CVS: winex/dlls/psapi psapi_main.c,1.10,1.11

[email protected] 12 Sep 2007 12:27:07 -0000
Newsgroups gmane.comp.emulators.winex.cvs
Message-ID <[email protected]>
Subject: winex/dlls/psapi psapi_main.c,1.10,1.11Update of /var/lib/cvsd/cvsroot/winex/dlls/psapi
In directory agravaine:/tmp/cvs-serv9886/dlls/psapi

Modified Files:
	psapi_main.c 
Log Message:

- fixed several printf warnings
- prevented some non-strings from being printed as strings in psapi



Index: psapi_main.c
===================================================================
RCS file: /var/lib/cvsd/cvsroot/winex/dlls/psapi/psapi_main.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- psapi_main.c	12 Sep 2007 12:21:45 -0000	1.10
+++ psapi_main.c	12 Sep 2007 12:27:05 -0000	1.11
@@ -20,22 +20,25 @@
  */
 BOOL WINAPI EmptyWorkingSet(HANDLE hProcess)
 {
-  TRACE("(0x%08x)", hProcess);
-  return SetProcessWorkingSetSize(hProcess, 0xFFFFFFFF, 0xFFFFFFFF);
+    TRACE("(hProcess = 0x%08x)", hProcess);
+
+    return SetProcessWorkingSetSize(hProcess, 0xFFFFFFFF, 0xFFFFFFFF);
 }
 
 /***********************************************************************
  *           EnumDeviceDrivers (PSAPI.@)
  */
 BOOL WINAPI EnumDeviceDrivers(
-  LPVOID *lpImageBase, DWORD cb, LPDWORD lpcbNeeded)
+    LPVOID *lpImageBase, 
+    DWORD   cb, 
+    LPDWORD lpcbNeeded)
 {
-  FIXME("(%p, %ld, %p): stub\n", lpImageBase, cb, lpcbNeeded);
+    FIXME("(lpImageBase = %p, cb = %ld, lpcbNeeded = %p): stub\n", lpImageBase, cb, lpcbNeeded);
 
-  if(lpcbNeeded)
-    *lpcbNeeded = 0;
+    if(lpcbNeeded)
+        *lpcbNeeded = 0;
 
-  return TRUE;
+    return TRUE;
 }
 
 
@@ -154,96 +157,110 @@
  *          GetDeviceDriverBaseNameA (PSAPI.@)
  */
 DWORD WINAPI GetDeviceDriverBaseNameA(
-  LPVOID ImageBase, LPSTR lpBaseName, DWORD nSize)
+    LPVOID  ImageBase, 
+    LPSTR   lpBaseName, 
+    DWORD   nSize)
 {
-  FIXME("(%p, %s, %ld): stub\n",
-    ImageBase, debugstr_a(lpBaseName), nSize
-  );
+    FIXME("(ImageBase = %p, lpBaseName = %p, nSize = %ld): stub\n",
+            ImageBase, lpBaseName, nSize);
 
-  if(lpBaseName && nSize)
-    lpBaseName[0] = '\0';
 
-  return 0;
+    if(lpBaseName && nSize)
+        lpBaseName[0] = '\0';
+
+    return 0;
 }
 
 /***********************************************************************
  *           GetDeviceDriverBaseNameW (PSAPI.@)
  */
 DWORD WINAPI GetDeviceDriverBaseNameW(
-  LPVOID ImageBase, LPWSTR lpBaseName, DWORD nSize)
+    LPVOID  ImageBase, 
+    LPWSTR  lpBaseName, 
+    DWORD   nSize)
 {
-  FIXME("(%p, %s, %ld): stub\n",
-    ImageBase, debugstr_w(lpBaseName), nSize
-  );
+    FIXME("(ImageBase = %p, lpBaseName = %p, nSize = %ld): stub\n",
+            ImageBase, lpBaseName, nSize);
 
-  if(lpBaseName && nSize)
-    lpBaseName[0] = '\0';
 
-  return 0;
+    if(lpBaseName && nSize)
+        lpBaseName[0] = '\0';
+
+    return 0;
 }
 
 /***********************************************************************
  *           GetDeviceDriverFileNameA (PSAPI.@)
  */
 DWORD WINAPI GetDeviceDriverFileNameA(
-  LPVOID ImageBase, LPSTR lpFilename, DWORD nSize)
+    LPVOID  ImageBase, 
+    LPSTR   lpFilename, 
+    DWORD   nSize)
 {
-  FIXME("(%p, %s, %ld): stub\n",
-    ImageBase, debugstr_a(lpFilename), nSize
-  );
+    FIXME("(ImageBase = %p, lpFilename = %p, nSize = %ld}: stub\n",
+            ImageBase, lpFilename, nSize);
 
-  if(lpFilename && nSize)
-    lpFilename[0] = '\0';
 
-  return 0;
+    if(lpFilename && nSize)
+        lpFilename[0] = '\0';
+
+    return 0;
 }
 
 /***********************************************************************
  *           GetDeviceDriverFileNameW (PSAPI.@)
  */
 DWORD WINAPI GetDeviceDriverFileNameW(
-  LPVOID ImageBase, LPWSTR lpFilename, DWORD nSize)
+    LPVOID  ImageBase, 
+    LPWSTR  lpFilename, 
+    DWORD   nSize)
 {
-  FIXME("(%p, %s, %ld): stub\n",
-    ImageBase, debugstr_w(lpFilename), nSize
-  );
+    FIXME("(ImageBase = %p, lpFilename = %p, nSize = %ld): stub\n",
+            ImageBase, lpFilename, nSize);
 
-  if(lpFilename && nSize)
-    lpFilename[0] = '\0';
 
-  return 0;
+    if(lpFilename && nSize)
+        lpFilename[0] = '\0';
+
+    return 0;
 }
 
 /***********************************************************************
  *           GetMappedFileNameA (PSAPI.@)
  */
 DWORD WINAPI GetMappedFileNameA(
-  HANDLE hProcess, LPVOID lpv, LPSTR lpFilename, DWORD nSize)
+    HANDLE  hProcess, 
+    LPVOID  lpv, 
+    LPSTR   lpFilename, 
+    DWORD   nSize)
 {
-  FIXME("(hProcess=0x%08x, %p, %s, %ld): stub\n",
-    hProcess, lpv, debugstr_a(lpFilename), nSize
-  );
+    FIXME("(hProcess = 0x%08x, lpv = %p, lpFilename = %p, nSize = %ld): stub\n",
+            hProcess, lpv, lpFilename, nSize);
 
-  if(lpFilename && nSize)
-    lpFilename[0] = '\0';
 
-  return 0;
+    if(lpFilename && nSize)
+        lpFilename[0] = '\0';
+
+    return 0;
 }
 
 /***********************************************************************
  *           GetMappedFileNameW (PSAPI.@)
  */
 DWORD WINAPI GetMappedFileNameW(
-  HANDLE hProcess, LPVOID lpv, LPWSTR lpFilename, DWORD nSize)
+    HANDLE  hProcess, 
+    LPVOID  lpv, 
+    LPWSTR  lpFilename, 
+    DWORD   nSize)
 {
-  FIXME("(hProcess=0x%08x, %p, %s, %ld): stub\n",
-    hProcess, lpv, debugstr_w(lpFilename), nSize
-  );
+    FIXME("(hProcess = 0x%08x, lpv = %p, lpFilename = %p, nSize = %ld): stub\n",
+            hProcess, lpv, lpFilename, nSize);
 
-  if(lpFilename && nSize)
-    lpFilename[0] = '\0';
 
-  return 0;
+    if(lpFilename && nSize)
+        lpFilename[0] = '\0';
+
+    return 0;
 }
 
 
