Changeset 59561 in vbox

Timestamp:

Feb 2, 2016 6:11:18 PM (9 years ago)

Author:

vboxsync

Message:

VBoxProxyStub.c: Adjusted assertions to ignore ERROR_ACCESS_DENIED in some places and use LogRel as it may help with identifying trouble (if logging is enabled early enough).

File:

• trunk/src/VBox/Main/src-all/win/VBoxProxyStub.c (modified) (21 diffs)

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

@@ -86 +86 @@
                   ((PKUSER_SHARED_DATA)MM_SHARED_USER_DATA_VA)->NtMajorVersion) >= RT_MAKE_U64(1/*Lo*/,6/*Hi*/) \
       ? "VBoxProxyStub.dll" : "VBoxProxyStubLegacy.dll" )
+
+/** For use with AssertLogRel except a_Expr1 from assertions but not LogRel. */
+#ifdef RT_STRICT
+# define VBPS_LOGREL_NO_ASSERT(a_Expr1) (a_Expr)
+#else
+# define VBPS_LOGREL_NO_ASSERT false
+#endif
 
 
@@ -225 +232 @@
      * /target being set to NT51.
      */
-    AssertMsg(hrc == S_OK, ("%Rhrc\n",  hrc));
+    AssertLogRelMsg(hrc == S_OK, ("%Rhrc\n",  hrc));
     return hrc;
 }
@@ -413 +420 @@
         /* 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);
+        AssertLogRelMsgReturn(rc == ERROR_ACCESS_DENIED, ("%u\n", rc), pState->rc = rc);
     }
     else
-        AssertMsgReturn(rc == ERROR_ACCESS_DENIED, ("%u\n", rc), pState->rc = rc);
+       AssertLogRelMsgReturn(rc == ERROR_ACCESS_DENIED, ("%u\n", rc), pState->rc = rc);
     return pState->rc = rc;
 }
@@ -513 +520 @@
             return ERROR_SUCCESS;
         }
-        AssertMsgFailed(("%u\n", rc));
+        AssertLogRelMsgFailed(("%u\n", rc));
         RegCloseKey(pState->aAltDeletes[i].hkeyClasses);
     }
@@ -521 +528 @@
     else
     {
-        AssertMsgFailed(("%u\n", rc));
+        AssertLogRelMsgFailed(("%u (%#x %s)\n", rc));
         pState->rc = rc;
     }
@@ -556 +563 @@
             rc = RegOpenKeyExW(pState->hkeyClassesRootDst, L"Interface", 0 /*fOptions*/, pState->fSamBoth,
                                &pState->hkeyClsidRootDst);
-        AssertMsgReturnStmt(rc == ERROR_SUCCESS, ("%u\n", rc), pState->hkeyInterfaceRootDst = NULL,  pState->rc = rc);
+        AssertLogRelMsgReturnStmt(rc == ERROR_SUCCESS, ("%u\n", rc), pState->hkeyInterfaceRootDst = NULL,  pState->rc = rc);
     }
 
@@ -570 +577 @@
             if (rc != ERROR_SUCCESS)
             {
-                AssertMsgStmt(rc == ERROR_FILE_NOT_FOUND, ("%u\n", rc), pState->rc = rc);
+                AssertMsgStmt(rc == ERROR_FILE_NOT_FOUND || ERROR_ACCESS_DENIED, ("%u\n", rc), pState->rc = rc);
                 pState->aAltDeletes[i].hkeyInterface = NULL;
             }
@@ -702 +709 @@
     }
 
-    AssertMsgFailed(("%d: '%ls'='%ls' -> %u\n", uLine, pwszValueNm, pwszValue, rc));
+    AssertLogRelMsg(VBPS_LOGREL_NO_ASSERT(rc == ERROR_ACCESS_DENIED),
+                    ("%d: '%ls'='%ls' -> %u\n", uLine, pwszValueNm, pwszValue, rc));
     pState->rc = rc;
     return rc;
@@ -768 +776 @@
     }
 
-    AssertMsgFailed(("%d: '%s'='%s' -> %u\n", uLine, pszValueNm, pszValue, rc));
+    AssertLogRelMsg(VBPS_LOGREL_NO_ASSERT(rc == ERROR_ACCESS_DENIED),
+                    ("%d: '%s'='%s' -> %u\n", uLine, pszValueNm, pszValue, rc));
     pState->rc = rc;
     return rc;
@@ -788 +797 @@
         return ERROR_SUCCESS;
 
-    AssertMsgFailed(("%d: close key -> %u\n", uLine, rc));
+    AssertLogRelMsgFailed(("%d: close key -> %u\n", uLine, rc));
     pState->rc = rc;
     return rc;
