October 2019 - Wine-Commits

Zebediah Figura : quartz/videorenderer: Implement IOverlay::GetWindowHandle().
by Alexandre Julliard Oct. 2, 2019

Oct. 2, 2019

Module: wine Branch: master Commit: 7fda84e72bb1502061fc9dd5364cf6d824b7e0ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=7fda84e72bb1502061fc9dd5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Oct 1 22:43:14 2019 -0500 quartz/videorenderer: Implement IOverlay::GetWindowHandle(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/videorenderer.c | 26 ++++++++++++++++++++++++++ dlls/quartz/videorenderer.c | 8 ++++++-- 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index 728c7b4180..c2eb16f0cc 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -1321,6 +1321,31 @@ static void test_unconnected_filter_state(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_overlay(void) +{ + IBaseFilter *filter = create_video_renderer(); + IOverlay *overlay; + HRESULT hr; + ULONG ref; + IPin *pin; + HWND hwnd; + + IBaseFilter_FindPin(filter, sink_id, &pin); + + hr = IPin_QueryInterface(pin, &IID_IOverlay, (void **)&overlay); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hwnd = (HWND)0xdeadbeef; + hr = IOverlay_GetWindowHandle(overlay, &hwnd); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hwnd && hwnd != (HWND)0xdeadbeef, "Got invalid window %p.\n", hwnd); + + IOverlay_Release(overlay); + IPin_Release(pin); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(videorenderer) { CoInitialize(NULL); @@ -1334,6 +1359,7 @@ START_TEST(videorenderer) test_enum_media_types(); test_unconnected_filter_state(); test_connect_pin(); + test_overlay(); CoUninitialize(); } diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index e2d80642d2..429b59bfe3 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -854,8 +854,12 @@ static HRESULT WINAPI overlay_SetColorKey(IOverlay *iface, COLORKEY *key) static HRESULT WINAPI overlay_GetWindowHandle(IOverlay *iface, HWND *window) { - FIXME("iface %p, window %p, stub!\n", iface, window); - return E_NOTIMPL; + VideoRendererImpl *filter = impl_from_IOverlay(iface); + + TRACE("filter %p, window %p.\n", filter, window); + + *window = filter->baseControlWindow.baseWindow.hWnd; + return S_OK; } static HRESULT WINAPI overlay_GetClipList(IOverlay *iface, RECT *source, RECT *dest, RGNDATA **region)

1 0

Zebediah Figura : d3d8: Handle stateblocks in d3d8_device_SetPixelShader().
by Alexandre Julliard Oct. 2, 2019

Oct. 2, 2019

Module: wine Branch: master Commit: 041181f1dcf83425718fd97581343379a5ce058c URL: https://source.winehq.org/git/wine.git/?a=commit;h=041181f1dcf83425718fd975… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Oct 1 20:03:50 2019 -0500 d3d8: Handle stateblocks in d3d8_device_SetPixelShader(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index eabefd8043..011364ccbc 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -3144,7 +3144,9 @@ static HRESULT WINAPI d3d8_device_SetPixelShader(IDirect3DDevice8 *iface, DWORD if (!shader) { - wined3d_device_set_pixel_shader(device->wined3d_device, NULL); + wined3d_stateblock_set_pixel_shader(device->update_state, NULL); + if (!device->recording) + wined3d_device_set_pixel_shader(device->wined3d_device, NULL); wined3d_mutex_unlock(); return D3D_OK; } @@ -3157,7 +3159,9 @@ static HRESULT WINAPI d3d8_device_SetPixelShader(IDirect3DDevice8 *iface, DWORD } TRACE("Setting shader %p.\n", shader_impl); - wined3d_device_set_pixel_shader(device->wined3d_device, shader_impl->wined3d_shader); + wined3d_stateblock_set_pixel_shader(device->update_state, shader_impl->wined3d_shader); + if (!device->recording) + wined3d_device_set_pixel_shader(device->wined3d_device, shader_impl->wined3d_shader); wined3d_mutex_unlock(); return D3D_OK;

1 0

Piotr Caban : winebus.sys: Make device_id string more similar to native.
by Alexandre Julliard Oct. 2, 2019

Oct. 2, 2019

Module: wine Branch: master Commit: 5e8eb5f4c54c3a6d3c92fd414372da2fbd5bd91a URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e8eb5f4c54c3a6d3c92fd41… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 2 19:59:58 2019 +0200 winebus.sys: Make device_id string more similar to native. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 5b9900c70d..98ed890af8 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -182,7 +182,7 @@ static WCHAR *get_device_id(DEVICE_OBJECT *device) static const WCHAR formatW[] = {'%','s','\\','v','i','d','_','%','0','4','x', '&','p','i','d','_','%','0','4','x',0}; static const WCHAR format_inputW[] = {'%','s','\\','v','i','d','_','%','0','4','x', - '&','p','i','d','_','%','0','4','x','&','%','s','_','%','i',0}; + '&','p','i','d','_','%','0','4','x','&','%','s','_','%','0','2','i',0}; struct device_extension *ext = (struct device_extension *)device->DeviceExtension; DWORD len = strlenW(ext->busid) + 34; WCHAR *dst;

1 0

Zebediah Figura : quartz/tests: Add a test for filter graph threading.
by Alexandre Julliard Oct. 2, 2019

Oct. 2, 2019

Module: wine Branch: master Commit: e584a5b4c4820452e1f1aa47252e413b1294483c URL: https://source.winehq.org/git/wine.git/?a=commit;h=e584a5b4c4820452e1f1aa47… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Oct 1 22:43:15 2019 -0500 quartz/tests: Add a test for filter graph threading. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 93 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 93 insertions(+) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index c781a52857..6c357041f2 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -4015,6 +4015,98 @@ static void test_add_source_filter(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static HWND get_renderer_hwnd(IFilterGraph2 *graph) +{ + IEnumFilters *enum_filters; + IEnumPins *enum_pins; + IBaseFilter *filter; + IOverlay *overlay; + HWND hwnd = NULL; + HRESULT hr; + IPin *pin; + + hr = IFilterGraph2_EnumFilters(graph, &enum_filters); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + while (IEnumFilters_Next(enum_filters, 1, &filter, NULL) == S_OK) + { + hr = IBaseFilter_EnumPins(filter, &enum_pins); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IEnumPins_Next(enum_pins, 1, &pin, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IEnumPins_Release(enum_pins); + + if (SUCCEEDED(IPin_QueryInterface(pin, &IID_IOverlay, (void **)&overlay))) + { + hr = IOverlay_GetWindowHandle(overlay, &hwnd); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IOverlay_Release(overlay); + } + + IPin_Release(pin); + IBaseFilter_Release(filter); + } + + IEnumFilters_Release(enum_filters); + + return hwnd; +} + +static void test_window_threading(void) +{ + WCHAR *filename = load_resource(avifile); + IFilterGraph2 *graph = create_graph(); + HRESULT hr; + DWORD tid; + ULONG ref; + HWND hwnd; + BOOL ret; + + hr = IFilterGraph2_RenderFile(graph, filename, NULL); + if (FAILED(hr)) + { + skip("Cannot render test file, hr %#x.\n", hr); + IFilterGraph2_Release(graph); + DeleteFileW(filename); + return; + } + ok(hr == S_OK, "Got hr %#x.\n", hr); + + if ((hwnd = get_renderer_hwnd(graph))) + { + tid = GetWindowThreadProcessId(hwnd, NULL); + ok(tid != GetCurrentThreadId(), "Window should have been created on a separate thread.\n"); + + /* The thread should be processing messages, or this will hang. */ + SendMessageA(hwnd, WM_NULL, 0, 0); + } + else + skip("Could not find renderer window.\n"); + + ref = IFilterGraph2_Release(graph); + ok(!ref, "Got outstanding refcount %d.\n", ref); + + hr = CoCreateInstance(&CLSID_FilterGraphNoThread, NULL, CLSCTX_INPROC_SERVER, + &IID_IFilterGraph2, (void **)&graph); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IFilterGraph2_RenderFile(graph, filename, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + if ((hwnd = get_renderer_hwnd(graph))) + { + tid = GetWindowThreadProcessId(hwnd, NULL); + todo_wine ok(tid == GetCurrentThreadId(), "Window should be created on main thread.\n"); + } + else + skip("Could not find renderer window.\n"); + + ref = IFilterGraph2_Release(graph); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ret = DeleteFileW(filename); + ok(ret, "Failed to delete file, error %u.\n", GetLastError()); +} + START_TEST(filtergraph) { CoInitializeEx(NULL, COINIT_MULTITHREADED); @@ -4037,6 +4129,7 @@ START_TEST(filtergraph) test_graph_seeking(); test_default_sync_source(); test_add_source_filter(); + test_window_threading(); CoUninitialize(); test_render_with_multithread();

1 0

Zebediah Figura : wined3d: Introduce wined3d_stateblock_set_ps_consts_f().
by Alexandre Julliard Oct. 2, 2019

Oct. 2, 2019

Module: wine Branch: master Commit: a84a8522d9ff935e69c8b802467543fa53ebf745 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a84a8522d9ff935e69c8b802… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Oct 1 20:03:51 2019 -0500 wined3d: Introduce wined3d_stateblock_set_ps_consts_f(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/stateblock.c | 14 ++++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 3 files changed, 17 insertions(+) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 1ee64b3224..64a900fbde 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1352,6 +1352,20 @@ void CDECL wined3d_stateblock_set_pixel_shader(struct wined3d_stateblock *stateb stateblock->changed.pixelShader = TRUE; } +HRESULT CDECL wined3d_stateblock_set_ps_consts_f(struct wined3d_stateblock *stateblock, + unsigned int start_idx, unsigned int count, const struct wined3d_vec4 *constants) +{ + TRACE("stateblock %p, start_idx %u, count %u, constants %p.\n", + stateblock, start_idx, count, constants); + + if (!constants || start_idx >= WINED3D_MAX_PS_CONSTS_F || count > WINED3D_MAX_PS_CONSTS_F - start_idx) + return WINED3DERR_INVALIDCALL; + + memcpy(&stateblock->stateblock_state.ps_consts_f[start_idx], constants, count * sizeof(*constants)); + memset(&stateblock->changed.ps_consts_f[start_idx], 1, count * sizeof(*stateblock->changed.ps_consts_f)); + return WINED3D_OK; +} + void CDECL wined3d_stateblock_set_vertex_declaration(struct wined3d_stateblock *stateblock, struct wined3d_vertex_declaration *declaration) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 6e6f50a7e1..016cf55c03 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -259,6 +259,7 @@ @ cdecl wined3d_stateblock_decref(ptr) @ cdecl wined3d_stateblock_incref(ptr) @ cdecl wined3d_stateblock_set_pixel_shader(ptr ptr) +@ cdecl wined3d_stateblock_set_ps_consts_f(ptr long long ptr) @ cdecl wined3d_stateblock_set_vertex_declaration(ptr ptr) @ cdecl wined3d_stateblock_set_vertex_shader(ptr ptr) @ cdecl wined3d_stateblock_set_vs_consts_b(ptr long long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 2f6e7f3bc0..c4c469d4fe 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2661,6 +2661,8 @@ HRESULT __cdecl wined3d_stateblock_create(struct wined3d_device *device, ULONG __cdecl wined3d_stateblock_decref(struct wined3d_stateblock *stateblock); ULONG __cdecl wined3d_stateblock_incref(struct wined3d_stateblock *stateblock); void __cdecl wined3d_stateblock_set_pixel_shader(struct wined3d_stateblock *stateblock, struct wined3d_shader *shader); +HRESULT __cdecl wined3d_stateblock_set_ps_consts_f(struct wined3d_stateblock *stateblock, + unsigned int start_idx, unsigned int count, const struct wined3d_vec4 *constants); void __cdecl wined3d_stateblock_set_vertex_declaration(struct wined3d_stateblock *stateblock, struct wined3d_vertex_declaration *declaration); void __cdecl wined3d_stateblock_set_vertex_shader(struct wined3d_stateblock *stateblock, struct wined3d_shader *shader);

1 0

Zebediah Figura : quartz/videorenderer: Add a stub IOverlay interface to the sink pin.
by Alexandre Julliard Oct. 2, 2019

Oct. 2, 2019

Module: wine Branch: master Commit: c581404d31359097711a088fb949df9d6bd064e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c581404d31359097711a088f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Oct 1 22:43:13 2019 -0500 quartz/videorenderer: Add a stub IOverlay interface to the sink pin. This is not used by any application I know of, but is useful for testing. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/videorenderer.c | 2 +- dlls/quartz/videorenderer.c | 118 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 119 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index 54275cc234..728c7b4180 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -102,7 +102,7 @@ static void test_interfaces(void) IBaseFilter_FindPin(filter, sink_id, &pin); check_interface(pin, &IID_IMemInputPin, TRUE); - todo_wine check_interface(pin, &IID_IOverlay, TRUE); + check_interface(pin, &IID_IOverlay, TRUE); check_interface(pin, &IID_IPin, TRUE); todo_wine check_interface(pin, &IID_IPinConnection, TRUE); todo_wine check_interface(pin, &IID_IQualityControl, TRUE); diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index a7b3159ebc..e2d80642d2 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -42,6 +42,8 @@ typedef struct VideoRendererImpl BaseControlWindow baseControlWindow; BaseControlVideo baseControlVideo; + IOverlay IOverlay_iface; + BOOL init; HANDLE hThread; @@ -401,6 +403,19 @@ static HRESULT video_renderer_query_interface(BaseRenderer *iface, REFIID iid, v return S_OK; } +static HRESULT video_renderer_pin_query_interface(BaseRenderer *iface, REFIID iid, void **out) +{ + VideoRendererImpl *filter = impl_from_BaseRenderer(iface); + + if (IsEqualGUID(iid, &IID_IOverlay)) + *out = &filter->IOverlay_iface; + else + return E_NOINTERFACE; + + IUnknown_AddRef((IUnknown *)*out); + return S_OK; +} + static void video_renderer_stop_stream(BaseRenderer *iface) { VideoRendererImpl *This = impl_from_BaseRenderer(iface); @@ -475,6 +490,7 @@ static const BaseRendererFuncTable BaseFuncTable = .pfnEndFlush = VideoRenderer_EndFlush, .renderer_destroy = video_renderer_destroy, .renderer_query_interface = video_renderer_query_interface, + .renderer_pin_query_interface = video_renderer_pin_query_interface, }; static const BaseWindowFuncTable renderer_BaseWindowFuncTable = { @@ -783,6 +799,106 @@ static const IVideoWindowVtbl IVideoWindow_VTable = BaseControlWindowImpl_IsCursorHidden }; +static inline VideoRendererImpl *impl_from_IOverlay(IOverlay *iface) +{ + return CONTAINING_RECORD(iface, VideoRendererImpl, IOverlay_iface); +} + +static HRESULT WINAPI overlay_QueryInterface(IOverlay *iface, REFIID iid, void **out) +{ + VideoRendererImpl *filter = impl_from_IOverlay(iface); + return IPin_QueryInterface(&filter->renderer.sink.pin.IPin_iface, iid, out); +} + +static ULONG WINAPI overlay_AddRef(IOverlay *iface) +{ + VideoRendererImpl *filter = impl_from_IOverlay(iface); + return IPin_AddRef(&filter->renderer.sink.pin.IPin_iface); +} + +static ULONG WINAPI overlay_Release(IOverlay *iface) +{ + VideoRendererImpl *filter = impl_from_IOverlay(iface); + return IPin_Release(&filter->renderer.sink.pin.IPin_iface); +} + +static HRESULT WINAPI overlay_GetPalette(IOverlay *iface, DWORD *count, PALETTEENTRY **palette) +{ + FIXME("iface %p, count %p, palette %p, stub!\n", iface, count, palette); + return E_NOTIMPL; +} + +static HRESULT WINAPI overlay_SetPalette(IOverlay *iface, DWORD count, PALETTEENTRY *palette) +{ + FIXME("iface %p, count %u, palette %p, stub!\n", iface, count, palette); + return E_NOTIMPL; +} + +static HRESULT WINAPI overlay_GetDefaultColorKey(IOverlay *iface, COLORKEY *key) +{ + FIXME("iface %p, key %p, stub!\n", iface, key); + return E_NOTIMPL; +} + +static HRESULT WINAPI overlay_GetColorKey(IOverlay *iface, COLORKEY *key) +{ + FIXME("iface %p, key %p, stub!\n", iface, key); + return E_NOTIMPL; +} + +static HRESULT WINAPI overlay_SetColorKey(IOverlay *iface, COLORKEY *key) +{ + FIXME("iface %p, key %p, stub!\n", iface, key); + return E_NOTIMPL; +} + +static HRESULT WINAPI overlay_GetWindowHandle(IOverlay *iface, HWND *window) +{ + FIXME("iface %p, window %p, stub!\n", iface, window); + return E_NOTIMPL; +} + +static HRESULT WINAPI overlay_GetClipList(IOverlay *iface, RECT *source, RECT *dest, RGNDATA **region) +{ + FIXME("iface %p, source %p, dest %p, region %p, stub!\n", iface, source, dest, region); + return E_NOTIMPL; +} + +static HRESULT WINAPI overlay_GetVideoPosition(IOverlay *iface, RECT *source, RECT *dest) +{ + FIXME("iface %p, source %p, dest %p, stub!\n", iface, source, dest); + return E_NOTIMPL; +} + +static HRESULT WINAPI overlay_Advise(IOverlay *iface, IOverlayNotify *sink, DWORD flags) +{ + FIXME("iface %p, sink %p, flags %#x, stub!\n", iface, sink, flags); + return E_NOTIMPL; +} + +static HRESULT WINAPI overlay_Unadvise(IOverlay *iface) +{ + FIXME("iface %p, stub!\n", iface); + return E_NOTIMPL; +} + +static const IOverlayVtbl overlay_vtbl = +{ + overlay_QueryInterface, + overlay_AddRef, + overlay_Release, + overlay_GetPalette, + overlay_SetPalette, + overlay_GetDefaultColorKey, + overlay_GetColorKey, + overlay_SetColorKey, + overlay_GetWindowHandle, + overlay_GetClipList, + overlay_GetVideoPosition, + overlay_Advise, + overlay_Unadvise, +}; + HRESULT VideoRenderer_create(IUnknown *outer, void **out) { static const WCHAR sink_name[] = {'I','n',0}; @@ -799,6 +915,8 @@ HRESULT VideoRenderer_create(IUnknown *outer, void **out) ZeroMemory(&pVideoRenderer->WindowPos, sizeof(RECT)); pVideoRenderer->FullScreenMode = OAFALSE; + pVideoRenderer->IOverlay_iface.lpVtbl = &overlay_vtbl; + hr = strmbase_renderer_init(&pVideoRenderer->renderer, &VideoRenderer_Vtbl, outer, &CLSID_VideoRenderer, sink_name, &BaseFuncTable);

1 0

Zebediah Figura : strmbase: Add a callback to expose renderer pin interfaces.
by Alexandre Julliard Oct. 2, 2019

Oct. 2, 2019

Module: wine Branch: master Commit: 5757a07fc20d95d146617377700aaff96d0fb6b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5757a07fc20d95d146617377… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Oct 1 22:43:12 2019 -0500 strmbase: Add a callback to expose renderer pin interfaces. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/renderer.c | 5 +++++ include/wine/strmbase.h | 1 + 2 files changed, 6 insertions(+) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 1de974a909..25534154e9 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -220,6 +220,11 @@ static HRESULT sink_query_accept(struct strmbase_pin *pin, const AM_MEDIA_TYPE * static HRESULT sink_query_interface(struct strmbase_pin *iface, REFIID iid, void **out) { BaseRenderer *filter = impl_from_IPin(&iface->IPin_iface); + HRESULT hr; + + if (filter->pFuncsTable->renderer_pin_query_interface + && SUCCEEDED(hr = filter->pFuncsTable->renderer_pin_query_interface(filter, iid, out))) + return hr; if (IsEqualGUID(iid, &IID_IMemInputPin)) *out = &filter->sink.IMemInputPin_iface; diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 6a358decfc..5eaf204f47 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -574,6 +574,7 @@ typedef struct BaseRendererFuncTable { BaseRenderer_EndFlush pfnEndFlush; void (*renderer_destroy)(BaseRenderer *iface); HRESULT (*renderer_query_interface)(BaseRenderer *iface, REFIID iid, void **out); + HRESULT (*renderer_pin_query_interface)(BaseRenderer *iface, REFIID iid, void **out); } BaseRendererFuncTable; HRESULT WINAPI BaseRendererImpl_Receive(BaseRenderer *This, IMediaSample * pSample);

1 0

Matteo Bruni : d3dx9: Fix pitch passed to DXTn [de]compression functions.
by Alexandre Julliard Oct. 2, 2019

Oct. 2, 2019

Module: wine Branch: master Commit: 9069913dbba0914b80544ce4afb9e7285efad2a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9069913dbba0914b80544ce4… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Oct 2 20:22:08 2019 +0200 d3dx9: Fix pitch passed to DXTn [de]compression functions. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47862 Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/surface.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index b47509aa38..29325d5c0a 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -1972,6 +1972,8 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, int i, int j, void *texel); unsigned int x, y; + src_pitch = src_pitch * srcformatdesc->block_width / srcformatdesc->block_byte_count; + src_uncompressed = heap_alloc(src_size.width * src_size.height * sizeof(DWORD)); if (!src_uncompressed) { @@ -2003,8 +2005,7 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, DWORD *ptr = &src_uncompressed[y * src_size.width]; for (x = 0; x < src_size.width; ++x) { - fetch_dxt_texel(src_pitch / sizeof(DWORD), src_memory, - x + src_rect->left, y + src_rect->top, ptr); + fetch_dxt_texel(src_pitch, src_memory, x + src_rect->left, y + src_rect->top, ptr); ++ptr; } } @@ -2080,7 +2081,8 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, ERR("Unexpected destination compressed format %u.\n", surfdesc.Format); } tx_compress_dxtn(4, dst_size_aligned.width, dst_size_aligned.height, - dst_uncompressed, gl_format, lockrect.pBits, lockrect.Pitch); + dst_uncompressed, gl_format, lockrect.pBits, + lockrect.Pitch * destformatdesc->block_width / destformatdesc->block_byte_count); heap_free(dst_uncompressed); } }

1 0

Matteo Bruni : maintainers: Drop Sebastian Lackner as a maintainer.
by Alexandre Julliard Oct. 2, 2019

Oct. 2, 2019

Module: wine Branch: master Commit: 99719dff1f16604cf6b69a1813806a2c4e58a847 URL: https://source.winehq.org/git/wine.git/?a=commit;h=99719dff1f16604cf6b69a18… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Oct 2 20:22:10 2019 +0200 maintainers: Drop Sebastian Lackner as a maintainer. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 344282727f..6606d30ca7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -205,10 +205,6 @@ P: Andrew Eikum <aeikum(a)codeweavers.com> P: Huw Davies <huw(a)codeweavers.com> F: dlls/oleaut32/typelib.c -OpenMP -M: Sebastian Lackner <sebastian(a)fds-team.de> -F: dlls/vcomp*/ - Postscript Driver M: Huw Davies <huw(a)codeweavers.com> F: dlls/wineps.drv/ @@ -229,14 +225,6 @@ P: Huw Davies <huw(a)codeweavers.com> F: dlls/rpcrt4 F: tools/widl -Threadpool -M: Sebastian Lackner <sebastian(a)fds-team.de> -F: dlls/ntdll/threadpool.c - -Timezone database -M: Sebastian Lackner <sebastian(a)fds-team.de> -F: loader/wine.inf.in - TWAIN P: Vincent Povirk <vincent(a)codeweavers.com> F: dlls/twain_32/ @@ -278,7 +266,6 @@ F: dlls/wmiutils/ Wine server, IPC M: Alexandre Julliard <julliard(a)winehq.org> -P: Sebastian Lackner <sebastian(a)fds-team.de> P: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> F: server/ @@ -314,7 +301,6 @@ P: Alex Henrie <alexhenrie24(a)gmail.com> P: Andrew Eikum <aeikum(a)codeweavers.com> P: Huw Davies <huw(a)codeweavers.com> P: Jacek Caban <jacek(a)codeweavers.com> -P: Sebastian Lackner <sebastian(a)fds-team.de> P: Vincent Povirk <vincent(a)codeweavers.com> P: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> F: *

1 0

Alistair Leslie-Hughes : dmime: Always set a minimum timeout in IDirectMusicPerformance8::SetNotificationHandle.
by Alexandre Julliard Oct. 2, 2019

Oct. 2, 2019

Module: wine Branch: master Commit: 955ac888496fe4514e383638a219251e827b97b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=955ac888496fe4514e383638… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Oct 2 22:10:11 2019 +0200 dmime: Always set a minimum timeout in IDirectMusicPerformance8::SetNotificationHandle. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/performance.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index b7b4d01017..399b9b9919 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -519,12 +519,16 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_SetGraph(IDirectMusicPerforma static HRESULT WINAPI IDirectMusicPerformance8Impl_SetNotificationHandle(IDirectMusicPerformance8 *iface, HANDLE hNotification, REFERENCE_TIME rtMinimum) { - IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); + IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); - FIXME("(%p, %p, 0x%s): stub\n", This, hNotification, wine_dbgstr_longlong(rtMinimum)); - This->hNotification = hNotification; - if (rtMinimum) This->rtMinimum = rtMinimum; - return S_OK; + TRACE("(%p, %p, 0x%s)\n", This, hNotification, wine_dbgstr_longlong(rtMinimum)); + + This->hNotification = hNotification; + if (rtMinimum) + This->rtMinimum = rtMinimum; + else if (!This->rtMinimum) + This->rtMinimum = 20000000; /* 2 seconds */ + return S_OK; } static HRESULT WINAPI IDirectMusicPerformance8Impl_GetNotificationPMsg(IDirectMusicPerformance8 *iface,

1 0