Changeset 103449 in vbox

Timestamp:

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

Author:

vboxsync

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

161780

Message:

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

Location:

trunk

Files:

• include/VBox/com/errorprint.h (modified) (4 diffs)
• src/VBox/Frontends/VBoxAutostart/VBoxAutostart-posix.cpp (modified) (2 diffs)
• src/VBox/Frontends/VBoxAutostart/VBoxAutostartStart.cpp (modified) (2 diffs)
• src/VBox/Frontends/VBoxAutostart/VBoxAutostartStop.cpp (modified) (2 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); \
         } \

trunk/src/VBox/Frontends/VBoxAutostart/VBoxAutostart-posix.cpp

@@ -226 +226 @@
 
     /* complete the line. */
-    LONG iRc = E_FAIL;
+    LONG iRc = (LONG)E_FAIL;
     hrc = progress->COMGETTER(ResultCode)(&iRc);
     if (SUCCEEDED(hrc))
@@ -239 +239 @@
             RTStrmPrintf(g_pStdErr, "Progress state: %Rhrc\n", iRc);
         }
-        hrc = iRc;
+        hrc = (HRESULT)iRc;
     }
     else

trunk/src/VBox/Frontends/VBoxAutostart/VBoxAutostartStart.cpp

@@ -105 +105 @@
         for (size_t i = 0; i < machines.size(); ++i)
         {
-            if (machines[i])
+            ComPtr<IMachine> pMachine = machines[i];
+
+            if (pMachine.isNotNull())
             {
                 Bstr strName;
-                CHECK_ERROR_BREAK(machines[i], COMGETTER(Name)(strName.asOutParam()));
+                CHECK_ERROR_BREAK(pMachine, COMGETTER(Name)(strName.asOutParam()));
 
                 BOOL fAccessible;
-                CHECK_ERROR_BREAK(machines[i], COMGETTER(Accessible)(&fAccessible));
+                CHECK_ERROR_BREAK(pMachine, COMGETTER(Accessible)(&fAccessible));
                 if (!fAccessible)
                 {
@@ -121 +123 @@
 
                 BOOL fAutostart;
-                CHECK_ERROR_BREAK(machines[i], COMGETTER(AutostartEnabled)(&fAutostart));
+                CHECK_ERROR_BREAK(pMachine, COMGETTER(AutostartEnabled)(&fAutostart));
                 if (fAutostart)
                 {
-                    CHECK_ERROR_BREAK(machines[i], COMGETTER(Id)(autostartVM.strId.asOutParam()));
-                    CHECK_ERROR_BREAK(machines[i], COMGETTER(AutostartDelay)(&autostartVM.uStartupDelay));
+                    CHECK_ERROR_BREAK(pMachine, COMGETTER(Id)(autostartVM.strId.asOutParam()));
+                    CHECK_ERROR_BREAK(pMachine, COMGETTER(AutostartDelay)(&autostartVM.uStartupDelay));
 
                     listVM.push_back(autostartVM);

trunk/src/VBox/Frontends/VBoxAutostart/VBoxAutostartStop.cpp

@@ -135 +135 @@
         for (size_t i = 0; i < machines.size(); ++i)
         {
-            if (machines[i])
+            ComPtr<IMachine> pMachine = machines[i];
+
+            if (pMachine.isNotNull())
             {
                 Bstr strName;
-                CHECK_ERROR_BREAK(machines[i], COMGETTER(Name)(strName.asOutParam()));
+                CHECK_ERROR_BREAK(pMachine, COMGETTER(Name)(strName.asOutParam()));
 
                 BOOL fAccessible;
-                CHECK_ERROR_BREAK(machines[i], COMGETTER(Accessible)(&fAccessible));
+                CHECK_ERROR_BREAK(pMachine, COMGETTER(Accessible)(&fAccessible));
                 if (!fAccessible)
                 {
@@ -151 +153 @@
 
                 AutostopType_T enmAutostopType;
-                CHECK_ERROR_BREAK(machines[i], COMGETTER(AutostopType)(&enmAutostopType));
+                CHECK_ERROR_BREAK(pMachine, COMGETTER(AutostopType)(&enmAutostopType));
                 if (enmAutostopType != AutostopType_Disabled)
                 {
-                    CHECK_ERROR_BREAK(machines[i], COMGETTER(Id)(autostopVM.strId.asOutParam()));
+                    CHECK_ERROR_BREAK(pMachine, COMGETTER(Id)(autostopVM.strId.asOutParam()));
                     autostopVM.enmAutostopType = enmAutostopType;