wine-commits November 2019

wine-commits@winehq.org

1 participants
895 discussions

Zebediah Figura : quartz/videorenderer: Wait in Receive() while paused.
by Alexandre Julliard 22 Nov '19

22 Nov '19

Module: wine Branch: master Commit: 6014c0a99784ce7948f0504caa9f63a8eee2eb70 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6014c0a99784ce7948f0504c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Nov 21 18:11:26 2019 -0600 quartz/videorenderer: Wait in Receive() while paused. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/videorenderer.c | 10 +++++----- dlls/quartz/videorenderer.c | 25 ++++++++++++++++++++++++- 2 files changed, 29 insertions(+), 6 deletions(-) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index e7c0e15edd..046d94b0b8 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -744,7 +744,7 @@ static void test_filter_state(IMemInputPin *input, IFilterGraph2 *graph) hr = IMediaControl_GetState(control, 1000, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); + ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); hr = IMediaControl_Stop(control); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -777,7 +777,7 @@ static void test_filter_state(IMemInputPin *input, IFilterGraph2 *graph) hr = IMediaControl_GetState(control, 1000, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); + ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); hr = IMediaControl_Run(control); todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -803,7 +803,7 @@ static void test_filter_state(IMemInputPin *input, IFilterGraph2 *graph) hr = IMediaControl_GetState(control, 1000, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); + ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); hr = IMediaControl_Run(control); todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -868,7 +868,7 @@ static void test_flushing(IPin *pin, IMemInputPin *input, IFilterGraph2 *graph) ok(hr == S_FALSE, "Got hr %#x.\n", hr); thread = send_frame(input); - todo_wine ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); + ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); hr = IMediaControl_GetState(control, 0, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -892,7 +892,7 @@ static void test_flushing(IPin *pin, IMemInputPin *input, IFilterGraph2 *graph) todo_wine ok(hr == VFW_S_STATE_INTERMEDIATE, "Got hr %#x.\n", hr); thread = send_frame(input); - todo_wine ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); + ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); hr = IMediaControl_Run(control); todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index db889bb661..bd228277cb 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -54,6 +54,8 @@ typedef struct VideoRendererImpl LONG FullScreenMode; DWORD saved_style; + + HANDLE run_event; } VideoRendererImpl; static inline VideoRendererImpl *impl_from_BaseWindow(BaseWindow *iface) @@ -176,6 +178,15 @@ static HRESULT WINAPI VideoRenderer_DoRenderSample(struct strmbase_renderer *ifa pbSrcStream, (BITMAPINFO *)bih, DIB_RGB_COLORS, SRCCOPY); ReleaseDC(filter->baseControlWindow.baseWindow.hWnd, dc); + if (filter->renderer.filter.state == State_Paused) + { + const HANDLE events[2] = {filter->run_event, filter->renderer.flush_event}; + + LeaveCriticalSection(&filter->renderer.csRenderLock); + WaitForMultipleObjects(2, events, FALSE, INFINITE); + EnterCriticalSection(&filter->renderer.csRenderLock); + } + return S_OK; } @@ -234,7 +245,7 @@ static void video_renderer_destroy(struct strmbase_renderer *iface) BaseControlWindow_Destroy(&filter->baseControlWindow); BaseControlVideo_Destroy(&filter->baseControlVideo); - + CloseHandle(filter->run_event); strmbase_renderer_cleanup(&filter->renderer); CoTaskMemFree(filter); } @@ -267,6 +278,13 @@ static HRESULT video_renderer_pin_query_interface(struct strmbase_renderer *ifac return S_OK; } +static void video_renderer_start_stream(struct strmbase_renderer *iface) +{ + VideoRendererImpl *filter = impl_from_strmbase_renderer(iface); + + SetEvent(filter->run_event); +} + static void video_renderer_stop_stream(struct strmbase_renderer *iface) { VideoRendererImpl *This = impl_from_strmbase_renderer(iface); @@ -276,6 +294,8 @@ static void video_renderer_stop_stream(struct strmbase_renderer *iface) if (This->baseControlWindow.AutoShow) /* Black it out */ RedrawWindow(This->baseControlWindow.baseWindow.hWnd, NULL, NULL, RDW_INVALIDATE|RDW_ERASE); + + ResetEvent(This->run_event); } static void video_renderer_init_stream(struct strmbase_renderer *iface) @@ -315,6 +335,7 @@ static const struct strmbase_renderer_ops renderer_ops = .pfnCheckMediaType = VideoRenderer_CheckMediaType, .pfnDoRenderSample = VideoRenderer_DoRenderSample, .renderer_init_stream = video_renderer_init_stream, + .renderer_start_stream = video_renderer_start_stream, .renderer_stop_stream = video_renderer_stop_stream, .pfnShouldDrawSampleNow = VideoRenderer_ShouldDrawSampleNow, .renderer_destroy = video_renderer_destroy, @@ -722,6 +743,8 @@ HRESULT VideoRenderer_create(IUnknown *outer, void **out) if (FAILED(hr = BaseWindowImpl_PrepareWindow(&pVideoRenderer->baseControlWindow.baseWindow))) goto fail; + pVideoRenderer->run_event = CreateEventW(NULL, TRUE, FALSE, NULL); + *out = &pVideoRenderer->renderer.filter.IUnknown_inner; return S_OK;