@@ -382,7 +399,7 @@
   BOOL ret, res;
   DWORD errcode;
 
-  TRACE("(hProcess=0x%08x,hModule=0x%08x, %p, %ld)\n",
+  TRACE("(hProcess = 0x%08x, hModule = 0x%08x, lpmodinfo = %p, cb = %ld)\n",
         hProcess, hModule, lpmodinfo, cb);
 
   memset(lpmodinfo, 0, cb);
@@ -443,30 +460,32 @@
  *           GetProcessMemoryInfo (PSAPI.@)
  */
 BOOL WINAPI GetProcessMemoryInfo(
-  HANDLE Process, PPROCESS_MEMORY_COUNTERS ppsmemCounters, DWORD cb)
+    HANDLE                      Process, 
+    PPROCESS_MEMORY_COUNTERS    ppsmemCounters, 
+    DWORD                       cb)
 {
-  FIXME("(hProcess=0x%08x, %p, %ld): stub\n",
-    Process, ppsmemCounters, cb
-  );
+    FIXME("(hProcess = 0x%08x, ppsmemCounters = %p, cb = %ld): stub\n",
+            Process, ppsmemCounters, cb);
 
-  memset(ppsmemCounters, 0, cb);
+    memset(ppsmemCounters, 0, cb);
 
-  return TRUE;
+    return TRUE;
 }
 
 /***********************************************************************
  *           GetWsChanges (PSAPI.@)
  */
 BOOL WINAPI GetWsChanges(
-  HANDLE hProcess, PPSAPI_WS_WATCH_INFORMATION lpWatchInfo, DWORD cb)
+    HANDLE                      hProcess, 
+    PPSAPI_WS_WATCH_INFORMATION lpWatchInfo, 
+    DWORD                       cb)
 {
-  FIXME("(hProcess=0x%08x, %p, %ld): stub\n",
-    hProcess, lpWatchInfo, cb
-  );
+    FIXME("(hProcess = 0x%08x, lpWatchInfo = %p, cb = %ld): stub\n",
+            hProcess, lpWatchInfo, cb);
 
-  memset(lpWatchInfo, 0, cb);
+    memset(lpWatchInfo, 0, cb);
 
-  return TRUE;
+    return TRUE;
 }
 
 /***********************************************************************
@@ -474,9 +493,9 @@
  */
 BOOL WINAPI InitializeProcessForWsWatch(HANDLE hProcess)
 {
-  FIXME("(hProcess=0x%08x): stub\n", hProcess);
+    FIXME("(hProcess = 0x%08x): stub\n", hProcess);
 
-  return TRUE;
+    return TRUE;
 }
 
 /***********************************************************************
@@ -487,10 +506,10 @@
  */
 BOOL WINAPI QueryWorkingSet(HANDLE hProcess, LPVOID pv, DWORD cb)
 {
-  FIXME("(hProcess=0x%08x, %p, %ld)\n", hProcess, pv, cb);
+    FIXME("(hProcess = 0x%08x, pv = %p, cb = %ld)\n", hProcess, pv, cb);
 
-  if(pv && cb)
-    ((DWORD *) pv)[0] = 0; /* Empty WorkingSet */
+    if(pv && cb)
+        ((DWORD *) pv)[0] = 0; /* Empty WorkingSet */
 
-  return TRUE;
+    return TRUE;
 }