Skip to content

Fix potential issues when determining application working directory on startup #210

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
seer-by-sentry wants to merge 1 commit into
base: main
Choose a base branch
from
+40 −20
Open

Fix potential issues when determining application working directory on startup #210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions Core/Tools/MapCacheBuilder/Source/WinMain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,11 +223,15 @@ Int APIENTRY WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,

// Set the current directory to the app directory.
char buf[_MAX_PATH];
GetModuleFileName(NULL, buf, sizeof(buf));
if (char *pEnd = strrchr(buf, '\\')) {
*pEnd = 0;
buf[0] = '\0'; // Initialize buffer to empty string
DWORD result = GetModuleFileName(NULL, buf, sizeof(buf));
if (result > 0 && result < sizeof(buf))
{
if (char *pEnd = strrchr(buf, '\\')) {
*pEnd = 0;
::SetCurrentDirectory(buf);
}
}
::SetCurrentDirectory(buf);

/*
** Convert WinMain arguments to simple main argc and argv
Expand Down
12 changes: 8 additions & 4 deletions Generals/Code/Main/WinMain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -795,12 +795,16 @@ Int APIENTRY WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,

/// @todo remove this force set of working directory later
Char buffer[ _MAX_PATH ];
GetModuleFileName( NULL, buffer, sizeof( buffer ) );
if (Char *pEnd = strrchr(buffer, '\\'))
buffer[0] = '\0'; // Initialize buffer to empty string
DWORD result = GetModuleFileName( NULL, buffer, sizeof( buffer ) );
if (result > 0 && result < sizeof(buffer))
{
*pEnd = 0;
if (Char *pEnd = strrchr(buffer, '\\'))
{
*pEnd = 0;
::SetCurrentDirectory(buffer);
}
}
::SetCurrentDirectory(buffer);


#ifdef RTS_DEBUG
Expand Down
12 changes: 8 additions & 4 deletions Generals/Code/Tools/GUIEdit/Source/WinMain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,12 +186,16 @@ Int APIENTRY WinMain(HINSTANCE hInstance,

/// @todo remove this force set of working directory later
Char buffer[ _MAX_PATH ];
GetModuleFileName( NULL, buffer, sizeof( buffer ) );
if (Char *pEnd = strrchr(buffer, '\\'))
buffer[0] = '\0'; // Initialize buffer to empty string
DWORD result = GetModuleFileName( NULL, buffer, sizeof( buffer ) );
if (result > 0 && result < sizeof(buffer))
{
*pEnd = 0;
if (Char *pEnd = strrchr(buffer, '\\'))
{
*pEnd = 0;
::SetCurrentDirectory(buffer);
}
}
::SetCurrentDirectory(buffer);

// initialize the memory manager early
initMemoryManager();
Expand Down
12 changes: 8 additions & 4 deletions GeneralsMD/Code/Main/WinMain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -856,12 +856,16 @@ Int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,

/// @todo remove this force set of working directory later
Char buffer[_MAX_PATH];
GetModuleFileName(NULL, buffer, sizeof(buffer));
if (Char* pEnd = strrchr(buffer, '\\'))
buffer[0] = '\0'; // Initialize buffer to empty string
DWORD result = GetModuleFileName(NULL, buffer, sizeof(buffer));
if (result > 0 && result < sizeof(buffer))
{
*pEnd = 0;
if (Char* pEnd = strrchr(buffer, '\\'))
{
*pEnd = 0;
::SetCurrentDirectory(buffer);
}
}
::SetCurrentDirectory(buffer);


#ifdef RTS_DEBUG
Expand Down
12 changes: 8 additions & 4 deletions GeneralsMD/Code/Tools/GUIEdit/Source/WinMain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,12 +186,16 @@ Int APIENTRY WinMain(HINSTANCE hInstance,

/// @todo remove this force set of working directory later
Char buffer[ _MAX_PATH ];
GetModuleFileName( NULL, buffer, sizeof( buffer ) );
if (Char *pEnd = strrchr(buffer, '\\'))
buffer[0] = '\0'; // Initialize buffer to empty string
DWORD result = GetModuleFileName( NULL, buffer, sizeof( buffer ) );
if (result > 0 && result < sizeof(buffer))
{
*pEnd = 0;
if (Char *pEnd = strrchr(buffer, '\\'))
{
*pEnd = 0;
::SetCurrentDirectory(buffer);
}
}
::SetCurrentDirectory(buffer);

// initialize the memory manager early
initMemoryManager();
Expand Down
Loading