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
2c1b7c8c
Commit
2c1b7c8c
authored
May 04, 2022
by
Jacek Caban
Committed by
Alexandre Julliard
May 06, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
winex11: Move LoadIcon call to dllmain.
Signed-off-by:
Jacek Caban
<
jacek@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
2f4a338d
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
1 deletion
+12
-1
dllmain.c
dlls/winex11.drv/dllmain.c
+7
-0
unixlib.h
dlls/winex11.drv/unixlib.h
+1
-0
window.c
dlls/winex11.drv/window.c
+4
-1
No files found.
dlls/winex11.drv/dllmain.c
View file @
2c1b7c8c
...
@@ -151,6 +151,12 @@ static NTSTATUS WINAPI x11drv_is_system_module( void *arg, ULONG size )
...
@@ -151,6 +151,12 @@ static NTSTATUS WINAPI x11drv_is_system_module( void *arg, ULONG size )
}
}
static
NTSTATUS
x11drv_load_icon
(
UINT
id
)
{
return
HandleToUlong
(
LoadIconW
(
NULL
,
UlongToPtr
(
id
)));
}
typedef
NTSTATUS
(
*
callback_func
)(
UINT
arg
);
typedef
NTSTATUS
(
*
callback_func
)(
UINT
arg
);
static
const
callback_func
callback_funcs
[]
=
static
const
callback_func
callback_funcs
[]
=
{
{
...
@@ -162,6 +168,7 @@ static const callback_func callback_funcs[] =
...
@@ -162,6 +168,7 @@ static const callback_func callback_funcs[] =
x11drv_ime_set_cursor_pos
,
x11drv_ime_set_cursor_pos
,
x11drv_ime_set_open_status
,
x11drv_ime_set_open_status
,
x11drv_ime_update_association
,
x11drv_ime_update_association
,
x11drv_load_icon
,
};
};
C_ASSERT
(
ARRAYSIZE
(
callback_funcs
)
==
client_funcs_count
);
C_ASSERT
(
ARRAYSIZE
(
callback_funcs
)
==
client_funcs_count
);
...
...
dlls/winex11.drv/unixlib.h
View file @
2c1b7c8c
...
@@ -117,6 +117,7 @@ enum client_callback
...
@@ -117,6 +117,7 @@ enum client_callback
client_ime_set_cursor_pos
,
client_ime_set_cursor_pos
,
client_ime_set_open_status
,
client_ime_set_open_status
,
client_ime_update_association
,
client_ime_update_association
,
client_load_icon
,
client_funcs_count
client_funcs_count
};
};
...
...
dlls/winex11.drv/window.c
View file @
2c1b7c8c
...
@@ -627,7 +627,10 @@ static void fetch_icon_data( HWND hwnd, HICON icon_big, HICON icon_small )
...
@@ -627,7 +627,10 @@ static void fetch_icon_data( HWND hwnd, HICON icon_big, HICON icon_small )
if
(
!
icon_big
)
if
(
!
icon_big
)
icon_big
=
get_icon_info
(
(
HICON
)
NtUserGetClassLongPtrW
(
hwnd
,
GCLP_HICON
),
&
ii
);
icon_big
=
get_icon_info
(
(
HICON
)
NtUserGetClassLongPtrW
(
hwnd
,
GCLP_HICON
),
&
ii
);
if
(
!
icon_big
)
if
(
!
icon_big
)
icon_big
=
get_icon_info
(
LoadIconW
(
0
,
(
LPWSTR
)
IDI_WINLOGO
),
&
ii
);
{
UINT
winlogo
=
x11drv_client_call
(
client_load_icon
,
IDI_WINLOGO
);
icon_big
=
get_icon_info
(
UlongToHandle
(
winlogo
),
&
ii
);
}
}
}
if
(
!
icon_small
)
if
(
!
icon_small
)
{
{
...
...
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