lucent/cocco-ddraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove fixwndprochook setting

Browse source
This commit is contained in:
FunkyFr3sh 2023-07-31 07:33:57 +02:00
parent 5aa33228df
commit e42d000366
3 changed files with 6 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
inc/dd.h
View file

@ -150,7 +150,6 @@ typedef struct CNCDDRAW
BOOL toggle_borderless; BOOL toggle_borderless;
BOOL nonexclusive; BOOL nonexclusive;
int fixchilds; int fixchilds;
BOOL fixwndprochook;
BOOL fixnotresponding; BOOL fixnotresponding;
BOOL flipclear; BOOL flipclear;
BOOL locktopleft; BOOL locktopleft;

12
src/config.c
View file

@ -38,7 +38,6 @@ void cfg_load()
g_ddraw->toggle_borderless = cfg_get_bool("toggle_borderless", FALSE); g_ddraw->toggle_borderless = cfg_get_bool("toggle_borderless", FALSE);
g_ddraw->nonexclusive = cfg_get_bool("nonexclusive", FALSE); g_ddraw->nonexclusive = cfg_get_bool("nonexclusive", FALSE);
g_ddraw->fixchilds = cfg_get_int("fixchilds", FIX_CHILDS_DETECT_PAINT); 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->flipclear = cfg_get_bool("flipclear", FALSE);
g_ddraw->fixnotresponding = cfg_get_bool("fixnotresponding", FALSE); g_ddraw->fixnotresponding = cfg_get_bool("fixnotresponding", FALSE);
g_ddraw->locktopleft = cfg_get_bool("locktopleft", FALSE); g_ddraw->locktopleft = cfg_get_bool("locktopleft", FALSE);
@ -370,7 +369,6 @@ static void cfg_create_ini()
"game_handles_close=false\n" "game_handles_close=false\n"
"accuratetimers=false\n" "accuratetimers=false\n"
"fixpitch=true\n" "fixpitch=true\n"
"fixwndprochook=false\n"
"fixnotresponding=false\n" "fixnotresponding=false\n"
"locktopleft=false\n" "locktopleft=false\n"
"lock_surfaces=false\n" "lock_surfaces=false\n"
@ -811,17 +809,14 @@ static void cfg_create_ini()
"\n" "\n"
"; Grand Theft Auto\n" "; Grand Theft Auto\n"
"[Grand Theft Auto]\n" "[Grand Theft Auto]\n"
"fixwndprochook=true\n"
"singlecpu=false\n" "singlecpu=false\n"
"\n" "\n"
"; Grand Theft Auto: London 1969\n" "; Grand Theft Auto: London 1969\n"
"[gta_uk]\n" "[gta_uk]\n"
"fixwndprochook=true\n"
"singlecpu=false\n" "singlecpu=false\n"
"\n" "\n"
"; Grand Theft Auto: London 1961\n" "; Grand Theft Auto: London 1961\n"
"[Gta_61]\n" "[Gta_61]\n"
"fixwndprochook=true\n"
"singlecpu=false\n" "singlecpu=false\n"
"\n" "\n"
"; Heroes of Might and Magic II: The Succession Wars\n" "; Heroes of Might and Magic II: The Succession Wars\n"
@ -841,7 +836,6 @@ static void cfg_create_ini()
"; Invictus\n" "; Invictus\n"
"[Invictus]\n" "[Invictus]\n"
"adjmouse=true\n" "adjmouse=true\n"
"fixwndprochook=true\n"
"renderer=opengl\n" "renderer=opengl\n"
"\n" "\n"
"; Interstate 76\n" "; Interstate 76\n"
@ -1045,21 +1039,15 @@ static void cfg_create_ini()
"maintas=false\n" "maintas=false\n"
"boxing=false\n" "boxing=false\n"
"\n" "\n"
"; Theme Park World\n"
"[TP]\n"
"fixwndprochook=true\n"
"\n"
"; Total Annihilation (Unofficial Beta Patch v3.9.02)\n" "; Total Annihilation (Unofficial Beta Patch v3.9.02)\n"
"[TotalA]\n" "[TotalA]\n"
"lock_surfaces=true\n" "lock_surfaces=true\n"
"singlecpu=false\n" "singlecpu=false\n"
"fixwndprochook=true\n"
"\n" "\n"
"; Total Annihilation Replay Viewer (Unofficial Beta Patch v3.9.02)\n" "; Total Annihilation Replay Viewer (Unofficial Beta Patch v3.9.02)\n"
"[Viewer]\n" "[Viewer]\n"
"lock_surfaces=true\n" "lock_surfaces=true\n"
"singlecpu=false\n" "singlecpu=false\n"
"fixwndprochook=true\n"
"\n" "\n"
"; Three Kingdoms: Fate of the Dragon\n" "; Three Kingdoms: Fate of the Dragon\n"
"[sanguo]\n" "[sanguo]\n"

22
src/winapi_hooks.c
View file

@ -440,24 +440,12 @@ LONG WINAPI fake_SetWindowLongA(HWND hWnd, int nIndex, LONG dwNewLong)
if (nIndex == GWL_STYLE) if (nIndex == GWL_STYLE)
return 0; return 0;
if (nIndex == GWL_WNDPROC && g_ddraw->fixwndprochook) if (nIndex == GWL_WNDPROC)
{ {
if (dwNewLong == (LONG)compat_WndProc) WNDPROC old = g_ddraw->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; 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 (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;
} }
} }