1 0

Zebediah Figura : quartz/videorenderer: Remove some dead code.
by Alexandre Julliard 22 Nov '19

22 Nov '19

Module: wine Branch: master Commit: b78dcbf269eedf91bad53ff4dea23d2223748c1c URL: https://source.winehq.org/git/wine.git/?a=commit;h=b78dcbf269eedf91bad53ff4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Nov 21 18:11:25 2019 -0600 quartz/videorenderer: Remove some dead code. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/videorenderer.c | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index bc5791dd5c..db889bb661 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -149,7 +149,6 @@ static HRESULT WINAPI VideoRenderer_DoRenderSample(struct strmbase_renderer *ifa const AM_MEDIA_TYPE *mt = &filter->renderer.sink.pin.mt; LPBYTE pbSrcStream = NULL; BITMAPINFOHEADER *bih; - LONG cbSrcStream = 0; HRESULT hr; HDC dc; @@ -162,23 +161,6 @@ static HRESULT WINAPI VideoRenderer_DoRenderSample(struct strmbase_renderer *ifa return hr; } - cbSrcStream = IMediaSample_GetActualDataLength(pSample); - - TRACE("val %p %d\n", pbSrcStream, cbSrcStream); - -#if 0 /* For debugging purpose */ - { - int i; - for(i = 0; i < cbSrcStream; i++) - { - if ((i!=0) && !(i%16)) - TRACE("\n"); - TRACE("%02x ", pbSrcStream[i]); - } - TRACE("\n"); - } -#endif - if (IsEqualGUID(&mt->formattype, &FORMAT_VideoInfo)) bih = &((VIDEOINFOHEADER *)mt->pbFormat)->bmiHeader; else

1 0

Zebediah Figura : quartz/videorenderer: Get rid of filter state checks in VideoRenderer_DoRenderSample().
by Alexandre Julliard 22 Nov '19

22 Nov '19

