CWS-TOOLING: integrate CWS native206_DEV300

6 files changed, 84 insertions, 2 deletions

diff --git a/setup_native/source/packinfo/openoffice.pcp b/setup_native/source/packinfo/openoffice.pcp
index ff8bda1b7328..142822728ec8 100644
--- a/setup_native/source/packinfo/openoffice.pcp
+++ b/setup_native/source/packinfo/openoffice.pcp
diff --git a/setup_native/source/packinfo/openofficelanguagepack.pcp b/setup_native/source/packinfo/openofficelanguagepack.pcp
index f2b446e1af32..013a11ed0c2b 100644
--- a/setup_native/source/packinfo/openofficelanguagepack.pcp
+++ b/setup_native/source/packinfo/openofficelanguagepack.pcp
diff --git a/setup_native/source/packinfo/ure.pcp b/setup_native/source/packinfo/ure.pcp
index a8488c9709c6..982656647647 100644
--- a/setup_native/source/packinfo/ure.pcp
+++ b/setup_native/source/packinfo/ure.pcp
diff --git a/setup_native/source/win32/customactions/shellextensions/dotnetcheck.cxx b/setup_native/source/win32/customactions/shellextensions/dotnetcheck.cxx
index 5ce683cc9d26..37e6516308ff 100644
--- a/setup_native/source/win32/customactions/shellextensions/dotnetcheck.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/dotnetcheck.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: dotnetcheck.cxx,v $
- * $Revision: 1.2 $
+ * $Revision: 1.2.42.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -157,3 +157,40 @@ extern "C" UINT __stdcall DotNetCheck(MSIHANDLE handle) {
 
     return ERROR_SUCCESS;
 }
+
+extern "C" UINT __stdcall ShowProperties(MSIHANDLE handle)
+{
+    string property = GetMsiProperty(handle, TEXT("INSTALLLOCATION"));
+    string myText = TEXT("INSTALLLOCATION: ") + property;
+    MessageBox(NULL, myText.c_str(), "INSTALLLOCATION", MB_OK);
+
+    property = GetMsiProperty(handle, TEXT("UREINSTALLLOCATION"));
+    myText = TEXT("UREINSTALLLOCATION: ") + property;
+    MessageBox(NULL, myText.c_str(), "UREINSTALLLOCATION", MB_OK);
+
+    property = GetMsiProperty(handle, TEXT("BASISINSTALLLOCATION"));
+    myText = TEXT("BASISINSTALLLOCATION: ") + property;
+    MessageBox(NULL, myText.c_str(), "BASISINSTALLLOCATION", MB_OK);
+
+    property = GetMsiProperty(handle, TEXT("OFFICEINSTALLLOCATION"));
+    myText = TEXT("OFFICEINSTALLLOCATION: ") + property;
+    MessageBox(NULL, myText.c_str(), "OFFICEINSTALLLOCATION", MB_OK);
+
+    property = GetMsiProperty(handle, TEXT("Installed"));
+    myText = TEXT("Installed: ") + property;
+    MessageBox(NULL, myText.c_str(), "Installed", MB_OK);
+
+    property = GetMsiProperty(handle, TEXT("PATCH"));
+    myText = TEXT("PATCH: ") + property;
+    MessageBox(NULL, myText.c_str(), "PATCH", MB_OK);
+
+    property = GetMsiProperty(handle, TEXT("REMOVE"));
+    myText = TEXT("REMOVE: ") + property;
+    MessageBox(NULL, myText.c_str(), "REMOVE", MB_OK);
+
+    property = GetMsiProperty(handle, TEXT("ALLUSERS"));
+    myText = TEXT("ALLUSERS: ") + property;
+    MessageBox(NULL, myText.c_str(), "ALLUSERS", MB_OK);
+
+    return ERROR_SUCCESS;
+}
diff --git a/setup_native/source/win32/customactions/shellextensions/exports.dxp b/setup_native/source/win32/customactions/shellextensions/exports.dxp
index 394362f74ef0..193d4198ef28 100644
--- a/setup_native/source/win32/customactions/shellextensions/exports.dxp
+++ b/setup_native/source/win32/customactions/shellextensions/exports.dxp
@@ -14,4 +14,5 @@ SetAdminInstallProperty
 CreateLayerLinks
 RemoveLayerLinks
 DotNetCheck
+ShowProperties
 copyEditionData
