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

Timestamp:

Aug 10, 2010 3:40:18 PM (14 years ago)

Author:

vboxsync

Message:

Main: use settings struct for machine user data; remove iprt::MiniString::raw() and change all occurences to c_str()

Location:

trunk/src/VBox/Main

Files:

• ApplianceImplExport.cpp (modified) (5 diffs)
• ApplianceImplImport.cpp (modified) (3 diffs)
• ConsoleImpl.cpp (modified) (14 diffs)
• ConsoleImpl2.cpp (modified) (8 diffs)
• ConsoleVRDPServer.cpp (modified) (4 diffs)
• DHCPServerRunner.cpp (modified) (1 diff)
• GuestImpl.cpp (modified) (8 diffs)
• HostNetworkInterfaceImpl.cpp (modified) (5 diffs)
• MachineDebuggerImpl.cpp (modified) (4 diffs)
• MachineImpl.cpp (modified) (108 diffs)
• MediumImpl.cpp (modified) (70 diffs)
• NATEngineImpl.cpp (modified) (7 diffs)
• SessionImpl.cpp (modified) (1 diff)
• SharedFolderImpl.cpp (modified) (2 diffs)
• SnapshotImpl.cpp (modified) (25 diffs)
• StorageControllerImpl.cpp (modified) (1 diff)
• SystemPropertiesImpl.cpp (modified) (2 diffs)
• USBControllerImpl.cpp (modified) (9 diffs)
• VFSExplorerImpl.cpp (modified) (1 diff)
• VirtualBoxImpl.cpp (modified) (16 diffs)
• include/ConsoleImpl.h (modified) (1 diff)
• include/MachineImpl.h (modified) (2 diffs)
• include/SnapshotImpl.h (modified) (1 diff)
• include/VirtualBoxBase.h (modified) (1 diff)
• include/netif.h (modified) (1 diff)
• webservice/vboxweb.cpp (modified) (5 diffs)
• xml/Settings.cpp (modified) (12 diffs)

trunk/src/VBox/Main/ApplianceImplExport.cpp

@@ -106 +106 @@
 
         // get name
-        bstrName1 = mUserData->mName;
+        Utf8Str strVMName = mUserData->s.strName;
         // get description
-        bstrDescription = mUserData->mDescription;
+        Utf8Str strDescription = mUserData->s.strDescription;
         // get guest OS
-        bstrGuestOSType = mUserData->mOSTypeId;
+        Utf8Str strOsTypeVBox = mUserData->s.strOsType;
         // CPU count
         cCPUs = mHWData->mCPUCount;
@@ -126 +126 @@
 
         /* Guest OS type */
-        Utf8Str strOsTypeVBox(bstrGuestOSType);
         ovf::CIMOSType_T cim = convertVBoxOSType2CIMOSType(strOsTypeVBox.c_str());
         pNewDesc->addEntry(VirtualSystemDescriptionType_OS,
@@ -134 +133 @@
 
         /* VM name */
-        Utf8Str strVMName(bstrName1);
         pNewDesc->addEntry(VirtualSystemDescriptionType_Name,
                            "",
@@ -141 +139 @@
 
         // description
-        Utf8Str strDescription(bstrDescription);
         pNewDesc->addEntry(VirtualSystemDescriptionType_Description,
                            "",
@@ -1506 +1503 @@
 
             // create a new hard disk interface for the destination disk image
-            Log(("Creating target disk \"%s\"\n", strTargetFilePath.raw()));
+            Log(("Creating target disk \"%s\"\n", strTargetFilePath.c_str()));
             rc = mVirtualBox->CreateHardDisk(bstrSrcFormat, Bstr(strTargetFilePath), pTargetDisk.asOutParam());
             if (FAILED(rc)) throw rc;

trunk/src/VBox/Main/ApplianceImplImport.cpp

@@ -498 +498 @@
                         /* Construct a unique target path */
                         Utf8StrFmt strPath("%s%c%s",
-                                           strDefaultHardDiskFolder.raw(),
+                                           strDefaultHardDiskFolder.c_str(),
                                            RTPATH_DELIMITER,
                                            strFilename.c_str());
@@ -1972 +1972 @@
      */
 
-    config.strDescription = stack.strDescription;
+    config.machineUserData.strDescription = stack.strDescription;
 
     config.hardwareMachine.cCPUs = stack.cCPUs;
@@ -2087 +2087 @@
                 DebugBreakThrow(setError(E_FAIL,
                                          tr("<vbox:Machine> element in OVF contains a medium attachment for the disk image %s but the OVF describes no such image"),
-                                         strUuid.raw()));
+                                         strUuid.c_str()));
         } // for (settings::AttachedDevicesList::const_iterator dit = sc.llAttachedDevices.begin();
     } // for (settings::StorageControllersList::const_iterator sit = config.storageMachine.llStorageControllers.begin();

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -2309 +2309 @@
                     rc = setError(VBOX_E_FILE_ERROR,
                         tr("Could not create a directory '%s' to save the state to (%Rrc)"),
-                        dir.raw(), vrc);
+                        dir.c_str(), vrc);
                     break;
                 }
@@ -2980 +2980 @@
     va_end(args);
     return rc;
-}
-
-HRESULT Console::setAuthLibraryError(const char *filename, int rc)
-{
-    return setError(E_FAIL, tr("Could not load the external authentication library '%s' (%Rrc)"), filename, rc);
 }
 
@@ -4944 +4939 @@
 
     Utf8Str logFile = Utf8StrFmt("%s%cVBox.log",
-                                 logDir.raw(), RTPATH_DELIMITER);
+                                 logDir.c_str(), RTPATH_DELIMITER);
     Utf8Str pngFile = Utf8StrFmt("%s%cVBox.png",
-                                 logDir.raw(), RTPATH_DELIMITER);
+                                 logDir.c_str(), RTPATH_DELIMITER);
 
     /*
@@ -4969 +4964 @@
             {
                 if (i > 0)
-                    oldName = Utf8StrFmt("%s.%d", files[j]->raw(), i);
+                    oldName = Utf8StrFmt("%s.%d", files[j]->c_str(), i);
                 else
                     oldName = *files[j];
-                newName = Utf8StrFmt("%s.%d", files[j]->raw(), i + 1);
+                newName = Utf8StrFmt("%s.%d", files[j]->c_str(), i + 1);
                 /* If the old file doesn't exist, delete the new file (if it
                  * exists) to provide correct rotation even if the sequence is
@@ -4992 +4987 @@
     int vrc = RTLogCreateEx(&loggerRelease, fFlags, "all",
                             "VBOX_RELEASE_LOG", RT_ELEMENTS(s_apszGroups), s_apszGroups,
-                            RTLOGDEST_FILE, szError, sizeof(szError), logFile.raw());
+                            RTLOGDEST_FILE, szError, sizeof(szError), logFile.c_str());
     if (RT_SUCCESS(vrc))
     {
@@ -6376 +6371 @@
 
     LogFlowThisFunc(("Proxying USB device '%s' {%RTuuid}...\n",
-                      Address.raw(), uuid.ptr()));
+                      Address.c_str(), uuid.ptr()));
 
     /* leave the lock before a VMR3* call (EMT will call us back)! */
@@ -6383 +6378 @@
 /** @todo just do everything here and only wrap the PDMR3Usb call. That'll offload some notification stuff from the EMT thread. */
     int vrc = VMR3ReqCallWait(mpVM, VMCPUID_ANY,
-                              (PFNRT) usbAttachCallback, 6, this, aHostDevice, uuid.ptr(), fRemote, Address.raw(), aMaskedIfs);
+                              (PFNRT)usbAttachCallback, 6, this, aHostDevice, uuid.ptr(), fRemote, Address.c_str(), aMaskedIfs);
 
     /* restore the lock */
@@ -6393 +6388 @@
     {
         LogWarningThisFunc(("Failed to create proxy device for '%s' {%RTuuid} (%Rrc)\n",
-                             Address.raw(), uuid.ptr(), vrc));
+                             Address.c_str(), uuid.ptr(), vrc));
 
         switch (vrc)
@@ -6922 +6917 @@
 
     LogRel(("Console: VM runtime error: fatal=%RTbool, errorID=%s message=\"%s\"\n",
-             fFatal, pszErrorId, message.raw()));
+             fFatal, pszErrorId, message.c_str()));
 
     that->onRuntimeError(BOOL(fFatal), Bstr(pszErrorId), Bstr(message));
@@ -7252 +7247 @@
             Utf8Str ports = bstr;
             errMsg = Utf8StrFmt(tr("VRDP server can't bind to a port: %s"),
-                                ports.raw());
+                                ports.c_str());
             LogRel(("Warning: failed to launch VRDP server (%Rrc): '%s'\n",
-                    vrc, errMsg.raw()));
+                    vrc, errMsg.c_str()));
         }
         else if (RT_FAILURE(vrc))
@@ -7271 +7266 @@
             }
             LogRel(("Failed to launch VRDP server (%Rrc), error message: '%s'\n",
-                     vrc, errMsg.raw()));
+                     vrc, errMsg.c_str()));
             throw setErrorStatic(E_FAIL, errMsg.c_str());
         }
@@ -7366 +7361 @@
                 {
                     LogFlowFunc(("Restoring saved state from '%s'...\n",
-                                 task->mSavedStateFile.raw()));
+                                 task->mSavedStateFile.c_str()));
 
                     vrc = VMR3LoadFromFile(pVM,
@@ -7958 +7953 @@
     HRESULT rc = S_OK;
 
-    LogFlowFunc(("Saving the state to '%s'...\n", task->mSavedStateFile.raw()));
+    LogFlowFunc(("Saving the state to '%s'...\n", task->mSavedStateFile.c_str()));
 
     bool fSuspenededBySave;
@@ -7970 +7965 @@
     {
         errMsg = Utf8StrFmt(Console::tr("Failed to save the machine state to '%s' (%Rrc)"),
-                            task->mSavedStateFile.raw(), vrc);
+                            task->mSavedStateFile.c_str(), vrc);
         rc = E_FAIL;
     }

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -1590 +1590 @@
             Assert(macAddr);
             Utf8Str macAddrUtf8 = macAddr;
-            char *macStr = (char*)macAddrUtf8.raw();
+            char *macStr = (char*)macAddrUtf8.c_str();
             Assert(strlen(macStr) == 12);
             RTMAC Mac;
@@ -2349 +2349 @@
                 continue;
 
-            const char *pszExtraDataKey = strKey.raw() + sizeof("VBoxInternal/") - 1;
+            const char *pszExtraDataKey = strKey.c_str() + sizeof("VBoxInternal/") - 1;
 
             // get the value
@@ -2359 +2359 @@
                 hrc = pMachine->GetExtraData(Bstr(strKey), bstrExtraDataValue.asOutParam());
             if (FAILED(hrc))
-                LogRel(("Warning: Cannot get extra data key %s, rc = %Rrc\n", strKey.raw(), hrc));
+                LogRel(("Warning: Cannot get extra data key %s, rc = %Rrc\n", strKey.c_str(), hrc));
 
             /*
@@ -3300 +3300 @@
         if (pos == Utf8Str::npos) \
         { \
-            Log(( #res " extracting from %s is failed\n", str.raw())); \
+            Log(( #res " extracting from %s is failed\n", str.c_str())); \
             continue; \
         } \
         res = str.substr(ppos, pos - ppos); \
-        Log2((#res " %s pos:%d, ppos:%d\n", res.raw(), pos, ppos)); \
+        Log2((#res " %s pos:%d, ppos:%d\n", res.c_str(), pos, ppos)); \
         ppos = pos + 1; \
     } while (0)
@@ -3332 +3332 @@
                         continue;
 
-                    InsertConfigNode(pCfg, strName.raw(), &pPF);
+                    InsertConfigNode(pCfg, strName.c_str(), &pPF);
                     InsertConfigString(pPF, "Protocol", strProto);
 
@@ -3341 +3341 @@
                         InsertConfigString(pPF, "GuestIP", strGuestIP);
 
-                    port = RTStrToUInt16(strHostPort.raw());
+                    port = RTStrToUInt16(strHostPort.c_str());
                     if (port)
                         InsertConfigInteger(pPF, "HostPort", port);
 
-                    port = RTStrToUInt16(strGuestPort.raw());
+                    port = RTStrToUInt16(strGuestPort.c_str());
                     if (port)
                         InsertConfigInteger(pPF, "GuestPort", port);
@@ -3412 +3412 @@
 
                 Utf8Str HifNameUtf8(HifName);
-                const char *pszHifName = HifNameUtf8.raw();
+                const char *pszHifName = HifNameUtf8.c_str();
 
 # if defined(RT_OS_DARWIN)
@@ -3823 +3823 @@
 
                 Utf8Str HifNameUtf8(HifName);
-                const char *pszHifName = HifNameUtf8.raw();
+                const char *pszHifName = HifNameUtf8.c_str();
                 ComPtr<IHostNetworkInterface> hostInterface;
                 rc = host->FindHostNetworkInterfaceByName(HifName, hostInterface.asOutParam());

trunk/src/VBox/Main/ConsoleVRDPServer.cpp

@@ -617 +617 @@
             if ((size_t)cbBuffer >= cbAddress)
             {
-                if (cbAddress > 0)
-                {
-                    if (address.raw())
-                    {
-                        memcpy(pvBuffer, address.raw(), cbAddress);
-                    }
-                    else
-                    {
-                        /* The value is an empty string. */
-                        *(uint8_t *)pvBuffer = 0;
-                    }
-                }
-
+                memcpy(pvBuffer, address.c_str(), cbAddress);
                 rc = VINF_SUCCESS;
             }
@@ -688 +676 @@
             if ((size_t)cbBuffer >= cbPortRange)
             {
-                if (cbPortRange > 0)
-                {
-                    if (portRange.raw())
-                    {
-                        memcpy(pvBuffer, portRange.raw(), cbPortRange);
-                    }
-                    else
-                    {
-                        /* The value is an empty string. */
-                        *(uint8_t *)pvBuffer = 0;
-                    }
-                }
-
+                memcpy(pvBuffer, portRange.c_str(), cbPortRange);
                 rc = VINF_SUCCESS;
             }
@@ -1470 +1446 @@
 
         int rc;
-        if (RTPathHavePath(filename.raw()))
-            rc = RTLdrLoad(filename.raw(), &mAuthLibrary);
+        if (RTPathHavePath(filename.c_str()))
+            rc = RTLdrLoad(filename.c_str(), &mAuthLibrary);
         else
-            rc = RTLdrLoadAppPriv(filename.raw(), &mAuthLibrary);
+            rc = RTLdrLoadAppPriv(filename.c_str(), &mAuthLibrary);
 
         if (RT_FAILURE(rc))
@@ -1513 +1489 @@
         if (RT_FAILURE(rc))
         {
-            mConsole->setAuthLibraryError(filename.raw(), rc);
+            mConsole->setError(E_FAIL,
+                               mConsole->tr("Could not load the external authentication library '%s' (%Rrc)"),
+                               filename.c_str(),
+                               rc);
 
             mpfnAuthEntry = NULL;

trunk/src/VBox/Main/DHCPServerRunner.cpp

@@ -111 +111 @@
              */
             if (mOptions[i].length())
-                args[index++] = mOptions[i].raw();  // value
+                args[index++] = mOptions[i].c_str();  // value
         }
     }

trunk/src/VBox/Main/GuestImpl.cpp

@@ -466 +466 @@
 
             pVMMDevPort->pfnSetCredentials(pVMMDevPort,
-                                           Utf8Str(aUserName).raw(),
-                                           Utf8Str(aPassword).raw(),
-                                           Utf8Str(aDomain).raw(),
+                                           Utf8Str(aUserName).c_str(),
+                                           Utf8Str(aPassword).c_str(),
+                                           Utf8Str(aDomain).c_str(),
                                            u32Flags);
             return S_OK;
@@ -1020 +1020 @@
                     for (unsigned i = 0; i < env.size(); i++)
                     {
-                        vrc = prepareExecuteEnv(Utf8Str(env[i]).raw(), &pvEnv, &cbEnv, &uNumEnv);
+                        vrc = prepareExecuteEnv(Utf8Str(env[i]).c_str(), &pvEnv, &cbEnv, &uNumEnv);
                         if (RT_FAILURE(vrc))
                             break;
@@ -1027 +1027 @@
 
                 LogRel(("Executing guest process \"%s\" as user \"%s\" ...\n",
-                        Utf8Command.raw(), Utf8UserName.raw()));
+                        Utf8Command.c_str(), Utf8UserName.c_str()));
 
                 if (RT_SUCCESS(vrc))
@@ -1041 +1041 @@
                     int i = 0;
                     paParms[i++].setUInt32(uContextID);
-                    paParms[i++].setPointer((void*)Utf8Command.raw(), (uint32_t)strlen(Utf8Command.raw()) + 1);
+                    paParms[i++].setPointer((void*)Utf8Command.c_str(), (uint32_t)Utf8Command.length() + 1);
                     paParms[i++].setUInt32(aFlags);
                     paParms[i++].setUInt32(uNumArgs);
