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

[PATCH v2 7/7] winepulse: Build with msvcrt.
by Jacek Caban 25 May '21

25 May '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winepulse.drv/Makefile.in | 2 ++ dlls/winepulse.drv/mmdevdrv.c | 15 ++------------- 2 files changed, 4 insertions(+), 13 deletions(-)

2 1

[PATCH v2 6/7] winepulse: Allocate ACImpl volumes when channel count is known.
by Jacek Caban 25 May '21

25 May '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winepulse.drv/mmdevdrv.c | 52 +++++++++++++++++++++++------------ 1 file changed, 34 insertions(+), 18 deletions(-)

2 1

[PATCH v2 5/7] winepulse: Simplify IAudioStreamVolume::GetChannelVolume implementation.
by Jacek Caban 25 May '21

25 May '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winepulse.drv/mmdevdrv.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)

2 1

[PATCH v2 4/7] winepulse: Simplify IAudioStreamVolume::SetChannelVolume implementation.
by Jacek Caban 25 May '21

25 May '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winepulse.drv/mmdevdrv.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)

2 1

[PATCH v2 3/7] winepulse: Move pulse_is_started to unix lib.
by Jacek Caban 25 May '21

25 May '21

And move pulse_stream to pulse.c since it's accessed only from unix lib now. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winepulse.drv/mmdevdrv.c | 2 +- dlls/winepulse.drv/pulse.c | 36 +++++++++++++++++++++++++++++++++++ dlls/winepulse.drv/unixlib.h | 32 +++---------------------------- 3 files changed, 40 insertions(+), 30 deletions(-)

2 1

[PATCH v2 2/7] winepulse: Simplify checks for stream being initialized.
by Jacek Caban 25 May '21

25 May '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winepulse.drv/mmdevdrv.c | 37 ++++++++--------------------------- 1 file changed, 8 insertions(+), 29 deletions(-)

2 1

[PATCH v2 1/7] winepulse: Move pulse_get_position to unix lib.
by Jacek Caban 25 May '21

25 May '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winepulse.drv/mmdevdrv.c | 46 +++++++++-------------------------- dlls/winepulse.drv/pulse.c | 34 ++++++++++++++++++++++++++ dlls/winepulse.drv/unixlib.h | 1 + 3 files changed, 47 insertions(+), 34 deletions(-)

2 1

[PATCH 1/6] dinput8/tests: Flush events after creating window.
by Rémi Bernon 25 May '21

25 May '21

