4010b2

diff --git a/od-win32/direct3d11.cpp b/od-win32/direct3d11.cpp
index 31daa4d1b03feea8b5e3831ea5149470a7b92d1c..63e62e6cd2dec034fa944a1db69485a6f0371892 100644 (file)
--- a/od-win32/direct3d11.cpp
+++ b/od-win32/direct3d11.cpp
@@ -3370,6 +3370,7 @@ static int xxD3D11_init2(HWND ahwnd, int monid, int w_w, int w_h, int t_w, int t
        result = adapterOutput->QueryInterface(__uuidof(IDXGIOutput1), &adapterOutput1);
        if (FAILED(result)) {
                write_log(_T("IDXGIOutput QueryInterface %08x\n"), result);
+               return 0;
        }
 
        // Get the number of modes that fit the display format for the adapter output (monitor).

diff --git a/od-win32/win32.cpp b/od-win32/win32.cpp
index 4b6a7c5a10dd761918b9883367d74d6452131226..7e943b6b773da01f0f474e2e20a017de9580ec80 100644 (file)
--- a/od-win32/win32.cpp
+++ b/od-win32/win32.cpp
@@ -7037,7 +7037,7 @@ static void create_dump (struct _EXCEPTION_POINTERS *pExceptionPointers)
 
 LONG WINAPI WIN32_ExceptionFilter (struct _EXCEPTION_POINTERS * pExceptionPointers, DWORD ec)
 {
-       write_log (_T("EVALEXCEPTION!\n"));
+       write_log (_T("EVALEXCEPTION %08x!\n"), ec);
        create_dump  (pExceptionPointers);
        return EXCEPTION_CONTINUE_SEARCH;
 }

diff --git a/od-win32/win32.h b/od-win32/win32.h
index d99403ad9a31a8ecc4abff96b8027dea8df8e02e..7407c86f503517d867e67485d29d679bc349e34e 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, 6, 30)
+#define WINUAEDATE MAKEBD(2018, 7, 3)
 
 //#define WINUAEEXTRA _T("AmiKit Preview")
 //#define WINUAEEXTRA _T("Amiga Forever Edition")

diff --git a/rommgr.cpp b/rommgr.cpp
index ade316a288a7e16ddc634e91233d388fd1978823..8a3f10be4c39cb0a0330b3a264d6ca9f7253a391 100644 (file)
--- a/rommgr.cpp
+++ b/rommgr.cpp
@@ -382,9 +382,9 @@ static struct romdata roms[] = {
        ALTROMPN(92, 1, 1, 32768, ROMTYPE_ODD  | ROMTYPE_8BIT, NULL, 0xa6023f20, 0xdfb048d6, 0xbdc03587, 0x241e8121, 0x26aba603, 0xd69b0238)
        ALTROMPN(92, 1, 2, 32768, ROMTYPE_EVEN | ROMTYPE_8BIT, NULL, 0x9635a9cd, 0x47578b27, 0xc4ba6e54, 0x891930dd, 0xcb4b6a45, 0x5d6b31b2)
 
-       { _T("Blizzard SCSI Kit III"), 1, 139, 1, 139, _T("BSCSIIII\0"), 65536, 167, 0, 0, ROMTYPE_BLIZKIT3, 0, 0, NULL,
-       0xfd2c772f, 0x1411c248, 0x72f7cb8d, 0xecbe4744, 0xf0b8d12a, 0x1aaaad44, NULL, _T("blizzard_scsi_kit_iv.rom") },
-       { _T("Blizzard SCSI Kit IV"), 8, 5, 8, 5, _T("BSCSIIV\0"), 32768, 94, 0, 0, ROMTYPE_BLIZKIT4, 0, 0, NULL,
+       { _T("Blizzard SCSI Kit III"), 1, 139, 1, 139, _T("BSCSIII\0"), 65536, 167, 0, 0, ROMTYPE_BLIZKIT3, 0, 0, NULL,
+       0xfd2c772f, 0x1411c248, 0x72f7cb8d, 0xecbe4744, 0xf0b8d12a, 0x1aaaad44, NULL, NULL },
+       { _T("Blizzard SCSI Kit IV"), 8, 5, 8, 5, _T("BSCSIV\0"), 32768, 94, 0, 0, ROMTYPE_BLIZKIT4, 0, 0, NULL,
        0xf53a0fca, 0xefe17ca5,0x88c44a7f,0x0f8c62be,0x20f23278,0xcfe06727, NULL, _T("blizzard_scsi_kit_iv.rom") },
        { _T("Fastlane"), 8, 5, 8, 5, _T("FASTLANE\0"), 32768, 102, 0, 0, ROMTYPE_FASTLANE, 0, 0, NULL,
        0x00447765, 0x2644e7cb,0xba5cc54e,0x880b4b42,0x49fd1dd1,0x2eb4a3bc, NULL, _T("fastlanez3.rom") },