December 2019 - Wine-Commits

João Diogo Ferreira : kernel32: Properly handle GEO_NATION and GEO_ID in GetGeoInfoW().
by Alexandre Julliard Dec. 4, 2019

Dec. 4, 2019

Module: wine Branch: master Commit: c93aa1095e1e70d9466e7c7063bd89181acb2f2a URL: https://source.winehq.org/git/wine.git/?a=commit;h=c93aa1095e1e70d9466e7c70… Author: João Diogo Ferreira <devilj(a)outlook.pt> Date: Mon Dec 2 21:39:44 2019 +0000 kernel32: Properly handle GEO_NATION and GEO_ID in GetGeoInfoW(). Signed-off-by: João Diogo Craveiro Ferreira <devilj(a)outlook.pt> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 31 +++++++++++++++++++++++++++++++ dlls/kernel32/tests/locale.c | 40 ++++++++++++++++++++++++++++++++++++---- 2 files changed, 67 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 4d4b99660a..5b196be2d5 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -2908,6 +2908,34 @@ BOOL WINAPI SetUserGeoID(GEOID geoid) /****************************************************************************** * GetGeoInfoW (KERNEL32.@) + * + * Retrieves information about a geographic location by its GeoID. + * + * PARAMS + * geoid [I] The GeoID of the location of interest. + * geotype [I] The type of information to be retrieved (SYSGEOTYPE enum from "winnls.h"). + * data [O] The output buffer to store the information. + * data_len [I] The length of the buffer, measured in WCHARs and including the null terminator. + * lang [I] Language identifier. Must be 0 unless geotype is GEO_RFC1766 or GEO_LCID. + * + * RETURNS + * Success: The number of WCHARs (including null) written to the buffer -or- + * if no buffer was provided, the minimum length required to hold the full data. + * Failure: Zero. Call GetLastError() to determine the cause. + * + * NOTES + * On failure, GetLastError() will return one of the following values: + * - ERROR_INVALID_PARAMETER: the GeoID provided was invalid. + * - ERROR_INVALID_FLAGS: the specified geotype was invalid. + * - ERROR_INSUFFICIENT_BUFFER: the provided buffer was too small to hold the full data. + * - ERROR_CALL_NOT_IMPLEMENTED: (Wine implementation) we don't handle that geotype yet. + * + * The list of available GeoIDs can be retrieved with EnumSystemGeoID(), + * or call GetUserGeoID() to retrieve the user's current location. + * + * TODO + * Currently, we only handle the following geotypes: GEO_ID, GEO_ISO2, GEO_ISO3, + * GEO_ISO_UN_NUMBER, GEO_PARENT and GEO_NATION. */ INT WINAPI GetGeoInfoW(GEOID geoid, GEOTYPE geotype, LPWSTR data, int data_len, LANGID lang) { @@ -2926,6 +2954,9 @@ INT WINAPI GetGeoInfoW(GEOID geoid, GEOTYPE geotype, LPWSTR data, int data_len, switch (geotype) { case GEO_NATION: + if (ptr->kind != LOCATION_NATION) return 0; + /* fall through */ + case GEO_ID: sprintfW(buffW, fmtW, ptr->id); break; case GEO_ISO_UN_NUMBER: diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index ee38dc36ac..de1d4fca22 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -4984,11 +4984,43 @@ static void test_GetGeoInfo(void) ok(!strcmp(buffA, "RU"), "got %s\n", buffA); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %d\n", GetLastError()); - /* GEO_NATION returns GEOID in a string form */ + /* GEO_NATION returns GEOID in a string form, but only for GEOCLASS_NATION-type IDs */ + ret = pGetGeoInfoA(203, GEO_NATION, buffA, 20, 0); /* GEOCLASS_NATION */ + ok(ret == 4, "GEO_NATION of nation: expected 4, got %d\n", ret); + ok(!strcmp(buffA, "203"), "GEO_NATION of nation: expected 203, got %s\n", buffA); + buffA[0] = 0; - ret = pGetGeoInfoA(203, GEO_NATION, buffA, 20, 0); - ok(ret == 4, "got %d\n", ret); - ok(!strcmp(buffA, "203"), "got %s\n", buffA); + ret = pGetGeoInfoA(39070, GEO_NATION, buffA, 20, 0); /* GEOCLASS_REGION */ + ok(ret == 0, "GEO_NATION of region: expected 0, got %d\n", ret); + ok(*buffA == 0, "GEO_NATION of region: expected empty string, got %s\n", buffA); + + buffA[0] = 0; + ret = pGetGeoInfoA(333, GEO_NATION, buffA, 20, 0); /* LOCATION_BOTH internal Wine type */ + ok(ret == 0 || + broken(ret == 4) /* Win7 and older */, + "GEO_NATION of LOCATION_BOTH: expected 0, got %d\n", ret); + ok(*buffA == 0 || + broken(!strcmp(buffA, "333")) /* Win7 and older */, + "GEO_NATION of LOCATION_BOTH: expected empty string, got %s\n", buffA); + + /* GEO_ID is like GEO_NATION but works for any ID */ + buffA[0] = 0; + ret = pGetGeoInfoA(203, GEO_ID, buffA, 20, 0); /* GEOCLASS_NATION */ + if (ret == 0) + win_skip("GEO_ID not supported.\n"); + else + { + ok(ret == 4, "GEO_ID: expected 4, got %d\n", ret); + ok(!strcmp(buffA, "203"), "GEO_ID: expected 203, got %s\n", buffA); + + ret = pGetGeoInfoA(47610, GEO_ID, buffA, 20, 0); /* GEOCLASS_REGION */ + ok(ret == 6, "got %d\n", ret); + ok(!strcmp(buffA, "47610"), "got %s\n", buffA); + + ret = pGetGeoInfoA(333, GEO_ID, buffA, 20, 0); /* LOCATION_BOTH internal Wine type */ + ok(ret == 4, "got %d\n", ret); + ok(!strcmp(buffA, "333"), "got %s\n", buffA); + } /* GEO_PARENT */ buffA[0] = 0;

