Changeset 15574 in vbox for trunk/src/VBox

Timestamp:

Dec 16, 2008 11:37:26 AM (16 years ago)

Author:

vboxsync

Message:

#3282: Windows build fixes.

Location:

trunk/src/VBox

Files:

• Frontends/VBoxManage/VBoxManage.cpp (modified) (1 diff)
• Main/ConsoleImpl.cpp (modified) (1 diff)
• Main/ConsoleImpl2.cpp (modified) (4 diffs)
• Main/HostImpl.cpp (modified) (4 diffs)

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

@@ -3670 +3670 @@
         {
             /* not a valid UUID, search for it */
-            ComPtr<IHostNetworkInterfaceCollection> coll;
-            CHECK_ERROR_BREAK(host, COMGETTER(NetworkInterfaces)(coll.asOutParam()));
-            CHECK_ERROR_BREAK(coll, FindByName(Bstr(argv[0]), hostif.asOutParam()));
+            Bstr strName(argv[0]);
+            com::SafeIfaceArray <IHostNetworkInterface> hostNetworkInterfaces;
+            CHECK_ERROR_BREAK(host, COMGETTER(NetworkInterfaces) (ComSafeArrayAsOutParam (hostNetworkInterfaces)));
+            ComPtr <IHostNetworkInterface> hostif;
+            for (size_t i = 0; i < hostNetworkInterfaces.size(); ++i)
+            {
+                Bstr name;
+                hostNetworkInterfaces[i]->COMGETTER(Name) (name.asOutParam());
+                if (name == strName)
+                {
+                    hostif = hostNetworkInterfaces[i];
+                    break;
+                }
+            }
+            if (hostif.isNull())
+            {
+                rc = E_INVALIDARG;
+                break;
+            }
             CHECK_ERROR_BREAK(hostif, COMGETTER(Id)(uuid.asOutParam()));
         }

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -4299 +4299 @@
                 virtualBox->COMGETTER(Host)(host.asOutParam());
                 com::SafeIfaceArray <IHostNetworkInterface> hostNetworkInterfaces;
-                CHECK_ERROR(host, 
-                            COMGETTER(NetworkInterfaces) (ComSafeArrayAsOutParam (hostNetworkInterfaces)));
+                host->COMGETTER(NetworkInterfaces) (ComSafeArrayAsOutParam (hostNetworkInterfaces));
                 bool found = false;
                 for (size_t i = 0; i < hostNetworkInterfaces.size(); ++i)
                 {
                     Bstr name;
-                    hostNetworkInterfaces[i].COMGETTER(Name) (name.asOutParam());
+                    hostNetworkInterfaces[i]->COMGETTER(Name) (name.asOutParam());
                     if (name == hostif)
                     {

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -1313 +1313 @@
 # elif defined(RT_OS_WINDOWS)
                     com::SafeIfaceArray <IHostNetworkInterface> hostNetworkInterfaces;
-                    hrc = host->COMGETTER(NetworkInterfaces) (ComSafeArrayAsOutParam (hostNetworkInterfaces)));
+                    hrc = host->COMGETTER(NetworkInterfaces) (ComSafeArrayAsOutParam (hostNetworkInterfaces));
                     if(FAILED(hrc))
                     {
@@ -1323 +1323 @@
                     {
                         Bstr name;
-                        hostNetworkInterfaces[i].COMGETTER(Name) (name.asOutParam());
-                        if (name == hostif)
+                        hostNetworkInterfaces[i]->COMGETTER(Name) (name.asOutParam());
+                        if (name == HifName)
                         {
                             hostInterface = hostNetworkInterfaces[i];
@@ -1330 +1330 @@
                         }
                     }
-                    if (hostInterface.IsNull())
+                    if (hostInterface.isNull())
                     {
                         AssertBreakpoint();
@@ -1521 +1521 @@
                         }
                     }
-                    if (hostInterface.IsNull())
+                    if (hostInterface.isNull())
                     {
                         AssertMsgFailed(("Cannot get GUID for host interface '%ls'\n", hostInterfaceName));

trunk/src/VBox/Main/HostImpl.cpp

@@ -1378 +1378 @@
     {
         com::SafeIfaceArray <IHostNetworkInterface> hostNetworkInterfaces;
-        rc = host->COMGETTER(NetworkInterfaces) (ComSafeArrayAsOutParam (hostNetworkInterfaces)));
+        rc = COMGETTER(NetworkInterfaces) (ComSafeArrayAsOutParam (hostNetworkInterfaces));
         CheckComRCReturnRC (rc);
         for (size_t i = 0; i < hostNetworkInterfaces.size(); ++i)
         {
             Bstr name;
-            hostNetworkInterfaces[i].COMGETTER(Name) (name.asOutParam());
+            hostNetworkInterfaces[i]->COMGETTER(Name) (name.asOutParam());
             if (name == aName)
             {
@@ -1446 +1446 @@
     {
         com::SafeIfaceArray <IHostNetworkInterface> hostNetworkInterfaces;
-        rc = host->COMGETTER(NetworkInterfaces) (ComSafeArrayAsOutParam (hostNetworkInterfaces)));
+        rc = COMGETTER(NetworkInterfaces) (ComSafeArrayAsOutParam (hostNetworkInterfaces));
         CheckComRCReturnRC (rc);
         ComPtr <IHostNetworkInterface> iface;
@@ -1452 +1452 @@
         {
             Guid guid;
-            hostNetworkInterfaces[i].COMGETTER(Id) (guid.asOutParam());
+            hostNetworkInterfaces[i]->COMGETTER(Id) (guid.asOutParam());
             if (guid == aId)
             {
@@ -1459 +1459 @@
             }
         }
-        if (iface.IsNull())
+        if (iface.isNull())
             return setError (VBOX_E_OBJECT_NOT_FOUND,
                 tr ("Host network interface with UUID {%RTuuid} does not exist"),