April 2021 - Wine-Commits - list.winehq.org

Nikolay Sivov : include: Remove duplicated ComboEx item mask flags.
by Alexandre Julliard April 12, 2021

April 12, 2021

Module: wine Branch: master Commit: e78742bc4b57ecfdef0ea9883b92cffdd4e3bacb URL: https://source.winehq.org/git/wine.git/?a=commit;h=e78742bc4b57ecfdef0ea988… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 12 07:43:22 2021 +0300 include: Remove duplicated ComboEx item mask flags. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/commctrl.h | 8 -------- 1 file changed, 8 deletions(-) diff --git a/include/commctrl.h b/include/commctrl.h index 5614f64a979..41abceb0138 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -4417,14 +4417,6 @@ static const WCHAR WC_COMBOBOXEXW[] = { 'C','o','m','b','o', #endif #define WC_COMBOBOXEX WINELIB_NAME_AW(WC_COMBOBOXEX) -#define CBEIF_TEXT 0x00000001 -#define CBEIF_IMAGE 0x00000002 -#define CBEIF_SELECTEDIMAGE 0x00000004 -#define CBEIF_OVERLAY 0x00000008 -#define CBEIF_INDENT 0x00000010 -#define CBEIF_LPARAM 0x00000020 -#define CBEIF_DI_SETITEM 0x10000000 - #define CBEM_INSERTITEMA (WM_USER+1) #define CBEM_INSERTITEMW (WM_USER+11) #define CBEM_INSERTITEM WINELIB_NAME_AW(CBEM_INSERTITEM)

1 0

Zebediah Figura : wineusb.sys: Report RawDeviceOK in IRP_MN_QUERY_CAPABILITIES.
by Alexandre Julliard April 12, 2021

April 12, 2021

Module: wine Branch: master Commit: 66a0cc963674c672237f82237b01ab788e850513 URL: https://source.winehq.org/git/wine.git/?a=commit;h=66a0cc963674c672237f8223… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Apr 10 21:57:16 2021 -0500 wineusb.sys: Report RawDeviceOK in IRP_MN_QUERY_CAPABILITIES. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineusb.sys/wineusb.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/wineusb.sys/wineusb.c b/dlls/wineusb.sys/wineusb.c index f46f17d66f4..b8cefdaff5e 100644 --- a/dlls/wineusb.sys/wineusb.c +++ b/dlls/wineusb.sys/wineusb.c @@ -377,8 +377,17 @@ static NTSTATUS pdo_pnp(DEVICE_OBJECT *device_obj, IRP *irp) ret = query_id(device, irp, stack->Parameters.QueryId.IdType); break; - case IRP_MN_START_DEVICE: case IRP_MN_QUERY_CAPABILITIES: + { + DEVICE_CAPABILITIES *caps = stack->Parameters.DeviceCapabilities.Capabilities; + + caps->RawDeviceOK = 1; + + ret = STATUS_SUCCESS; + break; + } + + case IRP_MN_START_DEVICE: case IRP_MN_SURPRISE_REMOVAL: ret = STATUS_SUCCESS; break;

1 0

Paul Gofman : kernel32: Implement PackageIdFromFullName().
by Alexandre Julliard April 12, 2021

April 12, 2021

Module: wine Branch: master Commit: b1e2780eacc77236ab4ecd57597c458b22a2cf2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1e2780eacc77236ab4ecd57… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Mar 26 12:37:43 2021 +0300 kernel32: Implement PackageIdFromFullName(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-appmodel-runtime-l1-1-1.spec | 2 +- .../ext-ms-win-kernel32-package-l1-1-1.spec | 2 +- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/tests/version.c | 173 +++++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/version.c | 116 ++++++++++++++ include/appmodel.h | 31 ++++ 7 files changed, 324 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b1e2780eacc77236ab4e…

1 0

Hans Leidekker : ws2_32: Implement GetHostNameW.
by Alexandre Julliard April 12, 2021

April 12, 2021

Module: wine Branch: master Commit: 998e5eaddb3f893824ac513680634852271097a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=998e5eaddb3f893824ac5136… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Sun Apr 11 21:55:40 2021 +0200 ws2_32: Implement GetHostNameW. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49286 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 30 ++++++++++++++++++++++++++++++ dlls/ws2_32/tests/sock.c | 29 +++++++++++++++++++++++++++++ dlls/ws2_32/ws2_32.spec | 1 + include/winsock2.h | 1 + 4 files changed, 61 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 4f26d6475aa..262171ebab0 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -7224,6 +7224,36 @@ int WINAPI WS_gethostname(char *name, int namelen) return 0; } +/*********************************************************************** + * GetHostNameW (WS2_32.@) + */ +int WINAPI GetHostNameW(WCHAR *name, int namelen) +{ + char buf[256]; + int len; + + TRACE("name %p, len %d\n", name, namelen); + + if (!name) + { + SetLastError(WSAEFAULT); + return SOCKET_ERROR; + } + + if (gethostname(buf, sizeof(buf))) + { + SetLastError(wsaErrno()); + return SOCKET_ERROR; + } + + if ((len = MultiByteToWideChar(CP_ACP, 0, buf, -1, NULL, 0)) > namelen) + { + SetLastError(WSAEFAULT); + return SOCKET_ERROR; + } + MultiByteToWideChar(CP_ACP, 0, buf, -1, name, namelen); + return 0; +} /* ------------------------------------- Windows sockets extensions -- * * * diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index cedbf423d97..5a1a271b099 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4323,6 +4323,34 @@ static void test_gethostname(void) ok(he != NULL, "gethostbyname(\"%s\") failed: %d\n", name, WSAGetLastError()); } +static void test_GetHostNameW(void) +{ + WCHAR name[256]; + int ret, len; + + WSASetLastError(0xdeadbeef); + ret = GetHostNameW(NULL, 256); + ok(ret == -1, "GetHostNameW() returned %d\n", ret); + ok(WSAGetLastError() == WSAEFAULT, "GetHostNameW with null buffer " + "failed with %d, expected %d\n", WSAGetLastError(), WSAEFAULT); + + ret = GetHostNameW(name, sizeof(name)); + ok(ret == 0, "GetHostNameW() call failed: %d\n", WSAGetLastError()); + + len = wcslen(name); + WSASetLastError(0xdeadbeef); + wcscpy(name, L"deadbeef"); + ret = GetHostNameW(name, len); + ok(ret == -1, "GetHostNameW() returned %d\n", ret); + ok(!wcscmp(name, L"deadbeef"), "name changed unexpected!\n"); + ok(WSAGetLastError() == WSAEFAULT, "GetHostNameW with insufficient length " + "failed with %d, expected %d\n", WSAGetLastError(), WSAEFAULT); + + len++; + ret = GetHostNameW(name, len); + ok(ret == 0, "GetHostNameW() call failed: %d\n", WSAGetLastError()); +} + static void test_inet_addr(void) { u_long addr; @@ -10631,6 +10659,7 @@ START_TEST( sock ) test_gethostbyname(); test_gethostbyname_hack(); test_gethostname(); + test_GetHostNameW(); test_WSASendMsg(); test_WSASendTo(); diff --git a/dlls/ws2_32/ws2_32.spec b/dlls/ws2_32/ws2_32.spec index 87e0bdfa2f0..29545165a48 100644 --- a/dlls/ws2_32/ws2_32.spec +++ b/dlls/ws2_32/ws2_32.spec @@ -57,6 +57,7 @@ @ stdcall GetAddrInfoExOverlappedResult(ptr) @ stdcall GetAddrInfoExW(wstr wstr long ptr ptr ptr ptr ptr ptr ptr) @ stdcall GetAddrInfoW(wstr wstr ptr ptr) +@ stdcall GetHostNameW(ptr long) @ stdcall GetNameInfoW(ptr long ptr long ptr long long) @ stdcall InetNtopW(long ptr ptr long) @ stdcall InetPtonW(long wstr ptr) diff --git a/include/winsock2.h b/include/winsock2.h index e8d033976f4..1935c99ad40 100644 --- a/include/winsock2.h +++ b/include/winsock2.h @@ -695,6 +695,7 @@ typedef SOCKET (WINAPI *LPFN_SOCKET)(int,int,int); * "Winsock2 Function Typedefs" section below. */ #if WS_API_PROTOTYPES +int WINAPI GetHostNameW(WCHAR *, int); SOCKET WINAPI WSAAccept(SOCKET,struct WS(sockaddr)*,LPINT,LPCONDITIONPROC,DWORD_PTR); INT WINAPI WSAAddressToStringA(LPSOCKADDR,DWORD,LPWSAPROTOCOL_INFOA,LPSTR,LPDWORD); INT WINAPI WSAAddressToStringW(LPSOCKADDR,DWORD,LPWSAPROTOCOL_INFOW,LPWSTR,LPDWORD);

