Michael Stefaniuc : taskmgr: Use GetGuiResources() directly.
Alexandre Julliard
julliard at winehq.org
Mon Oct 19 15:54:05 CDT 2020
Module: wine
Branch: master
Commit: d98cd9e82ae701e560befc44881476361ef5070a
URL: https://source.winehq.org/git/wine.git/?a=commit;h=d98cd9e82ae701e560befc44881476361ef5070a
Author: Michael Stefaniuc <mstefani at winehq.org>
Date: Sun Oct 18 23:33:27 2020 +0200
taskmgr: Use GetGuiResources() directly.
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
programs/taskmgr/perfdata.c | 9 ++-------
programs/taskmgr/perfdata.h | 1 -
2 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/programs/taskmgr/perfdata.c b/programs/taskmgr/perfdata.c
index d81ab102482..67f0d934412 100644
--- a/programs/taskmgr/perfdata.c
+++ b/programs/taskmgr/perfdata.c
@@ -31,7 +31,6 @@
#include "perfdata.h"
static PROCNTQSI pNtQuerySystemInformation = NULL;
-static PROCGGR pGetGuiResources = NULL;
static PROCGPIC pGetProcessIoCounters = NULL;
static PROCISW64 pIsWow64Process = NULL;
static CRITICAL_SECTION PerfDataCriticalSection;
@@ -60,11 +59,9 @@ BOOL PerfDataInitialize(void)
{
LONG status;
static const WCHAR wszNtdll[] = {'n','t','d','l','l','.','d','l','l',0};
- static const WCHAR wszUser32[] = {'u','s','e','r','3','2','.','d','l','l',0};
static const WCHAR wszKernel32[] = {'k','e','r','n','e','l','3','2','.','d','l','l',0};
pNtQuerySystemInformation = (PROCNTQSI)GetProcAddress(GetModuleHandleW(wszNtdll), "NtQuerySystemInformation");
- pGetGuiResources = (PROCGGR)GetProcAddress(GetModuleHandleW(wszUser32), "GetGuiResources");
pGetProcessIoCounters = (PROCGPIC)GetProcAddress(GetModuleHandleW(wszKernel32), "GetProcessIoCounters");
pIsWow64Process = (PROCISW64)GetProcAddress(GetModuleHandleW(wszKernel32), "IsWow64Process");
@@ -297,10 +294,8 @@ void PerfDataRefresh(void)
RevertToSelf();
CloseHandle(hProcessToken);
}
- if (pGetGuiResources) {
- pPerfData[Idx].USERObjectCount = pGetGuiResources(hProcess, GR_USEROBJECTS);
- pPerfData[Idx].GDIObjectCount = pGetGuiResources(hProcess, GR_GDIOBJECTS);
- }
+ pPerfData[Idx].USERObjectCount = GetGuiResources(hProcess, GR_USEROBJECTS);
+ pPerfData[Idx].GDIObjectCount = GetGuiResources(hProcess, GR_GDIOBJECTS);
if (pGetProcessIoCounters)
pGetProcessIoCounters(hProcess, &pPerfData[Idx].IOCounters);
if (pIsWow64Process)
diff --git a/programs/taskmgr/perfdata.h b/programs/taskmgr/perfdata.h
index d6a16028c4b..8b9fabbd910 100644
--- a/programs/taskmgr/perfdata.h
+++ b/programs/taskmgr/perfdata.h
@@ -67,7 +67,6 @@ struct _SYSTEM_PAGEFILE_INFORMATION
#define GR_USEROBJECTS 1 /* Count of USER objects */
typedef LONG (WINAPI *PROCNTQSI)(UINT,PVOID,ULONG,PULONG);
-typedef DWORD (WINAPI *PROCGGR)(HANDLE,DWORD);
typedef BOOL (WINAPI *PROCGPIC)(HANDLE,PIO_COUNTERS);
typedef BOOL (WINAPI *PROCISW64)(HANDLE,PBOOL);
More information about the wine-cvs
mailing list