January 2023 - Wine-commits

Fabian Maurer : user32/tests: Don't assign const variable to other const (gcc 4.7).
by Alexandre Julliard 24 Jan '23

24 Jan '23

Module: wine Branch: master Commit: 4bc6aad375e552fa5930c65c0e9c434f1848286e URL: https://gitlab.winehq.org/wine/wine/-/commit/4bc6aad375e552fa5930c65c0e9c43… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Mon Dec 12 18:45:17 2022 +0100 user32/tests: Don't assign const variable to other const (gcc 4.7). Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/user32/tests/sysparams.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index 5c199a07769..6ed7755b91b 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -3123,7 +3123,8 @@ static void test_EnumDisplaySettings(void) { static const DWORD mode_fields = DM_DISPLAYORIENTATION | DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT | DM_DISPLAYFLAGS | DM_DISPLAYFREQUENCY; - static const DWORD setting_fields = mode_fields | DM_POSITION; + static const DWORD setting_fields = DM_DISPLAYORIENTATION | DM_BITSPERPEL | + DM_PELSWIDTH | DM_PELSHEIGHT | DM_DISPLAYFLAGS | DM_DISPLAYFREQUENCY | DM_POSITION; CHAR primary_adapter[CCHDEVICENAME]; DPI_AWARENESS_CONTEXT ctx = NULL; DWORD err, val, device, mode;

1 0

Nikolay Sivov : include: Add recent DirectWrite API changes.
by Alexandre Julliard 24 Jan '23

24 Jan '23

Module: wine Branch: master Commit: cab673f8b32562656d8f5c45baf6624e8fd2bd99 URL: https://gitlab.winehq.org/wine/wine/-/commit/cab673f8b32562656d8f5c45baf662… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Dec 17 18:37:32 2022 +0300 include: Add recent DirectWrite API changes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- include/dwrite_3.idl | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/include/dwrite_3.idl b/include/dwrite_3.idl index 845754f6e3f..e67c8ab6364 100644 --- a/include/dwrite_3.idl +++ b/include/dwrite_3.idl @@ -473,6 +473,29 @@ interface IDWriteFontSet3 : IDWriteFontSet2 HRESULT GetFontSourceName(UINT32 index, WCHAR *buffer, UINT32 buffer_size); } +[ + local, + object, + uuid(eec175fc-bea9-4c86-8b53-ccbdd7df0c82) +] +interface IDWriteFontSet4 : IDWriteFontSet3 +{ + UINT32 ConvertWeightStretchStyleToFontAxisValues( + DWRITE_FONT_AXIS_VALUE const *input_axis_values, + UINT32 input_axis_count, + DWRITE_FONT_WEIGHT weight, + DWRITE_FONT_STRETCH stretch, + DWRITE_FONT_STYLE style, + float size, + DWRITE_FONT_AXIS_VALUE *output_axis_values); + HRESULT GetMatchingFonts( + WCHAR const *family_name, + DWRITE_FONT_AXIS_VALUE const *axis_values, + UINT32 axis_value_count, + DWRITE_FONT_SIMULATIONS allowed_simulations, + IDWriteFontSet4 **fonts); +} + [ local, object, @@ -795,6 +818,21 @@ interface IDWriteFontFace5 : IDWriteFontFace4 BOOL Equals(IDWriteFontFace *fontface); } +[ + local, + object, + uuid(c4b1fe1b-6e84-47d5-b54c-a597981b06ad) +] +interface IDWriteFontFace6 : IDWriteFontFace5 +{ + HRESULT GetFamilyNames( + DWRITE_FONT_FAMILY_MODEL font_family_model, + IDWriteLocalizedStrings **names); + HRESULT GetFaceNames( + DWRITE_FONT_FAMILY_MODEL font_family_model, + IDWriteLocalizedStrings **names); +} + typedef struct DWRITE_COLOR_GLYPH_RUN1 DWRITE_COLOR_GLYPH_RUN1; cpp_quote("struct DWRITE_COLOR_GLYPH_RUN1")

