Changeset 24364 in vbox

Timestamp:

Nov 5, 2009 2:18:31 AM (15 years ago)

Author:

vboxsync

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

54388

Message:

Main: Fixed XPCOM warnings caused by Machine::GetCpuIdLeaf not setting error info. Use UINT32_MAX instead of -1, avoids gcc warnings.

Location:

trunk

Files:

• include/VBox/settings.h (modified) (1 diff)
• src/VBox/Main/MachineImpl.cpp (modified) (11 diffs)

trunk/include/VBox/settings.h

@@ -395 +395 @@
 {
     CpuIdLeaf()
-        : ulId(-1),
+        : ulId(UINT32_MAX),
           ulEax(0),
           ulEbx(0),

trunk/src/VBox/Main/MachineImpl.cpp

@@ -1382 +1382 @@
 STDMETHODIMP Machine::GetCpuIdLeaf(ULONG id, ULONG *aValEax, ULONG *aValEbx, ULONG *aValEcx, ULONG *aValEdx)
 {
-    if (!aValEax || !aValEbx || !aValEcx || !aValEdx)
-        return E_POINTER;
+    CheckComArgOutPointerValid(aValEax);
+    CheckComArgOutPointerValid(aValEbx);
+    CheckComArgOutPointerValid(aValEcx);
+    CheckComArgOutPointerValid(aValEdx);
 
     AutoCaller autoCaller(this);
@@ -1404 +1406 @@
     case 0xA:
         if (mHWData->mCpuIdStdLeafs[id].ulId != id)
-            return E_INVALIDARG;    /* not set */
+            return setError(E_INVALIDARG, tr("CpuId override leaf %#x is not set"), id);
 
         *aValEax = mHWData->mCpuIdStdLeafs[id].ulEax;
@@ -1424 +1426 @@
     case 0x8000000A:
         if (mHWData->mCpuIdExtLeafs[id - 0x80000000].ulId != id)
-            return E_INVALIDARG;    /* not set */
+            return setError(E_INVALIDARG, tr("CpuId override leaf %#x is not set"), id);
 
         *aValEax = mHWData->mCpuIdExtLeafs[id - 0x80000000].ulEax;
@@ -1433 +1435 @@
 
     default:
-        return E_INVALIDARG;
+        return setError(E_INVALIDARG, tr("CpuId override leaf %#x is out of range"), id);
     }
     return S_OK;
@@ -1461 +1463 @@
     case 0x9:
     case 0xA:
+        AssertCompile(RT_ELEMENTS(mHWData->mCpuIdStdLeafs) == 0xA);
         AssertRelease(id < RT_ELEMENTS(mHWData->mCpuIdStdLeafs));
         mHWData->mCpuIdStdLeafs[id].ulId  = id;
@@ -1480 +1483 @@
     case 0x80000009:
     case 0x8000000A:
+        AssertCompile(RT_ELEMENTS(mHWData->mCpuIdExtLeafs) == 0xA);
         AssertRelease(id - 0x80000000 < RT_ELEMENTS(mHWData->mCpuIdExtLeafs));
         mHWData->mCpuIdExtLeafs[id - 0x80000000].ulId  = id;
@@ -1489 +1493 @@
 
     default:
-        return E_INVALIDARG;
+        return setError(E_INVALIDARG, tr("CpuId override leaf %#x is out of range"), id);
     }
     return S_OK;
@@ -1517 +1521 @@
     case 0x9:
     case 0xA:
+        AssertCompile(RT_ELEMENTS(mHWData->mCpuIdStdLeafs) == 0xA);
         AssertRelease(id < RT_ELEMENTS(mHWData->mCpuIdStdLeafs));
         /* Invalidate leaf. */
-        mHWData->mCpuIdStdLeafs[id].ulId = -1;
+        mHWData->mCpuIdStdLeafs[id].ulId = UINT32_MAX;
         break;
 
@@ -1533 +1538 @@
     case 0x80000009:
     case 0x8000000A:
+        AssertCompile(RT_ELEMENTS(mHWData->mCpuIdExtLeafs) == 0xA);
         AssertRelease(id - 0x80000000 < RT_ELEMENTS(mHWData->mCpuIdExtLeafs));
         /* Invalidate leaf. */
-        mHWData->mCpuIdExtLeafs[id - 0x80000000].ulId  = -1;
+        mHWData->mCpuIdExtLeafs[id - 0x80000000].ulId = UINT32_MAX;
         break;
 
     default:
-        return E_INVALIDARG;
+        return setError(E_INVALIDARG, tr("CpuId override leaf %#x is out of range"), id);
     }
     return S_OK;
@@ -1556 +1562 @@
     /* Invalidate all standard leafs. */
     for (unsigned i = 0; i < RT_ELEMENTS(mHWData->mCpuIdStdLeafs); i++)
-        mHWData->mCpuIdStdLeafs[i].ulId  = -1;
+        mHWData->mCpuIdStdLeafs[i].ulId = UINT32_MAX;
 
     /* Invalidate all extended leafs. */
     for (unsigned i = 0; i < RT_ELEMENTS(mHWData->mCpuIdExtLeafs); i++)
-        mHWData->mCpuIdExtLeafs[i].ulId = -1;
+        mHWData->mCpuIdExtLeafs[i].ulId = UINT32_MAX;
 
     return S_OK;
@@ -6594 +6600 @@
         for (unsigned idx = 0; idx < RT_ELEMENTS(mHWData->mCpuIdStdLeafs); idx++)
         {
-            if (mHWData->mCpuIdStdLeafs[idx].ulId != -1)
+            if (mHWData->mCpuIdStdLeafs[idx].ulId != UINT32_MAX)
                 data.llCpuIdLeafs.push_back(mHWData->mCpuIdStdLeafs[idx]);
         }
         for (unsigned idx = 0; idx < RT_ELEMENTS(mHWData->mCpuIdExtLeafs); idx++)
         {
-            if (mHWData->mCpuIdExtLeafs[idx].ulId != -1)
+            if (mHWData->mCpuIdExtLeafs[idx].ulId != UINT32_MAX)
                 data.llCpuIdLeafs.push_back(mHWData->mCpuIdExtLeafs[idx]);
         }