system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-15 09:15:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

uxtheme: Win64 printf format warning fixes.

Browse source
This commit is contained in:
Michael Stefaniuc 2006-10-08 19:34:18 +02:00 committed by Alexandre Julliard
parent d3e324f878
commit dc3706ae50
5 changed files with 15 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
dlls/uxtheme/Makefile.in
View file

@ -6,7 +6,6 @@ MODULE = uxtheme.dll
IMPORTLIB = libuxtheme.$(IMPLIBEXT) IMPORTLIB = libuxtheme.$(IMPLIBEXT)
IMPORTS = user32 gdi32 advapi32 kernel32 ntdll IMPORTS = user32 gdi32 advapi32 kernel32 ntdll
DELAYIMPORTS = msimg32 DELAYIMPORTS = msimg32
EXTRADEFS = -DWINE_NO_LONG_AS_INT
C_SRCS = \ C_SRCS = \
draw.c \ draw.c \

12
dlls/uxtheme/draw.c
View file

@ -53,7 +53,7 @@ HRESULT WINAPI EnableThemeDialogTexture(HWND hwnd, DWORD dwFlags)
static const WCHAR szTab[] = { 'T','a','b',0 }; static const WCHAR szTab[] = { 'T','a','b',0 };
HRESULT hr; HRESULT hr;
TRACE("(%p,0x%08lx\n", hwnd, dwFlags); TRACE("(%p,0x%08x\n", hwnd, dwFlags);
hr = SetPropW (hwnd, MAKEINTATOMW (atDialogThemeEnabled), hr = SetPropW (hwnd, MAKEINTATOMW (atDialogThemeEnabled),
(HANDLE)(dwFlags|0x80000000)); (HANDLE)(dwFlags|0x80000000));
/* 0x80000000 serves as a "flags set" flag */ /* 0x80000000 serves as a "flags set" flag */
@ -220,7 +220,7 @@ static PTHEME_PROPERTY UXTHEME_SelectImage(HTHEME hTheme, HDC hdc, int iPartId,
} }
} }
if(reqsize.x <= size.x && reqsize.y <= size.y) { 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; return fileProp;
} }
} }
@ -831,7 +831,7 @@ static HRESULT UXTHEME_DrawBackgroundFill(HTHEME hTheme, HDC hdc, int iPartId,
HRESULT hr = S_OK; HRESULT hr = S_OK;
int filltype = FT_SOLID; 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) if(pOptions->dwFlags & DTBG_OMITCONTENT)
return S_OK; return S_OK;
@ -929,7 +929,7 @@ HRESULT WINAPI DrawThemeBackgroundEx(HTHEME hTheme, HDC hdc, int iPartId,
int bgtype = BT_BORDERFILL; int bgtype = BT_BORDERFILL;
RECT rt; 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) if(!hTheme)
return E_HANDLE; return E_HANDLE;
@ -1627,7 +1627,7 @@ HRESULT WINAPI GetThemeBackgroundContentRect(HTHEME hTheme, HDC hdc, int iPartId
/* If nothing was found, leave unchanged */ /* 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; return S_OK;
} }
@ -1675,7 +1675,7 @@ HRESULT WINAPI GetThemeBackgroundExtent(HTHEME hTheme, HDC hdc, int iPartId,
/* If nothing was found, leave unchanged */ /* 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; return S_OK;
} }

2
dlls/uxtheme/main.c
View file

@ -35,7 +35,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(uxtheme);
/* For the moment, do nothing here. */ /* For the moment, do nothing here. */
BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) 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) { switch(fdwReason) {
case DLL_PROCESS_ATTACH: case DLL_PROCESS_ATTACH:
DisableThreadLibraryCalls(hInstDLL); DisableThreadLibraryCalls(hInstDLL);

2
dlls/uxtheme/msstyles.c
View file

@ -115,7 +115,7 @@ HRESULT MSSTYLES_OpenThemeFile(LPCWSTR lpThemeFile, LPCWSTR pszColorName, LPCWST
} }
if((versize = SizeofResource(hTheme, hrsc)) != 2) 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); hr = HRESULT_FROM_WIN32(ERROR_BAD_FORMAT);
goto invalid_theme; goto invalid_theme;
} }

14
dlls/uxtheme/system.c
View file

