Techwizz/Gobligine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Minor fix ups for TCHAR == char on XP. Add in stub function for detectpresence on windows.

Browse source
This commit is contained in:
Alex Grant Benedict 2021-11-28 12:00:56 -07:00
parent 83cd60ab43
commit 3e605aa5fb
2 changed files with 19 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
gameheaders/stratagus-gameutils.h
View file

@ -181,16 +181,16 @@ wchar_t *GetExtractionLogPath(const wchar_t *game_name, const wchar_t *data_path
wchar_t logname[MAX_PATH];
wcscpy(logname, game_name);
wcscat(logname, L"-extraction.log");
if (PathCombine(marker, data_path, L"portable-install")) {
if (PathFileExists(marker)) {
PathCombine(marker, data_path, logname);
if (PathCombineW(marker, data_path, L"portable-install")) {
if (PathFileExistsW(marker)) {
PathCombineW(marker, data_path, logname);
return marker;
}
}
SHGetFolderPath(NULL, CSIDL_PERSONAL | CSIDL_FLAG_CREATE, NULL, 0, marker);
PathAppend(marker, L"Stratagus");
SHGetFolderPathW(NULL, CSIDL_PERSONAL | CSIDL_FLAG_CREATE, NULL, 0, marker);
PathAppendW(marker, L"Stratagus");
mkdir_p(marker);
PathAppend(marker, logname);
PathAppendW(marker, logname);
return marker;
}
#endif

21
gameheaders/stratagus-tinyfiledialogs.h
View file

@ -178,6 +178,11 @@ char *tinyfd_colorChooser(
/************ WINDOWS ONLY SECTION ************************/
#ifdef _WIN32
static int detectPresence(char const *const aExecutable)
{
return 0;
}
/* windows only - utf-16 version */
int tinyfd_notifyPopupW(
wchar_t const *aTitle, /* NULL or L"" */
@ -2922,12 +2927,12 @@ char *tinyfd_inputBox(
if (tinyfd_winUtf8) { writeUtf8(aMessage); }
else { printf("%s", aMessage); }
printf("\n");
}
}
printf("(ctrl-Z + enter to cancel): ");
if (! aDefaultInput) {
(void) GetConsoleMode(hStdin, &mode);
(void) SetConsoleMode(hStdin, mode & (~ENABLE_ECHO_INPUT));
}
}
if (tinyfd_winUtf8) {
lConsoleHandle = GetStdHandle(STD_INPUT_HANDLE);
(void) ReadConsoleW(lConsoleHandle, lBuffW, MAX_PATH_OR_CMD, &lNum, NULL);
@ -5559,7 +5564,7 @@ char *tinyfd_saveFileDialog(
strcat(lDialogString, "initialfile='") ;
strcat(lDialogString, lString) ;
strcat(lDialogString, "',") ;
}
}
}
if ((aNumOfFilterPatterns > 1)
|| ((aNumOfFilterPatterns == 1) /* test because poor osx behaviour */
@ -5574,7 +5579,7 @@ char *tinyfd_saveFileDialog(
strcat(lDialogString, "'") ;
strcat(lDialogString, aFilterPatterns[i]) ;
strcat(lDialogString, "',") ;
}
}
strcat(lDialogString, ")),") ;
strcat(lDialogString, "('All files','*'))") ;
}
@ -5972,13 +5977,13 @@ char *tinyfd_openFileDialog(
if (strlen(lString)) {
strcat(lDialogString, "initialdir='") ;
strcat(lDialogString, lString) ;
strcat(lDialogString, "',") ;
}
strcat(lDialogString, "',") ;
}
getLastName(lString, aDefaultPathAndFile) ;
if (strlen(lString)) {
strcat(lDialogString, "initialfile='") ;
strcat(lDialogString, lString) ;
strcat(lDialogString, "',") ;
strcat(lDialogString, "',") ;
}
}
if ((aNumOfFilterPatterns > 1)
@ -5994,7 +5999,7 @@ char *tinyfd_openFileDialog(
strcat(lDialogString, "'") ;
strcat(lDialogString, aFilterPatterns[i]) ;
strcat(lDialogString, "',") ;
}
}
strcat(lDialogString, ")),") ;
strcat(lDialogString, "('All files','*'))") ;
}