Removed WIN_NATIVE flag.

dlls/x11drv/window.c

@@ -591,11 +591,7 @@ static void create_desktop( Display *display, WND *wndPtr )
     wine_tsx11_unlock();
 
     data->whole_window = data->client_window = root_window;
-    if (root_window != DefaultRootWindow(display))
-    {
-        wndPtr->flags |= WIN_NATIVE;
-        X11DRV_create_desktop_thread();
-    }
+    if (root_window != DefaultRootWindow(display)) X11DRV_create_desktop_thread();
 }
 
 
@@ -785,7 +781,6 @@ BOOL X11DRV_CreateWindow( HWND hwnd, CREATESTRUCTA *cs, BOOL unicode )
 
     wndPtr = WIN_FindWndPtr( hwnd );
     wndPtr->pDriverData = data;
-    wndPtr->flags |= WIN_NATIVE;
     WIN_ReleaseWndPtr( wndPtr );
 
     if (unicode)
@@ -793,7 +788,11 @@ BOOL X11DRV_CreateWindow( HWND hwnd, CREATESTRUCTA *cs, BOOL unicode )
     else
         ret = SendMessageA( hwnd, WM_NCCREATE, 0, (LPARAM)cs );
 
-    if (!ret) goto failed;
+    if (!ret)
+    {
+        X11DRV_DestroyWindow( hwnd );
+        return FALSE;
+    }
 
     TRACE( "hwnd %x cs %d,%d %dx%d\n", hwnd, cs->x, cs->y, cs->cx, cs->cy );
 
@@ -843,6 +842,7 @@ BOOL X11DRV_CreateWindow( HWND hwnd, CREATESTRUCTA *cs, BOOL unicode )
 
     /* Send the size messages */
 
+    if (!(wndPtr = WIN_FindWndPtr(hwnd))) return FALSE;
     if (!(wndPtr->flags & WIN_NEED_SIZE))
     {
         /* send it anyway */
@@ -875,6 +875,7 @@ BOOL X11DRV_CreateWindow( HWND hwnd, CREATESTRUCTA *cs, BOOL unicode )
                       newPos.right, newPos.bottom, swFlag );
     }
 
+    WIN_ReleaseWndPtr( wndPtr );
     return TRUE;
 
 

include/win.h

@@ -79,7 +79,6 @@ typedef struct
 #define WIN_NEEDS_NCPAINT      0x0004 /* WM_NCPAINT must be sent to window */
 #define WIN_RESTORE_MAX        0x0008 /* Maximize when restoring */
 #define WIN_INTERNAL_PAINT     0x0010 /* Internal WM_PAINT message pending */
-#define WIN_NATIVE	       0x0020 /* Directly mapped to the window provided by the driver */
 #define WIN_NEED_SIZE          0x0040 /* Internal WM_SIZE is needed */
 #define WIN_NCACTIVATED        0x0080 /* last WM_NCACTIVATE was positive */
 #define WIN_ISDIALOG           0x0200 /* Window is a dialog */

windows/dce.c

@@ -260,7 +260,6 @@ static INT DCE_ReleaseDC( DCE* dce )
 BOOL DCE_InvalidateDCE(WND* pWnd, const RECT* pRectUpdate)
 {
     WND* wndScope = WIN_LockWndPtr(pWnd->parent);
-    WND *pDesktop = WIN_GetDesktop();
     BOOL bRet = FALSE;
 
     if( wndScope )
@@ -293,13 +292,6 @@ BOOL DCE_InvalidateDCE(WND* pWnd, const RECT* pRectUpdate)
                         continue;
                     }
 
-		    if (wndCurrent == pDesktop && !(wndCurrent->flags & WIN_NATIVE))
-		    {
-			/* don't bother with fake desktop */
-                        WIN_ReleaseWndPtr(wndCurrent);
-			continue;
-		    }
-
 		    /* check if DCE window is within the z-order scope */
 
 		    for( wnd = WIN_LockWndPtr(wndCurrent); wnd; WIN_UpdateWndPtr(&wnd,wnd->parent))
@@ -351,7 +343,6 @@ BOOL DCE_InvalidateDCE(WND* pWnd, const RECT* pRectUpdate)
 	} /* dce list */
         WIN_ReleaseWndPtr(wndScope);
     }
-    WIN_ReleaseDesktop();
     return bRet;
 }