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

Francois Gouget : testbot/web: Adjust some web page titles.
by Alexandre Julliard 28 Aug '19

28 Aug '19

Module: tools Branch: master Commit: 1ab176d54a665c3aef5199eb3663489145ae7bfc URL: https://source.winehq.org/git/tools.git/?a=commit;h=1ab176d54a665c3aef5199e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Aug 28 11:20:42 2019 +0200 testbot/web: Adjust some web page titles. This makes it easier to identify them in the browser tabs. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Activity.pl | 7 +++++++ testbot/web/Stats.pl | 7 +++++++ testbot/web/admin/Log.pl | 8 ++++++++ 3 files changed, 22 insertions(+) diff --git a/testbot/web/Activity.pl b/testbot/web/Activity.pl index fa842d9..bf7d6b9 100644 --- a/testbot/web/Activity.pl +++ b/testbot/web/Activity.pl @@ -51,6 +51,13 @@ sub _initialize($$$) $self->{Method} = "get"; } +sub GetPageTitle($$) +{ + my ($self, $Page) = @_; + + return "Activity - ${ProjectName} Test Bot"; +} + sub GeneratePage($) { my ($self) = @_; diff --git a/testbot/web/Stats.pl b/testbot/web/Stats.pl index 2d426ac..70e812d 100644 --- a/testbot/web/Stats.pl +++ b/testbot/web/Stats.pl @@ -40,6 +40,13 @@ sub _initialize($$$) $self->SUPER::_initialize($Request, $RequiredRole); } +sub GetPageTitle($$) +{ + my ($self, $Page) = @_; + + return "Statistics - ${ProjectName} Test Bot"; +} + sub _CompareVMs() { my ($aHost, $bHost) = ($a->GetHost(), $b->GetHost()); diff --git a/testbot/web/admin/Log.pl b/testbot/web/admin/Log.pl index 934bf25..f0ac524 100644 --- a/testbot/web/admin/Log.pl +++ b/testbot/web/admin/Log.pl @@ -25,6 +25,7 @@ use ObjectModel::CGI::FreeFormPage; our @ISA = qw(ObjectModel::CGI::FreeFormPage); use ObjectModel::BasicPropertyDescriptor; +use WineTestBot::Config; use WineTestBot::Log; @@ -38,6 +39,13 @@ sub _initialize($$$) $self->SUPER::_initialize($Request, $RequiredRole, \@PropertyDescriptors); } +sub GetPageTitle($$) +{ + my ($self, $Page) = @_; + + return "Engine Log - ${ProjectName} Test Bot"; +} + sub GetPropertyValue($$) { my ($self, $PropertyDescriptor) = @_;

1 0

Francois Gouget : testbot/SetWinLocale: Document the --no-reboot option.
by Alexandre Julliard 28 Aug '19

28 Aug '19

Module: tools Branch: master Commit: 8d8fd2d03fef33e61279319dce3c9b50c1b8a3a1 URL: https://source.winehq.org/git/tools.git/?a=commit;h=8d8fd2d03fef33e61279319… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Aug 28 15:25:36 2019 +0200 testbot/SetWinLocale: Document the --no-reboot option. It is useful for testing. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/scripts/SetWinLocale | 2 ++ 1 file changed, 2 insertions(+) diff --git a/testbot/scripts/SetWinLocale b/testbot/scripts/SetWinLocale index 5ca0507..824d8f5 100755 --- a/testbot/scripts/SetWinLocale +++ b/testbot/scripts/SetWinLocale @@ -545,6 +545,8 @@ if (defined $Usage) print " --keyboard KBD Specifies the keyboard layout (see --defaults).\n"; print " --country CTY Specifies the location using only the country part of the\n"; print " Windows locale (see --defaults).\n"; + print " --no-reboot Do not reboot Windows. Some locale changes will only take\n"; + print " effect after the next reboot.\n"; print " --debug Show more detailed information about progress.\n"; print " --dry-run Show what would happen but do nothing.\n"; print " --help Shows this usage message.\n";

1 0

Francois Gouget : libvirttool: Fix LibvirtDomain::_GetStateName().
by Alexandre Julliard 28 Aug '19

28 Aug '19