1 0

Rémi Bernon : sechost: Use heap_strdup_multi_AtoW for dependencies in CreateServiceA.
by Alexandre Julliard 24 Jan '23

24 Jan '23

Module: wine Branch: master Commit: bea9ef83cc062372a1b6acfb31381a9ab86915ed URL: https://gitlab.winehq.org/wine/wine/-/commit/bea9ef83cc062372a1b6acfb31381a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jan 24 14:09:56 2023 +0100 sechost: Use heap_strdup_multi_AtoW for dependencies in CreateServiceA. --- dlls/sechost/service.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/sechost/service.c b/dlls/sechost/service.c index 011533b883e..b00e5536eda 100644 --- a/dlls/sechost/service.c +++ b/dlls/sechost/service.c @@ -356,7 +356,7 @@ SC_HANDLE WINAPI DECLSPEC_HOTPATCH CreateServiceA( SC_HANDLE manager, const char display_nameW = heap_strdupAtoW( display_name ); pathW = heap_strdupAtoW( path ); groupW = heap_strdupAtoW( group ); - dependenciesW = heap_strdupAtoW( dependencies ); + dependenciesW = heap_strdup_multi_AtoW( dependencies ); usernameW = heap_strdupAtoW( username ); passwordW = heap_strdupAtoW( password );

1 0

Rémi Bernon : services: Use a separate allocation for NotifyParamsArray[0].params.
by Alexandre Julliard 24 Jan '23

24 Jan '23

Module: wine Branch: master Commit: 03aa9e13e70e0f4c8087a93c7435eff75fc7cddd URL: https://gitlab.winehq.org/wine/wine/-/commit/03aa9e13e70e0f4c8087a93c7435ef… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jan 24 15:13:41 2023 +0100 services: Use a separate allocation for NotifyParamsArray[0].params. The pointer might be freed by RPC NdrPointerFree, which will try to use a dedicated free call for the array elements, and fail. --- programs/services/rpc.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index de918d33b1f..e56d25ea1af 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -102,6 +102,8 @@ static void sc_notify_release(struct sc_notify_handle *notify) if (r == 0) { CloseHandle(notify->event); + if (notify->params_list) + free(notify->params_list->NotifyParamsArray[0].params); free(notify->params_list); free(notify); } @@ -841,11 +843,14 @@ static void fill_notify(struct sc_notify_handle *notify, struct service_entry *s SC_RPC_NOTIFY_PARAMS_LIST *list; SERVICE_NOTIFY_STATUS_CHANGE_PARAMS_2 *cparams; - list = calloc(1, sizeof(SC_RPC_NOTIFY_PARAMS_LIST) + sizeof(SERVICE_NOTIFY_STATUS_CHANGE_PARAMS_2)); + list = calloc(1, sizeof(SC_RPC_NOTIFY_PARAMS_LIST)); if (!list) return; - - cparams = (SERVICE_NOTIFY_STATUS_CHANGE_PARAMS_2 *)(list + 1); + if (!(cparams = calloc(1, sizeof(SERVICE_NOTIFY_STATUS_CHANGE_PARAMS_2)))) + { + free(list); + return; + } cparams->dwNotifyMask = notify->notify_mask; fill_status_process(&cparams->ServiceStatus, service);

1 0

Gerald Pfeifer : localspl: Avoid uninitialized variable in fill_builtin_form_info.
by Alexandre Julliard 24 Jan '23

24 Jan '23

