April 2007 - Wine-commits - list.winehq.org

Hans Leidekker : shell32: Add a stub implementation for SHMapIDListToImageListIndexAsync.
by Alexandre Julliard 26 Apr '07

26 Apr '07

Module: wine Branch: master Commit: bab2ddb77ed55dd711101deff1f20dbb5cee792d URL: http://source.winehq.org/git/wine.git/?a=commit;h=bab2ddb77ed55dd711101deff… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Wed Apr 25 20:49:56 2007 +0200 shell32: Add a stub implementation for SHMapIDListToImageListIndexAsync. --- dlls/shell32/iconcache.c | 13 +++++++++++++ dlls/shell32/shell32.spec | 1 + 2 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/iconcache.c b/dlls/shell32/iconcache.c index 0a7eb6c..6645761 100644 --- a/dlls/shell32/iconcache.c +++ b/dlls/shell32/iconcache.c @@ -617,6 +617,19 @@ int WINAPI SHMapPIDLToSystemImageListIndex( } /************************************************************************* + * SHMapIDListToImageListIndexAsync [SHELL32.148] + */ +HRESULT WINAPI SHMapIDListToImageListIndexAsync(IUnknown *pts, IShellFolder *psf, + LPCITEMIDLIST pidl, UINT flags, + void *pfn, void *pvData, void *pvHint, + int *piIndex, int *piIndexSel) +{ + FIXME("(%p, %p, %p, 0x%08x, %p, %p, %p, %p, %p)\n", + pts, psf, pidl, flags, pfn, pvData, pvHint, piIndex, piIndexSel); + return E_FAIL; +} + +/************************************************************************* * Shell_GetCachedImageIndex [SHELL32.72] * */ diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index 415fe95..2bf62dc 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -136,6 +136,7 @@ 145 stdcall -noname PathFindOnPath(ptr ptr) PathFindOnPathAW 146 stdcall -noname RLBuildListOfPaths() 147 stdcall -noname SHCLSIDFromString(long long) SHCLSIDFromStringAW + 148 stdcall -noname SHMapIDListToImageListIndexAsync(ptr ptr ptr long ptr ptr ptr ptr ptr) 149 stdcall -noname SHFind_InitMenuPopup(long long long long) 151 stdcall -noname SHLoadOLE(long)

1 0

Hans Leidekker : msi: Add a stub implementation for MsiEnumProductsEx{A, W} .
by Alexandre Julliard 26 Apr '07

26 Apr '07

Module: wine Branch: master Commit: 9eefc04f6bc8bfe380da19d0c91e13c88d35151a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9eefc04f6bc8bfe380da19d0c… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Wed Apr 25 20:49:43 2007 +0200 msi: Add a stub implementation for MsiEnumProductsEx{A, W}. --- dlls/msi/msi.spec | 4 ++-- dlls/msi/registry.c | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/msi/msi.spec b/dlls/msi/msi.spec index 420205f..2fe63b3 100644 --- a/dlls/msi/msi.spec +++ b/dlls/msi/msi.spec @@ -238,8 +238,8 @@ 242 stub MsiExtractPatchXMLDataW 243 stub MsiGetPatchInfoExA 244 stub MsiGetPatchInfoExW -245 stub MsiEnumProductsExA -246 stub MsiEnumProductsExW +245 stdcall MsiEnumProductsExA(str str long long ptr ptr ptr ptr) +246 stdcall MsiEnumProductsExW(wstr wstr long long ptr ptr ptr ptr) 247 stub MsiGetProductInfoExA 248 stub MsiGetProductInfoExW 249 stub MsiQueryComponentStateA diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index 1aa1303..088f46a 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -1068,3 +1068,23 @@ UINT WINAPI MsiEnumPatchesW( LPCWSTR szProduct, DWORD iPatchIndex, iPatchIndex, lpPatchBuf, lpTransformsBuf, pcchTransformsBuf); return ERROR_NO_MORE_ITEMS; } + +UINT WINAPI MsiEnumProductsExA( LPCSTR szProductCode, LPCSTR szUserSid, + DWORD dwContext, DWORD dwIndex, LPSTR szInstalledProductCode, + MSIINSTALLCONTEXT* pdwInstalledContext, LPSTR szSid, LPDWORD pcchSid) +{ + FIXME("%s %s %d %d %p %p %p %p\n", debugstr_a(szProductCode), debugstr_a(szUserSid), + dwContext, dwIndex, szInstalledProductCode, pdwInstalledContext, + szSid, pcchSid); + return ERROR_NO_MORE_ITEMS; +} + +UINT WINAPI MsiEnumProductsExW( LPCWSTR szProductCode, LPCWSTR szUserSid, + DWORD dwContext, DWORD dwIndex, LPWSTR szInstalledProductCode, + MSIINSTALLCONTEXT* pdwInstalledContext, LPWSTR szSid, LPDWORD pcchSid) +{ + FIXME("%s %s %d %d %p %p %p %p\n", debugstr_w(szProductCode), debugstr_w(szUserSid), + dwContext, dwIndex, szInstalledProductCode, pdwInstalledContext, + szSid, pcchSid); + return ERROR_NO_MORE_ITEMS; +}