1 0

Zebediah Figura : ntoskrnl/tests: Add some tests for WM_DEVICECHANGE.
by Alexandre Julliard April 12, 2021

April 12, 2021

Module: wine Branch: master Commit: cac26c77c97abb1d8f5ff5660a66f2e20622049f URL: https://source.winehq.org/git/wine.git/?a=commit;h=cac26c77c97abb1d8f5ff566… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Apr 10 21:57:14 2021 -0500 ntoskrnl/tests: Add some tests for WM_DEVICECHANGE. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/Makefile.in | 2 +- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 115 +++++++++++++++++++++++++++++++++++- 2 files changed, 113 insertions(+), 4 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/Makefile.in b/dlls/ntoskrnl.exe/tests/Makefile.in index d911879ff99..7a5b2340907 100644 --- a/dlls/ntoskrnl.exe/tests/Makefile.in +++ b/dlls/ntoskrnl.exe/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = ntoskrnl.exe -IMPORTS = advapi32 crypt32 newdev setupapi wintrust ws2_32 +IMPORTS = advapi32 crypt32 newdev setupapi user32 wintrust ws2_32 driver_IMPORTS = winecrt0 ntoskrnl driver_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 571d983ae8d..3167478cbcb 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -35,6 +35,7 @@ #include "mssip.h" #include "setupapi.h" #include "newdev.h" +#include "dbt.h" #include "initguid.h" #include "devguid.h" #include "wine/test.h" @@ -984,20 +985,116 @@ static void add_file_to_catalog(HANDLE catalog, const WCHAR *file) } } -static void test_pnp_devices(void) +static const GUID control_class = {0xdeadbeef, 0x29ef, 0x4538, {0xa5, 0xfd, 0xb6, 0x95, 0x73, 0xa3, 0x62, 0xc0}}; +static const GUID bus_class = {0xdeadbeef, 0x29ef, 0x4538, {0xa5, 0xfd, 0xb6, 0x95, 0x73, 0xa3, 0x62, 0xc1}}; + +static unsigned int got_bus_arrival, got_bus_removal; + +static LRESULT WINAPI device_notify_proc(HWND window, UINT message, WPARAM wparam, LPARAM lparam) +{ + if (message != WM_DEVICECHANGE) + return DefWindowProcA(window, message, wparam, lparam); + + switch (wparam) + { + case DBT_DEVNODES_CHANGED: + if (winetest_debug > 1) trace("device nodes changed\n"); + + ok(InSendMessageEx(NULL) == ISMEX_NOTIFY, "got message flags %#x\n", InSendMessageEx(NULL)); + ok(!lparam, "got lparam %#Ix\n", lparam); + break; + + case DBT_DEVICEARRIVAL: + { + const DEV_BROADCAST_DEVICEINTERFACE_A *iface = (const DEV_BROADCAST_DEVICEINTERFACE_A *)lparam; + DWORD expect_size = offsetof(DEV_BROADCAST_DEVICEINTERFACE_A, dbcc_name[strlen(iface->dbcc_name)]); + + if (winetest_debug > 1) trace("device arrival %s\n", iface->dbcc_name); + + ok(InSendMessageEx(NULL) == ISMEX_SEND, "got message flags %#x\n", InSendMessageEx(NULL)); + + ok(iface->dbcc_devicetype == DBT_DEVTYP_DEVICEINTERFACE, + "got unexpected notification type %#x\n", iface->dbcc_devicetype); + ok(iface->dbcc_size >= expect_size, "expected size at least %u, got %u\n", expect_size, iface->dbcc_size); + ok(!iface->dbcc_reserved, "got reserved %#x\n", iface->dbcc_reserved); + if (IsEqualGUID(&iface->dbcc_classguid, &bus_class)) + { + ++got_bus_arrival; + todo_wine ok(!strcmp(iface->dbcc_name, "\\\\?\\ROOT#WINETEST#0#{deadbeef-29ef-4538-a5fd-b69573a362c1}"), + "got name %s\n", debugstr_a(iface->dbcc_name)); + } + break; + } + + case DBT_DEVICEREMOVECOMPLETE: + { + const DEV_BROADCAST_DEVICEINTERFACE_A *iface = (const DEV_BROADCAST_DEVICEINTERFACE_A *)lparam; + DWORD expect_size = offsetof(DEV_BROADCAST_DEVICEINTERFACE_A, dbcc_name[strlen(iface->dbcc_name)]); + + if (winetest_debug > 1) trace("device removal %s\n", iface->dbcc_name); + + ok(InSendMessageEx(NULL) == ISMEX_SEND, "got message flags %#x\n", InSendMessageEx(NULL)); + + ok(iface->dbcc_devicetype == DBT_DEVTYP_DEVICEINTERFACE, + "got unexpected notification type %#x\n", iface->dbcc_devicetype); + ok(iface->dbcc_size >= expect_size, "expected size at least %u, got %u\n", expect_size, iface->dbcc_size); + ok(!iface->dbcc_reserved, "got reserved %#x\n", iface->dbcc_reserved); + if (IsEqualGUID(&iface->dbcc_classguid, &bus_class)) + { + ++got_bus_removal; + todo_wine ok(!strcmp(iface->dbcc_name, "\\\\?\\ROOT#WINETEST#0#{deadbeef-29ef-4538-a5fd-b69573a362c1}"), + "got name %s\n", debugstr_a(iface->dbcc_name)); + } + break; + } + } + return DefWindowProcA(window, message, wparam, lparam); +} + +static void pump_messages(void) { - static const GUID control_class = {0xdeadbeef, 0x29ef, 0x4538, {0xa5, 0xfd, 0xb6, 0x95, 0x73, 0xa3, 0x62, 0xc0}}; - static const GUID bus_class = {0xdeadbeef, 0x29ef, 0x4538, {0xa5, 0xfd, 0xb6, 0x95, 0x73, 0xa3, 0x62, 0xc1}}; + MSG msg; + + if (!MsgWaitForMultipleObjects(0, NULL, FALSE, 200, QS_ALLINPUT)) + { + while (PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE)) + { + TranslateMessage(&msg); + DispatchMessageA(&msg); + } + } +} +static void test_pnp_devices(void) +{ char buffer[200]; SP_DEVICE_INTERFACE_DETAIL_DATA_A *iface_detail = (void *)buffer; SP_DEVICE_INTERFACE_DATA iface = {sizeof(iface)}; SP_DEVINFO_DATA device = {sizeof(device)}; + DEV_BROADCAST_DEVICEINTERFACE_A filter = + { + .dbcc_size = sizeof(filter), + .dbcc_devicetype = DBT_DEVTYP_DEVICEINTERFACE, + }; + static const WNDCLASSA class = + { + .lpszClassName = "ntoskrnl_test_wc", + .lpfnWndProc = device_notify_proc, + }; + HDEVNOTIFY notify_handle; + HANDLE window; HDEVINFO set; HANDLE bus; DWORD size; BOOL ret; + ret = RegisterClassA(&class); + ok(ret, "failed to register class\n"); + window = CreateWindowA("ntoskrnl_test_wc", NULL, 0, 0, 0, 0, 0, HWND_MESSAGE, NULL, NULL, NULL); + ok(!!window, "failed to create window\n"); + notify_handle = RegisterDeviceNotificationA(window, &filter, DEVICE_NOTIFY_ALL_INTERFACE_CLASSES); + ok(!!notify_handle, "failed to register window, error %u\n", GetLastError()); + set = SetupDiGetClassDevsA(&control_class, NULL, NULL, DIGCF_PRESENT | DIGCF_DEVICEINTERFACE); ok(set != INVALID_HANDLE_VALUE, "failed to get device list, error %#x\n", GetLastError()); @@ -1060,6 +1157,10 @@ static void test_pnp_devices(void) ret = DeviceIoControl(bus, IOCTL_WINETEST_BUS_ENABLE_IFACE, NULL, 0, NULL, 0, &size, NULL); ok(ret, "got error %u\n", GetLastError()); + pump_messages(); + ok(got_bus_arrival == 1, "got %u bus arrival messages\n", got_bus_arrival); + ok(!got_bus_removal, "got %u bus removal messages\n", got_bus_removal); + set = SetupDiGetClassDevsA(&bus_class, NULL, NULL, DIGCF_DEVICEINTERFACE | DIGCF_PRESENT); ok(set != INVALID_HANDLE_VALUE, "failed to get device list, error %#x\n", GetLastError()); ret = SetupDiEnumDeviceInterfaces(set, NULL, &bus_class, 0, &iface); @@ -1072,6 +1173,10 @@ static void test_pnp_devices(void) ret = DeviceIoControl(bus, IOCTL_WINETEST_BUS_DISABLE_IFACE, NULL, 0, NULL, 0, &size, NULL); ok(ret, "got error %u\n", GetLastError()); + pump_messages(); + ok(got_bus_arrival == 1, "got %u bus arrival messages\n", got_bus_arrival); + ok(got_bus_removal == 1, "got %u bus removal messages\n", got_bus_removal); + set = SetupDiGetClassDevsA(&bus_class, NULL, NULL, DIGCF_DEVICEINTERFACE); ok(set != INVALID_HANDLE_VALUE, "failed to get device list, error %#x\n", GetLastError()); ret = SetupDiEnumDeviceInterfaces(set, NULL, &bus_class, 0, &iface); @@ -1089,6 +1194,10 @@ static void test_pnp_devices(void) SetupDiDestroyDeviceInfoList(set); CloseHandle(bus); + + UnregisterDeviceNotification(notify_handle); + DestroyWindow(window); + UnregisterClassA("ntoskrnl_test_wc", GetModuleHandleA(NULL)); } static void test_pnp_driver(struct testsign_context *ctx)

