Changeset 38735 in vbox for trunk/src/VBox

Timestamp:

Sep 13, 2011 1:25:16 PM (13 years ago)

Author:

vboxsync

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

74006

Message:

%lS -> %ls.

Location:

trunk/src/VBox

Files:

• Frontends/VBoxHeadless/VBoxHeadless.cpp (modified) (1 diff)
• Frontends/VBoxManage/VBoxManageDisk.cpp (modified) (5 diffs)
• Frontends/VBoxManage/VBoxManageGuestProp.cpp (modified) (3 diffs)
• Frontends/VBoxManage/VBoxManageHostonly.cpp (modified) (1 diff)
• Frontends/VBoxManage/VBoxManageInfo.cpp (modified) (46 diffs)
• Frontends/VBoxManage/VBoxManageList.cpp (modified) (17 diffs)
• Frontends/VBoxManage/VBoxManageMisc.cpp (modified) (6 diffs)
• Frontends/VBoxSDL/VBoxSDL.cpp (modified) (3 diffs)
• HostServices/SharedFolders/service.cpp (modified) (2 diffs)
• Main/testcase/tstAPI.cpp (modified) (4 diffs)
• Runtime/testcase/tstDir.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.cpp

@@ -1199 +1199 @@
                 if (info.isBasicAvailable())
                 {
-                    RTPrintf("Error: failed to start machine. Error message: %lS\n", info.getText().raw());
+                    RTPrintf("Error: failed to start machine. Error message: %ls\n", info.getText().raw());
                 }
                 else

trunk/src/VBox/Frontends/VBoxManage/VBoxManageDisk.cpp

@@ -940 +940 @@
             Bstr err;
             CHECK_ERROR_BREAK(hardDisk, COMGETTER(LastAccessError)(err.asOutParam()));
-            RTPrintf("Access Error:         %lS\n", err.raw());
+            RTPrintf("Access Error:         %ls\n", err.raw());
         }
 
@@ -947 +947 @@
         if (!description.isEmpty())
         {
-            RTPrintf("Description:          %lS\n", description.raw());
+            RTPrintf("Description:          %ls\n", description.raw());
         }
 
@@ -991 +991 @@
         Bstr format;
         hardDisk->COMGETTER(Format)(format.asOutParam());
-        RTPrintf("Storage format:       %lS\n", format.raw());
+        RTPrintf("Storage format:       %ls\n", format.raw());
         ULONG variant;
         hardDisk->COMGETTER(Variant)(&variant);
@@ -1031 +1031 @@
                 machine->COMGETTER(Name)(name.asOutParam());
                 machine->COMGETTER(Id)(uuid.asOutParam());
-                RTPrintf("%s%lS (UUID: %lS)\n",
+                RTPrintf("%s%ls (UUID: %ls)\n",
                          j == 0 ? "In use by VMs:        " : "                      ",
                          name.raw(), machineIds[j]);
@@ -1041 +1041 @@
         Bstr loc;
         hardDisk->COMGETTER(Location)(loc.asOutParam());
-        RTPrintf("Location:             %lS\n", loc.raw());
+        RTPrintf("Location:             %ls\n", loc.raw());
 
         /* print out information specific for differencing hard disks */

trunk/src/VBox/Frontends/VBoxManage/VBoxManageGuestProp.cpp

@@ -107 +107 @@
             RTPrintf("No value set!\n");
         else
-            RTPrintf("Value: %lS\n", value.raw());
+            RTPrintf("Value: %ls\n", value.raw());
         if (!value.isEmpty() && verbose)
         {
             RTPrintf("Timestamp: %lld\n", i64Timestamp);
-            RTPrintf("Flags: %lS\n", flags.raw());
+            RTPrintf("Flags: %ls\n", flags.raw());
         }
     }
@@ -233 +233 @@
                 RTPrintf("No properties found.\n");
             for (unsigned i = 0; i < names.size(); ++i)
-                RTPrintf("Name: %lS, value: %lS, timestamp: %lld, flags: %lS\n",
+                RTPrintf("Name: %ls, value: %ls, timestamp: %lld, flags: %ls\n",
                          names[i], values[i], timestamps[i], flags[i]);
         }
@@ -337 +337 @@
                         gpcev->COMGETTER(Value)(aNextValue.asOutParam());
                         gpcev->COMGETTER(Flags)(aNextFlags.asOutParam());
