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

Rémi Bernon : user32: Use rawinput device handles to identify devices.
by Alexandre Julliard May 3, 2021

May 3, 2021

Module: wine Branch: master Commit: f2759829f8b79e0bed72d826b676123b0074b57f URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2759829f8b79e0bed72d826… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Apr 26 12:38:02 2021 +0200 user32: Use rawinput device handles to identify devices. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/rawinput.c | 32 +++++++++++++++++++++++++++++--- dlls/user32/tests/input.c | 2 +- 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index ad93517ae8a..a2cf5769fcc 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -50,6 +50,7 @@ struct device { SP_DEVICE_INTERFACE_DETAIL_DATA_W *detail; HANDLE file; + HANDLE handle; RID_DEVICE_INFO info; PHIDP_PREPARSED_DATA data; }; @@ -100,7 +101,7 @@ static struct device *add_device(HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface) struct device *device; UINT32 handle; HANDLE file; - DWORD size, type; + DWORD i, size, type; SetupDiGetDeviceInterfaceDetailW(set, iface, NULL, 0, &size, &device_data); if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) @@ -116,6 +117,15 @@ static struct device *add_device(HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface) return NULL; } + for (i = 0; i < rawinput_devices_count; ++i) + { + if (rawinput_devices[i].handle == UlongToHandle(handle)) + { + TRACE("Updating device %x / %s\n", handle, debugstr_w(rawinput_devices[i].detail->DevicePath)); + return rawinput_devices + i; + } + } + if (!(detail = malloc(size))) { ERR("Failed to allocate memory.\n"); @@ -147,6 +157,7 @@ static struct device *add_device(HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface) device = &rawinput_devices[rawinput_devices_count++]; device->detail = detail; device->file = file; + device->handle = ULongToHandle(handle); device->info.cbSize = sizeof(RID_DEVICE_INFO); device->data = NULL; @@ -244,6 +255,20 @@ static void find_devices(void) } +static struct device *find_device_from_handle(HANDLE handle) +{ + UINT i; + for (i = 0; i < rawinput_devices_count; ++i) + if (rawinput_devices[i].handle == handle) + return rawinput_devices + i; + find_devices(); + for (i = 0; i < rawinput_devices_count; ++i) + if (rawinput_devices[i].handle == handle) + return rawinput_devices + i; + return NULL; +} + + struct rawinput_thread_data *rawinput_thread_data(void) { struct user_thread_info *thread_info = get_user_thread_info(); @@ -401,7 +426,7 @@ UINT WINAPI GetRawInputDeviceList(RAWINPUTDEVICELIST *devices, UINT *device_coun for (i = 0; i < rawinput_devices_count; ++i) { - devices[2 + i].hDevice = &rawinput_devices[i]; + devices[2 + i].hDevice = rawinput_devices[i].handle; devices[2 + i].dwType = rawinput_devices[i].info.dwType; } @@ -671,7 +696,7 @@ UINT WINAPI GetRawInputDeviceInfoW(HANDLE handle, UINT command, void *data, UINT static const RID_DEVICE_INFO_MOUSE mouse_info = {1, 5, 0, FALSE}; RID_DEVICE_INFO info; - struct device *device = handle; + struct device *device; const void *to_copy; UINT to_copy_bytes, avail_bytes; @@ -679,6 +704,7 @@ UINT WINAPI GetRawInputDeviceInfoW(HANDLE handle, UINT command, void *data, UINT handle, command, data, data_size); if (!data_size) return ~0U; + if (!(device = find_device_from_handle(handle))) return ~0U; /* each case below must set: * *data_size: length (meaning defined by command) of data we want to copy diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index c4c361575cd..382e124e1f4 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1886,7 +1886,7 @@ static void test_GetRawInputDeviceList(void) * understand that; so use the \\?\ prefix instead */ name[1] = '\\'; file = CreateFileW(name, 0, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL); - todo_wine_if(i == 0 || i == 1) + todo_wine_if(info.dwType == RIM_TYPEMOUSE || info.dwType == RIM_TYPEKEYBOARD) ok(file != INVALID_HANDLE_VALUE, "Failed to open %s, error %u\n", wine_dbgstr_w(name), GetLastError()); sz = 0;

1 0

Nikolay Sivov : mfplat: Add MFllMulDiv().
by Alexandre Julliard May 3, 2021

May 3, 2021

Module: wine Branch: master Commit: 3e3490be39e4f09948fa5b12f3155283c6758ad0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e3490be39e4f09948fa5b12… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 3 20:02:43 2021 +0300 mfplat: Add MFllMulDiv(). Implementation is based on similar gstreamer utility code, adjusted for signed arguments, and with platform optimizations removed. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 181 +++++++++++++++++++++++++++++++++++++++++++++ dlls/mfplat/mfplat.spec | 2 +- dlls/mfplat/tests/mfplat.c | 39 ++++++++++ include/mfapi.h | 1 + 4 files changed, 222 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 5a35350f5c5..dad4039fa16 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -19,6 +19,7 @@ #include <stdarg.h> #include <string.h> #include <math.h> +#include <limits.h> #define COBJMACROS #define NONAMELESSUNION @@ -8928,3 +8929,183 @@ HRESULT WINAPI MFCreateDXGIDeviceManager(UINT *token, IMFDXGIDeviceManager **man return S_OK; } + + +/* + * MFllMulDiv implementation is derived from gstreamer utility functions code (gstutils.c), + * released under LGPL2. Full authors list follows. + * =================================================================================== + * Copyright (C) 1999,2000 Erik Walthinsen <omega(a)cse.ogi.edu> + * 2000 Wim Taymans <wtay(a)chello.be> + * 2002 Thomas Vander Stichele <thomas(a)apestaart.org> + * 2004 Wim Taymans <wim(a)fluendo.com> + * 2015 Jan Schmidt <jan(a)centricular.com> + * =================================================================================== + */ + +static void llmult128(ULARGE_INTEGER *c1, ULARGE_INTEGER *c0, LONGLONG val, LONGLONG num) +{ + ULARGE_INTEGER a1, b0, v, n; + + v.QuadPart = llabs(val); + n.QuadPart = llabs(num); + + /* do 128 bits multiply + * nh nl + * * vh vl + * ---------- + * a0 = vl * nl + * a1 = vl * nh + * b0 = vh * nl + * b1 = + vh * nh + * ------------------- + * c1h c1l c0h c0l + * + * "a0" is optimized away, result is stored directly in c0. "b1" is + * optimized away, result is stored directly in c1. + */ + c0->QuadPart = (ULONGLONG)v.LowPart * n.LowPart; + a1.QuadPart = (ULONGLONG)v.LowPart * n.HighPart; + b0.QuadPart = (ULONGLONG)v.HighPart * n.LowPart; + + /* add the high word of a0 to the low words of a1 and b0 using c1 as + * scrach space to capture the carry. the low word of the result becomes + * the final high word of c0 */ + c1->QuadPart = (ULONGLONG)c0->HighPart + a1.LowPart + b0.LowPart; + c0->HighPart = c1->LowPart; + + /* add the carry from the result above (found in the high word of c1) and + * the high words of a1 and b0 to b1, the result is c1. */ + c1->QuadPart = (ULONGLONG)v.HighPart * n.HighPart + c1->HighPart + a1.HighPart + b0.HighPart; +} + +static ULONGLONG lldiv128(ULARGE_INTEGER c1, ULARGE_INTEGER c0, LONGLONG denom) +{ + ULARGE_INTEGER q1, q0, rhat; + ULARGE_INTEGER v, cmp1, cmp2; + unsigned int s = 0; + + v.QuadPart = llabs(denom); + + /* 64bit numerator */ + if (c1.QuadPart == 0) + return c0.QuadPart / v.QuadPart; + + /* 96bit numerator, 32bit denominator */ + if (v.HighPart == 0 && c1.HighPart == 0) + { + ULONGLONG low = c0.LowPart, high = c0.HighPart + ((ULONGLONG)c1.LowPart << 32); + low += (high % v.LowPart) << 32; + return ((high / v.LowPart) << 32) + (low / v.LowPart); + } + + /* 128bit numerator, 32bit denominator */ + if (v.HighPart == 0) + return UI64_MAX; + + /* count number of leading zeroes */ + BitScanReverse(&s, v.HighPart); + s = 31 - s; + + if (s) + { + /* normalize divisor and dividend */ + v.QuadPart <<= s; + c1.QuadPart = (c1.QuadPart << s) | (c0.HighPart >> (32 - s)); + c0.QuadPart <<= s; + } + + q1.QuadPart = c1.QuadPart / v.HighPart; + rhat.QuadPart = c1.QuadPart - q1.QuadPart * v.HighPart; + + cmp1.HighPart = rhat.LowPart; + cmp1.LowPart = c0.HighPart; + cmp2.QuadPart = q1.QuadPart * v.LowPart; + + while (q1.HighPart || cmp2.QuadPart > cmp1.QuadPart) + { + q1.QuadPart--; + rhat.QuadPart += v.HighPart; + if (rhat.HighPart) + break; + cmp1.HighPart = rhat.LowPart; + cmp2.QuadPart -= v.LowPart; + } + c1.HighPart = c1.LowPart; + c1.LowPart = c0.HighPart; + c1.QuadPart -= q1.QuadPart * v.QuadPart; + q0.QuadPart = c1.QuadPart / v.HighPart; + rhat.QuadPart = c1.QuadPart - q0.QuadPart * v.HighPart; + + cmp1.HighPart = rhat.LowPart; + cmp1.LowPart = c0.LowPart; + cmp2.QuadPart = q0.QuadPart * v.LowPart; + + while (q0.HighPart || cmp2.QuadPart > cmp1.QuadPart) + { + q0.QuadPart--; + rhat.QuadPart += v.HighPart; + if (rhat.HighPart) + break; + cmp1.HighPart = rhat.LowPart; + cmp2.QuadPart -= v.LowPart; + } + q0.HighPart += q1.LowPart; + + return q0.QuadPart; +} + +/*********************************************************************** + * MFllMulDiv (mfplat.@) + */ +LONGLONG WINAPI MFllMulDiv(LONGLONG val, LONGLONG num, LONGLONG denom, LONGLONG factor) +{ +#define LLOVERFLOW (sign ? I64_MIN : I64_MAX) + unsigned int sign, factor_sign, denom_sign; + ULARGE_INTEGER c1, c0; + ULONGLONG ret; + + TRACE("%s, %s, %s, %s.\n", wine_dbgstr_longlong(val), wine_dbgstr_longlong(num), + wine_dbgstr_longlong(denom), wine_dbgstr_longlong(factor)); + + /* compute 128-bit numerator product */ + llmult128(&c1, &c0, val, num); + + sign = (val < 0) ^ (num < 0); + factor_sign = factor < 0; + denom_sign = denom < 0; + + factor = llabs(factor); + if (sign == factor_sign) + { + if (UI64_MAX - c0.QuadPart < factor) + { + if (c1.QuadPart == UI64_MAX) return LLOVERFLOW; + c1.QuadPart++; + } + c0.QuadPart += factor; + } + else + { + if (c0.QuadPart >= factor) + c0.QuadPart -= factor; + else + { + if (c1.QuadPart) + c1.QuadPart--; + else + sign = !sign; + + c0.QuadPart = factor - c0.QuadPart; + } + } + + if (c1.QuadPart >= denom) return LLOVERFLOW; + + /* compute quotient, fits in 64 bits */ + ret = lldiv128(c1, c0, denom); + sign ^= denom_sign; + if (ret >= I64_MAX) return LLOVERFLOW; + return sign ? -(LONGLONG)ret : ret; +#undef LLOVERFLOW +} diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index cbda9404aa9..d8558cee0cb 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -176,6 +176,6 @@ @ stdcall MFUnwrapMediaType(ptr ptr) @ stub MFValidateMediaTypeSize @ stdcall MFWrapMediaType(ptr ptr ptr ptr) -@ stub MFllMulDiv +@ stdcall -ret64 MFllMulDiv(int64 int64 int64 int64) @ stub PropVariantFromStream @ stub PropVariantToStream diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 89547be0a4f..b0c7298c28d 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -20,6 +20,7 @@ #include <stdarg.h> #include <string.h> +#include <limits.h> #define COBJMACROS @@ -7130,6 +7131,43 @@ static void test_MFLockSharedWorkQueue(void) ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); } +static void test_MFllMulDiv(void) +{ + /* (a * b + d) / c */ + static const struct muldivtest + { + LONGLONG a; + LONGLONG b; + LONGLONG c; + LONGLONG d; + LONGLONG result; + } + muldivtests[] = + { + { 0, 0, 0, 0, _I64_MAX }, + { 1000000, 1000000, 2, 0, 500000000000 }, + { _I64_MAX, 3, _I64_MAX, 0, 3 }, + { _I64_MAX, 3, _I64_MAX, 1, 3 }, + { -10000, 3, 100, 0, -300 }, + { 2, 0, 3, 5, 1 }, + { 2, 1, 1, -3, -1 }, + /* a * b product does not fit in uint64_t */ + { _I64_MAX, 4, 8, 0, _I64_MAX / 2 }, + /* Large a * b product, large denominator */ + { _I64_MAX, 4, 0x100000000, 0, 0x1ffffffff }, + }; + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(muldivtests); ++i) + { + LONGLONG result; + + result = MFllMulDiv(muldivtests[i].a, muldivtests[i].b, muldivtests[i].c, muldivtests[i].d); + ok(result == muldivtests[i].result, "%u: unexpected result %s, expected %s.\n", i, + wine_dbgstr_longlong(result), wine_dbgstr_longlong(muldivtests[i].result)); + } +} + START_TEST(mfplat) { char **argv; @@ -7194,6 +7232,7 @@ START_TEST(mfplat) test_dxgi_surface_buffer(); test_sample_allocator(); test_MFMapDX9FormatToDXGIFormat(); + test_MFllMulDiv(); CoUninitialize(); } diff --git a/include/mfapi.h b/include/mfapi.h index c1cf766c005..986f5b9e3e4 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -552,6 +552,7 @@ HRESULT WINAPI MFTEnumEx(GUID category, UINT32 flags, const MFT_REGISTER_TYPE_IN HRESULT WINAPI MFInitAttributesFromBlob(IMFAttributes *attributes, const UINT8 *buffer, UINT size); HRESULT WINAPI MFInitMediaTypeFromWaveFormatEx(IMFMediaType *mediatype, const WAVEFORMATEX *format, UINT32 size); HRESULT WINAPI MFInvokeCallback(IMFAsyncResult *result); +LONGLONG WINAPI MFllMulDiv(LONGLONG val, LONGLONG num, LONGLONG denom, LONGLONG factor); HRESULT WINAPI MFLockPlatform(void); HRESULT WINAPI MFLockSharedWorkQueue(const WCHAR *name, LONG base_priority, DWORD *taskid, DWORD *queue); DXGI_FORMAT WINAPI MFMapDX9FormatToDXGIFormat(DWORD format);

1 0

Zebediah Figura : d3d8/tests: Port test_sample_mask() from d3d9.
by Alexandre Julliard May 3, 2021

May 3, 2021

Module: wine Branch: master Commit: 30fe080965409e68cc86a04af1935e4944f4b049 URL: https://source.winehq.org/git/wine.git/?a=commit;h=30fe080965409e68cc86a04a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Apr 30 11:08:26 2021 -0500 d3d8/tests: Port test_sample_mask() from d3d9. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/visual.c | 88 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index fc8a05a3c40..f25549388d0 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -11070,6 +11070,93 @@ static void test_desktop_window(void) IDirect3D8_Release(d3d); } +static void test_sample_mask(void) +{ + IDirect3DSurface8 *rt, *ms_rt; + struct surface_readback rb; + IDirect3DDevice8 *device; + IDirect3D8 *d3d; + ULONG refcount; + DWORD colour; + HWND window; + HRESULT hr; + + static const struct + { + struct vec3 position; + DWORD diffuse; + } + quad[] = + { + {{-1.0f, -1.0f, 0.1f}, 0xffffffff}, + {{-1.0f, 1.0f, 0.1f}, 0xffffffff}, + {{ 1.0f, -1.0f, 0.1f}, 0xffffffff}, + {{ 1.0f, 1.0f, 0.1f}, 0xffffffff}, + }; + + window = create_window(); + d3d = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + + if (FAILED(IDirect3D8_CheckDeviceMultiSampleType(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_A8R8G8B8, TRUE, D3DMULTISAMPLE_2_SAMPLES))) + { + skip("Multisampling not supported for D3DFMT_A8R8G8B8.\n"); + IDirect3D8_Release(d3d); + DestroyWindow(window); + return; + } + + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a 3D device.\n"); + IDirect3D8_Release(d3d); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice8_CreateRenderTarget(device, 128, 128, D3DFMT_A8R8G8B8, D3DMULTISAMPLE_NONE, FALSE, &rt); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_CreateRenderTarget(device, 128, 128, + D3DFMT_A8R8G8B8, D3DMULTISAMPLE_2_SAMPLES, FALSE, &ms_rt); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetRenderTarget(device, ms_rt, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice8_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_MULTISAMPLEMASK, 0x5); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff0000, 0.0f, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(quad[0])); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice8_CopyRects(device, ms_rt, NULL, 0, rt, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + get_rt_readback(rt, &rb); + colour = get_readback_color(&rb, 64, 64); + ok(color_match(colour, 0xffff8080, 1), "Got unexpected colour %08x.\n", colour); + release_surface_readback(&rb); + + hr = IDirect3DDevice8_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + IDirect3DSurface8_Release(ms_rt); + IDirect3DSurface8_Release(rt); + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D8_Release(d3d); + DestroyWindow(window); +} + START_TEST(visual) { D3DADAPTER_IDENTIFIER8 identifier; @@ -11147,4 +11234,5 @@ START_TEST(visual) test_sysmem_draw(); test_alphatest(); test_desktop_window(); + test_sample_mask(); }

1 0

Arkadiusz Hiler : ntoskrnl: Implement IoSetDevicePropertyData().
by Alexandre Julliard May 3, 2021

May 3, 2021

Module: wine Branch: master Commit: 50210ea2448fb3e8d97891ac359230c207c351c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=50210ea2448fb3e8d97891ac… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Mon Apr 26 12:37:59 2021 +0200 ntoskrnl: Implement IoSetDevicePropertyData(). Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Arkadiusz Hiler <arek(a)hiler.eu> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + dlls/ntoskrnl.exe/pnp.c | 51 +++++++++++++++++++++++++++++++++++++ include/ddk/wdm.h | 4 +++ 3 files changed, 56 insertions(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 3505a58b9d6..2f7e27e0d87 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -465,6 +465,7 @@ @ stdcall IoReuseIrp(ptr long) @ stub IoSetCompletionRoutineEx @ stdcall IoSetDeviceInterfaceState(ptr long) +@ stdcall IoSetDevicePropertyData(ptr ptr long long long long ptr) @ stub IoSetDeviceToVerify @ stub IoSetFileOrigin @ stub IoSetHardErrorOrVerifyDevice diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c index 095344b1073..e425712d738 100644 --- a/dlls/ntoskrnl.exe/pnp.c +++ b/dlls/ntoskrnl.exe/pnp.c @@ -38,6 +38,12 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); WINE_DEFAULT_DEBUG_CHANNEL(plugplay); +static inline const char *debugstr_propkey( const DEVPROPKEY *id ) +{ + if (!id) return "(null)"; + return wine_dbg_sprintf( "{%s,%04x}", wine_dbgstr_guid( &id->fmtid ), id->pid ); +} + #define MAX_SERVICE_NAME 260 struct device_interface @@ -783,6 +789,51 @@ NTSTATUS WINAPI IoSetDeviceInterfaceState( UNICODE_STRING *name, BOOLEAN enable return ret; } +/*********************************************************************** + * IoSetDevicePropertyData (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI IoSetDevicePropertyData( DEVICE_OBJECT *device, const DEVPROPKEY *property_key, LCID lcid, + ULONG flags, DEVPROPTYPE type, ULONG size, void *data ) +{ + SP_DEVINFO_DATA sp_device = {sizeof(sp_device)}; + WCHAR device_instance_id[MAX_DEVICE_ID_LEN]; + NTSTATUS status; + HDEVINFO set; + + TRACE( "device %p, property_key %s, lcid %#x, flags %#x, type %#x, size %u, data %p.\n", + device, debugstr_propkey(property_key), lcid, flags, type, size, data ); + + /* flags is always treated as PLUGPLAY_PROPERTY_PERSISTENT starting with Win 8 / 2012 */ + + if (lcid != LOCALE_NEUTRAL) FIXME( "only LOCALE_NEUTRAL is supported\n" ); + + if ((status = get_device_instance_id( device, device_instance_id ))) return status; + + if ((set = SetupDiCreateDeviceInfoList( &GUID_NULL, NULL )) == INVALID_HANDLE_VALUE) + { + ERR( "Failed to create device list, error %#x.\n", GetLastError() ); + return GetLastError(); + } + + if (!SetupDiOpenDeviceInfoW( set, device_instance_id, NULL, 0, &sp_device )) + { + ERR( "Failed to open device, error %#x.\n", GetLastError() ); + SetupDiDestroyDeviceInfoList( set ); + return GetLastError(); + } + + if (!SetupDiSetDevicePropertyW( set, &sp_device, property_key, type, data, size, 0 )) + { + ERR( "Failed to set property, error %#x.\n", GetLastError() ); + SetupDiDestroyDeviceInfoList( set ); + return GetLastError(); + } + + SetupDiDestroyDeviceInfoList( set ); + + return STATUS_SUCCESS; +} + /*********************************************************************** * IoRegisterDeviceInterface (NTOSKRNL.EXE.@) */ diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 51097bfe3ab..447833c4bc9 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -21,6 +21,7 @@ #define _NTDDK_ #include <ntstatus.h> +#include <devpropdef.h> #ifdef _WIN64 #define POINTER_ALIGNMENT DECLSPEC_ALIGN(8) @@ -1681,6 +1682,8 @@ void WINAPI ExReleaseResourceForThreadLite(ERESOURCE*,ERESOURCE_THREAD); ULONG WINAPI ExSetTimerResolution(ULONG,BOOLEAN); void WINAPI ExUnregisterCallback(void*); +#define PLUGPLAY_PROPERTY_PERSISTENT 0x0001 + void WINAPI IoAcquireCancelSpinLock(KIRQL*); NTSTATUS WINAPI IoAcquireRemoveLockEx(IO_REMOVE_LOCK*,void*,const char*,ULONG, ULONG); NTSTATUS WINAPI IoAllocateDriverObjectExtension(PDRIVER_OBJECT,PVOID,ULONG,PVOID*); @@ -1728,6 +1731,7 @@ void WINAPI IoReleaseRemoveLockAndWaitEx(IO_REMOVE_LOCK*,void*,ULONG); void WINAPI IoReleaseRemoveLockEx(IO_REMOVE_LOCK*,void*,ULONG); void WINAPI IoReuseIrp(IRP*,NTSTATUS); NTSTATUS WINAPI IoSetDeviceInterfaceState(UNICODE_STRING*,BOOLEAN); +NTSTATUS WINAPI IoSetDevicePropertyData(DEVICE_OBJECT*,const DEVPROPKEY*,LCID,ULONG,DEVPROPTYPE,ULONG,void*); NTSTATUS WINAPI IoWMIRegistrationControl(PDEVICE_OBJECT,ULONG); void FASTCALL KeAcquireInStackQueuedSpinLockAtDpcLevel(KSPIN_LOCK*,KLOCK_QUEUE_HANDLE*);

1 0

Rémi Bernon : hidclass.sys: Assign rawinput handles through device properties.
by Alexandre Julliard May 3, 2021

May 3, 2021

Module: wine Branch: master Commit: 3532d666b96712b04d58b640182c35c1c4bc9d8c URL: https://source.winehq.org/git/wine.git/?a=commit;h=3532d666b96712b04d58b640… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Apr 26 12:38:00 2021 +0200 hidclass.sys: Assign rawinput handles through device properties. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 4 ---- dlls/hidclass.sys/pnp.c | 18 ++++++++++++++++-- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index a7825080deb..7dc97781b6b 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -21,7 +21,6 @@ #include <stdarg.h> #define NONAMELESSUNION #define NONAMELESSSTRUCT -#include "initguid.h" #include "hid.h" #include "winreg.h" #include "winuser.h" @@ -30,9 +29,6 @@ #include "ddk/hidsdi.h" #include "ddk/hidtypes.h" #include "ddk/wdm.h" -#include "devguid.h" -#include "ntddmou.h" -#include "ntddkbd.h" WINE_DEFAULT_DEBUG_CHANNEL(hid); WINE_DECLARE_DEBUG_CHANNEL(hid_report); diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index 3d81c16356e..2769b78c13b 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -21,7 +21,10 @@ #define NONAMELESSUNION #include <unistd.h> #include <stdarg.h> +#include "initguid.h" #include "hid.h" +#include "devguid.h" +#include "devpkey.h" #include "ntddmou.h" #include "ntddkbd.h" #include "ddk/hidtypes.h" @@ -33,6 +36,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(hid); +DEFINE_DEVPROPKEY(DEVPROPKEY_HID_HANDLE, 0xbc62e415, 0xf4fe, 0x405c, 0x8e, 0xda, 0x63, 0x6f, 0xb5, 0x9f, 0x08, 0x98, 2); + #if defined(__i386__) && !defined(_WIN32) extern void * WINAPI wrap_fastcall_func1( void *func, const void *a ); @@ -231,8 +236,6 @@ static void create_child(minidriver *minidriver, DEVICE_OBJECT *fdo) pdo_ext->u.pdo.information.DescriptorSize = pdo_ext->u.pdo.preparsed_data->dwSize; - IoInvalidateDeviceRelations(fdo_ext->u.fdo.hid_ext.PhysicalDeviceObject, BusRelations); - page = pdo_ext->u.pdo.preparsed_data->caps.UsagePage; usage = pdo_ext->u.pdo.preparsed_data->caps.Usage; if (page == HID_USAGE_PAGE_GENERIC && usage == HID_USAGE_GENERIC_MOUSE) @@ -242,6 +245,17 @@ static void create_child(minidriver *minidriver, DEVICE_OBJECT *fdo) else pdo_ext->u.pdo.rawinput_handle = alloc_rawinput_handle(); + if ((status = IoSetDevicePropertyData(child_pdo, &DEVPROPKEY_HID_HANDLE, LOCALE_NEUTRAL, + PLUGPLAY_PROPERTY_PERSISTENT, DEVPROP_TYPE_UINT32, + sizeof(pdo_ext->u.pdo.rawinput_handle), &pdo_ext->u.pdo.rawinput_handle))) + { + ERR("Failed to set device handle property, status %x\n", status); + IoDeleteDevice(child_pdo); + return; + } + + IoInvalidateDeviceRelations(fdo_ext->u.fdo.hid_ext.PhysicalDeviceObject, BusRelations); + pdo_ext->u.pdo.poll_interval = DEFAULT_POLL_INTERVAL; pdo_ext->u.pdo.ring_buffer = RingBuffer_Create(

1 0

Zebediah Figura : ws2_32: Move protocol lookup functions to protocol.c.
by Alexandre Julliard May 3, 2021

May 3, 2021

Module: wine Branch: master Commit: 5d9fe0363728d729cfee31c62420fe5a7db0335e URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d9fe0363728d729cfee31c6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Apr 30 19:10:01 2021 -0500 ws2_32: Move protocol lookup functions to protocol.c. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/protocol.c | 144 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/ws2_32/socket.c | 103 ----------------------------------- 2 files changed, 144 insertions(+), 103 deletions(-) diff --git a/dlls/ws2_32/protocol.c b/dlls/ws2_32/protocol.c index c2e661c03dc..ad840aaeb6f 100644 --- a/dlls/ws2_32/protocol.c +++ b/dlls/ws2_32/protocol.c @@ -1388,3 +1388,147 @@ int WINAPI GetHostNameW( WCHAR *name, int namelen ) MultiByteToWideChar( CP_ACP, 0, buf, -1, name, namelen ); return 0; } + + +static int list_size( char **list, int item_size ) +{ + int i, size = 0; + if (list) + { + for (i = 0; list[i]; i++) + size += (item_size ? item_size : strlen(list[i]) + 1); + size += (i + 1) * sizeof(char *); + } + return size; +} + +static int list_dup( char **src, char **dst, int item_size ) +{ + char *p; + int i; + + for (i = 0; src[i]; i++) + ; + p = (char *)(dst + i + 1); + + for (i = 0; src[i]; i++) + { + int count = item_size ? item_size : strlen(src[i]) + 1; + memcpy( p, src[i], count ); + dst[i] = p; + p += count; + } + dst[i] = NULL; + return p - (char *)dst; +} + +static const struct +{ + int prot; + const char *names[3]; +} +protocols[] = +{ + { 0, {"ip", "IP"}}, + { 1, {"icmp", "ICMP"}}, + { 3, {"ggp", "GGP"}}, + { 6, {"tcp", "TCP"}}, + { 8, {"egp", "EGP"}}, + {12, {"pup", "PUP"}}, + {17, {"udp", "UDP"}}, + {20, {"hmp", "HMP"}}, + {22, {"xns-idp", "XNS-IDP"}}, + {27, {"rdp", "RDP"}}, + {41, {"ipv6", "IPv6"}}, + {43, {"ipv6-route", "IPv6-Route"}}, + {44, {"ipv6-frag", "IPv6-Frag"}}, + {50, {"esp", "ESP"}}, + {51, {"ah", "AH"}}, + {58, {"ipv6-icmp", "IPv6-ICMP"}}, + {59, {"ipv6-nonxt", "IPv6-NoNxt"}}, + {60, {"ipv6-opts", "IPv6-Opts"}}, + {66, {"rvd", "RVD"}}, +}; + +static struct WS_protoent *get_protoent_buffer( unsigned int size ) +{ + struct per_thread_data *data = get_per_thread_data(); + + if (data->pe_buffer) + { + if (data->pe_len >= size) return data->pe_buffer; + HeapFree( GetProcessHeap(), 0, data->pe_buffer ); + } + data->pe_len = size; + data->pe_buffer = HeapAlloc( GetProcessHeap(), 0, size ); + if (!data->pe_buffer) SetLastError( WSAENOBUFS ); + return data->pe_buffer; +} + +static struct WS_protoent *create_protoent( const char *name, char **aliases, int prot ) +{ + struct WS_protoent *ret; + unsigned int size = sizeof(*ret) + strlen( name ) + sizeof(char *) + list_size( aliases, 0 ); + + if (!(ret = get_protoent_buffer( size ))) return NULL; + ret->p_proto = prot; + ret->p_name = (char *)(ret + 1); + strcpy( ret->p_name, name ); + ret->p_aliases = (char **)ret->p_name + strlen( name ) / sizeof(char *) + 1; + list_dup( aliases, ret->p_aliases, 0 ); + return ret; +} + + +/*********************************************************************** + * getprotobyname (ws2_32.53) + */ +struct WS_protoent * WINAPI WS_getprotobyname( const char *name ) +{ + struct WS_protoent *retval = NULL; + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(protocols); i++) + { + if (!_strnicmp( protocols[i].names[0], name, -1 )) + { + retval = create_protoent( protocols[i].names[0], (char **)protocols[i].names + 1, + protocols[i].prot ); + break; + } + } + if (!retval) + { + WARN( "protocol %s not found\n", debugstr_a(name) ); + SetLastError( WSANO_DATA ); + } + TRACE( "%s ret %p\n", debugstr_a(name), retval ); + return retval; +} + + +/*********************************************************************** + * getprotobynumber (ws2_32.54) + */ +struct WS_protoent * WINAPI WS_getprotobynumber( int number ) +{ + struct WS_protoent *retval = NULL; + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(protocols); i++) + { + if (protocols[i].prot == number) + { + retval = create_protoent( protocols[i].names[0], (char **)protocols[i].names + 1, + protocols[i].prot ); + break; + } + } + if (!retval) + { + WARN( "protocol %d not found\n", number ); + SetLastError( WSANO_DATA ); + } + TRACE( "%d ret %p\n", number, retval ); + return retval; +} diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 5ced4720558..c3c73568c83 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -609,7 +609,6 @@ int num_startup; static FARPROC blocking_hook = (FARPROC)WSA_DefaultBlockingHook; /* function prototypes */ -static struct WS_protoent *WS_create_pe( const char *name, char **aliases, int prot ); static struct WS_servent *WS_dup_se(const struct servent* p_se); static int ws_protocol_info(SOCKET s, int unicode, WSAPROTOCOL_INFOW *buffer, int *size); @@ -1578,21 +1577,6 @@ static struct WS_servent *check_buffer_se(int size) return ptb->se_buffer; } -static struct WS_protoent *check_buffer_pe(int size) -{ - struct per_thread_data * ptb = get_per_thread_data(); - if (ptb->pe_buffer) - { - if (ptb->pe_len >= size ) return ptb->pe_buffer; - HeapFree( GetProcessHeap(), 0, ptb->pe_buffer ); - } - ptb->pe_buffer = HeapAlloc( GetProcessHeap(), 0, (ptb->pe_len = size) ); - if (!ptb->pe_buffer) SetLastError(WSAENOBUFS); - return ptb->pe_buffer; -} - -/* ----------------------------------- i/o APIs */ - static inline BOOL supported_pf(int pf) { switch (pf) @@ -5737,79 +5721,6 @@ SOCKET WINAPI WS_socket(int af, int type, int protocol) } -static const struct { int prot; const char *names[3]; } protocols[] = -{ - { 0, { "ip", "IP" }}, - { 1, { "icmp", "ICMP" }}, - { 3, { "ggp", "GGP" }}, - { 6, { "tcp", "TCP" }}, - { 8, { "egp", "EGP" }}, - { 12, { "pup", "PUP" }}, - { 17, { "udp", "UDP" }}, - { 20, { "hmp", "HMP" }}, - { 22, { "xns-idp", "XNS-IDP" }}, - { 27, { "rdp", "RDP" }}, - { 41, { "ipv6", "IPv6" }}, - { 43, { "ipv6-route", "IPv6-Route" }}, - { 44, { "ipv6-frag", "IPv6-Frag" }}, - { 50, { "esp", "ESP" }}, - { 51, { "ah", "AH" }}, - { 58, { "ipv6-icmp", "IPv6-ICMP" }}, - { 59, { "ipv6-nonxt", "IPv6-NoNxt" }}, - { 60, { "ipv6-opts", "IPv6-Opts" }}, - { 66, { "rvd", "RVD" }}, -}; - -/*********************************************************************** - * getprotobyname (WS2_32.53) - */ -struct WS_protoent* WINAPI WS_getprotobyname(const char* name) -{ - struct WS_protoent* retval = NULL; - unsigned int i; - - for (i = 0; i < ARRAY_SIZE(protocols); i++) - { - if (_strnicmp( protocols[i].names[0], name, -1 )) continue; - retval = WS_create_pe( protocols[i].names[0], (char **)protocols[i].names + 1, - protocols[i].prot ); - break; - } - if (!retval) - { - WARN( "protocol %s not found\n", debugstr_a(name) ); - SetLastError(WSANO_DATA); - } - TRACE( "%s ret %p\n", debugstr_a(name), retval ); - return retval; -} - - -/*********************************************************************** - * getprotobynumber (WS2_32.54) - */ -struct WS_protoent* WINAPI WS_getprotobynumber(int number) -{ - struct WS_protoent* retval = NULL; - unsigned int i; - - for (i = 0; i < ARRAY_SIZE(protocols); i++) - { - if (protocols[i].prot != number) continue; - retval = WS_create_pe( protocols[i].names[0], (char **)protocols[i].names + 1, - protocols[i].prot ); - break; - } - if (!retval) - { - WARN( "protocol %d not found\n", number ); - SetLastError(WSANO_DATA); - } - TRACE("%i ret %p\n", number, retval); - return retval; -} - - /*********************************************************************** * getservbyname (WS2_32.55) */ @@ -6313,20 +6224,6 @@ static int list_dup(char** l_src, char** l_to, int item_size) return p - (char *)l_to; } -static struct WS_protoent *WS_create_pe( const char *name, char **aliases, int prot ) -{ - struct WS_protoent *ret; - unsigned int size = sizeof(*ret) + strlen(name) + sizeof(char *) + list_size(aliases, 0); - - if (!(ret = check_buffer_pe( size ))) return NULL; - ret->p_proto = prot; - ret->p_name = (char *)(ret + 1); - strcpy( ret->p_name, name ); - ret->p_aliases = (char **)ret->p_name + strlen(name) / sizeof(char *) + 1; - list_dup( aliases, ret->p_aliases, 0 ); - return ret; -} - /* ----- servent */ static struct WS_servent *WS_dup_se(const struct servent* p_se)

