wine-commits July 2019

2 participants
228 discussions

Alexandre Julliard : kernel32: Move lstr* string functions to kernelbase.

by Alexandre Julliard

Module: wine Branch: master Commit: 2a455ce049d65eeab95895b6b6d52f6e5047537b URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a455ce049d65eeab95895b6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 27 10:42:13 2019 +0200 kernel32: Move lstr* string functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/Makefile.in | 2 +- dlls/kernel32/kernel32.spec | 24 ++++---- dlls/kernel32/locale.c | 96 ------------------------------- dlls/kernel32/string.c | 110 ----------------------------------- dlls/kernelbase/kernelbase.spec | 24 ++++---- dlls/kernelbase/string.c | 124 ++++++++++++++++++++++++++++++++++++++++ 6 files changed, 149 insertions(+), 231 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2a455ce049d65eeab958…

4 years, 11 months

Alexandre Julliard : kernelbase: Get rid of some string helper functions.

by Alexandre Julliard

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)

4 years, 11 months

Hans Leidekker : ntdll: Support NtQuerySystemInformation( SystemFirmwareTableInformation) on macOS.

by Alexandre Julliard

Module: wine Branch: master Commit: a8745d1211033dd38682e2f4e8bc322d47a15e0f URL: https://source.winehq.org/git/wine.git/?a=commit;h=a8745d1211033dd38682e2f4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jul 1 14:17:43 2019 +0200 ntdll: Support NtQuerySystemInformation(SystemFirmwareTableInformation) on macOS. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/nt.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index d03c0a1..0dc06f9 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -36,6 +36,9 @@ #ifdef HAVE_MACH_MACHINE_H # include <mach/machine.h> #endif +#ifdef HAVE_IOKIT_IOKITLIB_H +# include <IOKit/IOKitLib.h> +#endif #include <ctype.h> #include <string.h> @@ -2218,6 +2221,80 @@ static NTSTATUS get_firmware_info(SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULONG } } +#elif defined(__APPLE__) +static NTSTATUS get_firmware_info(SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULONG available_len, ULONG *required_len) +{ + switch (sfti->ProviderSignature) + { + case RSMB: + { + io_service_t service; + CFDataRef data; + const UInt8 *ptr; + CFIndex len; + struct smbios_prologue *prologue; + BYTE major_version = 2, minor_version = 0; + + if (!(service = IOServiceGetMatchingService(kIOMasterPortDefault, IOServiceMatching("AppleSMBIOS")))) + { + WARN("can't find AppleSMBIOS service\n"); + return STATUS_NO_MEMORY; + } + + if (!(data = IORegistryEntryCreateCFProperty(service, CFSTR("SMBIOS-EPS"), kCFAllocatorDefault, 0))) + { + WARN("can't find SMBIOS entry point\n"); + IOObjectRelease(service); + return STATUS_NO_MEMORY; + } + + len = CFDataGetLength(data); + ptr = CFDataGetBytePtr(data); + if (len >= 8 && !memcmp(ptr, "_SM_", 4)) + { + major_version = ptr[6]; + minor_version = ptr[7]; + } + CFRelease(data); + + if (!(data = IORegistryEntryCreateCFProperty(service, CFSTR("SMBIOS"), kCFAllocatorDefault, 0))) + { + WARN("can't find SMBIOS table\n"); + IOObjectRelease(service); + return STATUS_NO_MEMORY; + } + + len = CFDataGetLength(data); + ptr = CFDataGetBytePtr(data); + sfti->TableBufferLength = sizeof(*prologue) + len; + *required_len = sfti->TableBufferLength + FIELD_OFFSET(SYSTEM_FIRMWARE_TABLE_INFORMATION, TableBuffer); + if (available_len < *required_len) + { + CFRelease(data); + IOObjectRelease(service); + return STATUS_BUFFER_TOO_SMALL; + } + + prologue = (struct smbios_prologue *)sfti->TableBuffer; + prologue->calling_method = 0; + prologue->major_version = major_version; + prologue->minor_version = minor_version; + prologue->revision = 0; + prologue->length = sfti->TableBufferLength - sizeof(*prologue); + + memcpy(sfti->TableBuffer + sizeof(*prologue), ptr, len); + + CFRelease(data); + IOObjectRelease(service); + return STATUS_SUCCESS; + } + default: + { + FIXME("info_class SYSTEM_FIRMWARE_TABLE_INFORMATION provider %08x\n", sfti->ProviderSignature); + return STATUS_NOT_IMPLEMENTED; + } + } +} #else static NTSTATUS get_firmware_info(SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULONG available_len, ULONG *required_len)

4 years, 11 months

Nikolay Sivov : mfplat: Trace MF_PD_DURATION guid.

by Alexandre Julliard

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);")

4 years, 11 months

Nikolay Sivov : server: Use KEYEVENTF_UNICODE mode only when virtual key code was not specified.

by Alexandre Julliard

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; }

4 years, 11 months

Nikolay Sivov : user32/tests: Add another test for KEYEVENTF_UNICODE mode.

by Alexandre Julliard

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:

4 years, 11 months

Nikolay Sivov : user32/tests: Use SendInput() directly.

by Alexandre Julliard

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();

4 years, 11 months

Dmitry Timoshkov : ntdll: Add '-norelay' flag for _vsnprintf().

by Alexandre Julliard

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

4 years, 11 months

Zebediah Figura : msi: Close all handles opened by a custom action thread.

by Alexandre Julliard

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; }

4 years, 11 months

Zebediah Figura : strmbase: Fix implementation of IEnumMediaTypes::Skip().

by Alexandre Julliard

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…

4 years, 11 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2019