Merge branch 'active' into gpg_signing_with_ssh_key

Author: forwardpointer

windows/devices/util/DeviceEnumerator.cxx

@@ -58,9 +58,9 @@ DeviceEnumerator::GetDeviceInterfaceClassInstanceNames(const GUID& deviceInterfa
 
 /* static */
 std::vector<std::string>
-DeviceEnumerator::GetDeviceInterfaceClassInstanceNames(const std::string& deviceInterfaceClassString) noexcept
+DeviceEnumerator::GetDeviceInterfaceClassInstanceNames(std::string_view deviceInterfaceClassString) noexcept
 {
-    auto deviceClassInterfaceGuid = notstd::GuidFromString(deviceInterfaceClassString);
+    auto deviceClassInterfaceGuid = notstd::GuidFromStringView(deviceInterfaceClassString);
     if (!deviceClassInterfaceGuid.has_value()) {
         return {};
     }

windows/devices/util/include/windows/devices/DeviceEnumerator.hxx

@@ -2,17 +2,15 @@
 #ifndef WINDOWS_DEVICE_ENUMERATOR
 #define WINDOWS_DEVICE_ENUMERATOR
 
-#include <string>
+#include <string_view>
 #include <vector>
 
 // NB: This must come before any other Windows include
 #include <windows.h>
 
 #include <guiddef.h>
 
-namespace windows
-{
-namespace devices
+namespace windows::devices
 {
 /**
  * @brief Enumerates the names of device interface instances belonging to a
@@ -23,7 +21,7 @@ struct DeviceEnumerator
     /**
      * @brief Get a list of device paths for instances of the specified device
      * interface class.
-     * 
+     *
      * @param deviceInterfaceClassGuid The GUID of the device class to enumerate.
      * @return std::vector<std::string> A list of device paths.
      */
@@ -33,14 +31,13 @@ struct DeviceEnumerator
     /**
      * @brief Get a list of device paths for instances of the specified device
      * interface class.
-     * 
-     * @param deviceInterfaceClassString 
-     * @return std::vector<std::string> 
+     *
+     * @param deviceInterfaceClassString
+     * @return std::vector<std::string>
      */
     static std::vector<std::string>
-    GetDeviceInterfaceClassInstanceNames(const std::string& deviceInterfaceClassString) noexcept;
+    GetDeviceInterfaceClassInstanceNames(std::string_view deviceInterfaceClassString) noexcept;
 };
-} // namespace devices
-} // namespace windows
+} // namespace windows::devices
 
-#endif // WINDOWS_DEVICE_ENUMERATOR
+#endif // WINDOWS_DEVICE_ENUMERATOR

windows/shared/notstd/guid.hxx

@@ -4,6 +4,7 @@
 #include <iterator>
 #include <optional>
 #include <string>
+#include <string_view>
 #include <utility>
 
 #include <rpc.h>
@@ -77,29 +78,29 @@ GuidToString(const GUID& guid)
 }
 
 /**
- * @brief Parses a string for a GUID and returns it, if valid.
+ * @brief Parses a string (_view) for a GUID and returns it, if valid.
  * 
- * @tparam TString The type of input string to parse.
- * @param input The string to parse.
+ * @tparam TStringView The type of input string view to parse.
+ * @param input The string view to parse.
  * @return std::optional<GUID> An optional containing a GUID if the input was valid, std::nullopt otherwise.
  */
-template <typename TString>
+template <typename TStringView>
 inline std::optional<GUID>
-GuidFromString(const TString& input) noexcept;
+GuidFromStringView(TStringView input) noexcept;
 
 /**
- * @brief Specialization for parsing a GUID from std::string.
+ * @brief Specialization for parsing a GUID from std::string_view.
  * 
  * @tparam TString std::string
  * @param input 
  * @return std::optional<GUID> 
  */
 template <>
 inline std::optional<GUID>
-GuidFromString(const std::string& input) noexcept
+GuidFromStringView(std::string_view input) noexcept
 {
     GUID guid{};
-    auto result = UuidFromStringA(reinterpret_cast<RPC_CSTR>(const_cast<std::string::value_type*>(std::data(input))), &guid);
+    auto result = UuidFromStringA(reinterpret_cast<RPC_CSTR>(const_cast<std::string_view::value_type*>(std::data(input))), &guid);
     if (result != NOERROR) {
         return std::nullopt;
     }
@@ -108,24 +109,63 @@ GuidFromString(const std::string& input) noexcept
 }
 
 /**
- * @brief Specialization for parsing a GUID from std::wstring.
+ * @brief Specialization for parsing a GUID from std::wstring_view.
  * 
  * @tparam TString std::wstring
  * @param input 
  * @return std::optional<GUID> 
  */
 template <>
 inline std::optional<GUID>
-GuidFromString(const std::wstring& input) noexcept
+GuidFromStringView(std::wstring_view input) noexcept
 {
     GUID guid{};
-    auto result = UuidFromStringW(reinterpret_cast<RPC_WSTR>(const_cast<std::wstring::value_type*>(std::data(input))), &guid);
+    auto result = UuidFromStringW(reinterpret_cast<RPC_WSTR>(const_cast<std::wstring_view::value_type*>(std::data(input))), &guid);
     if (result != NOERROR) {
         return std::nullopt;
     }
 
     return guid;
 }
+
+/**
+ * @brief Parses a string for a GUID and returns it, if valid.
+ * 
+ * @tparam TString The type of input string to parse.
+ * @param input The string to parse.
+ * @return std::optional<GUID> An optional containing a GUID if the input was valid, std::nullopt otherwise.
+ */
+template <typename TString>
+inline std::optional<GUID>
+GuidFromString(const TString& input) noexcept;
+
+/**
+ * @brief Specialization for parsing a GUID from std::string.
+ * 
+ * @tparam TString std::string
+ * @param input 
+ * @return std::optional<GUID> 
+ */
+template <>
+inline std::optional<GUID>
+GuidFromString(const std::string& input) noexcept
+{
+    return GuidFromStringView(std::string_view{ input });
+}
+
+/**
+ * @brief Specialization for parsing a GUID from std::wstring.
+ * 
+ * @tparam TString std::wstring
+ * @param input 
+ * @return std::optional<GUID> 
+ */
+template <>
+inline std::optional<GUID>
+GuidFromString(const std::wstring& input) noexcept
+{
+    return GuidFromStringView(std::wstring_view{ input });
+}
 } // namespace notstd 
 
 namespace std