Fix bugs.

dlltest/main.cpp

@@ -191,12 +191,13 @@ int main (int argc, char *argv [])
 {
 	setlocale (LC_ALL, "");
 	std::wcout.imbue (std::locale ("", LC_CTYPE));
+	CoInitializeEx (nullptr, COINIT_MULTITHREADED);
 	std::wcout << L"Please enter the file path: " << std::endl;
 	std::wcout << L"\\> ";
 	std::wstring pkgPathStr = L"E:\\Profiles\\Bruce\\Desktop\\Discourse.appx";
-	pkgPathStr = L"F:\\BaiduNetdiskDownload\\Collection4\\Microsoft.BingFinance_2015.709.2014.2069_neutral_~_8wekyb3d8bbwe\\FinanceApp_3.0.4.336_x86.appx";
+	//pkgPathStr = L"F:\\BaiduNetdiskDownload\\Collection4\\Microsoft.BingFinance_2015.709.2014.2069_neutral_~_8wekyb3d8bbwe\\FinanceApp_3.0.4.336_x86.appx";
 	//pkgPathStr = L"F:\\BaiduNetdiskDownload\\Collection4\\Microsoft.BingFinance_2015.709.2014.2069_neutral_~_8wekyb3d8bbwe.appxbundle";
-	//pkgPathStr = L"";
+	pkgPathStr = L"E:\\Profiles\\Bruce\\Desktop\\н¨Îļþ¼Ð\\Microsoft.MSIXPackagingTool_2023.1212.538.0_neutral_~_8wekyb3d8bbwe.Msixbundle";
 	if (pkgPathStr.empty ()) std::getline (std::wcin, pkgPathStr);
 	pkgPathStr.erase (
 		std::remove (pkgPathStr.begin (), pkgPathStr.end (), L'\"'),

pkgread/pkgread.h

@@ -368,7 +368,14 @@ class package_reader
 	{
 	#ifdef _PRI_READER_CLI_HEADER_
 		pribundlereader.destroy ();
-		for (auto &it : prifilestreams) if (it != nullptr) DestroyAppxFileStream (it);
+		for (auto &it : prifilestreams)
+		{
+			if (it != nullptr)
+			{
+				DestroyAppxFileStream (it);
+				it = nullptr;
+			}
+		}
 		prifilestreams.clear ();
 		switch (this->package_type ())
 		{
@@ -383,6 +390,7 @@ class package_reader
 			case PKGTYPE_BUNDLE: {
 				HANDLE hls = nullptr, hss = nullptr;
 				destruct rel1 ([&hls, &hss] () {
+					if (hls == hss) hss = nullptr;
 					if (hls) DestroyAppxFileStream (hls);
 					if (hss) DestroyAppxFileStream (hss);
 				});
@@ -423,6 +431,9 @@ class package_reader
 				}
 			} break;
 		}
+		std::sort (prifilestreams.begin (), prifilestreams.end ());
+		auto last = std::unique (prifilestreams.begin (), prifilestreams.end ());
+		prifilestreams.erase (last, prifilestreams.end ());
 		try
 		{
 			std::vector <std::wstring> resnames;
@@ -598,6 +609,7 @@ class package_reader
 				case PKGTYPE_BUNDLE: {
 					HANDLE pkg = nullptr, pic = nullptr;
 					destruct relp ([&pic, &pkg] () {
+						if (pic == pkg) pkg = nullptr; // 虽然来说这个代码永远无法达到，但是保险起见
 						if (pic) DestroyAppxFileStream (pic);
 						if (pkg) DestroyAppxFileStream (pkg);
 						pkg = nullptr;
@@ -616,12 +628,14 @@ class package_reader
 						if (lpstr) free (lpstr);
 						HANDLE pkg1 = nullptr, pic1 = nullptr;
 						destruct relp1 ([&pic1, &pkg1] () {
+							if (pic1 == pkg1) pkg1 = nullptr; // 虽然来说这个代码永远无法达到，但是保险起见
 							if (pic1) DestroyAppxFileStream (pic1);
 							if (pkg1) DestroyAppxFileStream (pkg1);
 							pkg1 = nullptr;
 							pic1 = nullptr;
 						});
 						pkg1 = GetAppxBundleApplicationPackageFile (hReader);
+						if (pkg1 == pkg) pkg = nullptr;
 						if (pkg1)
 						{
 							pic1 = GetFileFromPayloadPackage (pkg1, logo ().c_str ());
@@ -782,6 +796,7 @@ class package_reader
 					case PKGTYPE_BUNDLE: {
 						HANDLE pkg = nullptr, pic = nullptr;
 						destruct relp ([&pic, &pkg] () {
+							if (pic == pkg) pkg = nullptr; // 虽然来说这个代码永远无法达到，但是保险起见
 							if (pic) DestroyAppxFileStream (pic);
 							if (pkg) DestroyAppxFileStream (pkg);
 							pkg = nullptr;

shared/html/settings/appinstaller.html

@@ -74,7 +74,7 @@
                     </ul>
                 </nav>
             </aside>
-            <iframe class="main right"></iframe>
+            <iframe class="main right" defer loading="lazy" async></iframe>
         </div>
     </div>
 </body>

shared/html/settings/appinstaller/theme.html

@@ -329,7 +329,15 @@
                                 iframe.contentWindow.Theme.currentColor = color;
                                 iframe.contentWindow.Theme.currentTheme = id;
                             };*/
-                            iframe.src = previewHtml + "?color=" + color + "&id=" + id;
+                            setTimeout(function(iframenode, iframesrc) {
+                                iframenode.src = iframesrc;
+                            }, 0, iframe, previewHtml + "?color=" + color + "&id=" + id);
+                            // iframe.src = previewHtml + "?color=" + color + "&id=" + id;
+                            try {
+                                iframe.defer = true;
+                                iframe.loading = "lazy";
+                                iframe.async = true;
+                            } catch (e) {}
                             item.appendChild(iframe);
                             var colorstr = "light";
                             if (color === Theme.ColorType.dark) colorstr = "dark";
@@ -467,7 +475,7 @@
                     <br>
                     <h3 data-res-fromfile="publicRes (174)"></h3>
                     <label data-res-fromfile="publicRes (175)"></label><br>
-                    <iframe src="../../preview.html" id="theme-custom-preview"></iframe>
+                    <iframe src="../../preview.html" id="theme-custom-preview" defer loading="lazy" async></iframe>
                     <br><br>
                     <button id="jump-editpage" data-res-fromfile="publicRes (176)"></button>
                     <script>

shared/html/settings/settings.html

@@ -46,7 +46,7 @@
                     </ul>
                 </nav>
             </aside>
-            <iframe class="main right"></iframe>
+            <iframe class="main right" defer loading="lazy" async></iframe>
         </div>
     </div>
 </body>