wine-commits October 2021

wine-commits@winehq.org

2 participants
1165 discussions

Rémi Bernon : dinput: Check for mouse warping in the poll callback.
by Alexandre Julliard 20 Oct '21

20 Oct '21

Module: wine Branch: master Commit: 59fad29102875842519ef5cbc19cd37c99460291 URL: https://source.winehq.org/git/wine.git/?a=commit;h=59fad29102875842519ef5cb… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Oct 20 11:29:31 2021 +0200 dinput: Check for mouse warping in the poll callback. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/mouse.c | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 5933d7e5f0f..7b8402b2bf5 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -472,27 +472,14 @@ static HRESULT WINAPI SysMouseWImpl_GetDeviceState(LPDIRECTINPUTDEVICE8W iface, } LeaveCriticalSection(&This->base.crit); - warp_check( This, FALSE ); return DI_OK; } -/****************************************************************************** - * GetDeviceData : gets buffered input data. - */ -static HRESULT WINAPI SysMouseWImpl_GetDeviceData(LPDIRECTINPUTDEVICE8W iface, - DWORD dodsize, LPDIDEVICEOBJECTDATA dod, LPDWORD entries, DWORD flags) -{ - SysMouseImpl *This = impl_from_IDirectInputDevice8W(iface); - HRESULT res; - - res = IDirectInputDevice2WImpl_GetDeviceData(iface, dodsize, dod, entries, flags); - if (SUCCEEDED(res)) warp_check( This, FALSE ); - return res; -} - static HRESULT mouse_internal_poll( IDirectInputDevice8W *iface ) { + SysMouseImpl *impl = impl_from_IDirectInputDevice8W( iface ); check_dinput_events(); + warp_check( impl, FALSE ); return DI_OK; } @@ -710,7 +697,7 @@ static const IDirectInputDevice8WVtbl SysMouseWvt = IDirectInputDevice2WImpl_Acquire, IDirectInputDevice2WImpl_Unacquire, SysMouseWImpl_GetDeviceState, - SysMouseWImpl_GetDeviceData, + IDirectInputDevice2WImpl_GetDeviceData, IDirectInputDevice2WImpl_SetDataFormat, IDirectInputDevice2WImpl_SetEventNotification, IDirectInputDevice2WImpl_SetCooperativeLevel,

1 0

Rémi Bernon : dinput: Factor all Poll implementations together.
by Alexandre Julliard 20 Oct '21

20 Oct '21

Module: wine Branch: master Commit: aebd03f07087fdff5cd83b1c4d9ecc930658b61c URL: https://source.winehq.org/git/wine.git/?a=commit;h=aebd03f07087fdff5cd83b1c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Oct 20 11:29:30 2021 +0200 dinput: Factor all Poll implementations together. With a new internal poll callback for mouse and keyboard Wine-specific message peeking behavior. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 12 ++++++++---- dlls/dinput/device_private.h | 1 + dlls/dinput/joystick_hid.c | 15 ++------------- dlls/dinput/keyboard.c | 7 +++++++ dlls/dinput/mouse.c | 7 +++++++ 5 files changed, 25 insertions(+), 17 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 2b2c4646e31..c31166b8248 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1661,13 +1661,17 @@ HRESULT WINAPI IDirectInputDevice2WImpl_Escape(LPDIRECTINPUTDEVICE8W iface, LPDI return DI_OK; } -HRESULT WINAPI IDirectInputDevice2WImpl_Poll(LPDIRECTINPUTDEVICE8W iface) +HRESULT WINAPI IDirectInputDevice2WImpl_Poll( IDirectInputDevice8W *iface ) { - IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); + IDirectInputDeviceImpl *impl = impl_from_IDirectInputDevice8W( iface ); + HRESULT hr = DI_NOEFFECT; - if (!This->acquired) return DIERR_NOTACQUIRED; + EnterCriticalSection( &impl->crit ); + if (!impl->acquired) hr = DIERR_NOTACQUIRED; + LeaveCriticalSection( &impl->crit ); + if (hr != DI_OK) return hr; - check_dinput_events(); + if (impl->vtbl->poll) return impl->vtbl->poll( iface ); return DI_OK; } diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index da1a90fda42..92b0320520b 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -57,6 +57,7 @@ typedef HRESULT dinput_device_read_state( IDirectInputDevice8W *iface ); struct dinput_device_vtbl { + HRESULT (*poll)( IDirectInputDevice8W *iface ); HRESULT (*read)( IDirectInputDevice8W *iface ); HRESULT (*acquire)( IDirectInputDevice8W *iface ); HRESULT (*unacquire)( IDirectInputDevice8W *iface ); diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 5718f02bf47..59e5e4a719f 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -1162,18 +1162,6 @@ static HRESULT WINAPI hid_joystick_EnumCreatedEffectObjects( IDirectInputDevice8 return DI_OK; } -static HRESULT WINAPI hid_joystick_Poll( IDirectInputDevice8W *iface ) -{ - struct hid_joystick *impl = impl_from_IDirectInputDevice8W( iface ); - HRESULT hr = DI_NOEFFECT; - - EnterCriticalSection( &impl->base.crit ); - if (!impl->base.acquired) hr = DIERR_NOTACQUIRED; - LeaveCriticalSection( &impl->base.crit ); - - return hr; -} - static const IDirectInputDevice8WVtbl hid_joystick_vtbl = { /*** IUnknown methods ***/ @@ -1204,7 +1192,7 @@ static const IDirectInputDevice8WVtbl hid_joystick_vtbl = hid_joystick_SendForceFeedbackCommand, hid_joystick_EnumCreatedEffectObjects, IDirectInputDevice2WImpl_Escape, - hid_joystick_Poll, + IDirectInputDevice2WImpl_Poll, IDirectInputDevice2WImpl_SendDeviceData, /*** IDirectInputDevice7 methods ***/ IDirectInputDevice7WImpl_EnumEffectsInFile, @@ -1432,6 +1420,7 @@ static HRESULT hid_joystick_internal_enum_objects( IDirectInputDevice8W *iface, static const struct dinput_device_vtbl hid_joystick_internal_vtbl = { + NULL, hid_joystick_internal_read, hid_joystick_internal_acquire, hid_joystick_internal_unacquire, diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index ad91c948fbc..a8f831e7597 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -270,6 +270,12 @@ static HRESULT WINAPI SysKeyboardWImpl_GetDeviceState(LPDIRECTINPUTDEVICE8W ifac return DI_OK; } +static HRESULT keyboard_internal_poll( IDirectInputDevice8W *iface ) +{ + check_dinput_events(); + return DI_OK; +} + static HRESULT keyboard_internal_acquire( IDirectInputDevice8W *iface ) { return DI_OK; @@ -353,6 +359,7 @@ static HRESULT keyboard_internal_set_property( IDirectInputDevice8W *iface, DWOR static const struct dinput_device_vtbl keyboard_internal_vtbl = { + keyboard_internal_poll, NULL, keyboard_internal_acquire, keyboard_internal_unacquire, diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 5b3ec2d1f20..5933d7e5f0f 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -490,6 +490,12 @@ static HRESULT WINAPI SysMouseWImpl_GetDeviceData(LPDIRECTINPUTDEVICE8W iface, return res; } +static HRESULT mouse_internal_poll( IDirectInputDevice8W *iface ) +{ + check_dinput_events(); + return DI_OK; +} + static HRESULT mouse_internal_acquire( IDirectInputDevice8W *iface ) { SysMouseImpl *impl = impl_from_IDirectInputDevice8W( iface ); @@ -683,6 +689,7 @@ static HRESULT mouse_internal_set_property( IDirectInputDevice8W *iface, DWORD p static const struct dinput_device_vtbl mouse_internal_vtbl = { + mouse_internal_poll, NULL, mouse_internal_acquire, mouse_internal_unacquire,

1 0

Rémi Bernon : dinput: Factor object enumeration checks and offset mapping.
by Alexandre Julliard 20 Oct '21

20 Oct '21

