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
fe95de98
Commit
fe95de98
authored
Apr 07, 2017
by
Zebediah Figura
Committed by
Alexandre Julliard
Apr 25, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
user32: Move internal message from EnableWindow to WIN_SetStyle().
Signed-off-by:
Zebediah Figura
<
z.figura12@gmail.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
826871ba
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
7 additions
and
14 deletions
+7
-14
message.c
dlls/user32/message.c
+2
-2
spy.c
dlls/user32/spy.c
+1
-1
msg.c
dlls/user32/tests/msg.c
+2
-2
user_private.h
dlls/user32/user_private.h
+1
-1
win.c
dlls/user32/win.c
+1
-8
No files found.
dlls/user32/message.c
View file @
fe95de98
...
...
@@ -1867,9 +1867,9 @@ static LRESULT handle_internal_message( HWND hwnd, UINT msg, WPARAM wparam, LPAR
return
(
LRESULT
)
SetParent
(
hwnd
,
(
HWND
)
wparam
);
case
WM_WINE_SETWINDOWLONG
:
return
WIN_SetWindowLong
(
hwnd
,
(
short
)
LOWORD
(
wparam
),
HIWORD
(
wparam
),
lparam
,
TRUE
);
case
WM_WINE_
ENABLEWINDOW
:
case
WM_WINE_
SETSTYLE
:
if
(
is_desktop_window
(
hwnd
))
return
0
;
return
EnableWindow
(
hwnd
,
wparam
);
return
WIN_SetStyle
(
hwnd
,
wparam
,
lparam
);
case
WM_WINE_SETACTIVEWINDOW
:
if
(
is_desktop_window
(
hwnd
))
return
0
;
if
(
!
wparam
&&
GetForegroundWindow
()
==
hwnd
)
return
0
;
...
...
dlls/user32/spy.c
View file @
fe95de98
...
...
@@ -1136,7 +1136,7 @@ static const char * const WINEMessageTypeNames[SPY_MAX_WINEMSGNUM + 1] =
"WM_WINE_SHOWWINDOW"
,
"WM_WINE_SETPARENT"
,
"WM_WINE_SETWINDOWLONG"
,
"WM_WINE_
ENABLEWINDOW
"
,
"WM_WINE_
SETSTYLE
"
,
"WM_WINE_SETACTIVEWINDOW"
,
"WM_WINE_KEYBOARD_LL_HOOK"
,
"WM_WINE_MOUSE_LL_HOOK"
,
...
...
dlls/user32/tests/msg.c
View file @
fe95de98
...
...
@@ -16316,8 +16316,8 @@ static DWORD WINAPI SendMessage_thread_2(void *param)
PostMessageA
(
wnd_event
->
hwnd
,
WM_USER
+
1
,
0
,
0
);
/* this leads to sending an internal message under Wine */
trace
(
"thread: call
EnableWindow
\n
"
);
EnableWindow
(
wnd_event
->
hwnd
,
TRUE
);
trace
(
"thread: call
SetParent
\n
"
);
SetParent
(
wnd_event
->
hwnd
,
wnd_event
->
hwnd
);
trace
(
"thread: call SendMessage
\n
"
);
SendMessageA
(
wnd_event
->
hwnd
,
WM_USER
+
2
,
0
,
0
);
...
...
dlls/user32/user_private.h
View file @
fe95de98
...
...
@@ -48,7 +48,7 @@ enum wine_internal_message
WM_WINE_SHOWWINDOW
,
WM_WINE_SETPARENT
,
WM_WINE_SETWINDOWLONG
,
WM_WINE_
ENABLEWINDOW
,
WM_WINE_
SETSTYLE
,
WM_WINE_SETACTIVEWINDOW
,
WM_WINE_KEYBOARD_LL_HOOK
,
WM_WINE_MOUSE_LL_HOOK
,
...
...
dlls/user32/win.c
View file @
fe95de98
...
...
@@ -768,8 +768,7 @@ ULONG WIN_SetStyle( HWND hwnd, ULONG set_bits, ULONG clear_bits )
if
(
win
==
WND_OTHER_PROCESS
)
{
if
(
IsWindow
(
hwnd
))
ERR
(
"cannot set style %x/%x on other process window %p
\n
"
,
set_bits
,
clear_bits
,
hwnd
);
return
SendMessageW
(
hwnd
,
WM_WINE_SETSTYLE
,
set_bits
,
clear_bits
);
return
0
;
}
style
.
styleOld
=
win
->
dwStyle
;
...
...
@@ -2137,7 +2136,6 @@ HWND WINAPI GetDesktopWindow(void)
BOOL
WINAPI
EnableWindow
(
HWND
hwnd
,
BOOL
enable
)
{
BOOL
retvalue
;
HWND
full_handle
;
if
(
is_broadcast
(
hwnd
))
{
...
...
@@ -2145,11 +2143,6 @@ BOOL WINAPI EnableWindow( HWND hwnd, BOOL enable )
return
FALSE
;
}
if
(
!
(
full_handle
=
WIN_IsCurrentThread
(
hwnd
)))
return
SendMessageW
(
hwnd
,
WM_WINE_ENABLEWINDOW
,
enable
,
0
);
hwnd
=
full_handle
;
TRACE
(
"( %p, %d )
\n
"
,
hwnd
,
enable
);
if
(
enable
)
...
...
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