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>

10 files changed, 16 insertions, 39 deletions

diff --git a/shell/Library_ooofilt.mk b/shell/Library_ooofilt.mk
index d8f68b05fe84..f997eeadeb4c 100644
--- a/shell/Library_ooofilt.mk
+++ b/shell/Library_ooofilt.mk
@@ -19,10 +19,8 @@ $(eval $(call gb_Library_add_defs,ooofilt,\
 	-DUNICODE \
 	-DWIN32_LEAN_AND_MEAN \
 	-D_UNICODE \
-))
-$(eval $(call gb_Library_add_defs,ooofilt,\
-	-D_WIN32_IE=0x501 \
-	-D_WIN32_WINNT=0x0501 \
+	-D_WIN32_IE=0x700 \
+	-D_WIN32_WINNT=0x0502 \
 	-UNOMINMAX \
 ))
 
diff --git a/shell/Library_ooofilt_x64.mk b/shell/Library_ooofilt_x64.mk
index c32a51261637..8f994dc2b9ca 100644
--- a/shell/Library_ooofilt_x64.mk
+++ b/shell/Library_ooofilt_x64.mk
@@ -26,10 +26,8 @@ $(eval $(call gb_Library_add_defs,ooofilt_x64,\
 	-DWIN32_LEAN_AND_MEAN \
 	-D_UNICODE \
 	-UNOMINMAX \
-))
-$(eval $(call gb_Library_add_defs,ooofilt_x64,\
-	-D_WIN32_IE=0x501 \
-	-D_WIN32_WINNT=0x0501 \
+	-D_WIN32_IE=0x700 \
+	-D_WIN32_WINNT=0x0502 \
 ))
 
 $(eval $(call gb_Library_use_externals,ooofilt_x64,\
diff --git a/shell/Library_propertyhdl.mk b/shell/Library_propertyhdl.mk
index 70b2763225fe..6ea684fcb962 100644
--- a/shell/Library_propertyhdl.mk
+++ b/shell/Library_propertyhdl.mk
@@ -20,10 +20,8 @@ $(eval $(call gb_Library_add_defs,propertyhdl,\
 	-DWIN32_LEAN_AND_MEAN \
 	-D_UNICODE \
 	-UNOMINMAX \
-))
-$(eval $(call gb_Library_add_defs,propertyhdl,\
-	-D_WIN32_IE=0x501 \
-	-D_WIN32_WINNT=0x0501 \
+	-D_WIN32_IE=0x700 \
+	-D_WIN32_WINNT=0x0502 \
 ))
 
 $(eval $(call gb_Library_use_externals,propertyhdl,\
diff --git a/shell/Library_propertyhdl_x64.mk b/shell/Library_propertyhdl_x64.mk
index d73126a755ec..29f389911516 100644
--- a/shell/Library_propertyhdl_x64.mk
+++ b/shell/Library_propertyhdl_x64.mk
@@ -26,10 +26,8 @@ $(eval $(call gb_Library_add_defs,propertyhdl_x64,\
 	-DWIN32_LEAN_AND_MEAN \
 	-D_UNICODE \
 	-UNOMINMAX \
-))
-$(eval $(call gb_Library_add_defs,propertyhdl_x64,\
-	-D_WIN32_IE=0x501 \
-	-D_WIN32_WINNT=0x0501 \
+	-D_WIN32_IE=0x700 \
+	-D_WIN32_WINNT=0x0502 \
 ))
 
 $(eval $(call gb_Library_use_externals,propertyhdl_x64,\
diff --git a/shell/Library_shlxthdl.mk b/shell/Library_shlxthdl.mk
index 9cd0ceae50b3..f79dc85f1249 100644
--- a/shell/Library_shlxthdl.mk
+++ b/shell/Library_shlxthdl.mk
@@ -20,10 +20,8 @@ $(eval $(call gb_Library_add_defs,shlxthdl,\
 	-DWIN32_LEAN_AND_MEAN \
 	-D_UNICODE \
 	-UNOMINMAX \
-))
-$(eval $(call gb_Library_add_defs,shlxthdl,\
-	-D_WIN32_IE=0x501 \
-	-D_WIN32_WINNT=0x0501 \
+	-D_WIN32_IE=0x700 \
+	-D_WIN32_WINNT=0x0502 \
 ))
 
 $(eval $(call gb_Library_use_externals,shlxthdl,\
diff --git a/shell/Library_shlxthdl_x64.mk b/shell/Library_shlxthdl_x64.mk
index eef8081f48ed..dfd694d93efb 100644
--- a/shell/Library_shlxthdl_x64.mk
+++ b/shell/Library_shlxthdl_x64.mk
@@ -26,10 +26,8 @@ $(eval $(call gb_Library_add_defs,shlxthdl_x64,\
 	-DWIN32_LEAN_AND_MEAN \
 	-D_UNICODE \
 	-UNOMINMAX \
-))
-$(eval $(call gb_Library_add_defs,shlxthdl_x64,\
-	-D_WIN32_IE=0x501 \
-	-D_WIN32_WINNT=0x0501 \
+	-D_WIN32_IE=0x700 \
+	-D_WIN32_WINNT=0x0502 \
 ))
 
 $(eval $(call gb_Library_use_externals,shlxthdl_x64,\
diff --git a/shell/StaticLibrary_shlxthandler_common.mk b/shell/StaticLibrary_shlxthandler_common.mk
index 1114b6a16fc0..e6a47ac67db4 100644
--- a/shell/StaticLibrary_shlxthandler_common.mk
+++ b/shell/StaticLibrary_shlxthandler_common.mk
@@ -19,10 +19,8 @@ $(eval $(call gb_StaticLibrary_add_defs,shlxthandler_common,\
 	-DUNICODE \
 	-DWIN32_LEAN_AND_MEAN \
 	-D_UNICODE \
-))
-$(eval $(call gb_StaticLibrary_add_defs,shlxthandler_common,\
-	-D_WIN32_IE=0x501 \
-	-D_WIN32_WINNT=0x0501 \
+	-D_WIN32_IE=0x700 \
+	-D_WIN32_WINNT=0x0502 \
 ))
 
 $(eval $(call gb_StaticLibrary_use_externals,shlxthandler_common,\
diff --git a/shell/StaticLibrary_shlxthandler_common_x64.mk b/shell/StaticLibrary_shlxthandler_common_x64.mk
index 106c9c572430..3456c0bca1bb 100644
--- a/shell/StaticLibrary_shlxthandler_common_x64.mk
+++ b/shell/StaticLibrary_shlxthandler_common_x64.mk
@@ -25,10 +25,8 @@ $(eval $(call gb_StaticLibrary_add_defs,shlxthandler_common_x64,\
 	-DUNICODE \
 	-DWIN32_LEAN_AND_MEAN \
 	-D_UNICODE \
-))
-$(eval $(call gb_StaticLibrary_add_defs,shlxthandler_common_x64,\
-	-D_WIN32_IE=0x501 \
-	-D_WIN32_WINNT=0x0501 \
+	-D_WIN32_IE=0x700 \
+	-D_WIN32_WINNT=0x0502 \
 ))
 
 $(eval $(call gb_StaticLibrary_use_externals,shlxthandler_common_x64,\
diff --git a/shell/source/backends/localebe/localebackend.cxx b/shell/source/backends/localebe/localebackend.cxx
index 02bdc97eef5c..2d38cd28dcd3 100644
--- a/shell/source/backends/localebe/localebackend.cxx
+++ b/shell/source/backends/localebe/localebackend.cxx
@@ -26,12 +26,6 @@
 #include <stdio.h>
 
 #ifdef WNT
-
-#ifdef WINVER
-#undef WINVER
-#endif
-#define WINVER 0x0501
-
 #if defined _MSC_VER
 #pragma warning(push, 1)
 #endif
diff --git a/shell/source/win32/shlxthandler/res/rcheader.txt b/shell/source/win32/shlxthandler/res/rcheader.txt
index f2d716b65971..065bf2a3a11e 100644
--- a/shell/source/win32/shlxthandler/res/rcheader.txt
+++ b/shell/source/win32/shlxthandler/res/rcheader.txt
@@ -1,4 +1,3 @@
-#define WINVER 0x0500
 #include <winresrc.h>
 #define LB_ADDSTRING	(WM_USER+1)
 #define CB_ADDSTRING	(WM_USER+3)