Hello, this is the last of the trivial patches where only the format strings needed to be changed. License: LGPL, X11 Changelog: Michael Stefaniuc <mstefani@redhat.com> - Compile the winspool dll with STRICT defined bye michael -- Michael Stefaniuc Tel.: +49-711-96437-199 System Administration Fax.: +49-711-96437-111 Red Hat GmbH Email: mstefani@redhat.com Hauptstaetterstr. 58 http://www.redhat.de/ D-70178 Stuttgart
Index: Makefile.in
===================================================================
RCS file: /home/wine/wine/dlls/winspool/Makefile.in,v
retrieving revision 1.20
diff -u -r1.20 Makefile.in
--- Makefile.in 18 Oct 2002 23:46:28 -0000 1.20
+++ Makefile.in 21 Oct 2002 23:26:19 -0000
@@ -1,4 +1,4 @@
-EXTRADEFS = -D_SPOOL32_ -DWINE_NO_STRICT
+EXTRADEFS = -D_SPOOL32_
TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
Index: info.c
===================================================================
RCS file: /home/wine/wine/dlls/winspool/info.c,v
retrieving revision 1.59
diff -u -r1.59 info.c
--- info.c 4 Oct 2002 00:27:10 -0000 1.59
+++ info.c 21 Oct 2002 23:26:20 -0000
@@ -658,7 +658,7 @@
LPSTR lpName = pDeviceName;
LONG ret;
- TRACE("(%d,%d,%s,%p,%p,%ld)\n",
+ TRACE("(%p,%p,%s,%p,%p,%ld)\n",
hWnd,hPrinter,pDeviceName,pDevModeOutput,pDevModeInput,fMode
);
@@ -703,7 +703,7 @@
LPDEVMODEA pDevModeOutputA = NULL;
LONG ret;
- TRACE("(%d,%d,%s,%p,%p,%ld)\n",
+ TRACE("(%p,%p,%s,%p,%p,%ld)\n",
hWnd,hPrinter,debugstr_w(pDeviceName),pDevModeOutput,pDevModeInput,
fMode);
if(pDevModeOutput) {
@@ -848,7 +848,7 @@
BOOL WINAPI
DeletePortA (LPSTR pName, HWND hWnd, LPSTR pPortName)
{
- FIXME("(%s,0x%08x,%s):stub\n",debugstr_a(pName),hWnd,
+ FIXME("(%s,%p,%s):stub\n",debugstr_a(pName),hWnd,
debugstr_a(pPortName));
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
@@ -889,7 +889,7 @@
*/
BOOL WINAPI AddFormA(HANDLE hPrinter, DWORD Level, LPBYTE pForm)
{
- FIXME("(%d,%ld,%p): stub\n", hPrinter, Level, pForm);
+ FIXME("(%p,%ld,%p): stub\n", hPrinter, Level, pForm);
return 1;
}
@@ -898,7 +898,7 @@
*/
BOOL WINAPI AddFormW(HANDLE hPrinter, DWORD Level, LPBYTE pForm)
{
- FIXME("(%d,%ld,%p): stub\n", hPrinter, Level, pForm);
+ FIXME("(%p,%ld,%p): stub\n", hPrinter, Level, pForm);
return 1;
}
@@ -908,7 +908,7 @@
BOOL WINAPI AddJobA(HANDLE hPrinter, DWORD Level, LPBYTE pData,
DWORD cbBuf, LPDWORD pcbNeeded)
{
- FIXME("(%d,%ld,%p,%ld,%p): stub\n", hPrinter, Level, pData, cbBuf,
+ FIXME("(%p,%ld,%p,%ld,%p): stub\n", hPrinter, Level, pData, cbBuf,
pcbNeeded);
return 1;
}
@@ -919,7 +919,7 @@
BOOL WINAPI AddJobW(HANDLE hPrinter, DWORD Level, LPBYTE pData, DWORD cbBuf,
LPDWORD pcbNeeded)
{
- FIXME("(%d,%ld,%p,%ld,%p): stub\n", hPrinter, Level, pData, cbBuf,
+ FIXME("(%p,%ld,%p,%ld,%p): stub\n", hPrinter, Level, pData, cbBuf,
pcbNeeded);
return 1;
}
@@ -1165,7 +1165,7 @@
{
int i = (int)hPrinter;
- TRACE("Handle %d\n", hPrinter);
+ TRACE("Handle %p\n", hPrinter);
if ((i <= 0) || (i > nb_printers)) return FALSE;
HeapFree( GetProcessHeap(), 0, printer_array[i - 1] );
@@ -1178,7 +1178,7 @@
*/
BOOL WINAPI DeleteFormA(HANDLE hPrinter, LPSTR pFormName)
{
- FIXME("(%d,%s): stub\n", hPrinter, pFormName);
+ FIXME("(%p,%s): stub\n", hPrinter, pFormName);
return 1;
}
@@ -1187,7 +1187,7 @@
*/
BOOL WINAPI DeleteFormW(HANDLE hPrinter, LPWSTR pFormName)
{
- FIXME("(%d,%s): stub\n", hPrinter, debugstr_w(pFormName));
+ FIXME("(%p,%s): stub\n", hPrinter, debugstr_w(pFormName));
return 1;
}
@@ -1223,7 +1223,7 @@
BOOL WINAPI SetPrinterA(HANDLE hPrinter, DWORD Level, LPBYTE pPrinter,
DWORD Command)
{
- FIXME("(%d,%ld,%p,%ld): stub\n",hPrinter,Level,pPrinter,Command);
+ FIXME("(%p,%ld,%p,%ld): stub\n",hPrinter,Level,pPrinter,Command);
return FALSE;
}
@@ -1233,7 +1233,7 @@
BOOL WINAPI SetJobA(HANDLE hPrinter, DWORD JobId, DWORD Level,
LPBYTE pJob, DWORD Command)
{
- FIXME("(%d,%ld,%ld,%p,%ld): stub\n",hPrinter,JobId,Level,pJob,
+ FIXME("(%p,%ld,%ld,%p,%ld): stub\n",hPrinter,JobId,Level,pJob,
Command);
return FALSE;
}
@@ -1244,7 +1244,7 @@
BOOL WINAPI SetJobW(HANDLE hPrinter, DWORD JobId, DWORD Level,
LPBYTE pJob, DWORD Command)
{
- FIXME("(%d,%ld,%ld,%p,%ld): stub\n",hPrinter,JobId,Level,pJob,
+ FIXME("(%p,%ld,%ld,%p,%ld): stub\n",hPrinter,JobId,Level,pJob,
Command);
return FALSE;
}
@@ -1255,7 +1255,7 @@
BOOL WINAPI GetFormA(HANDLE hPrinter, LPSTR pFormName, DWORD Level,
LPBYTE pForm, DWORD cbBuf, LPDWORD pcbNeeded)
{
- FIXME("(%d,%s,%ld,%p,%ld,%p): stub\n",hPrinter,pFormName,
+ FIXME("(%p,%s,%ld,%p,%ld,%p): stub\n",hPrinter,pFormName,
Level,pForm,cbBuf,pcbNeeded);
return FALSE;
}
@@ -1266,7 +1266,7 @@
BOOL WINAPI GetFormW(HANDLE hPrinter, LPWSTR pFormName, DWORD Level,
LPBYTE pForm, DWORD cbBuf, LPDWORD pcbNeeded)
{
- FIXME("(%d,%s,%ld,%p,%ld,%p): stub\n",hPrinter,
+ FIXME("(%p,%s,%ld,%p,%ld,%p): stub\n",hPrinter,
debugstr_w(pFormName),Level,pForm,cbBuf,pcbNeeded);
return FALSE;
}
@@ -1277,7 +1277,7 @@
BOOL WINAPI SetFormA(HANDLE hPrinter, LPSTR pFormName, DWORD Level,
LPBYTE pForm)
{
- FIXME("(%d,%s,%ld,%p): stub\n",hPrinter,pFormName,Level,pForm);
+ FIXME("(%p,%s,%ld,%p): stub\n",hPrinter,pFormName,Level,pForm);
return FALSE;
}
@@ -1287,7 +1287,7 @@
BOOL WINAPI SetFormW(HANDLE hPrinter, LPWSTR pFormName, DWORD Level,
LPBYTE pForm)
{
- FIXME("(%d,%p,%ld,%p): stub\n",hPrinter,pFormName,Level,pForm);
+ FIXME("(%p,%p,%ld,%p): stub\n",hPrinter,pFormName,Level,pForm);
return FALSE;
}
@@ -1297,7 +1297,7 @@
BOOL WINAPI ReadPrinter(HANDLE hPrinter, LPVOID pBuf, DWORD cbBuf,
LPDWORD pNoBytesRead)
{
- FIXME("(%d,%p,%ld,%p): stub\n",hPrinter,pBuf,cbBuf,pNoBytesRead);
+ FIXME("(%p,%p,%ld,%p): stub\n",hPrinter,pBuf,cbBuf,pNoBytesRead);
return FALSE;
}
@@ -1306,7 +1306,7 @@
*/
BOOL WINAPI ResetPrinterA(HANDLE hPrinter, LPPRINTER_DEFAULTSA pDefault)
{
- FIXME("(%d, %p): stub\n", hPrinter, pDefault);
+ FIXME("(%p, %p): stub\n", hPrinter, pDefault);
return FALSE;
}
@@ -1315,7 +1315,7 @@
*/
BOOL WINAPI ResetPrinterW(HANDLE hPrinter, LPPRINTER_DEFAULTSW pDefault)
{
- FIXME("(%d, %p): stub\n", hPrinter, pDefault);
+ FIXME("(%p, %p): stub\n", hPrinter, pDefault);
return FALSE;
}
@@ -1739,7 +1739,7 @@
HKEY hkeyPrinter, hkeyPrinters;
BOOL ret;
- TRACE("(%d,%ld,%p,%ld,%p)\n",hPrinter,Level,pPrinter,cbBuf, pcbNeeded);
+ TRACE("(%p,%ld,%p,%ld,%p)\n",hPrinter,Level,pPrinter,cbBuf, pcbNeeded);
if (!(name = WINSPOOL_GetOpenedPrinter(hPrinter))) return FALSE;
@@ -2264,7 +2264,7 @@
LPBYTE ptr = NULL;
HKEY hkeyPrinter, hkeyPrinters, hkeyDrivers;
- TRACE("(%d,%s,%ld,%p,%ld,%p)\n",hPrinter,debugstr_w(pEnvironment),
+ TRACE("(%p,%s,%ld,%p,%ld,%p)\n",hPrinter,debugstr_w(pEnvironment),
Level,pDriverInfo,cbBuf, pcbNeeded);
ZeroMemory(pDriverInfo, cbBuf);
@@ -2531,7 +2531,7 @@
BOOL WINAPI PrinterProperties(HWND hWnd, /* [in] handle to parent window */
HANDLE hPrinter /* [in] handle to printer object */
){
- FIXME("(%d,%d): stub\n", hWnd, hPrinter);
+ FIXME("(%p,%p): stub\n", hWnd, hPrinter);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return FALSE;
}
@@ -2798,7 +2798,7 @@
HKEY hkeyPrinter, hkeySubkey;
DWORD ret;
- TRACE("(%08x, %s, %s %08lx, %p, %08lx)\n", hPrinter, debugstr_a(pKeyName),
+ TRACE("(%p, %s, %s %08lx, %p, %08lx)\n", hPrinter, debugstr_a(pKeyName),
debugstr_a(pValueName), Type, pData, cbData);
if((ret = WINSPOOL_GetOpenedPrinterRegKey(hPrinter, &hkeyPrinter))
@@ -2827,7 +2827,7 @@
HKEY hkeyPrinter, hkeySubkey;
DWORD ret;
- TRACE("(%08x, %s, %s %08lx, %p, %08lx)\n", hPrinter, debugstr_w(pKeyName),
+ TRACE("(%p, %s, %s %08lx, %p, %08lx)\n", hPrinter, debugstr_w(pKeyName),
debugstr_w(pValueName), Type, pData, cbData);
if((ret = WINSPOOL_GetOpenedPrinterRegKey(hPrinter, &hkeyPrinter))
@@ -2876,7 +2876,7 @@
HKEY hkeyPrinter, hkeySubkey;
DWORD ret;
- TRACE("(%08x, %s, %s %p, %p, %08lx, %p)\n", hPrinter,
+ TRACE("(%p, %s, %s %p, %p, %08lx, %p)\n", hPrinter,
debugstr_a(pKeyName), debugstr_a(pValueName), pType, pData, nSize,
pcbNeeded);
@@ -2907,7 +2907,7 @@
HKEY hkeyPrinter, hkeySubkey;
DWORD ret;
- TRACE("(%08x, %s, %s %p, %p, %08lx, %p)\n", hPrinter,
+ TRACE("(%p, %s, %s %p, %p, %08lx, %p)\n", hPrinter,
debugstr_w(pKeyName), debugstr_w(pValueName), pType, pData, nSize,
pcbNeeded);
@@ -2964,7 +2964,7 @@
PBYTE lpValue;
PPRINTER_ENUM_VALUESW ppev;
- TRACE ("%08x %s\n", hPrinter, debugstr_w (pKeyName));
+ TRACE ("%p %s\n", hPrinter, debugstr_w (pKeyName));
if (pKeyName == NULL || *pKeyName == 0)
return ERROR_INVALID_PARAMETER;
@@ -2972,7 +2972,7 @@
ret = WINSPOOL_GetOpenedPrinterRegKey (hPrinter, &hkPrinter);
if (ret != ERROR_SUCCESS)
{
- TRACE ("WINSPOOL_GetOpenedPrinterRegKey (%08x) returned %li\n",
+ TRACE ("WINSPOOL_GetOpenedPrinterRegKey (%p) returned %li\n",
hPrinter, ret);
return ret;
}
@@ -2983,7 +2983,7 @@
r = RegCloseKey (hkPrinter);
if (r != ERROR_SUCCESS)
WARN ("RegCloseKey returned %li\n", r);
- TRACE ("RegOpenKeyExW (%08x, %s) returned %li\n", hPrinter,
+ TRACE ("RegOpenKeyExW (%p, %s) returned %li\n", hPrinter,
debugstr_w (pKeyName), ret);
return ret;
}
@@ -3005,7 +3005,7 @@
r = RegCloseKey (hkSubKey);
if (r != ERROR_SUCCESS)
WARN ("RegCloseKey returned %li\n", r);
- TRACE ("RegQueryInfoKeyW (%08x) returned %li\n", hkSubKey, ret);
+ TRACE ("RegQueryInfoKeyW (%p) returned %li\n", hkSubKey, ret);
return ret;
}
@@ -3199,7 +3199,7 @@
HANDLE hHeap;
LPSTR pBuffer;
- TRACE ("%08x %s\n", hPrinter, pKeyName);
+ TRACE ("%p %s\n", hPrinter, pKeyName);
if (pKeyName == NULL || *pKeyName == 0)
return ERROR_INVALID_PARAMETER;
Attachment:
pgp00066.pgp
Description: PGP signature
