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

Henri Verbeet : wined3d: Map Vulkan adapter bo's persistently on 64-bit architectures.
by Alexandre Julliard May 29, 2020

May 29, 2020

Module: wine Branch: master Commit: 859514a684a1ae3bef57d4adc913d49d7a4b438b URL: https://source.winehq.org/git/wine.git/?a=commit;h=859514a684a1ae3bef57d4ad… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 29 20:51:33 2020 +0430 wined3d: Map Vulkan adapter bo's persistently on 64-bit architectures. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 9 +++++++++ dlls/wined3d/context_vk.c | 5 +++++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 15 insertions(+) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 0cd77c4e6b..cbde5d3683 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -844,6 +844,9 @@ static void *wined3d_bo_vk_map(struct wined3d_bo_vk *bo, struct wined3d_context_ void *map_ptr; VkResult vr; + if (bo->map_ptr) + return bo->map_ptr; + vk_info = context_vk->vk_info; device_vk = wined3d_device_vk(context_vk->c.device); @@ -872,6 +875,9 @@ static void *wined3d_bo_vk_map(struct wined3d_bo_vk *bo, struct wined3d_context_ return NULL; } + if (sizeof(map_ptr) >= sizeof(uint64_t)) + bo->map_ptr = map_ptr; + return map_ptr; } @@ -881,6 +887,9 @@ static void wined3d_bo_vk_unmap(struct wined3d_bo_vk *bo, struct wined3d_context struct wined3d_device_vk *device_vk; struct wined3d_bo_slab_vk *slab; + if (bo->map_ptr) + return; + if ((slab = bo->slab)) { if (--slab->map_count) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 45924eb16b..a7c77dd5a6 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -483,6 +483,7 @@ BOOL wined3d_context_vk_create_bo(struct wined3d_context_vk *context_vk, VkDevic return FALSE; } + bo->map_ptr = NULL; bo->buffer_offset = 0; bo->size = size; bo->usage = usage; @@ -791,6 +792,8 @@ void wined3d_context_vk_destroy_sampler(struct wined3d_context_vk *context_vk, void wined3d_context_vk_destroy_bo(struct wined3d_context_vk *context_vk, const struct wined3d_bo_vk *bo) { + struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); + const struct wined3d_vk_info *vk_info = context_vk->vk_info; size_t object_size, idx; TRACE("context_vk %p, bo %p.\n", context_vk, bo); @@ -810,6 +813,8 @@ void wined3d_context_vk_destroy_bo(struct wined3d_context_vk *context_vk, const return; } + if (bo->map_ptr) + VK_CALL(vkUnmapMemory(device_vk->vk_device, bo->vk_memory)); wined3d_context_vk_destroy_memory(context_vk, bo->vk_memory, bo->command_buffer_id); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 49379b3ca5..8eee18ad17 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1554,6 +1554,7 @@ struct wined3d_bo_vk struct wined3d_bo_slab_vk *slab; VkDeviceMemory vk_memory; + void *map_ptr; VkDeviceSize buffer_offset; VkDeviceSize memory_offset;

1 0

Henri Verbeet : wined3d: Initialise more caps and limits in wined3d_adapter_vk_init_d3d_info().
by Alexandre Julliard May 29, 2020

May 29, 2020

Module: wine Branch: master Commit: d777b9492ddd9c26c9e6ee9504c9065654d49c14 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d777b9492ddd9c26c9e6ee95… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 29 20:51:32 2020 +0430 wined3d: Initialise more caps and limits in wined3d_adapter_vk_init_d3d_info(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 71 ++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 67 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index f8929ddf1f..0cd77c4e6b 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -2068,13 +2068,76 @@ static void adapter_vk_init_driver_info(struct wined3d_adapter_vk *adapter_vk, wined3d_driver_info_init(&adapter_vk->a.driver_info, gpu_description, vram_bytes, sysmem_bytes); } -static void wined3d_adapter_vk_init_d3d_info(struct wined3d_adapter *adapter, uint32_t wined3d_creation_flags) +static enum wined3d_feature_level feature_level_from_caps(const struct shader_caps *shader_caps) { - struct wined3d_d3d_info *d3d_info = &adapter->d3d_info; + unsigned int shader_model; + + shader_model = min(shader_caps->vs_version, shader_caps->ps_version); + shader_model = min(shader_model, max(shader_caps->gs_version, 3)); + shader_model = min(shader_model, max(shader_caps->hs_version, 4)); + shader_model = min(shader_model, max(shader_caps->ds_version, 4)); + + if (shader_model >= 5) + return WINED3D_FEATURE_LEVEL_11_1; + + if (shader_model >= 4) + return WINED3D_FEATURE_LEVEL_10_1; + + return WINED3D_FEATURE_LEVEL_NONE; +} + +static void wined3d_adapter_vk_init_d3d_info(struct wined3d_adapter_vk *adapter_vk, uint32_t wined3d_creation_flags) +{ + struct wined3d_d3d_info *d3d_info = &adapter_vk->a.d3d_info; + struct wined3d_vertex_caps vertex_caps; + struct fragment_caps fragment_caps; + struct shader_caps shader_caps; + + adapter_vk->a.shader_backend->shader_get_caps(&adapter_vk->a, &shader_caps); + adapter_vk->a.vertex_pipe->vp_get_caps(&adapter_vk->a, &vertex_caps); + adapter_vk->a.fragment_pipe->get_caps(&adapter_vk->a, &fragment_caps); + + d3d_info->limits.vs_version = shader_caps.vs_version; + d3d_info->limits.hs_version = shader_caps.hs_version; + d3d_info->limits.ds_version = shader_caps.ds_version; + d3d_info->limits.gs_version = shader_caps.gs_version; + d3d_info->limits.ps_version = shader_caps.ps_version; + d3d_info->limits.cs_version = shader_caps.cs_version; + d3d_info->limits.vs_uniform_count = shader_caps.vs_uniform_count; + d3d_info->limits.ps_uniform_count = shader_caps.ps_uniform_count; + d3d_info->limits.varying_count = shader_caps.varying_count; + d3d_info->limits.ffp_textures = fragment_caps.MaxSimultaneousTextures; + d3d_info->limits.ffp_blend_stages = fragment_caps.MaxTextureBlendStages; + d3d_info->limits.ffp_vertex_blend_matrices = vertex_caps.max_vertex_blend_matrices; + d3d_info->limits.active_light_count = vertex_caps.max_active_lights; + + d3d_info->limits.max_rt_count = WINED3D_MAX_RENDER_TARGETS; + d3d_info->limits.max_clip_distances = WINED3D_MAX_CLIP_DISTANCES; + d3d_info->limits.texture_size = adapter_vk->device_limits.maxImageDimension2D; + d3d_info->limits.pointsize_max = adapter_vk->device_limits.pointSizeRange[1]; d3d_info->wined3d_creation_flags = wined3d_creation_flags; - d3d_info->texture_swizzle = TRUE; + d3d_info->xyzrhw = vertex_caps.xyzrhw; + d3d_info->emulated_flatshading = vertex_caps.emulated_flatshading; + d3d_info->ffp_generic_attributes = vertex_caps.ffp_generic_attributes; + d3d_info->ffp_alpha_test = false; + d3d_info->vs_clipping = !!(shader_caps.wined3d_caps & WINED3D_SHADER_CAP_VS_CLIPPING); + d3d_info->shader_color_key = !!(fragment_caps.wined3d_caps & WINED3D_FRAGMENT_CAP_COLOR_KEY); + d3d_info->shader_double_precision = !!(shader_caps.wined3d_caps & WINED3D_SHADER_CAP_DOUBLE_PRECISION); + d3d_info->shader_output_interpolation = !!(shader_caps.wined3d_caps & WINED3D_SHADER_CAP_OUTPUT_INTERPOLATION); + d3d_info->viewport_array_index_any_shader = false; /* VK_EXT_shader_viewport_index_layer */ + d3d_info->texture_npot = true; + d3d_info->texture_npot_conditional = true; + d3d_info->draw_base_vertex_offset = true; + d3d_info->vertex_bgra = true; + d3d_info->texture_swizzle = true; + d3d_info->srgb_read_control = false; + d3d_info->srgb_write_control = false; + d3d_info->clip_control = true; + d3d_info->full_ffp_varyings = !!(shader_caps.wined3d_caps & WINED3D_SHADER_CAP_FULL_FFP_VARYINGS); + d3d_info->scaled_resolve = false; + d3d_info->feature_level = feature_level_from_caps(&shader_caps); d3d_info->multisample_draw_location = WINED3D_LOCATION_TEXTURE_RGB; } @@ -2130,7 +2193,7 @@ static BOOL wined3d_adapter_vk_init(struct wined3d_adapter_vk *adapter_vk, adapter->misc_state_template = misc_state_template_vk; adapter->shader_backend = wined3d_spirv_shader_backend_init_vk(); - wined3d_adapter_vk_init_d3d_info(adapter, wined3d_creation_flags); + wined3d_adapter_vk_init_d3d_info(adapter_vk, wined3d_creation_flags); return TRUE;

1 0

Hans Leidekker : bcrypt: Add support for BCRYPT_DSA_ALGORITHM.
by Alexandre Julliard May 29, 2020

May 29, 2020

Module: wine Branch: master Commit: c2a4a4ec3c1f6723a07eb9e8e49e0bf78a6f4cac URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2a4a4ec3c1f6723a07eb9e8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri May 29 11:29:06 2020 +0200 bcrypt: Add support for BCRYPT_DSA_ALGORITHM. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_internal.h | 1 + dlls/bcrypt/bcrypt_main.c | 46 ++++++++--- dlls/bcrypt/gnutls.c | 178 +++++++++++++++++++++++++++++++++++++++++- dlls/bcrypt/tests/bcrypt.c | 96 +++++++++++++++++++++++ include/bcrypt.h | 69 ++++++++++++++-- 5 files changed, 369 insertions(+), 21 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c2a4a4ec3c1f6723a07e…

1 0

Jacek Caban : ieframe: Return S_FALSE in IWebBrowser2::get_Document when returning NULL.
by Alexandre Julliard May 29, 2020

May 29, 2020

Module: wine Branch: master Commit: bf83d755d987fec552cd1dce30638c31c49ab760 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf83d755d987fec552cd1dce… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 29 20:37:03 2020 +0200 ieframe: Return S_FALSE in IWebBrowser2::get_Document when returning NULL. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/tests/webbrowser.c | 6 ++++++ dlls/ieframe/webbrowser.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 426fe18da0..898d0e6805 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -4056,6 +4056,7 @@ static void test_SetAdvise(void) IViewObject2 *view; IAdviseSink *sink; IOleObject *oleobj; + IDispatch *doc; DWORD aspects, flags; if (!(browser = create_webbrowser())) return; @@ -4115,6 +4116,11 @@ static void test_SetAdvise(void) hr = IViewObject2_SetAdvise(view, 0, 0, NULL); ok(hr == S_OK, "got %08x\n", hr); + doc = (void*)0xdeadbeef; + hr = IWebBrowser2_get_Document(browser, &doc); + ok(hr == S_FALSE, "get_Document failed: %08x\n", hr); + ok(!doc, "doc = %p\n", doc); + IOleObject_Release(oleobj); IViewObject2_Release(view); IWebBrowser2_Release(browser); diff --git a/dlls/ieframe/webbrowser.c b/dlls/ieframe/webbrowser.c index 1e50512e42..356b0a2833 100644 --- a/dlls/ieframe/webbrowser.c +++ b/dlls/ieframe/webbrowser.c @@ -404,7 +404,7 @@ static HRESULT WINAPI WebBrowser_get_Document(IWebBrowser2 *iface, IDispatch **p } *ppDisp = disp; - return S_OK; + return disp ? S_OK : S_FALSE; } static HRESULT WINAPI WebBrowser_get_TopLevelContainer(IWebBrowser2 *iface, VARIANT_BOOL *pBool)

1 0

Alexandre Julliard : ntdll: Create user shared data section in the server, and initialize it in wineboot.
by Alexandre Julliard May 29, 2020

May 29, 2020

Module: wine Branch: master Commit: e854ea34cc481658ec61f4603d0438e075608c98 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e854ea34cc481658ec61f460… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 29 12:26:57 2020 +0200 ntdll: Create user shared data section in the server, and initialize it in wineboot. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 1 + dlls/ntdll/ntdll_misc.h | 2 +- dlls/ntdll/server.c | 3 -- dlls/ntdll/thread.c | 92 ++---------------------------------------- include/wine/server_protocol.h | 4 +- programs/wineboot/wineboot.c | 88 ++++++++++++++++++++++++++++++++++++++++ server/directory.c | 10 ++++- server/file.h | 6 +-- server/mapping.c | 39 +++++++++--------- server/process.c | 8 ---- server/protocol.def | 1 - server/request.h | 3 +- server/trace.c | 1 - 13 files changed, 128 insertions(+), 130 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e854ea34cc481658ec61…

1 0

Alexandre Julliard : ntdll: Move server initialization functions to the Unix library.
by Alexandre Julliard May 29, 2020

May 29, 2020

Module: wine Branch: master Commit: 8a63b688ac49f19c259066fd100407edf3747f95 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a63b688ac49f19c259066fd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 29 14:17:55 2020 +0200 ntdll: Move server initialization functions to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/Makefile.in | 1 + dlls/ntdll/loader.c | 3 +- dlls/ntdll/ntdll_misc.h | 2 - dlls/ntdll/server.c | 578 +------------------------------ dlls/ntdll/thread.c | 4 +- dlls/ntdll/unix/loader.c | 16 +- dlls/ntdll/unix/server.c | 748 +++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/unix_private.h | 14 + dlls/ntdll/unixlib.h | 13 +- 9 files changed, 792 insertions(+), 587 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8a63b688ac49f19c2590…

1 0

Alexandre Julliard : ntdll: Move fd cache functions to the Unix library.
by Alexandre Julliard May 29, 2020

May 29, 2020

Module: wine Branch: master Commit: 1a743c9af39d0224b65ae504ae7e24d9fad56c2b URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a743c9af39d0224b65ae504… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 29 15:35:16 2020 +0200 ntdll: Move fd cache functions to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/cdrom.c | 2 +- dlls/ntdll/directory.c | 10 +- dlls/ntdll/file.c | 46 +++---- dlls/ntdll/loader.c | 2 +- dlls/ntdll/ntdll_misc.h | 3 - dlls/ntdll/om.c | 4 +- dlls/ntdll/serial.c | 4 +- dlls/ntdll/server.c | 226 +--------------------------------- dlls/ntdll/tape.c | 2 +- dlls/ntdll/thread.c | 2 +- dlls/ntdll/unix/loader.c | 6 +- dlls/ntdll/unix/server.c | 271 ++++++++++++++++++++++++++++++++++++++++- dlls/ntdll/unix/unix_private.h | 10 +- dlls/ntdll/unixlib.h | 11 +- dlls/ntdll/virtual.c | 6 +- 15 files changed, 335 insertions(+), 270 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1a743c9af39d0224b65a…

1 0

Alexandre Julliard : ntdll: Move server call functions to the Unix library.
by Alexandre Julliard May 29, 2020

May 29, 2020

Module: wine Branch: master Commit: 01150d7f8d27ad5efdb824da938c4a9fa562a036 URL: https://source.winehq.org/git/wine.git/?a=commit;h=01150d7f8d27ad5efdb824da… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 29 15:53:42 2020 +0200 ntdll: Move server call functions to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll_misc.h | 1 - dlls/ntdll/server.c | 102 +------------------------------------- dlls/ntdll/unix/loader.c | 2 + dlls/ntdll/unix/server.c | 109 +++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/unix_private.h | 1 + dlls/ntdll/unixlib.h | 4 +- dlls/ntdll/virtual.c | 2 +- 7 files changed, 118 insertions(+), 103 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=01150d7f8d27ad5efdb8…

1 0

Nikolay Sivov : dwrite: Simplify glyph properties helpers by using current glyph buffer.
by Alexandre Julliard May 29, 2020

May 29, 2020

Module: wine Branch: master Commit: 2e79405eec7f4e1a60e76e3ad49f401ae9e6e0a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e79405eec7f4e1a60e76e3a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 29 19:01:03 2020 +0300 dwrite: Simplify glyph properties helpers by using current glyph buffer. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index c6cfdb6133..8ed52d3be4 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -3167,14 +3167,15 @@ static unsigned int opentype_layout_get_glyph_class(const struct dwrite_fonttabl return glyph_class; } -static unsigned int opentype_set_glyph_props(struct scriptshaping_context *context, unsigned int g, UINT16 glyph) +static unsigned int opentype_set_glyph_props(struct scriptshaping_context *context, unsigned int idx) { struct scriptshaping_cache *cache = context->cache; unsigned int glyph_class = 0, props; if (cache->gdef.classdef) { - glyph_class = opentype_layout_get_glyph_class(&cache->gdef.table, cache->gdef.classdef, glyph); + glyph_class = opentype_layout_get_glyph_class(&cache->gdef.table, cache->gdef.classdef, + context->u.buffer.glyphs[idx]); } switch (glyph_class) @@ -3192,16 +3193,16 @@ static unsigned int opentype_set_glyph_props(struct scriptshaping_context *conte props = 0; } - context->glyph_infos[g].props = props; + context->glyph_infos[idx].props = props; return props; } -static void opentype_set_subst_glyph_props(struct scriptshaping_context *context, unsigned int g, UINT16 glyph) +static void opentype_set_subst_glyph_props(struct scriptshaping_context *context, unsigned int idx) { - unsigned int glyph_props = opentype_set_glyph_props(context, g, glyph); - context->u.subst.glyph_props[g].isDiacritic = !!(glyph_props == GLYPH_PROP_MARK); - context->u.subst.glyph_props[g].isZeroWidthSpace = !!(glyph_props == GLYPH_PROP_MARK); + unsigned int glyph_props = opentype_set_glyph_props(context, idx); + context->u.subst.glyph_props[idx].isDiacritic = !!(glyph_props == GLYPH_PROP_MARK); + context->u.subst.glyph_props[idx].isZeroWidthSpace = !!(glyph_props == GLYPH_PROP_MARK); } struct coverage_compare_format1_context @@ -4459,7 +4460,7 @@ void opentype_layout_apply_gpos_features(struct scriptshaping_context *context, opentype_layout_collect_lookups(context, script_index, language_index, features, &context->cache->gpos, &lookups); for (i = 0; i < context->glyph_count; ++i) - opentype_set_glyph_props(context, i, context->u.pos.glyphs[i]); + opentype_set_glyph_props(context, i); opentype_layout_set_glyph_masks(context, features); for (i = 0; i < lookups.count; ++i) @@ -4491,7 +4492,7 @@ static void opentype_layout_replace_glyph(struct scriptshaping_context *context, if (glyph != orig_glyph) { context->u.subst.glyphs[context->cur] = glyph; - opentype_set_subst_glyph_props(context, context->cur, glyph); + opentype_set_subst_glyph_props(context, context->cur); } context->cur++; } @@ -4673,7 +4674,7 @@ static BOOL opentype_layout_apply_gsub_mult_substitution(struct scriptshaping_co context->u.subst.glyph_props[idx + i].isClusterStart = 0; context->u.buffer.glyph_props[idx + i].components = 0; } - opentype_set_subst_glyph_props(context, idx + i, glyph); + opentype_set_subst_glyph_props(context, idx + i); /* Inherit feature mask from original matched glyph. */ context->glyph_infos[idx + i].mask = mask; } @@ -5181,10 +5182,10 @@ static void opentype_get_nominal_glyphs(struct scriptshaping_context *context, c if (*context->u.subst.digits && codepoint >= '0' && codepoint <= '9') codepoint = context->u.subst.digits[codepoint - '0']; - context->u.subst.glyphs[g] = font->get_glyph(context->cache->context, codepoint); + context->u.buffer.glyphs[g] = font->get_glyph(context->cache->context, codepoint); context->u.buffer.glyph_props[g].justification = SCRIPT_JUSTIFY_CHARACTER; context->u.buffer.glyph_props[g].isClusterStart = 1; - opentype_set_subst_glyph_props(context, g, context->u.subst.glyphs[g]); + opentype_set_subst_glyph_props(context, g); if (opentype_is_default_ignorable(codepoint)) context->u.buffer.glyph_props[g].isZeroWidthSpace = 1; context->u.buffer.glyph_props[g].components = 1;

1 0

Gijs Vermeulen : wtsapi32: Improve WTSQuerySessionInformationW stub.
by Alexandre Julliard May 29, 2020

May 29, 2020

Module: wine Branch: master Commit: 116890da122da856c49dc66643bda5cd8360339b URL: https://source.winehq.org/git/wine.git/?a=commit;h=116890da122da856c49dc666… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Thu May 28 15:59:27 2020 +0200 wtsapi32: Improve WTSQuerySessionInformationW stub. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wtsapi32/tests/wtsapi.c | 19 +++++++++++++++++++ dlls/wtsapi32/wtsapi32.c | 11 +++++++++++ 2 files changed, 30 insertions(+) diff --git a/dlls/wtsapi32/tests/wtsapi.c b/dlls/wtsapi32/tests/wtsapi.c index f45598f548..c9312cd97c 100644 --- a/dlls/wtsapi32/tests/wtsapi.c +++ b/dlls/wtsapi32/tests/wtsapi.c @@ -97,6 +97,25 @@ static void test_WTSQuerySessionInformation(void) char *buf2; DWORD count; + SetLastError(0xdeadbeef); + count = 0; + ret = WTSQuerySessionInformationW(WTS_CURRENT_SERVER_HANDLE, WTS_CURRENT_SESSION, WTSUserName, NULL, &count); + ok(!ret, "got %u\n", GetLastError()); + ok(count == 0, "got %u\n", count); + ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + count = 1; + ret = WTSQuerySessionInformationW(WTS_CURRENT_SERVER_HANDLE, WTS_CURRENT_SESSION, WTSUserName, NULL, &count); + ok(!ret, "got %u\n", GetLastError()); + ok(count == 1, "got %u\n", count); + ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = WTSQuerySessionInformationW(WTS_CURRENT_SERVER_HANDLE, WTS_CURRENT_SESSION, WTSUserName, &buf1, NULL); + ok(!ret, "got %u\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "got %u\n", GetLastError()); + count = 0; buf1 = NULL; ret = WTSQuerySessionInformationW(WTS_CURRENT_SERVER_HANDLE, WTS_CURRENT_SESSION, WTSUserName, &buf1, &count); diff --git a/dlls/wtsapi32/wtsapi32.c b/dlls/wtsapi32/wtsapi32.c index 0ba05abf2c..ef3e0d10a0 100644 --- a/dlls/wtsapi32/wtsapi32.c +++ b/dlls/wtsapi32/wtsapi32.c @@ -341,6 +341,12 @@ BOOL WINAPI WTSQuerySessionInformationW( FIXME("Stub %p 0x%08x %d %p %p\n", hServer, SessionId, WTSInfoClass, Buffer, BytesReturned); + if (!Buffer || !BytesReturned) + { + SetLastError(ERROR_INVALID_USER_BUFFER); + return FALSE; + } + if (WTSInfoClass == WTSUserName) { WCHAR *username; @@ -354,6 +360,11 @@ BOOL WINAPI WTSQuerySessionInformationW( *BytesReturned = count * sizeof(WCHAR); return TRUE; } + else + { + *Buffer = NULL; + *BytesReturned = 0; + } return FALSE; }

1 0