Update download link for Runtime Libraries

Added links to download runtime libraries and dependencies for Metro apps.

Manager/ShortcutCreateForm.Designer.cs

@@ -115,10 +115,10 @@
 			this.label1.AutoSize = true;
 			this.tableLayoutPanel1.SetColumnSpan(this.label1, 5);
 			this.label1.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.label1.Font = new System.Drawing.Font("微软雅黑 Light", 20F);
+			this.label1.Font = new System.Drawing.Font("Segoe UI", 19.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
 			this.label1.Location = new System.Drawing.Point(27, 24);
 			this.label1.Name = "label1";
-			this.label1.Size = new System.Drawing.Size(727, 45);
+			this.label1.Size = new System.Drawing.Size(727, 46);
 			this.label1.TabIndex = 0;
 			this.label1.Text = "Create Desktop Shortcut";
 			// 
@@ -127,7 +127,7 @@
 			this.label2.AutoSize = true;
 			this.tableLayoutPanel1.SetColumnSpan(this.label2, 5);
 			this.label2.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.label2.Location = new System.Drawing.Point(27, 79);
+			this.label2.Location = new System.Drawing.Point(27, 80);
 			this.label2.Name = "label2";
 			this.label2.Size = new System.Drawing.Size(727, 60);
 			this.label2.TabIndex = 1;
@@ -147,7 +147,7 @@
 			this.tableLayoutPanel2.Controls.Add(this.label7, 0, 8);
 			this.tableLayoutPanel2.Controls.Add(this.customIconDisplay, 0, 9);
 			this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.tableLayoutPanel2.Location = new System.Drawing.Point(27, 152);
+			this.tableLayoutPanel2.Location = new System.Drawing.Point(27, 153);
 			this.tableLayoutPanel2.Name = "tableLayoutPanel2";
 			this.tableLayoutPanel2.RowCount = 10;
 			this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle());
@@ -160,7 +160,7 @@
 			this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 39F));
 			this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 18F));
 			this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 13F));
-			this.tableLayoutPanel2.Size = new System.Drawing.Size(235, 324);
+			this.tableLayoutPanel2.Size = new System.Drawing.Size(235, 323);
 			this.tableLayoutPanel2.TabIndex = 2;
 			// 
 			// label3
@@ -251,7 +251,7 @@
 			this.customIconDisplay.Dock = System.Windows.Forms.DockStyle.Fill;
 			this.customIconDisplay.Location = new System.Drawing.Point(3, 230);
 			this.customIconDisplay.Name = "customIconDisplay";
-			this.customIconDisplay.Size = new System.Drawing.Size(229, 91);
+			this.customIconDisplay.Size = new System.Drawing.Size(229, 90);
 			this.customIconDisplay.TabIndex = 7;
 			this.customIconDisplay.TabStop = false;
 			// 
@@ -273,7 +273,7 @@
 			this.tableLayoutPanel3.Controls.Add(this.label12, 0, 9);
 			this.tableLayoutPanel3.Controls.Add(this.shortcutNameInput, 0, 10);
 			this.tableLayoutPanel3.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.tableLayoutPanel3.Location = new System.Drawing.Point(273, 152);
+			this.tableLayoutPanel3.Location = new System.Drawing.Point(273, 153);
 			this.tableLayoutPanel3.Name = "tableLayoutPanel3";
 			this.tableLayoutPanel3.RowCount = 11;
 			this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle());
@@ -287,7 +287,7 @@
 			this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 32F));
 			this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle());
 			this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 18F));
-			this.tableLayoutPanel3.Size = new System.Drawing.Size(235, 324);
+			this.tableLayoutPanel3.Size = new System.Drawing.Size(235, 323);
 			this.tableLayoutPanel3.TabIndex = 3;
 			// 
 			// label5
