xserver: Branch 'master' - 3 commits

[Jon TURNEY]

 hw/xwin/winclipboardinit.c |    6 ++++--
 hw/xwin/wincreatewnd.c     |   20 ++++++++++++++------
 hw/xwin/winwin32rootless.c |    6 +++---
 miext/Makefile.am          |    2 +-
 4 files changed, 22 insertions(+), 12 deletions(-)

New commits:
commit fad5f96c01811af7490a071719e4017c019a8d9b
Author: Jon TURNEY <jon.turney at dronecode.org.uk>
Date:   Wed Jul 29 13:50:48 2009 +0100

    Cygwin/X: Only try to build rootless extension if multiwindow extwm mode is being built
    
    Rootless extension still needs a bit more work to build successfully for Cygwin/X

diff --git a/miext/Makefile.am b/miext/Makefile.am
index 73a6577..84ab708 100644
--- a/miext/Makefile.am
+++ b/miext/Makefile.am
@@ -5,7 +5,7 @@ endif
 if XQUARTZ
 SUBDIRS += rootless
 endif
-if XWIN
+if XWIN_MULTIWINDOWEXTWM
 SUBDIRS += rootless
 endif
 DIST_SUBDIRS = damage shadow cw rootless
commit de2ae521abde445daaf025a07aa01563ca5ddd41
Author: Colin Harrison <colin.harrison at virgin.net>
Date:   Sun Jul 26 20:48:19 2009 +0100

    Xming: Use RegisterClassEx() instead of superseded RegisterClass()
    
    RegisterClass is supserseded by RegisterClassEx, so change to using that everywhere
    
    Signed-off-by: Jon TURNEY <jon.turney at dronecode.org.uk>

