[PATCH 1/7] xwin: Remove native GDI engine

[Jon TURNEY]

On 08/10/2014 13:17, Adam Jackson wrote:
> As the man page says, "unsupported, experimental, and barely
> functional".  The last even minor updates to any of this were back in
> 2004, presumably it's not getting better any time soon.

Thanks for doing this.  Getting rid of these has been on my todo list 
for a while.

I think the DirectDraw2 engine hasn't been useful for about a decade, so 
I'll make a patch to remove that as well.

[1/7] & [2/7] Reviewed-by: Jon TURNEY <jon.turney at dronecode.org.uk>

> diff --git a/hw/xwin/wincreatewnd.c b/hw/xwin/wincreatewnd.c
> index 6732dcb..fa9cb5f 100644
> --- a/hw/xwin/wincreatewnd.c
> +++ b/hw/xwin/wincreatewnd.c
> @@ -110,20 +110,9 @@ winCreateBoundingWindowFullScreen(ScreenPtr pScreen)
>                                GetModuleHandle(NULL),     /* Instance handle */
>                                pScreenPriv);      /* ScreenPrivates */
>
> -    /* Branch on the server engine */
> -    switch (pScreenInfo->dwEngine) {
> -#ifdef XWIN_NATIVEGDI
> -    case WIN_SERVER_SHADOW_GDI:
> -        /* Show the window */
> -        ShowWindow(*phwnd, SW_SHOWMAXIMIZED);
> -        break;
> -#endif
> -
> -    default:
> -        /* Hide the window */
> -        ShowWindow(*phwnd, SW_SHOWNORMAL);
> -        break;
> -    }
> +    /* Hide the window */
> +    ShowWindow(*phwnd, SW_SHOWNORMAL);
> +    break;

The switch has been removed, so break is no longer needed.

Please squash the attached patch into this one.

-------------- next part --------------
From d8be6054b7cae890e224e352340a5613c18d569f Mon Sep 17 00:00:00 2001
From: Jon TURNEY <jon.turney at dronecode.org.uk>
Date: Wed, 8 Oct 2014 17:21:01 +0100
Subject: [PATCH] Compilation fix for remove native GDI engine

---
 hw/xwin/wincreatewnd.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/hw/xwin/wincreatewnd.c b/hw/xwin/wincreatewnd.c
index fa9cb5f..b420aae 100644
--- a/hw/xwin/wincreatewnd.c
+++ b/hw/xwin/wincreatewnd.c
@@ -110,9 +110,8 @@ winCreateBoundingWindowFullScreen(ScreenPtr pScreen)
                              GetModuleHandle(NULL),     /* Instance handle */
                              pScreenPriv);      /* ScreenPrivates */
 
-    /* Hide the window */
+    /* Show the window */
     ShowWindow(*phwnd, SW_SHOWNORMAL);
-    break;
 
     /* Send first paint message */
     UpdateWindow(*phwnd);
-- 
2.1.1