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

Hans Leidekker : ws2_32: Implement GetHostNameW.
by Alexandre Julliard 12 Apr '21

12 Apr '21

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 12 Apr '21

12 Apr '21

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

Zebediah Figura : ntoskrnl/tests: Test child device enumeration.
by Alexandre Julliard 12 Apr '21

12 Apr '21

Module: wine Branch: master Commit: 5e63c849b4f4a4198955cc80b50efc32e5877ea7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e63c849b4f4a4198955cc80… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Apr 10 21:57:15 2021 -0500 ntoskrnl/tests: Test child device enumeration. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/pnp.c | 4 +- dlls/ntoskrnl.exe/tests/Makefile.in | 2 +- dlls/ntoskrnl.exe/tests/driver.h | 4 + dlls/ntoskrnl.exe/tests/driver_pnp.c | 295 +++++++++++++++++++++++++++++++++++ dlls/ntoskrnl.exe/tests/ntoskrnl.c | 131 +++++++++++++++- include/cfgmgr32.h | 12 ++ include/ddk/wdm.h | 6 +- 7 files changed, 447 insertions(+), 7 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5e63c849b4f4a4198955…

1 0

Zebediah Figura : wineusb.sys: Report RawDeviceOK in IRP_MN_QUERY_CAPABILITIES.
by Alexandre Julliard 12 Apr '21

12 Apr '21

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

Zebediah Figura : ntoskrnl: Start the device even without a function driver if it reports RawDeviceOK.
by Alexandre Julliard 12 Apr '21

12 Apr '21

Module: wine Branch: master Commit: 48b2e67d095d6c133de94e5545efbc85c58a01d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=48b2e67d095d6c133de94e55… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Apr 10 21:57:17 2021 -0500 ntoskrnl: Start the device even without a function driver if it reports RawDeviceOK. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/pnp.c | 43 +++++++++++++++++- dlls/ntoskrnl.exe/tests/driver_pnp.c | 2 +- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 88 +++++++++++++++++++----------------- 3 files changed, 89 insertions(+), 44 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=48b2e67d095d6c133de9…

1 0

Zebediah Figura : ntoskrnl: Do not send power IRPs on device start and removal.
by Alexandre Julliard 12 Apr '21

12 Apr '21

Module: wine Branch: master Commit: 94037f90a01a489d404ebfe80e5b1ce2263453d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=94037f90a01a489d404ebfe8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Apr 10 21:57:18 2021 -0500 ntoskrnl: Do not send power IRPs on device start and removal. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/pnp.c | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c index f8dc8c31935..0d9d816e3c0 100644 --- a/dlls/ntoskrnl.exe/pnp.c +++ b/dlls/ntoskrnl.exe/pnp.c @@ -141,30 +141,6 @@ static NTSTATUS get_device_instance_id( DEVICE_OBJECT *device, WCHAR *buffer ) return STATUS_SUCCESS; } -static void send_power_irp( DEVICE_OBJECT *device, DEVICE_POWER_STATE power ) -{ - IO_STATUS_BLOCK irp_status; - IO_STACK_LOCATION *irpsp; - KEVENT event; - IRP *irp; - - device = IoGetAttachedDevice( device ); - - KeInitializeEvent( &event, NotificationEvent, FALSE ); - if (!(irp = IoBuildSynchronousFsdRequest( IRP_MJ_POWER, device, NULL, 0, NULL, &event, &irp_status ))) - return; - - irpsp = IoGetNextIrpStackLocation( irp ); - irpsp->MinorFunction = IRP_MN_SET_POWER; - - irpsp->Parameters.Power.Type = DevicePowerState; - irpsp->Parameters.Power.State.DeviceState = power; - - irp->IoStatus.u.Status = STATUS_NOT_SUPPORTED; - if (IoCallDriver( device, irp ) == STATUS_PENDING) - KeWaitForSingleObject( &event, Executive, KernelMode, FALSE, NULL ); -} - static NTSTATUS get_device_caps( DEVICE_OBJECT *device, DEVICE_CAPABILITIES *caps ) { IO_STACK_LOCATION *irpsp; @@ -317,10 +293,7 @@ static void start_device( DEVICE_OBJECT *device, HDEVINFO set, SP_DEVINFO_DATA * { load_function_driver( device, set, sp_device ); if (device->DriverObject) - { send_pnp_irp( device, IRP_MN_START_DEVICE ); - send_power_irp( device, PowerDeviceD0 ); - } } static void enumerate_new_device( DEVICE_OBJECT *device, HDEVINFO set ) @@ -384,7 +357,6 @@ static void remove_device( DEVICE_OBJECT *device ) remove_device( wine_device->children->Objects[i] ); } - send_power_irp( device, PowerDeviceD3 ); send_pnp_irp( device, IRP_MN_SURPRISE_REMOVAL ); send_pnp_irp( device, IRP_MN_REMOVE_DEVICE ); }

