September 2021 - Wine-commits

Nikolay Sivov : riched20: Use regular allocation helpers for text services objects.
by Alexandre Julliard 30 Sep '21

30 Sep '21

Module: wine Branch: master Commit: 2064c206c0b67edb8524f572166b974ba9cbd6fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=2064c206c0b67edb8524f572… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 30 16:10:27 2021 +0300 riched20: Use regular allocation helpers for text services objects. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/txthost.c | 4 ++-- dlls/riched20/txtsrv.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index e18ec9490c0..af4d37d9fd2 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -93,7 +93,7 @@ struct host *host_create( HWND hwnd, CREATESTRUCTW *cs, BOOL emulate_10 ) { struct host *texthost; - texthost = CoTaskMemAlloc(sizeof(*texthost)); + texthost = heap_alloc(sizeof(*texthost)); if (!texthost) return NULL; texthost->ITextHost_iface.lpVtbl = &textHostVtbl; @@ -158,7 +158,7 @@ static ULONG WINAPI ITextHostImpl_Release( ITextHost2 *iface ) { SetWindowLongPtrW( host->window, 0, 0 ); ITextServices_Release( host->text_srv ); - CoTaskMemFree( host ); + heap_free( host ); } return ref; } diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index 73b8d3ea7e9..fb7fc754bb5 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -81,7 +81,7 @@ static ULONG WINAPI ITextServicesImpl_Release(IUnknown *iface) { richole_release_children( services ); ME_DestroyEditor( services->editor ); - CoTaskMemFree( services ); + heap_free( services ); } return ref; } @@ -580,7 +580,7 @@ HRESULT create_text_services( IUnknown *outer, ITextHost *text_host, IUnknown ** TRACE( "%p %p --> %p\n", outer, text_host, unk ); if (text_host == NULL) return E_POINTER; - services = CoTaskMemAlloc( sizeof(*services) ); + services = heap_alloc( sizeof(*services) ); if (services == NULL) return E_OUTOFMEMORY; services->ref = 1; services->IUnknown_inner.lpVtbl = &textservices_inner_vtbl;

1 0

Eric Pouech : d3dx9: Fix use of D3DXVec2Normalize().
by Alexandre Julliard 30 Sep '21

30 Sep '21

Module: wine Branch: master Commit: 46b33179c239002cbe7de5fea00a815b5c8fab21 URL: https://source.winehq.org/git/wine.git/?a=commit;h=46b33179c239002cbe7de5fe… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Sep 30 21:05:08 2021 +0200 d3dx9: Fix use of D3DXVec2Normalize(). Spotted by GCC 11. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/mesh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 8f7c926c32a..48abb7ede41 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -5508,7 +5508,7 @@ static inline BOOL is_direction_similar(D3DXVECTOR2 *dir1, D3DXVECTOR2 *dir2, fl static inline D3DXVECTOR2 *unit_vec2(D3DXVECTOR2 *dir, const D3DXVECTOR2 *pt1, const D3DXVECTOR2 *pt2) { - return D3DXVec2Normalize(D3DXVec2Subtract(dir, pt2, pt1), dir); + return D3DXVec2Normalize(dir, D3DXVec2Subtract(dir, pt2, pt1)); } struct cos_table

1 0

Eric Pouech : d3dx9/tests: Fix use of D3DXVec2Normalize().
by Alexandre Julliard 30 Sep '21

30 Sep '21

Module: wine Branch: master Commit: 70c51f89bdcecd6119345038b8f33785aa465865 URL: https://source.winehq.org/git/wine.git/?a=commit;h=70c51f89bdcecd6119345038… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Sep 30 21:05:09 2021 +0200 d3dx9/tests: Fix use of D3DXVec2Normalize(). Spotted by GCC 11. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/mesh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index e981f3623ce..829e4ee0ff9 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -3611,7 +3611,7 @@ static inline BOOL is_direction_similar(D3DXVECTOR2 *dir1, D3DXVECTOR2 *dir2, fl static inline D3DXVECTOR2 *unit_vec2(D3DXVECTOR2 *dir, const D3DXVECTOR2 *pt1, const D3DXVECTOR2 *pt2) { - return D3DXVec2Normalize(D3DXVec2Subtract(dir, pt2, pt1), dir); + return D3DXVec2Normalize(dir, D3DXVec2Subtract(dir, pt2, pt1)); } static BOOL attempt_line_merge(struct outline *outline,

1 0

Nikolay Sivov : d3d10/effect: Go through both local and shared buffers when looking for shader resources.
by Alexandre Julliard 30 Sep '21

30 Sep '21

Module: wine Branch: master Commit: 7fe8e49f336d54895b98f03834605e7b615dd543 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7fe8e49f336d54895b98f038… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 28 15:23:03 2021 +0300 d3d10/effect: Go through both local and shared buffers when looking for shader resources. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 56 ++++++++++++++++++++++++++++------------------- dlls/d3d10/tests/effect.c | 53 +++++++++++++++++++++++++++++++------------- 2 files changed, 72 insertions(+), 37 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 668efcda666..71660eb399e 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -526,6 +526,35 @@ static BOOL copy_name(const char *ptr, char **name) return TRUE; } +static struct d3d10_effect_variable * d3d10_effect_get_buffer_by_name(struct d3d10_effect *effect, + const char *name) +{ + ID3D10EffectVariable *v; + unsigned int i; + + for (i = 0; i < effect->local_buffer_count; ++i) + { + struct d3d10_effect_variable *l = &effect->local_buffers[i]; + if (l->name && !strcmp(l->name, name)) + { + TRACE("Found local buffer %s.\n", debugstr_a(name)); + return l; + } + } + + if (effect->pool) + { + if ((v = (ID3D10EffectVariable *)effect->pool->lpVtbl->GetConstantBufferByName(effect->pool, name)) + && v->lpVtbl->IsValid(v)) + { + TRACE("Found shared buffer %s.\n", debugstr_a(name)); + return impl_from_ID3D10EffectVariable(v); + } + } + + return NULL; +} + static HRESULT get_fx10_shader_resources(struct d3d10_effect_variable *v, const void *data, size_t data_size) { struct d3d10_effect_shader_variable *sv = &v->u.shader; @@ -557,16 +586,7 @@ static HRESULT get_fx10_shader_resources(struct d3d10_effect_variable *v, const { case D3D10_SIT_CBUFFER: case D3D10_SIT_TBUFFER: - for (y = 0; y < v->effect->local_buffer_count; ++y) - { - var = &v->effect->local_buffers[y]; - - if (!strcmp(bind_desc.Name, var->name)) - { - sr->variable = var; - break; - } - } + sr->variable = d3d10_effect_get_buffer_by_name(v->effect, bind_desc.Name); break; case D3D10_SIT_SAMPLER: @@ -3316,24 +3336,16 @@ static struct ID3D10EffectConstantBuffer * STDMETHODCALLTYPE d3d10_effect_GetCon const char *name) { struct d3d10_effect *effect = impl_from_ID3D10Effect(iface); - unsigned int i; + struct d3d10_effect_variable *v; TRACE("iface %p, name %s.\n", iface, debugstr_a(name)); - for (i = 0; i < effect->local_buffer_count; ++i) + if ((v = d3d10_effect_get_buffer_by_name(effect, name))) { - struct d3d10_effect_variable *l = &effect->local_buffers[i]; - - if (l->name && !strcmp(l->name, name)) - { - TRACE("Returning buffer %p.\n", l); - return (ID3D10EffectConstantBuffer *)&l->ID3D10EffectVariable_iface; - } + TRACE("Returning buffer %p.\n", v); + return (ID3D10EffectConstantBuffer *)&v->ID3D10EffectVariable_iface; } - if (effect->pool) - return effect->pool->lpVtbl->GetConstantBufferByName(effect->pool, name); - WARN("Invalid name specified\n"); return (ID3D10EffectConstantBuffer *)&null_local_buffer.ID3D10EffectVariable_iface; diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index e833fc09799..a1ec44a0a16 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -6294,22 +6294,27 @@ shared BlendState s_blendstate; shared Texture s_texture; shared PixelShader ps; +float4 VS( float4 pos : POSITION ) : SV_POSITION +{ + return f1.xxxx; +} + technique10 tech_child { pass P0 { SetPixelShader(ps); - SetVertexShader(NULL); + SetVertexShader(CompileShader(vs_4_0, VS())); SetGeometryShader(NULL); } }; #endif static DWORD fx_test_pool_child[] = { - 0x43425844, 0xa11d7cb2, 0x41f20697, 0x14a62983, 0x43b9f39c, 0x00000001, 0x0000029f, 0x00000001, - 0x00000024, 0x30315846, 0x00000273, 0xfeff1001, 0x00000002, 0x00000002, 0x00000000, 0x00000001, - 0x00000002, 0x00000003, 0x00000001, 0x00000103, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x62635f6c, + 0x43425844, 0xa46943b7, 0x1a80ed65, 0x3602c2be, 0xfe502f4e, 0x00000001, 0x000004d7, 0x00000001, + 0x00000024, 0x30315846, 0x000004ab, 0xfeff1001, 0x00000002, 0x00000002, 0x00000000, 0x00000001, + 0x00000002, 0x00000003, 0x00000001, 0x0000033b, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000001, 0x00000000, 0x62635f6c, 0x6f6c6600, 0x09007461, 0x01000000, 0x00000000, 0x04000000, 0x10000000, 0x04000000, 0x09000000, 0x66000009, 0x4f430030, 0x30524f4c, 0x635f6c00, 0x66003262, 0x5f730033, 0x66006263, 0x32660031, 0x4c4f4300, 0x0031524f, 0x6e656c42, 0x61745364, 0x50006574, 0x02000000, 0x00000000, 0x00000000, @@ -6317,16 +6322,34 @@ static DWORD fx_test_pool_child[] = 0x00657275, 0x00000084, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000009, 0x65745f73, 0x72757478, 0x69500065, 0x536c6578, 0x65646168, 0x00b20072, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00050000, 0x73700000, 0x63657400, 0x68635f68, 0x00646c69, - 0x01003050, 0x02000000, 0x00000000, 0x01000000, 0x02000000, 0x00000000, 0x04000000, 0x10000000, - 0x00000000, 0x01000000, 0xff000000, 0x00ffffff, 0x2b000000, 0x0f000000, 0x2e000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x35000000, 0x10000000, 0x00000000, 0x01000000, 0xff000000, - 0x00ffffff, 0x3b000000, 0x0f000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x3e000000, 0x10000000, 0x00000000, 0x02000000, 0xff000000, 0x43ffffff, 0x0f000000, 0x2e000000, - 0x00000000, 0x00000000, 0x00000000, 0x46000000, 0x0f000000, 0x49000000, 0x04000000, 0x00000000, - 0x00000000, 0x77000000, 0x5b000000, 0x00000000, 0xff000000, 0xa8ffffff, 0x8c000000, 0x00000000, - 0xff000000, 0xdaffffff, 0xbe000000, 0x00000000, 0xff000000, 0xddffffff, 0x01000000, 0x00000000, - 0xe8000000, 0x03000000, 0x00000000, 0x07000000, 0x00000000, 0x02000000, 0xda000000, 0x06000000, - 0x00000000, 0x01000000, 0xeb000000, 0x08000000, 0x00000000, 0x01000000, 0xf7000000, 0x00000000, + 0x38003050, 0x44000002, 0x2d434258, 0x4237b3f1, 0x252579b9, 0x2c27ed59, 0x014a8013, 0x38000000, + 0x05000002, 0x34000000, 0x08000000, 0x3c000001, 0x70000001, 0xbc000001, 0x52000001, 0xcc464544, + 0x01000000, 0x44000000, 0x01000000, 0x1c000000, 0x00000000, 0x00fffe04, 0xa3000001, 0x3c000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x01000000, 0x00000000, 0x73000000, + 0x0062635f, 0x3cababab, 0x02000000, 0x5c000000, 0x10000000, 0x00000000, 0x00000000, 0x8c000000, + 0x00000000, 0x04000000, 0x02000000, 0x90000000, 0x00000000, 0xa0000000, 0x04000000, 0x04000000, + 0x00000000, 0x90000000, 0x00000000, 0x66000000, 0x00ab0031, 0x01000300, 0x00000100, 0x00000000, + 0x66000000, 0x694d0032, 0x736f7263, 0x2074666f, 0x20295228, 0x4c534c48, 0x61685320, 0x20726564, + 0x706d6f43, 0x72656c69, 0x2e303120, 0x49ab0031, 0x2c4e4753, 0x01000000, 0x08000000, 0x20000000, + 0x00000000, 0x00000000, 0x03000000, 0x00000000, 0x0f000000, 0x50000000, 0x5449534f, 0x004e4f49, + 0x4fababab, 0x2c4e4753, 0x01000000, 0x08000000, 0x20000000, 0x00000000, 0x01000000, 0x03000000, + 0x00000000, 0x0f000000, 0x53000000, 0x4f505f56, 0x49544953, 0x53004e4f, 0x44524448, 0x40000000, + 0x11000100, 0x59000000, 0x46040000, 0x0000208e, 0x01000000, 0x67000000, 0xf2040000, 0x00001020, + 0x01000000, 0x36000000, 0xf2060000, 0x00001020, 0x06000000, 0x00002080, 0x00000000, 0x3e000000, + 0x53010000, 0x74544154, 0x02000000, 0x00000000, 0x00000000, 0x01000000, 0x00000000, 0x00000000, + 0x00000000, 0x01000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x01000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xeb000000, + 0x00000000, 0x01000000, 0x02000000, 0x00000000, 0x04000000, 0x10000000, 0x00000000, 0x01000000, + 0xff000000, 0x00ffffff, 0x2b000000, 0x0f000000, 0x2e000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x35000000, 0x10000000, 0x00000000, 0x01000000, 0xff000000, 0x00ffffff, 0x3b000000, + 0x0f000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x3e000000, 0x10000000, + 0x00000000, 0x02000000, 0xff000000, 0x43ffffff, 0x0f000000, 0x2e000000, 0x00000000, 0x00000000, + 0x00000000, 0x46000000, 0x0f000000, 0x49000000, 0x04000000, 0x00000000, 0x00000000, 0x77000000, + 0x5b000000, 0x00000000, 0xff000000, 0xa8ffffff, 0x8c000000, 0x00000000, 0xff000000, 0xdaffffff, + 0xbe000000, 0x00000000, 0xff000000, 0xddffffff, 0x01000000, 0x00000000, 0xe8000000, 0x03000000, + 0x00000000, 0x07000000, 0x00000000, 0x02000000, 0xda000000, 0x06000000, 0x00000000, 0x07000000, + 0x27000000, 0x08000003, 0x00000000, 0x01000000, 0x2f000000, 0x00000003, }; static void test_effect_pool(void)

1 0

Nikolay Sivov : d3d10/effect: Go through both local and shared variables when looking for shader resources.
by Alexandre Julliard 30 Sep '21

30 Sep '21

Module: wine Branch: master Commit: c716aa48022c1caa37af723aef884e615a30763e URL: https://source.winehq.org/git/wine.git/?a=commit;h=c716aa48022c1caa37af723a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 28 15:23:04 2021 +0300 d3d10/effect: Go through both local and shared variables when looking for shader resources. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 101 +++++++++++++++++++------------- dlls/d3d10/tests/effect.c | 143 +++++++++++++++++++++++++++------------------- 2 files changed, 143 insertions(+), 101 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c716aa48022c1caa37af…

1 0

Alistair Leslie-Hughes : include: Add more sapi interfaces.
by Alexandre Julliard 30 Sep '21

30 Sep '21

Module: wine Branch: master Commit: aa629c4c7225166f4ee46476d98702df2e142711 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa629c4c7225166f4ee46476… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Sep 30 18:59:30 2021 +1000 include: Add more sapi interfaces. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/sapi.idl | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/include/sapi.idl b/include/sapi.idl index d2c1aac8afc..ba577d4de04 100644 --- a/include/sapi.idl +++ b/include/sapi.idl @@ -1065,6 +1065,31 @@ interface ISpVoice : ISpEventSource [in] ULONG count); }; +[ + object, + uuid(be7a9cc9-5f9e-11d2-960f-00c04f8ee628), + pointer_default(unique), + local, + restricted +] +interface ISpEventSink : IUnknown +{ + HRESULT AddEvents([in] const SPEVENT *events, [in] ULONG count); + HRESULT GetEventInterest([out] ULONGLONG *interest); +}; + +[ + object, + uuid(5b559f40-e952-11d2-bb91-00c04f8ee6c0), + pointer_default(unique), + restricted +] +interface ISpObjectWithToken : IUnknown +{ + HRESULT SetObjectToken([in] ISpObjectToken *token); + HRESULT GetObjectToken([out] ISpObjectToken **token); +}; + [ object, uuid(bed530be-2606-4f4d-a1c0-54c5cda5566f), @@ -1097,6 +1122,21 @@ interface ISpAudio : ISpStreamFormat HRESULT GetBufferNotifySize([out] ULONG *size); HRESULT SetBufferNotifySize([in] ULONG size); }; +[ + object, + uuid(15806f6e-1d70-4b48-98e6-3b1a007509ab), + pointer_default(unique), + local, + restricted +] +interface ISpMMSysAudio : ISpAudio +{ + HRESULT GetDeviceId([out] UINT *id); + HRESULT SetDeviceId([in] UINT id); + HRESULT GetMMHandle([out] void **handle); + HRESULT GetLineId([out] UINT *id); + HRESULT SetLineId([in] UINT id); +}; [ object, @@ -1254,4 +1294,26 @@ library SpeechLib interface ISpStream; [default] interface ISpeechFileStream; }; + + [ + uuid(cf3d2e50-53f2-11d2-960c-00c04f8ee628) + ] + coclass SpMMAudioIn + { + interface ISpEventSource; + interface ISpEventSink; + interface ISpObjectWithToken; + interface ISpMMSysAudio; + }; + + [ + uuid(a8c680eb-3d32-11d2-9ee7-00c04f797396) + ] + coclass SpMMAudioOut + { + interface ISpEventSource; + interface ISpEventSink; + interface ISpObjectWithToken; + interface ISpMMSysAudio; + }; }