1 0

Nikolay Sivov : comctl32/tests: Enable some ComboEx tests on version 6.
by Alexandre Julliard April 12, 2021

April 12, 2021

Module: wine Branch: master Commit: 302c891eeec046935db6657f20ba81f2c075db3e URL: https://source.winehq.org/git/wine.git/?a=commit;h=302c891eeec046935db6657f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 12 12:17:04 2021 +0300 comctl32/tests: Enable some ComboEx tests on version 6. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/combo.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/comctl32/tests/combo.c b/dlls/comctl32/tests/combo.c index 63470a50ff7..4102191e2f6 100644 --- a/dlls/comctl32/tests/combo.c +++ b/dlls/comctl32/tests/combo.c @@ -1391,6 +1391,11 @@ START_TEST(combo) return; } + test_comboex(); + test_comboex_CB_GETLBTEXT(); + test_comboex_WM_WINDOWPOSCHANGING(); + test_comboex_get_set_item(); + /* ComboBox control tests. */ test_combo_WS_VSCROLL(); test_combo_setfont(CBS_DROPDOWN);

1 0

Zebediah Figura : ntoskrnl/tests: Handle IRP_MJ_POWER requests.
by Alexandre Julliard April 12, 2021

April 12, 2021

Module: wine Branch: master Commit: 8417f634a6844cc8232caf27bc29c3c8ceceec72 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8417f634a6844cc8232caf27… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Apr 10 21:57:19 2021 -0500 ntoskrnl/tests: Handle IRP_MJ_POWER requests. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/driver_pnp.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/dlls/ntoskrnl.exe/tests/driver_pnp.c b/dlls/ntoskrnl.exe/tests/driver_pnp.c index 34b21e4de48..75b03e17f47 100644 --- a/dlls/ntoskrnl.exe/tests/driver_pnp.c +++ b/dlls/ntoskrnl.exe/tests/driver_pnp.c @@ -308,6 +308,34 @@ static NTSTATUS WINAPI driver_pnp(DEVICE_OBJECT *device, IRP *irp) return pdo_pnp(device, irp); } +static NTSTATUS WINAPI driver_power(DEVICE_OBJECT *device, IRP *irp) +{ + IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation(irp); + NTSTATUS ret = STATUS_NOT_SUPPORTED; + + /* We do not expect power IRPs as part of normal operation. */ + ok(0, "unexpected call\n"); + + if (device == bus_fdo) + { + PoStartNextPowerIrp(irp); + IoSkipCurrentIrpStackLocation(irp); + return PoCallDriver(bus_pdo, irp); + } + + if (stack->MinorFunction == IRP_MN_SET_POWER) + { + if (stack->Parameters.Power.Type == DevicePowerState) + PoSetPowerState(device, DevicePowerState, stack->Parameters.Power.State); + ret = STATUS_SUCCESS; + } + + PoStartNextPowerIrp(irp); + irp->IoStatus.Status = ret; + IoCompleteRequest(irp, IO_NO_INCREMENT); + return ret; +} + static void test_bus_query_caps(DEVICE_OBJECT *top_device) { DEVICE_CAPABILITIES caps; @@ -633,6 +661,7 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, UNICODE_STRING *registry) driver->DriverExtension->AddDevice = driver_add_device; driver->DriverUnload = driver_unload; driver->MajorFunction[IRP_MJ_PNP] = driver_pnp; + driver->MajorFunction[IRP_MJ_POWER] = driver_power; driver->MajorFunction[IRP_MJ_DEVICE_CONTROL] = driver_ioctl; driver->MajorFunction[IRP_MJ_CREATE] = driver_create; driver->MajorFunction[IRP_MJ_CLOSE] = driver_close;

