[ros-diffs] [fireball] 50292: - Code cleanup: add source files for common function groups. - Change license information to better reflect the contents. - Move tons of different header includes in individual fi...

Author: fireball
Date: Wed Jan  5 20:15:19 2011
New Revision: 50292

URL: http://svn.reactos.org/svn/reactos?rev=50292&view=rev
Log:
- Code cleanup: add source files for common function groups.
- Change license information to better reflect the contents.
- Move tons of different header includes in individual files to one include set inside
winent.h.

Added:
    branches/arwinss/reactos/dll/win32/winent.drv/bitblt.c   (with props)
    branches/arwinss/reactos/dll/win32/winent.drv/dib.c   (with props)
    branches/arwinss/reactos/dll/win32/winent.drv/graphics.c   (with props)
    branches/arwinss/reactos/dll/win32/winent.drv/window.c
      - copied, changed from r50170, branches/arwinss/reactos/dll/win32/winent.drv/wnd.c
Removed:
    branches/arwinss/reactos/dll/win32/winent.drv/wnd.c
Modified:
    branches/arwinss/reactos/dll/win32/winent.drv/clipboard.c
    branches/arwinss/reactos/dll/win32/winent.drv/font.c
    branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c
    branches/arwinss/reactos/dll/win32/winent.drv/main.c
    branches/arwinss/reactos/dll/win32/winent.drv/mouse.c
    branches/arwinss/reactos/dll/win32/winent.drv/ogldrv.c
    branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c
    branches/arwinss/reactos/dll/win32/winent.drv/winent.h
    branches/arwinss/reactos/dll/win32/winent.drv/winent.rbuild

Added: branches/arwinss/reactos/dll/win32/winent.drv/bitblt.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen…
==============================================================================
--- branches/arwinss/reactos/dll/win32/winent.drv/bitblt.c (added)
+++ branches/arwinss/reactos/dll/win32/winent.drv/bitblt.c [iso-8859-1] Wed Jan  5
20:15:19 2011
@@ -1,0 +1,19 @@
+/*
+ * PROJECT:         ReactOS
+ * LICENSE:         GNU LGPL by FSF v2.1 or any later
+ * FILE:            dll/win32/winent.drv/bitblt.c
+ * PURPOSE:         GDI driver stub for ReactOS/Windows
+ * PROGRAMMERS:     Aleksey Bragin (aleksey(a)reactos.org)
+ */
+
+/* INCLUDES ***************************************************************/
+
+
+#include "winent.h"
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(bitblt);
+
+/* FUNCTIONS **************************************************************/
+
+/* EOF */

Propchange: branches/arwinss/reactos/dll/win32/winent.drv/bitblt.c
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: branches/arwinss/reactos/dll/win32/winent.drv/clipboard.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen…
==============================================================================
--- branches/arwinss/reactos/dll/win32/winent.drv/clipboard.c [iso-8859-1] (original)
+++ branches/arwinss/reactos/dll/win32/winent.drv/clipboard.c [iso-8859-1] Wed Jan  5
20:15:19 2011
@@ -11,24 +11,7 @@
  *                            2003 Ulrich Czekalla for CodeWeavers
  */
 
-#include <stdarg.h>
-#include <stdio.h>
-#define WIN32_NO_STATUS
-#include "windef.h"
-#include "winbase.h"
-#include "winuser.h"
-#include "winnls.h"
-#include "wingdi.h"
-#define NTOS_USER_MODE
-#include <ndk/ntndk.h>
-#include <winddi.h>
-#include <win32k/ntgdityp.h>
-#include "ntrosgdi.h"
-#include "wine/rosuser.h"
-#include "wine/list.h"
 #include "winent.h"
-#include "wine/unicode.h"
-#include "wine/server.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(clipboard);

Added: branches/arwinss/reactos/dll/win32/winent.drv/dib.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen…
==============================================================================
--- branches/arwinss/reactos/dll/win32/winent.drv/dib.c (added)
+++ branches/arwinss/reactos/dll/win32/winent.drv/dib.c [iso-8859-1] Wed Jan  5 20:15:19
2011
@@ -1,0 +1,18 @@
+/*
+ * PROJECT:         ReactOS
+ * LICENSE:         GNU LGPL by FSF v2.1 or any later
+ * FILE:            dll/win32/winent.drv/bitblt.c
+ * PURPOSE:         GDI driver stub for ReactOS/Windows
+ * PROGRAMMERS:     Aleksey Bragin (aleksey(a)reactos.org)
+ */
+
+/* INCLUDES ***************************************************************/
+
+#include "winent.h"
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(bitmap);
+
+/* FUNCTIONS **************************************************************/
+
+/* EOF */

