From dd20989c0b5cdd0175346bed252c142587a10d95 Mon Sep 17 00:00:00 2001
From: MouriNaruto <Mouri_Naruto@Outlook.com>
Date: Tue, 10 May 2022 22:05:57 +0800
Subject: [PATCH] Update to 1.2.252.0.

---
 Documents/ReleaseNotes.md                     |  25 ++++++++++++++++
 NanaZip/Mile.Project.Properties.h             | Bin 1966 -> 1968 bytes
 NanaZipConsole/Mile.Project.Properties.h      | Bin 1998 -> 2000 bytes
 NanaZipCore/Mile.Project.Properties.h         | Bin 1942 -> 1944 bytes
 NanaZipInstaller/Mile.Project.Properties.h    | Bin 1972 -> 1974 bytes
 NanaZipPackage/NanaZipPackage.wapproj         |   2 +-
 NanaZipPackage/Package.appxmanifest           |  27 ++++++++----------
 NanaZipSfxConsole/Mile.Project.Properties.h   | Bin 2024 -> 2026 bytes
 NanaZipSfxSetup/Mile.Project.Properties.h     | Bin 2012 -> 2014 bytes
 NanaZipSfxWindows/Mile.Project.Properties.h   | Bin 2024 -> 2026 bytes
 .../NanaZipSfxWindowsResources.rc             | Bin 751432 -> 762036 bytes
 .../Mile.Project.Properties.h                 | Bin 2004 -> 2006 bytes
 .../NanaZipShellExtension.cpp                 |   4 +--
 NanaZipWindows/Mile.Project.Properties.h      | Bin 1998 -> 2000 bytes
 SevenZip/CPP/7zip/UI/FileManager/resource.rc  |   2 +-
 SevenZip/CPP/7zip/UI/GUI/resource.rc          |   2 +-
 SevenZip/CPP/Common/Lang.cpp                  |   8 +++++-
 17 files changed, 49 insertions(+), 21 deletions(-)

diff --git a/Documents/ReleaseNotes.md b/Documents/ReleaseNotes.md
index d961fcdf0..c1c738d00 100644
--- a/Documents/ReleaseNotes.md
+++ b/Documents/ReleaseNotes.md
@@ -3,6 +3,31 @@
 For preview versions, please read 
 [NanaZip Preview Release Notes](ReleaseNotesPreview.md).
 
+**NanaZip 1.2 (1.2.252.0)**
+
+- Fix no ordinal 345 was found in the dynamically attached library issue in 
+  Self Extracting Executables. (Thanks to FadeMind.)
+- Add Per-Monitor DPI-Aware support for all GUI components.
+- Adjust and simplify the compiler options for modernizing.
+- Fix i18n issue for the About dialog. (Thanks to AndromedaMelody.)
+- Update installation tutorial. (Suggested by AndromedaMelody.)
+- Fix cannot start editor issue when only store edition of notepad existed. 
+  (Thanks to AndromedaMelody.)
+- Modernize the i18n implementation via migrating language files from .txt to 
+  .resw. (Contributed by AndromedaMelody. Suggested by Maicol Battistini.)
+- Update ModernWin32MessageBox for solving the infinite loop issue in some 
+  cases. (Thanks to AndromedaMelody.)
+- Tweak icons and provide icons for preview versions. (Designed by Alice 
+  (四月天). Thanks to StarlightMelody.)
+- Fix crash issue when opening archive files. (Thanks to 1human and Maicol 
+  Battistini.)
+- Remove Language page in Options dialog because NanaZip will follow the 
+  language settings from Windows itself.
+- Fix the issue of the i18n implementation of File Type Association. 
+  (Contributed by AndromedaMelody.)
+- Add i18n support for GUI edition of Self Extracting Executable. 
+  (Contributed by AndromedaMelody.)
+
 **NanaZip 1.1 (1.1.194.0)**
 
 - Add assembly implementations from 7-Zip back for improving performance.
diff --git a/NanaZip/Mile.Project.Properties.h b/NanaZip/Mile.Project.Properties.h
index ba7eb2fd6736f54ff234bf81ac2bd8c1c9c4054b..52232dfd14a1462525046100f53eeff725d5a6f4 100644
GIT binary patch
delta 57
zcmZ3-zkz>41v9fLgVE%R%=VLaG0QOPGw4qaWYV6*A|)8gP{5GFkjPNNkjkLIV91~}
Nxu3~+a{`MWGXS`H4eS5_

delta 56
zcmdnMzm9)H1v9e|gX!e^O!kv^G0RMz!DJ;J!r;i@&Y-}c#1Ozx#E{BR#*hgl%Yh;$
Jn{`>5nE|lf4RHVf

diff --git a/NanaZipConsole/Mile.Project.Properties.h b/NanaZipConsole/Mile.Project.Properties.h
index f25ea10a7b01363c799809f77fc6adf7b7f35169..577d026620b4b9c71ed94aad31a0fda9d95830f2 100644
GIT binary patch
delta 57
zcmX@de}R8P1v9fLgVE%R%=VLaG0QOPGw4qaWYV6*A|)8gP{5GFkjPNNkjkLIV91~}
Nxu3~+a{@~qGXTcA4om<5

delta 56
zcmcb>e~y1c1v9e|gX!e^O!kv^G0RMz!DJ;J!r;i@&Y-}c#1Ozx#E{BR#*hgl%Yh;$
Kn{`<hGXns=-3`$I

diff --git a/NanaZipCore/Mile.Project.Properties.h b/NanaZipCore/Mile.Project.Properties.h
index 0eb93c15c5f9bd9a8a9a52f8f868bd898b90c22f..ea3ff9daec8f590ce62ead5e7983407efecfbd62 100644
GIT binary patch
delta 57
zcmbQnKZAcm1v9fLgVE%R%=VLaG0QOPGw4qaWYV6*A|)8gP{5GFkjPNNkjkLIV91~}
Nxu3~+a{`MQGXSm14Ws}7

