diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2013-11-06 11:23:15 +0100 |
---|---|---|
committer | Thorsten Behrens <thb@documentfoundation.org> | 2013-11-20 07:15:16 -0600 |
commit | f01580ce9c5f898c1fdb85e302a158f1a31205db (patch) | |
tree | a49f1c99391904d8b4f96e6ff1a7160ce82d4461 /extensions | |
parent | d0c5f4522f8aa063b3e7c034db079d74b7f0b3fa (diff) |
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 <thb@documentfoundation.org>
Tested-by: Thorsten Behrens <thb@documentfoundation.org>
Diffstat (limited to 'extensions')
-rw-r--r-- | extensions/Library_oleautobridge.mk | 4 | ||||
-rw-r--r-- | extensions/source/activex/StdAfx2.h | 2 | ||||
-rw-r--r-- | extensions/source/activex/so_activex.rc | 1 | ||||
-rw-r--r-- | extensions/source/ole/oledll.cxx | 1 | ||||
-rw-r--r-- | extensions/source/ole/oleobjw.cxx | 3 | ||||
-rw-r--r-- | extensions/source/ole/servprov.cxx | 4 | ||||
-rw-r--r-- | extensions/source/ole/servreg.cxx | 3 | ||||
-rw-r--r-- | extensions/source/ole/unoobjw.cxx | 3 | ||||
-rw-r--r-- | extensions/source/ole/wincrap.hxx | 4 | ||||
-rw-r--r-- | extensions/test/ole/AxTestComponents/StdAfx.h | 2 | ||||
-rw-r--r-- | extensions/test/ole/EventListenerSample/EventListener/StdAfx.h | 2 | ||||
-rw-r--r-- | extensions/test/ole/unoTocomCalls/XCallback_Impl/StdAfx.h | 2 |
12 files changed, 8 insertions, 23 deletions
diff --git a/extensions/Library_oleautobridge.mk b/extensions/Library_oleautobridge.mk index 5c138a5bf47e..2c9e49ced4d7 100644 --- a/extensions/Library_oleautobridge.mk +++ b/extensions/Library_oleautobridge.mk @@ -24,6 +24,10 @@ $(eval $(call gb_Library_add_ldflags,oleautobridge,\ -LIBPATH:$(ATL_LIB) \ )) +$(eval $(call gb_Library_add_defs,oleautobridge,\ + -D_WIN32_WINNT=0x0502 \ +)) + $(eval $(call gb_Library_use_external,oleautobridge,boost_headers)) $(eval $(call gb_Library_use_libraries,oleautobridge,\ diff --git a/extensions/source/activex/StdAfx2.h b/extensions/source/activex/StdAfx2.h index c1ef7e523db4..4d9ba1d7231d 100644 --- a/extensions/source/activex/StdAfx2.h +++ b/extensions/source/activex/StdAfx2.h @@ -30,7 +30,7 @@ #define STRICT #ifndef _WIN32_WINNT -#define _WIN32_WINNT 0x0403 +#define _WIN32_WINNT 0x0502 #endif #define _ATL_APARTMENT_THREADED #define _ATL_STATIC_REGISTRY diff --git a/extensions/source/activex/so_activex.rc b/extensions/source/activex/so_activex.rc index 2928c02c97d3..c1dca6dbe61d 100644 --- a/extensions/source/activex/so_activex.rc +++ b/extensions/source/activex/so_activex.rc @@ -25,7 +25,6 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#define WINVER 0x0500 #include <winresrc.h> #define LB_ADDSTRING (WM_USER+1) #define CB_ADDSTRING (WM_USER+3) 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 <vector> #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 <osl/time.h> #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 <stdio.h> #include <vector> 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 diff --git a/extensions/test/ole/AxTestComponents/StdAfx.h b/extensions/test/ole/AxTestComponents/StdAfx.h index f25e075be701..eed60448a599 100644 --- a/extensions/test/ole/AxTestComponents/StdAfx.h +++ b/extensions/test/ole/AxTestComponents/StdAfx.h @@ -29,7 +29,7 @@ #define STRICT #ifndef _WIN32_WINNT -#define _WIN32_WINNT 0x0400 +#define _WIN32_WINNT 0x0502 #endif #define _ATL_APARTMENT_THREADED diff --git a/extensions/test/ole/EventListenerSample/EventListener/StdAfx.h b/extensions/test/ole/EventListenerSample/EventListener/StdAfx.h index b27537feab08..08ee6950931f 100644 --- a/extensions/test/ole/EventListenerSample/EventListener/StdAfx.h +++ b/extensions/test/ole/EventListenerSample/EventListener/StdAfx.h @@ -29,7 +29,7 @@ #define STRICT #ifndef _WIN32_WINNT -#define _WIN32_WINNT 0x0400 +#define _WIN32_WINNT 0x0502 #endif #define _ATL_APARTMENT_THREADED diff --git a/extensions/test/ole/unoTocomCalls/XCallback_Impl/StdAfx.h b/extensions/test/ole/unoTocomCalls/XCallback_Impl/StdAfx.h index b35c1ddc8df9..f43772942f81 100644 --- a/extensions/test/ole/unoTocomCalls/XCallback_Impl/StdAfx.h +++ b/extensions/test/ole/unoTocomCalls/XCallback_Impl/StdAfx.h @@ -29,7 +29,7 @@ #define STRICT #ifndef _WIN32_WINNT -#define _WIN32_WINNT 0x0400 +#define _WIN32_WINNT 0x0502 #endif #define _ATL_APARTMENT_THREADED |