1 0

appdb/include testData.php
by WineHQ 26 Apr '07

26 Apr '07

ChangeSet ID: 31107 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/04/25 19:17:42 Modified files: include : testData.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Fix loading of 'Runs?' value in the testData form, otherwise the value is displayed as though no value is set Patch: http://cvs.winehq.org/patch.py?id=31107 Old revision New revision Changes Path 1.49 1.50 +1 -1 appdb/include/testData.php Index: appdb/include/testData.php diff -u -p appdb/include/testData.php:1.49 appdb/include/testData.php:1.50 --- appdb/include/testData.php:1.49 26 Apr 2007 0:17:42 -0000 +++ appdb/include/testData.php 26 Apr 2007 0:17:42 -0000 @@ -719,7 +719,7 @@ class testData{ { echo "<select name='$sVarname'>\n"; echo "<option value=\"\">Choose ...</option>\n"; - $aRating = array("Yes", "No", "Not Installable"); + $aRating = array("Yes", "No", "Not installable"); $iMax = count($aRating); for($i=0; $i < $iMax; $i++)

1 0

Paul Vriens : setupapi/tests: SetupDiCreateDeviceInfoListExW is not implemented on win98.
by Alexandre Julliard 25 Apr '07

25 Apr '07

Module: wine Branch: master Commit: ce3fa8e861ef05ce08d27cf6c1fe016a38474845 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce3fa8e861ef05ce08d27cf6c… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Apr 25 13:28:44 2007 +0200 setupapi/tests: SetupDiCreateDeviceInfoListExW is not implemented on win98. --- dlls/setupapi/tests/devinst.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index c47cd75..d0756b7 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -62,6 +62,11 @@ static void test_SetupDiCreateDeviceInfoListEx(void) devlist = pSetupDiCreateDeviceInfoListExW(NULL, NULL, NULL, notnull); error = GetLastError(); + if (error == ERROR_CALL_NOT_IMPLEMENTED) + { + skip("SetupDiCreateDeviceInfoListExW is not implemented\n"); + return; + } ok(devlist == INVALID_HANDLE_VALUE, "SetupDiCreateDeviceInfoListExW failed : %p %d (expected %p)\n", devlist, error, INVALID_HANDLE_VALUE); ok(error == ERROR_INVALID_PARAMETER, "GetLastError returned wrong value : %d, (expected %d)\n", error, ERROR_INVALID_PARAMETER);

1 0

Paul Vriens : kernel32/tests: GetLongPathNameW is not implemented on win98.
by Alexandre Julliard 25 Apr '07

25 Apr '07

Module: wine Branch: master Commit: 67c26f4ec30886fc1279d72bdab6524983ce9343 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67c26f4ec30886fc1279d72bd… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Apr 25 13:21:19 2007 +0200 kernel32/tests: GetLongPathNameW is not implemented on win98. --- dlls/kernel32/tests/path.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 9212165..33fcf6f 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -941,6 +941,11 @@ static void test_GetLongPathNameW(void) { SetLastError(0xdeadbeef); length = pGetLongPathNameW(NULL,NULL,0); + if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + skip("GetLongPathNameW is not implemented\n"); + return; + } ok(0==length,"GetLongPathNameW returned %d but expected 0\n",length); ok(GetLastError()==ERROR_INVALID_PARAMETER,"GetLastError returned %d but expected ERROR_INVALID_PARAMETER\n",GetLastError());

1 0

Paul Vriens : kernel32/tests: GetComputerNameW is not implemented on win98.
by Alexandre Julliard 25 Apr '07

25 Apr '07

Module: wine Branch: master Commit: c1f6501808ca8ca8b03984f6218b905d095fb9c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1f6501808ca8ca8b03984f62… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Apr 25 13:16:37 2007 +0200 kernel32/tests: GetComputerNameW is not implemented on win98. --- dlls/kernel32/tests/environ.c | 22 ++++++++++++++-------- 1 files changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/environ.c b/dlls/kernel32/tests/environ.c index dab57f7..b53a4b4 100644 --- a/dlls/kernel32/tests/environ.c +++ b/dlls/kernel32/tests/environ.c @@ -265,16 +265,22 @@ static void test_GetComputerName(void) HeapFree(GetProcessHeap(), 0, name); size = 0; + SetLastError(0xdeadbeef); ret = GetComputerNameW((LPWSTR)0xdeadbeef, &size); error = GetLastError(); - todo_wine - ok(!ret && error == ERROR_BUFFER_OVERFLOW, "GetComputerNameW should have failed with ERROR_BUFFER_OVERFLOW instead of %d\n", error); - size++; /* nul terminating character */ - nameW = HeapAlloc(GetProcessHeap(), 0, size * sizeof(nameW[0])); - ok(nameW != NULL, "HeapAlloc failed with error %d\n", GetLastError()); - ret = GetComputerNameW(nameW, &size); - ok(ret, "GetComputerNameW failed with error %d\n", GetLastError()); - HeapFree(GetProcessHeap(), 0, nameW); + if (error == ERROR_CALL_NOT_IMPLEMENTED) + skip("GetComputerNameW is not implemented\n"); + else + { + todo_wine + ok(!ret && error == ERROR_BUFFER_OVERFLOW, "GetComputerNameW should have failed with ERROR_BUFFER_OVERFLOW instead of %d\n", error); + size++; /* nul terminating character */ + nameW = HeapAlloc(GetProcessHeap(), 0, size * sizeof(nameW[0])); + ok(nameW != NULL, "HeapAlloc failed with error %d\n", GetLastError()); + ret = GetComputerNameW(nameW, &size); + ok(ret, "GetComputerNameW failed with error %d\n", GetLastError()); + HeapFree(GetProcessHeap(), 0, nameW); + } pGetComputerNameExA = GetProcAddress(GetModuleHandle("kernel32.dll"), "GetComputerNameExA"); if (!pGetComputerNameExA)

1 0

Paul Vriens : kernel32/tests: CreateRemoteThread is not implemented on win98.
by Alexandre Julliard 25 Apr '07

25 Apr '07

Module: wine Branch: master Commit: 9dafa1fc11d6951fc354849860cf48ecdf8d9641 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9dafa1fc11d6951fc35484986… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Apr 25 13:04:03 2007 +0200 kernel32/tests: CreateRemoteThread is not implemented on win98. --- dlls/kernel32/tests/thread.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index 69861de..bbda00e 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -241,8 +241,14 @@ static VOID test_CreateRemoteThread(void) ok(ret != 0, "DuplicateHandle failed, err=%u\n", GetLastError()); /* create suspended remote thread with entry point SetEvent() */ + SetLastError(0xdeadbeef); hThread = CreateRemoteThread(hProcess, NULL, 0, threadFunc_SetEvent, hRemoteEvent, CREATE_SUSPENDED, &tid); + if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + skip("CreateRemoteThread is not implemented\n"); + goto cleanup; + } ok(hThread != NULL, "CreateRemoteThread failed, err=%u\n", GetLastError()); ok(tid != 0, "null tid\n"); ret = SuspendThread(hThread); @@ -291,6 +297,7 @@ static VOID test_CreateRemoteThread(void) if (ret) ok(exitcode == 0, "SetEvent succeeded, expected to fail\n"); CloseHandle(hThread); +cleanup: TerminateProcess(hProcess, 0); CloseHandle(hEvent); CloseHandle(hProcess);