-                        RTPrintf("Name: %lS, value: %lS, flags: %lS\n",
+                        RTPrintf("Name: %ls, value: %ls, flags: %ls\n",
                                  aNextName.raw(), aNextValue.raw(), aNextFlags.raw());
                         fSignalled = true;

trunk/src/VBox/Frontends/VBoxManage/VBoxManageHostonly.cpp

@@ -71 +71 @@
     CHECK_ERROR(hif, COMGETTER(Name) (name.asOutParam()));
 
-    RTPrintf("Interface '%lS' was successfully created\n", name.raw());
+    RTPrintf("Interface '%ls' was successfully created\n", name.raw());
 
     return 0;

trunk/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp

@@ -62 +62 @@
     {
         /* print with hierarchical numbering */
-        RTPrintf("SnapshotName%lS=\"%lS\"\n", prefix.raw(), name.raw());
-        RTPrintf("SnapshotUUID%lS=\"%s\"\n", prefix.raw(), Utf8Str(uuid).c_str());
+        RTPrintf("SnapshotName%ls=\"%ls\"\n", prefix.raw(), name.raw());
+        RTPrintf("SnapshotUUID%ls=\"%s\"\n", prefix.raw(), Utf8Str(uuid).c_str());
     }
     else
@@ -69 +69 @@
         /* print with indentation */
         bool fCurrent = (rootSnapshot == currentSnapshot);
-        RTPrintf("   %lSName: %lS (UUID: %s)%s\n",
+        RTPrintf("   %lsName: %ls (UUID: %s)%s\n",
                  prefix.raw(),
                  name.raw(),
@@ -88 +88 @@
                 Bstr newPrefix;
                 if (details == VMINFO_MACHINEREADABLE)
-                    newPrefix = Utf8StrFmt("%lS-%d", prefix.raw(), index + 1);
+                    newPrefix = Utf8StrFmt("%ls-%d", prefix.raw(), index + 1);
                 else
                 {
-                    newPrefix = Utf8StrFmt("%lS   ", prefix.raw());
+                    newPrefix = Utf8StrFmt("%ls   ", prefix.raw());
                 }
 
@@ -247 +247 @@
                 Bstr settingsFilePath;
                 rc = machine->COMGETTER(SettingsFilePath)(settingsFilePath.asOutParam());
-                RTPrintf("Config file:     %lS\n", settingsFilePath.raw());
+                RTPrintf("Config file:     %ls\n", settingsFilePath.raw());
                 ComPtr<IVirtualBoxErrorInfo> accessError;
                 rc = machine->COMGETTER(AccessError)(accessError.asOutParam());
@@ -264 +264 @@
     if (details == VMINFO_COMPACT)
     {
-        RTPrintf("\"%lS\" {%s}\n", machineName.raw(), Utf8Str(uuid).c_str());
+        RTPrintf("\"%ls\" {%s}\n", machineName.raw(), Utf8Str(uuid).c_str());
         return S_OK;
     }
 
     if (details == VMINFO_MACHINEREADABLE)
-        RTPrintf("name=\"%lS\"\n", machineName.raw());
-    else
-        RTPrintf("Name:            %lS\n", machineName.raw());
+        RTPrintf("name=\"%ls\"\n", machineName.raw());
+    else
+        RTPrintf("Name:            %ls\n", machineName.raw());
 
     Bstr osTypeId;
@@ -280 +280 @@
     rc = osType->COMGETTER(Description)(osName.asOutParam());
     if (details == VMINFO_MACHINEREADABLE)
-        RTPrintf("ostype=\"%lS\"\n", osTypeId.raw());
-    else
-        RTPrintf("Guest OS:        %lS\n", osName.raw());
+        RTPrintf("ostype=\"%ls\"\n", osTypeId.raw());
+    else
+        RTPrintf("Guest OS:        %ls\n", osName.raw());
 
     if (details == VMINFO_MACHINEREADABLE)
@@ -292 +292 @@
     rc = machine->COMGETTER(SettingsFilePath)(settingsFilePath.asOutParam());
     if (details == VMINFO_MACHINEREADABLE)
-        RTPrintf("CfgFile=\"%lS\"\n", settingsFilePath.raw());
-    else
-        RTPrintf("Config file:     %lS\n", settingsFilePath.raw());
+        RTPrintf("CfgFile=\"%ls\"\n", settingsFilePath.raw());
+    else
+        RTPrintf("Config file:     %ls\n", settingsFilePath.raw());
 
     Bstr snapshotFolder;
     rc = machine->COMGETTER(SnapshotFolder)(snapshotFolder.asOutParam());
     if (details == VMINFO_MACHINEREADABLE)
-        RTPrintf("SnapFldr=\"%lS\"\n", snapshotFolder.raw());
-    else
-        RTPrintf("Snapshot folder: %lS\n", snapshotFolder.raw());
+        RTPrintf("SnapFldr=\"%ls\"\n", snapshotFolder.raw());
+    else
+        RTPrintf("Snapshot folder: %ls\n", snapshotFolder.raw());
 
     Bstr logFolder;
     rc = machine->COMGETTER(LogFolder)(logFolder.asOutParam());
     if (details == VMINFO_MACHINEREADABLE)
-        RTPrintf("LogFldr=\"%lS\"\n", logFolder.raw());
-    else
-        RTPrintf("Log folder:      %lS\n", logFolder.raw());
+        RTPrintf("LogFldr=\"%ls\"\n", logFolder.raw());
+    else
+        RTPrintf("Log folder:      %ls\n", logFolder.raw());
 
     Bstr strHardwareUuid;
     rc = machine->COMGETTER(HardwareUUID)(strHardwareUuid.asOutParam());
     if (details == VMINFO_MACHINEREADABLE)
-        RTPrintf("hardwareuuid=\"%lS\"\n", strHardwareUuid.raw());
-    else
-        RTPrintf("Hardware UUID:   %lS\n", strHardwareUuid.raw());
+        RTPrintf("hardwareuuid=\"%ls\"\n", strHardwareUuid.raw());
+    else
+        RTPrintf("Hardware UUID:   %ls\n", strHardwareUuid.raw());
 
     ULONG memorySize;
@@ -622 +622 @@
         RTPrintf("VMStateChangeTime=\"%s\"\n", pszTime);
         if (!stateFile.isEmpty())
-            RTPrintf("VMStateFile=\"%lS\"\n", stateFile.raw());
+            RTPrintf("VMStateFile=\"%ls\"\n", stateFile.raw());
     }
     else
@@ -667 +667 @@
     machine->COMGETTER(TeleporterAddress)(teleporterAddress.asOutParam());
     if (details == VMINFO_MACHINEREADABLE)
-        RTPrintf("teleporteraddress=\"%lS\"\n", teleporterAddress.raw());
-    else
-        RTPrintf("Teleporter Address: %lS\n", teleporterAddress.raw());
+        RTPrintf("teleporteraddress=\"%ls\"\n", teleporterAddress.raw());
+    else
+        RTPrintf("Teleporter Address: %ls\n", teleporterAddress.raw());
 
     Bstr teleporterPassword;
     machine->COMGETTER(TeleporterPassword)(teleporterPassword.asOutParam());
     if (details == VMINFO_MACHINEREADABLE)
-        RTPrintf("teleporterpassword=\"%lS\"\n", teleporterPassword.raw());
-    else
-        RTPrintf("Teleporter Password: %lS\n", teleporterPassword.raw());
+        RTPrintf("teleporterpassword=\"%ls\"\n", teleporterPassword.raw());
+    else
+        RTPrintf("Teleporter Password: %ls\n", teleporterPassword.raw());
 
     /*
@@ -694 +694 @@
         storageCtl->COMGETTER(Name)(storageCtlName.asOutParam());
         if (details == VMINFO_MACHINEREADABLE)
-            RTPrintf("storagecontrollername%u=\"%lS\"\n", i, storageCtlName.raw());
+            RTPrintf("storagecontrollername%u=\"%ls\"\n", i, storageCtlName.raw());
         else
-            RTPrintf("Storage Controller Name (%u):            %lS\n", i, storageCtlName.raw());
+            RTPrintf("Storage Controller Name (%u):            %ls\n", i, storageCtlName.raw());
 
         storageCtl->COMGETTER(ControllerType)(&enmCtlType);
@@ -800 +800 @@
                     if (details == VMINFO_MACHINEREADABLE)
                     {
-                        RTPrintf("\"%lS-%d-%d\"=\"%lS\"\n", storageCtlName.raw(),
+                        RTPrintf("\"%ls-%d-%d\"=\"%ls\"\n", storageCtlName.raw(),
                                  i, k, filePath.raw());
-                        RTPrintf("\"%lS-ImageUUID-%d-%d\"=\"%s\"\n",
+                        RTPrintf("\"%ls-ImageUUID-%d-%d\"=\"%s\"\n",
                                  storageCtlName.raw(), i, k, Utf8Str(uuid).c_str());
                         if (fPassthrough)
-                            RTPrintf("\"%lS-dvdpassthrough\"=\"%s\"\n", storageCtlName.raw(),
+                            RTPrintf("\"%ls-dvdpassthrough\"=\"%s\"\n", storageCtlName.raw(),
                                      fPassthrough ? "on" : "off");
                         if (devType == DeviceType_DVD)
                         {
-                            RTPrintf("\"%lS-tempeject\"=\"%s\"\n", storageCtlName.raw(),
+                            RTPrintf("\"%ls-tempeject\"=\"%s\"\n", storageCtlName.raw(),
                                      fTempEject ? "on" : "off");
-                            RTPrintf("\"%lS-IsEjected\"=\"%s\"\n", storageCtlName.raw(),
+                            RTPrintf("\"%ls-IsEjected\"=\"%s\"\n", storageCtlName.raw(),
                                      fIsEjected ? "on" : "off");
                         }
@@ -817 +817 @@
                     else
                     {
-                        RTPrintf("%lS (%d, %d): %lS (UUID: %s)",
+                        RTPrintf("%ls (%d, %d): %ls (UUID: %s)",
                                  storageCtlName.raw(), i, k, filePath.raw(),
                                  Utf8Str(uuid).c_str());
@@ -833 +833 @@
                     if (details == VMINFO_MACHINEREADABLE)
                     {
-                        RTPrintf("\"%lS-%d-%d\"=\"emptydrive\"\n", storageCtlName.raw(), i, k);
+                        RTPrintf("\"%ls-%d-%d\"=\"emptydrive\"\n", storageCtlName.raw(), i, k);
                         if (devType == DeviceType_DVD)
-                            RTPrintf("\"%lS-IsEjected\"=\"%s\"\n", storageCtlName.raw(),
+                            RTPrintf("\"%ls-IsEjected\"=\"%s\"\n", storageCtlName.raw(),
                                      fIsEjected ? "on" : "off");
                     }
                     else
                     {
-                        RTPrintf("%lS (%d, %d): Empty", storageCtlName.raw(), i, k);
+                        RTPrintf("%ls (%d, %d): Empty", storageCtlName.raw(), i, k);
                         if (fTempEject)
                             RTPrintf(" (temp eject)");
@@ -851 +851 @@
                 {
                     if (details == VMINFO_MACHINEREADABLE)
-                        RTPrintf("\"%lS-%d-%d\"=\"none\"\n", storageCtlName.raw(), i, k);
+                        RTPrintf("\"%ls-%d-%d\"=\"none\"\n", storageCtlName.raw(), i, k);
                 }
             }
@@ -977 +977 @@
                         if (details == VMINFO_MACHINEREADABLE)
                         {
-                            RTPrintf("natnet%d=\"%lS\"\n", currentNIC + 1, strNetwork.length() ? strNetwork.raw(): Bstr("nat").raw());
+                            RTPrintf("natnet%d=\"%ls\"\n", currentNIC + 1, strNetwork.length() ? strNetwork.raw(): Bstr("nat").raw());
                             strAttachment = "nat";
                             strNatSettings = Utf8StrFmt("mtu=\"%d\"\nsockSnd=\"%d\"\nsockRcv=\"%d\"\ntcpWndSnd=\"%d\"\ntcpWndRcv=\"%d\"\n",
@@ -997 +997 @@
                         if (details == VMINFO_MACHINEREADABLE)
                         {
-                            RTPrintf("bridgeadapter%d=\"%lS\"\n", currentNIC + 1, strBridgeAdp.raw());
+                            RTPrintf("bridgeadapter%d=\"%ls\"\n", currentNIC + 1, strBridgeAdp.raw());
                             strAttachment = "bridged";
                         }
                         else
-                            strAttachment = Utf8StrFmt("Bridged Interface '%lS'", strBridgeAdp.raw());
+                            strAttachment = Utf8StrFmt("Bridged Interface '%ls'", strBridgeAdp.raw());
                         break;
                     }
@@ -1011 +1011 @@
                         if (details == VMINFO_MACHINEREADABLE)
                         {
-                            RTPrintf("intnet%d=\"%lS\"\n", currentNIC + 1, strNetwork.raw());
+                            RTPrintf("intnet%d=\"%ls\"\n", currentNIC + 1, strNetwork.raw());
                             strAttachment = "intnet";
                         }
@@ -1025 +1025 @@
                         if (details == VMINFO_MACHINEREADABLE)
                         {
-                            RTPrintf("hostonlyadapter%d=\"%lS\"\n", currentNIC + 1, strHostonlyAdp.raw());
+                            RTPrintf("hostonlyadapter%d=\"%ls\"\n", currentNIC + 1, strHostonlyAdp.raw());
                             strAttachment = "hostonly";
                         }
                         else
-                            strAttachment = Utf8StrFmt("Host-only Interface '%lS'", strHostonlyAdp.raw());
+                            strAttachment = Utf8StrFmt("Host-only Interface '%ls'", strHostonlyAdp.raw());
                         break;
                     }
@@ -1038 +1038 @@
                         if (details == VMINFO_MACHINEREADABLE)
                         {
-                            RTPrintf("generic%d=\"%lS\"\n", currentNIC + 1, strGenericDriver.raw());
+                            RTPrintf("generic%d=\"%ls\"\n", currentNIC + 1, strGenericDriver.raw());
                             strAttachment = "Generic";
                         }
                         else
                         {
-                            strAttachment = Utf8StrFmt("Generic '%lS'", strGenericDriver.raw());
+                            strAttachment = Utf8StrFmt("Generic '%ls'", strGenericDriver.raw());
 
                             // show the generic properties
@@ -1055 +1055 @@
                                 strAttachment += " { ";
                                 for (unsigned i = 0; i < aProperties.size(); ++i)
-                                    strAttachment += Utf8StrFmt(!i ? "%lS='%lS'" : ", %lS='%lS'",
+                                    strAttachment += Utf8StrFmt(!i ? "%ls='%ls'" : ", %ls='%ls'",
                                                                 aProperties[i], aValues[i]);
                                 strAttachment += " }";
@@ -1118 +1118 @@
                 if (details == VMINFO_MACHINEREADABLE)
                 {
-                    RTPrintf("macaddress%d=\"%lS\"\n", currentNIC + 1, strMACAddress.raw());
+                    RTPrintf("macaddress%d=\"%ls\"\n", currentNIC + 1, strMACAddress.raw());
                     RTPrintf("cableconnected%d=\"%s\"\n", currentNIC + 1, fConnected ? "on" : "off");
                     RTPrintf("nic%d=\"%s\"\n", currentNIC + 1, strAttachment.c_str());
                 }
                 else
-                    RTPrintf("NIC %u:           MAC: %lS, Attachment: %s, Cable connected: %s, Trace: %s (file: %lS), Type: %s, Reported speed: %d Mbps, Boot priority: %d, Promisc Policy: %s\n",
+                    RTPrintf("NIC %u:           MAC: %ls, Attachment: %s, Cable connected: %s, Trace: %s (file: %ls), Type: %s, Reported speed: %d Mbps, Boot priority: %d, Promisc Policy: %s\n",
                              currentNIC + 1, strMACAddress.raw(), strAttachment.c_str(),
                              fConnected ? "on" : "off",
@@ -1256 +1256 @@
                     case PortMode_RawFile:
                         if (details == VMINFO_MACHINEREADABLE)
-                            RTPrintf("uartmode%d=\"%lS\"\n", currentUART + 1,
+                            RTPrintf("uartmode%d=\"%ls\"\n", currentUART + 1,
                                      path.raw());
                         else
-                            RTPrintf(", attached to raw file '%lS'\n",
+                            RTPrintf(", attached to raw file '%ls'\n",
                                      path.raw());
                         break;
                     case PortMode_HostPipe:
                         if (details == VMINFO_MACHINEREADABLE)
-                            RTPrintf("uartmode%d=\"%s,%lS\"\n", currentUART + 1,
+                            RTPrintf("uartmode%d=\"%s,%ls\"\n", currentUART + 1,
                                      fServer ? "server" : "client", path.raw());
                         else
-                            RTPrintf(", attached to pipe (%s) '%lS'\n",
+                            RTPrintf(", attached to pipe (%s) '%ls'\n",
                                      fServer ? "server" : "client", path.raw());
                         break;
                     case PortMode_HostDevice:
                         if (details == VMINFO_MACHINEREADABLE)
-                            RTPrintf("uartmode%d=\"%lS\"\n", currentUART + 1,
+                            RTPrintf("uartmode%d=\"%ls\"\n", currentUART + 1,
                                      path.raw());
                         else
-                            RTPrintf(", attached to device '%lS'\n", path.raw());
+                            RTPrintf(", attached to device '%ls'\n", path.raw());
                         break;
                 }
@@ -1530 +1530 @@
                 RTPrintf("vrde=\"on\"\n");
                 RTPrintf("vrdeport=%d\n", currentPort);
-                RTPrintf("vrdeports=\"%lS\"\n", ports.raw());
-                RTPrintf("vrdeaddress=\"%lS\"\n", address.raw());
+                RTPrintf("vrdeports=\"%ls\"\n", ports.raw());
+                RTPrintf("vrdeaddress=\"%ls\"\n", address.raw());
                 RTPrintf("vrdeauthtype=\"%s\"\n", strAuthType);
                 RTPrintf("vrdemulticon=\"%s\"\n", fMultiCon ? "on" : "off");
@@ -1537 +1537 @@
                 RTPrintf("vrdevideochannel=\"%s\"\n", fVideoChannel ? "on" : "off");
                 if (fVideoChannel)
-                    RTPrintf("vrdevideochannelquality=\"%lS\"\n", videoChannelQuality.raw());
+                    RTPrintf("vrdevideochannelquality=\"%ls\"\n", videoChannelQuality.raw());
             }
             else
@@ -1543 +1543 @@
                 if (address.isEmpty())
                     address = "0.0.0.0";
-                RTPrintf("VRDE:            enabled (Address %lS, Ports %lS, MultiConn: %s, ReuseSingleConn: %s, Authentication type: %s)\n", address.raw(), ports.raw(), fMultiCon ? "on" : "off", fReuseCon ? "on" : "off", strAuthType);
+                RTPrintf("VRDE:            enabled (Address %ls, Ports %ls, MultiConn: %s, ReuseSingleConn: %s, Authentication type: %s)\n", address.raw(), ports.raw(), fMultiCon ? "on" : "off", fReuseCon ? "on" : "off", strAuthType);
                 if (console && currentPort != -1 && currentPort != 0)
                    RTPrintf("VRDE port:       %d\n", currentPort);
                 if (fVideoChannel)
-                    RTPrintf("Video redirection: enabled (Quality %lS)\n", videoChannelQuality.raw());
+                    RTPrintf("Video redirection: enabled (Quality %ls)\n", videoChannelQuality.raw());
                 else
                     RTPrintf("Video redirection: disabled\n");
@@ -1562 +1562 @@
                     {
                         if (value.isEmpty())
-                            RTPrintf("vrdeproperty[%lS]=<not set>\n", aProperties[i]);
+                            RTPrintf("vrdeproperty[%ls]=<not set>\n", aProperties[i]);
                         else
-                            RTPrintf("vrdeproperty[%lS]=\"%lS\"\n", aProperties[i], value.raw());
+                            RTPrintf("vrdeproperty[%ls]=\"%ls\"\n", aProperties[i], value.raw());
                     }
                     else
@@ -1571 +1571 @@
                             RTPrintf("VRDE property: %-10lS = <not set>\n", aProperties[i]);
                         else
-                            RTPrintf("VRDE property: %-10lS = \"%lS\"\n", aProperties[i], value.raw());
+                            RTPrintf("VRDE property: %-10lS = \"%ls\"\n", aProperties[i], value.raw());
                     }
                 }
@@ -1643 +1643 @@
                     CHECK_ERROR_RET(DevPtr, COMGETTER(Name)(bstr.asOutParam()), rc);
                     if (details == VMINFO_MACHINEREADABLE)
-                        RTPrintf("USBFilterName%zu=\"%lS\"\n", index + 1, bstr.raw());
+                        RTPrintf("USBFilterName%zu=\"%ls\"\n", index + 1, bstr.raw());
                     else
-                        RTPrintf("Name:             %lS\n", bstr.raw());
+                        RTPrintf("Name:             %ls\n", bstr.raw());
                     CHECK_ERROR_RET(DevPtr, COMGETTER(VendorId)(bstr.asOutParam()), rc);
                     if (details == VMINFO_MACHINEREADABLE)
-                        RTPrintf("USBFilterVendorId%zu=\"%lS\"\n", index + 1, bstr.raw());
+                        RTPrintf("USBFilterVendorId%zu=\"%ls\"\n", index + 1, bstr.raw());
                     else
-                        RTPrintf("VendorId:         %lS\n", bstr.raw());
+                        RTPrintf("VendorId:         %ls\n", bstr.raw());
                     CHECK_ERROR_RET(DevPtr, COMGETTER(ProductId)(bstr.asOutParam()), rc);
                     if (details == VMINFO_MACHINEREADABLE)
-                        RTPrintf("USBFilterProductId%zu=\"%lS\"\n", index + 1, bstr.raw());
+                        RTPrintf("USBFilterProductId%zu=\"%ls\"\n", index + 1, bstr.raw());
                     else
-                        RTPrintf("ProductId:        %lS\n", bstr.raw());
+                        RTPrintf("ProductId:        %ls\n", bstr.raw());
                     CHECK_ERROR_RET(DevPtr, COMGETTER(Revision)(bstr.asOutParam()), rc);
                     if (details == VMINFO_MACHINEREADABLE)
-                        RTPrintf("USBFilterRevision%zu=\"%lS\"\n", index + 1, bstr.raw());
+                        RTPrintf("USBFilterRevision%zu=\"%ls\"\n", index + 1, bstr.raw());
                     else
-                        RTPrintf("Revision:         %lS\n", bstr.raw());
+                        RTPrintf("Revision:         %ls\n", bstr.raw());
                     CHECK_ERROR_RET(DevPtr, COMGETTER(Manufacturer)(bstr.asOutParam()), rc);
                     if (details == VMINFO_MACHINEREADABLE)
-                        RTPrintf("USBFilterManufacturer%zu=\"%lS\"\n", index + 1, bstr.raw());
+                        RTPrintf("USBFilterManufacturer%zu=\"%ls\"\n", index + 1, bstr.raw());
                     else
-                        RTPrintf("Manufacturer:     %lS\n", bstr.raw());
+                        RTPrintf("Manufacturer:     %ls\n", bstr.raw());
                     CHECK_ERROR_RET(DevPtr, COMGETTER(Product)(bstr.asOutParam()), rc);
                     if (details == VMINFO_MACHINEREADABLE)
-                        RTPrintf("USBFilterProduct%zu=\"%lS\"\n", index + 1, bstr.raw());
+                        RTPrintf("USBFilterProduct%zu=\"%ls\"\n", index + 1, bstr.raw());
                     else
-                        RTPrintf("Product:          %lS\n", bstr.raw());
+                        RTPrintf("Product:          %ls\n", bstr.raw());
                     CHECK_ERROR_RET(DevPtr, COMGETTER(Remote)(bstr.asOutParam()), rc);
                     if (details == VMINFO_MACHINEREADABLE)
-                        RTPrintf("USBFilterRemote%zu=\"%lS\"\n", index + 1, bstr.raw());
+                        RTPrintf("USBFilterRemote%zu=\"%ls\"\n", index + 1, bstr.raw());
                     else
-                        RTPrintf("Remote:           %lS\n", bstr.raw());
+                        RTPrintf("Remote:           %ls\n", bstr.raw());
                     CHECK_ERROR_RET(DevPtr, COMGETTER(SerialNumber)(bstr.asOutParam()), rc);
                     if (details == VMINFO_MACHINEREADABLE)
-                        RTPrintf("USBFilterSerialNumber%zu=\"%lS\"\n", index + 1, bstr.raw());
+                        RTPrintf("USBFilterSerialNumber%zu=\"%ls\"\n", index + 1, bstr.raw());
                     else
-                        RTPrintf("Serial Number:    %lS\n", bstr.raw());
+                        RTPrintf("Serial Number:    %ls\n", bstr.raw());
                     if (details != VMINFO_MACHINEREADABLE)
                     {
@@ -1749 +1749 @@
                         {
                             if (details == VMINFO_MACHINEREADABLE)
-                                RTPrintf("USBRemoteManufacturer%zu=\"%lS\"\n", index + 1, bstr.raw());
+                                RTPrintf("USBRemoteManufacturer%zu=\"%ls\"\n", index + 1, bstr.raw());
                             else
-                                RTPrintf("Manufacturer:       %lS\n", bstr.raw());
+                                RTPrintf("Manufacturer:       %ls\n", bstr.raw());
                         }
                         CHECK_ERROR_RET(dev, COMGETTER(Product)(bstr.asOutParam()), rc);
@@ -1757 +1757 @@
                         {
                             if (details == VMINFO_MACHINEREADABLE)
-                                RTPrintf("USBRemoteProduct%zu=\"%lS\"\n", index + 1, bstr.raw());
+                                RTPrintf("USBRemoteProduct%zu=\"%ls\"\n", index + 1, bstr.raw());
                             else
-                                RTPrintf("Product:            %lS\n", bstr.raw());
+                                RTPrintf("Product:            %ls\n", bstr.raw());
                         }
                         CHECK_ERROR_RET(dev, COMGETTER(SerialNumber)(bstr.asOutParam()), rc);
@@ -1765 +1765 @@
                         {
                             if (details == VMINFO_MACHINEREADABLE)
-                                RTPrintf("USBRemoteSerialNumber%zu=\"%lS\"\n", index + 1, bstr.raw());
+                                RTPrintf("USBRemoteSerialNumber%zu=\"%ls\"\n", index + 1, bstr.raw());
                             else
-                                RTPrintf("SerialNumber:       %lS\n", bstr.raw());
+                                RTPrintf("SerialNumber:       %ls\n", bstr.raw());
                         }
                         CHECK_ERROR_RET(dev, COMGETTER(Address)(bstr.asOutParam()), rc);
@@ -1773 +1773 @@
                         {
                             if (details == VMINFO_MACHINEREADABLE)
-                                RTPrintf("USBRemoteAddress%zu=\"%lS\"\n", index + 1, bstr.raw());
+                                RTPrintf("USBRemoteAddress%zu=\"%ls\"\n", index + 1, bstr.raw());
                             else
-                                RTPrintf("Address:            %lS\n", bstr.raw());
+                                RTPrintf("Address:            %ls\n", bstr.raw());
                         }
 
@@ -1838 +1838 @@
                         {
                             if (details == VMINFO_MACHINEREADABLE)
-                                RTPrintf("USBAttachedManufacturer%zu=\"%lS\"\n", index + 1, bstr.raw());
+                                RTPrintf("USBAttachedManufacturer%zu=\"%ls\"\n", index + 1, bstr.raw());
                             else
-                                RTPrintf("Manufacturer:       %lS\n", bstr.raw());
+                                RTPrintf("Manufacturer:       %ls\n", bstr.raw());
                         }
                         CHECK_ERROR_RET(dev, COMGETTER(Product)(bstr.asOutParam()), rc);
@@ -1846 +1846 @@
                         {
                             if (details == VMINFO_MACHINEREADABLE)
-                                RTPrintf("USBAttachedProduct%zu=\"%lS\"\n", index + 1, bstr.raw());
+                                RTPrintf("USBAttachedProduct%zu=\"%ls\"\n", index + 1, bstr.raw());
                             else
-                                RTPrintf("Product:            %lS\n", bstr.raw());
+                                RTPrintf("Product:            %ls\n", bstr.raw());
                         }
                         CHECK_ERROR_RET(dev, COMGETTER(SerialNumber)(bstr.asOutParam()), rc);
@@ -1854 +1854 @@
                         {
                             if (details == VMINFO_MACHINEREADABLE)
-                                RTPrintf("USBAttachedSerialNumber%zu=\"%lS\"\n", index + 1, bstr.raw());
+                                RTPrintf("USBAttachedSerialNumber%zu=\"%ls\"\n", index + 1, bstr.raw());
                             else
-                                RTPrintf("SerialNumber:       %lS\n", bstr.raw());
+                                RTPrintf("SerialNumber:       %ls\n", bstr.raw());
                         }
                         CHECK_ERROR_RET(dev, COMGETTER(Address)(bstr.asOutParam()), rc);
@@ -1862 +1862 @@
                         {
                             if (details == VMINFO_MACHINEREADABLE)
-                                RTPrintf("USBAttachedAddress%zu=\"%lS\"\n", index + 1, bstr.raw());
+                                RTPrintf("USBAttachedAddress%zu=\"%ls\"\n", index + 1, bstr.raw());
                             else
-                                RTPrintf("Address:            %lS\n", bstr.raw());
+                                RTPrintf("Address:            %ls\n", bstr.raw());
                         }
 
@@ -1903 +1903 @@
                      RTPrintf("AttachedHostPci=%s,%s\n", szHostPciAddress, szGuestPciAddress);
                  else
-                     RTPrintf("   Host device %lS at %s attached as %s\n", DevName.raw(), szHostPciAddress, szGuestPciAddress);
+                     RTPrintf("   Host device %ls at %s attached as %s\n", DevName.raw(), szHostPciAddress, szGuestPciAddress);
              }
 
@@ -1932 +1932 @@
             sf->COMGETTER(Name)(name.asOutParam());
             sf->COMGETTER(HostPath)(hostPath.asOutParam());
-            RTPrintf("Name: '%lS', Host path: '%lS' (global mapping)\n", name.raw(), hostPath.raw());
+            RTPrintf("Name: '%ls', Host path: '%ls' (global mapping)\n", name.raw(), hostPath.raw());
             ++numSharedFolders;
         }
@@ -1956 +1956 @@
             if (details == VMINFO_MACHINEREADABLE)
             {
-                RTPrintf("SharedFolderNameMachineMapping%zu=\"%lS\"\n", i + 1,
+                RTPrintf("SharedFolderNameMachineMapping%zu=\"%ls\"\n", i + 1,
                          name.raw());
-                RTPrintf("SharedFolderPathMachineMapping%zu=\"%lS\"\n", i + 1,
+                RTPrintf("SharedFolderPathMachineMapping%zu=\"%ls\"\n", i + 1,
                          hostPath.raw());
             }
             else
-                RTPrintf("Name: '%lS', Host path: '%lS' (machine mapping), %s\n",
+                RTPrintf("Name: '%ls', Host path: '%ls' (machine mapping), %s\n",
                          name.raw(), hostPath.raw(), writable ? "writable" : "readonly");
             ++numSharedFolders;
@@ -1985 +1985 @@
             if (details == VMINFO_MACHINEREADABLE)
             {
-                RTPrintf("SharedFolderNameTransientMapping%zu=\"%lS\"\n", i + 1,
+                RTPrintf("SharedFolderNameTransientMapping%zu=\"%ls\"\n", i + 1,
                          name.raw());
-                RTPrintf("SharedFolderPathTransientMapping%zu=\"%lS\"\n", i + 1,
+                RTPrintf("SharedFolderPathTransientMapping%zu=\"%ls\"\n", i + 1,
                          hostPath.raw());
             }
             else
-                RTPrintf("Name: '%lS', Host path: '%lS' (transient mapping)\n", name.raw(), hostPath.raw());
+                RTPrintf("Name: '%ls', Host path: '%ls' (transient mapping)\n", name.raw(), hostPath.raw());
             ++numSharedFolders;
         }
@@ -2106 +2106 @@
                 if (details == VMINFO_MACHINEREADABLE)
                 {
-                    RTPrintf("VRDEUserName=\"%lS\"\n", User.raw());
-                    RTPrintf("VRDEDomain=\"%lS\"\n", Domain.raw());
-                    RTPrintf("VRDEClientName=\"%lS\"\n", ClientName.raw());
-                    RTPrintf("VRDEClientIP=\"%lS\"\n", ClientIP.raw());
+                    RTPrintf("VRDEUserName=\"%ls\"\n", User.raw());
+                    RTPrintf("VRDEDomain=\"%ls\"\n", Domain.raw());
+                    RTPrintf("VRDEClientName=\"%ls\"\n", ClientName.raw());
+                    RTPrintf("VRDEClientIP=\"%ls\"\n", ClientIP.raw());
                     RTPrintf("VRDEClientVersion=%d\n",  ClientVersion);
                     RTPrintf("VRDEEncryption=\"%s\"\n", EncryptionStyle == 0? "RDP4": "RDP5 (X.509)");
@@ -2115 +2115 @@
                 else
                 {
-                    RTPrintf("User name:          %lS\n", User.raw());
-                    RTPrintf("Domain:             %lS\n", Domain.raw());
-                    RTPrintf("Client name:        %lS\n", ClientName.raw());
-                    RTPrintf("Client IP:          %lS\n", ClientIP.raw());
+                    RTPrintf("User name:          %ls\n", User.raw());
+                    RTPrintf("Domain:             %ls\n", Domain.raw());
+                    RTPrintf("Client name:        %ls\n", ClientName.raw());
+                    RTPrintf("Client IP:          %ls\n", ClientIP.raw());
                     RTPrintf("Client version:     %d\n",  ClientVersion);
                     RTPrintf("Encryption:         %s\n", EncryptionStyle == 0? "RDP4": "RDP5 (X.509)");
@@ -2138 +2138 @@
         {
             if (details == VMINFO_MACHINEREADABLE)
-                RTPrintf("description=\"%lS\"\n", description.raw());
+                RTPrintf("description=\"%ls\"\n", description.raw());
             else
-                RTPrintf("Description:\n%lS\n", description.raw());
+                RTPrintf("Description:\n%ls\n", description.raw());
         }
     }
@@ -2170 +2170 @@
             {
                 if (details == VMINFO_MACHINEREADABLE)
-                    RTPrintf("GuestOSType=\"%lS\"\n", guestString.raw());
+                    RTPrintf("GuestOSType=\"%ls\"\n", guestString.raw());
                 else
-                    RTPrintf("OS type:                             %lS\n", guestString.raw());
+                    RTPrintf("OS type:                             %ls\n", guestString.raw());
             }
 
@@ -2190 +2190 @@
             {
                 if (details == VMINFO_MACHINEREADABLE)
-                    RTPrintf("GuestAdditionsVersion=\"%lS\"\n", guestString.raw());
+                    RTPrintf("GuestAdditionsVersion=\"%ls\"\n", guestString.raw());
                 else
-                    RTPrintf("Additions version:                   %lS\n\n", guestString.raw());
+                    RTPrintf("Additions version:                   %ls\n\n", guestString.raw());
             }
 
@@ -2215 +2215 @@
                         CHECK_ERROR_RET(fac, COMGETTER(LastUpdated)(&lLastUpdatedMS), rc);
                         if (details == VMINFO_MACHINEREADABLE)
-                            RTPrintf("GuestAdditionsFacility_%lS=%u,%lld\n",
+                            RTPrintf("GuestAdditionsFacility_%ls=%u,%lld\n",
                                      guestString.raw(), curStatus, lLastUpdatedMS);
                         else
                         {
                             makeTimeStr(szLastUpdated, sizeof(szLastUpdated), lLastUpdatedMS);
-                            RTPrintf("Facility \"%lS\": %s (last update: %s)\n",
+                            RTPrintf("Facility \"%ls\": %s (last update: %s)\n",
                                      guestString.raw(), facilityStateToName(curStatus, false /* No short naming */), szLastUpdated);
                         }

