svn merge ^/branches/released .

4 files changed, 341 insertions, 345 deletions

diff --git a/xorg-server/hw/xwin/InitInput.c b/xorg-server/hw/xwin/InitInput.c
index 7d886a9fc..8740319cf 100644
--- a/xorg-server/hw/xwin/InitInput.c
+++ b/xorg-server/hw/xwin/InitInput.c
@@ -1,168 +1,168 @@
-/*
-
-  Copyright 1993, 1998  The Open Group
-
-  Permission to use, copy, modify, distribute, and sell this software and its
-  documentation for any purpose is hereby granted without fee, provided that
-  the above copyright notice appear in all copies and that both that
-  copyright notice and this permission notice appear in supporting
-  documentation.
-
-  The above copyright notice and this permission notice shall be included
-  in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-  OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-  IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-  OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-  ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-  OTHER DEALINGS IN THE SOFTWARE.
-
-  Except as contained in this notice, the name of The Open Group shall
-  not be used in advertising or otherwise to promote the sale, use or
-  other dealings in this Software without prior written authorization
-  from The Open Group.
-
-*/
-
-#ifdef HAVE_XWIN_CONFIG_H
-#include <xwin-config.h>
-#endif
-#include "win.h"
-#include "dixstruct.h"
-#include "inputstr.h"
-#include <unistd.h>
-
-/*
- * Local function prototypes
- */
-
-#ifdef XWIN_CLIPBOARD
-DISPATCH_PROC(winProcEstablishConnection);
-DISPATCH_PROC(winProcQueryTree);
-DISPATCH_PROC(winProcSetSelectionOwner);
-#endif
-
-
-/*
- * Local global declarations
- */
-
-DeviceIntPtr g_pwinPointer;
-DeviceIntPtr g_pwinKeyboard;
-
-
-/*
- * References to external symbols
- */
-
-#ifdef HAS_DEVWINDOWS
-extern int			g_fdMessageQueue;
-#endif
-extern Bool			g_fXdmcpEnabled;
-#ifdef XWIN_CLIPBOARD
-extern winDispatchProcPtr	winProcEstablishConnectionOrig;
-extern winDispatchProcPtr	winProcQueryTreeOrig;
-#endif
-
-
-/* Called from dix/devices.c */
-/*
- * All of our keys generate up and down transition notifications,
- * so all of our keys can be used as modifiers.
- * 
- * An example of a modifier is mapping the A key to the Control key.
- * A has to be a legal modifier.  I think.
- */
-
-Bool
-LegalModifier (unsigned int uiKey, DeviceIntPtr pDevice)
-{
-  return TRUE;
-}
-
-
-/* Called from dix/dispatch.c */
-/*
- * Run through the Windows message queue(s) one more time.
- * Tell mi to dequeue the events that we have sent it.
- */
-void
-ProcessInputEvents (void)
-{
-  mieqProcessInputEvents ();
-}
-
-
-void DDXRingBell(int volume, int pitch, int duration)
-{
-  /* winKeybdBell is used instead */
-  return;
-}
-
-
-/* See Porting Layer Definition - p. 17 */
-void
-InitInput (int argc, char *argv[])
-{
-  winDebug ("InitInput\n");
-
-#ifdef XWIN_CLIPBOARD
-  /*
-   * Wrap some functions at every generation of the server.
-   */
-  if (InitialVector[2] != winProcEstablishConnection)
-    {
-      winProcEstablishConnectionOrig = InitialVector[2];
-      InitialVector[2] = winProcEstablishConnection;
-    }
-  if (g_fXdmcpEnabled
-      && ProcVector[X_QueryTree] != winProcQueryTree)
-    {
-      winProcQueryTreeOrig = ProcVector[X_QueryTree];
-      ProcVector[X_QueryTree] = winProcQueryTree;
-    }
-#endif
-
-  g_pwinPointer = AddInputDevice (serverClient, winMouseProc, TRUE);
-  g_pwinKeyboard = AddInputDevice (serverClient, winKeybdProc, TRUE);
-  
-  RegisterPointerDevice (g_pwinPointer);
-  RegisterKeyboardDevice (g_pwinKeyboard);
-
-  g_pwinPointer->name = strdup("Windows mouse");
-  g_pwinKeyboard->name = strdup("Windows keyboard");
-
-  mieqInit ();
-
-  /* Initialize the mode key states */
-  winInitializeModeKeyStates ();
-
-#ifdef HAS_DEVWINDOWS
-  /* Only open the windows message queue device once */
-  if (g_fdMessageQueue == WIN_FD_INVALID)
-    {
-      /* Open a file descriptor for the Windows message queue */
-      g_fdMessageQueue = open (WIN_MSG_QUEUE_FNAME, O_RDONLY);
-      
-      if (g_fdMessageQueue == -1)
-	{
-	  FatalError ("InitInput - Failed opening %s\n",
-		      WIN_MSG_QUEUE_FNAME);
-	}
-
-      /* Add the message queue as a device to wait for in WaitForSomething */
-      AddEnabledDevice (g_fdMessageQueue);
-    }
-#endif
-
-  winDebug ("InitInput - returning\n");
-}
-
-void
-CloseInput (void)
-{
-  g_pwinPointer=NULL;
-  g_pwinKeyboard=NULL;
-}
+/*

+

+  Copyright 1993, 1998  The Open Group

+

+  Permission to use, copy, modify, distribute, and sell this software and its

+  documentation for any purpose is hereby granted without fee, provided that

+  the above copyright notice appear in all copies and that both that

+  copyright notice and this permission notice appear in supporting

+  documentation.

+

+  The above copyright notice and this permission notice shall be included

+  in all copies or substantial portions of the Software.

+

+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

+  OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

+  IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR

+  OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

+  ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

+  OTHER DEALINGS IN THE SOFTWARE.

+

+  Except as contained in this notice, the name of The Open Group shall

+  not be used in advertising or otherwise to promote the sale, use or

+  other dealings in this Software without prior written authorization

+  from The Open Group.

+

+*/