@@ -1048 +1048 @@
                     paParms[i++].setUInt32(cbEnv);
                     paParms[i++].setPointer((void*)pvEnv, cbEnv);
-                    paParms[i++].setPointer((void*)Utf8UserName.raw(), (uint32_t)strlen(Utf8UserName.raw()) + 1);
-                    paParms[i++].setPointer((void*)Utf8Password.raw(), (uint32_t)strlen(Utf8Password.raw()) + 1);
+                    paParms[i++].setPointer((void*)Utf8UserName.c_str(), (uint32_t)Utf8UserName.length() + 1);
+                    paParms[i++].setPointer((void*)Utf8Password.c_str(), (uint32_t)Utf8Password.length() + 1);
                     paParms[i++].setUInt32(aTimeoutMS);
 
@@ -1159 +1159 @@
                     {
                         if (vrc == VERR_FILE_NOT_FOUND) /* This is the most likely error. */
-                        {
                             rc = setError(VBOX_E_IPRT_ERROR,
-                                          tr("The file '%s' was not found on guest"), Utf8Command.raw());
-                        }
+                                          tr("The file '%s' was not found on guest"), Utf8Command.c_str());
                         else if (vrc == VERR_PATH_NOT_FOUND)
-                        {
                             rc = setError(VBOX_E_IPRT_ERROR,
-                                          tr("The path to file '%s' was not found on guest"), Utf8Command.raw());
-                        }
+                                          tr("The path to file '%s' was not found on guest"), Utf8Command.c_str());
                         else if (vrc == VERR_BAD_EXE_FORMAT)
-                        {
                             rc = setError(VBOX_E_IPRT_ERROR,
-                                          tr("The file '%s' is not an executable format on guest"), Utf8Command.raw());
-                        }
+                                          tr("The file '%s' is not an executable format on guest"), Utf8Command.c_str());
                         else if (vrc == VERR_AUTHENTICATION_FAILURE)
-                        {
                             rc = setError(VBOX_E_IPRT_ERROR,
-                                          tr("The specified user '%s' was not able to logon on guest"), Utf8UserName.raw());
-                        }
+                                          tr("The specified user '%s' was not able to logon on guest"), Utf8UserName.c_str());
                         else if (vrc == VERR_TIMEOUT)
-                        {
                             rc = setError(VBOX_E_IPRT_ERROR,
                                           tr("The guest did not respond within time (%ums)"), aTimeoutMS);
-                        }
                         else if (vrc == VERR_CANCELLED)
-                        {
                             rc = setError(VBOX_E_IPRT_ERROR,
                                           tr("The execution operation was canceled"));
-                        }
                         else if (vrc == VERR_PERMISSION_DENIED)
-                        {
                             rc = setError(VBOX_E_IPRT_ERROR,
                                           tr("Invalid user/password credentials"));
-                        }
                         else
                         {
@@ -1215 +1201 @@
             {
                 if (vrc == VERR_INVALID_VM_HANDLE)
-                {
                     rc = setError(VBOX_E_VM_ERROR,
                                   tr("VMM device is not available (is the VM running?)"));
-                }
                 else if (vrc == VERR_TIMEOUT)
-                {
                     rc = setError(VBOX_E_VM_ERROR,
                                   tr("The guest execution service is not ready"));
-                }
                 else if (vrc == VERR_HGCM_SERVICE_NOT_FOUND)
-                {
                     rc = setError(VBOX_E_VM_ERROR,
                                   tr("The guest execution service is not available"));
-                }
                 else /* HGCM call went wrong. */
-                {
                     rc = setError(E_UNEXPECTED,
                                   tr("The HGCM call failed with error %Rrc"), vrc);
-                }
             }
 
@@ -1243 +1221 @@
         if (RT_FAILURE(vrc))
             LogRel(("Executing guest process \"%s\" as user \"%s\" failed with %Rrc\n",
-                    Utf8Command.raw(), Utf8UserName.raw(), vrc));
+                    Utf8Command.c_str(), Utf8UserName.c_str(), vrc));
     }
     catch (std::bad_alloc &)

trunk/src/VBox/Main/HostNetworkInterfaceImpl.cpp

@@ -61 +61 @@
  * @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().c_str()));
 
     ComAssertRet(aInterfaceName, E_INVALIDARG);
@@ -76 +76 @@
     unconst(mGuid) = aGuid;
     mIfType = ifType;
-
 
     /* Confirm a successful initialization */
@@ -440 +439 @@
 
     ULONG ip, mask;
-    ip = inet_addr(Utf8Str(aIPAddress).raw());
+    ip = inet_addr(Utf8Str(aIPAddress).c_str());
     if (ip != INADDR_NONE)
     {
@@ -446 +445 @@
             mask = 0xFFFFFF;
         else
-            mask = inet_addr(Utf8Str(aNetMask).raw());
+            mask = inet_addr(Utf8Str(aNetMask).c_str());
         if (mask != INADDR_NONE)
         {
@@ -567 +566 @@
         if (tmpMask.isEmpty())
             tmpMask = Bstr(VBOXNET_IPV4MASK_DEFAULT);
-        m.IPAddress = inet_addr(Utf8Str(tmpAddr).raw());
-        m.networkMask = inet_addr(Utf8Str(tmpMask).raw());
+        m.IPAddress = inet_addr(Utf8Str(tmpAddr).c_str());
+        m.networkMask = inet_addr(Utf8Str(tmpMask).c_str());
     }
 

trunk/src/VBox/Main/MachineDebuggerImpl.cpp

@@ -657 +657 @@
  * @param   aPattern            The selection pattern. A bit similar to filename globbing.
  */
-STDMETHODIMP MachineDebugger::ResetStats (IN_BSTR aPattern)
+STDMETHODIMP MachineDebugger::ResetStats(IN_BSTR aPattern)
 {
     Console::SafeVMPtrQuiet pVM (mParent);
@@ -664 +664 @@
         return setError(VBOX_E_INVALID_VM_STATE, "Machine is not running");
 
-    STAMR3Reset (pVM, Utf8Str (aPattern).raw());
+    STAMR3Reset(pVM, Utf8Str(aPattern).c_str());
 
     return S_OK;
@@ -682 +682 @@
         return setError(VBOX_E_INVALID_VM_STATE, "Machine is not running");
 
-    STAMR3Dump (pVM, Utf8Str (aPattern).raw());
+    STAMR3Dump(pVM, Utf8Str(aPattern).c_str());
 
     return S_OK;
@@ -703 +703 @@
 
     char *pszSnapshot;
-    int vrc = STAMR3Snapshot (pVM, Utf8Str (aPattern).raw(), &pszSnapshot, NULL,
-                              !!aWithDescriptions);
+    int vrc = STAMR3Snapshot(pVM, Utf8Str(aPattern).c_str(), &pszSnapshot, NULL,
+                             !!aWithDescriptions);
     if (RT_FAILURE(vrc))
         return vrc == VERR_NO_MEMORY ? E_OUTOFMEMORY : E_FAIL;

trunk/src/VBox/Main/MachineImpl.cpp

@@ -131 +131 @@
         pMachineConfigFile = NULL;
     }
-}
-
-/////////////////////////////////////////////////////////////////////////////
-// Machine::UserData structure
-/////////////////////////////////////////////////////////////////////////////
-
-Machine::UserData::UserData()
-{
-    /* default values for a newly created machine */
-
-    mNameSync = TRUE;
-    mTeleporterEnabled = FALSE;
-    mTeleporterPort = 0;
-    mRTCUseUTC = FALSE;
-
-    /* mName, mOSTypeId, mSnapshotFolder, mSnapshotFolderFull are initialized in
-     * Machine::init() */
-}
-
-Machine::UserData::~UserData()
-{
 }
 
@@ -290 +269 @@
 {
     LogFlowThisFuncEnter();
-    LogFlowThisFunc(("(Init_New) aConfigFile='%s'\n", strConfigFile.raw()));
+    LogFlowThisFunc(("(Init_New) aConfigFile='%s'\n", strConfigFile.c_str()));
 
     /* Enclose the state transition NotReady->InInit->Ready */
@@ -317 +296 @@
         unconst(mData->mUuid) = aId;
 
-        mUserData->mName = strName;
-        mUserData->mNameSync = aNameSync;
+        mUserData->s.strName = strName;
+        mUserData->s.fNameSync = aNameSync;
 
         /* initialize the default snapshots folder
@@ -328 +307 @@
         {
             /* Store OS type */
-            mUserData->mOSTypeId = aOsType->id();
+            mUserData->s.strOsType = aOsType->id();
 
             /* Apply BIOS defaults */
@@ -355 +334 @@
     }
 
-    LogFlowThisFunc(("mName='%ls', mRegistered=%RTbool, mAccessible=%RTbool, rc=%08X\n",
-                     !!mUserData ? mUserData->mName.raw() : NULL,
+    LogFlowThisFunc(("mName='%s', mRegistered=%RTbool, mAccessible=%RTbool, rc=%08X\n",
+                     !!mUserData ? mUserData->s.strName.c_str() : "NULL",
                      mData->mRegistered,
                      mData->mAccessible,
@@ -388 +367 @@
 {
     LogFlowThisFuncEnter();
-    LogFlowThisFunc(("(Init_Registered) aConfigFile='%s\n", strConfigFile.raw()));
+    LogFlowThisFunc(("(Init_Registered) aConfigFile='%s\n", strConfigFile.c_str()));
 
     /* Enclose the state transition NotReady->InInit->Ready */
@@ -450 +429 @@
     }
 
-    LogFlowThisFunc(("mName='%ls', mRegistered=%RTbool, mAccessible=%RTbool "
+    LogFlowThisFunc(("mName='%s', mRegistered=%RTbool, mAccessible=%RTbool "
                       "rc=%08X\n",
-                      !!mUserData ? mUserData->mName.raw() : NULL,
+                      !!mUserData ? mUserData->s.strName.c_str() : "NULL",
                       mData->mRegistered, mData->mAccessible, rc));
 
@@ -511 +490 @@
 
         // override VM name as well, it may be different
-        mUserData->mName = strName;
+        mUserData->s.strName = strName;
 
         /* commit all changes made during the initialization */
@@ -527 +506 @@
     }
 
-    LogFlowThisFunc(("mName='%ls', mRegistered=%RTbool, mAccessible=%RTbool "
+    LogFlowThisFunc(("mName='%s', mRegistered=%RTbool, mAccessible=%RTbool "
                      "rc=%08X\n",
-                      !!mUserData ? mUserData->mName.raw() : NULL,
+                      !!mUserData ? mUserData->s.strName.c_str() : "NULL",
                       mData->mRegistered, mData->mAccessible, rc));
 
@@ -567 +546 @@
         return setError(VBOX_E_FILE_ERROR,
                         tr("Invalid machine settings file name '%s' (%Rrc)"),
-                        strConfigFile.raw(),
+                        strConfigFile.c_str(),
                         vrc1);
 
@@ -597 +576 @@
             rc = setError(VBOX_E_FILE_ERROR,
                           tr("Machine settings file '%s' already exists"),
-                          mData->m_strConfigFileFull.raw());
+                          mData->m_strConfigFileFull.c_str());
         else
         {
@@ -606 +585 @@
                 rc = setError(VBOX_E_FILE_ERROR,
                               tr("Could not delete the existing settings file '%s' (%Rrc)"),
-                              mData->m_strConfigFileFull.raw(), vrc2);
+                              mData->m_strConfigFileFull.c_str(), vrc2);
         }
     }
@@ -614 +593 @@
         rc = setError(VBOX_E_FILE_ERROR,
                       tr("Invalid machine settings file name '%s' (%Rrc)"),
-                      mData->m_strConfigFileFull.raw(),
+                      mData->m_strConfigFileFull.c_str(),
                       vrc);
     return rc;
@@ -657 +636 @@
                                tr("Machine UUID {%RTuuid} in '%s' doesn't match its UUID {%s} in the registry file '%s'"),
                                mData->pMachineConfigFile->uuid.raw(),
-                               mData->m_strConfigFileFull.raw(),
-                               mData->mUuid.toString().raw(),
-                               mParent->settingsFilePath().raw());
+                               mData->m_strConfigFileFull.c_str(),
+                               mData->mUuid.toString().c_str(),
+                               mParent->settingsFilePath().c_str());
 
             rc = loadMachineDataFromSettings(*mData->pMachineConfigFile);
@@ -907 +886 @@
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    mUserData->mName.cloneTo(aName);
+    mUserData->s.strName.cloneTo(aName);
 
     return S_OK;
@@ -926 +905 @@
     setModified(IsModified_MachineData);
     mUserData.backup();
-    mUserData->mName = aName;
+    mUserData->s.strName = aName;
 
     return S_OK;
@@ -940 +919 @@
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    mUserData->mDescription.cloneTo(aDescription);
+    mUserData->s.strDescription.cloneTo(aDescription);
 
     return S_OK;
@@ -957 +936 @@
     setModified(IsModified_MachineData);
     mUserData.backup();
-    mUserData->mDescription = aDescription;
+    mUserData->s.strDescription = aDescription;
 
     return S_OK;
@@ -985 +964 @@
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    mUserData->mOSTypeId.cloneTo(aOSTypeId);
+    mUserData->s.strOsType.cloneTo(aOSTypeId);
 
     return S_OK;
@@ -1015 +994 @@
     setModified(IsModified_MachineData);
     mUserData.backup();
-    mUserData->mOSTypeId = osTypeId;
+    mUserData->s.strOsType = osTypeId;
 
     return S_OK;
@@ -2031 +2010 @@
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    mUserData->mSnapshotFolderFull.cloneTo(aSnapshotFolder);
+    mUserData->m_strSnapshotFolderFull.cloneTo(aSnapshotFolder);
 
     return S_OK;
@@ -2058 +2037 @@
                         tr("The snapshot folder of a machine with snapshots cannot be changed (please delete all snapshots first)"));
 
-    Utf8Str snapshotFolder = aSnapshotFolder;
-
-    if (snapshotFolder.isEmpty())
+    Utf8Str strSnapshotFolder0(aSnapshotFolder);       // keep original
+    Utf8Str strSnapshotFolder(strSnapshotFolder0);
+
+    if (strSnapshotFolder.isEmpty())
     {
         if (isInOwnDir())
-        {
             /* the default snapshots folder is 'Snapshots' in the machine dir */
-            snapshotFolder = "Snapshots";
-        }
+            strSnapshotFolder = "Snapshots";
         else
-        {
             /* the default snapshots folder is {UUID}, for backwards
              * compatibility and to resolve conflicts */
-            snapshotFolder = Utf8StrFmt("{%RTuuid}", mData->mUuid.raw());
-        }
-    }
-
-    int vrc = calculateFullPath(snapshotFolder, snapshotFolder);
+            strSnapshotFolder = Utf8StrFmt("{%RTuuid}", mData->mUuid.raw());
+    }
+
+    int vrc = calculateFullPath(strSnapshotFolder, strSnapshotFolder);
     if (RT_FAILURE(vrc))
         return setError(E_FAIL,
@@ -2083 +2059 @@
     setModified(IsModified_MachineData);
     mUserData.backup();
-    mUserData->mSnapshotFolder = aSnapshotFolder;
-    mUserData->mSnapshotFolderFull = snapshotFolder;
+    mUserData->s.strSnapshotFolder = strSnapshotFolder0;
+    mUserData->m_strSnapshotFolderFull = strSnapshotFolder;
 
     return S_OK;
@@ -2464 +2440 @@
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    *aEnabled = mUserData->mTeleporterEnabled;
+    *aEnabled = mUserData->s.fTeleporterEnabled;
 
     return S_OK;
@@ -2493 +2469 @@
     setModified(IsModified_MachineData);
     mUserData.backup();
-    mUserData->mTeleporterEnabled = aEnabled;
+    mUserData->s.fTeleporterEnabled = !!aEnabled;
 
     return S_OK;
@@ -2507 +2483 @@
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    *aPort = mUserData->mTeleporterPort;
+    *aPort = (ULONG)mUserData->s.uTeleporterPort;
 
     return S_OK;
@@ -2527 +2503 @@
     setModified(IsModified_MachineData);
     mUserData.backup();
-    mUserData->mTeleporterPort = aPort;
+    mUserData->s.uTeleporterPort = (uint32_t)aPort;
 
     return S_OK;
@@ -2541 +2517 @@
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    mUserData->mTeleporterAddress.cloneTo(aAddress);
+    mUserData->s.strTeleporterAddress.cloneTo(aAddress);
 
     return S_OK;
@@ -2558 +2534 @@
     setModified(IsModified_MachineData);
     mUserData.backup();
-    mUserData->mTeleporterAddress = aAddress;
+    mUserData->s.strTeleporterAddress = aAddress;
 
     return S_OK;
@@ -2572 +2548 @@
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    mUserData->mTeleporterPassword.cloneTo(aPassword);
+    mUserData->s.strTeleporterPassword.cloneTo(aPassword);
 
     return S_OK;
@@ -2589 +2565 @@
     setModified(IsModified_MachineData);
     mUserData.backup();
-    mUserData->mTeleporterPassword = aPassword;
+    mUserData->s.strTeleporterPassword = aPassword;
 
     return S_OK;
@@ -2603 +2579 @@
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    *aEnabled = mUserData->mRTCUseUTC;
+    *aEnabled = mUserData->s.fRTCUseUTC;
 
     return S_OK;
@@ -2632 +2608 @@
     setModified(IsModified_MachineData);
     mUserData.backup();
-    mUserData->mRTCUseUTC = aEnabled;
+    mUserData->s.fRTCUseUTC = !!aEnabled;
 
     return S_OK;
@@ -2729 +2705 @@
     if (!mData->mRegistered)
         return setError(E_UNEXPECTED,
-                        tr("The machine '%ls' is not registered"),
-                        mUserData->mName.raw());
+                        tr("The machine '%s' is not registered"),
+                        mUserData->s.strName.c_str());
 
     LogFlowThisFunc(("mSession.mState=%s\n", Global::stringifySessionState(mData->mSession.mState)));