1 0

Zebediah Figura : ntoskrnl/tests: Handle IRP_MJ_POWER requests.
by Alexandre Julliard 12 Apr '21

12 Apr '21

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

Esme Povirk : kernel32: Add stub for GetMaximumProcessorGroupCount.
by Alexandre Julliard 12 Apr '21

12 Apr '21

Module: wine Branch: master Commit: 773161f84b9e413e74b6bea750ca5e35b0549941 URL: https://source.winehq.org/git/wine.git/?a=commit;h=773161f84b9e413e74b6bea7… Author: Esme Povirk <esme(a)codeweavers.com> Date: Fri Apr 9 15:05:29 2021 -0500 kernel32: Add stub for GetMaximumProcessorGroupCount. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-kernel32-legacy-l1-1-0.spec | 2 +- .../api-ms-win-core-kernel32-legacy-l1-1-1.spec | 2 +- .../api-ms-win-downlevel-kernel32-l2-1-0.spec | 2 +- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/process.c | 9 +++++++++ 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-core-kernel32-legacy-l1-1-0/api-ms-win-core-kernel32-legacy-l1-1-0.spec b/dlls/api-ms-win-core-kernel32-legacy-l1-1-0/api-ms-win-core-kernel32-legacy-l1-1-0.spec index e653ac6d212..b6af37ab0aa 100644 --- a/dlls/api-ms-win-core-kernel32-legacy-l1-1-0/api-ms-win-core-kernel32-legacy-l1-1-0.spec +++ b/dlls/api-ms-win-core-kernel32-legacy-l1-1-0/api-ms-win-core-kernel32-legacy-l1-1-0.spec @@ -21,7 +21,7 @@ @ stdcall GetComputerNameW(ptr ptr) kernel32.GetComputerNameW @ stdcall GetConsoleWindow() kernel32.GetConsoleWindow @ stub GetDurationFormatEx -@ stub GetMaximumProcessorGroupCount +@ stdcall GetMaximumProcessorGroupCount() kernel32.GetMaximumProcessorGroupCount @ stdcall GetNamedPipeClientProcessId(long ptr) kernel32.GetNamedPipeClientProcessId @ stdcall GetNamedPipeServerProcessId(long ptr) kernel32.GetNamedPipeServerProcessId @ stdcall GetShortPathNameA(str ptr long) kernel32.GetShortPathNameA diff --git a/dlls/api-ms-win-core-kernel32-legacy-l1-1-1/api-ms-win-core-kernel32-legacy-l1-1-1.spec b/dlls/api-ms-win-core-kernel32-legacy-l1-1-1/api-ms-win-core-kernel32-legacy-l1-1-1.spec index 4998af04d9b..5ce8e24713b 100644 --- a/dlls/api-ms-win-core-kernel32-legacy-l1-1-1/api-ms-win-core-kernel32-legacy-l1-1-1.spec +++ b/dlls/api-ms-win-core-kernel32-legacy-l1-1-1/api-ms-win-core-kernel32-legacy-l1-1-1.spec @@ -26,7 +26,7 @@ @ stub GetDurationFormatEx @ stub GetFileAttributesTransactedW @ stub GetFirmwareType -@ stub GetMaximumProcessorGroupCount +@ stdcall GetMaximumProcessorGroupCount() kernel32.GetMaximumProcessorGroupCount @ stdcall GetNamedPipeClientProcessId(long ptr) kernel32.GetNamedPipeClientProcessId @ stdcall GetNamedPipeServerProcessId(long ptr) kernel32.GetNamedPipeServerProcessId @ stdcall GetNumaAvailableMemoryNodeEx(long ptr) kernel32.GetNumaAvailableMemoryNodeEx diff --git a/dlls/api-ms-win-downlevel-kernel32-l2-1-0/api-ms-win-downlevel-kernel32-l2-1-0.spec b/dlls/api-ms-win-downlevel-kernel32-l2-1-0/api-ms-win-downlevel-kernel32-l2-1-0.spec index 750badec24b..042bb066b9e 100644 --- a/dlls/api-ms-win-downlevel-kernel32-l2-1-0/api-ms-win-downlevel-kernel32-l2-1-0.spec +++ b/dlls/api-ms-win-downlevel-kernel32-l2-1-0/api-ms-win-downlevel-kernel32-l2-1-0.spec @@ -33,7 +33,7 @@ @ stdcall GetConsoleWindow() kernel32.GetConsoleWindow @ stub GetDurationFormatEx @ stdcall GetFirmwareEnvironmentVariableW(wstr wstr ptr long) kernel32.GetFirmwareEnvironmentVariableW -@ stub GetMaximumProcessorGroupCount +@ stdcall GetMaximumProcessorGroupCount() kernel32.GetMaximumProcessorGroupCount @ stdcall GetNamedPipeClientProcessId(long ptr) kernel32.GetNamedPipeClientProcessId @ stdcall GetNamedPipeServerProcessId(long ptr) kernel32.GetNamedPipeServerProcessId @ stdcall GetPrivateProfileIntA(str str long str) kernel32.GetPrivateProfileIntA diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 0312e044a86..06f524a8080 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -719,7 +719,7 @@ @ stdcall -import GetLongPathNameW(wstr ptr long) @ stdcall GetMailslotInfo(long ptr ptr ptr ptr) @ stdcall GetMaximumProcessorCount(long) -# @ stub GetMaximumProcessorGroupCount +@ stdcall GetMaximumProcessorGroupCount() @ stdcall -import GetModuleFileNameA(long ptr long) @ stdcall -import GetModuleFileNameW(long ptr long) @ stdcall -import GetModuleHandleA(str) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 41a5b34af19..f07a997bea3 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -635,6 +635,15 @@ DWORD WINAPI GetMaximumProcessorCount(WORD group) return cpus; } +/*********************************************************************** + * GetMaximumProcessorGroupCount (KERNEL32.@) + */ +DWORD WINAPI GetMaximumProcessorGroupCount(void) +{ + FIXME("semi-stub, always returning 1\n"); + return 1; +} + /*********************************************************************** * GetFirmwareEnvironmentVariableA (KERNEL32.@) */

1 0

Paul Gofman : kernel32: Implement PackageIdFromFullName().
by Alexandre Julliard 12 Apr '21

12 Apr '21

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

Anton Baskanov : amstream: Implement MediaStreamFilter::EndOfStream.
by Alexandre Julliard 12 Apr '21

12 Apr '21

Module: wine Branch: master Commit: eea53b3c400db5f66de95d1f6c526233bc036ace URL: https://source.winehq.org/git/wine.git/?a=commit;h=eea53b3c400db5f66de95d1f… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Sun Apr 11 14:35:28 2021 +0700 amstream: Implement MediaStreamFilter::EndOfStream. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/filter.c | 42 ++++++++++++++++++++++-- dlls/amstream/tests/amstream.c | 72 +++++++++++++++++++++--------------------- 2 files changed, 76 insertions(+), 38 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=eea53b3c400db5f66de9…

1 0