1 0

Hugh McMaster : comctl32/listview: Initialize marqueeRect from left-click coordinates before starting a marquee highlight.
by Alexandre Julliard May 3, 2021

May 3, 2021

Module: wine Branch: master Commit: daf95aaadf3a59f0ccc129a853327417b5e4f07c URL: https://source.winehq.org/git/wine.git/?a=commit;h=daf95aaadf3a59f0ccc129a8… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Apr 26 20:59:51 2021 +1000 comctl32/listview: Initialize marqueeRect from left-click coordinates before starting a marquee highlight. The infoPtr->marqueeRect structure is not currently initialized before the marquee highlight sequence starts, resulting in the RECT having initial coordinates of (0,0)-(0,0). These coordinates cause the first item in the listview control to be identified as being within the range of the marqueeRect's coordinates. That item is then set to LVIS_SELECTED even though it is not part of the marquee selection. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listview.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 05a772ab175..8cbfee834ce 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -4113,6 +4113,7 @@ static LRESULT LISTVIEW_MouseMove(LISTVIEW_INFO *infoPtr, WORD fwKeys, INT x, IN /* Begin selection and capture mouse */ infoPtr->bMarqueeSelect = TRUE; + infoPtr->marqueeRect = rect; SetCapture(infoPtr->hwndSelf); } }

