July 2019 - Wine-commits - list.winehq.org

Zebediah Figura : qedit/tests: Add some tests for media types.
by Alexandre Julliard 01 Jul '19

01 Jul '19

Module: wine Branch: master Commit: b1ffe12e43908ea1a78cce09b25ab6b986216b6a URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1ffe12e43908ea1a78cce09… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Jun 29 13:43:47 2019 -0500 qedit/tests: Add some tests for media types. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/tests/nullrenderer.c | 28 ++++++++++++++++++++++++++++ dlls/qedit/tests/samplegrabber.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+) diff --git a/dlls/qedit/tests/nullrenderer.c b/dlls/qedit/tests/nullrenderer.c index d39b28d..3d5221b 100644 --- a/dlls/qedit/tests/nullrenderer.c +++ b/dlls/qedit/tests/nullrenderer.c @@ -352,6 +352,33 @@ static void test_aggregation(void) ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); } +static void test_media_types(void) +{ + IBaseFilter *filter = create_null_renderer(); + AM_MEDIA_TYPE mt = {}, *pmt; + IEnumMediaTypes *enummt; + HRESULT hr; + ULONG ref; + IPin *pin; + + IBaseFilter_FindPin(filter, sink_id, &pin); + + hr = IPin_EnumMediaTypes(pin, &enummt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enummt, 1, &pmt, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + IEnumMediaTypes_Release(enummt); + + hr = IPin_QueryAccept(pin, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + IPin_Release(pin); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(nullrenderer) { IBaseFilter *filter; @@ -373,6 +400,7 @@ START_TEST(nullrenderer) test_find_pin(); test_pin_info(); test_aggregation(); + test_media_types(); CoUninitialize(); } diff --git a/dlls/qedit/tests/samplegrabber.c b/dlls/qedit/tests/samplegrabber.c index 8bc44b9..9bb4eb4 100644 --- a/dlls/qedit/tests/samplegrabber.c +++ b/dlls/qedit/tests/samplegrabber.c @@ -449,6 +449,39 @@ static void test_aggregation(void) ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); } +static void test_media_types(void) +{ + IBaseFilter *filter = create_sample_grabber(); + IEnumMediaTypes *enummt; + AM_MEDIA_TYPE mt = {}; + HRESULT hr; + ULONG ref; + IPin *pin; + + IBaseFilter_FindPin(filter, sink_id, &pin); + + hr = IPin_EnumMediaTypes(pin, &enummt); + todo_wine ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); + + hr = IPin_QueryAccept(pin, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + IPin_Release(pin); + + IBaseFilter_FindPin(filter, source_id, &pin); + + hr = IPin_EnumMediaTypes(pin, &enummt); + todo_wine ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); + + hr = IPin_QueryAccept(pin, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + IPin_Release(pin); + + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(samplegrabber) { IBaseFilter *filter; @@ -470,6 +503,7 @@ START_TEST(samplegrabber) test_find_pin(); test_pin_info(); test_aggregation(); + test_media_types(); CoUninitialize(); }

1 0

Zebediah Figura : qedit/tests: Add some tests for IEnumMediaTypes().
by Alexandre Julliard 01 Jul '19

01 Jul '19

Module: wine Branch: master Commit: 038407475bed7a29650c5e1b5bdab38e4e57800e URL: https://source.winehq.org/git/wine.git/?a=commit;h=038407475bed7a29650c5e1b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Jun 29 13:43:48 2019 -0500 qedit/tests: Add some tests for IEnumMediaTypes(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/tests/nullrenderer.c | 45 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/dlls/qedit/tests/nullrenderer.c b/dlls/qedit/tests/nullrenderer.c index 3d5221b..7841720 100644 --- a/dlls/qedit/tests/nullrenderer.c +++ b/dlls/qedit/tests/nullrenderer.c @@ -379,6 +379,50 @@ static void test_media_types(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_enum_media_types(void) +{ + IBaseFilter *filter = create_null_renderer(); + IEnumMediaTypes *enum1, *enum2; + AM_MEDIA_TYPE *mts[2]; + ULONG ref, count; + HRESULT hr; + IPin *pin; + + IBaseFilter_FindPin(filter, sink_id, &pin); + + hr = IPin_EnumMediaTypes(pin, &enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enum1, 1, mts, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enum1, 1, mts, &count); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(!count, "Got count %u.\n", count); + + hr = IEnumMediaTypes_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enum1, 1, mts, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Clone(enum1, &enum2); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Skip(enum1, 1); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enum2, 1, mts, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + IEnumMediaTypes_Release(enum1); + IEnumMediaTypes_Release(enum2); + IPin_Release(pin); + + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(nullrenderer) { IBaseFilter *filter; @@ -401,6 +445,7 @@ START_TEST(nullrenderer) test_pin_info(); test_aggregation(); test_media_types(); + test_enum_media_types(); CoUninitialize(); }

1 0

Zebediah Figura : strmbase: Simplify IEnumMediaTypesImpl_Next().
by Alexandre Julliard 01 Jul '19

01 Jul '19

Module: wine Branch: master Commit: cf09b5a80031d8fe67c5e8b1b7561de3e7273db2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf09b5a80031d8fe67c5e8b1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Jun 29 13:43:49 2019 -0500 strmbase: Simplify IEnumMediaTypesImpl_Next(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/mediatype.c | 43 +++++++++++++++++-------------------------- 1 file changed, 17 insertions(+), 26 deletions(-) diff --git a/dlls/strmbase/mediatype.c b/dlls/strmbase/mediatype.c index 8ad2e22..66b5fa1 100644 --- a/dlls/strmbase/mediatype.c +++ b/dlls/strmbase/mediatype.c @@ -172,44 +172,35 @@ static ULONG WINAPI IEnumMediaTypesImpl_Release(IEnumMediaTypes * iface) return ref; } -static HRESULT WINAPI IEnumMediaTypesImpl_Next(IEnumMediaTypes * iface, ULONG cMediaTypes, AM_MEDIA_TYPE ** ppMediaTypes, ULONG * pcFetched) +static HRESULT WINAPI IEnumMediaTypesImpl_Next(IEnumMediaTypes *iface, + ULONG count, AM_MEDIA_TYPE **mts, ULONG *ret_count) { - ULONG cFetched; - IEnumMediaTypesImpl *This = impl_from_IEnumMediaTypes(iface); - - TRACE("(%p)->(%u, %p, %p)\n", iface, cMediaTypes, ppMediaTypes, pcFetched); + IEnumMediaTypesImpl *enummt = impl_from_IEnumMediaTypes(iface); + ULONG i; - cFetched = min(This->count, This->uIndex + cMediaTypes) - This->uIndex; + TRACE("iface %p, count %u, mts %p, ret_count %p.\n", iface, count, mts, ret_count); - if (This->currentVersion != This->mediaVersionFunction(This->basePin)) + if (enummt->currentVersion != enummt->mediaVersionFunction(enummt->basePin)) return VFW_E_ENUM_OUT_OF_SYNC; - TRACE("Next uIndex: %u, cFetched: %u\n", This->uIndex, cFetched); - - if (cFetched > 0) + for (i = 0; i < count && enummt->uIndex + i < enummt->count; i++) { - ULONG i; - for (i = 0; i < cFetched; i++) + if (!(mts[i] = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE))) + || FAILED(enummt->enumMediaFunction(enummt->basePin, enummt->uIndex + i, mts[i]))) { - if (!(ppMediaTypes[i] = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE))) - || FAILED(This->enumMediaFunction(This->basePin, This->uIndex + i, ppMediaTypes[i]))) - { - while (i--) - DeleteMediaType(ppMediaTypes[i]); - *pcFetched = 0; - return E_OUTOFMEMORY; - } + while (i--) + DeleteMediaType(mts[i]); + *ret_count = 0; + return E_OUTOFMEMORY; } } - if ((cMediaTypes != 1) || pcFetched) - *pcFetched = cFetched; + if ((count != 1) || ret_count) + *ret_count = i; - This->uIndex += cFetched; + enummt->uIndex += i; - if (cFetched != cMediaTypes) - return S_FALSE; - return S_OK; + return i == count ? S_OK : S_FALSE; } static HRESULT WINAPI IEnumMediaTypesImpl_Skip(IEnumMediaTypes * iface, ULONG cMediaTypes)