@@ -2800 +2776 @@
             pSessionControl->Uninitialize();
             return setError(VBOX_E_INVALID_SESSION_STATE,
-                            tr("The machine '%ls' was unlocked unexpectedly while attempting to share its session"),
-                               mUserData->mName.raw());
+                            tr("The machine '%s' was unlocked unexpectedly while attempting to share its session"),
+                               mUserData->s.strName.c_str());
         }
 
@@ -2813 +2789 @@
         // sharing not permitted, or machine still unlocking:
         return setError(VBOX_E_INVALID_OBJECT_STATE,
-                        tr("The machine '%ls' is already locked for a session (or being unlocked)"),
-                        mUserData->mName.raw());
+                        tr("The machine '%s' is already locked for a session (or being unlocked)"),
+                        mUserData->s.strName.c_str());
     }
     else
@@ -2843 +2819 @@
                 return setError(E_ACCESSDENIED,
                                 tr("An unexpected process (PID=0x%08X) has tried to lock the "
-                                   "machine '%ls', while only the process started by launchVMProcess (PID=0x%08X) is allowed"),
-                                pid, mUserData->mName.raw(), mData->mSession.mPid);
+                                   "machine '%s', while only the process started by launchVMProcess (PID=0x%08X) is allowed"),
+                                pid, mUserData->s.strName.c_str(), mData->mSession.mPid);
         }
 
@@ -3178 +3154 @@
             return setError(VBOX_E_OBJECT_IN_USE,
                             tr("Medium '%s' is already attached to port %d, device %d of controller '%ls' of this virtual machine"),
-                            pMedium->getLocationFull().raw(),
+                            pMedium->getLocationFull().c_str(),
                             aControllerPort,
                             aDevice,
@@ -3222 +3198 @@
         return setError(VBOX_E_OBJECT_IN_USE,
                         tr("Medium '%s' is already attached to this virtual machine"),
-                        medium->getLocationFull().raw());
+                        medium->getLocationFull().c_str());
 
     bool fIndirect = false;
@@ -3417 +3393 @@
         rc = diff->init(mParent,
                         medium->getPreferredDiffFormat(),
-                        Utf8StrFmt("%ls"RTPATH_SLASH_STR,
-                                   mUserData->mSnapshotFolderFull.raw()).raw(),
+                        Utf8Str(mUserData->m_strSnapshotFolderFull).append(RTPATH_SLASH_STR),
                         &fNeedsSaveSettings);
         if (FAILED(rc)) return rc;
@@ -3985 +3960 @@
     if (mData->mSession.mState != SessionState_Unlocked)
         return setError(VBOX_E_INVALID_OBJECT_STATE,
-                        tr("Cannot unregister the machine '%ls' while it is locked"),
-                        mUserData->mName.raw());
+                        tr("Cannot unregister the machine '%s' while it is locked"),
+                        mUserData->s.strName.c_str());
 
     HRESULT rc = S_OK;
@@ -4010 +3985 @@
         // fail now before we start detaching media
         return setError(VBOX_E_INVALID_OBJECT_STATE,
-                        tr("Cannot unregister the machine '%ls' because it has %d snapshots"),
-                           mUserData->mName.raw(), cSnapshots);
+                        tr("Cannot unregister the machine '%s' because it has %d snapshots"),
+                           mUserData->s.strName.c_str(), cSnapshots);
 
     // this list collects the medium objects from all medium attachments
@@ -4034 +4009 @@
         else
             return setError(VBOX_E_INVALID_OBJECT_STATE,
-                            tr("Cannot unregister the machine '%ls' because it has %d media attachments"),
-                            mUserData->mName.raw(), mMediaData->mAttachments.size());
+                            tr("Cannot unregister the machine '%s' because it has %d media attachments"),
+                            mUserData->s.strName.c_str(), mMediaData->mAttachments.size());
     }
 
@@ -4257 +4232 @@
              * files that may have been created by the GUI. */
             Utf8Str log = Utf8StrFmt("%s%cVBox.log",
-                                     logFolder.raw(), RTPATH_DELIMITER);
+                                     logFolder.c_str(), RTPATH_DELIMITER);
             RTFileDelete(log.c_str());
             log = Utf8StrFmt("%s%cVBox.png",
-                             logFolder.raw(), RTPATH_DELIMITER);
+                             logFolder.c_str(), RTPATH_DELIMITER);
             RTFileDelete(log.c_str());
             for (int i = uLogHistoryCount; i > 0; i--)
             {
                 log = Utf8StrFmt("%s%cVBox.log.%d",
-                                 logFolder.raw(), RTPATH_DELIMITER, i);
+                                 logFolder.c_str(), RTPATH_DELIMITER, i);
                 RTFileDelete(log.c_str());
                 log = Utf8StrFmt("%s%cVBox.png.%d",
-                                 logFolder.raw(), RTPATH_DELIMITER, i);
+                                 logFolder.c_str(), RTPATH_DELIMITER, i);
                 RTFileDelete(log.c_str());
             }
@@ -4278 +4253 @@
          * there (we don't check for errors because the user might have
          * some private files there that we don't want to delete) */
-        Utf8Str snapshotFolder(mUserData->mSnapshotFolderFull);
-        Assert(snapshotFolder.length());
-        if (RTDirExists(snapshotFolder.c_str()))
-            RTDirRemove(snapshotFolder.c_str());
+        Assert(mUserData->m_strSnapshotFolderFull.length());
+        if (RTDirExists(mUserData->m_strSnapshotFolderFull.c_str()))
+            RTDirRemove(mUserData->m_strSnapshotFolderFull.c_str());
 
         /* delete the directory that contains the settings file, but only
@@ -4601 +4575 @@
         uint32_t fFlags = NILFLAG;
         if (    (aFlags != NULL)
-             && RT_FAILURE(validateFlags(utf8Flags.raw(), &fFlags))
+             && RT_FAILURE(validateFlags(utf8Flags.c_str(), &fFlags))
            )
             return setError(E_INVALIDARG,
@@ -4660 +4634 @@
         if (   SUCCEEDED(rc)
             && (   mHWData->mGuestPropertyNotificationPatterns.isEmpty()
-                || RTStrSimplePatternMultiMatch(mHWData->mGuestPropertyNotificationPatterns.raw(), RTSTR_MAX,
-                                                utf8Name.raw(), RTSTR_MAX, NULL) )
+                || RTStrSimplePatternMultiMatch(mHWData->mGuestPropertyNotificationPatterns.c_str(),
+                                                RTSTR_MAX,
+                                                utf8Name.c_str(),
+                                                RTSTR_MAX,
+                                                NULL)
+               )
            )
         {
@@ -4761 +4739 @@
          ++it)
         if (   strPatterns.isEmpty()
-            || RTStrSimplePatternMultiMatch(strPatterns.raw(),
+            || RTStrSimplePatternMultiMatch(strPatterns.c_str(),
                                             RTSTR_MAX,
-                                            it->strName.raw(),
-                                            RTSTR_MAX, NULL)
+                                            it->strName.c_str(),
+                                            RTSTR_MAX,
+                                            NULL)
            )
             propList.push_back(*it);
@@ -5057 +5036 @@
 #define sSSMDisplayScreenshotVer 0x00010001
 
-static int readSavedDisplayScreenshot(Utf8Str *pStateFilePath, uint32_t u32Type, uint8_t **ppu8Data, uint32_t *pcbData, uint32_t *pu32Width, uint32_t *pu32Height)
-{
-    LogFlowFunc(("u32Type = %d [%s]\n", u32Type, pStateFilePath->raw()));
+static int readSavedDisplayScreenshot(const Utf8Str &strStateFilePath, uint32_t u32Type, uint8_t **ppu8Data, uint32_t *pcbData, uint32_t *pu32Width, uint32_t *pu32Height)
+{
+    LogFlowFunc(("u32Type = %d [%s]\n", u32Type, strStateFilePath.c_str()));
 
     /* @todo cache read data */
-    if (pStateFilePath->isEmpty())
+    if (strStateFilePath.isEmpty())
     {
         /* No saved state data. */
@@ -5074 +5053 @@
 
     PSSMHANDLE pSSM;
-    int vrc = SSMR3Open(pStateFilePath->raw(), 0 /*fFlags*/, &pSSM);
+    int vrc = SSMR3Open(strStateFilePath.c_str(), 0 /*fFlags*/, &pSSM);
     if (RT_SUCCESS(vrc))
     {
@@ -5197 +5176 @@
     uint32_t u32Height = 0;
 
-    int vrc = readSavedDisplayScreenshot(&mSSData->mStateFilePath, 0 /* u32Type */, &pu8Data, &cbData, &u32Width, &u32Height);
+    int vrc = readSavedDisplayScreenshot(mSSData->mStateFilePath, 0 /* u32Type */, &pu8Data, &cbData, &u32Width, &u32Height);
 
     if (RT_FAILURE(vrc))
@@ -5234 +5213 @@
     uint32_t u32Height = 0;
 
-    int vrc = readSavedDisplayScreenshot(&mSSData->mStateFilePath, 0 /* u32Type */, &pu8Data, &cbData, &u32Width, &u32Height);
+    int vrc = readSavedDisplayScreenshot(mSSData->mStateFilePath, 0 /* u32Type */, &pu8Data, &cbData, &u32Width, &u32Height);
 
     if (RT_FAILURE(vrc))
@@ -5296 +5275 @@
     uint32_t u32Height = 0;
 
-    int vrc = readSavedDisplayScreenshot(&mSSData->mStateFilePath, 1 /* u32Type */, &pu8Data, &cbData, &u32Width, &u32Height);
+    int vrc = readSavedDisplayScreenshot(mSSData->mStateFilePath, 1 /* u32Type */, &pu8Data, &cbData, &u32Width, &u32Height);
 
     if (RT_FAILURE(vrc))
@@ -5333 +5312 @@
     uint32_t u32Height = 0;
 
-    int vrc = readSavedDisplayScreenshot(&mSSData->mStateFilePath, 1 /* u32Type */, &pu8Data, &cbData, &u32Width, &u32Height);
+    int vrc = readSavedDisplayScreenshot(mSSData->mStateFilePath, 1 /* u32Type */, &pu8Data, &cbData, &u32Width, &u32Height);
 
     if (RT_FAILURE(vrc))
@@ -5498 +5477 @@
 
     RTFILE LogFile;
-    int vrc = RTFileOpen(&LogFile, log.raw(),
+    int vrc = RTFileOpen(&LogFile, log.c_str(),
                          RTFILE_O_OPEN | RTFILE_O_READ | RTFILE_O_DENY_NONE);
     if (RT_SUCCESS(vrc))
@@ -5508 +5487 @@
             rc = setError(VBOX_E_IPRT_ERROR,
                           tr("Could not read log file '%s' (%Rrc)"),
-                          log.raw(), vrc);
+                          log.c_str(), vrc);
         RTFileClose(LogFile);
     }
@@ -5514 +5493 @@
         rc = setError(VBOX_E_IPRT_ERROR,
                       tr("Could not open log file '%s' (%Rrc)"),
-                      log.raw(), vrc);
+                      log.c_str(), vrc);
 
     if (FAILED(rc))
@@ -5630 +5609 @@
     Utf8Str settingsDir;
     if (isInOwnDir(&settingsDir))
-    {
         /* Log folder is <Machines>/<VM_Name>/Logs */
-        aLogFolder = Utf8StrFmt("%s%cLogs", settingsDir.raw(), RTPATH_DELIMITER);
-    }
+        aLogFolder = settingsDir;
     else
     {
         /* Log folder is <Machines>/<VM_SnapshotFolder>/Logs */
-        Assert(!mUserData->mSnapshotFolderFull.isEmpty());
-        aLogFolder = Utf8StrFmt ("%ls%cLogs", mUserData->mSnapshotFolderFull.raw(),
-                                 RTPATH_DELIMITER);
-    }
+        Assert(!mUserData->m_strSnapshotFolderFull.isEmpty());
+        aLogFolder = mUserData->m_strSnapshotFolderFull;
+    }
+
+    aLogFolder.append(RTPATH_DELIMITER);
+    aLogFolder.append("Logs");
 }
 
@@ -5654 +5633 @@
     if (idx == 0)
         log = Utf8StrFmt("%s%cVBox.log",
-                         logFolder.raw(), RTPATH_DELIMITER);
+                         logFolder.c_str(), RTPATH_DELIMITER);
     else
         log = Utf8StrFmt("%s%cVBox.log.%d",
-                         logFolder.raw(), RTPATH_DELIMITER, idx);
+                         logFolder.c_str(), RTPATH_DELIMITER, idx);
     return log;
 }
@@ -5682 +5661 @@
     if (!mData->mRegistered)
         return setError(E_UNEXPECTED,
-                        tr("The machine '%ls' is not registered"),
-                        mUserData->mName.raw());
+                        tr("The machine '%s' is not registered"),
+                        mUserData->s.strName.c_str());
 
     LogFlowThisFunc(("mSession.mState=%s\n", Global::stringifySessionState(mData->mSession.mState)));
@@ -5691 +5670 @@
          || mData->mSession.mState == SessionState_Unlocking)
         return setError(VBOX_E_INVALID_OBJECT_STATE,
-                        tr("The machine '%ls' is already locked by a session (or being locked or unlocked)"),
-                        mUserData->mName.raw());
+                        tr("The machine '%s' is already locked by a session (or being locked or unlocked)"),
+                        mUserData->s.strName.c_str());
 
     /* may not be busy */
@@ -5775 +5754 @@
 
         Utf8Str idStr = mData->mUuid.toString();
-        Utf8Str strName = mUserData->mName;
-        const char * args[] = {szPath, "--comment", strName.c_str(), "--startvm", idStr.c_str(), "--no-startvm-errormsgbox", 0 };
+        const char * args[] = {szPath, "--comment", mUserData->s.strName.c_str(), "--startvm", idStr.c_str(), "--no-startvm-errormsgbox", 0 };
         vrc = RTProcCreate(szPath, args, env, 0, &pid);
     }
@@ -5794 +5772 @@
 
         Utf8Str idStr = mData->mUuid.toString();
-        Utf8Str strName = mUserData->mName;
-        const char * args[] = {szPath, "--comment", strName.c_str(), "--startvm", idStr.c_str(), 0 };
+        const char * args[] = {szPath, "--comment", mUserData->s.strName.c_str(), "--startvm", idStr.c_str(), 0 };
         vrc = RTProcCreate(szPath, args, env, 0, &pid);
     }
@@ -5819 +5796 @@
         Utf8Str idStr = mData->mUuid.toString();
         /* Leave space for 2 args, as "headless" needs --vrdp off on non-OSE. */
-        Utf8Str strName = mUserData->mName;
-        const char * args[] = {szPath, "--comment", strName.c_str(), "--startvm", idStr.c_str(), 0, 0, 0 };
+        const char * args[] = {szPath, "--comment", mUserData->s.strName.c_str(), "--startvm", idStr.c_str(), 0, 0, 0 };
 #ifdef VBOX_WITH_VRDP
         if (strType == "headless")
@@ -5852 +5828 @@
     if (RT_FAILURE(vrc))
         return setError(VBOX_E_IPRT_ERROR,
-                        tr("Could not launch a process for the machine '%ls' (%Rrc)"),
-                        mUserData->mName.raw(), vrc);
+                        tr("Could not launch a process for the machine '%s' (%Rrc)"),
+                        mUserData->s.strName.c_str(), vrc);
 
     LogFlowThisFunc(("launched.pid=%d(0x%x)\n", pid, pid));
