Maarten Lankhorst : user32: Fix a message test that would only pass on wine .

[Alexandre Julliard]

Module: wine
Branch: master
Commit: c6e61fbf892fe80bd34dfedeff3eaeeec43d0236
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=c6e61fbf892fe80bd34dfedeff...

Author: Maarten Lankhorst 
Date:   Wed Feb 13 15:43:21 2008 -0800

user32: Fix a message test that would only pass on wine.

---

dlls/user32/tests/msg.c |    2 +-
 dlls/user32/winpos.c    |    3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c
index 280b972..575d5d0 100644
--- a/dlls/user32/tests/msg.c
+++ b/dlls/user32/tests/msg.c
@@ -8936,7 +8936,7 @@ static const struct message WmSetWindowRgn_no_redraw[] = {
 };

static const struct message WmSetWindowRgn_clear[] = {
-    { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOSIZE|SWP_NOMOVE }, /* some versions of 2000/XP also has SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE in wparam */
+    { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE },
     { WM_NCCALCSIZE, sent|wparam, 1 },
     { WM_NCPAINT, sent }, /* wparam != 1 */
     { WM_GETTEXT, sent|defwinproc|optional },
diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c
index 40ff927..e6ab36c 100644
--- a/dlls/user32/winpos.c
+++ b/dlls/user32/winpos.c
@@ -273,8 +273,7 @@ int WINAPI SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL bRedraw )

if (ret)
     {
-        UINT swp_flags = SWP_NOSIZE|SWP_NOMOVE|SWP_NOZORDER|SWP_NOACTIVATE|SWP_FRAMECHANGED;
-        if (hrgn) swp_flags |= SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE;
+        UINT swp_flags = SWP_NOSIZE|SWP_NOMOVE|SWP_NOZORDER|SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE;
         if (!bRedraw) swp_flags |= SWP_NOREDRAW;
         SetWindowPos( hwnd, 0, 0, 0, 0, 0, swp_flags );
     }