Commit 41dd56cb authored by Michael Stefaniuc's avatar Michael Stefaniuc Committed by Alexandre Julliard

"One liners" printf format warning fixes for the migration of DWORD/LONG/ULONG from long to int.

parent 705b5a00
......@@ -69,7 +69,7 @@ HWND VFWAPI capCreateCaptureWindowW(LPCWSTR lpszWindowName, DWORD dwStyle, INT x
INT y, INT nWidth, INT nHeight, HWND hWnd,
INT nID)
{
FIXME("%s, %08lx, %08x, %08x, %08x, %08x, %p, %08x\n",
FIXME("%s, %08x, %08x, %08x, %08x, %08x, %p, %08x\n",
debugstr_w(lpszWindowName), dwStyle,
x, y, nWidth, nHeight, hWnd, nID);
return 0;
......
......@@ -41,7 +41,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(compstui);
*/
BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
{
TRACE("(%p, %ld, %p)\n",hinstDLL, fdwReason, lpvReserved);
TRACE("(%p, %d, %p)\n",hinstDLL, fdwReason, lpvReserved);
switch(fdwReason)
{
......
......@@ -86,7 +86,7 @@ static void convert_struct_stat( struct crtdll_stat *dst, const struct _stat *sr
*/
BOOL WINAPI DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvReserved)
{
TRACE("(%p,%ld,%p)\n",hinstDLL,fdwReason,lpvReserved);
TRACE("(%p,%d,%p)\n",hinstDLL,fdwReason,lpvReserved);
if (fdwReason == DLL_PROCESS_ATTACH)
{
......
......@@ -29,7 +29,7 @@ HMODULE CRYPTDLL_hModule = 0;
BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
{
TRACE("%p,%lx,%p\n", hinstDLL, fdwReason, lpvReserved);
TRACE("%p,%x,%p\n", hinstDLL, fdwReason, lpvReserved);
switch (fdwReason) {
case DLL_WINE_PREATTACH:
......
......@@ -27,7 +27,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(cryptnet);
BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
{
TRACE("(0x%p, %ld, %p)\n", hinstDLL, fdwReason, lpvReserved);
TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved);
switch (fdwReason) {
case DLL_WINE_PREATTACH:
......
......@@ -34,7 +34,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dpnhpast);
*/
BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
{
TRACE("(%p, %ld, %p)\n",hinstDLL,fdwReason,lpvReserved);
TRACE("(%p, %d, %p)\n",hinstDLL,fdwReason,lpvReserved);
if (fdwReason == DLL_PROCESS_ATTACH)
{
......
......@@ -36,7 +36,7 @@ HINSTANCE GPHOTO2_instance;
BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
{
TRACE("%p,%lx,%p\n", hinstDLL, fdwReason, lpvReserved);
TRACE("%p,%x,%p\n", hinstDLL, fdwReason, lpvReserved);
switch (fdwReason)
{
......
......@@ -56,7 +56,7 @@ static void test_HlinkIsShortcut(void)
for(i=0; i<sizeof(shortcut_test)/sizeof(shortcut_test[0]); i++) {
hres = HlinkIsShortcut(shortcut_test[i].file);
ok(hres == shortcut_test[i].hres, "[%d] HlinkIsShortcut returned %08lx, expected %08lx\n",
ok(hres == shortcut_test[i].hres, "[%d] HlinkIsShortcut returned %08x, expected %08x\n",
i, hres, shortcut_test[i].hres);
}
}
......
......@@ -45,7 +45,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(localspl);
*/
BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
{
TRACE("(%p, %ld, %p)\n",hinstDLL, fdwReason, lpvReserved);
TRACE("(%p, %d, %p)\n",hinstDLL, fdwReason, lpvReserved);
switch(fdwReason)
{
......
......@@ -37,7 +37,7 @@ BOOL WINAPI MMDEVLDR_DeviceIoControl(DWORD dwIoControlCode,
LPDWORD lpcbBytesReturned,
LPOVERLAPPED lpOverlapped)
{
FIXME("(%ld,%p,%ld,%p,%ld,%p,%p): stub\n",
FIXME("(%d,%p,%d,%p,%d,%p,%p): stub\n",
dwIoControlCode,
lpvInBuffer,cbInBuffer,
lpvOutBuffer,cbOutBuffer,
......
......@@ -46,7 +46,7 @@ BOOL WINAPI MONODEBG_DeviceIoControl(DWORD dwIoControlCode,
ERR("%s\n",debugstr_a(lpvInBuffer));
break;
default:
FIXME("(%ld,%p,%ld,%p,%ld,%p,%p): stub\n",
FIXME("(%d,%p,%d,%p,%d,%p,%p): stub\n",
dwIoControlCode,
lpvInBuffer,cbInBuffer,
lpvOutBuffer,cbOutBuffer,
......
......@@ -30,7 +30,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mprapi);
*/
BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID reserved)
{
TRACE("(%p, %ld, %p)\n", hinst, reason, reserved);
TRACE("(%p, %d, %p)\n", hinst, reason, reserved);
switch(reason)
{
......
......@@ -60,7 +60,7 @@ BOOL WINAPI DllMain(
DWORD fdwReason,
LPVOID lpvReserved )
{
TRACE("(%p,%ld,%p)\n",hInstDLL,fdwReason,lpvReserved);
TRACE("(%p,%d,%p)\n",hInstDLL,fdwReason,lpvReserved);
switch ( fdwReason )
{
......
......@@ -46,6 +46,6 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved )
*/
LONG WINAPI MSNET32_57( LONG a1, LONG a2, LPVOID a3, LONG a4, LPVOID a5 )
{
FIXME("(0x%04lx 0x%04lx %p 0x%04lx %p): stub\n", a1, a2, a3, a4, a5);
FIXME("(0x%04x 0x%04x %p 0x%04x %p): stub\n", a1, a2, a3, a4, a5);
return -1; /* FAILURE */
}
......@@ -41,7 +41,7 @@ static int init_functions(void)
HMODULE hModule = LoadLibraryA("msvcrtd.dll");
if (!hModule) {
trace("LoadLibraryA failed to load msvcrtd.dll with GLE=%ld\n", GetLastError());
trace("LoadLibraryA failed to load msvcrtd.dll with GLE=%d\n", GetLastError());
return FALSE;
}
......
......@@ -31,7 +31,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ntdsapi);
*/
BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID reserved)
{
TRACE("(%p, %ld, %p)\n", hinst, reason, reserved);
TRACE("(%p, %d, %p)\n", hinst, reason, reserved);
switch(reason)
{
......
......@@ -36,7 +36,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(odbc);
BOOL WINAPI ODBCCPlApplet( LONG i, LONG j, LONG * p1, LONG * p2)
{
FIXME( "( %ld %ld %p %p) : stub!\n", i, j, p1, p2);
FIXME( "( %d %d %p %p) : stub!\n", i, j, p1, p2);
return FALSE;
}
......
......@@ -39,7 +39,7 @@ HINSTANCE OLEDLG_hInstance = 0;
*/
BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad)
{
TRACE("%p 0x%lx %p\n", hinstDLL, fdwReason, fImpLoad);
TRACE("%p 0x%x %p\n", hinstDLL, fdwReason, fImpLoad);
switch(fdwReason) {
case DLL_PROCESS_ATTACH:
......
......@@ -35,7 +35,7 @@ HINSTANCE SANE_instance;
BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
{
TRACE("%p,%lx,%p\n", hinstDLL, fdwReason, lpvReserved);
TRACE("%p,%x,%p\n", hinstDLL, fdwReason, lpvReserved);
switch (fdwReason)
{
......
......@@ -48,7 +48,7 @@ HMODULE SENSAPI_hModule = 0;
BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
{
TRACE("%p,%lx,%p\n", hinstDLL, fdwReason, lpvReserved);
TRACE("%p,%x,%p\n", hinstDLL, fdwReason, lpvReserved);
switch (fdwReason) {
case DLL_PROCESS_ATTACH:
......
......@@ -36,7 +36,7 @@ BOOL WINAPI DllMain(
DWORD fdwReason,
LPVOID lpvReserved)
{
TRACE("(%p,%ld,%p)\n", hInstDLL, fdwReason, lpvReserved);
TRACE("(%p,%d,%p)\n", hInstDLL, fdwReason, lpvReserved);
switch(fdwReason) {
case DLL_WINE_PREATTACH:
......
......@@ -35,7 +35,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(svrapi);
*/
BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad)
{
TRACE("%p 0x%lx %p\n", hinstDLL, fdwReason, fImpLoad);
TRACE("%p 0x%x %p\n", hinstDLL, fdwReason, fImpLoad);
switch(fdwReason) {
case DLL_WINE_PREATTACH:
......
......@@ -45,7 +45,7 @@ static activeDS *TWAIN_LookupSource (pTW_IDENTITY pDest)
BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
{
TRACE("%p,%lx,%p\n", hinstDLL, fdwReason, lpvReserved);
TRACE("%p,%x,%p\n", hinstDLL, fdwReason, lpvReserved);
switch (fdwReason)
{
......
......@@ -31,7 +31,7 @@ WINE_DEFAULT_DEBUG_CHANNEL( userenv );
BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
{
TRACE("%p %ld %p\n", hinstDLL, fdwReason, lpvReserved);
TRACE("%p %d %p\n", hinstDLL, fdwReason, lpvReserved);
switch (fdwReason)
{
......
......@@ -62,7 +62,7 @@ BOOL WINAPI VDHCP_DeviceIoControl(DWORD dwIoControlCode, LPVOID lpvInBuffer,
break;
default:
FIXME("(%ld,%p,%ld,%p,%ld,%p,%p): stub\n",
FIXME("(%d,%p,%d,%p,%d,%p,%p): stub\n",
dwIoControlCode,
lpvInBuffer,cbInBuffer,
lpvOutBuffer,cbOutBuffer,
......
......@@ -155,7 +155,7 @@ BOOL WINAPI VNBT_DeviceIoControl(DWORD dwIoControlCode,
* to unimplemented...
*/
default:
FIXME( "Unimplemented control %ld for VxD device VNB\n",
FIXME( "Unimplemented control %d for VxD device VNB\n",
dwIoControlCode );
error = ERROR_NOT_SUPPORTED;
break;
......
......@@ -39,7 +39,7 @@ BOOL WINAPI VNETBIOS_DeviceIoControl( DWORD code, LPVOID lpvInBuffer, DWORD cbIn
Netbios(lpvInBuffer);
return TRUE;
default:
FIXME("(%ld,%p,%ld,%p,%ld,%p,%p): stub\n",
FIXME("(%d,%p,%d,%p,%d,%p,%p): stub\n",
code, lpvInBuffer,cbInBuffer, lpvOutBuffer,cbOutBuffer,
lpcbBytesReturned, lpOverlapped);
return FALSE;
......
......@@ -42,7 +42,7 @@ BOOL WINAPI VTDAPI_DeviceIoControl( DWORD code, LPVOID lpvInBuffer, DWORD cbInBu
return TRUE;
default:
FIXME( "Control %ld not implemented\n", code);
FIXME( "Control %d not implemented\n", code);
return FALSE;
}
}
......@@ -400,7 +400,7 @@ static LRESULT JSTCK_GetPosEx(DWORD_PTR dwDevID, LPJOYINFOEX lpInfo)
lpInfo->dwButtons = js.buttons;
#endif
TRACE("x: %ld, y: %ld, z: %ld, r: %ld, u: %ld, v: %ld, buttons: 0x%04x, flags: 0x%04x (fd %d)\n",
TRACE("x: %d, y: %d, z: %d, r: %d, u: %d, v: %d, buttons: 0x%04x, flags: 0x%04x (fd %d)\n",
lpInfo->dwXpos, lpInfo->dwYpos, lpInfo->dwZpos,
lpInfo->dwRpos, lpInfo->dwUpos, lpInfo->dwVpos,
(unsigned int)lpInfo->dwButtons,
......
......@@ -47,6 +47,6 @@ int main(int argc, char *argv[])
ret = LZCopy(hSourceFile, hDestFile);
LZClose(hSourceFile);
LZClose(hDestFile);
if (ret <= 0) fprintf(stderr,"LZCopy failed: return is %ld\n",ret);
if (ret <= 0) fprintf(stderr,"LZCopy failed: return is %d\n",ret);
return (ret <= 0);
}
......@@ -80,7 +80,7 @@ static unsigned long create_desktop( const char *name, unsigned int width, unsig
desktop = CreateDesktopA( name, NULL, NULL, 0, DESKTOP_ALL_ACCESS, NULL );
if (!desktop)
{
WINE_ERR( "failed to create desktop %s error %ld\n", wine_dbgstr_a(name), GetLastError() );
WINE_ERR( "failed to create desktop %s error %d\n", wine_dbgstr_a(name), GetLastError() );
ExitProcess( 1 );
}
/* magic: desktop "root" means use the X11 root window */
......
......@@ -710,7 +710,7 @@ int main(int argc, char **argv)
LogFileName = argvW[i];
if(MsiEnableLogW(LogMode, LogFileName, LogAttributes) != ERROR_SUCCESS)
{
fprintf(stderr, "Logging in %s (0x%08lx, %lu) failed\n",
fprintf(stderr, "Logging in %s (0x%08x, %u) failed\n",
wine_dbgstr_w(LogFileName), LogMode, LogAttributes);
ExitProcess(1);
}
......
......@@ -256,7 +256,7 @@ static void UninstallProgram(void)
{ /* wait for the process to exit */
WaitForSingleObject(info.hProcess, INFINITE);
res = GetExitCodeProcess(info.hProcess, &exit_code);
WINE_TRACE("%d: %08lx\n", res, exit_code);
WINE_TRACE("%d: %08x\n", res, exit_code);
}
else
{
......
......@@ -514,7 +514,7 @@ unsigned long lhash_val_of_name_sys( syskind_t skind, LCID lcid, LPCSTR lpStr)
switch (PRIMARYLANGID(LANGIDFROMLCID(lcid)))
{
default:
fprintf(stderr, "Unknown lcid %lx, treating as latin-based, please report\n", lcid);
fprintf(stderr, "Unknown lcid %x, treating as latin-based, please report\n", lcid);
/* .. Fall Through .. */
case LANG_AFRIKAANS: case LANG_ALBANIAN: case LANG_ARMENIAN:
case LANG_ASSAMESE: case LANG_AZERI: case LANG_BASQUE:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment