wine-devel October 2019

wine-devel@winehq.org

80 participants
669 discussions

[PATCH v3 1/2] wined3d: Issue texture barrier before using a texture attached to FBO.
by Paul Gofman 23 Oct '19

23 Oct '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45978 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- v2: - Check resource bind flags before searching for texture among render targets. v3: - Introduce a shared helper function instead of static which will be reused in the next patch. dlls/d3d9/tests/visual.c | 162 +++++++++++++++++++++++++++++++++ dlls/wined3d/adapter_gl.c | 7 ++ dlls/wined3d/context.c | 29 ++++++ dlls/wined3d/wined3d_gl.h | 2 + dlls/wined3d/wined3d_private.h | 23 ++++- 5 files changed, 222 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index e7076aeed6..f3ff26b773 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -26263,6 +26263,167 @@ static void test_draw_mapped_buffer(void) DestroyWindow(window); } +static void test_sample_attached_rendertarget(void) +{ + D3DADAPTER_IDENTIFIER9 identifier; + IDirect3DQuery9 *event_query; + IDirect3DTexture9 *texture; + IDirect3DVertexBuffer9 *vb; + IDirect3DPixelShader9 *ps; + IDirect3DDevice9 *device; + IDirect3DSurface9 *rt; + IDirect3D9 *d3d; + unsigned int i; + ULONG refcount; + D3DCOLOR color; + BOOL is_warp; + HWND window; + HRESULT hr; + void *data; + + static const struct + { + struct vec3 posistion; + struct vec2 texcoord; + } + quad[] = + { + {{-1.0f, -1.0f, 0.1f}, {0.0f, 0.0f}}, + {{-1.0f, 1.0f, 0.1f}, {0.0f, 1.0f}}, + {{ 1.0f, -1.0f, 0.0f}, {1.0f, 0.0f}}, + {{ 1.0f, 1.0f, 0.1f}, {1.0f, 1.0f}}, + }; + + static const DWORD pixel_shader_code[] = + { + 0xffff0200, /* ps_2_0 */ + 0x05000051, 0xa00f0000, 0x3e800000, 0x3e800000, 0x3e800000, 0x3e800000, + /* def c0, 0.25, 0.25, 0.25, 0.25 */ + 0x0200001f, 0x80000000, 0xb00f0000, /* dcl t0 */ + 0x0200001f, 0x90000000, 0xa00f0800, /* dcl_2d s0 */ + 0x03000042, 0x800f0000, 0xb0e40000, 0xa0e40800, /* texld r0, t0, s0 */ + 0x03000002, 0x800f0000, 0x80e40000, 0xa0e40000, /* add r0, r0, c0 */ + 0x02000001, 0x800f0800, 0x80e40000, /* mov oC0, r0 */ + 0x0000ffff + }; + + window = create_window(); + ok(!!window, "Failed to create a window.\n"); + + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + + hr = IDirect3D9_GetAdapterIdentifier(d3d, D3DADAPTER_DEFAULT, 0, &identifier); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + is_warp = adapter_is_warp(&identifier); + + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + IDirect3D9_Release(d3d); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice9_CreateQuery(device, D3DQUERYTYPE_EVENT, NULL); + if (hr == D3DERR_NOTAVAILABLE) + { + /* Without synchronization native d3d seems to show race condition on + * render target update, similar to opengl without using texture barrier. */ + skip("Event queries are not supported, skipping test.\n"); + IDirect3DDevice9_Release(device); + IDirect3D9_Release(d3d); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice9_CreateQuery(device, D3DQUERYTYPE_EVENT, &event_query); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DQuery9_Issue(event_query, D3DISSUE_END); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_CreateVertexBuffer(device, sizeof(quad), D3DUSAGE_DYNAMIC, + D3DFVF_XYZ | D3DFVF_TEX1, D3DPOOL_DEFAULT, &vb, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DVertexBuffer9_Lock(vb, 0, sizeof(quad), &data, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + memcpy(data, quad, sizeof(quad)); + hr = IDirect3DVertexBuffer9_Unlock(vb); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetStreamSource(device, 0, vb, 0, sizeof(quad[0])); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_TEX1); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZENABLE, FALSE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_CreateTexture(device, 64, 64, 1, D3DUSAGE_RENDERTARGET, + D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &texture, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DTexture9_GetSurfaceLevel(texture, 0, &rt); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetRenderTarget(device, 0, rt); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *)texture); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x01010101, 0.0, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + check_rt_color(rt, 0x00010101); + + hr = IDirect3DDevice9_CreatePixelShader(device, pixel_shader_code, &ps); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetPixelShader(device, ps); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i < 3; ++i) + { + while (IDirect3DQuery9_GetData(event_query, NULL, 0, D3DGETDATA_FLUSH) == S_FALSE) + ; + + hr = IDirect3DDevice9_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, 0, 2); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + IDirect3DQuery9_Issue(event_query, D3DISSUE_END); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + } + + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + color = getPixelColor(device, 0, 0); + if (is_warp || color == 0x00010101) + skip("Sampling attached render targets is not supported.\n"); + else + check_rt_color(rt, 0x00c1c1c1); + + IDirect3DQuery9_Release(event_query); + + IDirect3DVertexBuffer9_Release(vb); + + IDirect3DPixelShader9_Release(ps); + IDirect3DSurface9_Release(rt); + IDirect3DTexture9_Release(texture); + + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + + IDirect3D9_Release(d3d); + DestroyWindow(window); +} START_TEST(visual) { @@ -26409,4 +26570,5 @@ START_TEST(visual) test_desktop_window(); test_mismatched_sample_types(); test_draw_mapped_buffer(); + test_sample_attached_rendertarget(); } diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index ed1022030b..e83aebfa56 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -159,6 +159,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_vertex_shader", ARB_VERTEX_SHADER }, {"GL_ARB_vertex_type_2_10_10_10_rev", ARB_VERTEX_TYPE_2_10_10_10_REV}, {"GL_ARB_viewport_array", ARB_VIEWPORT_ARRAY }, + {"GL_ARB_texture_barrier", ARB_TEXTURE_BARRIER }, /* ATI */ {"GL_ATI_fragment_shader", ATI_FRAGMENT_SHADER }, @@ -228,6 +229,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_NV_vertex_program2", NV_VERTEX_PROGRAM2 }, {"GL_NV_vertex_program2_option", NV_VERTEX_PROGRAM2_OPTION }, {"GL_NV_vertex_program3", NV_VERTEX_PROGRAM3 }, + {"GL_NV_texture_barrier", NV_TEXTURE_BARRIER }, }; static const struct wined3d_extension_map wgl_extension_map[] = @@ -2454,6 +2456,8 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) USE_GL_FUNC(glViewportArrayv) USE_GL_FUNC(glViewportIndexedf) USE_GL_FUNC(glViewportIndexedfv) + /* GL_ARB_texture_barrier */ + USE_GL_FUNC(glTextureBarrier); /* GL_ATI_fragment_shader */ USE_GL_FUNC(glAlphaFragmentOp1ATI) USE_GL_FUNC(glAlphaFragmentOp2ATI) @@ -2644,6 +2648,8 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) USE_GL_FUNC(glCombinerParameteriNV) USE_GL_FUNC(glCombinerParameterivNV) USE_GL_FUNC(glFinalCombinerInputNV) + /* GL_NV_texture_barrier */ + USE_GL_FUNC(glTextureBarrierNV); /* WGL extensions */ USE_GL_FUNC(wglChoosePixelFormatARB) USE_GL_FUNC(wglGetExtensionsStringARB) @@ -3406,6 +3412,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, {ARB_CULL_DISTANCE, MAKEDWORD_VERSION(4, 5)}, {ARB_DERIVATIVE_CONTROL, MAKEDWORD_VERSION(4, 5)}, {ARB_SHADER_TEXTURE_IMAGE_SAMPLES, MAKEDWORD_VERSION(4, 5)}, + {ARB_TEXTURE_BARRIER, MAKEDWORD_VERSION(4, 5)}, {ARB_PIPELINE_STATISTICS_QUERY, MAKEDWORD_VERSION(4, 6)}, {ARB_POLYGON_OFFSET_CLAMP, MAKEDWORD_VERSION(4, 6)}, diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 9cd6a6e3de..e9750c41c5 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3696,6 +3696,9 @@ static void context_preload_texture(struct wined3d_context *context, if (!(texture = state->textures[idx])) return; + if (wined3d_resource_check_fbo_attached(state, &texture->resource)) + context->uses_fbo_attached_resources = 1; + wined3d_texture_load(texture, context, is_srgb_enabled(state->sampler_states[idx])); } @@ -3929,6 +3932,8 @@ static BOOL context_apply_draw_state(struct wined3d_context *context, unsigned int i, base; WORD map; + context->uses_fbo_attached_resources = 0; + if (!have_framebuffer_attachment(gl_info->limits.buffers, fb->render_targets, fb->depth_stencil)) { if (!gl_info->supported[ARB_FRAMEBUFFER_NO_ATTACHMENTS]) @@ -4984,6 +4989,30 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s checkGLcall("glPatchParameteri"); } + if (context->uses_fbo_attached_resources) + { + static unsigned int fixme_once; + + if (gl_info->supported[ARB_TEXTURE_BARRIER]) + { + GL_EXTCALL(glTextureBarrier()); + } + else if (gl_info->supported[NV_TEXTURE_BARRIER]) + { + GL_EXTCALL(glTextureBarrierNV()); + } + else + { + if (!fixme_once++) + FIXME("Sampling attached render targets is not supported.\n"); + + WARN("Sampling attached render targets is not supported, skipping draw.\n"); + context_release(context); + return; + } + checkGLcall("glTextureBarrier"); + } + if (parameters->indirect) { if (!context->use_immediate_mode_draw && !emulation) diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 678ad1a4ef..3372b4b6be 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -142,6 +142,7 @@ enum wined3d_gl_extension ARB_VERTEX_SHADER, ARB_VERTEX_TYPE_2_10_10_10_REV, ARB_VIEWPORT_ARRAY, + ARB_TEXTURE_BARRIER, /* ATI */ ATI_FRAGMENT_SHADER, ATI_SEPARATE_STENCIL, @@ -204,6 +205,7 @@ enum wined3d_gl_extension NV_VERTEX_PROGRAM2, NV_VERTEX_PROGRAM2_OPTION, NV_VERTEX_PROGRAM3, + NV_TEXTURE_BARRIER, /* WGL extensions */ WGL_ARB_PIXEL_FORMAT, WGL_EXT_SWAP_CONTROL, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 307f7a42ad..88833aef70 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1961,6 +1961,7 @@ struct wined3d_context DWORD use_immediate_mode_draw : 1; DWORD uses_uavs : 1; + DWORD uses_fbo_attached_resources : 1; DWORD transform_feedback_active : 1; DWORD transform_feedback_paused : 1; DWORD fog_coord : 1; @@ -1969,7 +1970,7 @@ struct wined3d_context DWORD destroyed : 1; DWORD destroy_delayed : 1; DWORD clip_distance_mask : 8; /* WINED3D_MAX_CLIP_DISTANCES, 8 */ - DWORD padding : 15; + DWORD padding : 14; DWORD constant_update_mask; DWORD numbered_array_mask; @@ -5279,6 +5280,26 @@ static inline void wined3d_context_copy_bo_address(struct wined3d_context *conte dst, dst_bind_flags, src, src_bind_flags, size); } +static inline BOOL wined3d_resource_check_fbo_attached(const struct wined3d_state *state, + const struct wined3d_resource *resource) +{ + struct wined3d_rendertarget_view * const *rts = &state->fb->render_targets[0]; + unsigned int i; + + if ((resource->bind_flags & WINED3D_BIND_DEPTH_STENCIL) + && state->fb->depth_stencil && state->fb->depth_stencil->resource == resource) + return TRUE; + + if (!(resource->bind_flags & WINED3D_BIND_RENDER_TARGET)) + return FALSE; + + for (i = 0; i < MAX_RENDER_TARGET_VIEWS; ++i) + if (rts[i] && rts[i]->resource == resource) + return TRUE; + + return FALSE; +} + /* The WNDCLASS-Name for the fake window which we use to retrieve the GL capabilities */ #define WINED3D_OPENGL_WINDOW_CLASS_NAME "WineD3D_OpenGL" -- 2.21.0

3 8

[PATCH 3/3] vbscript: Add LBound function implementation.
by Jacek Caban 23 Oct '19

23 Oct '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/global.c | 38 ++++++++++++++++++++++++++++++++++--- dlls/vbscript/tests/api.vbs | 3 +++ 2 files changed, 38 insertions(+), 3 deletions(-)

1 0

[PATCH 2/3] vbscript: Fix array reference handling in do_icall.
by Jacek Caban 23 Oct '19

23 Oct '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/interp.c | 4 ++-- dlls/vbscript/tests/lang.vbs | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-)

1 0

[PATCH 1/3] vbscript: Improve exec_script debug traces.
by Jacek Caban 23 Oct '19

23 Oct '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/interp.c | 3 +++ 1 file changed, 3 insertions(+)

1 0

[PATCH] vkd3d: Add support for multiplanar depth/stencil state transitions.
by Conor McCarthy 23 Oct '19

