From c2379b6a52bcaaeed1e9598ca2e2fa21a47bae6d Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Tue, 27 Aug 2002 22:00:03 +0000 Subject: [PATCH] Resources for new crash dialog. --- stepmania/src/StepMania.RC | 61 ++++++++++++++++++++++++++++++++++++-- stepmania/src/resource.h | 10 ++++++- 2 files changed, 68 insertions(+), 3 deletions(-) diff --git a/stepmania/src/StepMania.RC b/stepmania/src/StepMania.RC index 28ce783d0e..ef5bb58364 100644 --- a/stepmania/src/StepMania.RC +++ b/stepmania/src/StepMania.RC @@ -119,13 +119,14 @@ END BITMAP_ERROR BITMAP MOVEABLE PURE "error.bmp" BITMAP_LOADING BITMAP DISCARDABLE "loading.bmp" +BITMAP_CRASH BITMAP DISCARDABLE "error2.bmp" ///////////////////////////////////////////////////////////////////////////// // // Dialog // -IDD_ERROR_DIALOG DIALOGEX 0, 0, 332, 234 +IDD_ERROR_DIALOG DIALOG DISCARDABLE 0, 0, 332, 234 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION CAPTION "StepMania Error" FONT 8, "MS Sans Serif" @@ -134,7 +135,7 @@ BEGIN ES_AUTOHSCROLL | ES_READONLY | WS_VSCROLL | NOT WS_TABSTOP DEFPUSHBUTTON "Close",IDOK,265,215,60,15 - CONTROL 129,IDC_STATIC,"Static",SS_BITMAP,0,0,258,37 + CONTROL 129,IDC_STATIC,"Static",SS_BITMAP,0,0,332,38 LTEXT "Sorry! An error has occurred while running StepMania.\r\n\r\nSpecific details about the error may be listeted in the box below:", IDC_STATIC,7,46,298,28 PUSHBUTTON "Restart StepMania",IDC_BUTTON_RESTART,175,215,80,15 @@ -152,6 +153,46 @@ BEGIN CTEXT "line3",IDC_STATIC_MESSAGE3,0,65,310,10,SS_CENTERIMAGE END +IDD_DISASM DIALOG DISCARDABLE 0, 0, 320, 201 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Dynamic code disassembly" +FONT 8, "MS Sans Serif" +BEGIN + DEFPUSHBUTTON "OK",IDOK,263,180,50,14 + LISTBOX IDC_ASMBOX,7,7,306,170,LBS_OWNERDRAWVARIABLE | + LBS_USETABSTOPS | LBS_NOINTEGRALHEIGHT | LBS_NOSEL | + WS_VSCROLL | WS_TABSTOP + LTEXT "",IDC_STATIC,8,182,245,8 +END + +IDD_DISASM_CRASH DIALOG DISCARDABLE 0, 0, 399, 286 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION +CAPTION "StepMania Error" +FONT 8, "MS Sans Serif" +BEGIN + DEFPUSHBUTTON "OK",IDOK,348,270,50,15 + LISTBOX IDC_ASMBOX,7,58,279,100,LBS_OWNERDRAWVARIABLE | + LBS_USETABSTOPS | LBS_NOINTEGRALHEIGHT | LBS_NODATA | + LBS_NOSEL | WS_VSCROLL | WS_TABSTOP + LTEXT "crash reason: programmer needs good whack on head", + IDC_STATIC_BOMBREASON,8,222,219,8 + LISTBOX IDC_REGDUMP,291,58,101,158,NOT LBS_NOTIFY | + LBS_NOINTEGRALHEIGHT | LBS_NOSEL | WS_VSCROLL | + WS_HSCROLL | WS_TABSTOP + LTEXT "Program disassembly",IDC_STATIC,7,46,66,8 + LTEXT "CPU registers",IDC_STATIC,287,46,44,8 + LTEXT "StepMania has crashed due to a program error. Please hit Save to dump diagnostic information to a file called 'crashinfo.txt' in the StepMania program directory, and then OK to bring up the normal crash box.", + IDC_STATIC,7,238,319,25 + PUSHBUTTON "Save",IDC_CRASH_SAVE,77,270,50,15 + LISTBOX IDC_CALL_STACK,7,178,279,38,LBS_NOINTEGRALHEIGHT | + WS_VSCROLL | WS_TABSTOP + LTEXT "Estimated call stack",IDC_STATIC,7,167,64,8 + CONTROL 121,IDC_STATIC,"Static",SS_BITMAP,1,2,396,36 + PUSHBUTTON "View Log",IDC_BUTTON_VIEW_LOG,1,270,74,15 + PUSHBUTTON "Restart StepMania",IDC_BUTTON_RESTART,129,270,80,15 + PUSHBUTTON "Report the Error",IDC_BUTTON_REPORT,211,270,76,15 +END + ///////////////////////////////////////////////////////////////////////////// // @@ -168,6 +209,22 @@ BEGIN TOPMARGIN, 7 BOTTOMMARGIN, 71 END + + IDD_DISASM, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 313 + TOPMARGIN, 7 + BOTTOMMARGIN, 194 + END + + IDD_DISASM_CRASH, DIALOG + BEGIN + LEFTMARGIN, 1 + RIGHTMARGIN, 398 + VERTGUIDE, 286 + BOTTOMMARGIN, 274 + END END #endif // APSTUDIO_INVOKED diff --git a/stepmania/src/resource.h b/stepmania/src/resource.h index bcd8575a30..e2c0e0b72b 100644 --- a/stepmania/src/resource.h +++ b/stepmania/src/resource.h @@ -2,10 +2,14 @@ // Microsoft Developer Studio generated include file. // Used by StepMania.RC // +#define IDC_CRASH_SAVE 16 #define IDD_ERROR_DIALOG 111 #define IDD_LOADING_DIALOG 116 #define BITMAP_LOADING 117 +#define BITMAP_CRASH 121 #define BITMAP_ERROR 129 +#define IDD_DISASM 138 +#define IDD_DISASM_CRASH 199 #define IDC_SHOCKWAVEFLASH1 1000 #define IDR_MAIN_ACCEL 1001 #define IDC_BUTTON_RESTART 1001 @@ -23,13 +27,17 @@ #define IDC_STATIC_MESSAGE1 1010 #define IDC_STATIC_MESSAGE2 1011 #define IDC_STATIC_MESSAGE3 1013 +#define IDC_ASMBOX 1133 +#define IDC_REGDUMP 1283 +#define IDC_STATIC_BOMBREASON 1284 +#define IDC_CALL_STACK 1310 #define IDM_EXIT 40003 // Next default values for new objects // #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 118 +#define _APS_NEXT_RESOURCE_VALUE 123 #define _APS_NEXT_COMMAND_VALUE 40009 #define _APS_NEXT_CONTROL_VALUE 1011 #define _APS_NEXT_SYMED_VALUE 101