1 0

Zebediah Figura : wineqtdecoder: Use strmbase filter state change methods.
by Alexandre Julliard Dec. 4, 2019

Dec. 4, 2019

Module: wine Branch: master Commit: 498179b4482026091bf7376c0d2ac9a036e7ca0e URL: https://source.winehq.org/git/wine.git/?a=commit;h=498179b4482026091bf7376c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Dec 3 22:03:28 2019 -0600 wineqtdecoder: Use strmbase filter state change methods. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineqtdecoder/qtsplitter.c | 107 +++++++++++++++------------------------- 1 file changed, 40 insertions(+), 67 deletions(-) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index 81e18d3420..f22e014e1b 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -160,7 +160,6 @@ typedef struct QTSplitter { HANDLE runEvent; DWORD outputSize; - FILTER_STATE state; CRITICAL_SECTION csReceive; SourceSeeking sourceSeeking; @@ -281,10 +280,46 @@ static void qt_splitter_destroy(struct strmbase_filter *iface) CoTaskMemFree(filter); } +static HRESULT qt_splitter_start_stream(struct strmbase_filter *iface, REFERENCE_TIME time) +{ + QTSplitter *filter = impl_from_strmbase_filter(iface); + HRESULT hr = VFW_E_NOT_CONNECTED, pin_hr; + + EnterCriticalSection(&This->csReceive); + + if (filter->pVideo_Pin) + pin_hr = BaseOutputPinImpl_Active(&filter->pVideo_Pin->pin); + if (SUCCEEDED(pin_hr)) + hr = pin_hr; + if (filter->pAudio_Pin) + pin_hr = BaseOutputPinImpl_Active(&filter->pAudio_Pin->pin); + if (SUCCEEDED(pin_hr)) + hr = pin_hr; + SetEvent(filter->runEvent); + + LeaveCriticalSection(&This->csReceive); + + return hr; +} + +static HRESULT qt_splitter_cleanup_stream(struct strmbase_filter *iface) +{ + QTSplitter *filter = impl_from_strmbase_filter(iface); + + EnterCriticalSection(&This->csReceive); + IAsyncReader_BeginFlush(filter->pInputPin.pReader); + IAsyncReader_EndFlush(filter->pInputPin.pReader); + LeaveCriticalSection(&This->csReceive); + + return S_OK; +} + static const struct strmbase_filter_ops filter_ops = { .filter_get_pin = qt_splitter_get_pin, .filter_destroy = qt_splitter_destroy, + .filter_start_stream = qt_splitter_start_stream, + .filter_cleanup_stream = qt_splitter_cleanup_stream, }; static HRESULT sink_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE *mt) @@ -329,7 +364,6 @@ IUnknown * CALLBACK QTSplitter_create(IUnknown *outer, HRESULT *phr) This->pVideo_Pin = NULL; This->pAudio_Pin = NULL; - This->state = State_Stopped; This->aSession = NULL; This->runEvent = CreateEventW(NULL, 0, 0, NULL); @@ -378,28 +412,6 @@ static HRESULT WINAPI QT_QueryInterface(IBaseFilter *iface, REFIID riid, LPVOID return E_NOINTERFACE; } -static HRESULT WINAPI QT_Stop(IBaseFilter *iface) -{ - QTSplitter *This = impl_from_IBaseFilter(iface); - - TRACE("()\n"); - - EnterCriticalSection(&This->csReceive); - IAsyncReader_BeginFlush(This->pInputPin.pReader); - IAsyncReader_EndFlush(This->pInputPin.pReader); - LeaveCriticalSection(&This->csReceive); - - return S_OK; -} - -static HRESULT WINAPI QT_Pause(IBaseFilter *iface) -{ - HRESULT hr = S_OK; - TRACE("()\n"); - - return hr; -} - static OSErr QT_Create_Extract_Session(QTSplitter *filter) { AudioStreamBasicDescription aDesc; @@ -534,7 +546,6 @@ static DWORD WINAPI QTSplitter_thread(LPVOID data) return 0; } - This->state = State_Running; /* Prime the pump: Needed for MPEG streams */ GetMovieNextInterestingTime(This->pQTMovie, nextTimeEdgeOK | nextTimeStep, 0, NULL, This->movie_time, 1, &next_time, NULL); @@ -733,7 +744,6 @@ audio_error: LeaveCriticalSection(&This->csReceive); } while (hr == S_OK); - This->state = State_Stopped; if (This->pAudio_Pin) OutputQueue_EOS(This->pAudio_Pin->queue); if (This->pVideo_Pin) @@ -742,52 +752,15 @@ audio_error: return hr; } -static HRESULT WINAPI QT_Run(IBaseFilter *iface, REFERENCE_TIME tStart) -{ - HRESULT hr = S_OK; - QTSplitter *This = impl_from_IBaseFilter(iface); - HRESULT hr_any = VFW_E_NOT_CONNECTED; - - TRACE("(%s)\n", wine_dbgstr_longlong(tStart)); - - EnterCriticalSection(&This->csReceive); - - if (This->pVideo_Pin) - hr = BaseOutputPinImpl_Active(&This->pVideo_Pin->pin); - if (SUCCEEDED(hr)) - hr_any = hr; - if (This->pAudio_Pin) - hr = BaseOutputPinImpl_Active(&This->pAudio_Pin->pin); - if (SUCCEEDED(hr)) - hr_any = hr; - - hr = hr_any; - - SetEvent(This->runEvent); - LeaveCriticalSection(&This->csReceive); - - return hr; -} - -static HRESULT WINAPI QT_GetState(IBaseFilter *iface, DWORD dwMilliSecsTimeout, FILTER_STATE *pState) -{ - QTSplitter *This = impl_from_IBaseFilter(iface); - TRACE("(%d, %p)\n", dwMilliSecsTimeout, pState); - - *pState = This->state; - - return S_OK; -} - static const IBaseFilterVtbl QT_Vtbl = { QT_QueryInterface, BaseFilterImpl_AddRef, BaseFilterImpl_Release, BaseFilterImpl_GetClassID, - QT_Stop, - QT_Pause, - QT_Run, - QT_GetState, + BaseFilterImpl_Stop, + BaseFilterImpl_Pause, + BaseFilterImpl_Run, + BaseFilterImpl_GetState, BaseFilterImpl_SetSyncSource, BaseFilterImpl_GetSyncSource, BaseFilterImpl_EnumPins,

