CWS-TOOLING: integrate CWS dv17

1 files changed, 7 insertions, 5 deletions

diff --git a/setup_native/source/win32/customactions/reg64/reg64.cxx b/setup_native/source/win32/customactions/reg64/reg64.cxx
index ffa225791ead..37dbb8276627 100755..100644
--- a/setup_native/source/win32/customactions/reg64/reg64.cxx
+++ b/setup_native/source/win32/customactions/reg64/reg64.cxx
@@ -368,13 +368,13 @@ bool DoRegEntries( MSIHANDLE& rhMSI, OPERATION op, MSIHANDLE& rhView)
             case(-1):
                     if (isInstall4AllUsers)
                     {
-                        key = HKEY_CURRENT_USER;
-                        OutputDebugStringFormat(L"HKEY_CURRENT_USER" );
+                        key = HKEY_LOCAL_MACHINE;
+                        OutputDebugStringFormat(L"HKEY_LOCAL_MACHINE" );
                     }
                     else
                     {
-                        key = HKEY_LOCAL_MACHINE;
-                        OutputDebugStringFormat(L"HKEY_LOCAL_MACHINE" );
+                        key = HKEY_CURRENT_USER;
+                        OutputDebugStringFormat(L"HKEY_CURRENT_USER" );
                     }
                 break;
             case(0):
@@ -393,7 +393,9 @@ bool DoRegEntries( MSIHANDLE& rhMSI, OPERATION op, MSIHANDLE& rhView)
                     key = HKEY_USERS;
                     OutputDebugStringFormat(L"HKEY_USERS" );
                 break;
-
+            default:
+                    OutputDebugStringFormat(L"Unknown Root!" );
+                break;
         }
 
         OutputDebugStringFormat(L"Key:");