Changeset 85257 in vbox for trunk/src/VBox/Main/src-server

Timestamp:

Jul 11, 2020 11:54:09 PM (5 years ago)

Author:

vboxsync

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

139234

Message:

Main/MachineImpl.cpp: Signed/unsigned conversion issues. bugref:9790

File:

• trunk/src/VBox/Main/src-server/MachineImpl.cpp (modified) (5 diffs)

trunk/src/VBox/Main/src-server/MachineImpl.cpp

@@ -2318 +2318 @@
     if (strSnapshotFolder.isEmpty())
         strSnapshotFolder = "Snapshots";
-    int vrc = i_calculateFullPath(strSnapshotFolder,
-                                strSnapshotFolder);
+    int vrc = i_calculateFullPath(strSnapshotFolder, strSnapshotFolder);
     if (RT_FAILURE(vrc))
         return setErrorBoth(E_FAIL, vrc,
@@ -7054 +7053 @@
 {
     AutoCaller autoCaller(this);
-    AssertComRCReturn(autoCaller.rc(), autoCaller.rc());
+    AssertComRCReturn(autoCaller.rc(), Global::vboxStatusCodeFromCOM(autoCaller.rc()));
 
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
@@ -10266 +10265 @@
             prop.strName = it->first;
             prop.strValue = property.strValue;
-            prop.timestamp = property.mTimestamp;
+            prop.timestamp = (uint64_t)property.mTimestamp;
             char szFlags[GUEST_PROP_MAX_FLAGS_LEN + 1];
             GuestPropWriteFlags(property.mFlags, szFlags);
@@ -13109 +13108 @@
                                         const com::Utf8Str &aErrMsg)
 {
+    HRESULT const hrcResult = (HRESULT)aResult;
     LogFlowThisFuncEnter();
 
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    AssertReturn(    (   (SUCCEEDED(aResult) && mData->mMachineState == MachineState_PoweredOff)
-                      || (FAILED(aResult) && mData->mMachineState == MachineState_Stopping))
+    AssertReturn(    (   (SUCCEEDED(hrcResult) && mData->mMachineState == MachineState_PoweredOff)
+                      || (FAILED(hrcResult) && mData->mMachineState == MachineState_Stopping))
                   && mConsoleTaskData.mLastState != MachineState_Null,
                  E_FAIL);
@@ -13124 +13124 @@
      * MachineState_PoweredOff, so no need to do anything.
      */
-    if (FAILED(aResult))
+    if (FAILED(hrcResult))
         i_setMachineState(mConsoleTaskData.mLastState);
 
     /* notify the progress object about operation completion */
     Assert(mConsoleTaskData.mProgress);
-    if (SUCCEEDED(aResult))
+    if (SUCCEEDED(hrcResult))
         mConsoleTaskData.mProgress->i_notifyComplete(S_OK);
     else
     {
         if (aErrMsg.length())
-            mConsoleTaskData.mProgress->i_notifyComplete(aResult,
+            mConsoleTaskData.mProgress->i_notifyComplete(hrcResult,
                                                          COM_IIDOF(ISession),
                                                          getComponentName(),
                                                          aErrMsg.c_str());
         else
-            mConsoleTaskData.mProgress->i_notifyComplete(aResult);
+            mConsoleTaskData.mProgress->i_notifyComplete(hrcResult);
     }