From: <ze...@us...> - 2010-10-27 01:48:10
|
Revision: 3833 http://desmume.svn.sourceforge.net/desmume/?rev=3833&view=rev Author: zeromus Date: 2010-10-27 01:48:02 +0000 (Wed, 27 Oct 2010) Log Message: ----------- merge 3814-3816, 3819-3822, 3824, 3831, 3832 to release branch Modified Paths: -------------- branches/release_0_9_7/desmume/src/GPU.cpp branches/release_0_9_7/desmume/src/Makefile.am branches/release_0_9_7/desmume/src/armcpu.cpp branches/release_0_9_7/desmume/src/utils/libfat/disc_io.h branches/release_0_9_7/desmume/src/utils/libfat/fatfile.cpp branches/release_0_9_7/desmume/src/windows/DeSmuME_2005.vcproj branches/release_0_9_7/desmume/src/windows/DeSmuME_2008.vcproj branches/release_0_9_7/desmume/src/windows/DeSmuME_2010.vcxproj branches/release_0_9_7/desmume/src/windows/DeSmuME_2010.vcxproj.filters branches/release_0_9_7/desmume/src/windows/hotkey.cpp branches/release_0_9_7/desmume/src/windows/hotkey.h branches/release_0_9_7/desmume/src/windows/ramwatch.cpp branches/release_0_9_7/desmume/src/windows/resource.h branches/release_0_9_7/desmume/src/windows/resources.rc Removed Paths: ------------- branches/release_0_9_7/desmume/src/utils/libfat/ndstypes.h Property Changed: ---------------- branches/release_0_9_7/desmume/ branches/release_0_9_7/desmume/src/ branches/release_0_9_7/desmume/src/Disassembler.cpp branches/release_0_9_7/desmume/src/FIFO.cpp branches/release_0_9_7/desmume/src/armcpu.cpp branches/release_0_9_7/desmume/src/bios.cpp branches/release_0_9_7/desmume/src/cli/main.cpp branches/release_0_9_7/desmume/src/cocoa/translations/English.lproj/Localizable.strings branches/release_0_9_7/desmume/src/cocoa/translations/English.lproj/MainMenu.nib/ branches/release_0_9_7/desmume/src/cocoa/translations/French.lproj/Localizable.strings branches/release_0_9_7/desmume/src/cocoa/translations/French.lproj/MainMenu.nib/ branches/release_0_9_7/desmume/src/cocoa/translations/Japanese.lproj/Localizable.strings branches/release_0_9_7/desmume/src/cocoa/translations/Japanese.lproj/MainMenu.nib/ branches/release_0_9_7/desmume/src/cp15.cpp branches/release_0_9_7/desmume/src/ctrlssdl.cpp branches/release_0_9_7/desmume/src/debug.cpp branches/release_0_9_7/desmume/src/fs-linux.cpp branches/release_0_9_7/desmume/src/fs-windows.cpp branches/release_0_9_7/desmume/src/gdbstub/gdbstub.cpp branches/release_0_9_7/desmume/src/sndsdl.cpp branches/release_0_9_7/desmume/src/windows/AboutBox.cpp branches/release_0_9_7/desmume/src/windows/CWindow.cpp branches/release_0_9_7/desmume/src/windows/FirmConfig.cpp branches/release_0_9_7/desmume/src/windows/IORegView.cpp branches/release_0_9_7/desmume/src/windows/colorctrl.cpp branches/release_0_9_7/desmume/src/windows/console.cpp branches/release_0_9_7/desmume/src/windows/defaultconfig/ branches/release_0_9_7/desmume/src/windows/defaultconfig/userconfig.h branches/release_0_9_7/desmume/src/windows/disView.cpp branches/release_0_9_7/desmume/src/windows/ginfo.cpp branches/release_0_9_7/desmume/src/windows/lightView.cpp branches/release_0_9_7/desmume/src/windows/mapView.cpp branches/release_0_9_7/desmume/src/windows/matrixView.cpp branches/release_0_9_7/desmume/src/windows/memView.cpp branches/release_0_9_7/desmume/src/windows/oamView.cpp branches/release_0_9_7/desmume/src/windows/palView.cpp branches/release_0_9_7/desmume/src/windows/snddx.cpp branches/release_0_9_7/desmume/src/windows/tileView.cpp branches/release_0_9_7/tools/ds_tests/armwrestler/ Property changes on: branches/release_0_9_7/desmume ___________________________________________________________________ Modified: svn:mergeinfo - /branches/release_0_9_3:2355 /branches/release_0_9_4:2665-2666 /branches/release_0_9_6/desmume:3520-3522,3563 /branches/rerecording_0_9_2:2049,2075,2081-2087,2089 + /branches/release_0_9_3:2355 /branches/release_0_9_4:2665-2666 /branches/release_0_9_6/desmume:3520-3522,3563 /branches/rerecording_0_9_2:2049,2075,2081-2087,2089 /trunk/desmume/src/desmume:3814-3816 Property changes on: branches/release_0_9_7/desmume/src ___________________________________________________________________ Modified: svn:mergeinfo - /branches/release_0_9_4/src:2665-2666 /branches/release_0_9_6/desmume/src:3520-3522,3563,3749 /branches/rerecording_0_9_2/src:2048-2049,2075,2081-2087,2089 + /branches/release_0_9_4/src:2665-2666 /branches/release_0_9_6/desmume/src:3520-3522,3563,3749 /branches/rerecording_0_9_2/src:2048-2049,2075,2081-2087,2089 /trunk/desmume/src:3814-3816,3819,3821-3822,3824,3831-3832 /trunk/desmume/src/desmume/src:3814-3816 Property changes on: branches/release_0_9_7/desmume/src/Disassembler.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/release_0_9_4/src/Disassembler.cpp:2665-2666 /branches/release_0_9_6/desmume/src/Disassembler.cpp:3520-3522,3563 /branches/rerecording_0_9_2/src/Disassembler.cpp:2075 + /branches/release_0_9_4/src/Disassembler.cpp:2665-2666 /branches/release_0_9_6/desmume/src/Disassembler.cpp:3520-3522,3563 /branches/rerecording_0_9_2/src/Disassembler.cpp:2075 /trunk/desmume/src/Disassembler.cpp:3814-3816,3819,3821-3822,3824,3831-3832 /trunk/desmume/src/desmume/src/Disassembler.cpp:3814-3816 Property changes on: branches/release_0_9_7/desmume/src/FIFO.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/release_0_9_4/src/FIFO.cpp:2665-2666 /branches/release_0_9_6/desmume/src/FIFO.cpp:3520-3522,3563 /branches/rerecording_0_9_2/src/FIFO.cpp:2075 + /branches/release_0_9_4/src/FIFO.cpp:2665-2666 /branches/release_0_9_6/desmume/src/FIFO.cpp:3520-3522,3563 /branches/rerecording_0_9_2/src/FIFO.cpp:2075 /trunk/desmume/src/FIFO.cpp:3814-3816,3819,3821-3822,3824,3831-3832 /trunk/desmume/src/desmume/src/FIFO.cpp:3814-3816 Modified: branches/release_0_9_7/desmume/src/GPU.cpp =================================================================== --- branches/release_0_9_7/desmume/src/GPU.cpp 2010-10-27 01:42:11 UTC (rev 3832) +++ branches/release_0_9_7/desmume/src/GPU.cpp 2010-10-27 01:48:02 UTC (rev 3833) @@ -196,6 +196,12 @@ { memset(g, 0, sizeof(GPU)); + //important for emulator stability for this to initialize, since we have to setup a table based on it + g->BLDALPHA_EVA = 0; + g->BLDALPHA_EVB = 0; + //make sure we have our blend table setup even if the game blends without setting the blend variables + g->updateBLDALPHA(); + g->setFinalColorBck_funcNum = 0; g->setFinalColor3d_funcNum = 0; g->setFinalColorSpr_funcNum = 0; Modified: branches/release_0_9_7/desmume/src/Makefile.am =================================================================== --- branches/release_0_9_7/desmume/src/Makefile.am 2010-10-27 01:42:11 UTC (rev 3832) +++ branches/release_0_9_7/desmume/src/Makefile.am 2010-10-27 01:48:02 UTC (rev 3833) @@ -74,7 +74,6 @@ utils/libfat/lock.cpp \ utils/libfat/lock.h \ utils/libfat/mem_allocate.h \ - utils/libfat/ndstypes.h \ utils/libfat/partition.cpp \ utils/libfat/partition.h \ addons.cpp addons.h \ Modified: branches/release_0_9_7/desmume/src/armcpu.cpp =================================================================== --- branches/release_0_9_7/desmume/src/armcpu.cpp 2010-10-27 01:42:11 UTC (rev 3832) +++ branches/release_0_9_7/desmume/src/armcpu.cpp 2010-10-27 01:48:02 UTC (rev 3833) @@ -215,8 +215,6 @@ void armcpu_init(armcpu_t *armcpu, u32 adr) { - u32 i; - armcpu->LDTBit = (armcpu->proc_ID==0); //Si ARM9 utiliser le syte v5 pour le load armcpu->intVector = 0xFFFF0000 * (armcpu->proc_ID==0); armcpu->waitIRQ = FALSE; @@ -227,12 +225,12 @@ // armcpu->irq_flag = 0; //#endif - for(i = 0; i < 15; ++i) + for(int i = 0; i < 16; ++i) { armcpu->R[i] = 0; if(armcpu->coproc[i]) free(armcpu->coproc[i]); armcpu->coproc[i] = NULL; - } + } armcpu->CPSR.val = armcpu->SPSR.val = SYS; Property changes on: branches/release_0_9_7/desmume/src/armcpu.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/release_0_9_4/src/armcpu.cpp:2665-2666 /branches/release_0_9_6/desmume/src/armcpu.cpp:3520-3522,3563 /branches/rerecording_0_9_2/src/armcpu.cpp:2075 + /branches/release_0_9_4/src/armcpu.cpp:2665-2666 /branches/release_0_9_6/desmume/src/armcpu.cpp:3520-3522,3563 /branches/rerecording_0_9_2/src/armcpu.cpp:2075 /trunk/desmume/src/armcpu.cpp:3814-3816,3819,3821-3822,3824,3831-3832 /trunk/desmume/src/desmume/src/armcpu.cpp:3814-3816 Property changes on: branches/release_0_9_7/desmume/src/bios.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/release_0_9_4/src/bios.cpp:2665-2666 /branches/release_0_9_6/desmume/src/bios.cpp:3520-3522,3563 /branches/rerecording_0_9_2/src/bios.cpp:2075 + /branches/release_0_9_4/src/bios.cpp:2665-2666 /branches/release_0_9_6/desmume/src/bios.cpp:3520-3522,3563 /branches/rerecording_0_9_2/src/bios.cpp:2075 /trunk/desmume/src/bios.cpp:3814-3816,3819,3821-3822,3824,3831-3832 /trunk/desmume/src/desmume/src/bios.cpp:3814-3816 Property changes on: branches/release_0_9_7/desmume/src/cli/main.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/release_0_9_4/src/cli/main.cpp:2665-2666 /branches/release_0_9_6/desmume/src/cli/main.cpp:3520-3522,3563 /branches/rerecording_0_9_2/src/cli/main.cpp:2075 + /branches/release_0_9_4/src/cli/main.cpp:2665-2666 /branches/release_0_9_6/desmume/src/cli/main.cpp:3520-3522,3563 /branches/rerecording_0_9_2/src/cli/main.cpp:2075 /trunk/desmume/src/cli/main.cpp:3814-3816,3819,3821-3822,3824,3831-3832 /trunk/desmume/src/desmume/src/cli/main.cpp:3814-3816 Property changes on: branches/release_0_9_7/desmume/src/cocoa/translations/English.lproj/Localizable.strings ___________________________________________________________________ Modified: svn:mergeinfo - /branches/release_0_9_4/src/cocoa/translations/English.lproj/Localizable.strings:2665-2666 /branches/release_0_9_6/desmume/src/cocoa/translations/English.lproj/Localizable.strings:3520-3522,3563 /branches/rerecording_0_9_2/src/cocoa/translations/English.lproj/Localizable.strings:2075 + /branches/release_0_9_4/src/cocoa/translations/English.lproj/Localizable.strings:2665-2666 /branches/release_0_9_6/desmume/src/cocoa/translations/English.lproj/Localizable.strings:3520-3522,3563 /branches/rerecording_0_9_2/src/cocoa/translations/English.lproj/Localizable.strings:2075 /trunk/desmume/src/cocoa/translations/English.lproj/Localizable.strings:3814-3816,3819,3821-3822,3824,3831-3832 /trunk/desmume/src/desmume/src/cocoa/translations/English.lproj/Localizable.strings:3814-3816 Property changes on: branches/release_0_9_7/desmume/src/cocoa/translations/English.lproj/MainMenu.nib ___________________________________________________________________ Modified: svn:mergeinfo - /branches/release_0_9_4/src/cocoa/translations/English.lproj/MainMenu.nib:2665-2666 /branches/release_0_9_6/desmume/src/cocoa/translations/English.lproj/MainMenu.nib:3520-3522,3563 /branches/rerecording_0_9_2/src/cocoa/translations/English.lproj/MainMenu.nib:2075 + /branches/release_0_9_4/src/cocoa/translations/English.lproj/MainMenu.nib:2665-2666 /branches/release_0_9_6/desmume/src/cocoa/translations/English.lproj/MainMenu.nib:3520-3522,3563 /branches/rerecording_0_9_2/src/cocoa/translations/English.lproj/MainMenu.nib:2075 /trunk/desmume/src/cocoa/translations/English.lproj/MainMenu.nib:3814-3816,3819,3821-3822,3824,3831-3832 /trunk/desmume/src/desmume/src/cocoa/translations/English.lproj/MainMenu.nib:3814-3816 Property changes on: branches/release_0_9_7/desmume/src/cocoa/translations/French.lproj/Localizable.strings ___________________________________________________________________ Modified: svn:mergeinfo - /branches/release_0_9_4/src/cocoa/translations/French.lproj/Localizable.strings:2665-2666 /branches/release_0_9_6/desmume/src/cocoa/translations/French.lproj/Localizable.strings:3520-3522,3563 /branches/rerecording_0_9_2/src/cocoa/translations/French.lproj/Localizable.strings:2075 + /branches/release_0_9_4/src/cocoa/translations/French.lproj/Localizable.strings:2665-2666 /branches/release_0_9_6/desmume/src/cocoa/translations/French.lproj/Localizable.strings:3520-3522,3563 /branches/rerecording_0_9_2/src/cocoa/translations/French.lproj/Localizable.strings:2075 /trunk/desmume/src/cocoa/translations/French.lproj/Localizable.strings:3814-3816,3819,3821-3822,3824,3831-3832 /trunk/desmume/src/desmume/src/cocoa/translations/French.lproj/Localizable.strings:3814-3816 Property changes on: branches/release_0_9_7/desmume/src/cocoa/translations/French.lproj/MainMenu.nib ___________________________________________________________________ Modified: svn:mergeinfo - /branches/release_0_9_4/src/cocoa/translations/French.lproj/MainMenu.nib:2665-2666 /branches/release_0_9_6/desmume/src/cocoa/translations/French.lproj/MainMenu.nib:3520-3522,3563 /branches/rerecording_0_9_2/src/cocoa/translations/French.lproj/MainMenu.nib:2075 + /branches/release_0_9_4/src/cocoa/translations/French.lproj/MainMenu.nib:2665-2666 /branches/release_0_9_6/desmume/src/cocoa/translations/French.lproj/MainMenu.nib:3520-3522,3563 /branches/rerecording_0_9_2/src/cocoa/translations/French.lproj/MainMenu.nib:2075 /trunk/desmume/src/cocoa/translations/French.lproj/MainMenu.nib:3814-3816,3819,3821-3822,3824,3831-3832 /trunk/desmume/src/desmume/src/cocoa/translations/French.lproj/MainMenu.nib:3814-3816 Property changes on: branches/release_0_9_7/desmume/src/cocoa/translations/Japanese.lproj/Localizable.strings ___________________________________________________________________ Modified: svn:mergeinfo - /branches/release_0_9_4/src/cocoa/translations/Japanese.lproj/Localizable.strings:2665-2666 /branches/release_0_9_6/desmume/src/cocoa/translations/Japanese.lproj/Localizable.strings:3520-3522,3563 /branches/rerecording_0_9_2/src/cocoa/translations/Japanese.lproj/Localizable.strings:2075 + /branches/release_0_9_4/src/cocoa/translations/Japanese.lproj/Localizable.strings:2665-2666 /branches/release_0_9_6/desmume/src/cocoa/translations/Japanese.lproj/Localizable.strings:3520-3522,3563 /branches/rerecording_0_9_2/src/cocoa/translations/Japanese.lproj/Localizable.strings:2075 /trunk/desmume/src/cocoa/translations/Japanese.lproj/Localizable.strings:3814-3816,3819,3821-3822,3824,3831-3832 /trunk/desmume/src/desmume/src/cocoa/translations/Japanese.lproj/Localizable.strings:3814-3816 Property changes on: branches/release_0_9_7/desmume/src/cocoa/translations/Japanese.lproj/MainMenu.nib ___________________________________________________________________ Modified: svn:mergeinfo - /branches/release_0_9_4/src/cocoa/translations/Japanese.lproj/MainMenu.nib:2665-2666 /branches/release_0_9_6/desmume/src/cocoa/translations/Japanese.lproj/MainMenu.nib:3520-3522,3563 /branches/rerecording_0_9_2/src/cocoa/translations/Japanese.lproj/MainMenu.nib:2075 + /branches/release_0_9_4/src/cocoa/translations/Japanese.lproj/MainMenu.nib:2665-2666 /branches/release_0_9_6/desmume/src/cocoa/translations/Japanese.lproj/MainMenu.nib:3520-3522,3563 /branches/rerecording_0_9_2/src/cocoa/translations/Japanese.lproj/MainMenu.nib:2075 /trunk/desmume/src/cocoa/translations/Japanese.lproj/MainMenu.nib:3814-3816,3819,3821-3822,3824,3831-3832 /trunk/desmume/src/desmume/src/cocoa/translations/Japanese.lproj/MainMenu.nib:3814-3816 Property changes on: branches/release_0_9_7/desmume/src/cp15.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/release_0_9_4/src/cp15.cpp:2665-2666 /branches/release_0_9_6/desmume/src/cp15.cpp:3520-3522,3563 /branches/rerecording_0_9_2/src/cp15.cpp:2075 + /branches/release_0_9_4/src/cp15.cpp:2665-2666 /branches/release_0_9_6/desmume/src/cp15.cpp:3520-3522,3563 /branches/rerecording_0_9_2/src/cp15.cpp:2075 /trunk/desmume/src/cp15.cpp:3814-3816,3819,3821-3822,3824,3831-3832 /trunk/desmume/src/desmume/src/cp15.cpp:3814-3816 Property changes on: branches/release_0_9_7/desmume/src/ctrlssdl.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/release_0_9_4/src/ctrlssdl.cpp:2665-2666 /branches/release_0_9_6/desmume/src/ctrlssdl.cpp:3520-3522,3563 /branches/rerecording_0_9_2/src/ctrlssdl.cpp:2075 + /branches/release_0_9_4/src/ctrlssdl.cpp:2665-2666 /branches/release_0_9_6/desmume/src/ctrlssdl.cpp:3520-3522,3563 /branches/rerecording_0_9_2/src/ctrlssdl.cpp:2075 /trunk/desmume/src/ctrlssdl.cpp:3814-3816,3819,3821-3822,3824,3831-3832 /trunk/desmume/src/desmume/src/ctrlssdl.cpp:3814-3816 Property changes on: branches/release_0_9_7/desmume/src/debug.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/release_0_9_4/src/debug.cpp:2665-2666 /branches/release_0_9_6/desmume/src/debug.cpp:3520-3522,3563 /branches/rerecording_0_9_2/src/debug.cpp:2075 + /branches/release_0_9_4/src/debug.cpp:2665-2666 /branches/release_0_9_6/desmume/src/debug.cpp:3520-3522,3563 /branches/rerecording_0_9_2/src/debug.cpp:2075 /trunk/desmume/src/debug.cpp:3814-3816,3819,3821-3822,3824,3831-3832 /trunk/desmume/src/desmume/src/debug.cpp:3814-3816 Property changes on: branches/release_0_9_7/desmume/src/fs-linux.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/release_0_9_4/src/fs-linux.cpp:2665-2666 /branches/release_0_9_6/desmume/src/fs-linux.cpp:3520-3522,3563 /branches/rerecording_0_9_2/src/fs-linux.cpp:2075 + /branches/release_0_9_4/src/fs-linux.cpp:2665-2666 /branches/release_0_9_6/desmume/src/fs-linux.cpp:3520-3522,3563 /branches/rerecording_0_9_2/src/fs-linux.cpp:2075 /trunk/desmume/src/desmume/src/fs-linux.cpp:3814-3816 /trunk/desmume/src/fs-linux.cpp:3814-3816,3819,3821-3822,3824,3831-3832 Property changes on: branches/release_0_9_7/desmume/src/fs-windows.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/release_0_9_4/src/fs-windows.cpp:2665-2666 /branches/release_0_9_6/desmume/src/fs-windows.cpp:3520-3522,3563 /branches/rerecording_0_9_2/src/fs-windows.cpp:2075 + /branches/release_0_9_4/src/fs-windows.cpp:2665-2666 /branches/release_0_9_6/desmume/src/fs-windows.cpp:3520-3522,3563 /branches/rerecording_0_9_2/src/fs-windows.cpp:2075 /trunk/desmume/src/desmume/src/fs-windows.cpp:3814-3816 /trunk/desmume/src/fs-windows.cpp:3814-3816,3819,3821-3822,3824,3831-3832 Property changes on: branches/release_0_9_7/desmume/src/gdbstub/gdbstub.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/release_0_9_4/src/gdbstub/gdbstub.cpp:2665-2666 /branches/release_0_9_6/desmume/src/gdbstub/gdbstub.cpp:3520-3522,3563 /branches/rerecording_0_9_2/src/gdbstub/gdbstub.cpp:2075 + /branches/release_0_9_4/src/gdbstub/gdbstub.cpp:2665-2666 /branches/release_0_9_6/desmume/src/gdbstub/gdbstub.cpp:3520-3522,3563 /branches/rerecording_0_9_2/src/gdbstub/gdbstub.cpp:2075 /trunk/desmume/src/desmume/src/gdbstub/gdbstub.cpp:3814-3816 /trunk/desmume/src/gdbstub/gdbstub.cpp:3814-3816,3819,3821-3822,3824,3831-3832 Property changes on: branches/release_0_9_7/desmume/src/sndsdl.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/release_0_9_4/src/sndsdl.cpp:2665-2666 /branches/release_0_9_6/desmume/src/sndsdl.cpp:3520-3522,3563 /branches/rerecording_0_9_2/src/sndsdl.cpp:2075 + /branches/release_0_9_4/src/sndsdl.cpp:2665-2666 /branches/release_0_9_6/desmume/src/sndsdl.cpp:3520-3522,3563 /branches/rerecording_0_9_2/src/sndsdl.cpp:2075 /trunk/desmume/src/desmume/src/sndsdl.cpp:3814-3816 /trunk/desmume/src/sndsdl.cpp:3814-3816,3819,3821-3822,3824,3831-3832 Modified: branches/release_0_9_7/desmume/src/utils/libfat/disc_io.h =================================================================== --- branches/release_0_9_7/desmume/src/utils/libfat/disc_io.h 2010-10-27 01:42:11 UTC (rev 3832) +++ branches/release_0_9_7/desmume/src/utils/libfat/disc_io.h 2010-10-27 01:48:02 UTC (rev 3833) @@ -30,8 +30,6 @@ #ifndef NDS_DISC_IO_INCLUDE #define NDS_DISC_IO_INCLUDE -#include "ndstypes.h" - #define FEATURE_MEDIUM_CANREAD 0x00000001 #define FEATURE_MEDIUM_CANWRITE 0x00000002 #define FEATURE_SLOT_GBA 0x00000010 Modified: branches/release_0_9_7/desmume/src/utils/libfat/fatfile.cpp =================================================================== --- branches/release_0_9_7/desmume/src/utils/libfat/fatfile.cpp 2010-10-27 01:42:11 UTC (rev 3832) +++ branches/release_0_9_7/desmume/src/utils/libfat/fatfile.cpp 2010-10-27 01:48:02 UTC (rev 3833) @@ -656,12 +656,9 @@ _FAT_lock(&partition->lock); // Only write up to the maximum file size, taking into account wrap-around of ints - // <zeromus> first `len` here was changed from `remain` which was a bug due to being used before being defined. - // this was a blind stab in the dark, I didnt think about it much. need to update this file when it is fixed in libnds trunk if (len + file->filesize > FILE_MAX_SIZE || len + file->filesize < file->filesize) { len = FILE_MAX_SIZE - file->filesize; } - remain = len; // Short circuit cases where len is 0 (or less) if (len <= 0) { @@ -669,6 +666,8 @@ return 0; } + remain = len; + // Get a new cluster for the start of the file if required if (file->startCluster == CLUSTER_FREE) { tempNextCluster = _FAT_fat_linkFreeCluster (partition, CLUSTER_FREE); Deleted: branches/release_0_9_7/desmume/src/utils/libfat/ndstypes.h =================================================================== Property changes on: branches/release_0_9_7/desmume/src/windows/AboutBox.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/release_0_9_4/src/windows/AboutBox.cpp:2665-2666 /branches/release_0_9_6/desmume/src/windows/AboutBox.cpp:3520-3522,3563 /branches/rerecording_0_9_2/src/windows/AboutBox.cpp:2075 + /branches/release_0_9_4/src/windows/AboutBox.cpp:2665-2666 /branches/release_0_9_6/desmume/src/windows/AboutBox.cpp:3520-3522,3563 /branches/rerecording_0_9_2/src/windows/AboutBox.cpp:2075 /trunk/desmume/src/desmume/src/windows/AboutBox.cpp:3814-3816 /trunk/desmume/src/windows/AboutBox.cpp:3814-3816,3819,3821-3822,3824,3831-3832 Property changes on: branches/release_0_9_7/desmume/src/windows/CWindow.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/release_0_9_4/src/windows/CWindow.cpp:2665-2666 /branches/release_0_9_6/desmume/src/windows/CWindow.cpp:3520-3522,3563 /branches/rerecording_0_9_2/src/windows/CWindow.cpp:2075 + /branches/release_0_9_4/src/windows/CWindow.cpp:2665-2666 /branches/release_0_9_6/desmume/src/windows/CWindow.cpp:3520-3522,3563 /branches/rerecording_0_9_2/src/windows/CWindow.cpp:2075 /trunk/desmume/src/desmume/src/windows/CWindow.cpp:3814-3816 /trunk/desmume/src/windows/CWindow.cpp:3814-3816,3819,3821-3822,3824,3831-3832 Modified: branches/release_0_9_7/desmume/src/windows/DeSmuME_2005.vcproj =================================================================== --- branches/release_0_9_7/desmume/src/windows/DeSmuME_2005.vcproj 2010-10-27 01:42:11 UTC (rev 3832) +++ branches/release_0_9_7/desmume/src/windows/DeSmuME_2005.vcproj 2010-10-27 01:48:02 UTC (rev 3833) @@ -1593,10 +1593,6 @@ > </File> <File - RelativePath="..\utils\libfat\ndstypes.h" - > - </File> - <File RelativePath="..\utils\libfat\partition.cpp" > </File> Modified: branches/release_0_9_7/desmume/src/windows/DeSmuME_2008.vcproj =================================================================== --- branches/release_0_9_7/desmume/src/windows/DeSmuME_2008.vcproj 2010-10-27 01:42:11 UTC (rev 3832) +++ branches/release_0_9_7/desmume/src/windows/DeSmuME_2008.vcproj 2010-10-27 01:48:02 UTC (rev 3833) @@ -1234,10 +1234,6 @@ > </File> <File - RelativePath="..\utils\libfat\ndstypes.h" - > - </File> - <File RelativePath="..\utils\libfat\partition.cpp" > </File> Modified: branches/release_0_9_7/desmume/src/windows/DeSmuME_2010.vcxproj =================================================================== --- branches/release_0_9_7/desmume/src/windows/DeSmuME_2010.vcxproj 2010-10-27 01:42:11 UTC (rev 3832) +++ branches/release_0_9_7/desmume/src/windows/DeSmuME_2010.vcxproj 2010-10-27 01:48:02 UTC (rev 3833) @@ -155,7 +155,9 @@ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectName)_x64_release</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='Dev+|x64'">$(ProjectName)_x64_dev+</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)_x64_debug</TargetName> - <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)</TargetName> + <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)_release</TargetName> + <TargetName Condition="'$(Configuration)|$(Platform)'=='Dev+|Win32'">$(ProjectName)_dev+</TargetName> + <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)_debug</TargetName> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <PreBuildEvent> @@ -208,7 +210,7 @@ <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> <WholeProgramOptimization>true</WholeProgramOptimization> <AdditionalIncludeDirectories>.;..;lua\include;glib-2.20.1\build;glib-2.20.1\build\glib;.\zlib123;.\zziplib;.\winpcap;userconfig;defaultconfig;.\7z;.\agg\include;.\agg\examples;.\wx\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;GLIB_STATIC_COMPILATION;WIN32;HAVE_LIBZ;NOMINMAX;RELEASE;NDEBUG;EXPERIMENTAL_WIFI_COMM;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;GLIB_STATIC_COMPILATION;WIN32;HAVE_LIBZ;NOMINMAX;RELEASE;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <StringPooling>true</StringPooling> <ExceptionHandling>Sync</ExceptionHandling> <StructMemberAlignment>Default</StructMemberAlignment> @@ -254,7 +256,7 @@ <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> <WholeProgramOptimization>false</WholeProgramOptimization> <AdditionalIncludeDirectories>.;..;lua\include;glib-2.20.1\build;glib-2.20.1\build\glib;.\zlib123;.\zziplib;.\winpcap;userconfig;defaultconfig;.\7z;.\agg\include;.\agg\examples;.\wx\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;GLIB_STATIC_COMPILATION;WIN32;HAVE_LIBZ;NOMINMAX;RELEASE;NDEBUG;FASTBUILD;DEVELOPER;EXPERIMENTAL_WIFI_COMM;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;GLIB_STATIC_COMPILATION;WIN32;HAVE_LIBZ;NOMINMAX;RELEASE;NDEBUG;FASTBUILD;DEVELOPER;%(PreprocessorDefinitions)</PreprocessorDefinitions> <StringPooling>true</StringPooling> <ExceptionHandling>Sync</ExceptionHandling> <StructMemberAlignment>Default</StructMemberAlignment> @@ -621,7 +623,6 @@ <ClInclude Include="..\utils\libfat\libfat_public_api.h" /> <ClInclude Include="..\utils\libfat\lock.h" /> <ClInclude Include="..\utils\libfat\mem_allocate.h" /> - <ClInclude Include="..\utils\libfat\ndstypes.h" /> <ClInclude Include="..\utils\libfat\partition.h" /> <ClInclude Include="..\version.h" /> <ClInclude Include="..\wifi.h" /> Modified: branches/release_0_9_7/desmume/src/windows/DeSmuME_2010.vcxproj.filters =================================================================== --- branches/release_0_9_7/desmume/src/windows/DeSmuME_2010.vcxproj.filters 2010-10-27 01:42:11 UTC (rev 3832) +++ branches/release_0_9_7/desmume/src/windows/DeSmuME_2010.vcxproj.filters 2010-10-27 01:48:02 UTC (rev 3833) @@ -771,9 +771,6 @@ <ClInclude Include="..\utils\datetime.h"> <Filter>Core\utils</Filter> </ClInclude> - <ClInclude Include="..\utils\libfat\ndstypes.h"> - <Filter>Core\utils\libfat</Filter> - </ClInclude> <ClInclude Include="..\utils\libfat\partition.h"> <Filter>Core\utils\libfat</Filter> </ClInclude> Property changes on: branches/release_0_9_7/desmume/src/windows/FirmConfig.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/release_0_9_4/src/windows/FirmConfig.cpp:2665-2666 /branches/release_0_9_6/desmume/src/windows/FirmConfig.cpp:3520-3522,3563 /branches/rerecording_0_9_2/src/windows/FirmConfig.cpp:2075 + /branches/release_0_9_4/src/windows/FirmConfig.cpp:2665-2666 /branches/release_0_9_6/desmume/src/windows/FirmConfig.cpp:3520-3522,3563 /branches/rerecording_0_9_2/src/windows/FirmConfig.cpp:2075 /trunk/desmume/src/desmume/src/windows/FirmConfig.cpp:3814-3816 /trunk/desmume/src/windows/FirmConfig.cpp:3814-3816,3819,3821-3822,3824,3831-3832 Property changes on: branches/release_0_9_7/desmume/src/windows/IORegView.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/release_0_9_4/src/windows/IORegView.cpp:2665-2666 /branches/release_0_9_6/desmume/src/windows/IORegView.cpp:3520-3522,3563 /branches/rerecording_0_9_2/src/windows/IORegView.cpp:2075 + /branches/release_0_9_4/src/windows/IORegView.cpp:2665-2666 /branches/release_0_9_6/desmume/src/windows/IORegView.cpp:3520-3522,3563 /branches/rerecording_0_9_2/src/windows/IORegView.cpp:2075 /trunk/desmume/src/desmume/src/windows/IORegView.cpp:3814-3816 /trunk/desmume/src/windows/IORegView.cpp:3814-3816,3819,3821-3822,3824,3831-3832 Property changes on: branches/release_0_9_7/desmume/src/windows/colorctrl.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/release_0_9_4/src/windows/colorctrl.cpp:2665-2666 /branches/release_0_9_6/desmume/src/windows/colorctrl.cpp:3520-3522,3563 /branches/rerecording_0_9_2/src/windows/colorctrl.cpp:2075 + /branches/release_0_9_4/src/windows/colorctrl.cpp:2665-2666 /branches/release_0_9_6/desmume/src/windows/colorctrl.cpp:3520-3522,3563 /branches/rerecording_0_9_2/src/windows/colorctrl.cpp:2075 /trunk/desmume/src/desmume/src/windows/colorctrl.cpp:3814-3816 /trunk/desmume/src/windows/colorctrl.cpp:3814-3816,3819,3821-3822,3824,3831-3832 Property changes on: branches/release_0_9_7/desmume/src/windows/console.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/release_0_9_4/src/windows/console.cpp:2665-2666 /branches/release_0_9_6/desmume/src/windows/console.cpp:3520-3522,3563 /branches/rerecording_0_9_2/src/windows/console.cpp:2075 + /branches/release_0_9_4/src/windows/console.cpp:2665-2666 /branches/release_0_9_6/desmume/src/windows/console.cpp:3520-3522,3563 /branches/rerecording_0_9_2/src/windows/console.cpp:2075 /trunk/desmume/src/desmume/src/windows/console.cpp:3814-3816 /trunk/desmume/src/windows/console.cpp:3814-3816,3819,3821-3822,3824,3831-3832 Property changes on: branches/release_0_9_7/desmume/src/windows/defaultconfig ___________________________________________________________________ Modified: svn:mergeinfo - /branches/release_0_9_4/src/windows/defaultconfig:2665-2666 /branches/release_0_9_6/desmume/src/windows/defaultconfig:3520-3522,3563 /branches/rerecording_0_9_2/src/windows/defaultconfig:2048*,2075* + /branches/release_0_9_4/src/windows/defaultconfig:2665-2666 /branches/release_0_9_6/desmume/src/windows/defaultconfig:3520-3522,3563 /branches/rerecording_0_9_2/src/windows/defaultconfig:2048*,2075* /trunk/desmume/src/desmume/src/windows/defaultconfig:3814-3816 /trunk/desmume/src/windows/defaultconfig:3814-3816,3819,3821-3822,3824,3831-3832 Property changes on: branches/release_0_9_7/desmume/src/windows/defaultconfig/userconfig.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/release_0_9_3/src/windows/defaultconfig/userconfig.h:2355 /branches/release_0_9_4/src/windows/defaultconfig/userconfig.h:2665-2666 /branches/release_0_9_6/desmume/src/windows/defaultconfig/userconfig.h:3520-3522,3563 /branches/rerecording_0_9_2/src/windows/defaultconfig/userconfig.h:2075 + /branches/release_0_9_3/src/windows/defaultconfig/userconfig.h:2355 /branches/release_0_9_4/src/windows/defaultconfig/userconfig.h:2665-2666 /branches/release_0_9_6/desmume/src/windows/defaultconfig/userconfig.h:3520-3522,3563 /branches/rerecording_0_9_2/src/windows/defaultconfig/userconfig.h:2075 /trunk/desmume/src/desmume/src/windows/defaultconfig/userconfig.h:3814-3816 /trunk/desmume/src/windows/defaultconfig/userconfig.h:3814-3816,3819,3821-3822,3824,3831-3832 Property changes on: branches/release_0_9_7/desmume/src/windows/disView.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/release_0_9_4/src/windows/disView.cpp:2665-2666 /branches/release_0_9_6/desmume/src/windows/disView.cpp:3520-3522,3563 /branches/rerecording_0_9_2/src/windows/disView.cpp:2075 + /branches/release_0_9_4/src/windows/disView.cpp:2665-2666 /branches/release_0_9_6/desmume/src/windows/disView.cpp:3520-3522,3563 /branches/rerecording_0_9_2/src/windows/disView.cpp:2075 /trunk/desmume/src/desmume/src/windows/disView.cpp:3814-3816 /trunk/desmume/src/windows/disView.cpp:3814-3816,3819,3821-3822,3824,3831-3832 Property changes on: branches/release_0_9_7/desmume/src/windows/ginfo.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/release_0_9_4/src/windows/ginfo.cpp:2665-2666 /branches/release_0_9_6/desmume/src/windows/ginfo.cpp:3520-3522,3563 /branches/rerecording_0_9_2/src/windows/ginfo.cpp:2075 + /branches/release_0_9_4/src/windows/ginfo.cpp:2665-2666 /branches/release_0_9_6/desmume/src/windows/ginfo.cpp:3520-3522,3563 /branches/rerecording_0_9_2/src/windows/ginfo.cpp:2075 /trunk/desmume/src/desmume/src/windows/ginfo.cpp:3814-3816 /trunk/desmume/src/windows/ginfo.cpp:3814-3816,3819,3821-3822,3824,3831-3832 Modified: branches/release_0_9_7/desmume/src/windows/hotkey.cpp =================================================================== --- branches/release_0_9_7/desmume/src/windows/hotkey.cpp 2010-10-27 01:42:11 UTC (rev 3832) +++ branches/release_0_9_7/desmume/src/windows/hotkey.cpp 2010-10-27 01:48:02 UTC (rev 3833) @@ -21,6 +21,7 @@ #include "hotkey.h" #include "main.h" +#include "CheatsWin.h" #include "NDSSystem.h" #include "saves.h" #include "inputdx.h" @@ -91,6 +92,11 @@ void OpenRecentROM(int listNum); OpenRecentROM(0); } +void HK_SearchCheats(int, bool justPressed) +{ + if (romloaded) + CheatsSearchDialog(MainWindow->getHWnd()); +} void HK_QuickScreenShot(int param, bool justPressed) { char buffer[MAX_PATH]; @@ -703,6 +709,13 @@ keys->LCDsSwap.page = HOTKEY_PAGE_MOVIE; keys->LCDsSwap.key = VK_NEXT; + keys->SearchCheats.handleKeyDown = HK_SearchCheats; + keys->SearchCheats.code = "SearchCheats"; + keys->SearchCheats.name = STRW(ID_LABEL_HK54); + keys->SearchCheats.page = HOTKEY_PAGE_MOVIE; + keys->SearchCheats.key = 'S'; + keys->SearchCheats.modifiers = CUSTKEY_CTRL_MASK; + keys->IncreaseVolume.handleKeyDown = HK_IncreaseVolume; keys->IncreaseVolume.code = "IncreaseVolume"; keys->IncreaseVolume.name = STRW(ID_LABEL_HK32); Modified: branches/release_0_9_7/desmume/src/windows/hotkey.h =================================================================== --- branches/release_0_9_7/desmume/src/windows/hotkey.h 2010-10-27 01:42:11 UTC (rev 3832) +++ branches/release_0_9_7/desmume/src/windows/hotkey.h 2010-10-27 01:48:02 UTC (rev 3833) @@ -94,6 +94,7 @@ SCustomKey StylusAutoHold; SCustomKey LCDsMode; SCustomKey LCDsSwap; + SCustomKey SearchCheats; SCustomKey IncreaseVolume; SCustomKey DecreaseVolume; SCustomKey LastItem; // dummy, must be last Property changes on: branches/release_0_9_7/desmume/src/windows/lightView.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/release_0_9_4/src/windows/lightView.cpp:2665-2666 /branches/release_0_9_6/desmume/src/windows/lightView.cpp:3520-3522,3563 /branches/rerecording_0_9_2/src/windows/lightView.cpp:2075 + /branches/release_0_9_4/src/windows/lightView.cpp:2665-2666 /branches/release_0_9_6/desmume/src/windows/lightView.cpp:3520-3522,3563 /branches/rerecording_0_9_2/src/windows/lightView.cpp:2075 /trunk/desmume/src/desmume/src/windows/lightView.cpp:3814-3816 /trunk/desmume/src/windows/lightView.cpp:3814-3816,3819,3821-3822,3824,3831-3832 Property changes on: branches/release_0_9_7/desmume/src/windows/mapView.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/release_0_9_4/src/windows/mapView.cpp:2665-2666 /branches/release_0_9_6/desmume/src/windows/mapView.cpp:3520-3522,3563 /branches/rerecording_0_9_2/src/windows/mapView.cpp:2075 + /branches/release_0_9_4/src/windows/mapView.cpp:2665-2666 /branches/release_0_9_6/desmume/src/windows/mapView.cpp:3520-3522,3563 /branches/rerecording_0_9_2/src/windows/mapView.cpp:2075 /trunk/desmume/src/desmume/src/windows/mapView.cpp:3814-3816 /trunk/desmume/src/windows/mapView.cpp:3814-3816,3819,3821-3822,3824,3831-3832 Property changes on: branches/release_0_9_7/desmume/src/windows/matrixView.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/release_0_9_4/src/windows/matrixView.cpp:2665-2666 /branches/release_0_9_6/desmume/src/windows/matrixView.cpp:3520-3522,3563 /branches/rerecording_0_9_2/src/windows/matrixView.cpp:2075 + /branches/release_0_9_4/src/windows/matrixView.cpp:2665-2666 /branches/release_0_9_6/desmume/src/windows/matrixView.cpp:3520-3522,3563 /branches/rerecording_0_9_2/src/windows/matrixView.cpp:2075 /trunk/desmume/src/desmume/src/windows/matrixView.cpp:3814-3816 /trunk/desmume/src/windows/matrixView.cpp:3814-3816,3819,3821-3822,3824,3831-3832 Property changes on: branches/release_0_9_7/desmume/src/windows/memView.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/release_0_9_4/src/windows/memView.cpp:2665-2666 /branches/release_0_9_6/desmume/src/windows/memView.cpp:3520-3522,3563 /branches/rerecording_0_9_2/src/windows/memView.cpp:2075 + /branches/release_0_9_4/src/windows/memView.cpp:2665-2666 /branches/release_0_9_6/desmume/src/windows/memView.cpp:3520-3522,3563 /branches/rerecording_0_9_2/src/windows/memView.cpp:2075 /trunk/desmume/src/desmume/src/windows/memView.cpp:3814-3816 /trunk/desmume/src/windows/memView.cpp:3814-3816,3819,3821-3822,3824,3831-3832 Property changes on: branches/release_0_9_7/desmume/src/windows/oamView.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/release_0_9_4/src/windows/oamView.cpp:2665-2666 /branches/release_0_9_6/desmume/src/windows/oamView.cpp:3520-3522,3563 /branches/rerecording_0_9_2/src/windows/oamView.cpp:2075 + /branches/release_0_9_4/src/windows/oamView.cpp:2665-2666 /branches/release_0_9_6/desmume/src/windows/oamView.cpp:3520-3522,3563 /branches/rerecording_0_9_2/src/windows/oamView.cpp:2075 /trunk/desmume/src/desmume/src/windows/oamView.cpp:3814-3816 /trunk/desmume/src/windows/oamView.cpp:3814-3816,3819,3821-3822,3824,3831-3832 Property changes on: branches/release_0_9_7/desmume/src/windows/palView.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/release_0_9_4/src/windows/palView.cpp:2665-2666 /branches/release_0_9_6/desmume/src/windows/palView.cpp:3520-3522,3563 /branches/rerecording_0_9_2/src/windows/palView.cpp:2075 + /branches/release_0_9_4/src/windows/palView.cpp:2665-2666 /branches/release_0_9_6/desmume/src/windows/palView.cpp:3520-3522,3563 /branches/rerecording_0_9_2/src/windows/palView.cpp:2075 /trunk/desmume/src/desmume/src/windows/palView.cpp:3814-3816 /trunk/desmume/src/windows/palView.cpp:3814-3816,3819,3821-3822,3824,3831-3832 Modified: branches/release_0_9_7/desmume/src/windows/ramwatch.cpp =================================================================== --- branches/release_0_9_7/desmume/src/windows/ramwatch.cpp 2010-10-27 01:42:11 UTC (rev 3832) +++ branches/release_0_9_7/desmume/src/windows/ramwatch.cpp 2010-10-27 01:48:02 UTC (rev 3833) @@ -1077,6 +1077,7 @@ memcpy(&(rswatches[watchIndex]),&(rswatches[watchIndex - 1]),sizeof(AddressWatcher)); memcpy(&(rswatches[watchIndex - 1]),tmp,sizeof(AddressWatcher)); free(tmp); + ListView_SetItemState(GetDlgItem(hDlg,IDC_WATCHLIST),watchIndex,0,LVIS_FOCUSED|LVIS_SELECTED); ListView_SetSelectionMark(GetDlgItem(hDlg,IDC_WATCHLIST),watchIndex-1); ListView_SetItemState(GetDlgItem(hDlg,IDC_WATCHLIST),watchIndex-1,LVIS_FOCUSED|LVIS_SELECTED,LVIS_FOCUSED|LVIS_SELECTED); ListView_SetItemCount(GetDlgItem(hDlg,IDC_WATCHLIST),WatchCount); @@ -1093,6 +1094,7 @@ memcpy(&(rswatches[watchIndex]),&(rswatches[watchIndex + 1]),sizeof(AddressWatcher)); memcpy(&(rswatches[watchIndex + 1]),tmp,sizeof(AddressWatcher)); free(tmp); + ListView_SetItemState(GetDlgItem(hDlg,IDC_WATCHLIST),watchIndex,0,LVIS_FOCUSED|LVIS_SELECTED); ListView_SetSelectionMark(GetDlgItem(hDlg,IDC_WATCHLIST),watchIndex+1); ListView_SetItemState(GetDlgItem(hDlg,IDC_WATCHLIST),watchIndex+1,LVIS_FOCUSED|LVIS_SELECTED,LVIS_FOCUSED|LVIS_SELECTED); ListView_SetItemCount(GetDlgItem(hDlg,IDC_WATCHLIST),WatchCount); Modified: branches/release_0_9_7/desmume/src/windows/resource.h =================================================================== --- branches/release_0_9_7/desmume/src/windows/resource.h 2010-10-27 01:42:11 UTC (rev 3832) +++ branches/release_0_9_7/desmume/src/windows/resource.h 2010-10-27 01:48:02 UTC (rev 3833) @@ -770,6 +770,7 @@ #define ID_LABEL_HK51 4515 #define ID_LABEL_HK52 4516 #define ID_LABEL_HK53 4517 +#define ID_LABEL_HK54 4519 #define ID_LABEL_HK13b 4518 #define IDD_MICROPHONE 5000 #define IDM_MICROPHONESETTINGS 5001 Modified: branches/release_0_9_7/desmume/src/windows/resources.rc =================================================================== --- branches/release_0_9_7/desmume/src/windows/resources.rc 2010-10-27 01:42:11 UTC (rev 3832) +++ branches/release_0_9_7/desmume/src/windows/resources.rc 2010-10-27 01:48:02 UTC (rev 3833) @@ -10529,6 +10529,8 @@ |