November 2021 - Wine-Commits

Zhiyi Zhang : uxtheme/tests: Add GetThemeIntList() tests.
by Alexandre Julliard Nov. 2, 2021

Nov. 2, 2021

Module: wine Branch: master Commit: f86f0aec993afec504c2f57f93d76aa335c4c0b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f86f0aec993afec504c2f57f… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Nov 2 14:27:24 2021 +0800 uxtheme/tests: Add GetThemeIntList() tests. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/tests/system.c | 40 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index f56c3d2c273..7992911bc19 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -28,7 +28,7 @@ #include "ddk/d3dkmthk.h" #include "vfwmsgs.h" #include "uxtheme.h" -#include "vsstyle.h" +#include "vssym32.h" #include "msg.h" #include "wine/test.h" @@ -42,6 +42,7 @@ static HRESULT (WINAPI *pGetBufferedPaintBits)(HPAINTBUFFER, RGBQUAD **, int *); static HDC (WINAPI *pGetBufferedPaintDC)(HPAINTBUFFER); static HDC (WINAPI *pGetBufferedPaintTargetDC)(HPAINTBUFFER); static HRESULT (WINAPI *pGetBufferedPaintTargetRect)(HPAINTBUFFER, RECT *); +static HRESULT (WINAPI *pGetThemeIntList)(HTHEME, int, int, int, INTLIST *); static LONG (WINAPI *pDisplayConfigGetDeviceInfo)(DISPLAYCONFIG_DEVICE_INFO_HEADER *); static LONG (WINAPI *pDisplayConfigSetDeviceInfo)(DISPLAYCONFIG_DEVICE_INFO_HEADER *); @@ -79,6 +80,7 @@ static void init_funcs(void) GET_PROC(uxtheme, GetBufferedPaintDC) GET_PROC(uxtheme, GetBufferedPaintTargetDC) GET_PROC(uxtheme, GetBufferedPaintTargetRect) + GET_PROC(uxtheme, GetThemeIntList) GET_PROC(uxtheme, OpenThemeDataEx) GET_PROC(uxtheme, OpenThemeDataForDpi) @@ -1263,6 +1265,41 @@ static void test_EnableTheming(void) } } +static void test_GetThemeIntList(void) +{ + INTLIST intlist; + HTHEME theme; + HRESULT hr; + HWND hwnd; + + if (!pGetThemeIntList) + { + win_skip("GetThemeIntList is unavailable.\n"); + return; + } + + hwnd = CreateWindowA("static", "", WS_POPUP, 0, 0, 100, 100, 0, 0, 0, NULL); + theme = OpenThemeData(hwnd, L"Button"); + if (!theme) + { + skip("Theming is not active.\n"); + DestroyWindow(hwnd); + return; + } + + /* Check properties */ + /* TMT_TRANSITIONDURATIONS is a vista+ property */ + hr = pGetThemeIntList(theme, BP_PUSHBUTTON, PBS_NORMAL, TMT_TRANSITIONDURATIONS, &intlist); + if (LOBYTE(LOWORD(GetVersion())) < 6) + ok(hr == E_PROP_ID_UNSUPPORTED, "Expected %#x, got %#x.\n", E_PROP_ID_UNSUPPORTED, hr); + else + todo_wine + ok(hr == S_OK, "GetThemeIntList failed, hr %#x.\n", hr); + + CloseThemeData(theme); + DestroyWindow(hwnd); +} + START_TEST(system) { init_funcs(); @@ -1282,6 +1319,7 @@ START_TEST(system) test_GetThemePartSize(); test_CloseThemeData(); test_buffered_paint(); + test_GetThemeIntList(); /* Test EnableTheming() in the end because it may disable theming */ test_EnableTheming();

1 0

Ziqing Hui : user32/tests: Add ALT+letter hotkey tests.
by Alexandre Julliard Nov. 2, 2021

Nov. 2, 2021