1 0

Nikolay Sivov : mf/tests: Add some SAR supported interfaces checks.
by Alexandre Julliard April 12, 2021

April 12, 2021

Module: wine Branch: master Commit: aaf520cf5efe41f015b1cbbfad7c1cadb392fc9c URL: https://source.winehq.org/git/wine.git/?a=commit;h=aaf520cf5efe41f015b1cbbf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 12 12:19:52 2021 +0300 mf/tests: Add some SAR supported interfaces checks. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 458da0cb275..20440499227 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -3878,7 +3878,10 @@ if (SUCCEEDED(hr)) check_interface(sink, &IID_IMFClockStateSink, TRUE); check_interface(sink, &IID_IMFGetService, TRUE); todo_wine check_interface(sink, &IID_IMFPresentationTimeSource, TRUE); + todo_wine check_service_interface(sink, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateSupport, TRUE); + check_service_interface(sink, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateControl, FALSE); check_service_interface(sink, &MR_POLICY_VOLUME_SERVICE, &IID_IMFSimpleAudioVolume, TRUE); + check_service_interface(sink, &MR_STREAM_VOLUME_SERVICE, &IID_IMFAudioStreamVolume, TRUE); /* Clock */ hr = IMFMediaSink_QueryInterface(sink, &IID_IMFClockStateSink, (void **)&state_sink);

