From eced18d01fcdbae2b2ac60ef0820169d7691be4b Mon Sep 17 00:00:00 2001
From: FunkyFr3sh <cc.red.alert.1@googlemail.com>
Date: Tue, 13 Nov 2018 07:29:48 +0100
Subject: [PATCH] make real ddraw fully optional (keep old XP workaround..)

---
 src/debug.c |  2 +-
 src/main.c  | 21 +++++----------------
 2 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/src/debug.c b/src/debug.c
index c091569..c27644d 100644
--- a/src/debug.c
+++ b/src/debug.c
@@ -53,7 +53,7 @@ void DrawFrameInfoStart()
     DWORD tick_start = timeGetTime();
     if (tick_start >= tick_fps)
     {
-        snprintf(
+        _snprintf(
             debugText,
             sizeof(debugText),
             "FPS: %lu | Time: %2.2f ms  ",
diff --git a/src/main.c b/src/main.c
index 5eca911..550a369 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1323,12 +1323,10 @@ HRESULT WINAPI DirectDrawCreate(GUID FAR* lpGUID, LPDIRECTDRAW FAR* lplpDD, IUnk
     if(ddraw)
     {
         /* FIXME: check the calling module before passing the call! */
-        return ddraw->DirectDrawCreate(lpGUID, lplpDD, pUnkOuter);
+        if (ddraw->DirectDrawCreate)
+            return ddraw->DirectDrawCreate(lpGUID, lplpDD, pUnkOuter);
 
-        /*
-        printf(" returning DDERR_DIRECTDRAWALREADYCREATED\n");
         return DDERR_DIRECTDRAWALREADYCREATED;
-        */
     } 
 
     IDirectDrawImpl *This = (IDirectDrawImpl *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectDrawImpl));
@@ -1343,19 +1341,10 @@ HRESULT WINAPI DirectDrawCreate(GUID FAR* lpGUID, LPDIRECTDRAW FAR* lplpDD, IUnk
     if (!This->real_dll)
         This->real_dll = LoadLibrary("system32\\ddraw.dll");
 
-    if(!This->real_dll)
+    if(This->real_dll && !This->DirectDrawCreate)
     {
-        ddraw_Release(This);
-        return DDERR_GENERIC;
-    }
-
-    This->DirectDrawCreate = 
-        (HRESULT (WINAPI *)(GUID FAR*, LPDIRECTDRAW FAR*, IUnknown FAR*))GetProcAddress(This->real_dll, "DirectDrawCreate");
-
-    if(!This->DirectDrawCreate)
-    {
-        ddraw_Release(This);
-        return DDERR_GENERIC;
+        This->DirectDrawCreate =
+            (HRESULT(WINAPI *)(GUID FAR*, LPDIRECTDRAW FAR*, IUnknown FAR*))GetProcAddress(This->real_dll, "DirectDrawCreate");
     }
 
     InitializeCriticalSection(&This->cs);