Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-cw
Commits
354be197
Commit
354be197
authored
Feb 21, 2022
by
Eric Pouech
Committed by
Alexandre Julliard
Feb 21, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
uxtheme: Enable compilation with long types.
Signed-off-by:
Eric Pouech
<
eric.pouech@gmail.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
341b3416
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
20 additions
and
21 deletions
+20
-21
Makefile.in
dlls/uxtheme/Makefile.in
+0
-1
draw.c
dlls/uxtheme/draw.c
+6
-6
main.c
dlls/uxtheme/main.c
+1
-1
msstyles.c
dlls/uxtheme/msstyles.c
+1
-1
scrollbar.c
dlls/uxtheme/scrollbar.c
+1
-1
system.c
dlls/uxtheme/system.c
+11
-11
No files found.
dlls/uxtheme/Makefile.in
View file @
354be197
EXTRADEFS
=
-DWINE_NO_LONG_TYPES
MODULE
=
uxtheme.dll
IMPORTLIB
=
uxtheme
IMPORTS
=
user32 gdi32 advapi32
...
...
dlls/uxtheme/draw.c
View file @
354be197
...
...
@@ -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,%#
l
x
\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%l
d, 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,%
l
d)
\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,%l
d)
\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%08
l
x %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%08
l
x
\n
"
,
options
->
dwFlags
);
if
(
options
->
dwFlags
&
DTT_FONTPROP
)
fontProp
=
options
->
iFontPropId
;
...
...
dlls/uxtheme/main.c
View file @
354be197
...
...
@@ -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%
l
x %p
\n
"
,
hInstDLL
,
fdwReason
,
reserved
);
switch
(
fdwReason
)
{
case
DLL_PROCESS_ATTACH
:
DisableThreadLibraryCalls
(
hInstDLL
);
...
...
dlls/uxtheme/msstyles.c
View file @
354be197
...
...
@@ -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: %
l
d
\n
"
,
versize
);
hr
=
HRESULT_FROM_WIN32
(
ERROR_BAD_FORMAT
);
goto
invalid_theme
;
}
...
...
dlls/uxtheme/scrollbar.c
View file @
354be197
...
...
@@ -273,7 +273,7 @@ LRESULT WINAPI UXTHEME_ScrollbarWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR
HTHEME
theme
;
LRESULT
result
;
TRACE
(
"(%p, 0x%x, %
lu, %l
u, %d)
\n
"
,
hwnd
,
msg
,
wParam
,
lParam
,
unicode
);
TRACE
(
"(%p, 0x%x, %
Iu, %I
u, %d)
\n
"
,
hwnd
,
msg
,
wParam
,
lParam
,
unicode
);
switch
(
msg
)
{
case
WM_CREATE
:
...
...
dlls/uxtheme/system.c
View file @
354be197
...
...
@@ -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: %
l
d
\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: %
l
d
\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, %
l
x)
\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: %
l
x
\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,%
l
d): 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%08
l
x)
\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%08
l
x: 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,%
l
d)
\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,%l
d)
\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,%
l
d)
\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,%
l
d)
\n
"
,
debugstr_w
(
pszThemeFileName
),
debugstr_w
(
pszColorName
),
dwSizeNum
);
hr
=
MSSTYLES_OpenThemeFile
(
pszThemeFileName
,
pszColorName
,
NULL
,
&
pt
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment