Update to 1.2.252.0.

M2Team · May 10, 2022 · dd20989 · dd20989
1 parent 9ef98dd
commit dd20989
Show file tree

Hide file tree

Showing 17 changed files with 49 additions and 21 deletions.
diff --git 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
diff --git a/NanaZipConsole/Mile.Project.Properties.h b/NanaZipConsole/Mile.Project.Properties.h
diff --git a/NanaZipCore/Mile.Project.Properties.h b/NanaZipCore/Mile.Project.Properties.h
diff --git a/NanaZipInstaller/Mile.Project.Properties.h b/NanaZipInstaller/Mile.Project.Properties.h
diff --git 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
@@ -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
diff --git a/NanaZipSfxSetup/Mile.Project.Properties.h b/NanaZipSfxSetup/Mile.Project.Properties.h
diff --git a/NanaZipSfxWindows/Mile.Project.Properties.h b/NanaZipSfxWindows/Mile.Project.Properties.h
diff --git a/NanaZipSfxWindows/NanaZipSfxWindowsResources.rc b/NanaZipSfxWindows/NanaZipSfxWindowsResources.rc
diff --git a/NanaZipShellExtension/Mile.Project.Properties.h b/NanaZipShellExtension/Mile.Project.Properties.h
diff --git 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
diff --git 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
@@ -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
@@ -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;