From: Toni Wilen Date: Sat, 2 May 2015 16:32:44 +0000 (+0300) Subject: 3100b17 X-Git-Tag: 3100~39 X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=dc70ac96febf9ed6e2740f2e5de1822fedc6a293;p=francis%2Fwinuae.git 3100b17 --- diff --git a/amax.cpp b/amax.cpp index 708b3bf4..ab5d1c50 100644 --- a/amax.cpp +++ b/amax.cpp @@ -16,7 +16,7 @@ static const int addr_scramble[16] = { 14, 12, 2, 10, 15, 13, 1, 0, 7, 6, 5, 4, static int romptr; static uae_u8 *rom; static int amax_rom_size, rom_oddeven; -static uae_u8 data; +static uae_u8 amax_data; static uae_u8 bfd100, bfe001; static uae_u8 dselect; static bool amax_is_active; @@ -44,7 +44,7 @@ static void load_byte (void) val |= 1 << i; } } - data = val; + amax_data = val; if (AMAX_LOG > 0) write_log (_T("AMAX: load byte, rom=%d addr=%06x (%06x) data=%02x (%02x) PC=%08X\n"), rom_oddeven, romptr, addr, v, val, M68K_GETPC); } @@ -89,8 +89,8 @@ void amax_bfe001_write (uae_u8 pra, uae_u8 dra) bfe001 = v; /* CHNG low -> high: shift data register */ if ((v & 4) && !(bfe001_ov & 4)) { - data <<= 1; - data |= 1; + amax_data <<= 1; + amax_data |= 1; if (AMAX_LOG > 0) write_log (_T("AMAX: data shifted\n")); } @@ -119,7 +119,7 @@ void amax_disk_select (uae_u8 v, uae_u8 ov, int num) uae_u8 amax_disk_status (uae_u8 st) { - if (!(data & 0x80)) + if (!(amax_data & 0x80)) st &= ~0x20; return st; } @@ -135,7 +135,7 @@ void amax_reset (void) rom_oddeven = 0; bfe001_ov = 0; dwlastbit = 0; - data = 0xff; + amax_data = 0xff; xfree (rom); rom = NULL; dselect = 0; diff --git a/cfgfile.cpp b/cfgfile.cpp index 5af28f07..bcc3f47a 100644 --- a/cfgfile.cpp +++ b/cfgfile.cpp @@ -200,7 +200,8 @@ static const TCHAR *dongles[] = }; static const TCHAR *cdmodes[] = { _T("disabled"), _T(""), _T("image"), _T("ioctl"), _T("spti"), _T("aspi"), 0 }; static const TCHAR *cdconmodes[] = { _T(""), _T("uae"), _T("ide"), _T("scsi"), _T("cdtv"), _T("cd32"), 0 }; -static const TCHAR *specialmonitors[] = { _T("none"), _T("autodetect"), _T("a2024"), _T("graffiti"), _T("ham_e"), _T("ham_e_plus"), _T("dctv"), 0 }; +static const TCHAR *specialmonitors[] = { _T("none"), _T("autodetect"), _T("a2024"), _T("graffiti"), +_T("ham_e"), _T("ham_e_plus"), _T("videodac18"), _T("avideo12"), _T("avideo24"), _T("dctv"), 0 }; static const TCHAR *rtgtype[] = { _T("ZorroII"), _T("ZorroIII"), _T("PicassoII"), @@ -270,6 +271,11 @@ static const TCHAR *uaebootrom[] = { _T("full"), NULL }; +static const TCHAR *serialcrlf[] = { + _T("disabled"), + _T("crlf_cr"), + NULL +}; static const TCHAR *obsolete[] = { _T("accuracy"), _T("gfx_opengl"), _T("gfx_32bit_blits"), _T("32bit_blits"), _T("gfx_immediate_blits"), _T("gfx_ntsc"), _T("win32"), _T("gfx_filter_bits"), @@ -1215,6 +1221,7 @@ void cfgfile_save_options (struct zfile *f, struct uae_prefs *p, int type) cfgfile_write_bool (f, _T("serial_hardware_ctsrts"), p->serial_hwctsrts); cfgfile_write_bool (f, _T("serial_direct"), p->serial_direct); cfgfile_dwrite (f, _T("serial_stopbits"), _T("%d"), p->serial_stopbits); + cfgfile_dwrite_str(f, _T("serial_translate"), serialcrlf[p->serial_crlf]); cfgfile_write_str (f, _T("scsi"), scsimode[p->scsi]); cfgfile_write_bool (f, _T("uaeserial"), p->uaeserial); cfgfile_write_bool (f, _T("sana2"), p->sana2); @@ -2079,7 +2086,7 @@ static int getintval2 (TCHAR **p, int *result, int delim, bool last) return 0; } } - if (!_istdigit(**p)) + if (!_istdigit(**p) && **p != '-' && **p != '+') return 0; if (*p2 != 0) @@ -4006,37 +4013,39 @@ static bool cfgfile_read_board_rom(struct uae_prefs *p, const TCHAR *option, con _stprintf(buf, _T("%s_rom_options"), name); if (cfgfile_string (option, value, buf, buf2, sizeof buf2 / sizeof (TCHAR))) { - brc = get_device_rom_new(p, ert->romtype, j, &idx); - if (cfgfile_option_bool(buf2, _T("autoboot_disabled")) == 1) { - brc->roms[idx].autoboot_disabled = true; - } - if (ert->settings) { - for (int k = 0; ert->settings[k].name; k++) { - if (cfgfile_option_find(buf2, ert->settings[k].configname)) { - brc->roms[idx].device_settings |= 1 << k; + brc = get_device_rom(p, ert->romtype, j, &idx); + if (brc) { + if (cfgfile_option_bool(buf2, _T("autoboot_disabled")) == 1) { + brc->roms[idx].autoboot_disabled = true; + } + if (ert->settings) { + for (int k = 0; ert->settings[k].name; k++) { + if (cfgfile_option_find(buf2, ert->settings[k].configname)) { + brc->roms[idx].device_settings |= 1 << k; + } } } - } - if (ert->id_jumper) { - TCHAR *p = cfgfile_option_get(buf2, _T("id")); - if (p) { - brc->roms[idx].device_id = _tstol(p); + if (ert->id_jumper) { + TCHAR *p = cfgfile_option_get(buf2, _T("id")); + if (p) { + brc->roms[idx].device_id = _tstol(p); + } } - } - if (ert->subtypes) { - const struct expansionsubromtype *srt = ert->subtypes; - TCHAR tmp[MAX_DPATH], *p; - p = tmp; - *p = 0; - while (srt->name) { - _tcscpy(p, srt->configname); - p += _tcslen(p) + 1; - p[0] = 0; - srt++; + if (ert->subtypes) { + const struct expansionsubromtype *srt = ert->subtypes; + TCHAR tmp[MAX_DPATH], *p; + p = tmp; + *p = 0; + while (srt->name) { + _tcscpy(p, srt->configname); + p += _tcslen(p) + 1; + p[0] = 0; + srt++; + } + int v = cfgfile_option_select(buf2, _T("subtype"), tmp); + if (v >= 0) + brc->roms[idx].subtype = v; } - int v = cfgfile_option_select(buf2, _T("subtype"), tmp); - if (v >= 0) - brc->roms[idx].subtype = v; } return true; } @@ -4219,6 +4228,7 @@ static int cfgfile_parse_hardware (struct uae_prefs *p, const TCHAR *option, TCH || cfgfile_strval (option, value, _T("z3mapping"), &p->z3_mapping_mode, z3mapping, 0) || cfgfile_strval (option, value, _T("scsidev_mode"), &p->uaescsidevmode, uaescsidevmodes, 0) || cfgfile_strval (option, value, _T("boot_rom_uae"), &p->boot_rom, uaebootrom, 0) + || cfgfile_strval (option, value, _T("serial_translate"), &p->serial_crlf, serialcrlf, 0) || cfgfile_strboolval (option, value, _T("comp_flushmode"), &p->comp_hardflush, flushmode, 0)) return 1; @@ -5897,6 +5907,7 @@ void default_prefs (struct uae_prefs *p, int type) } p->gfx_resolution = RES_HIRES; p->gfx_vresolution = VRES_DOUBLE; + p->gfx_iscanlines = 1; p->gfx_apmode[0].gfx_fullscreen = GFX_WINDOW; p->gfx_apmode[1].gfx_fullscreen = GFX_WINDOW; p->gfx_xcenter = 0; p->gfx_ycenter = 0; diff --git a/cpuboard.cpp b/cpuboard.cpp index a79f20c1..fd5703a8 100644 --- a/cpuboard.cpp +++ b/cpuboard.cpp @@ -1018,7 +1018,7 @@ static void REGPARAM2 blizzardio_bput(uaecptr addr, uae_u32 v) write_log(_T("CS IO XBPUT %08x %02x PC=%08x\n"), addr, v & 0xff, M68K_GETPC); #endif if (is_fusionforty()) { - ; + write_log(_T("FusionForty IO XBPUT %08x %02x PC=%08x\n"), addr, v & 0xff, M68K_GETPC); } else if (is_csmk2()) { csmk2_flashaddressing = addr & 3; if (addr == 0x880000e3 && v == 0x2a) { @@ -1217,7 +1217,7 @@ static void REGPARAM2 blizzardio_wput(uaecptr addr, uae_u32 v) special_mem |= S_WRITE; #endif if (is_fusionforty()) { - ; + write_log(_T("FusionForty IO WPUT %08x %04x\n"), addr, v); } else if (is_blizzard()) { write_log(_T("CS IO WPUT %08x %04x\n"), addr, v); if((addr & 65535) == (BLIZZARD_BOARD_DISABLE & 65535)) { diff --git a/debug.cpp b/debug.cpp index bb0c971e..7f9436d9 100644 --- a/debug.cpp +++ b/debug.cpp @@ -3569,7 +3569,7 @@ static int cycle_breakpoint(TCHAR **c) next_char(c); if (more_params(c)) { int count = readint(c); - if (nc == 'S') { + if (nc == 's') { if (more_params(c)) { int hp = readint(c); if (count >= vpos) { diff --git a/include/options.h b/include/options.h index bf0c7d38..74e6b8a2 100644 --- a/include/options.h +++ b/include/options.h @@ -212,7 +212,10 @@ enum { CP_GENERIC = 1, CP_CDTV, CP_CDTVCR, CP_CD32, CP_A500, CP_A500P, CP_A600, #define MONITOREMU_GRAFFITI 3 #define MONITOREMU_HAM_E 4 #define MONITOREMU_HAM_E_PLUS 5 -#define MONITOREMU_DCTV 6 +#define MONITOREMU_VIDEODAC18 6 +#define MONITOREMU_AVIDEO12 7 +#define MONITOREMU_AVIDEO24 8 +#define MONITOREMU_DCTV 9 #define MAX_FILTERSHADERS 4 @@ -328,6 +331,7 @@ struct uae_prefs { bool serial_hwctsrts; bool serial_direct; int serial_stopbits; + int serial_crlf; bool parallel_demand; int parallel_matrix_emulation; bool parallel_postscript_emulation; diff --git a/newcpu.cpp b/newcpu.cpp index 68ad0631..16ec644f 100644 --- a/newcpu.cpp +++ b/newcpu.cpp @@ -87,8 +87,6 @@ cpuop_func *cpufunctbl[65536]; struct mmufixup mmufixup[2]; -extern uae_u32 get_fpsr (void); - #define COUNT_INSTRS 0 #define MC68060_PCR 0x04300000 #define MC68EC060_PCR 0x04310000 diff --git a/od-win32/build68k_msvc/build68k_msvc.vcxproj b/od-win32/build68k_msvc/build68k_msvc.vcxproj index 39748af1..8a7385ac 100644 --- a/od-win32/build68k_msvc/build68k_msvc.vcxproj +++ b/od-win32/build68k_msvc/build68k_msvc.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -31,31 +31,31 @@ Application false MultiByte - v110 + v140 Application false MultiByte - v110 + v140 Application false Unicode - v110 + v140 Application false Unicode - v120_xp + v140_xp Application false Unicode - v110 + v140 diff --git a/od-win32/dxwrap.cpp b/od-win32/dxwrap.cpp index c516f8cf..685d17b2 100644 --- a/od-win32/dxwrap.cpp +++ b/od-win32/dxwrap.cpp @@ -9,7 +9,6 @@ #include "xwin.h" #include -#include struct ddstuff dxdata; @@ -503,12 +502,11 @@ TCHAR *outGUID (const GUID *guid) const TCHAR *DXError (HRESULT ddrval) { static TCHAR dderr[1000]; - _stprintf (dderr, _T("%08X S=%d F=%04X C=%04X (%d) (%s)"), + _stprintf(dderr, _T("%08X S=%d F=%04X C=%04X (%d)"), ddrval, (ddrval & 0x80000000) ? 1 : 0, HRESULT_FACILITY(ddrval), HRESULT_CODE(ddrval), - HRESULT_CODE(ddrval), - DXGetErrorDescription (ddrval)); + HRESULT_CODE(ddrval)); return dderr; } diff --git a/od-win32/genblitter_msvc/genblitter_msvc.vcxproj b/od-win32/genblitter_msvc/genblitter_msvc.vcxproj index 25ad4fc5..e51dc58f 100644 --- a/od-win32/genblitter_msvc/genblitter_msvc.vcxproj +++ b/od-win32/genblitter_msvc/genblitter_msvc.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -31,31 +31,31 @@ Application false MultiByte - v110 + v140 Application false MultiByte - v110 + v140 Application false Unicode - v110 + v140 Application false Unicode - v120_xp + v140_xp Application false Unicode - v110 + v140 diff --git a/od-win32/gencomp_msvc/gencomp_msvc.vcxproj b/od-win32/gencomp_msvc/gencomp_msvc.vcxproj index c7be7710..b033d4d5 100644 --- a/od-win32/gencomp_msvc/gencomp_msvc.vcxproj +++ b/od-win32/gencomp_msvc/gencomp_msvc.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -31,33 +31,33 @@ Application false Unicode - v110 + v140 Application false MultiByte - v110 + v140 Application false Unicode - v110 + v140 Application false false Unicode - v120_xp + v140_xp Application false false MultiByte - v110 + v140 diff --git a/od-win32/gencpu_msvc/gencpu_msvc.vcxproj b/od-win32/gencpu_msvc/gencpu_msvc.vcxproj index 86f21c94..3e0b0ebe 100644 --- a/od-win32/gencpu_msvc/gencpu_msvc.vcxproj +++ b/od-win32/gencpu_msvc/gencpu_msvc.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -31,31 +31,31 @@ Application false Unicode - v110 + v140 Application false MultiByte - v110 + v140 Application false Unicode - v120_xp + v140_xp Application false Unicode - v120_xp + v140_xp Application false Unicode - v120_xp + v140_xp diff --git a/od-win32/genlinetoscr_msvc/genlinetoscr_msvc.vcxproj b/od-win32/genlinetoscr_msvc/genlinetoscr_msvc.vcxproj index 95480729..e7739ba4 100644 --- a/od-win32/genlinetoscr_msvc/genlinetoscr_msvc.vcxproj +++ b/od-win32/genlinetoscr_msvc/genlinetoscr_msvc.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -29,24 +29,24 @@ Application Unicode true - v110 + v140 Application Unicode true - v120_xp + v140_xp Application Unicode true - v110 + v140 Application Unicode - v110 + v140 diff --git a/od-win32/parser.h b/od-win32/parser.h index 367ad527..76ab8c62 100644 --- a/od-win32/parser.h +++ b/od-win32/parser.h @@ -20,7 +20,7 @@ void closeser (void); void doserout (void); void closeprinter (void); void flushprinter (void); -int checkserwrite (void); +int checkserwrite (int spaceneeded); void serialuartbreak (int); void shmem_serial_delete(void); diff --git a/od-win32/prowizard/prowizard.vcxproj b/od-win32/prowizard/prowizard.vcxproj index 6af03a6b..910aa102 100644 --- a/od-win32/prowizard/prowizard.vcxproj +++ b/od-win32/prowizard/prowizard.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -30,41 +30,42 @@ {8627DA33-98D1-4F60-B404-ECCEE0EE7BF9} prowizard Win32Proj + 8.1 StaticLibrary Unicode false - v120_xp + v140_xp StaticLibrary Unicode false - v110 + v140_xp StaticLibrary Unicode - v110 + v140 StaticLibrary Unicode true - v120 + v140 StaticLibrary Unicode true - v110 + v140 StaticLibrary Unicode - v110 + v140 diff --git a/od-win32/resources/resource.h b/od-win32/resources/resource.h index 9b7e1944..1059e09c 100644 --- a/od-win32/resources/resource.h +++ b/od-win32/resources/resource.h @@ -1169,6 +1169,7 @@ #define IDC_DF1WPTEXTQ 1794 #define IDC_RTG_Z2Z3 1794 #define IDC_RTG_BUFFERCNT 1795 +#define IDC_PATHS_RECURSIVEROMS 1795 #define IDC_RTG_VBINTERRUPT 1796 #define IDC_INPUTMAPLIST 1797 #define IDC_RTG_HWSPRITE 1797 diff --git a/od-win32/resources/winuae.rc b/od-win32/resources/winuae.rc index e33844ea..b9faeb86 100644 --- a/od-win32/resources/winuae.rc +++ b/od-win32/resources/winuae.rc @@ -1,7 +1,7 @@ // Microsoft Visual C++ generated resource script. // -#include "resource.h" #include "winres.h" +#include "resource.h" ///////////////////////////////////////////////////////////////////////////// // English resources @@ -699,7 +699,7 @@ BEGIN CONTROL "Genlock connected [] Allow boot sequence to detect genlock. Genlock is not emulated.",IDC_GENLOCK, "Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,234,42,150,10 CTEXT "External display hardware:",IDC_STATIC,228,59,117,15,SS_CENTERIMAGE - COMBOBOX IDC_MONITOREMU,238,78,98,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_MONITOREMU,238,78,147,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Collision Level",IDC_STATIC,1,116,393,48 CONTROL "None [] Collision hardware emulation disabled.",IDC_COLLISION0, "Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,47,132,101,10 @@ -951,7 +951,7 @@ IDD_PATHS DIALOGEX 0, 0, 396, 303 STYLE DS_LOCALEDIT | DS_SETFONT | DS_3DLOOK | DS_CONTROL | WS_CHILD FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN - LTEXT "System ROMs:",IDC_PATHS_ROML,3,2,260,8,SS_CENTERIMAGE + LTEXT "System ROMs:",IDC_PATHS_ROML,3,2,167,8,SS_CENTERIMAGE EDITTEXT IDC_PATHS_ROM,3,13,377,15,ES_AUTOHSCROLL PUSHBUTTON "...",IDC_PATHS_ROMS,384,13,11,15 LTEXT "Configuration files:",IDC_PATHS_CONFIGL,3,32,164,8,SS_CENTERIMAGE @@ -989,6 +989,7 @@ BEGIN CONTROL "Portable mode",IDC_REGISTRYMODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,303,231,82,11 CONTROL "Use original image's path",IDC_PATHS_SAVEIMAGEORIGINALPATH, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,177,148,197,11 + CONTROL "Scan subfolders",IDC_PATHS_RECURSIVEROMS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,177,1,197,11 END IDD_QUICKSTART DIALOGEX 0, 0, 396, 262 diff --git a/od-win32/screenshot.cpp b/od-win32/screenshot.cpp index de2e1e07..9ae8d546 100644 --- a/od-win32/screenshot.cpp +++ b/od-win32/screenshot.cpp @@ -526,4 +526,4 @@ void screenshot (int mode, int doprepare) screenshotf (_T("c:\\temp\\1.bmp"), 1, 1, 1, &vb); freevidbuffer (&vb); #endif -} +} \ No newline at end of file diff --git a/od-win32/sounddep/sound.cpp b/od-win32/sounddep/sound.cpp index 09fd9692..3d7ed550 100644 --- a/od-win32/sounddep/sound.cpp +++ b/od-win32/sounddep/sound.cpp @@ -38,7 +38,6 @@ #include #include #include -#include #include #include @@ -46,6 +45,8 @@ #include "sounddep/sound.h" +#define USE_XAUDIO 0 + struct sound_dp { // directsound @@ -109,6 +110,7 @@ struct sound_dp int sndbuf; int wasapigoodsize; +#if USE_XAUDIO // xaudio2 #define XA_BUFFERS 8 @@ -121,6 +123,7 @@ struct sound_dp int xabufcnt; int xsamplesplayed; int xextrasamples; +#endif double avg_correct; double cnt_correct; @@ -296,6 +299,7 @@ static void clearbuffer (struct sound_data *sd) clearbuffer_ds (sd); } +#if USE_XAUDIO static void pause_audio_xaudio2 (struct sound_data *sd) { struct sound_dp *s = sd->data; @@ -332,6 +336,7 @@ static void resume_audio_xaudio2 (struct sound_data *sd) if (FAILED (hr)) write_log (_T("XAUDIO2: Start() %08X\n"), hr); } +#endif static void pause_audio_wasapi (struct sound_data *sd) { @@ -501,8 +506,10 @@ void set_volume_sound_device (struct sound_data *sd, int volume, int mute) #endif } else if (sd->devicetype == SOUND_DEVICE_PA) { s->pavolume = volume; +#if USE_XAUDIO } else if (sd->devicetype == SOUND_DEVICE_XAUDIO2) { s->xmaster->SetVolume (mute ? 0.0 : (float)(100 - volume) / 100.0); +#endif } else if (sd->devicetype == SOUND_DEVICE_WASAPI_EXCLUSIVE || sd->devicetype == SOUND_DEVICE_WASAPI) { sd->softvolume = -1; hr = s->pAudioVolume->SetMasterVolume (1.0, NULL); @@ -945,6 +952,7 @@ static void setwavfmt (WAVEFORMATEXTENSIBLE *wavfmt, struct sound_data *sd, DWOR wavfmt->Format.nAvgBytesPerSec = wavfmt->Format.nBlockAlign * wavfmt->Format.nSamplesPerSec; } +#if USE_XAUDIO static void close_audio_xaudio2 (struct sound_data *sd) { struct sound_dp *s = sd->data; @@ -1046,6 +1054,7 @@ static int open_audio_xaudio2 (struct sound_data *sd, int index) return 1; } +#endif static void close_audio_wasapi (struct sound_data *sd) { @@ -1483,8 +1492,10 @@ int open_sound_device (struct sound_data *sd, int index, int bufsize, int freq, ret = open_audio_pa (sd, index); else if (type == SOUND_DEVICE_WASAPI || type == SOUND_DEVICE_WASAPI_EXCLUSIVE) ret = open_audio_wasapi (sd, index, type == SOUND_DEVICE_WASAPI_EXCLUSIVE); +#if USE_XAUDIO else if (type == SOUND_DEVICE_XAUDIO2) ret = open_audio_xaudio2 (sd, index); +#endif sd->samplesize = sd->channels * 2; sd->sndbufframes = sd->sndbufsize / sd->samplesize; return ret; @@ -1500,8 +1511,10 @@ void close_sound_device (struct sound_data *sd) close_audio_pa (sd); else if (sd->devicetype == SOUND_DEVICE_WASAPI || sd->devicetype == SOUND_DEVICE_WASAPI_EXCLUSIVE) close_audio_wasapi (sd); +#if USE_XAUDIO else if (sd->devicetype == SOUND_DEVICE_XAUDIO2) close_audio_xaudio2 (sd); +#endif xfree (sd->data); sd->data = NULL; } @@ -1516,8 +1529,10 @@ void pause_sound_device (struct sound_data *sd) pause_audio_pa (sd); else if (sd->devicetype == SOUND_DEVICE_WASAPI || sd->devicetype == SOUND_DEVICE_WASAPI_EXCLUSIVE) pause_audio_wasapi (sd); +#if USE_XAUDIO else if (sd->devicetype == SOUND_DEVICE_XAUDIO2) pause_audio_xaudio2 (sd); +#endif } void resume_sound_device (struct sound_data *sd) { @@ -1529,8 +1544,10 @@ void resume_sound_device (struct sound_data *sd) resume_audio_pa (sd); else if (sd->devicetype == SOUND_DEVICE_WASAPI || sd->devicetype == SOUND_DEVICE_WASAPI_EXCLUSIVE) resume_audio_wasapi (sd); +#if USE_XAUDIO else if (sd->devicetype == SOUND_DEVICE_XAUDIO2) resume_audio_xaudio2 (sd); +#endif sd->paused = 0; } @@ -1891,6 +1908,7 @@ int get_offset_sound_device (struct sound_data *sd) } +#if USE_XAUDIO static void finish_sound_buffer_xaudio2 (struct sound_data *sd, uae_u16 *sndbuffer) { struct sound_dp *s = sd->data; @@ -1939,8 +1957,8 @@ static void finish_sound_buffer_xaudio2 (struct sound_data *sd, uae_u16 *sndbuff } s->xsamplesplayed += sd->sndbufframes; s->xabufcnt = (s->xabufcnt + 1) & (XA_BUFFERS - 1); - } +#endif static void finish_sound_buffer_wasapi (struct sound_data *sd, uae_u16 *sndbuffer) { @@ -2218,8 +2236,10 @@ void send_sound (struct sound_data *sd, uae_u16 *sndbuffer) finish_sound_buffer_pa (sd, sndbuffer); else if (type == SOUND_DEVICE_WASAPI || type == SOUND_DEVICE_WASAPI_EXCLUSIVE) finish_sound_buffer_wasapi (sd, sndbuffer); +#if USE_XAUDIO else if (type == SOUND_DEVICE_XAUDIO2) finish_sound_buffer_xaudio2 (sd, sndbuffer); +#endif } void finish_sound_buffer (void) @@ -2428,6 +2448,7 @@ static void OpenALEnumerate (struct sound_device **sds, const char *pDeviceNames } } +#if USE_XAUDIO static void xaudioenumerate (struct sound_device **sds) { IXAudio2 *xaudio2 = NULL; @@ -2462,6 +2483,7 @@ static void xaudioenumerate (struct sound_device **sds) } xaudio2->Release(); } +#endif #define PORTAUDIO 1 #if PORTAUDIO @@ -2527,8 +2549,10 @@ int enumerate_sound_devices (void) DirectSoundCaptureEnumerate ((LPDSENUMCALLBACK)DSEnumProc, record_devices); if (os_vista && (sounddrivermask & SOUNDDRIVER_WASAPI)) wasapi_enum (sound_devices); +#if USE_XAUDIO if (sounddrivermask & SOUNDDRIVE_XAUDIO2) xaudioenumerate (sound_devices); +#endif if (sounddrivermask & SOUNDDRIVER_OPENAL) { __try { if (isdllversion (_T("openal32.dll"), 6, 14, 357, 22)) { diff --git a/od-win32/srcrelease.cmd b/od-win32/srcrelease.cmd index 37722c29..b8f4af50 100644 --- a/od-win32/srcrelease.cmd +++ b/od-win32/srcrelease.cmd @@ -124,23 +124,24 @@ rm -rf fullrelease rm -rf test cd .. -cd winuae_msvc +cd winuae_msvc10 rm -rf debug rm -rf release rm -rf fullrelease +rm -rf ipch rm -rf test +rm -rf x64 cd .. -cd winuae_msvc10 +cd winuae_msvc11 rm -rf debug rm -rf release rm -rf fullrelease -rm -rf ipch rm -rf test rm -rf x64 cd .. -cd winuae_msvc11 +cd winuae_msvc14 rm -rf debug rm -rf release rm -rf fullrelease diff --git a/od-win32/uaeunp/uaeunp.vcxproj b/od-win32/uaeunp/uaeunp.vcxproj index 759de7b5..17086f14 100644 --- a/od-win32/uaeunp/uaeunp.vcxproj +++ b/od-win32/uaeunp/uaeunp.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -24,18 +24,18 @@ Application Unicode true - v120 + v140 Application Unicode true - v110 + v140 Application Unicode - v120 + v140 diff --git a/od-win32/unpackers/unpackers.vcxproj b/od-win32/unpackers/unpackers.vcxproj index 71634aec..dfb2ae71 100644 --- a/od-win32/unpackers/unpackers.vcxproj +++ b/od-win32/unpackers/unpackers.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -36,41 +36,41 @@ StaticLibrary true Unicode - v110 + v140 StaticLibrary true Unicode - v110 + v140 StaticLibrary false false Unicode - v120_xp + v140_xp StaticLibrary false false Unicode - v110 + v140 StaticLibrary false true Unicode - v110 + v140 StaticLibrary false true Unicode - v110 + v140 diff --git a/od-win32/win32.cpp b/od-win32/win32.cpp index beac687b..c759f469 100644 --- a/od-win32/win32.cpp +++ b/od-win32/win32.cpp @@ -10,6 +10,7 @@ //#define MEMDEBUG #define MOUSECLIP_LOG 0 #define MOUSECLIP_HIDE 1 +#define TOUCH_SUPPORT 1 #include #include @@ -197,6 +198,7 @@ bool winuaelog_temporary_enable; int af_path_2005; int quickstart = 1, configurationcache = 1, relativepaths = 0; int saveimageoriginalpath = 0; +int recursiveromscan = 0; static TCHAR *inipath = NULL; @@ -204,6 +206,15 @@ static int guijoybutton[MAX_JPORTS]; static int guijoyaxis[MAX_JPORTS][4]; static bool guijoychange; +#if TOUCH_SUPPORT +typedef BOOL (CALLBACK* REGISTERTOUCHWINDOW)(HWND, ULONG); +typedef BOOL (CALLBACK* GETTOUCHINPUTINFO)(HTOUCHINPUT, UINT, PTOUCHINPUT, int); +typedef BOOL (CALLBACK* CLOSETOUCHINPUTHANDLE)(HTOUCHINPUT); + +static GETTOUCHINPUTINFO pGetTouchInputInfo; +static CLOSETOUCHINPUTHANDLE pCloseTouchInputHandle; +#endif + int timeend (void) { if (!timeon) @@ -1149,6 +1160,47 @@ static void add_media_insert_queue(HWND hwnd, const TCHAR *drvname, int retrycnt } } +#if TOUCH_SUPPORT +static int touch_touched; +static DWORD touch_time; + +static void processtouch(HWND hwnd, WPARAM wParam, LPARAM lParam) +{ + if (!pGetTouchInputInfo || !pCloseTouchInputHandle) + return; + UINT cInputs = LOWORD(wParam); + PTOUCHINPUT pInputs = new TOUCHINPUT[cInputs]; + if (NULL != pInputs) { + if (pGetTouchInputInfo((HTOUCHINPUT)lParam, cInputs, pInputs, sizeof(TOUCHINPUT))) { + for (int i = 0; i < cInputs; i++) { + PTOUCHINPUT ti = &pInputs[i]; + //write_log(_T("ID=%08x FLAGS=%08x MASK=%08x X=%d Y=%d \n"), ti->dwID, ti->dwFlags, ti->dwMask, ti->x / 100, ti->y / 100); + if (ti->dwFlags & TOUCHEVENTF_PRIMARY) { + int x = ti->x / 100; + int y = ti->y / 100; + if (x > 20 || y > 20) { + touch_touched = 0; + } else { + if (ti->dwFlags & TOUCHEVENTF_DOWN) { + touch_touched = 1; + touch_time = ti->dwTime; + } + if (ti->dwFlags & TOUCHEVENTF_UP) { + if (touch_touched && ti->dwTime >= touch_time + 3 * 1000) { + inputdevice_add_inputcode(AKS_ENTERGUI, 1); + } + touch_touched = 0; + } + } + } + } + pCloseTouchInputHandle((HTOUCHINPUT)lParam); + } + delete [] pInputs; + } +} +#endif + #define MSGDEBUG 1 static LRESULT CALLBACK AmigaWindowProc (HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) @@ -1755,6 +1807,12 @@ static LRESULT CALLBACK AmigaWindowProc (HWND hWnd, UINT message, WPARAM wParam, return 0; } +#if TOUCH_SUPPORT + case WM_TOUCH: + processtouch(hWnd, wParam, lParam); + break; +#endif + default: break; } @@ -1860,6 +1918,9 @@ static LRESULT CALLBACK MainWindowProc (HWND hWnd, UINT message, WPARAM wParam, case WT_PACKET: case WM_WTSSESSION_CHANGE: case WM_TIMER: +#if TOUCH_SUPPORT + case WM_TOUCH: +#endif return AmigaWindowProc (hWnd, message, wParam, lParam); #if 0 case WM_DISPLAYCHANGE: @@ -4483,19 +4544,28 @@ static void WIN32_HandleRegistryStuff (void) sounddrivermask = 3; regsetint (NULL, _T("SoundDriverMask"), sounddrivermask); } + + if (regexists (NULL, _T("RecursiveROMScan"))) + regqueryint (NULL, _T("RecursiveROMScan"), &recursiveromscan); + else + regsetint (NULL, _T("RecursiveROMScan"), recursiveromscan); + if (regexists (NULL, _T("ConfigurationCache"))) regqueryint (NULL, _T("ConfigurationCache"), &configurationcache); else regsetint (NULL, _T("ConfigurationCache"), configurationcache); + if (regexists (NULL, _T("SaveImageOriginalPath"))) regqueryint (NULL, _T("SaveImageOriginalPath"), &saveimageoriginalpath); else regsetint (NULL, _T("SaveImageOriginalPath"), saveimageoriginalpath); + if (regexists (NULL, _T("RelativePaths"))) regqueryint (NULL, _T("RelativePaths"), &relativepaths); else regsetint (NULL, _T("RelativePaths"), relativepaths); + regqueryint (NULL, _T("QuickStartMode"), &quickstart); reopen_console (); fetch_path (_T("ConfigurationPath"), path, sizeof (path) / sizeof (TCHAR)); @@ -4625,7 +4695,7 @@ static int dxdetect (void) #endif } -int os_admin, os_64bit, os_win7, os_vista, cpu_number; +int os_admin, os_64bit, os_win7, os_vista, cpu_number, os_touch; static int isadminpriv (void) { @@ -4720,6 +4790,14 @@ static int osdetect (void) } } + if (os_win7) { + int v = GetSystemMetrics(SM_DIGITIZER); + if (v & NID_READY) { + if (v & (NID_INTEGRATED_TOUCH | NID_INTEGRATED_PEN)) + os_touch = 1; + } + } + return 1; } @@ -6142,6 +6220,27 @@ void addnotifications (HWND hwnd, int remove, int isgui) } } +void registertouch(HWND hwnd) +{ +#if TOUCH_SUPPORT + REGISTERTOUCHWINDOW pRegisterTouchWindow; + + if (!os_touch) + return; + pRegisterTouchWindow = (REGISTERTOUCHWINDOW)GetProcAddress( + GetModuleHandle (_T("user32.dll")), "RegisterTouchWindow"); + pGetTouchInputInfo = (GETTOUCHINPUTINFO)GetProcAddress( + GetModuleHandle (_T("user32.dll")), "GetTouchInputInfo"); + pCloseTouchInputHandle = (CLOSETOUCHINPUTHANDLE)GetProcAddress( + GetModuleHandle (_T("user32.dll")), "CloseTouchInputHandle"); + if (!pRegisterTouchWindow || !pGetTouchInputInfo || !pCloseTouchInputHandle) + return; + if (!pRegisterTouchWindow(hwnd, 0)) { + write_log(_T("RegisterTouchWindow error: %d\n"), GetLastError()); + } +#endif +} + void systray (HWND hwnd, int remove) { NOTIFYICONDATA nid; diff --git a/od-win32/win32.h b/od-win32/win32.h index a68618fa..a37b4ae5 100644 --- a/od-win32/win32.h +++ b/od-win32/win32.h @@ -20,12 +20,12 @@ #define LANG_DLL_FULL_VERSION_MATCH 1 #if WINUAEPUBLICBETA -#define WINUAEBETA _T("16") +#define WINUAEBETA _T("17") #else #define WINUAEBETA _T("") #endif -#define WINUAEDATE MAKEBD(2015, 4, 18) +#define WINUAEDATE MAKEBD(2015, 5, 2) //#define WINUAEEXTRA _T("AmiKit Preview") //#define WINUAEEXTRA _T("Amiga Forever Edition") @@ -91,11 +91,11 @@ extern int sound_available; extern int framecnt; extern TCHAR VersionStr[256]; extern TCHAR BetaStr[64]; -extern int os_admin, os_64bit, os_vista, os_win7, cpu_number; +extern int os_admin, os_64bit, os_vista, os_win7, cpu_number, os_touch; extern OSVERSIONINFO osVersion; extern int paraport_mask; extern int gui_active; -extern int quickstart, configurationcache, saveimageoriginalpath, relativepaths; +extern int quickstart, configurationcache, saveimageoriginalpath, relativepaths, recursiveromscan; extern HKEY hWinUAEKey; extern int screen_is_picasso; @@ -139,6 +139,7 @@ extern void send_tablet (int x, int y, int z, int pres, uae_u32 buttons, int fla extern void send_tablet_proximity (int); void addnotifications (HWND hwnd, int remove, int isgui); +void registertouch(HWND hwnd); int win32_hardfile_media_change (const TCHAR *drvname, int inserted); extern int CheckRM (const TCHAR *DriveName); void systray (HWND hwnd, int remove); diff --git a/od-win32/win32gfx.cpp b/od-win32/win32gfx.cpp index f1e2134d..0226c6e6 100644 --- a/od-win32/win32gfx.cpp +++ b/od-win32/win32gfx.cpp @@ -2811,6 +2811,7 @@ static void createstatuswindow (void) LocalUnlock (hloc); LocalFree (hloc); } + registertouch(hStatusWnd); } #if 0 @@ -4065,6 +4066,9 @@ static int create_windows_2 (void) hMainWnd = hAmigaWnd; } + registertouch(hAmigaWnd); + registertouch(hMainWnd); + updatewinrect (true); GetWindowRect (hMainWnd, &mainwin_rect); if (dxfs || d3dfs) diff --git a/od-win32/win32gui.cpp b/od-win32/win32gui.cpp index f3be5b34..c80d02bb 100644 --- a/od-win32/win32gui.cpp +++ b/od-win32/win32gui.cpp @@ -21,7 +21,6 @@ #include #include #include -#include #include #include #include @@ -180,7 +179,7 @@ static void addaspectratios (HWND hDlg, int id) } } -static int scsiromselected = -1; +static int scsiromselected = 0; static int scsiromselectednum = 0; #define Error(x) MessageBox (NULL, (x), _T("WinUAE Error"), MB_OK) @@ -1803,7 +1802,7 @@ static void show_rom_list (void) free (p); } -static int scan_roms_2 (UAEREG *fkey, const TCHAR *path, bool deepscan) +static int scan_roms_2 (UAEREG *fkey, const TCHAR *path, bool deepscan, int level) { TCHAR buf[MAX_DPATH]; WIN32_FIND_DATA find_data; @@ -1827,6 +1826,13 @@ static int scan_roms_2 (UAEREG *fkey, const TCHAR *path, bool deepscan) if (!(find_data.dwFileAttributes & (FILE_ATTRIBUTE_DIRECTORY |FILE_ATTRIBUTE_SYSTEM)) && find_data.nFileSizeLow < 10000000) { if (scan_rom (tmppath, fkey, deepscan)) ret = 1; + } else if (deepscan && (find_data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) { + if (recursiveromscan < 0 || recursiveromscan > level) { + if (_tcsicmp(find_data.cFileName, _T(".")) && _tcsicmp(find_data.cFileName, _T(".."))) { + _tcscat(tmppath, _T("\\")); + scan_roms_2(fkey, tmppath, deepscan, level + 1); + } + } } if (!scan_rom_hook (NULL, 0) || FindNextFile (handle, &find_data) == 0) { FindClose (handle); @@ -1856,7 +1862,7 @@ static int scan_roms_3 (UAEREG *fkey, TCHAR **paths, const TCHAR *path) if (paths[i] && !_tcsicmp (paths[i], pathp)) return ret; } - ret = scan_roms_2 (fkey, pathp, deepscan); + ret = scan_roms_2 (fkey, pathp, deepscan, 0); for (i = 0; i < MAX_ROM_PATHS; i++) { if (!paths[i]) { paths[i] = my_strdup(pathp); @@ -5309,6 +5315,7 @@ static void resetregistry (void) regdelete (NULL, _T("QuickStartConfiguration")); regdelete (NULL, _T("QuickStartCompatibility")); regdelete (NULL, _T("QuickStartHostConfig")); + regdelete (NULL, _T("RecursiveROMScan")); regdelete (NULL, _T("ConfigurationCache")); regdelete (NULL, _T("SaveImageOriginalPath")); regdelete (NULL, _T("RelativePaths")); @@ -5485,6 +5492,7 @@ static INT_PTR CALLBACK PathsDlgProc (HWND hDlg, UINT msg, WPARAM wParam, LPARAM setac (hDlg, IDC_PATHS_SAVEIMAGE); setac (hDlg, IDC_PATHS_AVIOUTPUT); setac (hDlg, IDC_PATHS_RIP); + CheckDlgButton(hDlg, IDC_PATHS_RECURSIVEROMS, recursiveromscan); CheckDlgButton(hDlg, IDC_PATHS_CONFIGCACHE, configurationcache); CheckDlgButton(hDlg, IDC_PATHS_SAVEIMAGEORIGINALPATH, saveimageoriginalpath); CheckDlgButton(hDlg, IDC_PATHS_RELATIVE, relativepaths); @@ -5715,6 +5723,10 @@ static INT_PTR CALLBACK PathsDlgProc (HWND hDlg, UINT msg, WPARAM wParam, LPARAM case IDC_RESETDISKHISTORY: reset_disk_history (); break; + case IDC_PATHS_RECURSIVEROMS: + recursiveromscan = ischecked (hDlg, IDC_PATHS_RECURSIVEROMS) ? 2 : 0; + regsetint (NULL, _T("RecursiveROMScan"), recursiveromscan); + break; case IDC_PATHS_CONFIGCACHE: configurationcache = ischecked (hDlg, IDC_PATHS_CONFIGCACHE) ? 1 : 0; regsetint (NULL, _T("ConfigurationCache"), configurationcache); @@ -7332,10 +7344,13 @@ static INT_PTR CALLBACK ChipsetDlgProc (HWND hDlg, UINT msg, WPARAM wParam, LPAR SendDlgItemMessage (hDlg, IDC_MONITOREMU, CB_ADDSTRING, 0, (LPARAM)_T("-")); WIN32GUI_LoadUIString(IDS_AUTODETECT, buffer, sizeof buffer / sizeof (TCHAR)); SendDlgItemMessage (hDlg, IDC_MONITOREMU, CB_ADDSTRING, 0, (LPARAM)buffer); - SendDlgItemMessage (hDlg, IDC_MONITOREMU, CB_ADDSTRING, 0, (LPARAM)_T("A2024")); - SendDlgItemMessage (hDlg, IDC_MONITOREMU, CB_ADDSTRING, 0, (LPARAM)_T("Graffiti")); - SendDlgItemMessage (hDlg, IDC_MONITOREMU, CB_ADDSTRING, 0, (LPARAM)_T("HAM-E")); - SendDlgItemMessage (hDlg, IDC_MONITOREMU, CB_ADDSTRING, 0, (LPARAM)_T("HAM-E Plus")); + SendDlgItemMessage (hDlg, IDC_MONITOREMU, CB_ADDSTRING, 0, (LPARAM)_T("Commodore A2024")); + SendDlgItemMessage (hDlg, IDC_MONITOREMU, CB_ADDSTRING, 0, (LPARAM)_T("Individual Computers Graffiti")); + SendDlgItemMessage (hDlg, IDC_MONITOREMU, CB_ADDSTRING, 0, (LPARAM)_T("Black Belt Systems HAM-E")); + SendDlgItemMessage (hDlg, IDC_MONITOREMU, CB_ADDSTRING, 0, (LPARAM)_T("Black Belt Systems HAM-E Plus")); + SendDlgItemMessage (hDlg, IDC_MONITOREMU, CB_ADDSTRING, 0, (LPARAM)_T("Newtronic Video DAC 18")); + SendDlgItemMessage (hDlg, IDC_MONITOREMU, CB_ADDSTRING, 0, (LPARAM)_T("Archos AVideo 12")); + //SendDlgItemMessage (hDlg, IDC_MONITOREMU, CB_ADDSTRING, 0, (LPARAM)_T("Archos AVideo 24")); //SendDlgItemMessage (hDlg, IDC_MONITOREMU, CB_ADDSTRING, 0, (LPARAM)_T("DCTV")); #ifndef AGA @@ -10911,19 +10926,26 @@ static void inithdcontroller (HWND hDlg, int ctype, int ctype_unit, int devtype) gui_set_string_cursor(hdmenutable, hDlg, IDC_HDF_CONTROLLER, ctype + ctype_unit * HD_CONTROLLER_NEXT_UNIT); SendDlgItemMessage (hDlg, IDC_HDF_CONTROLLER_UNIT, CB_RESETCONTENT, 0, 0); - if (ctype >= HD_CONTROLLER_TYPE_IDE_FIRST && ctype <= HD_CONTROLLER_TYPE_SCSI_LAST) { + if (ctype >= HD_CONTROLLER_TYPE_IDE_FIRST && ctype <= HD_CONTROLLER_TYPE_IDE_LAST) { + const struct expansionromtype *ert = get_unit_expansion_rom(ctype); + SendDlgItemMessage (hDlg, IDC_HDF_CONTROLLER_UNIT, CB_ADDSTRING, 0, (LPARAM)_T("0")); + SendDlgItemMessage (hDlg, IDC_HDF_CONTROLLER_UNIT, CB_ADDSTRING, 0, (LPARAM)_T("1")); + if (!ert || (ert->deviceflags & EXPANSIONTYPE_IDE_PORT_DOUBLED)) { + SendDlgItemMessage (hDlg, IDC_HDF_CONTROLLER_UNIT, CB_ADDSTRING, 0, (LPARAM)_T("2")); + SendDlgItemMessage (hDlg, IDC_HDF_CONTROLLER_UNIT, CB_ADDSTRING, 0, (LPARAM)_T("3")); + } + ew(hDlg, IDC_HDF_CONTROLLER_UNIT, TRUE); + } else if (ctype >= HD_CONTROLLER_TYPE_SCSI_FIRST && ctype <= HD_CONTROLLER_TYPE_SCSI_LAST) { SendDlgItemMessage (hDlg, IDC_HDF_CONTROLLER_UNIT, CB_ADDSTRING, 0, (LPARAM)_T("0")); SendDlgItemMessage (hDlg, IDC_HDF_CONTROLLER_UNIT, CB_ADDSTRING, 0, (LPARAM)_T("1")); SendDlgItemMessage (hDlg, IDC_HDF_CONTROLLER_UNIT, CB_ADDSTRING, 0, (LPARAM)_T("2")); SendDlgItemMessage (hDlg, IDC_HDF_CONTROLLER_UNIT, CB_ADDSTRING, 0, (LPARAM)_T("3")); - if (ctype >= HD_CONTROLLER_TYPE_SCSI_FIRST && ctype <= HD_CONTROLLER_TYPE_SCSI_LAST) { - SendDlgItemMessage (hDlg, IDC_HDF_CONTROLLER_UNIT, CB_ADDSTRING, 0, (LPARAM)_T("4")); - SendDlgItemMessage (hDlg, IDC_HDF_CONTROLLER_UNIT, CB_ADDSTRING, 0, (LPARAM)_T("5")); - SendDlgItemMessage (hDlg, IDC_HDF_CONTROLLER_UNIT, CB_ADDSTRING, 0, (LPARAM)_T("6")); - const struct expansionromtype *ert = get_unit_expansion_rom(ctype); - if (devtype == UAEDEV_HDF && ert && !_tcscmp(ert->name, _T("a2091"))) - SendDlgItemMessage(hDlg, IDC_HDF_CONTROLLER_UNIT, CB_ADDSTRING, 0, (LPARAM)_T("XT")); - } + SendDlgItemMessage (hDlg, IDC_HDF_CONTROLLER_UNIT, CB_ADDSTRING, 0, (LPARAM)_T("4")); + SendDlgItemMessage (hDlg, IDC_HDF_CONTROLLER_UNIT, CB_ADDSTRING, 0, (LPARAM)_T("5")); + SendDlgItemMessage (hDlg, IDC_HDF_CONTROLLER_UNIT, CB_ADDSTRING, 0, (LPARAM)_T("6")); + const struct expansionromtype *ert = get_unit_expansion_rom(ctype); + if (devtype == UAEDEV_HDF && ert && !_tcscmp(ert->name, _T("a2091"))) + SendDlgItemMessage(hDlg, IDC_HDF_CONTROLLER_UNIT, CB_ADDSTRING, 0, (LPARAM)_T("XT")); ew(hDlg, IDC_HDF_CONTROLLER_UNIT, TRUE); } else { ew(hDlg, IDC_HDF_CONTROLLER_UNIT, FALSE); diff --git a/od-win32/win32gui_extra.cpp b/od-win32/win32gui_extra.cpp index 7b915b47..c61fb801 100644 --- a/od-win32/win32gui_extra.cpp +++ b/od-win32/win32gui_extra.cpp @@ -1,21 +1,7 @@ #include #include #include -#include -#include -#include -#include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include "sysconfig.h" #include "sysdeps.h" @@ -216,7 +202,7 @@ static INT_PTR CALLBACK DummyProc (HWND hDlg, UINT msg, WPARAM wParam, LPARAM lP extern int full_property_sheet; -static struct newresource *scaleresource2 (struct newresource *res, HWND parent, int resize, int fullscreen, DWORD exstyle, bool test) +static struct newresource *scaleresource2 (struct newresource *res, HWND parent, int resize, int fullscreen, DWORD exstyle) { DLGTEMPLATEEX *d, *s; DLGTEMPLATEEX_END *d2, *s2; @@ -248,12 +234,6 @@ static struct newresource *scaleresource2 (struct newresource *res, HWND parent, int width = d->cx; int height = d->cy; - if (test) { - // HACK! far enough to be invisible.. - d->x = 20000; - d->y = 20000; - } - if (resize > 0) { d->style &= ~DS_MODALFRAME; d->style |= WS_THICKFRAME; @@ -261,12 +241,11 @@ static struct newresource *scaleresource2 (struct newresource *res, HWND parent, d->style |= DS_MODALFRAME; d->style &= ~WS_THICKFRAME; } - if (fullscreen) { + if (fullscreen > 0) { //d->style |= SW_MAXIMIZE; d->style |= WS_THICKFRAME; } else { - if (full_property_sheet) - d->style |= WS_MINIMIZEBOX; + d->style |= WS_MINIMIZEBOX; } d->exStyle |= exstyle; @@ -322,7 +301,7 @@ static struct newresource *scaleresource2 (struct newresource *res, HWND parent, struct newresource *scaleresource (struct newresource *res, HWND parent, int resize, int fullscreen, DWORD exstyle) { - return scaleresource2(res, parent, resize, fullscreen, exstyle, false); + return scaleresource2(res, parent, resize, fullscreen, exstyle); } void freescaleresource (struct newresource *ns) @@ -475,12 +454,7 @@ static void getbaseunits (int fullscreen) write_log (_T("getbaseunits fail!\n")); abort(); } - // dialog is visible before WM_INITDIALOG in Windows 10! - // even when dialog does not have visible flag! - // last confirmed on build 10041 - // hopefully this gets fixed before RTM.. - bool win10bughack = osVersion.dwMajorVersion == 6 && osVersion.dwMinorVersion == 3; - nr2 = scaleresource2(nr, NULL, -1, 0, 0, win10bughack); + nr2 = scaleresource2(nr, NULL, -1, 0, 0); hwnd = CreateDialogIndirect (nr2->inst, nr2->resource, NULL, TestProc); if (hwnd) { DestroyWindow (hwnd); diff --git a/od-win32/winuae_msvc/winuae_msvc.sln b/od-win32/winuae_msvc/winuae_msvc.sln deleted file mode 100644 index 8a62d2b5..00000000 --- a/od-win32/winuae_msvc/winuae_msvc.sln +++ /dev/null @@ -1,137 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winuae", "winuae_msvc.vcproj", "{4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gencpu", "..\gencpu_msvc\gencpu_msvc.vcproj", "{DEF7ACF7-050E-4069-BB99-5B5D93F60521}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gencomp", "..\gencomp_msvc\gencomp_msvc.vcproj", "{54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "genblitter", "..\genblitter_msvc\genblitter_msvc.vcproj", "{765B0AF0-B8D3-4998-89AF-D6F939E1CD18}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "build68k", "..\build68k_msvc\build68k_msvc.vcproj", "{AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "singlefilehelper", "..\singlefilehelper\singlefilehelper.vcproj", "{DAF2EB1A-546A-41B3-9755-187562C01E3C}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "resourcedll", "..\resourcedll\resourcedll.vcproj", "{C85288FB-A035-42CA-B5FB-8E6214319E97}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fdrawcmd", "..\fdrawcmd\fdrawcmd.vcproj", "{960E83B5-9118-4EBD-AF50-18EFC1DC764B}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ipctester", "..\ipctester\ipctester.vcproj", "{79BDABE6-5308-4D64-8884-A5A35909D8D3}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "genlinetoscr", "..\genlinetoscr_msvc\genlinetoscr_msvc.vcproj", "{E9F73E11-A463-45C6-A733-2BED75852BA1}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "decompress", "..\decompress\decompress.vcproj", "{38FAC3FB-A2B7-453F-8A6A-73B97201BB04}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "uaeunp", "..\uaeunp\uaeunp.vcproj", "{6181E50C-5F32-42DC-BEF6-827AA8A5429D}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "consolewrapper", "..\consolewrapper\consolewrapper.vcproj", "{2C44DD04-F5D6-4CC3-B0D6-1F4E51A0D962}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "prowizard", "..\prowizard\prowizard.vcproj", "{8627DA33-98D1-4F60-B404-ECCEE0EE7BF9}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - FullRelease|Win32 = FullRelease|Win32 - FullRelease|x64 = FullRelease|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Debug|Win32.ActiveCfg = Debug|Win32 - {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Debug|Win32.Build.0 = Debug|Win32 - {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Debug|x64.ActiveCfg = Debug|x64 - {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Debug|x64.Build.0 = Debug|x64 - {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.FullRelease|Win32.ActiveCfg = FullRelease|Win32 - {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.FullRelease|Win32.Build.0 = FullRelease|Win32 - {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.FullRelease|x64.ActiveCfg = FullRelease|x64 - {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.FullRelease|x64.Build.0 = FullRelease|x64 - {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Release|Win32.ActiveCfg = Release|Win32 - {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Release|Win32.Build.0 = Release|Win32 - {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Release|x64.ActiveCfg = Release|x64 - {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Release|x64.Build.0 = Release|x64 - {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.Debug|Win32.ActiveCfg = Debug|Win32 - {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.Debug|x64.ActiveCfg = Debug|Win32 - {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.FullRelease|Win32.ActiveCfg = FullRelease|Win32 - {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.FullRelease|x64.ActiveCfg = FullRelease|Win32 - {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.Release|Win32.ActiveCfg = Release|Win32 - {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.Release|x64.ActiveCfg = Release|Win32 - {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.Debug|Win32.ActiveCfg = Debug|Win32 - {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.Debug|x64.ActiveCfg = Debug|Win32 - {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.FullRelease|Win32.ActiveCfg = FullRelease|Win32 - {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.FullRelease|x64.ActiveCfg = FullRelease|Win32 - {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.Release|Win32.ActiveCfg = Release|Win32 - {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.Release|x64.ActiveCfg = Release|Win32 - {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.Debug|Win32.ActiveCfg = Debug|Win32 - {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.Debug|x64.ActiveCfg = Debug|Win32 - {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.FullRelease|Win32.ActiveCfg = FullRelease|Win32 - {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.FullRelease|x64.ActiveCfg = FullRelease|Win32 - {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.Release|Win32.ActiveCfg = Release|Win32 - {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.Release|x64.ActiveCfg = Release|Win32 - {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.Debug|Win32.ActiveCfg = Debug|Win32 - {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.Debug|x64.ActiveCfg = Debug|Win32 - {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.FullRelease|Win32.ActiveCfg = FullRelease|Win32 - {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.FullRelease|x64.ActiveCfg = FullRelease|Win32 - {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.Release|Win32.ActiveCfg = Release|Win32 - {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.Release|x64.ActiveCfg = Release|Win32 - {DAF2EB1A-546A-41B3-9755-187562C01E3C}.Debug|Win32.ActiveCfg = Debug|Win32 - {DAF2EB1A-546A-41B3-9755-187562C01E3C}.Debug|x64.ActiveCfg = Debug|Win32 - {DAF2EB1A-546A-41B3-9755-187562C01E3C}.FullRelease|Win32.ActiveCfg = FullRelease|Win32 - {DAF2EB1A-546A-41B3-9755-187562C01E3C}.FullRelease|x64.ActiveCfg = FullRelease|Win32 - {DAF2EB1A-546A-41B3-9755-187562C01E3C}.Release|Win32.ActiveCfg = Release|Win32 - {DAF2EB1A-546A-41B3-9755-187562C01E3C}.Release|x64.ActiveCfg = Release|Win32 - {C85288FB-A035-42CA-B5FB-8E6214319E97}.Debug|Win32.ActiveCfg = Debug|Win32 - {C85288FB-A035-42CA-B5FB-8E6214319E97}.Debug|x64.ActiveCfg = Debug|Win32 - {C85288FB-A035-42CA-B5FB-8E6214319E97}.FullRelease|Win32.ActiveCfg = FullRelease|Win32 - {C85288FB-A035-42CA-B5FB-8E6214319E97}.FullRelease|x64.ActiveCfg = FullRelease|Win32 - {C85288FB-A035-42CA-B5FB-8E6214319E97}.Release|Win32.ActiveCfg = Release|Win32 - {C85288FB-A035-42CA-B5FB-8E6214319E97}.Release|x64.ActiveCfg = Release|Win32 - {960E83B5-9118-4EBD-AF50-18EFC1DC764B}.Debug|Win32.ActiveCfg = Debug|Win32 - {960E83B5-9118-4EBD-AF50-18EFC1DC764B}.Debug|x64.ActiveCfg = Debug|Win32 - {960E83B5-9118-4EBD-AF50-18EFC1DC764B}.FullRelease|Win32.ActiveCfg = FullRelease|Win32 - {960E83B5-9118-4EBD-AF50-18EFC1DC764B}.FullRelease|x64.ActiveCfg = FullRelease|Win32 - {960E83B5-9118-4EBD-AF50-18EFC1DC764B}.Release|Win32.ActiveCfg = Release|Win32 - {960E83B5-9118-4EBD-AF50-18EFC1DC764B}.Release|x64.ActiveCfg = Release|Win32 - {79BDABE6-5308-4D64-8884-A5A35909D8D3}.Debug|Win32.ActiveCfg = Debug|Win32 - {79BDABE6-5308-4D64-8884-A5A35909D8D3}.Debug|x64.ActiveCfg = Debug|Win32 - {79BDABE6-5308-4D64-8884-A5A35909D8D3}.FullRelease|Win32.ActiveCfg = FullRelease|Win32 - {79BDABE6-5308-4D64-8884-A5A35909D8D3}.FullRelease|x64.ActiveCfg = FullRelease|Win32 - {79BDABE6-5308-4D64-8884-A5A35909D8D3}.Release|Win32.ActiveCfg = Release|Win32 - {79BDABE6-5308-4D64-8884-A5A35909D8D3}.Release|x64.ActiveCfg = Release|Win32 - {E9F73E11-A463-45C6-A733-2BED75852BA1}.Debug|Win32.ActiveCfg = Debug|Win32 - {E9F73E11-A463-45C6-A733-2BED75852BA1}.Debug|x64.ActiveCfg = Debug|Win32 - {E9F73E11-A463-45C6-A733-2BED75852BA1}.FullRelease|Win32.ActiveCfg = FullRelease|Win32 - {E9F73E11-A463-45C6-A733-2BED75852BA1}.FullRelease|x64.ActiveCfg = FullRelease|Win32 - {E9F73E11-A463-45C6-A733-2BED75852BA1}.Release|Win32.ActiveCfg = Release|Win32 - {E9F73E11-A463-45C6-A733-2BED75852BA1}.Release|x64.ActiveCfg = Release|Win32 - {38FAC3FB-A2B7-453F-8A6A-73B97201BB04}.Debug|Win32.ActiveCfg = Debug|Win32 - {38FAC3FB-A2B7-453F-8A6A-73B97201BB04}.Debug|x64.ActiveCfg = Debug|Win32 - {38FAC3FB-A2B7-453F-8A6A-73B97201BB04}.FullRelease|Win32.ActiveCfg = Release|Win32 - {38FAC3FB-A2B7-453F-8A6A-73B97201BB04}.FullRelease|x64.ActiveCfg = Release|Win32 - {38FAC3FB-A2B7-453F-8A6A-73B97201BB04}.Release|Win32.ActiveCfg = Release|Win32 - {38FAC3FB-A2B7-453F-8A6A-73B97201BB04}.Release|x64.ActiveCfg = Release|Win32 - {6181E50C-5F32-42DC-BEF6-827AA8A5429D}.Debug|Win32.ActiveCfg = Debug|Win32 - {6181E50C-5F32-42DC-BEF6-827AA8A5429D}.Debug|Win32.Build.0 = Debug|Win32 - {6181E50C-5F32-42DC-BEF6-827AA8A5429D}.Debug|x64.ActiveCfg = Debug|Win32 - {6181E50C-5F32-42DC-BEF6-827AA8A5429D}.FullRelease|Win32.ActiveCfg = Release|Win32 - {6181E50C-5F32-42DC-BEF6-827AA8A5429D}.FullRelease|x64.ActiveCfg = Release|Win32 - {6181E50C-5F32-42DC-BEF6-827AA8A5429D}.Release|Win32.ActiveCfg = Release|Win32 - {6181E50C-5F32-42DC-BEF6-827AA8A5429D}.Release|Win32.Build.0 = Release|Win32 - {6181E50C-5F32-42DC-BEF6-827AA8A5429D}.Release|x64.ActiveCfg = Release|Win32 - {2C44DD04-F5D6-4CC3-B0D6-1F4E51A0D962}.Debug|Win32.ActiveCfg = Debug|Win32 - {2C44DD04-F5D6-4CC3-B0D6-1F4E51A0D962}.Debug|x64.ActiveCfg = Debug|Win32 - {2C44DD04-F5D6-4CC3-B0D6-1F4E51A0D962}.FullRelease|Win32.ActiveCfg = Release|Win32 - {2C44DD04-F5D6-4CC3-B0D6-1F4E51A0D962}.FullRelease|x64.ActiveCfg = Release|Win32 - {2C44DD04-F5D6-4CC3-B0D6-1F4E51A0D962}.Release|Win32.ActiveCfg = Release|Win32 - {2C44DD04-F5D6-4CC3-B0D6-1F4E51A0D962}.Release|x64.ActiveCfg = Release|Win32 - {8627DA33-98D1-4F60-B404-ECCEE0EE7BF9}.Debug|Win32.ActiveCfg = Debug|Win32 - {8627DA33-98D1-4F60-B404-ECCEE0EE7BF9}.Debug|x64.ActiveCfg = Debug|Win32 - {8627DA33-98D1-4F60-B404-ECCEE0EE7BF9}.FullRelease|Win32.ActiveCfg = Release|Win32 - {8627DA33-98D1-4F60-B404-ECCEE0EE7BF9}.FullRelease|x64.ActiveCfg = Release|Win32 - {8627DA33-98D1-4F60-B404-ECCEE0EE7BF9}.Release|Win32.ActiveCfg = Release|Win32 - {8627DA33-98D1-4F60-B404-ECCEE0EE7BF9}.Release|x64.ActiveCfg = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/od-win32/winuae_msvc/winuae_msvc.vcproj b/od-win32/winuae_msvc/winuae_msvc.vcproj deleted file mode 100644 index 04f4cd69..00000000 --- a/od-win32/winuae_msvc/winuae_msvc.vcproj +++ /dev/null @@ -1,1815 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/od-win32/winuae_msvc10/winuae.idc b/od-win32/winuae_msvc10/winuae.idc deleted file mode 100644 index 428a2ec7..00000000 --- a/od-win32/winuae_msvc10/winuae.idc +++ /dev/null @@ -1 +0,0 @@ - diff --git a/od-win32/winuae_msvc11/winuae_msvc.vcxproj b/od-win32/winuae_msvc11/winuae_msvc.vcxproj index 38b72579..6d8cbd7e 100644 --- a/od-win32/winuae_msvc11/winuae_msvc.vcxproj +++ b/od-win32/winuae_msvc11/winuae_msvc.vcxproj @@ -176,6 +176,9 @@ 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) + + false + _DEBUG;%(PreprocessorDefinitions) @@ -188,7 +191,7 @@ %(AdditionalOptions) Disabled ..\..\include;..\..;..\;..\resources;..\osdep;..\sounddep;..\..\prowizard\include;..\..\slirp;..\..\ppc\pearpc;%(AdditionalIncludeDirectories) - WINVER=0x0500;_DEBUG;WIN32_IE=0x0700;WIN32;_CRT_SECURE_NO_WARNINGS;D3D_DEBUG_INFO;UAE;WINUAE;%(PreprocessorDefinitions) + WINVER=0x0601;_DEBUG;WIN32_IE=0x0700;WIN32;_CRT_SECURE_NO_WARNINGS;D3D_DEBUG_INFO;UAE;WINUAE;%(PreprocessorDefinitions) false false false @@ -256,7 +259,7 @@ %(AdditionalOptions) Disabled ..\..\include;..\..;..\;..\resources;..\osdep;..\sounddep;..\..\slirp;..\..\ppc\pearpc;%(AdditionalIncludeDirectories) - WINVER=0x0500;_DEBUG;WIN32_IE=0x0700;WIN32;WIN64;PTR64;UAE;WINUAE;_CRT_SECURE_NO_WARNINGS;D3D_DEBUG_INFO;%(PreprocessorDefinitions) + WINVER=0x0601;_DEBUG;WIN32_IE=0x0700;WIN32;WIN64;PTR64;UAE;WINUAE;_CRT_SECURE_NO_WARNINGS;D3D_DEBUG_INFO;%(PreprocessorDefinitions) Sync EnableFastChecks MultiThreadedDebug @@ -319,7 +322,7 @@ true false ..\..\include;..\..;..\;..\resources;..\osdep;..\sounddep;..\..\prowizard\include;..\..\slirp;..\..\ppc\pearpc;:%(AdditionalIncludeDirectories) - WINVER=0x0500;NDEBUG;_WIN32_IE=0x0700;WIN32;UAE;WINUAE;%(PreprocessorDefinitions) + WINVER=0x0601;NDEBUG;_WIN32_IE=0x0700;WIN32;UAE;WINUAE;%(PreprocessorDefinitions) true Sync Default @@ -397,7 +400,7 @@ false false ..\..\include;..\..;..\;..\resources;..\osdep;..\sounddep;..\..\prowizard\include;..\..\slirp;..\..\ppc\pearpc;%(AdditionalIncludeDirectories) - WINVER=0x0500;_WIN32_IE=0x0700;WIN32;UAE;WINUAE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_IE=0x0700;WIN32;UAE;WINUAE;%(PreprocessorDefinitions) true Sync Default @@ -475,7 +478,7 @@ true false ..\..\include;..\..;..\;..\resources;..\osdep;..\sounddep;..\..\slirp;..\..\ppc\pearpc;..\..\ppc\pearpc;%(AdditionalIncludeDirectories) - WINVER=0x0500;NDEBUG;_WIN32_IE=0x0700;WIN32;WIN64;PTR64;UAE;WINUAE;%(PreprocessorDefinitions) + WINVER=0x0601;NDEBUG;_WIN32_IE=0x0700;WIN32;WIN64;PTR64;UAE;WINUAE;%(PreprocessorDefinitions) true Sync Default @@ -547,7 +550,7 @@ false false ..\..\include;..\..;..\;..\resources;..\osdep;..\sounddep;..\..\slirp;..\..\ppc\pearpc;%(AdditionalIncludeDirectories) - WINVER=0x0500;NDEBUG;_WIN32_IE=0x0700;WIN32;WIN64;PTR64;UAE;WINUAE;%(PreprocessorDefinitions) + WINVER=0x0601;NDEBUG;_WIN32_IE=0x0700;WIN32;WIN64;PTR64;UAE;WINUAE;%(PreprocessorDefinitions) true Sync Default @@ -565,7 +568,7 @@ $(Platform)\$(Configuration)\ Level3 true - Cdecl + FastCall Default 4996;%(DisableSpecificWarnings) %(ForcedIncludeFiles) @@ -618,7 +621,7 @@ true true ..\..\include;..\..;..\;..\resources;..\osdep;..\sounddep;..\..\prowizard\include;..\..\slirp;..\..\ppc\pearpc;%(AdditionalIncludeDirectories) - WINVER=0x0500;NDEBUG;_WIN32_IE=0x0700;WIN32;UAE;WINUAE;%(PreprocessorDefinitions) + WINVER=0x0601;NDEBUG;_WIN32_IE=0x0700;WIN32;UAE;WINUAE;%(PreprocessorDefinitions) true Sync Default @@ -693,7 +696,7 @@ true true ..\..\include;..\..;..\;..\resources;..\osdep;..\sounddep;..\..\slirp;..\..\ppc\pearpc;%(AdditionalIncludeDirectories) - WINVER=0x0500;NDEBUG;_WIN32_IE=0x0700;WIN32;WIN64;PTR64;UAE;WINUAE;%(PreprocessorDefinitions) + WINVER=0x0601;NDEBUG;_WIN32_IE=0x0700;WIN32;WIN64;PTR64;UAE;WINUAE;%(PreprocessorDefinitions) true Sync Default diff --git a/od-win32/winuae_msvc11/winuae_msvc.sln b/od-win32/winuae_msvc14/winuae_msvc.sln similarity index 100% rename from od-win32/winuae_msvc11/winuae_msvc.sln rename to od-win32/winuae_msvc14/winuae_msvc.sln diff --git a/od-win32/winuae_msvc14/winuae_msvc.vcxproj b/od-win32/winuae_msvc14/winuae_msvc.vcxproj new file mode 100644 index 00000000..89f3aeef --- /dev/null +++ b/od-win32/winuae_msvc14/winuae_msvc.vcxproj @@ -0,0 +1,1080 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + FullRelease + Win32 + + + FullRelease + x64 + + + Release + Win32 + + + Release + x64 + + + Test + Win32 + + + Test + x64 + + + + winuae + {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA} + winuae + 8.1 + + + + Application + false + Unicode + true + v140_xp + + + Application + false + Unicode + v140_xp + + + Application + false + Unicode + v140_xp + + + Application + false + Unicode + v140 + + + Application + false + Unicode + true + v140 + + + Application + false + Unicode + v140 + + + Application + false + Unicode + v140 + + + Application + false + Unicode + v140 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30128.1 + d:\amiga\ + $(Configuration)\ + true + true + d:\amiga\ + $(Platform)\$(Configuration)\ + true + true + d:\amiga\ + d:\amiga\ + $(Configuration)\ + $(Configuration)\ + false + false + d:\amiga\ + d:\amiga\ + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + false + false + true + true + d:\amiga\ + $(Configuration)\ + false + true + d:\amiga\ + $(Platform)\$(Configuration)\ + false + true + winuae64 + winuae64 + winuae64 + winuae64 + 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\Include;C:\dev\include;$(IncludePath) + C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Lib\x86;C:\dev\lib;C:\dev\WinDDK\7600.16385.1\lib\win7\i386;$(LibraryPath) + C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Lib\x86;C:\dev\lib;C:\dev\WinDDK\7600.16385.1\lib\win7\i386;$(LibraryPath) + C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Lib\x86;C:\dev\lib;C:\dev\WinDDK\7600.16385.1\lib\win7\i386;$(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\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 + 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\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\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) + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\Debug/winuae_msvc.tlb + + + %(AdditionalOptions) + Disabled + ..\..\include;..\..;..\;..\resources;..\osdep;..\sounddep;..\..\prowizard\include;..\..\slirp;..\..\ppc\pearpc;%(AdditionalIncludeDirectories) + WINVER=0x0500;_DEBUG;WIN32_IE=0x0700;WIN32;_CRT_SECURE_NO_WARNINGS;D3D_DEBUG_INFO;UAE;WINUAE;%(PreprocessorDefinitions) + false + false + false + Sync + EnableFastChecks + MultiThreadedDebug + true + false + .\Debug/winuae_msvc.pch + .\Debug/ + .\Debug/ + .\Debug/ + Level3 + true + EditAndContinue + FastCall + Default + 4996;%(DisableSpecificWarnings) + false + false + %(ForcedIncludeFiles) + true + Disabled + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + /MACHINE:I386 %(AdditionalOptions) + ws2_32.lib;ddraw.lib;dxguid.lib;winmm.lib;comctl32.lib;version.lib;msacm32.lib;dsound.lib;dinput8.lib;d3d9.lib;d3dx9d.lib;winio.lib;setupapi.lib;wininet.lib;dxerr.lib;shlwapi.lib;zlibstat.lib;libpng15.lib;lglcd.lib;wpcap.lib;packet.lib;openal32.lib;portaudio_x86.lib;vfw32.lib;wtsapi32.lib;enet.lib;prowizard.lib;lzmalib.lib;libFLAC_static.lib;Avrt.lib;hid.lib;Iphlpapi.lib;luastatic.lib;libmpeg2_ff.lib;softfloat.lib;%(AdditionalDependencies) + NotSet + $(OutDir)$(TargetName)$(TargetExt) + true + LIBCMT;%(IgnoreSpecificDefaultLibraries) + wpcap.dll;packet.dll;d3dx9_43.dll;openal32.dll;portaudio_x86.dll;ws2_32.dll;msacm32.dll;wtsapi32.dll;dsound.dll;wininet.dll;avrt.dll;ddraw.dll;Iphlpapi.dll;%(DelayLoadDLLs) + true + .\Debug/winuae.pdb + Windows + 2621440 + 2621440 + true + false + + + %(AdditionalLibraryDirectories);$(SolutionDir)\..\lib\ + + + false + + + ../resources/winuae.exe.manifest + true + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + X64 + .\Debug/winuae_msvc.tlb + + + %(AdditionalOptions) + Disabled + ..\..\include;..\..;..\;..\resources;..\osdep;..\sounddep;..\..\slirp;..\..\ppc\pearpc;%(AdditionalIncludeDirectories) + WINVER=0x0500;_DEBUG;WIN32_IE=0x0700;WIN32;WIN64;PTR64;UAE;WINUAE;_CRT_SECURE_NO_WARNINGS;D3D_DEBUG_INFO;%(PreprocessorDefinitions) + Sync + EnableFastChecks + MultiThreadedDebug + true + false + $(Platform)\$(Configuration)\winuae_msvc.pch + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + Level3 + true + ProgramDatabase + FastCall + Default + 4996;%(DisableSpecificWarnings) + false + true + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + 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;enet_x64.lib;prowizard_x64.lib;lzmalib.lib;libFLAC_static.lib;avrt.lib;hid.lib;Iphlpapi.lib;luastatic.lib;libmpeg2_ff.lib;softfloat.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName)$(TargetExt) + true + LIBCMT;%(IgnoreSpecificDefaultLibraries) + wpcap.dll;packet.dll;d3dx9_43.dll;openal32.dll;portaudio_x64.dll;ws2_32.dll;msacm32.dll;wtsapi32.dll;dsound.dll;avrt.dll;Dwmapi.lib;%(DelayLoadDLLs) + true + $(Platform)\$(Configuration)\winuae.pdb + Windows + 2621440 + 2621440 + true + false + true + MachineX64 + %(AdditionalLibraryDirectories);$(SolutionDir)\..\lib\ + + + + + ..\resources\winuae64.exe.manifest + true + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\Release/winuae_msvc.tlb + + + Full + AnySuitable + true + Speed + true + false + ..\..\include;..\..;..\;..\resources;..\osdep;..\sounddep;..\..\prowizard\include;..\..\slirp;..\..\ppc\pearpc;:%(AdditionalIncludeDirectories) + WINVER=0x0601;NDEBUG;_WIN32_IE=0x0700;WIN32;UAE;WINUAE;%(PreprocessorDefinitions) + true + Sync + Default + MultiThreaded + false + true + NoExtensions + Precise + false + false + + + .\Release/winuae_msvc.pch + .\Release/ + .\Release/ + .\Release/ + Level3 + true + FastCall + Default + 4996;%(DisableSpecificWarnings) + %(ForcedIncludeFiles) + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + ws2_32.lib;ddraw.lib;dxguid.lib;winmm.lib;comctl32.lib;version.lib;msacm32.lib;dsound.lib;dinput8.lib;d3d9.lib;d3dx9.lib;winio.lib;setupapi.lib;wininet.lib;dxerr.lib;shlwapi.lib;libpng15.lib;lglcd.lib;wpcap.lib;packet.lib;openal32.lib;portaudio_x86.lib;vfw32.lib;wtsapi32.lib;enet.lib;lzmalib.lib;prowizard.lib;libFLAC_static.lib;Avrt.lib;hid.lib;zlibstat.lib;Iphlpapi.lib;luastatic.lib;libmpeg2_ff.lib;softfloat.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName)$(TargetExt) + true + %(AdditionalLibraryDirectories);$(SolutionDir)\..\lib\ + %(AdditionalManifestDependencies) + %(IgnoreSpecificDefaultLibraries) + wpcap.dll;packet.dll;d3dx9_43.dll;openal32.dll;portaudio_x86.dll;ws2_32.dll;msacm32.dll;wtsapi32.dll;dsound.dll;wininet.dll;avrt.dll;ddraw.dll;Iphlpapi.dll;%(DelayLoadDLLs) + true + .\Release/winuae.pdb + Windows + 2621440 + 2621440 + true + true + true + + + true + false + true + MachineX86 + 5.01 + + + + + ../resources/winuae.exe.manifest + true + $(IntDir)$(TargetName)$(TargetExt).embed.manifest + /validate_manifest %(AdditionalOptions) + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\Release/winuae_msvc.tlb + + + Disabled + Disabled + true + Neither + false + false + ..\..\include;..\..;..\;..\resources;..\osdep;..\sounddep;..\..\prowizard\include;..\..\slirp;..\..\ppc\pearpc;%(AdditionalIncludeDirectories) + WINVER=0x0601;_WIN32_IE=0x0700;WIN32;UAE;WINUAE;%(PreprocessorDefinitions) + true + Sync + Default + MultiThreaded + false + true + NotSet + Precise + false + false + + + .\Test/winuae_msvc.pch + .\Test/ + .\Test/ + .\Test/ + Level3 + true + FastCall + Default + 4996;%(DisableSpecificWarnings) + %(ForcedIncludeFiles) + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + ws2_32.lib;ddraw.lib;dxguid.lib;winmm.lib;comctl32.lib;version.lib;msacm32.lib;dsound.lib;dinput8.lib;d3d9.lib;d3dx9.lib;winio.lib;setupapi.lib;wininet.lib;dxerr.lib;shlwapi.lib;libpng15.lib;lglcd.lib;wpcap.lib;packet.lib;openal32.lib;portaudio_x86.lib;vfw32.lib;wtsapi32.lib;enet.lib;lzmalib.lib;prowizard.lib;libFLAC_static.lib;Avrt.lib;hid.lib;zlibstat.lib;Iphlpapi.lib;luastatic.lib;libmpeg2_ff.lib;softfloat.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName)$(TargetExt) + true + %(AdditionalLibraryDirectories);$(SolutionDir)\..\lib\ + %(AdditionalManifestDependencies) + %(IgnoreSpecificDefaultLibraries) + wpcap.dll;packet.dll;d3dx9_43.dll;openal32.dll;portaudio_x86.dll;ws2_32.dll;msacm32.dll;wtsapi32.dll;dsound.dll;wininet.dll;avrt.dll;ddraw.dll;Iphlpapi.dll;%(DelayLoadDLLs) + true + .\Test/winuae.pdb + Windows + 2621440 + 2621440 + true + true + true + + + true + false + true + MachineX86 + 5.01 + + + + + ../resources/winuae.exe.manifest + true + $(IntDir)$(TargetName)$(TargetExt).embed.manifest + /validate_manifest %(AdditionalOptions) + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + X64 + .\Release/winuae_msvc.tlb + + + Full + OnlyExplicitInline + true + Speed + true + false + ..\..\include;..\..;..\;..\resources;..\osdep;..\sounddep;..\..\slirp;..\..\ppc\pearpc;..\..\ppc\pearpc;%(AdditionalIncludeDirectories) + WINVER=0x0601;NDEBUG;_WIN32_IE=0x0700;WIN32;WIN64;PTR64;UAE;WINUAE;%(PreprocessorDefinitions) + true + Sync + Default + MultiThreaded + false + true + NotSet + Precise + false + false + NotUsing + $(Platform)\$(Configuration)/winuae_msvc.pch + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + Level3 + true + FastCall + Default + 4996;%(DisableSpecificWarnings) + %(ForcedIncludeFiles) + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + 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;enet_x64.lib;prowizard_x64.lib;lzmalib.lib;libFLAC_static.lib;avrt.lib;hid.lib;Iphlpapi.lib;luastatic.lib;libmpeg2_ff.lib;softfloat.lib;%(AdditionalDependencies) + NotSet + $(OutDir)$(TargetName)$(TargetExt) + true + %(AdditionalLibraryDirectories);$(SolutionDir)\..\lib\ + MSVCRT.lib;%(IgnoreSpecificDefaultLibraries) + wpcap.dll;packet.dll;d3dx9_43.dll;openal32.dll;portaudio_x64.dll;ws2_32.dll;msacm32.dll;wtsapi32.dll;dsound.dll;avrt.dll;Dwmapi.dll;Iphlpapi.dll;%(DelayLoadDLLs) + true + $(Platform)\$(Configuration)\winuae.pdb + Windows + 0 + 0 + true + true + + + true + false + true + MachineX64 + true + + + ..\resources\winuae64.exe.manifest + true + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + X64 + .\Release/winuae_msvc.tlb + + + Disabled + OnlyExplicitInline + true + Neither + false + false + ..\..\include;..\..;..\;..\resources;..\osdep;..\sounddep;..\..\slirp;..\..\ppc\pearpc;%(AdditionalIncludeDirectories) + WINVER=0x0601;NDEBUG;_WIN32_IE=0x0700;WIN32;WIN64;PTR64;UAE;WINUAE;%(PreprocessorDefinitions) + true + Sync + Default + MultiThreaded + false + false + NotSet + Precise + false + false + NotUsing + $(Platform)\$(Configuration)/winuae_msvc.pch + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + Level3 + true + Cdecl + Default + 4996;%(DisableSpecificWarnings) + %(ForcedIncludeFiles) + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + 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;enet_x64.lib;prowizard_x64.lib;lzmalib.lib;libFLAC_static.lib;avrt.lib;hid.lib;Iphlpapi.lib;luastatic.lib;libmpeg2_ff.lib;softfloat.lib;%(AdditionalDependencies) + NotSet + $(OutDir)$(TargetName)$(TargetExt) + true + %(AdditionalLibraryDirectories);$(SolutionDir)\..\lib\ + %(IgnoreSpecificDefaultLibraries) + wpcap.dll;packet.dll;d3dx9_43.dll;openal32.dll;portaudio_x64.dll;ws2_32.dll;msacm32.dll;wtsapi32.dll;dsound.dll;avrt.dll;Dwmapi.lib;%(DelayLoadDLLs) + true + $(Platform)\$(Configuration)\winuae.pdb + Windows + 0 + 0 + true + true + + + false + false + true + MachineX64 + + + ..\resources\winuae64.exe.manifest + true + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\Release/winuae_msvc.tlb + + + Full + AnySuitable + true + Speed + true + true + ..\..\include;..\..;..\;..\resources;..\osdep;..\sounddep;..\..\prowizard\include;..\..\slirp;..\..\ppc\pearpc;%(AdditionalIncludeDirectories) + WINVER=0x0601;NDEBUG;_WIN32_IE=0x0700;WIN32;UAE;WINUAE;%(PreprocessorDefinitions) + true + Sync + Default + MultiThreaded + false + true + StreamingSIMDExtensions + Precise + false + false + + + .\FullRelease/winuae_msvc.pch + .\FullRelease/ + .\FullRelease/ + .\FullRelease/ + Level3 + true + FastCall + Default + 4996;%(DisableSpecificWarnings) + %(ForcedIncludeFiles) + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + ws2_32.lib;ddraw.lib;dxguid.lib;winmm.lib;comctl32.lib;version.lib;msacm32.lib;dsound.lib;dinput8.lib;d3d9.lib;d3dx9.lib;winio.lib;setupapi.lib;wininet.lib;dxerr.lib;shlwapi.lib;zlibstat.lib;libpng15.lib;lglcd.lib;wpcap.lib;packet.lib;openal32.lib;portaudio_x86.lib;vfw32.lib;wtsapi32.lib;avrt.lib;enet.lib;prowizard.lib;lzmalib.lib;libFLAC_static.lib;Avrt.lib;hid.lib;Iphlpapi.lib;luastatic.lib;libmpeg2_ff.lib;softfloat.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName)$(TargetExt) + true + %(AdditionalLibraryDirectories);$(SolutionDir)\..\lib\ + %(AdditionalManifestDependencies) + %(IgnoreSpecificDefaultLibraries) + wpcap.dll;packet.dll;d3dx9_43.dll;openal32.dll;portaudio_x86.dll;ws2_32.dll;msacm32.dll;wtsapi32.dll;dsound.dll;wininet.dll;avrt.dll;ddraw.dll;Iphlpapi.dll;%(DelayLoadDLLs) + true + .\FullRelease/winuae.pdb + Windows + 2621440 + 2621440 + true + true + false + UseLinkTimeCodeGeneration + true + false + true + MachineX86 + 5.01 + false + true + + + ../resources/winuae.exe.manifest + true + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + X64 + .\Release/winuae_msvc.tlb + + + Full + AnySuitable + true + Speed + true + true + ..\..\include;..\..;..\;..\resources;..\osdep;..\sounddep;..\..\slirp;..\..\ppc\pearpc;%(AdditionalIncludeDirectories) + WINVER=0x0601;NDEBUG;_WIN32_IE=0x0700;WIN32;WIN64;PTR64;UAE;WINUAE;%(PreprocessorDefinitions) + true + Sync + Default + MultiThreaded + false + true + NotSet + Precise + false + false + + + $(Platform)\$(Configuration)\winuae_msvc.pch + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + Level3 + true + FastCall + Default + 4996;%(DisableSpecificWarnings) + %(ForcedIncludeFiles) + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + 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;enet_x64.lib;prowizard_x64.lib;lzmalib.lib;libFLAC_static.lib;avrt.lib;hid.lib;Iphlpapi.lib;luastatic.lib;libmpeg2_ff.lib;softfloat.lib;%(AdditionalDependencies) + NotSet + $(OutDir)$(TargetName)$(TargetExt) + true + %(AdditionalLibraryDirectories);$(SolutionDir)\..\lib\ + %(IgnoreSpecificDefaultLibraries) + wpcap.dll;packet.dll;d3dx9_43.dll;openal32.dll;portaudio_x64.dll;ws2_32.dll;msacm32.dll;wtsapi32.dll;dsound.dll;avrt.dll;%(DelayLoadDLLs) + true + .\x64\FullRelease/winuae.pdb + Windows + 0 + 0 + true + true + UseLinkTimeCodeGeneration + true + false + true + MachineX64 + + + ..\resources\winuae64.exe.manifest;%(AdditionalManifestFiles) + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \projects\winuae\src\od-win32\resources + \projects\winuae\src\od-win32\resources + \projects\winuae\src\od-win32\resources + \projects\winuae\src\od-win32\resources + \projects\winuae\src\od-win32\resources + \projects\winuae\src\od-win32\resources + \projects\winuae\src\od-win32\resources + \projects\winuae\src\od-win32\resources + + + + + true + true + true + true + Document + + + true + true + true + true + Document + + + true + true + true + true + Document + + + true + true + true + true + Document + + + true + true + true + true + Document + + + true + true + true + true + Document + + + + + + + + + \ No newline at end of file diff --git a/od-win32/winuae_msvc14/winuae_msvc.vcxproj.filters b/od-win32/winuae_msvc14/winuae_msvc.vcxproj.filters new file mode 100644 index 00000000..9a9d9bfe --- /dev/null +++ b/od-win32/winuae_msvc14/winuae_msvc.vcxproj.filters @@ -0,0 +1,856 @@ + + + + + {86cfeeb5-a9b0-4c06-bd94-69c258884a66} + cpp;c;cxx;rc;def;r;odl;idl;hpj;bat + + + {5c4c971a-37b6-4c1e-82f1-d225ebb12808} + ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe + + + {c0e78831-47fa-48a0-a34e-8c3c4410c34b} + cpp;c;cxx;rc;def;r;odl;idl;hpj;bat + + + {e76a708a-933c-4af4-bad2-0820d79b6a78} + cpp;c;cxx;rc;def;r;odl;idl;hpj;bat + + + {dab2f6c7-d741-4002-b0c9-566a1536642a} + + + {a88602d5-1980-49b2-a87a-79afa3ca7346} + + + {6b855260-58da-4be4-b914-621ca2e33ca5} + + + {1af2c9da-63ab-4226-8b97-5544a0a34433} + + + {99d2fcb7-e014-45fe-a543-4a9b9242a35b} + + + {d2f2439b-d15d-47d5-bb26-1a9436aef770} + + + {d69b4a6c-84db-480b-8b80-60a2a3646f6e} + + + {93fcf20a-8921-43e8-b4b9-e5fceb81332d} + + + {dd8bf794-572a-4d08-9cae-b280eb493e54} + + + {7abef0b5-1d8e-4f43-baa6-ff61760bc330} + + + {fc42f311-daf2-48de-a851-8ad3a4aad22e} + + + {61d78a16-0513-4885-b23d-534829071ac0} + + + {a238ed36-3d5f-4fd0-afd7-a34029119da7} + + + + + win32 + + + win32 + + + win32 + + + win32 + + + win32 + + + win32 + + + win32 + + + win32 + + + win32 + + + win32 + + + win32 + + + win32 + + + win32 + + + win32 + + + win32 + + + win32 + + + win32 + + + win32 + + + win32 + + + win32 + + + win32 + + + win32 + + + win32 + + + win32 + + + win32 + + + win32 + + + win32 + + + win32 + + + win32 + + + win32 + + + win32 + + + win32 + + + win32 + + + win32 + + + win32 + + + win32 + + + win32 + + + win32 + + + win32 + + + win32 + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + jit + + + jit + + + jit + + + jit + + + prowizard + + + win32 + + + unpackers\dms + + + unpackers\dms + + + unpackers\dms + + + unpackers\dms + + + unpackers\dms + + + unpackers\dms + + + unpackers\dms + + + unpackers\dms + + + unpackers\dms + + + unpackers\dms + + + unpackers\dms + + + unpackers\lha + + + unpackers\lha + + + unpackers\lha + + + unpackers\lha + + + unpackers\lha + + + unpackers\lha + + + unpackers\lha + + + unpackers\lha + + + unpackers\lha + + + unpackers\lha + + + unpackers\lha + + + unpackers\lzx + + + unpackers\wrp + + + unpackers\zip + + + common + + + win32 + + + win32 + + + common + + + common + + + win32 + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + unpackers\chd + + + unpackers\chd + + + unpackers\chd + + + unpackers\chd + + + unpackers\chd + + + unpackers\chd + + + unpackers\chd + + + unpackers\chd + + + common + + + common + + + slirp + + + slirp + + + slirp + + + slirp + + + slirp + + + slirp + + + slirp + + + slirp + + + slirp + + + slirp + + + slirp + + + slirp + + + slirp + + + slirp + + + slirp + + + slirp + + + slirp + + + slirp + + + qemu + + + qemu + + + qemu + + + common + + + common + + + common + + + common + + + qemu + + + common + + + common + + + common + + + unpackers\mp2 + + + common + + + common + + + win32 + + + win32 + + + common + + + common + + + qemu + + + common + + + qemu + + + ppc + + + common + + + unpackers\chd + + + unpackers\chd + + + unpackers\chd + + + unpackers\chd + + + unpackers\chd + + + unpackers\chd + + + ppc + + + common + + + common + + + common + + + qemu + + + common + + + common + + + common + + + common + + + common + + + common + + + unpackers\zip + + + unpackers\zip + + + + + win32\Resource Files + + + win32\Resource Files + + + win32\Resource Files + + + win32\Resource Files + + + win32\Resource Files + + + win32\Resource Files + + + win32\Resource Files + + + win32\Resource Files + + + win32\Resource Files + + + win32\Resource Files + + + win32\Resource Files + + + win32\Resource Files + + + win32\Resource Files + + + win32\Resource Files + + + win32\Resource Files + + + win32\Resource Files + + + win32\Resource Files + + + win32\Resource Files + + + win32\Resource Files + + + win32\Resource Files + + + win32\Resource Files + + + win32\Resource Files + + + win32\Resource Files + + + win32\Resource Files + + + win32\Resource Files + + + win32\Resource Files + + + win32\Resource Files + + + win32\Resource Files + + + win32\Resource Files + + + win32\Resource Files + + + win32\Resource Files + + + + + + + + + + win32\Resource Files + + + + + + + + + + + + + + \ No newline at end of file diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt index e5dd07e2..2a55c543 100644 --- a/od-win32/winuaechangelog.txt +++ b/od-win32/winuaechangelog.txt @@ -1,4 +1,52 @@ +Beta 17: + +- Restrict GUI IDE units to 2 if device is single port and without IDE doubler support. +- Added recursive ROM scan option to Paths panel. Currently restricted to 2 directory levels. +- HAM-E Plus average pixel calculation bug fixed in hires mode. +- "Direct" serial mode and Amiga serial receive buffer is full and program does not clear buffered byte before + new byte arrives (uses emulated serial speed): keep waiting until program reads the buffered byte. + Previously it was possible to lose received characters in some situations. +- Windows 10 TP hack (b13) removed, build 10061 fixed it. RIM_TYPEHID RawInput bug is also fixed in 10061. +- VGA autoresolution hires<>superhires switch was unreliable, it didn't set internal "config changed" variable. +- If DirectInput device acquire call fails 10 times, ignore the device and stop error logging until all devices + needs to be re-acquired (for example focus is lost and regained or GUI is entered and exited) +- Entering ROM panel possible crash fixed. +- Newtronic Technologies Video DAC 18 RGB port video adapter emulation. (Format encoding information by mark_k) +- If programmable hsync or vsync enabled with out of range values: syncs stop, stop also CIA-A (if vsync timed) + and/or CIA-B TOD counting. +- Archos AVideo 12 emulation. Denise adapter, not AGA compatible, can't be AGA compatible even in emulation due + to custom chipset register conflict. (Information by mark_k) +- FBcc and FDBcc FPU instruction didn't work correctly in more compatible or cycle-exact modes. +- Negative boot priority value was parsed incorrectly when loading config file. Broken when manual HDF + geometry support was added +- If system has built-in touch screen (for example Intel based Windows 8.1 tablet), >3s touch in top/left + corner will open GUI. Added because previously it was impossible to enter GUI without external keyboard. + Quick hack only, real touch support may or may not be implemented in future. +- Made "Double, fields" default for interlace mode. +- Added partial 53C400 SCSI chip emulation (53C400 = 53C80 + integrated buffered "fake" dma support + + some PC single chip SCSI integration/compatibility features) +- Added Roctec RocHard RH800C SCSI emulation (53C400). Emulation is based on boot disk SCSI format utility + behavior, for some reason disk loadable driver won't automount SCSI disks. v2.0 ROM is still MIA. + IDE-only (SCSI chip not installed) and IDE+SCSI board subtypes added. +- Generate DSKSYN interrupt if DSKSYNC matches zero when DMA is started but before any bits gets + transferred. Jukebox 2 / Dreamdealers accidentally (wrong INTREQR bit checked) requires it. + +Beta 16: + +- Automatic resize used horizontal zoom value for both horizontal and vertical. +- Replaced half-integer scaling options with separate select menu with 1/1, 1/2, 1/4 and 1/8 scaling options. +- Paths panel portable mode checkbox now switches between modes. NOTE: currently old data is not copied but + created from scratch. Switching off portable mode automatically deletes winuae.ini. Switching on portable + mode does not delete registry data. +- Graffiti/HAM-E mode switch does not anymore change display position. +- Added HAM-E Plus emulation. (Probably not correct implemention, currently uses simple average calculation + to create extra pixel between each "normal" HAM-E pixel) +- Added separate waiting for connection TCP serial option. Old option does not wait anymore. +- Fixed 7-bit serial bytes in serial logging/TCP modes (Stop bit=bit7 was not cleared) +- Added Roctec RocHard RH800C emulation. rtidedisk.device, 1.0 ROM added which is IDE-only. First port is + IDE unit 0, second port is IDE unit 2. Ports are not shared and master-only. + Beta 15: - Map only upper half of ROM image if GVP Series II ROM is 32k. @@ -337,7 +385,7 @@ Masoboshi: - IDE and SCSI in non-DMA mode working. - SCSI writes are not working correctly, do not use! DMA controller not yet emulated. - "2.201" (device version) boot ROM added. ROM image does not have any version numbers or dates. -- IDE driver uses CHS addressing and seems to have problems with 2G drives, actual limit may be smallewr. +- IDE driver uses CHS addressing and seems to have problems with 2G drives, actual limit may be smaller. It tries to access first unavailable block number at the end of drive. (Driver flashes red background color if drive returns error status) @@ -409,7 +457,6 @@ Beta 4: - Added name to UAE Boot ROM DiagArea. (May be visible in some system info/diagnostics software) - HALT status was not cleared when loading new state file. - Beta 3: - Bitplane DMA sequencer emulation rewritten yet again to again match better with real hardware behavior. diff --git a/rommgr.cpp b/rommgr.cpp index 262cca08..f609b6d9 100644 --- a/rommgr.cpp +++ b/rommgr.cpp @@ -387,12 +387,12 @@ static struct romdata roms[] = { ALTROMPN(127, 1, 2, 16384, ROMTYPE_EVEN | ROMTYPE_8BIT, NULL, 0x65b4c3a0, 0x60e904d4, 0xe45bb6ba, 0x3e253ffa, 0xda4ee2e5, 0xc8548da1) { _T("Kupke Golem v3.9"), 3, 9, 3, 9, _T("GOLEM\0"), 16384, 124, 0, 0, ROMTYPE_GOLEM, 0, 0, NULL, 0x49157dd0, 0x03b615c9,0x2befa474,0xa37303ca,0xdc3e830d,0x3c0d9a9f, NULL, NULL }, - ALTROMPN(124, 1, 1, 8192, ROMTYPE_ODD | ROMTYPE_8BIT, NULL, 0x713298ad, 0x2ad7d6f3, 0xd696fd2c, 0x51a256ee, 0xea185c47, 0x52906e04) - ALTROMPN(124, 1, 2, 8192, ROMTYPE_EVEN | ROMTYPE_8BIT, NULL, 0x88cf2ec5, 0x59680f8d, 0xae520893, 0xff9ada35, 0xac9a1146, 0x4f87453c) + ALTROMPN(124, 1, 1, 8192, ROMTYPE_ODD | ROMTYPE_8BIT, NULL, 0x88cf2ec5, 0x59680f8d, 0xae520893, 0xff9ada35, 0xac9a1146, 0x4f87453c) + ALTROMPN(124, 1, 2, 8192, ROMTYPE_EVEN | ROMTYPE_8BIT, NULL, 0x713298ad, 0x2ad7d6f3, 0xd696fd2c, 0x51a256ee, 0xea185c47, 0x52906e04) { _T("GVP Series I v1.0"), 1, 0, 1, 16, _T("GVPI\0"), 16384, 123, 0, 0, ROMTYPE_GVPS1, 0, 0, NULL, 0x1a4c20aa, 0xb9a3377e,0x2d9b5163,0x28693c63,0x19ffb65b,0x40ae3618, NULL, NULL }, - ALTROMPN(123, 1, 1, 8192, ROMTYPE_ODD | ROMTYPE_8BIT, NULL, 0xa723193e, 0x05b4a072, 0x785c7824, 0x54e003c3, 0x6d88bd9b, 0xf5f561b9) - ALTROMPN(123, 1, 2, 8192, ROMTYPE_EVEN | ROMTYPE_8BIT, NULL, 0x27f15785, 0x1a71a78d, 0xdd4e9559, 0x0f133bba, 0x4a71122f, 0x44caef78) + ALTROMPN(123, 1, 1, 8192, ROMTYPE_ODD | ROMTYPE_8BIT, NULL, 0x27f15785, 0x1a71a78d, 0xdd4e9559, 0x0f133bba, 0x4a71122f, 0x44caef78) + ALTROMPN(123, 1, 2, 8192, ROMTYPE_EVEN | ROMTYPE_8BIT, NULL, 0xa723193e, 0x05b4a072, 0x785c7824, 0x54e003c3, 0x6d88bd9b, 0xf5f561b9) { _T("GVP Series I/II v3.15"), 3, 15, 3, 15, _T("GVPII\0GVPI\0"), 16384, 111, 0, 0, ROMTYPE_GVPS12, 0, 0, NULL, 0xf99c6f11, 0x77098a9e,0x35acaef2,0x11a546f0,0xc564cdac,0xf52836c4, NULL, NULL }, { _T("GVP Series II v4.15"), 4, 15, 4, 15, _T("GVPII\0"), 16384, 109, 0, 0, ROMTYPE_GVPS2, 0, 0, NULL,