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

Timestamp:

Feb 24, 2010 4:24:33 PM (15 years ago)

Author:

vboxsync

Message:

Main: Bstr makeover (third attempt) -- make Bstr(NULL) and Bstr() behave the same; resulting cleanup; make some more internal methods use Utf8Str instead of Bstr; fix a lot of CheckComArgNotNull??() usage

File:

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

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -574 +574 @@
 {
     if (!enabledGuestPropertiesVRDP())
-    {
         return;
-    }
+
+    Bstr bstrReadOnlyGuest(L"RDONLYGUEST");
 
     int rc;
@@ -584 +584 @@
     if (RT_SUCCESS(rc))
     {
-        mMachine->SetGuestProperty(Bstr(pszPropertyName), Bstr(""), Bstr("RDONLYGUEST"));
+        mMachine->SetGuestProperty(Bstr(pszPropertyName), NULL, bstrReadOnlyGuest);
         RTStrFree(pszPropertyName);
     }
@@ -591 +591 @@
     if (RT_SUCCESS(rc))
     {
-        mMachine->SetGuestProperty(Bstr(pszPropertyName), Bstr(""), Bstr("RDONLYGUEST"));
+        mMachine->SetGuestProperty(Bstr(pszPropertyName), NULL, bstrReadOnlyGuest);
         RTStrFree(pszPropertyName);
     }
@@ -598 +598 @@
     if (RT_SUCCESS(rc))
     {
-        mMachine->SetGuestProperty(Bstr(pszPropertyName), Bstr(""), Bstr("RDONLYGUEST"));
+        mMachine->SetGuestProperty(Bstr(pszPropertyName), NULL, bstrReadOnlyGuest);
         RTStrFree(pszPropertyName);
     }
@@ -606 +606 @@
     if (RT_SUCCESS(rc))
     {
-        mMachine->SetGuestProperty(Bstr("/VirtualBox/HostInfo/VRDP/LastDisconnectedClient"), Bstr(pszClientId), Bstr("RDONLYGUEST"));
+        mMachine->SetGuestProperty(Bstr("/VirtualBox/HostInfo/VRDP/LastDisconnectedClient"), Bstr(pszClientId), bstrReadOnlyGuest);
         RTStrFree(pszClientId);
     }
@@ -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 +1213 @@
     Bstr value(pCBData->pcszValue);
     Bstr flags(pCBData->pcszFlags);
-    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);
-        }
-    }
+    ComObjPtr<Console> ptrConsole = reinterpret_cast<Console *>(pvExtension);
+    HRESULT hrc = ptrConsole->mControl->PushGuestProperty(name,
+                                                          value,
+                                                          pCBData->u64Timestamp,
+                                                          flags);
+    if (SUCCEEDED(hrc))
+        rc = VINF_SUCCESS;
     else
-        rc = VERR_NO_MEMORY;
+    {
+        LogFunc(("Console::doGuestPropNotification: hrc=%Rhrc pCBData={.pcszName=%s, .pcszValue=%s, .pcszFlags=%s}\n",
+                 pCBData->pcszName, pCBData->pcszValue, pCBData->pcszFlags));
+        rc = Global::vboxStatusCodeFromCOM(hrc);
+    }
     return rc;
 }
@@ -1248 +1241 @@
     Utf8Str utf8Patterns(aPatterns);
     parm[0].type = VBOX_HGCM_SVC_PARM_PTR;
+    // mutableRaw() returns NULL for an empty string
+//     if ((parm[0].u.pointer.addr = utf8Patterns.mutableRaw()))
+//         parm[0].u.pointer.size = (uint32_t)utf8Patterns.length() + 1;
+//     else
+//     {
+//         parm[0].u.pointer.addr = (void*)"";
+//         parm[0].u.pointer.size = 1;
+//     }
     parm[0].u.pointer.addr = utf8Patterns.mutableRaw();
     parm[0].u.pointer.size = (uint32_t)utf8Patterns.length() + 1;
@@ -1364 +1365 @@
     try
     {
-        Bstr                pattern("");
-        hrc = doEnumerateGuestProperties(pattern, ComSafeArrayAsOutParam(namesOut),
+        Bstr pattern;
+        hrc = doEnumerateGuestProperties(pattern,
+                                         ComSafeArrayAsOutParam(namesOut),
                                          ComSafeArrayAsOutParam(valuesOut),
                                          ComSafeArrayAsOutParam(timestampsOut),
@@ -1371 +1373 @@
         if (SUCCEEDED(hrc))
         {
-            std::vector <BSTR>      names;
-            std::vector <BSTR>      values;
-            std::vector <ULONG64>   timestamps;
-            std::vector <BSTR>      flags;
+            std::vector<BSTR>      names;
+            std::vector<BSTR>      values;
+            std::vector<ULONG64>   timestamps;
+            std::vector<BSTR>      flags;
             for (size_t i = 0; i < namesOut.size(); ++i)
             {
@@ -1392 +1394 @@
             com::SafeArray<ULONG64> timestampsIn(timestamps);
             com::SafeArray<BSTR>    flagsIn(flags);
-            if (   namesIn.isNull()
-                || valuesIn.isNull()
-                || timestampsIn.isNull()
-                || flagsIn.isNull()
-               )
-                throw std::bad_alloc();
             /* PushGuestProperties() calls DiscardSettings(), which calls us back */
             mControl->PushGuestProperties(ComSafeArrayAsInParam(namesIn),
@@ -2594 +2590 @@
 {
 #ifdef VBOX_WITH_USB
-    CheckComArgNotNull(aAddress);
+    CheckComArgStrNotEmptyOrNull(aAddress);
     CheckComArgOutPointerValid(aDevice);
 
@@ -2664 +2660 @@
 Console::CreateSharedFolder(IN_BSTR aName, IN_BSTR aHostPath, BOOL aWritable)
 {
-    CheckComArgNotNull(aName);
-    CheckComArgNotNull(aHostPath);
+    CheckComArgStrNotEmptyOrNull(aName);
+    CheckComArgStrNotEmptyOrNull(aHostPath);
 
     AutoCaller autoCaller(this);
@@ -2732 +2728 @@
 STDMETHODIMP Console::RemoveSharedFolder(IN_BSTR aName)
 {
-    CheckComArgNotNull(aName);
+    CheckComArgStrNotEmptyOrNull(aName);
 
     AutoCaller autoCaller(this);
@@ -2798 +2794 @@
     LogFlowThisFunc(("aName='%ls' mMachineState=%08X\n", aName, mMachineState));
 
-    CheckComArgNotNull(aName);
+    CheckComArgStrNotEmptyOrNull(aName);
     CheckComArgOutPointerValid(aProgress);
 
@@ -7725 +7721 @@
          * (i.e. creating a snapshot online)
          */
-        ComAssertThrow(    (!pTask->bstrSavedStateFile.isNull() && pTask->fTakingSnapshotOnline)
-                        || (pTask->bstrSavedStateFile.isNull() && !pTask->fTakingSnapshotOnline),
+        ComAssertThrow(    (!pTask->bstrSavedStateFile.isEmpty() &&  pTask->fTakingSnapshotOnline)
+                        || ( pTask->bstrSavedStateFile.isEmpty() && !pTask->fTakingSnapshotOnline),
                        rc = E_FAIL);
 
@@ -8040 +8036 @@
             task->mProgress->notifyComplete(rc,
                                             COM_IIDOF(IConsole),
-                                            Console::getComponentName(),
+                                            (CBSTR)Console::getComponentName(),
                                             errMsg.c_str());
         else