From ae9cad072c368a4892645675edc5ae5d3c849c7c Mon Sep 17 00:00:00 2001 From: p989 Date: Fri, 3 Apr 2009 23:54:05 +0000 Subject: [PATCH] win32: debugging windows update in frames, 1 frame default --- desmume/src/windows/IORegView.cpp | 6 ++-- desmume/src/windows/disView.cpp | 12 +++---- desmume/src/windows/lightView.cpp | 6 ++-- desmume/src/windows/mapView.cpp | 6 ++-- desmume/src/windows/matrixView.cpp | 6 ++-- desmume/src/windows/memView.cpp | 12 +++---- desmume/src/windows/oamView.cpp | 6 ++-- desmume/src/windows/palView.cpp | 6 ++-- desmume/src/windows/resources.rc | 58 +++++++++++++++--------------- desmume/src/windows/tileView.cpp | 6 ++-- 10 files changed, 62 insertions(+), 62 deletions(-) diff --git a/desmume/src/windows/IORegView.cpp b/desmume/src/windows/IORegView.cpp index bbfe65eb1..157c9211d 100644 --- a/desmume/src/windows/IORegView.cpp +++ b/desmume/src/windows/IORegView.cpp @@ -103,7 +103,7 @@ BOOL CALLBACK IoregView_Proc (HWND hwnd, UINT message, WPARAM wParam, LPARAM lPa case WM_INITDIALOG : IORegView = new ioregview_struct; memset(IORegView, 0, sizeof(ioregview_struct)); - IORegView->autoup_secs = 5; + IORegView->autoup_secs = 1; SendMessage(GetDlgItem(hwnd, IDC_AUTO_UPDATE_SPIN), UDM_SETRANGE, 0, MAKELONG(99, 1)); SendMessage(GetDlgItem(hwnd, IDC_AUTO_UPDATE_SPIN), @@ -147,7 +147,7 @@ BOOL CALLBACK IoregView_Proc (HWND hwnd, UINT message, WPARAM wParam, LPARAM lPa EnableWindow(GetDlgItem(hwnd, IDC_AUTO_UPDATE_SECS), true); EnableWindow(GetDlgItem(hwnd, IDC_AUTO_UPDATE_SPIN), true); IORegView->autoup = TRUE; - SetTimer(hwnd, IDT_VIEW_IOREG, IORegView->autoup_secs*1000, (TIMERPROC) NULL); + SetTimer(hwnd, IDT_VIEW_IOREG, IORegView->autoup_secs*20, (TIMERPROC) NULL); return 1; case IDC_AUTO_UPDATE_SECS: { @@ -157,7 +157,7 @@ BOOL CALLBACK IoregView_Proc (HWND hwnd, UINT message, WPARAM wParam, LPARAM lPa IORegView->autoup_secs = t; if (IORegView->autoup) SetTimer(hwnd, IDT_VIEW_IOREG, - IORegView->autoup_secs*1000, (TIMERPROC) NULL); + IORegView->autoup_secs*20, (TIMERPROC) NULL); } } return 1; diff --git a/desmume/src/windows/disView.cpp b/desmume/src/windows/disView.cpp index 2454081d0..87c407ae7 100644 --- a/desmume/src/windows/disView.cpp +++ b/desmume/src/windows/disView.cpp @@ -299,7 +299,7 @@ BOOL CALLBACK ViewDisasm_ARM7Proc (HWND hwnd, UINT message, WPARAM wParam, LPARA DisView7 = new disview_struct; memset(DisView7, 0, sizeof(disview_struct)); DisView7->cpu = &NDS_ARM7; - DisView7->autoup_secs = 5; + DisView7->autoup_secs = 1; SendMessage(GetDlgItem(hwnd, IDC_AUTO_UPDATE_SPIN), UDM_SETRANGE, 0, MAKELONG(99, 1)); SendMessage(GetDlgItem(hwnd, IDC_AUTO_UPDATE_SPIN), @@ -378,7 +378,7 @@ BOOL CALLBACK ViewDisasm_ARM7Proc (HWND hwnd, UINT message, WPARAM wParam, LPARA EnableWindow(GetDlgItem(hwnd, IDC_AUTO_UPDATE_SECS), true); EnableWindow(GetDlgItem(hwnd, IDC_AUTO_UPDATE_SPIN), true); DisView7->autoup = TRUE; - SetTimer(hwnd, IDT_VIEW_DISASM7, DisView7->autoup_secs*1000, (TIMERPROC) NULL); + SetTimer(hwnd, IDT_VIEW_DISASM7, DisView7->autoup_secs*20, (TIMERPROC) NULL); return 1; case IDC_STEP : // TODO: draw in DD { @@ -442,7 +442,7 @@ BOOL CALLBACK ViewDisasm_ARM7Proc (HWND hwnd, UINT message, WPARAM wParam, LPARA DisView7->autoup_secs = t; if (DisView7->autoup) SetTimer(hwnd, IDT_VIEW_DISASM7, - DisView7->autoup_secs*1000, (TIMERPROC) NULL); + DisView7->autoup_secs*20, (TIMERPROC) NULL); } } return 1; @@ -543,7 +543,7 @@ BOOL CALLBACK ViewDisasm_ARM9Proc (HWND hwnd, UINT message, WPARAM wParam, LPARA DisView9 = new disview_struct; memset(DisView9, 0, sizeof(disview_struct)); DisView9->cpu = &NDS_ARM9; - DisView9->autoup_secs = 5; + DisView9->autoup_secs = 1; SendMessage(GetDlgItem(hwnd, IDC_AUTO_UPDATE_SPIN), UDM_SETRANGE, 0, MAKELONG(99, 1)); SendMessage(GetDlgItem(hwnd, IDC_AUTO_UPDATE_SPIN), @@ -622,7 +622,7 @@ BOOL CALLBACK ViewDisasm_ARM9Proc (HWND hwnd, UINT message, WPARAM wParam, LPARA EnableWindow(GetDlgItem(hwnd, IDC_AUTO_UPDATE_SECS), true); EnableWindow(GetDlgItem(hwnd, IDC_AUTO_UPDATE_SPIN), true); DisView9->autoup = TRUE; - SetTimer(hwnd, IDT_VIEW_DISASM9, DisView9->autoup_secs*1000, (TIMERPROC) NULL); + SetTimer(hwnd, IDT_VIEW_DISASM9, DisView9->autoup_secs*20, (TIMERPROC) NULL); return 1; case IDC_STEP : // TODO: draw in DD { @@ -686,7 +686,7 @@ BOOL CALLBACK ViewDisasm_ARM9Proc (HWND hwnd, UINT message, WPARAM wParam, LPARA DisView9->autoup_secs = t; if (DisView9->autoup) SetTimer(hwnd, IDT_VIEW_DISASM9, - DisView9->autoup_secs*1000, (TIMERPROC) NULL); + DisView9->autoup_secs*20, (TIMERPROC) NULL); } } return 1; diff --git a/desmume/src/windows/lightView.cpp b/desmume/src/windows/lightView.cpp index 011bdcb14..1d1037adb 100644 --- a/desmume/src/windows/lightView.cpp +++ b/desmume/src/windows/lightView.cpp @@ -107,7 +107,7 @@ BOOL CALLBACK ViewLightsProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM lPa case WM_INITDIALOG: LightsView = new lightsview_struct; memset(LightsView, 0, sizeof(lightsview_struct)); - LightsView->autoup_secs = 5; + LightsView->autoup_secs = 1; SendMessage(GetDlgItem(hwnd, IDC_AUTO_UPDATE_SPIN), UDM_SETRANGE, 0, MAKELONG(99, 1)); SendMessage(GetDlgItem(hwnd, IDC_AUTO_UPDATE_SPIN), @@ -156,7 +156,7 @@ BOOL CALLBACK ViewLightsProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM lPa EnableWindow(GetDlgItem(hwnd, IDC_AUTO_UPDATE_SECS), true); EnableWindow(GetDlgItem(hwnd, IDC_AUTO_UPDATE_SPIN), true); LightsView->autoup = TRUE; - SetTimer(hwnd, IDT_VIEW_LIGHTS, LightsView->autoup_secs*1000, (TIMERPROC) NULL); + SetTimer(hwnd, IDT_VIEW_LIGHTS, LightsView->autoup_secs*20, (TIMERPROC) NULL); return 1; case IDC_AUTO_UPDATE_SECS: { @@ -170,7 +170,7 @@ BOOL CALLBACK ViewLightsProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM lPa LightsView->autoup_secs = t; if (LightsView->autoup) SetTimer(hwnd, IDT_VIEW_LIGHTS, - LightsView->autoup_secs*1000, (TIMERPROC) NULL); + LightsView->autoup_secs*20, (TIMERPROC) NULL); } } return 1; diff --git a/desmume/src/windows/mapView.cpp b/desmume/src/windows/mapView.cpp index 0fff52893..a07e4c2f1 100644 --- a/desmume/src/windows/mapView.cpp +++ b/desmume/src/windows/mapView.cpp @@ -241,7 +241,7 @@ BOOL CALLBACK ViewMapsProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM lPara { MapView = new mapview_struct; memset(MapView, 0, sizeof(MapView)); - MapView->autoup_secs = 5; + MapView->autoup_secs = 1; SendMessage(GetDlgItem(hwnd, IDC_AUTO_UPDATE_SPIN), UDM_SETRANGE, 0, MAKELONG(99, 1)); SendMessage(GetDlgItem(hwnd, IDC_AUTO_UPDATE_SPIN), @@ -298,7 +298,7 @@ BOOL CALLBACK ViewMapsProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM lPara EnableWindow(GetDlgItem(hwnd, IDC_AUTO_UPDATE_SECS), true); EnableWindow(GetDlgItem(hwnd, IDC_AUTO_UPDATE_SPIN), true); MapView->autoup = TRUE; - SetTimer(hwnd, IDT_VIEW_MAP, MapView->autoup_secs*1000, (TIMERPROC) NULL); + SetTimer(hwnd, IDT_VIEW_MAP, MapView->autoup_secs*20, (TIMERPROC) NULL); return 1; case IDC_AUTO_UPDATE_SECS: { @@ -312,7 +312,7 @@ BOOL CALLBACK ViewMapsProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM lPara MapView->autoup_secs = t; if (MapView->autoup) SetTimer(hwnd, IDT_VIEW_MAP, - MapView->autoup_secs*1000, (TIMERPROC) NULL); + MapView->autoup_secs*20, (TIMERPROC) NULL); } } return 1; diff --git a/desmume/src/windows/matrixView.cpp b/desmume/src/windows/matrixView.cpp index 42bdca24a..12ee73150 100644 --- a/desmume/src/windows/matrixView.cpp +++ b/desmume/src/windows/matrixView.cpp @@ -151,7 +151,7 @@ BOOL CALLBACK ViewMatricesProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM l { MatrixView = new matrixview_struct; memset(MatrixView, 0, sizeof(matrixview_struct)); - MatrixView->autoup_secs = 5; + MatrixView->autoup_secs = 1; SendMessage(GetDlgItem(hwnd, IDC_AUTO_UPDATE_SPIN), UDM_SETRANGE, 0, MAKELONG(99, 1)); SendMessage(GetDlgItem(hwnd, IDC_AUTO_UPDATE_SPIN), @@ -222,7 +222,7 @@ BOOL CALLBACK ViewMatricesProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM l EnableWindow(GetDlgItem(hwnd, IDC_AUTO_UPDATE_SECS), true); EnableWindow(GetDlgItem(hwnd, IDC_AUTO_UPDATE_SPIN), true); MatrixView->autoup = TRUE; - SetTimer(hwnd, IDT_VIEW_MATRIX, MatrixView->autoup_secs*1000, (TIMERPROC) NULL); + SetTimer(hwnd, IDT_VIEW_MATRIX, MatrixView->autoup_secs*20, (TIMERPROC) NULL); return 1; case IDC_AUTO_UPDATE_SECS: { @@ -236,7 +236,7 @@ BOOL CALLBACK ViewMatricesProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM l MatrixView->autoup_secs = t; if (MatrixView->autoup) SetTimer(hwnd, IDT_VIEW_MATRIX, - MatrixView->autoup_secs*1000, (TIMERPROC) NULL); + MatrixView->autoup_secs*20, (TIMERPROC) NULL); } } return 1; diff --git a/desmume/src/windows/memView.cpp b/desmume/src/windows/memView.cpp index 215c0b18a..6d93291b0 100644 --- a/desmume/src/windows/memView.cpp +++ b/desmume/src/windows/memView.cpp @@ -218,7 +218,7 @@ BOOL CALLBACK ViewMem_ARM7Proc (HWND hwnd, UINT message, WPARAM wParam, LPARAM l MemView7 = new memview_struct; memset(MemView7, 0, sizeof(memview_struct)); MemView7->cpu = 1; - MemView7->autoup_secs = 5; + MemView7->autoup_secs = 1; SendMessage(GetDlgItem(hwnd, IDC_AUTO_UPDATE_SPIN), UDM_SETRANGE, 0, MAKELONG(99, 1)); SendMessage(GetDlgItem(hwnd, IDC_AUTO_UPDATE_SPIN), @@ -276,7 +276,7 @@ BOOL CALLBACK ViewMem_ARM7Proc (HWND hwnd, UINT message, WPARAM wParam, LPARAM l EnableWindow(GetDlgItem(hwnd, IDC_AUTO_UPDATE_SECS), true); EnableWindow(GetDlgItem(hwnd, IDC_AUTO_UPDATE_SPIN), true); MemView7->autoup = TRUE; - SetTimer(hwnd, IDT_VIEW_MEM7, MemView7->autoup_secs*1000, (TIMERPROC) NULL); + SetTimer(hwnd, IDT_VIEW_MEM7, MemView7->autoup_secs*20, (TIMERPROC) NULL); return 1; case IDC_AUTO_UPDATE_SECS: { @@ -290,7 +290,7 @@ BOOL CALLBACK ViewMem_ARM7Proc (HWND hwnd, UINT message, WPARAM wParam, LPARAM l MemView7->autoup_secs = t; if (MemView7->autoup) SetTimer(hwnd, IDT_VIEW_MEM7, - MemView7->autoup_secs*1000, (TIMERPROC) NULL); + MemView7->autoup_secs*20, (TIMERPROC) NULL); } } return 1; @@ -406,7 +406,7 @@ BOOL CALLBACK ViewMem_ARM9Proc (HWND hwnd, UINT message, WPARAM wParam, LPARAM l MemView9 = new memview_struct; memset(MemView9, 0, sizeof(memview_struct)); MemView9->cpu = 0; - MemView9->autoup_secs = 5; + MemView9->autoup_secs = 1; SendMessage(GetDlgItem(hwnd, IDC_AUTO_UPDATE_SPIN), UDM_SETRANGE, 0, MAKELONG(99, 1)); SendMessage(GetDlgItem(hwnd, IDC_AUTO_UPDATE_SPIN), @@ -464,7 +464,7 @@ BOOL CALLBACK ViewMem_ARM9Proc (HWND hwnd, UINT message, WPARAM wParam, LPARAM l EnableWindow(GetDlgItem(hwnd, IDC_AUTO_UPDATE_SECS), true); EnableWindow(GetDlgItem(hwnd, IDC_AUTO_UPDATE_SPIN), true); MemView9->autoup = TRUE; - SetTimer(hwnd, IDT_VIEW_MEM9, MemView9->autoup_secs*1000, (TIMERPROC) NULL); + SetTimer(hwnd, IDT_VIEW_MEM9, MemView9->autoup_secs*20, (TIMERPROC) NULL); return 1; case IDC_AUTO_UPDATE_SECS: { @@ -478,7 +478,7 @@ BOOL CALLBACK ViewMem_ARM9Proc (HWND hwnd, UINT message, WPARAM wParam, LPARAM l MemView9->autoup_secs = t; if (MemView9->autoup) SetTimer(hwnd, IDT_VIEW_MEM9, - MemView9->autoup_secs*1000, (TIMERPROC) NULL); + MemView9->autoup_secs*20, (TIMERPROC) NULL); } } return 1; diff --git a/desmume/src/windows/oamView.cpp b/desmume/src/windows/oamView.cpp index 466afb8d7..b41581ff4 100644 --- a/desmume/src/windows/oamView.cpp +++ b/desmume/src/windows/oamView.cpp @@ -226,7 +226,7 @@ BOOL CALLBACK ViewOAMProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam OAMView->oam = (OAM *)(ARM9Mem.ARM9_OAM); OAMView->gpu = MainScreen.gpu; - OAMView->autoup_secs = 5; + OAMView->autoup_secs = 1; SendMessage(GetDlgItem(hwnd, IDC_AUTO_UPDATE_SPIN), UDM_SETRANGE, 0, MAKELONG(99, 1)); SendMessage(GetDlgItem(hwnd, IDC_AUTO_UPDATE_SPIN), @@ -295,7 +295,7 @@ BOOL CALLBACK ViewOAMProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam EnableWindow(GetDlgItem(hwnd, IDC_AUTO_UPDATE_SECS), true); EnableWindow(GetDlgItem(hwnd, IDC_AUTO_UPDATE_SPIN), true); OAMView->autoup = TRUE; - SetTimer(hwnd, IDT_VIEW_OAM, OAMView->autoup_secs*1000, (TIMERPROC) NULL); + SetTimer(hwnd, IDT_VIEW_OAM, OAMView->autoup_secs*20, (TIMERPROC) NULL); return 1; case IDC_AUTO_UPDATE_SECS: { @@ -309,7 +309,7 @@ BOOL CALLBACK ViewOAMProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam OAMView->autoup_secs = t; if (OAMView->autoup) SetTimer(hwnd, IDT_VIEW_OAM, - OAMView->autoup_secs*1000, (TIMERPROC) NULL); + OAMView->autoup_secs*20, (TIMERPROC) NULL); } } return 1; diff --git a/desmume/src/windows/palView.cpp b/desmume/src/windows/palView.cpp index 12d91d9ae..f6222055c 100644 --- a/desmume/src/windows/palView.cpp +++ b/desmume/src/windows/palView.cpp @@ -96,7 +96,7 @@ BOOL CALLBACK ViewPalProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam PalView = new palview_struct; memset(PalView, 0, sizeof(palview_struct)); PalView->adr = (u16 *)ARM9Mem.ARM9_VMEM; - PalView->autoup_secs = 5; + PalView->autoup_secs = 1; SendMessage(GetDlgItem(hwnd, IDC_AUTO_UPDATE_SPIN), UDM_SETRANGE, 0, MAKELONG(99, 1)); SendMessage(GetDlgItem(hwnd, IDC_AUTO_UPDATE_SPIN), @@ -185,7 +185,7 @@ BOOL CALLBACK ViewPalProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam EnableWindow(GetDlgItem(hwnd, IDC_AUTO_UPDATE_SECS), true); EnableWindow(GetDlgItem(hwnd, IDC_AUTO_UPDATE_SPIN), true); PalView->autoup = TRUE; - SetTimer(hwnd, IDT_VIEW_PAL, PalView->autoup_secs*1000, (TIMERPROC) NULL); + SetTimer(hwnd, IDT_VIEW_PAL, PalView->autoup_secs*20, (TIMERPROC) NULL); return 1; case IDC_AUTO_UPDATE_SECS: { @@ -199,7 +199,7 @@ BOOL CALLBACK ViewPalProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam PalView->autoup_secs = t; if (PalView->autoup) SetTimer(hwnd, IDT_VIEW_PAL, - PalView->autoup_secs*1000, (TIMERPROC) NULL); + PalView->autoup_secs*20, (TIMERPROC) NULL); } } return 1; diff --git a/desmume/src/windows/resources.rc b/desmume/src/windows/resources.rc index ed4d27373..17a372c0b 100644 --- a/desmume/src/windows/resources.rc +++ b/desmume/src/windows/resources.rc @@ -908,7 +908,7 @@ BEGIN AUTOCHECKBOX "&Auto-update", IDC_AUTO_UPDATE, 285, 1, 54, 14, BS_AUTOCHECKBOX EDITTEXT IDC_AUTO_UPDATE_SECS, 340, 3, 12, 14, WS_DISABLED | ES_AUTOHSCROLL | ES_READONLY CONTROL "", IDC_AUTO_UPDATE_SPIN, UPDOWN_CLASS, WS_DISABLED | UDS_ARROWKEYS | UDS_AUTOBUDDY | UDS_SETBUDDYINT, 352, 2, 11, 14 - LTEXT "secs", IDC_STATIC, 364, 5, 16, 8, SS_LEFT + LTEXT "frames", IDC_STATIC, 364, 5, 16, 8, SS_LEFT EDITTEXT IDC_SETPNUM, 5, 170, 34, 14, WS_GROUP | ES_AUTOHSCROLL | ES_NUMBER | ES_UPPERCASE PUSHBUTTON "&Step", IDC_STEP, 41, 170, 50, 14, BS_PUSHBUTTON AUTOCHECKBOX "Autoupd asm", IDC_AUTOUPDATE_ASM, 94, 172, 57, 10, BS_AUTOCHECKBOX @@ -969,7 +969,7 @@ BEGIN LTEXT "", IDC_TMP, 327, 168, 40, 8, SS_LEFT EDITTEXT IDC_AUTO_UPDATE_SECS, 340, 3, 12, 14, WS_DISABLED | ES_AUTOHSCROLL | ES_READONLY CONTROL "", IDC_AUTO_UPDATE_SPIN, UPDOWN_CLASS, WS_DISABLED | UDS_ARROWKEYS | UDS_AUTOBUDDY | UDS_SETBUDDYINT, 352, 2, 11, 14 - LTEXT "secs", IDC_STATIC, 364, 5, 16, 8, SS_LEFT + LTEXT "frames", IDC_STATIC, 364, 5, 16, 8, SS_LEFT PUSHBUTTON "&Refresh", IDC_REFRESH, 162, 170, 50, 14, BS_PUSHBUTTON | BS_ICON EDITTEXT IDC_SETPNUM, 5, 170, 34, 14, WS_GROUP | ES_AUTOHSCROLL | ES_NUMBER | ES_UPPERCASE PUSHBUTTON "&Step", IDC_STEP, 41, 170, 50, 14, BS_PUSHBUTTON @@ -1031,7 +1031,7 @@ BEGIN AUTOCHECKBOX "&Auto-update", IDC_AUTO_UPDATE, 285, 1, 54, 14, BS_AUTOCHECKBOX EDITTEXT IDC_AUTO_UPDATE_SECS, 340, 3, 12, 14, WS_DISABLED | ES_AUTOHSCROLL | ES_READONLY CONTROL "", IDC_AUTO_UPDATE_SPIN, UPDOWN_CLASS, WS_DISABLED | UDS_ARROWKEYS | UDS_AUTOBUDDY | UDS_SETBUDDYINT, 352, 2, 11, 14 - LTEXT "secs", IDC_STATIC, 364, 5, 16, 8, SS_LEFT + LTEXT "frames", IDC_STATIC, 364, 5, 16, 8, SS_LEFT PUSHBUTTON "&Refresh", IDC_REFRESH, 162, 170, 50, 14, BS_PUSHBUTTON | BS_ICON EDITTEXT IDC_SETPNUM, 5, 170, 34, 14, WS_GROUP | ES_AUTOHSCROLL | ES_NUMBER | ES_UPPERCASE PUSHBUTTON "&Step", IDC_STEP, 41, 170, 50, 14, BS_PUSHBUTTON @@ -1094,7 +1094,7 @@ BEGIN AUTOCHECKBOX "&Auto-update", IDC_AUTO_UPDATE, 285, 1, 54, 14, BS_AUTOCHECKBOX EDITTEXT IDC_AUTO_UPDATE_SECS, 340, 3, 12, 14, WS_DISABLED | ES_AUTOHSCROLL | ES_READONLY CONTROL "", IDC_AUTO_UPDATE_SPIN, UPDOWN_CLASS, WS_DISABLED | UDS_ARROWKEYS | UDS_AUTOBUDDY | UDS_SETBUDDYINT, 352, 2, 11, 14 - LTEXT "secs", IDC_STATIC, 364, 5, 16, 8, SS_LEFT + LTEXT "frames", IDC_STATIC, 364, 5, 16, 8, SS_LEFT EDITTEXT IDC_SETPNUM, 5, 170, 34, 14, WS_GROUP | ES_AUTOHSCROLL | ES_NUMBER | ES_UPPERCASE PUSHBUTTON "&Step", IDC_STEP, 41, 170, 50, 14, BS_PUSHBUTTON AUTOCHECKBOX "Autoupd asm", IDC_AUTOUPDATE_ASM, 94, 172, 57, 10, BS_AUTOCHECKBOX @@ -1157,7 +1157,7 @@ BEGIN LTEXT "", IDC_TMP, 327, 168, 40, 8, SS_LEFT EDITTEXT IDC_AUTO_UPDATE_SECS, 340, 3, 12, 14, WS_DISABLED | ES_AUTOHSCROLL | ES_READONLY CONTROL "", IDC_AUTO_UPDATE_SPIN, UPDOWN_CLASS, WS_DISABLED | UDS_ARROWKEYS | UDS_AUTOBUDDY | UDS_SETBUDDYINT, 352, 2, 11, 14 - LTEXT "secs", IDC_STATIC, 364, 5, 16, 8, SS_LEFT + LTEXT "frames", IDC_STATIC, 364, 5, 16, 8, SS_LEFT PUSHBUTTON "&Refresh", IDC_REFRESH, 162, 170, 50, 14, BS_PUSHBUTTON | BS_ICON AUTOCHECKBOX "Autoupd asm", IDC_AUTOUPDATE_ASM, 94, 172, 57, 10, BS_AUTOCHECKBOX END @@ -1217,7 +1217,7 @@ BEGIN AUTOCHECKBOX "&Auto-update", IDC_AUTO_UPDATE, 285, 1, 54, 14, BS_AUTOCHECKBOX EDITTEXT IDC_AUTO_UPDATE_SECS, 340, 3, 12, 14, WS_DISABLED | ES_AUTOHSCROLL | ES_READONLY CONTROL "", IDC_AUTO_UPDATE_SPIN, UPDOWN_CLASS, WS_DISABLED | UDS_ARROWKEYS | UDS_AUTOBUDDY | UDS_SETBUDDYINT, 352, 2, 11, 14 - LTEXT "secs", IDC_STATIC, 364, 5, 16, 8, SS_LEFT + LTEXT "frames", IDC_STATIC, 364, 5, 16, 8, SS_LEFT PUSHBUTTON "&Refresh", IDC_REFRESH, 162, 170, 50, 14, BS_PUSHBUTTON | BS_ICON EDITTEXT IDC_SETPNUM, 5, 170, 34, 14, WS_GROUP | ES_AUTOHSCROLL | ES_NUMBER | ES_UPPERCASE PUSHBUTTON "&Step", IDC_STEP, 41, 170, 50, 14, BS_PUSHBUTTON @@ -1717,7 +1717,7 @@ BEGIN AUTOCHECKBOX "&Auto-update", IDC_AUTO_UPDATE, 32, 163, 54, 14, BS_AUTOCHECKBOX EDITTEXT IDC_AUTO_UPDATE_SECS, 87, 164, 12, 14, WS_DISABLED | ES_AUTOHSCROLL | ES_READONLY CONTROL "", IDC_AUTO_UPDATE_SPIN, UPDOWN_CLASS, WS_DISABLED | UDS_ARROWKEYS | UDS_AUTOBUDDY | UDS_SETBUDDYINT, 99, 164, 11, 14 - LTEXT "secs", IDC_STATIC, 111, 167, 16, 8, SS_LEFT + LTEXT "frames", IDC_STATIC, 111, 167, 16, 8, SS_LEFT PUSHBUTTON "&Fermer", IDC_FERMER, 50, 183, 50, 14, BS_PUSHBUTTON GROUPBOX "ARM9", IDC_STATIC, 4, 4, 142, 98 LTEXT "GXSTAT :", IDC_STATIC, 5, 92, 41, 8, SS_LEFT @@ -1766,7 +1766,7 @@ BEGIN AUTOCHECKBOX "&Auto-update", IDC_AUTO_UPDATE, 32, 163, 54, 14, BS_AUTOCHECKBOX EDITTEXT IDC_AUTO_UPDATE_SECS, 87, 164, 12, 14, WS_DISABLED | ES_AUTOHSCROLL | ES_READONLY CONTROL "", IDC_AUTO_UPDATE_SPIN, UPDOWN_CLASS, WS_DISABLED | UDS_ARROWKEYS | UDS_AUTOBUDDY | UDS_SETBUDDYINT, 99, 164, 11, 14 - LTEXT "secs", IDC_STATIC, 111, 167, 16, 8, SS_LEFT + LTEXT "frames", IDC_STATIC, 111, 167, 16, 8, SS_LEFT PUSHBUTTON "&Close", IDC_FERMER, 50, 183, 50, 14, BS_PUSHBUTTON GROUPBOX "ARM9", IDC_STATIC, 4, 4, 142, 98 LTEXT "GXSTAT :", IDC_STATIC, 5, 92, 41, 8, SS_LEFT @@ -1815,7 +1815,7 @@ BEGIN AUTOCHECKBOX "&Auto-update", IDC_AUTO_UPDATE, 32, 163, 54, 14, BS_AUTOCHECKBOX EDITTEXT IDC_AUTO_UPDATE_SECS, 87, 164, 12, 14, WS_DISABLED | ES_AUTOHSCROLL | ES_READONLY CONTROL "", IDC_AUTO_UPDATE_SPIN, UPDOWN_CLASS, WS_DISABLED | UDS_ARROWKEYS | UDS_AUTOBUDDY | UDS_SETBUDDYINT, 99, 164, 11, 14 - LTEXT "secs", IDC_STATIC, 111, 167, 16, 8, SS_LEFT + LTEXT "frames", IDC_STATIC, 111, 167, 16, 8, SS_LEFT PUSHBUTTON "&Luk", IDC_FERMER, 50, 183, 50, 14, BS_PUSHBUTTON GROUPBOX "ARM9", IDC_STATIC, 4, 4, 142, 98 LTEXT "GXSTAT :", IDC_STATIC, 5, 92, 41, 8, SS_LEFT @@ -1915,7 +1915,7 @@ BEGIN AUTOCHECKBOX "&Auto-update", IDC_AUTO_UPDATE, 13, 66, 54, 14, BS_AUTOCHECKBOX EDITTEXT IDC_AUTO_UPDATE_SECS, 68, 67, 12, 14, WS_DISABLED | ES_AUTOHSCROLL | ES_READONLY CONTROL "", IDC_AUTO_UPDATE_SPIN, UPDOWN_CLASS, WS_DISABLED | UDS_ARROWKEYS | UDS_AUTOBUDDY | UDS_SETBUDDYINT, 80, 67, 11, 14 - LTEXT "secs", IDC_STATIC, 92, 70, 16, 8, SS_LEFT + LTEXT "frames", IDC_STATIC, 92, 70, 16, 8, SS_LEFT END @@ -1945,7 +1945,7 @@ BEGIN AUTOCHECKBOX "&Auto-update", IDC_AUTO_UPDATE, 4, 92, 54, 14, BS_AUTOCHECKBOX EDITTEXT IDC_AUTO_UPDATE_SECS, 59, 93, 12, 14, WS_DISABLED | ES_AUTOHSCROLL | ES_READONLY CONTROL "", IDC_AUTO_UPDATE_SPIN, UPDOWN_CLASS, WS_DISABLED | UDS_ARROWKEYS | UDS_AUTOBUDDY | UDS_SETBUDDYINT, 71, 93, 11, 14 - LTEXT "secs", IDC_STATIC, 83, 96, 16, 8, SS_LEFT + LTEXT "frames", IDC_STATIC, 83, 96, 16, 8, SS_LEFT END @@ -1975,7 +1975,7 @@ BEGIN AUTOCHECKBOX "&Auto-update", IDC_AUTO_UPDATE, 4, 102, 54, 14, BS_AUTOCHECKBOX EDITTEXT IDC_AUTO_UPDATE_SECS, 59, 103, 12, 14, WS_DISABLED | ES_AUTOHSCROLL | ES_READONLY CONTROL "", IDC_AUTO_UPDATE_SPIN, UPDOWN_CLASS, WS_DISABLED | UDS_ARROWKEYS | UDS_AUTOBUDDY | UDS_SETBUDDYINT, 71, 103, 11, 14 - LTEXT "secs", IDC_STATIC, 83, 106, 16, 8, SS_LEFT + LTEXT "frames", IDC_STATIC, 83, 106, 16, 8, SS_LEFT LTEXT "Visible :", IDC_STATIC, 4, 50, 38, 8, SS_LEFT LTEXT "CHAR", IDC_CHAR, 47, 63, 85, 8, SS_LEFT END @@ -2007,7 +2007,7 @@ BEGIN AUTOCHECKBOX "&Auto-update", IDC_AUTO_UPDATE, 4, 92, 54, 14, BS_AUTOCHECKBOX EDITTEXT IDC_AUTO_UPDATE_SECS, 59, 93, 12, 14, WS_DISABLED | ES_AUTOHSCROLL | ES_READONLY CONTROL "", IDC_AUTO_UPDATE_SPIN, UPDOWN_CLASS, WS_DISABLED | UDS_ARROWKEYS | UDS_AUTOBUDDY | UDS_SETBUDDYINT, 71, 93, 11, 14 - LTEXT "secs", IDC_STATIC, 83, 96, 16, 8, SS_LEFT + LTEXT "frames", IDC_STATIC, 83, 96, 16, 8, SS_LEFT END @@ -2092,7 +2092,7 @@ BEGIN AUTOCHECKBOX "&Auto-update", IDC_AUTO_UPDATE, 13, 154, 54, 14, BS_AUTOCHECKBOX EDITTEXT IDC_AUTO_UPDATE_SECS, 68, 155, 12, 14, WS_DISABLED | ES_AUTOHSCROLL | ES_READONLY CONTROL "", IDC_AUTO_UPDATE_SPIN, UPDOWN_CLASS, WS_DISABLED | UDS_ARROWKEYS | UDS_AUTOBUDDY | UDS_SETBUDDYINT, 80, 155, 11, 14 - LTEXT "secs", IDC_STATIC, 92, 158, 16, 8, SS_LEFT + LTEXT "frames", IDC_STATIC, 92, 158, 16, 8, SS_LEFT END @@ -2114,7 +2114,7 @@ BEGIN AUTOCHECKBOX "&Auto-update", IDC_AUTO_UPDATE, 327, 1, 54, 14, BS_AUTOCHECKBOX EDITTEXT IDC_AUTO_UPDATE_SECS, 382, 2, 12, 14, WS_DISABLED | ES_AUTOHSCROLL | ES_READONLY CONTROL "", IDC_AUTO_UPDATE_SPIN, UPDOWN_CLASS, WS_DISABLED | UDS_ARROWKEYS | UDS_AUTOBUDDY | UDS_SETBUDDYINT, 394, 2, 11, 14 - LTEXT "secs", IDC_STATIC, 406, 5, 16, 8, SS_LEFT + LTEXT "frames", IDC_STATIC, 406, 5, 16, 8, SS_LEFT END @@ -2136,7 +2136,7 @@ BEGIN AUTOCHECKBOX "&Auto-update", IDC_AUTO_UPDATE, 327, 1, 54, 14, BS_AUTOCHECKBOX EDITTEXT IDC_AUTO_UPDATE_SECS, 382, 2, 12, 14, WS_DISABLED | ES_AUTOHSCROLL | ES_READONLY CONTROL "", IDC_AUTO_UPDATE_SPIN, UPDOWN_CLASS, WS_DISABLED | UDS_ARROWKEYS | UDS_AUTOBUDDY | UDS_SETBUDDYINT, 394, 2, 11, 14 - LTEXT "secs", IDC_STATIC, 406, 5, 16, 8, SS_LEFT + LTEXT "frames", IDC_STATIC, 406, 5, 16, 8, SS_LEFT END @@ -2158,7 +2158,7 @@ BEGIN AUTOCHECKBOX "&Auto-update", IDC_AUTO_UPDATE, 327, 1, 54, 14, BS_AUTOCHECKBOX EDITTEXT IDC_AUTO_UPDATE_SECS, 382, 2, 12, 14, WS_DISABLED | ES_AUTOHSCROLL | ES_READONLY CONTROL "", IDC_AUTO_UPDATE_SPIN, UPDOWN_CLASS, WS_DISABLED | UDS_ARROWKEYS | UDS_AUTOBUDDY | UDS_SETBUDDYINT, 394, 2, 11, 14 - LTEXT "secs", IDC_STATIC, 406, 5, 16, 8, SS_LEFT + LTEXT "frames", IDC_STATIC, 406, 5, 16, 8, SS_LEFT END @@ -2180,7 +2180,7 @@ BEGIN AUTOCHECKBOX "&Auto-update", IDC_AUTO_UPDATE, 327, 1, 54, 14, BS_AUTOCHECKBOX EDITTEXT IDC_AUTO_UPDATE_SECS, 382, 2, 12, 14, WS_DISABLED | ES_AUTOHSCROLL | ES_READONLY CONTROL "", IDC_AUTO_UPDATE_SPIN, UPDOWN_CLASS, WS_DISABLED | UDS_ARROWKEYS | UDS_AUTOBUDDY | UDS_SETBUDDYINT, 394, 2, 11, 14 - LTEXT "secs", IDC_STATIC, 406, 5, 16, 8, SS_LEFT + LTEXT "frames", IDC_STATIC, 406, 5, 16, 8, SS_LEFT END @@ -2202,7 +2202,7 @@ BEGIN AUTOCHECKBOX "&Auto-update", IDC_AUTO_UPDATE, 327, 1, 54, 14, BS_AUTOCHECKBOX EDITTEXT IDC_AUTO_UPDATE_SECS, 382, 2, 12, 14, WS_DISABLED | ES_AUTOHSCROLL | ES_READONLY CONTROL "", IDC_AUTO_UPDATE_SPIN, UPDOWN_CLASS, WS_DISABLED | UDS_ARROWKEYS | UDS_AUTOBUDDY | UDS_SETBUDDYINT, 394, 2, 11, 14 - LTEXT "secs", IDC_STATIC, 406, 5, 16, 8, SS_LEFT + LTEXT "frames", IDC_STATIC, 406, 5, 16, 8, SS_LEFT END @@ -2224,7 +2224,7 @@ BEGIN AUTOCHECKBOX "&Auto-update", IDC_AUTO_UPDATE, 327, 1, 54, 14, BS_AUTOCHECKBOX EDITTEXT IDC_AUTO_UPDATE_SECS, 382, 2, 12, 14, WS_DISABLED | ES_AUTOHSCROLL | ES_READONLY CONTROL "", IDC_AUTO_UPDATE_SPIN, UPDOWN_CLASS, WS_DISABLED | UDS_ARROWKEYS | UDS_AUTOBUDDY | UDS_SETBUDDYINT, 394, 2, 11, 14 - LTEXT "secs", IDC_STATIC, 406, 5, 16, 8, SS_LEFT + LTEXT "frames", IDC_STATIC, 406, 5, 16, 8, SS_LEFT END @@ -2260,7 +2260,7 @@ BEGIN AUTOCHECKBOX "&Auto-update", IDC_AUTO_UPDATE, 4, 161, 54, 14, BS_AUTOCHECKBOX EDITTEXT IDC_AUTO_UPDATE_SECS, 59, 162, 12, 14, WS_DISABLED | ES_AUTOHSCROLL | ES_READONLY CONTROL "", IDC_AUTO_UPDATE_SPIN, UPDOWN_CLASS, WS_DISABLED | UDS_ARROWKEYS | UDS_AUTOBUDDY | UDS_SETBUDDYINT, 71, 161, 11, 14 - LTEXT "secs", IDC_STATIC, 83, 163, 16, 8, SS_LEFT + LTEXT "frames", IDC_STATIC, 83, 163, 16, 8, SS_LEFT END @@ -2296,7 +2296,7 @@ BEGIN AUTOCHECKBOX "&Auto-update", IDC_AUTO_UPDATE, 4, 161, 54, 14, BS_AUTOCHECKBOX EDITTEXT IDC_AUTO_UPDATE_SECS, 59, 162, 12, 14, WS_DISABLED | ES_AUTOHSCROLL | ES_READONLY CONTROL "", IDC_AUTO_UPDATE_SPIN, UPDOWN_CLASS, WS_DISABLED | UDS_ARROWKEYS | UDS_AUTOBUDDY | UDS_SETBUDDYINT, 71, 161, 11, 14 - LTEXT "secs", IDC_STATIC, 83, 163, 16, 8, SS_LEFT + LTEXT "frames", IDC_STATIC, 83, 163, 16, 8, SS_LEFT END @@ -2332,7 +2332,7 @@ BEGIN AUTOCHECKBOX "&Auto-update", IDC_AUTO_UPDATE, 4, 161, 54, 14, BS_AUTOCHECKBOX EDITTEXT IDC_AUTO_UPDATE_SECS, 59, 162, 12, 14, WS_DISABLED | ES_AUTOHSCROLL | ES_READONLY CONTROL "", IDC_AUTO_UPDATE_SPIN, UPDOWN_CLASS, WS_DISABLED | UDS_ARROWKEYS | UDS_AUTOBUDDY | UDS_SETBUDDYINT, 71, 161, 11, 14 - LTEXT "secs", IDC_STATIC, 83, 163, 16, 8, SS_LEFT + LTEXT "frames", IDC_STATIC, 83, 163, 16, 8, SS_LEFT END @@ -2350,7 +2350,7 @@ BEGIN AUTOCHECKBOX "&Auto-update", IDC_AUTO_UPDATE, 13, 150, 54, 14, BS_AUTOCHECKBOX EDITTEXT IDC_AUTO_UPDATE_SECS, 68, 151, 12, 14, WS_DISABLED | ES_AUTOHSCROLL | ES_READONLY CONTROL "", IDC_AUTO_UPDATE_SPIN, UPDOWN_CLASS, WS_DISABLED | UDS_ARROWKEYS | UDS_AUTOBUDDY | UDS_SETBUDDYINT, 80, 151, 11, 14 - LTEXT "secs", IDC_STATIC, 92, 154, 16, 8, SS_LEFT + LTEXT "frames", IDC_STATIC, 92, 154, 16, 8, SS_LEFT END @@ -2368,7 +2368,7 @@ BEGIN AUTOCHECKBOX "&Auto-update", IDC_AUTO_UPDATE, 13, 150, 54, 14, BS_AUTOCHECKBOX EDITTEXT IDC_AUTO_UPDATE_SECS, 68, 151, 12, 14, WS_DISABLED | ES_AUTOHSCROLL | ES_READONLY CONTROL "", IDC_AUTO_UPDATE_SPIN, UPDOWN_CLASS, WS_DISABLED | UDS_ARROWKEYS | UDS_AUTOBUDDY | UDS_SETBUDDYINT, 80, 151, 11, 14 - LTEXT "secs", IDC_STATIC, 92, 154, 16, 8, SS_LEFT + LTEXT "frames", IDC_STATIC, 92, 154, 16, 8, SS_LEFT END @@ -2387,7 +2387,7 @@ BEGIN AUTOCHECKBOX "&Auto-update", IDC_AUTO_UPDATE2, 13, 150, 54, 14, BS_AUTOCHECKBOX EDITTEXT IDC_AUTO_UPDATE_SECS, 68, 151, 12, 14, WS_DISABLED | ES_AUTOHSCROLL | ES_READONLY CONTROL "", IDC_AUTO_UPDATE_SPIN, UPDOWN_CLASS, WS_DISABLED | UDS_ARROWKEYS | UDS_AUTOBUDDY | UDS_SETBUDDYINT, 80, 151, 11, 14 - LTEXT "secs", IDC_STATIC, 92, 154, 16, 8, SS_LEFT + LTEXT "frames", IDC_STATIC, 92, 154, 16, 8, SS_LEFT END @@ -2452,7 +2452,7 @@ BEGIN AUTOCHECKBOX "&Auto-update", IDC_AUTO_UPDATE, 349, 165, 54, 14, BS_AUTOCHECKBOX EDITTEXT IDC_AUTO_UPDATE_SECS, 404, 165, 12, 14, WS_DISABLED | ES_AUTOHSCROLL | ES_READONLY CONTROL "", IDC_AUTO_UPDATE_SPIN, UPDOWN_CLASS, WS_DISABLED | UDS_ARROWKEYS | UDS_AUTOBUDDY | UDS_SETBUDDYINT, 416, 164, 11, 14 - LTEXT "secs", IDC_STATIC, 428, 167, 16, 8, SS_LEFT + LTEXT "frames", IDC_STATIC, 428, 167, 16, 8, SS_LEFT END @@ -2477,7 +2477,7 @@ BEGIN AUTOCHECKBOX "&Auto-update", IDC_AUTO_UPDATE, 349, 165, 54, 14, BS_AUTOCHECKBOX EDITTEXT IDC_AUTO_UPDATE_SECS, 404, 165, 12, 14, WS_DISABLED | ES_AUTOHSCROLL | ES_READONLY CONTROL "", IDC_AUTO_UPDATE_SPIN, UPDOWN_CLASS, WS_DISABLED | UDS_ARROWKEYS | UDS_AUTOBUDDY | UDS_SETBUDDYINT, 416, 164, 11, 14 - LTEXT "secs", IDC_STATIC, 428, 167, 16, 8, SS_LEFT + LTEXT "frames", IDC_STATIC, 428, 167, 16, 8, SS_LEFT END @@ -2502,7 +2502,7 @@ BEGIN AUTOCHECKBOX "&Auto-update", IDC_AUTO_UPDATE, 349, 165, 54, 14, BS_AUTOCHECKBOX EDITTEXT IDC_AUTO_UPDATE_SECS, 404, 165, 12, 14, WS_DISABLED | ES_AUTOHSCROLL | ES_READONLY CONTROL "", IDC_AUTO_UPDATE_SPIN, UPDOWN_CLASS, WS_DISABLED | UDS_ARROWKEYS | UDS_AUTOBUDDY | UDS_SETBUDDYINT, 416, 164, 11, 14 - LTEXT "secs", IDC_STATIC, 428, 167, 16, 8, SS_LEFT + LTEXT "frames", IDC_STATIC, 428, 167, 16, 8, SS_LEFT END diff --git a/desmume/src/windows/tileView.cpp b/desmume/src/windows/tileView.cpp index 5ac79289f..208e95cd7 100644 --- a/desmume/src/windows/tileView.cpp +++ b/desmume/src/windows/tileView.cpp @@ -327,7 +327,7 @@ BOOL CALLBACK ViewTilesProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM lPar TileView->hwnd = hwnd; TileView->mem = ARM9Mem.ARM9_ABG; TileView->pal = ((u16 *)ARM9Mem.ARM9_VMEM); - TileView->autoup_secs = 5; + TileView->autoup_secs = 1; SendMessage(GetDlgItem(hwnd, IDC_AUTO_UPDATE_SPIN), UDM_SETRANGE, 0, MAKELONG(99, 1)); SendMessage(GetDlgItem(hwnd, IDC_AUTO_UPDATE_SPIN), @@ -442,7 +442,7 @@ BOOL CALLBACK ViewTilesProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM lPar EnableWindow(GetDlgItem(hwnd, IDC_AUTO_UPDATE_SECS), true); EnableWindow(GetDlgItem(hwnd, IDC_AUTO_UPDATE_SPIN), true); TileView->autoup = TRUE; - SetTimer(hwnd, IDT_VIEW_TILE, TileView->autoup_secs*1000, (TIMERPROC) NULL); + SetTimer(hwnd, IDT_VIEW_TILE, TileView->autoup_secs*20, (TIMERPROC) NULL); return 1; case IDC_AUTO_UPDATE_SECS: { @@ -456,7 +456,7 @@ BOOL CALLBACK ViewTilesProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM lPar TileView->autoup_secs = t; if (TileView->autoup) SetTimer(hwnd, IDT_VIEW_TILE, - TileView->autoup_secs*1000, (TIMERPROC) NULL); + TileView->autoup_secs*20, (TIMERPROC) NULL); } } return 1;