@@ -6050 +6026 @@
         if (RT_SUCCESS(vrc) && status.enmReason == RTPROCEXITREASON_NORMAL)
             rc = setError(E_FAIL,
-                          tr("The virtual machine '%ls' has terminated unexpectedly during startup with exit code %d"),
-                          getName().raw(), status.iStatus);
+                          tr("The virtual machine '%s' has terminated unexpectedly during startup with exit code %d"),
+                          getName().c_str(), status.iStatus);
         else if (RT_SUCCESS(vrc) && status.enmReason == RTPROCEXITREASON_SIGNAL)
             rc = setError(E_FAIL,
-                          tr("The virtual machine '%ls' has terminated unexpectedly during startup because of signal %d"),
-                          getName().raw(), status.iStatus);
+                          tr("The virtual machine '%s' has terminated unexpectedly during startup because of signal %d"),
+                          getName().c_str(), status.iStatus);
         else if (RT_SUCCESS(vrc) && status.enmReason == RTPROCEXITREASON_ABEND)
             rc = setError(E_FAIL,
-                          tr("The virtual machine '%ls' has terminated abnormally"),
-                          getName().raw(), status.iStatus);
+                          tr("The virtual machine '%s' has terminated abnormally"),
+                          getName().c_str(), status.iStatus);
         else
             rc = setError(E_FAIL,
-                          tr("The virtual machine '%ls' has terminated unexpectedly during startup (%Rrc)"),
-                          getName().raw(), rc);
+                          tr("The virtual machine '%s' has terminated unexpectedly during startup (%Rrc)"),
+                          getName().c_str(), rc);
     }
 
@@ -6122 +6098 @@
     if (!mData->mAccessible)
         return setError(VBOX_E_INVALID_OBJECT_STATE,
-                        tr("The machine '%ls' with UUID {%s} is inaccessible and cannot be registered"),
-                        mUserData->mName.raw(),
-                        mData->mUuid.toString().raw());
+                        tr("The machine '%s' with UUID {%s} is inaccessible and cannot be registered"),
+                        mUserData->s.strName.c_str(),
+                        mData->mUuid.toString().c_str());
 
     AssertReturn(autoCaller.state() == Ready, E_FAIL);
@@ -6130 +6106 @@
     if (mData->mRegistered)
         return setError(VBOX_E_INVALID_OBJECT_STATE,
-                        tr("The machine '%ls' with UUID {%s} is already registered"),
-                        mUserData->mName.raw(),
-                        mData->mUuid.toString().raw());
+                        tr("The machine '%s' with UUID {%s} is already registered"),
+                        mUserData->s.strName.c_str(),
+                        mData->mUuid.toString().c_str());
 
     HRESULT rc = S_OK;
@@ -6356 +6332 @@
 
     /* initialize mOSTypeId */
-    mUserData->mOSTypeId = mParent->getUnknownOSType()->id();
+    mUserData->s.strOsType = mParent->getUnknownOSType()->id();
 
     /* create associated BIOS settings object */
@@ -6665 +6641 @@
 HRESULT Machine::loadMachineDataFromSettings(const settings::MachineConfigFile &config)
 {
-    /* name (required) */
-    mUserData->mName = config.strName;
-
-    /* nameSync (optional, default is true) */
-    mUserData->mNameSync = config.fNameSync;
-
-    mUserData->mDescription = config.strDescription;
-
-    // guest OS type
-    mUserData->mOSTypeId = config.strOsType;
-    /* look up the object by Id to check it is valid */
+    // copy name, description, OS type, teleporter, UTC etc.
+    mUserData->s = config.machineUserData;
+
+    // look up the object by Id to check it is valid
     ComPtr<IGuestOSType> guestOSType;
-    HRESULT rc = mParent->GetGuestOSType(mUserData->mOSTypeId,
+    HRESULT rc = mParent->GetGuestOSType(Bstr(mUserData->s.strOsType),
                                          guestOSType.asOutParam());
     if (FAILED(rc)) return rc;
@@ -6691 +6660 @@
             return setError(E_FAIL,
                             tr("Invalid saved state file path '%s' (%Rrc)"),
-                            config.strStateFile.raw(),
+                            config.strStateFile.c_str(),
                             vrc);
         mSSData->mStateFilePath = stateFilePathFull;
     }
 
-    /* snapshotFolder (optional) */
-    rc = COMSETTER(SnapshotFolder)(Bstr(config.strSnapshotFolder));
+    // snapshot folder needs special processing so set it again
+    rc = COMSETTER(SnapshotFolder)(Bstr(config.machineUserData.strSnapshotFolder));
     if (FAILED(rc)) return rc;
 
@@ -6704 +6673 @@
 
     mData->mLastStateChange = config.timeLastStateChange;
-
-    /* teleportation */
-    mUserData->mTeleporterEnabled  = config.fTeleporterEnabled;
-    mUserData->mTeleporterPort     = config.uTeleporterPort;
-    mUserData->mTeleporterAddress  = config.strTeleporterAddress;
-    mUserData->mTeleporterPassword = config.strTeleporterPassword;
-
-    /* RTC */
-    mUserData->mRTCUseUTC = config.fRTCUseUTC;
 
     /*
@@ -6797 +6757 @@
             return setError(E_FAIL,
                             tr("Invalid saved state file path '%s' (%Rrc)"),
-                            strStateFile.raw(),
+                            strStateFile.c_str(),
                             vrc);
     }
@@ -7078 +7038 @@
             return setError(VBOX_E_OBJECT_IN_USE,
                             tr("Storage controller named '%s' already exists"),
-                            ctlData.strName.raw());
+                            ctlData.strName.c_str());
 
         pCtl.createObject();
@@ -7138 +7098 @@
          ++it)
     {
+        const settings::AttachedDevice &ad = *it;
+
         for (settings::AttachedDevicesList::const_iterator it2 = it;
              it2 != data.llAttachedDevices.end();
@@ -7145 +7107 @@
                 continue;
 
-            if (   (*it).lPort == (*it2).lPort
-                && (*it).lDevice == (*it2).lDevice)
+            const settings::AttachedDevice &ad2 = *it2;
+
+            if (   ad.lPort == ad2.lPort
+                && ad.lDevice == ad2.lDevice)
             {
                 return setError(E_FAIL,
-                                tr("Duplicate attachments for storage controller '%s', port %d, device %d of the virtual machine '%ls'"),
-                                aStorageController->getName().raw(), (*it).lPort, (*it).lDevice, mUserData->mName.raw());
+                                tr("Duplicate attachments for storage controller '%s', port %d, device %d of the virtual machine '%s'"),
+                                aStorageController->getName().c_str(),
+                                ad.lPort,
+                                ad.lDevice,
+                                mUserData->s.strName.c_str());
             }
         }
@@ -7198 +7165 @@
                         return setError(E_FAIL,
                                         tr("Immutable hard disk '%s' with UUID {%RTuuid} cannot be directly attached to snapshot with UUID {%RTuuid} "
-                                           "of the virtual machine '%ls' ('%s')"),
-                                        medium->getLocationFull().raw(),
+                                           "of the virtual machine '%s' ('%s')"),
+                                        medium->getLocationFull().c_str(),
                                         dev.uuid.raw(),
                                         aSnapshotId->raw(),
-                                        mUserData->mName.raw(),
-                                        mData->m_strConfigFileFull.raw());
+                                        mUserData->s.strName.c_str(),
+                                        mData->m_strConfigFileFull.c_str());
 
                     return setError(E_FAIL,
-                                    tr("Immutable hard disk '%s' with UUID {%RTuuid} cannot be directly attached to the virtual machine '%ls' ('%s')"),
-                                    medium->getLocationFull().raw(),
+                                    tr("Immutable hard disk '%s' with UUID {%RTuuid} cannot be directly attached to the virtual machine '%s' ('%s')"),
+                                    medium->getLocationFull().c_str(),
                                     dev.uuid.raw(),
-                                    mUserData->mName.raw(),
-                                    mData->m_strConfigFileFull.raw());
+                                    mUserData->s.strName.c_str(),
+                                    mData->m_strConfigFileFull.c_str());
                 }
 
@@ -7217 +7184 @@
                    )
                     return setError(E_FAIL,
-                                    tr("Hard disk '%s' with UUID {%RTuuid} cannot be directly attached to the virtual machine '%ls' ('%s') "
+                                    tr("Hard disk '%s' with UUID {%RTuuid} cannot be directly attached to the virtual machine '%s' ('%s') "
                                        "because it has %d differencing child hard disks"),
-                                    medium->getLocationFull().raw(),
+                                    medium->getLocationFull().c_str(),
                                     dev.uuid.raw(),
-                                    mUserData->mName.raw(),
-                                    mData->m_strConfigFileFull.raw(),
+                                    mUserData->s.strName.c_str(),
+                                    mData->m_strConfigFileFull.c_str(),
                                     medium->getChildren().size());
 
@@ -7228 +7195 @@
                                    medium))
                     return setError(E_FAIL,
-                                    tr("Hard disk '%s' with UUID {%RTuuid} is already attached to the virtual machine '%ls' ('%s')"),
-                                    medium->getLocationFull().raw(),
+                                    tr("Hard disk '%s' with UUID {%RTuuid} is already attached to the virtual machine '%s' ('%s')"),
+                                    medium->getLocationFull().c_str(),
                                     dev.uuid.raw(),
-                                    mUserData->mName.raw(),
-                                    mData->m_strConfigFileFull.raw());
+                                    mUserData->s.strName.c_str(),
+                                    mData->m_strConfigFileFull.c_str());
 
                 break;
@@ -7239 +7206 @@
             default:
                 return setError(E_FAIL,
-                                tr("Device with unknown type is attached to the virtual machine '%s' ('%s')"),
-                                medium->getLocationFull().raw(),
-                                mUserData->mName.raw(),
-                                mData->m_strConfigFileFull.raw());
+                                tr("Device '%s' with unknown type is attached to the virtual machine '%s' ('%s')"),
+                                medium->getLocationFull().c_str(),
+                                mUserData->s.strName.c_str(),
+                                mData->m_strConfigFileFull.c_str());
         }
 
@@ -7314 +7281 @@
             return setError(E_FAIL,
                             tr("Could not find a snapshot with UUID {%s}"),
-                            aId.toString().raw());
+                            aId.toString().c_str());
         return E_FAIL;
     }
@@ -7384 +7351 @@
         return setError(VBOX_E_OBJECT_NOT_FOUND,
                         tr("Could not find a storage controller named '%s'"),
-                        aName.raw());
+                        aName.c_str());
     return VBOX_E_OBJECT_NOT_FOUND;
 }
@@ -7437 +7404 @@
 
     /* attempt to rename the settings file if machine name is changed */
-    if (    mUserData->mNameSync
+    if (    mUserData->s.fNameSync
          && mUserData.isBackedUp()
-         && mUserData.backedUpData()->mName != mUserData->mName
+         && mUserData.backedUpData()->s.strName != mUserData->s.strName
        )
     {
@@ -7452 +7419 @@
             int vrc = VINF_SUCCESS;
 
-            Utf8Str name = mUserData.backedUpData()->mName;
-            Utf8Str newName = mUserData->mName;
+            Utf8Str name = mUserData.backedUpData()->s.strName;
+            Utf8Str newName = mUserData->s.strName;
 
             configFile = mData->m_strConfigFileFull;
@@ -7464 +7431 @@
             {
                 newConfigDir.stripFilename();
-                newConfigDir = Utf8StrFmt("%s%c%s",
-                    newConfigDir.raw(), RTPATH_DELIMITER, newName.raw());
+                newConfigDir.append(RTPATH_DELIMITER);
+                newConfigDir.append(newName);
                 /* new dir and old dir cannot be equal here because of 'if'
                  * above and because name != newName */
@@ -7472 +7439 @@
                 {
                     /* perform real rename only if the machine is not new */
-                    vrc = RTPathRename(configDir.raw(), newConfigDir.raw(), 0);
+                    vrc = RTPathRename(configDir.c_str(), newConfigDir.c_str(), 0);
                     if (RT_FAILURE(vrc))
                     {
                         rc = setError(E_FAIL,
                                       tr("Could not rename the directory '%s' to '%s' to save the settings file (%Rrc)"),
-                                      configDir.raw(),
-                                      newConfigDir.raw(),
+                                      configDir.c_str(),
+                                      newConfigDir.c_str(),
                                       vrc);
                         break;
@@ -7487 +7454 @@
 
             newConfigFile = Utf8StrFmt("%s%c%s.xml",
-                newConfigDir.raw(), RTPATH_DELIMITER, newName.raw());
+                newConfigDir.c_str(), RTPATH_DELIMITER, newName.c_str());
 
             /* then try to rename the settings file itself */
@@ -7494 +7461 @@
                 /* get the path to old settings file in renamed directory */
                 configFile = Utf8StrFmt("%s%c%s",
-                                        newConfigDir.raw(),
+                                        newConfigDir.c_str(),
                                         RTPATH_DELIMITER,
                                         RTPathFilename(configFile.c_str()));
@@ -7500 +7467 @@
                 {
                     /* perform real rename only if the machine is not new */
-                    vrc = RTFileRename(configFile.raw(), newConfigFile.raw(), 0);
+                    vrc = RTFileRename(configFile.c_str(), newConfigFile.c_str(), 0);
                     if (RT_FAILURE(vrc))
                     {
                         rc = setError(E_FAIL,
                                       tr("Could not rename the settings file '%s' to '%s' (%Rrc)"),
-                                      configFile.raw(),
-                                      newConfigFile.raw(),
+                                      configFile.c_str(),
+                                      newConfigFile.c_str(),
                                       vrc);
                         break;
@@ -7531 +7498 @@
 
             /* update the snapshot folder */
-            Utf8Str path = mUserData->mSnapshotFolderFull;
+            if (RTPathStartsWith(mUserData->m_strSnapshotFolderFull.c_str(),
+                                 configDir.c_str()))
+            {
+                mUserData->m_strSnapshotFolderFull = Utf8StrFmt("%s%s",
+                                                                newConfigDir.c_str(),
+                                                                mUserData->m_strSnapshotFolderFull.c_str() + configDir.length());
+                copyPathRelativeToMachine(mUserData->m_strSnapshotFolderFull,
+                                          mUserData->s.strSnapshotFolder);
+            }
+
+            /* update the saved state file path */
+            Utf8Str path = mSSData->mStateFilePath;
             if (RTPathStartsWith(path.c_str(), configDir.c_str()))
-            {
-                path = Utf8StrFmt("%s%s", newConfigDir.raw(),
-                                  path.raw() + configDir.length());
-                mUserData->mSnapshotFolderFull = path;
-                Utf8Str strTemp;
-                copyPathRelativeToMachine(path, strTemp);
-                mUserData->mSnapshotFolder = strTemp;
-            }
-
-            /* update the saved state file path */
-            path = mSSData->mStateFilePath;
-            if (RTPathStartsWith(path.c_str(), configDir.c_str()))
-            {
-                path = Utf8StrFmt("%s%s", newConfigDir.raw(),
-                                  path.raw() + configDir.length());
-                mSSData->mStateFilePath = path;
-            }
+                mSSData->mStateFilePath = Utf8StrFmt("%s%s",
+                                                     newConfigDir.c_str(),
+                                                     path.c_str() + configDir.length());
 
             /* Update saved state file paths of all online snapshots.
@@ -7564 +7528 @@
             /* silently try to rename everything back */
             if (fileRenamed)
-                RTFileRename(newConfigFile.raw(), configFile.raw(), 0);
+                RTFileRename(newConfigFile.c_str(), configFile.c_str(), 0);
             if (dirRenamed)
-                RTPathRename(newConfigDir.raw(), configDir.raw(), 0);
+                RTPathRename(newConfigDir.c_str(), configDir.c_str(), 0);
         }
 
@@ -7587 +7551 @@
                 return setError(E_FAIL,
                                 tr("Could not create a directory '%s' to save the settings file (%Rrc)"),
-                                path.raw(),
+                                path.c_str(),
                                 vrc);
             }
@@ -7600 +7564 @@
             return setError(E_FAIL,
                             tr("Could not create the settings file '%s' (%Rrc)"),
-                            path.raw(),
+                            path.c_str(),
                             vrc);
         RTFileClose(f);
@@ -7775 +7739 @@
 
     config.uuid = mData->mUuid;
-    config.strName = mUserData->mName;
-    config.fNameSync = !!mUserData->mNameSync;
-    config.strDescription = mUserData->mDescription;
-    config.strOsType = mUserData->mOSTypeId;
+
+    // copy name, description, OS type, teleport, UTC etc.
+    config.machineUserData = mUserData->s;
 
     if (    mData->mMachineState == MachineState_Saved
@@ -7806 +7769 @@
         config.uuidCurrentSnapshot.clear();
 
-    config.strSnapshotFolder = mUserData->mSnapshotFolder;
-    // config.fCurrentStateModified is special, see below
     config.timeLastStateChange = mData->mLastStateChange;
     config.fAborted = (mData->mMachineState == MachineState_Aborted);
     /// @todo Live Migration:        config.fTeleported = (mData->mMachineState == MachineState_Teleported);
-
-    config.fTeleporterEnabled    = !!mUserData->mTeleporterEnabled;
-    config.uTeleporterPort       = mUserData->mTeleporterPort;
-    config.strTeleporterAddress  = mUserData->mTeleporterAddress;
-    config.strTeleporterPassword = mUserData->mTeleporterPassword;
-
-    config.fRTCUseUTC = !!mUserData->mRTCUseUTC;
 
     HRESULT rc = saveHardware(config.hardwareMachine);
@@ -8367 +8321 @@
             DeviceType_T devType = pAtt->getType();
             Medium* pMedium = pAtt->getMedium();
+            ComObjPtr<Medium> pBase = pMedium->getBase();
 
             if (   devType != DeviceType_HardDisk
@@ -8384 +8339 @@
                     else
                         aProgress->SetNextOperation(BstrFmt(tr("Skipping medium '%s'"),
-                                                            pMedium->getBase()->getName().raw()),
+                                                            pBase->getName().c_str()),
                                                     aWeight);        // weight
                 }
@@ -8394 +8349 @@
             /* need a diff */
             aProgress->SetNextOperation(BstrFmt(tr("Creating differencing hard disk for '%s'"),
-                                                pMedium->getBase()->getName().raw()),
+                                                pBase->getName().c_str()),
                                         aWeight);        // weight
 
@@ -8401 +8356 @@
             rc = diff->init(mParent,
                             pMedium->getPreferredDiffFormat(),
-                            Utf8StrFmt("%ls"RTPATH_SLASH_STR,
-                                       mUserData->mSnapshotFolderFull.raw()).raw(),
+                            Utf8Str(mUserData->m_strSnapshotFolderFull).append(RTPATH_SLASH_STR),
                             pfNeedsSaveSettings);
             if (FAILED(rc)) throw rc;
@@ -8842 +8796 @@
 
         LogFlowThisFunc(("Examining current medium '%s' (implicit: %d)\n",
-                            (pMedium) ? pMedium->getName().raw() : "NULL",
-                            fImplicit));
+                         (pMedium) ? pMedium->getName().c_str() : "NULL",
+                         fImplicit));
 
         /** @todo convert all this Machine-based voodoo to MediumAttachment
@@ -8893 +8847 @@
                 if (pOldAttach->getMedium() == pMedium)
                 {
-                    LogFlowThisFunc(("--> medium '%s' was attached before, will not remove\n", pMedium->getName().raw()));
+                    LogFlowThisFunc(("--> medium '%s' was attached before, will not remove\n", pMedium->getName().c_str()));
 
                     /* yes: remove from old to avoid de-association */
@@ -8916 +8870 @@
         if (pAttach->getType() == DeviceType_HardDisk && pMedium)
         {
-            LogFlowThisFunc(("detaching medium '%s' from machine\n", pMedium->getName().raw()));
+            LogFlowThisFunc(("detaching medium '%s' from machine\n", pMedium->getName().c_str()));
 
             /* now de-associate from the current machine state */
@@ -9039 +8993 @@
     Utf8Str settingsDir = mData->m_strConfigFileFull;
     settingsDir.stripFilename();
-    char *dirName = RTPathFilename(settingsDir.c_str());
-
-    AssertReturn(dirName, false);
+    Utf8Str strDirName = RTPathFilename(settingsDir.c_str());
+
+    AssertReturn(!strDirName.isEmpty(), false);
 
     /* if we don't rename anything on name change, return false shorlty */
-    if (!mUserData->mNameSync)
+    if (!mUserData->s.fNameSync)
         return false;
 
@@ -9050 +9004 @@
         *aSettingsDir = settingsDir;
 
-    return Bstr(dirName) == mUserData->mName;
+    return strDirName == mUserData->s.strName;
 }
 
@@ -9547 +9501 @@
 {
     LogFlowThisFuncEnter();
-    LogFlowThisFunc(("mName={%ls}\n", aMachine->mUserData->mName.raw()));
+    LogFlowThisFunc(("mName={%s}\n", aMachine->mUserData->s.strName.c_str()));
 
     AssertReturn(aMachine, E_INVALIDARG);
@@ -10343 +10297 @@
     if (mData->mMachineState == MachineState_Paused)
     {
-        stateFilePath = Utf8StrFmt("%ls%c{%RTuuid}.sav",
-                                   mUserData->mSnapshotFolderFull.raw(),
+        stateFilePath = Utf8StrFmt("%s%c{%RTuuid}.sav",
+                                   mUserData->m_strSnapshotFolderFull.c_str(),
                                    RTPATH_DELIMITER, mData->mUuid.raw());
     }
@@ -10507 +10461 @@
         {
             Utf8Str utf8Flags(aFlags);
-            int vrc = validateFlags(utf8Flags.raw(), &fFlags);
+            int vrc = validateFlags(utf8Flags.c_str(), &fFlags);
             AssertRCReturn(vrc, E_INVALIDARG);
         }
@@ -10569 +10523 @@
          */
         if (    mHWData->mGuestPropertyNotificationPatterns.isEmpty()
-             || RTStrSimplePatternMultiMatch(mHWData->mGuestPropertyNotificationPatterns.raw(),
+             || RTStrSimplePatternMultiMatch(mHWData->mGuestPropertyNotificationPatterns.c_str(),
                                              RTSTR_MAX,
-                                             utf8Name.raw(),
+                                             utf8Name.c_str(),
                                              RTSTR_MAX, NULL)
            )

trunk/src/VBox/Main/MediumImpl.cpp

@@ -1012 +1012 @@
 
     LogFlowThisFunc(("m->strLocationFull='%s', m->strFormat=%s, m->id={%RTuuid}\n",
-                     m->strLocationFull.raw(), m->strFormat.raw(), m->id.raw()));
+                     m->strLocationFull.c_str(), m->strFormat.c_str(), m->id.raw()));
 
     /* Don't call queryInfo() for registered media to prevent the calling
@@ -1085 +1085 @@
     size_t lenLocation = aLocation.length();
     if (lenLocation > 12)
-        memcpy(&uuid.au8[4], aLocation.raw() + (lenLocation - 12), 12);
+        memcpy(&uuid.au8[4], aLocation.c_str() + (lenLocation - 12), 12);
     else
-        memcpy(&uuid.au8[4 + 12 - lenLocation], aLocation.raw(), lenLocation);
+        memcpy(&uuid.au8[4 + 12 - lenLocation], aLocation.c_str(), lenLocation);
     unconst(m->id) = uuid;
 
@@ -1436 +1436 @@
         return setError(VBOX_E_INVALID_OBJECT_STATE,
                         tr("Cannot change the type of medium '%s' because it is a differencing medium"),
-                        m->strLocationFull.raw());
+                        m->strLocationFull.c_str());
 
     /* cannot change the type of a medium being in use by more than one VM */
@@ -1442 +1442 @@
         return setError(VBOX_E_INVALID_OBJECT_STATE,
                         tr("Cannot change the type of medium '%s' because it is attached to %d virtual machines"),
-                        m->strLocationFull.raw(), m->backRefs.size());
+                        m->strLocationFull.c_str(), m->backRefs.size());
 
     switch (aType)
@@ -1461 +1461 @@
                 return setError(VBOX_E_OBJECT_IN_USE,
                                 tr("Cannot change type for medium '%s' since it has %d child media"),
-                                m->strLocationFull.raw(), getChildren().size());
+                                m->strLocationFull.c_str(), getChildren().size());
             if (aType == MediumType_Shareable)
             {
@@ -1468 +1468 @@
                     return setError(VBOX_E_INVALID_OBJECT_STATE,
                                     tr("Cannot change type for medium '%s' to 'Shareable' since it is a dynamic medium storage unit"),
-                                    m->strLocationFull.raw());
+                                    m->strLocationFull.c_str());
             }
             break;
