From e42d0003660d06c0857e4cfa33eb64c6b7835498 Mon Sep 17 00:00:00 2001
From: FunkyFr3sh <cc.red.alert.1@googlemail.com>
Date: Mon, 31 Jul 2023 07:33:57 +0200
Subject: [PATCH] remove fixwndprochook setting

---
 inc/dd.h           |  1 -
 src/config.c       | 12 ------------
 src/winapi_hooks.c | 24 ++++++------------------
 3 files changed, 6 insertions(+), 31 deletions(-)

diff --git a/inc/dd.h b/inc/dd.h
index 26d537e..0b19dd9 100644
--- a/inc/dd.h
+++ b/inc/dd.h
@@ -150,7 +150,6 @@ typedef struct CNCDDRAW
     BOOL toggle_borderless;
     BOOL nonexclusive;
     int fixchilds;
-    BOOL fixwndprochook;
     BOOL fixnotresponding;
     BOOL flipclear;
     BOOL locktopleft;
diff --git a/src/config.c b/src/config.c
index b255a65..ff2a259 100644
--- a/src/config.c
+++ b/src/config.c
@@ -38,7 +38,6 @@ void cfg_load()
     g_ddraw->toggle_borderless = cfg_get_bool("toggle_borderless", FALSE);
     g_ddraw->nonexclusive = cfg_get_bool("nonexclusive", FALSE);
     g_ddraw->fixchilds = cfg_get_int("fixchilds", FIX_CHILDS_DETECT_PAINT);
-    g_ddraw->fixwndprochook = cfg_get_bool("fixwndprochook", FALSE);
     g_ddraw->flipclear = cfg_get_bool("flipclear", FALSE);
     g_ddraw->fixnotresponding = cfg_get_bool("fixnotresponding", FALSE);
     g_ddraw->locktopleft = cfg_get_bool("locktopleft", FALSE);
@@ -370,7 +369,6 @@ static void cfg_create_ini()
             "game_handles_close=false\n"
             "accuratetimers=false\n"
             "fixpitch=true\n"
-            "fixwndprochook=false\n"
             "fixnotresponding=false\n"
             "locktopleft=false\n"
             "lock_surfaces=false\n"
@@ -811,17 +809,14 @@ static void cfg_create_ini()
             "\n"
             "; Grand Theft Auto\n"
             "[Grand Theft Auto]\n"
-            "fixwndprochook=true\n"
             "singlecpu=false\n"
             "\n"
             "; Grand Theft Auto: London 1969\n"
             "[gta_uk]\n"
-            "fixwndprochook=true\n"
             "singlecpu=false\n"
             "\n"
             "; Grand Theft Auto: London 1961\n"
             "[Gta_61]\n"
-            "fixwndprochook=true\n"
             "singlecpu=false\n"
             "\n"
             "; Heroes of Might and Magic II:  The Succession Wars\n"
@@ -841,7 +836,6 @@ static void cfg_create_ini()
             "; Invictus\n"
             "[Invictus]\n"
             "adjmouse=true\n"
-            "fixwndprochook=true\n"
             "renderer=opengl\n"
             "\n"
             "; Interstate 76\n"
@@ -1045,21 +1039,15 @@ static void cfg_create_ini()
             "maintas=false\n"
             "boxing=false\n"
             "\n"
-            "; Theme Park World\n"
-            "[TP]\n"
-            "fixwndprochook=true\n"
-            "\n"
             "; Total Annihilation (Unofficial Beta Patch v3.9.02)\n"
             "[TotalA]\n"
             "lock_surfaces=true\n"
             "singlecpu=false\n"
-            "fixwndprochook=true\n"
             "\n"
             "; Total Annihilation Replay Viewer (Unofficial Beta Patch v3.9.02)\n"
             "[Viewer]\n"
             "lock_surfaces=true\n"
             "singlecpu=false\n"
-            "fixwndprochook=true\n"
             "\n"
             "; Three Kingdoms: Fate of the Dragon\n"
             "[sanguo]\n"
diff --git a/src/winapi_hooks.c b/src/winapi_hooks.c
index 2aeddf0..b500cf9 100644
--- a/src/winapi_hooks.c
+++ b/src/winapi_hooks.c
@@ -440,24 +440,12 @@ LONG WINAPI fake_SetWindowLongA(HWND hWnd, int nIndex, LONG dwNewLong)
         if (nIndex == GWL_STYLE)
             return 0;
 
-        if (nIndex == GWL_WNDPROC && g_ddraw->fixwndprochook)
+        if (nIndex == GWL_WNDPROC)
         {
-            if (dwNewLong == (LONG)compat_WndProc)
-            {
-                WNDPROC old = g_ddraw->wndproc = g_compat_wndproc;
-                //g_compat_wndproc = NULL;
-                return (LONG)old;
-            }
-            else
-            {
-                if (dwNewLong != (LONG)g_ddraw->wndproc)
-                {
-                    g_compat_wndproc = g_ddraw->wndproc;
-                    g_ddraw->wndproc = (WNDPROC)dwNewLong;
-                }
+            WNDPROC old = g_ddraw->wndproc;
+            g_ddraw->wndproc = (WNDPROC)dwNewLong;
 
-                return (LONG)compat_WndProc;
-            }
+            return (LONG)old;        
         }
     }
 
@@ -468,9 +456,9 @@ LONG WINAPI fake_GetWindowLongA(HWND hWnd, int nIndex)
 {
     if (g_ddraw && g_ddraw->hwnd == hWnd)
     {
-        if (nIndex == GWL_WNDPROC && g_ddraw->fixwndprochook)
+        if (nIndex == GWL_WNDPROC)
         {
-            return (LONG)compat_WndProc;
+            return (LONG)g_ddraw->wndproc;
         }
     }