Changeset 16118 in vbox for trunk/src

Timestamp:

Jan 21, 2009 9:43:00 AM (16 years ago)

Author:

vboxsync

Message:

Main: Fixed %ls/%s and Utf8Str/Bstr mismatch in hard disk code.

File:

• trunk/src/VBox/Main/HardDisk2Impl.cpp (modified) (11 diffs)

trunk/src/VBox/Main/HardDisk2Impl.cpp

@@ -1154 +1154 @@
     HRESULT rc = progress->init (mVirtualBox, static_cast <IHardDisk2 *> (this),
         BstrFmt (tr ("Creating dynamic hard disk storage unit '%ls'"),
-                 m.location.raw()),
+                 m.locationFull.raw()),
         FALSE /* aCancelable */);
     CheckComRCReturnRC (rc);
@@ -1209 +1209 @@
     HRESULT rc = progress->init (mVirtualBox, static_cast <IHardDisk2 *> (this),
         BstrFmt (tr ("Creating fixed hard disk storage unit '%ls'"),
-                 m.location.raw()),
+                 m.locationFull.raw()),
         FALSE /* aCancelable */);
     CheckComRCReturnRC (rc);
@@ -1270 +1270 @@
 
     if (mm.type == HardDiskType_Writethrough)
-        return setError (E_FAIL, tr ("Hard disk '%ls' is Writethrough"));
+        return setError (E_FAIL,
+            tr ("Hard disk '%ls' is Writethrough"),
+            m.locationFull.raw());
 
     /* We want to be locked for reading as long as our diff child is being
@@ -1331 +1333 @@
         progress.createObject();
         rc = progress->init (mVirtualBox, static_cast <IHardDisk2 *> (this),
-            BstrFmt (tr ("Creating a clone hard disk '%s'"),
-                     target->name().raw()),
+            BstrFmt (tr ("Creating clone hard disk '%ls'"),
+                     target->m.locationFull.raw()),
             FALSE /* aCancelable */);
         CheckComRCThrowRC (rc);
@@ -2044 +2046 @@
             rc = progress->init (mVirtualBox, static_cast <IHardDisk2 *> (this),
                 BstrFmt (tr ("Deleting hard disk storage unit '%ls'"),
-                         name().raw()),
+                         m.locationFull.raw()),
                 FALSE /* aCancelable */);
             CheckComRCReturnRC (rc);
@@ -2162 +2164 @@
                         "with UUID {%RTuuid}. No differencing hard disks "
                         "based on it may be created until it is detached"),
-                    m.location.raw(), it->machineId.raw());
+                    m.locationFull.raw(), it->machineId.raw());
             }
 
@@ -2182 +2184 @@
             rc = progress->init (mVirtualBox, static_cast <IHardDisk2 *> (this),
                 BstrFmt (tr ("Creating differencing hard disk storage unit '%ls'"),
-                         aTarget->name().raw()),
+                         aTarget->m.locationFull.raw()),
                 FALSE /* aCancelable */);
             CheckComRCReturnRC (rc);
@@ -2426 +2428 @@
             progress.createObject();
             rc = progress->init (mVirtualBox, static_cast <IHardDisk2 *> (this),
-                BstrFmt (tr ("Merging hard disk '%ls' to '%ls'"),
+                BstrFmt (tr ("Merging hard disk '%s' to '%s'"),
                          name().raw(), aChain->target()->name().raw()),
                 FALSE /* aCancelable */);
@@ -3535 +3537 @@
             MergeChain *chain = task->d.chain.get();
 
-#if 1
+#if 0
             LogFlow (("*** MERGE forward = %RTbool\n", chain->isForward()));
 #endif
@@ -3580 +3582 @@
                         if (RT_FAILURE (vrc))
                             throw vrc;
-#if 1
+#if 0
                         LogFlow (("*** MERGE disk = %ls\n",
                                   (*it)->m.locationFull.raw()));
@@ -3593 +3595 @@
                     unsigned end = chain->isForward() ?
                         chain->size() - 1 : 0;
-#if 1
+#if 0
                     LogFlow (("*** MERGE from %d to %d\n", start, end));
 #endif