[jimtabor] 62613: [Win32k] - Fix wine win.c test_CreateWindow line 5470, pass all those tests.

Author: jimtabor
Date: Sat Apr  5 05:06:48 2014
New Revision: 62613

URL: http://svn.reactos.org/svn/reactos?rev=62613&view=rev
Log:
[Win32k]
- Fix wine win.c test_CreateWindow line 5470, pass all those tests.

Modified:
    trunk/reactos/win32ss/user/ntuser/window.c

Modified: trunk/reactos/win32ss/user/ntuser/window.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/window....
==============================================================================
--- trunk/reactos/win32ss/user/ntuser/window.c	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/ntuser/window.c	[iso-8859-1] Sat Apr  5 05:06:48 2014
@@ -1353,7 +1353,7 @@
    co_WinPosSetWindowPos( Wnd,
                          (0 == (Wnd->ExStyle & WS_EX_TOPMOST) ? HWND_TOP : HWND_TOPMOST),
                           pt.x, pt.y, 0, 0, swFlags);
-   //ERR("IntSetParent SetWindowPos 2\n");
+   //ERR("IntSetParent SetWindowPos 2 X %d Y %d\n",pt.x, pt.y);
    if (WasVisible) co_WinPosShowWindow(Wnd, SW_SHOWNORMAL);

return WndOldParent;
@@ -1742,12 +1742,12 @@

/* Allocates and initializes a window */
 PWND FASTCALL IntCreateWindow(CREATESTRUCTW* Cs,
-                                        PLARGE_STRING WindowName,
-                                        PCLS Class,
-                                        PWND ParentWindow,
-                                        PWND OwnerWindow,
-                                        PVOID acbiBuffer,
-                                        PDESKTOP pdeskCreated)
+                              PLARGE_STRING WindowName,
+                              PCLS Class,
+                              PWND ParentWindow,
+                              PWND OwnerWindow,
+                              PVOID acbiBuffer,
+                              PDESKTOP pdeskCreated)
 {
    PWND pWnd = NULL;
    HWND hWnd;
@@ -1759,8 +1759,8 @@
    pti = pdeskCreated ? gptiDesktopThread : GetW32ThreadInfo();

if (!(Cs->dwExStyle & WS_EX_LAYOUTRTL))
-   {
-      if (ParentWindow)
+   {      // Need both here for wine win.c test_CreateWindow.
+      if (Cs->hwndParent && ParentWindow)
       {
          if ( (Cs->style & (WS_CHILD|WS_POPUP)) == WS_CHILD &&
               ParentWindow->ExStyle & WS_EX_LAYOUTRTL &&
@@ -1776,7 +1776,6 @@
          */
          if ( Class->fnid != FNID_DIALOG )
          {
-            ERR("No parent and not a dialog Fix HACK\n");
             if (pti->ppi->dwLayout & LAYOUT_RTL)
             {
                Cs->dwExStyle |= WS_EX_LAYOUTRTL;
@@ -2115,10 +2114,7 @@
    }

/* Now find the parent and the owner window */
-   ///////////////
-   // FIXME!!!! Breaks wine win.c test_CreateWindow line 5470!
    hWndParent = pti->rpdesk->pDeskInfo->spwnd->head.h;
-   ///////////////
    hWndOwner = NULL;

if (Cs->hwndParent == HWND_MESSAGE)