Module: wine Branch: master Commit: 0af834681ca30fd77aa6b37f9afabffb961e37da URL: https://source.winehq.org/git/wine.git/?a=commit;h=0af834681ca30fd77aa6b37f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Nov 21 18:11:24 2019 -0600 quartz/videorenderer: Get rid of filter state checks in VideoRenderer_DoRenderSample(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/videorenderer.c | 65 ++++++++++++++------------------------------- 1 file changed, 20 insertions(+), 45 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index e38a773239..bc5791dd5c 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -134,34 +134,6 @@ static void VideoRenderer_AutoShowWindow(VideoRendererImpl *This) ShowWindow(This->baseControlWindow.baseWindow.hWnd, SW_SHOW); } -static void VideoRenderer_SendSampleData(VideoRendererImpl* This, LPBYTE data, DWORD size) -{ - const AM_MEDIA_TYPE *amt = &This->renderer.sink.pin.mt; - BITMAPINFOHEADER *bmiHeader; - HDC dc; - - TRACE("(%p)->(%p, %d)\n", This, data, size); - - if (IsEqualGUID(&amt->formattype, &FORMAT_VideoInfo)) - { - bmiHeader = &((VIDEOINFOHEADER *)amt->pbFormat)->bmiHeader; - } - else if (IsEqualGUID(&amt->formattype, &FORMAT_VideoInfo2)) - { - bmiHeader = &((VIDEOINFOHEADER2 *)amt->pbFormat)->bmiHeader; - } - - TRACE("Src Rect: %s\n", wine_dbgstr_rect(&This->SourceRect)); - TRACE("Dst Rect: %s\n", wine_dbgstr_rect(&This->DestRect)); - - dc = GetDC(This->baseControlWindow.baseWindow.hWnd); - StretchDIBits(dc, This->DestRect.left, This->DestRect.top, This->DestRect.right -This->DestRect.left, - This->DestRect.bottom - This->DestRect.top, This->SourceRect.left, This->SourceRect.top, - This->SourceRect.right - This->SourceRect.left, This->SourceRect.bottom - This->SourceRect.top, - data, (BITMAPINFO *)bmiHeader, DIB_RGB_COLORS, SRCCOPY); - ReleaseDC(This->baseControlWindow.baseWindow.hWnd, dc); -} - static HRESULT WINAPI VideoRenderer_ShouldDrawSampleNow(struct strmbase_renderer *filter, IMediaSample *pSample, REFERENCE_TIME *start, REFERENCE_TIME *end) { @@ -173,12 +145,15 @@ static HRESULT WINAPI VideoRenderer_ShouldDrawSampleNow(struct strmbase_renderer static HRESULT WINAPI VideoRenderer_DoRenderSample(struct strmbase_renderer *iface, IMediaSample *pSample) { - VideoRendererImpl *This = impl_from_strmbase_renderer(iface); + VideoRendererImpl *filter = impl_from_strmbase_renderer(iface); + const AM_MEDIA_TYPE *mt = &filter->renderer.sink.pin.mt; LPBYTE pbSrcStream = NULL; + BITMAPINFOHEADER *bih; LONG cbSrcStream = 0; HRESULT hr; + HDC dc; - TRACE("(%p)->(%p)\n", This, pSample); + TRACE("filter %p, sample %p.\n", filter, pSample); hr = IMediaSample_GetPointer(pSample, &pbSrcStream); if (FAILED(hr)) @@ -204,21 +179,21 @@ static HRESULT WINAPI VideoRenderer_DoRenderSample(struct strmbase_renderer *ifa } #endif - if (This->renderer.filter.state == State_Paused) - { - VideoRenderer_SendSampleData(This, pbSrcStream, cbSrcStream); - if (This->renderer.filter.state == State_Paused) - { - /* Flushing */ - return S_OK; - } - if (This->renderer.filter.state == State_Stopped) - { - return VFW_E_WRONG_STATE; - } - } else { - VideoRenderer_SendSampleData(This, pbSrcStream, cbSrcStream); - } + if (IsEqualGUID(&mt->formattype, &FORMAT_VideoInfo)) + bih = &((VIDEOINFOHEADER *)mt->pbFormat)->bmiHeader; + else + bih = &((VIDEOINFOHEADER2 *)mt->pbFormat)->bmiHeader; + + dc = GetDC(filter->baseControlWindow.baseWindow.hWnd); + StretchDIBits(dc, filter->DestRect.left, filter->DestRect.top, + filter->DestRect.right - filter->DestRect.left, + filter->DestRect.bottom - filter->DestRect.top, + filter->SourceRect.left, filter->SourceRect.top, + filter->SourceRect.right - filter->SourceRect.left, + filter->SourceRect.bottom - filter->SourceRect.top, + pbSrcStream, (BITMAPINFO *)bih, DIB_RGB_COLORS, SRCCOPY); + ReleaseDC(filter->baseControlWindow.baseWindow.hWnd, dc); + return S_OK; }

1 0

Zebediah Figura : strmbase/renderer: Exit BaseRendererImpl_Receive() immediately if flush_event was signaled.
by Alexandre Julliard 22 Nov '19