1 0

Nikolay Sivov : comctl32/tests: Add some tests for ComboEx callback functionality.
by Alexandre Julliard April 12, 2021

April 12, 2021

Module: wine Branch: master Commit: 0bb8ddfd413587f515cf55c9213ab5bf53aa0a25 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0bb8ddfd413587f515cf55c9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 12 12:17:05 2021 +0300 comctl32/tests: Add some tests for ComboEx callback functionality. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/combo.c | 159 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 155 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/tests/combo.c b/dlls/comctl32/tests/combo.c index 4102191e2f6..69232a3d4bd 100644 --- a/dlls/comctl32/tests/combo.c +++ b/dlls/comctl32/tests/combo.c @@ -27,8 +27,12 @@ #include "v6util.h" #include "msg.h" -#define EDITBOX_SEQ_INDEX 0 -#define NUM_MSG_SEQUENCES 1 +enum message_seq_index +{ + EDITBOX_SEQ_INDEX = 0, + PARENT_SEQ_INDEX, + NUM_MSG_SEQUENCES, +}; #define EDITBOX_ID 0 #define COMBO_ID 1995 @@ -442,10 +446,29 @@ static void test_comboex_WM_WINDOWPOSCHANGING(void) ok(ret, "DestroyWindow failed\n"); } -static LRESULT ComboExTestOnNotify(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +struct di_context { + unsigned int mask; + BOOL set_CBEIF_DI_SETITEM; +}; + +static struct di_context di_context; + +static LRESULT ComboExTestOnNotify(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + struct message msg; NMHDR *hdr = (NMHDR*)lParam; - switch(hdr->code){ + + msg.message = message; + msg.flags = sent|wparam|lparam; + msg.wParam = wParam; + msg.lParam = lParam; + if (hdr) msg.id = hdr->code; + + add_message(sequences, PARENT_SEQ_INDEX, &msg); + + switch (hdr->code) + { case CBEN_ENDEDITA: { NMCBEENDEDITA *edit_info = (NMCBEENDEDITA*)hdr; @@ -462,6 +485,42 @@ static LRESULT ComboExTestOnNotify(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lP } break; } + case CBEN_GETDISPINFOA: + case CBEN_GETDISPINFOW: + { + NMCOMBOBOXEXA *item = (NMCOMBOBOXEXA *)hdr; + + di_context.mask = item->ceItem.mask; + + if (item->ceItem.mask & CBEIF_IMAGE) + { + ok(item->ceItem.iImage == I_IMAGECALLBACK, "Unexpected iImage %d.\n", item->ceItem.iImage); + item->ceItem.iImage = 123; + } + + if (item->ceItem.mask & CBEIF_TEXT) + { + ok(item->ceItem.pszText && item->ceItem.pszText != LPSTR_TEXTCALLBACKA, + "Unexpected pszText %p.\n", item->ceItem.pszText); + ok(item->ceItem.cchTextMax == 0, "Unexpected cchTextMax %d.\n", item->ceItem.cchTextMax); + } + + if (item->ceItem.mask & CBEIF_SELECTEDIMAGE) + ok(item->ceItem.iSelectedImage == I_IMAGECALLBACK, "Unexpected iSelectedImage %d.\n", + item->ceItem.iSelectedImage); + + if (item->ceItem.mask & CBEIF_OVERLAY) + ok(item->ceItem.iOverlay == I_IMAGECALLBACK, "Unexpected iOverlay %d.\n", + item->ceItem.iOverlay); + + if (item->ceItem.mask & CBEIF_INDENT) + ok(item->ceItem.iIndent == 0, "Unexpected iIndent %d.\n", item->ceItem.iIndent); + + if (di_context.set_CBEIF_DI_SETITEM) + item->ceItem.mask |= CBEIF_DI_SETITEM; + + break; + } } return 0; } @@ -1365,6 +1424,96 @@ static void test_combo_ctlcolor(void) DestroyWindow(combo); } +static const struct message getdisp_parent_seq[] = +{ + { WM_NOTIFY, sent|id, 0, 0, CBEN_GETDISPINFOA }, + { 0 } +}; + +static const struct message empty_seq[] = +{ + { 0 } +}; + +static void test_comboex_CBEN_GETDISPINFO(void) +{ + static const unsigned int test_masks[] = + { + CBEIF_TEXT, + CBEIF_IMAGE, + CBEIF_INDENT, + CBEIF_OVERLAY, + CBEIF_SELECTEDIMAGE, + CBEIF_IMAGE | CBEIF_INDENT, + }; + COMBOBOXEXITEMA item; + unsigned int i; + HWND combo; + DWORD res; + + combo = createComboEx(WS_BORDER | WS_VISIBLE | WS_CHILD | CBS_DROPDOWN); + ok(!!combo, "Failed to create control window.\n"); + + /* All possible callback fields. */ + memset(&item, 0, sizeof(item)); + item.mask = CBEIF_TEXT | CBEIF_IMAGE | CBEIF_INDENT | CBEIF_OVERLAY | CBEIF_SELECTEDIMAGE; + item.pszText = LPSTR_TEXTCALLBACKA; + item.iImage = I_IMAGECALLBACK; + item.iSelectedImage = I_IMAGECALLBACK; + item.iOverlay = I_IMAGECALLBACK; + item.iIndent = I_INDENTCALLBACK; + + res = SendMessageA(combo, CBEM_INSERTITEMA, 0, (LPARAM)&item); + ok(!res, "Unexpected return value %u.\n", res); + + for (i = 0; i < ARRAY_SIZE(test_masks); ++i) + { + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + memset(&item, 0, sizeof(item)); + item.mask = test_masks[i]; + res = SendMessageA(combo, CBEM_GETITEMA, 0, (LPARAM)&item); + ok(res == 1, "Unexpected return value %u.\n", res); + + ok_sequence(sequences, PARENT_SEQ_INDEX, getdisp_parent_seq, "Get disp mask seq", TRUE); + } + + di_context.set_CBEIF_DI_SETITEM = TRUE; + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + memset(&item, 0, sizeof(item)); + item.mask = CBEIF_IMAGE; + di_context.mask = 0; + res = SendMessageA(combo, CBEM_GETITEMA, 0, (LPARAM)&item); + ok(res == 1, "Unexpected return value %u.\n", res); +todo_wine + ok(di_context.mask == CBEIF_IMAGE, "Unexpected mask %#x.\n", di_context.mask); + + ok_sequence(sequences, PARENT_SEQ_INDEX, getdisp_parent_seq, "Get disp DI_SETITEM seq", TRUE); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + memset(&item, 0, sizeof(item)); + item.mask = CBEIF_IMAGE; + res = SendMessageA(combo, CBEM_GETITEMA, 0, (LPARAM)&item); + ok(res == 1, "Unexpected return value %u.\n", res); + ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, "Get disp after DI_SETITEM seq", FALSE); + + /* Request two fields, one was set. */ + memset(&item, 0, sizeof(item)); + item.mask = CBEIF_IMAGE | CBEIF_INDENT; + di_context.mask = 0; + res = SendMessageA(combo, CBEM_GETITEMA, 0, (LPARAM)&item); + ok(res == 1, "Unexpected return value %u.\n", res); +todo_wine + ok(di_context.mask == CBEIF_INDENT, "Unexpected mask %#x.\n", di_context.mask); + + di_context.set_CBEIF_DI_SETITEM = FALSE; + + DestroyWindow(combo); +} + START_TEST(combo) { ULONG_PTR ctx_cookie; @@ -1384,6 +1533,7 @@ START_TEST(combo) test_comboex_WM_WINDOWPOSCHANGING(); test_comboex_subclass(); test_comboex_get_set_item(); + test_comboex_CBEN_GETDISPINFO(); if (!load_v6_module(&ctx_cookie, &hCtx)) { @@ -1395,6 +1545,7 @@ START_TEST(combo) test_comboex_CB_GETLBTEXT(); test_comboex_WM_WINDOWPOSCHANGING(); test_comboex_get_set_item(); + test_comboex_CBEN_GETDISPINFO(); /* ComboBox control tests. */ test_combo_WS_VSCROLL();