trunk/src/VBox/Frontends/VBoxManage/VBoxManageList.cpp

@@ -89 +89 @@
         Bstr format;
         pMedium->COMGETTER(Format)(format.asOutParam());
-        RTPrintf("Format:      %lS\n", format.raw());
+        RTPrintf("Format:      %ls\n", format.raw());
         Bstr filepath;
         pMedium->COMGETTER(Location)(filepath.asOutParam());
-        RTPrintf("Location:    %lS\n", filepath.raw());
+        RTPrintf("Location:    %ls\n", filepath.raw());
 
         MediumState_T enmState;
@@ -158 +158 @@
             Bstr name;
             machine->COMGETTER(Name)(name.asOutParam());
-            RTPrintf("%s%lS (UUID: %lS)",
+            RTPrintf("%s%ls (UUID: %ls)",
                     j == 0 ? "Usage:       " : "             ",
                     name.raw(), machineIds[j]);
@@ -172 +172 @@
                     Bstr snapshotName;
                     snapshot->COMGETTER(Name)(snapshotName.asOutParam());
-                    RTPrintf(" [%lS (UUID: %lS)]", snapshotName.raw(), snapshotIds[k]);
+                    RTPrintf(" [%ls (UUID: %ls)]", snapshotName.raw(), snapshotIds[k]);
                 }
             }
