Mirror/StormLib
1
0
Fork 0
mirror of https://github.com/ladislav-zezula/StormLib.git synced 2026-01-24 16:26:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

+ Fixed regression tests

Browse Source 
+ Refactored udage of UNICODE characters
+ Fixed regression tests on Linux
This commit is contained in:
Ladislav Zezula
2024-03-07 17:46:27 +01:00
parent 98aff2cdec
commit dbe502676f
8 changed files with 467 additions and 548 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/SBaseCommon.cpp
View File

@@ -154,30 +154,18 @@ void StringCreatePseudoFileName(char * szBuffer, size_t cchMaxChars, unsigned in
#ifdef _UNICODE
void StringCopy(TCHAR * szTarget, size_t cchTarget, const char * szSource)
{
if(cchTarget > 0)
{
size_t cchSource = strlen(szSource);
int ccResult;
if(cchSource >= cchTarget)
cchSource = cchTarget - 1;
mbstowcs(szTarget, szSource, cchSource);
szTarget[cchSource] = 0;
}
ccResult = MultiByteToWideChar(CP_UTF8, 0, szSource, -1, szTarget, (int)(cchTarget));
szTarget[ccResult] = 0;
}
void StringCopy(char * szTarget, size_t cchTarget, const TCHAR * szSource)
{
if(cchTarget > 0)
{
size_t cchSource = _tcslen(szSource);
int ccResult;
if(cchSource >= cchTarget)
cchSource = cchTarget - 1;
wcstombs(szTarget, szSource, cchSource);
szTarget[cchSource] = 0;
}
ccResult = WideCharToMultiByte(CP_UTF8, 0, szSource, -1, szTarget, (int)(cchTarget), NULL, NULL);
szTarget[ccResult] = 0;
}
void StringCopy(TCHAR * szTarget, size_t cchTarget, const TCHAR * szSource)
@@ -205,6 +193,18 @@ void StringCat(TCHAR * szTarget, size_t cchTargetMax, const TCHAR * szSource)
StringCopy(szTarget + cchTarget, (cchTargetMax - cchTarget), szSource);
}
}
void StringCat(TCHAR * szTarget, size_t cchTargetMax, const char * szSource)
{
// Get the current length of the target
size_t cchTarget = _tcslen(szTarget);
// Copy the string to the target
if(cchTarget < cchTargetMax)
{
StringCopy(szTarget + cchTarget, (cchTargetMax - cchTarget), szSource);
}
}
#endif
//-----------------------------------------------------------------------------