1 files changed, 23 insertions, 8 deletions

diff --git a/src/dutil/wuautil.cpp b/src/dutil/wuautil.cpp
index 94ab659d..dfb28818 100644
--- a/src/dutil/wuautil.cpp
+++ b/src/dutil/wuautil.cpp
@@ -3,6 +3,21 @@
 #include "precomp.h"
 
 
+// Exit macros
+#define WuaExitOnLastError(x, s, ...) ExitOnLastErrorSource(DUTIL_SOURCE_WUAUTIL, x, s, __VA_ARGS__)
+#define WuaExitOnLastErrorDebugTrace(x, s, ...) ExitOnLastErrorDebugTraceSource(DUTIL_SOURCE_WUAUTIL, x, s, __VA_ARGS__)
+#define WuaExitWithLastError(x, s, ...) ExitWithLastErrorSource(DUTIL_SOURCE_WUAUTIL, x, s, __VA_ARGS__)
+#define WuaExitOnFailure(x, s, ...) ExitOnFailureSource(DUTIL_SOURCE_WUAUTIL, x, s, __VA_ARGS__)
+#define WuaExitOnRootFailure(x, s, ...) ExitOnRootFailureSource(DUTIL_SOURCE_WUAUTIL, x, s, __VA_ARGS__)
+#define WuaExitOnFailureDebugTrace(x, s, ...) ExitOnFailureDebugTraceSource(DUTIL_SOURCE_WUAUTIL, x, s, __VA_ARGS__)
+#define WuaExitOnNull(p, x, e, s, ...) ExitOnNullSource(DUTIL_SOURCE_WUAUTIL, p, x, e, s, __VA_ARGS__)
+#define WuaExitOnNullWithLastError(p, x, s, ...) ExitOnNullWithLastErrorSource(DUTIL_SOURCE_WUAUTIL, p, x, s, __VA_ARGS__)
+#define WuaExitOnNullDebugTrace(p, x, e, s, ...)  ExitOnNullDebugTraceSource(DUTIL_SOURCE_WUAUTIL, p, x, e, s, __VA_ARGS__)
+#define WuaExitOnInvalidHandleWithLastError(p, x, s, ...) ExitOnInvalidHandleWithLastErrorSource(DUTIL_SOURCE_WUAUTIL, p, x, s, __VA_ARGS__)
+#define WuaExitOnWin32Error(e, x, s, ...) ExitOnWin32ErrorSource(DUTIL_SOURCE_WUAUTIL, e, x, s, __VA_ARGS__)
+#define WuaExitOnGdipFailure(g, x, s, ...) ExitOnGdipFailureSource(DUTIL_SOURCE_WUAUTIL, g, x, s, __VA_ARGS__)
+
+
 // internal function declarations
 
 static HRESULT GetAutomaticUpdatesService(
@@ -18,10 +33,10 @@ extern "C" HRESULT DAPI WuaPauseAutomaticUpdates()
     IAutomaticUpdates *pAutomaticUpdates = NULL;
 
     hr = GetAutomaticUpdatesService(&pAutomaticUpdates);
-    ExitOnFailure(hr, "Failed to get the Automatic Updates service.");
+    WuaExitOnFailure(hr, "Failed to get the Automatic Updates service.");
 
     hr = pAutomaticUpdates->Pause();
-    ExitOnFailure(hr, "Failed to pause the Automatic Updates service.");
+    WuaExitOnFailure(hr, "Failed to pause the Automatic Updates service.");
 
 LExit:
     ReleaseObject(pAutomaticUpdates);
@@ -35,10 +50,10 @@ extern "C" HRESULT DAPI WuaResumeAutomaticUpdates()
     IAutomaticUpdates *pAutomaticUpdates = NULL;
 
     hr = GetAutomaticUpdatesService(&pAutomaticUpdates);
-    ExitOnFailure(hr, "Failed to get the Automatic Updates service.");
+    WuaExitOnFailure(hr, "Failed to get the Automatic Updates service.");
 
     hr = pAutomaticUpdates->Resume();
-    ExitOnFailure(hr, "Failed to resume the Automatic Updates service.");
+    WuaExitOnFailure(hr, "Failed to resume the Automatic Updates service.");
 
 LExit:
     ReleaseObject(pAutomaticUpdates);
@@ -55,10 +70,10 @@ extern "C" HRESULT DAPI WuaRestartRequired(
     VARIANT_BOOL bRestartRequired;
 
     hr = ::CoCreateInstance(__uuidof(SystemInformation), NULL, CLSCTX_INPROC_SERVER, __uuidof(ISystemInformation), reinterpret_cast<LPVOID*>(&pSystemInformation));
-    ExitOnRootFailure(hr, "Failed to get WUA system information interface.");
+    WuaExitOnRootFailure(hr, "Failed to get WUA system information interface.");
 
     hr = pSystemInformation->get_RebootRequired(&bRestartRequired);
-    ExitOnRootFailure(hr, "Failed to determine if restart is required from WUA.");
+    WuaExitOnRootFailure(hr, "Failed to determine if restart is required from WUA.");
 
     *pfRestartRequired = (VARIANT_FALSE != bRestartRequired);
 
@@ -79,10 +94,10 @@ static HRESULT GetAutomaticUpdatesService(
     CLSID clsidAutomaticUpdates = { };
 
     hr = ::CLSIDFromProgID(L"Microsoft.Update.AutoUpdate", &clsidAutomaticUpdates);
-    ExitOnFailure(hr, "Failed to get CLSID for Microsoft.Update.AutoUpdate.");
+    WuaExitOnFailure(hr, "Failed to get CLSID for Microsoft.Update.AutoUpdate.");
 
     hr = ::CoCreateInstance(clsidAutomaticUpdates, NULL, CLSCTX_INPROC_SERVER, IID_IAutomaticUpdates, reinterpret_cast<LPVOID*>(ppAutomaticUpdates));
-    ExitOnFailure(hr, "Failed to create instance of Microsoft.Update.AutoUpdate.");
+    WuaExitOnFailure(hr, "Failed to create instance of Microsoft.Update.AutoUpdate.");
 
 LExit:
     return hr;