@@ -1599 +1599 @@
         return setError(VBOX_E_NOT_SUPPORTED,
                         tr("Medium '%s' is not differencing"),
-                        m->strLocationFull.raw());
+                        m->strLocationFull.c_str());
 
     if (m->autoReset != !!aAutoReset)
@@ -1830 +1830 @@
             rc = setError(VBOX_E_INVALID_OBJECT_STATE,
                           tr("Medium '%s' is not locked for reading"),
-                          m->strLocationFull.raw());
+                          m->strLocationFull.c_str());
             break;
         }
@@ -1920 +1920 @@
             rc = setError(VBOX_E_INVALID_OBJECT_STATE,
                           tr("Medium '%s' is not locked for writing"),
-                          m->strLocationFull.raw());
+                          m->strLocationFull.c_str());
             break;
         }
@@ -2106 +2106 @@
             throw setError(VBOX_E_NOT_SUPPORTED,
                            tr("Medium format '%s' does not support dynamic storage creation"),
-                           m->strFormat.raw());
+                           m->strFormat.c_str());
         if (    (aVariant & MediumVariant_Fixed)
             &&  !(m->formatObj->getCapabilities() & MediumFormatCapabilities_CreateDynamic))
             throw setError(VBOX_E_NOT_SUPPORTED,
                            tr("Medium format '%s' does not support fixed storage creation"),
-                           m->strFormat.raw());
+                           m->strFormat.c_str());
 
         if (m->state != MediumState_NotCreated)
@@ -2120 +2120 @@
                              static_cast<IMedium*>(this),
                              (aVariant & MediumVariant_Fixed)
-                               ? BstrFmt(tr("Creating fixed medium storage unit '%s'"), m->strLocationFull.raw())
-                               : BstrFmt(tr("Creating dynamic medium storage unit '%s'"), m->strLocationFull.raw()),
+                               ? BstrFmt(tr("Creating fixed medium storage unit '%s'"), m->strLocationFull.c_str())
+                               : BstrFmt(tr("Creating dynamic medium storage unit '%s'"), m->strLocationFull.c_str()),
                              TRUE /* aCancelable */);
         if (FAILED(rc))
@@ -2193 +2193 @@
         return setError(VBOX_E_INVALID_OBJECT_STATE,
                         tr("Medium type of '%s' is Writethrough"),
-                        m->strLocationFull.raw());
+                        m->strLocationFull.c_str());
     else if (m->type == MediumType_Shareable)
         return setError(VBOX_E_INVALID_OBJECT_STATE,
                         tr("Medium type of '%s' is Shareable"),
-                        m->strLocationFull.raw());
+                        m->strLocationFull.c_str());
 
     /* Apply the normal locking logic to the entire chain. */
@@ -2322 +2322 @@
             throw setError(rc,
                            tr("Failed to lock source media '%s'"),
-                           getLocationFull().raw());
+                           getLocationFull().c_str());
         }
         rc = pTargetMediumLockList->Lock();
@@ -2331 +2331 @@
             throw setError(rc,
                            tr("Failed to lock target media '%s'"),
-                           pTarget->getLocationFull().raw());
+                           pTarget->getLocationFull().c_str());
         }
 
@@ -2337 +2337 @@
         rc = pProgress->init(m->pVirtualBox,
                              static_cast <IMedium *>(this),
-                             BstrFmt(tr("Creating clone medium '%s'"), pTarget->m->strLocationFull.raw()),
+                             BstrFmt(tr("Creating clone medium '%s'"), pTarget->m->strLocationFull.c_str()),
                              TRUE /* aCancelable */);
         if (FAILED(rc))
@@ -2410 +2410 @@
             throw setError(rc,
                            tr("Failed to lock media when compacting '%s'"),
-                           getLocationFull().raw());
+                           getLocationFull().c_str());
         }
 
@@ -2416 +2416 @@
         rc = pProgress->init(m->pVirtualBox,
                              static_cast <IMedium *>(this),
-                             BstrFmt(tr("Compacting medium '%s'"), m->strLocationFull.raw()),
+                             BstrFmt(tr("Compacting medium '%s'"), m->strLocationFull.c_str()),
                              TRUE /* aCancelable */);
         if (FAILED(rc))
@@ -2481 +2481 @@
             throw setError(VBOX_E_NOT_SUPPORTED,
                            tr("Medium type of '%s' is not differencing"),
-                           m->strLocationFull.raw());
+                           m->strLocationFull.c_str());
 
         rc = canClose();
@@ -2505 +2505 @@
             throw setError(rc,
                            tr("Failed to lock media when resetting '%s'"),
-                           getLocationFull().raw());
+                           getLocationFull().c_str());
         }
 
@@ -2511 +2511 @@
         rc = pProgress->init(m->pVirtualBox,
                              static_cast<IMedium*>(this),
-                             BstrFmt(tr("Resetting differencing medium '%s'"), m->strLocationFull.raw()),
+                             BstrFmt(tr("Resetting differencing medium '%s'"), m->strLocationFull.c_str()),
                              FALSE /* aCancelable */);
         if (FAILED(rc))
@@ -2701 +2701 @@
         return setError(VBOX_E_OBJECT_IN_USE,
                         tr("Cannot attach medium '%s' {%RTuuid}: %u differencing child media are being created"),
-                        m->strLocationFull.raw(),
+                        m->strLocationFull.c_str(),
                         m->id.raw(),
                         m->numCreateDiffTasks);
@@ -2744 +2744 @@
             return setError(VBOX_E_OBJECT_IN_USE,
                             tr("Cannot attach medium '%s' {%RTuuid} from snapshot '%RTuuid': medium is already in use by this snapshot!"),
-                            m->strLocationFull.raw(),
+                            m->strLocationFull.c_str(),
                             m->id.raw(),
                             aSnapshotId.raw(),
@@ -2838 +2838 @@
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    LogFlowThisFunc(("Dumping backrefs for medium '%s':\n", m->strLocationFull.raw()));
+    LogFlowThisFunc(("Dumping backrefs for medium '%s':\n", m->strLocationFull.c_str()));
 
     for (BackRefList::iterator it2 = m->backRefs.begin();
@@ -2877 +2877 @@
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    LogFlowThisFunc(("locationFull.before='%s'\n", m->strLocationFull.raw()));
+    LogFlowThisFunc(("locationFull.before='%s'\n", m->strLocationFull.c_str()));
 
     const char *pcszMediumPath = m->strLocationFull.c_str();
@@ -2891 +2891 @@
         unconst(m->strLocation) = path;
 
-        LogFlowThisFunc(("locationFull.after='%s'\n", m->strLocationFull.raw()));
+        LogFlowThisFunc(("locationFull.after='%s'\n", m->strLocationFull.c_str()));
     }
 
@@ -3093 +3093 @@
             return setError(VBOX_E_FILE_ERROR,
                             tr("Invalid medium storage file location '%s' (%Rrc)"),
-                            location.raw(),
+                            location.c_str(),
                             vrc);
 
@@ -3319 +3319 @@
 
                 location = Utf8StrFmt("%s{%RTuuid}.%s",
-                                      location.raw(), id.raw(), strExt.c_str());
+                                      location.c_str(), id.raw(), strExt.c_str());
             }
         }
@@ -3339 +3339 @@
             return setError(VBOX_E_FILE_ERROR,
                             tr("Invalid medium storage file location '%s' (%Rrc)"),
-                            location.raw(), vrc);
+                            location.c_str(), vrc);
 
         /* detect the backend from the storage unit if importing */
@@ -3369 +3369 @@
                     return setError(VBOX_E_FILE_ERROR,
                                     tr("Could not find file for the medium '%s' (%Rrc)"),
-                                    locationFull.raw(), vrc);
+                                    locationFull.c_str(), vrc);
                 else if (aFormat.isEmpty())
                     return setError(VBOX_E_IPRT_ERROR,
                                     tr("Could not get the storage format of the medium '%s' (%Rrc)"),
-                                    locationFull.raw(), vrc);
+                                    locationFull.c_str(), vrc);
                 else
                 {
@@ -3758 +3758 @@
             rc = setError(VBOX_E_INVALID_OBJECT_STATE,
                           tr("Storage for the medium '%s' is not created"),
-                          m->strLocationFull.raw());
+                          m->strLocationFull.c_str());
             break;
         }
@@ -3765 +3765 @@
             rc = setError(VBOX_E_INVALID_OBJECT_STATE,
                           tr("Storage for the medium '%s' is already created"),
-                          m->strLocationFull.raw());
+                          m->strLocationFull.c_str());
             break;
         }
@@ -3772 +3772 @@
             rc = setError(VBOX_E_INVALID_OBJECT_STATE,
                           tr("Medium '%s' is locked for reading by another task"),
-                          m->strLocationFull.raw());
+                          m->strLocationFull.c_str());
             break;
         }
@@ -3779 +3779 @@
             rc = setError(VBOX_E_INVALID_OBJECT_STATE,
                           tr("Medium '%s' is locked for writing by another task"),
-                          m->strLocationFull.raw());
+                          m->strLocationFull.c_str());
             break;
         }
@@ -3788 +3788 @@
                 rc = setError(VBOX_E_INVALID_OBJECT_STATE,
                               tr("Medium '%s' is not accessible. %s"),
-                              m->strLocationFull.raw(), m->strLastAccessError.c_str());
+                              m->strLocationFull.c_str(), m->strLastAccessError.c_str());
             else
                 rc = setError(VBOX_E_INVALID_OBJECT_STATE,
                               tr("Medium '%s' is not accessible"),
-                              m->strLocationFull.raw());
+                              m->strLocationFull.c_str());
             break;
         }
@@ -3799 +3799 @@
             rc = setError(VBOX_E_INVALID_OBJECT_STATE,
                           tr("Storage for the medium '%s' is being created"),
-                          m->strLocationFull.raw());
+                          m->strLocationFull.c_str());
             break;
         }
@@ -3806 +3806 @@
             rc = setError(VBOX_E_INVALID_OBJECT_STATE,
                           tr("Storage for the medium '%s' is being deleted"),
-                          m->strLocationFull.raw());
+                          m->strLocationFull.c_str());
             break;
         }
@@ -3861 +3861 @@
         return setError(VBOX_E_OBJECT_IN_USE,
                         tr("Medium '%s' cannot be closed because it is still attached to %d virtual machines"),
-                           m->strLocationFull.raw(), m->backRefs.size());
+                        m->strLocationFull.c_str(), m->backRefs.size());
 
     // perform extra media-dependent close checks
@@ -3939 +3939 @@
             throw setError(VBOX_E_NOT_SUPPORTED,
                            tr("Medium format '%s' does not support storage deletion"),
-                           m->strFormat.raw());
+                           m->strFormat.c_str());
 
         /* Note that we are fine with Inaccessible state too: a) for symmetry
@@ -4011 +4011 @@
             throw setError(rc,
                            tr("Failed to lock media when deleting '%s'"),
-                           getLocationFull().raw());
+                           getLocationFull().c_str());
         }
 
@@ -4035 +4035 @@
                 rc = pProgress->init(m->pVirtualBox,
                                      static_cast<IMedium*>(this),
-                                     BstrFmt(tr("Deleting medium storage unit '%s'"), m->strLocationFull.raw()),
+                                     BstrFmt(tr("Deleting medium storage unit '%s'"), m->strLocationFull.c_str()),
                                      FALSE /* aCancelable */);
                 if (FAILED(rc))
@@ -4239 +4239 @@
                     throw setError(VBOX_E_INVALID_OBJECT_STATE,
                                    tr("Medium '%s' is attached to a virtual machine with UUID {%RTuuid}. No differencing media based on it may be created until it is detached"),
-                                   m->strLocationFull.raw(), it->machineId.raw());
+                                   m->strLocationFull.c_str(), it->machineId.raw());
 
                 Assert(it->llSnapshotIds.size() == 1);
@@ -4256 +4256 @@
                 rc = pProgress->init(m->pVirtualBox,
                                      static_cast<IMedium*>(this),
-                                     BstrFmt(tr("Creating differencing medium storage unit '%s'"), aTarget->m->strLocationFull.raw()),
+                                     BstrFmt(tr("Creating differencing medium storage unit '%s'"), aTarget->m->strLocationFull.c_str()),
                                      TRUE /* aCancelable */);
                 if (FAILED(rc))
@@ -4377 +4377 @@
                 throw setError(VBOX_E_INVALID_OBJECT_STATE,
                                tr("Media '%s' and '%s' are unrelated"),
-                               m->strLocationFull.raw(), tgtLoc.raw());
+                               m->strLocationFull.c_str(), tgtLoc.c_str());
             }
         }
@@ -4423 +4423 @@
                 throw setError(VBOX_E_INVALID_OBJECT_STATE,
                                tr("Medium '%s' involved in the merge operation has more than one child medium (%d)"),
-                               m->strLocationFull.raw(), getChildren().size());
+                               m->strLocationFull.c_str(), getChildren().size());
             }
             /* One backreference is only allowed if the machine ID is not empty
@@ -4437 +4437 @@
                 throw setError(VBOX_E_OBJECT_IN_USE,
                                tr("Medium '%s' is attached to %d virtual machines"),
-                               m->strLocationFull.raw(), m->backRefs.size());
+                               m->strLocationFull.c_str(), m->backRefs.size());
             if (m->type == MediumType_Immutable)
                 throw setError(VBOX_E_INVALID_OBJECT_STATE,
                                tr("Medium '%s' is immutable"),
-                               m->strLocationFull.raw());
+                               m->strLocationFull.c_str());
         }
         else
@@ -4450 +4450 @@
                 throw setError(VBOX_E_OBJECT_IN_USE,
                                tr("Medium '%s' involved in the merge operation has more than one child medium (%d)"),
-                               pTarget->m->strLocationFull.raw(),
+                               pTarget->m->strLocationFull.c_str(),
                                pTarget->getChildren().size());
             }
@@ -4456 +4456 @@
                 throw setError(VBOX_E_INVALID_OBJECT_STATE,
                                tr("Medium '%s' is immutable"),
-                               pTarget->m->strLocationFull.raw());
+                               pTarget->m->strLocationFull.c_str());
         }
         ComObjPtr<Medium> pLast(fMergeForward ? (Medium *)pTarget : this);
@@ -4469 +4469 @@
                 throw setError(VBOX_E_OBJECT_IN_USE,
                                tr("Medium '%s' involved in the merge operation has more than one child medium (%d)"),
-                               pLast->m->strLocationFull.raw(),
+                               pLast->m->strLocationFull.c_str(),
                                pLast->getChildren().size());
             }
@@ -4475 +4475 @@
                 throw setError(VBOX_E_OBJECT_IN_USE,
                                tr("Medium '%s' is attached to %d virtual machines"),
-                               pLast->m->strLocationFull.raw(),
+                               pLast->m->strLocationFull.c_str(),
                                pLast->m->backRefs.size());
 
@@ -4574 +4574 @@
                 throw setError(rc,
                                tr("Failed to lock media when merging to '%s'"),
-                               pTarget->getLocationFull().raw());
+                               pTarget->getLocationFull().c_str());
             }
         }
@@ -4715 +4715 @@
                                      static_cast<IMedium*>(this),
                                      BstrFmt(tr("Merging medium '%s' to '%s'"),
-                                             getName().raw(),
-                                             tgtName.raw()),
+                                             getName().c_str(),
+                                             tgtName.c_str()),
                                      TRUE /* aCancelable */);
                 if (FAILED(rc))
@@ -4828 +4828 @@
         return setError(VBOX_E_OBJECT_IN_USE,
                         tr("Cannot close medium '%s' because it has %d child media"),
-                        m->strLocationFull.raw(), getChildren().size());
+                        m->strLocationFull.c_str(), getChildren().size());
 
     return S_OK;
@@ -4964 +4964 @@
         error = Utf8StrFmt(" (%Rrc)", aVRC);
     else
-        error = Utf8StrFmt(".\n%s", m->vdError.raw());
+        error = Utf8StrFmt(".\n%s", m->vdError.c_str());
 
     m->vdError.setNull();
@@ -4996 +4996 @@
     if (that->m->vdError.isEmpty())
         that->m->vdError =
-            Utf8StrFmt("%s (%Rrc)", Utf8StrFmtVA(pszFormat, va).raw(), rc);
+            Utf8StrFmt("%s (%Rrc)", Utf8StrFmtVA(pszFormat, va).c_str(), rc);
     else
         that->m->vdError =
-            Utf8StrFmt("%s.\n%s (%Rrc)", that->m->vdError.raw(),
-                       Utf8StrFmtVA(pszFormat, va).raw(), rc);
+            Utf8StrFmt("%s.\n%s (%Rrc)", that->m->vdError.c_str(),
+                       Utf8StrFmtVA(pszFormat, va).c_str(), rc);
 }
 
@@ -5269 +5269 @@
             throw setError(E_FAIL,
                             tr("Could not update medium UUID references to parent '%s' (%s)"),
-                            m->strLocationFull.raw(),
-                            vdError(aVRC).raw());
+                            m->strLocationFull.c_str(),
+                            vdError(aVRC).c_str());
         }
 
@@ -5384 +5384 @@
                 throw setError(VBOX_E_FILE_ERROR,
                                tr("Could not create the medium storage unit '%s'%s"),
-                               location.raw(), vdError(vrc).raw());
+                               location.c_str(), vdError(vrc).c_str());
 
             size = VDGetFileSize(hdd, 0);
@@ -5530 +5530 @@
                     throw setError(VBOX_E_FILE_ERROR,
                                    tr("Could not open the medium storage unit '%s'%s"),
-                                   pMedium->m->strLocationFull.raw(),
-                                   vdError(vrc).raw());
+                                   pMedium->m->strLocationFull.c_str(),
+                                   vdError(vrc).c_str());
             }
 
@@ -5552 +5552 @@
                 throw setError(VBOX_E_FILE_ERROR,
                                 tr("Could not create the differencing medium storage unit '%s'%s"),
-                                targetLocation.raw(), vdError(vrc).raw());
+                                targetLocation.c_str(), vdError(vrc).c_str());
 
             size = VDGetFileSize(hdd, VD_LAST_IMAGE);
@@ -5785 +5785 @@
             throw setError(VBOX_E_FILE_ERROR,
                             tr("Could not merge the medium '%s' to '%s'%s"),
-                            m->strLocationFull.raw(),
-                            pTarget->m->strLocationFull.raw(),
-                            vdError(aVRC).raw());
+                            m->strLocationFull.c_str(),
+                            pTarget->m->strLocationFull.c_str(),
+                            vdError(aVRC).c_str());
         }
 
@@ -6015 +6015 @@
                     throw setError(VBOX_E_FILE_ERROR,
                                    tr("Could not open the medium storage unit '%s'%s"),
-                                   pMedium->m->strLocationFull.raw(),
-                                   vdError(vrc).raw());
+                                   pMedium->m->strLocationFull.c_str(),
+                                   vdError(vrc).c_str());
             }
 
@@ -6079 +6079 @@
                         throw setError(VBOX_E_FILE_ERROR,
                                        tr("Could not open the medium storage unit '%s'%s"),
-                                       pMedium->m->strLocationFull.raw(),
-                                       vdError(vrc).raw());
+                                       pMedium->m->strLocationFull.c_str(),
+                                       vdError(vrc).c_str());
                 }
 
@@ -6088 +6088 @@
                              targetHdd,
                              targetFormat.c_str(),
-                             (fCreatingTarget) ? targetLocation.raw() : (char *)NULL,
+                             (fCreatingTarget) ? targetLocation.c_str() : (char *)NULL,
                              false,
                              0,
@@ -6099 +6099 @@
                     throw setError(VBOX_E_FILE_ERROR,
                                    tr("Could not create the clone medium '%s'%s"),
-                                   targetLocation.raw(), vdError(vrc).raw());
+                                   targetLocation.c_str(), vdError(vrc).c_str());
 
                 size = VDGetFileSize(targetHdd, VD_LAST_IMAGE);
@@ -6234 +6234 @@
                 throw setError(VBOX_E_FILE_ERROR,
                                tr("Could not delete the medium storage unit '%s'%s"),
-                               location.raw(), vdError(vrc).raw());
+                               location.c_str(), vdError(vrc).c_str());
 
         }
@@ -6329 +6329 @@
                     throw setError(VBOX_E_FILE_ERROR,
                                    tr("Could not open the medium storage unit '%s'%s"),
-                                   pMedium->m->strLocationFull.raw(),
-                                   vdError(vrc).raw());
+                                   pMedium->m->strLocationFull.c_str(),
+                                   vdError(vrc).c_str());
 
                 /* Done when we hit the media which should be reset */
@@ -6342 +6342 @@
                 throw setError(VBOX_E_FILE_ERROR,
                                tr("Could not delete the medium storage unit '%s'%s"),
-                               location.raw(), vdError(vrc).raw());
+                               location.c_str(), vdError(vrc).c_str());
 
             /* next, create it again */
@@ -6353 +6353 @@
                 throw setError(VBOX_E_FILE_ERROR,
                                tr("Could not open the medium storage unit '%s'%s"),
-                               parentLocation.raw(), vdError(vrc).raw());
+                               parentLocation.c_str(), vdError(vrc).c_str());
 
             vrc = VDCreateDiff(hdd,
@@ -6369 +6369 @@
                 throw setError(VBOX_E_FILE_ERROR,
                                tr("Could not create the differencing medium storage unit '%s'%s"),
-                               location.raw(), vdError(vrc).raw());
+                               location.c_str(), vdError(vrc).c_str());
 
             size = VDGetFileSize(hdd, VD_LAST_IMAGE);
@@ -6459 +6459 @@
                     throw setError(VBOX_E_FILE_ERROR,
                                    tr("Could not open the medium storage unit '%s'%s"),
-                                   pMedium->m->strLocationFull.raw(),
-                                   vdError(vrc).raw());
+                                   pMedium->m->strLocationFull.c_str(),
+                                   vdError(vrc).c_str());
             }
 
@@ -6476 +6476 @@
                     throw setError(VBOX_E_NOT_SUPPORTED,
                                    tr("Compacting is not yet supported for medium '%s'"),
-                                   location.raw());
+                                   location.c_str());
                 else if (vrc == VERR_NOT_IMPLEMENTED)
                     throw setError(E_NOTIMPL,
                                    tr("Compacting is not implemented, medium '%s'"),
-                                   location.raw());
+                                   location.c_str());
                 else
                     throw setError(VBOX_E_FILE_ERROR,
                                    tr("Could not compact medium '%s'%s"),
-                                   location.raw(),
-                                   vdError(vrc).raw());
+                                   location.c_str(),
+                                   vdError(vrc).c_str());
             }
         }

trunk/src/VBox/Main/NATEngineImpl.cpp

@@ -224 +224 @@
 
 STDMETHODIMP
-NATEngine::COMGETTER(Redirects) (ComSafeArrayOut (BSTR , aNatRules))
+NATEngine::COMGETTER(Redirects)(ComSafeArrayOut(BSTR , aNatRules))
 {
     CheckComArgOutSafeArrayPointerValid(aNatRules);
@@ -241 +241 @@
     {
         settings::NATRule r = it->second;
-        Utf8Str utf = Utf8StrFmt("%s,%d,%s,%d,%s,%d", r.strName.raw(), r.u32Proto,
-                        r.strHostIP.raw(), r.u16HostPort, r.strGuestIP.raw(), r.u16GuestPort);
-        utf.cloneTo(&sf[i]);
+        BstrFmt bstr("%s,%d,%s,%d,%s,%d",
+                     r.strName.c_str(),
+                     r.u32Proto,
+                     r.strHostIP.c_str(),
+                     r.u16HostPort,
+                     r.strGuestIP.c_str(),
+                     r.u16GuestPort);
+        bstr.detachTo(&sf[i]);
     }
     sf.detachTo(ComSafeArrayOutArg(aNatRules));
@@ -276 +281 @@
         name = Utf8StrFmt("%s_%d_%d", proto, aHostPort, aGuestPort);
     }
-    r.strName = name.raw();
+    r.strName = name.c_str();
     r.u32Proto = aProto;
     r.strHostIP = aBindIp;
@@ -405 +410 @@
     {
         mData->mNetwork.cloneTo(aNetwork);
-        Log(("Getter (this:%p) Network: %s\n", this, mData->mNetwork.raw()));
+        Log(("Getter (this:%p) Network: %s\n", this, mData->mNetwork.c_str()));
     }
     return S_OK;
@@ -463 +468 @@
     {
         mData->mTftpPrefix.cloneTo(aTftpPrefix);
-        Log(("Getter (this:%p) TftpPrefix: %s\n", this, mData->mTftpPrefix.raw()));
+        Log(("Getter (this:%p) TftpPrefix: %s\n", this, mData->mTftpPrefix.c_str()));
     }
     return S_OK;
@@ -494 +499 @@
     {
         mData->mTftpBootFile.cloneTo(aTftpBootFile);
-        Log(("Getter (this:%p) BootFile: %s\n", this, mData->mTftpBootFile.raw()));
+        Log(("Getter (this:%p) BootFile: %s\n", this, mData->mTftpBootFile.c_str()));
     }
     return S_OK;
@@ -525 +530 @@
     {
         mData->mTftpNextServer.cloneTo(aTftpNextServer);
-        Log(("Getter (this:%p) NextServer: %s\n", this, mData->mTftpNextServer.raw()));
+        Log(("Getter (this:%p) NextServer: %s\n", this, mData->mTftpNextServer.c_str()));
     }
     return S_OK;

trunk/src/VBox/Main/SessionImpl.cpp

@@ -1028 +1028 @@
 # ifdef VBOX_WITH_NEW_SYS_V_KEYGEN
     Utf8Str ipcKey = ipcId;
-    key_t key = RTStrToUInt32(ipcKey.raw());
+    key_t key = RTStrToUInt32(ipcKey.c_str());
     AssertMsgReturn (key != 0,
                     ("Key value of 0 is not valid for IPC semaphore"),

trunk/src/VBox/Main/SharedFolderImpl.cpp

@@ -218 +218 @@
         return setError(E_INVALIDARG,
                         tr("Invalid shared folder path: '%s' (%Rrc)"),
-                        hostPath.raw(), vrc);
+                        hostPath.c_str(), vrc);
 
     if (RTPathCompare(hostPath.c_str(), hostPathFull) != 0)
         return setError(E_INVALIDARG,
                         tr("Shared folder path '%s' is not absolute"),
-                        hostPath.raw());
+                        hostPath.c_str());
 
     unconst(mParent) = aParent;
