November 2019 - Wine-devel - list.winehq.org

[PATCH 2/5] sapi: Implement ISpVoice stub.
by Jactry Zeng 18 Nov '19

18 Nov '19

Superseded patch 173709. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/sapi/tests/tts.c | 24 ++- dlls/sapi/tts.c | 329 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 352 insertions(+), 1 deletion(-) diff --git a/dlls/sapi/tests/tts.c b/dlls/sapi/tests/tts.c index 3b71e933a2..e4b4e79943 100644 --- a/dlls/sapi/tests/tts.c +++ b/dlls/sapi/tests/tts.c @@ -36,7 +36,8 @@ static void _expect_ref(IUnknown *obj, ULONG ref, int line) static void test_interfaces(void) { - ISpeechVoice *speech_voice; + ISpeechVoice *speech_voice, *speech_voice2; + ISpVoice *spvoice, *spvoice2; IDispatch *dispatch; IUnknown *unk; HRESULT hr; @@ -60,6 +61,27 @@ static void test_interfaces(void) EXPECT_REF(speech_voice, 1); IUnknown_Release(unk); + hr = CoCreateInstance(&CLSID_SpVoice, NULL, CLSCTX_INPROC_SERVER, + &IID_ISpVoice, (void **)&spvoice); + ok(hr == S_OK, "Failed to create ISpVoice interface: %#x.\n", hr); + EXPECT_REF(spvoice, 1); + EXPECT_REF(speech_voice, 1); + + hr = ISpVoice_QueryInterface(spvoice, &IID_ISpeechVoice, (void **)&speech_voice2); + ok(hr == S_OK, "ISpVoice_QueryInterface failed: %#x.\n", hr); + EXPECT_REF(speech_voice2, 2); + EXPECT_REF(spvoice, 2); + EXPECT_REF(speech_voice, 1); + ISpeechVoice_Release(speech_voice2); + + hr = ISpeechVoice_QueryInterface(speech_voice, &IID_ISpVoice, (void **)&spvoice2); + ok(hr == S_OK, "ISpeechVoice_QueryInterface failed: %#x.\n", hr); + EXPECT_REF(speech_voice, 2); + EXPECT_REF(spvoice2, 2); + EXPECT_REF(spvoice, 1); + ISpVoice_Release(spvoice2); + ISpVoice_Release(spvoice); + ISpeechVoice_Release(speech_voice); } diff --git a/dlls/sapi/tts.c b/dlls/sapi/tts.c index 4000db11f5..8f1ecd1894 100644 --- a/dlls/sapi/tts.c +++ b/dlls/sapi/tts.c @@ -37,6 +37,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(sapi); struct speech_voice { ISpeechVoice ISpeechVoice_iface; + ISpVoice ISpVoice_iface; LONG ref; }; @@ -45,6 +46,11 @@ static inline struct speech_voice *impl_from_ISpeechVoice(ISpeechVoice *iface) return CONTAINING_RECORD(iface, struct speech_voice, ISpeechVoice_iface); } +static inline struct speech_voice *impl_from_ISpVoice(ISpVoice *iface) +{ + return CONTAINING_RECORD(iface, struct speech_voice, ISpVoice_iface); +} + /* ISpeechVoice interface */ static HRESULT WINAPI speech_voice_QueryInterface(ISpeechVoice *iface, REFIID iid, void **obj) { @@ -56,6 +62,8 @@ static HRESULT WINAPI speech_voice_QueryInterface(ISpeechVoice *iface, REFIID ii IsEqualIID(iid, &IID_IDispatch) || IsEqualIID(iid, &IID_ISpeechVoice)) *obj = &This->ISpeechVoice_iface; + else if (IsEqualIID(iid, &IID_ISpVoice)) + *obj = &This->ISpVoice_iface; else { *obj = NULL; @@ -398,6 +406,326 @@ static const ISpeechVoiceVtbl speech_voice_vtbl = speech_voice_DisplayUI, }; +/* ISpVoice interface */ +static HRESULT WINAPI spvoice_QueryInterface(ISpVoice *iface, REFIID iid, void **obj) +{ + struct speech_voice *This = impl_from_ISpVoice(iface); + + TRACE("(%p, %s %p).\n", iface, debugstr_guid(iid), obj); + + return ISpeechVoice_QueryInterface(&This->ISpeechVoice_iface, iid, obj); +} + +static ULONG WINAPI spvoice_AddRef(ISpVoice *iface) +{ + struct speech_voice *This = impl_from_ISpVoice(iface); + + TRACE("(%p).\n", iface); + + return ISpeechVoice_AddRef(&This->ISpeechVoice_iface); +} + +static ULONG WINAPI spvoice_Release(ISpVoice *iface) +{ + struct speech_voice *This = impl_from_ISpVoice(iface); + + TRACE("(%p).\n", iface); + + return ISpeechVoice_Release(&This->ISpeechVoice_iface); +} + +static HRESULT WINAPI spvoice_SetNotifySink(ISpVoice *iface, ISpNotifySink *sink) +{ + FIXME("(%p, %p): stub.\n", iface, sink); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spvoice_SetNotifyWindowMessage(ISpVoice *iface, HWND hwnd, UINT msg, + WPARAM wparam, LPARAM lparam) +{ + FIXME("(%p, %p, %u, %lx, %lx): stub.\n", iface, hwnd, msg, wparam, lparam); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spvoice_SetNotifyCallbackFunction(ISpVoice *iface, SPNOTIFYCALLBACK *callback, + WPARAM wparam, LPARAM lparam) +{ + FIXME("(%p, %p, %lx, %lx): stub.\n", iface, callback, wparam, lparam); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spvoice_SetNotifyCallbackInterface(ISpVoice *iface, ISpNotifyCallback *callback, + WPARAM wparam, LPARAM lparam) +{ + FIXME("(%p, %p, %lx, %lx): stub.\n", iface, callback, wparam, lparam); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spvoice_SetNotifyWin32Event(ISpVoice *iface) +{ + FIXME("(%p): stub.\n", iface); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spvoice_WaitForNotifyEvent(ISpVoice *iface, DWORD milliseconds) +{ + FIXME("(%p, %d): stub.\n", iface, milliseconds); + + return E_NOTIMPL; +} + +static HANDLE WINAPI spvoice_GetNotifyEventHandle(ISpVoice *iface) +{ + FIXME("(%p): stub.\n", iface); + + return NULL; +} + +static HRESULT WINAPI spvoice_SetInterest(ISpVoice *iface, ULONGLONG event, ULONGLONG queued) +{ + FIXME("(%p, %s, %s): stub.\n", iface, wine_dbgstr_longlong(event), wine_dbgstr_longlong(queued)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spvoice_GetEvents(ISpVoice *iface, ULONG count, SPEVENT *array, ULONG *fetched) +{ + FIXME("(%p, %u, %p, %p): stub.\n", iface, count, array, fetched); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spvoice_GetInfo(ISpVoice *iface, SPEVENTSOURCEINFO *info) +{ + FIXME("(%p, %p): stub.\n", iface, info); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spvoice_SetOutput(ISpVoice *iface, IUnknown *unk, BOOL changes) +{ + FIXME("(%p, %p, %d: stub.\n)", iface, unk, changes); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spvoice_GetOutputObjectToken(ISpVoice *iface, ISpObjectToken **token) +{ + FIXME("(%p, %p): stub.\n", iface, token); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spvoice_GetOutputStream(ISpVoice *iface, ISpStreamFormat **stream) +{ + FIXME("(%p, %p): stub.\n", iface, stream); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spvoice_Pause(ISpVoice *iface) +{ + FIXME("(%p): stub.\n", iface); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spvoice_Resume(ISpVoice *iface) +{ + FIXME("(%p): stub.\n", iface); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spvoice_SetVoice(ISpVoice *iface, ISpObjectToken *token) +{ + FIXME("(%p, %p): stub.\n", iface, token); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spvoice_GetVoice(ISpVoice *iface, ISpObjectToken **token) +{ + FIXME("(%p, %p): stub.\n", iface, token); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spvoice_Speak(ISpVoice *iface, const WCHAR *contents, DWORD flags, ULONG *number) +{ + FIXME("(%p, %p, %#x, %p): stub.\n", iface, contents, flags, number); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spvoice_SpeakStream(ISpVoice *iface, IStream *stream, DWORD flags, ULONG *number) +{ + FIXME("(%p, %p, %#x, %p): stub.\n", iface, stream, flags, number); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spvoice_GetStatus(ISpVoice *iface, SPVOICESTATUS *status, WCHAR **bookmark) +{ + FIXME("(%p, %p, %p): stub.\n", iface, status, bookmark); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spvoice_Skip(ISpVoice *iface, const WCHAR *type, LONG items, ULONG *skipped) +{ + FIXME("(%p, %s, %d, %p): stub.\n", iface, debugstr_w(type), items, skipped); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spvoice_SetPriority(ISpVoice *iface, SPVPRIORITY priority) +{ + FIXME("(%p, %d): stub.\n", iface, priority); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spvoice_GetPriority(ISpVoice *iface, SPVPRIORITY *priority) +{ + FIXME("(%p, %p): stub.\n", iface, priority); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spvoice_SetAlertBoundary(ISpVoice *iface, SPEVENTENUM boundary) +{ + FIXME("(%p, %d): stub.\n", iface, boundary); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spvoice_GetAlertBoundary(ISpVoice *iface, SPEVENTENUM *boundary) +{ + FIXME("(%p, %p): stub.\n", iface, boundary); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spvoice_SetRate(ISpVoice *iface, LONG adjust) +{ + FIXME("(%p, %d): stub.\n", iface, adjust); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spvoice_GetRate(ISpVoice *iface, LONG *adjust) +{ + FIXME("(%p, %p): stub.\n", iface, adjust); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spvoice_SetVolume(ISpVoice *iface, USHORT volume) +{ + FIXME("(%p, %d): stub.\n", iface, volume); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spvoice_GetVolume(ISpVoice *iface, USHORT *volume) +{ + FIXME("(%p, %p): stub.\n", iface, volume); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spvoice_WaitUntilDone(ISpVoice *iface, ULONG timeout) +{ + FIXME("(%p, %d): stub.\n", iface, timeout); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spvoice_SetSyncSpeakTimeout(ISpVoice *iface, ULONG timeout) +{ + FIXME("(%p, %d): stub.\n", iface, timeout); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spvoice_GetSyncSpeakTimeout(ISpVoice *iface, ULONG *timeout) +{ + FIXME("(%p, %p): stub.\n", iface, timeout); + + return E_NOTIMPL; +} + +static HANDLE WINAPI spvoice_SpeakCompleteEvent(ISpVoice *iface) +{ + FIXME("(%p): stub.\n", iface); + + return NULL; +} + +static HRESULT WINAPI spvoice_IsUISupported(ISpVoice *iface, const WCHAR *type, void *extra, + ULONG count, BOOL *supported) +{ + FIXME("(%p, %p, %p, %d, %p): stub.\n", iface, type, extra, count, supported); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spvoice_DisplayUI(ISpVoice *iface, HWND parent, const WCHAR *title, + const WCHAR *type, void *extra, ULONG count) +{ + FIXME("(%p, %p, %p, %p, %p, %d): stub.\n", iface, parent, title, type, extra, count); + + return E_NOTIMPL; +} + +static const ISpVoiceVtbl spvoice_vtbl = +{ + spvoice_QueryInterface, + spvoice_AddRef, + spvoice_Release, + spvoice_SetNotifySink, + spvoice_SetNotifyWindowMessage, + spvoice_SetNotifyCallbackFunction, + spvoice_SetNotifyCallbackInterface, + spvoice_SetNotifyWin32Event, + spvoice_WaitForNotifyEvent, + spvoice_GetNotifyEventHandle, + spvoice_SetInterest, + spvoice_GetEvents, + spvoice_GetInfo, + spvoice_SetOutput, + spvoice_GetOutputObjectToken, + spvoice_GetOutputStream, + spvoice_Pause, + spvoice_Resume, + spvoice_SetVoice, + spvoice_GetVoice, + spvoice_Speak, + spvoice_SpeakStream, + spvoice_GetStatus, + spvoice_Skip, + spvoice_SetPriority, + spvoice_GetPriority, + spvoice_SetAlertBoundary, + spvoice_GetAlertBoundary, + spvoice_SetRate, + spvoice_GetRate, + spvoice_SetVolume, + spvoice_GetVolume, + spvoice_WaitUntilDone, + spvoice_SetSyncSpeakTimeout, + spvoice_GetSyncSpeakTimeout, + spvoice_SpeakCompleteEvent, + spvoice_IsUISupported, + spvoice_DisplayUI +}; + HRESULT speech_voice_create(IUnknown *outer, REFIID iid, void **obj) { struct speech_voice *This = heap_alloc(sizeof(*This)); @@ -405,6 +733,7 @@ HRESULT speech_voice_create(IUnknown *outer, REFIID iid, void **obj) if (!This) return E_OUTOFMEMORY; This->ISpeechVoice_iface.lpVtbl = &speech_voice_vtbl; + This->ISpVoice_iface.lpVtbl = &spvoice_vtbl; This->ref = 1; hr = ISpeechVoice_QueryInterface(&This->ISpeechVoice_iface, iid, obj); -- 2.24.0

2 1

[PATCH] kernel32: implement Windows NT style GMEM_MOVEABLE/LMEM_MOVEABLE memory
by Damjan Jovanovic 18 Nov '19

18 Nov '19

Tests were performed on many Windows versions. Wine's unit tests cannot be used on Win9x any more; mingw's binaries require symbols only found in newer versions of MSVCRT.DLL. A GCC 2.95-based mingw had to be used, with a custom test (available on request). On Win9x, GlobalLock()/LocalLock() return pointers aligned to 4 byte boundaries (never 8), as they call HeapAlloc() which returns pointers aligned to 8 bytes, but then use the first 4 bytes to store the address of the HGLOBAL/HLOCAL. On WinNT, GlobalLock()/LocalLock() return pointers aligned to 8 byte boundaries. It is not known how GlobalHandle()/LocalHandle() converts the pointer back to the HGLOBAL/HLOCAL, but its address certainly isn't stored 4 bytes before the pointer. Wine initially followed the Win9x layout, but then as of Git commit cd0219e941505ac7026c5412ea68b54722ab234a started using 8 bytes before the pointer returned from *Lock() to maintain alignment on an 8 byte boundary, which some applications (certainly developed and tested only on Windows NT derivatives) wanted, and got memory corruption without. This however isn't enough. wxWidgets expects to be able to pass the pointer returned from GlobalLock() to HeapSize(), and applications crash if that fails. Not only must we maintain 8 byte alignment when emulating Windows NT, but the pointer returned from GlobalLock() must point to the start of a valid heap block. In this patch we support all Windows versions correctly: * When emulating Win9x, use only 4 bytes behind the pointer to store the address of the HGLOBAL/HLOCAL, instead of the current 8. * When emulating WinNT, allocate only the memory we need, storing the mapping from the pointer to its HGLOBAL/HLOCAL in a hash table, and implement GlobalHandle()/LocalHandle() by searching the hash table. Apart from improving correctness, this design also decreases memory usage by 4 bytes per allocation when emulating WinNT. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=38924 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/kernel32/heap.c | 89 ++++++++-------- dlls/kernel32/tests/heap.c | 10 ++ dlls/kernelbase/kernelbase.spec | 1 + dlls/kernelbase/memory.c | 175 +++++++++++++++++++++++++++----- include/winbase.h | 16 +++ 5 files changed, 219 insertions(+), 72 deletions(-)

3 2

[PATCH] dmstyle: Add GUID_IDirectMusicStyle support in Style Track GetParam.
by Alistair Leslie-Hughes 18 Nov '19

18 Nov '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dmstyle/styletrack.c | 24 ++++++++++++++++++++---- dlls/dmstyle/tests/dmstyle.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 4 deletions(-) diff --git a/dlls/dmstyle/styletrack.c b/dlls/dmstyle/styletrack.c index cc15bd81d1..06fe1c7ca8 100644 --- a/dlls/dmstyle/styletrack.c +++ b/dlls/dmstyle/styletrack.c @@ -132,15 +132,31 @@ static HRESULT WINAPI style_track_Play(IDirectMusicTrack8 *iface, void *pStateDa return S_OK; } -static HRESULT WINAPI style_track_GetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, - MUSIC_TIME mtTime, MUSIC_TIME *pmtNext, void *pParam) +static HRESULT WINAPI style_track_GetParam(IDirectMusicTrack8 *iface, REFGUID type, + MUSIC_TIME time, MUSIC_TIME *next, void *param) { IDirectMusicStyleTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, %d, %p, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pmtNext, pParam); + struct list *item = NULL; - if (!rguidType) + FIXME("(%p, %s, %d, %p, %p): stub\n", This, debugstr_dmguid(type), time, next, param); + + if (!type) return E_POINTER; + if (IsEqualGUID(&GUID_IDirectMusicStyle, type)) { + LIST_FOR_EACH (item, &This->Items) { + DMUS_PRIVATE_STYLE_ITEM *style = LIST_ENTRY(item, DMUS_PRIVATE_STYLE_ITEM, entry); + if (style->pObject) { + IDirectMusicStyle8_AddRef(style->pObject); + *((IDirectMusicStyle8**)param) = style->pObject; + + return S_OK; + } + } + + return DMUS_E_NOT_FOUND; + } + return S_OK; } diff --git a/dlls/dmstyle/tests/dmstyle.c b/dlls/dmstyle/tests/dmstyle.c index 6b2275866c..9cb42ec077 100644 --- a/dlls/dmstyle/tests/dmstyle.c +++ b/dlls/dmstyle/tests/dmstyle.c @@ -318,6 +318,12 @@ static void test_track(void) ok(hr == E_NOTIMPL, "IDirectMusicTrack8_Join failed: %08x\n", hr); } + hr = IDirectMusicTrack8_IsParamSupported(dmt8, &GUID_IDirectMusicStyle); + if (class[i].clsid == &CLSID_DirectMusicStyleTrack) + ok(hr == S_OK, "got: %08x\n", hr); + else + ok(hr == DMUS_E_TYPE_UNSUPPORTED, "got: %08x\n", hr); + /* IPersistStream */ hr = IDirectMusicTrack8_QueryInterface(dmt8, &IID_IPersistStream, (void**)&ps); ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); @@ -341,6 +347,30 @@ static void test_track(void) } } +static void test_track_DirectMusicStyleTrack(void) +{ + IDirectMusicTrack8 *dmt8; + HRESULT hr; + GUID params[] = { GUID_DisableTimeSig, GUID_EnableTimeSig, GUID_IDirectMusicStyle, GUID_SeedVariations, + GUID_TimeSignature}; + IDirectMusicStyle *style = NULL; + int i; + + hr = CoCreateInstance(&CLSID_DirectMusicStyleTrack, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicTrack8, + (void**)&dmt8); + ok(hr == S_OK, "Failed: %08x\n", hr); + + for (i=0; i < ARRAY_SIZE(params); i++) { + hr = IDirectMusicTrack8_IsParamSupported(dmt8, &params[i]); + ok(hr == S_OK, "Failed: %08x\n", hr); + } + + hr = IDirectMusicTrack8_GetParam(dmt8, &GUID_IDirectMusicStyle, 0, NULL, &style); + ok(hr == DMUS_E_NOT_FOUND, "Failed: %08x\n", hr); + + IDirectMusicTrack8_Release(dmt8); +} + struct chunk { FOURCC id; DWORD size; @@ -556,6 +586,7 @@ START_TEST(dmstyle) test_COM_track(); test_dmstyle(); test_track(); + test_track_DirectMusicStyleTrack(); test_parsedescriptor(); CoUninitialize(); -- 2.17.1

2 1

[PATCH] dmband/tests: Check all IDirectMusicTrack_IsParamSupported() types
by Michael Stefaniuc 17 Nov '19

17 Nov '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmband/tests/dmband.c | 50 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/dlls/dmband/tests/dmband.c b/dlls/dmband/tests/dmband.c index 29d0668219..459d00ed1d 100644 --- a/dlls/dmband/tests/dmband.c +++ b/dlls/dmband/tests/dmband.c @@ -181,6 +181,44 @@ static void test_bandtrack(void) CLSID class; ULARGE_INTEGER size; HRESULT hr; +#define X(guid) &guid, #guid + const struct { + REFGUID type; + const char *name; + BOOL supported; + } param_types[] = { + { X(GUID_BandParam), TRUE }, + { X(GUID_ChordParam), FALSE }, + { X(GUID_Clear_All_Bands), TRUE }, + { X(GUID_CommandParam), FALSE }, + { X(GUID_CommandParam2), FALSE }, + { X(GUID_CommandParamNext), FALSE }, + { X(GUID_ConnectToDLSCollection), TRUE }, + { X(GUID_Disable_Auto_Download), TRUE }, + { X(GUID_DisableTempo), FALSE }, + { X(GUID_DisableTimeSig), FALSE }, + { X(GUID_Download), TRUE }, + { X(GUID_DownloadToAudioPath), TRUE }, + { X(GUID_Enable_Auto_Download), TRUE }, + { X(GUID_EnableTempo), FALSE }, + { X(GUID_EnableTimeSig), FALSE }, + { X(GUID_IDirectMusicBand), TRUE }, + { X(GUID_IDirectMusicChordMap), FALSE }, + { X(GUID_IDirectMusicStyle), FALSE }, + { X(GUID_MuteParam), FALSE }, + { X(GUID_Play_Marker), FALSE }, + { X(GUID_RhythmParam), FALSE }, + { X(GUID_SeedVariations), FALSE }, + { X(GUID_StandardMIDIFile), TRUE }, + { X(GUID_TempoParam), FALSE }, + { X(GUID_TimeSignature), FALSE }, + { X(GUID_Unload), TRUE }, + { X(GUID_UnloadFromAudioPath), TRUE }, + { X(GUID_Valid_Start_Time), FALSE }, + { X(GUID_Variations), FALSE }, + }; +#undef X + unsigned int i; hr = CoCreateInstance(&CLSID_DirectMusicBandTrack, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicTrack8, (void**)&dmt8); @@ -203,8 +241,20 @@ static void test_bandtrack(void) hr = IDirectMusicTrack8_SetParam(dmt8, NULL, 0, NULL); ok(hr == E_POINTER, "IDirectMusicTrack8_SetParam failed: %08x\n", hr); } + hr = IDirectMusicTrack8_IsParamSupported(dmt8, NULL); ok(hr == E_POINTER, "IDirectMusicTrack8_IsParamSupported failed: %08x\n", hr); + for (i = 0; i < ARRAY_SIZE(param_types); i++) { + hr = IDirectMusicTrack8_IsParamSupported(dmt8, param_types[i].type); + if (param_types[i].supported) + ok(hr == S_OK, "IsParamSupported(%s) failed: %08x, expected S_OK\n", + param_types[i].name, hr); + else + ok(hr == DMUS_E_TYPE_UNSUPPORTED, + "IsParamSupported(%s) failed: %08x, expected DMUS_E_TYPE_UNSUPPORTED\n", + param_types[i].name, hr); + } + hr = IDirectMusicTrack8_AddNotificationType(dmt8, NULL); ok(hr == E_NOTIMPL, "IDirectMusicTrack8_AddNotificationType failed: %08x\n", hr); hr = IDirectMusicTrack8_RemoveNotificationType(dmt8, NULL); -- 2.20.1

1 0

[PATCH 3/3] dmime/tests: Check all IDirectMusicTrack_IsParamSupported() types
by Michael Stefaniuc 17 Nov '19

17 Nov '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmime/tests/dmime.c | 82 ++++++++++++++++++++++++++++++---------- 1 file changed, 62 insertions(+), 20 deletions(-) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 944a278dbb..3fb0e8afd8 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -532,24 +532,62 @@ static void test_track(void) CLSID classid; ULARGE_INTEGER size; HRESULT hr; +#define X(guid) &guid, #guid + const struct { + REFGUID type; + const char *name; + } param_types[] = { + { X(GUID_BandParam) }, + { X(GUID_ChordParam) }, + { X(GUID_Clear_All_Bands) }, + { X(GUID_CommandParam) }, + { X(GUID_CommandParam2) }, + { X(GUID_CommandParamNext) }, + { X(GUID_ConnectToDLSCollection) }, + { X(GUID_Disable_Auto_Download) }, + { X(GUID_DisableTempo) }, + { X(GUID_DisableTimeSig) }, + { X(GUID_Download) }, + { X(GUID_DownloadToAudioPath) }, + { X(GUID_Enable_Auto_Download) }, + { X(GUID_EnableTempo) }, + { X(GUID_EnableTimeSig) }, + { X(GUID_IDirectMusicBand) }, + { X(GUID_IDirectMusicChordMap) }, + { X(GUID_IDirectMusicStyle) }, + { X(GUID_MuteParam) }, + { X(GUID_Play_Marker) }, + { X(GUID_RhythmParam) }, + { X(GUID_SeedVariations) }, + { X(GUID_StandardMIDIFile) }, + { X(GUID_TempoParam) }, + { X(GUID_TimeSignature) }, + { X(GUID_Unload) }, + { X(GUID_UnloadFromAudioPath) }, + { X(GUID_Valid_Start_Time) }, + { X(GUID_Variations) }, + { X(GUID_NULL) } + }; +#undef X #define X(class) &CLSID_ ## class, #class const struct { REFCLSID clsid; const char *name; - BOOL has_param; + /* bitfield with supported param types */ + unsigned int has_params; } class[] = { - { X(DirectMusicLyricsTrack), TRUE }, - { X(DirectMusicMarkerTrack), TRUE }, - { X(DirectMusicParamControlTrack), TRUE }, - { X(DirectMusicSegmentTriggerTrack), TRUE }, - { X(DirectMusicSeqTrack), FALSE }, - { X(DirectMusicSysExTrack), FALSE }, - { X(DirectMusicTempoTrack), TRUE }, - { X(DirectMusicTimeSigTrack), TRUE }, - { X(DirectMusicWaveTrack), TRUE } + { X(DirectMusicLyricsTrack), 0 }, + { X(DirectMusicMarkerTrack), 0x8080000 }, + { X(DirectMusicParamControlTrack), 0 }, + { X(DirectMusicSegmentTriggerTrack), 0x3fffffff }, + { X(DirectMusicSeqTrack), ~0 }, /* param methods not implemented */ + { X(DirectMusicSysExTrack), ~0 }, /* param methods not implemented */ + { X(DirectMusicTempoTrack), 0x802100 }, + { X(DirectMusicTimeSigTrack), 0x1004200 }, + { X(DirectMusicWaveTrack), 0x6001c80 } }; #undef X - unsigned int i; + unsigned int i, j; for (i = 0; i < ARRAY_SIZE(class); i++) { trace("Testing %s\n", class[i].name); @@ -558,7 +596,18 @@ static void test_track(void) ok(hr == S_OK, "%s create failed: %08x, expected S_OK\n", class[i].name, hr); /* IDirectMusicTrack */ - if (!class[i].has_param) { + if (class[i].has_params != ~0) { + for (j = 0; j < ARRAY_SIZE(param_types); j++) { + hr = IDirectMusicTrack8_IsParamSupported(dmt, param_types[j].type); + if (class[i].has_params & (1 << j)) + ok(hr == S_OK, "IsParamSupported(%s) failed: %08x, expected S_OK\n", + param_types[j].name, hr); + else + ok(hr == DMUS_E_TYPE_UNSUPPORTED, + "IsParamSupported(%s) failed: %08x, expected DMUS_E_TYPE_UNSUPPORTED\n", + param_types[j].name, hr); + } + } else { hr = IDirectMusicTrack_GetParam(dmt, NULL, 0, NULL, NULL); ok(hr == E_NOTIMPL, "IDirectMusicTrack_GetParam failed: %08x\n", hr); hr = IDirectMusicTrack_SetParam(dmt, NULL, 0, NULL); @@ -569,13 +618,6 @@ static void test_track(void) hr = IDirectMusicTrack_IsParamSupported(dmt, &GUID_IDirectMusicStyle); ok(hr == E_NOTIMPL, "got: %08x\n", hr); } - else { - hr = IDirectMusicTrack_IsParamSupported(dmt, &GUID_IDirectMusicStyle); - if (class[i].clsid == &CLSID_DirectMusicSegmentTriggerTrack) - ok(hr == S_OK, "got: %08x\n", hr); - else - ok(hr == DMUS_E_TYPE_UNSUPPORTED, "got: %08x\n", hr); - } if (class[i].clsid != &CLSID_DirectMusicMarkerTrack && class[i].clsid != &CLSID_DirectMusicTimeSigTrack) { hr = IDirectMusicTrack_AddNotificationType(dmt, NULL); @@ -591,7 +633,7 @@ static void test_track(void) if (hr == S_OK) { hr = IDirectMusicTrack8_PlayEx(dmt8, NULL, 0, 0, 0, 0, NULL, NULL, 0); todo_wine ok(hr == E_POINTER, "IDirectMusicTrack8_PlayEx failed: %08x\n", hr); - if (!class[i].has_param) { + if (class[i].has_params == ~0) { hr = IDirectMusicTrack8_GetParamEx(dmt8, NULL, 0, NULL, NULL, NULL, 0); ok(hr == E_NOTIMPL, "IDirectMusicTrack8_GetParamEx failed: %08x\n", hr); hr = IDirectMusicTrack8_SetParamEx(dmt8, NULL, 0, NULL, NULL, 0); -- 2.20.1

1 0

[PATCH 2/3] dmime: The Wave track supports two additional param types
by Michael Stefaniuc 17 Nov '19

17 Nov '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmime/wavetrack.c | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/dlls/dmime/wavetrack.c b/dlls/dmime/wavetrack.c index a679ed60ab..5869c9e72d 100644 --- a/dlls/dmime/wavetrack.c +++ b/dlls/dmime/wavetrack.c @@ -136,20 +136,27 @@ static HRESULT WINAPI wave_track_SetParam(IDirectMusicTrack8 *iface, REFGUID rgu return S_OK; } -static HRESULT WINAPI wave_track_IsParamSupported(IDirectMusicTrack8 *iface, REFGUID rguidType) +static HRESULT WINAPI wave_track_IsParamSupported(IDirectMusicTrack8 *iface, REFGUID type) { - IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface); - - TRACE("(%p, %s)\n", This, debugstr_dmguid(rguidType)); - if (IsEqualGUID (rguidType, &GUID_Disable_Auto_Download) - || IsEqualGUID (rguidType, &GUID_Download) - || IsEqualGUID (rguidType, &GUID_DownloadToAudioPath) - || IsEqualGUID (rguidType, &GUID_Enable_Auto_Download)) { - TRACE("param supported\n"); - return S_OK; - } - TRACE("param unsupported\n"); - return DMUS_E_TYPE_UNSUPPORTED; + IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface); + static const REFGUID valid[] = { + &GUID_Disable_Auto_Download, + &GUID_Download, + &GUID_DownloadToAudioPath, + &GUID_Enable_Auto_Download, + &GUID_Unload, + &GUID_UnloadFromAudioPath + }; + unsigned int i; + + TRACE("(%p, %s)\n", This, debugstr_dmguid(type)); + + for (i = 0; i < ARRAY_SIZE(valid); i++) + if (IsEqualGUID(type, valid[i])) + return S_OK; + + TRACE("param unsupported\n"); + return DMUS_E_TYPE_UNSUPPORTED; } static HRESULT WINAPI wave_track_AddNotificationType(IDirectMusicTrack8 *iface, REFGUID notiftype) -- 2.20.1

1 0

[PATCH 1/3] dmime: SegTrigger track supports all param types, even invalid ones
by Michael Stefaniuc 17 Nov '19

17 Nov '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmime/segtriggertrack.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/dmime/segtriggertrack.c b/dlls/dmime/segtriggertrack.c index 3050a5031b..7e1d75aa05 100644 --- a/dlls/dmime/segtriggertrack.c +++ b/dlls/dmime/segtriggertrack.c @@ -156,11 +156,7 @@ static HRESULT WINAPI segment_track_IsParamSupported(IDirectMusicTrack8 *iface, TRACE("(%p, %s)\n", This, debugstr_dmguid(type)); - if (IsEqualGUID(type, &GUID_IDirectMusicStyle)) - return S_OK; - - TRACE("param unsupported\n"); - return DMUS_E_TYPE_UNSUPPORTED; + return S_OK; } static HRESULT WINAPI segment_track_AddNotificationType(IDirectMusicTrack8 *iface, -- 2.20.1

1 0

[PATCH] dmstyle/tests: Check all IDirectMusicTrack8_IsParamSupported() types
by Michael Stefaniuc 17 Nov '19

17 Nov '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmstyle/tests/dmstyle.c | 66 ++++++++++++++++++++++++++++++++---- 1 file changed, 59 insertions(+), 7 deletions(-) diff --git a/dlls/dmstyle/tests/dmstyle.c b/dlls/dmstyle/tests/dmstyle.c index 6b2275866c..0c17ef3b41 100644 --- a/dlls/dmstyle/tests/dmstyle.c +++ b/dlls/dmstyle/tests/dmstyle.c @@ -244,22 +244,61 @@ static void test_track(void) CLSID classid; ULARGE_INTEGER size; HRESULT hr; +#define X(guid) &guid, #guid + const struct { + REFGUID type; + const char *name; + } param_types[] = { + { X(GUID_BandParam) }, + { X(GUID_ChordParam) }, + { X(GUID_Clear_All_Bands) }, + { X(GUID_CommandParam) }, + { X(GUID_CommandParam2) }, + { X(GUID_CommandParamNext) }, + { X(GUID_ConnectToDLSCollection) }, + { X(GUID_Disable_Auto_Download) }, + { X(GUID_DisableTempo) }, + { X(GUID_DisableTimeSig) }, + { X(GUID_Download) }, + { X(GUID_DownloadToAudioPath) }, + { X(GUID_Enable_Auto_Download) }, + { X(GUID_EnableTempo) }, + { X(GUID_EnableTimeSig) }, + { X(GUID_IDirectMusicBand) }, + { X(GUID_IDirectMusicChordMap) }, + { X(GUID_IDirectMusicStyle) }, + { X(GUID_MuteParam) }, + { X(GUID_Play_Marker) }, + { X(GUID_RhythmParam) }, + { X(GUID_SeedVariations) }, + { X(GUID_StandardMIDIFile) }, + { X(GUID_TempoParam) }, + { X(GUID_TimeSignature) }, + { X(GUID_Unload) }, + { X(GUID_UnloadFromAudioPath) }, + { X(GUID_Valid_Start_Time) }, + { X(GUID_Variations) } + }; +#undef X #define X(class) &CLSID_ ## class, #class const struct { REFCLSID clsid; const char *name; BOOL has_save; BOOL has_join; + /* bitfields with supported param types */ + unsigned int has_params; + unsigned int todo_params; } class[] = { - { X(DirectMusicAuditionTrack), TRUE, FALSE }, - { X(DirectMusicChordTrack), TRUE, TRUE }, - { X(DirectMusicCommandTrack), TRUE, TRUE }, - { X(DirectMusicMotifTrack), FALSE, FALSE }, - { X(DirectMusicMuteTrack), TRUE, FALSE }, - { X(DirectMusicStyleTrack), FALSE, TRUE }, + { X(DirectMusicAuditionTrack), TRUE, FALSE, 0x18204200, 0x18204200 }, + { X(DirectMusicChordTrack), TRUE, TRUE, 0x100002, 1 }, + { X(DirectMusicCommandTrack), TRUE, TRUE, 0x38, 0 }, + { X(DirectMusicMotifTrack), FALSE, FALSE, 0x8204200, 0 }, + { X(DirectMusicMuteTrack), TRUE, FALSE, 0x40000, 0 }, + { X(DirectMusicStyleTrack), FALSE, TRUE, 0x1224200, 0 }, }; #undef X - unsigned int i; + unsigned int i, j; for (i = 0; i < ARRAY_SIZE(class); i++) { trace("Testing %s\n", class[i].name); @@ -287,6 +326,19 @@ static void test_track(void) hr = IDirectMusicTrack8_IsParamSupported(dmt8, NULL); ok(hr == E_POINTER, "IDirectMusicTrack8_IsParamSupported failed: %08x\n", hr); + for (j = 0; j < ARRAY_SIZE(param_types); j++) { + hr = IDirectMusicTrack8_IsParamSupported(dmt8, param_types[j].type); + if (class[i].has_params & (1 << j)) + todo_wine_if(class[i].todo_params & (1 << j)) + ok(hr == S_OK, "IsParamSupported(%s) failed: %08x, expected S_OK\n", + param_types[j].name, hr); + else + todo_wine_if(class[i].todo_params & (1 << j)) + ok(hr == DMUS_E_TYPE_UNSUPPORTED, + "IsParamSupported(%s) failed: %08x, expected DMUS_E_TYPE_UNSUPPORTED\n", + param_types[j].name, hr); + } + if (class[i].clsid == &CLSID_DirectMusicMuteTrack) { hr = IDirectMusicTrack8_AddNotificationType(dmt8, NULL); ok(hr == E_NOTIMPL, "IDirectMusicTrack8_AddNotificationType failed: %08x\n", hr); -- 2.20.1

1 0

[PATCH v4] wintab32: Use 64-bit math in ScaleForContext.
by John Chadwick 17 Nov '19

17 Nov '19

With some tablet configurations, the InExt value passed to ScaleForContext can be very large, leading to an integer overflow. Using MulDiv prevents this problem by internally using 64-bit math. Signed-off-by: John Chadwick <john(a)jchw.io> --- dlls/wintab32/context.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wintab32/context.c b/dlls/wintab32/context.c index 0514dd78b4..ff9a4ca677 100644 --- a/dlls/wintab32/context.c +++ b/dlls/wintab32/context.c @@ -178,9 +178,9 @@ int TABLET_PostTabletMessage(LPOPENCONTEXT newcontext, UINT msg, WPARAM wParam, static inline DWORD ScaleForContext(DWORD In, LONG InOrg, LONG InExt, LONG OutOrg, LONG OutExt) { if (((InExt > 0 )&&(OutExt > 0)) || ((InExt<0) && (OutExt < 0))) - return ((In - InOrg) * abs(OutExt) / abs(InExt)) + OutOrg; + return MulDiv(In - InOrg, abs(OutExt), abs(InExt)) + OutOrg; else - return ((abs(InExt) - (In - InOrg))*abs(OutExt) / abs(InExt)) + OutOrg; + return MulDiv(abs(InExt) - (In - InOrg), abs(OutExt), abs(InExt)) + OutOrg; } LPOPENCONTEXT AddPacketToContextQueue(LPWTPACKET packet, HWND hwnd) -- 2.23.0

1 0

[PATCH v2] dmime: Rewrite IDirectMusicSegment8 GetParam
by Alistair Leslie-Hughes 17 Nov '19

17 Nov '19

Removed IPersistStream CLSID checks as this was just wrong. Added support for Any Group (group = 0xFFFFFFFF) Rename Parameters and variables. Remove initial values of variables as they aren't required. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dmime/segment.c | 76 +++++++++++++++++++------------------------- 1 file changed, 33 insertions(+), 43 deletions(-) diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index d47c2f2c23..0c64989a00 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -366,58 +366,48 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_RemoveNotificationType(IDirectMus } static HRESULT WINAPI IDirectMusicSegment8Impl_GetParam(IDirectMusicSegment8 *iface, - REFGUID rguidType, DWORD dwGroupBits, DWORD dwIndex, MUSIC_TIME mtTime, MUSIC_TIME *pmtNext, - void *pParam) + REFGUID type, DWORD group, DWORD index, MUSIC_TIME time, MUSIC_TIME *next, + void *param) { - IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); - CLSID pIt_clsid; - struct list* pEntry = NULL; - IDirectMusicTrack* pTrack = NULL; - IPersistStream* pCLSIDStream = NULL; - LPDMUS_PRIVATE_SEGMENT_TRACK pIt = NULL; - HRESULT hr = S_OK; + IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); + struct list *item; + IDirectMusicTrack *track; + DMUS_PRIVATE_SEGMENT_TRACK *segment; + HRESULT hr; - FIXME("(%p, %s, 0x%x, %d, %d, %p, %p)\n", This, debugstr_dmguid(rguidType), dwGroupBits, dwIndex, mtTime, pmtNext, pParam); - - if (DMUS_SEG_ANYTRACK == dwIndex) { - - LIST_FOR_EACH (pEntry, &This->Tracks) { - pIt = LIST_ENTRY(pEntry, DMUS_PRIVATE_SEGMENT_TRACK, entry); + FIXME("(%p, %s, 0x%x, %d, %d, %p, %p) Semi-stub\n", This, debugstr_dmguid(type), group, + index, time, next, param); - hr = IDirectMusicTrack_QueryInterface(pIt->pTrack, &IID_IPersistStream, (void**) &pCLSIDStream); - if (FAILED(hr)) { - ERR("(%p): object %p don't implement IPersistStream Interface. Expect a crash (critical problem)\n", This, pIt->pTrack); - continue ; - } + if (index == DMUS_SEG_ANYTRACK || group == 0xFFFFFFFF) { + if (group == 0xFFFFFFFF && index != DMUS_SEG_ANYTRACK) + WARN("Any group doesnt have DMUS_SEG_ANYTRACK index.\n"); - TRACE(" - %p -> 0x%x,%p\n", pIt, pIt->dwGroupBits, pIt->pTrack); + LIST_FOR_EACH (item, &This->Tracks) { + segment = LIST_ENTRY(item, DMUS_PRIVATE_SEGMENT_TRACK, entry); - if (0xFFFFFFFF != dwGroupBits && 0 == (pIt->dwGroupBits & dwGroupBits)) continue ; - hr = IPersistStream_GetClassID(pCLSIDStream, &pIt_clsid); - IPersistStream_Release(pCLSIDStream); pCLSIDStream = NULL; - if (FAILED(hr)) { - ERR("(%p): non-implemented GetClassID for object %p\n", This, pIt->pTrack); - continue ; - } - if (FALSE == IsEqualGUID(&pIt_clsid, rguidType)) continue ; - if (FAILED(IDirectMusicTrack_IsParamSupported(pIt->pTrack, rguidType))) continue ; - hr = IDirectMusicTrack_GetParam(pIt->pTrack, rguidType, mtTime, pmtNext, pParam); - if (SUCCEEDED(hr)) return hr; + TRACE(" - %p -> 0x%x,%p\n", segment, segment->dwGroupBits, segment->pTrack); + + if (0xFFFFFFFF != group && 0 == (segment->dwGroupBits & group)) continue; + + if (FAILED(IDirectMusicTrack_IsParamSupported(segment->pTrack, type))) continue; + hr = IDirectMusicTrack_GetParam(segment->pTrack, type, time, next, param); + if (SUCCEEDED(hr)) return hr; + } + + WARN("(%p): not found\n", This); + return DMUS_E_TRACK_NOT_FOUND; } - ERR("(%p): not found\n", This); - return DMUS_E_TRACK_NOT_FOUND; - } - hr = IDirectMusicSegment8Impl_GetTrack(iface, &GUID_NULL, dwGroupBits, dwIndex, &pTrack); - if (FAILED(hr)) { - ERR("(%p): not found\n", This); - return DMUS_E_TRACK_NOT_FOUND; - } + hr = IDirectMusicSegment8Impl_GetTrack(iface, &GUID_NULL, group, index, &track); + if (FAILED(hr)) { + ERR("(%p): not found\n", This); + return DMUS_E_TRACK_NOT_FOUND; + } - hr = IDirectMusicTrack_GetParam(pTrack, rguidType, mtTime, pmtNext, pParam); - IDirectMusicTrack_Release(pTrack); pTrack = NULL; + hr = IDirectMusicTrack_GetParam(track, type, time, next, param); + IDirectMusicTrack_Release(track); track = NULL; - return hr; + return hr; } static HRESULT WINAPI IDirectMusicSegment8Impl_SetParam(IDirectMusicSegment8 *iface, -- 2.17.1

1 0