22 Nov '19

Module: wine Branch: master Commit: 6072c66c5a42800a8624ea550fe1308cb27cfa4b URL: https://source.winehq.org/git/wine.git/?a=commit;h=6072c66c5a42800a8624ea55… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Nov 21 18:11:23 2019 -0600 strmbase/renderer: Exit BaseRendererImpl_Receive() immediately if flush_event was signaled. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/renderer.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 0c33b5ea84..aa134ba5da 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -394,15 +394,22 @@ HRESULT WINAPI BaseRendererImpl_Receive(struct strmbase_renderer *This, IMediaSa if (now - This->stream_start - start <= -10000) { HANDLE handles[2] = {This->advise_event, This->flush_event}; + DWORD ret; IReferenceClock_AdviseTime(This->filter.pClock, This->stream_start, start, (HEVENT)This->advise_event, &cookie); LeaveCriticalSection(&This->csRenderLock); - WaitForMultipleObjects(2, handles, FALSE, INFINITE); + ret = WaitForMultipleObjects(2, handles, FALSE, INFINITE); IReferenceClock_Unadvise(This->filter.pClock, cookie); + if (ret == 1) + { + TRACE("Flush signaled, discarding current sample.\n"); + return S_OK; + } + EnterCriticalSection(&This->csRenderLock); } }

1 0

Zebediah Figura : quartz/videorenderer: Make VideoRenderer_SendSampleData() infallible.
by Alexandre Julliard 22 Nov '19

22 Nov '19

Module: wine Branch: master Commit: 608acdc83ad44db1ec9301d48695d3ce24fcfd91 URL: https://source.winehq.org/git/wine.git/?a=commit;h=608acdc83ad44db1ec9301d4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Nov 21 18:11:22 2019 -0600 quartz/videorenderer: Make VideoRenderer_SendSampleData() infallible. We already rejected any other format types when connecting. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/videorenderer.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index b71d15a5d2..e38a773239 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -134,7 +134,7 @@ static void VideoRenderer_AutoShowWindow(VideoRendererImpl *This) ShowWindow(This->baseControlWindow.baseWindow.hWnd, SW_SHOW); } -static DWORD VideoRenderer_SendSampleData(VideoRendererImpl* This, LPBYTE data, DWORD size) +static void VideoRenderer_SendSampleData(VideoRendererImpl* This, LPBYTE data, DWORD size) { const AM_MEDIA_TYPE *amt = &This->renderer.sink.pin.mt; BITMAPINFOHEADER *bmiHeader; @@ -150,11 +150,6 @@ static DWORD VideoRenderer_SendSampleData(VideoRendererImpl* This, LPBYTE data, { bmiHeader = &((VIDEOINFOHEADER2 *)amt->pbFormat)->bmiHeader; } - else - { - FIXME("Unknown subtype %s.\n", debugstr_guid(&amt->subtype)); - return VFW_E_RUNTIME_ERROR; - } TRACE("Src Rect: %s\n", wine_dbgstr_rect(&This->SourceRect)); TRACE("Dst Rect: %s\n", wine_dbgstr_rect(&This->DestRect)); @@ -165,8 +160,6 @@ static DWORD VideoRenderer_SendSampleData(VideoRendererImpl* This, LPBYTE data, This->SourceRect.right - This->SourceRect.left, This->SourceRect.bottom - This->SourceRect.top, data, (BITMAPINFO *)bmiHeader, DIB_RGB_COLORS, SRCCOPY); ReleaseDC(This->baseControlWindow.baseWindow.hWnd, dc); - - return S_OK; } static HRESULT WINAPI VideoRenderer_ShouldDrawSampleNow(struct strmbase_renderer *filter,

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 21 Nov '19

21 Nov '19

