Eric Pouech : uxtheme: Enable compilation with long types.
Alexandre Julliard
julliard at winehq.org
Mon Feb 21 16:15:12 CST 2022
Module: wine
Branch: master
Commit: 354be197cddc279ca2afb077be4cc0b9f7c6b514
URL: https://source.winehq.org/git/wine.git/?a=commit;h=354be197cddc279ca2afb077be4cc0b9f7c6b514
Author: Eric Pouech <eric.pouech at gmail.com>
Date: Mon Feb 21 07:57:50 2022 +0100
uxtheme: Enable compilation with long types.
Signed-off-by: Eric Pouech <eric.pouech at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/uxtheme/Makefile.in | 1 -
dlls/uxtheme/draw.c | 12 ++++++------
dlls/uxtheme/main.c | 2 +-
dlls/uxtheme/msstyles.c | 2 +-
dlls/uxtheme/scrollbar.c | 2 +-
dlls/uxtheme/system.c | 22 +++++++++++-----------
6 files changed, 20 insertions(+), 21 deletions(-)
diff --git a/dlls/uxtheme/Makefile.in b/dlls/uxtheme/Makefile.in
index 42f4c9867b4..933650f4261 100644
--- a/dlls/uxtheme/Makefile.in
+++ b/dlls/uxtheme/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
MODULE = uxtheme.dll
IMPORTLIB = uxtheme
IMPORTS = user32 gdi32 advapi32
diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c
index 75db466967c..d503fad3fea 100644
--- a/dlls/uxtheme/draw.c
+++ b/dlls/uxtheme/draw.c
@@ -57,7 +57,7 @@ HRESULT WINAPI EnableThemeDialogTexture(HWND hwnd, DWORD new_flag)
DWORD old_flag = 0;
BOOL res;
- TRACE("(%p,%#x\n", hwnd, new_flag);
+ TRACE("(%p,%#lx\n", hwnd, new_flag);
new_flag &= ETDT_VALIDBITS;
@@ -267,7 +267,7 @@ static PTHEME_PROPERTY UXTHEME_SelectImage(HTHEME hTheme, int iPartId, int iStat
}
}
if(reqsize.x <= size.x && reqsize.y <= size.y) {
- TRACE("Using image size %dx%d, image %d\n", reqsize.x, reqsize.y,
+ TRACE("Using image size %ldx%ld, image %d\n", reqsize.x, reqsize.y,
imagefile_index_to_property(i));
return fileProp;
}
@@ -957,7 +957,7 @@ static HRESULT UXTHEME_DrawBackgroundFill(HTHEME hTheme, HDC hdc, int iPartId,
HRESULT hr = S_OK;
int filltype = FT_SOLID;
- TRACE("(%d,%d,%d)\n", iPartId, iStateId, pOptions->dwFlags);
+ TRACE("(%d,%d,%ld)\n", iPartId, iStateId, pOptions->dwFlags);
if(pOptions->dwFlags & DTBG_OMITCONTENT)
return S_OK;
@@ -1055,7 +1055,7 @@ HRESULT WINAPI DrawThemeBackgroundEx(HTHEME hTheme, HDC hdc, int iPartId,
int bgtype = BT_BORDERFILL;
RECT rt;
- TRACE("(%p,%p,%d,%d,%d,%d)\n", hTheme, hdc, iPartId, iStateId,pRect->left,pRect->top);
+ TRACE("(%p,%p,%d,%d,%ld,%ld)\n", hTheme, hdc, iPartId, iStateId,pRect->left,pRect->top);
if(!hTheme)
return E_HANDLE;
@@ -1744,14 +1744,14 @@ HRESULT WINAPI DrawThemeTextEx(HTHEME hTheme, HDC hdc, int iPartId, int iStateId
int oldBkMode;
int fontProp;
- TRACE("%p %p %d %d %s:%d 0x%08x %p %p\n", hTheme, hdc, iPartId, iStateId,
+ TRACE("%p %p %d %d %s:%d 0x%08lx %p %p\n", hTheme, hdc, iPartId, iStateId,
debugstr_wn(pszText, iCharCount), iCharCount, flags, rect, options);
if(!hTheme)
return E_HANDLE;
if (options->dwFlags & ~(DTT_TEXTCOLOR | DTT_FONTPROP))
- FIXME("unsupported flags 0x%08x\n", options->dwFlags);
+ FIXME("unsupported flags 0x%08lx\n", options->dwFlags);
if (options->dwFlags & DTT_FONTPROP)
fontProp = options->iFontPropId;
diff --git a/dlls/uxtheme/main.c b/dlls/uxtheme/main.c
index 5f79dd6ed0d..211b6e3bddc 100644
--- a/dlls/uxtheme/main.c
+++ b/dlls/uxtheme/main.c
@@ -33,7 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(uxtheme);
/* For the moment, do nothing here. */
BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, void *reserved)
{
- TRACE("%p 0x%x %p\n", hInstDLL, fdwReason, reserved);
+ TRACE("%p 0x%lx %p\n", hInstDLL, fdwReason, reserved);
switch(fdwReason) {
case DLL_PROCESS_ATTACH:
DisableThreadLibraryCalls(hInstDLL);
diff --git a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c
index 376d8bc6db9..7d3ee72efe8 100644
--- a/dlls/uxtheme/msstyles.c
+++ b/dlls/uxtheme/msstyles.c
@@ -98,7 +98,7 @@ HRESULT MSSTYLES_OpenThemeFile(LPCWSTR lpThemeFile, LPCWSTR pszColorName, LPCWST
}
if((versize = SizeofResource(hTheme, hrsc)) != 2)
{
- TRACE("Version resource found, but wrong size: %d\n", versize);
+ TRACE("Version resource found, but wrong size: %ld\n", versize);
hr = HRESULT_FROM_WIN32(ERROR_BAD_FORMAT);
goto invalid_theme;
}
diff --git a/dlls/uxtheme/scrollbar.c b/dlls/uxtheme/scrollbar.c
index e96e5e89b69..719081ad5b8 100644
--- a/dlls/uxtheme/scrollbar.c
+++ b/dlls/uxtheme/scrollbar.c
@@ -273,7 +273,7 @@ LRESULT WINAPI UXTHEME_ScrollbarWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR
HTHEME theme;
LRESULT result;
- TRACE("(%p, 0x%x, %lu, %lu, %d)\n", hwnd, msg, wParam, lParam, unicode);
+ TRACE("(%p, 0x%x, %Iu, %Iu, %d)\n", hwnd, msg, wParam, lParam, unicode);
switch (msg) {
case WM_CREATE:
diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c
index 37c484387ec..8333d6b99ce 100644
--- a/dlls/uxtheme/system.c
+++ b/dlls/uxtheme/system.c
@@ -153,7 +153,7 @@ static void UXTHEME_LoadTheme(void)
}
else {
bThemeActive = FALSE;
- TRACE("Failed to get ThemeActive: %d\n", GetLastError());
+ TRACE("Failed to get ThemeActive: %ld\n", GetLastError());
}
buffsize = sizeof(szCurrentColor);
if (RegQueryValueExW(hKey, L"ColorName", NULL, NULL, (BYTE*)szCurrentColor, &buffsize))
@@ -446,7 +446,7 @@ HRESULT UXTHEME_SetActiveTheme(PTHEME_FILE tf)
if (!RegQueryValueExW(hKey, L"LoadedBefore", NULL, NULL, (BYTE *)tmp, &size))
loaded_before = (tmp[0] != '0');
else
- WARN("Failed to get LoadedBefore: %d\n", GetLastError());
+ WARN("Failed to get LoadedBefore: %ld\n", GetLastError());
RegCloseKey(hKey);
}
if (loaded_before && same_theme)
@@ -621,7 +621,7 @@ static HTHEME open_theme_data(HWND hwnd, LPCWSTR pszClassList, DWORD flags, UINT
LPCWSTR pszAppName;
LPCWSTR pszUseClassList;
HTHEME hTheme = NULL;
- TRACE("(%p,%s, %x)\n", hwnd, debugstr_w(pszClassList), flags);
+ TRACE("(%p,%s, %lx)\n", hwnd, debugstr_w(pszClassList), flags);
if(!pszClassList)
{
@@ -630,7 +630,7 @@ static HTHEME open_theme_data(HWND hwnd, LPCWSTR pszClassList, DWORD flags, UINT
}
if(flags)
- FIXME("unhandled flags: %x\n", flags);
+ FIXME("unhandled flags: %lx\n", flags);
if(bThemeActive)
{
@@ -738,7 +738,7 @@ HRESULT WINAPI SetWindowTheme(HWND hwnd, LPCWSTR pszSubAppName,
HRESULT WINAPI SetWindowThemeAttribute(HWND hwnd, enum WINDOWTHEMEATTRIBUTETYPE type,
PVOID attribute, DWORD size)
{
- FIXME("(%p,%d,%p,%d): stub\n", hwnd, type, attribute, size);
+ FIXME("(%p,%d,%p,%ld): stub\n", hwnd, type, attribute, size);
return E_NOTIMPL;
}
@@ -770,7 +770,7 @@ DWORD WINAPI GetThemeAppProperties(void)
*/
void WINAPI SetThemeAppProperties(DWORD dwFlags)
{
- TRACE("(0x%08x)\n", dwFlags);
+ TRACE("(0x%08lx)\n", dwFlags);
dwThemeAppProperties = dwFlags;
}
@@ -793,7 +793,7 @@ HRESULT WINAPI HitTestThemeBackground(HTHEME hTheme, HDC hdc, int iPartId,
const RECT *pRect, HRGN hrgn,
POINT ptTest, WORD *pwHitTestCode)
{
- FIXME("%d %d 0x%08x: stub\n", iPartId, iStateId, dwOptions);
+ FIXME("%d %d 0x%08lx: stub\n", iPartId, iStateId, dwOptions);
if(!hTheme)
return E_HANDLE;
return E_NOTIMPL;
@@ -912,7 +912,7 @@ HRESULT WINAPI OpenThemeFile(LPCWSTR pszThemeFileName, LPCWSTR pszColorName,
LPCWSTR pszSizeName, HTHEMEFILE *hThemeFile,
DWORD unknown)
{
- TRACE("(%s,%s,%s,%p,%d)\n", debugstr_w(pszThemeFileName),
+ TRACE("(%s,%s,%s,%p,%ld)\n", debugstr_w(pszThemeFileName),
debugstr_w(pszColorName), debugstr_w(pszSizeName),
hThemeFile, unknown);
return MSSTYLES_OpenThemeFile(pszThemeFileName, pszColorName, pszSizeName, (PTHEME_FILE*)hThemeFile);
@@ -992,7 +992,7 @@ HRESULT WINAPI GetThemeDefaults(LPCWSTR pszThemeFileName, LPWSTR pszColorName,
{
PTHEME_FILE pt;
HRESULT hr;
- TRACE("(%s,%p,%d,%p,%d)\n", debugstr_w(pszThemeFileName),
+ TRACE("(%s,%p,%ld,%p,%ld)\n", debugstr_w(pszThemeFileName),
pszColorName, dwColorNameLen,
pszSizeName, dwSizeNameLen);
@@ -1107,7 +1107,7 @@ HRESULT WINAPI EnumThemeColors(LPWSTR pszThemeFileName, LPWSTR pszSizeName,
HRESULT hr;
LPWSTR tmp;
UINT resourceId = dwColorNum + 1000;
- TRACE("(%s,%s,%d)\n", debugstr_w(pszThemeFileName),
+ TRACE("(%s,%s,%ld)\n", debugstr_w(pszThemeFileName),
debugstr_w(pszSizeName), dwColorNum);
hr = MSSTYLES_OpenThemeFile(pszThemeFileName, NULL, pszSizeName, &pt);
@@ -1165,7 +1165,7 @@ HRESULT WINAPI EnumThemeSizes(LPWSTR pszThemeFileName, LPWSTR pszColorName,
HRESULT hr;
LPWSTR tmp;
UINT resourceId = dwSizeNum + 3000;
- TRACE("(%s,%s,%d)\n", debugstr_w(pszThemeFileName),
+ TRACE("(%s,%s,%ld)\n", debugstr_w(pszThemeFileName),
debugstr_w(pszColorName), dwSizeNum);
hr = MSSTYLES_OpenThemeFile(pszThemeFileName, pszColorName, NULL, &pt);
More information about the wine-cvs
mailing list