3610b5

diff --git a/od-win32/direct3d11.cpp b/od-win32/direct3d11.cpp
index 1f056de42b46d0866622f93a8fc5244a54044363..51ff6ab747f2d80c4f7e1db7a20217ae173c4622 100644 (file)
--- a/od-win32/direct3d11.cpp
+++ b/od-win32/direct3d11.cpp
@@ -4434,6 +4434,9 @@ static void xD3D11_resize(int activate)
        if (d3d->guimode && isfullscreen() > 0)
                return;
 
+       if (quit_program == -UAE_QUIT)
+               return;
+
        if (activate) {
                d3d->fsmode = activate;
                d3d->fsmodechange = true;
@@ -4441,11 +4444,6 @@ static void xD3D11_resize(int activate)
                write_log(_T("D3D11 resize activate\n"));
        }
 
-       if (quit_program == -UAE_QUIT) {
-               xD3D11_quit(d3d);
-               return;
-       }
-
        d3d->fsresizedo = true;
 }
 

diff --git a/od-win32/srcrelease.cmd b/od-win32/srcrelease.cmd
index 2b889d466ebf87dde61fe5c2d2b91d9bd2bfb7ac..d60e40d78c51b1e0ee5c4b88956788d34372d610 100644 (file)
--- a/od-win32/srcrelease.cmd
+++ b/od-win32/srcrelease.cmd
@@ -1,197 +1,18 @@
-cd c:\projects\winuae_bak
-rm -rf bak
-mkdir bak
 
-copy d:\amiga\text\winuaechangelog.txt c:\projects\winuae\src\od-win32
-copy d:\amiga\text\winuaechangelog.txt c:\projects\winuae\distribution\docs
-
-copy c:\projects\winuae\src\* c:\projects\winuae_bak\bak\
-copy /s c:\projects\winuae\src\archivers\* c:\projects\winuae_bak\bak\archivers\
-mkdir bak\include
-copy c:\projects\winuae\src\include\* c:\projects\winuae_bak\bak\include\
-mkdir bak\jit
-copy c:\projects\winuae\src\jit\* c:\projects\winuae_bak\bak\jit\
-copy /s c:\projects\winuae\src\qemuvga\* c:\projects\winuae_bak\bak\qemuvga\
-copy /s c:\projects\winuae\src\slirp\* c:\projects\winuae_bak\bak\slirp\
-copy /s c:\projects\winuae\src\od-win32\* c:\projects\winuae_bak\bak\od-win32\
-
-copy d:\amiga\amiga\filesys.asm c:\projects\winuae_bak\bak
-
-cd bak
-del *.obj *.ilk *.exe *.pdb *.pch *.idb *.ncb *.sln *.suo *.ncb *.sdf *.db /s
-
-del cpudefs.cpp
-del blit.h
-del blitfunc.cpp
-del blitfunc.h
-del blittable.cpp
-del cputbl.h
-del cpustbl.cpp
-del compemu.cpp
-del comptbl.h
-del compstbl.cpp
-del cpuemu_0.cpp
-del cpuemu_11.cpp
-del cpuemu_12.cpp
-del cpuemu_13.cpp
-del cpuemu_20.cpp
-del cpuemu_21.cpp
-del cpuemu_22.cpp
-del cpuemu_31.cpp
-del cpuemu_32.cpp
-del cpuemu_33.cpp
-del linetoscr.cpp
-del aros.rom.cpp
-
-cd jit
-del compemu.cpp
-del compstbl.h
-del compstbl.cpp
-cd ..
-
-cd od-win32
-cd ipctester
-rm -rf debug
-rm -rf release
-rm -rf fullrelease
-cd ..
-
-cd spsutil
-rm -rf debug
-rm -rf release
-rm -rf fullrelease
-cd ..
-
-cd prowizard
-rm -rf debug
-rm -rf release
-rm -rf x64
-cd ..
-
-cd unpackers
-rm -rf debug
-rm -rf release
-rm -rf x64
-cd ..
-
-cd genlinetoscr_msvc
-rm -f genlinetoscr.exe
-rm -f *.cpp
-rm -f *.h
-rm -rf debug
-rm -rf release
-rm -rf fullrelease
-rm -rf test
-cd ..
-
-cd build68k_msvc
-rm -f build68k.exe
-rm -f *.cpp
-rm -f *.h
-rm -rf debug
-rm -rf release
-rm -rf fullrelease
-rm -rf test
-cd ..
-
-cd genblitter_msvc
-rm -f genblitter.exe 
-rm -f *.cpp
-rm -f *.h
-rm -rf debug
-rm -rf release
-rm -rf fullrelease
-rm -rf test
-cd ..
-
-cd gencomp_msvc
-rm -f gencomp.exe
-rm -f *.cpp
-rm -f *.h
-rm -rf debug
-rm -rf release
-rm -rf fullrelease
-rm -rf test
-cd ..
-
-cd gencpu_msvc
-rm -f gencpu.exe
-rm -f *.cpp
-rm -f *.h
-rm -rf debug
-rm -rf release
-rm -rf fullrelease
-rm -rf test
 cd ..
 
