October 2021 - Wine-Commits

Rémi Bernon : ntdll: Use the unrolled memset from msvcrt.
by Alexandre Julliard Oct. 25, 2021

Oct. 25, 2021

Module: wine Branch: master Commit: a602bdd326cf09b9c77ecbd4cb59af3c32bf2ecd URL: https://source.winehq.org/git/wine.git/?a=commit;h=a602bdd326cf09b9c77ecbd4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Oct 21 10:44:30 2021 +0200 ntdll: Use the unrolled memset from msvcrt. Although less frequently used, heap allocations are zeroed out with ntdll memset and they don't benefit from the msvcrt memset optimisation. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/string.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 63 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/string.c b/dlls/ntdll/string.c index fe484426bcb..0fa83821d21 100644 --- a/dlls/ntdll/string.c +++ b/dlls/ntdll/string.c @@ -25,6 +25,7 @@ #include <stdlib.h> #include <stdio.h> #include <string.h> +#include <stdint.h> #include "windef.h" #include "winbase.h" @@ -140,13 +141,72 @@ void * __cdecl memmove( void *dst, const void *src, size_t n ) } +static inline void memset_aligned_32( unsigned char *d, uint64_t v, size_t n ) +{ + unsigned char *end = d + n; + while (d < end) + { + *(uint64_t *)(d + 0) = v; + *(uint64_t *)(d + 8) = v; + *(uint64_t *)(d + 16) = v; + *(uint64_t *)(d + 24) = v; + d += 32; + } +} + /********************************************************************* * memset (NTDLL.@) */ -void * __cdecl memset( void *dst, int c, size_t n ) +void *__cdecl memset( void *dst, int c, size_t n ) { - volatile unsigned char *d = dst; /* avoid gcc optimizations */ - while (n--) *d++ = c; + typedef uint64_t DECLSPEC_ALIGN(1) unaligned_ui64; + typedef uint32_t DECLSPEC_ALIGN(1) unaligned_ui32; + typedef uint16_t DECLSPEC_ALIGN(1) unaligned_ui16; + + uint64_t v = 0x101010101010101ull * (unsigned char)c; + unsigned char *d = (unsigned char *)dst; + size_t a = 0x20 - ((uintptr_t)d & 0x1f); + + if (n >= 16) + { + *(unaligned_ui64 *)(d + 0) = v; + *(unaligned_ui64 *)(d + 8) = v; + *(unaligned_ui64 *)(d + n - 16) = v; + *(unaligned_ui64 *)(d + n - 8) = v; + if (n <= 32) return dst; + *(unaligned_ui64 *)(d + 16) = v; + *(unaligned_ui64 *)(d + 24) = v; + *(unaligned_ui64 *)(d + n - 32) = v; + *(unaligned_ui64 *)(d + n - 24) = v; + if (n <= 64) return dst; + + n = (n - a) & ~0x1f; + memset_aligned_32( d + a, v, n ); + return dst; + } + if (n >= 8) + { + *(unaligned_ui64 *)d = v; + *(unaligned_ui64 *)(d + n - 8) = v; + return dst; + } + if (n >= 4) + { + *(unaligned_ui32 *)d = v; + *(unaligned_ui32 *)(d + n - 4) = v; + return dst; + } + if (n >= 2) + { + *(unaligned_ui16 *)d = v; + *(unaligned_ui16 *)(d + n - 2) = v; + return dst; + } + if (n >= 1) + { + *(uint8_t *)d = v; + return dst; + } return dst; }

1 0

Alistair Leslie-Hughes : msdasql: Add IDBInitialize support.
by Alexandre Julliard Oct. 25, 2021

Oct. 25, 2021

