Fix up of issues in Windows 8 app prior to submission to Windows store

Fix of logos and icons to match Android and iOS applications.
Switch to using DLL for the mupdf winRT library.  Static libraries for
winRT defined calls is not allowed.   Added linker options for security issues.
Also fix of some circular header/namespace issues.

17 files changed, 34 insertions, 35 deletions

diff --git a/winrt/mupdf_cpp/Assets/Logo.Scale-100.png b/winrt/mupdf_cpp/Assets/Logo.Scale-100.png
index ba6b005d..821cb7d9 100644
--- a/winrt/mupdf_cpp/Assets/Logo.Scale-100.png
+++ b/winrt/mupdf_cpp/Assets/Logo.Scale-100.png
diff --git a/winrt/mupdf_cpp/Assets/Logo.Scale-140.png b/winrt/mupdf_cpp/Assets/Logo.Scale-140.png
index 36898526..94eb9b67 100644
--- a/winrt/mupdf_cpp/Assets/Logo.Scale-140.png
+++ b/winrt/mupdf_cpp/Assets/Logo.Scale-140.png
diff --git a/winrt/mupdf_cpp/Assets/Logo.Scale-180.png b/winrt/mupdf_cpp/Assets/Logo.Scale-180.png
index ef0d381f..44354901 100644
--- a/winrt/mupdf_cpp/Assets/Logo.Scale-180.png
+++ b/winrt/mupdf_cpp/Assets/Logo.Scale-180.png
diff --git a/winrt/mupdf_cpp/Assets/Logo.Scale-80.png b/winrt/mupdf_cpp/Assets/Logo.Scale-80.png
index 031a3ccd..165bda7a 100644
--- a/winrt/mupdf_cpp/Assets/Logo.Scale-80.png
+++ b/winrt/mupdf_cpp/Assets/Logo.Scale-80.png
diff --git a/winrt/mupdf_cpp/Assets/StoreLogo.scale-100.png b/winrt/mupdf_cpp/Assets/StoreLogo.scale-100.png
index 1b6473d4..5b5635e9 100644
--- a/winrt/mupdf_cpp/Assets/StoreLogo.scale-100.png
+++ b/winrt/mupdf_cpp/Assets/StoreLogo.scale-100.png
diff --git a/winrt/mupdf_cpp/Assets/StoreLogo.scale-140.png b/winrt/mupdf_cpp/Assets/StoreLogo.scale-140.png
index c0aaed7a..2813a863 100644
--- a/winrt/mupdf_cpp/Assets/StoreLogo.scale-140.png
+++ b/winrt/mupdf_cpp/Assets/StoreLogo.scale-140.png
diff --git a/winrt/mupdf_cpp/Assets/StoreLogo.scale-180.png b/winrt/mupdf_cpp/Assets/StoreLogo.scale-180.png
index 69532c59..1908837d 100644
--- a/winrt/mupdf_cpp/Assets/StoreLogo.scale-180.png
+++ b/winrt/mupdf_cpp/Assets/StoreLogo.scale-180.png
diff --git a/winrt/mupdf_cpp/Assets/WideLogo.scale-100.png b/winrt/mupdf_cpp/Assets/WideLogo.scale-100.png
deleted file mode 100644
index 9497ffb5..00000000
--- a/winrt/mupdf_cpp/Assets/WideLogo.scale-100.png
+++ /dev/null
diff --git a/winrt/mupdf_cpp/Assets/WideLogo.scale-140.png b/winrt/mupdf_cpp/Assets/WideLogo.scale-140.png
deleted file mode 100644
index 1c6cd7a0..00000000
--- a/winrt/mupdf_cpp/Assets/WideLogo.scale-140.png
+++ /dev/null
diff --git a/winrt/mupdf_cpp/Assets/WideLogo.scale-180.png b/winrt/mupdf_cpp/Assets/WideLogo.scale-180.png
deleted file mode 100644
index 7d3391f8..00000000
--- a/winrt/mupdf_cpp/Assets/WideLogo.scale-180.png
+++ /dev/null
diff --git a/winrt/mupdf_cpp/Assets/WideLogo.scale-80.png b/winrt/mupdf_cpp/Assets/WideLogo.scale-80.png
deleted file mode 100644
index 471efbda..00000000
--- a/winrt/mupdf_cpp/Assets/WideLogo.scale-80.png
+++ /dev/null
diff --git a/winrt/mupdf_cpp/Assets/mupdf_smallogo.png b/winrt/mupdf_cpp/Assets/mupdf_smallogo.png
index 15997f5c..48746c87 100644
--- a/winrt/mupdf_cpp/Assets/mupdf_smallogo.png
+++ b/winrt/mupdf_cpp/Assets/mupdf_smallogo.png
diff --git a/winrt/mupdf_cpp/Assets/mupdf_splash.png b/winrt/mupdf_cpp/Assets/mupdf_splash.png
index 5f011d17..624f9ae9 100644
--- a/winrt/mupdf_cpp/Assets/mupdf_splash.png
+++ b/winrt/mupdf_cpp/Assets/mupdf_splash.png
diff --git a/winrt/mupdf_cpp/MainPage.xaml.h b/winrt/mupdf_cpp/MainPage.xaml.h
index 203ad64e..80978bc8 100644
--- a/winrt/mupdf_cpp/MainPage.xaml.h
+++ b/winrt/mupdf_cpp/MainPage.xaml.h
@@ -10,8 +10,9 @@
 #include "ppltasks.h"
 #include <collection.h>
 #include <algorithm>
