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
6b8b9811
Commit
6b8b9811
authored
Jun 04, 2022
by
Jacek Caban
Committed by
Alexandre Julliard
Jun 06, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wineandroid: Implement desktop window proc using driver interface.
Signed-off-by:
Jacek Caban
<
jacek@codeweavers.com
>
parent
2887655b
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
7 deletions
+5
-7
desktop.c
dlls/user32/desktop.c
+1
-0
android.h
dlls/wineandroid.drv/android.h
+1
-0
init.c
dlls/wineandroid.drv/init.c
+1
-0
window.c
dlls/wineandroid.drv/window.c
+2
-7
No files found.
dlls/user32/desktop.c
View file @
6b8b9811
...
...
@@ -96,6 +96,7 @@ LRESULT WINAPI DesktopWndProc( HWND hwnd, UINT message, WPARAM wParam, LPARAM lP
{
case
WM_NCCREATE
:
case
WM_NCCALCSIZE
:
case
WM_PARENTNOTIFY
:
return
NtUserMessageCall
(
hwnd
,
message
,
wParam
,
lParam
,
0
,
NtUserDesktopWindowProc
,
FALSE
);
default:
...
...
dlls/wineandroid.drv/android.h
View file @
6b8b9811
...
...
@@ -88,6 +88,7 @@ extern void ANDROID_DestroyWindow( HWND hwnd ) DECLSPEC_HIDDEN;
extern
NTSTATUS
ANDROID_MsgWaitForMultipleObjectsEx
(
DWORD
count
,
const
HANDLE
*
handles
,
const
LARGE_INTEGER
*
timeout
,
DWORD
mask
,
DWORD
flags
)
DECLSPEC_HIDDEN
;
extern
LRESULT
ANDROID_DesktopWindowProc
(
HWND
hwnd
,
UINT
msg
,
WPARAM
wp
,
LPARAM
lp
)
DECLSPEC_HIDDEN
;
extern
void
ANDROID_SetCursor
(
HCURSOR
handle
)
DECLSPEC_HIDDEN
;
extern
void
ANDROID_SetLayeredWindowAttributes
(
HWND
hwnd
,
COLORREF
key
,
BYTE
alpha
,
DWORD
flags
)
DECLSPEC_HIDDEN
;
...
...
dlls/wineandroid.drv/init.c
View file @
6b8b9811
...
...
@@ -343,6 +343,7 @@ static const struct user_driver_funcs android_drv_funcs =
.
pEnumDisplaySettingsEx
=
ANDROID_EnumDisplaySettingsEx
,
.
pUpdateDisplayDevices
=
ANDROID_UpdateDisplayDevices
,
.
pCreateWindow
=
ANDROID_CreateWindow
,
.
pDesktopWindowProc
=
ANDROID_DesktopWindowProc
,
.
pDestroyWindow
=
ANDROID_DestroyWindow
,
.
pMsgWaitForMultipleObjectsEx
=
ANDROID_MsgWaitForMultipleObjectsEx
,
.
pSetCapture
=
ANDROID_SetCapture
,
...
...
dlls/wineandroid.drv/window.c
View file @
6b8b9811
...
...
@@ -1186,9 +1186,7 @@ static int get_cursor_system_id( const ICONINFOEXW *info )
}
static
WNDPROC
desktop_orig_wndproc
;
static
LRESULT
CALLBACK
desktop_wndproc_wrapper
(
HWND
hwnd
,
UINT
msg
,
WPARAM
wp
,
LPARAM
lp
)
LRESULT
ANDROID_DesktopWindowProc
(
HWND
hwnd
,
UINT
msg
,
WPARAM
wp
,
LPARAM
lp
)
{
switch
(
msg
)
{
...
...
@@ -1196,7 +1194,7 @@ static LRESULT CALLBACK desktop_wndproc_wrapper( HWND hwnd, UINT msg, WPARAM wp,
if
(
LOWORD
(
wp
)
==
WM_DESTROY
)
destroy_ioctl_window
(
(
HWND
)
lp
,
FALSE
);
break
;
}
return
desktop_orig_wndproc
(
hwnd
,
msg
,
wp
,
lp
);
return
NtUserMessageCall
(
hwnd
,
msg
,
wp
,
lp
,
0
,
NtUserDefWindowProc
,
FALSE
);
}
...
...
@@ -1655,9 +1653,6 @@ LRESULT ANDROID_WindowMessage( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp )
*/
BOOL
CDECL
ANDROID_create_desktop
(
UINT
width
,
UINT
height
)
{
desktop_orig_wndproc
=
(
WNDPROC
)
SetWindowLongPtrW
(
GetDesktopWindow
(),
GWLP_WNDPROC
,
(
LONG_PTR
)
desktop_wndproc_wrapper
);
/* wait until we receive the surface changed event */
while
(
!
screen_width
)
{
...
...
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