3410b9

diff --git a/include/newcpu.h b/include/newcpu.h
index e634755556536dc76f062c96f9dfc95bc809df7c..3106aa62f556936c7a1d7636a2d5378ba742c9a0 100644 (file)
--- a/include/newcpu.h
+++ b/include/newcpu.h
@@ -664,7 +664,7 @@ extern void flush_icache_hard(int);
 extern void compemu_reset(void);
 #else
 #define flush_icache(int) do {} while (0)
-#define flush_icache(int) do {} while (0)
+#define flush_icache_hard(int) do {} while (0)
 #endif
 bool check_prefs_changed_comp (bool);
 extern void flush_dcache (uaecptr, int);

diff --git a/od-win32/resources/resource.h b/od-win32/resources/resource.h
index b12891e020e94927387791b7b9f6a80460b4bbd5..a5f879bfc567cf1b417e329696d0a86becd85bed 100644 (file)
--- a/od-win32/resources/resource.h
+++ b/od-win32/resources/resource.h
@@ -403,6 +403,8 @@
 #define IDS_NUMSG_NOMEMORY              410
 #define IDS_EXPANSION_CATEGORY          411
 #define IDS_WINUAETITLE_PAUSED          412
+#define IDS_MOUSE_UNTRAP_MODE           413
+#define IDS_TABLET_MODE                 414
 #define IDS_QS_MODELS                   1000
 #define IDS_QS_MODEL_A500               1001
 #define IDS_QS_MODEL_A500P              1002
@@ -1317,7 +1319,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NO_MFC                     1
 #define _APS_3D_CONTROLS                     1
-#define _APS_NEXT_RESOURCE_VALUE        400
+#define _APS_NEXT_RESOURCE_VALUE        407
 #define _APS_NEXT_COMMAND_VALUE         40050
 #define _APS_NEXT_CONTROL_VALUE         1855
 #define _APS_NEXT_SYMED_VALUE           101

diff --git a/od-win32/resources/winuae.rc b/od-win32/resources/winuae.rc
index 42b03a76ded0f4e076661eaf6f298406b4be8afb..7f2bfe86f964d8da449600c9260ac3c9e22e86c8 100644 (file)
--- a/od-win32/resources/winuae.rc
+++ b/od-win32/resources/winuae.rc
@@ -648,7 +648,7 @@ BEGIN
     RTEXT           "Block size:",IDC_BLOCKSIZE_TEXT,299,132,45,10
     EDITTEXT        IDC_BLOCKSIZE,347,130,40,15,ES_NUMBER
     LTEXT           "HD Controller:",IDC_STATIC,10,113,54,10,SS_CENTERIMAGE
-    PUSHBUTTON      "RDB mode",IDC_HDF_RDB,135,109,75,14
+    PUSHBUTTON      "Full drive/RDB mode",IDC_HDF_RDB,83,109,127,14
     COMBOBOX        IDC_HDF_FEATURE_LEVEL,214,109,75,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
     COMBOBOX        IDC_HDF_CONTROLLER,6,131,152,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
     COMBOBOX        IDC_HDF_CONTROLLER_UNIT,163,131,63,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
@@ -2063,7 +2063,7 @@ BEGIN
     IDS_WSTYLE_EXTENDED     "Extended"
     IDS_MISCLISTITEMS1      "Untrap = middle button\nShow GUI on startup\nUse CTRL-F11 to quit\nDon't show taskbar button\nDon't show notification icon\n"
     IDS_MISCLISTITEMS2      "Main window always on top\nGUI window always on top\nDisable screensaver\nSynchronize clock\nOne second reboot pause\nFaster RTG\nClipboard sharing\nAllow native code\n"
