wine-commits September 2021

2 participants
1030 discussions

Alistair Leslie-Hughes : include: Add more sapi interfaces.

by Alexandre Julliard

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; + }; }

2 years, 6 months

Nikolay Sivov : d3d10/effect: Go through both local and shared variables when looking for shader resources.

by Alexandre Julliard

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…

2 years, 6 months

Nikolay Sivov : d3d10/effect: Go through both local and shared buffers when looking for shader resources.

by Alexandre Julliard

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)

2 years, 6 months

Eric Pouech : d3dx9/tests: Fix use of D3DXVec2Normalize().

by Alexandre Julliard

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,

2 years, 6 months

Eric Pouech : d3dx9: Fix use of D3DXVec2Normalize().

by Alexandre Julliard

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

2 years, 6 months

Nikolay Sivov : riched20: Use regular allocation helpers for text services objects.

by Alexandre Julliard

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;

2 years, 6 months

Nikolay Sivov : riched20: Remove New() allocation macro.

by Alexandre Julliard

Module: wine Branch: master Commit: 1d5c9defb19fca6cfb1107384fc2325d391726d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d5c9defb19fca6cfb110738… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 30 16:10:26 2021 +0300 riched20: Remove New() allocation macro. 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/reader.c | 8 ++++---- dlls/riched20/rtf.h | 7 ------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/dlls/riched20/reader.c b/dlls/riched20/reader.c index e73b8b87e9d..b17d6835f25 100644 --- a/dlls/riched20/reader.c +++ b/dlls/riched20/reader.c @@ -813,7 +813,7 @@ static void ReadFontTbl(RTF_Info *info) if (info->rtfClass == rtfEOF) break; } - fp = New (RTFFont); + fp = heap_alloc(sizeof(*fp)); if (fp == NULL) { ERR ("cannot allocate font entry\n"); break; @@ -986,7 +986,7 @@ static void ReadColorTbl(RTF_Info *info) continue; } - cp = New (RTFColor); + cp = heap_alloc(sizeof(*cp)); if (cp == NULL) { ERR ("cannot allocate color entry\n"); break; @@ -1036,7 +1036,7 @@ static void ReadStyleSheet(RTF_Info *info) break; if (RTFCheckCM (info, rtfGroup, rtfEndGroup)) break; - sp = New (RTFStyle); + sp = heap_alloc(sizeof(*sp)); if (sp == NULL) { ERR ("cannot allocate stylesheet entry\n"); break; @@ -1104,7 +1104,7 @@ static void ReadStyleSheet(RTF_Info *info) sp->rtfSNextPar = info->rtfParam; continue; } - sep = New (RTFStyleElt); + sep = heap_alloc(sizeof(*sep)); if (sep == NULL) { ERR ("cannot allocate style element\n"); diff --git a/dlls/riched20/rtf.h b/dlls/riched20/rtf.h index 35a0ee878e9..9f15d5ba8e1 100644 --- a/dlls/riched20/rtf.h +++ b/dlls/riched20/rtf.h @@ -1078,13 +1078,6 @@ struct RTFTable # define RTFBorderCellBottom 0x32 # define RTFBorderCellRight 0x33 -/* - * Return pointer to new element of type t, or NULL - * if no memory available. - */ - -# define New(t) (heap_alloc (sizeof (t))) - /* Parser stack size */ # define maxStack 32

2 years, 6 months

Rémi Bernon : dinput: Fix HID joystick DIDFT_POV enumeration.

by Alexandre Julliard

Module: wine Branch: master Commit: 5d782424d87259e4276801d118a1ad4a3044d428 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d782424d87259e4276801d1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 30 13:50:03 2021 +0200 dinput: Fix HID joystick DIDFT_POV enumeration. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 7c4b637d018..834a5de0860 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -417,7 +417,7 @@ static HRESULT WINAPI hid_joystick_EnumObjects( IDirectInputDevice8W *iface, LPD TRACE( "iface %p, callback %p, context %p, flags %#x.\n", iface, callback, context, flags ); if (!callback) return DIERR_INVALIDPARAM; - if (flags & ~(DIDFT_AXIS | DIDFT_AXIS | DIDFT_BUTTON | DIDFT_NODATA | DIDFT_COLLECTION)) + if (flags & ~(DIDFT_AXIS | DIDFT_POV | DIDFT_BUTTON | DIDFT_NODATA | DIDFT_COLLECTION)) return DIERR_INVALIDPARAM; if (flags == DIDFT_ALL || (flags & DIDFT_AXIS))

2 years, 6 months

Alistair Leslie-Hughes : wininet: Reset context length for http status 304.

by Alexandre Julliard

Module: wine Branch: master Commit: 8825ed72d7b8affc1eaaa4359797e68488cdf5d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8825ed72d7b8affc1eaaa435… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Sep 30 18:59:31 2021 +1000 wininet: Reset context length for http status 304. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 7 ++- dlls/wininet/tests/http.c | 134 +++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 138 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index e9363208471..c9c4a060aac 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2918,7 +2918,12 @@ static DWORD set_content_length(http_request_t *request) WCHAR encoding[20]; DWORD size; - if(request->status_code == HTTP_STATUS_NO_CONTENT || !wcscmp(request->verb, L"HEAD")) { + if(request->status_code == HTTP_STATUS_NO_CONTENT || request->status_code == HTTP_STATUS_NOT_MODIFIED || + !wcscmp(request->verb, L"HEAD")) + { + if (HTTP_GetCustomHeaderIndex(request, L"Content-Length", 0, FALSE) == -1 || + !wcscmp(request->verb, L"HEAD")) + request->read_size = 0; request->contentLength = request->netconn_stream.content_length = 0; return ERROR_SUCCESS; } diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index bf4dce80bef..ae95b4399e0 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2375,12 +2375,41 @@ static DWORD CALLBACK server_thread(LPVOID param) recvfrom(c, buffer, buffer_size, 0, NULL, NULL); send(c, ok_with_length, sizeof(ok_with_length)-1, 0); } - + if (strstr(buffer, "GET /test_no_content_content_length")) + { + static const char nocontentmsg[] = "HTTP/1.1 204 No Content\r\nConnection: close\r\n" + "Content-Length: 10\r\n\r\n0123456789"; + send(c, nocontentmsg, sizeof(nocontentmsg)-1, 0); + } if (strstr(buffer, "GET /test_no_content")) { - static const char nocontentmsg[] = "HTTP/1.1 204 No Content\r\nConnection: close\r\n\r\n"; + static const char nocontentmsg[] = "HTTP/1.1 204 No Content\r\nConnection: close\r\n\r\n" + "0123456789"; send(c, nocontentmsg, sizeof(nocontentmsg)-1, 0); } + if (strstr(buffer, "GET /test_not_modified_content_length")) + { + static const char notmodifiedmsg[] = "HTTP/1.1 304 Not Modified\r\nConnection: close\r\n" + "Content-Length: 10\r\n\r\n0123456789"; + send(c, notmodifiedmsg, sizeof(notmodifiedmsg)-1, 0); + } + else if (strstr(buffer, "GET /test_not_modified")) + { + static const char notmodifiedmsg[] = "HTTP/1.1 304 Not Modified\r\nConnection: close\r\n" + "\r\n0123456789"; + send(c, notmodifiedmsg, sizeof(notmodifiedmsg)-1, 0); + } + if (strstr(buffer, "HEAD /head_content_length")) + { + static const char headmsg[] = "HTTP/1.1 200 OK\r\nConnection: close\r\n" + "Content-Length: 10\r\n\r\n0123456789"; + send(c, headmsg, sizeof(headmsg)-1, 0); + } + else if (strstr(buffer, "HEAD /head")) + { + static const char headmsg[] = "HTTP/1.1 200 OK\r\nConnection: close\r\n\r\n0123456789"; + send(c, headmsg, sizeof(headmsg)-1, 0); + } if (strstr(buffer, "GET /test_conn_close")) { static const char conn_close_response[] = "HTTP/1.1 200 OK\r\nConnection: close\r\n\r\nsome content"; @@ -3487,6 +3516,106 @@ static void test_no_content(int port) CHECK_NOTIFIED(INTERNET_STATUS_CONNECTION_CLOSED); } +static void test_not_modified(int port) +{ + DWORD avail; + HINTERNET ses, con, req; + BOOL ret; + + ses = InternetOpenA("winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); + ok(ses != NULL, "InternetOpen failed\n"); + + con = InternetConnectA(ses, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); + ok(con != NULL, "InternetConnect failed\n"); + + req = HttpOpenRequestA(con, NULL, "/test_not_modified", NULL, NULL, NULL, 0, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + SetLastError(0xdeadbeef); + ret = HttpSendRequestW(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed: %u\n", GetLastError()); + test_status_code(req, 304); + + avail = 0xdeadbeef; + ret = InternetQueryDataAvailable(req, &avail, 0, 0); + ok(ret, "InternetQueryDataAvailable failed: %u\n", GetLastError()); + ok(!avail, "got %d\n", avail); + InternetCloseHandle(req); + + req = HttpOpenRequestA(con, NULL, "/test_not_modified_content_length", NULL, NULL, NULL, 0, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + SetLastError(0xdeadbeef); + ret = HttpSendRequestW(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed: %u\n", GetLastError()); + test_status_code(req, 304); + + avail = 0xdeadbeef; + ret = InternetQueryDataAvailable(req, &avail, 0, 0); + ok(ret, "InternetQueryDataAvailable failed: %u\n", GetLastError()); + ok(avail == 10, "got %d\n", avail); + InternetCloseHandle(req); + + req = HttpOpenRequestA(con, NULL, "/test_no_content", NULL, NULL, NULL, 0, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + SetLastError(0xdeadbeef); + ret = HttpSendRequestW(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed: %u\n", GetLastError()); + test_status_code(req, 204); + + avail = 0xdeadbeef; + ret = InternetQueryDataAvailable(req, &avail, 0, 0); + ok(ret, "InternetQueryDataAvailable failed: %u\n", GetLastError()); + ok(!avail, "got %d\n", avail); + InternetCloseHandle(req); + + req = HttpOpenRequestA(con, NULL, "/test_no_content_content_length", NULL, NULL, NULL, 0, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + SetLastError(0xdeadbeef); + ret = HttpSendRequestW(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed: %u\n", GetLastError()); + test_status_code(req, 204); + + avail = 0xdeadbeef; + ret = InternetQueryDataAvailable(req, &avail, 0, 0); + ok(ret, "InternetQueryDataAvailable failed: %u\n", GetLastError()); + ok(avail == 10, "got %d\n", avail); + InternetCloseHandle(req); + + req = HttpOpenRequestA(con, "HEAD", "/head", NULL, NULL, NULL, 0, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + SetLastError(0xdeadbeef); + ret = HttpSendRequestW(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed: %u\n", GetLastError()); + test_status_code(req, 200); + + avail = 0xdeadbeef; + ret = InternetQueryDataAvailable(req, &avail, 0, 0); + ok(ret, "InternetQueryDataAvailable failed: %u\n", GetLastError()); + ok(!avail, "got %d\n", avail); + InternetCloseHandle(req); + + req = HttpOpenRequestA(con, "HEAD", "/head_content_length", NULL, NULL, NULL, 0, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + SetLastError(0xdeadbeef); + ret = HttpSendRequestW(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed: %u\n", GetLastError()); + test_status_code(req, 200); + + avail = 0xdeadbeef; + ret = InternetQueryDataAvailable(req, &avail, 0, 0); + ok(ret, "InternetQueryDataAvailable failed: %u\n", GetLastError()); + ok(!avail, "got %d\n", avail); + + InternetCloseHandle(req); + InternetCloseHandle(con); + InternetCloseHandle(ses); +} + static void test_conn_close(int port) { HINTERNET session, connection, req; @@ -6060,6 +6189,7 @@ static void test_http_connection(void) test_HttpSendRequestW(si.port); test_options(si.port); test_no_content(si.port); + test_not_modified(si.port); test_conn_close(si.port); test_no_cache(si.port); test_cache_read_gzipped(si.port);

2 years, 6 months

Rémi Bernon : dinput8/tests: Add some HID joystick IDirectInputDevice8_CreateEffect tests.

by Alexandre Julliard

Module: wine Branch: master Commit: e69f27d2eee29184b340af9f836bd3039eab48ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=e69f27d2eee29184b340af9f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 30 10:37:41 2021 +0200 dinput8/tests: Add some HID joystick IDirectInputDevice8_CreateEffect tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 1 + dlls/dinput8/tests/hid.c | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 11496640049..d869f439101 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1578,6 +1578,7 @@ HRESULT WINAPI IDirectInputDevice2WImpl_CreateEffect(LPDIRECTINPUTDEVICE8W iface { IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); FIXME("(%p)->(%s,%p,%p,%p): stub!\n", This, debugstr_guid(rguid), lpeff, ppdef, pUnkOuter); + if (!ppdef) return E_POINTER; FIXME("not available in the generic implementation\n"); *ppdef = NULL; diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index f93c2b471f4..1ab6e645947 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -3682,6 +3682,7 @@ static void test_simple_joystick(void) DIEFFECTINFOW effectinfo = {0}; DIDATAFORMAT dataformat = {0}; IDirectInputDevice8W *device; + IDirectInputEffect *effect; DIEFFESCAPE escape = {0}; DIDEVCAPS caps = {0}; IDirectInput8W *di; @@ -4673,9 +4674,21 @@ static void test_simple_joystick(void) todo_wine ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_SendDeviceData returned %#x\n", hr ); + hr = IDirectInputDevice8_CreateEffect( device, &GUID_Sine, NULL, NULL, NULL ); + ok( hr == E_POINTER, "IDirectInputDevice8_CreateEffect returned %#x\n", hr ); + hr = IDirectInputDevice8_CreateEffect( device, NULL, NULL, &effect, NULL ); + ok( hr == DIERR_UNSUPPORTED, "IDirectInputDevice8_CreateEffect returned %#x\n", hr ); + hr = IDirectInputDevice8_CreateEffect( device, &GUID_NULL, NULL, &effect, NULL ); + ok( hr == DIERR_UNSUPPORTED, "IDirectInputDevice8_CreateEffect returned %#x\n", hr ); + hr = IDirectInputDevice8_CreateEffect( device, &GUID_Sine, NULL, &effect, NULL ); + ok( hr == DIERR_UNSUPPORTED, "IDirectInputDevice8_CreateEffect returned %#x\n", hr ); + hr = IDirectInputDevice8_Unacquire( device ); ok( hr == DI_OK, "IDirectInputDevice8_Unacquire returned: %#x\n", hr ); + hr = IDirectInputDevice8_CreateEffect( device, &GUID_Sine, NULL, &effect, NULL ); + ok( hr == DIERR_UNSUPPORTED, "IDirectInputDevice8_CreateEffect returned %#x\n", hr ); + hr = IDirectInputDevice8_Escape( device, NULL ); todo_wine ok( hr == E_POINTER, "IDirectInputDevice8_Escape returned: %#x\n", hr ); @@ -5051,6 +5064,30 @@ static BOOL test_device_types(void) return success; } +static void test_periodic_effect( IDirectInputDevice8W *device, HANDLE file ) +{ + IDirectInputEffect *effect; + HRESULT hr; + ULONG ref; + + hr = IDirectInputDevice8_CreateEffect( device, &GUID_Sine, NULL, NULL, NULL ); + ok( hr == E_POINTER, "IDirectInputDevice8_CreateEffect returned %#x\n", hr ); + hr = IDirectInputDevice8_CreateEffect( device, NULL, NULL, &effect, NULL ); + todo_wine + ok( hr == E_POINTER, "IDirectInputDevice8_CreateEffect returned %#x\n", hr ); + hr = IDirectInputDevice8_CreateEffect( device, &GUID_NULL, NULL, &effect, NULL ); + todo_wine + ok( hr == DIERR_DEVICENOTREG, "IDirectInputDevice8_CreateEffect returned %#x\n", hr ); + + hr = IDirectInputDevice8_CreateEffect( device, &GUID_Sine, NULL, &effect, NULL ); + todo_wine + ok( hr == DI_OK, "IDirectInputDevice8_CreateEffect returned %#x\n", hr ); + if (hr != DI_OK) return; + + ref = IDirectInputEffect_Release( effect ); + ok( ref == 0, "IDirectInputDeviceW_Release returned %d\n", ref ); +} + static void test_force_feedback_joystick( void ) { #include "psh_hid_macros.h" @@ -5797,6 +5834,8 @@ static void test_force_feedback_joystick( void ) todo_wine ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_SendDeviceData returned %#x\n", hr ); + test_periodic_effect( device, file ); + set_hid_expect( file, &expect_dc_reset, sizeof(expect_dc_reset) ); hr = IDirectInputDevice8_Unacquire( device ); ok( hr == DI_OK, "IDirectInputDevice8_Unacquire returned: %#x\n", hr );

2 years, 6 months

Jump to page:

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-commits September 2021