From: Toni Wilen Date: Sun, 13 May 2007 10:36:00 +0000 (+0300) Subject: imported winuaesrc1420a.zip X-Git-Tag: 2100~222 X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=4aee74829af13260375e7d34d05036f5228cec31;p=francis%2Fwinuae.git imported winuaesrc1420a.zip --- diff --git a/ar.c b/ar.c index 92913c04..7e0e2107 100755 --- a/ar.c +++ b/ar.c @@ -167,6 +167,8 @@ #define write_log_debug #endif +static char *cart_memnames[] = { NULL, "hrtmon", "arhrtmon", "superiv" }; +static char *cart_memnames2[] = { NULL, NULL, NULL, "superiv_2" }; #define ARMODE_FREEZE 0 /* AR2/3 The action replay 'freeze' button has been pressed. */ #define ARMODE_BREAKPOINT_AR2 2 /* AR2: The action replay is activated via a breakpoint. */ @@ -174,18 +176,23 @@ #define ARMODE_BREAKPOINT_AR3_RESET_AR2 3 /* AR2: The action replay is activated after a reset. */ /* AR3: The action replay is activated by a breakpoint. */ +#define CART_AR 0 +#define CART_HRTMON 1 +#define CART_AR1200 2 +#define CART_SUPER4 3 + uae_u8 ar_custom[2*256]; uae_u8 ar_ciaa[16], ar_ciab[16]; int hrtmon_flag = ACTION_REPLAY_INACTIVE; -static int ar1200; +static int cart_type; -static uae_u8 *hrtmemory = 0; +static uae_u8 *hrtmemory = 0, *hrtmemory2 = 0; static uae_u8 *armemory_rom = 0, *armemory_ram = 0; -static uae_u32 hrtmem_mask; +static uae_u32 hrtmem_mask, hrtmem2_mask; static uae_u8 *hrtmon_custom, *hrtmon_ciaa, *hrtmon_ciab; -uae_u32 hrtmem_start, hrtmem_size; +uae_u32 hrtmem_start, hrtmem2_start, hrtmem_size, hrtmem2_size; static int triggered_once; static void hrtmon_unmap_banks(void); @@ -211,6 +218,58 @@ static void cartridge_exit(void) #endif } +static uae_u32 REGPARAM2 hrtmem2_bget (uaecptr addr) +{ + addr -= hrtmem2_start & hrtmem2_mask; + addr &= hrtmem2_mask; + return hrtmemory2[addr]; +} +static uae_u32 REGPARAM2 hrtmem2_wget (uaecptr addr) +{ + return (hrtmem2_bget (addr) << 8) | hrtmem2_bget (addr + 1); +} +static uae_u32 REGPARAM2 hrtmem2_lget (uaecptr addr) +{ + return (hrtmem2_wget (addr) << 16) | hrtmem2_wget (addr + 2); +} + +static void REGPARAM2 hrtmem2_lput (uaecptr addr, uae_u32 l) +{ + uae_u32 *m; + addr -= hrtmem2_start & hrtmem2_mask; + addr &= hrtmem2_mask; + m = (uae_u32 *)(hrtmemory2 + addr); + do_put_mem_long (m, l); +} + +static void REGPARAM2 hrtmem2_wput (uaecptr addr, uae_u32 w) +{ + uae_u16 *m; + addr -= hrtmem2_start & hrtmem2_mask; + addr &= hrtmem2_mask; + m = (uae_u16 *)(hrtmemory2 + addr); + do_put_mem_word (m, (uae_u16)w); +} +static void REGPARAM2 hrtmem2_bput (uaecptr addr, uae_u32 b) +{ + addr -= hrtmem2_start & hrtmem2_mask; + addr &= hrtmem2_mask; + hrtmemory2[addr] = b; +} +static int REGPARAM2 hrtmem2_check (uaecptr addr, uae_u32 size) +{ + addr -= hrtmem2_start & hrtmem2_mask; + addr &= hrtmem2_mask; + return (addr + size) <= hrtmem2_size; +} + +static uae_u8 *REGPARAM2 hrtmem2_xlate (uaecptr addr) +{ + addr -= hrtmem2_start & hrtmem2_mask; + addr &= hrtmem2_mask; + return hrtmemory2 + addr; +} + static uae_u32 REGPARAM2 hrtmem_lget (uaecptr addr) { uae_u32 *m; @@ -219,7 +278,6 @@ static uae_u32 REGPARAM2 hrtmem_lget (uaecptr addr) m = (uae_u32 *)(hrtmemory + addr); return do_get_mem_long (m); } - static uae_u32 REGPARAM2 hrtmem_wget (uaecptr addr) { uae_u16 *m; @@ -228,7 +286,6 @@ static uae_u32 REGPARAM2 hrtmem_wget (uaecptr addr) m = (uae_u16 *)(hrtmemory + addr); return do_get_mem_word (m); } - static uae_u32 REGPARAM2 hrtmem_bget (uaecptr addr) { addr -= hrtmem_start & hrtmem_mask; @@ -241,7 +298,7 @@ static void REGPARAM2 hrtmem_lput (uaecptr addr, uae_u32 l) uae_u32 *m; addr -= hrtmem_start & hrtmem_mask; addr &= hrtmem_mask; - if (ar1200 && addr < 0x80000) + if (cart_type == CART_AR1200 && addr < 0x80000) return; m = (uae_u32 *)(hrtmemory + addr); do_put_mem_long (m, l); @@ -252,21 +309,19 @@ static void REGPARAM2 hrtmem_wput (uaecptr addr, uae_u32 w) uae_u16 *m; addr -= hrtmem_start & hrtmem_mask; addr &= hrtmem_mask; - if (ar1200 && addr < 0x80000) + if (cart_type == CART_AR1200 && addr < 0x80000) return; m = (uae_u16 *)(hrtmemory + addr); do_put_mem_word (m, (uae_u16)w); } - static void REGPARAM2 hrtmem_bput (uaecptr addr, uae_u32 b) { addr -= hrtmem_start & hrtmem_mask; addr &= hrtmem_mask; - if (ar1200 && addr < 0x80000) + if (cart_type == CART_AR1200 && addr < 0x80000) return; hrtmemory[addr] = b; } - static int REGPARAM2 hrtmem_check (uaecptr addr, uae_u32 size) { addr -= hrtmem_start & hrtmem_mask; @@ -284,9 +339,15 @@ static uae_u8 *REGPARAM2 hrtmem_xlate (uaecptr addr) static addrbank hrtmem_bank = { hrtmem_lget, hrtmem_wget, hrtmem_bget, hrtmem_lput, hrtmem_wput, hrtmem_bput, - hrtmem_xlate, hrtmem_check, NULL, "HRTMon memory", + hrtmem_xlate, hrtmem_check, NULL, "Cartridge Bank", hrtmem_lget, hrtmem_wget, ABFLAG_RAM }; +static addrbank hrtmem2_bank = { + hrtmem2_lget, hrtmem2_wget, hrtmem2_bget, + hrtmem2_lput, hrtmem2_wput, hrtmem2_bput, + hrtmem2_xlate, hrtmem2_check, NULL, "Cartridge Bank 2", + hrtmem2_lget, hrtmem2_wget, ABFLAG_RAM +}; static void copyfromamiga(uae_u8 *dst,uaecptr src,int len) { @@ -811,7 +872,7 @@ static void hrtmon_go (void) if (hrtmon_ciab) hrtmon_ciab[i * 256 + 0] = ar_ciab[i]; } - if (ar1200) { + if (cart_type == CART_AR1200) { old = get_long((uaecptr)(regs.vbr + 0x8)); put_word (hrtmem_start + 0xc0000, 4); put_long ((uaecptr)(regs.vbr + 8), get_long (hrtmem_start + 8)); @@ -827,7 +888,7 @@ static void hrtmon_go (void) void cartridge_init (void) { - if (hrtmemory && !ar1200) { + if (hrtmemory && cart_type != CART_AR1200) { hrtmon_map_banks (); put_long ((uaecptr)(regs.vbr + 0x7c), hrtmem_start + 12 + 2 + get_word (hrtmem_start + 14)); } @@ -838,7 +899,7 @@ void hrtmon_enter (void) if (!hrtmemory) return; hrtmon_map_banks (); - write_log("HRTMON/AR1200: freeze\n"); + write_log("%s: freeze\n", cart_memnames[cart_type]); hrtmon_go(); } @@ -993,7 +1054,7 @@ void action_replay_hide(void) void hrtmon_hide(void) { HRTCFG *cfg = (HRTCFG*)hrtmemory; - if (!ar1200 && cfg->entered) + if (cart_type != CART_AR1200 && cfg->entered) return; cartridge_exit(); hrtmon_flag = ACTION_REPLAY_IDLE; @@ -1418,11 +1479,14 @@ void action_replay_cleanup() free (armemory_ram); if (hrtmemory) mapped_free (hrtmemory); + if (hrtmemory2) + mapped_free (hrtmemory2); armemory_rom = 0; armemory_ram = 0; hrtmemory = 0; - ar1200 = 0; + hrtmemory2 = 0; + cart_type = 0; } #ifndef FALSE @@ -1441,7 +1505,7 @@ int hrtmon_lang = 0; static void hrtmon_configure(void) { HRTCFG *cfg = (HRTCFG*)hrtmemory; - if (ar1200 || armodel || !cfg) + if (cart_type != CART_HRTMON || armodel || !cfg) return; cfg->col0h = 0x00; cfg->col0l = 0x5a; cfg->col1h = 0x0f; cfg->col1l = 0xff; @@ -1469,24 +1533,27 @@ int hrtmon_load(void) if (hrtmemory) return 0; + //currprefs.cart_internal= changed_prefs.cart_internal = 2; + triggered_once = 0; armodel = 0; + cart_type = CART_AR; hrtmem_start = 0xa10000; if (!currprefs.cart_internal) { if (strlen(currprefs.cartfile) == 0) return 0; f = zfile_fopen(currprefs.cartfile,"rb"); if(!f) { - write_log("failed to load '%s' HRTMON/AR1200 ROM\n", currprefs.cartfile); + write_log("failed to load '%s' cartridge ROM\n", currprefs.cartfile); return 0; } zfile_fread(header, sizeof header, 1, f); if (!memcmp (header, "ATZ!", 4)) { - ar1200 = 1; + cart_type = CART_AR1200; armodel = 1200; hrtmem_start = 0x800000; } else if (!memcmp (header, "HRT!", 4)) { - ar1200 = 0; + cart_type = CART_HRTMON; } else { zfile_fclose (f); return 0; @@ -1494,26 +1561,41 @@ int hrtmon_load(void) } hrtmem_size = 0x100000; hrtmem_mask = hrtmem_size - 1; - hrtmemory = mapped_malloc (hrtmem_size, ar1200 ? "arhrtmon" : "hrtmon"); - memset (hrtmemory, 0xff, 0x80000); - if (currprefs.cart_internal) { + if (currprefs.cart_internal == 1) { #ifdef ACTION_REPLAY_HRTMON struct zfile *zf = zfile_fopen_data ("hrtrom.gz", hrtrom_len, hrtrom); f = zfile_gunzip (zf); #else return 0; #endif + cart_type = CART_HRTMON; + } else if (currprefs.cart_internal == 2) { + hrtmem_start = 0xd00000; + hrtmem_size = 0x40000; + hrtmem2_start = 0xb00000; + hrtmem2_size = 0xc0000; + cart_type = CART_SUPER4; + goto end; } + hrtmemory = mapped_malloc (hrtmem_size, cart_memnames[cart_type]); + memset (hrtmemory, 0xff, 0x80000); zfile_fseek (f, 0, SEEK_SET); zfile_fread (hrtmemory, 524288, 1, f); zfile_fclose (f); hrtmon_configure(); - hrtmem_bank.baseaddr = hrtmemory; - hrtmon_flag = ACTION_REPLAY_IDLE; hrtmon_custom = hrtmemory + 0x08f000; hrtmon_ciaa = hrtmemory + 0x08e000; hrtmon_ciab = hrtmemory + 0x08d000; - write_log("%s installed at %08.8X\n", ar1200 ? "AR1200" : "HRTMON", hrtmem_start); +end: + if (hrtmem2_size) { + hrtmem2_mask = hrtmem2_size - 1; + hrtmemory2 = mapped_malloc (hrtmem2_size, cart_memnames2[cart_type]); + memset(hrtmemory2, 0, hrtmem2_size); + hrtmem2_bank.baseaddr = hrtmemory2; + } + hrtmem_bank.baseaddr = hrtmemory; + hrtmon_flag = ACTION_REPLAY_IDLE; + write_log("%s installed at %08.8X\n", cart_memnames[cart_type], hrtmem_start); return 1; } @@ -1522,6 +1604,8 @@ void hrtmon_map_banks() if(!hrtmemory) return; map_banks (&hrtmem_bank, hrtmem_start >> 16, hrtmem_size >> 16, 0); + if (hrtmem2_size) + map_banks (&hrtmem2_bank, hrtmem2_start >> 16, hrtmem2_size >> 16, 0); } static void hrtmon_unmap_banks() @@ -1529,6 +1613,8 @@ static void hrtmon_unmap_banks() if(!hrtmemory) return; map_banks (&dummy_bank, hrtmem_start >> 16, hrtmem_size >> 16, 0); + if (hrtmem2_size) + map_banks (&dummy_bank, hrtmem2_start >> 16, hrtmem2_size >> 16, 0); } #define AR_VER_STR_OFFSET 0x4 /* offset in the rom where the version string begins. */ @@ -1611,6 +1697,8 @@ void action_replay_memory_reset(void) if (hrtmemory) { hrtmon_hide(); /* It is never really idle */ hrtmon_flag = ACTION_REPLAY_IDLE; + if (cart_type == CART_SUPER4) + hrtmon_map_banks(); } #endif #ifdef ACTION_REPLAY_COMMON diff --git a/cdtv.c b/cdtv.c index 32611217..674bedcc 100755 --- a/cdtv.c +++ b/cdtv.c @@ -129,7 +129,6 @@ static int get_qcode(void) if (s[1] == AUDIO_STATUS_IN_PROGRESS) { int end = msf2lsn((s[5 + 4] << 16) | (s[6 + 4] << 8) | (s[7 + 4])); if (end >= play_end - 75) { - sys_command_cd_pause (DF_IOCTL, unitnum, 1); cd_audio_status = AUDIO_STATUS_PLAY_COMPLETE; cd_playing = 0; do_stch(); diff --git a/memory.c b/memory.c index 4f7fd84a..e6ec4e88 100755 --- a/memory.c +++ b/memory.c @@ -2303,11 +2303,11 @@ void memory_reset (void) if (!currprefs.cs_a1000ram) map_banks (&dummy_bank, 0xD8, 6, 0); /* D80000 - DDFFFF not mapped (A1000 = custom chips) */ - /* map "nothing" to 0x200000 - 0x9FFFFF (0xBEFFFF if AGA) */ + /* map "nothing" to 0x200000 - 0x9FFFFF (0xBEFFFF if PCMCIA or AGA) */ bnk = allocated_chipmem >> 16; if (bnk < 0x20 + (currprefs.fastmem_size >> 16)) bnk = 0x20 + (currprefs.fastmem_size >> 16); - map_banks (&dummy_bank, bnk, (((currprefs.chipset_mask & CSMASK_AGA) || currprefs.cs_ide == 1) ? 0xBF : 0xA0) - bnk, 0); + map_banks (&dummy_bank, bnk, (((currprefs.chipset_mask & CSMASK_AGA) || currprefs.cs_pcmcia) ? 0xBF : 0xA0) - bnk, 0); if (currprefs.chipset_mask & CSMASK_AGA) map_banks (&dummy_bank, 0xc0, 0xd8 - 0xc0, 0); @@ -2399,7 +2399,7 @@ void memory_reset (void) if ((cloanto_rom || currprefs.cs_ksmirror) && !currprefs.maprom && !extendedkickmem_type) map_banks (&kickmem_bank, 0xE0, 8, 0); if (currprefs.cs_ksmirror == 2) { /* unexpanded A1200 also maps ROM here.. */ - if (!currprefs.cart_internal) { + if (currprefs.cart_internal != 1) { map_banks (&kickmem_bank, 0xA8, 8, 0); map_banks (&kickmem_bank, 0xB0, 8, 0); } diff --git a/od-win32/mman.c b/od-win32/mman.c index c0603672..9b66c732 100755 --- a/od-win32/mman.c +++ b/od-win32/mman.c @@ -306,6 +306,14 @@ void *shmat(int shmid, void *shmaddr, int shmflg) shmaddr=natmem_offset + 0x00800000; got = TRUE; } + if(!strcmp(shmids[shmid].name,"superiv")) { + shmaddr=natmem_offset + 0x00d00000; + got = TRUE; + } + if(!strcmp(shmids[shmid].name,"superiv_2")) { + shmaddr=natmem_offset + 0x00b00000; + got = TRUE; + } } #endif diff --git a/od-win32/picasso96_win.c b/od-win32/picasso96_win.c index 05b6a71c..3d6e611b 100755 --- a/od-win32/picasso96_win.c +++ b/od-win32/picasso96_win.c @@ -526,7 +526,7 @@ static void do_fillrect(uae_u8 *src, unsigned int x, unsigned int y, uae_u8 *dst; /* Try OS specific fillrect function here; and return if successful. Make sure we adjust for - * the pen values if we're doing 8-bit display-emulation on a 16-bit or higher screen. */ + * the pen values if we're doing 8-bit display-emulation on a 16-bit or higher screen. */ #ifdef PIXEL_LOCK flushpixels(); #endif @@ -541,7 +541,7 @@ static void do_fillrect(uae_u8 *src, unsigned int x, unsigned int y, if(DX_Fill(x, y, width, height, picasso_vidinfo.clut[src[0]], rgbtype)) return; } - + P96TRACE(("P96_WARNING: do_fillrect() using fall-back routine!\n")); if(y + height > picasso_vidinfo.height) @@ -734,8 +734,8 @@ static void do_blit(struct RenderInfo *ri, int Bpp, P96TRACE(("do_blit type-b\n")); if (picasso96_state.RGBFormat != RGBFB_CHUNKY) { - write_log ("ERROR: do_blit() calling abort 1!\n"); - abort (); + write_log ("ERROR: do_blit() failure, %d!\n", picasso96_state.RGBFormat); + goto out; } while (height-- > 0) { @@ -751,9 +751,8 @@ static void do_blit(struct RenderInfo *ri, int Bpp, *((uae_u32 *)dstp + i) = picasso_vidinfo.clut[srcp[i]]; break; default: - write_log ("ERROR - do_blit() calling abort 2!\n"); - abort (); - break; + write_log ("ERROR - do_blit() failure2, %d!\n", psiz); + goto out; } srcp += ri->BytesPerRow; dstp += picasso_vidinfo.rowbytes; @@ -825,8 +824,8 @@ static void wgfx_do_flushline (void) P96TRACE(("flushing type-b\n")); if (picasso96_state.RGBFormat != RGBFB_CHUNKY) { - write_log ("ERROR - wgfx_do_flushline() calling abort 1!\n"); - abort (); + write_log ("ERROR - wgfx_do_flushline() failure, %d!\n", picasso96_state.RGBFormat); + goto out; } dstp += wgfx_y * picasso_vidinfo.rowbytes + (wgfx_min - wgfx_linestart) * psiz; @@ -840,9 +839,8 @@ static void wgfx_do_flushline (void) *((uae_u32 *)dstp + i) = picasso_vidinfo.clut[src[i]]; break; default: - write_log ("ERROR - wgfx_do_flushline() calling abort 2!\n"); - abort (); - break; + write_log ("ERROR - wgfx_do_flushline() failure2, %d!\n", psiz); + goto out; } } @@ -2183,12 +2181,12 @@ uae_u32 REGPARAM2 picasso_FillRect (struct regstruct *regs) P96TRACE(("FillRect(%d, %d, %d, %d) Pen 0x%x BPP %d BPR %d Mask 0x%x\n", X, Y, Width, Height, Pen, Bpp, ri.BytesPerRow, Mask)); - if( Bpp > 1 ) + if(Bpp > 1) Mask = 0xFF; if (Mask == 0xFF) { - if((Width == 1) || (Height == 1)) + if(Width == 1 || Height == 1) { int i; uaecptr addr; @@ -2196,7 +2194,7 @@ uae_u32 REGPARAM2 picasso_FillRect (struct regstruct *regs) { uae_u32 diff = gfxmem_start - (uae_u32)gfxmemory; addr = ri.Memory + X * Bpp + Y * ri.BytesPerRow + diff; - if( Width == 1 ) + if(Width == 1) { for(i = 0; i < Height; i++) { @@ -2232,7 +2230,7 @@ uae_u32 REGPARAM2 picasso_FillRect (struct regstruct *regs) src = ri.Memory + X * Bpp + Y * ri.BytesPerRow; X = X - picasso96_state.XOffset; Y = Y - picasso96_state.YOffset; - if((int)X < 0){ Width = Width + X; X = 0; } + if((int)X < 0) { Width = Width + X; X = 0; } if((int)Width < 1) return 1; if((int)Y < 0) { Height = Height + Y; Y = 0; } if((int)Height < 1) return 1; diff --git a/od-win32/resources/resource b/od-win32/resources/resource index ece2489e..49ecf2bb 100755 --- a/od-win32/resources/resource +++ b/od-win32/resources/resource @@ -736,7 +736,7 @@ #define IDC_UPBM 1650 #define IDC_DISKLISTREMOVE2 1650 #define IDC_DISKLISTINSERT 1650 -#define IDC_DF0QENABLE2 1650 +#define IDC_DF1QENABLE 1650 #define IDC_SOUNDCARDLIST 1651 #define IDC_CS_SOUND1 1651 #define IDC_SOUNDFREQ 1652 @@ -864,6 +864,7 @@ #define IDC_CS_AGNUSREV2 1738 #define IDC_CS_DENISEREV 1738 #define IDC_DBG_OUTPUT1 1739 +#define IDC_CS_PCMCIA 1739 #define IDC_DBG_HELP 1740 #define IDC_DBG_INPUT 1741 #define IDC_DBG_DREG 1742 @@ -894,6 +895,7 @@ #define IDC_DBG_MISCCPU 1767 #define IDC_CS_A2091 1768 #define IDC_CS_DMAC2 1769 +#define IDC_CS_A4091 1770 #define ID__FLOPPYDRIVES 40004 #define ID_FLOPPYDRIVES_DF0 40005 #define ID_ST_CONFIGURATION 40010 diff --git a/od-win32/resources/resource.h b/od-win32/resources/resource.h index bd328a2a..b64d7853 100755 --- a/od-win32/resources/resource.h +++ b/od-win32/resources/resource.h @@ -864,6 +864,7 @@ #define IDC_CS_AGNUSREV2 1738 #define IDC_CS_DENISEREV 1738 #define IDC_DBG_OUTPUT1 1739 +#define IDC_CS_PCMCIA 1739 #define IDC_DBG_HELP 1740 #define IDC_DBG_INPUT 1741 #define IDC_DBG_DREG 1742 @@ -894,6 +895,7 @@ #define IDC_DBG_MISCCPU 1767 #define IDC_CS_A2091 1768 #define IDC_CS_DMAC2 1769 +#define IDC_CS_A4091 1770 #define ID__FLOPPYDRIVES 40004 #define ID_FLOPPYDRIVES_DF0 40005 @@ -924,7 +926,7 @@ #define _APS_3D_CONTROLS 1 #define _APS_NEXT_RESOURCE_VALUE 253 #define _APS_NEXT_COMMAND_VALUE 40029 -#define _APS_NEXT_CONTROL_VALUE 1770 +#define _APS_NEXT_CONTROL_VALUE 1771 #define _APS_NEXT_SYMED_VALUE 101 #endif #endif diff --git a/od-win32/resources/winuae.rc b/od-win32/resources/winuae.rc index 2d0d47c6..b6d47310 100755 --- a/od-win32/resources/winuae.rc +++ b/od-win32/resources/winuae.rc @@ -573,9 +573,11 @@ BEGIN EDITTEXT IDC_CS_AGNUSREV,235,209,45,13,ES_AUTOHSCROLL CONTROL "Denise/Lisa revision:",IDC_CS_DENISE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,150,227,81,10 EDITTEXT IDC_CS_DENISEREV,235,226,45,13,ES_AUTOHSCROLL - CONTROL "A590/A2091 SCSI",IDC_CS_A2091,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,17,175,76,10 + CONTROL "A590/A2091 SCSI",IDC_CS_A2091,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,175,76,10 CONTROL "A4000T SCSI",IDC_CS_DMAC2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,193,175,88,10 LTEXT "SCSI not yet implemented.",IDC_STATIC,25,161,224,8,SS_CENTERIMAGE + CONTROL "PCMCIA",IDC_CS_PCMCIA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,193,146,92,10 + CONTROL "A4091 SCSI",IDC_CS_A4091,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,187,76,10 END IDD_AVIOUTPUT DIALOGEX 0, 0, 288, 203 diff --git a/od-win32/resources/winuae_minimal.rc b/od-win32/resources/winuae_minimal.rc index df1239f6..93275c36 100755 --- a/od-win32/resources/winuae_minimal.rc +++ b/od-win32/resources/winuae_minimal.rc @@ -8,7 +8,6 @@ // Generated from the TEXTINCLUDE 2 resource. // #include "afxres.h" - ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -21,6 +20,31 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US #pragma code_page(1252) #endif //_WIN32 +///////////////////////////////////////////////////////////////////////////// +// +// Accelerator +// + +IDR_DBGACCEL ACCELERATORS +BEGIN + VK_F1, ID_DBG_PAGE1, VIRTKEY, NOINVERT + VK_F2, ID_DBG_PAGE2, VIRTKEY, NOINVERT + VK_F3, ID_DBG_PAGE3, VIRTKEY, NOINVERT + VK_F4, ID_DBG_PAGE4, VIRTKEY, NOINVERT + VK_F5, ID_DBG_PAGE5, VIRTKEY, NOINVERT + VK_F6, ID_DBG_PAGE6, VIRTKEY, NOINVERT + VK_F7, ID_DBG_PAGE7, VIRTKEY, NOINVERT + VK_F8, ID_DBG_PAGE8, VIRTKEY, NOINVERT + VK_F9, ID_DBG_PAGE9, VIRTKEY, NOINVERT + VK_DOWN, IDC_DBG_MEMDOWN, VIRTKEY, ALT, NOINVERT + VK_RIGHT, IDC_DBG_MEMDOWNFAST, VIRTKEY, ALT, NOINVERT + VK_UP, IDC_DBG_MEMUP, VIRTKEY, ALT, NOINVERT + VK_LEFT, IDC_DBG_MEMUPFAST, VIRTKEY, ALT, NOINVERT + "H", IDC_DBG_HELP, VIRTKEY, ALT, NOINVERT + "P", IDC_DBG_MEMTOPC, VIRTKEY, ALT, NOINVERT +END + + ///////////////////////////////////////////////////////////////////////////// // // Dialog @@ -39,9 +63,9 @@ BEGIN 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 a BlizKick-compatible memory area.",IDC_MAPROM, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,95,54,82,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,95,54,87,10 CONTROL "ShapeShifter support [] Patches the system ROM for ShapeShifter compatibility.",IDC_KICKSHIFTER, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,187,54,80,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,187,54,87,10 GROUPBOX "Miscellaneous",-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 @@ -51,45 +75,47 @@ BEGIN PUSHBUTTON "...",IDC_FLASHCHOOSER,280,110,10,15 GROUPBOX "HRTMon Settings",-1,5,136,290,31 CONTROL "Enable HRTMon [] HRTMon is monitor/debugger similar to Action Replay series, default activation key is Page Up.",IDC_HRTMON, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,89,148,75,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,89,148,84,10 END -IDD_DISPLAY DIALOGEX 0, 0, 300, 202 +IDD_DISPLAY DIALOGEX 0, 0, 300, 235 STYLE DS_LOCALEDIT | 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 "Full screen:",IDC_SELECTRESTEXT,17,17,38,15,SS_CENTERIMAGE + RTEXT "Full screen:",IDC_SELECTRESTEXT,15,17,40,15,SS_CENTERIMAGE COMBOBOX IDC_DISPLAYSELECT,59,10,147,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_RESOLUTION,59,27,52,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_REFRESHRATE,145,27,61,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP - RTEXT "Windowed:",IDC_WINDOWEDTEXT,18,51,37,8 EDITTEXT IDC_XSIZE,59,48,35,12,ES_NUMBER EDITTEXT IDC_YSIZE,103,48,35,12,ES_NUMBER - CONTROL "Vertical sync",IDC_VSYNC,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_TABSTOP,147,49,54,10 - GROUPBOX "Settings",IDC_SETTINGSTEXT,12,73,199,93 - CONTROL "Full-screen native modes",IDC_AFULLSCREEN,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_TABSTOP,21,85,92,10 - CONTROL "Full-screen RTG modes",IDC_PFULLSCREEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,120,85,87,10 - CONTROL "Correct aspect ratio",IDC_ASPECT,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_TABSTOP,21,99,92,10 - CONTROL "Force low resolution",IDC_LORES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,120,99,85,10 - LTEXT "Refresh:",IDC_REFRESHTEXT,18,129,28,8 - CONTROL "Slider1",IDC_FRAMERATE,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,47,124,75,20 - EDITTEXT IDC_RATETEXT,127,128,77,12,ES_CENTER | ES_READONLY + CONTROL "Vertical sync",IDC_VSYNC,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_TABSTOP,147,49,57,10 + GROUPBOX "Settings",IDC_SETTINGSTEXT,12,73,199,125 + CONTROL "Correct aspect ratio",IDC_ASPECT,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_TABSTOP,19,126,92,10 + CONTROL "Force low resolution",IDC_LORES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,118,126,89,10 + LTEXT "Refresh:",IDC_REFRESHTEXT,18,162,28,8 + CONTROL "Slider1",IDC_FRAMERATE,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,47,157,75,20 + EDITTEXT IDC_RATETEXT,127,161,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,49,10 + CONTROL "Vertical",IDC_YCENTER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,229,32,49,10 GROUPBOX "Line Mode",IDC_LINEMODE,222,73,61,73 CONTROL "Normal",IDC_LM_NORMAL,"Button",BS_AUTORADIOBUTTON | BS_LEFT | WS_GROUP | WS_TABSTOP,231,89,44,10 CONTROL "Double",IDC_LM_DOUBLED,"Button",BS_AUTORADIOBUTTON | BS_LEFT | WS_TABSTOP,231,105,45,10 CONTROL "Scanlines",IDC_LM_SCANLINES,"Button",BS_AUTORADIOBUTTON | BS_LEFT | WS_TABSTOP,231,121,46,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 - LTEXT "FPS adj.:",IDC_REFRESH2TEXT,17,149,30,8 - CONTROL "",IDC_FRAMERATE2,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,47,144,127,20 - EDITTEXT IDC_RATE2TEXT,178,148,26,12,ES_CENTER | ES_READONLY + COMBOBOX IDC_DA_MODE,20,211,58,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + CONTROL "",IDC_DA_SLIDER,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,84,207,101,20 + LTEXT "FPS adj.:",IDC_REFRESH2TEXT,16,182,32,8 + CONTROL "",IDC_FRAMERATE2,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,47,177,127,20 + EDITTEXT IDC_RATE2TEXT,178,181,26,12,ES_CENTER | ES_READONLY COMBOBOX IDC_RESOLUTIONDEPTH,112,27,32,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP - CONTROL "Filtered low resolution",IDC_LORES_SMOOTHED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,120,113,85,10 + CONTROL "Filtered low resolution",IDC_LORES_SMOOTHED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,118,140,89,10 + COMBOBOX IDC_SCREENMODE_NATIVE,100,85,102,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_SCREENMODE_RTG,100,103,102,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + RTEXT "Native mode:",IDC_STATIC,19,85,59,15,SS_CENTERIMAGE + RTEXT "Windowed:",IDC_WINDOWEDTEXT,15,51,40,8 + RTEXT "RTG mode:",IDC_STATIC,19,101,59,15,SS_CENTERIMAGE + PUSHBUTTON "Reset to defaults",IDC_DA_RESET,212,211,73,14 END IDD_MEMORY DIALOGEX 0, 0, 300, 175 @@ -122,47 +148,52 @@ BEGIN EDITTEXT IDC_MBRAM2,243,142,30,12,ES_CENTER | ES_READONLY END -IDD_CPU DIALOGEX 0, 0, 300, 177 +IDD_CPU DIALOGEX 0, 0, 300, 226 STYLE DS_LOCALEDIT | DS_SETFONT | DS_3DLOOK | DS_CONTROL | WS_CHILD FONT 8, "MS Sans Serif", 0, 0, 0x0 BEGIN - GROUPBOX "CPU",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 + GROUPBOX "CPU",IDC_STATIC,5,3,81,139,BS_LEFT + CONTROL "68000",IDC_CPU0,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,13,16,63,10 + CONTROL "68010",IDC_CPU1,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,13,30,65,10 + CONTROL "68020",IDC_CPU2,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,13,44,63,10 + CONTROL "68030",IDC_CPU3,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,13,58,64,10 + CONTROL "68040",IDC_CPU4,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,13,72,66,10 + CONTROL "68060",IDC_CPU5,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,13,85,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,9,126,73,10 - CONTROL "JIT [] Enable just-in-time CPU emulator. Significantly increases the speed of the CPU emulation. Requires 68020 or 68040 CPU.",IDC_JITENABLE, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,149,73,10 - GROUPBOX "CPU Emulation Speed",IDC_STATIC,90,5,205,86 + "Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,10,114,73,8 + 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,10,127,73,10 + GROUPBOX "CPU Emulation Speed",IDC_STATIC,90,3,205,90 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",IDC_CS_CPU_TEXT,96,73,15,10,SS_CENTERIMAGE | WS_TABSTOP + CONTROL "Slider1",IDC_SPEED,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,114,68,67,20 + LTEXT "Chipset",IDC_CS_CHIPSET_TEXT,182,73,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 - 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 "Constant 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 RTG",IDC_TRUST2,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,230,155,64,10 - CONTROL "More accurate FPU [] More compatible but slower FPU emulation.",IDC_COMPATIBLE_FPU, - "Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,9,137,73,10 + CONTROL "",IDC_CPUIDLE,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,219,68,69,20 + GROUPBOX "Advanced JIT Settings",IDC_STATIC,90,94,205,93 + RTEXT "Cache size:",IDC_CS_CACHE_TEXT,95,113,45,10,SS_CENTERIMAGE | WS_TABSTOP + CONTROL "Slider1",IDC_CACHE,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,140,108,115,20 + EDITTEXT IDC_CACHETEXT,255,113,30,12,ES_CENTER | ES_READONLY + CONTROL "Hard flush",IDC_HARDFLUSH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,100,141,63,10 + CONTROL "Constant jump",IDC_CONSTJUMP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,100,155,63,10 + CONTROL "FPU support",IDC_JITFPU,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,100,168,62,10 + CONTROL "Force settings",IDC_FORCE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,168,141,62,10 + CONTROL "No flags",IDC_NOFLAGS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,168,155,62,10 + CONTROL "Direct",IDC_TRUST0,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,235,141,52,10 + CONTROL "Indirect",IDC_TRUST1,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,235,155,52,10 + CONTROL "After RTG",IDC_TRUST2,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,235,168,52,10 + CONTROL "More compatible [] More compatible but slower FPU emulation.",IDC_COMPATIBLE_FPU, + "Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,9,206,73,10 + GROUPBOX "FPU",IDC_STATIC,6,144,81,76,BS_LEFT + CONTROL "24-bit addressing",IDC_COMPATIBLE24,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,10,100,73,8 + CONTROL "None",IDC_FPU0,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,14,154,63,10 + CONTROL "68881",IDC_FPU1,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,14,166,63,10 + CONTROL "68882",IDC_FPU2,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,14,179,63,10 + CONTROL "CPU internal",IDC_FPU3,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,14,192,63,10 END IDD_FLOPPY DIALOGEX 0, 0, 300, 240 @@ -218,14 +249,14 @@ 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,0,290,182 - PUSHBUTTON "Add &Directory...",IDC_NEW_FS,5,186,60,15 - PUSHBUTTON "Add &Hardfile...",IDC_NEW_HF,70,186,60,15 - PUSHBUTTON "Add Ha&rd Drive...",IDC_NEW_HD,135,186,60,15 + PUSHBUTTON "Add &Directory...",IDC_NEW_FS,5,186,64,15 + PUSHBUTTON "Add &Hardfile...",IDC_NEW_HF,74,186,64,15 + PUSHBUTTON "Add Ha&rd Drive...",IDC_NEW_HD,143,186,65,15 PUSHBUTTON "Remove",IDC_REMOVE,235,186,60,15 PUSHBUTTON "&Properties",IDC_EDIT,235,207,60,15 CONTROL "Add PC drives at startup",IDC_MAPDRIVES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,205,100,10 - CONTROL "Disable UAEFSDB-support",IDC_NOUAEFSDB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,110,205,115,10 - CONTROL "Don't use Windows Recycle Bin",IDC_NORECYCLEBIN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,110,216,115,10 + CONTROL "Disable UAEFSDB-support",IDC_NOUAEFSDB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,110,205,119,10 + CONTROL "Don't use Windows Recycle Bin",IDC_NORECYCLEBIN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,110,216,121,10 CONTROL "Include network drives",IDC_MAPDRIVES_NET,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,216,101,10 END @@ -236,10 +267,10 @@ 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 GROUPBOX "Sound Emulation",IDC_SOUNDSETTINGS,5,30,120,81 - 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,101,10 + CONTROL "Disabled, but emulated",IDC_SOUND1,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,13,57,102,10 + CONTROL "Enabled",IDC_SOUND2,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,13,69,102,10 + CONTROL "Enabled, 100% accurate",IDC_SOUND3,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,13,81,101,10 GROUPBOX "Volume",IDC_STATIC,131,36,164,31 CONTROL "",IDC_SOUNDVOLUME,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,137,44,105,20 EDITTEXT IDC_SOUNDVOLUME2,247,47,40,12,ES_CENTER | ES_READONLY @@ -247,17 +278,17 @@ BEGIN CONTROL "Slider1",IDC_SOUNDBUFFERRAM,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,138,81,106,19 EDITTEXT IDC_SOUNDBUFFERMEM,248,84,40,12,ES_CENTER | ES_READONLY GROUPBOX "Settings",IDC_SOUNDINTERPOLATION2,6,114,290,60 - LTEXT "Frequency:",IDC_SOUNDFREQTXT,11,124,37,8,SS_CENTERIMAGE - COMBOBOX IDC_SOUNDFREQ,13,133,51,75,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP - LTEXT "Audio filter:",IDC_SOUNDFILTERTXT,209,148,34,8,SS_CENTERIMAGE + LTEXT "Frequency:",IDC_SOUNDFREQTXT,11,147,53,8,SS_CENTERIMAGE + COMBOBOX IDC_SOUNDFREQ,13,156,51,75,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + LTEXT "Audio filter:",IDC_SOUNDFILTERTXT,209,148,77,8,SS_CENTERIMAGE COMBOBOX IDC_SOUNDFILTER,209,157,80,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Stereo mode:",IDC_SOUNDSTEREOTXT,74,124,41,8,SS_CENTERIMAGE - COMBOBOX IDC_SOUNDSTEREO,73,133,62,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Interpolation:",IDC_SOUNDINTERPOLATIONTXT,209,124,41,8,SS_CENTERIMAGE + LTEXT "Channel mode:",IDC_SOUNDSTEREOTXT,11,124,57,8,SS_CENTERIMAGE + COMBOBOX IDC_SOUNDSTEREO,13,133,122,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Interpolation:",IDC_SOUNDINTERPOLATIONTXT,209,124,75,8,SS_CENTERIMAGE COMBOBOX IDC_SOUNDINTERPOLATION,209,132,80,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Stereo separation:",IDC_SOUNDSTEREOSEPTXT,141,124,56,8,SS_CENTERIMAGE + LTEXT "Stereo separation:",IDC_SOUNDSTEREOSEPTXT,141,124,63,8,SS_CENTERIMAGE COMBOBOX IDC_SOUNDSTEREOSEP,142,133,62,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Stereo mixing delay:",IDC_SOUNDSTEREOMIXTXT,141,148,63,8,SS_CENTERIMAGE + LTEXT "Stereo delay:",IDC_SOUNDSTEREOMIXTXT,141,148,63,8,SS_CENTERIMAGE COMBOBOX IDC_SOUNDSTEREOMIX,142,157,62,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Floppy Drive Sound Emulation",IDC_STATIC,6,177,290,46 CONTROL "",IDC_SOUNDDRIVEVOLUME,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,14,185,107,19 @@ -265,7 +296,7 @@ BEGIN COMBOBOX IDC_SOUNDDRIVE,237,187,46,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_SOUNDDRIVESELECT,18,205,265,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_SOUNDSWAP,73,157,62,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Swap channels:",IDC_SOUNDSWAPTXT,74,148,50,8,SS_CENTERIMAGE + LTEXT "Swap channels:",IDC_SOUNDSWAPTXT,74,148,61,8,SS_CENTERIMAGE CONTROL "Automatic switching",IDC_SOUND_AUTO,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,14,95,103,10 END @@ -274,23 +305,23 @@ STYLE DS_LOCALEDIT | 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 - RTEXT "Name:",IDC_STATIC,0,161,40,15,SS_CENTERIMAGE - EDITTEXT IDC_EDITNAME,44,162,150,13,ES_AUTOHSCROLL - RTEXT "Description:",IDC_STATIC,4,183,37,15,SS_CENTERIMAGE - EDITTEXT IDC_EDITDESCRIPTION,44,183,150,13,ES_AUTOHSCROLL - 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 + RTEXT "Name:",IDC_STATIC,4,161,40,15,SS_CENTERIMAGE + EDITTEXT IDC_EDITNAME,48,162,146,13,ES_AUTOHSCROLL + RTEXT "Description:",IDC_STATIC,4,183,41,15,SS_CENTERIMAGE + EDITTEXT IDC_EDITDESCRIPTION,48,183,146,13,ES_AUTOHSCROLL + RTEXT "Link:",IDC_STATIC,4,204,40,15,SS_CENTERIMAGE + COMBOBOX IDC_CONFIGLINK,48,205,93,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 CONTROL "Autoload",IDC_CONFIGAUTO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,253,163,42,10 GROUPBOX "Additional Information",IDC_STATIC,199,179,96,38,BS_LEFT - PUSHBUTTON "View",IDC_VIEWINFO,210,195,35,15 - PUSHBUTTON "Set",IDC_SETINFO,250,195,35,15 - PUSHBUTTON "Load",IDC_QUICKLOAD,5,225,40,15 - PUSHBUTTON "Save",IDC_QUICKSAVE,50,225,40,15 - PUSHBUTTON "Load From...",IDC_LOAD,125,225,45,15 - PUSHBUTTON "Delete",IDC_DELETE,255,225,40,15 - PUSHBUTTON "Save As...",IDC_SAVE,175,225,40,15 + PUSHBUTTON "View",IDC_VIEWINFO,208,195,37,15 + PUSHBUTTON "Set",IDC_SETINFO,250,195,37,15 + PUSHBUTTON "Load",IDC_QUICKLOAD,5,225,44,15 + PUSHBUTTON "Save",IDC_QUICKSAVE,54,225,44,15 + PUSHBUTTON "Load From...",IDC_LOAD,121,225,49,15 + PUSHBUTTON "Delete",IDC_DELETE,251,225,44,15 + PUSHBUTTON "Save As...",IDC_SAVE,175,225,44,15 END IDD_PORTS DIALOGEX 0, 0, 300, 238 @@ -301,12 +332,12 @@ BEGIN RTEXT "Printer:",IDC_STATIC,12,15,25,15,SS_CENTERIMAGE 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 a 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,79,12 + CONTROL "PostScript printer emulation",IDC_PSPRINTER,"Button",BS_AUTOCHECKBOX | BS_VCENTER | WS_TABSTOP,95,33,110,12 + RTEXT "Autoflush [] Time in seconds after a 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 - EDITTEXT IDC_PS_PARAMS,120,50,169,12,ES_AUTOHSCROLL + RTEXT "Ghostscript extra parameters:",IDC_STATIC,12,49,102,15,SS_CENTERIMAGE + EDITTEXT IDC_PS_PARAMS,124,50,165,12,ES_AUTOHSCROLL GROUPBOX "Serial Port",IDC_SERIALFRAME,4,72,292,48 COMBOBOX IDC_SERIAL,49,84,232,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "Shared",IDC_SER_SHARED,"Button",BS_AUTOCHECKBOX | BS_VCENTER | WS_TABSTOP,11,102,48,13 @@ -362,15 +393,15 @@ STYLE DS_LOCALEDIT | DS_SETFONT | DS_3DLOOK | DS_CONTROL | WS_CHILD FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN GROUPBOX "Advanced",IDC_STATIC,8,2,285,110 - CONTROL "Untrap mouse with middle button",IDC_JULIAN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,29,15,120,10 - CONTROL "Show GUI on startup",IDC_SHOWGUI,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,29,27,120,10 - CONTROL "On-screen LEDs",IDC_SHOWLEDS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,29,40,115,10 - CONTROL "uaescsi.device",IDC_SCSIDEVICE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,29,53,117,10 - CONTROL "Don't show taskbar button",IDC_NOTASKBARBUTTON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,29,66,117,10 - CONTROL "bsdsocket.library emulation",IDC_SOCKETS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,159,15,120,10 - CONTROL "Use CTRL-F11 to quit",IDC_CTRLF11,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,159,27,120,10 - CONTROL "Don't use RGB overlays",IDC_NOOVERLAY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,159,40,120,10 - CONTROL "Synchronize clock",IDC_CLOCKSYNC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,159,66,115,10 + CONTROL "Untrap mouse with middle button",IDC_JULIAN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,23,15,129,10 + CONTROL "Show GUI on startup",IDC_SHOWGUI,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,23,27,120,10 + CONTROL "On-screen LEDs",IDC_SHOWLEDS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,23,40,115,10 + CONTROL "uaescsi.device",IDC_SCSIDEVICE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,23,53,117,10 + CONTROL "Don't show taskbar button",IDC_NOTASKBARBUTTON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,23,66,117,10 + CONTROL "bsdsocket.library emulation",IDC_SOCKETS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,161,15,120,10 + CONTROL "Use CTRL-F11 to quit",IDC_CTRLF11,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,161,27,120,10 + CONTROL "Don't use RGB overlays",IDC_NOOVERLAY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,161,40,120,10 + CONTROL "Synchronize clock",IDC_CLOCKSYNC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,161,66,115,10 GROUPBOX "Keyboard LEDs",IDC_STATIC,7,140,85,94 COMBOBOX IDC_KBLED1,22,154,56,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_KBLED2,22,173,56,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP @@ -386,14 +417,14 @@ BEGIN COMBOBOX IDC_STATE_RATE,248,197,38,65,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP RTEXT "Recording buffer (MB):",IDC_STATIC,157,219,83,10,SS_CENTERIMAGE | WS_TABSTOP COMBOBOX IDC_STATE_BUFFERSIZE,248,217,38,65,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP - CONTROL "Always on top",IDC_ALWAYSONTOP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,29,79,117,10 - CONTROL "Catweasel",IDC_CATWEASEL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,159,79,115,10 + CONTROL "Always on top",IDC_ALWAYSONTOP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,23,79,117,10 + CONTROL "Catweasel",IDC_CATWEASEL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,161,79,115,10 CONTROL "USB mode",IDC_KBLED_USB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,22,216,64,10 - COMBOBOX IDC_SCSIMODE,159,51,104,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_SCSIMODE,161,51,104,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_LANGUAGE,103,121,179,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Language",IDC_STATIC,7,112,285,25 - CONTROL "Disable powersaving features",IDC_POWERSAVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,29,92,117,10 - CONTROL "Magic Mouse",IDC_MOUSETRICK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,159,92,119,10 + CONTROL "Disable powersaving features",IDC_POWERSAVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,23,92,120,10 + CONTROL "Magic Mouse",IDC_MOUSETRICK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,161,92,119,10 END IDD_HARDFILE DIALOGEX 0, 0, 299, 212 @@ -410,16 +441,16 @@ BEGIN PUSHBUTTON "...",IDC_FILESYS_SELECTOR,271,34,11,15 RTEXT "Device:",IDC_HARDFILE_DEVICE_TEXT,17,58,31,10 EDITTEXT IDC_HARDFILE_DEVICE,52,54,40,15,ES_AUTOHSCROLL - RTEXT "Boot priority:",IDC_HARDFILE_BOOTPRI_TEXT,15,101,44,8 - EDITTEXT IDC_HARDFILE_BOOTPRI,65,96,40,15 + RTEXT "Boot priority:",IDC_HARDFILE_BOOTPRI_TEXT,24,79,44,8 + EDITTEXT IDC_HARDFILE_BOOTPRI,74,75,40,15 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 + RTEXT "Surfaces:",IDC_SURFACES_TEXT,120,79,30,10 + EDITTEXT IDC_HEADS,155,75,35,15,ES_NUMBER RTEXT "Reserved:",IDC_RESERVED_TEXT,197,79,35,10 EDITTEXT IDC_RESERVED,237,75,35,15,ES_NUMBER - RTEXT "Sectors:",IDC_SECTORS_TEXT,112,101,30,10 - EDITTEXT IDC_SECTORS,147,96,35,15,ES_NUMBER + RTEXT "Sectors:",IDC_SECTORS_TEXT,120,101,30,10 + EDITTEXT IDC_SECTORS,155,96,35,15,ES_NUMBER RTEXT "Block size:",IDC_BLOCKSIZE_TEXT,197,101,35,10 EDITTEXT IDC_BLOCKSIZE,237,96,35,15,ES_NUMBER GROUPBOX "New hard disk image file",IDC_STATIC,10,120,280,62 @@ -428,10 +459,11 @@ 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 - RTEXT "DOS type",IDC_STATIC,212,160,30,10,SS_CENTERIMAGE - RTEXT "MB",IDC_STATIC,212,138,11,10,SS_CENTERIMAGE + COMBOBOX IDC_HDF_CONTROLLER,73,97,41,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + RTEXT "DOS type",IDC_STATIC,214,160,32,10,SS_CENTERIMAGE + RTEXT "MB",IDC_STATIC,214,138,13,10,SS_CENTERIMAGE RTEXT "Type:",IDC_STATIC,18,160,25,10,SS_CENTERIMAGE + RTEXT "HD Controller:",IDC_STATIC,13,98,52,10,SS_CENTERIMAGE END IDD_FILESYS DIALOGEX 15, 25, 299, 111 @@ -483,17 +515,17 @@ BEGIN GROUPBOX "Options",IDC_STATIC,168,11,114,89 CONTROL "Immediate Blitter [] Faster but less compatible blitter emulation.",IDC_BLITIMM, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,174,30,96,10 - CONTROL "Cycle-exact CPU and Blitter [] The most compatible A500 emulation mode. Very fast PC recommended.",IDC_CYCLEEXACT, + CONTROL "Cycle-exact [] The most compatible A500 emulation mode. Very fast PC recommended.",IDC_CYCLEEXACT, "Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,174,43,100,10 GROUPBOX "Collision Level",IDC_STATIC,14,105,267,48 CONTROL "None [] Collision hardware emulation disabled.",IDC_COLLISION0, - "Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,40,121,50,10 + "Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,40,121,59,10 CONTROL "Sprites only [] Emulate only sprite vs. sprite collisions.",IDC_COLLISION1, - "Button",BS_AUTORADIOBUTTON | WS_TABSTOP,39,137,50,10 + "Button",BS_AUTORADIOBUTTON | WS_TABSTOP,39,137,62,10 CONTROL "Sprites and Sprites vs. Playfield [] Recommended collision emulation level.",IDC_COLLISION2, - "Button",BS_AUTORADIOBUTTON | WS_TABSTOP,104,121,161,10 + "Button",BS_AUTORADIOBUTTON | WS_TABSTOP,109,121,161,10 CONTROL "Full [] 100% collision hardware emulation. Only very few games need this option. Slowest.",IDC_COLLISION3, - "Button",BS_AUTORADIOBUTTON | WS_TABSTOP,104,137,82,10 + "Button",BS_AUTORADIOBUTTON | WS_TABSTOP,109,137,119,10 GROUPBOX "Sound Emulation",IDC_STATIC,13,159,268,65 CONTROL "Disabled",IDC_CS_SOUND0,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,39,175,102,10 CONTROL "Emulated",IDC_CS_SOUND1,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,39,190,91,10 @@ -520,27 +552,30 @@ BEGIN CONTROL "Vertical Sync",IDC_CS_CIAA_TOD1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,25,81,63,10 CONTROL "Power Supply 50Hz",IDC_CS_CIAA_TOD2,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,95,81,85,10 CONTROL "Power Supply 60Hz",IDC_CS_CIAA_TOD3,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,192,81,88,10 - CONTROL "Boot ROM Mirror",IDC_CS_KSMIRROR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,128,80,10 - CONTROL "A1000 Boot RAM/ROM",IDC_CS_A1000RAM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,102,128,86,10 - CONTROL "CD32 CD",IDC_CS_CD32CD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,141,76,10 - CONTROL "CD32 C2P",IDC_CS_CD32C2P,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,102,141,85,10 - CONTROL "CD32 NVRAM",IDC_CS_CD32NVRAM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,193,141,84,10 - CONTROL "CDTV CD",IDC_CS_CDTVCD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,154,47,10 - CONTROL "CDTV SRAM",IDC_CS_CDTVRAM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,102,153,85,10 - CONTROL "CDTV SRAM Expansion",IDC_CS_CDTVRAMEXP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,193,153,90,10 - CONTROL "A600/A1200 IDE",IDC_CS_IDE1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,166,79,10 - CONTROL "A4000 IDE",IDC_CS_IDE2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,102,166,84,10 - CONTROL "Ramsey revision:",IDC_CS_RAMSEY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,201,71,10 - EDITTEXT IDC_CS_RAMSEYREV,94,199,45,13,ES_AUTOHSCROLL - CONTROL "Fat Gary revision:",IDC_CS_FATGARY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,214,71,10 - EDITTEXT IDC_CS_FATGARYREV,94,213,45,13,ES_AUTOHSCROLL - CONTROL "Motherboard Super DMAC",IDC_CS_DMAC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,227,118,10 + CONTROL "Boot ROM Mirror",IDC_CS_KSMIRROR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,108,80,10 + CONTROL "A1000 Boot RAM/ROM",IDC_CS_A1000RAM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,100,108,88,10 + CONTROL "CD32 CD",IDC_CS_CD32CD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,121,76,10 + CONTROL "CD32 C2P",IDC_CS_CD32C2P,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,100,121,87,10 + CONTROL "CD32 NVRAM",IDC_CS_CD32NVRAM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,193,121,84,10 + CONTROL "CDTV CD",IDC_CS_CDTVCD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,134,47,10 + CONTROL "CDTV SRAM",IDC_CS_CDTVRAM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,100,133,87,10 + CONTROL "CDTV SRAM Expansion",IDC_CS_CDTVRAMEXP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,193,133,90,10 + CONTROL "A600/A1200 IDE",IDC_CS_IDE1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,146,79,10 + CONTROL "A4000/A4000T IDE",IDC_CS_IDE2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,100,146,88,10 + CONTROL "Ramsey revision:",IDC_CS_RAMSEY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,211,71,10 + EDITTEXT IDC_CS_RAMSEYREV,94,209,45,13,ES_AUTOHSCROLL + CONTROL "Fat Gary revision:",IDC_CS_FATGARY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,224,71,10 + EDITTEXT IDC_CS_FATGARYREV,94,223,45,13,ES_AUTOHSCROLL + CONTROL "A3000 SCSI",IDC_CS_DMAC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,100,175,76,10 CONTROL "Compatible Settings",IDC_CS_COMPATIBLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,21,234,10 - CONTROL "DF0: ID Hardware",IDC_CS_DF0IDHW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,193,128,92,10 - CONTROL "Agnus/Alice revision:",IDC_CS_AGNUS,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,150,201,81,10 - EDITTEXT IDC_CS_AGNUSREV,235,199,45,13,ES_AUTOHSCROLL | NOT WS_VISIBLE - CONTROL "Denise/Lisa revision:",IDC_CS_DENISE,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,150,214,81,10 - EDITTEXT IDC_CS_DENISEREV,235,213,45,13,ES_AUTOHSCROLL | NOT WS_VISIBLE + CONTROL "DF0: ID Hardware",IDC_CS_DF0IDHW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,193,108,92,10 + CONTROL "Agnus/Alice revision:",IDC_CS_AGNUS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,150,211,81,10 + EDITTEXT IDC_CS_AGNUSREV,235,209,45,13,ES_AUTOHSCROLL + CONTROL "Denise/Lisa revision:",IDC_CS_DENISE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,150,227,81,10 + EDITTEXT IDC_CS_DENISEREV,235,226,45,13,ES_AUTOHSCROLL + CONTROL "A590/A2091 SCSI",IDC_CS_A2091,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,17,175,76,10 + CONTROL "A4000T SCSI",IDC_CS_DMAC2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,193,175,88,10 + LTEXT "SCSI not yet implemented.",IDC_STATIC,25,161,224,8,SS_CENTERIMAGE END IDD_AVIOUTPUT DIALOGEX 0, 0, 288, 203 @@ -550,16 +585,16 @@ BEGIN GROUPBOX "Output Properties",IDC_STATIC,5,8,274,118 EDITTEXT IDC_AVIOUTPUT_FILETEXT,15,21,226,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER,WS_EX_CLIENTEDGE PUSHBUTTON "...",IDC_AVIOUTPUT_FILE,249,20,19,12 - CONTROL "Audio",IDC_AVIOUTPUT_AUDIO,"Button",BS_AUTOCHECKBOX | BS_PUSHLIKE | BS_FLAT | WS_TABSTOP,15,36,32,11 + CONTROL "Audio",IDC_AVIOUTPUT_AUDIO,"Button",BS_AUTOCHECKBOX | BS_PUSHLIKE | BS_FLAT | WS_TABSTOP,15,36,39,11 CONTROL "",IDC_AVIOUTPUT_AUDIO_STATIC,"Static",SS_LEFTNOWORDWRAP | SS_CENTERIMAGE | SS_SUNKEN | WS_GROUP,59,36,209,11 - CONTROL "Video",IDC_AVIOUTPUT_VIDEO,"Button",BS_AUTOCHECKBOX | BS_PUSHLIKE | BS_FLAT | WS_TABSTOP,15,50,32,11 + CONTROL "Video",IDC_AVIOUTPUT_VIDEO,"Button",BS_AUTOCHECKBOX | BS_PUSHLIKE | BS_FLAT | WS_TABSTOP,15,50,39,11 CONTROL "",IDC_AVIOUTPUT_VIDEO_STATIC,"Static",SS_LEFTNOWORDWRAP | SS_CENTERIMAGE | SS_SUNKEN | WS_GROUP,59,50,209,11 CONTROL "Disable frame rate limit while recording",IDC_AVIOUTPUT_FRAMELIMITER, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,68,136,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,68,158,10 CONTROL "AVI output enabled",IDC_AVIOUTPUT_ACTIVATED,"Button",BS_AUTORADIOBUTTON | BS_PUSHLIKE | BS_FLAT,15,103,108,14 CONTROL "PAL",IDC_AVIOUTPUT_PAL,"Button",BS_AUTORADIOBUTTON | BS_PUSHLIKE | BS_FLAT,133,103,66,14 CONTROL "NTSC",IDC_AVIOUTPUT_NTSC,"Button",BS_AUTORADIOBUTTON | BS_PUSHLIKE | BS_FLAT,204,103,66,14 - CONTROL "Slider1",IDC_AVIOUTPUT_FPS,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | TBS_ENABLESELRANGE | WS_TABSTOP,156,84,97,11 + CONTROL "Slider1",IDC_AVIOUTPUT_FPS,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | TBS_ENABLESELRANGE | WS_TABSTOP,166,84,87,11 LTEXT "fps",IDC_AVIOUTPUT_FPS_STATIC,255,84,19,8 PUSHBUTTON "Save screenshot",IDC_SCREENSHOT,16,141,76,14 GROUPBOX "Ripper",IDC_STATIC,5,127,274,38 @@ -570,7 +605,7 @@ BEGIN CONTROL "Playback",IDC_INPREC_PLAY,"Button",BS_AUTORADIOBUTTON | BS_PUSHLIKE | BS_FLAT,16,178,77,14 CONTROL "Alt. playback mode",IDC_INPREC_PLAYMODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,103,180,78,10 CONTROL "Disable sound output while recording",IDC_AVIOUTPUT_NOSOUNDOUTPUT, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,85,136,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,85,148,10 END IDD_INPUT DIALOGEX 0, 0, 300, 242 @@ -583,16 +618,16 @@ BEGIN 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 - EDITTEXT IDC_INPUTSPEEDD,207,195,25,12,ES_NUMBER - 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 + RTEXT "Joystick dead zone (%):",-1,7,196,79,10,SS_CENTERIMAGE + EDITTEXT IDC_INPUTDEADZONE,92,195,25,12,ES_NUMBER + RTEXT "Autofire rate (frames):",-1,10,212,76,10,SS_CENTERIMAGE + EDITTEXT IDC_INPUTAUTOFIRERATE,92,210,25,12,ES_NUMBER + RTEXT "Digital joy-mouse speed:",-1,124,196,84,10,SS_CENTERIMAGE + EDITTEXT IDC_INPUTSPEEDD,215,195,25,12,ES_NUMBER + RTEXT "Analog joy-mouse speed:",-1,120,212,88,10,SS_CENTERIMAGE + EDITTEXT IDC_INPUTSPEEDA,215,211,25,12,ES_NUMBER + RTEXT "Mouse speed:",-1,132,228,76,10,SS_CENTERIMAGE + EDITTEXT IDC_INPUTSPEEDM,215,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 PUSHBUTTON "Swap 1<>2",IDC_INPUTSWAP,249,226,45,14 @@ -603,36 +638,35 @@ STYLE DS_LOCALEDIT | DS_SETFONT | DS_3DLOOK | DS_CONTROL | WS_CHILD FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN GROUPBOX "Filter Settings",-1,0,0,294,186 - 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,9,44,59,10,SS_CENTERIMAGE - CONTROL "Slider1",IDC_FILTERHZ,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,108,37,142,19 + CONTROL "Enable",IDC_FILTERENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,17,46,10 + COMBOBOX IDC_FILTERMODE,62,15,61,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_FILTERFILTER,128,15,81,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Reset to defaults",IDC_FILTERDEFAULT,213,15,73,14 + RTEXT "Horiz. size:",-1,4,44,54,10,SS_CENTERIMAGE + CONTROL "Slider1",IDC_FILTERHZ,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,99,37,152,19 EDITTEXT IDC_FILTERHZV,253,40,34,12,ES_CENTER | ES_READONLY - RTEXT "Vertical size:",-1,10,64,59,10,SS_CENTERIMAGE - CONTROL "Slider1",IDC_FILTERVZ,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,108,57,142,19 + RTEXT "Vert. size:",-1,5,64,54,10,SS_CENTERIMAGE + CONTROL "Slider1",IDC_FILTERVZ,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,99,57,152,19 EDITTEXT IDC_FILTERVZV,253,59,34,12,ES_CENTER | ES_READONLY - RTEXT "Horizontal position:",-1,10,84,59,10,SS_CENTERIMAGE - CONTROL "Slider1",IDC_FILTERHO,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,108,77,141,19 + RTEXT "Horiz. position:",-1,5,84,55,10,SS_CENTERIMAGE + CONTROL "Slider1",IDC_FILTERHO,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,99,77,151,19 EDITTEXT IDC_FILTERHOV,253,79,34,12,ES_CENTER | ES_READONLY - RTEXT "Vertical position:",-1,10,103,59,10,SS_CENTERIMAGE - CONTROL "Slider1",IDC_FILTERVO,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,108,99,141,19 + RTEXT "Vert. position:",-1,5,103,55,10,SS_CENTERIMAGE + CONTROL "Slider1",IDC_FILTERVO,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,99,99,151,19 EDITTEXT IDC_FILTERVOV,253,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,94,126,157,19 - EDITTEXT IDC_FILTERSLV,253,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,94,146,157,19 - EDITTEXT IDC_FILTERSL2V,253,151,34,12,ES_CENTER | ES_READONLY + RTEXT "Extra settings:",-1,27,133,57,10,SS_CENTERIMAGE + CONTROL "Slider1",IDC_FILTERXL,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,99,157,151,19 + EDITTEXT IDC_FILTERXLV,253,159,34,12,ES_CENTER | ES_READONLY + COMBOBOX IDC_FILTERSLR,253,130,33,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP GROUPBOX "Presets",-1,0,187,296,36 COMBOBOX IDC_FILTERPRESETS,8,201,119,150,CBS_DROPDOWN | CBS_SORT | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Load",IDC_FILTERPRESETLOAD,132,200,47,14 PUSHBUTTON "Save",IDC_FILTERPRESETSAVE,184,200,47,14 PUSHBUTTON "Delete",IDC_FILTERPRESETDELETE,236,200,47,14 - COMBOBOX IDC_FILTERHZMULT,77,43,27,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_FILTERVZMULT,77,63,27,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_FILTERHZMULT,67,43,27,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_FILTERVZMULT,67,63,27,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP CONTROL "Autoscale",IDC_FILTERAUTORES,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,26,168,63,10 + COMBOBOX IDC_FILTERXTRA,105,130,138,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP END IDD_HARDDRIVE DIALOGEX 0, 0, 380, 66 @@ -642,10 +676,10 @@ FONT 8, "MS Sans Serif", 0, 0, 0x0 BEGIN LTEXT "Hard drive:",-1,7,11,35,10 COMBOBOX IDC_HARDDRIVE,49,9,325,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP - CONTROL "Read/write",IDC_RW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,245,33,50,10 - DEFPUSHBUTTON "Add hard drive",IDOK,176,30,57,14 + CONTROL "Read/write",IDC_RW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,247,33,55,10 + DEFPUSHBUTTON "Add hard drive",IDOK,173,30,65,14 PUSHBUTTON "Cancel",IDCANCEL,321,30,54,14 - DEFPUSHBUTTON "Create hard disk image file",IDC_HARDDRIVE_IMAGE,49,30,95,14 + DEFPUSHBUTTON "Create hard disk image file",IDC_HARDDRIVE_IMAGE,49,30,115,14 EDITTEXT IDC_PATH_NAME,89,49,169,15,ES_AUTOHSCROLL | NOT WS_VISIBLE END @@ -654,18 +688,18 @@ STYLE DS_LOCALEDIT | 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 + RTEXT "Run at priority:",IDC_ACTIVE_PRI,14,17,52,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 + RTEXT "Run at priority:",IDC_INACTIVE_PRI,109,17,51,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 + CONTROL "Disable sound",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 + RTEXT "Run at priority:",IDC_MINIMIZED_PRI,207,18,51,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 + CONTROL "Disable sound",IDC_MINIMIZED_NOSOUND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,207,63,79,10 END IDD_DISK DIALOGEX 0, 0, 300, 242 @@ -673,9 +707,9 @@ STYLE DS_LOCALEDIT | DS_SETFONT | DS_SETFOREGROUND | DS_3DLOOK | DS_CONTROL | DS 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 - PUSHBUTTON "Remove floppy disk image",IDC_DISKLISTREMOVE,153,223,93,15 + PUSHBUTTON "Remove floppy disk image",IDC_DISKLISTREMOVE,149,223,101,15 COMBOBOX IDC_DISKTEXT,3,205,293,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Insert floppy disk image",IDC_DISKLISTINSERT,38,223,93,15 + PUSHBUTTON "Insert floppy disk image",IDC_DISKLISTINSERT,34,223,101,15 END IDD_PANEL DIALOGEX 0, 0, 420, 278 @@ -728,10 +762,10 @@ STYLE DS_LOCALEDIT | DS_SETFONT | DS_3DLOOK | DS_CONTROL | WS_CHILD FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN GROUPBOX "Emulated Hardware",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 - RTEXT "Configuration:",IDC_STATIC,5,33,56,10,SS_CENTERIMAGE - COMBOBOX IDC_QUICKSTART_CONFIGURATION,65,31,225,50,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + RTEXT "Model:",IDC_STATIC,5,14,50,10,SS_CENTERIMAGE + COMBOBOX IDC_QUICKSTART_MODEL,59,12,233,50,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + RTEXT "Configuration:",IDC_STATIC,5,33,50,10,SS_CENTERIMAGE + COMBOBOX IDC_QUICKSTART_CONFIGURATION,59,31,233,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 @@ -740,21 +774,21 @@ BEGIN RTEXT "Configuration:",IDC_STATIC,5,105,55,10,SS_CENTERIMAGE COMBOBOX IDC_QUICKSTART_HOSTCONFIG,65,103,225,50,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Emulated Floppy Drives",IDC_QUICKSTART_DF,3,126,294,84 - LTEXT "Floppy drive DF0:",IDC_STATIC,10,138,56,10,SS_CENTERIMAGE - PUSHBUTTON "Select disk image",IDC_DF0QQ,77,135,98,15 + PUSHBUTTON "Select disk image",IDC_DF0QQ,82,136,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 PUSHBUTTON "Eject",IDC_EJECT0Q,260,136,30,15 COMBOBOX IDC_DF0TEXTQ,9,154,282,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - LTEXT "Floppy drive DF1:",IDC_STATIC,10,176,56,10,SS_CENTERIMAGE - PUSHBUTTON "Select disk image",IDC_DF1QQ,77,172,98,15 + PUSHBUTTON "Select disk image",IDC_DF1QQ,82,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 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 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,197,222,94,10 + CONTROL "Floppy drive DF0:",IDC_DF0QENABLE,"Button",BS_AUTORADIOBUTTON | BS_PUSHLIKE | BS_FLAT,9,136,66,15 + CONTROL "Floppy drive DF1:",IDC_DF1QENABLE,"Button",BS_AUTORADIOBUTTON | BS_PUSHLIKE | BS_FLAT,9,172,66,15 END IDD_FRONTEND DIALOGEX 0, 0, 420, 242 @@ -772,7 +806,7 @@ CAPTION "Processing..." FONT 8, "MS Sans Serif", 0, 0, 0x0 BEGIN PUSHBUTTON "Cancel",IDCANCEL,88,40,50,14 - CONTROL "",IDC_PROGRESSBAR,"msctls_progress32",WS_BORDER | 0x1,7,19,215,14 + CONTROL "",IDC_PROGRESSBAR,"msctls_progress32",PBS_SMOOTH | WS_BORDER,7,19,215,14 CTEXT "x",IDC_PROGRESSBAR_TEXT,23,5,187,10,SS_CENTERIMAGE | WS_TABSTOP END @@ -787,6 +821,38 @@ BEGIN CTEXT "Custom input event",IDC_STRINGBOX_TEXT,23,5,187,10,SS_CENTERIMAGE | WS_TABSTOP END +IDD_DEBUGGER DIALOGEX 0, 0, 454, 368 +STYLE DS_LOCALEDIT | DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_CAPTION | WS_THICKFRAME +EXSTYLE WS_EX_CONTROLPARENT +CAPTION "WinUAE Debugger" +FONT 8, "Courier New", 0, 0, 0x0 +BEGIN + EDITTEXT IDC_DBG_OUTPUT1,1,79,370,262,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | ES_WANTRETURN | WS_VSCROLL | NOT WS_TABSTOP + EDITTEXT IDC_DBG_OUTPUT2,1,79,370,262,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | ES_WANTRETURN | WS_VSCROLL | NOT WS_TABSTOP + LISTBOX IDC_DBG_MEM,1,92,370,249,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT + LISTBOX IDC_DBG_DASM,1,92,370,249,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT + EDITTEXT IDC_DBG_MEMINPUT,1,79,36,12,ES_AUTOHSCROLL | ES_WANTRETURN + EDITTEXT IDC_DBG_INPUT,1,342,354,12,ES_AUTOHSCROLL | ES_WANTRETURN + PUSHBUTTON "?",IDC_DBG_HELP,356,342,15,12,NOT WS_TABSTOP + PUSHBUTTON "Set to PC",IDC_DBG_MEMTOPC,38,79,45,12,NOT WS_TABSTOP + LISTBOX IDC_DBG_DREG,1,1,52,66,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT + LISTBOX IDC_DBG_AREG,54,1,52,66,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT + LISTBOX IDC_DBG_AMEM,106,1,231,66,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT + LISTBOX IDC_DBG_CCR,338,1,57,42,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT + LISTBOX IDC_DBG_SP_VBR,338,44,115,34,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT + LISTBOX IDC_DBG_MMISC,396,1,57,42,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT + LISTBOX IDC_DBG_PC,1,68,52,10,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT + LISTBOX IDC_DBG_PREFETCH,54,68,283,10,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT + LISTBOX IDC_DBG_FPREG,372,218,81,66,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT + LISTBOX IDC_DBG_FPSR,372,285,81,34,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT + LISTBOX IDC_DBG_MISCCPU,372,320,81,34,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT + CONTROL "",IDC_DBG_STATUS,"msctls_statusbar32",0x103,0,355,453,12 + LISTBOX IDC_DBG_BRKPTS,1,79,370,262,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_VSCROLL + LISTBOX IDC_DBG_MCUSTOM,372,79,81,138,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT + LISTBOX IDC_DBG_MISC,1,79,370,262,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_VSCROLL + LISTBOX IDC_DBG_CUSTOM,1,79,370,262,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_VSCROLL +END + ///////////////////////////////////////////////////////////////////////////// // @@ -823,8 +889,8 @@ IDI_PATHS ICON "paths.ico" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,4,1,0 - PRODUCTVERSION 1,4,1,0 + FILEVERSION 1,4,2,0 + PRODUCTVERSION 1,4,2,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -840,12 +906,12 @@ BEGIN BLOCK "040904b0" BEGIN VALUE "FileDescription", "WinUAE" - VALUE "FileVersion", "1.4.1" + VALUE "FileVersion", "1.4.2" VALUE "InternalName", "WinUAE" VALUE "LegalCopyright", "© 1996-2007 under the GNU Public License (GPL)" VALUE "OriginalFilename", "WinUAE.exe" VALUE "ProductName", "WinUAE" - VALUE "ProductVersion", "1.4.1" + VALUE "ProductVersion", "1.4.2" END END BLOCK "VarFileInfo" @@ -905,7 +971,7 @@ BEGIN IDS_PORTS "Game & I/O ports" IDS_MISC1 "Misc" IDS_MEMORY "RAM" - IDS_CPU "CPU" + IDS_CPU "CPU and FPU" IDS_CHIPSET "Chipset" IDS_INPUT "Input" IDS_FILTER "Filter" @@ -1005,9 +1071,9 @@ BEGIN IDS_PRI_BELOWNORMAL "Below Normal" IDS_PRI_LOW "Low" IDS_OLDRTGLIBRARY "The installed LIBS:Picasso96/rtg.library (%d.%d) file needs to be updated.\nA newer version is included in the ""Amiga Programs"" directory of the WinUAE distribution archive.\nThe new library fixes graphics problems and increases performance." - IDS_DEFAULT_AF2005 "Amiga Forever" + IDS_DEFAULT_AF2005 "WinUAE default (new) / Amiga Forever" IDS_DEFAULT_AF "Amiga Forever (old)" - IDS_DEFAULT_WINUAE "WinUAE default" + IDS_DEFAULT_WINUAE "WinUAE default (old)" END STRINGTABLE @@ -1020,8 +1086,6 @@ BEGIN IDS_DELETECONFIGCONFIRMATION "Are you sure you want to Delete this configuration?\n" IDS_DELETECONFIGTITLE "Confirm Delete" - IDS_GFXCARDCHECK "WinUAE will now determine the 16-bit pixel format of your graphics card. Your screen will go black for two seconds, with a resolution of 640x480 @ 60Hz. This procedure is required for best rendering of the emulation environment on 16-bit display-modes, and should be done whenever you run WinUAE for the first time, or install a new graphics card in your PC. Proceed with this test?" - IDS_GFXCARDTITLE "Pixel format detection" IDS_MUSTSELECTPATH "You must select a path!" IDS_SETTINGSERROR "Settings error" IDS_MUSTSELECTNAME "You must select a name for the volume!" @@ -1036,6 +1100,9 @@ BEGIN IDS_INP "WinUAE Input Recording" IDS_RESTOREINP "Playback a WinUAE input recording" IDS_SAVEINP "Record a WinUAE input recording" + IDS_SCREEN_WINDOWED "Windowed" + IDS_SCREEN_FULLSCREEN "Fullscreen" + IDS_SCREEN_FULLWINDOW "Full-window" IDS_SOUND_MONO "Mono" IDS_SOUND_MIXED "Mixed" IDS_SOUND_STEREO "Stereo" @@ -1123,9 +1190,9 @@ BEGIN IDS_NUMSG_MODRIP_NOTFOUND "No music modules or packed data found." IDS_NUMSG_MODRIP_FINISHED "Scan finished." IDS_NUMSG_MODRIP_SAVE "Module/packed data found\n%s\nWould you like to save it?" - IDS_NUMSG_KS68020 "The selected system ROM requires a 68020 or higher CPU." + IDS_NUMSG_KS68020 "The selected system ROM requires a 68020 with 32-bit addressing or 68030 or higher CPU." IDS_NUMSG_ROMNEED "One of the following system ROMs is required:\n\n%s\n\nCheck the System ROM path in the Paths panel and click Rescan ROMs." - IDS_NUMSG_STATEHD "WARNING: State saves do not support hard drive emulation. This message will not appear again." + IDS_NUMSG_STATEHD "WARNING: Current configuration is not fully compatible with state saves.\nThis message will not appear again." IDS_NUMSG_NOCAPS "Selected disk image needs the SPS plugin\nwhich is available from\nhttp//www.softpres.org/" IDS_NUMSG_OLDCAPS "You need an updated SPS plugin\nwhich is available from\nhttp//www.softpres.org/" IDS_IMGCHK_BOOTBLOCKCRCERROR @@ -1143,7 +1210,7 @@ BEGIN IDS_ROM_UNAVAILABLE "unavailable" IDS_HARDDRIVESAFETYWARNING "Warning: The safety test has been disabled, and non-empty hard disks were detected.\n\nHard disks marked with 'HD_*_' are not empty." - IDS_NUMSG_KS68EC020 "The selected system ROM requires a 68EC020 or higher CPU." + IDS_NUMSG_KS68EC020 "The selected system ROM requires a 68020 with 24-bit addressing or higher CPU." IDS_ROMSCANNOROMS "No supported system ROMs detected." IDS_NUMSG_KICKREP "You need to have a floppy disk (image file) in DF0: to use the system ROM replacement." IDS_NUMSG_KICKREPNO "The floppy disk (image file) in DF0: is not compatible with the system ROM replacement functionality." @@ -1158,7 +1225,7 @@ BEGIN IDS_QS_MODEL_A500 "1.3 ROM, OCS, 512 KB Chip + 512 KB Slow RAM (most common)\nThis configuration is capable of running most games and demos produced for first-generation hardware. Only few exceptions need a different configuration (e.g. the oldest games tend to be incompatible with this configuration).\n1.3 ROM, ECS Agnus, 512 KB Chip RAM + 512 KB Slow RAM\nLater hardware revision of the A500. Nearly 100% compatible with the previous configuration.\n1.3 ROM, ECS Agnus, 1 MB Chip RAM\nFew newer games and demos require this configuration.\n1.3 ROM, OCS Agnus, 512 KB Chip RAM\nVery old (e.g. pre-1988) games and demos may require this configuration.\n1.2 ROM, OCS Agnus, 512 KB Chip RAM\nAs available for the A1000, and installed on the first A500 and A2000 series. Some very old programs only work correctly with this configuration. Note: This system ROM version can only boot from floppy disk (no hard disk boot support).\n1.2 ROM, OCS Agnus, 512 KB Chip RAM + 512 KB Slow RAM\nThis configuration adds expansion memory to the first A500 produced. Try this if your game does not work with newer configurations, but works with the previous one. It could add some features to the game, including faster loading times. Note: This system ROM version can only boot from floppy disk (no hard disk boot support)." IDS_QS_MODEL_A500P "Basic non-expanded configuration\nThe A500+ adds an ECS Agnus chip, 1 MB of Chip RAM and a 2.0 ROM to the A500. Many A500 games and demos don't work properly on an A500+.\n2 MB Chip RAM expanded configuration\n\n4 MB Fast RAM expanded configuration\n" IDS_QS_MODEL_A600 "Basic non-expanded configuration\nThe A600 is smaller than the A500+ and has an updated 2.0 ROM.\n2 MB Chip RAM expanded configuration\n\n4 MB Fast RAM expanded configuration\n" - IDS_QS_MODEL_A1000 "512 KB Chip RAM\nThe A1000 was the first model produced, with a configuration equivalent to that of an A500 with OCS chipset. You normally don't need to use this configuration, unless you are nostalgic and would like to hear the short A1000 boot tune\n256 KB Chip RAM\nUnexpanded A1000. All later A1000 models were sold with a 256 KB RAM expansion built-in." + IDS_QS_MODEL_A1000 "512 KB Chip RAM\nThe A1000 was the first model produced, with a configuration equivalent to that of an A500 with OCS chipset. You normally don't need to use this configuration, unless you are nostalgic and would like to hear the short A1000 boot tune\n""ICS"" Denise without EHB support\nVery first A1000 models had Denise without EHB capability.\n256 KB Chip RAM\n Unexpanded A1000. All later A1000 models were sold with a 256 KB RAM expansion built-in." IDS_QS_MODEL_A1200 "Basic non-expanded configuration\nUse this configuration to run most AGA demos and games\n4 MB Fast RAM expanded configuration\nSome newer AGA games and demos need an expanded A1200 to run." IDS_QS_MODEL_CD32 "CD32\nThe CD32 was one the first 32-bit consoles on the market. It is basically an A1200 with a built-in CD-ROM drive. Insert your CD32 or CDTV CD-ROM into a free CD-ROM drive before starting the emulation." IDS_QS_MODEL_CDTV "CDTV\nThe CDTV was the first model with a built-in CD-ROM drive. Looking like a black CD player, it featured a configuration equivalent to that of an A500 with 1 MB RAM and an ECS chipset.\nFloppy drive and 64KB SRAM card expanded CDTV\n" @@ -1172,7 +1239,7 @@ END STRINGTABLE BEGIN - IDS_SOUND_STEREO2 "Cloned Stereo" + IDS_SOUND_STEREO2 "Cloned Stereo (4 Channels)" IDS_INPUT_CUSTOMEVENT "" END @@ -1200,12 +1267,16 @@ BEGIN "resource.\0" END - 3 TEXTINCLUDE BEGIN "\r\0" END +2 TEXTINCLUDE +BEGIN + "#include ""afxres.h""\r\0" +END + #endif // APSTUDIO_INVOKED #endif // Finnish resources @@ -1219,7 +1290,6 @@ END // Generated from the TEXTINCLUDE 3 resource. // - ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED diff --git a/od-win32/win32.c b/od-win32/win32.c index 5d66e3ce..240a30f2 100755 --- a/od-win32/win32.c +++ b/od-win32/win32.c @@ -90,6 +90,7 @@ static int forceroms; char VersionStr[256]; char BetaStr[64]; +extern int path_type; int in_sizemove; int manual_painting_needed; @@ -121,7 +122,7 @@ char start_path_exe[MAX_DPATH]; char start_path_af[MAX_DPATH]; char start_path_new[MAX_DPATH]; char help_file[MAX_DPATH]; -int af_path_2005, af_path_old, winuae_path; +int af_path_2005, af_path_old; extern int harddrive_dangerous, do_rdbdump, aspi_allow_all, no_rawinput; int log_scsi; @@ -1675,6 +1676,10 @@ void logging_init(void) "\nPress F12 to show the Settings Dialog (GUI), Alt-F4 to quit." "\nEnd+F1 changes floppy 0, End+F2 changes floppy 1, etc." "\n"); + if (start_path_af[0]) + write_log ("AF_OLD: '%s'\n", start_path_af); + if (start_path_new[0]) + write_log ("AF_NEW: '%s'\n", start_path_new); write_log ("EXE: '%s', DATA: '%s'\n", start_path_exe, start_path_data); } @@ -1838,7 +1843,6 @@ int target_parse_option (struct uae_prefs *p, char *option, char *value) || cfgfile_yesno (option, value, "map_net_drives", &p->win32_automount_netdrives) || cfgfile_yesno (option, value, "logfile", &p->win32_logfile) || cfgfile_yesno (option, value, "networking", &p->socket_emu) - || cfgfile_yesno (option, value, "no_overlay", &p->win32_no_overlay) || cfgfile_yesno (option, value, "borderless", &p->win32_borderless) || cfgfile_yesno (option, value, "inactive_pause", &p->win32_inactive_pause) || cfgfile_yesno (option, value, "inactive_nosound", &p->win32_inactive_nosound) @@ -1858,6 +1862,11 @@ int target_parse_option (struct uae_prefs *p, char *option, char *value) || cfgfile_intval (option, value, "kbledmode", &p->win32_kbledmode, 1) || cfgfile_intval (option, value, "cpu_idle", &p->cpu_idle, 1)); + if (cfgfile_yesno (option, value, "no_overlay", &p->win32_no_overlay)) { + if (os_vista) + p->win32_no_overlay = 1; + return 1; + } if (cfgfile_yesno (option, value, "aspi", &v)) { p->win32_uaescsimode = 0; @@ -1952,6 +1961,32 @@ static void fixtrailing(char *p) strcat(p, "\\"); } +static int isfilesindir(char *p) +{ + WIN32_FIND_DATA fd; + HANDLE h; + char path[MAX_DPATH]; + int i = 0; + DWORD v; + + v = GetFileAttributes(p); + if (v == INVALID_FILE_ATTRIBUTES || !(v & FILE_ATTRIBUTE_DIRECTORY)) + return 0; + strcpy (path, p); + strcat (path, "\\*.*"); + h = FindFirstFile(path, &fd); + if (h != INVALID_HANDLE_VALUE) { + for (i = 0; i < 3; i++) { + if (!FindNextFile (h, &fd)) + break; + } + FindClose(h); + } + if (i == 3) + return 1; + return 0; +} + void fetch_path (char *name, char *out, int size) { int size2 = size; @@ -2030,22 +2065,18 @@ void set_path (char *name, char *path) } } } - if (af_path_2005) { + if (af_path_2005 && path_type == 2005) { char tmp2[MAX_DPATH]; - strcpy (tmp2, start_path_af); - strcat (tmp2, "System\\rom"); - if (GetFileAttributes(tmp2) != INVALID_FILE_ATTRIBUTES) { + strcpy (tmp2, start_path_new); + strcat (tmp2, "..\\System\\rom"); + if (isfilesindir(tmp2)) strcpy (tmp, tmp2); - } else { - strcpy (tmp, start_path_new); - strcat (tmp, "WinUAE\\roms"); - } - } else if (af_path_old) { + } else if (af_path_old && path_type == 1) { char tmp2[MAX_DPATH]; - strcpy (tmp2, start_path_exe); + strcpy (tmp2, start_path_af); strcat (tmp2, "..\\shared\\rom"); - if (GetFileAttributes(tmp2) != INVALID_FILE_ATTRIBUTES) - strcpy (tmp, tmp2); + if (isfilesindir(tmp2)) + strcpy (tmp, tmp2); } } fixtrailing (tmp); @@ -2480,7 +2511,6 @@ static int osdetect (void) typedef HRESULT (CALLBACK* SHGETFOLDERPATH)(HWND,int,HANDLE,DWORD,LPTSTR); typedef BOOL (CALLBACK* SHGETSPECIALFOLDERPATH)(HWND,LPTSTR,int,BOOL); -extern int path_type; static void getstartpaths(int start_data) { SHGETFOLDERPATH pSHGetFolderPath; @@ -2490,10 +2520,11 @@ static void getstartpaths(int start_data) DWORD v; HKEY key; DWORD dispo; - int path_done; + char xstart_path_uae[MAX_DPATH], xstart_path_old[MAX_DPATH]; + char xstart_path_new1[MAX_DPATH], xstart_path_new2[MAX_DPATH]; - path_done = 0; - path_type = 2005; + path_type = -1; + xstart_path_uae[0] = xstart_path_old[0] = xstart_path_new1[0] = xstart_path_new2[0] = 0; if (RegCreateKeyEx(HKEY_CURRENT_USER, "Software\\Arabuusimiehet\\WinUAE", 0, "", REG_OPTION_NON_VOLATILE, KEY_WRITE | KEY_READ, NULL, &key, &dispo) == ERROR_SUCCESS) { @@ -2503,49 +2534,40 @@ static void getstartpaths(int start_data) prevpath[0] = 0; RegCloseKey(key); } + if (!strcmp(prevpath, "WinUAE")) + path_type = 0; + if (!strcmp(prevpath, "AF")) + path_type = 1; + if (!strcmp(prevpath, "AF2005")) + path_type = 2005; + pSHGetFolderPath = (SHGETFOLDERPATH)GetProcAddress( GetModuleHandle("shell32.dll"), "SHGetFolderPathA"); pSHGetSpecialFolderPath = (SHGETSPECIALFOLDERPATH)GetProcAddress( GetModuleHandle("shell32.dll"), "SHGetSpecialFolderPathA"); strcpy (start_path_exe, _pgmptr ); - if((posn = strrchr (start_path_exe, '\\'))) + if((posn = strrchr (start_path_exe, '\\'))) posn[1] = 0; strcpy (tmp, start_path_exe); - strcat (tmp, "..\\shared\\rom\\rom.key"); - v = GetFileAttributes(tmp); - if (v != INVALID_FILE_ATTRIBUTES) { - af_path_old = 1; - if (!strcmp (prevpath, "AF")) { - path_done = 1; - path_type = 1; - } - + strcat (tmp, "roms"); + if (isfilesindir(tmp)) { + strcpy (xstart_path_uae, start_path_exe); + } + strcpy (tmp, start_path_exe); + strcat (tmp, "configurations"); + if (isfilesindir(tmp)) { + strcpy (xstart_path_uae, start_path_exe); } strcpy (tmp, start_path_exe); - strcat (tmp, "roms"); + strcat (tmp, "..\\shared\\rom\\rom.key"); v = GetFileAttributes(tmp); - if (v != INVALID_FILE_ATTRIBUTES && (v & FILE_ATTRIBUTE_DIRECTORY)) { - WIN32_FIND_DATA fd; - HANDLE h; - int i; - strcat (tmp, "\\*.*"); - h = FindFirstFile(tmp, &fd); - if (h != INVALID_HANDLE_VALUE) { - for (i = 0; i < 3; i++) { - if (!FindNextFile (h, &fd)) - break; - } - if (i == 3) { - winuae_path = 1; - if (!strcmp (prevpath, "WinUAE")) { - path_done = 1; - path_type = 0; - } - } - FindClose(h); - } + if (v != INVALID_FILE_ATTRIBUTES) { + af_path_old = 1; + strcpy (xstart_path_old, start_path_exe); + strcat (xstart_path_old, "..\\shared\\"); + strcpy (start_path_af, xstart_path_old); } p = getenv("AMIGAFOREVERDATA"); @@ -2556,15 +2578,9 @@ static void getstartpaths(int start_data) fixtrailing(start_path_af); v = GetFileAttributes(tmp); if (v != INVALID_FILE_ATTRIBUTES && (v & FILE_ATTRIBUTE_DIRECTORY)) { - if (start_data == 0) { - if (path_done == 0) { - strcpy (start_path_data, start_path_af); - strcat (start_path_data, "WinUAE"); - path_done = 1; - } - start_data = 1; - } - af_path_2005 = 1; + strcpy (xstart_path_new1, start_path_af); + strcat (xstart_path_new1, "WinUAE\\"); + af_path_2005 |= 1; } } @@ -2582,29 +2598,49 @@ static void getstartpaths(int start_data) strcat(tmp, "WinUAE"); CreateDirectory(tmp2, NULL); CreateDirectory(tmp, NULL); - strcpy(start_path_new, tmp2); v = GetFileAttributes(tmp); - if (v != INVALID_FILE_ATTRIBUTES) { - if (v & FILE_ATTRIBUTE_DIRECTORY) { - if (start_data == 0) { - if (path_done == 0) { - strcpy (start_path_af, tmp2); - strcpy (start_path_data, start_path_af); - strcat (start_path_data, "WinUAE"); - path_done = 1; - } - start_data = 1; - } - af_path_2005 = 2; + if (v != INVALID_FILE_ATTRIBUTES && (v & FILE_ATTRIBUTE_DIRECTORY)) { + strcpy(start_path_new, tmp2); + strcat(start_path_new, "WinUAE\\"); + strcat(tmp, "\\configurations"); + if (isfilesindir(tmp)) { + strcpy (xstart_path_new2, start_path_new); + af_path_2005 |= 2; } } } } + if (start_data == 0) { + start_data = 1; + if (path_type == 0 && xstart_path_uae[0]) { + strcpy(start_path_data, xstart_path_uae); + } else if (path_type == 1 && af_path_old && xstart_path_old[0]) { + strcpy(start_path_data, xstart_path_old); + } else if (path_type == 2005 && af_path_2005 && xstart_path_new2[0]) { + strcpy (start_path_data, xstart_path_new2); + } else if (path_type < 0) { + path_type = 0; + strcpy(start_path_data, xstart_path_uae); + if (af_path_old) { + path_type = 1; + strcpy(start_path_data, xstart_path_old); + } + if (af_path_2005 & 2) { + path_type = 2005; + strcpy(start_path_data, xstart_path_new2); + } + if (af_path_2005 & 1) { + path_type = 2005; + strcpy(start_path_data, xstart_path_new1); + } + } + } + v = GetFileAttributes(start_path_data); - if (v == INVALID_FILE_ATTRIBUTES || !(v & FILE_ATTRIBUTE_DIRECTORY) || start_data <= 0) + if (v == INVALID_FILE_ATTRIBUTES || !(v & FILE_ATTRIBUTE_DIRECTORY) || start_data <= 0) { strcpy(start_path_data, start_path_exe); - + } fixtrailing(start_path_data); } @@ -2634,11 +2670,11 @@ static void makeverstr(char *s) #if WINUAEBETA > 0 sprintf(BetaStr, " (%sBeta %d, %d.%02d.%02d)", WINUAEPUBLICBETA > 0 ? "Public " : "", WINUAEBETA, GETBDY(WINUAEDATE), GETBDM(WINUAEDATE), GETBDD(WINUAEDATE)); - sprintf(s, "WinUAE %d.%d.%d%s", - UAEMAJOR, UAEMINOR, UAESUBREV, BetaStr); + sprintf(s, "WinUAE %d.%d.%d%s%s", + UAEMAJOR, UAEMINOR, UAESUBREV, WINUAEREV, BetaStr); #else - sprintf(s, "WinUAE %d.%d.%d (%d.%02d.%02d)", - UAEMAJOR, UAEMINOR, UAESUBREV, GETBDY(WINUAEDATE), GETBDM(WINUAEDATE), GETBDD(WINUAEDATE)); + sprintf(s, "WinUAE %d.%d.%d%s (%d.%02d.%02d)", + UAEMAJOR, UAEMINOR, UAESUBREV, WINUAEREV, GETBDY(WINUAEDATE), GETBDM(WINUAEDATE), GETBDD(WINUAEDATE)); #endif #ifdef WINUAEEXTRA if(strlen(WINUAEEXTRA) > 0) { diff --git a/od-win32/win32.h b/od-win32/win32.h index dac951ef..72f5935e 100755 --- a/od-win32/win32.h +++ b/od-win32/win32.h @@ -17,8 +17,9 @@ #define WINUAEBETA 0 #define WINUAEPUBLICBETA 0 -#define WINUAEDATE MAKEBD(2007, 5, 12) +#define WINUAEDATE MAKEBD(2007, 5, 13) //#define WINUAEEXTRA "" +#define WINUAEREV "a" #define IHF_WINDOWHIDDEN 6 #define NORMAL_WINDOW_STYLE (WS_VISIBLE | WS_BORDER | WS_CAPTION | WS_MINIMIZEBOX | WS_SYSMENU) @@ -77,7 +78,7 @@ extern HKEY hWinUAEKey; extern int screen_is_picasso; extern HINSTANCE hInst; extern int win_x_diff, win_y_diff; -extern int af_path_2005, af_path_old, winuae_path; +extern int af_path_2005, af_path_old; extern char start_path_af[MAX_DPATH], start_path_new[MAX_DPATH]; extern void sleep_millis (int ms); diff --git a/od-win32/win32gfx.c b/od-win32/win32gfx.c index faf2e393..b47a5dc4 100755 --- a/od-win32/win32gfx.c +++ b/od-win32/win32gfx.c @@ -1593,7 +1593,7 @@ int DX_Fill(int dstx, int dsty, int width, int height, uae_u32 color, RGBFTYPE r SetRect(&srcrect, dstx, dsty, dstx + width, dsty + height); /* Set up our destination rectangle, and adjust for blit to windowed display (if necessary ) */ - SetRect(&dstrect, dstx, dsty, dstx+width, dsty+height); + SetRect(&dstrect, dstx, dsty, dstx + width, dsty + height); centerrect(&dstrect); /* Render our fill to the visible (primary) surface */ diff --git a/od-win32/win32gui.c b/od-win32/win32gui.c index 6e1ec125..0d7511c3 100755 --- a/od-win32/win32gui.c +++ b/od-win32/win32gui.c @@ -2791,9 +2791,7 @@ static INT_PTR CALLBACK PathsDlgProc (HWND hDlg, UINT msg, WPARAM wParam, LPARAM recursive++; pages[PATHS_ID] = hDlg; currentpage = PATHS_ID; -#if WINUAEBETA == 0 ShowWindow (GetDlgItem (hDlg, IDC_RESETREGISTRY), FALSE); -#endif numtypes = 0; SendDlgItemMessage (hDlg, IDC_PATHS_DEFAULTTYPE, CB_RESETCONTENT, 0, 0L); if (af_path_2005) { @@ -2810,13 +2808,11 @@ static INT_PTR CALLBACK PathsDlgProc (HWND hDlg, UINT msg, WPARAM wParam, LPARAM selpath = numtypes; ptypes[numtypes++] = 1; } - if (winuae_path || numtypes == 0) { - WIN32GUI_LoadUIString(IDS_DEFAULT_WINUAE, tmp, sizeof tmp); - SendDlgItemMessage (hDlg, IDC_PATHS_DEFAULTTYPE, CB_ADDSTRING, 0, (LPARAM)tmp); - if (path_type == 0) - selpath = numtypes; - ptypes[numtypes++] = 0; - } + WIN32GUI_LoadUIString(IDS_DEFAULT_WINUAE, tmp, sizeof tmp); + SendDlgItemMessage (hDlg, IDC_PATHS_DEFAULTTYPE, CB_ADDSTRING, 0, (LPARAM)tmp); + if (path_type == 0) + selpath = numtypes; + ptypes[numtypes++] = 0; SendDlgItemMessage (hDlg, IDC_PATHS_DEFAULTTYPE, CB_SETCURSEL, selpath, 0); if (numtypes > 1) { EnableWindow(GetDlgItem (hDlg, IDC_PATHS_DEFAULTTYPE), TRUE); @@ -2911,29 +2907,24 @@ static INT_PTR CALLBACK PathsDlgProc (HWND hDlg, UINT msg, WPARAM wParam, LPARAM case IDC_PATHS_DEFAULT: val = SendDlgItemMessage (hDlg, IDC_PATHS_DEFAULTTYPE, CB_GETCURSEL, 0, 0L); if (val != CB_ERR && val >= 0 && val < numtypes) { - char *p = my_strdup (start_path_data); - int pp1 = af_path_2005, pp2 = af_path_old; val = ptypes[val]; if (val == 0) { strcpy (start_path_data, start_path_exe); - af_path_2005 = af_path_old = 0; path_type = 0; strcpy (pathmode, "WinUAE"); - } else if (val == 1) { - strcpy (start_path_data, start_path_exe); - af_path_2005 = 0; + } else if (val == 1 && start_path_af[0]) { + strcpy (start_path_data, start_path_af); strcpy (pathmode, "AF"); path_type = 1; - } else { + } else if (val == 2005 && start_path_new[0]) { strcpy (pathmode, "AF2005"); path_type = 2005; strcpy (start_path_data, start_path_new); } + SetCurrentDirectory (start_path_data); if (hWinUAEKey) RegSetValueEx (hWinUAEKey, "PathMode", 0, REG_SZ, (CONST BYTE *)pathmode, strlen(pathmode) + 1); set_path ("KickstartPath", NULL); - if (path_type == 2005) - strcat (start_path_data, "WinUAE\\"); set_path ("ConfigurationPath", NULL); set_path ("ScreenshotPath", NULL); set_path ("StatefilePath", NULL); @@ -2941,10 +2932,6 @@ static INT_PTR CALLBACK PathsDlgProc (HWND hDlg, UINT msg, WPARAM wParam, LPARAM set_path ("VideoPath", NULL); values_to_pathsdialog (hDlg); FreeConfigStore (); - strcpy (start_path_data, p); - xfree (p); - af_path_2005 = pp1; - af_path_old = pp2; } break; case IDC_ROM_RESCAN: @@ -4161,6 +4148,8 @@ static void values_to_chipsetdlg2 (HWND hDlg) CheckDlgButton (hDlg, IDC_CS_DMAC, workprefs.cs_mbdmac == 1); CheckDlgButton (hDlg, IDC_CS_DMAC2, workprefs.cs_mbdmac == 2); CheckDlgButton (hDlg, IDC_CS_A2091, workprefs.cs_a2091 > 0); + CheckDlgButton (hDlg, IDC_CS_A4091, workprefs.cs_a4091 > 0); + CheckDlgButton (hDlg, IDC_CS_PCMCIA, workprefs.cs_pcmcia > 0); CheckDlgButton (hDlg, IDC_CS_IDE1, workprefs.cs_ide > 0 && (workprefs.cs_ide & 1)); CheckDlgButton (hDlg, IDC_CS_IDE2, workprefs.cs_ide > 0 && (workprefs.cs_ide & 2)); txt[0] = 0; @@ -4225,6 +4214,8 @@ static void values_from_chipsetdlg2 (HWND hDlg, UINT msg, WPARAM wParam, LPARAM if (workprefs.cs_mbdmac == 0) workprefs.cs_mbdmac = IsDlgButtonChecked (hDlg, IDC_CS_DMAC2) ? 2 : 0; workprefs.cs_a2091 = IsDlgButtonChecked (hDlg, IDC_CS_A2091) ? 1 : 0; + workprefs.cs_a4091 = IsDlgButtonChecked (hDlg, IDC_CS_A4091) ? 1 : 0; + workprefs.cs_pcmcia = IsDlgButtonChecked (hDlg, IDC_CS_PCMCIA) ? 1 : 0; workprefs.cs_ide = IsDlgButtonChecked (hDlg, IDC_CS_IDE1) ? 1 : (IsDlgButtonChecked (hDlg, IDC_CS_IDE2) ? 2 : 0); workprefs.cs_ciaatod = IsDlgButtonChecked (hDlg, IDC_CS_CIAA_TOD1) ? 0 : (IsDlgButtonChecked (hDlg, IDC_CS_CIAA_TOD2) ? 1 : 2); @@ -4283,9 +4274,9 @@ static void enable_for_chipsetdlg2 (HWND hDlg) ew (hDlg, IDC_CS_IDE2, e); ew (hDlg, IDC_CS_DMAC, e); ew (hDlg, IDC_CS_DMAC2, e); -#if WINUAEBETA > 0 ew (hDlg, IDC_CS_A2091, e); -#endif + ew (hDlg, IDC_CS_A4091, e); + ew (hDlg, IDC_CS_PCMCIA, e); ew (hDlg, IDC_CS_CD32CD, e); ew (hDlg, IDC_CS_CD32NVRAM, e); ew (hDlg, IDC_CS_CD32C2P, e); @@ -4581,6 +4572,8 @@ static void getromfile (HWND hDlg, DWORD d, char *path, int size) } } +#define CART_SUPERIV "[Action Cartridge Super IV Professional]" + static void values_from_kickstartdlg (HWND hDlg) { getromfile (hDlg, IDC_ROMFILE, workprefs.romfile, sizeof (workprefs.romfile)); @@ -4588,8 +4581,11 @@ static void values_from_kickstartdlg (HWND hDlg) getromfile (hDlg, IDC_CARTFILE, workprefs.cartfile, sizeof (workprefs.cartfile)); if (workprefs.cartfile[0]) workprefs.cart_internal = 0; + if (!strcmp(workprefs.cartfile, CART_SUPERIV)) { + workprefs.cart_internal = 2; + } ew (hDlg, IDC_HRTMON, workprefs.cartfile[0] ? FALSE : TRUE); - CheckDlgButton(hDlg, IDC_HRTMON, workprefs.cart_internal ? TRUE : FALSE); + CheckDlgButton(hDlg, IDC_HRTMON, workprefs.cart_internal == 1 ? TRUE : FALSE); } static void values_to_kickstartdlg (HWND hDlg) @@ -4603,6 +4599,7 @@ static void values_to_kickstartdlg (HWND hDlg) addromfiles (fkey, hDlg, IDC_ROMFILE, workprefs.romfile, ROMTYPE_KICK | ROMTYPE_KICKCD32); addromfiles (fkey, hDlg, IDC_ROMFILE2, workprefs.romextfile, ROMTYPE_EXTCD32 | ROMTYPE_EXTCDTV | ROMTYPE_ARCADIABIOS); addromfiles (fkey, hDlg, IDC_CARTFILE, workprefs.cartfile, ROMTYPE_AR | ROMTYPE_ARCADIAGAME); + //SendDlgItemMessage(hDlg, IDC_CARTFILE, CB_ADDSTRING, 0, (LPARAM)CART_SUPERIV); if (fkey) RegCloseKey (fkey); } @@ -4610,7 +4607,7 @@ static void values_to_kickstartdlg (HWND hDlg) SetDlgItemText(hDlg, IDC_FLASHFILE, workprefs.flashfile); CheckDlgButton(hDlg, IDC_KICKSHIFTER, workprefs.kickshifter); CheckDlgButton(hDlg, IDC_MAPROM, workprefs.maprom); - CheckDlgButton(hDlg, IDC_HRTMON, workprefs.cart_internal); + CheckDlgButton(hDlg, IDC_HRTMON, workprefs.cart_internal == 1); } static void init_kickstart (HWND hDlg) @@ -4705,7 +4702,7 @@ static INT_PTR CALLBACK KickstartDlgProc (HWND hDlg, UINT msg, WPARAM wParam, LP case IDC_HRTMON: workprefs.cart_internal = IsDlgButtonChecked(hDlg, IDC_HRTMON) ? 1 : 0; - ew (hDlg, IDC_CARTFILE, workprefs.cart_internal ? FALSE : TRUE); + ew (hDlg, IDC_CARTFILE, workprefs.cart_internal == 1 ? FALSE : TRUE); break; } diff --git a/od-win32/winuae_msvc/winuae_msvc.8.vcproj b/od-win32/winuae_msvc/winuae_msvc.8.vcproj new file mode 100755 index 00000000..5f038081 --- /dev/null +++ b/od-win32/winuae_msvc/winuae_msvc.8.vcproj @@ -0,0 +1,2407 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/od-win32/winuae_msvc/winuae_msvc.vcproj b/od-win32/winuae_msvc/winuae_msvc.vcproj index 4bf2a969..4506c65f 100755 --- a/od-win32/winuae_msvc/winuae_msvc.vcproj +++ b/od-win32/winuae_msvc/winuae_msvc.vcproj @@ -316,7 +316,8 @@ EnableCOMDATFolding="2" OptimizeForWindows98="0" LinkTimeCodeGeneration="0" - RandomizedBaseAddress="2" + RandomizedBaseAddress="1" + FixedBaseAddress="1" DataExecutionPrevention="2" TargetMachine="1" /> @@ -2385,6 +2386,10 @@ RelativePath="..\resources\drive_startup.wav" > + + diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt index 0c48f196..9b995bac 100755 --- a/od-win32/winuaechangelog.txt +++ b/od-win32/winuaechangelog.txt @@ -1,4 +1,14 @@ +Beta 1: + +- added PCMCIA to advanced chipset. It does not emulate PCMCIA (yet), + it only reserves address space and makes CIA bank 64k (0xbf only + instead of 0xa0 to 0xbf) Previously only AGA changed CIA bank size. +- fixed paths defaulting to CSIDL_COMMON_DOCUMENTS even if previous + default was something else. + +1.4.2 + Beta 12: - CDTV right button/second firebutton pin state fixed (CDPD IV)