3500b10

diff --git a/include/options.h b/include/options.h
index 5d749eeaeaa5cf66949aca87a547ef0e3e7f66c4..ddc8e54a387fbcedc77e30e29c4edde1c0ac7320 100644 (file)
--- a/include/options.h
+++ b/include/options.h
@@ -15,8 +15,8 @@
 #include "traps.h"
 
 #define UAEMAJOR 3
-#define UAEMINOR 4
-#define UAESUBREV 1
+#define UAEMINOR 5
+#define UAESUBREV 0
 
 typedef enum { KBD_LANG_US, KBD_LANG_DK, KBD_LANG_DE, KBD_LANG_SE, KBD_LANG_FR, KBD_LANG_IT, KBD_LANG_ES } KbdLang;
 

diff --git a/od-win32/resources/winuae.rc b/od-win32/resources/winuae.rc
index 7f2bfe86f964d8da449600c9260ac3c9e22e86c8..54a46ee021eb0835b627435e8562c9723ceddf37 100644 (file)
--- a/od-win32/resources/winuae.rc
+++ b/od-win32/resources/winuae.rc
@@ -1337,12 +1337,12 @@ BEGIN
         BLOCK "040904b0"
         BEGIN
             VALUE "FileDescription", "WinUAE"
-            VALUE "FileVersion", "3.4.1.0"
+            VALUE "FileVersion", "3.5.0.0"
             VALUE "InternalName", "WinUAE"
             VALUE "LegalCopyright", "© 1996-2017 under the GNU Public License (GPL)"
             VALUE "OriginalFilename", "WinUAE.exe"
             VALUE "ProductName", "WinUAE"
-            VALUE "ProductVersion", "3.4.1.0"
+            VALUE "ProductVersion", "3.5.0.0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/od-win32/win32.h b/od-win32/win32.h
index ac0b88d4bbe5a01316a38c4e0f18a31f48832eac..e9e4fc2811c82e5a7cbb1538af62d68042f183d1 100644 (file)
--- 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("9")
+#define WINUAEBETA _T("10")
 #else
 #define WINUAEBETA _T("")
 #endif
 
-#define WINUAEDATE MAKEBD(2017, 5, 20)
+#define WINUAEDATE MAKEBD(2017, 5, 28)
 
 //#define WINUAEEXTRA _T("AmiKit Preview")
 //#define WINUAEEXTRA _T("Amiga Forever Edition")

diff --git a/od-win32/win32gui.cpp b/od-win32/win32gui.cpp
index 67e417414e8190043b3837bf18fa7b8a51208a33..d4a32db79312d45b9b0aacf8cdb8aeae40fd7810 100644 (file)
--- a/od-win32/win32gui.cpp
+++ b/od-win32/win32gui.cpp
@@ -4302,6 +4302,7 @@ void InitializeListView (HWND hDlg)
        TCHAR tmp[10], tmp2[MAX_DPATH];
        int listview_column_width[HARDDISK_COLUMNS];
        DWORD extraflags = 0;
