June 2020 - Wine-Commits - list.winehq.org

Zebediah Figura : d3dcompiler/tests: Add a simple test for global variable initializers.
by Alexandre Julliard June 17, 2020

June 17, 2020

Module: wine Branch: master Commit: 610baeac56932b7b3344b17a662089468437646a URL: https://source.winehq.org/git/wine.git/?a=commit;h=610baeac56932b7b3344b17a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 11 16:44:19 2020 -0500 d3dcompiler/tests: Add a simple test for global variable initializers. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/tests/hlsl_d3d9.c | 43 +++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c index d82a0b015a..83f5b7bdd5 100644 --- a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c +++ b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c @@ -948,6 +948,48 @@ static void test_struct_semantics(void) release_test_context(&test_context); } +static void test_global_initializer(void) +{ + struct test_context test_context; + ID3DXConstantTable *constants; + ID3D10Blob *ps_code = NULL; + struct vec4 v; + HRESULT hr; + + static const char ps_source[] = + "float myfunc()\n" + "{\n" + " return 0.6;\n" + "}\n" + "static float sf = myfunc() + 0.2;\n" + "uniform float uf = 0.2;\n" + "float4 main() : COLOR\n" + "{\n" + " return float4(sf, uf, 0, 0);\n" + "}"; + + if (!init_test_context(&test_context)) + return; + + todo_wine ps_code = compile_shader(ps_source, "ps_2_0"); + if (ps_code) + { + hr = pD3DXGetShaderConstantTable(ID3D10Blob_GetBufferPointer(ps_code), &constants); + ok(hr == D3D_OK, "Failed to get constant table, hr %#x.\n", hr); + hr = ID3DXConstantTable_SetDefaults(constants, test_context.device); + ok(hr == D3D_OK, "Failed to get constant table, hr %#x.\n", hr); + ID3DXConstantTable_Release(constants); + draw_quad(test_context.device, ps_code); + + v = get_color_vec4(test_context.device, 0, 0); + todo_wine ok(compare_vec4(&v, 0.8f, 0.2f, 0.0f, 0.0f, 4096), + "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v.x, v.y, v.z, v.w); + + ID3D10Blob_Release(ps_code); + } + release_test_context(&test_context); +} + static void check_constant_desc(const char *prefix, const D3DXCONSTANT_DESC *desc, const D3DXCONSTANT_DESC *expect, BOOL nonzero_defaultvalue) { @@ -1263,6 +1305,7 @@ START_TEST(hlsl_d3d9) test_majority(); test_struct_assignment(); test_struct_semantics(); + test_global_initializer(); test_constant_table(); test_fail();

1 0

Zebediah Figura : d3dcompiler/tests: Add a couple of extra tests for struct declaration syntax.
by Alexandre Julliard June 17, 2020

June 17, 2020

Module: wine Branch: master Commit: 549fa04cbd4020aeb6690200d70b684732a90c19 URL: https://source.winehq.org/git/wine.git/?a=commit;h=549fa04cbd4020aeb6690200… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 11 16:44:18 2020 -0500 d3dcompiler/tests: Add a couple of extra tests for struct declaration syntax. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/tests/hlsl_d3d9.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c index edff59b633..d82a0b015a 100644 --- a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c +++ b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c @@ -968,7 +968,7 @@ static void test_constant_table(void) { static const char *source = "typedef float3x3 matrix_t;\n" - "struct matrix_record { float3x3 a; };\n" + "struct matrix_record { float3x3 a; } dummy;\n" "uniform float4 a;\n" "uniform float b;\n" "uniform float unused;\n" @@ -1193,6 +1193,12 @@ static void test_fail(void) " o = float4(1, 1, 1, 1);\n" " return float4(0, 0, 0, 0);\n" "}", + + "struct {float4 a;};\n" + "float4 test() : SV_TARGET\n" + "{\n" + " return float4(0, 0, 0, 0);\n" + "}", }; static const char *targets[] = {"ps_2_0", "ps_3_0", "ps_4_0"};

1 0

Nikolay Sivov : evr: Add IMFVideoDeviceID to default mixer.
by Alexandre Julliard June 17, 2020

June 17, 2020