Module: wine Branch: master Commit: 90fc020400c06c163d4ab117d8da755b0f0e0861 URL: https://source.winehq.org/git/wine.git/?a=commit;h=90fc020400c06c163d4ab117… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Nov 21 23:12:46 2019 +0200 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/po/fi.po b/po/fi.po index 77152ebd9e..962af5547a 100644 --- a/po/fi.po +++ b/po/fi.po @@ -621,7 +621,7 @@ msgstr "&Muokatut värit:" #: comdlg32.rc:289 msgid "|S&olid" -msgstr "" +msgstr "|&Tasainen" #: comdlg32.rc:290 msgid "&Red:" @@ -658,11 +658,9 @@ msgid "&Define Custom Colors >>" msgstr "M&äärittele väri >>" #: comdlg32.rc:312 -#, fuzzy -#| msgid "&No" msgctxt "Solid" msgid "&o" -msgstr "&Ei" +msgstr "&T" #: comdlg32.rc:318 regedit.rc:275 regedit.rc:285 msgid "Find"

1 0

Michael Stefaniuc : dmscript: Clarify TRACE in IsParamSupported method of Script track.
by Alexandre Julliard 21 Nov '19

21 Nov '19

Module: wine Branch: master Commit: cb4733e3b12b353bdc8cd84fdade7d720baaf5bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb4733e3b12b353bdc8cd84f… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Nov 21 22:16:03 2019 +0100 dmscript: Clarify TRACE in IsParamSupported method of Script track. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmscript/scripttrack.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/dmscript/scripttrack.c b/dlls/dmscript/scripttrack.c index 7035f2b57a..608e36bd90 100644 --- a/dlls/dmscript/scripttrack.c +++ b/dlls/dmscript/scripttrack.c @@ -139,14 +139,13 @@ static HRESULT WINAPI script_track_SetParam(IDirectMusicTrack8 *iface, REFGUID r return S_OK; } -static HRESULT WINAPI script_track_IsParamSupported(IDirectMusicTrack8 *iface, REFGUID rguidType) +static HRESULT WINAPI script_track_IsParamSupported(IDirectMusicTrack8 *iface, REFGUID type) { - DirectMusicScriptTrack *This = impl_from_IDirectMusicTrack8(iface); + DirectMusicScriptTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %s): param type not supported\n", This, debugstr_dmguid(type)); - TRACE("(%p, %s)\n", This, debugstr_dmguid(rguidType)); - /* didn't find any params */ - TRACE("param unsupported\n"); - return DMUS_E_TYPE_UNSUPPORTED; + return DMUS_E_TYPE_UNSUPPORTED; } static HRESULT WINAPI script_track_AddNotificationType(IDirectMusicTrack8 *iface, REFGUID type)

1 0

Michael Stefaniuc : dmscript/tests: Add some Script track tests.
by Alexandre Julliard 21 Nov '19

21 Nov '19

