October 2021 - Wine-Commits

Rémi Bernon : winex11.drv: Introduce new map_raw_event_coords helper.
by Alexandre Julliard Oct. 25, 2021

Oct. 25, 2021

Module: wine Branch: master Commit: 7bc5b6800e0a78ab744532b7ed28ee04d38110f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7bc5b6800e0a78ab744532b7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Oct 25 11:51:52 2021 +0200 winex11.drv: Introduce new map_raw_event_coords helper. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/mouse.c | 125 ++++++++++++++++++++++++----------------------- 1 file changed, 64 insertions(+), 61 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 42bac332664..2243261e0b8 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -634,6 +634,65 @@ static void map_event_coords( HWND hwnd, Window window, Window event_root, int x input->u.mi.dy = pt.y; } +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; + 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 (!event->valuators.mask_len) return FALSE; + if (thread_data->xi2_state != xi_enabled) return FALSE; + + /* If there is no slave currently detected, no previous motion nor device + * change events were received. Look it up now on the device list in this + * case. + */ + if (!thread_data->xi2_current_slave) + { + XIDeviceInfo *devices = thread_data->xi2_devices; + + for (i = 0; i < thread_data->xi2_device_count; i++) + { + if (devices[i].use != XISlavePointer) continue; + if (devices[i].deviceid != event->deviceid) continue; + if (devices[i].attachment != thread_data->xi2_core_pointer) continue; + thread_data->xi2_current_slave = event->deviceid; + break; + } + } + 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++) + { + if (!XIMaskIsSet( event->valuators.mask, i )) continue; + val = *values++; + if (i == x_rel->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 (i == y_rel->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); + } + } + + TRACE( "pos %d,%d (event %f,%f)\n", input->u.mi.dx, input->u.mi.dy, dx, dy ); + return TRUE; +} + /*********************************************************************** * send_mouse_input @@ -1827,79 +1886,23 @@ static BOOL X11DRV_DeviceChanged( XGenericEventCookie *xev ) static BOOL X11DRV_RawMotion( XGenericEventCookie *xev ) { XIRawEvent *event = xev->data; - const double *values = event->valuators.values; - RECT virtual_rect; INPUT input; - int i; - double dx = 0, dy = 0, val; - struct x11drv_thread_data *thread_data = x11drv_thread_data(); - struct x11drv_valuator_data *x_rel, *y_rel; - - if (thread_data->x_rel_valuator.number < 0 || thread_data->y_rel_valuator.number < 0) return FALSE; - if (!event->valuators.mask_len) return FALSE; - if (thread_data->xi2_state != xi_enabled) return FALSE; - /* If there is no slave currently detected, no previous motion nor device - * change events were received. Look it up now on the device list in this - * case. - */ - if (!thread_data->xi2_current_slave) + if (broken_rawevents && is_old_motion_event( xev->serial )) { - XIDeviceInfo *devices = thread_data->xi2_devices; - - for (i = 0; i < thread_data->xi2_device_count; i++) - { - if (devices[i].use != XISlavePointer) continue; - if (devices[i].deviceid != event->deviceid) continue; - if (devices[i].attachment != thread_data->xi2_core_pointer) continue; - thread_data->xi2_current_slave = event->deviceid; - break; - } + TRACE( "old serial %lu, ignoring\n", xev->serial ); + return FALSE; } - if (event->deviceid != thread_data->xi2_current_slave) return FALSE; - - x_rel = &thread_data->x_rel_valuator; - y_rel = &thread_data->y_rel_valuator; - + input.type = INPUT_MOUSE; input.u.mi.mouseData = 0; input.u.mi.dwFlags = MOUSEEVENTF_MOVE; input.u.mi.time = EVENT_x11_time_to_win32_time( event->time ); input.u.mi.dwExtraInfo = 0; input.u.mi.dx = 0; input.u.mi.dy = 0; + if (!map_raw_event_coords( event, &input )) return FALSE; - virtual_rect = get_virtual_screen_rect(); - - for (i = 0; i <= max ( x_rel->number, y_rel->number ); i++) - { - if (!XIMaskIsSet( event->valuators.mask, i )) continue; - val = *values++; - if (i == x_rel->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 (i == y_rel->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 (broken_rawevents && is_old_motion_event( xev->serial )) - { - TRACE( "pos %d,%d old serial %lu, ignoring\n", input.u.mi.dx, input.u.mi.dy, xev->serial ); - return FALSE; - } - - TRACE( "pos %d,%d (event %f,%f)\n", input.u.mi.dx, input.u.mi.dy, dx, dy ); - - input.type = INPUT_MOUSE; __wine_send_input( 0, &input, NULL ); return TRUE; }

1 0

Piotr Caban : msvcrt: Rewrite _popen function.
by Alexandre Julliard Oct. 25, 2021

Oct. 25, 2021

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

Nikolay Sivov : mfplay: Implement GetPosition().
by Alexandre Julliard Oct. 25, 2021

Oct. 25, 2021

Module: wine Branch: master Commit: dd1a603a1f0447c980f41606aba5f6aa7717643e URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd1a603a1f0447c980f41606… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 25 13:04:21 2021 +0300 mfplay: Implement GetPosition(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/player.c | 40 +++++++++++++++++++++++++++++++++++++--- dlls/mfplay/tests/mfplay.c | 24 ++++++++++++++++++++++++ 2 files changed, 61 insertions(+), 3 deletions(-) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index 0e33dcbd649..a34973f8e36 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -904,9 +904,40 @@ static HRESULT WINAPI media_player_SetPosition(IMFPMediaPlayer *iface, REFGUID p static HRESULT WINAPI media_player_GetPosition(IMFPMediaPlayer *iface, REFGUID postype, PROPVARIANT *position) { - FIXME("%p, %s, %p.\n", iface, debugstr_guid(postype), position); + struct media_player *player = impl_from_IMFPMediaPlayer(iface); + IMFPresentationClock *presentation_clock; + IMFClock *clock; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %s, %p.\n", iface, debugstr_guid(postype), position); + + if (!position) + return E_POINTER; + + if (!IsEqualGUID(postype, &MFP_POSITIONTYPE_100NS)) + return E_INVALIDARG; + + EnterCriticalSection(&player->cs); + if (player->state == MFP_MEDIAPLAYER_STATE_SHUTDOWN) + hr = MF_E_SHUTDOWN; + else if (!player->item) + hr = MF_E_INVALIDREQUEST; + else + { + if (SUCCEEDED(hr = IMFMediaSession_GetClock(player->session, &clock))) + { + if (SUCCEEDED(hr = IMFClock_QueryInterface(clock, &IID_IMFPresentationClock, (void **)&presentation_clock))) + { + position->vt = VT_UI8; + hr = IMFPresentationClock_GetTime(presentation_clock, (MFTIME *)&position->uhVal.QuadPart); + IMFPresentationClock_Release(presentation_clock); + } + IMFClock_Release(clock); + } + } + LeaveCriticalSection(&player->cs); + + return hr; } static HRESULT WINAPI media_player_GetDuration(IMFPMediaPlayer *iface, REFGUID postype, PROPVARIANT *duration) @@ -916,9 +947,12 @@ static HRESULT WINAPI media_player_GetDuration(IMFPMediaPlayer *iface, REFGUID p TRACE("%p, %s, %p.\n", iface, debugstr_guid(postype), duration); - if (!postype || !duration) + if (!duration) return E_POINTER; + if (!IsEqualGUID(postype, &MFP_POSITIONTYPE_100NS)) + return E_INVALIDARG; + EnterCriticalSection(&player->cs); if (player->state == MFP_MEDIAPLAYER_STATE_SHUTDOWN) hr = MF_E_SHUTDOWN; diff --git a/dlls/mfplay/tests/mfplay.c b/dlls/mfplay/tests/mfplay.c index cfa689c189e..1daaa3af1d5 100644 --- a/dlls/mfplay/tests/mfplay.c +++ b/dlls/mfplay/tests/mfplay.c @@ -227,6 +227,15 @@ todo_wine hr = IMFPMediaPlayer_GetDuration(player, &MFP_POSITIONTYPE_100NS, &propvar); ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + hr = IMFPMediaPlayer_GetPosition(player, NULL, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_GetPosition(player, &MFP_POSITIONTYPE_100NS, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_GetPosition(player, &MFP_POSITIONTYPE_100NS, &propvar); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + hr = IMFPMediaPlayer_Shutdown(player); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); @@ -371,9 +380,24 @@ static void test_duration(void) hr = IMFPMediaPlayer_GetDuration(player, &MFP_POSITIONTYPE_100NS, NULL); ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + hr = IMFPMediaPlayer_GetDuration(player, &IID_IUnknown, &propvar); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + hr = IMFPMediaPlayer_GetDuration(player, &MFP_POSITIONTYPE_100NS, &propvar); ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + hr = IMFPMediaPlayer_GetPosition(player, NULL, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_GetPosition(player, &MFP_POSITIONTYPE_100NS, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_GetPosition(player, &IID_IUnknown, &propvar); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_GetPosition(player, &MFP_POSITIONTYPE_100NS, &propvar); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + IMFPMediaPlayer_Release(player); }

1 0

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

Oct. 25, 2021

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 Oct. 25, 2021

Oct. 25, 2021

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 Oct. 25, 2021

Oct. 25, 2021

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

Nikolay Sivov : evr: Trace normalized rectangle arguments.
by Alexandre Julliard Oct. 25, 2021

Oct. 25, 2021

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

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

Oct. 25, 2021

Module: wine Branch: master Commit: 2c1b8153630d34aaea27a2d59c67e9704f5aa7d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c1b8153630d34aaea27a2d5… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sat Oct 23 10:18:16 2021 +0200 wmc: 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/wmc/wmc.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/tools/wmc/wmc.c b/tools/wmc/wmc.c index 864c969b136..2993d3c5ef7 100644 --- a/tools/wmc/wmc.c +++ b/tools/wmc/wmc.c @@ -24,6 +24,11 @@ #include <stdlib.h> #include <string.h> #include <signal.h> +#include <limits.h> +#include <sys/types.h> +#ifdef HAVE_SYS_SYSCTL_H +# include <sys/sysctl.h> +#endif #include "wmc.h" #include "utils.h" @@ -165,7 +170,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

Alex Henrie : dxtrans: Add DllGetClassObject stub.
by Alexandre Julliard Oct. 25, 2021

Oct. 25, 2021

Module: wine Branch: master Commit: a0f86f4410e7524a98779389d73fbc1472226bb8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0f86f4410e7524a98779389… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Oct 24 19:20:47 2021 -0600 dxtrans: Add DllGetClassObject stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51917 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxtrans/Makefile.in | 3 +++ dlls/dxtrans/dxtrans.spec | 2 +- dlls/dxtrans/main.c | 35 +++++++++++++++++++++++++++++++++++ 3 files changed, 39 insertions(+), 1 deletion(-) diff --git a/dlls/dxtrans/Makefile.in b/dlls/dxtrans/Makefile.in index b5c1602917f..cf669277b93 100644 --- a/dlls/dxtrans/Makefile.in +++ b/dlls/dxtrans/Makefile.in @@ -1 +1,4 @@ MODULE = dxtrans.dll + +C_SRCS = \ + main.c diff --git a/dlls/dxtrans/dxtrans.spec b/dlls/dxtrans/dxtrans.spec index 7c2d605e534..b8ff0297a1b 100644 --- a/dlls/dxtrans/dxtrans.spec +++ b/dlls/dxtrans/dxtrans.spec @@ -6,6 +6,6 @@ @ stub ?DXOverArrayMMX@@YGXPAVDXPMSAMPLE@@PBV1(a)K@Z @ stdcall -private DllCanUnloadNow() @ stub DllEnumClassObjects -@ stub DllGetClassObject +@ stdcall -private DllGetClassObject(ptr ptr ptr) @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() diff --git a/dlls/dxtrans/main.c b/dlls/dxtrans/main.c new file mode 100644 index 00000000000..2b87e9f69c4 --- /dev/null +++ b/dlls/dxtrans/main.c @@ -0,0 +1,35 @@ +/* + * DirectX Transitions + * + * Copyright 2021 Alex Henrie + * + * 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 + */ + +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dxtrans); + +HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID riid, void **out) +{ + FIXME("(%s, %s, %p) stub!\n", debugstr_guid(clsid), debugstr_guid(riid), out); + return CLASS_E_CLASSNOTAVAILABLE; +}

1 0

Nikolay Sivov : mfplay: Partially implement GetDuration().
by Alexandre Julliard Oct. 25, 2021

Oct. 25, 2021

Module: wine Branch: master Commit: 9d6fc061c97a247ffce7134d429d10fc13a9d9c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d6fc061c97a247ffce7134d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 25 13:04:20 2021 +0300 mfplay: Partially implement GetDuration(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/player.c | 22 +++++++++++++++++++--- dlls/mfplay/tests/mfplay.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 3 deletions(-) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index adb88fff053..0e33dcbd649 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -909,11 +909,27 @@ static HRESULT WINAPI media_player_GetPosition(IMFPMediaPlayer *iface, REFGUID p return E_NOTIMPL; } -static HRESULT WINAPI media_player_GetDuration(IMFPMediaPlayer *iface, REFGUID postype, PROPVARIANT *position) +static HRESULT WINAPI media_player_GetDuration(IMFPMediaPlayer *iface, REFGUID postype, PROPVARIANT *duration) { - FIXME("%p, %s, %p.\n", iface, debugstr_guid(postype), position); + struct media_player *player = impl_from_IMFPMediaPlayer(iface); + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %s, %p.\n", iface, debugstr_guid(postype), duration); + + if (!postype || !duration) + return E_POINTER; + + EnterCriticalSection(&player->cs); + if (player->state == MFP_MEDIAPLAYER_STATE_SHUTDOWN) + hr = MF_E_SHUTDOWN; + else if (!player->item) + hr = MF_E_INVALIDREQUEST; + else + /* FIXME: use start/stop markers for resulting duration */ + hr = IMFPMediaItem_GetDuration(player->item, postype, duration); + LeaveCriticalSection(&player->cs); + + return hr; } static HRESULT WINAPI media_player_SetRate(IMFPMediaPlayer *iface, float rate) diff --git a/dlls/mfplay/tests/mfplay.c b/dlls/mfplay/tests/mfplay.c index f18e041a4d0..cfa689c189e 100644 --- a/dlls/mfplay/tests/mfplay.c +++ b/dlls/mfplay/tests/mfplay.c @@ -148,6 +148,7 @@ static void test_shutdown(void) IMFPMediaPlayer *player; float slowest, fastest; IMFPMediaItem *item; + PROPVARIANT propvar; COLORREF color; HWND window; DWORD mode; @@ -217,6 +218,15 @@ todo_wine hr = IMFPMediaPlayer_GetVideoWindow(player, &window); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFPMediaPlayer_GetDuration(player, NULL, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_GetDuration(player, &MFP_POSITIONTYPE_100NS, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_GetDuration(player, &MFP_POSITIONTYPE_100NS, &propvar); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + hr = IMFPMediaPlayer_Shutdown(player); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); @@ -345,10 +355,33 @@ todo_wine DestroyWindow(window); } +static void test_duration(void) +{ + IMFPMediaPlayer *player; + PROPVARIANT propvar; + HRESULT hr; + + hr = MFPCreateMediaPlayer(NULL, FALSE, 0, NULL, NULL, &player); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + /* No media item. */ + hr = IMFPMediaPlayer_GetDuration(player, NULL, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_GetDuration(player, &MFP_POSITIONTYPE_100NS, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_GetDuration(player, &MFP_POSITIONTYPE_100NS, &propvar); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + + IMFPMediaPlayer_Release(player); +} + START_TEST(mfplay) { test_create_player(); test_shutdown(); test_media_item(); test_video_control(); + test_duration(); }

1 0