[pkg-wine-party] [SCM] Debian Wine packaging branch, wheezy, updated. wine-1.4-7-302-gb61b690
Alexandre Julliard
julliard at winehq.org
Sun Jun 17 20:04:06 UTC 2012
The following commit has been merged in the wheezy branch:
commit 1211b50f8ca24b83ba0f20ba67b7c74a96e2e032
Author: Dmitry Timoshkov <dmitry at baikal.ru>
Date: Fri Mar 23 16:57:28 2012 +0800
user32: SetParent() should use ShowWindow() to make a reparented window visible and move a window to new position.
(cherry picked from commit 847317d01983eed51a93ef57390fb6a266091b70)
diff --git a/dlls/user32/win.c b/dlls/user32/win.c
index 83eab2d..cc8461a 100644
--- a/dlls/user32/win.c
+++ b/dlls/user32/win.c
@@ -2787,6 +2787,7 @@ HWND WINAPI SetParent( HWND hwnd, HWND parent )
HWND old_parent = 0;
BOOL was_visible;
WND *wndPtr;
+ POINT pt;
BOOL ret;
if (is_broadcast(hwnd) || is_broadcast(parent))
@@ -2828,6 +2829,9 @@ HWND WINAPI SetParent( HWND hwnd, HWND parent )
wndPtr = WIN_GetPtr( hwnd );
if (!wndPtr || wndPtr == WND_OTHER_PROCESS || wndPtr == WND_DESKTOP) return 0;
+ pt.x = wndPtr->rectWindow.left;
+ pt.y = wndPtr->rectWindow.top;
+
SERVER_START_REQ( set_parent )
{
req->handle = wine_server_user_handle( hwnd );
@@ -2849,10 +2853,9 @@ HWND WINAPI SetParent( HWND hwnd, HWND parent )
in the x-order and send the expected WM_WINDOWPOSCHANGING and
WM_WINDOWPOSCHANGED notification messages.
*/
- SetWindowPos( hwnd, HWND_TOP, 0, 0, 0, 0,
- SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE | (was_visible ? SWP_SHOWWINDOW : 0) );
- /* FIXME: a WM_MOVE is also generated (in the DefWindowProc handler
- * for WM_WINDOWPOSCHANGED) in Windows, should probably remove SWP_NOMOVE */
+ SetWindowPos( hwnd, HWND_TOP, pt.x, pt.y, 0, 0, SWP_NOSIZE );
+
+ if (was_visible) ShowWindow( hwnd, SW_SHOW );
return old_parent;
}
--
Debian Wine packaging
More information about the pkg-wine-party
mailing list