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

Alexandre Julliard : kernelbase: Get rid of some string helper functions.
by Alexandre Julliard July 1, 2019

July 1, 2019

Module: wine Branch: master Commit: 31083dbaecfc4918f1e02e746b162f6a0efaf003 URL: https://source.winehq.org/git/wine.git/?a=commit;h=31083dbaecfc4918f1e02e74… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 27 10:42:07 2019 +0200 kernelbase: Get rid of some string helper functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/string.c | 124 ++++++++++++++++++++++++----------------------- 1 file changed, 63 insertions(+), 61 deletions(-) diff --git a/dlls/kernelbase/string.c b/dlls/kernelbase/string.c index 2edaa47..52f968b 100644 --- a/dlls/kernelbase/string.c +++ b/dlls/kernelbase/string.c @@ -308,45 +308,31 @@ BOOL WINAPI ChrCmpIA(WORD ch1, WORD ch2) return char_compare(ch1, ch2, NORM_IGNORECASE); } -static BOOL WINAPI ChrCmpA(WORD ch1, WORD ch2) -{ - return char_compare(ch1, ch2, 0); -} - BOOL WINAPI ChrCmpIW(WCHAR ch1, WCHAR ch2) { return CompareStringW(GetThreadLocale(), NORM_IGNORECASE, &ch1, 1, &ch2, 1) - CSTR_EQUAL; } -static char * strstr_helper(const char *str, const char *search, - INT (WINAPI *cmp_func)(const char *, const char *, int)) +char * WINAPI StrStrA(const char *str, const char *search) { const char *end; size_t len; - if (!str || !search || !*search) - return NULL; + TRACE("%s, %s\n", wine_dbgstr_a(str), wine_dbgstr_a(search)); + + if (!str || !search || !*search) return NULL; len = strlen(search); end = str + strlen(str); while (str + len <= end) { - if (!cmp_func(str, search, len)) - return (char *)str; + if (!StrCmpNA(str, search, len)) return (char *)str; str = CharNextA(str); } - return NULL; } -char * WINAPI StrStrA(const char *str, const char *search) -{ - TRACE("%s, %s\n", wine_dbgstr_a(str), wine_dbgstr_a(search)); - - return strstr_helper(str, search, StrCmpNA); -} - WCHAR * WINAPI StrStrW(const WCHAR *str, const WCHAR *search) { TRACE("%s, %s\n", wine_dbgstr_w(str), wine_dbgstr_w(search)); @@ -465,9 +451,22 @@ WCHAR * WINAPI StrCpyNW(WCHAR *dst, const WCHAR *src, int count) char * WINAPI StrStrIA(const char *str, const char *search) { + const char *end; + size_t len; + TRACE("%s, %s\n", wine_dbgstr_a(str), debugstr_a(search)); - return strstr_helper(str, search, StrCmpNIA); + if (!str || !search || !*search) return NULL; + + len = strlen(search); + end = str + strlen(str); + + while (str + len <= end) + { + if (!StrCmpNIA(str, search, len)) return (char *)str; + str = CharNextA(str); + } + return NULL; } WCHAR * WINAPI StrStrIW(const WCHAR *str, const WCHAR *search) @@ -493,35 +492,22 @@ WCHAR * WINAPI StrStrIW(const WCHAR *str, const WCHAR *search) return NULL; } -static int strspn_helper(const char *str, const char *match, char * (WINAPI *func)(const char *, WORD), BOOL invert) +int WINAPI StrSpnA(const char *str, const char *match) { const char *ptr = str; - if (!str || !*str || !match) - return 0; + TRACE("%s, %s\n", wine_dbgstr_a(str), wine_dbgstr_a(match)); + + if (!str || !match) return 0; while (*ptr) { - const char *test = func(match, *ptr); - - if (!invert && !test) - break; - if (invert && test) - break; - + if (!StrChrA(match, *ptr)) break; ptr = CharNextA(ptr); - }; - + } return ptr - str; } -int WINAPI StrSpnA(const char *str, const char *match) -{ - TRACE("%s, %s\n", wine_dbgstr_a(str), wine_dbgstr_a(match)); - - return strspn_helper(str, match, StrChrA, FALSE); -} - int WINAPI StrSpnW(const WCHAR *str, const WCHAR *match) { if (!str || !match) return 0; @@ -530,9 +516,18 @@ int WINAPI StrSpnW(const WCHAR *str, const WCHAR *match) int WINAPI StrCSpnA(const char *str, const char *match) { + const char *ptr = str; + TRACE("%s, %s\n", wine_dbgstr_a(str), wine_dbgstr_a(match)); - return strspn_helper(str, match, StrChrA, TRUE); + if (!str || !match) return 0; + + while (*ptr) + { + if (StrChrA(match, *ptr)) break; + ptr = CharNextA(ptr); + } + return ptr - str; } int WINAPI StrCSpnW(const WCHAR *str, const WCHAR *match) @@ -545,9 +540,18 @@ int WINAPI StrCSpnW(const WCHAR *str, const WCHAR *match) int WINAPI StrCSpnIA(const char *str, const char *match) { + const char *ptr = str; + TRACE("%s, %s\n", wine_dbgstr_a(str), wine_dbgstr_a(match)); - return strspn_helper(str, match, StrChrIA, TRUE); + if (!str || !match) return 0; + + while (*ptr) + { + if (StrChrIA(match, *ptr)) break; + ptr = CharNextA(ptr); + } + return ptr - str; } int WINAPI StrCSpnIW(const WCHAR *str, const WCHAR *match) @@ -568,36 +572,23 @@ int WINAPI StrCSpnIW(const WCHAR *str, const WCHAR *match) return ptr - str; } -static LPSTR strrchra_helper(const char *str, const char *end, WORD ch, BOOL (WINAPI *cmp_func)(WORD, WORD)) +char * WINAPI StrRChrA(const char *str, const char *end, WORD ch) { const char *ret = NULL; - WORD ch2; - - if (!str) - return NULL; - if (!end) - end = str + lstrlenA(str); + TRACE("%s, %s, %#x\n", wine_dbgstr_a(str), wine_dbgstr_a(end), ch); + if (!str) return NULL; + if (!end) end = str + lstrlenA(str); while (*str && str <= end) { - ch2 = IsDBCSLeadByte(*str) ? *str << 8 | str[1] : *str; - - if (!cmp_func(ch, ch2)) - ret = str; + WORD ch2 = IsDBCSLeadByte(*str) ? *str << 8 | str[1] : *str; + if (!char_compare(ch, ch2, 0)) ret = str; str = CharNextA(str); } - return (char *)ret; } -char * WINAPI StrRChrA(const char *str, const char *end, WORD ch) -{ - TRACE("%s, %s, %#x\n", wine_dbgstr_a(str), wine_dbgstr_a(end), ch); - - return strrchra_helper(str, end, ch, ChrCmpA); -} - WCHAR * WINAPI StrRChrW(const WCHAR *str, const WCHAR *end, WORD ch) { WCHAR *ret = NULL; @@ -614,9 +605,20 @@ WCHAR * WINAPI StrRChrW(const WCHAR *str, const WCHAR *end, WORD ch) char * WINAPI StrRChrIA(const char *str, const char *end, WORD ch) { + const char *ret = NULL; + TRACE("%s, %s, %#x\n", wine_dbgstr_a(str), wine_dbgstr_a(end), ch); - return strrchra_helper(str, end, ch, ChrCmpIA); + if (!str) return NULL; + if (!end) end = str + lstrlenA(str); + + while (*str && str <= end) + { + WORD ch2 = IsDBCSLeadByte(*str) ? *str << 8 | str[1] : *str; + if (!ChrCmpIA(ch, ch2)) ret = str; + str = CharNextA(str); + } + return (char *)ret; } WCHAR * WINAPI StrRChrIW(const WCHAR *str, const WCHAR *end, WORD ch)

