儲存庫 vbox 的更動 14072

時間撮記:

2008-11-10 下午11:53:50 (16 年 以前)

作者:

vboxsync

訊息:

MM: The 64-bit MSC warning hunt continues.

位置:

trunk

檔案:

• include/VBox/dbgf.h (修改) (1 筆差異)
• src/VBox/VMM/DBGFSym.cpp (修改) (2 筆差異)
• src/VBox/VMM/PDM.cpp (修改) (1 筆差異)
• src/VBox/VMM/PDMDevice.cpp (修改) (3 筆差異)
• src/VBox/VMM/PDMLdr.cpp (修改) (3 筆差異)

trunk/include/VBox/dbgf.h

@@ -589 +589 @@
 
 VMMR3DECL(int)          DBGFR3ModuleLoad(PVM pVM, const char *pszFilename, RTGCUINTPTR AddressDelta, const char *pszName, RTGCUINTPTR ModuleAddress, unsigned cbImage);
-VMMR3DECL(void)         DBGFR3ModuleRelocate(PVM pVM, RTGCUINTPTR OldImageBase, RTGCUINTPTR NewImageBase, unsigned cbImage,
+VMMR3DECL(void)         DBGFR3ModuleRelocate(PVM pVM, RTGCUINTPTR OldImageBase, RTGCUINTPTR NewImageBase, RTGCUINTPTR cbImage,
                                              const char *pszFilename, const char *pszName);
 VMMR3DECL(int)          DBGFR3SymbolAdd(PVM pVM, RTGCUINTPTR ModuleAddress, RTGCUINTPTR SymbolAddress, RTUINT cbSymbol, const char *pszSymbol);

trunk/src/VBox/VMM/DBGFSym.cpp

@@ -638 +638 @@
  * @param   pszName         The module name.
  */
-VMMR3DECL(void) DBGFR3ModuleRelocate(PVM pVM, RTGCUINTPTR OldImageBase, RTGCUINTPTR NewImageBase, unsigned cbImage,
+VMMR3DECL(void) DBGFR3ModuleRelocate(PVM pVM, RTGCUINTPTR OldImageBase, RTGCUINTPTR NewImageBase, RTGCUINTPTR cbImage,
                                       const char *pszFilename, const char *pszName)
 {
@@ -647 +647 @@
             Log(("SymUnloadModule64(,%RGv) failed, lasterr=%d\n", OldImageBase, GetLastError()));
 
-        DWORD64 LoadedImageBase = SymLoadModule64(pVM, NULL, (char *)(void *)pszFilename, (char *)(void *)pszName, NewImageBase, cbImage);
+        DWORD ImageSize = (DWORD)cbImage; Assert(ImageSize == cbImage);
+        DWORD64 LoadedImageBase = SymLoadModule64(pVM, NULL, (char *)(void *)pszFilename, (char *)(void *)pszName, NewImageBase, ImageSize);
         if (!LoadedImageBase)
             Log(("SymLoadModule64(,,%s,,) -> lasterr=%d (relocate)\n", pszFilename, GetLastError()));

trunk/src/VBox/VMM/PDM.cpp

@@ -1170 +1170 @@
      * Iterate registered devices looking for the device.
      */
-    RTUINT cchDevice = strlen(pszDevice);
+    size_t cchDevice = strlen(pszDevice);
     for (PPDMDEV pDev = pVM->pdm.s.pDevs; pDev; pDev = pDev->pNext)
     {

trunk/src/VBox/VMM/PDMDevice.cpp

@@ -423 +423 @@
 PPDMDEV pdmR3DevLookup(PVM pVM, const char *pszName)
 {
-    RTUINT cchName = strlen(pszName);
+    size_t cchName = strlen(pszName);
     for (PPDMDEV pDev = pVM->pdm.s.pDevs; pDev; pDev = pDev->pNext)
         if (    pDev->cchName == cchName
@@ -693 +693 @@
         pDev->pInstances = NULL;
         pDev->pDevReg = pDevReg;
-        pDev->cchName = strlen(pDevReg->szDeviceName);
+        pDev->cchName = (uint32_t)strlen(pDevReg->szDeviceName);
 
         if (pDevPrev)
@@ -741 +741 @@
      * Iterate registered devices looking for the device.
      */
-    RTUINT cchDevice = strlen(pszDevice);
+    size_t cchDevice = strlen(pszDevice);
     for (PPDMDEV pDev = pVM->pdm.s.pDevs; pDev; pDev = pDev->pNext)
     {

trunk/src/VBox/VMM/PDMLdr.cpp

@@ -907 +907 @@
      * Allocate temp memory for return buffer.
      */
-    unsigned cchDir  = strlen(pszDir);
-    unsigned cchFile = strlen(pszFile);
-    unsigned cchDefaultExt;
+    size_t cchDir  = strlen(pszDir);
+    size_t cchFile = strlen(pszFile);
+    size_t cchDefaultExt;
 
     /*
@@ -919 +919 @@
         cchDefaultExt = strlen(pszDefaultExt);
 
-    unsigned cchPath = cchDir + 1 + cchFile + cchDefaultExt + 1;
-    if (cchPath > RTPATH_MAX)
-    {
-        AssertMsgFailed(("Path too long!\n"));
-        return NULL;
-    }
+    size_t cchPath = cchDir + 1 + cchFile + cchDefaultExt + 1;
+    AssertMsgReturn(cchPath <= RTPATH_MAX, ("Path too long!\n"), NULL);
 
     char *pszRet = (char *)RTMemTmpAlloc(cchDir + 1 + cchFile + cchDefaultExt + 1);
-    if (!pszRet)
-    {
-        AssertMsgFailed(("Out of temporary memory!\n"));
-        return NULL;
-    }
+    AssertMsgReturn(!pszRet, ("Out of temporary memory!\n"), NULL);
 
     /*
@@ -983 +975 @@
 
     char       *pszNearSym1;
-    unsigned    cchNearSym1;
+    size_t     cchNearSym1;
     RTRCINTPTR  offNearSym1;
 
     char       *pszNearSym2;
-    unsigned    cchNearSym2;
+    size_t      cchNearSym2;
     RTRCINTPTR  offNearSym2;
 } QMFEIPARG, *PQMFEIPARG;