[GEN][ZH] Unify the Autorun tool with changes from JFS (#739)

Author: xezon

Generals/Code/CMakeLists.txt

@@ -19,6 +19,10 @@ target_include_directories(gi_libraries_source_wwvegas_ww3d2 INTERFACE "Librarie
 target_include_directories(gi_libraries_source_wwvegas_wwmath INTERFACE "Libraries/Source/WWVegas/WWMath")
 target_include_directories(gi_libraries_source_wwvegas_wwsaveload INTERFACE "Libraries/Source/WWVegas/WWSaveLoad")
 target_include_directories(gi_main INTERFACE "Main")
+
+target_compile_definitions(gi_always INTERFACE
+    RTS_GENERALS=1
+)
 target_link_libraries(gi_always INTERFACE
     core_utility
     gi_libraries_include

Generals/Code/Tools/Autorun/AUTORUN.RC

@@ -138,9 +138,29 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 // Bitmap
 //
 
+#if defined(APSTUDIO_INVOKED) || defined(_ENGLISH)
+#if defined(APSTUDIO_INVOKED)
+BACKGROUND$(_ENGLISH)   BITMAP  DISCARDABLE     "Autorun_BG.bmp"
+#else
 BACKGROUND              BITMAP  DISCARDABLE     "Autorun_BG.bmp"
+#endif
+#endif
 BUTTON_SEL              BITMAP  DISCARDABLE     "ARButton_Sel.bmp"
 BUTTON_REG              BITMAP  DISCARDABLE     "ARButton_Reg.bmp"
+#if defined(APSTUDIO_INVOKED) || defined(_FRENCH)
+#if defined(APSTUDIO_INVOKED)
+BACKGROUND$(_FRENCH)    BITMAP  DISCARDABLE     "AutoRun_Frn.bmp"
+#else
+BACKGROUND              BITMAP  DISCARDABLE     "AutoRun_Frn.bmp"
+#endif
+#endif
+#if defined(APSTUDIO_INVOKED) || defined(_GERMAN)
+#if defined(APSTUDIO_INVOKED)
+BACKGROUND$(_GERMAN)    BITMAP  DISCARDABLE     "AutoRun_Ger.bmp"
+#else
+BACKGROUND              BITMAP  DISCARDABLE     "AutoRun_Ger.bmp"
+#endif
+#endif
 
 #ifdef APSTUDIO_INVOKED
 /////////////////////////////////////////////////////////////////////////////
@@ -150,13 +170,12 @@ BUTTON_REG              BITMAP  DISCARDABLE     "ARButton_Reg.bmp"
 
 1 TEXTINCLUDE DISCARDABLE 
 BEGIN
-    "..\\resource.h\0"
+    "resource.h\0"
 END
 
 2 TEXTINCLUDE DISCARDABLE 
 BEGIN
-    "#include ""afxres.h""\r\n"
-    "\0"
+    "#include ""afxres.h""\0"
 END
 
 3 TEXTINCLUDE DISCARDABLE 

Generals/Code/Tools/Autorun/CMakeLists.txt

@@ -54,8 +54,8 @@ macro(setup_autorun appname)
     target_sources(${appname} PRIVATE ${AUTORUN_SRC})
 
     target_link_libraries(${appname} PRIVATE
-        gi_always
         core_config
+        gi_always
         winmm
     )
 

Generals/Code/Tools/Autorun/ViewHTML.cpp

@@ -79,18 +79,28 @@ bool ViewHTML(const char* url, bool wait, const CallbackHook& callback)
 
 	//--------------------------------------------------------------------------
 	// Create unique temporary HTML filename
+	// JFS: Fixed so that it would go to the temp folder which was crashing
+	// on limited users.
 	//--------------------------------------------------------------------------
 	char tempPath[MAX_PATH];
-	GetWindowsDirectory(tempPath, MAX_PATH);
-	
 	char filename1[MAX_PATH];
 	char filename2[MAX_PATH];
+	
+	// Expand the TMP environment variable. 
+	{ 
+		DWORD dwResult;
+		dwResult = ExpandEnvironmentStrings( "%TEMP%", tempPath,  MAX_PATH);
+		if(dwResult == 0)
+			return false;
+	}
+
 	GetTempFileName(tempPath, "WS", 0, filename1);
 
 	strcpy( filename2, filename1 );
 	char* extPtr = strrchr(filename2, '.');
 	strcpy(extPtr, ".html");
 
+
 //	DebugPrint(filename);
 	Msg( __LINE__, TEXT(__FILE__), TEXT("filename = %s"), filename2 );