October 2021 - Wine-commits

Nikolay Sivov : mfplay: Change to stopped state when playback ends.
by Alexandre Julliard 25 Oct '21

25 Oct '21

Module: wine Branch: master Commit: e1e7c160931120000b5cc3b404a41d27499fecb4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e1e7c160931120000b5cc3b4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 25 13:04:22 2021 +0300 mfplay: Change to stopped state when playback ends. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/player.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index a34973f8e36..6f8d4942a0b 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -1929,6 +1929,17 @@ static void media_player_create_forward_event(struct media_player *player, HRESU LeaveCriticalSection(&player->cs); } +static void media_player_playback_ended(struct media_player *player, HRESULT event_status, + struct media_event **event) +{ + EnterCriticalSection(&player->cs); + + media_player_set_state(player, MFP_MEDIAPLAYER_STATE_STOPPED); + media_event_create(player, MFP_EVENT_TYPE_PLAYBACK_ENDED, event_status, player->item, event); + + LeaveCriticalSection(&player->cs); +} + static HRESULT WINAPI media_player_session_events_callback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) { @@ -1990,7 +2001,7 @@ static HRESULT WINAPI media_player_session_events_callback_Invoke(IMFAsyncCallba if (SUCCEEDED(IMFMediaEvent_GetUINT32(session_event, &MF_EVENT_TOPOLOGY_STATUS, &status)) && status == MF_TOPOSTATUS_ENDED) { - media_event_create(player, MFP_EVENT_TYPE_PLAYBACK_ENDED, event_status, player->item, &event); + media_player_playback_ended(player, event_status, &event); } break;

1 0

Nikolay Sivov : evr: Trace normalized rectangle arguments.
by Alexandre Julliard 25 Oct '21

25 Oct '21

Module: wine Branch: master Commit: 7c6c054427547f00b8c8d5418bcae1dafc4b6d89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c6c054427547f00b8c8d541… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 25 13:05:33 2021 +0300 evr: Trace normalized rectangle arguments. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/evr_private.h | 6 ++++++ dlls/evr/mixer.c | 3 ++- dlls/evr/presenter.c | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/evr/evr_private.h b/dlls/evr/evr_private.h index 7ae83140579..ef38b0f70cf 100644 --- a/dlls/evr/evr_private.h +++ b/dlls/evr/evr_private.h @@ -45,6 +45,12 @@ static inline const char *debugstr_time(LONGLONG time) return wine_dbg_sprintf("%s", rev); } +static inline const char *debugstr_normalized_rect(const MFVideoNormalizedRect *rect) +{ + if (!rect) return "(null)"; + return wine_dbg_sprintf("(%.8e,%.8e)-(%.8e,%.8e)", rect->left, rect->top, rect->right, rect->bottom); +} + HRESULT evr_filter_create(IUnknown *outer_unk, void **ppv) DECLSPEC_HIDDEN; HRESULT evr_mixer_create(IUnknown *outer_unk, void **ppv) DECLSPEC_HIDDEN; HRESULT evr_presenter_create(IUnknown *outer_unk, void **ppv) DECLSPEC_HIDDEN; diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 66c3960511a..f821dc7e6d9 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -25,6 +25,7 @@ #include "mferror.h" #include "evr_classes.h" +#include "evr_private.h" #include "initguid.h" #include "evr9.h" @@ -1551,7 +1552,7 @@ static HRESULT WINAPI video_mixer_control_SetStreamOutputRect(IMFVideoMixerContr struct input_stream *stream; HRESULT hr; - TRACE("%p, %u, %p.\n", iface, id, rect); + TRACE("%p, %u, %s.\n", iface, id, debugstr_normalized_rect(rect)); if (!rect) return E_POINTER; diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index fa116c18ccc..bf0f89df0eb 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -1280,7 +1280,7 @@ static HRESULT WINAPI video_presenter_control_SetVideoPosition(IMFVideoDisplayCo struct video_presenter *presenter = impl_from_IMFVideoDisplayControl(iface); HRESULT hr = S_OK; - TRACE("%p, %p, %s.\n", iface, src_rect, wine_dbgstr_rect(dst_rect)); + TRACE("%p, %s, %s.\n", iface, debugstr_normalized_rect(src_rect), wine_dbgstr_rect(dst_rect)); if (!src_rect && !dst_rect) return E_POINTER;

1 0

Rémi Bernon : xaudio2_7: Restore FAudioCreateReverbWithCustomAllocatorEXT use for old XAPO versions.
by Alexandre Julliard 25 Oct '21

25 Oct '21

Module: wine Branch: master Commit: 22c26a2dde318b5b370fc269cab871e5a8bc4231 URL: https://source.winehq.org/git/wine.git/?a=commit;h=22c26a2dde318b5b370fc269… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Oct 25 13:52:44 2021 +0200 xaudio2_7: Restore FAudioCreateReverbWithCustomAllocatorEXT use for old XAPO versions. This was initially guarded to check the presence of FAudioCreateReverb9* variant and dropped in d8be85863fedf6982944d06ebd1ce5904cb3d4e1 but it is required, and causes crackling sound after Life is Strange 2 intro. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_7/xapo.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/xaudio2_7/xapo.c b/dlls/xaudio2_7/xapo.c index 657d2f3f507..47210f1570e 100644 --- a/dlls/xaudio2_7/xapo.c +++ b/dlls/xaudio2_7/xapo.c @@ -311,6 +311,7 @@ static inline HRESULT get_fapo_from_clsid(REFCLSID clsid, FAPO **fapo) XAudio_Internal_Free, XAudio_Internal_Realloc ); +#if XAUDIO2_VER >= 9 if(IsEqualGUID(clsid, &CLSID_AudioReverb27)) return FAudioCreateReverb9WithCustomAllocatorEXT( fapo, @@ -319,6 +320,16 @@ static inline HRESULT get_fapo_from_clsid(REFCLSID clsid, FAPO **fapo) XAudio_Internal_Free, XAudio_Internal_Realloc ); +#else + if(IsEqualGUID(clsid, &CLSID_AudioReverb27)) + return FAudioCreateReverbWithCustomAllocatorEXT( + fapo, + 0, + XAudio_Internal_Malloc, + XAudio_Internal_Free, + XAudio_Internal_Realloc + ); +#endif #endif #if XAUDIO2_VER >= 8 || defined XAPOFX1_VER if(IsEqualGUID(clsid, &CLSID_FXReverb) ||

1 0

Rémi Bernon : faudio: Build with -DNDEBUG.
by Alexandre Julliard 25 Oct '21

25 Oct '21

Module: wine Branch: master Commit: babaf916ab12c7a9128409f717878919ccc5826b URL: https://source.winehq.org/git/wine.git/?a=commit;h=babaf916ab12c7a9128409f7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Oct 25 15:36:23 2021 +0200 faudio: Build with -DNDEBUG. Unix version of FAudio uses SDL_assert for its assertions, which is generally compiled as no-op in release builds. This better matches the original behavior. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51921 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/faudio/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/faudio/Makefile.in b/libs/faudio/Makefile.in index 9058cac6543..3a9bb591227 100644 --- a/libs/faudio/Makefile.in +++ b/libs/faudio/Makefile.in @@ -1,6 +1,6 @@ EXTLIB = libfaudio.a EXTRAINCL = -I$(srcdir)/include -EXTRADEFS = -DFAUDIO_WIN32_PLATFORM -DHAVE_WMADEC +EXTRADEFS = -DFAUDIO_WIN32_PLATFORM -DHAVE_WMADEC -DNDEBUG C_SRCS = \ src/F3DAudio.c \

1 0

Zebediah Figura : wmvcore/tests: Add some basic tests for streaming with the synchronous reader.
by Alexandre Julliard 25 Oct '21

25 Oct '21

Module: wine Branch: master Commit: 42d0d8d9071c8feb89a5ca798960123a3564de60 URL: https://source.winehq.org/git/wine.git/?a=commit;h=42d0d8d9071c8feb89a5ca79… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Oct 25 10:54:57 2021 -0500 wmvcore/tests: Add some basic tests for streaming with the synchronous reader. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmvcore/tests/Makefile.in | 3 + dlls/wmvcore/tests/rsrc.rc | 25 +++ dlls/wmvcore/tests/test.wmv | Bin 0 -> 45663 bytes dlls/wmvcore/tests/wmvcore.c | 392 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 420 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=42d0d8d9071c8feb89a5…

1 0

Piotr Caban : msvcrt: Fix clearing NOINHERIT flag in _dup2.
by Alexandre Julliard 25 Oct '21

25 Oct '21

Module: wine Branch: master Commit: 1420d28cd603ff4d96b4170e29f17b691cf9287b URL: https://source.winehq.org/git/wine.git/?a=commit;h=1420d28cd603ff4d96b4170e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 25 18:28:39 2021 +0200 msvcrt: Fix clearing NOINHERIT flag in _dup2. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 7b41d336dc7..fd7168991f4 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1128,7 +1128,7 @@ int CDECL _dup2(int od, int nd) if (DuplicateHandle(GetCurrentProcess(), info_od->handle, GetCurrentProcess(), &handle, 0, TRUE, DUPLICATE_SAME_ACCESS)) { - int wxflag = info_od->wxflag & ~_O_NOINHERIT; + int wxflag = info_od->wxflag & ~WX_DONTINHERIT; if (info_nd->wxflag & WX_OPEN) _close(nd);

1 0

Piotr Caban : msvcrt: Rewrite _popen function.
by Alexandre Julliard 25 Oct '21

25 Oct '21

Module: wine Branch: master Commit: e38f3761f890ccc0b32ac16c633cdf7582511133 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e38f3761f890ccc0b32ac16c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 25 18:29:00 2021 +0200 msvcrt: Rewrite _popen function. Old implementation was not thread safe, incorrectly copied file descriptors to child process and was leaking parent pipe fd to child process. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51719 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/process.c | 217 ++++++++++++++++++++++++++--------------------- dlls/msvcrt/tests/misc.c | 50 +++++++++-- 2 files changed, 166 insertions(+), 101 deletions(-) diff --git a/dlls/msvcrt/process.c b/dlls/msvcrt/process.c index f2240270179..630e378df87 100644 --- a/dlls/msvcrt/process.c +++ b/dlls/msvcrt/process.c @@ -1040,113 +1040,140 @@ void msvcrt_free_popen_data(void) */ FILE* CDECL _wpopen(const wchar_t* command, const wchar_t* mode) { - FILE *ret; - BOOL readPipe = TRUE; - int textmode, fds[2], fdToDup, fdToOpen, fdStdHandle = -1, fmode; - const wchar_t *p; - wchar_t *comspec, *fullcmd; - unsigned int len; - struct popen_handle *container; - DWORD i; - - TRACE("(command=%s, mode=%s)\n", debugstr_w(command), debugstr_w(mode)); - - if (!command || !mode) - return NULL; - - _get_fmode(&fmode); - textmode = fmode & (_O_BINARY | _O_TEXT); - for (p = mode; *p; p++) - { - switch (*p) + wchar_t *comspec, *fullcmd, fullname[MAX_PATH]; + int textmode, fds[2], fd_parent, fd_child; + struct popen_handle *container; + PROCESS_INFORMATION pi; + BOOL read_pipe = TRUE; + const wchar_t *p; + unsigned int len; + STARTUPINFOW si; + FILE *ret; + DWORD i; + BOOL r; + + TRACE("(command=%s, mode=%s)\n", debugstr_w(command), debugstr_w(mode)); + + if (!command || !mode) + return NULL; + + _get_fmode(&textmode); + textmode &= _O_BINARY | _O_TEXT; + textmode |= _O_NOINHERIT; + for (p = mode; *p; p++) { - case 'W': - case 'w': - readPipe = FALSE; - break; - case 'B': - case 'b': - textmode |= _O_BINARY; - textmode &= ~_O_TEXT; - break; - case 'T': - case 't': - textmode |= _O_TEXT; - textmode &= ~_O_BINARY; - break; + switch (*p) + { + case 'W': + case 'w': + read_pipe = FALSE; + break; + case 'B': + case 'b': + textmode |= _O_BINARY; + textmode &= ~_O_TEXT; + break; + case 'T': + case 't': + textmode |= _O_TEXT; + textmode &= ~_O_BINARY; + break; + } } - } - if (_pipe(fds, 0, textmode) == -1) - return NULL; + if (_pipe(fds, 0, textmode) == -1) + return NULL; - fdToDup = readPipe ? 1 : 0; - fdToOpen = readPipe ? 0 : 1; + if (read_pipe) + { + fd_parent = fds[0]; + fd_child = _dup(fds[1]); + _close(fds[1]); + } + else + { + fd_parent = fds[1]; + fd_child = _dup(fds[0]); + _close(fds[0]); + } + if (fd_child == -1) + { + _close(fd_parent); + return NULL; + } + ret = _wfdopen(fd_parent, mode); + if (!ret) + { + _close(fd_child); + return NULL; + } - _lock(_POPEN_LOCK); - for(i=0; i<popen_handles_size; i++) - { - if (!popen_handles[i].f) - break; - } - if (i==popen_handles_size) - { - i = (popen_handles_size ? popen_handles_size*2 : 8); - container = realloc(popen_handles, i*sizeof(*container)); - if (!container) goto error; - - popen_handles = container; - container = popen_handles+popen_handles_size; - memset(container, 0, (i-popen_handles_size)*sizeof(*container)); - popen_handles_size = i; - } - else container = popen_handles+i; + _lock(_POPEN_LOCK); + for (i = 0; i < popen_handles_size; i++) + { + if (!popen_handles[i].f) + break; + } + if (i == popen_handles_size) + { + i = (popen_handles_size ? popen_handles_size * 2 : 8); + container = realloc(popen_handles, i * sizeof(*container)); + if (!container) goto error; + + popen_handles = container; + container = popen_handles + popen_handles_size; + memset(container, 0, (i - popen_handles_size) * sizeof(*container)); + popen_handles_size = i; + } + else container = popen_handles + i; - if ((fdStdHandle = _dup(fdToDup)) == -1) - goto error; - if (_dup2(fds[fdToDup], fdToDup) != 0) - goto error; + if (!(comspec = msvcrt_get_comspec())) goto error; + len = wcslen(comspec) + wcslen(command) + 5; - _close(fds[fdToDup]); + if (!(fullcmd = HeapAlloc(GetProcessHeap(), 0, len * sizeof(wchar_t)))) + { + HeapFree(GetProcessHeap(), 0, comspec); + goto error; + } - if (!(comspec = msvcrt_get_comspec())) goto error; - len = wcslen(comspec) + wcslen(command) + 5; + wcscpy(fullcmd, comspec); + wcscat(fullcmd, L" /c "); + wcscat(fullcmd, command); + msvcrt_search_executable(comspec, fullname, 1); - if (!(fullcmd = HeapAlloc(GetProcessHeap(), 0, len * sizeof(wchar_t)))) - { + memset(&si, 0, sizeof(si)); + si.cb = sizeof(si); + si.dwFlags = STARTF_USESTDHANDLES; + if (read_pipe) + { + si.hStdInput = (HANDLE)_get_osfhandle(STDIN_FILENO); + si.hStdOutput = (HANDLE)_get_osfhandle(fd_child); + } + else + { + si.hStdInput = (HANDLE)_get_osfhandle(fd_child); + si.hStdOutput = (HANDLE)_get_osfhandle(STDOUT_FILENO); + } + si.hStdError = (HANDLE)_get_osfhandle(STDERR_FILENO); + r = CreateProcessW(fullname, fullcmd, NULL, NULL, TRUE, 0, NULL, NULL, &si, &pi); HeapFree(GetProcessHeap(), 0, comspec); - goto error; - } - - wcscpy(fullcmd, comspec); - wcscat(fullcmd, L" /c "); - wcscat(fullcmd, command); - - if ((container->proc = (HANDLE)msvcrt_spawn(_P_NOWAIT, comspec, fullcmd, NULL, 1)) - == INVALID_HANDLE_VALUE) - { - _close(fds[fdToOpen]); - ret = NULL; - } - else - { - ret = _wfdopen(fds[fdToOpen], mode); - if (!ret) - _close(fds[fdToOpen]); + HeapFree(GetProcessHeap(), 0, fullcmd); + if (!r) + { + msvcrt_set_errno(GetLastError()); + goto error; + } + CloseHandle(pi.hThread); + _close(fd_child); + container->proc = pi.hProcess; container->f = ret; - } - _unlock(_POPEN_LOCK); - HeapFree(GetProcessHeap(), 0, comspec); - HeapFree(GetProcessHeap(), 0, fullcmd); - _dup2(fdStdHandle, fdToDup); - _close(fdStdHandle); - return ret; + _unlock(_POPEN_LOCK); + return ret; error: - _unlock(_POPEN_LOCK); - if (fdStdHandle != -1) _close(fdStdHandle); - _close(fds[0]); - _close(fds[1]); - return NULL; + _unlock(_POPEN_LOCK); + _close(fd_child); + fclose(ret); + return NULL; } /********************************************************************* diff --git a/dlls/msvcrt/tests/misc.c b/dlls/msvcrt/tests/misc.c index 81c23dd23f2..06555e209b7 100644 --- a/dlls/msvcrt/tests/misc.c +++ b/dlls/msvcrt/tests/misc.c @@ -20,6 +20,8 @@ #include "wine/test.h" #include <errno.h> +#include <fcntl.h> +#include <io.h> #include <stdio.h> #include <math.h> #include <process.h> @@ -330,21 +332,42 @@ static void test__set_errno(void) ok(errno == 0xdeadbeef, "Expected errno to be 0xdeadbeef, got %d\n", errno); } -static void test__popen_child(void) +static void test__popen_child(int fd) { /* don't execute any tests here */ /* ExitProcess is used to set return code of _pclose */ printf("child output\n"); + if ((HANDLE)_get_osfhandle(fd) != INVALID_HANDLE_VALUE) + ExitProcess(1); ExitProcess(0x37); } +static void test__popen_read_child(void) +{ + char buf[1024], *rets; + + rets = fgets(buf, sizeof(buf), stdin); + if (strcmp(buf, "child-to-parent\n") != 0) + ExitProcess(1); + + rets = fgets(buf, sizeof(buf), stdin); + if (rets) + ExitProcess(2); + ExitProcess(3); +} + static void test__popen(const char *name) { FILE *pipe; - char buf[1024]; - int ret; + char *tempf, buf[1024]; + int ret, fd; - sprintf(buf, "\"%s\" misc popen", name); + tempf = _tempnam(".", "wne"); + ok(tempf != NULL, "_tempnam failed\n"); + fd = _open(tempf, _O_CREAT | _O_WRONLY); + ok(fd != -1, "open failed\n"); + + sprintf(buf, "\"%s\" misc popen %d", name, fd); pipe = _popen(buf, "r"); ok(pipe != NULL, "_popen failed with error: %d\n", errno); @@ -353,12 +376,25 @@ static void test__popen(const char *name) ret = _pclose(pipe); ok(ret == 0x37, "_pclose returned %x, expected 0x37\n", ret); + _close(fd); + _unlink(tempf); + free(tempf); errno = 0xdeadbeef; ret = _pclose((FILE*)0xdeadbeef); ok(ret == -1, "_pclose returned %x, expected -1\n", ret); if(p_set_errno) ok(errno == EBADF, "errno = %d\n", errno); + + sprintf(buf, "\"%s\" misc popen_read", name); + pipe = _popen(buf, "w"); + ok(pipe != NULL, "_popen failed with error: %d\n", errno); + + ret = fputs("child-to-parent\n", pipe); + ok(ret != EOF, "fputs returned %x\n", ret); + + ret = _pclose(pipe); + ok(ret == 0x3, "_pclose returned %x, expected 0x3\n", ret); } static void test__invalid_parameter(void) @@ -711,8 +747,10 @@ START_TEST(misc) arg_c = winetest_get_mainargs(&arg_v); if(arg_c >= 3) { - if(!strcmp(arg_v[2], "popen")) - test__popen_child(); + if (!strcmp(arg_v[2], "popen_read")) + test__popen_read_child(); + else if(arg_c == 4 && !strcmp(arg_v[2], "popen")) + test__popen_child(atoi(arg_v[3])); else ok(0, "invalid argument '%s'\n", arg_v[2]);

1 0

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

25 Oct '21

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

Alexandre Julliard : icinfo: Use the standard va_list instead of __ms_va_list.
by Alexandre Julliard 25 Oct '21

25 Oct '21

Module: wine Branch: master Commit: bac8aff2934c4dd7a360d604643bde81cc3a97bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=bac8aff2934c4dd7a360d604… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 25 11:01:02 2021 +0200 icinfo: Use the standard va_list instead of __ms_va_list. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/icinfo/icinfo.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/icinfo/icinfo.c b/programs/icinfo/icinfo.c index 25b847b5a36..01ddbfb6833 100644 --- a/programs/icinfo/icinfo.c +++ b/programs/icinfo/icinfo.c @@ -26,14 +26,14 @@ static int WINAPIV mywprintf(const WCHAR *format, ...) { static char output_bufA[65536]; static WCHAR output_bufW[sizeof(output_bufA)]; - __ms_va_list parms; + va_list parms; DWORD nOut; BOOL res = FALSE; HANDLE hout = GetStdHandle(STD_OUTPUT_HANDLE); - __ms_va_start(parms, format); + va_start(parms, format); vswprintf(output_bufW, ARRAY_SIZE(output_bufW), format, parms); - __ms_va_end(parms); + va_end(parms); /* Try to write as unicode whenever we think it's a console */ if (((DWORD_PTR)hout & 3) == 3)

1 0

Alexandre Julliard : ipconfig: Use the standard va_list instead of __ms_va_list.
by Alexandre Julliard 25 Oct '21

25 Oct '21

Module: wine Branch: master Commit: b2240d6dfb90ace4dd7cf911a9eaebf031e515b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2240d6dfb90ace4dd7cf911… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 25 11:01:09 2021 +0200 ipconfig: Use the standard va_list instead of __ms_va_list. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/ipconfig/ipconfig.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/programs/ipconfig/ipconfig.c b/programs/ipconfig/ipconfig.c index a056771128c..29f86521b07 100644 --- a/programs/ipconfig/ipconfig.c +++ b/programs/ipconfig/ipconfig.c @@ -28,7 +28,7 @@ #include "ipconfig.h" -static int ipconfig_vprintfW(const WCHAR *msg, __ms_va_list va_args) +static int ipconfig_vprintfW(const WCHAR *msg, va_list va_args) { int wlen; DWORD count, ret; @@ -64,27 +64,27 @@ static int ipconfig_vprintfW(const WCHAR *msg, __ms_va_list va_args) static int WINAPIV ipconfig_printfW(const WCHAR *msg, ...) { - __ms_va_list va_args; + va_list va_args; int len; - __ms_va_start(va_args, msg); + va_start(va_args, msg); len = ipconfig_vprintfW(msg, va_args); - __ms_va_end(va_args); + va_end(va_args); return len; } static int WINAPIV ipconfig_message_printfW(int msg, ...) { - __ms_va_list va_args; + va_list va_args; WCHAR msg_buffer[8192]; int len; LoadStringW(GetModuleHandleW(NULL), msg, msg_buffer, ARRAY_SIZE(msg_buffer)); - __ms_va_start(va_args, msg); + va_start(va_args, msg); len = ipconfig_vprintfW(msg_buffer, va_args); - __ms_va_end(va_args); + va_end(va_args); return len; }

1 0