Propchange: branches/arwinss/reactos/dll/win32/winent.drv/dib.c
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: branches/arwinss/reactos/dll/win32/winent.drv/font.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen…
==============================================================================
--- branches/arwinss/reactos/dll/win32/winent.drv/font.c [iso-8859-1] (original)
+++ branches/arwinss/reactos/dll/win32/winent.drv/font.c [iso-8859-1] Wed Jan  5 20:15:19
2011
@@ -1,6 +1,6 @@
 /*
  * PROJECT:         ReactOS
- * LICENSE:         LGPL
+ * LICENSE:         GNU LGPL by FSF v2.1 or any later
  * FILE:            dll/win32/winent.drv/font.c
  * PURPOSE:         Font Engine support functions
  * PROGRAMMERS:     Aleksey Bragin (aleksey(a)reactos.org)
@@ -8,20 +8,7 @@
 
 /* INCLUDES ***************************************************************/
 
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
-#include "windef.h"
-#include "winbase.h"
-#include "winuser.h"
-#include "wingdi.h"
-#include <winddi.h>
-#include <win32k/ntgdityp.h>
-#include "ntrosgdi.h"
-#include "wine/list.h"
 #include "winent.h"
-#include "wine/unicode.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(rosgdidrv);

Modified: branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen…
==============================================================================
--- branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c [iso-8859-1] (original)
+++ branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c [iso-8859-1] Wed Jan  5
20:15:19 2011
@@ -1,6 +1,6 @@
 /*
  * PROJECT:         ReactOS
- * LICENSE:         LGPL
+ * LICENSE:         GNU LGPL by FSF v2.1 or any later
  * FILE:            dll/win32/winent.drv/gdidrv.c
  * PURPOSE:         GDI driver stub for ReactOS/Windows
  * PROGRAMMERS:     Aleksey Bragin (aleksey(a)reactos.org)
@@ -8,18 +8,7 @@
 
 /* INCLUDES ***************************************************************/
 
-#include <stdarg.h>
-#include <stdio.h>
-#include "windef.h"
-#include "winbase.h"
-#include "winuser.h"
-#include "wingdi.h"
-#include <winddi.h>
-#include <win32k/ntgdityp.h>
-#include "ntrosgdi.h"
-#include "wine/list.h"
 #include "winent.h"
-#include <pseh/pseh2.h>
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(rosgdidrv);

Added: branches/arwinss/reactos/dll/win32/winent.drv/graphics.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen…
==============================================================================
--- branches/arwinss/reactos/dll/win32/winent.drv/graphics.c (added)
+++ branches/arwinss/reactos/dll/win32/winent.drv/graphics.c [iso-8859-1] Wed Jan  5
20:15:19 2011
@@ -1,0 +1,18 @@
+/*
+ * PROJECT:         ReactOS
+ * LICENSE:         GNU LGPL by FSF v2.1 or any later
+ * FILE:            dll/win32/winent.drv/graphics.c
+ * PURPOSE:         GDI high-level driver for ReactOS/Windows
+ * PROGRAMMERS:     Aleksey Bragin (aleksey(a)reactos.org)
+ */
+
+/* INCLUDES ***************************************************************/
+
+#include "winent.h"
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(graphics);
+
+/* FUNCTIONS **************************************************************/
+
+/* EOF */

Propchange: branches/arwinss/reactos/dll/win32/winent.drv/graphics.c
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: branches/arwinss/reactos/dll/win32/winent.drv/main.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen…
==============================================================================
--- branches/arwinss/reactos/dll/win32/winent.drv/main.c [iso-8859-1] (original)
+++ branches/arwinss/reactos/dll/win32/winent.drv/main.c [iso-8859-1] Wed Jan  5 20:15:19
2011
@@ -1,6 +1,6 @@
 /*
  * PROJECT:         ReactOS
- * LICENSE:         LGPL
+ * LICENSE:         GNU LGPL by FSF v2.1 or any later
  * FILE:            dll/win32/winent.drv/userdrv.c
  * PURPOSE:         User driver stub for ReactOS/Windows
  * PROGRAMMERS:     Aleksey Bragin (aleksey(a)reactos.org)
@@ -8,23 +8,7 @@
 
 /* INCLUDES ***************************************************************/
 
