Jacek Caban : kernel32: Moved QueryWorkingSet and QueryWorkingSetEx implementation to kernel32.
Alexandre Julliard
julliard at winehq.org
Wed May 11 13:02:57 CDT 2011
Module: wine
Branch: master
Commit: c1c70c62cba78e11d342de9c66c73fbdd91dbaa1
URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1c70c62cba78e11d342de9c66c73fbdd91dbaa1
Author: Jacek Caban <jacek at codeweavers.com>
Date: Wed May 11 13:06:45 2011 +0000
kernel32: Moved QueryWorkingSet and QueryWorkingSetEx implementation to kernel32.
---
dlls/kernel32/kernel32.spec | 2 ++
dlls/kernel32/process.c | 38 ++++++++++++++++++++++++++++++++++++++
dlls/psapi/psapi.spec | 4 ++--
dlls/psapi/psapi_main.c | 38 --------------------------------------
4 files changed, 42 insertions(+), 40 deletions(-)
diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec
index 01939c9..a4e45d6 100644
--- a/dlls/kernel32/kernel32.spec
+++ b/dlls/kernel32/kernel32.spec
@@ -772,6 +772,8 @@
@ stdcall K32GetProcessImageFileNameW(long ptr long)
@ stdcall K32EnumProcessModules(long ptr long ptr)
@ stdcall K32EnumProcesses(ptr long ptr)
+@ stdcall K32QueryWorkingSet(long ptr long)
+@ stdcall K32QueryWorkingSetEx(long ptr long)
@ stdcall -i386 -private -register K32Thk1632Epilog() krnl386.exe16.K32Thk1632Epilog
@ stdcall -i386 -private -register K32Thk1632Prolog() krnl386.exe16.K32Thk1632Prolog
@ stdcall LCIDToLocaleName(long ptr long long)
diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c
index 6ca1279..5436c06 100644
--- a/dlls/kernel32/process.c
+++ b/dlls/kernel32/process.c
@@ -3584,6 +3584,44 @@ BOOL WINAPI K32EnumProcessModules(HANDLE process, HMODULE *lphModule,
}
/***********************************************************************
+ * K32QueryWorkingSet (KERNEL32.@)
+ */
+BOOL WINAPI K32QueryWorkingSet( HANDLE process, LPVOID buffer, DWORD size )
+{
+ NTSTATUS status;
+
+ TRACE( "(%p, %p, %d)\n", process, buffer, size );
+
+ status = NtQueryVirtualMemory( process, NULL, MemoryWorkingSetList, buffer, size, NULL );
+
+ if (status)
+ {
+ SetLastError( RtlNtStatusToDosError( status ) );
+ return FALSE;
+ }
+ return TRUE;
+}
+
+/***********************************************************************
+ * K32QueryWorkingSetEx (KERNEL32.@)
+ */
+BOOL WINAPI K32QueryWorkingSetEx( HANDLE process, LPVOID buffer, DWORD size )
+{
+ NTSTATUS status;
+
+ TRACE( "(%p, %p, %d)\n", process, buffer, size );
+
+ status = NtQueryVirtualMemory( process, NULL, MemoryWorkingSetList, buffer, size, NULL );
+
+ if (status)
+ {
+ SetLastError( RtlNtStatusToDosError( status ) );
+ return FALSE;
+ }
+ return TRUE;
+}
+
+/***********************************************************************
* ProcessIdToSessionId (KERNEL32.@)
* This function is available on Terminal Server 4SP4 and Windows 2000
*/
diff --git a/dlls/psapi/psapi.spec b/dlls/psapi/psapi.spec
index 70f1144..37d6e80 100644
--- a/dlls/psapi/psapi.spec
+++ b/dlls/psapi/psapi.spec
@@ -21,5 +21,5 @@
@ stdcall GetProcessMemoryInfo(long ptr long)
@ stdcall GetWsChanges(long ptr long)
@ stdcall InitializeProcessForWsWatch(long)
-@ stdcall QueryWorkingSet(long ptr long)
-@ stdcall QueryWorkingSetEx(long ptr long)
+@ 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 34dfeed..909e7ce 100644
--- a/dlls/psapi/psapi_main.c
+++ b/dlls/psapi/psapi_main.c
@@ -475,41 +475,3 @@ BOOL WINAPI InitializeProcessForWsWatch(HANDLE hProcess)
return TRUE;
}
-
-/***********************************************************************
- * QueryWorkingSet (PSAPI.@)
- */
-BOOL WINAPI QueryWorkingSet( HANDLE process, LPVOID buffer, DWORD size )
-{
- NTSTATUS status;
-
- TRACE( "(%p, %p, %d)\n", process, buffer, size );
-
- status = NtQueryVirtualMemory( process, NULL, MemoryWorkingSetList, buffer, size, NULL );
-
- if (status)
- {
- SetLastError( RtlNtStatusToDosError( status ) );
- return FALSE;
- }
- return TRUE;
-}
-
-/***********************************************************************
- * QueryWorkingSetEx (PSAPI.@)
- */
-BOOL WINAPI QueryWorkingSetEx( HANDLE process, LPVOID buffer, DWORD size )
-{
- NTSTATUS status;
-
- TRACE( "(%p, %p, %d)\n", process, buffer, size );
-
- status = NtQueryVirtualMemory( process, NULL, MemoryWorkingSetList, buffer, size, NULL );
-
- if (status)
- {
- SetLastError( RtlNtStatusToDosError( status ) );
- return FALSE;
- }
- return TRUE;
-}
More information about the wine-cvs
mailing list