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

Michael Stefaniuc : d3dx9: Get rid of struct d3dx9_base_effect.
by Alexandre Julliard 22 Mar '19

22 Mar '19

Module: wine Branch: master Commit: 3b951b77f87ed9102fc7a2ccb0807b5592990147 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b951b77f87ed9102fc7a2cc… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Mar 22 19:09:56 2019 +0100 d3dx9: Get rid of struct d3dx9_base_effect. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 0e91f28..433ec3b 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -148,20 +148,11 @@ struct d3dx_technique struct IDirect3DStateBlock9 *saved_state; }; -struct d3dx9_base_effect -{ - struct d3dx_effect *effect; - - - ULONG64 version_counter; -}; - struct d3dx_effect { ID3DXEffect ID3DXEffect_iface; LONG ref; - struct d3dx9_base_effect base_effect; unsigned int parameter_count; unsigned int technique_count; unsigned int object_count; @@ -169,6 +160,7 @@ struct d3dx_effect struct d3dx_technique *techniques; struct d3dx_object *objects; DWORD flags; + struct wine_rb_tree param_tree; char *full_name_tmp; unsigned int full_name_tmp_size; @@ -180,6 +172,7 @@ struct d3dx_effect struct d3dx_pass *active_pass; BOOL started; DWORD begin_flags; + ULONG64 version_counter; D3DLIGHT9 current_light[8]; unsigned int light_updated; @@ -1126,7 +1119,7 @@ static BOOL walk_parameter_tree(struct d3dx_parameter *param, walk_parameter_dep static ULONG64 *get_version_counter_ptr(struct d3dx_effect *effect) { - return effect->pool ? &effect->pool->version_counter : &effect->base_effect.version_counter; + return effect->pool ? &effect->pool->version_counter : &effect->version_counter; } static ULONG64 next_effect_update_version(struct d3dx_effect *effect) @@ -6152,7 +6145,6 @@ static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDev #else UINT compile_flags = 0; #endif - struct d3dx9_base_effect *base = &effect->base_effect; ID3DBlob *bytecode = NULL, *temp_errors = NULL; unsigned int skip_constants_count = 0; char *skip_constants_buffer = NULL; @@ -6179,7 +6171,6 @@ static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDev IDirect3DDevice9_AddRef(device); effect->device = device; - base->effect = effect; effect->flags = eflags; read_dword(&ptr, &tag);

1 0

Michael Stefaniuc : d3dx9: Secure against unsafe iface to COM object transitions.
by Alexandre Julliard 22 Mar '19

22 Mar '19

Module: wine Branch: master Commit: cd3e5020e4c87f49eb042fff9f607b6d745a5d55 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd3e5020e4c87f49eb042fff… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Mar 22 19:09:57 2019 +0100 d3dx9: Secure against unsafe iface to COM object transitions. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 433ec3b..269f75e 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1768,6 +1768,8 @@ static inline struct d3dx_effect_pool *impl_from_ID3DXEffectPool(ID3DXEffectPool return CONTAINING_RECORD(iface, struct d3dx_effect_pool, ID3DXEffectPool_iface); } +static inline struct d3dx_effect_pool *unsafe_impl_from_ID3DXEffectPool(ID3DXEffectPool *iface); + static inline struct d3dx_effect *impl_from_ID3DXEffect(ID3DXEffect *iface) { return CONTAINING_RECORD(iface, struct d3dx_effect, ID3DXEffect_iface); @@ -6164,8 +6166,8 @@ static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDev if (pool) { + effect->pool = unsafe_impl_from_ID3DXEffectPool(pool); pool->lpVtbl->AddRef(pool); - effect->pool = impl_from_ID3DXEffectPool(pool); } IDirect3DDevice9_AddRef(device); @@ -6477,6 +6479,15 @@ static const struct ID3DXEffectPoolVtbl ID3DXEffectPool_Vtbl = d3dx_effect_pool_Release }; +static inline struct d3dx_effect_pool *unsafe_impl_from_ID3DXEffectPool(ID3DXEffectPool *iface) +{ + if (!iface) + return NULL; + + assert(iface->lpVtbl == &ID3DXEffectPool_Vtbl); + return impl_from_ID3DXEffectPool(iface); +} + HRESULT WINAPI D3DXCreateEffectPool(ID3DXEffectPool **pool) { struct d3dx_effect_pool *object;

1 0

Michael Stefaniuc : d3d9/tests: Remove redundant not-NULL checks ( coccinellery).
by Alexandre Julliard 22 Mar '19

22 Mar '19

Module: wine Branch: master Commit: f6be725389f1a6d2addbdecbb84232e00a0e9dd0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6be725389f1a6d2addbdecb… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Mar 22 08:47:36 2019 +0100 d3d9/tests: Remove redundant not-NULL checks (coccinellery). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 705deab..ffeb6b4 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -2731,7 +2731,7 @@ static void test_depthstenciltest(void) ok(hr == D3D_OK, "IDirect3DDevice9_Clear failed with %08x\n", hr); if(pDepthStencil) IDirect3DSurface9_Release(pDepthStencil); - if(pDevice) IDirect3D9_Release(pDevice); + IDirect3D9_Release(pDevice); /* Now see if autodepthstencil disable is honored. First, without a format set */ ZeroMemory( &d3dpp, sizeof(d3dpp) ); @@ -2765,7 +2765,7 @@ static void test_depthstenciltest(void) ok(hr == D3D_OK, "IDirect3DDevice9_GetRenderState failed with %08x\n", hr); ok(state == D3DZB_FALSE, "D3DRS_ZENABLE is %s\n", state == D3DZB_FALSE ? "D3DZB_FALSE" : (state == D3DZB_TRUE ? "D3DZB_TRUE" : "D3DZB_USEW")); - if(pDevice) IDirect3D9_Release(pDevice); + IDirect3D9_Release(pDevice); /* Next, try EnableAutoDepthStencil FALSE with a depth stencil format set */ ZeroMemory( &d3dpp, sizeof(d3dpp) );

1 0

Józef Kucia : d3d12: Load vulkan-1.dll once.
by Alexandre Julliard 22 Mar '19

22 Mar '19

Module: wine Branch: master Commit: a29e6b8b772c1f10dbfc3d82cdb44cadf00ef5b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a29e6b8b772c1f10dbfc3d82… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 22 09:42:02 2019 +0100 d3d12: Load vulkan-1.dll once. 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/d3d12/d3d12_main.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/d3d12/d3d12_main.c b/dlls/d3d12/d3d12_main.c index 8a199aa..fff3acb 100644 --- a/dlls/d3d12/d3d12_main.c +++ b/dlls/d3d12/d3d12_main.c @@ -47,11 +47,25 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag); #ifdef USE_WIN32_VULKAN +static HMODULE vulkan_module; + /* FIXME: We should unload vulkan-1.dll. */ +static BOOL WINAPI load_vulkan_dll_once(INIT_ONCE *once, void *param, void **context) +{ + vulkan_module = LoadLibraryA("vulkan-1.dll"); + return TRUE; +} + static PFN_vkGetInstanceProcAddr load_vulkan(void) { - HMODULE vulkan = LoadLibraryA("vulkan-1.dll"); - return (void *)GetProcAddress(vulkan, "vkGetInstanceProcAddr"); + static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; + + InitOnceExecuteOnce(&init_once, load_vulkan_dll_once, NULL, NULL); + + if (vulkan_module) + return (void *)GetProcAddress(vulkan_module, "vkGetInstanceProcAddr"); + + return NULL; } #else

1 0

Józef Kucia : d3d12: Call vkd3d_serialize_root_signature() directly.
by Alexandre Julliard 22 Mar '19

22 Mar '19

Module: wine Branch: master Commit: 2f1007490e9e2bdc49f2562e4339474387ba1602 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f1007490e9e2bdc49f2562e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 22 09:42:03 2019 +0100 d3d12: Call vkd3d_serialize_root_signature() directly. 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/d3d12/d3d12_main.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/d3d12/d3d12_main.c b/dlls/d3d12/d3d12_main.c index fff3acb..bd680d8 100644 --- a/dlls/d3d12/d3d12_main.c +++ b/dlls/d3d12/d3d12_main.c @@ -418,11 +418,10 @@ HRESULT WINAPI D3D12SerializeRootSignature(const D3D12_ROOT_SIGNATURE_DESC *root HRESULT WINAPI D3D12SerializeVersionedRootSignature(const D3D12_VERSIONED_ROOT_SIGNATURE_DESC *desc, ID3DBlob **blob, ID3DBlob **error_blob) { - FIXME("desc %p, blob %p, error_blob %p partial-stub!\n", - desc, blob, error_blob); + TRACE("desc %p, blob %p, error_blob %p.\n", desc, blob, error_blob); if (desc->Version == D3D_ROOT_SIGNATURE_VERSION_1_0) - return D3D12SerializeRootSignature(&desc->Desc_1_0, desc->Version, blob, error_blob); + return vkd3d_serialize_root_signature(&desc->Desc_1_0, desc->Version, blob, error_blob); FIXME("Unsupported version %#x.\n", desc->Version); return E_NOTIMPL;

1 0

Józef Kucia : wined3d: Merge if statements in adapter_gl_get_wined3d_caps().
by Alexandre Julliard 22 Mar '19

22 Mar '19

Module: wine Branch: master Commit: 43965b9005be5021d3ddb5a83feaf576d4f1fee9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=43965b9005be5021d3ddb5a8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 22 09:42:04 2019 +0100 wined3d: Merge if statements in adapter_gl_get_wined3d_caps(). 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/wined3d/adapter_gl.c | 79 ++++++++++++++++++++--------------------------- 1 file changed, 33 insertions(+), 46 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index b02241b..3a0511e 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4275,6 +4275,9 @@ static void adapter_gl_get_wined3d_caps(const struct wined3d_adapter *adapter, s caps->RasterCaps |= WINED3DPRASTERCAPS_ANISOTROPY | WINED3DPRASTERCAPS_ZBIAS | WINED3DPRASTERCAPS_MIPMAPLODBIAS; + + caps->TextureFilterCaps |= WINED3DPTFILTERCAPS_MAGFANISOTROPIC + | WINED3DPTFILTERCAPS_MINFANISOTROPIC; } if (gl_info->supported[ARB_BLEND_FUNC_EXTENDED]) @@ -4292,25 +4295,8 @@ static void adapter_gl_get_wined3d_caps(const struct wined3d_adapter *adapter, s | WINED3DPTEXTURECAPS_MIPVOLUMEMAP; if (!d3d_info->texture_npot) caps->TextureCaps |= WINED3DPTEXTURECAPS_VOLUMEMAP_POW2; - } - - if (gl_info->supported[ARB_TEXTURE_CUBE_MAP]) - { - caps->TextureCaps |= WINED3DPTEXTURECAPS_CUBEMAP - | WINED3DPTEXTURECAPS_MIPCUBEMAP; - if (!d3d_info->texture_npot) - caps->TextureCaps |= WINED3DPTEXTURECAPS_CUBEMAP_POW2; - } - - if (gl_info->supported[ARB_TEXTURE_FILTER_ANISOTROPIC]) - { - caps->TextureFilterCaps |= WINED3DPTFILTERCAPS_MAGFANISOTROPIC - | WINED3DPTFILTERCAPS_MINFANISOTROPIC; - } - if (gl_info->supported[ARB_TEXTURE_CUBE_MAP]) - { - caps->CubeTextureFilterCaps |= WINED3DPTFILTERCAPS_MAGFLINEAR + caps->VolumeTextureFilterCaps |= WINED3DPTFILTERCAPS_MAGFLINEAR | WINED3DPTFILTERCAPS_MAGFPOINT | WINED3DPTFILTERCAPS_MINFLINEAR | WINED3DPTFILTERCAPS_MINFPOINT @@ -4323,16 +4309,34 @@ static void adapter_gl_get_wined3d_caps(const struct wined3d_adapter *adapter, s | WINED3DPTFILTERCAPS_MIPNEAREST | WINED3DPTFILTERCAPS_NEAREST; - if (gl_info->supported[ARB_TEXTURE_FILTER_ANISOTROPIC]) + caps->VolumeTextureAddressCaps |= WINED3DPTADDRESSCAPS_INDEPENDENTUV + | WINED3DPTADDRESSCAPS_CLAMP + | WINED3DPTADDRESSCAPS_WRAP; + + if (gl_info->supported[ARB_TEXTURE_BORDER_CLAMP]) { - caps->CubeTextureFilterCaps |= WINED3DPTFILTERCAPS_MAGFANISOTROPIC - | WINED3DPTFILTERCAPS_MINFANISOTROPIC; + caps->VolumeTextureAddressCaps |= WINED3DPTADDRESSCAPS_BORDER; + } + if (gl_info->supported[ARB_TEXTURE_MIRRORED_REPEAT]) + { + caps->VolumeTextureAddressCaps |= WINED3DPTADDRESSCAPS_MIRROR; } + if (gl_info->supported[ARB_TEXTURE_MIRROR_CLAMP_TO_EDGE]) + { + caps->VolumeTextureAddressCaps |= WINED3DPTADDRESSCAPS_MIRRORONCE; + } + + caps->MaxVolumeExtent = gl_info->limits.texture3d_size; } - if (gl_info->supported[EXT_TEXTURE3D]) + if (gl_info->supported[ARB_TEXTURE_CUBE_MAP]) { - caps->VolumeTextureFilterCaps |= WINED3DPTFILTERCAPS_MAGFLINEAR + caps->TextureCaps |= WINED3DPTEXTURECAPS_CUBEMAP + | WINED3DPTEXTURECAPS_MIPCUBEMAP; + if (!d3d_info->texture_npot) + caps->TextureCaps |= WINED3DPTEXTURECAPS_CUBEMAP_POW2; + + caps->CubeTextureFilterCaps |= WINED3DPTFILTERCAPS_MAGFLINEAR | WINED3DPTFILTERCAPS_MAGFPOINT | WINED3DPTFILTERCAPS_MINFLINEAR | WINED3DPTFILTERCAPS_MINFPOINT @@ -4344,6 +4348,12 @@ static void adapter_gl_get_wined3d_caps(const struct wined3d_adapter *adapter, s | WINED3DPTFILTERCAPS_MIPLINEAR | WINED3DPTFILTERCAPS_MIPNEAREST | WINED3DPTFILTERCAPS_NEAREST; + + if (gl_info->supported[ARB_TEXTURE_FILTER_ANISOTROPIC]) + { + caps->CubeTextureFilterCaps |= WINED3DPTFILTERCAPS_MAGFANISOTROPIC + | WINED3DPTFILTERCAPS_MINFANISOTROPIC; + } } if (gl_info->supported[ARB_TEXTURE_BORDER_CLAMP]) @@ -4359,29 +4369,6 @@ static void adapter_gl_get_wined3d_caps(const struct wined3d_adapter *adapter, s caps->TextureAddressCaps |= WINED3DPTADDRESSCAPS_MIRRORONCE; } - if (gl_info->supported[EXT_TEXTURE3D]) - { - caps->VolumeTextureAddressCaps |= WINED3DPTADDRESSCAPS_INDEPENDENTUV - | WINED3DPTADDRESSCAPS_CLAMP - | WINED3DPTADDRESSCAPS_WRAP; - - if (gl_info->supported[ARB_TEXTURE_BORDER_CLAMP]) - { - caps->VolumeTextureAddressCaps |= WINED3DPTADDRESSCAPS_BORDER; - } - if (gl_info->supported[ARB_TEXTURE_MIRRORED_REPEAT]) - { - caps->VolumeTextureAddressCaps |= WINED3DPTADDRESSCAPS_MIRROR; - } - if (gl_info->supported[ARB_TEXTURE_MIRROR_CLAMP_TO_EDGE]) - { - caps->VolumeTextureAddressCaps |= WINED3DPTADDRESSCAPS_MIRRORONCE; - } - } - - if (gl_info->supported[EXT_TEXTURE3D]) - caps->MaxVolumeExtent = gl_info->limits.texture3d_size; - if (gl_info->supported[EXT_STENCIL_WRAP]) { caps->StencilCaps |= WINED3DSTENCILCAPS_DECR

1 0

Józef Kucia : wined3d: Introduce a separate structure for OpenGL adapters.
by Alexandre Julliard 22 Mar '19

22 Mar '19

Module: wine Branch: master Commit: 7593a7544d865c9b4448794a8e938316db8a6606 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7593a7544d865c9b4448794a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 22 09:42:05 2019 +0100 wined3d: Introduce a separate structure for OpenGL adapters. 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/wined3d/adapter_gl.c | 31 ++++++++++++++--- dlls/wined3d/device.c | 2 +- dlls/wined3d/directx.c | 76 +++++++++++++++++++++++++++++------------- dlls/wined3d/wined3d_private.h | 22 +++++++----- 4 files changed, 94 insertions(+), 37 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7593a7544d865c9b4448…

1 0

Stefan Dösinger : ddraw: Don' t operate on stored invalid clippers.
by Alexandre Julliard 22 Mar '19

22 Mar '19

Module: wine Branch: master Commit: 347efb985c7685ffd2e0a24090fc35be003dd84f URL: https://source.winehq.org/git/wine.git/?a=commit;h=347efb985c7685ffd2e0a240… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Mar 22 12:50:04 2019 +0300 ddraw: Don't operate on stored invalid clippers. 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 | 2 +- dlls/ddraw/ddraw_private.h | 1 + dlls/ddraw/surface.c | 13 ++++++++++--- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/clipper.c b/dlls/ddraw/clipper.c index e4b7ec2..68a0a7f 100644 --- a/dlls/ddraw/clipper.c +++ b/dlls/ddraw/clipper.c @@ -33,7 +33,7 @@ static inline struct ddraw_clipper *impl_from_IDirectDrawClipper(IDirectDrawClip return CONTAINING_RECORD(iface, struct ddraw_clipper, IDirectDrawClipper_iface); } -static BOOL ddraw_clipper_is_valid(const struct ddraw_clipper *clipper) +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 diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 77e2866..087c709 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -391,6 +391,7 @@ struct ddraw_clipper HRESULT ddraw_clipper_init(struct ddraw_clipper *clipper) DECLSPEC_HIDDEN; struct ddraw_clipper *unsafe_impl_from_IDirectDrawClipper(IDirectDrawClipper *iface) DECLSPEC_HIDDEN; +BOOL ddraw_clipper_is_valid(const struct ddraw_clipper *clipper) DECLSPEC_HIDDEN; /***************************************************************************** * IDirectDrawPalette implementation structure diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index b8cc2d2..4e2faef 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1549,6 +1549,12 @@ static HRESULT ddraw_surface_blt_clipped(struct ddraw_surface *dst_surface, cons return hr; } + if (!ddraw_clipper_is_valid(dst_surface->clipper)) + { + FIXME("Attempting to blit with an invalid clipper.\n"); + return DDERR_INVALIDPARAMS; + } + scale_x = (float)(src_rect.right - src_rect.left) / (float)(dst_rect.right - dst_rect.left); scale_y = (float)(src_rect.bottom - src_rect.top) / (float)(dst_rect.bottom - dst_rect.top); @@ -4426,7 +4432,8 @@ static HRESULT WINAPI ddraw_surface7_GetClipper(IDirectDrawSurface7 *iface, IDir } *clipper = &surface->clipper->IDirectDrawClipper_iface; - IDirectDrawClipper_AddRef(*clipper); + if (ddraw_clipper_is_valid(surface->clipper)) + IDirectDrawClipper_AddRef(*clipper); wined3d_mutex_unlock(); return DD_OK; @@ -4501,7 +4508,7 @@ static HRESULT WINAPI ddraw_surface7_SetClipper(IDirectDrawSurface7 *iface, if (clipper != NULL) IDirectDrawClipper_AddRef(iclipper); - if (old_clipper) + if (old_clipper && ddraw_clipper_is_valid(old_clipper)) IDirectDrawClipper_Release(&old_clipper->IDirectDrawClipper_iface); if ((This->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) && This->ddraw->wined3d_swapchain) @@ -5782,7 +5789,7 @@ static void STDMETHODCALLTYPE ddraw_surface_wined3d_object_destroyed(void *paren /* Reduce the ddraw surface count. */ list_remove(&surface->surface_list_entry); - if (surface->clipper) + if (surface->clipper && ddraw_clipper_is_valid(surface->clipper)) IDirectDrawClipper_Release(&surface->clipper->IDirectDrawClipper_iface); if (surface == surface->ddraw->primary)

1 0

Nikolay Sivov : mfplat: Print warning instead of fixme for unsupported interfaces in attributes object.
by Alexandre Julliard 22 Mar '19

22 Mar '19

Module: wine Branch: master Commit: 71bf156e1bc658c77814eb90ac8a8e2f39e38755 URL: https://source.winehq.org/git/wine.git/?a=commit;h=71bf156e1bc658c77814eb90… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 22 09:15:13 2019 +0300 mfplat: Print warning instead of fixme for unsupported interfaces in attributes object. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 899aca7..8e9cb66 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -651,24 +651,19 @@ static inline mfattributes *impl_from_IMFAttributes(IMFAttributes *iface) static HRESULT WINAPI mfattributes_QueryInterface(IMFAttributes *iface, REFIID riid, void **out) { - mfattributes *This = impl_from_IMFAttributes(iface); - - TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), out); + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), out); - if(IsEqualGUID(riid, &IID_IUnknown) || - IsEqualGUID(riid, &IID_IMFAttributes)) + if (IsEqualIID(riid, &IID_IMFAttributes) || + IsEqualGUID(riid, &IID_IUnknown)) { - *out = &This->IMFAttributes_iface; - } - else - { - FIXME("(%s, %p)\n", debugstr_guid(riid), out); - *out = NULL; - return E_NOINTERFACE; + *out = iface; + IMFAttributes_AddRef(iface); + return S_OK; } - IUnknown_AddRef((IUnknown*)*out); - return S_OK; + WARN("Unsupported %s.\n", debugstr_guid(riid)); + *out = NULL; + return E_NOINTERFACE; } static ULONG WINAPI mfattributes_AddRef(IMFAttributes *iface)

1 0

Nikolay Sivov : mfplat: Remove typedef for attributes structure.
by Alexandre Julliard 22 Mar '19

22 Mar '19

Module: wine Branch: master Commit: 52cca8e8e301b753b1f9e8c961dd2150d6aeaa65 URL: https://source.winehq.org/git/wine.git/?a=commit;h=52cca8e8e301b753b1f9e8c9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 22 09:15:14 2019 +0300 mfplat: Remove typedef for attributes structure. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 18 +++++++++--------- dlls/mfplat/mfplat_private.h | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 8e9cb66..30c3073 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -644,9 +644,9 @@ static const char *debugstr_attr(const GUID *guid) return ret ? wine_dbg_sprintf("%s", ret->name) : wine_dbgstr_guid(guid); } -static inline mfattributes *impl_from_IMFAttributes(IMFAttributes *iface) +static inline struct attributes *impl_from_IMFAttributes(IMFAttributes *iface) { - return CONTAINING_RECORD(iface, mfattributes, IMFAttributes_iface); + return CONTAINING_RECORD(iface, struct attributes, IMFAttributes_iface); } static HRESULT WINAPI mfattributes_QueryInterface(IMFAttributes *iface, REFIID riid, void **out) @@ -668,12 +668,12 @@ static HRESULT WINAPI mfattributes_QueryInterface(IMFAttributes *iface, REFIID r static ULONG WINAPI mfattributes_AddRef(IMFAttributes *iface) { - mfattributes *This = impl_from_IMFAttributes(iface); - ULONG ref = InterlockedIncrement(&This->ref); + struct attributes *attributes = impl_from_IMFAttributes(iface); + ULONG refcount = InterlockedIncrement(&attributes->ref); - TRACE("(%p) ref=%u\n", This, ref); + TRACE("%p, refcount %d.\n", iface, refcount); - return ref; + return refcount; } static ULONG WINAPI mfattributes_Release(IMFAttributes *iface) @@ -1792,7 +1792,7 @@ HRESULT WINAPI MFInitAttributesFromBlob(IMFAttributes *dest, const UINT8 *buffer typedef struct _mfbytestream { - mfattributes attributes; + struct attributes attributes; IMFByteStream IMFByteStream_iface; } mfbytestream; @@ -2273,7 +2273,7 @@ HRESULT WINAPI MFGetPluginControl(IMFPluginControl **ret) typedef struct _mfpresentationdescriptor { - mfattributes attributes; + struct attributes attributes; IMFPresentationDescriptor IMFPresentationDescriptor_iface; } mfpresentationdescriptor; @@ -3566,7 +3566,7 @@ HRESULT WINAPI MFCreateSourceResolver(IMFSourceResolver **resolver) typedef struct media_event { - mfattributes attributes; + struct attributes attributes; IMFMediaEvent IMFMediaEvent_iface; MediaEventType type; diff --git a/dlls/mfplat/mfplat_private.h b/dlls/mfplat/mfplat_private.h index 7d2e25f..b3ed176 100644 --- a/dlls/mfplat/mfplat_private.h +++ b/dlls/mfplat/mfplat_private.h @@ -30,7 +30,7 @@ struct attribute PROPVARIANT value; }; -typedef struct attributes +struct attributes { IMFAttributes IMFAttributes_iface; LONG ref; @@ -38,7 +38,7 @@ typedef struct attributes struct attribute *attributes; size_t capacity; size_t count; -} mfattributes; +}; extern HRESULT init_attributes_object(struct attributes *object, UINT32 size) DECLSPEC_HIDDEN; extern void clear_attributes_object(struct attributes *object) DECLSPEC_HIDDEN;

1 0