Changeset 103449 in vbox for trunk/include

Timestamp:

Feb 19, 2024 2:21:15 PM (12 months ago)

Author:

vboxsync

Message:

include/VBox/errorprint.h,FE/VBoxAutostart: Some warning fixes, bugref:3409

File:

• trunk/include/VBox/com/errorprint.h (modified) (4 diffs)

trunk/include/VBox/com/errorprint.h

@@ -302 +302 @@
         if (FAILED(hrc) || FAILED(iRc)) \
         { \
-            if (SUCCEEDED(hrc)) hrc = iRc; else iRc = hrc; \
+            if (SUCCEEDED(hrc)) hrc = (HRESULT)iRc; else iRc = (LONG)hrc; \
             RTMsgError msg; \
-            com::GlueHandleComErrorProgress(progress, __PRETTY_FUNCTION__, iRc, __FILE__, __LINE__); \
+            com::GlueHandleComErrorProgress(progress, __PRETTY_FUNCTION__, (HRESULT)iRc, __FILE__, __LINE__); \
         } \
     } while (0)
@@ -321 +321 @@
         if (FAILED(hrc) || FAILED(iRc)) \
         { \
-            if (SUCCEEDED(hrc)) hrc = iRc; else iRc = hrc; \
+            if (SUCCEEDED(hrc)) hrc = (HRESULT)iRc; else iRc = (LONG)hrc; \
             RTMsgError msg; \
-            com::GlueHandleComErrorProgress(progress, __PRETTY_FUNCTION__, iRc, __FILE__, __LINE__); \
+            com::GlueHandleComErrorProgress(progress, __PRETTY_FUNCTION__, (HRESULT)iRc, __FILE__, __LINE__); \
             break; \
         } \
@@ -335 +335 @@
         if (FAILED(hrc) || FAILED(iRc)) \
         { \
-            if (SUCCEEDED(hrc)) hrc = iRc; else iRc = hrc; \
+            if (SUCCEEDED(hrc)) hrc = (HRESULT)iRc; else iRc = (LONG)hrc; \
             RTMsgError msg; \
-            com::GlueHandleComErrorProgress(progress, __PRETTY_FUNCTION__, iRc, __FILE__, __LINE__); \
+            com::GlueHandleComErrorProgress(progress, __PRETTY_FUNCTION__, (HRESULT)iRc, __FILE__, __LINE__); \
             break; \
         } \
@@ -358 +358 @@
             RTMsgError msg; \
             com::GlueHandleComErrorProgress(progress, __PRETTY_FUNCTION__, \
-                                            SUCCEEDED(hrcCheck) ? iRc : hrcCheck, __FILE__, __LINE__); \
+                                            SUCCEEDED(hrcCheck) ? (HRESULT)iRc : hrcCheck, __FILE__, __LINE__); \
             return (ret); \
         } \