-#include "mudocument.h"
+#include <assert.h>
 #include "DocumentPage.h"
+#include "status.h"
 
 using namespace Platform;
 using namespace Concurrency;
@@ -148,7 +149,6 @@ namespace mupdf_cpp
 		void ClearLinks();
 		void InvalidateLinks();
 		void ContentDisplay(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e);
-		void FlattenOutline(fz_outline *outline, int level);
 		void ListView_Single_Tap(Platform::Object^ sender, Windows::UI::Xaml::Input::TappedRoutedEventArgs^ e);
 		void ContentSelected(Platform::Object^ sender, Windows::UI::Xaml::Controls::ItemClickEventArgs^ e);
 		void ContentChanged(Platform::Object^ sender, Windows::UI::Xaml::Controls::SelectionChangedEventArgs^ e);
diff --git a/winrt/mupdf_cpp/Package.appxmanifest b/winrt/mupdf_cpp/Package.appxmanifest
index b4b59afd..862154f8 100644
--- a/winrt/mupdf_cpp/Package.appxmanifest
+++ b/winrt/mupdf_cpp/Package.appxmanifest
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/2010/manifest">
-  <Identity Name="faab8eca-be5e-4e0d-b782-213ccbbc5f34" Publisher="CN=Artifex Software" Version="1.0.0.0" />
+  <Identity Name="ArtifexSoftware.MuPDF" Publisher="CN=B93265AA-82AD-458A-A08E-7069B8ED88B5" Version="1.0.0.0" />
   <Properties>
-    <DisplayName>mupdf_cpp</DisplayName>
-    <PublisherDisplayName>Artifex Software Inc.</PublisherDisplayName>
+    <DisplayName>MuPDF</DisplayName>
+    <PublisherDisplayName>Artifex Software</PublisherDisplayName>
     <Logo>Assets\StoreLogo.png</Logo>
   </Properties>
   <Prerequisites>
@@ -16,7 +16,7 @@
   <Applications>
     <Application Id="App" Executable="$targetnametoken$.exe" EntryPoint="mupdf_cpp.App">
       <VisualElements DisplayName="MuPDF" Logo="Assets\Logo.png" SmallLogo="assets/mupdf_smallogo.png" Description="A lightweight, high quality PDF/XPS/CBZ viewer for Windows 8 devices." ForegroundText="light" BackgroundColor="#464646">
-        <DefaultTile ShowName="allLogos" WideLogo="Assets\WideLogo.png" />
+        <DefaultTile ShowName="allLogos" />
         <SplashScreen Image="Assets\mupdf_splash.png" />
       </VisualElements>
       <Extensions>
