diff options
Diffstat (limited to 'win32')
23 files changed, 205 insertions, 1189 deletions
diff --git a/win32/config.h.tt b/win32/config.h.tt index 77da3b38..ad518964 100644 --- a/win32/config.h.tt +++ b/win32/config.h.tt @@ -2,7 +2,6 @@ #define ENABLE_NLS #define USE_PLUGIN #define USE_OPENSSL -#define USE_IPV6 #define HAVE_ISO_CODES #define ISO_CODES_PREFIX ".\\" #define ISO_CODES_LOCALEDIR LOCALEDIR @@ -13,6 +12,3 @@ #define OLD_PERL #define GETTEXT_PACKAGE "hexchat" #define PACKAGE_TARNAME "hexchat-<#= [string]::Join('.', $versionParts) #>" -#ifndef USE_IPV6 -#define socklen_t int -#endif diff --git a/win32/copy/copy.vcxproj b/win32/copy/copy.vcxproj index d0c1150b..557ca702 100644 --- a/win32/copy/copy.vcxproj +++ b/win32/copy/copy.vcxproj @@ -2,6 +2,7 @@ <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup Label="Configuration"> <PlatformToolset>v120</PlatformToolset> + <ConfigurationType>Application</ConfigurationType> </PropertyGroup> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Release|Win32"> @@ -18,73 +19,65 @@ <RootNamespace>copy</RootNamespace> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>MultiByte</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>MultiByte</CharacterSet> - </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <ImportGroup Label="ExtensionSettings"> - </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" /> - <Import Project="..\hexchat.props" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\hexchat.props" /> - </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <OutDir>$(HexChatBin)</OutDir> - <IntDir>$(HexChatObj)$(ProjectName)\</IntDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <OutDir>$(HexChatBin)</OutDir> - <IntDir>$(HexChatObj)$(ProjectName)\</IntDir> - </PropertyGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <ClCompile> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - </ClCompile> - <Link> - <GenerateDebugInformation>true</GenerateDebugInformation> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - </Link> - <PreBuildEvent> - <Command>$(HexChatCopy)</Command> - </PreBuildEvent> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <ClCompile> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - </ClCompile> - <Link> - <GenerateDebugInformation>true</GenerateDebugInformation> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - </Link> - <PreBuildEvent> - <Command>$(HexChatCopy)</Command> - </PreBuildEvent> - </ItemDefinitionGroup> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="..\hexchat.props" /> <ItemGroup> + <None Include="$(DepsRoot)\bin\cert.pem" /> + <None Include="$(DepsRoot)\bin\atk-1.0.dll" /> + <None Include="$(DepsRoot)\bin\cairo.dll" /> + <None Include="$(DepsRoot)\bin\fontconfig.dll" /> + <None Include="$(DepsRoot)\bin\gdk_pixbuf-2.0.dll" /> + <None Include="$(DepsRoot)\bin\gdk-win32-2.0.dll" /> + <None Include="$(DepsRoot)\bin\gio-2.0.dll" /> + <None Include="$(DepsRoot)\bin\glib-2.0.dll" /> + <None Include="$(DepsRoot)\bin\gmodule-2.0.dll" /> + <None Include="$(DepsRoot)\bin\gobject-2.0.dll" /> + <None Include="$(DepsRoot)\bin\gspawn-win$(PlatformArchitecture)-helper.exe" /> + <None Include="$(DepsRoot)\bin\gspawn-win$(PlatformArchitecture)-helper-console.exe" /> + <None Include="$(DepsRoot)\bin\gthread-2.0.dll" /> + <None Include="$(DepsRoot)\bin\gtk-win32-2.0.dll" /> + <None Include="$(DepsRoot)\bin\harfbuzz.dll" /> + <None Include="$(DepsRoot)\bin\iconv.dll" /> + <None Include="$(DepsRoot)\bin\libeay32.dll" /> + <None Include="$(DepsRoot)\bin\libenchant.dll" /> + <None Include="$(DepsRoot)\bin\libintl.dll" /> + <None Include="$(DepsRoot)\bin\libpng16.dll" /> + <None Include="$(DepsRoot)\bin\libxml2.dll" /> + <None Include="$(DepsRoot)\bin\pango-1.0.dll" /> + <None Include="$(DepsRoot)\bin\pangocairo-1.0.dll" /> + <None Include="$(DepsRoot)\bin\pangoft2-1.0.dll" /> + <None Include="$(DepsRoot)\bin\pangowin32-1.0.dll" /> + <None Include="$(DepsRoot)\bin\pixman-1.dll" /> + <None Include="$(DepsRoot)\bin\ssleay32.dll" /> + <None Include="$(DepsRoot)\bin\zlib1.dll" /> + <None Include="$(WinSparklePath)\WinSparkle.dll" /> + <None Include="$(HexChatBin)thememan.exe" /> <None Include="changelog.url" /> <None Include="readme.url" /> - <None Include="share\xml\iso-codes\iso_3166.xml" /> - <None Include="share\xml\iso-codes\iso_639.xml" /> + + <Engines Include="$(DepsRoot)\lib\gtk-2.0\i686-pc-vs10\engines\**\*" /> + + <Share Include="share\**\*" /> + + <DepsRootDocs Include="$(DepsRoot)\share\doc\**\*" /> + + <Locale Include="$(HexChatBin)locale\**\*;$(DepsRoot)\share\locale\**\*" /> + + <MSWindowsTheme Include="$(DepsRoot)\share\themes\MS-Windows\**\*" /> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets"> - </ImportGroup> -</Project> \ No newline at end of file + <Target Name="Build"> + <Copy SourceFiles="@(None)" DestinationFolder="$(HexChatRel)" /> + <Copy SourceFiles="@(Engines)" DestinationFiles="@(Engines->'$(HexChatRel)\lib\gtk-2.0\i686-pc-vs10\engines\%(RecursiveDir)%(Filename)%(Extension)')" /> + <Copy SourceFiles="@(Share)" DestinationFiles="@(Share->'$(HexChatRel)\share\%(RecursiveDir)%(Filename)%(Extension)')" /> + <Copy SourceFiles="@(DepsRootDocs)" DestinationFiles="@(DepsRootDocs->'$(HexChatRel)\share\doc\%(RecursiveDir)%(Filename)%(Extension)')" /> + <Copy SourceFiles="..\..\COPYING" DestinationFolder="$(HexChatRel)\share\doc\hexchat" /> + <Copy SourceFiles="$(WinSparklePath)\COPYING" DestinationFolder="$(HexChatRel)\share\doc\WinSparkle" /> + <Copy SourceFiles="$(DepsRoot)\lib\enchant\libenchant_myspell.dll" DestinationFolder="$(HexChatRel)\lib\enchant" /> + <Copy SourceFiles="@(Locale)" DestinationFiles="@(Locale->'$(HexChatRel)\share\locale\%(RecursiveDir)%(Filename)%(Extension)')" /> + <Copy SourceFiles="@(MSWindowsTheme)" DestinationFiles="@(MSWindowsTheme->'$(HexChatRel)\share\themes\MS-Windows\%(RecursiveDir)%(Filename)%(Extension)')" /> + + <WriteLinesToFile File="$(HexChatRel)portable-mode" Lines="2" Overwrite="true" /> + </Target> +</Project> diff --git a/win32/copy/copy.vcxproj.filters b/win32/copy/copy.vcxproj.filters index af2be024..695b5c78 100644 --- a/win32/copy/copy.vcxproj.filters +++ b/win32/copy/copy.vcxproj.filters @@ -1,52 +1,3 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup> - <Filter Include="Resource Files"> - <UniqueIdentifier>{e02a8c67-767c-4c6e-a854-81fae08cf4da}</UniqueIdentifier> - </Filter> - <Filter Include="Resource Files\etc"> - <UniqueIdentifier>{503881c0-011d-443b-a373-4bfe125dcfa6}</UniqueIdentifier> - </Filter> - <Filter Include="Resource Files\share"> - <UniqueIdentifier>{4316433a-2a8e-48f7-9020-e1f4de0d23d1}</UniqueIdentifier> - </Filter> - <Filter Include="Resource Files\etc\gtk-2.0"> - <UniqueIdentifier>{832ebebc-ab71-4bf6-9f3a-02ec748f7c14}</UniqueIdentifier> - </Filter> - <Filter Include="Resource Files\share\xml"> - <UniqueIdentifier>{9a881586-aed2-4f80-ba84-e521e6785566}</UniqueIdentifier> - </Filter> - <Filter Include="Resource Files\share\xml\iso-codes"> - <UniqueIdentifier>{c825f724-0618-4160-97b7-12d6e0f2bc7b}</UniqueIdentifier> - </Filter> - </ItemGroup> - <ItemGroup> - <None Include="etc\download.png"> - <Filter>Resource Files\etc</Filter> - </None> - <None Include="etc\gtkpref.png"> - <Filter>Resource Files\etc</Filter> - </None> - <None Include="etc\music.png"> - <Filter>Resource Files\etc</Filter> - </None> - <None Include="etc\system.png"> - <Filter>Resource Files\etc</Filter> - </None> - <None Include="etc\gtk-2.0\gtkrc"> - <Filter>Resource Files\etc\gtk-2.0</Filter> - </None> - <None Include="share\xml\iso-codes\iso_639.xml"> - <Filter>Resource Files\share\xml\iso-codes</Filter> - </None> - <None Include="share\xml\iso-codes\iso_3166.xml"> - <Filter>Resource Files\share\xml\iso-codes</Filter> - </None> - <None Include="readme.url"> - <Filter>Resource Files</Filter> - </None> - <None Include="changelog.url"> - <Filter>Resource Files</Filter> - </None> - </ItemGroup> </Project> \ No newline at end of file diff --git a/win32/ext/nss-wdk/build-x64.bat b/win32/ext/nss-wdk/build-x64.bat deleted file mode 100644 index 96bb0422..00000000 --- a/win32/ext/nss-wdk/build-x64.bat +++ /dev/null @@ -1,13 +0,0 @@ -@echo off -set WDK_ROOT=c:\WinDDK\7600.16385.1 -set INCLUDE=%WDK_ROOT%\inc\api;%WDK_ROOT%\inc\crt;%WDK_ROOT%\inc\ddk -set LIB=%WDK_ROOT%\lib\wnet\amd64;%WDK_ROOT%\lib\Crt\amd64 -set PATH=%PROGRAMFILES(X86)%\Microsoft Visual Studio 10.0\VC\bin\amd64;%PROGRAMFILES(X86)%\Microsoft SDKs\Windows\v7.0A\Bin\x64;c:\mozilla-build\msys\bin;c:\mozilla-build\moztools-x64\bin -set BUILD_OPT=1 -set USE_64=1 -set WINDDK_BUILD=1 -cd mozilla\security\nss -make nss_build_all -cd ..\..\.. -echo.Finished! -pause diff --git a/win32/ext/nss-wdk/build-x86.bat b/win32/ext/nss-wdk/build-x86.bat deleted file mode 100644 index c6d4868e..00000000 --- a/win32/ext/nss-wdk/build-x86.bat +++ /dev/null @@ -1,13 +0,0 @@ -@echo off -set WDK_ROOT=c:\WinDDK\7600.16385.1 -set INCLUDE=%WDK_ROOT%\inc\api;%WDK_ROOT%\inc\crt -set LIB=%WDK_ROOT%\lib\wxp\i386;%WDK_ROOT%\lib\Crt\i386 -set PATH=%PROGRAMFILES(X86)%\Microsoft Visual Studio 10.0\VC\bin;%PROGRAMFILES(X86)%\Microsoft Visual Studio 10.0\Common7\IDE;%PROGRAMFILES(X86)%\Microsoft SDKs\Windows\v7.0A\Bin;c:\mozilla-build\msys\bin;c:\mozilla-build\moztools\bin -set BUILD_OPT=1 -set USE_64= -set WINDDK_BUILD=1 -cd mozilla\security\nss -make nss_build_all -cd ..\..\.. -echo.Finished! -pause diff --git a/win32/ext/nss-wdk/nss-wdk.patch b/win32/ext/nss-wdk/nss-wdk.patch deleted file mode 100644 index 7d663491..00000000 --- a/win32/ext/nss-wdk/nss-wdk.patch +++ /dev/null @@ -1,257 +0,0 @@ -diff -ruN --strip-trailing-cr nss-3.13.6.orig/mozilla/dbm/include/mcom_db.h nss-3.13.6/mozilla/dbm/include/mcom_db.h ---- nss-3.13.6.orig/mozilla/dbm/include/mcom_db.h 2009-06-05 01:18:50 +0200 -+++ nss-3.13.6/mozilla/dbm/include/mcom_db.h 2012-10-06 00:54:22 +0200 -@@ -40,6 +40,15 @@ - #define off_t long - #endif - -+#ifdef WINDDK_BUILD -+#ifndef stat -+#define stat _stat -+#endif -+#ifndef getpid -+#define getpid GetCurrentProcessId -+#endif -+#endif -+ - #ifndef macintosh - #include <sys/types.h> - #endif -diff -ruN --strip-trailing-cr nss-3.13.6.orig/mozilla/dbm/src/mktemp.c nss-3.13.6/mozilla/dbm/src/mktemp.c ---- nss-3.13.6.orig/mozilla/dbm/src/mktemp.c 2009-06-05 01:19:31 +0200 -+++ nss-3.13.6/mozilla/dbm/src/mktemp.c 2012-10-06 00:54:22 +0200 -@@ -45,13 +45,13 @@ - #include <ctype.h> - #include "mcom_db.h" - --#ifndef _WINDOWS --#include <unistd.h> --#endif -- - #ifdef _WINDOWS -+#ifndef WINDDK_BUILD - #include <process.h> -+#endif - #include "winfile.h" -+#else -+#include <unistd.h> - #endif - - static int _gettemp(char *path, register int *doopen, int extraFlags); -diff -ruN --strip-trailing-cr nss-3.13.6.orig/mozilla/nsprpub/config/config.mk nss-3.13.6/mozilla/nsprpub/config/config.mk ---- nss-3.13.6.orig/mozilla/nsprpub/config/config.mk 2012-03-06 14:13:38 +0100 -+++ nss-3.13.6/mozilla/nsprpub/config/config.mk 2012-10-06 00:54:22 +0200 -@@ -132,6 +132,15 @@ - DEFINES += -DMOZ_UNICODE - endif - -+ifdef WINDDK_BUILD -+OS_CFLAGS += -DWINDDK_BUILD -+ifdef USE_64 -+OS_LIBS += msvcrt_win2003.obj -+else -+OS_LIBS += msvcrt_winxp.obj -+endif -+endif -+ - #################################################################### - # - # Configuration for the release process -diff -ruN --strip-trailing-cr nss-3.13.6.orig/mozilla/nsprpub/pr/src/Makefile.in nss-3.13.6/mozilla/nsprpub/pr/src/Makefile.in ---- nss-3.13.6.orig/mozilla/nsprpub/pr/src/Makefile.in 2012-03-06 14:13:59 +0100 -+++ nss-3.13.6/mozilla/nsprpub/pr/src/Makefile.in 2012-10-06 00:54:22 +0200 -@@ -170,9 +170,17 @@ - ifdef NS_USE_GCC - OS_LIBS = -ladvapi32 -lwsock32 -lwinmm - else -+ifdef WINDDK_BUILD -+ifdef USE_64 -+OS_LIBS = advapi32.lib wsock32.lib winmm.lib msvcrt_win2003.obj -+else -+OS_LIBS = advapi32.lib wsock32.lib winmm.lib msvcrt_winxp.obj -+endif -+else - OS_LIBS = advapi32.lib wsock32.lib winmm.lib - endif - endif -+endif - - ifeq ($(OS_ARCH),WINCE) - OS_LIBS = ws2.lib -diff -ruN --strip-trailing-cr nss-3.13.6.orig/mozilla/nsprpub/pr/src/md/windows/ntmisc.c nss-3.13.6/mozilla/nsprpub/pr/src/md/windows/ntmisc.c ---- nss-3.13.6.orig/mozilla/nsprpub/pr/src/md/windows/ntmisc.c 2012-03-06 14:14:17 +0100 -+++ nss-3.13.6/mozilla/nsprpub/pr/src/md/windows/ntmisc.c 2012-10-06 00:54:22 +0200 -@@ -593,7 +593,11 @@ - */ - hasFdInheritBuffer = (attr && attr->fdInheritBuffer); - if ((envp == NULL) && hasFdInheritBuffer) { -+#ifdef WINDDK_BUILD -+ envp = getenv; -+#else - envp = environ; -+#endif - } - - if (envp != NULL) { -diff -ruN --strip-trailing-cr nss-3.13.6.orig/mozilla/security/coreconf/WIN32.mk nss-3.13.6/mozilla/security/coreconf/WIN32.mk ---- nss-3.13.6.orig/mozilla/security/coreconf/WIN32.mk 2011-09-14 19:59:43 +0200 -+++ nss-3.13.6/mozilla/security/coreconf/WIN32.mk 2012-10-06 00:54:22 +0200 -@@ -146,6 +146,14 @@ - OS_CFLAGS += -W3 -nologo -D_CRT_SECURE_NO_WARNINGS \ - -D_CRT_NONSTDC_NO_WARNINGS - OS_DLLFLAGS += -nologo -DLL -SUBSYSTEM:WINDOWS -+ ifdef WINDDK_BUILD -+ OS_CFLAGS += -DWINDDK_BUILD -+ ifdef USE_64 -+ OS_LIBS += msvcrt_win2003.obj -+ else -+ OS_LIBS += msvcrt_winxp.obj -+ endif -+ endif - ifeq ($(_MSC_VER),$(_MSC_VER_6)) - ifndef MOZ_DEBUG_SYMBOLS - OS_DLLFLAGS += -PDB:NONE -diff -ruN --strip-trailing-cr nss-3.13.6.orig/mozilla/security/coreconf/arch.mk nss-3.13.6/mozilla/security/coreconf/arch.mk ---- nss-3.13.6.orig/mozilla/security/coreconf/arch.mk 2009-06-05 04:14:49 +0200 -+++ nss-3.13.6/mozilla/security/coreconf/arch.mk 2012-10-06 00:54:22 +0200 -@@ -268,7 +268,15 @@ - # the uname.exe in the MSYS toolkit. - # - ifeq (MINGW32_NT,$(findstring MINGW32_NT,$(OS_ARCH))) -- OS_RELEASE := $(patsubst MINGW32_NT-%,%,$(OS_ARCH)) -+ ifdef WINDDK_BUILD -+ ifdef USE_64 -+ OS_RELEASE := 5.2 -+ else -+ OS_RELEASE := 5.1 -+ endif -+ else -+ OS_RELEASE := $(patsubst MINGW32_NT-%,%,$(OS_ARCH)) -+ endif - OS_ARCH = WINNT - USE_MSYS = 1 - ifndef CPU_ARCH -diff -ruN --strip-trailing-cr nss-3.13.6.orig/mozilla/security/nss/cmd/platlibs.mk nss-3.13.6/mozilla/security/nss/cmd/platlibs.mk ---- nss-3.13.6.orig/mozilla/security/nss/cmd/platlibs.mk 2010-06-12 02:58:33 +0200 -+++ nss-3.13.6/mozilla/security/nss/cmd/platlibs.mk 2012-10-06 00:54:22 +0200 -@@ -249,3 +249,11 @@ - endif - - JAR_LIBS = $(DIST)/lib/$(LIB_PREFIX)jar.$(LIB_SUFFIX) -+ -+ifdef WINDDK_BUILD -+ifdef USE_64 -+OS_LIBS += msvcrt_win2003.obj -+else -+OS_LIBS += msvcrt_winxp.obj -+endif -+endif -diff -ruN --strip-trailing-cr nss-3.13.6.orig/mozilla/security/nss/cmd/selfserv/selfserv.c nss-3.13.6/mozilla/security/nss/cmd/selfserv/selfserv.c ---- nss-3.13.6.orig/mozilla/security/nss/cmd/selfserv/selfserv.c 2012-03-01 19:38:24 +0100 -+++ nss-3.13.6/mozilla/security/nss/cmd/selfserv/selfserv.c 2012-10-06 00:54:22 +0200 -@@ -51,8 +51,13 @@ - #endif - - #if defined(_WINDOWS) -+#ifdef WINDDK_BUILD -+#include <windows.h> -+#define getpid GetCurrentProcessId -+#else - #include <process.h> /* for getpid() */ - #endif -+#endif - - #include <signal.h> - #include <stdlib.h> -diff -ruN --strip-trailing-cr nss-3.13.6.orig/mozilla/security/nss/lib/freebl/mpi/mpcpucache.c nss-3.13.6/mozilla/security/nss/lib/freebl/mpi/mpcpucache.c ---- nss-3.13.6.orig/mozilla/security/nss/lib/freebl/mpi/mpcpucache.c 2011-09-30 18:07:16 +0200 -+++ nss-3.13.6/mozilla/security/nss/lib/freebl/mpi/mpcpucache.c 2012-10-06 00:54:22 +0200 -@@ -80,7 +80,11 @@ - - #elif defined(_MSC_VER) - -+#ifdef WINDDK_BUILD -+#include <ntddk.h> -+#else - #include <intrin.h> -+#endif - - void freebl_cpuid(unsigned long op, unsigned long *eax, - unsigned long *ebx, unsigned long *ecx, -diff -ruN --strip-trailing-cr nss-3.13.6.orig/mozilla/security/nss/lib/freebl/win_rand.c nss-3.13.6/mozilla/security/nss/lib/freebl/win_rand.c ---- nss-3.13.6.orig/mozilla/security/nss/lib/freebl/win_rand.c 2011-01-06 20:00:52 +0100 -+++ nss-3.13.6/mozilla/security/nss/lib/freebl/win_rand.c 2012-10-06 00:54:22 +0200 -@@ -50,6 +50,13 @@ - #include <sys/types.h> - #include <sys/stat.h> - #endif -+ -+#ifdef WINDDK_BUILD -+#ifndef stat -+#define stat _stat -+#endif -+#endif -+ - #include <stdio.h> - #include "prio.h" - #include "prerror.h" -diff -ruN --strip-trailing-cr nss-3.13.6.orig/mozilla/security/nss/lib/softoken/legacydb/config.mk nss-3.13.6/mozilla/security/nss/lib/softoken/legacydb/config.mk ---- nss-3.13.6.orig/mozilla/security/nss/lib/softoken/legacydb/config.mk 2011-11-06 00:01:08 +0100 -+++ nss-3.13.6/mozilla/security/nss/lib/softoken/legacydb/config.mk 2012-10-06 00:54:22 +0200 -@@ -95,3 +95,11 @@ - ifeq ($(OS_TARGET),WINCE) - DEFINES += -DDBM_USING_NSPR - endif -+ -+ifdef WINDDK_BUILD -+ifdef USE_64 -+OS_LIBS += msvcrt_win2003.obj -+else -+OS_LIBS += msvcrt_winxp.obj -+endif -+endif -diff -ruN --strip-trailing-cr nss-3.13.6.orig/mozilla/security/nss/lib/sqlite/sqlite3.c nss-3.13.6/mozilla/security/nss/lib/sqlite/sqlite3.c ---- nss-3.13.6.orig/mozilla/security/nss/lib/sqlite/sqlite3.c 2010-01-08 06:42:38 +0100 -+++ nss-3.13.6/mozilla/security/nss/lib/sqlite/sqlite3.c 2012-10-06 00:54:22 +0200 -@@ -10980,7 +10980,8 @@ - ** localtime_s(). - */ - #if !defined(HAVE_LOCALTIME_R) && !defined(HAVE_LOCALTIME_S) && \ -- defined(_MSC_VER) && defined(_CRT_INSECURE_DEPRECATE) -+ defined(_MSC_VER) && defined(_CRT_INSECURE_DEPRECATE) && \ -+ !defined(WINDDK_BUILD) - #define HAVE_LOCALTIME_S 1 - #endif - -diff -ruN --strip-trailing-cr nss-3.13.6.orig/mozilla/security/nss/lib/ssl/sslimpl.h nss-3.13.6/mozilla/security/nss/lib/ssl/sslimpl.h ---- nss-3.13.6.orig/mozilla/security/nss/lib/ssl/sslimpl.h 2012-02-15 22:52:08 +0100 -+++ nss-3.13.6/mozilla/security/nss/lib/ssl/sslimpl.h 2012-10-06 00:54:22 +0200 -@@ -1657,8 +1657,13 @@ - #elif defined(_WIN32_WCE) - #define SSL_GETPID GetCurrentProcessId - #elif defined(WIN32) -+#ifdef WINDDK_BUILD -+#include <windows.h> -+#define SSL_GETPID GetCurrentProcessId -+#else - extern int __cdecl _getpid(void); - #define SSL_GETPID _getpid -+#endif - #else - #define SSL_GETPID() 0 - #endif -diff -ruN --strip-trailing-cr nss-3.13.6.orig/mozilla/security/nss/lib/zlib/config.mk nss-3.13.6/mozilla/security/nss/lib/zlib/config.mk ---- nss-3.13.6.orig/mozilla/security/nss/lib/zlib/config.mk 2009-11-07 02:13:10 +0100 -+++ nss-3.13.6/mozilla/security/nss/lib/zlib/config.mk 2012-10-06 00:54:22 +0200 -@@ -46,3 +46,11 @@ - PROGRAM = - - EXTRA_LIBS = $(LIBRARY) -+ -+ifdef WINDDK_BUILD -+ifdef USE_64 -+OS_LIBS += msvcrt_win2003.obj -+else -+OS_LIBS += msvcrt_winxp.obj -+endif -+endif diff --git a/win32/hexchat.exe.manifest b/win32/hexchat.exe.manifest new file mode 100644 index 00000000..1ea11920 --- /dev/null +++ b/win32/hexchat.exe.manifest @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity + name="HexChat" + processorArchitecture="*" + version="1.0.0.0" + type="win32" + /> + <description>HexChat IRC Client</description> + <dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="*" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> + </dependency> + <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1"> + <application> + <!--This Id value indicates the application supports Windows 7 functionality--> + <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/> + <!--This Id value indicates the application supports Windows 8 functionality--> + <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/> + <!--This Id value indicates the application supports Windows 8.1 functionality--> + <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/> + </application> + </compatibility> +</assembly> \ No newline at end of file diff --git a/win32/hexchat.props b/win32/hexchat.props index 8af53c79..b8ee2446 100644 --- a/win32/hexchat.props +++ b/win32/hexchat.props @@ -1,17 +1,16 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ImportGroup Label="PropertySheets" /> - <PropertyGroup Label="UserMacros"> <!-- SPECIFY YOUR DEPENDENCY DIRECTORIES HERE --> - <YourDepsPath>c:\mozilla-build\hexchat\gtk</YourDepsPath> - <YourGendefPath>c:\mozilla-build\gendef</YourGendefPath> - <YourMsgfmtPath>c:\mozilla-build\msgfmt</YourMsgfmtPath> - <YourPerlPath>c:\mozilla-build\perl-5.20</YourPerlPath> - <YourPython2Path>c:\mozilla-build\python-2.7</YourPython2Path> - <YourPython3Path>c:\mozilla-build\python-3.4</YourPython3Path> + <YourDepsPath>c:\gtk-build\gtk</YourDepsPath> + <YourGendefPath>c:\gtk-build\gendef</YourGendefPath> + <YourMsgfmtPath>c:\gtk-build\msgfmt</YourMsgfmtPath> + <YourPerlPath>c:\gtk-build\perl-5.20</YourPerlPath> + <YourPython2Path>c:\gtk-build\python-2.7</YourPython2Path> + <YourPython3Path>c:\gtk-build\python-3.4</YourPython3Path> + <YourWinSparklePath>c:\gtk-build\WinSparkle</YourWinSparklePath> <!-- YOU SHOULDN'T TOUCH ANYTHING BELOW --> @@ -21,9 +20,9 @@ <DepsRoot>$(YourDepsPath)\$(PlatformName)</DepsRoot> <GendefPath>$(YourGendefPath)</GendefPath> <MsgfmtPath>$(YourMsgfmtPath)</MsgfmtPath> + <WinSparklePath>$(YourWinSparklePath)\$(PlatformName)</WinSparklePath> <PerlPath>$(YourPerlPath)\$(PlatformName)</PerlPath> <PerlLib>perl520</PerlLib> - <PerlOutput>hcperl</PerlOutput> <Python2Path>$(YourPython2Path)\$(PlatformName)</Python2Path> <Python2Lib>python27</Python2Lib> <Python2Output>hcpython2</Python2Output> @@ -37,79 +36,49 @@ <HexChatBuild>$(SolutionDir)..\..\hexchat-build</HexChatBuild> <HexChatBin>$(HexChatBuild)\$(PlatformName)\bin\</HexChatBin> <HexChatObj>$(HexChatBuild)\$(PlatformName)\obj\</HexChatObj> - <HexChatRel>$(HexChatBuild)\$(PlatformName)\rel</HexChatRel> - <HexChatCopy> -rmdir /q /s "$(HexChatRel)" -mkdir "$(HexChatRel)" -echo 2> portable-mode -move portable-mode "$(HexChatRel)" -copy changelog.url "$(HexChatRel)" -copy readme.url "$(HexChatRel)" -copy "$(DepsRoot)\bin\cert.pem" "$(HexChatRel)" -copy "$(HexChatBin)hexchat.exe" "$(HexChatRel)" -copy "$(HexChatBin)hexchat-text.exe" "$(HexChatRel)" -copy "$(HexChatBin)thememan.exe" "$(HexChatRel)" -copy "$(DepsRoot)\bin\atk-1.0.dll" "$(HexChatRel)" -copy "$(DepsRoot)\bin\cairo.dll" "$(HexChatRel)" -copy "$(DepsRoot)\bin\fontconfig.dll" "$(HexChatRel)" -copy "$(DepsRoot)\bin\gdk_pixbuf-2.0.dll" "$(HexChatRel)" -copy "$(DepsRoot)\bin\gdk-win32-2.0.dll" "$(HexChatRel)" -copy "$(DepsRoot)\bin\gio-2.0.dll" "$(HexChatRel)" -copy "$(DepsRoot)\bin\glib-2.0.dll" "$(HexChatRel)" -copy "$(DepsRoot)\bin\gmodule-2.0.dll" "$(HexChatRel)" -copy "$(DepsRoot)\bin\gobject-2.0.dll" "$(HexChatRel) -copy "$(DepsRoot)\bin\gthread-2.0.dll" "$(HexChatRel)" -copy "$(DepsRoot)\bin\gtk-win32-2.0.dll" "$(HexChatRel)" -copy "$(DepsRoot)\bin\harfbuzz.dll" "$(HexChatRel)" -copy "$(DepsRoot)\bin\iconv.dll" "$(HexChatRel)" -copy "$(DepsRoot)\bin\libeay32.dll" "$(HexChatRel)" -copy "$(DepsRoot)\bin\libenchant.dll" "$(HexChatRel)" -copy "$(DepsRoot)\bin\libintl.dll" "$(HexChatRel)" -copy "$(DepsRoot)\bin\libpng16.dll" "$(HexChatRel)" -copy "$(DepsRoot)\bin\libxml2.dll" "$(HexChatRel)" -copy "$(DepsRoot)\bin\pango-1.0.dll" "$(HexChatRel)" -copy "$(DepsRoot)\bin\pangocairo-1.0.dll" "$(HexChatRel)" -copy "$(DepsRoot)\bin\pangoft2-1.0.dll" "$(HexChatRel)" -copy "$(DepsRoot)\bin\pangowin32-1.0.dll" "$(HexChatRel)" -copy "$(DepsRoot)\bin\pixman-1.dll" "$(HexChatRel)" -copy "$(DepsRoot)\bin\ssleay32.dll" "$(HexChatRel)" -copy "$(DepsRoot)\bin\zlib1.dll" "$(HexChatRel)" -xcopy /q /s /i "$(DepsRoot)\lib\gtk-2.0\i686-pc-vs10\engines" "$(HexChatRel)\lib\gtk-2.0\i686-pc-vs10\engines" -xcopy /q /s /i share "$(HexChatRel)\share" -xcopy /q /s /i "..\..\COPYING" "$(HexChatRel)\share\doc\hexchat\" -xcopy /q /s /i "$(DepsRoot)\share\doc" "$(HexChatRel)\share\doc" -xcopy /q /s /i "$(DepsRoot)\share\themes\MS-Windows" "$(HexChatRel)\share\themes\MS-Windows" -xcopy /q /s /i "$(DepsRoot)\lib\enchant\libenchant_myspell.dll" "$(HexChatRel)\lib\enchant\" -xcopy /q /s /i "$(HexChatBin)hcchecksum.dll" "$(HexChatRel)\plugins\" -copy "$(HexChatBin)hcdoat.dll" "$(HexChatRel)\plugins" -copy "$(HexChatBin)hcexec.dll" "$(HexChatRel)\plugins" -copy "$(HexChatBin)hcfishlim.dll" "$(HexChatRel)\plugins" -copy "$(HexChatBin)hcmpcinfo.dll" "$(HexChatRel)\plugins" -copy "$(HexChatBin)hcperl.dll" "$(HexChatRel)\plugins" -copy "$(HexChatBin)hcpython2.dll" "$(HexChatRel)\plugins" -copy "$(HexChatBin)hcpython3.dll" "$(HexChatRel)\plugins" -copy "$(HexChatBin)hcupd.dll" "$(HexChatRel)\plugins" -copy "$(HexChatBin)hcwinamp.dll" "$(HexChatRel)\plugins" -copy "$(HexChatBin)hcsysinfo.dll" "$(HexChatRel)\plugins" -xcopy /q /s /i "$(HexChatBin)locale" "$(HexChatRel)\share\locale" -xcopy /q /s /i "$(DepsRoot)\share\locale" "$(HexChatRel)\share\locale" - </HexChatCopy> - <IsccPath Condition="'$(Platform)'=='Win32'">"%PROGRAMFILES%\Inno Setup 5\iscc.exe"</IsccPath> - <IsccPath Condition="'$(Platform)'=='x64'">"%PROGRAMFILES(x86)%\Inno Setup 5\iscc.exe"</IsccPath> + <HexChatLib>$(HexChatBuild)\$(PlatformName)\lib\</HexChatLib> + <HexChatPdb>$(HexChatBuild)\$(PlatformName)\pdb\</HexChatPdb> + <HexChatRel>$(HexChatBuild)\$(PlatformName)\rel\</HexChatRel> + <IsccPath>"$(MSBuildExtensionsPath32)\..\Inno Setup 5\iscc.exe"</IsccPath> + </PropertyGroup> + + <PropertyGroup> + <LinkIncremental>false</LinkIncremental> + <IntDir>$(HexChatObj)$(ProjectName)\</IntDir> + <UseDebugLibraries>false</UseDebugLibraries> + <WholeProgramOptimization>true</WholeProgramOptimization> + <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> <ItemDefinitionGroup> <ClCompile> <WarningLevel>Level3</WarningLevel> + <PrecompiledHeader>NotUsing</PrecompiledHeader> <DisableSpecificWarnings>4996</DisableSpecificWarnings> - <AdditionalOptions>/d2Zi+ %(AdditionalOptions)</AdditionalOptions> - <WholeProgramOptimization>false</WholeProgramOptimization> + <AdditionalOptions>/d2Zi+ %(AdditionalOptions)</AdditionalOptions> + <WholeProgramOptimization>true</WholeProgramOptimization> <!-- UNCOMMENT ONLY ONE --> <!--Optimization>Disabled</Optimization--> <Optimization>MaxSpeed</Optimization> <!--Optimization>MinSpace</Optimization--> <!--Optimization>Full</Optimization--> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <MultiProcessorCompilation>true</MultiProcessorCompilation> + <PreProcessorDefinitions>NTDDI_VERSION=NTDDI_WIN8;_WIN32_WINNT=_WIN32_WINNT_WIN8;%(PreProcessorDefinitions)</PreProcessorDefinitions> </ClCompile> + <Lib> + <LinkTimeCodeGeneration>true</LinkTimeCodeGeneration> + </Lib> + <Link> + <ImportLibrary>$(HexChatLib)$(TargetName).lib</ImportLibrary> + <ProgramDatabaseFile>$(HexChatPdb)$(TargetName).pdb</ProgramDatabaseFile> + <SubSystem>Windows</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> + </Link> </ItemDefinitionGroup> <ItemGroup /> diff --git a/win32/hexchat.sln b/win32/hexchat.sln index 03b75c5d..272c96df 100644 --- a/win32/hexchat.sln +++ b/win32/hexchat.sln @@ -1,7 +1,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2013 -VisualStudioVersion = 12.0.21005.1 +VisualStudioVersion = 12.0.30501.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common", "..\src\common\common.vcxproj", "{87554B59-006C-4D94-9714-897B27067BA3}" ProjectSection(ProjectDependencies) = postProject @@ -78,28 +78,31 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nls", "nls\nls.vcxproj", "{ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "copy", "copy\copy.vcxproj", "{C9B735E4-75BC-45AC-A5E3-39A6D076F912}" ProjectSection(ProjectDependencies) = postProject + {B10A2C41-344C-43E0-A32D-B9587C198D8B} = {B10A2C41-344C-43E0-A32D-B9587C198D8B} + {DE87FFCA-9606-4116-B747-062D88A56A28} = {DE87FFCA-9606-4116-B747-062D88A56A28} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "installer", "installer\installer.vcxproj", "{5A0F4962-E670-4DA2-9E45-52CC47F26E2F}" + ProjectSection(ProjectDependencies) = postProject {C2321A03-0BA7-45B3-8740-ABD82B36B0BF} = {C2321A03-0BA7-45B3-8740-ABD82B36B0BF} {19C52A0A-A790-409E-A28A-9745FF990F5C} = {19C52A0A-A790-409E-A28A-9745FF990F5C} + {BF0EBC16-68AD-4CD1-864C-5B56836EBE2A} = {BF0EBC16-68AD-4CD1-864C-5B56836EBE2A} {4980AF24-9D42-427D-A8E6-0DF3B97C455D} = {4980AF24-9D42-427D-A8E6-0DF3B97C455D} {17E4BE39-76F7-4A06-AD21-EFD0C5091F76} = {17E4BE39-76F7-4A06-AD21-EFD0C5091F76} {B10A2C41-344C-43E0-A32D-B9587C198D8B} = {B10A2C41-344C-43E0-A32D-B9587C198D8B} {461DC24A-A410-4171-8C02-CCDBF3702C2A} = {461DC24A-A410-4171-8C02-CCDBF3702C2A} {E93E1255-95D1-4B08-8FDF-B53CC6A21280} = {E93E1255-95D1-4B08-8FDF-B53CC6A21280} - {87554B59-006C-4D94-9714-897B27067BA3} = {87554B59-006C-4D94-9714-897B27067BA3} + {A7D7CE59-2A31-48AE-BED2-A9828E241832} = {A7D7CE59-2A31-48AE-BED2-A9828E241832} {5EF7F47D-D09C-43C4-BF64-B28B11A0FF91} = {5EF7F47D-D09C-43C4-BF64-B28B11A0FF91} {6C0CA980-97C5-427A-BE61-5BCECAFABBDA} = {6C0CA980-97C5-427A-BE61-5BCECAFABBDA} {B0E36D93-CA2A-49FE-9EB9-9C96C6016EEC} = {B0E36D93-CA2A-49FE-9EB9-9C96C6016EEC} {E78C0D9A-798E-4BF6-B0CC-6FECB8CA2FCE} = {E78C0D9A-798E-4BF6-B0CC-6FECB8CA2FCE} {E4BDB4C8-2335-415A-ACEE-BA88B19BFE82} = {E4BDB4C8-2335-415A-ACEE-BA88B19BFE82} {DE87FFCA-9606-4116-B747-062D88A56A28} = {DE87FFCA-9606-4116-B747-062D88A56A28} + {C53145CC-D021-40C9-B97C-0249AB9A43C9} = {C53145CC-D021-40C9-B97C-0249AB9A43C9} {D90BC3E3-1341-4849-9354-5F40489D39D1} = {D90BC3E3-1341-4849-9354-5F40489D39D1} - {3C4F42FC-292A-420B-B63D-C03DFBDD8E4E} = {3C4F42FC-292A-420B-B63D-C03DFBDD8E4E} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "installer", "installer\installer.vcxproj", "{5A0F4962-E670-4DA2-9E45-52CC47F26E2F}" - ProjectSection(ProjectDependencies) = postProject - {87554B59-006C-4D94-9714-897B27067BA3} = {87554B59-006C-4D94-9714-897B27067BA3} {C9B735E4-75BC-45AC-A5E3-39A6D076F912} = {C9B735E4-75BC-45AC-A5E3-39A6D076F912} + {3C4F42FC-292A-420B-B63D-C03DFBDD8E4E} = {3C4F42FC-292A-420B-B63D-C03DFBDD8E4E} EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "htm", "..\src\htm\htm.csproj", "{DE87FFCA-9606-4116-B747-062D88A56A28}" @@ -119,6 +122,15 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "python3", "..\plugins\pytho {87554B59-006C-4D94-9714-897B27067BA3} = {87554B59-006C-4D94-9714-897B27067BA3} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "notifications-winrt", "..\src\fe-gtk\notifications\notifications-winrt.vcxproj", "{C53145CC-D021-40C9-B97C-0249AB9A43C9}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "external", "external", "{021EC1D0-FF67-4700-9AB2-EAABF1159C09}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libenchant_win8", "..\src\libenchant_win8\libenchant_win8.vcxproj", "{BF0EBC16-68AD-4CD1-864C-5B56836EBE2A}" + ProjectSection(ProjectDependencies) = postProject + {87554B59-006C-4D94-9714-897B27067BA3} = {87554B59-006C-4D94-9714-897B27067BA3} + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Release|Win32 = Release|Win32 @@ -201,16 +213,23 @@ Global {C2321A03-0BA7-45B3-8740-ABD82B36B0BF}.Release|Win32.Build.0 = Release|Win32 {C2321A03-0BA7-45B3-8740-ABD82B36B0BF}.Release|x64.ActiveCfg = Release|x64 {C2321A03-0BA7-45B3-8740-ABD82B36B0BF}.Release|x64.Build.0 = Release|x64 + {C53145CC-D021-40C9-B97C-0249AB9A43C9}.Release|Win32.ActiveCfg = Release|Win32 + {C53145CC-D021-40C9-B97C-0249AB9A43C9}.Release|Win32.Build.0 = Release|Win32 + {C53145CC-D021-40C9-B97C-0249AB9A43C9}.Release|x64.ActiveCfg = Release|x64 + {C53145CC-D021-40C9-B97C-0249AB9A43C9}.Release|x64.Build.0 = Release|x64 + {BF0EBC16-68AD-4CD1-864C-5B56836EBE2A}.Release|Win32.ActiveCfg = Release|Win32 + {BF0EBC16-68AD-4CD1-864C-5B56836EBE2A}.Release|Win32.Build.0 = Release|Win32 + {BF0EBC16-68AD-4CD1-864C-5B56836EBE2A}.Release|x64.ActiveCfg = Release|x64 + {BF0EBC16-68AD-4CD1-864C-5B56836EBE2A}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution + {87554B59-006C-4D94-9714-897B27067BA3} = {AAACEB12-9475-410E-AF5A-FDFF907E9043} {E4BDB4C8-2335-415A-ACEE-BA88B19BFE82} = {AAACEB12-9475-410E-AF5A-FDFF907E9043} {E93E1255-95D1-4B08-8FDF-B53CC6A21280} = {AAACEB12-9475-410E-AF5A-FDFF907E9043} - {87554B59-006C-4D94-9714-897B27067BA3} = {AAACEB12-9475-410E-AF5A-FDFF907E9043} - {DE87FFCA-9606-4116-B747-062D88A56A28} = {AAACEB12-9475-410E-AF5A-FDFF907E9043} - {A7D7CE59-2A31-48AE-BED2-A9828E241832} = {AAACEB12-9475-410E-AF5A-FDFF907E9043} + {19C52A0A-A790-409E-A28A-9745FF990F5C} = {D237DA6B-BD5F-46C0-8BEA-50E9A1340240} {4980AF24-9D42-427D-A8E6-0DF3B97C455D} = {561126F4-FA18-45FC-A2BF-8F858F161D6D} {5EF7F47D-D09C-43C4-BF64-B28B11A0FF91} = {561126F4-FA18-45FC-A2BF-8F858F161D6D} {17E4BE39-76F7-4A06-AD21-EFD0C5091F76} = {561126F4-FA18-45FC-A2BF-8F858F161D6D} @@ -219,11 +238,14 @@ Global {461DC24A-A410-4171-8C02-CCDBF3702C2A} = {561126F4-FA18-45FC-A2BF-8F858F161D6D} {E78C0D9A-798E-4BF6-B0CC-6FECB8CA2FCE} = {561126F4-FA18-45FC-A2BF-8F858F161D6D} {6C0CA980-97C5-427A-BE61-5BCECAFABBDA} = {561126F4-FA18-45FC-A2BF-8F858F161D6D} - {19C52A0A-A790-409E-A28A-9745FF990F5C} = {D237DA6B-BD5F-46C0-8BEA-50E9A1340240} - {D90BC3E3-1341-4849-9354-5F40489D39D1} = {D237DA6B-BD5F-46C0-8BEA-50E9A1340240} - {C2321A03-0BA7-45B3-8740-ABD82B36B0BF} = {D237DA6B-BD5F-46C0-8BEA-50E9A1340240} {B10A2C41-344C-43E0-A32D-B9587C198D8B} = {0FD996A7-464F-4981-8380-3DCA3A244A13} {C9B735E4-75BC-45AC-A5E3-39A6D076F912} = {0FD996A7-464F-4981-8380-3DCA3A244A13} {5A0F4962-E670-4DA2-9E45-52CC47F26E2F} = {0FD996A7-464F-4981-8380-3DCA3A244A13} + {DE87FFCA-9606-4116-B747-062D88A56A28} = {AAACEB12-9475-410E-AF5A-FDFF907E9043} + {A7D7CE59-2A31-48AE-BED2-A9828E241832} = {AAACEB12-9475-410E-AF5A-FDFF907E9043} + {D90BC3E3-1341-4849-9354-5F40489D39D1} = {D237DA6B-BD5F-46C0-8BEA-50E9A1340240} + {C2321A03-0BA7-45B3-8740-ABD82B36B0BF} = {D237DA6B-BD5F-46C0-8BEA-50E9A1340240} + {C53145CC-D021-40C9-B97C-0249AB9A43C9} = {561126F4-FA18-45FC-A2BF-8F858F161D6D} + {BF0EBC16-68AD-4CD1-864C-5B56836EBE2A} = {021EC1D0-FF67-4700-9AB2-EAABF1159C09} EndGlobalSection EndGlobal diff --git a/win32/installer/hexchat.iss.tt b/win32/installer/hexchat.iss.tt index 0ccf2097..6c71de12 100644 --- a/win32/installer/hexchat.iss.tt +++ b/win32/installer/hexchat.iss.tt @@ -124,6 +124,13 @@ Source: "gio-2.0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs Source: "glib-2.0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs Source: "gmodule-2.0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs Source: "gobject-2.0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs +#if APPARCH == "x64" +Source: "gspawn-win64-helper.exe"; DestDir: "{app}"; Flags: ignoreversion; Components: libs +Source: "gspawn-win64-helper-console.exe"; DestDir: "{app}"; Flags: ignoreversion; Components: libs +#else +Source: "gspawn-win32-helper.exe"; DestDir: "{app}"; Flags: ignoreversion; Components: libs +Source: "gspawn-win32-helper-console.exe"; DestDir: "{app}"; Flags: ignoreversion; Components: libs +#endif Source: "gthread-2.0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs Source: "gtk-win32-2.0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs Source: "harfbuzz.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs @@ -141,7 +148,9 @@ Source: "pixman-1.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs Source: "ssleay32.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs Source: "zlib1.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs -Source: "lib\enchant\libenchant_myspell.dll"; DestDir: "{app}\lib\enchant"; Flags: ignoreversion; Components: libs +Source: "plugins\hcnotifications-winrt.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: libs + +Source: "lib\enchant\*"; DestDir: "{app}\lib\enchant"; Flags: ignoreversion; Components: libs Source: "lib\gtk-2.0\i686-pc-vs10\engines\*"; DestDir: "{app}\lib\gtk-2.0\i686-pc-vs10\engines"; Flags: ignoreversion; Components: libs @@ -153,6 +162,7 @@ Source: "share\music.png"; DestDir: "{app}\share"; Flags: ignoreversion; Compone Source: "plugins\hcmpcinfo.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\mpcinfo Source: "share\download.png"; DestDir: "{app}\share"; Flags: ignoreversion; Components: plugins\upd Source: "plugins\hcupd.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\upd +Source: "WinSparkle.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: plugins\upd Source: "plugins\hcwinamp.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\winamp Source: "share\system.png"; DestDir: "{app}\share"; Flags: ignoreversion; Components: plugins\sysinfo Source: "plugins\hcsysinfo.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\sysinfo @@ -166,7 +176,7 @@ Source: "hexchat-text.exe"; DestDir: "{app}"; Flags: ignoreversion; Components: Source: "thememan.exe"; DestDir: "{app}"; Flags: ignoreversion; Components: xtm [Icons] -Name: "{group}\HexChat"; Filename: "{app}\hexchat.exe"; Tasks: not portable +Name: "{group}\HexChat"; Filename: "{app}\hexchat.exe"; AppUserModelID: "HexChat.Desktop.Notify"; Tasks: not portable Name: "{group}\HexChat Safe Mode"; Filename: "{app}\hexchat.exe"; Parameters: "--no-auto --no-plugins"; Tasks: not portable Name: "{group}\HexChat ChangeLog"; Filename: "{app}\changelog.url"; IconFilename: "{sys}\shell32.dll"; IconIndex: 165; Tasks: not portable Name: "{group}\HexChat ReadMe"; Filename: "{app}\readme.url"; IconFilename: "{sys}\shell32.dll"; IconIndex: 23; Tasks: not portable @@ -220,8 +230,16 @@ end; ///////////////////////////////////////////////////////////////////// function CheckSpellInstall(): Boolean; +var + Version: TWindowsVersion; begin - Result := DirExists(ExpandConstant('{localappdata}') + '\enchant');; + GetWindowsVersionEx(Version); + + // Windows 8 or greater has built in spell check. + if Version.NTPlatform and (Version.Major > 6) or ((Version.Major = 6) and (Version.Minor > 1)) then + Result := True + else + Result := DirExists(ExpandConstant('{localappdata}') + '\enchant\myspell'); end; ///////////////////////////////////////////////////////////////////// @@ -250,18 +268,18 @@ begin begin #if APPARCH == "x64" - REDIST := 'http://dl.hexchat.net/misc/vcredist_2013_x64.exe'; - PERL := 'http://dl.hexchat.net/misc/perl/Perl%205.20.0%20x64.msi'; + REDIST := 'https://dl.hexchat.net/misc/vcredist_2013_x64.exe'; + PERL := 'https://dl.hexchat.net/misc/perl/Perl%205.20.0%20x64.msi'; PY2 := 'http://python.org/ftp/python/2.7.8/python-2.7.8.amd64.msi'; PY3 := 'http://python.org/ftp/python/3.4.1/python-3.4.1.amd64.msi'; #else - REDIST := 'http://dl.hexchat.net/misc/vcredist_2013_x86.exe'; - PERL := 'http://dl.hexchat.net/misc/perl/Perl%205.20.0%20x86.msi'; + REDIST := 'https://dl.hexchat.net/misc/vcredist_2013_x86.exe'; + PERL := 'https://dl.hexchat.net/misc/perl/Perl%205.20.0%20x86.msi'; PY2 := 'http://python.org/ftp/python/2.7.8/python-2.7.8.msi'; PY3 := 'http://python.org/ftp/python/3.4.1/python-3.4.1.msi'; #endif - DOTNET := 'http://dl.hexchat.net/misc/dotnet_40.exe'; - SPELL := 'http://dl.hexchat.net/hexchat/HexChat%20Spelling%20Dictionaries%20r2.exe'; + DOTNET := 'https://dl.hexchat.net/misc/dotnet_40.exe'; + SPELL := 'https://dl.hexchat.net/hexchat/HexChat%20Spelling%20Dictionaries%20r2.exe'; if not CheckVCInstall() then idpAddFile(REDIST, ExpandConstant('{tmp}\vcredist.exe')); diff --git a/win32/installer/installer.vcxproj b/win32/installer/installer.vcxproj index a3d546c9..713411a5 100644 --- a/win32/installer/installer.vcxproj +++ b/win32/installer/installer.vcxproj @@ -2,6 +2,7 @@ <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup Label="Configuration"> <PlatformToolset>v120</PlatformToolset> + <ConfigurationType>Application</ConfigurationType> </PropertyGroup> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Release|Win32"> @@ -18,42 +19,14 @@ <RootNamespace>installer</RootNamespace> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>MultiByte</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>MultiByte</CharacterSet> - </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <ImportGroup Label="ExtensionSettings"> - </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" /> - <Import Project="..\hexchat.props" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\hexchat.props" /> - </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <OutDir>$(HexChatBin)</OutDir> - <IntDir>$(HexChatObj)$(ProjectName)\</IntDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <OutDir>$(HexChatBin)</OutDir> - <IntDir>$(HexChatObj)$(ProjectName)\</IntDir> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="..\hexchat.props" /> + <PropertyGroup> + <OutDir>$(HexChatRel)</OutDir> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)'=='Release'"> <ClCompile> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -64,10 +37,8 @@ <Command> <![CDATA[ SET SOLUTIONDIR=$(SolutionDir)..\ -powershell -File "$(SolutionDir)..\win32\version-template.ps1" "$(SolutionDir)..\win32\installer\hexchat.iss.tt" "$(SolutionDir)..\win32\installer\hexchat.iss" -del "$(OutDir)hexchat.iss" -type hexchat.iss >> "$(OutDir)hexchat.iss" -$(IsccPath) /dPROJECTDIR="$(ProjectDir)" /dAPPARCH="$(Platform)" "$(OutDir)hexchat.iss" +powershell -File "$(SolutionDir)..\win32\version-template.ps1" "$(SolutionDir)..\win32\installer\hexchat.iss.tt" "$(HexChatBin)hexchat.iss" +$(IsccPath) /dPROJECTDIR="$(ProjectDir)" /dAPPARCH="$(Platform)" "$(HexChatBin)hexchat.iss" ]]> </Command> </PreBuildEvent> @@ -78,6 +49,4 @@ $(IsccPath) /dPROJECTDIR="$(ProjectDir)" /dAPPARCH="$(Platform)" "$(OutDir)hexch <None Include="hexchat.iss" /> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets"> - </ImportGroup> </Project> diff --git a/win32/nls/nls.vcxproj b/win32/nls/nls.vcxproj index 928fb225..36977f3c 100644 --- a/win32/nls/nls.vcxproj +++ b/win32/nls/nls.vcxproj @@ -2,6 +2,7 @@ <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup Label="Configuration"> <PlatformToolset>v120</PlatformToolset> + <ConfigurationType>Application</ConfigurationType> </PropertyGroup> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Release|Win32"> @@ -18,68 +19,13 @@ <RootNamespace>nls</RootNamespace> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>MultiByte</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>MultiByte</CharacterSet> - </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <ImportGroup Label="ExtensionSettings"> - </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" /> - <Import Project="..\hexchat.props" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\hexchat.props" /> - </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="..\hexchat.props" /> + <PropertyGroup> <OutDir>$(HexChatBin)</OutDir> - <IntDir>$(HexChatObj)$(ProjectName)\</IntDir> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <OutDir>$(HexChatBin)</OutDir> - <IntDir>$(HexChatObj)$(ProjectName)\</IntDir> - </PropertyGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <ClCompile> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - </ClCompile> - <Link> - <GenerateDebugInformation>true</GenerateDebugInformation> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - </Link> - <PreBuildEvent> - <Command>cd ..\..\po -rmdir /q /s "$(OutDir)\locale" -mkdir "$(OutDir)\locale" -for %%A in (*.po) do ( -mkdir "$(OutDir)\locale\%%~nA\LC_MESSAGES" -"$(MsgfmtPath)\msgfmt" -co "$(OutDir)\locale\%%~nA\LC_MESSAGES\hexchat.mo" %%A -)</Command> - </PreBuildEvent> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <ClCompile> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - </ClCompile> - <Link> - <GenerateDebugInformation>true</GenerateDebugInformation> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - </Link> + <ItemDefinitionGroup> <PreBuildEvent> <Command>cd ..\..\po rmdir /q /s "$(OutDir)\locale" @@ -93,6 +39,4 @@ mkdir "$(OutDir)\locale\%%~nA\LC_MESSAGES" <ItemGroup> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets"> - </ImportGroup> -</Project> \ No newline at end of file +</Project> diff --git a/win32/version.txt b/win32/version.txt index 5cc82157..d332044b 100644 --- a/win32/version.txt +++ b/win32/version.txt @@ -1 +1 @@ -2.10.1 \ No newline at end of file +2.10.2 \ No newline at end of file diff --git a/win32/wdkpt/vs2010/Microsoft.Cpp.Win32.WDK7.props b/win32/wdkpt/vs2010/Microsoft.Cpp.Win32.WDK7.props deleted file mode 100644 index 41e4baae..00000000 --- a/win32/wdkpt/vs2010/Microsoft.Cpp.Win32.WDK7.props +++ /dev/null @@ -1,68 +0,0 @@ -<!-- -*********************************************************************************************** -Microsoft.Cpp.Win32.v100.props - -WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have - created a backup copy. Incorrect changes to this file will make it - impossible to load or build your projects from the command-line or the IDE. - -Copyright (C) Microsoft Corporation. All rights reserved. -*********************************************************************************************** ---> - -<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$(VCTargetsPath)\Platforms\Win32\PlatformToolsets\v100\ImportBefore\*.props" Condition="Exists('$(VCTargetsPath)\Platforms\Win32\PlatformToolsets\v100\ImportBefore')" /> - - <PropertyGroup> - <PlatformToolsetVersion>100</PlatformToolsetVersion> - - <WDKInstallDir>$(SystemDrive)\WinDDK\7600.16385.1</WDKInstallDir> - - <VCInstallDir>$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\10.0\Setup\VC@ProductDir)</VCInstallDir> - <VCInstallDir Condition="'$(VCInstallDir)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\10.0\Setup\VC@ProductDir)</VCInstallDir> - <VCInstallDir Condition="'$(VCInstallDir)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VCExpress\10.0\Setup\VC@ProductDir)</VCInstallDir> - <VCInstallDir Condition="'$(VCInstallDir)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\VCExpress\10.0\Setup\VC@ProductDir)</VCInstallDir> - - <VSInstallDir>$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\10.0\Setup\VS@ProductDir)</VSInstallDir> - <VSInstallDir Condition="'$(VSInstallDir)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\10.0\Setup\VS@ProductDir)</VSInstallDir> - <VSInstallDir Condition="'$(VSInstallDir)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VCExpress\10.0\Setup\VS@ProductDir)</VSInstallDir> - <VSInstallDir Condition="'$(VSInstallDir)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\VCExpress\10.0\Setup\VS@ProductDir)</VSInstallDir> - - <WindowsSdkDir Condition="'$(UseEnv)' != 'true'">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.0A@InstallationFolder)</WindowsSdkDir> - <WindowsSdkDir Condition="'$(WindowsSdkDir)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Microsoft SDKs\Windows\v7.0A@InstallationFolder)</WindowsSdkDir> - - <FrameworkDir Condition="'$(UseEnv)' != 'true'">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\.NETFramework@InstallRoot)</FrameworkDir> - <FrameworkDir Condition="'$(FrameworkDir)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\.NETFramework@InstallRoot)</FrameworkDir> - - <FrameworkSdkDir Condition="'$(UseEnv)' != 'true'">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.0A@InstallationFolder)</FrameworkSdkDir> - <FrameworkSdkDir Condition="'$(FrameworkSdkDir)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Microsoft SDKs\Windows\v7.0A@InstallationFolder)</FrameworkSdkDir> - - <FrameworkVersion Condition="'$(UseEnv)' != 'true'">v4.0</FrameworkVersion> - <Framework35Version Condition="'$(UseEnv)' != 'true'">v3.5</Framework35Version> - - <ExecutablePath Condition="'$(ExecutablePath)' == ''">$(VCInstallDir)bin;$(WindowsSdkDir)bin\NETFX 4.0 Tools;$(WindowsSdkDir)bin;$(VSInstallDir)Common7\Tools\bin;$(VSInstallDir)Common7\tools;$(VSInstallDir)Common7\ide;$(ProgramFiles)\HTML Help Workshop;$(FrameworkSDKDir)\bin;$(MSBuildToolsPath32);$(VSInstallDir);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH);</ExecutablePath> - <IncludePath>$(WDKInstallDir)\inc\api;$(WDKInstallDir)\inc\crt;$(WDKInstallDir)\inc\api\crt\stl70;$(WDKInstallDir)\inc\mfc42;$(WDKInstallDir)\inc\ddk;$(WDKInstallDir)\inc\api\dao360;</IncludePath> - <LibraryPath>$(WDKInstallDir)\lib\wxp\i386;$(WDKInstallDir)\lib\Crt\i386;$(WDKInstallDir)\lib\Mfc\i386;$(WDKInstallDir)\lib\ATL\i386</LibraryPath> - <SourcePath Condition="'$(SourcePath)' == ''">$(VCInstallDir)atlmfc\src\mfc;$(VCInstallDir)atlmfc\src\mfcm;$(VCInstallDir)atlmfc\src\atl;$(VCInstallDir)crt\src;</SourcePath> - <NativeExecutablePath Condition="'$(NativeExecutablePath)' == ''">$(ExecutablePath)</NativeExecutablePath> - </PropertyGroup> - - <ItemDefinitionGroup> - <Link> - <AdditionalDependencies>msvcrt_winxp.obj;%(AdditionalDependencies)</AdditionalDependencies> - </Link> - <ResourceCompile> - <SuppressStartupBanner Condition="'%(ResourceCompile.SuppressStartupBanner)' == ''">true</SuppressStartupBanner> - </ResourceCompile> - <ManifestResourceCompile> - <SuppressStartupBanner Condition="'%(ManifestResourceCompile.SuppressStartupBanner)'==''">true</SuppressStartupBanner> - </ManifestResourceCompile> - <Manifest> - <EnableDPIAwareness Condition="'$(EnableDPIAwareness)' == '' AND '$(UseOfMFC)' == 'static'">true</EnableDPIAwareness> - <EnableDPIAwareness Condition="'$(EnableDPIAwareness)' == '' AND '$(UseOfMFC)' == 'dynamic'">true</EnableDPIAwareness> - <EnableDPIAwareness Condition="'$(EnableDPIAwareness)' == '' AND '$(UseOfMFC)' != 'static' AND '$(UseOfMFC)' != 'dynamic'">false</EnableDPIAwareness> - </Manifest> - </ItemDefinitionGroup> - - <Import Project="$(VCTargetsPath)\Platforms\Win32\PlatformToolsets\v100\ImportAfter\*.props" Condition="Exists('$(VCTargetsPath)\Platforms\Win32\PlatformToolsets\v100\ImportAfter')" /> -</Project> diff --git a/win32/wdkpt/vs2010/Microsoft.Cpp.Win32.WDK7.targets b/win32/wdkpt/vs2010/Microsoft.Cpp.Win32.WDK7.targets deleted file mode 100644 index f68a78bc..00000000 --- a/win32/wdkpt/vs2010/Microsoft.Cpp.Win32.WDK7.targets +++ /dev/null @@ -1,20 +0,0 @@ -<!-- -*********************************************************************************************** -Microsoft.Cpp.Win32.v100.targets - -WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have - created a backup copy. Incorrect changes to this file will make it - impossible to load or build your projects from the command-line or the IDE. - -This file defines the steps/targets required to build Visual C++ (version 10.0) projects -specifically on x86 platforms. - -Copyright (C) Microsoft Corporation. All rights reserved. -*********************************************************************************************** ---> - -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$(VCTargetsPath)\Platforms\Win32\PlatformToolsets\v100\ImportBefore\*.targets" Condition="Exists('$(VCTargetsPath)\Platforms\Win32\PlatformToolsets\v100\ImportBefore')" /> - - <Import Project="$(VCTargetsPath)\Platforms\Win32\PlatformToolsets\v100\ImportAfter\*.targets" Condition="Exists('$(VCTargetsPath)\Platforms\Win32\PlatformToolsets\v100\ImportAfter')" /> -</Project> diff --git a/win32/wdkpt/vs2010/Microsoft.Cpp.x64.WDK7.props b/win32/wdkpt/vs2010/Microsoft.Cpp.x64.WDK7.props deleted file mode 100644 index 7f72f8e2..00000000 --- a/win32/wdkpt/vs2010/Microsoft.Cpp.x64.WDK7.props +++ /dev/null @@ -1,68 +0,0 @@ -<!-- -*********************************************************************************************** -Microsoft.Cpp.x64.v100.props - -WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have - created a backup copy. Incorrect changes to this file will make it - impossible to load or build your projects from the command-line or the IDE. - -Copyright (C) Microsoft Corporation. All rights reserved. -*********************************************************************************************** ---> - -<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$(VCTargetsPath)\Platforms\x64\PlatformToolsets\v100\ImportBefore\*.props" Condition="Exists('$(VCTargetsPath)\Platforms\x64\PlatformToolsets\v100\ImportBefore')" /> - - <PropertyGroup> - <PlatformToolsetVersion>100</PlatformToolsetVersion> - - <WDKInstallDir>$(SystemDrive)\WinDDK\7600.16385.1</WDKInstallDir> - - <VCInstallDir>$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\10.0\Setup\VC@ProductDir)</VCInstallDir> - <VCInstallDir Condition="'$(VCInstallDir)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\10.0\Setup\VC@ProductDir)</VCInstallDir> - <VCInstallDir Condition="'$(VCInstallDir)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VCExpress\10.0\Setup\VC@ProductDir)</VCInstallDir> - <VCInstallDir Condition="'$(VCInstallDir)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\VCExpress\10.0\Setup\VC@ProductDir)</VCInstallDir> - - <VSInstallDir>$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\10.0\Setup\VS@ProductDir)</VSInstallDir> - <VSInstallDir Condition="'$(VSInstallDir)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\10.0\Setup\VS@ProductDir)</VSInstallDir> - <VSInstallDir Condition="'$(VSInstallDir)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VCExpress\10.0\Setup\VS@ProductDir)</VSInstallDir> - <VSInstallDir Condition="'$(VSInstallDir)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\VCExpress\10.0\Setup\VS@ProductDir)</VSInstallDir> - - <WindowsSdkDir Condition="'$(UseEnv)' != 'true'">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.0A@InstallationFolder)</WindowsSdkDir> - <WindowsSdkDir Condition="'$(WindowsSdkDir)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Microsoft SDKs\Windows\v7.0A@InstallationFolder)</WindowsSdkDir> - - <FrameworkDir Condition="'$(UseEnv)' != 'true'">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\.NETFramework@InstallRoot)</FrameworkDir> - <FrameworkDir Condition="'$(FrameworkDir)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\.NETFramework@InstallRoot)</FrameworkDir> - - <FrameworkSdkDir Condition="'$(UseEnv)' != 'true'">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.0A@InstallationFolder)</FrameworkSdkDir> - <FrameworkSdkDir Condition="'$(FrameworkSdkDir)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Microsoft SDKs\Windows\v7.0A@InstallationFolder)</FrameworkSdkDir> - - <FrameworkVersion Condition="'$(UseEnv)' != 'true'">v4.0</FrameworkVersion> - <Framework35Version Condition="'$(UseEnv)' != 'true'">v3.5</Framework35Version> - - <ExecutablePath Condition="'$(ExecutablePath)' == ''">$(VCInstallDir)bin\x86_amd64;$(VCInstallDir)bin;$(WindowsSdkDir)bin\NETFX 4.0 Tools;$(WindowsSdkDir)bin;$(VSInstallDir)Common7\Tools\bin;$(VSInstallDir)Common7\tools;$(VSInstallDir)Common7\ide;$(ProgramFiles)\HTML Help Workshop;$(FrameworkSDKDir)\bin;$(FrameworkSDKDir)\lib\win64;$(MSBuildToolsPath32);$(FxCopDir);$(PATH);</ExecutablePath> - <IncludePath>$(WDKInstallDir)\inc\api;$(WDKInstallDir)\inc\crt;$(WDKInstallDir)\inc\api\crt\stl70;$(WDKInstallDir)\inc\mfc42;$(WDKInstallDir)\inc\ddk;$(WDKInstallDir)\inc\api\dao360;</IncludePath> - <LibraryPath>$(WDKInstallDir)\lib\wnet\amd64;$(WDKInstallDir)\lib\Crt\amd64;$(WDKInstallDir)\lib\Mfc\amd64;$(WDKInstallDir)\lib\ATL\amd64;</LibraryPath> - <SourcePath Condition="'$(SourcePath)' == ''">$(VCInstallDir)atlmfc\src\mfc;$(VCInstallDir)atlmfc\src\mfcm;$(VCInstallDir)atlmfc\src\atl;$(VCInstallDir)crt\src;</SourcePath> - <NativeExecutablePath Condition="'$(NativeExecutablePath)' == ''">$(VCInstallDir)bin\AMD64;$(VCInstallDir)VCPackages;$(WindowsSdkDir)bin\NETFX 4.0 Tools\x64;$(WindowsSdkDir)bin\NETFX 4.0 Tools;$(WindowsSdkDir)bin\x64;$(WindowsSdkDir)bin\win64\x64;$(WindowsSdkDir)bin;$(MSBuildToolsPath);$(PATH);</NativeExecutablePath> - </PropertyGroup> - - <ItemDefinitionGroup> - <Link> - <AdditionalDependencies>msvcrt_win2003.obj;%(AdditionalDependencies)</AdditionalDependencies> - </Link> - <ResourceCompile> - <SuppressStartupBanner Condition="'%(ResourceCompile.SuppressStartupBanner)' == ''">true</SuppressStartupBanner> - </ResourceCompile> - <ManifestResourceCompile> - <SuppressStartupBanner Condition="'%(ManifestResourceCompile.SuppressStartupBanner)'==''">true</SuppressStartupBanner> - </ManifestResourceCompile> - <Manifest> - <EnableDPIAwareness Condition="'$(EnableDPIAwareness)' == '' AND '$(UseOfMFC)' == 'static'">true</EnableDPIAwareness> - <EnableDPIAwareness Condition="'$(EnableDPIAwareness)' == '' AND '$(UseOfMFC)' == 'dynamic'">true</EnableDPIAwareness> - <EnableDPIAwareness Condition="'$(EnableDPIAwareness)' == '' AND '$(UseOfMFC)' != 'static' AND '$(UseOfMFC)' != 'dynamic'">false</EnableDPIAwareness> - </Manifest> - </ItemDefinitionGroup> - - <Import Project="$(VCTargetsPath)\Platforms\x64\PlatformToolsets\v100\ImportAfter\*.props" Condition="Exists('$(VCTargetsPath)\Platforms\x64\PlatformToolsets\v100\ImportAfter')" /> -</Project> diff --git a/win32/wdkpt/vs2010/Microsoft.Cpp.x64.WDK7.targets b/win32/wdkpt/vs2010/Microsoft.Cpp.x64.WDK7.targets deleted file mode 100644 index fa6651e1..00000000 --- a/win32/wdkpt/vs2010/Microsoft.Cpp.x64.WDK7.targets +++ /dev/null @@ -1,20 +0,0 @@ -<!-- -*********************************************************************************************** -Microsoft.Cpp.x64.v100.targets - -WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have - created a backup copy. Incorrect changes to this file will make it - impossible to load or build your projects from the command-line or the IDE. - -This file defines the steps/targets required to build Visual C++ (version 10.0) projects -specifically on X64 platforms. - -Copyright (C) Microsoft Corporation. All rights reserved. -*********************************************************************************************** ---> - -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$(VCTargetsPath)\Platforms\x64\PlatformToolsets\v100\ImportBefore\*.targets" Condition="Exists('$(VCTargetsPath)\Platforms\x64\PlatformToolsets\v100\ImportBefore')" /> - - <Import Project="$(VCTargetsPath)\Platforms\x64\PlatformToolsets\v100\ImportAfter\*.targets" Condition="Exists('$(VCTargetsPath)\Platforms\x64\PlatformToolsets\v100\ImportAfter')" /> -</Project> diff --git a/win32/wdkpt/vs2010/wdkpt.aip b/win32/wdkpt/vs2010/wdkpt.aip deleted file mode 100644 index 38502e5e..00000000 --- a/win32/wdkpt/vs2010/wdkpt.aip +++ /dev/null @@ -1,137 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<DOCUMENT Type="Advanced Installer" CreateVersion="9.2" version="9.5" Modules="simple" RootPath="." Language="en" Id="{F800981F-A57B-40E4-91FE-3C228741E1AD}"> - <COMPONENT cid="caphyon.advinst.msicomp.MsiValidationComponent"> - <ROW Table="File" Column="Sequence" MinValue="1" MaxValue="32767" Description="Sequence with respect to the media images; order must track cabinet order." Options="0" ColumnType="2" ColumnIndex="7" ColumnSize="2" MsiKey="File#Sequence"/> - <ROW Table="Media" Column="LastSequence" MinValue="0" MaxValue="32767" Description="File sequence number for the last file for this media." Options="0" ColumnType="2" ColumnIndex="1" ColumnSize="2" MsiKey="Media#LastSequence"/> - </COMPONENT> - <COMPONENT cid="caphyon.advinst.msicomp.MsiPropsComponent"> - <ROW Property="ALLUSERS" Value="2" MultiBuildValue="DefaultBuild:1"/> - <ROW Property="ARPCOMMENTS" Value="This installer database contains the logic and data required to install [|ProductName]." ValueLocId="*"/> - <ROW Property="ARPHELPLINK" Value="http://www.hexchat.org/developers/wdk-platform-toolset"/> - <ROW Property="ARPURLINFOABOUT" Value="http://www.hexchat.org/developers/wdk-platform-toolset"/> - <ROW Property="ARPURLUPDATEINFO" Value="http://www.hexchat.org/developers/wdk-platform-toolset"/> - <ROW Property="Manufacturer" Value="HexChat" ValueLocId="*"/> - <ROW Property="ProductCode" Value="1033:{6C7B98A1-9E15-4756-9FCA-0566ED776BE3} " Type="16"/> - <ROW Property="ProductLanguage" Value="1033"/> - <ROW Property="ProductName" Value="Visual Studio 2010 Windows Driver Kit Platform Toolset" ValueLocId="*"/> - <ROW Property="ProductVersion" Value="1.1" Type="32"/> - <ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND"/> - <ROW Property="UpgradeCode" Value="{1947FE78-21A1-4B81-99CE-E07AAEE6077D}"/> - <ROW Property="WindowsType9X" MultiBuildValue="DefaultBuild:Windows 9x/ME" ValueLocId="-"/> - <ROW Property="WindowsType9XDisplay" MultiBuildValue="DefaultBuild:Windows 9x/ME" ValueLocId="-"/> - </COMPONENT> - <COMPONENT cid="caphyon.advinst.msicomp.MsiDirsComponent"> - <ROW Directory="APPDIR" Directory_Parent="TARGETDIR" DefaultDir="APPDIR:." IsPseudoRoot="1"/> - <ROW Directory="MSBuild_Dir" Directory_Parent="ProgramFilesFolder" DefaultDir="MSBuild"/> - <ROW Directory="Microsoft.Cpp_Dir" Directory_Parent="MSBuild_Dir" DefaultDir="Micros~1.Cpp|Microsoft.Cpp"/> - <ROW Directory="PlatformToolsets_1_Dir" Directory_Parent="x64_Dir" DefaultDir="Platfo~1|PlatformToolsets"/> - <ROW Directory="PlatformToolsets_Dir" Directory_Parent="Win32_Dir" DefaultDir="Platfo~1|PlatformToolsets"/> - <ROW Directory="Platforms_Dir" Directory_Parent="v4.0_Dir" DefaultDir="Platfo~1|Platforms"/> - <ROW Directory="ProgramFilesFolder" Directory_Parent="TARGETDIR" DefaultDir="Progra~1|ProgramFilesFolder" IsPseudoRoot="1"/> - <ROW Directory="TARGETDIR" DefaultDir="SourceDir"/> - <ROW Directory="WDK7_1_Dir" Directory_Parent="PlatformToolsets_1_Dir" DefaultDir="WDK7"/> - <ROW Directory="WDK7_Dir" Directory_Parent="PlatformToolsets_Dir" DefaultDir="WDK7"/> - <ROW Directory="Win32_Dir" Directory_Parent="Platforms_Dir" DefaultDir="Win32"/> - <ROW Directory="v4.0_Dir" Directory_Parent="Microsoft.Cpp_Dir" DefaultDir="v4.0"/> - <ROW Directory="x64_Dir" Directory_Parent="Platforms_Dir" DefaultDir="x64"/> - </COMPONENT> - <COMPONENT cid="caphyon.advinst.msicomp.MsiCompsComponent"> - <ROW Component="Microsoft.Cpp.Win32.WDK7.props" ComponentId="{3EA16365-3C7E-4F84-A326-C7F28B33F487}" Directory_="WDK7_Dir" Attributes="0" KeyPath="Microsoft.Cpp.Win32.WDK7.props" Type="0"/> - <ROW Component="Microsoft.Cpp.x64.WDK7.props" ComponentId="{50DB333C-5D3E-4A14-80B9-BA1D727BD220}" Directory_="WDK7_1_Dir" Attributes="0" KeyPath="Microsoft.Cpp.x64.WDK7.props" Type="0"/> - </COMPONENT> - <COMPONENT cid="caphyon.advinst.msicomp.MsiFeatsComponent"> - <ROW Feature="MainFeature" Title="MainFeature" Description="Description" Display="1" Level="1" Directory_="APPDIR" Attributes="0" Components="Microsoft.Cpp.Win32.WDK7.props Microsoft.Cpp.x64.WDK7.props"/> - <ATTRIBUTE name="CurrentFeature" value="MainFeature"/> - </COMPONENT> - <COMPONENT cid="caphyon.advinst.msicomp.MsiFilesComponent"> - <ROW File="Microsoft.Cpp.Win32.WDK7.props" Component_="Microsoft.Cpp.Win32.WDK7.props" FileName="Micros~1.pro|Microsoft.Cpp.Win32.WDK7.props" Attributes="0" SourcePath="Microsoft.Cpp.Win32.WDK7.props" SelfReg="false" NextFile="Microsoft.Cpp.Win32.WDK7.targets"/> - <ROW File="Microsoft.Cpp.Win32.WDK7.targets" Component_="Microsoft.Cpp.Win32.WDK7.props" FileName="Micros~1.tar|Microsoft.Cpp.Win32.WDK7.targets" Attributes="0" SourcePath="Microsoft.Cpp.Win32.WDK7.targets" SelfReg="false" NextFile="Microsoft.Cpp.x64.WDK7.props"/> - <ROW File="Microsoft.Cpp.x64.WDK7.props" Component_="Microsoft.Cpp.x64.WDK7.props" FileName="Micros~1.pro|Microsoft.Cpp.x64.WDK7.props" Attributes="0" SourcePath="Microsoft.Cpp.x64.WDK7.props" SelfReg="false" NextFile="Microsoft.Cpp.x64.WDK7.targets"/> - <ROW File="Microsoft.Cpp.x64.WDK7.targets" Component_="Microsoft.Cpp.x64.WDK7.props" FileName="Micros~1.tar|Microsoft.Cpp.x64.WDK7.targets" Attributes="0" SourcePath="Microsoft.Cpp.x64.WDK7.targets" SelfReg="false"/> - </COMPONENT> - <COMPONENT cid="caphyon.advinst.msicomp.BuildComponent"> - <ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="0" PackageFolder="." PackageFileName="Visual Studio 2010 Windows Driver Kit Platform Toolset 1.1" Languages="en" InstallationType="4" UseLargeSchema="true"/> - <ATTRIBUTE name="CurrentBuild" value="DefaultBuild"/> - </COMPONENT> - <COMPONENT cid="caphyon.advinst.msicomp.DictionaryComponent"> - <ROW Path="<AI_DICTS>ui.ail"/> - <ROW Path="<AI_DICTS>ui_en.ail"/> - </COMPONENT> - <COMPONENT cid="caphyon.advinst.msicomp.FragmentComponent"> - <ROW Fragment="CommonUI.aip" Path="<AI_FRAGS>CommonUI.aip"/> - <ROW Fragment="MaintenanceTypeDlg.aip" Path="<AI_THEMES>classic\fragments\MaintenanceTypeDlg.aip"/> - <ROW Fragment="MaintenanceWelcomeDlg.aip" Path="<AI_THEMES>classic\fragments\MaintenanceWelcomeDlg.aip"/> - <ROW Fragment="SequenceDialogs.aip" Path="<AI_THEMES>classic\fragments\SequenceDialogs.aip"/> - <ROW Fragment="Sequences.aip" Path="<AI_FRAGS>Sequences.aip"/> - <ROW Fragment="StaticUIStrings.aip" Path="<AI_FRAGS>StaticUIStrings.aip"/> - <ROW Fragment="UI.aip" Path="<AI_THEMES>classic\fragments\UI.aip"/> - <ROW Fragment="Validation.aip" Path="<AI_FRAGS>Validation.aip"/> - <ROW Fragment="VerifyRemoveDlg.aip" Path="<AI_THEMES>classic\fragments\VerifyRemoveDlg.aip"/> - <ROW Fragment="VerifyRepairDlg.aip" Path="<AI_THEMES>classic\fragments\VerifyRepairDlg.aip"/> - <ROW Fragment="WelcomeDlg.aip" Path="<AI_THEMES>classic\fragments\WelcomeDlg.aip"/> - </COMPONENT> - <COMPONENT cid="caphyon.advinst.msicomp.MsiBinaryComponent"> - <ROW Name="aicustact.dll" SourcePath="<AI_CUSTACTS>aicustact.dll"/> - </COMPONENT> - <COMPONENT cid="caphyon.advinst.msicomp.MsiControlComponent"> - <ATTRIBUTE name="FixedSizeBitmaps" value="0"/> - </COMPONENT> - <COMPONENT cid="caphyon.advinst.msicomp.MsiControlEventComponent"> - <ROW Dialog_="WelcomeDlg" Control_="Next" Event="NewDialog" Argument="VerifyReadyDlg" Condition="AI_INSTALL" Ordering="1"/> - <ROW Dialog_="MaintenanceWelcomeDlg" Control_="Next" Event="NewDialog" Argument="MaintenanceTypeDlg" Condition="AI_MAINT" Ordering="99"/> - <ROW Dialog_="CustomizeDlg" Control_="Next" Event="NewDialog" Argument="VerifyReadyDlg" Condition="AI_MAINT" Ordering="101"/> - <ROW Dialog_="VerifyReadyDlg" Control_="Install" Event="EndDialog" Argument="Return" Condition="AI_INSTALL" Ordering="197"/> - <ROW Dialog_="VerifyReadyDlg" Control_="Back" Event="NewDialog" Argument="WelcomeDlg" Condition="AI_INSTALL" Ordering="201"/> - <ROW Dialog_="CustomizeDlg" Control_="Back" Event="NewDialog" Argument="MaintenanceTypeDlg" Condition="AI_MAINT" Ordering="1"/> - <ROW Dialog_="VerifyReadyDlg" Control_="Install" Event="EndDialog" Argument="Return" Condition="AI_MAINT" Ordering="198"/> - <ROW Dialog_="VerifyReadyDlg" Control_="Back" Event="NewDialog" Argument="CustomizeDlg" Condition="AI_MAINT" Ordering="202"/> - <ROW Dialog_="MaintenanceTypeDlg" Control_="ChangeButton" Event="NewDialog" Argument="CustomizeDlg" Condition="AI_MAINT" Ordering="501"/> - <ROW Dialog_="MaintenanceTypeDlg" Control_="Back" Event="NewDialog" Argument="MaintenanceWelcomeDlg" Condition="AI_MAINT" Ordering="1"/> - <ROW Dialog_="MaintenanceTypeDlg" Control_="RemoveButton" Event="NewDialog" Argument="VerifyRemoveDlg" Condition="AI_MAINT AND InstallMode="Remove"" Ordering="601"/> - <ROW Dialog_="VerifyRemoveDlg" Control_="Back" Event="NewDialog" Argument="MaintenanceTypeDlg" Condition="AI_MAINT AND InstallMode="Remove"" Ordering="1"/> - <ROW Dialog_="MaintenanceTypeDlg" Control_="RepairButton" Event="NewDialog" Argument="VerifyRepairDlg" Condition="AI_MAINT AND InstallMode="Repair"" Ordering="601"/> - <ROW Dialog_="VerifyRepairDlg" Control_="Back" Event="NewDialog" Argument="MaintenanceTypeDlg" Condition="AI_MAINT AND InstallMode="Repair"" Ordering="1"/> - <ROW Dialog_="VerifyRepairDlg" Control_="Repair" Event="EndDialog" Argument="Return" Condition="AI_MAINT AND InstallMode="Repair"" Ordering="399"/> - <ROW Dialog_="VerifyRemoveDlg" Control_="Remove" Event="EndDialog" Argument="Return" Condition="AI_MAINT AND InstallMode="Remove"" Ordering="299"/> - <ROW Dialog_="PatchWelcomeDlg" Control_="Next" Event="NewDialog" Argument="VerifyReadyDlg" Condition="AI_PATCH" Ordering="201"/> - <ROW Dialog_="VerifyReadyDlg" Control_="Install" Event="EndDialog" Argument="Return" Condition="AI_PATCH" Ordering="199"/> - <ROW Dialog_="VerifyReadyDlg" Control_="Back" Event="NewDialog" Argument="PatchWelcomeDlg" Condition="AI_PATCH" Ordering="203"/> - <ROW Dialog_="ResumeDlg" Control_="Install" Event="EndDialog" Argument="Return" Condition="AI_RESUME" Ordering="299"/> - </COMPONENT> - <COMPONENT cid="caphyon.advinst.msicomp.MsiCustActComponent"> - <ROW Action="AI_DOWNGRADE" Type="19" Target="4010"/> - <ROW Action="AI_InstallModeCheck" Type="1" Source="aicustact.dll" Target="UpdateInstallMode" WithoutSeq="true"/> - <ROW Action="AI_PREPARE_UPGRADE" Type="65" Source="aicustact.dll" Target="PrepareUpgrade"/> - <ROW Action="AI_RESTORE_LOCATION" Type="65" Source="aicustact.dll" Target="RestoreLocation"/> - <ROW Action="AI_ResolveKnownFolders" Type="1" Source="aicustact.dll" Target="AI_ResolveKnownFolders"/> - <ROW Action="AI_ResolveLocalizedCredentials" Type="1" Source="aicustact.dll" Target="GetLocalizedCredentials"/> - <ROW Action="AI_SHOW_LOG" Type="65" Source="aicustact.dll" Target="LaunchLogFile" WithoutSeq="true"/> - <ROW Action="AI_STORE_LOCATION" Type="51" Source="ARPINSTALLLOCATION" Target="[APPDIR]"/> - <ROW Action="SET_APPDIR" Type="307" Source="APPDIR" Target="[ProgramFilesFolder][Manufacturer]\[ProductName]"/> - <ROW Action="SET_SHORTCUTDIR" Type="307" Source="SHORTCUTDIR" Target="[ProgramMenuFolder][ProductName]"/> - <ROW Action="SET_TARGETDIR_TO_APPDIR" Type="51" Source="TARGETDIR" Target="[APPDIR]"/> - </COMPONENT> - <COMPONENT cid="caphyon.advinst.msicomp.MsiInstExSeqComponent"> - <ROW Action="AI_DOWNGRADE" Condition="AI_NEWERPRODUCTFOUND AND (UILevel <> 5)" Sequence="210"/> - <ROW Action="AI_RESTORE_LOCATION" Condition="APPDIR=""" Sequence="749"/> - <ROW Action="AI_STORE_LOCATION" Condition="(Not Installed) OR REINSTALL" Sequence="1501"/> - <ROW Action="AI_PREPARE_UPGRADE" Condition="AI_UPGRADE="No" AND (Not Installed)" Sequence="1399"/> - <ROW Action="AI_ResolveKnownFolders" Sequence="52"/> - <ROW Action="AI_ResolveLocalizedCredentials" Sequence="51"/> - </COMPONENT> - <COMPONENT cid="caphyon.advinst.msicomp.MsiInstallUISequenceComponent"> - <ROW Action="AI_RESTORE_LOCATION" Condition="APPDIR=""" Sequence="749"/> - <ROW Action="AI_ResolveKnownFolders" Sequence="52"/> - <ROW Action="AI_ResolveLocalizedCredentials" Sequence="51"/> - </COMPONENT> - <COMPONENT cid="caphyon.advinst.msicomp.MsiLaunchConditionsComponent"> - <ROW Condition="VersionNT" Description="[ProductName] cannot be installed on [WindowsType9XDisplay]" DescriptionLocId="AI.LaunchCondition.No9X" IsPredefined="true" Builds="DefaultBuild"/> - </COMPONENT> - <COMPONENT cid="caphyon.advinst.msicomp.MsiThemeComponent"> - <ATTRIBUTE name="UsedTheme" value="classic"/> - </COMPONENT> - <COMPONENT cid="caphyon.advinst.msicomp.MsiUpgradeComponent"> - <ROW UpgradeCode="[|UpgradeCode]" VersionMax="[|ProductVersion]" Attributes="1025" ActionProperty="OLDPRODUCTS"/> - <ROW UpgradeCode="[|UpgradeCode]" VersionMin="[|ProductVersion]" Attributes="2" ActionProperty="AI_NEWERPRODUCTFOUND"/> - </COMPONENT> -</DOCUMENT> diff --git a/win32/wdkpt/vs2012/Microsoft.Cpp.Win32.WDK7.props b/win32/wdkpt/vs2012/Microsoft.Cpp.Win32.WDK7.props deleted file mode 100644 index 8a9fe767..00000000 --- a/win32/wdkpt/vs2012/Microsoft.Cpp.Win32.WDK7.props +++ /dev/null @@ -1,52 +0,0 @@ -<!-- -*********************************************************************************************** -Microsoft.Cpp.Win32.v110.props - -WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have - created a backup copy. Incorrect changes to this file will make it - impossible to load or build your projects from the command-line or the IDE. - -Copyright (C) Microsoft Corporation. All rights reserved. -*********************************************************************************************** ---> - -<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$(VCTargetsPath)\Platforms\Win32\PlatformToolsets\v110\ImportBefore\*.props" Condition="Exists('$(VCTargetsPath)\Platforms\Win32\PlatformToolsets\v110\ImportBefore')" /> - - <PropertyGroup> - <WDKInstallDir>$(SystemDrive)\WinDDK\7600.16385.1</WDKInstallDir> - <!-- Required for enabling Team Build for packaging Windows Store app projects --> - <OutDirWasSpecified Condition=" '$(OutDir)'!='' AND '$(OutDirWasSpecified)'=='' ">true</OutDirWasSpecified> - <OutDirWasSpecified Condition=" '$(OutDir)'=='' AND '$(OutDirWasSpecified)'=='' ">false</OutDirWasSpecified> - - <IntDir Condition="'$(IntDir)'=='' AND '$(IntermediateOutputPath)'!=''">$(IntermediateOutputPath)</IntDir> - <IntDir Condition="'$(IntDir)'=='' AND '$(IntermediateOutputPath)'==''">$(Configuration)\</IntDir> - <OutDir Condition="'$(OutDir)'=='' AND '$(SolutionDir)' != ''">$(SolutionDir)$(Configuration)\</OutDir> - <OutDir Condition="'$(OutDir)'=='' AND '$(SolutionDir)' == ''">$(IntDir)</OutDir> - </PropertyGroup> - - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Common.props" /> - - <PropertyGroup> - <ExecutablePath Condition="'$(ExecutablePath)' == ''">$(VCInstallDir)bin;$(WindowsSDK_ExecutablePath_x86);$(VSInstallDir)Common7\Tools\bin;$(VSInstallDir)Common7\tools;$(VSInstallDir)Common7\ide;$(ProgramFiles)\HTML Help Workshop;$(MSBuildToolsPath32);$(VSInstallDir);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH);</ExecutablePath> - <IncludePath>$(WDKInstallDir)\inc\api;$(WDKInstallDir)\inc\crt;$(WDKInstallDir)\inc\api\crt\stl70;$(WDKInstallDir)\inc\mfc42;$(WDKInstallDir)\inc\ddk;$(WDKInstallDir)\inc\api\dao360;</IncludePath> - <ReferencePath Condition="'$(ReferencePath)' == ''">$(VCInstallDir)atlmfc\lib;$(VCInstallDir)lib</ReferencePath> - <LibraryPath>$(WDKInstallDir)\lib\wxp\i386;$(WDKInstallDir)\lib\Crt\i386;$(WDKInstallDir)\lib\Mfc\i386;$(WDKInstallDir)\lib\ATL\i386</LibraryPath> - <LibraryWPath Condition="'$(LibraryWPath)' == ''">$(WindowsSDK_MetadataPath)</LibraryWPath> - <SourcePath Condition="'$(SourcePath)' == ''">$(VCInstallDir)atlmfc\src\mfc;$(VCInstallDir)atlmfc\src\mfcm;$(VCInstallDir)atlmfc\src\atl;$(VCInstallDir)crt\src;</SourcePath> - <ExcludePath Condition="'$(ExcludePath)' == ''">$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath);$(MSBuildToolsPath32);$(VCInstallDir)atlmfc\lib;$(VCInstallDir)lib;</ExcludePath> - <NativeExecutablePath Condition="'$(NativeExecutablePath)' == ''">$(ExecutablePath)</NativeExecutablePath> - <DebugCppRuntimeFilesPath Condition="'$(DebugCppRuntimeFilesPath)' == ''">$(VCInstallDir)redist\Debug_NonRedist\x86</DebugCppRuntimeFilesPath> - </PropertyGroup> - - <ItemDefinitionGroup> - <Link> - <AdditionalDependencies>msvcrt_winxp.obj;%(AdditionalDependencies)</AdditionalDependencies> - <MinimumRequiredVersion>5.1</MinimumRequiredVersion> - </Link> - </ItemDefinitionGroup> - - <Import Project="$(VCTargetsPath)\Platforms\Win32\PlatformToolsets\v110\ImportAfter\*.props" Condition="Exists('$(VCTargetsPath)\Platforms\Win32\PlatformToolsets\v110\ImportAfter')" /> - - <Import Project="$(VCTargetsPath)\Platforms\Win32\Microsoft.Cpp.Win32.Common.props" /> -</Project> diff --git a/win32/wdkpt/vs2012/Microsoft.Cpp.Win32.WDK7.targets b/win32/wdkpt/vs2012/Microsoft.Cpp.Win32.WDK7.targets deleted file mode 100644 index 3f50fc93..00000000 --- a/win32/wdkpt/vs2012/Microsoft.Cpp.Win32.WDK7.targets +++ /dev/null @@ -1,20 +0,0 @@ -<!-- -*********************************************************************************************** -Microsoft.Cpp.Win32.v110.targets - -WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have - created a backup copy. Incorrect changes to this file will make it - impossible to load or build your projects from the command-line or the IDE. - -This file defines the steps/targets required to build Visual C++ (version 11.0) projects -specifically on x86 platforms. - -Copyright (C) Microsoft Corporation. All rights reserved. -*********************************************************************************************** ---> - -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$(VCTargetsPath)\Platforms\Win32\PlatformToolsets\v110\ImportBefore\*.targets" Condition="Exists('$(VCTargetsPath)\Platforms\Win32\PlatformToolsets\v110\ImportBefore')" /> - <Import Project="$(VCTargetsPath)\Microsoft.CppCommon.targets" /> - <Import Project="$(VCTargetsPath)\Platforms\Win32\PlatformToolsets\v110\ImportAfter\*.targets" Condition="Exists('$(VCTargetsPath)\Platforms\Win32\PlatformToolsets\v110\ImportAfter')" /> -</Project> diff --git a/win32/wdkpt/vs2012/Microsoft.Cpp.x64.WDK7.props b/win32/wdkpt/vs2012/Microsoft.Cpp.x64.WDK7.props deleted file mode 100644 index 9d7825c0..00000000 --- a/win32/wdkpt/vs2012/Microsoft.Cpp.x64.WDK7.props +++ /dev/null @@ -1,52 +0,0 @@ -<!-- -*********************************************************************************************** -Microsoft.Cpp.x64.v110.props - -WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have - created a backup copy. Incorrect changes to this file will make it - impossible to load or build your projects from the command-line or the IDE. - -Copyright (C) Microsoft Corporation. All rights reserved. -*********************************************************************************************** ---> - -<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$(VCTargetsPath)\Platforms\x64\PlatformToolsets\v110\ImportBefore\*.props" Condition="Exists('$(VCTargetsPath)\Platforms\x64\PlatformToolsets\v110\ImportBefore')" /> - - <PropertyGroup> - <WDKInstallDir>$(SystemDrive)\WinDDK\7600.16385.1</WDKInstallDir> - <!-- Required for enabling Team Build for packaging Windows Store app projects --> - <OutDirWasSpecified Condition=" '$(OutDir)'!='' AND '$(OutDirWasSpecified)'=='' ">true</OutDirWasSpecified> - <OutDirWasSpecified Condition=" '$(OutDir)'=='' AND '$(OutDirWasSpecified)'=='' ">false</OutDirWasSpecified> - - <IntDir Condition="'$(IntDir)'=='' AND '$(IntermediateOutputPath)'!=''">$(IntermediateOutputPath)</IntDir> - <IntDir Condition="'$(IntDir)'=='' AND '$(IntermediateOutputPath)'==''">$(Platform)\$(Configuration)\</IntDir> - <OutDir Condition="'$(OutDir)'=='' AND '$(SolutionDir)' == ''">$(IntDir)</OutDir> - <OutDir Condition="'$(OutDir)'=='' AND '$(SolutionDir)' != ''">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir> - </PropertyGroup> - - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Common.props" /> - - <PropertyGroup> - <ExecutablePath Condition="'$(ExecutablePath)' == ''">$(VCInstallDir)bin\x86_amd64;$(VCInstallDir)bin;$(WindowsSDK_ExecutablePath_x86);$(VSInstallDir)Common7\Tools\bin;$(VSInstallDir)Common7\tools;$(VSInstallDir)Common7\ide;$(ProgramFiles)\HTML Help Workshop;$(MSBuildToolsPath32);$(FxCopDir);$(PATH);</ExecutablePath> - <IncludePath>$(WDKInstallDir)\inc\api;$(WDKInstallDir)\inc\crt;$(WDKInstallDir)\inc\api\crt\stl70;$(WDKInstallDir)\inc\mfc42;$(WDKInstallDir)\inc\ddk;$(WDKInstallDir)\inc\api\dao360;</IncludePath> - <ReferencePath Condition="'$(ReferencePath)' == ''">$(VCInstallDir)atlmfc\lib\amd64;$(VCInstallDir)lib\amd64;</ReferencePath> - <LibraryPath>$(WDKInstallDir)\lib\wnet\amd64;$(WDKInstallDir)\lib\Crt\amd64;$(WDKInstallDir)\lib\Mfc\amd64;$(WDKInstallDir)\lib\ATL\amd64;</LibraryPath> - <LibraryWPath Condition="'$(LibraryWPath)' == ''">$(WindowsSDK_MetadataPath)</LibraryWPath> - <SourcePath Condition="'$(SourcePath)' == ''">$(VCInstallDir)atlmfc\src\mfc;$(VCInstallDir)atlmfc\src\mfcm;$(VCInstallDir)atlmfc\src\atl;$(VCInstallDir)crt\src;</SourcePath> - <ExcludePath Condition="'$(ExcludePath)' == ''">$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath);$(MSBuildToolsPath);$(MSBuildToolsPath32);$(VCInstallDir)atlmfc\lib\amd64;$(VCInstallDir)lib\amd64;</ExcludePath> - <NativeExecutablePath Condition="'$(NativeExecutablePath)' == ''">$(VCInstallDir)bin\AMD64;$(VCInstallDir)VCPackages;$(WindowsSDK_ExecutablePath_x64);$(WindowsSDK_ExecutablePath_x86);$(MSBuildToolsPath);$(PATH);</NativeExecutablePath> - <DebugCppRuntimeFilesPath Condition="'$(DebugCppRuntimeFilesPath)' == ''">$(VCInstallDir)redist\Debug_NonRedist\x64</DebugCppRuntimeFilesPath> - </PropertyGroup> - - <ItemDefinitionGroup> - <Link> - <AdditionalDependencies>msvcrt_win2003.obj;%(AdditionalDependencies)</AdditionalDependencies> - <MinimumRequiredVersion>5.2</MinimumRequiredVersion> - </Link> - </ItemDefinitionGroup> - - <Import Project="$(VCTargetsPath)\Platforms\x64\PlatformToolsets\v110\ImportAfter\*.props" Condition="Exists('$(VCTargetsPath)\Platforms\x64\PlatformToolsets\v110\ImportAfter')" /> - - <Import Project="$(VCTargetsPath)\Platforms\x64\Microsoft.Cpp.x64.Common.props" /> -</Project> diff --git a/win32/wdkpt/vs2012/Microsoft.Cpp.x64.WDK7.targets b/win32/wdkpt/vs2012/Microsoft.Cpp.x64.WDK7.targets deleted file mode 100644 index 2c6271c8..00000000 --- a/win32/wdkpt/vs2012/Microsoft.Cpp.x64.WDK7.targets +++ /dev/null @@ -1,20 +0,0 @@ -<!-- -*********************************************************************************************** -Microsoft.Cpp.x64.v110.targets - -WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have - created a backup copy. Incorrect changes to this file will make it - impossible to load or build your projects from the command-line or the IDE. - -This file defines the steps/targets required to build Visual C++ (version 11.0) projects -specifically on X64 platforms. - -Copyright (C) Microsoft Corporation. All rights reserved. -*********************************************************************************************** ---> - -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$(VCTargetsPath)\Platforms\x64\PlatformToolsets\v110\ImportBefore\*.targets" Condition="Exists('$(VCTargetsPath)\Platforms\x64\PlatformToolsets\v110\ImportBefore')" /> - <Import Project="$(VCTargetsPath)\Microsoft.CppCommon.targets" /> - <Import Project="$(VCTargetsPath)\Platforms\x64\PlatformToolsets\v110\ImportAfter\*.targets" Condition="Exists('$(VCTargetsPath)\Platforms\x64\PlatformToolsets\v110\ImportAfter')" /> -</Project> diff --git a/win32/wdkpt/vs2012/wdkpt.aip b/win32/wdkpt/vs2012/wdkpt.aip deleted file mode 100644 index b6763d29..00000000 --- a/win32/wdkpt/vs2012/wdkpt.aip +++ /dev/null @@ -1,138 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<DOCUMENT Type="Advanced Installer" CreateVersion="9.2" version="9.5" Modules="simple" RootPath="." Language="en" Id="{F800981F-A57B-40E4-91FE-3C228741E1AD}"> - <COMPONENT cid="caphyon.advinst.msicomp.MsiValidationComponent"> - <ROW Table="File" Column="Sequence" MinValue="1" MaxValue="32767" Description="Sequence with respect to the media images; order must track cabinet order." Options="0" ColumnType="2" ColumnIndex="7" ColumnSize="2" MsiKey="File#Sequence"/> - <ROW Table="Media" Column="LastSequence" MinValue="0" MaxValue="32767" Description="File sequence number for the last file for this media." Options="0" ColumnType="2" ColumnIndex="1" ColumnSize="2" MsiKey="Media#LastSequence"/> - </COMPONENT> - <COMPONENT cid="caphyon.advinst.msicomp.MsiPropsComponent"> - <ROW Property="ALLUSERS" Value="2" MultiBuildValue="DefaultBuild:1"/> - <ROW Property="ARPCOMMENTS" Value="This installer database contains the logic and data required to install [|ProductName]." ValueLocId="*"/> - <ROW Property="ARPHELPLINK" Value="http://www.hexchat.org/developers/wdk-platform-toolset"/> - <ROW Property="ARPURLINFOABOUT" Value="http://www.hexchat.org/developers/wdk-platform-toolset"/> - <ROW Property="ARPURLUPDATEINFO" Value="http://www.hexchat.org/developers/wdk-platform-toolset"/> - <ROW Property="Manufacturer" Value="HexChat" ValueLocId="*"/> - <ROW Property="ProductCode" Value="1033:{2EE972A9-9913-48AF-B0D7-BF76215BE858} " Type="16"/> - <ROW Property="ProductLanguage" Value="1033"/> - <ROW Property="ProductName" Value="Visual Studio 2012 Windows Driver Kit Platform Toolset" ValueLocId="*"/> - <ROW Property="ProductVersion" Value="1.2" Type="32"/> - <ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND"/> - <ROW Property="UpgradeCode" Value="{A569B016-AF0C-4D04-8EF8-0144088E92D0}"/> - <ROW Property="WindowsType9X" MultiBuildValue="DefaultBuild:Windows 9x/ME" ValueLocId="-"/> - <ROW Property="WindowsType9XDisplay" MultiBuildValue="DefaultBuild:Windows 9x/ME" ValueLocId="-"/> - </COMPONENT> - <COMPONENT cid="caphyon.advinst.msicomp.MsiDirsComponent"> - <ROW Directory="APPDIR" Directory_Parent="TARGETDIR" DefaultDir="APPDIR:." IsPseudoRoot="1"/> - <ROW Directory="MSBuild_Dir" Directory_Parent="ProgramFilesFolder" DefaultDir="MSBuild"/> - <ROW Directory="Microsoft.Cpp_Dir" Directory_Parent="MSBuild_Dir" DefaultDir="Micros~1.Cpp|Microsoft.Cpp"/> - <ROW Directory="PlatformToolsets_1_Dir" Directory_Parent="x64_Dir" DefaultDir="Platfo~1|PlatformToolsets"/> - <ROW Directory="PlatformToolsets_Dir" Directory_Parent="Win32_Dir" DefaultDir="Platfo~1|PlatformToolsets"/> - <ROW Directory="Platforms_Dir" Directory_Parent="V110_Dir" DefaultDir="Platfo~1|Platforms"/> - <ROW Directory="ProgramFilesFolder" Directory_Parent="TARGETDIR" DefaultDir="Progra~1|ProgramFilesFolder" IsPseudoRoot="1"/> - <ROW Directory="TARGETDIR" DefaultDir="SourceDir"/> - <ROW Directory="V110_Dir" Directory_Parent="v4.0_Dir" DefaultDir="V110"/> - <ROW Directory="WDK7_1_Dir" Directory_Parent="PlatformToolsets_1_Dir" DefaultDir="WDK7"/> - <ROW Directory="WDK7_Dir" Directory_Parent="PlatformToolsets_Dir" DefaultDir="WDK7"/> - <ROW Directory="Win32_Dir" Directory_Parent="Platforms_Dir" DefaultDir="Win32"/> - <ROW Directory="v4.0_Dir" Directory_Parent="Microsoft.Cpp_Dir" DefaultDir="v4.0"/> - <ROW Directory="x64_Dir" Directory_Parent="Platforms_Dir" DefaultDir="x64"/> - </COMPONENT> - <COMPONENT cid="caphyon.advinst.msicomp.MsiCompsComponent"> - <ROW Component="Microsoft.Cpp.Win32.WDK7.props" ComponentId="{3EA16365-3C7E-4F84-A326-C7F28B33F487}" Directory_="WDK7_Dir" Attributes="0" KeyPath="Microsoft.Cpp.Win32.WDK7.props" Type="0"/> - <ROW Component="Microsoft.Cpp.x64.WDK7.props" ComponentId="{50DB333C-5D3E-4A14-80B9-BA1D727BD220}" Directory_="WDK7_1_Dir" Attributes="0" KeyPath="Microsoft.Cpp.x64.WDK7.props" Type="0"/> - </COMPONENT> - <COMPONENT cid="caphyon.advinst.msicomp.MsiFeatsComponent"> - <ROW Feature="MainFeature" Title="MainFeature" Description="Description" Display="1" Level="1" Directory_="APPDIR" Attributes="0" Components="Microsoft.Cpp.Win32.WDK7.props Microsoft.Cpp.x64.WDK7.props"/> - <ATTRIBUTE name="CurrentFeature" value="MainFeature"/> - </COMPONENT> - <COMPONENT cid="caphyon.advinst.msicomp.MsiFilesComponent"> - <ROW File="Microsoft.Cpp.Win32.WDK7.props" Component_="Microsoft.Cpp.Win32.WDK7.props" FileName="Micros~1.pro|Microsoft.Cpp.Win32.WDK7.props" Attributes="0" SourcePath="Microsoft.Cpp.Win32.WDK7.props" SelfReg="false" NextFile="Microsoft.Cpp.Win32.WDK7.targets"/> - <ROW File="Microsoft.Cpp.Win32.WDK7.targets" Component_="Microsoft.Cpp.Win32.WDK7.props" FileName="Micros~1.tar|Microsoft.Cpp.Win32.WDK7.targets" Attributes="0" SourcePath="Microsoft.Cpp.Win32.WDK7.targets" SelfReg="false" NextFile="Microsoft.Cpp.x64.WDK7.props"/> - <ROW File="Microsoft.Cpp.x64.WDK7.props" Component_="Microsoft.Cpp.x64.WDK7.props" FileName="Micros~1.pro|Microsoft.Cpp.x64.WDK7.props" Attributes="0" SourcePath="Microsoft.Cpp.x64.WDK7.props" SelfReg="false" NextFile="Microsoft.Cpp.x64.WDK7.targets"/> - <ROW File="Microsoft.Cpp.x64.WDK7.targets" Component_="Microsoft.Cpp.x64.WDK7.props" FileName="Micros~1.tar|Microsoft.Cpp.x64.WDK7.targets" Attributes="0" SourcePath="Microsoft.Cpp.x64.WDK7.targets" SelfReg="false"/> - </COMPONENT> - <COMPONENT cid="caphyon.advinst.msicomp.BuildComponent"> - <ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="0" PackageFolder="." PackageFileName="Visual Studio 2012 Windows Driver Kit Platform Toolset 1.2" Languages="en" InstallationType="4" UseLargeSchema="true"/> - <ATTRIBUTE name="CurrentBuild" value="DefaultBuild"/> - </COMPONENT> - <COMPONENT cid="caphyon.advinst.msicomp.DictionaryComponent"> - <ROW Path="<AI_DICTS>ui.ail"/> - <ROW Path="<AI_DICTS>ui_en.ail"/> - </COMPONENT> - <COMPONENT cid="caphyon.advinst.msicomp.FragmentComponent"> - <ROW Fragment="CommonUI.aip" Path="<AI_FRAGS>CommonUI.aip"/> - <ROW Fragment="MaintenanceTypeDlg.aip" Path="<AI_THEMES>classic\fragments\MaintenanceTypeDlg.aip"/> - <ROW Fragment="MaintenanceWelcomeDlg.aip" Path="<AI_THEMES>classic\fragments\MaintenanceWelcomeDlg.aip"/> - <ROW Fragment="SequenceDialogs.aip" Path="<AI_THEMES>classic\fragments\SequenceDialogs.aip"/> - <ROW Fragment="Sequences.aip" Path="<AI_FRAGS>Sequences.aip"/> - <ROW Fragment="StaticUIStrings.aip" Path="<AI_FRAGS>StaticUIStrings.aip"/> - <ROW Fragment="UI.aip" Path="<AI_THEMES>classic\fragments\UI.aip"/> - <ROW Fragment="Validation.aip" Path="<AI_FRAGS>Validation.aip"/> - <ROW Fragment="VerifyRemoveDlg.aip" Path="<AI_THEMES>classic\fragments\VerifyRemoveDlg.aip"/> - <ROW Fragment="VerifyRepairDlg.aip" Path="<AI_THEMES>classic\fragments\VerifyRepairDlg.aip"/> - <ROW Fragment="WelcomeDlg.aip" Path="<AI_THEMES>classic\fragments\WelcomeDlg.aip"/> - </COMPONENT> - <COMPONENT cid="caphyon.advinst.msicomp.MsiBinaryComponent"> - <ROW Name="aicustact.dll" SourcePath="<AI_CUSTACTS>aicustact.dll"/> - </COMPONENT> - <COMPONENT cid="caphyon.advinst.msicomp.MsiControlComponent"> - <ATTRIBUTE name="FixedSizeBitmaps" value="0"/> - </COMPONENT> - <COMPONENT cid="caphyon.advinst.msicomp.MsiControlEventComponent"> - <ROW Dialog_="WelcomeDlg" Control_="Next" Event="NewDialog" Argument="VerifyReadyDlg" Condition="AI_INSTALL" Ordering="1"/> - <ROW Dialog_="MaintenanceWelcomeDlg" Control_="Next" Event="NewDialog" Argument="MaintenanceTypeDlg" Condition="AI_MAINT" Ordering="99"/> - <ROW Dialog_="CustomizeDlg" Control_="Next" Event="NewDialog" Argument="VerifyReadyDlg" Condition="AI_MAINT" Ordering="101"/> - <ROW Dialog_="VerifyReadyDlg" Control_="Install" Event="EndDialog" Argument="Return" Condition="AI_INSTALL" Ordering="197"/> - <ROW Dialog_="VerifyReadyDlg" Control_="Back" Event="NewDialog" Argument="WelcomeDlg" Condition="AI_INSTALL" Ordering="201"/> - <ROW Dialog_="CustomizeDlg" Control_="Back" Event="NewDialog" Argument="MaintenanceTypeDlg" Condition="AI_MAINT" Ordering="1"/> - <ROW Dialog_="VerifyReadyDlg" Control_="Install" Event="EndDialog" Argument="Return" Condition="AI_MAINT" Ordering="198"/> - <ROW Dialog_="VerifyReadyDlg" Control_="Back" Event="NewDialog" Argument="CustomizeDlg" Condition="AI_MAINT" Ordering="202"/> - <ROW Dialog_="MaintenanceTypeDlg" Control_="ChangeButton" Event="NewDialog" Argument="CustomizeDlg" Condition="AI_MAINT" Ordering="501"/> - <ROW Dialog_="MaintenanceTypeDlg" Control_="Back" Event="NewDialog" Argument="MaintenanceWelcomeDlg" Condition="AI_MAINT" Ordering="1"/> - <ROW Dialog_="MaintenanceTypeDlg" Control_="RemoveButton" Event="NewDialog" Argument="VerifyRemoveDlg" Condition="AI_MAINT AND InstallMode="Remove"" Ordering="601"/> - <ROW Dialog_="VerifyRemoveDlg" Control_="Back" Event="NewDialog" Argument="MaintenanceTypeDlg" Condition="AI_MAINT AND InstallMode="Remove"" Ordering="1"/> - <ROW Dialog_="MaintenanceTypeDlg" Control_="RepairButton" Event="NewDialog" Argument="VerifyRepairDlg" Condition="AI_MAINT AND InstallMode="Repair"" Ordering="601"/> - <ROW Dialog_="VerifyRepairDlg" Control_="Back" Event="NewDialog" Argument="MaintenanceTypeDlg" Condition="AI_MAINT AND InstallMode="Repair"" Ordering="1"/> - <ROW Dialog_="VerifyRepairDlg" Control_="Repair" Event="EndDialog" Argument="Return" Condition="AI_MAINT AND InstallMode="Repair"" Ordering="399"/> - <ROW Dialog_="VerifyRemoveDlg" Control_="Remove" Event="EndDialog" Argument="Return" Condition="AI_MAINT AND InstallMode="Remove"" Ordering="299"/> - <ROW Dialog_="PatchWelcomeDlg" Control_="Next" Event="NewDialog" Argument="VerifyReadyDlg" Condition="AI_PATCH" Ordering="201"/> - <ROW Dialog_="VerifyReadyDlg" Control_="Install" Event="EndDialog" Argument="Return" Condition="AI_PATCH" Ordering="199"/> - <ROW Dialog_="VerifyReadyDlg" Control_="Back" Event="NewDialog" Argument="PatchWelcomeDlg" Condition="AI_PATCH" Ordering="203"/> - <ROW Dialog_="ResumeDlg" Control_="Install" Event="EndDialog" Argument="Return" Condition="AI_RESUME" Ordering="299"/> - </COMPONENT> - <COMPONENT cid="caphyon.advinst.msicomp.MsiCustActComponent"> - <ROW Action="AI_DOWNGRADE" Type="19" Target="4010"/> - <ROW Action="AI_InstallModeCheck" Type="1" Source="aicustact.dll" Target="UpdateInstallMode" WithoutSeq="true"/> - <ROW Action="AI_PREPARE_UPGRADE" Type="65" Source="aicustact.dll" Target="PrepareUpgrade"/> - <ROW Action="AI_RESTORE_LOCATION" Type="65" Source="aicustact.dll" Target="RestoreLocation"/> - <ROW Action="AI_ResolveKnownFolders" Type="1" Source="aicustact.dll" Target="AI_ResolveKnownFolders"/> - <ROW Action="AI_ResolveLocalizedCredentials" Type="1" Source="aicustact.dll" Target="GetLocalizedCredentials"/> - <ROW Action="AI_SHOW_LOG" Type="65" Source="aicustact.dll" Target="LaunchLogFile" WithoutSeq="true"/> - <ROW Action="AI_STORE_LOCATION" Type="51" Source="ARPINSTALLLOCATION" Target="[APPDIR]"/> - <ROW Action="SET_APPDIR" Type="307" Source="APPDIR" Target="[ProgramFilesFolder][Manufacturer]\[ProductName]"/> - <ROW Action="SET_SHORTCUTDIR" Type="307" Source="SHORTCUTDIR" Target="[ProgramMenuFolder][ProductName]"/> - <ROW Action="SET_TARGETDIR_TO_APPDIR" Type="51" Source="TARGETDIR" Target="[APPDIR]"/> - </COMPONENT> - <COMPONENT cid="caphyon.advinst.msicomp.MsiInstExSeqComponent"> - <ROW Action="AI_DOWNGRADE" Condition="AI_NEWERPRODUCTFOUND AND (UILevel <> 5)" Sequence="210"/> - <ROW Action="AI_RESTORE_LOCATION" Condition="APPDIR=""" Sequence="749"/> - <ROW Action="AI_STORE_LOCATION" Condition="(Not Installed) OR REINSTALL" Sequence="1501"/> - <ROW Action="AI_PREPARE_UPGRADE" Condition="AI_UPGRADE="No" AND (Not Installed)" Sequence="1399"/> - <ROW Action="AI_ResolveKnownFolders" Sequence="52"/> - <ROW Action="AI_ResolveLocalizedCredentials" Sequence="51"/> - </COMPONENT> - <COMPONENT cid="caphyon.advinst.msicomp.MsiInstallUISequenceComponent"> - <ROW Action="AI_RESTORE_LOCATION" Condition="APPDIR=""" Sequence="749"/> - <ROW Action="AI_ResolveKnownFolders" Sequence="52"/> - <ROW Action="AI_ResolveLocalizedCredentials" Sequence="51"/> - </COMPONENT> - <COMPONENT cid="caphyon.advinst.msicomp.MsiLaunchConditionsComponent"> - <ROW Condition="VersionNT" Description="[ProductName] cannot be installed on [WindowsType9XDisplay]" DescriptionLocId="AI.LaunchCondition.No9X" IsPredefined="true" Builds="DefaultBuild"/> - </COMPONENT> - <COMPONENT cid="caphyon.advinst.msicomp.MsiThemeComponent"> - <ATTRIBUTE name="UsedTheme" value="classic"/> - </COMPONENT> - <COMPONENT cid="caphyon.advinst.msicomp.MsiUpgradeComponent"> - <ROW UpgradeCode="[|UpgradeCode]" VersionMax="[|ProductVersion]" Attributes="1025" ActionProperty="OLDPRODUCTS"/> - <ROW UpgradeCode="[|UpgradeCode]" VersionMin="[|ProductVersion]" Attributes="2" ActionProperty="AI_NEWERPRODUCTFOUND"/> - </COMPONENT> -</DOCUMENT> |