1 0

Emmanuel Maillard : winecoreaudio: Implement MIDIOut_Reset.
by Alexandre Julliard 25 Apr '07

25 Apr '07

Module: wine Branch: master Commit: 0a202679b86521d0f6d206ab8f74a263527aa7c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a202679b86521d0f6d206ab8… Author: Emmanuel Maillard <mahanuu(a)free.fr> Date: Wed Apr 25 01:17:45 2007 +0200 winecoreaudio: Implement MIDIOut_Reset. --- dlls/winecoreaudio.drv/midi.c | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index 7cbddcf..fd00cb3 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -499,6 +499,31 @@ static DWORD MIDIOut_SetVolume(WORD wDevID, DWORD dwVolume) return MMSYSERR_NOTSUPPORTED; } +static DWORD MIDIOut_Reset(WORD wDevID) +{ + unsigned chn; + + TRACE("%d\n", wDevID); + + if (wDevID >= MIDIOut_NumDevs) { + WARN("bad device ID : %d\n", wDevID); + return MMSYSERR_BADDEVICEID; + } + if (destinations[wDevID].caps.wTechnology == MOD_SYNTH) + { + for (chn = 0; chn < 16; chn++) { + /* turn off every note */ + MusicDeviceMIDIEvent(destinations[wDevID].synth, 0xB0 | chn, 0x7B, 0, 0); + /* remove sustain on channel */ + MusicDeviceMIDIEvent(destinations[wDevID].synth, 0xB0 | chn, 0x40, 0, 0); + } + } + else FIXME("MOD_MIDIPORT\n"); + + /* FIXME: the LongData buffers must also be returned to the app */ + return MMSYSERR_NOERROR; +} + /************************************************************************** * modMessage */ @@ -533,6 +558,7 @@ DWORD WINAPI CoreAudio_modMessage(UINT wDevID, UINT wMsg, DWORD dwUser, DWORD dw case MODM_SETVOLUME: return MIDIOut_SetVolume(wDevID, dwParam1); case MODM_RESET: + return MIDIOut_Reset(wDevID); default: TRACE("Unsupported message (08%x)\n", wMsg); }

1 0

Emmanuel Maillard : winecoreaudio: Implement MIDIOut_GetVolume and MIDIOut_SetVolume.
by Alexandre Julliard 25 Apr '07

25 Apr '07