@@ -476,14 +476,14 @@
 			this.tableLayoutPanel4.Controls.Add(this.imageSizeList, 0, 1);
 			this.tableLayoutPanel4.Controls.Add(this.imagesPreview, 0, 3);
 			this.tableLayoutPanel4.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.tableLayoutPanel4.Location = new System.Drawing.Point(519, 152);
+			this.tableLayoutPanel4.Location = new System.Drawing.Point(519, 153);
 			this.tableLayoutPanel4.Name = "tableLayoutPanel4";
 			this.tableLayoutPanel4.RowCount = 4;
 			this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle());
 			this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
 			this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle());
 			this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
-			this.tableLayoutPanel4.Size = new System.Drawing.Size(235, 324);
+			this.tableLayoutPanel4.Size = new System.Drawing.Size(235, 323);
 			this.tableLayoutPanel4.TabIndex = 4;
 			// 
 			// label8
@@ -500,7 +500,7 @@
 			// 
 			this.label9.AutoSize = true;
 			this.label9.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.label9.Location = new System.Drawing.Point(3, 162);
+			this.label9.Location = new System.Drawing.Point(3, 161);
 			this.label9.Name = "label9";
 			this.label9.Size = new System.Drawing.Size(229, 20);
 			this.label9.TabIndex = 1;
@@ -516,7 +516,7 @@
 			this.imageSizeList.Location = new System.Drawing.Point(3, 23);
 			this.imageSizeList.Name = "imageSizeList";
 			this.imageSizeList.RowTemplate.Height = 27;
-			this.imageSizeList.Size = new System.Drawing.Size(229, 136);
+			this.imageSizeList.Size = new System.Drawing.Size(229, 135);
 			this.imageSizeList.TabIndex = 2;
 			this.imageSizeList.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.imageSizeList_CellDoubleClick);
 			// 
@@ -536,7 +536,7 @@
 			this.imagesPreview.AutoScroll = true;
 			this.imagesPreview.Dock = System.Windows.Forms.DockStyle.Fill;
 			this.imagesPreview.FlowDirection = System.Windows.Forms.FlowDirection.TopDown;
-			this.imagesPreview.Location = new System.Drawing.Point(3, 185);
+			this.imagesPreview.Location = new System.Drawing.Point(3, 184);
 			this.imagesPreview.Name = "imagesPreview";
 			this.imagesPreview.Size = new System.Drawing.Size(229, 136);
 			this.imagesPreview.TabIndex = 3;

PriFileFormat/ComStreamWrapper.cs

@@ -142,6 +142,11 @@ namespace PriFileFormat
 				comStream.SetSize (value);
 			}
 		}
+		public override void Close ()
+		{
+			comStream = null;
+			base.Close ();
+		}
 		~ComStreamWrapper () { comStream = null;}
 	}
 }

PriFileFormat/HierarchicalSchemaSection.cs

@@ -174,12 +174,15 @@ namespace PriFileFormat
 		}
 		~HierarchicalSchemaSection ()
 		{
-			return;
-			Version = null;
-			foreach (var item in Items) { item.Parent = null; }
-			foreach (var scope in Scopes) { scope.Parent = null; }
-			Scopes = null;
-			Items = null;
+			try
+			{
+				Version = null;
+				foreach (var item in Items) { item.Parent = null; }
+				foreach (var scope in Scopes) { scope.Parent = null; }
+				Scopes = null;
+				Items = null;
+			}
+			catch { }
 		}
 		// Checksum computation is buggy for some files
 

PriFileFormat/PriFile.csproj

@@ -48,7 +48,6 @@
     <Compile Include="ByteSpan.cs" />
     <Compile Include="ComStreamWrapper.cs" />
     <Compile Include="DataItemSection.cs" />
-    <Compile Include="DataTree.cs" />
     <Compile Include="DecisionInfoSection.cs" />
     <Compile Include="HierarchicalSchemaSection.cs" />
     <Compile Include="PriDescriptorSection.cs" />

PriFileFormat/app.config

@@ -1,3 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6"/></startup></configuration>
+	<startup>
+		<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6"/>
+	</startup>
+</configuration>

