1.7.0.2 (#32)

* change tpfconvert functionality to backup into backup folder

* use vcpkg for more packages

* update readme, bump to 1.7.0.2

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.16)
+cmake_minimum_required(VERSION 3.29)
 
 set(CMAKE_GENERATOR_PLATFORM win32)
 
@@ -9,16 +9,10 @@ if(NOT(CMAKE_SIZEOF_VOID_P EQUAL 4))
     message(FATAL_ERROR "You are configuring a non 32-bit build, this is not supported. Run cmake with `-A Win32`")
 endif()
 
-option(CLEAN "Cleans third party libraries and recompiles them" OFF)
-if(${CLEAN} MATCHES "ON")
-    message("Removing directory: ${PROJECT_SOURCE_DIR}/bin/install")
-    file(REMOVE_RECURSE ${PROJECT_SOURCE_DIR}/bin/install)
-endif()
-
 set(VERSION_MAJOR 1)
 set(VERSION_MINOR 7)
 set(VERSION_PATCH 0)
-set(VERSION_TWEAK 0)
+set(VERSION_TWEAK 2)
 
 set(VERSION_RC "${CMAKE_CURRENT_BINARY_DIR}/version.rc")
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/version.rc.in" "${VERSION_RC}" @ONLY)
@@ -27,15 +21,14 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_SOURCE_DIR}/bin")
 set(CMAKE_CXX_STANDARD 23)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
-set(CMAKE_INSTALL_PREFIX ${PROJECT_SOURCE_DIR}/bin/install)
 
 add_compile_options(/MP /permissive-)
 
 list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
-include(libzippp)
-include(minhook)
+find_package(libzippp CONFIG REQUIRED)
+find_package(minhook CONFIG REQUIRED)
+find_package(Microsoft.GSL CONFIG REQUIRED)
 include(dxtk)
-include(msgsl)
 
 add_library(gMod SHARED)
 
@@ -52,12 +45,13 @@ target_include_directories(gMod PRIVATE
     )
 source_group(TREE "${CMAKE_CURRENT_SOURCE_DIR}" FILES ${SOURCES})
 target_sources(gMod PRIVATE ${SOURCES})
+target_compile_options(gMod PRIVATE /W4 /WX)
 
 target_link_libraries(gMod PRIVATE
     dxguid
-    libzippp
+    libzippp::libzippp
     psapi
-    minhook
+    minhook::minhook
     directxtex
     Microsoft.GSL::GSL
     )

CMakePresets.json

@@ -7,6 +7,8 @@
 	  "architecture": "Win32",
       "binaryDir": "${sourceDir}/build",
       "cacheVariables": {
+		"VCPKG_OVERLAY_TRIPLETS": "${sourceDir}/triplets",
+		"VCPKG_TARGET_TRIPLET": "x86-windows-mixed",
         "CMAKE_TOOLCHAIN_FILE": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake"
       }
     }

README.md

@@ -28,7 +28,7 @@ If you would like to use Reshade in combination with gMod, we recommend running
 
 Requirements:
 - Visual Studio 2022
-- CMake 3.16+, integrated into the Developer Powershell for VS 2022
+- CMake 3.29+, integrated into the Developer Powershell for VS 2022
 - vcpkg, integrated into the Developer Powershell for VS 2022
 
 Compile:
@@ -39,7 +39,6 @@ Compile:
 **TpfConvert**
 Small utility to convert old .tpf files with invalid images into .zip files with working images.
 Usage:
-- put TpfConvert.exe and d3dx9.dll anywhere
-- create a folder "plugins" in that folder and put your .tpf/.zip files with invalid images there
-- run TpfConvert.exe, My_Texmod.tpf is fixed and copied into My_Texmod_.zip
-- copy My_Texmod_.zip into your GW Launcher plugins folder, delete My_Texmod.tpf from it, if it still exists
+- Put TpfConvert.exe and d3dx9.dll in the folder where you have your old, broken texmods with invalid images.
+- Run TpfConvert.exe, all *.tpf and *.zip files are processed. The originals are saved into a newly created backup folder.
+- Done.

TpfConvert/CMakeLists.txt

