Changeset 73829 in vbox for trunk

Timestamp:

Aug 22, 2018 1:35:07 PM (6 years ago)

Author:

vboxsync

Message:

Main/ExtPackManager: resolve signed/unsigned warnings on Windows

File:

• trunk/src/VBox/Main/src-all/ExtPackManagerImpl.cpp (modified) (5 diffs)

trunk/src/VBox/Main/src-all/ExtPackManagerImpl.cpp

@@ -1747 +1747 @@
      * Validate the input and get our bearings.
      */
-    AssertPtrReturn(pcszDescription, E_INVALIDARG);
-    AssertReturn(cOperations >= 1, E_INVALIDARG);
-    AssertReturn(uTotalOperationsWeight >= 1, E_INVALIDARG);
-    AssertPtrReturn(pcszFirstOperationDescription, E_INVALIDARG);
-    AssertReturn(uFirstOperationWeight >= 1, E_INVALIDARG);
-    AssertPtrReturn(ppProgressOut, E_INVALIDARG);
-
-    AssertPtrReturn(pHlp, VERR_INVALID_POINTER);
-    AssertReturn(pHlp->u32Version == VBOXEXTPACKHLP_VERSION, VERR_INVALID_POINTER);
+    AssertPtrReturn(pcszDescription, (uint32_t)E_INVALIDARG);
+    AssertReturn(cOperations >= 1, (uint32_t)E_INVALIDARG);
+    AssertReturn(uTotalOperationsWeight >= 1, (uint32_t)E_INVALIDARG);
+    AssertPtrReturn(pcszFirstOperationDescription, (uint32_t)E_INVALIDARG);
+    AssertReturn(uFirstOperationWeight >= 1, (uint32_t)E_INVALIDARG);
+    AssertPtrReturn(ppProgressOut, (uint32_t)E_INVALIDARG);
+
+    AssertPtrReturn(pHlp, (uint32_t)E_INVALIDARG);
+    AssertReturn(pHlp->u32Version == VBOXEXTPACKHLP_VERSION, (uint32_t)E_INVALIDARG);
 #ifndef VBOX_COM_INPROC
     ExtPack::Data *m = RT_FROM_CPP_MEMBER(pHlp, Data, Hlp);
@@ -1784 +1784 @@
      * Validate the input and get our bearings.
      */
-    AssertPtrReturn(pProgress, E_INVALIDARG);
-    AssertPtrReturn(pfCanceled, E_INVALIDARG);
-
-    AssertPtrReturn(pHlp, VERR_INVALID_POINTER);
-    AssertReturn(pHlp->u32Version == VBOXEXTPACKHLP_VERSION, VERR_INVALID_POINTER);
+    AssertPtrReturn(pProgress, (uint32_t)E_INVALIDARG);
+    AssertPtrReturn(pfCanceled, (uint32_t)E_INVALIDARG);
+
+    AssertPtrReturn(pHlp, (uint32_t)E_INVALIDARG);
+    AssertReturn(pHlp->u32Version == VBOXEXTPACKHLP_VERSION, (uint32_t)E_INVALIDARG);
 
     BOOL fCanceled = FALSE;
@@ -1803 +1803 @@
      * Validate the input and get our bearings.
      */
-    AssertPtrReturn(pProgress, E_INVALIDARG);
-    AssertReturn(uPercent <= 100, E_INVALIDARG);
-
-    AssertPtrReturn(pHlp, VERR_INVALID_POINTER);
-    AssertReturn(pHlp->u32Version == VBOXEXTPACKHLP_VERSION, VERR_INVALID_POINTER);
+    AssertPtrReturn(pProgress, (uint32_t)E_INVALIDARG);
+    AssertReturn(uPercent <= 100, (uint32_t)E_INVALIDARG);
+
+    AssertPtrReturn(pHlp, (uint32_t)E_INVALIDARG);
+    AssertReturn(pHlp->u32Version == VBOXEXTPACKHLP_VERSION, (uint32_t)E_INVALIDARG);
 
     return pProgress->SetCurrentOperationProgress(uPercent);
@@ -1820 +1820 @@
      * Validate the input and get our bearings.
      */
-    AssertPtrReturn(pProgress, E_INVALIDARG);
-    AssertPtrReturn(pcszNextOperationDescription, E_INVALIDARG);
-    AssertReturn(uNextOperationWeight >= 1, E_INVALIDARG);
-
-    AssertPtrReturn(pHlp, VERR_INVALID_POINTER);
-    AssertReturn(pHlp->u32Version == VBOXEXTPACKHLP_VERSION, VERR_INVALID_POINTER);
+    AssertPtrReturn(pProgress, (uint32_t)E_INVALIDARG);
+    AssertPtrReturn(pcszNextOperationDescription, (uint32_t)E_INVALIDARG);
+    AssertReturn(uNextOperationWeight >= 1, (uint32_t)E_INVALIDARG);
+
+    AssertPtrReturn(pHlp, (uint32_t)E_INVALIDARG);
+    AssertReturn(pHlp->u32Version == VBOXEXTPACKHLP_VERSION, (uint32_t)E_INVALIDARG);
 
     return pProgress->SetNextOperation(Bstr(pcszNextOperationDescription).raw(), uNextOperationWeight);
@@ -1837 +1837 @@
      * Validate the input and get our bearings.
      */
-    AssertPtrReturn(pProgress, E_INVALIDARG);
-
-    AssertPtrReturn(pHlp, VERR_INVALID_POINTER);
-    AssertReturn(pHlp->u32Version == VBOXEXTPACKHLP_VERSION, VERR_INVALID_POINTER);
+    AssertPtrReturn(pProgress, (uint32_t)E_INVALIDARG);
+
+    AssertPtrReturn(pHlp, (uint32_t)E_INVALIDARG);
+    AssertReturn(pHlp->u32Version == VBOXEXTPACKHLP_VERSION, (uint32_t)E_INVALIDARG);
 
     Progress *pProgressInt = static_cast<Progress *>(pProgress);