ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix some random warnings.

This commit is contained in:
Matthew Parlane 2012-12-24 07:37:50 +13:00
parent f865450b5a
commit 59ec1fe180
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Common/Src/VideoBackendBase.cpp
View File

@ -41,7 +41,7 @@ static bool IsGteVista()
VER_SET_CONDITION(dwlConditionMask, VER_MAJORVERSION, VER_GREATER_EQUAL); VER_SET_CONDITION(dwlConditionMask, VER_MAJORVERSION, VER_GREATER_EQUAL);
return VerifyVersionInfo(&osvi, VER_MAJORVERSION, dwlConditionMask); return VerifyVersionInfo(&osvi, VER_MAJORVERSION, dwlConditionMask) != FALSE;
} }
#endif #endif

6
Source/Core/Core/Src/Movie.cpp
View File

@ -97,7 +97,7 @@ void EnsureTmpInputSize(size_t bound)
if (tmpInput != NULL) if (tmpInput != NULL)
{ {
if (g_totalBytes > 0) if (g_totalBytes > 0)
memcpy(newTmpInput, tmpInput, g_totalBytes); memcpy(newTmpInput, tmpInput, (size_t)g_totalBytes);
delete[] tmpInput; delete[] tmpInput;
} }
tmpInput = newTmpInput; tmpInput = newTmpInput;
@ -637,7 +637,7 @@ void RecordInput(SPADStatus *PadStatus, int controllerID)
g_bDiscChange = false; g_bDiscChange = false;
} }
EnsureTmpInputSize(g_currentByte + 8); EnsureTmpInputSize((size_t)(g_currentByte + 8));
memcpy(&(tmpInput[g_currentByte]), &g_padState, 8); memcpy(&(tmpInput[g_currentByte]), &g_padState, 8);
g_currentByte += 8; g_currentByte += 8;
g_totalBytes = g_currentByte; g_totalBytes = g_currentByte;
@ -661,7 +661,7 @@ void RecordWiimote(int wiimote, u8 *data, u8 size)
return; return;
InputUpdate(); InputUpdate();
EnsureTmpInputSize(g_currentByte + size + 1); EnsureTmpInputSize((size_t)(g_currentByte + size + 1));
tmpInput[g_currentByte++] = size; tmpInput[g_currentByte++] = size;
memcpy(&(tmpInput[g_currentByte]), data, size); memcpy(&(tmpInput[g_currentByte]), data, size);
g_currentByte += size; g_currentByte += size;