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

Timestamp:

Apr 28, 2009 2:10:45 PM (16 years ago)

Author:

vboxsync

Message:

Main: hopefully fixed Linux burns

Location:

trunk/src/VBox/Main

Files:

• ConsoleImpl.cpp (modified) (1 diff)
• FloppyDriveImpl.cpp (modified) (1 diff)
• HostPower.cpp (modified) (1 diff)
• ProgressImpl.cpp (modified) (4 diffs)
• generic/NetIf-generic.cpp (modified) (1 diff)
• include/ProgressImpl.h (modified) (2 diffs)
• testcase/tstVBoxAPILinux.cpp (modified) (7 diffs)

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -6912 +6912 @@
         if (SUCCEEDED (rc))
         {
-            HRESULT result = S_OK;
-            rc = task->mServerProgress->COMGETTER(ResultCode) (&result);
+            LONG iRc = S_OK;
+            rc = task->mServerProgress->COMGETTER(ResultCode) (&iRc);
             if (SUCCEEDED (rc))
-                rc = result;
+                rc = iRc;
         }
     }

trunk/src/VBox/Main/FloppyDriveImpl.cpp

@@ -256 +256 @@
 STDMETHODIMP FloppyDrive::MountImage (IN_BSTR aImageId)
 {
-    Guid imageId = aImageId;
+    Guid imageId(aImageId);
     CheckComArgExpr(aImageId, !imageId.isEmpty());
 

trunk/src/VBox/Main/HostPower.cpp

@@ -136 +136 @@
 
                 /* Wait until the operation has been completed. */
+                LONG iRc;
                 rc = progress->WaitForCompletion(-1);
                 if (SUCCEEDED (rc))
-                    progress->COMGETTER(ResultCode) (&rc);
+                    progress->COMGETTER(ResultCode) (&iRc);
+                rc = iRc;
 
                 AssertMsg (SUCCEEDED (rc), ("SaveState WaitForCompletion "

trunk/src/VBox/Main/ProgressImpl.cpp

@@ -372 +372 @@
 }
 
-STDMETHODIMP ProgressBase::COMGETTER(ResultCode) (HRESULT *aResultCode)
+STDMETHODIMP ProgressBase::COMGETTER(ResultCode) (LONG *aResultCode)
 {
     CheckComArgOutPointerValid(aResultCode);
@@ -492 +492 @@
     AssertReturn (aProgress != NULL, E_INVALIDARG);
 
-    HRESULT resultCode;
-    HRESULT rc = aProgress->COMGETTER(ResultCode) (&resultCode);
+    LONG iRc;
+    HRESULT rc = aProgress->COMGETTER(ResultCode) (&iRc);
     AssertComRCReturnRC (rc);
+    HRESULT resultCode = iRc;
 
     if (resultCode == S_OK)
@@ -1315 +1316 @@
 }
 
-STDMETHODIMP CombinedProgress::COMGETTER(ResultCode) (HRESULT *aResultCode)
+STDMETHODIMP CombinedProgress::COMGETTER(ResultCode) (LONG *aResultCode)
 {
     CheckComArgOutPointerValid(aResultCode);
@@ -1592 +1593 @@
                 return rc;
 
-            rc = progress->COMGETTER(ResultCode) (&mResultCode);
+            LONG iRc;
+            rc = progress->COMGETTER(ResultCode) (&iRc);
             if (FAILED (rc))
                 return rc;
+            mResultCode = iRc;
 
             if (FAILED (mResultCode))

trunk/src/VBox/Main/generic/NetIf-generic.cpp

@@ -218 +218 @@
         Bstr ifname;
         ComPtr <IHostNetworkInterface> iface;
-        if (FAILED (host->FindHostNetworkInterfaceById (aId, iface.asOutParam())))
+        if (FAILED (host->FindHostNetworkInterfaceById (Guid(aId).toUtf16(), iface.asOutParam())))
             return VERR_INVALID_PARAMETER;
         iface->COMGETTER (Name) (ifname.asOutParam());

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

@@ -76 +76 @@
     STDMETHOD(COMGETTER(Completed)) (BOOL *aCompleted);
     STDMETHOD(COMGETTER(Canceled)) (BOOL *aCanceled);
-    STDMETHOD(COMGETTER(ResultCode)) (HRESULT *aResultCode);
+    STDMETHOD(COMGETTER(ResultCode)) (LONG *aResultCode);
     STDMETHOD(COMGETTER(ErrorInfo)) (IVirtualBoxErrorInfo **aErrorInfo);
     STDMETHOD(COMGETTER(OperationCount)) (ULONG *aOperationCount);
@@ -396 +396 @@
     STDMETHOD(COMGETTER(Completed)) (BOOL *aCompleted);
     STDMETHOD(COMGETTER(Canceled)) (BOOL *aCanceled);
-    STDMETHOD(COMGETTER(ResultCode)) (HRESULT *aResultCode);
+    STDMETHOD(COMGETTER(ResultCode)) (LONG *aResultCode);
     STDMETHOD(COMGETTER(ErrorInfo)) (IVirtualBoxErrorInfo **aErrorInfo);
     STDMETHOD(COMGETTER(Operation)) (ULONG *aCount);

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

@@ -143 +143 @@
                 }
 
-                nsID *iid = nsnull;
-                machine->GetId(&iid);
-                const char *uuidString = nsIDToString(iid);
+                nsXPIDLString iid;
+                machine->GetId(getter_Copies(iid));
+                const char *uuidString = ToNewCString(iid);
                 printf("\tUUID:        %s\n", uuidString);
                 free((void*)uuidString);
-                nsMemory::Free(iid);
 
                 if (isAccessible)
@@ -194 +193 @@
      * in the configuration until we explicitely choose to do so.
      */
-    nsID VMuuid = {0};
     nsCOMPtr <IMachine> machine;
     rc = virtualBox->CreateMachine(NS_LITERAL_STRING("A brand new name").get(),
-                                   nsnull, nsnull, VMuuid, getter_AddRefs(machine));
+                                   nsnull, nsnull, nsnull, getter_AddRefs(machine));
     if (NS_FAILED(rc))
     {
@@ -272 +270 @@
         }
 
-        nsID *machineUUID = nsnull;
-        machine->GetId(&machineUUID);
-        rc = virtualBox->OpenSession(session, *machineUUID);
-        nsMemory::Free(machineUUID);
+        nsXPIDLString machineUUID;
+        machine->GetId(getter_Copies(machineUUID));
+        rc = virtualBox->OpenSession(session, machineUUID);
         if (NS_FAILED(rc))
         {
@@ -329 +326 @@
              */
             rc = progress->WaitForCompletion(-1);
-            nsresult resultCode;
+            PRInt32 resultCode;
             progress->GetResultCode(&resultCode);
             if (NS_FAILED(rc) || NS_FAILED(resultCode))
@@ -343 +340 @@
                  * when we've created the image.
                  */
-                nsID *vdiUUID = nsnull;
-                hardDisk->GetId(&vdiUUID);
-                rc = machine->AttachHardDisk(*vdiUUID,
+                nsXPIDLString vdiUUID;
+                hardDisk->GetId(getter_Copies(vdiUUID));
+                rc = machine->AttachHardDisk(vdiUUID,
                                              NS_LITERAL_STRING("IDE").get(), // controler identifier
                                              0,                              // channel number on the controller
                                              0);                             // device number on the controller
-                nsMemory::Free(vdiUUID);
                 if (NS_FAILED(rc))
                 {
@@ -364 +360 @@
      * as the boot device.
      */
-    nsID uuid = {0};
     nsCOMPtr<IDVDImage> dvdImage;
 
     rc = virtualBox->OpenDVDImage(NS_LITERAL_STRING("/home/achimha/isoimages/winnt4ger.iso").get(),
-                                  uuid, /* NULL UUID, i.e. a new one will be created */
+                                  nsnull, /* NULL UUID, i.e. a new one will be created */
                                   getter_AddRefs(dvdImage));
     if (NS_FAILED(rc))
@@ -379 +374 @@
          * Now assign it to our VM
          */
-        nsID *isoUUID = nsnull;
-        dvdImage->GetId(&isoUUID);
+        nsXPIDLString isoUUID;
+        dvdImage->GetId(getter_Copies(isoUUID));
         nsCOMPtr<IDVDDrive> dvdDrive;
         machine->GetDVDDrive(getter_AddRefs(dvdDrive));
-        rc = dvdDrive->MountImage(*isoUUID);
-        nsMemory::Free(isoUUID);
+        rc = dvdDrive->MountImage(isoUUID);
         if (NS_FAILED(rc))
         {