Module: wine Branch: master Commit: ec3e51bb10365e8081661531a2bd84ff2f10866a URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec3e51bb10365e8081661531… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Oct 20 11:29:29 2021 +0200 dinput: Factor object enumeration checks and offset mapping. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 39 +++++++++++++++++++++++++++++++++------ dlls/dinput/joystick_hid.c | 26 +++++++------------------- dlls/dinput/keyboard.c | 19 ++----------------- dlls/dinput/mouse.c | 20 ++------------------ 4 files changed, 44 insertions(+), 60 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ec3e51bb10365e808166…

1 0

Alexandre Julliard : wow64win: Add missing syscall entry for NtUserGetObjectInformation().
by Alexandre Julliard 20 Oct '21

20 Oct '21

Module: wine Branch: master Commit: 90a0b7c7061b514b4796f26f5679d89e867ac11a URL: https://source.winehq.org/git/wine.git/?a=commit;h=90a0b7c7061b514b4796f26f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 20 13:18:16 2021 +0200 wow64win: Add missing syscall entry for NtUserGetObjectInformation(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64win/syscall.h | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index 18435b993f0..8cf27d47aad 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -92,6 +92,7 @@ SYSCALL_ENTRY( NtUserCloseWindowStation ) \ SYSCALL_ENTRY( NtUserCreateDesktopEx ) \ SYSCALL_ENTRY( NtUserCreateWindowStation ) \ + SYSCALL_ENTRY( NtUserGetObjectInformation ) \ SYSCALL_ENTRY( NtUserGetProcessWindowStation ) \ SYSCALL_ENTRY( NtUserGetThreadDesktop ) \ SYSCALL_ENTRY( NtUserOpenDesktop ) \

1 0

Alexandre Julliard : msgsm32.acm: Use the bundled gsm codec and build with msvcrt.
by Alexandre Julliard 20 Oct '21

20 Oct '21

Module: wine Branch: master Commit: 0e7fd41af953b2a9fa23cf6920fac229f2dd2e44 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e7fd41af953b2a9fa23cf69… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 20 11:46:12 2021 +0200 msgsm32.acm: Use the bundled gsm codec and build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 78 -------------------------------- configure.ac | 12 ----- dlls/msgsm32.acm/Makefile.in | 5 +-- dlls/msgsm32.acm/msgsm32.c | 105 ++++++------------------------------------- include/config.h.in | 9 ---- 5 files changed, 16 insertions(+), 193 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0e7fd41af953b2a9fa23…

1 0

Alexandre Julliard : libs: Import upstream code from gsm 1.0.19.
by Alexandre Julliard 20 Oct '21

20 Oct '21

Module: wine Branch: master Commit: 116ea9cec442ce66df2d4b94e34f81ff466bd91c URL: https://source.winehq.org/git/wine.git/?a=commit;h=116ea9cec442ce66df2d4b94… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 20 11:45:59 2021 +0200 libs: Import upstream code from gsm 1.0.19. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 24 ++ configure.ac | 2 + libs/gsm/COPYRIGHT | 35 ++ libs/gsm/Makefile.in | 19 + libs/gsm/inc/gsm.h | 79 ++++ libs/gsm/inc/private.h | 277 +++++++++++++ libs/gsm/inc/proto.h | 65 ++++ libs/gsm/inc/unproto.h | 23 ++ libs/gsm/src/add.c | 235 +++++++++++ libs/gsm/src/code.c | 89 +++++ libs/gsm/src/decode.c | 63 +++ libs/gsm/src/gsm_create.c | 28 ++ libs/gsm/src/gsm_decode.c | 361 +++++++++++++++++ libs/gsm/src/gsm_destroy.c | 16 + libs/gsm/src/gsm_encode.c | 451 +++++++++++++++++++++ libs/gsm/src/gsm_option.c | 69 ++++ libs/gsm/src/gsm_print.c | 167 ++++++++ libs/gsm/src/long_term.c | 949 +++++++++++++++++++++++++++++++++++++++++++++ libs/gsm/src/lpc.c | 341 ++++++++++++++++ libs/gsm/src/preprocess.c | 113 ++++++ libs/gsm/src/rpe.c | 488 +++++++++++++++++++++++ libs/gsm/src/short_term.c | 429 ++++++++++++++++++++ libs/gsm/src/table.c | 63 +++ 23 files changed, 4386 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=116ea9cec442ce66df2d…

