Jacek Caban : kernel32: Moved EnumPageFiles[AW] implementation to kernel32.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 827e852166d6be0fe5293e6fc5883a5b443c524f
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=827e852166d6be0fe5293e6fc5...

Author: Jacek Caban 
Date:   Mon May 16 15:19:18 2011 +0200

kernel32: Moved EnumPageFiles[AW] implementation to kernel32.

---

dlls/kernel32/kernel32.spec |    2 ++
 dlls/kernel32/virtual.c     |   19 +++++++++++++++++++
 dlls/psapi/psapi.spec       |    4 ++--
 dlls/psapi/psapi_main.c     |   18 ------------------
 4 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec
index 52ddb12..2650431 100644
--- a/dlls/kernel32/kernel32.spec
+++ b/dlls/kernel32/kernel32.spec
@@ -771,6 +771,8 @@
 @ stdcall K32GetProcessImageFileNameA(long ptr long)
 @ stdcall K32GetProcessImageFileNameW(long ptr long)
 @ stdcall K32EnumDeviceDrivers(ptr long ptr)
+@ stdcall K32EnumPageFilesA(ptr ptr)
+@ stdcall K32EnumPageFilesW(ptr ptr)
 @ stdcall K32EnumProcessModules(long ptr long ptr)
 @ stdcall K32EnumProcesses(ptr long ptr)
 @ stdcall K32GetDeviceDriverBaseNameA(ptr ptr long)
diff --git a/dlls/kernel32/virtual.c b/dlls/kernel32/virtual.c
index a901f85..655d47d 100644
--- a/dlls/kernel32/virtual.c
+++ b/dlls/kernel32/virtual.c
@@ -39,6 +39,7 @@
 #include "winnls.h"
 #include "winternl.h"
 #include "winerror.h"
+#include "psapi.h"
 #include "wine/exception.h"
 #include "wine/debug.h"

@@ -850,3 +851,21 @@ DWORD WINAPI K32GetMappedFileNameW(HANDLE process, LPVOID lpv, LPWSTR file_name,

return 0;
 }
+
+/***********************************************************************
+ *           K32EnumPageFilesA (KERNEL32.@)
+ */
+BOOL WINAPI K32EnumPageFilesA( PENUM_PAGE_FILE_CALLBACKA callback, LPVOID context )
+{
+    FIXME_(file)("(%p, %p) stub\n", callback, context );
+    return FALSE;
+}
+
+/***********************************************************************
+ *           K32EnumPageFilesW (KERNEL32.@)
+ */
+BOOL WINAPI K32EnumPageFilesW( PENUM_PAGE_FILE_CALLBACKW callback, LPVOID context )
+{
+    FIXME_(file)("(%p, %p) stub\n", callback, context );
+    return FALSE;
+}
diff --git a/dlls/psapi/psapi.spec b/dlls/psapi/psapi.spec
index 835de4e..e179573 100644
--- a/dlls/psapi/psapi.spec
+++ b/dlls/psapi/psapi.spec
@@ -1,7 +1,7 @@
 @ stdcall EmptyWorkingSet(long) kernel32.K32EmptyWorkingSet
 @ stdcall EnumDeviceDrivers(ptr long ptr) kernel32.K32EnumDeviceDrivers
-@ stdcall EnumPageFilesA(ptr ptr)
-@ stdcall EnumPageFilesW(ptr ptr)
+@ stdcall EnumPageFilesA(ptr ptr) kernel32.K32EnumPageFilesA
+@ stdcall EnumPageFilesW(ptr ptr) kernel32.K32EnumPageFilesW
 @ stdcall EnumProcessModules(long ptr long ptr) kernel32.K32EnumProcessModules
 @ stdcall EnumProcesses(ptr long ptr) kernel32.K32EnumProcesses
 @ stdcall GetDeviceDriverBaseNameA(ptr ptr long) kernel32.K32GetDeviceDriverBaseNameA
diff --git a/dlls/psapi/psapi_main.c b/dlls/psapi/psapi_main.c
index ef2f23d..c4479b8 100644
--- a/dlls/psapi/psapi_main.c
+++ b/dlls/psapi/psapi_main.c
@@ -34,24 +34,6 @@

WINE_DEFAULT_DEBUG_CHANNEL(psapi);

-/***********************************************************************
- *           EnumPageFilesA (PSAPI.@)
- */
-BOOL WINAPI EnumPageFilesA( PENUM_PAGE_FILE_CALLBACKA callback, LPVOID context )
-{
-    FIXME("(%p, %p) stub\n", callback, context );
-    return FALSE;
-}
-
-/***********************************************************************
- *           EnumPageFilesW (PSAPI.@)
- */
-BOOL WINAPI EnumPageFilesW( PENUM_PAGE_FILE_CALLBACKW callback, LPVOID context )
-{
-    FIXME("(%p, %p) stub\n", callback, context );
-    return FALSE;
-}
-

/***********************************************************************
  *           GetPerformanceInfo (PSAPI.@)