+

+#ifdef HAVE_XWIN_CONFIG_H

+#include <xwin-config.h>

+#endif

+#include "win.h"

+#include "dixstruct.h"

+#include "inputstr.h"

+#include <unistd.h>

+

+/*

+ * Local function prototypes

+ */

+

+#ifdef XWIN_CLIPBOARD

+int winProcEstablishConnection(ClientPtr /* client */);

+int winProcQueryTree(ClientPtr /* client */);

+int winProcSetSelectionOwner(ClientPtr /* client */);

+#endif

+

+

+/*

+ * Local global declarations

+ */

+

+DeviceIntPtr g_pwinPointer;

+DeviceIntPtr g_pwinKeyboard;

+

+

+/*

+ * References to external symbols

+ */

+

+#ifdef HAS_DEVWINDOWS

+extern int			g_fdMessageQueue;

+#endif

+extern Bool			g_fXdmcpEnabled;

+#ifdef XWIN_CLIPBOARD

+extern winDispatchProcPtr	winProcEstablishConnectionOrig;

+extern winDispatchProcPtr	winProcQueryTreeOrig;

+#endif

+

+

+/* Called from dix/devices.c */

+/*

+ * All of our keys generate up and down transition notifications,

+ * so all of our keys can be used as modifiers.

+ * 

+ * An example of a modifier is mapping the A key to the Control key.

+ * A has to be a legal modifier.  I think.

+ */

+

+Bool

+LegalModifier (unsigned int uiKey, DeviceIntPtr pDevice)

+{

+  return TRUE;

+}

+

+

+/* Called from dix/dispatch.c */

+/*

+ * Run through the Windows message queue(s) one more time.

+ * Tell mi to dequeue the events that we have sent it.

+ */

+void

+ProcessInputEvents (void)

+{

+  mieqProcessInputEvents ();

+}

+

+

+void DDXRingBell(int volume, int pitch, int duration)

+{

+  /* winKeybdBell is used instead */

+  return;

+}

+

+

+/* See Porting Layer Definition - p. 17 */

