VirtualBox

Changeset 14072

Show
Ignore:
Timestamp:
11/11/08 00:53:50 (2 months ago)
Author:
vboxsync
Message:

MM: The 64-bit MSC warning hunt continues.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/include/VBox/dbgf.h

    r13832 r14072  
    589589 
    590590VMMR3DECL(int)          DBGFR3ModuleLoad(PVM pVM, const char *pszFilename, RTGCUINTPTR AddressDelta, const char *pszName, RTGCUINTPTR ModuleAddress, unsigned cbImage); 
    591 VMMR3DECL(void)         DBGFR3ModuleRelocate(PVM pVM, RTGCUINTPTR OldImageBase, RTGCUINTPTR NewImageBase, unsigned cbImage, 
     591VMMR3DECL(void)         DBGFR3ModuleRelocate(PVM pVM, RTGCUINTPTR OldImageBase, RTGCUINTPTR NewImageBase, RTGCUINTPTR cbImage, 
    592592                                             const char *pszFilename, const char *pszName); 
    593593VMMR3DECL(int)          DBGFR3SymbolAdd(PVM pVM, RTGCUINTPTR ModuleAddress, RTGCUINTPTR SymbolAddress, RTUINT cbSymbol, const char *pszSymbol); 

  • trunk/src/VBox/VMM/DBGFSym.cpp

    r13841 r14072  
    638638 * @param   pszName         The module name. 
    639639 */ 
    640 VMMR3DECL(void) DBGFR3ModuleRelocate(PVM pVM, RTGCUINTPTR OldImageBase, RTGCUINTPTR NewImageBase, unsigned cbImage, 
     640VMMR3DECL(void) DBGFR3ModuleRelocate(PVM pVM, RTGCUINTPTR OldImageBase, RTGCUINTPTR NewImageBase, RTGCUINTPTR cbImage, 
    641641                                      const char *pszFilename, const char *pszName) 
    642642{ 
    …… 
    647647            Log(("SymUnloadModule64(,%RGv) failed, lasterr=%d\n", OldImageBase, GetLastError())); 
    648648 
    649         DWORD64 LoadedImageBase = SymLoadModule64(pVM, NULL, (char *)(void *)pszFilename, (char *)(void *)pszName, NewImageBase, cbImage); 
     649        DWORD ImageSize = (DWORD)cbImage; Assert(ImageSize == cbImage); 
     650        DWORD64 LoadedImageBase = SymLoadModule64(pVM, NULL, (char *)(void *)pszFilename, (char *)(void *)pszName, NewImageBase, ImageSize); 
    650651        if (!LoadedImageBase) 
    651652            Log(("SymLoadModule64(,,%s,,) -> lasterr=%d (relocate)\n", pszFilename, GetLastError())); 

  • trunk/src/VBox/VMM/PDM.cpp

    r13824 r14072  
    11701170     * Iterate registered devices looking for the device. 
    11711171     */ 
    1172     RTUINT cchDevice = strlen(pszDevice); 
     1172    size_t cchDevice = strlen(pszDevice); 
    11731173    for (PPDMDEV pDev = pVM->pdm.s.pDevs; pDev; pDev = pDev->pNext) 
    11741174    { 

  • trunk/src/VBox/VMM/PDMDevice.cpp

    r14070 r14072  
    423423PPDMDEV pdmR3DevLookup(PVM pVM, const char *pszName) 
    424424{ 
    425     RTUINT cchName = strlen(pszName); 
     425    size_t cchName = strlen(pszName); 
    426426    for (PPDMDEV pDev = pVM->pdm.s.pDevs; pDev; pDev = pDev->pNext) 
    427427        if (    pDev->cchName == cchName 
    …… 
    693693        pDev->pInstances = NULL; 
    694694        pDev->pDevReg = pDevReg; 
    695         pDev->cchName = strlen(pDevReg->szDeviceName); 
     695        pDev->cchName = (uint32_t)strlen(pDevReg->szDeviceName); 
    696696 
    697697        if (pDevPrev) 
    …… 
    741741     * Iterate registered devices looking for the device. 
    742742     */ 
    743     RTUINT cchDevice = strlen(pszDevice); 
     743    size_t cchDevice = strlen(pszDevice); 
    744744    for (PPDMDEV pDev = pVM->pdm.s.pDevs; pDev; pDev = pDev->pNext) 
    745745    { 

  • trunk/src/VBox/VMM/PDMLdr.cpp

    r13830 r14072  
    907907     * Allocate temp memory for return buffer. 
    908908     */ 
    909     unsigned cchDir  = strlen(pszDir); 
    910     unsigned cchFile = strlen(pszFile); 
    911     unsigned cchDefaultExt; 
     909    size_t cchDir  = strlen(pszDir); 
     910    size_t cchFile = strlen(pszFile); 
     911    size_t cchDefaultExt; 
    912912 
    913913    /* 
    …… 
    919919        cchDefaultExt = strlen(pszDefaultExt); 
    920920 
    921     unsigned cchPath = cchDir + 1 + cchFile + cchDefaultExt + 1; 
    922     if (cchPath > RTPATH_MAX) 
    923     { 
    924         AssertMsgFailed(("Path too long!\n")); 
    925         return NULL; 
    926     } 
     921    size_t cchPath = cchDir + 1 + cchFile + cchDefaultExt + 1; 
     922    AssertMsgReturn(cchPath <= RTPATH_MAX, ("Path too long!\n"), NULL); 
    927923 
    928924    char *pszRet = (char *)RTMemTmpAlloc(cchDir + 1 + cchFile + cchDefaultExt + 1); 
    929     if (!pszRet) 
    930     { 
    931         AssertMsgFailed(("Out of temporary memory!\n")); 
    932         return NULL; 
    933     } 
     925    AssertMsgReturn(!pszRet, ("Out of temporary memory!\n"), NULL); 
    934926 
    935927    /* 
    …… 
    983975 
    984976    char       *pszNearSym1; 
    985     unsigned    cchNearSym1; 
     977    size_t     cchNearSym1; 
    986978    RTRCINTPTR  offNearSym1; 
    987979 
    988980    char       *pszNearSym2; 
    989     unsigned    cchNearSym2; 
     981    size_t      cchNearSym2; 
    990982    RTRCINTPTR  offNearSym2; 
    991983} QMFEIPARG, *PQMFEIPARG; 

© 2008 Sun Microsystems, Inc.
Contact – Privacy policy