-cd winuae_msvc14
-rm -rf debug
-rm -rf release
-rm -rf fullrelease
-rm -rf test
-rm -rf x64
-rm -rf packages
-cd ..
+copy d:\amiga\text\winuaechangelog.txt /y
+copy d:\amiga\text\winuaechangelog.txt ..\..\distribution\docs /y
 
-cd winuae_msvc15
-rm -rf debug
-rm -rf release
-rm -rf fullrelease
-rm -rf test
-rm -rf x64
-rm -rf packages
-rm -rf ipch
-cd ..
+del ..\winuaesrc.7z
 
-cd singlefilehelper
-rm -rf debug
-rm -rf release
-rm -rf fullrelease
-cd ..
+7z a -r ..\winuaesrc *.c *.cpp *.h *.sln *.vcxproj* *.ico *.rc *.bmp *.cur *.manifest *.png *.txt
 
-cd resourcedll
-rm -rf debug
-rm -rf release
-rm -rf fullrelease
-cd ..
-
-cd fdrawcmd
-rm -rf debug
-rm -rf release
-rm -rf fullrelease
-cd ..
-
-cd uaeunp
-rm -rf debug
-rm -rf release
-rm -rf fullrelease
-cd ..
+copy ..\winuaesrc.7z e:\amiga\winuaepackets\winuaesrc%1.7z
+copy ..\winuaesrc.7z e:\amiga /y
 
-cd decompress
-rm -rf debug
-rm -rf release
-rm -rf fullrelease
-cd ..
-
-cd consolewrapper
-rm -rf debug
-rm -rf release
-rm -rf fullrelease
-cd ..
-
-cd wix
-rm -rf bin
-rm -rf obj
-cd ..
-
-
-cd ..
-
-7z a -r winuaesrc *
+cd od-win32
 
-copy winuaesrc.7z e:\amiga\winuaepackets\winuaesrc%1.7z
-move winuaesrc.7z e:\amiga
-cd c:\projects\winuae\src\od-win32
 7z a winuaedebug%1 winuae_msvc15\fullrelease\winuae.pdb winuae_msvc15\x64\fullrelease\winuae.pdb
 move winuaedebug%1.7z e:\amiga\winuaepackets\debug\
 copy winuae_msvc15\fullrelease\winuae.pdb d:\amiga\dump\winuae.pdb

diff --git a/od-win32/win32.h b/od-win32/win32.h
index 7274f0b47750c9a38dd67dc1968eaa4f1710c043..5470359b3b02f771dea4bd59308167d95ac9bdc1 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("4")
+#define WINUAEBETA _T("5")
 #else
 #define WINUAEBETA _T("")
 #endif
 
-#define WINUAEDATE MAKEBD(2018, 2, 14)
+#define WINUAEDATE MAKEBD(2018, 2, 19)
 
 //#define WINUAEEXTRA _T("AmiKit Preview")
 //#define WINUAEEXTRA _T("Amiga Forever Edition")

diff --git a/od-win32/winuae_msvc15/winuae_msvc.vcxproj b/od-win32/winuae_msvc15/winuae_msvc.vcxproj
index 0af55eea5077511384e8620a12d9294d877ce319..d0a7ee5b03f93461b314d3c04b28469bf90b0107 100644 (file)
--- a/od-win32/winuae_msvc15/winuae_msvc.vcxproj
+++ b/od-win32/winuae_msvc15/winuae_msvc.vcxproj
@@ -181,22 +181,28 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Test|x64'">
     <IgnoreImportLibrary>
     </IgnoreImportLibrary>
