diff --git a/core/deps/libwebsocket/libwebsockets.h b/core/deps/libwebsocket/libwebsockets.h index 03ead6ed9..27051bf17 100644 --- a/core/deps/libwebsocket/libwebsockets.h +++ b/core/deps/libwebsocket/libwebsockets.h @@ -24,7 +24,6 @@ #ifdef __cplusplus extern "C" { -#include #endif #ifdef CMAKE_BUILD @@ -36,6 +35,7 @@ extern "C" { #ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN #endif + #include #include #include diff --git a/core/imgread/common.cpp b/core/imgread/common.cpp index 122d79a68..8d7759fc1 100644 --- a/core/imgread/common.cpp +++ b/core/imgread/common.cpp @@ -131,9 +131,16 @@ bool ConvertSector(u8* in_buff , u8* out_buff , int from , int to,int sector) Disc* OpenDisc(const wchar* fn) { - Disc* rv; + Disc* rv = nullptr; - for (int i=0;drivers[i] && !(rv=drivers[i](fn));i++) ; + for (unat i=0; drivers[i] && !rv; i++) { // ;drivers[i] && !(rv=drivers[i](fn)); + rv = drivers[i](fn); + + if (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)."; + msgboxf(warn_str,MBX_ICONASTERISK);// if (OS_DlgYes!=os_Dialog(OS_DialogYesNo, cdiWarn_S)) rv=0; + } + } return rv; } @@ -171,7 +178,7 @@ bool InitDrive(u32 fileflags) printf("Loading default image \"%s\"\n",settings.imgread.DefaultImage); if (!InitDrive_(settings.imgread.DefaultImage)) { - msgboxf("Default image \"%s\" failed to load",MBX_ICONERROR); + msgboxf("Default image \"%s\" failed to load",MBX_ICONERROR,settings.imgread.DefaultImage); return false; } else diff --git a/core/rec-x86/rec_lin86_asm.S b/core/rec-x86/rec_lin86_asm.S index d57ce3c5b..f47e01219 100644 --- a/core/rec-x86/rec_lin86_asm.S +++ b/core/rec-x86/rec_lin86_asm.S @@ -93,7 +93,7 @@ ngen_mainloop: push ebp push ebx - mov ecx,0xA0000000 + mov ecx,[eax-184] # PC - was 0xA0000000 mov dword ptr cycle_counter, 448 #SH4_TIMESLICE lea eax, no_update diff --git a/core/rec-x86/rec_x86_asm.cpp b/core/rec-x86/rec_x86_asm.cpp index a780b94b4..154f6f6b5 100644 --- a/core/rec-x86/rec_x86_asm.cpp +++ b/core/rec-x86/rec_x86_asm.cpp @@ -71,7 +71,7 @@ naked void ngen_mainloop(void* cntx) push ebp; push ebx; - mov ecx,0xA0000000; + mov ecx,[eax-184]; //# PC - was #0xA0000000 mov [cycle_counter],SH4_TIMESLICE; mov [loop_no_update],offset no_update; diff --git a/core/reios/gdrom_hle.cpp b/core/reios/gdrom_hle.cpp index 24009dfeb..68f35f04b 100644 --- a/core/reios/gdrom_hle.cpp +++ b/core/reios/gdrom_hle.cpp @@ -110,7 +110,7 @@ void GD_HLE_Command(u32 cc, u32 prm) switch(cc) { case GDCC_GETTOC: - printf("GDROM:\t*FIXME* CMD GETTOC PRM:%X\n",cc,prm); + printf("GDROM:\t*FIXME* CMD GETTOC PRM:%X\n",prm); break; case GDCC_GETTOC2: @@ -118,12 +118,12 @@ void GD_HLE_Command(u32 cc, u32 prm) break; case GDCC_GETSES: - debugf("GDROM:\tGETSES PRM:%X\n", cc, prm); + debugf("GDROM:\tGETSES PRM:%X\n", prm); GDROM_HLE_ReadSES(r[5]); break; case GDCC_INIT: - printf("GDROM:\tCMD INIT PRM:%X\n",cc,prm); + printf("GDROM:\tCMD INIT PRM:%X\n",prm); break; case GDCC_PIOREAD: @@ -131,34 +131,34 @@ void GD_HLE_Command(u32 cc, u32 prm) break; case GDCC_DMAREAD: - debugf("GDROM:\tCMD DMAREAD PRM:%X\n", cc, prm); + debugf("GDROM:\tCMD DMAREAD PRM:%X\n", prm); GDROM_HLE_ReadDMA(r[5]); break; case GDCC_PLAY_SECTOR: - printf("GDROM:\tCMD PLAYSEC? PRM:%X\n",cc,prm); + printf("GDROM:\tCMD PLAYSEC? PRM:%X\n",prm); break; case GDCC_RELEASE: - printf("GDROM:\tCMD RELEASE? PRM:%X\n",cc,prm); + printf("GDROM:\tCMD RELEASE? PRM:%X\n",prm); break; - case GDCC_STOP: printf("GDROM:\tCMD STOP PRM:%X\n",cc,prm); break; - case GDCC_SEEK: printf("GDROM:\tCMD SEEK PRM:%X\n",cc,prm); break; - case GDCC_PLAY: printf("GDROM:\tCMD PLAY PRM:%X\n",cc,prm); break; - case GDCC_PAUSE:printf("GDROM:\tCMD PAUSE PRM:%X\n",cc,prm); break; + case GDCC_STOP: printf("GDROM:\tCMD STOP PRM:%X\n",prm); break; + case GDCC_SEEK: printf("GDROM:\tCMD SEEK PRM:%X\n",prm); break; + case GDCC_PLAY: printf("GDROM:\tCMD PLAY PRM:%X\n",prm); break; + case GDCC_PAUSE:printf("GDROM:\tCMD PAUSE PRM:%X\n",prm); break; case GDCC_READ: - printf("GDROM:\tCMD READ PRM:%X\n",cc,prm); + printf("GDROM:\tCMD READ PRM:%X\n",prm); break; case GDCC_GETSCD: - debugf("GDROM:\tGETSCD PRM:%X\n",cc,prm); + debugf("GDROM:\tGETSCD PRM:%X\n",prm); GDCC_HLE_GETSCD(r[5]); break; - default: printf("GDROM:\tUnknown GDROM CC:%X PRM:%X\n",cc,prm); break; + default: printf("GDROM:\tUnknown GDROM CC:%X PRM:%X\n",prm); break; } } diff --git a/shell/reicast.vcxproj b/shell/reicast.vcxproj index a1f475ac3..06b489eb1 100644 --- a/shell/reicast.vcxproj +++ b/shell/reicast.vcxproj @@ -1,556 +1,557 @@ - - - - - Fast - Win32 - - - Fast - x64 - - - Slow - Win32 - - - Slow - x64 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - - - - - true - true - true - true - - - /bigobj %(AdditionalOptions) - /bigobj %(AdditionalOptions) - - - - true - true - - - true - true - - - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - true - true - true - - - true - true - true - true - - - - - - - true - true - - - - - - - - - - - - - - - - true - true - true - true - - - true - true - true - true - - - - {58B14048-EACB-4780-8B1E-9C84C2C30A8E} - Win32Proj - reicast - reicast - - - - Application - true - MultiByte - true - v120 - - - Application - true - MultiByte - true - v120 - - - Application - true - MultiByte - v120 - - - Application - true - MultiByte - v120 - - - - - - - - - - - - - - - - - - - - true - $(SolutionDir)..\WorkDir\ - $(Platform)\$(Configuration)\generated\objs\ - $(ProjectName)_$(Platform)_$(Configuration) - - - true - $(SolutionDir)..\WorkDir\ - $(ProjectName)_$(Platform)_$(Configuration) - $(Platform)\$(Configuration)\generated\objs\ - - - true - $(SolutionDir)..\WorkDir\ - $(Platform)\$(Configuration)\generated\objs\ - $(ProjectName)_$(Platform)_$(Configuration) - - - true - $(SolutionDir)..\WorkDir\ - $(ProjectName)_$(Platform)_$(Configuration) - $(Platform)\$(Configuration)\generated\objs\ - - - - - - Level3 - Full - WIN32;NDEBUG;_CONSOLE;X86;%(PreprocessorDefinitions) - $(ProjectDir)..\core\;$(ProjectDir)..\core\khronos;%(AdditionalIncludeDirectories) - /MP %(AdditionalOptions) - AnySuitable - true - Speed - true - true - Default - MultiThreadedDLL - false - StreamingSIMDExtensions - Fast - ProgramDatabase - true - false - $(IntDir)/%(RelativeDir)/ - true - - - Windows - true - $(SolutionDir)..\pvrframe - Dsound.lib;winmm.lib;wsock32.lib;comctl32.lib;%(AdditionalDependencies) - - - - - - - Level3 - Full - WIN32;NDEBUG;_CONSOLE;X86;%(PreprocessorDefinitions) - $(ProjectDir)..\core\;$(ProjectDir)..\core\khronos;%(AdditionalIncludeDirectories) - /MP %(AdditionalOptions) - AnySuitable - true - Speed - true - true - Default - MultiThreadedDLL - false - StreamingSIMDExtensions - Fast - ProgramDatabase - true - false - $(IntDir)/%(RelativeDir)/ - - - true - - - Windows - true - $(SolutionDir)..\pvrframe - Dsound.lib;winmm.lib;wsock32.lib;comctl32.lib;%(AdditionalDependencies) - - - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;X86;%(PreprocessorDefinitions) - $(ProjectDir)..\core\;$(ProjectDir)..\core\khronos;%(AdditionalIncludeDirectories) - true - false - Default - $(IntDir)/%(RelativeDir)/ - true - - - Windows - true - $(SolutionDir)..\pvrframe - Dsound.lib;winmm.lib;wsock32.lib;comctl32.lib;%(AdditionalDependencies) - - - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;X86;%(PreprocessorDefinitions) - $(ProjectDir)..\core\;$(ProjectDir)..\core\khronos;%(AdditionalIncludeDirectories) - true - false - Default - $(IntDir)/%(RelativeDir)/ - - - EditAndContinue - true - - - Windows - true - $(SolutionDir)..\pvrframe - Dsound.lib;winmm.lib;wsock32.lib;comctl32.lib;%(AdditionalDependencies) - - - - - true - - - - - true - - - - - - + + + + + Fast + Win32 + + + Fast + x64 + + + Slow + Win32 + + + Slow + x64 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + + + + + true + true + true + true + + + /bigobj %(AdditionalOptions) + /bigobj %(AdditionalOptions) + + + + true + true + + + true + true + + + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + true + true + true + + + true + true + true + true + + + + + + + true + true + + + + + + + + + + + + + + + + true + true + true + true + + + true + true + true + true + + + + {58B14048-EACB-4780-8B1E-9C84C2C30A8E} + Win32Proj + reicast + reicast + 10.0.10586.0 + + + + Application + true + MultiByte + true + v141 + + + Application + true + MultiByte + true + v141 + + + Application + true + MultiByte + v141 + + + Application + true + MultiByte + v141 + + + + + + + + + + + + + + + + + + + + true + $(SolutionDir)..\WorkDir\ + $(Platform)\$(Configuration)\generated\objs\ + $(ProjectName)_$(Platform)_$(Configuration) + + + true + $(SolutionDir)..\WorkDir\ + $(ProjectName)_$(Platform)_$(Configuration) + $(Platform)\$(Configuration)\generated\objs\ + + + true + $(SolutionDir)..\WorkDir\ + $(Platform)\$(Configuration)\generated\objs\ + $(ProjectName)_$(Platform)_$(Configuration) + + + true + $(SolutionDir)..\WorkDir\ + $(ProjectName)_$(Platform)_$(Configuration) + $(Platform)\$(Configuration)\generated\objs\ + + + + + + Level3 + Full + WIN32;NDEBUG;_CONSOLE;X86;%(PreprocessorDefinitions) + $(ProjectDir)..\core\;$(ProjectDir)..\core\khronos;%(AdditionalIncludeDirectories) + /MP %(AdditionalOptions) + AnySuitable + true + Speed + true + true + Default + MultiThreadedDLL + false + StreamingSIMDExtensions + Fast + ProgramDatabase + true + false + $(IntDir)/%(RelativeDir)/ + true + + + Windows + true + $(SolutionDir)..\pvrframe + Dsound.lib;winmm.lib;wsock32.lib;comctl32.lib;%(AdditionalDependencies) + + + + + + + Level3 + Full + WIN32;NDEBUG;_CONSOLE;X86;%(PreprocessorDefinitions) + $(ProjectDir)..\core\;$(ProjectDir)..\core\khronos;%(AdditionalIncludeDirectories) + /MP %(AdditionalOptions) + AnySuitable + true + Speed + true + true + Default + MultiThreadedDLL + false + StreamingSIMDExtensions + Fast + ProgramDatabase + true + false + $(IntDir)/%(RelativeDir)/ + + + true + + + Windows + true + $(SolutionDir)..\pvrframe + Dsound.lib;winmm.lib;wsock32.lib;comctl32.lib;%(AdditionalDependencies) + + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;X86;%(PreprocessorDefinitions) + $(ProjectDir)..\core\;$(ProjectDir)..\core\khronos;%(AdditionalIncludeDirectories) + true + false + Default + $(IntDir)/%(RelativeDir)/ + true + + + Windows + true + $(SolutionDir)..\pvrframe + Dsound.lib;winmm.lib;wsock32.lib;comctl32.lib;%(AdditionalDependencies) + + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;X86;%(PreprocessorDefinitions) + $(ProjectDir)..\core\;$(ProjectDir)..\core\khronos;%(AdditionalIncludeDirectories) + true + false + Default + $(IntDir)/%(RelativeDir)/ + + + EditAndContinue + true + + + Windows + true + $(SolutionDir)..\pvrframe + Dsound.lib;winmm.lib;wsock32.lib;comctl32.lib;%(AdditionalDependencies) + + + + + true + + + + + true + + + + + + \ No newline at end of file