@@ -34,7 +34,4 @@
       </Extensions>
     </Application>
   </Applications>
-  <Capabilities>
-    <Capability Name="documentsLibrary" />
-  </Capabilities>
 </Package>
\ No newline at end of file
diff --git a/winrt/mupdf_cpp/mupdf_cpp.vcxproj b/winrt/mupdf_cpp/mupdf_cpp.vcxproj
index 241b3e03..b5da02da 100644
--- a/winrt/mupdf_cpp/mupdf_cpp.vcxproj
+++ b/winrt/mupdf_cpp/mupdf_cpp.vcxproj
@@ -90,8 +90,9 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
-    <PackageCertificateKeyFile>mupdf_cpp_TemporaryKey.pfx</PackageCertificateKeyFile>
-    <PackageCertificateThumbprint>9417B1B38E16F42A27C3D0AA69B4CE6DEB584BAC</PackageCertificateThumbprint>
+    <PackageCertificateKeyFile>mupdf_cpp_StoreKey.pfx</PackageCertificateKeyFile>
+    <PackageCertificateThumbprint>CD9F039F746ECFA4533010958399D3B0FFB6B3B5</PackageCertificateThumbprint>
+    <AppxAutoIncrementPackageRevision>True</AppxAutoIncrementPackageRevision>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
@@ -123,6 +124,7 @@
     </ClCompile>
     <Link>
       <AdditionalDependencies>kernel32.lib;%(AdditionalDependencies);../$(Platform)/$(Configuration)/libmupdf_winRT.lib;../$(Platform)/$(Configuration)/libthirdparty_winRT.lib;../$(Platform)/$(Configuration)/libmupdf-nov8_winRT.lib;../$(Platform)/$(Configuration)/mupdfwinrt.lib</AdditionalDependencies>
+      <AdditionalOptions>/APPCONTAINER /SAFESEH %(AdditionalOptions)</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
@@ -133,6 +135,9 @@
     </ClCompile>
     <Link>
       <AdditionalDependencies>kernel32.lib;%(AdditionalDependencies);../$(Platform)/$(Configuration)/libmupdf_winRT.lib;../$(Platform)/$(Configuration)/libthirdparty_winRT.lib;../$(Platform)/$(Configuration)/libmupdf-nov8_winRT.lib;../$(Platform)/$(Configuration)/mupdfwinrt.lib</AdditionalDependencies>
+      <SectionAlignment>
+      </SectionAlignment>
+      <AdditionalOptions>/APPCONTAINER %(AdditionalOptions)</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -143,6 +148,7 @@
     </ClCompile>
     <Link>
       <AdditionalDependencies>kernel32.lib;%(AdditionalDependencies);../$(Platform)/$(Configuration)/libmupdf_winRT.lib;../$(Platform)/$(Configuration)/libthirdparty_winRT.lib;../$(Platform)/$(Configuration)/libmupdf-nov8_winRT.lib;../$(Platform)/$(Configuration)/mupdfwinrt.lib</AdditionalDependencies>
+      <AdditionalOptions>/APPCONTAINER /SAFESEH %(AdditionalOptions)</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -153,6 +159,9 @@
     </ClCompile>
     <Link>
       <AdditionalDependencies>kernel32.lib;%(AdditionalDependencies);../$(Platform)/$(Configuration)/libmupdf_winRT.lib;../$(Platform)/$(Configuration)/libthirdparty_winRT.lib;../$(Platform)/$(Configuration)/libmupdf-nov8_winRT.lib;../$(Platform)/$(Configuration)/mupdfwinrt.lib</AdditionalDependencies>
+      <SectionAlignment>
+      </SectionAlignment>
+      <AdditionalOptions>/APPCONTAINER /SAFESEH %(AdditionalOptions)</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -163,6 +172,7 @@
     </ClCompile>
     <Link>
       <AdditionalDependencies>kernel32.lib;%(AdditionalDependencies);../$(Platform)/$(Configuration)/libmupdf_winRT.lib;../$(Platform)/$(Configuration)/libthirdparty_winRT.lib;../$(Platform)/$(Configuration)/libmupdf-nov8_winRT.lib;../$(Platform)/$(Configuration)/mupdfwinrt.lib</AdditionalDependencies>
