From 21f47c03ec330038b33f7821062588f9576d3b6f Mon Sep 17 00:00:00 2001 From: flyinghead Date: Tue, 25 Sep 2018 12:27:37 +0200 Subject: [PATCH] Fix dynarec x64 crash with mingw64. Get rid of CDI warning pop up dialog --- core/hw/sh4/dyna/driver.cpp | 5 +++++ core/imgread/common.cpp | 5 +---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/core/hw/sh4/dyna/driver.cpp b/core/hw/sh4/dyna/driver.cpp index 3f7983f24..9f14cc5e3 100644 --- a/core/hw/sh4/dyna/driver.cpp +++ b/core/hw/sh4/dyna/driver.cpp @@ -425,6 +425,7 @@ void recSh4_Init() } #if defined(_WIN64) +#ifdef _MSVC_VER for (int i = 10; i < 1300; i++) { @@ -436,6 +437,10 @@ void recSh4_Init() if (CodeCache) break; } +#else + CodeCache = (u8*)VirtualAlloc(NULL, CODE_SIZE, MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE); +#endif + verify(CodeCache != NULL); #else CodeCache = (u8*)(((unat)SH4_TCB+4095)& ~4095); #endif diff --git a/core/imgread/common.cpp b/core/imgread/common.cpp index 4e2c7d673..90f79e549 100644 --- a/core/imgread/common.cpp +++ b/core/imgread/common.cpp @@ -138,11 +138,8 @@ Disc* OpenDisc(const wchar* fn) if (rv && cdi_parse == drivers[i]) { const wchar warn_str[] = "Warning: CDI Image Loaded!\n Many CDI images are known to be defective, GDI or CHD format is preferred. Please only file bug reports when using images known to be good (GDI or CHD)."; -#ifdef _ANDROID printf(warn_str); -#else - msgboxf(warn_str, MBX_ICONASTERISK);// if (OS_DlgYes!=os_Dialog(OS_DialogYesNo, cdiWarn_S)) rv=0; -#endif + break; } }