Merge tag 'v0.22.7'

release v0.22.7

src/fs/DirectoryReader.hxx

@@ -24,7 +24,7 @@
 
 #ifdef _WIN32
 
-#include <windows.h>
+#include <fileapi.h>
 #include <tchar.h>
 
 /**

src/fs/Glob.cxx

@@ -0,0 +1,36 @@
+/*
+ * Copyright 2003-2021 The Music Player Daemon Project
+ * http://www.musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 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
+#include <shlwapi.h>
+
+bool
+Glob::Check(const char *name_fs) const noexcept
+{
+	return PathMatchSpecA(name_fs, pattern.c_str());
+}
+
+#endif

src/fs/Glob.hxx

@@ -24,45 +24,44 @@
 
 #ifdef HAVE_FNMATCH
 #define HAVE_CLASS_GLOB
-#include <string>
 #include <fnmatch.h>
 #elif defined(_WIN32)
 #define HAVE_CLASS_GLOB
-#include <string>
-#include <shlwapi.h>
 #endif
 
 #ifdef HAVE_CLASS_GLOB
 #include "util/Compiler.h"
 
+#include <string>
+
 /**
  * A pattern that matches file names.  It may contain shell wildcards
  * (asterisk and question mark).
  */
 class Glob {
-#if defined(HAVE_FNMATCH) || defined(_WIN32)
 	std::string pattern;
-#endif
 
 public:
-#if defined(HAVE_FNMATCH) || defined(_WIN32)
 	explicit Glob(const char *_pattern)
 		:pattern(_pattern) {}
 
-	Glob(Glob &&other)
-		:pattern(std::move(other.pattern)) {}
-#endif
+	Glob(Glob &&other) noexcept = default;
+	Glob &operator=(Glob &&other) noexcept = default;
 
 	gcc_pure
-	bool Check(const char *name_fs) const noexcept {
-#ifdef HAVE_FNMATCH
-		return fnmatch(pattern.c_str(), name_fs, 0) == 0;
-#elif defined(_WIN32)
-		return PathMatchSpecA(name_fs, pattern.c_str());
-#endif
-	}
+	bool Check(const char *name_fs) const noexcept;
 };
 
-#endif
+#ifdef HAVE_FNMATCH
+
+inline bool
+Glob::Check(const char *name_fs) const noexcept
+{
+	return fnmatch(pattern.c_str(), name_fs, 0) == 0;
+}
+
+#endif
+
+#endif /* HAVE_CLASS_GLOB */
 
 #endif

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/fs/io/FileOutputStream.hxx

@@ -42,7 +42,10 @@
 #include <cstdint>
 
 #ifdef _WIN32
-#include <windows.h>
+#include <fileapi.h>
+#include <windef.h> // for HWND (needed by winbase.h)
+#include <handleapi.h> // for INVALID_HANDLE_VALUE
+#include <winbase.h> // for FILE_END
 #endif
 
 #if defined(__linux__) && !defined(ANDROID)

src/fs/io/FileReader.hxx

@@ -35,7 +35,10 @@
 #include "util/Compiler.h"
 
 #ifdef _WIN32
-#include <windows.h>
+#include <fileapi.h>
+#include <handleapi.h> // for INVALID_HANDLE_VALUE
+#include <windef.h> // for HWND (needed by winbase.h)
+#include <winbase.h> // for FILE_CURRENT
 #else
 #include "io/UniqueFileDescriptor.hxx"
 #endif

src/fs/meson.build

@@ -3,6 +3,7 @@ fs_sources = [
   'Traits.cxx',
   'Config.cxx',
   'Charset.cxx',
+  'Glob.cxx',
   'Path.cxx',
   'Path2.cxx',
   'AllocatedPath.cxx',