diff --git a/akiko.cpp b/akiko.cpp index 19262867b..d2117c5f2 100644 --- a/akiko.cpp +++ b/akiko.cpp @@ -1995,7 +1995,7 @@ static void REGPARAM2 akiko_bput (uaecptr addr, uae_u32 v) static void REGPARAM2 akiko_wput (uaecptr addr, uae_u32 v) { - addr &= 0xfff; + addr &= 0xffff; if (addr >= 0x8000) return; if((addr < 0x30 && AKIKO_DEBUG_IO)) { diff --git a/od-win32/resources/winuae_minimal.rc b/od-win32/resources/winuae_minimal.rc index 9074396dc..66712112d 100644 --- a/od-win32/resources/winuae_minimal.rc +++ b/od-win32/resources/winuae_minimal.rc @@ -2,8 +2,8 @@ // #pragma code_page(65001) -#include "resource.h" #include "winres.h" +#include "resource.h" ///////////////////////////////////////////////////////////////////////////// // English (United Kingdom) resources @@ -130,6 +130,13 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,87,77,104,12 CONTROL "ShapeShifter support [] Patches the system ROM for ShapeShifter compatibility.",IDC_KICKSHIFTER, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,195,77,106,13 + GROUPBOX "Advanced Custom ROM Settings",IDC_STATIC,0,98,394,59 + COMBOBOX IDC_CUSTOMROMSELECT,12,115,135,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + RTEXT "Address range",IDC_STATIC,158,115,54,15,SS_CENTERIMAGE + EDITTEXT IDC_ROM_ADDRESS,219,115,79,13,ES_AUTOHSCROLL + EDITTEXT IDC_ROM_ADDRESS2,306,115,79,13,ES_AUTOHSCROLL + EDITTEXT IDC_CUSTOMROMFILE,12,135,361,12,ES_AUTOHSCROLL + PUSHBUTTON "...",IDC_CUSTOMROMCHOOSER,376,132,10,15 GROUPBOX "Miscellaneous",IDC_STATIC,0,162,395,109 LTEXT "Cartridge ROM file:",IDC_FLASHTEXT2,12,177,265,10 COMBOBOX IDC_CARTFILE,12,190,361,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP @@ -143,13 +150,6 @@ BEGIN GROUPBOX "Advanced UAE expansion board/Boot ROM Settings",IDC_STATIC,0,274,395,36 COMBOBOX IDC_UAEBOARD_TYPE,96,289,155,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP RTEXT "Board type:",IDC_STATIC,20,287,67,15,SS_CENTERIMAGE - RTEXT "Address range",IDC_STATIC,158,115,54,15,SS_CENTERIMAGE - EDITTEXT IDC_ROM_ADDRESS,219,115,79,13,ES_AUTOHSCROLL - EDITTEXT IDC_ROM_ADDRESS2,306,115,79,13,ES_AUTOHSCROLL - COMBOBOX IDC_CUSTOMROMSELECT,12,115,135,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - GROUPBOX "Advanced Custom ROM Settings",IDC_STATIC,0,98,394,59 - EDITTEXT IDC_CUSTOMROMFILE,12,135,361,12,ES_AUTOHSCROLL - PUSHBUTTON "...",IDC_CUSTOMROMCHOOSER,376,132,10,15 END IDD_DISPLAY DIALOGEX 0, 0, 396, 316 @@ -161,38 +161,43 @@ BEGIN RTEXT "Fullscreen:",IDC_STATIC,3,35,51,15,SS_CENTERIMAGE COMBOBOX IDC_RESOLUTION,59,35,76,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_RESOLUTIONDEPTH,144,35,62,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_REFRESHRATE,288,36,97,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP RTEXT "Windowed:",IDC_STATIC,2,52,51,15,SS_CENTERIMAGE EDITTEXT IDC_XSIZE,59,54,43,12,ES_NUMBER EDITTEXT IDC_YSIZE,110,54,43,12,ES_NUMBER + CONTROL "Window resize",IDC_DISPLAY_RESIZE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,161,55,92,10 + CONTROL "VRR monitor. Do not tick!",IDC_DISPLAY_VARSYNC,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,58,71,112,10 + COMBOBOX IDC_REFRESHRATE,288,36,97,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_DISPLAY_BUFFERCNT,288,54,97,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP GROUPBOX "Settings",IDC_SETTINGSTEXT,1,90,283,183 RTEXT "Native:",IDC_STATIC,18,102,32,15,SS_CENTERIMAGE COMBOBOX IDC_SCREENMODE_NATIVE,54,102,71,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_SCREENMODE_NATIVE2,131,102,108,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_SCREENMODE_NATIVE3,246,102,31,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP RTEXT "RTG:",IDC_STATIC,19,119,31,15,SS_CENTERIMAGE COMBOBOX IDC_SCREENMODE_RTG,54,122,71,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_SCREENMODE_RTG2,131,122,107,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP CONTROL "Blacker than black [] Borderblanked black is blacker than display area black.",IDC_BLACKER_THAN_BLACK, "Button",BS_AUTOCHECKBOX | BS_LEFT | WS_TABSTOP,11,144,139,10 - CONTROL "Filtered low resolution [] When scaling hires to lores or superhires to hires, show average color of pixel instead of dropping every other pixel.",IDC_LORES_SMOOTHED, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,155,144,123,10 CONTROL "Remove interlace artifacts [] Emulates interlace mode internally as progressive, removing all interlace artifacts. Not compatible with all software.",IDC_FLICKERFIXER, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,158,139,10 + CONTROL "Monochrome video out",IDC_GRAYSCALE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,171,139,10 + CONTROL "Filtered low resolution [] When scaling hires to lores or superhires to hires, show average color of pixel instead of dropping every other pixel.",IDC_LORES_SMOOTHED, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,155,144,123,10 CONTROL "VGA mode resolution autoswitch [] Automatically selects between hires and superhires in programmed display modes, keeping correct aspect ratio.",IDC_AUTORESOLUTIONVGA, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,155,158,124,10 - CONTROL "Monochrome video out",IDC_GRAYSCALE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,171,139,10 - RTEXT "Resolution:",IDC_STATIC,24,196,110,8,SS_CENTERIMAGE - COMBOBOX IDC_LORES,142,195,127,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + RTEXT "Resolution:",IDC_STATIC,6,196,44,8,SS_CENTERIMAGE + COMBOBOX IDC_LORES,57,195,77,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + RTEXT "Overscan:",IDC_STATIC,145,196,43,8,SS_CENTERIMAGE + COMBOBOX IDC_OVERSCANMODE,197,194,80,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP RTEXT "Resolution autoswitch:",IDC_STATIC,92,216,110,8,SS_CENTERIMAGE - COMBOBOX IDC_AUTORESOLUTIONSELECT,210,215,59,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_AUTORESOLUTIONSELECT,214,215,63,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP RTEXT "Refresh:",IDC_REFRESHTEXT,11,235,57,8 CONTROL "Slider1",IDC_FRAMERATE,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,71,230,99,20 - COMBOBOX IDC_RATE2BOX,210,235,60,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_RATE2BOX,213,235,64,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP RTEXT "FPS adj.:",IDC_REFRESH2TEXT,9,256,61,8 CONTROL "",IDC_FRAMERATE2,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,71,251,99,20 - EDITTEXT IDC_RATE2TEXT,210,255,46,12,ES_AUTOHSCROLL - CONTROL "",IDC_RATE2ENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,261,256,8,10 + EDITTEXT IDC_RATE2TEXT,212,255,46,12,ES_AUTOHSCROLL + CONTROL "",IDC_RATE2ENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,265,256,8,10 COMBOBOX IDC_DA_MODE,15,280,71,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP CONTROL "",IDC_DA_SLIDER,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,96,276,96,20 EDITTEXT IDC_DA_TEXT,205,280,56,12,ES_AUTOHSCROLL | ES_READONLY @@ -211,9 +216,6 @@ BEGIN CONTROL "Double, frames",IDC_LM_IDOUBLED,"Button",BS_AUTORADIOBUTTON | BS_LEFT | WS_TABSTOP,299,255,90,10 CONTROL "Double, fields",IDC_LM_IDOUBLED2,"Button",BS_AUTORADIOBUTTON | BS_LEFT | WS_TABSTOP,299,268,90,10 CONTROL "Double, fields+",IDC_LM_IDOUBLED3,"Button",BS_AUTORADIOBUTTON | BS_LEFT | WS_TABSTOP,299,281,90,10 - CONTROL "VRR monitor. Do not tick!",IDC_DISPLAY_VARSYNC,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,58,71,112,10 - COMBOBOX IDC_SCREENMODE_NATIVE3,246,102,31,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP - CONTROL "Window resize",IDC_DISPLAY_RESIZE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,161,55,92,10 END IDD_MEMORY DIALOGEX 0, 0, 396, 316 @@ -248,14 +250,16 @@ BEGIN EDITTEXT IDC_AUTOCONFIG_PRODUCT,196,194,45,13,ES_AUTOHSCROLL RTEXT "Autoconfig data",IDC_STATIC,11,214,57,15,SS_CENTERIMAGE EDITTEXT IDC_AUTOCONFIG_DATA,78,213,164,13,ES_AUTOHSCROLL - CONTROL "Edit Autoconfig data",IDC_FASTMEMAUTOCONFIGUSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,261,196,103,8 - CONTROL "Manual configuration",IDC_FASTMEMNOAUTOCONFIG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,261,214,103,8 RTEXT "Memory board",IDC_STATIC,15,235,53,15,SS_CENTERIMAGE COMBOBOX IDC_MEMORYBOARDSELECT,77,235,165,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Z3 mapping mode:",IDC_STATIC,263,234,115,15,SS_CENTERIMAGE RTEXT "Address range",IDC_STATIC,10,256,57,15,SS_CENTERIMAGE EDITTEXT IDC_RAM_ADDRESS,77,256,79,13,ES_AUTOHSCROLL EDITTEXT IDC_RAM_ADDRESS2,164,256,79,13,ES_AUTOHSCROLL + CONTROL "Edit Autoconfig data",IDC_FASTMEMAUTOCONFIGUSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,261,190,103,8 + CONTROL "Manual configuration",IDC_FASTMEMNOAUTOCONFIG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,261,201,103,8 + CONTROL "DMA Capable",IDC_FASTMEMDMA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,261,213,103,8 + CONTROL "Force 16-bit",IDC_FASTMEMFORCE16,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,261,225,103,8 + LTEXT "Z3 mapping mode:",IDC_STATIC,263,236,115,15,SS_CENTERIMAGE COMBOBOX IDC_Z3MAPPING,262,256,117,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END @@ -273,15 +277,18 @@ BEGIN CONTROL "24-bit addressing",IDC_COMPATIBLE24,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,8,98,119,12 CONTROL "More compatible [] 68000: emulate prefetch. 68020+: emulate prefetch and instruction cache. More compatible but slower.",IDC_COMPATIBLE, "Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,8,111,118,12 + CONTROL "Data cache emulation [] 68030, 040 and 060 optional data cache emulation. Requires More compatible option.",IDC_CPUDATACACHE, + "Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,8,123,119,12 CONTROL "JIT [] Enable just-in-time CPU emulator. Significantly increases the speed of the CPU emulation. Requires 68020 or higher CPU.",IDC_JITENABLE, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,136,120,12 + CONTROL "Unimplemented CPU emu [] Emulate 68060 unimplemented integer instructions",IDC_CPU_UNIMPLEMENTED, + "Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,8,149,118,12 + GROUPBOX "MMU",IDC_STATIC,2,168,129,42,BS_LEFT CONTROL "None",IDC_MMUENABLEOFF,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,8,181,87,10 - CONTROL "EC [] 68EC030, 68EC040 and 68EC060 Transparent Translation Register emulation. Not compatible with JIT.",IDC_MMUENABLEEC, - "Button",BS_AUTORADIOBUTTON | WS_TABSTOP,73,195,48,10 CONTROL "MMU [] 68030, 68040 and 68060 MMU emulation. Not compatible with JIT.",IDC_MMUENABLE, "Button",BS_AUTORADIOBUTTON | WS_TABSTOP,8,195,49,10 - CONTROL "Unimplemented CPU emu [] Emulate 68060 unimplemented integer instructions",IDC_CPU_UNIMPLEMENTED, - "Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,8,149,118,12 + CONTROL "EC [] 68EC030, 68EC040 and 68EC060 Transparent Translation Register emulation. Not compatible with JIT.",IDC_MMUENABLEEC, + "Button",BS_AUTORADIOBUTTON | WS_TABSTOP,73,195,48,10 GROUPBOX "FPU",IDC_STATIC,1,212,129,103,BS_LEFT CONTROL "None",IDC_FPU0,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,8,223,87,10 CONTROL "68881",IDC_FPU1,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,8,236,87,10 @@ -291,15 +298,17 @@ BEGIN "Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,8,275,117,10 CONTROL "Unimplemented FPU emu [] Emulate FPU unimplemented instructions",IDC_FPU_UNIMPLEMENTED, "Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,8,287,116,10 + COMBOBOX IDC_FPU_MODE,7,299,112,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "CPU Emulation Speed",IDC_STATIC,136,1,258,97 CONTROL "Fastest possible",IDC_CS_HOST,"Button",BS_AUTORADIOBUTTON | BS_LEFT | WS_GROUP | WS_TABSTOP,143,19,195,10 CONTROL "Approximate A500/A1200 or cycle-exact",IDC_CS_68000, "Button",BS_AUTORADIOBUTTON | BS_LEFT | WS_TABSTOP,143,33,195,10 - CONTROL "Slider1",IDC_SPEED,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,142,50,192,20 - RTEXT "CPU Speed",IDC_STATIC,141,77,55,9,SS_CENTERIMAGE - EDITTEXT IDC_CPUTEXT,204,76,30,12,ES_CENTER | ES_READONLY - RTEXT "CPU Idle",IDC_STATIC,239,77,62,9 - CONTROL "",IDC_CPUIDLE,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,308,72,69,21 + CONTROL "Slider1",IDC_SPEED,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,142,50,205,20 + RTEXT "CPU Speed",IDC_STATIC,141,77,46,9,SS_CENTERIMAGE + EDITTEXT IDC_CPUTEXT,194,75,30,12,ES_CENTER | ES_READONLY + RTEXT "CPU Idle",IDC_STATIC,230,77,41,9 + CONTROL "",IDC_CPUIDLE,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,278,72,69,21 + EDITTEXT IDC_CPUIDLETEXT,356,75,30,12,ES_CENTER | ES_READONLY GROUPBOX "Cycle-exact CPU Emulation Speed",IDC_STATIC,136,100,258,42 RTEXT "CPU Frequency",IDC_STATIC,139,121,67,10,SS_CENTERIMAGE COMBOBOX IDC_CPU_FREQUENCY,215,120,89,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP @@ -323,10 +332,6 @@ BEGIN CONTROL "Direct",IDC_TRUST0,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,143,288,72,10 CONTROL "Indirect",IDC_TRUST1,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,221,288,72,10 CONTROL "No flags",IDC_NOFLAGS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,299,288,68,11 - GROUPBOX "MMU",IDC_STATIC,2,168,129,42,BS_LEFT - CONTROL "Data cache emulation [] 68030, 040 and 060 optional data cache emulation. Requires More compatible option.",IDC_CPUDATACACHE, - "Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,8,123,119,12 - COMBOBOX IDC_FPU_MODE,7,299,112,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "Catch unexpected exceptions",IDC_JITCRASH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,143,300,115,11 END @@ -337,8 +342,8 @@ BEGIN GROUPBOX "Floppy Drives",IDC_SETTINGSTEXT3,1,23,393,163 CONTROL "DF0:",IDC_DF0ENABLE,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,7,37,34,15 PUSHBUTTON "Delete save image",IDC_SAVEIMAGE0,69,36,78,15,NOT WS_VISIBLE - COMBOBOX IDC_DF0TYPE,152,37,65,50,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - RTEXT "Write-protected",IDC_STATIC,221,40,74,10,SS_CENTERIMAGE + COMBOBOX IDC_DF0TYPE,152,37,76,50,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + RTEXT "Write-protected",IDC_STATIC,229,40,66,10,SS_CENTERIMAGE CONTROL "",IDC_DF0WP,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,300,36,10,15 PUSHBUTTON "?",IDC_INFO0,323,35,17,15 PUSHBUTTON "Eject",IDC_EJECT0,345,35,30,15 @@ -346,8 +351,8 @@ BEGIN COMBOBOX IDC_DF0TEXT,6,54,384,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP CONTROL "DF1:",IDC_DF1ENABLE,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,7,74,34,15 PUSHBUTTON "Delete save image",IDC_SAVEIMAGE1,69,72,78,15,NOT WS_VISIBLE - COMBOBOX IDC_DF1TYPE,152,74,65,50,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - RTEXT "Write-protected",IDC_STATIC,221,76,74,10,SS_CENTERIMAGE + COMBOBOX IDC_DF1TYPE,152,74,76,50,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + RTEXT "Write-protected",IDC_STATIC,229,76,66,10,SS_CENTERIMAGE CONTROL "",IDC_DF1WP,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,300,73,10,15 PUSHBUTTON "?",IDC_INFO1,323,72,17,15 PUSHBUTTON "Eject",IDC_EJECT1,345,72,30,15 @@ -355,8 +360,8 @@ BEGIN COMBOBOX IDC_DF1TEXT,6,91,383,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP CONTROL "DF2:",IDC_DF2ENABLE,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,7,110,34,15 PUSHBUTTON "Delete save image",IDC_SAVEIMAGE2,69,108,78,15,NOT WS_VISIBLE - COMBOBOX IDC_DF2TYPE,152,110,65,50,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - RTEXT "Write-protected",IDC_STATIC,222,111,73,10,SS_CENTERIMAGE + COMBOBOX IDC_DF2TYPE,152,110,76,50,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + RTEXT "Write-protected",IDC_STATIC,229,111,66,10,SS_CENTERIMAGE CONTROL "",IDC_DF2WP,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,300,109,9,15 PUSHBUTTON "?",IDC_INFO2,323,108,17,15 PUSHBUTTON "Eject",IDC_EJECT2,345,108,30,15 @@ -364,8 +369,8 @@ BEGIN COMBOBOX IDC_DF2TEXT,6,127,384,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP CONTROL "DF3:",IDC_DF3ENABLE,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,7,146,34,15 PUSHBUTTON "Delete save image",IDC_SAVEIMAGE3,69,144,78,15,NOT WS_VISIBLE - COMBOBOX IDC_DF3TYPE,152,146,65,50,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - RTEXT "Write-protected",IDC_STATIC,222,148,73,10,SS_CENTERIMAGE + COMBOBOX IDC_DF3TYPE,152,146,76,50,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + RTEXT "Write-protected",IDC_STATIC,229,148,66,10,SS_CENTERIMAGE CONTROL "",IDC_DF3WP,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,300,146,9,15 PUSHBUTTON "?",IDC_INFO3,323,145,17,15 PUSHBUTTON "Eject",IDC_EJECT3,345,144,30,15 @@ -430,6 +435,7 @@ BEGIN CONTROL "Enabled",IDC_SOUND2,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,13,72,108,10 CONTROL "Automatic switching",IDC_SOUND_AUTO,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,13,90,108,10 CONTROL "Include CD and FMV audio",IDC_SOUND_CDPAULAMIX,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,13,103,108,10 + CONTROL "Volume Counter mode",IDC_SOUND_VOLCNT,"Button",BS_AUTOCHECKBOX | BS_LEFT | NOT WS_VISIBLE | WS_GROUP | WS_TABSTOP,13,123,108,10 GROUPBOX "Volume",IDC_STATIC,139,28,255,69 RTEXT "Master",IDC_STATIC,160,47,51,10,SS_CENTERIMAGE CONTROL "",IDC_SOUNDVOLUME,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,215,41,105,20 @@ -469,7 +475,6 @@ BEGIN CONTROL "WASAPI",IDC_SOUND_WASAPI,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,292,257,98,10 CONTROL "OpenAL",IDC_SOUND_OPENAL,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,292,271,98,10 CONTROL "PortAudio",IDC_SOUND_PORTAUDIO,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,292,285,98,10 - CONTROL "Volume Counter mode",IDC_SOUND_VOLCNT,"Button",BS_AUTOCHECKBOX | BS_LEFT | NOT WS_VISIBLE | WS_GROUP | WS_TABSTOP,13,123,108,10 END IDD_LOADSAVE DIALOGEX 0, 0, 396, 316 @@ -594,11 +599,11 @@ BEGIN CONTROL "",IDC_RICHEDIT1,"RICHEDIT",TCS_SCROLLOPPOSITE | TCS_RAGGEDRIGHT | TCS_MULTISELECT | WS_DISABLED,65,36,210,35 CONTROL "",IDC_RICHEDIT2,"RICHEDIT",TCS_SCROLLOPPOSITE | TCS_RAGGEDRIGHT | TCS_MULTISELECT | WS_DISABLED,1,84,343,28 PUSHBUTTON "Contributors",IDC_CONTRIBUTORS,132,126,80,15 + CONTROL "",IDC_CLOANTOHOME,"RICHEDIT",TCS_SCROLLOPPOSITE | TCS_RAGGEDRIGHT | TCS_MULTISELECT | WS_DISABLED,2,194,112,24 CONTROL "",IDC_AMIGAHOME,"RICHEDIT",TCS_SCROLLOPPOSITE | TCS_RAGGEDRIGHT | TCS_MULTISELECT | WS_DISABLED,116,194,112,24 CONTROL "",IDC_WINUAEHOME,"RICHEDIT",TCS_SCROLLOPPOSITE | TCS_RAGGEDRIGHT | TCS_MULTISELECT | WS_DISABLED,231,194,112,24 - CONTROL "",IDC_CAPS,"RICHEDIT",TCS_SCROLLOPPOSITE | TCS_RAGGEDRIGHT | TCS_MULTISELECT | WS_DISABLED,174,222,112,24 CONTROL "",IDC_ABIME,"RICHEDIT",TCS_SCROLLOPPOSITE | TCS_RAGGEDRIGHT | TCS_MULTISELECT | WS_DISABLED,60,222,112,24 - CONTROL "",IDC_CLOANTOHOME,"RICHEDIT",TCS_SCROLLOPPOSITE | TCS_RAGGEDRIGHT | TCS_MULTISELECT | WS_DISABLED,2,194,112,24 + CONTROL "",IDC_CAPS,"RICHEDIT",TCS_SCROLLOPPOSITE | TCS_RAGGEDRIGHT | TCS_MULTISELECT | WS_DISABLED,174,222,112,24 CONTROL "",IDC_AMIGASYS,"RICHEDIT",TCS_SCROLLOPPOSITE | TCS_RAGGEDRIGHT | TCS_MULTISELECT | WS_DISABLED,2,251,112,24 CONTROL "",IDC_AMIKIT,"RICHEDIT",TCS_SCROLLOPPOSITE | TCS_RAGGEDRIGHT | TCS_MULTISELECT | WS_DISABLED,231,251,112,24 END @@ -610,20 +615,22 @@ BEGIN CONTROL "",IDC_MISCLIST,"SysListView32",LVS_REPORT | LVS_ALIGNLEFT | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,3,5,258,232 GROUPBOX "Miscellaneous Options",IDC_STATIC,266,2,128,123 CTEXT "SCSI and CD/DVD access:",IDC_STATIC,272,14,117,10,SS_CENTERIMAGE - COMBOBOX IDC_SCSIMODE,287,28,87,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_SCSIMODE,273,28,114,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CTEXT "Windowed style:",IDC_STATIC,272,45,117,10,SS_CENTERIMAGE - COMBOBOX IDC_WINDOWEDMODE,287,59,87,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_WINDOWEDMODE,273,59,114,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP CTEXT "Graphics API:",IDC_STATIC,272,76,117,10,SS_CENTERIMAGE - COMBOBOX IDC_DXMODE,287,89,87,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_DXMODE_OPTIONS,287,107,87,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_DXMODE,273,89,114,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_DXMODE_OPTIONS,273,107,114,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP GROUPBOX "GUI",IDC_STATIC,266,125,128,112 COMBOBOX IDC_LANGUAGE,273,138,114,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "GUI Font...",IDC_GUI_FONT,272,155,54,14 PUSHBUTTON "Set default",IDC_GUI_DEFAULT,272,174,54,14 COMBOBOX IDC_GUI_SIZE,333,175,54,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Reset list customizations",IDC_GUI_LVDEFAULT,272,192,115,14 CONTROL "Resizeable GUI",IDC_GUI_RESIZE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,273,209,114,11 CONTROL "Fullscreen GUI",IDC_GUI_FULLSCREEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,273,222,114,11 GROUPBOX "State Files",IDC_STATIC,1,242,393,38 + COMBOBOX IDC_STATENAME,5,258,232,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP CONTROL "",IDC_STATECLEAR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,244,261,9,10 PUSHBUTTON "Load state...",IDC_DOLOADSTATE,257,257,65,14 PUSHBUTTON "Save state...",IDC_DOSAVESTATE,325,257,65,14 @@ -632,8 +639,6 @@ BEGIN COMBOBOX IDC_KBLED2,97,295,64,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_KBLED3,184,295,64,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "USB mode",IDC_KBLED_USB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,296,64,11 - COMBOBOX IDC_STATENAME,5,258,232,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Reset list customizations",IDC_GUI_LVDEFAULT,272,192,115,14 END IDD_HARDFILE DIALOGEX 0, 0, 397, 292 @@ -646,6 +651,9 @@ BEGIN RTEXT "Path:",IDC_HARDFILE_DIR_TEXT,10,18,37,10 COMBOBOX IDC_PATH_NAME,52,15,325,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "...",IDC_SELECTOR,380,14,11,15 + RTEXT "Geometry:",IDC_STATIC,6,34,41,10 + COMBOBOX IDC_PATH_GEOMETRY,52,32,325,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "...",IDC_PATH_GEOMETRY_SELECTOR,380,31,11,15 RTEXT "FileSys:",IDC_HARDFILE_FILESYS_TEXT,13,52,34,10 COMBOBOX IDC_PATH_FILESYS,51,49,325,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "...",IDC_FILESYS_SELECTOR,380,48,11,15 @@ -686,9 +694,6 @@ BEGIN PUSHBUTTON "OK",IDOK,147,271,50,14 PUSHBUTTON "Cancel",IDCANCEL,203,271,50,14 RTEXT "Cylinders:",IDC_CYLINDERS_TEXT,300,128,43,10,NOT WS_VISIBLE - COMBOBOX IDC_PATH_GEOMETRY,52,32,325,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "...",IDC_PATH_GEOMETRY_SELECTOR,380,31,11,15 - RTEXT "Geometry:",IDC_STATIC,6,34,41,10 END IDD_FILESYS DIALOGEX 15, 25, 396, 111 @@ -758,12 +763,15 @@ BEGIN COMBOBOX IDC_CS_EXT,116,129,88,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Options",IDC_STATIC,221,20,173,137 CONTROL "Keyboard connected",IDC_KEYBOARD_CONNECTED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,234,35,150,10 + CONTROL "Subpixel display emulation",IDC_SUBPIXEL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,234,48,150,10 CONTROL "Immediate Blitter [] Faster but less compatible blitter emulation.",IDC_BLITIMM, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,234,62,150,10 CONTROL "Wait for Blitter [] Compatibility hack for programs that don't wait for the blitter correctly, causing graphics corruption if CPU is too fast.",IDC_BLITWAIT, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,234,75,150,10 - LTEXT "Monitor:",IDC_STATIC,240,139,68,15,SS_CENTERIMAGE,WS_EX_RIGHT + LTEXT "Video port display hardware:",IDC_STATIC,241,105,117,15,SS_CENTERIMAGE COMBOBOX IDC_MONITOREMU,237,123,147,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Monitor:",IDC_STATIC,240,139,68,15,SS_CENTERIMAGE,WS_EX_RIGHT + COMBOBOX IDC_MONITOREMU_MON,319,141,65,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Collision Level",IDC_STATIC,1,161,393,48 CONTROL "None [] Collision hardware emulation disabled.",IDC_COLLISION0, "Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,47,177,101,10 @@ -780,12 +788,9 @@ BEGIN COMBOBOX IDC_GENLOCKMIX,330,229,54,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "Include alpha channel in screenshots and video captures.",IDC_GENLOCK_ALPHA, "Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,13,247,214,10 + CONTROL "Keep aspect ratio",IDC_GENLOCK_KEEP_ASPECT,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,13,262,214,10 COMBOBOX IDC_GENLOCKFILE,12,278,356,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "...",IDC_GENLOCKFILESELECT,375,277,10,15 - CONTROL "Keep aspect ratio",IDC_GENLOCK_KEEP_ASPECT,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,13,262,214,10 - COMBOBOX IDC_MONITOREMU_MON,319,141,65,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Video port display hardware:",IDC_STATIC,241,105,117,15,SS_CENTERIMAGE - CONTROL "Subpixel display emulation",IDC_SUBPIXEL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,234,48,150,10 END IDD_CHIPSET2 DIALOGEX 0, 0, 396, 316 @@ -812,6 +817,7 @@ BEGIN CONTROL "KB Reset Warning",IDC_CS_RESETWARNING,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,158,104,11 CONTROL "CIA TOD bug",IDC_CS_CIATODBUG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,171,104,11 CONTROL "1M Chip / 0.5M+0.5M",IDC_CS_1MCHIPJUMPER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,184,104,11 + CONTROL "Toshiba Gary",IDC_CS_TOSHIBAGARY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,197,106,12 CONTROL "A1000 Boot RAM/ROM",IDC_CS_A1000RAM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,127,93,121,11 CONTROL "CD32 C2P",IDC_CS_CD32C2P,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,127,106,121,11 CONTROL "CDTV SRAM",IDC_CS_CDTVRAM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,127,119,121,11 @@ -821,6 +827,7 @@ BEGIN CONTROL "Z3 Autoconfig",IDC_CS_Z3AUTOCONFIG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,127,171,104,11 CONTROL "Custom register byte write bug",IDC_CS_BYTECUSTOMWRITEBUG, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,127,184,130,11 + CONTROL "KS ROM has Chip RAM speed",IDC_CS_ROMISSLOW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,127,197,125,12 CONTROL "DF0: ID Hardware",IDC_CS_DF0IDHW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,93,125,11 CONTROL "CD32 NVRAM",IDC_CS_CD32NVRAM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,106,125,11 CONTROL "CDTV-CR",IDC_CS_CDTVCR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,119,123,11 @@ -828,6 +835,10 @@ BEGIN CONTROL "C00000 is Fast RAM",IDC_CS_SLOWISFAST,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,145,125,11 CONTROL "A1000 Agnus (8361/8367)",IDC_CS_DIPAGNUS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,158,125,11 CONTROL "Composite color burst",IDC_CS_COMPOSITECOLOR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,171,125,12 + CONTROL "CIA 391078-01 [] CIA revision that can't read IO pin status in output mode",IDC_CS_CIA, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,197,125,12 + RTEXT "Unmapped address space:",IDC_STATIC,15,215,101,9 + COMBOBOX IDC_CS_UNMAPPED,125,212,113,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Internal SCSI Hardware",IDC_STATIC,0,232,395,30 CONTROL "A3000 WD33C93 SCSI",IDC_CS_DMAC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,84,247,108,11 CONTROL "A4000T NCR53C710 SCSI",IDC_CS_DMAC2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,200,247,125,11 @@ -840,12 +851,6 @@ BEGIN CONTROL "Denise/Lisa revision:",IDC_CS_DENISE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,200,299,107,11 EDITTEXT IDC_CS_AGNUSREV,311,284,45,13,ES_AUTOHSCROLL EDITTEXT IDC_CS_DENISEREV,311,298,45,13,ES_AUTOHSCROLL - COMBOBOX IDC_CS_UNMAPPED,125,212,113,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - RTEXT "Unmapped address space:",IDC_STATIC,15,215,101,9 - CONTROL "Toshiba Gary",IDC_CS_TOSHIBAGARY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,197,106,12 - CONTROL "KS ROM has Chip RAM speed",IDC_CS_ROMISSLOW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,127,198,125,12 - CONTROL "CIA 391078-01 [] CIA revision that can't read IO pin status in output mode",IDC_CS_CIA, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,185,125,12 END IDD_AVIOUTPUT DIALOGEX 0, 0, 396, 316 @@ -919,6 +924,7 @@ BEGIN COMBOBOX IDC_FILTERMODE,9,39,153,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_FILTERSTACK,167,39,27,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_FILTERFILTERH,199,39,29,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_FILTERFILTERV,233,39,29,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_FILTEROVERLAYTYPE,9,60,119,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_FILTEROVERLAY,134,60,129,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_FILTER_NATIVERTG,268,20,120,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP @@ -927,16 +933,16 @@ BEGIN COMBOBOX IDC_FILTERINTEGER,361,60,27,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP RTEXT "Horiz. size:",-1,7,87,81,10,SS_CENTERIMAGE COMBOBOX IDC_FILTERHZMULT,92,86,35,150,CBS_DROPDOWN | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP - RTEXT "Vert. size:",-1,7,108,81,10,SS_CENTERIMAGE - COMBOBOX IDC_FILTERVZMULT,92,107,35,150,CBS_DROPDOWN | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP - RTEXT "Horiz. position:",-1,5,129,81,10,SS_CENTERIMAGE - RTEXT "Vert. position:",-1,5,149,81,10,SS_CENTERIMAGE CONTROL "Slider1",IDC_FILTERHZ,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,147,80,152,19 EDITTEXT IDC_FILTERHZV,316,82,42,12,ES_CENTER | ES_READONLY + RTEXT "Vert. size:",-1,7,108,81,10,SS_CENTERIMAGE + COMBOBOX IDC_FILTERVZMULT,92,107,35,150,CBS_DROPDOWN | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP CONTROL "Slider1",IDC_FILTERVZ,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,147,101,152,19 EDITTEXT IDC_FILTERVZV,316,103,42,12,ES_CENTER | ES_READONLY + RTEXT "Horiz. position:",-1,5,129,81,10,SS_CENTERIMAGE CONTROL "Slider1",IDC_FILTERHO,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,147,122,151,19 EDITTEXT IDC_FILTERHOV,316,124,42,12,ES_CENTER | ES_READONLY + RTEXT "Vert. position:",-1,5,149,81,10,SS_CENTERIMAGE CONTROL "Slider1",IDC_FILTERVO,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,147,143,151,19 EDITTEXT IDC_FILTERVOV,316,145,42,12,ES_CENTER | ES_READONLY GROUPBOX "Aspect Ratio Correction",-1,1,173,144,89 @@ -955,7 +961,6 @@ BEGIN PUSHBUTTON "Load",IDC_FILTERPRESETLOAD,205,280,55,14 PUSHBUTTON "Save",IDC_FILTERPRESETSAVE,265,280,55,14 PUSHBUTTON "Delete",IDC_FILTERPRESETDELETE,325,280,55,14 - COMBOBOX IDC_FILTERFILTERV,233,39,29,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP END IDD_HARDDRIVE DIALOGEX 0, 0, 397, 219 @@ -965,33 +970,33 @@ FONT 8, "MS Sans Serif", 0, 0, 0x0 BEGIN RTEXT "Hard drive:",IDC_STATIC,7,11,38,10 COMBOBOX IDC_HARDDRIVE,49,9,339,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + RTEXT "Geometry:",IDC_STATIC,3,31,41,10 + COMBOBOX IDC_PATH_GEOMETRY,49,29,325,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_DISABLED | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "...",IDC_PATH_GEOMETRY_SELECTOR,377,28,11,15,WS_DISABLED EDITTEXT IDC_HDFINFO,5,51,385,12,ES_CENTER | ES_READONLY EDITTEXT IDC_HDFINFO2,5,68,385,12,ES_CENTER | ES_READONLY - DEFPUSHBUTTON "Read Identity",IDC_HARDDRIVE_ID,113,152,111,14,WS_DISABLED - EDITTEXT IDC_PATH_NAME,17,190,41,15,ES_AUTOHSCROLL | NOT WS_VISIBLE + DEFPUSHBUTTON "Create hard disk image file",IDC_HARDDRIVE_IMAGE,5,88,158,14,WS_DISABLED CONTROL "Read/write",IDC_HDF_RW,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,171,90,56,10 + CONTROL "Lock",IDC_HDF_LOCK,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,233,90,55,10 + CONTROL "Identity",IDC_HDF_IDENTITY,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,233,110,55,10 + CONTROL "Manual geometry",IDC_HDF_PHYSGEOMETRY,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,299,90,87,10 COMBOBOX IDC_HDF_CONTROLLER_UNIT,7,111,97,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_DISABLED | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_HDF_CONTROLLER_TYPE,113,111,110,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_DISABLED | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_HDF_FEATURE_LEVEL,7,152,97,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_DISABLED | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_HDF_CONTROLLER,7,132,216,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_DISABLED | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_HDF_FEATURE_LEVEL,7,152,97,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_DISABLED | WS_VSCROLL | WS_TABSTOP + DEFPUSHBUTTON "Read Identity",IDC_HARDDRIVE_ID,113,152,111,14,WS_DISABLED + EDITTEXT IDC_HDFINFO3,7,173,217,12,ES_CENTER | ES_READONLY + EDITTEXT IDC_PATH_NAME,17,190,41,15,ES_AUTOHSCROLL | NOT WS_VISIBLE DEFPUSHBUTTON "Add hard drive",IDOK,237,190,73,14,WS_DISABLED - PUSHBUTTON "Cancel",IDCANCEL,316,190,73,14 - CONTROL "Lock",IDC_HDF_LOCK,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,233,90,55,10 - DEFPUSHBUTTON "Create hard disk image file",IDC_HARDDRIVE_IMAGE,5,88,158,14,WS_DISABLED - CONTROL "Manual geometry",IDC_HDF_PHYSGEOMETRY,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,299,90,87,10 + RTEXT "Surfaces:",IDC_SURFACES_TEXT,298,112,45,10 EDITTEXT IDC_HEADS,347,109,40,15,ES_NUMBER | WS_DISABLED + RTEXT "Sectors:",IDC_SECTORS_TEXT,298,131,45,10 EDITTEXT IDC_SECTORS,347,128,40,15,ES_NUMBER | WS_DISABLED + RTEXT "Cylinders:",IDC_CYLINDERS_TEXT,300,150,43,10 EDITTEXT IDC_RESERVED,347,147,40,15,ES_NUMBER | WS_DISABLED - EDITTEXT IDC_BLOCKSIZE,347,166,40,15,ES_NUMBER | WS_DISABLED - RTEXT "Surfaces:",IDC_SURFACES_TEXT,298,112,45,10 - RTEXT "Sectors:",IDC_SECTORS_TEXT,298,131,45,10 RTEXT "Block size:",IDC_BLOCKSIZE_TEXT,299,168,45,10 - RTEXT "Cylinders:",IDC_CYLINDERS_TEXT,300,150,43,10 - COMBOBOX IDC_PATH_GEOMETRY,49,29,325,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_DISABLED | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "...",IDC_PATH_GEOMETRY_SELECTOR,377,28,11,15,WS_DISABLED - RTEXT "Geometry:",IDC_STATIC,3,31,41,10 - CONTROL "Identity",IDC_HDF_IDENTITY,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,233,110,55,10 - EDITTEXT IDC_HDFINFO3,7,173,217,12,ES_CENTER | ES_READONLY + EDITTEXT IDC_BLOCKSIZE,347,166,40,15,ES_NUMBER | WS_DISABLED + PUSHBUTTON "Cancel",IDCANCEL,316,190,73,14 END IDD_MISC2 DIALOGEX 0, 0, 396, 316 @@ -1116,24 +1121,26 @@ BEGIN RTEXT "Configuration:",IDC_STATIC,5,136,68,10,SS_CENTERIMAGE COMBOBOX IDC_QUICKSTART_HOSTCONFIG,77,134,310,50,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Emulated Drives",IDC_QUICKSTART_DF,1,163,393,93 - CONTROL "Floppy drive DF0:",IDC_DF0QENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,176,77,15 - PUSHBUTTON "Select image file",IDC_DF0QQ,93,176,98,15 - RTEXT "Write-protected",IDC_DF0WPTEXTQ,196,179,69,10,SS_CENTERIMAGE - CONTROL "",IDC_DF0WPQ,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,270,177,10,15 + CONTROL "Floppy drive DF0:",IDC_DF0QENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,176,71,15 + PUSHBUTTON "Select image file",IDC_DF0QQ,85,176,88,15 + RTEXT "Write-protected",IDC_DF0WPTEXTQ,244,179,69,10,SS_CENTERIMAGE + CONTROL "",IDC_DF0WPQ,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,318,177,10,15 PUSHBUTTON "?",IDC_INFO0Q,334,176,19,15 PUSHBUTTON "Eject",IDC_EJECT0Q,358,176,30,15 COMBOBOX IDC_DF0TEXTQ,9,195,379,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - CONTROL "Floppy drive DF1:",IDC_DF1QENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,214,77,15 - PUSHBUTTON "Select image file",IDC_DF1QQ,93,214,98,15 - RTEXT "Write-protected",IDC_DF1WPTEXTQ,195,217,69,10,SS_CENTERIMAGE - COMBOBOX IDC_CD0Q_TYPE,199,215,74,50,CBS_DROPDOWNLIST | NOT WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - CONTROL "",IDC_DF1WPQ,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,270,213,10,15 + CONTROL "Floppy drive DF1:",IDC_DF1QENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,214,71,15 + PUSHBUTTON "Select image file",IDC_DF1QQ,85,214,88,15 + RTEXT "Write-protected",IDC_DF1WPTEXTQ,243,217,69,10,SS_CENTERIMAGE + COMBOBOX IDC_CD0Q_TYPE,253,215,74,50,CBS_DROPDOWNLIST | NOT WS_VISIBLE | WS_VSCROLL | WS_TABSTOP + CONTROL "",IDC_DF1WPQ,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,316,213,10,15 PUSHBUTTON "?",IDC_INFO1Q,334,214,19,15 PUSHBUTTON "Eject",IDC_EJECT1Q,358,214,30,15 COMBOBOX IDC_DF1TEXTQ,9,232,379,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Set configuration",IDC_QUICKSTART_SETCONFIG,9,266,88,15,NOT WS_VISIBLE GROUPBOX "Mode",IDC_STATIC,250,258,144,28,BS_LEFT CONTROL "Start in Quickstart mode",IDC_QUICKSTARTMODE,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_TABSTOP,259,269,131,12 + COMBOBOX IDC_DF0TYPE,179,177,66,50,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_DF1TYPE,179,215,68,50,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END IDD_FRONTEND DIALOGEX 0, 0, 420, 242 @@ -1216,7 +1223,10 @@ STYLE DS_LOCALEDIT | DS_SETFONT | DS_3DLOOK | DS_CONTROL | WS_CHILD FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN GROUPBOX "RTG Graphics Card",IDC_STATIC,1,48,393,198 + LTEXT "Board:",IDC_STATIC,29,62,61,10 COMBOBOX IDC_RTG_Z2Z3,26,77,215,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + LTEXT "Monitor:",IDC_STATIC,105,62,65,10,0,WS_EX_RIGHT + COMBOBOX IDC_MONITOREMU_MON,175,61,65,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_RTG_NUM,248,77,37,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP RTEXT "VRAM size: [] Graphics card memory. Required for RTG (Picasso96) emulation.",IDC_GFXCARDTEXT,2,98,76,10,SS_NOTIFY | SS_CENTERIMAGE CONTROL "",IDC_P96MEM,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,88,94,103,20 @@ -1230,6 +1240,7 @@ BEGIN CONTROL "Always center",IDC_RTG_CENTER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,25,156,169,10 CONTROL "Hardware vertical blank interrupt",IDC_RTG_VBINTERRUPT, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,25,169,157,10 + CONTROL "Multithreaded",IDC_RTG_THREAD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,207,156,83,10 CONTROL "Hardware sprite emulation",IDC_RTG_HWSPRITE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,207,169,148,10 CTEXT "Color modes:",IDC_STATIC,295,81,83,10,SS_CENTERIMAGE COMBOBOX IDC_RTG_8BIT,296,96,82,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP @@ -1243,10 +1254,6 @@ BEGIN COMBOBOX IDC_RTG_BUFFERCNT,153,227,84,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP CTEXT "Aspect ratio:",IDC_STATIC,282,212,83,10,SS_CENTERIMAGE COMBOBOX IDC_RTG_SCALE_ASPECTRATIO,282,227,84,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP - CONTROL "Multithreaded",IDC_RTG_THREAD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,207,156,83,10 - LTEXT "Board:",IDC_STATIC,29,62,61,10 - COMBOBOX IDC_MONITOREMU_MON,175,61,65,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Monitor:",IDC_STATIC,105,62,65,10,0,WS_EX_RIGHT END IDD_INPUTMAP DIALOGEX 0, 0, 421, 341 @@ -1296,12 +1303,12 @@ STYLE DS_LOCALEDIT | DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK | CAPTION "CD Settings" FONT 8, "MS Sans Serif", 0, 0, 0x0 BEGIN + CONTROL "",IDC_CDLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,4,4,387,77 RTEXT "HD Controller:",IDC_STATIC,7,90,65,10,SS_CENTERIMAGE COMBOBOX IDC_HDF_CONTROLLER,80,89,154,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_HDF_CONTROLLER_UNIT,239,89,71,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "Add CD Drive",IDOK,121,108,73,14 PUSHBUTTON "Cancel",IDCANCEL,201,108,73,14 - CONTROL "",IDC_CDLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,4,4,387,77 END IDD_TAPEDRIVE DIALOGEX 0, 0, 395, 97 @@ -1342,26 +1349,25 @@ BEGIN COMBOBOX IDC_SCSIROMSUBSELECT,12,95,157,75,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_EXPANSIONBOARDITEMSELECTOR,12,112,157,75,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_SCSIROMSELECTNUM,175,78,22,75,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + CONTROL "24-bit DMA",IDC_SCSIROM24BITDMA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,202,61,84,12 RTEXT "Controller ID:",IDC_STATIC,241,59,110,15,SS_CENTERIMAGE COMBOBOX IDC_SCSIROMID,356,60,29,75,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_SCSIROMFILE,202,78,171,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "...",IDC_SCSIROMCHOOSER,376,78,10,15 CONTROL "Autoboot disabled",IDC_SCSIROMFILEAUTOBOOT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,202,98,94,12 + CONTROL "PCMCIA inserted",IDC_SCSIROMFILEPCMCIA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,301,98,84,12 CONTROL "",IDC_EXPANSIONBOARDCHECKBOX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,202,112,99,12 - EDITTEXT IDC_EXPANSIONBOARDSTRINGBOX,202,112,172,14,ES_AUTOHSCROLL - COMBOBOX IDC_EXPANSIONBOARDSELECTOR,202,112,171,75,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_SCSIROMFILE,202,78,171,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP GROUPBOX "Accelerator Board Settings",IDC_STATIC,1,133,394,91 COMBOBOX IDC_CPUBOARD_TYPE,13,154,117,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_CPUBOARD_SUBTYPE,13,173,117,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_ACCELERATORBOARDITEMSELECTOR,12,205,157,75,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_ACCELERATORBOARDSELECTOR,202,205,171,75,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - RTEXT "Accelerator board memory:",IDC_STATIC,155,181,104,15,SS_CENTERIMAGE LTEXT "Accelerator board ROM file:",IDC_STATIC,203,141,170,15,SS_CENTERIMAGE COMBOBOX IDC_CPUBOARDROMFILE,202,156,169,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "...",IDC_CPUBOARDROMCHOOSER,376,155,10,15 + RTEXT "Accelerator board memory:",IDC_STATIC,155,181,104,15,SS_CENTERIMAGE CONTROL "",IDC_CPUBOARDMEM,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,269,179,68,20 EDITTEXT IDC_CPUBOARDRAM,343,183,40,12,ES_CENTER | ES_READONLY - CONTROL "",IDC_ACCELERATORBOARDCHECKBOX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,202,206,99,12 + COMBOBOX IDC_ACCELERATORBOARDITEMSELECTOR,12,205,157,75,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_ACCELERATORBOARDSELECTOR,202,205,171,75,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP GROUPBOX "Miscellaneous Expansions",IDC_STATIC,1,228,394,51 CONTROL "bsdsocket.library [] bsdsocket network library emulation.",IDC_SOCKETS, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,243,179,11 @@ -1369,8 +1375,10 @@ BEGIN CONTROL "uaenet.device [] Sana 2 compatible network device emulation.",IDC_SANA2, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,193,243,187,11 CONTROL "CD32 Full Motion Video cartridge",IDC_CS_CD32FMV,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,193,259,193,11 + EDITTEXT IDC_EXPANSIONBOARDSTRINGBOX,202,112,172,14,ES_AUTOHSCROLL + COMBOBOX IDC_EXPANSIONBOARDSELECTOR,202,112,171,75,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + CONTROL "",IDC_ACCELERATORBOARDCHECKBOX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,202,206,99,12 CONTROL "Enabled",IDC_SCSIROMSELECTED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,202,79,99,12 - CONTROL "PCMCIA inserted",IDC_SCSIROMFILEPCMCIA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,301,98,84,12 END IDD_CHSQUERY DIALOGEX 0, 0, 396, 85 @@ -1378,15 +1386,15 @@ STYLE DS_LOCALEDIT | DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK | CAPTION "CHS Geometry" FONT 8, "MS Sans Serif", 0, 0, 0x0 BEGIN - PUSHBUTTON "OK",IDOK,59,57,135,15 - PUSHBUTTON "Cancel",IDCANCEL,201,57,135,15 - EDITTEXT IDC_CHS_CYLINDERS,86,32,45,13,ES_AUTOHSCROLL - EDITTEXT IDC_CHS_HEADS,204,32,45,13,ES_AUTOHSCROLL - EDITTEXT IDC_CHS_SECTORS,322,32,45,13,ES_AUTOHSCROLL + CTEXT "Imaging CHS-only IDE drive requires correct geometry. Check drive label.",IDC_STATIC,39,10,330,9 RTEXT "Cylinders:",IDC_STATIC,27,33,45,9 + EDITTEXT IDC_CHS_CYLINDERS,86,32,45,13,ES_AUTOHSCROLL RTEXT "Heads:",IDC_STATIC,145,33,45,9 + EDITTEXT IDC_CHS_HEADS,204,32,45,13,ES_AUTOHSCROLL RTEXT "Sectors:",IDC_STATIC,263,33,45,9 - CTEXT "Imaging CHS-only IDE drive requires correct geometry. Check drive label.",IDC_STATIC,39,10,330,9 + EDITTEXT IDC_CHS_SECTORS,322,32,45,13,ES_AUTOHSCROLL + PUSHBUTTON "OK",IDOK,59,57,135,15 + PUSHBUTTON "Cancel",IDCANCEL,201,57,135,15 END @@ -1396,8 +1404,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 4,4,0,0 - PRODUCTVERSION 4,4,0,0 + FILEVERSION 4,9,0,0 + PRODUCTVERSION 4,9,0,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -1413,12 +1421,12 @@ BEGIN BLOCK "040904b0" BEGIN VALUE "FileDescription", "WinUAE" - VALUE "FileVersion", "4.4.0.0" + VALUE "FileVersion", "4.9.0.0" VALUE "InternalName", "WinUAE" - VALUE "LegalCopyright", "© 1996-2020 under the GNU Public License (GPL)" + VALUE "LegalCopyright", "© 1996-2021 under the GNU Public License (GPL)" VALUE "OriginalFilename", "WinUAE.exe" VALUE "ProductName", "WinUAE" - VALUE "ProductVersion", "4.4.0.0" + VALUE "ProductVersion", "4.9.0.0" END END BLOCK "VarFileInfo" @@ -1539,7 +1547,7 @@ BEGIN IDD_MEMORY, DIALOG BEGIN - BOTTOMMARGIN, 265 + BOTTOMMARGIN, 284 END IDD_CPU, DIALOG @@ -2131,11 +2139,13 @@ END STRINGTABLE BEGIN - IDS_MISCLISTITEMS4 "Windows shutdown/logoff notification\nWarn when attempting to close window\nPower led dims when audio filter is disabled\nAutomatically capture mouse when window is activated\nDebug memory space\n" + IDS_MISCLISTITEMS4 "Windows shutdown/logoff notification\nWarn when attempting to close window\nPower led dims when audio filter is disabled\nAutomatically capture mouse when window is activated\nDebug memory space\nForce hard reset if CPU halted\n" IDS_SHUTDOWN_NOTIFICATION "Emulation session active" IDS_QUIT_WARNING "Are you sure you want to quit WinUAE?" IDS_UNMAPPED_ADDRESS "Floating\nAll zeros\nAll ones\n" IDS_GENLOCK_OPTIONS "Noise (built-in)\nTest card (built-in)\nImage file (png)\nVideo file\nCapture device\nAmerican Laser Games LaserDisc Player\nSony LaserDisc Player\nPioneer LaserDisc Player\n" + IDS_READONLYCONFIRMATION + "Selected configuration file is write protected.\nDo you want to overwrite it?\n%s\n" END STRINGTABLE diff --git a/od-win32/win32.h b/od-win32/win32.h index 622d5b21a..04cfc5acd 100644 --- a/od-win32/win32.h +++ b/od-win32/win32.h @@ -20,12 +20,12 @@ #define LANG_DLL_FULL_VERSION_MATCH 1 #if WINUAEPUBLICBETA -#define WINUAEBETA _T("Beta 42 (RC3)") +#define WINUAEBETA _T("") #else #define WINUAEBETA _T("") #endif -#define WINUAEDATE MAKEBD(2021, 12, 2) +#define WINUAEDATE MAKEBD(2021, 12, 6) //#define WINUAEEXTRA _T("AmiKit Preview") //#define WINUAEEXTRA _T("Amiga Forever Edition") diff --git a/od-win32/win32gfx.cpp b/od-win32/win32gfx.cpp index 2b30ee1ed..31b34d1a9 100644 --- a/od-win32/win32gfx.cpp +++ b/od-win32/win32gfx.cpp @@ -4349,6 +4349,7 @@ static void updatedisplayarea2(int monid) void updatedisplayarea(int monid) { + set_custom_limits(-1, -1, -1, -1); if (monid >= 0) { updatedisplayarea2(monid); } else { diff --git a/od-win32/wix/Product.wxs b/od-win32/wix/Product.wxs index f83f09058..423245db0 100644 --- a/od-win32/wix/Product.wxs +++ b/od-win32/wix/Product.wxs @@ -2,8 +2,8 @@ - - + +