From bd84ff202a752e9566fd5d8ac1671a2410e4931a Mon Sep 17 00:00:00 2001 From: Toni Wilen Date: Sun, 27 Jan 2019 17:41:52 +0200 Subject: [PATCH] 4200b1 --- include/options.h | 2 +- include/xwin.h | 7 -- od-win32/build68k_msvc/build68k_msvc.vcxproj | 8 ++- .../genblitter_msvc/genblitter_msvc.vcxproj | 8 ++- od-win32/gencomp_msvc/gencomp_msvc.vcxproj | 8 ++- od-win32/gencpu_msvc/gencpu_msvc.vcxproj | 12 +++- .../genlinetoscr_msvc.vcxproj | 7 +- od-win32/hardfile_win32.cpp | 18 ++--- od-win32/prowizard/prowizard.vcxproj | 3 + od-win32/resources/resource.h | 10 ++- od-win32/resources/winuae.rc | 70 +++++++++++-------- od-win32/uaeunp/uaeunp.vcxproj | 3 + od-win32/unpackers/unpackers.vcxproj | 6 +- od-win32/win32.cpp | 2 +- od-win32/win32.h | 6 +- od-win32/winuae_msvc15/winuae_msvc.vcxproj | 44 ++++++------ rommgr.cpp | 28 ++++---- 17 files changed, 146 insertions(+), 96 deletions(-) diff --git a/include/options.h b/include/options.h index c33372c0..503478f7 100644 --- a/include/options.h +++ b/include/options.h @@ -15,7 +15,7 @@ #include "traps.h" #define UAEMAJOR 4 -#define UAEMINOR 1 +#define UAEMINOR 2 #define UAESUBREV 0 #define MAX_AMIGADISPLAYS 4 diff --git a/include/xwin.h b/include/xwin.h index 1a301946..8a28107a 100644 --- a/include/xwin.h +++ b/include/xwin.h @@ -64,7 +64,6 @@ void getgfxoffset(int monid, float *dxp, float *dyp, float *mxp, float *myp); float target_getcurrentvblankrate(int monid); extern int debuggable (void); -extern void LED (int); extern void screenshot(int monid, int,int); void refreshtitle (void); @@ -72,16 +71,10 @@ extern int bits_in_mask (unsigned long mask); extern int mask_shift (unsigned long mask); extern unsigned int doMask (int p, int bits, int shift); extern unsigned int doMask256 (int p, int bits, int shift); -extern void setup_maxcol (int); -extern void alloc_colors256 (int (*)(int, int, int, xcolnr *)); extern void alloc_colors64k (int monid, int, int, int, int, int, int, int, int, int, int, bool); extern void alloc_colors_rgb (int rw, int gw, int bw, int rs, int gs, int bs, int aw, int as, int alpha, int byte_swap, uae_u32 *rc, uae_u32 *gc, uae_u32 *bc); extern void alloc_colors_picasso (int rw, int gw, int bw, int rs, int gs, int bs, int rgbfmt, uae_u32 *rgbx16); -extern void setup_greydither (int bits, allocfunc_type allocfunc); -extern void setup_greydither_maxcol (int maxcol, allocfunc_type allocfunc); -extern void setup_dither (int bits, allocfunc_type allocfunc); -extern void DitherLine (uae_u8 *l, uae_u16 *r4g4b4, int x, int y, uae_s16 len, int bits) ASM_SYM_FOR_FUNC("DitherLine"); extern float getvsyncrate(int monid, float hz, int *mult); /* The graphics code has a choice whether it wants to use a large buffer diff --git a/od-win32/build68k_msvc/build68k_msvc.vcxproj b/od-win32/build68k_msvc/build68k_msvc.vcxproj index cc847517..ce019a74 100644 --- a/od-win32/build68k_msvc/build68k_msvc.vcxproj +++ b/od-win32/build68k_msvc/build68k_msvc.vcxproj @@ -25,6 +25,7 @@ build68k {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C} + 8.1 @@ -32,30 +33,35 @@ false MultiByte v141 + false Application false MultiByte v141 + false Application false Unicode v141 + false Application false Unicode - v141_xp + v141 + false Application false Unicode v141 + false diff --git a/od-win32/genblitter_msvc/genblitter_msvc.vcxproj b/od-win32/genblitter_msvc/genblitter_msvc.vcxproj index 2d88bade..afa47214 100644 --- a/od-win32/genblitter_msvc/genblitter_msvc.vcxproj +++ b/od-win32/genblitter_msvc/genblitter_msvc.vcxproj @@ -25,6 +25,7 @@ genblitter {765B0AF0-B8D3-4998-89AF-D6F939E1CD18} + 8.1 @@ -32,30 +33,35 @@ false MultiByte v141 + false Application false MultiByte v141 + false Application false Unicode v141 + false Application false Unicode - v141_xp + v141 + false Application false Unicode v141 + false diff --git a/od-win32/gencomp_msvc/gencomp_msvc.vcxproj b/od-win32/gencomp_msvc/gencomp_msvc.vcxproj index cf2121fc..73a075bb 100644 --- a/od-win32/gencomp_msvc/gencomp_msvc.vcxproj +++ b/od-win32/gencomp_msvc/gencomp_msvc.vcxproj @@ -25,6 +25,7 @@ gencomp {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB} + 8.1 @@ -32,25 +33,29 @@ false Unicode v141 + false Application false MultiByte v141 + false Application false Unicode v141 + false Application false false Unicode - v141_xp + v141 + false Application @@ -58,6 +63,7 @@ false Unicode v141 + false diff --git a/od-win32/gencpu_msvc/gencpu_msvc.vcxproj b/od-win32/gencpu_msvc/gencpu_msvc.vcxproj index cf55325b..d59d30c8 100644 --- a/od-win32/gencpu_msvc/gencpu_msvc.vcxproj +++ b/od-win32/gencpu_msvc/gencpu_msvc.vcxproj @@ -25,6 +25,7 @@ gencpu {DEF7ACF7-050E-4069-BB99-5B5D93F60521} + 8.1 @@ -32,30 +33,35 @@ false Unicode v141 + false Application false MultiByte v141 + false Application false Unicode - v141_xp + v141 + false Application false Unicode - v141_xp + v141 + false Application false Unicode - v141_xp + v141 + false diff --git a/od-win32/genlinetoscr_msvc/genlinetoscr_msvc.vcxproj b/od-win32/genlinetoscr_msvc/genlinetoscr_msvc.vcxproj index 2dee8757..cf3dc296 100644 --- a/od-win32/genlinetoscr_msvc/genlinetoscr_msvc.vcxproj +++ b/od-win32/genlinetoscr_msvc/genlinetoscr_msvc.vcxproj @@ -23,6 +23,7 @@ {E9F73E11-A463-45C6-A733-2BED75852BA1} genlinetoscr_msvc Win32Proj + 8.1 @@ -30,23 +31,27 @@ Unicode true v141 + false Application Unicode true - v141_xp + v141 + false Application Unicode true v141 + false Application Unicode v141 + false diff --git a/od-win32/hardfile_win32.cpp b/od-win32/hardfile_win32.cpp index 399ef3a8..012dfa38 100644 --- a/od-win32/hardfile_win32.cpp +++ b/od-win32/hardfile_win32.cpp @@ -1767,6 +1767,16 @@ static bool getdeviceinfo (HANDLE hDevice, struct uae_driveinfo *udi) } readidentity(INVALID_HANDLE_VALUE, udi, NULL); + gli_ok = true; + gli.Length.QuadPart = 0; + if (!DeviceIoControl(hDevice, IOCTL_DISK_GET_LENGTH_INFO, NULL, 0, (void*)& gli, sizeof(gli), &returnedLength, NULL)) { + gli_ok = false; + write_log(_T("IOCTL_DISK_GET_LENGTH_INFO failed with error code %d.\n"), GetLastError()); + } + else { + write_log(_T("IOCTL_DISK_GET_LENGTH_INFO returned size: %I64d (0x%I64x)\n"), gli.Length.QuadPart, gli.Length.QuadPart); + } + if (!DeviceIoControl (hDevice, IOCTL_DISK_GET_DRIVE_GEOMETRY, NULL, 0, (void*)&dg, sizeof (dg), &returnedLength, NULL)) { DWORD err = GetLastError(); if (isnomediaerr (err)) { @@ -1782,14 +1792,6 @@ static bool getdeviceinfo (HANDLE hDevice, struct uae_driveinfo *udi) if (err == ERROR_WRITE_PROTECT) udi->readonly = 1; } - gli_ok = true; - gli.Length.QuadPart = 0; - if (!DeviceIoControl (hDevice, IOCTL_DISK_GET_LENGTH_INFO, NULL, 0, (void*)&gli, sizeof (gli), &returnedLength, NULL)) { - gli_ok = false; - write_log (_T("IOCTL_DISK_GET_LENGTH_INFO failed with error code %d.\n"), GetLastError()); - } else { - write_log (_T("IOCTL_DISK_GET_LENGTH_INFO returned size: %I64d (0x%I64x)\n"), gli.Length.QuadPart, gli.Length.QuadPart); - } if (ischs(udi->identity) && gli.Length.QuadPart == 0) { int c, h, s; diff --git a/od-win32/prowizard/prowizard.vcxproj b/od-win32/prowizard/prowizard.vcxproj index f55a8ff7..810f12ac 100644 --- a/od-win32/prowizard/prowizard.vcxproj +++ b/od-win32/prowizard/prowizard.vcxproj @@ -39,17 +39,20 @@ Unicode false v141_xp + false StaticLibrary Unicode false v141_xp + false StaticLibrary Unicode v141 + false StaticLibrary diff --git a/od-win32/resources/resource.h b/od-win32/resources/resource.h index f69301d2..e9f458e0 100644 --- a/od-win32/resources/resource.h +++ b/od-win32/resources/resource.h @@ -693,6 +693,8 @@ #define IDC_LOAD 1401 #define IDC_RTCCHOOSER 1401 #define IDC_SCSIROMCHOOSER 1402 +#define IDC_FLASHCHOOSER2 1402 +#define IDC_CUSTOMROMCHOOSER 1402 #define IDC_DELETE 1403 #define IDC_CPUBOARDROMCHOOSER 1403 #define IDC_CONFIGLIST 1404 @@ -1069,6 +1071,8 @@ #define IDC_FILTERKEEPAUTOSCALEASPECT 1710 #define IDC_SOUND_CDPAULAMIX 1710 #define IDC_CS_CIAA_TOD1 1711 +#define IDC_SOUND_CDPAULAMIX2 1711 +#define IDC_SOUND_VOLCNT 1711 #define IDC_CS_CIAA_TOD2 1712 #define IDC_CS_EXT 1712 #define IDC_CS_CIAA_TOD3 1713 @@ -1301,6 +1305,10 @@ #define IDC_CONFIGCATEGORY 1860 #define IDC_CHS_SECTORS 1861 #define IDC_CONFIGTAGS 1861 +#define IDC_CUSTOMROMSELECT 1861 +#define IDC_ROM_ADDRESS 1862 +#define IDC_ROM_ADDRESS2 1863 +#define IDC_CUSTOMROMFILE 1864 #define ID__FLOPPYDRIVES 40004 #define ID_FLOPPYDRIVES_DF0 40005 #define ID_ST_CONFIGURATION 40010 @@ -1352,7 +1360,7 @@ #define _APS_3D_CONTROLS 1 #define _APS_NEXT_RESOURCE_VALUE 407 #define _APS_NEXT_COMMAND_VALUE 40050 -#define _APS_NEXT_CONTROL_VALUE 1861 +#define _APS_NEXT_CONTROL_VALUE 1864 #define _APS_NEXT_SYMED_VALUE 101 #endif #endif diff --git a/od-win32/resources/winuae.rc b/od-win32/resources/winuae.rc index c84b6919..28bb43ac 100644 --- a/od-win32/resources/winuae.rc +++ b/od-win32/resources/winuae.rc @@ -3,10 +3,10 @@ #include "winres.h" #include "resource.h" ///////////////////////////////////////////////////////////////////////////// -// English resources +// English (United Kingdom) resources -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG) +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK #pragma code_page(1252) ///////////////////////////////////////////////////////////////////////////// @@ -113,12 +113,12 @@ BEGIN PUSHBUTTON "Move down",IDC_BOARDS_DOWN,203,241,78,14 END -IDD_KICKSTART DIALOGEX 0, 0, 396, 259 +IDD_KICKSTART DIALOGEX 0, 0, 396, 305 STYLE DS_LOCALEDIT | DS_SETFONT | DS_3DLOOK | DS_CONTROL | WS_CHILD EXSTYLE WS_EX_CONTEXTHELP FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN - GROUPBOX "System ROM Settings",IDC_STATIC,1,0,394,91 + GROUPBOX "System ROM Settings",IDC_STATIC,1,0,394,89 LTEXT "Main ROM file:",IDC_ROMTEXT,14,13,263,10 COMBOBOX IDC_ROMFILE,12,25,361,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "...",IDC_KICKCHOOSER,376,25,10,15 @@ -126,22 +126,29 @@ BEGIN COMBOBOX IDC_ROMFILE2,12,54,361,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "...",IDC_ROMCHOOSER2,376,55,10,15 CONTROL "MapROM emulation [] Creates a BlizKick-compatible memory area.",IDC_MAPROM, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,87,73,104,12 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,87,72,104,12 CONTROL "ShapeShifter support [] Patches the system ROM for ShapeShifter compatibility.",IDC_KICKSHIFTER, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,195,73,106,13 - GROUPBOX "Miscellaneous",IDC_STATIC,0,96,395,109 - LTEXT "Cartridge ROM file:",IDC_FLASHTEXT2,12,111,265,10 - COMBOBOX IDC_CARTFILE,12,124,361,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "...",IDC_CARTCHOOSER,376,123,10,15 - LTEXT "Flash RAM or A2286/A2386SX BIOS CMOS RAM file:",IDC_FLASHTEXT,12,141,265,10 - EDITTEXT IDC_FLASHFILE,12,153,361,12,ES_AUTOHSCROLL - PUSHBUTTON "...",IDC_FLASHCHOOSER,376,151,10,15 - LTEXT "Real Time Clock file",IDC_STATIC,12,167,313,15,SS_CENTERIMAGE - EDITTEXT IDC_RTCFILE,12,183,361,12,ES_AUTOHSCROLL - PUSHBUTTON "...",IDC_RTCCHOOSER,376,181,10,15 - GROUPBOX "Advanced UAE expansion board/Boot ROM Settings",IDC_STATIC,0,209,395,48 - COMBOBOX IDC_UAEBOARD_TYPE,96,228,155,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - RTEXT "Board type:",IDC_STATIC,20,227,67,15,SS_CENTERIMAGE + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,195,72,106,13 + GROUPBOX "Miscellaneous",IDC_STATIC,0,157,395,109 + LTEXT "Cartridge ROM file:",IDC_FLASHTEXT2,12,172,265,10 + COMBOBOX IDC_CARTFILE,12,185,361,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "...",IDC_CARTCHOOSER,376,185,10,15 + LTEXT "Flash RAM or A2286/A2386SX BIOS CMOS RAM file:",IDC_FLASHTEXT,12,202,265,10 + EDITTEXT IDC_FLASHFILE,12,214,361,12,ES_AUTOHSCROLL + PUSHBUTTON "...",IDC_FLASHCHOOSER,376,213,10,15 + LTEXT "Real Time Clock file",IDC_STATIC,12,228,313,15,SS_CENTERIMAGE + EDITTEXT IDC_RTCFILE,12,244,361,12,ES_AUTOHSCROLL + PUSHBUTTON "...",IDC_RTCCHOOSER,376,243,10,15 + GROUPBOX "Advanced UAE expansion board/Boot ROM Settings",IDC_STATIC,0,269,395,36 + COMBOBOX IDC_UAEBOARD_TYPE,96,284,155,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + RTEXT "Board type:",IDC_STATIC,20,282,67,15,SS_CENTERIMAGE + RTEXT "Address range",IDC_STATIC,158,110,54,15,SS_CENTERIMAGE + EDITTEXT IDC_ROM_ADDRESS,219,110,79,13,ES_AUTOHSCROLL + EDITTEXT IDC_ROM_ADDRESS2,306,110,79,13,ES_AUTOHSCROLL + COMBOBOX IDC_CUSTOMROMSELECT,12,110,135,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX "Advanced Custom ROM Settings",IDC_STATIC,0,93,394,59 + EDITTEXT IDC_CUSTOMROMFILE,12,130,361,12,ES_AUTOHSCROLL + PUSHBUTTON "...",IDC_CUSTOMROMCHOOSER,376,127,10,15 END IDD_DISPLAY DIALOGEX 0, 0, 396, 311 @@ -418,10 +425,10 @@ BEGIN COMBOBOX IDC_SOUNDCARDLIST,1,1,393,50,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Sound Emulation",IDC_SOUNDSETTINGS,1,19,132,112 CONTROL "Disabled",IDC_SOUND0,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,13,35,108,10 - CONTROL "Disabled, but emulated",IDC_SOUND1,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,13,53,107,10 - CONTROL "Enabled",IDC_SOUND2,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,13,71,108,10 - CONTROL "Automatic switching",IDC_SOUND_AUTO,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,13,92,108,10 - CONTROL "Include CD and FMV audio",IDC_SOUND_CDPAULAMIX,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,13,108,108,10 + CONTROL "Disabled, but emulated",IDC_SOUND1,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,13,49,107,10 + CONTROL "Enabled",IDC_SOUND2,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,13,63,108,10 + CONTROL "Automatic switching",IDC_SOUND_AUTO,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,13,81,108,10 + CONTROL "Include CD and FMV audio",IDC_SOUND_CDPAULAMIX,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,13,94,108,10 GROUPBOX "Volume",IDC_STATIC,139,19,255,69 RTEXT "Master",IDC_STATIC,160,38,51,10,SS_CENTERIMAGE CONTROL "",IDC_SOUNDVOLUME,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,215,32,105,20 @@ -461,6 +468,7 @@ BEGIN CONTROL "WASAPI",IDC_SOUND_WASAPI,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,292,248,98,10 CONTROL "OpenAL",IDC_SOUND_OPENAL,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,292,262,98,10 CONTROL "PortAudio",IDC_SOUND_PORTAUDIO,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,292,276,98,10 + CONTROL "Volume Counter mode",IDC_SOUND_VOLCNT,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,13,114,108,10 END IDD_LOADSAVE DIALOGEX 0, 0, 396, 318 @@ -1386,8 +1394,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 4,1,0,0 - PRODUCTVERSION 4,1,0,0 + FILEVERSION 4,2,0,0 + PRODUCTVERSION 4,2,0,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -1403,12 +1411,12 @@ BEGIN BLOCK "040904b0" BEGIN VALUE "FileDescription", "WinUAE" - VALUE "FileVersion", "4.1.0.0" + VALUE "FileVersion", "4.2.0.0" VALUE "InternalName", "WinUAE" - VALUE "LegalCopyright", "© 1996-2018 under the GNU Public License (GPL)" + VALUE "LegalCopyright", "© 1996-2019 under the GNU Public License (GPL)" VALUE "OriginalFilename", "WinUAE.exe" VALUE "ProductName", "WinUAE" - VALUE "ProductVersion", "4.1.0.0" + VALUE "ProductVersion", "4.2.0.0" END END BLOCK "VarFileInfo" @@ -1544,7 +1552,7 @@ BEGIN IDD_KICKSTART, DIALOG BEGIN - BOTTOMMARGIN, 258 + BOTTOMMARGIN, 304 END IDD_DISPLAY, DIALOG @@ -2166,7 +2174,7 @@ BEGIN IDS_TABLET_MODE "-\nTablet emulation\n" END -#endif // English resources +#endif // English (United Kingdom) resources ///////////////////////////////////////////////////////////////////////////// diff --git a/od-win32/uaeunp/uaeunp.vcxproj b/od-win32/uaeunp/uaeunp.vcxproj index ecff390b..cf5ba802 100644 --- a/od-win32/uaeunp/uaeunp.vcxproj +++ b/od-win32/uaeunp/uaeunp.vcxproj @@ -26,17 +26,20 @@ Unicode true v141 + false Application Unicode true v141 + false Application Unicode v141 + false diff --git a/od-win32/unpackers/unpackers.vcxproj b/od-win32/unpackers/unpackers.vcxproj index 9e403810..305fa1e7 100644 --- a/od-win32/unpackers/unpackers.vcxproj +++ b/od-win32/unpackers/unpackers.vcxproj @@ -30,7 +30,7 @@ {98BA115B-829F-4085-9729-ABD0D779A60A} Win32Proj unpackers - 8.1 + 7.0 @@ -50,14 +50,14 @@ false false Unicode - v141_xp + v141 StaticLibrary false false Unicode - v141_xp + v141 StaticLibrary diff --git a/od-win32/win32.cpp b/od-win32/win32.cpp index 72dd68b3..ac2adb56 100644 --- a/od-win32/win32.cpp +++ b/od-win32/win32.cpp @@ -3493,7 +3493,7 @@ void logging_init (void) SystemInfo.wProcessorArchitecture, SystemInfo.wProcessorLevel, SystemInfo.wProcessorRevision, SystemInfo.dwNumberOfProcessors, filedate, os_touch); write_log (_T("\n(c) 1995-2001 Bernd Schmidt - Core UAE concept and implementation.") - _T("\n(c) 1998-2018 Toni Wilen - Win32 port, core code updates.") + _T("\n(c) 1998-2019 Toni Wilen - Win32 port, core code updates.") _T("\n(c) 1996-2001 Brian King - Win32 port, Picasso96 RTG, and GUI.") _T("\n(c) 1996-1999 Mathias Ortmann - Win32 port and bsdsocket support.") _T("\n(c) 2000-2001 Bernd Meyer - JIT engine.") diff --git a/od-win32/win32.h b/od-win32/win32.h index b875e660..addf6ff9 100644 --- a/od-win32/win32.h +++ b/od-win32/win32.h @@ -15,17 +15,17 @@ #define GETBDM(x) (((x) - ((x / 10000) * 10000)) / 100) #define GETBDD(x) ((x) % 100) -#define WINUAEPUBLICBETA 0 +#define WINUAEPUBLICBETA 1 #define LANG_DLL 1 #define LANG_DLL_FULL_VERSION_MATCH 1 #if WINUAEPUBLICBETA -#define WINUAEBETA _T("12") +#define WINUAEBETA _T("1") #else #define WINUAEBETA _T("") #endif -#define WINUAEDATE MAKEBD(2018, 12, 5) +#define WINUAEDATE MAKEBD(2019, 1, 27) //#define WINUAEEXTRA _T("AmiKit Preview") //#define WINUAEEXTRA _T("Amiga Forever Edition") diff --git a/od-win32/winuae_msvc15/winuae_msvc.vcxproj b/od-win32/winuae_msvc15/winuae_msvc.vcxproj index 43e11cf3..90f06822 100644 --- a/od-win32/winuae_msvc15/winuae_msvc.vcxproj +++ b/od-win32/winuae_msvc15/winuae_msvc.vcxproj @@ -48,24 +48,28 @@ Unicode true v141_xp + false Application false Unicode v141_xp + false Application false Unicode v141_xp + false Application false Unicode v141_xp + false Application @@ -73,24 +77,28 @@ Unicode true v141 + false Application false Unicode v141 + false Application false Unicode v141 + false Application false Unicode v141 + false @@ -156,58 +164,58 @@ winuae64 winuae64 winuae64 - $(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.16299.0\ucrt;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.16299.0\winrt;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.16299.0\um;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.16299.0\shared;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.16299.0\km;c:\dev\include;$(IncludePath) - $(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.16299.0\ucrt;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.16299.0\winrt;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.16299.0\um;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.16299.0\shared;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.16299.0\km;c:\dev\include;$(IncludePath) + $(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.17763.0\ucrt;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.17763.0\winrt;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.17763.0\um;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.17763.0\shared;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.17763.0\km;c:\dev\include;$(IncludePath) + $(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.17763.0\ucrt;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.17763.0\winrt;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.17763.0\um;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.17763.0\shared;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.17763.0\km;c:\dev\include;$(IncludePath) C:\dev\lib;$(LibraryPath) C:\dev\lib;$(LibraryPath) C:\dev\lib;$(LibraryPath) - $(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.16299.0\ucrt;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.16299.0\winrt;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.16299.0\um;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.16299.0\shared;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.16299.0\km;c:\dev\include;$(IncludePath) - $(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.16299.0\ucrt;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.16299.0\winrt;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.16299.0\um;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.16299.0\shared;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.16299.0\km;c:\dev\include;$(IncludePath) + $(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.17763.0\ucrt;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.17763.0\winrt;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.17763.0\um;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.17763.0\shared;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.17763.0\km;c:\dev\include;$(IncludePath) + $(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.17763.0\ucrt;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.17763.0\winrt;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.17763.0\um;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.17763.0\shared;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.17763.0\km;c:\dev\include;$(IncludePath) $(VC_ReferencesPath_x86); C:\dev\lib;$(LibraryPath) true true true true - $(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.16299.0\ucrt;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.16299.0\winrt;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.16299.0\um;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.16299.0\shared;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.16299.0\km;c:\dev\include;$(IncludePath) + $(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.17763.0\ucrt;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.17763.0\winrt;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.17763.0\um;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.17763.0\shared;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.17763.0\km;c:\dev\include;$(IncludePath) C:\dev\lib\x64;$(LibraryPath) - $(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.16299.0\ucrt;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.16299.0\winrt;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.16299.0\um;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.16299.0\shared;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.16299.0\km;c:\dev\include;$(IncludePath) - $(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.16299.0\ucrt;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.16299.0\winrt;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.16299.0\um;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.16299.0\shared;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.16299.0\km;c:\dev\include;$(IncludePath) + $(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.17763.0\ucrt;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.17763.0\winrt;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.17763.0\um;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.17763.0\shared;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.17763.0\km;c:\dev\include;$(IncludePath) + $(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.17763.0\ucrt;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.17763.0\winrt;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.17763.0\um;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.17763.0\shared;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.17763.0\km;c:\dev\include;$(IncludePath) C:\dev\lib\x64;$(LibraryPath) C:\dev\lib\x64;$(LibraryPath) - $(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.16299.0\ucrt;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.16299.0\winrt;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.16299.0\um;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.16299.0\shared;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.16299.0\km;c:\dev\include;$(IncludePath) + $(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.17763.0\ucrt;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.17763.0\winrt;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.17763.0\um;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.17763.0\shared;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.17763.0\km;c:\dev\include;$(IncludePath) C:\dev\lib\x64;$(LibraryPath) - $(MSBuildProgramFiles32)\Windows Kits\10\bin\10.0.16299.0\x64;$(ExecutablePath) + $(MSBuildProgramFiles32)\Windows Kits\10\bin\10.0.17763.0\x64;$(ExecutablePath) - $(MSBuildProgramFiles32)\Windows Kits\10\bin\10.0.16299.0\x86;$(ExecutablePath) + $(MSBuildProgramFiles32)\Windows Kits\10\bin\10.0.17763.0\x86;$(ExecutablePath) $(VC_IncludePath);$(WindowsSDK_IncludePath);$(MSBuild_ExecutablePath);$(VC_LibraryPath_x86); - $(MSBuildProgramFiles32)\Windows Kits\10\bin\10.0.16299.0\x86;$(ExecutablePath) + $(MSBuildProgramFiles32)\Windows Kits\10\bin\10.0.17763.0\x86;$(ExecutablePath) $(VC_IncludePath);$(WindowsSDK_IncludePath);$(MSBuild_ExecutablePath);$(VC_LibraryPath_x86); - $(MSBuildProgramFiles32)\Windows Kits\10\bin\10.0.16299.0\x86;$(ExecutablePath) + $(MSBuildProgramFiles32)\Windows Kits\10\bin\10.0.17763.0\x86;$(ExecutablePath) $(VC_IncludePath);$(WindowsSDK_IncludePath);$(MSBuild_ExecutablePath);$(VC_LibraryPath_x86); - $(MSBuildProgramFiles32)\Windows Kits\10\bin\10.0.16299.0\x64;$(ExecutablePath) + $(MSBuildProgramFiles32)\Windows Kits\10\bin\10.0.17763.0\x64;$(ExecutablePath) - $(MSBuildProgramFiles32)\Windows Kits\10\bin\10.0.16299.0\x64;$(ExecutablePath) + $(MSBuildProgramFiles32)\Windows Kits\10\bin\10.0.17763.0\x64;$(ExecutablePath) NativeMinimumRules.ruleset - $(MSBuildProgramFiles32)\Windows Kits\10\bin\10.0.16299.0\x86;$(ExecutablePath) + $(MSBuildProgramFiles32)\Windows Kits\10\bin\10.0.17763.0\x86;$(ExecutablePath) $(VC_IncludePath);$(WindowsSDK_IncludePath);$(MSBuild_ExecutablePath);$(VC_LibraryPath_x86); - $(MSBuildProgramFiles32)\Windows Kits\10\bin\10.0.16299.0\x64;$(ExecutablePath) + $(MSBuildProgramFiles32)\Windows Kits\10\bin\10.0.17763.0\x64;$(ExecutablePath) @@ -274,7 +282,6 @@ ../resources/winuae.exe.manifest - PerMonitorHighDPIAware @@ -414,7 +421,6 @@ ../resources/winuae.exe.manifest - PerMonitorHighDPIAware $(IntDir)$(TargetName)$(TargetExt).embed.manifest /validate_manifest %(AdditionalOptions) @@ -495,7 +501,6 @@ ../resources/winuae.exe.manifest - PerMonitorHighDPIAware $(IntDir)$(TargetName)$(TargetExt).embed.manifest /validate_manifest %(AdditionalOptions) @@ -728,7 +733,6 @@ ../resources/winuae.exe.manifest - PerMonitorHighDPIAware diff --git a/rommgr.cpp b/rommgr.cpp index 60f67f53..fd197d66 100644 --- a/rommgr.cpp +++ b/rommgr.cpp @@ -1982,23 +1982,23 @@ struct zfile *read_rom_name (const TCHAR *filename) f = rom_fopen2(filename, _T("rb"), ZFD_NORMAL); if (f) { uae_u8 tmp[11] = { 0 }; - zfile_fread (tmp, sizeof tmp, 1, f); - if (!memcmp (tmp, "AMIROMTYPE1", sizeof tmp)) { + zfile_fread(tmp, sizeof tmp, 1, f); + if (!memcmp(tmp, "AMIROMTYPE1", sizeof tmp)) { struct zfile *df; int size; uae_u8 *buf; - addkeydir (filename); - zfile_fseek (f, 0, SEEK_END); - size = zfile_ftell (f) - sizeof tmp; - zfile_fseek (f, sizeof tmp, SEEK_SET); - buf = xmalloc (uae_u8, size); - zfile_fread (buf, size, 1, f); - df = zfile_fopen_empty (f, _T("tmp.rom"), size); - decode_cloanto_rom_do (buf, size, size); - zfile_fwrite (buf, size, 1, df); - zfile_fclose (f); - xfree (buf); - zfile_fseek (df, 0, SEEK_SET); + addkeydir(filename); + zfile_fseek(f, 0, SEEK_END); + size = zfile_ftell(f) - sizeof tmp; + zfile_fseek(f, sizeof tmp, SEEK_SET); + buf = xmalloc(uae_u8, size); + zfile_fread(buf, size, 1, f); + df = zfile_fopen_empty(f, _T("tmp.rom"), size); + decode_cloanto_rom_do(buf, size, size); + zfile_fwrite(buf, size, 1, df); + zfile_fclose(f); + xfree(buf); + zfile_fseek(df, 0, SEEK_SET); f = df; } else { zfile_fseek (f, -((int)sizeof tmp), SEEK_CUR); -- 2.47.3