@@ -309 +309 @@
 
     m.lastAccessError = BstrFmt (
-        tr ("'%s' is not accessible (%Rrc)"), hostPath.raw(), vrc);
+        tr ("'%s' is not accessible (%Rrc)"), hostPath.c_str(), vrc);
 
     LogWarningThisFunc(("m.lastAccessError=\"%ls\"\n", m.lastAccessError.raw()));

trunk/src/VBox/Main/SnapshotImpl.cpp

@@ -520 +520 @@
 HRESULT Snapshot::deleteStateFile()
 {
-    int vrc = RTFileDelete(m->pMachine->mSSData->mStateFilePath.raw());
+    int vrc = RTFileDelete(m->pMachine->mSSData->mStateFilePath.c_str());
     if (RT_SUCCESS(vrc))
         m->pMachine->mSSData->mStateFilePath.setNull();
@@ -688 +688 @@
  * @param aNewPath
  */
-void Snapshot::updateSavedStatePathsImpl(const char *aOldPath, const char *aNewPath)
+void Snapshot::updateSavedStatePathsImpl(const Utf8Str &strOldPath,
+                                         const Utf8Str &strNewPath)
 {
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
@@ -697 +698 @@
     /* state file may be NULL (for offline snapshots) */
     if (    path.length()
-         && RTPathStartsWith(path.c_str(), aOldPath)
+         && RTPathStartsWith(path.c_str(), strOldPath.c_str())
        )
     {
-        m->pMachine->mSSData->mStateFilePath = Utf8StrFmt("%s%s", aNewPath, path.raw() + strlen(aOldPath));
-
-        LogFlowThisFunc(("-> updated: {%s}\n", path.raw()));
+        m->pMachine->mSSData->mStateFilePath = Utf8StrFmt("%s%s",
+                                                          strNewPath.c_str(),
+                                                          path.c_str() + strOldPath.length());
+        LogFlowThisFunc(("-> updated: {%s}\n", path.c_str()));
     }
 
@@ -710 +712 @@
     {
         Snapshot *pChild = *it;
-        pChild->updateSavedStatePathsImpl(aOldPath, aNewPath);
+        pChild->updateSavedStatePathsImpl(strOldPath, strNewPath);
     }
 }
@@ -725 +727 @@
  *  @note Locks the machine (for the snapshots tree) +  this object + children for writing.
  */
-void Snapshot::updateSavedStatePaths(const char *aOldPath, const char *aNewPath)
-{
-    LogFlowThisFunc(("aOldPath={%s} aNewPath={%s}\n", aOldPath, aNewPath));
-
-    AssertReturnVoid(aOldPath);
-    AssertReturnVoid(aNewPath);
+void Snapshot::updateSavedStatePaths(const Utf8Str &strOldPath,
+                                     const Utf8Str &strNewPath)
+{
+    LogFlowThisFunc(("aOldPath={%s} aNewPath={%s}\n", strOldPath.c_str(), strNewPath.c_str()));
 
     AutoCaller autoCaller(this);
@@ -739 +739 @@
 
     // call the implementation under the tree lock
-    updateSavedStatePathsImpl(aOldPath, aNewPath);
+    updateSavedStatePathsImpl(strOldPath, strNewPath);
 }
 
@@ -926 +926 @@
 {
     LogFlowThisFuncEnter();
-    LogFlowThisFunc(("mName={%ls}\n", aSessionMachine->mUserData->mName.raw()));
+    LogFlowThisFunc(("mName={%s}\n", aSessionMachine->mUserData->s.strName.c_str()));
 
     AssertReturn(aSessionMachine && !Guid(aSnapshotId).isEmpty(), E_INVALIDARG);
@@ -1061 +1061 @@
 {
     LogFlowThisFuncEnter();
-    LogFlowThisFunc(("mName={%ls}\n", aMachine->mUserData->mName.raw()));
+    LogFlowThisFunc(("mName={%s}\n", aMachine->mUserData->s.strName.c_str()));
 
     AssertReturn(aMachine &&  !Guid(aSnapshotId).isEmpty(), E_INVALIDARG);
@@ -1388 +1388 @@
          || mData->mMachineState == MachineState_Saved)
     {
-        strStateFilePath = Utf8StrFmt("%ls%c{%RTuuid}.sav",
-                                      mUserData->mSnapshotFolderFull.raw(),
+        strStateFilePath = Utf8StrFmt("%s%c{%RTuuid}.sav",
+                                      mUserData->m_strSnapshotFolderFull.c_str(),
                                       RTPATH_DELIMITER,
                                       snapshotId.ptr());
@@ -1450 +1450 @@
 
             LogFlowThisFunc(("Copying the execution state from '%s' to '%s'...\n",
-                             stateFrom.raw(), stateTo.raw()));
+                             stateFrom.c_str(), stateTo.c_str()));
 
             aConsoleProgress->SetNextOperation(Bstr(tr("Copying the execution state")),
@@ -1471 +1471 @@
                 throw setError(E_FAIL,
                                tr("Could not copy the state file '%s' to '%s' (%Rrc)"),
-                               stateFrom.raw(),
-                               stateTo.raw(),
+                               stateFrom.c_str(),
+                               stateTo.c_str(),
                                vrc);
         }
@@ -1702 +1702 @@
         ulStateFileSizeMB = (ULONG)(ullSize / _1M);
         LogFlowThisFunc(("op %d: saved state file '%s' has %RI64 bytes (%d MB)\n",
-                         ulOpCount, pSnapshot->stateFilePath().raw(), ullSize, ulStateFileSizeMB));
+                         ulOpCount, pSnapshot->stateFilePath().c_str(), ullSize, ulStateFileSizeMB));
 
         ulTotalWeight += ulStateFileSizeMB;
@@ -1857 +1857 @@
                 Utf8Str snapStateFilePath = aTask.pSnapshot->stateFilePath();
 
-                Utf8Str stateFilePath = Utf8StrFmt("%ls%c{%RTuuid}.sav",
-                                                   mUserData->mSnapshotFolderFull.raw(),
+                Utf8Str stateFilePath = Utf8StrFmt("%s%c{%RTuuid}.sav",
+                                                   mUserData->m_strSnapshotFolderFull.c_str(),
                                                    RTPATH_DELIMITER,
                                                    mData->mUuid.raw());
 
                 LogFlowThisFunc(("Copying saved state file from '%s' to '%s'...\n",
-                                  snapStateFilePath.raw(), stateFilePath.raw()));
+                                  snapStateFilePath.c_str(), stateFilePath.c_str()));
 
                 aTask.pProgress->SetNextOperation(Bstr(tr("Restoring the execution state")),
@@ -1888 +1888 @@
                     throw setError(E_FAIL,
                                    tr("Could not copy the state file '%s' to '%s' (%Rrc)"),
-                                   snapStateFilePath.raw(),
-                                   stateFilePath.raw(),
+                                   snapStateFilePath.c_str(),
+                                   stateFilePath.c_str(),
                                    vrc);
             }
@@ -1917 +1917 @@
                )
             {
-                LogFlowThisFunc(("Picked differencing image '%s' for deletion\n", pMedium->getName().raw()));
+                LogFlowThisFunc(("Picked differencing image '%s' for deletion\n", pMedium->getName().c_str()));
 
                 llDiffAttachmentsToDelete.push_back(pAttach);
@@ -1953 +1953 @@
             AutoWriteLock mlock(pMedium COMMA_LOCKVAL_SRC_POS);
 
-            LogFlowThisFunc(("Detaching old current state in differencing image '%s'\n", pMedium->getName().raw()));
+            LogFlowThisFunc(("Detaching old current state in differencing image '%s'\n", pMedium->getName().c_str()));
 
             // Normally we "detach" the medium by removing the attachment object
@@ -1986 +1986 @@
         {
             ComObjPtr<Medium> &pMedium = *it;
-            LogFlowThisFunc(("Deleting old current state in differencing image '%s'\n", pMedium->getName().raw()));
+            LogFlowThisFunc(("Deleting old current state in differencing image '%s'\n", pMedium->getName().c_str()));
 
             HRESULT rc2 = pMedium->deleteStorage(NULL /* aProgress */,
@@ -2094 +2094 @@
     if (childrenCount > 1)
         return setError(VBOX_E_INVALID_OBJECT_STATE,
-                        tr("Snapshot '%s' of the machine '%ls' cannot be deleted. because it has %d child snapshots, which is more than the one snapshot allowed for deletion"),
+                        tr("Snapshot '%s' of the machine '%s' cannot be deleted. because it has %d child snapshots, which is more than the one snapshot allowed for deletion"),
                         pSnapshot->getName().c_str(),
-                        mUserData->mName.raw(),
+                        mUserData->s.strName.c_str(),
                         childrenCount);
 
@@ -2536 +2536 @@
 
             aTask.pProgress->SetNextOperation(BstrFmt(tr("Merging differencing image '%s'"),
-                                              pMedium->getName().raw()),
+                                              pMedium->getName().c_str()),
                                               ulWeight);
 
@@ -2582 +2582 @@
                                        tr("Snapshot '%s' of the machine '%ls' cannot be deleted while a VM is running, as this case is not implemented yet. You can delete the snapshot when the VM is powered off"),
                                        aTask.pSnapshot->getName().c_str(),
-                                       mUserData->mName.raw());
+                                       mUserData->s.strName.c_str());
 
                     // online medium merge, in the direction decided earlier
@@ -2628 +2628 @@
                     const Utf8Str &loc = it->mpSource->getLocationFull();
                     // Source medium is still there, so merge failed early.
-                    if (RTFileExists(loc.raw()))
+                    if (RTFileExists(loc.c_str()))
                         throw rc;
 
@@ -2870 +2870 @@
         return setError(E_FAIL,
                         tr("Hard disk '%s' has more than one child hard disk (%d)"),
-                        aHD->getLocationFull().raw(),
+                        aHD->getLocationFull().c_str(),
                         aHD->getChildren().size());
 
@@ -2985 +2985 @@
                     rc = setError(rc,
                                   tr("Cannot lock hard disk '%s' for a live merge"),
-                                  aHD->getLocationFull().raw());
+                                  aHD->getLocationFull().c_str());
                 }
                 else
@@ -2999 +2999 @@
                 rc = setError(rc,
                               tr("Failed to construct lock list for a live merge of hard disk '%s'"),
-                              aHD->getLocationFull().raw());
+                              aHD->getLocationFull().c_str());
             }
 
@@ -3028 +3028 @@
             rc = setError(rc,
                           tr("Cannot lock hard disk '%s' for an offline merge"),
-                          aHD->getLocationFull().raw());
+                          aHD->getLocationFull().c_str());
         }
     }

trunk/src/VBox/Main/StorageControllerImpl.cpp

@@ -127 +127 @@
 {
     LogFlowThisFunc(("aParent=%p aName=\"%s\" aInstance=%u\n",
-                     aParent, aName.raw(), aInstance));
+                     aParent, aName.c_str(), aInstance));
 
     ComAssertRet(aParent && !aName.isEmpty(), E_INVALIDARG);

trunk/src/VBox/Main/SystemPropertiesImpl.cpp

@@ -868 +868 @@
         return setError(E_FAIL,
                         tr("Invalid default machine folder '%s' (%Rrc)"),
-                        path.raw(),
+                        path.c_str(),
                         vrc);
 
@@ -889 +889 @@
         return setError(E_FAIL,
                         tr("Invalid default hard disk folder '%s' (%Rrc)"),
-                        path.raw(),
+                        path.c_str(),
                         vrc);
 

trunk/src/VBox/Main/USBControllerImpl.cpp

@@ -59 +59 @@
 struct USBController::Data
 {
-    Data()
-        : pParent(NULL)
-    {};
+    Data(Machine *pMachine)
+        : pParent(pMachine),
+          pHost(pMachine->getVirtualBox()->host())
+    { }
 
     ~Data()
     {};
 
-    /** Parent object. */
     Machine * const                 pParent;
-    /** Peer object. */
+    Host * const                    pHost;
+
+    // peer machine's USB controller
     const ComObjPtr<USBController>  pPeer;
 
@@ -115 +117 @@
     AssertReturn(autoInitSpan.isOk(), E_FAIL);
 
-    m = new Data();
-
-    unconst(m->pParent) = aParent;
+    m = new Data(aParent);
+
     /* mPeer is left null */
 
@@ -153 +154 @@
     AssertReturn(autoInitSpan.isOk(), E_FAIL);
 
-    m = new Data();
-
-    unconst(m->pParent) = aParent;
+    m = new Data(aParent);
+
     unconst(m->pPeer) = aPeer;
 
@@ -197 +197 @@
     AssertReturn(autoInitSpan.isOk(), E_FAIL);
 
-    m = new Data();
-
-    unconst(m->pParent) = aParent;
+    m = new Data(aParent);
+
     /* mPeer is left null */
 
@@ -537 +536 @@
     if (filter->getData().mActive && Global::IsOnline(adep.machineState()))
     {
-        USBProxyService *service = m->pParent->getVirtualBox()->host()->usbProxyService();
+        USBProxyService *service = m->pHost->usbProxyService();
         ComAssertRet(service, E_FAIL);
 
@@ -608 +607 @@
     if (filter->getData().mActive && Global::IsOnline(adep.machineState()))
     {
-        USBProxyService *service = m->pParent->getVirtualBox()->host()->usbProxyService();
+        USBProxyService *service = m->pHost->usbProxyService();
         ComAssertRet(service, E_FAIL);
 
@@ -756 +755 @@
     if (m->llDeviceFilters.isBackedUp())
     {
-        USBProxyService *service = m->pParent->getVirtualBox()->host()->usbProxyService();
+        USBProxyService *service = m->pHost->usbProxyService();
         Assert(service);
 
@@ -1007 +1006 @@
     /* we don't modify our data fields -- no need to lock */
 
-    if (aFilter->mInList && m->pParent->isRegistered())
-    {
-        USBProxyService *service = m->pParent->getVirtualBox()->host()->usbProxyService();
+    if (    aFilter->mInList
+         && m->pParent->isRegistered())
+    {
+        USBProxyService *service = m->pHost->usbProxyService();
         ComAssertRet(service, E_FAIL);
 
@@ -1201 +1201 @@
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    USBProxyService *service = m->pParent->getVirtualBox()->host()->usbProxyService();
+    USBProxyService *service = m->pHost->usbProxyService();
     AssertReturn(service, E_FAIL);
 

trunk/src/VBox/Main/VFSExplorerImpl.cpp

@@ -536 +536 @@
     {
         Bstr progressDesc = BstrFmt(tr("Update directory info for '%s'"),
-                                    m->strPath.raw());
+                                    m->strPath.c_str());
         /* Create the progress object */
         progress.createObject();
 
-        rc = progress->init(mVirtualBox, static_cast<IVFSExplorer*>(this),
+        rc = progress->init(mVirtualBox,
+                            static_cast<IVFSExplorer*>(this),
                             progressDesc,
                             TRUE /* aCancelable */);

trunk/src/VBox/Main/VirtualBoxImpl.cpp

@@ -387 +387 @@
     /* compose the VirtualBox.xml file name */
     unconst(m->strSettingsFilePath) = Utf8StrFmt("%s%c%s",
-                                                m->strHomeDir.raw(),
-                                                RTPATH_DELIMITER,
-                                                VBOX_GLOBAL_SETTINGS_FILE);
+                                                 m->strHomeDir.c_str(),
+                                                 RTPATH_DELIMITER,
+                                                 VBOX_GLOBAL_SETTINGS_FILE);
     HRESULT rc = S_OK;
     bool fCreate = false;
@@ -1073 +1073 @@
                                firmwareDesc[i].fileName);
         rc = calculateFullPath(shortName, fullName); AssertRCReturn(rc, rc);
-        if (RTFileExists(fullName.raw()))
+        if (RTFileExists(fullName.c_str()))
         {
             *aResult = TRUE;
@@ -1087 +1087 @@
                               RTPATH_DELIMITER,
                               firmwareDesc[i].fileName);
-        if (RTFileExists(fullName.raw()))
+        if (RTFileExists(fullName.c_str()))
         {
             *aResult = TRUE;
@@ -1142 +1142 @@
 
     strSettingsFile = Utf8StrFmt("%s%c%ls%c%ls.xml",
-                                 strSettingsFile.raw(),
+                                 strSettingsFile.c_str(),
                                  RTPATH_DELIMITER,
                                  aName,
@@ -1203 +1203 @@
     /* append the default extension if none */
     if (!RTPathHaveExt(settingsFile.c_str()))
-        settingsFile = Utf8StrFmt("%s.xml", settingsFile.raw());
+        settingsFile = Utf8StrFmt("%s.xml", settingsFile.c_str());
 
     /* create a new object */
@@ -1331 +1331 @@
     /* start with not found */
     ComObjPtr<Machine> pMachineFound;
+    Utf8Str strName(aName);
 
     AutoReadLock al(m->allMachines.getLockHandle() COMMA_LOCKVAL_SRC_POS);
@@ -1344 +1345 @@
 
         AutoReadLock machLock(pMachine2 COMMA_LOCKVAL_SRC_POS);
-        if (pMachine2->getName() == aName)
+        if (pMachine2->getName() == strName)
         {
             pMachineFound = pMachine2;
@@ -2362 +2363 @@
 {
     LogFlowThisFunc(("machine={%s} aKey={%ls} aValue={%ls}\n",
-                      aId.toString().raw(), aKey, aValue));
+                      aId.toString().c_str(), aKey, aValue));
 
     AutoCaller autoCaller(this);
@@ -2765 +2766 @@
                      tr("Could not find a hard disk with UUID {%RTuuid} in the media registry ('%s')"),
                      aId->raw(),
-                     m->strSettingsFilePath.raw());
+                     m->strSettingsFilePath.c_str());
         else
             setError(rc,
                      tr("Could not find a hard disk with location '%ls' in the media registry ('%s')"),
                      aLocation,
-                     m->strSettingsFilePath.raw());
+                     m->strSettingsFilePath.c_str());
     }
 
@@ -2872 +2873 @@
                      tr("Could not find an image file with UUID {%RTuuid} in the media registry ('%s')"),
                      aId->raw(),
-                     m->strSettingsFilePath.raw());
+                     m->strSettingsFilePath.c_str());
         else
             setError(rc,
                      tr("Could not find an image file with location '%ls' in the media registry ('%s')"),
                      aLocation.c_str(),
-                     m->strSettingsFilePath.raw());
+                     m->strSettingsFilePath.c_str());
     }
 
