From 58d8228c4643e82de04f8ebf8bce8469d84c0ac5 Mon Sep 17 00:00:00 2001 From: "blythe%netscape.com" Date: Tue, 11 Dec 2001 23:56:37 +0000 Subject: [PATCH] fix build bustage caused by recent checkin git-svn-id: svn://10.0.0.236/trunk@110317 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/xpcom/base/nsStackFrameWin.h | 3 +++ mozilla/xpcom/base/nsTraceRefcnt.cpp | 7 ++++++- mozilla/xpcom/base/nsTraceRefcntImpl.cpp | 7 ++++++- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/mozilla/xpcom/base/nsStackFrameWin.h b/mozilla/xpcom/base/nsStackFrameWin.h index 81b172bad0f..17fb447654c 100644 --- a/mozilla/xpcom/base/nsStackFrameWin.h +++ b/mozilla/xpcom/base/nsStackFrameWin.h @@ -83,6 +83,9 @@ extern SYMUNDNAME _SymUnDName; typedef DWORD ( __stdcall *SYMGETMODULEINFO)( HANDLE, DWORD, PIMAGEHLP_MODULE); extern SYMGETMODULEINFO _SymGetModuleInfo; +typedef BOOL ( __stdcall *ENUMLOADEDMODULES)( HANDLE, PENUMLOADED_MODULES_CALLBACK, PVOID); +extern ENUMLOADEDMODULES _EnumerateLoadedModules; + PRBool EnsureSymInitialized(); /* diff --git a/mozilla/xpcom/base/nsTraceRefcnt.cpp b/mozilla/xpcom/base/nsTraceRefcnt.cpp index d02d94a5891..b2ed42cc7e4 100644 --- a/mozilla/xpcom/base/nsTraceRefcnt.cpp +++ b/mozilla/xpcom/base/nsTraceRefcnt.cpp @@ -880,6 +880,8 @@ SYMUNDNAME _SymUnDName; SYMGETMODULEINFO _SymGetModuleInfo; +ENUMLOADEDMODULES _EnumerateLoadedModules; + PR_END_EXTERN_C static PRBool @@ -918,6 +920,9 @@ EnsureImageHlpInitialized() _SymGetModuleInfo = (SYMGETMODULEINFO)GetProcAddress(module, "SymGetModuleInfo"); if (!_SymGetModuleInfo) return PR_FALSE; + _EnumerateLoadedModules = (ENUMLOADEDMODULES)GetProcAddress(module, "EnumerateLoadedModules"); + if (!_EnumerateLoadedModules) return PR_FALSE; + gInitialized = PR_TRUE; } @@ -984,7 +989,7 @@ BOOL SymGetModuleInfoEspecial(HANDLE aProcess, DWORD aAddr, PIMAGEHLP_MODULE aMo * Not loaded, here's the magic. * Go through all the modules. */ - enumRes = EnumerateLoadedModules(aProcess, callbackEspecial, (PVOID)aAddr); + enumRes = _EnumerateLoadedModules(aProcess, callbackEspecial, (PVOID)aAddr); if(FALSE != enumRes) { /* diff --git a/mozilla/xpcom/base/nsTraceRefcntImpl.cpp b/mozilla/xpcom/base/nsTraceRefcntImpl.cpp index d02d94a5891..b2ed42cc7e4 100644 --- a/mozilla/xpcom/base/nsTraceRefcntImpl.cpp +++ b/mozilla/xpcom/base/nsTraceRefcntImpl.cpp @@ -880,6 +880,8 @@ SYMUNDNAME _SymUnDName; SYMGETMODULEINFO _SymGetModuleInfo; +ENUMLOADEDMODULES _EnumerateLoadedModules; + PR_END_EXTERN_C static PRBool @@ -918,6 +920,9 @@ EnsureImageHlpInitialized() _SymGetModuleInfo = (SYMGETMODULEINFO)GetProcAddress(module, "SymGetModuleInfo"); if (!_SymGetModuleInfo) return PR_FALSE; + _EnumerateLoadedModules = (ENUMLOADEDMODULES)GetProcAddress(module, "EnumerateLoadedModules"); + if (!_EnumerateLoadedModules) return PR_FALSE; + gInitialized = PR_TRUE; } @@ -984,7 +989,7 @@ BOOL SymGetModuleInfoEspecial(HANDLE aProcess, DWORD aAddr, PIMAGEHLP_MODULE aMo * Not loaded, here's the magic. * Go through all the modules. */ - enumRes = EnumerateLoadedModules(aProcess, callbackEspecial, (PVOID)aAddr); + enumRes = _EnumerateLoadedModules(aProcess, callbackEspecial, (PVOID)aAddr); if(FALSE != enumRes) { /*