Module: wine Branch: master Commit: 9bf9b20c53ac843edf26e41eb1ef024876affd15 URL: https://gitlab.winehq.org/wine/wine/-/commit/9bf9b20c53ac843edf26e41eb1ef02… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Jan 14 00:53:42 2023 +0100 localspl: Avoid uninitialized variable in fill_builtin_form_info. As diagnosed by GCC 13: dlls/localspl/provider.c: In function ‘fill_builtin_form_info’: dlls/localspl/provider.c:3045:16: warning: ‘res_len’ may be used uninitialized [-Wmaybe-uninitialized] 3045 | if (res_len) | ^ --- dlls/localspl/provider.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index 790d9d64c00..7ab68b62c3d 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -3008,7 +3008,7 @@ static void fill_builtin_form_info( BYTE **base, WCHAR **strings, const struct b DWORD size, DWORD *used ) { FORM_INFO_2W *info = *(FORM_INFO_2W**)base; - DWORD name_len = wcslen( form->name ) + 1, res_len, keyword_len, total_size; + DWORD name_len = wcslen( form->name ) + 1, res_len = 0, keyword_len, total_size; static const WCHAR dll_name[] = L"localspl.dll"; const WCHAR *resource;

1 0

Zebediah Figura : d3d11/tests: Add a basic test for vertex formats.
by Alexandre Julliard 24 Jan '23

24 Jan '23