Module: wine Branch: master Commit: 556490d35b78bd847ecfd4594f888ca428bb33eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=556490d35b78bd847ecfd459… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Nov 2 10:54:21 2021 +0800 user32/tests: Add ALT+letter hotkey tests. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 81 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 79 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 4b2495f4197..73737eab98b 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -17359,6 +17359,29 @@ static const struct message WmHotkeyNew[] = { { WM_KEYUP, sent, 0, 0x80000001 }, /* lparam not checked so the sequence isn't a todo */ { 0 } }; +static const struct message WmHotkeyPressALT[] = { + { WM_SYSKEYDOWN, kbd_hook|wparam|lparam, VK_LMENU, LLKHF_INJECTED|LLKHF_ALTDOWN }, + { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_MENU, 0x20000001 }, + { WM_SYSKEYDOWN, sent|wparam|lparam, VK_MENU, 0x20000001 }, + { 0 } +}; +static const struct message WmHotkeyPressWithALT[] = { + { WM_SYSKEYDOWN, kbd_hook, 0, LLKHF_INJECTED|LLKHF_ALTDOWN }, /* lparam not checked */ + { WM_HOTKEY, sent|wparam, 6 }, + { 0 } +}; +static const struct message WmHotkeyReleaseWithALT[] = { + { WM_SYSKEYUP, kbd_hook|lparam, 0, LLKHF_INJECTED|LLKHF_UP|LLKHF_ALTDOWN }, + { HCBT_KEYSKIPPED, hook|lparam|optional, 0, 0xa0000001 }, + { WM_SYSKEYUP, sent|lparam, 0, 0xa0000001 }, + { 0 } +}; +static const struct message WmHotkeyReleaseALT[] = { + { WM_KEYUP, kbd_hook|wparam|lparam, VK_LMENU, LLKHF_INJECTED|LLKHF_UP }, + { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_MENU, 0xc0000001 }, + { WM_KEYUP, sent|wparam|lparam, VK_MENU, 0xc0000001 }, + { 0 } +}; static int hotkey_letter; @@ -17378,9 +17401,12 @@ static LRESULT CALLBACK KeyboardHookProc(int nCode, WPARAM wParam, LPARAM lParam msg.descr = "KeyboardHookProc"; add_message(&msg); - if (wParam == WM_KEYUP || wParam == WM_KEYDOWN) + if (wParam == WM_KEYUP || wParam == WM_KEYDOWN || + wParam == WM_SYSKEYUP || wParam == WM_SYSKEYDOWN) { - ok(kdbhookstruct->vkCode == VK_LWIN || kdbhookstruct->vkCode == hotkey_letter, + ok(kdbhookstruct->vkCode == VK_LWIN || + kdbhookstruct->vkCode == VK_LMENU || + kdbhookstruct->vkCode == hotkey_letter, "unexpected keycode %x\n", kdbhookstruct->vkCode); } } @@ -17635,6 +17661,56 @@ static void test_hotkey(void) } ok_sequence(WmHotkeyReleaseLWIN, "thread hotkey release LWIN", FALSE); + /* Search for an ALT + letter combination that hasn't been registered */ + for (hotkey_letter = 0x41; hotkey_letter <= 0x51; hotkey_letter ++) + { + SetLastError(0xdeadbeef); + ret = RegisterHotKey(test_window, 6, MOD_ALT, hotkey_letter); + + if (ret == TRUE) + { + break; + } + else + { + ok(GetLastError() == ERROR_HOTKEY_ALREADY_REGISTERED || broken(GetLastError() == 0xdeadbeef), + "unexpected error %d\n", GetLastError()); + } + } + + if (hotkey_letter == 0x52) + { + ok(0, "Couldn't find any free ALT + letter combination\n"); + goto end; + } + + keybd_event(VK_LMENU, 0, 0, 0); + while (PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE)) + DispatchMessageA(&msg); + ok_sequence(WmHotkeyPressALT, "window hotkey press ALT", TRUE); + + keybd_event(hotkey_letter, 0, 0, 0); + while (PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE)) + { + if (msg.message == WM_HOTKEY) + { + ok(msg.hwnd == test_window, "unexpected hwnd %p\n", msg.hwnd); + ok(msg.lParam == MAKELPARAM(MOD_ALT, hotkey_letter), "unexpected WM_HOTKEY lparam %lx\n", msg.lParam); + } + DispatchMessageA(&msg); + } + ok_sequence(WmHotkeyPressWithALT, "window hotkey press with ALT", TRUE); + + keybd_event(hotkey_letter, 0, KEYEVENTF_KEYUP, 0); + while (PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE)) + DispatchMessageA(&msg); + ok_sequence(WmHotkeyReleaseWithALT, "window hotkey release with ALT", TRUE); + + keybd_event(VK_LMENU, 0, KEYEVENTF_KEYUP, 0); + while (PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE)) + DispatchMessageA(&msg); + ok_sequence(WmHotkeyReleaseALT, "window hotkey release ALT", FALSE); + /* Unregister thread hotkey */ ret = UnregisterHotKey(NULL, 5); ok(ret == TRUE, "expected TRUE, got %i, err=%d\n", ret, GetLastError()); @@ -17645,6 +17721,7 @@ static void test_hotkey(void) end: UnregisterHotKey(NULL, 5); UnregisterHotKey(test_window, 5); + UnregisterHotKey(test_window, 6); DestroyWindow(test_window); flush_sequence(); }

