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 old stom hooks

Browse Source
This commit is contained in:
FunkyFr3sh 2020-10-15 01:17:40 +02:00
parent a17896d154
commit d45bf45895
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/dd.c
View File

@ -68,6 +68,7 @@ HRESULT dd_EnumDisplayModes(DWORD dwFlags, LPDDSURFACEDESC lpDDSurfaceDesc, LPVO
dprintfex(" %d: %dx%d@%d %d bpp\n", (int)i, (int)m.dmPelsWidth, (int)m.dmPelsHeight, (int)m.dmDisplayFrequency, (int)m.dmBitsPerPel); dprintfex(" %d: %dx%d@%d %d bpp\n", (int)i, (int)m.dmPelsWidth, (int)m.dmPelsHeight, (int)m.dmDisplayFrequency, (int)m.dmBitsPerPel);
memset(&s, 0, sizeof(DDSURFACEDESC)); memset(&s, 0, sizeof(DDSURFACEDESC));
s.dwSize = sizeof(DDSURFACEDESC); s.dwSize = sizeof(DDSURFACEDESC);
s.dwFlags = DDSD_HEIGHT | DDSD_REFRESHRATE | DDSD_WIDTH | DDSD_PIXELFORMAT; s.dwFlags = DDSD_HEIGHT | DDSD_REFRESHRATE | DDSD_WIDTH | DDSD_PIXELFORMAT;
s.dwHeight = m.dmPelsHeight; s.dwHeight = m.dmPelsHeight;
@ -117,6 +118,7 @@ HRESULT dd_EnumDisplayModes(DWORD dwFlags, LPDDSURFACEDESC lpDDSurfaceDesc, LPVO
for (i = 0; i < sizeof(resolutions) / sizeof(resolutions[0]); i++) for (i = 0; i < sizeof(resolutions) / sizeof(resolutions[0]); i++)
{ {
memset(&s, 0, sizeof(DDSURFACEDESC)); memset(&s, 0, sizeof(DDSURFACEDESC));
s.dwSize = sizeof(DDSURFACEDESC); s.dwSize = sizeof(DDSURFACEDESC);
s.dwFlags = DDSD_HEIGHT | DDSD_REFRESHRATE | DDSD_WIDTH | DDSD_PIXELFORMAT; s.dwFlags = DDSD_HEIGHT | DDSD_REFRESHRATE | DDSD_WIDTH | DDSD_PIXELFORMAT;
s.dwHeight = resolutions[i].cy; s.dwHeight = resolutions[i].cy;
@ -273,6 +275,7 @@ HRESULT dd_SetDisplayMode(DWORD width, DWORD height, DWORD bpp)
g_ddraw->altenter = FALSE; g_ddraw->altenter = FALSE;
memset(&g_ddraw->render.mode, 0, sizeof(DEVMODE)); memset(&g_ddraw->render.mode, 0, sizeof(DEVMODE));
g_ddraw->render.mode.dmSize = sizeof(DEVMODE); g_ddraw->render.mode.dmSize = sizeof(DEVMODE);
g_ddraw->render.mode.dmFields = DM_PELSWIDTH | DM_PELSHEIGHT; g_ddraw->render.mode.dmFields = DM_PELSWIDTH | DM_PELSHEIGHT;
g_ddraw->render.mode.dmPelsWidth = g_ddraw->render.width; g_ddraw->render.mode.dmPelsWidth = g_ddraw->render.width;
@ -322,6 +325,7 @@ HRESULT dd_SetDisplayMode(DWORD width, DWORD height, DWORD bpp)
if (g_ddraw->windowed) //windowed-fullscreen aka borderless if (g_ddraw->windowed) //windowed-fullscreen aka borderless
{ {
border = FALSE; border = FALSE;
g_config.window_rect.left = -32000; g_config.window_rect.left = -32000;
g_config.window_rect.top = -32000; g_config.window_rect.top = -32000;
@ -348,12 +352,13 @@ HRESULT dd_SetDisplayMode(DWORD width, DWORD height, DWORD bpp)
mouse_unlock(); mouse_unlock();
memset(&g_ddraw->render.mode, 0, sizeof(DEVMODE)); memset(&g_ddraw->render.mode, 0, sizeof(DEVMODE));
g_ddraw->render.mode.dmSize = sizeof(DEVMODE); g_ddraw->render.mode.dmSize = sizeof(DEVMODE);
g_ddraw->render.mode.dmFields = DM_PELSWIDTH|DM_PELSHEIGHT; g_ddraw->render.mode.dmFields = DM_PELSWIDTH|DM_PELSHEIGHT;
g_ddraw->render.mode.dmPelsWidth = g_ddraw->render.width; g_ddraw->render.mode.dmPelsWidth = g_ddraw->render.width;
g_ddraw->render.mode.dmPelsHeight = g_ddraw->render.height; g_ddraw->render.mode.dmPelsHeight = g_ddraw->render.height;
if(g_ddraw->render.bpp) if (g_ddraw->render.bpp)
{ {
g_ddraw->render.mode.dmFields |= DM_BITSPERPEL; g_ddraw->render.mode.dmFields |= DM_BITSPERPEL;
g_ddraw->render.mode.dmBitsPerPel = g_ddraw->render.bpp; g_ddraw->render.mode.dmBitsPerPel = g_ddraw->render.bpp;
@ -736,9 +741,11 @@ ULONG dd_Release()
if (g_ddraw->ref == 0) if (g_ddraw->ref == 0)
{ {
if (g_ddraw->bpp) if (g_ddraw->bpp)
{
cfg_save(); cfg_save();
}
if(g_ddraw->render.run) if (g_ddraw->render.run)
{ {
EnterCriticalSection(&g_ddraw->cs); EnterCriticalSection(&g_ddraw->cs);
g_ddraw->render.run = FALSE; g_ddraw->render.run = FALSE;

6
src/dllmain.c
View File

@ -82,14 +82,14 @@ BOOL WINAPI DllMain(HANDLE hDll, DWORD dwReason, LPVOID lpReserved)
if (!set_dpi_aware) if (!set_dpi_aware)
{ {
HMODULE hUser32 = GetModuleHandle("user32.dll"); HMODULE huser32 = GetModuleHandle("user32.dll");
if (hUser32) if (huser32)
{ {
typedef BOOL(__stdcall* SETPROCESSDPIAWAREPROC)(); typedef BOOL(__stdcall* SETPROCESSDPIAWAREPROC)();
SETPROCESSDPIAWAREPROC set_aware = SETPROCESSDPIAWAREPROC set_aware =
(SETPROCESSDPIAWAREPROC)GetProcAddress(hUser32, "SetProcessDPIAware"); (SETPROCESSDPIAWAREPROC)GetProcAddress(huser32, "SetProcessDPIAware");
if (set_aware) if (set_aware)
set_aware(); set_aware();

7
src/hook.c
View File

@ -155,7 +155,6 @@ void hook_create(char *module_name, char *function_name, PROC new_function, PROC
if (g_hook_method == 1) if (g_hook_method == 1)
{ {
hook_patch_iat(GetModuleHandle(NULL), module_name, function_name, new_function); hook_patch_iat(GetModuleHandle(NULL), module_name, function_name, new_function);
hook_patch_iat(GetModuleHandle("storm.dll"), module_name, function_name, new_function);
} }
} }
@ -213,12 +212,6 @@ void hook_revert(char *module_name, char *function_name, PROC new_function, PROC
module_name, module_name,
function_name, function_name,
GetProcAddress(GetModuleHandle(module_name), function_name)); GetProcAddress(GetModuleHandle(module_name), function_name));
hook_patch_iat(
GetModuleHandle("storm.dll"),
module_name,
function_name,
GetProcAddress(GetModuleHandle(module_name), function_name));
} }
} }