October 2021 - Wine-Commits

Ziqing Hui : d3dx10: Add stubs for D3DX10CreateTextureFromResource{A, W}.
by Alexandre Julliard Oct. 7, 2021

Oct. 7, 2021

Module: wine Branch: master Commit: 5636088871714f2a2de9e543eb66f944ce188edc URL: https://source.winehq.org/git/wine.git/?a=commit;h=5636088871714f2a2de9e543… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Oct 5 16:31:56 2021 +0800 d3dx10: Add stubs for D3DX10CreateTextureFromResource{A, W}. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/d3dx10_43.spec | 4 ++-- dlls/d3dx10_43/texture.c | 16 ++++++++++++++++ include/d3dx10tex.h | 6 ++++++ 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx10_43/d3dx10_43.spec b/dlls/d3dx10_43/d3dx10_43.spec index af349afae02..82b71b5fa5c 100644 --- a/dlls/d3dx10_43/d3dx10_43.spec +++ b/dlls/d3dx10_43/d3dx10_43.spec @@ -45,8 +45,8 @@ @ stdcall D3DX10CreateTextureFromFileA(ptr str ptr ptr ptr ptr) @ stdcall D3DX10CreateTextureFromFileW(ptr wstr ptr ptr ptr ptr) @ stdcall D3DX10CreateTextureFromMemory(ptr ptr long ptr ptr ptr ptr) -@ stub D3DX10CreateTextureFromResourceA(ptr long str ptr ptr ptr ptr) -@ stub D3DX10CreateTextureFromResourceW(ptr long wstr ptr ptr ptr ptr) +@ stdcall D3DX10CreateTextureFromResourceA(ptr long str ptr ptr ptr ptr) +@ stdcall D3DX10CreateTextureFromResourceW(ptr long wstr ptr ptr ptr ptr) @ stdcall D3DX10FilterTexture(ptr long long) @ stdcall D3DX10GetFeatureLevel1(ptr ptr) @ stdcall D3DX10GetImageInfoFromFileA(str ptr ptr ptr) diff --git a/dlls/d3dx10_43/texture.c b/dlls/d3dx10_43/texture.c index 5aca98610a9..0568bc2316c 100644 --- a/dlls/d3dx10_43/texture.c +++ b/dlls/d3dx10_43/texture.c @@ -589,6 +589,22 @@ HRESULT WINAPI D3DX10CreateTextureFromFileW(ID3D10Device *device, const WCHAR *s return E_NOTIMPL; } +HRESULT WINAPI D3DX10CreateTextureFromResourceA(ID3D10Device *device, HMODULE module, const char *resource, + D3DX10_IMAGE_LOAD_INFO *load_info, ID3DX10ThreadPump *pump, ID3D10Resource **texture, HRESULT *hresult) +{ + FIXME("device %p, module %p, resource %s, load_info %p, pump %p, texture %p, hresult %p stub!\n", + device, module, debugstr_a(resource), load_info, pump, texture, hresult); + return E_NOTIMPL; +} + +HRESULT WINAPI D3DX10CreateTextureFromResourceW(ID3D10Device *device, HMODULE module, const WCHAR *resource, + D3DX10_IMAGE_LOAD_INFO *load_info, ID3DX10ThreadPump *pump, ID3D10Resource **texture, HRESULT *hresult) +{ + FIXME("device %p, module %p, resource %s, load_info %p, pump %p, texture %p, hresult %p stub!\n", + device, module, debugstr_w(resource), load_info, pump, texture, hresult); + return E_NOTIMPL; +} + HRESULT WINAPI D3DX10CreateTextureFromMemory(ID3D10Device *device, const void *src_data, SIZE_T src_data_size, D3DX10_IMAGE_LOAD_INFO *load_info, ID3DX10ThreadPump *pump, ID3D10Resource **texture, HRESULT *hresult) { diff --git a/include/d3dx10tex.h b/include/d3dx10tex.h index 022afdd51d9..33e41e577b4 100644 --- a/include/d3dx10tex.h +++ b/include/d3dx10tex.h @@ -162,6 +162,12 @@ HRESULT WINAPI D3DX10CreateTextureFromFileW(ID3D10Device *device, const WCHAR *s D3DX10_IMAGE_LOAD_INFO *load_info, ID3DX10ThreadPump *pump, ID3D10Resource **texture, HRESULT *hresult); #define D3DX10CreateTextureFromFile WINELIB_NAME_AW(D3DX10CreateTextureFromFile) +HRESULT WINAPI D3DX10CreateTextureFromResourceA(ID3D10Device *device, HMODULE module, const char *resource, + D3DX10_IMAGE_LOAD_INFO *load_info, ID3DX10ThreadPump *pump, ID3D10Resource **texture, HRESULT *hresult); +HRESULT WINAPI D3DX10CreateTextureFromResourceW(ID3D10Device *device, HMODULE module, const WCHAR *resource, + D3DX10_IMAGE_LOAD_INFO *load_info, ID3DX10ThreadPump *pump, ID3D10Resource **texture, HRESULT *hresult); +#define D3DX10CreateTextureFromResource WINELIB_NAME_AW(D3DX10CreateTextureFromResource) + HRESULT WINAPI D3DX10LoadTextureFromTexture(ID3D10Resource *src_texture, D3DX10_TEXTURE_LOAD_INFO *load_info, ID3D10Resource *dst_texture);

