コミット: 706cdc50f9b5300ba09c62cd9fa2c75c2b5f5ed2 - timidity41 (git)

コミットメタ情報

• リビジョン: 706cdc50f9b5300ba09c62cd9fa2c75c2b5f5ed2 (tree)
• 日時: 2014-08-15 07:32:52
• 作者: yta <yta@inte...>
• コミッター: TAMUKI Shoichi

ログメッセージ

Fix Windows Driver

Add DriverCallback API. The driver must call the DriverCallback API.
After changing, some MIDI sequencers will not freeze: XGWorks, Domino,
etc.

Signed-off-by: yta <[e-mail]>

変更サマリ

• modified: windrv/mmddk.h
• modified: windrv/timiditydrv.c

差分

--- a/windrv/mmddk.h
+++ b/windrv/mmddk.h
@@ -381,8 +381,8 @@ typedef JOYDEVMSGPROC *LPJOYDEVMSGPROC;
 #define MAKEMCIRESOURCE(wRet, wRes) MAKELRESULT((wRet), (wRes))
 
 typedef struct {
-	DWORD   		dwCallback;
-	DWORD   		dwInstance;
+	DWORD_PTR		dwCallback;
+	DWORD_PTR		dwInstance;
 	HMIDIOUT		hMidi;
 	DWORD   		dwFlags;
 } PORTALLOC, *LPPORTALLOC;
