From f3c59bd3396d79adaf86f3ed16c0f34cc66fe255 Mon Sep 17 00:00:00 2001 From: Michael Vrhel Date: Wed, 19 Jun 2013 13:08:02 -0700 Subject: 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. --- winrt/libmupdf_winRT.vcxproj | 1 - winrt/libmupdf_winRT.vcxproj.filters | 5 +--- winrt/mupdf_cpp/Assets/Logo.Scale-100.png | Bin 12690 -> 14183 bytes winrt/mupdf_cpp/Assets/Logo.Scale-140.png | Bin 18164 -> 19150 bytes winrt/mupdf_cpp/Assets/Logo.Scale-180.png | Bin 19945 -> 24211 bytes winrt/mupdf_cpp/Assets/Logo.Scale-80.png | Bin 10749 -> 11656 bytes winrt/mupdf_cpp/Assets/StoreLogo.scale-100.png | Bin 5382 -> 5816 bytes winrt/mupdf_cpp/Assets/StoreLogo.scale-140.png | Bin 6728 -> 7512 bytes winrt/mupdf_cpp/Assets/StoreLogo.scale-180.png | Bin 8026 -> 9262 bytes winrt/mupdf_cpp/Assets/WideLogo.scale-100.png | Bin 30014 -> 0 bytes winrt/mupdf_cpp/Assets/WideLogo.scale-140.png | Bin 51342 -> 0 bytes winrt/mupdf_cpp/Assets/WideLogo.scale-180.png | Bin 68929 -> 0 bytes winrt/mupdf_cpp/Assets/WideLogo.scale-80.png | Bin 22486 -> 0 bytes winrt/mupdf_cpp/Assets/mupdf_smallogo.png | Bin 4108 -> 4299 bytes winrt/mupdf_cpp/Assets/mupdf_splash.png | Bin 23297 -> 28390 bytes winrt/mupdf_cpp/MainPage.xaml.h | 4 +-- winrt/mupdf_cpp/Package.appxmanifest | 11 +++---- winrt/mupdf_cpp/mupdf_cpp.vcxproj | 39 ++++++++++++++++--------- winrt/mupdf_cpp/mupdf_cpp.vcxproj.filters | 15 ++-------- winrt/mupdfwinrt/Links.cpp | 1 + winrt/mupdfwinrt/Links.h | 1 + winrt/mupdfwinrt/muctx.cpp | 1 - winrt/mupdfwinrt/muctx.h | 8 +---- winrt/mupdfwinrt/mudocument.cpp | 1 + winrt/mupdfwinrt/mudocument.h | 4 --- winrt/mupdfwinrt/mupdfwinrt.vcxproj | 25 ++++++++-------- winrt/mupdfwinrt/mupdfwinrt.vcxproj.filters | 1 + winrt/mupdfwinrt/status.h | 19 ++++++++++++ winrt/mupdfwinrt/utils.h | 7 ----- 29 files changed, 72 insertions(+), 71 deletions(-) delete mode 100644 winrt/mupdf_cpp/Assets/WideLogo.scale-100.png delete mode 100644 winrt/mupdf_cpp/Assets/WideLogo.scale-140.png delete mode 100644 winrt/mupdf_cpp/Assets/WideLogo.scale-180.png delete mode 100644 winrt/mupdf_cpp/Assets/WideLogo.scale-80.png create mode 100644 winrt/mupdfwinrt/status.h diff --git a/winrt/libmupdf_winRT.vcxproj b/winrt/libmupdf_winRT.vcxproj index 79f27674..9db1732a 100644 --- a/winrt/libmupdf_winRT.vcxproj +++ b/winrt/libmupdf_winRT.vcxproj @@ -80,7 +80,6 @@ - diff --git a/winrt/libmupdf_winRT.vcxproj.filters b/winrt/libmupdf_winRT.vcxproj.filters index 74df3789..f2dfaec7 100644 --- a/winrt/libmupdf_winRT.vcxproj.filters +++ b/winrt/libmupdf_winRT.vcxproj.filters @@ -147,9 +147,6 @@ fitz - - fitz - fitz @@ -399,4 +396,4 @@ image - + \ No newline at end of file diff --git a/winrt/mupdf_cpp/Assets/Logo.Scale-100.png b/winrt/mupdf_cpp/Assets/Logo.Scale-100.png index ba6b005d..821cb7d9 100644 Binary files a/winrt/mupdf_cpp/Assets/Logo.Scale-100.png and b/winrt/mupdf_cpp/Assets/Logo.Scale-100.png differ diff --git a/winrt/mupdf_cpp/Assets/Logo.Scale-140.png b/winrt/mupdf_cpp/Assets/Logo.Scale-140.png index 36898526..94eb9b67 100644 Binary files a/winrt/mupdf_cpp/Assets/Logo.Scale-140.png and b/winrt/mupdf_cpp/Assets/Logo.Scale-140.png differ diff --git a/winrt/mupdf_cpp/Assets/Logo.Scale-180.png b/winrt/mupdf_cpp/Assets/Logo.Scale-180.png index ef0d381f..44354901 100644 Binary files a/winrt/mupdf_cpp/Assets/Logo.Scale-180.png and b/winrt/mupdf_cpp/Assets/Logo.Scale-180.png differ diff --git a/winrt/mupdf_cpp/Assets/Logo.Scale-80.png b/winrt/mupdf_cpp/Assets/Logo.Scale-80.png index 031a3ccd..165bda7a 100644 Binary files a/winrt/mupdf_cpp/Assets/Logo.Scale-80.png and b/winrt/mupdf_cpp/Assets/Logo.Scale-80.png differ diff --git a/winrt/mupdf_cpp/Assets/StoreLogo.scale-100.png b/winrt/mupdf_cpp/Assets/StoreLogo.scale-100.png index 1b6473d4..5b5635e9 100644 Binary files a/winrt/mupdf_cpp/Assets/StoreLogo.scale-100.png and b/winrt/mupdf_cpp/Assets/StoreLogo.scale-100.png differ diff --git a/winrt/mupdf_cpp/Assets/StoreLogo.scale-140.png b/winrt/mupdf_cpp/Assets/StoreLogo.scale-140.png index c0aaed7a..2813a863 100644 Binary files a/winrt/mupdf_cpp/Assets/StoreLogo.scale-140.png and b/winrt/mupdf_cpp/Assets/StoreLogo.scale-140.png differ diff --git a/winrt/mupdf_cpp/Assets/StoreLogo.scale-180.png b/winrt/mupdf_cpp/Assets/StoreLogo.scale-180.png index 69532c59..1908837d 100644 Binary files a/winrt/mupdf_cpp/Assets/StoreLogo.scale-180.png and b/winrt/mupdf_cpp/Assets/StoreLogo.scale-180.png differ 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 Binary files a/winrt/mupdf_cpp/Assets/WideLogo.scale-100.png and /dev/null differ 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 Binary files a/winrt/mupdf_cpp/Assets/WideLogo.scale-140.png and /dev/null differ 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 Binary files a/winrt/mupdf_cpp/Assets/WideLogo.scale-180.png and /dev/null differ 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 Binary files a/winrt/mupdf_cpp/Assets/WideLogo.scale-80.png and /dev/null differ diff --git a/winrt/mupdf_cpp/Assets/mupdf_smallogo.png b/winrt/mupdf_cpp/Assets/mupdf_smallogo.png index 15997f5c..48746c87 100644 Binary files a/winrt/mupdf_cpp/Assets/mupdf_smallogo.png and b/winrt/mupdf_cpp/Assets/mupdf_smallogo.png differ diff --git a/winrt/mupdf_cpp/Assets/mupdf_splash.png b/winrt/mupdf_cpp/Assets/mupdf_splash.png index 5f011d17..624f9ae9 100644 Binary files a/winrt/mupdf_cpp/Assets/mupdf_splash.png and b/winrt/mupdf_cpp/Assets/mupdf_splash.png differ 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 #include -#include "mudocument.h" +#include #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 @@  - + - mupdf_cpp - Artifex Software Inc. + MuPDF + Artifex Software Assets\StoreLogo.png @@ -16,7 +16,7 @@ - + @@ -34,7 +34,4 @@ - - - \ 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 @@ - mupdf_cpp_TemporaryKey.pfx - 9417B1B38E16F42A27C3D0AA69B4CE6DEB584BAC + mupdf_cpp_StoreKey.pfx + CD9F039F746ECFA4533010958399D3B0FFB6B3B5 + True $(Platform)\$(Configuration)\$(ProjectName)\ @@ -123,6 +124,7 @@ kernel32.lib;%(AdditionalDependencies);../$(Platform)/$(Configuration)/libmupdf_winRT.lib;../$(Platform)/$(Configuration)/libthirdparty_winRT.lib;../$(Platform)/$(Configuration)/libmupdf-nov8_winRT.lib;../$(Platform)/$(Configuration)/mupdfwinrt.lib + /APPCONTAINER /SAFESEH %(AdditionalOptions) @@ -133,6 +135,9 @@ kernel32.lib;%(AdditionalDependencies);../$(Platform)/$(Configuration)/libmupdf_winRT.lib;../$(Platform)/$(Configuration)/libthirdparty_winRT.lib;../$(Platform)/$(Configuration)/libmupdf-nov8_winRT.lib;../$(Platform)/$(Configuration)/mupdfwinrt.lib + + + /APPCONTAINER %(AdditionalOptions) @@ -143,6 +148,7 @@ kernel32.lib;%(AdditionalDependencies);../$(Platform)/$(Configuration)/libmupdf_winRT.lib;../$(Platform)/$(Configuration)/libthirdparty_winRT.lib;../$(Platform)/$(Configuration)/libmupdf-nov8_winRT.lib;../$(Platform)/$(Configuration)/mupdfwinrt.lib + /APPCONTAINER /SAFESEH %(AdditionalOptions) @@ -153,6 +159,9 @@ kernel32.lib;%(AdditionalDependencies);../$(Platform)/$(Configuration)/libmupdf_winRT.lib;../$(Platform)/$(Configuration)/libthirdparty_winRT.lib;../$(Platform)/$(Configuration)/libmupdf-nov8_winRT.lib;../$(Platform)/$(Configuration)/mupdfwinrt.lib + + + /APPCONTAINER /SAFESEH %(AdditionalOptions) @@ -163,6 +172,7 @@ kernel32.lib;%(AdditionalDependencies);../$(Platform)/$(Configuration)/libmupdf_winRT.lib;../$(Platform)/$(Configuration)/libthirdparty_winRT.lib;../$(Platform)/$(Configuration)/libmupdf-nov8_winRT.lib;../$(Platform)/$(Configuration)/mupdfwinrt.lib + /APPCONTAINER /SAFESEH %(AdditionalOptions) @@ -173,9 +183,13 @@ kernel32.lib;%(AdditionalDependencies);../$(Platform)/$(Configuration)/libmupdf_winRT.lib;../$(Platform)/$(Configuration)/libthirdparty_winRT.lib;../$(Platform)/$(Configuration)/libmupdf-nov8_winRT.lib;../$(Platform)/$(Configuration)/mupdfwinrt.lib + + + /APPCONTAINER %(AdditionalOptions) + @@ -201,6 +215,7 @@ Designer + @@ -239,18 +254,14 @@ true - - true - - - true - - - true - - - true - + + + + {9e6ab41d-09a7-45a6-a53b-1e4bf3ac5b33} + + + + 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 @@ + + + @@ -53,18 +56,6 @@ Assets - - Assets - - - Assets - - - Assets - - - Assets - Assets diff --git a/winrt/mupdfwinrt/Links.cpp b/winrt/mupdfwinrt/Links.cpp index 6169e77c..50db8ff2 100644 --- a/winrt/mupdfwinrt/Links.cpp +++ b/winrt/mupdfwinrt/Links.cpp @@ -1,5 +1,6 @@ #include "pch.h" #include "Links.h" +#include "status.h" using namespace mupdfwinrt; diff --git a/winrt/mupdfwinrt/Links.h b/winrt/mupdfwinrt/Links.h index bb5b87bb..39ebfc0b 100644 --- a/winrt/mupdfwinrt/Links.h +++ b/winrt/mupdfwinrt/Links.h @@ -1,6 +1,7 @@ #pragma once #include "utils.h" +#include "status.h" using namespace Windows::Foundation; diff --git a/winrt/mupdfwinrt/muctx.cpp b/winrt/mupdfwinrt/muctx.cpp index d8f3c6b2..56c6f3a9 100644 --- a/winrt/mupdfwinrt/muctx.cpp +++ b/winrt/mupdfwinrt/muctx.cpp @@ -2,7 +2,6 @@ #include "pch.h" #include "muctx.h" -#include "Links.h" /* This class interfaces to mupdf API with minimal windows objects * (other than the file streaming stuff) */ diff --git a/winrt/mupdfwinrt/muctx.h b/winrt/mupdfwinrt/muctx.h index 35070372..826fa45b 100644 --- a/winrt/mupdfwinrt/muctx.h +++ b/winrt/mupdfwinrt/muctx.h @@ -7,18 +7,12 @@ #include #include "utils.h" #include "Cache.h" +#include "status.h" extern "C" { #include "mupdf/fitz.h" } -typedef enum { - S_ISOK = 0, - E_FAILURE = 1, - E_OUTOFMEM = 2, - E_NEEDPASSWORD -} status_t; - #define MAX_SEARCH 500 using namespace Platform; /* For String */ diff --git a/winrt/mupdfwinrt/mudocument.cpp b/winrt/mupdfwinrt/mudocument.cpp index abcbce70..92c24e24 100644 --- a/winrt/mupdfwinrt/mudocument.cpp +++ b/winrt/mupdfwinrt/mudocument.cpp @@ -6,6 +6,7 @@ #include "pch.h" #include "mudocument.h" +#include "status.h" using namespace mupdfwinrt; using namespace concurrency; diff --git a/winrt/mupdfwinrt/mudocument.h b/winrt/mupdfwinrt/mudocument.h index c4bc0b4e..bb4de722 100644 --- a/winrt/mupdfwinrt/mudocument.h +++ b/winrt/mupdfwinrt/mudocument.h @@ -16,10 +16,6 @@ using namespace Platform; using namespace Concurrency; using namespace Platform::Collections; -#define SEARCH_FORWARD 1 -#define SEARCH_BACKWARD -1 -#define TEXT_NOT_FOUND -1 - namespace mupdfwinrt { public ref class mudocument sealed diff --git a/winrt/mupdfwinrt/mupdfwinrt.vcxproj b/winrt/mupdfwinrt/mupdfwinrt.vcxproj index 3dd51982..01b99ea6 100644 --- a/winrt/mupdfwinrt/mupdfwinrt.vcxproj +++ b/winrt/mupdfwinrt/mupdfwinrt.vcxproj @@ -37,34 +37,34 @@ - StaticLibrary + DynamicLibrary true v110 - StaticLibrary + DynamicLibrary true v110 - StaticLibrary + DynamicLibrary true v110 - StaticLibrary + DynamicLibrary false true v110 - StaticLibrary + DynamicLibrary false true v110 - StaticLibrary + DynamicLibrary false true v110 @@ -132,7 +132,7 @@ Console - runtimeobject.lib;../$(Platform)/$(Configuration)/libmupdf_winRT.lib;../$(Platform)/$(Configuration)/libthirdparty_winRT.lib;../$(Platform)/$(Configuration)/libmupdf-nov8_winRT.lib;%(AdditionalDependencies) + runtimeobject.lib;../$(Platform)/$(Configuration)/libmupdf_winRT.lib;../$(Platform)/$(Configuration)/libthirdparty_winRT.lib;../$(Platform)/$(Configuration)/libmupdf-nov8_winRT.lib false @@ -148,7 +148,7 @@ Console - runtimeobject.lib;../../$(Platform)/$(Configuration)/libmupdf_winRT.lib;../../$(Platform)/$(Configuration)/libthirdparty_winRT.lib;../../$(Platform)/$(Configuration)/libmupdf-nov8_winRT.lib;%(AdditionalDependencies) + runtimeobject.lib;../$(Platform)/$(Configuration)/libmupdf_winRT.lib;../$(Platform)/$(Configuration)/libthirdparty_winRT.lib;../$(Platform)/$(Configuration)/libmupdf-nov8_winRT.lib false @@ -164,7 +164,7 @@ Console - runtimeobject.lib;%(AdditionalDependencies) + runtimeobject.lib;../$(Platform)/$(Configuration)/libmupdf_winRT.lib;../$(Platform)/$(Configuration)/libthirdparty_winRT.lib;../$(Platform)/$(Configuration)/libmupdf-nov8_winRT.lib false @@ -180,7 +180,7 @@ Console - runtimeobject.lib;%(AdditionalDependencies) + runtimeobject.lib;../$(Platform)/$(Configuration)/libmupdf_winRT.lib;../$(Platform)/$(Configuration)/libthirdparty_winRT.lib;../$(Platform)/$(Configuration)/libmupdf-nov8_winRT.lib false @@ -196,7 +196,7 @@ Console - runtimeobject.lib;%(AdditionalDependencies) + runtimeobject.lib;../$(Platform)/$(Configuration)/libmupdf_winRT.lib;../$(Platform)/$(Configuration)/libthirdparty_winRT.lib;../$(Platform)/$(Configuration)/libmupdf-nov8_winRT.lib false @@ -212,7 +212,7 @@ Console - runtimeobject.lib;%(AdditionalDependencies) + runtimeobject.lib;../$(Platform)/$(Configuration)/libmupdf_winRT.lib;../$(Platform)/$(Configuration)/libthirdparty_winRT.lib;../$(Platform)/$(Configuration)/libmupdf-nov8_winRT.lib false @@ -223,6 +223,7 @@ + diff --git a/winrt/mupdfwinrt/mupdfwinrt.vcxproj.filters b/winrt/mupdfwinrt/mupdfwinrt.vcxproj.filters index 5c98d5ba..7598f3e5 100644 --- a/winrt/mupdfwinrt/mupdfwinrt.vcxproj.filters +++ b/winrt/mupdfwinrt/mupdfwinrt.vcxproj.filters @@ -23,5 +23,6 @@ + \ No newline at end of file diff --git a/winrt/mupdfwinrt/status.h b/winrt/mupdfwinrt/status.h new file mode 100644 index 00000000..af168d62 --- /dev/null +++ b/winrt/mupdfwinrt/status.h @@ -0,0 +1,19 @@ +#pragma once + +typedef enum { + S_ISOK = 0, + E_FAILURE = 1, + E_OUTOFMEM = 2, + E_NEEDPASSWORD +} status_t; + +typedef enum { + LINK_GOTO = 0, + LINK_URI, + TEXTBOX, /* Do double duty with this class */ + NOT_SET, +} link_t; + +#define SEARCH_FORWARD 1 +#define SEARCH_BACKWARD -1 +#define TEXT_NOT_FOUND -1 diff --git a/winrt/mupdfwinrt/utils.h b/winrt/mupdfwinrt/utils.h index a1237097..6ffc7e20 100644 --- a/winrt/mupdfwinrt/utils.h +++ b/winrt/mupdfwinrt/utils.h @@ -3,12 +3,5 @@ #include "Windows.h" using namespace Platform; -typedef enum { - LINK_GOTO = 0, - LINK_URI, - TEXTBOX, /* Do double duty with this class */ - NOT_SET, -} link_t; - String^ char_to_String(char *char_in); char* String_to_char(String^ text); -- cgit v1.2.3