1 0

Zebediah Figura : strmbase: Fix implementation of IEnumMediaTypes::Skip().
by Alexandre Julliard 01 Jul '19

01 Jul '19

Module: wine Branch: master Commit: af35e10c14b69702f91600fa53f438c4dc28dc9a URL: https://source.winehq.org/git/wine.git/?a=commit;h=af35e10c14b69702f91600fa… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Jun 29 13:43:50 2019 -0500 strmbase: Fix implementation of IEnumMediaTypes::Skip(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47291 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/tests/avico.c | 4 ++-- dlls/qcap/tests/avimux.c | 6 +++--- dlls/qcap/tests/smartteefilter.c | 2 +- dlls/qedit/tests/nullrenderer.c | 2 +- dlls/quartz/tests/avidec.c | 6 +++--- dlls/quartz/tests/avisplit.c | 6 +++--- dlls/quartz/tests/dsoundrender.c | 2 +- dlls/quartz/tests/filesource.c | 8 ++++---- dlls/quartz/tests/mpegsplit.c | 4 ++-- dlls/quartz/tests/videorenderer.c | 2 +- dlls/quartz/tests/vmr7.c | 2 +- dlls/quartz/tests/vmr9.c | 2 +- dlls/quartz/tests/waveparser.c | 6 +++--- dlls/strmbase/mediatype.c | 17 +++++++---------- 14 files changed, 33 insertions(+), 36 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=af35e10c14b69702f916…

