From: Toni Wilen Date: Sun, 2 Sep 2012 13:49:13 +0000 (+0300) Subject: 2500b15 X-Git-Tag: 2500~16 X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=c2cb65a785661f4cd1787b7f97be34f32ed79dbc;p=francis%2Fwinuae.git 2500b15 --- diff --git a/blitter.cpp b/blitter.cpp index 02ebcf5c..71fe9efe 100644 --- a/blitter.cpp +++ b/blitter.cpp @@ -719,7 +719,7 @@ static void decide_blitter_line (int hsync, int hpos) if (c == 3) { blitter_read (); - alloc_cycle_blitter (last_blitter_hpos, &bltcpt); + alloc_cycle_blitter (last_blitter_hpos, &bltcpt, 3); record_dma_blit (0x70, blt_info.bltcdat, bltcpt, last_blitter_hpos); } else if (c == 5) { @@ -737,7 +737,7 @@ static void decide_blitter_line (int hsync, int hpos) /* onedot mode and no pixel = bus write access is skipped */ if (blitlinepixel) { blitter_write (); - alloc_cycle_blitter (last_blitter_hpos, &bltdpt); + alloc_cycle_blitter (last_blitter_hpos, &bltdpt, 4); record_dma_blit (0x00, blt_info.bltddat, bltdpt, last_blitter_hpos); blitlinepixel = 0; } @@ -892,7 +892,7 @@ STATIC_INLINE void blitter_doddma (int hpos) record_dma_blit (0x00, d, bltdpt, hpos); last_custom_value1 = d; chipmem_agnus_wput2 (bltdpt, d); - alloc_cycle_blitter (hpos, &bltdpt); + alloc_cycle_blitter (hpos, &bltdpt, 4); bltdpt += blit_add; blitter_hcounter2++; if (blitter_hcounter2 == blt_info.hblitsize) { @@ -919,7 +919,7 @@ STATIC_INLINE void blitter_dodma (int ch, int hpos) addr = bltapt; bltapt += blit_add; reg = 0x74; - alloc_cycle_blitter (hpos, &bltapt); + alloc_cycle_blitter (hpos, &bltapt, 1); break; case 2: blt_info.bltbdat = dat = chipmem_wget_indirect (bltbpt); @@ -932,7 +932,7 @@ STATIC_INLINE void blitter_dodma (int ch, int hpos) blt_info.bltbhold = (((uae_u32)prevb << 16) | blt_info.bltbdat) >> blt_info.blitbshift; prevb = blt_info.bltbdat; reg = 0x72; - alloc_cycle_blitter (hpos, &bltbpt); + alloc_cycle_blitter (hpos, &bltbpt, 2); break; case 3: blt_info.bltcdat = dat = chipmem_wget_indirect (bltcpt); @@ -940,7 +940,7 @@ STATIC_INLINE void blitter_dodma (int ch, int hpos) addr = bltcpt; bltcpt += blit_add; reg = 0x70; - alloc_cycle_blitter (hpos, &bltcpt); + alloc_cycle_blitter (hpos, &bltcpt, 3); break; default: abort (); diff --git a/custom.cpp b/custom.cpp index 12b0c116..52735ecf 100644 --- a/custom.cpp +++ b/custom.cpp @@ -156,7 +156,7 @@ static int lof_togglecnt_lace, lof_togglecnt_nlace, lof_previous, nlace_cnt; */ static int vpos_previous, hpos_previous; static int vpos_lpen, hpos_lpen, lightpen_triggered; -int lightpen_x, lightpen_y, lightpen_cx, lightpen_cy; +int lightpen_x = -1, lightpen_y = -1, lightpen_cx, lightpen_cy, lightpen_active; static uae_u32 sprtaba[256],sprtabb[256]; static uae_u32 sprite_ab_merge[256]; @@ -296,6 +296,7 @@ static unsigned int clxdat, clxcon, clxcon2, clxcon_bpl_enable, clxcon_bpl_match enum copper_states { COP_stop, + COP_waitforever, COP_read1, COP_read2, COP_bltwait, @@ -464,17 +465,17 @@ void alloc_cycle_ext (int hpos, int type) alloc_cycle (hpos, type); } -void alloc_cycle_blitter (int hpos, uaecptr *ptr) +void alloc_cycle_blitter (int hpos, uaecptr *ptr, int chnum) { if (cycle_line[hpos] & CYCLE_COPPER_SPECIAL) { static int warned = 100; uaecptr srcptr = cop_state.strobe == 1 ? cop1lc : cop2lc; if (warned > 0) { - write_log (_T("buggy copper cycle conflict with blitter %08x <- %08x\n"), *ptr, srcptr); + write_log (_T("buggy copper cycle conflict with blitter ch %c %08x <- %08x PC=%08x\n"), 'A' + (chnum - 1), *ptr, srcptr, m68k_getpc ()); warned--; } - if (currprefs.cpu_model == 68000) - *ptr = srcptr; +// if (currprefs.cpu_model == 68000) +// *ptr = srcptr; } alloc_cycle (hpos, CYCLE_BLITTER); } @@ -3543,7 +3544,7 @@ static void COPJMP (int num, int vblank) cop_state.ignore_next = 0; if (!oldstrobe) cop_state.state_prev = cop_state.state; - if ((cop_state.state == COP_wait || cop_state.state == COP_stop) && !vblank) { + if ((cop_state.state == COP_wait || cop_state.state == COP_waitforever) && !vblank) { cop_state.state = COP_strobe_delay1x; } else { cop_state.state = vblank ? COP_start_delay : (copper_access ? COP_strobe_delay1 : COP_strobe_extra); @@ -4719,13 +4720,13 @@ static void update_copper (int until_hpos) // Cycle can be free and copper won't allocate it. // If Blitter uses this cycle = Copper's address gets copied blitter DMA pointer.. cop_state.state = COP_strobe_delay2x; - cycle_line[old_hpos] |= CYCLE_COPPER_SPECIAL; break; case COP_strobe_delay2x: - // Second cycle fetches following word and tosses it away. Must be free cycle. + // Second cycle fetches following word and tosses it away. Must be free cycle + // but is not allocated, blitter or cpu can still use it. if (copper_cant_read (old_hpos, 1)) continue; - alloc_cycle (old_hpos, CYCLE_COPPER); + cycle_line[old_hpos] |= CYCLE_COPPER_SPECIAL; if (debug_dma) record_dma (0x1fe, chipmem_wget_indirect (cop_state.ip), cop_state.ip, old_hpos, vpos, DMARECORD_COPPER); cop_state.state = COP_read1; @@ -4865,7 +4866,7 @@ static void update_copper (int until_hpos) vp = vpos & (((cop_state.saved_i2 >> 8) & 0x7F) | 0x80); if (cop_state.saved_i1 == 0xFFFF && cop_state.saved_i2 == 0xFFFE) { - cop_state.state = COP_stop; + cop_state.state = COP_waitforever; copper_enabled_thisline = 0; unset_special (SPCFLAG_COPPER); goto out; @@ -4959,7 +4960,7 @@ static void compute_spcflag_copper (int hpos) copper_enabled_thisline = 0; unset_special (SPCFLAG_COPPER); - if (!dmaen (DMA_COPPER) || cop_state.state == COP_stop || cop_state.state == COP_bltwait || nocustom ()) + if (!dmaen (DMA_COPPER) || cop_state.state == COP_stop || cop_state.state == COP_waitforever || cop_state.state == COP_bltwait || nocustom ()) return; if (cop_state.state == COP_wait) { @@ -6572,7 +6573,7 @@ void custom_reset (int hardreset) write_log (_T("Reset at %08X\n"), M68K_GETPC); memory_map_dump (); - lightpen_x = lightpen_y = -1; + lightpen_active = -1; lightpen_triggered = 0; lightpen_cx = lightpen_cy = -1; if (!savestate_state) { diff --git a/drawing.cpp b/drawing.cpp index c06eaf13..fc46466b 100644 --- a/drawing.cpp +++ b/drawing.cpp @@ -2661,12 +2661,16 @@ static void lightpen_update (struct vidbuffer *vb) for (i = 0; i < LIGHTPEN_HEIGHT; i++) { int line = lightpen_y + i - LIGHTPEN_HEIGHT / 2; if (line >= 0 || line < max_ypos_thisframe) { - draw_lightpen_cursor(lightpen_x, i, line, lightpen_cx > 0); + if (lightpen_active > 0) + draw_lightpen_cursor (lightpen_x, i, line, lightpen_cx > 0); flush_line (vb, line); } } lightpen_y1 = lightpen_y - LIGHTPEN_HEIGHT / 2 - 1 + min_ypos_for_screen; lightpen_y2 = lightpen_y1 + LIGHTPEN_HEIGHT + 2; + + if (lightpen_active < 0) + lightpen_active = 0; } void finish_drawing_frame (void) @@ -2745,7 +2749,7 @@ void finish_drawing_frame (void) } } - if (lightpen_x > 0 || lightpen_y > 0) + if (lightpen_active) lightpen_update (vb); if (currprefs.monitoremu && gfxvidinfo.tempbuffer.bufmem_allocated) { diff --git a/fpp.cpp b/fpp.cpp index 6a66c9fe..cbf5c893 100644 --- a/fpp.cpp +++ b/fpp.cpp @@ -132,8 +132,11 @@ static __inline__ void native_set_fpucw (uae_u32 m68k_cw) if (m68k_cw & (0x1000)) ex |= _EM_OVERFLOW; #endif - - _control87(ex | fp87_round[(m68k_cw >> 4) & 3] | fp87_prec[(m68k_cw >> 6) & 3], _MCW_RC | _MCW_PC); +#ifdef WIN64 + _controlfp (ex | fp87_round[(m68k_cw >> 4) & 3], _MCW_RC); +#else + _control87 (ex | fp87_round[(m68k_cw >> 4) & 3] | fp87_prec[(m68k_cw >> 6) & 3], _MCW_RC | _MCW_PC); +#endif #else static uae_u16 x87_cw_tab[] = { 0x137f, 0x1f7f, 0x177f, 0x1b7f, /* Extended */ diff --git a/include/custom.h b/include/custom.h index 0fff0111..9c1b5203 100644 --- a/include/custom.h +++ b/include/custom.h @@ -207,7 +207,7 @@ STATIC_INLINE int GET_PLANES(uae_u16 bplcon0) extern void fpscounter_reset (void); extern unsigned long idletime; -extern int lightpen_x, lightpen_y, lightpen_cx, lightpen_cy; +extern int lightpen_x, lightpen_y, lightpen_cx, lightpen_cy, lightpen_active; struct customhack { uae_u16 v; @@ -216,7 +216,7 @@ struct customhack { void customhack_put (struct customhack *ch, uae_u16 v, int hpos); uae_u16 customhack_get (struct customhack *ch, int hpos); extern void alloc_cycle_ext (int, int); -extern void alloc_cycle_blitter (int hpos, uaecptr *ptr); +extern void alloc_cycle_blitter (int hpos, uaecptr *ptr, int); extern bool ispal (void); extern int current_maxvpos (void); extern struct chipset_refresh *get_chipset_refresh (void); diff --git a/inputdevice.cpp b/inputdevice.cpp index ac079510..47ea5e26 100644 --- a/inputdevice.cpp +++ b/inputdevice.cpp @@ -226,6 +226,7 @@ static uae_u8 pot_dat[NORMAL_JPORTS][2]; static int pot_dat_act[NORMAL_JPORTS][2]; static int analog_port[NORMAL_JPORTS][2]; static int digital_port[NORMAL_JPORTS][2]; +static int lightpen; #define POTDAT_DELAY_PAL 8 #define POTDAT_DELAY_NTSC 7 @@ -1223,10 +1224,12 @@ int input_mousehack_status (int mode, uaecptr diminfo, uaecptr dispinfo, uaecptr mousehack_address = m68k_dreg (regs, 0); mousehack_enable (); } else if (mode == 0) { - uae_u8 v = get_byte (mousehack_address + MH_E); - v |= 0x40; - put_byte (mousehack_address + MH_E, v); - write_log (_T("Tablet driver running (%08x,%02x)\n"), mousehack_address, v); + if (mousehack_address) { + uae_u8 v = get_byte (mousehack_address + MH_E); + v |= 0x40; + put_byte (mousehack_address + MH_E, v); + write_log (_T("Tablet driver running (%08x,%02x)\n"), mousehack_address, v); + } } else if (mode == 1) { int x1 = -1, y1 = -1, x2 = -1, y2 = -1; uae_u32 props = 0; @@ -1280,7 +1283,7 @@ void inputdevice_tablet (int x, int y, int z, int pressure, uae_u32 buttonbits, uae_u8 tmp[MH_END]; mousehack_enable (); - if (inputdevice_is_tablet () <= 0) + if (inputdevice_is_tablet () <= 0 || !mousehack_address) return; //write_log (_T("%d %d %d %d %08X %d %d %d %d\n"), x, y, z, pressure, buttonbits, inproximity, ax, ay, az); p = get_real_address (mousehack_address); @@ -1370,7 +1373,7 @@ void inputdevice_tablet_info (int maxx, int maxy, int maxz, int maxax, int maxay { uae_u8 *p; - if (!uae_boot_rom) + if (!uae_boot_rom || !mousehack_address) return; p = get_real_address (mousehack_address); @@ -2236,6 +2239,7 @@ static int handle_custom_event (const TCHAR *custom) if (custom == NULL) return 0; + config_changed = 1; write_log (_T("%s\n"), custom); p = buf = my_strdup (custom); while (p && *p) { @@ -2253,11 +2257,16 @@ static int handle_custom_event (const TCHAR *custom) nextp++; } //write_log (L"-> '%s'\n", p); - cfgfile_parse_line (&changed_prefs, p, 0); + if (!_tcsicmp (p, _T("no_config_check"))) { + config_changed = 0; + } else if (!_tcsicmp (p, _T("do_config_check"))) { + config_changed = 1; + } else { + cfgfile_parse_line (&changed_prefs, p, 0); + } p = nextp; } xfree (buf); - config_changed = 1; return 0; } @@ -2844,10 +2853,11 @@ static int handle_input_event (int nr, int state, int max, int autofire, bool ca { case 5: /* lightpen/gun */ { - if (lightpen_x < 0 && lightpen_y < 0) { + if (!lightpen_active) { lightpen_x = gfxvidinfo.outbuffer->outwidth / 2; lightpen_y = gfxvidinfo.outbuffer->outheight / 2; } + lightpen_active = true; if (ie->type == 0) { int delta = 0; if (max == 0) @@ -3716,6 +3726,15 @@ static int isdigitalbutton (int ei) return 0; } +static int islightpen (int ei) +{ + if (ei >= INPUTEVENT_LIGHTPEN_FIRST && ei < INPUTEVENT_LIGHTPEN_LAST) { + lightpen = 1; + return 1; + } + return 0; +} + static void isqualifier (int ei) { } @@ -3739,6 +3758,9 @@ static void scanevents (struct uae_prefs *p) joydirpot[i][j] = 128 / (312 * 100 / currprefs.input_analog_joystick_mult) + (128 * currprefs.input_analog_joystick_mult / 100) + currprefs.input_analog_joystick_offset; } } + lightpen = 0; + if (lightpen_active > 0) + lightpen_active = -1; for (i = 0; i < MAX_INPUT_DEVICES; i++) { use_joysticks[i] = 0; @@ -3754,6 +3776,7 @@ static void scanevents (struct uae_prefs *p) ismouse (ei); isdigitalbutton (ei); isqualifier (ei); + islightpen (ei); if (joysticks[i].eventid[ID_BUTTON_OFFSET + j][k] > 0) use_joysticks[i] = 1; } @@ -3765,6 +3788,7 @@ static void scanevents (struct uae_prefs *p) ismouse (ei); isdigitalbutton (ei); isqualifier (ei); + islightpen (ei); if (mice[i].eventid[ID_BUTTON_OFFSET + j][k] > 0) use_mice[i] = 1; } @@ -3781,6 +3805,7 @@ static void scanevents (struct uae_prefs *p) isanalog (ei); isdigitalbutton (ei); isqualifier (ei); + islightpen (ei); if (ei > 0) use_joysticks[i] = 1; } @@ -3792,6 +3817,7 @@ static void scanevents (struct uae_prefs *p) isanalog (ei); isdigitalbutton (ei); isqualifier (ei); + islightpen (ei); if (ei > 0) use_mice[i] = 1; } @@ -3812,6 +3838,7 @@ static void scanevents (struct uae_prefs *p) ismouse (ei); isdigitalbutton (ei); isqualifier (ei); + islightpen (ei); if (ei > 0) scancodeused[i][keyboards[i].extra[j]] = ei; } @@ -5459,13 +5486,12 @@ static int put_event_data (const struct inputdevice_functions *id, int devnum, i if ((flags & (mask1 | mask2)) == (mask1 | mask2)) flags &= ~mask2; } - if (custom && custom[0] == 0) { + if (custom && custom[0] == 0) custom = NULL; + if (custom) eventid = 0; - } - if (eventid <= 0 && !custom) { + if (eventid <= 0 && !custom) flags = 0; - } ret = -1; if (type == IDEV_WIDGET_BUTTON || type == IDEV_WIDGET_BUTTONAXIS) { diff --git a/inputevents.def b/inputevents.def index eee649d4..79c4e8ba 100644 --- a/inputevents.def +++ b/inputevents.def @@ -94,6 +94,8 @@ DEFEVENT(JOY2_CD32_YELLOW,_T("Joy2 CD32 Yellow"),AM_K,4,2,JOYBUTTON_CD32_YELLOW) DEFEVENT(JOY2_CD32_RED,_T("Joy2 CD32 Red"),AM_K,4,2,JOYBUTTON_CD32_RED) DEFEVENT(JOY2_CD32_BLUE,_T("Joy2 CD32 Blue"),AM_K,4,2,JOYBUTTON_CD32_BLUE) +DEFEVENT(LIGHTPEN_FIRST, _T(""), AM_DUMMY, 0,0,0) + DEFEVENT(LIGHTPEN_HORIZ,_T("Lightpen Horizontal"),AM_MOUSE_AXIS|AM_JOY_AXIS,0,5,0) DEFEVENT(LIGHTPEN_VERT,_T("Lightpen Vertical"),AM_MOUSE_AXIS|AM_JOY_AXIS,0,5,1) DEFEVENT(LIGHTPEN_LEFT,_T("Lightpen Left"),AM_K,1,5,DIR_LEFT) @@ -101,6 +103,8 @@ DEFEVENT(LIGHTPEN_RIGHT,_T("Lightpen Right"),AM_K,1,5,DIR_RIGHT) DEFEVENT(LIGHTPEN_UP,_T("Lightpen Up"),AM_K,1,5,DIR_UP) DEFEVENT(LIGHTPEN_DOWN,_T("Lightpen Down"),AM_K,1,5,DIR_DOWN) +DEFEVENT(LIGHTPEN_LAST, _T(""), AM_DUMMY, 0,0,0) + /* parallel port joystick adapter */ DEFEVENT(PAR_JOY1_START, _T("[Parallel port joystick adapter]"), AM_INFO, 0,3,0) diff --git a/od-win32/avioutput.cpp b/od-win32/avioutput.cpp index 92c12835..d7dde9be 100644 --- a/od-win32/avioutput.cpp +++ b/od-win32/avioutput.cpp @@ -21,7 +21,7 @@ Copyright(c) 2001 - 2002; #include "sysconfig.h" #include "sysdeps.h" -#include "resource" +#include "resource.h" #include "options.h" #include "audio.h" diff --git a/od-win32/bsdsock.cpp b/od-win32/bsdsock.cpp index 1e4ac3c6..17264948 100644 --- a/od-win32/bsdsock.cpp +++ b/od-win32/bsdsock.cpp @@ -17,7 +17,7 @@ #if defined(BSDSOCKET) -#include "resource" +#include "resource.h" #include #include diff --git a/od-win32/debug_win32.cpp b/od-win32/debug_win32.cpp index 5624b8fb..e4a42942 100644 --- a/od-win32/debug_win32.cpp +++ b/od-win32/debug_win32.cpp @@ -15,7 +15,7 @@ #include #include -#include "resource" +#include "resource.h" #include "options.h" #include "memory.h" diff --git a/od-win32/direct3d.cpp b/od-win32/direct3d.cpp index bd23aaf3..a9eda5fa 100644 --- a/od-win32/direct3d.cpp +++ b/od-win32/direct3d.cpp @@ -1,6 +1,6 @@ #include -#include +#include "resource.h" #include "sysconfig.h" #include "sysdeps.h" diff --git a/od-win32/hardfile_win32.cpp b/od-win32/hardfile_win32.cpp index 1f7ce563..25c68237 100644 --- a/od-win32/hardfile_win32.cpp +++ b/od-win32/hardfile_win32.cpp @@ -6,7 +6,7 @@ #include -#include "resource" +#include "resource.h" #include "threaddep/thread.h" #include "options.h" diff --git a/od-win32/lcd.cpp b/od-win32/lcd.cpp index 9ed112e5..379bb211 100644 --- a/od-win32/lcd.cpp +++ b/od-win32/lcd.cpp @@ -4,7 +4,7 @@ #if defined(LOGITECHLCD) -#include "resource" +#include "resource.h" #include "gui.h" #include "lcd.h" diff --git a/od-win32/lib/prowizard_x64.lib b/od-win32/lib/prowizard_x64.lib index 6f3aeaed..b9716ade 100644 Binary files a/od-win32/lib/prowizard_x64.lib and b/od-win32/lib/prowizard_x64.lib differ diff --git a/od-win32/midi.cpp b/od-win32/midi.cpp index 0b7cd4b6..2416af63 100644 --- a/od-win32/midi.cpp +++ b/od-win32/midi.cpp @@ -29,7 +29,7 @@ #include "sysdeps.h" -#include "resource" +#include "resource.h" #include "options.h" #include "parser.h" diff --git a/od-win32/mman.cpp b/od-win32/mman.cpp index bfd34ba8..a1f22f03 100644 --- a/od-win32/mman.cpp +++ b/od-win32/mman.cpp @@ -136,8 +136,13 @@ bool preinit_shm (void) GetSystemInfo (&si); max_allowed_mman = 512; - if (os_64bit) + if (os_64bit) { +#ifdef WIN64 + max_allowed_mman = 3072; +#else max_allowed_mman = 2048; +#endif + } memstats.dwLength = sizeof(memstats); GlobalMemoryStatus(&memstats); @@ -168,19 +173,33 @@ bool preinit_shm (void) if (max_allowed_mman * 1024 * 1024 > size64) max_allowed_mman = size64 / (1024 * 1024); - natmem_size = max_allowed_mman * 1024 * 1024; + natmem_size = (max_allowed_mman + 1) * 1024 * 1024; if (natmem_size < 256 * 1024 * 1024) natmem_size = 256 * 1024 * 1024; write_log (_T("Total physical RAM %lluM. Attempting to reserve: %uM.\n"), totalphys64 >> 20, natmem_size >> 20); - for (;;) { - natmem_offset = (uae_u8*)VirtualAlloc (NULL, natmem_size, MEM_RESERVE | (VAMODE == 1 ? MEM_WRITE_WATCH : 0), PAGE_READWRITE); - if (natmem_offset) - break; - natmem_size -= 128 * 1024 * 1024; - if (!natmem_size) { - write_log (_T("Can't allocate 256M of virtual address space!?\n")); - return false; + natmem_offset = 0; + if (natmem_size <= 640 * 1024 * 1024) { + uae_u32 p = 0x78000000 - natmem_size; + for (;;) { + natmem_offset = (uae_u8*)VirtualAlloc ((void*)p, natmem_size, MEM_RESERVE | (VAMODE == 1 ? MEM_WRITE_WATCH : 0), PAGE_READWRITE); + if (natmem_offset) + break; + p -= 256 * 1024 * 1024; + if (p <= 256 * 1024 * 1024) + break; + } + } + if (!natmem_offset) { + for (;;) { + natmem_offset = (uae_u8*)VirtualAlloc (NULL, natmem_size, MEM_RESERVE | (VAMODE == 1 ? MEM_WRITE_WATCH : 0), PAGE_READWRITE); + if (natmem_offset) + break; + natmem_size -= 128 * 1024 * 1024; + if (!natmem_size) { + write_log (_T("Can't allocate 256M of virtual address space!?\n")); + return false; + } } } max_z3fastmem = natmem_size; @@ -830,6 +849,8 @@ void protect_roms (bool protect) shm = &shmids[i]; if (shm->mode != PAGE_READONLY) continue; + if (!shm->attached || !shm->rosize) + continue; if (!VirtualProtect (shm->attached, shm->rosize, protect ? PAGE_READONLY : PAGE_READWRITE, &old)) { write_log (_T("VP %08X - %08X %x (%dk) failed %d\n"), (uae_u8*)shm->attached - natmem_offset, (uae_u8*)shm->attached - natmem_offset + shm->size, diff --git a/od-win32/picasso96_win.cpp b/od-win32/picasso96_win.cpp index 823ce78d..e1c35053 100644 --- a/od-win32/picasso96_win.cpp +++ b/od-win32/picasso96_win.cpp @@ -167,7 +167,7 @@ typedef enum { } BLIT_OPCODE; #include "win32gui.h" -#include "resource" +#include "resource.h" #define UAE_RTG_LIBRARY_VERSION 40 #define UAE_RTG_LIBRARY_REVISION 3994 diff --git a/od-win32/prowizard/prowizard.vcxproj b/od-win32/prowizard/prowizard.vcxproj index bf0d6413..ab07c50d 100644 --- a/od-win32/prowizard/prowizard.vcxproj +++ b/od-win32/prowizard/prowizard.vcxproj @@ -142,7 +142,7 @@ false ..\..\prowizard\include;..\..\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - MultiThreaded + MultiThreadedDLL false true diff --git a/od-win32/resources/resource.h b/od-win32/resources/resource.h new file mode 100644 index 00000000..bbb7dad7 --- /dev/null +++ b/od-win32/resources/resource.h @@ -0,0 +1,1153 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Visual C++ generated include file. +// Used by winuae.rc +// +#define IDS_KICKSTART 1 +#define IDS_DISK 2 +#define IDS_DISPLAY 3 +#define IDC_HARDDRIVE_IMAGE 3 +#define IDC_LISTDIALOG_CLEAR 3 +#define IDS_HARDDISK 4 +#define IDS_FLOPPY 5 +#define IDS_ABOUT 6 +#define IDS_LOADSAVE 7 +#define IDS_AVIOUTPUT 8 +#define IDS_IOPORTS 9 +#define IDS_MISC1 10 +#define IDS_MEMORY 11 +#define IDS_CPU 12 +#define IDS_CHIPSET 13 +#define IDS_INPUT 14 +#define IDS_OPENGL 15 +#define IDS_FILTER 15 +#define IDS_MISC2 16 +#define IDS_PATHS 17 +#define IDS_QUICKSTART 18 +#define IDS_FRONTEND 19 +#define IDS_CHIPSET2 20 +#define IDS_GAMEPORTS 21 +#define IDS_EXPANSION 22 +#define IDS_EXTTEXT 100 +#define IDS_EXTACTUAL 101 +#define IDS_SOUND 102 +#define IDS_CDROM 103 +#define IDS_FRAMERATE 104 +#define IDS_SECOND 105 +#define IDS_THIRD 106 +#define IDD_KICKSTART 107 +#define IDS_FOURTH 107 +#define IDD_DISPLAY 108 +#define IDS_FIFTH 108 +#define IDD_MEMORY 109 +#define IDS_SIXTH 109 +#define IDD_FLOPPY 110 +#define IDS_SEVENTH 110 +#define IDD_CPU 111 +#define IDS_EIGHTH 111 +#define IDD_ABOUT 112 +#define IDS_NINTH 112 +#define IDD_HARDDISK 113 +#define IDS_TENTH 113 +#define IDS_SELECTADF 114 +#define IDS_ADF 115 +#define IDS_CHOOSEBLANK 116 +#define IDS_SELECTHDF 117 +#define IDS_HDF 118 +#define IDS_SELECTUAE 119 +#define IDS_UAE 120 +#define IDS_SELECTROM 121 +#define IDD_SOUND 122 +#define IDS_ROM 122 +#define IDI_APPICON 123 +#define IDS_SELECTKEY 123 +#define IDI_CPU 124 +#define IDS_KEY 124 +#define IDI_ABOUT 125 +#define IDS_SELECTINFO 125 +#define IDS_NONE 126 +#define IDS_VOLUME 127 +#define IDI_HARDDISK 128 +#define IDS_PATH 128 +#define IDS_RW 129 +#define IDI_SOUND 130 +#define IDS_SECTORS 130 +#define IDS_SURFACES 131 +#define IDS_RESERVED 132 +#define IDS_BLOCKSIZE 133 +#define IDI_FLOPPY 134 +#define IDS_NAME 134 +#define IDD_LOADSAVE 135 +#define IDS_DESCRIPTION 135 +#define IDS_ONEINSTANCE 136 +#define IDI_IOPORTS 137 +#define IDS_INSTALLDIRECTX 137 +#define IDD_IOPORTS 138 +#define IDS_REGKEYCREATEFAILED 138 +#define IDS_COULDNOTLOADCONFIG 139 +#define IDD_CONTRIBUTORS 140 +#define IDS_NOHELP 140 +#define IDD_MISC1 141 +#define IDS_MUSTSELECTCONFIG 141 +#define IDD_HARDFILE 142 +#define IDS_NOAGA 142 +#define IDD_FILESYS 143 +#define IDS_INVALIDCOMPORT 143 +#define IDS_WSOCK2NEEDED 144 +#define IDD_MISC2 144 +#define IDS_UNSUPPORTEDPIXELFORMAT 145 +#define IDS_WAVEOUTOPENFAILURE 146 +#define IDS_MUSTENTERNAME 147 +#define IDS_MUSTSELECTCONFIGFORDELETE 148 +#define IDS_DELETECONFIGCONFIRMATION 149 +#define IDI_MISC1 150 +#define IDS_DELETECONFIGTITLE 150 +#define IDC_MYHAND 151 +#define IDS_GFXCARDCHECK 151 +#define IDS_GFXCARDTITLE 152 +#define IDD_DEBUGGER 152 +#define IDD_SETINFO 153 +#define IDS_MUSTSELECTPATH 153 +#define IDI_ICON1 153 +#define IDS_SETTINGSERROR 154 +#define IDD_CHIPSET 154 +#define IDS_MUSTSELECTNAME 155 +#define IDI_MOVE_UP 155 +#define IDD_CHIPSET2 155 +#define IDS_MUSTSELECTFILE 156 +#define IDI_MOVE_DOWN 156 +#define IDS_FAILEDHARDFILECREATION 157 +#define IDD_AVIOUTPUT 157 +#define IDS_CREATIONERROR 158 +#define IDI_AVIOUTPUT 158 +#define IDS_ERRORTITLE 159 +#define IDS_SELECTFILESYSROOT 160 +#define IDD_OPENGL 160 +#define IDD_FILTER 160 +#define IDS_DEFAULTMIDIOUT 161 +#define IDS_DEFAULTMIDIIN 162 +#define IDS_CONTRIBUTORS1 163 +#define IDD_HARDDRIVE 163 +#define IDS_CONTRIBUTORS2 164 +#define IDS_INVALIDPRTPORT 165 +#define IDS_SELECTUSS 166 +#define IDS_RESTOREUSS 166 +#define IDS_USS 167 +#define IDS_WRONGOSVERSION 168 +#define IDR_DRIVE_STARTUP_A500_1 168 +#define IDS_SELECTFLASH 169 +#define IDR_DRIVE_CLICK_A500_1 169 +#define IDS_FLASH 170 +#define IDR_DRIVE_SPIN_A500_1 170 +#define IDD_INPUT 171 +#define IDS_INPUTHOSTWIDGET 171 +#define IDI_INPUT 172 +#define IDS_INPUTAMIGAEVENT 172 +#define IDD_DISK 172 +#define IDS_INPUTAUTOFIRE 173 +#define IDS_SAVEUSS 174 +#define IDS_MIDIOVERFLOW 175 +#define IDS_HFDSIZE 176 +#define IDS_DEVICE 177 +#define IDS_BOOTPRI 178 +#define IDS_WRONGDXVERSION 179 +#define IDI_MISC2 180 +#define IDS_FLOPPY_COMPATIBLE 180 +#define IDR_DRIVE_SNATCH_A500_1 181 +#define IDS_FLOPPY_TURBO 181 +#define IDI_DISK 182 +#define IDR_DRIVE_SPINND_A500_1 182 +#define IDS_YES 182 +#define IDD_PANEL 183 +#define IDS_NO 183 +#define IDD_PATHS 184 +#define IDS_PRI_ABOVENORMAL 184 +#define IDI_CONFIGFILE 185 +#define IDD_QUICKSTART 185 +#define IDS_PRI_NORMAL 185 +#define IDM_SYSTRAY 186 +#define IDS_PRI_BELOWNORMAL 186 +#define IDS_PRI_LOW 187 +#define IDI_FOLDER 188 +#define IDS_OLDRTGLIBRARY 188 +#define IDI_DISPLAY 190 +#define IDS_DEFAULT_AF 190 +#define IDS_DEFAULT_WINUAE 191 +#define IDI_ROOT 192 +#define IDS_INP 192 +#define IDS_RESTOREINP 193 +#define IDI_MEMORY 194 +#define IDS_SAVEINP 194 +#define IDS_SCREEN_WINDOWED 195 +#define IDS_SCREEN_FULLSCREEN 196 +#define IDS_SCREEN_FULLWINDOW 197 +#define IDS_SCREEN_VSYNC 198 +#define IDS_SCREEN_VSYNC_AUTOSWITCH 199 +#define IDS_SOUND_MONO 200 +#define IDS_SOUND_MIXED 201 +#define IDI_QUICKSTART 201 +#define IDS_SOUND_STEREO 202 +#define IDS_SOUND_INTERPOL_DISABLED 203 +#define IDS_DISABLED 203 +#define IDS_SOUND_INTERPOL_RH 204 +#define IDI_PATHS 204 +#define IDS_SOUND_INTERPOL_CRUX 205 +#define IDS_SOUND_FILTER_OFF 206 +#define IDS_SOUND_FILTER_EMULATED 207 +#define IDS_SOUND_FILTER_EMULATED_E 208 +#define IDS_INPUT_COMPATIBILITY 209 +#define IDS_INPUT_GAMEPORTS 209 +#define IDS_INPUT_CUSTOM 210 +#define IDS_INPUT_COPY_DEFAULT 211 +#define IDS_INPUT_COPY_CUSTOM 212 +#define IDS_3D_NO_FILTER 213 +#define IDS_3D_BILINEAR 214 +#define IDS_VSYNC_DEFAULT 215 +#define IDS_DRIVESOUND_NONE 216 +#define IDS_DRIVESOUND_DEFAULT_A500 217 +#define IDS_AVIOUTPUT_NOCODEC 218 +#define IDS_DISK_IMAGENAME 219 +#define IDS_DISK_DRIVENAME 220 +#define IDS_UNSUPPORTEDSCREENMODE 222 +#define IDS_UNSUPPORTEDSCREENMODE_1 223 +#define IDS_UNSUPPORTEDSCREENMODE_2 224 +#define IDS_UNSUPPORTEDSCREENMODE_3 225 +#define IDS_UNSUPPORTEDSCREENMODE_4 226 +#define IDS_FLOPPYTYPE35DD 227 +#define IDS_FLOPPYTYPE35HD 228 +#define IDS_FLOPPYTYPE525SD 229 +#define IDS_FLOPPYTYPEDISABLED 230 +#define IDS_STMENUNOFLOPPY 231 +#define IDS_TREEVIEW_HARDWARE 232 +#define IDS_TREEVIEW_HOST 233 +#define IDS_TREEVIEW_MISC 234 +#define IDS_TREEVIEW_SETTINGS 235 +#define IDS_WINUAETITLE_MMB 236 +#define IDS_WINUAETITLE_NORMAL 237 +#define IDS_STARTEMULATION 238 +#define IDS_TREEVIEW_ABOUT 239 +#define IDS_NOHARDDRIVES 240 +#define IDS_DEFAULT_HOST 241 +#define IDS_SOUND_4CHANNEL 242 +#define IDS_HF_FS_CUSTOM 243 +#define IDS_SELECTFS 244 +#define IDS_KEYJOY 245 +#define IDB_XARCADE 246 +#define IDS_STATEFILE_UNCOMPRESSED 246 +#define IDS_STATEFILE_RAMDUMP 247 +#define IDS_STATEFILE_WAVE 248 +#define IDD_FRONTEND 249 +#define IDS_SOUND_SWAP_PAULA 249 +#define IDS_SOUND_SWAP_AHI 250 +#define IDD_PROGRESSBAR 250 +#define IDS_SOUND_SWAP_BOTH 251 +#define IDD_STRINGBOX 251 +#define IDB_LCD160X43 252 +#define IDS_SOUND_FILTER_ON_AGA 252 +#define IDS_SOUND_FILTER_ON 253 +#define IDS_SOUND_FILTER_ON_A500 253 +#define IDS_DRIVESOUND_PC_FLOPPY 254 +#define IDS_FLOPPYTYPE35DDESCOM 255 +#define IDS_SOUND_STEREO2 256 +#define IDS_INPUT_CUSTOMEVENT 257 +#define IDS_DEFAULT_NEWWINUAE 258 +#define IDS_SOUND_CLONED51 259 +#define IDS_SOUND_51 260 +#define IDS_AUTOMATIC 261 +#define IDI_GAMEPORTS 262 +#define IDS_ALL 262 +#define IDD_GAMEPORTS 263 +#define IDS_INPUTTOGGLE 263 +#define IDS_NETDISCONNECTED 264 +#define IDS_QS_CD 265 +#define IDS_QS_CD_AUTO 266 +#define IDS_QS_CD_IMAGE 267 +#define IDS_REMAPTITLE 268 +#define IDS_FILTER_NOOVERLAYS 269 +#define IDS_STMENUNOCD 270 +#define IDS_ON 271 +#define IDS_INPUTQUALIFIER 272 +#define IDS_GENERIC 273 +#define IDS_AUTODETECT 274 +#define IDS_NUMSG_NEEDEXT2 300 +#define IDS_NUMSG_NOROMKEY 301 +#define IDS_NUMSG_KSROMCRCERROR 302 +#define IDS_NUMSG_KSROMREADERROR 303 +#define IDS_NUMSG_NOEXTROM 304 +#define IDS_NUMSG_MODRIP_NOTFOUND 305 +#define IDS_NUMSG_MODRIP_FINISHED 306 +#define IDS_NUMSG_MODRIP_SAVE 307 +#define IDS_NUMSG_KS68020 308 +#define IDS_NUMSG_ROMNEED 309 +#define IDS_NUMSG_NOZLIB 310 +#define IDS_NUMSG_STATEHD 311 +#define IDS_NUMSG_NOCAPS 312 +#define IDS_NUMSG_OLDCAPS 313 +#define IDS_IMGCHK_BOOTBLOCKCRCERROR 314 +#define IDS_IMGCHK_BOOTBLOCKNO 315 +#define IDS_IMGCHK_DAMAGED 316 +#define IDS_IMGCHK_KS2 317 +#define IDS_IMGCHK_KS3 318 +#define IDS_ROMSCANEND 319 +#define IDS_ROM_AVAILABLE 320 +#define IDS_ROM_UNAVAILABLE 321 +#define IDS_HARDDRIVESAFETYWARNING1 322 +#define IDS_NUMSG_KS68EC020 323 +#define IDS_ROMSCANNOROMS 324 +#define IDS_NUMSG_KICKREP 325 +#define IDS_NUMSG_KICKREPNO 326 +#define IDS_NUMSG_NOROM 327 +#define IDS_HDCLONE_OK 328 +#define IDS_HDCLONE_FAIL 329 +#define IDR_DBGACCEL 330 +#define IDS_NUMSG_KS68030 331 +#define IDS_NUMSG_EXPROMNEED 332 +#define IDS_HARDDRIVESAFETYWARNING2 333 +#define IDM_DBGCONTEXTMENU 334 +#define IDS_SB_FAVORITENAME 334 +#define IDD_DBGMEMINPUT 335 +#define IDS_SB_CUSTOMEVENT 335 +#define IDS_FLOPPYTYPE35DDPC 336 +#define IDS_FLOPPYTYPE35HDPC 337 +#define IDS_JOYMODE_DEFAULT 338 +#define IDS_JOYMODE_MOUSE 339 +#define IDS_JOYMODE_JOYSTICK 340 +#define IDS_JOYMODE_JOYSTICKANALOG 341 +#define IDS_JOYMODE_LIGHTPEN 342 +#define IDS_JOYMODE_MOUSE_CDTV 343 +#define IDS_JOYMODE_JOYSTICK_CD32 344 +#define IDS_TABLET_BOTH_CURSORS 345 +#define IDI_DISKIMAGE 345 +#define IDS_TABLET_NATIVE_CURSOR 346 +#define IDS_TABLET_HOST_CURSOR 347 +#define IDI_PORTS 347 +#define IDS_AUTOSCALE_DISABLED 348 +#define IDS_AUTOSCALE_SCALING 349 +#define IDI_FILE 349 +#define IDS_AUTOSCALE_RESIZE 350 +#define IDS_PRINTER_ASCII 351 +#define IDD_EXPANSION 351 +#define IDS_PRINTER_EPSON 352 +#define IDS_PRINTER_EPSON9 352 +#define IDS_PRINTER_POSTSCRIPT_DETECTION 353 +#define IDI_EXPANSION 353 +#define IDS_PRINTER_POSTSCRIPT_EMULATION 354 +#define IDD_INPUTMAP 354 +#define IDS_PRINTER_PASSTHROUGH 355 +#define IDD_INFOBOX 355 +#define IDS_RES_LORES 356 +#define IDS_RES_HIRES 357 +#define IDS_RES_SUPERHIRES 358 +#define IDS_PRINTER_EPSON48 359 +#define IDS_SELECTCD 360 +#define IDS_CD 361 +#define IDS_BUFFER_SINGLE 362 +#define IDS_BUFFER_DOUBLE 363 +#define IDS_BUFFER_TRIPLE 364 +#define IDS_AUTOSCALE_CENTER 365 +#define IDS_AUTOSCALE_MAX 366 +#define IDS_AUTOSCALE_TV 367 +#define IDS_JOYMODE_GAMEPAD 368 +#define IDS_AUTOSCALE_DEFAULT 369 +#define IDS_AUTOSCALE_MANUAL 370 +#define IDS_PORT_AUTOFIRE 371 +#define IDS_PORT_AUTOFIRE_TOGGLE 372 +#define IDS_PORT_AUTOFIRE_ALWAYS 373 +#define IDS_PORT_AUTOFIRE_NO 374 +#define IDS_AUTOSCALE_INTEGER 375 +#define IDS_SCREEN_VSYNC2_AUTOSWITCH 376 +#define IDS_SCREEN_VSYNC2 377 +#define IDS_SCREEN_VSYNC_NONE 378 +#define IDS_FILTEROVERLAYTYPE_MASKS 379 +#define IDS_FILTEROVERLAYTYPE_OVERLAYS 380 +#define IDS_AUTOSCALE_INTEGER_AUTOSCALE 381 +#define IDS_WSTYLE_BORDERLESS 382 +#define IDS_WSTYLE_MINIMAL 383 +#define IDS_WSTYLE_STANDARD 384 +#define IDS_WSTYLE_EXTENDED 385 +#define IDD_LIST 386 +#define IDS_MISCLISTITEMS1 386 +#define IDS_MISCLISTITEMS2 387 +#define IDS_MISCLISTITEMS3 388 +#define IDS_QS_MODELS 1000 +#define IDS_QS_MODEL_A500 1001 +#define IDS_QS_MODEL_A500P 1002 +#define IDS_QS_MODEL_A600 1003 +#define IDS_QS_MODEL_A1000 1004 +#define IDS_QS_MODEL_A1200 1005 +#define IDS_QS_MODEL_CD32 1006 +#define IDS_QS_MODEL_CDTV 1007 +#define IDS_QS_MODEL_UAE 1008 +#define IDS_QS_MODEL_ARCADIA 1009 +#define IDS_QS_MODEL_A3000 1010 +#define IDS_QS_MODEL_A4000 1011 +#define IDS_QS_MODEL_A4000T 1012 +#define IDC_RESOLUTION 1021 +#define IDC_SERIAL 1022 +#define IDC_REFRESHRATE 1022 +#define IDC_ILLEGAL 1023 +#define IDC_MIDILIST 1023 +#define IDC_MIDIOUTLIST 1023 +#define IDC_DA_MODE 1023 +#define IDC_MIDIINLIST 1024 +#define IDC_RESOLUTION2 1024 +#define IDC_DISPLAYSELECT 1024 +#define IDC_AUTOCONFIG 1025 +#define IDC_PRINTERLIST 1025 +#define IDC_RESOLUTIONDEPTH 1025 +#define IDC_CHIPMEM 1026 +#define IDC_CREATELOGFILE 1026 +#define IDC_PORT0_JOYS 1026 +#define IDC_SCREENMODE_NATIVE 1026 +#define IDC_PRINTERTYPELIST 1026 +#define IDC_FASTMEM 1027 +#define IDC_PORT1_JOYS 1027 +#define IDC_SCREENMODE_RTG 1027 +#define IDC_DONGLELIST 1027 +#define IDC_MBMEM1 1028 +#define IDC_PORT_TABLET_CURSOR 1028 +#define IDC_SAMPLERLIST 1028 +#define IDC_DISPLAY_BUFFERCNT 1028 +#define IDC_PORT0_JOYSMODE 1029 +#define IDC_SCREENMODE_NATIVE2 1029 +#define IDC_SLOWMEM 1030 +#define IDC_PORT1_JOYSMODE 1030 +#define IDC_SCREENMODE_RTG2 1030 +#define IDC_MBMEM2 1031 +#define IDC_PORT2_JOYS 1031 +#define IDC_PORT3_JOYS 1032 +#define IDC_PARALLEL 1033 +#define IDC_PORT0_AF 1033 +#define IDC_PORT1_AF 1034 +#define IDC_FOCUSMINIMIZE 1041 +#define IDC_FASTTEXT 1043 +#define IDC_FASTRAM 1044 +#define IDC_CHIPRAM 1045 +#define IDC_SLOWRAM 1046 +#define IDC_Z3TEXT 1047 +#define IDC_Z3FASTRAM 1048 +#define IDC_Z3FASTMEM 1049 +#define IDC_MBRAM1 1050 +#define IDC_MBRAM2 1051 +#define IDC_Z3CHIPMEM 1052 +#define IDC_Z3CHIPRAM 1053 +#define IDC_MAX32RAM 1054 +#define IDC_UAEHOME 1070 +#define IDC_PICASSOHOME 1071 +#define IDC_AMIGAHOME 1072 +#define IDC_WINUAEHOME 1073 +#define IDC_AIABHOME 1074 +#define IDC_CLOANTOHOME 1075 +#define IDC_THEROOTS 1076 +#define IDC_CAPS 1077 +#define IDC_ABIME 1078 +#define IDC_AMIGASYS 1079 +#define IDC_AMIKIT 1080 +#define IDC_RICHEDIT1 1091 +#define IDC_RICHEDIT2 1092 +#define IDC_CONTRIBUTORS 1124 +#define IDC_BLACKER_THAN_BLACK 1170 +#define IDC_BLITIMM 1174 +#define IDC_BLITWAIT 1175 +#define IDC_LORES 1176 +#define IDC_RATE2BOX 1177 +#define IDC_LORES_SMOOTHED 1179 +#define IDC_FLICKERFIXER 1180 +#define IDC_AUTORESOLUTION 1181 +#define IDC_RATE2ENABLE 1182 +#define IDC_FRAMERATE 1185 +#define IDC_XSIZE 1187 +#define IDC_YSIZE 1188 +#define IDC_INPUTAUTOFIRERATE 1188 +#define IDC_LM_NORMAL 1189 +#define IDC_INPUTSPEEDD 1189 +#define IDC_LM_DOUBLED 1190 +#define IDC_INPUTSPEEDA 1190 +#define IDC_GFXCARDTEXT 1191 +#define IDC_LM_SCANLINES 1191 +#define IDC_INPUTSPEEDM 1191 +#define IDC_P96RAM 1192 +#define IDC_P96MEM 1193 +#define IDC_DA_SLIDER 1193 +#define IDC_FRAMERATE2 1194 +#define IDC_RATE2TEXT 1195 +#define IDC_DA_TEXT 1196 +#define IDC_CPU0 1200 +#define IDC_CPU1 1201 +#define IDC_CPU2 1202 +#define IDC_CPU3 1203 +#define IDC_CPU4 1204 +#define IDC_CPU5 1205 +#define IDC_CS_HOST 1209 +#define IDC_CS_68000 1210 +#define IDC_CS_ADJUSTABLE 1211 +#define IDC_COMPATIBLE 1214 +#define IDC_TRUST0 1215 +#define IDC_TRUST1 1216 +#define IDC_CACHE 1218 +#define IDC_CYCLEEXACT 1219 +#define IDC_CPUIDLE 1220 +#define IDC_GENLOCK 1220 +#define IDC_COMPATIBLE_FPU 1221 +#define IDC_FASTERRTG 1221 +#define IDC_COMPATIBLE24 1222 +#define IDC_SPEED 1223 +#define IDC_FPU0 1224 +#define IDC_FPU1 1225 +#define IDC_FPU2 1226 +#define IDC_FPU3 1227 +#define IDC_SOUNDSETTINGS 1229 +#define IDC_8BIT 1230 +#define IDC_16BIT 1231 +#define IDC_11KHZ 1232 +#define IDC_22KHZ 1233 +#define IDC_44KHZ 1234 +#define IDC_48KHZ 1235 +#define IDC_SOUNDSIZE 1236 +#define IDC_FREQUENCY 1237 +#define IDC_SOUND0 1238 +#define IDC_SOUND1 1239 +#define IDC_SOUND2 1240 +#define IDC_SOUNDSTYLE 1242 +#define IDC_SOUNDSTYLE0 1243 +#define IDC_STEREO 1244 +#define IDC_SOUNDSTYLE1 1245 +#define IDC_SOUNDINTERPOLATION 1248 +#define IDC_INTERPOLATION0 1249 +#define IDC_INTERPOLATION1 1250 +#define IDC_INTERPOLATION2 1251 +#define IDC_STEREOMODE 1252 +#define IDC_SOUNDINTERPOLATION2 1252 +#define IDC_STEREOMODE0 1253 +#define IDC_STEREOMODE1 1254 +#define IDC_STEREOMODE2 1255 +#define IDC_SOUNDINTERPOLATION3 1256 +#define IDC_DF0TEXT 1270 +#define IDC_DF1TEXT 1271 +#define IDC_DF2TEXT 1272 +#define IDC_DF3TEXT 1273 +#define IDC_EJECT0 1274 +#define IDC_EJECT1 1275 +#define IDC_EJECT2 1276 +#define IDC_EJECT3 1277 +#define IDC_DF0 1278 +#define IDC_DF1 1279 +#define IDC_DF2 1280 +#define IDC_DF3 1281 +#define IDC_CREATE 1282 +#define IDC_CREATE_RAW 1283 +#define IDC_SNAPSHOTNAME 1284 +#define IDC_SNAPSHOT 1285 +#define IDC_SAVEIMAGE0 1285 +#define IDC_DOSAVESTATE 1286 +#define IDC_SAVEIMAGE1 1286 +#define IDC_DOLOADSTATE 1287 +#define IDC_SAVEIMAGE2 1287 +#define IDC_PROWIZARD 1288 +#define IDC_SAVEIMAGE3 1288 +#define IDC_GUI_FONT 1288 +#define IDC_GUI_DEFAULT 1289 +#define IDC_GUI_LISTFONT 1290 +#define IDC_PORT0_JOYSC 1302 +#define IDC_PORT0_KBDA 1303 +#define IDC_PORT0_KBDB 1304 +#define IDC_PORT0_KBDC 1305 +#define IDC_PORT0_KBDD 1306 +#define IDC_PORT0_KBDE 1307 +#define IDC_PORT1_JOYSC 1308 +#define IDC_PORT1_KBDA 1309 +#define IDC_PORT1_KBDB 1310 +#define IDC_PORT1_KBDC 1311 +#define IDC_PORT1_KBDD 1312 +#define IDC_PORT1_KBDE 1313 +#define IDC_MIDIFRAME 1314 +#define IDC_SERPARFRAME 1315 +#define IDC_SERIALFRAME 1316 +#define IDC_EDIT 1334 +#define IDC_REMOVE 1335 +#define IDC_VOLUMELIST 1336 +#define IDC_UP 1337 +#define IDC_DOWN 1338 +#define IDC_NEW_FS 1339 +#define IDC_NEW_HF 1340 +#define IDC_NEW_HD 1341 +#define IDC_PORT0 1342 +#define IDC_NEW_FSARCH 1342 +#define IDC_PORT1 1343 +#define IDC_PATH_NAME 1362 +#define IDC_SELECTOR 1363 +#define IDC_VOLUME_NAME 1364 +#define IDC_HARDFILE_DEVICE 1364 +#define IDC_SECTORS 1365 +#define IDC_VOLUME_DEVICE 1365 +#define IDC_HEADS 1366 +#define IDC_RESERVED 1367 +#define IDC_BLOCKSIZE 1368 +#define IDC_HARDFILE_BOOTPRI 1369 +#define IDC_SECTORS_TEXT 1370 +#define IDC_SURFACES_TEXT 1371 +#define IDC_RESERVED_TEXT 1372 +#define IDC_RESERVED_TEXT2 1373 +#define IDC_BLOCKSIZE_TEXT 1374 +#define ID_OK 1375 +#define IDC_HARDFILE_BOOTPRI_TEXT 1375 +#define IDC_PATH_FILESYS 1376 +#define IDC_HARDFILE_DIR_TEXT 1377 +#define IDC_HARDFILE_DEVICE_TEXT 1378 +#define IDC_HFRDB 1380 +#define IDC_RDB 1380 +#define IDC_HARDFILE_FILESYS_TEXT 1380 +#define IDC_FS_AUTOBOOT 1380 +#define IDC_FILESYS_SELECTOR 1381 +#define IDC_HDF_AUTOBOOT 1382 +#define IDC_HDF_DONOTMOUNT 1383 +#define IDC_ROMFILE 1390 +#define IDC_KEYFILE 1391 +#define IDC_KICKCHOOSER 1392 +#define IDC_KEYCHOOSER 1393 +#define IDC_ROMFILE2 1394 +#define IDC_ROMCHOOSER2 1395 +#define IDC_FLASHCHOOSER 1396 +#define IDC_FLASHFILE 1397 +#define IDC_CARTFILE 1398 +#define IDC_CARTCHOOSER 1399 +#define IDC_SAVE 1400 +#define IDC_LOAD 1401 +#define IDC_DELETE 1403 +#define IDC_CONFIGLIST 1404 +#define IDC_EDITNAME 1405 +#define IDC_EDITDESCRIPTION 1406 +#define IDC_QUICKSAVE 1408 +#define IDC_QUICKLOAD 1409 +#define IDC_EXIT 1410 +#define IDC_EDITPATH 1410 +#define IDC_HDF_RDB 1500 +#define IDC_HFSIZE 1501 +#define IDC_HF_SIZE 1501 +#define IDC_LINEMODE 1502 +#define IDC_CREATEHF 1502 +#define IDC_HF_CREATE 1502 +#define IDC_SOCKETS 1503 +#define IDC_HF_DOSTYPE 1503 +#define IDC_HDF_CONTROLLER 1504 +#define IDC_RESETAMIGA 1504 +#define IDC_QUITEMU 1505 +#define IDC_MAPDRIVES 1507 +#define IDC_CPUTEXT 1508 +#define IDC_MAPDRIVES_NET 1508 +#define IDC_RESTARTEMU 1508 +#define IDC_CACHETEXT 1509 +#define IDC_SWAP 1509 +#define IDC_MAPDRIVES_CD 1509 +#define IDC_SELECTRESTEXT 1510 +#define IDC_FLUSHPRINTER 1510 +#define IDC_MAPDRIVES_REMOVABLE 1510 +#define IDC_PORT0_TEST 1510 +#define IDC_SCREENRESTEXT 1511 +#define IDC_MAPDRIVES_AUTO 1511 +#define IDC_PORT0_TEST2 1511 +#define IDC_PORT1_TEST 1511 +#define IDC_WIDTHTEXT 1512 +#define IDC_WINDOWEDTEXT 1512 +#define IDC_PORT2_TEST 1512 +#define IDC_MAPDRIVES_LIMIT 1512 +#define IDC_HEIGHTTEXT 1513 +#define IDC_PORT3_TEST 1513 +#define IDC_SETTINGSTEXT 1514 +#define IDC_REFRESHTEXT 1515 +#define IDC_SETTINGSTEXT2 1515 +#define IDC_DISABLE1 1516 +#define IDC_DF1WP 1516 +#define IDC_QUICKSTART_COMPA 1516 +#define IDC_REFRESH2TEXT 1516 +#define IDC_DISABLE2 1517 +#define IDC_DF2WP 1517 +#define IDC_QUICKSTART_DF 1517 +#define IDC_DISABLE3 1518 +#define IDC_XCENTER 1518 +#define IDC_DF3WP 1518 +#define IDC_DF1WP2 1518 +#define IDC_QUICKSTART_HOST 1518 +#define IDC_YCENTER 1519 +#define IDC_DISABLE0 1519 +#define IDC_DF0WP 1519 +#define IDC_OCS 1520 +#define IDC_HDFLOPPY 1520 +#define IDC_SETTINGSTEXT3 1520 +#define IDC_ECS_AGNUS 1521 +#define IDC_ECS_DENISE 1522 +#define IDC_ECS 1523 +#define IDC_AGA 1524 +#define IDC_NTSC 1525 +#define IDC_NOSPEED 1527 +#define IDC_NOSOUND 1528 +#define IDC_INACTIVE_NOSOUND 1528 +#define IDC_MIDI 1529 +#define IDC_NOSPEEDPAUSE 1529 +#define IDC_INACTIVE_PAUSE 1529 +#define IDC_KICKSHIFTER 1530 +#define IDC_MIDI2 1530 +#define IDC_HIGHPRIORITY 1530 +#define IDC_MINIMIZED_NOSOUND 1530 +#define IDC_MINIMIZED_PAUSE 1531 +#define IDC_STATEREC_RECORD 1532 +#define IDC_KBLED_USB 1533 +#define IDC_ACTIVE_PAUSE 1534 +#define IDC_KBLED_USB2 1534 +#define IDC_ACTIVE_NOSOUND 1535 +#define IDC_STATECLEAR 1536 +#define IDC_SER_SHARED 1553 +#define IDC_GUI_RESIZE 1553 +#define IDC_SER_CTSRTS 1554 +#define IDC_SER_DIRECT 1555 +#define IDC_PSPRINTER 1556 +#define IDC_PSPRINTERDETECT 1557 +#define IDC_UAESERIAL 1558 +#define IDC_VIEWINFO 1568 +#define IDC_SETINFO 1569 +#define IDC_FLOPPYSLIDER 1570 +#define IDC_FLOPPYSLIDERTEXT 1571 +#define IDC_FLOPPYSPEED 1572 +#define IDC_FLOPPYSPD 1572 +#define IDC_GUILANGUAGE_LIST 1573 +#define IDC_SOUNDBUFFERRAM 1574 +#define IDC_SOUNDADJUST 1575 +#define IDC_SOUNDBUFFERTEXT 1576 +#define IDC_SOUNDVOLUME 1576 +#define IDC_SOUNDBUFFERMEM 1577 +#define IDC_HARDFLUSH 1578 +#define IDC_SOUNDADJUSTNUM 1578 +#define IDC_CONSTJUMP 1579 +#define IDC_SOUNDDRIVEVOLUME 1579 +#define IDC_JITFPU 1580 +#define IDC_SOUNDVOLUME2 1580 +#define IDC_NOFLAGS 1581 +#define IDC_SOUNDDRIVEVOLUME2 1581 +#define IDC_CS_CACHE_TEXT 1582 +#define IDC_CS_CACHE_TEXT2 1583 +#define IDC_COLLISIONS 1584 +#define IDC_JITENABLE 1584 +#define IDC_DISASSEMBLY 1585 +#define IDC_MMUENABLE 1585 +#define IDC_COLLISION0 1589 +#define IDC_COLLISION1 1590 +#define IDC_AUDIOSYNC 1590 +#define IDC_COLLISION2 1591 +#define IDC_COLLISION3 1592 +#define IDC_SOUNDLAGSLIDER 1592 +#define IDC_SOUNDLAGCAPTION 1594 +#define IDC_FLOPPYTYPE 1594 +#define IDC_SYNCPARAMS 1595 +#define IDC_DF0TYPE 1595 +#define IDC_SOUNDLAGTEXT 1596 +#define IDC_DF1TYPE 1596 +#define IDC_DF2TYPE 1597 +#define IDC_SOUNDSPEEDSLIDER 1598 +#define IDC_DF3TYPE 1598 +#define IDC_SOUNDSPEEDTEXT 1599 +#define IDC_SOUNDSPEEDCAPTION 1600 +#define IDC_RTGMATCHDEPTH 1601 +#define IDC_ROMFILE2TEXT 1602 +#define IDC_ROMTEXT 1603 +#define IDC_KEYTEXT 1604 +#define IDC_CD32 1605 +#define IDC_AKIKOC2P 1605 +#define IDC_FLASHTEXT 1605 +#define IDC_SCSIDEVICE 1606 +#define IDC_FLASHTEXT2 1606 +#define IDC_INPUTTYPE 1607 +#define IDC_INPUTSELECTTEXT 1608 +#define IDC_NOUAEFSDB 1608 +#define IDC_INPUTDEVICE 1609 +#define IDC_MAPROM 1609 +#define IDC_NORECYCLEBIN 1609 +#define IDC_AVIOUTPUT_FILETEXT 1610 +#define IDC_INPUTDEVICETEXT 1610 +#define IDC_ALWAYSONTOP 1610 +#define IDC_AVIOUTPUT_FILE 1611 +#define IDC_INPUTLIST 1611 +#define IDC_CATWEASEL 1611 +#define IDC_INPUTAMIGA 1612 +#define IDC_AVIOUTPUT_VIDEO 1613 +#define IDC_INPUTAUTOFIRE 1613 +#define IDC_PORT_MOUSETRICK 1613 +#define IDC_AVIOUTPUT_AUDIO 1614 +#define IDC_INPUTCOPYFROM 1614 +#define IDC_SANA2 1614 +#define IDC_AVIOUTPUT_VIDEO_CODEC 1615 +#define IDC_INPUTDEVICEDISABLE 1615 +#define IDC_AVIOUTPUT_ACTIVATED 1615 +#define IDC_A2065 1615 +#define IDC_AVIOUTPUT_AUDIO_CODEC 1616 +#define IDC_INPUTAMIGACNT 1616 +#define IDC_FILTERHZ 1616 +#define IDC_SAMPLERIPPER_ACTIVATED 1616 +#define IDC_AVIOUTPUT_BORDER_TRIM 1617 +#define IDC_FILTERVZ 1617 +#define IDC_AVIOUTPUT_AUDIO_STATIC 1618 +#define IDC_FILTERHO 1618 +#define IDC_AVIOUTPUT_VIDEO_STATIC 1619 +#define IDC_FILTERVO 1619 +#define IDC_AVIOUTPUT_8BIT 1620 +#define IDC_FILTERASPECT 1620 +#define IDC_STATEREC_PLAY 1620 +#define IDC_AVIOUTPUT_24BIT 1621 +#define IDC_FILTERASPECT2 1621 +#define IDC_STATEREC_SAVE 1621 +#define IDC_AVIOUTPUT_WIDTH 1622 +#define IDC_AVIOUTPUT_HEIGHT 1623 +#define IDC_AVIOUTPUT_FRAME 1624 +#define IDC_FILTERXL 1624 +#define IDC_FILTERSLR 1625 +#define IDC_FILTERHZMULT 1626 +#define IDC_FILTERMODE 1627 +#define IDC_FILTERFILTER 1628 +#define IDC_FILTERDEFAULT 1629 +#define IDC_FILTERXTRA 1630 +#define IDC_INPUTDEADZONE 1630 +#define IDC_INPUTCOPY 1631 +#define IDC_FILTERPRESETS 1631 +#define IDC_SCREENSHOT 1632 +#define IDC_INPUTSWAP 1632 +#define IDC_FILTERPRESETLOAD 1632 +#define IDC_FLOPPYSPDTEXT 1633 +#define IDC_FILTERPRESETSAVE 1633 +#define IDC_INPUTREMAP 1633 +#define IDC_FLOPPYSPD_TEXT 1634 +#define IDC_FILTERPRESETDELETE 1634 +#define IDC_INPUTTEST 1634 +#define IDC_HARDDRIVE 1635 +#define IDC_INACTIVE_PRI 1635 +#define IDC_FILTERVZMULT 1635 +#define IDC_INPUTTEST2 1635 +#define IDC_SOUNDPRIMARY 1636 +#define IDC_MINIMIZED_PRI 1636 +#define IDC_FILTERAUTOSCALE 1636 +#define IDC_VOLUME_BOOTPRI_TEXT 1637 +#define IDC_FILTEROVERLAY 1637 +#define IDC_VOLUME_BOOTPRI 1638 +#define IDC_FILTEROVERLAYTYPE 1638 +#define IDC_KBLED1 1639 +#define IDC_KBLED2 1640 +#define IDC_SOUNDFILTER 1640 +#define IDC_KBLED3 1641 +#define IDC_SOUNDCALIBRATE 1641 +#define IDC_ACTIVE_PRIORITY 1642 +#define IDC_SOUNDDRIVE 1642 +#define IDC_KBLED4 1642 +#define IDC_GUI_SIZE 1642 +#define IDC_INACTIVE_PRIORITY 1643 +#define IDC_ACTIVE_PRI 1644 +#define IDC_MINIMIZED_PRIORITY 1645 +#define IDC_AVIOUTPUT_FRAMELIMITER 1645 +#define IDC_STATEREC_RATE 1646 +#define IDC_SOUNDDRIVESELECT 1647 +#define IDC_PANELTREE 1647 +#define IDC_AVIOUTPUT_NOSOUNDOUTPUT 1647 +#define IDC_STATE_BUFFERSIZE_TEXT 1648 +#define IDC_CONFIGTREE 1648 +#define IDC_AVIOUTPUT_NOSOUNDSYNC 1648 +#define IDC_AVIOUTPUT_OPTIONS 1649 +#define IDC_STATE_RATE_TEXT 1649 +#define IDC_DISKLISTREMOVE 1649 +#define IDC_DF0QENABLE 1649 +#define IDC_AVIOUTPUT_ORIGINALSIZE 1649 +#define IDC_SOUNDCARD 1650 +#define IDC_UPBM 1650 +#define IDC_DISKLISTINSERT 1650 +#define IDC_DF1QENABLE 1650 +#define IDC_AVIOUTPUT_ORIGINALSIZE2 1650 +#define IDC_SCREENSHOT_ORIGINALSIZE 1650 +#define IDC_SOUNDCARDLIST 1651 +#define IDC_STATE_BUFFERSIZE2 1651 +#define IDC_STATEREC_BUFFERSIZE 1651 +#define IDC_SOUNDFREQ 1652 +#define IDC_STATEREC_AUTOPLAY 1652 +#define IDC_SOUNDFREQTXT 1653 +#define IDC_PANEL_FRAME 1653 +#define IDC_SOUNDFILTERTXT 1654 +#define IDC_PANEL_FRAME_OUTER 1654 +#define IDC_SOUNDSTEREO 1655 +#define IDC_CONFIGTYPE 1655 +#define IDC_SOUNDDRIVETXT 1656 +#define IDC_PATHS_ROM 1656 +#define IDC_SOUNDSTEREOSEP 1656 +#define IDC_SOUNDSTEREOTXT 1657 +#define IDC_PATHS_CONFIG 1657 +#define IDC_SOUNDINTERPOLATIONTXT 1658 +#define IDC_PATHS_SCREENSHOT 1658 +#define IDC_DISK 1659 +#define IDC_DISKLIST 1659 +#define IDC_PATHS_SAVEIMAGE 1659 +#define IDC_SOUNDSTEREOSEPTXT 1659 +#define IDC_PATHS_SAVESTATE 1660 +#define IDC_SOUNDSTEREOMIXTXT 1660 +#define IDC_PATHS_ROMS 1661 +#define IDC_SOUNDSTEREOMIX 1661 +#define IDC_PATHS_CONFIGS 1662 +#define IDC_SOUNDSWAP 1662 +#define IDC_PATHS_SCREENSHOTS 1663 +#define IDC_PATHS_SAVESTATES 1664 +#define IDC_SOUNDSTEREOSWAPTXT 1664 +#define IDC_SOUNDSWAPTXT 1664 +#define IDC_PATHS_SAVEIMAGES 1665 +#define IDC_PATHS_ROML 1666 +#define IDC_PATHS_CONFIGL 1667 +#define IDC_PATHS_SCREENSHOTL 1668 +#define IDC_PATHS_STATEFILEL 1669 +#define IDC_PATHS_SAVEIMAGEL 1670 +#define IDC_PATHS_DEFAULT 1671 +#define IDC_ROM_RESCAN 1672 +#define IDC_QUICKSTARTMODE 1673 +#define IDC_RESETREGISTRY 1673 +#define IDC_QUICKSTART_MODEL 1674 +#define IDC_PATHS_AVIOUTPUTL 1674 +#define IDC_QUICKSTART_CONFIGURATION 1675 +#define IDC_PATHS_AVIOUTPUT 1675 +#define IDC_QUICKSTART_COMPATIBILITY 1676 +#define IDC_PATHS_AVIOUTPUTS 1676 +#define IDC_QUICKSTART_CONFIG 1677 +#define IDC_RESETDISKHISTORY 1677 +#define IDC_DF0Q 1678 +#define IDC_DF0QQ 1678 +#define IDC_PATHS_RIPSL 1678 +#define IDC_DF1Q 1679 +#define IDC_QUICKSTART_HOSTCONFIG 1679 +#define IDC_PATHS_RIP 1679 +#define IDC_DF1QQ 1680 +#define IDC_PATHS_RIPS 1680 +#define IDC_QUICKSTART_SETCONFIG 1681 +#define IDC_CONFIGAUTO 1682 +#define IDC_CD0Q_TYPE 1682 +#define IDC_DF0TEXTQ 1683 +#define IDC_CONFIGNOLINK 1683 +#define IDC_DF0WPQ 1684 +#define IDC_EJECT0Q 1685 +#define IDC_DF1WPQ 1686 +#define IDC_EJECT1Q 1687 +#define IDC_DF1TEXTQ 1688 +#define IDC_FILTERXLV 1692 +#define IDC_FILTERVOV 1693 +#define IDC_FILTERHOV 1694 +#define IDC_CONFIGLINK 1694 +#define IDC_FILTERVZV 1695 +#define IDC_PS_PARAMS 1695 +#define IDC_FILTERHZV 1696 +#define IDC_HF_TYPE 1696 +#define IDC_PRINTERAUTOFLUSH 1697 +#define IDC_PRINTERAUTOFLUSHTXT 1698 +#define IDC_DISKTEXT 1699 +#define IDC_FE_LIST 1700 +#define IDC_FE_INFO 1701 +#define IDC_FE_INFO2 1702 +#define IDC_FE_SCREENSHOT 1702 +#define IDC_PATHS_DEFAULTTYPE 1704 +#define IDC_SCSIMODE 1705 +#define IDC_PROGRESSBAR 1705 +#define IDC_PROGRESSBAR_TEXT 1706 +#define IDC_LANGUAGE 1706 +#define IDC_CREATE_NAME 1707 +#define IDC_NETDEVICE 1707 +#define IDC_SOUND_AUTO 1709 +#define IDC_FILTERKEEPASPECT 1709 +#define IDC_CS_RTC 1710 +#define IDC_FILTERKEEPAUTOSCALEASPECT 1710 +#define IDC_CS_CIAA_TOD1 1711 +#define IDC_CS_CIAA_TOD2 1712 +#define IDC_CS_EXT 1712 +#define IDC_CS_CIAA_TOD3 1713 +#define IDC_SOUND_DS 1713 +#define IDC_MONITOREMU 1713 +#define IDC_CS_COMPATIBLE 1714 +#define IDC_CS_RAMSEYREV 1715 +#define IDC_SOUND_WASAPI 1715 +#define IDC_CS_KSMIRROR_E0 1716 +#define IDC_STRINGBOXEDIT 1716 +#define IDC_SOUND_OPENAL 1716 +#define IDC_CS_CD32CD 1717 +#define IDC_CS_CD32C2P 1718 +#define IDC_SOUND_PORTAUDIO 1718 +#define IDC_CS_CD32NVRAM 1719 +#define IDC_CS_CDTVCD 1720 +#define IDC_CS_CDTVRAM 1721 +#define IDC_CS_IDE1 1722 +#define IDC_CS_IDE2 1723 +#define IDC_CS_IDE3 1724 +#define IDC_CS_A1000RAM 1724 +#define IDC_CS_RAMSEY 1725 +#define IDC_CS_GARY 1726 +#define IDC_CS_FATGARY 1726 +#define IDC_CS_DMAC 1727 +#define IDC_CS_RTCADJUST 1728 +#define IDC_CS_FATGARYREV 1729 +#define IDC_CS_CDTVRAMEXP 1730 +#define IDC_CS_RTC1 1731 +#define IDC_CS_RTC2 1732 +#define IDC_CS_RTC3 1733 +#define IDC_CS_IDE4 1734 +#define IDC_CS_DF0IDHW 1734 +#define IDC_CS_AGNUS 1735 +#define IDC_CS_AGNUSREV 1736 +#define IDC_CS_DENISE 1737 +#define IDC_CS_DENISEREV 1738 +#define IDC_DBG_OUTPUT1 1739 +#define IDC_CS_PCMCIA 1739 +#define IDC_CS_SLOWISFAST 1740 +#define IDC_DBG_HELP 1740 +#define IDC_DBG_INPUT 1741 +#define IDC_CS_KSMIRROR_A8 1741 +#define IDC_DBG_DREG 1742 +#define IDC_CS_CIAOVERLAY 1742 +#define IDC_DBG_AREG 1743 +#define IDC_CS_RESETWARNING 1743 +#define IDC_DBG_CCR 1744 +#define IDC_CS_NOEHB 1744 +#define IDC_DBG_AMEM 1745 +#define IDC_CS_DIPAGNUS 1745 +#define IDC_DBG_SP_VBR 1746 +#define IDC_DBG_MMISC 1747 +#define IDC_DBG_PC 1748 +#define IDC_DBG_PREFETCH 1749 +#define IDC_DBG_FPREG 1750 +#define IDC_DBG_FPSR 1751 +#define IDC_DBG_OUTPUT2 1752 +#define IDC_DBG_MEMINPUT 1753 +#define IDC_DBG_MEMDOWN 1754 +#define IDC_DBG_MEMUP 1755 +#define IDC_DBG_MEM 1756 +#define IDC_DBG_DASM 1757 +#define IDC_DBG_MEMDOWNFAST 1758 +#define IDC_DBG_MEMTOPC 1759 +#define IDC_DBG_MEMUPFAST 1760 +#define IDC_DA_RESET 1761 +#define IDC_DBG_STATUS 1762 +#define IDC_DBG_BRKPTS 1763 +#define IDC_DBG_MCUSTOM 1764 +#define IDC_DBG_MISC 1765 +#define IDC_DBG_CUSTOM 1766 +#define IDC_DBG_MISCCPU 1767 +#define IDC_CS_A2091 1768 +#define IDC_CS_DMAC2 1769 +#define IDC_CS_A4091 1770 +#define IDC_CS_CDTVSCSI 1771 +#define IDC_CS_SCSIMODE 1772 +#define IDC_DF0ENABLE 1773 +#define IDC_DF1ENABLE 1774 +#define IDC_FS_SELECT_DIR 1774 +#define IDC_FS_SELECT_FILE 1775 +#define IDC_FLOPPY_FFS 1775 +#define IDC_DF2ENABLE 1776 +#define IDC_FS_SELECT_EJECT 1776 +#define IDC_FS_RW 1777 +#define IDC_FLOPPY_BOOTABLE 1777 +#define IDC_DF3ENABLE 1778 +#define IDC_HDF_RW 1778 +#define IDC_HDFINFO 1779 +#define IDC_DBG_AUTOSET 1780 +#define IDC_HF_SPARSE 1780 +#define IDC_DBG_DASM2 1781 +#define IDC_HF_DYNAMIC 1781 +#define IDC_DBG_MEM2 1782 +#define IDC_DBG_MEMINPUT2 1783 +#define IDC_DBG_ADDRINPUTTXT 1784 +#define IDC_RTG_SCALE 1785 +#define IDC_RTG_MATCH_DEPTH 1786 +#define IDC_RTG_8BIT 1787 +#define IDC_RTG_16BIT 1788 +#define IDC_PATHS_CONFIGCACHE 1788 +#define IDC_RTG_24BIT 1789 +#define IDC_ASSOCIATELIST 1789 +#define IDC_PORT_TABLET 1789 +#define IDC_PATHS_RELATIVE 1789 +#define IDC_RTG_32BIT 1790 +#define IDC_ASSOCIATE_OFF 1790 +#define IDC_PORT_TABLET_FULL 1790 +#define IDC_CPU_MULTIPLIER 1790 +#define IDC_CPU_FREQUENCY2 1790 +#define IDC_DD_SURFACETYPE 1791 +#define IDC_RTG_SCALE_ALLOW 1791 +#define IDC_CPU_FREQUENCY 1791 +#define IDC_RTG_SCALE_ASPECTRATIO 1792 +#define IDC_ASSOCIATE_ON 1792 +#define IDC_DD_SURFACETYPE2 1792 +#define IDC_DXMODE 1792 +#define IDC_RTG_VBLANKRATE 1793 +#define IDC_DF0WPTEXTQ 1793 +#define IDC_WINDOWEDMODE 1793 +#define IDC_DF1WPTEXTQ 1794 +#define IDC_RTG_Z2Z3 1794 +#define IDC_RTG_BUFFERCNT 1795 +#define IDC_RTG_VBINTERRUPT 1796 +#define IDC_INPUTMAPLIST 1797 +#define IDC_RTG_HWSPRITE 1797 +#define IDC_PORT1_REMAP 1798 +#define IDC_PORT0_REMAP 1799 +#define IDC_PORT2_REMAP 1800 +#define IDC_PORT3_REMAP 1801 +#define IDC_INPUTMAPOUT 1801 +#define IDC_INFOBOX_TEXT2 1802 +#define IDC_INFOBOX_TEXT1 1803 +#define IDC_INFOBOX_TEXT3 1804 +#define IDC_CD_EJECT 1804 +#define IDC_CD_TEXT 1805 +#define IDC_CD_TYPE 1806 +#define IDC_CD_SELECT 1807 +#define IDC_FASTMEMAUTOCONFIG 1808 +#define IDC_RTG_DISPLAYSELECT 1809 +#define IDC_MISCLIST 1810 +#define IDC_STATENAME 1811 +#define IDC_SAMPLER_STEREO 1812 +#define IDC_LISTDIALOG_LIST 1813 +#define ID__FLOPPYDRIVES 40004 +#define ID_FLOPPYDRIVES_DF0 40005 +#define ID_ST_CONFIGURATION 40010 +#define ID_ST_HELP 40011 +#define ID_ST_QUIT 40012 +#define ID_ST_EJECTALL 40013 +#define ID_ST_DF0 40014 +#define ID_ST_DF1 40015 +#define ID_ST_DF2 40016 +#define ID_ST_DF3 40017 +#define ID_ST_RESET 40019 +#define ID_DBG_PAGE1 40020 +#define ID_DBG_PAGE2 40021 +#define ID_DBG_PAGE3 40022 +#define ID_DBG_PAGE4 40023 +#define ID_DBG_PAGE5 40024 +#define ID_DBG_PAGE6 40025 +#define ID_DBG_PAGE7 40026 +#define ID_DBG_PAGE8 40027 +#define ID_DBG_PAGE9 40028 +#define ID_DBG_STEP_OVER 40029 +#define ID_DBG_STEP_INTO 40030 +#define ID_DBG_SETTOA0 40031 +#define ID_DBG_SETTOA1 40032 +#define ID_DBG_SETTOA2 40033 +#define ID_DBG_SETTOA3 40034 +#define ID_DBG_SETTOA4 40035 +#define ID_DBG_SETTOA5 40036 +#define ID_DBG_SETTOA6 40037 +#define ID_DBG_SETTOA7 40038 +#define ID_DBG_ENTERADDR 40039 +#define ID_DBG_COPYLBLINE 40040 +#define ID_DBG_COPYLB 40041 +#define ID_DBG_TOGGLEBP 40042 +#define ID_DBG_DELETEBPS 40043 +#define ID_DBG_SETTOPC 40044 +#define ID_MENU_CDDRIVES 40045 +#define ID_CDDRIVES_EJECT 40046 +#define ID_ST_CDEJECTALL 40047 +#define ID_CDDRIVES_CD 40048 +#define ID_ST_CD0 40049 + +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NO_MFC 1 +#define _APS_3D_CONTROLS 1 +#define _APS_NEXT_RESOURCE_VALUE 387 +#define _APS_NEXT_COMMAND_VALUE 40050 +#define _APS_NEXT_CONTROL_VALUE 1814 +#define _APS_NEXT_SYMED_VALUE 101 +#endif +#endif diff --git a/od-win32/resources/winuae.exe.manifest b/od-win32/resources/winuae.exe.manifest index b66e65d5..80f71119 100644 --- a/od-win32/resources/winuae.exe.manifest +++ b/od-win32/resources/winuae.exe.manifest @@ -1,5 +1,6 @@ - - + + + + language="*"> + - - - - - - - - - - true - - - + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/od-win32/resources/winuae.rc b/od-win32/resources/winuae.rc index fb02011c..31e615ae 100644 --- a/od-win32/resources/winuae.rc +++ b/od-win32/resources/winuae.rc @@ -1,6 +1,6 @@ // Microsoft Visual C++ generated resource script. // -#include "resource." +#include "resource.h" #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// @@ -125,11 +125,11 @@ BEGIN COMBOBOX IDC_REFRESHRATE,266,33,119,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_DISPLAY_BUFFERCNT,266,56,119,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP GROUPBOX "Settings",IDC_SETTINGSTEXT,1,86,283,144 - RTEXT "Native:",IDC_STATIC,9,98,56,15,SS_CENTERIMAGE - COMBOBOX IDC_SCREENMODE_NATIVE,69,98,63,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + RTEXT "Native:",IDC_STATIC,9,98,48,15,SS_CENTERIMAGE + COMBOBOX IDC_SCREENMODE_NATIVE,61,98,71,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_SCREENMODE_NATIVE2,142,98,127,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP - RTEXT "RTG:",IDC_STATIC,8,115,57,15,SS_CENTERIMAGE - COMBOBOX IDC_SCREENMODE_RTG,69,118,63,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + RTEXT "RTG:",IDC_STATIC,8,115,49,15,SS_CENTERIMAGE + COMBOBOX IDC_SCREENMODE_RTG,61,118,71,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_SCREENMODE_RTG2,142,118,127,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP CONTROL "Blacker than black",IDC_BLACKER_THAN_BLACK,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_TABSTOP,11,140,142,10 CONTROL "Remove interlace artifacts",IDC_FLICKERFIXER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,154,142,10 @@ -1800,7 +1800,7 @@ LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT 1 TEXTINCLUDE BEGIN - "resource.\0" + "resource.h\0" END 3 TEXTINCLUDE diff --git a/od-win32/resources/winuae64.exe.manifest b/od-win32/resources/winuae64.exe.manifest index f9701443..c3dae2bd 100644 --- a/od-win32/resources/winuae64.exe.manifest +++ b/od-win32/resources/winuae64.exe.manifest @@ -1,5 +1,6 @@ - + + + language="*"> + - - - - - - - - + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/od-win32/rp.cpp b/od-win32/rp.cpp index 20b4e531..fe4a2bf6 100644 --- a/od-win32/rp.cpp +++ b/od-win32/rp.cpp @@ -31,7 +31,7 @@ #include "registry.h" #include "win32gui.h" #include "drawing.h" -#include +#include "resource.h" static int initialized; static RPGUESTINFO guestinfo; diff --git a/od-win32/win32.cpp b/od-win32/win32.cpp index 6846894d..8df7369a 100644 --- a/od-win32/win32.cpp +++ b/od-win32/win32.cpp @@ -35,7 +35,7 @@ #include #include -#include "resource" +#include "resource.h" #include #include "wintablet.h" @@ -5915,6 +5915,7 @@ int PASCAL wWinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdL #endif #endif SetErrorMode (SEM_FAILCRITICALERRORS | SEM_NOOPENFILEERRORBOX); + currprefs.win32_filesystem_mangle_reserved_names = true; SetDllDirectory (_T("")); /* Make sure we do an InitCommonControls() to get some advanced controls */ InitCommonControls (); diff --git a/od-win32/win32.h b/od-win32/win32.h index 813aaf6d..ea430663 100644 --- a/od-win32/win32.h +++ b/od-win32/win32.h @@ -19,8 +19,8 @@ #define LANG_DLL 1 //#define WINUAEBETA _T("") -#define WINUAEBETA _T("14") -#define WINUAEDATE MAKEBD(2012, 8, 30) +#define WINUAEBETA _T("15") +#define WINUAEDATE MAKEBD(2012, 9, 2) #define WINUAEEXTRA _T("") //#define WINUAEEXTRA _T("AmiKit Preview") #define WINUAEREV _T("") diff --git a/od-win32/win32gfx.cpp b/od-win32/win32gfx.cpp index 4a409fcf..428b7113 100644 --- a/od-win32/win32gfx.cpp +++ b/od-win32/win32gfx.cpp @@ -19,7 +19,7 @@ #include "sysdeps.h" -#include "resource" +#include "resource.h" #include "options.h" #include "audio.h" diff --git a/od-win32/win32gui.cpp b/od-win32/win32gui.cpp index 88f0a41b..0cb1be89 100644 --- a/od-win32/win32gui.cpp +++ b/od-win32/win32gui.cpp @@ -31,7 +31,7 @@ #include #include -#include "resource" +#include "resource.h" #include "sysconfig.h" #include "sysdeps.h" #include "gui.h" @@ -1151,7 +1151,8 @@ static HWND cachedlist = NULL; #define MIN_SLOW_MEM 0 #define MAX_SLOW_MEM 4 #define MIN_Z3_MEM 0 -#define MAX_Z3_MEM ((max_z3fastmem >> 20) < 512 ? 12 : ((max_z3fastmem >> 20) < 1024 ? 13 : ((max_z3fastmem >> 20) < 2048) ? 14 : ((max_z3fastmem >> 20) < 2560) ? 15 : ((max_z3fastmem >> 20) < 3072) ? 16 : 17)) +//#define MAX_Z3_MEM ((max_z3fastmem >> 20) < 512 ? 12 : ((max_z3fastmem >> 20) < 1024 ? 13 : ((max_z3fastmem >> 20) < 2048) ? 14 : ((max_z3fastmem >> 20) < 2560) ? 15 : ((max_z3fastmem >> 20) < 3072) ? 16 : 17)) +#define MAX_Z3_MEM ((max_z3fastmem >> 20) < 512 ? 12 : ((max_z3fastmem >> 20) < 1024 ? 13 : ((max_z3fastmem >> 20) < 2048) ? 14 : 15)) #define MAX_Z3_CHIPMEM 7 #define MIN_P96_MEM 0 #define MAX_P96_MEM_Z3 ((max_z3fastmem >> 20) < 512 ? 8 : ((max_z3fastmem >> 20) < 1024 ? 9 : ((max_z3fastmem >> 20) < 2048) ? 10 : 11)) @@ -15231,7 +15232,7 @@ static int GetSettings (int all_options, HWND hwnd) scaleresource_setmult (hwnd, -fmultx, -fmulty); } else { scaleresource_setmult (hwnd, gui_width, gui_height); - //write_log (_T("Requested GUI %dx%d\n"), gui_width, gui_height); + write_log (_T("Requested GUI size = %dx%d\n"), gui_width, gui_height); } tres = scaleresource (panelresource, hwnd, gui_resize); dhwnd = CreateDialogIndirect (tres->inst, tres->resource, hwnd, DialogProc); @@ -15246,7 +15247,7 @@ static int GetSettings (int all_options, HWND hwnd) int w, h; getguisize (dhwnd, &w, &h); - //write_log (_T("GUI %dx%d\n"), w, h); + write_log (_T("Got GUI size = %dx%d\n"), w, h); if (w < 100 || h < 100 || w > 4096 || h > 4096) { write_log (_T("GUI size (%dx%d) out of range!\n"), w, h); scaleresource_setdefaults (); diff --git a/od-win32/win32gui_extra.cpp b/od-win32/win32gui_extra.cpp index c4d46a98..5820c36d 100644 --- a/od-win32/win32gui_extra.cpp +++ b/od-win32/win32gui_extra.cpp @@ -20,7 +20,7 @@ #include "sysconfig.h" #include "sysdeps.h" -#include "resource" +#include "resource.h" #include "registry.h" #include "win32.h" #include "win32gui.h" @@ -155,7 +155,7 @@ static void modifytemplatefont (DLGTEMPLATEEX *d, DLGTEMPLATEEX_END *d2) d2->pointsize = fontsize_gui; d2->italic = (fontstyle_gui & ITALIC_FONTTYPE) != 0; d2->weight = fontweight_gui; - } +} } static void modifyitem (DLGTEMPLATEEX *d, DLGTEMPLATEEX_END *d2, DLGITEMTEMPLATEEX *dt, int id) @@ -205,10 +205,10 @@ static INT_PTR CALLBACK DummyProc (HWND hDlg, UINT msg, WPARAM wParam, LPARAM lP struct newresource *scaleresource (struct newresource *res, HWND parent, int resize) { - DLGTEMPLATEEX *d; - DLGTEMPLATEEX_END *d2; + DLGTEMPLATEEX *d, *s; + DLGTEMPLATEEX_END *d2, *s2; DLGITEMTEMPLATEEX *dt; - BYTE *p, *p2; + BYTE *p, *p2, *ps, *ps2; int i; struct newresource *ns; @@ -230,6 +230,7 @@ struct newresource *scaleresource (struct newresource *res, HWND parent, int res memcpy ((void*)ns->resource, res->resource, ns->size); d = (DLGTEMPLATEEX*)ns->resource; + s = (DLGTEMPLATEEX*)res->resource; if (resize > 0) { d->style &= ~DS_MODALFRAME; @@ -244,20 +245,32 @@ struct newresource *scaleresource (struct newresource *res, HWND parent, int res p = skiptext (p); p = skiptext (p); p = skiptext (p); + + s2 = (DLGTEMPLATEEX_END*)res->resource; + ps = (BYTE*)s2 + sizeof (DLGTEMPLATEEX); + ps = skiptext (ps); + ps = skiptext (ps); + ps = skiptext (ps); + d2 = (DLGTEMPLATEEX_END*)p; p2 = p; p2 += sizeof (DLGTEMPLATEEX_END); p2 = skiptextone (p2); p2 = todword (p2); + s2 = (DLGTEMPLATEEX_END*)ps; + ps2 = ps; + ps2 += sizeof (DLGTEMPLATEEX_END); + ps2 = skiptextone (ps2); + ps2 = todword (ps2); + modifytemplatefont (d, d2); p += sizeof (DLGTEMPLATEEX_END); p = skiptextone (p); p = todword (p); - if (p != p2) - memmove (p, p2, ns->size - (p2 - (BYTE*)ns->resource)); + memcpy (p, ps2, ns->size - (ps2 - (BYTE*)res->resource)); modifytemplate(d, d2, ns->tmpl); diff --git a/od-win32/winuae_msvc10/winuae_msvc.vcxproj b/od-win32/winuae_msvc10/winuae_msvc.vcxproj index 051f33a0..fba521ff 100644 --- a/od-win32/winuae_msvc10/winuae_msvc.vcxproj +++ b/od-win32/winuae_msvc10/winuae_msvc.vcxproj @@ -121,6 +121,15 @@ C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Include;C:\dev\include;$(IncludePath) $(ReferencePath) C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Lib\x86;C:\dev\lib;$(LibraryPath) + true + true + true + C:\dev\include;C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Include;$(IncludePath) + C:\dev\lib\x64;C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Lib\x64;$(LibraryPath) + C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Include;C:\dev\include;$(IncludePath) + C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Lib\x64;C:\dev\lib\x64;$(LibraryPath) + C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Include;C:\dev\include;$(IncludePath) + C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Lib\x64;C:\dev\lib\x64;$(LibraryPath) @@ -185,7 +194,8 @@ - ..\resources\winuae.exe.manifest;%(AdditionalManifestFiles) + ../resources/winuae.exe.manifest + true @@ -203,9 +213,9 @@ WINVER=0x0500;_DEBUG;WIN32_IE=0x0700;WIN32;WIN64;_CRT_SECURE_NO_WARNINGS;D3D_DEBUG_INFO;%(PreprocessorDefinitions) Sync EnableFastChecks - MultiThreadedDebug + MultiThreadedDebugDLL true - true + false $(Platform)\$(Configuration)\winuae_msvc.pch $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ @@ -217,6 +227,7 @@ Default 4996;%(DisableSpecificWarnings) false + true _DEBUG;%(PreprocessorDefinitions) @@ -226,7 +237,7 @@ ws2_32.lib;ddraw.lib;dxguid.lib;winmm.lib;comctl32.lib;version.lib;vfw32.lib;msacm32.lib;dsound.lib;dinput8.lib;d3d9.lib;d3dx9.lib;setupapi.lib;wininet.lib;dxerr.lib;shlwapi.lib;zlibstat.lib;portaudio_x64.lib;packet.lib;wpcap.lib;openal32.lib;libpng15.lib;lglcd.lib;wtsapi32.lib;wntab32x.lib;enet_x64.lib;prowizard_x64.lib;lzmalib.lib;libFLAC_static.lib;avrt.lib;hid.lib;%(AdditionalDependencies) $(OutDir)$(TargetName)$(TargetExt) true - %(IgnoreSpecificDefaultLibraries) + LIBCMT;%(IgnoreSpecificDefaultLibraries) wpcap.dll;packet.dll;d3dx9_42.dll;openal32.dll;wintab32.dll;portaudio_x64.dll;ws2_32.dll;msacm32.dll;wtsapi32.dll;dsound.dll;avrt.dll;%(DelayLoadDLLs) true $(Platform)\$(Configuration)\winuae.pdb @@ -243,7 +254,8 @@ - ..\resources\winuae64.exe.manifest;%(AdditionalManifestFiles) + ..\resources\winuae64.exe.manifest + true @@ -317,7 +329,10 @@ - ..\resources\winuae.exe.manifest;%(AdditionalManifestFiles) + ../resources/winuae.exe.manifest + true + $(IntDir)$(TargetName)$(TargetExt).embed.manifest + /validate_manifest %(AdditionalOptions) @@ -340,7 +355,7 @@ true Sync Default - MultiThreaded + MultiThreadedDLL false true NotSet @@ -370,7 +385,7 @@ $(OutDir)$(TargetName)$(TargetExt) true %(AdditionalLibraryDirectories);$(SolutionDir)\..\lib\ - %(IgnoreSpecificDefaultLibraries) + LIBCMT;%(IgnoreSpecificDefaultLibraries) wpcap.dll;packet.dll;d3dx9_43.dll;openal32.dll;wintab32.dll;portaudio_x64.dll;ws2_32.dll;msacm32.dll;wtsapi32.dll;dsound.dll;avrt.dll;%(DelayLoadDLLs) true $(Platform)\$(Configuration)\winuae.pdb @@ -387,7 +402,8 @@ MachineX64 - ..\resources\winuae64.exe.manifest;%(AdditionalManifestFiles) + ..\resources\winuae64.exe.manifest + true @@ -460,7 +476,8 @@ - ..\resources\winuae9.exe.manifest;%(AdditionalManifestFiles) + ../resources/winuae.exe.manifest + true @@ -483,7 +500,7 @@ true Sync Default - MultiThreaded + MultiThreadedDLL false true NotSet @@ -514,7 +531,7 @@ $(OutDir)$(TargetName)$(TargetExt) true %(AdditionalLibraryDirectories);$(SolutionDir)\..\lib\ - %(IgnoreSpecificDefaultLibraries) + LIBCMT;%(IgnoreSpecificDefaultLibraries) wpcap.dll;packet.dll;d3dx9_43.dll;openal32.dll;wintab32.dll;portaudio_x64.dll;ws2_32.dll;msacm32.dll;wtsapi32.dll;dsound.dll;avrt.dll;%(DelayLoadDLLs) true $(Platform)\$(Configuration)\winuae.pdb @@ -531,6 +548,7 @@ ..\resources\winuae64.exe.manifest;%(AdditionalManifestFiles) + true @@ -727,7 +745,6 @@ - diff --git a/od-win32/winuae_msvc10/winuae_msvc.vcxproj.filters b/od-win32/winuae_msvc10/winuae_msvc.vcxproj.filters index 3418b03e..30f08932 100644 --- a/od-win32/winuae_msvc10/winuae_msvc.vcxproj.filters +++ b/od-win32/winuae_msvc10/winuae_msvc.vcxproj.filters @@ -608,7 +608,6 @@ - diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt index 73d66d0c..9799507c 100644 --- a/od-win32/winuaechangelog.txt +++ b/od-win32/winuaechangelog.txt @@ -1,6 +1,19 @@ - restore only single input target to default. +Beta 15: + +- Fixed too large GUI size if non-100% Windows DPI setting and full optimized build. (b13) +- Fonts with long names caused corrupted dialog structure. +- Marked WinUAE as Windows Vista/7/8 compatible. This should have been done long time ago, without this Windows enables + some backwards compatibility features, for example Aero gets disabled in fullscreen directdraw. +- Disabled COPJMP bug emulation, it triggers incorrectly in Seven Sins/Scoopex. + (Already did some logic analyzer testing but I can't yet confirm exact trigger conditions for this bug, it wasn't as simple + as I originally thought) +- Editing non-custom event's qualifier reset input target to none. +- Lightpen cursor wasn't removed when lightpen mode was disabled. +- Wintab tablet messages corrupted memory if Windows driver installed but tablet mode was not enabled. (b6) + Beta 14: - Borderblank emulation rewritten yet again, now borderblank state is included with color 0 change events (this time