README.md

@@ -4,7 +4,7 @@
 <h2>Required runtime libraries</h2>
 <ul>
   <li>Microsoft .NET Framework 4.5 (may be pre-installed on Windows 8.x and later)</li>
-  <li>Microsoft .NET Framework 4.6</li>
+  <li>Microsoft .NET Framework 4.6.2</li>
   <li>Microsoft Visual C++ 2013 Redistributable (x86)</li>
   <li>Microsoft Visual C++ 2015 Redistributable (x86)</li>
 </ul>
@@ -12,6 +12,8 @@
 <p>Download the latest release from the Releases section.</p>
 <a href="https://github.com/modernw/App-Installer-For-Windows-8.x-Reset/releases" target="_blank"><img src="https://img.shields.io/github/v/release/modernw/App-Installer-For-Windows-8.x-Reset"></a>
 <p>Note: There is no official release yet, but the test version still does not have the Pre-released label; this is for testing upgrade functionality. Once the official release is complete, previous versions will be marked as Pre-released.</p>
+<a href="https://github.com/modernw/App-Installer-For-Windows-8.x-Reset/releases/tag/0.0.0.0" target="blank">Download Runtime Libraries</a><br>
+<a href="https://github.com/modernw/App-Installer-For-Windows-8.x-Reset/blob/master/Tools/Dependencies/depsinstaller.zip" target="blank">Download Dependencies for Metro Apps</a>
 <h2>Attention</h2>
 <ul>
   <li><del>This program is an x86 program, not an ARM application, not cross-platform, and cannot be used on Windows RT.</del></li>

priformatcli/priformatcli - 副本.vcxproj

@@ -0,0 +1,205 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|ARM">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM">
+      <Configuration>Release</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{33D91B58-1981-4A3C-B4D1-86EE406CDE12}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>priformatcli</RootNamespace>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+    <CLRSupport>true</CLRSupport>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+    <CLRSupport>true</CLRSupport>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+    <CLRSupport>true</CLRSupport>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+    <CLRSupport>true</CLRSupport>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;PRIFORMATCLI_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;PRIFORMATCLI_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalLibraryDirectories>
+      </AdditionalLibraryDirectories>
+      <AdditionalDependencies>shlwapi.lib;version.lib;dwmapi.lib;winhttp.lib;Psapi.lib;advapi32.lib;gdi32.lib;comdlg32.lib;shell32.lib;ole32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PRIFORMATCLI_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PRIFORMATCLI_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalLibraryDirectories>
+      </AdditionalLibraryDirectories>
+      <AdditionalDependencies>shlwapi.lib;version.lib;dwmapi.lib;winhttp.lib;Psapi.lib;advapi32.lib;gdi32.lib;comdlg32.lib;shell32.lib;ole32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <Text Include="ReadMe.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="localeex.h" />
+    <ClInclude Include="mpstr.h" />
+    <ClInclude Include="nstring.h" />
+    <ClInclude Include="prifile.h" />
+    <ClInclude Include="priformatcli.h" />
+    <ClInclude Include="resource.h" />
+    <ClInclude Include="stdafx.h" />
+    <ClInclude Include="strcmp.h" />
+    <ClInclude Include="syncutil.h" />
+    <ClInclude Include="targetver.h" />
+    <ClInclude Include="themeinfo.h" />
+    <ClInclude Include="typestrans.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="dllmain.cpp">
+      <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsManaged>
+      <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</CompileAsManaged>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+      </PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
+      </PrecompiledHeader>
+      <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsManaged>
+      <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</CompileAsManaged>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+      </PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
+      </PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="priformatcli.cpp" />
+    <ClCompile Include="stdafx.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="priformatcli.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\PriFileFormat\PriFile.csproj">
+      <Project>{ef4012d4-ef08-499c-b803-177739350b2d}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>

priformatcli/priformatcli.h

