mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-11-21 16:46:54 -08:00
pdh-PdhLookupPerfNameByIndex-processor: Remove patch set.
This was written for Silverlight, but Silverlight didn't actually need this.
This commit is contained in:
parent
a1a2d65488
commit
96a8cc2920
@ -187,7 +187,6 @@ patch_enable_all ()
|
||||
enable_oleaut32_OleLoadPicture="$1"
|
||||
enable_oleaut32_OleLoadPictureFile="$1"
|
||||
enable_packager_DllMain="$1"
|
||||
enable_pdh_PdhLookupPerfNameByIndex_processor="$1"
|
||||
enable_programs_findstr="$1"
|
||||
enable_programs_systeminfo="$1"
|
||||
enable_quartz_MediaSeeking_Positions="$1"
|
||||
@ -616,9 +615,6 @@ patch_enable ()
|
||||
packager-DllMain)
|
||||
enable_packager_DllMain="$2"
|
||||
;;
|
||||
pdh-PdhLookupPerfNameByIndex-processor)
|
||||
enable_pdh_PdhLookupPerfNameByIndex_processor="$2"
|
||||
;;
|
||||
programs-findstr)
|
||||
enable_programs_findstr="$2"
|
||||
;;
|
||||
@ -3185,18 +3181,6 @@ if test "$enable_packager_DllMain" -eq 1; then
|
||||
patch_apply packager-DllMain/0001-packager-Prefer-native-version.patch
|
||||
fi
|
||||
|
||||
# Patchset pdh-PdhLookupPerfNameByIndex-processor
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#33018] pdh: Support the 'Processor' object string.
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/pdh/pdh_main.c, dlls/pdh/tests/pdh.c
|
||||
# |
|
||||
if test "$enable_pdh_PdhLookupPerfNameByIndex_processor" -eq 1; then
|
||||
patch_apply pdh-PdhLookupPerfNameByIndex-processor/0001-pdh-Support-the-Processor-object-string.patch
|
||||
fi
|
||||
|
||||
# Patchset programs-findstr
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
|
@ -1,44 +0,0 @@
|
||||
From 7d05b746a1ed3528230dd438cf29f41d332c97ae Mon Sep 17 00:00:00 2001
|
||||
From: Erich Hoover <ehoover@mines.edu>
|
||||
Date: Mon, 18 Feb 2013 16:02:27 -0700
|
||||
Subject: [PATCH] pdh: Support the 'Processor' object string.
|
||||
|
||||
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=33018
|
||||
---
|
||||
dlls/pdh/pdh_main.c | 1 +
|
||||
dlls/pdh/tests/pdh.c | 7 +++++++
|
||||
2 files changed, 8 insertions(+)
|
||||
|
||||
diff --git a/dlls/pdh/pdh_main.c b/dlls/pdh/pdh_main.c
|
||||
index d3bf6ab8706..fbe5ae1cdd3 100644
|
||||
--- a/dlls/pdh/pdh_main.c
|
||||
+++ b/dlls/pdh/pdh_main.c
|
||||
@@ -197,6 +197,7 @@ static void CALLBACK collect_uptime( struct counter *counter )
|
||||
static const struct source counter_sources[] =
|
||||
{
|
||||
{ 6, L"\\Processor(_Total)\\% Processor Time", collect_processor_time, TYPE_PROCESSOR_TIME, -5, 10000000 },
|
||||
+ { 238, L"\\Processor", NULL, 0, 0, 0 },
|
||||
{ 674, L"\\System\\System Up Time", collect_uptime, TYPE_UPTIME, -3, 1000 }
|
||||
};
|
||||
|
||||
diff --git a/dlls/pdh/tests/pdh.c b/dlls/pdh/tests/pdh.c
|
||||
index 71603f8c6ba..da0af83a006 100644
|
||||
--- a/dlls/pdh/tests/pdh.c
|
||||
+++ b/dlls/pdh/tests/pdh.c
|
||||
@@ -665,6 +665,13 @@ static void test_PdhLookupPerfNameByIndexA( void )
|
||||
"PdhLookupPerfNameByIndexA failed, got %s expected \'%% Processor Time\'\n", buffer);
|
||||
ok(size == sizeof("% Processor Time"), "PdhLookupPerfNameByIndexA failed %d\n", size);
|
||||
|
||||
+ size = sizeof(buffer);
|
||||
+ ret = PdhLookupPerfNameByIndexA( NULL, 238, buffer, &size );
|
||||
+ ok(ret == ERROR_SUCCESS, "PdhLookupPerfNameByIndexA failed 0x%08x\n", ret);
|
||||
+ ok(!lstrcmpA( buffer, "Processor" ),
|
||||
+ "PdhLookupPerfNameByIndexA failed, got %s expected \'Processor\'\n", buffer);
|
||||
+ ok(size == sizeof("Processor"), "PdhLookupPerfNameByIndexA failed %d\n", size);
|
||||
+
|
||||
size = sizeof(buffer);
|
||||
ret = PdhLookupPerfNameByIndexA( NULL, 674, NULL, &size );
|
||||
ok(ret == PDH_INVALID_ARGUMENT ||
|
||||
--
|
||||
2.28.0
|
||||
|
@ -1 +0,0 @@
|
||||
Fixes: [33018] pdh: Support the 'Processor' object string.
|
Loading…
Reference in New Issue
Block a user