Changeset 26553 in vbox for trunk/src/VBox/Main

Timestamp:

Feb 15, 2010 5:34:29 PM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

57732

Message:

Main: backing out r57728 + r57730 which burn on windows

Location:

trunk/src/VBox/Main

Files:

• ApplianceImpl.cpp (modified) (11 diffs)
• ConsoleImpl.cpp (modified) (10 diffs)
• ConsoleImpl2.cpp (modified) (2 diffs)
• ConsoleImplTeleporter.cpp (modified) (2 diffs)
• GuestImpl.cpp (modified) (6 diffs)
• HostImpl.cpp (modified) (3 diffs)
• HostNetworkInterfaceImpl.cpp (modified) (2 diffs)
• MachineImpl.cpp (modified) (28 diffs)
• Matching.cpp (modified) (1 diff)
• MediumImpl.cpp (modified) (10 diffs)
• NetworkAdapterImpl.cpp (modified) (2 diffs)
• ProgressImpl.cpp (modified) (15 diffs)
• RemoteUSBDeviceImpl.cpp (modified) (2 diffs)
• SessionImpl.cpp (modified) (2 diffs)
• SharedFolderImpl.cpp (modified) (1 diff)
• SnapshotImpl.cpp (modified) (2 diffs)
• SystemPropertiesImpl.cpp (modified) (2 diffs)
• USBControllerImpl.cpp (modified) (3 diffs)
• USBDeviceImpl.cpp (modified) (1 diff)
• VirtualBoxBase.cpp (modified) (3 diffs)
• VirtualBoxImpl.cpp (modified) (52 diffs)
• generic/NetIf-generic.cpp (modified) (1 diff)
• glue/ErrorInfo.cpp (modified) (1 diff)
• include/ApplianceImpl.h (modified) (1 diff)
• include/ProgressImpl.h (modified) (9 diffs)
• include/VirtualBoxImpl.h (modified) (1 diff)
• xml/Settings.cpp (modified) (1 diff)

trunk/src/VBox/Main/ApplianceImpl.cpp

@@ -370 +370 @@
     int i = 1;
     /* @todo: Maybe too cost-intensive; try to find a lighter way */
-    while (mVirtualBox->FindMachine(Bstr(tmpName).raw(), &machine) != VBOX_E_OBJECT_NOT_FOUND)
+    while (mVirtualBox->FindMachine(Bstr(tmpName), &machine) != VBOX_E_OBJECT_NOT_FOUND)
     {
         RTStrFree(tmpName);
@@ -391 +391 @@
     /* @todo: Maybe too cost-intensive; try to find a lighter way */
     while (RTPathExists(tmpName) ||
-           mVirtualBox->FindHardDisk(Bstr(tmpName).raw(), &harddisk) != VBOX_E_OBJECT_NOT_FOUND)
+           mVirtualBox->FindHardDisk(Bstr(tmpName), &harddisk) != VBOX_E_OBJECT_NOT_FOUND)
     {
         RTStrFree(tmpName);
@@ -501 +501 @@
 }
 
-HRESULT Appliance::setUpProgressFS(ComObjPtr<Progress> &pProgress, const Utf8Str &strDescription)
+HRESULT Appliance::setUpProgressFS(ComObjPtr<Progress> &pProgress, const Bstr &bstrDescription)
 {
     HRESULT rc;
@@ -532 +532 @@
 
     rc = pProgress->init(mVirtualBox, static_cast<IAppliance*>(this),
-                         strDescription,
+                         bstrDescription,
                          TRUE /* aCancelable */,
                          cOperations, // ULONG cOperations,
                          ulTotalOperationsWeight, // ULONG ulTotalOperationsWeight,
-                         strDescription, // CBSTR bstrFirstOperationDescription,
+                         bstrDescription, // CBSTR bstrFirstOperationDescription,
                          m->ulWeightPerOperation); // ULONG ulFirstOperationWeight,
     return rc;
 }
 
-HRESULT Appliance::setUpProgressImportS3(ComObjPtr<Progress> &pProgress, const Utf8Str &strDescription)
+HRESULT Appliance::setUpProgressImportS3(ComObjPtr<Progress> &pProgress, const Bstr &bstrDescription)
 {
     HRESULT rc;
@@ -572 +572 @@
 
     rc = pProgress->init(mVirtualBox, static_cast<IAppliance*>(this),
-                         strDescription,
+                         bstrDescription,
                          TRUE /* aCancelable */,
                          cOperations, // ULONG cOperations,
                          ulTotalOperationsWeight, // ULONG ulTotalOperationsWeight,
-                         tr("Init"), // CBSTR bstrFirstOperationDescription,
+                         Bstr(tr("Init")), // CBSTR bstrFirstOperationDescription,
                          ulInitWeight); // ULONG ulFirstOperationWeight,
     return rc;
 }
 
-HRESULT Appliance::setUpProgressWriteS3(ComObjPtr<Progress> &pProgress, const Utf8Str &strDescription)
+HRESULT Appliance::setUpProgressWriteS3(ComObjPtr<Progress> &pProgress, const Bstr &bstrDescription)
 {
     HRESULT rc;
@@ -614 +614 @@
 
     rc = pProgress->init(mVirtualBox, static_cast<IAppliance*>(this),
-                         strDescription,
+                         bstrDescription,
                          TRUE /* aCancelable */,
                          cOperations, // ULONG cOperations,
                          ulTotalOperationsWeight, // ULONG ulTotalOperationsWeight,
-                         strDescription, // CBSTR bstrFirstOperationDescription,
+                         bstrDescription, // CBSTR bstrFirstOperationDescription,
                          ulOVFCreationWeight); // ULONG ulFirstOperationWeight,
     return rc;
@@ -837 +837 @@
     task->locInfo = aLocInfo;
 
-    Utf8Str progressDesc = Utf8StrFmt(tr("Import appliance '%s'"),
-                                      aLocInfo.strPath.c_str());
+    Bstr progressDesc = BstrFmt(tr("Import appliance '%s'"),
+                                aLocInfo.strPath.c_str());
 
     HRESULT rc = S_OK;
@@ -1569 +1569 @@
                                                     mhda.lDevice,
                                                     DeviceType_Floppy,
-                                                    NULL);
+                                                    Bstr(""));
                         if (FAILED(rc)) throw rc;
 
@@ -1618 +1618 @@
                                                     mhda.lDevice,
                                                     DeviceType_DVD,
-                                                    NULL);
+                                                    Bstr(""));
                         if (FAILED(rc)) throw rc;
 
@@ -1744 +1744 @@
                             rc = mVirtualBox->OpenHardDisk(Bstr(strSrcFilePath),
                                                            AccessMode_ReadOnly,
-                                                           false, NULL, false, NULL,
+                                                           false, Bstr(""), false, Bstr(""),
                                                            srcHdVBox.asOutParam());
                             if (FAILED(rc)) throw rc;
@@ -4281 +4281 @@
                                                       IN_BSTR aExtraConfigValue)
 {
+    CheckComArgNotNull(aVboxValue);
+    CheckComArgNotNull(aExtraConfigValue);
+
     AutoCaller autoCaller(this);
     if (FAILED(autoCaller.rc())) return autoCaller.rc();

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);
 
@@ -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);
 

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -3155 +3155 @@
                 }
 