Module: wine Branch: master Commit: dc19f5c517af5d04bebb4f26bd79220b02f1ba64 URL: https://gitlab.winehq.org/wine/wine/-/commit/dc19f5c517af5d04bebb4f26bd7922… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jan 11 19:25:11 2023 -0600 d3d11/tests: Add a basic test for vertex formats. --- dlls/d3d11/tests/d3d11.c | 192 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 192 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 1f6b211f693..70a8ff1f683 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -34725,6 +34725,197 @@ static void test_rtv_depth_slice(void) release_test_context(&test_context); } +static void test_vertex_formats(void) +{ + struct d3d11_test_context test_context; + ID3D11DeviceContext *context; + ID3D11RenderTargetView *rtv; + ID3D11Device *device; + ID3D11Texture2D *rt; + unsigned int i; + HRESULT hr; + + static const D3D11_TEXTURE2D_DESC rt_desc = + { + .Width = 4, + .Height = 4, + .MipLevels = 1, + .ArraySize = 1, + .Format = DXGI_FORMAT_R32G32B32A32_FLOAT, + .SampleDesc.Count = 1, + .Usage = D3D11_USAGE_DEFAULT, + .BindFlags = D3D11_BIND_RENDER_TARGET, + }; + + static const struct quad + { + struct vec2 position; + unsigned int color[4]; + } + quad[] = + { + {{-1.0f, -1.0f}, {0x87654321, 0x12345678, 0xcccccccc, 0xdeadbeef}}, + {{-1.0f, 1.0f}, {0x87654321, 0x12345678, 0xcccccccc, 0xdeadbeef}}, + {{ 1.0f, -1.0f}, {0x87654321, 0x12345678, 0xcccccccc, 0xdeadbeef}}, + {{ 1.0f, 1.0f}, {0x87654321, 0x12345678, 0xcccccccc, 0xdeadbeef}}, + }; + + static const unsigned int vs_code[] = + { +#if 0 + void main(inout float4 position : sv_position, inout float4 color : COLOR) + { + } +#endif + 0x43425844, 0xc2f6fe60, 0x8a304938, 0x14c1a190, 0xe6f3e35e, 0x00000001, 0x00000144, 0x00000003, + 0x0000002c, 0x00000080, 0x000000d4, 0x4e475349, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, + 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x00000044, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000f0f, 0x705f7673, 0x7469736f, 0x006e6f69, 0x4f4c4f43, 0xabab0052, + 0x4e47534f, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, 0x00000000, 0x00000001, 0x00000003, + 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x0000000f, + 0x705f7673, 0x7469736f, 0x006e6f69, 0x4f4c4f43, 0xabab0052, 0x52444853, 0x00000068, 0x00010040, + 0x0000001a, 0x0300005f, 0x001010f2, 0x00000000, 0x0300005f, 0x001010f2, 0x00000001, 0x04000067, + 0x001020f2, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000001, 0x05000036, 0x001020f2, + 0x00000000, 0x00101e46, 0x00000000, 0x05000036, 0x001020f2, 0x00000001, 0x00101e46, 0x00000001, + 0x0100003e, + }; + + static const unsigned int ps_code[] = + { +#if 0 + float4 main(float4 position : sv_position, float4 color : COLOR) : sv_target + { + return color; + } +#endif + 0x43425844, 0xb9b047ca, 0x73193a19, 0xb9a919ed, 0x21c2ff5f, 0x00000001, 0x000000f4, 0x00000003, + 0x0000002c, 0x00000080, 0x000000b4, 0x4e475349, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000f0f, 0x705f7673, 0x7469736f, 0x006e6f69, 0x4f4c4f43, 0xabab0052, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x745f7673, 0x65677261, 0xabab0074, 0x52444853, 0x00000038, 0x00000040, + 0x0000000e, 0x03001062, 0x001010f2, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x05000036, + 0x001020f2, 0x00000000, 0x00101e46, 0x00000001, 0x0100003e, + }; + + static const struct vec4 white = {1.0f, 1.0f, 1.0f, 1.0f}; + + static const struct + { + DXGI_FORMAT format; + struct vec4 expect; + } + tests[] = + { + {DXGI_FORMAT_R32G32B32A32_FLOAT, {-1.72477726e-34, 5.69045661e-28, -1.07374176e+08, -6.25985340e+18}}, + {DXGI_FORMAT_R32G32B32_FLOAT, {-1.72477726e-34, 5.69045661e-28, -1.07374176e+08, 1.0}}, + {DXGI_FORMAT_R32G32_FLOAT, {-1.72477726e-34, 5.69045661e-28, 0.0, 1.0}}, + {DXGI_FORMAT_R32_FLOAT, {-1.72477726e-34, 0.0, 0.0, 1.0}}, + + {DXGI_FORMAT_R10G10B10A2_UNORM, { 7.82991230e-01, 3.28445762e-01, 1.15347020e-01, 6.66666666e-01}}, + + {DXGI_FORMAT_R11G11B10_FLOAT, { 1.89453125e-01, 1.30000000e+01, 3.81250000e+00, 1.0}}, + + {DXGI_FORMAT_R16G16B16A16_FLOAT, { 3.56445313e+00, -1.12831593e-04, 1.03500000e+02, 7.57217407e-04}}, + {DXGI_FORMAT_R16G16B16A16_UNORM, { 2.62226284e-01, 5.28892934e-01, 3.37773710e-01, 7.11070448e-02}}, + {DXGI_FORMAT_R16G16B16A16_SNORM, { 5.24460614e-01, -9.42258954e-01, 6.75557733e-01, 1.42216250e-01}}, + {DXGI_FORMAT_R16G16_FLOAT, { 3.56445313e+00, -1.12831593e-04, 0.0, 1.0}}, + {DXGI_FORMAT_R16G16_UNORM, { 2.62226284e-01, 5.28892934e-01, 0.0, 1.0}}, + {DXGI_FORMAT_R16G16_SNORM, { 5.24460614e-01, -9.42258954e-01, 0.0, 1.0}}, + {DXGI_FORMAT_R16_FLOAT, { 3.56445313e+00, 0.0, 0.0, 1.0}}, + {DXGI_FORMAT_R16_UNORM, { 2.62226284e-01, 0.0, 0.0, 1.0}}, + {DXGI_FORMAT_R16_SNORM, { 5.24460614e-01, 0.0, 0.0, 1.0}}, + + {DXGI_FORMAT_R8G8B8A8_UNORM, { 1.29411772e-01, 2.62745112e-01, 3.96078438e-01, 5.29411793e-01}}, + {DXGI_FORMAT_R8G8B8A8_SNORM, { 2.59842515e-01, 5.27559042e-01, 7.95275569e-01, -9.52755928e-01}}, + {DXGI_FORMAT_R8G8_UNORM, { 1.29411772e-01, 2.62745112e-01, 0.0, 1.0}}, + {DXGI_FORMAT_R8G8_SNORM, { 2.59842515e-01, 5.27559042e-01, 0.0, 1.0}}, + {DXGI_FORMAT_R8_UNORM, { 1.29411772e-01, 0.0, 0.0, 1.0}}, + {DXGI_FORMAT_R8_SNORM, { 2.59842515e-01, 0.0, 0.0, 1.0}}, + + {DXGI_FORMAT_B8G8R8A8_UNORM, { 3.96078438e-01, 2.62745112e-01, 1.29411772e-01, 5.29411793e-01}}, + {DXGI_FORMAT_B8G8R8X8_UNORM, { 3.96078438e-01, 2.62745112e-01, 1.29411772e-01, 1.0}}, + }; + + if (!init_test_context(&test_context, NULL)) + return; + device = test_context.device; + context = test_context.immediate_context; + + hr = ID3D11Device_CreateTexture2D(device, &rt_desc, NULL, &rt); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)rt, NULL, &rtv); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = ID3D11Device_CreateVertexShader(device, vs_code, sizeof(vs_code), NULL, &test_context.vs); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = ID3D11Device_CreatePixelShader(device, ps_code, sizeof(ps_code), NULL, &test_context.ps); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + test_context.vb = create_buffer(device, D3D11_BIND_VERTEX_BUFFER, sizeof(quad), quad); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + const D3D11_INPUT_ELEMENT_DESC layout_desc[] = + { + { + .SemanticName = "sv_position", + .SemanticIndex = 0, + .Format = DXGI_FORMAT_R32G32_FLOAT, + .InputSlot = 0, + .AlignedByteOffset = offsetof(struct quad, position), + .InputSlotClass = D3D11_INPUT_PER_VERTEX_DATA, + }, + { + .SemanticName = "COLOR", + .SemanticIndex = 0, + .Format = tests[i].format, + .InputSlot = 0, + .AlignedByteOffset = offsetof(struct quad, color), + .InputSlotClass = D3D11_INPUT_PER_VERTEX_DATA, + }, + }; + + static const unsigned int stride = sizeof(*quad); + static const unsigned int offset = 0; + ID3D11InputLayout *input_layout; + unsigned int format_support; + + hr = ID3D11Device_CheckFormatSupport(device, tests[i].format, &format_support); + ok(hr == S_OK || hr == E_FAIL, "Got hr %#lx.\n", hr); + + if (!(format_support & D3D11_FORMAT_SUPPORT_IA_VERTEX_BUFFER)) + continue; + + winetest_push_context("Format %#x", tests[i].format); + + hr = ID3D11Device_CreateInputLayout(device, layout_desc, ARRAY_SIZE(layout_desc), + vs_code, sizeof(vs_code), &input_layout); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + clear_rtv(context, rtv, &white); + ID3D11DeviceContext_OMSetRenderTargets(context, 1, &rtv, NULL); + ID3D11DeviceContext_IASetInputLayout(context, input_layout); + ID3D11DeviceContext_IASetPrimitiveTopology(context, D3D11_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); + ID3D11DeviceContext_IASetVertexBuffers(context, 0, 1, &test_context.vb, &stride, &offset); + ID3D11DeviceContext_VSSetShader(context, test_context.vs, NULL, 0); + ID3D11DeviceContext_PSSetShader(context, test_context.ps, NULL, 0); + ID3D11DeviceContext_Draw(context, 4, 0); + + todo_wine_if (tests[i].format == DXGI_FORMAT_R11G11B10_FLOAT) + check_texture_vec4(rt, &tests[i].expect, 1); + + ID3D11InputLayout_Release(input_layout); + + winetest_pop_context(); + } + + ID3D11RenderTargetView_Release(rtv); + ID3D11Texture2D_Release(rt); + release_test_context(&test_context); +} + START_TEST(d3d11) { unsigned int argc, i; @@ -34907,6 +35098,7 @@ START_TEST(d3d11) queue_test(test_user_defined_annotation); queue_test(test_logic_op); queue_test(test_rtv_depth_slice); + queue_test(test_vertex_formats); run_queued_tests();

