uxtheme: Enable compilation with long types.
Signed-off-by: Eric Pouech <eric.pouech@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
341b341605
commit
354be197cd
|
@ -1,4 +1,3 @@
|
||||||
EXTRADEFS = -DWINE_NO_LONG_TYPES
|
|
||||||
MODULE = uxtheme.dll
|
MODULE = uxtheme.dll
|
||||||
IMPORTLIB = uxtheme
|
IMPORTLIB = uxtheme
|
||||||
IMPORTS = user32 gdi32 advapi32
|
IMPORTS = user32 gdi32 advapi32
|
||||||
|
|
|
@ -57,7 +57,7 @@ HRESULT WINAPI EnableThemeDialogTexture(HWND hwnd, DWORD new_flag)
|
||||||
DWORD old_flag = 0;
|
DWORD old_flag = 0;
|
||||||
BOOL res;
|
BOOL res;
|
||||||
|
|
||||||
TRACE("(%p,%#x\n", hwnd, new_flag);
|
TRACE("(%p,%#lx\n", hwnd, new_flag);
|
||||||
|
|
||||||
new_flag &= ETDT_VALIDBITS;
|
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) {
|
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));
|
imagefile_index_to_property(i));
|
||||||
return fileProp;
|
return fileProp;
|
||||||
}
|
}
|
||||||
|
@ -957,7 +957,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,%d)\n", iPartId, iStateId, pOptions->dwFlags);
|
TRACE("(%d,%d,%ld)\n", iPartId, iStateId, pOptions->dwFlags);
|
||||||
|
|
||||||
if(pOptions->dwFlags & DTBG_OMITCONTENT)
|
if(pOptions->dwFlags & DTBG_OMITCONTENT)
|
||||||
return S_OK;
|
return S_OK;
|
||||||
|
@ -1055,7 +1055,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,%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)
|
if(!hTheme)
|
||||||
return E_HANDLE;
|
return E_HANDLE;
|
||||||
|
|
||||||
|
@ -1744,14 +1744,14 @@ HRESULT WINAPI DrawThemeTextEx(HTHEME hTheme, HDC hdc, int iPartId, int iStateId
|
||||||
int oldBkMode;
|
int oldBkMode;
|
||||||
int fontProp;
|
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);
|
debugstr_wn(pszText, iCharCount), iCharCount, flags, rect, options);
|
||||||
|
|
||||||
if(!hTheme)
|
if(!hTheme)
|
||||||
return E_HANDLE;
|
return E_HANDLE;
|
||||||
|
|
||||||
if (options->dwFlags & ~(DTT_TEXTCOLOR | DTT_FONTPROP))
|
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)
|
if (options->dwFlags & DTT_FONTPROP)
|
||||||
fontProp = options->iFontPropId;
|
fontProp = options->iFontPropId;
|
||||||
|
|
|
@ -33,7 +33,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, void *reserved)
|
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) {
|
switch(fdwReason) {
|
||||||
case DLL_PROCESS_ATTACH:
|
case DLL_PROCESS_ATTACH:
|
||||||
DisableThreadLibraryCalls(hInstDLL);
|
DisableThreadLibraryCalls(hInstDLL);
|
||||||
|
|
|
@ -98,7 +98,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: %d\n", versize);
|
TRACE("Version resource found, but wrong size: %ld\n", versize);
|
||||||
hr = HRESULT_FROM_WIN32(ERROR_BAD_FORMAT);
|
hr = HRESULT_FROM_WIN32(ERROR_BAD_FORMAT);
|
||||||
goto invalid_theme;
|
goto invalid_theme;
|
||||||
}
|
}
|
||||||
|
|
|
@ -273,7 +273,7 @@ LRESULT WINAPI UXTHEME_ScrollbarWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR
|
||||||
HTHEME theme;
|
HTHEME theme;
|
||||||
LRESULT result;
|
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) {
|
switch (msg) {
|
||||||
case WM_CREATE:
|
case WM_CREATE:
|
||||||
|
|
|
@ -153,7 +153,7 @@ static void UXTHEME_LoadTheme(void)
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
bThemeActive = FALSE;
|
bThemeActive = FALSE;
|
||||||
TRACE("Failed to get ThemeActive: %d\n", GetLastError());
|
TRACE("Failed to get ThemeActive: %ld\n", GetLastError());
|
||||||
}
|
}
|
||||||
buffsize = sizeof(szCurrentColor);
|
buffsize = sizeof(szCurrentColor);
|
||||||
if (RegQueryValueExW(hKey, L"ColorName", NULL, NULL, (BYTE*)szCurrentColor, &buffsize))
|
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))
|
if (!RegQueryValueExW(hKey, L"LoadedBefore", NULL, NULL, (BYTE *)tmp, &size))
|
||||||
loaded_before = (tmp[0] != '0');
|
loaded_before = (tmp[0] != '0');
|
||||||
else
|
else
|
||||||
WARN("Failed to get LoadedBefore: %d\n", GetLastError());
|
WARN("Failed to get LoadedBefore: %ld\n", GetLastError());
|
||||||
RegCloseKey(hKey);
|
RegCloseKey(hKey);
|
||||||
}
|
}
|
||||||
if (loaded_before && same_theme)
|
if (loaded_before && same_theme)
|
||||||
|
@ -621,7 +621,7 @@ static HTHEME open_theme_data(HWND hwnd, LPCWSTR pszClassList, DWORD flags, UINT
|
||||||
LPCWSTR pszAppName;
|
LPCWSTR pszAppName;
|
||||||
LPCWSTR pszUseClassList;
|
LPCWSTR pszUseClassList;
|
||||||
HTHEME hTheme = NULL;
|
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)
|
if(!pszClassList)
|
||||||
{
|
{
|
||||||
|
@ -630,7 +630,7 @@ static HTHEME open_theme_data(HWND hwnd, LPCWSTR pszClassList, DWORD flags, UINT
|
||||||
}
|
}
|
||||||
|
|
||||||
if(flags)
|
if(flags)
|
||||||
FIXME("unhandled flags: %x\n", flags);
|
FIXME("unhandled flags: %lx\n", flags);
|
||||||
|
|
||||||
if(bThemeActive)
|
if(bThemeActive)
|
||||||
{
|
{
|
||||||
|
@ -738,7 +738,7 @@ HRESULT WINAPI SetWindowTheme(HWND hwnd, LPCWSTR pszSubAppName,
|
||||||
HRESULT WINAPI SetWindowThemeAttribute(HWND hwnd, enum WINDOWTHEMEATTRIBUTETYPE type,
|
HRESULT WINAPI SetWindowThemeAttribute(HWND hwnd, enum WINDOWTHEMEATTRIBUTETYPE type,
|
||||||
PVOID attribute, DWORD size)
|
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;
|
return E_NOTIMPL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -770,7 +770,7 @@ DWORD WINAPI GetThemeAppProperties(void)
|
||||||
*/
|
*/
|
||||||
void WINAPI SetThemeAppProperties(DWORD dwFlags)
|
void WINAPI SetThemeAppProperties(DWORD dwFlags)
|
||||||
{
|
{
|
||||||
TRACE("(0x%08x)\n", dwFlags);
|
TRACE("(0x%08lx)\n", dwFlags);
|
||||||
dwThemeAppProperties = dwFlags;
|
dwThemeAppProperties = dwFlags;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -793,7 +793,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%08x: stub\n", iPartId, iStateId, dwOptions);
|
FIXME("%d %d 0x%08lx: stub\n", iPartId, iStateId, dwOptions);
|
||||||
if(!hTheme)
|
if(!hTheme)
|
||||||
return E_HANDLE;
|
return E_HANDLE;
|
||||||
return E_NOTIMPL;
|
return E_NOTIMPL;
|
||||||
|
@ -912,7 +912,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,%d)\n", debugstr_w(pszThemeFileName),
|
TRACE("(%s,%s,%s,%p,%ld)\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);
|
||||||
|
@ -992,7 +992,7 @@ HRESULT WINAPI GetThemeDefaults(LPCWSTR pszThemeFileName, LPWSTR pszColorName,
|
||||||
{
|
{
|
||||||
PTHEME_FILE pt;
|
PTHEME_FILE pt;
|
||||||
HRESULT hr;
|
HRESULT hr;
|
||||||
TRACE("(%s,%p,%d,%p,%d)\n", debugstr_w(pszThemeFileName),
|
TRACE("(%s,%p,%ld,%p,%ld)\n", debugstr_w(pszThemeFileName),
|
||||||
pszColorName, dwColorNameLen,
|
pszColorName, dwColorNameLen,
|
||||||
pszSizeName, dwSizeNameLen);
|
pszSizeName, dwSizeNameLen);
|
||||||
|
|
||||||
|
@ -1107,7 +1107,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,%d)\n", debugstr_w(pszThemeFileName),
|
TRACE("(%s,%s,%ld)\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);
|
||||||
|
@ -1165,7 +1165,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,%d)\n", debugstr_w(pszThemeFileName),
|
TRACE("(%s,%s,%ld)\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);
|
||||||
|
|
Loading…
Reference in New Issue