1 0

Nikolay Sivov : user32/tests: Add another test for KEYEVENTF_UNICODE mode.
by Alexandre Julliard July 1, 2019

July 1, 2019

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

Zebediah Figura : qedit/tests: Add some tests for IEnumMediaTypes().
by Alexandre Julliard July 1, 2019

July 1, 2019

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 : qedit/tests: Add some tests for media types.
by Alexandre Julliard July 1, 2019

July 1, 2019

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 : strmbase: Fix implementation of IEnumMediaTypes::Skip().
by Alexandre Julliard July 1, 2019

July 1, 2019

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 July 1, 2019

July 1, 2019

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

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to shader_glsl_generate_geometry_shader ().
by Alexandre Julliard July 1, 2019

July 1, 2019

Module: wine Branch: master Commit: 9eb34e4f7481f7f8e5dd4dcd5e14da5e1597966c URL: https://source.winehq.org/git/wine.git/?a=commit;h=9eb34e4f7481f7f8e5dd4dcd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 28 15:12:17 2019 +0430 wined3d: Pass a wined3d_context_gl structure to shader_glsl_generate_geometry_shader(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index a793bf7..1b04e9a 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8203,14 +8203,13 @@ static GLuint shader_glsl_generate_domain_shader(const struct wined3d_context_gl } /* Context activation is done by the caller. */ -static GLuint shader_glsl_generate_geometry_shader(const struct wined3d_context *context, +static GLuint shader_glsl_generate_geometry_shader(const struct wined3d_context_gl *context_gl, struct shader_glsl_priv *priv, const struct wined3d_shader *shader, const struct gs_compile_args *args) { - const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); struct wined3d_string_buffer_list *string_buffers = &priv->string_buffers; const struct wined3d_shader_reg_maps *reg_maps = &shader->reg_maps; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; struct wined3d_string_buffer *buffer = &priv->shader_buffer; - const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_shader_signature_element *output; enum wined3d_primitive_type primitive_type; struct shader_glsl_ctx_priv priv_ctx; @@ -8642,6 +8641,7 @@ static GLuint find_glsl_domain_shader(const struct wined3d_context *context, static GLuint find_glsl_geometry_shader(const struct wined3d_context *context, struct shader_glsl_priv *priv, struct wined3d_shader *shader, const struct gs_compile_args *args) { + const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); struct glsl_gs_compiled_shader *gl_shaders, *new_array; struct glsl_shader_private *shader_data; unsigned int i, new_size; @@ -8687,7 +8687,7 @@ static GLuint find_glsl_geometry_shader(const struct wined3d_context *context, gl_shaders = new_array; string_buffer_clear(&priv->shader_buffer); - ret = shader_glsl_generate_geometry_shader(context, priv, shader, args); + ret = shader_glsl_generate_geometry_shader(context_gl, priv, shader, args); gl_shaders[shader_data->num_gl_shaders].args = *args; gl_shaders[shader_data->num_gl_shaders++].id = ret;

1 0

Nikolay Sivov : server: Use KEYEVENTF_UNICODE mode only when virtual key code was not specified.
by Alexandre Julliard July 1, 2019

July 1, 2019

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