1 0

Zebediah Figura : winegstreamer: Return S_OK from IWMSyncReader::SetOutputSetting(L"VideoSampleDurations").
by Alexandre Julliard Nov. 2, 2021

Nov. 2, 2021

Module: wine Branch: master Commit: 399ccc032750e2658526fc70fa0bfee7995597df URL: https://source.winehq.org/git/wine.git/?a=commit;h=399ccc032750e2658526fc70… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Nov 2 00:13:01 2021 -0500 winegstreamer: Return S_OK from IWMSyncReader::SetOutputSetting(L"VideoSampleDurations"). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/wm_syncreader.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/dlls/winegstreamer/wm_syncreader.c b/dlls/winegstreamer/wm_syncreader.c index 1f5827cf244..2c65f652cdb 100644 --- a/dlls/winegstreamer/wm_syncreader.c +++ b/dlls/winegstreamer/wm_syncreader.c @@ -249,12 +249,24 @@ static HRESULT WINAPI WMSyncReader_SetOutputProps(IWMSyncReader2 *iface, DWORD o return wm_reader_set_output_props(&reader->reader, output, props); } -static HRESULT WINAPI WMSyncReader_SetOutputSetting(IWMSyncReader2 *iface, DWORD output_num, const WCHAR *name, - WMT_ATTR_DATATYPE type, const BYTE *value, WORD length) +static HRESULT WINAPI WMSyncReader_SetOutputSetting(IWMSyncReader2 *iface, DWORD output, + const WCHAR *name, WMT_ATTR_DATATYPE type, const BYTE *value, WORD size) { - struct sync_reader *This = impl_from_IWMSyncReader2(iface); - FIXME("(%p)->(%d %s %d %p %d): stub!\n", This, output_num, debugstr_w(name), type, value, length); - return E_NOTIMPL; + struct sync_reader *reader = impl_from_IWMSyncReader2(iface); + + TRACE("reader %p, output %u, name %s, type %#x, value %p, size %u.\n", + reader, output, debugstr_w(name), type, value, size); + + if (!wcscmp(name, L"VideoSampleDurations")) + { + FIXME("Ignoring VideoSampleDurations setting.\n"); + return S_OK; + } + else + { + FIXME("Unknown setting %s; returning E_NOTIMPL.\n", debugstr_w(name)); + return E_NOTIMPL; + } } static HRESULT WINAPI WMSyncReader_SetRange(IWMSyncReader2 *iface, QWORD start, LONGLONG duration)

