summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--canvas/Library_cairocanvas.mk4
-rw-r--r--canvas/source/cairo/cairo_win32_cairo.cxx2
-rw-r--r--connectivity/Library_ado.mk6
-rw-r--r--connectivity/source/drivers/ado/ADriver.cxx5
-rw-r--r--crashrep/source/win32/rcheader.txt1
-rw-r--r--desktop/Library_deploymentgui.mk4
-rw-r--r--desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx4
-rw-r--r--embeddedobj/Library_emboleobj.mk4
-rw-r--r--embeddedobj/source/msole/platform.h3
-rw-r--r--embedserv/Library_emser.mk1
-rw-r--r--embedserv/source/embed/esdll.cxx1
-rw-r--r--embedserv/source/inc/stdafx.h2
-rw-r--r--extensions/Library_oleautobridge.mk4
-rw-r--r--extensions/source/activex/StdAfx2.h2
-rw-r--r--extensions/source/activex/so_activex.rc1
-rw-r--r--extensions/source/ole/oledll.cxx1
-rw-r--r--extensions/source/ole/oleobjw.cxx3
-rw-r--r--extensions/source/ole/servprov.cxx4
-rw-r--r--extensions/source/ole/servreg.cxx3
-rw-r--r--extensions/source/ole/unoobjw.cxx3
-rw-r--r--extensions/source/ole/wincrap.hxx4
-rw-r--r--extensions/test/ole/AxTestComponents/StdAfx.h2
-rw-r--r--extensions/test/ole/EventListenerSample/EventListener/StdAfx.h2
-rw-r--r--extensions/test/ole/unoTocomCalls/XCallback_Impl/StdAfx.h2
-rw-r--r--external/libmariadb/mariadb-trunk-101.patch2
-rw-r--r--external/nss/nss-3.13.3-build.patch.32
-rw-r--r--filter/source/placeware/tempfile.cxx5
-rw-r--r--fpicker/source/win32/filepicker/FileOpenDlg.cxx5
-rw-r--r--fpicker/source/win32/filepicker/platform_xp.h6
-rw-r--r--i18nlangtag/source/isolang/inwnt.cxx2
-rw-r--r--odk/examples/OLE/activex/StdAfx2.h2
-rw-r--r--sal/Library_sal.mk4
-rw-r--r--sal/osl/w32/file.cxx1
-rw-r--r--sal/osl/w32/file_dirvol.cxx1
-rw-r--r--sal/osl/w32/file_error.c1
-rw-r--r--sal/osl/w32/file_url.cxx1
-rw-r--r--sal/osl/w32/system.h5
-rw-r--r--sal/osl/w32/tempfile.cxx1
-rw-r--r--setup_native/Library_sellangmsi.mk2
-rw-r--r--setup_native/Library_shlxtmsi.mk1
-rw-r--r--setup_native/source/win32/customactions/sellang/sellang.cxx5
-rw-r--r--setup_native/source/win32/customactions/shellextensions/checkdirectory.cxx2
-rw-r--r--setup_native/source/win32/customactions/shellextensions/checkpatches.cxx2
-rw-r--r--setup_native/source/win32/customactions/shellextensions/completeinstallpath.cxx1
-rw-r--r--setup_native/source/win32/customactions/shellextensions/layerlinks.cxx2
-rw-r--r--setup_native/source/win32/customactions/shellextensions/migrateinstallpath.cxx1
-rw-r--r--setup_native/source/win32/customactions/shellextensions/startmenuicon.cxx2
-rw-r--r--setup_native/source/win32/customactions/shellextensions/upgrade.cxx2
-rw-r--r--setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx2
-rw-r--r--sfx2/source/appl/shutdowniconw32.cxx3
-rw-r--r--shell/Library_ooofilt.mk6
-rw-r--r--shell/Library_ooofilt_x64.mk6
-rw-r--r--shell/Library_propertyhdl.mk6
-rw-r--r--shell/Library_propertyhdl_x64.mk6
-rw-r--r--shell/Library_shlxthdl.mk6
-rw-r--r--shell/Library_shlxthdl_x64.mk6
-rw-r--r--shell/StaticLibrary_shlxthandler_common.mk6
-rw-r--r--shell/StaticLibrary_shlxthandler_common_x64.mk6
-rw-r--r--shell/source/backends/localebe/localebackend.cxx6
-rw-r--r--shell/source/win32/shlxthandler/res/rcheader.txt1
-rw-r--r--solenv/gbuild/platform/com_MSC_defs.mk2
-rw-r--r--solenv/gbuild/platform/mingw.mk2
-rw-r--r--solenv/gbuild/platform/windows.mk4
-rw-r--r--vcl/win/source/gdi/salprn.cxx2
64 files changed, 61 insertions, 135 deletions
diff --git a/canvas/Library_cairocanvas.mk b/canvas/Library_cairocanvas.mk
index 45c4824f7ab8..b4654c0b9438 100644
--- a/canvas/Library_cairocanvas.mk
+++ b/canvas/Library_cairocanvas.mk
@@ -82,6 +82,10 @@ $(eval $(call gb_Library_use_externals,cairocanvas,\
ifeq ($(OS),WNT)
+$(eval $(call gb_Library_add_defs,cairocanvas,\
+ -D_WIN32_WINNT=0x0502 \
+))
+
$(eval $(call gb_Library_add_exception_objects,cairocanvas,\
canvas/source/cairo/cairo_win32_cairo \
))
diff --git a/canvas/source/cairo/cairo_win32_cairo.cxx b/canvas/source/cairo/cairo_win32_cairo.cxx
index 3bf9c6db2a90..89b786cbfb28 100644
--- a/canvas/source/cairo/cairo_win32_cairo.cxx
+++ b/canvas/source/cairo/cairo_win32_cairo.cxx
@@ -17,8 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#define _WIN32_WINNT 0x0500
-
#ifdef WNT
/************************************************************************
* Win32 surface backend for OpenOffice.org Cairo Canvas *
diff --git a/connectivity/Library_ado.mk b/connectivity/Library_ado.mk
index a62fcbafa1e1..0a559a3a8117 100644
--- a/connectivity/Library_ado.mk
+++ b/connectivity/Library_ado.mk
@@ -34,6 +34,12 @@ $(eval $(call gb_Library_use_system_win32_libs,ado,\
uuid \
))
+ifeq ($(OS),WNT)
+$(eval $(call gb_Library_add_defs,ado,\
+ -D_WIN32_WINNT=0x0502 \
+))
+endif
+
ifeq ($(WINDOWS_SDK_VERSION),80)
$(eval $(call gb_Library_add_defs,ado,\
-DNTDDI_VERSION=0x0601 \
diff --git a/connectivity/source/drivers/ado/ADriver.cxx b/connectivity/source/drivers/ado/ADriver.cxx
index f55a03f5f974..3daa811fcf14 100644
--- a/connectivity/source/drivers/ado/ADriver.cxx
+++ b/connectivity/source/drivers/ado/ADriver.cxx
@@ -17,11 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if defined _WIN32_WINNT
-#undef _WIN32_WINNT
-#endif
-#define _WIN32_WINNT 0x0501
-
#include "ado/ADriver.hxx"
#include "ado/AConnection.hxx"
#include "ado/Awrapadox.hxx"
diff --git a/crashrep/source/win32/rcheader.txt b/crashrep/source/win32/rcheader.txt
index bace84b1ff93..dc67fee79c06 100644
--- a/crashrep/source/win32/rcheader.txt
+++ b/crashrep/source/win32/rcheader.txt
@@ -18,7 +18,6 @@
// Header
#include "resource.h"
-#define WINVER 0x0500
#include <winresrc.h>
#define LB_ADDSTRING (WM_USER+1)
#define CB_ADDSTRING (WM_USER+3)
diff --git a/desktop/Library_deploymentgui.mk b/desktop/Library_deploymentgui.mk
index 1fb9e33f3711..2a13cc6ce3a1 100644
--- a/desktop/Library_deploymentgui.mk
+++ b/desktop/Library_deploymentgui.mk
@@ -42,6 +42,10 @@ $(eval $(call gb_Library_use_libraries,deploymentgui,\
ifeq ($(OS),WNT)
+$(eval $(call gb_Library_add_defs,deploymentgui,\
+ -D_WIN32_WINNT=0x0502 \
+))
+
$(eval $(call gb_Library_use_system_win32_libs,deploymentgui,\
ole32 \
))
diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
index 8b2cd3369248..706c48538160 100644
--- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
@@ -17,10 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if defined WNT
-#define _WIN32_WINNT 0x0500
-#endif
-
#include "sal/config.h"
#include <cstddef>
diff --git a/embeddedobj/Library_emboleobj.mk b/embeddedobj/Library_emboleobj.mk
index 3d415f40f2d2..96f03ee16ca5 100644
--- a/embeddedobj/Library_emboleobj.mk
+++ b/embeddedobj/Library_emboleobj.mk
@@ -17,6 +17,10 @@ $(eval $(call gb_Library_set_include,emboleobj,\
$$(INCLUDE) \
))
+$(eval $(call gb_Library_add_defs,emboleobj,\
+ -D_WIN32_WINNT=0x0502 \
+))
+
$(eval $(call gb_Library_use_external,emboleobj,boost_headers))
$(eval $(call gb_Library_use_sdk_api,emboleobj))
diff --git a/embeddedobj/source/msole/platform.h b/embeddedobj/source/msole/platform.h
index 2a8c1172b3c0..56c21a21d8cc 100644
--- a/embeddedobj/source/msole/platform.h
+++ b/embeddedobj/source/msole/platform.h
@@ -21,9 +21,6 @@
#define _PLATFORM_H_
#define STRICT
-#ifndef _WIN32_WINNT
-#define _WIN32_WINNT 0x0400
-#endif
#define _ATL_APARTMENT_THREADED
#if defined _MSC_VER
diff --git a/embedserv/Library_emser.mk b/embedserv/Library_emser.mk
index 5458ed2bd33e..a85e4c70cf83 100644
--- a/embedserv/Library_emser.mk
+++ b/embedserv/Library_emser.mk
@@ -20,6 +20,7 @@ $(eval $(call gb_Library_set_include,emser,\
$(eval $(call gb_Library_add_defs,emser,\
-UNOMINMAX \
+ -D_WIN32_WINNT=0x0502 \
))
$(eval $(call gb_Library_use_external,emser,boost_headers))
diff --git a/embedserv/source/embed/esdll.cxx b/embedserv/source/embed/esdll.cxx
index b5aa6b7a2762..52f8013738c2 100644
--- a/embedserv/source/embed/esdll.cxx
+++ b/embedserv/source/embed/esdll.cxx
@@ -18,7 +18,6 @@
*/
#define STRICT
-#define _WIN32_WINNT 0x0403
#define _WIN32_DCOM
#ifdef _MSC_VER
#pragma warning(disable : 4917 4555)
diff --git a/embedserv/source/inc/stdafx.h b/embedserv/source/inc/stdafx.h
index d3109ddf9b91..abfc022a935e 100644
--- a/embedserv/source/inc/stdafx.h
+++ b/embedserv/source/inc/stdafx.h
@@ -8,7 +8,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/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
diff --git a/external/libmariadb/mariadb-trunk-101.patch b/external/libmariadb/mariadb-trunk-101.patch
index a5a74a519b6b..228bddc04776 100644
--- a/external/libmariadb/mariadb-trunk-101.patch
+++ b/external/libmariadb/mariadb-trunk-101.patch
@@ -240752,7 +240752,7 @@ diff -x .bzr -u --recursive -N mariadb-native-client.release/win-iconv/win_iconv
+
+/* for WC_NO_BEST_FIT_CHARS */
+#ifndef WINVER
-+# define WINVER 0x0500
++# define WINVER 0x0502
+#endif
+
+#define STRICT
diff --git a/external/nss/nss-3.13.3-build.patch.3 b/external/nss/nss-3.13.3-build.patch.3
index 7412c288ab77..383b9384a9c8 100644
--- a/external/nss/nss-3.13.3-build.patch.3
+++ b/external/nss/nss-3.13.3-build.patch.3
@@ -16,7 +16,7 @@
# the dllimport attribute that a pointer to a function marked as
# dllimport cannot be used as as a constant address.
- OS_CFLAGS += -mwindows -mms-bitfields -mnop-fun-dllimport
-+ OS_CFLAGS += -mwindows -mms-bitfields -mnop-fun-dllimport -D_WIN32_IE=0x0501 -U__MMX__ -U__SSE__ -U__SSE2__
++ OS_CFLAGS += -mwindows -mms-bitfields -mnop-fun-dllimport -D_WIN32_IE=0x0700 -U__MMX__ -U__SSE__ -U__SSE2__
_GEN_IMPORT_LIB=-Wl,--out-implib,$(IMPORT_LIBRARY)
DLLFLAGS += -mwindows -o $@ -shared -Wl,--export-all-symbols $(if $(IMPORT_LIBRARY),$(_GEN_IMPORT_LIB))
ifdef BUILD_OPT
diff --git a/filter/source/placeware/tempfile.cxx b/filter/source/placeware/tempfile.cxx
index 1a40047a9659..961eaeda9470 100644
--- a/filter/source/placeware/tempfile.cxx
+++ b/filter/source/placeware/tempfile.cxx
@@ -55,11 +55,6 @@ oslFileError SAL_CALL my_getTempDirURL( rtl_uString** pustrTempDir )
}
#else
-#ifndef _WIN32_WINNT
-# define _WIN32_WINNT 0x0400
-# define _CTYPE_DISABLE_MACROS /* wg. dynamischer C-Runtime MH */
-#endif
-
#if defined _MSC_VER
#pragma warning(push, 1)
#endif
diff --git a/fpicker/source/win32/filepicker/FileOpenDlg.cxx b/fpicker/source/win32/filepicker/FileOpenDlg.cxx
index d56fa792b6ec..a9eee26a1f77 100644
--- a/fpicker/source/win32/filepicker/FileOpenDlg.cxx
+++ b/fpicker/source/win32/filepicker/FileOpenDlg.cxx
@@ -17,11 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if defined _WIN32_WINNT
-# undef _WIN32_WINNT
-#endif
-#define _WIN32_WINNT 0x0500
-
#include <tchar.h>
#include <osl/diagnose.h>
#include "../misc/WinImplHelper.hxx"
diff --git a/fpicker/source/win32/filepicker/platform_xp.h b/fpicker/source/win32/filepicker/platform_xp.h
index 6a502f680521..a31cbc40e037 100644
--- a/fpicker/source/win32/filepicker/platform_xp.h
+++ b/fpicker/source/win32/filepicker/platform_xp.h
@@ -28,9 +28,9 @@
#undef _WIN32_IE
#undef _WTL_NO_CSTRING
-#define WINVER 0x0501
-#define _WIN32_WINNT 0x0501
-#define _WIN32_IE 0x0600
+#define WINVER 0x0502
+#define _WIN32_WINNT 0x0502
+#define _WIN32_IE 0x0700
#define _WTL_NO_CSTRING
#if defined _MSC_VER
diff --git a/i18nlangtag/source/isolang/inwnt.cxx b/i18nlangtag/source/isolang/inwnt.cxx
index e62f89e8a077..293aa78e82ad 100644
--- a/i18nlangtag/source/isolang/inwnt.cxx
+++ b/i18nlangtag/source/isolang/inwnt.cxx
@@ -20,8 +20,6 @@
#include <sal/config.h>
-#define WINVER 0x0500
-
#ifdef _MSC_VER
#pragma warning(push,1) // disable warnings within system headers
#endif
diff --git a/odk/examples/OLE/activex/StdAfx2.h b/odk/examples/OLE/activex/StdAfx2.h
index bfb06fa7b34d..2767f4d4a869 100644
--- a/odk/examples/OLE/activex/StdAfx2.h
+++ b/odk/examples/OLE/activex/StdAfx2.h
@@ -46,7 +46,7 @@
#define STRICT
#ifndef _WIN32_WINNT
-#define _WIN32_WINNT 0x0400
+#define _WIN32_WINNT 0x0502
#endif
#define _ATL_APARTMENT_THREADED
#define _ATL_STATIC_REGISTRY
diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk
index 6ba73ee94fd9..cbc52a7212bf 100644
--- a/sal/Library_sal.mk
+++ b/sal/Library_sal.mk
@@ -229,6 +229,10 @@ else # $(OS) == WNT
))
# .ENDIF
+$(eval $(call gb_Library_add_defs,sal,\
+ -D_WIN32_WINNT=0x0502 \
+))
+
$(eval $(call gb_Library_add_exception_objects,sal,\
sal/osl/w32/file \
sal/osl/w32/file_dirvol \
diff --git a/sal/osl/w32/file.cxx b/sal/osl/w32/file.cxx
index 87411d83d411..30a4f550a1f5 100644
--- a/sal/osl/w32/file.cxx
+++ b/sal/osl/w32/file.cxx
@@ -20,7 +20,6 @@
#define UNICODE
#define _UNICODE
-#define _WIN32_WINNT 0x0500
#include "systools/win32/uwinapi.h"
#include "osl/file.hxx"
diff --git a/sal/osl/w32/file_dirvol.cxx b/sal/osl/w32/file_dirvol.cxx
index f3c97ecd26ab..071e29447176 100644
--- a/sal/osl/w32/file_dirvol.cxx
+++ b/sal/osl/w32/file_dirvol.cxx
@@ -19,7 +19,6 @@
#define UNICODE
#define _UNICODE
-#define _WIN32_WINNT 0x0500
#include "systools/win32/uwinapi.h"
#include "osl/file.h"
diff --git a/sal/osl/w32/file_error.c b/sal/osl/w32/file_error.c
index f1cd9ceab9e8..3bb2e49def9d 100644
--- a/sal/osl/w32/file_error.c
+++ b/sal/osl/w32/file_error.c
@@ -19,7 +19,6 @@
#define UNICODE
#define _UNICODE
-#define _WIN32_WINNT 0x0500
#include "systools/win32/uwinapi.h"
#include "file_error.h"
diff --git a/sal/osl/w32/file_url.cxx b/sal/osl/w32/file_url.cxx
index 228e88ed1941..978b8db29046 100644
--- a/sal/osl/w32/file_url.cxx
+++ b/sal/osl/w32/file_url.cxx
@@ -19,7 +19,6 @@
#define UNICODE
#define _UNICODE
-#define _WIN32_WINNT 0x0500
#include "systools/win32/uwinapi.h"
#include "file_url.h"
diff --git a/sal/osl/w32/system.h b/sal/osl/w32/system.h
index d74a587b853a..57a7a0fb6aa4 100644
--- a/sal/osl/w32/system.h
+++ b/sal/osl/w32/system.h
@@ -21,11 +21,6 @@
# define NO_DEBUG_CRT
#endif
-#ifndef _WIN32_WINNT
-# define _WIN32_WINNT 0x0400
-# define _CTYPE_DISABLE_MACROS /* wg. dynamischer C-Runtime MH */
-#endif
-
#include <stdio.h>
#include <stdlib.h>
#include <stdarg.h>
diff --git a/sal/osl/w32/tempfile.cxx b/sal/osl/w32/tempfile.cxx
index 731dd4375333..d85410316b8f 100644
--- a/sal/osl/w32/tempfile.cxx
+++ b/sal/osl/w32/tempfile.cxx
@@ -19,7 +19,6 @@
#define UNICODE
#define _UNICODE
-#define _WIN32_WINNT 0x0500
#include "systools/win32/uwinapi.h"
#include "osl/file.h"
diff --git a/setup_native/Library_sellangmsi.mk b/setup_native/Library_sellangmsi.mk
index 2df29fc8bcfe..204e22f2ac51 100644
--- a/setup_native/Library_sellangmsi.mk
+++ b/setup_native/Library_sellangmsi.mk
@@ -15,6 +15,8 @@ $(eval $(call gb_Library_use_custom_headers,sellangmsi,\
$(eval $(call gb_Library_add_defs,sellangmsi,\
-U_DLL \
+ -D_WIN32_WINNT=0x0502 \
+ -DWIN32_LEAN_AND_MEAN \
))
$(eval $(call gb_Library_add_cxxflags,sellangmsi,\
diff --git a/setup_native/Library_shlxtmsi.mk b/setup_native/Library_shlxtmsi.mk
index 84fbe72f3741..9d0186a2a28a 100644
--- a/setup_native/Library_shlxtmsi.mk
+++ b/setup_native/Library_shlxtmsi.mk
@@ -13,6 +13,7 @@ $(eval $(call gb_Library_use_external,shlxtmsi,boost_headers))
$(eval $(call gb_Library_add_defs,shlxtmsi,\
-U_DLL \
+ -D_WIN32_WINNT=0x0502 \
))
$(eval $(call gb_Library_add_cxxflags,shlxtmsi,\
diff --git a/setup_native/source/win32/customactions/sellang/sellang.cxx b/setup_native/source/win32/customactions/sellang/sellang.cxx
index 06c4c029a4e6..46b500b4b5cb 100644
--- a/setup_native/source/win32/customactions/sellang/sellang.cxx
+++ b/setup_native/source/win32/customactions/sellang/sellang.cxx
@@ -22,11 +22,6 @@
*/
#define MAX_LANGUAGES 200
-#define WIN32_LEAN_AND_MEAN
-#define _WIN32_WINNT 0x0500
-#undef WINVER
-#define WINVER 0x0500
-
#include <windows.h>
#include <msiquery.h>
#include <malloc.h>
diff --git a/setup_native/source/win32/customactions/shellextensions/checkdirectory.cxx b/setup_native/source/win32/customactions/shellextensions/checkdirectory.cxx
index 7b35b3cf518c..1a4f4f01bdc5 100644
--- a/setup_native/source/win32/customactions/shellextensions/checkdirectory.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/checkdirectory.cxx
@@ -17,8 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#define _WIN32_WINNT 0x0401
-
#ifdef _MSC_VER
#pragma warning(push, 1) /* disable warnings within system headers */
#endif
diff --git a/setup_native/source/win32/customactions/shellextensions/checkpatches.cxx b/setup_native/source/win32/customactions/shellextensions/checkpatches.cxx
index 94a24cd7687c..4207837fead2 100644
--- a/setup_native/source/win32/customactions/shellextensions/checkpatches.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/checkpatches.cxx
@@ -17,8 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#define _WIN32_WINNT 0x0401
-
#ifdef _MSC_VER
#pragma warning(push, 1) /* disable warnings within system headers */
#endif
diff --git a/setup_native/source/win32/customactions/shellextensions/completeinstallpath.cxx b/setup_native/source/win32/customactions/shellextensions/completeinstallpath.cxx
index 7def8af956db..30cc424a80da 100644
--- a/setup_native/source/win32/customactions/shellextensions/completeinstallpath.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/completeinstallpath.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#define _WIN32_WINDOWS 0x0410
#ifdef _MSC_VER
#pragma warning(push, 1) /* disable warnings within system headers */
#endif
diff --git a/setup_native/source/win32/customactions/shellextensions/layerlinks.cxx b/setup_native/source/win32/customactions/shellextensions/layerlinks.cxx
index 88e020f5b27e..680fc410d592 100644
--- a/setup_native/source/win32/customactions/shellextensions/layerlinks.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/layerlinks.cxx
@@ -20,8 +20,6 @@
#undef UNICODE
#undef _UNICODE
-#define _WIN32_WINDOWS 0x0410
-
#ifdef _MSC_VER
#pragma warning(push, 1) /* disable warnings within system headers */
#endif
diff --git a/setup_native/source/win32/customactions/shellextensions/migrateinstallpath.cxx b/setup_native/source/win32/customactions/shellextensions/migrateinstallpath.cxx
index 1b159fd22e79..26a6760e327b 100644
--- a/setup_native/source/win32/customactions/shellextensions/migrateinstallpath.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/migrateinstallpath.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#define _WIN32_WINDOWS 0x0410
#ifdef _MSC_VER
#pragma warning(push, 1) /* disable warnings within system headers */
#endif
diff --git a/setup_native/source/win32/customactions/shellextensions/startmenuicon.cxx b/setup_native/source/win32/customactions/shellextensions/startmenuicon.cxx
index de3f3f6b461e..f983338936f0 100644
--- a/setup_native/source/win32/customactions/shellextensions/startmenuicon.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/startmenuicon.cxx
@@ -17,8 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#define _WIN32_WINDOWS 0x0410
-
#ifdef _MSC_VER
#pragma warning(push, 1) /* disable warnings within system headers */
#endif
diff --git a/setup_native/source/win32/customactions/shellextensions/upgrade.cxx b/setup_native/source/win32/customactions/shellextensions/upgrade.cxx
index 84650116b678..5cbfe6a571ef 100644
--- a/setup_native/source/win32/customactions/shellextensions/upgrade.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/upgrade.cxx
@@ -20,8 +20,6 @@
#undef UNICODE
#undef _UNICODE
-#define _WIN32_WINDOWS 0x0410
-
#ifdef _MSC_VER
#pragma warning(push, 1) /* disable warnings within system headers */
#endif
diff --git a/setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx b/setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx
index 7011fcdf7dd7..fb106d7cb8b5 100644
--- a/setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx
@@ -17,8 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#define _WIN32_WINNT 0x0401
-
#ifdef _MSC_VER
#pragma warning(push, 1) /* disable warnings within system headers */
#endif
diff --git a/sfx2/source/appl/shutdowniconw32.cxx b/sfx2/source/appl/shutdowniconw32.cxx
index c720328f98ce..8c7a6a1cd42f 100644
--- a/sfx2/source/appl/shutdowniconw32.cxx
+++ b/sfx2/source/appl/shutdowniconw32.cxx
@@ -25,9 +25,6 @@
#pragma warning(disable:4668 4917)
#endif
-// Support Windows 95 too
-#undef WINVER
-#define WINVER 0x0400
#define USE_APP_SHORTCUTS
// the systray icon is only available on windows
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)
diff --git a/solenv/gbuild/platform/com_MSC_defs.mk b/solenv/gbuild/platform/com_MSC_defs.mk
index c76d65a97467..f002d51f8e71 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -57,7 +57,7 @@ gb_COMPILERDEFS += \
endif
gb_RCDEFS := \
- -DWINVER=0x0400 \
+ -DWINVER=0x0502 \
-DWIN32 \
gb_RCFLAGS :=
diff --git a/solenv/gbuild/platform/mingw.mk b/solenv/gbuild/platform/mingw.mk
index 53533e7f2f8f..fe0422336b93 100644
--- a/solenv/gbuild/platform/mingw.mk
+++ b/solenv/gbuild/platform/mingw.mk
@@ -26,7 +26,7 @@ gb_COMPILERDEFS += \
-D_FORCENAMELESSUNION \
gb_RCDEFS := \
- -DWINVER=0x0400 \
+ -DWINVER=0x0502 \
-DWIN32 \
gb_RCFLAGS :=
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index bc2dad14ad06..02428cae3b17 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -18,8 +18,8 @@ gb_Helper_LIBRARY_PATH_VAR := PATH
gb_MKTEMP := mktemp --tmpdir=$(gb_TMPDIR) gbuild.XXXXXX
gb_OSDEFS := \
- -DWINVER=0x0500 \
- -D_WIN32_IE=0x0500 \
+ -DWINVER=0x0502 \
+ -D_WIN32_IE=0x0700 \
-DWIN32 \
-DWNT \
-DNOMINMAX \
diff --git a/vcl/win/source/gdi/salprn.cxx b/vcl/win/source/gdi/salprn.cxx
index dae08ddcf12b..7b8edec681a8 100644
--- a/vcl/win/source/gdi/salprn.cxx
+++ b/vcl/win/source/gdi/salprn.cxx
@@ -17,8 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#define WINVER 0x0500
-
#include <string.h>
#include <svsys.h>
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-16 15:38:56 +0000