Changeset 96803 in vbox for trunk/src/VBox/Main/src-global

Timestamp:

Sep 20, 2022 12:51:05 PM (2 years ago)

Author:

vboxsync

Message:

Main/VBoxSDS: Restored original const wchar_t * string parameter for i_isFeatureEnabled - using Utf8Str is just extra code bloat and adds two totally unnecessary points of failure. bugref:9341

File:

• trunk/src/VBox/Main/src-global/win/VirtualBoxSDSImpl.cpp (modified) (9 diffs)

trunk/src/VBox/Main/src-global/win/VirtualBoxSDSImpl.cpp

@@ -237 +237 @@
 
 /* static */
-bool VirtualBoxSDS::i_isFeatureEnabled(com::Utf8Str const &a_rStrFeature)
-{
-    HKEY hKey;
+bool VirtualBoxSDS::i_isFeatureEnabled(wchar_t const *a_pwszFeature)
+{
+    HKEY    hKey;
     LSTATUS lrc = RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"Software\\Oracle\\VirtualBox\\VBoxSDS", 0, KEY_READ, &hKey);
     /* Treat any errors as the feature is off. Because the actual error value doesn't matter. */
@@ -245 +245 @@
         return false;
 
-    PRTUTF16 pwszFeature;
-    int rc = RTStrToUtf16(a_rStrFeature.c_str(), &pwszFeature);
-    AssertRCReturn(rc, false);
-
-    DWORD dwType = 0;
+    DWORD dwType  = 0;
     DWORD dwValue = 0;
     DWORD cbValue = sizeof(DWORD);
-    lrc = RegQueryValueExW(hKey, pwszFeature, NULL, &dwType, (LPBYTE)&dwValue, &cbValue);
-
-    RTUtf16Free(pwszFeature);
-
-    bool const fEnabled =    lrc     == ERROR_SUCCESS
-                          && dwType  == REG_DWORD
-                          /* A lot of people are used to putting 0xFF or similar to DWORDs for enabling stuff. */
-                          && dwValue >= 1;
+    lrc = RegQueryValueExW(hKey, a_pwszFeature, NULL, &dwType, (LPBYTE)&dwValue, &cbValue);
+
+    bool const fEnabled = lrc     == ERROR_SUCCESS
+                       && dwType  == REG_DWORD
+                       && dwValue != 0;
 
     RegCloseKey(hKey);
@@ -296 +289 @@
     {
         *aExistingVirtualBox = NULL;
+
         /*
          * Get the client user SID and name.
@@ -344 +338 @@
 #ifdef VBOX_WITH_VBOXSVC_SESSION_0
                     DWORD dwSessionId = 0;
-                    if (VirtualBoxSDS::i_isFeatureEnabled("ServerSession0"))
+                    if (VirtualBoxSDS::i_isFeatureEnabled(L"ServerSession0"))
                     {
                         /* Get user token. */
@@ -360 +354 @@
                                 HANDLE hNewToken;
                                 if (DuplicateTokenEx(hThreadToken, MAXIMUM_ALLOWED, NULL /*SecurityAttribs*/,
-                                                        SecurityIdentification, TokenPrimary, &hNewToken))
+                                                     SecurityIdentification, TokenPrimary, &hNewToken))
                                 {
                                     CloseHandle(hThreadToken);
@@ -390 +384 @@
                             }
                             else
-                                LogRel(("registerVBoxSVC: GetTokenInformation failed: %ld\n", GetLastError()));
+                                LogRel(("registerVBoxSVC: GetTokenInformation failed: %Rwc\n", GetLastError()));
                         }
+
                         /* Either the "VBoxSVC in windows session 0" feature is off or the request from VBoxSVC running
                          * in windows session 0. */
@@ -397 +392 @@
                         {
                             /* if VBoxSVC in the Windows session 0 is not started or if it did not
-                                * registered during a minute, start new one */
+                             * registered during a minute, start new one */
                             if (   pUserData->m_pidTheChosenOne == NIL_RTPROCESS
                                 || GetTickCount() - pUserData->m_tickTheChosenOne > 60 * 1000)
@@ -404 +399 @@
                                 if (SetTokenInformation(hThreadToken, TokenSessionId, &uSessionId, sizeof(uint32_t)))
                                 {
-                                    /* start VBoxSVC process */
-                                    /* Get the path to the executable directory w/ trailing slash: */
+                                    /*
+                                     * Start VBoxSVC process
+                                     */
                                     char szPath[RTPATH_MAX];
                                     int vrc = RTPathAppPrivateArch(szPath, sizeof(szPath));
                                     AssertRCReturn(vrc, vrc);
+
                                     size_t cbBufLeft = RTPathEnsureTrailingSeparator(szPath, sizeof(szPath));
                                     AssertReturn(cbBufLeft > 0, VERR_FILENAME_TOO_LONG);
-                                    char *pszNamePart = &szPath[cbBufLeft]; NOREF(pszNamePart);
+
+                                    char *pszNamePart = &szPath[cbBufLeft];
                                     cbBufLeft = sizeof(szPath) - cbBufLeft;
+
                                     static const char s_szVirtualBox_exe[] = "VBoxSVC.exe";
                                     vrc = RTStrCopy(pszNamePart, cbBufLeft, s_szVirtualBox_exe);
                                     AssertRCReturn(vrc, vrc);
+
                                     const char *apszArgs[] =
                                     {
@@ -483 +483 @@
                         else
                         {
-                            LogRel(("registerVBoxSVC: OpenProcess() failed: %ld\n", GetLastError()));
+                            LogRel(("registerVBoxSVC: OpenProcess() failed: %Rwc\n", GetLastError()));
                             hrc = E_ACCESSDENIED;
                         }