Module: wine Branch: master Commit: 9aa9cde8416a251d8ed6fcba05d533d792b91541 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9aa9cde8416a251d8ed6fcba0… Author: Emmanuel Maillard <mahanuu(a)free.fr> Date: Wed Apr 25 01:16:44 2007 +0200 winecoreaudio: Implement MIDIOut_GetVolume and MIDIOut_SetVolume. --- dlls/winecoreaudio.drv/coremidi.h | 3 ++ dlls/winecoreaudio.drv/midi.c | 52 +++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 0 deletions(-) diff --git a/dlls/winecoreaudio.drv/coremidi.h b/dlls/winecoreaudio.drv/coremidi.h index 2a02003..69fd4ce 100644 --- a/dlls/winecoreaudio.drv/coremidi.h +++ b/dlls/winecoreaudio.drv/coremidi.h @@ -55,6 +55,9 @@ typedef void *AUGraph; extern OSStatus MusicDeviceMIDIEvent(AudioUnit au, UInt32 inStatus, UInt32 inData1, UInt32 inData2, UInt32 inOffsetSampleFrame); extern OSStatus MusicDeviceSysEx(AudioUnit au, const UInt8 *inData, UInt32 inLength); +/* audiounit.c */ +extern int AudioUnit_SetVolume(AudioUnit au, float left, float right); +extern int AudioUnit_GetVolume(AudioUnit au, float *left, float *right); #endif /* coremidi.c */ diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index 6bca11e..7cbddcf 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -449,6 +449,56 @@ static DWORD MIDIOut_GetNumDevs(void) return MIDIOut_NumDevs; } +static DWORD MIDIOut_GetVolume(WORD wDevID, DWORD *lpdwVolume) +{ + TRACE("%d\n", wDevID); + + if (wDevID >= MIDIOut_NumDevs) { + WARN("bad device ID : %d\n", wDevID); + return MMSYSERR_BADDEVICEID; + } + if (lpdwVolume == NULL) { + WARN("Invalid Parameter\n"); + return MMSYSERR_INVALPARAM; + } + + if (destinations[wDevID].caps.wTechnology == MOD_SYNTH) + { + float left; + float right; + AudioUnit_GetVolume(destinations[wDevID].synth, &left, &right); + + *lpdwVolume = ((WORD) left * 0xFFFFl) + (((WORD) right * 0xFFFFl) << 16); + + return MMSYSERR_NOERROR; + } + + return MMSYSERR_NOTSUPPORTED; +} + +static DWORD MIDIOut_SetVolume(WORD wDevID, DWORD dwVolume) +{ + TRACE("%d\n", wDevID); + + if (wDevID >= MIDIOut_NumDevs) { + WARN("bad device ID : %d\n", wDevID); + return MMSYSERR_BADDEVICEID; + } + if (destinations[wDevID].caps.wTechnology == MOD_SYNTH) + { + float left; + float right; + + left = LOWORD(dwVolume) / 65535.0f; + right = HIWORD(dwVolume) / 65535.0f; + AudioUnit_SetVolume(destinations[wDevID].synth, left, right); + + return MMSYSERR_NOERROR; + } + + return MMSYSERR_NOTSUPPORTED; +} + /************************************************************************** * modMessage */ @@ -479,7 +529,9 @@ DWORD WINAPI CoreAudio_modMessage(UINT wDevID, UINT wMsg, DWORD dwUser, DWORD dw case MODM_GETNUMDEVS: return MIDIOut_GetNumDevs(); case MODM_GETVOLUME: + return MIDIOut_GetVolume(wDevID, (DWORD*)dwParam1); case MODM_SETVOLUME: + return MIDIOut_SetVolume(wDevID, dwParam1); case MODM_RESET: default: TRACE("Unsupported message (08%x)\n", wMsg);

1 0

Emmanuel Maillard : winecoreaudio: Implement MIDIOut_LongData.
by Alexandre Julliard 25 Apr '07

25 Apr '07

