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

[PATCH 1/4] ddraw: Protect against invalid clipper pointers (v2).
by Stefan Dösinger 13 Mar '19

13 Mar '19

Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- v2: Drop the magic and move bad clipper detection into a separate function instead of impl_from_IDirectDrawClipper. I also dropped patch 4 (see 159887) from this resubmission because with moving the bad clipper detection to a separate function there is still a difference between impl_from_... and unsafe_impl_from_... . --- 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 01cac40ec6e..e4b7ec2bd50 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; -- 2.19.2

4 9

[PATCH v2] d3d10: Implement ID3D10EffectScalarVariable::{Get, Set}{Int, Float, Bool}
by Nick Renieris 13 Mar '19

13 Mar '19

Signed-off-by: Nick Renieris <velocityra(a)gmail.com> --- dlls/d3d10/d3d10_private.h | 11 +++++++ dlls/d3d10/effect.c | 71 ++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 70 insertions(+), 12 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index e785b8b..4f51bf7 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -100,6 +100,16 @@ struct d3d10_effect_shader_variable } shader; }; +struct d3d10_effect_scalar_variable +{ + union + { + int i; + float f; + BOOL b; + }; +}; + struct d3d10_effect_state_object_variable { union @@ -173,6 +183,7 @@ struct d3d10_effect_variable { struct d3d10_effect_state_object_variable state; struct d3d10_effect_shader_variable shader; + struct d3d10_effect_scalar_variable scalar; } u; }; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index cd6f4a3..81b0a8a 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -4125,17 +4125,33 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_scalar_variable_GetRawValue(ID3D10 static HRESULT STDMETHODCALLTYPE d3d10_effect_scalar_variable_SetFloat(ID3D10EffectScalarVariable *iface, float value) { - FIXME("iface %p, value %.8e stub!\n", iface, value); + struct d3d10_effect_variable *This; - return E_NOTIMPL; + TRACE("iface %p, value %.8e\n", iface, value); + + if (!iface) + return D3DERR_INVALIDCALL; + + This = impl_from_ID3D10EffectVariable((ID3D10EffectVariable *)iface); + This->u.scalar.f = value; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_effect_scalar_variable_GetFloat(ID3D10EffectScalarVariable *iface, float *value) { - FIXME("iface %p, value %p stub!\n", iface, value); + struct d3d10_effect_variable *This; - return E_NOTIMPL; + TRACE("iface %p, value %p\n", iface, value); + + if (!iface || !value) + return D3DERR_INVALIDCALL; + + This = impl_from_ID3D10EffectVariable((ID3D10EffectVariable *)iface); + *value = This->u.scalar.f; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_effect_scalar_variable_SetFloatArray(ID3D10EffectScalarVariable *iface, @@ -4157,17 +4173,32 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_scalar_variable_GetFloatArray(ID3D static HRESULT STDMETHODCALLTYPE d3d10_effect_scalar_variable_SetInt(ID3D10EffectScalarVariable *iface, int value) { - FIXME("iface %p, value %d stub!\n", iface, value); + struct d3d10_effect_variable *This; - return E_NOTIMPL; + TRACE("iface %p, value %d\n", iface, value); + + if (!iface) + return D3DERR_INVALIDCALL; + + This = impl_from_ID3D10EffectVariable((ID3D10EffectVariable *)iface); + This->u.scalar.i = value; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_effect_scalar_variable_GetInt(ID3D10EffectScalarVariable *iface, int *value) { - FIXME("iface %p, value %p stub!\n", iface, value); + struct d3d10_effect_variable *This; - return E_NOTIMPL; + TRACE("iface %p, value %p\n", iface, value); + if (!iface || !value) + return D3DERR_INVALIDCALL; + + This = impl_from_ID3D10EffectVariable((ID3D10EffectVariable *)iface); + *value = This->u.scalar.i; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_effect_scalar_variable_SetIntArray(ID3D10EffectScalarVariable *iface, @@ -4189,17 +4220,33 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_scalar_variable_GetIntArray(ID3D10 static HRESULT STDMETHODCALLTYPE d3d10_effect_scalar_variable_SetBool(ID3D10EffectScalarVariable *iface, BOOL value) { - FIXME("iface %p, value %d stub!\n", iface, value); + struct d3d10_effect_variable *This; - return E_NOTIMPL; + TRACE("iface %p, value %d\n", iface, value); + + if (!iface) + return D3DERR_INVALIDCALL; + + This = impl_from_ID3D10EffectVariable((ID3D10EffectVariable *)iface); + This->u.scalar.b = value; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_effect_scalar_variable_GetBool(ID3D10EffectScalarVariable *iface, BOOL *value) { - FIXME("iface %p, value %p stub!\n", iface, value); + struct d3d10_effect_variable *This; - return E_NOTIMPL; + TRACE("iface %p, value %p\n", iface, value); + + if (!iface || !value) + return D3DERR_INVALIDCALL; + + This = impl_from_ID3D10EffectVariable((ID3D10EffectVariable *)iface); + *value = This->u.scalar.b; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_effect_scalar_variable_SetBoolArray(ID3D10EffectScalarVariable *iface, -- 2.7.4

3 6

[PATCH 1/2] ddraw: Clear *clipper on failure in ddraw_surface7_GetClipper().
by Henri Verbeet 13 Mar '19

13 Mar '19

From: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 160692. dlls/ddraw/surface.c | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 2b788bd8d13..b8cc2d2195d 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -4408,39 +4408,25 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface1_BltFast(IDirectDrawSurfac src_impl ? &src_impl->IDirectDrawSurface7_iface : NULL, src_rect, flags); } -/***************************************************************************** - * IDirectDrawSurface7::GetClipper - * - * Returns the IDirectDrawClipper interface of the clipper assigned to this - * surface - * - * Params: - * Clipper: Address to store the interface pointer at - * - * Returns: - * DD_OK on success - * DDERR_INVALIDPARAMS if Clipper is NULL - * DDERR_NOCLIPPERATTACHED if there's no clipper attached - * - *****************************************************************************/ -static HRESULT WINAPI ddraw_surface7_GetClipper(IDirectDrawSurface7 *iface, IDirectDrawClipper **Clipper) +static HRESULT WINAPI ddraw_surface7_GetClipper(IDirectDrawSurface7 *iface, IDirectDrawClipper **clipper) { struct ddraw_surface *surface = impl_from_IDirectDrawSurface7(iface); - TRACE("iface %p, clipper %p.\n", iface, Clipper); + TRACE("iface %p, clipper %p.\n", iface, clipper); - if (!Clipper) + if (!clipper) return DDERR_INVALIDPARAMS; wined3d_mutex_lock(); if (!surface->clipper) { wined3d_mutex_unlock(); + *clipper = NULL; return DDERR_NOCLIPPERATTACHED; } - *Clipper = &surface->clipper->IDirectDrawClipper_iface; - IDirectDrawClipper_AddRef(*Clipper); + *clipper = &surface->clipper->IDirectDrawClipper_iface; + IDirectDrawClipper_AddRef(*clipper); wined3d_mutex_unlock(); return DD_OK; -- 2.11.0

2 1

[PATCH 4/4] dxgi: Do not forward d3d11_swapchain_Present() to d3d11_swapchain_Present1().
by Józef Kucia 13 Mar '19

13 Mar '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- 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 47f71961768a..704b03c8a6ea 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) -- 2.19.2

3 2

[PATCH 3/4] d3d12: Do not pass VkPhysicalDevice to vkd3d if we failed to find matching device.
by Józef Kucia 13 Mar '19

13 Mar '19

Vkd3d has got a better heuristic for selecting the device. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d12/d3d12_main.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/dlls/d3d12/d3d12_main.c b/dlls/d3d12/d3d12_main.c index 9eef3ad92ddf..2c6472acb06d 100644 --- a/dlls/d3d12/d3d12_main.c +++ b/dlls/d3d12/d3d12_main.c @@ -267,10 +267,7 @@ static VkPhysicalDevice d3d12_get_vk_physical_device(struct vkd3d_instance *inst } if (!vk_physical_device) - { FIXME("Could not find Vulkan physical device for DXGI adapter.\n"); - vk_physical_device = vk_physical_devices[0]; - } done: heap_free(vk_physical_devices); @@ -284,7 +281,6 @@ HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, D3D_FEATURE_LEVEL minimum_fe struct vkd3d_instance_create_info instance_create_info; struct vkd3d_device_create_info device_create_info; struct wine_dxgi_adapter_info adapter_info; - VkPhysicalDevice vk_physical_device; const struct vulkan_funcs *vk_funcs; struct vkd3d_instance *instance; IWineDXGIAdapter *wine_adapter; @@ -344,15 +340,12 @@ HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, D3D_FEATURE_LEVEL minimum_fe goto done; } - if (!(vk_physical_device = d3d12_get_vk_physical_device(instance, vk_funcs, &adapter_info))) - goto done_instance; - device_create_info.type = VKD3D_STRUCTURE_TYPE_DEVICE_CREATE_INFO; device_create_info.next = NULL; device_create_info.minimum_feature_level = minimum_feature_level; device_create_info.instance = instance; device_create_info.instance_create_info = NULL; - device_create_info.vk_physical_device = vk_physical_device; + device_create_info.vk_physical_device = d3d12_get_vk_physical_device(instance, vk_funcs, &adapter_info); device_create_info.device_extensions = device_extensions; device_create_info.device_extension_count = ARRAY_SIZE(device_extensions); device_create_info.parent = (IUnknown *)wine_adapter; @@ -360,7 +353,6 @@ HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, D3D_FEATURE_LEVEL minimum_fe hr = vkd3d_create_device(&device_create_info, iid, device); -done_instance: vkd3d_instance_decref(instance); done: -- 2.19.2

3 2

[PATCH 1/4] wined3d: Store BGRA vertex capabilities in struct wined3d_d3d_info.
by Józef Kucia 13 Mar '19

13 Mar '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 1 + dlls/wined3d/context.c | 8 +++----- dlls/wined3d/device.c | 2 +- dlls/wined3d/wined3d_private.h | 4 ++-- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 5bcb39f59c14..686f4f06cbb7 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -3741,6 +3741,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, || gl_info->supported[ARB_TEXTURE_RECTANGLE]; d3d_info->draw_base_vertex_offset = !!gl_info->supported[ARB_DRAW_ELEMENTS_BASE_VERTEX]; + d3d_info->vertex_bgra = !!gl_info->supported[ARB_VERTEX_ARRAY_BGRA]; if (gl_info->supported[ARB_TEXTURE_MULTISAMPLE]) d3d_info->multisample_draw_location = WINED3D_LOCATION_TEXTURE_RGB; diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 267238dafa42..6d270a7eb693 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3516,8 +3516,7 @@ static BOOL fixed_get_input(BYTE usage, BYTE usage_idx, unsigned int *regnum) /* Context activation is done by the caller. */ void wined3d_stream_info_from_declaration(struct wined3d_stream_info *stream_info, - const struct wined3d_state *state, const struct wined3d_gl_info *gl_info, - const struct wined3d_d3d_info *d3d_info) + const struct wined3d_state *state, const struct wined3d_d3d_info *d3d_info) { /* We need to deal with frequency data! */ struct wined3d_vertex_declaration *declaration = state->vertex_declaration; @@ -3613,8 +3612,7 @@ void wined3d_stream_info_from_declaration(struct wined3d_stream_info *stream_inf stream_info->elements[idx].divisor = 0; } - if (!gl_info->supported[ARB_VERTEX_ARRAY_BGRA] - && element->format->id == WINED3DFMT_B8G8R8A8_UNORM) + if (!d3d_info->vertex_bgra && element->format->id == WINED3DFMT_B8G8R8A8_UNORM) { stream_info->swizzle_map |= 1u << idx; } @@ -3633,7 +3631,7 @@ static void context_update_stream_info(struct wined3d_context *context, const st unsigned int i; WORD map; - wined3d_stream_info_from_declaration(stream_info, state, gl_info, d3d_info); + wined3d_stream_info_from_declaration(stream_info, state, d3d_info); stream_info->all_vbo = 1; context->buffer_fence_count = 0; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 79a5b68c6f77..1328543186ad 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3422,7 +3422,7 @@ HRESULT CDECL wined3d_device_process_vertices(struct wined3d_device *device, vs = state->shader[WINED3D_SHADER_TYPE_VERTEX]; state->shader[WINED3D_SHADER_TYPE_VERTEX] = NULL; - wined3d_stream_info_from_declaration(&stream_info, state, &device->adapter->gl_info, &device->adapter->d3d_info); + wined3d_stream_info_from_declaration(&stream_info, state, &device->adapter->d3d_info); state->shader[WINED3D_SHADER_TYPE_VERTEX] = vs; /* We can't convert FROM a VBO, and vertex buffers used to source into diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d0edb8c8bd86..e70010e74c94 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -206,6 +206,7 @@ struct wined3d_d3d_info unsigned int texture_npot : 1; unsigned int texture_npot_conditional : 1; unsigned int draw_base_vertex_offset : 1; + unsigned int vertex_bgra : 1; enum wined3d_feature_level feature_level; DWORD multisample_draw_location; @@ -1511,8 +1512,7 @@ struct wined3d_stream_info }; void wined3d_stream_info_from_declaration(struct wined3d_stream_info *stream_info, - const struct wined3d_state *state, const struct wined3d_gl_info *gl_info, - const struct wined3d_d3d_info *d3d_info) DECLSPEC_HIDDEN; + const struct wined3d_state *state, const struct wined3d_d3d_info *d3d_info) DECLSPEC_HIDDEN; struct wined3d_direct_dispatch_parameters { -- 2.19.2

2 1

[PATCH v2 1/7] d3d8/tests: Add a test for CheckDeviceFormat() with an unsupported adapter format.
by Matteo Bruni 13 Mar '19

13 Mar '19

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- v2: Get rid of broken(), it can return D3DERR_NOTAVAILABLE with the gdi renderer too. (Henri) dlls/d3d8/tests/device.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 51dd3aef579..d5989b8b09a 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -8148,6 +8148,13 @@ static void test_check_device_format(void) ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x, device type %#x.\n", hr, device_type); } + hr = IDirect3D8_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_A8R8G8B8, + 0, D3DRTYPE_TEXTURE, D3DFMT_X8R8G8B8); + ok(hr == D3DERR_NOTAVAILABLE, "Got unexpected hr %#x.\n", hr); + hr = IDirect3D8_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + 0, D3DRTYPE_TEXTURE, D3DFMT_X8R8G8B8); + ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE, "Got unexpected hr %#x.\n", hr); + hr = IDirect3D8_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, 0, D3DRTYPE_VERTEXBUFFER, D3DFMT_VERTEXDATA); todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); -- 2.19.2

4 20

[PATCH 5/5] mshtml: Correctly handle documents with no window associated in IHTMLDocument2::get_location.
by Jacek Caban 13 Mar '19

13 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmldoc.c | 6 +++--- dlls/mshtml/tests/dom.c | 9 +++++++++ 2 files changed, 12 insertions(+), 3 deletions(-)

1 0

[PATCH 4/5] mshtml: Add IHTMLDOMImplementation2::createHTMLDocument implementation.
by Jacek Caban 13 Mar '19

13 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmldoc.c | 26 ++++++++------- dlls/mshtml/htmlwindow.c | 6 +++- dlls/mshtml/mshtml_private.h | 6 ++-- dlls/mshtml/nsiface.idl | 16 +++++++++- dlls/mshtml/omnavigator.c | 62 +++++++++++++++++++++++++++++++++--- dlls/mshtml/tests/dom.c | 19 +++++++++++ 6 files changed, 116 insertions(+), 19 deletions(-)

1 0

[PATCH 3/5] mshtml: Bind events directly to document node for documents with no window associated.
by Jacek Caban 13 Mar '19

13 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/nsevents.c | 40 ++++++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 18 deletions(-)

1 0