Add Multiple Icons Support + ZlibStream Unicode + DarkExt.json changes

.gitattributes

@@ -73,3 +73,7 @@
 *.plist text eol=lf
 *.java text eol=lf
 CodeResources text eol=lf
+
+# HelpNDoc and generated compressed help files
+*.hnd binary
+*.chm binary

.gitignore

@@ -204,3 +204,5 @@ DarkEdif*.sln
 *.sdf
 *.db
 *.001
+*.mf2backup.mfa
+*.mfacfg

AllExts VS2017.sln

@@ -45,7 +45,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BitMask", "MMF2SDK\Bit Mask
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PackX", "MMF2SDK\PackX\PackX.vcxproj", "{29B44557-9BC0-43BC-BBF6-0AB4C9B69198}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VOLINFO", "MMF2SDK\VOLINFO\VOLINFO.vcxproj", "{2196C17D-EDAC-43AD-AF88-1D7D6CBD9145}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VOLINFO", "MMF2SDK_Unicode\VOLINFO\VOLINFO.vcxproj", "{2196C17D-EDAC-43AD-AF88-1D7D6CBD9145}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Stochastic Utility", "Edif\Stochastic Utility\Stochastic Utility.vcxproj", "{5BC0EA76-0F7D-4F52-ADC9-CE378742E9B9}"
 EndProject

AllExts VS2019.sln

@@ -47,7 +47,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BitMask", "MMF2SDK\Bit Mask
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PackX", "MMF2SDK\PackX\PackX.vcxproj", "{29B44557-9BC0-43BC-BBF6-0AB4C9B69198}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VOLINFO", "MMF2SDK\VOLINFO\VOLINFO.vcxproj", "{2196C17D-EDAC-43AD-AF88-1D7D6CBD9145}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VOLINFO", "MMF2SDK_Unicode\VOLINFO\VOLINFO.vcxproj", "{2196C17D-EDAC-43AD-AF88-1D7D6CBD9145}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Stochastic Utility", "Edif\Stochastic Utility\Stochastic Utility.vcxproj", "{5BC0EA76-0F7D-4F52-ADC9-CE378742E9B9}"
 EndProject

DarkEdif/DarkEdif Template/DarkEdif Template.iOS.vcxproj

@@ -70,6 +70,7 @@
     <ClInclude Include="..\Inc\iOS\MMF2Lib\CRenderToTexture.h" />
     <ClInclude Include="..\Inc\iOS\MMF2Lib\CRenderUtils.h" />
     <ClInclude Include="..\Inc\iOS\MMF2Lib\CRSpr.h" />
+    <ClInclude Include="..\Inc\iOS\MMF2Lib\CRunFrame.h" />
     <ClInclude Include="..\Inc\iOS\MMF2Lib\CShader.h" />
     <ClInclude Include="..\Inc\iOS\MMF2Lib\CTexture.h" />
     <ClInclude Include="..\Inc\iOS\MMFiOSMasterHeader.hpp" />

DarkEdif/DarkEdif Template/DarkEdif Template.iOS.vcxproj.filters

@@ -123,5 +123,8 @@
     <ClInclude Include="..\Inc\iOS\MMF2Lib\CExtension.h">
       <Filter>Global to all extensions</Filter>
     </ClInclude>
+    <ClInclude Include="..\Inc\iOS\MMF2Lib\CRunFrame.h">
+      <Filter>Global to all extensions</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>

DarkEdif/DarkEdif Template/DarkExt.json

@@ -77,6 +77,11 @@
 			{
 				"Type": "FolderEnd"
 			},