1 0

Michael Stefaniuc : dmime/tests: Add GetParam/SetParam tests for unsupported types.
by Alexandre Julliard Dec. 4, 2019

Dec. 4, 2019

Module: wine Branch: master Commit: badea4cae0a35171afe9eefc77f3bce8aa8063d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=badea4cae0a35171afe9eefc… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Dec 3 23:51:26 2019 +0100 dmime/tests: Add GetParam/SetParam tests for unsupported types. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/tests/dmime.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index a35470b4cd..e8fa6a596d 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -712,10 +712,20 @@ static void test_track(void) else if (class[i].clsid == &CLSID_DirectMusicWaveTrack) expect_getparam(dmt, param_types[j].type, param_types[j].name, DMUS_E_GET_UNSUPPORTED); - } else + } else { ok(hr == DMUS_E_TYPE_UNSUPPORTED, "IsParamSupported(%s) failed: %08x, expected DMUS_E_TYPE_UNSUPPORTED\n", param_types[j].name, hr); + expect_getparam(dmt, param_types[j].type, param_types[j].name, + DMUS_E_GET_UNSUPPORTED); + if (class[i].clsid == &CLSID_DirectMusicWaveTrack) + expect_setparam(dmt, param_types[j].type, param_types[j].name, + DMUS_E_TYPE_UNSUPPORTED); + else + expect_setparam(dmt, param_types[j].type, param_types[j].name, + DMUS_E_SET_UNSUPPORTED); + } + /* GetParam / SetParam for IsParamSupported supported types */ if (class[i].clsid == &CLSID_DirectMusicTimeSigTrack) { expect_getparam(dmt, &GUID_DisableTimeSig, "GUID_DisableTimeSig",

1 0

Michael Stefaniuc : dmime: Tempo track supports only GUID_TempoParam in GetParam().
by Alexandre Julliard Dec. 4, 2019

Dec. 4, 2019

Module: wine Branch: master Commit: ca060d45e32c265ef531c8d1f40f4c8234f1dba2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca060d45e32c265ef531c8d1… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Dec 3 23:51:25 2019 +0100 dmime: Tempo track supports only GUID_TempoParam in GetParam(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/tempotrack.c | 77 +++++++++++++++++++++--------------------------- dlls/dmime/tests/dmime.c | 5 ++++ 2 files changed, 39 insertions(+), 43 deletions(-) diff --git a/dlls/dmime/tempotrack.c b/dlls/dmime/tempotrack.c index 442aec37bf..94e4430b7f 100644 --- a/dlls/dmime/tempotrack.c +++ b/dlls/dmime/tempotrack.c @@ -153,52 +153,43 @@ static HRESULT WINAPI tempo_track_Play(IDirectMusicTrack8 *iface, void *pStateDa return S_OK; } -static HRESULT WINAPI tempo_track_GetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, - MUSIC_TIME mtTime, MUSIC_TIME *pmtNext, void *pParam) +static HRESULT WINAPI tempo_track_GetParam(IDirectMusicTrack8 *iface, REFGUID type, MUSIC_TIME time, + MUSIC_TIME *next, void *param) { - IDirectMusicTempoTrack *This = impl_from_IDirectMusicTrack8(iface); - - HRESULT hr = S_OK; - struct list* pEntry = NULL; - LPDMUS_PRIVATE_TEMPO_ITEM pIt = NULL; - DMUS_TEMPO_PARAM* prm = pParam; - - FIXME("(%p, %s, %d, %p, %p): almost stub\n", This, debugstr_dmguid(rguidType), mtTime, pmtNext, pParam); - - if (NULL == pParam) { - return E_POINTER; - } + IDirectMusicTempoTrack *This = impl_from_IDirectMusicTrack8(iface); + DMUS_PRIVATE_TEMPO_ITEM *item = NULL; + DMUS_TEMPO_PARAM *prm = param; + + TRACE("(%p, %s, %d, %p, %p)\n", This, debugstr_dmguid(type), time, next, param); + + if (!param) + return E_POINTER; + if (!IsEqualGUID(type, &GUID_TempoParam)) + return DMUS_E_GET_UNSUPPORTED; + + FIXME("Partial support for GUID_TempoParam\n"); + + if (next) + *next = 0; + prm->mtTime = 0; + prm->dblTempo = 0.123456; + + LIST_FOR_EACH_ENTRY(item, &This->Items, DMUS_PRIVATE_TEMPO_ITEM, entry) { + if (item->item.lTime <= time) { + MUSIC_TIME ofs = item->item.lTime - time; + if (ofs > prm->mtTime) { + prm->mtTime = ofs; + prm->dblTempo = item->item.dblTempo; + } + if (next && item->item.lTime > time && item->item.lTime < *next) + *next = item->item.lTime; + } + } - hr = IDirectMusicTrack_IsParamSupported (iface, rguidType); - if (FAILED(hr)) { - return hr; - } + if (0.123456 == prm->dblTempo) + return DMUS_E_NOT_FOUND; - if (NULL != pmtNext) *pmtNext = 0; - prm->mtTime = 0; - prm->dblTempo = 0.123456; - - LIST_FOR_EACH (pEntry, &This->Items) { - pIt = LIST_ENTRY(pEntry, DMUS_PRIVATE_TEMPO_ITEM, entry); - /*TRACE(" - %p -> 0x%lx,%p\n", pIt, pIt->item.lTime, pIt->item.dblTempo);*/ - if (pIt->item.lTime <= mtTime) { - MUSIC_TIME ofs = pIt->item.lTime - mtTime; - if (ofs > prm->mtTime) { - prm->mtTime = ofs; - prm->dblTempo = pIt->item.dblTempo; - } - if (NULL != pmtNext && pIt->item.lTime > mtTime) { - if (pIt->item.lTime < *pmtNext) { - *pmtNext = pIt->item.lTime; - } - } - } - } - - if (0.123456 == prm->dblTempo) { - return DMUS_E_NOT_FOUND; - } - return S_OK; + return S_OK; } static HRESULT WINAPI tempo_track_SetParam(IDirectMusicTrack8 *iface, REFGUID type, MUSIC_TIME time, diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 3e25328cd8..a35470b4cd 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -724,6 +724,11 @@ static void test_track(void) DMUS_E_GET_UNSUPPORTED); expect_setparam(dmt, &GUID_TimeSignature, "GUID_TimeSignature", DMUS_E_SET_UNSUPPORTED); + } else if (class[i].clsid == &CLSID_DirectMusicTempoTrack) { + expect_getparam(dmt, &GUID_DisableTempo, "GUID_DisableTempo", + DMUS_E_GET_UNSUPPORTED); + expect_getparam(dmt, &GUID_EnableTempo, "GUID_EnableTempo", + DMUS_E_GET_UNSUPPORTED); } } } else {

1 0

Michael Stefaniuc : dmime: Partial implementation of the Wave track Get/SetParam.
by Alexandre Julliard Dec. 4, 2019

Dec. 4, 2019

Module: wine Branch: master Commit: d4233399607b33fd114a92275ee8c8dc10e3205f URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4233399607b33fd114a9227… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Dec 3 23:51:22 2019 +0100 dmime: Partial implementation of the Wave track Get/SetParam. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/tests/dmime.c | 3 +++ dlls/dmime/wavetrack.c | 48 ++++++++++++++++++++++++++++++++++++++---------- 2 files changed, 41 insertions(+), 10 deletions(-) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 723dc88399..a08fc19c22 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -709,6 +709,9 @@ static void test_track(void) } else if (class[i].clsid == &CLSID_DirectMusicMarkerTrack) expect_setparam(dmt, param_types[j].type, param_types[j].name, DMUS_E_SET_UNSUPPORTED); + else if (class[i].clsid == &CLSID_DirectMusicWaveTrack) + expect_getparam(dmt, param_types[j].type, param_types[j].name, + DMUS_E_GET_UNSUPPORTED); } else ok(hr == DMUS_E_TYPE_UNSUPPORTED, "IsParamSupported(%s) failed: %08x, expected DMUS_E_TYPE_UNSUPPORTED\n", diff --git a/dlls/dmime/wavetrack.c b/dlls/dmime/wavetrack.c index 34adca6065..1c6b08b523 100644 --- a/dlls/dmime/wavetrack.c +++ b/dlls/dmime/wavetrack.c @@ -120,20 +120,48 @@ static HRESULT WINAPI wave_track_Play(IDirectMusicTrack8 *iface, void *pStateDat return S_OK; } -static HRESULT WINAPI wave_track_GetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, - MUSIC_TIME mtTime, MUSIC_TIME *pmtNext, void *pParam) +static HRESULT WINAPI wave_track_GetParam(IDirectMusicTrack8 *iface, REFGUID type, MUSIC_TIME time, + MUSIC_TIME *next, void *param) { - IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, %d, %p, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pmtNext, pParam); - return S_OK; + IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %s, %d, %p, %p): not supported\n", This, debugstr_dmguid(type), time, next, param); + return DMUS_E_GET_UNSUPPORTED; } -static HRESULT WINAPI wave_track_SetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, - MUSIC_TIME mtTime, void *pParam) +static HRESULT WINAPI wave_track_SetParam(IDirectMusicTrack8 *iface, REFGUID type, MUSIC_TIME time, + void *param) { - IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, %d, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pParam); - return S_OK; + IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %s, %d, %p)\n", This, debugstr_dmguid(type), time, param); + + if (IsEqualGUID(type, &GUID_Disable_Auto_Download)) { + FIXME("GUID_Disable_Auto_Download not handled yet\n"); + return S_OK; + } + if (IsEqualGUID(type, &GUID_Download)) { + FIXME("GUID_Download not handled yet\n"); + return S_OK; + } + if (IsEqualGUID(type, &GUID_DownloadToAudioPath)) { + FIXME("GUID_DownloadToAudioPath not handled yet\n"); + return S_OK; + } + if (IsEqualGUID(type, &GUID_Enable_Auto_Download)) { + FIXME("GUID_Enable_Auto_Download not handled yet\n"); + return S_OK; + } + if (IsEqualGUID(type, &GUID_Unload)) { + FIXME("GUID_Unload not handled yet\n"); + return S_OK; + } + if (IsEqualGUID(type, &GUID_UnloadFromAudioPath)) { + FIXME("GUID_UnloadFromAudioPath not handled yet\n"); + return S_OK; + } + + return DMUS_E_TYPE_UNSUPPORTED; } static HRESULT WINAPI wave_track_IsParamSupported(IDirectMusicTrack8 *iface, REFGUID type)

