Changeset 45927 in vbox

Timestamp:

May 7, 2013 8:05:43 AM (12 years ago)

Author:

vboxsync

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

85565

Message:

*: a few uint32_t warnings

Location:

trunk/src/VBox

Files:

• Main/glue/string.cpp (modified) (1 diff)
• Main/src-client/ConsoleImpl2.cpp (modified) (1 diff)
• Main/src-client/GuestProcessImpl.cpp (modified) (2 diffs)
• Main/src-client/Nvram.cpp (modified) (2 diffs)
• Main/src-client/UsbCardReader.cpp (modified) (1 diff)
• Runtime/common/string/uniread.cpp (modified) (1 diff)
• Runtime/r0drv/nt/spinlock-r0drv-nt.cpp (modified) (4 diffs)

trunk/src/VBox/Main/glue/string.cpp

@@ -58 +58 @@
     }
 
-    m_bstr = ::SysAllocStringByteLen(NULL, cwc * sizeof(OLECHAR));
+    m_bstr = ::SysAllocStringByteLen(NULL, (unsigned)(cwc * sizeof(OLECHAR)));
     if (RT_UNLIKELY(!m_bstr))
         throw std::bad_alloc();

trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp

@@ -4944 +4944 @@
     parms[0].type = VBOX_HGCM_SVC_PARM_PTR;
     parms[0].u.pointer.addr = (void *)pszName;
-    parms[0].u.pointer.size = strlen(pszName) + 1;
+    parms[0].u.pointer.size = (uint32_t)strlen(pszName) + 1;
     parms[1].type = VBOX_HGCM_SVC_PARM_PTR;
     parms[1].u.pointer.addr = (void *)pszValue;
-    parms[1].u.pointer.size = strlen(pszValue) + 1;
+    parms[1].u.pointer.size = (uint32_t)strlen(pszValue) + 1;
     parms[2].type = VBOX_HGCM_SVC_PARM_PTR;
     parms[2].u.pointer.addr = (void *)pszFlags;
-    parms[2].u.pointer.size = strlen(pszFlags) + 1;
+    parms[2].u.pointer.size = (uint32_t)strlen(pszFlags) + 1;
     pVMMDev->hgcmHostCall("VBoxGuestPropSvc", guestProp::SET_PROP_HOST, 3,
                           &parms[0]);

trunk/src/VBox/Main/src-client/GuestProcessImpl.cpp

@@ -1056 +1056 @@
                                 (ULONG)mData.mProcess.mCommand.length() + 1);
         paParms[i++].setUInt32(mData.mProcess.mFlags);
-        paParms[i++].setUInt32(mData.mProcess.mArguments.size());
-        paParms[i++].setPointer((void*)pszArgs, cbArgs);
-        paParms[i++].setUInt32(mData.mProcess.mEnvironment.Size());
-        paParms[i++].setUInt32(cbEnv);
-        paParms[i++].setPointer((void*)pvEnv, cbEnv);
+        paParms[i++].setUInt32((uint32_t)mData.mProcess.mArguments.size());
+        paParms[i++].setPointer((void*)pszArgs, (uint32_t)cbArgs);
+        paParms[i++].setUInt32((uint32_t)mData.mProcess.mEnvironment.Size());
+        paParms[i++].setUInt32((uint32_t)cbEnv);
+        paParms[i++].setPointer((void*)pvEnv, (uint32_t)cbEnv);
         if (uProtocol < 2)
         {
@@ -1588 +1588 @@
     paParms[i++].setUInt32(mData.mPID);
     paParms[i++].setUInt32(uFlags);
-    paParms[i++].setPointer(pvData, cbData);
-    paParms[i++].setUInt32(cbData);
+    paParms[i++].setPointer(pvData, (uint32_t)cbData);
+    paParms[i++].setUInt32((uint32_t)cbData);
 
     alock.release(); /* Drop the write lock before sending. */

trunk/src/VBox/Main/src-client/Nvram.cpp

@@ -287 +287 @@
     int rc = CFGMR3QueryString(pVarNode, "Name", pszName, *pcchName);
     AssertRCReturn(rc, rc);
-    *pcchName = strlen(pszName);
+    *pcchName = (uint32_t)strlen(pszName);
 
     char    szUuid[RTUUID_STR_LENGTH];
@@ -304 +304 @@
     rc = CFGMR3QueryBytes(pVarNode, "Value", pbValue, cbValue);
     AssertRCReturn(rc, rc);
-    *pcbValue = cbValue;
+    *pcbValue = (uint32_t)cbValue;
 
     return VINF_SUCCESS;

trunk/src/VBox/Main/src-client/UsbCardReader.cpp

@@ -1054 +1054 @@
                 {
                     pszReaderName = pRsp->szReader;
-                    cchReaderName = strlen(pRsp->szReader) + 1;
+                    cchReaderName = (uint32_t)strlen(pRsp->szReader) + 1;
                     u32CardState = pRsp->u32State;
                     u32Protocol = pRsp->u32Protocol;

trunk/src/VBox/Runtime/common/string/uniread.cpp

@@ -920 +920 @@
         cch = vfprintf(stdout, pszFormat, va);
     else
-        cch = strlen(pszFormat);
+        cch = (int)strlen(pszFormat);
     va_end(va);
     return cch;

trunk/src/VBox/Runtime/r0drv/nt/spinlock-r0drv-nt.cpp

@@ -75 +75 @@
     KIRQL volatile      SavedIrql;
     /** The saved interrupt flag. */
-    uint32_t volatile   fIntSaved;
+    RTCCUINTREG volatile fIntSaved;
     /** The spinlock creation flags. */
     uint32_t            fFlags;
@@ -141 +141 @@
     {
 #ifndef RTSPINLOCK_NT_HACK_NOIRQ
-        uint32_t fIntSaved = ASMGetFlags();
+        RTCCUINTREG fIntSaved = ASMGetFlags();
         ASMIntDisable();
         KeAcquireSpinLock(&pThis->Spinlock, &SavedIrql);
@@ -151 +151 @@
             Assert(SavedIrql < DISPATCH_LEVEL);
         }
-        uint32_t fIntSaved = ASMGetFlags();
+        RTCCUINTREG fIntSaved = ASMGetFlags();
         ASMIntDisable();
 
@@ -177 +177 @@
     if (pThis->fFlags & RTSPINLOCK_FLAGS_INTERRUPT_SAFE)
     {
-        uint32_t fIntSaved = pThis->fIntSaved;
+        RTCCUINTREG fIntSaved = pThis->fIntSaved;
         pThis->fIntSaved = 0;