Merge remote-tracking branch 'origin/released'

Conflicts:
	pixman/pixman/pixman-mmx.c
	xorg-server/Xext/shm.c
	xorg-server/Xext/syncsrv.h
	xorg-server/Xext/xvmain.c
	xorg-server/Xi/exevents.c
	xorg-server/Xi/opendev.c
	xorg-server/composite/compalloc.c
	xorg-server/composite/compoverlay.c
	xorg-server/dix/colormap.c
	xorg-server/dix/devices.c
	xorg-server/dix/dispatch.c
	xorg-server/dix/dixfonts.c
	xorg-server/dix/eventconvert.c
	xorg-server/dix/events.c
	xorg-server/dix/gc.c
	xorg-server/dix/getevents.c
	xorg-server/dix/main.c
	xorg-server/dix/privates.c
	xorg-server/dix/registry.c
	xorg-server/dix/resource.c
	xorg-server/exa/exa_accel.c
	xorg-server/exa/exa_migration_classic.c
	xorg-server/exa/exa_unaccel.c
	xorg-server/fb/fb.h
	xorg-server/fb/fbcopy.c
	xorg-server/fb/fbpixmap.c
	xorg-server/glx/dispatch.h
	xorg-server/glx/glapi.h
	xorg-server/glx/glapi_gentable.c
	xorg-server/glx/glapitable.h
	xorg-server/glx/glprocs.h
	xorg-server/glx/glxcmds.c
	xorg-server/glx/glxcmdsswap.c
	xorg-server/glx/glxdricommon.c
	xorg-server/glx/glxdriswrast.c
	xorg-server/glx/glxext.c
	xorg-server/glx/indirect_dispatch.c
	xorg-server/glx/indirect_dispatch.h
	xorg-server/glx/indirect_dispatch_swap.c
	xorg-server/glx/indirect_size.h
	xorg-server/glx/indirect_size_get.h
	xorg-server/glx/indirect_table.c
	xorg-server/glx/indirect_util.c
	xorg-server/glx/rensize.c
	xorg-server/glx/single2swap.c
	xorg-server/glx/singlepix.c
	xorg-server/glx/singlepixswap.c
	xorg-server/glx/singlesize.c
	xorg-server/hw/dmx/dmxinit.c
	xorg-server/hw/kdrive/ephyr/ephyr.c
	xorg-server/hw/kdrive/ephyr/hostx.c
	xorg-server/hw/kdrive/ephyr/hostx.h
	xorg-server/hw/kdrive/src/kinput.c
	xorg-server/hw/xfree86/common/compiler.h
	xorg-server/hw/xwin/InitInput.c
	xorg-server/hw/xwin/InitOutput.c
	xorg-server/hw/xwin/ddraw.h
	xorg-server/hw/xwin/glx/glwrap.c
	xorg-server/hw/xwin/glx/indirect.c
	xorg-server/hw/xwin/glx/wgl_ext_api.h
	xorg-server/hw/xwin/glx/winpriv.c
	xorg-server/hw/xwin/win.h
	xorg-server/hw/xwin/winallpriv.c
	xorg-server/hw/xwin/winauth.c
	xorg-server/hw/xwin/winclipboard.h
	xorg-server/hw/xwin/winclipboardinit.c
	xorg-server/hw/xwin/winclipboardthread.c
	xorg-server/hw/xwin/winclipboardunicode.c
	xorg-server/hw/xwin/winclipboardwndproc.c
	xorg-server/hw/xwin/winclipboardwrappers.c
	xorg-server/hw/xwin/winclipboardxevents.c
	xorg-server/hw/xwin/wincmap.c
	xorg-server/hw/xwin/winconfig.c
	xorg-server/hw/xwin/wincreatewnd.c
	xorg-server/hw/xwin/wincursor.c
	xorg-server/hw/xwin/windialogs.c
	xorg-server/hw/xwin/winengine.c
	xorg-server/hw/xwin/winerror.c
	xorg-server/hw/xwin/wingc.c
	xorg-server/hw/xwin/wingetsp.c
	xorg-server/hw/xwin/winkeybd.c
	xorg-server/hw/xwin/winkeybd.h
	xorg-server/hw/xwin/winlayouts.h
	xorg-server/hw/xwin/winmisc.c
	xorg-server/hw/xwin/winmonitors.c
	xorg-server/hw/xwin/winmouse.c
	xorg-server/hw/xwin/winmsg.c
	xorg-server/hw/xwin/winmsg.h
	xorg-server/hw/xwin/winmultiwindowclass.c
	xorg-server/hw/xwin/winmultiwindowicons.c
	xorg-server/hw/xwin/winmultiwindowshape.c
	xorg-server/hw/xwin/winmultiwindowwindow.c
	xorg-server/hw/xwin/winmultiwindowwm.c
	xorg-server/hw/xwin/winmultiwindowwndproc.c
	xorg-server/hw/xwin/winnativegdi.c
	xorg-server/hw/xwin/winpfbdd.c
	xorg-server/hw/xwin/winpixmap.c
	xorg-server/hw/xwin/winpolyline.c
	xorg-server/hw/xwin/winprefs.c
	xorg-server/hw/xwin/winprocarg.c
	xorg-server/hw/xwin/winregistry.c
	xorg-server/hw/xwin/winscrinit.c
	xorg-server/hw/xwin/winsetsp.c
	xorg-server/hw/xwin/winshaddd.c
	xorg-server/hw/xwin/winshadddnl.c
	xorg-server/hw/xwin/winshadgdi.c
	xorg-server/hw/xwin/wintrayicon.c
	xorg-server/hw/xwin/winwin32rootless.c
	xorg-server/hw/xwin/winwin32rootlesswindow.c
	xorg-server/hw/xwin/winwin32rootlesswndproc.c
	xorg-server/hw/xwin/winwindow.c
	xorg-server/hw/xwin/winwindow.h
	xorg-server/hw/xwin/winwindowswm.c
	xorg-server/hw/xwin/winwndproc.c
	xorg-server/include/callback.h
	xorg-server/include/dixstruct.h
	xorg-server/include/misc.h
	xorg-server/include/os.h
	xorg-server/include/scrnintstr.h
	xorg-server/mi/micmap.c
	xorg-server/mi/miinitext.c
	xorg-server/mi/mioverlay.c
	xorg-server/mi/misprite.c
	xorg-server/mi/mivaltree.c
	xorg-server/mi/miwindow.c
	xorg-server/miext/damage/damage.c
	xorg-server/miext/rootless/rootlessGC.c
	xorg-server/miext/rootless/rootlessWindow.c
	xorg-server/os/WaitFor.c
	xorg-server/os/access.c
	xorg-server/os/connection.c
	xorg-server/os/io.c
	xorg-server/os/log.c
	xorg-server/os/osinit.c
	xorg-server/os/utils.c
	xorg-server/os/xdmcp.c
	xorg-server/os/xprintf.c
	xorg-server/os/xstrans.c
	xorg-server/render/mipict.c
	xorg-server/xkb/xkbActions.c
	xorg-server/xkb/xkbInit.c
	xorg-server/xkeyboard-config/compat/default.in

