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
7625e6ba
Commit
7625e6ba
authored
May 31, 2022
by
Jacek Caban
Committed by
Alexandre Julliard
May 31, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
win32u: Use user_callbacks for alertable NtWaitForMultipleObjects calls.
Wine-Bug:
https://bugs.winehq.org/show_bug.cgi?id=53020
Signed-off-by:
Jacek Caban
<
jacek@codeweavers.com
>
parent
2d4b85a9
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
2 deletions
+7
-2
user_main.c
dlls/user32/user_main.c
+1
-0
driver.c
dlls/win32u/driver.c
+5
-2
ntuser_private.h
dlls/win32u/ntuser_private.h
+1
-0
No files found.
dlls/user32/user_main.c
View file @
7625e6ba
...
...
@@ -162,6 +162,7 @@ static const struct user_callbacks user_funcs =
EndMenu
,
ImmProcessKey
,
ImmTranslateMessage
,
NtWaitForMultipleObjects
,
free_win_ptr
,
MENU_GetSysMenu
,
MENU_IsMenuActive
,
...
...
dlls/win32u/driver.c
View file @
7625e6ba
...
...
@@ -813,8 +813,11 @@ static NTSTATUS nulldrv_MsgWaitForMultipleObjectsEx( DWORD count, const HANDLE *
{
if
(
!
count
&&
timeout
&&
!
timeout
->
QuadPart
)
return
WAIT_TIMEOUT
;
return
NtWaitForMultipleObjects
(
count
,
handles
,
!
(
flags
&
MWMO_WAITALL
),
!!
(
flags
&
MWMO_ALERTABLE
),
timeout
);
if
(
!
user_callbacks
)
return
NtWaitForMultipleObjects
(
count
,
handles
,
!
(
flags
&
MWMO_WAITALL
),
!!
(
flags
&
MWMO_ALERTABLE
),
timeout
);
return
user_callbacks
->
pNtWaitForMultipleObjects
(
count
,
handles
,
!
(
flags
&
MWMO_WAITALL
),
!!
(
flags
&
MWMO_ALERTABLE
),
timeout
);
}
static
void
nulldrv_ReleaseDC
(
HWND
hwnd
,
HDC
hdc
)
...
...
dlls/win32u/ntuser_private.h
View file @
7625e6ba
...
...
@@ -35,6 +35,7 @@ struct user_callbacks
BOOL
(
WINAPI
*
pEndMenu
)(
void
);
BOOL
(
WINAPI
*
pImmProcessKey
)(
HWND
,
HKL
,
UINT
,
LPARAM
,
DWORD
);
BOOL
(
WINAPI
*
pImmTranslateMessage
)(
HWND
,
UINT
,
WPARAM
,
LPARAM
);
NTSTATUS
(
WINAPI
*
pNtWaitForMultipleObjects
)(
ULONG
,
const
HANDLE
*
,
BOOLEAN
,
BOOLEAN
,
const
LARGE_INTEGER
*
);
void
(
CDECL
*
free_win_ptr
)(
struct
tagWND
*
win
);
HMENU
(
CDECL
*
get_sys_menu
)(
HWND
hwnd
,
HMENU
popup
);
HWND
(
CDECL
*
is_menu_active
)(
void
);
...
...
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