October 2006 - Wine-commits

Michael Stefaniuc : netapi32: Win64 printf format warning fixes.
by Alexandre Julliard 09 Oct '06

09 Oct '06

Module: wine Branch: master Commit: 611220d554e0a908b0b6933beb5d0fda299b87ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=611220d554e0a908b0b6933be… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Oct 8 19:35:50 2006 +0200 netapi32: Win64 printf format warning fixes. --- dlls/netapi32/tests/Makefile.in | 1 - dlls/netapi32/tests/access.c | 18 +++++++++--------- dlls/netapi32/tests/apibuf.c | 4 ++-- dlls/netapi32/tests/ds.c | 16 ++++++++-------- dlls/netapi32/tests/wksta.c | 8 ++++---- 5 files changed, 23 insertions(+), 24 deletions(-) diff --git a/dlls/netapi32/tests/Makefile.in b/dlls/netapi32/tests/Makefile.in index 7abb0da..3c8971a 100644 --- a/dlls/netapi32/tests/Makefile.in +++ b/dlls/netapi32/tests/Makefile.in @@ -4,7 +4,6 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ TESTDLL = netapi32.dll IMPORTS = netapi32 advapi32 kernel32 -EXTRADEFS = -DWINE_NO_LONG_AS_INT CTESTS = \ access.c \ diff --git a/dlls/netapi32/tests/access.c b/dlls/netapi32/tests/access.c index 7816aa8..b625c37 100644 --- a/dlls/netapi32/tests/access.c +++ b/dlls/netapi32/tests/access.c @@ -79,7 +79,7 @@ static void run_usergetinfo_tests(void) /* Level 0 */ rc=pNetUserGetInfo(NULL, sAdminUserName, 0, (LPBYTE *)&ui0); if (rc != NERR_Success) { - trace ("Aborting usergetinfo_tests(). NetUserGetInfo: rc=%ld\n", rc); + trace ("Aborting usergetinfo_tests(). NetUserGetInfo: rc=%d\n", rc); return; } ok(!lstrcmpW(sAdminUserName, ui0->usri0_name), "This is really user name\n"); @@ -90,7 +90,7 @@ static void run_usergetinfo_tests(void) /* Level 10 */ rc=pNetUserGetInfo(NULL, sAdminUserName, 10, (LPBYTE *)&ui10); - ok(rc == NERR_Success, "NetUserGetInfo: rc=%ld\n", rc); + ok(rc == NERR_Success, "NetUserGetInfo: rc=%d\n", rc); ok(!lstrcmpW(sAdminUserName, ui10->usri10_name), "This is really user name\n"); pNetApiBufferSize(ui10, &dwSize); ok(dwSize >= (sizeof(USER_INFO_10) + @@ -105,22 +105,22 @@ static void run_usergetinfo_tests(void) /* errors handling */ rc=pNetUserGetInfo(NULL, sAdminUserName, 10000, (LPBYTE *)&ui0); - ok(rc == ERROR_INVALID_LEVEL,"Invalid Level: rc=%ld\n",rc); + ok(rc == ERROR_INVALID_LEVEL,"Invalid Level: rc=%d\n",rc); rc=pNetUserGetInfo(NULL, sNonexistentUser, 0, (LPBYTE *)&ui0); - ok(rc == NERR_UserNotFound,"Invalid User Name: rc=%ld\n",rc); + ok(rc == NERR_UserNotFound,"Invalid User Name: rc=%d\n",rc); todo_wine { /* FIXME - Currently Wine can't verify whether the network path is good or bad */ rc=pNetUserGetInfo(sBadNetPath, sAdminUserName, 0, (LPBYTE *)&ui0); ok(rc == ERROR_BAD_NETPATH || rc == ERROR_NETWORK_UNREACHABLE, - "Bad Network Path: rc=%ld\n",rc); + "Bad Network Path: rc=%d\n",rc); } rc=pNetUserGetInfo(sEmptyStr, sAdminUserName, 0, (LPBYTE *)&ui0); ok(rc == ERROR_BAD_NETPATH || rc == NERR_Success, - "Bad Network Path: rc=%ld\n",rc); + "Bad Network Path: rc=%d\n",rc); rc=pNetUserGetInfo(sInvalidName, sAdminUserName, 0, (LPBYTE *)&ui0); - ok(rc == ERROR_INVALID_NAME,"Invalid Server Name: rc=%ld\n",rc); + ok(rc == ERROR_INVALID_NAME,"Invalid Server Name: rc=%d\n",rc); rc=pNetUserGetInfo(sInvalidName2, sAdminUserName, 0, (LPBYTE *)&ui0); - ok(rc == ERROR_INVALID_NAME,"Invalid Server Name: rc=%ld\n",rc); + ok(rc == ERROR_INVALID_NAME,"Invalid Server Name: rc=%d\n",rc); } /* checks Level 1 of NetQueryDisplayInformation */ @@ -177,7 +177,7 @@ static void run_usermodalsget_tests(void USER_MODALS_INFO_2 * umi2 = NULL; rc = pNetUserModalsGet(NULL, 2, (LPBYTE *)&umi2); - ok(rc == ERROR_SUCCESS, "NetUserModalsGet failed, rc = %ld\n", rc); + ok(rc == ERROR_SUCCESS, "NetUserModalsGet failed, rc = %d\n", rc); if (umi2) pNetApiBufferFree(umi2); diff --git a/dlls/netapi32/tests/apibuf.c b/dlls/netapi32/tests/apibuf.c index 871a4d3..4ef99c9 100644 --- a/dlls/netapi32/tests/apibuf.c +++ b/dlls/netapi32/tests/apibuf.c @@ -83,13 +83,13 @@ static void run_apibuf_tests(void) SetLastError(0xdeadbeef); res = pNetApiBufferAllocate(0, (LPVOID *)NULL); ok( (res == ERROR_INVALID_PARAMETER) && (GetLastError() == 0xdeadbeef), - "returned %ld with 0x%lx (expected ERROR_INVALID_PARAMETER with " \ + "returned %d with 0x%x (expected ERROR_INVALID_PARAMETER with " \ "0xdeadbeef)\n", res, GetLastError()); SetLastError(0xdeadbeef); res = pNetApiBufferAllocate(1024, (LPVOID *)NULL); ok( (res == ERROR_INVALID_PARAMETER) && (GetLastError() == 0xdeadbeef), - "returned %ld with 0x%lx (expected ERROR_INVALID_PARAMETER with " \ + "returned %d with 0x%x (expected ERROR_INVALID_PARAMETER with " \ "0xdeadbeef)\n", res, GetLastError()); } diff --git a/dlls/netapi32/tests/ds.c b/dlls/netapi32/tests/ds.c index 870afb1..7d0413d 100644 --- a/dlls/netapi32/tests/ds.c +++ b/dlls/netapi32/tests/ds.c @@ -36,18 +36,18 @@ static void test_params(void) SetLastError(0xdeadbeef); ret = pDsRoleGetPrimaryDomainInformation(NULL, DsRolePrimaryDomainInfoBasic, NULL); - ok( ret == ERROR_INVALID_PARAMETER, "Expected error ERROR_INVALID_PARAMETER, got (%ld)\n", ret); + ok( ret == ERROR_INVALID_PARAMETER, "Expected error ERROR_INVALID_PARAMETER, got (%d)\n", ret); SetLastError(0xdeadbeef); ret = pDsRoleGetPrimaryDomainInformation(NULL, 0, NULL); - ok( ret == ERROR_INVALID_PARAMETER, "Expected error ERROR_INVALID_PARAMETER, got (%ld)\n", ret); + ok( ret == ERROR_INVALID_PARAMETER, "Expected error ERROR_INVALID_PARAMETER, got (%d)\n", ret); SetLastError(0xdeadbeef); ret = pDsRoleGetPrimaryDomainInformation(NULL, 4, NULL); - ok( ret == ERROR_INVALID_PARAMETER, "Expected error ERROR_INVALID_PARAMETER, got (%ld)\n", ret); + ok( ret == ERROR_INVALID_PARAMETER, "Expected error ERROR_INVALID_PARAMETER, got (%d)\n", ret); SetLastError(0xdeadbeef); ret = pDsRoleGetPrimaryDomainInformation(NULL, 4, (PBYTE *)&dpdi); - ok( ret == ERROR_INVALID_PARAMETER, "Expected error ERROR_INVALID_PARAMETER, got (%ld)\n", ret); + ok( ret == ERROR_INVALID_PARAMETER, "Expected error ERROR_INVALID_PARAMETER, got (%d)\n", ret); } static void test_get(void) @@ -59,17 +59,17 @@ static void test_get(void) SetLastError(0xdeadbeef); ret = pDsRoleGetPrimaryDomainInformation(NULL, DsRolePrimaryDomainInfoBasic, (PBYTE *)&dpdi); - ok( ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got (%ld)\n", ret); + ok( ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got (%d)\n", ret); pDsRoleFreeMemory(&dpdi); SetLastError(0xdeadbeef); ret = pDsRoleGetPrimaryDomainInformation(NULL, DsRoleUpgradeStatus, (PBYTE *)&dusi); - todo_wine { ok( ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got (%ld)\n", ret); } + todo_wine { ok( ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got (%d)\n", ret); } pDsRoleFreeMemory(&dusi); SetLastError(0xdeadbeef); ret = pDsRoleGetPrimaryDomainInformation(NULL, DsRoleOperationState, (PBYTE *)&dosi); - todo_wine { ok( ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got (%ld)\n", ret); } + todo_wine { ok( ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got (%d)\n", ret); } pDsRoleFreeMemory(&dosi); } @@ -86,7 +86,7 @@ START_TEST(ds) pDsRoleGetPrimaryDomainInformation=(void*)GetProcAddress(hnetapi32,"DsRoleGetPrimaryDomainInformation"); if (!pDsRoleGetPrimaryDomainInformation) { - trace("DsRoleGetPrimaryDomainInformation not implemented : (%ld), stop testing\n", GetLastError()); + trace("DsRoleGetPrimaryDomainInformation not implemented : (%d), stop testing\n", GetLastError()); return; } pDsRoleFreeMemory=(void*)GetProcAddress(hnetapi32,"DsRoleFreeMemory"); diff --git a/dlls/netapi32/tests/wksta.c b/dlls/netapi32/tests/wksta.c index 3e9a501..f8e9bb0 100644 --- a/dlls/netapi32/tests/wksta.c +++ b/dlls/netapi32/tests/wksta.c @@ -135,7 +135,7 @@ static void run_wkstatransportenum_tests apiReturn = pNetWkstaTransportEnum(NULL, 1, NULL, MAX_PREFERRED_LENGTH, NULL, &totalEntries, NULL); ok(apiReturn == ERROR_INVALID_LEVEL || apiReturn == ERROR_INVALID_PARAMETER, - "NetWkstaTransportEnum returned %ld\n", apiReturn); + "NetWkstaTransportEnum returned %d\n", apiReturn); /* 2nd check: is param 5 passed? (only if level passes?) */ apiReturn = pNetWkstaTransportEnum(NULL, 0, NULL, MAX_PREFERRED_LENGTH, @@ -146,13 +146,13 @@ static void run_wkstatransportenum_tests return; ok(apiReturn == STATUS_ACCESS_VIOLATION || apiReturn == ERROR_INVALID_PARAMETER, - "NetWkstaTransportEnum returned %ld\n", apiReturn); + "NetWkstaTransportEnum returned %d\n", apiReturn); /* 3rd check: is param 3 passed? */ apiReturn = pNetWkstaTransportEnum(NULL, 0, NULL, MAX_PREFERRED_LENGTH, NULL, NULL, NULL); ok(apiReturn == STATUS_ACCESS_VIOLATION || apiReturn == RPC_X_NULL_REF_POINTER || apiReturn == ERROR_INVALID_PARAMETER, - "NetWkstaTransportEnum returned %ld\n", apiReturn); + "NetWkstaTransportEnum returned %d\n", apiReturn); /* 4th check: is param 6 passed? */ apiReturn = pNetWkstaTransportEnum(NULL, 0, &bufPtr, MAX_PREFERRED_LENGTH, @@ -163,7 +163,7 @@ static void run_wkstatransportenum_tests apiReturn = pNetWkstaTransportEnum(NULL, 0, &bufPtr, MAX_PREFERRED_LENGTH, &entriesRead, &totalEntries, NULL); ok(apiReturn == NERR_Success || apiReturn == ERROR_NETWORK_UNREACHABLE, - "NetWkstaTransportEnum returned %ld\n", apiReturn); + "NetWkstaTransportEnum returned %d\n", apiReturn); if (apiReturn == NERR_Success) { /* WKSTA_TRANSPORT_INFO_0 *transports = (WKSTA_TRANSPORT_INFO_0 *)bufPtr; */

1 0

Michael Stefaniuc : uxtheme: Win64 printf format warning fixes.
by Alexandre Julliard 09 Oct '06

09 Oct '06

Module: wine Branch: master Commit: dc3706ae50cd28fef48a52e8acf86c7b99a48156 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc3706ae50cd28fef48a52e8a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Oct 8 19:34:18 2006 +0200 uxtheme: Win64 printf format warning fixes. --- dlls/uxtheme/Makefile.in | 1 - dlls/uxtheme/draw.c | 12 ++++++------ dlls/uxtheme/main.c | 2 +- dlls/uxtheme/msstyles.c | 2 +- dlls/uxtheme/system.c | 14 +++++++------- 5 files changed, 15 insertions(+), 16 deletions(-) diff --git a/dlls/uxtheme/Makefile.in b/dlls/uxtheme/Makefile.in index 0351510..46a2e7e 100644 --- a/dlls/uxtheme/Makefile.in +++ b/dlls/uxtheme/Makefile.in @@ -6,7 +6,6 @@ MODULE = uxtheme.dll IMPORTLIB = libuxtheme.$(IMPLIBEXT) IMPORTS = user32 gdi32 advapi32 kernel32 ntdll DELAYIMPORTS = msimg32 -EXTRADEFS = -DWINE_NO_LONG_AS_INT C_SRCS = \ draw.c \ diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c index 4546b29..b31d1ae 100644 --- a/dlls/uxtheme/draw.c +++ b/dlls/uxtheme/draw.c @@ -53,7 +53,7 @@ HRESULT WINAPI EnableThemeDialogTexture( static const WCHAR szTab[] = { 'T','a','b',0 }; HRESULT hr; - TRACE("(%p,0x%08lx\n", hwnd, dwFlags); + TRACE("(%p,0x%08x\n", hwnd, dwFlags); hr = SetPropW (hwnd, MAKEINTATOMW (atDialogThemeEnabled), (HANDLE)(dwFlags|0x80000000)); /* 0x80000000 serves as a "flags set" flag */ @@ -220,7 +220,7 @@ static PTHEME_PROPERTY UXTHEME_SelectIma } } if(reqsize.x <= size.x && reqsize.y <= size.y) { - TRACE("Using image size %ldx%ld, image %d\n", reqsize.x, reqsize.y, i + TMT_IMAGEFILE1); + TRACE("Using image size %dx%d, image %d\n", reqsize.x, reqsize.y, i + TMT_IMAGEFILE1); return fileProp; } } @@ -831,7 +831,7 @@ static HRESULT UXTHEME_DrawBackgroundFil HRESULT hr = S_OK; int filltype = FT_SOLID; - TRACE("(%d,%d,%ld)\n", iPartId, iStateId, pOptions->dwFlags); + TRACE("(%d,%d,%d)\n", iPartId, iStateId, pOptions->dwFlags); if(pOptions->dwFlags & DTBG_OMITCONTENT) return S_OK; @@ -929,7 +929,7 @@ HRESULT WINAPI DrawThemeBackgroundEx(HTH int bgtype = BT_BORDERFILL; RECT rt; - TRACE("(%p,%p,%d,%d,%ld,%ld)\n", hTheme, hdc, iPartId, iStateId,pRect->left,pRect->top); + TRACE("(%p,%p,%d,%d,%d,%d)\n", hTheme, hdc, iPartId, iStateId,pRect->left,pRect->top); if(!hTheme) return E_HANDLE; @@ -1627,7 +1627,7 @@ HRESULT WINAPI GetThemeBackgroundContent /* If nothing was found, leave unchanged */ } - TRACE("left:%ld,top:%ld,right:%ld,bottom:%ld\n", pContentRect->left, pContentRect->top, pContentRect->right, pContentRect->bottom); + TRACE("left:%d,top:%d,right:%d,bottom:%d\n", pContentRect->left, pContentRect->top, pContentRect->right, pContentRect->bottom); return S_OK; } @@ -1675,7 +1675,7 @@ HRESULT WINAPI GetThemeBackgroundExtent( /* If nothing was found, leave unchanged */ } - TRACE("left:%ld,top:%ld,right:%ld,bottom:%ld\n", pExtentRect->left, pExtentRect->top, pExtentRect->right, pExtentRect->bottom); + TRACE("left:%d,top:%d,right:%d,bottom:%d\n", pExtentRect->left, pExtentRect->top, pExtentRect->right, pExtentRect->bottom); return S_OK; } diff --git a/dlls/uxtheme/main.c b/dlls/uxtheme/main.c index 1cf124d..74444e9 100644 --- a/dlls/uxtheme/main.c +++ b/dlls/uxtheme/main.c @@ -35,7 +35,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(uxtheme); /* For the moment, do nothing here. */ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) { - TRACE("%p 0x%lx %p: stub\n", hInstDLL, fdwReason, lpv); + TRACE("%p 0x%x %p: stub\n", hInstDLL, fdwReason, lpv); switch(fdwReason) { case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hInstDLL); diff --git a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c index 9225206..0d2210d 100644 --- a/dlls/uxtheme/msstyles.c +++ b/dlls/uxtheme/msstyles.c @@ -115,7 +115,7 @@ HRESULT MSSTYLES_OpenThemeFile(LPCWSTR l } if((versize = SizeofResource(hTheme, hrsc)) != 2) { - TRACE("Version resource found, but wrong size: %ld\n", versize); + TRACE("Version resource found, but wrong size: %d\n", versize); hr = HRESULT_FROM_WIN32(ERROR_BAD_FORMAT); goto invalid_theme; } diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index 2b746a1..0d13ccd 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -165,7 +165,7 @@ static void UXTHEME_LoadTheme(void) } else { bThemeActive = FALSE; - TRACE("Failed to get ThemeActive: %ld\n", GetLastError()); + TRACE("Failed to get ThemeActive: %d\n", GetLastError()); } buffsize = sizeof(szCurrentColor)/sizeof(szCurrentColor[0]); if(RegQueryValueExW(hKey, szColorName, NULL, NULL, (LPBYTE)szCurrentColor, &buffsize)) @@ -725,7 +725,7 @@ DWORD WINAPI GetThemeAppProperties(void) */ void WINAPI SetThemeAppProperties(DWORD dwFlags) { - TRACE("(0x%08lx)\n", dwFlags); + TRACE("(0x%08x)\n", dwFlags); dwThemeAppProperties = dwFlags; } @@ -748,7 +748,7 @@ HRESULT WINAPI HitTestThemeBackground(HT const RECT *pRect, HRGN hrgn, POINT ptTest, WORD *pwHitTestCode) { - FIXME("%d %d 0x%08lx: stub\n", iPartId, iStateId, dwOptions); + FIXME("%d %d 0x%08x: stub\n", iPartId, iStateId, dwOptions); if(!hTheme) return E_HANDLE; return ERROR_CALL_NOT_IMPLEMENTED; @@ -867,7 +867,7 @@ HRESULT WINAPI OpenThemeFile(LPCWSTR psz LPCWSTR pszSizeName, HTHEMEFILE *hThemeFile, DWORD unknown) { - TRACE("(%s,%s,%s,%p,%ld)\n", debugstr_w(pszThemeFileName), + TRACE("(%s,%s,%s,%p,%d)\n", debugstr_w(pszThemeFileName), debugstr_w(pszColorName), debugstr_w(pszSizeName), hThemeFile, unknown); return MSSTYLES_OpenThemeFile(pszThemeFileName, pszColorName, pszSizeName, (PTHEME_FILE*)hThemeFile); @@ -947,7 +947,7 @@ HRESULT WINAPI GetThemeDefaults(LPCWSTR { PTHEME_FILE pt; HRESULT hr; - TRACE("(%s,%p,%ld,%p,%ld)\n", debugstr_w(pszThemeFileName), + TRACE("(%s,%p,%d,%p,%d)\n", debugstr_w(pszThemeFileName), pszColorName, dwColorNameLen, pszSizeName, dwSizeNameLen); @@ -1066,7 +1066,7 @@ HRESULT WINAPI EnumThemeColors(LPWSTR ps HRESULT hr; LPWSTR tmp; UINT resourceId = dwColorNum + 1000; - TRACE("(%s,%s,%ld)\n", debugstr_w(pszThemeFileName), + TRACE("(%s,%s,%d)\n", debugstr_w(pszThemeFileName), debugstr_w(pszSizeName), dwColorNum); hr = MSSTYLES_OpenThemeFile(pszThemeFileName, NULL, pszSizeName, &pt); @@ -1126,7 +1126,7 @@ HRESULT WINAPI EnumThemeSizes(LPWSTR psz HRESULT hr; LPWSTR tmp; UINT resourceId = dwSizeNum + 3000; - TRACE("(%s,%s,%ld)\n", debugstr_w(pszThemeFileName), + TRACE("(%s,%s,%d)\n", debugstr_w(pszThemeFileName), debugstr_w(pszColorName), dwSizeNum); hr = MSSTYLES_OpenThemeFile(pszThemeFileName, pszColorName, NULL, &pt);

1 0

Michael Stefaniuc : version: Win64 printf format warning fixes.
by Alexandre Julliard 09 Oct '06

09 Oct '06

Module: wine Branch: master Commit: 54b1c5e0fa1576ce00696c93c955ebdbec6ed534 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54b1c5e0fa1576ce00696c93c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Oct 8 19:35:18 2006 +0200 version: Win64 printf format warning fixes. --- dlls/version/Makefile.in | 1 - dlls/version/info.c | 24 ++++++++++++------------ dlls/version/install.c | 6 +++--- dlls/version/resource.c | 4 ++-- dlls/version/ver16.c | 2 +- 5 files changed, 18 insertions(+), 19 deletions(-) diff --git a/dlls/version/Makefile.in b/dlls/version/Makefile.in index 4839f93..d609a8d 100644 --- a/dlls/version/Makefile.in +++ b/dlls/version/Makefile.in @@ -5,7 +5,6 @@ VPATH = @srcdir@ MODULE = version.dll IMPORTLIB = libversion.$(IMPLIBEXT) IMPORTS = lz32 kernel32 ntdll -EXTRADEFS = -DWINE_NO_LONG_AS_INT C_SRCS = \ info.c \ diff --git a/dlls/version/info.c b/dlls/version/info.c index f9e8d1c..92553ea 100644 --- a/dlls/version/info.c +++ b/dlls/version/info.c @@ -69,7 +69,7 @@ static void print_vffi_debug(VS_FIXEDFIL { WORD mode = LOWORD(vffi->dwFileVersionMS); WORD ver_rev = HIWORD(vffi->dwFileVersionLS); - TRACE("fileversion=%lu.%u.%u.%u (%s.major.minor.release), ", + TRACE("fileversion=%u.%u.%u.%u (%s.major.minor.release), ", (vffi->dwFileVersionMS), HIBYTE(ver_rev), LOBYTE(ver_rev), LOWORD(vffi->dwFileVersionLS), (mode == 3) ? "Usermode" : ((mode <= 2) ? "Kernelmode" : "?") ); @@ -84,7 +84,7 @@ static void print_vffi_debug(VS_FIXEDFIL HIWORD(vffi->dwProductVersionMS),LOWORD(vffi->dwProductVersionMS), HIWORD(vffi->dwProductVersionLS),LOWORD(vffi->dwProductVersionLS)); - TRACE("flagmask=0x%lx, flags=0x%lx %s%s%s%s%s%s\n", + TRACE("flagmask=0x%x, flags=0x%x %s%s%s%s%s%s\n", vffi->dwFileFlagsMask, vffi->dwFileFlags, (vffi->dwFileFlags & VS_FF_DEBUG) ? "DEBUG," : "", (vffi->dwFileFlags & VS_FF_PRERELEASE) ? "PRERELEASE," : "", @@ -105,7 +105,7 @@ static void print_vffi_debug(VS_FIXEDFIL case VOS_NT:TRACE("NT,");break; case VOS_UNKNOWN: default: - TRACE("UNKNOWN(0x%lx),",vffi->dwFileOS&0xFFFF0000);break; + TRACE("UNKNOWN(0x%x),",vffi->dwFileOS&0xFFFF0000);break; } switch (LOWORD(vffi->dwFileOS)) @@ -130,7 +130,7 @@ static void print_vffi_debug(VS_FIXEDFIL { if(versioned_printer) /* NT3.x/NT4.0 or old w2k Driver */ TRACE(",PRINTER"); - TRACE(" (subtype=0x%lx)", vffi->dwFileSubtype); + TRACE(" (subtype=0x%x)", vffi->dwFileSubtype); } break; case VFT_DRV: @@ -151,7 +151,7 @@ static void print_vffi_debug(VS_FIXEDFIL case VFT2_DRV_VERSIONED_PRINTER:TRACE("VERSIONED_PRINTER");break; case VFT2_UNKNOWN: default: - TRACE("UNKNOWN(0x%lx)",vffi->dwFileSubtype);break; + TRACE("UNKNOWN(0x%x)",vffi->dwFileSubtype);break; } break; case VFT_FONT: @@ -161,18 +161,18 @@ static void print_vffi_debug(VS_FIXEDFIL case VFT2_FONT_RASTER:TRACE("RASTER");break; case VFT2_FONT_VECTOR:TRACE("VECTOR");break; case VFT2_FONT_TRUETYPE:TRACE("TRUETYPE");break; - default:TRACE("UNKNOWN(0x%lx)",vffi->dwFileSubtype);break; + default:TRACE("UNKNOWN(0x%x)",vffi->dwFileSubtype);break; } break; case VFT_VXD:TRACE("filetype=VXD");break; case VFT_STATIC_LIB:TRACE("filetype=STATIC_LIB");break; case VFT_UNKNOWN: default: - TRACE("filetype=Unknown(0x%lx)",vffi->dwFileType);break; + TRACE("filetype=Unknown(0x%x)",vffi->dwFileType);break; } TRACE("\n"); - TRACE("filedate=0x%lx.0x%lx\n",vffi->dwFileDateMS,vffi->dwFileDateLS); + TRACE("filedate=0x%x.0x%x\n",vffi->dwFileDateMS,vffi->dwFileDateLS); } /*********************************************************************** @@ -280,7 +280,7 @@ static DWORD VERSION_GetFileVersionInfo_ if ( vffi->dwSignature != VS_FFI_SIGNATURE ) { - WARN("vffi->dwSignature is 0x%08lx, but not 0x%08lx!\n", + WARN("vffi->dwSignature is 0x%08x, but not 0x%08lx!\n", vffi->dwSignature, VS_FFI_SIGNATURE ); len = 0xFFFFFFFF; goto END; @@ -414,7 +414,7 @@ static DWORD VERSION_GetFileVersionInfo_ if ( vffi->dwSignature != VS_FFI_SIGNATURE ) { - WARN("vffi->dwSignature is 0x%08lx, but not 0x%08lx!\n", + WARN("vffi->dwSignature is 0x%08x, but not 0x%08lx!\n", vffi->dwSignature, VS_FFI_SIGNATURE ); len = 0xFFFFFFFF; goto END; @@ -548,7 +548,7 @@ BOOL WINAPI GetFileVersionInfoW( LPCWSTR DWORD len; VS_VERSION_INFO_STRUCT32* vvis = (VS_VERSION_INFO_STRUCT32*)data; - TRACE("(%s,%ld,size=%ld,data=%p)\n", + TRACE("(%s,%d,size=%d,data=%p)\n", debugstr_w(filename), handle, datasize, data ); if (!data) @@ -615,7 +615,7 @@ BOOL WINAPI GetFileVersionInfoA( LPCSTR UNICODE_STRING filenameW; BOOL retval; - TRACE("(%s,%ld,size=%ld,data=%p)\n", + TRACE("(%s,%d,size=%d,data=%p)\n", debugstr_a(filename), handle, datasize, data ); if(filename) diff --git a/dlls/version/install.c b/dlls/version/install.c index c7565af..c341f83 100644 --- a/dlls/version/install.c +++ b/dlls/version/install.c @@ -208,7 +208,7 @@ DWORD WINAPI VerFindFileA( *lpuCurDirLen = curDirSizeReq; } - TRACE("ret = %lu (%s%s%s) curdir=%s destdir=%s\n", retval, + TRACE("ret = %u (%s%s%s) curdir=%s destdir=%s\n", retval, (retval & VFF_CURNEDEST) ? "VFF_CURNEDEST " : "", (retval & VFF_FILEINUSE) ? "VFF_FILEINUSE " : "", (retval & VFF_BUFFTOOSMALL) ? "VFF_BUFFTOOSMALL " : "", @@ -299,7 +299,7 @@ DWORD WINAPI VerFindFileW( UINT flags,LP *lpuCurDirLen = curDirSizeReq; } - TRACE("ret = %lu (%s%s%s) curdir=%s destdir=%s\n", retval, + TRACE("ret = %u (%s%s%s) curdir=%s destdir=%s\n", retval, (retval & VFF_CURNEDEST) ? "VFF_CURNEDEST " : "", (retval & VFF_FILEINUSE) ? "VFF_FILEINUSE " : "", (retval & VFF_BUFFTOOSMALL) ? "VFF_BUFFTOOSMALL " : "", @@ -338,7 +338,7 @@ _fetch_versioninfo(LPSTR fn,VS_FIXEDFILE if ((*vffi)->dwSignature == 0x004f0049) /* hack to detect unicode */ *vffi = (VS_FIXEDFILEINFO*)(buf+0x28); if ((*vffi)->dwSignature != VS_FFI_SIGNATURE) - WARN("Bad VS_FIXEDFILEINFO signature 0x%08lx\n",(*vffi)->dwSignature); + WARN("Bad VS_FIXEDFILEINFO signature 0x%08x\n",(*vffi)->dwSignature); return buf; } } diff --git a/dlls/version/resource.c b/dlls/version/resource.c index 4961cc9..e637f6c 100644 --- a/dlls/version/resource.c +++ b/dlls/version/resource.c @@ -403,7 +403,7 @@ DWORD WINAPI GetFileResourceSize16( LPCS OFSTRUCT ofs; DWORD reslen; - TRACE("(%s,type=0x%lx,id=0x%lx,off=%p)\n", + TRACE("(%s,type=0x%x,id=0x%x,off=%p)\n", debugstr_a(lpszFileName), (LONG)lpszResType, (LONG)lpszResId, lpszResId ); @@ -440,7 +440,7 @@ DWORD WINAPI GetFileResource16( LPCSTR l OFSTRUCT ofs; DWORD reslen = dwResLen; - TRACE("(%s,type=%p,id=%p,off=%ld,len=%ld,data=%p)\n", + TRACE("(%s,type=%p,id=%p,off=%d,len=%d,data=%p)\n", debugstr_a(lpszFileName), lpszResType, lpszResId, dwFileOffset, dwResLen, lpvData ); diff --git a/dlls/version/ver16.c b/dlls/version/ver16.c index 5cf2fd9..a581f89 100644 --- a/dlls/version/ver16.c +++ b/dlls/version/ver16.c @@ -44,7 +44,7 @@ DWORD WINAPI GetFileVersionInfoSize16( L DWORD WINAPI GetFileVersionInfo16( LPCSTR lpszFileName, DWORD handle, DWORD cbBuf, LPVOID lpvData ) { - TRACE("(%s, %08lx, %ld, %p)\n", + TRACE("(%s, %08x, %d, %p)\n", debugstr_a(lpszFileName), handle, cbBuf, lpvData ); return GetFileVersionInfoA( lpszFileName, handle, cbBuf, lpvData );

1 0

Michael Stefaniuc : d3dxof: Win64 printf format warning fixes.
by Alexandre Julliard 09 Oct '06

09 Oct '06

Module: wine Branch: master Commit: 51ca8e8ef87de3999854b329a8b4f458c7df35fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=51ca8e8ef87de3999854b329a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Oct 8 18:59:55 2006 +0200 d3dxof: Win64 printf format warning fixes. --- dlls/d3dxof/Makefile.in | 1 - dlls/d3dxof/d3dxof.c | 42 +++++++++++++++++++++--------------------- 2 files changed, 21 insertions(+), 22 deletions(-) diff --git a/dlls/d3dxof/Makefile.in b/dlls/d3dxof/Makefile.in index 1df954e..6bdc04b 100644 --- a/dlls/d3dxof/Makefile.in +++ b/dlls/d3dxof/Makefile.in @@ -6,7 +6,6 @@ MODULE = d3dxof.dll IMPORTLIB = libd3dxof.$(IMPLIBEXT) IMPORTS = ole32 user32 advapi32 kernel32 EXTRALIBS = -ldxguid -luuid -EXTRADEFS = -DWINE_NO_LONG_AS_INT C_SRCS = \ main.c \ diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index e082a4e..0904f64 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -82,7 +82,7 @@ static ULONG WINAPI IDirectXFileImpl_Add IDirectXFileImpl *This = (IDirectXFileImpl *)iface; ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p/%p): AddRef from %ld\n", iface, This, ref - 1); + TRACE("(%p/%p): AddRef from %d\n", iface, This, ref - 1); return ref; } @@ -92,7 +92,7 @@ static ULONG WINAPI IDirectXFileImpl_Rel IDirectXFileImpl *This = (IDirectXFileImpl *)iface; ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p/%p): ReleaseRef to %ld\n", iface, This, ref); + TRACE("(%p/%p): ReleaseRef to %d\n", iface, This, ref); if (!ref) HeapFree(GetProcessHeap(), 0, This); @@ -107,7 +107,7 @@ static HRESULT WINAPI IDirectXFileImpl_C IDirectXFileImpl *This = (IDirectXFileImpl *)iface; IDirectXFileEnumObjectImpl* object; - FIXME("(%p/%p)->(%p,%lx,%p) stub!\n", This, iface, pvSource, dwLoadOptions, ppEnumObj); + FIXME("(%p/%p)->(%p,%x,%p) stub!\n", This, iface, pvSource, dwLoadOptions, ppEnumObj); if (dwLoadOptions == 0) { @@ -128,7 +128,7 @@ static HRESULT WINAPI IDirectXFileImpl_C { IDirectXFileImpl *This = (IDirectXFileImpl *)iface; - FIXME("(%p/%p)->(%s,%lx,%p) stub!\n", This, iface, szFileName, dwFileFormat, ppSaveObj); + FIXME("(%p/%p)->(%s,%x,%p) stub!\n", This, iface, szFileName, dwFileFormat, ppSaveObj); return S_FALSE; } @@ -137,7 +137,7 @@ static HRESULT WINAPI IDirectXFileImpl_R { IDirectXFileImpl *This = (IDirectXFileImpl *)iface; - FIXME("(%p/%p)->(%p,%ld) stub!\n", This, iface, pvData, cbSize); + FIXME("(%p/%p)->(%p,%d) stub!\n", This, iface, pvData, cbSize); return S_FALSE; } @@ -193,7 +193,7 @@ static ULONG WINAPI IDirectXFileBinaryIm IDirectXFileBinaryImpl *This = (IDirectXFileBinaryImpl *)iface; ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p/%p): AddRef from %ld\n", iface, This, ref - 1); + TRACE("(%p/%p): AddRef from %d\n", iface, This, ref - 1); return ref; } @@ -203,7 +203,7 @@ static ULONG WINAPI IDirectXFileBinaryIm IDirectXFileBinaryImpl *This = (IDirectXFileBinaryImpl *)iface; ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p/%p): ReleaseRef to %ld\n", iface, This, ref); + TRACE("(%p/%p): ReleaseRef to %d\n", iface, This, ref); if (!ref) HeapFree(GetProcessHeap(), 0, This); @@ -254,7 +254,7 @@ static HRESULT WINAPI IDirectXFileBinary { IDirectXFileBinaryImpl *This = (IDirectXFileBinaryImpl *)iface; - FIXME("(%p/%p)->(%p, %ld, %p) stub!\n", This, iface, pvData, cbSize, pcbRead); + FIXME("(%p/%p)->(%p, %d, %p) stub!\n", This, iface, pvData, cbSize, pcbRead); return S_FALSE; } @@ -312,7 +312,7 @@ static ULONG WINAPI IDirectXFileDataImpl IDirectXFileDataImpl *This = (IDirectXFileDataImpl *)iface; ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p/%p): AddRef from %ld\n", iface, This, ref - 1); + TRACE("(%p/%p): AddRef from %d\n", iface, This, ref - 1); return ref; } @@ -322,7 +322,7 @@ static ULONG WINAPI IDirectXFileDataImpl IDirectXFileDataImpl *This = (IDirectXFileDataImpl *)iface; ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p/%p): ReleaseRef to %ld\n", iface, This, ref); + TRACE("(%p/%p): ReleaseRef to %d\n", iface, This, ref); if (!ref) HeapFree(GetProcessHeap(), 0, This); @@ -400,7 +400,7 @@ static HRESULT WINAPI IDirectXFileDataIm { IDirectXFileDataImpl *This = (IDirectXFileDataImpl *)iface; - FIXME("(%p/%p)->(%s,%p,%s,%p,%ld) stub!\n", This, iface, szName, pguid, szMimeType, pvData, cbSize); + FIXME("(%p/%p)->(%s,%p,%s,%p,%d) stub!\n", This, iface, szName, pguid, szMimeType, pvData, cbSize); return S_FALSE; } @@ -461,7 +461,7 @@ static ULONG WINAPI IDirectXFileDataRefe IDirectXFileDataReferenceImpl *This = (IDirectXFileDataReferenceImpl *)iface; ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p/%p): AddRef from %ld\n", iface, This, ref - 1); + TRACE("(%p/%p): AddRef from %d\n", iface, This, ref - 1); return ref; } @@ -471,7 +471,7 @@ static ULONG WINAPI IDirectXFileDataRefe IDirectXFileDataReferenceImpl *This = (IDirectXFileDataReferenceImpl *)iface; ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p/%p): ReleaseRef to %ld\n", iface, This, ref); + TRACE("(%p/%p): ReleaseRef to %d\n", iface, This, ref); if (!ref) HeapFree(GetProcessHeap(), 0, This); @@ -558,7 +558,7 @@ static ULONG WINAPI IDirectXFileEnumObje IDirectXFileEnumObjectImpl *This = (IDirectXFileEnumObjectImpl *)iface; ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p/%p): AddRef from %ld\n", iface, This, ref - 1); + TRACE("(%p/%p): AddRef from %d\n", iface, This, ref - 1); return ref; } @@ -568,7 +568,7 @@ static ULONG WINAPI IDirectXFileEnumObje IDirectXFileEnumObjectImpl *This = (IDirectXFileEnumObjectImpl *)iface; ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p/%p): ReleaseRef to %ld\n", iface, This, ref); + TRACE("(%p/%p): ReleaseRef to %d\n", iface, This, ref); if (!ref) HeapFree(GetProcessHeap(), 0, This); @@ -662,7 +662,7 @@ static ULONG WINAPI IDirectXFileObjectIm IDirectXFileObjectImpl *This = (IDirectXFileObjectImpl *)iface; ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p/%p): AddRef from %ld\n", iface, This, ref - 1); + TRACE("(%p/%p): AddRef from %d\n", iface, This, ref - 1); return ref; } @@ -672,7 +672,7 @@ static ULONG WINAPI IDirectXFileObjectIm IDirectXFileObjectImpl *This = (IDirectXFileObjectImpl *)iface; ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p/%p): ReleaseRef to %ld\n", iface, This, ref); + TRACE("(%p/%p): ReleaseRef to %d\n", iface, This, ref); if (!ref) HeapFree(GetProcessHeap(), 0, This); @@ -748,7 +748,7 @@ static ULONG WINAPI IDirectXFileSaveObje IDirectXFileSaveObjectImpl *This = (IDirectXFileSaveObjectImpl *)iface; ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p/%p): AddRef from %ld\n", iface, This, ref - 1); + TRACE("(%p/%p): AddRef from %d\n", iface, This, ref - 1); return ref; } @@ -758,7 +758,7 @@ static ULONG WINAPI IDirectXFileSaveObje IDirectXFileSaveObjectImpl *This = (IDirectXFileSaveObjectImpl *)iface; ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p/%p): ReleaseRef to %ld\n", iface, This, ref); + TRACE("(%p/%p): ReleaseRef to %d\n", iface, This, ref); if (!ref) HeapFree(GetProcessHeap(), 0, This); @@ -770,7 +770,7 @@ static HRESULT WINAPI IDirectXFileSaveOb { IDirectXFileSaveObjectImpl *This = (IDirectXFileSaveObjectImpl *)iface; - FIXME("(%p/%p)->(%ld,%p) stub!\n", This, iface, cTemplates, ppguidTemplates); + FIXME("(%p/%p)->(%d,%p) stub!\n", This, iface, cTemplates, ppguidTemplates); return S_FALSE; } @@ -779,7 +779,7 @@ static HRESULT WINAPI IDirectXFileSaveOb { IDirectXFileSaveObjectImpl *This = (IDirectXFileSaveObjectImpl *)iface; - FIXME("(%p/%p)->(%p,%s,%p,%ld,%p,%p) stub!\n", This, iface, rguidTemplate, szName, pguid, cbSize, pvData, ppDataObj); + FIXME("(%p/%p)->(%p,%s,%p,%d,%p,%p) stub!\n", This, iface, rguidTemplate, szName, pguid, cbSize, pvData, ppDataObj); return S_FALSE; }

1 0

Michael Stefaniuc : wintab32: Win64 printf format warning fixes.
by Alexandre Julliard 09 Oct '06

09 Oct '06

Module: wine Branch: master Commit: d3e324f878b7d6d482e4d20dc3ee63bc15379b09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3e324f878b7d6d482e4d20dc… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Oct 8 19:33:43 2006 +0200 wintab32: Win64 printf format warning fixes. --- dlls/wintab32/Makefile.in | 1 - dlls/wintab32/context.c | 4 ++-- dlls/wintab32/manager.c | 2 +- dlls/wintab32/wintab16.c | 2 +- dlls/wintab32/wintab32.c | 2 +- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/wintab32/Makefile.in b/dlls/wintab32/Makefile.in index d7eed25..4ff7fc3 100644 --- a/dlls/wintab32/Makefile.in +++ b/dlls/wintab32/Makefile.in @@ -5,7 +5,6 @@ VPATH = @srcdir@ MODULE = wintab32.dll IMPORTLIB = libwintab32.$(IMPLIBEXT) IMPORTS = user32 kernel32 -EXTRADEFS = -DWINE_NO_LONG_AS_INT C_SRCS = \ context.c \ diff --git a/dlls/wintab32/context.c b/dlls/wintab32/context.c index b22c2d2..aea9c67 100644 --- a/dlls/wintab32/context.c +++ b/dlls/wintab32/context.c @@ -68,7 +68,7 @@ static char* DUMPBITS(int x, char* buf) static inline void DUMPPACKET(WTPACKET packet) { - TRACE("pkContext: %p pkStatus: 0x%x pkTime : 0x%x pkChanged: 0x%x pkSerialNumber: 0x%x pkCursor : %i pkButtons: %x pkX: %li pkY: %li pkZ: %li pkNormalPressure: %i pkTangentPressure: %i pkOrientation: (%i,%i,%i) pkRotation: (%i,%i,%i)\n", + TRACE("pkContext: %p pkStatus: 0x%x pkTime : 0x%x pkChanged: 0x%x pkSerialNumber: 0x%x pkCursor : %i pkButtons: %x pkX: %i pkY: %i pkZ: %i pkNormalPressure: %i pkTangentPressure: %i pkOrientation: (%i,%i,%i) pkRotation: (%i,%i,%i)\n", packet.pkContext, (UINT)packet.pkStatus, (UINT)packet.pkTime, @@ -94,7 +94,7 @@ static inline void DUMPCONTEXT(LOGCONTEX CHAR bits1[100]; CHAR bits2[100]; - sprintf(mmsg,"%s, %x, %x, %x, %x, %x, %x, %x%s, %x%s, %x%s, %x, %x, %i, %i, %i, %li ,%li, %li, %li, %li, %li,%li, %li, %li, %li, %li, %li, %i, %i, %i, %i, %i %li %li", + sprintf(mmsg,"%s, %x, %x, %x, %x, %x, %x, %x%s, %x%s, %x%s, %x, %x, %i, %i, %i, %i ,%i, %i, %i, %i, %i,%i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i %i %i", debugstr_a(lc.lcName), lc.lcOptions, lc.lcStatus, lc.lcLocks, lc.lcMsgBase, lc.lcDevice, lc.lcPktRate, (UINT)lc.lcPktData, DUMPBITS(lc.lcPktData,bits), (UINT)lc.lcPktMode, DUMPBITS(lc.lcPktMode,bits1), (UINT)lc.lcMoveMask, diff --git a/dlls/wintab32/manager.c b/dlls/wintab32/manager.c index 49aae58..85e901d 100644 --- a/dlls/wintab32/manager.c +++ b/dlls/wintab32/manager.c @@ -245,7 +245,7 @@ BOOL WINAPI WTMgrCsrButtonMap(HMGR hMgr, BOOL WINAPI WTMgrCsrPressureBtnMarks(HMGR hMgr, UINT wCsr, DWORD dwNMarks, DWORD dwTMarks) { - FIXME("(%p, %u, %lu, %lu): stub\n", hMgr, wCsr, dwNMarks, dwTMarks); + FIXME("(%p, %u, %u, %u): stub\n", hMgr, wCsr, dwNMarks, dwTMarks); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); diff --git a/dlls/wintab32/wintab16.c b/dlls/wintab32/wintab16.c index 34773bc..fc35977 100644 --- a/dlls/wintab32/wintab16.c +++ b/dlls/wintab32/wintab16.c @@ -502,7 +502,7 @@ BOOL16 WINAPI WTMgrCsrButtonMap16(HMGR16 BOOL16 WINAPI WTMgrCsrPressureBtnMarks16(HMGR16 hMgr, UINT16 wCsr, DWORD dwNMarks, DWORD dwTMarks) { - FIXME("(0x%04hx, %hu, %lu, %lu): stub\n", hMgr, wCsr, dwNMarks, dwTMarks); + FIXME("(0x%04hx, %hu, %u, %u): stub\n", hMgr, wCsr, dwNMarks, dwTMarks); return FALSE; } diff --git a/dlls/wintab32/wintab32.c b/dlls/wintab32/wintab32.c index 8718da9..f621f8e 100644 --- a/dlls/wintab32/wintab32.c +++ b/dlls/wintab32/wintab32.c @@ -68,7 +68,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, static const WCHAR name[] = {'T','a','b','l','e','t',0}; HMODULE hx11drv; - TRACE("%p, %lx, %p\n",hInstDLL,fdwReason,lpReserved); + TRACE("%p, %x, %p\n",hInstDLL,fdwReason,lpReserved); switch (fdwReason) { case DLL_PROCESS_ATTACH:

1 0

Michael Stefaniuc : dmsynth: Win64 printf format warning fixes.
by Alexandre Julliard 09 Oct '06

09 Oct '06

Module: wine Branch: master Commit: bb08d0ecf376e99322a27cedaa4ae30db767fbda URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb08d0ecf376e99322a27ceda… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Oct 8 18:59:31 2006 +0200 dmsynth: Win64 printf format warning fixes. --- dlls/dmsynth/Makefile.in | 1 - dlls/dmsynth/dmsynth_main.c | 2 +- dlls/dmsynth/synth.c | 22 +++++++++++----------- dlls/dmsynth/synthsink.c | 4 ++-- 4 files changed, 14 insertions(+), 15 deletions(-) diff --git a/dlls/dmsynth/Makefile.in b/dlls/dmsynth/Makefile.in index f6fc5f5..88224f4 100644 --- a/dlls/dmsynth/Makefile.in +++ b/dlls/dmsynth/Makefile.in @@ -5,7 +5,6 @@ VPATH = @srcdir@ MODULE = dmsynth.dll IMPORTS = winmm ole32 user32 advapi32 kernel32 EXTRALIBS = -ldxguid -luuid -EXTRADEFS = -DWINE_NO_LONG_AS_INT C_SRCS = \ dmsynth_main.c \ diff --git a/dlls/dmsynth/dmsynth_main.c b/dlls/dmsynth/dmsynth_main.c index b982e48..6de7c48 100644 --- a/dlls/dmsynth/dmsynth_main.c +++ b/dlls/dmsynth/dmsynth_main.c @@ -516,7 +516,7 @@ const char *debugstr_dmreturn (DWORD cod return codes[i].name; } /* if we didn't find it, return value */ - return wine_dbg_sprintf("0x%08lx", code); + return wine_dbg_sprintf("0x%08x", code); } /* generic flag-dumping function */ diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index ad052c2..8c774e9 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -41,7 +41,7 @@ static ULONG WINAPI IDirectMusicSynth8Im IDirectMusicSynth8Impl *This = (IDirectMusicSynth8Impl *)iface; ULONG refCount = InterlockedIncrement(&This->ref); - TRACE("(%p)->(ref before=%lu)\n", This, refCount - 1); + TRACE("(%p)->(ref before=%u)\n", This, refCount - 1); DMSYNTH_LockModule(); @@ -52,7 +52,7 @@ static ULONG WINAPI IDirectMusicSynth8Im IDirectMusicSynth8Impl *This = (IDirectMusicSynth8Impl *)iface; ULONG refCount = InterlockedDecrement(&This->ref); - TRACE("(%p)->(ref before=%lu)\n", This, refCount + 1); + TRACE("(%p)->(ref before=%u)\n", This, refCount + 1); if (!refCount) { HeapFree(GetProcessHeap(), 0, This); @@ -78,7 +78,7 @@ static HRESULT WINAPI IDirectMusicSynth8 static HRESULT WINAPI IDirectMusicSynth8Impl_SetNumChannelGroups (LPDIRECTMUSICSYNTH8 iface, DWORD dwGroups) { IDirectMusicSynth8Impl *This = (IDirectMusicSynth8Impl *)iface; - FIXME("(%p, %ld): stub\n", This, dwGroups); + FIXME("(%p, %d): stub\n", This, dwGroups); return S_OK; } @@ -96,7 +96,7 @@ static HRESULT WINAPI IDirectMusicSynth8 static HRESULT WINAPI IDirectMusicSynth8Impl_PlayBuffer (LPDIRECTMUSICSYNTH8 iface, REFERENCE_TIME rt, LPBYTE pbBuffer, DWORD cbBuffer) { IDirectMusicSynth8Impl *This = (IDirectMusicSynth8Impl *)iface; - FIXME("(%p, 0x%s, %p, %ld): stub\n", This, wine_dbgstr_longlong(rt), pbBuffer, cbBuffer); + FIXME("(%p, 0x%s, %p, %d): stub\n", This, wine_dbgstr_longlong(rt), pbBuffer, cbBuffer); return S_OK; } @@ -142,7 +142,7 @@ static HRESULT WINAPI IDirectMusicSynth8 static HRESULT WINAPI IDirectMusicSynth8Impl_Render (LPDIRECTMUSICSYNTH8 iface, short* pBuffer, DWORD dwLength, LONGLONG llPosition) { IDirectMusicSynth8Impl *This = (IDirectMusicSynth8Impl *)iface; - FIXME("(%p, %p, %ld, 0x%s): stub\n", This, pBuffer, dwLength, wine_dbgstr_longlong(llPosition)); + FIXME("(%p, %p, %d, 0x%s): stub\n", This, pBuffer, dwLength, wine_dbgstr_longlong(llPosition)); return S_OK; } @@ -155,7 +155,7 @@ static HRESULT WINAPI IDirectMusicSynth8 static HRESULT WINAPI IDirectMusicSynth8Impl_GetChannelPriority (LPDIRECTMUSICSYNTH8 iface, DWORD dwChannelGroup, DWORD dwChannel, LPDWORD pdwPriority) { IDirectMusicSynth8Impl *This = (IDirectMusicSynth8Impl *)iface; - FIXME("(%p, %ld, %ld, %p): stub\n", This, dwChannelGroup, dwChannel, pdwPriority); + FIXME("(%p, %d, %d, %p): stub\n", This, dwChannelGroup, dwChannel, pdwPriority); return S_OK; } @@ -174,7 +174,7 @@ static HRESULT WINAPI IDirectMusicSynth8 /* IDirectMusicSynth8Impl IDirectMusicSynth8 part: */ static HRESULT WINAPI IDirectMusicSynth8Impl_PlayVoice (LPDIRECTMUSICSYNTH8 iface, REFERENCE_TIME rt, DWORD dwVoiceId, DWORD dwChannelGroup, DWORD dwChannel, DWORD dwDLId, long prPitch, long vrVolume, SAMPLE_TIME stVoiceStart, SAMPLE_TIME stLoopStart, SAMPLE_TIME stLoopEnd) { IDirectMusicSynth8Impl *This = (IDirectMusicSynth8Impl *)iface; - FIXME("(%p, 0x%s, %ld, %ld, %ld, %ld, %li, %li,0x%s, 0x%s, 0x%s): stub\n", + FIXME("(%p, 0x%s, %d, %d, %d, %d, %li, %li,0x%s, 0x%s, 0x%s): stub\n", This, wine_dbgstr_longlong(rt), dwVoiceId, dwChannelGroup, dwChannel, dwDLId, prPitch, vrVolume, wine_dbgstr_longlong(stVoiceStart), wine_dbgstr_longlong(stLoopStart), wine_dbgstr_longlong(stLoopEnd)); return S_OK; @@ -182,25 +182,25 @@ static HRESULT WINAPI IDirectMusicSynth8 static HRESULT WINAPI IDirectMusicSynth8Impl_StopVoice (LPDIRECTMUSICSYNTH8 iface, REFERENCE_TIME rt, DWORD dwVoiceId) { IDirectMusicSynth8Impl *This = (IDirectMusicSynth8Impl *)iface; - FIXME("(%p, 0x%s, %ld): stub\n", This, wine_dbgstr_longlong(rt), dwVoiceId); + FIXME("(%p, 0x%s, %d): stub\n", This, wine_dbgstr_longlong(rt), dwVoiceId); return S_OK; } static HRESULT WINAPI IDirectMusicSynth8Impl_GetVoiceState (LPDIRECTMUSICSYNTH8 iface, DWORD dwVoice[], DWORD cbVoice, DMUS_VOICE_STATE dwVoiceState[]) { IDirectMusicSynth8Impl *This = (IDirectMusicSynth8Impl *)iface; - FIXME("(%p, %p, %ld, %p): stub\n", This, dwVoice, cbVoice, dwVoiceState); + FIXME("(%p, %p, %d, %p): stub\n", This, dwVoice, cbVoice, dwVoiceState); return S_OK; } static HRESULT WINAPI IDirectMusicSynth8Impl_Refresh (LPDIRECTMUSICSYNTH8 iface, DWORD dwDownloadID, DWORD dwFlags) { IDirectMusicSynth8Impl *This = (IDirectMusicSynth8Impl *)iface; - FIXME("(%p, %ld, %ld): stub\n", This, dwDownloadID, dwFlags); + FIXME("(%p, %d, %d): stub\n", This, dwDownloadID, dwFlags); return S_OK; } static HRESULT WINAPI IDirectMusicSynth8Impl_AssignChannelToBuses (LPDIRECTMUSICSYNTH8 iface, DWORD dwChannelGroup, DWORD dwChannel, LPDWORD pdwBuses, DWORD cBuses) { IDirectMusicSynth8Impl *This = (IDirectMusicSynth8Impl *)iface; - FIXME("(%p, %ld, %ld, %p, %ld): stub\n", This, dwChannelGroup, dwChannel, pdwBuses, cBuses); + FIXME("(%p, %d, %d, %p, %d): stub\n", This, dwChannelGroup, dwChannel, pdwBuses, cBuses); return S_OK; } diff --git a/dlls/dmsynth/synthsink.c b/dlls/dmsynth/synthsink.c index a9f7099..e139afc 100644 --- a/dlls/dmsynth/synthsink.c +++ b/dlls/dmsynth/synthsink.c @@ -40,7 +40,7 @@ static ULONG WINAPI IDirectMusicSynthSin IDirectMusicSynthSinkImpl *This = (IDirectMusicSynthSinkImpl *)iface; ULONG refCount = InterlockedIncrement(&This->ref); - TRACE("(%p)->(ref before=%lu)\n", This, refCount - 1); + TRACE("(%p)->(ref before=%u)\n", This, refCount - 1); DMSYNTH_LockModule(); @@ -51,7 +51,7 @@ static ULONG WINAPI IDirectMusicSynthSin IDirectMusicSynthSinkImpl *This = (IDirectMusicSynthSinkImpl *)iface; ULONG refCount = InterlockedDecrement(&This->ref); - TRACE("(%p)->(ref before=%lu)\n", This, refCount + 1); + TRACE("(%p)->(ref before=%u)\n", This, refCount + 1); if (!refCount) { HeapFree(GetProcessHeap(), 0, This);

1 0

Michael Stefaniuc : vmm.vxd: Win64 printf format warning fixes.
by Alexandre Julliard 09 Oct '06

09 Oct '06

Module: wine Branch: master Commit: 3e4fd9bf5956bd9f1c7f45ecacdcc37838f2f194 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e4fd9bf5956bd9f1c7f45eca… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Oct 8 18:59:42 2006 +0200 vmm.vxd: Win64 printf format warning fixes. --- dlls/vmm.vxd/Makefile.in | 1 - dlls/vmm.vxd/vmm.c | 20 ++++++++++---------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/vmm.vxd/Makefile.in b/dlls/vmm.vxd/Makefile.in index 854852f..eaacf3f 100644 --- a/dlls/vmm.vxd/Makefile.in +++ b/dlls/vmm.vxd/Makefile.in @@ -4,7 +4,6 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = vmm.vxd IMPORTS = kernel32 ntdll -EXTRADEFS = -DWINE_NO_LONG_AS_INT C_SRCS = \ vmm.c diff --git a/dlls/vmm.vxd/vmm.c b/dlls/vmm.vxd/vmm.c index 85ca9ad..24de4d7 100644 --- a/dlls/vmm.vxd/vmm.c +++ b/dlls/vmm.vxd/vmm.c @@ -148,7 +148,7 @@ DWORD WINAPI VMM_VxDCall( DWORD service, ULONG npages = (ULONG) stack32_pop( context ); ULONG flags = (ULONG) stack32_pop( context ); - TRACE("PageReserve: page: %08lx, npages: %08lx, flags: %08lx partial stub!\n", + TRACE("PageReserve: page: %08x, npages: %08x, flags: %08x partial stub!\n", page, npages, flags ); if ( page == PR_SYSTEM ) { @@ -180,8 +180,8 @@ DWORD WINAPI VMM_VxDCall( DWORD service, ULONG pagerdata = (ULONG) stack32_pop( context ); ULONG flags = (ULONG) stack32_pop( context ); - TRACE("PageCommit: page: %08lx, npages: %08lx, hpd: %08lx pagerdata: " - "%08lx, flags: %08lx partial stub\n", + TRACE("PageCommit: page: %08x, npages: %08x, hpd: %08x pagerdata: " + "%08x, flags: %08x partial stub\n", page, npages, hpd, pagerdata, flags ); if ( flags & PC_USER ) @@ -208,7 +208,7 @@ DWORD WINAPI VMM_VxDCall( DWORD service, ULONG npages = (ULONG) stack32_pop( context ); ULONG flags = (ULONG) stack32_pop( context ); - TRACE("PageDecommit: page: %08lx, npages: %08lx, flags: %08lx partial stub\n", + TRACE("PageDecommit: page: %08x, npages: %08x, flags: %08x partial stub\n", page, npages, flags ); address = (LPVOID )( page * psize ); ret = VirtualFree ( address, ( npages * psize ), MEM_DECOMMIT ); @@ -230,7 +230,7 @@ DWORD WINAPI VMM_VxDCall( DWORD service, ULONG permand = stack32_pop ( context ); ULONG permor = stack32_pop ( context ); - TRACE("PageModifyPermissions %08lx %08lx %08lx %08lx partial stub\n", + TRACE("PageModifyPermissions %08x %08x %08x %08x partial stub\n", page, npages, permand, permor ); address = (LPVOID )( page * psize ); @@ -271,7 +271,7 @@ DWORD WINAPI VMM_VxDCall( DWORD service, ERR("Can't change page permissions for %p\n", address ); return 0xffffffff; } - TRACE("Returning: %08lx\n", pg_old_perm ); + TRACE("Returning: %08x\n", pg_old_perm ); return pg_old_perm; } @@ -281,7 +281,7 @@ DWORD WINAPI VMM_VxDCall( DWORD service, LPVOID hmem = (LPVOID) stack32_pop( context ); DWORD flags = (DWORD ) stack32_pop( context ); - TRACE("PageFree: hmem: %p, flags: %08lx partial stub\n", + TRACE("PageFree: hmem: %p, flags: %08x partial stub\n", hmem, flags ); ret = VirtualFree ( hmem, 0, MEM_RELEASE ); @@ -420,7 +420,7 @@ DWORD WINAPI VMM_VxDCall( DWORD service, * implementation of this. */ - FIXME("GetDemandPageInfo(%08lx %08lx): stub!\n", dinfo, flags); + FIXME("GetDemandPageInfo(%08x %08x): stub!\n", dinfo, flags); return 0; } @@ -469,10 +469,10 @@ #endif default: if (LOWORD(service) < N_VMM_SERVICE) - FIXME( "Unimplemented service %s (%08lx)\n", + FIXME( "Unimplemented service %s (%08x)\n", VMM_Service_Name[LOWORD(service)], service); else - FIXME( "Unknown service %08lx\n", service); + FIXME( "Unknown service %08x\n", service); return 0xffffffff; /* FIXME */ } }

1 0

Michael Stefaniuc : ws2_32/tests: Win64 printf format warning fixes.
by Alexandre Julliard 09 Oct '06

09 Oct '06

Module: wine Branch: master Commit: a279570d15a3d5dd522f9df0d0962d2ca90cf4fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=a279570d15a3d5dd522f9df0d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Oct 8 18:58:55 2006 +0200 ws2_32/tests: Win64 printf format warning fixes. --- dlls/ws2_32/tests/Makefile.in | 1 - dlls/ws2_32/tests/sock.c | 42 +++++++++++++++++++++-------------------- 2 files changed, 21 insertions(+), 22 deletions(-) diff --git a/dlls/ws2_32/tests/Makefile.in b/dlls/ws2_32/tests/Makefile.in index 206c3d3..d180471 100644 --- a/dlls/ws2_32/tests/Makefile.in +++ b/dlls/ws2_32/tests/Makefile.in @@ -4,7 +4,6 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ TESTDLL = ws2_32.dll IMPORTS = ws2_32 kernel32 -EXTRADEFS = -DWINE_NO_LONG_AS_INT CTESTS = \ protocol.c \ diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 96d3c3e..837eec1 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -203,7 +203,7 @@ static int do_synchronous_send ( SOCKET int n = 1; for ( p = buf; n > 0 && p < last; p += n ) n = send ( s, p, min ( sendlen, last - p ), 0 ); - wsa_ok ( n, 0 <=, "do_synchronous_send (%lx): error %d\n" ); + wsa_ok ( n, 0 <=, "do_synchronous_send (%x): error %d\n" ); return p - buf; } @@ -213,7 +213,7 @@ static int do_synchronous_recv ( SOCKET int n = 1; for ( p = buf; n > 0 && p < last; p += n ) n = recv ( s, p, min ( recvlen, last - p ), 0 ); - wsa_ok ( n, 0 <=, "do_synchronous_recv (%lx): error %d:\n" ); + wsa_ok ( n, 0 <=, "do_synchronous_recv (%x): error %d:\n" ); return p - buf; } @@ -325,7 +325,7 @@ static void client_start ( client_params static void client_stop (void) { client_memory *mem = TlsGetValue ( tls ); - wsa_ok ( closesocket ( mem->s ), 0 ==, "closesocket error (%lx): %d\n" ); + wsa_ok ( closesocket ( mem->s ), 0 ==, "closesocket error (%x): %d\n" ); LocalFree ( (HANDLE) mem->send_buf ); LocalFree ( (HANDLE) mem ); ExitThread(0); @@ -350,8 +350,8 @@ static VOID WINAPI simple_server ( serve server_start ( par ); mem = TlsGetValue ( tls ); - wsa_ok ( set_blocking ( mem->s, TRUE ), 0 ==, "simple_server (%lx): failed to set blocking mode: %d\n"); - wsa_ok ( listen ( mem->s, SOMAXCONN ), 0 ==, "simple_server (%lx): listen failed: %d\n"); + wsa_ok ( set_blocking ( mem->s, TRUE ), 0 ==, "simple_server (%x): failed to set blocking mode: %d\n"); + wsa_ok ( listen ( mem->s, SOMAXCONN ), 0 ==, "simple_server (%x): listen failed: %d\n"); trace ( "simple_server (%x) ready\n", id ); SetEvent ( server_ready ); /* notify clients */ @@ -363,7 +363,7 @@ static VOID WINAPI simple_server ( serve /* accept a single connection */ tmp = sizeof ( mem->sock[0].peer ); mem->sock[0].s = accept ( mem->s, (struct sockaddr*) &mem->sock[0].peer, &tmp ); - wsa_ok ( mem->sock[0].s, INVALID_SOCKET !=, "simple_server (%lx): accept failed: %d\n" ); + wsa_ok ( mem->sock[0].s, INVALID_SOCKET !=, "simple_server (%x): accept failed: %d\n" ); ok ( mem->sock[0].peer.sin_addr.s_addr == inet_addr ( gen->inet_addr ), "simple_server (%x): strange peer address\n", id ); @@ -382,7 +382,7 @@ static VOID WINAPI simple_server ( serve /* cleanup */ read_zero_bytes ( mem->sock[0].s ); - wsa_ok ( closesocket ( mem->sock[0].s ), 0 ==, "simple_server (%lx): closesocket error: %d\n" ); + wsa_ok ( closesocket ( mem->sock[0].s ), 0 ==, "simple_server (%x): closesocket error: %d\n" ); mem->sock[0].s = INVALID_SOCKET; } @@ -410,8 +410,8 @@ static VOID WINAPI select_server ( serve server_start ( par ); mem = TlsGetValue ( tls ); - wsa_ok ( set_blocking ( mem->s, FALSE ), 0 ==, "select_server (%lx): failed to set blocking mode: %d\n"); - wsa_ok ( listen ( mem->s, SOMAXCONN ), 0 ==, "select_server (%lx): listen failed: %d\n"); + wsa_ok ( set_blocking ( mem->s, FALSE ), 0 ==, "select_server (%x): failed to set blocking mode: %d\n"); + wsa_ok ( listen ( mem->s, SOMAXCONN ), 0 ==, "select_server (%x): listen failed: %d\n"); trace ( "select_server (%x) ready\n", id ); SetEvent ( server_ready ); /* notify clients */ @@ -431,7 +431,7 @@ static VOID WINAPI select_server ( serve n_set = 0; wsa_ok ( ( n_ready = select ( 0, &fds_recv, &fds_send, NULL, &timeout ) ), SOCKET_ERROR !=, - "select_server (%lx): select() failed: %d\n" ); + "select_server (%x): select() failed: %d\n" ); /* check for incoming requests */ if ( FD_ISSET ( mem->s, &fds_recv ) ) { @@ -442,7 +442,7 @@ static VOID WINAPI select_server ( serve /* accept a single connection */ tmp = sizeof ( mem->sock[n_connections].peer ); mem->sock[n_connections].s = accept ( mem->s, (struct sockaddr*) &mem->sock[n_connections].peer, &tmp ); - wsa_ok ( mem->sock[n_connections].s, INVALID_SOCKET !=, "select_server (%lx): accept() failed: %d\n" ); + wsa_ok ( mem->sock[n_connections].s, INVALID_SOCKET !=, "select_server (%x): accept() failed: %d\n" ); ok ( mem->sock[n_connections].peer.sin_addr.s_addr == inet_addr ( gen->inet_addr ), "select_server (%x): strange peer address\n", id ); @@ -513,7 +513,7 @@ static VOID WINAPI select_server ( serve { /* cleanup */ read_zero_bytes ( mem->sock[i].s ); - wsa_ok ( closesocket ( mem->sock[i].s ), 0 ==, "select_server (%lx): closesocket error: %d\n" ); + wsa_ok ( closesocket ( mem->sock[i].s ), 0 ==, "select_server (%x): closesocket error: %d\n" ); mem->sock[i].s = INVALID_SOCKET; } @@ -546,7 +546,7 @@ static VOID WINAPI simple_client ( clien /* Connect */ wsa_ok ( connect ( mem->s, (struct sockaddr*) &mem->addr, sizeof ( mem->addr ) ), - 0 ==, "simple_client (%lx): connect error: %d\n" ); + 0 ==, "simple_client (%x): connect error: %d\n" ); ok ( set_blocking ( mem->s, TRUE ) == 0, "simple_client (%x): failed to set blocking mode\n", id ); trace ( "simple_client (%x) connected\n", id ); @@ -557,7 +557,7 @@ static VOID WINAPI simple_client ( clien "simple_client (%x): sent less data than expected: %d of %d\n", id, n_sent, n_expected ); /* shutdown send direction */ - wsa_ok ( shutdown ( mem->s, SD_SEND ), 0 ==, "simple_client (%lx): shutdown failed: %d\n" ); + wsa_ok ( shutdown ( mem->s, SD_SEND ), 0 ==, "simple_client (%x): shutdown failed: %d\n" ); /* Receive data echoed back & check it */ n_recvd = do_synchronous_recv ( mem->s, mem->recv_buf, n_expected, par->buflen ); @@ -604,7 +604,7 @@ static void WINAPI event_client ( client tmp = WaitForSingleObject ( event, INFINITE ); ok ( tmp == WAIT_OBJECT_0, "event_client (%x): wait for connect event failed: %d\n", id, tmp ); err = WSAEnumNetworkEvents ( mem->s, event, &wsa_events ); - wsa_ok ( err, 0 ==, "event_client (%lx): WSAEnumNetworkEvents error: %d\n" ); + wsa_ok ( err, 0 ==, "event_client (%x): WSAEnumNetworkEvents error: %d\n" ); err = wsa_events.iErrorCode[ FD_CONNECT_BIT ]; ok ( err == 0, "event_client (%x): connect error: %d\n", id, err ); @@ -625,7 +625,7 @@ static void WINAPI event_client ( client ok ( err == WAIT_OBJECT_0, "event_client (%x): wait failed\n", id ); err = WSAEnumNetworkEvents ( mem->s, event, &wsa_events ); - wsa_ok ( err, 0 ==, "event_client (%lx): WSAEnumNetworkEvents error: %d\n" ); + wsa_ok ( err, 0 ==, "event_client (%x): WSAEnumNetworkEvents error: %d\n" ); if ( wsa_events.lNetworkEvents & FD_WRITE ) { @@ -662,7 +662,7 @@ static void WINAPI event_client ( client /* First read must succeed */ n = recv ( mem->s, recv_p, min ( recv_last - recv_p, par->buflen ), 0 ); - wsa_ok ( n, 0 <=, "event_client (%lx): recv error: %d\n" ); + wsa_ok ( n, 0 <=, "event_client (%x): recv error: %d\n" ); while ( n >= 0 ) { recv_p += n; @@ -765,13 +765,13 @@ static void do_test( test_setup *test ) wait = WaitForMultipleObjects ( 1 + n, thread, TRUE, 1000 * TEST_TIMEOUT ); ok ( wait >= WAIT_OBJECT_0 && wait <= WAIT_OBJECT_0 + n , - "some threads have not completed: %lx\n", wait ); + "some threads have not completed: %x\n", wait ); if ( ! ( wait >= WAIT_OBJECT_0 && wait <= WAIT_OBJECT_0 + n ) ) { for (i = 0; i <= n; i++) { - trace ("terminating thread %08lx\n", thread_id[i]); + trace ("terminating thread %08x\n", thread_id[i]); if ( WaitForSingleObject ( thread[i], 0 ) != WAIT_OBJECT_0 ) TerminateThread ( thread [i], 0 ); } @@ -1340,7 +1340,7 @@ static VOID WINAPI SelectReadThread(sele addr.sin_port = htons(SERVERPORT); do_bind(par->s, (struct sockaddr *)&addr, sizeof(addr)); - wsa_ok(listen(par->s, SOMAXCONN ), 0 ==, "SelectReadThread (%lx): listen failed: %d\n"); + wsa_ok(listen(par->s, SOMAXCONN ), 0 ==, "SelectReadThread (%x): listen failed: %d\n"); SetEvent(server_ready); ret = select(par->s+1, &readfds, NULL, NULL, &select_timeout); @@ -1396,7 +1396,7 @@ static void test_select(void) thread_params.ReadKilled = FALSE; server_ready = CreateEventW(NULL, TRUE, FALSE, NULL); thread_handle = CreateThread (NULL, 0, (LPTHREAD_START_ROUTINE) &SelectReadThread, &thread_params, 0, NULL ); - ok ( (thread_handle != NULL), "CreateThread failed unexpectedly: %ld\n", GetLastError()); + ok ( (thread_handle != NULL), "CreateThread failed unexpectedly: %d\n", GetLastError()); WaitForSingleObject (server_ready, INFINITE); Sleep(2000);

1 0

Michael Stefaniuc : pstorec: Win64 printf format warning fixes.
by Alexandre Julliard 09 Oct '06

09 Oct '06

Module: wine Branch: master Commit: d6be8fbb30f77905e5abecbb05d944225ad2a99e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6be8fbb30f77905e5abecbb0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Oct 8 18:58:40 2006 +0200 pstorec: Win64 printf format warning fixes. --- dlls/pstorec/Makefile.in | 1 - dlls/pstorec/pstorec.c | 22 +++++++++++----------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/pstorec/Makefile.in b/dlls/pstorec/Makefile.in index 7251c1f..b4fdd2d 100644 --- a/dlls/pstorec/Makefile.in +++ b/dlls/pstorec/Makefile.in @@ -5,7 +5,6 @@ VPATH = @srcdir@ MODULE = pstorec.dll IMPORTS = ole32 shlwapi advapi32 kernel32 EXTRALIBS = -luuid -EXTRADEFS = -DWINE_NO_LONG_AS_INT C_SRCS = \ pstorec.c diff --git a/dlls/pstorec/pstorec.c b/dlls/pstorec/pstorec.c index 0e29a9f..96ebe5b 100644 --- a/dlls/pstorec/pstorec.c +++ b/dlls/pstorec/pstorec.c @@ -39,7 +39,7 @@ typedef struct BOOL WINAPI DllMain(HINSTANCE hinst, DWORD fdwReason, LPVOID fImpLoad) { - TRACE("%p %lx %p\n", hinst, fdwReason, fImpLoad); + TRACE("%p %x %p\n", hinst, fdwReason, fImpLoad); switch (fdwReason) { @@ -89,7 +89,7 @@ static ULONG WINAPI PStore_fnAddRef(IPSt { PStore_impl *This = (PStore_impl *)iface; - TRACE("%p %lu\n", This, This->ref); + TRACE("%p %u\n", This, This->ref); return InterlockedIncrement( &This->ref ); } @@ -102,7 +102,7 @@ static ULONG WINAPI PStore_fnRelease(IPS PStore_impl *This = (PStore_impl *)iface; LONG ref; - TRACE("%p %lu\n", This, This->ref); + TRACE("%p %u\n", This, This->ref); ref = InterlockedDecrement( &This->ref ); if( !ref ) @@ -146,7 +146,7 @@ static HRESULT WINAPI PStore_fnSetProvPa static HRESULT WINAPI PStore_fnCreateType( IPStore* This, PST_KEY Key, const GUID* pType, PPST_TYPEINFO pInfo, DWORD dwFlags) { - FIXME("%p %08lx %s %p(%ld,%s) %08lx\n", This, Key, debugstr_guid(pType), + FIXME("%p %08x %s %p(%d,%s) %08x\n", This, Key, debugstr_guid(pType), pInfo, pInfo->cbSize, debugstr_w(pInfo->szDisplayName), dwFlags); return E_NOTIMPL; @@ -168,7 +168,7 @@ static HRESULT WINAPI PStore_fnGetTypeIn static HRESULT WINAPI PStore_fnDeleteType( IPStore* This, PST_KEY Key, const GUID* pType, DWORD dwFlags) { - FIXME("%p %ld %s %08lx\n", This, Key, debugstr_guid(pType), dwFlags); + FIXME("%p %d %s %08x\n", This, Key, debugstr_guid(pType), dwFlags); return E_NOTIMPL; } @@ -179,7 +179,7 @@ static HRESULT WINAPI PStore_fnCreateSub PST_KEY Key, const GUID* pType, const GUID* pSubtype, PPST_TYPEINFO pInfo, PPST_ACCESSRULESET pRules, DWORD dwFlags) { - FIXME("%p %08lx %s %s %p %p %08lx\n", This, Key, debugstr_guid(pType), + FIXME("%p %08x %s %s %p %p %08x\n", This, Key, debugstr_guid(pType), debugstr_guid(pSubtype), pInfo, pRules, dwFlags); return E_NOTIMPL; } @@ -201,7 +201,7 @@ static HRESULT WINAPI PStore_fnGetSubtyp static HRESULT WINAPI PStore_fnDeleteSubtype( IPStore* This, PST_KEY Key, const GUID* pType, const GUID* pSubtype, DWORD dwFlags) { - FIXME("%p %lu %s %s %08lx\n", This, Key, + FIXME("%p %u %s %s %08x\n", This, Key, debugstr_guid(pType), debugstr_guid(pSubtype), dwFlags); return E_NOTIMPL; } @@ -266,7 +266,7 @@ static HRESULT WINAPI PStore_fnReadItem( const GUID* pItemType, const GUID* pItemSubtype, LPCWSTR szItemName, DWORD *cbData, BYTE** pbData, PPST_PROMPTIFO pPromptInfo, DWORD dwFlags) { - FIXME("%p %08lx %s %s %s %p %p %p %08lx\n", This, Key, + FIXME("%p %08x %s %s %s %p %p %p %08x\n", This, Key, debugstr_guid(pItemType), debugstr_guid(pItemSubtype), debugstr_w(szItemName), cbData, pbData, pPromptInfo, dwFlags); return E_NOTIMPL; @@ -280,7 +280,7 @@ static HRESULT WINAPI PStore_fnWriteItem DWORD cbData, BYTE* ppbData, PPST_PROMPTIFO pPromptInfo, DWORD dwDefaultConfirmationStyle, DWORD dwFlags) { - FIXME("%p %08lx %s %s %s %ld %p %p %08lx\n", This, Key, + FIXME("%p %08x %s %s %s %d %p %p %08x\n", This, Key, debugstr_guid(pItemType), debugstr_guid(pItemSubtype), debugstr_w(szItemName), cbData, ppbData, pPromptInfo, dwFlags); return E_NOTIMPL; @@ -293,7 +293,7 @@ static HRESULT WINAPI PStore_fnOpenItem( const GUID* pItemType, const GUID* pItemSubtype, LPCWSTR szItemName, PST_ACCESSMODE ModeFlags, PPST_PROMPTIFO pProomptInfo, DWORD dwFlags ) { - FIXME("%p %08lx %s %s %p %08lx %p %08lx\n", This, Key, + FIXME("%p %08x %s %s %p %08x %p %08x\n", This, Key, debugstr_guid(pItemType), debugstr_guid(pItemSubtype), debugstr_w(szItemName), ModeFlags, pProomptInfo, dwFlags); return E_NOTIMPL; @@ -353,7 +353,7 @@ HRESULT WINAPI PStoreCreateInstance( IPS { PStore_impl *ips; - TRACE("%p %s %p %08lx\n", ppProvider, debugstr_guid(pProviderID), pReserved, dwFlags); + TRACE("%p %s %p %08x\n", ppProvider, debugstr_guid(pProviderID), pReserved, dwFlags); ips = HeapAlloc( GetProcessHeap(), 0, sizeof (PStore_impl) ); if( !ips )

1 0

Michael Stefaniuc : wsock32: Win64 printf format warning fixes.
by Alexandre Julliard 09 Oct '06

09 Oct '06

Module: wine Branch: master Commit: 1048d9a033d144e84528e875a73e895b9b886dc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1048d9a033d144e84528e875a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Oct 8 18:58:29 2006 +0200 wsock32: Win64 printf format warning fixes. --- dlls/wsock32/Makefile.in | 1 - dlls/wsock32/service.c | 12 ++++++------ dlls/wsock32/socket.c | 8 ++++---- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/wsock32/Makefile.in b/dlls/wsock32/Makefile.in index b86acdb..0fbb83f 100644 --- a/dlls/wsock32/Makefile.in +++ b/dlls/wsock32/Makefile.in @@ -5,7 +5,6 @@ VPATH = @srcdir@ MODULE = wsock32.dll IMPORTLIB = libwsock32.$(IMPLIBEXT) IMPORTS = ws2_32 iphlpapi kernel32 -EXTRADEFS = -DWINE_NO_LONG_AS_INT C_SRCS = \ protocol.c \ diff --git a/dlls/wsock32/service.c b/dlls/wsock32/service.c index 45b151c..17fea61 100644 --- a/dlls/wsock32/service.c +++ b/dlls/wsock32/service.c @@ -38,7 +38,7 @@ INT WINAPI GetAddressByNameA(DWORD dwNam LPVOID lpCsaddrBuffer, LPDWORD lpdwBufferLength, LPSTR lpAliasBuffer, LPDWORD lpdwAliasBufferLength) { - FIXME("(0x%08lx, %s, %s, %p, 0x%08lx, %p, %p, %p, %p, %p) stub\n", dwNameSpace, + FIXME("(0x%08x, %s, %s, %p, 0x%08x, %p, %p, %p, %p, %p) stub\n", dwNameSpace, debugstr_guid(lpServiceType), debugstr_a(lpServiceName), lpiProtocols, dwResolution, lpServiceAsyncInfo, lpCsaddrBuffer, lpdwBufferLength, lpAliasBuffer, lpdwAliasBufferLength); @@ -52,7 +52,7 @@ INT WINAPI GetAddressByNameW(DWORD dwNam LPVOID lpCsaddrBuffer, LPDWORD lpdwBufferLength, LPWSTR lpAliasBuffer, LPDWORD lpdwAliasBufferLength) { - FIXME("(0x%08lx, %s, %s, %p, 0x%08lx, %p, %p, %p, %p, %p) stub\n", dwNameSpace, + FIXME("(0x%08x, %s, %s, %p, 0x%08x, %p, %p, %p, %p, %p) stub\n", dwNameSpace, debugstr_guid(lpServiceType), debugstr_w(lpServiceName), lpiProtocols, dwResolution, lpServiceAsyncInfo, lpCsaddrBuffer, lpdwBufferLength, lpAliasBuffer, lpdwAliasBufferLength); @@ -135,7 +135,7 @@ INT WINAPI SetServiceA(DWORD dwNameSpace LPSERVICE_ASYNC_INFO lpServiceAsyncInfo, LPDWORD lpdwStatusFlags) { /* tell the user they've got a substandard implementation */ - FIXME("wsock32: SetServiceA(%lu, %lu, %lu, %p, %p, %p): stub\n", dwNameSpace, dwOperation, dwFlags, + FIXME("wsock32: SetServiceA(%u, %u, %u, %p, %p, %p): stub\n", dwNameSpace, dwOperation, dwFlags, lpServiceInfo, lpServiceAsyncInfo, lpdwStatusFlags); /* some programs may be able to compensate if they know what happened */ @@ -152,7 +152,7 @@ INT WINAPI SetServiceW(DWORD dwNameSpace LPSERVICE_ASYNC_INFO lpServiceAsyncInfo, LPDWORD lpdwStatusFlags) { /* tell the user they've got a substandard implementation */ - FIXME("wsock32: SetServiceW(%lu, %lu, %lu, %p, %p, %p): stub\n", dwNameSpace, dwOperation, dwFlags, + FIXME("wsock32: SetServiceW(%u, %u, %u, %p, %p, %p): stub\n", dwNameSpace, dwOperation, dwFlags, lpServiceInfo, lpServiceAsyncInfo, lpdwStatusFlags); /* some programs may be able to compensate if they know what happened */ @@ -194,7 +194,7 @@ INT WINAPI GetServiceA(DWORD dwNameSpace DWORD dwProperties, LPVOID lpBuffer, LPDWORD lpdwBufferSize, LPSERVICE_ASYNC_INFO lpServiceAsyncInfo) { - FIXME("(%lu, %p, %s, %lu, %p, %p, %p): stub\n", dwNameSpace, + FIXME("(%u, %p, %s, %u, %p, %p, %p): stub\n", dwNameSpace, lpGuid, lpServiceName, dwProperties, lpBuffer, lpdwBufferSize, lpServiceAsyncInfo); /* some programs may be able to compensate if they know what happened */ @@ -211,7 +211,7 @@ INT WINAPI GetServiceW(DWORD dwNameSpace DWORD dwProperties, LPVOID lpBuffer, LPDWORD lpdwBufferSize, LPSERVICE_ASYNC_INFO lpServiceAsyncInfo) { - FIXME("(%lu, %p, %s, %lu, %p, %p, %p): stub\n", dwNameSpace, + FIXME("(%u, %p, %s, %u, %p, %p, %p): stub\n", dwNameSpace, lpGuid, lpServiceName, dwProperties, lpBuffer, lpdwBufferSize, lpServiceAsyncInfo); /* some programs may be able to compensate if they know what happened */ diff --git a/dlls/wsock32/socket.c b/dlls/wsock32/socket.c index 6f70a52..044761b 100644 --- a/dlls/wsock32/socket.c +++ b/dlls/wsock32/socket.c @@ -252,7 +252,7 @@ DWORD WINAPI WsControl(DWORD protocol, */ if (index == 1) return NO_ERROR; - ERR ("Error retrieving data for interface index %lu\n", + ERR ("Error retrieving data for interface index %u\n", index); return ret; } @@ -407,8 +407,8 @@ DWORD WINAPI WsControl(DWORD protocol, { if (table->table[i].dwIndex == index) { - TRACE("Found IP info for tei_instance 0x%lx:\n", index); - TRACE("IP 0x%08lx, mask 0x%08lx\n", table->table[i].dwAddr, + TRACE("Found IP info for tei_instance 0x%x:\n", index); + TRACE("IP 0x%08x, mask 0x%08x\n", table->table[i].dwAddr, table->table[i].dwMask); memcpy(baseIPInfo, &table->table[i], sizeof(MIB_IPADDRROW)); break; @@ -611,7 +611,7 @@ #endif } default: - FIXME("Protocol Not Supported -> protocol=0x%lx, action=0x%lx, Request=%p, RequestLen=%p, Response=%p, ResponseLen=%p\n", + FIXME("Protocol Not Supported -> protocol=0x%x, action=0x%x, Request=%p, RequestLen=%p, Response=%p, ResponseLen=%p\n", protocol, action, pRequestInfo, pcbRequestInfoLen, pResponseInfo, pcbResponseInfoLen); return (WSAEOPNOTSUPP);

1 0