Module: wine Branch: master Commit: 6e351769f8acd74aa5c4d55636d908be4b463f8e URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e351769f8acd74aa5c4d556… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Oct 25 20:34:33 2021 +1100 msdasql: Add IDBInitialize support. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdasql/msdasql_main.c | 60 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/dlls/msdasql/msdasql_main.c b/dlls/msdasql/msdasql_main.c index 31830e7025b..00dbcec6780 100644 --- a/dlls/msdasql/msdasql_main.c +++ b/dlls/msdasql/msdasql_main.c @@ -104,6 +104,7 @@ struct msdasql { IUnknown MSDASQL_iface; IDBProperties IDBProperties_iface; + IDBInitialize IDBInitialize_iface; LONG ref; }; @@ -118,6 +119,11 @@ static inline struct msdasql *impl_from_IDBProperties(IDBProperties *iface) return CONTAINING_RECORD(iface, struct msdasql, IDBProperties_iface); } +static inline struct msdasql *impl_from_IDBInitialize(IDBInitialize *iface) +{ + return CONTAINING_RECORD(iface, struct msdasql, IDBInitialize_iface); +} + static HRESULT WINAPI msdsql_QueryInterface(IUnknown *iface, REFIID riid, void **out) { struct msdasql *provider = impl_from_IUnknown(iface); @@ -133,6 +139,10 @@ static HRESULT WINAPI msdsql_QueryInterface(IUnknown *iface, REFIID riid, void * { *out = &provider->IDBProperties_iface; } + else if ( IsEqualGUID(riid, &IID_IDBInitialize)) + { + *out = &provider->IDBInitialize_iface; + } else { FIXME("(%s, %p)\n", debugstr_guid(riid), out); @@ -239,6 +249,55 @@ static const struct IDBPropertiesVtbl dbprops_vtbl = dbprops_SetProperties }; +static HRESULT WINAPI dbinit_QueryInterface(IDBInitialize *iface, REFIID riid, void **ppvObject) +{ + struct msdasql *provider = impl_from_IDBInitialize(iface); + + return IUnknown_QueryInterface(&provider->MSDASQL_iface, riid, ppvObject); +} + +static ULONG WINAPI dbinit_AddRef(IDBInitialize *iface) +{ + struct msdasql *provider = impl_from_IDBInitialize(iface); + + return IUnknown_AddRef(&provider->MSDASQL_iface); +} + +static ULONG WINAPI dbinit_Release(IDBInitialize *iface) +{ + struct msdasql *provider = impl_from_IDBInitialize(iface); + + return IUnknown_Release(&provider->MSDASQL_iface); +} + +static HRESULT WINAPI dbinit_Initialize(IDBInitialize *iface) +{ + struct msdasql *provider = impl_from_IDBInitialize(iface); + + FIXME("%p stub\n", provider); + + return S_OK; +} + +static HRESULT WINAPI dbinit_Uninitialize(IDBInitialize *iface) +{ + struct msdasql *provider = impl_from_IDBInitialize(iface); + + FIXME("%p stub\n", provider); + + return S_OK; +} + + +static const struct IDBInitializeVtbl dbinit_vtbl = +{ + dbinit_QueryInterface, + dbinit_AddRef, + dbinit_Release, + dbinit_Initialize, + dbinit_Uninitialize +}; + static HRESULT create_msdasql_provider(REFIID riid, void **ppv) { struct msdasql *provider; @@ -250,6 +309,7 @@ static HRESULT create_msdasql_provider(REFIID riid, void **ppv) provider->MSDASQL_iface.lpVtbl = &msdsql_vtbl; provider->IDBProperties_iface.lpVtbl = &dbprops_vtbl; + provider->IDBInitialize_iface.lpVtbl = &dbinit_vtbl; provider->ref = 1; hr = IUnknown_QueryInterface(&provider->MSDASQL_iface, riid, ppv);

1 0

Rémi Bernon : msvcrt: Write memory forward in memset.
by Alexandre Julliard Oct. 25, 2021

Oct. 25, 2021

Module: wine Branch: master Commit: 7c046c7afd4253daa9cd8dbb6b2f466f128fecc9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c046c7afd4253daa9cd8dbb… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Oct 21 10:44:29 2021 +0200 msvcrt: Write memory forward in memset. Instead of going backward, which breaks the Linux kernel transparent huge pages allocation assumptions. This can be reproduced by calling memset on large, newly allocated, memory regions. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/string.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 5655fbfe68a..48d44d3b72e 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -2857,13 +2857,14 @@ void * __cdecl memcpy(void *dst, const void *src, size_t n) static inline void memset_aligned_32(unsigned char *d, uint64_t v, size_t n) { - while (n >= 32) - { - *(uint64_t *)(d + n - 32) = v; - *(uint64_t *)(d + n - 24) = v; - *(uint64_t *)(d + n - 16) = v; - *(uint64_t *)(d + n - 8) = v; - n -= 32; + unsigned char *end = d + n; + while (d < end) + { + *(uint64_t *)(d + 0) = v; + *(uint64_t *)(d + 8) = v; + *(uint64_t *)(d + 16) = v; + *(uint64_t *)(d + 24) = v; + d += 32; } }

1 0

Alistair Leslie-Hughes : msdasql: Implement MSDASQL provider.
by Alexandre Julliard Oct. 25, 2021

Oct. 25, 2021

Module: wine Branch: master Commit: 00d2ca25b0b161570cea54d7d2cb4f977a5a22fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=00d2ca25b0b161570cea54d7… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Oct 25 20:34:31 2021 +1100 msdasql: Implement MSDASQL provider. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdasql/msdasql_main.c | 105 ++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 97 insertions(+), 8 deletions(-) diff --git a/dlls/msdasql/msdasql_main.c b/dlls/msdasql/msdasql_main.c index c3c54ba2606..91978ad9c1a 100644 --- a/dlls/msdasql/msdasql_main.c +++ b/dlls/msdasql/msdasql_main.c @@ -64,11 +64,13 @@ static ULONG WINAPI ClassFactory_Release(IClassFactory *iface) return 1; } -HRESULT WINAPI ClassFactory_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **ppv) +static HRESULT create_msdasql_provider(REFIID riid, void **ppv); + +HRESULT WINAPI msdasql_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **ppv) { - FIXME("(%p %s %p)\n", outer, debugstr_guid(riid), ppv); + TRACE("(%p %s %p)\n", outer, debugstr_guid(riid), ppv); - return CLASS_E_CLASSNOTAVAILABLE; + return create_msdasql_provider(riid, ppv); } static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL fLock) @@ -77,18 +79,105 @@ static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL fLock) return S_OK; } -static const IClassFactoryVtbl cffactoryVtbl = { +static const IClassFactoryVtbl cfmsdasqlVtbl = { ClassFactory_QueryInterface, ClassFactory_AddRef, ClassFactory_Release, - ClassFactory_CreateInstance, + msdasql_CreateInstance, ClassFactory_LockServer }; -static IClassFactory cffactory = { &cffactoryVtbl }; +static IClassFactory cfmsdasql = { &cfmsdasqlVtbl }; HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID riid, void **ppv ) { - FIXME("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); - return IClassFactory_QueryInterface(&cffactory, riid, ppv); + TRACE("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + + if (IsEqualGUID(&CLSID_MSDASQL, rclsid)) + return IClassFactory_QueryInterface(&cfmsdasql, riid, ppv); + + return CLASS_E_CLASSNOTAVAILABLE; +} + +struct msdasql +{ + IUnknown MSDASQL_iface; + + LONG ref; +}; + +static inline struct msdasql *impl_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, struct msdasql, MSDASQL_iface); +} + +static HRESULT WINAPI msdsql_QueryInterface(IUnknown *iface, REFIID riid, void **out) +{ + struct msdasql *provider = impl_from_IUnknown(iface); + + TRACE("(%p)->(%s %p)\n", provider, debugstr_guid(riid), out); + + if(IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &CLSID_MSDASQL)) + { + *out = &provider->MSDASQL_iface; + } + else + { + FIXME("(%s, %p)\n", debugstr_guid(riid), out); + *out = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*out); + return S_OK; +} + +static ULONG WINAPI msdsql_AddRef(IUnknown *iface) +{ + struct msdasql *provider = impl_from_IUnknown(iface); + ULONG ref = InterlockedIncrement(&provider->ref); + + TRACE("(%p) ref=%u\n", provider, ref); + + return ref; +} + +static ULONG WINAPI msdsql_Release(IUnknown *iface) +{ + struct msdasql *provider = impl_from_IUnknown(iface); + ULONG ref = InterlockedDecrement(&provider->ref); + + TRACE("(%p) ref=%u\n", provider, ref); + + if (!ref) + { + free(provider); + } + + return ref; +} + +static const IUnknownVtbl msdsql_vtbl = +{ + msdsql_QueryInterface, + msdsql_AddRef, + msdsql_Release +}; + +static HRESULT create_msdasql_provider(REFIID riid, void **ppv) +{ + struct msdasql *provider; + HRESULT hr; + + provider = malloc(sizeof(struct msdasql)); + if (!provider) + return E_OUTOFMEMORY; + + provider->MSDASQL_iface.lpVtbl = &msdsql_vtbl; + provider->ref = 1; + + hr = IUnknown_QueryInterface(&provider->MSDASQL_iface, riid, ppv); + IUnknown_Release(&provider->MSDASQL_iface); + return hr; }

