TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-23 00:23:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1035 from bpay/memfixes

Browse source 
Memfixes
This commit is contained in:
Luis Anton Rebollo 2015-01-25 13:42:32 +01:00
commit 6492028bb2
26 changed files with 79 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Engine/source/platformWin32/menus/popupMenuWin32.cpp
View file

@ -160,7 +160,7 @@ void PopupMenu::createPlatformMenu()
mData->mMenu = mIsPopup ? CreatePopupMenu() : CreateMenu();
AssertFatal(mData->mMenu, "Unable to create menu");
MENUINFO mi;
MENUINFO mi = { 0 };
mi.cbSize = sizeof(mi);
mi.fMask = MIM_MENUDATA;
mi.dwMenuData = (ULONG_PTR)this;
@ -178,7 +178,7 @@ S32 PopupMenu::insertItem(S32 pos, const char *title, const char* accelerator, c
if(isAttached && pWindow == NULL)
return -1;
MENUITEMINFOA mi;
MENUITEMINFOA mi = { 0 };
mi.cbSize = sizeof(mi);
mi.fMask = MIIM_ID|MIIM_TYPE;
mi.wID = (mData->mMenuID * PlatformPopupMenuData::PopupMenuIDRange) + mData->mLastID + 1;

30
Engine/source/platformWin32/winWindow.cpp
View file

@ -352,19 +352,20 @@ S32 main(S32 argc, const char **argv)
#include "app/mainLoop.h"
S32 PASCAL WinMain( HINSTANCE hInstance, HINSTANCE, LPSTR lpszCmdLine, S32)
S32 WINAPI WinMain( HINSTANCE hInstance, HINSTANCE, LPSTR lpszCmdLine, S32)
{
Vector<char *> argv( __FILE__, __LINE__ );
char moduleName[256];
enum { moduleNameSize = 256 };
char moduleName[moduleNameSize];
#ifdef TORQUE_UNICODE
{
TCHAR buf[ 256 ];
GetModuleFileNameW( NULL, buf, sizeof( buf ) );
convertUTF16toUTF8( buf, moduleName, sizeof( moduleName ) );
TCHAR buf[ moduleNameSize ];
GetModuleFileNameW( NULL, buf, moduleNameSize );
convertUTF16toUTF8( buf, moduleName, moduleNameSize );
}
#else
GetModuleFileNameA(NULL, moduleName, sizeof(moduleName));
GetModuleFileNameA(NULL, moduleName, moduleNameSize);
#endif
argv.push_back(moduleName);
@ -433,15 +434,16 @@ S32 torque_winmain( HINSTANCE hInstance, HINSTANCE, LPSTR lpszCmdLine, S32)
{
Vector<char *> argv( __FILE__, __LINE__ );
char moduleName[256];
enum { moduleNameSize = 256 };
char moduleName[moduleNameSize];
#ifdef TORQUE_UNICODE
{
TCHAR buf[ 256 ];
GetModuleFileNameW( NULL, buf, sizeof( buf ) );
convertUTF16toUTF8( buf, moduleName, sizeof( moduleName ) );
}
{
TCHAR buf[ moduleNameSize ];
GetModuleFileNameW( NULL, buf, moduleNameSize );
convertUTF16toUTF8( buf, moduleName, moduleNameSize );
}
#else
GetModuleFileNameA(NULL, moduleName, sizeof(moduleName));
GetModuleFileNameA(NULL, moduleName, moduleNameSize);
#endif
argv.push_back(moduleName);
@ -657,4 +659,4 @@ DefineConsoleFunction( isKoreanBuild, bool, ( ), , "isKoreanBuild()")
}
return( result );
}
}