-#include <stdarg.h>
-#include <stdio.h>
-#define WIN32_NO_STATUS
-#include "windef.h"
-#include "winbase.h"
-#include "winuser.h"
-#include "wingdi.h"
-#include "shellapi.h"
-#define NTOS_USER_MODE
-#include <ndk/ntndk.h>
-#include <winddi.h>
-#include <win32k/ntgdityp.h>
-#include "ntrosgdi.h"
-#include "wine/rosuser.h"
-#include "wine/list.h"
 #include "winent.h"
-#include "wine/server.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(rosuserdrv);

Modified: branches/arwinss/reactos/dll/win32/winent.drv/mouse.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen…
==============================================================================
--- branches/arwinss/reactos/dll/win32/winent.drv/mouse.c [iso-8859-1] (original)
+++ branches/arwinss/reactos/dll/win32/winent.drv/mouse.c [iso-8859-1] Wed Jan  5 20:15:19
2011
@@ -19,22 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <stdarg.h>
-#include <stdio.h>
-#define WIN32_NO_STATUS
-#include "windef.h"
-#include "winbase.h"
-#include "winuser.h"
-#include "wingdi.h"
-#define NTOS_USER_MODE
-#include <ndk/ntndk.h>
-#include <winddi.h>
-#include <win32k/ntgdityp.h>
-#include "ntrosgdi.h"
-#include "wine/rosuser.h"
-#include "wine/list.h"
 #include "winent.h"
-#include "wine/server.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(cursor);

Modified: branches/arwinss/reactos/dll/win32/winent.drv/ogldrv.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen…
==============================================================================
--- branches/arwinss/reactos/dll/win32/winent.drv/ogldrv.c [iso-8859-1] (original)
+++ branches/arwinss/reactos/dll/win32/winent.drv/ogldrv.c [iso-8859-1] Wed Jan  5
20:15:19 2011
@@ -1,6 +1,6 @@
 /*
  * PROJECT:         ReactOS
- * LICENSE:         LGPL
+ * LICENSE:         GNU LGPL by FSF v2.1 or any later
  * FILE:            dll/win32/winent.drv/ogldrv.c
  * PURPOSE:         OpenGL driver for ReactOS/Windows
  * PROGRAMMERS:     Kamil Hornicek
@@ -8,11 +8,7 @@
 
 /* INCLUDES ***************************************************************/
 
-#include "windows.h"
-#include "wingdi.h"
-#include <winddi.h>
-#include <win32k/ntgdityp.h>
-#include "ntrosgdi.h"
+#include "winent.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(rosogldrv);

Modified: branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen…
==============================================================================
--- branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c [iso-8859-1] (original)
+++ branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c [iso-8859-1] Wed Jan  5
20:15:19 2011
@@ -1,6 +1,6 @@
 /*
  * PROJECT:         ReactOS
- * LICENSE:         LGPL
+ * LICENSE:         GNU LGPL by FSF v2.1 or any later
  * FILE:            dll/win32/winent.drv/userdrv.c
  * PURPOSE:         User driver stub for ReactOS/Windows
  * PROGRAMMERS:     Aleksey Bragin (aleksey(a)reactos.org)
@@ -8,22 +8,7 @@
 
 /* INCLUDES ***************************************************************/
 
-#include <stdarg.h>
-#include <stdio.h>
-#define WIN32_NO_STATUS
-#include "windef.h"
-#include "winbase.h"
-#include "winuser.h"
-#include "wingdi.h"
-#define NTOS_USER_MODE
-#include <ndk/ntndk.h>
-#include <winddi.h>
-#include <win32k/ntgdityp.h>
-#include "ntrosgdi.h"
-#include "wine/rosuser.h"
-#include "wine/list.h"
 #include "winent.h"
-#include "wine/server.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(rosuserdrv);

Copied: branches/arwinss/reactos/dll/win32/winent.drv/window.c (from r50170,
branches/arwinss/reactos/dll/win32/winent.drv/wnd.c)
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen…
==============================================================================
--- branches/arwinss/reactos/dll/win32/winent.drv/wnd.c [iso-8859-1] (original)
+++ branches/arwinss/reactos/dll/win32/winent.drv/window.c [iso-8859-1] Wed Jan  5
20:15:19 2011
@@ -1,29 +1,14 @@
 /*
  * PROJECT:         ReactOS
- * LICENSE:         LGPL
- * FILE:            dll/win32/winent.drv/wnd.c
+ * LICENSE:         GNU LGPL by FSF v2.1 or any later
+ * FILE:            dll/win32/winent.drv/window.c
  * PURPOSE:         Windows related functions
  * PROGRAMMERS:     Aleksey Bragin (aleksey(a)reactos.org)
  */
 
 /* INCLUDES ***************************************************************/
 