@@ -227 +227 @@
         if (i)
             RTPrintf("\n");
-        RTPrintf("Pack no.%2zu:   %lS\n"
-                 "Version:      %lS\n"
+        RTPrintf("Pack no.%2zu:   %ls\n"
+                 "Version:      %ls\n"
                  "Revision:     %u\n"
-                 "Description:  %lS\n"
-                 "VRDE Module:  %lS\n"
+                 "Description:  %ls\n"
+                 "VRDE Module:  %ls\n"
                  "Usable:       %RTbool\n"
-                 "Why unusable: %lS\n",
+                 "Why unusable: %ls\n",
                  i, bstrName.raw(),
                  bstrVersion.raw(),
@@ -367 +367 @@
                     Bstr guestId;
                     guestOS->COMGETTER(Id)(guestId.asOutParam());
-                    RTPrintf("ID:          %lS\n", guestId.raw());
+                    RTPrintf("ID:          %ls\n", guestId.raw());
                     Bstr guestDescription;
                     guestOS->COMGETTER(Description)(guestDescription.asOutParam());
-                    RTPrintf("Description: %lS\n\n", guestDescription.raw());
+                    RTPrintf("Description: %ls\n\n", guestDescription.raw());
                 }
             }
@@ -392 +392 @@
                     Bstr location;
                     dvdDrive->COMGETTER(Location)(location.asOutParam());
