5 files changed, 76 insertions, 15 deletions

diff --git a/src/dutil/inc/conutil.h b/src/dutil/inc/conutil.h
index cfb65332..a098cd4c 100644
--- a/src/dutil/inc/conutil.h
+++ b/src/dutil/inc/conutil.h
@@ -9,12 +9,8 @@ extern "C" {
 #define ConsoleExitOnFailure(x, c, f, ...) if (FAILED(x)) { ConsoleWriteError(x, c, f, __VA_ARGS__); ExitTrace(x, f, __VA_ARGS__); goto LExit; }
 #define ConsoleExitOnLastError(x, c, f, ...) { x = ::GetLastError(); x = HRESULT_FROM_WIN32(x); if (FAILED(x)) { ConsoleWriteError(x, c, f, __VA_ARGS__); ExitTrace(x, f, __VA_ARGS__); goto LExit; } }
 #define ConsoleExitOnNull(p, x, e, c, f, ...) if (NULL == p) { x = e; ConsoleWriteError(x, c, f, __VA_ARGS__); ExitTrace(x, f, __VA_ARGS__); goto LExit; }
-
-
-// the following macros need to go away
-#define ConsoleTrace(l, f, ...) { ConsoleWriteLine(CONSOLE_COLOR_NORMAL, f, __VA_ARGS__); Trace(l, f, __VA_ARGS__); }
-#define ConsoleWarning(f, ...) { ConsoleWriteLine(CONSOLE_COLOR_YELLOW, f, __VA_ARGS__); Trace(REPORT_STANDARD, f, __VA_ARGS__); }
-#define ConsoleError(x, f, ...) { ConsoleWriteError(x, CONSOLE_COLOR_RED, f, __VA_ARGS__); TraceError(x, f, __VA_ARGS__); }
+#define ConsoleExitOnNullWithLastError(p, x, c, f, ...) if (NULL == p) { DWORD Dutil_er = ::GetLastError(); x = HRESULT_FROM_WIN32(Dutil_er); if (!FAILED(x)) { x = E_FAIL; } ConsoleWriteError(x, c, f, __VA_ARGS__); ExitTrace(x, f, __VA_ARGS__); goto LExit; }
+#define ConsoleExitWithLastError(x, c, f, ...) { DWORD Dutil_er = ::GetLastError(); x = HRESULT_FROM_WIN32(Dutil_er); if (!FAILED(x)) { x = E_FAIL; } ConsoleWriteError(x, c, f, __VA_ARGS__); ExitTrace(x, f, __VA_ARGS__); goto LExit; }
 
 
 // enums
diff --git a/src/dutil/inc/strutil.h b/src/dutil/inc/strutil.h
index 1a2ed1d8..c73615aa 100644
--- a/src/dutil/inc/strutil.h
+++ b/src/dutil/inc/strutil.h
@@ -100,6 +100,11 @@ HRESULT __cdecl StrAllocConcatFormatted(
     __in __format_string LPCWSTR wzFormat,
     ...
     );
+HRESULT __cdecl StrAllocConcatFormattedSecure(
+    __deref_out_z LPWSTR* ppwz,
+    __in __format_string LPCWSTR wzFormat,
+    ...
+    );
 HRESULT __cdecl StrAllocFormattedSecure(
     __deref_out_z LPWSTR* ppwz,
     __in __format_string LPCWSTR wzFormat,
diff --git a/src/dutil/inc/wiutil.h b/src/dutil/inc/wiutil.h
index 4264b815..07f6b56c 100644
--- a/src/dutil/inc/wiutil.h
+++ b/src/dutil/inc/wiutil.h
@@ -330,10 +330,15 @@ HRESULT DAPI WiuEnableLog(
     __in_z LPCWSTR wzLogFile,
     __in DWORD dwLogAttributes
     );
+HRESULT DAPI WiuInitializeInternalUI(
+    __in INSTALLUILEVEL internalUILevel,
+    __in_opt HWND hwndParent,
+    __in WIU_MSI_EXECUTE_CONTEXT* pExecuteContext
+    );
 HRESULT DAPI WiuInitializeExternalUI(
     __in PFN_MSIEXECUTEMESSAGEHANDLER pfnMessageHandler,
     __in INSTALLUILEVEL internalUILevel,
-    __in HWND hwndParent,
+    __in_opt HWND hwndParent,
     __in LPVOID pvContext,
     __in BOOL fRollback,
     __in WIU_MSI_EXECUTE_CONTEXT* pExecuteContext
diff --git a/src/dutil/strutil.cpp b/src/dutil/strutil.cpp
index 2e5e2f96..4e184c34 100644
--- a/src/dutil/strutil.cpp
+++ b/src/dutil/strutil.cpp
@@ -920,8 +920,42 @@ LExit:
 
 
 /********************************************************************
+StrAllocConcatFormattedSecure - allocates or reuses dynamic string
+memory and adds a formatted string. If the memory needs to be
+reallocated, calls SecureZeroMemory on original block of memory after
+it is moved.
+
+NOTE: caller is responsible for freeing ppwz even if function fails
+********************************************************************/
+extern "C" HRESULT __cdecl StrAllocConcatFormattedSecure(
+    __deref_out_z LPWSTR* ppwz,
+    __in __format_string LPCWSTR wzFormat,
+    ...
+    )
+{
+    Assert(ppwz && wzFormat && *wzFormat);
+
+    HRESULT hr = S_OK;
+    LPWSTR sczFormatted = NULL;
+    va_list args;
+
+    va_start(args, wzFormat);
+    hr = StrAllocFormattedArgsSecure(&sczFormatted, wzFormat, args);
+    va_end(args);
+    ExitOnFailure(hr, "Failed to allocate formatted string");
+
+    hr = StrAllocConcatSecure(ppwz, sczFormatted, 0);
+
+LExit:
+    ReleaseStr(sczFormatted);
+
+    return hr;
+}
+
+
+/********************************************************************
 StrAllocFormattedSecure - allocates or reuses dynamic string memory 
-and formats it. If the memory needs to reallocated, 
+and formats it. If the memory needs to be reallocated,
 calls SecureZeroMemory on original block of memory after it is moved.
 
 NOTE: caller is responsible for freeing ppwz even if function fails
diff --git a/src/dutil/wiutil.cpp b/src/dutil/wiutil.cpp
index 1a489d54..1b3dd317 100644
--- a/src/dutil/wiutil.cpp
+++ b/src/dutil/wiutil.cpp
@@ -715,10 +715,32 @@ LExit:
 }
 
 
+extern "C" HRESULT DAPI WiuInitializeInternalUI(
+    __in INSTALLUILEVEL internalUILevel,
+    __in_opt HWND hwndParent,
+    __in WIU_MSI_EXECUTE_CONTEXT* pExecuteContext
+    )
+{
+    HRESULT hr = S_OK;
+
+    memset(pExecuteContext, 0, sizeof(WIU_MSI_EXECUTE_CONTEXT));
+
+    pExecuteContext->previousInstallUILevel = vpfnMsiSetInternalUI(internalUILevel, &hwndParent);
+    pExecuteContext->hwndPreviousParentWindow = hwndParent;
+
+    if (INSTALLUILEVEL_NOCHANGE == pExecuteContext->previousInstallUILevel)
+    {
+        hr = E_INVALIDARG;
+    }
+
+    return hr;
+}
+
+
 extern "C" HRESULT DAPI WiuInitializeExternalUI(
     __in PFN_MSIEXECUTEMESSAGEHANDLER pfnMessageHandler,
     __in INSTALLUILEVEL internalUILevel,
-    __in HWND hwndParent,
+    __in_opt HWND hwndParent,
     __in LPVOID pvContext,
     __in BOOL fRollback,
     __in WIU_MSI_EXECUTE_CONTEXT* pExecuteContext
@@ -730,7 +752,7 @@ extern "C" HRESULT DAPI WiuInitializeExternalUI(
     DWORD dwMessageFilter = INSTALLLOGMODE_INITIALIZE | INSTALLLOGMODE_TERMINATE |
                             INSTALLLOGMODE_FATALEXIT | INSTALLLOGMODE_ERROR | INSTALLLOGMODE_WARNING |
                             INSTALLLOGMODE_RESOLVESOURCE | INSTALLLOGMODE_OUTOFDISKSPACE |
-                            INSTALLLOGMODE_ACTIONSTART | INSTALLLOGMODE_ACTIONDATA | INSTALLLOGMODE_COMMONDATA|
+                            INSTALLLOGMODE_ACTIONSTART | INSTALLLOGMODE_ACTIONDATA | INSTALLLOGMODE_COMMONDATA |
                             INSTALLLOGMODE_PROGRESS | INSTALLLOGMODE_FILESINUSE;
 
     if (MAKEDWORD(0, 4) <= vdwMsiDllMajorMinor)
@@ -738,15 +760,14 @@ extern "C" HRESULT DAPI WiuInitializeExternalUI(
         dwMessageFilter |= INSTALLLOGMODE_RMFILESINUSE;
     }
 
-    memset(pExecuteContext, 0, sizeof(WIU_MSI_EXECUTE_CONTEXT));
+    // Wire the internal and external UI handler.
+    hr = WiuInitializeInternalUI(internalUILevel, hwndParent, pExecuteContext);
+    ExitOnFailure(hr, "Failed to set internal UI level and window.");
+
     pExecuteContext->fRollback = fRollback;
     pExecuteContext->pfnMessageHandler = pfnMessageHandler;
     pExecuteContext->pvContext = pvContext;
 
-    // Wire the internal and external UI handler.
-    pExecuteContext->previousInstallUILevel = vpfnMsiSetInternalUI(internalUILevel, &hwndParent);
-    pExecuteContext->hwndPreviousParentWindow = hwndParent;
-
     // If the external UI record is available (MSI version >= 3.1) use it but fall back to the standard external
     // UI handler if necesary.
     if (vpfnMsiSetExternalUIRecord)