3610b2

diff --git a/od-win32/direct3d11.cpp b/od-win32/direct3d11.cpp
index d058d0b4fdc61c41854bea18e259722f9ea7e137..4aadfb9374bb0728769d4b2eddb934bb5ebe56cd 100644 (file)
--- a/od-win32/direct3d11.cpp
+++ b/od-win32/direct3d11.cpp
@@ -3210,7 +3210,7 @@ static int xxD3D11_init2(HWND ahwnd, int w_w, int w_h, int t_w, int t_h, int dep
                                continue;
                        if (!m->RefreshRate.Numerator || !m->RefreshRate.Denominator)
                                continue;
-                       float nfreq = m->RefreshRate.Numerator / m->RefreshRate.Denominator;
+                       float nfreq = (float)m->RefreshRate.Numerator / m->RefreshRate.Denominator;
                        if (nfreq > ffreq) {
                                ffreq = nfreq;
                                d3d->fsSwapChainDesc.RefreshRate.Denominator = m->RefreshRate.Denominator;
@@ -3239,7 +3239,8 @@ static int xxD3D11_init2(HWND ahwnd, int w_w, int w_h, int t_w, int t_h, int dep
                        if (md2.RefreshRate.Denominator && md2.RefreshRate.Numerator)
                                *freq = md2.RefreshRate.Numerator / md2.RefreshRate.Denominator;
                        write_log(_T("D3D11 FindClosestMatchingMode1() %d/%d=%.2f SLO=%d W=%d H=%d\n"),
-                               md2.RefreshRate.Numerator, md2.RefreshRate.Denominator, (float)md2.RefreshRate.Numerator / md2.RefreshRate.Denominator, md1.ScanlineOrdering,
+                               md2.RefreshRate.Numerator, md2.RefreshRate.Denominator,
+                               (float)md2.RefreshRate.Numerator / md2.RefreshRate.Denominator, md1.ScanlineOrdering,
                                md2.Width, md2.Height);
                }
        }

diff --git a/od-win32/win32.cpp b/od-win32/win32.cpp
index 9a2522c0b20518bb88e8d4a09666ea30cac438d5..ccd6a6bd713bb6884c673f78dd5a269a1911ae4d 100644 (file)
--- a/od-win32/win32.cpp
+++ b/od-win32/win32.cpp
@@ -1537,7 +1537,7 @@ static LRESULT CALLBACK AmigaWindowProc (HWND hWnd, UINT message, WPARAM wParam,
        static bool ignorelbutton;
 
 #if MSGDEBUG > 1
-       write_log (_T("AWP: %x %x\n"), hWnd, message);
+       write_log (_T("AWP: %p %08x %08x %08x\n"), hWnd, message, wParam, lParam);
 #endif
 
        if (all_events_disabled)
@@ -1594,7 +1594,6 @@ static LRESULT CALLBACK AmigaWindowProc (HWND hWnd, UINT message, WPARAM wParam,
                }
                return 0;
        case WM_SIZE:
-               //write_log (_T("WM_SIZE %d\n"), wParam);
                if (hStatusWnd)
                        SendMessage(hStatusWnd, WM_SIZE, wParam, lParam);
                if (wParam == SIZE_MINIMIZED && !minimized) {
@@ -1603,7 +1602,6 @@ static LRESULT CALLBACK AmigaWindowProc (HWND hWnd, UINT message, WPARAM wParam,
                }
                return 0;
        case WM_ACTIVATE:
-               //write_log (_T("active %d\n"), LOWORD(wParam));
                if (LOWORD(wParam) == WA_INACTIVE) {
                        if (HIWORD(wParam))
                                setminimized();

diff --git a/od-win32/win32.h b/od-win32/win32.h
index 2aa950526271621be86679e628687035853f8beb..9c7ee6c8a3279189e5835294cfa18e10b7ece7ae 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("1")
+#define WINUAEBETA _T("2")
 #else
 #define WINUAEBETA _T("")
 #endif
 
-#define WINUAEDATE MAKEBD(2018, 2, 3)
+#define WINUAEDATE MAKEBD(2018, 2, 4)
 
 //#define WINUAEEXTRA _T("AmiKit Preview")
 //#define WINUAEEXTRA _T("Amiga Forever Edition")

diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt
index 4bdf8c39448732d75e56332b78bfd3f146e021a0..ab6ae04b2eacb74c8d2ab79467dcccc89dccf6ce 100644 (file)
--- a/od-win32/winuaechangelog.txt
+++ b/od-win32/winuaechangelog.txt
@@ -4,6 +4,52 @@ 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
+\r
+Beta 2:\r
+\r
+- If D3D11 fullscreen refresh rate is default: prefer highest supported refresh rate.\r
+- Use pre-scaled values when calculating aspect ratio in integer scale modes. Note that integer scale value selection uses original values, not aspect ratio scaled values. (Fixing this is more complex)\r
+- Few Application Verifier detected bugs fixed. One could have caused random crash at startup or when saving config.\r
+- Fixed random crash when at least one Input panel custom event string was set, Restart was clicked and then emulation was started again.\r
+\r
+Beta 1:\r
+\r
+- Added Elsat Mega Ram HD controller emulation.\r
+- A.L.F.3 HD controller emulation\r
+- Rewritten expansion hardware interrupt handling to make it more compatible with PPC emulation.\r
+- Implemented experimental RTG mode background thread for Amiga side VRAM to host texture color space conversion/copy. Option in RTG Board panel.\r
+- Fixed crash at startup if DXGI 1.4 was highest available version (Windows 10 build 10240 only)\r
+- KS 1.2 boot hack caused a crash in some manually configured UAE boot rom configurations without at least one directory filesystem/harddrive.\r
+- OCS/ECS only BPLCON2 with "illegal" PF1 or PF2 value is now accurately emulated in dual playfield mode. (If BPLCON2 PFx>=5 and matching playfield is not transparent: playfield is drawn using COLOR0 with playfield priorities still working normally)\r
+- D3D11: switching off on screen leds on the fly left static led texture on screen.\r
+- Floppy sound type selection was not loaded correctly from config file (3.6)\r
+- Floppy sound empty drive volume level was used if disk was inserted before emulation was started. (old)\r
+- HDF filesystem loader now skips HUNK_DEBUG and HUNK_SYMBOL hunks instead of aborting filesystem initialization.\r
+- Direct3D11 fullscreen, enter GUI, press save screenshot button: nothing happened.\r
+- Direct3D11 window mouse drag resize now refreshes the display only after resizing ends.\r
+- Do not allow UAE RTG init to succeed if it is enabled but not autoconfigured. (Few versions ago introduced new autoconfig handling broke previous "is this configured test?")\r
+- Some 68000 instructions didn't use correct reversed memory access order in long -(An) addressing mode. (MOVE EA,-(an), MOVEM, ADDX, SUBX)\r
+- Reading real 68EC040 MMU enable/page size TC register always returns zero, emulation now does the same. (Real 68EC060 not yet tested)\r
+- 68040 SRP and URP registers are full 32-bit, 68060 masks out low 9 bits (which are ignored anyway when calculating descriptor table addresses)\r
+- NCR5394 emulation improved (A.L.F.3 compatibility), support use of "Transfer information" command to manually read status and message bytes instead of "Initiator command complete sequence" that was designed for this purpose and all previously emulated 5394 based controllers have used.\r
+- NCR5394 emulation didn't handle situation where data was written to FIFO before true DMA write was started. FIFO contents should be written before DMA transfer starts. (Blizzard SCSI Kit IV in some situations, possibly others)\r
+- Added "Identity" checkbox to Add harddrive panel. If ticked, real ATA identity data is used in emulated ATA device instead of generic UAE generated and drive appears exactly as it does in real hardware (identical name, geometry etc). If checkbox is disabled: used HD controller/adapter does not support reading ATA Identity or drive is not ATA or ATAPI.\r
+- Read Identity now also shows CHS geometry, LBA and LBA48 (if supported), parsed from identity data (if available)\r
+- kickstart_ext_rom and cart config entries support Arcadia and ALG ROM images.\r
+- joyport2 -config entry incorrectly used port 3 slot.\r
+\r
+Elsat Mega Ram HD:\r
+\r
+- Basic PIO IDE controller.\r
+- elsat.device "ElsatHD 1.0 (09 Oct 1992)"\r
+\r
+A.L.F.3:\r
+\r
+- SCSI, NCR5394 based.\r
+- Fake DMA, MOVEMs used in transfer loop.\r
+- No official ROM dump available, tested using loadable driver ROM hack.\r
+\r
+\r
 3.6.0\r
 \r
 - Main window was not activated early enough, it was possible to get logged D3D11 fullscreen error and automatic fallback to windowed mode in some situations.\r