1 0

Alexandre Julliard : mxsml3: Use the bundled libxml2 and libxslt and build with msvcrt.
by Alexandre Julliard 20 Oct '21

20 Oct '21

Module: wine Branch: master Commit: bca1b7f2faeb0798f4af420c15ff5a1b1f7b40af URL: https://source.winehq.org/git/wine.git/?a=commit;h=bca1b7f2faeb0798f4af420c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 20 11:39:06 2021 +0200 mxsml3: Use the bundled libxml2 and libxslt and build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 454 -------------------------------------------- configure.ac | 51 ----- dlls/msxml3/Makefile.in | 7 +- dlls/msxml3/attribute.c | 14 +- dlls/msxml3/cdata.c | 12 +- dlls/msxml3/comment.c | 12 +- dlls/msxml3/dispex.c | 6 +- dlls/msxml3/docfrag.c | 12 +- dlls/msxml3/doctype.c | 12 +- dlls/msxml3/domdoc.c | 61 +----- dlls/msxml3/element.c | 30 ++- dlls/msxml3/entityref.c | 12 +- dlls/msxml3/factory.c | 8 +- dlls/msxml3/httprequest.c | 33 ++-- dlls/msxml3/main.c | 112 ++--------- dlls/msxml3/msxml_private.h | 30 +-- dlls/msxml3/mxnamespace.c | 8 +- dlls/msxml3/mxwriter.c | 7 +- dlls/msxml3/node.c | 87 ++------- dlls/msxml3/nodelist.c | 12 +- dlls/msxml3/nodemap.c | 12 +- dlls/msxml3/pi.c | 18 +- dlls/msxml3/saxreader.c | 41 ++-- dlls/msxml3/schema.c | 56 ++---- dlls/msxml3/selection.c | 16 +- dlls/msxml3/stylesheet.c | 15 +- dlls/msxml3/text.c | 14 +- dlls/msxml3/xdr.c | 11 +- dlls/msxml3/xmldoc.c | 25 +-- dlls/msxml3/xmlelem.c | 12 +- dlls/msxml3/xmlview.c | 5 +- dlls/msxml3/xslpattern.h | 8 - dlls/msxml3/xslpattern.l | 7 - dlls/msxml3/xslpattern.y | 6 - include/config.h.in | 39 ---- 35 files changed, 150 insertions(+), 1115 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bca1b7f2faeb0798f4af…

1 0

Alexandre Julliard : libs: Import code from upstream libxslt 1.1.34.
by Alexandre Julliard 20 Oct '21

20 Oct '21