1 0

Zebediah Figura : wineqtdecoder: Don't expose IMediaSeeking from the filter.
by Alexandre Julliard Dec. 4, 2019

Dec. 4, 2019

Module: wine Branch: master Commit: ab57793f2cc42b68faa1213a278a607e386525df URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab57793f2cc42b68faa1213a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Dec 3 22:03:30 2019 -0600 wineqtdecoder: Don't expose IMediaSeeking from the filter. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineqtdecoder/qtsplitter.c | 35 ++--------------------------------- 1 file changed, 2 insertions(+), 33 deletions(-) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index c021fec8af..28ea36785a 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -381,37 +381,6 @@ IUnknown * CALLBACK QTSplitter_create(IUnknown *outer, HRESULT *phr) return &This->filter.IUnknown_inner; } -static HRESULT WINAPI QT_QueryInterface(IBaseFilter *iface, REFIID riid, LPVOID *ppv) -{ - QTSplitter *This = impl_from_IBaseFilter(iface); - TRACE("(%s, %p)\n", debugstr_guid(riid), ppv); - - *ppv = NULL; - - if (IsEqualIID(riid, &IID_IUnknown)) - *ppv = This; - else if (IsEqualIID(riid, &IID_IPersist)) - *ppv = This; - else if (IsEqualIID(riid, &IID_IMediaFilter)) - *ppv = This; - else if (IsEqualIID(riid, &IID_IBaseFilter)) - *ppv = This; - else if (IsEqualIID(riid, &IID_IMediaSeeking)) - *ppv = &This->sourceSeeking; - - if (*ppv) - { - IUnknown_AddRef((IUnknown *)(*ppv)); - return S_OK; - } - - if (!IsEqualIID(riid, &IID_IPin) && !IsEqualIID(riid, &IID_IVideoWindow) && - !IsEqualIID(riid, &IID_IAMFilterMiscFlags)) - FIXME("No interface for %s!\n", debugstr_guid(riid)); - - return E_NOINTERFACE; -} - static OSErr QT_Create_Extract_Session(QTSplitter *filter) { AudioStreamBasicDescription aDesc; @@ -753,7 +722,7 @@ audio_error: } static const IBaseFilterVtbl QT_Vtbl = { - QT_QueryInterface, + BaseFilterImpl_QueryInterface, BaseFilterImpl_AddRef, BaseFilterImpl_Release, BaseFilterImpl_GetClassID, @@ -1220,7 +1189,7 @@ static HRESULT WINAPI QTOutPin_QueryInterface(IPin *iface, REFIID riid, void **p else if (IsEqualIID(riid, &IID_IPin)) *ppv = iface; else if (IsEqualIID(riid, &IID_IMediaSeeking)) - return IBaseFilter_QueryInterface(&This->pin.pin.filter->IBaseFilter_iface, &IID_IMediaSeeking, ppv); + *ppv = &This->sourceSeeking.IMediaSeeking_iface; else if (IsEqualIID(riid, &IID_IQualityControl)) *ppv = &This->IQualityControl_iface;