@@ -822 +831 @@
     else
     {
-        AssertMsgFailed(("%d: create key '%s' -> %u\n", uLine, pszKey,  rc));
+        AssertLogRelMsg(VBPS_LOGREL_NO_ASSERT(rc == ERROR_ACCESS_DENIED),
+                        ("%d: create key '%s' -> %u\n", uLine, pszKey,  rc));
         pState->rc = rc;
         *phkey = NULL;
@@ -853 +863 @@
     else
     {
-        AssertMsgFailed(("%d: create key '%s'(/Default='%s') -> %u\n", uLine, pszKey, pszValue, rc));
+        AssertLogRelMsg(VBPS_LOGREL_NO_ASSERT(rc == ERROR_ACCESS_DENIED),
+                        ("%d: create key '%s'(/Default='%s') -> %u\n", uLine, pszKey, pszValue, rc));
         pState->rc = rc;
     }
@@ -883 +894 @@
     else
     {
-        AssertMsgFailed(("%d: create key '%s'(/Default='%ls') -> %u\n", uLine, pszKey, pwszValue, rc));
+        AssertLogRelMsg(VBPS_LOGREL_NO_ASSERT(rc == ERROR_ACCESS_DENIED),
+                        ("%d: create key '%s'(/Default='%ls') -> %u\n", uLine, pszKey, pwszValue, rc));
         pState->rc = rc;
     }
@@ -914 +926 @@
     else
     {
-        AssertMsgFailed(("%d: create key '%s'(/Default='%s') -> %u\n", uLine, pszKey, pszValue, rc));
+        AssertLogRelMsg(VBPS_LOGREL_NO_ASSERT(rc == ERROR_ACCESS_DENIED),
+                        ("%d: create key '%s'(/Default='%s') -> %u\n", uLine, pszKey, pszValue, rc));
         pState->rc = rc;
         *phkey = NULL;
@@ -955 +968 @@
         return ERROR_SUCCESS;
 
-    AssertMsgFailed(("%d: delete key '%s' -> %u\n", uLine, pszKey, rc));
+    AssertLogRelMsg(VBPS_LOGREL_NO_ASSERT(rc == ERROR_ACCESS_DENIED),
+                    ("%d: delete key '%s' -> %u\n", uLine, pszKey, rc));
     pState->rc = rc;
     return rc;
@@ -994 +1008 @@
         return ERROR_SUCCESS;
 
-    AssertMsgFailed(("%d: delete key '%ls' -> %u\n", uLine, pwszKey, rc));
+    AssertLogRelMsg(VBPS_LOGREL_NO_ASSERT(rc == ERROR_ACCESS_DENIED),
+                    ("%d: delete key '%ls' -> %u\n", uLine, pwszKey, rc));
     pState->rc = rc;
     return rc;
@@ -1023 +1038 @@
         {
             rc = RegOpenKeyExW(pState->aAltDeletes[i].hkeyClasses, L"AppID", 0 /*fOptions*/, pState->fSamDelete, &hkeyAppIds);
-            AssertMsgStmt(rc == ERROR_SUCCESS || rc == ERROR_FILE_NOT_FOUND, ("%u\n", rc), pState->rc = rc);
+            AssertLogRelMsgStmt(rc == ERROR_SUCCESS || rc == ERROR_FILE_NOT_FOUND, ("%u\n", rc), pState->rc = rc);
             if (rc == ERROR_SUCCESS)
             {
@@ -1042 +1057 @@
             return ERROR_SUCCESS;
     }
-    AssertMsgReturn(rc == ERROR_SUCCESS, ("%u\n", rc), pState->rc = rc);
+    AssertLogRelMsgReturn(rc == ERROR_SUCCESS, ("%u\n", rc), pState->rc = rc);
 
     if (pState->fDelete)
@@ -1315 +1330 @@
     /* Open Classes/TypeLib/. */
     rc = vbpsCreateRegKeyA(pState, pState->hkeyClassesRootDst, "TypeLib", &hkeyTypeLibs, __LINE__);
-    AssertReturnVoid(rc == ERROR_SUCCESS);
+    if (rc != ERROR_SUCCESS)
+        return;
 
     /* Create TypeLib/{UUID}. */
@@ -1421 +1437 @@
     Assert(pState->fUpdate && !pState->fDelete);
     rc = vbpsRegOpenInterfaceKeys(pState);
-    AssertReturnVoid(rc == ERROR_SUCCESS);
+    if (rc != ERROR_SUCCESS)
+        return rc;
 
     /*
@@ -1450 +1467 @@
             AssertReturnVoidStmt(cMethods >= 3 && cMethods < 1024, pState->rc = ERROR_INVALID_DATA);
             sprintf(szMethods, "%u", cMethods);
-
-            AssertReturnVoid(rc == ERROR_SUCCESS);
 
             rc = vbpsCreateRegKeyWithDefaultValueAAEx(pState, pState->hkeyInterfaceRootDst,