UrfwInitialize() didn't report if ExtRoLoadCatalog() errored and returned a failing HRESULT (only trapped thrown exceptions, but the implementation does both) (#2498)

DrusTheAxe · Santosh Chintalapati · commit 903124c470a1 · 2022-05-12T12:15:44.000-07:00
diff --git a/dev/UndockedRegFreeWinRT/urfw.cpp b/dev/UndockedRegFreeWinRT/urfw.cpp
@@ -413,7 +413,7 @@ HRESULT UrfwInitialize() noexcept
     DetourAttach(&(PVOID&)TrueRoResolveNamespace, RoResolveNamespaceDetour);
     try
     {
-        ExtRoLoadCatalog();
+        RETURN_IF_FAILED(ExtRoLoadCatalog());
     }
     catch (...)
     {

Original file line number	Diff line number	Diff line change
`@@ -413,7 +413,7 @@ HRESULT UrfwInitialize() noexcept`
`413`	`413`	`DetourAttach(&(PVOID&)TrueRoResolveNamespace, RoResolveNamespaceDetour);`
`414`	`414`	`try`
`415`	`415`	`{`
`416`		`- ExtRoLoadCatalog();`
	`416`	`+ RETURN_IF_FAILED(ExtRoLoadCatalog());`
`417`	`417`	`}`
`418`	`418`	`catch (...)`
`419`	`419`	`{`