1 files changed, 194 insertions, 212 deletions

diff --git a/xorg-server/hw/xwin/winengine.c b/xorg-server/hw/xwin/winengine.c
index 3f5048dcd..b118864bb 100644
--- a/xorg-server/hw/xwin/winengine.c
+++ b/xorg-server/hw/xwin/winengine.c
@@ -38,8 +38,8 @@
  * Global variables for function pointers into
  * dynamically loaded libraries
  */
-FARPROC		g_fpDirectDrawCreate = NULL;
-FARPROC		g_fpDirectDrawCreateClipper = NULL;
+FARPROC g_fpDirectDrawCreate = NULL;
+FARPROC g_fpDirectDrawCreateClipper = NULL;
 
 /*
   module handle for dynamically loaded directdraw library
@@ -52,86 +52,82 @@ static HMODULE g_hmodDirectDraw = NULL;
  */
 
 void
-winDetectSupportedEngines (void)
+winDetectSupportedEngines(void)
 {
-  OSVERSIONINFO		osvi;
+    OSVERSIONINFO osvi;
 
-  /* Initialize the engine support flags */
-  g_dwEnginesSupported = WIN_SERVER_SHADOW_GDI;
+    /* Initialize the engine support flags */
+    g_dwEnginesSupported = WIN_SERVER_SHADOW_GDI;
 
 #ifdef XWIN_NATIVEGDI
-  g_dwEnginesSupported |= WIN_SERVER_NATIVE_GDI;
+    g_dwEnginesSupported |= WIN_SERVER_NATIVE_GDI;
 #endif
 
-  /* Get operating system version information */
-  ZeroMemory (&osvi, sizeof (osvi));
-  osvi.dwOSVersionInfoSize = sizeof (osvi);
-  GetVersionEx (&osvi);
-
-  /* Do we have DirectDraw? */
-  if (g_hmodDirectDraw != NULL)
-    {
-      LPDIRECTDRAW	lpdd = NULL;
-      LPDIRECTDRAW4	lpdd4 = NULL;
-      HRESULT		ddrval;
-
-      /* Was the DirectDrawCreate function found? */
-      if (g_fpDirectDrawCreate == NULL)
-	{
-	  /* No DirectDraw support */
-	  return;
-	}
-
-      /* DirectDrawCreate exists, try to call it */
-      /* Create a DirectDraw object, store the address at lpdd */
-      ddrval = (*g_fpDirectDrawCreate) (NULL,
-					(void**) &lpdd,
-					NULL);
-      if (FAILED (ddrval))
-	{
-	  /* No DirectDraw support */
-	  winDebug ("winDetectSupportedEngines - DirectDraw not installed\n");
-	  return;
-	}
-      else
-	{
-	  /* We have DirectDraw */
-	  winDebug ("winDetectSupportedEngines - DirectDraw installed\n");
-	  g_dwEnginesSupported |= WIN_SERVER_SHADOW_DD;
+    /* Get operating system version information */
+    ZeroMemory(&osvi, sizeof(osvi));
+    osvi.dwOSVersionInfoSize = sizeof(osvi);
+    GetVersionEx(&osvi);
+
+    /* Do we have DirectDraw? */
+    if (g_hmodDirectDraw != NULL) {
+        LPDIRECTDRAW lpdd = NULL;
+        LPDIRECTDRAW4 lpdd4 = NULL;
+        HRESULT ddrval;
+
+        /* Was the DirectDrawCreate function found? */
+        if (g_fpDirectDrawCreate == NULL) {
+            /* No DirectDraw support */
+            return;
+        }
+
+        /* DirectDrawCreate exists, try to call it */
+        /* Create a DirectDraw object, store the address at lpdd */
+        ddrval = (*g_fpDirectDrawCreate) (NULL, (void **) &lpdd, NULL);
+        if (FAILED(ddrval)) {
+            /* No DirectDraw support */
+            winDebug (
+                          "winDetectSupportedEngines - DirectDraw not installed\n");
+            return;
+        }
+        else {
+            /* We have DirectDraw */
+	          winDebug (
+                          "winDetectSupportedEngines - DirectDraw installed\n");
+            g_dwEnginesSupported |= WIN_SERVER_SHADOW_DD;
 
 #ifdef XWIN_PRIMARYFB
-	  /* Allow PrimaryDD engine if NT */
-	  if (osvi.dwPlatformId == VER_PLATFORM_WIN32_NT)
-	    {
-	      g_dwEnginesSupported |= WIN_SERVER_PRIMARY_DD;
-	      winDebug ("winDetectSupportedEngines - Allowing PrimaryDD\n");
-	    }
+            /* Allow PrimaryDD engine if NT */
+            if (osvi.dwPlatformId == VER_PLATFORM_WIN32_NT) {
+                g_dwEnginesSupported |= WIN_SERVER_PRIMARY_DD;
+	              winDebug (
+                              "winDetectSupportedEngines - Allowing PrimaryDD\n");
+            }
 #endif
-	}
-      
-      /* Try to query for DirectDraw4 interface */
-      ddrval = IDirectDraw_QueryInterface (lpdd,
-					   &IID_IDirectDraw4,
-					   (LPVOID*) &lpdd4);
-      if (SUCCEEDED (ddrval))
-	{
-	  /* We have DirectDraw4 */
-	  winDebug ("winDetectSupportedEngines - DirectDraw4 installed\n");
-	  g_dwEnginesSupported |= WIN_SERVER_SHADOW_DDNL;
-	}
-
-      /* Cleanup DirectDraw interfaces */
-      if (lpdd4 != NULL)
-	IDirectDraw_Release (lpdd4);
-      if (lpdd != NULL)
-	IDirectDraw_Release (lpdd);
+        }
+
+        /* Try to query for DirectDraw4 interface */
+        ddrval = IDirectDraw_QueryInterface(lpdd,
+                                            &IID_IDirectDraw4,
+                                            (LPVOID *) & lpdd4);
+        if (SUCCEEDED(ddrval)) {
+            /* We have DirectDraw4 */
+	          winDebug (
+                          "winDetectSupportedEngines - DirectDraw4 installed\n");
+            g_dwEnginesSupported |= WIN_SERVER_SHADOW_DDNL;
+        }
+
+        /* Cleanup DirectDraw interfaces */
+        if (lpdd4 != NULL)
+            IDirectDraw_Release(lpdd4);
+        if (lpdd != NULL)
+            IDirectDraw_Release(lpdd);
     }
 
-  winDebug ("winDetectSupportedEngines - Returning, supported engines %08x\n",
-	  (unsigned int) g_dwEnginesSupported);
+    winDebug (
+                  "winDetectSupportedEngines - Returning, supported engines %08x\n",
+                  (unsigned int) g_dwEnginesSupported);
 }
 
-
 /*
  * Set the engine type, depending on the engines
  * supported for this screen, and whether the user
@@ -139,197 +135,183 @@ winDetectSupportedEngines (void)
  */
 
 Bool
-winSetEngine (ScreenPtr pScreen)
+winSetEngine(ScreenPtr pScreen)
 {
-  winScreenPriv(pScreen);
-  winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;
-  HDC			hdc;
-  DWORD			dwBPP;
-
-  /* Get a DC */
-  hdc = GetDC (NULL);
-  if (hdc == NULL)
-    {
-      ErrorF ("winSetEngine - Couldn't get an HDC\n");
-      return FALSE;
+    winScreenPriv(pScreen);
+    winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
+    HDC hdc;
+    DWORD dwBPP;
+
+    /* Get a DC */
+    hdc = GetDC(NULL);
+    if (hdc == NULL) {
+        ErrorF("winSetEngine - Couldn't get an HDC\n");
+        return FALSE;
     }
 
-  /*
-   * pScreenInfo->dwBPP may be 0 to indicate that the current screen
-   * depth is to be used.  Thus, we must query for the current display
-   * depth here.
-   */
-  dwBPP = GetDeviceCaps (hdc, BITSPIXEL);
-
-  /* Release the DC */
-  ReleaseDC (NULL, hdc);
-  hdc = NULL;
-
-  /* ShadowGDI is the only engine that supports windowed PseudoColor */
-  if (dwBPP == 8 && !pScreenInfo->fFullScreen)
-    {
-      winDebug ("winSetEngine - Windowed && PseudoColor => ShadowGDI\n");
-      pScreenInfo->dwEngine = WIN_SERVER_SHADOW_GDI;
-
-      /* Set engine function pointers */
-      winSetEngineFunctionsShadowGDI (pScreen);
-      return TRUE;
+    /*
+     * pScreenInfo->dwBPP may be 0 to indicate that the current screen
+     * depth is to be used.  Thus, we must query for the current display
+     * depth here.
+     */
+    dwBPP = GetDeviceCaps(hdc, BITSPIXEL);
+
+    /* Release the DC */
+    ReleaseDC(NULL, hdc);
+    hdc = NULL;
+
+    /* ShadowGDI is the only engine that supports windowed PseudoColor */
+    if (dwBPP == 8 && !pScreenInfo->fFullScreen) {
+        winDebug (
+                      "winSetEngine - Windowed && PseudoColor => ShadowGDI\n");
+        pScreenInfo->dwEngine = WIN_SERVER_SHADOW_GDI;
+
+        /* Set engine function pointers */
+        winSetEngineFunctionsShadowGDI(pScreen);
+        return TRUE;
     }
 
-  /* ShadowGDI is the only engine that supports Multi Window Mode */
-  if (
-      FALSE
+    /* ShadowGDI is the only engine that supports Multi Window Mode */
+    if (FALSE
 #ifdef XWIN_MULTIWINDOWEXTWM
-      || pScreenInfo->fMWExtWM
+        || pScreenInfo->fMWExtWM
 #endif
 #ifdef XWIN_MULTIWINDOW
-      || pScreenInfo->fMultiWindow
+        || pScreenInfo->fMultiWindow
 #endif
-      )
-    {
-      winDebug ("winSetEngine - Multi Window or Rootless => ShadowGDI\n");
-      pScreenInfo->dwEngine = WIN_SERVER_SHADOW_GDI;
-
-      /* Set engine function pointers */
-      winSetEngineFunctionsShadowGDI (pScreen);
-      return TRUE;
+        ) {
+        winDebug (
+                      "winSetEngine - Multi Window or Rootless => ShadowGDI\n");
+        pScreenInfo->dwEngine = WIN_SERVER_SHADOW_GDI;
+
+        /* Set engine function pointers */
+        winSetEngineFunctionsShadowGDI(pScreen);
+        return TRUE;
     }
 
   /* If there is a user's choice, we'll use that */
-  if (pScreenInfo->dwEnginePreferred)
-    {
-      winDebug ("winSetEngine - Using user's preference: %d\n",
-	      (int) pScreenInfo->dwEnginePreferred);
-      pScreenInfo->dwEngine = pScreenInfo->dwEnginePreferred;
-
-      /* Setup engine function pointers */
-      switch (pScreenInfo->dwEngine)
-	{
-	case WIN_SERVER_SHADOW_GDI:
-	  winSetEngineFunctionsShadowGDI (pScreen);
-	  break;
-	case WIN_SERVER_SHADOW_DD:
-	  winSetEngineFunctionsShadowDD (pScreen);
-	  break;
-	case WIN_SERVER_SHADOW_DDNL:
-	  winSetEngineFunctionsShadowDDNL (pScreen);
-	  break;
+  if (pScreenInfo->dwEnginePreferred) {
+        winDebug ("winSetEngine - Using user's preference: %d\n",
+                      (int) pScreenInfo->dwEnginePreferred);
+        pScreenInfo->dwEngine = pScreenInfo->dwEnginePreferred;
+
+        /* Setup engine function pointers */
+        switch (pScreenInfo->dwEngine) {
+        case WIN_SERVER_SHADOW_GDI:
+            winSetEngineFunctionsShadowGDI(pScreen);
+            break;
+        case WIN_SERVER_SHADOW_DD:
+            winSetEngineFunctionsShadowDD(pScreen);
+            break;
+        case WIN_SERVER_SHADOW_DDNL:
+            winSetEngineFunctionsShadowDDNL(pScreen);
+            break;
 #ifdef XWIN_PRIMARYFB
-	case WIN_SERVER_PRIMARY_DD:
-	  winSetEngineFunctionsPrimaryDD (pScreen);
-	  break;
+        case WIN_SERVER_PRIMARY_DD:
+            winSetEngineFunctionsPrimaryDD(pScreen);
+            break;
 #endif
 #ifdef XWIN_NATIVEGDI
-	case WIN_SERVER_NATIVE_GDI:
-	  winSetEngineFunctionsNativeGDI (pScreen);
-	  break;
+        case WIN_SERVER_NATIVE_GDI:
+            winSetEngineFunctionsNativeGDI(pScreen);
+            break;
 #endif
-	default:
-	  FatalError ("winSetEngine - Invalid engine type %d\n",pScreenInfo->dwEngine);
-	}
-      return TRUE;
+        default:
+            FatalError ("winSetEngine - Invalid engine type %d\n",pScreenInfo->dwEngine);
+        }
+        return TRUE;
     }
 
-  /* ShadowDDNL has good performance, so why not */
-  if (g_dwEnginesSupported & WIN_SERVER_SHADOW_DDNL)
-    {
-      winDebug ("winSetEngine - Using Shadow DirectDraw NonLocking\n");
-      pScreenInfo->dwEngine = WIN_SERVER_SHADOW_DDNL;
+    /* ShadowDDNL has good performance, so why not */
+    if (g_dwEnginesSupported & WIN_SERVER_SHADOW_DDNL) {
+        winDebug ("winSetEngine - Using Shadow DirectDraw NonLocking\n");
+        pScreenInfo->dwEngine = WIN_SERVER_SHADOW_DDNL;
 
-      /* Set engine function pointers */
-      winSetEngineFunctionsShadowDDNL (pScreen);
-      return TRUE;
+        /* Set engine function pointers */
+        winSetEngineFunctionsShadowDDNL(pScreen);
+        return TRUE;
     }
 
-  /* ShadowDD is next in line */
-  if (g_dwEnginesSupported & WIN_SERVER_SHADOW_DD)
-    {
-      winDebug ("winSetEngine - Using Shadow DirectDraw\n");
-      pScreenInfo->dwEngine = WIN_SERVER_SHADOW_DD;
+    /* ShadowDD is next in line */
+    if (g_dwEnginesSupported & WIN_SERVER_SHADOW_DD) {
+        winDebug ("winSetEngine - Using Shadow DirectDraw\n");
+        pScreenInfo->dwEngine = WIN_SERVER_SHADOW_DD;
 
-      /* Set engine function pointers */
-      winSetEngineFunctionsShadowDD (pScreen);
-      return TRUE;
+        /* Set engine function pointers */
+        winSetEngineFunctionsShadowDD(pScreen);
+        return TRUE;
     }
 
-  /* ShadowGDI is next in line */
-  if (g_dwEnginesSupported & WIN_SERVER_SHADOW_GDI)
-    {
-      winDebug ("winSetEngine - Using Shadow GDI DIB\n");
-      pScreenInfo->dwEngine = WIN_SERVER_SHADOW_GDI;
+    /* ShadowGDI is next in line */
+    if (g_dwEnginesSupported & WIN_SERVER_SHADOW_GDI) {
+        winDebug ("winSetEngine - Using Shadow GDI DIB\n");
+        pScreenInfo->dwEngine = WIN_SERVER_SHADOW_GDI;
 
-      /* Set engine function pointers */
-      winSetEngineFunctionsShadowGDI (pScreen);
-      return TRUE;
+        /* Set engine function pointers */
+        winSetEngineFunctionsShadowGDI(pScreen);
+        return TRUE;
     }
 
-  return TRUE;
+    return TRUE;
 }
 
-
 /*
  * Get procedure addresses for DirectDrawCreate and DirectDrawCreateClipper
  */
 
 Bool
-winGetDDProcAddresses (void)
+winGetDDProcAddresses(void)
 {
-  Bool			fReturn = TRUE;
-  
-  /* Load the DirectDraw library */
-  g_hmodDirectDraw = LoadLibraryEx ("ddraw.dll", NULL, 0);
-  if (g_hmodDirectDraw == NULL)
-    {
-      ErrorF ("winGetDDProcAddresses - Could not load ddraw.dll\n");
-      fReturn = TRUE;
-      goto winGetDDProcAddresses_Exit;
+    Bool fReturn = TRUE;
+
+    /* Load the DirectDraw library */
+    g_hmodDirectDraw = LoadLibraryEx("ddraw.dll", NULL, 0);
+    if (g_hmodDirectDraw == NULL) {
+        ErrorF("winGetDDProcAddresses - Could not load ddraw.dll\n");
+        fReturn = TRUE;
+        goto winGetDDProcAddresses_Exit;
     }
 
-  /* Try to get the DirectDrawCreate address */
-  g_fpDirectDrawCreate = GetProcAddress (g_hmodDirectDraw,
-					 "DirectDrawCreate");
-  if (g_fpDirectDrawCreate == NULL)
-    {
-      ErrorF ("winGetDDProcAddresses - Could not get DirectDrawCreate "
-	      "address\n");
-      fReturn = TRUE;
-      goto winGetDDProcAddresses_Exit;
+    /* Try to get the DirectDrawCreate address */
+    g_fpDirectDrawCreate = GetProcAddress(g_hmodDirectDraw, "DirectDrawCreate");
+    if (g_fpDirectDrawCreate == NULL) {
+        ErrorF("winGetDDProcAddresses - Could not get DirectDrawCreate "
+               "address\n");
+        fReturn = TRUE;
+        goto winGetDDProcAddresses_Exit;
     }
 
-  /* Try to get the DirectDrawCreateClipper address */
-  g_fpDirectDrawCreateClipper = GetProcAddress (g_hmodDirectDraw,
-						"DirectDrawCreateClipper");
-  if (g_fpDirectDrawCreateClipper == NULL)
-    {
-      ErrorF ("winGetDDProcAddresses - Could not get "
-	      "DirectDrawCreateClipper address\n");
-      fReturn = FALSE;
-      goto winGetDDProcAddresses_Exit;
+    /* Try to get the DirectDrawCreateClipper address */
+    g_fpDirectDrawCreateClipper = GetProcAddress(g_hmodDirectDraw,
+                                                 "DirectDrawCreateClipper");
+    if (g_fpDirectDrawCreateClipper == NULL) {
+        ErrorF("winGetDDProcAddresses - Could not get "
+               "DirectDrawCreateClipper address\n");
+        fReturn = FALSE;
+        goto winGetDDProcAddresses_Exit;
     }
 
-  /*
-   * Note: Do not unload ddraw.dll here.  Do it in GiveUp
-   */
+    /*
+     * Note: Do not unload ddraw.dll here.  Do it in GiveUp
+     */
 
  winGetDDProcAddresses_Exit:
-  /* Unload the DirectDraw library if we failed to initialize */
-  if (!fReturn && g_hmodDirectDraw != NULL)
-    {
-      FreeLibrary (g_hmodDirectDraw);
-      g_hmodDirectDraw = NULL;
+    /* Unload the DirectDraw library if we failed to initialize */
+    if (!fReturn && g_hmodDirectDraw != NULL) {
+        FreeLibrary(g_hmodDirectDraw);
+        g_hmodDirectDraw = NULL;
     }
-  
-  return fReturn;
+
+    return fReturn;
 }
 
 void
 winReleaseDDProcAddresses(void)
 {
-  if (g_hmodDirectDraw != NULL)
-    {
-      FreeLibrary (g_hmodDirectDraw);
-      g_hmodDirectDraw = NULL;
-      g_fpDirectDrawCreate = NULL;
-      g_fpDirectDrawCreateClipper = NULL;
+    if (g_hmodDirectDraw != NULL) {
+        FreeLibrary(g_hmodDirectDraw);
+        g_hmodDirectDraw = NULL;
+        g_fpDirectDrawCreate = NULL;
+        g_fpDirectDrawCreateClipper = NULL;
     }
 }