1 0

Alistair Leslie-Hughes : msdasql: New DLL.
by Alexandre Julliard Oct. 25, 2021

Oct. 25, 2021

Module: wine Branch: master Commit: 48cc6ce421332b4b32ac500b6f9362442feda6da URL: https://source.winehq.org/git/wine.git/?a=commit;h=48cc6ce421332b4b32ac500b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Oct 25 20:34:29 2021 +1100 msdasql: New DLL. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 + configure.ac | 1 + dlls/msdasql/Makefile.in | 7 ++++ dlls/msdasql/msdasql.spec | 4 ++ dlls/msdasql/msdasql_main.c | 91 +++++++++++++++++++++++++++++++++++++++++++++ loader/wine.inf.in | 2 + 6 files changed, 107 insertions(+) diff --git a/configure b/configure index 5100dd8af5f..229aaa288ac 100755 --- a/configure +++ b/configure @@ -1451,6 +1451,7 @@ enable_mscorwks enable_msctf enable_msctfp enable_msdaps +enable_msdasql enable_msdelta enable_msdmo enable_msdrm @@ -19409,6 +19410,7 @@ wine_fn_config_makefile dlls/msctf enable_msctf wine_fn_config_makefile dlls/msctf/tests enable_tests wine_fn_config_makefile dlls/msctfp enable_msctfp wine_fn_config_makefile dlls/msdaps enable_msdaps +wine_fn_config_makefile dlls/msdasql enable_msdasql wine_fn_config_makefile dlls/msdelta enable_msdelta wine_fn_config_makefile dlls/msdmo enable_msdmo wine_fn_config_makefile dlls/msdmo/tests enable_tests diff --git a/configure.ac b/configure.ac index 6941b2c73a8..70e90c54558 100644 --- a/configure.ac +++ b/configure.ac @@ -3119,6 +3119,7 @@ WINE_CONFIG_MAKEFILE(dlls/msctf) WINE_CONFIG_MAKEFILE(dlls/msctf/tests) WINE_CONFIG_MAKEFILE(dlls/msctfp) WINE_CONFIG_MAKEFILE(dlls/msdaps) +WINE_CONFIG_MAKEFILE(dlls/msdasql) WINE_CONFIG_MAKEFILE(dlls/msdelta) WINE_CONFIG_MAKEFILE(dlls/msdmo) WINE_CONFIG_MAKEFILE(dlls/msdmo/tests) diff --git a/dlls/msdasql/Makefile.in b/dlls/msdasql/Makefile.in new file mode 100644 index 00000000000..71db923d09e --- /dev/null +++ b/dlls/msdasql/Makefile.in @@ -0,0 +1,7 @@ +MODULE = msdasql.dll +IMPORTS = uuid + +EXTRADLLFLAGS = -Wb,--prefer-native + +C_SRCS = \ + msdasql_main.c diff --git a/dlls/msdasql/msdasql.spec b/dlls/msdasql/msdasql.spec new file mode 100644 index 00000000000..b16365d0c9f --- /dev/null +++ b/dlls/msdasql/msdasql.spec @@ -0,0 +1,4 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/msdasql/msdasql_main.c b/dlls/msdasql/msdasql_main.c new file mode 100644 index 00000000000..1b3f5f5ed24 --- /dev/null +++ b/dlls/msdasql/msdasql_main.c @@ -0,0 +1,91 @@ +/* + * 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 <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "objbase.h" +#include "rpcproxy.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msdasql); + +static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) +{ + *ppv = NULL; + + if(IsEqualGUID(&IID_IUnknown, riid)) { + TRACE("(%p)->(IID_IUnknown %p)\n", iface, ppv); + *ppv = iface; + }else if(IsEqualGUID(&IID_IClassFactory, riid)) { + TRACE("(%p)->(IID_IClassFactory %p)\n", iface, ppv); + *ppv = iface; + } + + if(*ppv) { + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; + } + + WARN("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppv); + return E_NOINTERFACE; +} + +static ULONG WINAPI ClassFactory_AddRef(IClassFactory *iface) +{ + TRACE("(%p)\n", iface); + return 2; +} + +static ULONG WINAPI ClassFactory_Release(IClassFactory *iface) +{ + TRACE("(%p)\n", iface); + return 1; +} + +HRESULT WINAPI ClassFactory_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **ppv) +{ + FIXME("(%p %s %p)\n", outer, debugstr_guid(riid), ppv); + + return CLASS_E_CLASSNOTAVAILABLE; +} + +static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL fLock) +{ + TRACE("(%p)->(%x)\n", iface, fLock); + return S_OK; +} + +static const IClassFactoryVtbl cffactoryVtbl = { + ClassFactory_QueryInterface, + ClassFactory_AddRef, + ClassFactory_Release, + ClassFactory_CreateInstance, + ClassFactory_LockServer +}; + +static IClassFactory cffactory = { &cffactoryVtbl }; + +HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID riid, void **ppv ) +{ + FIXME("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + return IClassFactory_QueryInterface(&cffactory, riid, ppv); +} diff --git a/loader/wine.inf.in b/loader/wine.inf.in index d023701c04b..b1894dcba61 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2657,6 +2657,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 16422,Windows NT\Accessories,wordpad.exe 16427,System\OLE DB,oledb32.dll 16427,System\OLE DB,msdaps.dll +16427,System\OLE DB,msdasql.dll 16427,System\ADO,msado15.dll 66000,3,wineps.drv 12,,*.sys,- @@ -2716,6 +2717,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 16427,Microsoft Shared\TextConv, 16427,System\OLE DB,oledb32.dll 16427,System\OLE DB,msdaps.dll +16427,System\OLE DB,msdasql.dll 16427,System\ADO,msado15.dll 66000,3,wineps.drv 12,,*.sys

