Jacek Caban : kernel32: Moved GetProcessImageFileName implementation from psapi to kernel32.

[Alexandre Julliard]

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

Author: Jacek Caban 
Date:   Fri Apr  8 14:17:45 2011 +0200

kernel32: Moved GetProcessImageFileName implementation from psapi to kernel32.

---

dlls/kernel32/kernel32.spec |    2 ++
 dlls/kernel32/process.c     |   17 +++++++++++++++++
 dlls/psapi/psapi.spec       |    4 ++--
 dlls/psapi/psapi_main.c     |   21 ---------------------
 4 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec
index d7edf1f..b3b8fd5 100644
--- a/dlls/kernel32/kernel32.spec
+++ b/dlls/kernel32/kernel32.spec
@@ -767,6 +767,8 @@
 @ stdcall IsValidLocale(long long)
 # @ stub IsValidUILanguage
 @ stdcall IsWow64Process(ptr ptr)
+@ stdcall K32GetProcessImageFileNameA(long ptr long)
+@ stdcall K32GetProcessImageFileNameW(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 1956649..e039cad 100644
--- a/dlls/kernel32/process.c
+++ b/dlls/kernel32/process.c
@@ -3439,6 +3439,23 @@ cleanup:
 }

/***********************************************************************
+ *           K32GetProcessImageFileNameA (KERNEL32.@)
+ */
+DWORD WINAPI K32GetProcessImageFileNameA( HANDLE process, LPSTR file, DWORD size )
+{
+    FIXME("(%p, %p, %d) stub\n", process, file, size );
+    return 0;
+}
+
+/***********************************************************************
+ *           K32GetProcessImageFileNameW (KERNEL32.@)
+ */
+DWORD WINAPI K32GetProcessImageFileNameW( HANDLE process, LPWSTR file, DWORD size )
+{
+    return QueryFullProcessImageNameW(process, PROCESS_NAME_NATIVE, file, &size) ? size : 0;
+}
+
+/***********************************************************************
  * 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 0ae008d..aefe3e4 100644
--- a/dlls/psapi/psapi.spec
+++ b/dlls/psapi/psapi.spec
@@ -16,8 +16,8 @@
 @ stdcall GetModuleFileNameExW(long long ptr long)
 @ stdcall GetModuleInformation(long long ptr long)
 @ stdcall GetPerformanceInfo(ptr long)
-@ stdcall GetProcessImageFileNameA(long ptr long)
-@ stdcall GetProcessImageFileNameW(long ptr long)
+@ stdcall GetProcessImageFileNameA(long ptr long) kernel32.K32GetProcessImageFileNameA
+@ stdcall GetProcessImageFileNameW(long ptr long) kernel32.K32GetProcessImageFileNameW
 @ stdcall GetProcessMemoryInfo(long ptr long)
 @ stdcall GetWsChanges(long ptr long)
 @ stdcall InitializeProcessForWsWatch(long)
diff --git a/dlls/psapi/psapi_main.c b/dlls/psapi/psapi_main.c
index 61ba8de..327005c 100644
--- a/dlls/psapi/psapi_main.c
+++ b/dlls/psapi/psapi_main.c
@@ -494,27 +494,6 @@ BOOL WINAPI GetPerformanceInfo( PPERFORMANCE_INFORMATION info, DWORD size )
 }

/***********************************************************************
- *           GetProcessImageFileNameA (PSAPI.@)
- */
-DWORD WINAPI GetProcessImageFileNameA( HANDLE process, LPSTR file, DWORD size )
-{
-    FIXME("(%p, %p, %d) stub\n", process, file, size );
-    return 0;
-}
-
-/***********************************************************************
- *           GetProcessImageFileNameW (PSAPI.@)
- */
-DWORD WINAPI GetProcessImageFileNameW( HANDLE process, LPWSTR file, DWORD size )
-{
-    BOOL success = QueryFullProcessImageNameW(process, PROCESS_NAME_NATIVE, file, &size);
-    if (success)
-        return size;
-    else
-        return 0;
-}
-
-/***********************************************************************
  *           GetProcessMemoryInfo (PSAPI.@)
  *
  * Retrieve memory usage information for a given process