@ -165,7 +165,7 @@ static void UXTHEME_LoadTheme(void)
} }
else { else {
bThemeActive = FALSE; bThemeActive = FALSE;
TRACE("Failed to get ThemeActive: %ld\n", GetLastError()); TRACE("Failed to get ThemeActive: %d\n", GetLastError());
} }
buffsize = sizeof(szCurrentColor)/sizeof(szCurrentColor[0]); buffsize = sizeof(szCurrentColor)/sizeof(szCurrentColor[0]);
if(RegQueryValueExW(hKey, szColorName, NULL, NULL, (LPBYTE)szCurrentColor, &buffsize)) if(RegQueryValueExW(hKey, szColorName, NULL, NULL, (LPBYTE)szCurrentColor, &buffsize))
@ -725,7 +725,7 @@ DWORD WINAPI GetThemeAppProperties(void)
*/ */
void WINAPI SetThemeAppProperties(DWORD dwFlags) void WINAPI SetThemeAppProperties(DWORD dwFlags)
{ {
TRACE("(0x%08lx)\n", dwFlags); TRACE("(0x%08x)\n", dwFlags);
dwThemeAppProperties = dwFlags; dwThemeAppProperties = dwFlags;
} }
@ -748,7 +748,7 @@ HRESULT WINAPI HitTestThemeBackground(HTHEME hTheme, HDC hdc, int iPartId,
const RECT *pRect, HRGN hrgn, const RECT *pRect, HRGN hrgn,
POINT ptTest, WORD *pwHitTestCode) 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) if(!hTheme)
return E_HANDLE; return E_HANDLE;
return ERROR_CALL_NOT_IMPLEMENTED; return ERROR_CALL_NOT_IMPLEMENTED;
@ -867,7 +867,7 @@ HRESULT WINAPI OpenThemeFile(LPCWSTR pszThemeFileName, LPCWSTR pszColorName,
LPCWSTR pszSizeName, HTHEMEFILE *hThemeFile, LPCWSTR pszSizeName, HTHEMEFILE *hThemeFile,
DWORD unknown) 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), debugstr_w(pszColorName), debugstr_w(pszSizeName),
hThemeFile, unknown); hThemeFile, unknown);
return MSSTYLES_OpenThemeFile(pszThemeFileName, pszColorName, pszSizeName, (PTHEME_FILE*)hThemeFile); return MSSTYLES_OpenThemeFile(pszThemeFileName, pszColorName, pszSizeName, (PTHEME_FILE*)hThemeFile);
@ -947,7 +947,7 @@ HRESULT WINAPI GetThemeDefaults(LPCWSTR pszThemeFileName, LPWSTR pszColorName,
{ {
PTHEME_FILE pt; PTHEME_FILE pt;
HRESULT hr; HRESULT hr;
TRACE("(%s,%p,%ld,%p,%ld)\n", debugstr_w(pszThemeFileName), TRACE("(%s,%p,%d,%p,%d)\n", debugstr_w(pszThemeFileName),
pszColorName, dwColorNameLen, pszColorName, dwColorNameLen,
pszSizeName, dwSizeNameLen); pszSizeName, dwSizeNameLen);
@ -1066,7 +1066,7 @@ HRESULT WINAPI EnumThemeColors(LPWSTR pszThemeFileName, LPWSTR pszSizeName,
HRESULT hr; HRESULT hr;
LPWSTR tmp; LPWSTR tmp;
UINT resourceId = dwColorNum + 1000; UINT resourceId = dwColorNum + 1000;
TRACE("(%s,%s,%ld)\n", debugstr_w(pszThemeFileName), TRACE("(%s,%s,%d)\n", debugstr_w(pszThemeFileName),
debugstr_w(pszSizeName), dwColorNum); debugstr_w(pszSizeName), dwColorNum);
hr = MSSTYLES_OpenThemeFile(pszThemeFileName, NULL, pszSizeName, &pt); hr = MSSTYLES_OpenThemeFile(pszThemeFileName, NULL, pszSizeName, &pt);
@ -1126,7 +1126,7 @@ HRESULT WINAPI EnumThemeSizes(LPWSTR pszThemeFileName, LPWSTR pszColorName,
HRESULT hr; HRESULT hr;
LPWSTR tmp; LPWSTR tmp;
UINT resourceId = dwSizeNum + 3000; UINT resourceId = dwSizeNum + 3000;
TRACE("(%s,%s,%ld)\n", debugstr_w(pszThemeFileName), TRACE("(%s,%s,%d)\n", debugstr_w(pszThemeFileName),
debugstr_w(pszColorName), dwSizeNum); debugstr_w(pszColorName), dwSizeNum);
hr = MSSTYLES_OpenThemeFile(pszThemeFileName, pszColorName, NULL, &pt); hr = MSSTYLES_OpenThemeFile(pszThemeFileName, pszColorName, NULL, &pt);