Use more WIN32_LEAN_AND_MEAN

https://msdn.microsoft.com/en-us/aa383745

Change-Id: I83528dc8e6a5e119e7aa816219d35f1ea3723b96
Reviewed-on: https://gerrit.libreoffice.org/42338Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>

bridges/source/cpp_uno/msvc_win32_x86-64/dllinit.cxx

@@ -19,6 +19,7 @@
 
 
 #pragma warning(push,1) // disable warnings within system headers
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #pragma warning(pop)
 

bridges/source/cpp_uno/msvc_win32_x86-64/mscx.hxx

@@ -20,6 +20,7 @@
 #define INCLUDED_BRIDGES_SOURCE_CPP_UNO_MSVC_WIN32_X86_64_MSCX_HXX
 
 #pragma warning(push, 1)
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #pragma warning(pop)
 

desktop/util/officeloader.rc

@@ -16,6 +16,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include "version.hrc"
 

desktop/win32/source/applauncher/launcher.hxx

@@ -19,6 +19,7 @@
 
 #pragma once
 
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
 extern WCHAR APPLICATION_SWITCH[];

desktop/win32/source/applauncher/launcher.rc

@@ -16,6 +16,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include "version.hrc"
 

desktop/win32/source/officeloader/officeloader.cxx

@@ -20,6 +20,7 @@
 #include <cstddef>
 
 #include <systools/win32/uwinapi.h>
+#include <stdlib.h>
 #include <desktop/exithelper.h>
 
 #include "../loader.hxx"

dtrans/source/win32/dtobj/TxtCnvtHlp.hxx

@@ -27,6 +27,7 @@
 #if defined _MSC_VER
 #pragma warning(push,1)
 #endif
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #if defined _MSC_VER
 #pragma warning(pop)

hwpfilter/source/htags.h

@@ -21,6 +21,9 @@
 #define INCLUDED_HWPFILTER_SOURCE_HTAGS_H
 
 #include <memory>
+#ifdef _WIN32
+#  include <objidl.h>
+#endif
 
 class HWPFile;
 /**

hwpfilter/source/precompile.h

@@ -21,6 +21,7 @@
     #if defined _MSC_VER
         #pragma warning(push, 1)
     #endif
+    #define WIN32_LEAN_AND_MEAN
     #include "windows.h"
     #include "crtdbg.h"
     #if defined _MSC_VER

include/default.rc

@@ -16,6 +16,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include "version.hrc"
 

include/prewin.h

@@ -39,6 +39,7 @@
 #   pragma warning (disable: 4005)
 #endif
 
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
 #ifdef _MSC_VER

jurt/source/pipe/wrapper/wrapper.c

@@ -21,6 +21,7 @@
 
 #include <stddef.h>
 
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
 #include "jni.h"

sal/osl/w32/file-impl.hxx

@@ -15,6 +15,7 @@
 #include <osl/file.h>
 #include <sal/types.h>
 
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
 extern "C" oslFileHandle SAL_CALL osl_createFileHandleFromOSHandle(

sal/osl/w32/filetime.hxx

@@ -12,6 +12,7 @@
 
 #include <sal/config.h>
 
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
 #include <osl/time.h>

setup_native/source/win32/customactions/tools/checkversion.cxx

@@ -22,6 +22,7 @@
 #ifdef _MSC_VER
 #pragma warning(push,1) // disable warnings within system headers
 #endif
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include <msiquery.h>
 #ifdef _MSC_VER

setup_native/source/win32/customactions/tools/seterror.cxx

@@ -22,6 +22,7 @@
 #ifdef _MSC_VER
 #pragma warning(push,1) // disable warnings within system headers
 #endif
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #ifdef _MSC_VER
 #pragma warning(pop)

shell/inc/global.hxx

@@ -23,6 +23,9 @@
 #if defined _MSC_VER
 #pragma warning(push, 1)
 #endif
+#if !defined WIN32_LEAN_AND_MEAN
+#  define WIN32_LEAN_AND_MEAN
+#endif
 #include <windows.h>
 #if defined _MSC_VER
 #pragma warning(pop)

shell/inc/utilities.hxx

@@ -24,6 +24,9 @@
 #if defined _MSC_VER
 #pragma warning(push, 1)
 #endif
+#if !defined WIN32_LEAN_AND_MEAN
+  #define WIN32_LEAN_AND_MEAN
+#endif
 #include <windows.h>
 #if defined _MSC_VER
 #pragma warning(pop)

shell/source/tools/regsvrex/regsvrex.cxx

@@ -21,6 +21,7 @@
 #if defined _MSC_VER
 #pragma warning(push, 1)
 #endif
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #if defined _MSC_VER
 #pragma warning(pop)

vcl/win/gdi/salprn.cxx

@@ -49,6 +49,14 @@
 
 #include <malloc.h>
 
+#include <winspool.h>
+#if defined GetDefaultPrinter
+#  undef GetDefaultPrinter
+#endif
+#if defined SetPrinterData
+#  undef SetPrinterData
+#endif
+
 #define CATCH_DRIVER_EX_BEGIN                                               \
     __try                                                                   \
     {