-    IDS_MISCLISTITEMS3      "Native on-screen display\nRTG on-screen display\nCreate winuaelog.txt log\nLog illegal memory accesses\nBlank unused displays\nStart mouse uncaptured\nStart minimized\nMinimize when focus is lost\nBlack frame insertion\nMaster floppy write protection\nMaster harddrive write protection\nHide all UAE autoconfig boards\n"
+    IDS_MISCLISTITEMS3      "Native on-screen display\nRTG on-screen display\nCreate winuaelog.txt log\nLog illegal memory accesses\nBlank unused displays\nStart mouse uncaptured\nStart minimized\nMinimize when focus is lost\nBlack frame insertion\nMaster floppy write protection\nMaster harddrive write protection\nHide all UAE autoconfig boards\nRight Control = Right Windows key\n"
     IDS_JOYMODE_WHEELMOUSE  "Wheel Mouse"
     IDS_NUMSG_KS68030PLUS   "The selected system ROM requires a 68030 or higher CPU."
     IDS_SELECTTAPE          "Select a Tape directory or archive file..."
@@ -2091,6 +2091,8 @@ BEGIN
     IDS_NUMSG_NOMEMORY      "Out of memory or too much Z3 autoconfig space configured.\nIf 64-bit, make sure RTG board is first in board list."
     IDS_EXPANSION_CATEGORY  "Built-in expansions\nSCSI controllers\nIDE controllers\nSASI controllers\nCustom controllers\nPCI bridgeboards\nx86 bridgeboards\nGraphics boards\nSound cards\nNetwork adapters\nDisk controllers"
     IDS_WINUAETITLE_PAUSED  "[Paused]"
+    IDS_MOUSE_UNTRAP_MODE   "None (Alt-Tab)\nMiddle button\nMagic mouse\nBoth\n"
+    IDS_TABLET_MODE         "-\nTablet emulation\n"
 END
 
 #endif    // English resources

diff --git a/od-win32/serial_win32.cpp b/od-win32/serial_win32.cpp
index 1e9bfadaf4f48851d09d1855ae633ab50ebf8352..d134103dbc180f23997c518fe4663a4b9979f9f4 100644 (file)
--- a/od-win32/serial_win32.cpp
+++ b/od-win32/serial_win32.cpp
@@ -178,6 +178,7 @@ static int serdatr_last_got;
 int serdev;
 int seriallog = 0, log_sercon = 0;
 int serial_enet;
+extern int consoleopen;
 
 void serial_open (void);
 void serial_close (void);
@@ -475,7 +476,7 @@ static void serdatcopy(void)
        data_in_sershift = 1;
        data_in_serdat = 0;
 
-       if (seriallog) {
+       if (seriallog > 0 || (consoleopen && seriallog < 0)) {
                gotlogwrite = true;
                write_logx(_T("%c"), docharlog(serdatshift_masked));
        }
@@ -532,7 +533,7 @@ void serial_hsynchandler (void)
                }
        }
 #endif
