gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-06 14:27:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r26490) -Fix (r26489): compilation under Windows

Browse Source
This commit is contained in:
rubidium 2014-04-23 21:30:32 +00:00
parent 21f991e235
commit ce06139328
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/os/windows/win32.cpp
View File

@ -212,7 +212,7 @@ void FiosGetDrives()
FiosItem *fios = _fios_items.Append(); FiosItem *fios = _fios_items.Append();
fios->type = FIOS_TYPE_DRIVE; fios->type = FIOS_TYPE_DRIVE;
fios->mtime = 0; fios->mtime = 0;
snprintf(fios->name, lengthof(fios->name), PATHSEP ""); seprintf(fios->name, lastof(fios->name), PATHSEP "");
strecpy(fios->title, fios->name, lastof(fios->title)); strecpy(fios->title, fios->name, lastof(fios->title));
#else #else
TCHAR drives[256]; TCHAR drives[256];
@ -223,7 +223,7 @@ void FiosGetDrives()
FiosItem *fios = _fios_items.Append(); FiosItem *fios = _fios_items.Append();
fios->type = FIOS_TYPE_DRIVE; fios->type = FIOS_TYPE_DRIVE;
fios->mtime = 0; fios->mtime = 0;
snprintf(fios->name, lengthof(fios->name), "%c:", s[0] & 0xFF); seprintf(fios->name, lastof(fios->name), "%c:", s[0] & 0xFF);
strecpy(fios->title, fios->name, lastof(fios->title)); strecpy(fios->title, fios->name, lastof(fios->title));
while (*s++ != '\0') { /* Nothing */ } while (*s++ != '\0') { /* Nothing */ }
} }
@ -495,9 +495,9 @@ void DetermineBasePaths(const char *exe)
#ifdef WITH_PERSONAL_DIR #ifdef WITH_PERSONAL_DIR
if (SUCCEEDED(OTTDSHGetFolderPath(NULL, CSIDL_PERSONAL, NULL, SHGFP_TYPE_CURRENT, path))) { if (SUCCEEDED(OTTDSHGetFolderPath(NULL, CSIDL_PERSONAL, NULL, SHGFP_TYPE_CURRENT, path))) {
strecpy(tmp, FS2OTTD(path), lastof(tmp)); strecpy(tmp, FS2OTTD(path), lastof(tmp));
AppendPathSeparator(tmp, MAX_PATH); AppendPathSeparator(tmp, lastof(tmp));
strecat(tmp, PERSONAL_DIR, lastof(tmp)); strecat(tmp, PERSONAL_DIR, lastof(tmp));
AppendPathSeparator(tmp, MAX_PATH); AppendPathSeparator(tmp, lastof(tmp));
_searchpaths[SP_PERSONAL_DIR] = strdup(tmp); _searchpaths[SP_PERSONAL_DIR] = strdup(tmp);
} else { } else {
_searchpaths[SP_PERSONAL_DIR] = NULL; _searchpaths[SP_PERSONAL_DIR] = NULL;
@ -505,9 +505,9 @@ void DetermineBasePaths(const char *exe)
if (SUCCEEDED(OTTDSHGetFolderPath(NULL, CSIDL_COMMON_DOCUMENTS, NULL, SHGFP_TYPE_CURRENT, path))) { if (SUCCEEDED(OTTDSHGetFolderPath(NULL, CSIDL_COMMON_DOCUMENTS, NULL, SHGFP_TYPE_CURRENT, path))) {
strecpy(tmp, FS2OTTD(path), lastof(tmp)); strecpy(tmp, FS2OTTD(path), lastof(tmp));
AppendPathSeparator(tmp, MAX_PATH); AppendPathSeparator(tmp, lastof(tmp));
strecat(tmp, PERSONAL_DIR, lastof(tmp)); strecat(tmp, PERSONAL_DIR, lastof(tmp));
AppendPathSeparator(tmp, MAX_PATH); AppendPathSeparator(tmp, lastof(tmp));
_searchpaths[SP_SHARED_DIR] = strdup(tmp); _searchpaths[SP_SHARED_DIR] = strdup(tmp);
} else { } else {
_searchpaths[SP_SHARED_DIR] = NULL; _searchpaths[SP_SHARED_DIR] = NULL;
@ -519,7 +519,7 @@ void DetermineBasePaths(const char *exe)
/* Get the path to working directory of OpenTTD */ /* Get the path to working directory of OpenTTD */
getcwd(tmp, lengthof(tmp)); getcwd(tmp, lengthof(tmp));
AppendPathSeparator(tmp, MAX_PATH); AppendPathSeparator(tmp, lastof(tmp));
_searchpaths[SP_WORKING_DIR] = strdup(tmp); _searchpaths[SP_WORKING_DIR] = strdup(tmp);
if (!GetModuleFileName(NULL, path, lengthof(path))) { if (!GetModuleFileName(NULL, path, lengthof(path))) {