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
c2f3a663
Commit
c2f3a663
authored
Oct 09, 2002
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Avoid infinite SendMessage recursion, just like Windows does.
parent
4ce72031
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
5 deletions
+17
-5
message.c
dlls/user/message.c
+14
-4
queue.h
include/queue.h
+3
-1
No files found.
dlls/user/message.c
View file @
c2f3a663
...
...
@@ -1339,10 +1339,18 @@ static BOOL unpack_dde_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM
*/
static
LRESULT
call_window_proc
(
HWND
hwnd
,
UINT
msg
,
WPARAM
wparam
,
LPARAM
lparam
,
BOOL
unicode
)
{
LRESULT
result
;
LRESULT
result
=
0
;
WNDPROC
winproc
;
MESSAGEQUEUE
*
queue
=
QUEUE_Current
();
if
(
queue
->
recursion_count
>
MAX_SENDMSG_RECURSION
)
return
0
;
queue
->
recursion_count
++
;
if
(
msg
&
0x80000000
)
return
handle_internal_message
(
hwnd
,
msg
,
wparam
,
lparam
);
if
(
msg
&
0x80000000
)
{
result
=
handle_internal_message
(
hwnd
,
msg
,
wparam
,
lparam
);
goto
done
;
}
/* first the WH_CALLWNDPROC hook */
if
(
HOOK_IsHooked
(
WH_CALLWNDPROC
))
...
...
@@ -1363,12 +1371,12 @@ static LRESULT call_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpar
/* now call the window procedure */
if
(
unicode
)
{
if
(
!
(
winproc
=
(
WNDPROC
)
GetWindowLongW
(
hwnd
,
GWL_WNDPROC
)))
return
0
;
if
(
!
(
winproc
=
(
WNDPROC
)
GetWindowLongW
(
hwnd
,
GWL_WNDPROC
)))
goto
done
;
result
=
CallWindowProcW
(
winproc
,
hwnd
,
msg
,
wparam
,
lparam
);
}
else
{
if
(
!
(
winproc
=
(
WNDPROC
)
GetWindowLongA
(
hwnd
,
GWL_WNDPROC
)))
return
0
;
if
(
!
(
winproc
=
(
WNDPROC
)
GetWindowLongA
(
hwnd
,
GWL_WNDPROC
)))
goto
done
;
result
=
CallWindowProcA
(
winproc
,
hwnd
,
msg
,
wparam
,
lparam
);
}
...
...
@@ -1384,6 +1392,8 @@ static LRESULT call_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpar
if
(
unicode
)
HOOK_CallHooksW
(
WH_CALLWNDPROCRET
,
HC_ACTION
,
1
,
(
LPARAM
)
&
cwp
);
else
HOOK_CallHooksA
(
WH_CALLWNDPROCRET
,
HC_ACTION
,
1
,
(
LPARAM
)
&
cwp
);
}
done:
queue
->
recursion_count
--
;
return
result
;
}
...
...
include/queue.h
View file @
c2f3a663
...
...
@@ -53,6 +53,7 @@ typedef struct tagMESSAGEQUEUE
HQUEUE16
self
;
/* Handle to self (was: reserved) */
TEB
*
teb
;
/* Thread owning queue */
HANDLE
server_queue
;
/* Handle to server-side queue */
DWORD
recursion_count
;
/* Counter to prevent infinite SendMessage recursion */
struct
received_message_info
*
receive_info
;
/* Info about message being currently received */
DWORD
magic
;
/* magic number should be QUEUE_MAGIC */
...
...
@@ -73,7 +74,8 @@ typedef struct tagMESSAGEQUEUE
}
MESSAGEQUEUE
;
#define QUEUE_MAGIC 0xD46E80AF
#define QUEUE_MAGIC 0xD46E80AF
#define MAX_SENDMSG_RECURSION 64
/* Per queue data management methods */
HWND
PERQDATA_GetFocusWnd
(
PERQUEUEDATA
*
pQData
);
...
...
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