+			{
+                "Title": "Props outside folder",
+                "Info": "This blue header is called a group inside the DarkExt.json file.",
+                "Type": "Group"
+            },
 			{
 				"Title": "Static text 1",
 				"Info": "Blank text",
@@ -139,7 +144,7 @@
 		"About": {
 			"Name": "Exemple objet",
 			"Author": "Votre Nom",
-			"Copyright": "Copyright \u00A9 2022 par Votre Nom",
+			"Copyright": "Copyright \u00A9 2026 par Votre Nom",
 			"Comment": "Une ou deux phrases pour décrire votre poste",
 			"Help": "Help/Example.chm",
 			"URL": "http://www.example.com/"
@@ -209,6 +214,11 @@
 			{
 				"Type": "FolderEnd"
 			},
+			{
+                "Title": "Groupe",
+                "Info": "Voir le fichier DarkExt.json.",
+                "Type": "Group"
+            },
 			{
 				"Title": "Texte statique 1",
 				"Info": "Texte vide",

DarkEdif/DarkEdif Template/Edittime.cpp

@@ -19,7 +19,11 @@ int FusionAPI MakeIconEx(mv * mV, cSurface * pIconSf, TCHAR * lpName, ObjInfo *
 {
 #pragma DllExportHint
 	pIconSf->Delete();
+	#ifdef DARKEDIF_MULTIPLE_ICONS
+	pIconSf->Clone(*Edif::SDK->Image);
+	#else
 	pIconSf->Clone(*Edif::SDK->Icon);
+	#endif
 
 	pIconSf->SetTransparentColor(RGB(255, 0, 255));
 	return 0;

DarkEdif/DarkEdif Template/Ext.rc

@@ -154,6 +154,9 @@ END
 
 #if EditorBuild
 IDR_EDIF_ICON	Edif	"Icon.png"
+#ifdef DARKEDIF_MULTIPLE_ICONS
+IDR_EDIF_IMAGE	Edif	"Image.png"
+#endif
 #if !defined(DARKEXT_JSON_FILE_EXTERNAL)
 IDR_EDIF_JSON	Edif	"DarkExt.json"
 #endif

DarkEdif/DarkEdif Template/Resource.h

@@ -2,6 +2,9 @@
 // Microsoft Developer Studio generated include file.
 // Used by Ext.rc
 //
+#ifdef DARKEDIF_MULTIPLE_ICONS
+#define IDR_EDIF_IMAGE					100
+#endif
 #define IDR_EDIF_ICON					101
 #define IDR_EDIF_JSON					102
 

DarkEdif/Inc/Android/MMFAndroidMasterHeader.hpp

@@ -637,35 +637,45 @@ struct CEventProgram {
 	global<jclass> meClass;
 	Edif::Runtime* runtime;
 };
-struct CRunFrame {
-	NO_DEFAULT_CTORS(CRunFrame);
+struct CRunFrameMultiPlat {
+	NO_DEFAULT_CTORS(CRunFrameMultiPlat);
 
 	CEventProgram* get_eventProgram();
+	const TCHAR * get_name();
 
+	CRunFrameMultiPlat(jobject app, Edif::Runtime* runtime);
 protected:
 	friend class Edif::Runtime;
 	friend struct RunHeader;
+	std::string frameName;
+
+	global<jobject> me;
+	global<jclass> meClass;
 	Edif::Runtime* runtime;
-	jobject me;
 };
 
 
 struct CRunAppMultiPlat {
 	NO_DEFAULT_CTORS(CRunAppMultiPlat);
 	int get_nCurrentFrame();
-	CRunFrame* get_Frame();
+	CRunFrameMultiPlat * get_Frame();
 	CRunAppMultiPlat * get_ParentApp();
 	std::size_t GetNumFusionFrames();
+	const TCHAR * get_name();
+	const TCHAR * get_appFileName();
+	const TCHAR * get_editorFileName();
+	const TCHAR * get_targetFileName();
 
 	CRunAppMultiPlat(jobject app, Edif::Runtime * runtime);
 protected:
 	friend class Edif::Runtime;
 	friend struct RunHeader;
 	friend DarkEdif::Surface;
-	std::unique_ptr<CRunFrame> frame;
+	std::unique_ptr<CRunFrameMultiPlat> frame;
 	std::optional<int> nCurrentFrame;
 	std::size_t numTotalFrames = 0; // 0 if unset
 	std::uint16_t currentFrame = 0; // 0 if unset, 1+ if set
+	std::string appName; // Blank if unset
 	std::unique_ptr<CRunAppMultiPlat> parentApp;
 	bool parentAppIsNull = false;
 	global<jobject> me;

DarkEdif/Inc/Mac/MMFMacMasterHeader.hpp

@@ -230,14 +230,18 @@ inline namespace FusionInternals
 	};
 
 	struct CRunFrameMultiPlat {
-
+		const TCHAR * get_name();
 	};
 	struct CRunAppMultiPlat {
 		NO_DEFAULT_CTORS(CRunAppMultiPlat);
 		int get_nCurrentFrame();
 		CRunFrameMultiPlat* get_Frame();
 		CRunAppMultiPlat* get_ParentApp();
 		std::size_t GetNumFusionFrames();
+		const TCHAR * get_name();
+		const TCHAR * get_appFileName();
+		const TCHAR * get_editorFileName();
+		const TCHAR * get_targetFileName();
 	};
 
 	struct RunHeader {

DarkEdif/Inc/Shared/Edif.hpp

@@ -162,6 +162,10 @@ namespace Edif
 #if EditorBuild
 		cSurface * Icon = nullptr;
 		DarkEdif::Surface * ExtIcon = nullptr;
+#ifdef DARKEDIF_MULTIPLE_ICONS
+		cSurface * Image = nullptr;
+		DarkEdif::Surface * ExtImage = nullptr;
+#endif
 		std::unique_ptr<PropData[]> EdittimeProperties;
 
 #ifndef NOPROPS