1 0

Zebediah Figura : msi: Close all handles opened by a custom action thread.
by Alexandre Julliard 01 Jul '19

01 Jul '19

Module: wine Branch: master Commit: e4e7e956bd93f0ffd597a041a58c82c02c811ac0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4e7e956bd93f0ffd597a041… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jun 30 17:14:18 2019 -0500 msi: Close all handles opened by a custom action thread. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47418 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/custom.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 03f9b08..b864270 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -580,7 +580,8 @@ UINT CDECL __wine_msi_call_dll_function(DWORD client_pid, const GUID *guid) midl_user_free(dll); midl_user_free(proc); - MsiCloseHandle(hPackage); + + MsiCloseAllHandles(); return r; }

1 0

Dmitry Timoshkov : ntdll: Add '-norelay' flag for _vsnprintf().
by Alexandre Julliard 01 Jul '19

01 Jul '19

Module: wine Branch: master Commit: 84a46a27e71be999b63a8fb2e44a4aaea8cf4c58 URL: https://source.winehq.org/git/wine.git/?a=commit;h=84a46a27e71be999b63a8fb2… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jul 1 17:21:25 2019 +0800 ntdll: Add '-norelay' flag for _vsnprintf(). Otherwise for instance +relay,+ver log has ver: traces completely messed up. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 0ec7b56..94bc52c 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1419,7 +1419,7 @@ @ cdecl _ui64tow(int64 ptr long) @ cdecl _ultoa(long ptr long) @ cdecl _ultow(long ptr long) -@ cdecl _vsnprintf(ptr long str ptr) NTDLL__vsnprintf +@ cdecl -norelay _vsnprintf(ptr long str ptr) NTDLL__vsnprintf @ cdecl _vsnwprintf(ptr long wstr ptr) NTDLL__vsnwprintf @ cdecl _wcsicmp(wstr wstr) NTDLL__wcsicmp @ cdecl _wcslwr(wstr) NTDLL__wcslwr

1 0

Nikolay Sivov : user32/tests: Use SendInput() directly.
by Alexandre Julliard 01 Jul '19

01 Jul '19

