From 2f438d8f87224b45c404b78084cc7ff07b5609e2 Mon Sep 17 00:00:00 2001 From: Toni Wilen Date: Sun, 28 Sep 2014 17:46:16 +0300 Subject: [PATCH] 2900b18 --- expansion.cpp | 4 +-- od-win32/sysconfig.h | 1 - od-win32/win32.cpp | 5 +++ od-win32/win32.h | 4 +-- od-win32/winuae_msvc11/winuae_msvc.vcxproj | 31 +++++++------------ .../winuae_msvc11/winuae_msvc.vcxproj.filters | 30 ------------------ od-win32/winuaechangelog.txt | 12 ++++++- zfile_archive.cpp | 21 +++++++------ 8 files changed, 42 insertions(+), 66 deletions(-) diff --git a/expansion.cpp b/expansion.cpp index 59365a53..4d04bfee 100644 --- a/expansion.cpp +++ b/expansion.cpp @@ -424,12 +424,12 @@ static void boardmessage(addrbank *mapped, bool success) sizemod = 'M'; size /= 1024; } - write_log (_T("Card %d: Z%d 0x%08x %4d%c %s %s %s.\n"), + write_log (_T("Card %d: Z%d 0x%08x %4d%c %s %s%s\n"), ecard + 1, (type & 0xc0) == zorroII ? 2 : 3, expamem_board_pointer, size, sizemod, type & rom_card ? _T("ROM") : (type & add_memory ? _T("RAM") : _T("IO ")), mapped->name, - success ? _T("ok") : _T("shut up")); + success ? _T("") : _T(" SHUT UP")); } void expamem_shutup(addrbank *mapped) diff --git a/od-win32/sysconfig.h b/od-win32/sysconfig.h index f0207df0..925d2303 100644 --- a/od-win32/sysconfig.h +++ b/od-win32/sysconfig.h @@ -90,7 +90,6 @@ #define WITH_UAENET_PCAP #define WITH_PPC #define WITH_QEMU_CPU -#define WITH_PEARPC_CPU #else diff --git a/od-win32/win32.cpp b/od-win32/win32.cpp index 1c82d713..9420f25b 100644 --- a/od-win32/win32.cpp +++ b/od-win32/win32.cpp @@ -3119,6 +3119,11 @@ void target_fixup_options (struct uae_prefs *p) p->win32_rtgmatchdepth = false; if (gfxboard_need_byteswap (p->rtgmem_type)) p->color_mode = 5; + if (p->ppc_model && !p->gfx_api) { + error_log (_T("Graphics board and PPC: Direct3D enabled.")); + p->gfx_api = 1; + } + } } diff --git a/od-win32/win32.h b/od-win32/win32.h index b8c69bb0..9fe2d480 100644 --- 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("17") +#define WINUAEBETA _T("18") #else #define WINUAEBETA _T("") #endif -#define WINUAEDATE MAKEBD(2014, 9, 21) +#define WINUAEDATE MAKEBD(2014, 9, 28) //#define WINUAEEXTRA _T("AmiKit Preview") //#define WINUAEEXTRA _T("Amiga Forever Edition") diff --git a/od-win32/winuae_msvc11/winuae_msvc.vcxproj b/od-win32/winuae_msvc11/winuae_msvc.vcxproj index 5c7b206f..088bbb35 100644 --- a/od-win32/winuae_msvc11/winuae_msvc.vcxproj +++ b/od-win32/winuae_msvc11/winuae_msvc.vcxproj @@ -256,7 +256,7 @@ %(AdditionalOptions) Disabled ..\..\include;..\..;..\;..\resources;..\osdep;..\sounddep;..\..\slirp;..\..\ppc\pearpc;%(AdditionalIncludeDirectories) - WINVER=0x0500;_DEBUG;WIN32_IE=0x0700;WIN32;WIN64;_CRT_SECURE_NO_WARNINGS;D3D_DEBUG_INFO;%(PreprocessorDefinitions) + WINVER=0x0500;_DEBUG;WIN32_IE=0x0700;WIN32;WIN64;PTR64;UAE;WINUAE;_CRT_SECURE_NO_WARNINGS;D3D_DEBUG_INFO;%(PreprocessorDefinitions) Sync EnableFastChecks MultiThreadedDebugDLL @@ -476,7 +476,7 @@ true false ..\..\include;..\..;..\;..\resources;..\osdep;..\sounddep;..\..\slirp;..\..\ppc\pearpc;..\..\ppc\pearpc;%(AdditionalIncludeDirectories) - WINVER=0x0500;NDEBUG;_WIN32_IE=0x0700;WIN32;WIN64;%(PreprocessorDefinitions) + WINVER=0x0500;NDEBUG;_WIN32_IE=0x0700;WIN32;WIN64;PTR64;UAE;WINUAE;%(PreprocessorDefinitions) true Sync Default @@ -541,20 +541,20 @@ .\Release/winuae_msvc.tlb - Full + Disabled OnlyExplicitInline true - Speed - true + Neither + false false ..\..\include;..\..;..\;..\resources;..\osdep;..\sounddep;..\..\slirp;..\..\ppc\pearpc;%(AdditionalIncludeDirectories) - WINVER=0x0500;NDEBUG;_WIN32_IE=0x0700;WIN32;WIN64;%(PreprocessorDefinitions) + WINVER=0x0500;NDEBUG;_WIN32_IE=0x0700;WIN32;WIN64;PTR64;UAE;WINUAE;%(PreprocessorDefinitions) true Sync Default - MultiThreadedDLL + MultiThreadedDebugDLL false - true + false NotSet Precise false @@ -566,7 +566,7 @@ $(Platform)\$(Configuration)\ Level3 true - StdCall + FastCall Default 4996;%(DisableSpecificWarnings) %(ForcedIncludeFiles) @@ -577,7 +577,7 @@ 0x0409 - ws2_32.lib;ddraw.lib;dxguid.lib;winmm.lib;comctl32.lib;version.lib;vfw32.lib;msacm32.lib;dsound.lib;dinput8.lib;d3d9.lib;d3dx9.lib;setupapi.lib;wininet.lib;dxerr.lib;shlwapi.lib;zlibstat.lib;portaudio_x64.lib;packet.lib;wpcap.lib;openal32.lib;libpng15.lib;lglcd.lib;wtsapi32.lib;enet_x64.lib;prowizard_x64.lib;lzmalib.lib;libFLAC_static.lib;avrt.lib;hid.lib;Iphlpapi.lib;luastatic.lib;libmpeg2_ff;%(AdditionalDependencies) + ws2_32.lib;ddraw.lib;dxguid.lib;winmm.lib;comctl32.lib;version.lib;vfw32.lib;msacm32.lib;dsound.lib;dinput8.lib;d3d9.lib;d3dx9.lib;setupapi.lib;wininet.lib;dxerr.lib;shlwapi.lib;zlibstat.lib;portaudio_x64.lib;packet.lib;wpcap.lib;openal32.lib;libpng15.lib;lglcd.lib;wtsapi32.lib;enet_x64.lib;prowizard_x64.lib;lzmalib.lib;libFLAC_static.lib;avrt.lib;hid.lib;Iphlpapi.lib;luastatic.lib;libmpeg2_ff.lib;softfloat_x64.lib;%(AdditionalDependencies) NotSet $(OutDir)$(TargetName)$(TargetExt) true @@ -694,7 +694,7 @@ true true ..\..\include;..\..;..\;..\resources;..\osdep;..\sounddep;..\..\slirp;..\..\ppc\pearpc;%(AdditionalIncludeDirectories) - WINVER=0x0500;NDEBUG;_WIN32_IE=0x0700;WIN32;WIN64;%(PreprocessorDefinitions) + WINVER=0x0500;NDEBUG;_WIN32_IE=0x0700;WIN32;WIN64;PTR64;UAE;WINUAE;%(PreprocessorDefinitions) true Sync Default @@ -814,15 +814,6 @@ - - - - - - - - - diff --git a/od-win32/winuae_msvc11/winuae_msvc.vcxproj.filters b/od-win32/winuae_msvc11/winuae_msvc.vcxproj.filters index 93714133..cc787cc1 100644 --- a/od-win32/winuae_msvc11/winuae_msvc.vcxproj.filters +++ b/od-win32/winuae_msvc11/winuae_msvc.vcxproj.filters @@ -56,9 +56,6 @@ {a238ed36-3d5f-4fd0-afd7-a34029119da7} - - {f8cdc857-41a2-400a-a2e1-9a9eb3ac9d04} - @@ -709,33 +706,6 @@ common - - ppc\pearpc - - - ppc\pearpc - - - ppc\pearpc - - - ppc\pearpc - - - ppc\pearpc - - - ppc\pearpc - - - ppc\pearpc - - - ppc\pearpc - - - ppc\pearpc - diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt index b412611e..c21e8d35 100644 --- a/od-win32/winuaechangelog.txt +++ b/od-win32/winuaechangelog.txt @@ -18,6 +18,17 @@ Things that may happen in 2015: - restore only single input target to default. +Beta 18: + +- "Pause emulation when xyz" option remained forever stuck in pause mode if PPC CPU was active. +- PearPC PPC emulation removed. +- Freezer cartridge ROMs had disappeared from GUI. +- Freezer cartridges didn't work. +- Force Direct3D mode if hardware RTG board + PPC enabled. DirectDraw has glitches. (Will also have + glitches in non-PPC mode but there is no need to change it yet) +- CSPPC/BPPC interrupt controller IO address accesses were not thread safe, caused random lost or stuck + interrupts. + Beta 17: - Hard reset now forces reload of KS ROM if maprom is active, previously map rom mapped image @@ -40,7 +51,6 @@ Important: - QEMU PPC libraries are now loaded from \plugins\qemu\. Old location is not supported anymore. Move all qemu dependency libraries and qemu-uae.dll to new path. - Beta 16: - GUI (and log) showed wrong size for very large drives (>1T). Visual problem only. diff --git a/zfile_archive.cpp b/zfile_archive.cpp index 0b4a7fa2..dcd00d8e 100644 --- a/zfile_archive.cpp +++ b/zfile_archive.cpp @@ -707,7 +707,7 @@ static int canrar (void) return israr < 0 ? 0 : 1; } -static int CALLBACK RARCallbackProc (UINT msg,LONG UserData,LONG P1,LONG P2) +static int CALLBACK RARCallbackProc (UINT msg, LONG UserData, LONG P1, LONG P2) { if (msg == UCM_PROCESSDATA) { zfile_fwrite ((uae_u8*)P1, 1, P2, rarunpackzf); @@ -1538,8 +1538,8 @@ static struct zfile *archive_access_adf (struct znode *zn) struct zfile *z = NULL; int root, ffs; struct adfhandle *adf = (struct adfhandle*)zn->volume->handle; - int size, bs; - int i; + uae_s64 size; + int i, bs; uae_u8 *dst; size = zn->size; @@ -1556,7 +1556,7 @@ static struct zfile *archive_access_adf (struct znode *zn) for (;;) { adf_read_block (adf, root); for (i = bs / 4 - 51; i >= 6; i--) { - int bsize = ffs ? bs : bs - 24; + uae_s64 bsize = ffs ? bs : bs - 24; int block = gl (adf, i * 4); if (size < bsize) bsize = size; @@ -1578,7 +1578,7 @@ static struct zfile *archive_access_adf (struct znode *zn) struct sfsblock *sfsblocks; int sfsblockcnt, sfsmaxblockcnt, i; - int bsize; + uae_s64 bsize; int block = zn->offset; int dblock; int btree, version, sfs2; @@ -1752,7 +1752,8 @@ static struct zfile *archive_access_rdb (struct znode *zn) struct zfile *zf; uae_u8 buf[512] = { 0 }; int surf, spb, spt, lowcyl, highcyl; - int size, block, blocksize; + int block, blocksize; + uae_s64 size; uae_u8 *p; if (zn->offset) { @@ -2015,12 +2016,12 @@ static struct zfile *archive_access_fat (struct znode *zn) { uae_u8 buf[512] = { 0 }; int fatbits = 12; - int size = zn->size; + uae_s64 size = zn->size; struct zfile *sz, *dz; int rootdir, reserved, sectorspercluster; int numfats, sectorsperfat, rootentries; - int dataregion; - int offset, cluster; + int dataregion, cluster; + uae_s64 offset; sz = zn->volume->archive; @@ -2044,7 +2045,7 @@ static struct zfile *archive_access_fat (struct znode *zn) offset = 0; cluster = zn->offset; while (size && cluster >= 2) { - int left = size > sectorspercluster * 512 ? sectorspercluster * 512 : size; + uae_s64 left = size > sectorspercluster * 512 ? sectorspercluster * 512 : size; int sector = dataregion + (cluster - 2) * sectorspercluster; zfile_fseek (sz, sector * 512, SEEK_SET); zfile_fread (dz->data + offset, 1, left, sz); -- 2.47.3