@@ -33,7 +33,7 @@ endif()
 find_package(dxsdk-d3dx CONFIG REQUIRED)
 
 target_link_libraries(TpfConvert PRIVATE
-    libzippp
+    libzippp::libzippp
     Microsoft::D3DX9
     d3d9
 )

TpfConvert/src/TpfConvert.ixx

@@ -85,7 +85,8 @@ namespace {
 
 int main(int argc, char* argv[])
 {
-    const std::filesystem::path path = argc > 1 ? argv[1] : GetExecutablePath() / "plugins";
+    const std::filesystem::path path = argc > 1 ? argv[1] : GetExecutablePath();
+    const auto backup_path = path / "backup";
 
     if (!InitializeDirect3D()) {
         return -1;
@@ -95,28 +96,35 @@ int main(int argc, char* argv[])
         return 1;
     }
 
+    if (!std::filesystem::exists(backup_path)) {
+        std::filesystem::create_directory(backup_path);
+    }
+
     for (const auto& modfile : std::filesystem::directory_iterator(path)) {
         if (modfile.is_regular_file() && (modfile.path().extension() == ".tpf" || modfile.path().extension() == ".zip")) {
             const auto mod_path = modfile.path();
-            if (mod_path.extension() == ".zip" && mod_path.stem().string().ends_with("_")) {
+            const auto backup_file = backup_path / mod_path.filename();
+
+            if (std::filesystem::exists( backup_file)) {
                 std::print("Skipping previous TpfConvert output: {}\n", mod_path.filename().string());
                 continue;
             }
             else {
                 std::print("Processing: {}\n", mod_path.filename().string());
+                std::error_code ec;
+                std::filesystem::rename(mod_path, backup_file, ec);
             }
 
-            const auto zip_filename = mod_path.parent_path() / (mod_path.stem().string() + "_.zip");
+            const auto zip_filename = path / (mod_path.stem().string() + ".zip");
             if (std::filesystem::exists(zip_filename)) {
-                std::print("{} was already processed\n", mod_path.filename().string());
-                continue;
+                std::filesystem::remove(zip_filename);
             }
-            libzippp::ZipArchive zip_archive(zip_filename.string());
 
-            ModfileLoader loader(mod_path);
+            ModfileLoader loader(backup_file);
             std::vector<std::pair<std::string, std::vector<uint8_t>>> data_entries;
             const auto entries = loader.GetContents();
 
+            libzippp::ZipArchive zip_archive(zip_filename.string());
             zip_archive.open(libzippp::ZipArchive::Write);
 
             for (const auto& entry : entries) {

cmake/libzip.cmake

@@ -1,65 +0,0 @@
-include_guard()
-include(FetchContent)
-include(zlib)
-
-FetchContent_Declare(
-    libzip
-    GIT_REPOSITORY https://github.com/nih-at/libzip
-    GIT_TAG v1.10.1)
-FetchContent_GetProperties(libzip)
-
-if (libzip_POPULATED)
-    message(STATUS "Skipping libzip download")
-    return()
-endif()
-
-FetchContent_Populate(libzip)
-if(EXISTS ${CMAKE_INSTALL_PREFIX}/lib/zip.lib)
-    message(STATUS "Skipping libzip build")
-    return()
-endif()
-
-set(OPTIONS
-    "-A" "Win32"
-    "-DZLIB_LIBRARY:PATH=${CMAKE_INSTALL_PREFIX}/lib/zlibstatic.lib"
-    "-DZLIB_INCLUDE_DIR:PATH=${CMAKE_INSTALL_PREFIX}/include"
-    "-DENABLE_COMMONCRYPTO=OFF"
-    "-DENABLE_GNUTLS=OFF"
-    "-DENABLE_MBEDTLS=OFF"
-    "-DENABLE_OPENSSL=OFF"
-    "-DENABLE_WINDOWS_CRYPTO=ON"
-    "-DENABLE_FDOPEN=OFF"
-    "-DENABLE_BZIP2=OFF"
-    "-DENABLE_LZMA=OFF"
-    "-DENABLE_ZSTD=OFF"
-    "-DBUILD_TOOLS=OFF"
-    "-DBUILD_REGRESS=OFF"
-    "-DBUILD_EXAMPLES=OFF"
-    "-DBUILD_DOC=OFF"
-    "-DLIBZIP_DO_INSTALL=ON"
-    "-DBUILD_SHARED_LIBS=OFF"
-    "-DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}"
-    "-DCMAKE_MSVC_RUNTIME_LIBRARY=${CMAKE_MSVC_RUNTIME_LIBRARY}"
-    )
-
-message("Building libzip with OPTIONS:\n${OPTIONS}")
-
-# Patch CMakeLists.txt to require version 3.15 - otherwise cmake ignores MSVC_RUNTIME_LIBRARY
-file(READ ${libzip_SOURCE_DIR}/CMakeLists.txt FILE_CONTENT)
-string(REPLACE "VERSION 3.5.0" "VERSION 3.15.0" UPDATED_CONTENT "${FILE_CONTENT}")
-file(WRITE ${libzip_SOURCE_DIR}/CMakeLists.txt "${UPDATED_CONTENT}")
-      
-execute_process(
-    COMMAND ${CMAKE_COMMAND} ${OPTIONS} .
-    WORKING_DIRECTORY ${libzip_SOURCE_DIR}
-)
-execute_process(
-    COMMAND ${CMAKE_COMMAND} --build . --config Release
-    WORKING_DIRECTORY ${libzip_SOURCE_DIR}
-)
-execute_process(
-    COMMAND ${CMAKE_COMMAND} --install . --config Release
-    WORKING_DIRECTORY ${libzip_SOURCE_DIR}
-)
-
-message(STATUS "Finished libzip build")

cmake/libzippp.cmake

@@ -1,42 +0,0 @@
-include_guard()
-include(FetchContent)
-include(libzip)
-
-find_library(ZLIB_LIBRARY REQUIRED
-    NAMES zlibstatic
-    PATHS ${CMAKE_INSTALL_PREFIX}/lib
-)
-find_library(LIBZIP_LIBRARY REQUIRED
-    NAMES zip
-    PATHS ${CMAKE_INSTALL_PREFIX}/lib
-)
-
-FetchContent_Declare(
-    libzippp
-    GIT_REPOSITORY https://github.com/ctabin/libzippp
-    GIT_TAG libzippp-v7.0-1.10.1)
-FetchContent_GetProperties(libzippp)
-
-if (NOT libzippp_POPULATED)
-    FetchContent_Populate(libzippp)
-endif()
-
-add_library(libzippp STATIC)
-
-set(SOURCES
-    "${libzippp_SOURCE_DIR}/src/libzippp.h"
-    "${libzippp_SOURCE_DIR}/src/libzippp.cpp"
-    )
-source_group(TREE ${libzippp_SOURCE_DIR} FILES ${SOURCES})
-target_sources(libzippp PRIVATE ${SOURCES})
-target_include_directories(libzippp PUBLIC "${libzippp_SOURCE_DIR}/src")
-target_include_directories(libzippp PRIVATE "${CMAKE_INSTALL_PREFIX}/include")
-target_compile_definitions(libzippp PUBLIC
-    LIBZIPPP_WITH_ENCRYPTION
-    )
-target_link_libraries(libzippp PRIVATE
-    ${LIBZIP_LIBRARY}
-    ${ZLIB_LIBRARY}
-    )
-
-set_target_properties(libzippp PROPERTIES FOLDER "Dependencies/")

cmake/minhook.cmake

@@ -1,16 +0,0 @@
-include_guard()
-include(FetchContent)
-
-FetchContent_Declare(
-    minhook
-    GIT_REPOSITORY https://github.com/TsudaKageyu/minhook
-    GIT_TAG master)
-FetchContent_GetProperties(minhook)
-
-if (NOT minhook_POPULATED)
-    FetchContent_Populate(minhook)
-endif()
-
-add_subdirectory(${minhook_SOURCE_DIR} EXCLUDE_FROM_ALL)
-
-set_target_properties(minhook PROPERTIES FOLDER "Dependencies/")

cmake/msgsl.cmake

@@ -1,11 +0,0 @@
-cmake_minimum_required(VERSION 3.14)
-
-include(FetchContent)
-
-FetchContent_Declare(GSL
-    GIT_REPOSITORY "https://github.com/microsoft/GSL"
-    GIT_TAG "v4.0.0"
-    GIT_SHALLOW ON
-)
-
-FetchContent_MakeAvailable(GSL)

cmake/zlib.cmake

@@ -1,47 +0,0 @@
-include_guard()
-include(FetchContent)
-
-# Fetch zlib using FetchContent
-FetchContent_Declare(
-  zlib
-  GIT_REPOSITORY https://github.com/madler/zlib
-  GIT_TAG v1.3
-)
-
-FetchContent_GetProperties(zlib)
-
-if(zlib_POPULATED)
-    message(STATUS "Skipping zlib download")
-    return()
-endif()
-
-FetchContent_Populate(zlib)
-
-if(EXISTS ${CMAKE_INSTALL_PREFIX}/lib/zlibstatic.lib)
-    message(STATUS "Skipping zlib build")
-    return()
-endif()
-
-set(OPTIONS
-    "-A" "Win32"
-    "-DBUILD_SHARED_LIBS=OFF"
-    "-DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}"
-    "-DCMAKE_MSVC_RUNTIME_LIBRARY=${CMAKE_MSVC_RUNTIME_LIBRARY}"
-)
-    
-message("Building zlib with OPTIONS:\n${OPTIONS}")
-
-execute_process(
-    COMMAND ${CMAKE_COMMAND} ${OPTIONS} .
-    WORKING_DIRECTORY ${zlib_SOURCE_DIR}
-)
-execute_process(
-    COMMAND ${CMAKE_COMMAND} --build . --config Release
-    WORKING_DIRECTORY ${zlib_SOURCE_DIR}
-)
-execute_process(
-    COMMAND ${CMAKE_COMMAND} --install . --config Release
-    WORKING_DIRECTORY ${zlib_SOURCE_DIR}
-)
-
-message(STATUS "Finished zlib build")

header/Defines.h

@@ -34,7 +34,7 @@ struct TextureFileStruct {
     HashType crc_hash = 0; // hash value
 };
 
-inline void Message(const char* format, ...)
+inline void Message([[maybe_unused]] const char* format, ...)
 {
 #ifdef _DEBUG
 #if 0
@@ -46,7 +46,7 @@ inline void Message(const char* format, ...)
 #endif
 }
 
-inline void Info(const char* format, ...)
+inline void Info([[maybe_unused]] const char* format, ...)
 {
 #ifdef _DEBUG
     const HANDLE hConsole = GetStdHandle(STD_OUTPUT_HANDLE);
@@ -58,7 +58,7 @@ inline void Info(const char* format, ...)
 #endif
 }
 
-inline void Warning(const char* format, ...)
+inline void Warning([[maybe_unused]] const char* format, ...)
 {
 #ifdef _DEBUG
     const HANDLE hConsole = GetStdHandle(STD_ERROR_HANDLE);

modules/ModfileLoader_TpfReader.ixx

@@ -23,13 +23,13 @@ public:
         line_length = file_stream.tellg();
         file_stream.seekg(0, std::ios::beg); // Go to the beginning of the stream
 
-        std::vector<char> data(line_length);
+        std::vector<char> data(static_cast<long>(line_length));
         file_stream.read(data.data(), line_length);
-        for (auto i = 0; i < data.size(); i++) {
+        for (auto i = 0u; i < data.size(); i++) {
             data[i] = XOR(data[i], i);
         }
 
-        for (int i = data.size() - 1; i > 0 && data[i] != 0; i--) {
+        for (auto i = data.size() - 1; i > 0 && data[i] != 0; i--) {
             data[i] = 0;
         }
 
@@ -42,7 +42,7 @@ public:
 
 private:
     std::ifstream file_stream;
-    long line_length = 0;
+    std::streamoff line_length = 0;
 
     [[nodiscard]] char XOR(const char b, const long position) const
     {

modules/TextureClient.ixx

@@ -10,6 +10,7 @@ export module TextureClient;
 import TextureFunction;
 import ModfileLoader;
 
+export std::vector<std::pair<std::string, std::string>> modlists_contents;
 /*
  *  An object of this class is owned by each d3d9 device.
  *  All other functions are called from the render thread instance of the game itself.
@@ -56,8 +57,7 @@ private:
     // called if a target texture is found
     int LoadTexture(TextureFileStruct* file_in_memory, uModTexturePtrPtr auto ppTexture);
 
-    void LoadModsFromFile(const char* source);
-    std::filesystem::path exe_path; // path to gw.exe
+    void LoadModsFromModlist(std::pair<std::string, std::string> modfile_tuple);
     std::filesystem::path dll_path; // path to gmod dll
 };
 
@@ -189,18 +189,12 @@ std::vector<gsl::owner<TextureFileStruct*>> ProcessModfile(const std::filesystem
     return texture_file_structs;
 }
 
-void TextureClient::LoadModsFromFile(const char* source)
+void TextureClient::LoadModsFromModlist(std::pair<std::string, std::string> modfile_tuple)
 {
     static std::vector<std::filesystem::path> loaded_modfiles{};
-    Message("Initialize: searching in %s\n", source);
 
     std::locale::global(std::locale(""));
-    std::ifstream file(source, std::ios::binary);
-    if (!file.is_open()) {
-        Warning("LoadModsFromFile: failed to open modlist.txt for reading; aborting!!!");
-        return;
-    }
-    Message("Initialize: found modlist.txt. Reading\n");
+    std::istringstream file(modfile_tuple.second);
     std::string line;
     std::vector<std::filesystem::path> modfiles;
     while (std::getline(file, line)) {
@@ -216,7 +210,7 @@ void TextureClient::LoadModsFromFile(const char* source)
             loaded_modfiles.push_back(fsline);
         }
     }
-    auto files_size = 0u;
+    auto files_size = 0ull;
     for (const auto modfile : modfiles) {
         if (std::filesystem::exists(modfile)) {
             files_size += std::filesystem::file_size(modfile);
@@ -241,26 +235,15 @@ void TextureClient::LoadModsFromFile(const char* source)
         }
         should_update = true;
     }
-    Message("Finished loading mods from %s: Loaded %u bytes (%u mb)", source, loaded_size, loaded_size / 1024 / 1024);
+    Message("Finished loading mods from %s: Loaded %u bytes (%u mb)", modfile_tuple.first.c_str(), loaded_size, loaded_size / 1024 / 1024);
 }
 
 void TextureClient::Initialize()
 {
     const auto t1 = std::chrono::high_resolution_clock::now();
     Info("Initialize: begin\n");
-    Message("Initialize: searching for modlist.txt\n");
-    char gwpath[MAX_PATH]{};
-    GetModuleFileName(GetModuleHandle(nullptr), gwpath, MAX_PATH); //ask for name and path of this executable
-    char dllpath[MAX_PATH]{};
-    GetModuleFileName(gl_hThisInstance, dllpath, MAX_PATH); //ask for name and path of this dll
-    exe_path = std::filesystem::path(gwpath).parent_path();
-    dll_path = std::filesystem::path(dllpath).parent_path();
-    for (const auto& path : {exe_path, dll_path}) {
-        const auto modlist = path / "modlist.txt";
-        if (std::filesystem::exists(modlist)) {
-            Message("Initialize: found %s\n", modlist.string().c_str());
-            LoadModsFromFile(modlist.string().c_str());
-        }
+    for (const auto& modlists_content : modlists_contents) {
+        LoadModsFromModlist(modlists_content);
     }
     const auto t2 = std::chrono::high_resolution_clock::now();
     const auto ms = duration_cast<std::chrono::milliseconds>(t2 - t1);

modules/TextureFunction.ixx

@@ -146,7 +146,7 @@ export namespace TextureFunction {
         return crc;
     }
 
-    uint32_t get_crc32(const char* data_ptr, const int length)
+    uint32_t get_crc32(const char* data_ptr, const unsigned int length)
     {
         constexpr static auto crc32_poly = 0xEDB88320u;
         constexpr static auto ul_crc_in = 0xffffffff;
@@ -365,7 +365,7 @@ export namespace TextureFunction {
         }
     }
 
-    DirectX::Blob ConvertToCompressedDDS(TexEntry& entry, const bool compress, const std::filesystem::path& dll_path)
+    DirectX::Blob ConvertToCompressedDDS(TexEntry& entry, const bool compress, [[maybe_unused]] const std::filesystem::path& dll_path)
     {
         DirectX::ScratchImage image;
         HRESULT hr = 0;

source/Error.cpp

@@ -16,7 +16,7 @@ const char *function)
         GetModuleFileName(gl_hThisInstance, module_path, _countof(module_path));
     }
     if (!*module_path) {
-        strcpy(module_path, "Unknown");
+        strcpy_s(module_path, "Unknown");
     }
     const char* fmt = "Module: %s\n\nExpr: %s\n\nFile: %s\n\nFunction: %s, line %d";
     int len = snprintf(NULL, 0, fmt, module_path, expr, file, function, line);

source/dll_main.cpp

@@ -2,6 +2,8 @@
 #include <Psapi.h>
 #include "MinHook.h"
 
+import TextureClient;
+
 void ExitInstance();
 void InitInstance(HINSTANCE hModule);
 
@@ -44,7 +46,7 @@ namespace {
             TCHAR szModuleName[MAX_PATH];
             ASSERT(GetModuleFileName(hModules[i], szModuleName, _countof(szModuleName)) > 0);
             const auto basename = strrchr(szModuleName, '\\');
-            if (basename && stricmp(basename + 1, name) == 0)
+            if (basename && _stricmp(basename + 1, name) == 0)
                 return hModules[i];
         }
         return nullptr;
@@ -201,16 +203,39 @@ BOOL WINAPI DllMain(HINSTANCE hModule, DWORD ul_reason_for_call, LPVOID lpReserv
     return true;
 }
 
+void LoadModlists()
+{
+    Message("Initialize: searching for modlist.txt\n");
+    char gwpath[MAX_PATH]{};
+    GetModuleFileName(GetModuleHandle(nullptr), gwpath, MAX_PATH); //ask for name and path of this executable
+    char dllpath[MAX_PATH]{};
+    GetModuleFileName(gl_hThisInstance, dllpath, MAX_PATH); //ask for name and path of this dll
+    const auto exe_path = std::filesystem::path(gwpath).parent_path();
+    const auto dll_path = std::filesystem::path(dllpath).parent_path();
+    for (const auto& path : {exe_path, dll_path}) {
+        const auto modlist = path / "modlist.txt";
+        if (std::filesystem::exists(modlist)) {
+            Message("Initialize: found %s\n", modlist.string().c_str());
+            std::ifstream t(modlist, std::ios::binary);
+            std::stringstream buffer;
+            buffer << t.rdbuf();
+            modlists_contents.emplace_back(modlist.string(), buffer.str());
+        }
+    }
+}
+
 void InitInstance(HINSTANCE hModule)
 {
     Message("InitInstance: %p\n", hModule);
-    DisableThreadLibraryCalls(hModule); //reduce overhead
 
     // Store the handle to this module
     gl_hThisInstance = hModule;
 
+    LoadModlists();
+    DisableThreadLibraryCalls(hModule); //reduce overhead
+
     // d3d9.dll shouldn't be loaded at this point.
-    const auto d3d9_loaded = FindLoadedModuleByName("d3d9.dll");
+    [[maybe_unused]] const auto d3d9_loaded = FindLoadedModuleByName("d3d9.dll");
     //ASSERT(!d3d9_loaded);
 
     MH_Initialize();

source/uMod_IDirect3DCubeTexture9.cpp

@@ -264,7 +264,7 @@ HashTuple uMod_IDirect3DCubeTexture9::GetHash() const
         }
     }
 
-    const int size = (TextureFunction::GetBitsFromFormat(desc.Format) * desc.Width * desc.Height) / 8;
+    const auto size = (TextureFunction::GetBitsFromFormat(desc.Format) * desc.Width * desc.Height) / 8;
     const auto crc32 = TextureFunction::get_crc32(static_cast<char*>(d3dlr.pBits), size);
     const auto crc64 = HashCheck::Use64BitCrc() ? TextureFunction::get_crc64(static_cast<char*>(d3dlr.pBits), size) : 0;
 

source/uMod_IDirect3DDevice9.cpp

@@ -66,7 +66,7 @@ ULONG uMod_IDirect3DDevice9::Release()
 
     const ULONG count = m_pIDirect3DDevice9->Release();
     Message("%p = " PRE_MESSAGE "::Release(): %p\n", count, this);
-    if (uMod_Reference != count) //bug
+    if (uMod_Reference != static_cast<int>(count)) //bug
     {
         Message("Error in " PRE_MESSAGE "::Release(): %p!=%p\n", uMod_Reference, count);
     }
@@ -367,9 +367,9 @@ HRESULT uMod_IDirect3DDevice9::UpdateTexture(IDirect3DBaseTexture9* pSourceTextu
                     pDest->Hash = pSource->Hash; // take over the hash
                     UnswitchTextures(pDest);
                     if (pSource->CrossRef_D3Dtex != nullptr) {
-                        uMod_IDirect3DTexture9* cpy = pSource->CrossRef_D3Dtex;
+                        uMod_IDirect3DTexture9* cpy2 = pSource->CrossRef_D3Dtex;
                         UnswitchTextures(pSource);
-                        SwitchTextures(cpy, pDest);
+                        SwitchTextures(cpy2, pDest);
                     }
                 }
                 if (pDest->CrossRef_D3Dtex != nullptr) {
@@ -387,9 +387,9 @@ HRESULT uMod_IDirect3DDevice9::UpdateTexture(IDirect3DBaseTexture9* pSourceTextu
                     pDest->Hash = pSourceVolume->Hash; // take over the hash
                     UnswitchTextures(pDest);
                     if (pSourceVolume->CrossRef_D3Dtex != nullptr) {
-                        uMod_IDirect3DVolumeTexture9* cpy = pSourceVolume->CrossRef_D3Dtex;
+                        uMod_IDirect3DVolumeTexture9* cpy2 = pSourceVolume->CrossRef_D3Dtex;
                         UnswitchTextures(pSourceVolume);
-                        SwitchTextures(cpy, pDest);
+                        SwitchTextures(cpy2, pDest);
                     }
                 }
                 if (pDest->CrossRef_D3Dtex != nullptr) {
@@ -407,9 +407,9 @@ HRESULT uMod_IDirect3DDevice9::UpdateTexture(IDirect3DBaseTexture9* pSourceTextu
                     pDest->Hash = pSourceCube->Hash; // take over the hash
                     UnswitchTextures(pDest);
                     if (pSourceCube->CrossRef_D3Dtex != nullptr) {
-                        uMod_IDirect3DCubeTexture9* cpy = pSourceCube->CrossRef_D3Dtex;
+                        uMod_IDirect3DCubeTexture9* cpy2 = pSourceCube->CrossRef_D3Dtex;
                         UnswitchTextures(pSourceCube);
-                        SwitchTextures(cpy, pDest);
+                        SwitchTextures(cpy2, pDest);
                     }
                 }
                 if (pDest->CrossRef_D3Dtex != nullptr) {

triplets/x86-windows-mixed.cmake

@@ -0,0 +1,9 @@
+set(VCPKG_TARGET_ARCHITECTURE x86)
+
+if(PORT MATCHES "dxsdk-d3dx")
+    set(VCPKG_CRT_LINKAGE dynamic)
+    set(VCPKG_LIBRARY_LINKAGE dynamic)
+else()
+    set(VCPKG_CRT_LINKAGE static)
+    set(VCPKG_LIBRARY_LINKAGE static)
+endif()

vcpkg.json

@@ -1,5 +1,13 @@
 {
   "dependencies": [
-    "dxsdk-d3dx"
+    "dxsdk-d3dx",
+    {
+      "name": "libzippp",
+      "features": [
+        "encryption"
+      ]
+    },
+    "minhook",
+    "ms-gsl"
   ]
 }