Cool_Tools/bemanitools
1
0
Fork 0
mirror of https://github.com/djhackersdev/bemanitools.git synced 2024-11-28 08:20:51 +01:00
Code Releases 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-03-27 19:36:00 +02:00 committed by icex2
parent a2ceb0f6cc
commit 4d9fe0002a
3 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/iidxhook-util/settings.c
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);

11
src/main/util/str.c
View File

@ -194,6 +194,17 @@ wchar_t *str_widen(const char *src)
return result;
}
void str_replace(char *str, char cur, char new)
{
while (*str != '\0') {
if (*str == cur) {
*str = new;
}
str++;
}
}
wchar_t *wstr_dup(const wchar_t *wstr)
{
wchar_t *dest;

1
src/main/util/str.h
View File

@ -15,6 +15,7 @@ size_t str_format(char *buf, size_t nchars, const char *fmt, ...);
void str_trim(char *str);
size_t str_vformat(char *buf, size_t nchars, const char *fmt, va_list ap);
wchar_t *str_widen(const char *src);
void str_replace(char *str, char cur, char new);
void wstr_cat(wchar_t *dest, size_t dnchars, const wchar_t *src);
void wstr_cpy(wchar_t *dest, size_t dnchars, const wchar_t *src);