From: Toni Wilen Date: Mon, 30 May 2005 19:03:05 +0000 (+0300) Subject: imported winuaesrc1000b10.zip X-Git-Tag: 2100~311 X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=faead67d419ba0b72d9c2af231ccff2d8a358c1b;p=francis%2Fwinuae.git imported winuaesrc1000b10.zip --- diff --git a/compemu_fpp.c b/compemu_fpp.c index 9ff0945f..24244edc 100755 --- a/compemu_fpp.c +++ b/compemu_fpp.c @@ -1446,25 +1446,24 @@ void comp_fpp_opp (uae_u32 opcode, uae_u16 extra) MAKE_FPSR (reg); break; case 0x1e: /* FGETEXP */ - FAIL(1); - return; dont_care_fflags(); - { - int expon; - frexp (src, &expon); - regs.fp[reg] = (double) (expon - 1); - MAKE_FPSR (regs.fp[reg]); + src=get_fp_value (opcode, extra); + if (src < 0) { + FAIL(1); /* Illegal instruction */ + return; } + fgetexp_rr(reg,src); + MAKE_FPSR (reg); break; case 0x1f: /* FGETMAN */ - FAIL(1); - return; dont_care_fflags(); - { - int expon; - regs.fp[reg] = frexp (src, &expon) * 2.0; - MAKE_FPSR (regs.fp[reg]); + src=get_fp_value (opcode, extra); + if (src < 0) { + FAIL(1); /* Illegal instruction */ + return; } + fgetman_rr(reg,src); + MAKE_FPSR (reg); break; case 0x20: /* FDIV */ case 0x60: @@ -1578,8 +1577,10 @@ void comp_fpp_opp (uae_u32 opcode, uae_u16 extra) FAIL(1); /* Illegal instruction */ return; } - fsincos_rr(reg,extra & 7,src); - MAKE_FPSR (extra & 7); + if (reg == (extra & 7)) + fsin_rr(reg, src); + else + fsincos_rr(reg, extra & 7, src); MAKE_FPSR (reg); break; case 0x38: /* FCMP */ diff --git a/compemu_raw_x86.c b/compemu_raw_x86.c index a64895ba..b470eade 100755 --- a/compemu_raw_x86.c +++ b/compemu_raw_x86.c @@ -2828,6 +2828,54 @@ LOWFUNC(NONE,NONE,2,raw_frndint_rr,(FW d, FR s)) } LENDFUNC(NONE,NONE,2,raw_frndint_rr,(FW d, FR s)) +LOWFUNC(NONE,NONE,2,raw_fgetexp_rr,(FW d, FR s)) +{ + int ds; + + if (d!=s) { + ds=stackpos(s); + emit_byte(0xd9); + emit_byte(0xc0+ds); /* fld x */ + emit_byte(0xd9); + emit_byte(0xf4); /* fxtract exp push man */ + emit_byte(0xdd); + emit_byte(0xd8); /* fstp just pop man */ + tos_make(d); /* store exp to destination */ + } + else { + make_tos(d); /* tos=x=y */ + emit_byte(0xd9); + emit_byte(0xf4); /* fxtract exp push man */ + emit_byte(0xdd); + emit_byte(0xd8); /* fstp just pop man */ + } +} +LENDFUNC(NONE,NONE,2,raw_fgetexp_rr,(FW d, FR s)) + +LOWFUNC(NONE,NONE,2,raw_fgetman_rr,(FW d, FR s)) +{ + int ds; + + if (d!=s) { + ds=stackpos(s); + emit_byte(0xd9); + emit_byte(0xc0+ds); /* fld x */ + emit_byte(0xd9); + emit_byte(0xf4); /* fxtract exp push man */ + emit_byte(0xdd); + emit_byte(0xd9); /* fstp copy man up & pop */ + tos_make(d); /* store man to destination */ + } + else { + make_tos(d); /* tos=x=y */ + emit_byte(0xd9); + emit_byte(0xf4); /* fxtract exp push man */ + emit_byte(0xdd); + emit_byte(0xd9); /* fstp copy man up & pop */ + } +} +LENDFUNC(NONE,NONE,2,raw_fgetman_rr,(FW d, FR s)) + LOWFUNC(NONE,NONE,2,raw_fsin_rr,(FW d, FR s)) { int ds; @@ -2933,13 +2981,20 @@ LOWFUNC(NONE,NONE,2,raw_fscale_rr,(FRW d, FR s)) { int ds; - make_tos(s); /* tos=x */ - ds=stackpos(d); - emit_byte(0xd9); - emit_byte(0xc0+ds); /* fld y */ - emit_byte(0xd9); - emit_byte(0xfd); /* fscale y*(2^x) */ - tos_make(d); /* store y=y*(2^x) */ + if (live.spos[d]==live.tos && live.spos[s]==live.tos-1) { + //write_log ("fscale found x in TOS-1 and y in TOS\n"); + emit_byte(0xd9); + emit_byte(0xfd); /* fscale y*(2^x) */ + } + else { + make_tos(s); /* tos=x */ + ds=stackpos(d); + emit_byte(0xd9); + emit_byte(0xc0+ds); /* fld y */ + emit_byte(0xd9); + emit_byte(0xfd); /* fscale y*(2^x) */ + tos_make(d); /* store y=y*(2^x) */ + } } LENDFUNC(NONE,NONE,2,raw_fscale_rr,(FRW d, FR s)) @@ -3607,14 +3662,21 @@ LENDFUNC(NONE,NONE,2,raw_fdiv_rr,(FRW d, FR s)) LOWFUNC(NONE,NONE,2,raw_frem_rr,(FRW d, FR s)) { int ds; - - make_tos(s); /* tos=x */ - ds=stackpos(d); - emit_byte(0xd9); - emit_byte(0xc0+ds); /* fld y */ - emit_byte(0xd9); - emit_byte(0xf8); /* fprem rem(y/x) */ - tos_make(d); /* store y=rem(y/x) */ + + if (live.spos[d]==live.tos && live.spos[s]==live.tos-1) { + //write_log ("frem found x in TOS-1 and y in TOS\n"); + emit_byte(0xd9); + emit_byte(0xf8); /* fprem rem(y/x) */ + } + else { + make_tos(s); /* tos=x */ + ds=stackpos(d); + emit_byte(0xd9); + emit_byte(0xc0+ds); /* fld y */ + emit_byte(0xd9); + emit_byte(0xf8); /* fprem rem(y/x) */ + tos_make(d); /* store y=rem(y/x) */ + } } LENDFUNC(NONE,NONE,2,raw_frem_rr,(FRW d, FR s)) @@ -3622,13 +3684,20 @@ LOWFUNC(NONE,NONE,2,raw_frem1_rr,(FRW d, FR s)) { int ds; - make_tos(s); /* tos=x */ - ds=stackpos(d); - emit_byte(0xd9); - emit_byte(0xc0+ds); /* fld y */ - emit_byte(0xd9); - emit_byte(0xf5); /* fprem rem1(y/x) */ - tos_make(d); /* store y=rem1(y/x) */ + if (live.spos[d]==live.tos && live.spos[s]==live.tos-1) { + //write_log ("frem1 found x in TOS-1 and y in TOS\n"); + emit_byte(0xd9); + emit_byte(0xf5); /* fprem1 rem1(y/x) */ + } + else { + make_tos(s); /* tos=x */ + ds=stackpos(d); + emit_byte(0xd9); + emit_byte(0xc0+ds); /* fld y */ + emit_byte(0xd9); + emit_byte(0xf5); /* fprem1 rem1(y/x) */ + tos_make(d); /* store y=rem(y/x) */ + } } LENDFUNC(NONE,NONE,2,raw_frem1_rr,(FRW d, FR s)) diff --git a/compemu_support.c b/compemu_support.c index 31803314..f59bcb86 100755 --- a/compemu_support.c +++ b/compemu_support.c @@ -4176,6 +4176,36 @@ MIDFUNC(2,fabs_rr,(FW d, FR s)) } MENDFUNC(2,fabs_rr,(FW d, FR s)) +MIDFUNC(2,frndint_rr,(FW d, FR s)) +{ + s=f_readreg(s); + d=f_writereg(d); + raw_frndint_rr(d,s); + f_unlock(s); + f_unlock(d); +} +MENDFUNC(2,frndint_rr,(FW d, FR s)) + +MIDFUNC(2,fgetexp_rr,(FW d, FR s)) +{ + s=f_readreg(s); + d=f_writereg(d); + raw_fgetexp_rr(d,s); + f_unlock(s); + f_unlock(d); +} +MENDFUNC(2,fgetexp_rr,(FW d, FR s)) + +MIDFUNC(2,fgetman_rr,(FW d, FR s)) +{ + s=f_readreg(s); + d=f_writereg(d); + raw_fgetman_rr(d,s); + f_unlock(s); + f_unlock(d); +} +MENDFUNC(2,fgetman_rr,(FW d, FR s)) + MIDFUNC(2,fsin_rr,(FW d, FR s)) { s=f_readreg(s); @@ -4268,16 +4298,6 @@ MIDFUNC(2,ftentox_rr,(FW d, FR s)) } MENDFUNC(2,ftentox_rr,(FW d, FR s)) -MIDFUNC(2,frndint_rr,(FW d, FR s)) -{ - s=f_readreg(s); - d=f_writereg(d); - raw_frndint_rr(d,s); - f_unlock(s); - f_unlock(d); -} -MENDFUNC(2,frndint_rr,(FW d, FR s)) - MIDFUNC(2,flog2_rr,(FW d, FR s)) { s=f_readreg(s); diff --git a/custom.c b/custom.c index aad77fa9..51e79470 100755 --- a/custom.c +++ b/custom.c @@ -707,7 +707,7 @@ static void create_cycle_diagram_table(void) if (planes <= max_planes) { for (cycle = 0; cycle < fetch_start; cycle++) { if (cycle < max_planes && planes >= cycle_sequence[cycle & 7]) { - v = 1; + v = cycle_sequence[cycle & 7]; } else { v = 0; freecycles++; @@ -2714,6 +2714,26 @@ static void varsync (void) } #endif +int is_bitplane_dma (int hpos) +{ + if (fetch_state == fetch_not_started || hpos < thisline_decision.plfleft) + return 0; + if ((passed_plfstop == 3 && hpos >= thisline_decision.plfright) + || hpos >= estimated_last_fetch_cycle) + return 0; + return curr_diagram[(hpos - cycle_diagram_shift) & fetchstart_mask]; +} + +STATIC_INLINE int is_bitplane_dma_inline (int hpos) +{ + if (fetch_state == fetch_not_started || hpos < thisline_decision.plfleft) + return 0; + if ((passed_plfstop == 3 && hpos >= thisline_decision.plfright) + || hpos >= estimated_last_fetch_cycle) + return 0; + return curr_diagram[(hpos - cycle_diagram_shift) & fetchstart_mask]; +} + static void BPLxPTH (int hpos, uae_u16 v, int num) { decide_line (hpos); @@ -2723,9 +2743,14 @@ static void BPLxPTH (int hpos, uae_u16 v, int num) } static void BPLxPTL (int hpos, uae_u16 v, int num) { + int delta = 0; decide_line (hpos); decide_fetch (hpos); - bplpt[num] = (bplpt[num] & ~0xffff) | (v & 0xfffe); + /* fix for "bitplane dma fetch at the same time while updating BPLxPTL" */ + /* fixes "3v Demo" by Cave and "New Year Demo" by Phoenix */ + if (is_bitplane_dma(hpos - 1) == num + 1) + delta = 2 << fetchmode; + bplpt[num] = (bplpt[num] & ~0xffff) | ((v + delta) & 0xfffe); //write_log("%d:%d:BPL%dPTL %08.8X\n", hpos, vpos, num, v); } @@ -3303,26 +3328,6 @@ static void COLOR_WRITE (int hpos, uae_u16 v, int num) /* Determine which cycles are available for the copper in a display * with a agiven number of planes. */ -int is_bitplane_dma (int hpos) -{ - if (fetch_state == fetch_not_started || hpos < thisline_decision.plfleft) - return 0; - if ((passed_plfstop == 3 && hpos >= thisline_decision.plfright) - || hpos >= estimated_last_fetch_cycle) - return 0; - return curr_diagram[(hpos - cycle_diagram_shift) & fetchstart_mask]; -} - -STATIC_INLINE int is_bitplane_dma_inline (int hpos) -{ - if (fetch_state == fetch_not_started || hpos < thisline_decision.plfleft) - return 0; - if ((passed_plfstop == 3 && hpos >= thisline_decision.plfright) - || hpos >= estimated_last_fetch_cycle) - return 0; - return curr_diagram[(hpos - cycle_diagram_shift) & fetchstart_mask]; -} - STATIC_INLINE int copper_cant_read (int hpos) { if (hpos + 1 >= maxhpos) diff --git a/fpp.c b/fpp.c index 916b969b..2dd93a62 100755 --- a/fpp.c +++ b/fpp.c @@ -1372,8 +1372,8 @@ void fpp_opp (uae_u32 opcode, uae_u16 extra) case 0x35: case 0x36: case 0x37: - regs.fp[reg] = sin (src); regs.fp[extra & 7] = cos (src); + regs.fp[reg] = sin (src); MAKE_FPSR (regs.fp[reg]); break; case 0x38: /* FCMP */ diff --git a/include/compemu.h b/include/COMPEMU.H similarity index 99% rename from include/compemu.h rename to include/COMPEMU.H index b0ceb288..8f4ede07 100755 --- a/include/compemu.h +++ b/include/COMPEMU.H @@ -422,6 +422,8 @@ DECLARE(dont_care_fflags(void)); DECLARE(fsqrt_rr(FW d, FR s)); DECLARE(fabs_rr(FW d, FR s)); DECLARE(frndint_rr(FW d, FR s)); +DECLARE(fgetexp_rr(FW d, FR s)); +DECLARE(fgetman_rr(FW d, FR s)); DECLARE(fsin_rr(FW d, FR s)); DECLARE(fcos_rr(FW d, FR s)); DECLARE(ftan_rr(FW d, FR s)); @@ -438,10 +440,10 @@ DECLARE(flog10_rr(FW d, FR s)); DECLARE(fasin_rr(FW d, FR s)); DECLARE(facos_rr(FW d, FR s)); DECLARE(fatan_rr(FW d, FR s)); +DECLARE(fatanh_rr(FW d, FR s)); DECLARE(fsinh_rr(FW d, FR s)); DECLARE(fcosh_rr(FW d, FR s)); DECLARE(ftanh_rr(FW d, FR s)); -DECLARE(fatanh_rr(FW d, FR s)); DECLARE(fneg_rr(FW d, FR s)); DECLARE(fadd_rr(FRW d, FR s)); DECLARE(fsub_rr(FRW d, FR s)); diff --git a/memory.c b/memory.c index eb4ede7c..0c12a794 100755 --- a/memory.c +++ b/memory.c @@ -179,7 +179,7 @@ uae_u8 *load_keyfile (struct uae_prefs *p, char *path, int *size) struct zfile *f; uae_u8 *keybuf = 0; int keysize = 0; - char tmp[MAX_PATH]; + char tmp[MAX_PATH], *d; tmp[0] = 0; if (path) @@ -187,23 +187,33 @@ uae_u8 *load_keyfile (struct uae_prefs *p, char *path, int *size) strcat (tmp, "rom.key"); f = zfile_fopen (tmp, "rb"); if (!f) { - struct romdata *rd = getromdatabyid (0); - char *s = romlist_get (rd); - if (s) - f = zfile_fopen (s, "rb"); + strcpy (tmp, p->romfile); + d = strrchr(tmp, '/'); + if (!d) + d = strrchr(tmp, '\\'); + if (d) { + strcpy (d + 1, "rom.key"); + f = zfile_fopen(tmp, "rb"); + } if (!f) { - strcpy (tmp, p->path_rom); - strcat (tmp, "rom.key"); - f = zfile_fopen (tmp, "rb"); + struct romdata *rd = getromdatabyid (0); + char *s = romlist_get (rd); + if (s) + f = zfile_fopen (s, "rb"); if (!f) { - f = zfile_fopen ("roms/rom.key", "rb"); + strcpy (tmp, p->path_rom); + strcat (tmp, "rom.key"); + f = zfile_fopen (tmp, "rb"); if (!f) { - strcpy (tmp, start_path_data); - strcat (tmp, "rom.key"); - f = zfile_fopen(tmp, "rb"); + f = zfile_fopen ("roms/rom.key", "rb"); if (!f) { - sprintf (tmp, "%s../shared/rom/rom.key", start_path_data); + strcpy (tmp, start_path_data); + strcat (tmp, "rom.key"); f = zfile_fopen(tmp, "rb"); + if (!f) { + sprintf (tmp, "%s../shared/rom/rom.key", start_path_data); + f = zfile_fopen(tmp, "rb"); + } } } } diff --git a/od-win32/resources/winuae.rc b/od-win32/resources/winuae.rc index 1d2a7249..2b6d67a2 100755 --- a/od-win32/resources/winuae.rc +++ b/od-win32/resources/winuae.rc @@ -38,23 +38,18 @@ FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN GROUPBOX "ROM Settings:",-1,5,0,290,74 RTEXT "Boot ROM File:",IDC_ROMTEXT,10,15,75,10 - COMBOBOX IDC_ROMFILE,89,12,186,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | - CBS_SORT | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_ROMFILE,89,12,186,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "...",IDC_KICKCHOOSER,280,10,10,15 RTEXT "Extended ROM File:",IDC_ROMFILE2TEXT,10,35,75,10 - COMBOBOX IDC_ROMFILE2,89,31,186,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | - CBS_SORT | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_ROMFILE2,89,31,186,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "...",IDC_ROMCHOOSER2,280,30,10,15 - CONTROL "MAPROM emulation [] Creates BlizKick-compatible memory area.", - IDC_MAPROM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,95,54, - 82,10 - CONTROL "ShapeShifter support [] Patches Kickstart ROM for ShapeShifter compatibility.", - IDC_KICKSHIFTER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, - 187,54,80,10 + CONTROL "MAPROM emulation [] Creates BlizKick-compatible memory area.",IDC_MAPROM, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,95,54,82,10 + CONTROL "ShapeShifter support [] Patches Kickstart ROM for ShapeShifter compatibility.",IDC_KICKSHIFTER, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,187,54,80,10 GROUPBOX "Misc settings:",-1,5,76,290,57 RTEXT "Cartridge ROM File:",IDC_FLASHTEXT2,8,93,75,10 - COMBOBOX IDC_CARTFILE,89,90,186,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | - CBS_SORT | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_CARTFILE,89,90,186,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "...",IDC_CARTCHOOSER,280,90,10,15 RTEXT "Flash RAM File:",IDC_FLASHTEXT,8,112,75,10 EDITTEXT IDC_FLASHFILE,89,110,185,13,ES_AUTOHSCROLL @@ -66,55 +61,34 @@ STYLE DS_SETFONT | DS_3DLOOK | DS_CONTROL | WS_CHILD FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN GROUPBOX "Screen",IDC_SCREENRESTEXT,12,0,199,67,BS_LEFT - RTEXT "Fullscreen",IDC_SELECTRESTEXT,22,17,34,15, - SS_CENTERIMAGE - COMBOBOX IDC_DISPLAYSELECT,61,10,143,150,CBS_DROPDOWNLIST | - CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_RESOLUTION,61,27,77,150,CBS_DROPDOWNLIST | - CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_REFRESHRATE,143,27,61,150,CBS_DROPDOWNLIST | - CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + RTEXT "Fullscreen",IDC_SELECTRESTEXT,22,17,34,15,SS_CENTERIMAGE + COMBOBOX IDC_DISPLAYSELECT,61,10,143,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_RESOLUTION,61,27,77,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_REFRESHRATE,143,27,61,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP RTEXT "Windowed",IDC_WINDOWEDTEXT,22,51,35,8 EDITTEXT IDC_XSIZE,61,48,35,12,ES_NUMBER EDITTEXT IDC_YSIZE,103,48,35,12,ES_NUMBER - CONTROL "VSync",IDC_VSYNC,"Button",BS_AUTOCHECKBOX | BS_LEFT | - WS_TABSTOP,145,49,54,10 + CONTROL "VSync",IDC_VSYNC,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_TABSTOP,145,49,54,10 GROUPBOX "Settings",IDC_SETTINGSTEXT,12,77,199,89 - CONTROL "Full Screen",IDC_AFULLSCREEN,"Button",BS_AUTOCHECKBOX | - BS_LEFT | WS_TABSTOP,35,89,90,10 - CONTROL "Full Screen RTG",IDC_PFULLSCREEN,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,131,89,70,10,0, - HIDC_PFULLSCREEN - CONTROL "Correct aspect ratio",IDC_ASPECT,"Button", - BS_AUTOCHECKBOX | BS_LEFT | WS_TABSTOP,35,106,90,10 - CONTROL "Lo-res",IDC_LORES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, - 131,106,70,10,0,HIDC_LORES + CONTROL "Full Screen",IDC_AFULLSCREEN,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_TABSTOP,35,89,90,10 + CONTROL "Full Screen RTG",IDC_PFULLSCREEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,131,89,70,10,0,HIDC_PFULLSCREEN + CONTROL "Correct aspect ratio",IDC_ASPECT,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_TABSTOP,35,106,90,10 + CONTROL "Lo-res",IDC_LORES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,131,106,70,10,0,HIDC_LORES LTEXT "Refresh:",IDC_REFRESHTEXT,18,129,28,8 - CONTROL "Slider1",IDC_FRAMERATE,"msctls_trackbar32", - TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,46,124,75,20 + CONTROL "Slider1",IDC_FRAMERATE,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,46,124,75,20 EDITTEXT IDC_RATETEXT,126,128,77,12,ES_CENTER | ES_READONLY GROUPBOX "Centering",IDC_STATIC,221,0,61,67 - CONTROL "Horizontal",IDC_XCENTER,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,229,16,45,10 - CONTROL "Vertical",IDC_YCENTER,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,229,32,39,10 + CONTROL "Horizontal",IDC_XCENTER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,229,16,45,10 + CONTROL "Vertical",IDC_YCENTER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,229,32,39,10 GROUPBOX "Line mode",IDC_LINEMODE,222,77,61,74 - CONTROL "Normal",IDC_LM_NORMAL,"Button",BS_AUTORADIOBUTTON | - BS_LEFT | WS_GROUP | WS_TABSTOP,233,89,38,10 - CONTROL "Doubled",IDC_LM_DOUBLED,"Button",BS_AUTORADIOBUTTON | - BS_LEFT | WS_TABSTOP,233,105,41,10 - CONTROL "Scanline",IDC_LM_SCANLINES,"Button",BS_AUTORADIOBUTTON | - BS_LEFT | WS_TABSTOP,233,121,40,10 - COMBOBOX IDC_DA_MODE,35,183,58,150,CBS_DROPDOWNLIST | - CBS_HASSTRINGS | NOT WS_VISIBLE | WS_VSCROLL | - WS_TABSTOP - CONTROL "",IDC_DA_SLIDER,"msctls_trackbar32",TBS_AUTOTICKS | - TBS_TOP | NOT WS_VISIBLE | WS_TABSTOP,99,179,101,20 - PUSHBUTTON "Detect pixel format",IDC_TEST16BIT,210,181,73,14,0,0, - HIDC_TEST16BIT + CONTROL "Normal",IDC_LM_NORMAL,"Button",BS_AUTORADIOBUTTON | BS_LEFT | WS_GROUP | WS_TABSTOP,233,89,38,10 + CONTROL "Doubled",IDC_LM_DOUBLED,"Button",BS_AUTORADIOBUTTON | BS_LEFT | WS_TABSTOP,233,105,41,10 + CONTROL "Scanline",IDC_LM_SCANLINES,"Button",BS_AUTORADIOBUTTON | BS_LEFT | WS_TABSTOP,233,121,40,10 + COMBOBOX IDC_DA_MODE,35,183,58,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | NOT WS_VISIBLE | WS_VSCROLL | WS_TABSTOP + CONTROL "",IDC_DA_SLIDER,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | NOT WS_VISIBLE | WS_TABSTOP,99,179,101,20 + PUSHBUTTON "Detect pixel format",IDC_TEST16BIT,210,181,73,14,0,0,HIDC_TEST16BIT LTEXT "FPS Adj.",IDC_REFRESH2TEXT,18,149,28,8 - CONTROL "",IDC_FRAMERATE2,"msctls_trackbar32",TBS_AUTOTICKS | - TBS_TOP | WS_TABSTOP,46,144,127,20 + CONTROL "",IDC_FRAMERATE2,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,46,144,127,20 EDITTEXT IDC_RATE2TEXT,177,148,26,12,ES_CENTER | ES_READONLY END @@ -125,21 +99,15 @@ FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN GROUPBOX "Memory Settings:",-1,14,40,274,93 RTEXT "Chip:",-1,24,60,20,10,SS_CENTERIMAGE - CONTROL "Slider1",IDC_CHIPMEM,"msctls_trackbar32",TBS_AUTOTICKS | - TBS_TOP | WS_TABSTOP,54,55,50,20 + CONTROL "Slider1",IDC_CHIPMEM,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,54,55,50,20 RTEXT "Fast:",IDC_FASTTEXT,24,85,20,10,SS_CENTERIMAGE - CONTROL "Slider1",IDC_FASTMEM,"msctls_trackbar32",TBS_AUTOTICKS | - TBS_TOP | WS_TABSTOP,54,80,50,20 + CONTROL "Slider1",IDC_FASTMEM,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,54,80,50,20 RTEXT "Slow:",-1,149,60,20,10,SS_CENTERIMAGE - CONTROL "Slider1",IDC_SLOWMEM,"msctls_trackbar32",TBS_AUTOTICKS | - TBS_TOP | WS_TABSTOP,179,55,50,20 + CONTROL "Slider1",IDC_SLOWMEM,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,179,55,50,20 RTEXT "Z3-Fast:",IDC_Z3TEXT,139,85,30,10,SS_CENTERIMAGE - CONTROL "Slider1",IDC_Z3FASTMEM,"msctls_trackbar32", - TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,179,80,60,20 - RTEXT "RTG: [] Graphics card memory. Required for Picasso96 emulation.", - IDC_GFXCARDTEXT,96,110,76,10,SS_NOTIFY | SS_CENTERIMAGE - CONTROL "Slider1",IDC_P96MEM,"msctls_trackbar32",TBS_AUTOTICKS | - TBS_TOP | WS_TABSTOP,179,105,60,20 + CONTROL "Slider1",IDC_Z3FASTMEM,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,179,80,60,20 + RTEXT "RTG: [] Graphics card memory. Required for Picasso96 emulation.",IDC_GFXCARDTEXT,96,110,76,10,SS_NOTIFY | SS_CENTERIMAGE + CONTROL "Slider1",IDC_P96MEM,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,179,105,60,20 EDITTEXT IDC_CHIPRAM,105,59,30,12,ES_CENTER | ES_READONLY EDITTEXT IDC_FASTRAM,105,86,30,12,ES_CENTER | ES_READONLY EDITTEXT IDC_SLOWRAM,243,58,30,12,ES_CENTER | ES_READONLY @@ -152,67 +120,40 @@ STYLE DS_SETFONT | DS_3DLOOK | DS_CONTROL | WS_CHILD FONT 8, "MS Sans Serif", 0, 0, 0x0 BEGIN GROUPBOX "CPU Type:",IDC_STATIC,5,5,81,166,BS_LEFT - CONTROL "68000",IDC_CPU0,"Button",BS_AUTORADIOBUTTON | WS_GROUP | - WS_TABSTOP,10,18,63,10 - CONTROL "68010",IDC_CPU1,"Button",BS_AUTORADIOBUTTON | - WS_TABSTOP,10,33,65,10 - CONTROL "68EC020",IDC_CPU2,"Button",BS_AUTORADIOBUTTON | - WS_TABSTOP,10,48,65,10 - CONTROL "68EC020 + FPU",IDC_CPU3,"Button",BS_AUTORADIOBUTTON | - WS_TABSTOP,10,63,68,10 - CONTROL "68020",IDC_CPU4,"Button",BS_AUTORADIOBUTTON | - WS_TABSTOP,10,78,63,10 - CONTROL "68020 + FPU",IDC_CPU5,"Button",BS_AUTORADIOBUTTON | - WS_TABSTOP,10,93,64,10 - CONTROL "68040",IDC_CPU6,"Button",BS_AUTORADIOBUTTON | - WS_TABSTOP,10,108,66,10 - CONTROL "More compatible [] Emulate 68000's prefetch registers. More compatible but slower.", - IDC_COMPATIBLE,"Button",BS_AUTOCHECKBOX | BS_LEFT | - WS_GROUP | WS_TABSTOP,10,130,70,10 - CONTROL "JIT [] Enable Just-In-Time CPU emulator. Increases the speed of CPU emulation 10-100x. Requires 68020 or 68040 CPU.", - IDC_JITENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10, - 145,64,10 + CONTROL "68000",IDC_CPU0,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,10,18,63,10 + CONTROL "68010",IDC_CPU1,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,10,33,65,10 + CONTROL "68EC020",IDC_CPU2,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,10,48,65,10 + CONTROL "68EC020 + FPU",IDC_CPU3,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,10,63,68,10 + CONTROL "68020",IDC_CPU4,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,10,78,63,10 + CONTROL "68020 + FPU",IDC_CPU5,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,10,93,64,10 + CONTROL "68040",IDC_CPU6,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,10,108,66,10 + CONTROL "More compatible [] Emulate 68000's prefetch registers. More compatible but slower.",IDC_COMPATIBLE, + "Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,10,130,70,10 + CONTROL "JIT [] Enable Just-In-Time CPU emulator. Increases the speed of CPU emulation 10-100x. Requires 68020 or 68040 CPU.",IDC_JITENABLE, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,145,64,10 GROUPBOX "CPU Emulation Speed:",IDC_STATIC,90,5,205,86 - CONTROL "Fastest possible, but maintain chipset timing", - IDC_CS_HOST,"Button",BS_AUTORADIOBUTTON | BS_LEFT | - WS_GROUP | WS_TABSTOP,95,18,195,10 - CONTROL "Match A500 speed",IDC_CS_68000,"Button", - BS_AUTORADIOBUTTON | BS_LEFT | WS_TABSTOP,95,32,195,10 + CONTROL "Fastest possible, but maintain chipset timing",IDC_CS_HOST, + "Button",BS_AUTORADIOBUTTON | BS_LEFT | WS_GROUP | WS_TABSTOP,95,18,195,10 + CONTROL "Match A500 speed",IDC_CS_68000,"Button",BS_AUTORADIOBUTTON | BS_LEFT | WS_TABSTOP,95,32,195,10 CONTROL "Adjustable between CPU and chipset",IDC_CS_ADJUSTABLE, - "Button",BS_AUTORADIOBUTTON | BS_LEFT | WS_TABSTOP,95,47, - 195,10 - RTEXT "CPU",IDC_CS_CPU_TEXT,96,71,15,10,SS_CENTERIMAGE | - WS_TABSTOP - CONTROL "Slider1",IDC_SPEED,"msctls_trackbar32",TBS_AUTOTICKS | - TBS_TOP | WS_TABSTOP,114,66,67,20 - LTEXT "Chipset",IDC_CS_CHIPSET_TEXT,182,71,25,10, - SS_CENTERIMAGE | NOT WS_GROUP | WS_TABSTOP - RTEXT "CPU Idle",IDC_CS_CPU_TEXT2,236,56,32,10,SS_CENTERIMAGE | - WS_TABSTOP - CONTROL "",IDC_CPUIDLE,"msctls_trackbar32",TBS_AUTOTICKS | - TBS_TOP | WS_TABSTOP,219,66,69,20 + "Button",BS_AUTORADIOBUTTON | BS_LEFT | WS_TABSTOP,95,47,195,10 + RTEXT "CPU",IDC_CS_CPU_TEXT,96,71,15,10,SS_CENTERIMAGE | WS_TABSTOP + CONTROL "Slider1",IDC_SPEED,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,114,66,67,20 + LTEXT "Chipset",IDC_CS_CHIPSET_TEXT,182,71,25,10,SS_CENTERIMAGE | NOT WS_GROUP | WS_TABSTOP + RTEXT "CPU Idle",IDC_CS_CPU_TEXT2,236,56,32,10,SS_CENTERIMAGE | WS_TABSTOP + CONTROL "",IDC_CPUIDLE,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,219,66,69,20 GROUPBOX "Advanced JIT settings:",IDC_STATIC,90,92,205,79 - RTEXT "Cache Size:",IDC_CS_CACHE_TEXT,95,109,45,10, - SS_CENTERIMAGE | WS_TABSTOP - CONTROL "Slider1",IDC_CACHE,"msctls_trackbar32",TBS_AUTOTICKS | - TBS_TOP | WS_TABSTOP,140,104,115,20 + RTEXT "Cache Size:",IDC_CS_CACHE_TEXT,95,109,45,10,SS_CENTERIMAGE | WS_TABSTOP + CONTROL "Slider1",IDC_CACHE,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,140,104,115,20 EDITTEXT IDC_CACHETEXT,255,109,30,12,ES_CENTER | ES_READONLY - CONTROL "Hard Flush",IDC_HARDFLUSH,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,100,128,60,10 - CONTROL "Const Jump",IDC_CONSTJUMP,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,100,142,60,10 - CONTROL "FPU Support",IDC_JITFPU,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,100,155,60,10 - CONTROL "Force Settings",IDC_FORCE,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,165,128,61,10 - CONTROL "No Flags",IDC_NOFLAGS,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,165,142,60,10 - CONTROL "Direct",IDC_TRUST0,"Button",BS_AUTORADIOBUTTON | - WS_GROUP | WS_TABSTOP,230,128,34,10 - CONTROL "Indirect",IDC_TRUST1,"Button",BS_AUTORADIOBUTTON | - WS_TABSTOP,230,142,45,10 - CONTROL "After Picasso96",IDC_TRUST2,"Button",BS_AUTORADIOBUTTON | - WS_TABSTOP,230,155,64,10 + CONTROL "Hard Flush",IDC_HARDFLUSH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,100,128,60,10 + CONTROL "Const Jump",IDC_CONSTJUMP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,100,142,60,10 + CONTROL "FPU Support",IDC_JITFPU,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,100,155,60,10 + CONTROL "Force Settings",IDC_FORCE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,165,128,61,10 + CONTROL "No Flags",IDC_NOFLAGS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,165,142,60,10 + CONTROL "Direct",IDC_TRUST0,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,230,128,34,10 + CONTROL "Indirect",IDC_TRUST1,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,230,142,45,10 + CONTROL "After Picasso96",IDC_TRUST2,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,230,155,64,10 END IDD_FLOPPY DIALOGEX 0, 0, 300, 230 @@ -220,66 +161,44 @@ STYLE DS_SETFONT | DS_3DLOOK | DS_CONTROL | WS_CHILD FONT 8, "MS Sans Serif", 0, 0, 0x0 BEGIN RTEXT "DF0:",IDC_STATIC,10,7,20,10,SS_CENTERIMAGE - COMBOBOX IDC_DF0TEXT,2,22,296,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | - WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_DF0TYPE,123,6,49,50,CBS_DROPDOWNLIST | WS_VSCROLL | - WS_TABSTOP + COMBOBOX IDC_DF0TEXT,2,22,296,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_DF0TYPE,123,6,49,50,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP RTEXT "Write Protected",IDC_STATIC,174,8,59,10,SS_CENTERIMAGE - CONTROL "",IDC_DF0WP,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | - WS_TABSTOP,238,4,10,15 + CONTROL "",IDC_DF0WP,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,238,4,10,15 PUSHBUTTON "Eject",IDC_EJECT0,253,4,30,15 PUSHBUTTON "...",IDC_DF0,287,4,10,15 RTEXT "DF1:",IDC_STATIC,10,42,20,10,SS_CENTERIMAGE - COMBOBOX IDC_DF1TEXT,2,58,296,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | - WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_DF1TYPE,123,42,49,50,CBS_DROPDOWNLIST | WS_VSCROLL | - WS_TABSTOP + COMBOBOX IDC_DF1TEXT,2,58,296,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_DF1TYPE,123,42,49,50,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP RTEXT "Write Protected",IDC_STATIC,174,43,59,10,SS_CENTERIMAGE - CONTROL "",IDC_DF1WP,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | - WS_TABSTOP,238,40,10,15 + CONTROL "",IDC_DF1WP,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,238,40,10,15 PUSHBUTTON "Eject",IDC_EJECT1,253,40,30,15 PUSHBUTTON "...",IDC_DF1,287,40,10,15 RTEXT "DF2:",IDC_STATIC,10,77,20,10,SS_CENTERIMAGE - COMBOBOX IDC_DF2TEXT,2,93,296,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | - WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_DF2TYPE,123,77,49,50,CBS_DROPDOWNLIST | WS_VSCROLL | - WS_TABSTOP + COMBOBOX IDC_DF2TEXT,2,93,296,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_DF2TYPE,123,77,49,50,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP RTEXT "Write Protected",IDC_STATIC,174,77,59,10,SS_CENTERIMAGE - CONTROL "",IDC_DF2WP,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | - WS_TABSTOP,238,75,9,15 + CONTROL "",IDC_DF2WP,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,238,75,9,15 PUSHBUTTON "Eject",IDC_EJECT2,253,75,30,15 PUSHBUTTON "...",IDC_DF2,287,75,10,15 RTEXT "DF3:",IDC_STATIC,10,112,20,9,SS_CENTERIMAGE - COMBOBOX IDC_DF3TEXT,2,128,296,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | - WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_DF3TYPE,123,112,49,50,CBS_DROPDOWNLIST | WS_VSCROLL | - WS_TABSTOP - RTEXT "Write Protected",IDC_STATIC,174,113,59,10, - SS_CENTERIMAGE - CONTROL "",IDC_DF3WP,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | - WS_TABSTOP,238,111,9,15 + COMBOBOX IDC_DF3TEXT,2,128,296,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_DF3TYPE,123,112,49,50,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + RTEXT "Write Protected",IDC_STATIC,174,113,59,10,SS_CENTERIMAGE + CONTROL "",IDC_DF3WP,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,238,111,9,15 PUSHBUTTON "Eject",IDC_EJECT3,253,110,30,15 PUSHBUTTON "...",IDC_DF3,287,109,10,15 GROUPBOX "New disk image",IDC_SETTINGSTEXT,5,147,289,35 - COMBOBOX IDC_FLOPPYTYPE,16,160,51,50,CBS_DROPDOWNLIST | - WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Create Standard ""Floppy"" [] Creates standard 880kb ADF disk image.", - IDC_CREATE,76,160,97,15 - PUSHBUTTON "Create Custom ""Floppy"" [] Creates ~2Mb low level (MFM) ADF disk image. Useful for programs that use non-AmigaDOS disk format (for example some save disks or MSDOS formatted floppies)", - IDC_CREATE_RAW,183,160,101,15 - GROUPBOX "Floppy drive emulation speed",IDC_SETTINGSTEXT2,5,185, - 289,35 - CONTROL "",IDC_FLOPPYSPD,"msctls_trackbar32",TBS_AUTOTICKS | - TBS_TOP | WS_TABSTOP,32,193,116,20 + COMBOBOX IDC_FLOPPYTYPE,16,160,51,50,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Create Standard ""Floppy"" [] Creates standard 880kb ADF disk image.",IDC_CREATE,76,160,97,15 + PUSHBUTTON "Create Custom ""Floppy"" [] Creates ~2Mb low level (MFM) ADF disk image. Useful for programs that use non-AmigaDOS disk format (for example some save disks or MSDOS formatted floppies)",IDC_CREATE_RAW,183,160,101,15 + GROUPBOX "Floppy drive emulation speed",IDC_SETTINGSTEXT2,5,185,289,35 + CONTROL "",IDC_FLOPPYSPD,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,32,193,116,20 EDITTEXT IDC_FLOPPYSPDTEXT,169,196,107,12,ES_CENTER | ES_READONLY - PUSHBUTTON "Delete Saveimage",IDC_SAVEIMAGE0,43,5,70,15,NOT - WS_VISIBLE - PUSHBUTTON "Delete Saveimage",IDC_SAVEIMAGE1,43,40,70,15,NOT - WS_VISIBLE - PUSHBUTTON "Delete Saveimage",IDC_SAVEIMAGE2,43,75,70,15,NOT - WS_VISIBLE - PUSHBUTTON "Delete Saveimage",IDC_SAVEIMAGE3,43,110,70,15,NOT - WS_VISIBLE + PUSHBUTTON "Delete Saveimage",IDC_SAVEIMAGE0,43,5,70,15,NOT WS_VISIBLE + PUSHBUTTON "Delete Saveimage",IDC_SAVEIMAGE1,43,40,70,15,NOT WS_VISIBLE + PUSHBUTTON "Delete Saveimage",IDC_SAVEIMAGE2,43,75,70,15,NOT WS_VISIBLE + PUSHBUTTON "Delete Saveimage",IDC_SAVEIMAGE3,43,110,70,15,NOT WS_VISIBLE END IDD_HARDDISK DIALOGEX 0, 0, 300, 242 @@ -287,21 +206,15 @@ STYLE DS_SETFONT | DS_3DLOOK | DS_CONTROL | WS_CHILD EXSTYLE WS_EX_CONTEXTHELP FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN - CONTROL "List1",IDC_VOLUMELIST,"SysListView32",LVS_REPORT | - LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | - LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,5,5,290,185 + CONTROL "List1",IDC_VOLUMELIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,5,5,290,185 PUSHBUTTON "Add &Directory...",IDC_NEW_FS,5,196,60,15 PUSHBUTTON "Add &Hardfile...",IDC_NEW_HF,70,196,60,15 PUSHBUTTON "Add Ha&rddrive...",IDC_NEW_HD,135,196,60,15 PUSHBUTTON "Remove",IDC_REMOVE,235,196,60,15 PUSHBUTTON "&Properties",IDC_EDIT,235,217,60,15 - CONTROL "Add PC Drives at Startup",IDC_MAPDRIVES,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,5,216,105,10,0, - HIDC_MAPDRIVES - CONTROL "Disable UAEFSDB-support",IDC_NOUAEFSDB,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,5,229,115,10 - CONTROL "Don't use Windows Recycle Bin",IDC_NORECYCLEBIN,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,114,216,115,10 + CONTROL "Add PC Drives at Startup",IDC_MAPDRIVES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,216,105,10,0,HIDC_MAPDRIVES + CONTROL "Disable UAEFSDB-support",IDC_NOUAEFSDB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,229,115,10 + CONTROL "Don't use Windows Recycle Bin",IDC_NORECYCLEBIN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,114,216,115,10 END IDD_SOUND DIALOGEX 0, 0, 300, 244 @@ -309,91 +222,58 @@ STYLE DS_SETFONT | DS_3DLOOK | DS_CONTROL | WS_CHILD FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN RTEXT "Sound device:",IDC_SOUNDCARD,8,9,51,13,SS_CENTERIMAGE - COMBOBOX IDC_SOUNDCARDLIST,64,9,229,50,CBS_DROPDOWNLIST | - WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_SOUNDCARDLIST,64,9,229,50,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Sound Emulation",IDC_SOUNDSETTINGS,5,30,120,68 - CONTROL "Disabled",IDC_SOUND0,"Button",BS_AUTORADIOBUTTON | - WS_GROUP | WS_TABSTOP,13,45,43,10 - CONTROL "Disabled, but emulated",IDC_SOUND1,"Button", - BS_AUTORADIOBUTTON | WS_TABSTOP,13,57,88,10 - CONTROL "Enabled",IDC_SOUND2,"Button",BS_AUTORADIOBUTTON | - WS_TABSTOP,13,69,42,10 - CONTROL "Enabled, 100% accurate",IDC_SOUND3,"Button", - BS_AUTORADIOBUTTON | WS_TABSTOP,13,81,93,10 + CONTROL "Disabled",IDC_SOUND0,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,13,45,43,10 + CONTROL "Disabled, but emulated",IDC_SOUND1,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,13,57,88,10 + CONTROL "Enabled",IDC_SOUND2,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,13,69,42,10 + CONTROL "Enabled, 100% accurate",IDC_SOUND3,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,13,81,93,10 GROUPBOX "Volume",IDC_STATIC,131,30,164,31 - CONTROL "",IDC_SOUNDVOLUME,"msctls_trackbar32",TBS_AUTOTICKS | - TBS_TOP | WS_TABSTOP,137,38,105,20 + CONTROL "",IDC_SOUNDVOLUME,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,137,38,105,20 EDITTEXT IDC_SOUNDVOLUME2,247,41,40,12,ES_CENTER | ES_READONLY GROUPBOX "Sound buffer size",IDC_STATIC,132,67,164,31 - CONTROL "Slider1",IDC_SOUNDBUFFERRAM,"msctls_trackbar32", - TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,138,75,106,19 + CONTROL "Slider1",IDC_SOUNDBUFFERRAM,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,138,75,106,19 EDITTEXT IDC_SOUNDBUFFERMEM,248,78,40,12,ES_CENTER | ES_READONLY GROUPBOX "Settings",IDC_SOUNDINTERPOLATION2,6,101,290,60 LTEXT "Frequency",IDC_SOUNDFREQTXT,13,111,37,8,SS_CENTERIMAGE - COMBOBOX IDC_SOUNDFREQ,15,120,59,75,CBS_DROPDOWN | WS_VSCROLL | - WS_TABSTOP - LTEXT "Audio filter",IDC_SOUNDFILTERTXT,227,135,34,8, - SS_CENTERIMAGE - COMBOBOX IDC_SOUNDFILTER,227,144,62,75,CBS_DROPDOWNLIST | - WS_VSCROLL | WS_TABSTOP - LTEXT "Stereo mode",IDC_SOUNDSTEREOTXT,86,111,41,8, - SS_CENTERIMAGE - COMBOBOX IDC_SOUNDSTEREO,85,120,62,75,CBS_DROPDOWNLIST | - WS_VSCROLL | WS_TABSTOP - LTEXT "Interpolation",IDC_SOUNDINTERPOLATIONTXT,227,111,41,8, - SS_CENTERIMAGE - COMBOBOX IDC_SOUNDINTERPOLATION,227,119,62,75,CBS_DROPDOWNLIST | - WS_VSCROLL | WS_TABSTOP - LTEXT "Stereo separation",IDC_SOUNDSTEREOSEPTXT,155,111,56,8, - SS_CENTERIMAGE - COMBOBOX IDC_SOUNDSTEREOSEP,156,120,62,75,CBS_DROPDOWNLIST | - WS_VSCROLL | WS_TABSTOP - LTEXT "Stereo mixing delay",IDC_SOUNDSTEREOMIXTXT,155,135,63,8, - SS_CENTERIMAGE - COMBOBOX IDC_SOUNDSTEREOMIX,156,144,62,75,CBS_DROPDOWNLIST | - WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_SOUNDFREQ,15,120,59,75,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + LTEXT "Audio filter",IDC_SOUNDFILTERTXT,227,135,34,8,SS_CENTERIMAGE + COMBOBOX IDC_SOUNDFILTER,227,144,62,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Stereo mode",IDC_SOUNDSTEREOTXT,86,111,41,8,SS_CENTERIMAGE + COMBOBOX IDC_SOUNDSTEREO,85,120,62,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Interpolation",IDC_SOUNDINTERPOLATIONTXT,227,111,41,8,SS_CENTERIMAGE + COMBOBOX IDC_SOUNDINTERPOLATION,227,119,62,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Stereo separation",IDC_SOUNDSTEREOSEPTXT,155,111,56,8,SS_CENTERIMAGE + COMBOBOX IDC_SOUNDSTEREOSEP,156,120,62,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Stereo mixing delay",IDC_SOUNDSTEREOMIXTXT,155,135,63,8,SS_CENTERIMAGE + COMBOBOX IDC_SOUNDSTEREOMIX,156,144,62,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Disk Drive Sound Emulation",IDC_STATIC,6,164,290,46 - CONTROL "",IDC_SOUNDDRIVEVOLUME,"msctls_trackbar32", - TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,14,172,107,19 - EDITTEXT IDC_SOUNDDRIVEVOLUME2,124,178,40,12,ES_CENTER | - ES_READONLY - COMBOBOX IDC_SOUNDDRIVE,237,174,46,75,CBS_DROPDOWNLIST | - WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_SOUNDDRIVESELECT,18,192,265,75,CBS_DROPDOWNLIST | - WS_VSCROLL | WS_TABSTOP + CONTROL "",IDC_SOUNDDRIVEVOLUME,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,14,172,107,19 + EDITTEXT IDC_SOUNDDRIVEVOLUME2,124,178,40,12,ES_CENTER | ES_READONLY + COMBOBOX IDC_SOUNDDRIVE,237,174,46,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_SOUNDDRIVESELECT,18,192,265,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Sound driver lag compensation",IDC_STATIC,6,211,290,31 - CONTROL "Slider1",IDC_SOUNDADJUST,"msctls_trackbar32", - TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,14,221,107,19 + CONTROL "Slider1",IDC_SOUNDADJUST,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,14,221,107,19 EDITTEXT IDC_SOUNDADJUSTNUM,124,224,40,12,ES_CENTER | ES_READONLY PUSHBUTTON "Calibrate",IDC_SOUNDCALIBRATE,183,223,40,14 - COMBOBOX IDC_SOUNDSWAP,85,144,62,75,CBS_DROPDOWNLIST | WS_VSCROLL | - WS_TABSTOP - LTEXT "Swap channels",IDC_SOUNDSWAPTXT,86,135,50,8, - SS_CENTERIMAGE + COMBOBOX IDC_SOUNDSWAP,85,144,62,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Swap channels",IDC_SOUNDSWAPTXT,86,135,50,8,SS_CENTERIMAGE END IDD_LOADSAVE DIALOGEX 0, 0, 302, 241 STYLE DS_SETFONT | DS_3DLOOK | DS_CONTROL | WS_CHILD FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN - CONTROL "",IDC_CONFIGTREE,"SysTreeView32",TVS_HASLINES | - TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | WS_BORDER | - WS_TABSTOP,6,3,289,153,WS_EX_CLIENTEDGE + CONTROL "",IDC_CONFIGTREE,"SysTreeView32",TVS_HASLINES | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,6,3,289,153,WS_EX_CLIENTEDGE RTEXT "Name:",IDC_STATIC,0,161,40,15,SS_CENTERIMAGE - EDITTEXT IDC_EDITNAME,44,162,150,13,ES_AUTOHSCROLL,0, - HIDC_EDITNAME + EDITTEXT IDC_EDITNAME,44,162,150,13,ES_AUTOHSCROLL,0,HIDC_EDITNAME RTEXT "Description:",IDC_STATIC,4,183,37,15,SS_CENTERIMAGE - EDITTEXT IDC_EDITDESCRIPTION,44,183,150,13,ES_AUTOHSCROLL,0, - HIDC_EDITDESCRIPTION + EDITTEXT IDC_EDITDESCRIPTION,44,183,150,13,ES_AUTOHSCROLL,0,HIDC_EDITDESCRIPTION RTEXT "Link:",IDC_STATIC,0,204,40,15,SS_CENTERIMAGE - COMBOBOX IDC_CONFIGLINK,44,205,97,150,CBS_DROPDOWN | - CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP - CONTROL "Ignore link",IDC_CONFIGNOLINK,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,146,206,48,10 - EDITTEXT IDC_EDITPATH,199,161,49,15,ES_AUTOHSCROLL | WS_DISABLED, - 0,HIDC_EDITPATH - CONTROL "Autoload",IDC_CONFIGAUTO,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,253,163,42,10 + COMBOBOX IDC_CONFIGLINK,44,205,97,150,CBS_DROPDOWN | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + CONTROL "Ignore link",IDC_CONFIGNOLINK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,146,206,48,10 + EDITTEXT IDC_EDITPATH,199,161,49,15,ES_AUTOHSCROLL | WS_DISABLED,0,HIDC_EDITPATH + CONTROL "Autoload",IDC_CONFIGAUTO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,253,163,42,10 GROUPBOX "Extra info",IDC_STATIC,199,179,96,38,BS_LEFT PUSHBUTTON "View",IDC_VIEWINFO,210,195,35,15 PUSHBUTTON "Set",IDC_SETINFO,250,195,35,15 @@ -410,100 +290,59 @@ FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN GROUPBOX "Parallel Port",IDC_SERPARFRAME,5,2,291,68 RTEXT "Printer:",IDC_STATIC,12,15,25,15,SS_CENTERIMAGE - COMBOBOX IDC_PRINTERLIST,49,15,153,134,CBS_DROPDOWNLIST | - WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PRINTERLIST,49,15,153,134,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Flush print job",IDC_FLUSHPRINTER,220,14,58,12 - CONTROL "PostScript detection",IDC_PSPRINTERDETECT,"Button", - BS_AUTOCHECKBOX | BS_VCENTER | WS_TABSTOP,11,33,78,12 - CONTROL "PostScript printer emulation",IDC_PSPRINTER,"Button", - BS_AUTOCHECKBOX | BS_VCENTER | WS_TABSTOP,93,33,100,12 - RTEXT "Autoflush timeout [] Time in seconds after pending print job is automatically flushed.", - IDC_PRINTERAUTOFLUSHTXT,202,32,57,15,SS_NOTIFY | - SS_CENTERIMAGE + CONTROL "PostScript detection",IDC_PSPRINTERDETECT,"Button",BS_AUTOCHECKBOX | BS_VCENTER | WS_TABSTOP,11,33,78,12 + CONTROL "PostScript printer emulation",IDC_PSPRINTER,"Button",BS_AUTOCHECKBOX | BS_VCENTER | WS_TABSTOP,93,33,100,12 + RTEXT "Autoflush timeout [] Time in seconds after pending print job is automatically flushed.",IDC_PRINTERAUTOFLUSHTXT,202,32,57,15,SS_NOTIFY | SS_CENTERIMAGE EDITTEXT IDC_PRINTERAUTOFLUSH,263,33,25,12,ES_NUMBER - RTEXT "Ghostscript extra parameters:",IDC_STATIC,12,49,91,15, - SS_CENTERIMAGE + RTEXT "Ghostscript extra parameters:",IDC_STATIC,12,49,91,15,SS_CENTERIMAGE EDITTEXT IDC_PS_PARAMS,120,50,169,12,ES_AUTOHSCROLL GROUPBOX "Serial Port",IDC_SERIALFRAME,4,72,292,29 - COMBOBOX IDC_SERIAL,19,83,95,65,CBS_DROPDOWNLIST | WS_VSCROLL | - WS_TABSTOP - CONTROL "Shared",IDC_SHARED,"Button",BS_AUTOCHECKBOX | - BS_VCENTER | WS_TABSTOP,132,83,48,13 - CONTROL "RTS/CTS",IDC_SER_CTSRTS,"Button",BS_AUTOCHECKBOX | - BS_VCENTER | WS_TABSTOP,185,83,53,12 - CONTROL "Direct []Use when emulating serial linked games on two PCs running WinUAE", - IDC_SERIAL_DIRECT,"Button",BS_AUTOCHECKBOX | BS_VCENTER | - WS_TABSTOP,243,83,46,12 + COMBOBOX IDC_SERIAL,19,83,95,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "Shared",IDC_SHARED,"Button",BS_AUTOCHECKBOX | BS_VCENTER | WS_TABSTOP,132,83,48,13 + CONTROL "RTS/CTS",IDC_SER_CTSRTS,"Button",BS_AUTOCHECKBOX | BS_VCENTER | WS_TABSTOP,185,83,53,12 + CONTROL "Direct []Use when emulating serial linked games on two PCs running WinUAE",IDC_SERIAL_DIRECT, + "Button",BS_AUTOCHECKBOX | BS_VCENTER | WS_TABSTOP,243,83,46,12 GROUPBOX "MIDI",IDC_MIDIFRAME,4,104,292,33 RTEXT "Out:",IDC_MIDI,10,115,34,15,SS_CENTERIMAGE - COMBOBOX IDC_MIDIOUTLIST,50,115,95,130,CBS_DROPDOWNLIST | - WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_MIDIOUTLIST,50,115,95,130,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP RTEXT "In:",IDC_MIDI2,150,115,29,15,SS_CENTERIMAGE - COMBOBOX IDC_MIDIINLIST,185,115,95,134,CBS_DROPDOWNLIST | - WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_MIDIINLIST,185,115,95,134,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Mouse/Joystick Ports",IDC_PORT0,4,139,292,75 - COMBOBOX IDC_PORT0_JOYS,45,155,241,130,CBS_DROPDOWNLIST | - WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_PORT1_JOYS,45,176,241,130,CBS_DROPDOWNLIST | - WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PORT0_JOYS,45,155,241,130,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PORT1_JOYS,45,176,241,130,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Swap Ports",IDC_SWAP,211,195,75,14 RTEXT "Port 0:",IDC_STATIC,11,154,25,15,SS_CENTERIMAGE RTEXT "Port 1:",IDC_STATIC,11,175,25,15,SS_CENTERIMAGE - LTEXT "X-Arcade layout information []#1",IDC_STATIC,16,195,106, - 15,SS_NOTIFY | SS_CENTERIMAGE + LTEXT "X-Arcade layout information []#1",IDC_STATIC,16,195,106,15,SS_NOTIFY | SS_CENTERIMAGE END IDD_CONTRIBUTORS DIALOGEX 0, 0, 411, 242 -STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK | WS_POPUP | - WS_VISIBLE | WS_CAPTION +STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION CAPTION "UAE Authors and Contributors..." FONT 8, "MS Sans Serif", 0, 0, 0x0 BEGIN DEFPUSHBUTTON "Ok",ID_OK,177,219,53,14 - CONTROL "",IDC_CONTRIBUTORS,"RICHEDIT",TCS_HOTTRACK | - TCS_VERTICAL | TCS_RAGGEDRIGHT | TCS_OWNERDRAWFIXED | - TCS_MULTISELECT | WS_BORDER | WS_VSCROLL | WS_HSCROLL | - WS_TABSTOP,4,5,404,206 + CONTROL "",IDC_CONTRIBUTORS,"RICHEDIT",TCS_HOTTRACK | TCS_VERTICAL | TCS_RAGGEDRIGHT | TCS_OWNERDRAWFIXED | TCS_MULTISELECT | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,4,5,404,206 END IDD_ABOUT DIALOGEX 0, 0, 300, 175 STYLE DS_SETFONT | DS_3DLOOK | DS_CONTROL | WS_CHILD FONT 8, "MS Sans Serif", 0, 0, 0x0 BEGIN - CONTROL "",IDC_RICHEDIT1,"RICHEDIT",TCS_SCROLLOPPOSITE | - TCS_RAGGEDRIGHT | TCS_MULTISELECT | WS_DISABLED,45,10, - 210,15 - CONTROL "",IDC_RICHEDIT2,"RICHEDIT",TCS_SCROLLOPPOSITE | - TCS_RAGGEDRIGHT | TCS_MULTISELECT | WS_DISABLED,20,30, - 260,13 + CONTROL "",IDC_RICHEDIT1,"RICHEDIT",TCS_SCROLLOPPOSITE | TCS_RAGGEDRIGHT | TCS_MULTISELECT | WS_DISABLED,45,10,210,15 + CONTROL "",IDC_RICHEDIT2,"RICHEDIT",TCS_SCROLLOPPOSITE | TCS_RAGGEDRIGHT | TCS_MULTISELECT | WS_DISABLED,20,30,260,13 PUSHBUTTON "Contributors",IDC_CONTRIBUTORS,110,55,80,15 - CONTROL "",IDC_CLOANTOHOME,"RICHEDIT",TCS_SCROLLOPPOSITE | - TCS_RAGGEDRIGHT | TCS_MULTISELECT | WS_DISABLED,20,90,80, - 20 - CONTROL "",IDC_UAEHOME,"RICHEDIT",TCS_SCROLLOPPOSITE | - TCS_RAGGEDRIGHT | TCS_MULTISELECT | WS_DISABLED,20,120, - 80,15 - CONTROL "",IDC_PICASSOHOME,"RICHEDIT",TCS_SCROLLOPPOSITE | - TCS_RAGGEDRIGHT | TCS_MULTISELECT | WS_DISABLED,200,90, - 80,20 - CONTROL "",IDC_AMIGAHOME,"RICHEDIT",TCS_SCROLLOPPOSITE | - TCS_RAGGEDRIGHT | TCS_MULTISELECT | WS_DISABLED,110,90, - 80,15 - CONTROL "",IDC_WINUAEHOME,"RICHEDIT",TCS_SCROLLOPPOSITE | - TCS_RAGGEDRIGHT | TCS_MULTISELECT | WS_DISABLED,200,120, - 80,15 - CONTROL "",IDC_AIABHOME,"RICHEDIT",TCS_SCROLLOPPOSITE | - TCS_RAGGEDRIGHT | TCS_MULTISELECT | WS_DISABLED,110,120, - 80,15 - CONTROL "",IDC_THEROOTS,"RICHEDIT",TCS_SCROLLOPPOSITE | - TCS_RAGGEDRIGHT | TCS_MULTISELECT | WS_DISABLED,20,145, - 80,15 - CONTROL "",IDC_CAPS,"RICHEDIT",TCS_SCROLLOPPOSITE | - TCS_RAGGEDRIGHT | TCS_MULTISELECT | WS_DISABLED,200,145, - 80,15 - CONTROL "",IDC_ABIME,"RICHEDIT",TCS_SCROLLOPPOSITE | - TCS_RAGGEDRIGHT | TCS_MULTISELECT | WS_DISABLED,110,145, - 80,15 + CONTROL "",IDC_UAEHOME,"RICHEDIT",TCS_SCROLLOPPOSITE | TCS_RAGGEDRIGHT | TCS_MULTISELECT | WS_DISABLED,20,120,80,15 + CONTROL "",IDC_PICASSOHOME,"RICHEDIT",TCS_SCROLLOPPOSITE | TCS_RAGGEDRIGHT | TCS_MULTISELECT | WS_DISABLED,200,90,80,20 + CONTROL "",IDC_AMIGAHOME,"RICHEDIT",TCS_SCROLLOPPOSITE | TCS_RAGGEDRIGHT | TCS_MULTISELECT | WS_DISABLED,110,90,80,15 + CONTROL "",IDC_WINUAEHOME,"RICHEDIT",TCS_SCROLLOPPOSITE | TCS_RAGGEDRIGHT | TCS_MULTISELECT | WS_DISABLED,200,120,80,15 + CONTROL "",IDC_AIABHOME,"RICHEDIT",TCS_SCROLLOPPOSITE | TCS_RAGGEDRIGHT | TCS_MULTISELECT | WS_DISABLED,110,120,80,15 + CONTROL "",IDC_THEROOTS,"RICHEDIT",TCS_SCROLLOPPOSITE | TCS_RAGGEDRIGHT | TCS_MULTISELECT | WS_DISABLED,20,145,80,15 + CONTROL "",IDC_CAPS,"RICHEDIT",TCS_SCROLLOPPOSITE | TCS_RAGGEDRIGHT | TCS_MULTISELECT | WS_DISABLED,200,145,80,15 + CONTROL "",IDC_ABIME,"RICHEDIT",TCS_SCROLLOPPOSITE | TCS_RAGGEDRIGHT | TCS_MULTISELECT | WS_DISABLED,110,145,80,15 + CONTROL "",IDC_CLOANTOHOME,"RICHEDIT",TCS_SCROLLOPPOSITE | TCS_RAGGEDRIGHT | TCS_MULTISELECT | WS_DISABLED,20,90,80,20 END IDD_MISC1 DIALOGEX 0, 0, 300, 219 @@ -511,61 +350,37 @@ STYLE DS_SETFONT | DS_3DLOOK | DS_CONTROL | WS_CHILD FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN GROUPBOX "Advanced:",IDC_STATIC,8,4,285,103 - CONTROL "Middle-Mouse-Button --> ALT-TAB",IDC_JULIAN,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,29,19,120,10 - CONTROL "Show GUI on startup",IDC_SHOWGUI,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,29,34,120,10 - CONTROL "On-Screen LEDs",IDC_SHOWLEDS,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,29,49,115,10 - CONTROL "UAEscsi.device",IDC_SCSIDEVICE,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,29,64,117,10 - CONTROL "Don't show Taskbar button",IDC_NOTASKBARBUTTON,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,29,78,117,10 - CONTROL "BSDsocket.library emulation",IDC_SOCKETS,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,159,19,120,10 - CONTROL "Use CTRL-F11 to quit",IDC_CTRLF11,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,159,34,120,10 - CONTROL "Don't use RGB overlays",IDC_NOOVERLAY,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,159,49,120,10 - CONTROL "Use ASPI SCSI layer",IDC_ASPI,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,159,64,115,10 - CONTROL "Syncronize clock",IDC_CLOCKSYNC,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,159,78,115,10 + CONTROL "Middle-Mouse-Button --> ALT-TAB",IDC_JULIAN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,29,19,120,10 + CONTROL "Show GUI on startup",IDC_SHOWGUI,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,29,34,120,10 + CONTROL "On-Screen LEDs",IDC_SHOWLEDS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,29,49,115,10 + CONTROL "UAEscsi.device",IDC_SCSIDEVICE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,29,64,117,10 + CONTROL "Don't show Taskbar button",IDC_NOTASKBARBUTTON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,29,78,117,10 + CONTROL "BSDsocket.library emulation",IDC_SOCKETS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,159,19,120,10 + CONTROL "Use CTRL-F11 to quit",IDC_CTRLF11,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,159,34,120,10 + CONTROL "Don't use RGB overlays",IDC_NOOVERLAY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,159,49,120,10 + CONTROL "Use ASPI SCSI layer",IDC_ASPI,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,159,64,115,10 + CONTROL "Syncronize clock",IDC_CLOCKSYNC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,159,78,115,10 GROUPBOX "Keyboard LEDs:",IDC_STATIC,7,110,85,73 - COMBOBOX IDC_KBLED1,22,123,56,65,CBS_DROPDOWNLIST | WS_VSCROLL | - WS_TABSTOP - COMBOBOX IDC_KBLED2,22,142,56,65,CBS_DROPDOWNLIST | WS_VSCROLL | - WS_TABSTOP - COMBOBOX IDC_KBLED3,22,162,56,65,CBS_DROPDOWNLIST | WS_VSCROLL | - WS_TABSTOP + COMBOBOX IDC_KBLED1,22,123,56,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_KBLED2,22,142,56,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_KBLED3,22,162,56,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Logging:",IDC_STATIC,97,110,195,25 - CONTROL "Create log file",IDC_CREATELOGFILE,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,107,120,72,10,0, - HIDC_CREATELOGFILE - CONTROL "Illegal mem accesses",IDC_ILLEGAL,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,189,120,80,10 + CONTROL "Create log file",IDC_CREATELOGFILE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,107,120,72,10,0,HIDC_CREATELOGFILE + CONTROL "Illegal mem accesses",IDC_ILLEGAL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,189,120,80,10 GROUPBOX "State files:",IDC_STATIC,98,137,195,78 PUSHBUTTON "Load state...",IDC_DOLOADSTATE,105,156,49,14 PUSHBUTTON "Save state...",IDC_DOSAVESTATE,106,182,49,14 - CONTROL "Enable state recording",IDC_STATE_CAPTURE,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,188,155,88,10 - RTEXT "Recording rate (seconds)",IDC_STATE_RATE_TEXT,157,173, - 86,10,SS_CENTERIMAGE | WS_TABSTOP - COMBOBOX IDC_STATE_RATE,248,171,38,65,CBS_DROPDOWN | WS_VSCROLL | - WS_TABSTOP - RTEXT "Recording buffer (MB)",IDC_STATE_BUFFERSIZE_TEXT,157, - 193,83,10,SS_CENTERIMAGE | WS_TABSTOP - COMBOBOX IDC_STATE_BUFFERSIZE,248,191,38,65,CBS_DROPDOWN | - WS_VSCROLL | WS_TABSTOP - CONTROL "Always on top",IDC_ALWAYSONTOP,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,29,92,117,10 - CONTROL "Catweasel",IDC_CATWEASEL,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,159,92,115,10 + CONTROL "Enable state recording",IDC_STATE_CAPTURE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,188,155,88,10 + RTEXT "Recording rate (seconds)",IDC_STATE_RATE_TEXT,157,173,86,10,SS_CENTERIMAGE | WS_TABSTOP + COMBOBOX IDC_STATE_RATE,248,171,38,65,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + RTEXT "Recording buffer (MB)",IDC_STATE_BUFFERSIZE_TEXT,157,193,83,10,SS_CENTERIMAGE | WS_TABSTOP + COMBOBOX IDC_STATE_BUFFERSIZE,248,191,38,65,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + CONTROL "Always on top",IDC_ALWAYSONTOP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,29,92,117,10 + CONTROL "Catweasel",IDC_CATWEASEL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,159,92,115,10 END IDD_HARDFILE DIALOGEX 0, 0, 299, 212 -STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK | DS_CENTER | - DS_CENTERMOUSE | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK | DS_CENTER | DS_CENTERMOUSE | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Hardfile Settings" FONT 8, "MS Sans Serif", 0, 0, 0x0 BEGIN @@ -580,8 +395,7 @@ BEGIN EDITTEXT IDC_HARDFILE_DEVICE,52,54,40,15,ES_AUTOHSCROLL RTEXT "BootPri:",IDC_HARDFILE_BOOTPRI_TEXT,18,79,30,8 EDITTEXT IDC_HARDFILE_BOOTPRI,52,75,40,15 - CONTROL "Read/Write",IDC_RW,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,110,57,50,10 + CONTROL "Read/Write",IDC_RW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,110,57,50,10 PUSHBUTTON "Enable RDB-mode",IDC_HDF_RDB,192,55,92,14 RTEXT "Surfaces:",IDC_SURFACES_TEXT,112,79,30,10 EDITTEXT IDC_HEADS,147,75,35,15,ES_NUMBER @@ -597,16 +411,14 @@ BEGIN PUSHBUTTON "OK",IDOK,102,191,50,14 PUSHBUTTON "Cancel",IDCANCEL,158,191,50,14 EDITTEXT IDC_HF_DOSTYPE,146,158,61,15 - COMBOBOX IDC_HF_TYPE,50,158,80,150,CBS_DROPDOWNLIST | - CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_HF_TYPE,50,158,80,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP RTEXT "DosType",IDC_STATIC,212,160,30,10,SS_CENTERIMAGE RTEXT "Megabytes",IDC_STATIC,212,138,35,10,SS_CENTERIMAGE RTEXT "Type:",IDC_STATIC,18,160,25,10,SS_CENTERIMAGE END IDD_FILESYS DIALOGEX 15, 25, 299, 111 -STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK | DS_CENTER | - DS_CENTERMOUSE | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK | DS_CENTER | DS_CENTERMOUSE | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Volume Settings" FONT 8, "MS Sans Serif", 0, 0, 0x0 BEGIN @@ -617,8 +429,7 @@ BEGIN LTEXT "Path:",-1,5,51,44,10 EDITTEXT IDC_PATH_NAME,65,46,213,15,ES_AUTOHSCROLL PUSHBUTTON "...",IDC_SELECTOR,283,46,10,15 - CONTROL "Read/Write",IDC_RW,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,5,70,50,10 + CONTROL "Read/Write",IDC_RW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,70,50,10 RTEXT "BootPri:",IDC_VOLUME_BOOTPRI_TEXT,68,70,30,8 EDITTEXT IDC_VOLUME_BOOTPRI,106,68,27,15 PUSHBUTTON "OK",IDOK,120,91,48,15 @@ -626,8 +437,7 @@ BEGIN END IDD_SETINFO DIALOGEX 0, 0, 229, 85 -STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK | DS_CENTER | - DS_CENTERMOUSE | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK | DS_CENTER | DS_CENTERMOUSE | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Info Settings" FONT 8, "MS Sans Serif", 0, 0, 0x0 BEGIN @@ -643,51 +453,36 @@ STYLE DS_SETFONT | DS_3DLOOK | DS_CONTROL | WS_CHILD FONT 8, "MS Sans Serif", 0, 0, 0x0 BEGIN GROUPBOX "Chipset type",IDC_STATIC,14,11,145,82 - CONTROL "OCS [] The original Amiga chipset (A1000, most A500s)", - IDC_OCS,"Button",BS_AUTORADIOBUTTON | WS_GROUP | - WS_TABSTOP,38,31,51,10 - CONTROL "ECS Agnus [] Partial Enhanced Chipset. Later A500 and A2000 hardware revisions.", - IDC_ECS_AGNUS,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP, - 38,47,55,10 - CONTROL "Full ECS [] Full ECS Chipset, ECS Agnus and ECS Denise. (A500+, A600, A3000)", - IDC_ECS,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,38,63, - 52,10 - CONTROL "AGA [] The next generation Amiga chipset (A1200, A4000 and CD32)", - IDC_AGA,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,101,31, - 51,10 - CONTROL "NTSC [] North American and Japanese display standard, 60Hz refresh rate. Other countries use PAL (50Hz. display refresh rate)", - IDC_NTSC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,102,63,50, - 10 + CONTROL "OCS [] The original Amiga chipset (A1000, most A500s)",IDC_OCS, + "Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,38,31,51,10 + CONTROL "ECS Agnus [] Partial Enhanced Chipset. Later A500 and A2000 hardware revisions.",IDC_ECS_AGNUS, + "Button",BS_AUTORADIOBUTTON | WS_TABSTOP,38,47,55,10 + CONTROL "Full ECS [] Full ECS Chipset, ECS Agnus and ECS Denise. (A500+, A600, A3000)",IDC_ECS, + "Button",BS_AUTORADIOBUTTON | WS_TABSTOP,38,63,52,10 + CONTROL "AGA [] The next generation Amiga chipset (A1200, A4000 and CD32)",IDC_AGA, + "Button",BS_AUTORADIOBUTTON | WS_TABSTOP,101,31,51,10 + CONTROL "NTSC [] North American and Japanese display standard, 60Hz refresh rate. Other countries use PAL (50Hz. display refresh rate)",IDC_NTSC, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,102,63,50,10 GROUPBOX "Misc chipset options",IDC_STATIC,168,11,114,82 - CONTROL "Fast Copper [] Faster but less compatible copper emulation.", - IDC_FASTCOPPER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,174, - 31,98,10 - CONTROL "Immediate Blitter [] Faster but less compatible blitter emulation.", - IDC_BLITIMM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,174,47, - 96,10 - CONTROL "Cycle exact CPU and Blitter [] The most compatible A500 emulation mode. Very fast CPU recommended.", - IDC_CYCLEEXACT,"Button",BS_AUTOCHECKBOX | BS_LEFT | - WS_GROUP | WS_TABSTOP,174,64,100,10 + CONTROL "Fast Copper [] Faster but less compatible copper emulation.",IDC_FASTCOPPER, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,174,31,98,10 + CONTROL "Immediate Blitter [] Faster but less compatible blitter emulation.",IDC_BLITIMM, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,174,47,96,10 + CONTROL "Cycle exact CPU and Blitter [] The most compatible A500 emulation mode. Very fast CPU recommended.",IDC_CYCLEEXACT, + "Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,174,64,100,10 GROUPBOX "Collision level",IDC_STATIC,14,97,267,48 - CONTROL "None [] Collision hardware emulation disabled.", - IDC_COLLISION0,"Button",BS_AUTORADIOBUTTON | WS_GROUP | - WS_TABSTOP,40,113,50,10 - CONTROL "Sprites only [] Emulate only sprite vs sprite collisions.", - IDC_COLLISION1,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP, - 39,129,50,10 - CONTROL "Sprites and Sprites vs. Playfield [] Recommended collision emulation level.", - IDC_COLLISION2,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP, - 104,113,161,10 - CONTROL "Full [] 100% collision hardware emulation. Only very few games need this option. Slowest.", - IDC_COLLISION3,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP, - 104,129,82,10 + CONTROL "None [] Collision hardware emulation disabled.",IDC_COLLISION0, + "Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,40,113,50,10 + CONTROL "Sprites only [] Emulate only sprite vs sprite collisions.",IDC_COLLISION1, + "Button",BS_AUTORADIOBUTTON | WS_TABSTOP,39,129,50,10 + CONTROL "Sprites and Sprites vs. Playfield [] Recommended collision emulation level.",IDC_COLLISION2, + "Button",BS_AUTORADIOBUTTON | WS_TABSTOP,104,113,161,10 + CONTROL "Full [] 100% collision hardware emulation. Only very few games need this option. Slowest.",IDC_COLLISION3, + "Button",BS_AUTORADIOBUTTON | WS_TABSTOP,104,129,82,10 GROUPBOX "Sound emulation",IDC_STATIC,13,151,268,65 - CONTROL "Disabled",IDC_CS_SOUND0,"Button",BS_AUTORADIOBUTTON | - WS_GROUP | WS_TABSTOP,39,167,102,10 - CONTROL "Emulated",IDC_CS_SOUND1,"Button",BS_AUTORADIOBUTTON | - WS_TABSTOP,39,182,91,10 - CONTROL "Emulated, 100% accurate",IDC_CS_SOUND2,"Button", - BS_AUTORADIOBUTTON | WS_TABSTOP,39,197,95,10 + CONTROL "Disabled",IDC_CS_SOUND0,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,39,167,102,10 + CONTROL "Emulated",IDC_CS_SOUND1,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,39,182,91,10 + CONTROL "Emulated, 100% accurate",IDC_CS_SOUND2,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,39,197,95,10 END IDD_AVIOUTPUT DIALOGEX 0, 0, 197, 233 @@ -695,70 +490,48 @@ STYLE DS_SETFONT | DS_CONTROL | WS_CHILD FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN GROUPBOX "Output Properties:",IDC_STATIC,5,8,184,96 - EDITTEXT IDC_AVIOUTPUT_FILETEXT,26,21,120,12,ES_AUTOHSCROLL | - ES_READONLY | NOT WS_BORDER,WS_EX_CLIENTEDGE + EDITTEXT IDC_AVIOUTPUT_FILETEXT,26,21,120,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,WS_EX_CLIENTEDGE PUSHBUTTON "...",IDC_AVIOUTPUT_FILE,148,21,19,12 - CONTROL "Audio",IDC_AVIOUTPUT_AUDIO,"Button",BS_AUTOCHECKBOX | - BS_PUSHLIKE | BS_FLAT | WS_TABSTOP,26,36,32,11 - CONTROL "",IDC_AVIOUTPUT_AUDIO_STATIC,"Static",SS_LEFTNOWORDWRAP | - SS_CENTERIMAGE | SS_SUNKEN | WS_GROUP,60,36,107,11 - CONTROL "Video",IDC_AVIOUTPUT_VIDEO,"Button",BS_AUTOCHECKBOX | - BS_PUSHLIKE | BS_FLAT | WS_TABSTOP,26,50,32,11 - CONTROL "",IDC_AVIOUTPUT_VIDEO_STATIC,"Static",SS_LEFTNOWORDWRAP | - SS_CENTERIMAGE | SS_SUNKEN | WS_GROUP,60,50,107,11 - CONTROL "Disable frame rate limit while recording", - IDC_AVIOUTPUT_FRAMELIMITER,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,28,68,142,10 - CONTROL "AVIOutput enabled",IDC_AVIOUTPUT_ACTIVATED,"Button", - BS_AUTORADIOBUTTON | BS_PUSHLIKE | BS_FLAT,26,83,142,14 + CONTROL "Audio",IDC_AVIOUTPUT_AUDIO,"Button",BS_AUTOCHECKBOX | BS_PUSHLIKE | BS_FLAT | WS_TABSTOP,26,36,32,11 + CONTROL "",IDC_AVIOUTPUT_AUDIO_STATIC,"Static",SS_LEFTNOWORDWRAP | SS_CENTERIMAGE | SS_SUNKEN | WS_GROUP,60,36,107,11 + CONTROL "Video",IDC_AVIOUTPUT_VIDEO,"Button",BS_AUTOCHECKBOX | BS_PUSHLIKE | BS_FLAT | WS_TABSTOP,26,50,32,11 + CONTROL "",IDC_AVIOUTPUT_VIDEO_STATIC,"Static",SS_LEFTNOWORDWRAP | SS_CENTERIMAGE | SS_SUNKEN | WS_GROUP,60,50,107,11 + CONTROL "Disable frame rate limit while recording",IDC_AVIOUTPUT_FRAMELIMITER, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,28,68,142,10 + CONTROL "AVIOutput enabled",IDC_AVIOUTPUT_ACTIVATED,"Button",BS_AUTORADIOBUTTON | BS_PUSHLIKE | BS_FLAT,26,83,142,14 GROUPBOX "Playback Rate:",IDC_STATIC,5,107,184,50 - CONTROL "PAL",IDC_AVIOUTPUT_PAL,"Button",BS_AUTORADIOBUTTON | - BS_PUSHLIKE | BS_FLAT,24,121,66,12 - CONTROL "NTSC",IDC_AVIOUTPUT_NTSC,"Button",BS_AUTORADIOBUTTON | - BS_PUSHLIKE | BS_FLAT,102,121,66,12 - CONTROL "Slider1",IDC_AVIOUTPUT_FPS,"msctls_trackbar32",TBS_BOTH | - TBS_NOTICKS | TBS_ENABLESELRANGE | WS_TABSTOP,21,137,120, - 11 + CONTROL "PAL",IDC_AVIOUTPUT_PAL,"Button",BS_AUTORADIOBUTTON | BS_PUSHLIKE | BS_FLAT,24,121,66,12 + CONTROL "NTSC",IDC_AVIOUTPUT_NTSC,"Button",BS_AUTORADIOBUTTON | BS_PUSHLIKE | BS_FLAT,102,121,66,12 + CONTROL "Slider1",IDC_AVIOUTPUT_FPS,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | TBS_ENABLESELRANGE | WS_TABSTOP,21,137,120,11 LTEXT "fps",IDC_AVIOUTPUT_FPS_STATIC,148,138,23,8 PUSHBUTTON "Save Screenshot",IDC_SCREENSHOT,15,176,85,14 GROUPBOX "Ripper",IDC_STATIC,5,160,184,63 PUSHBUTTON "Pro Wizard",IDC_PROWIZARD,112,176,69,14,WS_DISABLED - CONTROL "Sampleripper",IDC_SAMPLERIPPER_ACTIVATED,"Button", - BS_AUTORADIOBUTTON | BS_PUSHLIKE | BS_FLAT,15,198,84,14 + CONTROL "Sampleripper",IDC_SAMPLERIPPER_ACTIVATED,"Button",BS_AUTORADIOBUTTON | BS_PUSHLIKE | BS_FLAT,15,198,84,14 END IDD_INPUT DIALOGEX 0, 0, 300, 242 STYLE DS_SETFONT | DS_3DLOOK | DS_CONTROL | WS_CHILD FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN - COMBOBOX IDC_INPUTTYPE,5,5,98,150,CBS_DROPDOWNLIST | - CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_INPUTDEVICE,109,4,167,150,CBS_DROPDOWNLIST | - CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP - CONTROL "",IDC_INPUTDEVICEDISABLE,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,282,7,9,8 - CONTROL "List1",IDC_INPUTLIST,"SysListView32",LVS_REPORT | - LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | - LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,5,22,290,146 - COMBOBOX IDC_INPUTAMIGACNT,5,174,24,150,CBS_DROPDOWNLIST | - CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_INPUTAMIGA,33,174,262,150,CBS_DROPDOWNLIST | - CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_INPUTTYPE,5,5,98,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_INPUTDEVICE,109,4,167,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + CONTROL "",IDC_INPUTDEVICEDISABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,282,7,9,8 + CONTROL "List1",IDC_INPUTLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,5,22,290,146 + COMBOBOX IDC_INPUTAMIGACNT,5,174,24,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_INPUTAMIGA,33,174,262,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP RTEXT "Joystick dead zone (%):",-1,8,196,76,10,SS_CENTERIMAGE EDITTEXT IDC_INPUTDEADZONE,89,195,25,12,ES_NUMBER RTEXT "Autofire rate (frames):",-1,9,212,68,10,SS_CENTERIMAGE EDITTEXT IDC_INPUTAUTOFIRERATE,89,210,25,12,ES_NUMBER - RTEXT "Digital joy-mouse speed:",-1,121,196,76,10, - SS_CENTERIMAGE + RTEXT "Digital joy-mouse speed:",-1,121,196,76,10,SS_CENTERIMAGE EDITTEXT IDC_INPUTSPEEDD,207,195,25,12,ES_NUMBER - RTEXT "Analog joy-mouse speed:",-1,120,212,80,10, - SS_CENTERIMAGE + RTEXT "Analog joy-mouse speed:",-1,120,212,80,10,SS_CENTERIMAGE EDITTEXT IDC_INPUTSPEEDA,207,211,25,12,ES_NUMBER RTEXT "Mouse speed:",-1,132,228,68,10,SS_CENTERIMAGE EDITTEXT IDC_INPUTSPEEDM,207,227,25,12,ES_NUMBER PUSHBUTTON "Copy from:",IDC_INPUTCOPY,249,195,45,14 - COMBOBOX IDC_INPUTCOPYFROM,249,211,45,150,CBS_DROPDOWNLIST | - CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_INPUTCOPYFROM,249,211,45,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Swap 1<>2",IDC_INPUTSWAP,249,226,45,14 END @@ -767,57 +540,43 @@ STYLE DS_SETFONT | DS_3DLOOK | DS_CONTROL | WS_CHILD FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN GROUPBOX "Filter settings:",-1,0,0,294,174 - CONTROL "Enable",IDC_FILTERENABLE,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,26,17,38,10 - COMBOBOX IDC_FILTERMODE,67,15,56,150,CBS_DROPDOWNLIST | - CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_FILTERFILTER,128,15,65,150,CBS_DROPDOWNLIST | - CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + CONTROL "Enable",IDC_FILTERENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,26,17,38,10 + COMBOBOX IDC_FILTERMODE,67,15,56,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_FILTERFILTER,128,15,65,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Reset to defaults",IDC_FILTERDEFAULT,197,15,73,14 RTEXT "Horizontal Size",-1,25,44,57,10,SS_CENTERIMAGE - CONTROL "Slider1",IDC_FILTERHZ,"msctls_trackbar32",TBS_AUTOTICKS | - TBS_TOP | WS_TABSTOP,89,37,158,19 + CONTROL "Slider1",IDC_FILTERHZ,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,89,37,158,19 EDITTEXT IDC_FILTERHZV,248,40,34,12,ES_CENTER | ES_READONLY RTEXT "Vertical Size",-1,26,64,57,10,SS_CENTERIMAGE - CONTROL "Slider1",IDC_FILTERVZ,"msctls_trackbar32",TBS_AUTOTICKS | - TBS_TOP | WS_TABSTOP,89,57,157,19 + CONTROL "Slider1",IDC_FILTERVZ,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,89,57,157,19 EDITTEXT IDC_FILTERVZV,248,59,34,12,ES_CENTER | ES_READONLY RTEXT "Horizontal Position",-1,26,84,57,10,SS_CENTERIMAGE - CONTROL "Slider1",IDC_FILTERHO,"msctls_trackbar32",TBS_AUTOTICKS | - TBS_TOP | WS_TABSTOP,89,77,157,19 + CONTROL "Slider1",IDC_FILTERHO,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,89,77,157,19 EDITTEXT IDC_FILTERHOV,248,79,34,12,ES_CENTER | ES_READONLY RTEXT "Vertical Position",-1,26,103,57,10,SS_CENTERIMAGE - CONTROL "Slider1",IDC_FILTERVO,"msctls_trackbar32",TBS_AUTOTICKS | - TBS_TOP | WS_TABSTOP,89,97,157,19 + CONTROL "Slider1",IDC_FILTERVO,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,89,97,157,19 EDITTEXT IDC_FILTERVOV,248,101,34,12,ES_CENTER | ES_READONLY RTEXT "Scanlines",-1,27,133,57,10,SS_CENTERIMAGE - CONTROL "Slider1",IDC_FILTERSL,"msctls_trackbar32",TBS_AUTOTICKS | - TBS_TOP | WS_TABSTOP,89,126,157,19 + CONTROL "Slider1",IDC_FILTERSL,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,89,126,157,19 EDITTEXT IDC_FILTERSLV,248,128,34,12,ES_CENTER | ES_READONLY - COMBOBOX IDC_FILTERSLR,56,146,27,150,CBS_DROPDOWNLIST | - CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP - CONTROL "Slider1",IDC_FILTERSL2,"msctls_trackbar32", - TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,89,146,157,19 + COMBOBOX IDC_FILTERSLR,56,146,27,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + CONTROL "Slider1",IDC_FILTERSL2,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,89,146,157,19 EDITTEXT IDC_FILTERSL2V,248,151,34,12,ES_CENTER | ES_READONLY GROUPBOX "Presets",-1,0,176,296,36 - COMBOBOX IDC_FILTERPRESETS,8,190,119,150,CBS_DROPDOWN | CBS_SORT | - CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_FILTERPRESETS,8,190,119,150,CBS_DROPDOWN | CBS_SORT | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Load",IDC_FILTERPRESETLOAD,132,189,47,14 PUSHBUTTON "Save",IDC_FILTERPRESETSAVE,184,189,47,14 PUSHBUTTON "Delete",IDC_FILTERPRESETDELETE,236,189,47,14 END IDD_HARDDRIVE DIALOGEX 0, 0, 300, 66 -STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK | DS_CENTER | - DS_CENTERMOUSE | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK | DS_CENTER | DS_CENTERMOUSE | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Harddrive Settings" FONT 8, "MS Sans Serif", 0, 0, 0x0 BEGIN LTEXT "Harddrive:",-1,7,11,35,10 - COMBOBOX IDC_HARDDRIVE,49,9,246,150,CBS_DROPDOWNLIST | - CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP - CONTROL "Read/Write",IDC_RW,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,15,30,50,10 + COMBOBOX IDC_HARDDRIVE,49,9,246,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + CONTROL "Read/Write",IDC_RW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,30,50,10 DEFPUSHBUTTON "OK",IDOK,115,30,50,14 PUSHBUTTON "Cancel",IDCANCEL,189,30,50,14 END @@ -827,55 +586,38 @@ STYLE DS_SETFONT | DS_3DLOOK | DS_CONTROL | WS_CHILD FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN GROUPBOX "When Active:",IDC_STATIC,8,7,88,73 - RTEXT "Run at priority:",IDC_ACTIVE_PRI,14,17,45,10, - SS_CENTERIMAGE | WS_TABSTOP - COMBOBOX IDC_ACTIVE_PRIORITY,14,29,76,65,CBS_DROPDOWNLIST | - WS_VSCROLL | WS_TABSTOP + RTEXT "Run at priority:",IDC_ACTIVE_PRI,14,17,45,10,SS_CENTERIMAGE | WS_TABSTOP + COMBOBOX IDC_ACTIVE_PRIORITY,14,29,76,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "When Inactive:",IDC_STATIC,102,7,92,73 - RTEXT "Run at priority:",IDC_INACTIVE_PRI,109,17,45,10, - SS_CENTERIMAGE | WS_TABSTOP - COMBOBOX IDC_INACTIVE_PRIORITY,109,29,76,65,CBS_DROPDOWNLIST | - WS_VSCROLL | WS_TABSTOP - CONTROL "Pause emulation",IDC_INACTIVE_PAUSE,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,109,50,69,10 - CONTROL "Disable sound output",IDC_INACTIVE_NOSOUND,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,109,63,79,10 + RTEXT "Run at priority:",IDC_INACTIVE_PRI,109,17,45,10,SS_CENTERIMAGE | WS_TABSTOP + COMBOBOX IDC_INACTIVE_PRIORITY,109,29,76,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "Pause emulation",IDC_INACTIVE_PAUSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,109,50,69,10 + CONTROL "Disable sound output",IDC_INACTIVE_NOSOUND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,109,63,79,10 GROUPBOX "When Minimized:",IDC_STATIC,199,7,92,73 - RTEXT "Run at priority:",IDC_MINIMIZED_PRI,207,18,45,10, - SS_CENTERIMAGE | WS_TABSTOP - COMBOBOX IDC_MINIMIZED_PRIORITY,207,30,76,65,CBS_DROPDOWNLIST | - WS_VSCROLL | WS_TABSTOP - CONTROL "Pause emulation",IDC_MINIMIZED_PAUSE,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,207,50,69,10 - CONTROL "Disable sound output",IDC_MINIMIZED_NOSOUND,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,207,63,79,10 + RTEXT "Run at priority:",IDC_MINIMIZED_PRI,207,18,45,10,SS_CENTERIMAGE | WS_TABSTOP + COMBOBOX IDC_MINIMIZED_PRIORITY,207,30,76,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "Pause emulation",IDC_MINIMIZED_PAUSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,207,50,69,10 + CONTROL "Disable sound output",IDC_MINIMIZED_NOSOUND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,207,63,79,10 END IDD_DISK DIALOGEX 0, 0, 300, 242 -STYLE DS_SETFONT | DS_SETFOREGROUND | DS_3DLOOK | DS_CONTROL | DS_CENTER | - DS_CENTERMOUSE | WS_CHILD +STYLE DS_SETFONT | DS_SETFOREGROUND | DS_3DLOOK | DS_CONTROL | DS_CENTER | DS_CENTERMOUSE | WS_CHILD FONT 8, "MS Sans Serif", 0, 0, 0x0 BEGIN - CONTROL "",IDC_DISKLIST,"SysListView32",LVS_REPORT | - LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | - LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,4,6,292,196 + CONTROL "",IDC_DISKLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,4,6,292,196 PUSHBUTTON "Remove disk image",IDC_DISKLISTREMOVE,153,223,93,15 - COMBOBOX IDC_DISKTEXT,3,205,293,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | - WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_DISKTEXT,3,205,293,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Insert disk image",IDC_DISKLISTINSERT,38,223,93,15 END IDD_PANEL DIALOGEX 0, 0, 420, 278 -STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_CAPTION | - WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_ACCEPTFILES | WS_EX_CONTROLPARENT CAPTION "WinUAE Properties" FONT 8, "MS Sans Serif", 0, 0, 0x0 BEGIN GROUPBOX "",IDC_PANEL_FRAME,112,4,303,247,NOT WS_VISIBLE - CONTROL "",IDC_PANELTREE,"SysTreeView32",TVS_HASLINES | - TVS_SHOWSELALWAYS | TVS_NOSCROLL | WS_BORDER | - WS_TABSTOP,5,5,101,248,WS_EX_CLIENTEDGE + CONTROL "",IDC_PANELTREE,"SysTreeView32",TVS_HASLINES | TVS_SHOWSELALWAYS | TVS_NOSCROLL | WS_BORDER | WS_TABSTOP,5,5,101,248,WS_EX_CLIENTEDGE GROUPBOX "",IDC_PANEL_FRAME_OUTER,110,2,307,251 PUSHBUTTON "Reset",IDC_RESETAMIGA,6,259,47,14 PUSHBUTTON "Quit",IDC_QUITEMU,57,259,47,14 @@ -891,24 +633,19 @@ BEGIN LTEXT "ROM path:",IDC_PATHS_ROML,14,9,260,8,SS_CENTERIMAGE EDITTEXT IDC_PATHS_ROM,14,22,261,15,ES_AUTOHSCROLL PUSHBUTTON "...",IDC_PATHS_ROMS,281,22,11,15 - LTEXT "Configuration file path:",IDC_PATHS_CONFIGL,14,40,260,8, - SS_CENTERIMAGE + LTEXT "Configuration file path:",IDC_PATHS_CONFIGL,14,40,260,8,SS_CENTERIMAGE EDITTEXT IDC_PATHS_CONFIG,14,52,261,15,ES_AUTOHSCROLL PUSHBUTTON "...",IDC_PATHS_CONFIGS,281,52,11,15 - LTEXT "Screenshot path:",IDC_PATHS_SCREENSHOTL,14,71,260,8, - SS_CENTERIMAGE + LTEXT "Screenshot path:",IDC_PATHS_SCREENSHOTL,14,71,260,8,SS_CENTERIMAGE EDITTEXT IDC_PATHS_SCREENSHOT,14,83,261,15,ES_AUTOHSCROLL PUSHBUTTON "...",IDC_PATHS_SCREENSHOTS,281,83,11,15 - LTEXT "State file path:",IDC_PATHS_STATEFILEL,14,102,260,8, - SS_CENTERIMAGE + LTEXT "State file path:",IDC_PATHS_STATEFILEL,14,102,260,8,SS_CENTERIMAGE EDITTEXT IDC_PATHS_SAVESTATE,14,114,261,15,ES_AUTOHSCROLL PUSHBUTTON "...",IDC_PATHS_SAVESTATES,281,114,11,15 - LTEXT "Video path:",IDC_PATHS_AVIOUTPUTL,14,132,260,8, - SS_CENTERIMAGE + LTEXT "Video path:",IDC_PATHS_AVIOUTPUTL,14,132,260,8,SS_CENTERIMAGE EDITTEXT IDC_PATHS_AVIOUTPUT,14,144,261,15,ES_AUTOHSCROLL PUSHBUTTON "...",IDC_PATHS_AVIOUTPUTS,282,144,11,15 - LTEXT "Saveimage path:",IDC_PATHS_SAVEIMAGEL,14,163,260,8, - SS_CENTERIMAGE + LTEXT "Saveimage path:",IDC_PATHS_SAVEIMAGEL,14,163,260,8,SS_CENTERIMAGE EDITTEXT IDC_PATHS_SAVEIMAGE,14,175,261,15,ES_AUTOHSCROLL PUSHBUTTON "...",IDC_PATHS_SAVEIMAGES,281,175,11,15 PUSHBUTTON "Reset to defaults",IDC_PATHS_DEFAULT,13,199,73,14 @@ -920,59 +657,41 @@ IDD_QUICKSTART DIALOGEX 0, 0, 300, 242 STYLE DS_SETFONT | DS_3DLOOK | DS_CONTROL | WS_CHILD FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN - GROUPBOX "Hardware configuration",IDC_QUICKSTART_CONFIG,3,0,294, - 54 + GROUPBOX "Hardware configuration",IDC_QUICKSTART_CONFIG,3,0,294,54 RTEXT "Model:",IDC_STATIC,5,14,56,10,SS_CENTERIMAGE - COMBOBOX IDC_QUICKSTART_MODEL,65,12,225,50,CBS_DROPDOWNLIST | - WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_QUICKSTART_MODEL,65,12,225,50,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP RTEXT "Configuration:",IDC_STATIC,5,33,56,10,SS_CENTERIMAGE - COMBOBOX IDC_QUICKSTART_CONFIGURATION,65,31,225,50, - CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - GROUPBOX "Compatibility vs required CPU power ", - IDC_QUICKSTART_COMPA,3,56,294,33 - RTEXT "Best compatibility",IDC_STATIC,13,70,67,10, - SS_CENTERIMAGE - CONTROL "",IDC_QUICKSTART_COMPATIBILITY,"msctls_trackbar32", - TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,88,65,115,21 - RTEXT "Low compatibility",IDC_STATIC,215,70,63,10, - SS_CENTERIMAGE + COMBOBOX IDC_QUICKSTART_CONFIGURATION,65,31,225,50,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX "Compatibility vs required CPU power ",IDC_QUICKSTART_COMPA,3,56,294,33 + RTEXT "Best compatibility",IDC_STATIC,13,70,67,10,SS_CENTERIMAGE + CONTROL "",IDC_QUICKSTART_COMPATIBILITY,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,88,65,115,21 + RTEXT "Low compatibility",IDC_STATIC,215,70,63,10,SS_CENTERIMAGE GROUPBOX "Host configuration",IDC_QUICKSTART_HOST,3,91,294,33 RTEXT "Configuration:",IDC_STATIC,5,105,55,10,SS_CENTERIMAGE - COMBOBOX IDC_QUICKSTART_HOSTCONFIG,65,103,225,50,CBS_DROPDOWNLIST | - WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_QUICKSTART_HOSTCONFIG,65,103,225,50,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Disk Drives",IDC_QUICKSTART_DF,3,126,294,84 LTEXT "Disk Drive DF0:",IDC_STATIC,10,138,56,10,SS_CENTERIMAGE PUSHBUTTON "Select Disk Image",IDC_DF0QQ,77,135,98,15 - RTEXT "Write Protected",IDC_STATIC,180,139,58,10, - SS_CENTERIMAGE - CONTROL "",IDC_DF0WPQ,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | - WS_TABSTOP,245,137,10,15 + RTEXT "Write Protected",IDC_STATIC,180,139,58,10,SS_CENTERIMAGE + CONTROL "",IDC_DF0WPQ,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,245,137,10,15 PUSHBUTTON "Eject",IDC_EJECT0Q,260,136,30,15 - COMBOBOX IDC_DF0TEXTQ,9,154,282,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | - WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_DF0TEXTQ,9,154,282,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP LTEXT "Disk Drive DF1:",IDC_STATIC,10,176,56,10,SS_CENTERIMAGE PUSHBUTTON "Select Disk Image",IDC_DF1QQ,77,172,98,15 - RTEXT "Write Protected",IDC_STATIC,180,175,58,10, - SS_CENTERIMAGE - CONTROL "",IDC_DF1WPQ,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | - WS_TABSTOP,245,173,10,15 + RTEXT "Write Protected",IDC_STATIC,180,175,58,10,SS_CENTERIMAGE + CONTROL "",IDC_DF1WPQ,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,245,173,10,15 PUSHBUTTON "Eject",IDC_EJECT1Q,260,172,30,15 - COMBOBOX IDC_DF1TEXTQ,9,190,282,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | - WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Set Configuration",IDC_QUICKSTART_SETCONFIG,9,219,72,15, - NOT WS_VISIBLE + COMBOBOX IDC_DF1TEXTQ,9,190,282,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Set Configuration",IDC_QUICKSTART_SETCONFIG,9,219,72,15,NOT WS_VISIBLE GROUPBOX "Mode",IDC_STATIC,190,211,107,27,BS_LEFT - CONTROL "Start in Quickstart-mode",IDC_QUICKSTARTMODE,"Button", - BS_AUTOCHECKBOX | BS_LEFT | WS_TABSTOP,199,222,94,10 + CONTROL "Start in Quickstart-mode",IDC_QUICKSTARTMODE,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_TABSTOP,199,222,94,10 END IDD_FRONTEND DIALOGEX 0, 0, 420, 242 STYLE DS_SETFONT | DS_3DLOOK | DS_CONTROL | WS_CHILD FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN - CONTROL "",IDC_FE_LIST,"SysListView32",LVS_REPORT | - LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | - LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,6,9,235,124 + CONTROL "",IDC_FE_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,6,9,235,124 GROUPBOX "",IDC_FE_INFO,249,140,160,95 GROUPBOX "",IDC_FE_SCREENSHOT,249,7,160,128 END diff --git a/od-win32/win32.h b/od-win32/win32.h index a1b942b2..e6f9655a 100755 --- a/od-win32/win32.h +++ b/od-win32/win32.h @@ -21,8 +21,8 @@ extern int manual_painting_needed; extern int manual_palette_refresh_needed; extern int mouseactive, focus; extern int ignore_messages_all; -#define WINUAEBETA 1 -#define WINUAEBETASTR " Beta 9" +#define WINUAEBETA 0 +#define WINUAEBETASTR "" extern char start_path_exe[MAX_DPATH]; extern char start_path_data[MAX_DPATH]; diff --git a/od-win32/win32gui.c b/od-win32/win32gui.c index 5ea19569..7364d6b1 100755 --- a/od-win32/win32gui.c +++ b/od-win32/win32gui.c @@ -2453,7 +2453,7 @@ static urlinfo urls[] = {IDC_PICASSOHOME, FALSE, "Picasso96 Home Page", "http://www.picasso96.cogito.de/"}, {IDC_UAEHOME, FALSE, "UAE Home Page", "http://www.freiburg.linux.de/~uae/"}, {IDC_WINUAEHOME, FALSE, "WinUAE Home Page", "http://www.winuae.net/"}, - {IDC_AIABHOME, FALSE, "AIAB", "http://aiab.emuunlim.com/"}, + {IDC_AIABHOME, FALSE, "AIAB", "http://www.amigainabox.co.uk/"}, {IDC_THEROOTS, FALSE, "Back To The Roots", "http://www.back2roots.org/"}, {IDC_ABIME, FALSE, "abime.net", "http://www.abime.net/"}, {IDC_CAPS, FALSE, "CAPS", "http://caps-project.org/"},