delta 56
zcmbQiKaGDw1v9e|gX!e^O!kv^G0RMz!DJ;J!r;i@&Y-}c#1Ozx#E{BR#*hgl%Yh;$
Jn{`>TnE|F<4JiNs

diff --git a/NanaZipInstaller/Mile.Project.Properties.h b/NanaZipInstaller/Mile.Project.Properties.h
index dd138a3c7f5cd8bfdbbf6b5190f4194fac3c4862..db244da7549f76bedcf2feaff25cf4c240490875 100644
GIT binary patch
delta 57
zcmdnOzm0!G1v9fLgVE%R%=VLaG0QOPGw4qaWYV6*A|)8gP{5GFkjPNNkjkLIV91~}
Nxu3~+a{@~UGXT3L4gLTC

delta 56
zcmdnSzlDE81v9e|gX!e^O!kv^G0RMz!DJ;J!r;i@&Y-}c#1Ozx#E{BR#*hgl%Yh;$
Jn{`<_nE|tX4TAsx

diff --git a/NanaZipPackage/NanaZipPackage.wapproj b/NanaZipPackage/NanaZipPackage.wapproj
index 31b77affb..9515712f9 100644
--- a/NanaZipPackage/NanaZipPackage.wapproj
+++ b/NanaZipPackage/NanaZipPackage.wapproj
@@ -25,7 +25,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Image Assets -->
-    <Content Include="..\Assets\PreviewPackageAssets\**\*">
+    <Content Include="..\Assets\PackageAssets\**\*">
       <DeploymentContent>true</DeploymentContent>
       <Link>Assets\%(RecursiveDir)%(FileName)%(Extension)</Link>
     </Content>
diff --git a/NanaZipPackage/Package.appxmanifest b/NanaZipPackage/Package.appxmanifest
index cc0927c20..e3609c46e 100644
--- a/NanaZipPackage/Package.appxmanifest
+++ b/NanaZipPackage/Package.appxmanifest
@@ -15,12 +15,12 @@
   IgnorableNamespaces="uap rescap desktop uap2 uap3 com desktop4 desktop5 uap8 virtualization">
 
   <Identity
-    Name="40174MouriNaruto.NanaZipPreview"
+    Name="40174MouriNaruto.NanaZip"
     Publisher="CN=E310A153-74A9-4D81-800B-857A8D58408A"
-    Version="1.2.225.0" />
+    Version="1.2.252.0" />
 
   <Properties>
-    <DisplayName>NanaZip Preview</DisplayName>
+    <DisplayName>NanaZip</DisplayName>
     <PublisherDisplayName>Kenji Mouri</PublisherDisplayName>
     <Logo>Assets\StoreLogo.png</Logo>
     <virtualization:FileSystemWriteVirtualization>
@@ -47,7 +47,7 @@
       EntryPoint="Windows.FullTrustApplication">
       <uap:VisualElements 
         AppListEntry="none"
-        DisplayName="NanaZip Preview"
+        DisplayName="NanaZip"
         Description="NanaZip"
         BackgroundColor="transparent"
         Square150x150Logo="Assets\Square150x150Logo.png"
@@ -70,7 +70,7 @@
       EntryPoint="Windows.FullTrustApplication">
       <uap:VisualElements 
         AppListEntry="none"
-        DisplayName="NanaZip Preview"
+        DisplayName="NanaZip"
         Description="NanaZip"
         BackgroundColor="transparent"
         Square150x150Logo="Assets\Square150x150Logo.png"
@@ -92,7 +92,7 @@
       Executable="NanaZip.exe"
       EntryPoint="Windows.FullTrustApplication">
       <uap:VisualElements
-        DisplayName="NanaZip Preview"
+        DisplayName="NanaZip"
         Description="NanaZip"
         BackgroundColor="transparent"
         Square150x150Logo="Assets\Square150x150Logo.png"
@@ -120,7 +120,7 @@
           </uap3:AppExecutionAlias>
         </uap3:Extension>
         <uap:Extension Category="windows.fileTypeAssociation">
-          <uap:FileTypeAssociation Name="fileassociations">
+          <uap3:FileTypeAssociation Name="fileassociations" Parameters="&quot;%1&quot;">
             <uap:Logo>Assets\ArchiveFile.png</uap:Logo>
             <uap:SupportedFileTypes>
               <uap:FileType>.001</uap:FileType>
@@ -167,25 +167,22 @@
               <uap:FileType>.zip</uap:FileType>
               <uap:FileType>.zst</uap:FileType>
             </uap:SupportedFileTypes>
-            <uap2:SupportedVerbs>
-              <uap3:Verb Id="open" Parameters="&quot;%1&quot;">ms-resource:///Legacy/Resource540</uap3:Verb>
-            </uap2:SupportedVerbs>
-          </uap:FileTypeAssociation>
-        </uap:Extension>
+          </uap3:FileTypeAssociation>    
+      </uap:Extension>
         <desktop4:Extension Category="windows.fileExplorerContextMenus">
           <desktop4:FileExplorerContextMenus>
             <desktop5:ItemType Type="Directory">
-              <desktop5:Verb Id="NanaZipShellExtension" Clsid="469D94E9-6AF4-4395-B396-99B1308F8CE5" />
+              <desktop5:Verb Id="NanaZipShellExtension" Clsid="CAE3F1D4-7765-4D98-A060-52CD14D56EAB" />
             </desktop5:ItemType>
             <desktop5:ItemType Type="*">
-              <desktop5:Verb Id="NanaZipShellExtension" Clsid="469D94E9-6AF4-4395-B396-99B1308F8CE5" />
+              <desktop5:Verb Id="NanaZipShellExtension" Clsid="CAE3F1D4-7765-4D98-A060-52CD14D56EAB" />
             </desktop5:ItemType>
           </desktop4:FileExplorerContextMenus>
         </desktop4:Extension>
         <com:Extension Category="windows.comServer">
           <com:ComServer>
             <com:SurrogateServer DisplayName="NanaZip Shell Extension">
-              <com:Class Id="469D94E9-6AF4-4395-B396-99B1308F8CE5" Path="NanaZipShellExtension.dll" ThreadingModel="STA"/>
+              <com:Class Id="CAE3F1D4-7765-4D98-A060-52CD14D56EAB" Path="NanaZipShellExtension.dll" ThreadingModel="STA"/>
             </com:SurrogateServer>
           </com:ComServer>
         </com:Extension>
diff --git a/NanaZipSfxConsole/Mile.Project.Properties.h b/NanaZipSfxConsole/Mile.Project.Properties.h
index de0d441813e97d6d9afb3f59a534cd5fb6bcb832..beeef5b359dafd7c71e8a0b41ec426bf22c9b6ce 100644
GIT binary patch
delta 57
zcmaFC|B8P@1v9fLgVE%R%=VLaG0QOPGw4qaWYV6*A|)8gP{5GFkjPNNkjkLIV91~}
Nxu3~+a{@~TGXT;~4w?V}

