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

set up .ini section once and then reuse it

Browse Source
This commit is contained in:
FunkyFr3sh 2024-06-01 07:29:48 +02:00
parent 416c6a8d92
commit fb858f3f08
3 changed files with 50 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
inc/config.h
View File

@ -18,6 +18,7 @@ typedef struct CNCDDRAWCONFIG
char dll_file_name[MAX_PATH];
char process_file_ext[MAX_PATH];
char dll_file_ext[MAX_PATH];
char game_section[MAX_PATH];
INIFILE ini;
BOOL d3d9on12;
BOOL opengl_core;

69
src/config.c
View File

@ -18,6 +18,7 @@ static void cfg_create_ini();
static BOOL cfg_get_bool(LPCSTR key, BOOL default_value);
static int cfg_get_int(LPCSTR key, int default_value);
static DWORD cfg_get_string(LPCSTR key, LPCSTR default_value, LPSTR out_string, DWORD out_size);
static DWORD cfg_get_game_section(LPSTR buf, DWORD size);
#define GET_INT(a,b,c) a = cfg_get_int(b, c); TRACE("%s=%d\n", b, a)
#define GET_BOOL(a,b,c) a = cfg_get_bool(b, c); TRACE("%s=%s\n", b, a ? "true" : "false")
@ -1333,11 +1334,15 @@ static void cfg_init()
}
ini_create(&g_config.ini, g_config.ini_path);
cfg_get_game_section(g_config.game_section, sizeof(g_config.game_section));
}
static DWORD cfg_get_string(LPCSTR key, LPCSTR default_value, LPSTR out_string, DWORD out_size)
static DWORD cfg_get_game_section(LPSTR buf, DWORD size)
{
char buf[MAX_PATH] = { 0 };
if (!buf || size == 0)
return 0;
char tmp[MAX_PATH] = { 0 };
if (IsWine())
{
@ -1346,26 +1351,29 @@ static DWORD cfg_get_string(LPCSTR key, LPCSTR default_value, LPSTR out_string,
if (ini_section_exists(&g_config.ini, section))
{
DWORD x = ini_get_string(&g_config.ini, section, key, "", out_string, out_size);
if (x > 0)
return x;
return ini_get_string(&g_config.ini, "ddraw", key, default_value, out_string, out_size);
strncpy(buf, section, size - 1);
buf[size - 1] = 0;
return strlen(buf);
}
}
DWORD s = ini_get_string(&g_config.ini, g_config.process_file_name, key, "", out_string, out_size);
if (s > 0)
if (ini_section_exists(&g_config.ini, g_config.process_file_name))
{
if (ini_get_string(&g_config.ini, g_config.process_file_name, "checkfile", "", buf, sizeof(buf)) > 0)
if (ini_get_string(&g_config.ini, g_config.process_file_name, "checkfile", "", tmp, sizeof(tmp)) > 0)
{
if (FILE_EXISTS(buf))
return s;
if (FILE_EXISTS(tmp))
{
strncpy(buf, g_config.process_file_name, size - 1);
buf[size - 1] = 0;
return strlen(buf);
}
}
else
return s;
{
strncpy(buf, g_config.process_file_name, size - 1);
buf[size - 1] = 0;
return strlen(buf);
}
}
for (int i = 2; i < 10; i++)
@ -1373,19 +1381,36 @@ static DWORD cfg_get_string(LPCSTR key, LPCSTR default_value, LPSTR out_string,
char section[MAX_PATH] = { 0 };
_snprintf(section, sizeof(section) - 1, "%s/%d", g_config.process_file_name, i);
DWORD s = ini_get_string(&g_config.ini, section, key, "", out_string, out_size);
if (s > 0)
if (ini_section_exists(&g_config.ini, section))
{
if (ini_get_string(&g_config.ini, section, "checkfile", "", buf, sizeof(buf)) > 0)
if (ini_get_string(&g_config.ini, section, "checkfile", "", tmp, sizeof(tmp)) > 0)
{
if (FILE_EXISTS(buf))
return s;
if (FILE_EXISTS(tmp))
{
strncpy(buf, section, size - 1);
buf[size - 1] = 0;
return strlen(buf);
}
}
}
}
return ini_get_string(&g_config.ini, "ddraw", key, default_value, out_string, out_size);
buf[0] = 0;
return 0;
}
static DWORD cfg_get_string(LPCSTR key, LPCSTR default_value, LPSTR buf, DWORD size)
{
if (g_config.game_section[0])
{
DWORD s = ini_get_string(&g_config.ini, g_config.game_section, key, "", buf, size);
if (s > 0)
return s;
}
return ini_get_string(&g_config.ini, "ddraw", key, default_value, buf, size);
}
static BOOL cfg_get_bool(LPCSTR key, BOOL default_value)

3
src/winapi_hooks.c
View File

@ -1473,7 +1473,8 @@ HWND WINAPI fake_CreateWindowExA(
!Y &&
g_ddraw.ref && g_ddraw.width && g_ddraw.width == nWidth && g_ddraw.height == nHeight &&
g_ddraw.hwnd && hWndParent == g_ddraw.hwnd &&
!hMenu)
!hMenu &&
!g_config.game_section[0])
{
dwExStyle = WS_EX_TRANSPARENT;
g_config.lock_mouse_top_left = TRUE;