-    <ExecutablePath>C:\Program Files (x86)\Windows Kits\10\bin\x86;$(ExecutablePath)</ExecutablePath>
+    <ExecutablePath>$(MSBuildProgramFiles32)\Windows Kits\10\bin\10.0.16299.0\x64;$(ExecutablePath)</ExecutablePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Test|Win32'">
-    <ExecutablePath>C:\Program Files (x86)\Windows Kits\10\bin\x86;$(ExecutablePath)</ExecutablePath>
+    <ExecutablePath>$(MSBuildProgramFiles32)\Windows Kits\10\bin\10.0.16299.0\x86;$(ExecutablePath)</ExecutablePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ExecutablePath>C:\Program Files (x86)\Windows Kits\10\bin\x86;$(ExecutablePath)</ExecutablePath>
+    <ExecutablePath>$(MSBuildProgramFiles32)\Windows Kits\10\bin\10.0.16299.0\x86;$(ExecutablePath)</ExecutablePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">
-    <ExecutablePath>C:\Program Files (x86)\Windows Kits\10\bin\x86;$(ExecutablePath)</ExecutablePath>
+    <ExecutablePath>$(MSBuildProgramFiles32)\Windows Kits\10\bin\10.0.16299.0\x86;$(ExecutablePath)</ExecutablePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='FullRelease|x64'">
-    <ExecutablePath>C:\Program Files (x86)\Windows Kits\10\bin\x86;$(ExecutablePath)</ExecutablePath>
+    <ExecutablePath>$(MSBuildProgramFiles32)\Windows Kits\10\bin\10.0.16299.0\x64;$(ExecutablePath)</ExecutablePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ExecutablePath>C:\Program Files (x86)\Windows Kits\10\bin\x86;$(ExecutablePath)</ExecutablePath>
+    <ExecutablePath>$(MSBuildProgramFiles32)\Windows Kits\10\bin\10.0.16299.0\x64;$(ExecutablePath)</ExecutablePath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ExecutablePath>$(MSBuildProgramFiles32)\Windows Kits\10\bin\10.0.16299.0\x86;$(ExecutablePath)</ExecutablePath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ExecutablePath>$(MSBuildProgramFiles32)\Windows Kits\10\bin\10.0.16299.0\x64;$(ExecutablePath)</ExecutablePath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Midl>

diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt
index db7eb038c1826eb7fb5936190e7ce40315544b2b..34f28b9340cef11d510fe0e11f2f16eeacd925b2 100644 (file)
--- a/od-win32/winuaechangelog.txt
+++ b/od-win32/winuaechangelog.txt
@@ -5,6 +5,27 @@ JIT Direct current rules are less complex now. It automatically switches off onl
   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 5:\r
+\r
+- Creating new file with "DOS" name (for example AUX) to directory filesystem drive returned error (got broken in 3.6.0, it added special handling for reading existing special named files in case if filesystem accepts them without mangling but creating new files was missed..)\r
+- Autoscale ignored small vertical display areas in very top of display in some situations.\r
+- A600/A1200/A4000 IDE missed doubler supported flag. (3.5.0+ only shows ports 2 and 3 if device is confirmed supporting IDE doubler)\r
+- Virtual RDB is now supported with dynamic (VHD) hardfiles. (Virtual RDB: if partition hardfile is mounted to any hardware emulated IDE or SCSI controller, virtual RDB is automatically added. This enables to boot/mount partition hardfiles even when using hardware emulated HD controllers)\r
+- Virtual RDB now also includes FSHD and LSEG blocks if hardfile FileSys path is non-empty. (Makes filesystem compatibility testing much faster and easier when using non-UAE controllers)\r
+- If D3D11 mode shader/mask loading failed (for example missing mask image file), not all allocated data was freed.\r
+- Remaining D3D11 alt-tab/F12 fullscreen<>windowed mode crashes should be fixed.\r
+- D3D11 fullscreen mode restore after alt-tab sometimes only showed blank screen.\r
+- Reverted 3.6.0b17 allow JIT direct in CSPPC mode. PPC can't boot without JIT-direct incompatible memory mapping. If you want JIT Direct with CSPPC and don't need PPC: Use CSMK3.\r
+\r
+Beta 4:\r
+\r
+- Cirrus Logic emulation blit out of bounds checks added, previously it usually caused a crash, for example OS4 + Picasso IV sometimes does small blits that cross end of VRAM. (Original QEMU blit checks were very broken)\r
+- Yet another interrupt handling rewrite to properly support cross thread interrupt activation (PPC emulation).\r
+- Added more validation to clipboard sharing IFF parsing to prevent crashes if data is truncated.\r
+- RTG multithread + hardware mouse cursor + no OSD: mouse cursor movement didn't re-draw the screen.\r
+- If SCSI ATA passtrough returns weird timeout error (instead of immediate failure like it is supposed to do), don't attempt it again to reduce delay when selecting real harddrive.\r
+- Fixed D3D 11 mode debug mode warning. Most likely it was harmless.\r
+\r
 Beta 3:\r
 \r
 - Not all Advanced chipset options reset when compatible checkbox was ticked.\r