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
48947117
Commit
48947117
authored
Jun 17, 2013
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
user.exe: Always pass a resource size to CreateIconFromResourceEx16.
parent
7ca08fee
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
3 deletions
+4
-3
user.c
dlls/user.exe16/user.c
+4
-3
No files found.
dlls/user.exe16/user.c
View file @
48947117
...
...
@@ -2094,6 +2094,7 @@ HANDLE16 WINAPI LoadImage16(HINSTANCE16 hinst, LPCSTR name, UINT16 type, INT16 c
{
HGLOBAL16
handle
;
HRSRC16
hRsrc
,
hGroupRsrc
;
DWORD
size
;
if
(
!
hinst
||
(
flags
&
LR_LOADFROMFILE
))
{
...
...
@@ -2129,7 +2130,6 @@ HANDLE16 WINAPI LoadImage16(HINSTANCE16 hinst, LPCSTR name, UINT16 type, INT16 c
BITMAPFILEHEADER
header
;
WCHAR
path
[
MAX_PATH
],
filename
[
MAX_PATH
];
HANDLE
file
;
DWORD
size
;
filename
[
0
]
=
0
;
if
(
!
(
hRsrc
=
FindResource16
(
hinst
,
name
,
(
LPCSTR
)
RT_BITMAP
)))
return
0
;
...
...
@@ -2186,7 +2186,8 @@ HANDLE16 WINAPI LoadImage16(HINSTANCE16 hinst, LPCSTR name, UINT16 type, INT16 c
if
(
!
(
handle
=
LoadResource16
(
hinst
,
hRsrc
)))
return
0
;
bits
=
LockResource16
(
handle
);
hIcon
=
CreateIconFromResourceEx16
(
bits
,
0
,
type
==
IMAGE_ICON
,
0x00030000
,
cx
,
cy
,
flags
);
size
=
SizeofResource16
(
hinst
,
hRsrc
);
hIcon
=
CreateIconFromResourceEx16
(
bits
,
size
,
type
==
IMAGE_ICON
,
0x00030000
,
cx
,
cy
,
flags
);
FreeResource16
(
handle
);
if
(
hIcon
&&
(
flags
&
LR_SHARED
))
add_shared_icon
(
hinst
,
hRsrc
,
hGroupRsrc
,
hIcon
);
...
...
@@ -2734,7 +2735,7 @@ WORD WINAPI GetIconID16( HGLOBAL16 hResource, DWORD resType )
*/
HICON16
WINAPI
LoadIconHandler16
(
HGLOBAL16
hResource
,
BOOL16
bNew
)
{
return
CreateIconFromResourceEx16
(
LockResource16
(
hResource
),
0
,
TRUE
,
return
CreateIconFromResourceEx16
(
LockResource16
(
hResource
),
0
xffff
,
TRUE
,
bNew
?
0x00030000
:
0x00020000
,
0
,
0
,
LR_DEFAULTCOLOR
);
}
...
...
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