1 0

Rémi Bernon : winex11.drv: Accumulate mouse movement to avoid rounding losses.
by Alexandre Julliard Oct. 25, 2021

Oct. 25, 2021

Module: wine Branch: master Commit: f7ac9f309f2964e131c8e60c5ff3a878b67b2e32 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7ac9f309f2964e131c8e60c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Oct 25 11:51:55 2021 +0200 winex11.drv: Accumulate mouse movement to avoid rounding losses. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=38420 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/mouse.c | 41 ++++++++++++++++++++++++++++++++--------- 1 file changed, 32 insertions(+), 9 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 1ef7027e838..8cc30f0736d 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -22,6 +22,8 @@ #include "config.h" #include "wine/port.h" +#include <math.h> + #include <X11/Xlib.h> #include <X11/cursorfont.h> #include <stdarg.h> @@ -270,6 +272,9 @@ static void update_relative_valuators(XIAnyClassInfo **valuators, int n_valuator (!class->label && class->number == 1 && class->mode == XIModeRelative)) thread_data->y_valuator = *class; } + + thread_data->x_valuator.value = 0; + thread_data->y_valuator.value = 0; } #endif @@ -351,6 +356,8 @@ static void disable_xinput2(void) pXIFreeDeviceInfo( data->xi2_devices ); data->x_valuator.number = -1; data->y_valuator.number = -1; + data->x_valuator.value = 0; + data->y_valuator.value = 0; data->xi2_devices = NULL; data->xi2_core_pointer = 0; data->xi2_current_slave = 0; @@ -626,8 +633,8 @@ static BOOL map_raw_event_coords( XIRawEvent *event, INPUT *input ) { struct x11drv_thread_data *thread_data = x11drv_thread_data(); XIValuatorClassInfo *x = &thread_data->x_valuator, *y = &thread_data->y_valuator; + double x_value = 0, y_value = 0, x_scale, y_scale; const double *values = event->valuators.values; - double dx = 0, dy = 0, val; RECT virtual_rect; int i; @@ -656,25 +663,41 @@ static BOOL map_raw_event_coords( XIRawEvent *event, INPUT *input ) virtual_rect = get_virtual_screen_rect(); + if (x->max <= x->min) x_scale = 1; + else x_scale = (virtual_rect.right - virtual_rect.left) / (x->max - x->min); + if (y->max <= y->min) y_scale = 1; + else y_scale = (virtual_rect.bottom - virtual_rect.top) / (y->max - y->min); + for (i = 0; i <= max( x->number, y->number ); i++) { if (!XIMaskIsSet( event->valuators.mask, i )) continue; - val = *values++; if (i == x->number) { - input->u.mi.dx = dx = val; - if (x->min < x->max) - input->u.mi.dx = val * (virtual_rect.right - virtual_rect.left) / (x->max - x->min); + x_value = *values; + x->value += x_value * x_scale; } if (i == y->number) { - input->u.mi.dy = dy = val; - if (y->min < y->max) - input->u.mi.dy = val * (virtual_rect.bottom - virtual_rect.top) / (y->max - y->min); + y_value = *values; + y->value += y_value * y_scale; } + values++; + } + + input->u.mi.dx = round( x->value ); + input->u.mi.dy = round( y->value ); + + TRACE( "event %f,%f value %f,%f input %d,%d\n", x_value, y_value, x->value, y->value, input->u.mi.dx, input->u.mi.dy ); + + x->value -= input->u.mi.dx; + y->value -= input->u.mi.dy; + + if (!input->u.mi.dx && !input->u.mi.dy) + { + TRACE( "accumulating motion\n" ); + return FALSE; } - TRACE( "pos %d,%d (event %f,%f)\n", input->u.mi.dx, input->u.mi.dy, dx, dy ); return TRUE; }