delta 56
zcmaFG|AK!*1v9e|gX!e^O!kv^G0RMz!DJ;J!r;i@&Y-}c#1Ozx#E{BR#*hgl%Yh;$
Kn{`?CG6Mk0Jq{lL

diff --git a/NanaZipSfxSetup/Mile.Project.Properties.h b/NanaZipSfxSetup/Mile.Project.Properties.h
index a5778cc2c7e55d300e29345692f8b9cd437d7f18..9f0198c41174da08d4161adc161bcd964e57a345 100644
GIT binary patch
delta 57
zcmcb^e~*7d1v9fLgVE%R%=VLaG0QOPGw4qaWYV6*A|)8gP{5GFkjPNNkjkLIV91~}
Nxu3~+a{@~ZGXTu?4t4+l

delta 60
zcmcb|e}{iV1v9e|gX!czR{hC*%mR~lG0RMz!DJ;J!r;i@&Y-}c#1Ozx#E{BR#*hgl
O%Yh;$n{`<>G6MkH?hX_H

diff --git a/NanaZipSfxWindows/Mile.Project.Properties.h b/NanaZipSfxWindows/Mile.Project.Properties.h
index ac78cf3b47ad159f69fe26f28d877cdd523aa4be..a96912c71f3405b7b7b23da2063cf723f5862cd2 100644
GIT binary patch
delta 57
zcmaFC|B8P@1v9fLgVE%R%=VLaG0QOPGw4qaWYV6*A|)8gP{5GFkjPNNkjkLIV91~}
Nxu3~+a{@~TGXT;~4w?V}

