Changeset 26603 in vbox for trunk/src/VBox/Main/ConsoleImpl.cpp

Timestamp:

Feb 17, 2010 12:24:34 PM (15 years ago)

Author:

vboxsync

Message:

Main: back out r57775

File:

• trunk/src/VBox/Main/ConsoleImpl.cpp (modified) (13 diffs)

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -584 +584 @@
     if (RT_SUCCESS(rc))
     {
-        mMachine->SetGuestProperty(Bstr(pszPropertyName), NULL, Bstr("RDONLYGUEST"));
+        mMachine->SetGuestProperty(Bstr(pszPropertyName), Bstr(""), Bstr("RDONLYGUEST"));
         RTStrFree(pszPropertyName);
     }
@@ -591 +591 @@
     if (RT_SUCCESS(rc))
     {
-        mMachine->SetGuestProperty(Bstr(pszPropertyName), NULL, Bstr("RDONLYGUEST"));
+        mMachine->SetGuestProperty(Bstr(pszPropertyName), Bstr(""), Bstr("RDONLYGUEST"));
         RTStrFree(pszPropertyName);
     }
@@ -598 +598 @@
     if (RT_SUCCESS(rc))
     {
-        mMachine->SetGuestProperty(Bstr(pszPropertyName), NULL, Bstr("RDONLYGUEST"));
+        mMachine->SetGuestProperty(Bstr(pszPropertyName), Bstr(""), Bstr("RDONLYGUEST"));
         RTStrFree(pszPropertyName);
     }
@@ -1190 +1190 @@
 
 // static
-DECLCALLBACK(int) Console::doGuestPropNotification(void *pvExtension,
-                                                   uint32_t u32Function,
-                                                   void *pvParms, uint32_t cbParms)
+DECLCALLBACK(int)
+Console::doGuestPropNotification(void *pvExtension, uint32_t u32Function,
+                                 void *pvParms, uint32_t cbParms)
 {
     using namespace guestProp;
@@ -1212 +1212 @@
     Bstr value(pCBData->pcszValue);
     Bstr flags(pCBData->pcszFlags);
-    ComObjPtr<Console> ptrConsole = reinterpret_cast<Console *>(pvExtension);
-    HRESULT hrc = ptrConsole->mControl->PushGuestProperty(name,
-                                                          value,
-                                                          pCBData->u64Timestamp,
-                                                          flags);
-    if (SUCCEEDED(hrc))
-        rc = VINF_SUCCESS;
+    if (   !name.isNull()
+        && (!value.isNull() || pCBData->pcszValue == NULL)
+        && (!flags.isNull() || pCBData->pcszFlags == NULL)
+       )
+    {
+        ComObjPtr<Console> ptrConsole = reinterpret_cast<Console *>(pvExtension);
+        HRESULT hrc = ptrConsole->mControl->PushGuestProperty(name,
+                                                              value,
+                                                              pCBData->u64Timestamp,
+                                                              flags);
+        if (SUCCEEDED(hrc))
+            rc = VINF_SUCCESS;
+        else
+        {
+            LogFunc(("Console::doGuestPropNotification: hrc=%Rhrc pCBData={.pcszName=%s, .pcszValue=%s, .pcszFlags=%s}\n",
+                     pCBData->pcszName, pCBData->pcszValue, pCBData->pcszFlags));
+            rc = Global::vboxStatusCodeFromCOM(hrc);
+        }
+    }
     else
-    {
-        LogFunc(("Console::doGuestPropNotification: hrc=%Rhrc pCBData={.pcszName=%s, .pcszValue=%s, .pcszFlags=%s}\n",
-                    pCBData->pcszName, pCBData->pcszValue, pCBData->pcszFlags));
-        rc = Global::vboxStatusCodeFromCOM(hrc);
-    }
+        rc = VERR_NO_MEMORY;
     return rc;
 }
@@ -2586 +2594 @@
 {
 #ifdef VBOX_WITH_USB
-    CheckComArgStrNotEmptyOrNull(aAddress);
+    CheckComArgNotNull(aAddress);
     CheckComArgOutPointerValid(aDevice);
 
@@ -2653 +2661 @@
 }
 
-STDMETHODIMP Console::CreateSharedFolder(IN_BSTR aName, IN_BSTR aHostPath, BOOL aWritable)
-{
-    CheckComArgStrNotEmptyOrNull(aName);
-    CheckComArgStrNotEmptyOrNull(aHostPath);
+STDMETHODIMP
+Console::CreateSharedFolder(IN_BSTR aName, IN_BSTR aHostPath, BOOL aWritable)
+{
+    CheckComArgNotNull(aName);
+    CheckComArgNotNull(aHostPath);
 
     AutoCaller autoCaller(this);
@@ -2723 +2732 @@
 STDMETHODIMP Console::RemoveSharedFolder(IN_BSTR aName)
 {
-    CheckComArgStrNotEmptyOrNull(aName);
+    CheckComArgNotNull(aName);
 
     AutoCaller autoCaller(this);
@@ -2789 +2798 @@
     LogFlowThisFunc(("aName='%ls' mMachineState=%08X\n", aName, mMachineState));
 
-    CheckComArgStrNotEmptyOrNull(aName);
+    CheckComArgNotNull(aName);
     CheckComArgOutPointerValid(aProgress);
 
@@ -5025 +5034 @@
                 Bstr hostif;
                 adapter->COMGETTER(HostInterface)(hostif.asOutParam());
-                if (hostif.isEmpty())
+                if (!hostif)
                 {
                     return setError(VBOX_E_HOST_ERROR,
@@ -5081 +5090 @@
         rc = mMachine->COMGETTER(StateFilePath)(savedStateFile.asOutParam());
         if (FAILED(rc)) return rc;
-        ComAssertRet(!savedStateFile.isEmpty(), E_FAIL);
+        ComAssertRet(!!savedStateFile, E_FAIL);
         int vrc = SSMR3ValidateFile(Utf8Str(savedStateFile).c_str(), false /* fChecksumIt */);
         if (RT_FAILURE(vrc))
@@ -5809 +5818 @@
 {
     ComAssertRet(aName && *aName, E_FAIL);
-    ComAssertRet(!aData.mHostPath.isEmpty(), E_FAIL);
+    ComAssertRet(aData.mHostPath, E_FAIL);
 
     /* sanity checks */
@@ -7716 +7725 @@
          * (i.e. creating a snapshot online)
          */
-        ComAssertThrow(    (!pTask->bstrSavedStateFile.isEmpty() && pTask->fTakingSnapshotOnline)
-                        || (pTask->bstrSavedStateFile.isEmpty() && !pTask->fTakingSnapshotOnline),
+        ComAssertThrow(    (!pTask->bstrSavedStateFile.isNull() && pTask->fTakingSnapshotOnline)
+                        || (pTask->bstrSavedStateFile.isNull() && !pTask->fTakingSnapshotOnline),
                        rc = E_FAIL);