Changeset 50064 in vbox for trunk/src/VBox/Additions/WINNT/VBoxCredProv

Timestamp:

Jan 13, 2014 6:40:38 PM (11 years ago)

Author:

vboxsync

Message:

VBoxCredProv: Implemented registry option to disable handling SENS events.

Location:

trunk/src/VBox/Additions/WINNT/VBoxCredProv

Files:

• VBoxCredProvProvider.cpp (modified) (3 diffs)
• VBoxCredentialProvider.cpp (modified) (5 diffs)

trunk/src/VBox/Additions/WINNT/VBoxCredProv/VBoxCredProvProvider.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2012-2013 Oracle Corporation
+ * Copyright (C) 2012-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -142 +142 @@
             && dwSize == sizeof(DWORD))
         {
-            m_fHandleRemoteSessions = true;
+            m_fHandleRemoteSessions = RT_BOOL(dwValue);
         }
 
@@ -286 +286 @@
         }
 
-        case CPUS_CHANGE_PASSWORD:
-        case CPUS_CREDUI:
-        case CPUS_PLAP:
+        case CPUS_CHANGE_PASSWORD: /* Asks us to provide a way to change the password. */
+        case CPUS_CREDUI:          /* Displays an own UI. We don't need that. */
+        case CPUS_PLAP:            /* See Pre-Logon-Access Provider. Not needed (yet). */
 
             hr = E_NOTIMPL;

trunk/src/VBox/Additions/WINNT/VBoxCredProv/VBoxCredentialProvider.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2012-2013 Oracle Corporation
+ * Copyright (C) 2012-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -46 +46 @@
 
 #ifdef VBOX_WITH_SENS
+static bool g_fSENSEnabled = false;
 static IEventSystem *g_pIEventSystem;   /**< Pointer to IEventSystem interface. */
 
@@ -388 +389 @@
         case DLL_THREAD_DETACH:
             break;
+
+        default:
+            break;
     }
 
@@ -442 +446 @@
     if (!g_cDllRefs)
     {
-        VBoxCredentialProviderUnregisterSENS();
+        if (g_fSENSEnabled)
+            VBoxCredentialProviderUnregisterSENS();
 
         CoUninitialize();
@@ -477 +482 @@
 
 #ifdef VBOX_WITH_SENS
-            if (SUCCEEDED(hr))
+            g_fSENSEnabled = true; /* By default SENS support is enabled. */
+
+            HKEY hKey;
+            /** @todo Add some registry wrapper function(s) as soon as we got more values to retrieve. */
+            DWORD dwRet = RegOpenKeyEx(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Oracle\\VirtualBox Guest Additions\\AutoLogon",
+                                       0L, KEY_QUERY_VALUE, &hKey);
+            if (dwRet == ERROR_SUCCESS)
+            {
+                DWORD dwValue;
+                DWORD dwType = REG_DWORD;
+                DWORD dwSize = sizeof(DWORD);
+
+                dwRet = RegQueryValueEx(hKey, L"HandleSENS", NULL, &dwType, (LPBYTE)&dwValue, &dwSize);
+                if (   dwRet  == ERROR_SUCCESS
+                    && dwType == REG_DWORD
+                    && dwSize == sizeof(DWORD))
+                {
+                    g_fSENSEnabled = RT_BOOL(dwValue);
+                }
+
+                RegCloseKey(hKey);
+            }
+
+            VBoxCredProvVerbose(0, "VBoxCredentialProviderCreate: g_fSENSEnabled=%RTbool\n",
+                                g_fSENSEnabled);
+            if (   SUCCEEDED(hr)
+                && g_fSENSEnabled)
             {
                 HRESULT hRes = CoInitializeEx(NULL, COINIT_MULTITHREADED);
                 VBoxCredentialProviderRegisterSENS();
             }
+#else
+            VBoxCredProvVerbose(0, "VBoxCredentialProviderCreate: SENS support is disabled\n");
 #endif
         }