xserver: Branch 'master' - 3 commits

[Alan Hourihane]

 hw/xwin/winmouse.c              |    5 +++--
 hw/xwin/winmultiwindowwm.c      |    5 +----
 hw/xwin/winmultiwindowwndproc.c |    4 ++--
 3 files changed, 6 insertions(+), 8 deletions(-)

New commits:
diff-tree 86c4941727f7c673ae6bb88c67443fa25935c7f5 (from be44018a3c6172caf3e91c36ea321420d104e79f)
Author: Colin Harrison <colin.harrison-at-virgin.net>
Date:   Wed May 9 16:55:27 2007 +0100

    fix an occasional crash in GetWindowName() (bug: 9798)

diff --git a/hw/xwin/winmultiwindowwm.c b/hw/xwin/winmultiwindowwm.c
index 1918e54..5401ecd 100644
--- a/hw/xwin/winmultiwindowwm.c
+++ b/hw/xwin/winmultiwindowwm.c
@@ -445,10 +445,7 @@ GetWindowName (Display *pDisplay, Window
     }
   else
     {
-      XmbTextPropertyToTextList (pDisplay, &xtpName, &ppList, &nNum);
-
-      /* */
-      if (nNum && ppList && *ppList)
+      if (XmbTextPropertyToTextList (pDisplay, &xtpName, &ppList, &nNum) >= Success && nNum > 0 && *ppList)
 	{
 	  *ppName = strdup (*ppList);
 	  XFreeStringList (ppList);
diff-tree be44018a3c6172caf3e91c36ea321420d104e79f (from d3248b66a650c6c629cd66240e25004869217d2e)
Author: Colin Harrison <colin.harrison-at-virgin.net>
Date:   Wed May 9 16:55:09 2007 +0100

    Fix bad use of hwnd (bug: 9808)

diff --git a/hw/xwin/winmultiwindowwndproc.c b/hw/xwin/winmultiwindowwndproc.c
index 0df896d..47875b4 100644
--- a/hw/xwin/winmultiwindowwndproc.c
+++ b/hw/xwin/winmultiwindowwndproc.c
@@ -444,7 +444,7 @@ winTopLevelWindowProc (HWND hwnd, UINT m
       /* Avoid the BitBlt's if the PAINTSTRUCT is bogus */
       if (ps.rcPaint.right==0 && ps.rcPaint.bottom==0 && ps.rcPaint.left==0 && ps.rcPaint.top==0)
       {
-	EndPaint (hwndScreen, &ps);
+	EndPaint (hwnd, &ps);
 	return 0;
       }
 
@@ -474,7 +474,7 @@ winTopLevelWindowProc (HWND hwnd, UINT m
 	}
 
       /* EndPaint frees the DC */
-      EndPaint (hwndScreen, &ps);
+      EndPaint (hwnd, &ps);
       return 0;
 
     case WM_MOUSEMOVE:
diff-tree d3248b66a650c6c629cd66240e25004869217d2e (from 021e5df85d7c9373a2fed55512751d16e08128db)
Author: Colin Harrison <colin.harrison-at-virgin.net>
Date:   Wed May 9 16:54:46 2007 +0100

    Migrate some code to the new mi apis

diff --git a/hw/xwin/winmouse.c b/hw/xwin/winmouse.c
index f0092e9..1507dd3 100644
--- a/hw/xwin/winmouse.c
+++ b/hw/xwin/winmouse.c
@@ -100,9 +100,10 @@ winMouseProc (DeviceIntPtr pDeviceInt, i
       InitPointerDeviceStruct (pDevice,
 			       map,
 			       lngMouseButtons + lngWheelEvents,
-			       miPointerGetMotionEvents,
+			       GetMotionHistory,
 			       winMouseCtrl,
-			       miPointerGetMotionBufferSize ());
+			       GetMotionHistorySize(),
+			       2);
       free(map);
 
 #if defined(XFree86Server) && defined(XINPUT)