Module: wine Branch: master Commit: 4b13f859f741d11999a51208b4d1de94788ce418 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b13f859f741d11999a51208… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 1 14:09:28 2019 +0300 user32/tests: Use SendInput() directly. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/input.c | 29 +++++++++++------------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 4a9be55..78d1e54 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -76,7 +76,6 @@ static struct { BOOL sendinput_broken; } key_status; -static UINT (WINAPI *pSendInput) (UINT, INPUT*, size_t); static BOOL (WINAPI *pGetCurrentInputMessageSource)( INPUT_MESSAGE_SOURCE *source ); static BOOL (WINAPI *pGetPointerType)(UINT32, POINTER_INPUT_TYPE*); static int (WINAPI *pGetMouseMovePointsEx) (UINT, LPMOUSEMOVEPOINT, LPMOUSEMOVEPOINT, int, DWORD); @@ -163,7 +162,6 @@ static void init_function_pointers(void) if (!(p ## func = (void*)GetProcAddress(hdll, #func))) \ trace("GetProcAddress(%s) failed\n", #func) - GET_PROC(SendInput); GET_PROC(GetCurrentInputMessageSource); GET_PROC(GetMouseMovePointsEx); GET_PROC(GetPointerType); @@ -249,7 +247,7 @@ static BOOL do_test( HWND hwnd, int seqnr, const KEV td[] ) for( kmctr = 0; kmctr < MAXKEYEVENTS && expmsg[kmctr].message; kmctr++) ; ok( evtctr <= MAXKEYEVENTS, "evtctr is above MAXKEYEVENTS\n" ); - if( evtctr != pSendInput(evtctr, &inputs[0], sizeof(INPUT))) + if( evtctr != SendInput(evtctr, &inputs[0], sizeof(INPUT))) ok (FALSE, "SendInput failed to send some events\n"); i = 0; if (winetest_debug > 1) @@ -954,7 +952,7 @@ static void test_Input_blackbox(void) i.u.ki.wScan = ii+1 /* useful for debugging */; i.u.ki.dwFlags = sendinput_test[ii].dwFlags; i.u.ki.wVk = sendinput_test[ii].wVk; - pSendInput(1, (INPUT*)&i, sizeof(TEST_INPUT)); + SendInput(1, (INPUT*)&i, sizeof(TEST_INPUT)); empty_message_queue(); GetKeyboardState(ks2); compare_and_check(ii, ks1, ks2, &sendinput_test[ii], foreground); @@ -997,7 +995,7 @@ static void test_unicode_keys(HWND hwnd, HHOOK hook) inputs[0].u.ki.dwFlags = KEYEVENTF_UNICODE; reset_key_status(); - pSendInput(1, (INPUT*)inputs, sizeof(INPUT)); + SendInput(1, (INPUT*)inputs, sizeof(INPUT)); while(PeekMessageW(&msg, hwnd, 0, 0, PM_REMOVE)){ if(msg.message == WM_KEYDOWN && msg.wParam == VK_PACKET){ TranslateMessage(&msg); @@ -1019,7 +1017,7 @@ static void test_unicode_keys(HWND hwnd, HHOOK hook) inputs[1].u.ki.dwFlags = KEYEVENTF_UNICODE | KEYEVENTF_KEYUP; reset_key_status(); - pSendInput(1, (INPUT*)(inputs+1), sizeof(INPUT)); + SendInput(1, (INPUT*)(inputs+1), sizeof(INPUT)); while(PeekMessageW(&msg, hwnd, 0, 0, PM_REMOVE)){ if(msg.message == WM_KEYDOWN && msg.wParam == VK_PACKET){ TranslateMessage(&msg); @@ -1045,7 +1043,7 @@ static void test_unicode_keys(HWND hwnd, HHOOK hook) reset_key_status(); key_status.expect_alt = TRUE; - pSendInput(2, (INPUT*)inputs, sizeof(INPUT)); + SendInput(2, (INPUT*)inputs, sizeof(INPUT)); while(PeekMessageW(&msg, hwnd, 0, 0, PM_REMOVE)){ if(msg.message == WM_SYSKEYDOWN && msg.wParam == VK_PACKET){ TranslateMessage(&msg); @@ -1072,7 +1070,7 @@ static void test_unicode_keys(HWND hwnd, HHOOK hook) reset_key_status(); key_status.expect_alt = TRUE; - pSendInput(2, (INPUT*)inputs, sizeof(INPUT)); + SendInput(2, (INPUT*)inputs, sizeof(INPUT)); while(PeekMessageW(&msg, hwnd, 0, 0, PM_REMOVE)){ if(msg.message == WM_SYSKEYDOWN && msg.wParam == VK_PACKET){ TranslateMessage(&msg); @@ -2758,7 +2756,7 @@ static void test_input_message_source(void) SendMessageA( hwnd, WM_KEYDOWN, 0, 0 ); SendMessageA( hwnd, WM_MOUSEMOVE, 0, 0 ); - pSendInput( 2, (INPUT *)inputs, sizeof(INPUT) ); + SendInput( 2, (INPUT *)inputs, sizeof(INPUT) ); while (PeekMessageW( &msg, hwnd, 0, 0, PM_REMOVE )) { expect_src.deviceType = IMDT_KEYBOARD; @@ -2834,15 +2832,10 @@ START_TEST(input) init_function_pointers(); GetCursorPos( &pos ); - if (pSendInput) - { - test_Input_blackbox(); - test_Input_whitebox(); - test_Input_unicode(); - test_Input_mouse(); - } - else win_skip("SendInput is not available\n"); - + test_Input_blackbox(); + test_Input_whitebox(); + test_Input_unicode(); + test_Input_mouse(); test_keynames(); test_mouse_ll_hook(); test_key_map();

1 0

Nikolay Sivov : user32/tests: Add another test for KEYEVENTF_UNICODE mode.
by Alexandre Julliard 01 Jul '19

01 Jul '19

Module: wine Branch: master Commit: 0b2fbab179d5c38014789442cd2c0e3a3795ad50 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b2fbab179d5c38014789442… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 1 14:09:29 2019 +0300 user32/tests: Add another test for KEYEVENTF_UNICODE mode. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/input.c | 72 +++++++++++++++++++++++++++++++++-------------- 1 file changed, 51 insertions(+), 21 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 78d1e54..f7e351b 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -72,6 +72,7 @@ static struct { LONG last_hook_up; LONG last_hook_syskey_down; LONG last_hook_syskey_up; + WORD vk; BOOL expect_alt; BOOL sendinput_broken; } key_status; @@ -115,15 +116,6 @@ typedef struct } u; } TEST_INPUT; -#define ADDTOINPUTS(kev) \ -inputs[evtctr].type = INPUT_KEYBOARD; \ - ((TEST_INPUT*)inputs)[evtctr].u.ki.wVk = GETVKEY[ kev]; \ - ((TEST_INPUT*)inputs)[evtctr].u.ki.wScan = GETSCAN[ kev]; \ - ((TEST_INPUT*)inputs)[evtctr].u.ki.dwFlags = GETFLAGS[ kev]; \ - ((TEST_INPUT*)inputs)[evtctr].u.ki.dwExtraInfo = 0; \ - ((TEST_INPUT*)inputs)[evtctr].u.ki.time = ++timetag; \ - if( kev) evtctr++; - typedef struct { UINT message; WPARAM wParam; @@ -227,17 +219,25 @@ static int KbdMessage( KEV kev, WPARAM *pwParam, LPARAM *plParam ) */ static BOOL do_test( HWND hwnd, int seqnr, const KEV td[] ) { - INPUT inputs[MAXKEYEVENTS]; + TEST_INPUT inputs[MAXKEYEVENTS]; KMSG expmsg[MAXKEYEVENTS]; MSG msg; char buf[100]; - UINT evtctr=0; + UINT evtctr=0, ret; int kmctr, i; buf[0]='\0'; TrackSysKey=0; /* see input.c */ - for( i = 0; i < MAXKEYEVENTS; i++) { - ADDTOINPUTS(td[i]) + for (i = 0; i < MAXKEYEVENTS; i++) + { + inputs[evtctr].type = INPUT_KEYBOARD; + inputs[evtctr].u.ki.wVk = GETVKEY[td[i]]; + inputs[evtctr].u.ki.wScan = GETSCAN[td[i]]; + inputs[evtctr].u.ki.dwFlags = GETFLAGS[td[i]]; + inputs[evtctr].u.ki.dwExtraInfo = 0; + inputs[evtctr].u.ki.time = ++timetag; + if (td[i]) evtctr++; + strcat(buf, getdesc[td[i]]); if(td[i]) expmsg[i].message = KbdMessage(td[i], &(expmsg[i].wParam), &(expmsg[i].lParam)); @@ -247,8 +247,8 @@ static BOOL do_test( HWND hwnd, int seqnr, const KEV td[] ) for( kmctr = 0; kmctr < MAXKEYEVENTS && expmsg[kmctr].message; kmctr++) ; ok( evtctr <= MAXKEYEVENTS, "evtctr is above MAXKEYEVENTS\n" ); - if( evtctr != SendInput(evtctr, &inputs[0], sizeof(INPUT))) - ok (FALSE, "SendInput failed to send some events\n"); + ret = SendInput(evtctr, (INPUT *)inputs, sizeof(INPUT)); + ok(ret == evtctr, "SendInput failed to send some events\n"); i = 0; if (winetest_debug > 1) trace("======== key stroke sequence #%d: %s =============\n", @@ -963,7 +963,7 @@ static void test_Input_blackbox(void) UnhookWindowsHookEx(hook); } -static void reset_key_status(void) +static void reset_key_status(WORD vk) { key_status.last_key_down = -1; key_status.last_key_up = -1; @@ -975,6 +975,7 @@ static void reset_key_status(void) key_status.last_hook_up = -1; key_status.last_hook_syskey_down = -1; key_status.last_hook_syskey_up = -1; + key_status.vk = vk; key_status.expect_alt = FALSE; key_status.sendinput_broken = FALSE; } @@ -994,7 +995,7 @@ static void test_unicode_keys(HWND hwnd, HHOOK hook) inputs[0].u.ki.wScan = 0x3c0; inputs[0].u.ki.dwFlags = KEYEVENTF_UNICODE; - reset_key_status(); + reset_key_status(VK_PACKET); SendInput(1, (INPUT*)inputs, sizeof(INPUT)); while(PeekMessageW(&msg, hwnd, 0, 0, PM_REMOVE)){ if(msg.message == WM_KEYDOWN && msg.wParam == VK_PACKET){ @@ -1016,7 +1017,7 @@ static void test_unicode_keys(HWND hwnd, HHOOK hook) inputs[1].u.ki.wScan = 0x3c0; inputs[1].u.ki.dwFlags = KEYEVENTF_UNICODE | KEYEVENTF_KEYUP; - reset_key_status(); + reset_key_status(VK_PACKET); SendInput(1, (INPUT*)(inputs+1), sizeof(INPUT)); while(PeekMessageW(&msg, hwnd, 0, 0, PM_REMOVE)){ if(msg.message == WM_KEYDOWN && msg.wParam == VK_PACKET){ @@ -1041,7 +1042,7 @@ static void test_unicode_keys(HWND hwnd, HHOOK hook) inputs[1].u.ki.wScan = 0x3041; inputs[1].u.ki.dwFlags = KEYEVENTF_UNICODE; - reset_key_status(); + reset_key_status(VK_PACKET); key_status.expect_alt = TRUE; SendInput(2, (INPUT*)inputs, sizeof(INPUT)); while(PeekMessageW(&msg, hwnd, 0, 0, PM_REMOVE)){ @@ -1068,7 +1069,7 @@ static void test_unicode_keys(HWND hwnd, HHOOK hook) inputs[0].u.ki.wScan = 0; inputs[0].u.ki.dwFlags = KEYEVENTF_KEYUP; - reset_key_status(); + reset_key_status(VK_PACKET); key_status.expect_alt = TRUE; SendInput(2, (INPUT*)inputs, sizeof(INPUT)); while(PeekMessageW(&msg, hwnd, 0, 0, PM_REMOVE)){ @@ -1084,6 +1085,34 @@ static void test_unicode_keys(HWND hwnd, HHOOK hook) ok(key_status.last_hook_up == 0x3041, "Last hook up msg should have been 0x3041, was: 0x%x\n", key_status.last_hook_up); } + + /* Press and release, non-zero key code. */ + inputs[0].u.ki.wVk = 0x51; + inputs[0].u.ki.wScan = 0x123; + inputs[0].u.ki.dwFlags = KEYEVENTF_UNICODE; + + inputs[1].u.ki.wVk = 0x51; + inputs[1].u.ki.wScan = 0x123; + inputs[1].u.ki.dwFlags = KEYEVENTF_UNICODE | KEYEVENTF_KEYUP; + + reset_key_status(inputs[0].u.ki.wVk); + SendInput(2, (INPUT*)inputs, sizeof(INPUT)); + while (PeekMessageW(&msg, hwnd, 0, 0, PM_REMOVE)) + { + TranslateMessage(&msg); + DispatchMessageW(&msg); + } + + if (!key_status.sendinput_broken) + { + todo_wine { + ok(key_status.last_key_down == 0x51, "Unexpected key down %#x.\n", key_status.last_key_down); + ok(key_status.last_key_up == 0x51, "Unexpected key up %#x.\n", key_status.last_key_up); + } + if (hook) + todo_wine + ok(key_status.last_hook_up == 0x23, "Unexpected hook message %#x.\n", key_status.last_hook_up); + } } static LRESULT CALLBACK unicode_wnd_proc( HWND hWnd, UINT msg, WPARAM wParam, @@ -1124,7 +1153,8 @@ static LRESULT CALLBACK llkbd_unicode_hook(int nCode, WPARAM wParam, LPARAM lPar ok(info->vkCode == VK_LMENU, "vkCode should have been VK_LMENU[0x%04x], was: 0x%x\n", VK_LMENU, info->vkCode); key_status.expect_alt = FALSE; }else - ok(info->vkCode == VK_PACKET, "vkCode should have been VK_PACKET[0x%04x], was: 0x%x\n", VK_PACKET, info->vkCode); + todo_wine_if(key_status.vk != VK_PACKET) + ok(info->vkCode == key_status.vk, "Unexpected vkCode %#x, expected %#x.\n", info->vkCode, key_status.vk); } switch(wParam){ case WM_KEYDOWN:

1 0

Nikolay Sivov : server: Use KEYEVENTF_UNICODE mode only when virtual key code was not specified.
by Alexandre Julliard 01 Jul '19

01 Jul '19

Module: wine Branch: master Commit: a476ae1991112a4caece2ca09218288896e11cf2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a476ae1991112a4caece2ca0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 1 14:09:30 2019 +0300 server: Use KEYEVENTF_UNICODE mode only when virtual key code was not specified. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/input.c | 2 -- server/queue.c | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index f7e351b..168b055 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1105,10 +1105,8 @@ static void test_unicode_keys(HWND hwnd, HHOOK hook) if (!key_status.sendinput_broken) { - todo_wine { ok(key_status.last_key_down == 0x51, "Unexpected key down %#x.\n", key_status.last_key_down); ok(key_status.last_key_up == 0x51, "Unexpected key up %#x.\n", key_status.last_key_up); - } if (hook) todo_wine ok(key_status.last_hook_up == 0x23, "Unexpected hook message %#x.\n", key_status.last_hook_up); diff --git a/server/queue.c b/server/queue.c index 2423991..96587d1 100644 --- a/server/queue.c +++ b/server/queue.c @@ -1803,7 +1803,7 @@ static int queue_keyboard_message( struct desktop *desktop, user_handle_t win, c msg->lparam = (input->kbd.scan << 16) | 1u; /* repeat count */ if (origin == IMO_INJECTED) msg_data->flags = LLKHF_INJECTED; - if (input->kbd.flags & KEYEVENTF_UNICODE) + if (input->kbd.flags & KEYEVENTF_UNICODE && !vkey) { msg->wparam = VK_PACKET; }

1 0

Nikolay Sivov : mfplat: Trace MF_PD_DURATION guid.
by Alexandre Julliard 01 Jul '19

01 Jul '19

Module: wine Branch: master Commit: a07d6070d54f9459fbbee49d7ee7900ccac87e1c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a07d6070d54f9459fbbee49d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 1 15:08:47 2019 +0300 mfplat: Trace MF_PD_DURATION guid. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 1 + include/mfidl.idl | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 45d1677..eec54ae 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -641,6 +641,7 @@ const char *debugstr_attr(const GUID *guid) X(MF_MT_AUDIO_BLOCK_ALIGNMENT), X(MF_PD_PMPHOST_CONTEXT), X(MF_PD_APP_CONTEXT), + X(MF_PD_DURATION), X(MF_PD_TOTAL_FILE_SIZE), X(MF_PD_AUDIO_ENCODING_BITRATE), X(MF_PD_VIDEO_ENCODING_BITRATE), diff --git a/include/mfidl.idl b/include/mfidl.idl index 66a8477..1ed63be 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -761,9 +761,9 @@ cpp_quote("EXTERN_GUID(MF_SD_MUTUALLY_EXCLUSIVE, 0x023ef79c, 0x388d, 0x487f cpp_quote("EXTERN_GUID(MF_SD_PROTECTED, 0x00af2181, 0xbdc2, 0x423c, 0xab, 0xca, 0xf5, 0x03, 0x59, 0x3b, 0xc1, 0x21);") cpp_quote("EXTERN_GUID(MF_SD_STREAM_NAME, 0x4f1b099d, 0xd314, 0x41e5, 0xa7, 0x81, 0x7f, 0xef, 0xaa, 0x4c, 0x50, 0x1f);") cpp_quote("EXTERN_GUID(MF_SD_SAMI_LANGUAGE, 0x36fcb98a, 0x6cd0, 0x44cb, 0xac, 0xb9, 0xa8, 0xf5, 0x60, 0x0d, 0xd0, 0xbb);") - cpp_quote("EXTERN_GUID(MF_PD_PMPHOST_CONTEXT, 0x6c990d31, 0xbb8e, 0x477a, 0x85, 0x98, 0x0d, 0x5d, 0x96, 0xfc, 0xd8, 0x8a);") cpp_quote("EXTERN_GUID(MF_PD_APP_CONTEXT, 0x6c990d32, 0xbb8e, 0x477a, 0x85, 0x98, 0x0d, 0x5d, 0x96, 0xfc, 0xd8, 0x8a);") +cpp_quote("EXTERN_GUID(MF_PD_DURATION, 0x6c990d33, 0xbb8e, 0x477a, 0x85, 0x98, 0x0d, 0x5d, 0x96, 0xfc, 0xd8, 0x8a);") cpp_quote("EXTERN_GUID(MF_PD_TOTAL_FILE_SIZE, 0x6c990d34, 0xbb8e, 0x477a, 0x85, 0x98, 0x0d, 0x5d, 0x96, 0xfc, 0xd8, 0x8a);") cpp_quote("EXTERN_GUID(MF_PD_AUDIO_ENCODING_BITRATE, 0x6c990d35, 0xbb8e, 0x477a, 0x85, 0x98, 0x0d, 0x5d, 0x96, 0xfc, 0xd8, 0x8a);") cpp_quote("EXTERN_GUID(MF_PD_VIDEO_ENCODING_BITRATE, 0x6c990d36, 0xbb8e, 0x477a, 0x85, 0x98, 0x0d, 0x5d, 0x96, 0xfc, 0xd8, 0x8a);")

1 0