Module: wine Branch: master Commit: dc3706ae50cd28fef48a52e8acf86c7b99a48156 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc3706ae50cd28fef48a52e8ac...
Author: Michael Stefaniuc mstefani@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);
-
Alexandre Julliard