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
d112d746
Commit
d112d746
authored
Dec 09, 2021
by
Ziqing Hui
Committed by
Alexandre Julliard
Dec 09, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
user32: Pass correct flags in CreateIconFromResource().
Signed-off-by:
Ziqing Hui
<
zhui@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
3b26e293
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
9 deletions
+1
-9
cursoricon.c
dlls/user32/cursoricon.c
+1
-1
cursoricon.c
dlls/user32/tests/cursoricon.c
+0
-8
No files found.
dlls/user32/cursoricon.c
View file @
d112d746
...
@@ -1592,7 +1592,7 @@ HICON WINAPI CreateIconFromResourceEx( LPBYTE bits, UINT cbSize,
...
@@ -1592,7 +1592,7 @@ HICON WINAPI CreateIconFromResourceEx( LPBYTE bits, UINT cbSize,
HICON
WINAPI
CreateIconFromResource
(
LPBYTE
bits
,
UINT
cbSize
,
HICON
WINAPI
CreateIconFromResource
(
LPBYTE
bits
,
UINT
cbSize
,
BOOL
bIcon
,
DWORD
dwVersion
)
BOOL
bIcon
,
DWORD
dwVersion
)
{
{
return
CreateIconFromResourceEx
(
bits
,
cbSize
,
bIcon
,
dwVersion
,
0
,
0
,
0
);
return
CreateIconFromResourceEx
(
bits
,
cbSize
,
bIcon
,
dwVersion
,
0
,
0
,
LR_DEFAULTSIZE
|
LR_SHARED
);
}
}
...
...
dlls/user32/tests/cursoricon.c
View file @
d112d746
...
@@ -1595,10 +1595,8 @@ static void test_CreateIconFromResource(void)
...
@@ -1595,10 +1595,8 @@ static void test_CreateIconFromResource(void)
/* Test the icon information. */
/* Test the icon information. */
SetLastError
(
0xdeadbeef
);
SetLastError
(
0xdeadbeef
);
ret
=
GetIconInfo
(
handle
,
&
icon_info
);
ret
=
GetIconInfo
(
handle
,
&
icon_info
);
todo_wine
ok
(
ret
,
"GetIconInfo() failed.
\n
"
);
ok
(
ret
,
"GetIconInfo() failed.
\n
"
);
error
=
GetLastError
();
error
=
GetLastError
();
todo_wine
ok
(
error
==
0xdeadbeef
,
"Last error: %u
\n
"
,
error
);
ok
(
error
==
0xdeadbeef
,
"Last error: %u
\n
"
,
error
);
if
(
ret
)
if
(
ret
)
...
@@ -1616,14 +1614,10 @@ static void test_CreateIconFromResource(void)
...
@@ -1616,14 +1614,10 @@ static void test_CreateIconFromResource(void)
ICONINFOEXA
infoex
;
ICONINFOEXA
infoex
;
infoex
.
cbSize
=
sizeof
(
infoex
);
infoex
.
cbSize
=
sizeof
(
infoex
);
ret
=
pGetIconInfoExA
(
handle
,
&
infoex
);
ret
=
pGetIconInfoExA
(
handle
,
&
infoex
);
todo_wine
ok
(
ret
,
"GetIconInfoEx failed err %d
\n
"
,
GetLastError
()
);
ok
(
ret
,
"GetIconInfoEx failed err %d
\n
"
,
GetLastError
()
);
if
(
ret
)
{
ok
(
infoex
.
wResID
==
0
,
"GetIconInfoEx wrong resid %x
\n
"
,
infoex
.
wResID
);
ok
(
infoex
.
wResID
==
0
,
"GetIconInfoEx wrong resid %x
\n
"
,
infoex
.
wResID
);
ok
(
infoex
.
szModName
[
0
]
==
0
,
"GetIconInfoEx wrong module %s
\n
"
,
infoex
.
szModName
);
ok
(
infoex
.
szModName
[
0
]
==
0
,
"GetIconInfoEx wrong module %s
\n
"
,
infoex
.
szModName
);
ok
(
infoex
.
szResName
[
0
]
==
0
,
"GetIconInfoEx wrong name %s
\n
"
,
infoex
.
szResName
);
ok
(
infoex
.
szResName
[
0
]
==
0
,
"GetIconInfoEx wrong name %s
\n
"
,
infoex
.
szResName
);
}
}
}
/* Test creating an icon. */
/* Test creating an icon. */
...
@@ -1637,10 +1631,8 @@ static void test_CreateIconFromResource(void)
...
@@ -1637,10 +1631,8 @@ static void test_CreateIconFromResource(void)
/* Test the icon information. */
/* Test the icon information. */
SetLastError
(
0xdeadbeef
);
SetLastError
(
0xdeadbeef
);
ret
=
GetIconInfo
(
handle
,
&
icon_info
);
ret
=
GetIconInfo
(
handle
,
&
icon_info
);
todo_wine
ok
(
ret
,
"GetIconInfo() failed.
\n
"
);
ok
(
ret
,
"GetIconInfo() failed.
\n
"
);
error
=
GetLastError
();
error
=
GetLastError
();
todo_wine
ok
(
error
==
0xdeadbeef
,
"Last error: %u
\n
"
,
error
);
ok
(
error
==
0xdeadbeef
,
"Last error: %u
\n
"
,
error
);
if
(
ret
)
if
(
ret
)
...
...
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