November 2019 - Wine-devel - list.winehq.org

[PATCH] vkd3d: Implement ID3D12Device::GetCustomHeapProperties
by Derek Lesho 06 Nov '19

06 Nov '19

Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- Based solely off the documentation for the function on MSDN, assuming the UMA and CacheCoherentUMA features are TRUE. --- libs/vkd3d/device.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 4d6f7c9..df81226 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2974,11 +2974,33 @@ invalid: static D3D12_HEAP_PROPERTIES * STDMETHODCALLTYPE d3d12_device_GetCustomHeapProperties(ID3D12Device *iface, D3D12_HEAP_PROPERTIES *heap_properties, UINT node_mask, D3D12_HEAP_TYPE heap_type) { - FIXME("iface %p, heap_properties %p, node_mask 0x%08x, heap_type %#x stub!\n", + TRACE("iface %p, heap_properties %p, node_mask 0x%08x, heap_type %#x stub!\n", iface, heap_properties, node_mask, heap_type); debug_ignored_node_mask(node_mask); + heap_properties->Type = heap_type; + heap_properties->CreationNodeMask = 1; + heap_properties->VisibleNodeMask = 1; + + switch (heap_type) + { + case D3D12_HEAP_TYPE_UPLOAD: + heap_properties->CPUPageProperty = D3D12_CPU_PAGE_PROPERTY_WRITE_BACK; + heap_properties->MemoryPoolPreference = D3D12_MEMORY_POOL_L0; + break; + case D3D12_HEAP_TYPE_DEFAULT: + heap_properties->CPUPageProperty = D3D12_CPU_PAGE_PROPERTY_NOT_AVAILABLE; + heap_properties->MemoryPoolPreference = D3D12_MEMORY_POOL_L0; + break; + case D3D12_HEAP_TYPE_READBACK: + heap_properties->CPUPageProperty = D3D12_CPU_PAGE_PROPERTY_WRITE_BACK; + heap_properties->MemoryPoolPreference = D3D12_MEMORY_POOL_L0; + break; + default: + FIXME("Unhandled heap type: %#x\n", heap_type); + }; + return heap_properties; } -- 2.23.0

1 3

[PATCH 3/3] vbscript: Get rid of ident_map.
by Jacek Caban 06 Nov '19

06 Nov '19

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/vbdisp.c | 116 ++++++++++----------------------------- dlls/vbscript/vbscript.h | 6 -- 2 files changed, 28 insertions(+), 94 deletions(-)

1 0

[PATCH 2/3] vbscript: Store global variables in an array.
by Jacek Caban 06 Nov '19

06 Nov '19

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- This version is rebased on top of my today's patch. I also reordered things inside compile_script to avoid possible failure after global context is half-modified. dlls/vbscript/compile.c | 30 ++++++++++++++++++--------- dlls/vbscript/interp.c | 45 ++++++++++++++++++++++++++++++++-------- dlls/vbscript/vbdisp.c | 4 ++-- dlls/vbscript/vbscript.c | 9 ++++++-- dlls/vbscript/vbscript.h | 5 ++++- 5 files changed, 69 insertions(+), 24 deletions(-)

1 0

[PATCH 1/3] vbscript: Store global static arrays together with global variables.
by Jacek Caban 06 Nov '19

06 Nov '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- This is unchanged version of my previous patch. I send it together with Gabriel's patches that needed to be rebased on top of it. dlls/vbscript/compile.c | 1 + dlls/vbscript/interp.c | 59 +++++++++++++++++++++++++++------------- dlls/vbscript/vbscript.h | 1 + 3 files changed, 42 insertions(+), 19 deletions(-)

1 0

[PATCH] dsdmo: Added dll
by Alistair Leslie-Hughes 06 Nov '19

06 Nov '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- configure | 2 + configure.ac | 1 + dlls/dsdmo/Makefile.in | 6 +++ dlls/dsdmo/dsdmo.spec | 4 ++ dlls/dsdmo/main.c | 85 ++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 98 insertions(+) create mode 100644 dlls/dsdmo/Makefile.in create mode 100644 dlls/dsdmo/dsdmo.spec create mode 100644 dlls/dsdmo/main.c diff --git a/configure b/configure index 8ddfb4ecdd..d69d1ac4a3 100755 --- a/configure +++ b/configure @@ -1257,6 +1257,7 @@ enable_dpnlobby enable_dpvoice enable_dpwsockx enable_drmclien +enable_dsdmo enable_dsound enable_dsquery enable_dssenh @@ -20384,6 +20385,7 @@ wine_fn_config_makefile dlls/dpvoice enable_dpvoice wine_fn_config_makefile dlls/dpvoice/tests enable_tests wine_fn_config_makefile dlls/dpwsockx enable_dpwsockx wine_fn_config_makefile dlls/drmclien enable_drmclien +wine_fn_config_makefile dlls/dsdmo enable_dsdmo wine_fn_config_makefile dlls/dsound enable_dsound wine_fn_config_makefile dlls/dsound/tests enable_tests wine_fn_config_makefile dlls/dsquery enable_dsquery diff --git a/configure.ac b/configure.ac index 31aac11d31..c99db6984b 100644 --- a/configure.ac +++ b/configure.ac @@ -3237,6 +3237,7 @@ WINE_CONFIG_MAKEFILE(dlls/dpvoice) WINE_CONFIG_MAKEFILE(dlls/dpvoice/tests) WINE_CONFIG_MAKEFILE(dlls/dpwsockx) WINE_CONFIG_MAKEFILE(dlls/drmclien) +WINE_CONFIG_MAKEFILE(dlls/dsdmo) WINE_CONFIG_MAKEFILE(dlls/dsound) WINE_CONFIG_MAKEFILE(dlls/dsound/tests) WINE_CONFIG_MAKEFILE(dlls/dsquery) diff --git a/dlls/dsdmo/Makefile.in b/dlls/dsdmo/Makefile.in new file mode 100644 index 0000000000..99816ae0c0 --- /dev/null +++ b/dlls/dsdmo/Makefile.in @@ -0,0 +1,6 @@ +MODULE = dsdmo.dll + +EXTRADLLFLAGS = -mno-cygwin + +C_SRCS = \ + main.c diff --git a/dlls/dsdmo/dsdmo.spec b/dlls/dsdmo/dsdmo.spec new file mode 100644 index 0000000000..b16365d0c9 --- /dev/null +++ b/dlls/dsdmo/dsdmo.spec @@ -0,0 +1,4 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/dsdmo/main.c b/dlls/dsdmo/main.c new file mode 100644 index 0000000000..61a67f44d8 --- /dev/null +++ b/dlls/dsdmo/main.c @@ -0,0 +1,85 @@ +/* + * Copyright 2019 Alistair Leslie-Hughes + * + * 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 + */ +#define COBJMACROS + +#include "ole2.h" +#include "rpcproxy.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dsdmo); + +static HINSTANCE dsdmo_instance; + +/****************************************************************** + * DllMain + */ +BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) +{ + TRACE("(%p %d %p)\n", hInstDLL, fdwReason, lpv); + + switch(fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + dsdmo_instance = hInstDLL; + DisableThreadLibraryCalls(dsdmo_instance); + break; + case DLL_PROCESS_DETACH: + if (lpv) break; + break; + } + + return TRUE; +} + +/*********************************************************************** + * DllGetClassObject + */ +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) +{ + FIXME("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + return CLASS_E_CLASSNOTAVAILABLE; +} + +/*********************************************************************** + * DllCanUnloadNow + */ +HRESULT WINAPI DllCanUnloadNow(void) +{ + return S_FALSE; +} + +/*********************************************************************** + * DllRegisterServer + */ +HRESULT WINAPI DllRegisterServer(void) +{ + TRACE("()\n"); + return __wine_register_resources(dsdmo_instance); +} + +/*********************************************************************** + * DllUnregisterServer + */ +HRESULT WINAPI DllUnregisterServer(void) +{ + TRACE("()\n"); + return __wine_unregister_resources(dsdmo_instance); +} -- 2.17.1

2 1

[PATCH] ddraw/tests: Add tests for alpha component in surface format conversions.
by Paul Gofman 06 Nov '19

06 Nov '19

Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/ddraw/tests/ddraw7.c | 277 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 277 insertions(+) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 279263fe37..5a2b9c6e13 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -16475,6 +16475,282 @@ static void test_d32_support(void) DestroyWindow(window); } +static void test_surface_format_conversion_alpha(void) +{ + static const unsigned int rgba_data[4 * 4] = + { + 0xff00ff00, 0xff0000ff, 0xff0000ff, 0xff0000ff, + 0xff0000ff, 0xff00ff00, 0xff0000ff, 0xff0000ff, + 0xff00ff00, 0xff0000ff, 0xff00ff00, 0xff0000ff, + 0xff00ff00, 0xff0000ff, 0xff0000ff, 0xff00ff00, + }; + static const unsigned int rgbx_data[4 * 4] = + { + 0x0000ff00, 0x000000ff, 0x000000ff, 0x000000ff, + 0x000000ff, 0x0000ff00, 0x000000ff, 0x000000ff, + 0x0000ff00, 0x000000ff, 0x0000ff00, 0x000000ff, + 0x0000ff00, 0x000000ff, 0x000000ff, 0x0000ff00, + }; + static const unsigned short int r5g6b5_data[4 * 4] = + { + 0x07e0, 0x001f, 0x001f, 0x001f, + 0x001f, 0x07e0, 0x001f, 0x001f, + 0x07e0, 0x001f, 0x07e0, 0x001f, + 0x07e0, 0x001f, 0x001f, 0x07e0, + }; + static const unsigned short int r5g5b5x1_data[4 * 4] = + { + 0x03e0, 0x001f, 0x001f, 0x001f, + 0x001f, 0x03e0, 0x001f, 0x001f, + 0x03e0, 0x001f, 0x03e0, 0x001f, + 0x03e0, 0x001f, 0x001f, 0x03e0, + }; + static const unsigned short int r5g5b5a1_data[4 * 4] = + { + 0x83e0, 0x801f, 0x801f, 0x801f, + 0x801f, 0x83e0, 0x801f, 0x801f, + 0x83e0, 0x801f, 0x83e0, 0x801f, + 0x83e0, 0x801f, 0x801f, 0x83e0, + }; + static const unsigned int dxt1_data[8] = + { + 0x001f07e0, 0x14445154, + }; + static const unsigned int dxt2_data[16] = + { + 0xffffffff, 0xffffffff, 0x001f07e0, 0x14445154, + }; + + enum test_format_id + { + FMT_RGBA, + FMT_RGBX, + FMT_R5G6B5, + FMT_R5G5B5X1, + FMT_R5G5B5A1, + FMT_DXT1, + FMT_DXT2, + FMT_DXT3, + }; + + static const struct test_format + { + DDPIXELFORMAT fmt; + const char *name; + unsigned int block_size, x_blocks, y_blocks; + DWORD support_flag; + } + formats[] = + { + { + { + sizeof(DDPIXELFORMAT), DDPF_RGB | DDPF_ALPHAPIXELS, 0, + {32}, {0x00ff0000}, {0x0000ff00}, {0x000000ff}, {0xff000000} + }, + "RGBA", 4, 4, 4, + }, + { + { + sizeof(DDPIXELFORMAT), DDPF_RGB, 0, + {32}, {0x00ff0000}, {0x0000ff00}, {0x000000ff}, {0x00000000} + }, + "RGBX", 4, 4, 4, + }, + { + { + sizeof(DDPIXELFORMAT), DDPF_RGB, 0, + {16}, {0x0000f800}, {0x000007e0}, {0x0000001f}, {0x00000000} + }, + "R5G6B5", 2, 4, 4, + }, + { + { + sizeof(DDPIXELFORMAT), DDPF_RGB, 0, + {16}, {0x00007c00}, {0x000003e0}, {0x0000001f}, {0x00000000} + }, + "R5G5B5X1", 2, 4, 4, + }, + { + { + sizeof(DDPIXELFORMAT), DDPF_RGB | DDPF_ALPHAPIXELS, 0, + {16}, {0x00007c00}, {0x000003e0}, {0x0000001f}, {0x00008000} + }, + "R5G5B5A1", 2, 4, 4, + }, + { + { + sizeof(DDPIXELFORMAT), DDPF_FOURCC, MAKEFOURCC('D', 'X', 'T', '1'), + {0}, {0}, {0}, {0}, {0} + }, + "DXT1", 8, 1, 1, SUPPORT_DXT1, + }, + { + { + sizeof(DDPIXELFORMAT), DDPF_FOURCC, MAKEFOURCC('D', 'X', 'T', '2'), + {0}, {0}, {0}, {0}, {0} + }, + "DXT2", 16, 1, 1, SUPPORT_DXT2, + }, + { + { + sizeof(DDPIXELFORMAT), DDPF_FOURCC, MAKEFOURCC('D', 'X', 'T', '3'), + {0}, {0}, {0}, {0}, {0} + }, + "DXT3", 16, 1, 1, SUPPORT_DXT3, + }, + }; + + static const struct + { + enum test_format_id src_format; + const void *src_data; + enum test_format_id dst_format; + const void *expected_data; + BOOL todo, broken_warp; + const void *expected_broken; + } + tests[] = + { + {FMT_RGBX, rgbx_data, FMT_RGBA, rgba_data, FALSE, TRUE, rgbx_data}, + {FMT_RGBA, rgba_data, FMT_RGBX, rgbx_data, TRUE, TRUE, rgba_data}, + {FMT_R5G6B5, r5g6b5_data, FMT_RGBA, rgba_data}, + {FMT_R5G5B5X1, r5g5b5x1_data, FMT_RGBA, rgba_data}, + {FMT_R5G6B5, r5g6b5_data, FMT_R5G5B5A1, r5g5b5a1_data}, + {FMT_R5G5B5X1, r5g5b5x1_data, FMT_R5G5B5A1, r5g5b5x1_data, TRUE}, + {FMT_R5G5B5A1, r5g5b5a1_data, FMT_R5G6B5, r5g6b5_data}, + {FMT_RGBA, rgba_data, FMT_DXT1, dxt1_data}, + {FMT_RGBX, rgbx_data, FMT_DXT1, dxt1_data, TRUE}, + {FMT_RGBA, rgba_data, FMT_DXT2, dxt2_data}, + {FMT_RGBX, rgbx_data, FMT_DXT2, dxt2_data, TRUE}, + {FMT_RGBA, rgba_data, FMT_DXT3, dxt2_data}, + {FMT_RGBX, rgbx_data, FMT_DXT3, dxt2_data, TRUE}, + {FMT_DXT1, dxt1_data, FMT_DXT2, dxt2_data, TRUE}, + {FMT_DXT1, dxt1_data, FMT_RGBA, rgba_data}, + {FMT_DXT1, dxt1_data, FMT_RGBX, rgba_data}, + {FMT_DXT3, dxt2_data, FMT_RGBA, rgba_data}, + {FMT_DXT3, dxt2_data, FMT_RGBX, rgba_data}, + }; + + const struct test_format *src_format, *dst_format; + IDirectDrawSurface7 *src_surf, *dst_surf; + DDSURFACEDESC2 surface_desc, lock; + unsigned int i, x, y, pitch; + IDirect3DDevice7 *device; + DWORD supported_fmts; + BOOL passed, is_warp; + IDirectDraw7 *ddraw; + ULONG refcount; + HWND window; + HRESULT hr; + + window = create_window(); + if (!(device = create_device(window, DDSCL_NORMAL))) + { + skip("Failed to create a 3D device, skipping test.\n"); + DestroyWindow(window); + return; + } + + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + is_warp = ddraw_is_warp(ddraw); + + hr = IDirect3DDevice7_EnumTextureFormats(device, test_block_formats_creation_cb, + &supported_fmts); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT; + surface_desc.dwWidth = 4; + surface_desc.dwHeight = 4; + surface_desc.ddsCaps.dwCaps = DDSCAPS_TEXTURE | DDSCAPS_VIDEOMEMORY; + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + src_format = &formats[tests[i].src_format]; + dst_format = &formats[tests[i].dst_format]; + + if (~supported_fmts & dst_format->support_flag) + { + skip("%s format is not supported, skipping test %u.\n", dst_format->name, i); + continue; + } + if (~supported_fmts & src_format->support_flag) + { + skip("%s format is not supported, skipping test %u.\n", src_format->name, i); + continue; + } + + U4(surface_desc).ddpfPixelFormat = src_format->fmt; + hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &src_surf, NULL); + ok(hr == DD_OK, "Test %u, got unexpected hr %#x.\n", i, hr); + + U4(surface_desc).ddpfPixelFormat = dst_format->fmt; + hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &dst_surf, NULL); + ok(hr == DD_OK, "Test %u, got unexpected hr %#x.\n", i, hr); + + memset(&lock, 0, sizeof(lock)); + lock.dwSize = sizeof(lock); + hr = IDirectDrawSurface7_Lock(src_surf, NULL, &lock, 0, NULL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + pitch = U1(lock).lPitch; + for (y = 0; y < src_format->y_blocks; ++y) + memcpy((BYTE*)lock.lpSurface + y * pitch, + (BYTE *)tests[i].src_data + y * src_format->x_blocks * src_format->block_size, + src_format->block_size * src_format->x_blocks); + hr = IDirectDrawSurface7_Unlock(src_surf, NULL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirectDrawSurface7_Blt(dst_surf, NULL, src_surf, NULL, DDBLT_WAIT, NULL); + ok(hr == DD_OK, "Test %s -> %s, got unexpected hr %#x.\n", + src_format->name, dst_format->name, hr); + + memset(&lock, 0, sizeof(lock)); + lock.dwSize = sizeof(lock); + hr = IDirectDrawSurface7_Lock(dst_surf, NULL, &lock, 0, NULL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + pitch = U1(lock).lPitch; + + for (y = 0; y < dst_format->y_blocks; ++y) + { + const void *expected_data = is_warp && tests[i].broken_warp ? tests[i].expected_broken + : tests[i].expected_data; + + passed = !memcmp((BYTE*)lock.lpSurface + y * pitch, + (BYTE *)expected_data + y * dst_format->x_blocks * dst_format->block_size, + dst_format->block_size * dst_format->x_blocks); + todo_wine_if(tests[i].todo) + ok(passed, "Test %s -> %s, row %u, unexpected surface data.\n", + src_format->name, dst_format->name, y); + + if (!passed && !(!strcmp(winetest_platform, "wine") && tests[i].todo)) + { + for (x = 0; x < dst_format->x_blocks * dst_format->block_size / 4; ++x) + trace("Test %u, x %u, y %u, expected 0x%08x, got 0x%08x.\n", i, x, y, + *(unsigned int *)((BYTE*)lock.lpSurface + y * pitch + x * 4), + *(unsigned int*)((BYTE *)tests[i].expected_data + + y * dst_format->x_blocks * dst_format->block_size + x * 4)); + } + if (!passed) + break; + } + hr = IDirectDrawSurface7_Unlock(dst_surf, NULL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + IDirectDrawSurface7_Release(dst_surf); + IDirectDrawSurface7_Release(src_surf); + } + + IDirect3DDevice7_Release(device); + refcount = IDirectDraw7_Release(ddraw); + ok(!refcount, "%u references left.\n", refcount); + DestroyWindow(window); +} + START_TEST(ddraw7) { DDDEVICEIDENTIFIER2 identifier; @@ -16623,4 +16899,5 @@ START_TEST(ddraw7) test_begin_end_state_block(); test_caps(); test_d32_support(); + test_surface_format_conversion_alpha(); } -- 2.23.0

3 2

[PATCH 2/2] msvcrt: Use %ls format for wchar strings in DoMessageBox.
by Piotr Caban 06 Nov '19

06 Nov '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/exit.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[PATCH 1/2 v2] msvcrt: Use %ls format for wchar strings in _wassert.
by Piotr Caban 06 Nov '19

06 Nov '19

From: Jacek Caban <jacek(a)codeweavers.com> %s does not do the right thing in ucrtbase. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- v2: - use %ls format - change format_msgbox string dlls/msvcrt/exit.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

1 0

[PATCH] vbscript: Store global static arrays together with global variables.
by Jacek Caban 06 Nov '19

06 Nov '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/compile.c | 1 + dlls/vbscript/interp.c | 61 ++++++++++++++++++++++++++------------- dlls/vbscript/tests/run.c | 11 +++++++ dlls/vbscript/vbscript.h | 1 + 4 files changed, 54 insertions(+), 20 deletions(-)

1 0

[PATCH] user32: Remove unused GetAsyncKeyState() driver entry.
by Huw Davies 06 Nov '19

06 Nov '19

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/user32/driver.c | 13 -------- dlls/user32/input.c | 68 ++++++++++++++++++-------------------- dlls/user32/user_private.h | 1 - 3 files changed, 32 insertions(+), 50 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 921ea2c962..66b26ca51a 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -106,7 +106,6 @@ static const USER_DRIVER *load_driver(void) GET_USER_FUNC(ActivateKeyboardLayout); GET_USER_FUNC(Beep); - GET_USER_FUNC(GetAsyncKeyState); GET_USER_FUNC(GetKeyNameText); GET_USER_FUNC(GetKeyboardLayout); GET_USER_FUNC(GetKeyboardLayoutList); @@ -206,11 +205,6 @@ static void CDECL nulldrv_Beep(void) { } -static SHORT CDECL nulldrv_GetAsyncKeyState( INT key ) -{ - return -1; -} - static UINT CDECL nulldrv_GetKeyboardLayoutList( INT size, HKL *layouts ) { HKEY hKeyKeyboard; @@ -494,7 +488,6 @@ static USER_DRIVER null_driver = /* keyboard functions */ nulldrv_ActivateKeyboardLayout, nulldrv_Beep, - nulldrv_GetAsyncKeyState, nulldrv_GetKeyNameText, nulldrv_GetKeyboardLayout, nulldrv_GetKeyboardLayoutList, @@ -566,11 +559,6 @@ static void CDECL loaderdrv_Beep(void) load_driver()->pBeep(); } -static SHORT CDECL loaderdrv_GetAsyncKeyState( INT key ) -{ - return load_driver()->pGetAsyncKeyState( key ); -} - static INT CDECL loaderdrv_GetKeyNameText( LONG lparam, LPWSTR buffer, INT size ) { return load_driver()->pGetKeyNameText( lparam, buffer, size ); @@ -715,7 +703,6 @@ static USER_DRIVER lazy_load_driver = /* keyboard functions */ loaderdrv_ActivateKeyboardLayout, loaderdrv_Beep, - loaderdrv_GetAsyncKeyState, loaderdrv_GetKeyNameText, loaderdrv_GetKeyboardLayout, loaderdrv_GetKeyboardLayoutList, diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 8b2ae805aa..0325e2ce3d 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -401,51 +401,47 @@ SHORT WINAPI DECLSPEC_HOTPATCH GetAsyncKeyState( INT key ) check_for_events( QS_INPUT ); - if ((ret = USER_Driver->pGetAsyncKeyState( key )) == -1) + if (key_state_info && !(key_state_info->state[key] & 0xc0) && + key_state_info->counter == counter && GetTickCount() - key_state_info->time < 50) { - if (key_state_info && - !(key_state_info->state[key] & 0xc0) && - key_state_info->counter == counter && - GetTickCount() - key_state_info->time < 50) - { - /* use cached value */ - return 0; - } - else if (!key_state_info) + /* use cached value */ + return 0; + } + else if (!key_state_info) + { + key_state_info = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*key_state_info) ); + get_user_thread_info()->key_state = key_state_info; + } + + ret = 0; + SERVER_START_REQ( get_key_state ) + { + req->tid = 0; + req->key = key; + if (key_state_info) { - key_state_info = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*key_state_info) ); - get_user_thread_info()->key_state = key_state_info; + prev_key_state = key_state_info->state[key]; + wine_server_set_reply( req, key_state_info->state, sizeof(key_state_info->state) ); } - - ret = 0; - SERVER_START_REQ( get_key_state ) + if (!wine_server_call( req )) { - req->tid = 0; - req->key = key; + if (reply->state & 0x40) ret |= 0x0001; + if (reply->state & 0x80) ret |= 0x8000; if (key_state_info) { - prev_key_state = key_state_info->state[key]; - wine_server_set_reply( req, key_state_info->state, sizeof(key_state_info->state) ); - } - if (!wine_server_call( req )) - { - if (reply->state & 0x40) ret |= 0x0001; - if (reply->state & 0x80) ret |= 0x8000; - if (key_state_info) - { - /* force refreshing the key state cache - some multithreaded programs - * (like Adobe Photoshop CS5) expect that changes to the async key state - * are also immediately available in other threads. */ - if (prev_key_state != key_state_info->state[key]) - counter = interlocked_xchg_add( &global_key_state_counter, 1 ) + 1; - - key_state_info->time = GetTickCount(); - key_state_info->counter = counter; - } + /* force refreshing the key state cache - some multithreaded programs + * (like Adobe Photoshop CS5) expect that changes to the async key state + * are also immediately available in other threads. */ + if (prev_key_state != key_state_info->state[key]) + counter = interlocked_xchg_add( &global_key_state_counter, 1 ) + 1; + + key_state_info->time = GetTickCount(); + key_state_info->counter = counter; } } - SERVER_END_REQ; } + SERVER_END_REQ; + return ret; } diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index c11aae707c..7e294558ef 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -64,7 +64,6 @@ typedef struct tagUSER_DRIVER { /* keyboard functions */ HKL (CDECL *pActivateKeyboardLayout)(HKL, UINT); void (CDECL *pBeep)(void); - SHORT (CDECL *pGetAsyncKeyState)(INT); INT (CDECL *pGetKeyNameText)(LONG, LPWSTR, INT); HKL (CDECL *pGetKeyboardLayout)(DWORD); UINT (CDECL *pGetKeyboardLayoutList)(INT, HKL *); -- 2.23.0

1 0