Max/djhackersdev_bemanitools
1
0
Fork 0
Code Issues 72 Pull Requests 15 Actions Packages Projects Releases 20 Wiki Activity

fix(iidxhook-util/settings): Bugfix broken paths with mixed / and \

Browse Source 
Applies to iidx18 and iidx19 when using the recently extended
redirect feature for settings paths, mixing / and \ crashes the
game in some operator sub-menus when trying to save settings.
This commit is contained in:
icex2
2023-04-06 15:39:53 +02:00
committed by icex2
parent a2ceb0f6cc
commit 4d9fe0002a
3 changed files with 30 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/iidxhook-util/settings.c
+18 -6
View File
@@ -37,9 +37,11 @@ static char settings_path[MAX_PATH] = ".\\";
/* ------------------------------------------------------------------------- */
static void settings_build_new_path(const char* orig_path, char* new_path, size_t new_path_len)
static void settings_build_new_path(
const char *orig_path, char *new_path, size_t new_path_len)
{
size_t settings_path_len;
char* orig_appended_path;
settings_path_len = strlen(settings_path);
@@ -48,8 +50,18 @@ static void settings_build_new_path(const char* orig_path, char* new_path, size_
strcpy(new_path, settings_path);
strcat(new_path, orig_path);
/* Remove : of drive letter. Multiple \ are fine and handled by windows */
new_path[settings_path_len + 1] = '\\';
/* Fix only the part of the original path which comes after the leading settings path */
orig_appended_path = new_path + settings_path_len;
/* Duplicate \ in paths is fine because the win32 file API applies path
normalization */
/* Fixes some paths resulting in a mix of / and \ leading to crashes
on iidx 18 and 19, e.g. settings.bin saving in operator menu */
str_replace(orig_appended_path, '/', '\\');
/* Remove : of drive letter */
str_replace(orig_appended_path, ':', '\\');
}
/* ------------------------------------------------------------------------- */
@@ -65,7 +77,7 @@ BOOL WINAPI my_CreateDirectoryA(
settings_build_new_path(lpPathName, new_path, sizeof(new_path));
log_misc("(CreateDir) Remapped settings path %s", new_path);
log_misc("(CreateDir) Remapped settings path %s -> %s", lpPathName, new_path);
return real_CreateDirectoryA(new_path, lpSecurityAttributes);
}
@@ -122,9 +134,9 @@ settings_hook_dispatch_irp(struct irp *irp)
settings_build_new_path(filename_cstr, new_path, sizeof(new_path));
free(filename_cstr);
log_misc("Remapped settings path %s -> %s", filename_cstr, new_path);
log_misc("Remapped settings path to %s", new_path);
free(filename_cstr);
filename_wstr = str_widen(new_path);