From f01580ce9c5f898c1fdb85e302a158f1a31205db Mon Sep 17 00:00:00 2001 From: Thomas Arnhold Date: Wed, 6 Nov 2013 11:23:15 +0100 Subject: Windows: Require at least Windows XP SP2 * Windows XP SP2 is 0x0502, see http://msdn.microsoft.com/en-us/library/aa383745.aspx * If a module changes the Windows SDK version setting, this is done module wide now. So the overall behavior is as before. This seems to be the best compromise for now. * We need at least SP2 because of the bluetooth stuff used in sd/source/ui/remotecontrol. * Now, we require at least Internet Explorer 7.0. IE6 has been outdated for a long time. * Leave StdAfx.h file definitions, as those are Microsoft project specific precompiled header files. * All local definitions of WINVER are removed, because the global WINVER setting makes them obsolete now. To the relation of the three macros: Setting _WIN32_WINNT sets WINVER and NTDDI_VERSION automatically to the same value as _WIN32_WINNT. WINVER and NTDDI_VERSION can be set idenpendently each for itself. Change-Id: Ibcc12493aae4fcaf7bcfda88be99c1b61bc326cb Reviewed-on: https://gerrit.libreoffice.org/6496 Reviewed-by: Thorsten Behrens Tested-by: Thorsten Behrens --- extensions/source/ole/oledll.cxx | 1 - extensions/source/ole/oleobjw.cxx | 3 --- extensions/source/ole/servprov.cxx | 4 ---- extensions/source/ole/servreg.cxx | 3 --- extensions/source/ole/unoobjw.cxx | 3 --- extensions/source/ole/wincrap.hxx | 4 ---- 6 files changed, 18 deletions(-) (limited to 'extensions/source/ole') diff --git a/extensions/source/ole/oledll.cxx b/extensions/source/ole/oledll.cxx index 626937704021..d1813555442e 100644 --- a/extensions/source/ole/oledll.cxx +++ b/extensions/source/ole/oledll.cxx @@ -19,7 +19,6 @@ #define STRICT -#define _WIN32_WINNT 0x0403 #define _WIN32_DCOM #pragma warning (push,1) diff --git a/extensions/source/ole/oleobjw.cxx b/extensions/source/ole/oleobjw.cxx index f5415a618a75..1118f43eb659 100644 --- a/extensions/source/ole/oleobjw.cxx +++ b/extensions/source/ole/oleobjw.cxx @@ -17,9 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -// http://stackoverflow.com/questions/5839292/error-c1189-after-installing-visual-studio-2010 -#define _WIN32_WINNT 0x0403 - #include "ole2uno.hxx" #include "rtl/ustrbuf.hxx" diff --git a/extensions/source/ole/servprov.cxx b/extensions/source/ole/servprov.cxx index 9e799071d857..cbf4645bd81c 100644 --- a/extensions/source/ole/servprov.cxx +++ b/extensions/source/ole/servprov.cxx @@ -17,10 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -// http://stackoverflow.com/questions/5839292/error-c1189-after-installing-visual-studio-2010 -#define _WIN32_WINNT 0x0403 - - #include #ifdef __MINGW32__ diff --git a/extensions/source/ole/servreg.cxx b/extensions/source/ole/servreg.cxx index 401b492725a8..60e39ae25df0 100644 --- a/extensions/source/ole/servreg.cxx +++ b/extensions/source/ole/servreg.cxx @@ -17,9 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -// http://stackoverflow.com/questions/5839292/error-c1189-after-installing-visual-studio-2010 -#define _WIN32_WINNT 0x0403 - #include #include "ole2uno.hxx" #include "servprov.hxx" diff --git a/extensions/source/ole/unoobjw.cxx b/extensions/source/ole/unoobjw.cxx index bac14b01674a..0689773d0a97 100644 --- a/extensions/source/ole/unoobjw.cxx +++ b/extensions/source/ole/unoobjw.cxx @@ -18,9 +18,6 @@ */ #include "ole2uno.hxx" -#if _WIN32_WINNT != 0x403 -#error wrong _WIN32_WINNT -#endif #include #include diff --git a/extensions/source/ole/wincrap.hxx b/extensions/source/ole/wincrap.hxx index e7c308461a5a..29801c2e7b9d 100644 --- a/extensions/source/ole/wincrap.hxx +++ b/extensions/source/ole/wincrap.hxx @@ -22,10 +22,6 @@ /* wrap all includes that need to be wrapped by presys.h/postsys.h here */ -// from oleobjw.hxx -// http://stackoverflow.com/questions/5839292/error-c1189-after-installing-visual-studio-2010 -#define _WIN32_WINNT 0x0403 - #define STRICT #define _WIN32_DCOM -- cgit v1.2.3