-#include <stdarg.h>
-#include <stdio.h>
-#define WIN32_NO_STATUS
-#include "windef.h"
-#include "winbase.h"
-#include "winuser.h"
-#include "wingdi.h"
-#define NTOS_USER_MODE
-#include <ndk/ntndk.h>
-#include <winddi.h>
-#include <win32k/ntgdityp.h>
-#include "ntrosgdi.h"
-#include "wine/rosuser.h"
-#include "wine/list.h"
 #include "winent.h"
-#include "wine/server.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(rosuserdrv);

Modified: branches/arwinss/reactos/dll/win32/winent.drv/winent.h
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen…
==============================================================================
--- branches/arwinss/reactos/dll/win32/winent.drv/winent.h [iso-8859-1] (original)
+++ branches/arwinss/reactos/dll/win32/winent.drv/winent.h [iso-8859-1] Wed Jan  5
20:15:19 2011
@@ -1,3 +1,43 @@
+/*
+ * WINENT driver definitions
+ *
+ * Copyright 2009 Aleksey Bragin
+ * Some parts taken from Wine project (winex11.drv)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include <stdarg.h>
+#include <stdio.h>
+#define WIN32_NO_STATUS
+#include "windef.h"
+#include "winbase.h"
+#include "winuser.h"
+#include "wingdi.h"
+#include "shellapi.h"
+#define NTOS_USER_MODE
+#include <ndk/ntndk.h>
+#include <winddi.h>
+#include <win32k/ntgdityp.h>
+#include "ntrosgdi.h"
+#include "wine/rosuser.h"
+#include "wine/list.h"
+#include "wine/unicode.h"
+#include "wine/server.h"
+#include <pseh/pseh2.h>
+
 /* GDI escapes */
 
 #define NTDRV_ESCAPE 6789

Modified: branches/arwinss/reactos/dll/win32/winent.drv/winent.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen…
==============================================================================
--- branches/arwinss/reactos/dll/win32/winent.drv/winent.rbuild [iso-8859-1] (original)
+++ branches/arwinss/reactos/dll/win32/winent.drv/winent.rbuild [iso-8859-1] Wed Jan  5
20:15:19 2011
@@ -6,13 +6,16 @@
 	<redefine name="_WIN32_WINNT">0x0501</redefine>
 	<define name="__WINESRC__" />
 	<define name="_WINE" />
+	<file>bitblt.c</file>
 	<file>clipboard.c</file>
+	<file>dib.c</file>
 	<file>font.c</file>
 	<file>gdidrv.c</file>
+	<file>graphics.c</file>
 	<file>main.c</file>
 	<file>userdrv.c</file>
 	<file>mouse.c</file>
-	<file>wnd.c</file>
+	<file>window.c</file>
 	<file>ogldrv.c</file>
 
 	<file>winent.rc</file>