+void

+InitInput (int argc, char *argv[])

+{

+  winDebug ("InitInput\n");

+

+#ifdef XWIN_CLIPBOARD

+  /*

+   * Wrap some functions at every generation of the server.

+   */

+  if (InitialVector[2] != winProcEstablishConnection)

+    {

+      winProcEstablishConnectionOrig = InitialVector[2];

+      InitialVector[2] = winProcEstablishConnection;

+    }

+  if (g_fXdmcpEnabled

+      && ProcVector[X_QueryTree] != winProcQueryTree)

+    {

+      winProcQueryTreeOrig = ProcVector[X_QueryTree];

+      ProcVector[X_QueryTree] = winProcQueryTree;

+    }

+#endif

+

+  g_pwinPointer = AddInputDevice (serverClient, winMouseProc, TRUE);

+  g_pwinKeyboard = AddInputDevice (serverClient, winKeybdProc, TRUE);

+  

+  RegisterPointerDevice (g_pwinPointer);

+  RegisterKeyboardDevice (g_pwinKeyboard);

+

+  g_pwinPointer->name = strdup("Windows mouse");

+  g_pwinKeyboard->name = strdup("Windows keyboard");

+

+  mieqInit ();

+

+  /* Initialize the mode key states */

+  winInitializeModeKeyStates ();

+

+#ifdef HAS_DEVWINDOWS

+  /* Only open the windows message queue device once */

+  if (g_fdMessageQueue == WIN_FD_INVALID)

+    {

+      /* Open a file descriptor for the Windows message queue */

+      g_fdMessageQueue = open (WIN_MSG_QUEUE_FNAME, O_RDONLY);

+      

+      if (g_fdMessageQueue == -1)

+	{

+	  FatalError ("InitInput - Failed opening %s\n",

+		      WIN_MSG_QUEUE_FNAME);

+	}

+

+      /* Add the message queue as a device to wait for in WaitForSomething */

+      AddEnabledDevice (g_fdMessageQueue);

+    }

+#endif

+

+  winDebug ("InitInput - returning\n");

+}

+

+void

+CloseInput (void)

+{

+  g_pwinPointer=NULL;

+  g_pwinKeyboard=NULL;

+}

