5300b10

tonioni · May 27, 2024 · 8ba0ad0 · 8ba0ad0
1 parent f350227
commit 8ba0ad0
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/od-win32/sounddep/sound.cpp b/od-win32/sounddep/sound.cpp
@@ -1103,6 +1103,8 @@ class UAEIMMNotificationClient : public IMMNotificationClient
 			return S_OK;
 		if (flow != eConsole && flow != eMultimedia)
 			return S_OK;
+		if (!s)
+			return S_OK;
 		if (s->devicetype == SOUND_DEVICE_WASAPI_EXCLUSIVE) {
 			write_log(_T("WASAPI EX OnDefaultDeviceChanged '%s'\n"), pwstrDeviceId);
 			return S_OK;
@@ -1131,13 +1133,17 @@ class UAEIMMNotificationClient : public IMMNotificationClient
 	}
 	HRESULT STDMETHODCALLTYPE OnDeviceStateChanged(LPCWSTR pwstrDeviceId, DWORD dwNewState)
 	{
+		if (!s)
+			return S_OK;
 		if (s->devicetype == SOUND_DEVICE_WASAPI_EXCLUSIVE || s->devicetype == SOUND_DEVICE_WASAPI) {
 			;// write_log(_T("WASAPI OnDeviceStateChanged '%s' %08x\n"), pwstrDeviceId, dwNewState);
 		}
 		return S_OK;
 	}
 	HRESULT STDMETHODCALLTYPE OnPropertyValueChanged(LPCWSTR pwstrDeviceId, const PROPERTYKEY key)
 	{
+		if (!s)
+			return S_OK;
 		if (s->devicetype == SOUND_DEVICE_WASAPI_EXCLUSIVE || s->devicetype == SOUND_DEVICE_WASAPI) {
 			;// write_log(_T("WASAPI OnPropertyValueChanged '%s'\n"), pwstrDeviceId);
 		}

diff --git 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("8")
+#define WINUAEBETA _T("10")
 #else
 #define WINUAEBETA _T("")
 #endif
 
-#define WINUAEDATE MAKEBD(2024, 5, 20)
+#define WINUAEDATE MAKEBD(2024, 5, 27)
 
 //#define WINUAEEXTRA _T("AmiKit Preview")
 //#define WINUAEEXTRA _T("Amiga Forever Edition")

diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt
@@ -1,4 +1,10 @@
 
+Beta 10:
+
+- Fast CPU and serial port loop back mode: transmit never finished, nothing was received.
+- Undocumented serial port feature emulated: CPU/Copper INTREQ write that sets RBF bit will also set SERDATR OVRUN bit.
+- ATAPI CD MODE SELECT command fixed. (Used to control analog CD audio volume) 
+
 Beta 9:
 
 - AGA mode color register with set genlock bit was misdetected as blanking being enabled. (b1 made it visible but real bug was introduced long time ago)
@@ -70,7 +76,7 @@ All Picasso96 supported RTG boards are now emulated. All CGX4 supported boards e
 
 Beta 2:
 
-- Release raw input devices when GUI is open (except during input Test/Remap) or when debugger window is active. Allows Windows shortcut keys like Win+E now work without need to unfocus the window.
+- Release raw input devices when GUI is open (except during input Test/Remap) or when debugger window is active. Allows Windows shortcut keys like Win+E work without need to unfocus the window.
 - Added Misc panel option to disable default on screen keyboard gamepad button 4 mapping. 
 - Added Domino RTG board emulation. (ET4000, basic SVGA chip, no HW cursor, no blitter. Has linear frame buffer support. Emulator code from 86box.)
 - Added Merlin Z2 and Z3 RTG board emulation. (ET4000/W32, ET4000+ HW cursor and blitter. Emulator code from 86box.). Blitter is not yet hooked up properly. (If you try it, make sure NOBLITTER=YES)