Removed: branches/arwinss/reactos/dll/win32/winent.drv/wnd.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen…
==============================================================================
--- branches/arwinss/reactos/dll/win32/winent.drv/wnd.c [iso-8859-1] (original)
+++ branches/arwinss/reactos/dll/win32/winent.drv/wnd.c (removed)
@@ -1,288 +1,0 @@
-/*
- * PROJECT:         ReactOS
- * LICENSE:         LGPL
- * FILE:            dll/win32/winent.drv/wnd.c
- * PURPOSE:         Windows related functions
- * PROGRAMMERS:     Aleksey Bragin (aleksey(a)reactos.org)
- */
-
-/* INCLUDES ***************************************************************/
-
-#include <stdarg.h>
-#include <stdio.h>
-#define WIN32_NO_STATUS
-#include "windef.h"
-#include "winbase.h"
-#include "winuser.h"
-#include "wingdi.h"
-#define NTOS_USER_MODE
-#include <ndk/ntndk.h>
-#include <winddi.h>
-#include <win32k/ntgdityp.h>
-#include "ntrosgdi.h"
-#include "wine/rosuser.h"
-#include "wine/list.h"
-#include "winent.h"
-#include "wine/server.h"
-#include "wine/debug.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(rosuserdrv);
-
-static struct list wnd_data_list = LIST_INIT( wnd_data_list );
-static CRITICAL_SECTION wnd_data_cs;
-static CRITICAL_SECTION_DEBUG critsect_debug =
-{
-    0, 0, &wnd_data_cs,
-    { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList },
-      0, 0, { (DWORD_PTR)(__FILE__ ": wnd_data_cs") }
-};
-static CRITICAL_SECTION wnd_data_cs = { &critsect_debug, -1, 0, 0, 0, 0 };
-
-/* FUNCTIONS **************************************************************/
-
-VOID CDECL RosDrv_UpdateZOrder(HWND hwnd, RECT *rect)
-{
-        FIXME("hwnd %x rect (%d, %d)-(%d,%d)\n", hwnd,
-            rect->top, rect->left, rect->bottom, rect->right);
-
-        SERVER_START_REQ( update_window_zorder )
-        {
-            req->window      = wine_server_user_handle( hwnd );
-            req->rect.left   = rect->left;
-            req->rect.top    = rect->top;
-            req->rect.right  = rect->right;
-            req->rect.bottom = rect->bottom;
-            wine_server_call( req );
-        }
-        SERVER_END_REQ;
-}
-
-struct ntdrv_win_data *associate_create( HWND hwnd )
-{
-    struct ntdrv_win_data *data;
-
-    /* Insert our mapping */
-    data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct ntdrv_win_data));
-    if(!data) return NULL;
-
-    data->hwnd = hwnd;
-
-    EnterCriticalSection(&wnd_data_cs);
-    list_add_tail(&wnd_data_list, &data->entry);
-    LeaveCriticalSection(&wnd_data_cs);
-
-    return data;
-}
-
-VOID associate_destroy( struct ntdrv_win_data *data )
-{
-    EnterCriticalSection(&wnd_data_cs);
-    list_remove( &data->entry );
-    LeaveCriticalSection(&wnd_data_cs);
-
-    HeapFree( GetProcessHeap(), 0, data);
-}
-
-struct ntdrv_win_data *associate_find( HWND hwnd )
-{
-    struct ntdrv_win_data *item;
-    BOOL found = FALSE;
-
-    EnterCriticalSection(&wnd_data_cs);
-
-    LIST_FOR_EACH_ENTRY( item, &wnd_data_list, struct ntdrv_win_data, entry )
-        if (item->hwnd == hwnd)
-        {
-            found = TRUE;
-            break;
-        }
-
-    LeaveCriticalSection(&wnd_data_cs);
-
-    if (!found) item = NULL;
-
-    return item;
-}
-
-/***********************************************************************
- *		NTDRV_get_win_data
- *
- * Return the private data structure associated with a window.
- */
-struct ntdrv_win_data *NTDRV_get_win_data( HWND hwnd )
-{
-    struct ntdrv_win_data *data;
-
-    if (!hwnd) return NULL;
-
-    data = associate_find( hwnd );
-
-    return data;
-}
-
-
-/***********************************************************************
- *		NTDRV_create_win_data
- *
- * Create a private data window structure for an existing window.
- */
-struct ntdrv_win_data *NTDRV_create_win_data( HWND hwnd )
-{
-    struct ntdrv_win_data *data;
-    DWORD style, ex_style;
-    HWND parent;
-
-    if (!(parent = GetAncestor( hwnd, GA_PARENT ))) return NULL;  /* desktop */
-
-    /* don't create win data for HWND_MESSAGE windows */
-    if (parent != GetDesktopWindow() && !GetAncestor( parent, GA_PARENT )) return
NULL;
-
-    data = associate_create(hwnd);
-    if (!data) return NULL;
-
-    GetWindowRect( hwnd, &data->window_rect );
-    MapWindowPoints( 0, parent, (POINT *)&data->window_rect, 2 );
-    data->whole_rect = data->window_rect;
-    GetClientRect( hwnd, &data->client_rect );
-    MapWindowPoints( hwnd, parent, (POINT *)&data->client_rect, 2 );
-
-    if (parent == GetDesktopWindow())
-    {
-        TRACE( "win %p window %s whole %s client %s\n",
-               hwnd, wine_dbgstr_rect( &data->window_rect ),
-               wine_dbgstr_rect( &data->whole_rect ), wine_dbgstr_rect(
&data->client_rect ));
-
-        style = GetWindowLongW( data->hwnd, GWL_STYLE );
-        ex_style = GetWindowLongW( data->hwnd, GWL_EXSTYLE );
-
-        /* Inform window manager about window rect in screen coords */
-        SwmAddWindow(hwnd, &data->window_rect, style, ex_style);
-        data->whole_window = (PVOID)1;
-    }
-
-    return data;
-}
-
-/* initialize the desktop window id in the desktop manager process */
-struct ntdrv_win_data *NTDRV_create_desktop_win_data( HWND hwnd )
-{
-    struct ntdrv_win_data *data;
-
-    data = associate_create(hwnd);
-    if (!data) return NULL;
-
-    /* Mark it as being a whole window */
-    data->whole_window = (PVOID)1;
-
-    return data;
-}
-
-/***********************************************************************
- *		NTDRV_destroy_win_data
- *
- * Deletes a private data window structure for an existing window.
- */
-void NTDRV_destroy_win_data( HWND hwnd )
-{
-    struct ntdrv_win_data *data = NTDRV_get_win_data(hwnd);
-    if (!data) return;
-
-    /* Remove property and free its data */
-    associate_destroy( data );
-
-    /* Inform window manager */
-    SwmRemoveWindow( hwnd );
-}
-
-/***********************************************************************
- *     map_window
- */
-void map_window( struct ntdrv_win_data *data, DWORD new_style )
-{
-    TRACE( "win %p/%lx\n", data->hwnd, data->whole_window );
-
-    SwmShowWindow( data->hwnd, TRUE, 0);
-
-    data->mapped = TRUE;
-    data->iconic = (new_style & WS_MINIMIZE) != 0;
-}
-
-
-/***********************************************************************
- *     unmap_window
- */
-void unmap_window( struct ntdrv_win_data *data )
-{
-    TRACE( "win %p/%lx\n", data->hwnd, data->whole_window );
-
-    SwmShowWindow( data->hwnd, FALSE, 0);
-
-    data->mapped = FALSE;
-    //data->net_wm_state = 0;
-}
-
-/***********************************************************************
- *		is_window_rect_mapped
- *
- * Check if the SWM whole window should be mapped based on its rectangle
- */
-BOOL is_window_rect_mapped( const RECT *rect )
-{
-    /* don't map if rect is off-screen */
-    /*if (rect->left >= virtual_screen_rect.right ||
-        rect->top >= virtual_screen_rect.bottom ||
-        rect->right <= virtual_screen_rect.left ||
-        rect->bottom <= virtual_screen_rect.top)
-        return FALSE;*/
-
-    return TRUE;
-}
-
-/***********************************************************************
- *		sync_window_position
- *
- * Synchronize the SWM window position with the Windows one
- */
-void sync_window_position( struct ntdrv_win_data *data,
-                           UINT swp_flags, const RECT *old_window_rect,
-                           const RECT *old_whole_rect, const RECT *old_client_rect )
-{
-    SwmPosChanged(data->hwnd, &data->whole_rect, old_whole_rect, NULL,
swp_flags);
-
-    if (!(swp_flags & SWP_NOZORDER) || (swp_flags & SWP_SHOWWINDOW))
-    {
-        /* find window that this one must be after */
-        HWND prev = GetWindow( data->hwnd, GW_HWNDPREV );
-        while (prev && !(GetWindowLongW( prev, GWL_STYLE ) & WS_VISIBLE))
-            prev = GetWindow( prev, GW_HWNDPREV );
-        if (!prev)  /* top child */
-        {
-            /* Bring this window to foreground */
-            SwmSetForeground(data->hwnd);
-        }
-        /* should use stack_mode Below but most window managers don't get it right
*/
-        /* and Above with a sibling doesn't work so well either, so we ignore it */
-    }
-
-#ifdef HAVE_LIBXSHAPE
-    if (IsRectEmpty( old_window_rect ) != IsRectEmpty( &data->window_rect ))
-        sync_window_region( display, data, (HRGN)1 );
-    if (data->shaped)
-    {
-        int old_x_offset = old_window_rect->left - old_whole_rect->left;
-        int old_y_offset = old_window_rect->top - old_whole_rect->top;
-        int new_x_offset = data->window_rect.left - data->whole_rect.left;
-        int new_y_offset = data->window_rect.top - data->whole_rect.top;
-        if (old_x_offset != new_x_offset || old_y_offset != new_y_offset)
-            XShapeOffsetShape( display, data->whole_window, ShapeBounding,
-                               new_x_offset - old_x_offset, new_y_offset - old_y_offset
);
-    }
-#endif
-
-    TRACE( "win %p/%lx pos %d,%d,%dx%d\n",
-           data->hwnd, data->whole_window, data->whole_rect.left,
data->whole_rect.top,
-           data->whole_rect.right - data->whole_rect.left,
-           data->whole_rect.bottom - data->whole_rect.top );
-}
-
-/* EOF */