+      <AdditionalOptions>/APPCONTAINER /SAFESEH %(AdditionalOptions)</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -173,9 +183,13 @@
     </ClCompile>
     <Link>
       <AdditionalDependencies>kernel32.lib;%(AdditionalDependencies);../$(Platform)/$(Configuration)/libmupdf_winRT.lib;../$(Platform)/$(Configuration)/libthirdparty_winRT.lib;../$(Platform)/$(Configuration)/libmupdf-nov8_winRT.lib;../$(Platform)/$(Configuration)/mupdfwinrt.lib</AdditionalDependencies>
+      <SectionAlignment>
+      </SectionAlignment>
+      <AdditionalOptions>/APPCONTAINER %(AdditionalOptions)</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClInclude Include="..\mupdfwinrt\status.h" />
     <ClInclude Include="DocumentPage.h" />
     <ClInclude Include="pch.h" />
     <ClInclude Include="App.xaml.h">
@@ -201,6 +215,7 @@
     <AppxManifest Include="Package.appxmanifest">
       <SubType>Designer</SubType>
     </AppxManifest>
+    <None Include="mupdf_cpp_StoreKey.pfx" />
     <None Include="mupdf_cpp_TemporaryKey.pfx" />
   </ItemGroup>
   <ItemGroup>
@@ -239,18 +254,14 @@
     <Image Include="Assets\StoreLogo.scale-180.png">
       <DeploymentContent>true</DeploymentContent>
     </Image>
-    <Image Include="Assets\WideLogo.scale-100.png">
-      <DeploymentContent>true</DeploymentContent>
-    </Image>
-    <Image Include="Assets\WideLogo.scale-140.png">
-      <DeploymentContent>true</DeploymentContent>
-    </Image>
-    <Image Include="Assets\WideLogo.scale-180.png">
-      <DeploymentContent>true</DeploymentContent>
-    </Image>
-    <Image Include="Assets\WideLogo.scale-80.png">
-      <DeploymentContent>true</DeploymentContent>
-    </Image>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\mupdfwinrt\mupdfwinrt.vcxproj">
+      <Project>{9e6ab41d-09a7-45a6-a53b-1e4bf3ac5b33}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Package.StoreAssociation.xml" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/winrt/mupdf_cpp/mupdf_cpp.vcxproj.filters b/winrt/mupdf_cpp/mupdf_cpp.vcxproj.filters
index 23db29e8..c1791b26 100644
--- a/winrt/mupdf_cpp/mupdf_cpp.vcxproj.filters
+++ b/winrt/mupdf_cpp/mupdf_cpp.vcxproj.filters
@@ -27,12 +27,15 @@
     <ClInclude Include="MainPage.xaml.h" />
     <ClInclude Include="DocumentPage.h" />
     <ClInclude Include="RectList.h" />
+    <ClInclude Include="..\mupdfwinrt\status.h" />
   </ItemGroup>
   <ItemGroup>
     <AppxManifest Include="Package.appxmanifest" />
   </ItemGroup>
   <ItemGroup>
     <None Include="mupdf_cpp_TemporaryKey.pfx" />
+    <None Include="Package.StoreAssociation.xml" />
+    <None Include="mupdf_cpp_StoreKey.pfx" />
   </ItemGroup>
   <ItemGroup>
     <Page Include="MainPage.xaml" />
@@ -53,18 +56,6 @@
     <Image Include="Assets\Logo.Scale-180.png">
       <Filter>Assets</Filter>
     </Image>
-    <Image Include="Assets\WideLogo.scale-100.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\WideLogo.scale-140.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\WideLogo.scale-180.png">
-      <Filter>Assets</Filter>
-    </Image>
-    <Image Include="Assets\WideLogo.scale-80.png">
-      <Filter>Assets</Filter>
-    </Image>
     <Image Include="Assets\mupdf_splash.png">
       <Filter>Assets</Filter>
     </Image>