Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-12 12:55:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Match new (more-const) signature for PENUMLOADED_MODULES_CALLBACK and PENUMLOADED_MODULES_CALLBACK64. b=415426 Fixing bustage on Windows tinderbox from SDK upgrade.

Browse Source
This commit is contained in:
dbaron@dbaron.org 2008-02-03 11:34:31 -08:00
parent 00ede61ac3
commit 775c2226ec
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/trace-malloc/lib/nsDebugHelpWin32.cpp
View File

@ -208,7 +208,7 @@ DHWImportHooker::~DHWImportHooker()
PR_Unlock(gLock);
}
static BOOL CALLBACK ModuleEnumCallback(LPSTR ModuleName,
static BOOL CALLBACK ModuleEnumCallback(PCSTR ModuleName,
ULONG ModuleBase,
ULONG ModuleSize,
PVOID UserContext)

18
xpcom/base/nsStackWalk.cpp
View File

@ -712,8 +712,8 @@ NS_StackWalk(NS_WalkStackCallback aCallback, PRUint32 aSkipFrames,
static BOOL CALLBACK callbackEspecial(
LPSTR aModuleName,
DWORD aModuleBase,
PCSTR aModuleName,
ULONG aModuleBase,
ULONG aModuleSize,
PVOID aUserContext)
{
@ -734,7 +734,7 @@ static BOOL CALLBACK callbackEspecial(
? (addr >= aModuleBase && addr <= (aModuleBase + aModuleSize))
: (addr <= aModuleBase && addr >= (aModuleBase - aModuleSize))
) {
retval = _SymLoadModule(GetCurrentProcess(), NULL, aModuleName, NULL, aModuleBase, aModuleSize);
retval = _SymLoadModule(GetCurrentProcess(), NULL, (PSTR)aModuleName, NULL, aModuleBase, aModuleSize);
if (!retval)
PrintError("SymLoadModule");
}
@ -743,7 +743,7 @@ static BOOL CALLBACK callbackEspecial(
}
static BOOL CALLBACK callbackEspecial64(
PTSTR aModuleName,
PCSTR aModuleName,
DWORD64 aModuleBase,
ULONG aModuleSize,
PVOID aUserContext)
@ -766,7 +766,7 @@ static BOOL CALLBACK callbackEspecial64(
? (addr >= aModuleBase && addr <= (aModuleBase + aModuleSize))
: (addr <= aModuleBase && addr >= (aModuleBase - aModuleSize))
) {
retval = _SymLoadModule64(GetCurrentProcess(), NULL, aModuleName, NULL, aModuleBase, aModuleSize);
retval = _SymLoadModule64(GetCurrentProcess(), NULL, (PSTR)aModuleName, NULL, aModuleBase, aModuleSize);
if (!retval)
PrintError("SymLoadModule64");
}
@ -811,9 +811,7 @@ BOOL SymGetModuleInfoEspecial(HANDLE aProcess, DWORD aAddr, PIMAGEHLP_MODULE aMo
* Not loaded, here's the magic.
* Go through all the modules.
*/
// Need to cast to PENUMLOADED_MODULES_CALLBACK for some compiler
// or platform SDK; see bug 391848.
enumRes = _EnumerateLoadedModules(aProcess, (PENUMLOADED_MODULES_CALLBACK)callbackEspecial, (PVOID)&aAddr);
enumRes = _EnumerateLoadedModules(aProcess, callbackEspecial, (PVOID)&aAddr);
if (FALSE != enumRes)
{
/*
@ -880,9 +878,7 @@ BOOL SymGetModuleInfoEspecial64(HANDLE aProcess, DWORD64 aAddr, PIMAGEHLP_MODULE
* Not loaded, here's the magic.
* Go through all the modules.
*/
// Need to cast to PENUMLOADED_MODULES_CALLBACK for some compiler
// or platform SDK; see bug 391848.
enumRes = _EnumerateLoadedModules64(aProcess, (PENUMLOADED_MODULES_CALLBACK64)callbackEspecial64, (PVOID)&aAddr);
enumRes = _EnumerateLoadedModules64(aProcess, callbackEspecial64, (PVOID)&aAddr);
if (FALSE != enumRes)
{
/*