ShuriZma
/
Cxbx-Reloaded
mirror of https://github.com/Cxbx-Reloaded/Cxbx-Reloaded.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use existing variable (broke GUI actions) 

Plus use strncpy function instead of strcpy to prevent buffer overflow.
This commit is contained in:
RadWolfie 2018-06-13 18:28:04 -05:00
parent 2ad7cb8746
commit 2677569469
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/Cxbx/WndMain.cpp
View File

@ -160,7 +160,6 @@ WndMain::WndMain(HINSTANCE x_hInstance) :
m_CxbxDebug(DM_NONE), m_CxbxDebug(DM_NONE),
m_FlagsLLE(0), m_FlagsLLE(0),
m_StorageToggle(0), m_StorageToggle(0),
m_StorageLocation(),
m_dwRecentXbe(0) m_dwRecentXbe(0)
{ {
// initialize members // initialize members
@ -272,12 +271,12 @@ WndMain::WndMain(HINSTANCE x_hInstance) :
} }
dwType = REG_SZ; dwSize = MAX_PATH; dwType = REG_SZ; dwSize = MAX_PATH;
result = RegQueryValueEx(hKey, "DataStorageLocation", NULL, &dwType, (PBYTE)&m_StorageLocation, &dwSize); result = RegQueryValueEx(hKey, "DataStorageLocation", NULL, &dwType, (PBYTE)&XTL::szFolder_CxbxReloadedData, &dwSize);
if (result != ERROR_SUCCESS) { if (result != ERROR_SUCCESS) {
char szDir[MAX_PATH]; char szDir[MAX_PATH];
SHGetSpecialFolderPath(NULL, szDir, CSIDL_APPDATA, TRUE); SHGetSpecialFolderPath(NULL, szDir, CSIDL_APPDATA, TRUE);
strcpy(m_StorageLocation, szDir); strncpy(XTL::szFolder_CxbxReloadedData, szDir, MAX_PATH);
g_EmuShared->SetStorageLocation(m_StorageLocation); g_EmuShared->SetStorageLocation(XTL::szFolder_CxbxReloadedData);
} }
// Prevent using an incorrect path from the registry if the debug folders have been moved // Prevent using an incorrect path from the registry if the debug folders have been moved
@ -437,7 +436,7 @@ WndMain::~WndMain()
RegSetValueEx(hKey, "DataStorageToggle", 0, dwType, (PBYTE)&m_StorageToggle, dwSize); RegSetValueEx(hKey, "DataStorageToggle", 0, dwType, (PBYTE)&m_StorageToggle, dwSize);
dwType = REG_SZ; dwSize = MAX_PATH; dwType = REG_SZ; dwSize = MAX_PATH;
RegSetValueEx(hKey, "DataStorageLocation", 0, dwType, (PBYTE)m_StorageLocation, dwSize); RegSetValueEx(hKey, "DataStorageLocation", 0, dwType, (PBYTE)XTL::szFolder_CxbxReloadedData, dwSize);
} }
} }
@ -1221,7 +1220,7 @@ LRESULT CALLBACK WndMain::WndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lP
} }
m_StorageToggle = 2; m_StorageToggle = 2;
strcpy(m_StorageLocation, szDir); strncpy(XTL::szFolder_CxbxReloadedData, szDir, MAX_PATH);
RefreshMenus(); RefreshMenus();
} }
} }
@ -1233,7 +1232,7 @@ LRESULT CALLBACK WndMain::WndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lP
SHGetSpecialFolderPath(NULL, szDir, CSIDL_APPDATA, TRUE); SHGetSpecialFolderPath(NULL, szDir, CSIDL_APPDATA, TRUE);
m_StorageToggle = 0; m_StorageToggle = 0;
strcpy(m_StorageLocation, szDir); strncpy(XTL::szFolder_CxbxReloadedData, szDir, MAX_PATH);
RefreshMenus(); RefreshMenus();
} }
break; break;
@ -1244,7 +1243,7 @@ LRESULT CALLBACK WndMain::WndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lP
GetCurrentDirectory(MAX_PATH, szDir); GetCurrentDirectory(MAX_PATH, szDir);
m_StorageToggle = 1; m_StorageToggle = 1;
strcpy(m_StorageLocation, szDir); strncpy(XTL::szFolder_CxbxReloadedData, szDir, MAX_PATH);
RefreshMenus(); RefreshMenus();
} }
break; break;
@ -2321,7 +2320,7 @@ void WndMain::StartEmulation(HWND hwndParent, DebuggerState LocalDebuggerState /
g_EmuShared->SetDirectHostBackBufferAccess(&m_DirectHostBackBufferAccess); g_EmuShared->SetDirectHostBackBufferAccess(&m_DirectHostBackBufferAccess);
// register storage location with emulator process // register storage location with emulator process
g_EmuShared->SetStorageLocation(m_StorageLocation); g_EmuShared->SetStorageLocation(XTL::szFolder_CxbxReloadedData);
if (m_ScaleViewport) { if (m_ScaleViewport) {
// Set the window size to emulation dimensions // Set the window size to emulation dimensions

1
src/Cxbx/WndMain.h
View File

@ -235,7 +235,6 @@ class WndMain : public Wnd
// * Storage location // * Storage location
// ****************************************************************** // ******************************************************************
DWORD m_StorageToggle; DWORD m_StorageToggle;
char m_StorageLocation[MAX_PATH];
}; };
#endif #endif