ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

winport: 

- fix crashes tools on Windows XP;
- added refresh on cycles in Disassembler tool;
This commit is contained in:
mtabachenko 2008-11-15 17:51:17 +00:00
parent 443ce7216d
commit 9cbd4d7035
14 changed files with 106 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
desmume/src/FIFO.cpp
View File

@ -35,24 +35,21 @@ void FIFOadd(FIFO *fifo, u32 val)
{
if (fifo->full)
{
//printlog("!!!!! FIFOadd full\n");
fifo->error = true;
return;
}
fifo->buf[fifo->sendPos] = val;
fifo->sendPos = (fifo->sendPos+1) & 0x7FFF;
fifo->half = (fifo->sendPos < (sizeof(fifo->buf)>>1));
fifo->half = (fifo->sendPos < 0x4000);
fifo->full = (fifo->sendPos == fifo->recvPos);
fifo->empty = false;
//printlog("-------------- FIFO add size=%i, val=%X\n",fifo->sendPos, val);
}
u32 FIFOget(FIFO * fifo)
{
if (fifo->empty)
{
//printlog("!!!!! FIFOget empty\n");
fifo->error = true;
return 0;
}
@ -61,6 +58,5 @@ u32 FIFOget(FIFO * fifo)
val = fifo->buf[fifo->recvPos];
fifo->recvPos = (fifo->recvPos+1) & 0x7FFF;
fifo->empty = (fifo->recvPos == fifo->sendPos);
//printlog("-------------- FIFO get size=%i, val=%X\n",fifo->recvPos, val);
return val;
}

18
desmume/src/MMU.cpp
View File

@ -256,8 +256,8 @@ void MMU_Init(void) {
MMU.MMU_WAIT32[0] = MMU_ARM9_WAIT32;
MMU.MMU_WAIT32[1] = MMU_ARM7_WAIT32;
FIFOclear(MMU.fifos);
FIFOclear(MMU.fifos+1);
FIFOclear(&MMU.fifos[0]);
FIFOclear(&MMU.fifos[1]);
mc_init(&MMU.fw, MC_TYPE_FLASH); /* init fw device */
mc_alloc(&MMU.fw, NDS_FW_SIZE_V1);
@ -312,8 +312,8 @@ void MMU_clearMem()
memset(MMU.ARM7_ERAM, 0, 0x010000);
memset(MMU.ARM7_REG, 0, 0x010000);
FIFOclear(MMU.fifos);
FIFOclear(MMU.fifos+1);
FIFOclear(&MMU.fifos[0]);
FIFOclear(&MMU.fifos[1]);
MMU.DTCMRegion = 0x027C0000;
MMU.ITCMRegion = 0x00000000;
@ -854,7 +854,7 @@ u32 FASTCALL _MMU_read32(u32 adr)
//printlog("MMU read32: REG_IPCFIFORECV (%X)\n", cnt_l);
if (!(cnt_l & 0x8000)) return 0; // FIFO disabled
u16 cnt_r = T1ReadWord(MMU.MMU_MEM[proc^1][0x40], 0x184);
u32 val = FIFOget(MMU.fifos + proc);
u32 val = FIFOget(&MMU.fifos[proc]);
cnt_l |= (MMU.fifos[proc].empty?0x0100:0) | (MMU.fifos[proc].full?0x0200:0) | (MMU.fifos[proc].error?0x4000:0);
cnt_r |= (MMU.fifos[proc].empty?0x0001:0) | (MMU.fifos[proc].full?0x0002:0);
@ -1789,7 +1789,7 @@ void FASTCALL _MMU_write16(u32 adr, u16 val)
{
/* this is the first init, the other side didnt init yet */
/* so do a complete init */
FIFOclear(MMU.fifos + proc);
FIFOclear(&MMU.fifos[proc]);
T1WriteWord(MMU.MMU_MEM[proc][0x40], 0x184,0x8101) ;
/* and then handle it as usual */
}
@ -2448,9 +2448,7 @@ void FASTCALL _MMU_write32(u32 adr, u32 val)
case 0x04000600: // Geometry Engine Status Register (R and R/W)
{
//printlog("MMU write32: Geometry Engine Status Register (R and R/W)");
//printlog("------- val=%X\n\n************\n\n", val);
//printlog("MMU write32: Geometry Engine Status Register (R and R/W)\n");
MMU.fifos[proc].irq = (val>>30) & 0x03;
return;
}
@ -2834,7 +2832,7 @@ void FASTCALL _MMU_write32(u32 adr, u32 val)
u16 cnt_r = T1ReadWord(MMU.MMU_MEM[proc^1][0x40], 0x184);
//printlog("MMU write32 (%s): REG_IPCFIFOSEND (%X-%X) val=%X\n", proc?"ARM9":"ARM7",cnt_l,cnt_r,val);
//FIFOadd(MMU.fifos+(proc^1), val);
FIFOadd(MMU.fifos+(proc^1), val);
FIFOadd(&MMU.fifos[proc^1], val);
cnt_l = (cnt_l & 0xFFFC) | (MMU.fifos[proc^1].full?0x0002:0);
cnt_r = (cnt_r & 0xFCFF) | (MMU.fifos[proc^1].full?0x0200:0);
T1WriteWord(MMU.MMU_MEM[proc][0x40], 0x184, cnt_l);

10
desmume/src/NDSSystem.cpp
View File

@ -32,6 +32,10 @@
#include "ROMReader.h"
#include "gfx3d.h"
#ifdef _WIN32
#include "./windows/disView.h"
#endif
/* the count of bytes copied from the firmware into memory */
#define NDS_FW_USER_SETTINGS_MEM_BYTE_COUNT 0x70
@ -902,6 +906,9 @@ NDS_exec(s32 nb, BOOL force)
//nds.ARM9Cycle += armcpu_exec(&NDS_ARM9);
nds.ARM9Cycle += armcpu_exec<0>();
}
#ifdef _WIN32
DisassemblerTools_Refresh(0);
#endif
}
#ifdef EXPERIMENTAL_WIFI
@ -936,6 +943,9 @@ NDS_exec(s32 nb, BOOL force)
//nds.ARM7Cycle += (armcpu_exec(&NDS_ARM7)<<1);
nds.ARM7Cycle += (armcpu_exec<1>()<<1);
}
#ifdef _WIN32
DisassemblerTools_Refresh(1);
#endif
}
}

