ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Zebediah Figura 2017-04-07 14:17:08 -05:00 committed by Alexandre Julliard
parent 826871ba95
commit fe95de98b5
5 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/user32/message.c
View File

@ -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;

2
dlls/user32/spy.c
View File

@ -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",

4
dlls/user32/tests/msg.c
View File

@ -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);

2
dlls/user32/user_private.h
View File

@ -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,

9
dlls/user32/win.c
View File

@ -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)