Merge pull request #5572 from shuffle2/msvc-w4

msvc: use /W4 (and fixes to make it work)

3 files changed, 4 insertions, 3 deletions

diff --git a/Source/Core/DiscIO/CISOBlob.h b/Source/Core/DiscIO/CISOBlob.h
index b674dedc18..a1c8c97b40 100644
--- a/Source/Core/DiscIO/CISOBlob.h
+++ b/Source/Core/DiscIO/CISOBlob.h
@@ -48,7 +48,7 @@ private:
   CISOFileReader(File::IOFile file);
 
   typedef u16 MapType;
-  static const MapType UNUSED_BLOCK_ID = -1;
+  static const MapType UNUSED_BLOCK_ID = UINT16_MAX;
 
   File::IOFile m_file;
   u64 m_size;
diff --git a/Source/Core/DiscIO/VolumeDirectory.cpp b/Source/Core/DiscIO/VolumeDirectory.cpp
index ed965983e6..f6f603d8ff 100644
--- a/Source/Core/DiscIO/VolumeDirectory.cpp
+++ b/Source/Core/DiscIO/VolumeDirectory.cpp
@@ -35,7 +35,7 @@ const size_t VolumeDirectory::MAX_ID_LENGTH;
 
 VolumeDirectory::VolumeDirectory(const std::string& directory, bool is_wii,
                                  const std::string& apploader, const std::string& dol)
-    : m_data_start_address(-1), m_disk_header(DISKHEADERINFO_ADDRESS),
+    : m_data_start_address(UINT64_MAX), m_disk_header(DISKHEADERINFO_ADDRESS),
       m_disk_header_info(std::make_unique<SDiskHeaderInfo>()), m_fst_address(0), m_dol_address(0)
 {
   m_root_directory = ExtractDirectoryName(directory);
diff --git a/Source/Core/DiscIO/VolumeWii.cpp b/Source/Core/DiscIO/VolumeWii.cpp
index f928bbcdf3..4b6ef56539 100644
--- a/Source/Core/DiscIO/VolumeWii.cpp
+++ b/Source/Core/DiscIO/VolumeWii.cpp
@@ -32,7 +32,8 @@ namespace DiscIO
 constexpr u64 PARTITION_DATA_OFFSET = 0x20000;
 
 VolumeWii::VolumeWii(std::unique_ptr<BlobReader> reader)
-    : m_pReader(std::move(reader)), m_game_partition(PARTITION_NONE), m_last_decrypted_block(-1)
+    : m_pReader(std::move(reader)), m_game_partition(PARTITION_NONE),
+      m_last_decrypted_block(UINT64_MAX)
 {
   _assert_(m_pReader);