Skip to content

refactor: Simplify path string formatting in World Builder #1759

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

Merged
merged 4 commits into from
Oct 31, 2025
Merged

refactor: Simplify path string formatting in World Builder #1759

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
696bcea
refactor: Eliminate redundant buffer copies
bobtista Oct 29, 2025
6a81b52
address PR comments
bobtista Oct 30, 2025
797a340
nit: remove formatting only changes
bobtista Oct 30, 2025
7860a44
fix: Restore GeneralsMD commented path logic in WHeightMapEdit
bobtista Oct 30, 2025
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
6 changes: 3 additions & 3 deletions Core/Libraries/Source/WWVegas/WW3D2/hmdldef.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,9 +148,9 @@ int HModelDefClass::Load_W3D(ChunkLoadClass & cload)
/*
** process the header info
*/
strlcpy(ModelName,header.Name,W3D_NAME_LEN);
strlcpy(BasePoseName,header.HierarchyName,W3D_NAME_LEN);
strcpy(Name,ModelName);
strlcpy(ModelName,header.Name,W3D_NAME_LEN);
strlcpy(BasePoseName,header.HierarchyName,W3D_NAME_LEN);
strcpy(Name,ModelName);

/*
** Just allocate a node for the number of sub objects we're expecting
Expand Down
20 changes: 7 additions & 13 deletions Generals/Code/Tools/WorldBuilder/src/OpenMap.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,11 +115,10 @@ void OpenMap::populateMapListbox( Bool systemMaps )
char fileBuf[_MAX_PATH];

if (systemMaps)
strcpy(dirBuf, "Maps\\");
strlcpy(dirBuf, "Maps\\", ARRAY_SIZE(dirBuf));
else
{
strcpy(dirBuf, TheGlobalData->getPath_UserData().str());
strlcat(dirBuf, "Maps\\", ARRAY_SIZE(dirBuf));
snprintf(dirBuf, ARRAY_SIZE(dirBuf), "%sMaps\\", TheGlobalData->getPath_UserData().str());
}

int len = strlen(dirBuf);
Expand All @@ -131,8 +130,7 @@ void OpenMap::populateMapListbox( Bool systemMaps )
CListBox *pList = (CListBox *)this->GetDlgItem(IDC_OPEN_LIST);
if (pList == NULL) return;
pList->ResetContent();
strcpy(findBuf, dirBuf);
strlcat(findBuf, "*.*", ARRAY_SIZE(findBuf));
snprintf(findBuf, ARRAY_SIZE(findBuf), "%s*.*", dirBuf);

Bool found = false;

Expand All @@ -141,15 +139,11 @@ void OpenMap::populateMapListbox( Bool systemMaps )
do {
if (strcmp(findData.cFileName, ".") == 0 || strcmp(findData.cFileName, "..") == 0)
continue;
if ((findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) == 0) {
continue;
}
if ((findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) == 0) {
continue;
}

strcpy(fileBuf, dirBuf);
strlcat(fileBuf, findData.cFileName, ARRAY_SIZE(findBuf));
strlcat(fileBuf, "\\", ARRAY_SIZE(findBuf));
strlcat(fileBuf, findData.cFileName, ARRAY_SIZE(findBuf));
strlcat(fileBuf, ".map", ARRAY_SIZE(findBuf));
snprintf(fileBuf, ARRAY_SIZE(fileBuf), "%s%s\\%s.map", dirBuf, findData.cFileName, findData.cFileName);
try {
CFileStatus status;
if (CFile::GetStatus(fileBuf, status)) {
Expand Down
17 changes: 6 additions & 11 deletions Generals/Code/Tools/WorldBuilder/src/SaveMap.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,22 +138,17 @@ void SaveMap::populateMapListbox( Bool systemMaps )
CListBox *pList = (CListBox *)this->GetDlgItem(IDC_SAVE_LIST);
if (pList == NULL) return;
pList->ResetContent();
strcpy(findBuf, dirBuf);
strlcat(findBuf, "*.*", ARRAY_SIZE(findBuf));
snprintf(findBuf, ARRAY_SIZE(findBuf), "%s*.*", dirBuf);

hFindFile = FindFirstFile(findBuf, &findData);
if (hFindFile != INVALID_HANDLE_VALUE) {
do {
if (strcmp(findData.cFileName, ".") == 0 || strcmp(findData.cFileName, "..") == 0)
continue;
if ((findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) == 0) {
continue;
}
strcpy(fileBuf, dirBuf);
strlcat(fileBuf, findData.cFileName, ARRAY_SIZE(fileBuf));
strlcat(fileBuf, "\\", ARRAY_SIZE(fileBuf));
strlcat(fileBuf, findData.cFileName, ARRAY_SIZE(fileBuf));
strlcat(fileBuf, ".map", ARRAY_SIZE(fileBuf));
if ((findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) == 0) {
continue;
}
snprintf(fileBuf, ARRAY_SIZE(fileBuf), "%s%s\\%s.map", dirBuf, findData.cFileName, findData.cFileName);
try {
CFileStatus status;
if (CFile::GetStatus(fileBuf, status)) {
Expand All @@ -169,7 +164,7 @@ void SaveMap::populateMapListbox( Bool systemMaps )
}
CEdit *pEdit = (CEdit*)GetDlgItem(IDC_SAVE_MAP_EDIT);
if (pEdit != NULL) {
strcpy(fileBuf, m_pInfo->filename);
strlcpy(fileBuf, m_pInfo->filename, ARRAY_SIZE(fileBuf));
Int len = strlen(fileBuf);
if (len>4 && stricmp(".map", fileBuf+(len-4)) == 0) {
// strip of the .map
Expand Down
10 changes: 3 additions & 7 deletions Generals/Code/Tools/WorldBuilder/src/WHeightMapEdit.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,30 +414,26 @@ void WorldHeightMapEdit::loadBaseImages(void)
void WorldHeightMapEdit::loadDirectoryOfImages(const char *pFilePath)
{
char dirBuf[_MAX_PATH];
char findBuf[_MAX_PATH];
char fileBuf[_MAX_PATH];

strcpy(dirBuf, pFilePath);
strlcpy(dirBuf, pFilePath, ARRAY_SIZE(dirBuf));
int len = strlen(dirBuf);

if (len > 0 && dirBuf[len - 1] != '\\') {
dirBuf[len++] = '\\';
dirBuf[len] = 0;
}
strcpy(findBuf, dirBuf);

FilenameList filenameList;
TheFileSystem->getFileListInDirectory(AsciiString(findBuf), AsciiString("*.*"), filenameList, TRUE);
TheFileSystem->getFileListInDirectory(AsciiString(dirBuf), AsciiString("*.*"), filenameList, TRUE);

if (filenameList.size() == 0) {
return;
}
FilenameList::iterator it = filenameList.begin();
do {
AsciiString filename = *it;

strcpy(fileBuf, dirBuf);
strcat(fileBuf, filename.str());
strlcpy(fileBuf, filename.str(), ARRAY_SIZE(fileBuf));
loadBitmap(fileBuf, filename.str());

++it;
Expand Down
20 changes: 7 additions & 13 deletions GeneralsMD/Code/Tools/WorldBuilder/src/OpenMap.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,11 +115,10 @@ void OpenMap::populateMapListbox( Bool systemMaps )
char fileBuf[_MAX_PATH];

if (systemMaps)
strcpy(dirBuf, "Maps\\");
strlcpy(dirBuf, "Maps\\", ARRAY_SIZE(dirBuf));
else
{
strcpy(dirBuf, TheGlobalData->getPath_UserData().str());
strlcat(dirBuf, "Maps\\", ARRAY_SIZE(dirBuf));
snprintf(dirBuf, ARRAY_SIZE(dirBuf), "%sMaps\\", TheGlobalData->getPath_UserData().str());
}

int len = strlen(dirBuf);
Expand All @@ -131,8 +130,7 @@ void OpenMap::populateMapListbox( Bool systemMaps )
CListBox *pList = (CListBox *)this->GetDlgItem(IDC_OPEN_LIST);
if (pList == NULL) return;
pList->ResetContent();
strcpy(findBuf, dirBuf);
strlcat(findBuf, "*.*", ARRAY_SIZE(findBuf));
snprintf(findBuf, ARRAY_SIZE(findBuf), "%s*.*", dirBuf);

Bool found = false;

Expand All @@ -141,15 +139,11 @@ void OpenMap::populateMapListbox( Bool systemMaps )
do {
if (strcmp(findData.cFileName, ".") == 0 || strcmp(findData.cFileName, "..") == 0)
continue;
if ((findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) == 0) {
continue;
}
if ((findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) == 0) {
continue;
}

strcpy(fileBuf, dirBuf);
strlcat(fileBuf, findData.cFileName, ARRAY_SIZE(findBuf));
strlcat(fileBuf, "\\", ARRAY_SIZE(findBuf));
strlcat(fileBuf, findData.cFileName, ARRAY_SIZE(findBuf));
strlcat(fileBuf, ".map", ARRAY_SIZE(findBuf));
snprintf(fileBuf, ARRAY_SIZE(fileBuf), "%s%s\\%s.map", dirBuf, findData.cFileName, findData.cFileName);
try {
CFileStatus status;
if (CFile::GetStatus(fileBuf, status)) {
Expand Down
17 changes: 6 additions & 11 deletions GeneralsMD/Code/Tools/WorldBuilder/src/SaveMap.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,22 +138,17 @@ void SaveMap::populateMapListbox( Bool systemMaps )
CListBox *pList = (CListBox *)this->GetDlgItem(IDC_SAVE_LIST);
if (pList == NULL) return;
pList->ResetContent();
strcpy(findBuf, dirBuf);
strlcat(findBuf, "*.*", ARRAY_SIZE(findBuf));
snprintf(findBuf, ARRAY_SIZE(findBuf), "%s*.*", dirBuf);

hFindFile = FindFirstFile(findBuf, &findData);
if (hFindFile != INVALID_HANDLE_VALUE) {
do {
if (strcmp(findData.cFileName, ".") == 0 || strcmp(findData.cFileName, "..") == 0)
continue;
if ((findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) == 0) {
continue;
}
strcpy(fileBuf, dirBuf);
strlcat(fileBuf, findData.cFileName, ARRAY_SIZE(fileBuf));
strlcat(fileBuf, "\\", ARRAY_SIZE(fileBuf));
strlcat(fileBuf, findData.cFileName, ARRAY_SIZE(fileBuf));
strlcat(fileBuf, ".map", ARRAY_SIZE(fileBuf));
if ((findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) == 0) {
continue;
}
snprintf(fileBuf, ARRAY_SIZE(fileBuf), "%s%s\\%s.map", dirBuf, findData.cFileName, findData.cFileName);
try {
CFileStatus status;
if (CFile::GetStatus(fileBuf, status)) {
Expand All @@ -169,7 +164,7 @@ void SaveMap::populateMapListbox( Bool systemMaps )
}
CEdit *pEdit = (CEdit*)GetDlgItem(IDC_SAVE_MAP_EDIT);
if (pEdit != NULL) {
strcpy(fileBuf, m_pInfo->filename);
strlcpy(fileBuf, m_pInfo->filename, ARRAY_SIZE(fileBuf));
Int len = strlen(fileBuf);
if (len>4 && stricmp(".map", fileBuf+(len-4)) == 0) {
// strip of the .map
Expand Down
9 changes: 3 additions & 6 deletions GeneralsMD/Code/Tools/WorldBuilder/src/WHeightMapEdit.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,29 +415,26 @@ void WorldHeightMapEdit::loadBaseImages(void)
void WorldHeightMapEdit::loadDirectoryOfImages(const char *pFilePath)
{
char dirBuf[_MAX_PATH];
char findBuf[_MAX_PATH];
char fileBuf[_MAX_PATH];

strcpy(dirBuf, pFilePath);
strlcpy(dirBuf, pFilePath, ARRAY_SIZE(dirBuf));
int len = strlen(dirBuf);

if (len > 0 && dirBuf[len - 1] != '\\') {
dirBuf[len++] = '\\';
dirBuf[len] = 0;
}
strcpy(findBuf, dirBuf);

FilenameList filenameList;
TheFileSystem->getFileListInDirectory(AsciiString(findBuf), AsciiString("*.*"), filenameList, TRUE);
TheFileSystem->getFileListInDirectory(AsciiString(dirBuf), AsciiString("*.*"), filenameList, TRUE);

if (filenameList.size() == 0) {
return;
}
FilenameList::iterator it = filenameList.begin();
do {
AsciiString filename = *it;
//strcpy(fileBuf, dirBuf);
strcpy(fileBuf, filename.str());
strlcpy(fileBuf, filename.str(), ARRAY_SIZE(fileBuf));
loadBitmap(fileBuf, filename.str());

++it;
Expand Down
Loading