Jacek Caban : kernel32: Moved GetMappedFileName[AW] stubs to kernel32.

Alexandre Julliard julliard at winehq.org
Fri May 13 11:17:50 CDT 2011


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

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Fri May 13 11:05:11 2011 +0200

kernel32: Moved GetMappedFileName[AW] stubs to kernel32.

---

 dlls/kernel32/kernel32.spec |    2 ++
 dlls/kernel32/virtual.c     |   27 +++++++++++++++++++++++++++
 dlls/psapi/psapi.spec       |    4 ++--
 dlls/psapi/psapi_main.c     |   28 ----------------------------
 4 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec
index 31680fe..9edd92e 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 K32GetMappedFileNameA(long ptr ptr long)
+@ stdcall K32GetMappedFileNameW(long ptr ptr long)
 @ stdcall K32GetModuleBaseNameA(long long ptr long)
 @ stdcall K32GetModuleBaseNameW(long long ptr long)
 @ stdcall K32GetModuleFileNameExA(long long ptr long)
diff --git a/dlls/kernel32/virtual.c b/dlls/kernel32/virtual.c
index dcd5b85..a901f85 100644
--- a/dlls/kernel32/virtual.c
+++ b/dlls/kernel32/virtual.c
@@ -45,6 +45,7 @@
 #include "kernel_private.h"
 
 WINE_DECLARE_DEBUG_CHANNEL(seh);
+WINE_DECLARE_DEBUG_CHANNEL(file);
 
 static unsigned int page_size;
 
@@ -823,3 +824,29 @@ BOOL WINAPI IsBadStringPtrW( LPCWSTR str, UINT max )
     __ENDTRY
     return FALSE;
 }
+
+/***********************************************************************
+ *           K32GetMappedFileNameA (KERNEL32.@)
+ */
+DWORD WINAPI K32GetMappedFileNameA(HANDLE process, LPVOID lpv, LPSTR file_name, DWORD size)
+{
+    FIXME_(file)("(%p, %p, %p, %d): stub\n", process, lpv, file_name, size);
+
+    if (file_name && size)
+        file_name[0] = '\0';
+
+    return 0;
+}
+
+/***********************************************************************
+ *           K32GetMappedFileNameW (KERNEL32.@)
+ */
+DWORD WINAPI K32GetMappedFileNameW(HANDLE process, LPVOID lpv, LPWSTR file_name, DWORD size)
+{
+    FIXME_(file)("(%p, %p, %p, %d): stub\n", process, lpv, file_name, size);
+
+    if (file_name && size)
+        file_name[0] = '\0';
+
+    return 0;
+}
diff --git a/dlls/psapi/psapi.spec b/dlls/psapi/psapi.spec
index aaf2931..a53ec04 100644
--- a/dlls/psapi/psapi.spec
+++ b/dlls/psapi/psapi.spec
@@ -8,8 +8,8 @@
 @ stdcall GetDeviceDriverBaseNameW(ptr ptr long)
 @ stdcall GetDeviceDriverFileNameA(ptr ptr long)
 @ stdcall GetDeviceDriverFileNameW(ptr ptr long)
-@ stdcall GetMappedFileNameA(long ptr ptr long)
-@ stdcall GetMappedFileNameW(long ptr ptr long)
+@ stdcall GetMappedFileNameA(long ptr ptr long) kernel32.K32GetMappedFileNameA
+@ stdcall GetMappedFileNameW(long ptr ptr long) kernel32.K32GetMappedFileNameW
 @ stdcall GetModuleBaseNameA(long long ptr long) kernel32.K32GetModuleBaseNameA
 @ stdcall GetModuleBaseNameW(long long ptr long) kernel32.K32GetModuleBaseNameW
 @ stdcall GetModuleFileNameExA(long long ptr long) kernel32.K32GetModuleFileNameExA
diff --git a/dlls/psapi/psapi_main.c b/dlls/psapi/psapi_main.c
index b297b7b..8d79892 100644
--- a/dlls/psapi/psapi_main.c
+++ b/dlls/psapi/psapi_main.c
@@ -122,34 +122,6 @@ DWORD WINAPI GetDeviceDriverFileNameW(LPVOID ImageBase, LPWSTR lpFilename,
 }
 
 /***********************************************************************
- *           GetMappedFileNameA (PSAPI.@)
- */
-DWORD WINAPI GetMappedFileNameA(HANDLE hProcess, LPVOID lpv, LPSTR lpFilename, 
-                                DWORD nSize)
-{
-    FIXME("(%p, %p, %p, %d): stub\n", hProcess, lpv, lpFilename, nSize);
-
-    if (lpFilename && nSize)
-        lpFilename[0] = '\0';
-
-    return 0;
-}
-
-/***********************************************************************
- *           GetMappedFileNameW (PSAPI.@)
- */
-DWORD WINAPI GetMappedFileNameW(HANDLE hProcess, LPVOID lpv, LPWSTR lpFilename, 
-                                DWORD nSize)
-{
-    FIXME("(%p, %p, %p, %d): stub\n", hProcess, lpv, lpFilename, nSize);
-
-    if (lpFilename && nSize)
-        lpFilename[0] = '\0';
-
-    return 0;
-}
-
-/***********************************************************************
  *           GetPerformanceInfo (PSAPI.@)
  */
 BOOL WINAPI GetPerformanceInfo( PPERFORMANCE_INFORMATION info, DWORD size )




More information about the wine-cvs mailing list