@@ -390,8 +390,8 @@ typedef struct {
 typedef struct {
 	HWAVE			hWave;
 	LPWAVEFORMATEX		lpFormat;
-	DWORD			dwCallback;
-	DWORD			dwInstance;
+	DWORD_PTR		dwCallback;
+	DWORD_PTR		dwInstance;
 	UINT			uMappedDeviceID;
         DWORD			dnDevNode;
 } WAVEOPENDESC, *LPWAVEOPENDESC;
@@ -403,9 +403,9 @@ typedef struct {
 
 typedef struct {
 	HMIDI			hMidi;
-	DWORD			dwCallback;
-	DWORD			dwInstance;
-        DWORD          		dnDevNode;
+	DWORD_PTR		dwCallback;
+	DWORD_PTR		dwInstance;
+        DWORD_PTR		dnDevNode;
         DWORD          		cIds;
         MIDIOPENSTRMID 		rgIds;
 } MIDIOPENDESC, *LPMIDIOPENDESC;
@@ -414,8 +414,8 @@ typedef struct tMIXEROPENDESC
 {
 	HMIXEROBJ		hmx;
         LPVOID			pReserved0;
-	DWORD			dwCallback;
-	DWORD			dwInstance;
+	DWORD_PTR		dwCallback;
+	DWORD_PTR		dwInstance;
 } MIXEROPENDESC, *LPMIXEROPENDESC;
 
 typedef struct {
@@ -449,14 +449,14 @@ BOOL			WINAPI	mciFreeCommandResource(UINT uTable);
 #define DCB_TYPEMASK		0x0007
 #define DCB_NOSWITCH		0x0008			/* don't switch stacks for callback */
 
-BOOL		 	WINAPI	DriverCallback(DWORD dwCallBack, UINT uFlags, HDRVR hDev,
-					       UINT wMsg, DWORD dwUser, DWORD dwParam1, DWORD dwParam2);
+BOOL		 	WINAPI	DriverCallback(DWORD_PTR dwCallBack, UINT uFlags, HDRVR hDev,
+					       UINT wMsg, DWORD_PTR dwUser, DWORD_PTR dwParam1, DWORD_PTR dwParam2);
 
-typedef void (*LPTASKCALLBACK)(DWORD dwInst);
+typedef void (*LPTASKCALLBACK)(DWORD_PTR dwInst);
 
 #define TASKERR_NOTASKSUPPORT 1
 #define TASKERR_OUTOFMEMORY   2
-MMRESULT WINAPI mmTaskCreate(LPTASKCALLBACK, HANDLE*, DWORD);
+MMRESULT WINAPI mmTaskCreate(LPTASKCALLBACK, HANDLE*, DWORD_PTR);
 void     WINAPI mmTaskBlock(HANDLE);
 BOOL     WINAPI mmTaskSignal(HANDLE);
 void     WINAPI mmTaskYield(void);

--- a/windrv/timiditydrv.c
+++ b/windrv/timiditydrv.c
@@ -103,6 +103,10 @@ const GUID CLSID_tim_synth = {0x0FEC4C35,0xA705,0x41d7,{0xA3,0xBB,0xD5,0x87,0xA2
 static volatile int OpenCount = 0;
 static volatile int modm_closed = 1;
 
+static HDRVR hdrvrInstance;
+static MIDIOPENDESC mid_desc;
+static DWORD dwOpenFlags;
+
 static CRITICAL_SECTION mim_section;
 static volatile int stop_thread = 0;
 static HANDLE hRtsynThread = NULL;
@@ -134,8 +138,11 @@ STDAPI DllUnregisterServer(void)
 	return S_OK;
 }
 
-STDAPI_(LONG) DriverProc(DWORD_PTR dwDriverId, HDRVR hdrvr, UINT msg, LPARAM lParam1, LPARAM lParam2){
+STDAPI_(LRESULT) DriverProc(DWORD_PTR dwDriverId, HDRVR hdrvr, UINT msg, LPARAM lParam1, LPARAM lParam2){
 	switch(msg) {
+	case DRV_OPEN:
+		hdrvrInstance = hdrvr;
+		return 1;
 	case DRV_REMOVE:
 		if (modm_closed == 0){
 			int maxloop=500;
@@ -159,7 +166,6 @@ STDAPI_(LONG) DriverProc(DWORD_PTR dwDriverId, HDRVR hdrvr, UINT msg, LPARAM lPa
 	case DRV_EXITSESSION:
 	case DRV_FREE:
 	case DRV_INSTALL:
-	case DRV_OPEN:
 	case DRV_POWER:
 	case DRV_QUERYCONFIGURE:
 	default:
@@ -260,7 +266,73 @@ unsigned __stdcall threadfunc(LPVOID lpV){
 	return 0;
 }
 
-STDAPI_(LONG) modMessage(UINT uDeviceID, UINT uMsg, DWORD dwUser, DWORD dwParam1, DWORD dwParam2){
+static void modCallback(UINT uMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2)
+{
+//	DWORD_PTR dwUser, dwSend1, dwSend2;
+	DWORD_PTR dwCallback = mid_desc.dwCallback;
+	DWORD_PTR dwInstance = mid_desc.dwInstance;
+
+	if (!dwCallback) {
+	    return;
+	}
+/*
+	switch (uMsg) {
+	case MM_MOM_DONE:
+	    dwUser = mid_desc.dwInstance;
+	    dwSend1 = (DWORD_PTR)(mid_desc.hMidi);
+	    dwSend2 = dwParam1;
+	    break;
+	default:
+	    dwUser = mid_desc.dwInstance;
+	    dwSend1 = (DWORD_PTR)(mid_desc.hMidi);
+	    dwSend2 = 0;
+	    break;
+	}
+*/
+
+	switch (dwOpenFlags & CALLBACK_TYPEMASK) {
+	case CALLBACK_NULL:
+	    break;
+	case CALLBACK_WINDOW:
+	    {
+//		HWND hWnd = (HWND)(dwCallback);
+//		PostMessage(hWnd, uMsg, (WPARAM)(dwSend1), (LPARAM)(dwSend2));
+		DriverCallback(dwCallback, DCB_WINDOW, hdrvrInstance, uMsg, dwInstance, dwParam1, dwParam2);
+	    }
+	    break;
+	case CALLBACK_FUNCTION:
+	    {
+//		typedef void (CALLBACK *MIDIOUTPROC)(HMIDIOUT, UINT, DWORD_PTR, DWORD_PTR, DWORD_PTR);
+//		MIDIOUTPROC MidiOutProc = (MIDIOUTPROC)(dwCallback);
+//		(*MidiOutProc)((HMIDIOUT)mid_desc.hMidi, uMsg, dwUser, dwSend1, dwSend2);
+		DriverCallback(dwCallback, DCB_FUNCTION, hdrvrInstance, uMsg, dwInstance, dwParam1, dwParam2);
+	    }
+	    break;
+	case CALLBACK_THREAD:
+	    {
+//		DWORD dwThread = (DWORD)(dwCallback);
+//		PostThreadMessage(dwThread, uMsg, (WPARAM)(dwSend1), (LPARAM)(dwSend2));
+		DriverCallback(dwCallback, DCB_TASK, hdrvrInstance, uMsg, dwInstance, dwParam1, dwParam2);
+	    }
+	    break;
+	case CALLBACK_EVENT:
+	    {
+//		HANDLE hEvent = (HANDLE)(dwCallback);
+//		SetEvent(hEvent);
+		DriverCallback(dwCallback, DCB_EVENT, hdrvrInstance, uMsg, dwInstance, dwParam1, dwParam2);
+	    }
+	    break;
+	default:
+	    {
+		/* not implemented */
+	    }
+	    break;
+	}
+
+	return;
+}
+
+STDAPI_(DWORD) modMessage(UINT uDeviceID, UINT uMsg, DWORD_PTR dwUser, DWORD_PTR dwParam1, DWORD_PTR dwParam2){
 	MIDIHDR *IIMidiHdr;
 	
 	switch (uMsg) {
@@ -273,6 +345,12 @@ STDAPI_(LONG) modMessage(UINT uDeviceID, UINT uMsg, DWORD dwUser, DWORD dwParam1
 			int opend=0;
 			char **argv = (char **)alloca(argc * sizeof(char *));
 			
+			ZeroMemory(&mid_desc, sizeof(MIDIOPENDESC));
+			if (dwParam1) {
+				CopyMemory(&mid_desc, (LPMIDIOPENDESC)dwParam1, sizeof(MIDIOPENDESC));
+			}
+			dwOpenFlags = (DWORD)dwParam2;
+			
 			processPriority = GetPriorityClass(GetCurrentProcess());
 			SetPriorityClass(GetCurrentProcess(), REALTIME_PRIORITY_CLASS);
 			//AllocConsole();
@@ -291,6 +369,7 @@ STDAPI_(LONG) modMessage(UINT uDeviceID, UINT uMsg, DWORD dwUser, DWORD dwParam1
 			hRtsynThread=(HANDLE)_beginthreadex(NULL,0,threadfunc,0,0,&thrdaddr);
 			SetPriorityClass(hRtsynThread, REALTIME_PRIORITY_CLASS);
 			SetThreadPriority(hRtsynThread, THREAD_PRIORITY_TIME_CRITICAL);
+			modCallback(MM_MOM_OPEN, dwParam1, dwParam2);
 			modm_closed = 0;
 		}
 		SetPriorityClass(GetCurrentProcess(), processPriority);
@@ -304,13 +383,19 @@ STDAPI_(LONG) modMessage(UINT uDeviceID, UINT uMsg, DWORD dwUser, DWORD dwParam1
 	case MODM_LONGDATA:
 		{
 		double event_time = get_current_calender_time();
+		DWORD dwLength;
 		IIMidiHdr = (MIDIHDR *)dwParam1;
 		if( !(IIMidiHdr->dwFlags & MHDR_PREPARED) ) return MIDIERR_UNPREPARED;
 		IIMidiHdr->dwFlags &= ~MHDR_INQUEUE;
 		IIMidiHdr->dwFlags |= MHDR_DONE;
 		EnterCriticalSection(&mim_section);
-		rtsyn_play_one_sysex(IIMidiHdr->lpData, IIMidiHdr->dwBufferLength, event_time);
+		dwLength = IIMidiHdr->dwBufferLength;
+		if (IIMidiHdr->dwBytesRecorded > 0 && IIMidiHdr->dwBytesRecorded <= IIMidiHdr->dwBufferLength) {
+			dwLength = IIMidiHdr->dwBytesRecorded;
+		}
+		rtsyn_play_one_sysex(IIMidiHdr->lpData, dwLength, event_time);
 		LeaveCriticalSection(&mim_section);
+		modCallback(MM_MOM_DONE, dwParam1, dwParam2);
 		return MMSYSERR_NOERROR;
 		}
 	case MODM_DATA:
@@ -330,6 +415,7 @@ STDAPI_(LONG) modMessage(UINT uDeviceID, UINT uMsg, DWORD dwUser, DWORD dwParam1
 			OpenCount = 0;
 			return MMSYSERR_NOTENABLED;
 		}
+		modCallback(MM_MOM_CLOSE, dwParam1, dwParam2);
 		return MMSYSERR_NOERROR;
 		break;
 	default: