March 2019 - Wine-Commits - list.winehq.org

Stefan Dösinger : ddraw: Protect against invalid clipper pointers.
by Alexandre Julliard March 13, 2019

March 13, 2019

Module: wine Branch: master Commit: f8361d27e4912193ed8ecdf302d3df250e9480e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f8361d27e4912193ed8ecdf3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Mar 13 13:18:31 2019 +0100 ddraw: Protect against invalid clipper pointers. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/clipper.c | 67 +++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 64 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/clipper.c b/dlls/ddraw/clipper.c index 01cac40..e4b7ec2 100644 --- a/dlls/ddraw/clipper.c +++ b/dlls/ddraw/clipper.c @@ -26,17 +26,43 @@ WINE_DEFAULT_DEBUG_CHANNEL(ddraw); +static const struct IDirectDrawClipperVtbl ddraw_clipper_vtbl; + static inline struct ddraw_clipper *impl_from_IDirectDrawClipper(IDirectDrawClipper *iface) { return CONTAINING_RECORD(iface, struct ddraw_clipper, IDirectDrawClipper_iface); } +static BOOL ddraw_clipper_is_valid(const struct ddraw_clipper *clipper) +{ + /* Native is very lenient when you invoke the clipper methods with a clipper pointer that + * points to something that is either not accessible or not a clipper, or if you break + * a clipper after assigning it to a surface. Deus Ex: Goty depends on this. */ + + if (IsBadReadPtr(clipper, sizeof(*clipper))) + { + WARN("The application gave us an invalid clipper pointer %p.\n", clipper); + return FALSE; + } + if (clipper->IDirectDrawClipper_iface.lpVtbl != &ddraw_clipper_vtbl) + { + WARN("The clipper vtable is modified: %p, expected %p.\n", + clipper->IDirectDrawClipper_iface.lpVtbl, &ddraw_clipper_vtbl); + return FALSE; + } + + return TRUE; +} + static HRESULT WINAPI ddraw_clipper_QueryInterface(IDirectDrawClipper *iface, REFIID iid, void **object) { struct ddraw_clipper *clipper = impl_from_IDirectDrawClipper(iface); TRACE("iface %p, iid %s, object %p.\n", iface, debugstr_guid(iid), object); + if (!ddraw_clipper_is_valid(clipper)) + return DDERR_INVALIDPARAMS; + if (IsEqualGUID(&IID_IDirectDrawClipper, iid) || IsEqualGUID(&IID_IUnknown, iid)) { @@ -54,17 +80,31 @@ static HRESULT WINAPI ddraw_clipper_QueryInterface(IDirectDrawClipper *iface, RE static ULONG WINAPI ddraw_clipper_AddRef(IDirectDrawClipper *iface) { struct ddraw_clipper *clipper = impl_from_IDirectDrawClipper(iface); - ULONG refcount = InterlockedIncrement(&clipper->ref); + ULONG refcount; - TRACE("%p increasing refcount to %u.\n", clipper, refcount); + if (!ddraw_clipper_is_valid(clipper)) + { + WARN("Invalid clipper, returning 0.\n"); + return 0; + } + refcount = InterlockedIncrement(&clipper->ref); + TRACE("%p increasing refcount to %u.\n", clipper, refcount); return refcount; } static ULONG WINAPI ddraw_clipper_Release(IDirectDrawClipper *iface) { struct ddraw_clipper *clipper = impl_from_IDirectDrawClipper(iface); - ULONG refcount = InterlockedDecrement(&clipper->ref); + ULONG refcount; + + if (!ddraw_clipper_is_valid(clipper)) + { + WARN("Invalid clipper, returning 0.\n"); + return 0; + } + + refcount = InterlockedDecrement(&clipper->ref); TRACE("%p decreasing refcount to %u.\n", clipper, refcount); @@ -72,6 +112,7 @@ static ULONG WINAPI ddraw_clipper_Release(IDirectDrawClipper *iface) { if (clipper->region) DeleteObject(clipper->region); + clipper->IDirectDrawClipper_iface.lpVtbl = NULL; /* Should help with detecting freed clippers. */ heap_free(clipper); } @@ -84,6 +125,9 @@ static HRESULT WINAPI ddraw_clipper_SetHWnd(IDirectDrawClipper *iface, DWORD fla TRACE("iface %p, flags %#x, window %p.\n", iface, flags, window); + if (!ddraw_clipper_is_valid(clipper)) + return DDERR_INVALIDPARAMS; + if (flags) { FIXME("flags %#x, not supported.\n", flags); @@ -161,6 +205,9 @@ static HRESULT WINAPI ddraw_clipper_GetClipList(IDirectDrawClipper *iface, RECT TRACE("iface %p, rect %s, clip_list %p, clip_list_size %p.\n", iface, wine_dbgstr_rect(rect), clip_list, clip_list_size); + if (!ddraw_clipper_is_valid(clipper)) + return DDERR_INVALIDPARAMS; + wined3d_mutex_lock(); if (clipper->window) @@ -238,6 +285,9 @@ static HRESULT WINAPI ddraw_clipper_SetClipList(IDirectDrawClipper *iface, RGNDA TRACE("iface %p, region %p, flags %#x.\n", iface, region, flags); + if (!ddraw_clipper_is_valid(clipper)) + return DDERR_INVALIDPARAMS; + wined3d_mutex_lock(); if (clipper->window) @@ -268,6 +318,9 @@ static HRESULT WINAPI ddraw_clipper_GetHWnd(IDirectDrawClipper *iface, HWND *win TRACE("iface %p, window %p.\n", iface, window); + if (!ddraw_clipper_is_valid(clipper)) + return DDERR_INVALIDPARAMS; + wined3d_mutex_lock(); *window = clipper->window; wined3d_mutex_unlock(); @@ -282,6 +335,9 @@ static HRESULT WINAPI ddraw_clipper_Initialize(IDirectDrawClipper *iface, TRACE("iface %p, ddraw %p, flags %#x.\n", iface, ddraw, flags); + if (!ddraw_clipper_is_valid(clipper)) + return DDERR_INVALIDPARAMS; + wined3d_mutex_lock(); if (clipper->initialized) { @@ -297,8 +353,13 @@ static HRESULT WINAPI ddraw_clipper_Initialize(IDirectDrawClipper *iface, static HRESULT WINAPI ddraw_clipper_IsClipListChanged(IDirectDrawClipper *iface, BOOL *changed) { + struct ddraw_clipper *clipper = impl_from_IDirectDrawClipper(iface); + FIXME("iface %p, changed %p stub!\n", iface, changed); + if (!ddraw_clipper_is_valid(clipper)) + return DDERR_INVALIDPARAMS; + /* XXX What is safest? */ *changed = FALSE;

1 0

Matteo Bruni : d3d8: Validate vertex stride in Draw[Indexed]PrimitiveUP().
by Alexandre Julliard March 13, 2019

March 13, 2019

Module: wine Branch: master Commit: 59e32ecbbe7c9a7ba2dd036d242861b33c88e684 URL: https://source.winehq.org/git/wine.git/?a=commit;h=59e32ecbbe7c9a7ba2dd036d… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Mar 12 21:25:10 2019 +0100 d3d8: Validate vertex stride in Draw[Indexed]PrimitiveUP(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 8 ++++---- dlls/d3d8/tests/device.c | 12 ++++++++++++ 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 56c363c..61bd7bb 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2432,9 +2432,9 @@ static HRESULT WINAPI d3d8_device_DrawPrimitiveUP(IDirect3DDevice8 *iface, TRACE("iface %p, primitive_type %#x, primitive_count %u, data %p, stride %u.\n", iface, primitive_type, primitive_count, data, stride); - if (!primitive_count) + if (!primitive_count || !stride) { - WARN("primitive_count is 0, returning D3D_OK\n"); + WARN("primitive_count or stride is 0, returning D3D_OK.\n"); return D3D_OK; } @@ -2532,9 +2532,9 @@ static HRESULT WINAPI d3d8_device_DrawIndexedPrimitiveUP(IDirect3DDevice8 *iface iface, primitive_type, min_vertex_idx, vertex_count, primitive_count, index_data, index_format, vertex_data, vertex_stride); - if (!primitive_count) + if (!primitive_count || !vertex_stride) { - WARN("primitive_count is 0, returning D3D_OK\n"); + WARN("primitive_count or vertex_stride is 0, returning D3D_OK.\n"); return D3D_OK; } diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 0564154..b9a999e 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -9512,6 +9512,11 @@ static void test_draw_primitive(void) ok(stride == sizeof(*quad), "Unexpected stride %u.\n", stride); IDirect3DVertexBuffer8_Release(current_vb); + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, quad, 0); + ok(hr == D3D_OK, "DrawPrimitiveUP failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, quad, sizeof(*quad)); + ok(hr == D3D_OK, "DrawPrimitiveUP failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLELIST, 2, quad, sizeof(*quad)); ok(SUCCEEDED(hr), "DrawPrimitiveUP failed, hr %#x.\n", hr); @@ -9538,6 +9543,13 @@ static void test_draw_primitive(void) ok(base_vertex_index == 1, "Unexpected base vertex index %u.\n", base_vertex_index); IDirect3DIndexBuffer8_Release(current_ib); + hr = IDirect3DDevice8_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, 4, 0, + indices, D3DFMT_INDEX16, quad, 0); + ok(SUCCEEDED(hr), "DrawIndexedPrimitiveUP failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, 4, 2, + indices, D3DFMT_INDEX16, quad, 0); + ok(SUCCEEDED(hr), "DrawIndexedPrimitiveUP failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, 4, 2, indices, D3DFMT_INDEX16, quad, sizeof(*quad)); ok(SUCCEEDED(hr), "DrawIndexedPrimitiveUP failed, hr %#x.\n", hr);

1 0

Matteo Bruni : d3d9: Validate vertex stride in Draw[Indexed]PrimitiveUP().
by Alexandre Julliard March 13, 2019

March 13, 2019

Module: wine Branch: master Commit: 758cdfa02dce6d8facf9e6a0a7f09bcbb9cacb1b URL: https://source.winehq.org/git/wine.git/?a=commit;h=758cdfa02dce6d8facf9e6a0… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Mar 12 21:25:09 2019 +0100 d3d9: Validate vertex stride in Draw[Indexed]PrimitiveUP(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46713 Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 12 +++++++++++- dlls/d3d9/tests/device.c | 12 ++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 5d59fd5..5844d2c 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2915,9 +2915,14 @@ static HRESULT WINAPI d3d9_device_DrawPrimitiveUP(IDirect3DDevice9Ex *iface, TRACE("iface %p, primitive_type %#x, primitive_count %u, data %p, stride %u.\n", iface, primitive_type, primitive_count, data, stride); + if (!stride) + { + WARN("stride is 0, returning D3DERR_INVALIDCALL.\n"); + return D3DERR_INVALIDCALL; + } if (!primitive_count) { - WARN("primitive_count is 0, returning D3D_OK\n"); + WARN("primitive_count is 0, returning D3D_OK.\n"); return D3D_OK; } @@ -3026,6 +3031,11 @@ static HRESULT WINAPI d3d9_device_DrawIndexedPrimitiveUP(IDirect3DDevice9Ex *ifa iface, primitive_type, min_vertex_idx, vertex_count, primitive_count, index_data, index_format, vertex_data, vertex_stride); + if (!vertex_stride) + { + WARN("vertex_stride is 0, returning D3DERR_INVALIDCALL.\n"); + return D3DERR_INVALIDCALL; + } if (!primitive_count) { WARN("primitive_count is 0, returning D3D_OK.\n"); diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 76d19b9..d119b63 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -2981,6 +2981,11 @@ static void test_draw_primitive(void) hr = IDirect3DDevice9_DrawPrimitive(device, D3DPT_TRIANGLELIST, 0, 2); ok(SUCCEEDED(hr), "DrawPrimitive failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLELIST, 2, quad, 0); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, quad, 0); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLELIST, 2, quad, sizeof(*quad)); ok(SUCCEEDED(hr), "DrawPrimitiveUP failed, hr %#x.\n", hr); @@ -3010,6 +3015,13 @@ static void test_draw_primitive(void) IDirect3DIndexBuffer9_Release(current_ib); hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, 4, 2, + indices, D3DFMT_INDEX16, quad, 0); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, 4, 0, + indices, D3DFMT_INDEX16, quad, 0); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, 4, 2, indices, D3DFMT_INDEX16, quad, sizeof(*quad)); ok(SUCCEEDED(hr), "DrawIndexedPrimitiveUP failed, hr %#x.\n", hr);

1 0

Jacek Caban : mshtml: Use detach_document_node in detach_gecko_browser.
by Alexandre Julliard March 13, 2019

March 13, 2019

Module: wine Branch: master Commit: d49d83a18e7fee9122d94adf1a675d4e47c2eed5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d49d83a18e7fee9122d94adf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 13 17:54:04 2019 +0100 mshtml: Use detach_document_node in detach_gecko_browser. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/nsembed.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 956ba37..33d251d 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -2197,8 +2197,7 @@ void detach_gecko_browser(GeckoBrowser *This) while(!list_empty(&This->document_nodes)) { HTMLDocumentNode *doc = LIST_ENTRY(list_head(&This->document_nodes), HTMLDocumentNode, browser_entry); - list_remove(&doc->browser_entry); - doc->browser = NULL; + detach_document_node(doc); } while(!list_empty(&This->outer_windows)) {

1 0

Jacek Caban : mshtml: Correctly handle documents with no window associated in IHTMLDocument2:: get_location.
by Alexandre Julliard March 13, 2019

March 13, 2019

Module: wine Branch: master Commit: fc1bdc65a7b909aba258d871c7840ec52635790c URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc1bdc65a7b909aba258d871… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 13 17:54:30 2019 +0100 mshtml: Correctly handle documents with no window associated in IHTMLDocument2::get_location. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 6 +++--- dlls/mshtml/tests/dom.c | 9 +++++++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 9d57ef9..d5e2a70 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -745,12 +745,12 @@ static HRESULT WINAPI HTMLDocument_get_referrer(IHTMLDocument2 *iface, BSTR *p) static HRESULT WINAPI HTMLDocument_get_location(IHTMLDocument2 *iface, IHTMLLocation **p) { - HTMLDocument *This = impl_from_IHTMLDocument2(iface); + HTMLDocumentNode *This = impl_from_IHTMLDocument2(iface)->doc_node; TRACE("(%p)->(%p)\n", This, p); - if(!This->doc_node->nsdoc) { - WARN("NULL nsdoc\n"); + if(!This->nsdoc || !This->window) { + WARN("NULL window\n"); return E_UNEXPECTED; } diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index adb1fa5..52d353f 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -6921,7 +6921,9 @@ static void test_dom_implementation(IHTMLDocument2 *doc) hres = IHTMLDOMImplementation_QueryInterface(dom_implementation, &IID_IHTMLDOMImplementation2, (void**)&dom_implementation2); if(SUCCEEDED(hres)) { + IHTMLDocument2 *new_document2; IHTMLDocument7 *new_document; + IHTMLLocation *location; str = a2bstr("test"); hres = IHTMLDOMImplementation2_createHTMLDocument(dom_implementation2, str, &new_document); @@ -6930,6 +6932,13 @@ static void test_dom_implementation(IHTMLDocument2 *doc) test_disp((IUnknown*)new_document, &DIID_DispHTMLDocument, &CLSID_HTMLDocument, "[object]"); test_ifaces((IUnknown*)new_document, doc_node_iids); + hres = IHTMLDocument7_QueryInterface(new_document, &IID_IHTMLDocument2, (void**)&new_document2); + ok(hres == S_OK, "Could not get IHTMLDocument2 iface: %08x\n", hres); + + hres = IHTMLDocument2_get_location(new_document2, &location); + ok(hres == E_UNEXPECTED, "get_location returned: %08x\n", hres); + + IHTMLDocument2_Release(new_document2); IHTMLDocument7_Release(new_document); IHTMLDOMImplementation2_Release(dom_implementation2); }else {

1 0

Józef Kucia : dxgi: Do not forward d3d11_swapchain_Present() to d3d11_swapchain_Present1().
by Alexandre Julliard March 13, 2019

March 13, 2019

Module: wine Branch: master Commit: e88084f65097b77bf80a47e75ea62065c300186d URL: https://source.winehq.org/git/wine.git/?a=commit;h=e88084f65097b77bf80a47e7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Mar 13 14:48:18 2019 +0100 dxgi: Do not forward d3d11_swapchain_Present() to d3d11_swapchain_Present1(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/swapchain.c | 38 ++++++++++++++++++++++---------------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 47f7196..704b03c 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -295,13 +295,33 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetDevice(IDXGISwapChain1 *ifac /* IDXGISwapChain1 methods */ +static HRESULT d3d11_swapchain_present(struct d3d11_swapchain *swapchain, + unsigned int sync_interval, unsigned int flags) +{ + if (sync_interval > 4) + { + WARN("Invalid sync interval %u.\n", sync_interval); + return DXGI_ERROR_INVALID_CALL; + } + + if (flags & ~DXGI_PRESENT_TEST) + FIXME("Unimplemented flags %#x.\n", flags); + if (flags & DXGI_PRESENT_TEST) + { + WARN("Returning S_OK for DXGI_PRESENT_TEST.\n"); + return S_OK; + } + + return wined3d_swapchain_present(swapchain->wined3d_swapchain, NULL, NULL, NULL, sync_interval, 0); +} + static HRESULT STDMETHODCALLTYPE d3d11_swapchain_Present(IDXGISwapChain1 *iface, UINT sync_interval, UINT flags) { struct d3d11_swapchain *swapchain = d3d11_swapchain_from_IDXGISwapChain1(iface); TRACE("iface %p, sync_interval %u, flags %#x.\n", iface, sync_interval, flags); - return IDXGISwapChain1_Present1(&swapchain->IDXGISwapChain1_iface, sync_interval, flags, NULL); + return d3d11_swapchain_present(swapchain, sync_interval, flags); } static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetBuffer(IDXGISwapChain1 *iface, @@ -650,24 +670,10 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_Present1(IDXGISwapChain1 *iface TRACE("iface %p, sync_interval %u, flags %#x, present_parameters %p.\n", iface, sync_interval, flags, present_parameters); - if (sync_interval > 4) - { - WARN("Invalid sync interval %u.\n", sync_interval); - return DXGI_ERROR_INVALID_CALL; - } - - if (flags & ~DXGI_PRESENT_TEST) - FIXME("Unimplemented flags %#x.\n", flags); - if (flags & DXGI_PRESENT_TEST) - { - WARN("Returning S_OK for DXGI_PRESENT_TEST.\n"); - return S_OK; - } - if (present_parameters) FIXME("Ignored present parameters %p.\n", present_parameters); - return wined3d_swapchain_present(swapchain->wined3d_swapchain, NULL, NULL, NULL, sync_interval, 0); + return d3d11_swapchain_present(swapchain, sync_interval, flags); } static BOOL STDMETHODCALLTYPE d3d11_swapchain_IsTemporaryMonoSupported(IDXGISwapChain1 *iface)

1 0

Henri Verbeet : d3d9/tests: Mark one more test in test_vshader_input() as broken on WARP.
by Alexandre Julliard March 13, 2019

March 13, 2019

Module: wine Branch: master Commit: 73355cab96de112f5125907424b37289afc6ebe7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=73355cab96de112f51259074… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 13 22:04:24 2019 +0330 d3d9/tests: Mark one more test in test_vshader_input() as broken on WARP. This fails intermittently on the testbot. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 9318610..0ce9948 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -8747,8 +8747,7 @@ static void test_vshader_input(void) * * A test app for this behavior is Half Life 2 Episode 2 in dxlevel 95, and related games(Portal, TF2). */ - ok(color == 0x000000ff || color == 0x00808080 || color == 0x00000000 - || broken(color_match(color, D3DCOLOR_ARGB(0x00, 0x0b, 0x75, 0x80), 1)), + ok(color == 0x000000ff || color == 0x00808080 || color == 0x00000000 || broken(warp), "Got unexpected color 0x%08x for quad 2 (different colors).\n", color); hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL);

1 0

Nikolay Sivov : mfreadwrite: Return source flags through MF_SOURCE_READER_MEDIASOURCE_CHARACTERISTICS.
by Alexandre Julliard March 13, 2019

March 13, 2019

Module: wine Branch: master Commit: 9ef27b8d247e12536994b82561ceef1afc235f34 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ef27b8d247e12536994b825… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 13 09:29:35 2019 +0300 mfreadwrite: Return source flags through MF_SOURCE_READER_MEDIASOURCE_CHARACTERISTICS. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/main.c | 35 ++++++++++++++++++++++++++++++++--- include/mfreadwrite.idl | 2 ++ 2 files changed, 34 insertions(+), 3 deletions(-) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index 6b6c516..f3fd3b2 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -21,6 +21,7 @@ #include <stdarg.h> #define COBJMACROS +#define NONAMELESSUNION #include "windef.h" #include "winbase.h" @@ -211,10 +212,38 @@ static HRESULT WINAPI src_reader_GetServiceForStream(IMFSourceReader *iface, DWO } static HRESULT WINAPI src_reader_GetPresentationAttribute(IMFSourceReader *iface, DWORD index, - REFGUID guid, PROPVARIANT *attr) + REFGUID guid, PROPVARIANT *value) { - srcreader *This = impl_from_IMFSourceReader(iface); - FIXME("%p, 0x%08x, %s, %p\n", This, index, debugstr_guid(guid), attr); + struct source_reader *reader = impl_from_IMFSourceReader(iface); + HRESULT hr; + + TRACE("%p, %#x, %s, %p.\n", iface, index, debugstr_guid(guid), value); + + switch (index) + { + case MF_SOURCE_READER_MEDIASOURCE: + if (IsEqualGUID(guid, &MF_SOURCE_READER_MEDIASOURCE_CHARACTERISTICS)) + { + DWORD flags; + + if (FAILED(hr = IMFMediaSource_GetCharacteristics(reader->source, &flags))) + return hr; + + value->vt = VT_UI4; + value->u.ulVal = flags; + return S_OK; + } + else + { + FIXME("Unsupported source attribute %s.\n", debugstr_guid(guid)); + return E_NOTIMPL; + } + break; + default: + FIXME("Unsupported index %#x.\n", index); + return E_NOTIMPL; + } + return E_NOTIMPL; } diff --git a/include/mfreadwrite.idl b/include/mfreadwrite.idl index 2647127..9097b5a 100644 --- a/include/mfreadwrite.idl +++ b/include/mfreadwrite.idl @@ -78,6 +78,8 @@ cpp_quote("EXTERN_GUID(MF_READWRITE_MMCSS_CLASS_AUDIO, 0x430847da, 0x08 cpp_quote("EXTERN_GUID(MF_READWRITE_MMCSS_PRIORITY_AUDIO, 0x273db885, 0x2de2, 0x4db2, 0xa6, 0xa7, 0xfd, 0xb6, 0x6f, 0xb4, 0x0b, 0x61);") cpp_quote("EXTERN_GUID(MF_READWRITE_D3D_OPTIONAL, 0x216479d9, 0x3071, 0x42ca, 0xbb, 0x6c, 0x4c, 0x22, 0x10, 0x2e, 0x1d, 0x18);") +cpp_quote("EXTERN_GUID(MF_SOURCE_READER_MEDIASOURCE_CHARACTERISTICS, 0x6d23f5c8, 0xc5d7, 0x4a9b, 0x99, 0x71, 0x5d, 0x11, 0xf8, 0xbc, 0xa8, 0x80);") + interface IMFMediaSource; [

1 0

Nikolay Sivov : mfplat: Forward CopyAllItems() for events.
by Alexandre Julliard March 13, 2019

March 13, 2019

Module: wine Branch: master Commit: e8df24941d56d57a08b5ee4e8f928149d60b9389 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e8df24941d56d57a08b5ee4e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 13 09:29:36 2019 +0300 mfplat: Forward CopyAllItems() for events. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index f12666f..c7f4fea 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -2930,11 +2930,8 @@ static HRESULT WINAPI mfmediaevent_GetItemByIndex(IMFMediaEvent *iface, UINT32 i static HRESULT WINAPI mfmediaevent_CopyAllItems(IMFMediaEvent *iface, IMFAttributes *dest) { - mfmediaevent *This = impl_from_IMFMediaEvent(iface); - - FIXME("%p, %p\n", This, dest); - - return E_NOTIMPL; + struct media_event *event = impl_from_IMFMediaEvent(iface); + return IMFAttributes_CopyAllItems(&event->attributes.IMFAttributes_iface, dest); } static HRESULT WINAPI mfmediaevent_GetType(IMFMediaEvent *iface, MediaEventType *type)

1 0

Huw Davies : winemaker: Fix --single-target option parsing.
by Alexandre Julliard March 13, 2019

March 13, 2019

Module: wine Branch: master Commit: c45acfe9a16f2166fe7274939b98a46d850aa4cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=c45acfe9a16f2166fe727493… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Mar 12 13:41:52 2019 +0000 winemaker: Fix --single-target option parsing. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winemaker/winemaker | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/winemaker/winemaker b/tools/winemaker/winemaker index ec5fb16..88ae78ce 100755 --- a/tools/winemaker/winemaker +++ b/tools/winemaker/winemaker @@ -2702,8 +2702,9 @@ binmode(STDOUT, ":utf8"); target_init(\@global_settings); -foreach(@ARGV) { - my $arg=$_; +my @args = @ARGV; +while (@args>0) { + my $arg=shift @args; # General options if ($arg eq "--nobanner") { $opt_no_banner=1; @@ -2712,7 +2713,7 @@ foreach(@ARGV) { } elsif ($arg eq "--nobackup") { $opt_backup=0; } elsif ($arg eq "--single-target") { - $opt_single_target=shift @ARGV; + $opt_single_target=shift @args; } elsif ($arg eq "--lower-none") { $opt_lower=$OPT_LOWER_NONE; } elsif ($arg eq "--lower-all") {

1 0