Minor changes

- suppressed error in FFileReader::Serialize() when compiled with MAX_DEBUG and opening huge file
- updated compatibility table
- genmake now using -nologo for rc.exe
- test.sh now handles correctly D: Windows paths under linux/vmware
- improved VS projects

Author: gildor2

.vs/CppProperties.json

@@ -9,9 +9,8 @@
       ],
       "defines": [
         "WIN32",
-        "NDEBUG",
-        "UNICODE",
-        "_UNICODE"
+        "HAS_UI",
+        "RENDERING"
       ],
       "intelliSenseMode": "windows-msvc-x86",
       "environments": [
@@ -29,9 +28,8 @@
       ],
       "defines": [
         "WIN32",
-        "NDEBUG",
-        "UNICODE",
-        "_UNICODE",
+        "HAS_UI",
+        "RENDERING",
         "MAX_DEBUG"
       ],
       "intelliSenseMode": "windows-msvc-x86",
@@ -50,9 +48,8 @@
       ],
       "defines": [
         "WIN32",
-        "NDEBUG",
-        "UNICODE",
-        "_UNICODE"
+        "HAS_UI",
+        "RENDERING"
       ],
       "intelliSenseMode": "windows-msvc-x64",
       "environments": [
@@ -70,9 +67,8 @@
       ],
       "defines": [
         "WIN32",
-        "NDEBUG",
-        "UNICODE",
-        "_UNICODE",
+        "HAS_UI",
+        "RENDERING",
         "MAX_DEBUG"
       ],
       "intelliSenseMode": "windows-msvc-x64",

.vscode/c_cpp_properties.json

@@ -3,22 +3,22 @@
         {
             "name": "Win32",
             "includePath": [
-                "${workspaceFolder}/**",
+                "${workspaceFolder}",
                 "${workspaceFolder}/Core",
-                "${workspaceFolder}/Unreal"
+                "${workspaceFolder}/Unreal",
+                "${workspaceFolder}/UmodelTool",
+                "${workspaceFolder}/libs/includewin32"
             ],
             "defines": [
-                "_DEBUG",
-                "UNICODE",
-                "_UNICODE",
-				"RENDERING",
-				"HAS_UI"
+                "MAX_DEBUG",
+                "RENDERING",
+                "HAS_UI"
             ],
-			"forcedInclude": [
-				"${workspaceFolder}/Unreal/GameDefines.h"
-			],
-            "windowsSdkVersion": "10.0.17134.0",
-            "compilerPath": "C:/Program Files (x86)/Microsoft Visual Studio/2019/Community/VC/Tools/MSVC/14.22.27905/bin/Hostx64/x64/cl.exe",
+            "forcedInclude": [
+                "${workspaceFolder}/Unreal/GameDefines.h"
+            ],
+            "windowsSdkVersion": "10.0.18362.0",
+            "compilerPath": "C:/Program Files (x86)/Microsoft Visual Studio/2019/Community/VC/Tools/MSVC/14.24.28314/bin/Hostx64/x64/cl.exe",
             "cStandard": "c11",
             "cppStandard": "c++17",
             "intelliSenseMode": "msvc-x64",

Tools/CompatTable/table.ini

@@ -617,6 +617,12 @@ Y Y Y Y UE4.16
 Mata
 https://store.steampowered.com/app/893070/The_End_Inaris_Quest/
 
+[The Inpatient (PS4)]
+Y Y Y Y UE4.17
+Supermassive Games
+https://en.wikipedia.org/wiki/The_Inpatient
+https://www.gildor.org/smf/index.php/topic,6919.0.html
+
 [The Swordsmen X]
 Y Y Y Y UE4.21
 ?

Tools/genmake

@@ -559,7 +559,7 @@ sub EmitCompilerDefs {
 		} else {
 			$defs .= " -d _WIN64 -d WIN64";
 		}
-		print "RC   = rc.exe -dNDEBUG -l 0x409${winxp}${defs}\n"
+		print "RC   = rc.exe -nologo -dNDEBUG -l 0x409${winxp}${defs}\n"
 	} elsif ($COMPILER eq "GnuC") {
 		my $platf = "gcc";
 		# platform override

Unreal/UnCoreSerialize.cpp

@@ -638,8 +638,8 @@ void FFileReader::Serialize(void *data, int size)
 				SeekPos = -1;
 			}
 		#if MAX_DEBUG
-			int tell = ftell(f);
-			if (tell != FilePos)
+			int tell = ftell(f); // msvcrt.dll doesn't have ftelli64, ftell() returns -1 when position is larger than 4Gb
+			if (tell != -1 && tell != FilePos)
 				appError("Bad FilePos!");
 		#endif
 			if (size >= FILE_BUFFER_SIZE / 2)

test.sh

@@ -27,16 +27,16 @@ EOF
 shopt -s extglob
 
 exe=umodel.exe
-c_drive=
+win_drive=
 if [ "$OSTYPE" == "linux-gnu" ] || [ "$OSTYPE" == "linux" ]; then
 	exe="umodel"
-	# VirtualBox default C: drive mapping
-	if [ -d "/media/sf_C_DRIVE" ]; then
-		c_drive="/media/sf_C_DRIVE"			# VirtualBox
-	elif [ -d "/mnt/hgfs/C" ]; then
-		c_drive="/mnt/hgfs/C"				# VMware
+	# Windows to VM or Linux path conversion
+#	if [ -d "/media/sf_C_DRIVE" ]; then
+#		c_drive="/media/sf_C_DRIVE"			# VirtualBox - not supported now because it has drive letter in the middle
+	if [ -d "/mnt/hgfs/C" ]; then
+		win_drive="/mnt/hgfs/"				# VMware
 	elif [ -d "/media/c" ]; then
-		c_drive="/media/c"
+		win_drive="/media/"					# linux
 	fi
 fi
 
@@ -66,8 +66,8 @@ function CheckDir()
 		dir=$1
 		DBG "... check $dir"
 		# support Windows paths on Linux
-		if [ "$c_drive" ] && [ "${dir:1:1}" == ":" ]; then
-			dir="${c_drive}${dir:2}"
+		if [ "$win_drive" ] && [ "${dir:1:1}" == ":" ]; then
+			dir="${win_drive}${dir:0:1}/${dir:2}"
 		fi
 		if [ -z "$checkedDirs" ]; then
 			checkedDirs=$dir
@@ -179,7 +179,7 @@ function fortnite()
 {
 	read aes < "Docs/fortnite.txt"
 	CheckDir "${launcher[@]/%/Fortnite/FortniteGame/Content/Paks}"
-	run -game=ue4.23 -aes=$aes $*
+	run -game=ue4.24 -aes=$aes $*
 }
 function ue3()
 {