Module: wine Branch: master Commit: 25023c130219c53fa84991e6ca22bbc4645c807d URL: http://source.winehq.org/git/wine.git/?a=commit;h=25023c130219c53fa84991e6ca...
Author: Jacek Caban jacek@codeweavers.com Date: Tue Apr 19 14:21:08 2011 +0200
psapi: Forward EmptyWorkingSet implementation to kernel32.
---
dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/process.c | 8 ++++++++ dlls/psapi/psapi.spec | 2 +- dlls/psapi/psapi_main.c | 8 -------- 4 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index b3b8fd5..21e8210 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -767,6 +767,7 @@ @ stdcall IsValidLocale(long long) # @ stub IsValidUILanguage @ stdcall IsWow64Process(ptr ptr) +@ stdcall K32EmptyWorkingSet(long) @ stdcall K32GetProcessImageFileNameA(long ptr long) @ stdcall K32GetProcessImageFileNameW(long ptr long) @ stdcall -i386 -private -register K32Thk1632Epilog() krnl386.exe16.K32Thk1632Epilog diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index c263092..d1d6a3b 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -3232,6 +3232,14 @@ BOOL WINAPI SetProcessWorkingSetSize(HANDLE hProcess, SIZE_T minset, }
/*********************************************************************** + * K32EmptyWorkingSet (KERNEL32.@) + */ +BOOL WINAPI K32EmptyWorkingSet(HANDLE hProcess) +{ + return SetProcessWorkingSetSize(hProcess, (SIZE_T)-1, (SIZE_T)-1); +} + +/*********************************************************************** * GetProcessWorkingSetSize (KERNEL32.@) */ BOOL WINAPI GetProcessWorkingSetSize(HANDLE hProcess, PSIZE_T minset, diff --git a/dlls/psapi/psapi.spec b/dlls/psapi/psapi.spec index aefe3e4..25e39cc 100644 --- a/dlls/psapi/psapi.spec +++ b/dlls/psapi/psapi.spec @@ -1,4 +1,4 @@ -@ stdcall EmptyWorkingSet(long) +@ stdcall EmptyWorkingSet(long) kernel32.K32EmptyWorkingSet @ stdcall EnumDeviceDrivers(ptr long ptr) @ stdcall EnumPageFilesA(ptr ptr) @ stdcall EnumPageFilesW(ptr ptr) diff --git a/dlls/psapi/psapi_main.c b/dlls/psapi/psapi_main.c index 327005c..07863ea 100644 --- a/dlls/psapi/psapi_main.c +++ b/dlls/psapi/psapi_main.c @@ -148,14 +148,6 @@ static BOOL PSAPI_GetLdrModule(HANDLE hProcess, HMODULE hModule, }
/*********************************************************************** - * EmptyWorkingSet (PSAPI.@) - */ -BOOL WINAPI EmptyWorkingSet(HANDLE hProcess) -{ - return SetProcessWorkingSetSize(hProcess, 0xFFFFFFFF, 0xFFFFFFFF); -} - -/*********************************************************************** * EnumDeviceDrivers (PSAPI.@) */ BOOL WINAPI EnumDeviceDrivers(LPVOID *lpImageBase, DWORD cb, LPDWORD lpcbNeeded)