Module: wine Branch: master Commit: 8d791562133469554dbd6f9fe9aee04fd024dc40 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d791562133469554dbd6f9f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 17 14:59:34 2020 +0300 evr: Add IMFVideoDeviceID to default mixer. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++++---- dlls/evr/tests/evr.c | 16 +++++++++---- 2 files changed, 73 insertions(+), 9 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 41d63c8aab..97eaf976fc 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -29,6 +29,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(evr); struct video_mixer { IMFTransform IMFTransform_iface; + IMFVideoDeviceID IMFVideoDeviceID_iface; LONG refcount; }; @@ -37,19 +38,35 @@ static struct video_mixer *impl_from_IMFTransform(IMFTransform *iface) return CONTAINING_RECORD(iface, struct video_mixer, IMFTransform_iface); } +static struct video_mixer *impl_from_IMFVideoDeviceID(IMFVideoDeviceID *iface) +{ + return CONTAINING_RECORD(iface, struct video_mixer, IMFVideoDeviceID_iface); +} + static HRESULT WINAPI video_mixer_transform_QueryInterface(IMFTransform *iface, REFIID riid, void **obj) { + struct video_mixer *mixer = impl_from_IMFTransform(iface); + + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); + if (IsEqualIID(riid, &IID_IMFTransform) || IsEqualIID(riid, &IID_IUnknown)) { *obj = iface; - IMFTransform_AddRef(iface); - return S_OK; + } + else if (IsEqualIID(riid, &IID_IMFVideoDeviceID)) + { + *obj = &mixer->IMFVideoDeviceID_iface; + } + else + { + WARN("Unsupported interface %s.\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; } - WARN("Unsupported interface %s.\n", debugstr_guid(riid)); - *obj = NULL; - return E_NOINTERFACE; + IUnknown_AddRef((IUnknown *)*obj); + return S_OK; } static ULONG WINAPI video_mixer_transform_AddRef(IMFTransform *iface) @@ -273,6 +290,44 @@ static const IMFTransformVtbl video_mixer_transform_vtbl = video_mixer_transform_ProcessOutput, }; +static HRESULT WINAPI video_mixer_device_id_QueryInterface(IMFVideoDeviceID *iface, REFIID riid, void **obj) +{ + struct video_mixer *mixer = impl_from_IMFVideoDeviceID(iface); + return IMFTransform_QueryInterface(&mixer->IMFTransform_iface, riid, obj); +} + +static ULONG WINAPI video_mixer_device_id_AddRef(IMFVideoDeviceID *iface) +{ + struct video_mixer *mixer = impl_from_IMFVideoDeviceID(iface); + return IMFTransform_AddRef(&mixer->IMFTransform_iface); +} + +static ULONG WINAPI video_mixer_device_id_Release(IMFVideoDeviceID *iface) +{ + struct video_mixer *mixer = impl_from_IMFVideoDeviceID(iface); + return IMFTransform_Release(&mixer->IMFTransform_iface); +} + +static HRESULT WINAPI video_mixer_device_id_GetDeviceID(IMFVideoDeviceID *iface, IID *device_id) +{ + TRACE("%p, %p.\n", iface, device_id); + + if (!device_id) + return E_POINTER; + + memcpy(device_id, &IID_IDirect3DDevice9, sizeof(*device_id)); + + return S_OK; +} + +static const IMFVideoDeviceIDVtbl video_mixer_device_id_vtbl = +{ + video_mixer_device_id_QueryInterface, + video_mixer_device_id_AddRef, + video_mixer_device_id_Release, + video_mixer_device_id_GetDeviceID, +}; + HRESULT WINAPI MFCreateVideoMixer(IUnknown *owner, REFIID riid_device, REFIID riid, void **obj) { TRACE("%p, %s, %s, %p.\n", owner, debugstr_guid(riid_device), debugstr_guid(riid), obj); @@ -296,6 +351,7 @@ HRESULT evr_mixer_create(IUnknown *outer, void **out) return E_OUTOFMEMORY; object->IMFTransform_iface.lpVtbl = &video_mixer_transform_vtbl; + object->IMFVideoDeviceID_iface.lpVtbl = &video_mixer_device_id_vtbl; object->refcount = 1; *out = &object->IMFTransform_iface; diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index c4b1a56157..7fa6136b0e 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -340,9 +340,11 @@ static void test_pin_info(void) static void test_default_mixer(void) { + IMFVideoDeviceID *deviceid; IMFTransform *transform; IUnknown *unk; HRESULT hr; + IID iid; hr = MFCreateVideoMixer(NULL, &IID_IDirect3DDevice9, &IID_IMFTransform, (void **)&transform); ok(hr == S_OK, "Failed to create default mixer, hr %#x.\n", hr); @@ -353,11 +355,17 @@ todo_wine if (SUCCEEDED(hr)) IUnknown_Release(unk); - hr = IMFTransform_QueryInterface(transform, &IID_IMFVideoDeviceID, (void **)&unk); -todo_wine + hr = IMFTransform_QueryInterface(transform, &IID_IMFVideoDeviceID, (void **)&deviceid); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - if (SUCCEEDED(hr)) - IUnknown_Release(unk); + + hr = IMFVideoDeviceID_GetDeviceID(deviceid, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoDeviceID_GetDeviceID(deviceid, &iid); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(IsEqualIID(&iid, &IID_IDirect3DDevice9), "Unexpected id %s.\n", wine_dbgstr_guid(&iid)); + + IMFVideoDeviceID_Release(deviceid); IMFTransform_Release(transform);

1 0

Zebediah Figura : d3dcompiler/tests: Add a test for struct field semantics.
by Alexandre Julliard June 17, 2020

June 17, 2020

Module: wine Branch: master Commit: f26a58a61b3d65e3b0c4c894c0fb18769dc95f3f URL: https://source.winehq.org/git/wine.git/?a=commit;h=f26a58a61b3d65e3b0c4c894… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 11 16:44:17 2020 -0500 d3dcompiler/tests: Add a test for struct field semantics. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/tests/hlsl_d3d9.c | 49 +++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c index 24829235a5..edff59b633 100644 --- a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c +++ b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c @@ -900,6 +900,54 @@ static void test_struct_assignment(void) release_test_context(&test_context); } +static void test_struct_semantics(void) +{ + struct test_context test_context; + ID3D10Blob *ps_code = NULL; + struct vec4 v; + + static const char ps_source[] = + "struct input\n" + "{\n" + " struct\n" + " {\n" + " float4 texcoord : TEXCOORD0;\n" + " } m;\n" + "};\n" + "struct output\n" + "{\n" + " struct\n" + " {\n" + " float4 color : COLOR;\n" + " } m;\n" + "};\n" + "struct output main(struct input i)\n" + "{\n" + " struct output o;\n" + " o.m.color = i.m.texcoord;\n" + " return o;\n" + "}"; + + if (!init_test_context(&test_context)) + return; + + todo_wine ps_code = compile_shader(ps_source, "ps_2_0"); + if (ps_code) + { + draw_quad(test_context.device, ps_code); + + v = get_color_vec4(test_context.device, 64, 48); + todo_wine ok(compare_vec4(&v, 0.1f, 0.1f, 0.0f, 0.0f, 4096), + "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v.x, v.y, v.z, v.w); + v = get_color_vec4(test_context.device, 320, 240); + todo_wine ok(compare_vec4(&v, 0.5f, 0.5f, 0.0f, 0.0f, 4096), + "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v.x, v.y, v.z, v.w); + + ID3D10Blob_Release(ps_code); + } + release_test_context(&test_context); +} + static void check_constant_desc(const char *prefix, const D3DXCONSTANT_DESC *desc, const D3DXCONSTANT_DESC *expect, BOOL nonzero_defaultvalue) { @@ -1208,6 +1256,7 @@ START_TEST(hlsl_d3d9) test_array_dimensions(); test_majority(); test_struct_assignment(); + test_struct_semantics(); test_constant_table(); test_fail();

1 0

André Hentschel : winedbg: Remove support for PPC32.
by Alexandre Julliard June 17, 2020

June 17, 2020

Module: wine Branch: master Commit: 4ebba430202e6120f26aaf81d44d082dec91911e URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ebba430202e6120f26aaf81… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jun 17 15:11:25 2020 +0200 winedbg: Remove support for PPC32. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/Makefile.in | 1 - programs/winedbg/be_ppc.c | 305 ------------------------------------------ programs/winedbg/gdbproxy.c | 4 - programs/winedbg/tgt_active.c | 2 - programs/winedbg/winedbg.c | 4 - 5 files changed, 316 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4ebba430202e6120f26a…

1 0

Nikolay Sivov : dwrite: Simplify alternate substitution handler.
by Alexandre Julliard June 17, 2020

June 17, 2020

Module: wine Branch: master Commit: 5909ab53032aa4e9fdbe6a83e15e970e154b8d49 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5909ab53032aa4e9fdbe6a83… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 17 14:47:53 2020 +0300 dwrite: Simplify alternate substitution handler. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 48 +++++++++++++++++++----------------------------- 1 file changed, 19 insertions(+), 29 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index e729be9b20..e8d2068397 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -4221,16 +4221,16 @@ static BOOL opentype_layout_apply_gpos_mark_to_base_attachment(struct scriptshap return TRUE; } -static BOOL table_read_array_be_word(const struct dwrite_fonttable *table, unsigned int offset, +static const UINT16 * table_read_array_be_word(const struct dwrite_fonttable *table, unsigned int offset, unsigned int index, UINT16 *data) { unsigned int count = table_read_be_word(table, offset); const UINT16 *array; - if (index >= count) return FALSE; + if (index != ~0u && index >= count) return NULL; if (!(array = table_read_ensure(table, offset + 2, count * sizeof(*array)))) return FALSE; - *data = GET_BE_WORD(array[index]); - return TRUE; + *data = index == ~0u ? count : GET_BE_WORD(array[index]); + return array; } static BOOL opentype_layout_apply_gpos_mark_to_lig_attachment(struct scriptshaping_context *context, @@ -4887,10 +4887,7 @@ static BOOL opentype_layout_apply_gsub_mult_substitution(struct scriptshaping_co return FALSE; } - glyph_count = table_read_be_word(table, subtable_offset + seq_offset); - - if (!(glyphs = table_read_ensure(table, subtable_offset + seq_offset + 2, glyph_count * sizeof(*glyphs)))) - return FALSE; + if (!(glyphs = table_read_array_be_word(table, subtable_offset + seq_offset, ~0u, &glyph_count))) return FALSE; if (glyph_count == 1) { @@ -4959,43 +4956,36 @@ static BOOL opentype_layout_apply_gsub_mult_substitution(struct scriptshaping_co static BOOL opentype_layout_apply_gsub_alt_substitution(struct scriptshaping_context *context, const struct lookup *lookup, unsigned int subtable_offset) { - const struct dwrite_fonttable *gsub = &context->table->table; - unsigned int idx, coverage_index, offset; + const struct dwrite_fonttable *table = &context->table->table; + unsigned int idx, coverage_index; UINT16 format, coverage, glyph; idx = context->cur; glyph = context->u.subst.glyphs[idx]; - format = table_read_be_word(gsub, subtable_offset); + format = table_read_be_word(table, subtable_offset); if (format == 1) { - const struct ot_gsub_altsubst_format1 *format1 = table_read_ensure(gsub, subtable_offset, sizeof(*format1)); - unsigned int count, shift, alt_index; + const struct ot_gsub_altsubst_format1 *format1 = table_read_ensure(table, subtable_offset, sizeof(*format1)); + unsigned int shift, alt_index; + UINT16 set_offset; - coverage = table_read_be_word(gsub, subtable_offset + FIELD_OFFSET(struct ot_gsub_altsubst_format1, coverage)); + coverage = table_read_be_word(table, subtable_offset + FIELD_OFFSET(struct ot_gsub_altsubst_format1, coverage)); - coverage_index = opentype_layout_is_glyph_covered(gsub, subtable_offset + coverage, glyph); - if (coverage_index == GLYPH_NOT_COVERED) - return FALSE; - - if (coverage_index >= GET_BE_WORD(format1->count)) - return FALSE; - - offset = table_read_be_word(gsub, subtable_offset + - FIELD_OFFSET(struct ot_gsub_altsubst_format1, sets[coverage_index])); + coverage_index = opentype_layout_is_glyph_covered(table, subtable_offset + coverage, glyph); + if (coverage_index == GLYPH_NOT_COVERED) return FALSE; - count = table_read_be_word(gsub, subtable_offset + offset); - if (!count) + if (!table_read_array_be_word(table, subtable_offset + FIELD_OFFSET(struct ot_gsub_altsubst_format1, count), + coverage_index, &set_offset)) return FALSE; + /* Argument is 1-based. */ BitScanForward(&shift, context->lookup_mask); alt_index = (context->lookup_mask & context->glyph_infos[idx].mask) >> shift; + if (!alt_index) return FALSE; - if (alt_index > count || !alt_index) - return FALSE; - - glyph = table_read_be_word(gsub, subtable_offset + offset + 2 + (alt_index - 1) * sizeof(glyph)); + if (!table_read_array_be_word(table, subtable_offset + set_offset, alt_index - 1, &glyph)) return FALSE; } else {

1 0

Zhiyi Zhang : winemac.drv: Use helpers to get and release display device init mutex.
by Alexandre Julliard June 17, 2020

June 17, 2020

Module: wine Branch: master Commit: 13e3d8f6354d23226ac5e7b1a2fb3aeb81d0b402 URL: https://source.winehq.org/git/wine.git/?a=commit;h=13e3d8f6354d23226ac5e7b1… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Jun 11 17:22:24 2020 +0800 winemac.drv: Use helpers to get and release display device init mutex. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/display.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 001906efdf..c024885e2d 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -136,6 +136,21 @@ static CRITICAL_SECTION modes_section = { &critsect_debug, -1, 0, 0, 0, 0 }; static BOOL inited_original_display_mode; +static HANDLE get_display_device_init_mutex(void) +{ + static const WCHAR init_mutexW[] = {'d','i','s','p','l','a','y','_','d','e','v','i','c','e','_','i','n','i','t',0}; + HANDLE mutex = CreateMutexW(NULL, FALSE, init_mutexW); + + WaitForSingleObject(mutex, INFINITE); + return mutex; +} + +static void release_display_device_init_mutex(HANDLE mutex) +{ + ReleaseMutex(mutex); + CloseHandle(mutex); +} + static BOOL get_display_device_reg_key(char *key, unsigned len) { static const char display_device_guid_prop[] = "__wine_display_device_guid"; @@ -1675,7 +1690,6 @@ static void cleanup_devices(void) */ void macdrv_init_display_devices(BOOL force) { - static const WCHAR init_mutexW[] = {'d','i','s','p','l','a','y','_','d','e','v','i','c','e','_','i','n','i','t',0}; HANDLE mutex; struct macdrv_gpu *gpus = NULL; struct macdrv_adapter *adapters = NULL; @@ -1691,8 +1705,7 @@ void macdrv_init_display_devices(BOOL force) LUID gpu_luid; UINT output_id = 0; - mutex = CreateMutexW(NULL, FALSE, init_mutexW); - WaitForSingleObject(mutex, INFINITE); + mutex = get_display_device_init_mutex(); if (RegCreateKeyExW(HKEY_LOCAL_MACHINE, video_keyW, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &video_hkey, &disposition)) @@ -1760,8 +1773,7 @@ done: SetupDiDestroyDeviceInfoList(gpu_devinfo); RegCloseKey(video_hkey); - ReleaseMutex(mutex); - CloseHandle(mutex); + release_display_device_init_mutex(mutex); macdrv_free_gpus(gpus); macdrv_free_adapters(adapters);

1 0

Nikolay Sivov : dwrite: Simplify multiple substitution handler.
by Alexandre Julliard June 17, 2020

June 17, 2020

Module: wine Branch: master Commit: 78ea46f6a908656e4958aabfd5951f4332722c8a URL: https://source.winehq.org/git/wine.git/?a=commit;h=78ea46f6a908656e4958aabf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 17 14:47:52 2020 +0300 dwrite: Simplify multiple substitution handler. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index c0a29d08df..e729be9b20 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -4862,37 +4862,34 @@ static BOOL opentype_layout_gsub_ensure_buffer(struct scriptshaping_context *con static BOOL opentype_layout_apply_gsub_mult_substitution(struct scriptshaping_context *context, const struct lookup *lookup, unsigned int subtable_offset) { - const struct dwrite_fonttable *gsub = &context->table->table; - UINT16 format, coverage, glyph, seq_count, glyph_count; - const struct ot_gsub_multsubst_format1 *format1; + const struct dwrite_fonttable *table = &context->table->table; + UINT16 format, coverage, glyph, glyph_count; unsigned int i, idx, coverage_index; const UINT16 *glyphs; idx = context->cur; glyph = context->u.subst.glyphs[idx]; - format = table_read_be_word(gsub, subtable_offset); + format = table_read_be_word(table, subtable_offset); - coverage = table_read_be_word(gsub, subtable_offset + FIELD_OFFSET(struct ot_gsub_multsubst_format1, coverage)); + coverage = table_read_be_word(table, subtable_offset + FIELD_OFFSET(struct ot_gsub_multsubst_format1, coverage)); if (format == 1) { - coverage_index = opentype_layout_is_glyph_covered(gsub, subtable_offset + coverage, glyph); - if (coverage_index == GLYPH_NOT_COVERED) - return FALSE; - - seq_count = table_read_be_word(gsub, subtable_offset + FIELD_OFFSET(struct ot_gsub_multsubst_format1, seq_count)); + UINT16 seq_offset; - format1 = table_read_ensure(gsub, subtable_offset, FIELD_OFFSET(struct ot_gsub_multsubst_format1, seq[seq_count])); + coverage_index = opentype_layout_is_glyph_covered(table, subtable_offset + coverage, glyph); + if (coverage_index == GLYPH_NOT_COVERED) return FALSE; - if (!seq_count || seq_count <= coverage_index || !format1) + if (!table_read_array_be_word(table, subtable_offset + FIELD_OFFSET(struct ot_gsub_multsubst_format1, seq_count), + coverage_index, &seq_offset)) + { return FALSE; + } - glyph_count = table_read_be_word(gsub, subtable_offset + GET_BE_WORD(format1->seq[coverage_index])); + glyph_count = table_read_be_word(table, subtable_offset + seq_offset); - glyphs = table_read_ensure(gsub, subtable_offset + GET_BE_WORD(format1->seq[coverage_index]) + 2, - glyph_count * sizeof(*glyphs)); - if (!glyphs) + if (!(glyphs = table_read_ensure(table, subtable_offset + seq_offset + 2, glyph_count * sizeof(*glyphs)))) return FALSE; if (glyph_count == 1)

1 0

Ziqing Hui : windowscodecs: Fix MIME types of DDS decoder.
by Alexandre Julliard June 17, 2020

June 17, 2020

Module: wine Branch: master Commit: a2fa0e76b17fb4f247e529b284841e89de99750f URL: https://source.winehq.org/git/wine.git/?a=commit;h=a2fa0e76b17fb4f247e529b2… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Jun 16 13:54:47 2020 +0800 windowscodecs: Fix MIME types of DDS decoder. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/regsvr.c | 2 +- dlls/windowscodecs/tests/info.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index 584897689d..00be59c98f 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -1298,7 +1298,7 @@ static struct regsvr_decoder const decoder_list[] = { "1.0.0.0", &GUID_VendorMicrosoft, &GUID_ContainerFormatDds, - "image/vnd-ms.dds", + "image/vnd.ms-dds", ".dds", dds_formats, dds_patterns diff --git a/dlls/windowscodecs/tests/info.c b/dlls/windowscodecs/tests/info.c index 707b0715b7..bb8d3310bc 100644 --- a/dlls/windowscodecs/tests/info.c +++ b/dlls/windowscodecs/tests/info.c @@ -193,7 +193,6 @@ static void test_decoder_info(void) hr = IWICBitmapDecoderInfo_GetMimeTypes(decoder_info, len, value, &len); ok(hr == S_OK, "GetMimeType failed, hr=%x\n", hr); todo_wine_if(test->todo) { - todo_wine_if(i == 6) ok(lstrcmpW(value, mimetypeW) == 0, "GetMimeType returned wrong value %s\n", wine_dbgstr_w(value)); ok(len == lstrlenW(mimetypeW) + 1, "GetMimeType returned wrong len %i\n", len); } @@ -205,7 +204,6 @@ static void test_decoder_info(void) hr = IWICBitmapDecoderInfo_GetMimeTypes(decoder_info, 256, value, &len); ok(hr == S_OK, "GetMimeType failed, hr=%x\n", hr); todo_wine_if(test->todo) { - todo_wine_if(i == 6) ok(lstrcmpW(value, mimetypeW) == 0, "GetMimeType returned wrong value %s\n", wine_dbgstr_w(value)); ok(len == lstrlenW(mimetypeW) + 1, "GetMimeType returned wrong len %i\n", len); }

1 0

Hans Leidekker : winhttp: Implement WinHttpWebSocketCompleteUpgrade.
by Alexandre Julliard June 17, 2020

June 17, 2020

Module: wine Branch: master Commit: 0b48050da58be2ee72bcc5c4848822d6853d857c URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b48050da58be2ee72bcc5c4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 17 11:53:41 2020 +0200 winhttp: Implement WinHttpWebSocketCompleteUpgrade. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 101 +++++++++++++++++++++++++++++++++++++++-- dlls/winhttp/session.c | 13 ++---- dlls/winhttp/tests/winhttp.c | 34 +++++++------- dlls/winhttp/winhttp_private.h | 14 ++++++ 4 files changed, 133 insertions(+), 29 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0b48050da58be2ee72bc…

1 0