-                    RTPrintf("Name:         %lS\n\n", location.raw());
+                    RTPrintf("Name:         %ls\n\n", location.raw());
                 }
             }
@@ -414 +414 @@
                     Bstr location;
                     floppyDrive->COMGETTER(Location)(location.asOutParam());
-                    RTPrintf("Name:         %lS\n\n", location.raw());
+                    RTPrintf("Name:         %ls\n\n", location.raw());
                 }
             }
@@ -445 +445 @@
                 Bstr interfaceName;
                 networkInterface->COMGETTER(Name)(interfaceName.asOutParam());
-                RTPrintf("Name:        %lS\n", interfaceName.raw());
+                RTPrintf("Name:        %ls\n", interfaceName.raw());
                 Guid interfaceGuid;
                 networkInterface->COMGETTER(Id)(interfaceGuid.asOutParam());
-                RTPrintf("GUID:        %lS\n\n", Bstr(interfaceGuid.toString()).raw());
+                RTPrintf("GUID:        %ls\n\n", Bstr(interfaceGuid.toString()).raw());
 #else /* VBOX_WITH_HOSTNETIF_API */
                 Bstr interfaceName;
                 networkInterface->COMGETTER(Name)(interfaceName.asOutParam());
-                RTPrintf("Name:            %lS\n", interfaceName.raw());
+                RTPrintf("Name:            %ls\n", interfaceName.raw());
                 Bstr interfaceGuid;
                 networkInterface->COMGETTER(Id)(interfaceGuid.asOutParam());
