儲存庫 vbox 的更動 45814

時間撮記:

2013-4-29 下午02:10:00 (12 年 以前)

作者:

vboxsync

訊息:

Main: removed all these recent hacks for debugging the testboxes

位置:

trunk/src/VBox/Main

檔案:

• include/VirtualBoxBase.h (修改) (2 筆差異)
• src-client/ConsoleImpl.cpp (修改) (3 筆差異)
• src-client/SessionImpl.cpp (修改) (3 筆差異)
• src-server/MachineImpl.cpp (修改) (4 筆差異)

trunk/src/VBox/Main/include/VirtualBoxBase.h

@@ -339 +339 @@
     } while (0)
 
-#define CheckComArgMaybeNull1(arg, err) \
-    do { \
-        if (RT_UNLIKELY(!RT_VALID_PTR(arg) && (arg) != NULL)) \
-            return setError(err, tr("Argument %s is an invalid pointer"), #arg); \
-    } while (0)
-
 /**
  * Checks that safe array argument is not NULL and returns E_INVALIDARG +
@@ -377 +371 @@
         if (RT_UNLIKELY(!RT_VALID_PTR(bstrInCheck) || *(bstrInCheck) == '\0')) \
             return setError(E_INVALIDARG, tr("Argument %s is empty or an invalid pointer"), #a_bstrIn); \
-    } while (0)
-#define CheckComArgStrNotEmptyOrNull1(a_bstrIn, err) \
-    do { \
-        IN_BSTR const bstrInCheck = (a_bstrIn); /* type check */ \
-        if (RT_UNLIKELY(!RT_VALID_PTR(bstrInCheck) || *(bstrInCheck) == '\0')) \
-            return setError(err, tr("Argument %s is empty or an invalid pointer"), #a_bstrIn); \
     } while (0)
 

trunk/src/VBox/Main/src-client/ConsoleImpl.cpp

@@ -5500 +5500 @@
 #else /* VBOX_WITH_GUEST_PROPS */
     if (!RT_VALID_PTR(aName))
-        /** @todo replace hardcoded constants with E_INVALIDARG once testboxes has
-         *        been debugged. */
-        return setError(0x80face00, tr("Name cannot be NULL or an invalid pointer"));
+        return setError(E_INVALIDARG, tr("Name cannot be NULL or an invalid pointer"));
     if (aValue != NULL && !RT_VALID_PTR(aValue))
-        return setError(0x80face01, tr("Invalid value pointer"));
+        return setError(E_INVALIDARG, tr("Invalid value pointer"));
     if (aFlags != NULL && !RT_VALID_PTR(aFlags))
-        return setError(0x80face02, tr("Invalid flags pointer"));
+        return setError(E_INVALIDARG, tr("Invalid flags pointer"));
 
     AutoCaller autoCaller(this);
@@ -5514 +5512 @@
     SafeVMPtrQuiet ptrVM(this);
     if (FAILED(ptrVM.rc()))
-    {
-        LogRel(("Console::setGuestProperty1: %ls -> %Rhrc\n", aName, ptrVM.rc())); /* !REMOVE ME! Debugging testboxes! */
         return ptrVM.rc();
-    }
 
     /* Note: validity of mVMMDev which is bound to uninit() is guaranteed by
@@ -5566 +5561 @@
         hrc = S_OK;
     else
-    {
-        LogRel(("Console::setGuestProperty2: %ls -> %Rrc\n", aName, vrc)); /* !REMOVE ME! Debugging testboxes! */
         hrc = setError(E_UNEXPECTED, tr("The service call failed with the error %Rrc"), vrc);
-    }
     return hrc;
 #endif /* VBOX_WITH_GUEST_PROPS */

trunk/src/VBox/Main/src-client/SessionImpl.cpp

@@ -802 +802 @@
                         Global::stringifySessionState(mState));
     AssertReturn(mType == SessionType_WriteLock, VBOX_E_INVALID_OBJECT_STATE);