23 Oct '19

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d/command.c | 121 ++++++++++++++++++++++++++++++++++++++----- 1 file changed, 109 insertions(+), 12 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 59ea482..5f7fb21 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -1872,7 +1872,7 @@ static void d3d12_command_list_invalidate_bindings(struct d3d12_command_list *li } } -static bool vk_barrier_parameters_from_d3d12_resource_state(unsigned int state, +static bool vk_barrier_parameters_from_d3d12_resource_state(unsigned int state, unsigned int stencil_state, const struct d3d12_resource *resource, VkQueueFlags vk_queue_flags, const struct vkd3d_vulkan_info *vk_info, VkAccessFlags *access_mask, VkPipelineStageFlags *stage_flags, VkImageLayout *image_layout) { @@ -1911,7 +1911,7 @@ static bool vk_barrier_parameters_from_d3d12_resource_state(unsigned int state, } else if (resource->present_state != D3D12_RESOURCE_STATE_COMMON) { - vk_barrier_parameters_from_d3d12_resource_state(resource->present_state, + vk_barrier_parameters_from_d3d12_resource_state(resource->present_state, 0, resource, vk_queue_flags, vk_info, access_mask, stage_flags, image_layout); return true; } @@ -1945,7 +1945,12 @@ static bool vk_barrier_parameters_from_d3d12_resource_state(unsigned int state, *stage_flags = VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT | VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT; if (image_layout) - *image_layout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL; + { + if (!stencil_state || (stencil_state & D3D12_RESOURCE_STATE_DEPTH_WRITE)) + *image_layout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL; + else + *image_layout = VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_STENCIL_READ_ONLY_OPTIMAL; + } return true; case D3D12_RESOURCE_STATE_COPY_DEST: @@ -1975,7 +1980,17 @@ static bool vk_barrier_parameters_from_d3d12_resource_state(unsigned int state, *access_mask = 0; *stage_flags = 0; if (image_layout) - *image_layout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL; + { + if (stencil_state & D3D12_RESOURCE_STATE_DEPTH_WRITE) + { + *image_layout = VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_STENCIL_ATTACHMENT_OPTIMAL; + *access_mask |= VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT; + } + else + { + *image_layout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL; + } + } break; case D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE: @@ -2096,7 +2111,7 @@ static void d3d12_command_list_transition_resource_to_initial_state(struct d3d12 barrier.oldLayout = d3d12_resource_is_cpu_accessible(resource) ? VK_IMAGE_LAYOUT_PREINITIALIZED : VK_IMAGE_LAYOUT_UNDEFINED; - if (!vk_barrier_parameters_from_d3d12_resource_state(resource->initial_state, + if (!vk_barrier_parameters_from_d3d12_resource_state(resource->initial_state, 0, resource, list->vk_queue_flags, vk_info, &barrier.dstAccessMask, &dst_stage_mask, &barrier.newLayout)) { FIXME("Unhandled state %#x.\n", resource->initial_state); @@ -3710,6 +3725,44 @@ static void STDMETHODCALLTYPE d3d12_command_list_SetPipelineState(ID3D12Graphics list->state = state; } +static bool is_ds_multiplanar_resolvable(unsigned int first_state, unsigned int second_state) +{ + /* Only combinations of depth/stencil read/write are supported. */ + return first_state == second_state + || ((first_state & (D3D12_RESOURCE_STATE_DEPTH_READ | D3D12_RESOURCE_STATE_DEPTH_WRITE)) + && (second_state & (D3D12_RESOURCE_STATE_DEPTH_READ | D3D12_RESOURCE_STATE_DEPTH_WRITE))); +} + +static unsigned int d3d12_find_ds_multiplanar_transition(const D3D12_RESOURCE_BARRIER *barriers, + unsigned int i, unsigned int barrier_count, unsigned int sub_resource_count) +{ + unsigned int sub_resource_idx = barriers[i].u.Transition.Subresource; + unsigned int j; + + for (j = i + 1; j < barrier_count; ++j) + { + if (barriers[j].Type == D3D12_RESOURCE_BARRIER_TYPE_TRANSITION + && barriers[j].u.Transition.pResource == barriers[i].u.Transition.pResource + && sub_resource_idx % sub_resource_count == barriers[j].u.Transition.Subresource % sub_resource_count) + { + /* Second barrier must be for a different plane. */ + if (barriers[j].u.Transition.Subresource == sub_resource_idx) + return 0; + + /* Validate the second barrier and check if the combination of two states is supported. */ + if (!is_valid_resource_state(barriers[j].u.Transition.StateBefore) + || !is_ds_multiplanar_resolvable(barriers[i].u.Transition.StateBefore, barriers[j].u.Transition.StateBefore) + || !is_valid_resource_state(barriers[j].u.Transition.StateAfter) + || !is_ds_multiplanar_resolvable(barriers[i].u.Transition.StateAfter, barriers[j].u.Transition.StateAfter) + || barriers[j].u.Transition.Subresource >= sub_resource_count * 2u) + return 0; + + return j; + } + } + return 0; +} + static void STDMETHODCALLTYPE d3d12_command_list_ResourceBarrier(ID3D12GraphicsCommandList1 *iface, UINT barrier_count, const D3D12_RESOURCE_BARRIER *barriers) { @@ -3717,6 +3770,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResourceBarrier(ID3D12GraphicsC bool have_aliasing_barriers = false, have_split_barriers = false; const struct vkd3d_vk_device_procs *vk_procs; const struct vkd3d_vulkan_info *vk_info; + bool *multiplanar_handled = NULL; unsigned int i; TRACE("iface %p, barrier_count %u, barriers %p.\n", iface, barrier_count, barriers); @@ -3746,6 +3800,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResourceBarrier(ID3D12GraphicsC { case D3D12_RESOURCE_BARRIER_TYPE_TRANSITION: { + unsigned int state_before, state_after, stencil_state_before = 0, stencil_state_after = 0; const D3D12_RESOURCE_TRANSITION_BARRIER *transition = &current->u.Transition; if (!is_valid_resource_state(transition->StateBefore)) @@ -3767,18 +3822,58 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResourceBarrier(ID3D12GraphicsC continue; } + if (multiplanar_handled && multiplanar_handled[i]) + { + FIXME("Skipping resource %p\n", resource); + continue; + } + + state_before = transition->StateBefore; + state_after = transition->StateAfter; + sub_resource_idx = transition->Subresource; - if (!vk_barrier_parameters_from_d3d12_resource_state(transition->StateBefore, + if (sub_resource_idx != D3D12_RESOURCE_BARRIER_ALL_SUBRESOURCES + && (resource->desc.Flags & D3D12_RESOURCE_FLAG_ALLOW_DEPTH_STENCIL)) + { + unsigned int sub_resource_count = d3d12_resource_desc_get_sub_resource_count(&resource->desc); + unsigned int j = d3d12_find_ds_multiplanar_transition(barriers, i, barrier_count, sub_resource_count); + if (j && (multiplanar_handled || (multiplanar_handled = vkd3d_calloc(barrier_count, sizeof(bool))))) + { + multiplanar_handled[j] = true; + if (sub_resource_idx >= sub_resource_count) + { + sub_resource_idx -= sub_resource_count; + /* The stencil barrier is at i, depth at j. */ + state_before = barriers[j].u.Transition.StateBefore; + state_after = barriers[j].u.Transition.StateAfter; + stencil_state_before = transition->StateBefore; + stencil_state_after = transition->StateAfter; + } + else + { + /* Depth at i, stencil at j. */ + stencil_state_before = barriers[j].u.Transition.StateBefore; + stencil_state_after = barriers[j].u.Transition.StateAfter; + } + } + else if (sub_resource_idx >= sub_resource_count) + { + FIXME_ONCE("Unhandled sub-resource idx %u.\n", sub_resource_idx); + continue; + } + } + + if (!vk_barrier_parameters_from_d3d12_resource_state(state_before, stencil_state_before, resource, list->vk_queue_flags, vk_info, &src_access_mask, &src_stage_mask, &layout_before)) { - FIXME("Unhandled state %#x.\n", transition->StateBefore); + FIXME("Unhandled state %#x.\n", state_before); continue; } - if (!vk_barrier_parameters_from_d3d12_resource_state(transition->StateAfter, + if (!vk_barrier_parameters_from_d3d12_resource_state(state_after, stencil_state_after, resource, list->vk_queue_flags, vk_info, &dst_access_mask, &dst_stage_mask, &layout_after)) { - FIXME("Unhandled state %#x.\n", transition->StateAfter); + FIXME("Unhandled state %#x.\n", state_after); continue; } @@ -3795,7 +3890,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResourceBarrier(ID3D12GraphicsC VkAccessFlags access_mask; resource = unsafe_impl_from_ID3D12Resource(uav->pResource); - vk_barrier_parameters_from_d3d12_resource_state(D3D12_RESOURCE_STATE_UNORDERED_ACCESS, + vk_barrier_parameters_from_d3d12_resource_state(D3D12_RESOURCE_STATE_UNORDERED_ACCESS, 0, resource, list->vk_queue_flags, vk_info, &access_mask, &stage_mask, &image_layout); src_access_mask = dst_access_mask = access_mask; src_stage_mask = dst_stage_mask = stage_mask; @@ -3894,6 +3989,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResourceBarrier(ID3D12GraphicsC } } + vkd3d_free(multiplanar_handled); + if (have_aliasing_barriers) FIXME_ONCE("Aliasing barriers not implemented yet.\n"); @@ -4737,7 +4834,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewUint(ID buffer_barrier.offset = cpu_descriptor->uav.buffer.offset; buffer_barrier.size = cpu_descriptor->uav.buffer.size; - vk_barrier_parameters_from_d3d12_resource_state(D3D12_RESOURCE_STATE_UNORDERED_ACCESS, + vk_barrier_parameters_from_d3d12_resource_state(D3D12_RESOURCE_STATE_UNORDERED_ACCESS, 0, resource_impl, list->vk_queue_flags, vk_info, &buffer_barrier.dstAccessMask, &stage_mask, NULL); VK_CALL(vkCmdPipelineBarrier(list->vk_command_buffer, @@ -4770,7 +4867,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewUint(ID image_barrier.image = resource_impl->u.vk_image; image_barrier.subresourceRange = range; - vk_barrier_parameters_from_d3d12_resource_state(D3D12_RESOURCE_STATE_UNORDERED_ACCESS, + vk_barrier_parameters_from_d3d12_resource_state(D3D12_RESOURCE_STATE_UNORDERED_ACCESS, 0, resource_impl, list->vk_queue_flags, vk_info, &image_barrier.dstAccessMask, &stage_mask, NULL); VK_CALL(vkCmdPipelineBarrier(list->vk_command_buffer, -- 2.23.0

2 1

[PATCH] vkd3d: Handle CPUPageProperty options for D3D12_HEAP_TYPE_CUSTOM.
by Conor McCarthy 23 Oct '19

23 Oct '19

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d/resource.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 626772e..ddd8bfc 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -58,9 +58,19 @@ static unsigned int vkd3d_select_memory_type(struct d3d12_device *device, uint32 break; case D3D12_HEAP_TYPE_CUSTOM: - FIXME("Custom heaps not supported yet.\n"); - flags[count++] = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT - | VK_MEMORY_PROPERTY_HOST_CACHED_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT; + switch (heap_properties->CPUPageProperty) + { + case D3D12_CPU_PAGE_PROPERTY_WRITE_COMBINE: + flags[count++] = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT; + break; + default: + WARN("Invalid CPU page property.\n"); + /* Fall through. */ + case D3D12_CPU_PAGE_PROPERTY_WRITE_BACK: + flags[count++] = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT + | VK_MEMORY_PROPERTY_HOST_CACHED_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT; + break; + } flags[count++] = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT; flags[count++] = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT; break; -- 2.23.0

2 1

[PATCH v2] user32/tests: Skip some tests with inconsistent results with non-us kbd.
by Rémi Bernon 23 Oct '19

23 Oct '19

See the same binary being tested twice here: * https://testbot.winehq.org/JobDetails.pl?Key=58277 * https://testbot.winehq.org/JobDetails.pl?Key=58278 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: This was PATCH 4/4 of the previous series for user32/tests, it's now doing what it was supposed to do. It would be better to fix the inconsistencies, but in the meantime this creates noise on testbot. dlls/user32/tests/input.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 130ce49bb57..c5cf9556ede 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -284,6 +284,13 @@ static BOOL TestASet( HWND hWnd, int nrkev, const KEV kevdwn[], const KEV kevup[ int i,j,k,l,m,n; static int count=0; KEV kbuf[MAXKEYEVENTS]; + BOOL us_kbd = (GetKeyboardLayout(0) == (HKL)(ULONG_PTR)0x04090409); + if (!us_kbd) + { + win_skip( "skipping test with inconsistent results on non-us keyboard\n" ); + return TRUE; + } + assert( nrkev==2 || nrkev==3); for(i=0;i<MAXKEYEVENTS;i++) kbuf[i]=0; /* two keys involved gives 4 test cases */ @@ -1184,6 +1191,12 @@ static void test_Input_unicode(void) HHOOK hook; HMODULE hModuleImm32; BOOL (WINAPI *pImmDisableIME)(DWORD); + BOOL us_kbd = (GetKeyboardLayout(0) == (HKL)(ULONG_PTR)0x04090409); + if (!us_kbd) + { + win_skip( "skipping test with inconsistent results on non-us keyboard\n" ); + return; + } wclass.lpszClassName = classNameW; wclass.style = CS_HREDRAW | CS_VREDRAW; -- 2.24.0.rc0

2 1

[PATCH] vbscript: Replace custom buffer management code by BSTR based helper.
by Dmitry Timoshkov 23 Oct '19

23 Oct '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/vbscript/vbregexp.c | 76 +++++++++++++--------------------------- 1 file changed, 25 insertions(+), 51 deletions(-) diff --git a/dlls/vbscript/vbregexp.c b/dlls/vbscript/vbregexp.c index 4edf9dcbfe..50652da953 100644 --- a/dlls/vbscript/vbregexp.c +++ b/dlls/vbscript/vbregexp.c @@ -1433,45 +1433,14 @@ static HRESULT WINAPI RegExp2_Test(IRegExp2 *iface, BSTR sourceString, VARIANT_B return hres; } -typedef struct { - WCHAR *buf; - DWORD size; - DWORD len; -} strbuf_t; - -static BOOL strbuf_ensure_size(strbuf_t *buf, unsigned len) -{ - WCHAR *new_buf; - DWORD new_size; - - if(len <= buf->size) - return TRUE; - - new_size = buf->size ? buf->size<<1 : 16; - if(new_size < len) - new_size = len; - if(buf->buf) - new_buf = heap_realloc(buf->buf, new_size*sizeof(WCHAR)); - else - new_buf = heap_alloc(new_size*sizeof(WCHAR)); - if(!new_buf) - return FALSE; - - buf->buf = new_buf; - buf->size = new_size; - return TRUE; -} - -static HRESULT strbuf_append(strbuf_t *buf, const WCHAR *str, DWORD len) +static HRESULT bstrcat(BSTR *str, const WCHAR *append, unsigned int len) { - if(!len) - return S_OK; + unsigned int old_len = SysStringLen(*str); - if(!strbuf_ensure_size(buf, buf->len+len)) + if (!SysReAllocStringLen(str, NULL, old_len + len)) return E_OUTOFMEMORY; - memcpy(buf->buf+buf->len, str, len*sizeof(WCHAR)); - buf->len += len; + memcpy(*str + old_len, append, len * sizeof(WCHAR)); return S_OK; } @@ -1480,11 +1449,10 @@ static HRESULT WINAPI RegExp2_Replace(IRegExp2 *iface, BSTR source, VARIANT repl RegExp2 *This = impl_from_IRegExp2(iface); const WCHAR *cp, *prev_cp = NULL, *ptr, *prev_ptr; size_t match_len = 0, source_len, replace_len; - strbuf_t buf = { NULL, 0, 0 }; match_state_t *state = NULL; heap_pool_t *mark; VARIANT strv; - BSTR replace; + BSTR replace, buf; HRESULT hres; TRACE("(%p)->(%s %s %p)\n", This, debugstr_w(source), debugstr_variant(&replaceVar), ret); @@ -1515,6 +1483,10 @@ static HRESULT WINAPI RegExp2_Replace(IRegExp2 *iface, BSTR source, VARIANT repl if(This->regexp && !(state = alloc_match_state(This->regexp, &This->pool, cp))) hres = E_OUTOFMEMORY; + buf = SysAllocString(L""); + if(!buf) + hres = E_OUTOFMEMORY; + while(SUCCEEDED(hres)) { if(This->regexp) { prev_cp = cp; @@ -1530,38 +1502,38 @@ static HRESULT WINAPI RegExp2_Replace(IRegExp2 *iface, BSTR source, VARIANT repl prev_cp = cp; } - hres = strbuf_append(&buf, prev_cp, cp - prev_cp - match_len); + hres = bstrcat(&buf, prev_cp, cp - prev_cp - match_len); if(FAILED(hres)) break; prev_ptr = replace; while((ptr = wmemchr(prev_ptr, '$', replace + replace_len - prev_ptr))) { - hres = strbuf_append(&buf, prev_ptr, ptr - prev_ptr); + hres = bstrcat(&buf, prev_ptr, ptr - prev_ptr); if(FAILED(hres)) break; switch(ptr[1]) { case '$': - hres = strbuf_append(&buf, ptr, 1); + hres = bstrcat(&buf, ptr, 1); prev_ptr = ptr + 2; break; case '&': - hres = strbuf_append(&buf, cp - match_len, match_len); + hres = bstrcat(&buf, cp - match_len, match_len); prev_ptr = ptr + 2; break; case '`': - hres = strbuf_append(&buf, source, cp - source - match_len); + hres = bstrcat(&buf, source, cp - source - match_len); prev_ptr = ptr + 2; break; case '\'': - hres = strbuf_append(&buf, cp, source + source_len - cp); + hres = bstrcat(&buf, cp, source + source_len - cp); prev_ptr = ptr + 2; break; default: { DWORD idx; if(!iswdigit(ptr[1])) { - hres = strbuf_append(&buf, ptr, 1); + hres = bstrcat(&buf, ptr, 1); prev_ptr = ptr + 1; break; } @@ -1573,13 +1545,13 @@ static HRESULT WINAPI RegExp2_Replace(IRegExp2 *iface, BSTR source, VARIANT repl }else if(idx && idx <= state->paren_count) { prev_ptr = ptr + 2; }else { - hres = strbuf_append(&buf, ptr, 1); + hres = bstrcat(&buf, ptr, 1); prev_ptr = ptr + 1; break; } if(state->parens[idx - 1].index != -1) - hres = strbuf_append(&buf, source + state->parens[idx - 1].index, + hres = bstrcat(&buf, source + state->parens[idx - 1].index, state->parens[idx - 1].length); break; } @@ -1588,7 +1560,7 @@ static HRESULT WINAPI RegExp2_Replace(IRegExp2 *iface, BSTR source, VARIANT repl break; } if(SUCCEEDED(hres)) - hres = strbuf_append(&buf, prev_ptr, replace + replace_len - prev_ptr); + hres = bstrcat(&buf, prev_ptr, replace + replace_len - prev_ptr); if(FAILED(hres)) break; @@ -1597,13 +1569,15 @@ static HRESULT WINAPI RegExp2_Replace(IRegExp2 *iface, BSTR source, VARIANT repl } if(SUCCEEDED(hres)) { - hres = strbuf_append(&buf, cp, source + source_len - cp); - if(SUCCEEDED(hres) && !(*ret = SysAllocStringLen(buf.buf, buf.len))) - hres = E_OUTOFMEMORY; + hres = bstrcat(&buf, cp, source + source_len - cp); + if(SUCCEEDED(hres)) + *ret = buf; } + if(FAILED(hres)) + SysFreeString(buf); + heap_pool_clear(mark); - heap_free(buf.buf); SysFreeString(replace); return hres; } -- 2.20.1

2 2

[PATCH 1/4] user32/tests: Update input test result for w1064v1809.
by Rémi Bernon 23 Oct '19

23 Oct '19

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/user32/tests/input.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index d0dc4a8bcf3..d768e64cdc1 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1409,7 +1409,9 @@ static void test_mouse_ll_hook(void) ok(pt_old.x == 149 && pt_old.y == 149, "Wrong new pos: (%d,%d)\n", pt_old.x, pt_old.y); mouse_event(MOUSEEVENTF_MOVE, 0, 0, 0, 0); GetCursorPos(&pt_old); - ok(pt_old.x == 150 && pt_old.y == 150, "Wrong new pos: (%d,%d)\n", pt_old.x, pt_old.y); + ok((pt_old.x == 150 && pt_old.y == 150) || + broken(pt_old.x == 149 && pt_old.y == 149) /* w1064v1809 */, + "Wrong new pos: (%d,%d)\n", pt_old.x, pt_old.y); mouse_event(MOUSEEVENTF_MOVE, 0, 0, 0, 0); GetCursorPos(&pt_old); todo_wine -- 2.24.0.rc0

2 7

[PATCH v2] setupapi/tests: Get rid of variables holding empty strings
by Vijay Kiran Kamuju 23 Oct '19

23 Oct '19

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/setupapi/tests/diskspace.c | 10 ++++------ dlls/setupapi/tests/setupcab.c | 5 ++--- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/setupapi/tests/diskspace.c b/dlls/setupapi/tests/diskspace.c index dab6705eee33..c92c15a821ae 100644 --- a/dlls/setupapi/tests/diskspace.c +++ b/dlls/setupapi/tests/diskspace.c @@ -375,8 +375,6 @@ static void test_SetupQuerySpaceRequiredOnDriveA(void) static void test_SetupQuerySpaceRequiredOnDriveW(void) { - static const WCHAR emptyW[] = {0}; - BOOL ret; HDSKSPC handle; LONGLONG space; @@ -403,7 +401,7 @@ static void test_SetupQuerySpaceRequiredOnDriveW(void) GetLastError()); SetLastError(0xdeadbeef); - ret = SetupQuerySpaceRequiredOnDriveW(NULL, emptyW, NULL, NULL, 0); + ret = SetupQuerySpaceRequiredOnDriveW(NULL, L"", NULL, NULL, 0); ok(!ret, "Expected SetupQuerySpaceRequiredOnDriveW to return FALSE, got %d\n", ret); ok(GetLastError() == ERROR_INVALID_HANDLE, "Expected GetLastError() to return ERROR_INVALID_HANDLE, got %u\n", @@ -411,7 +409,7 @@ static void test_SetupQuerySpaceRequiredOnDriveW(void) SetLastError(0xdeadbeef); space = 0xdeadbeef; - ret = SetupQuerySpaceRequiredOnDriveW(NULL, emptyW, &space, NULL, 0); + ret = SetupQuerySpaceRequiredOnDriveW(NULL, L"", &space, NULL, 0); ok(!ret, "Expected SetupQuerySpaceRequiredOnDriveW to return FALSE, got %d\n", ret); ok(space == 0xdeadbeef, "Expected output space parameter to be untouched\n"); ok(GetLastError() == ERROR_INVALID_HANDLE, @@ -441,7 +439,7 @@ static void test_SetupQuerySpaceRequiredOnDriveW(void) GetLastError()); SetLastError(0xdeadbeef); - ret = SetupQuerySpaceRequiredOnDriveW(handle, emptyW, NULL, NULL, 0); + ret = SetupQuerySpaceRequiredOnDriveW(handle, L"", NULL, NULL, 0); ok(!ret, "Expected SetupQuerySpaceRequiredOnDriveW to return FALSE, got %d\n", ret); ok(GetLastError() == ERROR_INVALID_DRIVE, "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", @@ -449,7 +447,7 @@ static void test_SetupQuerySpaceRequiredOnDriveW(void) SetLastError(0xdeadbeef); space = 0xdeadbeef; - ret = SetupQuerySpaceRequiredOnDriveW(handle, emptyW, &space, NULL, 0); + ret = SetupQuerySpaceRequiredOnDriveW(handle, L"", &space, NULL, 0); ok(!ret, "Expected SetupQuerySpaceRequiredOnDriveW to return FALSE, got %d\n", ret); ok(space == 0xdeadbeef, "Expected output space parameter to be untouched\n"); ok(GetLastError() == ERROR_INVALID_DRIVE, diff --git a/dlls/setupapi/tests/setupcab.c b/dlls/setupapi/tests/setupcab.c index bb9add035dbb..183da9016594 100644 --- a/dlls/setupapi/tests/setupcab.c +++ b/dlls/setupapi/tests/setupcab.c @@ -143,7 +143,6 @@ static void test_invalid_parametersA(void) static void test_invalid_parametersW(void) { static const WCHAR nonexistentW[] = {'c',':','\\','n','o','n','e','x','i','s','t','e','n','t','.','c','a','b',0}; - static const WCHAR emptyW[] = {0}; BOOL ret; WCHAR source[MAX_PATH], temp[MAX_PATH]; @@ -204,7 +203,7 @@ static void test_invalid_parametersW(void) GetLastError()); SetLastError(0xdeadbeef); - ret = SetupIterateCabinetW(emptyW, 0, NULL, NULL); + ret = SetupIterateCabinetW(L"", 0, NULL, NULL); ok(!ret, "Expected SetupIterateCabinetW to return 0, got %d\n", ret); ok(GetLastError() == ERROR_NOT_ENOUGH_MEMORY || GetLastError() == ERROR_FILE_NOT_FOUND, /* NT4/Win2k */ @@ -212,7 +211,7 @@ static void test_invalid_parametersW(void) GetLastError()); SetLastError(0xdeadbeef); - ret = SetupIterateCabinetW(emptyW, 0, dummy_callbackW, NULL); + ret = SetupIterateCabinetW(L"", 0, dummy_callbackW, NULL); ok(!ret, "Expected SetupIterateCabinetW to return 0, got %d\n", ret); ok(GetLastError() == ERROR_NOT_ENOUGH_MEMORY || GetLastError() == ERROR_FILE_NOT_FOUND, /* NT4/Win2k */ -- 2.21.0

1 0

[PATCH] vbscript/tests: Fix tests failures on Win10.
by Nikolay Sivov 23 Oct '19

23 Oct '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/vbscript/tests/createobj.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/vbscript/tests/createobj.c b/dlls/vbscript/tests/createobj.c index 1c72ed25c4..b16be88b85 100644 --- a/dlls/vbscript/tests/createobj.c +++ b/dlls/vbscript/tests/createobj.c @@ -229,7 +229,6 @@ static HRESULT WINAPI DispatchEx_GetTypeInfoCount(IDispatchEx *iface, UINT *pcti static HRESULT WINAPI DispatchEx_GetTypeInfo(IDispatchEx *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { - ok(0, "unexpected call\n"); return E_NOTIMPL; } -- 2.23.0

2 1

[PATCH] wscript/tests: Fix test failures on Win10.
by Nikolay Sivov 23 Oct '19

23 Oct '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- programs/wscript/tests/run.c | 1 - 1 file changed, 1 deletion(-) diff --git a/programs/wscript/tests/run.c b/programs/wscript/tests/run.c index 16d14ff79f..96ce03044c 100644 --- a/programs/wscript/tests/run.c +++ b/programs/wscript/tests/run.c @@ -134,7 +134,6 @@ static HRESULT WINAPI Dispatch_GetTypeInfoCount(IDispatch *iface, UINT *pctinfo) static HRESULT WINAPI Dispatch_GetTypeInfo(IDispatch *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { - ok(0, "unexpected call\n"); return E_NOTIMPL; } -- 2.23.0

2 1

[PATCH] vbscript/tests: Add some tests for IRegExp2::Replace().
by Dmitry Timoshkov 23 Oct '19

23 Oct '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/vbscript/tests/vbscript.c | 60 ++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/dlls/vbscript/tests/vbscript.c b/dlls/vbscript/tests/vbscript.c index 08edfc1be7..fdbfc4465b 100644 --- a/dlls/vbscript/tests/vbscript.c +++ b/dlls/vbscript/tests/vbscript.c @@ -1,5 +1,6 @@ /* * Copyright 2011 Jacek Caban for CodeWeavers + * Copyright 2019 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1131,6 +1132,64 @@ static void test_RegExp(void) IRegExp2_Release(regexp); } +static void test_RegExp_Replace(void) +{ + static const struct + { + const char *pattern; + const char *replace; + const char *source; + const char *result; + BOOL global; + } test[] = + { + { "abc", "", "123abc456", "123456", FALSE }, + { "abc", "dcba", "123abc456", "123dcba456", FALSE }, + { "[\r\n\t\f]+", " ", "\nHello\rNew\fWorld\t!", " Hello\rNew\fWorld\t!", FALSE }, + { "[\r\n\t\f]+", " ", "\nHello\rNew\fWorld\t!", " Hello New World !", TRUE }, + }; + HRESULT hr; + IRegExp2 *regexp; + VARIANT var; + BSTR str, ret, result; + int i; + + hr = CoCreateInstance(&CLSID_VBScriptRegExp, NULL, + CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, + &IID_IRegExp2, (void **)&regexp); + if (hr == REGDB_E_CLASSNOTREG) + { + win_skip("VBScriptRegExp is not registered\n"); + return; + } + ok(hr == S_OK, "got %#x\n", hr); + + for (i = 0; i < ARRAY_SIZE(test); i++) + { + hr = IRegExp2_put_Global(regexp, test[i].global ? VARIANT_TRUE : VARIANT_FALSE); + ok(hr == S_OK, "got %#x\n", hr); + + str = a2bstr(test[i].pattern); + hr = IRegExp2_put_Pattern(regexp, str); + ok(hr == S_OK, "got %#x\n", hr); + SysFreeString(str); + + str = a2bstr(test[i].source); + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = a2bstr(test[i].replace); + hr = IRegExp2_Replace(regexp, str, var, &ret); + ok(hr == S_OK, "got %#x\n", hr); + result = a2bstr(test[i].result); + ok(!wcscmp(ret, result), "got %s, expected %s\n", wine_dbgstr_w(ret), wine_dbgstr_w(result)); + SysFreeString(result); + SysFreeString(ret); + SysFreeString(V_BSTR(&var)); + SysFreeString(str); + } + + IRegExp2_Release(regexp); +} + static BOOL check_vbscript(void) { IActiveScriptParseProcedure2 *vbscript; @@ -1157,6 +1216,7 @@ START_TEST(vbscript) test_named_items(); test_scriptdisp(); test_RegExp(); + test_RegExp_Replace(); }else { win_skip("VBScript engine not available or too old\n"); } -- 2.20.1

2 1

[PATCH] setupapi/tests: Get rid of variables holding empty strings
by Vijay Kiran Kamuju 23 Oct '19

23 Oct '19

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/setupapi/tests/diskspace.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/setupapi/tests/diskspace.c b/dlls/setupapi/tests/diskspace.c index dab6705eee33..c92c15a821ae 100644 --- a/dlls/setupapi/tests/diskspace.c +++ b/dlls/setupapi/tests/diskspace.c @@ -375,8 +375,6 @@ static void test_SetupQuerySpaceRequiredOnDriveA(void) static void test_SetupQuerySpaceRequiredOnDriveW(void) { - static const WCHAR emptyW[] = {0}; - BOOL ret; HDSKSPC handle; LONGLONG space; @@ -403,7 +401,7 @@ static void test_SetupQuerySpaceRequiredOnDriveW(void) GetLastError()); SetLastError(0xdeadbeef); - ret = SetupQuerySpaceRequiredOnDriveW(NULL, emptyW, NULL, NULL, 0); + ret = SetupQuerySpaceRequiredOnDriveW(NULL, L"", NULL, NULL, 0); ok(!ret, "Expected SetupQuerySpaceRequiredOnDriveW to return FALSE, got %d\n", ret); ok(GetLastError() == ERROR_INVALID_HANDLE, "Expected GetLastError() to return ERROR_INVALID_HANDLE, got %u\n", @@ -411,7 +409,7 @@ static void test_SetupQuerySpaceRequiredOnDriveW(void) SetLastError(0xdeadbeef); space = 0xdeadbeef; - ret = SetupQuerySpaceRequiredOnDriveW(NULL, emptyW, &space, NULL, 0); + ret = SetupQuerySpaceRequiredOnDriveW(NULL, L"", &space, NULL, 0); ok(!ret, "Expected SetupQuerySpaceRequiredOnDriveW to return FALSE, got %d\n", ret); ok(space == 0xdeadbeef, "Expected output space parameter to be untouched\n"); ok(GetLastError() == ERROR_INVALID_HANDLE, @@ -441,7 +439,7 @@ static void test_SetupQuerySpaceRequiredOnDriveW(void) GetLastError()); SetLastError(0xdeadbeef); - ret = SetupQuerySpaceRequiredOnDriveW(handle, emptyW, NULL, NULL, 0); + ret = SetupQuerySpaceRequiredOnDriveW(handle, L"", NULL, NULL, 0); ok(!ret, "Expected SetupQuerySpaceRequiredOnDriveW to return FALSE, got %d\n", ret); ok(GetLastError() == ERROR_INVALID_DRIVE, "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", @@ -449,7 +447,7 @@ static void test_SetupQuerySpaceRequiredOnDriveW(void) SetLastError(0xdeadbeef); space = 0xdeadbeef; - ret = SetupQuerySpaceRequiredOnDriveW(handle, emptyW, &space, NULL, 0); + ret = SetupQuerySpaceRequiredOnDriveW(handle, L"", &space, NULL, 0); ok(!ret, "Expected SetupQuerySpaceRequiredOnDriveW to return FALSE, got %d\n", ret); ok(space == 0xdeadbeef, "Expected output space parameter to be untouched\n"); ok(GetLastError() == ERROR_INVALID_DRIVE, -- 2.21.0

1 0

Re: Michael Stefaniuc : comctl32/tests: Get rid of variables holding empty strings.
by Michael Stefaniuc 23 Oct '19

23 Oct '19

Uhm, this patch introduces test failures. I had assumed the Marvin email is enough to reject this with "Test failures". I doubt this patch is the real culprit but I didn't have time to properly debug the issue. On 10/22/19 11:57 PM, Alexandre Julliard wrote: > Module: wine > Branch: master > Commit: f8979fee1fa2e6aeed5a5026465dffa680c0848f > URL: https://source.winehq.org/git/wine.git/?a=commit;h=f8979fee1fa2e6aeed5a5026… > > Author: Michael Stefaniuc <mstefani(a)winehq.org> > Date: Tue Oct 22 01:24:32 2019 +0200 > > comctl32/tests: Get rid of variables holding empty strings. > > Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> > Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> > > --- > diff --git a/dlls/comctl32/tests/pager.c b/dlls/comctl32/tests/pager.c > index 0e2c25b08a..30005c88fa 100644 > --- a/dlls/comctl32/tests/pager.c > +++ b/dlls/comctl32/tests/pager.c > @@ -132,17 +130,17 @@ static const struct notify_test_send test_dont_convert_send_data[] = > > static const struct notify_test_receive test_convert_receive_data[] = > { > - {empty_w, sizeof(empty_w), ARRAY_SIZE(buffer), NULL, test_a, sizeof(test_a), -1, test_w, ARRAY_SIZE(buffer)}, > - {empty_w, sizeof(empty_w), ARRAY_SIZE(buffer), test_a, NULL, 0, -1, test_w, ARRAY_SIZE(buffer)}, > - {NULL, sizeof(empty_w), ARRAY_SIZE(buffer), test_a, NULL, 0, -1, NULL, ARRAY_SIZE(buffer)}, > - {empty_w, sizeof(empty_w), ARRAY_SIZE(buffer), large_a, NULL, 0, -1, large_truncated_65_w, ARRAY_SIZE(buffer)}, > - {empty_w, sizeof(empty_w), ARRAY_SIZE(buffer), empty_a, 0, 0, 1, empty_w, 1}, > + {L"", sizeof(L""), ARRAY_SIZE(buffer), NULL, test_a, sizeof(test_a), -1, test_w, ARRAY_SIZE(buffer)}, > + {L"", sizeof(L""), ARRAY_SIZE(buffer), test_a, NULL, 0, -1, test_w, ARRAY_SIZE(buffer)}, > + {NULL, sizeof(L""), ARRAY_SIZE(buffer), test_a, NULL, 0, -1, NULL, ARRAY_SIZE(buffer)}, > + {L"", sizeof(L""), ARRAY_SIZE(buffer), large_a, NULL, 0, -1, large_truncated_65_w, ARRAY_SIZE(buffer)}, ^^^ changing that back to empty_w makes the test failures go away... bye michael

2 2

[PATCH] kernel32/tests: Fix some test failures on Win10.
by Nikolay Sivov 23 Oct '19

23 Oct '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/kernel32/tests/format_msg.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/format_msg.c b/dlls/kernel32/tests/format_msg.c index 9214e3e454..780ec0abf1 100644 --- a/dlls/kernel32/tests/format_msg.c +++ b/dlls/kernel32/tests/format_msg.c @@ -1502,21 +1502,27 @@ static void test_message_from_hmodule(void) MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), out, ARRAY_SIZE(out), NULL); error = GetLastError(); ok(ret == 0, "FormatMessageA returned %u instead of 0\n", ret); - ok(error == ERROR_MR_MID_NOT_FOUND || error == ERROR_MUI_FILE_NOT_FOUND, "last error %u\n", error); + ok(error == ERROR_MR_MID_NOT_FOUND || + error == ERROR_MUI_FILE_NOT_FOUND || + error == ERROR_RESOURCE_TYPE_NOT_FOUND, "Unexpected last error %u.\n", error); SetLastError(0xdeadbeef); ret = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_FROM_HMODULE, h, 3044, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), out, ARRAY_SIZE(out), NULL); error = GetLastError(); ok(ret == 0, "FormatMessageA returned %u instead of 0\n", ret); - ok(error == ERROR_MR_MID_NOT_FOUND || error == ERROR_MUI_FILE_NOT_LOADED, "last error %u\n", error); + ok(error == ERROR_MR_MID_NOT_FOUND || + error == ERROR_MUI_FILE_NOT_LOADED || + error == ERROR_RESOURCE_TYPE_NOT_FOUND, "Unexpected last error %u.\n", error); SetLastError(0xdeadbeef); ret = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_FROM_HMODULE, h, 3044, MAKELANGID(LANG_NEUTRAL, SUBLANG_SYS_DEFAULT), out, ARRAY_SIZE(out), NULL); error = GetLastError(); ok(ret == 0, "FormatMessageA returned %u instead of 0\n", ret); - ok(error == ERROR_MR_MID_NOT_FOUND || error == ERROR_MUI_FILE_NOT_LOADED, "last error %u\n", error); + ok(error == ERROR_MR_MID_NOT_FOUND || + error == ERROR_MUI_FILE_NOT_LOADED || + error == ERROR_RESOURCE_TYPE_NOT_FOUND, "Unexpected last error %u.\n", error); SetLastError(0xdeadbeef); ret = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_FROM_HMODULE, h, 3044, -- 2.23.0

1 0

[PATCH v2] uianimation: Register interfaces.
by Alistair Leslie-Hughes 23 Oct '19

23 Oct '19

From: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/uianimation/Makefile.in | 4 ++ dlls/uianimation/uianimation_reg.idl | 57 ++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+) create mode 100644 dlls/uianimation/uianimation_reg.idl diff --git a/dlls/uianimation/Makefile.in b/dlls/uianimation/Makefile.in index 85bf1675db..9f5e6f05b2 100644 --- a/dlls/uianimation/Makefile.in +++ b/dlls/uianimation/Makefile.in @@ -4,3 +4,7 @@ EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ main.c + +IDL_SRCS = \ + uianimation_reg.idl + diff --git a/dlls/uianimation/uianimation_reg.idl b/dlls/uianimation/uianimation_reg.idl new file mode 100644 index 0000000000..7b311b50df --- /dev/null +++ b/dlls/uianimation/uianimation_reg.idl @@ -0,0 +1,57 @@ +/* + * UiAnimation register. + * + * Copyright (C) 2018 Louis Lenders + * + * 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 + */ + +#pragma makedep register + +[ + uuid(bfcd4a0c-06b6-4384-b768-0daa792c380e), + threading(both) +] +coclass UIAnimationTimer +{ + [default] interface IUIAnimationTimer; +} + +[ + uuid(4c1fc63a-695c-47e8-a339-1a194be3d0b8), + threading(both) +] +coclass UIAnimationManager +{ + [default] interface IUIAnimationManager; +} + +[ + uuid(8a9b1cdd-fcd7-419c-8b44-42fd17db1887), + threading(both) +] +coclass UIAnimationTransitionFactory +{ + [default] interface IUIAnimationTransitionFactory; +} + +[ + uuid(1d6322ad-aa85-4ef5-a828-86d71067d145), + threading(both) +] +coclass UIAnimationTransitionLibrary +{ + [default] interface IUIAnimationTransitionLibrary; +} -- 2.23.0

2 2

[PATCH 1/4] xinput: Make device hotplugging thread-safe
by Andrew Eikum 23 Oct '19

23 Oct '19

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/xinput1_3/hid.c | 239 ++++++++++++++++---------------- dlls/xinput1_3/xinput_main.c | 95 ++++++++++++- dlls/xinput1_3/xinput_private.h | 7 +- 3 files changed, 210 insertions(+), 131 deletions(-) diff --git a/dlls/xinput1_3/hid.c b/dlls/xinput1_3/hid.c index 38c93beb80f..477d5304cac 100644 --- a/dlls/xinput1_3/hid.c +++ b/dlls/xinput1_3/hid.c @@ -47,15 +47,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(xinput); #define XINPUT_GAMEPAD_GUIDE 0x0400 -static CRITICAL_SECTION hid_xinput_crit; -static CRITICAL_SECTION_DEBUG hid_critsect_debug = -{ - 0, 0, &hid_xinput_crit, - { &hid_critsect_debug.ProcessLocksList, &hid_critsect_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": hid_xinput_crit") } -}; -static CRITICAL_SECTION hid_xinput_crit = { &hid_critsect_debug, -1, 0, 0, 0, 0 }; - struct axis_info { LONG min; @@ -69,8 +60,6 @@ struct hid_platform_private { WCHAR *device_path; BOOL enabled; - CRITICAL_SECTION crit; - DWORD report_length; BYTE current_report; CHAR *reports[2]; @@ -195,9 +184,6 @@ static void build_private(struct hid_platform_private *private, PHIDP_PREPARSED_ private->device_path = HeapAlloc(GetProcessHeap(), 0, size); memcpy(private->device_path, path, size); private->enabled = TRUE; - - InitializeCriticalSection(&private->crit); - private->crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": JoystickImpl*->generic.base.crit"); } void HID_find_gamepads(xinput_controller *devices) @@ -208,20 +194,26 @@ void HID_find_gamepads(xinput_controller *devices) SP_DEVICE_INTERFACE_DETAIL_DATA_W *data; PHIDP_PREPARSED_DATA ppd; DWORD detail_size = MAX_PATH * sizeof(WCHAR); - HANDLE device = INVALID_HANDLE_VALUE; + HANDLE device; HIDP_CAPS Caps; - DWORD idx,didx; - int i; + DWORD idx; + int i, open_device_idx; idx = GetTickCount(); if ((idx - last_check) < 2000) return; + + EnterCriticalSection(&xinput_crit); + + if ((idx - last_check) < 2000) + { + LeaveCriticalSection(&xinput_crit); + return; + } last_check = idx; HidD_GetHidGuid(&hid_guid); - EnterCriticalSection(&hid_xinput_crit); - device_info_set = SetupDiGetClassDevsW(&hid_guid, NULL, NULL, DIGCF_DEVICEINTERFACE | DIGCF_PRESENT); data = HeapAlloc(GetProcessHeap(), 0 , sizeof(*data) + detail_size); @@ -230,9 +222,9 @@ void HID_find_gamepads(xinput_controller *devices) ZeroMemory(&interface_data, sizeof(interface_data)); interface_data.cbSize = sizeof(interface_data); - idx = didx = 0; + idx = 0; while (SetupDiEnumDeviceInterfaces(device_info_set, NULL, &hid_guid, idx++, - &interface_data) && didx < XUSER_MAX_COUNT) + &interface_data)) { static const WCHAR ig[] = {'I','G','_',0}; if (!SetupDiGetDeviceInterfaceDetailW(device_info_set, @@ -242,14 +234,24 @@ void HID_find_gamepads(xinput_controller *devices) if (!wcsstr(data->DevicePath, ig)) continue; + open_device_idx = -1; for (i = 0; i < XUSER_MAX_COUNT; i++) { struct hid_platform_private *private = devices[i].platform_private; - if (devices[i].connected && !wcscmp(data->DevicePath, private->device_path)) - break; + if (devices[i].connected) + { + if (!wcscmp(data->DevicePath, private->device_path)) + break; + } + else if(open_device_idx < 0) + open_device_idx = i; } if (i != XUSER_MAX_COUNT) + /* this device is already opened */ continue; + if (open_device_idx < 0) + /* no open device slots */ + break; device = CreateFileW(data->DevicePath, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0 ); if (device == INVALID_HANDLE_VALUE) continue; @@ -262,13 +264,12 @@ void HID_find_gamepads(xinput_controller *devices) Caps.Usage == 0x8 /* Multi-axis Controller */)) { struct hid_platform_private *private = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct hid_platform_private)); - if (VerifyGamepad(ppd, &(devices[didx].caps), private, &Caps)) + if (VerifyGamepad(ppd, &devices[open_device_idx].caps, private, &Caps)) { - TRACE("Found gamepad %i %s\n",didx, debugstr_w(data->DevicePath)); - devices[didx].connected = TRUE; + TRACE("Found gamepad %i %s\n", open_device_idx, debugstr_w(data->DevicePath)); build_private(private, ppd, &Caps, device, data->DevicePath); - devices[didx].platform_private = private; - didx++; + devices[open_device_idx].platform_private = private; + devices[open_device_idx].connected = TRUE; } else { @@ -282,41 +283,39 @@ void HID_find_gamepads(xinput_controller *devices) CloseHandle(device); HidD_FreePreparsedData(ppd); } - device = INVALID_HANDLE_VALUE; } HeapFree(GetProcessHeap(), 0, data); SetupDiDestroyDeviceInfoList(device_info_set); - LeaveCriticalSection(&hid_xinput_crit); - return; + LeaveCriticalSection(&xinput_crit); } static void remove_gamepad(xinput_controller *device) { + EnterCriticalSection(&device->crit); + if (device->connected) { struct hid_platform_private *private = device->platform_private; - EnterCriticalSection(&private->crit); + device->connected = FALSE; + CloseHandle(private->device); HeapFree(GetProcessHeap(), 0, private->reports[0]); HeapFree(GetProcessHeap(), 0, private->reports[1]); HeapFree(GetProcessHeap(), 0, private->device_path); HidD_FreePreparsedData(private->ppd); device->platform_private = NULL; - device->connected = FALSE; - LeaveCriticalSection(&private->crit); - DeleteCriticalSection(&private->crit); HeapFree(GetProcessHeap(), 0, private); } + + LeaveCriticalSection(&device->crit); } void HID_destroy_gamepads(xinput_controller *devices) { int i; - EnterCriticalSection(&hid_xinput_crit); for (i = 0; i < XUSER_MAX_COUNT; i++) remove_gamepad(&devices[i]); - LeaveCriticalSection(&hid_xinput_crit); } static SHORT scale_short(LONG value, const struct axis_info *axis) @@ -329,7 +328,7 @@ static BYTE scale_byte(LONG value, const struct axis_info *axis) return (((ULONGLONG)(value - axis->min)) * 0xff) / axis->range; } -void HID_update_state(xinput_controller* device) +void HID_update_state(xinput_controller *device, XINPUT_STATE *state) { struct hid_platform_private *private = device->platform_private; int i; @@ -343,107 +342,107 @@ void HID_update_state(xinput_controller* device) if (!private->enabled) return; - EnterCriticalSection(&private->crit); if (!HidD_GetInputReport(private->device, target_report, private->report_length)) { if (GetLastError() == ERROR_ACCESS_DENIED || GetLastError() == ERROR_INVALID_HANDLE) + { + EnterCriticalSection(&xinput_crit); remove_gamepad(device); + LeaveCriticalSection(&xinput_crit); + } else ERR("Failed to get Input Report (%x)\n", GetLastError()); - LeaveCriticalSection(&private->crit); return; } - if (memcmp(report, target_report, private->report_length) == 0) + if (memcmp(report, target_report, private->report_length) != 0) { - LeaveCriticalSection(&private->crit); - return; - } - - private->current_report = (private->current_report+1)%2; + private->current_report = (private->current_report+1)%2; - device->state.dwPacketNumber++; - button_length = ARRAY_SIZE(buttons); - HidP_GetUsages(HidP_Input, HID_USAGE_PAGE_BUTTON, 0, buttons, &button_length, private->ppd, target_report, private->report_length); + device->state.dwPacketNumber++; + button_length = ARRAY_SIZE(buttons); + HidP_GetUsages(HidP_Input, HID_USAGE_PAGE_BUTTON, 0, buttons, &button_length, private->ppd, target_report, private->report_length); - device->state.Gamepad.wButtons = 0; - for (i = 0; i < button_length; i++) - { - switch (buttons[i]) + device->state.Gamepad.wButtons = 0; + for (i = 0; i < button_length; i++) { - case 1: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_A; break; - case 2: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_B; break; - case 3: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_X; break; - case 4: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_Y; break; - case 5: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_LEFT_SHOULDER; break; - case 6: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_RIGHT_SHOULDER; break; - case 7: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_BACK; break; - case 8: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_START; break; - case 9: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_LEFT_THUMB; break; - case 10: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_RIGHT_THUMB; break; - case 11: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_GUIDE; break; + switch (buttons[i]) + { + case 1: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_A; break; + case 2: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_B; break; + case 3: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_X; break; + case 4: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_Y; break; + case 5: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_LEFT_SHOULDER; break; + case 6: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_RIGHT_SHOULDER; break; + case 7: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_BACK; break; + case 8: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_START; break; + case 9: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_LEFT_THUMB; break; + case 10: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_RIGHT_THUMB; break; + case 11: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_GUIDE; break; + } } - } - if(HidP_GetUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_HATSWITCH, &hat_value, - private->ppd, target_report, private->report_length) == HIDP_STATUS_SUCCESS) - { - switch(hat_value){ - /* 8 1 2 - * 7 0 3 - * 6 5 4 */ - case 0: - break; - case 1: - device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_UP; - break; - case 2: - device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_UP | XINPUT_GAMEPAD_DPAD_RIGHT; - break; - case 3: - device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_RIGHT; - break; - case 4: - device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_RIGHT | XINPUT_GAMEPAD_DPAD_DOWN; - break; - case 5: - device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_DOWN; - break; - case 6: - device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_DOWN | XINPUT_GAMEPAD_DPAD_LEFT; - break; - case 7: - device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_LEFT; - break; - case 8: - device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_LEFT | XINPUT_GAMEPAD_DPAD_UP; - break; + if(HidP_GetUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_HATSWITCH, &hat_value, + private->ppd, target_report, private->report_length) == HIDP_STATUS_SUCCESS) + { + switch(hat_value){ + /* 8 1 2 + * 7 0 3 + * 6 5 4 */ + case 0: + break; + case 1: + device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_UP; + break; + case 2: + device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_UP | XINPUT_GAMEPAD_DPAD_RIGHT; + break; + case 3: + device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_RIGHT; + break; + case 4: + device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_RIGHT | XINPUT_GAMEPAD_DPAD_DOWN; + break; + case 5: + device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_DOWN; + break; + case 6: + device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_DOWN | XINPUT_GAMEPAD_DPAD_LEFT; + break; + case 7: + device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_LEFT; + break; + case 8: + device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_LEFT | XINPUT_GAMEPAD_DPAD_UP; + break; + } } - } - if(HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_X, &value, - private->ppd, target_report, private->report_length) == HIDP_STATUS_SUCCESS) - device->state.Gamepad.sThumbLX = scale_short(value, &private->lx); + if(HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_X, &value, + private->ppd, target_report, private->report_length) == HIDP_STATUS_SUCCESS) + device->state.Gamepad.sThumbLX = scale_short(value, &private->lx); - if(HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Y, &value, - private->ppd, target_report, private->report_length) == HIDP_STATUS_SUCCESS) - device->state.Gamepad.sThumbLY = -scale_short(value, &private->ly) - 1; + if(HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Y, &value, + private->ppd, target_report, private->report_length) == HIDP_STATUS_SUCCESS) + device->state.Gamepad.sThumbLY = -scale_short(value, &private->ly) - 1; - if(HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_RX, &value, - private->ppd, target_report, private->report_length) == HIDP_STATUS_SUCCESS) - device->state.Gamepad.sThumbRX = scale_short(value, &private->rx); + if(HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_RX, &value, + private->ppd, target_report, private->report_length) == HIDP_STATUS_SUCCESS) + device->state.Gamepad.sThumbRX = scale_short(value, &private->rx); - if(HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_RY, &value, - private->ppd, target_report, private->report_length) == HIDP_STATUS_SUCCESS) - device->state.Gamepad.sThumbRY = -scale_short(value, &private->ry) - 1; + if(HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_RY, &value, + private->ppd, target_report, private->report_length) == HIDP_STATUS_SUCCESS) + device->state.Gamepad.sThumbRY = -scale_short(value, &private->ry) - 1; - if(HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_RZ, &value, - private->ppd, target_report, private->report_length) == HIDP_STATUS_SUCCESS) - device->state.Gamepad.bRightTrigger = scale_byte(value, &private->rtrigger); + if(HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_RZ, &value, + private->ppd, target_report, private->report_length) == HIDP_STATUS_SUCCESS) + device->state.Gamepad.bRightTrigger = scale_byte(value, &private->rtrigger); + + if(HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Z, &value, + private->ppd, target_report, private->report_length) == HIDP_STATUS_SUCCESS) + device->state.Gamepad.bLeftTrigger = scale_byte(value, &private->ltrigger); + } - if(HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Z, &value, - private->ppd, target_report, private->report_length) == HIDP_STATUS_SUCCESS) - device->state.Gamepad.bLeftTrigger = scale_byte(value, &private->ltrigger); - LeaveCriticalSection(&private->crit); + memcpy(state, &device->state, sizeof(*state)); } DWORD HID_set_state(xinput_controller* device, XINPUT_VIBRATION* state) @@ -474,9 +473,7 @@ DWORD HID_set_state(xinput_controller* device, XINPUT_VIBRATION* state) report.right = (BYTE)(state->wRightMotorSpeed / 256); memset(&report.pad2, 0, sizeof(report.pad2)); - EnterCriticalSection(&private->crit); rc = HidD_SetOutputReport(private->device, &report, sizeof(report)); - LeaveCriticalSection(&private->crit); if (rc) return ERROR_SUCCESS; return GetLastError(); @@ -492,7 +489,6 @@ void HID_enable(xinput_controller* device, BOOL enable) if (device->caps.Flags & XINPUT_CAPS_FFB_SUPPORTED) { - EnterCriticalSection(&private->crit); if (private->enabled && !enable) { XINPUT_VIBRATION state; @@ -504,7 +500,6 @@ void HID_enable(xinput_controller* device, BOOL enable) { HID_set_state(device, &device->vibration); } - LeaveCriticalSection(&private->crit); } private->enabled = enable; diff --git a/dlls/xinput1_3/xinput_main.c b/dlls/xinput1_3/xinput_main.c index a417fec7ad1..5c83e87fb13 100644 --- a/dlls/xinput1_3/xinput_main.c +++ b/dlls/xinput1_3/xinput_main.c @@ -34,7 +34,66 @@ WINE_DEFAULT_DEBUG_CHANNEL(xinput); -xinput_controller controllers[XUSER_MAX_COUNT]; +/* xinput_crit guards controllers array */ +static CRITICAL_SECTION_DEBUG xinput_critsect_debug = +{ + 0, 0, &xinput_crit, + { &xinput_critsect_debug.ProcessLocksList, &xinput_critsect_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": xinput_crit") } +}; +CRITICAL_SECTION xinput_crit = { &xinput_critsect_debug, -1, 0, 0, 0, 0 }; + +static CRITICAL_SECTION_DEBUG controller_critsect_debug[XUSER_MAX_COUNT] = +{ + { + 0, 0, &controllers[0].crit, + { &controller_critsect_debug[0].ProcessLocksList, &controller_critsect_debug[0].ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": controllers[0].crit") } + }, + { + 0, 0, &controllers[1].crit, + { &controller_critsect_debug[1].ProcessLocksList, &controller_critsect_debug[1].ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": controllers[1].crit") } + }, + { + 0, 0, &controllers[2].crit, + { &controller_critsect_debug[2].ProcessLocksList, &controller_critsect_debug[2].ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": controllers[2].crit") } + }, + { + 0, 0, &controllers[3].crit, + { &controller_critsect_debug[3].ProcessLocksList, &controller_critsect_debug[3].ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": controllers[3].crit") } + }, +}; + +xinput_controller controllers[XUSER_MAX_COUNT] = { + {{ &controller_critsect_debug[0], -1, 0, 0, 0, 0 }}, + {{ &controller_critsect_debug[1], -1, 0, 0, 0, 0 }}, + {{ &controller_critsect_debug[2], -1, 0, 0, 0, 0 }}, + {{ &controller_critsect_debug[3], -1, 0, 0, 0, 0 }}, +}; + +static BOOL verify_and_lock_device(xinput_controller *device) +{ + if (!device->connected) + return FALSE; + + EnterCriticalSection(&device->crit); + + if (!device->connected) + { + LeaveCriticalSection(&device->crit); + return FALSE; + } + + return TRUE; +} + +static void unlock_device(xinput_controller *device) +{ + LeaveCriticalSection(&device->crit); +} BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) { @@ -65,23 +124,30 @@ void WINAPI DECLSPEC_HOTPATCH XInputEnable(BOOL enable) for (index = 0; index < XUSER_MAX_COUNT; index ++) { - if (!controllers[index].connected) continue; + if (!verify_and_lock_device(&controllers[index])) continue; HID_enable(&controllers[index], enable); + unlock_device(&controllers[index]); } } DWORD WINAPI DECLSPEC_HOTPATCH XInputSetState(DWORD index, XINPUT_VIBRATION* vibration) { + DWORD ret; + TRACE("(index %u, vibration %p)\n", index, vibration); HID_find_gamepads(controllers); if (index >= XUSER_MAX_COUNT) return ERROR_BAD_ARGUMENTS; - if (!controllers[index].connected) + if (!verify_and_lock_device(&controllers[index])) return ERROR_DEVICE_NOT_CONNECTED; - return HID_set_state(&controllers[index], vibration); + ret = HID_set_state(&controllers[index], vibration); + + unlock_device(&controllers[index]); + + return ret; } /* Some versions of SteamOverlayRenderer hot-patch XInputGetStateEx() and call @@ -95,11 +161,19 @@ static DWORD xinput_get_state(DWORD index, XINPUT_STATE *state) if (index >= XUSER_MAX_COUNT) return ERROR_BAD_ARGUMENTS; + if (!verify_and_lock_device(&controllers[index])) + return ERROR_DEVICE_NOT_CONNECTED; + + HID_update_state(&controllers[index], state); + if (!controllers[index].connected) + { + /* update_state may have disconnected the controller */ + unlock_device(&controllers[index]); return ERROR_DEVICE_NOT_CONNECTED; + } - HID_update_state(&controllers[index]); - memcpy(state, &controllers[index].state, sizeof(XINPUT_STATE)); + unlock_device(&controllers[index]); return ERROR_SUCCESS; } @@ -151,13 +225,20 @@ DWORD WINAPI DECLSPEC_HOTPATCH XInputGetCapabilities(DWORD index, DWORD flags, X if (index >= XUSER_MAX_COUNT) return ERROR_BAD_ARGUMENTS; - if (!controllers[index].connected) + + if (!verify_and_lock_device(&controllers[index])) return ERROR_DEVICE_NOT_CONNECTED; + if (flags & XINPUT_FLAG_GAMEPAD && controllers[index].caps.SubType != XINPUT_DEVSUBTYPE_GAMEPAD) + { + unlock_device(&controllers[index]); return ERROR_DEVICE_NOT_CONNECTED; + } memcpy(capabilities, &controllers[index].caps, sizeof(*capabilities)); + unlock_device(&controllers[index]); + return ERROR_SUCCESS; } diff --git a/dlls/xinput1_3/xinput_private.h b/dlls/xinput1_3/xinput_private.h index d6e0e9614ee..74cf318a6fb 100644 --- a/dlls/xinput1_3/xinput_private.h +++ b/dlls/xinput1_3/xinput_private.h @@ -19,16 +19,19 @@ typedef struct _xinput_controller { - BOOL connected; + CRITICAL_SECTION crit; + BOOL connected; /* only TRUE when device is valid; may be used without holding crit */ XINPUT_CAPABILITIES caps; void *platform_private; XINPUT_STATE state; XINPUT_VIBRATION vibration; } xinput_controller; +CRITICAL_SECTION xinput_crit; +xinput_controller controllers[XUSER_MAX_COUNT]; void HID_find_gamepads(xinput_controller *devices) DECLSPEC_HIDDEN; void HID_destroy_gamepads(xinput_controller *devices) DECLSPEC_HIDDEN; -void HID_update_state(xinput_controller* device) DECLSPEC_HIDDEN; +void HID_update_state(xinput_controller* device, XINPUT_STATE *state) DECLSPEC_HIDDEN; DWORD HID_set_state(xinput_controller* device, XINPUT_VIBRATION* state) DECLSPEC_HIDDEN; void HID_enable(xinput_controller* device, BOOL enable) DECLSPEC_HIDDEN; -- 2.23.0

3 2

[PATCH v3 06/12] kernel32: Implement GetUserDefaultGeoName, make GetUserGeoID default to 39070.
by João Diogo Ferreira 23 Oct '19

23 Oct '19

V3: Don't allocate more memory than necessary. V2: Oops, previous version was in-dev. Changed order of operations and removed one stray trace I forgot was there. ORIGINAL PATCH NOTES: I also changed the default return value of GetUserGeoID() to make it more compliant with the new APIs. Signed-off-by: João Diogo Craveiro Ferreira <devilj(a)outlook.pt> --- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/locale.c | 138 +++++++++++++++++++++++++++++++++--- include/winnls.h | 1 + 3 files changed, 131 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index beebea9c1c..9a8e33eb9a 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -869,6 +869,7 @@ # @ stub GetUILanguageInfo @ stdcall -arch=x86_64 GetUmsCompletionListEvent(ptr ptr) # @ stub -arch=x86_64 GetUmsSystemThreadInformation +@ stdcall GetUserDefaultGeoName(ptr long) @ stdcall -import GetUserDefaultLCID() @ stdcall -import GetUserDefaultLangID() @ stdcall -import GetUserDefaultLocaleName(ptr long) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 4957e8df5e..87b4cf16bd 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -4090,25 +4090,46 @@ static inline const struct geoinfo_t *get_geoinfoptr_by_name(const WCHAR *name) /****************************************************************************** * GetUserGeoID (KERNEL32.@) + * + * Retrieves the ID of the user's geographic nation or region. + * + * PARAMS + * GeoClass [I] One of GEOCLASS_NATION or GEOCLASS_REGION (SYSGEOCLASS enum from "winnls.h"). + * + * RETURNS + * SUCCESS: The ID of the specified geographic class. + * FAILURE: GEOID_NOT_AVAILABLE. + * + * NOTES + * This function only fails if the geoclass specified is invalid; + * otherwise, a valid GeoID is always returned. */ -GEOID WINAPI GetUserGeoID( GEOCLASS GeoClass ) +GEOID WINAPI GetUserGeoID(GEOCLASS GeoClass) { - GEOID ret = GEOID_NOT_AVAILABLE; + GEOID ret = 39070; /* World */ static const WCHAR nationW[] = {'N','a','t','i','o','n',0}; static const WCHAR regionW[] = {'R','e','g','i','o','n',0}; WCHAR bufferW[40], *end; - DWORD count; + DWORD count = sizeof(bufferW); HANDLE hkey; UNICODE_STRING keyW; const KEY_VALUE_PARTIAL_INFORMATION *info = (KEY_VALUE_PARTIAL_INFORMATION *)bufferW; - count = sizeof(bufferW); if (GeoClass == GEOCLASS_NATION) + { + TRACE("(GEOCLASS_NATION)\n"); RtlInitUnicodeString( &keyW, nationW ); + } else if (GeoClass == GEOCLASS_REGION) + { + TRACE("(GEOCLASS_REGION)\n"); RtlInitUnicodeString( &keyW, regionW ); + } else - return ret; + { + WARN("Unknown geoclass %d\n", GeoClass); + return GEOID_NOT_AVAILABLE; + } if (!(hkey = create_geo_regkey())) return ret; @@ -4121,13 +4142,112 @@ GEOID WINAPI GetUserGeoID( GEOCLASS GeoClass ) } /****************************************************************************** - * set_geo_reg + * GetUserDefaultGeoName (KERNEL32.@) + * + * Retrieves the name of the user's geographic location. * - * Does the heavy lifting for SetUserGeoName() and SetUserGeoID(). + * This name is a two-letter ISO 3166 country code + * or a three-digit UN M.49 code for anything other than countries (e.g. continents). + * + * If geoNameCount is 0, this function will return the minimum length + * required for a buffer to hold the name. + * + * PARAMS + * geoName [O] Pointer to a buffer to hold the name. + * geoNameCount [I] Length of the buffer, including null, measured in WCHARs. * - * The return value and last error set here can (and probably should) - * be returned to the callers of those two functions. + * RETURNS + * SUCCESS: Number of WCHARs written to the buffer -OR- + * minimum length for the buffer, if geoNameCount was 0. + * FAILURE: Zero. Call GetLastError() to determine the cause. + * + * NOTES: + * On failure, GetLastError() will return one of the following values: + * - ERROR_INVALID_PARAMETER: one of the parameters was invalid. + * - ERROR_INSUFFICIENT_BUFFER: the specified buffer was too small to hold the name. + * - ERROR_BADDB: an internal error occured and the name could not be read. + * - ERROR_NOT_ENOUGH_MEMORY: (Wine implementation) not enough memory to execute successfuly. */ +int WINAPI GetUserDefaultGeoName(LPWSTR geoName, int geoNameCount) +{ + int ret = 0, size = 0; + DWORD count; + static const WCHAR nameW[] = {'N','a','m','e',0}; + KEY_VALUE_PARTIAL_INFORMATION kvi; + UNICODE_STRING keyname; + HANDLE hkey; + + TRACE("(%p, %d)\n", geoName, geoNameCount); + + if (geoNameCount < 0 || (!geoName && geoNameCount)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + + if (!(hkey = create_geo_regkey())) + { + SetLastError(ERROR_BADDB); + return 0; + } + + RtlInitUnicodeString(&keyname, nameW); + + if (NtQueryValueKey(hkey, &keyname, KeyValuePartialInformation, &kvi, sizeof(kvi), &count) + == STATUS_BUFFER_OVERFLOW && kvi.DataLength) + size = kvi.DataLength / sizeof(WCHAR); + else + SetLastError(ERROR_BADDB); + + if (size) + { + if (!geoNameCount) + ret = size; + else if (geoNameCount < size) + SetLastError(ERROR_INSUFFICIENT_BUFFER); + else if (geoNameCount >= size) + { + size_t kvi_size = 0; + KEY_VALUE_PARTIAL_INFORMATION *kvi = NULL; + + kvi_size = sizeof(KEY_VALUE_PARTIAL_INFORMATION) + (size * sizeof(WCHAR)); + if (!(kvi = HeapAlloc(GetProcessHeap(), 0, kvi_size))) + { + ERR("Couldn't allocate memory for KeyValuePartialInformation. Bailing.\n"); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + } + else + { + NTSTATUS status = NtQueryValueKey(hkey, &keyname, KeyValuePartialInformation, + kvi, kvi_size, &count); + if (status == STATUS_SUCCESS) + { + ret = size; + memcpy(geoName, kvi->Data, kvi->DataLength); + } + else + { + ERR("Unexpected error retrieving geoname: status=0x%x, kvi->DataLength=%u, kvi->Data=%s\n", + status, kvi->DataLength, wine_dbgstr_w((WCHAR*)kvi->Data)); + SetLastError(ERROR_BADDB); + } + HeapFree(GetProcessHeap(), 0, kvi); + } + } + } + + NtClose(hkey); + return ret; +} + +/****************************************************************************** +* set_geo_reg +* +* Does the heavy lifting for SetUserGeoName() and SetUserGeoID(). +* +* The return value and last error set here can (and probably should) +* be returned to the callers of those two functions. +*/ static int set_geo_reg(const struct geoinfo_t *geoinfo) { static const WCHAR nationW[] = {'N','a','t','i','o','n',0}; diff --git a/include/winnls.h b/include/winnls.h index 3aeb47c9e4..059a459153 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -935,6 +935,7 @@ WINBASEAPI INT WINAPI GetTimeFormatA(LCID,DWORD,const SYSTEMTIME*,LPCSTR WINBASEAPI INT WINAPI GetTimeFormatEx(LPCWSTR,DWORD,const SYSTEMTIME*,LPCWSTR,LPWSTR,INT); WINBASEAPI INT WINAPI GetTimeFormatW(LCID,DWORD,const SYSTEMTIME*,LPCWSTR,LPWSTR,INT); #define GetTimeFormat WINELIB_NAME_AW(GetTimeFormat) +WINBASEAPI int WINAPI GetUserDefaultGeoName(LPWSTR,int); WINBASEAPI LANGID WINAPI GetUserDefaultLangID(void); WINBASEAPI LCID WINAPI GetUserDefaultLCID(void); WINBASEAPI INT WINAPI GetUserDefaultLocaleName(LPWSTR,int); -- 2.23.0

1 0

[PATCH v2 07/12] kernel32: Autoinitialize geographic values when launching any program.
by João Diogo Ferreira 23 Oct '19

23 Oct '19

V2: Add more traces to make it obvious what is calling SetUserGeoName. FIXES BUG: 46196 https://bugs.winehq.org/show_bug.cgi?id=46196 Autodetects the correct GeoName and GeoID based on Wine's current locale. This should be more than satisfactory for almost everyone. That being said, it may come in handy to bypass this in some scenarios: * When testing geo behaviour without wanting to change the languague; * Users who use a foreign language but want Wine and programs knows the actual country they live in; * Users in countries not represented by Linux or Wine locales. The last case is, I think, particularly important, as that's where this patch could cause real loss of functionality. To opt-out: * Set HKCU\\Control Panel\\International\\Geo\\WineDisableAutoConfig to 1. * Type is REG_DWORD. * This key is created automatically if it doesn't exist yet. Signed-off-by: João Diogo Craveiro Ferreira <devilj(a)outlook.pt> --- dlls/kernel32/kernel_main.c | 3 +++ dlls/kernel32/kernel_private.h | 1 + dlls/kernel32/locale.c | 44 ++++++++++++++++++++++++++++++++++ 3 files changed, 48 insertions(+) diff --git a/dlls/kernel32/kernel_main.c b/dlls/kernel32/kernel_main.c index dfa66f0295..206972c210 100644 --- a/dlls/kernel32/kernel_main.c +++ b/dlls/kernel32/kernel_main.c @@ -88,6 +88,9 @@ static BOOL process_attach( HMODULE module ) /* Setup registry locale information */ LOCALE_InitRegistry(); + /* Setup registry geographic information */ + LOCALE_InitGeo(); + /* Setup registry timezone information */ TIMEZONE_InitRegistry(); diff --git a/dlls/kernel32/kernel_private.h b/dlls/kernel32/kernel_private.h index af85bee84d..6b93add056 100644 --- a/dlls/kernel32/kernel_private.h +++ b/dlls/kernel32/kernel_private.h @@ -76,6 +76,7 @@ extern void COMPUTERNAME_Init(void) DECLSPEC_HIDDEN; /* locale.c */ extern void LOCALE_Init(void) DECLSPEC_HIDDEN; extern void LOCALE_InitRegistry(void) DECLSPEC_HIDDEN; +extern void LOCALE_InitGeo(void) DECLSPEC_HIDDEN; /* time.c */ extern void TIMEZONE_InitRegistry(void) DECLSPEC_HIDDEN; diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index eb8ad14bcd..2e785e0361 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -877,6 +877,50 @@ void LOCALE_InitRegistry(void) NtClose( hkey ); } +/* Initialize the geo values in the registry. */ +void LOCALE_InitGeo(void) +{ + int enabled = 1; + HANDLE hkey = create_geo_regkey(); + + if (hkey) + { + WCHAR value[] = {'W','i','n','e','D','i','s','a','b','l','e','A','u','t','o','C','o','n','f','i','g',0}; + UNICODE_STRING uvalue; + KEY_VALUE_PARTIAL_INFORMATION kvi; + DWORD count; + NTSTATUS status; + RtlInitUnicodeString(&uvalue, value); + + status = NtQueryValueKey(hkey, &uvalue, KeyValuePartialInformation, &kvi, sizeof(kvi), &count); + if (status == STATUS_SUCCESS) + enabled = !kvi.Data[0]; + else if (status == STATUS_OBJECT_NAME_NOT_FOUND) + { + DWORD d = 0; + NtSetValueKey(hkey, &uvalue, 0, REG_DWORD, &d, sizeof(d)); + } + + NtClose(hkey); + } + + if (enabled) + { + WCHAR name[4]; + static WCHAR fallback[] = {'0','0','1',0}; /* World */ + int result; + + TRACE("Setting up geo values...\n"); + if ((result = GetLocaleInfoW(GetUserDefaultLCID(), LOCALE_SISO3166CTRYNAME, name, ARRAY_SIZE(name)))) + result = SetUserGeoName(name); + + if (!result) + SetUserGeoName(fallback); + TRACE("Finished setting geo values.\n"); + } + else + TRACE("Skipping: disabled by user.\n"); +} #ifdef __APPLE__ /*********************************************************************** -- 2.23.0

1 0

[PATCH v2 06/12] kernel32: Implement GetUserDefaultGeoName, make GetUserGeoID default to 39070.
by João Diogo Ferreira 23 Oct '19

23 Oct '19

V2: Oops, previous version was in-dev. Changed order of operations and removed one stray trace I forgot was there. ORIGINAL PATCH NOTES: I also changed the default return value of GetUserGeoID() to make it more compliant with the new APIs. Signed-off-by: João Diogo Craveiro Ferreira <devilj(a)outlook.pt> --- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/locale.c | 138 +++++++++++++++++++++++++++++++++--- include/winnls.h | 1 + 3 files changed, 131 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index beebea9c1c..9a8e33eb9a 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -869,6 +869,7 @@ # @ stub GetUILanguageInfo @ stdcall -arch=x86_64 GetUmsCompletionListEvent(ptr ptr) # @ stub -arch=x86_64 GetUmsSystemThreadInformation +@ stdcall GetUserDefaultGeoName(ptr long) @ stdcall -import GetUserDefaultLCID() @ stdcall -import GetUserDefaultLangID() @ stdcall -import GetUserDefaultLocaleName(ptr long) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 4957e8df5e..eb8ad14bcd 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -4090,25 +4090,46 @@ static inline const struct geoinfo_t *get_geoinfoptr_by_name(const WCHAR *name) /****************************************************************************** * GetUserGeoID (KERNEL32.@) + * + * Retrieves the ID of the user's geographic nation or region. + * + * PARAMS + * GeoClass [I] One of GEOCLASS_NATION or GEOCLASS_REGION (SYSGEOCLASS enum from "winnls.h"). + * + * RETURNS + * SUCCESS: The ID of the specified geographic class. + * FAILURE: GEOID_NOT_AVAILABLE. + * + * NOTES + * This function only fails if the geoclass specified is invalid; + * otherwise, a valid GeoID is always returned. */ -GEOID WINAPI GetUserGeoID( GEOCLASS GeoClass ) +GEOID WINAPI GetUserGeoID(GEOCLASS GeoClass) { - GEOID ret = GEOID_NOT_AVAILABLE; + GEOID ret = 39070; /* World */ static const WCHAR nationW[] = {'N','a','t','i','o','n',0}; static const WCHAR regionW[] = {'R','e','g','i','o','n',0}; WCHAR bufferW[40], *end; - DWORD count; + DWORD count = sizeof(bufferW); HANDLE hkey; UNICODE_STRING keyW; const KEY_VALUE_PARTIAL_INFORMATION *info = (KEY_VALUE_PARTIAL_INFORMATION *)bufferW; - count = sizeof(bufferW); if (GeoClass == GEOCLASS_NATION) + { + TRACE("(GEOCLASS_NATION)\n"); RtlInitUnicodeString( &keyW, nationW ); + } else if (GeoClass == GEOCLASS_REGION) + { + TRACE("(GEOCLASS_REGION)\n"); RtlInitUnicodeString( &keyW, regionW ); + } else - return ret; + { + WARN("Unknown geoclass %d\n", GeoClass); + return GEOID_NOT_AVAILABLE; + } if (!(hkey = create_geo_regkey())) return ret; @@ -4121,13 +4142,112 @@ GEOID WINAPI GetUserGeoID( GEOCLASS GeoClass ) } /****************************************************************************** - * set_geo_reg + * GetUserDefaultGeoName (KERNEL32.@) + * + * Retrieves the name of the user's geographic location. * - * Does the heavy lifting for SetUserGeoName() and SetUserGeoID(). + * This name is a two-letter ISO 3166 country code + * or a three-digit UN M.49 code for anything other than countries (e.g. continents). + * + * If geoNameCount is 0, this function will return the minimum length + * required for a buffer to hold the name. + * + * PARAMS + * geoName [O] Pointer to a buffer to hold the name. + * geoNameCount [I] Length of the buffer, including null, measured in WCHARs. * - * The return value and last error set here can (and probably should) - * be returned to the callers of those two functions. + * RETURNS + * SUCCESS: Number of WCHARs written to the buffer -OR- + * minimum length for the buffer, if geoNameCount was 0. + * FAILURE: Zero. Call GetLastError() to determine the cause. + * + * NOTES: + * On failure, GetLastError() will return one of the following values: + * - ERROR_INVALID_PARAMETER: one of the parameters was invalid. + * - ERROR_INSUFFICIENT_BUFFER: the specified buffer was too small to hold the name. + * - ERROR_BADDB: an internal error occured and the name could not be read. + * - ERROR_NOT_ENOUGH_MEMORY: (Wine implementation) not enough memory to execute successfuly. */ +int WINAPI GetUserDefaultGeoName(LPWSTR geoName, int geoNameCount) +{ + int ret = 0, size = 0; + DWORD count; + static const WCHAR nameW[] = {'N','a','m','e',0}; + KEY_VALUE_PARTIAL_INFORMATION kvi; + UNICODE_STRING keyname; + HANDLE hkey; + + TRACE("(%p, %d)\n", geoName, geoNameCount); + + if (geoNameCount < 0 || (!geoName && geoNameCount)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + + if (!(hkey = create_geo_regkey())) + { + SetLastError(ERROR_BADDB); + return 0; + } + + RtlInitUnicodeString(&keyname, nameW); + + if (NtQueryValueKey(hkey, &keyname, KeyValuePartialInformation, &kvi, sizeof(kvi), &count) + == STATUS_BUFFER_OVERFLOW && kvi.DataLength) + size = kvi.DataLength / sizeof(WCHAR); + else + SetLastError(ERROR_BADDB); + + if (size) + { + if (!geoNameCount) + ret = size; + else if (geoNameCount < size) + SetLastError(ERROR_INSUFFICIENT_BUFFER); + else if (geoNameCount >= size) + { + size_t kvi_size = 0; + KEY_VALUE_PARTIAL_INFORMATION *kvi = NULL; + + kvi_size = sizeof(KEY_VALUE_PARTIAL_INFORMATION) + (geoNameCount * sizeof(WCHAR)); + if (!(kvi = HeapAlloc(GetProcessHeap(), 0, kvi_size))) + { + ERR("Couldn't allocate memory for KeyValuePartialInformation. Bailing.\n"); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + } + else + { + NTSTATUS status = NtQueryValueKey(hkey, &keyname, KeyValuePartialInformation, + kvi, kvi_size, &count); + if (status == STATUS_SUCCESS) + { + ret = size; + memcpy(geoName, kvi->Data, kvi->DataLength); + } + else + { + ERR("Unexpected error retrieving geoname: status=0x%x, kvi->DataLength=%u, kvi->Data=%s\n", + status, kvi->DataLength, wine_dbgstr_w((WCHAR*)kvi->Data)); + SetLastError(ERROR_BADDB); + } + HeapFree(GetProcessHeap(), 0, kvi); + } + } + } + + NtClose(hkey); + return ret; +} + +/****************************************************************************** +* set_geo_reg +* +* Does the heavy lifting for SetUserGeoName() and SetUserGeoID(). +* +* The return value and last error set here can (and probably should) +* be returned to the callers of those two functions. +*/ static int set_geo_reg(const struct geoinfo_t *geoinfo) { static const WCHAR nationW[] = {'N','a','t','i','o','n',0}; diff --git a/include/winnls.h b/include/winnls.h index 3aeb47c9e4..059a459153 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -935,6 +935,7 @@ WINBASEAPI INT WINAPI GetTimeFormatA(LCID,DWORD,const SYSTEMTIME*,LPCSTR WINBASEAPI INT WINAPI GetTimeFormatEx(LPCWSTR,DWORD,const SYSTEMTIME*,LPCWSTR,LPWSTR,INT); WINBASEAPI INT WINAPI GetTimeFormatW(LCID,DWORD,const SYSTEMTIME*,LPCWSTR,LPWSTR,INT); #define GetTimeFormat WINELIB_NAME_AW(GetTimeFormat) +WINBASEAPI int WINAPI GetUserDefaultGeoName(LPWSTR,int); WINBASEAPI LANGID WINAPI GetUserDefaultLangID(void); WINBASEAPI LCID WINAPI GetUserDefaultLCID(void); WINBASEAPI INT WINAPI GetUserDefaultLocaleName(LPWSTR,int); -- 2.23.0

1 0

[PATCH 4/4] xinput: Get rid of redundant connected boolean
by Andrew Eikum 23 Oct '19

23 Oct '19

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/xinput1_3/hid.c | 8 +++----- dlls/xinput1_3/xinput_main.c | 12 ++++++------ dlls/xinput1_3/xinput_private.h | 3 +-- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/dlls/xinput1_3/hid.c b/dlls/xinput1_3/hid.c index c186c116f41..bb719ed56cc 100644 --- a/dlls/xinput1_3/hid.c +++ b/dlls/xinput1_3/hid.c @@ -199,7 +199,6 @@ static BOOL init_controller(xinput_controller *controller, PHIDP_PREPARSED_DATA memset(&controller->vibration, 0, sizeof(controller->vibration)); controller->platform_private = private; - controller->connected = TRUE; return TRUE; } @@ -256,7 +255,7 @@ void HID_find_gamepads(xinput_controller *devices) for (i = 0; i < XUSER_MAX_COUNT; i++) { struct hid_platform_private *private = devices[i].platform_private; - if (devices[i].connected) + if (devices[i].platform_private) { if (!wcscmp(data->DevicePath, private->device_path)) break; @@ -302,18 +301,17 @@ static void remove_gamepad(xinput_controller *device) { EnterCriticalSection(&device->crit); - if (device->connected) + if (device->platform_private) { struct hid_platform_private *private = device->platform_private; - device->connected = FALSE; + device->platform_private = NULL; CloseHandle(private->device); HeapFree(GetProcessHeap(), 0, private->reports[0]); HeapFree(GetProcessHeap(), 0, private->reports[1]); HeapFree(GetProcessHeap(), 0, private->device_path); HidD_FreePreparsedData(private->ppd); - device->platform_private = NULL; HeapFree(GetProcessHeap(), 0, private); } diff --git a/dlls/xinput1_3/xinput_main.c b/dlls/xinput1_3/xinput_main.c index 5c83e87fb13..5485ae8d2d1 100644 --- a/dlls/xinput1_3/xinput_main.c +++ b/dlls/xinput1_3/xinput_main.c @@ -76,12 +76,12 @@ xinput_controller controllers[XUSER_MAX_COUNT] = { static BOOL verify_and_lock_device(xinput_controller *device) { - if (!device->connected) + if (!device->platform_private) return FALSE; EnterCriticalSection(&device->crit); - if (!device->connected) + if (!device->platform_private) { LeaveCriticalSection(&device->crit); return FALSE; @@ -166,7 +166,7 @@ static DWORD xinput_get_state(DWORD index, XINPUT_STATE *state) HID_update_state(&controllers[index], state); - if (!controllers[index].connected) + if (!controllers[index].platform_private) { /* update_state may have disconnected the controller */ unlock_device(&controllers[index]); @@ -211,7 +211,7 @@ DWORD WINAPI DECLSPEC_HOTPATCH XInputGetKeystroke(DWORD index, DWORD reserved, P if (index >= XUSER_MAX_COUNT) return ERROR_BAD_ARGUMENTS; - if (!controllers[index].connected) + if (!controllers[index].platform_private) return ERROR_DEVICE_NOT_CONNECTED; return ERROR_NOT_SUPPORTED; @@ -248,7 +248,7 @@ DWORD WINAPI DECLSPEC_HOTPATCH XInputGetDSoundAudioDeviceGuids(DWORD index, GUID if (index >= XUSER_MAX_COUNT) return ERROR_BAD_ARGUMENTS; - if (!controllers[index].connected) + if (!controllers[index].platform_private) return ERROR_DEVICE_NOT_CONNECTED; return ERROR_NOT_SUPPORTED; @@ -263,7 +263,7 @@ DWORD WINAPI DECLSPEC_HOTPATCH XInputGetBatteryInformation(DWORD index, BYTE typ if (index >= XUSER_MAX_COUNT) return ERROR_BAD_ARGUMENTS; - if (!controllers[index].connected) + if (!controllers[index].platform_private) return ERROR_DEVICE_NOT_CONNECTED; return ERROR_NOT_SUPPORTED; diff --git a/dlls/xinput1_3/xinput_private.h b/dlls/xinput1_3/xinput_private.h index 74cf318a6fb..f3456cd8e7c 100644 --- a/dlls/xinput1_3/xinput_private.h +++ b/dlls/xinput1_3/xinput_private.h @@ -20,9 +20,8 @@ typedef struct _xinput_controller { CRITICAL_SECTION crit; - BOOL connected; /* only TRUE when device is valid; may be used without holding crit */ XINPUT_CAPABILITIES caps; - void *platform_private; + void *platform_private; /* non-NULL when device is valid; validity may be read without holding crit */ XINPUT_STATE state; XINPUT_VIBRATION vibration; } xinput_controller; -- 2.23.0

2 1

[PATCH 3/4] xinput: Clear instance data when a controller is hotplugged
by Andrew Eikum 23 Oct '19

23 Oct '19

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/xinput1_3/hid.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/xinput1_3/hid.c b/dlls/xinput1_3/hid.c index 5baf3b2b535..c186c116f41 100644 --- a/dlls/xinput1_3/hid.c +++ b/dlls/xinput1_3/hid.c @@ -195,6 +195,9 @@ static BOOL init_controller(xinput_controller *controller, PHIDP_PREPARSED_DATA memcpy(private->device_path, device_path, size); private->enabled = TRUE; + memset(&controller->state, 0, sizeof(controller->state)); + memset(&controller->vibration, 0, sizeof(controller->vibration)); + controller->platform_private = private; controller->connected = TRUE; -- 2.23.0

2 1

[PATCH 2/4] xinput: Consolidate new device setup
by Andrew Eikum 23 Oct '19

23 Oct '19

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/xinput1_3/hid.c | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/dlls/xinput1_3/hid.c b/dlls/xinput1_3/hid.c index 477d5304cac..5baf3b2b535 100644 --- a/dlls/xinput1_3/hid.c +++ b/dlls/xinput1_3/hid.c @@ -171,19 +171,34 @@ static BOOL VerifyGamepad(PHIDP_PREPARSED_DATA ppd, XINPUT_CAPABILITIES *xinput_ return TRUE; } -static void build_private(struct hid_platform_private *private, PHIDP_PREPARSED_DATA ppd, HIDP_CAPS *caps, HANDLE device, WCHAR *path) +static BOOL init_controller(xinput_controller *controller, PHIDP_PREPARSED_DATA ppd, HIDP_CAPS *caps, HANDLE device, WCHAR *device_path) { size_t size; + struct hid_platform_private *private = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct hid_platform_private)); + + if (!VerifyGamepad(ppd, &controller->caps, private, caps)) + { + HeapFree(GetProcessHeap(), 0, private); + return FALSE; + } + + TRACE("Found gamepad %s\n", debugstr_w(device_path)); + private->ppd = ppd; private->device = device; private->report_length = caps->InputReportByteLength + 1; private->current_report = 0; private->reports[0] = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, private->report_length); private->reports[1] = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, private->report_length); - size = (lstrlenW(path) + 1) * sizeof(WCHAR); + size = (lstrlenW(device_path) + 1) * sizeof(WCHAR); private->device_path = HeapAlloc(GetProcessHeap(), 0, size); - memcpy(private->device_path, path, size); + memcpy(private->device_path, device_path, size); private->enabled = TRUE; + + controller->platform_private = private; + controller->connected = TRUE; + + return TRUE; } void HID_find_gamepads(xinput_controller *devices) @@ -263,19 +278,10 @@ void HID_find_gamepads(xinput_controller *devices) Caps.Usage == HID_USAGE_GENERIC_JOYSTICK || Caps.Usage == 0x8 /* Multi-axis Controller */)) { - struct hid_platform_private *private = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct hid_platform_private)); - if (VerifyGamepad(ppd, &devices[open_device_idx].caps, private, &Caps)) - { - TRACE("Found gamepad %i %s\n", open_device_idx, debugstr_w(data->DevicePath)); - build_private(private, ppd, &Caps, device, data->DevicePath); - devices[open_device_idx].platform_private = private; - devices[open_device_idx].connected = TRUE; - } - else + if(!init_controller(&devices[open_device_idx], ppd, &Caps, device, data->DevicePath)) { CloseHandle(device); HidD_FreePreparsedData(ppd); - HeapFree(GetProcessHeap(), 0, private); } } else -- 2.23.0

2 1

[PATCH 12/12] kernel32/tests: Add tests for the GeoName API and GetUserGeoID().
by João Diogo Ferreira 23 Oct '19

23 Oct '19

Included tests for: * GetGeoInfoEx; * EnumSystemGeoNames; * GetUserGeoNames; * GetUserGeoID. Changed test_GetGeoInfo to check new GEOTYPEs. Didn't include SetUserGeoID() and SetUserGeoName() since normal programs aren't supposed to call those functions. Signed-off-by: João Diogo Craveiro Ferreira <devilj(a)outlook.pt> --- dlls/kernel32/tests/locale.c | 280 +++++++++++++++++++++++++++++++++++ 1 file changed, 280 insertions(+) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 81e74531ea..051045a414 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -97,7 +97,9 @@ static INT (WINAPI *pCompareStringEx)(LPCWSTR, DWORD, LPCWSTR, INT, LPCWSTR, INT LPNLSVERSIONINFO, LPVOID, LPARAM); static INT (WINAPI *pGetGeoInfoA)(GEOID, GEOTYPE, LPSTR, INT, LANGID); static INT (WINAPI *pGetGeoInfoW)(GEOID, GEOTYPE, LPWSTR, INT, LANGID); +static int (WINAPI *pGetGeoInfoEx)(PWSTR, GEOTYPE, PWSTR, int); static BOOL (WINAPI *pEnumSystemGeoID)(GEOCLASS, GEOID, GEO_ENUMPROC); +static BOOL (WINAPI *pEnumSystemGeoNames)(GEOCLASS, GEO_ENUMNAMEPROC, LPARAM); static BOOL (WINAPI *pGetSystemPreferredUILanguages)(DWORD, ULONG*, WCHAR*, ULONG*); static BOOL (WINAPI *pGetThreadPreferredUILanguages)(DWORD, ULONG*, WCHAR*, ULONG*); static BOOL (WINAPI *pGetUserPreferredUILanguages)(DWORD, ULONG*, WCHAR*, ULONG*); @@ -108,6 +110,8 @@ static LANGID (WINAPI *pSetThreadUILanguage)(LANGID); static LANGID (WINAPI *pGetThreadUILanguage)(VOID); static INT (WINAPI *pNormalizeString)(NORM_FORM, LPCWSTR, INT, LPWSTR, INT); static INT (WINAPI *pFindStringOrdinal)(DWORD, LPCWSTR lpStringSource, INT, LPCWSTR, INT, BOOL); +static int (WINAPI *pGetUserDefaultGeoName)(LPWSTR, int); +static BOOL (WINAPI *pSetUserGeoName)(PWSTR); static void InitFunctionPointers(void) { @@ -135,7 +139,9 @@ static void InitFunctionPointers(void) X(CompareStringEx); X(GetGeoInfoA); X(GetGeoInfoW); + X(GetGeoInfoEx); X(EnumSystemGeoID); + X(EnumSystemGeoNames); X(GetSystemPreferredUILanguages); X(GetThreadPreferredUILanguages); X(GetUserPreferredUILanguages); @@ -145,6 +151,8 @@ static void InitFunctionPointers(void) X(GetThreadUILanguage); X(NormalizeString); X(FindStringOrdinal); + X(GetUserDefaultGeoName); + X(SetUserGeoName); mod = GetModuleHandleA("ntdll"); X(RtlUpcaseUnicodeChar); @@ -4745,6 +4753,106 @@ static void test_CompareStringOrdinal(void) } } +static void test_GetUserGeoID(void) +{ + GEOID id; + + if (pGetUserDefaultGeoName) + { + ok(GEOID_NOT_AVAILABLE != GetUserGeoID(GEOCLASS_NATION), + "GEOCLASS_NATION: should return GEOID_NOT_AVAILABLE when GeoName API is available.\n"); + ok(GEOID_NOT_AVAILABLE != GetUserGeoID(GEOCLASS_REGION), + "GEOCLASS_REGION: should never return GEOID_NOT_AVAILABLE when GeoName API is available.\n"); + } + else + win_skip("This platform allows returning GEOID_NOT_AVAILABLE on success.\n"); + + id = GetUserGeoID(GEOCLASS_ALL); + ok(id == GEOID_NOT_AVAILABLE, + "GEOCLASS_ALL: Expected GEOID_NOT_AVAILABLE, got %d.\n", id); + id = GetUserGeoID(12345); + ok(id == GEOID_NOT_AVAILABLE, + "Gibberish argument: Expected GEOID_NOT_AVAILABLE, got %d.\n", id); +} + +static void test_GetUserDefaultGeoName(void) +{ + WCHAR name[10] = {0}; + int result, count; + + if (!(pGetUserDefaultGeoName)) + { + win_skip("GetUserDefaultGeoName: procedure not implemented on this platform.\n"); + return; + } + SetLastError(ERROR_SUCCESS); + count = result = pGetUserDefaultGeoName(NULL, 0); + ok(result > 0, + "(NULL, 0): Expected ret > 0, got %d; last error was %d.\n", + result, GetLastError()); + + SetLastError(ERROR_SUCCESS); + result = pGetUserDefaultGeoName(name, 0); + ok(result == count, + "(buffer, 0): Expected ret to match previous result (%d), got %d; last error was %d.\n", + result, count, GetLastError()); + + SetLastError(ERROR_SUCCESS); + result = pGetUserDefaultGeoName(NULL, 10); + ok(result == 0 && (GetLastError() == ERROR_INVALID_PARAMETER), + "(NULL, 10): Expected ret=0, got %d; and expected last error = ERROR_INVALID_PARAMETER (87), got %d\n", + result, GetLastError()); + + SetLastError(ERROR_SUCCESS); + result = pGetUserDefaultGeoName(NULL, -1); + ok(result == 0 && (GetLastError() == ERROR_INVALID_PARAMETER), + "(NULL, -1): Expected ret=0, got %d; and expected last error = ERROR_INVALID_PARAMETER (87), got %d.\n", + result, GetLastError()); + + SetLastError(ERROR_SUCCESS); + result = pGetUserDefaultGeoName(name, 1); + ok(result == 0 && (GetLastError() == ERROR_INSUFFICIENT_BUFFER), + "(buffer, 1): Expected ret == 0, got %d; and expected last error = ERROR_INSUFFICIENT_BUFFER (122), got %d.\n", + result, GetLastError()); + + SetLastError(ERROR_SUCCESS); + result = pGetUserDefaultGeoName(name, -1); + ok(result == 0 && (GetLastError() == ERROR_INVALID_PARAMETER), + "(buffer, -1): Expected ret=0, got %d; and expected last error = ERROR_INVALID_PARAMETER (87), got %d.\n", + result, GetLastError()); + + if (count <= ARRAY_SIZE(name)) + { + SetLastError(ERROR_SUCCESS); + result = pGetUserDefaultGeoName(name, count); + ok(result, + "(buffer, reported length): Expected non-zero ret, got otherwise with error = %d.\n", GetLastError()); + ok(result == count, + "(buffer, reported length): Expected character count == %d, got %d; last error was %d.\n", + count, result, GetLastError()); + ok(result == strlenW(name) + 1, + "(buffer, reported length): Expected string length to match ret (%d), got %d.\n", + result, strlenW(name) + 1); + + if (count < ARRAY_SIZE(name)) + { + SetLastError(ERROR_SUCCESS); + result = pGetUserDefaultGeoName(name, ARRAY_SIZE(name)); + ok(result, + "(buffer, larger length): Expected non-zero ret, got otherwise with error = %d.\n", GetLastError()); + ok(result == count, + "(buffer, larger length): Expected character count == %d, got %d; last error was %d.\n", + count, result, GetLastError()); + ok(result == strlenW(name) + 1, + "(buffer, larger length): Expected string length to match ret (%d), got %d.\n", + result, strlenW(name) + 1); + } + } + else + skip("GetUserDefaultGeoName: Couldn't test successful operation: GeoName string too large (%d > %lu).\n", + count, ARRAY_SIZE(name)); +} + static void test_GetGeoInfo(void) { char buffA[20]; @@ -4798,6 +4906,17 @@ static void test_GetGeoInfo(void) ok(ret == 4, "got %d\n", ret); ok(!strcmp(buffA, "203"), "got %s\n", buffA); + /* GEO_ID should behave like GEO_NATION */ + buffA[0] = 0; + ret = pGetGeoInfoA(203, GEO_ID, buffA, 20, 0); + if (ret) + { + ok(ret == 4, "got %d\n", ret); + ok(!strcmp(buffA, "203"), "got %s\n", buffA); + } + else + win_skip("GEO_ID not supported.\n"); + /* GEO_PARENT */ buffA[0] = 0; ret = pGetGeoInfoA(203, GEO_PARENT, buffA, 20, 0); @@ -4819,11 +4938,54 @@ static void test_GetGeoInfo(void) ok(!strcmp(buffA, "643"), "got %s\n", buffA); } + buffA[0] = 0; + ret = pGetGeoInfoA(193, GEO_NAME, buffA, 20, 0); /* LOCATION_NATION */ + if (ret == 0) + win_skip("GEO_NAME not supported.\n"); + else + { + ok(ret == 3, "expected ret == 3, got %d", ret); + ok(!strcmp(buffA, "PT"), "expected \"PT\", got %s\n", buffA); + + buffA[0] = 0; + ret = pGetGeoInfoA(39070, GEO_NAME, buffA, 20, 0); /* LOCATION_REGION */ + ok(ret == 4, "expected ret == 4, got %d", ret); + ok(!strcmp(buffA, "001"), "expected \"001\", got %s\n", buffA); + + buffA[0] = 0; + ret = pGetGeoInfoA(333, GEO_NAME, buffA, 20, 0); /* LOCATION_BOTH */ + ok(ret == 3, "expected ret == 3, got %d", ret); + ok(!strcmp(buffA, "AN"), "expected \"AN\", got %s\n", buffA); + } + /* try invalid type value */ SetLastError(0xdeadbeef); ret = pGetGeoInfoA(203, GEO_ID + 1, NULL, 0, 0); ok(ret == 0, "got %d\n", ret); ok(GetLastError() == ERROR_INVALID_FLAGS, "got %d\n", GetLastError()); + + if (pGetGeoInfoEx) + { + WCHAR buffer[10], pt[] = {'P','T',0}; + + /* Test types disallowed by GetGeoInfoEx */ + SetLastError(0xdeadbeef); + ret = pGetGeoInfoEx(pt, GEO_LCID, buffer, ARRAY_SIZE(buffer)); + ok(ret == 0, "expected ret == 0, got %d\n", ret); + ok(GetLastError() == ERROR_INVALID_FLAGS, "expected error 1004, got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pGetGeoInfoEx(pt, GEO_NATION, buffer, ARRAY_SIZE(buffer)); + ok(ret == 0, "expected ret == 0, got %d\n", ret); + ok(GetLastError() == ERROR_INVALID_FLAGS, "expected error 1004, got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pGetGeoInfoEx(pt, GEO_RFC1766, buffer, ARRAY_SIZE(buffer)); + ok(ret == 0, "expected ret == 0, got %d\n", ret); + ok(GetLastError() == ERROR_INVALID_FLAGS, "expected error 1004, got %d\n", GetLastError()); + } + else + win_skip("GetGeoInfoEx not supported.\n"); } static int geoidenum_count; @@ -4891,6 +5053,121 @@ static void test_EnumSystemGeoID(void) ret = pEnumSystemGeoID(GEOCLASS_REGION, 0, test_geoid_enumproc2); ok(ret && geoidenum_count > 0, "got %d, count %d\n", ret, geoidenum_count); } + + geoidenum_count = 0; + ret = pEnumSystemGeoID(GEOCLASS_ALL, 39070, test_geoid_enumproc2); + if (ret == 0) + win_skip("GEOCLASS_ALL is not supported in EnumSystemGeoID.\n"); + else + { + ok(ret && geoidenum_count > 0, "got %d, count %d\n", ret, geoidenum_count); + + geoidenum_count = 0; + ret = pEnumSystemGeoID(GEOCLASS_ALL, 0, test_geoid_enumproc2); + ok(ret && geoidenum_count > 0, "got %d, count %d\n", ret, geoidenum_count); + } +} + +static BOOL CALLBACK test_geoname_enumproc_deadbeef(PWSTR name, LPARAM data) +{ + (void)name; + ok(data == 0xdeadbeef, "deadbeef: expected 0xdeadbeef, got 0x%lx", data); + return FALSE; +} + +struct test_enum_geoname_count_types { + unsigned int total, nation, region, both; +}; + +static BOOL CALLBACK test_geoname_enumproc_counts(PWSTR name, LPARAM data) +{ + struct test_enum_geoname_count_types *ptr = (void*)data; + + /* Known names */ + static const WCHAR nation[] = {'A','U',0}, + region[] = {'0','0','1',0}, + both[] = {'A','N',0}; + + if (!ptr) + { + ok((INT_PTR)ptr, "geoname_enumproc_counts: expected some pointer, got %p\n", ptr); + return FALSE; + } + + ptr->total++; + + if (!winetest_strcmpW(name, nation)) + ptr->nation++; + if (!winetest_strcmpW(name, region)) + ptr->region++; + if (!winetest_strcmpW(name, both)) + ptr->both++; + + return TRUE; +} + +static BOOL CALLBACK test_geoname_enumproc_dummy(PWSTR name, LPARAM data) +{ + (void)name; + (void)data; + return FALSE; +} + +static void test_EnumSystemGeoNames(void) +{ + struct test_enum_geoname_count_types counts; + BOOL ret; + + if (!pEnumSystemGeoNames) + { + win_skip("unsupported platorm.\n"); + return; + } + + ok(pEnumSystemGeoNames(GEOCLASS_ALL, test_geoname_enumproc_deadbeef, 0xdeadbeef), + "deadbeef: expected non-zero ret, got otherwise with error=%d.\n", GetLastError()); + + ZeroMemory(&counts, sizeof(counts)); + ret = pEnumSystemGeoNames(GEOCLASS_NATION, test_geoname_enumproc_counts, (LPARAM)&counts); + if (ret) + { + ok(counts.total > 0 && counts.nation > 0 && counts.region == 0 && counts.both == 0, + "GEOCLASS_NATION: got total=%u, nation=%u, region=%u, both=%u\n", + counts.total, counts.nation, counts.region, counts.both); + } + else + ok(ret, "GEONAME_NATION: expected non-zero, got otherwise.\n"); + + ZeroMemory(&counts, sizeof(counts)); + ret = pEnumSystemGeoNames(GEOCLASS_REGION, test_geoname_enumproc_counts, (LPARAM)&counts); + if (ret) + { + ok(counts.total > 0 && counts.nation == 0 && counts.region > 0 && counts.both > 0, + "GEOCLASS_REGION: got total=%u, nation=%u, region=%u, both=%u\n", + counts.total, counts.nation, counts.region, counts.both); + } + else + ok(ret, "GEONAME_REGION: expected ret != 0, got otherwise.\n"); + + ZeroMemory(&counts, sizeof(counts)); + ret = pEnumSystemGeoNames(GEOCLASS_ALL, test_geoname_enumproc_counts, (LPARAM)&counts); + if (ret) + { + ok(counts.total > 0 && counts.nation > 0 && counts.region > 0 && counts.both > 0, + "GEOCLASS_ALL: got total=%u, nation=%u, region=%u, both=%u\n", + counts.total, counts.nation, counts.region, counts.both); + } + else + ok(ret, "GEONAME_ALL: expected ret != 0, got otherwise.\n"); + + /* Try invalid values */ + ret = pEnumSystemGeoNames(GEOCLASS_ALL, NULL, 0xdeadbeef); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, + "null enumproc: expected ret=0 and error=87, got ret=%d and error=%d\n", ret, GetLastError()); + + ret = pEnumSystemGeoNames(-1, test_geoname_enumproc_dummy, 0xdeadbeef); + ok(!ret && GetLastError() == ERROR_INVALID_FLAGS, + "invalid geoclass: expected ret=0 and error=1004, got ret=%d and error=%d\n", ret, GetLastError()); } struct invariant_entry { @@ -6049,6 +6326,7 @@ START_TEST(locale) test_CompareStringOrdinal(); test_GetGeoInfo(); test_EnumSystemGeoID(); + test_EnumSystemGeoNames(); test_invariant(); test_GetSystemPreferredUILanguages(); test_GetThreadPreferredUILanguages(); @@ -6058,6 +6336,8 @@ START_TEST(locale) test_SetThreadUILanguage(); test_NormalizeString(); test_SpecialCasing(); + test_GetUserGeoID(); + test_GetUserDefaultGeoName(); /* this requires collation table patch to make it MS compatible */ if (0) test_sorting(); } -- 2.23.0

2 1

← Newer
1
...
9
10
11
12
13
14
15
...
27
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel October 2019