3610b7

diff --git a/od-win32/srcrelease.cmd b/od-win32/srcrelease.cmd
index d60e40d78c51b1e0ee5c4b88956788d34372d610..29cf2db3446cb9f73e83c1874870e3ab7935ab51 100644 (file)
--- a/od-win32/srcrelease.cmd
+++ b/od-win32/srcrelease.cmd
@@ -1,9 +1,9 @@
 
-cd ..
-
 copy d:\amiga\text\winuaechangelog.txt /y
 copy d:\amiga\text\winuaechangelog.txt ..\..\distribution\docs /y
 
+cd ..
+
 del ..\winuaesrc.7z
 
 7z a -r ..\winuaesrc *.c *.cpp *.h *.sln *.vcxproj* *.ico *.rc *.bmp *.cur *.manifest *.png *.txt

diff --git a/od-win32/win32.cpp b/od-win32/win32.cpp
index 6e315822c46e50ecc76cbc6f0c4c47158224f83e..a38c1a85216e1b3cbad8ae77f087b3c623634e9d 100644 (file)
--- a/od-win32/win32.cpp
+++ b/od-win32/win32.cpp
@@ -1604,9 +1604,9 @@ static LRESULT CALLBACK AmigaWindowProc (HWND hWnd, UINT message, WPARAM wParam,
                }
                return 0;
        case WM_ACTIVATE:
-               write_log(_T("WM_ACTIVATE %p %x\n"), hWnd, wParam);
+               //write_log(_T("WM_ACTIVATE %p %x\n"), hWnd, wParam);
                if (LOWORD(wParam) == WA_INACTIVE) {
-                       write_log(_T("WM_ACTIVATE %x\n"), wParam);
+                       //write_log(_T("WM_ACTIVATE %x\n"), wParam);
                        if (HIWORD(wParam))
                                setminimized();
                        else
@@ -1621,7 +1621,7 @@ static LRESULT CALLBACK AmigaWindowProc (HWND hWnd, UINT message, WPARAM wParam,
                break;
        case WM_ACTIVATEAPP:
                D3D_restore();
-               write_log(_T("WM_ACTIVATEAPP %08x\n"), wParam);
+               //write_log(_T("WM_ACTIVATEAPP %08x\n"), wParam);
                if (!wParam && isfullscreen() > 0 && D3D_resize && !gui_active) {
                        write_log(_T("WM_ACTIVATEAPP inactive %p\n"), hWnd);
                        D3D_resize(-1);
@@ -5667,6 +5667,7 @@ extern int scanline_adjust;
 extern int log_ld;
 extern int logitech_lcd;
 extern uae_s64 max_avi_size;
+extern int floppy_writemode;
 
 extern DWORD_PTR cpu_affinity, cpu_paffinity;
 static DWORD_PTR original_affinity = -1;
@@ -5774,52 +5775,52 @@ static TCHAR *getdefaultini (int *tempfile)
        return my_strdup (orgpath);
 }
 
-static int parseargs (const TCHAR *argx, const TCHAR *np, const TCHAR *np2)
+static int parseargs(const TCHAR *argx, const TCHAR *np, const TCHAR *np2)
 {
        const TCHAR *arg = argx + 1;
 
        if (argx[0] != '-' && argx[0] != '/')
                return 0;
 
-       if (!_tcscmp (arg, _T("convert")) && np && np2) {
-               zfile_convertimage (np, np2);
+       if (!_tcscmp(arg, _T("convert")) && np && np2) {
+               zfile_convertimage(np, np2);
                return -1;
        }
-       if (!_tcscmp (arg, _T("console"))) {
+       if (!_tcscmp(arg, _T("console"))) {
                console_started = 1;
                return 1;
        }
-       if (!_tcscmp (arg, _T("cli"))) {
+       if (!_tcscmp(arg, _T("cli"))) {
                console_emulation = 1;
                return 1;
        }
-       if (!_tcscmp (arg, _T("log"))) {
+       if (!_tcscmp(arg, _T("log"))) {
                console_logging = 1;
                return 1;
        }
-       if (!_tcscmp (arg, _T("logfile"))) {
+       if (!_tcscmp(arg, _T("logfile"))) {
                winuaelog_temporary_enable = true;
                return 1;
        }
 #ifdef FILESYS
-       if (!_tcscmp (arg, _T("rdbdump"))) {
+       if (!_tcscmp(arg, _T("rdbdump"))) {
                do_rdbdump = 1;
                return 1;
        }
-       if (!_tcscmp (arg, _T("hddump"))) {
+       if (!_tcscmp(arg, _T("hddump"))) {
                do_rdbdump = 2;
                return 1;
        }
-       if (!_tcscmp (arg, _T("disableharddrivesafetycheck"))) {
+       if (!_tcscmp(arg, _T("disableharddrivesafetycheck"))) {
                //harddrive_dangerous = 0x1234dead;
                return 1;
        }
-       if (!_tcscmp (arg, _T("noaspifiltering"))) {
+       if (!_tcscmp(arg, _T("noaspifiltering"))) {
                //aspi_allow_all = 1;
                return 1;
        }
 #endif
-       if (!_tcscmp (arg, _T("pngprint"))) {
+       if (!_tcscmp(arg, _T("pngprint"))) {
                pngprint = 1;
                return 1;
        }
@@ -5839,61 +5840,61 @@ static int parseargs (const TCHAR *argx, const TCHAR *np, const TCHAR *np2)
                no_rawinput |= 2;
                return 1;
        }
-       if (!_tcscmp (arg, _T("nodirectinput"))) {
+       if (!_tcscmp(arg, _T("nodirectinput"))) {
                no_directinput = 1;
                return 1;
        }
-       if (!_tcscmp (arg, _T("nowindowsmouse"))) {
+       if (!_tcscmp(arg, _T("nowindowsmouse"))) {
                no_windowsmouse = 1;
                return 1;
        }
-       if (!_tcscmp (arg, _T("rawhid"))) {
+       if (!_tcscmp(arg, _T("rawhid"))) {
                rawinput_enabled_hid = 1;
                return 1;
        }
-       if (!_tcscmp (arg, _T("norawhid"))) {
+       if (!_tcscmp(arg, _T("norawhid"))) {
                rawinput_enabled_hid = 0;
                return 1;
        }
-       if (!_tcscmp (arg, _T("rawkeyboard"))) {
+       if (!_tcscmp(arg, _T("rawkeyboard"))) {
                // obsolete
                return 1;
        }
-       if (!_tcscmp (arg, _T("directsound"))) {
+       if (!_tcscmp(arg, _T("directsound"))) {
                force_directsound = 1;
                return 1;
        }
-       if (!_tcscmp (arg, _T("scsilog"))) {
+       if (!_tcscmp(arg, _T("scsilog"))) {
                log_scsi = 1;
                return 1;
        }
-       if (!_tcscmp (arg, _T("scsiemulog"))) {
+       if (!_tcscmp(arg, _T("scsiemulog"))) {
                extern int log_scsiemu;
                log_scsiemu = 1;
                return 1;
        }
-       if (!_tcscmp (arg, _T("ds_partition_hdf"))) {
+       if (!_tcscmp(arg, _T("ds_partition_hdf"))) {
                extern int enable_ds_partition_hdf;
                enable_ds_partition_hdf = 1;
                return 1;
        }
-       if (!_tcscmp (arg, _T("filesyslog"))) {
+       if (!_tcscmp(arg, _T("filesyslog"))) {
                log_filesys = 1;
                return 1;
        }
-       if (!_tcscmp (arg, _T("filesyslog2"))) {
+       if (!_tcscmp(arg, _T("filesyslog2"))) {
                log_filesys = 2;
                return 1;
        }
-       if (!_tcscmp (arg, _T("netlog"))) {
+       if (!_tcscmp(arg, _T("netlog"))) {
                log_net = 1;
                return 1;
        }
-       if (!_tcscmp (arg, _T("serlog"))) {
+       if (!_tcscmp(arg, _T("serlog"))) {
                log_sercon = 1;
                return 1;
        }
-       if (!_tcscmp (arg, _T("a2065log"))) {
+       if (!_tcscmp(arg, _T("a2065log"))) {
                log_a2065 = 1;
                return 1;
        }
@@ -5905,66 +5906,66 @@ static int parseargs (const TCHAR *argx, const TCHAR *np, const TCHAR *np2)
                log_a2065 = 3;
                return 1;
        }
-       if (!_tcscmp (arg, _T("a2065_promiscuous"))) {
+       if (!_tcscmp(arg, _T("a2065_promiscuous"))) {
                a2065_promiscuous = 1;
                return 1;
        }
-       if (!_tcscmp (arg, _T("seriallog"))) {
+       if (!_tcscmp(arg, _T("seriallog"))) {
                log_uaeserial = 1;
                return 1;
        }
-       if (!_tcscmp (arg, _T("vsynclog")) || !_tcscmp (arg, _T("vsynclog1"))) {
+       if (!_tcscmp(arg, _T("vsynclog")) || !_tcscmp(arg, _T("vsynclog1"))) {
                log_vsync |= 1;
                return 1;
        }
-       if (!_tcscmp (arg, _T("vsynclog2"))) {
+       if (!_tcscmp(arg, _T("vsynclog2"))) {
                log_vsync |= 2;
                return 1;
        }
-       if (!_tcscmp (arg, _T("bsdlog"))) {
+       if (!_tcscmp(arg, _T("bsdlog"))) {
                log_bsd = 1;
                return 1;
        }
-       if (!_tcscmp (arg, _T("clipboarddebug"))) {
+       if (!_tcscmp(arg, _T("clipboarddebug"))) {
                clipboard_debug = 1;
                return 1;
        }
-       if (!_tcscmp (arg, _T("rplog"))) {
+       if (!_tcscmp(arg, _T("rplog"))) {
                log_rp = 3;
                return 1;
        }
-       if (!_tcscmp (arg, _T("nomultidisplay"))) {
+       if (!_tcscmp(arg, _T("nomultidisplay"))) {
                return 1;
        }
-       if (!_tcscmp (arg, _T("legacypaths"))) {
+       if (!_tcscmp(arg, _T("legacypaths"))) {
                start_data = -2;
                return 1;
        }
-       if (!_tcscmp (arg, _T("screenshotbmp"))) {
+       if (!_tcscmp(arg, _T("screenshotbmp"))) {
                screenshotmode = 0;
                return 1;
        }
-       if (!_tcscmp (arg, _T("psprintdebug"))) {
+       if (!_tcscmp(arg, _T("psprintdebug"))) {
                postscript_print_debugging = 1;
                return 1;
        }
-       if (!_tcscmp (arg, _T("sounddebug"))) {
+       if (!_tcscmp(arg, _T("sounddebug"))) {
                sound_debug = 1;
                return 1;
        }
-       if (!_tcscmp (arg, _T("directcatweasel"))) {
+       if (!_tcscmp(arg, _T("directcatweasel"))) {
                force_direct_catweasel = 1;
                if (np) {
-                       force_direct_catweasel = getval (np);
+                       force_direct_catweasel = getval(np);
                        return 2;
                }
                return 1;
        }
-       if (!_tcscmp (arg, _T("forcerdtsc"))) {
+       if (!_tcscmp(arg, _T("forcerdtsc"))) {
                uae_time_use_rdtsc(true);
                return 1;
        }
-       if (!_tcscmp (arg, _T("ddsoftwarecolorkey"))) {
+       if (!_tcscmp(arg, _T("ddsoftwarecolorkey"))) {
                // obsolete
                return 1;
        }
@@ -5976,44 +5977,44 @@ static int parseargs (const TCHAR *argx, const TCHAR *np, const TCHAR *np2)
                shaderon = 0;
                return 1;
        }
-       if (!_tcscmp (arg, _T("d3ddebug"))) {
+       if (!_tcscmp(arg, _T("d3ddebug"))) {
                d3ddebug = 1;
                return 1;
        }
-       if (!_tcscmp (arg, _T("logflush"))) {
+       if (!_tcscmp(arg, _T("logflush"))) {
                extern int always_flush_log;
                always_flush_log = 1;
                return 1;
        }
-       if (!_tcscmp (arg, _T("ahidebug"))) {
+       if (!_tcscmp(arg, _T("ahidebug"))) {
                extern int ahi_debug;
                ahi_debug = 2;
                return 1;
        }
-       if (!_tcscmp (arg, _T("ahidebug2"))) {
+       if (!_tcscmp(arg, _T("ahidebug2"))) {
                extern int ahi_debug;
                ahi_debug = 3;
                return 1;
        }
-       if (!_tcscmp (arg, _T("quittogui"))) {
+       if (!_tcscmp(arg, _T("quittogui"))) {
                quit_to_gui = 1;
                return 1;
        }
-       if (!_tcscmp (arg, _T("ini")) && np) {
-               inipath = my_strdup (np);
+       if (!_tcscmp(arg, _T("ini")) && np) {
+               inipath = my_strdup(np);
                return 2;
        }
-       if (!_tcscmp (arg, _T("portable"))) {
+       if (!_tcscmp(arg, _T("portable"))) {
                int temp;
-               inipath = getdefaultini (&temp);
+               inipath = getdefaultini(&temp);
                createbootlog = false;
                return 2;
        }
-       if (!_tcscmp (arg, _T("bootlog"))) {
+       if (!_tcscmp(arg, _T("bootlog"))) {
                createbootlog = true;
                return 1;
        }
-       if (!_tcscmp (arg, _T("nobootlog"))) {
+       if (!_tcscmp(arg, _T("nobootlog"))) {
                createbootlog = false;
                return 1;
        }

diff --git a/od-win32/win32.h b/od-win32/win32.h
index 15cef71851cf3851c0f1e6d67daa47b3894a2260..12fc8077694aad1400656a0c66eb3f3fcde19b01 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("6")
+#define WINUAEBETA _T("7")
 #else
 #define WINUAEBETA _T("")
 #endif
 
-#define WINUAEDATE MAKEBD(2018, 2, 21)
+#define WINUAEDATE MAKEBD(2018, 2, 26)
 
 //#define WINUAEEXTRA _T("AmiKit Preview")
 //#define WINUAEEXTRA _T("Amiga Forever Edition")

diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt
index fb76bbc396c6b2e08719a5f47b3d45f1ecd00358..f6b480c756409b9bbcdce60dc34b23c0a68c17f1 100644 (file)
--- a/od-win32/winuaechangelog.txt
+++ b/od-win32/winuaechangelog.txt
@@ -5,6 +5,17 @@ JIT Direct current rules are less complex now. It automatically switches off onl
   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
 \r
+Beta 7:\r
+\r
+- Added resident struct to UAE boot ROM filesystem, enables c:version <directory filesystem device name>: to report name and version.\r
+- Enabled hardware emulated network card was not fully freed when Restart was pressed, it was still listening for incoming packets.\r
+- Game Ports panel selected Custom input mapping reverted to none in some situations.\r
+- Added PP&S Zeus 040 emulation, SCSI supported, other possible special hardware features not implemented.\r
+\r
+PP&S Zeus 040 SCSI:\r
+- 53C710 based which has built-in DMA controller but for some unknown reason driver wastes all CPU time.\r
+- PPSscsi2.device ("PPS SCSI Device 2.98 (28 Aug 1992)")\r
+\r
 Beta 6:\r
 \r
 - Task bar icon -> close window (possibly also other "external" close methods) didn't always work in D3D11 fullscreen mode.\r