1 0

Zhiyi Zhang : light.msstyles: Add TMT_TRANSITIONDURATIONS property.
by Alexandre Julliard Nov. 2, 2021

Nov. 2, 2021

Module: wine Branch: master Commit: 36ed40e99fffd4fa1e5caee788a9d0562e55cc1b URL: https://source.winehq.org/git/wine.git/?a=commit;h=36ed40e99fffd4fa1e5caee7… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Nov 2 14:27:49 2021 +0800 light.msstyles: Add TMT_TRANSITIONDURATIONS property. Set all transition duration to 100ms for different states and 0ms for the same state. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/light.msstyles/light.rc | 193 +++++++++++++++++++++++++++++++++++++++++++ dlls/uxtheme/tests/system.c | 1 - 2 files changed, 193 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=36ed40e99fffd4fa1e5c…

1 0

Zhiyi Zhang : comctl32/button: Remove useless calculation for drawing group boxes.
by Alexandre Julliard Nov. 2, 2021

Nov. 2, 2021

Module: wine Branch: master Commit: ff5f45f444f0b81d6e387a9d3200ebec7534fe81 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff5f45f444f0b81d6e387a9d… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Nov 2 15:17:45 2021 +0800 comctl32/button: Remove useless calculation for drawing group boxes. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index b576e6c6db6..b3331e179cd 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -2113,10 +2113,6 @@ static void GB_Paint( const BUTTON_INFO *infoPtr, HDC hDC, UINT action ) labelRect.right++; labelRect.bottom++; FillRect(hDC, &labelRect, hbr); - labelRect.left++; - labelRect.right--; - labelRect.bottom--; - BUTTON_DrawLabel(infoPtr, hDC, dtFlags, &imageRect, &textRect); } SelectClipRgn( hDC, hrgn );

1 0

Zhiyi Zhang : comctl32/button: Use BS_PUSHLIKE instead of WS_EX_RIGHT in BUTTON_PositionRect().
by Alexandre Julliard Nov. 2, 2021

Nov. 2, 2021