+       int listpadding;
 
        if (cachedlist) {
                if (lv_old_type >= 0) {
@@ -4391,6 +4392,8 @@ void InitializeListView (HWND hDlg)
 
        }
 
+       scalaresource_listview_font_info(&listpadding);
+       listpadding *= 2;
        int flags = LVS_EX_DOUBLEBUFFER | extraflags;
        if (lv_type != LV_MISC1)
                flags |= LVS_EX_ONECLICKACTIVATE | LVS_EX_UNDERLINEHOT | LVS_EX_FULLROWSELECT;
@@ -4401,7 +4404,7 @@ void InitializeListView (HWND hDlg)
        cachedlist = list;
 
        for(i = 0; i < listview_num_columns; i++)
-               listview_column_width[i] = ListView_GetStringWidth (list, column_heading[i]) + 15;
+               listview_column_width[i] = ListView_GetStringWidth (list, column_heading[i]) + listpadding;
 
        // If there are no columns, then insert some
        lvcolumn.mask = LVCF_WIDTH;
@@ -4527,7 +4530,7 @@ void InitializeListView (HWND hDlg)
                        lvstruct.iItem    = i;
                        lvstruct.iSubItem = 0;
                        result = ListView_InsertItem (list, &lvstruct);
-                       width = ListView_GetStringWidth (list, lvstruct.pszText) + 15;
+                       width = ListView_GetStringWidth (list, lvstruct.pszText) + listpadding;
                        if (width > listview_column_width[0])
                                listview_column_width[0] = width;
                        entry++;
@@ -4599,7 +4602,7 @@ void InitializeListView (HWND hDlg)
                        lvstruct.iSubItem = 0;
                        result = ListView_InsertItem (list, &lvstruct);
                        ListView_SetItemState (list, i, INDEXTOSTATEIMAGEMASK(type ? 0 : (checked ? 2 : 1)), LVIS_STATEIMAGEMASK);
-                       width = ListView_GetStringWidth (list, lvstruct.pszText) + 30;
+                       width = ListView_GetStringWidth (list, lvstruct.pszText) + listpadding;
                        if (width > listview_column_width[0])
                                listview_column_width[0] = width;
                        entry++;
@@ -4633,7 +4636,7 @@ void InitializeListView (HWND hDlg)
                        if (drv >= 0)
                                _stprintf (tmp, _T("DF%d:"), drv);
                        ListView_SetItemText (list, result, 2, tmp);
-                       width = ListView_GetStringWidth (list, lvstruct.pszText) + 15;
+                       width = ListView_GetStringWidth (list, lvstruct.pszText) + listpadding;
                        if (width > listview_column_width[0])
                                listview_column_width[0] = width;
                        entry++;
@@ -4661,7 +4664,7 @@ void InitializeListView (HWND hDlg)
                        result = ListView_InsertItem (list, &lvstruct);
                        ListView_SetItemText(list, result, 1, tmp);
                        ListView_SetItemText(list, result, 2, cds->name);
-                       width = ListView_GetStringWidth(list, cds->name) + 10;
+                       width = ListView_GetStringWidth(list, cds->name) + listpadding;
                        if (width > listview_column_width[2])
                                listview_column_width[2] = width;
                        break;
@@ -4811,38 +4814,38 @@ void InitializeListView (HWND hDlg)
                                listview_column_width[0] = 20;
 
                                ListView_SetItemText(list, result, 1, devname_str);
-                               width = ListView_GetStringWidth(list, devname_str) + 10;
+                               width = ListView_GetStringWidth(list, devname_str) + listpadding;
                                if(width > listview_column_width[1])
                                        listview_column_width[1] = width;
 
                                ListView_SetItemText(list, result, 2, volname_str);
-                               width = ListView_GetStringWidth(list, volname_str) + 10;
+                               width = ListView_GetStringWidth(list, volname_str) + listpadding;
                                if(width > listview_column_width[2])
                                        listview_column_width[2] = width;
 
                                listview_column_width[3] = 150;
                                ListView_SetItemText(list, result, 3, rootdirp);
-                               width = ListView_GetStringWidth(list, rootdirp) + 10;
+                               width = ListView_GetStringWidth(list, rootdirp) + listpadding;
                                if(width > listview_column_width[3])
                                        listview_column_width[3] = width;
 
                                ListView_SetItemText(list, result, 4, readwrite_str);
-                               width = ListView_GetStringWidth(list, readwrite_str) + 10;
+                               width = ListView_GetStringWidth(list, readwrite_str) + listpadding;
                                if(width > listview_column_width[4])
                                        listview_column_width[4] = width;
 
                                ListView_SetItemText(list, result, 5, blocksize_str);
-                               width = ListView_GetStringWidth(list, blocksize_str) + 10;
+                               width = ListView_GetStringWidth(list, blocksize_str) + listpadding;
                                if(width > listview_column_width[5])
                                        listview_column_width[5] = width;
 
                                ListView_SetItemText(list, result, 6, size_str);
-                               width = ListView_GetStringWidth(list, size_str) + 10;
+                               width = ListView_GetStringWidth(list, size_str) + listpadding;
                                if(width > listview_column_width[6])
                                        listview_column_width[6] = width;
 
                                ListView_SetItemText(list, result, 7, bootpri_str);
-                               width = ListView_GetStringWidth(list, bootpri_str) + 10;
+                               width = ListView_GetStringWidth(list, bootpri_str) + listpadding;
                                if(width > listview_column_width[7] )
                                        listview_column_width[7] = width;
                        }