diff --git a/hw/xwin/winclipboardinit.c b/hw/xwin/winclipboardinit.c
index 3e73bc6..bec63ac 100644
--- a/hw/xwin/winclipboardinit.c
+++ b/hw/xwin/winclipboardinit.c
@@ -92,10 +92,11 @@ winInitClipboard (void)
 HWND
 winClipboardCreateMessagingWindow (void)
 {
-  WNDCLASS			wc;
+  WNDCLASSEX			wc;
   HWND				hwnd;
 
   /* Setup our window class */
+  wc.cbSize=sizeof(WNDCLASSEX);
   wc.style = CS_HREDRAW | CS_VREDRAW;
   wc.lpfnWndProc = winClipboardWindowProc;
   wc.cbClsExtra = 0;
@@ -106,7 +107,8 @@ winClipboardCreateMessagingWindow (void)
   wc.hbrBackground = (HBRUSH) GetStockObject (WHITE_BRUSH);
   wc.lpszMenuName = NULL;
   wc.lpszClassName = WIN_CLIPBOARD_WINDOW_CLASS;
-  RegisterClass (&wc);
+  wc.hIconSm = 0;
+  RegisterClassEx (&wc);
 
   /* Create the window */
   hwnd = CreateWindowExA (0,			/* Extended styles */
diff --git a/hw/xwin/wincreatewnd.c b/hw/xwin/wincreatewnd.c
index 85b6cf8..0c342e1 100644
--- a/hw/xwin/wincreatewnd.c
+++ b/hw/xwin/wincreatewnd.c
@@ -63,7 +63,7 @@ winCreateBoundingWindowFullScreen (ScreenPtr pScreen)
   int			iWidth = pScreenInfo->dwWidth;
   int			iHeight = pScreenInfo->dwHeight;
   HWND			*phwnd = &pScreenPriv->hwndScreen;
-  WNDCLASS		wc;
+  WNDCLASSEX		wc;
   char			szTitle[256];
 
 #if CYGDEBUG
@@ -71,17 +71,21 @@ winCreateBoundingWindowFullScreen (ScreenPtr pScreen)
 #endif
 
   /* Setup our window class */
+  wc.cbSize=sizeof(WNDCLASSEX);
   wc.style = CS_HREDRAW | CS_VREDRAW;
   wc.lpfnWndProc = winWindowProc;
   wc.cbClsExtra = 0;
   wc.cbWndExtra = 0;
   wc.hInstance = g_hInstance;
-  wc.hIcon = LoadIcon (g_hInstance, MAKEINTRESOURCE(IDI_XWIN));
+  wc.hIcon = (HICON)LoadImage (g_hInstance, MAKEINTRESOURCE(IDI_XWIN), IMAGE_ICON,
+		GetSystemMetrics(SM_CXICON), GetSystemMetrics(SM_CYICON), 0);
   wc.hCursor = 0;
   wc.hbrBackground = 0;
   wc.lpszMenuName = NULL;
   wc.lpszClassName = WINDOW_CLASS;
-  RegisterClass (&wc);
+  wc.hIconSm = (HICON)LoadImage (g_hInstance, MAKEINTRESOURCE(IDI_XWIN), IMAGE_ICON,
+		GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), LR_DEFAULTSIZE);
+  RegisterClassEx (&wc);
 
   /* Set display and screen-specific tooltip text */
   if (g_pszQueryHost != NULL)
@@ -152,7 +156,7 @@ winCreateBoundingWindowWindowed (ScreenPtr pScreen)
   int                   iPosX;
   int                   iPosY;
   HWND			*phwnd = &pScreenPriv->hwndScreen;
-  WNDCLASS		wc;
+  WNDCLASSEX		wc;
   RECT			rcClient, rcWorkArea;
   DWORD			dwWindowStyle;
   BOOL			fForceShowWindow = FALSE;
@@ -195,17 +199,21 @@ winCreateBoundingWindowWindowed (ScreenPtr pScreen)
     dwWindowStyle |= WS_POPUP;
 
   /* Setup our window class */
+  wc.cbSize=sizeof(WNDCLASSEX);
   wc.style = CS_HREDRAW | CS_VREDRAW;
   wc.lpfnWndProc = winWindowProc;
   wc.cbClsExtra = 0;
   wc.cbWndExtra = 0;
   wc.hInstance = g_hInstance;
-  wc.hIcon = LoadIcon (g_hInstance, MAKEINTRESOURCE(IDI_XWIN));
+  wc.hIcon = (HICON)LoadImage (g_hInstance, MAKEINTRESOURCE(IDI_XWIN), IMAGE_ICON,
+		GetSystemMetrics(SM_CXICON), GetSystemMetrics(SM_CYICON), 0);
   wc.hCursor = 0;
   wc.hbrBackground = (HBRUSH) GetStockObject (WHITE_BRUSH);
   wc.lpszMenuName = NULL;
   wc.lpszClassName = WINDOW_CLASS;
-  RegisterClass (&wc);
+  wc.hIconSm = (HICON)LoadImage (g_hInstance, MAKEINTRESOURCE(IDI_XWIN), IMAGE_ICON,
+		GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), LR_DEFAULTSIZE);
+  RegisterClassEx (&wc);
 
   /* Get size of work area */
   winGetWorkArea (&rcWorkArea, pScreenInfo);
commit 764ce6ee683db342264bbca4df6379eb6093fb85
Author: Colin Harrison <colin.harrison at virgin.net>
Date:   Tue Jul 28 16:16:57 2009 +0100

    Xming: Use GetClassLongPtr() instead of superseded GetClassLong()
    
    GetClassLong() is superseded by GetClassLongPtr(), so change to using that

diff --git a/hw/xwin/winwin32rootless.c b/hw/xwin/winwin32rootless.c
index a17c219..c225a44 100755
--- a/hw/xwin/winwin32rootless.c
+++ b/hw/xwin/winwin32rootless.c
@@ -398,9 +398,9 @@ winMWExtWMDestroyFrame (RootlessFrameID wid)
 #endif
 
   /* Store the info we need to destroy after this window is gone */
-  hInstance = (HINSTANCE) GetClassLong (pRLWinPriv->hWnd, GCL_HMODULE);
-  hiconClass = (HICON) GetClassLong (pRLWinPriv->hWnd, GCL_HICON);
-  hiconSmClass = (HICON) GetClassLong (pRLWinPriv->hWnd, GCL_HICONSM);
+  hInstance = (HINSTANCE) GetClassLongPtr (pRLWinPriv->hWnd, GCLP_HMODULE);
+  hiconClass = (HICON) GetClassLongPtr (pRLWinPriv->hWnd, GCLP_HICON);
+  hiconSmClass = (HICON) GetClassLongPtr (pRLWinPriv->hWnd, GCLP_HICONSM);
   iReturn = GetClassName (pRLWinPriv->hWnd, pszClass, CLASS_NAME_LENGTH);
 
   pRLWinPriv->fClose = TRUE;