1 0

Ziqing Hui : d3dx10: Add stubs for D3DX10CreateTextureFromFile{A,W}.
by Alexandre Julliard Oct. 7, 2021

Oct. 7, 2021

Module: wine Branch: master Commit: 6623915b616ef5befe0a5665c80dd7aa50d64d94 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6623915b616ef5befe0a5665… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Oct 5 16:31:55 2021 +0800 d3dx10: Add stubs for D3DX10CreateTextureFromFile{A,W}. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/d3dx10_43.spec | 4 ++-- dlls/d3dx10_43/texture.c | 16 ++++++++++++++++ include/d3dx10tex.h | 6 ++++++ 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx10_43/d3dx10_43.spec b/dlls/d3dx10_43/d3dx10_43.spec index 8bc9451aeab..af349afae02 100644 --- a/dlls/d3dx10_43/d3dx10_43.spec +++ b/dlls/d3dx10_43/d3dx10_43.spec @@ -42,8 +42,8 @@ @ stub D3DX10CreateShaderResourceViewFromResourceW(ptr long wstr ptr ptr ptr ptr) @ stub D3DX10CreateSkinInfo(ptr) @ stdcall D3DX10CreateSprite(ptr long ptr) -@ stub D3DX10CreateTextureFromFileA(ptr str ptr ptr ptr ptr) -@ stub D3DX10CreateTextureFromFileW(ptr wstr ptr ptr ptr ptr) +@ stdcall D3DX10CreateTextureFromFileA(ptr str ptr ptr ptr ptr) +@ stdcall D3DX10CreateTextureFromFileW(ptr wstr ptr ptr ptr ptr) @ stdcall D3DX10CreateTextureFromMemory(ptr ptr long ptr ptr ptr ptr) @ stub D3DX10CreateTextureFromResourceA(ptr long str ptr ptr ptr ptr) @ stub D3DX10CreateTextureFromResourceW(ptr long wstr ptr ptr ptr ptr) diff --git a/dlls/d3dx10_43/texture.c b/dlls/d3dx10_43/texture.c index 32215b0a99a..5aca98610a9 100644 --- a/dlls/d3dx10_43/texture.c +++ b/dlls/d3dx10_43/texture.c @@ -573,6 +573,22 @@ end: return S_OK; } +HRESULT WINAPI D3DX10CreateTextureFromFileA(ID3D10Device *device, const char *src_file, + D3DX10_IMAGE_LOAD_INFO *load_info, ID3DX10ThreadPump *pump, ID3D10Resource **texture, HRESULT *hresult) +{ + FIXME("device %p, src_file %s, load_info %p, pump %p, texture %p, hresult %p stub!\n", + device, debugstr_a(src_file), load_info, pump, texture, hresult); + return E_NOTIMPL; +} + +HRESULT WINAPI D3DX10CreateTextureFromFileW(ID3D10Device *device, const WCHAR *src_file, + D3DX10_IMAGE_LOAD_INFO *load_info, ID3DX10ThreadPump *pump, ID3D10Resource **texture, HRESULT *hresult) +{ + FIXME("device %p, src_file %s, load_info %p, pump %p, texture %p, hresult %p stub!\n", + device, debugstr_w(src_file), load_info, pump, texture, hresult); + return E_NOTIMPL; +} + HRESULT WINAPI D3DX10CreateTextureFromMemory(ID3D10Device *device, const void *src_data, SIZE_T src_data_size, D3DX10_IMAGE_LOAD_INFO *load_info, ID3DX10ThreadPump *pump, ID3D10Resource **texture, HRESULT *hresult) { diff --git a/include/d3dx10tex.h b/include/d3dx10tex.h index 0f92fd38e6e..022afdd51d9 100644 --- a/include/d3dx10tex.h +++ b/include/d3dx10tex.h @@ -156,6 +156,12 @@ HRESULT WINAPI D3DX10GetImageInfoFromResourceW(HMODULE module, const WCHAR *reso HRESULT WINAPI D3DX10GetImageInfoFromMemory(const void *src_data, SIZE_T src_data_size, ID3DX10ThreadPump *pump, D3DX10_IMAGE_INFO *img_info, HRESULT *hresult); +HRESULT WINAPI D3DX10CreateTextureFromFileA(ID3D10Device *device, const char *src_file, + D3DX10_IMAGE_LOAD_INFO *load_info, ID3DX10ThreadPump *pump, ID3D10Resource **texture, HRESULT *hresult); +HRESULT WINAPI D3DX10CreateTextureFromFileW(ID3D10Device *device, const WCHAR *src_file, + D3DX10_IMAGE_LOAD_INFO *load_info, ID3DX10ThreadPump *pump, ID3D10Resource **texture, HRESULT *hresult); +#define D3DX10CreateTextureFromFile WINELIB_NAME_AW(D3DX10CreateTextureFromFile) + HRESULT WINAPI D3DX10LoadTextureFromTexture(ID3D10Resource *src_texture, D3DX10_TEXTURE_LOAD_INFO *load_info, ID3D10Resource *dst_texture);

1 0

Gabriel Ivăncescu : mshtml: Implement HTMLElement's toString.
by Alexandre Julliard Oct. 7, 2021

Oct. 7, 2021

Module: wine Branch: master Commit: a0108b3095b19087a7e8da472aa4de376b7a96ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0108b3095b19087a7e8da47… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Oct 7 16:52:30 2021 +0300 mshtml: Implement HTMLElement's toString. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 181 ++++++++++++++++++++++++++++++++------ dlls/mshtml/tests/documentmode.js | 154 ++++++++++++++++++++++++++++++++ 2 files changed, 306 insertions(+), 29 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a0108b3095b19087a7e8…

1 0

Nikolay Sivov : d3d10/effect: Set shader masks in ComputeStateBlockMask() for passes.
by Alexandre Julliard Oct. 7, 2021

Oct. 7, 2021

Module: wine Branch: master Commit: c85e46b1022a84b8017dc261c1a916a315f8c55e URL: https://source.winehq.org/git/wine.git/?a=commit;h=c85e46b1022a84b8017dc261… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 6 10:53:33 2021 +0300 d3d10/effect: Set shader masks in ComputeStateBlockMask() for passes. 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 | 13 +++++++++++-- dlls/d3d10/tests/effect.c | 4 +--- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index dd4e04d6374..70f6c3b3166 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -4113,9 +4113,18 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_Apply(ID3D10EffectPass *iface static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_ComputeStateBlockMask(ID3D10EffectPass *iface, D3D10_STATE_BLOCK_MASK *mask) { - FIXME("iface %p, mask %p stub!\n", iface, mask); + struct d3d10_effect_pass *pass = impl_from_ID3D10EffectPass(iface); - return E_NOTIMPL; + FIXME("iface %p, mask %p semi-stub!\n", iface, mask); + + if (pass->vs.shader != &null_shader_variable) + D3D10StateBlockMaskEnableCapture(mask, D3D10_DST_VS, 0, 1); + if (pass->ps.shader != &null_shader_variable) + D3D10StateBlockMaskEnableCapture(mask, D3D10_DST_PS, 0, 1); + if (pass->gs.shader != &null_shader_variable) + D3D10StateBlockMaskEnableCapture(mask, D3D10_DST_GS, 0, 1); + + return S_OK; } static const struct ID3D10EffectPassVtbl d3d10_effect_pass_vtbl = diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index 06c5aa68776..f3b81a2c58d 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -3016,7 +3016,6 @@ if (0) hr = D3D10StateBlockMaskDisableAll(&mask); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = p->lpVtbl->ComputeStateBlockMask(p, &mask); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ret = D3D10StateBlockMaskGetSetting(&mask, D3D10_DST_VS, 0); ok(!ret, "Unexpected mask.\n"); @@ -3164,7 +3163,6 @@ todo_wine hr = D3D10StateBlockMaskDisableAll(&mask); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = p->lpVtbl->ComputeStateBlockMask(p, &mask); -todo_wine { ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ret = D3D10StateBlockMaskGetSetting(&mask, D3D10_DST_VS, 0); ok(ret, "Unexpected mask.\n"); @@ -3172,7 +3170,7 @@ todo_wine { ok(ret, "Unexpected mask.\n"); ret = D3D10StateBlockMaskGetSetting(&mask, D3D10_DST_GS, 0); ok(ret, "Unexpected mask.\n"); -} + /* pass 2 */ p = t->lpVtbl->GetPassByIndex(t, 2);

1 0

Nikolay Sivov : d3d10/effect: Explicitly store rasterizer state variable.
by Alexandre Julliard Oct. 7, 2021

Oct. 7, 2021

Module: wine Branch: master Commit: 0c5c8fd84d89108aa2aab74d52b149121c8d4678 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c5c8fd84d89108aa2aab74d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 6 10:53:35 2021 +0300 d3d10/effect: Explicitly store rasterizer state variable. 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/d3d10_private.h | 2 +- dlls/d3d10/effect.c | 22 ++++++++++++++++++---- dlls/d3d10/tests/effect.c | 17 +++++++++++++++++ 3 files changed, 36 insertions(+), 5 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index f799d27b323..4e35a2f319d 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -79,7 +79,6 @@ struct d3d10_effect_object enum d3d10_effect_object_type type; union { - ID3D10RasterizerState *rs; ID3D10DepthStencilState *ds; ID3D10BlendState *bs; ID3D10VertexShader *vs; @@ -247,6 +246,7 @@ struct d3d10_effect_pass struct d3d10_effect_pass_shader_desc vs; struct d3d10_effect_pass_shader_desc ps; struct d3d10_effect_pass_shader_desc gs; + struct d3d10_effect_variable *rasterizer; UINT stencil_ref; UINT sample_mask; float blend_factor[4]; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 70f6c3b3166..66eb723fe9c 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1918,8 +1918,19 @@ static HRESULT parse_fx10_object(const char *data, size_t data_size, case D3D10_EOT_RASTERIZER_STATE: { ID3D10EffectRasterizerVariable *rv = variable->lpVtbl->AsRasterizer(variable); - if (FAILED(hr = rv->lpVtbl->GetRasterizerState(rv, variable_idx, &o->object.rs))) - return hr; + if (!rv->lpVtbl->IsValid(rv)) + { + WARN("Invalid variable type.\n"); + return E_FAIL; + } + v = impl_from_ID3D10EffectVariable(variable); + if (v->type->element_count) + { + if (variable_idx >= v->type->element_count) return E_FAIL; + o->pass->rasterizer = &v->elements[variable_idx]; + } + else + o->pass->rasterizer = v; break; } @@ -2903,8 +2914,7 @@ static HRESULT d3d10_effect_object_apply(struct d3d10_effect_object *o) switch(o->type) { case D3D10_EOT_RASTERIZER_STATE: - ID3D10Device_RSSetState(device, o->object.rs); - return S_OK; + break; case D3D10_EOT_DEPTH_STENCIL_STATE: ID3D10Device_OMSetDepthStencilState(device, o->object.ds, o->pass->stencil_ref); @@ -2935,6 +2945,8 @@ static HRESULT d3d10_effect_object_apply(struct d3d10_effect_object *o) FIXME("Unhandled effect object type %#x.\n", o->type); return E_FAIL; } + + return S_OK; } static void d3d10_effect_shader_variable_destroy(struct d3d10_effect_shader_variable *s, @@ -4100,6 +4112,8 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_Apply(ID3D10EffectPass *iface apply_shader_resources(device, pass->gs.shader); if (pass->ps.shader != &null_shader_variable) apply_shader_resources(device, pass->ps.shader); + if (pass->rasterizer) + ID3D10Device_RSSetState(device, pass->rasterizer->u.state.object.rasterizer); for (i = 0; i < pass->object_count; ++i) { diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index f3b81a2c58d..1a06ff95365 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -4195,6 +4195,7 @@ static void test_effect_state_groups(void) UINT sample_mask, stencil_ref; ID3D10EffectBlendVariable *b; D3D10_BLEND_DESC blend_desc; + D3D10_STATE_BLOCK_MASK mask; D3D10_PASS_DESC pass_desc; ID3D10EffectVariable *v; ID3D10EffectPass *pass; @@ -4203,6 +4204,7 @@ static void test_effect_state_groups(void) ID3D10Device *device; ULONG refcount; HRESULT hr; + BOOL ret; if (!(device = create_device())) { @@ -4323,6 +4325,21 @@ static void test_effect_state_groups(void) ok(pass_desc.BlendFactor[1] == 0.6f, "Got unexpected BlendFactor[1] %.8e.\n", pass_desc.BlendFactor[1]); ok(pass_desc.BlendFactor[2] == 0.7f, "Got unexpected BlendFactor[2] %.8e.\n", pass_desc.BlendFactor[2]); ok(pass_desc.BlendFactor[3] == 0.8f, "Got unexpected BlendFactor[3] %.8e.\n", pass_desc.BlendFactor[3]); + + hr = D3D10StateBlockMaskDisableAll(&mask); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = pass->lpVtbl->ComputeStateBlockMask(pass, &mask); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ret = D3D10StateBlockMaskGetSetting(&mask, D3D10_DST_RS_RASTERIZER_STATE, 0); +todo_wine + ok(ret, "Unexpected mask.\n"); + ret = D3D10StateBlockMaskGetSetting(&mask, D3D10_DST_OM_DEPTH_STENCIL_STATE, 0); +todo_wine + ok(ret, "Unexpected mask.\n"); + ret = D3D10StateBlockMaskGetSetting(&mask, D3D10_DST_OM_BLEND_STATE, 0); +todo_wine + ok(ret, "Unexpected mask.\n"); + hr = pass->lpVtbl->Apply(pass, 0); ok(SUCCEEDED(hr), "Failed to apply pass, hr %#x.\n", hr);

1 0

Zebediah Figura : winegstreamer: Get rid of the WMSyncReader typedef.
by Alexandre Julliard Oct. 7, 2021

Oct. 7, 2021

Module: wine Branch: master Commit: ba3fa4254b3c336b171c9d47de677c2d9b277cdc URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba3fa4254b3c336b171c9d47… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Oct 7 10:47:08 2021 -0500 winegstreamer: Get rid of the WMSyncReader typedef. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/wm_syncreader.c | 143 +++++++++++++++++++------------------ 1 file changed, 72 insertions(+), 71 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ba3fa4254b3c336b171c…

1 0

Zebediah Figura : winegstreamer: Translate GST_AUDIO_CHANNEL_POSITION_MONO to SPEAKER_FRONT_CENTER.
by Alexandre Julliard Oct. 7, 2021

Oct. 7, 2021

Module: wine Branch: master Commit: 009c1d66fa202666f778d7df2bbcc522993935cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=009c1d66fa202666f778d7df… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Oct 7 10:47:06 2021 -0500 winegstreamer: Translate GST_AUDIO_CHANNEL_POSITION_MONO to SPEAKER_FRONT_CENTER. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/wg_parser.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 0c23ae6d351..c3c9051a174 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -159,7 +159,10 @@ static uint32_t wg_channel_position_from_gst(GstAudioChannelPosition position) SPEAKER_TOP_BACK_CENTER, }; - if (position < ARRAY_SIZE(position_map)) + if (position == GST_AUDIO_CHANNEL_POSITION_MONO) + return SPEAKER_FRONT_CENTER; + + if (position >= 0 && position < ARRAY_SIZE(position_map)) return position_map[position]; return 0; }

1 0

Piotr Caban : user32: Fix window style while CBT_CREATEWND hook is called.
by Alexandre Julliard Oct. 7, 2021

Oct. 7, 2021

Module: wine Branch: master Commit: fd60414fce64fb97c4ac66267f84b9c577d7473b URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd60414fce64fb97c4ac6626… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 7 16:34:11 2021 +0200 user32: Fix window style while CBT_CREATEWND hook is called. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 17 +++++++---------- dlls/user32/win.c | 40 +++++++++++++++++++++++++++------------- include/wine/server_protocol.h | 4 +++- server/protocol.def | 2 ++ server/request.h | 4 +++- server/trace.c | 2 ++ server/window.c | 2 ++ 7 files changed, 46 insertions(+), 25 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 6715a26b631..6b13d93be14 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -1222,10 +1222,9 @@ static LRESULT CALLBACK cbt_hook_proc(int nCode, WPARAM wParam, LPARAM lParam) /* WS_VISIBLE should be turned off yet */ style = createwnd->lpcs->style & ~WS_VISIBLE; - todo_wine_if(!(style & WS_CLIPSIBLINGS) && (!(style & WS_CHILD) || (style & WS_POPUP))) - ok(style == GetWindowLongA(hwnd, GWL_STYLE), - "style of hwnd and style in the CREATESTRUCT do not match: %08x != %08x\n", - GetWindowLongA(hwnd, GWL_STYLE), style); + ok(style == GetWindowLongA(hwnd, GWL_STYLE), + "style of hwnd and style in the CREATESTRUCT do not match: %08x != %08x\n", + GetWindowLongA(hwnd, GWL_STYLE), style); if (0) { @@ -4451,13 +4450,11 @@ static LRESULT WINAPI cbt_proc(int ncode, WPARAM wparam, LPARAM lparam) c->lpcs->dwExStyle, ts->cs_exstyle); style = GetWindowLongW(hwnd, GWL_STYLE); - todo_wine_if(!(ts->cs_style & WS_CHILD) || (ts->cs_style & WS_POPUP)) - ok(style == ts->cs_style, "style = 0x%08x, expected 0x%08x\n", - style, ts->cs_style); + ok(style == ts->cs_style, "style = 0x%08x, expected 0x%08x\n", + style, ts->cs_style); style = GetWindowLongW(hwnd, GWL_EXSTYLE); - todo_wine_if(ts->exstyle != ts->cs_exstyle) - ok(style == (ts->cs_exstyle & ~WS_EX_LAYERED), - "exstyle = 0x%08x, expected 0x%08x\n", style, ts->cs_exstyle); + ok(style == (ts->cs_exstyle & ~WS_EX_LAYERED), + "exstyle = 0x%08x, expected 0x%08x\n", style, ts->cs_exstyle); return CallNextHookEx(NULL, ncode, wparam, lparam); } diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 081d21a95d0..5e89f4c2c97 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -192,7 +192,8 @@ void *free_user_handle( HANDLE handle, enum user_obj_type type ) * Create a window handle with the server. */ static WND *create_window_handle( HWND parent, HWND owner, LPCWSTR name, - HINSTANCE instance, BOOL unicode ) + HINSTANCE instance, BOOL unicode, + DWORD style, DWORD ex_style ) { WORD index; WND *win; @@ -209,6 +210,8 @@ static WND *create_window_handle( HWND parent, HWND owner, LPCWSTR name, req->instance = wine_server_client_ptr( instance ); req->dpi = GetDpiForSystem(); req->awareness = awareness; + req->style = style; + req->ex_style = ex_style; if (!(req->atom = get_int_atom_value( name )) && name) wine_server_add_data( req, name, lstrlenW(name)*sizeof(WCHAR) ); if (!wine_server_call_err( req )) @@ -1482,7 +1485,7 @@ static DWORD fix_exstyle( DWORD style, DWORD exstyle ) */ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, BOOL unicode ) { - INT cx, cy, style, sw = SW_SHOW; + INT cx, cy, style, ex_style, sw = SW_SHOW; LRESULT result; RECT rect; WND *wndPtr; @@ -1614,13 +1617,17 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, /* Create the window structure */ - if (!(wndPtr = create_window_handle( parent, owner, className, module, unicode ))) + style = cs->style & ~WS_VISIBLE; + ex_style = cs->dwExStyle & ~WS_EX_LAYERED; + if (!(wndPtr = create_window_handle( parent, owner, className, module, + unicode, style, ex_style ))) { WNDCLASSW wc; /* if it's a comctl32 class, GetClassInfo will load it, then we can retry */ if (GetLastError() != ERROR_INVALID_HANDLE || !GetClassInfoW( 0, className, &wc ) || - !(wndPtr = create_window_handle( parent, owner, className, module, unicode ))) + !(wndPtr = create_window_handle( parent, owner, className, module, + unicode, style, ex_style ))) return 0; } hwnd = wndPtr->obj.handle; @@ -1630,8 +1637,8 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, wndPtr->tid = GetCurrentThreadId(); wndPtr->hInstance = cs->hInstance; wndPtr->text = NULL; - wndPtr->dwStyle = cs->style & ~WS_VISIBLE; - wndPtr->dwExStyle = cs->dwExStyle; + wndPtr->dwStyle = style; + wndPtr->dwExStyle = ex_style; wndPtr->wIDmenu = 0; wndPtr->helpContext = 0; wndPtr->pScroll = NULL; @@ -1647,6 +1654,19 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, if (wndPtr->dwStyle & WS_SYSMENU) SetSystemMenu( hwnd, 0 ); + /* call the WH_CBT hook */ + + WIN_ReleasePtr( wndPtr ); + cbcs = *cs; + cbtc.lpcs = &cbcs; + cbtc.hwndInsertAfter = HWND_TOP; + if (HOOK_CallHooks( WH_CBT, HCBT_CREATEWND, (WPARAM)hwnd, (LPARAM)&cbtc, unicode ) || + !(wndPtr = WIN_GetPtr( hwnd ))) + { + free_window_handle( hwnd ); + return 0; + } + /* * Correct the window styles. * @@ -1660,6 +1680,7 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, wndPtr->dwStyle |= WS_CAPTION; } + wndPtr->dwExStyle = cs->dwExStyle; /* WS_EX_WINDOWEDGE depends on some other styles */ if ((wndPtr->dwStyle & (WS_DLGFRAME | WS_THICKFRAME)) && !(wndPtr->dwStyle & (WS_CHILD | WS_POPUP))) @@ -1713,13 +1734,6 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, context = SetThreadDpiAwarenessContext( GetWindowDpiAwarenessContext( hwnd )); - /* call the WH_CBT hook */ - - cbcs = *cs; - cbtc.lpcs = &cbcs; - cbtc.hwndInsertAfter = HWND_TOP; - if (HOOK_CallHooks( WH_CBT, HCBT_CREATEWND, (WPARAM)hwnd, (LPARAM)&cbtc, unicode )) goto failed; - /* send the WM_GETMINMAXINFO message and fix the size if needed */ cx = cs->cx; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 02c90ea9011..8a85e0bc4ff 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -3021,6 +3021,8 @@ struct create_window_request mod_handle_t instance; int dpi; int awareness; + unsigned int style; + unsigned int ex_style; /* VARARG(class,unicode_str); */ }; struct create_window_reply @@ -6257,7 +6259,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 732 +#define SERVER_PROTOCOL_VERSION 733 /* ### protocol_version end ### */ diff --git a/server/protocol.def b/server/protocol.def index a7a4b7cc957..0f58dc7c85a 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2241,6 +2241,8 @@ enum message_type mod_handle_t instance; /* module instance */ int dpi; /* system DPI */ int awareness; /* thread DPI awareness */ + unsigned int style; /* window style */ + unsigned int ex_style; /* window extended style */ VARARG(class,unicode_str); /* class name */ @REPLY user_handle_t handle; /* created window */ diff --git a/server/request.h b/server/request.h index ff1744c1a80..778e7272bf5 100644 --- a/server/request.h +++ b/server/request.h @@ -1441,7 +1441,9 @@ C_ASSERT( FIELD_OFFSET(struct create_window_request, atom) == 20 ); C_ASSERT( FIELD_OFFSET(struct create_window_request, instance) == 24 ); C_ASSERT( FIELD_OFFSET(struct create_window_request, dpi) == 32 ); C_ASSERT( FIELD_OFFSET(struct create_window_request, awareness) == 36 ); -C_ASSERT( sizeof(struct create_window_request) == 40 ); +C_ASSERT( FIELD_OFFSET(struct create_window_request, style) == 40 ); +C_ASSERT( FIELD_OFFSET(struct create_window_request, ex_style) == 44 ); +C_ASSERT( sizeof(struct create_window_request) == 48 ); C_ASSERT( FIELD_OFFSET(struct create_window_reply, handle) == 8 ); C_ASSERT( FIELD_OFFSET(struct create_window_reply, parent) == 12 ); C_ASSERT( FIELD_OFFSET(struct create_window_reply, owner) == 16 ); diff --git a/server/trace.c b/server/trace.c index a007cb280f0..5a2afac504a 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2929,6 +2929,8 @@ static void dump_create_window_request( const struct create_window_request *req dump_uint64( ", instance=", &req->instance ); fprintf( stderr, ", dpi=%d", req->dpi ); fprintf( stderr, ", awareness=%d", req->awareness ); + fprintf( stderr, ", style=%08x", req->style ); + fprintf( stderr, ", ex_style=%08x", req->ex_style ); dump_varargs_unicode_str( ", class=", cur_size ); } diff --git a/server/window.c b/server/window.c index c94c745bd3c..7ea91d2a7dc 100644 --- a/server/window.c +++ b/server/window.c @@ -1964,6 +1964,8 @@ DECL_HANDLER(create_window) win->dpi_awareness = req->awareness; win->dpi = req->dpi; } + win->style = req->style; + win->ex_style = req->ex_style; reply->handle = win->handle; reply->parent = win->parent ? win->parent->handle : 0;

1 0

Piotr Caban : user32: Fix style passed to HCBT_CREATEWND hook.
by Alexandre Julliard Oct. 7, 2021

Oct. 7, 2021

Module: wine Branch: master Commit: 1b6f8a1adb087d7bc2f42345b8b0861bd570addf URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b6f8a1adb087d7bc2f42345… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 7 16:34:07 2021 +0200 user32: Fix style passed to HCBT_CREATEWND hook. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 12 ++++++------ dlls/user32/win.c | 6 ------ 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index b9824422409..6715a26b631 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -1222,9 +1222,10 @@ static LRESULT CALLBACK cbt_hook_proc(int nCode, WPARAM wParam, LPARAM lParam) /* WS_VISIBLE should be turned off yet */ style = createwnd->lpcs->style & ~WS_VISIBLE; - ok(style == GetWindowLongA(hwnd, GWL_STYLE), - "style of hwnd and style in the CREATESTRUCT do not match: %08x != %08x\n", - GetWindowLongA(hwnd, GWL_STYLE), style); + todo_wine_if(!(style & WS_CLIPSIBLINGS) && (!(style & WS_CHILD) || (style & WS_POPUP))) + ok(style == GetWindowLongA(hwnd, GWL_STYLE), + "style of hwnd and style in the CREATESTRUCT do not match: %08x != %08x\n", + GetWindowLongA(hwnd, GWL_STYLE), style); if (0) { @@ -4444,9 +4445,8 @@ static LRESULT WINAPI cbt_proc(int ncode, WPARAM wparam, LPARAM lparam) ts = c->lpcs->lpCreateParams; ok(ts != NULL, "lpCreateParams not set\n"); - todo_wine_if(!(ts->cs_style & WS_CHILD) || (ts->cs_style & WS_POPUP)) - ok(c->lpcs->style == ts->cs_style, "style = 0x%08x, expected 0x%08x\n", - c->lpcs->style, ts->cs_style); + ok(c->lpcs->style == ts->cs_style, "style = 0x%08x, expected 0x%08x\n", + c->lpcs->style, ts->cs_style); ok(c->lpcs->dwExStyle == ts->cs_exstyle, "exstyle = 0x%08x, expected 0x%08x\n", c->lpcs->dwExStyle, ts->cs_exstyle); diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 21214432b6d..081d21a95d0 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1706,7 +1706,6 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, } else SetWindowLongPtrW( hwnd, GWLP_ID, (ULONG_PTR)cs->hMenu ); - style = wndPtr->dwStyle; win_dpi = wndPtr->dpi; WIN_ReleasePtr( wndPtr ); @@ -1716,12 +1715,7 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, /* call the WH_CBT hook */ - /* the window style passed to the hook must be the real window style, - * rather than just the window style that the caller to CreateWindowEx - * passed in, so we have to copy the original CREATESTRUCT and get the - * the real style. */ cbcs = *cs; - cbcs.style = style; cbtc.lpcs = &cbcs; cbtc.hwndInsertAfter = HWND_TOP; if (HOOK_CallHooks( WH_CBT, HCBT_CREATEWND, (WPARAM)hwnd, (LPARAM)&cbtc, unicode )) goto failed;

1 0

Piotr Caban : user32/tests: Test window style in HCBT_CREATEWND hook.
by Alexandre Julliard Oct. 7, 2021

Oct. 7, 2021

Module: wine Branch: master Commit: 08f60ee991916f3b4400574cb1096a6cc87d53e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=08f60ee991916f3b4400574c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 7 16:34:04 2021 +0200 user32/tests: Test window style in HCBT_CREATEWND hook. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index f9428fd3494..b9824422409 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -4432,6 +4432,35 @@ typedef struct DWORD exstyle; } test_style; +static LRESULT WINAPI cbt_proc(int ncode, WPARAM wparam, LPARAM lparam) +{ + CBT_CREATEWNDW* c = (CBT_CREATEWNDW*)lparam; + HWND hwnd = (HWND)wparam; + test_style *ts; + DWORD style; + + if (ncode != HCBT_CREATEWND) + return CallNextHookEx(NULL, ncode, wparam, lparam); + + ts = c->lpcs->lpCreateParams; + ok(ts != NULL, "lpCreateParams not set\n"); + todo_wine_if(!(ts->cs_style & WS_CHILD) || (ts->cs_style & WS_POPUP)) + ok(c->lpcs->style == ts->cs_style, "style = 0x%08x, expected 0x%08x\n", + c->lpcs->style, ts->cs_style); + ok(c->lpcs->dwExStyle == ts->cs_exstyle, "exstyle = 0x%08x, expected 0x%08x\n", + c->lpcs->dwExStyle, ts->cs_exstyle); + + style = GetWindowLongW(hwnd, GWL_STYLE); + todo_wine_if(!(ts->cs_style & WS_CHILD) || (ts->cs_style & WS_POPUP)) + ok(style == ts->cs_style, "style = 0x%08x, expected 0x%08x\n", + style, ts->cs_style); + style = GetWindowLongW(hwnd, GWL_EXSTYLE); + todo_wine_if(ts->exstyle != ts->cs_exstyle) + ok(style == (ts->cs_exstyle & ~WS_EX_LAYERED), + "exstyle = 0x%08x, expected 0x%08x\n", style, ts->cs_exstyle); + return CallNextHookEx(NULL, ncode, wparam, lparam); +} + static LRESULT WINAPI StyleCheckProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { CREATESTRUCTA *cs; @@ -4491,6 +4520,7 @@ static void check_window_style(DWORD dwStyleIn, DWORD dwExStyleIn, DWORD dwStyle test_style ts; HWND hwnd; HWND hwndParent = NULL; + HHOOK hook; ts.cs_style = dwStyleIn; ts.cs_exstyle = dwExStyleIn; @@ -4507,11 +4537,14 @@ static void check_window_style(DWORD dwStyleIn, DWORD dwExStyleIn, DWORD dwStyle { hwndParent = CreateWindowExA(0, "static", NULL, WS_OVERLAPPEDWINDOW, 0, 0, 0, 0, NULL, NULL, NULL, NULL); + ok(hwndParent != NULL, "CreateWindowExA failed\n"); } + hook = SetWindowsHookExW(WH_CBT, cbt_proc, 0, GetCurrentThreadId()); hwnd = CreateWindowExA(dwExStyleIn, (LPCSTR)MAKEINTATOM(atomStyleCheckClass), NULL, dwStyleIn, 0, 0, 0, 0, hwndParent, NULL, NULL, &ts); - assert(hwnd); + ok(hwnd != NULL, "CreateWindowExA failed\n"); + UnhookWindowsHookEx(hook); flush_events( TRUE );

1 0