-                RTPrintf("GUID:            %lS\n", interfaceGuid.raw());
+                RTPrintf("GUID:            %ls\n", interfaceGuid.raw());
                 BOOL bDhcpEnabled;
                 networkInterface->COMGETTER(DhcpEnabled)(&bDhcpEnabled);
@@ -462 +462 @@
                 Bstr IPAddress;
                 networkInterface->COMGETTER(IPAddress)(IPAddress.asOutParam());
-                RTPrintf("IPAddress:       %lS\n", IPAddress.raw());
+                RTPrintf("IPAddress:       %ls\n", IPAddress.raw());
                 Bstr NetworkMask;
                 networkInterface->COMGETTER(NetworkMask)(NetworkMask.asOutParam());
-                RTPrintf("NetworkMask:     %lS\n", NetworkMask.raw());
+                RTPrintf("NetworkMask:     %ls\n", NetworkMask.raw());
                 Bstr IPV6Address;
                 networkInterface->COMGETTER(IPV6Address)(IPV6Address.asOutParam());
-                RTPrintf("IPV6Address:     %lS\n", IPV6Address.raw());
+                RTPrintf("IPV6Address:     %ls\n", IPV6Address.raw());
                 ULONG IPV6NetworkMaskPrefixLength;
                 networkInterface->COMGETTER(IPV6NetworkMaskPrefixLength)(&IPV6NetworkMaskPrefixLength);
