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
f6f55058
Commit
f6f55058
authored
Nov 05, 2014
by
Sebastian Lackner
Committed by
Alexandre Julliard
Nov 21, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ole32: Don't process window events when APC calls are queued.
parent
bbf68910
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
1 deletion
+11
-1
compobj.c
dlls/ole32/compobj.c
+11
-0
compobj.c
dlls/ole32/tests/compobj.c
+0
-1
No files found.
dlls/ole32/compobj.c
View file @
f6f55058
...
@@ -4427,6 +4427,7 @@ HRESULT WINAPI CoWaitForMultipleHandles(DWORD dwFlags, DWORD dwTimeout,
...
@@ -4427,6 +4427,7 @@ HRESULT WINAPI CoWaitForMultipleHandles(DWORD dwFlags, DWORD dwTimeout,
DWORD
start_time
=
GetTickCount
();
DWORD
start_time
=
GetTickCount
();
APARTMENT
*
apt
=
COM_CurrentApt
();
APARTMENT
*
apt
=
COM_CurrentApt
();
BOOL
message_loop
=
apt
&&
!
apt
->
multi_threaded
;
BOOL
message_loop
=
apt
&&
!
apt
->
multi_threaded
;
BOOL
check_apc
=
(
dwFlags
&
COWAIT_ALERTABLE
)
!=
0
;
TRACE
(
"(0x%08x, 0x%08x, %d, %p, %p)
\n
"
,
dwFlags
,
dwTimeout
,
cHandles
,
TRACE
(
"(0x%08x, 0x%08x, %d, %p, %p)
\n
"
,
dwFlags
,
dwTimeout
,
cHandles
,
pHandles
,
lpdwindex
);
pHandles
,
lpdwindex
);
...
@@ -4460,6 +4461,16 @@ HRESULT WINAPI CoWaitForMultipleHandles(DWORD dwFlags, DWORD dwTimeout,
...
@@ -4460,6 +4461,16 @@ HRESULT WINAPI CoWaitForMultipleHandles(DWORD dwFlags, DWORD dwTimeout,
TRACE
(
"waiting for rpc completion or window message
\n
"
);
TRACE
(
"waiting for rpc completion or window message
\n
"
);
res
=
WAIT_TIMEOUT
;
if
(
check_apc
)
{
res
=
WaitForMultipleObjectsEx
(
cHandles
,
pHandles
,
(
dwFlags
&
COWAIT_WAITALL
)
!=
0
,
0
,
TRUE
);
check_apc
=
FALSE
;
}
if
(
res
==
WAIT_TIMEOUT
)
res
=
MsgWaitForMultipleObjectsEx
(
cHandles
,
pHandles
,
res
=
MsgWaitForMultipleObjectsEx
(
cHandles
,
pHandles
,
(
dwTimeout
==
INFINITE
)
?
INFINITE
:
start_time
+
dwTimeout
-
now
,
(
dwTimeout
==
INFINITE
)
?
INFINITE
:
start_time
+
dwTimeout
-
now
,
QS_SENDMESSAGE
|
QS_ALLPOSTMESSAGE
|
QS_PAINT
,
wait_flags
);
QS_SENDMESSAGE
|
QS_ALLPOSTMESSAGE
|
QS_PAINT
,
wait_flags
);
...
...
dlls/ole32/tests/compobj.c
View file @
f6f55058
...
@@ -2241,7 +2241,6 @@ static void test_CoWaitForMultipleHandles(void)
...
@@ -2241,7 +2241,6 @@ static void test_CoWaitForMultipleHandles(void)
ok
(
hr
==
S_OK
,
"expected S_OK, got 0x%08x
\n
"
,
hr
);
ok
(
hr
==
S_OK
,
"expected S_OK, got 0x%08x
\n
"
,
hr
);
ok
(
index
==
WAIT_IO_COMPLETION
,
"expected index WAIT_IO_COMPLETION, got %u
\n
"
,
index
);
ok
(
index
==
WAIT_IO_COMPLETION
,
"expected index WAIT_IO_COMPLETION, got %u
\n
"
,
index
);
success
=
PeekMessageA
(
&
msg
,
hWnd
,
WM_DDE_FIRST
,
WM_DDE_FIRST
,
PM_REMOVE
);
success
=
PeekMessageA
(
&
msg
,
hWnd
,
WM_DDE_FIRST
,
WM_DDE_FIRST
,
PM_REMOVE
);
todo_wine
ok
(
success
,
"CoWaitForMultipleHandles unexpectedly pumped messages
\n
"
);
ok
(
success
,
"CoWaitForMultipleHandles unexpectedly pumped messages
\n
"
);
/* test with COWAIT_INPUTAVAILABLE (semaphores are still locked) */
/* test with COWAIT_INPUTAVAILABLE (semaphores are still locked) */
...
...
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