From: Toni Wilen Date: Sat, 21 Nov 2015 13:01:07 +0000 (+0200) Subject: 3210 X-Git-Tag: 3210^0 X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=bc30c13a31341b524c23ce3be60c098e319612d8;p=francis%2Fwinuae.git 3210 --- diff --git a/include/options.h b/include/options.h index e975a704..40dca5de 100644 --- a/include/options.h +++ b/include/options.h @@ -14,7 +14,7 @@ #define UAEMAJOR 3 #define UAEMINOR 2 -#define UAESUBREV 0 +#define UAESUBREV 1 typedef enum { KBD_LANG_US, KBD_LANG_DK, KBD_LANG_DE, KBD_LANG_SE, KBD_LANG_FR, KBD_LANG_IT, KBD_LANG_ES } KbdLang; @@ -542,6 +542,7 @@ struct uae_prefs { TCHAR statefile[MAX_DPATH]; TCHAR inprecfile[MAX_DPATH]; bool inprec_autoplay; + bool refresh_indicator; struct multipath path_floppy; struct multipath path_hardfile; diff --git a/od-win32/hardfile_win32.cpp b/od-win32/hardfile_win32.cpp index 4f4629de..ae16bdeb 100644 --- a/od-win32/hardfile_win32.cpp +++ b/od-win32/hardfile_win32.cpp @@ -494,6 +494,7 @@ static bool getdeviceinfo (HANDLE hDevice, struct uae_driveinfo *udi) if (!DeviceIoControl (hDevice, IOCTL_DISK_GET_DRIVE_GEOMETRY, NULL, 0, (void*)&dg, sizeof (dg), &returnedLength, NULL)) { DWORD err = GetLastError(); if (isnomediaerr (err)) { + write_log(_T("IOCTL_DISK_GET_DRIVE_GEOMETRY no disk, error code %d.\n"), err); udi->nomedia = 1; return true; } diff --git a/od-win32/resources/winuae.rc b/od-win32/resources/winuae.rc index 7ff65d57..ea41bb94 100644 --- a/od-win32/resources/winuae.rc +++ b/od-win32/resources/winuae.rc @@ -17,32 +17,58 @@ LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. IDI_APPICON ICON "winuae.ico" + IDI_FLOPPY ICON "35floppy.ico" + IDI_ABOUT ICON "amigainfo.ico" + IDI_HARDDISK ICON "drive.ico" + IDI_CPU ICON "cpu.ico" + IDI_GAMEPORTS ICON "joystick.ico" + IDI_IOPORTS ICON "joystick.ico" + IDI_INPUT ICON "joystick.ico" + IDI_MISC1 ICON "misc.ico" + IDI_MISC2 ICON "misc.ico" + IDI_MOVE_UP ICON "move_up.ico" + IDI_MOVE_DOWN ICON "move_dow.ico" + IDI_AVIOUTPUT ICON "avioutput.ico" + IDI_DISK ICON "drive.ico" + IDI_FOLDER ICON "folder.ico" + IDI_SOUND ICON "sound.ico" + IDI_DISPLAY ICON "screen.ico" + IDI_ROOT ICON "root.ico" + IDI_MEMORY ICON "chip.ico" + IDI_QUICKSTART ICON "quickstart.ico" + IDI_PATHS ICON "paths.ico" + IDI_DISKIMAGE ICON "diskimage.ico" + IDI_PORTS ICON "port.ico" + IDI_CONFIGFILE ICON "configfile.ico" + IDI_FILE ICON "file.ico" + IDI_EXPANSION ICON "expansion.ico" + ///////////////////////////////////////////////////////////////////////////// // // Accelerator @@ -994,32 +1020,32 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,347,14,35,12 RTEXT "Configuration:",IDC_STATIC,5,33,68,10,SS_CENTERIMAGE COMBOBOX IDC_QUICKSTART_CONFIGURATION,77,31,310,50,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - GROUPBOX "Compatibility vs Required CPU Power ",IDC_QUICKSTART_COMPA,1,58,393,33 + GROUPBOX "Compatibility vs Required CPU Power ",IDC_QUICKSTART_COMPA,1,58,393,36 RTEXT "Best compatibility",IDC_STATIC,20,73,98,10,SS_CENTERIMAGE CONTROL "",IDC_QUICKSTART_COMPATIBILITY,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,145,68,115,21 LTEXT "Low compatibility",IDC_STATIC,279,74,92,10,SS_CENTERIMAGE - GROUPBOX "Host Configuration",IDC_QUICKSTART_HOST,1,96,393,35 - RTEXT "Configuration:",IDC_STATIC,5,109,68,10,SS_CENTERIMAGE - COMBOBOX IDC_QUICKSTART_HOSTCONFIG,77,107,310,50,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - GROUPBOX "Emulated Drives",IDC_QUICKSTART_DF,1,135,393,93 - CONTROL "Floppy drive DF0:",IDC_DF0QENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,148,77,15 - PUSHBUTTON "Select image file",IDC_DF0QQ,93,148,98,15 - RTEXT "Write-protected",IDC_DF0WPTEXTQ,196,151,69,10,SS_CENTERIMAGE - CONTROL "",IDC_DF0WPQ,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,270,149,10,15 - PUSHBUTTON "?",IDC_INFO0Q,334,148,19,15 - PUSHBUTTON "Eject",IDC_EJECT0Q,358,148,30,15 - COMBOBOX IDC_DF0TEXTQ,9,167,379,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - CONTROL "Floppy drive DF1:",IDC_DF1QENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,186,77,15 - PUSHBUTTON "Select image file",IDC_DF1QQ,93,186,98,15 - RTEXT "Write-protected",IDC_DF1WPTEXTQ,195,189,69,10,SS_CENTERIMAGE - COMBOBOX IDC_CD0Q_TYPE,199,187,74,50,CBS_DROPDOWNLIST | NOT WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - CONTROL "",IDC_DF1WPQ,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,270,185,10,15 - PUSHBUTTON "?",IDC_INFO1Q,334,186,19,15 - PUSHBUTTON "Eject",IDC_EJECT1Q,358,186,30,15 - COMBOBOX IDC_DF1TEXTQ,9,204,379,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Set configuration",IDC_QUICKSTART_SETCONFIG,9,239,88,15,NOT WS_VISIBLE - GROUPBOX "Mode",IDC_STATIC,250,231,144,28,BS_LEFT - CONTROL "Start in Quickstart mode",IDC_QUICKSTARTMODE,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_TABSTOP,259,242,131,12 + GROUPBOX "Host Configuration",IDC_QUICKSTART_HOST,1,98,393,35 + RTEXT "Configuration:",IDC_STATIC,5,111,68,10,SS_CENTERIMAGE + COMBOBOX IDC_QUICKSTART_HOSTCONFIG,77,109,310,50,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX "Emulated Drives",IDC_QUICKSTART_DF,1,138,393,93 + CONTROL "Floppy drive DF0:",IDC_DF0QENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,151,77,15 + PUSHBUTTON "Select image file",IDC_DF0QQ,93,151,98,15 + RTEXT "Write-protected",IDC_DF0WPTEXTQ,196,154,69,10,SS_CENTERIMAGE + CONTROL "",IDC_DF0WPQ,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,270,152,10,15 + PUSHBUTTON "?",IDC_INFO0Q,334,151,19,15 + PUSHBUTTON "Eject",IDC_EJECT0Q,358,151,30,15 + COMBOBOX IDC_DF0TEXTQ,9,170,379,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + CONTROL "Floppy drive DF1:",IDC_DF1QENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,189,77,15 + PUSHBUTTON "Select image file",IDC_DF1QQ,93,189,98,15 + RTEXT "Write-protected",IDC_DF1WPTEXTQ,195,192,69,10,SS_CENTERIMAGE + COMBOBOX IDC_CD0Q_TYPE,199,190,74,50,CBS_DROPDOWNLIST | NOT WS_VISIBLE | WS_VSCROLL | WS_TABSTOP + CONTROL "",IDC_DF1WPQ,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,270,188,10,15 + PUSHBUTTON "?",IDC_INFO1Q,334,189,19,15 + PUSHBUTTON "Eject",IDC_EJECT1Q,358,189,30,15 + COMBOBOX IDC_DF1TEXTQ,9,207,379,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Set configuration",IDC_QUICKSTART_SETCONFIG,9,241,88,15,NOT WS_VISIBLE + GROUPBOX "Mode",IDC_STATIC,250,233,144,28,BS_LEFT + CONTROL "Start in Quickstart mode",IDC_QUICKSTARTMODE,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_TABSTOP,259,244,131,12 END IDD_FRONTEND DIALOGEX 0, 0, 420, 242 @@ -1271,8 +1297,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,2,0,0 - PRODUCTVERSION 3,2,0,0 + FILEVERSION 3,2,1,0 + PRODUCTVERSION 3,2,1,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -1288,12 +1314,12 @@ BEGIN BLOCK "040904b0" BEGIN VALUE "FileDescription", "WinUAE" - VALUE "FileVersion", "3.2.0.0" + VALUE "FileVersion", "3.2.1.0" VALUE "InternalName", "WinUAE" VALUE "LegalCopyright", "© 1996-2015 under the GNU Public License (GPL)" VALUE "OriginalFilename", "WinUAE.exe" VALUE "ProductName", "WinUAE" - VALUE "ProductVersion", "3.2.0.0" + VALUE "ProductVersion", "3.2.1.0" END END BLOCK "VarFileInfo" @@ -1310,6 +1336,7 @@ END IDC_MYHAND CURSOR "H_arrow.cur" + ///////////////////////////////////////////////////////////////////////////// // // Menu @@ -1396,19 +1423,26 @@ END // IDR_DRIVE_STARTUP_A500_1 WAVE "drive_startup.wav" + IDR_DRIVE_CLICK_A500_1 WAVE "drive_click.wav" + IDR_DRIVE_SPIN_A500_1 WAVE "drive_spin.wav" + IDR_DRIVE_SNATCH_A500_1 WAVE "drive_snatch.wav" + IDR_DRIVE_SPINND_A500_1 WAVE "drive_spinnd.wav" + ///////////////////////////////////////////////////////////////////////////// // // Bitmap // IDB_XARCADE BITMAP "xarcade-winuae.bmp" + IDB_LCD160X43 BITMAP "lcd.bmp" + ///////////////////////////////////////////////////////////////////////////// // // DESIGNINFO diff --git a/od-win32/win32.h b/od-win32/win32.h index b66dd656..ed08b132 100644 --- a/od-win32/win32.h +++ b/od-win32/win32.h @@ -17,15 +17,15 @@ #define WINUAEPUBLICBETA 0 #define LANG_DLL 1 -#define LANG_DLL_FULL_VERSION_MATCH 1 +#define LANG_DLL_FULL_VERSION_MATCH 0 #if WINUAEPUBLICBETA -#define WINUAEBETA _T("20") +#define WINUAEBETA _T("") #else #define WINUAEBETA _T("") #endif -#define WINUAEDATE MAKEBD(2015, 11, 11) +#define WINUAEDATE MAKEBD(2015, 11, 19) //#define WINUAEEXTRA _T("AmiKit Preview") //#define WINUAEEXTRA _T("Amiga Forever Edition") diff --git a/od-win32/winuae_msvc14/winuae_msvc.vcxproj b/od-win32/winuae_msvc14/winuae_msvc.vcxproj index 626e4be6..35be5ec8 100644 --- a/od-win32/winuae_msvc14/winuae_msvc.vcxproj +++ b/od-win32/winuae_msvc14/winuae_msvc.vcxproj @@ -517,7 +517,7 @@ true %(AdditionalLibraryDirectories);$(SolutionDir)\..\lib\ MSVCRT.lib;%(IgnoreSpecificDefaultLibraries);MSVCRT - 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) + wpcap.dll;packet.dll;d3dx9_43.dll;openal32.dll;portaudio_x64.dll;ws2_32.dll;msacm32.dll;wtsapi32.dll;dsound.dll;avrt.dll;Iphlpapi.dll;%(DelayLoadDLLs) true $(Platform)\$(Configuration)\winuae.pdb Windows @@ -590,7 +590,7 @@ true %(AdditionalLibraryDirectories);$(SolutionDir)\..\lib\ %(IgnoreSpecificDefaultLibraries);MSVCRT - 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) + 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 $(Platform)\$(Configuration)\winuae.pdb Windows diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt index b509ef26..7a9d3dff 100644 --- a/od-win32/winuaechangelog.txt +++ b/od-win32/winuaechangelog.txt @@ -1,4 +1,22 @@ +- Restoring statefile with FPU crashed. +- If Blizzard RAM allocation fails in non-JIT compatible special case mode, halve memory size and try again + instead of crashing. +- DDFSTOP special case (changing value during cycle when old DDFSTOP would have matched) triggered + also when it should not have triggered. (Real / Complex) +- 68020+ accept odd stack when processing exceptions. For some reason I had assumed exceptions need + aligned supervisor stack. +- GUI Picasso IV ROM config never listed rom scanner detected ROM. +- If RTG board and JIT is enabled but RTG VRAM is located outside of natmem region (For example "real" Z3 address + at 0x40000000 under 32-bit Windows), disable the board instead of trying to config it in unusable address. + Previously used hack is not anymore compatible with updated JIT. +- libpng updated to 1.6.19. +- CPU state file buffer overflow when saving 68040+ state. +- If triple buffering, windowed, no vsync and desktop compositing (DWM) enabled, use double buffering. +- 64-bit version didn't load any plugin DLLs without extension (_x64 etc..) + +3.2.0 + Beta 20: - Map ROM feature was not JIT direct compatible (JIT update few betas ago) diff --git a/od-win32/wix/Product.wxs b/od-win32/wix/Product.wxs index cae37f64..1806e79c 100644 --- a/od-win32/wix/Product.wxs +++ b/od-win32/wix/Product.wxs @@ -1,6 +1,6 @@ - +