@@ -224,7 +224,7 @@ typedef class prifile
 	{
 		LPWSTR lpstr = nullptr;
 		reltask release ([&lpstr] () {
-			if (lpstr) free (lpstr);
+			if (lpstr) PriFormatFreeString (lpstr);
 			lpstr = nullptr;
 		});
 		lpstr = GetPriResource (m_hPriFile, resname.c_str ());

priformatcli/priformatcli.vcxproj

@@ -127,6 +127,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PRIFORMATCLI_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
+      <WholeProgramOptimization>true</WholeProgramOptimization>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>

shared/html/install.html

@@ -264,7 +264,7 @@
                     <span class="support" data-res-byname="IDS_PREINSTALL_SUPPOS"></span>
                     <span class="not-support" data-res-byname="IDS_PREINSTALL_NOSUPPOS"></span>
                 </p>
-                <br id="newline-divide" />
+                <br />
                 <p class="pkgfunctions-label" data-res-byname="IDS_FUNCTIONNAME"></p>
                 <div class="functions">
                     <ul>
@@ -394,27 +394,6 @@
                 <p data-res-byname="IDS_FAILED_REASONNAME"></p>
                 <textarea class="win-textarea" readonly></textarea>
             </div>
-            <script>
-                (function(global) {
-                    var pageContainerPage = document.getElementById("page-container").querySelector(".page");
-                    var pkgversion = pageContainerPage.querySelector(".pkgversion");
-                    var reason = document.querySelector(".reason.installfailed");
-                    var reasonTextArea = reason.querySelector("textarea");
-                    var reasonLabel = reason.querySelector("p");
-                    var eventutils = Windows.UI.Event.Util;
-                    var eventmonitor = Windows.UI.Event.Monitor;
-
-                    function resizeAndPositionEvent(e) {
-                        reason.style.height = "";
-                        var controlsContainer = pageContainerPage.querySelector(".controls");
-                        var maxHeight = pageContainerPage.getBoundingClientRect().height - pkgversion.getBoundingClientRect().top - pkgversion.getBoundingClientRect().height * 2 - controlsContainer.getBoundingClientRect().height;
-                        var suitHeight = reasonTextArea.offsetTop + reasonTextArea.scrollHeight;
-                        reason.style.height = parseInt(Math.min(maxHeight, suitHeight)) + "px";
-                    }
-                    eventmonitor.observe(pkgversion, "position", resizeAndPositionEvent);
-                    eventmonitor.observe(pageContainerPage, "resize", resizeAndPositionEvent);
-                })(this);
-            </script>
             <div class="controls">
                 <div class="checkbox">
                     <input type="checkbox" id="preinst-enablelaunch" class="win-checkbox" style="margin-left: 0;">

shared/html/libs/msgbox/contentdlg.css

@@ -127,4 +127,11 @@
 .win-ui-dark .win-contentdialog .win-contentdialog-dialog,
 .win-contentdialog.win-ui-dark .win-contentdialog-dialog {
     background-color: rgb(31, 0, 104);
+}
+
+.win-ui-dark .win-contentdialog .win-contentdialog-dialog button[type=submit],
+.win-contentdialog.win-ui-dark .win-contentdialog-dialog button[type=submit],
+.win-ui-dark .win-contentdialog .win-contentdialog-dialog input[type=submit],
+.win-contentdialog.win-ui-dark .win-contentdialog-dialog input[type=submit] {
+    border-color: white;
 }

shared/locale/pkgcli.xml

@@ -568,12 +568,12 @@ We will use default encoding.]]></lang>
     <lang name="zh-CN"><![CDATA[异常 {0}:
 信息：
     {1}
-堆栈回溯：
+堆栈轨迹：
     {2}]]></lang>
     <lang name="en-US"><![CDATA[Exception {0}:
 Message: 
     {1}
-Stack Trace: 
+Stack: 
     {2}]]></lang>
   </resource>
 </resources>

shared/version

@@ -1 +1 @@
-0.3.1.5
+0.3.1.7