To make it more likely it gets focused on X11 and fix spurious failures. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- This is the first part of a refactoring series to wrap ANSI interfaces around the unicode interfaces in a generic and more consistent way. Right now simple wrappers exists, at different levels, sometimes duplicated between the generic device base and specializations. The goal is mostly to cleanup the code but also eventually simplify the implementation of an HID joystick device. dlls/dinput/tests/mouse.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/dinput/tests/mouse.c b/dlls/dinput/tests/mouse.c index 2e0b8cdf2e9..69051bb2a34 100644 --- a/dlls/dinput/tests/mouse.c +++ b/dlls/dinput/tests/mouse.c @@ -48,6 +48,21 @@ static const HRESULT SetCoop_child_window[16] = { E_INVALIDARG, E_HANDLE, E_HANDLE, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG, E_INVALIDARG}; +static void flush_events(void) +{ + MSG msg; + int diff = 200; + int min_timeout = 100; + DWORD time = GetTickCount() + diff; + + while (diff > 0) + { + if (MsgWaitForMultipleObjects( 0, NULL, FALSE, min_timeout, QS_ALLINPUT ) == WAIT_TIMEOUT) break; + while (PeekMessageA( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageA( &msg ); + diff = time - GetTickCount(); + } +} + static void test_set_coop(IDirectInputA *pDI, HWND hwnd) { HRESULT hr; @@ -131,6 +146,7 @@ static void test_acquire(IDirectInputA *pDI, HWND hwnd) hwnd2 = CreateWindowA("static", "Temporary", WS_VISIBLE, 10, 210, 200, 200, NULL, NULL, NULL, NULL); ok(hwnd2 != NULL, "CreateWindowA failed with %u\n", GetLastError()); + flush_events(); hr = IDirectInputDevice_GetDeviceState(pMouse, sizeof(m_state), &m_state); ok(hr == DIERR_NOTACQUIRED, "GetDeviceState() should have failed: %08x\n", hr); -- 2.31.0

1 5

[PATCH v2 1/2] oleacc: Implement AccessibleObjectFromEvent.
by Connor McAdams 25 May '21

25 May '21

Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/oleacc/main.c | 52 +++++++++++++++++++++++++++++++++++++++++ dlls/oleacc/oleacc.spec | 2 +- 2 files changed, 53 insertions(+), 1 deletion(-) diff --git a/dlls/oleacc/main.c b/dlls/oleacc/main.c index f6b66a8bcab..db05d9dac92 100644 --- a/dlls/oleacc/main.c +++ b/dlls/oleacc/main.c @@ -331,6 +331,58 @@ HRESULT WINAPI AccessibleObjectFromPoint( POINT ptScreen, IAccessible** ppacc, V return E_NOTIMPL; } +HRESULT WINAPI AccessibleObjectFromEvent( HWND hwnd, DWORD dwObjectID, DWORD dwChildID, + IAccessible** ppacc, VARIANT* pvarChild ) +{ + IAccessible *iface = NULL; + IDispatch *disp = NULL; + VARIANT vid; + HRESULT hr; + + TRACE("%p %d %d %p %p\n", hwnd, dwObjectID, dwChildID, ppacc, pvarChild); + + hr = AccessibleObjectFromWindow(hwnd, dwObjectID, &IID_IAccessible, (void **)&iface); + if (!SUCCEEDED(hr)) + return hr; + + *ppacc = iface; + VariantInit(&vid); + V_VT(&vid) = VT_I4; + V_I4(&vid) = dwChildID; + + /* + * FIXME: Should also probably handle the possibility that the child isn't + * an object itself. + */ + hr = IAccessible_get_accChild(iface, vid, &disp); + + /* + * If we fail to get a child with the given ChildID, we instead return the + * IAccessible interface we retrieved from AccessibleObjectFromWindow. + */ + if (SUCCEEDED(hr)) + { + hr = IDispatch_QueryInterface(disp, &IID_IAccessible, (void **)ppacc); + if (SUCCEEDED(hr)) + { + V_I4(&vid) = CHILDID_SELF; + IAccessible_Release(iface); + } + else + { + *ppacc = iface; + } + + IDispatch_Release(disp); + } + + VariantInit(pvarChild); + V_VT(pvarChild) = VT_I4; + V_I4(pvarChild) = V_I4(&vid); + + return S_OK; +} + HRESULT WINAPI AccessibleObjectFromWindow( HWND hwnd, DWORD dwObjectID, REFIID riid, void** ppvObject ) { diff --git a/dlls/oleacc/oleacc.spec b/dlls/oleacc/oleacc.spec index 4cff0b8effc..9ad6e915965 100644 --- a/dlls/oleacc/oleacc.spec +++ b/dlls/oleacc/oleacc.spec @@ -1,5 +1,5 @@ @ stdcall AccessibleChildren(ptr long long ptr ptr) -@ stub AccessibleObjectFromEvent +@ stdcall AccessibleObjectFromEvent(ptr long long ptr ptr) @ stdcall AccessibleObjectFromPoint(int64 ptr ptr) @ stdcall AccessibleObjectFromWindow(ptr long ptr ptr) @ stdcall CreateStdAccessibleObject(ptr long ptr ptr) -- 2.25.1

1 2

[PATCH v2 1/3] dssenh/tests: Add CryptAcquireContextA last error check.
by Rémi Bernon 25 May '21

25 May '21

When container key doesn't exist yet. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=30244 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: Don't check last error on success. dlls/dssenh/tests/dssenh.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c index 4d33fc86cd8..b72b1e3a614 100644 --- a/dlls/dssenh/tests/dssenh.c +++ b/dlls/dssenh/tests/dssenh.c @@ -71,6 +71,19 @@ static void test_acquire_context(void) /* test base DSS provider (PROV_DSS) */ + SetLastError(0xdeadbeef); + result = CryptAcquireContextA(&hProv, NULL, NULL, PROV_DSS, 0); + if (!result) + { + todo_wine ok(GetLastError() == NTE_BAD_KEYSET, "Expected NTE_BAD_KEYSET, got %08x\n", GetLastError()); + SetLastError(0xdeadbeef); + result = CryptAcquireContextA(&hProv, NULL, NULL, PROV_DSS, CRYPT_NEWKEYSET); + } + ok(result, "CryptAcquireContextA succeeded\n"); + + result = CryptReleaseContext(hProv, 0); + ok(result, "CryptReleaseContext failed.\n"); + result = CryptAcquireContextA( &hProv, NULL, MS_DEF_DSS_PROV_A, PROV_DSS, CRYPT_VERIFYCONTEXT); if(!result) -- 2.31.0

2 5