mirror of
https://github.com/owasp-modsecurity/ModSecurity.git
synced 2025-09-30 03:34:29 +03:00
iis: Removes the installer helper dependency
Now using appcmd directly with WiX instead of calling the installer helper.
This commit is contained in:
Felipe \"Zimmerle\" Costa
committed by
Felipe Zimmerle
Felipe Zimmerle
parent
550d5aae21
commit
1a12648c9f
File diff suppressed because it is too large
Load Diff
@@ -1,96 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<Project DefaultTargets="Build" ToolsVersion="12.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="Release|Win32">
|
|
||||||
<Configuration>Release</Configuration>
|
|
||||||
<Platform>Win32</Platform>
|
|
||||||
</ProjectConfiguration>
|
|
||||||
</ItemGroup>
|
|
||||||
<PropertyGroup Label="Globals">
|
|
||||||
<ProjectGuid>{990BB195-6716-4DE3-B5E4-DCFCB1BD7D9C}</ProjectGuid>
|
|
||||||
<Keyword>Win32Proj</Keyword>
|
|
||||||
<RootNamespace>Installer</RootNamespace>
|
|
||||||
<ProjectName>InstallerHelper</ProjectName>
|
|
||||||
</PropertyGroup>
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
|
||||||
<ConfigurationType>Application</ConfigurationType>
|
|
||||||
<UseDebugLibraries>true</UseDebugLibraries>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
<PlatformToolset>v120</PlatformToolset>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
|
||||||
<ConfigurationType>Application</ConfigurationType>
|
|
||||||
<UseDebugLibraries>false</UseDebugLibraries>
|
|
||||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
|
||||||
<CharacterSet>Unicode</CharacterSet>
|
|
||||||
<UseOfMfc>Static</UseOfMfc>
|
|
||||||
<PlatformToolset>v120</PlatformToolset>
|
|
||||||
</PropertyGroup>
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
|
||||||
<ImportGroup Label="ExtensionSettings">
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
</ImportGroup>
|
|
||||||
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
|
||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
||||||
</ImportGroup>
|
|
||||||
<PropertyGroup Label="UserMacros" />
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
|
||||||
<LinkIncremental>true</LinkIncremental>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
|
||||||
<LinkIncremental>false</LinkIncremental>
|
|
||||||
</PropertyGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
|
||||||
<ClCompile>
|
|
||||||
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
|
||||||
<WarningLevel>Level3</WarningLevel>
|
|
||||||
<Optimization>Disabled</Optimization>
|
|
||||||
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
<PrecompiledHeaderFile>
|
|
||||||
</PrecompiledHeaderFile>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<SubSystem>Console</SubSystem>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
|
||||||
<ClCompile>
|
|
||||||
<WarningLevel>Level3</WarningLevel>
|
|
||||||
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
|
||||||
<Optimization>MaxSpeed</Optimization>
|
|
||||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
|
||||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
|
||||||
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
||||||
</ClCompile>
|
|
||||||
<Link>
|
|
||||||
<SubSystem>Console</SubSystem>
|
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
|
||||||
<OptimizeReferences>true</OptimizeReferences>
|
|
||||||
<AdditionalDependencies>ole32.lib;oleaut32.lib;advapi32.lib</AdditionalDependencies>
|
|
||||||
<UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
|
|
||||||
</Link>
|
|
||||||
</ItemDefinitionGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<None Include="ReadMe.txt" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<ClInclude Include="targetver.h" />
|
|
||||||
<ClInclude Include="XUnzip.h" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<ClCompile Include="Installer.cpp" />
|
|
||||||
<ClCompile Include="XUnzip.cpp" />
|
|
||||||
</ItemGroup>
|
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
|
||||||
<ImportGroup Label="ExtensionTargets">
|
|
||||||
</ImportGroup>
|
|
||||||
</Project>
|
|
||||||
@@ -1,36 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
||||||
<ItemGroup>
|
|
||||||
<Filter Include="Source Files">
|
|
||||||
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
|
|
||||||
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
|
|
||||||
</Filter>
|
|
||||||
<Filter Include="Header Files">
|
|
||||||
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
|
|
||||||
<Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
|
|
||||||
</Filter>
|
|
||||||
<Filter Include="Resource Files">
|
|
||||||
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
|
|
||||||
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
|
|
||||||
</Filter>
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<None Include="ReadMe.txt" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<ClInclude Include="targetver.h">
|
|
||||||
<Filter>Header Files</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="XUnzip.h">
|
|
||||||
<Filter>Header Files</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<ClCompile Include="Installer.cpp">
|
|
||||||
<Filter>Source Files</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
<ClCompile Include="XUnzip.cpp">
|
|
||||||
<Filter>Source Files</Filter>
|
|
||||||
</ClCompile>
|
|
||||||
</ItemGroup>
|
|
||||||
</Project>
|
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -1,382 +0,0 @@
|
|||||||
// XUnzip.h Version 1.3
|
|
||||||
//
|
|
||||||
// Authors: Mark Adler et al. (see below)
|
|
||||||
//
|
|
||||||
// Modified by: Lucian Wischik
|
|
||||||
// lu@wischik.com
|
|
||||||
//
|
|
||||||
// Version 1.0 - Turned C files into just a single CPP file
|
|
||||||
// - Made them compile cleanly as C++ files
|
|
||||||
// - Gave them simpler APIs
|
|
||||||
// - Added the ability to zip/unzip directly in memory without
|
|
||||||
// any intermediate files
|
|
||||||
//
|
|
||||||
// Modified by: Hans Dietrich
|
|
||||||
// hdietrich@gmail.com
|
|
||||||
//
|
|
||||||
///////////////////////////////////////////////////////////////////////////////
|
|
||||||
//
|
|
||||||
// Lucian Wischik's comments:
|
|
||||||
// --------------------------
|
|
||||||
// THIS FILE is almost entirely based upon code by info-zip.
|
|
||||||
// It has been modified by Lucian Wischik.
|
|
||||||
// The original code may be found at http://www.info-zip.org
|
|
||||||
// The original copyright text follows.
|
|
||||||
//
|
|
||||||
///////////////////////////////////////////////////////////////////////////////
|
|
||||||
//
|
|
||||||
// Original authors' comments:
|
|
||||||
// ---------------------------
|
|
||||||
// This is version 2002-Feb-16 of the Info-ZIP copyright and license. The
|
|
||||||
// definitive version of this document should be available at
|
|
||||||
// ftp://ftp.info-zip.org/pub/infozip/license.html indefinitely.
|
|
||||||
//
|
|
||||||
// Copyright (c) 1990-2002 Info-ZIP. All rights reserved.
|
|
||||||
//
|
|
||||||
// For the purposes of this copyright and license, "Info-ZIP" is defined as
|
|
||||||
// the following set of individuals:
|
|
||||||
//
|
|
||||||
// Mark Adler, John Bush, Karl Davis, Harald Denker, Jean-Michel Dubois,
|
|
||||||
// Jean-loup Gailly, Hunter Goatley, Ian Gorman, Chris Herborth, Dirk Haase,
|
|
||||||
// Greg Hartwig, Robert Heath, Jonathan Hudson, Paul Kienitz,
|
|
||||||
// David Kirschbaum, Johnny Lee, Onno van der Linden, Igor Mandrichenko,
|
|
||||||
// Steve P. Miller, Sergio Monesi, Keith Owens, George Petrov, Greg Roelofs,
|
|
||||||
// Kai Uwe Rommel, Steve Salisbury, Dave Smith, Christian Spieler,
|
|
||||||
// Antoine Verheijen, Paul von Behren, Rich Wales, Mike White
|
|
||||||
//
|
|
||||||
// This software is provided "as is", without warranty of any kind, express
|
|
||||||
// or implied. In no event shall Info-ZIP or its contributors be held liable
|
|
||||||
// for any direct, indirect, incidental, special or consequential damages
|
|
||||||
// arising out of the use of or inability to use this software.
|
|
||||||
//
|
|
||||||
// Permission is granted to anyone to use this software for any purpose,
|
|
||||||
// including commercial applications, and to alter it and redistribute it
|
|
||||||
// freely, subject to the following restrictions:
|
|
||||||
//
|
|
||||||
// 1. Redistributions of source code must retain the above copyright notice,
|
|
||||||
// definition, disclaimer, and this list of conditions.
|
|
||||||
//
|
|
||||||
// 2. Redistributions in binary form (compiled executables) must reproduce
|
|
||||||
// the above copyright notice, definition, disclaimer, and this list of
|
|
||||||
// conditions in documentation and/or other materials provided with the
|
|
||||||
// distribution. The sole exception to this condition is redistribution
|
|
||||||
// of a standard UnZipSFX binary as part of a self-extracting archive;
|
|
||||||
// that is permitted without inclusion of this license, as long as the
|
|
||||||
// normal UnZipSFX banner has not been removed from the binary or disabled.
|
|
||||||
//
|
|
||||||
// 3. Altered versions--including, but not limited to, ports to new
|
|
||||||
// operating systems, existing ports with new graphical interfaces, and
|
|
||||||
// dynamic, shared, or static library versions--must be plainly marked
|
|
||||||
// as such and must not be misrepresented as being the original source.
|
|
||||||
// Such altered versions also must not be misrepresented as being
|
|
||||||
// Info-ZIP releases--including, but not limited to, labeling of the
|
|
||||||
// altered versions with the names "Info-ZIP" (or any variation thereof,
|
|
||||||
// including, but not limited to, different capitalizations),
|
|
||||||
// "Pocket UnZip", "WiZ" or "MacZip" without the explicit permission of
|
|
||||||
// Info-ZIP. Such altered versions are further prohibited from
|
|
||||||
// misrepresentative use of the Zip-Bugs or Info-ZIP e-mail addresses or
|
|
||||||
// of the Info-ZIP URL(s).
|
|
||||||
//
|
|
||||||
// 4. Info-ZIP retains the right to use the names "Info-ZIP", "Zip", "UnZip",
|
|
||||||
// "UnZipSFX", "WiZ", "Pocket UnZip", "Pocket Zip", and "MacZip" for its
|
|
||||||
// own source and binary releases.
|
|
||||||
//
|
|
||||||
///////////////////////////////////////////////////////////////////////////////
|
|
||||||
|
|
||||||
#ifndef XUNZIP_H
|
|
||||||
#define XUNZIP_H
|
|
||||||
|
|
||||||
|
|
||||||
#ifndef XZIP_H
|
|
||||||
DECLARE_HANDLE(HZIP); // An HZIP identifies a zip file that has been opened
|
|
||||||
#endif
|
|
||||||
|
|
||||||
typedef DWORD ZRESULT;
|
|
||||||
// return codes from any of the zip functions. Listed later.
|
|
||||||
|
|
||||||
#define ZIP_HANDLE 1
|
|
||||||
#define ZIP_FILENAME 2
|
|
||||||
#define ZIP_MEMORY 3
|
|
||||||
|
|
||||||
typedef struct
|
|
||||||
{ int index; // index of this file within the zip
|
|
||||||
char name[MAX_PATH]; // filename within the zip
|
|
||||||
DWORD attr; // attributes, as in GetFileAttributes.
|
|
||||||
FILETIME atime,ctime,mtime;// access, create, modify filetimes
|
|
||||||
long comp_size; // sizes of item, compressed and uncompressed. These
|
|
||||||
long unc_size; // may be -1 if not yet known (e.g. being streamed in)
|
|
||||||
} ZIPENTRY;
|
|
||||||
|
|
||||||
typedef struct
|
|
||||||
{ int index; // index of this file within the zip
|
|
||||||
TCHAR name[MAX_PATH]; // filename within the zip
|
|
||||||
DWORD attr; // attributes, as in GetFileAttributes.
|
|
||||||
FILETIME atime,ctime,mtime;// access, create, modify filetimes
|
|
||||||
long comp_size; // sizes of item, compressed and uncompressed. These
|
|
||||||
long unc_size; // may be -1 if not yet known (e.g. being streamed in)
|
|
||||||
} ZIPENTRYW;
|
|
||||||
|
|
||||||
|
|
||||||
///////////////////////////////////////////////////////////////////////////////
|
|
||||||
//
|
|
||||||
// OpenZip()
|
|
||||||
//
|
|
||||||
// Purpose: Open an existing zip archive file
|
|
||||||
//
|
|
||||||
// Parameters: z - archive file name if flags is ZIP_FILENAME; for other
|
|
||||||
// uses see below
|
|
||||||
// len - for memory (ZIP_MEMORY) should be the buffer size;
|
|
||||||
// for other uses, should be 0
|
|
||||||
// flags - indicates usage, see below; for files, this will be
|
|
||||||
// ZIP_FILENAME
|
|
||||||
//
|
|
||||||
// Returns: HZIP - non-zero if zip archive opened ok, otherwise 0
|
|
||||||
//
|
|
||||||
HZIP OpenZip(void *rd, void *z, unsigned int len, DWORD flags);
|
|
||||||
// OpenZip - opens a zip file and returns a handle with which you can
|
|
||||||
// subsequently examine its contents. You can open a zip file from:
|
|
||||||
// from a pipe: OpenZip(hpipe_read,0, ZIP_HANDLE);
|
|
||||||
// from a file (by handle): OpenZip(hfile,0, ZIP_HANDLE);
|
|
||||||
// from a file (by name): OpenZip("c:\\test.zip",0, ZIP_FILENAME);
|
|
||||||
// from a memory block: OpenZip(bufstart, buflen, ZIP_MEMORY);
|
|
||||||
// If the file is opened through a pipe, then items may only be
|
|
||||||
// accessed in increasing order, and an item may only be unzipped once,
|
|
||||||
// although GetZipItem can be called immediately before and after unzipping
|
|
||||||
// it. If it's opened i n any other way, then full random access is possible.
|
|
||||||
// Note: pipe input is not yet implemented.
|
|
||||||
|
|
||||||
|
|
||||||
///////////////////////////////////////////////////////////////////////////////
|
|
||||||
//
|
|
||||||
// GetZipItem()
|
|
||||||
//
|
|
||||||
// Purpose: Get information about an item in an open zip archive
|
|
||||||
//
|
|
||||||
// Parameters: hz - handle of open zip archive
|
|
||||||
// index - index number (0 based) of item in zip
|
|
||||||
// ze - pointer to a ZIPENTRY (if ANSI) or ZIPENTRYW struct
|
|
||||||
// (if Unicode)
|
|
||||||
//
|
|
||||||
// Returns: ZRESULT - ZR_OK if success, otherwise some other value
|
|
||||||
//
|
|
||||||
|
|
||||||
#ifdef _UNICODE
|
|
||||||
#define GetZipItem GetZipItemW
|
|
||||||
#else
|
|
||||||
#define GetZipItem GetZipItemA
|
|
||||||
#endif
|
|
||||||
|
|
||||||
ZRESULT GetZipItemA(HZIP hz, int index, ZIPENTRY *ze);
|
|
||||||
ZRESULT GetZipItemW(HZIP hz, int index, ZIPENTRYW *ze);
|
|
||||||
// GetZipItem - call this to get information about an item in the zip.
|
|
||||||
// If index is -1 and the file wasn't opened through a pipe,
|
|
||||||
// then it returns information about the whole zipfile
|
|
||||||
// (and in particular ze.index returns the number of index items).
|
|
||||||
// Note: the item might be a directory (ze.attr & FILE_ATTRIBUTE_DIRECTORY)
|
|
||||||
// See below for notes on what happens when you unzip such an item.
|
|
||||||
// Note: if you are opening the zip through a pipe, then random access
|
|
||||||
// is not possible and GetZipItem(-1) fails and you can't discover the number
|
|
||||||
// of items except by calling GetZipItem on each one of them in turn,
|
|
||||||
// starting at 0, until eventually the call fails. Also, in the event that
|
|
||||||
// you are opening through a pipe and the zip was itself created into a pipe,
|
|
||||||
// then then comp_size and sometimes unc_size as well may not be known until
|
|
||||||
// after the item has been unzipped.
|
|
||||||
|
|
||||||
|
|
||||||
///////////////////////////////////////////////////////////////////////////////
|
|
||||||
//
|
|
||||||
// FindZipItem()
|
|
||||||
//
|
|
||||||
// Purpose: Find item by name and return information about it
|
|
||||||
//
|
|
||||||
// Parameters: hz - handle of open zip archive
|
|
||||||
// name - name of file to look for inside zip archive
|
|
||||||
// ic - TRUE = case insensitive
|
|
||||||
// index - pointer to index number returned, or -1
|
|
||||||
// ze - pointer to a ZIPENTRY (if ANSI) or ZIPENTRYW struct
|
|
||||||
// (if Unicode)
|
|
||||||
//
|
|
||||||
// Returns: ZRESULT - ZR_OK if success, otherwise some other value
|
|
||||||
//
|
|
||||||
|
|
||||||
#ifdef _UNICODE
|
|
||||||
#define FindZipItem FindZipItemW
|
|
||||||
#else
|
|
||||||
#define FindZipItem FindZipItemA
|
|
||||||
#endif
|
|
||||||
|
|
||||||
ZRESULT FindZipItemA(HZIP hz, const TCHAR *name, bool ic, int *index, ZIPENTRY *ze);
|
|
||||||
ZRESULT FindZipItemW(HZIP hz, const TCHAR *name, bool ic, int *index, ZIPENTRYW *ze);
|
|
||||||
// FindZipItem - finds an item by name. ic means 'insensitive to case'.
|
|
||||||
// It returns the index of the item, and returns information about it.
|
|
||||||
// If nothing was found, then index is set to -1 and the function returns
|
|
||||||
// an error code.
|
|
||||||
|
|
||||||
|
|
||||||
///////////////////////////////////////////////////////////////////////////////
|
|
||||||
//
|
|
||||||
// UnzipItem()
|
|
||||||
//
|
|
||||||
// Purpose: Find item by index and unzip it
|
|
||||||
//
|
|
||||||
// Parameters: hz - handle of open zip archive
|
|
||||||
// index - index number of file to unzip
|
|
||||||
// dst - target file name of unzipped file
|
|
||||||
// len - for memory (ZIP_MEMORY. length of buffer;
|
|
||||||
// otherwise 0
|
|
||||||
// flags - indicates usage, see below; for files, this will be
|
|
||||||
// ZIP_FILENAME
|
|
||||||
//
|
|
||||||
// Returns: ZRESULT - ZR_OK if success, otherwise some other value
|
|
||||||
//
|
|
||||||
|
|
||||||
ZRESULT UnzipItem(HZIP hz, int index, void *dst, unsigned int len, DWORD flags);
|
|
||||||
// UnzipItem - given an index to an item, unzips it. You can unzip to:
|
|
||||||
// to a pipe: UnzipItem(hz,i, hpipe_write,0,ZIP_HANDLE);
|
|
||||||
// to a file (by handle): UnzipItem(hz,i, hfile,0,ZIP_HANDLE);
|
|
||||||
// to a file (by name): UnzipItem(hz,i, ze.name,0,ZIP_FILENAME);
|
|
||||||
// to a memory block: UnzipItem(hz,i, buf,buflen,ZIP_MEMORY);
|
|
||||||
// In the final case, if the buffer isn't large enough to hold it all,
|
|
||||||
// then the return code indicates that more is yet to come. If it was
|
|
||||||
// large enough, and you want to know precisely how big, GetZipItem.
|
|
||||||
// Note: zip files are normally stored with relative pathnames. If you
|
|
||||||
// unzip with ZIP_FILENAME a relative pathname then the item gets created
|
|
||||||
// relative to the current directory - it first ensures that all necessary
|
|
||||||
// subdirectories have been created. Also, the item may itself be a directory.
|
|
||||||
// If you unzip a directory with ZIP_FILENAME, then the directory gets created.
|
|
||||||
// If you unzip it to a handle or a memory block, then nothing gets created
|
|
||||||
// and it emits 0 bytes.
|
|
||||||
|
|
||||||
|
|
||||||
///////////////////////////////////////////////////////////////////////////////
|
|
||||||
//
|
|
||||||
// CloseZip()
|
|
||||||
//
|
|
||||||
// Purpose: Close an open zip archive
|
|
||||||
//
|
|
||||||
// Parameters: hz - handle to an open zip archive
|
|
||||||
//
|
|
||||||
// Returns: ZRESULT - ZR_OK if success, otherwise some other value
|
|
||||||
//
|
|
||||||
ZRESULT CloseZip(HZIP hz);
|
|
||||||
// CloseZip - the zip handle must be closed with this function.
|
|
||||||
|
|
||||||
unsigned int FormatZipMessage(ZRESULT code, char *buf,unsigned int len);
|
|
||||||
// FormatZipMessage - given an error code, formats it as a string.
|
|
||||||
// It returns the length of the error message. If buf/len points
|
|
||||||
// to a real buffer, then it also writes as much as possible into there.
|
|
||||||
|
|
||||||
|
|
||||||
// These are the result codes:
|
|
||||||
#define ZR_OK 0x00000000 // nb. the pseudo-code zr-recent is never returned,
|
|
||||||
#define ZR_RECENT 0x00000001 // but can be passed to FormatZipMessage.
|
|
||||||
// The following come from general system stuff (e.g. files not openable)
|
|
||||||
#define ZR_GENMASK 0x0000FF00
|
|
||||||
#define ZR_NODUPH 0x00000100 // couldn't duplicate the handle
|
|
||||||
#define ZR_NOFILE 0x00000200 // couldn't create/open the file
|
|
||||||
#define ZR_NOALLOC 0x00000300 // failed to allocate some resource
|
|
||||||
#define ZR_WRITE 0x00000400 // a general error writing to the file
|
|
||||||
#define ZR_NOTFOUND 0x00000500 // couldn't find that file in the zip
|
|
||||||
#define ZR_MORE 0x00000600 // there's still more data to be unzipped
|
|
||||||
#define ZR_CORRUPT 0x00000700 // the zipfile is corrupt or not a zipfile
|
|
||||||
#define ZR_READ 0x00000800 // a general error reading the file
|
|
||||||
// The following come from mistakes on the part of the caller
|
|
||||||
#define ZR_CALLERMASK 0x00FF0000
|
|
||||||
#define ZR_ARGS 0x00010000 // general mistake with the arguments
|
|
||||||
#define ZR_NOTMMAP 0x00020000 // tried to ZipGetMemory, but that only works on mmap zipfiles, which yours wasn't
|
|
||||||
#define ZR_MEMSIZE 0x00030000 // the memory size is too small
|
|
||||||
#define ZR_FAILED 0x00040000 // the thing was already failed when you called this function
|
|
||||||
#define ZR_ENDED 0x00050000 // the zip creation has already been closed
|
|
||||||
#define ZR_MISSIZE 0x00060000 // the indicated input file size turned out mistaken
|
|
||||||
#define ZR_PARTIALUNZ 0x00070000 // the file had already been partially unzipped
|
|
||||||
#define ZR_ZMODE 0x00080000 // tried to mix creating/opening a zip
|
|
||||||
// The following come from bugs within the zip library itself
|
|
||||||
#define ZR_BUGMASK 0xFF000000
|
|
||||||
#define ZR_NOTINITED 0x01000000 // initialisation didn't work
|
|
||||||
#define ZR_SEEK 0x02000000 // trying to seek in an unseekable file
|
|
||||||
#define ZR_NOCHANGE 0x04000000 // changed its mind on storage, but not allowed
|
|
||||||
#define ZR_FLATE 0x05000000 // an internal error in the de/inflation code
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// e.g.
|
|
||||||
//
|
|
||||||
// SetCurrentDirectory("c:\\docs\\stuff");
|
|
||||||
// HZIP hz = OpenZip("c:\\stuff.zip",0,ZIP_FILENAME);
|
|
||||||
// ZIPENTRY ze; GetZipItem(hz,-1,&ze); int numitems=ze.index;
|
|
||||||
// for (int i=0; i<numitems; i++)
|
|
||||||
// { GetZipItem(hz,i,&ze);
|
|
||||||
// UnzipItem(hz,i,ze.name,0,ZIP_FILENAME);
|
|
||||||
// }
|
|
||||||
// CloseZip(hz);
|
|
||||||
//
|
|
||||||
//
|
|
||||||
// HRSRC hrsrc = FindResource(hInstance,MAKEINTRESOURCE(1),RT_RCDATA);
|
|
||||||
// HANDLE hglob = LoadResource(hInstance,hrsrc);
|
|
||||||
// void *zipbuf=LockResource(hglob);
|
|
||||||
// unsigned int ziplen=SizeofResource(hInstance,hrsrc);
|
|
||||||
// HZIP hz = OpenZip(zipbuf, ziplen, ZIP_MEMORY);
|
|
||||||
// - unzip to a membuffer -
|
|
||||||
// ZIPENTRY ze; int i; FindZipItem(hz,"file.dat",&i,&ze);
|
|
||||||
// char *ibuf = new char[ze.unc_size];
|
|
||||||
// UnzipItem(hz,i, ibuf, ze.unc_size,ZIP_MEMORY);
|
|
||||||
// delete[] buf;
|
|
||||||
// - unzip to a fixed membuff -
|
|
||||||
// ZIPENTRY ze; int i; FindZipItem(hz,"file.dat",&i,&ze);
|
|
||||||
// char ibuf[1024]; ZIPRESULT zr=ZR_MORE; unsigned long totsize=0;
|
|
||||||
// while (zr==ZR_MORE)
|
|
||||||
// { zr = UnzipItem(hz,i, ibuf,1024,ZIP_MEMORY);
|
|
||||||
// unsigned long bufsize=1024; if (zr==ZR_OK) bufsize=ze.unc_size-totsize;
|
|
||||||
// totsize+=bufsize;
|
|
||||||
// }
|
|
||||||
// - unzip to a pipe -
|
|
||||||
// HANDLE hthread=CreateWavReaderThread(&hread,&hwrite);
|
|
||||||
// FindZipItem(hz,"sound.wav",&i,&ze);
|
|
||||||
// UnzipItem(hz,i, hwrite,0,ZIP_HANDLE);
|
|
||||||
// CloseHandle(hwrite);
|
|
||||||
// WaitForSingleObject(hthread,INFINITE);
|
|
||||||
// CloseHandle(hread); CloseHandle(hthread);
|
|
||||||
// - finished -
|
|
||||||
// CloseZip(hz);
|
|
||||||
// // note: no need to free resources obtained through Find/Load/LockResource
|
|
||||||
//
|
|
||||||
//
|
|
||||||
// SetCurrentDirectory("c:\\docs\\pipedzipstuff");
|
|
||||||
// HANDLE hread,hwrite; CreatePipe(&hread,&hwrite);
|
|
||||||
// CreateZipWriterThread(hwrite);
|
|
||||||
// HZIP hz = OpenZip(hread,0,ZIP_HANDLE);
|
|
||||||
// for (int i=0; ; i++)
|
|
||||||
// { ZIPENTRY ze; ZRESULT res = GetZipItem(hz,i,&ze);
|
|
||||||
// if (res!=ZE_OK) break; // no more
|
|
||||||
// UnzipItem(hz,i, ze.name,0,ZIP_FILENAME);
|
|
||||||
// }
|
|
||||||
// CloseZip(hz);
|
|
||||||
//
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// Now we indulge in a little skullduggery so that the code works whether
|
|
||||||
// the user has included just zip or both zip and unzip.
|
|
||||||
// Idea: if header files for both zip and unzip are present, then presumably
|
|
||||||
// the cpp files for zip and unzip are both present, so we will call
|
|
||||||
// one or the other of them based on a dynamic choice. If the header file
|
|
||||||
// for only one is present, then we will bind to that particular one.
|
|
||||||
HZIP OpenZipU(void *rd, void *z,unsigned int len,DWORD flags);
|
|
||||||
ZRESULT CloseZipU(HZIP hz);
|
|
||||||
unsigned int FormatZipMessageU(ZRESULT code, char *buf,unsigned int len);
|
|
||||||
bool IsZipHandleU(HZIP hz);
|
|
||||||
#define OpenZip OpenZipU
|
|
||||||
|
|
||||||
#ifdef XZIP_H
|
|
||||||
#undef CloseZip
|
|
||||||
#define CloseZip(hz) (IsZipHandleU(hz)?CloseZipU(hz):CloseZipZ(hz))
|
|
||||||
#else
|
|
||||||
#define CloseZip CloseZipU
|
|
||||||
#define FormatZipMessage FormatZipMessageU
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
#endif //XUNZIP_H
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
#pragma once
|
|
||||||
|
|
||||||
// Including SDKDDKVer.h defines the highest available Windows platform.
|
|
||||||
|
|
||||||
// If you wish to build your application for a previous Windows platform, include WinSDKVer.h and
|
|
||||||
// set the _WIN32_WINNT macro to the platform you wish to support before including SDKDDKVer.h.
|
|
||||||
|
|
||||||
#include <SDKDDKVer.h>
|
|
||||||
@@ -5,8 +5,6 @@ VisualStudioVersion = 12.0.21005.1
|
|||||||
MinimumVisualStudioVersion = 10.0.40219.1
|
MinimumVisualStudioVersion = 10.0.40219.1
|
||||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ModSecurityIIS", "ModSecurityIIS.vcxproj", "{D1F7201F-064B-48AB-868C-FED22464841C}"
|
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ModSecurityIIS", "ModSecurityIIS.vcxproj", "{D1F7201F-064B-48AB-868C-FED22464841C}"
|
||||||
EndProject
|
EndProject
|
||||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "InstallerHelper", "InstallerHelper\InstallerHelper.vcxproj", "{990BB195-6716-4DE3-B5E4-DCFCB1BD7D9C}"
|
|
||||||
EndProject
|
|
||||||
Global
|
Global
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
Debug|Mixed Platforms = Debug|Mixed Platforms
|
Debug|Mixed Platforms = Debug|Mixed Platforms
|
||||||
@@ -34,20 +32,6 @@ Global
|
|||||||
{D1F7201F-064B-48AB-868C-FED22464841C}.Release|x64.Build.0 = Release|x64
|
{D1F7201F-064B-48AB-868C-FED22464841C}.Release|x64.Build.0 = Release|x64
|
||||||
{D1F7201F-064B-48AB-868C-FED22464841C}.Release|x86.ActiveCfg = Release|Win32
|
{D1F7201F-064B-48AB-868C-FED22464841C}.Release|x86.ActiveCfg = Release|Win32
|
||||||
{D1F7201F-064B-48AB-868C-FED22464841C}.Release|x86.Build.0 = Release|Win32
|
{D1F7201F-064B-48AB-868C-FED22464841C}.Release|x86.Build.0 = Release|Win32
|
||||||
{990BB195-6716-4DE3-B5E4-DCFCB1BD7D9C}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
|
|
||||||
{990BB195-6716-4DE3-B5E4-DCFCB1BD7D9C}.Debug|Mixed Platforms.Build.0 = Debug|Win32
|
|
||||||
{990BB195-6716-4DE3-B5E4-DCFCB1BD7D9C}.Debug|Win32.ActiveCfg = Debug|Win32
|
|
||||||
{990BB195-6716-4DE3-B5E4-DCFCB1BD7D9C}.Debug|Win32.Build.0 = Debug|Win32
|
|
||||||
{990BB195-6716-4DE3-B5E4-DCFCB1BD7D9C}.Debug|x64.ActiveCfg = Debug|Win32
|
|
||||||
{990BB195-6716-4DE3-B5E4-DCFCB1BD7D9C}.Debug|x86.ActiveCfg = Debug|Win32
|
|
||||||
{990BB195-6716-4DE3-B5E4-DCFCB1BD7D9C}.Debug|x86.Build.0 = Debug|Win32
|
|
||||||
{990BB195-6716-4DE3-B5E4-DCFCB1BD7D9C}.Release|Mixed Platforms.ActiveCfg = Release|Win32
|
|
||||||
{990BB195-6716-4DE3-B5E4-DCFCB1BD7D9C}.Release|Mixed Platforms.Build.0 = Release|Win32
|
|
||||||
{990BB195-6716-4DE3-B5E4-DCFCB1BD7D9C}.Release|Win32.ActiveCfg = Release|Win32
|
|
||||||
{990BB195-6716-4DE3-B5E4-DCFCB1BD7D9C}.Release|Win32.Build.0 = Release|Win32
|
|
||||||
{990BB195-6716-4DE3-B5E4-DCFCB1BD7D9C}.Release|x64.ActiveCfg = Release|Win32
|
|
||||||
{990BB195-6716-4DE3-B5E4-DCFCB1BD7D9C}.Release|x86.ActiveCfg = Release|Win32
|
|
||||||
{990BB195-6716-4DE3-B5E4-DCFCB1BD7D9C}.Release|x86.Build.0 = Release|Win32
|
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(SolutionProperties) = preSolution
|
GlobalSection(SolutionProperties) = preSolution
|
||||||
HideSolutionNode = FALSE
|
HideSolutionNode = FALSE
|
||||||
|
|||||||
@@ -113,8 +113,9 @@
|
|||||||
<Link>
|
<Link>
|
||||||
<ModuleDefinitionFile>mymodule.def</ModuleDefinitionFile>
|
<ModuleDefinitionFile>mymodule.def</ModuleDefinitionFile>
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;%(AdditionalDependencies);libapr-1.lib;libaprutil-1.lib;pcre.lib;libxml2.lib</AdditionalDependencies>
|
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;%(AdditionalDependencies);dependencies\build_dir\apache24\lib\libapr-1.lib;dependencies\build_dir\apache24\lib\libaprutil-1.lib;dependencies\build_dir\pcre\pcre.lib;dependencies\build_dir\libxml2\win32\bin.msvc\libxml2.lib</AdditionalDependencies>
|
||||||
<AdditionalLibraryDirectories>c:\drop\amd64</AdditionalLibraryDirectories>
|
<AdditionalLibraryDirectories>C:\core__\ModSecurity\iis\release\x64</AdditionalLibraryDirectories>
|
||||||
|
<AdditionalOptions> /LIBPATH:"C:\core__\ModSecurity\iis\release\x64" %(AdditionalOptions)</AdditionalOptions>
|
||||||
</Link>
|
</Link>
|
||||||
<PostBuildEvent>
|
<PostBuildEvent>
|
||||||
<Command>
|
<Command>
|
||||||
@@ -129,7 +130,7 @@
|
|||||||
</ClCompile>
|
</ClCompile>
|
||||||
<Link>
|
<Link>
|
||||||
<ModuleDefinitionFile>mymodule.def</ModuleDefinitionFile>
|
<ModuleDefinitionFile>mymodule.def</ModuleDefinitionFile>
|
||||||
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;%(AdditionalDependencies);dependencies\build_dir\pcre\pcre.lib;dependencies\build_dir\libxml2\win32\bin.msvc\libxml2.lib</AdditionalDependencies>
|
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;%(AdditionalDependencies);dependencies\build_dir\apache24\lib\libapr-1.lib;dependencies\build_dir\apache24\lib\libaprutil-1.lib;dependencies\build_dir\pcre\pcre.lib;dependencies\build_dir\libxml2\win32\bin.msvc\libxml2.lib</AdditionalDependencies>
|
||||||
</Link>
|
</Link>
|
||||||
<PostBuildEvent>
|
<PostBuildEvent>
|
||||||
<Command>
|
<Command>
|
||||||
@@ -140,13 +141,14 @@
|
|||||||
<ClCompile>
|
<ClCompile>
|
||||||
<PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);WIN32;WINNT;inline=APR_INLINE;AP_DECLARE_STATIC</PreprocessorDefinitions>
|
<PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);WIN32;WINNT;inline=APR_INLINE;AP_DECLARE_STATIC</PreprocessorDefinitions>
|
||||||
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
||||||
<AdditionalIncludeDirectories>dependencies\build_dir\pcre\include;dependencies\build_dir\pcre;dependencies\build_dir\libxml2\include;..\apache2;..\standalone</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>dependencies\build_dir\pcre\include;dependencies\build_dir\pcre;dependencies\build_dir\libxml2\include;..\apache2;..\standalone;dependencies\build_dir\apache24\include</AdditionalIncludeDirectories>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<Link>
|
<Link>
|
||||||
<ModuleDefinitionFile>mymodule.def</ModuleDefinitionFile>
|
<ModuleDefinitionFile>mymodule.def</ModuleDefinitionFile>
|
||||||
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;%(AdditionalDependencies);libapr-1.lib;libaprutil-1.lib;pcre.lib;libxml2.lib</AdditionalDependencies>
|
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;%(AdditionalDependencies);dependencies\build_dir\apache24\lib\libapr-1.lib;dependencies\build_dir\apache24\lib\libaprutil-1.lib;dependencies\build_dir\pcre\pcre.lib;dependencies\build_dir\libxml2\win32\bin.msvc\libxml2.lib</AdditionalDependencies>
|
||||||
<AdditionalLibraryDirectories>c:\drop\amd64</AdditionalLibraryDirectories>
|
<AdditionalLibraryDirectories>
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
</AdditionalLibraryDirectories>
|
||||||
|
<GenerateDebugInformation>false</GenerateDebugInformation>
|
||||||
</Link>
|
</Link>
|
||||||
<PostBuildEvent>
|
<PostBuildEvent>
|
||||||
<Command>
|
<Command>
|
||||||
|
|||||||
@@ -1,14 +1,20 @@
|
|||||||
|
|
||||||
set WIX=C:\Program Files (x86)\WixEdit\wix-3.0.5419.0\
|
set WIX=C:\Program Files (x86)\WiX Toolset v3.7\bin
|
||||||
set CURRENT_DIR=%cd%
|
set CURRENT_DIR=%cd%
|
||||||
|
|
||||||
del installer.wix*
|
del installer.wix*
|
||||||
|
|
||||||
"%WIX%\candle.exe" -ext WixUtilExtension -ext WixUIExtension "%CURRENT_DIR%\installer.wxs" -out "%CURRENT_DIR%\installer.wixobj"
|
"%WIX%\candle.exe" -ext WixUtilExtension -ext WixUIExtension "%CURRENT_DIR%\installer.wxs" -out "%CURRENT_DIR%\installer.wixobj" -dPlatform="x64"
|
||||||
|
@if NOT (%ERRORLEVEL%) == (0) goto build_failed
|
||||||
|
|
||||||
"%WIX%\light.exe" -ext WixUtilExtension -ext WixUIExtension "%CURRENT_DIR%\installer.wixobj" -out "%CURRENT_DIR%\installer.msi"
|
"%WIX%\light.exe" -ext WixUtilExtension -ext WixUIExtension "%CURRENT_DIR%\installer.wixobj" -out "%CURRENT_DIR%\installer-64.msi" -dPlatform="x64"
|
||||||
|
@if NOT (%ERRORLEVEL%) == (0) goto build_failed
|
||||||
|
|
||||||
|
"%WIX%\candle.exe" -ext WixUtilExtension -ext WixUIExtension "%CURRENT_DIR%\installer.wxs" -out "%CURRENT_DIR%\installer.wixobj" -dPlatform="x86"
|
||||||
|
@if NOT (%ERRORLEVEL%) == (0) goto build_failed
|
||||||
|
|
||||||
|
"%WIX%\light.exe" -ext WixUtilExtension -ext WixUIExtension "%CURRENT_DIR%\installer.wixobj" -out "%CURRENT_DIR%\installer-32.msi" -dPlatform="x86"
|
||||||
|
@if NOT (%ERRORLEVEL%) == (0) goto build_failed
|
||||||
|
|
||||||
exit /B 0
|
exit /B 0
|
||||||
|
|
||||||
|
|||||||
1072
iis/installer.wxs
1072
iis/installer.wxs
File diff suppressed because it is too large
Load Diff
21
iis/wix/README.TXT
Normal file
21
iis/wix/README.TXT
Normal file
@@ -0,0 +1,21 @@
|
|||||||
|
Please note that installing ModSecurity for IIS requires IIS to be installed and enabled.
|
||||||
|
|
||||||
|
|
||||||
|
After installing ModSecurity for IIS, the module will be running in all websites by default. To remove from a website add to web.config:
|
||||||
|
|
||||||
|
<modules>
|
||||||
|
<remove name="ModSecurityIIS" />
|
||||||
|
</modules>
|
||||||
|
|
||||||
|
To configure module in a website add to web.config:
|
||||||
|
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<configuration>
|
||||||
|
<system.webServer>
|
||||||
|
<ModSecurity enabled="true" configFile="c:\inetpub\wwwroot\xss.conf" />
|
||||||
|
</system.webServer>
|
||||||
|
</configuration>
|
||||||
|
|
||||||
|
where configFile is standard ModSecurity config file.
|
||||||
|
|
||||||
|
Events from the module will show up in "Application" Windows log.
|
||||||
Reference in New Issue
Block a user