1 0

Damjan Jovanovic : wrc: Use sysctl instead of /proc/curproc/file on FreeBSD.
by Alexandre Julliard Oct. 25, 2021

Oct. 25, 2021

Module: wine Branch: master Commit: f01b028d58d4195c9f84a08528ae7f9c226746e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f01b028d58d4195c9f84a085… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sat Oct 23 10:18:43 2021 +0200 wrc: Use sysctl instead of /proc/curproc/file on FreeBSD. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wrc/wrc.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/tools/wrc/wrc.c b/tools/wrc/wrc.c index 8cdb91195cf..b44ae6fd0e5 100644 --- a/tools/wrc/wrc.c +++ b/tools/wrc/wrc.c @@ -27,6 +27,11 @@ #include <assert.h> #include <ctype.h> #include <signal.h> +#include <limits.h> +#include <sys/types.h> +#ifdef HAVE_SYS_SYSCTL_H +# include <sys/sysctl.h> +#endif #include "../tools.h" #include "wrc.h" @@ -336,7 +341,12 @@ static void init_argv0_dir( const char *argv0 ) #if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) dir = realpath( "/proc/self/exe", NULL ); #elif defined (__FreeBSD__) || defined(__DragonFly__) - dir = realpath( "/proc/curproc/file", NULL ); + static int pathname[] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 }; + size_t path_size = PATH_MAX; + char *path = malloc( path_size ); + if (path && !sysctl( pathname, sizeof(pathname)/sizeof(pathname[0]), path, &path_size, NULL, 0 )) + dir = realpath( path, NULL ); + free( path ); #else dir = realpath( argv0, NULL ); #endif

1 0

Nikolay Sivov : mfplay: Better handle video control method calls when there is no media item set.
by Alexandre Julliard Oct. 25, 2021

Oct. 25, 2021

