From 5a943c56fc7e9570821a0585a5b2fbacb8eac466 Mon Sep 17 00:00:00 2001
From: unknown <E:\Ladik\Mail>
Date: Sun, 4 Oct 2015 12:21:43 +0200
Subject: + Workspaces for Visual Studio 2015 + Fixed warnings given by VS 2015

---
 src/SFileOpenArchive.cpp   | 6 +++---
 src/SFilePatchArchives.cpp | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/SFileOpenArchive.cpp b/src/SFileOpenArchive.cpp
index d62b98f..9ed74b4 100644
--- a/src/SFileOpenArchive.cpp
+++ b/src/SFileOpenArchive.cpp
@@ -209,7 +209,7 @@ bool WINAPI SFileOpenArchive(
     {
         ULONGLONG SearchOffset = 0;
         ULONGLONG EndOfSearch = FileSize;
-        DWORD dwStreamFlags = 0;
+        DWORD dwStrmFlags = 0;
         DWORD dwHeaderSize;
         DWORD dwHeaderID;
         bool bSearchComplete = false;
@@ -220,8 +220,8 @@ bool WINAPI SFileOpenArchive(
         pStream = NULL;
 
         // Set the archive read only if the stream is read-only
-        FileStream_GetFlags(ha->pStream, &dwStreamFlags);
-        ha->dwFlags |= (dwStreamFlags & STREAM_FLAG_READ_ONLY) ? MPQ_FLAG_READ_ONLY : 0;
+        FileStream_GetFlags(ha->pStream, &dwStrmFlags);
+        ha->dwFlags |= (dwStrmFlags & STREAM_FLAG_READ_ONLY) ? MPQ_FLAG_READ_ONLY : 0;
 
         // Also remember if we shall check sector CRCs when reading file
         ha->dwFlags |= (dwFlags & MPQ_OPEN_CHECK_SECTOR_CRC) ? MPQ_FLAG_CHECK_SECTOR_CRC : 0;
diff --git a/src/SFilePatchArchives.cpp b/src/SFilePatchArchives.cpp
index d01aaf2..840f86c 100644
--- a/src/SFilePatchArchives.cpp
+++ b/src/SFilePatchArchives.cpp
@@ -671,7 +671,7 @@ int Patch_InitPatcher(TMPQPatcher * pPatcher, TMPQFile * hf)
     DWORD cbMaxFileData = 0;
 
     // Overflow check
-    if((sizeof(MPQ_PATCH_HEADER) + cbMaxFileData) < cbMaxFileData)
+    if((cbMaxFileData + (DWORD)sizeof(MPQ_PATCH_HEADER)) < cbMaxFileData)
         return ERROR_NOT_ENOUGH_MEMORY;
     if(hf->hfPatch == NULL)
         return ERROR_INVALID_PARAMETER;
-- 
cgit v1.2.3