1 0

Michael Stefaniuc : dmime: Partial implementation of the TimeSig track Get/SetParam.
by Alexandre Julliard Dec. 4, 2019

Dec. 4, 2019

Module: wine Branch: master Commit: 2ff339f9ad513ac37f5640b6bbf3321b4c8bb08c URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ff339f9ad513ac37f5640b6… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Dec 3 23:51:23 2019 +0100 dmime: Partial implementation of the TimeSig track Get/SetParam. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/tests/dmime.c | 9 +++++++++ dlls/dmime/timesigtrack.c | 38 ++++++++++++++++++++++++++++---------- 2 files changed, 37 insertions(+), 10 deletions(-) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index a08fc19c22..3e25328cd8 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -716,6 +716,15 @@ static void test_track(void) ok(hr == DMUS_E_TYPE_UNSUPPORTED, "IsParamSupported(%s) failed: %08x, expected DMUS_E_TYPE_UNSUPPORTED\n", param_types[j].name, hr); + /* GetParam / SetParam for IsParamSupported supported types */ + if (class[i].clsid == &CLSID_DirectMusicTimeSigTrack) { + expect_getparam(dmt, &GUID_DisableTimeSig, "GUID_DisableTimeSig", + DMUS_E_GET_UNSUPPORTED); + expect_getparam(dmt, &GUID_EnableTimeSig, "GUID_EnableTimeSig", + DMUS_E_GET_UNSUPPORTED); + expect_setparam(dmt, &GUID_TimeSignature, "GUID_TimeSignature", + DMUS_E_SET_UNSUPPORTED); + } } } else { hr = IDirectMusicTrack_GetParam(dmt, NULL, 0, NULL, NULL); diff --git a/dlls/dmime/timesigtrack.c b/dlls/dmime/timesigtrack.c index 74b2c3652d..697b3e3593 100644 --- a/dlls/dmime/timesigtrack.c +++ b/dlls/dmime/timesigtrack.c @@ -117,20 +117,38 @@ static HRESULT WINAPI IDirectMusicTrackImpl_Play(IDirectMusicTrack *iface, void return S_OK; } -static HRESULT WINAPI IDirectMusicTrackImpl_GetParam(IDirectMusicTrack *iface, REFGUID rguidType, - MUSIC_TIME mtTime, MUSIC_TIME *pmtNext, void *pParam) +static HRESULT WINAPI IDirectMusicTrackImpl_GetParam(IDirectMusicTrack *iface, REFGUID type, + MUSIC_TIME time, MUSIC_TIME *next, void *param) { - IDirectMusicTimeSigTrack *This = impl_from_IDirectMusicTrack(iface); - FIXME("(%p, %s, %d, %p, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pmtNext, pParam); - return S_OK; + IDirectMusicTimeSigTrack *This = impl_from_IDirectMusicTrack(iface); + + TRACE("(%p, %s, %d, %p, %p)\n", This, debugstr_dmguid(type), time, next, param); + + if (IsEqualGUID(type, &GUID_TimeSignature)) { + FIXME("GUID_TimeSignature not handled yet\n"); + return DMUS_E_NOT_FOUND; + } + + return DMUS_E_GET_UNSUPPORTED; } -static HRESULT WINAPI IDirectMusicTrackImpl_SetParam(IDirectMusicTrack *iface, REFGUID rguidType, - MUSIC_TIME mtTime, void *pParam) +static HRESULT WINAPI IDirectMusicTrackImpl_SetParam(IDirectMusicTrack *iface, REFGUID type, + MUSIC_TIME time, void *param) { - IDirectMusicTimeSigTrack *This = impl_from_IDirectMusicTrack(iface); - FIXME("(%p, %s, %d, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pParam); - return S_OK; + IDirectMusicTimeSigTrack *This = impl_from_IDirectMusicTrack(iface); + + TRACE("(%p, %s, %d, %p)\n", This, debugstr_dmguid(type), time, param); + + if (IsEqualGUID(type, &GUID_DisableTimeSig)) { + FIXME("GUID_DisableTimeSig not handled yet\n"); + return S_OK; + } + if (IsEqualGUID(type, &GUID_EnableTimeSig)) { + FIXME("GUID_EnableTimeSig not handled yet\n"); + return S_OK; + } + + return DMUS_E_SET_UNSUPPORTED; } static HRESULT WINAPI IDirectMusicTrackImpl_IsParamSupported(IDirectMusicTrack *iface,

1 0

Zhiyi Zhang : user32/tests: Use a higher resolution in test_ChangeDisplaySettingsEx().
by Alexandre Julliard Dec. 4, 2019

Dec. 4, 2019

Module: wine Branch: master Commit: 11065839f5ec521e2711098797ec0c23efffb760 URL: https://source.winehq.org/git/wine.git/?a=commit;h=11065839f5ec521e27110987… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Dec 3 22:40:00 2019 +0800 user32/tests: Use a higher resolution in test_ChangeDisplaySettingsEx(). 640x480 is not supported on some Windows 10 versions. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/monitor.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 4268dba9c5..567870e3d1 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -234,20 +234,20 @@ struct vid_mode }; static const struct vid_mode vid_modes_test[] = { - {640, 480, 0, 0, DM_PELSWIDTH | DM_PELSHEIGHT | DM_BITSPERPEL | DM_DISPLAYFREQUENCY, 0}, - {640, 480, 0, 0, DM_PELSWIDTH | DM_PELSHEIGHT | DM_DISPLAYFREQUENCY, 1}, - {640, 480, 0, 0, DM_PELSWIDTH | DM_PELSHEIGHT | DM_BITSPERPEL , 0}, - {640, 480, 0, 0, DM_PELSWIDTH | DM_PELSHEIGHT , 1}, - {640, 480, 0, 0, DM_BITSPERPEL , 0}, - {640, 480, 0, 0, DM_DISPLAYFREQUENCY, 0}, + {1024, 768, 0, 0, DM_PELSWIDTH | DM_PELSHEIGHT | DM_BITSPERPEL | DM_DISPLAYFREQUENCY, 0}, + {1024, 768, 0, 0, DM_PELSWIDTH | DM_PELSHEIGHT | DM_DISPLAYFREQUENCY, 1}, + {1024, 768, 0, 0, DM_PELSWIDTH | DM_PELSHEIGHT | DM_BITSPERPEL , 0}, + {1024, 768, 0, 0, DM_PELSWIDTH | DM_PELSHEIGHT , 1}, + {1024, 768, 0, 0, DM_BITSPERPEL , 0}, + {1024, 768, 0, 0, DM_DISPLAYFREQUENCY, 0}, {0, 0, 0, 0, DM_PELSWIDTH, 0}, {0, 0, 0, 0, DM_PELSHEIGHT, 0}, - {640, 480, 0, 0, DM_PELSWIDTH, 0}, - {640, 480, 0, 0, DM_PELSHEIGHT, 0}, - { 0, 480, 0, 0, DM_PELSWIDTH | DM_PELSHEIGHT, 0}, - {640, 0, 0, 0, DM_PELSWIDTH | DM_PELSHEIGHT, 0}, + {1024, 768, 0, 0, DM_PELSWIDTH, 0}, + {1024, 768, 0, 0, DM_PELSHEIGHT, 0}, + { 0, 768, 0, 0, DM_PELSWIDTH | DM_PELSHEIGHT, 0}, + {1024, 0, 0, 0, DM_PELSWIDTH | DM_PELSHEIGHT, 0}, /* the following test succeeds under XP SP3 {0, 0, 0, 0, DM_DISPLAYFREQUENCY, 0}

1 0

Zhiyi Zhang : user32/tests: Import functions if possible.
by Alexandre Julliard Dec. 4, 2019

Dec. 4, 2019

Module: wine Branch: master Commit: 4fc651db925dcc257cab57e477658a641f87985e URL: https://source.winehq.org/git/wine.git/?a=commit;h=4fc651db925dcc257cab57e4… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Dec 3 22:37:50 2019 +0800 user32/tests: Import functions if possible. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/monitor.c | 126 +++++++++++++------------------------------- 1 file changed, 36 insertions(+), 90 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4fc651db925dcc257cab…

1 0

Michael Stefaniuc : dmime: Implement the Lyrics track param methods.
by Alexandre Julliard Dec. 4, 2019

Dec. 4, 2019

Module: wine Branch: master Commit: 85b966250a6f6a371c5737f532b0d6b951a5cb5d URL: https://source.winehq.org/git/wine.git/?a=commit;h=85b966250a6f6a371c5737f5… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Dec 3 23:51:18 2019 +0100 dmime: Implement the Lyrics track param methods. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/lyricstrack.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/dmime/lyricstrack.c b/dlls/dmime/lyricstrack.c index 7554356ba4..49f44f52a3 100644 --- a/dlls/dmime/lyricstrack.c +++ b/dlls/dmime/lyricstrack.c @@ -117,30 +117,30 @@ static HRESULT WINAPI lyrics_track_Play(IDirectMusicTrack8 *iface, void *pStateD return S_OK; } -static HRESULT WINAPI lyrics_track_GetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, - MUSIC_TIME mtTime, MUSIC_TIME *pmtNext, void *pParam) +static HRESULT WINAPI lyrics_track_GetParam(IDirectMusicTrack8 *iface, REFGUID type, + MUSIC_TIME time, MUSIC_TIME *next, void *param) { - IDirectMusicLyricsTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, %d, %p, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pmtNext, pParam); - return S_OK; + IDirectMusicLyricsTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %s, %d, %p, %p): not supported\n", This, debugstr_dmguid(type), time, next, param); + return DMUS_E_GET_UNSUPPORTED; } -static HRESULT WINAPI lyrics_track_SetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, - MUSIC_TIME mtTime, void *pParam) +static HRESULT WINAPI lyrics_track_SetParam(IDirectMusicTrack8 *iface, REFGUID type, + MUSIC_TIME time, void *param) { - IDirectMusicLyricsTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, %d, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pParam); - return S_OK; + IDirectMusicLyricsTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %s, %d, %p): not supported\n", This, debugstr_dmguid(type), time, param); + return DMUS_E_SET_UNSUPPORTED; } -static HRESULT WINAPI lyrics_track_IsParamSupported(IDirectMusicTrack8 *iface, REFGUID rguidType) +static HRESULT WINAPI lyrics_track_IsParamSupported(IDirectMusicTrack8 *iface, REFGUID type) { - IDirectMusicLyricsTrack *This = impl_from_IDirectMusicTrack8(iface); + IDirectMusicLyricsTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %s)\n", This, debugstr_dmguid(rguidType)); - /* didn't find any params */ - TRACE("param unsupported\n"); - return DMUS_E_TYPE_UNSUPPORTED; + TRACE("(%p, %s): param type not supported\n", This, debugstr_dmguid(type)); + return DMUS_E_TYPE_UNSUPPORTED; } static HRESULT WINAPI lyrics_track_AddNotificationType(IDirectMusicTrack8 *iface, REFGUID notiftype)

1 0