Module: wine Branch: master Commit: 97d5a029877a1c28ffadd9e85607b70291db54ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=97d5a029877a1c28ffadd9e85… Author: Emmanuel Maillard <mahanuu(a)free.fr> Date: Wed Apr 25 01:08:05 2007 +0200 winecoreaudio: Implement MIDIOut_LongData. --- dlls/winecoreaudio.drv/midi.c | 82 ++++++++++++++++++++++++++++++++++++++++- 1 files changed, 80 insertions(+), 2 deletions(-) diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index 250f523..6bca11e 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -296,6 +296,85 @@ static DWORD MIDIOut_Data(WORD wDevID, DWORD dwParam) return MMSYSERR_NOERROR; } +static DWORD MIDIOut_LongData(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) +{ + LPBYTE lpData; + OSStatus err = noErr; + + TRACE("wDevID=%d lpMidiHdr=%p dwSize=%d\n", wDevID, lpMidiHdr, dwSize); + + /* Note: MS doc does not say much about the dwBytesRecorded member of the MIDIHDR structure + * but it seems to be used only for midi input. + * Taking a look at the WAVEHDR structure (which is quite similar) confirms this assumption. + */ + + if (wDevID >= MIDIOut_NumDevs) { + WARN("bad device ID : %d\n", wDevID); + return MMSYSERR_BADDEVICEID; + } + + if (lpMidiHdr == NULL) { + WARN("Invalid Parameter\n"); + return MMSYSERR_INVALPARAM; + } + + lpData = (LPBYTE) lpMidiHdr->lpData; + + if (lpData == NULL) + return MIDIERR_UNPREPARED; + if (!(lpMidiHdr->dwFlags & MHDR_PREPARED)) + return MIDIERR_UNPREPARED; + if (lpMidiHdr->dwFlags & MHDR_INQUEUE) + return MIDIERR_STILLPLAYING; + lpMidiHdr->dwFlags &= ~MHDR_DONE; + lpMidiHdr->dwFlags |= MHDR_INQUEUE; + + /* FIXME: MS doc is not 100% clear. Will lpData only contain system exclusive + * data, or can it also contain raw MIDI data, to be split up and sent to + * modShortData() ? + * If the latest is true, then the following WARNing will fire up + */ + if (lpData[0] != 0xF0 || lpData[lpMidiHdr->dwBufferLength - 1] != 0xF7) { + WARN("Alledged system exclusive buffer is not correct\n\tPlease report with MIDI file\n"); + } + + TRACE("dwBufferLength=%u !\n", lpMidiHdr->dwBufferLength); + TRACE(" %02X %02X %02X ... %02X %02X %02X\n", + lpData[0], lpData[1], lpData[2], lpData[lpMidiHdr->dwBufferLength-3], + lpData[lpMidiHdr->dwBufferLength-2], lpData[lpMidiHdr->dwBufferLength-1]); + + + if (lpData[0] != 0xF0) { + /* System Exclusive */ + ERR("Add missing 0xF0 marker at the beginning of system exclusive byte stream\n"); + } + if (lpData[lpMidiHdr->dwBufferLength - 1] != 0xF7) { + /* Send end of System Exclusive */ + ERR("Add missing 0xF7 marker at the end of system exclusive byte stream\n"); + } + if (destinations[wDevID].caps.wTechnology == MOD_SYNTH) /* FIXME */ + { + err = MusicDeviceSysEx(destinations[wDevID].synth, (const UInt8 *) lpData, lpMidiHdr->dwBufferLength); + if (err != noErr) + { + ERR("MusicDeviceSysEx(%p, %p, %d) return %c%c%c%c\n", destinations[wDevID].synth, lpData, lpMidiHdr->dwBufferLength, (char) (err >> 24), (char) (err >> 16), (char) (err >> 8), (char) err); + return MMSYSERR_ERROR; + } + } + else + { + FIXME("MOD_MIDIPORT\n"); + } + + lpMidiHdr->dwFlags &= ~MHDR_INQUEUE; + lpMidiHdr->dwFlags |= MHDR_DONE; + if (MIDI_NotifyClient(wDevID, MOM_DONE, (DWORD)lpMidiHdr, 0L) != MMSYSERR_NOERROR) { + WARN("can't notify client !\n"); + return MMSYSERR_INVALPARAM; + } + return MMSYSERR_NOERROR; +} + /************************************************************************** * MIDIOut_Prepare [internal] */ @@ -390,8 +469,7 @@ DWORD WINAPI CoreAudio_modMessage(UINT wDevID, UINT wMsg, DWORD dwUser, DWORD dw case MODM_DATA: return MIDIOut_Data(wDevID, dwParam1); case MODM_LONGDATA: - TRACE("Unsupported message (08%x)\n", wMsg); - return MMSYSERR_NOTSUPPORTED; + return MIDIOut_LongData(wDevID, (LPMIDIHDR)dwParam1, dwParam2); case MODM_PREPARE: return MIDIOut_Prepare(wDevID, (LPMIDIHDR)dwParam1, dwParam2); case MODM_UNPREPARE:

1 0