From: Toni Wilen Date: Tue, 2 Jun 2015 17:10:42 +0000 (+0300) Subject: 3100b23 X-Git-Tag: 3100~4 X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=071e13c4a51a63857cbca5b6ef739577c742c5bc;p=francis%2Fwinuae.git 3100b23 --- diff --git a/disk.cpp b/disk.cpp index 6855bebe..6fdc719d 100644 --- a/disk.cpp +++ b/disk.cpp @@ -3331,7 +3331,7 @@ static void disk_doupdate_predict (int startcycle) else tword |= getonebit (drv->bigmfmbuf, mfmpos); } - if (dskdmaen != DSKDMA_READ && (tword & 0xffff) == dsksync) + if (dskdmaen != DSKDMA_READ && (tword & 0xffff) == dsksync && dsksync != 0) diskevent_flag |= DISK_WORDSYNC; } mfmpos++; diff --git a/od-win32/dinput.cpp b/od-win32/dinput.cpp index 184dc94a..865b21d5 100644 --- a/od-win32/dinput.cpp +++ b/od-win32/dinput.cpp @@ -3248,6 +3248,7 @@ static void release_keys (void) for (i = 0; i < MAX_KEYCODES; i++) { if (di_keycodes[j][i]) { my_kbd_handler (j, i, 0); + //write_log(_T("release %d:%02x\n"), j, i); di_keycodes[j][i] = 0; } } diff --git a/od-win32/direct3d.cpp b/od-win32/direct3d.cpp index 3ae8d875..38a628d6 100644 --- a/od-win32/direct3d.cpp +++ b/od-win32/direct3d.cpp @@ -2283,14 +2283,16 @@ static const TCHAR *D3D_init2 (HWND ahwnd, int w_w, int w_h, int depth, int *fre d3dx = LoadLibrary (D3DX9DLL); if (d3dx == NULL) { - if (os_vista) - _tcscpy(errmsg, _T("Direct3D: Optional DirectX9 components are not installed.\n") - _T("\nhttp://go.microsoft.com/fwlink/?linkid=56513")); - else - _tcscpy (errmsg, _T("Direct3D: Newer DirectX Runtime required or optional DirectX9 components are not installed.\n") - _T("\nhttp://go.microsoft.com/fwlink/?linkid=56513")); - if (isfullscreen () <= 0) - ShellExecute(NULL, _T("open"), _T("http://go.microsoft.com/fwlink/?linkid=56513"), NULL, NULL, SW_SHOWNORMAL); + static bool warned; + if (!warned) { + if (os_vista) + _tcscpy(errmsg, _T("Direct3D: Optional DirectX9 components are not installed.\n") + _T("\nhttp://go.microsoft.com/fwlink/?linkid=56513")); + else + _tcscpy (errmsg, _T("Direct3D: Newer DirectX Runtime required or optional DirectX9 components are not installed.\n") + _T("\nhttp://go.microsoft.com/fwlink/?linkid=56513")); + warned = true; + } return errmsg; } FreeLibrary (d3dx); diff --git a/od-win32/resources/resource.h b/od-win32/resources/resource.h index 1059e09c..285ebc22 100644 --- a/od-win32/resources/resource.h +++ b/od-win32/resources/resource.h @@ -1162,6 +1162,7 @@ #define IDC_DD_SURFACETYPE2 1792 #define IDC_DXMODE 1792 #define IDC_REGISTRYMODE 1792 +#define IDC_PORT_AUTOSWITCH 1792 #define IDC_RTG_VBLANKRATE 1793 #define IDC_DF0WPTEXTQ 1793 #define IDC_WINDOWEDMODE 1793 diff --git a/od-win32/resources/winuae.rc b/od-win32/resources/winuae.rc index c71a6f85..a59eea2c 100644 --- a/od-win32/resources/winuae.rc +++ b/od-win32/resources/winuae.rc @@ -512,6 +512,8 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,140,270,106,11 CONTROL "Tablet.library emulation",IDC_PORT_TABLET_LIBRARY, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,267,271,117,11 + CONTROL "Mouse/Joystick autoswitching [] Press button to automatically insert inactive input device in to joystick/mouse port",IDC_PORT_AUTOSWITCH, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,136,102,172,11 END IDD_CONTRIBUTORS DIALOGEX 0, 0, 530, 345 diff --git a/od-win32/win32.cpp b/od-win32/win32.cpp index 4b775910..e20bb657 100644 --- a/od-win32/win32.cpp +++ b/od-win32/win32.cpp @@ -529,6 +529,7 @@ bool setpaused (int priority) //write_log (_T("pause %d (%d)\n"), priority, pause_emulation); if (pause_emulation > priority) return false; + wait_keyrelease(); pause_emulation = priority; #ifdef WITH_PPC uae_ppc_pause(1); @@ -6581,6 +6582,17 @@ uae_u32 emulib_target_getcpurate (uae_u32 v, uae_u32 *low) return 0; } +bool target_can_autoswitchdevice(void) +{ +#ifdef RETROPLATFORM + if (rp_isactive ()) + return false; +#endif + if (!ismouseactive()) + return false; + return true; +} + void fpux_save (int *v) { #ifndef _WIN64 diff --git a/od-win32/win32.h b/od-win32/win32.h index 4f50ed3c..c1c4c6d7 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("22") +#define WINUAEBETA _T("23") #else #define WINUAEBETA _T("") #endif -#define WINUAEDATE MAKEBD(2015, 5, 25) +#define WINUAEDATE MAKEBD(2015, 6, 2) //#define WINUAEEXTRA _T("AmiKit Preview") //#define WINUAEEXTRA _T("Amiga Forever Edition") @@ -34,7 +34,7 @@ #define WINUAEEXTRA _T("") #endif #ifndef WINUAEREV -#define WINUAEREV _T("RC2") +#define WINUAEREV _T("RC3") #endif #define IHF_WINDOWHIDDEN 6 diff --git a/od-win32/win32gui.cpp b/od-win32/win32gui.cpp index ed750dad..15f0acb9 100644 --- a/od-win32/win32gui.cpp +++ b/od-win32/win32gui.cpp @@ -1689,9 +1689,10 @@ static void show_rom_list (void) 130, -1, -1, // m-tec 129, -1, -1, // adide 133, -1, -1, // adscsi - 127, -1, -1, // kommos + 127, 140, -1, -1, // kommos 128, -1, -1, // vector falcon - 132, -1, -2, // add500 + 132, -1, -1, // add500 + 139, -1, -2, // nexus 18, -1, 19, -1, 74, 23, -1, -1, // CD32 FMV 91, -1, -2, // Picasso IV @@ -1717,7 +1718,7 @@ static void show_rom_list (void) 99, 100, -1, -1, // BPPC 98, -1 ,-2, // CSPPC - 69, 67, 70, -1, -1, // nordic power + 69, 67, 70, 115, -1, -1, // nordic power 65, 68, -1, -1, // x-power 62, 60, -1, -1, // action cartridge 116, -1, -1, // pro access @@ -1742,6 +1743,7 @@ static void show_rom_list (void) _T("Kommos A500/A2000 SCSI\0") _T("Vector Falcon 8000 SCSI\0") _T("Archos ADD-500\0") + _T("Preferred Technologies Nexus\0") _T("CD32 Full Motion Video\0") _T("Picasso IV\0") @@ -10866,15 +10868,21 @@ static void sethardfile (HWND hDlg) SendDlgItemMessage (hDlg, IDC_HDF_FEATURE_LEVEL, CB_SETCURSEL, current_hfdlg.ci.unit_feature_level, 0); } -static void addhdcontroller(HWND hDlg, const struct expansionromtype *erc, int *hdmenutable, int firstid) +static void addhdcontroller(HWND hDlg, const struct expansionromtype *erc, int *hdmenutable, int firstid, int flags) { TCHAR name[MAX_DPATH]; - _tcscpy(name, erc->friendlymanufacturer); - _tcscat(name, _T(" ")); + name[0] = 0; + if (_tcsicmp(erc->friendlymanufacturer, erc->friendlyname)) { + _tcscat(name, erc->friendlymanufacturer); + _tcscat(name, _T(" ")); + } _tcscat(name, erc->friendlyname); if (workprefs.cpuboard_type && erc->romtype == ROMTYPE_CPUBOARD) { + const struct cpuboardsubtype *cbt = &cpuboards[workprefs.cpuboard_type].subtypes[workprefs.cpuboard_subtype]; + if (!(cbt->deviceflags & flags)) + return; _tcscat(name, _T(" (")); - _tcscat(name, cpuboards[workprefs.cpuboard_type].subtypes[workprefs.cpuboard_subtype].name); + _tcscat(name, cbt->name); _tcscat(name, _T(")")); } if (get_boardromconfig(&workprefs, erc->romtype, NULL) || get_boardromconfig(&workprefs, erc->romtype_extra, NULL)) { @@ -10904,7 +10912,7 @@ static void inithdcontroller (HWND hDlg, int ctype, int ctype_unit, int devtype) for (int i = 0; expansionroms[i].name; i++) { const struct expansionromtype *erc = &expansionroms[i]; if (erc->deviceflags & EXPANSIONTYPE_IDE) { - addhdcontroller(hDlg, erc, hdmenutable, HD_CONTROLLER_TYPE_IDE_EXPANSION_FIRST + i); + addhdcontroller(hDlg, erc, hdmenutable, HD_CONTROLLER_TYPE_IDE_EXPANSION_FIRST + i, EXPANSIONTYPE_IDE); } } @@ -10917,7 +10925,7 @@ static void inithdcontroller (HWND hDlg, int ctype, int ctype_unit, int devtype) for (int i = 0; expansionroms[i].name; i++) { const struct expansionromtype *erc = &expansionroms[i]; if (erc->deviceflags & EXPANSIONTYPE_SCSI) { - addhdcontroller(hDlg, erc, hdmenutable, HD_CONTROLLER_TYPE_SCSI_EXPANSION_FIRST + i); + addhdcontroller(hDlg, erc, hdmenutable, HD_CONTROLLER_TYPE_SCSI_EXPANSION_FIRST + i, EXPANSIONTYPE_SCSI); } } @@ -13196,6 +13204,7 @@ static void updatejoyport (HWND hDlg, int changedport) CheckDlgButton (hDlg, IDC_PORT_TABLET, workprefs.input_tablet > 0); CheckDlgButton (hDlg, IDC_PORT_TABLET_FULL, workprefs.input_tablet == TABLET_REAL); CheckDlgButton (hDlg, IDC_PORT_TABLET_LIBRARY, workprefs.tablet_library); + CheckDlgButton (hDlg, IDC_PORT_AUTOSWITCH, workprefs.input_autoswitch); if (joyxprevious[0] < 0) joyxprevious[0] = inputdevice_get_device_total (IDTYPE_JOYSTICK) + 1; @@ -13268,6 +13277,7 @@ static void values_from_gameportsdlg (HWND hDlg, int d, int changedport) currprefs.input_magic_mouse = workprefs.input_magic_mouse = ischecked (hDlg, IDC_PORT_MOUSETRICK); workprefs.input_magic_mouse_cursor = SendDlgItemMessage (hDlg, IDC_PORT_TABLET_CURSOR, CB_GETCURSEL, 0, 0L); + workprefs.input_autoswitch = ischecked (hDlg, IDC_PORT_AUTOSWITCH); workprefs.input_tablet = 0; if (ischecked (hDlg, IDC_PORT_TABLET)) { workprefs.input_tablet = TABLET_MOUSEHACK; diff --git a/od-win32/winuae_msvc11/winuae_msvc.sln b/od-win32/winuae_msvc11/winuae_msvc.sln index a8e953d3..b1dd8513 100644 --- a/od-win32/winuae_msvc11/winuae_msvc.sln +++ b/od-win32/winuae_msvc11/winuae_msvc.sln @@ -15,100 +15,258 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gencpu", "..\gencpu_msvc\ge EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "genlinetoscr", "..\genlinetoscr_msvc\genlinetoscr_msvc.vcxproj", "{E9F73E11-A463-45C6-A733-2BED75852BA1}" EndProject +Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "wix", "..\wix\wix.wixproj", "{BE211CE1-3955-4674-A664-5038FC791980}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Mixed Platforms = Debug|Mixed Platforms Debug|Win32 = Debug|Win32 Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + FullRelease|Mixed Platforms = FullRelease|Mixed Platforms FullRelease|Win32 = FullRelease|Win32 FullRelease|x64 = FullRelease|x64 + FullRelease|x86 = FullRelease|x86 + Release|Mixed Platforms = Release|Mixed Platforms Release|Win32 = Release|Win32 Release|x64 = Release|x64 + Release|x86 = Release|x86 + Test|Mixed Platforms = Test|Mixed Platforms Test|Win32 = Test|Win32 Test|x64 = Test|x64 + Test|x86 = Test|x86 + TestRelease|Mixed Platforms = TestRelease|Mixed Platforms TestRelease|Win32 = TestRelease|Win32 TestRelease|x64 = TestRelease|x64 + TestRelease|x86 = TestRelease|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 + {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Debug|Mixed Platforms.Build.0 = Debug|Win32 {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}.Debug|x86.ActiveCfg = Debug|Win32 + {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Debug|x86.Build.0 = Debug|Win32 + {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.FullRelease|Mixed Platforms.ActiveCfg = FullRelease|Win32 + {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.FullRelease|Mixed Platforms.Build.0 = FullRelease|Win32 {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}.FullRelease|x86.ActiveCfg = FullRelease|Win32 + {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.FullRelease|x86.Build.0 = FullRelease|Win32 + {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Release|Mixed Platforms.ActiveCfg = Release|Win32 + {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Release|Mixed Platforms.Build.0 = Release|Win32 {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 + {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Release|x86.ActiveCfg = Release|Win32 + {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Release|x86.Build.0 = Release|Win32 + {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Test|Mixed Platforms.ActiveCfg = Test|Win32 + {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Test|Mixed Platforms.Build.0 = Test|Win32 {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Test|Win32.ActiveCfg = Test|Win32 {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Test|Win32.Build.0 = Test|Win32 {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Test|x64.ActiveCfg = Test|x64 {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Test|x64.Build.0 = Test|x64 + {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Test|x86.ActiveCfg = Test|Win32 + {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Test|x86.Build.0 = Test|Win32 + {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.TestRelease|Mixed Platforms.ActiveCfg = Release|Win32 + {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.TestRelease|Mixed Platforms.Build.0 = Release|Win32 {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.TestRelease|Win32.ActiveCfg = Release|Win32 {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.TestRelease|Win32.Build.0 = Release|Win32 {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.TestRelease|x64.ActiveCfg = Release|x64 {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.TestRelease|x64.Build.0 = Release|x64 + {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.TestRelease|x86.ActiveCfg = Release|Win32 + {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.TestRelease|x86.Build.0 = Release|Win32 + {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 + {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.Debug|Mixed Platforms.Build.0 = Debug|Win32 {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.Debug|Win32.ActiveCfg = Debug|Win32 {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.Debug|Win32.Build.0 = Debug|Win32 {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.Debug|x64.ActiveCfg = Debug|Win32 + {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.Debug|x86.ActiveCfg = Debug|Win32 + {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.Debug|x86.Build.0 = Debug|Win32 + {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.FullRelease|Mixed Platforms.ActiveCfg = FullRelease|Win32 + {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.FullRelease|Mixed Platforms.Build.0 = FullRelease|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}.FullRelease|x86.ActiveCfg = FullRelease|Win32 + {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.FullRelease|x86.Build.0 = FullRelease|Win32 + {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.Release|Mixed Platforms.ActiveCfg = Release|Win32 {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.Release|Win32.ActiveCfg = Release|Win32 {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.Release|x64.ActiveCfg = Release|Win32 + {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.Release|x86.ActiveCfg = Release|Win32 + {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.Release|x86.Build.0 = Release|Win32 + {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.Test|Mixed Platforms.ActiveCfg = Test|Win32 + {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.Test|Mixed Platforms.Build.0 = Test|Win32 {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.Test|Win32.ActiveCfg = Test|Win32 {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.Test|x64.ActiveCfg = Test|Win32 + {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.Test|x86.ActiveCfg = Test|Win32 + {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.Test|x86.Build.0 = Test|Win32 + {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.TestRelease|Mixed Platforms.ActiveCfg = TestRelease|Win32 + {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.TestRelease|Mixed Platforms.Build.0 = TestRelease|Win32 {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.TestRelease|Win32.ActiveCfg = TestRelease|Win32 {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.TestRelease|Win32.Build.0 = TestRelease|Win32 {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.TestRelease|x64.ActiveCfg = TestRelease|Win32 + {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.TestRelease|x86.ActiveCfg = TestRelease|Win32 + {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.TestRelease|x86.Build.0 = TestRelease|Win32 + {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 + {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.Debug|Mixed Platforms.Build.0 = Debug|Win32 {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.Debug|Win32.ActiveCfg = Debug|Win32 {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.Debug|Win32.Build.0 = Debug|Win32 {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.Debug|x64.ActiveCfg = Debug|Win32 + {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.Debug|x86.ActiveCfg = Debug|Win32 + {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.Debug|x86.Build.0 = Debug|Win32 + {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.FullRelease|Mixed Platforms.ActiveCfg = FullRelease|Win32 + {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.FullRelease|Mixed Platforms.Build.0 = FullRelease|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}.FullRelease|x86.ActiveCfg = FullRelease|Win32 + {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.FullRelease|x86.Build.0 = FullRelease|Win32 + {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.Release|Mixed Platforms.ActiveCfg = Release|Win32 {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.Release|Win32.ActiveCfg = Release|Win32 {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.Release|x64.ActiveCfg = Release|Win32 + {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.Release|x86.ActiveCfg = Release|Win32 + {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.Release|x86.Build.0 = Release|Win32 + {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.Test|Mixed Platforms.ActiveCfg = Test|Win32 + {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.Test|Mixed Platforms.Build.0 = Test|Win32 {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.Test|Win32.ActiveCfg = Test|Win32 {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.Test|x64.ActiveCfg = Test|Win32 + {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.Test|x86.ActiveCfg = Test|Win32 + {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.Test|x86.Build.0 = Test|Win32 + {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.TestRelease|Mixed Platforms.ActiveCfg = TestRelease|Win32 + {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.TestRelease|Mixed Platforms.Build.0 = TestRelease|Win32 {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.TestRelease|Win32.ActiveCfg = TestRelease|Win32 {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.TestRelease|Win32.Build.0 = TestRelease|Win32 {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.TestRelease|x64.ActiveCfg = TestRelease|Win32 + {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.TestRelease|x86.ActiveCfg = TestRelease|Win32 + {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.TestRelease|x86.Build.0 = TestRelease|Win32 + {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 + {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.Debug|Mixed Platforms.Build.0 = Debug|Win32 {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.Debug|Win32.ActiveCfg = Debug|Win32 {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.Debug|Win32.Build.0 = Debug|Win32 {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.Debug|x64.ActiveCfg = Debug|Win32 + {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.Debug|x86.ActiveCfg = Debug|Win32 + {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.Debug|x86.Build.0 = Debug|Win32 + {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.FullRelease|Mixed Platforms.ActiveCfg = FullRelease|Win32 + {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.FullRelease|Mixed Platforms.Build.0 = FullRelease|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}.FullRelease|x86.ActiveCfg = FullRelease|Win32 + {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.FullRelease|x86.Build.0 = FullRelease|Win32 + {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.Release|Mixed Platforms.ActiveCfg = Release|Win32 {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.Release|Win32.ActiveCfg = Release|Win32 {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.Release|x64.ActiveCfg = Release|Win32 + {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.Release|x86.ActiveCfg = Release|Win32 + {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.Release|x86.Build.0 = Release|Win32 + {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.Test|Mixed Platforms.ActiveCfg = Test|Win32 + {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.Test|Mixed Platforms.Build.0 = Test|Win32 {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.Test|Win32.ActiveCfg = Test|Win32 {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.Test|x64.ActiveCfg = Test|Win32 + {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.Test|x86.ActiveCfg = Test|Win32 + {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.Test|x86.Build.0 = Test|Win32 + {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.TestRelease|Mixed Platforms.ActiveCfg = TestRelease|Win32 + {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.TestRelease|Mixed Platforms.Build.0 = TestRelease|Win32 {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.TestRelease|Win32.ActiveCfg = TestRelease|Win32 {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.TestRelease|Win32.Build.0 = TestRelease|Win32 {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.TestRelease|x64.ActiveCfg = TestRelease|Win32 + {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.TestRelease|x86.ActiveCfg = TestRelease|Win32 + {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.TestRelease|x86.Build.0 = TestRelease|Win32 + {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 + {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.Debug|Mixed Platforms.Build.0 = Debug|Win32 {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.Debug|Win32.ActiveCfg = Debug|Win32 {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.Debug|Win32.Build.0 = Debug|Win32 {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.Debug|x64.ActiveCfg = Debug|Win32 + {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.Debug|x86.ActiveCfg = Debug|Win32 + {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.Debug|x86.Build.0 = Debug|Win32 + {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.FullRelease|Mixed Platforms.ActiveCfg = FullRelease|Win32 + {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.FullRelease|Mixed Platforms.Build.0 = FullRelease|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}.FullRelease|x86.ActiveCfg = FullRelease|Win32 + {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.FullRelease|x86.Build.0 = FullRelease|Win32 + {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.Release|Mixed Platforms.ActiveCfg = Release|Win32 {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.Release|Win32.ActiveCfg = Release|Win32 {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.Release|x64.ActiveCfg = Release|Win32 + {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.Release|x86.ActiveCfg = Release|Win32 + {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.Release|x86.Build.0 = Release|Win32 + {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.Test|Mixed Platforms.ActiveCfg = Test|Win32 + {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.Test|Mixed Platforms.Build.0 = Test|Win32 {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.Test|Win32.ActiveCfg = Test|Win32 {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.Test|x64.ActiveCfg = Test|Win32 + {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.Test|x86.ActiveCfg = Test|Win32 + {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.Test|x86.Build.0 = Test|Win32 + {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.TestRelease|Mixed Platforms.ActiveCfg = TestRelease|Win32 + {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.TestRelease|Mixed Platforms.Build.0 = TestRelease|Win32 {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.TestRelease|Win32.ActiveCfg = TestRelease|Win32 {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.TestRelease|Win32.Build.0 = TestRelease|Win32 {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.TestRelease|x64.ActiveCfg = TestRelease|Win32 + {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.TestRelease|x86.ActiveCfg = TestRelease|Win32 + {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.TestRelease|x86.Build.0 = TestRelease|Win32 + {E9F73E11-A463-45C6-A733-2BED75852BA1}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 + {E9F73E11-A463-45C6-A733-2BED75852BA1}.Debug|Mixed Platforms.Build.0 = Debug|Win32 {E9F73E11-A463-45C6-A733-2BED75852BA1}.Debug|Win32.ActiveCfg = Debug|Win32 {E9F73E11-A463-45C6-A733-2BED75852BA1}.Debug|Win32.Build.0 = Debug|Win32 {E9F73E11-A463-45C6-A733-2BED75852BA1}.Debug|x64.ActiveCfg = Debug|Win32 + {E9F73E11-A463-45C6-A733-2BED75852BA1}.Debug|x86.ActiveCfg = Debug|Win32 + {E9F73E11-A463-45C6-A733-2BED75852BA1}.Debug|x86.Build.0 = Debug|Win32 + {E9F73E11-A463-45C6-A733-2BED75852BA1}.FullRelease|Mixed Platforms.ActiveCfg = FullRelease|Win32 + {E9F73E11-A463-45C6-A733-2BED75852BA1}.FullRelease|Mixed Platforms.Build.0 = FullRelease|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}.FullRelease|x86.ActiveCfg = FullRelease|Win32 + {E9F73E11-A463-45C6-A733-2BED75852BA1}.FullRelease|x86.Build.0 = FullRelease|Win32 + {E9F73E11-A463-45C6-A733-2BED75852BA1}.Release|Mixed Platforms.ActiveCfg = Release|Win32 {E9F73E11-A463-45C6-A733-2BED75852BA1}.Release|Win32.ActiveCfg = Release|Win32 {E9F73E11-A463-45C6-A733-2BED75852BA1}.Release|x64.ActiveCfg = Release|Win32 + {E9F73E11-A463-45C6-A733-2BED75852BA1}.Release|x86.ActiveCfg = Release|Win32 + {E9F73E11-A463-45C6-A733-2BED75852BA1}.Release|x86.Build.0 = Release|Win32 + {E9F73E11-A463-45C6-A733-2BED75852BA1}.Test|Mixed Platforms.ActiveCfg = Test|Win32 + {E9F73E11-A463-45C6-A733-2BED75852BA1}.Test|Mixed Platforms.Build.0 = Test|Win32 {E9F73E11-A463-45C6-A733-2BED75852BA1}.Test|Win32.ActiveCfg = Test|Win32 {E9F73E11-A463-45C6-A733-2BED75852BA1}.Test|x64.ActiveCfg = Test|Win32 + {E9F73E11-A463-45C6-A733-2BED75852BA1}.Test|x86.ActiveCfg = Test|Win32 + {E9F73E11-A463-45C6-A733-2BED75852BA1}.Test|x86.Build.0 = Test|Win32 + {E9F73E11-A463-45C6-A733-2BED75852BA1}.TestRelease|Mixed Platforms.ActiveCfg = Release|Win32 + {E9F73E11-A463-45C6-A733-2BED75852BA1}.TestRelease|Mixed Platforms.Build.0 = Release|Win32 {E9F73E11-A463-45C6-A733-2BED75852BA1}.TestRelease|Win32.ActiveCfg = Release|Win32 {E9F73E11-A463-45C6-A733-2BED75852BA1}.TestRelease|Win32.Build.0 = Release|Win32 {E9F73E11-A463-45C6-A733-2BED75852BA1}.TestRelease|x64.ActiveCfg = Release|Win32 + {E9F73E11-A463-45C6-A733-2BED75852BA1}.TestRelease|x86.ActiveCfg = Release|Win32 + {E9F73E11-A463-45C6-A733-2BED75852BA1}.TestRelease|x86.Build.0 = Release|Win32 + {BE211CE1-3955-4674-A664-5038FC791980}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 + {BE211CE1-3955-4674-A664-5038FC791980}.Debug|Mixed Platforms.Build.0 = Debug|x86 + {BE211CE1-3955-4674-A664-5038FC791980}.Debug|Win32.ActiveCfg = Debug|x86 + {BE211CE1-3955-4674-A664-5038FC791980}.Debug|Win32.Build.0 = Debug|x86 + {BE211CE1-3955-4674-A664-5038FC791980}.Debug|x64.ActiveCfg = Debug|x86 + {BE211CE1-3955-4674-A664-5038FC791980}.Debug|x86.ActiveCfg = Debug|x86 + {BE211CE1-3955-4674-A664-5038FC791980}.Debug|x86.Build.0 = Debug|x86 + {BE211CE1-3955-4674-A664-5038FC791980}.FullRelease|Mixed Platforms.ActiveCfg = Release|x86 + {BE211CE1-3955-4674-A664-5038FC791980}.FullRelease|Mixed Platforms.Build.0 = Release|x86 + {BE211CE1-3955-4674-A664-5038FC791980}.FullRelease|Win32.ActiveCfg = Release|x86 + {BE211CE1-3955-4674-A664-5038FC791980}.FullRelease|x64.ActiveCfg = Release|x86 + {BE211CE1-3955-4674-A664-5038FC791980}.FullRelease|x86.ActiveCfg = Release|x86 + {BE211CE1-3955-4674-A664-5038FC791980}.FullRelease|x86.Build.0 = Release|x86 + {BE211CE1-3955-4674-A664-5038FC791980}.Release|Mixed Platforms.ActiveCfg = Release|x86 + {BE211CE1-3955-4674-A664-5038FC791980}.Release|Win32.ActiveCfg = Release|x86 + {BE211CE1-3955-4674-A664-5038FC791980}.Release|x64.ActiveCfg = Release|x86 + {BE211CE1-3955-4674-A664-5038FC791980}.Release|x86.ActiveCfg = Release|x86 + {BE211CE1-3955-4674-A664-5038FC791980}.Release|x86.Build.0 = Release|x86 + {BE211CE1-3955-4674-A664-5038FC791980}.Test|Mixed Platforms.ActiveCfg = Release|x86 + {BE211CE1-3955-4674-A664-5038FC791980}.Test|Mixed Platforms.Build.0 = Release|x86 + {BE211CE1-3955-4674-A664-5038FC791980}.Test|Win32.ActiveCfg = Release|x86 + {BE211CE1-3955-4674-A664-5038FC791980}.Test|x64.ActiveCfg = Release|x86 + {BE211CE1-3955-4674-A664-5038FC791980}.Test|x86.ActiveCfg = Release|x86 + {BE211CE1-3955-4674-A664-5038FC791980}.Test|x86.Build.0 = Release|x86 + {BE211CE1-3955-4674-A664-5038FC791980}.TestRelease|Mixed Platforms.ActiveCfg = Release|x86 + {BE211CE1-3955-4674-A664-5038FC791980}.TestRelease|Mixed Platforms.Build.0 = Release|x86 + {BE211CE1-3955-4674-A664-5038FC791980}.TestRelease|Win32.ActiveCfg = Release|x86 + {BE211CE1-3955-4674-A664-5038FC791980}.TestRelease|Win32.Build.0 = Release|x86 + {BE211CE1-3955-4674-A664-5038FC791980}.TestRelease|x64.ActiveCfg = Release|x86 + {BE211CE1-3955-4674-A664-5038FC791980}.TestRelease|x86.ActiveCfg = Release|x86 + {BE211CE1-3955-4674-A664-5038FC791980}.TestRelease|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt index ee7d686a..a1e649b3 100644 --- a/od-win32/winuaechangelog.txt +++ b/od-win32/winuaechangelog.txt @@ -1,4 +1,17 @@ +Beta 23: (RC3) + +- Toccata audio didn't automatically re-enable audio if it was stopped by automatic switching. +- Fixed A2065 crash in "Cable disconnected" mode. +- Added J.Kommos ROM v1.7 (1990-03-13) Previously added ROM was v1.8 (1990-07-25). +- Preferred Technologies Nexus added to ROM scan result window. +- Fixed 68030 MMU prefetch hack flaw that caused A3000 with 2.04 SuperKickstart to crash. +- "Mouse uncaptured: emulation paused" and any key pressed: key was not released automatically (ALT-TAB). +- 68881/68882 NULL FSAVE frame has normal frame size stored (Undocumented but real hardware confirmed) +- Don't prevent RTC in A1200 chipset extra mode if accelerator board is also enabled. +- HD selection GUI visual bugs fixed. +- Added input device autoswitch on/off checkbox. (This was supposed to be added long time ago but I forgot) + Beta 22: (RC2) - In some rare situatations both "HARD_DDF_STOP" and "plf_passed_stop" test conditions incorrectly passed diff --git a/od-win32/wix/Product.wxs b/od-win32/wix/Product.wxs index 555f7070..bca0d8a7 100644 --- a/od-win32/wix/Product.wxs +++ b/od-win32/wix/Product.wxs @@ -1,11 +1,11 @@ - + - +