diff --git a/xorg-server/hw/xwin/winclipboardinit.c b/xorg-server/hw/xwin/winclipboardinit.c
index d451314fb..802b12fed 100644
--- a/xorg-server/hw/xwin/winclipboardinit.c
+++ b/xorg-server/hw/xwin/winclipboardinit.c
@@ -1,145 +1,145 @@
-/*
- *Copyright (C) 2003-2004 Harold L Hunt II All Rights Reserved.
- *
- *Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- *"Software"), to deal in the Software without restriction, including
- *without limitation the rights to use, copy, modify, merge, publish,
- *distribute, sublicense, and/or sell copies of the Software, and to
- *permit persons to whom the Software is furnished to do so, subject to
- *the following conditions:
- *
- *The above copyright notice and this permission notice shall be
- *included in all copies or substantial portions of the Software.
- *
- *THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- *MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *NONINFRINGEMENT. IN NO EVENT SHALL HAROLD L HUNT II BE LIABLE FOR
- *ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- *CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- *WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- *Except as contained in this notice, the name of Harold L Hunt II
- *shall not be used in advertising or otherwise to promote the sale, use
- *or other dealings in this Software without prior written authorization
- *from Harold L Hunt II.
- *
- * Authors:	Harold L Hunt II
- */
-
-#ifdef HAVE_XWIN_CONFIG_H
-#include <xwin-config.h>
-#endif
-#include "dixstruct.h"
-#include "winclipboard.h"
-
-
-/*
- * Local typedefs
- */
-
-typedef int (*winDispatchProcPtr) (ClientPtr);
-
-DISPATCH_PROC(winProcSetSelectionOwner);
-
-
-/*
- * References to external symbols
- */
-
-extern pthread_t		g_ptClipboardProc;
-extern winDispatchProcPtr	winProcSetSelectionOwnerOrig;
-extern Bool			g_fClipboard;
-extern HWND			g_hwndClipboard;
-
-
-/*
- * Intialize the Clipboard module
- */
-
-Bool
-winInitClipboard (void)
-{
-  winDebug ("winInitClipboard ()\n");
-
-  /* Wrap some internal server functions */
-  if (ProcVector[X_SetSelectionOwner] != winProcSetSelectionOwner)
-    {
-      winProcSetSelectionOwnerOrig = ProcVector[X_SetSelectionOwner];
-      ProcVector[X_SetSelectionOwner] = winProcSetSelectionOwner;
-    }
-  
-  /* Spawn a thread for the Clipboard module */
-  if (pthread_create (&g_ptClipboardProc,
-		      NULL,
-		      winClipboardProc,
-		      NULL))
-    {
-      /* Bail if thread creation failed */
-      ErrorF ("winInitClipboard - pthread_create failed.\n");
-      return FALSE;
-    }
-
-  return TRUE;
-}
-
-
-/*
- * Create the Windows window that we use to recieve Windows messages
- */
-
-HWND
-winClipboardCreateMessagingWindow (void)
-{
-  WNDCLASSEX			wc;
-  HWND				hwnd;
-
-  /* Setup our window class */
-  wc.cbSize=sizeof(WNDCLASSEX);
-  wc.style = CS_HREDRAW | CS_VREDRAW;
-  wc.lpfnWndProc = winClipboardWindowProc;
-  wc.cbClsExtra = 0;
-  wc.cbWndExtra = 0;
-  wc.hInstance = GetModuleHandle (NULL);
-  wc.hIcon = 0;
-  wc.hCursor = 0;
-  wc.hbrBackground = (HBRUSH) GetStockObject (WHITE_BRUSH);
-  wc.lpszMenuName = NULL;
-  wc.lpszClassName = WIN_CLIPBOARD_WINDOW_CLASS;
-  wc.hIconSm = 0;
-  RegisterClassEx (&wc);
-
-  /* Create the window */
-  hwnd = CreateWindowExA (0,			/* Extended styles */
-			  WIN_CLIPBOARD_WINDOW_CLASS,/* Class name */
-			  WIN_CLIPBOARD_WINDOW_TITLE,/* Window name */
-			  WS_OVERLAPPED,	/* Not visible anyway */
-			  CW_USEDEFAULT,	/* Horizontal position */
-			  CW_USEDEFAULT,	/* Vertical position */
-			  CW_USEDEFAULT,	/* Right edge */
-			  CW_USEDEFAULT,	/* Bottom edge */
-			  (HWND) NULL,		/* No parent or owner window */
-			  (HMENU) NULL,		/* No menu */
-			  GetModuleHandle (NULL),/* Instance handle */
-			  NULL);		/* Creation data */
-  assert (hwnd != NULL);
-
-  /* I'm not sure, but we may need to call this to start message processing */
-  ShowWindow (hwnd, SW_HIDE);
-
-  /* Similarly, we may need a call to this even though we don't paint */
-  UpdateWindow (hwnd);
-
-  return hwnd;
-}
-
-void
-winFixClipboardChain (void)
-{
-   if (g_fClipboard
-       && g_hwndClipboard)
-     {
-       PostMessage (g_hwndClipboard, WM_WM_REINIT, 0, 0);
-     }
-}
+/*

+ *Copyright (C) 2003-2004 Harold L Hunt II All Rights Reserved.

+ *

+ *Permission is hereby granted, free of charge, to any person obtaining

+ * a copy of this software and associated documentation files (the

+ *"Software"), to deal in the Software without restriction, including

+ *without limitation the rights to use, copy, modify, merge, publish,

+ *distribute, sublicense, and/or sell copies of the Software, and to

+ *permit persons to whom the Software is furnished to do so, subject to

+ *the following conditions:

+ *

+ *The above copyright notice and this permission notice shall be

+ *included in all copies or substantial portions of the Software.

+ *

+ *THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

+ *EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+ *MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

+ *NONINFRINGEMENT. IN NO EVENT SHALL HAROLD L HUNT II BE LIABLE FOR

+ *ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF

+ *CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

+ *WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+ *

+ *Except as contained in this notice, the name of Harold L Hunt II

+ *shall not be used in advertising or otherwise to promote the sale, use

+ *or other dealings in this Software without prior written authorization

+ *from Harold L Hunt II.

+ *

+ * Authors:	Harold L Hunt II

+ */