@@ -3102 +3103 @@
             AutoReadLock mediaLock(hardDisk COMMA_LOCKVAL_SRC_POS);
             aConflict = Utf8StrFmt(tr("hard disk '%s' with UUID {%RTuuid}"),
-                                   hardDisk->getLocationFull().raw(),
+                                   hardDisk->getLocationFull().c_str(),
                                    hardDisk->getId().raw());
             return S_OK;
@@ -3116 +3117 @@
             AutoReadLock mediaLock(image COMMA_LOCKVAL_SRC_POS);
             aConflict = Utf8StrFmt(tr("CD/DVD image '%s' with UUID {%RTuuid}"),
-                                   image->getLocationFull().raw(),
+                                   image->getLocationFull().c_str(),
                                    image->getId().raw());
             return S_OK;
@@ -3130 +3131 @@
             AutoReadLock mediaLock(image COMMA_LOCKVAL_SRC_POS);
             aConflict = Utf8StrFmt(tr("floppy image '%s' with UUID {%RTuuid}"),
-                                   image->getLocationFull().raw(),
+                                   image->getLocationFull().c_str(),
                                    image->getId().raw());
             return S_OK;
@@ -3352 +3353 @@
 
             return setError(E_INVALIDARG,
-                            tr("Registered machine with UUID {%RTuuid} ('%ls') already exists"),
+                            tr("Registered machine with UUID {%RTuuid} ('%s') already exists"),
                             aMachine->getId().raw(),
-                            pMachine->getSettingsFileFull().raw());
+                            pMachine->getSettingsFileFull().c_str());
         }
 
@@ -3420 +3421 @@
         return setError(E_INVALIDARG,
                         tr("Cannot register the hard disk '%s' with UUID {%RTuuid} because a %s already exists in the media registry ('%s')"),
-                        strLocationFull.raw(),
+                        strLocationFull.c_str(),
                         id.raw(),
-                        strConflict.raw(),
-                        m->strSettingsFilePath.raw());
+                        strConflict.c_str(),
+                        m->strSettingsFilePath.c_str());
 
     // store base (root) hard disks in the list
@@ -3537 +3538 @@
         return setError(VBOX_E_INVALID_OBJECT_STATE,
                         tr("Cannot register the image '%s' with UUID {%RTuuid} because a %s already exists in the media registry ('%s')"),
-                        strLocationFull.raw(),
+                        strLocationFull.c_str(),
                         id.raw(),
-                        strConflict.raw(),
-                        m->strSettingsFilePath.raw());
+                        strConflict.c_str(),
+                        m->strSettingsFilePath.c_str());
 
     // add to the collection

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

@@ -229 +229 @@
 
     static HRESULT setErrorStatic(HRESULT aResultCode, const char *pcsz, ...);
-    HRESULT setAuthLibraryError(const char *filename, int rc);
     HRESULT setInvalidMachineStateError();
 

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

@@ -214 +214 @@
     struct UserData
     {
-        UserData();
-        ~UserData();
-
-        Bstr    mName;
-        BOOL    mNameSync;
-        Bstr    mDescription;
-        Bstr    mOSTypeId;
-        Bstr    mSnapshotFolder;
-        Bstr    mSnapshotFolderFull;
-        BOOL    mTeleporterEnabled;
-        ULONG   mTeleporterPort;
-        Bstr    mTeleporterAddress;
-        Bstr    mTeleporterPassword;
-        BOOL    mRTCUseUTC;
+        settings::MachineUserData s;
+        Utf8Str m_strSnapshotFolderFull;
     };
 
@@ -592 +580 @@
      * for reading.
      */
-    const Bstr& getName() const { return mUserData->mName; }
+    const Utf8Str& getName() const { return mUserData->s.strName; }
 
     enum

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

@@ -116 +116 @@
     ComObjPtr<Snapshot> findChildOrSelf(const Utf8Str &aName);
 
-    void updateSavedStatePaths(const char *aOldPath,
-                               const char *aNewPath);
-    void updateSavedStatePathsImpl(const char *aOldPath,
-                                   const char *aNewPath);
+    void updateSavedStatePaths(const Utf8Str &strOldPath,
+                               const Utf8Str &strNewPath);
+    void updateSavedStatePathsImpl(const Utf8Str &strOldPath,
+                                   const Utf8Str &strNewPath);
 
     HRESULT saveSnapshot(settings::Snapshot &data, bool aAttrsOnly);

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

@@ -343 +343 @@
         if (RT_UNLIKELY(!(expr))) \
             return setError(E_INVALIDARG, tr ("Argument %s %s"), \
-                            #arg, Utf8StrFmt msg .raw()); \
+                            #arg, Utf8StrFmt msg .c_str()); \
     } while (0)
 

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

@@ -147 +147 @@
     /* Get the index from the name */
     int iInstance;
-    if (sscanf(Utf8Str(bstrIfName).raw(), "vboxnet%d", &iInstance) != 1)
+    if (sscanf(Utf8Str(bstrIfName).c_str(), "vboxnet%d", &iInstance) != 1)
         return Bstr("0.0.0.0");
 

trunk/src/VBox/Main/webservice/vboxweb.cpp

@@ -205 +205 @@
                 pcszDescr = "Maximum number of worker threads to run in parallel (100).";
                 break;
-                
+
             case 'k':
                 pcszDescr = "Maximum number of requests before a socket will be closed (100).";
@@ -931 +931 @@
 {
     com::Utf8Str ustr(bstr);
-    const char *pcsz;
-    if ((pcsz = ustr.raw()))
-        return pcsz;
-    return "";
+    return ustr.c_str();        // @todo r=dj since the length is known, we can probably use a better std::string allocator
 }
 
@@ -946 +943 @@
 {
     com::Utf8Str ustr(uuid.toString());
-    const char *pcsz;
-    if ((pcsz = ustr.raw()))
-        return pcsz;
-    return "";
+    return ustr.c_str();        // @todo r=dj since the length is known, we can probably use a better std::string allocator
 }
 
@@ -1163 +1157 @@
             do
             {
-                rc = RTLdrLoad(filename.raw(), &hlibAuth);
+                rc = RTLdrLoad(filename.c_str(), &hlibAuth);
                 if (RT_FAILURE(rc))
                 {
@@ -1645 +1639 @@
     WEBDEBUG(("-- entering %s\n", __FUNCTION__));
 
-    do 
+    do
     {
         // WebServiceSession constructor tinkers with global MOR map and requires a write lock

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

@@ -1718 +1718 @@
 MachineConfigFile::MachineConfigFile(const Utf8Str *pstrFilename)
     : ConfigFileBase(pstrFilename),
-      fNameSync(true),
-      fTeleporterEnabled(false),
-      uTeleporterPort(0),
-      fRTCUseUTC(false),
       fCurrentStateModified(true),
       fAborted(false)
@@ -1778 +1774 @@
     return (    (this == &c)
             || (    (uuid                       == c.uuid)
-                 && (strName                    == c.strName)
-                 && (fNameSync                  == c.fNameSync)
-                 && (strDescription             == c.strDescription)
-                 && (strOsType                  == c.strOsType)
+                 && (machineUserData            == c.machineUserData)
                  && (strStateFile               == c.strStateFile)
                  && (uuidCurrentSnapshot        == c.uuidCurrentSnapshot)
-                 && (strSnapshotFolder          == c.strSnapshotFolder)
-                 && (fTeleporterEnabled         == c.fTeleporterEnabled)
-                 && (uTeleporterPort            == c.uTeleporterPort)
-                 && (strTeleporterAddress       == c.strTeleporterAddress)
-                 && (strTeleporterPassword      == c.strTeleporterPassword)
-                 && (fRTCUseUTC                 == c.fRTCUseUTC)
                  // skip fCurrentStateModified!
                  && (RTTimeSpecIsEqual(&timeLastStateChange, &c.timeLastStateChange))
@@ -2536 +2523 @@
         {
             Utf8Str strLocalOrUTC;
-            fRTCUseUTC =    pelmHwChild->getAttributeValue("localOrUTC", strLocalOrUTC)
-                         && strLocalOrUTC == "UTC";
+            machineUserData.fRTCUseUTC =    pelmHwChild->getAttributeValue("localOrUTC", strLocalOrUTC)
+                                         && strLocalOrUTC == "UTC";
         }
         else if (    (pelmHwChild->nameEquals("UART"))
@@ -3049 +3036 @@
     Utf8Str strUUID;
     if (    (elmMachine.getAttributeValue("uuid", strUUID))
-         && (elmMachine.getAttributeValue("name", strName))
+         && (elmMachine.getAttributeValue("name", machineUserData.strName))
        )
     {
         parseUUID(uuid, strUUID);
 
-        if (!elmMachine.getAttributeValue("nameSync", fNameSync))
-            fNameSync = true;
+        elmMachine.getAttributeValue("nameSync", machineUserData.fNameSync);
 
         Utf8Str str;
-        elmMachine.getAttributeValue("Description", strDescription);
-
-        elmMachine.getAttributeValue("OSType", strOsType);
+        elmMachine.getAttributeValue("Description", machineUserData.strDescription);
+
+        elmMachine.getAttributeValue("OSType", machineUserData.strOsType);
         if (m->sv < SettingsVersion_v1_5)
-            convertOldOSType_pre1_5(strOsType);
+            convertOldOSType_pre1_5(machineUserData.strOsType);
 
         elmMachine.getAttributeValue("stateFile", strStateFile);
         if (elmMachine.getAttributeValue("currentSnapshot", str))
             parseUUID(uuidCurrentSnapshot, str);
-        elmMachine.getAttributeValue("snapshotFolder", strSnapshotFolder);
+        elmMachine.getAttributeValue("snapshotFolder", machineUserData.strSnapshotFolder);
         if (!elmMachine.getAttributeValue("currentStateModified", fCurrentStateModified))
             fCurrentStateModified = true;
@@ -3103 +3089 @@
             }
             else if (pelmMachineChild->nameEquals("Description"))
-                strDescription = pelmMachineChild->getValue();
+                machineUserData.strDescription = pelmMachineChild->getValue();
             else if (pelmMachineChild->nameEquals("Teleporter"))
             {
-                if (!pelmMachineChild->getAttributeValue("enabled", fTeleporterEnabled))
-                    fTeleporterEnabled = false;
-                if (!pelmMachineChild->getAttributeValue("port", uTeleporterPort))
-                    uTeleporterPort = 0;
-                if (!pelmMachineChild->getAttributeValue("address", strTeleporterAddress))
-                    strTeleporterAddress = "";
-                if (!pelmMachineChild->getAttributeValue("password", strTeleporterPassword))
-                    strTeleporterPassword = "";
+                pelmMachineChild->getAttributeValue("enabled", machineUserData.fTeleporterEnabled);
+                pelmMachineChild->getAttributeValue("port", machineUserData.uTeleporterPort);
+                pelmMachineChild->getAttributeValue("address", machineUserData.strTeleporterAddress);
+                pelmMachineChild->getAttributeValue("password", machineUserData.strTeleporterPassword);
             }
         }
@@ -3574 +3556 @@
     {
         xml::ElementNode *pelmRTC = pelmHardware->createChild("RTC");
-        pelmRTC->setAttribute("localOrUTC", fRTCUseUTC ? "UTC" : "local");
+        pelmRTC->setAttribute("localOrUTC", machineUserData.fRTCUseUTC ? "UTC" : "local");
     }
 
@@ -3782 +3764 @@
 
         xml::ElementNode *pelmController = pelmStorageControllers->createChild("StorageController");
-        com::Utf8Str name = sc.strName.raw();
-        //
+        com::Utf8Str name = sc.strName;
         if (m->sv < SettingsVersion_v1_8)
         {
@@ -3984 +3965 @@
 
     elmMachine.setAttribute("uuid", uuid.toStringCurly());
-    elmMachine.setAttribute("name", strName);
-    if (!fNameSync)
-        elmMachine.setAttribute("nameSync", fNameSync);
-    if (strDescription.length())
-        elmMachine.createChild("Description")->addContent(strDescription);
-    elmMachine.setAttribute("OSType", strOsType);
+    elmMachine.setAttribute("name", machineUserData.strName);
+    if (!machineUserData.fNameSync)
+        elmMachine.setAttribute("nameSync", machineUserData.fNameSync);
+    if (machineUserData.strDescription.length())
+        elmMachine.createChild("Description")->addContent(machineUserData.strDescription);
+    elmMachine.setAttribute("OSType", machineUserData.strOsType);
     if (strStateFile.length())
         elmMachine.setAttribute("stateFile", strStateFile);
@@ -3995 +3976 @@
          && !uuidCurrentSnapshot.isEmpty())
         elmMachine.setAttribute("currentSnapshot", uuidCurrentSnapshot.toStringCurly());
-    if (strSnapshotFolder.length())
-        elmMachine.setAttribute("snapshotFolder", strSnapshotFolder);
+    if (machineUserData.strSnapshotFolder.length())
+        elmMachine.setAttribute("snapshotFolder", machineUserData.strSnapshotFolder);
     if (!fCurrentStateModified)
         elmMachine.setAttribute("currentStateModified", fCurrentStateModified);
@@ -4003 +3984 @@
         elmMachine.setAttribute("aborted", fAborted);
     if (    m->sv >= SettingsVersion_v1_9
-        &&  (   fTeleporterEnabled
-            ||  uTeleporterPort
-            ||  !strTeleporterAddress.isEmpty()
-            ||  !strTeleporterPassword.isEmpty()
+        &&  (   machineUserData.fTeleporterEnabled
+            ||  machineUserData.uTeleporterPort
+            ||  !machineUserData.strTeleporterAddress.isEmpty()
+            ||  !machineUserData.strTeleporterPassword.isEmpty()
             )
        )
     {
         xml::ElementNode *pelmTeleporter = elmMachine.createChild("Teleporter");
-        pelmTeleporter->setAttribute("enabled", fTeleporterEnabled);
-        pelmTeleporter->setAttribute("port", uTeleporterPort);
-        pelmTeleporter->setAttribute("address", strTeleporterAddress);
-        pelmTeleporter->setAttribute("password", strTeleporterPassword);
+        pelmTeleporter->setAttribute("enabled", machineUserData.fTeleporterEnabled);
+        pelmTeleporter->setAttribute("port", machineUserData.uTeleporterPort);
+        pelmTeleporter->setAttribute("address", machineUserData.strTeleporterAddress);
+        pelmTeleporter->setAttribute("password", machineUserData.strTeleporterPassword);
     }
 
@@ -4244 +4225 @@
             || (hardwareMachine.fPageFusionEnabled)
                 // and CPU hotplug, RTC timezone control, HID type and HPET
-            || fRTCUseUTC
+            || machineUserData.fRTCUseUTC
             || hardwareMachine.fCpuHotPlug
             || hardwareMachine.pointingHidType != PointingHidType_PS2Mouse
@@ -4308 +4289 @@
          && (    (hardwareMachine.firmwareType >= FirmwareType_EFI)
               || (hardwareMachine.fHardwareVirtExclusive != HWVIRTEXCLUSIVEDEFAULT)
-              || fTeleporterEnabled
-              || uTeleporterPort
-              || !strTeleporterAddress.isEmpty()
-              || !strTeleporterPassword.isEmpty()
+              || machineUserData.fTeleporterEnabled
+              || machineUserData.uTeleporterPort
+              || !machineUserData.strTeleporterAddress.isEmpty()
+              || !machineUserData.strTeleporterPassword.isEmpty()
               || !hardwareMachine.uuid.isEmpty()
             )