TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-12 07:04:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename the memory allocating versions to make prev error less likely

Browse source 
The behavior is different enough that these shouldn't be overloaded
with the non-allocating verions. Also makes it more obvious what is
going on to the caller.
This commit is contained in:
Ben Payne 2015-01-23 16:09:01 -05:00
parent d669eb6ee7
commit fcf52fb5e0
9 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Engine/source/platformWin32/nativeDialogs/win32MsgBox.cpp
View file

@ -101,8 +101,8 @@ S32 Platform::messageBox(const UTF8 *title, const UTF8 *message, MBButtons butto
pWindow->setCursorVisible(true);
#ifdef UNICODE
const UTF16 *msg = convertUTF8toUTF16(message);
const UTF16 *t = convertUTF8toUTF16(title);
const UTF16 *msg = createUTF16string(message);
const UTF16 *t = createUTF16string(title);
#else
const UTF8 *msg = message;
const UTF8 *t = title;

6
Engine/source/platformWin32/winFileio.cpp
View file

@ -802,7 +802,7 @@ StringTableEntry Platform::getCurrentDirectory()
forwardslash( buf );
#ifdef UNICODE
char* utf8 = convertUTF16toUTF8( buf );
char* utf8 = createUTF8string( buf );
StringTableEntry result = StringTable->insert( utf8 );
SAFE_DELETE_ARRAY( utf8 );
return result;
@ -847,8 +847,8 @@ static void getExecutableInfo( StringTableEntry* path, StringTableEntry* exe )
if( delimiter )
*delimiter = '\0';
char* pathBuf = convertUTF16toUTF8( cen_buf );
char* exeBuf = convertUTF16toUTF8( delimiter + 1 );
char* pathBuf = createUTF8string( cen_buf );
char* exeBuf = createUTF8string( delimiter + 1 );
pathEntry = StringTable->insert( pathBuf );
exeEntry = StringTable->insert( exeBuf );