diff --git a/setup_native/source/win32/customactions/shellextensions/migrateinstallpath.cxx b/setup_native/source/win32/customactions/shellextensions/migrateinstallpath.cxx
index 3255ddea5e30..59cb50edbf6f 100755
--- a/setup_native/source/win32/customactions/shellextensions/migrateinstallpath.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/migrateinstallpath.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: migrateinstallpath.cxx,v $
- * $Revision: 1.8 $
+ * $Revision: 1.8.108.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -100,6 +100,28 @@ extern "C" UINT __stdcall MigrateInstallPath( MSIHANDLE handle )
             MsiSetProperty(handle, TEXT("OFFICEINSTALLLOCATION"), sInstDir.c_str());
             // MessageBox( NULL, sInstDir.c_str(), "Found in HKEY_CURRENT_USER", MB_OK );
         }
+
+        if ( ERROR_SUCCESS == RegQueryValueEx( hKey, TEXT("BASISINSTALLLOCATION"), NULL, NULL, (LPBYTE)szValue, &nValueSize ) )
+        {
+            sInstDir = szValue;
+            MsiSetProperty(handle, TEXT("BASISINSTALLLOCATION"), sInstDir.c_str());
+            // MessageBox( NULL, sInstDir.c_str(), "Found in HKEY_CURRENT_USER", MB_OK );
+        }
+
+        if ( ERROR_SUCCESS == RegQueryValueEx( hKey, TEXT("UREINSTALLLOCATION"), NULL, NULL, (LPBYTE)szValue, &nValueSize ) )
+        {
+            sInstDir = szValue;
+            MsiSetProperty(handle, TEXT("UREINSTALLLOCATION"), sInstDir.c_str());
+            // MessageBox( NULL, sInstDir.c_str(), "Found in HKEY_CURRENT_USER", MB_OK );
+        }
+
+        if ( ERROR_SUCCESS == RegQueryValueEx( hKey, TEXT("INSTALLLOCATION"), NULL, NULL, (LPBYTE)szValue, &nValueSize ) )
+        {
+            sInstDir = szValue;
+            MsiSetProperty(handle, TEXT("INSTALLLOCATION"), sInstDir.c_str());
+            // MessageBox( NULL, sInstDir.c_str(), "Found in HKEY_CURRENT_USER", MB_OK );
+        }
+
         RegCloseKey( hKey );
     }
     else if ( ERROR_SUCCESS == RegOpenKey( HKEY_LOCAL_MACHINE,  sProductKey.c_str(), &hKey ) )
@@ -110,6 +132,28 @@ extern "C" UINT __stdcall MigrateInstallPath( MSIHANDLE handle )
             MsiSetProperty(handle, TEXT("OFFICEINSTALLLOCATION"), sInstDir.c_str());
             // MessageBox( NULL, sInstDir.c_str(), "Found in HKEY_LOCAL_MACHINE", MB_OK );
         }
+
+        if ( ERROR_SUCCESS == RegQueryValueEx( hKey, TEXT("BASISINSTALLLOCATION"), NULL, NULL, (LPBYTE)szValue, &nValueSize ) )
+        {
+            sInstDir = szValue;
+            MsiSetProperty(handle, TEXT("BASISINSTALLLOCATION"), sInstDir.c_str());
+            // MessageBox( NULL, sInstDir.c_str(), "Found in HKEY_LOCAL_MACHINE", MB_OK );
+        }
+
+        if ( ERROR_SUCCESS == RegQueryValueEx( hKey, TEXT("UREINSTALLLOCATION"), NULL, NULL, (LPBYTE)szValue, &nValueSize ) )
+        {
+            sInstDir = szValue;
+            MsiSetProperty(handle, TEXT("UREINSTALLLOCATION"), sInstDir.c_str());
+            // MessageBox( NULL, sInstDir.c_str(), "Found in HKEY_LOCAL_MACHINE", MB_OK );
+        }
+
+        if ( ERROR_SUCCESS == RegQueryValueEx( hKey, TEXT("INSTALLLOCATION"), NULL, NULL, (LPBYTE)szValue, &nValueSize ) )
+        {
+            sInstDir = szValue;
+            MsiSetProperty(handle, TEXT("INSTALLLOCATION"), sInstDir.c_str());
+            // MessageBox( NULL, sInstDir.c_str(), "Found in HKEY_LOCAL_MACHINE", MB_OK );
+        }
+
         RegCloseKey( hKey );
     }