[mapguide-commits] r9439 - in sandbox/jng/deprecate_dwf: Oem Oem/zlib_minizip Oem/zlib_minizip/win Server/src/Services/Resource
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Sat Jan 5 08:01:38 PST 2019
Author: jng
Date: 2019-01-05 08:01:38 -0800 (Sat, 05 Jan 2019)
New Revision: 9439
Added:
sandbox/jng/deprecate_dwf/Oem/zlib_minizip/
sandbox/jng/deprecate_dwf/Oem/zlib_minizip/CMakeLists.txt
sandbox/jng/deprecate_dwf/Oem/zlib_minizip/win/
sandbox/jng/deprecate_dwf/Oem/zlib_minizip/win/minizip.vcxproj
sandbox/jng/deprecate_dwf/Oem/zlib_minizip/win/minizip.vcxproj.filters
Removed:
sandbox/jng/deprecate_dwf/Server/src/Services/Resource/ByteSourceDwfInputStreamImpl.cpp
sandbox/jng/deprecate_dwf/Server/src/Services/Resource/ByteSourceDwfInputStreamImpl.h
Modified:
sandbox/jng/deprecate_dwf/Oem/CMakeLists.txt
sandbox/jng/deprecate_dwf/Oem/oem.sln
sandbox/jng/deprecate_dwf/Server/src/Services/Resource/ResourceServiceDefs.h
sandbox/jng/deprecate_dwf/Server/src/Services/Resource/ServerResourceService.vcxproj
sandbox/jng/deprecate_dwf/Server/src/Services/Resource/ServerResourceServiceBuild.cpp
sandbox/jng/deprecate_dwf/Server/src/Services/Resource/ZipFileHandler.cpp
sandbox/jng/deprecate_dwf/Server/src/Services/Resource/ZipFileHandler.h
sandbox/jng/deprecate_dwf/Server/src/Services/Resource/ZipFileReader.cpp
sandbox/jng/deprecate_dwf/Server/src/Services/Resource/ZipFileWriter.cpp
Log:
Comment out and remove usage of the DWF Toolkit impl of zip file reading and writing in MgServerResourceService
In its place, we'll use the minizip contrib library as part of the zlib sources. This commit sets up the projects to build minizip and for MgServerResourceService to link to it and zlib.
Modified: sandbox/jng/deprecate_dwf/Oem/CMakeLists.txt
===================================================================
--- sandbox/jng/deprecate_dwf/Oem/CMakeLists.txt 2019-01-05 14:56:06 UTC (rev 9438)
+++ sandbox/jng/deprecate_dwf/Oem/CMakeLists.txt 2019-01-05 16:01:38 UTC (rev 9439)
@@ -23,5 +23,6 @@
#add_subdirectory(geos)
add_subdirectory(DWFTK)
add_subdirectory(CsMapLibrary)
+add_subdirectory(zlib_minizip)
add_subdirectory(SWIGEx)
add_subdirectory(LinuxApt)
\ No newline at end of file
Modified: sandbox/jng/deprecate_dwf/Oem/oem.sln
===================================================================
--- sandbox/jng/deprecate_dwf/Oem/oem.sln 2019-01-05 14:56:06 UTC (rev 9438)
+++ sandbox/jng/deprecate_dwf/Oem/oem.sln 2019-01-05 16:01:38 UTC (rev 9439)
@@ -89,6 +89,8 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IMake", "..\BuildTools\WebTools\IMake\IMake.vcxproj", "{B601F04C-0D42-4AFC-A092-B31185E2EA8C}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "minizip", "zlib_minizip\win\minizip.vcxproj", "{DB542A13-DE6E-3E82-BA87-7AE2885324B1}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -384,6 +386,14 @@
{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Release|Win32.Build.0 = Release|Win32
{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Release|x64.ActiveCfg = Release|x64
{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Release|x64.Build.0 = Release|x64
+ {DB542A13-DE6E-3E82-BA87-7AE2885324B1}.Debug|Win32.ActiveCfg = Debug|Win32
+ {DB542A13-DE6E-3E82-BA87-7AE2885324B1}.Debug|Win32.Build.0 = Debug|Win32
+ {DB542A13-DE6E-3E82-BA87-7AE2885324B1}.Debug|x64.ActiveCfg = Debug|x64
+ {DB542A13-DE6E-3E82-BA87-7AE2885324B1}.Debug|x64.Build.0 = Debug|x64
+ {DB542A13-DE6E-3E82-BA87-7AE2885324B1}.Release|Win32.ActiveCfg = Release|Win32
+ {DB542A13-DE6E-3E82-BA87-7AE2885324B1}.Release|Win32.Build.0 = Release|Win32
+ {DB542A13-DE6E-3E82-BA87-7AE2885324B1}.Release|x64.ActiveCfg = Release|x64
+ {DB542A13-DE6E-3E82-BA87-7AE2885324B1}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Added: sandbox/jng/deprecate_dwf/Oem/zlib_minizip/CMakeLists.txt
===================================================================
--- sandbox/jng/deprecate_dwf/Oem/zlib_minizip/CMakeLists.txt (rev 0)
+++ sandbox/jng/deprecate_dwf/Oem/zlib_minizip/CMakeLists.txt 2019-01-05 16:01:38 UTC (rev 9439)
@@ -0,0 +1,14 @@
+project(minizip)
+
+include_directories(
+ ../gd/zlib
+ ../gd/zlib/contrib/minizip
+)
+
+set(minizip_SRCS
+ ../gd/zlib/contrib/minizip/zip.c
+ ../gd/zlib/contrib/minizip/unzip.c
+ ../gd/zlib/contrib/minizip/ioapi.c
+)
+
+add_library(minizip STATIC ${minizip_SRCS})
\ No newline at end of file
Index: sandbox/jng/deprecate_dwf/Oem/zlib_minizip/win
===================================================================
--- sandbox/jng/deprecate_dwf/Oem/zlib_minizip/win 2019-01-05 14:56:06 UTC (rev 9438)
+++ sandbox/jng/deprecate_dwf/Oem/zlib_minizip/win 2019-01-05 16:01:38 UTC (rev 9439)
Property changes on: sandbox/jng/deprecate_dwf/Oem/zlib_minizip/win
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,3 ##
+Debug
+minizip.dir
+Release
Added: sandbox/jng/deprecate_dwf/Oem/zlib_minizip/win/minizip.vcxproj
===================================================================
--- sandbox/jng/deprecate_dwf/Oem/zlib_minizip/win/minizip.vcxproj (rev 0)
+++ sandbox/jng/deprecate_dwf/Oem/zlib_minizip/win/minizip.vcxproj 2019-01-05 16:01:38 UTC (rev 9439)
@@ -0,0 +1,215 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{DB542A13-DE6E-3E82-BA87-7AE2885324B1}</ProjectGuid>
+ <Keyword>Win32Proj</Keyword>
+ <Platform>Win32</Platform>
+ <ProjectName>minizip</ProjectName>
+ <VCProjectUpgraderObjectName>NoUpgrade</VCProjectUpgraderObjectName>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup 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>
+ <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\win\Debug\Win32\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\win\Debug\x64\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">minizip.dir\Debug\Win32\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">minizip.dir\Debug\x64\</IntDir>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">minizipd</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">minizipd</TargetName>
+ <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.lib</TargetExt>
+ <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.lib</TargetExt>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\win\Release\Win32\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\win\Release\x64\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">minizip.dir\Release\Win32\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">minizip.dir\Release\x64\</IntDir>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">minizip</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">minizip</TargetName>
+ <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.lib</TargetExt>
+ <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.lib</TargetExt>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <ClCompile>
+ <AdditionalIncludeDirectories>..\..\gd\zlib;..\..\gd\zlib\contrib\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AssemblerListingLocation>Debug/</AssemblerListingLocation>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <CompileAs>CompileAsC</CompileAs>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <ExceptionHandling>
+ </ExceptionHandling>
+ <InlineFunctionExpansion>Disabled</InlineFunctionExpansion>
+ <Optimization>Disabled</Optimization>
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <WarningLevel>Level3</WarningLevel>
+ <PreprocessorDefinitions>WIN32;_WINDOWS</PreprocessorDefinitions>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..\gd\zlib;..\..\gd\zlib\contrib\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ResourceCompile>
+ <Midl>
+ <AdditionalIncludeDirectories>..\..\gd\zlib;..\..\gd\zlib\contrib\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+ <HeaderFileName>%(Filename).h</HeaderFileName>
+ <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
+ <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
+ <ProxyFileName>%(Filename)_p.c</ProxyFileName>
+ </Midl>
+ <Lib>
+ <AdditionalOptions>%(AdditionalOptions) /machine:X86</AdditionalOptions>
+ </Lib>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <ClCompile>
+ <AdditionalIncludeDirectories>..\..\gd\zlib;..\..\gd\zlib\contrib\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AssemblerListingLocation>Debug/</AssemblerListingLocation>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <CompileAs>CompileAsC</CompileAs>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <ExceptionHandling>
+ </ExceptionHandling>
+ <InlineFunctionExpansion>Disabled</InlineFunctionExpansion>
+ <Optimization>Disabled</Optimization>
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <WarningLevel>Level3</WarningLevel>
+ <PreprocessorDefinitions>WIN32;_WINDOWS</PreprocessorDefinitions>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..\gd\zlib;..\..\gd\zlib\contrib\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ResourceCompile>
+ <Midl>
+ <AdditionalIncludeDirectories>..\..\gd\zlib;..\..\gd\zlib\contrib\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+ <HeaderFileName>%(Filename).h</HeaderFileName>
+ <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
+ <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
+ <ProxyFileName>%(Filename)_p.c</ProxyFileName>
+ </Midl>
+ <Lib>
+ <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
+ </Lib>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
+ <AdditionalIncludeDirectories>..\..\gd\zlib;..\..\gd\zlib\contrib\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AssemblerListingLocation>Release/</AssemblerListingLocation>
+ <CompileAs>CompileAsC</CompileAs>
+ <ExceptionHandling>
+ </ExceptionHandling>
+ <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+ <Optimization>MaxSpeed</Optimization>
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <WarningLevel>Level3</WarningLevel>
+ <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;</PreprocessorDefinitions>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <DebugInformationFormat>
+ </DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..\gd\zlib;..\..\gd\zlib\contrib\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ResourceCompile>
+ <Midl>
+ <AdditionalIncludeDirectories>..\..\gd\zlib;..\..\gd\zlib\contrib\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+ <HeaderFileName>%(Filename).h</HeaderFileName>
+ <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
+ <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
+ <ProxyFileName>%(Filename)_p.c</ProxyFileName>
+ </Midl>
+ <Lib>
+ <AdditionalOptions>%(AdditionalOptions) /machine:X86</AdditionalOptions>
+ </Lib>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <ClCompile>
+ <AdditionalIncludeDirectories>..\..\gd\zlib;..\..\gd\zlib\contrib\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AssemblerListingLocation>Release/</AssemblerListingLocation>
+ <CompileAs>CompileAsC</CompileAs>
+ <ExceptionHandling>
+ </ExceptionHandling>
+ <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+ <Optimization>MaxSpeed</Optimization>
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <WarningLevel>Level3</WarningLevel>
+ <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;</PreprocessorDefinitions>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <DebugInformationFormat>
+ </DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..\gd\zlib;..\..\gd\zlib\contrib\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ResourceCompile>
+ <Midl>
+ <AdditionalIncludeDirectories>..\..\gd\zlib;..\..\gd\zlib\contrib\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
+ <HeaderFileName>%(Filename).h</HeaderFileName>
+ <TypeLibraryName>%(Filename).tlb</TypeLibraryName>
+ <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
+ <ProxyFileName>%(Filename)_p.c</ProxyFileName>
+ </Midl>
+ <Lib>
+ <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
+ </Lib>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\gd\zlib\contrib\minizip\zip.c" />
+ <ClCompile Include="..\..\gd\zlib\contrib\minizip\unzip.c" />
+ <ClCompile Include="..\..\gd\zlib\contrib\minizip\ioapi.c" />
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file
Added: sandbox/jng/deprecate_dwf/Oem/zlib_minizip/win/minizip.vcxproj.filters
===================================================================
--- sandbox/jng/deprecate_dwf/Oem/zlib_minizip/win/minizip.vcxproj.filters (rev 0)
+++ sandbox/jng/deprecate_dwf/Oem/zlib_minizip/win/minizip.vcxproj.filters 2019-01-05 16:01:38 UTC (rev 9439)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <ClCompile Include="..\..\gd\zlib\contrib\minizip\zip.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\gd\zlib\contrib\minizip\unzip.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\gd\zlib\contrib\minizip\ioapi.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <Filter Include="Source Files">
+ <UniqueIdentifier>{9019A4BC-3CB2-32B0-8E97-11E93088471D}</UniqueIdentifier>
+ </Filter>
+ </ItemGroup>
+</Project>
Deleted: sandbox/jng/deprecate_dwf/Server/src/Services/Resource/ByteSourceDwfInputStreamImpl.cpp
===================================================================
--- sandbox/jng/deprecate_dwf/Server/src/Services/Resource/ByteSourceDwfInputStreamImpl.cpp 2019-01-05 14:56:06 UTC (rev 9438)
+++ sandbox/jng/deprecate_dwf/Server/src/Services/Resource/ByteSourceDwfInputStreamImpl.cpp 2019-01-05 16:01:38 UTC (rev 9439)
@@ -1,141 +0,0 @@
-//
-// Copyright (C) 2004-2011 by Autodesk, Inc.
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of version 2.1 of the GNU Lesser
-// General Public License as published by the Free Software Foundation.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-//
-
-#include "ResourceServiceDefs.h"
-#include "ByteSourceDwfInputStreamImpl.h"
-
-///----------------------------------------------------------------------------
-/// <summary>
-/// Constructs an MgByteSourceDwfInputStreamImpl object.
-/// </summary>
-///
-/// <param name="inputStream">
-/// DWFInputStream object to use.
-/// </param>
-///----------------------------------------------------------------------------
-
-MgByteSourceDwfInputStreamImpl::MgByteSourceDwfInputStreamImpl(
- DWFInputStream* inputStream) :
- m_inputStream(inputStream)
-{
- CHECKARGUMENTNULL(m_inputStream, L"MgByteSourceDwfInputStreamImpl.MgByteSourceDwfInputStreamImpl");
-}
-
-///----------------------------------------------------------------------------
-/// <summary>
-/// Destructs an MgByteSourceDwfInputStreamImpl object.
-/// </summary>
-///----------------------------------------------------------------------------
-
-MgByteSourceDwfInputStreamImpl::~MgByteSourceDwfInputStreamImpl()
-{
- DWFCORE_FREE_OBJECT(m_inputStream);
-}
-
-///----------------------------------------------------------------------------
-/// <summary>
-/// Returns the remaining length of the byte source. This length is
-/// adjusted for previous reads. If the returned length is zero
-/// then the underlying source may be a streaming format and the length
-/// is not known.
-/// </summary>
-///
-/// <returns>
-/// Remaining length of the byte source.
-/// </returns>
-///
-/// <exceptions>
-/// MgDwfException
-/// </exceptions>
-///----------------------------------------------------------------------------
-
-INT64 MgByteSourceDwfInputStreamImpl::GetLength()
-{
- INT64 length = 0;
-
- MG_RESOURCE_SERVICE_TRY()
-
- length = m_inputStream->available();
-
- MG_RESOURCE_SERVICE_CATCH_AND_THROW(L"MgByteSourceDwfInputStreamImpl.GetLength")
-
- return length;
-}
-
-bool MgByteSourceDwfInputStreamImpl::IsRewindable()
-{
- // Currently DWFUnzippingInputStream does not support rewinding.
- return false;
-}
-
-///----------------------------------------------------------------------------
-/// <summary>
-/// Rewinds to the start of memory. Length is reset.
-/// </summary>
-///
-/// <returns>
-/// Nothing.
-/// </returns>
-///
-/// <exceptions>
-/// MgDwfException
-/// </exceptions>
-///----------------------------------------------------------------------------
-
-void MgByteSourceDwfInputStreamImpl::Rewind()
-{
- MG_RESOURCE_SERVICE_TRY()
-
- // Currently DWFUnzippingInputStream throws an DWFNotImplementedException.
- m_inputStream->seek(SEEK_SET, 0);
-
- MG_RESOURCE_SERVICE_CATCH_AND_THROW(L"MgByteSourceDwfInputStreamImpl.Rewind")
-}
-
-///----------------------------------------------------------------------------
-/// <summary>
-/// Reads a buffer.
-/// </summary>
-///
-/// <param name="buffer">
-/// A buffer receiving the data.
-/// </param>
-/// <param name="length">
-/// Maximum number of bytes to read.
-/// </param>
-///
-/// <returns>
-/// Actual number of bytes put in the buffer. 0 means end of bytes.
-/// </returns>
-///
-/// <exceptions>
-/// MgDwfException
-/// </exceptions>
-///----------------------------------------------------------------------------
-
-INT32 MgByteSourceDwfInputStreamImpl::Read(BYTE_ARRAY_OUT buffer, INT32 length)
-{
- INT32 nBytesRead = 0;
-
- MG_RESOURCE_SERVICE_TRY()
-
- nBytesRead = (INT32)m_inputStream->read(buffer, length);
-
- MG_RESOURCE_SERVICE_CATCH_AND_THROW(L"MgByteSourceDwfInputStreamImpl.Read")
-
- return nBytesRead;
-}
Deleted: sandbox/jng/deprecate_dwf/Server/src/Services/Resource/ByteSourceDwfInputStreamImpl.h
===================================================================
--- sandbox/jng/deprecate_dwf/Server/src/Services/Resource/ByteSourceDwfInputStreamImpl.h 2019-01-05 14:56:06 UTC (rev 9438)
+++ sandbox/jng/deprecate_dwf/Server/src/Services/Resource/ByteSourceDwfInputStreamImpl.h 2019-01-05 16:01:38 UTC (rev 9439)
@@ -1,117 +0,0 @@
-//
-// Copyright (C) 2004-2011 by Autodesk, Inc.
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of version 2.1 of the GNU Lesser
-// General Public License as published by the Free Software Foundation.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-//
-
-#ifndef MG_BYTE_SOURCE_DWF_INPUT_STREAM_IMPL_H_
-#define MG_BYTE_SOURCE_DWF_INPUT_STREAM_IMPL_H_
-
-#include "ServerResourceDllExport.h"
-
-///////////////////////////////////////////////////////////////////////////////
-/// <summary>
-/// MgByteSourceDwfInputStreamImpl provides access to the bytes on a DWF input
-/// stream source.
-/// </summary>
-///
-class MG_SERVER_RESOURCE_API MgByteSourceDwfInputStreamImpl : public ByteSourceImpl
-{
-public:
-
- ///////////////////////////////////////////////////////////////////////////
- /// <summary>
- /// Constructs an MgByteSourceDwfInputStreamImpl object.
- /// </summary>
- ///
- /// <param name="inputStream">
- /// DWFInputStream object to use.
- /// </param>
- ///
- MgByteSourceDwfInputStreamImpl(DWFInputStream* inputStream);
-
- ///////////////////////////////////////////////////////////////////////////
- /// <summary>
- /// Destructs an MgByteSourceDwfInputStreamImpl object.
- /// </summary>
- ///
- virtual ~MgByteSourceDwfInputStreamImpl();
-
- ///////////////////////////////////////////////////////////////////////////
- /// <summary>
- /// Returns the remaining length of the byte source. This length is
- /// adjusted for previous reads. If the returned length is zero
- /// then the underlying source may be a streaming format and the length
- /// is not known.
- /// </summary>
- ///
- /// <returns>
- /// Remaining length of the byte source.
- /// </returns>
- ///
- INT64 GetLength();
-
- ///////////////////////////////////////////////////////////////////////////
- /// \brief
- /// Determines if the source is rewindable.
- ///
- /// \return
- /// true if the source is rewindable, false otherwise.
- ///
- bool IsRewindable();
-
- ///////////////////////////////////////////////////////////////////////////
- /// <summary>
- /// Rewinds to the start of memory. Length is reset.
- /// </summary>
- ///
- /// <returns>
- /// Nothing.
- /// </returns>
- ///
- void Rewind();
-
- ///////////////////////////////////////////////////////////////////////////
- /// <summary>
- /// Reads a buffer.
- /// </summary>
- ///
- /// <param name="buffer">
- /// A buffer receiving the data.
- /// </param>
- /// <param name="length">
- /// Maximum number of bytes to read.
- /// </param>
- ///
- /// <returns>
- /// Actual number of bytes put in the buffer. 0 means end of bytes.
- /// </returns>
- ///
- INT32 Read(BYTE_ARRAY_OUT buffer, INT32 length);
-
-private:
-
- // Unimplemented Methods
-
- MgByteSourceDwfInputStreamImpl();
- MgByteSourceDwfInputStreamImpl(const MgByteSourceDwfInputStreamImpl&);
- MgByteSourceDwfInputStreamImpl& operator=(
- const MgByteSourceDwfInputStreamImpl&);
-
-protected:
-
- DWFInputStream* m_inputStream;
-};
-
-#endif
Modified: sandbox/jng/deprecate_dwf/Server/src/Services/Resource/ResourceServiceDefs.h
===================================================================
--- sandbox/jng/deprecate_dwf/Server/src/Services/Resource/ResourceServiceDefs.h 2019-01-05 14:56:06 UTC (rev 9438)
+++ sandbox/jng/deprecate_dwf/Server/src/Services/Resource/ResourceServiceDefs.h 2019-01-05 16:01:38 UTC (rev 9439)
@@ -26,7 +26,6 @@
#include <map>
#include <vector>
#include <dbxml/DbXml.hpp>
-#include <dwfcore/ZipFileDescriptor.h>
#include "db_cxx.h"
using namespace DbXml;
@@ -78,13 +77,7 @@
arguments.Add(message); \
mgException = new MgDbException(methodName, __LINE__, __WFILE__, NULL, L"MgFormatInnerExceptionMessage", &arguments); \
(static_cast<MgThirdPartyException*>(mgException.p))->SetErrorCode(e.get_errno()); \
- } \
- catch (DWFException& e) \
- { \
- MgStringCollection arguments; \
- arguments.Add(STRING(e.message())); \
- mgException = new MgDwfException(methodName, __LINE__, __WFILE__, NULL, L"MgFormatInnerExceptionMessage", &arguments); \
- } \
+ } \
catch (const XMLException& e) \
{ \
MgStringCollection arguments; \
Modified: sandbox/jng/deprecate_dwf/Server/src/Services/Resource/ServerResourceService.vcxproj
===================================================================
--- sandbox/jng/deprecate_dwf/Server/src/Services/Resource/ServerResourceService.vcxproj 2019-01-05 14:56:06 UTC (rev 9438)
+++ sandbox/jng/deprecate_dwf/Server/src/Services/Resource/ServerResourceService.vcxproj 2019-01-05 16:01:38 UTC (rev 9439)
@@ -94,8 +94,8 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\Common;..\..\Common\Base;..\..\Common\Cache;..\..\Common\Manager;..\Feature;..\Site;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfModel;..\..\..\..\Common\MdfParser;..\..\..\..\Common\Security;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;..\..\..\..\Oem\dbxml\db-4.8.26\\build_windows;..\..\..\..\Oem\dbxml\dbxml\include;..\..\..\..\Oem\dbxml\dbxml\src;..\..\..\..\Oem\DWFTK\develop\global\src;..\..\..\..\Oem\FDO\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MG_SERVER_RESOURCE_EXPORTS;DWFCORE_STATIC;DWFTK_USE_DWFCORE_ZLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..\..\..\Oem\gd\zlib;..\..\..\..\Oem\gd\zlib\contrib\minizip;..\..\Common;..\..\Common\Base;..\..\Common\Cache;..\..\Common\Manager;..\Feature;..\Site;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfModel;..\..\..\..\Common\MdfParser;..\..\..\..\Common\Security;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;..\..\..\..\Oem\dbxml\db-4.8.26\\build_windows;..\..\..\..\Oem\dbxml\dbxml\include;..\..\..\..\Oem\dbxml\dbxml\src;..\..\..\..\Oem\FDO\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MG_SERVER_RESOURCE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -104,9 +104,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACEd.lib;xerces-c_3mgD.lib;libdb48d.lib;libdbxml25d.lib;dwfcore_wt.1.7.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>zlibd.lib;minizipd.lib;ACEd.lib;xerces-c_3mgD.lib;libdb48d.lib;libdbxml25d.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgServerResourceServiced.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);..\..\..\..\Oem\dbxml\lib\$(Configuration);..\..\..\..\Oem\DWFTK\develop\global\lib\static\$(Configuration)\vc10.0;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\..\Oem\zlib_minizip\win\Debug\Win32;..\..\..\..\Oem\gd\lpng\projects\vs\Debug\ZLib..\..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);..\..\..\..\Oem\dbxml\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgServerResourceServiced.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -122,8 +122,8 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\Common;..\..\Common\Base;..\..\Common\Cache;..\..\Common\Manager;..\Feature;..\Site;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfModel;..\..\..\..\Common\MdfParser;..\..\..\..\Common\Security;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;..\..\..\..\Oem\dbxml\db-4.8.26\\build_windows;..\..\..\..\Oem\dbxml\dbxml\include;..\..\..\..\Oem\dbxml\dbxml\src;..\..\..\..\Oem\DWFTK\develop\global\src;..\..\..\..\Oem\FDO\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MG_SERVER_RESOURCE_EXPORTS;DWFCORE_STATIC;DWFTK_USE_DWFCORE_ZLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..\..\..\Oem\gd\zlib;..\..\..\..\Oem\gd\zlib\contrib\minizip;..\..\Common;..\..\Common\Base;..\..\Common\Cache;..\..\Common\Manager;..\Feature;..\Site;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfModel;..\..\..\..\Common\MdfParser;..\..\..\..\Common\Security;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;..\..\..\..\Oem\dbxml\db-4.8.26\\build_windows;..\..\..\..\Oem\dbxml\dbxml\include;..\..\..\..\Oem\dbxml\dbxml\src;..\..\..\..\Oem\FDO\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MG_SERVER_RESOURCE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -132,9 +132,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACEd.lib;xerces-c_3mgD.lib;libdb48d.lib;libdbxml25d.lib;dwfcore_wt.1.7.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>zlibd.lib;minizipd.lib;ACEd.lib;xerces-c_3mgD.lib;libdb48d.lib;libdbxml25d.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgServerResourceServiced.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\..\..\Oem\dbxml\lib64\$(Configuration);..\..\..\..\Oem\DWFTK\develop\global\lib\x64\static\$(Configuration)\vc10.0;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\..\Oem\zlib_minizip\win\Debug\x64;..\..\..\..\Oem\gd\lpng\projects\vs\Debug64\ZLib..\..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\..\..\Oem\dbxml\lib64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgServerResourceServiced.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -150,8 +150,8 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\..\Common;..\..\Common\Base;..\..\Common\Cache;..\..\Common\Manager;..\Feature;..\Site;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfModel;..\..\..\..\Common\MdfParser;..\..\..\..\Common\Security;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;..\..\..\..\Oem\dbxml\db-4.8.26\\build_windows;..\..\..\..\Oem\dbxml\dbxml\include;..\..\..\..\Oem\dbxml\dbxml\src;..\..\..\..\Oem\DWFTK\develop\global\src;..\..\..\..\Oem\FDO\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MG_SERVER_RESOURCE_EXPORTS;DWFCORE_STATIC;DWFTK_USE_DWFCORE_ZLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..\..\..\Oem\gd\zlib;..\..\..\..\Oem\gd\zlib\contrib\minizip;..\..\Common;..\..\Common\Base;..\..\Common\Cache;..\..\Common\Manager;..\Feature;..\Site;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfModel;..\..\..\..\Common\MdfParser;..\..\..\..\Common\Security;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;..\..\..\..\Oem\dbxml\db-4.8.26\\build_windows;..\..\..\..\Oem\dbxml\dbxml\include;..\..\..\..\Oem\dbxml\dbxml\src;..\..\..\..\Oem\FDO\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MG_SERVER_RESOURCE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
@@ -159,9 +159,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACE.lib;xerces-c_3mg.lib;libdb48.lib;libdbxml25.lib;dwfcore_wt.1.7.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>zlib.lib;minizip.lib;ACE.lib;xerces-c_3mg.lib;libdb48.lib;libdbxml25.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgServerResourceService.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);..\..\..\..\Oem\dbxml\lib\$(Configuration);..\..\..\..\Oem\DWFTK\develop\global\lib\static\$(Configuration)\vc10.0;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\..\Oem\zlib_minizip\win\Release\Win32;..\..\..\..\Oem\gd\lpng\projects\vs\LIB Release\ZLib;..\..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);..\..\..\..\Oem\dbxml\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgServerResourceService.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -179,8 +179,8 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\..\Common;..\..\Common\Base;..\..\Common\Cache;..\..\Common\Manager;..\Feature;..\Site;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfModel;..\..\..\..\Common\MdfParser;..\..\..\..\Common\Security;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;..\..\..\..\Oem\dbxml\db-4.8.26\\build_windows;..\..\..\..\Oem\dbxml\dbxml\include;..\..\..\..\Oem\dbxml\dbxml\src;..\..\..\..\Oem\DWFTK\develop\global\src;..\..\..\..\Oem\FDO\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MG_SERVER_RESOURCE_EXPORTS;DWFCORE_STATIC;DWFTK_USE_DWFCORE_ZLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..\..\..\Oem\gd\zlib;..\..\..\..\Oem\gd\zlib\contrib\minizip;..\..\Common;..\..\Common\Base;..\..\Common\Cache;..\..\Common\Manager;..\Feature;..\Site;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfModel;..\..\..\..\Common\MdfParser;..\..\..\..\Common\Security;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;..\..\..\..\Oem\dbxml\db-4.8.26\\build_windows;..\..\..\..\Oem\dbxml\dbxml\include;..\..\..\..\Oem\dbxml\dbxml\src;..\..\..\..\Oem\FDO\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MG_SERVER_RESOURCE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
@@ -188,9 +188,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACE.lib;xerces-c_3mg.lib;libdb48.lib;libdbxml25.lib;dwfcore_wt.1.7.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>zlib.lib;minizip.lib;ACE.lib;xerces-c_3mg.lib;libdb48.lib;libdbxml25.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgServerResourceService.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\..\..\Oem\dbxml\lib64\$(Configuration);..\..\..\..\Oem\DWFTK\develop\global\lib\x64\static\$(Configuration)\vc10.0;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\..\Oem\zlib_minizip\win\Release\x64;..\..\..\..\Oem\gd\lpng\projects\vs\Release64\ZLib;..\..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\..\..\Oem\dbxml\lib64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgServerResourceService.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -422,12 +422,6 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
- <ClCompile Include="ByteSourceDwfInputStreamImpl.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- </ClCompile>
<ClCompile Include="Database.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
@@ -725,7 +719,6 @@
<ClInclude Include="ApplicationRepository.h" />
<ClInclude Include="ApplicationRepositoryManager.h" />
<ClInclude Include="ApplicationResourceContentManager.h" />
- <ClInclude Include="ByteSourceDwfInputStreamImpl.h" />
<ClInclude Include="Database.h" />
<ClInclude Include="DataBindingInfo.h" />
<ClInclude Include="DbEnvironment.h" />
Modified: sandbox/jng/deprecate_dwf/Server/src/Services/Resource/ServerResourceServiceBuild.cpp
===================================================================
--- sandbox/jng/deprecate_dwf/Server/src/Services/Resource/ServerResourceServiceBuild.cpp 2019-01-05 14:56:06 UTC (rev 9438)
+++ sandbox/jng/deprecate_dwf/Server/src/Services/Resource/ServerResourceServiceBuild.cpp 2019-01-05 16:01:38 UTC (rev 9439)
@@ -24,7 +24,6 @@
#include "ApplicationRepository.cpp"
#include "ApplicationRepositoryManager.cpp"
#include "ApplicationResourceContentManager.cpp"
-#include "ByteSourceDwfInputStreamImpl.cpp"
#include "Database.cpp"
#include "DataBindingInfo.cpp"
#include "DbEnvironment.cpp"
Modified: sandbox/jng/deprecate_dwf/Server/src/Services/Resource/ZipFileHandler.cpp
===================================================================
--- sandbox/jng/deprecate_dwf/Server/src/Services/Resource/ZipFileHandler.cpp 2019-01-05 14:56:06 UTC (rev 9438)
+++ sandbox/jng/deprecate_dwf/Server/src/Services/Resource/ZipFileHandler.cpp 2019-01-05 16:01:38 UTC (rev 9439)
@@ -22,11 +22,10 @@
/// \brief
/// Constructs the object.
///
-MgZipFileHandler::MgZipFileHandler(CREFSTRING filePath,
- DWFZipFileDescriptor::teFileMode fileMode)
+MgZipFileHandler::MgZipFileHandler(CREFSTRING filePath, MgZipFileMode fileMode)
{
ACE_ASSERT(!filePath.empty());
-
+ /*
MG_RESOURCE_SERVICE_TRY()
DWFFile zipFile(filePath.c_str());
@@ -35,6 +34,7 @@
m_zipFileDescriptor->open();
MG_RESOURCE_SERVICE_CATCH_AND_THROW(L"MgZipFileHandler.MgZipFileHandler")
+ */
}
///////////////////////////////////////////////////////////////////////////////
Modified: sandbox/jng/deprecate_dwf/Server/src/Services/Resource/ZipFileHandler.h
===================================================================
--- sandbox/jng/deprecate_dwf/Server/src/Services/Resource/ZipFileHandler.h 2019-01-05 14:56:06 UTC (rev 9438)
+++ sandbox/jng/deprecate_dwf/Server/src/Services/Resource/ZipFileHandler.h 2019-01-05 16:01:38 UTC (rev 9439)
@@ -18,6 +18,12 @@
#ifndef MGZIPFILEHANDLER_H_
#define MGZIPFILEHANDLER_H_
+enum MgZipFileMode
+{
+ Read,
+ Write
+};
+
class MgZipFileHandler
{
/// Constructors/Destructor
@@ -24,8 +30,7 @@
public:
- MgZipFileHandler(CREFSTRING filePath,
- DWFZipFileDescriptor::teFileMode fileMode);
+ MgZipFileHandler(CREFSTRING filePath, MgZipFileMode fileMode);
virtual ~MgZipFileHandler();
private:
@@ -44,7 +49,7 @@
protected:
- auto_ptr<DWFZipFileDescriptor> m_zipFileDescriptor;
+ //auto_ptr<DWFZipFileDescriptor> m_zipFileDescriptor;
};
/// Inline Methods
Modified: sandbox/jng/deprecate_dwf/Server/src/Services/Resource/ZipFileReader.cpp
===================================================================
--- sandbox/jng/deprecate_dwf/Server/src/Services/Resource/ZipFileReader.cpp 2019-01-05 14:56:06 UTC (rev 9438)
+++ sandbox/jng/deprecate_dwf/Server/src/Services/Resource/ZipFileReader.cpp 2019-01-05 16:01:38 UTC (rev 9439)
@@ -17,7 +17,6 @@
#include "ResourceServiceDefs.h"
#include "ZipFileReader.h"
-#include "ByteSourceDwfInputStreamImpl.h"
///////////////////////////////////////////////////////////////////////////////
/// \brief
@@ -24,7 +23,7 @@
/// Constructs the object.
///
MgZipFileReader::MgZipFileReader(CREFSTRING filePath) :
- MgZipFileHandler(filePath, DWFZipFileDescriptor::eUnzip)
+ MgZipFileHandler(filePath, MgZipFileMode::Read)
{
}
@@ -44,7 +43,7 @@
{
ACE_ASSERT(!filePath.empty());
Ptr<MgByteSource> byteSource;
-
+ /*
MG_RESOURCE_SERVICE_TRY()
// Note that the byteSource object owns the byteSourceImpl object whose
@@ -59,6 +58,6 @@
byteSource = new MgByteSource(byteSourceImpl);
MG_RESOURCE_SERVICE_CATCH_AND_THROW(L"MgZipFileReader.ExtractArchive")
-
+ */
return byteSource.Detach();
}
Modified: sandbox/jng/deprecate_dwf/Server/src/Services/Resource/ZipFileWriter.cpp
===================================================================
--- sandbox/jng/deprecate_dwf/Server/src/Services/Resource/ZipFileWriter.cpp 2019-01-05 14:56:06 UTC (rev 9438)
+++ sandbox/jng/deprecate_dwf/Server/src/Services/Resource/ZipFileWriter.cpp 2019-01-05 16:01:38 UTC (rev 9439)
@@ -23,7 +23,7 @@
/// Constructs the object.
///
MgZipFileWriter::MgZipFileWriter(CREFSTRING filePath) :
- MgZipFileHandler(filePath, DWFZipFileDescriptor::eZip)
+ MgZipFileHandler(filePath, MgZipFileMode::Write)
{
}
@@ -42,6 +42,7 @@
void MgZipFileWriter::AddArchive(CREFSTRING filePath, MgByteReader* byteReader)
{
ACE_ASSERT(!filePath.empty());
+ /*
DWFOutputStream* outputStream = NULL;
MG_RESOURCE_SERVICE_TRY()
@@ -66,6 +67,7 @@
DWFCORE_FREE_OBJECT(outputStream);
MG_RESOURCE_SERVICE_THROW()
+ */
}
///////////////////////////////////////////////////////////////////////////////
More information about the mapguide-commits
mailing list