Jacek Caban : psapi.h: Added support for PSAPI_VERSION version 2.
Alexandre Julliard
julliard at winehq.org
Fri Mar 3 14:20:35 CST 2017
Module: wine
Branch: master
Commit: 853b4148dd9c352d6cb9608df6e281c4fffec590
URL: http://source.winehq.org/git/wine.git/?a=commit;h=853b4148dd9c352d6cb9608df6e281c4fffec590
Author: Jacek Caban <jacek at codeweavers.com>
Date: Fri Mar 3 13:11:30 2017 +0100
psapi.h: Added support for PSAPI_VERSION version 2.
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
include/psapi.h | 34 ++++++++++++++++++++++++++++++++++
programs/wscript/tests/run.c | 1 +
2 files changed, 35 insertions(+)
diff --git a/include/psapi.h b/include/psapi.h
index fbdd903..c7663f8 100644
--- a/include/psapi.h
+++ b/include/psapi.h
@@ -21,6 +21,10 @@
#ifndef __WINE_PSAPI_H
#define __WINE_PSAPI_H
+#ifndef PSAPI_VERSION
+#define PSAPI_VERSION 2
+#endif
+
typedef struct _MODULEINFO {
LPVOID lpBaseOfDll;
DWORD SizeOfImage;
@@ -79,6 +83,36 @@ typedef BOOL (*PENUM_PAGE_FILE_CALLBACKW) (LPVOID, PENUM_PAGE_FILE_INFORMATION,
extern "C" {
#endif
+#if PSAPI_VERSION > 1
+#define EnumProcesses K32EnumProcesses
+#define EnumProcessModules K32EnumProcessModules
+#define EnumProcessModulesEx K32EnumProcessModulesEx
+#define GetModuleBaseNameA K32GetModuleBaseNameA
+#define GetModuleBaseNameW K32GetModuleBaseNameW
+#define GetModuleFileNameExA K32GetModuleFileNameExA
+#define GetModuleFileNameExW K32GetModuleFileNameExW
+#define GetModuleInformation K32GetModuleInformation
+#define EmptyWorkingSet K32EmptyWorkingSet
+#define QueryWorkingSet K32QueryWorkingSet
+#define QueryWorkingSetEx K32QueryWorkingSetEx
+#define InitializeProcessForWsWatch K32InitializeProcessForWsWatch
+#define GetWsChanges K32GetWsChanges
+#define GetWsChangesEx K32GetWsChangesEx
+#define GetMappedFileNameW K32GetMappedFileNameW
+#define GetMappedFileNameA K32GetMappedFileNameA
+#define EnumDeviceDrivers K32EnumDeviceDrivers
+#define GetDeviceDriverBaseNameA K32GetDeviceDriverBaseNameA
+#define GetDeviceDriverBaseNameW K32GetDeviceDriverBaseNameW
+#define GetDeviceDriverFileNameA K32GetDeviceDriverFileNameA
+#define GetDeviceDriverFileNameW K32GetDeviceDriverFileNameW
+#define GetProcessMemoryInfo K32GetProcessMemoryInfo
+#define GetPerformanceInfo K32GetPerformanceInfo
+#define EnumPageFilesW K32EnumPageFilesW
+#define EnumPageFilesA K32EnumPageFilesA
+#define GetProcessImageFileNameA K32GetProcessImageFileNameA
+#define GetProcessImageFileNameW K32GetProcessImageFileNameW
+#endif
+
BOOL WINAPI EnumProcesses(DWORD*, DWORD, DWORD*);
BOOL WINAPI EnumProcessModules(HANDLE, HMODULE*, DWORD, LPDWORD);
BOOL WINAPI EnumProcessModulesEx(HANDLE, HMODULE*, DWORD, LPDWORD, DWORD);
diff --git a/programs/wscript/tests/run.c b/programs/wscript/tests/run.c
index eb840cc..770fd8f 100644
--- a/programs/wscript/tests/run.c
+++ b/programs/wscript/tests/run.c
@@ -21,6 +21,7 @@
#define COBJMACROS
#define CONST_VTABLE
+#define PSAPI_VERSION 1
#include <initguid.h>
#include <windows.h>
#include <psapi.h>
More information about the wine-cvs
mailing list