From 73b6a165512e92fd3e36b21c245bfa3b95ea8819 Mon Sep 17 00:00:00 2001
From: Alexander Batalov <alex.batalov@gmail.com>
Date: Wed, 27 Jul 2022 10:11:33 +0300
Subject: [PATCH] Fix loading save game crash on Windows

---
 src/file_utils.cc | 22 +++++++---------------
 src/file_utils.h  |  1 -
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/src/file_utils.cc b/src/file_utils.cc
index 664ff02..dc25dba 100644
--- a/src/file_utils.cc
+++ b/src/file_utils.cc
@@ -10,6 +10,8 @@
 
 #include <vector>
 
+static void fileCopy(const char* existingFilePath, const char* newFilePath);
+
 // 0x452740
 int fileCopyDecompressed(const char* existingFilePath, const char* newFilePath)
 {
@@ -51,7 +53,7 @@ int fileCopyDecompressed(const char* existingFilePath, const char* newFilePath)
             return -1;
         }
     } else {
-        fileCopy(existingFilePath, newFilePath, true);
+        fileCopy(existingFilePath, newFilePath);
     }
 
     return 0;
@@ -74,7 +76,7 @@ int fileCopyCompressed(const char* existingFilePath, const char* newFilePath)
         // Source file is already gzipped, there is no need to do anything
         // besides copying.
         fclose(inStream);
-        fileCopy(existingFilePath, newFilePath, true);
+        fileCopy(existingFilePath, newFilePath);
     } else {
         gzFile outStream = compat_gzopen(newFilePath, "wb");
         if (outStream == NULL) {
@@ -137,15 +139,13 @@ int _gzdecompress_file(const char* existingFilePath, const char* newFilePath)
         gzclose(gzstream);
         fclose(stream);
     } else {
-        fileCopy(existingFilePath, newFilePath, true);
+        fileCopy(existingFilePath, newFilePath);
     }
 
     return 0;
 }
 
-// Modelled as replacement for `CopyFileA`, but `overwrite` is the opposite to
-// `bFailIfExists` param. Update callers accordingly.
-void fileCopy(const char* existingFilePath, const char* newFilePath, bool overwrite)
+static void fileCopy(const char* existingFilePath, const char* newFilePath)
 {
     char nativeExistingFilePath[COMPAT_MAX_PATH];
     strcpy(nativeExistingFilePath, existingFilePath);
@@ -155,16 +155,8 @@ void fileCopy(const char* existingFilePath, const char* newFilePath, bool overwr
     strcpy(nativeNewFilePath, newFilePath);
     compat_windows_path_to_native(nativeNewFilePath);
 
-    char outMode[4];
-    outMode[0] = 'w';
-    outMode[1] = 'b';
-
-    if (!overwrite) {
-        outMode[2] = 'x';
-    }
-
     FILE* in = fopen(nativeExistingFilePath, "rb");
-    FILE* out = fopen(nativeNewFilePath, outMode);
+    FILE* out = fopen(nativeNewFilePath, "wb");
     if (in != NULL && out != NULL) {
         std::vector<unsigned char> buffer(0xFFFF);
 
diff --git a/src/file_utils.h b/src/file_utils.h
index cdac4d8..10f626a 100644
--- a/src/file_utils.h
+++ b/src/file_utils.h
@@ -4,6 +4,5 @@
 int fileCopyDecompressed(const char* existingFilePath, const char* newFilePath);
 int fileCopyCompressed(const char* existingFilePath, const char* newFilePath);
 int _gzdecompress_file(const char* existingFilePath, const char* newFilePath);
-void fileCopy(const char* existingFilePath, const char* newFilePath, bool overwrite);
 
 #endif /* FILE_UTILS_H */