OMv15: Oops.

KeppySoftware · Jun 30, 2023 · f37fc98 · f37fc98
1 parent a6e5e21
commit f37fc98
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/OmniMIDIv2/SynthMain.cpp b/OmniMIDIv2/SynthMain.cpp
@@ -203,7 +203,7 @@ bool OmniMIDI::SynthModule::ProcessEvBuf() {
 			return true;
 		}
 
-		if (!(tev - 0xC0 & 0xE0)) len = 2;
+		if (!((tev - 0xC0) & 0xE0)) len = 2;
 		else if (cmd == 0xF0)
 		{
 			switch (GETCHANNEL(tev))
@@ -243,7 +243,7 @@ bool OmniMIDI::SynthModule::LoadFuncs() {
 	assert(NanoSleep != 0);
 
 	if (!NanoSleep)
-		FNERROR(SynErr, L"How even? How can your OS not have NtDelayExecution??? Are we in NT 4.0????");
+		FNERROR(SynErr, L"Where's NtDelayExecution... Is this Windows 95?");
 
 	void* ptr = nullptr;
 

diff --git a/OmniMIDIv2/WDMDrv.cpp b/OmniMIDIv2/WDMDrv.cpp
@@ -1,8 +1,10 @@
 /*
-OmniMIDI v15+ (Rewrite) for Windows NT
+* 
+	OmniMIDI v15+ (Rewrite) for Windows NT
+
+	This file contains the required code to run the driver under Windows 7 SP1 and later.
+	This file is useful only if you want to compile the driver under Windows, it's not needed for Linux/macOS porting.
 
-This file contains the required code to run the driver under Windows 7 SP1 and later.
-This file is useful only if you want to compile the driver under Windows, it's not needed for Linux/macOS porting.
 */
 
 #include "pch.h"
@@ -96,6 +98,12 @@ unsigned long WinDriver::DriverMask::GiveCaps(UINT DeviceIdentifier, PVOID CapsP
 		Caps2W.vDriverVersion = MAKEWORD(6, 2);
 		memcpy((LPMIDIOUTCAPS2W)CapsPointer, &Caps2W, min(CapsSize, sizeof(Caps2W)));
 		break;
+
+	default:
+		// ???????
+		NERROR(MaskErr, L"Size passed to CapsSize does not match any valid MIDIOUTCAPS struct.", false);
+		return MMSYSERR_INVALPARAM;
+
 	}
 
 	return MMSYSERR_NOERROR;