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

Zebediah Figura : d3dcompiler/tests: Add a simple test for global variable initializers.
by Alexandre Julliard 17 Jun '20

17 Jun '20

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

Nikolay Sivov : dwrite: Simplify ligature substitution handler.
by Alexandre Julliard 17 Jun '20

17 Jun '20

Module: wine Branch: master Commit: f5e342b2a6b99f76ed6c9dc788fb5bf426a5355c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f5e342b2a6b99f76ed6c9dc7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 17 14:47:54 2020 +0300 dwrite: Simplify ligature substitution handler. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 39 +++++++++++++++------------------------ 1 file changed, 15 insertions(+), 24 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index e8d2068397..53925465a1 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -5119,46 +5119,37 @@ static BOOL opentype_layout_apply_ligature(struct scriptshaping_context *context static BOOL opentype_layout_apply_gsub_lig_substitution(struct scriptshaping_context *context, const struct lookup *lookup, unsigned int subtable_offset) { - const struct dwrite_fonttable *gsub = &context->table->table; - unsigned int coverage_index, offset, lig_set_offset, lig_set_count; - UINT16 format, coverage, glyph; + const struct dwrite_fonttable *table = &context->table->table; + UINT16 format, coverage, glyph, lig_set_offset; + unsigned int coverage_index; glyph = context->u.subst.glyphs[context->cur]; - format = table_read_be_word(gsub, subtable_offset); + format = table_read_be_word(table, subtable_offset); if (format == 1) { - const struct ot_gsub_ligsubst_format1 *format1 = table_read_ensure(gsub, subtable_offset, sizeof(*format1)); - const struct ot_gsub_ligset *lig_set; - unsigned int i, lig_count; + const struct ot_gsub_ligsubst_format1 *format1 = table_read_ensure(table, subtable_offset, sizeof(*format1)); + unsigned int i; + const UINT16 *offsets; + UINT16 lig_count; - coverage = table_read_be_word(gsub, subtable_offset + FIELD_OFFSET(struct ot_gsub_ligsubst_format1, coverage)); + coverage = table_read_be_word(table, subtable_offset + FIELD_OFFSET(struct ot_gsub_ligsubst_format1, coverage)); - coverage_index = opentype_layout_is_glyph_covered(gsub, subtable_offset + coverage, glyph); - if (coverage_index == GLYPH_NOT_COVERED) - return FALSE; + coverage_index = opentype_layout_is_glyph_covered(table, subtable_offset + coverage, glyph); + if (coverage_index == GLYPH_NOT_COVERED) return FALSE; - lig_set_count = table_read_be_word(gsub, subtable_offset + FIELD_OFFSET(struct ot_gsub_ligsubst_format1, lig_set_count)); - if (coverage_index >= lig_set_count || !table_read_ensure(gsub, subtable_offset, - FIELD_OFFSET(struct ot_gsub_ligsubst_format1, lig_sets[lig_set_count]))) - { + if (!table_read_array_be_word(table, subtable_offset + FIELD_OFFSET(struct ot_gsub_ligsubst_format1, lig_set_count), + coverage_index, &lig_set_offset)) return FALSE; - } - - lig_set_offset = table_read_be_word(gsub, subtable_offset + - FIELD_OFFSET(struct ot_gsub_ligsubst_format1, lig_sets[coverage_index])); - offset = subtable_offset + lig_set_offset; - lig_count = table_read_be_word(gsub, offset); - lig_set = table_read_ensure(gsub, offset, FIELD_OFFSET(struct ot_gsub_ligset, offsets[lig_count])); - if (!lig_count || !lig_set) + if (!(offsets = table_read_array_be_word(table, subtable_offset + lig_set_offset, ~0u, &lig_count))) return FALSE; /* First applicable ligature is used. */ for (i = 0; i < lig_count; ++i) { - if (opentype_layout_apply_ligature(context, offset + GET_BE_WORD(lig_set->offsets[i]), lookup)) + if (opentype_layout_apply_ligature(context, subtable_offset + lig_set_offset + GET_BE_WORD(offsets[i]), lookup)) return TRUE; } }

1 0

Nikolay Sivov : evr/tests: Add basic creation test for default mixer object.
by Alexandre Julliard 17 Jun '20

17 Jun '20

Module: wine Branch: master Commit: d492f7bbf818ba35a0bb8a7be2d814c0ba8acc5a URL: https://source.winehq.org/git/wine.git/?a=commit;h=d492f7bbf818ba35a0bb8a7b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 17 14:59:32 2020 +0300 evr/tests: Add basic creation test for default mixer object. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/Makefile.in | 4 +++- dlls/evr/evr.spec | 2 +- dlls/evr/mixer.c | 28 ++++++++++++++++++++++++ dlls/evr/tests/Makefile.in | 2 +- dlls/evr/tests/evr.c | 32 +++++++++++++++++++++++++++ include/evr.idl | 54 ++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 119 insertions(+), 3 deletions(-) diff --git a/dlls/evr/Makefile.in b/dlls/evr/Makefile.in index 053d80e61d..8f971dca06 100644 --- a/dlls/evr/Makefile.in +++ b/dlls/evr/Makefile.in @@ -1,10 +1,12 @@ MODULE = evr.dll +IMPORTLIB = evr IMPORTS = mfuuid strmiids strmbase uuid ole32 oleaut32 EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ evr.c \ - main.c + main.c \ + mixer.c IDL_SRCS = evr_classes.idl diff --git a/dlls/evr/evr.spec b/dlls/evr/evr.spec index c78900c576..ea87f16da1 100644 --- a/dlls/evr/evr.spec +++ b/dlls/evr/evr.spec @@ -13,7 +13,7 @@ @ stub MFCreateVideoMediaTypeFromSubtype @ stub MFCreateVideoMediaTypeFromVideoInfoHeader2 @ stub MFCreateVideoMediaTypeFromVideoInfoHeader -@ stub MFCreateVideoMixer +@ stdcall MFCreateVideoMixer(ptr ptr ptr ptr) @ stub MFCreateVideoMixerAndPresenter @ stub MFCreateVideoOTA @ stub MFCreateVideoPresenter2 diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c new file mode 100644 index 0000000000..fe2f4bab1d --- /dev/null +++ b/dlls/evr/mixer.c @@ -0,0 +1,28 @@ +/* + * Copyright 2020 Nikolay Sivov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/debug.h" +#include "evr.h" + +WINE_DEFAULT_DEBUG_CHANNEL(evr); + +HRESULT WINAPI MFCreateVideoMixer(IUnknown *owner, REFIID riid_device, REFIID riid, void **obj) +{ + FIXME("%p, %s, %s, %p.\n", owner, debugstr_guid(riid_device), debugstr_guid(riid), obj); + return E_NOTIMPL; +} diff --git a/dlls/evr/tests/Makefile.in b/dlls/evr/tests/Makefile.in index 8dc11e5e55..529c535450 100644 --- a/dlls/evr/tests/Makefile.in +++ b/dlls/evr/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = evr.dll -IMPORTS = mfuuid strmiids uuid ole32 oleaut32 +IMPORTS = mfuuid strmiids uuid dxguid ole32 oleaut32 evr C_SRCS = \ evr.c diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 489b7b949d..adb2b777a2 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -22,6 +22,7 @@ #include "dshow.h" #include "wine/test.h" #include "d3d9.h" +#include "evr.h" #include "initguid.h" #include "dxva2api.h" @@ -337,6 +338,36 @@ static void test_pin_info(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_default_mixer(void) +{ + IMFTransform *transform; + IUnknown *unk; + HRESULT hr; + + hr = MFCreateVideoMixer(NULL, &IID_IDirect3DDevice9, &IID_IMFTransform, (void **)&transform); +todo_wine + ok(hr == S_OK, "Failed to create default mixer, hr %#x.\n", hr); + if (FAILED(hr)) + return; + + hr = IMFTransform_QueryInterface(transform, &IID_IMFTopologyServiceLookupClient, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IUnknown_Release(unk); + + hr = IMFTransform_QueryInterface(transform, &IID_IMFVideoDeviceID, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IUnknown_Release(unk); + + IMFTransform_Release(transform); + + hr = MFCreateVideoMixer(NULL, &IID_IMFTransform, &IID_IMFTransform, (void **)&transform); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = CoCreateInstance(&CLSID_MFVideoMixer9, NULL, CLSCTX_INPROC_SERVER, &IID_IMFTransform, (void **)&transform); + ok(hr == S_OK, "Failed to create default mixer, hr %#x.\n", hr); + IMFTransform_Release(transform); +} + START_TEST(evr) { CoInitialize(NULL); @@ -346,6 +377,7 @@ START_TEST(evr) test_enum_pins(); test_find_pin(); test_pin_info(); + test_default_mixer(); CoUninitialize(); } diff --git a/include/evr.idl b/include/evr.idl index 3768b41b16..39b4853b2e 100644 --- a/include/evr.idl +++ b/include/evr.idl @@ -107,3 +107,57 @@ interface IMFVideoRenderer : IUnknown [in] IMFVideoPresenter *pVideoPresenter ); } + +typedef enum _MF_SERVICE_LOOKUP_TYPE +{ + MF_SERVICE_LOOKUP_UPSTREAM, + MF_SERVICE_LOOKUP_UPSTREAM_DIRECT, + MF_SERVICE_LOOKUP_DOWNSTREAM, + MF_SERVICE_LOOKUP_DOWNSTREAM_DIRECT, + MF_SERVICE_LOOKUP_ALL, + MF_SERVICE_LOOKUP_GLOBAL, +} MF_SERVICE_LOOKUP_TYPE; + +[ + object, + uuid(fa993889-4383-415a-a930-dd472a8cf6f7), + local +] +interface IMFTopologyServiceLookup : IUnknown +{ + HRESULT LookupService( + [in] MF_SERVICE_LOOKUP_TYPE lookup_type, + [in] DWORD index, + [in] REFGUID service, + [in] REFIID riid, + [out, iid_is(riid)] void **objects, + [in, out] DWORD *num_objects + ); +} + +[ + object, + uuid(fa99388a-4383-415a-a930-dd472a8cf6f7), + local +] +interface IMFTopologyServiceLookupClient : IUnknown +{ + HRESULT InitServicePointers( + [in] IMFTopologyServiceLookup *service_lookup + ); + HRESULT ReleaseServicePointers(); +} + +[ + object, + uuid(a38d9567-5a9c-4f3c-b293-8eb415b279ba), + local +] +interface IMFVideoDeviceID : IUnknown +{ + HRESULT GetDeviceID( + [out] IID *device_id + ); +} + +cpp_quote("HRESULT WINAPI MFCreateVideoMixer(IUnknown *owner, REFIID riid_device, REFIID riid, void **obj);")

1 0

Nikolay Sivov : evr: Add IMFTransform stub for default video mixer.
by Alexandre Julliard 17 Jun '20

17 Jun '20

Module: wine Branch: master Commit: c09be94f63282f169cae6db8339514e076d323ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=c09be94f63282f169cae6db8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 17 14:59:33 2020 +0300 evr: Add IMFTransform stub for default video mixer. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/Makefile.in | 2 +- dlls/evr/evr_classes.idl | 9 +- dlls/evr/evr_private.h | 2 +- dlls/evr/main.c | 1 + dlls/evr/mixer.c | 280 ++++++++++++++++++++++++++++++++++++++++++++++- dlls/evr/tests/evr.c | 11 +- 6 files changed, 294 insertions(+), 11 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c09be94f63282f169cae…

1 0

Zebediah Figura : d3dcompiler: Factor out hlsl_ir_var allocation.
by Alexandre Julliard 17 Jun '20

17 Jun '20

Module: wine Branch: master Commit: a9e720e54fe555e0463a6aabfac15ea10d342cb5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9e720e54fe555e0463a6aab… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 11 16:44:20 2020 -0500 d3dcompiler: Factor out hlsl_ir_var allocation. 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/hlsl.y | 58 +++++++++++++++++++++------------------------- 1 file changed, 27 insertions(+), 31 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 28d4dd7f2c..393f8d52fb 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -508,8 +508,8 @@ static struct hlsl_ir_swizzle *get_swizzle(struct hlsl_ir_node *value, const cha return NULL; } -static struct hlsl_ir_var *new_synthetic_var(const char *name, struct hlsl_type *type, - const struct source_location loc) +static struct hlsl_ir_var *new_var(const char *name, struct hlsl_type *type, const struct source_location loc, + const char *semantic, unsigned int modifiers, const struct reg_reservation *reg_reservation) { struct hlsl_ir_var *var; @@ -519,10 +519,22 @@ static struct hlsl_ir_var *new_synthetic_var(const char *name, struct hlsl_type return NULL; } - var->name = strdup(name); + var->name = name; var->data_type = type; var->loc = loc; - list_add_tail(&hlsl_ctx.globals->vars, &var->scope_entry); + var->semantic = semantic; + var->modifiers = modifiers; + var->reg_reservation = reg_reservation; + return var; +} + +static struct hlsl_ir_var *new_synthetic_var(const char *name, struct hlsl_type *type, + const struct source_location loc) +{ + struct hlsl_ir_var *var = new_var(strdup(name), type, loc, NULL, 0, NULL); + + if (var) + list_add_tail(&hlsl_ctx.globals->vars, &var->scope_entry); return var; } @@ -785,23 +797,16 @@ static struct list *declare_vars(struct hlsl_type *basic_type, DWORD modifiers, LIST_FOR_EACH_ENTRY_SAFE(v, v_next, var_list, struct parse_variable_def, entry) { - var = d3dcompiler_alloc(sizeof(*var)); - if (!var) - { - ERR("Out of memory.\n"); - free_parse_variable_def(v); - continue; - } if (v->array_size) type = new_array_type(basic_type, v->array_size); else type = basic_type; - var->data_type = type; - var->loc = v->loc; - var->name = v->name; - var->modifiers = modifiers; - var->semantic = v->semantic; - var->reg_reservation = v->reg_reservation; + + if (!(var = new_var(v->name, type, v->loc, v->semantic, modifiers, v->reg_reservation))) + { + free_parse_variable_def(v); + continue; + } debug_dump_decl(type, modifiers, v->name, v->loc.line); if (hlsl_ctx.cur_scope == hlsl_ctx.globals) @@ -1081,29 +1086,20 @@ static BOOL add_typedef(DWORD modifiers, struct hlsl_type *orig_type, struct lis static BOOL add_func_parameter(struct list *list, struct parse_parameter *param, const struct source_location loc) { - struct hlsl_ir_var *decl = d3dcompiler_alloc(sizeof(*decl)); + struct hlsl_ir_var *var; if (param->type->type == HLSL_CLASS_MATRIX) assert(param->type->modifiers & HLSL_MODIFIERS_MAJORITY_MASK); - if (!decl) - { - ERR("Out of memory.\n"); + if (!(var = new_var(param->name, param->type, loc, param->semantic, param->modifiers, param->reg_reservation))) return FALSE; - } - decl->data_type = param->type; - decl->loc = loc; - decl->name = param->name; - decl->semantic = param->semantic; - decl->reg_reservation = param->reg_reservation; - decl->modifiers = param->modifiers; - if (!add_declaration(hlsl_ctx.cur_scope, decl, FALSE)) + if (!add_declaration(hlsl_ctx.cur_scope, var, FALSE)) { - free_declaration(decl); + free_declaration(var); return FALSE; } - list_add_tail(list, &decl->param_entry); + list_add_tail(list, &var->param_entry); return TRUE; }

1 0

Ziqing Hui : windowscodecs: Fix MIME types of DDS decoder.
by Alexandre Julliard 17 Jun '20

17 Jun '20

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

Zhiyi Zhang : winemac.drv: Use helpers to get and release display device init mutex.
by Alexandre Julliard 17 Jun '20

17 Jun '20

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

Zhiyi Zhang : winemac.drv: Support multiple adapter display settings in registry.
by Alexandre Julliard 17 Jun '20

17 Jun '20

Module: wine Branch: master Commit: 6b6a7124a67c6eadbe4408163f93dbf0379b6565 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b6a7124a67c6eadbe440816… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Jun 11 17:22:48 2020 +0800 winemac.drv: Support multiple adapter display settings in registry. 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 | 82 ++++++++++++++++++++++++++++++---------------- 1 file changed, 53 insertions(+), 29 deletions(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index c024885e2d..522ff57d7a 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -71,6 +71,7 @@ static const WCHAR video_idW[] = {'V','i','d','e','o','I','D',0}; static const WCHAR symbolic_link_valueW[]= {'S','y','m','b','o','l','i','c','L','i','n','k','V','a','l','u','e',0}; static const WCHAR gpu_idW[] = {'G','P','U','I','D',0}; static const WCHAR mointor_id_fmtW[] = {'M','o','n','i','t','o','r','I','D','%','d',0}; +static const WCHAR adapter_prefixW[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y'}; static const WCHAR adapter_name_fmtW[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','%','d',0}; static const WCHAR state_flagsW[] = {'S','t','a','t','e','F','l','a','g','s',0}; static const WCHAR guid_fmtW[] = { @@ -151,44 +152,58 @@ static void release_display_device_init_mutex(HANDLE mutex) CloseHandle(mutex); } -static BOOL get_display_device_reg_key(char *key, unsigned len) +static BOOL get_display_device_reg_key(const WCHAR *device_name, WCHAR *key, unsigned len) { - static const char display_device_guid_prop[] = "__wine_display_device_guid"; - static const char video_path[] = "System\\CurrentControlSet\\Control\\Video\\{"; - static const char display0[] = "}\\0000"; - ATOM guid_atom; + WCHAR value_name[MAX_PATH], buffer[MAX_PATH], *end_ptr; + DWORD adapter_index, size; - assert(len >= sizeof(video_path) + sizeof(display0) + 40); - - guid_atom = HandleToULong(GetPropA(GetDesktopWindow(), display_device_guid_prop)); - if (!guid_atom) return FALSE; + /* Device name has to be \\.\DISPLAY%d */ + if (strncmpiW(device_name, adapter_prefixW, ARRAY_SIZE(adapter_prefixW))) + return FALSE; - memcpy(key, video_path, sizeof(video_path)); + /* Parse \\.\DISPLAY* */ + adapter_index = strtolW(device_name + ARRAY_SIZE(adapter_prefixW), &end_ptr, 10) - 1; + if (*end_ptr) + return FALSE; - if (!GlobalGetAtomNameA(guid_atom, key + strlen(key), 40)) + /* Open \Device\Video* in HKLM\HARDWARE\DEVICEMAP\VIDEO\ */ + sprintfW(value_name, device_video_fmtW, adapter_index); + size = sizeof(buffer); + if (RegGetValueW(HKEY_LOCAL_MACHINE, video_keyW, value_name, RRF_RT_REG_SZ, NULL, buffer, &size)) return FALSE; - strcat(key, display0); + if (len < lstrlenW(buffer + 18) + 1) + return FALSE; - TRACE("display device key %s\n", wine_dbgstr_a(key)); + /* Skip \Registry\Machine\ prefix */ + lstrcpyW(key, buffer + 18); + TRACE("display device %s registry settings key %s.\n", wine_dbgstr_w(device_name), wine_dbgstr_w(key)); return TRUE; } -static BOOL read_registry_settings(DEVMODEW *dm) +static BOOL read_registry_settings(const WCHAR *device_name, DEVMODEW *dm) { - char wine_mac_reg_key[128]; + WCHAR wine_mac_reg_key[MAX_PATH]; + HANDLE mutex; HKEY hkey; DWORD type, size; BOOL ret = TRUE; dm->dmFields = 0; - if (!get_display_device_reg_key(wine_mac_reg_key, sizeof(wine_mac_reg_key))) + mutex = get_display_device_init_mutex(); + if (!get_display_device_reg_key(device_name, wine_mac_reg_key, ARRAY_SIZE(wine_mac_reg_key))) + { + release_display_device_init_mutex(mutex); return FALSE; + } - if (RegOpenKeyExA(HKEY_CURRENT_CONFIG, wine_mac_reg_key, 0, KEY_READ, &hkey)) + if (RegOpenKeyExW(HKEY_CURRENT_CONFIG, wine_mac_reg_key, 0, KEY_READ, &hkey)) + { + release_display_device_init_mutex(mutex); return FALSE; + } #define query_value(name, data) \ size = sizeof(DWORD); \ @@ -216,22 +231,31 @@ static BOOL read_registry_settings(DEVMODEW *dm) #undef query_value RegCloseKey(hkey); + release_display_device_init_mutex(mutex); return ret; } -static BOOL write_registry_settings(const DEVMODEW *dm) +static BOOL write_registry_settings(const WCHAR *device_name, const DEVMODEW *dm) { - char wine_mac_reg_key[128]; + WCHAR wine_mac_reg_key[MAX_PATH]; + HANDLE mutex; HKEY hkey; BOOL ret = TRUE; - if (!get_display_device_reg_key(wine_mac_reg_key, sizeof(wine_mac_reg_key))) + mutex = get_display_device_init_mutex(); + if (!get_display_device_reg_key(device_name, wine_mac_reg_key, ARRAY_SIZE(wine_mac_reg_key))) + { + release_display_device_init_mutex(mutex); return FALSE; + } - if (RegCreateKeyExA(HKEY_CURRENT_CONFIG, wine_mac_reg_key, 0, NULL, + if (RegCreateKeyExW(HKEY_CURRENT_CONFIG, wine_mac_reg_key, 0, NULL, REG_OPTION_VOLATILE, KEY_WRITE, NULL, &hkey, NULL)) + { + release_display_device_init_mutex(mutex); return FALSE; + } #define set_value(name, data) \ if (RegSetValueExA(hkey, name, 0, REG_DWORD, (const BYTE*)(data), sizeof(DWORD))) \ @@ -250,6 +274,7 @@ static BOOL write_registry_settings(const DEVMODEW *dm) #undef set_value RegCloseKey(hkey); + release_display_device_init_mutex(mutex); return ret; } @@ -833,12 +858,6 @@ LONG CDECL macdrv_ChangeDisplaySettingsEx(LPCWSTR devname, LPDEVMODEW devmode, devmode = &default_mode; } - if (lstrcmpiW(primary_adapter, devname)) - { - FIXME("Changing non-primary adapter settings is currently unsupported.\n"); - return DISP_CHANGE_SUCCESSFUL; - } - if (is_detached_mode(devmode)) { FIXME("Detaching adapters is currently unsupported.\n"); @@ -958,13 +977,18 @@ better: /* we have a valid mode */ TRACE("Requested display settings match mode %ld\n", best); - if ((flags & CDS_UPDATEREGISTRY) && !write_registry_settings(devmode)) + if ((flags & CDS_UPDATEREGISTRY) && !write_registry_settings(devname, devmode)) { WARN("Failed to update registry\n"); ret = DISP_CHANGE_NOTUPDATED; } else if (flags & (CDS_TEST | CDS_NORESET)) ret = DISP_CHANGE_SUCCESSFUL; + else if (lstrcmpiW(primary_adapter, devname)) + { + FIXME("Changing non-primary adapter settings is currently unsupported.\n"); + ret = DISP_CHANGE_SUCCESSFUL; + } else if (macdrv_set_display_mode(&displays[0], best_display_mode)) { int mode_bpp = display_mode_bits_per_pixel(best_display_mode); @@ -1034,7 +1058,7 @@ BOOL CDECL macdrv_EnumDisplaySettingsEx(LPCWSTR devname, DWORD mode, if (mode == ENUM_REGISTRY_SETTINGS) { TRACE("mode %d (registry) -- getting default mode\n", mode); - return read_registry_settings(devmode); + return read_registry_settings(devname, devmode); } if (macdrv_get_displays(&displays, &num_displays))

1 0

Alistair Leslie-Hughes : winhttp: Status HTTP_STATUS_SWITCH_PROTOCOLS doesn't have any content.
by Alexandre Julliard 17 Jun '20

17 Jun '20

Module: wine Branch: master Commit: a6de059eef5e0aa4aa688885c1d91497c588576f URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6de059eef5e0aa4aa688885… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jun 17 11:53:40 2020 +0200 winhttp: Status HTTP_STATUS_SWITCH_PROTOCOLS doesn't have any content. 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/winhttp/request.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 79d66fd5e8..9173bdb56d 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2353,8 +2353,11 @@ static void set_content_length( struct request *request, DWORD status ) WCHAR encoding[20]; DWORD buflen = sizeof(request->content_length); - if (status == HTTP_STATUS_NO_CONTENT || status == HTTP_STATUS_NOT_MODIFIED || !wcscmp( request->verb, L"HEAD" )) + if (status == HTTP_STATUS_NO_CONTENT || status == HTTP_STATUS_NOT_MODIFIED || + status == HTTP_STATUS_SWITCH_PROTOCOLS || !wcscmp( request->verb, L"HEAD" )) + { request->content_length = 0; + } else { if (query_headers( request, WINHTTP_QUERY_CONTENT_LENGTH|WINHTTP_QUERY_FLAG_NUMBER,

1 0

Hans Leidekker : winhttp: Implement WinHttpWebSocketCompleteUpgrade.
by Alexandre Julliard 17 Jun '20

17 Jun '20

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