2 files changed, 16 insertions, 8 deletions

diff --git a/src/ext/Bal/Samples/bafunctions/precomp.h b/src/ext/Bal/Samples/bafunctions/precomp.h
index 832d2250..cda11a40 100644
--- a/src/ext/Bal/Samples/bafunctions/precomp.h
+++ b/src/ext/Bal/Samples/bafunctions/precomp.h
@@ -23,13 +23,13 @@
 #include "dictutil.h"
 //#include "dirutil.h"
 #include "fileutil.h"
-#include "locutil.h"
+//#include "locutil.h"
 //#include "logutil.h"
 #include "pathutil.h"
 //#include "resrutil.h"
 //#include "shelutil.h"
 #include "strutil.h"
-#include "thmutil.h"
+//#include "thmutil.h"
 //#include "uriutil.h"
 //#include "xmlutil.h"
 #include "regutil.h"
diff --git a/src/ext/Bal/wixstdba/WixStandardBootstrapperApplication.cpp b/src/ext/Bal/wixstdba/WixStandardBootstrapperApplication.cpp
index 5546b74f..cdb9d017 100644
--- a/src/ext/Bal/wixstdba/WixStandardBootstrapperApplication.cpp
+++ b/src/ext/Bal/wixstdba/WixStandardBootstrapperApplication.cpp
@@ -2783,7 +2783,6 @@ private:
             if (pBA->m_pfnBAFunctionsProc)
             {
                 wndProcArgs.cbSize = sizeof(wndProcArgs);
-                wndProcArgs.pTheme = pTheme;
                 wndProcArgs.hWnd = hWnd;
                 wndProcArgs.uMsg = uMsg;
                 wndProcArgs.wParam = wParam;
@@ -2791,10 +2790,20 @@ private:
                 wndProcResults.cbSize = sizeof(wndProcResults);
 
                 hr = pBA->m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_WNDPROC, &wndProcArgs, &wndProcResults, pBA->m_pvBAFunctionsProcContext);
-                if (E_NOTIMPL != hr)
+
+                if (E_NOTIMPL == hr)
                 {
-                    lres = wndProcResults.lres;
-                    ExitFunction();
+                    hr = S_OK;
+                }
+                else
+                {
+                    BalExitOnFailure(hr, "BAFunctions WndProc failed.");
+
+                    if (wndProcResults.fProcessed)
+                    {
+                        lres = wndProcResults.lResult;
+                        ExitFunction();
+                    }
                 }
             }
         }
@@ -2910,8 +2919,7 @@ private:
         if (m_pfnBAFunctionsProc)
         {
             themeLoadedArgs.cbSize = sizeof(themeLoadedArgs);
-            themeLoadedArgs.pTheme = m_pTheme;
-            themeLoadedArgs.pWixLoc = m_pWixLoc;
+            themeLoadedArgs.hWnd = m_pTheme->hwndParent;
             themeLoadedResults.cbSize = sizeof(themeLoadedResults);
             hr = m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONTHEMELOADED, &themeLoadedArgs, &themeLoadedResults, m_pvBAFunctionsProcContext);
             BalExitOnFailure(hr, "BAFunctions OnThemeLoaded failed.");