@@ -474 +474 @@
                 Bstr HardwareAddress;
                 networkInterface->COMGETTER(HardwareAddress)(HardwareAddress.asOutParam());
-                RTPrintf("HardwareAddress: %lS\n", HardwareAddress.raw());
+                RTPrintf("HardwareAddress: %ls\n", HardwareAddress.raw());
                 HostNetworkInterfaceMediumType_T Type;
                 networkInterface->COMGETTER(MediumType)(&Type);
@@ -483 +483 @@
                 Bstr netName;
                 networkInterface->COMGETTER(NetworkName)(netName.asOutParam());
-                RTPrintf("VBoxNetworkName: %lS\n\n", netName.raw());
+                RTPrintf("VBoxNetworkName: %ls\n\n", netName.raw());
 #endif
             }
@@ -519 +519 @@
                     RTPrintf("Processor#%u speed: unknown\n", i, processorSpeed);
                 CHECK_ERROR(Host, GetProcessorDescription(i, processorDescription.asOutParam()));
-                RTPrintf("Processor#%u description: %lS\n", i, processorDescription.raw());
+                RTPrintf("Processor#%u description: %ls\n", i, processorDescription.raw());
             }
 
@@ -532 +532 @@
             Bstr operatingSystem;
             CHECK_ERROR(Host, COMGETTER(OperatingSystem)(operatingSystem.asOutParam()));
-            RTPrintf("Operating system: %lS\n", operatingSystem.raw());
+            RTPrintf("Operating system: %ls\n", operatingSystem.raw());
 
             Bstr oSVersion;
             CHECK_ERROR(Host, COMGETTER(OSVersion)(oSVersion.asOutParam()));
-            RTPrintf("Operating system version: %lS\n", oSVersion.raw());
+            RTPrintf("Operating system version: %ls\n", oSVersion.raw());
             break;
         }
@@ -713 +713 @@
                     CHECK_ERROR_RET(dev, COMGETTER(Manufacturer)(bstr.asOutParam()), 1);
                     if (!bstr.isEmpty())
-                        RTPrintf("Manufacturer:       %lS\n", bstr.raw());
+                        RTPrintf("Manufacturer:       %ls\n", bstr.raw());
                     CHECK_ERROR_RET(dev, COMGETTER(Product)(bstr.asOutParam()), 1);
                     if (!bstr.isEmpty())
-                        RTPrintf("Product:            %lS\n", bstr.raw());
+                        RTPrintf("Product:            %ls\n", bstr.raw());
                     CHECK_ERROR_RET(dev, COMGETTER(SerialNumber)(bstr.asOutParam()), 1);
                     if (!bstr.isEmpty())
-                        RTPrintf("SerialNumber:       %lS\n", bstr.raw());
+                        RTPrintf("SerialNumber:       %ls\n", bstr.raw());
                     CHECK_ERROR_RET(dev, COMGETTER(Address)(bstr.asOutParam()), 1);
                     if (!bstr.isEmpty())
-                        RTPrintf("Address:            %lS\n", bstr.raw());
+                        RTPrintf("Address:            %ls\n", bstr.raw());
 
                     /* current state  */
@@ -805 +805 @@
                     Bstr bstr;
                     CHECK_ERROR_RET(flt, COMGETTER(Name)(bstr.asOutParam()), 1);
-                    RTPrintf("Name:             %lS\n", bstr.raw());
+                    RTPrintf("Name:             %ls\n", bstr.raw());
                     CHECK_ERROR_RET(flt, COMGETTER(VendorId)(bstr.asOutParam()), 1);
-                    RTPrintf("VendorId:         %lS\n", bstr.raw());
+                    RTPrintf("VendorId:         %ls\n", bstr.raw());
                     CHECK_ERROR_RET(flt, COMGETTER(ProductId)(bstr.asOutParam()), 1);
-                    RTPrintf("ProductId:        %lS\n", bstr.raw());
+                    RTPrintf("ProductId:        %ls\n", bstr.raw());
                     CHECK_ERROR_RET(flt, COMGETTER(Revision)(bstr.asOutParam()), 1);
-                    RTPrintf("Revision:         %lS\n", bstr.raw());
+                    RTPrintf("Revision:         %ls\n", bstr.raw());
                     CHECK_ERROR_RET(flt, COMGETTER(Manufacturer)(bstr.asOutParam()), 1);
-                    RTPrintf("Manufacturer:     %lS\n", bstr.raw());
+                    RTPrintf("Manufacturer:     %ls\n", bstr.raw());
                     CHECK_ERROR_RET(flt, COMGETTER(Product)(bstr.asOutParam()), 1);
-                    RTPrintf("Product:          %lS\n", bstr.raw());
+                    RTPrintf("Product:          %ls\n", bstr.raw());
                     CHECK_ERROR_RET(flt, COMGETTER(SerialNumber)(bstr.asOutParam()), 1);
-                    RTPrintf("Serial Number:    %lS\n\n", bstr.raw());
+                    RTPrintf("Serial Number:    %ls\n\n", bstr.raw());
                 }
             }
@@ -901 +901 @@
             RTPrintf("Maximum Devices per Floppy Port: %u\n", ulValue);
             systemProperties->COMGETTER(DefaultMachineFolder)(str.asOutParam());
-            RTPrintf("Default machine folder:          %lS\n", str.raw());
+            RTPrintf("Default machine folder:          %ls\n", str.raw());
             systemProperties->COMGETTER(VRDEAuthLibrary)(str.asOutParam());
-            RTPrintf("VRDE auth library:               %lS\n", str.raw());
+            RTPrintf("VRDE auth library:               %ls\n", str.raw());
             systemProperties->COMGETTER(WebServiceAuthLibrary)(str.asOutParam());
-            RTPrintf("Webservice auth. library:        %lS\n", str.raw());
+            RTPrintf("Webservice auth. library:        %ls\n", str.raw());
             systemProperties->COMGETTER(DefaultVRDEExtPack)(str.asOutParam());
-            RTPrintf("Remote desktop ExtPack:          %lS\n", str.raw());
+            RTPrintf("Remote desktop ExtPack:          %ls\n", str.raw());
             systemProperties->COMGETTER(LogHistoryCount)(&ulValue);
             RTPrintf("Log history count:               %u\n", ulValue);
@@ -922 +922 @@
                 Bstr netName;
                 svr->COMGETTER(NetworkName)(netName.asOutParam());
-                RTPrintf("NetworkName:    %lS\n", netName.raw());
+                RTPrintf("NetworkName:    %ls\n", netName.raw());
                 Bstr ip;
                 svr->COMGETTER(IPAddress)(ip.asOutParam());
-                RTPrintf("IP:             %lS\n", ip.raw());
+                RTPrintf("IP:             %ls\n", ip.raw());
                 Bstr netmask;
                 svr->COMGETTER(NetworkMask)(netmask.asOutParam());