Module: tools Branch: master Commit: defe5c90e7a8a0f35983de256acfcf6bea040f40 URL: https://source.winehq.org/git/tools.git/?a=commit;h=defe5c90e7a8a0f35983de2… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Aug 28 15:25:46 2019 +0200 libvirttool: Fix LibvirtDomain::_GetStateName(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LibvirtDomain.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/LibvirtDomain.pm b/testbot/lib/WineTestBot/LibvirtDomain.pm index 89b31e5..40e0f78 100644 --- a/testbot/lib/WineTestBot/LibvirtDomain.pm +++ b/testbot/lib/WineTestBot/LibvirtDomain.pm @@ -263,7 +263,7 @@ sub _GetStateName($) { my ($State) = @_; - my %StateNames = { + my %StateNames = ( Sys::Virt::Domain::STATE_NOSTATE => "no state", Sys::Virt::Domain::STATE_RUNNING => "running", Sys::Virt::Domain::STATE_BLOCKED => "blocked", @@ -272,7 +272,7 @@ sub _GetStateName($) Sys::Virt::Domain::STATE_SHUTOFF => "shutoff", Sys::Virt::Domain::STATE_CRASHED => "crashed", Sys::Virt::Domain::STATE_PMSUSPENDED => "pmsuspended", - }; + ); return $StateNames{$State} || "unknown"; }

1 0

Hans Leidekker : wbemprox: Store the element size in struct array.
by Alexandre Julliard 27 Aug '19

27 Aug '19