-       if (seriallog && !data_in_serdatr && gotlogwrite) {
+       if (seriallog > 0 && !data_in_serdatr && gotlogwrite) {
                int ch = read_log();
                if (ch > 0) {
                        serdatr = ch | 0x100;

diff --git a/od-win32/win32.h b/od-win32/win32.h
index 9f717626a739c2c8f718e79f2846be9d10b8d289..ac0b88d4bbe5a01316a38c4e0f18a31f48832eac 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("8")
+#define WINUAEBETA _T("9")
 #else
 #define WINUAEBETA _T("")
 #endif
 
-#define WINUAEDATE MAKEBD(2017, 5, 7)
+#define WINUAEDATE MAKEBD(2017, 5, 20)
 
 //#define WINUAEEXTRA _T("AmiKit Preview")
 //#define WINUAEEXTRA _T("Amiga Forever Edition")
@@ -54,7 +54,7 @@ extern TCHAR start_path_exe[MAX_DPATH];
 extern TCHAR start_path_data[MAX_DPATH];
 extern TCHAR start_path_plugins[MAX_DPATH];
 
-extern bool my_kbd_handler (int, int, int);
+extern bool my_kbd_handler (int, int, int, bool);
 extern void clearallkeys (void);
 extern int getcapslock (void);
 

diff --git a/od-win32/win32gui.cpp b/od-win32/win32gui.cpp
index 8d1c9021a3528331e711099357054062e2c2a993..67e417414e8190043b3837bf18fa7b8a51208a33 100644 (file)
--- a/od-win32/win32gui.cpp
+++ b/od-win32/win32gui.cpp
@@ -10817,6 +10817,12 @@ static void misc_lang (HWND hDlg)
        SendDlgItemMessage (hDlg, IDC_GUI_SIZE, CB_RESETCONTENT, 0, 0);
        WIN32GUI_LoadUIString (IDS_SELECT_MENU, tmp, sizeof tmp / sizeof (TCHAR));
        SendDlgItemMessage (hDlg, IDC_GUI_SIZE, CB_ADDSTRING, 0, (LPARAM)tmp);
+       SendDlgItemMessage (hDlg, IDC_GUI_SIZE, CB_ADDSTRING, 0, (LPARAM)_T("200%"));
+       SendDlgItemMessage (hDlg, IDC_GUI_SIZE, CB_ADDSTRING, 0, (LPARAM)_T("190%"));
+       SendDlgItemMessage (hDlg, IDC_GUI_SIZE, CB_ADDSTRING, 0, (LPARAM)_T("180%"));
+       SendDlgItemMessage (hDlg, IDC_GUI_SIZE, CB_ADDSTRING, 0, (LPARAM)_T("170%"));
+       SendDlgItemMessage (hDlg, IDC_GUI_SIZE, CB_ADDSTRING, 0, (LPARAM)_T("160%"));
+       SendDlgItemMessage (hDlg, IDC_GUI_SIZE, CB_ADDSTRING, 0, (LPARAM)_T("150%"));
        SendDlgItemMessage (hDlg, IDC_GUI_SIZE, CB_ADDSTRING, 0, (LPARAM)_T("140%"));
        SendDlgItemMessage (hDlg, IDC_GUI_SIZE, CB_ADDSTRING, 0, (LPARAM)_T("130%"));
        SendDlgItemMessage (hDlg, IDC_GUI_SIZE, CB_ADDSTRING, 0, (LPARAM)_T("120%"));
@@ -11134,7 +11140,7 @@ static INT_PTR MiscDlgProc (HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam)
                                        v = GUI_SCALE_DEFAULT;
                                } else {
                                        v--;
-                                       v = 140 - v * 10;
+                                       v = 200 - v * 10;
                                }
                                if (isfullscreen() <= 0)
                                        scaleresource_getdpimult(&dpix, &dpiy, &previous_dpix, &previous_dpiy);
@@ -15471,7 +15477,7 @@ static void processport (HWND hDlg, bool reset, int port)
 /* Handle messages for the Joystick Settings page of our property-sheet */
 static INT_PTR CALLBACK GamePortsDlgProc (HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam)
 {
-       TCHAR tmp[MAX_DPATH];
+       TCHAR tmp[MAX_DPATH], *tmp2;
        static int recursive = 0;
        static int first;
        int temp, i;
@@ -15479,86 +15485,102 @@ static INT_PTR CALLBACK GamePortsDlgProc (HWND hDlg, UINT msg, WPARAM wParam, LP
        switch (msg)
        {
        case WM_INITDIALOG:
-               recursive++;
-               pages[GAMEPORTS_ID] = hDlg;
-               currentpage = GAMEPORTS_ID;
-
-               if (!first) {
-                       first = 1;
-                       joyxprevious[0] = -1;
-                       joyxprevious[1] = -1;
-                       joyxprevious[2] = -1;
-                       joyxprevious[3] = -1;
-               }
-
-               for (i = 0; joysaf[i] >= 0; i++) {
-                       int id = joysaf[i];
-                       SendDlgItemMessage (hDlg, id, CB_RESETCONTENT, 0, 0L);
-                       WIN32GUI_LoadUIString (IDS_PORT_AUTOFIRE_NO, tmp, MAX_DPATH);
-                       if (!remapcustoms[0].name)
-                               remapcustoms[0].name = my_strdup(tmp);
-                       SendDlgItemMessage (hDlg, id, CB_ADDSTRING, 0, (LPARAM)tmp);
-                       WIN32GUI_LoadUIString (IDS_PORT_AUTOFIRE, tmp, MAX_DPATH);
-                       if (!remapcustoms[1].name)
-                               remapcustoms[1].name = my_strdup(tmp);
-                       SendDlgItemMessage (hDlg, id, CB_ADDSTRING, 0, (LPARAM)tmp);
-                       WIN32GUI_LoadUIString (IDS_PORT_AUTOFIRE_TOGGLE, tmp, MAX_DPATH);
-                       if (!remapcustoms[2].name)
-                               remapcustoms[2].name = my_strdup(tmp);
-                       SendDlgItemMessage (hDlg, id, CB_ADDSTRING, 0, (LPARAM)tmp);
-                       WIN32GUI_LoadUIString (IDS_PORT_AUTOFIRE_ALWAYS, tmp, MAX_DPATH);
-                       if (!remapcustoms[3].name)
-                               remapcustoms[3].name = my_strdup(tmp);
-                       SendDlgItemMessage (hDlg, id, CB_ADDSTRING, 0, (LPARAM)tmp);
-               }
-
-               SendDlgItemMessage (hDlg, IDC_PORT_TABLET_CURSOR, CB_RESETCONTENT, 0, 0L);
-               WIN32GUI_LoadUIString (IDS_TABLET_BOTH_CURSORS, tmp, MAX_DPATH);
-               SendDlgItemMessage (hDlg, IDC_PORT_TABLET_CURSOR, CB_ADDSTRING, 0, (LPARAM)tmp);
-               WIN32GUI_LoadUIString (IDS_TABLET_NATIVE_CURSOR, tmp, MAX_DPATH);
-               SendDlgItemMessage (hDlg, IDC_PORT_TABLET_CURSOR, CB_ADDSTRING, 0, (LPARAM)tmp);
-               WIN32GUI_LoadUIString (IDS_TABLET_HOST_CURSOR, tmp, MAX_DPATH);
-               SendDlgItemMessage (hDlg, IDC_PORT_TABLET_CURSOR, CB_ADDSTRING, 0, (LPARAM)tmp);
-
-               SendDlgItemMessage(hDlg, IDC_MOUSE_UNTRAPMODE, CB_RESETCONTENT, 0, 0L);
-               SendDlgItemMessage(hDlg, IDC_MOUSE_UNTRAPMODE, CB_ADDSTRING, 0, (LPARAM)_T("None (Alt-Tab)"));
-               SendDlgItemMessage(hDlg, IDC_MOUSE_UNTRAPMODE, CB_ADDSTRING, 0, (LPARAM)_T("Middle button"));
-               SendDlgItemMessage(hDlg, IDC_MOUSE_UNTRAPMODE, CB_ADDSTRING, 0, (LPARAM)_T("Magic mouse"));
-               SendDlgItemMessage(hDlg, IDC_MOUSE_UNTRAPMODE, CB_ADDSTRING, 0, (LPARAM)_T("Both"));
-               SendDlgItemMessage(hDlg, IDC_MOUSE_UNTRAPMODE, CB_SETCURSEL, workprefs.input_mouse_untrap, 0);
-
-               SendDlgItemMessage(hDlg, IDC_PORT_TABLET_MODE, CB_RESETCONTENT, 0, 0L);
-               SendDlgItemMessage(hDlg, IDC_PORT_TABLET_MODE, CB_ADDSTRING, 0, (LPARAM)_T("-"));
-               SendDlgItemMessage(hDlg, IDC_PORT_TABLET_MODE, CB_ADDSTRING, 0, (LPARAM)_T("Tablet emulation"));
-               SendDlgItemMessage(hDlg, IDC_PORT_TABLET_MODE, CB_SETCURSEL, workprefs.input_tablet == TABLET_REAL ? 1 : 0, 0);
+               {
+                       recursive++;
+                       pages[GAMEPORTS_ID] = hDlg;
+                       currentpage = GAMEPORTS_ID;
+
+                       if (!first) {
+                               first = 1;
+                               joyxprevious[0] = -1;
+                               joyxprevious[1] = -1;
+                               joyxprevious[2] = -1;
+                               joyxprevious[3] = -1;
+                       }
+
+                       for (i = 0; joysaf[i] >= 0; i++) {
+                               int id = joysaf[i];
+                               SendDlgItemMessage (hDlg, id, CB_RESETCONTENT, 0, 0L);
+                               WIN32GUI_LoadUIString (IDS_PORT_AUTOFIRE_NO, tmp, MAX_DPATH);
+                               if (!remapcustoms[0].name)
+                                       remapcustoms[0].name = my_strdup(tmp);
+                               SendDlgItemMessage (hDlg, id, CB_ADDSTRING, 0, (LPARAM)tmp);
+                               WIN32GUI_LoadUIString (IDS_PORT_AUTOFIRE, tmp, MAX_DPATH);
+                               if (!remapcustoms[1].name)
+                                       remapcustoms[1].name = my_strdup(tmp);
+                               SendDlgItemMessage (hDlg, id, CB_ADDSTRING, 0, (LPARAM)tmp);
+                               WIN32GUI_LoadUIString (IDS_PORT_AUTOFIRE_TOGGLE, tmp, MAX_DPATH);
+                               if (!remapcustoms[2].name)
+                                       remapcustoms[2].name = my_strdup(tmp);
+                               SendDlgItemMessage (hDlg, id, CB_ADDSTRING, 0, (LPARAM)tmp);
+                               WIN32GUI_LoadUIString (IDS_PORT_AUTOFIRE_ALWAYS, tmp, MAX_DPATH);
+                               if (!remapcustoms[3].name)
+                                       remapcustoms[3].name = my_strdup(tmp);
+                               SendDlgItemMessage (hDlg, id, CB_ADDSTRING, 0, (LPARAM)tmp);
+                       }
+
+                       SendDlgItemMessage (hDlg, IDC_PORT_TABLET_CURSOR, CB_RESETCONTENT, 0, 0L);
+                       WIN32GUI_LoadUIString (IDS_TABLET_BOTH_CURSORS, tmp, MAX_DPATH);
+                       SendDlgItemMessage (hDlg, IDC_PORT_TABLET_CURSOR, CB_ADDSTRING, 0, (LPARAM)tmp);
+                       WIN32GUI_LoadUIString (IDS_TABLET_NATIVE_CURSOR, tmp, MAX_DPATH);
+                       SendDlgItemMessage (hDlg, IDC_PORT_TABLET_CURSOR, CB_ADDSTRING, 0, (LPARAM)tmp);
+                       WIN32GUI_LoadUIString (IDS_TABLET_HOST_CURSOR, tmp, MAX_DPATH);
+                       SendDlgItemMessage (hDlg, IDC_PORT_TABLET_CURSOR, CB_ADDSTRING, 0, (LPARAM)tmp);
+
+                       WIN32GUI_LoadUIString (IDS_MOUSE_UNTRAP_MODE, tmp, MAX_DPATH);
+                       SendDlgItemMessage(hDlg, IDC_MOUSE_UNTRAPMODE, CB_RESETCONTENT, 0, 0L);
+                       TCHAR *p1 = tmp;
+                       for (;;) {
+                               TCHAR *p2 = _tcschr (p1, '\n');
+                               if (!p2)
+                                       break;
+                               *p2++= 0;
+                               SendDlgItemMessage (hDlg, IDC_MOUSE_UNTRAPMODE, CB_ADDSTRING, 0, (LPARAM)p1);
+                               p1 = p2;
+                       }
+                       SendDlgItemMessage(hDlg, IDC_MOUSE_UNTRAPMODE, CB_SETCURSEL, workprefs.input_mouse_untrap, 0);
 
-               for (i = 0; i < 2; i++) {
-                       int id = i == 0 ? IDC_PORT0_JOYSMODE : IDC_PORT1_JOYSMODE;
-                       SendDlgItemMessage (hDlg, id, CB_RESETCONTENT, 0, 0L);
-                       WIN32GUI_LoadUIString (IDS_JOYMODE_DEFAULT, tmp, MAX_DPATH);
-                       SendDlgItemMessage (hDlg, id, CB_ADDSTRING, 0, (LPARAM)tmp);
-                       WIN32GUI_LoadUIString (IDS_JOYMODE_WHEELMOUSE, tmp, MAX_DPATH);
-                       SendDlgItemMessage (hDlg, id, CB_ADDSTRING, 0, (LPARAM)tmp);
-                       WIN32GUI_LoadUIString (IDS_JOYMODE_MOUSE, tmp, MAX_DPATH);
-                       SendDlgItemMessage (hDlg, id, CB_ADDSTRING, 0, (LPARAM)tmp);
-                       WIN32GUI_LoadUIString (IDS_JOYMODE_JOYSTICK, tmp, MAX_DPATH);
-                       SendDlgItemMessage (hDlg, id, CB_ADDSTRING, 0, (LPARAM)tmp);
-                       WIN32GUI_LoadUIString (IDS_JOYMODE_GAMEPAD, tmp, MAX_DPATH);
-                       SendDlgItemMessage (hDlg, id, CB_ADDSTRING, 0, (LPARAM)tmp);
-                       WIN32GUI_LoadUIString (IDS_JOYMODE_JOYSTICKANALOG, tmp, MAX_DPATH);
-                       SendDlgItemMessage (hDlg, id, CB_ADDSTRING, 0, (LPARAM)tmp);
-                       WIN32GUI_LoadUIString (IDS_JOYMODE_MOUSE_CDTV, tmp, MAX_DPATH);
-                       SendDlgItemMessage (hDlg, id, CB_ADDSTRING, 0, (LPARAM)tmp);
-                       WIN32GUI_LoadUIString (IDS_JOYMODE_JOYSTICK_CD32, tmp, MAX_DPATH);
-                       SendDlgItemMessage (hDlg, id, CB_ADDSTRING, 0, (LPARAM)tmp);
-                       WIN32GUI_LoadUIString (IDS_JOYMODE_LIGHTPEN, tmp, MAX_DPATH);
-                       SendDlgItemMessage (hDlg, id, CB_ADDSTRING, 0, (LPARAM)tmp);
-               }
+                       WIN32GUI_LoadUIString (IDS_TABLET_MODE, tmp, MAX_DPATH);
+                       SendDlgItemMessage(hDlg, IDC_PORT_TABLET_MODE, CB_RESETCONTENT, 0, 0L);
+                       p1 = tmp;
+                       for (;;) {
+                               TCHAR *p2 = _tcschr (p1, '\n');
+                               if (!p2)
+                                       break;
+                               *p2++= 0;
+                               SendDlgItemMessage (hDlg, IDC_PORT_TABLET_MODE, CB_ADDSTRING, 0, (LPARAM)p1);
+                               p1 = p2;
+                       }
+                       SendDlgItemMessage(hDlg, IDC_PORT_TABLET_MODE, CB_SETCURSEL, workprefs.input_tablet == TABLET_REAL ? 1 : 0, 0);
+
+                       for (i = 0; i < 2; i++) {
+                               int id = i == 0 ? IDC_PORT0_JOYSMODE : IDC_PORT1_JOYSMODE;
+                               SendDlgItemMessage (hDlg, id, CB_RESETCONTENT, 0, 0L);
+                               WIN32GUI_LoadUIString (IDS_JOYMODE_DEFAULT, tmp, MAX_DPATH);
+                               SendDlgItemMessage (hDlg, id, CB_ADDSTRING, 0, (LPARAM)tmp);
+                               WIN32GUI_LoadUIString (IDS_JOYMODE_WHEELMOUSE, tmp, MAX_DPATH);
+                               SendDlgItemMessage (hDlg, id, CB_ADDSTRING, 0, (LPARAM)tmp);
+                               WIN32GUI_LoadUIString (IDS_JOYMODE_MOUSE, tmp, MAX_DPATH);
+                               SendDlgItemMessage (hDlg, id, CB_ADDSTRING, 0, (LPARAM)tmp);
+                               WIN32GUI_LoadUIString (IDS_JOYMODE_JOYSTICK, tmp, MAX_DPATH);
+                               SendDlgItemMessage (hDlg, id, CB_ADDSTRING, 0, (LPARAM)tmp);
+                               WIN32GUI_LoadUIString (IDS_JOYMODE_GAMEPAD, tmp, MAX_DPATH);
+                               SendDlgItemMessage (hDlg, id, CB_ADDSTRING, 0, (LPARAM)tmp);
+                               WIN32GUI_LoadUIString (IDS_JOYMODE_JOYSTICKANALOG, tmp, MAX_DPATH);
+                               SendDlgItemMessage (hDlg, id, CB_ADDSTRING, 0, (LPARAM)tmp);
+                               WIN32GUI_LoadUIString (IDS_JOYMODE_MOUSE_CDTV, tmp, MAX_DPATH);
+                               SendDlgItemMessage (hDlg, id, CB_ADDSTRING, 0, (LPARAM)tmp);
+                               WIN32GUI_LoadUIString (IDS_JOYMODE_JOYSTICK_CD32, tmp, MAX_DPATH);
+                               SendDlgItemMessage (hDlg, id, CB_ADDSTRING, 0, (LPARAM)tmp);
+                               WIN32GUI_LoadUIString (IDS_JOYMODE_LIGHTPEN, tmp, MAX_DPATH);
+                               SendDlgItemMessage (hDlg, id, CB_ADDSTRING, 0, (LPARAM)tmp);
+                       }
 
-               inputdevice_updateconfig (NULL, &workprefs);
-               enable_for_gameportsdlg (hDlg);
-               updatejoyport (hDlg, -1);
-               recursive--;
+                       inputdevice_updateconfig (NULL, &workprefs);
+                       enable_for_gameportsdlg (hDlg);
+                       updatejoyport (hDlg, -1);
+                       recursive--;
+               }
                break;
        case WM_USER:
                recursive++;

diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt
index ea87646dd1fa506170199e024eb569f805552029..c53109a5d48718b703c3d4afb4bc0e7a257c1645 100644 (file)
--- a/od-win32/winuaechangelog.txt
+++ b/od-win32/winuaechangelog.txt
@@ -4,6 +4,17 @@ 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 9:\r
+\r
+- Comspec emulation was very unstable in cycle-exact modes.\r
+- Amiga-side key(s) pressed when entering pause state was not correctly released when unpaused.\r
+- Add UAE boot ROM (if not 128k full autoconfig device) fake ConfigDev as earlier (in diag init) to make sure possible\r
+  rom configured MMU setup knows about the fake autoconfig device (for example m68k AROS with MMU enabled)\r
+- Updated AROS ROM.\r
+- Selecting built-in AROS ROM always opened console window (broke when console window serial input was added).\r
+- Added A590/A2091 v6.1 ROM.\r
+- H CPU history debugger command now also shows all DMA accesses if v DMA debugger is enabled.\r
+\r
 Beta 8:\r
 \r
 - Blitter BDAT register's old content was not preserved and shifted in when BDAT was rewritten with CPU or copper\r

diff --git a/traps.cpp b/traps.cpp
index 0ba66c631edf6f22944699b770753bbc65f0f89f..3b35d13a98804b15e3ac5e9993eaefe92ee3a0c4 100644 (file)
--- a/traps.cpp
+++ b/traps.cpp
@@ -1448,4 +1448,4 @@ void trap_memcpyah_safe(TrapContext *ctx, uae_u8 *dst, uaecptr src, int size)
        } else {
                memcpyah_safe(dst, src, size);
        }
-}
\ No newline at end of file
+}