3220b2

diff --git a/od-win32/win32.h b/od-win32/win32.h
index 184a298cee120393d290664be42ef7345513259d..38d7f876e660fdfa68c5bb717aced8e504013cb7 100644 (file)
--- a/od-win32/win32.h
+++ b/od-win32/win32.h
@@ -20,12 +20,12 @@
 #define LANG_DLL_FULL_VERSION_MATCH 0
 
 #if WINUAEPUBLICBETA
-#define WINUAEBETA _T("1")
+#define WINUAEBETA _T("2")
 #else
 #define WINUAEBETA _T("")
 #endif
 
-#define WINUAEDATE MAKEBD(2015, 12, 10)
+#define WINUAEDATE MAKEBD(2015, 12, 13)
 
 //#define WINUAEEXTRA _T("AmiKit Preview")
 //#define WINUAEEXTRA _T("Amiga Forever Edition")

diff --git a/od-win32/win32gfx.cpp b/od-win32/win32gfx.cpp
index bb3bfd0a6437831d4896031a87d4ec3b0b02e6e2..318855705c3c9afc88286bb3f5eeaf2f7b30a59e 100644 (file)
--- a/od-win32/win32gfx.cpp
+++ b/od-win32/win32gfx.cpp
@@ -137,6 +137,7 @@ volatile bool vblank_found_rtg;
 static HANDLE flipevent, flipevent2, vblankwaitevent;
 static volatile int flipevent_mode;
 static CRITICAL_SECTION screen_cs;
+static bool screen_cs_allocated;
 
 void gfx_lock (void)
 {
@@ -2732,7 +2733,10 @@ int graphics_init (bool mousecapture)
 
 int graphics_setup (void)
 {
-       InitializeCriticalSection (&screen_cs);
+       if (!screen_cs_allocated) {
+               InitializeCriticalSection(&screen_cs);
+               screen_cs_allocated = true;
+       }
 #ifdef PICASSO96
        InitPicasso96 ();
 #endif

diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt
index 7a9d3dff96db00dd065ff077c99aca8dbc0a1ecb..00b4e5443aa559c3ee86aa42b155f0f40b4d6077 100644 (file)
--- a/od-win32/winuaechangelog.txt
+++ b/od-win32/winuaechangelog.txt
@@ -1,4 +1,52 @@
 
+Beta 2:
+
+- SASI/SASI (CHS) options were not visible in GUI when listing SASI controllers.
+- No MIDI out devices detected, 64-bit only.
+- AVIOutput with "capture before filtering": width is now always divisible by 16 and height is divisible by two.
+- Added config file only optional AVIOutput position and offset parameters: recording_width and recording_height,
+  (resolution of video) and recording_x and recording_y, offset from top/left of Amiga display. If offsets are not
+  set or negative, Amiga display is automatically centered. Only available in "capture before filtering" mode.
+  GUI setting may be added later.
+- Windowed mode bottom bar CPU state didn't show PPC state if x86 and PPC CPU expansion was active at the same time.
+- Phoenix Board SCSI emulation added.
+
+Phoenix Board SCSI:
+- Autoconfig, 5380 SCSI chip.
+- Very simple design, PIO SCSI, software handshake. (No "fake DMA").
+- Boot ROM version J added, pbscsi.device 3.1. ("Phoenix Board SCSI J 29/7/92")
+
+Beta 1:
+
+- 68020+ BFFFO instruction's result value must be calculated from full offset (was offset AND 31),
+  even when effective address is data register.
+- When loading config with joystick that is not available, switch to keyboard layout that was
+  previously selected or none, not layout A. Set layout A in default.uae if you want old behavior.
+- If IPL rises during interrupt exception processing, new interrupt exception should start immediately when
+  previous one was about to execute first instruction. Previously one instruction was always executed before
+  new instruction exception processing started.
+- Per-monitor high DPI update still caused repeated GUI window closing/opening.
+- Slirp code had undefined C (unsigned <= 0 comparisons, in WinUAE only), probably accidentally worked when
+  using older compiler. Caused slirp thread to use 100% CPU time continuously.
+- Keyboard names are now listed in Input panel device list. (Replaces "HID Keyboard Device" or similar generic name)
+- AGA FMODE register was reset to original value if state was restored and then display parameters changed (for
+  example window was resized) and program didn't update FMODE for example in copper list. (3.1.0b10)
+- AGA subpixel bitplane delay emulation rewritten. (Fire and Ice CD32 config screen jitter, Banshee flickering
+  vertical line)
+- Fixed wrong free call in function that creates zipped debugging log files.
+- Renamed log file zip file name. includes now 64-bit identifier and version number.
+- Added Windows build number to log version string.
+- Filter reserved USB HID usage IDs, not just vendor reserved IDs.
+- Changed HID RawInput handling, never unregister raw input, use rawinput device change events to detect device
+  insertions/removals instead of generic change support that also includes other types of media changes.
+  This update also works around odd Windows 10 (10586 only?) rawinput side-effect where device handle can change
+  after RegisterRawInputDevices() call. Raw input device change notification support is Vista or later only.
+- Updated built-in HRTmon to 2.36
+- Clip out of bounds RTG coordinates instead of rejecting graphics operation completely.
+- SSE2 rounding mode should match FPU rounding mode. (3.2.0b16)
+
+3.2.1
+
 - Restoring statefile with FPU crashed.
 - If Blizzard RAM allocation fails in non-JIT compatible special case mode, halve memory size and try again
   instead of crashing.