Module: wine Branch: master Commit: 3995b5ecf9511bd3ed5c4eff088023e160c2f722 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3995b5ecf9511bd3ed5c4eff… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Aug 27 16:35:55 2019 +0200 wbemprox: Store the element size in struct array. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 45 ++++++++++++++++++++++------------------ dlls/wbemprox/class.c | 6 ++---- dlls/wbemprox/query.c | 12 +++++------ dlls/wbemprox/wbemprox_private.h | 1 + 4 files changed, 33 insertions(+), 31 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 06ade74..8c4ebe4 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -1251,6 +1251,7 @@ static UINT16 systemenclosure_chassistypes[] = }; static const struct array systemenclosure_chassistypes_array = { + sizeof(*systemenclosure_chassistypes), ARRAY_SIZE(systemenclosure_chassistypes), &systemenclosure_chassistypes }; @@ -2484,8 +2485,9 @@ static struct array *get_defaultipgateway( IP_ADAPTER_GATEWAY_ADDRESS *list ) return NULL; } } - ret->count = count; - ret->ptr = ptr; + ret->elem_size = sizeof(*ptr); + ret->count = count; + ret->ptr = ptr; return ret; } static struct array *get_dnsserversearchorder( IP_ADAPTER_DNS_SERVER_ADDRESS *list ) @@ -2517,8 +2519,9 @@ static struct array *get_dnsserversearchorder( IP_ADAPTER_DNS_SERVER_ADDRESS *li } if ((p = wcsrchr( ptr[i - 1], ':' ))) *p = 0; } - ret->count = count; - ret->ptr = ptr; + ret->elem_size = sizeof(*ptr); + ret->count = count; + ret->ptr = ptr; return ret; } static struct array *get_ipaddress( IP_ADAPTER_UNICAST_ADDRESS_LH *list ) @@ -2549,8 +2552,9 @@ static struct array *get_ipaddress( IP_ADAPTER_UNICAST_ADDRESS_LH *list ) return NULL; } } - ret->count = count; - ret->ptr = ptr; + ret->elem_size = sizeof(*ptr); + ret->count = count; + ret->ptr = ptr; return ret; } static struct array *get_ipsubnet( IP_ADAPTER_UNICAST_ADDRESS_LH *list ) @@ -2601,8 +2605,9 @@ static struct array *get_ipsubnet( IP_ADAPTER_UNICAST_ADDRESS_LH *list ) return NULL; } } - ret->count = count; - ret->ptr = ptr; + ret->elem_size = sizeof(*ptr); + ret->count = count; + ret->ptr = ptr; return ret; } static WCHAR *get_settingid( UINT32 index ) @@ -3458,20 +3463,20 @@ static WCHAR *get_accountname( LSA_TRANSLATED_NAME *name ) } static struct array *get_binaryrepresentation( PSID sid, UINT len ) { - struct array *array = heap_alloc( sizeof(struct array) ); - if (array) + struct array *ret; + UINT8 *ptr; + + if (!(ret = heap_alloc( sizeof(*ret) ))) return NULL; + if (!(ptr = heap_alloc( len ))) { - UINT8 *ret = heap_alloc( len ); - if (ret) - { - memcpy( ret, sid, len ); - array->count = len; - array->ptr = ret; - return array; - } - heap_free( array ); + heap_free( ret ); + return NULL; } - return NULL; + memcpy( ptr, sid, len ); + ret->elem_size = sizeof(*ptr); + ret->count = len; + ret->ptr = ptr; + return ret; } static WCHAR *get_referenceddomainname( LSA_REFERENCED_DOMAIN_LIST *domain ) { diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index 042ebeb..943d5fe 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -235,13 +235,11 @@ static struct record *create_record( struct table *table ) void destroy_array( struct array *array, CIMTYPE type ) { - UINT i, size; - + UINT i; if (!array) return; if (type == CIM_STRING || type == CIM_DATETIME || type == CIM_REFERENCE) { - size = get_type_size( type ); - for (i = 0; i < array->count; i++) heap_free( *(WCHAR **)((char *)array->ptr + i * size) ); + for (i = 0; i < array->count; i++) heap_free( *(WCHAR **)((char *)array->ptr + i * array->elem_size) ); } heap_free( array->ptr ); heap_free( array ); diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 080329c..0165d23 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -765,7 +765,6 @@ VARTYPE to_vartype( CIMTYPE type ) SAFEARRAY *to_safearray( const struct array *array, CIMTYPE type ) { SAFEARRAY *ret; - UINT size = get_type_size( type ); VARTYPE vartype = to_vartype( type ); LONG i; @@ -773,7 +772,7 @@ SAFEARRAY *to_safearray( const struct array *array, CIMTYPE type ) for (i = 0; i < array->count; i++) { - void *ptr = (char *)array->ptr + i * size; + void *ptr = (char *)array->ptr + i * array->elem_size; if (vartype == VT_BSTR) { BSTR str = SysAllocString( *(const WCHAR **)ptr ); @@ -951,23 +950,22 @@ static struct array *to_array( VARIANT *var, CIMTYPE *type ) LONG bound, i; VARTYPE vartype; CIMTYPE basetype; - UINT size; if (SafeArrayGetVartype( V_ARRAY( var ), &vartype ) != S_OK) return NULL; if (!(basetype = to_cimtype( vartype ))) return NULL; if (SafeArrayGetUBound( V_ARRAY( var ), 1, &bound ) != S_OK) return NULL; if (!(ret = heap_alloc( sizeof(struct array) ))) return NULL; - ret->count = bound + 1; - size = get_type_size( basetype ); - if (!(ret->ptr = heap_alloc_zero( ret->count * size ))) + ret->count = bound + 1; + ret->elem_size = get_type_size( basetype ); + if (!(ret->ptr = heap_alloc_zero( ret->count * ret->elem_size ))) { heap_free( ret ); return NULL; } for (i = 0; i < ret->count; i++) { - void *ptr = (char *)ret->ptr + i * size; + void *ptr = (char *)ret->ptr + i * ret->elem_size; if (vartype == VT_BSTR) { BSTR str; diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index cbf4c89..799bc80 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -124,6 +124,7 @@ struct property struct array { + UINT elem_size; UINT count; void *ptr; };

1 0

Hans Leidekker : wbemprox: Retrieve more properties from the SMBIOS table.
by Alexandre Julliard 27 Aug '19

27 Aug '19

Module: wine Branch: master Commit: 7e085d6ee25248bd34e863706f013e1d08d9ee2a URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e085d6ee25248bd34e86370… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Aug 27 16:35:56 2019 +0200 wbemprox: Retrieve more properties from the SMBIOS table. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 680 ++++++++++++++++++++++++++++++--------- dlls/wbemprox/wbemprox_private.h | 10 + 2 files changed, 538 insertions(+), 152 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7e085d6ee25248bd34e8…

1 0

Jacek Caban : kernel32/tests: Add exception handling race test.
by Alexandre Julliard 27 Aug '19

27 Aug '19

Module: wine Branch: master Commit: 42a9b58b066ff374148cee088ac57cfba46e3b76 URL: https://source.winehq.org/git/wine.git/?a=commit;h=42a9b58b066ff374148cee08… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 26 19:37:20 2019 +0200 kernel32/tests: Add exception handling race test. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/debugger.c | 83 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index 90868cd..c9da131 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -311,6 +311,16 @@ static void set_thread_context_(unsigned line, struct debugger_context *ctx, str ok_(__FILE__,line)(ret, "SetThreadContext failed: %u\n", GetLastError()); } +static void fetch_process_context(struct debugger_context *ctx) +{ + struct debuggee_thread *thread; + + WINE_RB_FOR_EACH_ENTRY(thread, &ctx->threads, struct debuggee_thread, entry) + { + fetch_thread_context(thread); + } +} + #define WAIT_EVENT_TIMEOUT 20000 #define POLL_EVENT_TIMEOUT 200 @@ -1259,6 +1269,7 @@ static void test_debugger(const char *argv0) STARTUPINFOA si; HANDLE event, thread; BYTE *mem, buf[4096], *proc_code, *thread_proc, byte; + unsigned int i, worker_cnt, exception_cnt; struct debuggee_thread *debuggee_thread; char *cmd; BOOL ret; @@ -1346,6 +1357,78 @@ static void test_debugger(const char *argv0) } else win_skip("call_debug_service_code not supported on this architecture\n"); + if (sizeof(loop_code) > 1 && broken(1) /* FIXME: broken in Wine */) + { + memset(buf, OP_BP, sizeof(buf)); + memcpy(proc_code, &loop_code, sizeof(loop_code)); + ret = WriteProcessMemory(pi.hProcess, mem, buf, sizeof(buf), NULL); + ok(ret, "WriteProcessMemory failed: %u\n", GetLastError()); + + ctx.thread_tag = 1; + + worker_cnt = 20; + for (i = 0; i < worker_cnt; i++) + { + thread = CreateRemoteThread(pi.hProcess, NULL, 0, (void*)thread_proc, NULL, 0, NULL); + ok(thread != NULL, "CreateRemoteThread failed: %u\n", GetLastError()); + + next_event(&ctx, 20000); + ok(ctx.ev.dwDebugEventCode == CREATE_THREAD_DEBUG_EVENT, "dwDebugEventCode = %d\n", ctx.ev.dwDebugEventCode); + + ret = CloseHandle(thread); + ok(ret, "CloseHandle failed, last error %d.\n", GetLastError()); + } + + byte = OP_BP; + ret = WriteProcessMemory(pi.hProcess, thread_proc + 1, &byte, 1, NULL); + ok(ret, "WriteProcessMemory failed: %u\n", GetLastError()); + + expect_breakpoint_exception(&ctx, thread_proc + 1); + exception_cnt = 1; + + debuggee_thread = ctx.current_thread; + fetch_process_context(&ctx); + ok(get_ip(&ctx.current_thread->ctx) == thread_proc + 2, "unexpected instruction pointer %p\n", + get_ip(&ctx.current_thread->ctx)); + + byte = 0xc3; /* ret */ + ret = WriteProcessMemory(pi.hProcess, thread_proc + 1, &byte, 1, NULL); + ok(ret, "WriteProcessMemory failed: %u\n", GetLastError()); + + for (;;) + { + DEBUG_EVENT ev; + + /* even when there are more pending events, they are not reported until current event is continued */ + ret = WaitForDebugEvent(&ev, 10); + ok(GetLastError() == ERROR_SEM_TIMEOUT, "WaitForDebugEvent returned %x(%u)\n", ret, GetLastError()); + + next_event(&ctx, 100); + if (ctx.ev.dwDebugEventCode != EXCEPTION_DEBUG_EVENT) break; + trace("exception at %p in thread %04x\n", ctx.ev.u.Exception.ExceptionRecord.ExceptionAddress, ctx.ev.dwThreadId); + ok(ctx.ev.u.Exception.ExceptionRecord.ExceptionCode == EXCEPTION_BREAKPOINT, "ExceptionCode = %x\n", + ctx.ev.u.Exception.ExceptionRecord.ExceptionCode); + ok(ctx.ev.u.Exception.ExceptionRecord.ExceptionAddress == thread_proc + 1, + "ExceptionAddress = %p\n", ctx.ev.u.Exception.ExceptionRecord.ExceptionAddress); + ok(get_ip(&ctx.current_thread->ctx) == thread_proc + 2 + || broken(get_ip(&ctx.current_thread->ctx) == thread_proc), /* sometimes observed on win10 */ + "unexpected instruction pointer %p\n", + get_ip(&ctx.current_thread->ctx)); + exception_cnt++; + } + + trace("received %u exceptions\n", exception_cnt); + + for (;;) + { + ok(ctx.ev.dwDebugEventCode == EXIT_THREAD_DEBUG_EVENT + || broken(ctx.ev.dwDebugEventCode == CREATE_THREAD_DEBUG_EVENT), /* sometimes happens on vista */ + "dwDebugEventCode = %d\n", ctx.ev.dwDebugEventCode); + if (ctx.ev.dwDebugEventCode == EXIT_THREAD_DEBUG_EVENT && !--worker_cnt) break; + next_event(&ctx, 2000); + } + } + SetEvent(event); do

1 0

Rémi Bernon : dinput/tests: Add test to validate interactions between dinput and raw input devices.
by Alexandre Julliard 27 Aug '19

27 Aug '19

Module: wine Branch: master Commit: d7916cdf4f8f8cbed7225cfdd0e37c566c9b1eff URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7916cdf4f8f8cbed7225cfd… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Aug 26 16:06:55 2019 +0200 dinput/tests: Add test to validate interactions between dinput and raw input devices. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/keyboard.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/dinput/tests/keyboard.c b/dlls/dinput/tests/keyboard.c index d6ab5b5..0e399f0 100644 --- a/dlls/dinput/tests/keyboard.c +++ b/dlls/dinput/tests/keyboard.c @@ -93,6 +93,7 @@ static void acquire_tests(IDirectInputA *pDI, HWND hwnd) }; DIDATAFORMAT df; HKL hkl, hkl_orig; + UINT prev_raw_devices_count, raw_devices_count; hkl = activate_keyboard_layout(MAKELANGID(LANG_ENGLISH, SUBLANG_DEFAULT), &hkl_orig); if (!hkl) return; @@ -165,6 +166,22 @@ static void acquire_tests(IDirectInputA *pDI, HWND hwnd) } keybd_event('Q', 0, KEYEVENTF_KEYUP, 0); + prev_raw_devices_count = 0; + GetRegisteredRawInputDevices(NULL, &prev_raw_devices_count, sizeof(RAWINPUTDEVICE)); + ok(prev_raw_devices_count == 0 || broken(prev_raw_devices_count == 1) /* wxppro, w2003std */, + "Unexpected raw devices registered: %d\n", prev_raw_devices_count); + + hr = IDirectInputDevice_Acquire(pKeyboard); + ok(SUCCEEDED(hr), "IDirectInputDevice_Acquire() failed: %08x\n", hr); + + raw_devices_count = 0; + GetRegisteredRawInputDevices(NULL, &raw_devices_count, sizeof(RAWINPUTDEVICE)); + ok(raw_devices_count == prev_raw_devices_count, + "Unexpected raw devices registered: %d\n", raw_devices_count); + + hr = IDirectInputDevice_Unacquire(pKeyboard); + ok(SUCCEEDED(hr), "IDirectInputDevice_Unacquire() failed: %08x\n", hr); + if (pKeyboard) IUnknown_Release(pKeyboard); ActivateKeyboardLayout(hkl_orig, 0);

1 0

Rémi Bernon : dinput8/tests: Add test to validate interactions between dinput8 and raw input devices.
by Alexandre Julliard 27 Aug '19

27 Aug '19

Module: wine Branch: master Commit: 2f51ebd961f63a79aa6be637c85548e276367076 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f51ebd961f63a79aa6be637… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Aug 26 16:06:56 2019 +0200 dinput8/tests: Add test to validate interactions between dinput8 and raw input devices. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/device.c | 170 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 170 insertions(+) diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput8/tests/device.c index 1bfb34a..cd86289 100644 --- a/dlls/dinput8/tests/device.c +++ b/dlls/dinput8/tests/device.c @@ -560,12 +560,182 @@ static void test_save_settings(void) IDirectInput_Release(pDI); } +static void test_mouse_keyboard(void) +{ + HRESULT hr; + HWND hwnd, di_hwnd = INVALID_HANDLE_VALUE; + IDirectInput8A *di = NULL; + IDirectInputDevice8A *di_mouse, *di_keyboard; + UINT raw_devices_count; + RAWINPUTDEVICE raw_devices[3]; + + hwnd = CreateWindowExA(WS_EX_TOPMOST, "static", "dinput", WS_POPUP | WS_VISIBLE, 0, 0, 100, 100, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "CreateWindowExA failed\n"); + + hr = CoCreateInstance(&CLSID_DirectInput8, 0, CLSCTX_INPROC_SERVER, &IID_IDirectInput8A, (LPVOID*)&di); + if (hr == DIERR_OLDDIRECTINPUTVERSION || + hr == DIERR_BETADIRECTINPUTVERSION || + hr == REGDB_E_CLASSNOTREG) + { + win_skip("test_mouse_keyboard requires dinput8\n"); + return; + } + ok(SUCCEEDED(hr), "DirectInput8Create failed: %08x\n", hr); + + hr = IDirectInput8_Initialize(di, GetModuleHandleA(NULL), DIRECTINPUT_VERSION); + if (hr == DIERR_OLDDIRECTINPUTVERSION || hr == DIERR_BETADIRECTINPUTVERSION) + { + win_skip("test_mouse_keyboard requires dinput8\n"); + return; + } + ok(SUCCEEDED(hr), "IDirectInput8_Initialize failed: %08x\n", hr); + + hr = IDirectInput8_CreateDevice(di, &GUID_SysMouse, &di_mouse, NULL); + ok(SUCCEEDED(hr), "IDirectInput8_CreateDevice failed: %08x\n", hr); + hr = IDirectInputDevice8_SetDataFormat(di_mouse, &c_dfDIMouse); + ok(SUCCEEDED(hr), "IDirectInputDevice8_SetDataFormat failed: %08x\n", hr); + + hr = IDirectInput8_CreateDevice(di, &GUID_SysKeyboard, &di_keyboard, NULL); + ok(SUCCEEDED(hr), "IDirectInput8_CreateDevice failed: %08x\n", hr); + hr = IDirectInputDevice8_SetDataFormat(di_keyboard, &c_dfDIKeyboard); + ok(SUCCEEDED(hr), "IDirectInputDevice8_SetDataFormat failed: %08x\n", hr); + + raw_devices_count = ARRAY_SIZE(raw_devices); + GetRegisteredRawInputDevices(NULL, &raw_devices_count, sizeof(RAWINPUTDEVICE)); + todo_wine + ok(raw_devices_count == 0, "Unexpected raw devices registered: %d\n", raw_devices_count); + + hr = IDirectInputDevice8_Acquire(di_keyboard); + ok(SUCCEEDED(hr), "IDirectInputDevice8_Acquire failed: %08x\n", hr); + raw_devices_count = ARRAY_SIZE(raw_devices); + memset(raw_devices, 0, sizeof(raw_devices)); + hr = GetRegisteredRawInputDevices(raw_devices, &raw_devices_count, sizeof(RAWINPUTDEVICE)); + todo_wine + ok(hr == 1, "GetRegisteredRawInputDevices returned %d, raw_devices_count: %d\n", hr, raw_devices_count); + todo_wine + ok(raw_devices[0].usUsagePage == 1, "Unexpected raw device usage page: %x\n", raw_devices[0].usUsagePage); + todo_wine + ok(raw_devices[0].usUsage == 6, "Unexpected raw device usage: %x\n", raw_devices[0].usUsage); + todo_wine + ok(raw_devices[0].dwFlags == RIDEV_INPUTSINK, "Unexpected raw device flags: %x\n", raw_devices[0].dwFlags); + todo_wine + ok(raw_devices[0].hwndTarget != NULL, "Unexpected raw device target: %p\n", raw_devices[0].hwndTarget); + hr = IDirectInputDevice8_Unacquire(di_keyboard); + ok(SUCCEEDED(hr), "IDirectInputDevice8_Acquire failed: %08x\n", hr); + raw_devices_count = ARRAY_SIZE(raw_devices); + GetRegisteredRawInputDevices(NULL, &raw_devices_count, sizeof(RAWINPUTDEVICE)); + todo_wine + ok(raw_devices_count == 0, "Unexpected raw devices registered: %d\n", raw_devices_count); + + if (raw_devices[0].hwndTarget != NULL) + di_hwnd = raw_devices[0].hwndTarget; + + hr = IDirectInputDevice8_Acquire(di_mouse); + ok(SUCCEEDED(hr), "IDirectInputDevice8_Acquire failed: %08x\n", hr); + raw_devices_count = ARRAY_SIZE(raw_devices); + memset(raw_devices, 0, sizeof(raw_devices)); + hr = GetRegisteredRawInputDevices(raw_devices, &raw_devices_count, sizeof(RAWINPUTDEVICE)); + todo_wine + ok(hr == 1, "GetRegisteredRawInputDevices returned %d, raw_devices_count: %d\n", hr, raw_devices_count); + todo_wine + ok(raw_devices[0].usUsagePage == 1, "Unexpected raw device usage page: %x\n", raw_devices[0].usUsagePage); + todo_wine + ok(raw_devices[0].usUsage == 2, "Unexpected raw device usage: %x\n", raw_devices[0].usUsage); + todo_wine + ok(raw_devices[0].dwFlags == RIDEV_INPUTSINK, "Unexpected raw device flags: %x\n", raw_devices[0].dwFlags); + todo_wine + ok(raw_devices[0].hwndTarget == di_hwnd, "Unexpected raw device target: %p\n", raw_devices[0].hwndTarget); + hr = IDirectInputDevice8_Unacquire(di_mouse); + ok(SUCCEEDED(hr), "IDirectInputDevice8_Acquire failed: %08x\n", hr); + raw_devices_count = ARRAY_SIZE(raw_devices); + GetRegisteredRawInputDevices(NULL, &raw_devices_count, sizeof(RAWINPUTDEVICE)); + todo_wine + ok(raw_devices_count == 0, "Unexpected raw devices registered: %d\n", raw_devices_count); + + /* expect dinput8 to take over any activated raw input devices */ + raw_devices[0].usUsagePage = 0x01; + raw_devices[0].usUsage = 0x05; + raw_devices[0].dwFlags = 0; + raw_devices[0].hwndTarget = hwnd; + raw_devices[1].usUsagePage = 0x01; + raw_devices[1].usUsage = 0x06; + raw_devices[1].dwFlags = 0; + raw_devices[1].hwndTarget = hwnd; + raw_devices[2].usUsagePage = 0x01; + raw_devices[2].usUsage = 0x02; + raw_devices[2].dwFlags = 0; + raw_devices[2].hwndTarget = hwnd; + raw_devices_count = ARRAY_SIZE(raw_devices); + hr = RegisterRawInputDevices(raw_devices, raw_devices_count, sizeof(RAWINPUTDEVICE)); + ok(hr == TRUE, "RegisterRawInputDevices failed\n"); + + hr = IDirectInputDevice8_Acquire(di_keyboard); + ok(SUCCEEDED(hr), "IDirectInputDevice8_Acquire failed: %08x\n", hr); + hr = IDirectInputDevice8_Acquire(di_mouse); + ok(SUCCEEDED(hr), "IDirectInputDevice8_Acquire failed: %08x\n", hr); + raw_devices_count = ARRAY_SIZE(raw_devices); + memset(raw_devices, 0, sizeof(raw_devices)); + hr = GetRegisteredRawInputDevices(raw_devices, &raw_devices_count, sizeof(RAWINPUTDEVICE)); + todo_wine + ok(hr == 3, "GetRegisteredRawInputDevices returned %d, raw_devices_count: %d\n", hr, raw_devices_count); + todo_wine + ok(raw_devices[0].usUsagePage == 1, "Unexpected raw device usage page: %x\n", raw_devices[0].usUsagePage); + todo_wine + ok(raw_devices[0].usUsage == 2, "Unexpected raw device usage: %x\n", raw_devices[0].usUsage); + todo_wine + ok(raw_devices[0].dwFlags == RIDEV_INPUTSINK, "Unexpected raw device flags: %x\n", raw_devices[0].dwFlags); + todo_wine + ok(raw_devices[0].hwndTarget == di_hwnd, "Unexpected raw device target: %p\n", raw_devices[0].hwndTarget); + todo_wine + ok(raw_devices[1].usUsagePage == 1, "Unexpected raw device usage page: %x\n", raw_devices[1].usUsagePage); + todo_wine + ok(raw_devices[1].usUsage == 5, "Unexpected raw device usage: %x\n", raw_devices[1].usUsage); + ok(raw_devices[1].dwFlags == 0, "Unexpected raw device flags: %x\n", raw_devices[1].dwFlags); + todo_wine + ok(raw_devices[1].hwndTarget == hwnd, "Unexpected raw device target: %p\n", raw_devices[1].hwndTarget); + todo_wine + ok(raw_devices[2].usUsagePage == 1, "Unexpected raw device usage page: %x\n", raw_devices[1].usUsagePage); + todo_wine + ok(raw_devices[2].usUsage == 6, "Unexpected raw device usage: %x\n", raw_devices[1].usUsage); + todo_wine + ok(raw_devices[2].dwFlags == RIDEV_INPUTSINK, "Unexpected raw device flags: %x\n", raw_devices[1].dwFlags); + todo_wine + ok(raw_devices[2].hwndTarget == di_hwnd, "Unexpected raw device target: %p\n", raw_devices[1].hwndTarget); + hr = IDirectInputDevice8_Unacquire(di_keyboard); + ok(SUCCEEDED(hr), "IDirectInputDevice8_Acquire failed: %08x\n", hr); + hr = IDirectInputDevice8_Unacquire(di_mouse); + ok(SUCCEEDED(hr), "IDirectInputDevice8_Acquire failed: %08x\n", hr); + raw_devices_count = ARRAY_SIZE(raw_devices); + GetRegisteredRawInputDevices(NULL, &raw_devices_count, sizeof(RAWINPUTDEVICE)); + todo_wine + ok(raw_devices_count == 1, "Unexpected raw devices registered: %d\n", raw_devices_count); + + raw_devices_count = ARRAY_SIZE(raw_devices); + hr = GetRegisteredRawInputDevices(raw_devices, &raw_devices_count, sizeof(RAWINPUTDEVICE)); + todo_wine + ok(hr == 1, "GetRegisteredRawInputDevices returned %d, raw_devices_count: %d\n", hr, raw_devices_count); + todo_wine + ok(raw_devices[0].usUsagePage == 1, "Unexpected raw device usage page: %x\n", raw_devices[0].usUsagePage); + todo_wine + ok(raw_devices[0].usUsage == 5, "Unexpected raw device usage: %x\n", raw_devices[0].usUsage); + ok(raw_devices[0].dwFlags == 0, "Unexpected raw device flags: %x\n", raw_devices[0].dwFlags); + todo_wine + ok(raw_devices[0].hwndTarget == hwnd, "Unexpected raw device target: %p\n", raw_devices[0].hwndTarget); + + IDirectInputDevice8_Release(di_mouse); + IDirectInputDevice8_Release(di_keyboard); + IDirectInput8_Release(di); + + DestroyWindow(hwnd); +} + START_TEST(device) { CoInitialize(NULL); test_action_mapping(); test_save_settings(); + test_mouse_keyboard(); CoUninitialize(); }

1 0

Rémi Bernon : dinput8/tests: Add window name and window class name test.
by Alexandre Julliard 27 Aug '19

27 Aug '19

Module: wine Branch: master Commit: e001daf5c1f3455ea126a12d92508e5b5d4c5463 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e001daf5c1f3455ea126a12d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Aug 26 16:06:57 2019 +0200 dinput8/tests: Add window name and window class name test. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/device.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput8/tests/device.c index cd86289..0bf6936 100644 --- a/dlls/dinput8/tests/device.c +++ b/dlls/dinput8/tests/device.c @@ -628,7 +628,20 @@ static void test_mouse_keyboard(void) ok(raw_devices_count == 0, "Unexpected raw devices registered: %d\n", raw_devices_count); if (raw_devices[0].hwndTarget != NULL) + { + WCHAR di_hwnd_class[] = {'D','I','E','m','W','i','n',0}; + WCHAR str[16]; + int i; + di_hwnd = raw_devices[0].hwndTarget; + i = GetClassNameW(di_hwnd, str, ARRAY_SIZE(str)); + ok(i == lstrlenW(di_hwnd_class), "GetClassName returned incorrect length\n"); + ok(!lstrcmpW(di_hwnd_class, str), "GetClassName returned incorrect name for this window's class\n"); + + i = GetWindowTextW(di_hwnd, str, ARRAY_SIZE(str)); + ok(i == lstrlenW(di_hwnd_class), "GetClassName returned incorrect length\n"); + ok(!lstrcmpW(di_hwnd_class, str), "GetClassName returned incorrect name for this window's class\n"); + } hr = IDirectInputDevice8_Acquire(di_mouse); ok(SUCCEEDED(hr), "IDirectInputDevice8_Acquire failed: %08x\n", hr);

1 0

Michael Stefaniuc : msi/tests: Actually test two return values.
by Alexandre Julliard 27 Aug '19

27 Aug '19

Module: wine Branch: master Commit: 8738075da4e59336898457fb381488aa3be877cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=8738075da4e59336898457fb… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Aug 16 21:28:52 2019 +0200 msi/tests: Actually test two return values. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/package.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 4d384d0..0604098 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -2081,9 +2081,9 @@ static void test_condition(void) ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); r = MsiEvaluateConditionA(hpkg, "!nofeature=\"\""); ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); - MsiEvaluateConditionA(hpkg, "$nocomponent=\"\""); + r = MsiEvaluateConditionA(hpkg, "$nocomponent=\"\""); ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); - MsiEvaluateConditionA(hpkg, "?nocomponent=\"\""); + r = MsiEvaluateConditionA(hpkg, "?nocomponent=\"\""); ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); MsiSetPropertyA(hpkg, "A", "2");

1 0