1 0

Nikolay Sivov : ole32/composite: Fix argument handling in component enumerator methods.
by Alexandre Julliard 30 Sep '21

30 Sep '21

Module: wine Branch: master Commit: 7de48a741606d96a5cedf45f7cd9b0ea24b16629 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7de48a741606d96a5cedf45f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 30 11:26:45 2021 +0300 ole32/composite: Fix argument handling in component enumerator methods. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compositemoniker.c | 60 ++++++------- dlls/ole32/tests/moniker.c | 192 +++++++++++++++++++++++++++++++++++++++--- 2 files changed, 209 insertions(+), 43 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7de48a741606d96a5ced…

1 0

Nikolay Sivov : ole32/composite: Do not use enumerators and antimoniker composition in RelativePathTo().
by Alexandre Julliard 30 Sep '21

30 Sep '21

Module: wine Branch: master Commit: 61f8991fd9523c7b1db587ff4b1c67b9307f52e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=61f8991fd9523c7b1db587ff… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 30 11:26:46 2021 +0300 ole32/composite: Do not use enumerators and antimoniker composition in RelativePathTo(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compositemoniker.c | 233 +++++++++++++++++------------------------- dlls/ole32/tests/moniker.c | 12 +++ 2 files changed, 108 insertions(+), 137 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=61f8991fd9523c7b1db5…

1 0

Nikolay Sivov : ole32/composite: Disable cloning of enumerator instances.
by Alexandre Julliard 30 Sep '21

30 Sep '21

Module: wine Branch: master Commit: b557c395556a9d2a6b62c7be3b79968e9dc78e80 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b557c395556a9d2a6b62c7be… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 30 11:26:47 2021 +0300 ole32/composite: Disable cloning of enumerator instances. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compositemoniker.c | 6 +++--- dlls/ole32/tests/moniker.c | 12 ++++-------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c index cde3f1762f0..652962e1a87 100644 --- a/dlls/ole32/compositemoniker.c +++ b/dlls/ole32/compositemoniker.c @@ -1363,14 +1363,14 @@ EnumMonikerImpl_Reset(IEnumMoniker* iface) static HRESULT WINAPI EnumMonikerImpl_Clone(IEnumMoniker *iface, IEnumMoniker **ret) { - EnumMonikerImpl *This = impl_from_IEnumMoniker(iface); - TRACE("%p, %p.\n", iface, ret); if (!ret) return E_INVALIDARG; - return EnumMonikerImpl_CreateEnumMoniker(This->tabMoniker,This->tabSize,This->currentPos,TRUE,ret); + *ret = NULL; + + return E_NOTIMPL; } static const IEnumMonikerVtbl VT_EnumMonikerImpl = diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index a60472951f7..abd17c9961f 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -3699,10 +3699,9 @@ todo_wine { enummoniker2 = (void *)0xdeadbeef; hr = IEnumMoniker_Clone(enummoniker, &enummoniker2); -todo_wine { ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); ok(!enummoniker2, "Unexpected pointer.\n"); -} + hr = IEnumMoniker_Reset(enummoniker); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); @@ -3718,10 +3717,9 @@ todo_wine { enummoniker2 = (void *)0xdeadbeef; hr = IEnumMoniker_Clone(enummoniker, &enummoniker2); -todo_wine { ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); ok(!enummoniker2, "Unexpected pointer.\n"); -} + IEnumMoniker_Release(enummoniker); /* Backward direction */ @@ -3783,10 +3781,9 @@ todo_wine { enummoniker2 = (void *)0xdeadbeef; hr = IEnumMoniker_Clone(enummoniker, &enummoniker2); -todo_wine { ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); ok(!enummoniker2, "Unexpected pointer.\n"); -} + hr = IEnumMoniker_Reset(enummoniker); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); @@ -3802,10 +3799,9 @@ todo_wine { enummoniker2 = (void *)0xdeadbeef; hr = IEnumMoniker_Clone(enummoniker, &enummoniker2); -todo_wine { ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); ok(!enummoniker2, "Unexpected pointer.\n"); -} + IEnumMoniker_Release(enummoniker); IMoniker_Release(moniker);