-                if (!networkName.isEmpty())
+                if (!networkName.isNull())
                 {
                     /*
@@ -3162 +3162 @@
                      */
                     ComPtr<IDHCPServer> dhcpServer;
-                    hrc = virtualBox->FindDHCPServerByNetworkName(networkName.raw(), dhcpServer.asOutParam());
+                    hrc = virtualBox->FindDHCPServerByNetworkName(networkName.mutableRaw(), dhcpServer.asOutParam());
                     if (SUCCEEDED(hrc))
                     {

trunk/src/VBox/Main/ConsoleImplTeleporter.cpp

@@ -894 +894 @@
  * @param   aProgress       Where to return the progress object.
  */
-STDMETHODIMP Console::Teleport(IN_BSTR aHostname,
-                               ULONG aPort,
-                               IN_BSTR aPassword,
-                               ULONG aMaxDowntime,
-                               IProgress **aProgress)
+STDMETHODIMP
+Console::Teleport(IN_BSTR aHostname, ULONG aPort, IN_BSTR aPassword, ULONG aMaxDowntime, IProgress **aProgress)
 {
     /*
@@ -906 +903 @@
     CheckComArgOutPointerValid(aProgress);
     CheckComArgStrNotEmptyOrNull(aHostname);
+    CheckComArgNotNull(aHostname);
     CheckComArgExprMsg(aPort, aPort > 0 && aPort <= 65535, ("is %u", aPort));
     CheckComArgExprMsg(aMaxDowntime, aMaxDowntime > 0, ("is %u", aMaxDowntime));

trunk/src/VBox/Main/GuestImpl.cpp

@@ -127 +127 @@
 
     // redirect the call to IMachine if no additions are installed
-    if (mData.mAdditionsVersion.isEmpty())
-        return mParent->machine()->COMGETTER(OSTypeId)(aOSTypeId);
+    if (mData.mAdditionsVersion.isNull())
+        return mParent->machine()->COMGETTER(OSTypeId) (aOSTypeId);
 
     mData.mOSTypeId.cloneTo(aOSTypeId);
@@ -135 +135 @@
 }
 
-STDMETHODIMP Guest::COMGETTER(AdditionsActive)(BOOL *aAdditionsActive)
+STDMETHODIMP Guest::COMGETTER(AdditionsActive) (BOOL *aAdditionsActive)
 {
     CheckComArgOutPointerValid(aAdditionsActive);
@@ -262 +262 @@
                                    IN_BSTR aDomain, BOOL aAllowInteractiveLogon)
 {
+    CheckComArgNotNull(aUserName);
+    CheckComArgNotNull(aPassword);
+    CheckComArgNotNull(aDomain);
+
     AutoCaller autoCaller(this);
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
@@ -274 +278 @@
 
         vmmDev->getVMMDevPort()->pfnSetCredentials(vmmDev->getVMMDevPort(),
-                                                   Utf8Str(aUserName).raw(),
-                                                   Utf8Str(aPassword).raw(),
-                                                   Utf8Str(aDomain).raw(),
-                                                   u32Flags);
+            Utf8Str(aUserName).raw(), Utf8Str(aPassword).raw(),
+            Utf8Str(aDomain).raw(), u32Flags);
         return S_OK;
     }
@@ -315 +317 @@
 void Guest::setAdditionsVersion (Bstr aVersion, VBOXOSTYPE aOsType)
 {
-    Assert(aVersion.isEmpty() || !aVersion.isEmpty());
+    Assert(aVersion.isNull() || !aVersion.isEmpty());
 
     AutoCaller autoCaller(this);
@@ -323 +325 @@
 
     mData.mAdditionsVersion = aVersion;
-    mData.mAdditionsActive = !aVersion.isEmpty();
-
-    mData.mOSTypeId = Global::OSTypeId(aOsType);
+    mData.mAdditionsActive = !aVersion.isNull();
+
+    mData.mOSTypeId = Global::OSTypeId (aOsType);
 }
 

trunk/src/VBox/Main/HostImpl.cpp

@@ -1290 +1290 @@
 STDMETHODIMP Host::FindHostDVDDrive(IN_BSTR aName, IMedium **aDrive)
 {
-    CheckComArgStrNotEmptyOrNull(aName);
+    CheckComArgNotNull(aName);
     CheckComArgOutPointerValid(aDrive);
 
@@ -1317 +1317 @@
 STDMETHODIMP Host::FindHostFloppyDrive(IN_BSTR aName, IMedium **aDrive)
 {
-    CheckComArgStrNotEmptyOrNull(aName);
+    CheckComArgNotNull(aName);
     CheckComArgOutPointerValid(aDrive);
 
@@ -1451 +1451 @@
 {
 #ifdef VBOX_WITH_USB
-    CheckComArgStrNotEmptyOrNull(aAddress);
+    CheckComArgNotNull(aAddress);
     CheckComArgOutPointerValid(aDevice);
 

trunk/src/VBox/Main/HostNetworkInterfaceImpl.cpp

@@ -56 +56 @@
  * @param   aGuid GUID of the host network interface
  */
-HRESULT HostNetworkInterface::init(Bstr aInterfaceName, Guid aGuid, HostNetworkInterfaceType_T ifType)
+HRESULT HostNetworkInterface::init (Bstr aInterfaceName, Guid aGuid, HostNetworkInterfaceType_T ifType)
 {
     LogFlowThisFunc(("aInterfaceName={%ls}, aGuid={%s}\n",
-                     aInterfaceName.raw(), aGuid.toString().raw()));
+                      aInterfaceName.raw(), aGuid.toString().raw()));
 
     ComAssertRet(aInterfaceName, E_INVALIDARG);
@@ -423 +423 @@
             {
                 m.realIPAddress = 0;
-                if (FAILED(mVBox->SetExtraData(Bstr(Utf8StrFmt("HostOnly/%ls/IPAddress", mInterfaceName.raw())), NULL)))
+                if (FAILED(mVBox->SetExtraData(Bstr(Utf8StrFmt("HostOnly/%ls/IPAddress", mInterfaceName.raw())), Bstr(""))))
                     return E_FAIL;
-                if (FAILED(mVBox->SetExtraData(Bstr(Utf8StrFmt("HostOnly/%ls/IPNetMask", mInterfaceName.raw())), NULL)))
+                if (FAILED(mVBox->SetExtraData(Bstr(Utf8StrFmt("HostOnly/%ls/IPNetMask", mInterfaceName.raw())), Bstr(""))))
                     return E_FAIL;
                 return S_OK;

trunk/src/VBox/Main/MachineImpl.cpp

@@ -697 +697 @@
 STDMETHODIMP Machine::COMSETTER(Name)(IN_BSTR aName)
 {
-    if (!aName || !*aName)
+    CheckComArgNotNull(aName);
+
+    if (!*aName)
         return setError(E_INVALIDARG,
                         tr("Machine name cannot be empty"));
@@ -777 +779 @@
 STDMETHODIMP Machine::COMSETTER(OSTypeId)(IN_BSTR aOSTypeId)
 {
-    CheckComArgStrNotEmptyOrNull(aOSTypeId);
+    CheckComArgNotNull(aOSTypeId);
 
     AutoCaller autoCaller(this);
@@ -1928 +1930 @@
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    mData->mSession.mType.cloneTo(aSessionType);
+    if (mData->mSession.mType.isNull())
+        Bstr("").cloneTo(aSessionType);
+    else
+        mData->mSession.mType.cloneTo(aSessionType);
 
     return S_OK;
@@ -1985 +1990 @@
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    mSSData->mStateFilePath.cloneTo(aStateFilePath);
+    if (mSSData->mStateFilePath.isEmpty())
+        Bstr("").cloneTo(aStateFilePath);
+    else
+        mSSData->mStateFilePath.cloneTo(aStateFilePath);
 
     return S_OK;
@@ -2126 +2134 @@
 }
 
-STDMETHODIMP Machine::COMSETTER(GuestPropertyNotificationPatterns)(IN_BSTR aPatterns)
-{
+STDMETHODIMP
+Machine::COMSETTER(GuestPropertyNotificationPatterns)(IN_BSTR aPatterns)
+{
+    CheckComArgNotNull(aPatterns);
     AutoCaller autoCaller(this);
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
@@ -2390 +2400 @@
                                    IN_BSTR aId)
 {
-    CheckComArgStrNotEmptyOrNull(aControllerName);
-
     LogFlowThisFunc(("aControllerName=\"%ls\" aControllerPort=%d aDevice=%d aType=%d aId=\"%ls\"\n",
                      aControllerName, aControllerPort, aDevice, aType, aId));
+
+    CheckComArgNotNull(aControllerName);
+    CheckComArgNotNull(aId);
 
     AutoCaller autoCaller(this);
@@ -2815 +2826 @@
                                    LONG aDevice)
 {
-    CheckComArgStrNotEmptyOrNull(aControllerName);
+    CheckComArgNotNull(aControllerName);
 
     LogFlowThisFunc(("aControllerName=\"%ls\" aControllerPort=%ld aDevice=%ld\n",
@@ -2900 +2911 @@
                                         LONG aDevice, BOOL aPassthrough)
 {
-    CheckComArgStrNotEmptyOrNull(aControllerName);
+    CheckComArgNotNull(aControllerName);
 
     LogFlowThisFunc(("aControllerName=\"%ls\" aControllerPort=%ld aDevice=%ld aPassthrough=%d\n",
@@ -2954 +2965 @@
                      aControllerName, aControllerPort, aDevice, aForce));
 
-    CheckComArgStrNotEmptyOrNull(aControllerName);
+    CheckComArgNotNull(aControllerName);
+    CheckComArgNotNull(aId);
 
     AutoCaller autoCaller(this);
@@ -3094 +3106 @@
                      aControllerName, aControllerPort, aDevice));
 
-    CheckComArgStrNotEmptyOrNull(aControllerName);
+    CheckComArgNotNull(aControllerName);
     CheckComArgOutPointerValid(aMedium);
 
@@ -3193 +3205 @@
                                    BSTR *aValue)
 {
-    CheckComArgStrNotEmptyOrNull(aKey);
+    CheckComArgNotNull(aKey);
     CheckComArgOutPointerValid(aValue);
 
@@ -3200 +3212 @@
 
     /* start with nothing found */
-    Bstr bstrResult;
+    Bstr bstrResult("");
 
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
@@ -3220 +3232 @@
 STDMETHODIMP Machine::SetExtraData(IN_BSTR aKey, IN_BSTR aValue)
 {
-    CheckComArgStrNotEmptyOrNull(aKey);
+    CheckComArgNotNull(aKey);
 
     AutoCaller autoCaller(this);
@@ -3251 +3263 @@
         // lock to copy the list of callbacks to invoke
         Bstr error;
-        Bstr bstrValue(aValue);
+        Bstr bstrValue;
+        if (aValue)
+            bstrValue = aValue;
+        else
+            bstrValue = (const char *)"";
 
         if (!mParent->onExtraDataCanChange(mData->mUuid, aKey, bstrValue, error))
         {
             const char *sep = error.isEmpty() ? "" : ": ";
-            CBSTR err = error.raw();
+            CBSTR err = error.isNull() ? (CBSTR) L"" : error.raw();
             LogWarningFunc(("Someone vetoed! Change refused%s%ls\n",
                             sep, err));
@@ -3440 +3456 @@
 STDMETHODIMP Machine::FindSnapshot(IN_BSTR aName, ISnapshot **aSnapshot)
 {
-    CheckComArgStrNotEmptyOrNull(aName);
+    CheckComArgNotNull(aName);
     CheckComArgOutPointerValid(aSnapshot);
 
@@ -3466 +3482 @@
 STDMETHODIMP Machine::CreateSharedFolder(IN_BSTR aName, IN_BSTR aHostPath, BOOL aWritable)
 {
-    CheckComArgStrNotEmptyOrNull(aName);
-    CheckComArgStrNotEmptyOrNull(aHostPath);
+    CheckComArgNotNull(aName);
+    CheckComArgNotNull(aHostPath);
 
     AutoCaller autoCaller(this);
@@ -3501 +3517 @@
 STDMETHODIMP Machine::RemoveSharedFolder(IN_BSTR aName)
 {
-    CheckComArgStrNotEmptyOrNull(aName);
+    CheckComArgNotNull(aName);
 
     AutoCaller autoCaller(this);
@@ -3591 +3607 @@
     ReturnComNotImplemented();
 #else // VBOX_WITH_GUEST_PROPS
-    CheckComArgStrNotEmptyOrNull(aName);
+    CheckComArgNotNull(aName);
     CheckComArgOutPointerValid(aValue);
     CheckComArgOutPointerValid(aTimestamp);
@@ -3670 +3686 @@
     using namespace guestProp;
 
-    CheckComArgStrNotEmptyOrNull(aName);
+    CheckComArgNotNull(aName);
+    CheckComArgNotNull(aValue);
     if ((aFlags != NULL) && !VALID_PTR(aFlags))
         return E_INVALIDARG;
@@ -3679 +3696 @@
     {
         Utf8Str utf8Name(aName);
-        Utf8Str utf8Value(aValue);
         Utf8Str utf8Flags(aFlags);
 
@@ -3735 +3751 @@
             if (found && SUCCEEDED(rc))
             {
-                if (utf8Value.length())
+                if (*aValue)
                 {
                     RTTIMESPEC time;
-                    property.strValue = utf8Value;
+                    property.strValue = aValue;
                     property.mTimestamp = RTTimeSpecGetNano(RTTimeNow(&time));
                     if (aFlags != NULL)
@@ -3745 +3761 @@
                 }
             }
-            else if (SUCCEEDED(rc) && utf8Value.length())
+            else if (SUCCEEDED(rc) && *aValue)
             {
                 RTTIMESPEC time;
@@ -3751 +3767 @@
                 mHWData.backup();
                 property.strName = aName;
-                property.strValue = utf8Value;
+                property.strValue = aValue;
                 property.mTimestamp = RTTimeSpecGetNano(RTTimeNow(&time));
                 property.mFlags = fFlags;
@@ -3769 +3785 @@
         else
         {
-            ComPtr<IInternalSessionControl> directControl = mData->mSession.mDirectControl;
+            ComPtr<IInternalSessionControl> directControl =
+                mData->mSession.mDirectControl;
 
             /* just be on the safe side when calling another process */
@@ -3780 +3797 @@
             else
                 rc = directControl->AccessGuestProperty(aName,
-                                                        aValue,
+                                                        *aValue ? aValue : NULL,  /** @todo Fix when adding DeleteGuestProperty(), see defect. */
                                                         aFlags,
                                                         true /* isSetter */,
@@ -3914 +3931 @@
                      aControllerName, aControllerPort, aDevice));
 
-    CheckComArgStrNotEmptyOrNull(aControllerName);
+    CheckComArgNotNull(aControllerName);
     CheckComArgOutPointerValid(aAttachment);
 
@@ -8930 +8947 @@
 #endif /* VBOX_WITH_USB */
 
-    if (!mData->mSession.mType.isEmpty())
+    if (!mData->mSession.mType.isNull())
     {
         /* mType is not null when this machine's process has been started by
@@ -9638 +9655 @@
     using namespace guestProp;
 
-    CheckComArgStrNotEmptyOrNull(aName);
-    if (aValue && *aValue && (!VALID_PTR(aValue) || !VALID_PTR(aFlags)))
+    CheckComArgNotNull(aName);
+    if (aValue != NULL && (!VALID_PTR(aValue) || !VALID_PTR(aFlags)))
         return E_POINTER;  /* aValue can be NULL to indicate deletion */
 

trunk/src/VBox/Main/Matching.cpp

@@ -198 +198 @@
     return
         mSimple.isEmpty() ||
-        (mIgnoreCase && mSimple.compare(aValue, Bstr::CaseInsensitive) == 0) ||
-        (!mIgnoreCase && mSimple.compare(aValue) == 0);
+        (mIgnoreCase && mSimple.compareIgnoreCase (aValue) == 0) ||
+        (!mIgnoreCase && mSimple.compare (aValue) == 0);
 }
 

trunk/src/VBox/Main/MediumImpl.cpp

@@ -1361 +1361 @@
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    m->strDescription.cloneTo(aDescription);
+    if (m->strDescription.isEmpty())
+        Bstr("").cloneTo(aDescription);
+    else
+        m->strDescription.cloneTo(aDescription);
 
     return S_OK;
@@ -1368 +1371 @@
 STDMETHODIMP Medium::COMSETTER(Description)(IN_BSTR aDescription)
 {
+    CheckComArgNotNull(aDescription);
+
     AutoCaller autoCaller(this);
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
@@ -1410 +1415 @@
 STDMETHODIMP Medium::COMSETTER(Location)(IN_BSTR aLocation)
 {
-    CheckComArgStrNotEmptyOrNull(aLocation);
+    CheckComArgNotNull(aLocation);
 
     AutoCaller autoCaller(this);
@@ -1720 +1725 @@
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    m->strLastAccessError.cloneTo(aLastAccessError);
+    if (m->strLastAccessError.isEmpty())
+        Bstr("").cloneTo(aLastAccessError);
+    else
+        m->strLastAccessError.cloneTo(aLastAccessError);
 
     return S_OK;
@@ -2094 +2102 @@
                         tr("Property '%ls' does not exist"), aName);
 
-    it->second.cloneTo(aValue);
+    if (it->second.isEmpty())
+        Bstr("").cloneTo(aValue);
+    else
+        it->second.cloneTo(aValue);
 
     return S_OK;
@@ -2158 +2169 @@
     {
         it->first.cloneTo(&names[i]);
-        it->second.cloneTo(&values[i]);
+        if (it->second.isEmpty())
+            Bstr("").cloneTo(&values[i]);
+        else
+            it->second.cloneTo(&values[i]);
         ++ i;
     }
@@ -2348 +2362 @@
 
 STDMETHODIMP Medium::CloneTo(IMedium *aTarget,
-                             MediumVariant_T aVariant,
-                             IMedium *aParent,
-                             IProgress **aProgress)
+                              MediumVariant_T aVariant,
+                              IMedium *aParent,
+                              IProgress **aProgress)
 {
     CheckComArgNotNull(aTarget);
@@ -3076 +3090 @@
     {
         /* only save properties that have non-default values */
-        if (!it->second.isEmpty())
+        if (!it->second.isNull())
         {
             Utf8Str name = it->first;
@@ -4844 +4858 @@
 
     /* we interpret null values as "no value" in Medium */
-    if (it->second.isEmpty())
+    if (it->second.isNull())
         return VERR_CFGM_VALUE_NOT_FOUND;
 
@@ -4871 +4885 @@
 
     /* we interpret null values as "no value" in Medium */
-    if (it->second.isEmpty())
+    if (it->second.isNull())
         return VERR_CFGM_VALUE_NOT_FOUND;
 

trunk/src/VBox/Main/NetworkAdapterImpl.cpp

@@ -1026 +1026 @@
         case NetworkAttachmentType_NAT:
             mData->mNATNetwork = data.strName;
+            if (mData->mNATNetwork.isNull())
+                mData->mNATNetwork = "";
             rc = AttachToNAT();
             if (FAILED(rc)) return rc;
@@ -1039 +1041 @@
         case NetworkAttachmentType_Internal:
             mData->mInternalNetwork = data.strName;
-            Assert(!mData->mInternalNetwork.isEmpty());
+            Assert(!mData->mInternalNetwork.isNull());
 
             rc = AttachToInternalNetwork();

trunk/src/VBox/Main/ProgressImpl.cpp

@@ -97 +97 @@
  * @return              COM result indicator.
  */
-HRESULT ProgressBase::protectedInit(AutoInitSpan &aAutoInitSpan,
+HRESULT ProgressBase::protectedInit (AutoInitSpan &aAutoInitSpan,
 #if !defined (VBOX_COM_INPROC)
-                                    VirtualBox *aParent,
+                            VirtualBox *aParent,
 #endif
-                                    IUnknown *aInitiator,
-                                    const Utf8Str &strDescription,
-                                    OUT_GUID aId /* = NULL */)
+                            IUnknown *aInitiator,
+                            CBSTR aDescription, OUT_GUID aId /* = NULL */)
 {
     /* Guarantees subclasses call this method at the proper time */
@@ -117 +116 @@
 #endif
 
-    AssertReturn(!strDescription.isEmpty(), E_INVALIDARG);
+    AssertReturn(aDescription, E_INVALIDARG);
 
 #if !defined (VBOX_COM_INPROC)
@@ -144 +143 @@
 #endif
 
-    unconst(m_strDescription) = strDescription;
+    unconst(mDescription) = aDescription;
 
     return S_OK;
@@ -221 +220 @@
 
     /* mDescription is constant during life time, no need to lock */
-    m_strDescription.cloneTo(aDescription);
+    mDescription.cloneTo(aDescription);
 
     return S_OK;
@@ -466 +465 @@
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    m_strOperationDescription.cloneTo(aOperationDescription);
+    m_bstrOperationDescription.cloneTo(aOperationDescription);
 
     return S_OK;
@@ -664 +663 @@
 #endif
                         IUnknown *aInitiator,
-                        const Utf8Str &strDescription,
+                        CBSTR aDescription,
                         BOOL aCancelable,
                         ULONG cOperations,
                         ULONG ulTotalOperationsWeight,
-                        const Utf8Str &strFirstOperationDescription,
+                        CBSTR bstrFirstOperationDescription,
                         ULONG ulFirstOperationWeight,
                         OUT_GUID aId /* = NULL */)
 {
-    LogFlowThisFunc(("aDescription=\"%s\", cOperations=%d, ulTotalOperationsWeight=%d, strFirstOperationDescription=\"%s\", ulFirstOperationWeight=%d\n",
-                     strDescription.c_str(),
+    LogFlowThisFunc(("aDescription=\"%ls\", cOperations=%d, ulTotalOperationsWeight=%d, bstrFirstOperationDescription=\"%ls\", ulFirstOperationWeight=%d\n",
+                     aDescription,
                      cOperations,
                      ulTotalOperationsWeight,
-                     strFirstOperationDescription.c_str(),
+                     bstrFirstOperationDescription,
                      ulFirstOperationWeight));
 
-    AssertReturn(!strFirstOperationDescription.isEmpty(), E_INVALIDARG);
+    AssertReturn(bstrFirstOperationDescription, E_INVALIDARG);
     AssertReturn(ulTotalOperationsWeight >= 1, E_INVALIDARG);
 
@@ -688 +687 @@
     HRESULT rc = S_OK;
 
-    rc = ProgressBase::protectedInit(autoInitSpan,
+    rc = ProgressBase::protectedInit (autoInitSpan,
 #if !defined (VBOX_COM_INPROC)
-                                     aParent,
+                                      aParent,
 #endif
-                                     aInitiator,
-                                     strDescription,
-                                     aId);
+                                      aInitiator, aDescription, aId);
     if (FAILED(rc)) return rc;
 
@@ -703 +700 @@
     m_ulOperationsCompletedWeight = 0;
     m_ulCurrentOperation = 0;
-    m_strOperationDescription = strFirstOperationDescription;
+    m_bstrOperationDescription = bstrFirstOperationDescription;
     m_ulCurrentOperationWeight = ulFirstOperationWeight;
     m_ulOperationPercent = 0;
@@ -736 +733 @@
 HRESULT Progress::init(BOOL aCancelable,
                        ULONG aOperationCount,
-                       const Utf8Str &strOperationDescription)
-{
-    LogFlowThisFunc(("aOperationDescription=\"%s\"\n", strOperationDescription.c_str()));
+                       CBSTR aOperationDescription)
+{
+    LogFlowThisFunc(("aOperationDescription=\"%ls\"\n", aOperationDescription));
 
     /* Enclose the state transition NotReady->InInit->Ready */
@@ -746 +743 @@
     HRESULT rc = S_OK;
 
-    rc = ProgressBase::protectedInit(autoInitSpan);
+    rc = ProgressBase::protectedInit (autoInitSpan);
     if (FAILED(rc)) return rc;
 
@@ -757 +754 @@
     m_ulOperationsCompletedWeight = 0;
     m_ulCurrentOperation = 0;
-    m_strOperationDescription = strOperationDescription;
+    m_bstrOperationDescription = aOperationDescription;
     m_ulCurrentOperationWeight = 1;
     m_ulOperationPercent = 0;
 
-    int vrc = RTSemEventMultiCreate(&mCompletedSem);
-    ComAssertRCRet(vrc, E_FAIL);
-
-    RTSemEventMultiReset(mCompletedSem);
+    int vrc = RTSemEventMultiCreate (&mCompletedSem);
+    ComAssertRCRet (vrc, E_FAIL);
+
+    RTSemEventMultiReset (mCompletedSem);
 
     /* Confirm a successful initialization when it's the case */
@@ -790 +787 @@
     if (mWaitersCount > 0)
     {
-        LogFlow (("WARNING: There are still %d threads waiting for '%s' completion!\n",
-                  mWaitersCount, m_strDescription.c_str()));
-        RTSemEventMultiSignal(mCompletedSem);
+        LogFlow (("WARNING: There are still %d threads waiting for '%ls' completion!\n",
+                  mWaitersCount, mDescription.raw()));
+        RTSemEventMultiSignal (mCompletedSem);
     }
 
-    RTSemEventMultiDestroy(mCompletedSem);
-
-    ProgressBase::protectedUninit(autoUninitSpan);
+    RTSemEventMultiDestroy (mCompletedSem);
+
+    ProgressBase::protectedUninit (autoUninitSpan);
 }
 
@@ -1007 +1004 @@
     m_ulOperationsCompletedWeight += m_ulCurrentOperationWeight;
 
-    m_strOperationDescription = bstrNextOperationDescription;
+    m_bstrOperationDescription = bstrNextOperationDescription;
     m_ulCurrentOperationWeight = ulNextOperationsWeight;
     m_ulOperationPercent = 0;
 
-    Log(("Progress::setNextOperation(%s): ulNextOperationsWeight = %d; m_ulCurrentOperation is now %d, m_ulOperationsCompletedWeight is now %d\n",
-         m_strOperationDescription.c_str(), ulNextOperationsWeight, m_ulCurrentOperation, m_ulOperationsCompletedWeight));
+    Log(("Progress::setNextOperation(%ls): ulNextOperationsWeight = %d; m_ulCurrentOperation is now %d, m_ulOperationsCompletedWeight is now %d\n",
+         m_bstrOperationDescription.raw(), ulNextOperationsWeight, m_ulCurrentOperation, m_ulOperationsCompletedWeight));
 
     /* wake up all waiting threads */
@@ -1289 +1286 @@
 
     m_ulCurrentOperation = 0;
-    Bstr bstrOperationDescription;
-    rc = mProgresses[0]->COMGETTER(OperationDescription)(bstrOperationDescription.asOutParam());
-    m_strOperationDescription = bstrOperationDescription;
+    rc = mProgresses[0]->COMGETTER(OperationDescription)(m_bstrOperationDescription.asOutParam());
     if (FAILED(rc)) return rc;
 
@@ -1791 +1786 @@
         {
             m_ulCurrentOperation = mCompletedOperations + operation;
-            Bstr bstrOperationDescription;
-            rc = progress->COMGETTER(OperationDescription)(bstrOperationDescription.asOutParam());
-            m_strOperationDescription = bstrOperationDescription;
+            rc = progress->COMGETTER(OperationDescription) (
+                m_bstrOperationDescription.asOutParam());
         }
     }

trunk/src/VBox/Main/RemoteUSBDeviceImpl.cpp

@@ -134 +134 @@
 /////////////////////////////////////////////////////////////////////////////
 
-STDMETHODIMP RemoteUSBDevice::COMGETTER(Id)(BSTR *aId)
+STDMETHODIMP RemoteUSBDevice::COMGETTER(Id) (BSTR *aId)
 {
     CheckComArgOutPointerValid(aId);
@@ -142 +142 @@
 
     /* this is const, no need to lock */
-    Bstr(mData.id.toUtf16()).cloneTo(aId);
+    Bstr(mData.id).cloneTo(aId);
 
     return S_OK;

trunk/src/VBox/Main/SessionImpl.cpp

@@ -682 +682 @@
 }
 
-STDMETHODIMP Session::AccessGuestProperty(IN_BSTR aName,
-                                          IN_BSTR aValue,
-                                          IN_BSTR aFlags,
-                                          BOOL aIsSetter,
-                                          BSTR *aRetValue,
-                                          ULONG64 *aRetTimestamp,
-                                          BSTR *aRetFlags)
+STDMETHODIMP Session::AccessGuestProperty(IN_BSTR aName, IN_BSTR aValue, IN_BSTR aFlags,
+                                          BOOL aIsSetter, BSTR *aRetValue, ULONG64 *aRetTimestamp, BSTR *aRetFlags)
 {
 #ifdef VBOX_WITH_GUEST_PROPS
@@ -699 +694 @@
                         Global::stringifySessionState(mState));
     AssertReturn(mType == SessionType_Direct, VBOX_E_INVALID_OBJECT_STATE);
-    CheckComArgStrNotEmptyOrNull(aName);
+    CheckComArgNotNull(aName);
     if (!aIsSetter && !VALID_PTR(aRetValue))
         return E_POINTER;

trunk/src/VBox/Main/SharedFolderImpl.cpp

@@ -333 +333 @@
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    m.lastAccessError.cloneTo(aLastAccessError);
+    if (m.lastAccessError.isEmpty())
+        Bstr("").cloneTo(aLastAccessError);
+    else
+        m.lastAccessError.cloneTo(aLastAccessError);
 
     return S_OK;

trunk/src/VBox/Main/SnapshotImpl.cpp

@@ -342 +342 @@
 STDMETHODIMP Snapshot::COMSETTER(Name)(IN_BSTR aName)
 {
-    CheckComArgStrNotEmptyOrNull(aName);
+    CheckComArgNotNull(aName);
 
     AutoCaller autoCaller(this);
@@ -378 +378 @@
 STDMETHODIMP Snapshot::COMSETTER(Description)(IN_BSTR aDescription)
 {
+    CheckComArgNotNull(aDescription);
+
     AutoCaller autoCaller(this);
     if (FAILED(autoCaller.rc())) return autoCaller.rc();

trunk/src/VBox/Main/SystemPropertiesImpl.cpp

@@ -814 +814 @@
  * @return ComObjPtr<MediumFormat>
  */
-ComObjPtr<MediumFormat> SystemProperties::mediumFormat(CBSTR aFormat)
+ComObjPtr<MediumFormat> SystemProperties::mediumFormat (CBSTR aFormat)
 {
     ComObjPtr<MediumFormat> format;
@@ -824 +824 @@
 
     for (MediumFormatList::const_iterator it = mMediumFormats.begin();
-         it != mMediumFormats.end();
-         ++it)
+         it != mMediumFormats.end(); ++ it)
     {
         /* MediumFormat is all const, no need to lock */
 
-        if ((*it)->id().compare(aFormat, Bstr::CaseInsensitive) == 0)
+        if ((*it)->id().compareIgnoreCase (aFormat) == 0)
         {
             format = *it;

trunk/src/VBox/Main/USBControllerImpl.cpp

@@ -1110 +1110 @@
     rc = aUSBDevice->COMGETTER(Manufacturer) (manufacturer.asOutParam());
     ComAssertComRCRet(rc, false);
-    if (!manufacturer.isEmpty())
+    if (!manufacturer.isNull())
         USBFilterSetStringExact (&dev, USBFILTERIDX_MANUFACTURER_STR, Utf8Str(manufacturer).c_str(), true);
 
@@ -1116 +1116 @@
     rc = aUSBDevice->COMGETTER(Product) (product.asOutParam());
     ComAssertComRCRet(rc, false);
-    if (!product.isEmpty())
+    if (!product.isNull())
         USBFilterSetStringExact (&dev, USBFILTERIDX_PRODUCT_STR, Utf8Str(product).c_str(), true);
 
@@ -1122 +1122 @@
     rc = aUSBDevice->COMGETTER(SerialNumber) (serialNumber.asOutParam());
     ComAssertComRCRet(rc, false);
-    if (!serialNumber.isEmpty())
+    if (!serialNumber.isNull())
         USBFilterSetStringExact (&dev, USBFILTERIDX_SERIAL_NUMBER_STR, Utf8Str(serialNumber).c_str(), true);
 

trunk/src/VBox/Main/USBDeviceImpl.cpp

@@ -155 +155 @@
 
     /* this is const, no need to lock */
-    Guid(mData.id).toUtf16().cloneTo(aId);
+    Guid(mData.id).toString().cloneTo(aId);
 
     return S_OK;

trunk/src/VBox/Main/VirtualBoxBase.cpp

@@ -810 +810 @@
  */
 /* static */
-HRESULT VirtualBoxSupportErrorInfoImplBase::setErrorInternal(HRESULT aResultCode,
-                                                             const GUID &aIID,
-                                                             const Bstr &aComponent,
-                                                             const Bstr &aText,
-                                                             bool aWarning,
-                                                             bool aLogIt)
+HRESULT VirtualBoxSupportErrorInfoImplBase::setErrorInternal (
+    HRESULT aResultCode, const GUID &aIID,
+    const Bstr &aComponent, const Bstr &aText,
+    bool aWarning, bool aLogIt)
 {
     /* whether multi-error mode is turned on */
@@ -827 +825 @@
 
     /* these are mandatory, others -- not */
-    AssertReturn(    (!aWarning && FAILED(aResultCode))
-                  || (aWarning && aResultCode != S_OK),
+    AssertReturn((!aWarning && FAILED(aResultCode)) ||
+                  (aWarning && aResultCode != S_OK),
                   E_FAIL);
     AssertReturn(!aText.isEmpty(), E_FAIL);
@@ -916 +914 @@
 
             /* set the current error info and preserve the previous one if any */
-            rc = info->init(aResultCode, aIID, aComponent.raw(), aText.raw(), curInfo);
+            rc = info->init (aResultCode, aIID, aComponent, aText, curInfo);
             if (FAILED(rc)) break;
 

trunk/src/VBox/Main/VirtualBoxImpl.cpp

@@ -302 +302 @@
     LogFlowThisFuncEnter();
 
-    if (sVersion.isEmpty())
+    if (sVersion.isNull())
         sVersion = VBOX_VERSION_STRING;
     sRevision = RTBldCfgRevision();
-    if (sPackageType.isEmpty())
+    if (sPackageType.isNull())
         sPackageType = VBOX_PACKAGE_STRING;
     LogFlowThisFunc(("Version: %ls, Package: %ls\n", sVersion.raw(), sPackageType.raw()));
@@ -323 +323 @@
     /* compose the VirtualBox.xml file name */
     unconst(m->strSettingsFilePath) = Utf8StrFmt("%s%c%s",
-                                                 m->strHomeDir.raw(),
-                                                 RTPATH_DELIMITER,
-                                                 VBOX_GLOBAL_SETTINGS_FILE);
+                                                m->strHomeDir.raw(),
+                                                RTPATH_DELIMITER,
+                                                VBOX_GLOBAL_SETTINGS_FILE);
     HRESULT rc = S_OK;
     bool fCreate = false;
@@ -979 +979 @@
                                firmwareDesc[i].fileName);
         rc = calculateFullPath(shortName, fullName); AssertRCReturn(rc, rc);
-        if (RTFileExists(fullName.c_str()))
+        if (RTFileExists(fullName.raw()))
         {
             *aResult = TRUE;
              if (aFile)
-                fullName.cloneTo(aFile);
+                Utf8Str(fullName).cloneTo(aFile);
             break;
         }
@@ -993 +993 @@
                               RTPATH_DELIMITER,
                               firmwareDesc[i].fileName);
-        if (RTFileExists(fullName.c_str()))
+        if (RTFileExists(fullName.raw()))
         {
             *aResult = TRUE;
             if (aFile)
-                fullName.cloneTo(aFile);
+                Utf8Str(fullName).cloneTo(aFile);
             break;
         }
@@ -1225 +1225 @@
     LogFlowThisFunc(("aName=\"%ls\", aMachine={%p}\n", aName, aMachine));
 
-    CheckComArgStrNotEmptyOrNull(aName);
+    CheckComArgNotNull(aName);
     CheckComArgOutSafeArrayPointerValid(aMachine);
 
@@ -1346 +1346 @@
                                       IMedium **aHardDisk)
 {
-    CheckComArgStrNotEmptyOrNull(aLocation);
+    CheckComArgNotNull(aLocation);
+    CheckComArgNotNull(aImageId);
+    CheckComArgNotNull(aParentId);
     CheckComArgOutSafeArrayPointerValid(aHardDisk);
 
@@ -1421 +1423 @@
                                       IMedium **aHardDisk)
 {
-    CheckComArgStrNotEmptyOrNull(aLocation);
+    CheckComArgNotNull(aLocation);
     CheckComArgOutSafeArrayPointerValid(aHardDisk);
 
@@ -1428 +1430 @@
 
     ComObjPtr<Medium> hardDisk;
-    Utf8Str strLocation(aLocation);
-    HRESULT rc = findHardDisk(NULL, &strLocation, true /* setError */, &hardDisk);
+    HRESULT rc = findHardDisk(NULL, aLocation, true /* setError */, &hardDisk);
 
     /* the below will set *aHardDisk to NULL if hardDisk is null */
@@ -1478 +1479 @@
 
 /** @note Locks objects! */
-STDMETHODIMP VirtualBox::GetDVDImage(IN_BSTR aId, IMedium **aDVDImage)
+STDMETHODIMP VirtualBox::GetDVDImage (IN_BSTR aId, IMedium **aDVDImage)
 {
     CheckComArgOutSafeArrayPointerValid(aDVDImage);
@@ -1496 +1497 @@
 
 /** @note Locks objects! */
-STDMETHODIMP VirtualBox::FindDVDImage(IN_BSTR aLocation, IMedium **aDVDImage)
-{
-    CheckComArgStrNotEmptyOrNull(aLocation);
+STDMETHODIMP VirtualBox::FindDVDImage (IN_BSTR aLocation, IMedium **aDVDImage)
+{
+    CheckComArgNotNull(aLocation);
     CheckComArgOutSafeArrayPointerValid(aDVDImage);
 
@@ -1505 +1506 @@
 
     ComObjPtr<Medium> image;
-    Utf8Str strLocation(aLocation);
-    HRESULT rc = findDVDImage(NULL, &strLocation, true /* setError */, &image);
+    HRESULT rc = findDVDImage (NULL, aLocation, true /* setError */, &image);
 
     /* the below will set *aDVDImage to NULL if dvd is null */
@@ -1515 +1515 @@
 
 /** @note Doesn't lock anything. */
-STDMETHODIMP VirtualBox::OpenFloppyImage(IN_BSTR aLocation, IN_BSTR aId,
-                                         IMedium **aFloppyImage)
+STDMETHODIMP VirtualBox::OpenFloppyImage (IN_BSTR aLocation, IN_BSTR aId,
+                                          IMedium **aFloppyImage)
 {
     CheckComArgStrNotEmptyOrNull(aLocation);
@@ -1555 +1555 @@
 
 /** @note Locks objects! */
-STDMETHODIMP VirtualBox::GetFloppyImage(IN_BSTR aId,
-                                        IMedium **aFloppyImage)
+STDMETHODIMP VirtualBox::GetFloppyImage (IN_BSTR aId,
+                                         IMedium **aFloppyImage)
 
 {
@@ -1575 +1575 @@
 
 /** @note Locks objects! */
-STDMETHODIMP VirtualBox::FindFloppyImage(IN_BSTR aLocation,
-                                         IMedium **aFloppyImage)
-{
-    CheckComArgStrNotEmptyOrNull(aLocation);
+STDMETHODIMP VirtualBox::FindFloppyImage (IN_BSTR aLocation,
+                                          IMedium **aFloppyImage)
+{
+    CheckComArgNotNull(aLocation);
     CheckComArgOutSafeArrayPointerValid(aFloppyImage);
 
@@ -1585 +1585 @@
 
     ComObjPtr<Medium> image;
-    Utf8Str strLocation(aLocation);
-    HRESULT rc = findFloppyImage(NULL, &strLocation, true /* setError */, &image);
+    HRESULT rc = findFloppyImage(NULL, aLocation, true /* setError */, &image);
 
     /* the below will set *aFloppyImage to NULL if img is null */
@@ -1595 +1594 @@
 
 /** @note Locks this object for reading. */
-STDMETHODIMP VirtualBox::GetGuestOSType(IN_BSTR aId, IGuestOSType **aType)
+STDMETHODIMP VirtualBox::GetGuestOSType (IN_BSTR aId, IGuestOSType **aType)
 {
     /* Old ID to new ID conversion table. See r39691 for a source */
@@ -1616 +1615 @@
     };
 
-    CheckComArgNotNull(aType);
+    CheckComArgNotNull (aType);
 
     AutoCaller autoCaller(this);
@@ -1640 +1639 @@
     {
         const Bstr &typeId = (*it)->id();
-        if (typeId.compare(id, Bstr::CaseInsensitive) == 0)
+        AssertMsg (!!typeId, ("ID must not be NULL"));
+        if (typeId.compareIgnoreCase (id) == 0)
         {
             (*it).queryInterfaceTo(aType);
@@ -1709 +1709 @@
                                       BSTR *aValue)
 {
-    CheckComArgStrNotEmptyOrNull(aKey);
+    CheckComArgNotNull(aKey);
     CheckComArgNotNull(aValue);
 
@@ -1716 +1716 @@
 
     /* start with nothing found */
-    Bstr bstrResult;
+    Bstr bstrResult("");
 
     settings::ExtraDataItemsMap::const_iterator it = m->pMainConfigFile->mapExtraDataItems.find(Utf8Str(aKey));
@@ -1735 +1735 @@
                                       IN_BSTR aValue)
 {
-    CheckComArgStrNotEmptyOrNull(aKey);
+    CheckComArgNotNull(aKey);
 
     AutoCaller autoCaller(this);
@@ -1766 +1766 @@
         // lock to copy the list of callbacks to invoke
         Bstr error;
-        Bstr bstrValue(aValue);
+        Bstr bstrValue;
+        if (aValue)
+            bstrValue = aValue;
+        else
+            bstrValue = (const char *)"";
 
         if (!onExtraDataCanChange(Guid::Empty, aKey, bstrValue, error))
         {
             const char *sep = error.isEmpty() ? "" : ": ";
-            CBSTR err = error.raw();
+            CBSTR err = error.isNull() ? (CBSTR) L"" : error.raw();
             LogWarningFunc(("Someone vetoed! Change refused%s%ls\n",
                             sep, err));
@@ -1862 +1866 @@
     LogRel(("remotesession=%s\n", Utf8Str(aMachineId).c_str()));
 
-    CheckComArgStrNotEmptyOrNull(aMachineId);
+    CheckComArgNotNull(aMachineId);
     CheckComArgNotNull(aSession);
+    CheckComArgNotNull(aType);
     CheckComArgOutSafeArrayPointerValid(aProgress);
 
@@ -1892 +1897 @@
     ComObjPtr<Progress> progress;
     progress.createObject();
-    progress->init(this,
-                   static_cast<IMachine*>(machine),
-                   tr("Spawning session"),
-                   FALSE /* aCancelable */);
+    progress->init (this, static_cast <IMachine *> (machine),
+                    Bstr (tr ("Spawning session")),
+                    FALSE /* aCancelable */);
 
     rc = machine->openRemoteSession (control, aType, aEnvironment, progress);
@@ -2430 +2434 @@
             case DataChanged:
                 LogFlow (("OnMachineDataChange: id={%RTuuid}\n", id.ptr()));
-                aCallback->OnMachineDataChange(id.toUtf16());
+                aCallback->OnMachineDataChange (id.toUtf16());
                 break;
 
@@ -2436 +2440 @@
                 LogFlow (("OnMachineStateChange: id={%RTuuid}, state=%d\n",
                           id.ptr(), state));
-                aCallback->OnMachineStateChange(id.toUtf16(), state);
+                aCallback->OnMachineStateChange (id.toUtf16(), state);
                 break;
 
@@ -2442 +2446 @@
                 LogFlow (("OnMachineRegistered: id={%RTuuid}, registered=%d\n",
                           id.ptr(), registered));
-                aCallback->OnMachineRegistered(id.toUtf16(), registered);
+                aCallback->OnMachineRegistered (id.toUtf16(), registered);
                 break;
         }
@@ -2493 +2497 @@
     while ((it != list.end()) && allowChange)
     {
-        HRESULT rc = (*it++)->OnExtraDataCanChange(id,
-                                                   aKey,
-                                                   aValue,
-                                                   aError.asOutParam(),
-                                                   &allowChange);
+        HRESULT rc = (*it++)->OnExtraDataCanChange (id, aKey, aValue,
+                                                    aError.asOutParam(), &allowChange);
         if (FAILED(rc))
         {
@@ -2526 +2527 @@
         LogFlow (("OnExtraDataChange: machineId={%RTuuid}, key='%ls', val='%ls'\n",
                   machineId.ptr(), key.raw(), val.raw()));
-        aCallback->OnExtraDataChange(machineId.toUtf16(), key, val);
+        aCallback->OnExtraDataChange (machineId.toUtf16(), key, val);
     }
 
@@ -2553 +2554 @@
 {
     SessionEvent (VirtualBox *aVB, const Guid &aMachineId, SessionState_T aState)
-        : CallbackEvent (aVB), machineId(aMachineId), sessionState (aState)
+        : CallbackEvent (aVB), machineId (aMachineId), sessionState (aState)
         {}
 
@@ -2560 +2561 @@
         LogFlow (("OnSessionStateChange: machineId={%RTuuid}, sessionState=%d\n",
                   machineId.ptr(), sessionState));
-        aCallback->OnSessionStateChange(machineId.toUtf16(), sessionState);
+        aCallback->OnSessionStateChange (machineId.toUtf16(), sessionState);
     }
 
@@ -2597 +2598 @@
                 LogFlow (("OnSnapshotTaken: machineId={%RTuuid}, snapshotId={%RTuuid}\n",
                           machineId.ptr(), snapshotId.ptr()));
-                aCallback->OnSnapshotTaken(mid, sid);
+                aCallback->OnSnapshotTaken (mid, sid);
                 break;
 
@@ -2603 +2604 @@
                 LogFlow (("OnSnapshotDiscarded: machineId={%RTuuid}, snapshotId={%RTuuid}\n",
                           machineId.ptr(), snapshotId.ptr()));
-                aCallback->OnSnapshotDiscarded(mid, sid);
+                aCallback->OnSnapshotDiscarded (mid, sid);
                 break;
 
@@ -2609 +2610 @@
                 LogFlow (("OnSnapshotChange: machineId={%RTuuid}, snapshotId={%RTuuid}\n",
                           machineId.ptr(), snapshotId.ptr()));
-                aCallback->OnSnapshotChange(mid, sid);
+                aCallback->OnSnapshotChange (mid, sid);
                 break;
         }
@@ -2660 +2661 @@
         LogFlow(("OnGuestPropertyChange: machineId={%RTuuid}, name='%ls', value='%ls', flags='%ls'\n",
                  machineId.ptr(), name.raw(), value.raw(), flags.raw()));
-        aCallback->OnGuestPropertyChange(machineId.toUtf16(), name, value, flags);
+        aCallback->OnGuestPropertyChange (machineId.toUtf16(), name, value, flags);
     }
 
@@ -2796 +2797 @@
  *
  * @param aId           ID of the hard disk (unused when NULL).
- * @param pstrLocation  Full location specification (unused NULL).
+ * @param aLocation     Full location specification (unused NULL).
  * @param aSetError     If @c true , the appropriate error info is set in case
  *                      when the hard disk is not found.
@@ -2806 +2807 @@
  */
 HRESULT VirtualBox::findHardDisk(const Guid *aId,
-                                 const Utf8Str *pstrLocation,
+                                 CBSTR aLocation,
                                  bool aSetError,
                                  ComObjPtr<Medium> *aHardDisk /*= NULL*/)
 {
-    AssertReturn(aId || pstrLocation, E_INVALIDARG);
+    AssertReturn(aId || aLocation, E_INVALIDARG);
 
     // we use the hard disks map, but it is protected by the
@@ -2830 +2831 @@
     /* then iterate and search by location */
     int result = -1;
-    if (pstrLocation)
-    {
+    if (aLocation)
+    {
+        Utf8Str location = aLocation;
+
         for (HardDiskMap::const_iterator it = m->mapHardDisks.begin();
              it != m->mapHardDisks.end();
@@ -2838 +2841 @@
             const ComObjPtr<Medium> &hd = (*it).second;
 
-            HRESULT rc = hd->compareLocationTo(pstrLocation->c_str(), result);
+            HRESULT rc = hd->compareLocationTo(location.c_str(), result);
             if (FAILED(rc)) return rc;
 
@@ -2861 +2864 @@
         else
             setError(rc,
-                     tr("Could not find a hard disk with location '%s' in the media registry ('%s')"),
-                     pstrLocation->c_str(),
+                     tr("Could not find a hard disk with location '%ls' in the media registry ('%s')"),
+                     aLocation,
                      m->strSettingsFilePath.raw());
     }
@@ -2885 +2888 @@
  */
 HRESULT VirtualBox::findDVDImage(const Guid *aId,
-                                 const Utf8Str *pstrLocation,
+                                 CBSTR aLocation,
                                  bool aSetError,
                                  ComObjPtr<Medium> *aImage /* = NULL */)
 {
-    AssertReturn(aId || pstrLocation, E_INVALIDARG);
+    AssertReturn(aId || aLocation, E_INVALIDARG);
 
     Utf8Str location;
 
-    if (pstrLocation != NULL)
-    {
-        int vrc = calculateFullPath(*pstrLocation, location);
+    if (aLocation != NULL)
+    {
+        int vrc = calculateFullPath(Utf8Str(aLocation), location);
         if (RT_FAILURE(vrc))
             return setError(VBOX_E_FILE_ERROR,
-                            tr("Invalid image file location '%s' (%Rrc)"),
-                            pstrLocation->c_str(),
+                            tr("Invalid image file location '%ls' (%Rrc)"),
+                            aLocation,
                             vrc);
     }
@@ -2914 +2917 @@
         AutoReadLock imageLock(*it COMMA_LOCKVAL_SRC_POS);
 
-        found =    (aId && (*it)->getId() == *aId)
-                || (    pstrLocation != NULL
-                     && RTPathCompare(location.c_str(),
-                                      (*it)->getLocationFull().c_str()
-                                     ) == 0);
+        found = (aId && (*it)->getId() == *aId) ||
+                (aLocation != NULL &&
+                 RTPathCompare(location.c_str(),
+                               (*it)->getLocationFull().c_str()
+                              ) == 0);
         if (found)
         {
@@ -2938 +2941 @@
         else
             setError(rc,
-                     tr("Could not find a CD/DVD image with location '%s' in the media registry ('%s')"),
-                     pstrLocation->c_str(),
+                     tr("Could not find a CD/DVD image with location '%ls' in the media registry ('%s')"),
+                     aLocation,
                      m->strSettingsFilePath.raw());
     }
@@ -2963 +2966 @@
  */
 HRESULT VirtualBox::findFloppyImage(const Guid *aId,
-                                    const Utf8Str *pstrLocation,
+                                    CBSTR aLocation,
                                     bool aSetError,
                                     ComObjPtr<Medium> *aImage /* = NULL */)
 {
-    AssertReturn(aId || pstrLocation, E_INVALIDARG);
+    AssertReturn(aId || aLocation, E_INVALIDARG);
 
     Utf8Str location;
 
-    if (pstrLocation != NULL)
-    {
-        int vrc = calculateFullPath(*pstrLocation, location);
+    if (aLocation != NULL)
+    {
+        int vrc = calculateFullPath(Utf8Str(aLocation), location);
         if (RT_FAILURE(vrc))
             return setError(VBOX_E_FILE_ERROR,
-                            tr("Invalid image file location '%s' (%Rrc)"),
-                            pstrLocation->c_str(),
-                            vrc);
+                            tr("Invalid image file location '%ls' (%Rrc)"),
+                            aLocation, vrc);
     }
 
@@ -2992 +2994 @@
         AutoReadLock imageLock(*it COMMA_LOCKVAL_SRC_POS);
 
-        found =    (aId && (*it)->getId() == *aId)
-                || (    pstrLocation != NULL
-                     && RTPathCompare(location.c_str(),
-                                      (*it)->getLocationFull().c_str()
-                                     ) == 0);
+        found = (aId && (*it)->getId() == *aId) ||
+                (aLocation != NULL &&
+                 RTPathCompare(location.c_str(),
+                               (*it)->getLocationFull().c_str()
+                              ) == 0);
         if (found)
         {
@@ -3016 +3018 @@
         else
             setError(rc,
-                     tr("Could not find a floppy image with location '%s' in the media registry ('%s')"),
-                     pstrLocation->c_str(),
+                     tr("Could not find a floppy image with location '%ls' in the media registry ('%s')"),
+                     aLocation,
                      m->strSettingsFilePath.raw());
     }
@@ -3195 +3197 @@
     HRESULT rc = S_OK;
 
+    Bstr bstrLocation(aLocation);
+
     {
         ComObjPtr<Medium> hardDisk;
-        rc = findHardDisk(&aId, &aLocation, false /* aSetError */, &hardDisk);
+        rc = findHardDisk(&aId, bstrLocation, false /* aSetError */, &hardDisk);
         if (SUCCEEDED(rc))
         {
@@ -3211 +3215 @@
     {
         ComObjPtr<Medium> image;
-        rc = findDVDImage(&aId, &aLocation, false /* aSetError */, &image);
+        rc = findDVDImage(&aId, bstrLocation, false /* aSetError */, &image);
         if (SUCCEEDED(rc))
         {
@@ -3225 +3229 @@
     {
         ComObjPtr<Medium> image;
-        rc = findFloppyImage(&aId, &aLocation, false /* aSetError */, &image);
+        rc = findFloppyImage(&aId, bstrLocation, false /* aSetError */, &image);
         if (SUCCEEDED(rc))
         {
@@ -4355 +4359 @@
 STDMETHODIMP VirtualBox::CreateDHCPServer (IN_BSTR aName, IDHCPServer ** aServer)
 {
-    CheckComArgStrNotEmptyOrNull(aName);
+    CheckComArgNotNull(aName);
     CheckComArgNotNull(aServer);
 
@@ -4376 +4380 @@
 STDMETHODIMP VirtualBox::FindDHCPServerByNetworkName(IN_BSTR aName, IDHCPServer ** aServer)
 {
-    CheckComArgStrNotEmptyOrNull(aName);
+    CheckComArgNotNull(aName);
     CheckComArgNotNull(aServer);
 
@@ -4452 +4456 @@
 
     ComPtr<IDHCPServer> existing;
-    rc = FindDHCPServerByNetworkName(name, existing.asOutParam());
+    rc = FindDHCPServerByNetworkName(name.mutableRaw(), existing.asOutParam());
     if (SUCCEEDED(rc))
     {

trunk/src/VBox/Main/generic/NetIf-generic.cpp

@@ -231 +231 @@
         Bstr ifname;
         ComPtr<IHostNetworkInterface> iface;
-        if (FAILED(host->FindHostNetworkInterfaceById(Guid(aId).toUtf16(), iface.asOutParam())))
+        if (FAILED(host->FindHostNetworkInterfaceById (Guid(aId).toUtf16(), iface.asOutParam())))
             return VERR_INVALID_PARAMETER;
-        iface->COMGETTER(Name)(ifname.asOutParam());
-        if (ifname.isEmpty())
+        iface->COMGETTER(Name) (ifname.asOutParam());
+        if (ifname.isNull())
             return VERR_INTERNAL_ERROR;
 
-        rc = progress->init(pVBox,
-                            host,
-                            Bstr("Removing host network interface"),
+        rc = progress->init (pVBox, host,
+                            Bstr ("Removing host network interface"),
                             FALSE /* aCancelable */);
         if(SUCCEEDED(rc))

trunk/src/VBox/Main/glue/ErrorInfo.cpp

@@ -170 +170 @@
     {
         mCalleeIID = aIID;
-        GetInterfaceNameByIID(aIID, mCalleeName.asOutParam());
+        GetInterfaceNameByIID (aIID, mCalleeName.asOutParam());
     }
 }

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

@@ -96 +96 @@
 
     void disksWeight(uint32_t &ulTotalMB, uint32_t &cDisks) const;
-    HRESULT setUpProgressFS(ComObjPtr<Progress> &pProgress, const Utf8Str &strDescription);
-    HRESULT setUpProgressImportS3(ComObjPtr<Progress> &pProgress, const Utf8Str &strDescription);
-    HRESULT setUpProgressWriteS3(ComObjPtr<Progress> &pProgress, const Utf8Str &strDescription);
+    HRESULT setUpProgressFS(ComObjPtr<Progress> &pProgress, const Bstr &bstrDescription);
+    HRESULT setUpProgressImportS3(ComObjPtr<Progress> &pProgress, const Bstr &bstrDescription);
+    HRESULT setUpProgressWriteS3(ComObjPtr<Progress> &pProgress, const Bstr &bstrDescription);
 
     struct LocationInfo;

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

@@ -52 +52 @@
     HRESULT protectedInit(AutoInitSpan &aAutoInitSpan,
 #if !defined (VBOX_COM_INPROC)
-                          VirtualBox *aParent,
-#endif
-                          IUnknown *aInitiator,
-                          const Utf8Str &strDescription,
-                          OUT_GUID aId = NULL);
+                  VirtualBox *aParent,
+#endif
+                  IUnknown *aInitiator,
+                  CBSTR aDescription, OUT_GUID aId = NULL);
     HRESULT protectedInit(AutoInitSpan &aAutoInitSpan);
     void protectedUninit(AutoUninitSpan &aAutoUninitSpan);
@@ -106 +105 @@
 
     const Guid mId;
-    const Utf8Str m_strDescription;
+    const Bstr mDescription;
 
     uint64_t m_ullTimestamp;                        // progress object creation timestamp, for ETA computation
@@ -127 +126 @@
 
     ULONG m_ulCurrentOperation;                     // operations counter, incremented with each setNextOperation()
-    Utf8Str m_strOperationDescription;              // name of current operation; initially from constructor, changed with setNextOperation()
+    Bstr m_bstrOperationDescription;                // name of current operation; initially from constructor, changed with setNextOperation()
     ULONG m_ulCurrentOperationWeight;               // weight of current operation, given to setNextOperation()
     ULONG m_ulOperationPercent;                     // percentage of current operation, set with setCurrentOperationProgress()
@@ -177 +176 @@
 #endif
                   IUnknown *aInitiator,
-                  const Utf8Str &strDescription,
+                  CBSTR aDescription,
                   BOOL aCancelable,
                   OUT_GUID aId = NULL)
@@ -186 +185 @@
 #endif
             aInitiator,
-            strDescription,
+            aDescription,
             aCancelable,
             1,      // cOperations
             1,      // ulTotalOperationsWeight
-            strDescription, // bstrFirstOperationDescription
+            aDescription, // bstrFirstOperationDescription
             1,      // ulFirstOperationWeight
             aId);
@@ -212 +211 @@
 #endif
                   IUnknown *aInitiator,
-                  const Utf8Str &strDescription,
-                  BOOL aCancelable,
+                  CBSTR aDescription, BOOL aCancelable,
                   ULONG cOperations,
-                  const Utf8Str &strFirstOperationDescription,
+                  CBSTR bstrFirstOperationDescription,
                   OUT_GUID aId = NULL)
     {
@@ -223 +221 @@
 #endif
             aInitiator,
-            strDescription,
+            aDescription,
             aCancelable,
             cOperations,      // cOperations
             cOperations,      // ulTotalOperationsWeight = cOperations
-            strFirstOperationDescription, // bstrFirstOperationDescription
+            bstrFirstOperationDescription, // bstrFirstOperationDescription
             1,      // ulFirstOperationWeight: weigh them all the same
             aId);
@@ -237 +235 @@
 #endif
                   IUnknown *aInitiator,
-                  const Utf8Str &strDescription,
+                  CBSTR aDescription,
                   BOOL aCancelable,
                   ULONG cOperations,
                   ULONG ulTotalOperationsWeight,
-                  const Utf8Str &strFirstOperationDescription,
+                  CBSTR bstrFirstOperationDescription,
                   ULONG ulFirstOperationWeight,
                   OUT_GUID aId = NULL);
@@ -247 +245 @@
     HRESULT init(BOOL aCancelable,
                  ULONG aOperationCount,
-                 const Utf8Str &strOperationDescription);
+                 CBSTR aOperationDescription);
 
     void uninit();

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

@@ -246 +246 @@
                          ComObjPtr<Machine> *machine = NULL);
 
-    HRESULT findHardDisk(const Guid *aId, const Utf8Str *pstrLocation,
+    HRESULT findHardDisk(const Guid *aId, CBSTR aLocation,
                           bool aSetError, ComObjPtr<Medium> *aHardDisk = NULL);
-    HRESULT findDVDImage(const Guid *aId, const Utf8Str *pstrLocation,
+    HRESULT findDVDImage(const Guid *aId, CBSTR aLocation,
                          bool aSetError, ComObjPtr<Medium> *aImage = NULL);
-    HRESULT findFloppyImage(const Guid *aId, const Utf8Str *pstrLocation,
+    HRESULT findFloppyImage(const Guid *aId, CBSTR aLocation,
                             bool aSetError, ComObjPtr<Medium> *aImage = NULL);
 

trunk/src/VBox/Main/xml/Settings.cpp

@@ -195 +195 @@
             strLine = Utf8StrFmt(" (line %RU32)", pNode->getLineNumber());
 
+        const char *pcsz = strLine.c_str();
         Utf8StrFmt str(N_("Error in %s%s -- %s"),
                        file->m->strFilename.c_str(),
-                       strLine.c_str(),
+                       (pcsz) ? pcsz : "",
                        strWhat.c_str());