Module: wine Branch: master Commit: 5e16493f71c70c4dc54db8de0900e42fd00417f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e16493f71c70c4dc54db8de… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Nov 2 15:17:51 2021 +0800 comctl32/button: Use BS_PUSHLIKE instead of WS_EX_RIGHT in BUTTON_PositionRect(). BS_PUSHLIKE and WS_EX_RIGHT have the same value and it was a typo to use WS_EX_RIGHT. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index b3331e179cd..fbe060513d2 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -1122,7 +1122,7 @@ static void BUTTON_PositionRect(LONG style, const RECT *outerRect, RECT *innerRe INT width = innerRect->right - innerRect->left; INT height = innerRect->bottom - innerRect->top; - if ((style & WS_EX_RIGHT) && !(style & BS_CENTER)) style |= BS_CENTER; + if ((style & BS_PUSHLIKE) && !(style & BS_CENTER)) style |= BS_CENTER; if (!(style & BS_CENTER)) {

1 0

Alistair Leslie-Hughes : msdasql: Trace unsupported rowset interfaces.
by Alexandre Julliard Nov. 2, 2021

Nov. 2, 2021

Module: wine Branch: master Commit: 1b443bd516ea0a74303cc69450b2a872b43e8d88 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b443bd516ea0a74303cc694… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Nov 2 13:21:26 2021 +1100 msdasql: Trace unsupported rowset interfaces. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdasql/session.c | 15 +++++++++++++++ dlls/msdasql/tests/provider.c | 10 ++++++++++ 2 files changed, 25 insertions(+) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index 5345701a35e..0298c7e7424 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -472,6 +472,21 @@ static HRESULT WINAPI msdasql_rowset_QueryInterface(IRowset *iface, REFIID riid, { *ppv = &rowset->IColumnsRowset_iface; } + else if (IsEqualGUID(&IID_IRowsetChange, riid)) + { + TRACE("IID_IRowsetChange not supported\n"); + return E_NOINTERFACE; + } + else if (IsEqualGUID(&IID_IRowsetUpdate, riid)) + { + TRACE("IID_IRowsetUpdate not supported\n"); + return E_NOINTERFACE; + } + else if (IsEqualGUID(&IID_IRowsetLocate, riid)) + { + TRACE("IID_IRowsetLocate not supported\n"); + return E_NOINTERFACE; + } if(*ppv) { diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index f10156aacfa..8b076ed4479 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -228,6 +228,7 @@ static void test_rowset_interfaces(IRowset *rowset) IColumnsInfo *col_info; IColumnsRowset *col_rs; IAccessor *accessor; + IUnknown *unk; HRESULT hr; hr = IRowset_QueryInterface(rowset, &IID_IRowsetInfo, (void**)&info); @@ -245,6 +246,15 @@ static void test_rowset_interfaces(IRowset *rowset) hr = IRowset_QueryInterface(rowset, &IID_IColumnsRowset, (void**)&col_rs); ok(hr == S_OK, "got 0x%08x\n", hr); IColumnsRowset_Release(col_rs); + + hr = IRowset_QueryInterface(rowset, &IID_IRowsetChange, (void**)&unk); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + + hr = IRowset_QueryInterface(rowset, &IID_IRowsetUpdate, (void**)&unk); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + + hr = IRowset_QueryInterface(rowset, &IID_IRowsetLocate, (void**)&unk); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); } static void test_command_rowset(IUnknown *cmd)

1 0

Zebediah Figura : winegstreamer: Implement IWMHeaderInfo::GetAttributeByName(L"Seekable").
by Alexandre Julliard Nov. 2, 2021

Nov. 2, 2021

Module: wine Branch: master Commit: c3811e84617e409875957b3d0b43fc5be91f01f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c3811e84617e409875957b3d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Nov 2 00:13:03 2021 -0500 winegstreamer: Implement IWMHeaderInfo::GetAttributeByName(L"Seekable"). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/wm_reader.c | 21 +++++++++++++++++++++ dlls/wmvcore/tests/wmvcore.c | 22 ++++++++++++++++++++++ 2 files changed, 43 insertions(+) diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index 80393d4e7a1..bd7fcd06bd3 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -910,6 +910,27 @@ static HRESULT WINAPI header_info_GetAttributeByName(IWMHeaderInfo3 *iface, WORD memcpy(value, &duration, sizeof(QWORD)); return S_OK; } + else if (!wcscmp(name, L"Seekable")) + { + if (*stream_number) + { + WARN("Requesting duration for stream %u, returning ASF_E_NOTFOUND.\n", *stream_number); + return ASF_E_NOTFOUND; + } + + *size = sizeof(BOOL); + if (!value) + { + *type = WMT_TYPE_BOOL; + return S_OK; + } + if (req_size < *size) + return ASF_E_BUFFERTOOSMALL; + + *type = WMT_TYPE_BOOL; + *(BOOL *)value = TRUE; + return S_OK; + } else { FIXME("Unknown attribute %s.\n", debugstr_w(name)); diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index 6d510553fef..92208c0b8a3 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -468,6 +468,17 @@ static void test_reader_attributes(IWMProfile *profile) ok(ret_stream_number == stream_number, "Expected stream number %u, got %u.\n", stream_number, ret_stream_number); + size = sizeof(DWORD); + type = 0xdeadbeef; + dword = 0xdeadbeef; + hr = IWMHeaderInfo_GetAttributeByName(header_info, &ret_stream_number, + L"Seekable", &type, (BYTE *)&dword, &size); + ok(hr == ASF_E_NOTFOUND, "Got hr %#x.\n", hr); + ok(type == 0xdeadbeef, "Got type %#x.\n", type); + ok(size == sizeof(DWORD), "Got size %u.\n", size); + ok(ret_stream_number == stream_number, "Expected stream number %u, got %u.\n", + stream_number, ret_stream_number); + IWMStreamConfig_Release(config); } @@ -546,6 +557,17 @@ static void test_reader_attributes(IWMProfile *profile) ok(size == sizeof(QWORD), "Got size %u.\n", size); ok(stream_number == 0, "Got stream number %u.\n", stream_number); + size = sizeof(DWORD); + type = 0xdeadbeef; + dword = 0xdeadbeef; + hr = IWMHeaderInfo_GetAttributeByName(header_info, &stream_number, + L"Seekable", &type, (BYTE *)&dword, &size); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(type == WMT_TYPE_BOOL, "Got type %#x.\n", type); + ok(size == sizeof(DWORD), "Got size %u.\n", size); + ok(dword == TRUE, "Got duration %I64u.\n", duration); + ok(stream_number == 0, "Got stream number %u.\n", stream_number); + IWMHeaderInfo_Release(header_info); }

1 0

Zebediah Figura : winegstreamer: Implement IWMSyncReader::Open().
by Alexandre Julliard Nov. 2, 2021

Nov. 2, 2021

Module: wine Branch: master Commit: 56dde41b6d91c589d861dca5d50ffa9f607da1db URL: https://source.winehq.org/git/wine.git/?a=commit;h=56dde41b6d91c589d861dca5… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Nov 2 00:13:04 2021 -0500 winegstreamer: Implement IWMSyncReader::Open(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_private.h | 2 + dlls/winegstreamer/wm_reader.c | 132 +++++++++++++++++++++++++++++-------- dlls/winegstreamer/wm_syncreader.c | 8 ++- dlls/wmvcore/tests/wmvcore.c | 40 +++++++++++ 4 files changed, 151 insertions(+), 31 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=56dde41b6d91c589d861…

1 0

Ziqing Hui : server: Also queue hotkey message for WM_SYSKEYDOWN.
by Alexandre Julliard Nov. 2, 2021

Nov. 2, 2021

Module: wine Branch: master Commit: 77f1658393b46fd29b998876129b2c4851ac6619 URL: https://source.winehq.org/git/wine.git/?a=commit;h=77f1658393b46fd29b998876… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Nov 2 10:54:22 2021 +0800 server: Also queue hotkey message for WM_SYSKEYDOWN. ALT and F10 key generate WM_SYSKEYDOWN message. They should also have the ability to queue hotkey message. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 2 +- server/queue.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 73737eab98b..c054a145112 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -17699,7 +17699,7 @@ static void test_hotkey(void) } DispatchMessageA(&msg); } - ok_sequence(WmHotkeyPressWithALT, "window hotkey press with ALT", TRUE); + ok_sequence(WmHotkeyPressWithALT, "window hotkey press with ALT", FALSE); keybd_event(hotkey_letter, 0, KEYEVENTF_KEYUP, 0); while (PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE)) diff --git a/server/queue.c b/server/queue.c index 63a3a1fe2db..f7bc28f39e9 100644 --- a/server/queue.c +++ b/server/queue.c @@ -1422,7 +1422,7 @@ static int queue_hotkey_message( struct desktop *desktop, struct message *msg ) struct hotkey *hotkey; unsigned int modifiers = 0; - if (msg->msg != WM_KEYDOWN) return 0; + if (msg->msg != WM_KEYDOWN && msg->msg != WM_SYSKEYDOWN) return 0; if (desktop->keystate[VK_MENU] & 0x80) modifiers |= MOD_ALT; if (desktop->keystate[VK_CONTROL] & 0x80) modifiers |= MOD_CONTROL;

1 0