TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-18 20:00:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge remote-tracking branch 'bpay/clang-cl-build-fixes' into development

Browse source 
Conflicts:
	Engine/source/T3D/shapeBase.h
This commit is contained in:
Daniel Buckmaster 2015-07-17 16:55:12 +10:00
commit c2e5dc3345
17 changed files with 40 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Engine/source/windowManager/win32/win32Window.cpp
View file

@ -439,8 +439,8 @@ void Win32Window::centerWindow()
// Get the monitor's extents.
MONITORINFO monInfo;
dMemset(&monInfo, 0, sizeof MONITORINFO);
monInfo.cbSize = sizeof MONITORINFO;
dMemset(&monInfo, 0, sizeof(MONITORINFO));
monInfo.cbSize = sizeof(MONITORINFO);
GetMonitorInfo(hMon, &monInfo);
// Calculate the offset to center the window in the working area
@ -502,8 +502,8 @@ bool Win32Window::setSize( const Point2I &newSize )
// Get the monitor's extents.
MONITORINFO monInfo;
dMemset(&monInfo, 0, sizeof MONITORINFO);
monInfo.cbSize = sizeof MONITORINFO;
dMemset(&monInfo, 0, sizeof(MONITORINFO));
monInfo.cbSize = sizeof(MONITORINFO);
GetMonitorInfo(hMon, &monInfo);
// Calculate the offset to center the window in the working area

4
Engine/source/windowManager/win32/win32WindowMgr.cpp
View file

@ -502,8 +502,8 @@ void Win32WindowManager::lowerCurtain()
// Get the monitor's extents.
MONITORINFO monInfo;
dMemset(&monInfo, 0, sizeof MONITORINFO);
monInfo.cbSize = sizeof MONITORINFO;
dMemset(&monInfo, 0, sizeof(MONITORINFO));
monInfo.cbSize = sizeof(MONITORINFO);
GetMonitorInfo(hMon, &monInfo);

4
Engine/source/windowManager/win32/winDispatch.cpp
View file

@ -137,14 +137,14 @@ static void _keyboardEvent(Win32Window* window,UINT message, WPARAM wParam, WPAR
&& window->getKeyboardTranslation()
&& !window->shouldNotTranslate( torqueMods, newVirtKey ) )
{
U16 chars[ 64 ];
wchar_t chars[ 64 ];
dMemset( chars, 0, sizeof( chars ) );
S32 res = ToUnicode( keyCode, scanCode, keyboardState, chars, sizeof( chars ) / sizeof( chars[ 0 ] ), 0 );
// This should only happen on Window 9x/ME systems
if( res == 0 )
res = ToAscii( keyCode, scanCode, keyboardState, chars, 0 );
res = ToAscii( keyCode, scanCode, keyboardState, (LPWORD)chars, 0 );
if( res >= 1 )
{