+

+#ifdef HAVE_XWIN_CONFIG_H

+#include <xwin-config.h>

+#endif

+#include "dixstruct.h"

+#include "winclipboard.h"

+

+

+/*

+ * Local typedefs

+ */

+

+typedef int (*winDispatchProcPtr) (ClientPtr);

+

+int winProcSetSelectionOwner(ClientPtr /* client */);

+

+

+/*

+ * References to external symbols

+ */

+

+extern pthread_t		g_ptClipboardProc;

+extern winDispatchProcPtr	winProcSetSelectionOwnerOrig;

+extern Bool			g_fClipboard;

+extern HWND			g_hwndClipboard;

+

+

+/*

+ * Intialize the Clipboard module

+ */

+

+Bool

+winInitClipboard (void)

+{

+  winDebug ("winInitClipboard ()\n");

+

+  /* Wrap some internal server functions */

+  if (ProcVector[X_SetSelectionOwner] != winProcSetSelectionOwner)

+    {

+      winProcSetSelectionOwnerOrig = ProcVector[X_SetSelectionOwner];

+      ProcVector[X_SetSelectionOwner] = winProcSetSelectionOwner;

+    }

+  

+  /* Spawn a thread for the Clipboard module */

+  if (pthread_create (&g_ptClipboardProc,

+		      NULL,

+		      winClipboardProc,

+		      NULL))

+    {

+      /* Bail if thread creation failed */

+      ErrorF ("winInitClipboard - pthread_create failed.\n");

+      return FALSE;

+    }

+

+  return TRUE;

+}

+

+

+/*

+ * Create the Windows window that we use to recieve Windows messages

+ */

+

+HWND

+winClipboardCreateMessagingWindow (void)

+{

+  WNDCLASSEX			wc;

+  HWND				hwnd;

+

+  /* Setup our window class */

+  wc.cbSize=sizeof(WNDCLASSEX);

+  wc.style = CS_HREDRAW | CS_VREDRAW;

+  wc.lpfnWndProc = winClipboardWindowProc;

+  wc.cbClsExtra = 0;

+  wc.cbWndExtra = 0;

+  wc.hInstance = GetModuleHandle (NULL);

+  wc.hIcon = 0;

+  wc.hCursor = 0;

+  wc.hbrBackground = (HBRUSH) GetStockObject (WHITE_BRUSH);

+  wc.lpszMenuName = NULL;

+  wc.lpszClassName = WIN_CLIPBOARD_WINDOW_CLASS;

+  wc.hIconSm = 0;

+  RegisterClassEx (&wc);

+

+  /* Create the window */

+  hwnd = CreateWindowExA (0,			/* Extended styles */

+			  WIN_CLIPBOARD_WINDOW_CLASS,/* Class name */

+			  WIN_CLIPBOARD_WINDOW_TITLE,/* Window name */

+			  WS_OVERLAPPED,	/* Not visible anyway */

+			  CW_USEDEFAULT,	/* Horizontal position */

+			  CW_USEDEFAULT,	/* Vertical position */

+			  CW_USEDEFAULT,	/* Right edge */

+			  CW_USEDEFAULT,	/* Bottom edge */

+			  (HWND) NULL,		/* No parent or owner window */

+			  (HMENU) NULL,		/* No menu */

+			  GetModuleHandle (NULL),/* Instance handle */

+			  NULL);		/* Creation data */

+  assert (hwnd != NULL);

+

+  /* I'm not sure, but we may need to call this to start message processing */

+  ShowWindow (hwnd, SW_HIDE);

+

+  /* Similarly, we may need a call to this even though we don't paint */

+  UpdateWindow (hwnd);

+

+  return hwnd;

+}

