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
ae3fbab8
Commit
ae3fbab8
authored
Dec 18, 1998
by
Ulrich Weigand
Committed by
Alexandre Julliard
Dec 18, 1998
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bugfix: always clear QS_... from *both* changeBits and waitBits.
Bugfix: queue->hSendingTask is *queue* handle, not task handle.
parent
d604eb12
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
14 deletions
+7
-14
message.c
windows/message.c
+4
-9
queue.c
windows/queue.c
+3
-5
No files found.
windows/message.c
View file @
ae3fbab8
...
...
@@ -608,7 +608,6 @@ static LRESULT MSG_SendMessage( HQUEUE16 hDestQueue, HWND16 hwnd, UINT16 msg,
if
(
!
(
queue
->
wakeBits
&
QS_SMPARAMSFREE
)
)
{
TRACE
(
sendmsg
,
"
\t
Intertask SendMessage: sleeping since unreplied SendMessage pending
\n
"
);
queue
->
changeBits
&=
~
QS_SMPARAMSFREE
;
QUEUE_WaitBits
(
QS_SMPARAMSFREE
);
}
...
...
@@ -622,7 +621,7 @@ static LRESULT MSG_SendMessage( HQUEUE16 hDestQueue, HWND16 hwnd, UINT16 msg,
queue
->
hPrevSendingTask
=
destQ
->
hSendingTask
;
destQ
->
hSendingTask
=
GetTaskQueue
(
0
);
queue
->
wakeBits
&=
~
QS_SMPARAMSFREE
;
QUEUE_ClearWakeBit
(
queue
,
QS_SMPARAMSFREE
)
;
queue
->
flags
=
(
queue
->
flags
&
~
(
QUEUE_SM_WIN32
|
QUEUE_SM_UNICODE
))
|
flags
;
TRACE
(
sendmsg
,
"%*ssm: smResultInit = %08x
\n
"
,
prevSMRL
,
""
,
(
unsigned
)
&
qCtrl
);
...
...
@@ -637,11 +636,7 @@ static LRESULT MSG_SendMessage( HQUEUE16 hDestQueue, HWND16 hwnd, UINT16 msg,
{
if
(
!
(
queue
->
wakeBits
&
QS_SMRESULT
))
{
queue
->
changeBits
&=
~
QS_SMRESULT
;
if
(
THREAD_IsWin16
(
THREAD_Current
()
))
DirectedYield
(
destQ
->
hTask
);
else
QUEUE_Signal
(
destQ
->
hTask
);
if
(
THREAD_IsWin16
(
THREAD_Current
()
))
DirectedYield
(
destQ
->
hTask
);
QUEUE_WaitBits
(
QS_SMRESULT
);
TRACE
(
sendmsg
,
"
\t
sm: have result!
\n
"
);
}
...
...
@@ -653,7 +648,7 @@ static LRESULT MSG_SendMessage( HQUEUE16 hDestQueue, HWND16 hwnd, UINT16 msg,
queue
->
smResult
->
lResult
=
queue
->
SendMessageReturn
;
queue
->
smResult
->
bPending
=
FALSE
;
}
queue
->
wakeBits
&=
~
QS_SMRESULT
;
QUEUE_ClearWakeBit
(
queue
,
QS_SMRESULT
)
;
if
(
queue
->
smResult
!=
&
qCtrl
)
ERR
(
sendmsg
,
"%*ssm: weird scenes inside the goldmine!
\n
"
,
prevSMRL
,
""
);
...
...
@@ -703,7 +698,7 @@ void WINAPI ReplyMessage16( LRESULT result )
queue
->
InSendMessageHandle
=
0
;
QUEUE_SetWakeBit
(
senderQ
,
QS_SMRESULT
);
if
(
THREAD_IsWin16
(
THREAD_Current
()))
DirectedYield
(
queue
->
hSending
Task
);
if
(
THREAD_IsWin16
(
THREAD_Current
()))
DirectedYield
(
senderQ
->
h
Task
);
}
...
...
windows/queue.c
View file @
ae3fbab8
...
...
@@ -361,10 +361,7 @@ void QUEUE_ReceiveMessage( MESSAGEQUEUE *queue )
{
TRACE
(
msg
,
"
\t
rcm: nothing to do
\n
"
);
return
;
}
if
(
!
senderQ
->
hPrevSendingTask
)
{
queue
->
wakeBits
&=
~
QS_SENDMESSAGE
;
/* no more sent messages */
queue
->
changeBits
&=
~
QS_SENDMESSAGE
;
}
QUEUE_ClearWakeBit
(
queue
,
QS_SENDMESSAGE
);
/* no more sent messages */
/* Save current state on stack */
prevSender
=
queue
->
InSendMessageHandle
;
...
...
@@ -445,7 +442,8 @@ void QUEUE_FlushMessages( HQUEUE16 hQueue )
TRACE
(
msg
,
"
\t
from queue %04x, smResult %08x
\n
"
,
queue
->
hSendingTask
,
(
unsigned
)
CtrlPtr
);
if
(
!
(
queue
->
hSendingTask
=
senderQ
->
hPrevSendingTask
)
)
queue
->
wakeBits
&=
~
QS_SENDMESSAGE
;
QUEUE_ClearWakeBit
(
queue
,
QS_SENDMESSAGE
);
QUEUE_SetWakeBit
(
senderQ
,
QS_SMPARAMSFREE
);
queue
->
smResultCurrent
=
CtrlPtr
;
...
...
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