2
desmume/src/windows/IORegView.cpp
View File

@ -72,7 +72,7 @@ BOOL CALLBACK IoregView_Proc (HWND hwnd, UINT message, WPARAM wParam, LPARAM lPa
switch (message)
{
case WM_INITDIALOG :
IORegView = new ioregview_struct;
IORegView = new ioregview_struct[1];
memset(IORegView, 0, sizeof(ioregview_struct));
IORegView->autoup_secs = 5;
SendMessage(GetDlgItem(hwnd, IDC_AUTO_UPDATE_SPIN),

63
desmume/src/windows/disView.cpp
View File

@ -43,6 +43,8 @@ typedef struct
disview_struct *DisView7 = NULL;
disview_struct *DisView9 = NULL;
static HWND DisViewWnd[2] = {NULL, NULL};
#define INDEX(i) ((((i)>>16)&0xFF0)|(((i)>>4)&0xF))
LRESULT DisViewBox_OnPaint(HWND hwnd, disview_struct *win, WPARAM wParam, LPARAM lParam)
@ -290,7 +292,7 @@ BOOL CALLBACK ViewDisasm_ARM7Proc (HWND hwnd, UINT message, WPARAM wParam, LPARA
SetWindowText(hwnd, "ARM7 Disassembler");
SetDlgItemInt(hwnd, IDC_SETPNUM, 1, FALSE);
SendMessage(GetDlgItem(hwnd, IDC_AUTO_DES), BM_SETCHECK, TRUE, 0);
DisView7 = new disview_struct;
DisView7 = new disview_struct[1];
memset(DisView7, 0, sizeof(disview_struct));
DisView7->cpu = &NDS_ARM7;
DisView7->autoup_secs = 5;
@ -298,6 +300,7 @@ BOOL CALLBACK ViewDisasm_ARM7Proc (HWND hwnd, UINT message, WPARAM wParam, LPARA
UDM_SETRANGE, 0, MAKELONG(99, 1));
SendMessage(GetDlgItem(hwnd, IDC_AUTO_UPDATE_SPIN),
UDM_SETPOS32, 0, DisView7->autoup_secs);
DisViewWnd[1] = NULL;
return 1;
}
case WM_CLOSE :
@ -312,6 +315,7 @@ BOOL CALLBACK ViewDisasm_ARM7Proc (HWND hwnd, UINT message, WPARAM wParam, LPARA
delete DisView7;
DisView7 = NULL;
}
DisViewWnd[1] = NULL;
//printlog("Close ARM7 disassembler\n");
PostQuitMessage(0);
return 1;
@ -359,12 +363,14 @@ BOOL CALLBACK ViewDisasm_ARM7Proc (HWND hwnd, UINT message, WPARAM wParam, LPARA
case IDC_AUTO_UPDATE :
if(DisView7->autoup)
{
EnableWindow(GetDlgItem(hwnd, IDC_AUTOUPDATE_ASM), TRUE);
EnableWindow(GetDlgItem(hwnd, IDC_AUTO_UPDATE_SECS), false);
EnableWindow(GetDlgItem(hwnd, IDC_AUTO_UPDATE_SPIN), false);
KillTimer(hwnd, IDT_VIEW_DISASM7);
DisView7->autoup = FALSE;
return 1;
}
EnableWindow(GetDlgItem(hwnd, IDC_AUTOUPDATE_ASM), FALSE);
EnableWindow(GetDlgItem(hwnd, IDC_AUTO_UPDATE_SECS), true);
EnableWindow(GetDlgItem(hwnd, IDC_AUTO_UPDATE_SPIN), true);
DisView7->autoup = TRUE;
@ -422,7 +428,7 @@ BOOL CALLBACK ViewDisasm_ARM7Proc (HWND hwnd, UINT message, WPARAM wParam, LPARA
return 1;
case IDC_AUTO_UPDATE_SECS:
{
int t = GetDlgItemInt(hwnd, IDC_AUTO_UPDATE_SECS, FALSE, TRUE);
u16 t = GetDlgItemInt(hwnd, IDC_AUTO_UPDATE_SECS, FALSE, TRUE);
if (t != DisView7->autoup_secs)
{
DisView7->autoup_secs = t;
@ -432,6 +438,18 @@ BOOL CALLBACK ViewDisasm_ARM7Proc (HWND hwnd, UINT message, WPARAM wParam, LPARA
}
}
return 1;
case IDC_AUTOUPDATE_ASM:
{
if (DisViewWnd[1] == NULL)
{
EnableWindow(GetDlgItem(hwnd, IDC_AUTO_UPDATE), FALSE);
DisViewWnd[1] = GetDlgItem(hwnd, IDC_DES_BOX);
return 1;
}
DisViewWnd[1] = NULL;
EnableWindow(GetDlgItem(hwnd, IDC_AUTO_UPDATE), TRUE);
}
return 1;
return 1;
}
return 0;
@ -510,7 +528,7 @@ BOOL CALLBACK ViewDisasm_ARM9Proc (HWND hwnd, UINT message, WPARAM wParam, LPARA
SetWindowText(hwnd, "ARM9 Disassembler");
SetDlgItemInt(hwnd, IDC_SETPNUM, 1, FALSE);
SendMessage(GetDlgItem(hwnd, IDC_AUTO_DES), BM_SETCHECK, TRUE, 0);
DisView9 = new disview_struct;
DisView9 = new disview_struct[1];
memset(DisView9, 0, sizeof(disview_struct));
DisView9->cpu = &NDS_ARM9;
DisView9->autoup_secs = 5;
@ -518,6 +536,7 @@ BOOL CALLBACK ViewDisasm_ARM9Proc (HWND hwnd, UINT message, WPARAM wParam, LPARA
UDM_SETRANGE, 0, MAKELONG(99, 1));
SendMessage(GetDlgItem(hwnd, IDC_AUTO_UPDATE_SPIN),
UDM_SETPOS32, 0, DisView9->autoup_secs);
DisViewWnd[0] = NULL;
return 1;
}
case WM_CLOSE :
@ -532,7 +551,8 @@ BOOL CALLBACK ViewDisasm_ARM9Proc (HWND hwnd, UINT message, WPARAM wParam, LPARA
delete DisView9;
DisView9 = NULL;
}
printlog("Close ARM9 disassembler\n");
DisViewWnd[0] = NULL;
//printlog("Close ARM9 disassembler\n");
PostQuitMessage(0);
return 1;
}
@ -579,12 +599,14 @@ BOOL CALLBACK ViewDisasm_ARM9Proc (HWND hwnd, UINT message, WPARAM wParam, LPARA
case IDC_AUTO_UPDATE :
if(DisView9->autoup)
{
EnableWindow(GetDlgItem(hwnd, IDC_AUTOUPDATE_ASM), TRUE);
EnableWindow(GetDlgItem(hwnd, IDC_AUTO_UPDATE_SECS), false);
EnableWindow(GetDlgItem(hwnd, IDC_AUTO_UPDATE_SPIN), false);
KillTimer(hwnd, IDT_VIEW_DISASM9);
DisView9->autoup = FALSE;
return 1;
}
EnableWindow(GetDlgItem(hwnd, IDC_AUTOUPDATE_ASM), FALSE);
EnableWindow(GetDlgItem(hwnd, IDC_AUTO_UPDATE_SECS), true);
EnableWindow(GetDlgItem(hwnd, IDC_AUTO_UPDATE_SPIN), true);
DisView9->autoup = TRUE;
@ -642,7 +664,7 @@ BOOL CALLBACK ViewDisasm_ARM9Proc (HWND hwnd, UINT message, WPARAM wParam, LPARA
return 1;
case IDC_AUTO_UPDATE_SECS:
{
int t = GetDlgItemInt(hwnd, IDC_AUTO_UPDATE_SECS, FALSE, TRUE);
u16 t = GetDlgItemInt(hwnd, IDC_AUTO_UPDATE_SECS, FALSE, TRUE);
if (t != DisView9->autoup_secs)
{
DisView9->autoup_secs = t;
@ -652,10 +674,39 @@ BOOL CALLBACK ViewDisasm_ARM9Proc (HWND hwnd, UINT message, WPARAM wParam, LPARA
}
}
return 1;
return 1;
case IDC_AUTOUPDATE_ASM:
{
if (DisViewWnd[0] == NULL)
{
EnableWindow(GetDlgItem(hwnd, IDC_AUTO_UPDATE), FALSE);
DisViewWnd[0] = GetDlgItem(hwnd, IDC_DES_BOX);
return 1;
}
DisViewWnd[0] = NULL;
EnableWindow(GetDlgItem(hwnd, IDC_AUTO_UPDATE), TRUE);
}
return 1;
return 1;
}
return 0;
}
return DefWindowProc(hwnd, message, wParam, lParam);
}
void DisassemblerTools_Refresh(u8 proc)
{
if (DisViewWnd[proc] == NULL) return;
if (proc == 0)
{
DisView9->autogo=true;
InvalidateRect(DisViewWnd[proc], NULL, FALSE);
DisView9->autogo=false;
}
else
{
DisView7->autogo=true;
InvalidateRect(DisViewWnd[proc], NULL, FALSE);
DisView7->autogo=false;
}
}

2
desmume/src/windows/disView.h
View File

@ -30,4 +30,6 @@ extern LRESULT CALLBACK ViewDisasm_ARM7BoxProc(HWND hwnd, UINT msg, WPARAM wPara
extern BOOL CALLBACK ViewDisasm_ARM9Proc (HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam);
extern LRESULT CALLBACK ViewDisasm_ARM9BoxProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);
extern void DisassemblerTools_Refresh(u8 proc);
#endif

2
desmume/src/windows/lightView.cpp
View File

@ -105,7 +105,7 @@ BOOL CALLBACK ViewLightsProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM lPa
switch (message)
{
case WM_INITDIALOG:
LightsView = new lightsview_struct;
LightsView = new lightsview_struct[1];
memset(LightsView, 0, sizeof(lightsview_struct));
LightsView->autoup_secs = 5;
SendMessage(GetDlgItem(hwnd, IDC_AUTO_UPDATE_SPIN),

2
desmume/src/windows/mapView.cpp
View File

@ -221,7 +221,7 @@ BOOL CALLBACK ViewMapsProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM lPara
{
case WM_INITDIALOG :
{
MapView = new mapview_struct;
MapView = new mapview_struct[1];
memset(MapView, 0, sizeof(MapView));
MapView->autoup_secs = 5;
SendMessage(GetDlgItem(hwnd, IDC_AUTO_UPDATE_SPIN),

2
desmume/src/windows/matrixView.cpp
View File

@ -149,7 +149,7 @@ BOOL CALLBACK ViewMatricesProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM l
{
case WM_INITDIALOG:
{
MatrixView = new matrixview_struct;
MatrixView = new matrixview_struct[1];
memset(MatrixView, 0, sizeof(matrixview_struct));
MatrixView->autoup_secs = 5;
SendMessage(GetDlgItem(hwnd, IDC_AUTO_UPDATE_SPIN),

2
desmume/src/windows/memView.cpp
View File

@ -213,7 +213,7 @@ bool CALLBACK ViewMem_ARM7Proc (HWND hwnd, UINT message, WPARAM wParam, LPARAM l
{
SetWindowText(hwnd, "ARM7 memory viewer");
SendMessage(GetDlgItem(hwnd, IDC_8_BIT), BM_SETCHECK, TRUE, 0);
MemView7 = new memview_struct;
MemView7 = new memview_struct[1];
memset(MemView7, 0, sizeof(memview_struct));
MemView7->cpu = 1;
MemView7->autoup_secs = 5;

2
desmume/src/windows/oamView.cpp
View File

@ -210,7 +210,7 @@ BOOL CALLBACK ViewOAMProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam
{
case WM_INITDIALOG :
{
OAMView = new oamview_struct;
OAMView = new oamview_struct[1];
memset(OAMView, 0, sizeof(oamview_struct));
OAMView->oam = (OAM *)(ARM9Mem.ARM9_OAM);
OAMView->gpu = MainScreen.gpu;

2
desmume/src/windows/palView.cpp
View File

@ -89,7 +89,7 @@ BOOL CALLBACK ViewPalProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam
{
case WM_INITDIALOG :
{
PalView = new palview_struct;
PalView = new palview_struct[1];
memset(PalView, 0, sizeof(palview_struct));
PalView->adr = (u16 *)ARM9Mem.ARM9_VMEM;
PalView->autoup_secs = 5;

3
desmume/src/windows/resource.h
View File

@ -207,6 +207,7 @@
#define IDC_EDIT04 1014
#define ID_CANCEL 1016
#define IDSAVE 1017
#define IDC_AUTOUPDATE_ASM 1018
#define IDM_FIRMSETTINGS 1100
#define IDD_FIRMSETTINGS 1101
#define IDC_EDIT1 1102
@ -355,7 +356,7 @@
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 107
#define _APS_NEXT_COMMAND_VALUE 40037
#define _APS_NEXT_CONTROL_VALUE 1018
#define _APS_NEXT_CONTROL_VALUE 1019
#define _APS_NEXT_SYMED_VALUE 112
#endif
#endif

32
desmume/src/windows/resources.rc
View File

@ -17,7 +17,7 @@
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU)
#ifdef _WIN32
LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
#pragma code_page(1252)
#pragma code_page(1251)
#endif //_WIN32
/////////////////////////////////////////////////////////////////////////////
@ -290,8 +290,6 @@ BEGIN
PUSHBUTTON "&Start",IDC_GO,240,1,20,14
CONTROL "Rediger",IDC_DES_BOX,"DesViewBox7",WS_VSCROLL | WS_TABSTOP,4,16,296,150,WS_EX_CLIENTEDGE
PUSHBUTTON "&Luk",IDC_FERMER,246,170,50,14
EDITTEXT IDC_SETPNUM,5,170,65,14,ES_UPPERCASE | ES_AUTOHSCROLL | ES_NUMBER | WS_GROUP
PUSHBUTTON "&Step",IDC_STEP,75,170,50,14
LTEXT "R0 :",IDC_STATIC,304,16,17,8
LTEXT "R1 :",IDC_STATIC,304,24,17,8
LTEXT "R2 :",IDC_STATIC,304,32,17,8
@ -333,6 +331,9 @@ BEGIN
EDITTEXT IDC_AUTO_UPDATE_SECS,340,3,12,14,ES_AUTOHSCROLL | ES_READONLY | WS_DISABLED
CONTROL "",IDC_AUTO_UPDATE_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_DISABLED,352,2,11,14
LTEXT "secs",IDC_STATIC,364,5,16,8
EDITTEXT IDC_SETPNUM,5,170,34,14,ES_UPPERCASE | ES_AUTOHSCROLL | ES_NUMBER | WS_GROUP
PUSHBUTTON "&Step",IDC_STEP,41,170,50,14
CONTROL "Autoupd asm",IDC_AUTOUPDATE_ASM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,94,172,57,10
END
IDD_GAME_INFO DIALOG 0, 0, 150, 150
@ -531,8 +532,6 @@ BEGIN
PUSHBUTTON "&Start",IDC_GO,240,1,20,14
CONTROL "Rediger",IDC_DES_BOX,"DesViewBox9",WS_VSCROLL | WS_TABSTOP,4,16,296,150,WS_EX_CLIENTEDGE
PUSHBUTTON "&Luk",IDC_FERMER,246,170,50,14
EDITTEXT IDC_SETPNUM,5,170,65,14,ES_UPPERCASE | ES_AUTOHSCROLL | ES_NUMBER | WS_GROUP
PUSHBUTTON "&Step",IDC_STEP,75,170,50,14
LTEXT "R0 :",IDC_STATIC,304,16,17,8
LTEXT "R1 :",IDC_STATIC,304,24,17,8
LTEXT "R2 :",IDC_STATIC,304,32,17,8
@ -574,6 +573,9 @@ BEGIN
EDITTEXT IDC_AUTO_UPDATE_SECS,340,3,12,14,ES_AUTOHSCROLL | ES_READONLY | WS_DISABLED
CONTROL "",IDC_AUTO_UPDATE_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_DISABLED,352,2,11,14
LTEXT "secs",IDC_STATIC,364,5,16,8
EDITTEXT IDC_SETPNUM,5,170,34,14,ES_UPPERCASE | ES_AUTOHSCROLL | ES_NUMBER | WS_GROUP
PUSHBUTTON "&Step",IDC_STEP,41,170,50,14
CONTROL "Autoupd asm",IDC_AUTOUPDATE_ASM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,94,172,57,10
END
IDD_MEM_VIEWER9 DIALOGEX 0, 0, 428, 178
@ -926,8 +928,6 @@ BEGIN
CONTROL "&Auto-update",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,285,1,54,14
CONTROL "Edit",IDC_DES_BOX,"DesViewBox7",WS_VSCROLL | WS_TABSTOP,4,16,296,150,WS_EX_CLIENTEDGE
PUSHBUTTON "&Close",IDC_FERMER,248,170,50,14
EDITTEXT IDC_SETPNUM,5,170,65,14,ES_UPPERCASE | ES_AUTOHSCROLL | ES_NUMBER | WS_GROUP
PUSHBUTTON "&Step",IDC_STEP,75,170,50,14
LTEXT "R0 :",IDC_STATIC,304,16,17,8
LTEXT "R1 :",IDC_STATIC,304,24,17,8
LTEXT "R2 :",IDC_STATIC,304,32,17,8
@ -968,6 +968,9 @@ BEGIN
CONTROL "",IDC_AUTO_UPDATE_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_DISABLED,352,2,11,14
LTEXT "secs",IDC_STATIC,364,5,16,8
PUSHBUTTON "&Refresh",IDC_REFRESH,162,170,50,14,BS_ICON
EDITTEXT IDC_SETPNUM,5,170,34,14,ES_UPPERCASE | ES_AUTOHSCROLL | ES_NUMBER | WS_GROUP
PUSHBUTTON "&Step",IDC_STEP,41,170,50,14
CONTROL "Autoupd asm",IDC_AUTOUPDATE_ASM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,94,172,57,10
END
IDD_GAME_INFO DIALOG 0, 0, 150, 150
@ -1300,8 +1303,8 @@ BEGIN
CONTROL "&Auto-update",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,285,1,54,14
CONTROL "Edit",IDC_DES_BOX,"DesViewBox9",WS_VSCROLL | WS_TABSTOP,4,16,296,150,WS_EX_CLIENTEDGE
PUSHBUTTON "&Close",IDC_FERMER,248,170,50,14
EDITTEXT IDC_SETPNUM,5,170,65,14,ES_UPPERCASE | ES_AUTOHSCROLL | ES_NUMBER | WS_GROUP
PUSHBUTTON "&Step",IDC_STEP,75,170,50,14
EDITTEXT IDC_SETPNUM,5,170,34,14,ES_UPPERCASE | ES_AUTOHSCROLL | ES_NUMBER | WS_GROUP
PUSHBUTTON "&Step",IDC_STEP,41,170,50,14
LTEXT "R0 :",IDC_STATIC,304,16,17,8
LTEXT "R1 :",IDC_STATIC,304,24,17,8
LTEXT "R2 :",IDC_STATIC,304,32,17,8
@ -1342,6 +1345,7 @@ BEGIN
CONTROL "",IDC_AUTO_UPDATE_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_DISABLED,352,2,11,14
LTEXT "secs",IDC_STATIC,364,5,16,8
PUSHBUTTON "&Refresh",IDC_REFRESH,162,170,50,14,BS_ICON
CONTROL "Autoupd asm",IDC_AUTOUPDATE_ASM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,94,172,57,10
END
IDD_MEM_VIEWER9 DIALOGEX 0, 0, 428, 178
@ -1604,8 +1608,6 @@ BEGIN
PUSHBUTTON "&GO",IDC_GO,240,1,20,14
CONTROL "Edit",IDC_DES_BOX,"DesViewBox7",WS_VSCROLL | WS_TABSTOP,4,16,296,150,WS_EX_CLIENTEDGE
PUSHBUTTON "&Fermer",IDC_FERMER,246,170,50,14
EDITTEXT IDC_SETPNUM,5,170,65,14,ES_UPPERCASE | ES_AUTOHSCROLL | ES_NUMBER | WS_GROUP
PUSHBUTTON "&Step",IDC_STEP,75,170,50,14
LTEXT "R0 :",IDC_STATIC,304,16,17,8
LTEXT "R1 :",IDC_STATIC,304,24,17,8
LTEXT "R2 :",IDC_STATIC,304,32,17,8
@ -1647,6 +1649,9 @@ BEGIN
CONTROL "",IDC_AUTO_UPDATE_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_DISABLED,352,2,11,14
LTEXT "secs",IDC_STATIC,364,5,16,8
PUSHBUTTON "&Refresh",IDC_REFRESH,162,170,50,14,BS_ICON
EDITTEXT IDC_SETPNUM,5,170,34,14,ES_UPPERCASE | ES_AUTOHSCROLL | ES_NUMBER | WS_GROUP
PUSHBUTTON "&Step",IDC_STEP,41,170,50,14
CONTROL "Autoupd asm",IDC_AUTOUPDATE_ASM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,94,172,57,10
END
IDD_GAME_INFO DIALOG 0, 0, 150, 150
@ -1808,8 +1813,6 @@ BEGIN
PUSHBUTTON "&GO",IDC_GO,240,1,20,14
CONTROL "Edit",IDC_DES_BOX,"DesViewBox9",WS_VSCROLL | WS_TABSTOP,4,16,296,150,WS_EX_CLIENTEDGE
PUSHBUTTON "&Fermer",IDC_FERMER,246,170,50,14
EDITTEXT IDC_SETPNUM,5,170,65,14,ES_UPPERCASE | ES_AUTOHSCROLL | ES_NUMBER | WS_GROUP
PUSHBUTTON "&Step",IDC_STEP,75,170,50,14
LTEXT "R0 :",IDC_STATIC,304,16,17,8
LTEXT "R1 :",IDC_STATIC,304,24,17,8
LTEXT "R2 :",IDC_STATIC,304,32,17,8
@ -1851,6 +1854,9 @@ BEGIN
CONTROL "",IDC_AUTO_UPDATE_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_DISABLED,352,2,11,14
LTEXT "secs",IDC_STATIC,364,5,16,8
PUSHBUTTON "&Refresh",IDC_REFRESH,162,170,50,14,BS_ICON
EDITTEXT IDC_SETPNUM,5,170,34,14,ES_UPPERCASE | ES_AUTOHSCROLL | ES_NUMBER | WS_GROUP
PUSHBUTTON "&Step",IDC_STEP,41,170,50,14
CONTROL "Autoupd asm",IDC_AUTOUPDATE_ASM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,94,172,57,10
END
IDD_MEM_VIEWER9 DIALOGEX 0, 0, 428, 178