1 0

Zebediah Figura : ws2_32: Move service lookup functions to protocol.c.
by Alexandre Julliard May 3, 2021

May 3, 2021

Module: wine Branch: master Commit: cfdaa7fdaf8f102d5eb9482ef0d18be615fe2684 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cfdaa7fdaf8f102d5eb9482e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Apr 30 19:10:02 2021 -0500 ws2_32: Move service lookup functions to protocol.c. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/protocol.c | 121 +++++++++++++++++++++++++++++++++++++ dlls/ws2_32/socket.c | 160 ------------------------------------------------- 2 files changed, 121 insertions(+), 160 deletions(-) diff --git a/dlls/ws2_32/protocol.c b/dlls/ws2_32/protocol.c index ad840aaeb6f..2cb6ef4be1c 100644 --- a/dlls/ws2_32/protocol.c +++ b/dlls/ws2_32/protocol.c @@ -1532,3 +1532,124 @@ struct WS_protoent * WINAPI WS_getprotobynumber( int number ) TRACE( "%d ret %p\n", number, retval ); return retval; } + + +static char *strdup_lower( const char *str ) +{ + char *ret = HeapAlloc( GetProcessHeap(), 0, strlen(str) + 1 ); + int i; + + if (ret) + { + for (i = 0; str[i]; i++) ret[i] = tolower( str[i] ); + ret[i] = 0; + } + else SetLastError( WSAENOBUFS ); + return ret; +} + +static struct WS_servent *get_servent_buffer( int size ) +{ + struct per_thread_data *data = get_per_thread_data(); + if (data->se_buffer) + { + if (data->se_len >= size) return data->se_buffer; + HeapFree( GetProcessHeap(), 0, data->se_buffer ); + } + data->se_len = size; + data->se_buffer = HeapAlloc( GetProcessHeap(), 0, size ); + if (!data->se_buffer) SetLastError( WSAENOBUFS ); + return data->se_buffer; +} + +static struct WS_servent *servent_from_unix( const struct servent *p_se ) +{ + char *p; + struct WS_servent *p_to; + + int size = (sizeof(*p_se) + + strlen(p_se->s_proto) + 1 + + strlen(p_se->s_name) + 1 + + list_size(p_se->s_aliases, 0)); + + if (!(p_to = get_servent_buffer( size ))) return NULL; + p_to->s_port = p_se->s_port; + + p = (char *)(p_to + 1); + p_to->s_name = p; + strcpy( p, p_se->s_name ); + p += strlen(p) + 1; + + p_to->s_proto = p; + strcpy( p, p_se->s_proto ); + p += strlen(p) + 1; + + p_to->s_aliases = (char **)p; + list_dup( p_se->s_aliases, p_to->s_aliases, 0 ); + return p_to; +} + + +/*********************************************************************** + * getservbyname (ws2_32.55) + */ +struct WS_servent * WINAPI WS_getservbyname( const char *name, const char *proto ) +{ + struct WS_servent *retval = NULL; + struct servent *serv; + char *name_str; + char *proto_str = NULL; + + if (!(name_str = strdup_lower( name ))) return NULL; + + if (proto && *proto) + { + if (!(proto_str = strdup_lower( proto ))) + { + HeapFree( GetProcessHeap(), 0, name_str ); + return NULL; + } + } + + EnterCriticalSection( &csWSgetXXXbyYYY ); + serv = getservbyname( name_str, proto_str ); + if (serv) + retval = servent_from_unix( serv ); + else + SetLastError( WSANO_DATA ); + LeaveCriticalSection( &csWSgetXXXbyYYY ); + + HeapFree( GetProcessHeap(), 0, proto_str ); + HeapFree( GetProcessHeap(), 0, name_str ); + TRACE( "%s, %s ret %p\n", debugstr_a(name), debugstr_a(proto), retval ); + return retval; +} + + +/*********************************************************************** + * getservbyport (ws2_32.56) + */ +struct WS_servent * WINAPI WS_getservbyport( int port, const char *proto ) +{ + struct WS_servent *retval = NULL; +#ifdef HAVE_GETSERVBYPORT + struct servent *serv; + char *proto_str = NULL; + + if (proto && *proto) + { + if (!(proto_str = strdup_lower( proto ))) return NULL; + } + + EnterCriticalSection( &csWSgetXXXbyYYY ); + if ((serv = getservbyport( port, proto_str ))) + retval = servent_from_unix( serv ); + else + SetLastError( WSANO_DATA ); + LeaveCriticalSection( &csWSgetXXXbyYYY ); + + HeapFree( GetProcessHeap(), 0, proto_str ); +#endif + TRACE( "%d (i.e. port %d), %s ret %p\n", port, (int)ntohl(port), debugstr_a(proto), retval ); + return retval; +} diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index c3c73568c83..2776e2f0014 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -225,7 +225,6 @@ static int WS2_recv_base( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine, LPWSABUF lpControlBuffer ); -DECLARE_CRITICAL_SECTION(csWSgetXXXbyYYY); DECLARE_CRITICAL_SECTION(cs_if_addr_cache); DECLARE_CRITICAL_SECTION(cs_socket_list); @@ -609,7 +608,6 @@ int num_startup; static FARPROC blocking_hook = (FARPROC)WSA_DefaultBlockingHook; /* function prototypes */ -static struct WS_servent *WS_dup_se(const struct servent* p_se); static int ws_protocol_info(SOCKET s, int unicode, WSAPROTOCOL_INFOW *buffer, int *size); int WSAIOCTL_GetInterfaceCount(void); @@ -1340,22 +1338,6 @@ static int convert_sockopt(INT *level, INT *optname) return 0; } -/* ----------------------------------- Per-thread info (or per-process?) */ - -static char *strdup_lower(const char *str) -{ - int i; - char *ret = HeapAlloc( GetProcessHeap(), 0, strlen(str) + 1 ); - - if (ret) - { - for (i = 0; str[i]; i++) ret[i] = tolower(str[i]); - ret[i] = 0; - } - else SetLastError(WSAENOBUFS); - return ret; -} - /* Utility: get the SO_RCVTIMEO or SO_SNDTIMEO socket option * from an fd and return the value converted to milli seconds * or 0 if there is an infinite time out */ @@ -1564,19 +1546,6 @@ void WINAPI WSASetLastError(INT iError) { SetLastError(iError); } -static struct WS_servent *check_buffer_se(int size) -{ - struct per_thread_data * ptb = get_per_thread_data(); - if (ptb->se_buffer) - { - if (ptb->se_len >= size ) return ptb->se_buffer; - HeapFree( GetProcessHeap(), 0, ptb->se_buffer ); - } - ptb->se_buffer = HeapAlloc( GetProcessHeap(), 0, (ptb->se_len = size) ); - if (!ptb->se_buffer) SetLastError(WSAENOBUFS); - return ptb->se_buffer; -} - static inline BOOL supported_pf(int pf) { switch (pf) @@ -5721,68 +5690,6 @@ SOCKET WINAPI WS_socket(int af, int type, int protocol) } -/*********************************************************************** - * getservbyname (WS2_32.55) - */ -struct WS_servent* WINAPI WS_getservbyname(const char *name, const char *proto) -{ - struct WS_servent* retval = NULL; - struct servent* serv; - char *name_str; - char *proto_str = NULL; - - if (!(name_str = strdup_lower(name))) return NULL; - - if (proto && *proto) - { - if (!(proto_str = strdup_lower(proto))) - { - HeapFree( GetProcessHeap(), 0, name_str ); - return NULL; - } - } - - EnterCriticalSection( &csWSgetXXXbyYYY ); - serv = getservbyname(name_str, proto_str); - if( serv != NULL ) - { - retval = WS_dup_se(serv); - } - else SetLastError(WSANO_DATA); - LeaveCriticalSection( &csWSgetXXXbyYYY ); - HeapFree( GetProcessHeap(), 0, proto_str ); - HeapFree( GetProcessHeap(), 0, name_str ); - TRACE( "%s, %s ret %p\n", debugstr_a(name), debugstr_a(proto), retval ); - return retval; -} - -/*********************************************************************** - * getservbyport (WS2_32.56) - */ -struct WS_servent* WINAPI WS_getservbyport(int port, const char *proto) -{ - struct WS_servent* retval = NULL; -#ifdef HAVE_GETSERVBYPORT - struct servent* serv; - char *proto_str = NULL; - - if (proto && *proto) - { - if (!(proto_str = strdup_lower(proto))) return NULL; - } - EnterCriticalSection( &csWSgetXXXbyYYY ); - if( (serv = getservbyport(port, proto_str)) != NULL ) { - retval = WS_dup_se(serv); - } - else SetLastError(WSANO_DATA); - LeaveCriticalSection( &csWSgetXXXbyYYY ); - HeapFree( GetProcessHeap(), 0, proto_str ); -#endif - TRACE("%d (i.e. port %d), %s ret %p\n", port, (int)ntohl(port), debugstr_a(proto), retval); - return retval; -} - - /*********************************************************************** * WSAEnumNetworkEvents (WS2_32.36) */ @@ -6187,73 +6094,6 @@ INT WINAPI WSAUnhookBlockingHook(void) } -/* ----------------------------------- end of API stuff */ - -/* ----------------------------------- helper functions - - * - * TODO: Merge WS_dup_..() stuff into one function that - * would operate with a generic structure containing internal - * pointers (via a template of some kind). - */ - -static int list_size(char** l, int item_size) -{ - int i,j = 0; - if(l) - { for(i=0;l[i];i++) - j += (item_size) ? item_size : strlen(l[i]) + 1; - j += (i + 1) * sizeof(char*); } - return j; -} - -static int list_dup(char** l_src, char** l_to, int item_size) -{ - char *p; - int i; - - for (i = 0; l_src[i]; i++) ; - p = (char *)(l_to + i + 1); - for (i = 0; l_src[i]; i++) - { - int count = ( item_size ) ? item_size : strlen(l_src[i]) + 1; - memcpy(p, l_src[i], count); - l_to[i] = p; - p += count; - } - l_to[i] = NULL; - return p - (char *)l_to; -} - -/* ----- servent */ - -static struct WS_servent *WS_dup_se(const struct servent* p_se) -{ - char *p; - struct WS_servent *p_to; - - int size = (sizeof(*p_se) + - strlen(p_se->s_proto) + 1 + - strlen(p_se->s_name) + 1 + - list_size(p_se->s_aliases, 0)); - - if (!(p_to = check_buffer_se(size))) return NULL; - p_to->s_port = p_se->s_port; - - p = (char *)(p_to + 1); - p_to->s_name = p; - strcpy(p, p_se->s_name); - p += strlen(p) + 1; - - p_to->s_proto = p; - strcpy(p, p_se->s_proto); - p += strlen(p) + 1; - - p_to->s_aliases = (char **)p; - list_dup(p_se->s_aliases, p_to->s_aliases, 0); - return p_to; -} - - /*********************************************************************** * WSARecv (WS2_32.67) */

1 0

Rémi Bernon : user32: Add a default ActivateKeyboardLayout implementation.
by Alexandre Julliard May 3, 2021

May 3, 2021

Module: wine Branch: master Commit: 66a46120a0fda1c5d5d046683497d06404203514 URL: https://source.winehq.org/git/wine.git/?a=commit;h=66a46120a0fda1c5d5d04668… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon May 3 11:37:56 2021 +0200 user32: Add a default ActivateKeyboardLayout implementation. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/driver.c | 2 +- dlls/user32/input.c | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index c075a49a350..f683cf25b7e 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -189,7 +189,7 @@ void USER_unload_driver(void) static HKL CDECL nulldrv_ActivateKeyboardLayout( HKL layout, UINT flags ) { - return 0; + return (HKL)~0; /* use default implementation */ } static void CDECL nulldrv_Beep(void) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 97be83369d9..ff90bc6f343 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -1310,11 +1310,16 @@ INT WINAPI ToAsciiEx( UINT virtKey, UINT scanCode, const BYTE *lpKeyState, /********************************************************************** * ActivateKeyboardLayout (USER32.@) */ -HKL WINAPI ActivateKeyboardLayout(HKL hLayout, UINT flags) +HKL WINAPI ActivateKeyboardLayout( HKL layout, UINT flags ) { - TRACE_(keyboard)("(%p, %d)\n", hLayout, flags); + HKL old_layout; - return USER_Driver->pActivateKeyboardLayout(hLayout, flags); + TRACE_(keyboard)( "layout %p, flags %x\n", layout, flags ); + + if ((old_layout = USER_Driver->pActivateKeyboardLayout( layout, flags )) != (HKL)~0) + return old_layout; + + return get_locale_kbd_layout(); } /**********************************************************************

1 0

Rémi Bernon : user32: Add a default GetKeyboardLayout implementation.
by Alexandre Julliard May 3, 2021

May 3, 2021

Module: wine Branch: master Commit: 92cbeed9d7a60e1961c3f7a385d2ad3b06a49843 URL: https://source.winehq.org/git/wine.git/?a=commit;h=92cbeed9d7a60e1961c3f7a3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon May 3 11:37:58 2021 +0200 user32: Add a default GetKeyboardLayout implementation. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/driver.c | 2 +- dlls/user32/input.c | 6 +++++- dlls/wineandroid.drv/keyboard.c | 20 -------------------- dlls/wineandroid.drv/wineandroid.drv.spec | 1 - 4 files changed, 6 insertions(+), 23 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index f683cf25b7e..efaa04db096 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -208,7 +208,7 @@ static INT CDECL nulldrv_GetKeyNameText( LONG lparam, LPWSTR buffer, INT size ) static HKL CDECL nulldrv_GetKeyboardLayout( DWORD thread_id ) { - return 0; + return (HKL)~0; /* use default implementation */ } static BOOL CDECL nulldrv_GetKeyboardLayoutName( LPWSTR name ) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index d3dcf375746..1f795e43545 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -1083,7 +1083,11 @@ UINT WINAPI GetKBCodePage(void) */ HKL WINAPI GetKeyboardLayout(DWORD thread_id) { - return USER_Driver->pGetKeyboardLayout(thread_id); + HKL layout; + + if ((layout = USER_Driver->pGetKeyboardLayout( thread_id )) != (HKL)~0) return layout; + + return get_locale_kbd_layout(); } /**************************************************************************** diff --git a/dlls/wineandroid.drv/keyboard.c b/dlls/wineandroid.drv/keyboard.c index 04565c3fad8..803f13d8f39 100644 --- a/dlls/wineandroid.drv/keyboard.c +++ b/dlls/wineandroid.drv/keyboard.c @@ -878,26 +878,6 @@ UINT CDECL ANDROID_MapVirtualKeyEx( UINT code, UINT maptype, HKL hkl ) } -/*********************************************************************** - * ANDROID_GetKeyboardLayout - */ -HKL CDECL ANDROID_GetKeyboardLayout( DWORD thread_id ) -{ - ULONG_PTR layout = GetUserDefaultLCID(); - LANGID langid; - static int once; - - langid = PRIMARYLANGID(LANGIDFROMLCID( layout )); - if (langid == LANG_CHINESE || langid == LANG_JAPANESE || langid == LANG_KOREAN) - layout = MAKELONG( layout, 0xe001 ); /* IME */ - else - layout |= layout << 16; - - if (!once++) FIXME( "returning %lx\n", layout ); - return (HKL)layout; -} - - /*********************************************************************** * ANDROID_VkKeyScanEx */ diff --git a/dlls/wineandroid.drv/wineandroid.drv.spec b/dlls/wineandroid.drv/wineandroid.drv.spec index 6f27c1586b3..d79665ecc72 100644 --- a/dlls/wineandroid.drv/wineandroid.drv.spec +++ b/dlls/wineandroid.drv/wineandroid.drv.spec @@ -5,7 +5,6 @@ # USER driver @ cdecl GetKeyNameText(long ptr long) ANDROID_GetKeyNameText -@ cdecl GetKeyboardLayout(long) ANDROID_GetKeyboardLayout @ cdecl MapVirtualKeyEx(long long long) ANDROID_MapVirtualKeyEx @ cdecl VkKeyScanEx(long long) ANDROID_VkKeyScanEx @ cdecl SetCursor(long) ANDROID_SetCursor

1 0