@@ -5324,6 +5327,7 @@ static INT_PTR CALLBACK LoadSaveDlgProc (HWND hDlg, UINT msg, WPARAM wParam, LPA
        {
        case WM_INITDIALOG:
                recursive++;
+               scaleresource_setfont (hDlg);
                if (!configstore) {
                        DeleteConfigTree (hDlg);
                        CreateConfigStore (NULL, FALSE);
@@ -5859,6 +5863,7 @@ static INT_PTR CALLBACK PathsDlgProc (HWND hDlg, UINT msg, WPARAM wParam, LPARAM
        {
        case WM_INITDIALOG:
                recursive++;
+               scaleresource_setfont (hDlg);
                pages[PATHS_ID] = hDlg;
                setac (hDlg, IDC_PATHS_ROM);
                setac (hDlg, IDC_PATHS_CONFIG);
@@ -6414,6 +6419,7 @@ static INT_PTR CALLBACK QuickstartDlgProc (HWND hDlg, UINT msg, WPARAM wParam, L
        {
        case WM_INITDIALOG:
                {
+                       scaleresource_setfont (hDlg);
                        int ids[] = { IDC_DF0TEXTQ, IDC_DF1TEXTQ, -1 };
                        pages[QUICKSTART_ID] = hDlg;
                        currentpage = QUICKSTART_ID;
@@ -6631,6 +6637,7 @@ static INT_PTR CALLBACK AboutDlgProc (HWND hDlg, UINT msg, WPARAM wParam, LPARAM
        switch( msg )
        {
        case WM_INITDIALOG:
+               scaleresource_setfont (hDlg);
                pages[ABOUT_ID] = hDlg;
                currentpage = ABOUT_ID;
                init_aboutdlg (hDlg);
@@ -7613,6 +7620,7 @@ static INT_PTR CALLBACK DisplayDlgProc (HWND hDlg, UINT msg, WPARAM wParam, LPAR
        switch (msg)
        {
        case WM_INITDIALOG:
+               scaleresource_setfont (hDlg);
                pages[DISPLAY_ID] = hDlg;
                currentpage = DISPLAY_ID;
                SendDlgItemMessage (hDlg, IDC_FRAMERATE, TBM_SETPAGESIZE, 0, 1);
@@ -7821,6 +7829,7 @@ static INT_PTR CALLBACK ChipsetDlgProc (HWND hDlg, UINT msg, WPARAM wParam, LPAR
 
        switch (msg) {
        case WM_INITDIALOG:
+               scaleresource_setfont (hDlg);
                pages[CHIPSET_ID] = hDlg;
                currentpage = CHIPSET_ID;
 
@@ -8181,6 +8190,7 @@ static INT_PTR CALLBACK ChipsetDlgProc2 (HWND hDlg, UINT msg, WPARAM wParam, LPA
 
        switch (msg) {
        case WM_INITDIALOG:
+               scaleresource_setfont (hDlg);
                pages[CHIPSET2_ID] = hDlg;
                currentpage = CHIPSET2_ID;
                cs_compatible = workprefs.cs_compatible;
@@ -8352,7 +8362,7 @@ static void setfastram_selectmenu(HWND hDlg, int mode)
        setchecked(hDlg, IDC_FASTMEMNOAUTOCONFIG, rb && rb->manual_config);
        if (rb) {
                if (rb->manual_config) {
-                       if (rb->end_address <= rb->start_address || rb->start_address + rb->size >= rb->end_address)
+                       if (rb->end_address <= rb->start_address || rb->start_address + rb->size < rb->end_address)
                                rb->end_address = rb->start_address + rb->size - 1;
                } else {
                        rb->start_address = 0;
@@ -9480,6 +9490,7 @@ static INT_PTR CALLBACK Expansion2DlgProc(HWND hDlg, UINT msg, WPARAM wParam, LP
                case WM_INITDIALOG:
                {
                        recursive++;
+                       scaleresource_setfont (hDlg);
                        pages[EXPANSION2_ID] = hDlg;
                        currentpage = EXPANSION2_ID;
                        int ids[] = { IDC_SCSIROMFILE, IDC_CPUBOARDROMFILE, -1 };
@@ -9862,6 +9873,7 @@ static INT_PTR CALLBACK ExpansionDlgProc (HWND hDlg, UINT msg, WPARAM wParam, LP
        switch (msg)
        {
        case WM_INITDIALOG:
+               scaleresource_setfont (hDlg);
                pages[EXPANSION_ID] = hDlg;
                currentpage = EXPANSION_ID;
 
@@ -10139,6 +10151,7 @@ static INT_PTR CALLBACK BoardsDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM
        {
                case WM_INITDIALOG:
                recursive++;
+               scaleresource_setfont (hDlg);
                pages[BOARD_ID] = hDlg;
                currentpage = BOARD_ID;
                setchecked(hDlg, IDC_AUTOCONFIGCUSTOMSORT, workprefs.autoconfig_custom_sort);
@@ -10266,6 +10279,7 @@ static INT_PTR CALLBACK MemoryDlgProc (HWND hDlg, UINT msg, WPARAM wParam, LPARA
        {
        case WM_INITDIALOG:
                recursive++;
+               scaleresource_setfont (hDlg);
                pages[MEMORY_ID] = hDlg;
                currentpage = MEMORY_ID;
                SendDlgItemMessage (hDlg, IDC_CHIPMEM, TBM_SETRANGE, TRUE, MAKELONG (MIN_CHIP_MEM, MAX_CHIP_MEM));
@@ -10575,6 +10589,7 @@ static INT_PTR CALLBACK KickstartDlgProc (HWND hDlg, UINT msg, WPARAM wParam, LP
        {
        case WM_INITDIALOG:
                {
+                       scaleresource_setfont (hDlg);
                        int ids[] = { IDC_ROMFILE, IDC_ROMFILE2, IDC_CARTFILE, -1 };
                        pages[KICKSTART_ID] = hDlg;
                        currentpage = KICKSTART_ID;
@@ -11000,6 +11015,7 @@ static INT_PTR MiscDlgProc (HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam)
        switch (msg)
        {
        case WM_INITDIALOG:
+               scaleresource_setfont (hDlg);
                pages[currentpage] = hDlg;
                InitializeListView (hDlg);
                values_to_miscdlg (hDlg);
@@ -11587,6 +11603,7 @@ static INT_PTR CALLBACK CPUDlgProc (HWND hDlg, UINT msg, WPARAM wParam, LPARAM l
        switch (msg) {
        case WM_INITDIALOG:
                recursive++;
+               scaleresource_setfont (hDlg);
                pages[CPU_ID] = hDlg;
                currentpage = CPU_ID;
                SendDlgItemMessage (hDlg, IDC_CACHE, TBM_SETRANGE, TRUE, MAKELONG (MIN_CACHE_SIZE, MAX_CACHE_SIZE));
@@ -12103,6 +12120,7 @@ static INT_PTR CALLBACK SoundDlgProc (HWND hDlg, UINT msg, WPARAM wParam, LPARAM
        case WM_INITDIALOG:
                {
                        recursive++;
+                       scaleresource_setfont (hDlg);
                        sound_loaddrivesamples ();
                        SendDlgItemMessage (hDlg, IDC_SOUNDBUFFERRAM, TBM_SETRANGE, TRUE, MAKELONG (MIN_SOUND_MEM, MAX_SOUND_MEM));
                        SendDlgItemMessage (hDlg, IDC_SOUNDBUFFERRAM, TBM_SETPAGESIZE, 0, 1);
@@ -12485,9 +12503,15 @@ static void sethardfile (HWND hDlg)
        bool disables = !rdb || (rdb && current_hfdlg.ci.controller_type == HD_CONTROLLER_TYPE_UAE);
        bool ide = current_hfdlg.ci.controller_type >= HD_CONTROLLER_TYPE_IDE_FIRST && current_hfdlg.ci.controller_type <= HD_CONTROLLER_TYPE_IDE_LAST;
        bool scsi = current_hfdlg.ci.controller_type >= HD_CONTROLLER_TYPE_SCSI_FIRST && current_hfdlg.ci.controller_type <= HD_CONTROLLER_TYPE_SCSI_LAST;
+       const struct expansionromtype *ert = get_unit_expansion_rom(current_hfdlg.ci.controller_type);
 
-       if (current_hfdlg.ci.controller_unit >= 8)
-               current_hfdlg.ci.unit_feature_level = HD_LEVEL_SASI_CHS;
+       if (ert && current_hfdlg.ci.controller_unit >= 8) {
+               if (!_tcscmp(ert->name, _T("a2091"))) {
+                       current_hfdlg.ci.unit_feature_level = HD_LEVEL_SASI_CHS;
+               } else if (!_tcscmp(ert->name, _T("a2090a"))) {
+                       current_hfdlg.ci.unit_feature_level = HD_LEVEL_SCSI_1;
+               }
+       }
 
        if (!disables)
                current_hfdlg.ci.bootpri = 0;
@@ -13747,6 +13771,7 @@ static INT_PTR CALLBACK HarddiskDlgProc (HWND hDlg, UINT msg, WPARAM wParam, LPA
 {
        switch (msg) {
        case WM_INITDIALOG:
+               scaleresource_setfont (hDlg);
                clicked_entry = 0;
                pages[HARDDISK_ID] = hDlg;
                currentpage = HARDDISK_ID;
@@ -14337,6 +14362,7 @@ static INT_PTR CALLBACK FloppyDlgProc (HWND hDlg, UINT msg, WPARAM wParam, LPARA
                        TCHAR ft35dd[20], ft35hd[20], ft35ddpc[20], ft35hdpc[20],  ft525sd[20], ftdis[20], ft35ddescom[20];
                        int df0texts[] = { IDC_DF0TEXT, IDC_DF1TEXT, IDC_DF2TEXT, IDC_DF3TEXT, -1 };
 
+                       scaleresource_setfont (hDlg);
                        WIN32GUI_LoadUIString (IDS_FLOPPYTYPE35DD, ft35dd, sizeof ft35dd / sizeof (TCHAR));
                        WIN32GUI_LoadUIString (IDS_FLOPPYTYPE35HD, ft35hd, sizeof ft35hd / sizeof (TCHAR));
                        WIN32GUI_LoadUIString (IDS_FLOPPYTYPE35DDPC, ft35ddpc, sizeof ft35ddpc / sizeof (TCHAR));
@@ -14669,6 +14695,7 @@ static INT_PTR CALLBACK SwapperDlgProc (HWND hDlg, UINT msg, WPARAM wParam, LPAR
        switch (msg)
        {
        case WM_INITDIALOG:
+               scaleresource_setfont (hDlg);
                pages[DISK_ID] = hDlg;
                currentpage = DISK_ID;
                InitializeListView (hDlg);
@@ -15487,6 +15514,7 @@ static INT_PTR CALLBACK GamePortsDlgProc (HWND hDlg, UINT msg, WPARAM wParam, LP
        case WM_INITDIALOG:
                {
                        recursive++;
+                       scaleresource_setfont (hDlg);
                        pages[GAMEPORTS_ID] = hDlg;
                        currentpage = GAMEPORTS_ID;
 
@@ -15669,6 +15697,7 @@ static INT_PTR CALLBACK IOPortsDlgProc (HWND hDlg, UINT msg, WPARAM wParam, LPAR
        {
        case WM_INITDIALOG:
                recursive++;
+               scaleresource_setfont (hDlg);
                pages[IOPORTS_ID] = hDlg;
                currentpage = IOPORTS_ID;
                init_portsdlg (hDlg);
@@ -16754,6 +16783,7 @@ static INT_PTR CALLBACK InputMapDlgProc (HWND hDlg, UINT msg, WPARAM wParam, LPA
                return TRUE;
        case WM_INITDIALOG:
        {
+               scaleresource_setfont (hDlg);
                inputmap_port_remap = -1;
                inputmap_remap_counter = -1;
                inputmap_view_offset = 0;
@@ -17242,6 +17272,7 @@ static INT_PTR CALLBACK InputDlgProc (HWND hDlg, UINT msg, WPARAM wParam, LPARAM
        {
        case WM_INITDIALOG:
                recursive++;
+               scaleresource_setfont (hDlg);
                pages[INPUT_ID] = hDlg;
                currentpage = INPUT_ID;
                inputdevice_updateconfig (NULL, &workprefs);
@@ -18109,7 +18140,7 @@ static INT_PTR CALLBACK hw3dDlgProc (HWND hDlg, UINT msg, WPARAM wParam, LPARAM
                        }
                        firstinit = true;
                }
-
+               scaleresource_setfont (hDlg);
                pages[HW3D_ID] = hDlg;
                currentpage = HW3D_ID;
                SendDlgItemMessage (hDlg, IDC_FILTERASPECT, CB_RESETCONTENT, 0, 0);
@@ -18492,6 +18523,7 @@ static INT_PTR CALLBACK AVIOutputDlgProc (HWND hDlg, UINT msg, WPARAM wParam, LP
        switch(msg)
        {
        case WM_INITDIALOG:
+               scaleresource_setfont (hDlg);
                pages[AVIOUTPUT_ID] = hDlg;
                currentpage = AVIOUTPUT_ID;
                AVIOutput_GetSettings ();
@@ -19034,7 +19066,6 @@ static HWND updatePanel (int id, UINT action)
        tres = scaleresource (ppage[id].nres, hDlg, -1, 0, 0);
        panelDlg = CreateDialogIndirectParam (tres->inst, tres->resource, hDlg, ppage[id].dlgproc, id);
        freescaleresource(tres);
-       scaleresource_setfont (panelDlg);
        
        GetWindowRect (hDlg, &r3w);
        GetClientRect (panelDlg, &r3c);

diff --git a/od-win32/win32gui.h b/od-win32/win32gui.h
index c3fd90b5b87cf9983e07164e88a5e2c6e4e3eb16..d0339e9fae69b2fe0112c8ce31b607d7e33f590f 100644 (file)
--- a/od-win32/win32gui.h
+++ b/od-win32/win32gui.h
@@ -46,5 +46,6 @@ extern int scaleresource_choosefont (HWND hDlg, int fonttype);
 extern void scaleresource_setdefaults (void);
 extern void scaleresource_setfont (HWND hDlg);
 extern void scaleresource_getdpimult (double*, double*, int*, int*);
+extern void scalaresource_listview_font_info(int*);
 
 #endif

diff --git a/od-win32/win32gui_extra.cpp b/od-win32/win32gui_extra.cpp
index 769e69c0c36958c39aea5b29a495fa50711b7f83..6fc81d92b61ad3fdd02a57b0e11c8d542ed20f23 100644 (file)
--- a/od-win32/win32gui_extra.cpp
+++ b/od-win32/win32gui_extra.cpp
@@ -29,6 +29,7 @@ static int fontweight_list = FW_REGULAR;
 static int listviews[16];
 static int listviewcnt;
 static HFONT listviewfont;
+static TEXTMETRIC listview_tm;
 static const TCHAR *fontprefix;
 
 #include <pshpack2.h>
@@ -324,10 +325,20 @@ static void openfont (bool force)
 
        size = -MulDiv (fontsize_list, GetDeviceCaps (hdc, LOGPIXELSY), 72);
        listviewfont = CreateFont (size, 0, 0, 0, fontweight_list, (fontstyle_list & ITALIC_FONTTYPE) != 0, 0, 0, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH | FF_DONTCARE, fontname_list);
+       HGDIOBJ o = SelectObject(hdc, listviewfont);
+       memset(&listview_tm, 0, sizeof listview_tm);
+       listview_tm.tmAveCharWidth = 8;
+       GetTextMetrics(hdc, &listview_tm);
+       SelectObject(hdc, o);
 
        ReleaseDC (NULL, hdc);
 }
 
+void scalaresource_listview_font_info(int *w)
+{
+       *w = listview_tm.tmAveCharWidth;
+}
+
 void scaleresource_setfont (HWND hDlg)
 {
        if (!listviewcnt || (!_tcscmp (fontname_gui, fontname_list) && fontsize_gui == fontsize_list && fontstyle_gui == fontstyle_list && fontweight_gui == fontweight_list))

diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt
index c53109a5d48718b703c3d4afb4bc0e7a257c1645..adee9eae1264ab978309663a53f878163a1c96ff 100644 (file)
--- a/od-win32/winuaechangelog.txt
+++ b/od-win32/winuaechangelog.txt
@@ -4,6 +4,20 @@ JIT Direct current rules are less complex now. It automatically switches off onl
   - RTG VRAM is outside of reserved natmem space. Workaround: Move RTG in earlier position using Hardware info GUI panel.\r
   Note that in 64-bit version RTG VRAM must be inside of reserved natmem space. (Outside = error message and return back to GUI)\r
 \r
+Beta 10:\r
+\r
+- Version bumped to 3.5.0. .x was only reserved for minor bug fix versions.\r
+- GUI listview column width calculation used default font size, not selected font.\r
+- Z3 autoconfig in Z3 space didn't support documented byte write to 0x44 config register. (KS ROM always uses word write)\r
+- Manual RAM configuration GUI end address validation was incorrect. Now end address can be smaller than total RAM board size.\r
+- Fixed A2090(a) ST-506 emulation, last accessed LBA status field must be always filled if read/write/format command, added disable\r
+  ST-506 option. (ROM driver checks bit in autoconfig data if ST-506 is available)\r
+- MMU emulation can be now switched on/off on the fly. (Of course AmigaOS will crash if MMU is switched off and MMU is used for Map ROM etc..)\r
+- MMU PTEST in 68040 mode without MMU emulation now checks transparent translation registers and returns correct physical address,\r
+  now Enforcer initializes correctly in non-MMU mode and does not cause crash due to wrong MMU tables if MMU is later switched on.\r
+- Fixed Blizzard accelerator crash if memory size was zero (don't map empty maprom space). Note that boot ROM chooses different\r
+  address space if 1M RAM + MapROM is configured. This does not work yet.\r
+   \r
 Beta 9:\r
 \r
 - Comspec emulation was very unstable in cycle-exact modes.\r

diff --git a/od-win32/wix/Product.wxs b/od-win32/wix/Product.wxs
index 5d75ac40d11ff451cad1653c5acb1023e2d763c8..ae8ba8fd16775bda86196eb5459e0e7507ed7262 100644 (file)
--- a/od-win32/wix/Product.wxs
+++ b/od-win32/wix/Product.wxs
@@ -2,8 +2,8 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
 
   <?define ProductName = "WinUAE" ?>
-  <?define ProductVersion = "3.4.0" ?>
-  <?define ProductFullVersion = "3.4.0.0" ?>
+  <?define ProductVersion = "3.5.0" ?>
+  <?define ProductFullVersion = "3.5.0.0" ?>
   <?define ProductAuthor = "Arabuusimiehet" ?>
 
   <?if $(var.Platform) = x64 ?>

diff --git a/rommgr.cpp b/rommgr.cpp
index 9b59446826004d77681e9a1fd49e3cb27ea89c97..0972a4df874462ad763ae7d7f97509f62a6b6ee2 100644 (file)
--- a/rommgr.cpp
+++ b/rommgr.cpp
@@ -297,7 +297,7 @@ static struct romdata roms[] = {
        ALTROMPN(122, 1, 2, 8192, ROMTYPE_EVEN | ROMTYPE_8BIT, _T("315098-01"), 0xbe422e3b,0x64ad1646,0x030db10f,0x54f13f64,0x7d449e4d,0x17f9ab5c)
        { _T("A590/A2091 v4.6"), 4, 6, 4, 6, _T("A590\0A2091\0"), 16384, 202, 0, 0, ROMTYPE_A2091, 0, 0, NULL,
        0x00a38212, 0xa029a4de,0x56e5539d,0x0ee00588,0xc2634f13,0x29f06269 },
-       ALTROMPN(202, 1, 1, 8192, ROMTYPE_ODD  | ROMTYPE_8BIT, _T("390389-03"), 0x26013266,0x60dedda8,0xd406b276,0x2ad1504a,0x88a4d6e2,0x9c0fb10d)
+       ALTROMPN(202, 1, 1, 8192, ROMTYPE_ODD  | ROMTYPE_8BIT, _T("390389-02"), 0x26013266,0x60dedda8,0xd406b276,0x2ad1504a,0x88a4d6e2,0x9c0fb10d)
        ALTROMPN(202, 1, 2, 8192, ROMTYPE_EVEN | ROMTYPE_8BIT, _T("390388-02"), 0x6c9cb089,0xbd8c6bb7,0x9ae91a4d,0x1b9ee76f,0xdd11aaf9,0x7ca4358b)
        { _T("A590/A2091 v6.0"), 6, 0, 6, 0, _T("A590\0A2091\0"), 16384, 53, 0, 0, ROMTYPE_A2091, 0, 0, NULL,
        0x8396cf4e, 0x5E03BC61,0x8C862ABE,0x7BF79723,0xB4EEF4D2,0x1859A0F2 },
@@ -305,8 +305,8 @@ static struct romdata roms[] = {
        ALTROMPN(53, 1, 2, 8192, ROMTYPE_EVEN | ROMTYPE_8BIT, _T("390388-03"), 0x2e77bbff,0x8a098845,0x068f32cf,0xa4d34a27,0x8cd290f6,0x1d35a52c)
        { _T("A590/A2091 v6.1"), 6, 1, 6, 1, _T("A590\0A2091\0"), 16384, 206, 0, 0, ROMTYPE_A2091, 0, 0, NULL,
        0xaccf6452, 0xf56061ab,0x37768281,0x94d89729,0x802ee7ae,0x1de9df90 },
-       ALTROMPN(206, 1, 1, 8192, ROMTYPE_ODD  | ROMTYPE_8BIT, NULL, 0xc460cfdb,0x0de457da,0xec3b84f7,0x5e8fb344,0xdefe24ce,0x56cda3e0)
-       ALTROMPN(206, 1, 2, 8192, ROMTYPE_EVEN | ROMTYPE_8BIT, NULL, 0x00dbf615,0x503940d0,0x4fb3b49e,0xaa61100f,0xd3a48701,0x8b35e25a)
+       ALTROMPN(206, 1, 1, 8192, ROMTYPE_ODD  | ROMTYPE_8BIT, _T("390722-01"), 0xc460cfdb,0x0de457da,0xec3b84f7,0x5e8fb344,0xdefe24ce,0x56cda3e0)
+       ALTROMPN(206, 1, 2, 8192, ROMTYPE_EVEN | ROMTYPE_8BIT, _T("390721-01"), 0x00dbf615,0x503940d0,0x4fb3b49e,0xaa61100f,0xd3a48701,0x8b35e25a)
        { _T("A590/A2091 v6.6"), 6, 6, 6, 6, _T("A590\0A2091\0"), 16384, 54, 0, 0, ROMTYPE_A2091, 0, 0, NULL,
        0x33e00a7a, 0x739BB828,0xE874F064,0x9360F59D,0x26B5ED3F,0xBC99BB66 },
        ALTROMPN(54, 1, 1, 8192, ROMTYPE_ODD  | ROMTYPE_8BIT, _T("390722-02"), 0xe536bbb2,0xfd7f8a6d,0xa18c1b02,0xd07eb990,0xc2467a24,0x183ede12)