+

+void

+winFixClipboardChain (void)

+{

+   if (g_fClipboard

+       && g_hwndClipboard)

+     {

+       PostMessage (g_hwndClipboard, WM_WM_REINIT, 0, 0);

+     }

+}

diff --git a/xorg-server/hw/xwin/winclipboardwrappers.c b/xorg-server/hw/xwin/winclipboardwrappers.c
index 172365d27..3155b8c1f 100644
--- a/xorg-server/hw/xwin/winclipboardwrappers.c
+++ b/xorg-server/hw/xwin/winclipboardwrappers.c
@@ -52,9 +52,9 @@
  * Local function prototypes

  */

 

-DISPATCH_PROC(winProcEstablishConnection);

-DISPATCH_PROC(winProcQueryTree);

-DISPATCH_PROC(winProcSetSelectionOwner);

+int winProcEstablishConnection(ClientPtr /* client */);

+int winProcQueryTree(ClientPtr /* client */);

+int winProcSetSelectionOwner(ClientPtr /* client */);

 

 

 /*

diff --git a/xorg-server/hw/xwin/winwindowswm.c b/xorg-server/hw/xwin/winwindowswm.c
index 0d262c1ea..3c4a50433 100644
--- a/xorg-server/hw/xwin/winwindowswm.c
+++ b/xorg-server/hw/xwin/winwindowswm.c
@@ -44,10 +44,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "protocol-versions.h"

 

 static int WMErrorBase;

-

-static DISPATCH_PROC(ProcWindowsWMDispatch);

-static DISPATCH_PROC(SProcWindowsWMDispatch);

-

 static unsigned char WMReqCode = 0;

 static int WMEventBase = 0;

 

@@ -80,31 +76,6 @@ make_box (int x, int y, int w, int h)
   return r;

 }

 

-void

-winWindowsWMExtensionInit (void)

-{

-  ExtensionEntry* extEntry;

-

-  ClientType = CreateNewResourceType(WMFreeClient, "WMClient");

-  eventResourceType = CreateNewResourceType(WMFreeEvents, "WMEvent");

-  eventResource = FakeClientID(0);

-

-  if (ClientType && eventResourceType &&

-      (extEntry = AddExtension(WINDOWSWMNAME,

-			       WindowsWMNumberEvents,

-			       WindowsWMNumberErrors,

-			       ProcWindowsWMDispatch,

-			       SProcWindowsWMDispatch,

-			       NULL,

-			       StandardMinorOpcode)))

-    {

-      WMReqCode = (unsigned char)extEntry->base;

-      WMErrorBase = extEntry->errorBase;

-      WMEventBase = extEntry->eventBase;

-      EventSwapVector[WMEventBase] = (EventSwapPtr) SNotifyEvent;

-    }

-}

-

 static int

 ProcWindowsWMQueryVersion(register ClientPtr client)

 {

@@ -616,3 +587,28 @@ SProcWindowsWMDispatch (register ClientPtr client)
       return BadRequest;

     }

 }

+

+void

+winWindowsWMExtensionInit (void)

+{

+  ExtensionEntry* extEntry;

+

+  ClientType = CreateNewResourceType(WMFreeClient, "WMClient");

+  eventResourceType = CreateNewResourceType(WMFreeEvents, "WMEvent");

+  eventResource = FakeClientID(0);

+

+  if (ClientType && eventResourceType &&

+      (extEntry = AddExtension(WINDOWSWMNAME,

+			       WindowsWMNumberEvents,

+			       WindowsWMNumberErrors,

+			       ProcWindowsWMDispatch,

+			       SProcWindowsWMDispatch,

+			       NULL,

+			       StandardMinorOpcode)))

+    {

+      WMReqCode = (unsigned char)extEntry->base;

+      WMErrorBase = extEntry->errorBase;

+      WMEventBase = extEntry->eventBase;

+      EventSwapVector[WMEventBase] = (EventSwapPtr) SNotifyEvent;

+    }

+}