configure.ac | 7
external/coinmp/ExternalProject_coinmp.mk | 1
external/cppunit/ExternalProject_cppunit.mk | 1
external/curl/ExternalProject_curl.mk | 2
external/curl/UnpackedTarball_curl.mk | 1
external/curl/curl-xp.patch.1 | 12
external/lcms2/ExternalProject_lcms2.mk | 1
external/libgltf/ExternalProject_libgltf.mk | 1
external/nss/UnpackedTarball_nss.mk | 2
external/nss/nss-winXP-sdk.patch.1 | 12
external/openssl/opensslwnt.patch | 12
external/poppler/ExternalProject_poppler.mk | 2
external/python3/ExternalProject_python3.mk | 1
external/python3/python-3.3.0-gcc-4.8.patch.1 | 16
external/python3/python-3.3.0-msvc-x64.patch.1 | 289 -----------------
external/python3/python-3.3.0-msvc2012.patch.1 | 72 ----
external/python3/python-3.3.3-msvc2012-winxp.patch.1 | 117 ------
external/python3/python-3.3.5-darwin-gnu-xargs.patch.1 | 12
fpicker/Library_fps.mk | 2
fpicker/source/win32/filepicker/platform_vista.h | 7
sal/Module_sal.mk | 2
sal/osl/w32/socket.cxx | 117 ------
sd/source/ui/remotecontrol/DiscoveryService.cxx | 2
solenv/gbuild/platform/com_MSC_defs.mk | 1
solenv/gbuild/platform/windows.mk | 10
vcl/source/gdi/pdfwriter_impl.cxx | 27 -
vcl/win/app/salinst.cxx | 90 ++---
27 files changed, 47 insertions(+), 772 deletions(-)
New commits:
commit 656c8754abc6678e5efcaa1fec1dcac0a01ca54c
Author: Michael Stahl <mst...@redhat.com>
Date: Tue May 30 17:49:54 2017 +0200
sal,external: remove checks for obsolete VCVER=120
Change-Id: I4d32b7c4b2e545a8d979bc516f64cfcbf66ecd07
diff --git a/external/coinmp/ExternalProject_coinmp.mk
b/external/coinmp/ExternalProject_coinmp.mk
index 53d886510ece..ead6c6d1506c 100644
--- a/external/coinmp/ExternalProject_coinmp.mk
+++ b/external/coinmp/ExternalProject_coinmp.mk
@@ -19,7 +19,6 @@ $(call gb_ExternalProject_get_state_target,coinmp,build) :
MSBuild.exe CoinMP.sln /t:Build \
/p:Configuration=$(if
$(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
/p:Platform=$(if $(filter INTEL,$(CPUNAME)),Win32,x64) \
- $(if $(filter 120,$(VCVER)),/p:PlatformToolset=v120
/p:VisualStudioVersion=12.0 /ToolsVersion:12.0) \
$(if $(filter 140,$(VCVER)),/p:PlatformToolset=v140
/p:VisualStudioVersion=14.0 /ToolsVersion:14.0) \
$(if $(filter 150,$(VCVER)),/p:PlatformToolset=v141
/p:VisualStudioVersion=15.0 /ToolsVersion:15.0) \
$(if $(filter
150-10,$(VCVER)-$(WINDOWS_SDK_VERSION)),/p:WindowsTargetPlatformVersion=$(UCRTVERSION))
\
diff --git a/external/cppunit/ExternalProject_cppunit.mk
b/external/cppunit/ExternalProject_cppunit.mk
index 2a5a934d384e..b199accd1ed6 100644
--- a/external/cppunit/ExternalProject_cppunit.mk
+++ b/external/cppunit/ExternalProject_cppunit.mk
@@ -18,7 +18,6 @@ $(call gb_ExternalProject_get_state_target,cppunit,build) :
$(call gb_ExternalProject_run,build,\
PROFILEFLAGS="$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
/p:Platform=$(if $(filter INTEL,$(CPUNAME)),Win32,x64) \
- $(if $(filter 120,$(VCVER)),/p:PlatformToolset=v120
/p:VisualStudioVersion=12.0 /ToolsVersion:12.0) \
$(if $(filter 140,$(VCVER)),/p:PlatformToolset=v140
/p:VisualStudioVersion=14.0 /ToolsVersion:14.0) \
$(if $(filter 150,$(VCVER)),/p:PlatformToolset=v141
/p:VisualStudioVersion=15.0 /ToolsVersion:15.0) \
$(if $(filter
150-10,$(VCVER)-$(WINDOWS_SDK_VERSION)),/p:WindowsTargetPlatformVersion=$(UCRTVERSION))"
\
diff --git a/external/lcms2/ExternalProject_lcms2.mk
b/external/lcms2/ExternalProject_lcms2.mk
index 250255ff11cd..0e8fa4fb631f 100644
--- a/external/lcms2/ExternalProject_lcms2.mk
+++ b/external/lcms2/ExternalProject_lcms2.mk
@@ -18,7 +18,6 @@ ifeq ($(COM),MSC)
$(call gb_ExternalProject_get_state_target,lcms2,build):
$(call gb_ExternalProject_run,build,\
MSBuild.exe lcms2_DLL.vcxproj \
- $(if $(filter 120,$(VCVER)),/p:PlatformToolset=v120
/p:VisualStudioVersion=12.0 /ToolsVersion:12.0) \
$(if $(filter 140,$(VCVER)),/p:PlatformToolset=v140
/p:VisualStudioVersion=14.0 /ToolsVersion:14.0) \
$(if $(filter 150,$(VCVER)),/p:PlatformToolset=v141
/p:VisualStudioVersion=15.0 /ToolsVersion:15.0) \
$(if $(filter
150-10,$(VCVER)-$(WINDOWS_SDK_VERSION)),/p:WindowsTargetPlatformVersion=$(UCRTVERSION))
\
diff --git a/external/libgltf/ExternalProject_libgltf.mk
b/external/libgltf/ExternalProject_libgltf.mk
index 746c5742d514..da5655338eb2 100644
--- a/external/libgltf/ExternalProject_libgltf.mk
+++ b/external/libgltf/ExternalProject_libgltf.mk
@@ -42,7 +42,6 @@ $(call gb_ExternalProject_get_state_target,libgltf,build) :
$(call gb_ExternalProject_run,build,\
msbuild.exe libgltf.vcxproj /p:Platform=$(if $(filter
INTEL,$(CPUNAME)),Win32,x64) \
/p:Configuration=$(if
$(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
- $(if $(filter 120,$(VCVER)),/p:PlatformToolset=v120
/p:VisualStudioVersion=12.0 /ToolsVersion:12.0) \
$(if $(filter 140,$(VCVER)),/p:PlatformToolset=v140
/p:VisualStudioVersion=14.0 /ToolsVersion:14.0) \
$(if $(filter 150,$(VCVER)),/p:PlatformToolset=v141
/p:VisualStudioVersion=15.0 /ToolsVersion:15.0) \
$(if $(filter
150-10,$(VCVER)-$(WINDOWS_SDK_VERSION)),/p:WindowsTargetPlatformVersion=$(UCRTVERSION))
\
diff --git a/external/poppler/ExternalProject_poppler.mk
b/external/poppler/ExternalProject_poppler.mk
index 83d51b9ea9e7..61cc10e62d06 100644
--- a/external/poppler/ExternalProject_poppler.mk
+++ b/external/poppler/ExternalProject_poppler.mk
@@ -21,7 +21,7 @@ $(eval $(call gb_ExternalProject_register_targets,poppler,\
$(call gb_ExternalProject_get_state_target,poppler,build) :
$(call gb_ExternalProject_run,build,\
- $(if $(filter TRUE,$(DISABLE_DYNLOADING)),CFLAGS="$(CFLAGS)
$(gb_VISIBILITY_FLAGS) $(gb_COMPILEROPTFLAGS)" CXXFLAGS="$(CXXFLAGS)
$(gb_VISIBILITY_FLAGS) $(gb_VISIBILITY_FLAGS_CXX) $(gb_COMPILEROPTFLAGS)",$(if
$(filter MSC-120,$(COM)-$(VCVER)),CXXFLAGS="$(CXXFLAGS) -I$(SRCDIR)/include")) \
+ $(if $(filter TRUE,$(DISABLE_DYNLOADING)),CFLAGS="$(CFLAGS)
$(gb_VISIBILITY_FLAGS) $(gb_COMPILEROPTFLAGS)" CXXFLAGS="$(CXXFLAGS)
$(gb_VISIBILITY_FLAGS) $(gb_VISIBILITY_FLAGS_CXX) $(gb_COMPILEROPTFLAGS)") \
MAKE=$(MAKE) PKG_CONFIG="" ./configure \
--with-pic \
--enable-static \
diff --git a/external/python3/ExternalProject_python3.mk
b/external/python3/ExternalProject_python3.mk
index 997136504b14..09edc2a099f2 100644
--- a/external/python3/ExternalProject_python3.mk
+++ b/external/python3/ExternalProject_python3.mk
@@ -35,7 +35,6 @@ $(call gb_ExternalProject_get_state_target,python3,build) :
MAKEFLAGS= MSBuild.exe pcbuild.sln /t:Build \
/p:Configuration=$(if
$(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
/p:Platform=$(if $(filter INTEL,$(CPUNAME)),Win32,x64) \
- $(if $(filter 120,$(VCVER)),/p:PlatformToolset=v120
/p:VisualStudioVersion=12.0 /ToolsVersion:12.0) \
$(if $(filter 140,$(VCVER)),/p:PlatformToolset=v140
/p:VisualStudioVersion=14.0 /ToolsVersion:14.0) \
$(if $(filter 150,$(VCVER)),/p:PlatformToolset=v141
/p:VisualStudioVersion=15.0 /ToolsVersion:15.0) \
$(if $(filter
150-10,$(VCVER)-$(WINDOWS_SDK_VERSION)),/p:WindowsTargetPlatformVersion=$(UCRTVERSION))
\
diff --git a/sal/Module_sal.mk b/sal/Module_sal.mk
index fe9523a7a6e2..745339944bc9 100644
--- a/sal/Module_sal.mk
+++ b/sal/Module_sal.mk
@@ -25,7 +25,7 @@ $(eval $(call gb_Module_add_targets,sal,\
$(eval $(call gb_Module_add_check_targets,sal,\
$(if $(filter TRUE,$(DISABLE_DYNLOADING)),,CppunitTest_Module_DLL) \
- $(if $(filter-out
MSC-120,$(COM)-$(VCVER)),CppunitTest_sal_osl_security) \
+ CppunitTest_sal_osl_security \
CppunitTest_sal_osl \
CppunitTest_sal_rtl \
CppunitTest_sal_types \
commit 48801417688bf69aaac00c4b448f7779db13e895
Author: Michael Stahl <mst...@redhat.com>
Date: Tue May 30 17:26:59 2017 +0200
python3: remove obsolete python-3.3.3-msvc2012-winxp.patch.1
...and python-3.3.0-msvc2012.patch etc.
They were actually never applied to Python 3.5.
Change-Id: I5beb5a81d55ab1921411d2351bdb397ff02ba75c
diff --git a/external/python3/python-3.3.0-gcc-4.8.patch.1
b/external/python3/python-3.3.0-gcc-4.8.patch.1
deleted file mode 100644
index 6af06b338e96..000000000000
--- a/external/python3/python-3.3.0-gcc-4.8.patch.1
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ru python3.orig/Include/modsupport.h python3/Include/modsupport.h
---- python3.orig/Include/modsupport.h 2015-07-05 18:50:06.000000000 +0200
-+++ python3/Include/modsupport.h 2015-07-26 18:21:30.717680314 +0200
-@@ -26,7 +26,11 @@
- /* Due to a glitch in 3.2, the _SizeT versions weren't exported from the DLL.
*/
- #if !defined(PY_SSIZE_T_CLEAN) || !defined(Py_LIMITED_API) ||
Py_LIMITED_API+0 >= 0x03030000
- PyAPI_FUNC(int) PyArg_Parse(PyObject *, const char *, ...);
--PyAPI_FUNC(int) PyArg_ParseTuple(PyObject *, const char *, ...);
-+PyAPI_FUNC(int) PyArg_ParseTuple(PyObject *, const char *, ...)
-+#ifdef PY_SSIZE_T_CLEAN
-+ Py_FORMAT_PARSETUPLE(PyArg_ParseTuple, 2, 3)
-+#endif
-+ ;
- PyAPI_FUNC(int) PyArg_ParseTupleAndKeywords(PyObject *, PyObject *,
- const char *, char **, ...);
- PyAPI_FUNC(int) PyArg_ValidateKeywordArguments(PyObject *);
diff --git a/external/python3/python-3.3.0-msvc-x64.patch.1
b/external/python3/python-3.3.0-msvc-x64.patch.1
deleted file mode 100644
index a92acc77a563..000000000000
--- a/external/python3/python-3.3.0-msvc-x64.patch.1
+++ /dev/null
@@ -1,289 +0,0 @@
-Fix Python build for x64 Windows
-
-diff -ru python3/PCbuild/pcbuild.sln python3.new/PCbuild/pcbuild.sln
---- python3/PCbuild/pcbuild.sln 2012-09-29 10:00:48.000000000 +0200
-+++ python3.new/PCbuild/pcbuild.sln 2012-11-12 22:13:49.445159668 +0100
-@@ -104,20 +84,20 @@
- {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.Release|x64.Build.0 =
Release|x64
- {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|Win32.ActiveCfg =
Debug|Win32
- {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|Win32.Build.0 =
Debug|Win32
-- {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|x64.ActiveCfg =
Debug|Win32
-- {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|x64.Build.0 =
Debug|Win32
-+ {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|x64.ActiveCfg =
Debug|x64
-+ {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|x64.Build.0 =
Debug|x64
-
{F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGInstrument|Win32.ActiveCfg =
Release|Win32
-
{F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGInstrument|Win32.Build.0 =
Release|Win32
--
{F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGInstrument|x64.ActiveCfg =
Release|Win32
-- {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGInstrument|x64.Build.0
= Release|Win32
-+
{F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGInstrument|x64.ActiveCfg = Release|x64
-+ {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGInstrument|x64.Build.0
= Release|x64
- {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGUpdate|Win32.ActiveCfg
= Release|Win32
- {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGUpdate|Win32.Build.0 =
Release|Win32
-- {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGUpdate|x64.ActiveCfg =
Release|Win32
-- {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGUpdate|x64.Build.0 =
Release|Win32
-+ {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGUpdate|x64.ActiveCfg =
Release|x64
-+ {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGUpdate|x64.Build.0 =
Release|x64
- {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|Win32.ActiveCfg
= Release|Win32
- {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|Win32.Build.0 =
Release|Win32
-- {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|x64.ActiveCfg =
Release|Win32
-- {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|x64.Build.0 =
Release|Win32
-+ {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|x64.ActiveCfg =
Release|x64
-+ {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|x64.Build.0 =
Release|x64
- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Debug|Win32.ActiveCfg =
Debug|Win32
- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Debug|Win32.Build.0 =
Debug|Win32
- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Debug|x64.ActiveCfg =
Debug|x64
-@@ -168,20 +148,20 @@
- {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.Release|x64.Build.0 =
Release|x64
- {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|Win32.ActiveCfg =
Release|Win32
- {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|Win32.Build.0 =
Release|Win32
-- {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|x64.ActiveCfg =
Release|Win32
-- {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|x64.Build.0 =
Release|Win32
-+ {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|x64.ActiveCfg =
Release|x64
-+ {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|x64.Build.0 =
Release|x64
-
{C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGInstrument|Win32.ActiveCfg =
Release|Win32
-
{C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGInstrument|Win32.Build.0 =
Release|Win32
--
{C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGInstrument|x64.ActiveCfg =
Release|Win32
-- {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGInstrument|x64.Build.0
= Release|Win32
-+
{C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGInstrument|x64.ActiveCfg = Release|x64
-+ {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGInstrument|x64.Build.0
= Release|x64
- {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGUpdate|Win32.ActiveCfg
= Release|Win32
- {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGUpdate|Win32.Build.0 =
Release|Win32
-- {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGUpdate|x64.ActiveCfg =
Release|Win32
-- {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGUpdate|x64.Build.0 =
Release|Win32
-+ {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGUpdate|x64.ActiveCfg =
Release|x64
-+ {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGUpdate|x64.Build.0 =
Release|x64
- {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release|Win32.ActiveCfg
= Release|Win32
- {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release|Win32.Build.0 =
Release|Win32
-- {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release|x64.ActiveCfg =
Release|Win32
-- {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release|x64.Build.0 =
Release|Win32
-+ {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release|x64.ActiveCfg =
Release|x64
-+ {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release|x64.Build.0 =
Release|x64
- {28B5D777-DDF2-4B6B-B34F-31D938813856}.Debug|Win32.ActiveCfg =
Debug|Win32
- {28B5D777-DDF2-4B6B-B34F-31D938813856}.Debug|Win32.Build.0 =
Debug|Win32
- {28B5D777-DDF2-4B6B-B34F-31D938813856}.Debug|x64.ActiveCfg =
Debug|x64
-@@ -577,38 +557,38 @@
- {7B2727B5-5A3F-40EE-A866-43A13CD31446}.Debug|x64.Build.0 =
Debug|x64
-
{7B2727B5-5A3F-40EE-A866-43A13CD31446}.PGInstrument|Win32.ActiveCfg =
PGInstrument|Win32
-
{7B2727B5-5A3F-40EE-A866-43A13CD31446}.PGInstrument|Win32.Build.0 =
PGInstrument|Win32
--
{7B2727B5-5A3F-40EE-A866-43A13CD31446}.PGInstrument|x64.ActiveCfg =
PGInstrument|Win32
-- {7B2727B5-5A3F-40EE-A866-43A13CD31446}.PGInstrument|x64.Build.0
= PGInstrument|Win32
-+
{7B2727B5-5A3F-40EE-A866-43A13CD31446}.PGInstrument|x64.ActiveCfg =
PGInstrument|x64
-+ {7B2727B5-5A3F-40EE-A866-43A13CD31446}.PGInstrument|x64.Build.0
= PGInstrument|x64
- {7B2727B5-5A3F-40EE-A866-43A13CD31446}.PGUpdate|Win32.ActiveCfg
= PGUpdate|Win32
- {7B2727B5-5A3F-40EE-A866-43A13CD31446}.PGUpdate|Win32.Build.0 =
PGUpdate|Win32
-- {7B2727B5-5A3F-40EE-A866-43A13CD31446}.PGUpdate|x64.ActiveCfg =
PGUpdate|Win32
-- {7B2727B5-5A3F-40EE-A866-43A13CD31446}.PGUpdate|x64.Build.0 =
PGUpdate|Win32
-+ {7B2727B5-5A3F-40EE-A866-43A13CD31446}.PGUpdate|x64.ActiveCfg =
PGUpdate|x64
-+ {7B2727B5-5A3F-40EE-A866-43A13CD31446}.PGUpdate|x64.Build.0 =
PGUpdate|x64
- {7B2727B5-5A3F-40EE-A866-43A13CD31446}.Release|Win32.ActiveCfg
= Release|Win32
- {7B2727B5-5A3F-40EE-A866-43A13CD31446}.Release|Win32.Build.0 =
Release|Win32
-- {7B2727B5-5A3F-40EE-A866-43A13CD31446}.Release|x64.ActiveCfg =
Release|Win32
-- {7B2727B5-5A3F-40EE-A866-43A13CD31446}.Release|x64.Build.0 =
Release|Win32
-+ {7B2727B5-5A3F-40EE-A866-43A13CD31446}.Release|x64.ActiveCfg =
Release|x64
-+ {7B2727B5-5A3F-40EE-A866-43A13CD31446}.Release|x64.Build.0 =
Release|x64
- {1D4B18D3-7C12-4ECB-9179-8531FF876CE6}.Debug|Win32.ActiveCfg =
Debug|Win32
- {1D4B18D3-7C12-4ECB-9179-8531FF876CE6}.Debug|Win32.Build.0 =
Debug|Win32
- {1D4B18D3-7C12-4ECB-9179-8531FF876CE6}.Debug|x64.ActiveCfg =
Debug|x64
- {1D4B18D3-7C12-4ECB-9179-8531FF876CE6}.Debug|x64.Build.0 =
Debug|x64
-
{1D4B18D3-7C12-4ECB-9179-8531FF876CE6}.PGInstrument|Win32.ActiveCfg =
PGInstrument|Win32
-
{1D4B18D3-7C12-4ECB-9179-8531FF876CE6}.PGInstrument|Win32.Build.0 =
PGInstrument|Win32
--
{1D4B18D3-7C12-4ECB-9179-8531FF876CE6}.PGInstrument|x64.ActiveCfg =
PGInstrument|Win32
-- {1D4B18D3-7C12-4ECB-9179-8531FF876CE6}.PGInstrument|x64.Build.0
= PGInstrument|Win32
-+
{1D4B18D3-7C12-4ECB-9179-8531FF876CE6}.PGInstrument|x64.ActiveCfg =
PGInstrument|x64
-+ {1D4B18D3-7C12-4ECB-9179-8531FF876CE6}.PGInstrument|x64.Build.0
= PGInstrument|x64
- {1D4B18D3-7C12-4ECB-9179-8531FF876CE6}.PGUpdate|Win32.ActiveCfg
= PGUpdate|Win32
- {1D4B18D3-7C12-4ECB-9179-8531FF876CE6}.PGUpdate|Win32.Build.0 =
PGUpdate|Win32
-- {1D4B18D3-7C12-4ECB-9179-8531FF876CE6}.PGUpdate|x64.ActiveCfg =
PGUpdate|Win32
-- {1D4B18D3-7C12-4ECB-9179-8531FF876CE6}.PGUpdate|x64.Build.0 =
PGUpdate|Win32
-+ {1D4B18D3-7C12-4ECB-9179-8531FF876CE6}.PGUpdate|x64.ActiveCfg =
PGUpdate|x64
-+ {1D4B18D3-7C12-4ECB-9179-8531FF876CE6}.PGUpdate|x64.Build.0 =
PGUpdate|x64
- {1D4B18D3-7C12-4ECB-9179-8531FF876CE6}.Release|Win32.ActiveCfg
= Release|Win32
- {1D4B18D3-7C12-4ECB-9179-8531FF876CE6}.Release|Win32.Build.0 =
Release|Win32
-- {1D4B18D3-7C12-4ECB-9179-8531FF876CE6}.Release|x64.ActiveCfg =
Release|Win32
-- {1D4B18D3-7C12-4ECB-9179-8531FF876CE6}.Release|x64.Build.0 =
Release|Win32
-+ {1D4B18D3-7C12-4ECB-9179-8531FF876CE6}.Release|x64.ActiveCfg =
Release|x64
-+ {1D4B18D3-7C12-4ECB-9179-8531FF876CE6}.Release|x64.Build.0 =
Release|x64
- {19C0C13F-47CA-4432-AFF3-799A296A4DDC}.Debug|Win32.ActiveCfg =
Debug|Win32
- {19C0C13F-47CA-4432-AFF3-799A296A4DDC}.Debug|x64.ActiveCfg =
Debug|x64
-
{19C0C13F-47CA-4432-AFF3-799A296A4DDC}.PGInstrument|Win32.ActiveCfg =
Release|Win32
--
{19C0C13F-47CA-4432-AFF3-799A296A4DDC}.PGInstrument|x64.ActiveCfg =
Release|Win32
-+
{19C0C13F-47CA-4432-AFF3-799A296A4DDC}.PGInstrument|x64.ActiveCfg = Release|x64
- {19C0C13F-47CA-4432-AFF3-799A296A4DDC}.PGUpdate|Win32.ActiveCfg
= Release|Win32
-- {19C0C13F-47CA-4432-AFF3-799A296A4DDC}.PGUpdate|x64.ActiveCfg =
Release|Win32
-+ {19C0C13F-47CA-4432-AFF3-799A296A4DDC}.PGUpdate|x64.ActiveCfg =
Release|x64
- {19C0C13F-47CA-4432-AFF3-799A296A4DDC}.Release|Win32.ActiveCfg
= Release|Win32
- {19C0C13F-47CA-4432-AFF3-799A296A4DDC}.Release|x64.ActiveCfg =
Release|x64
- EndGlobalSection
---- python3/PCbuild/make_buildinfo.vcxproj
-+++ python3/PCbuild/make_buildinfo.vcxproj
-@@ -5,6 +5,10 @@
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
-+ <ProjectConfiguration Include="Release|x64">
-+ <Configuration>Release</Configuration>
-+ <Platform>x64</Platform>
-+ </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{C73F0EC1-358B-4177-940F-0846AC8B04CD}</ProjectGuid>
-@@ -16,6 +20,10 @@
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>NotSet</CharacterSet>
- </PropertyGroup>
-+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"
Label="Configuration">
-+ <ConfigurationType>Application</ConfigurationType>
-+ <CharacterSet>NotSet</CharacterSet>
-+ </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
-@@ -24,17 +32,38 @@
- <Import Project="pyproject.props" />
- <Import Project="release.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="pyproject.props" />
-+ <Import Project="x64.props" />
-+ <Import Project="release.props" />
-+ </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
- <CodeAnalysisRuleSet
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRules
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
- <CodeAnalysisRuleAssemblies
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-+ <CodeAnalysisRuleSet
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-+ <CodeAnalysisRules
Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-+ <CodeAnalysisRuleAssemblies
Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
- </PropertyGroup>
- <ItemDefinitionGroup
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-+
<PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-+ </ClCompile>
-+ <Link>
-+ <OutputFile>$(OutDir)make_buildinfo.exe</OutputFile>
-+ <SubSystem>Console</SubSystem>
-+ </Link>
-+ </ItemDefinitionGroup>
-+ <ItemDefinitionGroup
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-+ <ClCompile>
-+ <Optimization>Disabled</Optimization>
-+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-
<PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
- </ClCompile>
---- python3/PCbuild/make_versioninfo.vcxproj
-+++ python3/PCbuild/make_versioninfo.vcxproj
-@@ -114,24 +114,25 @@
- <ItemDefinitionGroup
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <CustomBuildStep>
- <Message>Build PC/pythonnt_rc(_d).h</Message>
- <Command>cd $(SolutionDir)
--make_versioninfo.exe > ..\PC\pythonnt_rc.h
-+amd64\make_versioninfo.exe > ..\PC\pythonnt_rc.h
- </Command>
- <Outputs>$(SolutionDir)..\PC\pythonnt_rc.h;%(Outputs)</Outputs>
- </CustomBuildStep>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <IntrinsicFunctions>true</IntrinsicFunctions>
-
<PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <Link>
-- <OutputFile>$(SolutionDir)make_versioninfo.exe</OutputFile>
-+ <OutputFile>$(SolutionDir)amd64\make_versioninfo.exe</OutputFile>
-+ <SubSystem>Console</SubSystem>
- </Link>
- <PostBuildEvent>
- <Command>cd $(SolutionDir)
--make_versioninfo.exe > ..\PC\python_nt.h
-+amd64\make_versioninfo.exe > ..\PC\python_nt.h
- </Command>
- </PostBuildEvent>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-@@ -172,9 +172,9 @@
- <ItemDefinitionGroup
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <CustomBuildStep>
- <Message>Build PC/pythonnt_rc(_d).h</Message>
- <Command>cd $(SolutionDir)
--make_versioninfo_d.exe > ..\PC\pythonnt_rc_d.h
-+amd64\make_versioninfo_d.exe > ..\PC\pythonnt_rc_d.h
- </Command>
- <Outputs>$(SolutionDir)..\PC\pythonnt_rc_d.h;%(Outputs)</Outputs>
- </CustomBuildStep>
- <Midl>
-@@ -186,14 +186,15 @@
- <IntrinsicFunctions>false</IntrinsicFunctions>
-
<PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <Link>
-- <OutputFile>$(SolutionDir)make_versioninfo_d.exe</OutputFile>
-+ <OutputFile>$(SolutionDir)amd64\make_versioninfo_d.exe</OutputFile>
-+ <SubSystem>Console</SubSystem>
- <TargetMachine>MachineX64</TargetMachine>
- </Link>
- <PostBuildEvent>
- <Command>cd $(SolutionDir)
--make_versioninfo_d.exe > ..\PC\python_nt_d.h
-+amd64\make_versioninfo_d.exe > ..\PC\python_nt_d.h
- </Command>
- </PostBuildEvent>
- </ItemDefinitionGroup>
- <ItemGroup>
---- python3/PCbuild/pythoncore.vcxproj
-+++ python3/PCbuild/pythoncore.vcxproj
-@@ -195,35 +195,35 @@
- <ItemDefinitionGroup
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Midl>
- <TargetEnvironment>X64</TargetEnvironment>
- </Midl>
- <ClCompile>
- <AdditionalOptions>/Zm200 %(AdditionalOptions)</AdditionalOptions>
-
<AdditionalIncludeDirectories>..\Python;..\Modules\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-
<PreprocessorDefinitions>_USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- </ClCompile>
- <ResourceCompile>
-
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0409</Culture>
-
<AdditionalIncludeDirectories>..\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- </ResourceCompile>
- <PreLinkEvent>
- <Message>Generate build information...</Message>
-- <Command>"$(SolutionDir)make_buildinfo.exe" Release
"$(IntDir)"</Command>
-+ <Command>"$(SolutionDir)amd64\make_buildinfo.exe" Release
"$(IntDir)"</Command>
- </PreLinkEvent>
- <Link>
-
<AdditionalDependencies>$(IntDir)getbuildinfo.o;%(AdditionalDependencies)</AdditionalDependencies>
-
<IgnoreSpecificDefaultLibraries>libc;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
- <BaseAddress>0x1e000000</BaseAddress>
- </Link>
- <PreBuildEvent>
- <Command>$(KillPythonExe)
- IF %ERRORLEVEL% NEQ 0 (
- echo kill_python: warning: could not kill running Pythons, exit code
%ERRORLEVEL%
- exit /b 0
- )</Command>
- </PreBuildEvent>
- <PreBuildEvent>
- <Message>Killing any running $(PythonExe) instances...</Message>
- </PreBuildEvent>
- </ItemDefinitionGroup>
-@@ -289,9 +289,9 @@
-
<AdditionalIncludeDirectories>..\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- </ResourceCompile>
- <PreLinkEvent>
- <Message>Generate build information...</Message>
-- <Command>"$(SolutionDir)make_buildinfo.exe" Debug "$(IntDir)"</Command>
-+ <Command>"$(SolutionDir)amd64\make_buildinfo.exe" Debug
"$(IntDir)"</Command>
- </PreLinkEvent>
- <Link>
-
<AdditionalDependencies>$(IntDir)getbuildinfo.o;%(AdditionalDependencies)</AdditionalDependencies>
-
<IgnoreSpecificDefaultLibraries>libc;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
diff --git a/external/python3/python-3.3.0-msvc2012.patch.1
b/external/python3/python-3.3.0-msvc2012.patch.1
deleted file mode 100644
index 9bbfbfbaf0d6..000000000000
--- a/external/python3/python-3.3.0-msvc2012.patch.1
+++ /dev/null
@@ -1,72 +0,0 @@
-Adapt VC10/MSVC2010 stuff for VC11/MSVC2012 (apparently builds with both then)
-
-diff -ru python3.old_/PCbuild/_msi.vcxproj python3/PCbuild/_msi.vcxproj
---- python3.old_/PCbuild/_msi.vcxproj 2012-09-29 10:00:48.000000000 +0200
-+++ python3/PCbuild/_msi.vcxproj 2012-11-13 15:52:40.656101165 +0100
-@@ -151,7 +151,7 @@
- </PropertyGroup>
- <ItemDefinitionGroup
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <Link>
--
<AdditionalDependencies>fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
-+
<AdditionalDependencies>cabinet.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <BaseAddress>0x1D160000</BaseAddress>
- </Link>
- </ItemDefinitionGroup>
-@@ -160,13 +160,13 @@
- <TargetEnvironment>X64</TargetEnvironment>
- </Midl>
- <Link>
--
<AdditionalDependencies>fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
-+
<AdditionalDependencies>cabinet.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <BaseAddress>0x1D160000</BaseAddress>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Link>
--
<AdditionalDependencies>fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
-+
<AdditionalDependencies>cabinet.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <BaseAddress>0x1D160000</BaseAddress>
- </Link>
- </ItemDefinitionGroup>
-@@ -175,13 +175,13 @@
- <TargetEnvironment>X64</TargetEnvironment>
- </Midl>
- <Link>
--
<AdditionalDependencies>fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
-+
<AdditionalDependencies>cabinet.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <BaseAddress>0x1D160000</BaseAddress>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup
Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">
- <Link>
--
<AdditionalDependencies>fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
-+
<AdditionalDependencies>cabinet.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <BaseAddress>0x1D160000</BaseAddress>
- </Link>
- </ItemDefinitionGroup>
-@@ -190,14 +190,14 @@
- <TargetEnvironment>X64</TargetEnvironment>
- </Midl>
- <Link>
--
<AdditionalDependencies>fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
-+
<AdditionalDependencies>cabinet.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <BaseAddress>0x1D160000</BaseAddress>
- <TargetMachine>MachineX64</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup
Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">
- <Link>
--
<AdditionalDependencies>fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
-+
<AdditionalDependencies>cabinet.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <BaseAddress>0x1D160000</BaseAddress>
- </Link>
- </ItemDefinitionGroup>
-@@ -206,7 +206,7 @@
- <TargetEnvironment>X64</TargetEnvironment>
- </Midl>
- <Link>
--
<AdditionalDependencies>fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
-+
<AdditionalDependencies>cabinet.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <BaseAddress>0x1D160000</BaseAddress>
- <TargetMachine>MachineX64</TargetMachine>
- </Link>
diff --git a/external/python3/python-3.3.3-msvc2012-winxp.patch.1
b/external/python3/python-3.3.3-msvc2012-winxp.patch.1
deleted file mode 100644
index 2addd4962c07..000000000000
--- a/external/python3/python-3.3.3-msvc2012-winxp.patch.1
+++ /dev/null
@@ -1,117 +0,0 @@
-without explicit subsystem set, the linker tries to open a file
-with the name of the comptibility version
-(fatal error LNK1181: cannot open input file ",5.01")
-diff -ur python3.org/PCbuild/_ctypes.vcxproj python3/PCbuild/_ctypes.vcxproj
---- python3.org/PCbuild/_ctypes.vcxproj 2014-05-19 19:06:01.274114800
+0200
-+++ python3/PCbuild/_ctypes.vcxproj 2014-05-19 19:07:13.649079800 +0200
-@@ -174,7 +174,7 @@
- </ClCompile>
- <Link>
- <AdditionalOptions>/EXPORT:DllGetClassObject,PRIVATE
/EXPORT:DllCanUnloadNow,PRIVATE %(AdditionalOptions)</AdditionalOptions>
-- <SubSystem>NotSet</SubSystem>
-+ <SubSystem>Console</SubSystem>
- <BaseAddress>0x1D1A0000</BaseAddress>
- </Link>
- </ItemDefinitionGroup>
-@@ -187,7 +187,7 @@
- </ClCompile>
- <Link>
- <AdditionalOptions>/EXPORT:DllGetClassObject,PRIVATE
/EXPORT:DllCanUnloadNow,PRIVATE %(AdditionalOptions)</AdditionalOptions>
-- <SubSystem>NotSet</SubSystem>
-+ <SubSystem>Console</SubSystem>
- <BaseAddress>0x1D1A0000</BaseAddress>
- </Link>
- </ItemDefinitionGroup>
-@@ -197,7 +197,7 @@
- </ClCompile>
- <Link>
- <AdditionalOptions>/EXPORT:DllGetClassObject,PRIVATE
/EXPORT:DllCanUnloadNow,PRIVATE %(AdditionalOptions)</AdditionalOptions>
-- <SubSystem>NotSet</SubSystem>
-+ <SubSystem>Console</SubSystem>
- <BaseAddress>0x1D1A0000</BaseAddress>
- </Link>
- </ItemDefinitionGroup>
-@@ -210,7 +210,7 @@
- </ClCompile>
- <Link>
- <AdditionalOptions>/EXPORT:DllGetClassObject,PRIVATE
/EXPORT:DllCanUnloadNow,PRIVATE %(AdditionalOptions)</AdditionalOptions>
-- <SubSystem>NotSet</SubSystem>
-+ <SubSystem>Console</SubSystem>
- <BaseAddress>0x1D1A0000</BaseAddress>
- <TargetMachine>MachineX64</TargetMachine>
- </Link>
-@@ -221,7 +221,7 @@
- </ClCompile>
- <Link>
- <AdditionalOptions>/EXPORT:DllGetClassObject,PRIVATE
/EXPORT:DllCanUnloadNow,PRIVATE %(AdditionalOptions)</AdditionalOptions>
-- <SubSystem>NotSet</SubSystem>
-+ <SubSystem>Console</SubSystem>
- <BaseAddress>0x1D1A0000</BaseAddress>
- </Link>
- </ItemDefinitionGroup>
-@@ -234,7 +234,7 @@
- </ClCompile>
- <Link>
- <AdditionalOptions>/EXPORT:DllGetClassObject,PRIVATE
/EXPORT:DllCanUnloadNow,PRIVATE %(AdditionalOptions)</AdditionalOptions>
-- <SubSystem>NotSet</SubSystem>
-+ <SubSystem>Console</SubSystem>
- <BaseAddress>0x1D1A0000</BaseAddress>
- <TargetMachine>MachineX64</TargetMachine>
- </Link>
-diff -ur python3.org/PCbuild/_decimal.vcxproj python3/PCbuild/_decimal.vcxproj
---- python3.org/PCbuild/_decimal.vcxproj 2014-05-19 19:06:01.274114800
+0200
-+++ python3/PCbuild/_decimal.vcxproj 2014-05-19 19:07:13.649079800 +0200
-@@ -176,7 +176,7 @@
-
<AdditionalIncludeDirectories>..\Modules\_decimal;..\Modules\_decimal\libmpdec;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- </ClCompile>
- <Link>
-- <SubSystem>NotSet</SubSystem>
-+ <SubSystem>Console</SubSystem>
- <BaseAddress>0x1D1A0000</BaseAddress>
- </Link>
- </ItemDefinitionGroup>
-@@ -189,7 +189,7 @@
-
<AdditionalIncludeDirectories>..\Modules\_decimal;..\Modules\_decimal\libmpdec;..\Include;..\PC;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- </ClCompile>
- <Link>
-- <SubSystem>NotSet</SubSystem>
-+ <SubSystem>Console</SubSystem>
- <BaseAddress>0x1D1A0000</BaseAddress>
- </Link>
- </ItemDefinitionGroup>
-@@ -199,7 +199,7 @@
-
<AdditionalIncludeDirectories>..\Modules\_decimal;..\Modules\_decimal\libmpdec;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- </ClCompile>
- <Link>
-- <SubSystem>NotSet</SubSystem>
-+ <SubSystem>Console</SubSystem>
- <BaseAddress>0x1D1A0000</BaseAddress>
- </Link>
- </ItemDefinitionGroup>
-@@ -212,7 +212,7 @@
-
<AdditionalIncludeDirectories>..\Modules\_decimal;..\Modules\_decimal\libmpdec;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- </ClCompile>
- <Link>
-- <SubSystem>NotSet</SubSystem>
-+ <SubSystem>Console</SubSystem>
- <BaseAddress>0x1D1A0000</BaseAddress>
- <TargetMachine>MachineX64</TargetMachine>
- </Link>
-@@ -223,7 +223,7 @@
-
<AdditionalIncludeDirectories>..\Modules\_decimal;..\Modules\_decimal\libmpdec;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- </ClCompile>
- <Link>
-- <SubSystem>NotSet</SubSystem>
-+ <SubSystem>Console</SubSystem>
- <BaseAddress>0x1D1A0000</BaseAddress>
- </Link>
- </ItemDefinitionGroup>
-@@ -236,7 +236,7 @@
-
<AdditionalIncludeDirectories>..\Modules\_decimal;..\Modules\_decimal\libmpdec;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- </ClCompile>
- <Link>
-- <SubSystem>NotSet</SubSystem>
-+ <SubSystem>Console</SubSystem>
- <BaseAddress>0x1D1A0000</BaseAddress>
- <TargetMachine>MachineX64</TargetMachine>
- </Link>
diff --git a/external/python3/python-3.3.5-darwin-gnu-xargs.patch.1
b/external/python3/python-3.3.5-darwin-gnu-xargs.patch.1
deleted file mode 100644
index d955618674e5..000000000000
--- a/external/python3/python-3.3.5-darwin-gnu-xargs.patch.1
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur python3.org/Mac/PythonLauncher/Makefile.in
python3/Mac/PythonLauncher/Makefile.in
---- python3.org/Mac/PythonLauncher/Makefile.in 2015-06-06 08:47:38.000000000
+0300
-+++ python3/Mac/PythonLauncher/Makefile.in 2015-06-06 08:48:18.000000000
+0300
-@@ -53,7 +53,7 @@
- --resource=$(srcdir)/factorySettings.plist \
- --plist Info.plist \
- build
-- find "Python Launcher.app" -name '.svn' -print0 | xargs -0 rm -r
-+ find "Python Launcher.app" -name '.svn' -print0 | xargs -0 rm -rf
-
-
- FileSettings.o: $(srcdir)/FileSettings.m
commit c102efd27a82eaaf94fe9fedb7be88cff80bceb2
Author: Michael Stahl <mst...@redhat.com>
Date: Tue May 30 17:17:01 2017 +0200
openssl: remove Windows XP patch
Change-Id: I6e80c33d134100235ac1007154ca7f6151b59c2f
diff --git a/external/openssl/opensslwnt.patch
b/external/openssl/opensslwnt.patch
index 2d00736f1317..e22bea6f077b 100644
--- a/external/openssl/opensslwnt.patch
+++ b/external/openssl/opensslwnt.patch
@@ -109,15 +109,6 @@ diff -ru openssl.orig/util/pl/VC-32.pl
openssl/util/pl/VC-32.pl
if ($FLAVOR =~ /WIN64/)
{
# Note that we currently don't have /WX on Win64! There is a lot of
-@@ -48,7 +48,7 @@
- my $f = $shlib || $fips ?' /MD':' /MT';
- $opt_cflags=$f.' /Ox';
- $dbg_cflags=$f.'d /Od -DDEBUG -D_DEBUG';
-- $lflags="/nologo /subsystem:console /opt:ref";
-+ $lflags="/nologo /subsystem:console,5.02 /opt:ref";
-
- *::perlasm_compile_target = sub {
- my ($target,$source,$bname)=@_;
@@ -114,7 +114,7 @@
}
@@ -146,10 +137,9 @@ diff -ru openssl.orig/util/pl/VC-32.pl
openssl/util/pl/VC-32.pl
$ff = "/fixed";
- $opt_cflags=$f.' /Ox /O2 /Ob2';
- $dbg_cflags=$f.'d /Od -DDEBUG -D_DEBUG';
-- $lflags="/nologo /subsystem:console /opt:ref";
-+ $lflags="/nologo /subsystem:console,5.01 /opt:ref";
+ $opt_cflags=$f.' -Ox -O2 -Ob2';
+ $dbg_cflags=$f.'d -Od -DDEBUG -D_DEBUG';
+ $lflags="/nologo /subsystem:console /opt:ref";
}
-$lib_cflag='/Zl' if (!$shlib); # remove /DEFAULTLIBs from static lib
+$lib_cflag='-Zl' if (!$shlib); # remove /DEFAULTLIBs from static lib
commit f4236b38c79c62f3ba41812e86057e7825428da9
Author: Michael Stahl <mst...@redhat.com>
Date: Tue May 30 16:54:55 2017 +0200
nss: remove obsolete nss-winXP-sdk.patch.1
Change-Id: I044be3b53134081bcbdbfd6fd252d6851d3dba41
diff --git a/external/nss/UnpackedTarball_nss.mk
b/external/nss/UnpackedTarball_nss.mk
index a9ce14ea20bb..314ff875ecbd 100644
--- a/external/nss/UnpackedTarball_nss.mk
+++ b/external/nss/UnpackedTarball_nss.mk
@@ -30,8 +30,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\
external/nss/nss.cygwin64.in32bit.patch) \
$(if $(filter WNT,$(OS)), \
external/nss/nss.vs2015.pdb.patch) \
- $(if $(findstring 120_70,$(VCVER)_$(WINDOWS_SDK_VERSION)), \
- external/nss/nss-winXP-sdk.patch.1) \
$(if $(filter WNT,$(OS)), \
external/nss/nss.utf8bom.patch.1) \
))
diff --git a/external/nss/nss-winXP-sdk.patch.1
b/external/nss/nss-winXP-sdk.patch.1
deleted file mode 100644
index 5273e71705b6..000000000000
--- a/external/nss/nss-winXP-sdk.patch.1
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur nss.org/nss/coreconf/config.mk nss/nss/coreconf/config.mk
---- nss.org/nss/coreconf/config.mk 2016-03-15 14:52:19.706093300 +0100
-+++ nss/nss/coreconf/config.mk 2016-03-15 14:56:51.549914800 +0100
-@@ -203,6 +203,8 @@
-
- # Hide old, deprecated, TLS cipher suite names when building NSS
- DEFINES += -DSSL_DISABLE_DEPRECATED_CIPHER_SUITE_NAMES
-+# build with 7.1A SDK for winXP compatibility
-+DEFINES += -D_USING_V110_SDK71_
-
- # Mozilla's mozilla/modules/zlib/src/zconf.h adds the MOZ_Z_ prefix to zlib
- # exported symbols, which causes problem when NSS is built as part of Mozilla.
commit ae286726dd223651f9b8bded18f609e2fe09c626
Author: Michael Stahl <mst...@redhat.com>
Date: Tue May 30 16:52:37 2017 +0200
curl: remove curl-xp.patch.1
Change-Id: I329289c97b857370852c982a8b74b739b9ac3d78
diff --git a/external/curl/ExternalProject_curl.mk
b/external/curl/ExternalProject_curl.mk
index f57efc07fd73..70de689dd0c7 100644
--- a/external/curl/ExternalProject_curl.mk
+++ b/external/curl/ExternalProject_curl.mk
@@ -66,7 +66,7 @@ $(call gb_ExternalProject_get_state_target,curl,build):
$(call gb_ExternalProject_run,build,\
MAKEFLAGS= LIB="$(ILIB)" nmake -f Makefile.vc12 \
cfg=$(if
$(MSVC_USE_DEBUG_RUNTIME),debug-dll,release-dll) \
- EXCFLAGS="/EHs /D_CRT_SECURE_NO_DEPRECATE
/DUSE_WINDOWS_SSPI /D_USING_V110_SDK71_ $(SOLARINC)" $(if $(filter
X86_64,$(CPUNAME)),MACHINE=X64) \
+ EXCFLAGS="/EHs /D_CRT_SECURE_NO_DEPRECATE
/DUSE_WINDOWS_SSPI $(SOLARINC)" $(if $(filter X86_64,$(CPUNAME)),MACHINE=X64) \
,lib)
endif
diff --git a/external/curl/UnpackedTarball_curl.mk
b/external/curl/UnpackedTarball_curl.mk
index 3e88d5f771f1..de252469fcc2 100644
--- a/external/curl/UnpackedTarball_curl.mk
+++ b/external/curl/UnpackedTarball_curl.mk
@@ -21,7 +21,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,curl,\
external/curl/curl-msvc.patch.1 \
external/curl/curl-msvc-schannel.patch.1 \
external/curl/curl-7.26.0_win-proxy.patch \
- external/curl/curl-xp.patch.1 \
))
ifeq ($(SYSTEM_NSS),)
diff --git a/external/curl/curl-xp.patch.1 b/external/curl/curl-xp.patch.1
deleted file mode 100644
index 9e4163e3eab1..000000000000
--- a/external/curl/curl-xp.patch.1
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur curl.org/src/Makefile.vc10 curl/src/Makefile.vc10
---- curl.org/src/Makefile.vc10 2016-07-04 03:45:24.102995951 +0200
-+++ curl/src/Makefile.vc10 2016-07-04 03:48:00.547835559 +0200
-@@ -127,7 +127,7 @@
- LINKD = link.exe /incremental:yes /debug /libpath:"../lib"
- RCD = rc.exe /dDEBUGBUILD=1
-
--CFLAGS = /I../lib /I../include /nologo /W3 /EHsc /DWIN32 /FD /c
/D_BIND_TO_CURRENT_VCLIBS_VERSION=1
-+CFLAGS = /I../lib /I../include /nologo /W3 /EHsc /DWIN32 /FD /c
/D_BIND_TO_CURRENT_VCLIBS_VERSION=1 /D_WIN32_WINNT=0x0502
- LFLAGS = /nologo /out:$(PROGRAM_NAME) /subsystem:console /machine:$(MACHINE)
- RESFLAGS = /i../include
-
commit 713ed7b338b467b176af7eb5e9a80559b8496e8e
Author: Michael Stahl <mst...@redhat.com>
Date: Tue May 30 17:00:42 2017 +0200
gbuild: stop defining _USING_V110_SDK71_
Change-Id: Ic8eee967269b3666b15795f20ee62817dadfb0ff
diff --git a/solenv/gbuild/platform/com_MSC_defs.mk
b/solenv/gbuild/platform/com_MSC_defs.mk
old mode 100755
new mode 100644
index 5c9b86618516..7f184c6be057
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -54,7 +54,6 @@ gb_COMPILERDEFS := \
-D_MT \
-D_DLL \
-DCPPU_ENV=$(gb_CPPU_ENV) \
- $(if $(findstring
140_70,$(VCVER)_$(WINDOWS_SDK_VERSION)),-D_USING_V110_SDK71_) \
ifeq ($(CPUNAME),INTEL)
gb_COMPILERDEFS += \
commit b411470bb818b6be17d0da982deb74d31b1b3dfc
Author: Michael Stahl <mst...@redhat.com>
Date: Tue May 30 16:45:32 2017 +0200
vcl: replace dynamic lookups of Windows 7 APIs with static calls
Change-Id: I5d4c4bb98e271e69c45b8e7f989f9b21d287c0bb
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx
b/vcl/source/gdi/pdfwriter_impl.cxx
index 5384204e4dc5..815892859b99 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -100,10 +100,7 @@
#ifdef _WIN32
// WinCrypt headers for PDF signing
-// Note: this uses Windows 7 APIs and requires the relevant data types;
-// the functions that don't exist in WinXP must be looked up at runtime!
-#undef _WIN32_WINNT
-#define _WIN32_WINNT _WIN32_WINNT_WIN7
+// Note: this uses Windows 7 APIs and requires the relevant data types
#include <prewin.h>
#include <wincrypt.h>
#include <postwin.h>
@@ -6222,17 +6219,6 @@ NSSCMSMessage *CreateCMSMessage(PRTime* time,
#ifdef _WIN32
-typedef BOOL (WINAPI *PointerTo_CryptRetrieveTimeStamp)(LPCWSTR wszUrl,
- DWORD dwRetrievalFlags,
- DWORD dwTimeout,
- LPCSTR pszHashId,
- const
CRYPT_TIMESTAMP_PARA *pPara,
- const BYTE *pbData,
- DWORD cbData,
-
PCRYPT_TIMESTAMP_CONTEXT *ppTsContext,
- PCCERT_CONTEXT
*ppTsSigner,
- HCERTSTORE phStore);
-
namespace
{
@@ -6958,15 +6944,6 @@ bool PDFWriter::Sign(PDFSignContext& rContext)
if( !rContext.m_aSignTSA.isEmpty() )
{
- PointerTo_CryptRetrieveTimeStamp crts =
reinterpret_cast<PointerTo_CryptRetrieveTimeStamp>(GetProcAddress(LoadLibrary("crypt32.dll"),
"CryptRetrieveTimeStamp"));
- if (!crts)
- {
- SAL_WARN("vcl.pdfwriter", "Could not find the
CryptRetrieveTimeStamp function in crypt32.dll: " <<
WindowsErrorString(GetLastError()));
- CryptMsgClose(hMsg);
- CertFreeCertificateContext(pCertContext);
- return false;
- }
-
HCRYPTMSG hDecodedMsg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING |
X509_ASN_ENCODING,
CMSG_DETACHED_FLAG,
CMSG_SIGNED,
@@ -7047,7 +7024,7 @@ bool PDFWriter::Sign(PDFSignContext& rContext)
aTsPara.cExtension = 0;
aTsPara.rgExtension = nullptr;
- if (!(*crts)(SAL_W(rContext.m_aSignTSA.getStr()),
+ if (!CryptRetrieveTimeStamp(SAL_W(rContext.m_aSignTSA.getStr()),
0,
10000,
szOID_NIST_sha256,
diff --git a/vcl/win/app/salinst.cxx b/vcl/win/app/salinst.cxx
index e087b4d1d99b..78147ae67608 100644
--- a/vcl/win/app/salinst.cxx
+++ b/vcl/win/app/salinst.cxx
@@ -913,65 +913,47 @@ void WinSalInstance::AddToRecentDocumentList(const
OUString& rFileUrl, const OUS
{
if ( aSalShlData.mbW7 )
{
- typedef HRESULT ( WINAPI *SHCREATEITEMFROMPARSINGNAME )( PCWSTR,
IBindCtx*, REFIID, void **ppv );
- SHCREATEITEMFROMPARSINGNAME pSHCreateItemFromParsingName =
-
reinterpret_cast<SHCREATEITEMFROMPARSINGNAME>(GetProcAddress(
- GetModuleHandleW (L"shell32.dll"),
"SHCreateItemFromParsingName" ));
+ IShellItem* pShellItem = nullptr;
- if( pSHCreateItemFromParsingName )
- {
- IShellItem* pShellItem = nullptr;
-
- HRESULT hr = pSHCreateItemFromParsingName (
SAL_W(system_path.getStr()), nullptr, IID_PPV_ARGS(&pShellItem) );
+ HRESULT hr =
SHCreateItemFromParsingName(SAL_W(system_path.getStr()), nullptr,
IID_PPV_ARGS(&pShellItem));
- if ( SUCCEEDED(hr) && pShellItem )
+ if ( SUCCEEDED(hr) && pShellItem )
+ {
+ OUString sApplicationName;
+
+ if ( rDocumentService == "com.sun.star.text.TextDocument" ||
+ rDocumentService == "com.sun.star.text.GlobalDocument" ||
+ rDocumentService == "com.sun.star.text.WebDocument" ||
+ rDocumentService == "com.sun.star.xforms.XMLFormDocument"
)
+ sApplicationName = "Writer";
+ else if ( rDocumentService ==
"com.sun.star.sheet.SpreadsheetDocument" ||
+ rDocumentService == "com.sun.star.chart2.ChartDocument" )
+ sApplicationName = "Calc";
+ else if ( rDocumentService ==
"com.sun.star.presentation.PresentationDocument" )
+ sApplicationName = "Impress";
+ else if ( rDocumentService ==
"com.sun.star.drawing.DrawingDocument" )
+ sApplicationName = "Draw";
+ else if ( rDocumentService ==
"com.sun.star.formula.FormulaProperties" )
+ sApplicationName = "Math";
+ else if ( rDocumentService ==
"com.sun.star.sdb.DatabaseDocument" ||
+ rDocumentService ==
"com.sun.star.sdb.OfficeDatabaseDocument" ||
+ rDocumentService == "com.sun.star.sdb.RelationDesign" ||
+ rDocumentService == "com.sun.star.sdb.QueryDesign" ||
+ rDocumentService == "com.sun.star.sdb.TableDesign" ||
+ rDocumentService == "com.sun.star.sdb.DataSourceBrowser" )
+ sApplicationName = "Base";
+
+ if ( !sApplicationName.isEmpty() )
{
- OUString sApplicationName;
-
- if ( rDocumentService == "com.sun.star.text.TextDocument"
||
- rDocumentService ==
"com.sun.star.text.GlobalDocument" ||
- rDocumentService == "com.sun.star.text.WebDocument" ||
- rDocumentService ==
"com.sun.star.xforms.XMLFormDocument" )
- sApplicationName = "Writer";
- else if ( rDocumentService ==
"com.sun.star.sheet.SpreadsheetDocument" ||
- rDocumentService ==
"com.sun.star.chart2.ChartDocument" )
- sApplicationName = "Calc";
- else if ( rDocumentService ==
"com.sun.star.presentation.PresentationDocument" )
- sApplicationName = "Impress";
- else if ( rDocumentService ==
"com.sun.star.drawing.DrawingDocument" )
- sApplicationName = "Draw";
- else if ( rDocumentService ==
"com.sun.star.formula.FormulaProperties" )
- sApplicationName = "Math";
- else if ( rDocumentService ==
"com.sun.star.sdb.DatabaseDocument" ||
- rDocumentService ==
"com.sun.star.sdb.OfficeDatabaseDocument" ||
- rDocumentService == "com.sun.star.sdb.RelationDesign"
||
- rDocumentService == "com.sun.star.sdb.QueryDesign" ||
- rDocumentService == "com.sun.star.sdb.TableDesign" ||
- rDocumentService ==
"com.sun.star.sdb.DataSourceBrowser" )
- sApplicationName = "Base";
-
- if ( !sApplicationName.isEmpty() )
- {
- OUString
sApplicationID("TheDocumentFoundation.LibreOffice.");
- sApplicationID += sApplicationName;
-
-#if _WIN32_WINNT < _WIN32_WINNT_WIN7
-// just define Windows 7 only constant locally...
-#define SHARD_APPIDINFO 0x00000004
-#endif
-
- typedef struct {
- IShellItem *psi;
- PCWSTR pszAppID;
- } DummyShardAppIDInfo;
+ OUString
sApplicationID("TheDocumentFoundation.LibreOffice.");
+ sApplicationID += sApplicationName;
- DummyShardAppIDInfo info;
- info.psi = pShellItem;
- info.pszAppID = SAL_W(sApplicationID.getStr());
+ SHARDAPPIDINFO info;
+ info.psi = pShellItem;
+ info.pszAppID = SAL_W(sApplicationID.getStr());
- SHAddToRecentDocs ( SHARD_APPIDINFO, &info );
- return;
- }
+ SHAddToRecentDocs ( SHARD_APPIDINFO, &info );
+ return;
}
}
}
commit 5158c16a9ef23ab610940eb51e2fead13a7b0456
Author: Michael Stahl <mst...@redhat.com>
Date: Tue May 30 16:42:28 2017 +0200
sal,sd: remove deprecated Windows XP socket code
Change-Id: I220911496ed2734224b1eb96a929ec8d8bf2a3ef
diff --git a/sal/osl/w32/socket.cxx b/sal/osl/w32/socket.cxx
index 319f18b9c116..c1f5b461fc24 100644
--- a/sal/osl/w32/socket.cxx
+++ b/sal/osl/w32/socket.cxx
@@ -424,26 +424,12 @@ oslSocketAddr SAL_CALL osl_createInetBroadcastAddr (
if (strDottedAddr && strDottedAddr->length)
{
-// the Win32 SDK 8.1 deprecates inet_addr()
-#if _WIN32_WINNT >= _WIN32_WINNT_VISTA
IN_ADDR addr;
INT ret = InetPtonW(AF_INET, SAL_W(strDottedAddr->buffer), & addr);
if (1 == ret)
{
nAddr = addr.S_un.S_addr;
}
-#else
- /* Dotted host address for limited broadcast */
- rtl_String *pDottedAddr = NULL;
-
- rtl_uString2String (
- &pDottedAddr, strDottedAddr->buffer, strDottedAddr->length,
- RTL_TEXTENCODING_UTF8, OUSTRING_TO_OSTRING_CVTFLAGS);
-
- nAddr = inet_addr (pDottedAddr->buffer);
-
- rtl_string_release (pDottedAddr);
-#endif
}
if (nAddr != OSL_INADDR_NONE)
@@ -487,21 +473,9 @@ oslSocketAddr SAL_CALL osl_createInetSocketAddr (
{
sal_uInt32 Addr;
-// the Win32 SDK 8.1 deprecates inet_addr()
-#if _WIN32_WINNT >= _WIN32_WINNT_VISTA
IN_ADDR addr;
INT ret = InetPtonW(AF_INET, SAL_W(strDottedAddr->buffer), & addr);
Addr = ret == 1 ? addr.S_un.S_addr : OSL_INADDR_NONE;
-#else
- rtl_String *pDottedAddr=NULL;
-
- rtl_uString2String(
- &pDottedAddr, strDottedAddr->buffer, strDottedAddr->length,
- RTL_TEXTENCODING_UTF8, OUSTRING_TO_OSTRING_CVTFLAGS);
-
- Addr= inet_addr (pDottedAddr->buffer);
- rtl_string_release (pDottedAddr);
-#endif
oslSocketAddr pAddr = nullptr;
if(Addr != OSL_INADDR_NONE)
@@ -554,68 +528,6 @@ struct oslHostAddrImpl {
oslSocketAddr pSockAddr;
} ;
-#if _WIN32_WINNT < _WIN32_WINNT_VISTA
-static oslHostAddr __osl_hostentToHostAddr (const struct hostent *he)
-{
- oslHostAddr pAddr= NULL;
- oslSocketAddr pSocketAddr = 0;
-
- rtl_uString *cn= NULL;
-
- if ((he == NULL) || (he->h_name == NULL) || (he->h_addr_list[0] == NULL))
- return ((oslHostAddr)NULL);
-
- rtl_string2UString(
- &cn, he->h_name, strlen(he->h_name),
- RTL_TEXTENCODING_UTF8, OUSTRING_TO_OSTRING_CVTFLAGS);
- OSL_ASSERT(cn != 0);
-
- pSocketAddr = osl_createSocketAddr_();
-
- if (pSocketAddr == NULL)
- {
- rtl_uString_release(cn);
- return ((oslHostAddr)NULL);
- }
-
- pSocketAddr->m_sockaddr.sa_family = he->h_addrtype;
- if (pSocketAddr->m_sockaddr.sa_family ==
FAMILY_TO_NATIVE(osl_Socket_FamilyInet))
- {
- struct sockaddr_in *sin= (struct sockaddr_in
*)&(pSocketAddr->m_sockaddr);
- memcpy (
- &(sin->sin_addr.s_addr),
- he->h_addr_list[0],
- he->h_length);
- }
- else
- {
- /* unknown address family */
- /* future extensions for new families might be implemented here */
-
- SAL_WARN("sal.osl", "_osl_hostentToHostAddr(): unknown address
family.");
- OSL_ASSERT(sal_False);
-
- osl_destroySocketAddr_( pSocketAddr );
- rtl_uString_release(cn);
- return ((oslHostAddr)NULL);
- }
-
- pAddr= (oslHostAddr )rtl_allocateMemory (sizeof (struct oslHostAddrImpl));
-
- if (pAddr == NULL)
- {
- osl_destroySocketAddr_( pSocketAddr );
- rtl_uString_release(cn);
- return ((oslHostAddr)NULL);
- }
-
- pAddr->pHostName= cn;
- pAddr->pSockAddr= pSocketAddr;
-
- return pAddr;
-}
-#endif
-
/*****************************************************************************/
/* osl_createHostAddr */
/*****************************************************************************/
@@ -659,19 +571,6 @@ oslHostAddr SAL_CALL osl_createHostAddrByName(rtl_uString
*strHostname)
if ((strHostname == nullptr) || (strHostname->length == 0))
return nullptr;
-#if _WIN32_WINNT < _WIN32_WINNT_VISTA
- struct hostent *he;
- rtl_String *Hostname= NULL;
-
- rtl_uString2String(
- &Hostname, strHostname->buffer, strHostname->length,
- RTL_TEXTENCODING_UTF8, OUSTRING_TO_OSTRING_CVTFLAGS);
-
- he= gethostbyname (Hostname->buffer);
-
- rtl_string_release (Hostname);
- return __osl_hostentToHostAddr (he);
-#else
PADDRINFOW pAddrInfo = nullptr;
int ret = GetAddrInfoW(
SAL_W(strHostname->buffer), nullptr, nullptr, & pAddrInfo);
@@ -699,7 +598,6 @@ oslHostAddr SAL_CALL osl_createHostAddrByName(rtl_uString
*strHostname)
SAL_INFO("sal.osl", "GetAddrInfoW failed: " << WSAGetLastError());
}
return nullptr;
-#endif // _WIN32_WINNT
}
/*****************************************************************************/
@@ -717,13 +615,6 @@ oslHostAddr SAL_CALL osl_createHostAddrByAddr(const
oslSocketAddr pAddr)
if (sin->sin_addr.s_addr == htonl(INADDR_ANY))
return nullptr;
-#if _WIN32_WINNT < _WIN32_WINNT_VISTA
- struct hostent *he;
- he= gethostbyaddr ((const sal_Char *)&(sin->sin_addr),
- sizeof (sin->sin_addr),
- sin->sin_family);
- return __osl_hostentToHostAddr (he);
-#else
WCHAR buf[NI_MAXHOST];
int ret = GetNameInfoW(
& pAddr->m_sockaddr, sizeof(struct sockaddr),
@@ -744,7 +635,6 @@ oslHostAddr SAL_CALL osl_createHostAddrByAddr(const
oslSocketAddr pAddr)
{
SAL_INFO("sal.osl", "GetNameInfoW failed: " << WSAGetLastError());
}
-#endif // _WIN32_WINNT
}
return nullptr;
@@ -988,12 +878,6 @@ oslSocketResult SAL_CALL osl_getDottedInetAddrOfSocketAddr
(
return osl_Socket_Error;
*strDottedInetAddr = nullptr;
-#if _WIN32_WINNT < _WIN32_WINNT_VISTA
- sal_Char * pDotted = inet_ntoa (pSystemInetAddr->sin_addr);
- rtl_string2UString(
- strDottedInetAddr, pDotted, strlen (pDotted),
- RTL_TEXTENCODING_UTF8, OUSTRING_TO_OSTRING_CVTFLAGS);
-#else
WCHAR buf[16]; // 16 for IPV4, 46 for IPV6
PCWSTR ret = InetNtopW(
AF_INET, & pSystemInetAddr->sin_addr,
@@ -1004,7 +888,6 @@ oslSocketResult SAL_CALL osl_getDottedInetAddrOfSocketAddr
(
return osl_Socket_Error;
}
rtl_uString_newFromStr(strDottedInetAddr, SAL_U(ret));
-#endif // _WIN32_WINNT
OSL_ASSERT(*strDottedInetAddr != nullptr);
return osl_Socket_Ok;
diff --git a/sd/source/ui/remotecontrol/DiscoveryService.cxx
b/sd/source/ui/remotecontrol/DiscoveryService.cxx
index 048b9bcea31e..97cccf70c575 100644
--- a/sd/source/ui/remotecontrol/DiscoveryService.cxx
+++ b/sd/source/ui/remotecontrol/DiscoveryService.cxx
@@ -123,7 +123,7 @@ void DiscoveryService::setupSockets()
struct ip_mreq multicastRequest;
// the Win32 SDK 8.1 deprecates inet_addr()
-#if defined(_WIN32_WINNT) && _WIN32_WINNT >= _WIN32_WINNT_VISTA
+#if defined(_WIN32)
IN_ADDR addr;
INT ret = InetPtonW(AF_INET, L"239.0.0.1", & addr);
if (1 == ret)
commit e687c1e3e35d65c7d21a4d243087adfd6b4ea9ef
Author: Michael Stahl <mst...@redhat.com>
Date: Tue May 30 16:41:03 2017 +0200
fpicker: global default _WIN32_WINNT is sufficient now
Remove local overrides.
Change-Id: I588b6543848f962d7533c49b138bc6d836fe5c47
diff --git a/fpicker/Library_fps.mk b/fpicker/Library_fps.mk
index 1cec714107db..2e7f0a17d42a 100644
--- a/fpicker/Library_fps.mk
+++ b/fpicker/Library_fps.mk
@@ -25,8 +25,6 @@ $(eval $(call gb_Library_use_sdk_api,fps))
$(eval $(call gb_Library_add_defs,fps,\
-D_UNICODE \
-DUNICODE \
- -U_WIN32_WINNT \
- -D_WIN32_WINNT=0x0600 \
))
$(eval $(call gb_Library_use_libraries,fps,\
diff --git a/fpicker/source/win32/filepicker/platform_vista.h
b/fpicker/source/win32/filepicker/platform_vista.h
index 359e5ae0a6d8..2a29131c9baa 100644
--- a/fpicker/source/win32/filepicker/platform_vista.h
+++ b/fpicker/source/win32/filepicker/platform_vista.h
@@ -22,15 +22,8 @@
#pragma once
-// Change these values to use different versions
-#undef WINVER
-#undef _WIN32_WINNT
-#undef _WIN32_IE
#undef _WTL_NO_CSTRING
-#define WINVER 0x0600
-#define _WIN32_WINNT 0x0600
-#define _WIN32_IE 0x0700
#define _WTL_NO_CSTRING
#if defined _MSC_VER
commit 2829dabaf37e6d9c736430f3fb9bbfb786b078ad
Author: Michael Stahl <mst...@redhat.com>
Date: Tue May 30 16:37:56 2017 +0200
gbuild: define _WIN32_WINNT = _WIN32_WINNT_WIN7 = 0x0601
And rely on implicitly derived
_WIN32_IE = _WIN32_IE_WIN7 = _WIN32_IE_IE80
Change-Id: I94717e2ed66387bdc76f9047c02c0820d4adc1f9
diff --git a/solenv/gbuild/platform/windows.mk
b/solenv/gbuild/platform/windows.mk
index e636de1c648d..51e8906e16f3 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -23,13 +23,11 @@ gb_Helper_LIBRARY_PATH_VAR := PATH
gb_MKTEMP := mktemp --tmpdir=$(gb_TMPDIR) gbuild.XXXXXX
# define _WIN32_WINNT and WINVER will be derived from it in sdkddkver.h
-# with a 7.1 SDK target Windows XP, with 8.x SDK target Windows Vista
-# currently _WIN32_IE is defined to a higher version than would be derived
-# in sdkddkver.h from _WIN32_WINNT=0x0502 but if _WIN32_WINNT >= 0x0600
-# the derived value is sufficient
+# current baseline is Windows 7 (NT 6.1)
+# for _WIN32_IE, if _WIN32_WINNT >= 0x0600 the derived value from
+# sdkddkver.h is sufficient
gb_OSDEFS := \
- -D_WIN32_WINNT=$(if $(filter 70,$(WINDOWS_SDK_VERSION)),0x0502,0x0600) \
- -D_WIN32_IE=0x0700 \
+ -D_WIN32_WINNT=0x0601 \
-DWIN32 \
-DWNT \
-DNOMINMAX \
commit 3d15405e436db0cbad351808ef3ca0e47f47a701
Author: Michael Stahl <mst...@redhat.com>
Date: Tue May 30 15:29:46 2017 +0200
configure: stop printing warnings about Windows XP
Change-Id: Ia90056aa074be3d80c28e774714b5e5f217e37a7
diff --git a/configure.ac b/configure.ac
index 1216160fa30f..0fcab1169b13 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5356,13 +5356,6 @@ the Windows SDK are installed.])
elif echo $WINDOWS_SDK_HOME | grep "8.0" >/dev/null 2>/dev/null; then
WINDOWS_SDK_VERSION=80
AC_MSG_RESULT([found Windows SDK 8.0 ($WINDOWS_SDK_HOME)])
- dnl compatibility warning if not explicitly choosing the 80 SDK:
- if test -z "$with_windows_sdk"; then
- AC_MSG_WARN([If a build should run on Windows XP,])
- AC_MSG_WARN([use --with-windows-sdk=7.1A])
- add_warning "If a build should run on Windows XP,"
- add_warning "use --with-windows-sdk=7.1A"
- fi
elif echo $WINDOWS_SDK_HOME | grep "8.1" >/dev/null 2>/dev/null; then
WINDOWS_SDK_VERSION=81
AC_MSG_RESULT([found Windows SDK 8.1 ($WINDOWS_SDK_HOME)])
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