1 0

Nikolay Sivov : ole32/composite: Cleanup enumerator methods.
by Alexandre Julliard 30 Sep '21

30 Sep '21

Module: wine Branch: master Commit: 966d74a1b4eba96a646f8c38647cbd2cc78bf4c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=966d74a1b4eba96a646f8c38… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 30 11:26:48 2021 +0300 ole32/composite: Cleanup enumerator methods. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compositemoniker.c | 137 ++++++++++++++++-------------------------- 1 file changed, 52 insertions(+), 85 deletions(-) diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c index 652962e1a87..a94e4734f45 100644 --- a/dlls/ole32/compositemoniker.c +++ b/dlls/ole32/compositemoniker.c @@ -72,13 +72,13 @@ static inline CompositeMonikerImpl *impl_from_IMarshal(IMarshal *iface) return CONTAINING_RECORD(iface, CompositeMonikerImpl, IMarshal_iface); } -/* EnumMoniker data structure */ -typedef struct EnumMonikerImpl{ +typedef struct EnumMonikerImpl +{ IEnumMoniker IEnumMoniker_iface; LONG ref; - IMoniker** tabMoniker; /* dynamic table containing the enumerated monikers */ - ULONG tabSize; /* size of tabMoniker */ - ULONG currentPos; /* index pointer on the current moniker */ + IMoniker **monikers; + unsigned int count; + unsigned int pos; } EnumMonikerImpl; static inline EnumMonikerImpl *impl_from_IEnumMoniker(IEnumMoniker *iface) @@ -86,7 +86,7 @@ static inline EnumMonikerImpl *impl_from_IEnumMoniker(IEnumMoniker *iface) return CONTAINING_RECORD(iface, EnumMonikerImpl, IEnumMoniker_iface); } -static HRESULT EnumMonikerImpl_CreateEnumMoniker(IMoniker** tabMoniker,ULONG tabSize,ULONG currentPos,BOOL leftToRight,IEnumMoniker ** ppmk); +static HRESULT create_enumerator(IMoniker **components, unsigned int count, BOOL forward, IEnumMoniker **ret); static HRESULT composite_get_rightmost(CompositeMonikerImpl *composite, IMoniker **left, IMoniker **rightmost); static HRESULT composite_get_leftmost(CompositeMonikerImpl *composite, IMoniker **leftmost); @@ -492,21 +492,21 @@ static HRESULT composite_get_components_alloc(IMoniker *iface, unsigned int *cou return S_OK; } -static HRESULT WINAPI CompositeMonikerImpl_Enum(IMoniker *iface, BOOL forward, IEnumMoniker **ppenumMoniker) +static HRESULT WINAPI CompositeMonikerImpl_Enum(IMoniker *iface, BOOL forward, IEnumMoniker **ret_enum) { IMoniker **monikers; unsigned int count; HRESULT hr; - TRACE("%p, %d, %p\n", iface, forward, ppenumMoniker); + TRACE("%p, %d, %p\n", iface, forward, ret_enum); - if (!ppenumMoniker) + if (!ret_enum) return E_INVALIDARG; if (FAILED(hr = composite_get_components_alloc(iface, &count, &monikers))) return hr; - hr = EnumMonikerImpl_CreateEnumMoniker(monikers, count, 0, forward, ppenumMoniker); + hr = create_enumerator(monikers, count, forward, ret_enum); heap_free(monikers); return hr; @@ -1280,36 +1280,30 @@ EnumMonikerImpl_AddRef(IEnumMoniker* iface) } -/****************************************************************************** - * EnumMonikerImpl_Release - ******************************************************************************/ -static ULONG WINAPI -EnumMonikerImpl_Release(IEnumMoniker* iface) +static ULONG WINAPI EnumMonikerImpl_Release(IEnumMoniker *iface) { - EnumMonikerImpl *This = impl_from_IEnumMoniker(iface); - ULONG i; - ULONG ref; - TRACE("(%p)\n",This); - - ref = InterlockedDecrement(&This->ref); - - /* destroy the object if there are no more references to it */ - if (ref == 0) { + EnumMonikerImpl *e = impl_from_IEnumMoniker(iface); + ULONG refcount = InterlockedDecrement(&e->ref); + unsigned int i; - for(i=0;i<This->tabSize;i++) - IMoniker_Release(This->tabMoniker[i]); + TRACE("%p, refcount %d.\n", iface, refcount); - HeapFree(GetProcessHeap(),0,This->tabMoniker); - HeapFree(GetProcessHeap(),0,This); + if (!refcount) + { + for (i = 0; i < e->count; ++i) + IMoniker_Release(e->monikers[i]); + heap_free(e->monikers); + heap_free(e); } - return ref; + + return refcount; } static HRESULT WINAPI EnumMonikerImpl_Next(IEnumMoniker *iface, ULONG count, IMoniker **m, ULONG *fetched) { - EnumMonikerImpl *This = impl_from_IEnumMoniker(iface); - ULONG i; + EnumMonikerImpl *e = impl_from_IEnumMoniker(iface); + unsigned int i; TRACE("%p, %u, %p, %p.\n", iface, count, m, fetched); @@ -1319,9 +1313,9 @@ static HRESULT WINAPI EnumMonikerImpl_Next(IEnumMoniker *iface, ULONG count, *m = NULL; /* retrieve the requested number of moniker from the current position */ - for(i=0;((This->currentPos < This->tabSize) && (i < count));i++) + for (i = 0; (e->pos < e->count) && (i < count); ++i) { - m[i] = This->tabMoniker[This->currentPos++]; + m[i] = e->monikers[e->pos++]; IMoniker_AddRef(m[i]); } @@ -1333,30 +1327,28 @@ static HRESULT WINAPI EnumMonikerImpl_Next(IEnumMoniker *iface, ULONG count, static HRESULT WINAPI EnumMonikerImpl_Skip(IEnumMoniker *iface, ULONG count) { - EnumMonikerImpl *This = impl_from_IEnumMoniker(iface); + EnumMonikerImpl *e = impl_from_IEnumMoniker(iface); TRACE("%p, %u.\n", iface, count); if (!count) return S_OK; - if ((This->currentPos + count) >= This->tabSize) + if ((e->pos + count) >= e->count) return S_FALSE; - This->currentPos += count; + e->pos += count; return S_OK; } -/****************************************************************************** - * EnumMonikerImpl_Reset - ******************************************************************************/ -static HRESULT WINAPI -EnumMonikerImpl_Reset(IEnumMoniker* iface) +static HRESULT WINAPI EnumMonikerImpl_Reset(IEnumMoniker* iface) { - EnumMonikerImpl *This = impl_from_IEnumMoniker(iface); + EnumMonikerImpl *e = impl_from_IEnumMoniker(iface); - This->currentPos=0; + TRACE("%p.\n", iface); + + e->pos = 0; return S_OK; } @@ -1384,60 +1376,35 @@ static const IEnumMonikerVtbl VT_EnumMonikerImpl = EnumMonikerImpl_Clone }; -/****************************************************************************** - * EnumMonikerImpl_CreateEnumMoniker - ******************************************************************************/ -static HRESULT -EnumMonikerImpl_CreateEnumMoniker(IMoniker** tabMoniker, ULONG tabSize, - ULONG currentPos, BOOL leftToRight, IEnumMoniker ** ppmk) +static HRESULT create_enumerator(IMoniker **components, unsigned int count, BOOL forward, IEnumMoniker **ret) { - EnumMonikerImpl* newEnumMoniker; - ULONG i; - - if (currentPos > tabSize) - return E_INVALIDARG; - - newEnumMoniker = HeapAlloc(GetProcessHeap(), 0, sizeof(EnumMonikerImpl)); - - if (newEnumMoniker == 0) - return STG_E_INSUFFICIENTMEMORY; - - /* Initialize the virtual function table. */ - newEnumMoniker->IEnumMoniker_iface.lpVtbl = &VT_EnumMonikerImpl; - newEnumMoniker->ref = 1; + EnumMonikerImpl *object; + unsigned int i; - newEnumMoniker->tabSize=tabSize; - newEnumMoniker->currentPos=currentPos; + if (!(object = heap_alloc_zero(sizeof(*object)))) + return E_OUTOFMEMORY; - newEnumMoniker->tabMoniker=HeapAlloc(GetProcessHeap(),0,tabSize*sizeof(newEnumMoniker->tabMoniker[0])); + object->IEnumMoniker_iface.lpVtbl = &VT_EnumMonikerImpl; + object->ref = 1; + object->count = count; - if (newEnumMoniker->tabMoniker==NULL) { - HeapFree(GetProcessHeap(), 0, newEnumMoniker); + if (!(object->monikers = heap_calloc(count, sizeof(*object->monikers)))) + { + heap_free(object); return E_OUTOFMEMORY; } - if (leftToRight) - for (i=0;i<tabSize;i++){ - - newEnumMoniker->tabMoniker[i]=tabMoniker[i]; - IMoniker_AddRef(tabMoniker[i]); - } - else - for (i = tabSize; i > 0; i--){ - - newEnumMoniker->tabMoniker[tabSize-i]=tabMoniker[i - 1]; - IMoniker_AddRef(tabMoniker[i - 1]); - } + for (i = 0; i < count; ++i) + { + object->monikers[i] = forward ? components[i] : components[count - i - 1]; + IMoniker_AddRef(object->monikers[i]); + } - *ppmk=&newEnumMoniker->IEnumMoniker_iface; + *ret = &object->IEnumMoniker_iface; return S_OK; } -/********************************************************************************/ -/* Virtual function table for the CompositeMonikerImpl class which includes */ -/* IPersist, IPersistStream and IMoniker functions. */ - static const IMonikerVtbl VT_CompositeMonikerImpl = { CompositeMonikerImpl_QueryInterface,

1 0