wine-devel March 2019

wine-devel@winehq.org

76 participants
1010 discussions

[PATCH] d3dxof: Change "value" size to 512.
by Józef Kucia 13 Mar '19

13 Mar '19

is_name() may write up to 512 bytes to the "value". Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3dxof/d3dxof_private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dxof/d3dxof_private.h b/dlls/d3dxof/d3dxof_private.h index cf33ed21ceaa..ff29261b6085 100644 --- a/dlls/d3dxof/d3dxof_private.h +++ b/dlls/d3dxof/d3dxof_private.h @@ -130,7 +130,7 @@ typedef struct { BOOL list_separator; ULONG cur_pos_data; LPBYTE cur_pstrings; - BYTE value[100]; + BYTE value[512]; xobject** pxo_globals; ULONG nb_pxo_globals; xobject* pxo_tab; -- 2.19.2

4 3

[PATCH 6/6] d3dx9: Merge the d3dx_effect_SetTexture() helper
by Michael Stefaniuc 13 Mar '19

13 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 59 +++++++++++++++++++----------------------- 1 file changed, 27 insertions(+), 32 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 0e436a1515..e180c2077c 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1499,35 +1499,6 @@ static HRESULT d3dx9_base_effect_get_vector_array(struct d3dx9_base_effect *base return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_set_texture(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, struct IDirect3DBaseTexture9 *texture) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (param && !param->element_count && - (param->type == D3DXPT_TEXTURE || param->type == D3DXPT_TEXTURE1D - || param->type == D3DXPT_TEXTURE2D || param->type == D3DXPT_TEXTURE3D - || param->type == D3DXPT_TEXTURECUBE)) - { - struct IDirect3DBaseTexture9 *oltexture = *(struct IDirect3DBaseTexture9 **)param->data; - - if (texture == oltexture) - return D3D_OK; - - if (texture) IDirect3DBaseTexture9_AddRef(texture); - if (oltexture) IDirect3DBaseTexture9_Release(oltexture); - - *(struct IDirect3DBaseTexture9 **)param->data = texture; - set_dirty(param); - - return D3D_OK; - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_get_vertex_shader(struct d3dx9_base_effect *base, D3DXHANDLE parameter, struct IDirect3DVertexShader9 **shader) { @@ -3532,14 +3503,38 @@ static HRESULT WINAPI d3dx_effect_GetString(ID3DXEffect *iface, D3DXHANDLE param return D3DERR_INVALIDCALL; } -static HRESULT WINAPI d3dx_effect_SetTexture(struct ID3DXEffect *iface, D3DXHANDLE parameter, - struct IDirect3DBaseTexture9 *texture) +static HRESULT WINAPI d3dx_effect_SetTexture(ID3DXEffect *iface, D3DXHANDLE parameter, + IDirect3DBaseTexture9 *texture) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, texture %p.\n", iface, parameter, texture); - return d3dx9_base_effect_set_texture(&effect->base_effect, parameter, texture); + if (param && !param->element_count + && (param->type == D3DXPT_TEXTURE || param->type == D3DXPT_TEXTURE1D + || param->type == D3DXPT_TEXTURE2D || param->type == D3DXPT_TEXTURE3D + || param->type == D3DXPT_TEXTURECUBE)) + { + IDirect3DBaseTexture9 *old_texture = *(IDirect3DBaseTexture9 **)param->data; + + if (texture == old_texture) + return D3D_OK; + + if (texture) + IDirect3DBaseTexture9_AddRef(texture); + if (old_texture) + IDirect3DBaseTexture9_Release(old_texture); + + *(IDirect3DBaseTexture9 **)param->data = texture; + set_dirty(param); + + return D3D_OK; + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_GetTexture(ID3DXEffect *iface, D3DXHANDLE parameter, -- 2.20.1

2 1

[PATCH 5/6] d3dx9: Merge the d3dx_effect_GetTexture() helper
by Michael Stefaniuc 13 Mar '19

13 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 42 ++++++++++++++++++------------------------ 1 file changed, 18 insertions(+), 24 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 155a499b9f..0e436a1515 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1528,27 +1528,6 @@ static HRESULT d3dx9_base_effect_set_texture(struct d3dx9_base_effect *base, return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_get_texture(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, struct IDirect3DBaseTexture9 **texture) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (texture && param && !param->element_count && - (param->type == D3DXPT_TEXTURE || param->type == D3DXPT_TEXTURE1D - || param->type == D3DXPT_TEXTURE2D || param->type == D3DXPT_TEXTURE3D - || param->type == D3DXPT_TEXTURECUBE)) - { - *texture = *(struct IDirect3DBaseTexture9 **)param->data; - if (*texture) IDirect3DBaseTexture9_AddRef(*texture); - TRACE("Returning %p\n", *texture); - return D3D_OK; - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_get_vertex_shader(struct d3dx9_base_effect *base, D3DXHANDLE parameter, struct IDirect3DVertexShader9 **shader) { @@ -3563,14 +3542,29 @@ static HRESULT WINAPI d3dx_effect_SetTexture(struct ID3DXEffect *iface, D3DXHAND return d3dx9_base_effect_set_texture(&effect->base_effect, parameter, texture); } -static HRESULT WINAPI d3dx_effect_GetTexture(struct ID3DXEffect *iface, D3DXHANDLE parameter, - struct IDirect3DBaseTexture9 **texture) +static HRESULT WINAPI d3dx_effect_GetTexture(ID3DXEffect *iface, D3DXHANDLE parameter, + IDirect3DBaseTexture9 **texture) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, texture %p.\n", iface, parameter, texture); - return d3dx9_base_effect_get_texture(&effect->base_effect, parameter, texture); + if (texture && param && !param->element_count + && (param->type == D3DXPT_TEXTURE || param->type == D3DXPT_TEXTURE1D + || param->type == D3DXPT_TEXTURE2D || param->type == D3DXPT_TEXTURE3D + || param->type == D3DXPT_TEXTURECUBE)) + { + *texture = *(IDirect3DBaseTexture9 **)param->data; + if (*texture) + IDirect3DBaseTexture9_AddRef(*texture); + TRACE("Returning %p.\n", *texture); + return D3D_OK; + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_GetPixelShader(ID3DXEffect *iface, D3DXHANDLE parameter, -- 2.20.1

2 1

[PATCH 4/6] d3dx9: Merge the d3dx_effect_SetString() helper
by Michael Stefaniuc 13 Mar '19

13 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index a81e330eaa..155a499b9f 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1499,22 +1499,6 @@ static HRESULT d3dx9_base_effect_get_vector_array(struct d3dx9_base_effect *base return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_set_string(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, const char *string) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (param && param->type == D3DXPT_STRING) - { - set_dirty(param); - return set_string(param->data, string); - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_set_texture(struct d3dx9_base_effect *base, D3DXHANDLE parameter, struct IDirect3DBaseTexture9 *texture) { @@ -3535,10 +3519,19 @@ static HRESULT WINAPI d3dx_effect_GetMatrixTransposePointerArray(ID3DXEffect *if static HRESULT WINAPI d3dx_effect_SetString(ID3DXEffect *iface, D3DXHANDLE parameter, const char *string) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, string %s.\n", iface, parameter, debugstr_a(string)); - return d3dx9_base_effect_set_string(&effect->base_effect, parameter, string); + if (param && param->type == D3DXPT_STRING) + { + set_dirty(param); + return set_string(param->data, string); + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_GetString(ID3DXEffect *iface, D3DXHANDLE parameter, const char **string) -- 2.20.1

2 1

[PATCH 3/6] d3dx9: Merge the d3dx_effect_GetString() helper
by Michael Stefaniuc 13 Mar '19

13 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 29 +++++++++++------------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 554d43df01..a81e330eaa 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1515,23 +1515,6 @@ static HRESULT d3dx9_base_effect_set_string(struct d3dx9_base_effect *base, return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_get_string(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, const char **string) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (string && param && !param->element_count && param->type == D3DXPT_STRING) - { - *string = *(const char **)param->data; - TRACE("Returning %s.\n", debugstr_a(*string)); - return D3D_OK; - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_set_texture(struct d3dx9_base_effect *base, D3DXHANDLE parameter, struct IDirect3DBaseTexture9 *texture) { @@ -3561,10 +3544,20 @@ static HRESULT WINAPI d3dx_effect_SetString(ID3DXEffect *iface, D3DXHANDLE param static HRESULT WINAPI d3dx_effect_GetString(ID3DXEffect *iface, D3DXHANDLE parameter, const char **string) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, string %p.\n", iface, parameter, string); - return d3dx9_base_effect_get_string(&effect->base_effect, parameter, string); + if (string && param && !param->element_count && param->type == D3DXPT_STRING) + { + *string = *(const char **)param->data; + TRACE("Returning %s.\n", debugstr_a(*string)); + return D3D_OK; + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_SetTexture(struct ID3DXEffect *iface, D3DXHANDLE parameter, -- 2.20.1

2 1

[PATCH 2/6] d3dx9: Merge the d3dx_effect_GetPixelShader() helper
by Michael Stefaniuc 13 Mar '19

13 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 33 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 993e61356b..554d43df01 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1582,24 +1582,6 @@ static HRESULT d3dx9_base_effect_get_texture(struct d3dx9_base_effect *base, return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_get_pixel_shader(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, struct IDirect3DPixelShader9 **shader) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (shader && param && !param->element_count && param->type == D3DXPT_PIXELSHADER) - { - if ((*shader = *(struct IDirect3DPixelShader9 **)param->data)) - IDirect3DPixelShader9_AddRef(*shader); - TRACE("Returning %p.\n", *shader); - return D3D_OK; - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_get_vertex_shader(struct d3dx9_base_effect *base, D3DXHANDLE parameter, struct IDirect3DVertexShader9 **shader) { @@ -3606,13 +3588,24 @@ static HRESULT WINAPI d3dx_effect_GetTexture(struct ID3DXEffect *iface, D3DXHAND } static HRESULT WINAPI d3dx_effect_GetPixelShader(ID3DXEffect *iface, D3DXHANDLE parameter, - struct IDirect3DPixelShader9 **shader) + IDirect3DPixelShader9 **shader) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, shader %p.\n", iface, parameter, shader); - return d3dx9_base_effect_get_pixel_shader(&effect->base_effect, parameter, shader); + if (shader && param && !param->element_count && param->type == D3DXPT_PIXELSHADER) + { + if ((*shader = *(IDirect3DPixelShader9 **)param->data)) + IDirect3DPixelShader9_AddRef(*shader); + TRACE("Returning %p.\n", *shader); + return D3D_OK; + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_GetVertexShader(struct ID3DXEffect *iface, D3DXHANDLE parameter, -- 2.20.1

2 1

[PATCH 1/6] d3dx9: Merge the d3dx_effect_GetParameterDesc() helper
by Michael Stefaniuc 13 Mar '19

13 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 49 ++++++++++++++++++------------------------ 1 file changed, 21 insertions(+), 28 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index b12127b35b..993e61356b 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -989,33 +989,6 @@ static inline DWORD d3dx9_effect_version(DWORD major, DWORD minor) return (0xfeff0000 | ((major) << 8) | (minor)); } -static HRESULT d3dx9_base_effect_get_parameter_desc(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, D3DXPARAMETER_DESC *desc) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (!desc || !param) - { - WARN("Invalid argument specified.\n"); - return D3DERR_INVALIDCALL; - } - - desc->Name = param->name; - desc->Semantic = param->semantic; - desc->Class = param->class; - desc->Type = param->type; - desc->Rows = param->rows; - desc->Columns = param->columns; - desc->Elements = param->element_count; - desc->Annotations = is_top_level_parameter(param) - ? top_level_parameter_from_parameter(param)->annotation_count : 0; - desc->StructMembers = param->member_count; - desc->Flags = param->flags; - desc->Bytes = param->bytes; - - return D3D_OK; -} - static HRESULT d3dx9_get_param_value_ptr(struct d3dx_pass *pass, struct d3dx_state *state, void **param_value, struct d3dx_parameter **out_param, BOOL update_all, BOOL *param_dirty) @@ -2335,10 +2308,30 @@ static HRESULT WINAPI d3dx_effect_GetParameterDesc(ID3DXEffect *iface, D3DXHANDL D3DXPARAMETER_DESC *desc) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, desc %p.\n", iface, parameter, desc); - return d3dx9_base_effect_get_parameter_desc(&effect->base_effect, parameter, desc); + if (!desc || !param) + { + WARN("Invalid argument specified.\n"); + return D3DERR_INVALIDCALL; + } + + desc->Name = param->name; + desc->Semantic = param->semantic; + desc->Class = param->class; + desc->Type = param->type; + desc->Rows = param->rows; + desc->Columns = param->columns; + desc->Elements = param->element_count; + desc->Annotations = is_top_level_parameter(param) + ? top_level_parameter_from_parameter(param)->annotation_count : 0; + desc->StructMembers = param->member_count; + desc->Flags = param->flags; + desc->Bytes = param->bytes; + + return D3D_OK; } static HRESULT WINAPI d3dx_effect_GetTechniqueDesc(ID3DXEffect *iface, D3DXHANDLE technique, -- 2.20.1

2 1

[PATCH v2 1/6] include: Correct IDL attributes for control.idl.
by Zebediah Figura 13 Mar '19

13 Mar '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- include/control.idl | 49 +++++++++++++++++++++++++-------------------- 1 file changed, 27 insertions(+), 22 deletions(-) diff --git a/include/control.idl b/include/control.idl index 529d435f78..265444aad0 100644 --- a/include/control.idl +++ b/include/control.idl @@ -42,7 +42,8 @@ library QuartzTypeLib [ object, uuid(56a868b1-0ad4-11ce-b03a-0020af0ba770), - pointer_default(unique) + oleautomation, + dual, ] interface IMediaControl : IDispatch { @@ -52,8 +53,8 @@ library QuartzTypeLib HRESULT GetState( [in] LONG msTimeout, [out] OAFilterState *pfs ); HRESULT RenderFile( [in] BSTR strFilename ); HRESULT AddSourceFilter( [in] BSTR strFilename, [out] IDispatch **ppUnk ); - [propget] HRESULT FilterCollection( [out] IDispatch **ppUnk ); - [propget] HRESULT RegFilterCollection( [out] IDispatch **ppUnk ); + [propget] HRESULT FilterCollection( [out, retval] IDispatch **ppUnk ); + [propget] HRESULT RegFilterCollection( [out, retval] IDispatch **ppUnk ); HRESULT StopWhenReady(); } @@ -64,7 +65,8 @@ library QuartzTypeLib [ object, uuid(56a868b3-0ad4-11ce-b03a-0020af0ba770), - pointer_default(unique) + oleautomation, + dual, ] interface IBasicAudio : IDispatch { @@ -81,7 +83,8 @@ library QuartzTypeLib [ object, uuid(56a868b4-0ad4-11ce-b03a-0020af0ba770), - pointer_default(unique) + oleautomation, + dual, ] interface IVideoWindow : IDispatch { @@ -133,7 +136,8 @@ library QuartzTypeLib [ object, uuid(56a868b5-0ad4-11ce-b03a-0020af0ba770), - pointer_default(unique) + oleautomation, + dual, ] interface IBasicVideo : IDispatch { @@ -168,9 +172,9 @@ library QuartzTypeLib HRESULT GetVideoPaletteEntries( [in] LONG StartIndex, [in] LONG Entries, [out] LONG *pRetrieved, - [out, size_is(Entries), length_is(*pRetrieved)] LONG *pPalette ); + [out] LONG *pPalette ); HRESULT GetCurrentImage( [in, out] LONG *pBufferSize, - [out, size_is(*pBufferSize), length_is(*pBufferSize)] LONG *pDIBImage ); + [out] LONG *pDIBImage ); HRESULT IsUsingDefaultSource(); HRESULT IsUsingDefaultDestination(); } @@ -193,7 +197,8 @@ library QuartzTypeLib [ object, uuid(56a868b6-0ad4-11ce-b03a-0020af0ba770), - pointer_default(unique) + oleautomation, + dual, ] interface IMediaEvent : IDispatch { @@ -212,7 +217,6 @@ library QuartzTypeLib [ object, uuid(56a868c0-0ad4-11ce-b03a-0020af0ba770), - pointer_default(unique) ] interface IMediaEventEx : IMediaEvent { @@ -228,21 +232,22 @@ library QuartzTypeLib [ object, uuid(56a868b2-0ad4-11ce-b03a-0020af0ba770), - pointer_default(unique) + oleautomation, + dual, ] interface IMediaPosition : IDispatch { - HRESULT get_Duration( [out] REFTIME *plength ); - HRESULT put_CurrentPosition( [in] REFTIME llTime ); - HRESULT get_CurrentPosition( [out] REFTIME *pllTime ); - HRESULT get_StopTime( [out] REFTIME *pllTime ); - HRESULT put_StopTime( [in] REFTIME llTime ); - HRESULT get_PrerollTime( [out] REFTIME *pllTime ); - HRESULT put_PrerollTime( [in] REFTIME llTime ); - HRESULT put_Rate( [in] double dRate ); - HRESULT get_Rate( [out] double *pdRate ); - HRESULT CanSeekForward( [out] LONG *pCanSeekForward ); - HRESULT CanSeekBackward( [out] LONG *pCanSeekBackward ); + [propget] HRESULT Duration( [out, retval] REFTIME *plength ); + [propput] HRESULT CurrentPosition( [in] REFTIME llTime ); + [propget] HRESULT CurrentPosition( [out, retval] REFTIME *pllTime ); + [propget] HRESULT StopTime( [out, retval] REFTIME *pllTime ); + [propput] HRESULT StopTime( [in] REFTIME llTime ); + [propget] HRESULT PrerollTime( [out, retval] REFTIME *pllTime ); + [propput] HRESULT PrerollTime( [in] REFTIME llTime ); + [propput] HRESULT Rate( [in] double dRate ); + [propget] HRESULT Rate( [out, retval] double *pdRate ); + HRESULT CanSeekForward( [out, retval] LONG *pCanSeekForward ); + HRESULT CanSeekBackward( [out, retval] LONG *pCanSeekBackward ); } } /* library QuartzTypeLib */ -- 2.20.1

2 9

[PATCH 2/4] dxgi/tests: Use void pointer for get_refcount() parameter.
by Józef Kucia 13 Mar '19

13 Mar '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/tests/dxgi.c | 53 +++++++++++++++++++++--------------------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 23d6a29c8ed3..91d218f3e8ef 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -106,10 +106,11 @@ static void run_queued_tests(void) heap_free(threads); } -static ULONG get_refcount(IUnknown *iface) +static ULONG get_refcount(void *iface) { - IUnknown_AddRef(iface); - return IUnknown_Release(iface); + IUnknown *unknown = iface; + IUnknown_AddRef(unknown); + return IUnknown_Release(unknown); } #define check_interface(a, b, c, d) check_interface_(__LINE__, a, b, c, d) @@ -1418,10 +1419,10 @@ static void test_create_swapchain(void) hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory); ok(hr == S_OK, "Failed to get parent, hr %#x.\n", hr); - expected_refcount = get_refcount((IUnknown *)adapter); - refcount = get_refcount((IUnknown *)factory); + expected_refcount = get_refcount(adapter); + refcount = get_refcount(factory); ok(refcount == 2, "Got unexpected refcount %u.\n", refcount); - refcount = get_refcount((IUnknown *)device); + refcount = get_refcount(device); ok(refcount == 2, "Got unexpected refcount %u.\n", refcount); creation_desc.OutputWindow = NULL; @@ -1441,11 +1442,11 @@ static void test_create_swapchain(void) hr = IDXGIFactory_CreateSwapChain(factory, obj, &creation_desc, &swapchain); ok(hr == S_OK, "Failed to create swapchain, hr %#x.\n", hr); - refcount = get_refcount((IUnknown *)adapter); + refcount = get_refcount(adapter); ok(refcount >= expected_refcount, "Got refcount %u, expected >= %u.\n", refcount, expected_refcount); - refcount = get_refcount((IUnknown *)factory); + refcount = get_refcount(factory); todo_wine ok(refcount == 4, "Got unexpected refcount %u.\n", refcount); - refcount = get_refcount((IUnknown *)device); + refcount = get_refcount(device); ok(refcount == 3, "Got unexpected refcount %u.\n", refcount); hr = IDXGISwapChain_GetDesc(swapchain, NULL); @@ -1492,7 +1493,7 @@ static void test_create_swapchain(void) refcount = IDXGISwapChain_Release(swapchain); ok(!refcount, "Swapchain has %u references left.\n", refcount); - refcount = get_refcount((IUnknown *)factory); + refcount = get_refcount(factory); ok(refcount == 2, "Got unexpected refcount %u.\n", refcount); for (i = 0; i < ARRAY_SIZE(refresh_list); ++i) @@ -3210,23 +3211,23 @@ static void test_private_data(void) ok(!ptr, "Got unexpected pointer %p.\n", ptr); ok(size == sizeof(IUnknown *), "Got unexpected size %u.\n", size); - refcount = get_refcount((IUnknown *)test_object); + refcount = get_refcount(test_object); hr = IDXGIDevice_SetPrivateDataInterface(device, &dxgi_private_data_test_guid, (IUnknown *)test_object); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); expected_refcount = refcount + 1; - refcount = get_refcount((IUnknown *)test_object); + refcount = get_refcount(test_object); ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); hr = IDXGIDevice_SetPrivateDataInterface(device, &dxgi_private_data_test_guid, (IUnknown *)test_object); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - refcount = get_refcount((IUnknown *)test_object); + refcount = get_refcount(test_object); ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); hr = IDXGIDevice_SetPrivateDataInterface(device, &dxgi_private_data_test_guid, NULL); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); expected_refcount--; - refcount = get_refcount((IUnknown *)test_object); + refcount = get_refcount(test_object); ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); hr = IDXGIDevice_SetPrivateDataInterface(device, &dxgi_private_data_test_guid, @@ -3235,7 +3236,7 @@ static void test_private_data(void) size = sizeof(data); hr = IDXGIDevice_SetPrivateData(device, &dxgi_private_data_test_guid, size, data); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - refcount = get_refcount((IUnknown *)test_object); + refcount = get_refcount(test_object); ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); hr = IDXGIDevice_SetPrivateData(device, &dxgi_private_data_test_guid, 42, NULL); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); @@ -3252,7 +3253,7 @@ static void test_private_data(void) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); ok(size == sizeof(test_object), "Got unexpected size %u.\n", size); expected_refcount++; - refcount = get_refcount((IUnknown *)test_object); + refcount = get_refcount(test_object); ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); if (ptr) IUnknown_Release(ptr); @@ -3267,7 +3268,7 @@ static void test_private_data(void) hr = IDXGIDevice_GetPrivateData(device, &dxgi_private_data_test_guid, &size, NULL); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); ok(size == sizeof(device), "Got unexpected size %u.\n", size); - refcount = get_refcount((IUnknown *)test_object); + refcount = get_refcount(test_object); ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); size = 1; @@ -4263,13 +4264,13 @@ static void test_output_desc(void) hr = IDXGIFactory_EnumAdapters(factory, i, &adapter2); ok(SUCCEEDED(hr), "Failed to enumerate adapter %u, hr %#x.\n", i, hr); ok(adapter != adapter2, "Expected to get new instance of IDXGIAdapter, %p == %p.\n", adapter, adapter2); - refcount = get_refcount((IUnknown *)adapter); + refcount = get_refcount(adapter); ok(refcount == 1, "Get unexpected refcount %u for adapter %u.\n", refcount, i); IDXGIAdapter_Release(adapter2); - refcount = get_refcount((IUnknown *)factory); + refcount = get_refcount(factory); ok(refcount == 2, "Get unexpected refcount %u.\n", refcount); - refcount = get_refcount((IUnknown *)adapter); + refcount = get_refcount(adapter); ok(refcount == 1, "Get unexpected refcount %u for adapter %u.\n", refcount, i); for (j = 0; ; ++j) @@ -4285,15 +4286,15 @@ static void test_output_desc(void) hr = IDXGIAdapter_EnumOutputs(adapter, j, &output2); ok(SUCCEEDED(hr), "Failed to enumerate output %u on adapter %u, hr %#x.\n", j, i, hr); ok(output != output2, "Expected to get new instance of IDXGIOutput, %p == %p.\n", output, output2); - refcount = get_refcount((IUnknown *)output); + refcount = get_refcount(output); ok(refcount == 1, "Get unexpected refcount %u for output %u, adapter %u.\n", refcount, j, i); IDXGIOutput_Release(output2); - refcount = get_refcount((IUnknown *)factory); + refcount = get_refcount(factory); ok(refcount == 2, "Get unexpected refcount %u.\n", refcount); - refcount = get_refcount((IUnknown *)adapter); + refcount = get_refcount(adapter); ok(refcount == 2, "Get unexpected refcount %u for adapter %u.\n", refcount, i); - refcount = get_refcount((IUnknown *)output); + refcount = get_refcount(output); ok(refcount == 1, "Get unexpected refcount %u for output %u, adapter %u.\n", refcount, j, i); hr = IDXGIOutput_GetDesc(output, &desc); @@ -4310,12 +4311,12 @@ static void test_output_desc(void) wine_dbgstr_rect(&monitor_info.rcMonitor)); IDXGIOutput_Release(output); - refcount = get_refcount((IUnknown *)adapter); + refcount = get_refcount(adapter); ok(refcount == 1, "Get unexpected refcount %u for adapter %u.\n", refcount, i); } IDXGIAdapter_Release(adapter); - refcount = get_refcount((IUnknown *)factory); + refcount = get_refcount(factory); ok(refcount == 1, "Get unexpected refcount %u.\n", refcount); } -- 2.19.2

3 2

[PATCH resend 1/6] user32/focus: Prevent a recursive loop with the activation messages
by Gabriel Ivăncescu 13 Mar '19

13 Mar '19

When activating a window and sending activation messages to the window procedure, we have to avoid a recursive loop by not sending more of these messages or hooks while we are still activating the window. Some applications actually depend on this behavior. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46274 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- It may seem a bit strange, but this is exactly what's needed to match the testcase in the next patch, so this is how Windows does it (including the hooks). dlls/user32/focus.c | 44 +++++++++++++++++++++++++++++--------------- dlls/user32/win.h | 1 + 2 files changed, 30 insertions(+), 15 deletions(-) diff --git a/dlls/user32/focus.c b/dlls/user32/focus.c index f1c8831..0d32d00 100644 --- a/dlls/user32/focus.c +++ b/dlls/user32/focus.c @@ -78,7 +78,7 @@ static BOOL set_active_window( HWND hwnd, HWND *prev, BOOL mouse, BOOL focus ) { HWND previous = GetActiveWindow(); BOOL ret; - DWORD old_thread, new_thread; + DWORD winflags, old_thread, new_thread; CBTACTIVATESTRUCT cbt; if (previous == hwnd) @@ -87,16 +87,24 @@ static BOOL set_active_window( HWND hwnd, HWND *prev, BOOL mouse, BOOL focus ) return TRUE; } - /* call CBT hook chain */ - cbt.fMouse = mouse; - cbt.hWndActive = previous; - if (HOOK_CallHooks( WH_CBT, HCBT_ACTIVATE, (WPARAM)hwnd, (LPARAM)&cbt, TRUE )) return FALSE; - - if (IsWindow(previous)) + /* Prevent a recursive activation loop with the activation messages */ + winflags = win_set_flags(hwnd, WIN_IS_IN_ACTIVATION, 0); + if (!(winflags & WIN_IS_IN_ACTIVATION)) { - SendMessageW( previous, WM_NCACTIVATE, FALSE, (LPARAM)hwnd ); - SendMessageW( previous, WM_ACTIVATE, - MAKEWPARAM( WA_INACTIVE, IsIconic(previous) ), (LPARAM)hwnd ); + ret = FALSE; + + /* call CBT hook chain */ + cbt.fMouse = mouse; + cbt.hWndActive = previous; + if (HOOK_CallHooks( WH_CBT, HCBT_ACTIVATE, (WPARAM)hwnd, (LPARAM)&cbt, TRUE )) + goto clear_flags; + + if (IsWindow(previous)) + { + SendMessageW( previous, WM_NCACTIVATE, FALSE, (LPARAM)hwnd ); + SendMessageW( previous, WM_ACTIVATE, + MAKEWPARAM( WA_INACTIVE, IsIconic(previous) ), (LPARAM)hwnd ); + } } SERVER_START_REQ( set_active_window ) @@ -106,9 +114,9 @@ static BOOL set_active_window( HWND hwnd, HWND *prev, BOOL mouse, BOOL focus ) previous = wine_server_ptr_handle( reply->previous ); } SERVER_END_REQ; - if (!ret) return FALSE; + if (!ret) goto clear_flags; if (prev) *prev = previous; - if (previous == hwnd) return TRUE; + if (previous == hwnd) goto clear_flags; if (hwnd) { @@ -116,7 +124,11 @@ static BOOL set_active_window( HWND hwnd, HWND *prev, BOOL mouse, BOOL focus ) if (SendMessageW( hwnd, WM_QUERYNEWPALETTE, 0, 0 )) SendMessageTimeoutW( HWND_BROADCAST, WM_PALETTEISCHANGING, (WPARAM)hwnd, 0, SMTO_ABORTIFHUNG, 2000, NULL ); - if (!IsWindow(hwnd)) return FALSE; + if (!IsWindow(hwnd)) + { + ret = FALSE; + goto clear_flags; + } } old_thread = previous ? GetWindowThreadProcessId( previous, NULL ) : 0; @@ -148,7 +160,7 @@ static BOOL set_active_window( HWND hwnd, HWND *prev, BOOL mouse, BOOL focus ) } } - if (IsWindow(hwnd)) + if (!(winflags & WIN_IS_IN_ACTIVATION) && IsWindow(hwnd)) { SendMessageW( hwnd, WM_NCACTIVATE, (hwnd == GetForegroundWindow()), (LPARAM)previous ); SendMessageW( hwnd, WM_ACTIVATE, @@ -173,7 +185,9 @@ static BOOL set_active_window( HWND hwnd, HWND *prev, BOOL mouse, BOOL focus ) } } - return TRUE; +clear_flags: + win_set_flags(hwnd, 0, WIN_IS_IN_ACTIVATION); + return ret; } diff --git a/dlls/user32/win.h b/dlls/user32/win.h index 81b08fc..d53e1a5 100644 --- a/dlls/user32/win.h +++ b/dlls/user32/win.h @@ -79,6 +79,7 @@ typedef struct tagWND #define WIN_NEEDS_SHOW_OWNEDPOPUP 0x0020 /* WM_SHOWWINDOW:SC_SHOW must be sent in the next ShowOwnedPopup call */ #define WIN_CHILDREN_MOVED 0x0040 /* children may have moved, ignore stored positions */ #define WIN_HAS_IME_WIN 0x0080 /* the window has been registered with imm32 */ +#define WIN_IS_IN_ACTIVATION 0x0100 /* the window is in an activation process */ /* Window functions */ extern HWND get_hwnd_message_parent(void) DECLSPEC_HIDDEN; -- 2.20.1

2 11

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel March 2019