meson.build: define NOUSER on Windows for lighter windows.h

meson.build

@@ -156,6 +156,10 @@ if is_windows
 
     # disable more Windows APIs which are not used by MPD
     '-DNOGDI', '-DNOBITMAP', '-DNOCOMM',
+    '-DNOUSER',
+
+    # reduce COM header bloat
+    '-DCOM_NO_WINDOWS_H',
 
     # disable Internet Explorer specific APIs
     '-D_WIN32_IE=0',

src/fs/Glob.cxx

@@ -17,6 +17,11 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef _WIN32
+// COM needs the "MSG" typedef, and shlwapi.h includes COM headers
+#undef NOUSER
+#endif
+
 #include "Glob.hxx"
 
 #ifdef _WIN32

src/fs/StandardDirectory.cxx

@@ -17,6 +17,10 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef _WIN32
+#undef NOUSER // COM needs the "MSG" typedef, and shlobj.h includes COM headers
+#endif
+
 #include "StandardDirectory.hxx"
 #include "FileSystem.hxx"
 #include "XDG.hxx"

src/mixer/plugins/WasapiMixerPlugin.cxx

@@ -17,6 +17,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#undef NOUSER // COM needs the "MSG" typedef
+
 #include "output/plugins/wasapi/ForMixer.hxx"
 #include "output/plugins/wasapi/AudioClient.hxx"
 #include "output/plugins/wasapi/Device.hxx"

src/output/plugins/wasapi/WasapiOutputPlugin.cxx

@@ -17,6 +17,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#undef NOUSER // COM needs the "MSG" typedef
+
 #include "WasapiOutputPlugin.hxx"
 #include "ForMixer.hxx"
 #include "AudioClient.hxx"

src/win32/Com.hxx

@@ -23,6 +23,7 @@
 #include "HResult.hxx"
 
 #include <combaseapi.h>
+#include <objbase.h> // for COINIT_APARTMENTTHREADED
 
 // RAII for Microsoft Component Object Model(COM)
 // https://docs.microsoft.com/en-us/windows/win32/api/_com/

src/win32/ComWorker.cxx

@@ -17,6 +17,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#undef NOUSER // COM needs the "MSG" typedef
+
 #include "ComWorker.hxx"
 #include "Com.hxx"
 #include "thread/Name.hxx"

src/win32/HResult.cxx

@@ -17,6 +17,11 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef _WIN32
+// COM needs the "MSG" typedef, and audiopolicy.h includes COM headers
+#undef NOUSER
+#endif
+
 #include "HResult.hxx"
 #include "system/Error.hxx"
 
@@ -25,6 +30,7 @@
 #include <cstdio>
 #include <memory>
 
+#include <combaseapi.h> // needed by audiopolicy.h if COM_NO_WINDOWS_H is defined
 #include <audiopolicy.h>
 
 std::string_view

src/win32/PropVariant.hxx

@@ -20,6 +20,7 @@
 #ifndef MPD_WIN32_PROPVARIANT_HXX
 #define MPD_WIN32_PROPVARIANT_HXX
 
+#include <combaseapi.h> // needed by propidl.h if COM_NO_WINDOWS_H is defined
 #include <propidl.h>
 
 class AllocatedString;