Module: wine Branch: master Commit: 595521bc959294ead39e740db77313d7cd0ca345 URL: http://source.winehq.org/git/wine.git/?a=commit;h=595521bc959294ead39e740db7...
Author: Jacek Caban jacek@codeweavers.com Date: Mon May 16 15:19:29 2011 +0200
kernel32: Moved GetWsChanges and InitializeProcessForWsWatch implementations to kernel32.
---
dlls/kernel32/kernel32.spec | 2 ++ dlls/kernel32/virtual.c | 29 +++++++++++++++++++++++++++++ dlls/psapi/psapi.spec | 4 ++-- dlls/psapi/psapi_main.c | 29 ----------------------------- 4 files changed, 33 insertions(+), 31 deletions(-)
diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 2650431..e144fd6 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -787,6 +787,8 @@ @ stdcall K32GetModuleFileNameExW(long long ptr long) @ stdcall K32GetModuleInformation(long long ptr long) @ stdcall K32GetProcessMemoryInfo(long ptr long) +@ stdcall K32GetWsChanges(long ptr long) +@ stdcall K32InitializeProcessForWsWatch(long) @ stdcall K32QueryWorkingSet(long ptr long) @ stdcall K32QueryWorkingSetEx(long ptr long) @ stdcall -i386 -private -register K32Thk1632Epilog() krnl386.exe16.K32Thk1632Epilog diff --git a/dlls/kernel32/virtual.c b/dlls/kernel32/virtual.c index 655d47d..6328399 100644 --- a/dlls/kernel32/virtual.c +++ b/dlls/kernel32/virtual.c @@ -869,3 +869,32 @@ BOOL WINAPI K32EnumPageFilesW( PENUM_PAGE_FILE_CALLBACKW callback, LPVOID contex FIXME_(file)("(%p, %p) stub\n", callback, context ); return FALSE; } + +/*********************************************************************** + * K32GetWsChanges (KERNEL32.@) + */ +BOOL WINAPI K32GetWsChanges(HANDLE process, PPSAPI_WS_WATCH_INFORMATION watchinfo, DWORD size) +{ + NTSTATUS status; + + TRACE_(seh)("(%p, %p, %d)\n", process, watchinfo, size); + + status = NtQueryInformationProcess( process, ProcessWorkingSetWatch, watchinfo, size, NULL ); + + if (status) + { + SetLastError( RtlNtStatusToDosError( status ) ); + return FALSE; + } + return TRUE; +} + +/*********************************************************************** + * K32InitializeProcessForWsWatch (KERNEL32.@) + */ +BOOL WINAPI K32InitializeProcessForWsWatch(HANDLE process) +{ + FIXME_(seh)("(process=%p): stub\n", process); + + return TRUE; +} diff --git a/dlls/psapi/psapi.spec b/dlls/psapi/psapi.spec index e179573..844c761 100644 --- a/dlls/psapi/psapi.spec +++ b/dlls/psapi/psapi.spec @@ -19,7 +19,7 @@ @ stdcall GetProcessImageFileNameA(long ptr long) kernel32.K32GetProcessImageFileNameA @ stdcall GetProcessImageFileNameW(long ptr long) kernel32.K32GetProcessImageFileNameW @ stdcall GetProcessMemoryInfo(long ptr long) kernel32.K32GetProcessMemoryInfo -@ stdcall GetWsChanges(long ptr long) -@ stdcall InitializeProcessForWsWatch(long) +@ stdcall GetWsChanges(long ptr long) kernel32.K32GetWsChanges +@ stdcall InitializeProcessForWsWatch(long) kernel32.K32InitializeProcessForWsWatch @ stdcall QueryWorkingSet(long ptr long) kernel32.K32QueryWorkingSet @ stdcall QueryWorkingSetEx(long ptr long) kernel32.K32QueryWorkingSetEx diff --git a/dlls/psapi/psapi_main.c b/dlls/psapi/psapi_main.c index c4479b8..17f408d 100644 --- a/dlls/psapi/psapi_main.c +++ b/dlls/psapi/psapi_main.c @@ -53,32 +53,3 @@ BOOL WINAPI GetPerformanceInfo( PPERFORMANCE_INFORMATION info, DWORD size ) } return TRUE; } - -/*********************************************************************** - * GetWsChanges (PSAPI.@) - */ -BOOL WINAPI GetWsChanges( HANDLE process, PPSAPI_WS_WATCH_INFORMATION watchinfo, DWORD size ) -{ - NTSTATUS status; - - TRACE( "(%p, %p, %d)\n", process, watchinfo, size ); - - status = NtQueryInformationProcess( process, ProcessWorkingSetWatch, watchinfo, size, NULL ); - - if (status) - { - SetLastError( RtlNtStatusToDosError( status ) ); - return FALSE; - } - return TRUE; -} - -/*********************************************************************** - * InitializeProcessForWsWatch (PSAPI.@) - */ -BOOL WINAPI InitializeProcessForWsWatch(HANDLE hProcess) -{ - FIXME("(hProcess=%p): stub\n", hProcess); - - return TRUE; -}