delta 56
zcmaFG|AK!*1v9e|gX!e^O!kv^G0RMz!DJ;J!r;i@&Y-}c#1Ozx#E{BR#*hgl%Yh;$
Kn{`?CG6Mk0Jq{lL

diff --git a/NanaZipSfxWindows/NanaZipSfxWindowsResources.rc b/NanaZipSfxWindows/NanaZipSfxWindowsResources.rc
index d0cb7fd3014a0abbecfb047f37109a55583f0cc2..04266111098108767826bff52fc095904be0cd5e 100644
GIT binary patch
delta 2444
zcmbVOU2IfE6rQ<vcJ6Llq)V;aQlS?Kt$~y-5~C%-v_LhWXep#%Mcie(h3(&NyIV`C
zKT9-`L?6%%91WP1S7Wds0RvIn5Vgh!L4Cm(0}q%$3>G!`B>0`VUBI@)#BAp7-kCY)
z`_6ZM+VQJ3$H$gtUzf+NW0iG1VyVcOk1J|~E8?ODPyY3sXvFUwqDv%1TI|HmgLm%G
zhA-tp`hCB3h>E|GUF0sXiYU{qyJ-7qIcI-XjyqLiHLR0#ZonVPHTiYUZEU8<d(J)d
z&R$<f@L7PR;Wi_Zcvgu98XNY9sOfXPg|Y#u0^UJ`s4@q+iOXB$Dmr*V4bkXc?U!*n
zd_q-HxK>8!=Wk>t_mFQfjUKe>bH#C07l+S5c<#q{8qYqU-QF1xQ3RL4jt3Gm?=jrz
zqOng@CuOfnH9ICcvD1cI8zI7O8hcB3($o8;rhV0x1_Ak_T0)U8e5)vR)30gWDb<nK
z1g#h<4fr(N$3-{ZJb)e$V$djbfih;7Z!itdifQ(OZo&{|=qT(t43BP7v}3QEz0&%K
zoJXl|WiyMfOY+WR#x%;%)SuC>(b=_*+Smq19#m4KVBTlm6L8&QvJjnADDQ<eOW~8m
zKHD*scJt<uMN!b&%hr&=o}IVyeD~1vpQ>^@iYt{@tU+^S{gf+k$F;^}2LY3ZU>Y%K
zkq|H9+!fVgNQA}9_+E;)%{XPkJLuYZRYJS$KnG=Olv+3w+bOPSXk7OiDz($8<mGP%
zaF+oFc>o%44x*Yyezlrw^2xn@kDJ2<Db|!*XR2LpqN>@3868!2Nx2LE|Gqzf9iUV7
zm>Q(wR@+anT(vaaTNs#2^(&CuY+*q85}XT?$B^*iu(i#J!3KGti;vjdG<rlTa?dFL
z@<Btuy`#3g1m8|wT<n4=C!bv)t<-%+4bZ4R;GgXRgo|V+0zuVL^t4<;O?CDf(~h%d
zI^61is<huYn!&h&QunK^RDVSJXEHt;lxr5G(PFOH4kli4an6$__kCgjJQLL0$Smf9
z#ny<PQ$DE|E-@~na!GVUoogj>C5?V0!xf#-G=(z`mi5ly$)gN1&<mDbOHCtk9o_ie
z(Xxk@xpoaTbx&^0Goi!suGSTFVO(t^_qwG^UGX?vdj-=BqZEEeY0pbCgmb%vQpe<d
zPkQ2ap@X>VyyoXNk79=t76X57?x<nO)#1g&(<qHkzV`q`!4I7frQU?=?0j22(GNUs
z%>1C^S<NFWKh_w=Z~}<8>rI&{!cgzm>S1zI^0CsqytkShzLIqFWBDo#x7i&C%U9sI
zf`c{EB~AYYr}ZB#yJ=Mfc}{UXCG+EhehUWn6tcE`CU1SY1*IYS>~F1u%+G6%?dGVH
zHvE8c50~oJ!geDL>)iIA29fi=O%yq#^`bjqjBjqwX)}jMRcO}C!=;QOf2n3_dS4eT
z<m?y%|J&7kSw{OV$rXX=Q>=`JuLscT7-e^nGH^@E+%jJ|?OW|UK*OixqsWEPl8z4g
zE2zGwur+W?EORsUlQxda$ZfDv24WtkpXb%&2$+<G3kiQ-=;DB^J2|mf70KKUt$k)#
znh|*51GR~=S7Z@D8##d<XoLfscxGx~i>UZ<r{yGKs+S(@v?2juJ81CC>8A}Pb|_c8
zvgLqdYa21~h+je@+HT3emC)|<s)L3*9p&Si8sIBK6n5~ZI*Neut%7!^!+-i~Db=d#
zY4{II2fg0PPl3q`$pe=(7jqh^-AxS>(i^3|I5@RYbkrFHavRCz_<!I+*w&Q&MHkV?
zIi&(F!e`nEdOIs?D16abL-pS&O-+{z=D#sgX<^w|3d@J3u^cQvRsgHu<Va=VyPN+3
DI3;g>

delta 55
zcmdmTQ18S$-G&y%Eliu_+vPl&fS4JGS%8=oh}nRc9f&!Am=lP(w##{PPYVYC4($-V

diff --git a/NanaZipShellExtension/Mile.Project.Properties.h b/NanaZipShellExtension/Mile.Project.Properties.h
index 48ee38cbe708001defa2b9352e0db1457b78c9ed..bed587de3518b20b1615a465728586990d1fe03f 100644
GIT binary patch
delta 57
zcmcb@e~o`b1v9fLgVE%R%=VLaG0QOPGw4qaWYV6*A|)8gP{5GFkjPNNkjkLIV91~}
Nxu3~+a{@~VGXTkE4qgBN

delta 60
zcmcb{e}#WT1v9e|gX!drtooDrm<1;9VwRaagUL!dgu#))ok4*?i6MZYh#{4sj3E<9
OmIFmhHtVviWCj50E)HA(

diff --git a/NanaZipShellExtension/NanaZipShellExtension.cpp b/NanaZipShellExtension/NanaZipShellExtension.cpp
index c7264061d..e0408373a 100644
--- a/NanaZipShellExtension/NanaZipShellExtension.cpp
+++ b/NanaZipShellExtension/NanaZipShellExtension.cpp
@@ -909,7 +909,7 @@ namespace NanaZip::ShellExtension
                 return E_NOTIMPL;
             }
 
-            return ::SHStrDupW(L"NanaZip Preview", ppszName);
+            return ::SHStrDupW(L"NanaZip", ppszName);
         }
 
         HRESULT STDMETHODCALLTYPE GetIcon(
@@ -1035,7 +1035,7 @@ namespace NanaZip::ShellExtension
 #pragma endregion
     };
 
-    struct DECLSPEC_UUID("469D94E9-6AF4-4395-B396-99B1308F8CE5")
+    struct DECLSPEC_UUID("CAE3F1D4-7765-4D98-A060-52CD14D56EAB")
         ClassFactory : public winrt::implements<
         ClassFactory, IClassFactory>
     {
diff --git a/NanaZipWindows/Mile.Project.Properties.h b/NanaZipWindows/Mile.Project.Properties.h
index eaecd86937b8ba405069029b673036fac19999ba..d9d9f7322cb583da278c123619c5571b3a3fd5cd 100644
GIT binary patch
delta 57
zcmX@de}R8P1v9fLgVE%R%=VLaG0QOPGw4qaWYV6*A|)8gP{5GFkjPNNkjkLIV91~}
Nxu3~+a{@~qGXTcA4om<5

delta 56
zcmcb>e~y1c1v9e|gX!e^O!kv^G0RMz!DJ;J!r;i@&Y-}c#1Ozx#E{BR#*hgl%Yh;$
Kn{`<hGXns=-3`$I

diff --git a/SevenZip/CPP/7zip/UI/FileManager/resource.rc b/SevenZip/CPP/7zip/UI/FileManager/resource.rc
index 8c52ab8f8..d2f4abb15 100644
--- a/SevenZip/CPP/7zip/UI/FileManager/resource.rc
+++ b/SevenZip/CPP/7zip/UI/FileManager/resource.rc
@@ -138,7 +138,7 @@ BEGIN
 END
 
 
-IDI_ICON  ICON  "../../../../../Assets/NanaZipPreview.ico"
+IDI_ICON  ICON  "../../../../../Assets/NanaZip.ico"
 
 IDB_ADD        BITMAP  "../../../../../NanaZip/Assets/Toolbar/Add_32x32.bmp"
 IDB_EXTRACT    BITMAP  "../../../../../NanaZip/Assets/Toolbar/Extract_32x32.bmp"
diff --git a/SevenZip/CPP/7zip/UI/GUI/resource.rc b/SevenZip/CPP/7zip/UI/GUI/resource.rc
index 75203f22e..3dd8afa2a 100644
--- a/SevenZip/CPP/7zip/UI/GUI/resource.rc
+++ b/SevenZip/CPP/7zip/UI/GUI/resource.rc
@@ -3,7 +3,7 @@
 
 #include "../FileManager/resourceGui.rc"
 
-IDI_ICON ICON "../../../../../Assets/NanaZipPreview.ico"
+IDI_ICON ICON "../../../../../Assets/NanaZip.ico"
 
 #include "../FileManager/PropertyName.rc"
 #include "../FileManager/OverwriteDialog.rc"
diff --git a/SevenZip/CPP/Common/Lang.cpp b/SevenZip/CPP/Common/Lang.cpp
index 7b82e8f40..782955a7c 100644
--- a/SevenZip/CPP/Common/Lang.cpp
+++ b/SevenZip/CPP/Common/Lang.cpp
@@ -48,7 +48,13 @@ const wchar_t *CLang::Get(UInt32 id) const throw()
     if (Iterator == g_LanguageMap.end())
     {
 #ifdef _SFX
-        return g_LanguageMap.emplace(id, NWindows::MyLoadString(id)).first->second;
+        UString Content = NWindows::MyLoadString(id);
+        if (Content.IsEmpty())
+        {
+            return nullptr;
+        }
+
+        return g_LanguageMap.emplace(id, Content).first->second;
 #else
         using winrt::Windows::ApplicationModel::Resources::Core::ResourceManager;
         using winrt::Windows::ApplicationModel::Resources::Core::ResourceMap;