psapi: Win64 printf format warning fixes.

[Michael Stefaniuc]

---
 dlls/psapi/Makefile.in  |    1 -
 dlls/psapi/psapi_main.c |   30 +++++++++++++++---------------
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/dlls/psapi/Makefile.in b/dlls/psapi/Makefile.in
index 4959289..8bd5546 100644
--- a/dlls/psapi/Makefile.in
+++ b/dlls/psapi/Makefile.in
@@ -5,7 +5,6 @@ VPATH     = @srcdir@
 MODULE    = psapi.dll
 IMPORTLIB = libpsapi.$(IMPLIBEXT)
 IMPORTS   = kernel32 ntdll
-EXTRADEFS = -DWINE_NO_LONG_AS_INT
 
 C_SRCS = \
 	psapi_main.c
diff --git a/dlls/psapi/psapi_main.c b/dlls/psapi/psapi_main.c
index 4556052..0313475 100644
--- a/dlls/psapi/psapi_main.c
+++ b/dlls/psapi/psapi_main.c
@@ -160,7 +160,7 @@ BOOL WINAPI EmptyWorkingSet(HANDLE hProc
  */
 BOOL WINAPI EnumDeviceDrivers(LPVOID *lpImageBase, DWORD cb, LPDWORD lpcbNeeded)
 {
-    FIXME("(%p, %ld, %p): stub\n", lpImageBase, cb, lpcbNeeded);
+    FIXME("(%p, %d, %p): stub\n", lpImageBase, cb, lpcbNeeded);
 
     if (lpcbNeeded)
         *lpcbNeeded = 0;
@@ -271,7 +271,7 @@ BOOL WINAPI EnumProcessModules(HANDLE hP
 DWORD WINAPI GetDeviceDriverBaseNameA(LPVOID ImageBase, LPSTR lpBaseName, 
                                       DWORD nSize)
 {
-    FIXME("(%p, %p, %ld): stub\n", ImageBase, lpBaseName, nSize);
+    FIXME("(%p, %p, %d): stub\n", ImageBase, lpBaseName, nSize);
 
     if (lpBaseName && nSize)
         lpBaseName[0] = '\0';
@@ -285,7 +285,7 @@ DWORD WINAPI GetDeviceDriverBaseNameA(LP
 DWORD WINAPI GetDeviceDriverBaseNameW(LPVOID ImageBase, LPWSTR lpBaseName, 
                                       DWORD nSize)
 {
-    FIXME("(%p, %p, %ld): stub\n", ImageBase, lpBaseName, nSize);
+    FIXME("(%p, %p, %d): stub\n", ImageBase, lpBaseName, nSize);
 
     if (lpBaseName && nSize)
         lpBaseName[0] = '\0';
@@ -299,7 +299,7 @@ DWORD WINAPI GetDeviceDriverBaseNameW(LP
 DWORD WINAPI GetDeviceDriverFileNameA(LPVOID ImageBase, LPSTR lpFilename, 
                                       DWORD nSize)
 {
-    FIXME("(%p, %p, %ld): stub\n", ImageBase, lpFilename, nSize);
+    FIXME("(%p, %p, %d): stub\n", ImageBase, lpFilename, nSize);
 
     if (lpFilename && nSize)
         lpFilename[0] = '\0';
@@ -313,7 +313,7 @@ DWORD WINAPI GetDeviceDriverFileNameA(LP
 DWORD WINAPI GetDeviceDriverFileNameW(LPVOID ImageBase, LPWSTR lpFilename, 
                                       DWORD nSize)
 {
-    FIXME("(%p, %p, %ld): stub\n", ImageBase, lpFilename, nSize);
+    FIXME("(%p, %p, %d): stub\n", ImageBase, lpFilename, nSize);
 
     if (lpFilename && nSize)
         lpFilename[0] = '\0';
@@ -327,7 +327,7 @@ DWORD WINAPI GetDeviceDriverFileNameW(LP
 DWORD WINAPI GetMappedFileNameA(HANDLE hProcess, LPVOID lpv, LPSTR lpFilename, 
                                 DWORD nSize)
 {
-    FIXME("(%p, %p, %p, %ld): stub\n", hProcess, lpv, lpFilename, nSize);
+    FIXME("(%p, %p, %p, %d): stub\n", hProcess, lpv, lpFilename, nSize);
 
     if (lpFilename && nSize)
         lpFilename[0] = '\0';
@@ -341,7 +341,7 @@ DWORD WINAPI GetMappedFileNameA(HANDLE h
 DWORD WINAPI GetMappedFileNameW(HANDLE hProcess, LPVOID lpv, LPWSTR lpFilename, 
                                 DWORD nSize)
 {
-    FIXME("(%p, %p, %p, %ld): stub\n", hProcess, lpv, lpFilename, nSize);
+    FIXME("(%p, %p, %p, %d): stub\n", hProcess, lpv, lpFilename, nSize);
 
     if (lpFilename && nSize)
         lpFilename[0] = '\0';
@@ -364,7 +364,7 @@ DWORD WINAPI GetModuleBaseNameA(HANDLE h
     }
     lpBaseNameW = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR) * nSize);
     buflenW = GetModuleBaseNameW(hProcess, hModule, lpBaseNameW, nSize);
-    TRACE("%ld, %s\n", buflenW, debugstr_w(lpBaseNameW));
+    TRACE("%d, %s\n", buflenW, debugstr_w(lpBaseNameW));
     if (buflenW)
     {
         ret = WideCharToMultiByte(CP_ACP, 0, lpBaseNameW, buflenW,
@@ -403,7 +403,7 @@ DWORD WINAPI GetModuleFileNameExA(HANDLE
 {
     WCHAR *ptr;
 
-    TRACE("(hProcess=%p, hModule=%p, %p, %ld)\n",
+    TRACE("(hProcess=%p, hModule=%p, %p, %d)\n",
           hProcess, hModule, lpFileName, nSize);
 
     if (!lpFileName || !nSize) return 0;
@@ -481,7 +481,7 @@ BOOL WINAPI GetPerformanceInfo( PPERFORM
 {
     NTSTATUS status;
 
-    TRACE( "(%p, %ld)\n", info, size );
+    TRACE( "(%p, %d)\n", info, size );
 
     status = NtQueryInformationProcess( GetCurrentProcess(), SystemPerformanceInformation, info, size, NULL );
 
@@ -498,7 +498,7 @@ BOOL WINAPI GetPerformanceInfo( PPERFORM
  */
 DWORD WINAPI GetProcessImageFileNameA( HANDLE process, LPSTR file, DWORD size )
 {
-    FIXME("(%p, %p, %ld) stub\n", process, file, size );
+    FIXME("(%p, %p, %d) stub\n", process, file, size );
     return 0;
 }
 
@@ -507,7 +507,7 @@ DWORD WINAPI GetProcessImageFileNameA( H
  */
 DWORD WINAPI GetProcessImageFileNameW( HANDLE process, LPWSTR file, DWORD size )
 {
-    FIXME("(%p, %p, %ld) stub\n", process, file, size );
+    FIXME("(%p, %p, %d) stub\n", process, file, size );
     return 0;
 }
 
@@ -559,7 +559,7 @@ BOOL WINAPI GetWsChanges( HANDLE process
 {
     NTSTATUS status;
 
-    TRACE( "(%p, %p, %ld)\n", process, watchinfo, size );
+    TRACE( "(%p, %p, %d)\n", process, watchinfo, size );
 
     status = NtQueryVirtualMemory( process, NULL, ProcessWorkingSetWatch, watchinfo, size, NULL );
 
@@ -588,7 +588,7 @@ BOOL WINAPI QueryWorkingSet( HANDLE proc
 {
     NTSTATUS status;
 
-    TRACE( "(%p, %p, %ld)\n", process, buffer, size );
+    TRACE( "(%p, %p, %d)\n", process, buffer, size );
 
     status = NtQueryVirtualMemory( process, NULL, MemoryWorkingSetList, buffer, size, NULL );
 
@@ -607,7 +607,7 @@ BOOL WINAPI QueryWorkingSetEx( HANDLE pr
 {
     NTSTATUS status;
 
-    TRACE( "(%p, %p, %ld)\n", process, buffer, size );
+    TRACE( "(%p, %p, %d)\n", process, buffer, size );
 
     status = NtQueryVirtualMemory( process, NULL, MemoryWorkingSetList, buffer,  size, NULL );
 
-- 
1.4.2.3
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://www.winehq.org/pipermail/wine-patches/attachments/20061008/c8c7d751/attachment.pgp