Disable PrimaryDD and ShadowDD DirectDraw2 drawing engines

Disable the PrimaryDD and ShadowDD DirectDraw2 drawing engines. I don't think
there is anywhere these are useful, but the ShadowDDNL DirectDraw4 drawing
engine isn't available.

3 files changed, 5 insertions, 22 deletions

diff --git a/hw/xwin/InitOutput.c b/hw/xwin/InitOutput.c
index 7ca818c70..b5e18c226 100644
--- a/hw/xwin/InitOutput.c
+++ b/hw/xwin/InitOutput.c
@@ -760,7 +760,7 @@ winUseMsg(void)
     ErrorF("-engine engine_type_id\n"
            "\tOverride the server's automatically selected engine type:\n"
            "\t\t1 - Shadow GDI\n"
-           "\t\t2 - Shadow DirectDraw\n"
+           "\t\t2 - Shadow DirectDraw - obsolete\n"
            "\t\t4 - Shadow DirectDraw4 Non-Locking\n"
 #ifdef XWIN_PRIMARYFB
            "\t\t8 - Primary DirectDraw - obsolete\n"
diff --git a/hw/xwin/man/XWin.man b/hw/xwin/man/XWin.man
index 738818ea5..5f2d2eabc 100644
--- a/hw/xwin/man/XWin.man
+++ b/hw/xwin/man/XWin.man
@@ -243,14 +243,12 @@ clipping region is then used to do a single bit block transfer that is
 constrained to the updated area by the clipping region.  There is some
 overhead involved in creating, installing, destroying, and removing
 the clipping region, thus there may not be much benefit for a small
-number of boxes (less than 10).  It is even possible that this
+number of boxes.  It is even possible that this
 functionality does not provide a benefit at any number of boxes; we
 can only determine the usefulness of this feature through testing.
 This option probably has limited effect on current \fIWindows\fP versions
 as they already perform GDI batching.
-This parameter works in conjunction with engines 1, 2, and 4 (Shadow
-GDI, Shadow DirectDraw, and Shadow DirectDraw Non-Locking,
-respectively).
+This parameter only has any effect when a Shadow drawing engine is selected.
 .TP 8
 .B "\-engine \fIengine_type_id\fP"
 This option, which is intended for Cygwin/X developers,
@@ -266,11 +264,11 @@ The engine type ids are:
 .IP 1 4
 Shadow GDI
 .IP 2 4
-Shadow DirectDraw
+Shadow DirectDraw (obsolete, disabled)
 .IP 4 4
 Shadow DirectDraw Non-Locking
 .IP 8 4
-Primary DirectDraw (unsupported, obsolete)
+Primary DirectDraw (unsupported, obsolete, disabled)
 .IP 16 4
 Native GDI (unsupported, experimental and barely functional)
 .RE
diff --git a/hw/xwin/winengine.c b/hw/xwin/winengine.c
index 1f55ada58..94e5e36e9 100644
--- a/hw/xwin/winengine.c
+++ b/hw/xwin/winengine.c
@@ -89,21 +89,6 @@ winDetectSupportedEngines(void)
                           "winDetectSupportedEngines - DirectDraw not installed\n");
             return;
         }
-        else {
-            /* We have DirectDraw */
-            winErrorFVerb(2,
-                          "winDetectSupportedEngines - DirectDraw installed, allowing ShadowDD\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;
-                winErrorFVerb(2,
-                              "winDetectSupportedEngines - Windows NT, allowing PrimaryDD\n");
-            }
-#endif
-        }
 
         /* Try to query for DirectDraw4 interface */
         ddrval = IDirectDraw_QueryInterface(lpdd,