Reworked API breaking change

nefarius · Aug 9, 2024 · 317b5ab · 317b5ab
1 parent 0df94e3
commit 317b5ab
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 14 deletions.
diff --git a/src/NefConUtil.cpp b/src/NefConUtil.cpp
@@ -111,9 +111,9 @@ int main(int argc, char* argv[])
             return EXIT_FAILURE;
         }
 
-        GUID clID;
+        const auto guid = nefarius::winapi::GUIDFromString(classGuid);
 
-        if (!nefarius::winapi::GUIDFromString(classGuid, &clID))
+        if (!guid)
         {
             logger->error(
                 "Device Class GUID format invalid, expected format (with or without brackets): xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx");
@@ -138,7 +138,7 @@ int main(int argc, char* argv[])
             return EXIT_FAILURE;
         }
 
-        auto ret = AddDeviceClassFilter(&clID, nefarius::utilities::ConvertAnsiToWide(serviceName), pos);
+        auto ret = AddDeviceClassFilter(&guid.value(), nefarius::utilities::ConvertAnsiToWide(serviceName), pos);
 
         if (ret)
         {
@@ -173,9 +173,9 @@ int main(int argc, char* argv[])
             return EXIT_FAILURE;
         }
 
-        GUID clID;
+        const auto guid = nefarius::winapi::GUIDFromString(classGuid);
 
-        if (!nefarius::winapi::GUIDFromString(classGuid, &clID))
+        if (!guid)
         {
             logger->error(
                 "Device Class GUID format invalid, expected format (with or without brackets): xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx");
@@ -200,7 +200,7 @@ int main(int argc, char* argv[])
             return EXIT_FAILURE;
         }
 
-        auto ret = RemoveDeviceClassFilter(&clID, nefarius::utilities::ConvertAnsiToWide(serviceName), pos);
+        auto ret = RemoveDeviceClassFilter(&guid.value(), nefarius::utilities::ConvertAnsiToWide(serviceName), pos);
 
         if (ret)
         {
@@ -393,17 +393,18 @@ int main(int argc, char* argv[])
             return EXIT_FAILURE;
         }
 
-        GUID clID;
+        const auto guid = nefarius::winapi::GUIDFromString(classGuid);
 
-        if (!nefarius::winapi::GUIDFromString(classGuid, &clID))
+        if (!guid)
         {
             logger->error(
                 "Device Class GUID format invalid, expected format (with or without brackets): xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx");
             return EXIT_FAILURE;
         }
 
-        auto ret = nefarius::devcon::Create(nefarius::utilities::ConvertAnsiToWide(className), &clID,
-                                            nefarius::utilities::WideMultiStringArray(nefarius::utilities::ConvertAnsiToWide(hwId)));
+        auto ret = nefarius::devcon::Create(nefarius::utilities::ConvertAnsiToWide(className), &guid.value(),
+                                            nefarius::utilities::WideMultiStringArray(
+                                                nefarius::utilities::ConvertAnsiToWide(hwId)));
 
         if (!ret)
         {
@@ -435,9 +436,9 @@ int main(int argc, char* argv[])
             return EXIT_FAILURE;
         }
 
-        GUID clID;
+        const auto guid = nefarius::winapi::GUIDFromString(classGuid);
 
-        if (!nefarius::winapi::GUIDFromString(classGuid, &clID))
+        if (!guid)
         {
             logger->error(
                 "Device Class GUID format invalid, expected format (with or without brackets): xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx");
@@ -446,7 +447,8 @@ int main(int argc, char* argv[])
 
         bool rebootRequired;
 
-        auto results = devcon::uninstall_device_and_driver(&clID, nefarius::utilities::ConvertAnsiToWide(hwId), &rebootRequired);
+        auto results = devcon::uninstall_device_and_driver(&guid.value(), nefarius::utilities::ConvertAnsiToWide(hwId),
+                                                           &rebootRequired);
 
         // TODO: finish proper error propagation!
         for (const auto& item : results)

diff --git a/vcpkg-configuration.json b/vcpkg-configuration.json
@@ -3,7 +3,7 @@
     {
       "kind": "git",
       "repository": "https://github.com/nefarius/nefarius-vcpkg-registry.git",
-      "baseline": "f05fbd1c3c85e36094132725878d3d03e3baf1fb",
+      "baseline": "710c5dff329f590618dc22c39823356238465499",
       "packages": [ "neflib" ]
     }
   ],