Module: wine Branch: master Commit: 8d32805dbc209c208d4cd6b99349512471aac161 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d32805dbc209c208d4cd6b9… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Nov 21 22:16:02 2019 +0100 dmscript/tests: Add some Script track tests. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmscript/tests/dmscript.c | 77 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 73 insertions(+), 4 deletions(-) diff --git a/dlls/dmscript/tests/dmscript.c b/dlls/dmscript/tests/dmscript.c index d372f39d9e..365b006025 100644 --- a/dlls/dmscript/tests/dmscript.c +++ b/dlls/dmscript/tests/dmscript.c @@ -203,18 +203,87 @@ static void test_dmscript(void) static void test_scripttrack(void) { - IDirectMusicTrack *dmt; + IDirectMusicTrack8 *dmt; IPersistStream *ps; CLSID class; ULARGE_INTEGER size; HRESULT hr; +#define X(guid) &guid, #guid + const struct { + REFGUID type; + const char *name; + } unsupported[] = { + { 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 + unsigned int i; hr = CoCreateInstance(&CLSID_DirectMusicScriptTrack, NULL, CLSCTX_INPROC_SERVER, - &IID_IDirectMusicTrack, (void**)&dmt); + &IID_IDirectMusicTrack8, (void**)&dmt); ok(hr == S_OK, "DirectMusicScriptTrack create failed: %08x, expected S_OK\n", hr); + /* IDirectMusicTrack8 */ + todo_wine { + hr = IDirectMusicTrack8_Init(dmt, NULL); + ok(hr == E_POINTER, "IDirectMusicTrack8_Init failed: %08x\n", hr); + hr = IDirectMusicTrack8_InitPlay(dmt, NULL, NULL, NULL, 0, 0); + ok(hr == E_POINTER, "IDirectMusicTrack8_InitPlay failed: %08x\n", hr); + hr = IDirectMusicTrack8_EndPlay(dmt, NULL); + ok(hr == E_POINTER, "IDirectMusicTrack8_EndPlay failed: %08x\n", hr); + hr = IDirectMusicTrack8_Play(dmt, NULL, 0, 0, 0, 0, NULL, NULL, 0); + ok(hr == E_POINTER, "IDirectMusicTrack8_Play failed: %08x\n", hr); + hr = IDirectMusicTrack8_GetParam(dmt, NULL, 0, NULL, NULL); + ok(hr == DMUS_E_GET_UNSUPPORTED, "IDirectMusicTrack8_GetParam failed: %08x\n", hr); + } + for (i = 0; i < ARRAY_SIZE(unsupported); i++) { + hr = IDirectMusicTrack8_IsParamSupported(dmt, unsupported[i].type); + ok(hr == DMUS_E_TYPE_UNSUPPORTED, + "IsParamSupported(%s) failed: %08x, expected DMUS_E_TYPE_UNSUPPORTED\n", + unsupported[i].name, hr); + } + hr = IDirectMusicTrack8_AddNotificationType(dmt, NULL); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_AddNotificationType failed: %08x\n", hr); + hr = IDirectMusicTrack8_RemoveNotificationType(dmt, NULL); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_RemoveNotificationType failed: %08x\n", hr); + hr = IDirectMusicTrack8_Clone(dmt, 0, 0, NULL); + todo_wine ok(hr == E_POINTER, "IDirectMusicTrack8_Clone failed: %08x\n", hr); + hr = IDirectMusicTrack8_PlayEx(dmt, NULL, 0, 0, 0, 0, NULL, NULL, 0); + todo_wine ok(hr == E_POINTER, "IDirectMusicTrack8_PlayEx failed: %08x\n", hr); + hr = IDirectMusicTrack8_Compose(dmt, NULL, 0, NULL); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_Compose failed: %08x\n", hr); + hr = IDirectMusicTrack8_Join(dmt, NULL, 0, NULL, 0, NULL); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_Join failed: %08x\n", hr); + /* IPersistStream */ - hr = IDirectMusicTrack_QueryInterface(dmt, &IID_IPersistStream, (void**)&ps); + hr = IDirectMusicTrack8_QueryInterface(dmt, &IID_IPersistStream, (void**)&ps); ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); hr = IPersistStream_GetClassID(ps, NULL); @@ -233,7 +302,7 @@ static void test_scripttrack(void) hr = IPersistStream_Save(ps, NULL, TRUE); ok(hr == E_NOTIMPL, "IPersistStream_Save failed: %08x\n", hr); - while (IDirectMusicTrack_Release(dmt)); + while (IDirectMusicTrack8_Release(dmt)); } struct chunk {

1 0

Michael Stefaniuc : dmscript: Implement unimplemented Script track methods.
by Alexandre Julliard 21 Nov '19

21 Nov '19

Module: wine Branch: master Commit: f9dff8f1cc69d14cffe5910931e48ec57a3ec4af URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9dff8f1cc69d14cffe59109… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Nov 21 22:16:01 2019 +0100 dmscript: Implement unimplemented Script track methods. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmscript/scripttrack.c | 48 +++++++++++++++++++++++++-------------------- 1 file changed, 27 insertions(+), 21 deletions(-) diff --git a/dlls/dmscript/scripttrack.c b/dlls/dmscript/scripttrack.c index 05c8f393a8..7035f2b57a 100644 --- a/dlls/dmscript/scripttrack.c +++ b/dlls/dmscript/scripttrack.c @@ -149,20 +149,22 @@ static HRESULT WINAPI script_track_IsParamSupported(IDirectMusicTrack8 *iface, R return DMUS_E_TYPE_UNSUPPORTED; } -static HRESULT WINAPI script_track_AddNotificationType(IDirectMusicTrack8 *iface, - REFGUID rguidNotificationType) +static HRESULT WINAPI script_track_AddNotificationType(IDirectMusicTrack8 *iface, REFGUID type) { - DirectMusicScriptTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s): stub\n", This, debugstr_dmguid(rguidNotificationType)); - return S_OK; + DirectMusicScriptTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %s): method not implemented\n", This, debugstr_dmguid(type)); + + return E_NOTIMPL; } -static HRESULT WINAPI script_track_RemoveNotificationType(IDirectMusicTrack8 *iface, - REFGUID rguidNotificationType) +static HRESULT WINAPI script_track_RemoveNotificationType(IDirectMusicTrack8 *iface, REFGUID type) { - DirectMusicScriptTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s): stub\n", This, debugstr_dmguid(rguidNotificationType)); - return S_OK; + DirectMusicScriptTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %s): method not implemented\n", This, debugstr_dmguid(type)); + + return E_NOTIMPL; } static HRESULT WINAPI script_track_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME mtStart, @@ -202,21 +204,25 @@ static HRESULT WINAPI script_track_SetParamEx(IDirectMusicTrack8 *iface, REFGUID return S_OK; } -static HRESULT WINAPI script_track_Compose(IDirectMusicTrack8 *iface, IUnknown *pContext, - DWORD dwTrackGroup, IDirectMusicTrack **ppResultTrack) +static HRESULT WINAPI script_track_Compose(IDirectMusicTrack8 *iface, IUnknown *context, + DWORD group, IDirectMusicTrack **res_track) { - DirectMusicScriptTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %d, %p): stub\n", This, pContext, dwTrackGroup, ppResultTrack); - return S_OK; + DirectMusicScriptTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %p, %d, %p): method not implemented\n", This, context, group, res_track); + + return E_NOTIMPL; } -static HRESULT WINAPI script_track_Join(IDirectMusicTrack8 *iface, IDirectMusicTrack *pNewTrack, - MUSIC_TIME mtJoin, IUnknown *pContext, DWORD dwTrackGroup, - IDirectMusicTrack **ppResultTrack) +static HRESULT WINAPI script_track_Join(IDirectMusicTrack8 *iface, IDirectMusicTrack *track2, + MUSIC_TIME join, IUnknown *context, DWORD group, IDirectMusicTrack **res_track) { - DirectMusicScriptTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %d, %p, %d, %p): stub\n", This, pNewTrack, mtJoin, pContext, dwTrackGroup, ppResultTrack); - return S_OK; + DirectMusicScriptTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %p, %d, %p, %d, %p): method not implemented\n", This, track2, join, context, + group, res_track); + + return E_NOTIMPL; } static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = {

1 0

Francois Gouget : user32/test: Start the AdjustWindowRectExForDpi() from a known state.
by Alexandre Julliard 21 Nov '19

21 Nov '19

Module: wine Branch: master Commit: c56116aa37a9726741fd04818ebea5b265d65321 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c56116aa37a9726741fd0481… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Nov 21 17:15:19 2019 +0100 user32/test: Start the AdjustWindowRectExForDpi() from a known state. rect and rect2 have been modified by the previous test by the time we get to AdjustWindowRectExForDpi(). This makes interpreting the traces harder in case of a failure. So reset them to the same starting state as for the AdjustWindowRectEx() test. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 78dc55f00a..b9309a8cba 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -5407,6 +5407,8 @@ static void test_AWR_flags(void) style, exstyle, wine_dbgstr_rect( &rect ), wine_dbgstr_rect( &rect2 )); if (pAdjustWindowRectExForDpi) { + SetRect( &rect, 100, 100, 200, 200 ); + rect2 = rect; pAdjustWindowRectExForDpi( &rect, style, FALSE, exstyle, 192 ); wine_AdjustWindowRectExForDpi( &rect2, style, FALSE, exstyle, 192 ); ok( EqualRect( &rect, &rect2 ), "%08x %08x rects do not match: win %s wine %s\n",

1 0

← Newer
1
...
33
34
35
36
37
38
39
...
90
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2019