November 2018 - Wine-commits

Zebediah Figura : setupapi/tests: Remove workarounds in test_SetupDiCreateDeviceInfoListEx().
by Alexandre Julliard 26 Nov '18

26 Nov '18

Module: wine Branch: master Commit: bc8a117747f91f229a5e0ac7c72f3b0d48623dd6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc8a117747f91f229a5e0ac7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Nov 25 23:20:23 2018 -0600 setupapi/tests: Remove workarounds in test_SetupDiCreateDeviceInfoListEx(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/devinst.c | 70 ++++++++++++++----------------------------- 1 file changed, 22 insertions(+), 48 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index b24480c..164df2b 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -34,9 +34,7 @@ #include "wine/test.h" /* function pointers */ -static HDEVINFO (WINAPI *pSetupDiCreateDeviceInfoListExW)(GUID*,HWND,PCWSTR,PVOID); static BOOL (WINAPI *pSetupDiCallClassInstaller)(DI_FUNCTION, HDEVINFO, PSP_DEVINFO_DATA); -static BOOL (WINAPI *pSetupDiDestroyDeviceInfoList)(HDEVINFO); static HKEY (WINAPI *pSetupDiOpenClassRegKeyExA)(GUID*,REGSAM,DWORD,PCSTR,PVOID); /* This is a unique guid for testing purposes */ @@ -47,8 +45,6 @@ static void init_function_pointers(void) { HMODULE hSetupAPI = GetModuleHandleA("setupapi.dll"); - pSetupDiCreateDeviceInfoListExW = (void *)GetProcAddress(hSetupAPI, "SetupDiCreateDeviceInfoListExW"); - pSetupDiDestroyDeviceInfoList = (void *)GetProcAddress(hSetupAPI, "SetupDiDestroyDeviceInfoList"); pSetupDiCallClassInstaller = (void *)GetProcAddress(hSetupAPI, "SetupDiCallClassInstaller"); pSetupDiOpenClassRegKeyExA = (void *)GetProcAddress(hSetupAPI, "SetupDiOpenClassRegKeyExA"); } @@ -119,57 +115,38 @@ cleanup: return ret; } -static void test_SetupDiCreateDeviceInfoListEx(void) +static void test_create_device_list_ex(void) { - HDEVINFO devlist; - BOOL ret; - DWORD error; - static CHAR notnull[] = "NotNull"; static const WCHAR machine[] = { 'd','u','m','m','y',0 }; static const WCHAR empty[] = { 0 }; + static char notnull[] = "NotNull"; + HDEVINFO set; + BOOL ret; SetLastError(0xdeadbeef); - /* create empty DeviceInfoList, but set Reserved to a value, which is not NULL */ - devlist = pSetupDiCreateDeviceInfoListExW(NULL, NULL, NULL, notnull); - - error = GetLastError(); - if (error == ERROR_CALL_NOT_IMPLEMENTED) - { - win_skip("SetupDiCreateDeviceInfoListExW is not implemented\n"); - return; - } - ok(devlist == INVALID_HANDLE_VALUE, "SetupDiCreateDeviceInfoListExW failed : %p %d (expected %p)\n", devlist, error, INVALID_HANDLE_VALUE); - ok(error == ERROR_INVALID_PARAMETER, "GetLastError returned wrong value : %d, (expected %d)\n", error, ERROR_INVALID_PARAMETER); + set = SetupDiCreateDeviceInfoListExW(NULL, NULL, NULL, notnull); + ok(set == INVALID_HANDLE_VALUE, "Expected failure.\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Got unexpected error %#x.\n", GetLastError()); SetLastError(0xdeadbeef); - /* create empty DeviceInfoList, but set MachineName to something */ - devlist = pSetupDiCreateDeviceInfoListExW(NULL, NULL, machine, NULL); + set = SetupDiCreateDeviceInfoListExW(NULL, NULL, machine, NULL); + ok(set == INVALID_HANDLE_VALUE, "Expected failure.\n"); + ok(GetLastError() == ERROR_INVALID_MACHINENAME + || GetLastError() == ERROR_MACHINE_UNAVAILABLE + || GetLastError() == ERROR_CALL_NOT_IMPLEMENTED, + "Got unexpected error %#x.\n", GetLastError()); - error = GetLastError(); - if (error == ERROR_CALL_NOT_IMPLEMENTED) - { - /* win10 reports ERROR_CALL_NOT_IMPLEMENTED at first here */ - win_skip("SetupDiCreateDeviceInfoListExW is not implemented\n"); - return; - } - ok(devlist == INVALID_HANDLE_VALUE, "SetupDiCreateDeviceInfoListExW failed : %p %d (expected %p)\n", devlist, error, INVALID_HANDLE_VALUE); - ok(error == ERROR_INVALID_MACHINENAME || error == ERROR_MACHINE_UNAVAILABLE, "GetLastError returned wrong value : %d, (expected %d or %d)\n", error, ERROR_INVALID_MACHINENAME, ERROR_MACHINE_UNAVAILABLE); + set = SetupDiCreateDeviceInfoListExW(NULL, NULL, NULL, NULL); + ok(set && set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.", GetLastError()); - /* create empty DeviceInfoList */ - devlist = pSetupDiCreateDeviceInfoListExW(NULL, NULL, NULL, NULL); - ok(devlist && devlist != INVALID_HANDLE_VALUE, "SetupDiCreateDeviceInfoListExW failed : %p %d (expected != %p)\n", devlist, error, INVALID_HANDLE_VALUE); - - /* destroy DeviceInfoList */ - ret = pSetupDiDestroyDeviceInfoList(devlist); - ok(ret, "SetupDiDestroyDeviceInfoList failed : %d\n", error); + ret = SetupDiDestroyDeviceInfoList(set); + ok(ret, "Failed to destroy device list, error %#x.\n", GetLastError()); - /* create empty DeviceInfoList with empty machine name */ - devlist = pSetupDiCreateDeviceInfoListExW(NULL, NULL, empty, NULL); - ok(devlist && devlist != INVALID_HANDLE_VALUE, "SetupDiCreateDeviceInfoListExW failed : %p %d (expected != %p)\n", devlist, error, INVALID_HANDLE_VALUE); + set = SetupDiCreateDeviceInfoListExW(NULL, NULL, empty, NULL); + ok(set && set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.", GetLastError()); - /* destroy DeviceInfoList */ - ret = pSetupDiDestroyDeviceInfoList(devlist); - ok(ret, "SetupDiDestroyDeviceInfoList failed : %d\n", error); + ret = SetupDiDestroyDeviceInfoList(set); + ok(ret, "Failed to destroy device list, error %#x.\n", GetLastError()); } static void test_SetupDiOpenClassRegKeyExA(void) @@ -1389,10 +1366,7 @@ START_TEST(devinst) } RegCloseKey(hkey); - if (pSetupDiCreateDeviceInfoListExW) - test_SetupDiCreateDeviceInfoListEx(); - else - win_skip("SetupDiCreateDeviceInfoListExW is not available\n"); + test_create_device_list_ex(); if (pSetupDiOpenClassRegKeyExA) test_SetupDiOpenClassRegKeyExA();

1 0

Zebediah Figura : setupapi/tests: Remove workarounds in test_SetupDiOpenClassRegKeyExA().
by Alexandre Julliard 26 Nov '18

26 Nov '18

Module: wine Branch: master Commit: 48be2832504dc0d9f15c58af79e729f8524783f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=48be2832504dc0d9f15c58af… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Nov 25 23:20:24 2018 -0600 setupapi/tests: Remove workarounds in test_SetupDiOpenClassRegKeyExA(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/devinst.c | 75 +++++++++++++------------------------------ 1 file changed, 23 insertions(+), 52 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 164df2b..0e6a1c0 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -33,22 +33,10 @@ #include "wine/heap.h" #include "wine/test.h" -/* function pointers */ -static BOOL (WINAPI *pSetupDiCallClassInstaller)(DI_FUNCTION, HDEVINFO, PSP_DEVINFO_DATA); -static HKEY (WINAPI *pSetupDiOpenClassRegKeyExA)(GUID*,REGSAM,DWORD,PCSTR,PVOID); - /* This is a unique guid for testing purposes */ static GUID guid = {0x6a55b5a4, 0x3f65, 0x11db, {0xb7,0x04,0x00,0x11,0x95,0x5c,0x2b,0xdb}}; static GUID guid2 = {0x6a55b5a5, 0x3f65, 0x11db, {0xb7,0x04,0x00,0x11,0x95,0x5c,0x2b,0xdb}}; -static void init_function_pointers(void) -{ - HMODULE hSetupAPI = GetModuleHandleA("setupapi.dll"); - - pSetupDiCallClassInstaller = (void *)GetProcAddress(hSetupAPI, "SetupDiCallClassInstaller"); - pSetupDiOpenClassRegKeyExA = (void *)GetProcAddress(hSetupAPI, "SetupDiOpenClassRegKeyExA"); -} - static LSTATUS devinst_RegDeleteTreeW(HKEY hKey, LPCWSTR lpszSubKey) { LONG ret; @@ -149,42 +137,32 @@ static void test_create_device_list_ex(void) ok(ret, "Failed to destroy device list, error %#x.\n", GetLastError()); } -static void test_SetupDiOpenClassRegKeyExA(void) +static void test_open_class_key(void) { - static const CHAR guidString[] = "{6a55b5a4-3f65-11db-b704-0011955c2bdb}"; - HKEY hkey; + static const char guidstr[] = "{6a55b5a4-3f65-11db-b704-0011955c2bdb}"; + HKEY root_key, class_key; + LONG res; - /* Check return value for nonexistent key */ - hkey = pSetupDiOpenClassRegKeyExA(&guid, KEY_ALL_ACCESS, - DIOCR_INSTALLER, NULL, NULL); - ok(hkey == INVALID_HANDLE_VALUE, - "returned %p (expected INVALID_HANDLE_VALUE)\n", hkey); + SetLastError(0xdeadbeef); + class_key = SetupDiOpenClassRegKeyExA(&guid, KEY_ALL_ACCESS, DIOCR_INSTALLER, NULL, NULL); + ok(class_key == INVALID_HANDLE_VALUE, "Expected failure.\n"); +todo_wine + ok(GetLastError() == ERROR_INVALID_CLASS, "Got unexpected error %#x.\n", GetLastError()); - /* Test it for a key that exists */ - hkey = SetupDiOpenClassRegKey(NULL, KEY_ALL_ACCESS); - if (hkey != INVALID_HANDLE_VALUE) - { - HKEY classKey; - if (RegCreateKeyA(hkey, guidString, &classKey) == ERROR_SUCCESS) - { - RegCloseKey(classKey); - SetLastError(0xdeadbeef); - classKey = pSetupDiOpenClassRegKeyExA(&guid, KEY_ALL_ACCESS, - DIOCR_INSTALLER, NULL, NULL); - ok(classKey != INVALID_HANDLE_VALUE, - "opening class registry key failed with error %d\n", - GetLastError()); - if (classKey != INVALID_HANDLE_VALUE) - RegCloseKey(classKey); - RegDeleteKeyA(hkey, guidString); - } - else - trace("failed to create registry key for test\n"); + root_key = SetupDiOpenClassRegKey(NULL, KEY_ALL_ACCESS); + ok(root_key != INVALID_HANDLE_VALUE, "Failed to open root key, error %#x.\n", GetLastError()); - RegCloseKey(hkey); - } - else - trace("failed to open classes key %u\n", GetLastError()); + res = RegCreateKeyA(root_key, guidstr, &class_key); + ok(!res, "Failed to create class key, error %#x.\n", GetLastError()); + RegCloseKey(class_key); + + SetLastError(0xdeadbeef); + class_key = SetupDiOpenClassRegKeyExA(&guid, KEY_ALL_ACCESS, DIOCR_INSTALLER, NULL, NULL); + ok(class_key != INVALID_HANDLE_VALUE, "Failed to open class key, error %#x.\n", GetLastError()); + RegCloseKey(class_key); + + RegDeleteKeyA(root_key, guidstr); + RegCloseKey(root_key); } static void create_inf_file(LPCSTR filename) @@ -1357,8 +1335,6 @@ START_TEST(devinst) { HKEY hkey; - init_function_pointers(); - if ((hkey = SetupDiOpenClassRegKey(NULL, KEY_ALL_ACCESS)) == INVALID_HANDLE_VALUE) { skip("needs admin rights\n"); @@ -1367,12 +1343,7 @@ START_TEST(devinst) RegCloseKey(hkey); test_create_device_list_ex(); - - if (pSetupDiOpenClassRegKeyExA) - test_SetupDiOpenClassRegKeyExA(); - else - win_skip("SetupDiOpenClassRegKeyExA is not available\n"); - + test_open_class_key(); test_install_class(); test_device_info(); test_get_device_instance_id();

1 0

Dmitry Timoshkov : user32: Don't force a combobox repaint on WM_SIZE.
by Alexandre Julliard 26 Nov '18

26 Nov '18

Module: wine Branch: master Commit: 2d9e3236ea8ae752184b8a285f9d616ec94afb8f URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d9e3236ea8ae752184b8a28… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Sun Nov 25 20:57:53 2018 +0300 user32: Don't force a combobox repaint on WM_SIZE. This breaks z-order based painting and causes side effects for applications that during the WM_PAINT processing reference internal data associated with a not fully initialized window. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/combo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c index 31ec6af..59c2e64 100644 --- a/dlls/user32/combo.c +++ b/dlls/user32/combo.c @@ -1536,7 +1536,7 @@ static void COMBO_Size( LPHEADCOMBO lphc ) &lphc->buttonRect, &lphc->droppedRect); - CBResetPos( lphc, &lphc->textRect, &lphc->droppedRect, TRUE ); + CBResetPos( lphc, &lphc->textRect, &lphc->droppedRect, FALSE ); }

1 0

Piotr Caban : msvcp90: Add missing break in time_get::do_get (coverity).
by Alexandre Julliard 26 Nov '18

26 Nov '18

Module: wine Branch: master Commit: 37fce369890da3c9d32d4e44fef868c9166388ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=37fce369890da3c9d32d4e44… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Nov 25 16:12:37 2018 +0100 msvcp90: Add missing break in time_get::do_get (coverity). Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/locale.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index f885068..068e81e 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -10514,6 +10514,7 @@ istreambuf_iterator_char* __thiscall time_get_char_do_get(const time_get_char *t case 'n': case 't': skip_ws_char(ctype, &s); + break; case 'p': { BOOL pm = FALSE; @@ -11414,6 +11415,7 @@ istreambuf_iterator_wchar* __thiscall time_get_wchar_do_get(const time_get_wchar case 'n': case 't': skip_ws_wchar(ctype, &s); + break; case 'p': { BOOL pm = FALSE;

1 0

Michael Stefaniuc : cmd: Avoid naming conflicts with the global HeapAlloc wrappers.
by Alexandre Julliard 26 Nov '18

26 Nov '18

Module: wine Branch: master Commit: 44bda237edb4bbc9aa190003dd2bd0919e820446 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44bda237edb4bbc9aa190003… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Nov 25 21:56:00 2018 +0100 cmd: Avoid naming conflicts with the global HeapAlloc wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/batch.c | 4 ++-- programs/cmd/builtins.c | 24 ++++++++++++------------ programs/cmd/directory.c | 14 +++++++------- programs/cmd/wcmd.h | 10 +++------- programs/cmd/wcmdmain.c | 20 ++++++++++---------- 5 files changed, 34 insertions(+), 38 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=44bda237edb4bbc9aa19…

1 0

Zebediah Figura : setupapi/devinst: Factor out get_device().
by Alexandre Julliard 26 Nov '18

26 Nov '18

Module: wine Branch: master Commit: 62bf00b94f23e2939e352173e4d5c6f95b2fab95 URL: https://source.winehq.org/git/wine.git/?a=commit;h=62bf00b94f23e2939e352173… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Nov 25 17:31:46 2018 -0600 setupapi/devinst: Factor out get_device(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 385 ++++++++++++------------------------------------ 1 file changed, 95 insertions(+), 290 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=62bf00b94f23e2939e35…

1 0

Zebediah Figura : setupapi/devinst: Factor out get_device_iface().
by Alexandre Julliard 26 Nov '18

26 Nov '18

Module: wine Branch: master Commit: cdb486ae0a720492f227fcf811ec03adf0241117 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cdb486ae0a720492f227fcf8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Nov 25 17:31:47 2018 -0600 setupapi/devinst: Factor out get_device_iface(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 121 +++++++++++++++++------------------------------- 1 file changed, 43 insertions(+), 78 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 630d3e9..69f6fa2 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -157,6 +157,25 @@ static struct device *get_device(HDEVINFO devinfo, const SP_DEVINFO_DATA *data) return device; } +static struct device_iface *get_device_iface(HDEVINFO devinfo, const SP_DEVICE_INTERFACE_DATA *data) +{ + struct DeviceInfoSet *set = devinfo; + + if (!devinfo || devinfo == INVALID_HANDLE_VALUE || set->magic != SETUP_DEVICE_INFO_SET_MAGIC) + { + SetLastError(ERROR_INVALID_HANDLE); + return NULL; + } + + if (!data || data->cbSize != sizeof(*data) || !data->Reserved) + { + SetLastError(ERROR_INVALID_PARAMETER); + return NULL; + } + + return (struct device_iface *)data->Reserved; +} + static inline void copy_device_data(SP_DEVINFO_DATA *data, const struct device *device) { data->ClassGuid = device->class; @@ -2493,34 +2512,22 @@ HKEY WINAPI SetupDiCreateDeviceInterfaceRegKeyW(HDEVINFO devinfo, SP_DEVICE_INTERFACE_DATA *iface_data, DWORD reserved, REGSAM access, HINF hinf, const WCHAR *section) { - struct DeviceInfoSet *set = devinfo; struct device_iface *iface; HKEY refstr_key, params_key; WCHAR *path; LONG ret; - TRACE("%p %p %d %#x %p %s\n", devinfo, iface_data, reserved, access, hinf, - debugstr_w(section)); + TRACE("devinfo %p, iface_data %p, reserved %d, access %#x, hinf %p, section %s.\n", + devinfo, iface_data, reserved, access, hinf, debugstr_w(section)); + + if (!(iface = get_device_iface(devinfo, iface_data))) - if (!devinfo || devinfo == INVALID_HANDLE_VALUE || - set->magic != SETUP_DEVICE_INFO_SET_MAGIC) - { - SetLastError(ERROR_INVALID_HANDLE); - return INVALID_HANDLE_VALUE; - } - if (!iface_data || iface_data->cbSize != sizeof(SP_DEVICE_INTERFACE_DATA) || - !iface_data->Reserved) - { - SetLastError(ERROR_INVALID_PARAMETER); - return INVALID_HANDLE_VALUE; - } if (hinf && !section) { SetLastError(ERROR_INVALID_PARAMETER); return INVALID_HANDLE_VALUE; } - iface = (struct device_iface *)iface_data->Reserved; if (!(path = get_refstr_key_path(iface))) { SetLastError(ERROR_OUTOFMEMORY); @@ -2554,28 +2561,16 @@ HKEY WINAPI SetupDiCreateDeviceInterfaceRegKeyW(HDEVINFO devinfo, BOOL WINAPI SetupDiDeleteDeviceInterfaceRegKey(HDEVINFO devinfo, SP_DEVICE_INTERFACE_DATA *iface_data, DWORD reserved) { - struct DeviceInfoSet *set = devinfo; struct device_iface *iface; HKEY refstr_key; WCHAR *path; LONG ret; - TRACE("%p %p %d\n", devinfo, iface_data, reserved); + TRACE("devinfo %p, iface_data %p, reserved %d.\n", devinfo, iface_data, reserved); - if (!devinfo || devinfo == INVALID_HANDLE_VALUE || - set->magic != SETUP_DEVICE_INFO_SET_MAGIC) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - if (!iface_data || iface_data->cbSize != sizeof(SP_DEVICE_INTERFACE_DATA) || - !iface_data->Reserved) - { - SetLastError(ERROR_INVALID_PARAMETER); + if (!(iface = get_device_iface(devinfo, iface_data))) return FALSE; - } - iface = (struct device_iface *)iface_data->Reserved; if (!(path = get_refstr_key_path(iface))) { SetLastError(ERROR_OUTOFMEMORY); @@ -2743,36 +2738,21 @@ BOOL WINAPI SetupDiDestroyDeviceInfoList(HDEVINFO devinfo) /*********************************************************************** * SetupDiGetDeviceInterfaceDetailA (SETUPAPI.@) */ -BOOL WINAPI SetupDiGetDeviceInterfaceDetailA( - HDEVINFO DeviceInfoSet, - PSP_DEVICE_INTERFACE_DATA DeviceInterfaceData, - PSP_DEVICE_INTERFACE_DETAIL_DATA_A DeviceInterfaceDetailData, - DWORD DeviceInterfaceDetailDataSize, - PDWORD RequiredSize, - SP_DEVINFO_DATA *device_data) +BOOL WINAPI SetupDiGetDeviceInterfaceDetailA(HDEVINFO devinfo, SP_DEVICE_INTERFACE_DATA *iface_data, + SP_DEVICE_INTERFACE_DETAIL_DATA_A *DeviceInterfaceDetailData, + DWORD DeviceInterfaceDetailDataSize, DWORD *RequiredSize, SP_DEVINFO_DATA *device_data) { - struct DeviceInfoSet *set = DeviceInfoSet; struct device_iface *iface; DWORD bytesNeeded = FIELD_OFFSET(SP_DEVICE_INTERFACE_DETAIL_DATA_A, DevicePath[1]); BOOL ret = FALSE; - TRACE("(%p, %p, %p, %d, %p, %p)\n", DeviceInfoSet, - DeviceInterfaceData, DeviceInterfaceDetailData, - DeviceInterfaceDetailDataSize, RequiredSize, device_data); + TRACE("devinfo %p, iface_data %p, detail_data %p, size %d, needed %p, device_data %p.\n", + devinfo, iface_data, DeviceInterfaceDetailData, DeviceInterfaceDetailDataSize, + RequiredSize, device_data); - if (!DeviceInfoSet || DeviceInfoSet == INVALID_HANDLE_VALUE || - set->magic != SETUP_DEVICE_INFO_SET_MAGIC) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - if (!DeviceInterfaceData || - DeviceInterfaceData->cbSize != sizeof(SP_DEVICE_INTERFACE_DATA) || - !DeviceInterfaceData->Reserved) - { - SetLastError(ERROR_INVALID_PARAMETER); + if (!(iface = get_device_iface(devinfo, iface_data))) return FALSE; - } + if (DeviceInterfaceDetailData && DeviceInterfaceDetailData->cbSize != sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_A)) { @@ -2784,7 +2764,7 @@ BOOL WINAPI SetupDiGetDeviceInterfaceDetailA( SetLastError(ERROR_INVALID_USER_BUFFER); return FALSE; } - iface = (struct device_iface *)DeviceInterfaceData->Reserved; + if (iface->symlink) bytesNeeded += WideCharToMultiByte(CP_ACP, 0, iface->symlink, -1, NULL, 0, NULL, NULL); @@ -2816,37 +2796,22 @@ BOOL WINAPI SetupDiGetDeviceInterfaceDetailA( /*********************************************************************** * SetupDiGetDeviceInterfaceDetailW (SETUPAPI.@) */ -BOOL WINAPI SetupDiGetDeviceInterfaceDetailW( - HDEVINFO DeviceInfoSet, - PSP_DEVICE_INTERFACE_DATA DeviceInterfaceData, - PSP_DEVICE_INTERFACE_DETAIL_DATA_W DeviceInterfaceDetailData, - DWORD DeviceInterfaceDetailDataSize, - PDWORD RequiredSize, - SP_DEVINFO_DATA *device_data) +BOOL WINAPI SetupDiGetDeviceInterfaceDetailW(HDEVINFO devinfo, SP_DEVICE_INTERFACE_DATA *iface_data, + SP_DEVICE_INTERFACE_DETAIL_DATA_W *DeviceInterfaceDetailData, + DWORD DeviceInterfaceDetailDataSize, DWORD *RequiredSize, SP_DEVINFO_DATA *device_data) { - struct DeviceInfoSet *set = DeviceInfoSet; struct device_iface *iface; DWORD bytesNeeded = offsetof(SP_DEVICE_INTERFACE_DETAIL_DATA_W, DevicePath) + sizeof(WCHAR); /* include NULL terminator */ BOOL ret = FALSE; - TRACE("(%p, %p, %p, %d, %p, %p)\n", DeviceInfoSet, - DeviceInterfaceData, DeviceInterfaceDetailData, - DeviceInterfaceDetailDataSize, RequiredSize, device_data); + TRACE("devinfo %p, iface_data %p, detail_data %p, size %d, needed %p, device_data %p.\n", + devinfo, iface_data, DeviceInterfaceDetailData, DeviceInterfaceDetailDataSize, + RequiredSize, device_data); - if (!DeviceInfoSet || DeviceInfoSet == INVALID_HANDLE_VALUE || - set->magic != SETUP_DEVICE_INFO_SET_MAGIC) - { - SetLastError(ERROR_INVALID_HANDLE); + if (!(iface = get_device_iface(devinfo, iface_data))) return FALSE; - } - if (!DeviceInterfaceData || - DeviceInterfaceData->cbSize != sizeof(SP_DEVICE_INTERFACE_DATA) || - !DeviceInterfaceData->Reserved) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } + if (DeviceInterfaceDetailData && (DeviceInterfaceDetailData->cbSize < offsetof(SP_DEVICE_INTERFACE_DETAIL_DATA_W, DevicePath) + sizeof(WCHAR) || DeviceInterfaceDetailData->cbSize > sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_W))) @@ -2859,7 +2824,7 @@ BOOL WINAPI SetupDiGetDeviceInterfaceDetailW( SetLastError(ERROR_INVALID_USER_BUFFER); return FALSE; } - iface = (struct device_iface *)DeviceInterfaceData->Reserved; + if (iface->symlink) bytesNeeded += sizeof(WCHAR) * lstrlenW(iface->symlink); if (DeviceInterfaceDetailDataSize >= bytesNeeded)

1 0

Zebediah Figura : setupapi/devinst: Factor out get_device_set().
by Alexandre Julliard 26 Nov '18

26 Nov '18

Module: wine Branch: master Commit: aba3ed75f112b5488ac1b5285491996ccd5a4f36 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aba3ed75f112b5488ac1b528… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Nov 25 17:31:48 2018 -0600 setupapi/devinst: Factor out get_device_set(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 203 +++++++++++++++++++----------------------------- 1 file changed, 79 insertions(+), 124 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=aba3ed75f112b5488ac1…

1 0

Francois Gouget : testbot: Fix a copy/ paste error in GetTaskMissionDescription().
by Alexandre Julliard 26 Nov '18

26 Nov '18

Module: tools Branch: master Commit: 4760c0ef27834ddf4ddd6d5cdc4a9964dec51087 URL: https://source.winehq.org/git/tools.git/?a=commit;h=4760c0ef27834ddf4ddd6d5… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Nov 26 18:13:00 2018 +0100 testbot: Fix a copy/paste error in GetTaskMissionDescription(). The condition was obviously redundant but at least it did not cause a bug. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Missions.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/Missions.pm b/testbot/lib/WineTestBot/Missions.pm index 9761a5a..869f699 100644 --- a/testbot/lib/WineTestBot/Missions.pm +++ b/testbot/lib/WineTestBot/Missions.pm @@ -108,7 +108,7 @@ sub GetTaskMissionDescription($) my $Builds = $TaskMission->{Builds}; my $Description = - ($Builds->{exe64} and ($Builds->{exe32} or $Builds->{exe32})) ? "32 & 64 bit executable" : + ($Builds->{exe32} and $Builds->{exe64}) ? "32 & 64 bit executable" : $Builds->{exe32} ? "32 bit executable" : $Builds->{exe64} ? "64 bit executable" : ($Builds->{wow64} and ($Builds->{win32} or $Builds->{wow32})) ? "32 & 64 bit" :

1 0

Francois Gouget : testbot/web: Add a legend to the statistics page.
by Alexandre Julliard 26 Nov '18

26 Nov '18

Module: tools Branch: master Commit: 9ba55dc4d78d4dc3718d4df53fb646404b9ddeea URL: https://source.winehq.org/git/tools.git/?a=commit;h=9ba55dc4d78d4dc3718d4df… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Nov 26 01:45:50 2018 +0100 testbot/web: Add a legend to the statistics page. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Stats.pl | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/testbot/web/Stats.pl b/testbot/web/Stats.pl index ccabb32..2d426ac 100644 --- a/testbot/web/Stats.pl +++ b/testbot/web/Stats.pl @@ -334,6 +334,22 @@ sub GenerateBody($) _GenStatsLine($VMsStats, "error.count", "Transient errors", $SortedVMKeys); print "</tbody></table></div>\n"; +} + +sub GenerateFooter($) +{ + my ($self) = @_; + print "<p></p><div class='CollectionBlock'><table>\n"; + print "<thead><tr><th class='Record'>Legend</th></tr></thead>\n"; + print "<tbody><tr><td class='Record'>\n"; + + print "<p>The <b>Job rate</b> and <b>Task rate</b> show the average hourly rate at which jobs / tasks are submitted to the TestBot. The <b>Revert rate</b> shows how many reverts have been done per hour to run those tasks. Note that the job and task rates provide a first approximation upper limit on the average time a job or task can take to complete.</p>\n"; + print "<p>The <b>Busy time</b> indicates how long the TestBot had at least one pending task and the <b>Busy %</b> shows how much of the wall clock time this represents. Note that the busy percentage and average <b>Job completion</b> times can be optimized by balancing the load on the different VM hosts.</p>\n"; + print "<p>The average and maximum time statistics show how long the VMs spend in each state of their lifecycle. A VM starts in the powered off or dirty state. It is then <b>reverted</b> to a clean state with the right configuration for the tests. Then it goes into the <b>sleep</b> state during which it gets ready to run the tests. Depending on the VM configuration this may be immediate or may require booting the VM first. Then it goes into the <b>run</b> state while the tests are being uploaded, run, and the results retrieved. This means the test itself takes less time to run than indicated in this statistic. Also note that the <b>WineTest</b> and <b>Wine update</b> tasks are tallied separately because they take much longer than regular tasks. Once the tests complete the VM is marked <b>dirty</b> while it waits for the TestBot to decide whether to power it off, or immediately revert it for the next task.</p>\n"; + print "<p>The errors section shows how many <b>Timeouts</b> occurred, that is how many tasks failed to complete within the alloted time; how many failed due to a <b>TestBot error</b>; and how many had to be rerun due to a <b>Transient error</b> such as a network connection issue.</p>\n"; + + print "</td></tr></tbody>\n"; + print "</tbody></table></div>\n"; print "<p class='GeneralFooterText'>Generated in ", Elapsed($self->{start}), " s</p>\n"; print "</div>\n"; }

1 0