[Libreoffice-commits] core.git: setup_native/source

[Mike Kaganski (via logerrit)]

 setup_native/source/win32/customactions/reg_dlls/reg_dlls.cxx |    9 +++++++++
 1 file changed, 9 insertions(+)

New commits:
commit 2bb064943444cd5bac155ad367378b674bceb11a
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Fri Jan 10 14:51:05 2020 +0300
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Fri Jan 10 15:14:10 2020 +0100

    Improve logging of feature states
    
    Change-Id: I8b304bbefe861abd7503204f0ae8efb0aea203ac
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86528
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/setup_native/source/win32/customactions/reg_dlls/reg_dlls.cxx b/setup_native/source/win32/customactions/reg_dlls/reg_dlls.cxx
index 74a524e4dae6..c7b1cc742938 100644
--- a/setup_native/source/win32/customactions/reg_dlls/reg_dlls.cxx
+++ b/setup_native/source/win32/customactions/reg_dlls/reg_dlls.cxx
@@ -236,12 +236,21 @@ extern "C" __declspec(dllexport) UINT __stdcall PrepRegUnregDLLs(MSIHANDLE hInst
         CheckWin32Error("MsiGetFeatureStateW",
                         MsiGetFeatureStateW(hInstall, L"gm_SharePointSupport_SubstMSO",
                                             &current_state_SubstMSO, &future_state_SubstMSO));
+
+        WriteLog(hInstall, "gm_SharePointSupport_SubstMSO state:", //
+                 "current", std::to_string(current_state_SubstMSO), //
+                 "future", std::to_string(future_state_SubstMSO)); //
+
         INSTALLSTATE current_state_Main;
         INSTALLSTATE future_state_Main;
         CheckWin32Error("MsiGetFeatureStateW",
                         MsiGetFeatureStateW(hInstall, L"gm_o_SharePointSupport",
                                             &current_state_Main, &future_state_Main));
 
+        WriteLog(hInstall, "gm_o_SharePointSupport state:", //
+                 "current", std::to_string(current_state_Main), //
+                 "future", std::to_string(future_state_Main)); //
+
         const bool bUnregSubstMSO = current_state_SubstMSO == INSTALLSTATE_LOCAL
                                     && future_state_SubstMSO == INSTALLSTATE_ABSENT;
         const bool bUnregMain