1 0

Zebediah Figura : d3d10core/tests: Add a basic test for vertex formats.
by Alexandre Julliard 24 Jan '23

24 Jan '23

Module: wine Branch: master Commit: e705c822a38829e7e4748dc4eaeb423f909602e5 URL: https://gitlab.winehq.org/wine/wine/-/commit/e705c822a38829e7e4748dc4eaeb42… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jan 11 19:25:15 2023 -0600 d3d10core/tests: Add a basic test for vertex formats. --- dlls/d3d10core/tests/d3d10core.c | 197 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 196 insertions(+), 1 deletion(-)

1 0

Zebediah Figura : wined3d: Separate a parse_channel_desc() helper.
by Alexandre Julliard 24 Jan '23

24 Jan '23

Module: wine Branch: master Commit: 941e685a5b06b45319e8c4c347976e225d657336 URL: https://gitlab.winehq.org/wine/wine/-/commit/941e685a5b06b45319e8c4c347976e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jan 10 18:24:50 2023 -0600 wined3d: Separate a parse_channel_desc() helper. --- dlls/wined3d/utils.c | 69 +++++++++++++++++++++++++++++----------------------- 1 file changed, 38 insertions(+), 31 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index fb350acf56f..4af95ab1ffb 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2048,10 +2048,46 @@ static enum wined3d_channel_type map_channel_type(char t) } } +static void parse_channel_desc(struct wined3d_format *format, const char *channel_desc) +{ + unsigned int component_count = 0; + unsigned int attrs = 0; + unsigned int j; + + for (j = 0; j < strlen(channel_desc); ++j) + { + enum wined3d_channel_type channel_type = map_channel_type(channel_desc[j]); + + if (channel_type == WINED3D_CHANNEL_TYPE_UNORM || channel_type == WINED3D_CHANNEL_TYPE_SNORM) + attrs |= WINED3D_FORMAT_ATTR_NORMALISED; + if (channel_type == WINED3D_CHANNEL_TYPE_UINT || channel_type == WINED3D_CHANNEL_TYPE_SINT) + attrs |= WINED3D_FORMAT_ATTR_INTEGER; + if (channel_type == WINED3D_CHANNEL_TYPE_FLOAT) + attrs |= WINED3D_FORMAT_ATTR_FLOAT; + if (channel_type != WINED3D_CHANNEL_TYPE_UNUSED) + ++component_count; + + if (channel_type == WINED3D_CHANNEL_TYPE_DEPTH && !format->depth_size) + { + format->depth_size = format->red_size; + format->red_size = format->red_offset = 0; + } + + if (channel_type == WINED3D_CHANNEL_TYPE_STENCIL && !format->stencil_size) + { + format->stencil_size = format->green_size; + format->green_size = format->green_offset = 0; + } + } + + format->attrs |= attrs; + format->component_count = component_count; +} + static BOOL init_format_base_info(struct wined3d_adapter *adapter) { struct wined3d_format *format; - unsigned int i, j; + unsigned int i; for (i = 0; i < ARRAY_SIZE(formats); ++i) { @@ -2078,8 +2114,6 @@ static BOOL init_format_base_info(struct wined3d_adapter *adapter) for (i = 0; i < ARRAY_SIZE(typed_formats); ++i) { struct wined3d_format *typeless_format; - unsigned int component_count = 0; - unsigned int attrs = 0; if (!(format = get_format_internal(adapter, typed_formats[i].id))) return FALSE; @@ -2106,34 +2140,7 @@ static BOOL init_format_base_info(struct wined3d_adapter *adapter) typeless_format->typeless_id = typeless_format->id; - for (j = 0; j < strlen(typed_formats[i].channels); ++j) - { - enum wined3d_channel_type channel_type = map_channel_type(typed_formats[i].channels[j]); - - if (channel_type == WINED3D_CHANNEL_TYPE_UNORM || channel_type == WINED3D_CHANNEL_TYPE_SNORM) - attrs |= WINED3D_FORMAT_ATTR_NORMALISED; - if (channel_type == WINED3D_CHANNEL_TYPE_UINT || channel_type == WINED3D_CHANNEL_TYPE_SINT) - attrs |= WINED3D_FORMAT_ATTR_INTEGER; - if (channel_type == WINED3D_CHANNEL_TYPE_FLOAT) - attrs |= WINED3D_FORMAT_ATTR_FLOAT; - if (channel_type != WINED3D_CHANNEL_TYPE_UNUSED) - ++component_count; - - if (channel_type == WINED3D_CHANNEL_TYPE_DEPTH && !format->depth_size) - { - format->depth_size = format->red_size; - format->red_size = format->red_offset = 0; - } - - if (channel_type == WINED3D_CHANNEL_TYPE_STENCIL && !format->stencil_size) - { - format->stencil_size = format->green_size; - format->green_size = format->green_offset = 0; - } - } - - format->component_count = component_count; - format->attrs |= attrs; + parse_channel_desc(format, typed_formats[i].channels); } for (i = 0; i < ARRAY_SIZE(ddi_formats); ++i)

