From 59ec1fe180e327e3a1b194f2a762d697591272c9 Mon Sep 17 00:00:00 2001 From: Matthew Parlane Date: Mon, 24 Dec 2012 07:37:50 +1300 Subject: [PATCH] Fix some random warnings. --- Source/Core/Common/Src/VideoBackendBase.cpp | 2 +- Source/Core/Core/Src/Movie.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/Core/Common/Src/VideoBackendBase.cpp b/Source/Core/Common/Src/VideoBackendBase.cpp index 339cb016c1..40bb0fc4ce 100644 --- a/Source/Core/Common/Src/VideoBackendBase.cpp +++ b/Source/Core/Common/Src/VideoBackendBase.cpp @@ -41,7 +41,7 @@ static bool IsGteVista() VER_SET_CONDITION(dwlConditionMask, VER_MAJORVERSION, VER_GREATER_EQUAL); - return VerifyVersionInfo(&osvi, VER_MAJORVERSION, dwlConditionMask); + return VerifyVersionInfo(&osvi, VER_MAJORVERSION, dwlConditionMask) != FALSE; } #endif diff --git a/Source/Core/Core/Src/Movie.cpp b/Source/Core/Core/Src/Movie.cpp index 4e5f3a3365..5eb1660d8e 100644 --- a/Source/Core/Core/Src/Movie.cpp +++ b/Source/Core/Core/Src/Movie.cpp @@ -97,7 +97,7 @@ void EnsureTmpInputSize(size_t bound) if (tmpInput != NULL) { if (g_totalBytes > 0) - memcpy(newTmpInput, tmpInput, g_totalBytes); + memcpy(newTmpInput, tmpInput, (size_t)g_totalBytes); delete[] tmpInput; } tmpInput = newTmpInput; @@ -637,7 +637,7 @@ void RecordInput(SPADStatus *PadStatus, int controllerID) g_bDiscChange = false; } - EnsureTmpInputSize(g_currentByte + 8); + EnsureTmpInputSize((size_t)(g_currentByte + 8)); memcpy(&(tmpInput[g_currentByte]), &g_padState, 8); g_currentByte += 8; g_totalBytes = g_currentByte; @@ -661,7 +661,7 @@ void RecordWiimote(int wiimote, u8 *data, u8 size) return; InputUpdate(); - EnsureTmpInputSize(g_currentByte + size + 1); + EnsureTmpInputSize((size_t)(g_currentByte + size + 1)); tmpInput[g_currentByte++] = size; memcpy(&(tmpInput[g_currentByte]), data, size); g_currentByte += size;