1 0

Nikolay Sivov : comctl32/tests: Remove unnecessary macro.
by Alexandre Julliard April 12, 2021

April 12, 2021

Module: wine Branch: master Commit: b6b98933ece4dbe0d5c04fa0fe751dfdb0cf55e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6b98933ece4dbe0d5c04fa0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 12 12:17:06 2021 +0300 comctl32/tests: Remove unnecessary macro. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/combo.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/tests/combo.c b/dlls/comctl32/tests/combo.c index 69232a3d4bd..69cc7680827 100644 --- a/dlls/comctl32/tests/combo.c +++ b/dlls/comctl32/tests/combo.c @@ -37,8 +37,6 @@ enum message_seq_index #define EDITBOX_ID 0 #define COMBO_ID 1995 -#define expect(expected, got) ok(got == expected, "Expected %d, got %d\n", expected, got) - #define expect_rect(r, _left, _top, _right, _bottom) ok(r.left == _left && r.top == _top && \ r.bottom == _bottom && r.right == _right, "Invalid rect %s vs (%d,%d)-(%d,%d)\n", \ wine_dbgstr_rect(&r), _left, _top, _right, _bottom); @@ -631,7 +629,7 @@ static void test_comboex_get_set_item(void) char textA[] = "test"; HWND hComboEx; COMBOBOXEXITEMA item; - BOOL ret; + DWORD ret; hComboEx = createComboEx(WS_BORDER | WS_VISIBLE | WS_CHILD | CBS_DROPDOWN); @@ -644,7 +642,7 @@ static void test_comboex_get_set_item(void) item.pszText = textA; item.iItem = -1; ret = SendMessageA(hComboEx, CBEM_SETITEMA, 0, (LPARAM)&item); - expect(TRUE, ret); + ok(ret == 1, "Unexpected return value %d.\n", ret); ok_sequence(sequences, EDITBOX_SEQ_INDEX, test_setitem_edit_seq, "set item data for edit", FALSE); @@ -653,16 +651,16 @@ static void test_comboex_get_set_item(void) item.iItem = -1; item.lParam = 0xdeadbeef; ret = SendMessageA(hComboEx, CBEM_GETITEMA, 0, (LPARAM)&item); - expect(TRUE, ret); + ok(ret == 1, "Unexpected return value %d.\n", ret); ok(item.lParam == 0, "Expected zero, got %lx\n", item.lParam); item.lParam = 0x1abe11ed; ret = SendMessageA(hComboEx, CBEM_SETITEMA, 0, (LPARAM)&item); - expect(TRUE, ret); + ok(ret == 1, "Unexpected return value %d.\n", ret); item.lParam = 0; ret = SendMessageA(hComboEx, CBEM_GETITEMA, 0, (LPARAM)&item); - expect(TRUE, ret); + ok(ret == 1, "Unexpected return value %d.\n", ret); ok(item.lParam == 0x1abe11ed, "Expected 0x1abe11ed, got %lx\n", item.lParam); DestroyWindow(hComboEx);

1 0