1 0

Zebediah Figura : wined3d: Use a string channel desc to initialize typed formats.
by Alexandre Julliard 24 Jan '23

24 Jan '23

Module: wine Branch: master Commit: bb82bc78f439ba92ae5a40979c8037dcb10477d4 URL: https://gitlab.winehq.org/wine/wine/-/commit/bb82bc78f439ba92ae5a40979c8037… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jan 10 18:39:54 2023 -0600 wined3d: Use a string channel desc to initialize typed formats. Avoid the need for manually set type attributes, and initialize the component count for all such formats. This fixes use of R11G11B10_FLOAT as a vertex attribute format with the GL backend. Since it has no corresponding typeless format, prior to this commit the component count was uninitialized and hence use of the format would result in a GL error. This fixes a GL error with Dark Souls Remastered. I did not immediately observe any corresponding rendering errors, however. --- dlls/d3d10core/tests/d3d10core.c | 3 +- dlls/d3d11/tests/d3d11.c | 3 +- dlls/wined3d/utils.c | 173 +++++++++++++++++++-------------------- 3 files changed, 85 insertions(+), 94 deletions(-)

1 0

Gabriel Ivăncescu : mshtml: Don't release the frame returned by get_frame_by_name.
by Alexandre Julliard 24 Jan '23

24 Jan '23

Module: wine Branch: master Commit: 6a1b12bd8ffca9c16177aac01ac5370f6688c55a URL: https://gitlab.winehq.org/wine/wine/-/commit/6a1b12bd8ffca9c16177aac01ac537… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Jan 3 18:27:04 2023 +0200 mshtml: Don't release the frame returned by get_frame_by_name. It does *not* add a ref to the returned frame. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlwindow.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 732f5ec7316..f013ba20d1c 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -3593,8 +3593,6 @@ static HRESULT WINAPI WindowDispEx_GetDispID(IDispatchEx *iface, BSTR bstrName, if(SUCCEEDED(hres) && frame) { global_prop_t *prop; - IHTMLWindow2_Release(&frame->base.IHTMLWindow2_iface); - prop = alloc_global_prop(window, GLOBAL_FRAMEVAR, bstrName); if(!prop) return E_OUTOFMEMORY;

1 0