-                RTPrintf("NetworkMask:    %lS\n", netmask.raw());
+                RTPrintf("NetworkMask:    %ls\n", netmask.raw());
                 Bstr lowerIp;
                 svr->COMGETTER(LowerIP)(lowerIp.asOutParam());
-                RTPrintf("lowerIPAddress: %lS\n", lowerIp.raw());
+                RTPrintf("lowerIPAddress: %ls\n", lowerIp.raw());
                 Bstr upperIp;
                 svr->COMGETTER(UpperIP)(upperIp.asOutParam());
-                RTPrintf("upperIPAddress: %lS\n", upperIp.raw());
+                RTPrintf("upperIPAddress: %ls\n", upperIp.raw());
                 BOOL fEnabled;
                 svr->COMGETTER(Enabled)(&fEnabled);

trunk/src/VBox/Frontends/VBoxManage/VBoxManageMisc.cpp

@@ -449 +449 @@
     Bstr bstrNewName;
     CHECK_ERROR_RET(trgMachine, COMGETTER(Name)(bstrNewName.asOutParam()), RTEXITCODE_FAILURE);
-    RTPrintf("Machine has been successfully cloned as \"%lS\"\n", bstrNewName.raw());
+    RTPrintf("Machine has been successfully cloned as \"%ls\"\n", bstrNewName.raw());
 
     return RTEXITCODE_SUCCESS;
@@ -684 +684 @@
                                                         bstrValue.asOutParam()));
 
-                RTPrintf("Key: %lS, Value: %lS\n", bstrKey.raw(), bstrValue.raw());
+                RTPrintf("Key: %ls, Value: %ls\n", bstrKey.raw(), bstrValue.raw());
             }
         }
@@ -693 +693 @@
                                                     value.asOutParam()));
             if (!value.isEmpty())
-                RTPrintf("Value: %lS\n", value.raw());
+                RTPrintf("Value: %ls\n", value.raw());
             else
                 RTPrintf("No value set!\n");
@@ -720 +720 @@
                                                       bstrValue.asOutParam()));
 
-                    RTPrintf("Key: %lS, Value: %lS\n", bstrKey.raw(), bstrValue.raw());
+                    RTPrintf("Key: %ls, Value: %ls\n", bstrKey.raw(), bstrValue.raw());
                 }
             }
@@ -729 +729 @@
                                                   value.asOutParam()));
                 if (!value.isEmpty())
-                    RTPrintf("Value: %lS\n", value.raw());
+                    RTPrintf("Value: %ls\n", value.raw());
                 else
                     RTPrintf("No value set!\n");
@@ -1076 +1076 @@
         CHECK_PROGRESS_ERROR_RET(ptrProgress, ("Failed to install \"%s\"", szPath), RTEXITCODE_FAILURE);
 
-        RTPrintf("Successfully installed \"%lS\".\n", bstrName.raw());
+        RTPrintf("Successfully installed \"%ls\".\n", bstrName.raw());
     }
     else if (!strcmp(a->argv[0], "uninstall"))

trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp

@@ -507 +507 @@
                 pRTEEv->COMGETTER(Id)(bstrId.asOutParam());
                 pRTEEv->COMGETTER(Message)(bstrMessage.asOutParam());
-                RTPrintf("\n%s: ** %lS **\n%lS\n%s\n", pszType, bstrId.raw(), bstrMessage.raw(),
+                RTPrintf("\n%s: ** %ls **\n%ls\n%s\n", pszType, bstrId.raw(), bstrMessage.raw(),
                          fPaused ? "The VM was paused. Continue with HostKey + P after you solved the problem.\n" : "");
                 break;
@@ -665 +665 @@
     com::ErrorInfo info;
 
-    RTStrPrintf(pszBuffer, sizeof(pszBuffer), "%lS", pwszDescr);
+    RTStrPrintf(pszBuffer, sizeof(pszBuffer), "%ls", pwszDescr);
 
     RTPrintf("\n%s! Error info:\n", pszName);
@@ -680 +680 @@
 
     if (pwszComponent)
-        RTPrintf("(component %lS).\n", pwszComponent);
+        RTPrintf("(component %ls).\n", pwszComponent);
 
     RTPrintf("\n");

trunk/src/VBox/HostServices/SharedFolders/service.cpp

@@ -1261 +1261 @@
         Log(("SharedFolders host service: svcCall: SHFL_FN_ADD_MAPPING\n"));
         LogRel(("SharedFolders host service: adding host mapping\n"));
-        LogRel(("    Host path '%lS', map name '%lS', %s\n",
+        LogRel(("    Host path '%ls', map name '%ls', %s\n",
                 ((SHFLSTRING *)paParms[0].u.pointer.addr)->String.ucs2,
                 ((SHFLSTRING *)paParms[1].u.pointer.addr)->String.ucs2,
@@ -1320 +1320 @@
     {
         Log(("SharedFolders host service: svcCall: SHFL_FN_REMOVE_MAPPING\n"));
-        LogRel(("SharedFolders host service: removing host mapping '%lS'\n",
+        LogRel(("SharedFolders host service: removing host mapping '%ls'\n",
                 ((SHFLSTRING *)paParms[0].u.pointer.addr)->String.ucs2));
 

trunk/src/VBox/Main/testcase/tstAPI.cpp

@@ -1186 +1186 @@
             Bstr interfaceName;
             networkInterface->COMGETTER(Name)(interfaceName.asOutParam());
-            RTPrintf("Found %d network interfaces, testing with %lS...\n", hostNetworkInterfaces.size(), interfaceName.raw());
+            RTPrintf("Found %d network interfaces, testing with %ls...\n", hostNetworkInterfaces.size(), interfaceName.raw());
             Guid interfaceGuid;
             networkInterface->COMGETTER(Id)(interfaceGuid.asOutParam());
@@ -1196 +1196 @@
             networkInterface->COMGETTER(Id)(interfaceGuid2.asOutParam());
             if (interfaceGuid2 != interfaceGuid)
-                RTPrintf("Failed to retrieve an interface by name %lS.\n", interfaceName.raw());
+                RTPrintf("Failed to retrieve an interface by name %ls.\n", interfaceName.raw());
             // Find the interface by its guid
             networkInterface.setNull();
@@ -1204 +1204 @@
             networkInterface->COMGETTER(Name)(interfaceName2.asOutParam());
             if (interfaceName != interfaceName2)
-                RTPrintf("Failed to retrieve an interface by GUID %lS.\n", Bstr(interfaceGuid.toString()).raw());
+                RTPrintf("Failed to retrieve an interface by GUID %ls.\n", Bstr(interfaceGuid.toString()).raw());
         }
         else
@@ -1414 +1414 @@
                 com::ProgressErrorInfo info(progress);
                 if (info.isBasicAvailable())
-                    RTPrintf("Error: failed to import appliance. Error message: %lS\n", info.getText().raw());
+                    RTPrintf("Error: failed to import appliance. Error message: %ls\n", info.getText().raw());
                 else
                     RTPrintf("Error: failed to import appliance. No error message available!\n");

trunk/src/VBox/Runtime/testcase/tstDir.cpp

@@ -162 +162 @@
                                  DirEntry.Info.AccessTime);
                         if (fShortName && DirEntry.cwcShortName)
-                            RTPrintf(" %2d %lS\n", DirEntry.cwcShortName, DirEntry.wszShortName);
+                            RTPrintf(" %2d %ls\n", DirEntry.cwcShortName, DirEntry.wszShortName);
                         else
                             RTPrintf(" %2d %s\n", DirEntry.cbName, DirEntry.szName);