Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
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-winehq
Commits
208c0411
Commit
208c0411
authored
Feb 02, 2022
by
Eric Pouech
Committed by
Alexandre Julliard
Feb 02, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
uxtheme: Use correct integral type.
Signed-off-by:
Eric Pouech
<
eric.pouech@gmail.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
715a6bfc
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
6 deletions
+12
-6
msstyles.c
dlls/uxtheme/msstyles.c
+12
-6
No files found.
dlls/uxtheme/msstyles.c
View file @
208c0411
...
@@ -42,6 +42,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(uxtheme);
...
@@ -42,6 +42,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(uxtheme);
*/
*/
static
BOOL
MSSTYLES_GetNextInteger
(
LPCWSTR
lpStringStart
,
LPCWSTR
lpStringEnd
,
LPCWSTR
*
lpValEnd
,
int
*
value
);
static
BOOL
MSSTYLES_GetNextInteger
(
LPCWSTR
lpStringStart
,
LPCWSTR
lpStringEnd
,
LPCWSTR
*
lpValEnd
,
int
*
value
);
static
BOOL
MSSTYLES_GetNextLong
(
LPCWSTR
lpStringStart
,
LPCWSTR
lpStringEnd
,
LPCWSTR
*
lpValEnd
,
LONG
*
value
);
static
BOOL
MSSTYLES_GetNextToken
(
LPCWSTR
lpStringStart
,
LPCWSTR
lpStringEnd
,
LPCWSTR
*
lpValEnd
,
LPWSTR
lpBuff
,
DWORD
buffSize
);
static
BOOL
MSSTYLES_GetNextToken
(
LPCWSTR
lpStringStart
,
LPCWSTR
lpStringEnd
,
LPCWSTR
*
lpValEnd
,
LPWSTR
lpBuff
,
DWORD
buffSize
);
static
void
MSSTYLES_ParseThemeIni
(
PTHEME_FILE
tf
,
BOOL
setMetrics
);
static
void
MSSTYLES_ParseThemeIni
(
PTHEME_FILE
tf
,
BOOL
setMetrics
);
static
HRESULT
MSSTYLES_GetFont
(
LPCWSTR
lpStringStart
,
LPCWSTR
lpStringEnd
,
LPCWSTR
*
lpValEnd
,
LOGFONTW
*
logfont
);
static
HRESULT
MSSTYLES_GetFont
(
LPCWSTR
lpStringStart
,
LPCWSTR
lpStringEnd
,
LPCWSTR
*
lpValEnd
,
LOGFONTW
*
logfont
);
...
@@ -1159,10 +1160,10 @@ HBITMAP MSSTYLES_LoadBitmap (PTHEME_CLASS tc, LPCWSTR lpFilename, BOOL* hasAlpha
...
@@ -1159,10 +1160,10 @@ HBITMAP MSSTYLES_LoadBitmap (PTHEME_CLASS tc, LPCWSTR lpFilename, BOOL* hasAlpha
return
img
->
image
;
return
img
->
image
;
}
}
static
BOOL
MSSTYLES_GetNext
Integer
(
LPCWSTR
lpStringStart
,
LPCWSTR
lpStringEnd
,
LPCWSTR
*
lpValEnd
,
int
*
value
)
static
BOOL
MSSTYLES_GetNext
Long
(
LPCWSTR
lpStringStart
,
LPCWSTR
lpStringEnd
,
LPCWSTR
*
lpValEnd
,
LONG
*
value
)
{
{
LPCWSTR
cur
=
lpStringStart
;
LPCWSTR
cur
=
lpStringStart
;
int
total
=
0
;
LONG
total
=
0
;
BOOL
gotNeg
=
FALSE
;
BOOL
gotNeg
=
FALSE
;
while
(
cur
<
lpStringEnd
&&
(
*
cur
<
'0'
||
*
cur
>
'9'
||
*
cur
==
'-'
))
cur
++
;
while
(
cur
<
lpStringEnd
&&
(
*
cur
<
'0'
||
*
cur
>
'9'
||
*
cur
==
'-'
))
cur
++
;
...
@@ -1183,6 +1184,11 @@ static BOOL MSSTYLES_GetNextInteger(LPCWSTR lpStringStart, LPCWSTR lpStringEnd,
...
@@ -1183,6 +1184,11 @@ static BOOL MSSTYLES_GetNextInteger(LPCWSTR lpStringStart, LPCWSTR lpStringEnd,
return
TRUE
;
return
TRUE
;
}
}
static
BOOL
MSSTYLES_GetNextInteger
(
LPCWSTR
lpStringStart
,
LPCWSTR
lpStringEnd
,
LPCWSTR
*
lpValEnd
,
int
*
value
)
{
return
MSSTYLES_GetNextLong
(
lpStringStart
,
lpStringEnd
,
lpValEnd
,
(
LONG
*
)
value
);
}
static
inline
BOOL
isSpace
(
WCHAR
c
)
static
inline
BOOL
isSpace
(
WCHAR
c
)
{
{
return
c
==
' '
||
c
==
'\f'
||
c
==
'\n'
||
c
==
'\r'
||
c
==
'\t'
||
c
==
'\v'
;
return
c
==
' '
||
c
==
'\f'
||
c
==
'\n'
||
c
==
'\r'
||
c
==
'\t'
||
c
==
'\v'
;
...
@@ -1377,10 +1383,10 @@ HRESULT MSSTYLES_GetPropertyRect(PTHEME_PROPERTY tp, RECT *pRect)
...
@@ -1377,10 +1383,10 @@ HRESULT MSSTYLES_GetPropertyRect(PTHEME_PROPERTY tp, RECT *pRect)
LPCWSTR
lpCur
=
tp
->
lpValue
;
LPCWSTR
lpCur
=
tp
->
lpValue
;
LPCWSTR
lpEnd
=
tp
->
lpValue
+
tp
->
dwValueLen
;
LPCWSTR
lpEnd
=
tp
->
lpValue
+
tp
->
dwValueLen
;
MSSTYLES_GetNext
Integer
(
lpCur
,
lpEnd
,
&
lpCur
,
&
pRect
->
left
);
MSSTYLES_GetNext
Long
(
lpCur
,
lpEnd
,
&
lpCur
,
&
pRect
->
left
);
MSSTYLES_GetNext
Integer
(
lpCur
,
lpEnd
,
&
lpCur
,
&
pRect
->
top
);
MSSTYLES_GetNext
Long
(
lpCur
,
lpEnd
,
&
lpCur
,
&
pRect
->
top
);
MSSTYLES_GetNext
Integer
(
lpCur
,
lpEnd
,
&
lpCur
,
&
pRect
->
right
);
MSSTYLES_GetNext
Long
(
lpCur
,
lpEnd
,
&
lpCur
,
&
pRect
->
right
);
if
(
!
MSSTYLES_GetNext
Integer
(
lpCur
,
lpEnd
,
&
lpCur
,
&
pRect
->
bottom
))
{
if
(
!
MSSTYLES_GetNext
Long
(
lpCur
,
lpEnd
,
&
lpCur
,
&
pRect
->
bottom
))
{
TRACE
(
"Could not parse rect property
\n
"
);
TRACE
(
"Could not parse rect property
\n
"
);
return
E_PROP_ID_UNSUPPORTED
;
return
E_PROP_ID_UNSUPPORTED
;
}
}
...
...
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