diff options
29 files changed, 72 insertions, 71 deletions
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 @@ <ClCompile Include="..\fitz\filt_predict.c" /> <ClCompile Include="..\fitz\image_jpeg.c" /> <ClCompile Include="..\fitz\image_jpx.c" /> - <ClCompile Include="..\fitz\image_md5.c" /> <ClCompile Include="..\fitz\image_png.c" /> <ClCompile Include="..\fitz\image_tiff.c" /> <ClCompile Include="..\fitz\memento.c" /> 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 @@ <ClCompile Include="..\fitz\image_jpx.c"> <Filter>fitz</Filter> </ClCompile> - <ClCompile Include="..\fitz\image_md5.c"> - <Filter>fitz</Filter> - </ClCompile> <ClCompile Include="..\fitz\image_png.c"> <Filter>fitz</Filter> </ClCompile> @@ -399,4 +396,4 @@ <Filter>image</Filter> </ClInclude> </ItemGroup> -</Project> +</Project>
\ 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differdeleted 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 Binary files differdeleted 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 Binary files differdeleted 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 Binary files differdeleted 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 Binary files differindex 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 Binary files differindex 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> 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 <mutex> #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 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> + <ConfigurationType>DynamicLibrary</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> <PlatformToolset>v110</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> + <ConfigurationType>DynamicLibrary</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> <PlatformToolset>v110</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> + <ConfigurationType>DynamicLibrary</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> <PlatformToolset>v110</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> + <ConfigurationType>DynamicLibrary</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> <WholeProgramOptimization>true</WholeProgramOptimization> <PlatformToolset>v110</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> + <ConfigurationType>DynamicLibrary</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> <WholeProgramOptimization>true</WholeProgramOptimization> <PlatformToolset>v110</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> + <ConfigurationType>DynamicLibrary</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> <WholeProgramOptimization>true</WholeProgramOptimization> <PlatformToolset>v110</PlatformToolset> @@ -132,7 +132,7 @@ </ClCompile> <Link> <SubSystem>Console</SubSystem> - <AdditionalDependencies>runtimeobject.lib;../$(Platform)/$(Configuration)/libmupdf_winRT.lib;../$(Platform)/$(Configuration)/libthirdparty_winRT.lib;../$(Platform)/$(Configuration)/libmupdf-nov8_winRT.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>runtimeobject.lib;../$(Platform)/$(Configuration)/libmupdf_winRT.lib;../$(Platform)/$(Configuration)/libthirdparty_winRT.lib;../$(Platform)/$(Configuration)/libmupdf-nov8_winRT.lib</AdditionalDependencies> <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> </Link> </ItemDefinitionGroup> @@ -148,7 +148,7 @@ </ClCompile> <Link> <SubSystem>Console</SubSystem> - <AdditionalDependencies>runtimeobject.lib;../../$(Platform)/$(Configuration)/libmupdf_winRT.lib;../../$(Platform)/$(Configuration)/libthirdparty_winRT.lib;../../$(Platform)/$(Configuration)/libmupdf-nov8_winRT.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>runtimeobject.lib;../$(Platform)/$(Configuration)/libmupdf_winRT.lib;../$(Platform)/$(Configuration)/libthirdparty_winRT.lib;../$(Platform)/$(Configuration)/libmupdf-nov8_winRT.lib</AdditionalDependencies> <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> </Link> </ItemDefinitionGroup> @@ -164,7 +164,7 @@ </ClCompile> <Link> <SubSystem>Console</SubSystem> - <AdditionalDependencies>runtimeobject.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>runtimeobject.lib;../$(Platform)/$(Configuration)/libmupdf_winRT.lib;../$(Platform)/$(Configuration)/libthirdparty_winRT.lib;../$(Platform)/$(Configuration)/libmupdf-nov8_winRT.lib</AdditionalDependencies> <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> </Link> </ItemDefinitionGroup> @@ -180,7 +180,7 @@ </ClCompile> <Link> <SubSystem>Console</SubSystem> - <AdditionalDependencies>runtimeobject.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>runtimeobject.lib;../$(Platform)/$(Configuration)/libmupdf_winRT.lib;../$(Platform)/$(Configuration)/libthirdparty_winRT.lib;../$(Platform)/$(Configuration)/libmupdf-nov8_winRT.lib</AdditionalDependencies> <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> </Link> </ItemDefinitionGroup> @@ -196,7 +196,7 @@ </ClCompile> <Link> <SubSystem>Console</SubSystem> - <AdditionalDependencies>runtimeobject.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>runtimeobject.lib;../$(Platform)/$(Configuration)/libmupdf_winRT.lib;../$(Platform)/$(Configuration)/libthirdparty_winRT.lib;../$(Platform)/$(Configuration)/libmupdf-nov8_winRT.lib</AdditionalDependencies> <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> </Link> </ItemDefinitionGroup> @@ -212,7 +212,7 @@ </ClCompile> <Link> <SubSystem>Console</SubSystem> - <AdditionalDependencies>runtimeobject.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>runtimeobject.lib;../$(Platform)/$(Configuration)/libmupdf_winRT.lib;../$(Platform)/$(Configuration)/libthirdparty_winRT.lib;../$(Platform)/$(Configuration)/libmupdf-nov8_winRT.lib</AdditionalDependencies> <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> </Link> </ItemDefinitionGroup> @@ -223,6 +223,7 @@ <ClInclude Include="muctx.h" /> <ClInclude Include="pch.h" /> <ClInclude Include="mudocument.h" /> + <ClInclude Include="status.h" /> <ClInclude Include="utils.h" /> </ItemGroup> <ItemGroup> 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 @@ <ClInclude Include="utils.h" /> <ClInclude Include="ContentItem.h" /> <ClInclude Include="Cache.h" /> + <ClInclude Include="status.h" /> </ItemGroup> </Project>
\ 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); |
