backup/cnc-ddraw
1
0
Fork 0
mirror of https://github.com/FunkyFr3sh/cnc-ddraw.git synced 2025-03-24 17:49:52 +01:00
Code Issues Projects Releases Activity

remove fixwndprochook setting

Browse Source
This commit is contained in:
FunkyFr3sh 2023-07-31 07:33:57 +02:00
parent 418df16446
commit 02aa3bc0d9
3 changed files with 6 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
inc/dd.h
View File

@ -140,7 +140,6 @@ typedef struct CNCDDRAW
BOOL nonexclusive; BOOL nonexclusive;
BOOL fixpitch; BOOL fixpitch;
int fixchilds; int fixchilds;
BOOL fixwndprochook;
BOOL fixnotresponding; BOOL fixnotresponding;
BOOL locktopleft; BOOL locktopleft;
BOOL d3d9linear; BOOL d3d9linear;

5
src/config.c
View File

@ -43,7 +43,6 @@ void cfg_load()
g_ddraw->nonexclusive = cfg_get_bool("nonexclusive", FALSE); g_ddraw->nonexclusive = cfg_get_bool("nonexclusive", FALSE);
g_ddraw->fixpitch = cfg_get_bool("fixpitch", FALSE); g_ddraw->fixpitch = cfg_get_bool("fixpitch", 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->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);
g_ddraw->releasealt = cfg_get_bool("releasealt", FALSE); g_ddraw->releasealt = cfg_get_bool("releasealt", FALSE);
@ -719,17 +718,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"
@ -745,7 +741,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"

24
src/winapi_hooks.c
View File

@ -428,24 +428,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;
{ g_ddraw->wndproc = (WNDPROC)dwNewLong;
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;
}
return (LONG)compat_WndProc; return (LONG)old;
}
} }
} }
@ -456,9 +444,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;
} }
} }