Changeset 59393 in vbox

Timestamp:

Jan 19, 2016 2:10:19 AM (9 years ago)

Author:

vboxsync

Message:

VBoxProxyStub.c: Normal users aren't allowed to do COM registrations, at least not this way. So, quietly ignore ERROR_ACCESS_DENIED duing VbpsUpdateRegistrations.

File:

• trunk/src/VBox/Main/src-all/win/VBoxProxyStub.c (modified) (1 diff)

trunk/src/VBox/Main/src-all/win/VBoxProxyStub.c

@@ -400 +400 @@
      */
     rc = RegOpenKeyExA(hkeyRoot, pszSubRoot, 0 /*fOptions*/, pState->fSamBoth, &pState->hkeyClassesRootDst);
-    AssertMsgReturn(rc == ERROR_SUCCESS, ("%u\n", rc), pState->rc = rc);
-    rc = RegCreateKeyExW(pState->hkeyClassesRootDst, L"CLSID", 0 /*Reserved*/, NULL /*pszClass*/, 0 /*fOptions*/,
-                         pState->fSamBoth, NULL /*pSecAttr*/, &pState->hkeyClsidRootDst, NULL /*pdwDisposition*/);
-    AssertMsgReturn(rc == ERROR_SUCCESS, ("%u\n", rc), pState->rc = rc);
-
-    return ERROR_SUCCESS;
+    if (rc == ERROR_SUCCESS)
+    {
+        rc = RegCreateKeyExW(pState->hkeyClassesRootDst, L"CLSID", 0 /*Reserved*/, NULL /*pszClass*/, 0 /*fOptions*/,
+                             pState->fSamBoth, NULL /*pSecAttr*/, &pState->hkeyClsidRootDst, NULL /*pdwDisposition*/);
+        if (rc == ERROR_SUCCESS)
+            return ERROR_SUCCESS;
+
+        /* Ignore access denied errors as these may easily happen for
+           non-admin users. Just give up when this happens */
+        AssertMsgReturn(rc == ERROR_ACCESS_DENIED, ("%u\n", rc), pState->rc = rc);
+    }
+    else
+        AssertMsgReturn(rc == ERROR_ACCESS_DENIED, ("%u\n", rc), pState->rc = rc);
+    return pState->rc = rc;
 }