Changeset 37202 in vbox for trunk

Timestamp:

May 24, 2011 3:57:55 PM (14 years ago)

Author:

vboxsync

Message:

VBoxManage: more build fixes for CBSTR/BSTR/wchar_t[] string incompatibilities

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• VBoxManageControlVM.cpp (modified) (1 diff)
• VBoxManageModifyVM.cpp (modified) (7 diffs)

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

@@ -664 +664 @@
                         CHECK_ERROR_RET(adapter, COMSETTER(Enabled)(TRUE), 1);
                         CHECK_ERROR_RET(adapter, COMSETTER(AttachmentType)(NetworkAttachmentType_Generic), 1);
-                        CHECK_ERROR_RET(adapter, SetProperty((CBSTR)L"name", Bstr(a->argv[3]).raw()), 1);
+                        CHECK_ERROR_RET(adapter, SetProperty(Bstr("name").raw(), Bstr(a->argv[3]).raw()), 1);
                     }
                     else

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

@@ -1278 +1278 @@
                 if (!strcmp(ValueUnion.psz, "none"))
                 {
-                    CHECK_ERROR(nic, COMSETTER(BridgedInterface)((CBSTR)L""));
+                    CHECK_ERROR(nic, COMSETTER(BridgedInterface)(Bstr().raw()));
                 }
                 else
@@ -1297 +1297 @@
                 if (!strcmp(ValueUnion.psz, "none"))
                 {
-                    CHECK_ERROR(nic, COMSETTER(HostOnlyInterface)((CBSTR)L""));
+                    CHECK_ERROR(nic, COMSETTER(HostOnlyInterface)(Bstr().raw()));
                 }
                 else
@@ -1316 +1316 @@
                 if (!strcmp(ValueUnion.psz, "none"))
                 {
-                    CHECK_ERROR(nic, COMSETTER(InternalNetwork)((CBSTR)L""));
+                    CHECK_ERROR(nic, COMSETTER(InternalNetwork)(Bstr().raw()));
                 }
                 else
@@ -1595 +1595 @@
                 if (!strcmp(ValueUnion.psz, "auto"))
                 {
-                    CHECK_ERROR(nic, COMSETTER(MACAddress)((CBSTR)L""));
+                    CHECK_ERROR(nic, COMSETTER(MACAddress)(Bstr().raw()));
                 }
                 else
@@ -1919 +1919 @@
                     }
                     else
-                        CHECK_ERROR(vrdeServer, COMSETTER(VRDEExtPack)((CBSTR)L""));
+                        CHECK_ERROR(vrdeServer, COMSETTER(VRDEExtPack)(Bstr().raw()));
                 }
                 break;
@@ -2035 +2035 @@
                     }
                     else
-                        CHECK_ERROR(vrdeServer, COMSETTER(AuthLibrary)((CBSTR)L""));
+                        CHECK_ERROR(vrdeServer, COMSETTER(AuthLibrary)(Bstr().raw()));
                 }
                 break;
@@ -2123 +2123 @@
             {
                 if (!strcmp(ValueUnion.psz, "default"))
-                    CHECK_ERROR(machine, COMSETTER(SnapshotFolder)((CBSTR)L""));
+                    CHECK_ERROR(machine, COMSETTER(SnapshotFolder)(Bstr().raw()));
                 else
                     CHECK_ERROR(machine, COMSETTER(SnapshotFolder)(Bstr(ValueUnion.psz).raw()));