-    CheckComArgStrNotEmptyOrNull1(aName, 0x80face05);
+    CheckComArgStrNotEmptyOrNull(aName);
     if (!aIsSetter && !VALID_PTR(aRetValue))
         return E_POINTER;
@@ -811 +811 @@
     /* aValue can be NULL for a setter call if the property is to be deleted. */
     if (aIsSetter && (aValue != NULL) && !VALID_PTR(aValue))
-        return setError(0x80face06, tr("Invalid value pointer"));
+        return setError(E_INVALIDARG, tr("Invalid value pointer"));
     /* aFlags can be null if it is to be left as is */
     if (aIsSetter && (aFlags != NULL) && !VALID_PTR(aFlags))
-        return setError(0x80face07, tr("Invalid flags pointer"));
+        return setError(E_INVALIDARG, tr("Invalid flags pointer"));
 
     /* If this session is not in a VM process fend off the call. The caller
@@ -824 +824 @@
         return mConsole->getGuestProperty(aName, aRetValue, aRetTimestamp, aRetFlags);
     else
-    {
-        HRESULT rc = mConsole->setGuestProperty(aName, aValue, aFlags);
-        LogRel(("Session::AccessGuestProperty: %ls -> %Rhrc\n", aName, rc)); /* !REMOVE ME! Debugging testboxes! */
-        return rc;
-    }
+        return mConsole->setGuestProperty(aName, aValue, aFlags);
 #else /* VBOX_WITH_GUEST_PROPS not defined */
     ReturnComNotImplemented();

trunk/src/VBox/Main/src-server/MachineImpl.cpp

@@ -5725 +5725 @@
 
     rc = checkStateDependency(MutableStateDep);
-    if (FAILED(rc))
-    {
-        LogRel(("Machine::setGuestPropertyToService: %ls -> %Rhrc\n", aName, rc)); /* !REMOVE ME! Debugging testboxes! */
-        return rc;
-    }
+    if (FAILED(rc)) return rc;
 
     try
@@ -5837 +5833 @@
             rc = E_ACCESSDENIED;
         else
-        {
-            /** @todo Fix when adding DeleteGuestProperty(),
-                         see defect. */
+            /** @todo Fix when adding DeleteGuestProperty(), see defect. */
             rc = directControl->AccessGuestProperty(aName, aValue, aFlags,
                                                     true /* isSetter */,
                                                     &dummy, &dummy64, &dummy);
-            if (FAILED(rc))
-            {
-                LogRel(("Machine::setGuestPropertyToVM: %ls -> %Rhrc\n", aName, rc)); /* !REMOVE ME! Debugging testboxes! */
-                /* testbox hacking: a shot in the dark. */
-                ErrorInfoKeeper eik;
-                return rc;
-            }
-        }
     }
     catch (std::bad_alloc &)
@@ -5867 +5853 @@
     ReturnComNotImplemented();
 #else // VBOX_WITH_GUEST_PROPS
-    CheckComArgStrNotEmptyOrNull1(aName, 0x80face08);
-    CheckComArgMaybeNull1(aFlags, 0x80face03);
-    CheckComArgMaybeNull1(aValue, 0x80face04);
+    CheckComArgStrNotEmptyOrNull(aName);
+    CheckComArgMaybeNull(aFlags);
+    CheckComArgMaybeNull(aValue);
 
     AutoCaller autoCaller(this);
@@ -5890 +5876 @@
 STDMETHODIMP Machine::DeleteGuestProperty(IN_BSTR aName)
 {
-    HRESULT hrc = SetGuestProperty(aName, NULL, NULL);
-    LogRel(("DeleteGuestProperty: %ls -> %Rhrc\n", aName, hrc)); /* !REMOVE ME! Debugging testboxes! */
-    return hrc;
+    return SetGuestProperty(aName, NULL, NULL);
 }