Module: wine Branch: master Commit: dbe241990f9499ecaf00733e5e9e1e117faaf177 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dbe241990f9499ecaf00733e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 25 13:04:16 2021 +0300 mfplay: Better handle video control method calls when there is no media item set. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/player.c | 33 +++++++++-------- dlls/mfplay/tests/Makefile.in | 2 +- dlls/mfplay/tests/mfplay.c | 86 +++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 101 insertions(+), 20 deletions(-) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index 28226f92962..03f204768ab 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -1323,6 +1323,15 @@ static HRESULT WINAPI media_player_SetMute(IMFPMediaPlayer *iface, BOOL mute) return E_NOTIMPL; } +static HRESULT media_player_get_display_control(const struct media_player *player, + IMFVideoDisplayControl **display_control) +{ + HRESULT hr = MFGetService((IUnknown *)player->session, &MR_VIDEO_RENDER_SERVICE, + &IID_IMFVideoDisplayControl, (void **)display_control); + if (SUCCEEDED(hr)) return hr; + return hr == MF_E_SHUTDOWN ? hr : MF_E_INVALIDREQUEST; +} + static HRESULT WINAPI media_player_GetNativeVideoSize(IMFPMediaPlayer *iface, SIZE *video, SIZE *arvideo) { @@ -1332,8 +1341,7 @@ static HRESULT WINAPI media_player_GetNativeVideoSize(IMFPMediaPlayer *iface, TRACE("%p, %p, %p.\n", iface, video, arvideo); - if (SUCCEEDED(hr = MFGetService((IUnknown *)player->session, &MR_VIDEO_RENDER_SERVICE, - &IID_IMFVideoDisplayControl, (void **)&display_control))) + if (SUCCEEDED(hr = media_player_get_display_control(player, &display_control))) { hr = IMFVideoDisplayControl_GetNativeVideoSize(display_control, video, arvideo); IMFVideoDisplayControl_Release(display_control); @@ -1351,8 +1359,7 @@ static HRESULT WINAPI media_player_GetIdealVideoSize(IMFPMediaPlayer *iface, TRACE("%p, %p, %p.\n", iface, min_size, max_size); - if (SUCCEEDED(hr = MFGetService((IUnknown *)player->session, &MR_VIDEO_RENDER_SERVICE, - &IID_IMFVideoDisplayControl, (void **)&display_control))) + if (SUCCEEDED(hr = media_player_get_display_control(player, &display_control))) { hr = IMFVideoDisplayControl_GetIdealVideoSize(display_control, min_size, max_size); IMFVideoDisplayControl_Release(display_control); @@ -1370,8 +1377,7 @@ static HRESULT WINAPI media_player_SetVideoSourceRect(IMFPMediaPlayer *iface, TRACE("%p, %p.\n", iface, rect); - if (SUCCEEDED(hr = MFGetService((IUnknown *)player->session, &MR_VIDEO_RENDER_SERVICE, - &IID_IMFVideoDisplayControl, (void **)&display_control))) + if (SUCCEEDED(hr = media_player_get_display_control(player, &display_control))) { hr = IMFVideoDisplayControl_SetVideoPosition(display_control, rect, NULL); IMFVideoDisplayControl_Release(display_control); @@ -1390,8 +1396,7 @@ static HRESULT WINAPI media_player_GetVideoSourceRect(IMFPMediaPlayer *iface, TRACE("%p, %p.\n", iface, rect); - if (SUCCEEDED(hr = MFGetService((IUnknown *)player->session, &MR_VIDEO_RENDER_SERVICE, - &IID_IMFVideoDisplayControl, (void **)&display_control))) + if (SUCCEEDED(hr = media_player_get_display_control(player, &display_control))) { hr = IMFVideoDisplayControl_GetVideoPosition(display_control, rect, &dest); IMFVideoDisplayControl_Release(display_control); @@ -1408,8 +1413,7 @@ static HRESULT WINAPI media_player_SetAspectRatioMode(IMFPMediaPlayer *iface, DW TRACE("%p, %u.\n", iface, mode); - if (SUCCEEDED(hr = MFGetService((IUnknown *)player->session, &MR_VIDEO_RENDER_SERVICE, - &IID_IMFVideoDisplayControl, (void **)&display_control))) + if (SUCCEEDED(hr = media_player_get_display_control(player, &display_control))) { hr = IMFVideoDisplayControl_SetAspectRatioMode(display_control, mode); IMFVideoDisplayControl_Release(display_control); @@ -1427,8 +1431,7 @@ static HRESULT WINAPI media_player_GetAspectRatioMode(IMFPMediaPlayer *iface, TRACE("%p, %p.\n", iface, mode); - if (SUCCEEDED(hr = MFGetService((IUnknown *)player->session, &MR_VIDEO_RENDER_SERVICE, - &IID_IMFVideoDisplayControl, (void **)&display_control))) + if (SUCCEEDED(hr = media_player_get_display_control(player, &display_control))) { hr = IMFVideoDisplayControl_GetAspectRatioMode(display_control, mode); IMFVideoDisplayControl_Release(display_control); @@ -1463,8 +1466,7 @@ static HRESULT WINAPI media_player_SetBorderColor(IMFPMediaPlayer *iface, COLORR TRACE("%p, %#x.\n", iface, color); - if (SUCCEEDED(hr = MFGetService((IUnknown *)player->session, &MR_VIDEO_RENDER_SERVICE, - &IID_IMFVideoDisplayControl, (void **)&display_control))) + if (SUCCEEDED(hr = media_player_get_display_control(player, &display_control))) { hr = IMFVideoDisplayControl_SetBorderColor(display_control, color); IMFVideoDisplayControl_Release(display_control); @@ -1481,8 +1483,7 @@ static HRESULT WINAPI media_player_GetBorderColor(IMFPMediaPlayer *iface, COLORR TRACE("%p, %p.\n", iface, color); - if (SUCCEEDED(hr = MFGetService((IUnknown *)player->session, &MR_VIDEO_RENDER_SERVICE, - &IID_IMFVideoDisplayControl, (void **)&display_control))) + if (SUCCEEDED(hr = media_player_get_display_control(player, &display_control))) { hr = IMFVideoDisplayControl_GetBorderColor(display_control, color); IMFVideoDisplayControl_Release(display_control); diff --git a/dlls/mfplay/tests/Makefile.in b/dlls/mfplay/tests/Makefile.in index 43c7ec26240..4eabb5ae0ab 100644 --- a/dlls/mfplay/tests/Makefile.in +++ b/dlls/mfplay/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = mfplay.dll -IMPORTS = mfplay uuid mfuuid +IMPORTS = mfplay user32 uuid mfuuid C_SRCS = \ mfplay.c diff --git a/dlls/mfplay/tests/mfplay.c b/dlls/mfplay/tests/mfplay.c index 438d636daa2..074cee6d217 100644 --- a/dlls/mfplay/tests/mfplay.c +++ b/dlls/mfplay/tests/mfplay.c @@ -142,13 +142,16 @@ static void test_create_player(void) static void test_shutdown(void) { - SIZE min_size, max_size; + SIZE size, min_size, max_size; + MFP_MEDIAPLAYER_STATE state; + MFVideoNormalizedRect rect; IMFPMediaPlayer *player; float slowest, fastest; - HRESULT hr; - MFP_MEDIAPLAYER_STATE state; IMFPMediaItem *item; + COLORREF color; HWND window; + DWORD mode; + HRESULT hr; hr = MFPCreateMediaPlayer(NULL, FALSE, 0, NULL, NULL, &player); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); @@ -180,6 +183,28 @@ static void test_shutdown(void) hr = IMFPMediaPlayer_GetIdealVideoSize(player, &min_size, &max_size); ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + hr = IMFPMediaPlayer_GetVideoSourceRect(player, &rect); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_GetBorderColor(player, &color); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_GetAspectRatioMode(player, &mode); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_GetNativeVideoSize(player, &size, &size); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_SetBorderColor(player, 0); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_SetAspectRatioMode(player, MFVideoARMode_None); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_UpdateVideo(player); +todo_wine + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + hr = IMFPMediaPlayer_CreateMediaItemFromURL(player, L"url", TRUE, 0, &item); ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); @@ -212,9 +237,64 @@ static void test_media_item(void) IMFPMediaPlayer_Release(player); } +static void test_video_control(void) +{ + MFVideoNormalizedRect rect; + IMFPMediaPlayer *player; + COLORREF color; + HWND window; + DWORD mode; + HRESULT hr; + SIZE size; + + window = CreateWindowA("static", "mfplay_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + ok(!!window, "Failed to create output window.\n"); + + hr = MFPCreateMediaPlayer(NULL, FALSE, 0, NULL, window, &player); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + /* No active media item */ + + rect.left = rect.top = 0.0f; + rect.right = rect.bottom = 1.0f; + hr = IMFPMediaPlayer_SetVideoSourceRect(player, &rect); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_SetBorderColor(player, 0); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_SetAspectRatioMode(player, MFVideoARMode_None); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_GetVideoSourceRect(player, &rect); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_GetBorderColor(player, &color); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_GetAspectRatioMode(player, &mode); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_GetIdealVideoSize(player, &size, &size); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_GetNativeVideoSize(player, &size, &size); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_UpdateVideo(player); +todo_wine + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + + IMFPMediaPlayer_Release(player); + + DestroyWindow(window); +} + START_TEST(mfplay) { test_create_player(); test_shutdown(); test_media_item(); + test_video_control(); }

1 0

Rémi Bernon : winex11.drv: Rename (x|y)_rel_valuator to (x|y)_valuator.
by Alexandre Julliard Oct. 25, 2021

Oct. 25, 2021

Module: wine Branch: master Commit: dfa11dc040f93aceec7009eeb3a57b95764c1c64 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dfa11dc040f93aceec7009ee… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Oct 25 11:51:54 2021 +0200 winex11.drv: Rename (x|y)_rel_valuator to (x|y)_valuator. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/mouse.c | 33 +++++++++++++++------------------ dlls/winex11.drv/x11drv.h | 4 ++-- 2 files changed, 17 insertions(+), 20 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index c6daa30392c..1ef7027e838 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -256,8 +256,8 @@ static void update_relative_valuators(XIAnyClassInfo **valuators, int n_valuator struct x11drv_thread_data *thread_data = x11drv_thread_data(); int i; - thread_data->x_rel_valuator.number = -1; - thread_data->y_rel_valuator.number = -1; + thread_data->x_valuator.number = -1; + thread_data->y_valuator.number = -1; for (i = 0; i < n_valuators; i++) { @@ -265,10 +265,10 @@ static void update_relative_valuators(XIAnyClassInfo **valuators, int n_valuator if (valuators[i]->type != XIValuatorClass) continue; if (class->label == x11drv_atom( Rel_X ) || (!class->label && class->number == 0 && class->mode == XIModeRelative)) - thread_data->x_rel_valuator = *class; + thread_data->x_valuator = *class; else if (class->label == x11drv_atom( Rel_Y ) || (!class->label && class->number == 1 && class->mode == XIModeRelative)) - thread_data->y_rel_valuator = *class; + thread_data->y_valuator = *class; } } #endif @@ -349,8 +349,8 @@ static void disable_xinput2(void) pXISelectEvents( data->display, DefaultRootWindow( data->display ), &mask, 1 ); pXIFreeDeviceInfo( data->xi2_devices ); - data->x_rel_valuator.number = -1; - data->y_rel_valuator.number = -1; + data->x_valuator.number = -1; + data->y_valuator.number = -1; data->xi2_devices = NULL; data->xi2_core_pointer = 0; data->xi2_current_slave = 0; @@ -625,13 +625,13 @@ static void map_event_coords( HWND hwnd, Window window, Window event_root, int x static BOOL map_raw_event_coords( XIRawEvent *event, INPUT *input ) { struct x11drv_thread_data *thread_data = x11drv_thread_data(); + XIValuatorClassInfo *x = &thread_data->x_valuator, *y = &thread_data->y_valuator; const double *values = event->valuators.values; - XIValuatorClassInfo *x_rel, *y_rel; double dx = 0, dy = 0, val; RECT virtual_rect; int i; - if (thread_data->x_rel_valuator.number < 0 || thread_data->y_rel_valuator.number < 0) return FALSE; + if (x->number < 0 || y->number < 0) return FALSE; if (!event->valuators.mask_len) return FALSE; if (thread_data->xi2_state != xi_enabled) return FALSE; @@ -654,26 +654,23 @@ static BOOL map_raw_event_coords( XIRawEvent *event, INPUT *input ) } if (event->deviceid != thread_data->xi2_current_slave) return FALSE; - x_rel = &thread_data->x_rel_valuator; - y_rel = &thread_data->y_rel_valuator; - virtual_rect = get_virtual_screen_rect(); - for (i = 0; i <= max( x_rel->number, y_rel->number ); i++) + for (i = 0; i <= max( x->number, y->number ); i++) { if (!XIMaskIsSet( event->valuators.mask, i )) continue; val = *values++; - if (i == x_rel->number) + if (i == x->number) { input->u.mi.dx = dx = val; - if (x_rel->min < x_rel->max) - input->u.mi.dx = val * (virtual_rect.right - virtual_rect.left) / (x_rel->max - x_rel->min); + if (x->min < x->max) + input->u.mi.dx = val * (virtual_rect.right - virtual_rect.left) / (x->max - x->min); } - if (i == y_rel->number) + if (i == y->number) { input->u.mi.dy = dy = val; - if (y_rel->min < y_rel->max) - input->u.mi.dy = val * (virtual_rect.bottom - virtual_rect.top) / (y_rel->max - y_rel->min); + if (y->min < y->max) + input->u.mi.dy = val * (virtual_rect.bottom - virtual_rect.top) / (y->max - y->min); } } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 962fe373833..d384a8a68c0 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -335,8 +335,8 @@ struct x11drv_thread_data enum { xi_unavailable = -1, xi_unknown, xi_disabled, xi_enabled } xi2_state; /* XInput2 state */ void *xi2_devices; /* list of XInput2 devices (valid when state is enabled) */ int xi2_device_count; - XIValuatorClassInfo x_rel_valuator; - XIValuatorClassInfo y_rel_valuator; + XIValuatorClassInfo x_valuator; + XIValuatorClassInfo y_valuator; int xi2_core_pointer; /* XInput2 core pointer id */ int xi2_current_slave; /* Current slave driving the Core pointer */ #endif /* HAVE_X11_EXTENSIONS_XINPUT2_H */

1 0

Rémi Bernon : winex11.drv: Use XIValuatorClassInfo instead of a custom struct.
by Alexandre Julliard Oct. 25, 2021

Oct. 25, 2021

Module: wine Branch: master Commit: da11387857f69d8bf68de56197390052f680f283 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da11387857f69d8bf68de561… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Oct 25 11:51:53 2021 +0200 winex11.drv: Use XIValuatorClassInfo instead of a custom struct. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/mouse.c | 18 +++--------------- dlls/winex11.drv/window.c | 3 +++ dlls/winex11.drv/x11drv.h | 16 +++++++--------- 3 files changed, 13 insertions(+), 24 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 2243261e0b8..c6daa30392c 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -262,25 +262,13 @@ static void update_relative_valuators(XIAnyClassInfo **valuators, int n_valuator for (i = 0; i < n_valuators; i++) { XIValuatorClassInfo *class = (XIValuatorClassInfo *)valuators[i]; - struct x11drv_valuator_data *valuator_data = NULL; - if (valuators[i]->type != XIValuatorClass) continue; if (class->label == x11drv_atom( Rel_X ) || (!class->label && class->number == 0 && class->mode == XIModeRelative)) - { - valuator_data = &thread_data->x_rel_valuator; - } + thread_data->x_rel_valuator = *class; else if (class->label == x11drv_atom( Rel_Y ) || (!class->label && class->number == 1 && class->mode == XIModeRelative)) - { - valuator_data = &thread_data->y_rel_valuator; - } - - if (valuator_data) { - valuator_data->number = class->number; - valuator_data->min = class->min; - valuator_data->max = class->max; - } + thread_data->y_rel_valuator = *class; } } #endif @@ -638,7 +626,7 @@ static BOOL map_raw_event_coords( XIRawEvent *event, INPUT *input ) { struct x11drv_thread_data *thread_data = x11drv_thread_data(); const double *values = event->valuators.values; - struct x11drv_valuator_data *x_rel, *y_rel; + XIValuatorClassInfo *x_rel, *y_rel; double dx = 0, dy = 0, val; RECT virtual_rect; int i; diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 7ec2639e309..bcb0b8044bc 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -36,6 +36,9 @@ #ifdef HAVE_LIBXSHAPE #include <X11/extensions/shape.h> #endif /* HAVE_LIBXSHAPE */ +#ifdef HAVE_X11_EXTENSIONS_XINPUT2_H +#include <X11/extensions/XInput2.h> +#endif /* avoid conflict with field names in included win32 headers */ #undef Status diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index e82ee921830..962fe373833 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -32,6 +32,9 @@ #include <X11/Xresource.h> #include <X11/Xutil.h> #include <X11/Xatom.h> +#ifdef HAVE_X11_EXTENSIONS_XINPUT2_H +#include <X11/extensions/XInput2.h> +#endif #define BOOL X_BOOL #define BYTE X_BYTE @@ -314,13 +317,6 @@ struct x11drv_escape_flush_gl_drawable * X11 USER driver */ -struct x11drv_valuator_data -{ - double min; - double max; - int number; -}; - struct x11drv_thread_data { Display *display; @@ -335,13 +331,15 @@ struct x11drv_thread_data Window clip_window; /* window used for cursor clipping */ HWND clip_hwnd; /* message window stored in desktop while clipping is active */ DWORD clip_reset; /* time when clipping was last reset */ +#ifdef HAVE_X11_EXTENSIONS_XINPUT2_H enum { xi_unavailable = -1, xi_unknown, xi_disabled, xi_enabled } xi2_state; /* XInput2 state */ void *xi2_devices; /* list of XInput2 devices (valid when state is enabled) */ int xi2_device_count; - struct x11drv_valuator_data x_rel_valuator; - struct x11drv_valuator_data y_rel_valuator; + XIValuatorClassInfo x_rel_valuator; + XIValuatorClassInfo y_rel_valuator; int xi2_core_pointer; /* XInput2 core pointer id */ int xi2_current_slave; /* Current slave driving the Core pointer */ +#endif /* HAVE_X11_EXTENSIONS_XINPUT2_H */ }; extern struct x11drv_thread_data *x11drv_init_thread_data(void) DECLSPEC_HIDDEN;

1 0