actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup, fix path.

Browse Source
This commit is contained in:
Glenn Maynard
2003-09-22 00:10:04 +00:00
parent 4720a80e52
commit a316e1cfa1
1 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/archutils/Win32/Crash.cpp
+7 -12
View File
@@ -296,15 +296,12 @@ long __stdcall CrashHandler(EXCEPTION_POINTERS *pExc)
DoSave(pExc); DoSave(pExc);
/* Little trick to get an HINSTANCE of ourself without having access to the hwnd ... */ /* Little trick to get an HINSTANCE of ourself without having access to the hwnd ... */
int ret;
{ {
TCHAR szFullAppPath[MAX_PATH]; TCHAR szFullAppPath[MAX_PATH];
GetModuleFileName(NULL, szFullAppPath, MAX_PATH); GetModuleFileName(NULL, szFullAppPath, MAX_PATH);
HINSTANCE handle = LoadLibrary(szFullAppPath); HINSTANCE handle = LoadLibrary(szFullAppPath);
/* Returns TRUE if we want to pop up the standard crash box; DialogBoxParam(handle, MAKEINTRESOURCE(IDD_DISASM_CRASH), NULL,
* FALSE if we should just die. */
ret = DialogBoxParam(handle, MAKEINTRESOURCE(IDD_DISASM_CRASH), NULL,
CrashDlgProc, (LPARAM)pExc); CrashDlgProc, (LPARAM)pExc);
} }
@@ -313,8 +310,6 @@ long __stdcall CrashHandler(EXCEPTION_POINTERS *pExc)
InHere = false; InHere = false;
SetUnhandledExceptionFilter(NULL); SetUnhandledExceptionFilter(NULL);
if(ret)
UnhandledExceptionFilter(pExc);
return EXCEPTION_EXECUTE_HANDLER; return EXCEPTION_EXECUTE_HANDLER;
} }
@@ -439,7 +434,7 @@ static bool IsValidCall(char *buf, int len) {
} }
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
/*
struct ModuleInfo { struct ModuleInfo {
const char *name; const char *name;
unsigned long base, size; unsigned long base, size;
@@ -458,7 +453,7 @@ typedef BOOL (__stdcall *PGETMODULEINFORMATION)(HANDLE, HMODULE, Win32ModuleInfo
typedef HANDLE (__stdcall *PCREATETOOLHELP32SNAPSHOT)(DWORD, DWORD); typedef HANDLE (__stdcall *PCREATETOOLHELP32SNAPSHOT)(DWORD, DWORD);
typedef BOOL (WINAPI *PMODULE32FIRST)(HANDLE, LPMODULEENTRY32); typedef BOOL (WINAPI *PMODULE32FIRST)(HANDLE, LPMODULEENTRY32);
typedef BOOL (WINAPI *PMODULE32NEXT)(HANDLE, LPMODULEENTRY32); typedef BOOL (WINAPI *PMODULE32NEXT)(HANDLE, LPMODULEENTRY32);
/*
static ModuleInfo *CrashGetModules(void *&ptr) { static ModuleInfo *CrashGetModules(void *&ptr) {
void *pMem = VirtualAlloc(NULL, 65536, MEM_COMMIT, PAGE_READWRITE); void *pMem = VirtualAlloc(NULL, 65536, MEM_COMMIT, PAGE_READWRITE);
@@ -603,7 +598,7 @@ static ModuleInfo *CrashGetModules(void *&ptr) {
typedef unsigned short ushort; typedef unsigned short ushort;
typedef unsigned long ulong; typedef unsigned long ulong;
/*
struct PEHeader { struct PEHeader {
ulong signature; ulong signature;
ushort machine; ushort machine;
@@ -717,7 +712,7 @@ struct PE32PlusOptionalHeader {
ulong export_size; // 116 ulong export_size; // 116
}; };
/*
static const char *CrashLookupExport(HMODULE hmod, unsigned long addr, unsigned long &fnbase) { static const char *CrashLookupExport(HMODULE hmod, unsigned long addr, unsigned long &fnbase) {
char *pBase = (char *)hmod; char *pBase = (char *)hmod;
@@ -1054,8 +1049,8 @@ long VDDebugInfoLookupRVA(VDDebugInfoContext *pctx, unsigned rva, char *buf, int
} }
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
#include "dbghelp.h" #include "ddk/dbghelp.h"
#pragma comment(lib, "dbghelp.lib") #pragma comment(lib, "ddk/dbghelp.lib")
static bool InitDbghelp() static bool InitDbghelp()
{ {