Module: wine Branch: master Commit: c638618cbc5f6f26b0a0d1b32078b9ecca3af8df URL: https://source.winehq.org/git/wine.git/?a=commit;h=c638618cbc5f6f26b0a0d1b3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 20 11:33:05 2021 +0200 libs: Import code from upstream libxslt 1.1.34. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 26 + configure.ac | 2 + libs/xslt/AUTHORS | 63 + libs/xslt/COPYING | 53 + libs/xslt/Makefile.in | 23 + libs/xslt/libxslt/attributes.c | 1248 ++++++ libs/xslt/libxslt/attributes.h | 38 + libs/xslt/libxslt/attrvt.c | 396 ++ libs/xslt/libxslt/documents.c | 436 +++ libs/xslt/libxslt/documents.h | 93 + libs/xslt/libxslt/extensions.c | 2380 ++++++++++++ libs/xslt/libxslt/extensions.h | 262 ++ libs/xslt/libxslt/extra.c | 199 + libs/xslt/libxslt/extra.h | 72 + libs/xslt/libxslt/functions.c | 1008 +++++ libs/xslt/libxslt/functions.h | 78 + libs/xslt/libxslt/imports.c | 414 ++ libs/xslt/libxslt/imports.h | 75 + libs/xslt/libxslt/keys.c | 947 +++++ libs/xslt/libxslt/keys.h | 53 + libs/xslt/libxslt/libxslt.h | 36 + libs/xslt/libxslt/namespaces.c | 853 ++++ libs/xslt/libxslt/namespaces.h | 68 + libs/xslt/libxslt/numbers.c | 1363 +++++++ libs/xslt/libxslt/numbersInternals.h | 73 + libs/xslt/libxslt/pattern.c | 2642 +++++++++++++ libs/xslt/libxslt/pattern.h | 84 + libs/xslt/libxslt/preproc.c | 2376 ++++++++++++ libs/xslt/libxslt/preproc.h | 43 + libs/xslt/libxslt/security.c | 482 +++ libs/xslt/libxslt/security.h | 104 + libs/xslt/libxslt/templates.c | 864 +++++ libs/xslt/libxslt/templates.h | 77 + libs/xslt/libxslt/transform.c | 6524 +++++++++++++++++++++++++++++++ libs/xslt/libxslt/transform.h | 207 + libs/xslt/libxslt/trio.h | 216 ++ libs/xslt/libxslt/triodef.h | 220 ++ libs/xslt/libxslt/variables.c | 2374 ++++++++++++ libs/xslt/libxslt/variables.h | 118 + libs/xslt/libxslt/win32config.h | 129 + libs/xslt/libxslt/xslt.c | 7047 ++++++++++++++++++++++++++++++++++ libs/xslt/libxslt/xslt.h | 110 + libs/xslt/libxslt/xsltInternals.h | 1978 ++++++++++ libs/xslt/libxslt/xsltconfig.h | 180 + libs/xslt/libxslt/xsltexports.h | 142 + libs/xslt/libxslt/xsltlocale.c | 520 +++ libs/xslt/libxslt/xsltlocale.h | 76 + libs/xslt/libxslt/xsltutils.c | 2477 ++++++++++++ libs/xslt/libxslt/xsltutils.h | 313 ++ 49 files changed, 39562 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c638618cbc5f6f26b0a0…

1 0

Alexandre Julliard : libs: Import code from upstream libxml2 2.9.12.
by Alexandre Julliard 20 Oct '21

20 Oct '21

1 0

Alexandre Julliard : msxml3: Always set output length in encoding conversion.
by Alexandre Julliard 20 Oct '21

20 Oct '21

Module: wine Branch: master Commit: 9a335d89d0cc9c8cca04d41a8cd43b09a9488a20 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a335d89d0cc9c8cca04d41a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 20 11:31:58 2021 +0200 msxml3: Always set output length in encoding conversion. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/main.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c index 25400b698ca..e9a43ab64b2 100644 --- a/dlls/msxml3/main.c +++ b/dlls/msxml3/main.c @@ -233,9 +233,9 @@ static void init_libxslt(void) static int to_utf8(int cp, unsigned char *out, int *outlen, const unsigned char *in, int *inlen) { WCHAR *tmp; - int len; + int len = 0; - if (!in || !inlen) return 0; + if (!in || !inlen) goto done; len = MultiByteToWideChar(cp, 0, (const char *)in, *inlen, NULL, 0); tmp = heap_alloc(len * sizeof(WCHAR)); @@ -245,7 +245,7 @@ static int to_utf8(int cp, unsigned char *out, int *outlen, const unsigned char len = WideCharToMultiByte(CP_UTF8, 0, tmp, len, (char *)out, *outlen, NULL, NULL); heap_free(tmp); if (!len) return -1; - +done: *outlen = len; return len; } @@ -253,9 +253,9 @@ static int to_utf8(int cp, unsigned char *out, int *outlen, const unsigned char static int from_utf8(int cp, unsigned char *out, int *outlen, const unsigned char *in, int *inlen) { WCHAR *tmp; - int len; + int len = 0; - if (!in || !inlen) return 0; + if (!in || !inlen) goto done; len = MultiByteToWideChar(CP_UTF8, 0, (const char *)in, *inlen, NULL, 0); tmp = heap_alloc(len * sizeof(WCHAR)); @@ -265,7 +265,7 @@ static int from_utf8(int cp, unsigned char *out, int *outlen, const unsigned cha len = WideCharToMultiByte(cp, 0, tmp, len, (char *)out, *outlen, NULL, NULL); heap_free(tmp); if (!len) return -1; - +done: *outlen = len; return len; }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2021