wine-commits April 2021

wine-commits@winehq.org

2 participants
865 discussions

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/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 : 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

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

Hugh McMaster : po: Remove duplicate line in Dutch translation.
by Alexandre Julliard 12 Apr '21

12 Apr '21

Module: wine Branch: master Commit: 6f7d8a73158cabe192ce6bb4da15f231e8acf4ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f7d8a73158cabe192ce6bb4… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Apr 12 16:21:47 2021 +1000 po: Remove duplicate line in Dutch translation. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nl.po | 1 - 1 file changed, 1 deletion(-) diff --git a/po/nl.po b/po/nl.po index e5ea842cfea..b212ed1736e 100644 --- a/po/nl.po +++ b/po/nl.po @@ -14785,7 +14785,6 @@ msgid "" " Access the registry using the 64-bit view.\n" "\n" msgstr "" -" /reg:32\n" " /reg:32\n" " Open de 32-bits weergave van het register.\n" "\n"

1 0

Nikolay Sivov : include: Remove duplicated ComboEx item mask flags.
by Alexandre Julliard 12 Apr '21

12 Apr '21

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

Nikolay Sivov : sc: Fix typos in CLI arguments parsing.
by Alexandre Julliard 12 Apr '21

12 Apr '21

Module: wine Branch: master Commit: d3ddc1186467172c564169e054a82c9f97e99c59 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d3ddc1186467172c564169e0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Apr 11 22:09:01 2021 +0300 sc: Fix typos in CLI arguments parsing. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/sc/sc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/sc/sc.c b/programs/sc/sc.c index a20813b8cd5..02b476957d6 100644 --- a/programs/sc/sc.c +++ b/programs/sc/sc.c @@ -82,7 +82,7 @@ static BOOL parse_create_params( int argc, const WCHAR *argv[], struct create_pa if (!wcsicmp( argv[i + 1], L"rec" )) cp->type = SERVICE_RECOGNIZER_DRIVER; if (!wcsicmp( argv[i + 1], L"interact" )) cp->type |= SERVICE_INTERACTIVE_PROCESS; } - if (!wcsicmp( argv[i], L"start="L"start" ) && i < argc - 1) + if (!wcsicmp( argv[i], L"start=" ) && i < argc - 1) { if (!wcsicmp( argv[i + 1], L"boot" )) cp->start = SERVICE_BOOT_START; if (!wcsicmp( argv[i + 1], L"system" )) cp->start = SERVICE_SYSTEM_START; @@ -134,7 +134,7 @@ static BOOL parse_failure_actions( const WCHAR *arg, SERVICE_FAILURE_ACTIONSW *f { if (!wcsicmp( p, L"run" )) fa->lpsaActions[i].Type = SC_ACTION_RUN_COMMAND; else if (!wcsicmp( p, L"restart" )) fa->lpsaActions[i].Type = SC_ACTION_RESTART; - else if (!wcsicmp( p, L"reboot="L"reboot" )) fa->lpsaActions[i].Type = SC_ACTION_REBOOT; + else if (!wcsicmp( p, L"reboot" )) fa->lpsaActions[i].Type = SC_ACTION_REBOOT; else fa->lpsaActions[i].Type = SC_ACTION_NONE; p += lstrlenW( p ) + 1; @@ -159,7 +159,7 @@ static BOOL parse_failure_params( int argc, const WCHAR *argv[], SERVICE_FAILURE for (i = 0; i < argc; i++) { if (!wcsicmp( argv[i], L"reset=" ) && i < argc - 1) fa->dwResetPeriod = wcstol( argv[i + 1], NULL, 10 ); - if (!wcsicmp( argv[i], L"reboot="L"reboot" ) && i < argc - 1) fa->lpRebootMsg = (WCHAR *)argv[i + 1]; + if (!wcsicmp( argv[i], L"reboot=" ) && i < argc - 1) fa->lpRebootMsg = (WCHAR *)argv[i + 1]; if (!wcsicmp( argv[i], L"command=" ) && i < argc - 1) fa->lpCommand = (WCHAR *)argv[i + 1]; if (!wcsicmp( argv[i], L"actions=" )) { @@ -264,7 +264,7 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) } else WINE_TRACE("failed to open service %u\n", GetLastError()); } - else if (!wcsicmp( argv[1], L"start="L"start" )) + else if (!wcsicmp( argv[1], L"start" )) { service = OpenServiceW( manager, argv[2], SERVICE_START ); if (service)

1 0

Anton Baskanov : quartz: Use a separate critical section for events.
by Alexandre Julliard 12 Apr '21

12 Apr '21

Module: wine Branch: master Commit: 86cbfa4bea7199ffa1507420b7f5b1f3c3a70a77 URL: https://source.winehq.org/git/wine.git/?a=commit;h=86cbfa4bea7199ffa1507420… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Sat Apr 10 11:45:35 2021 -0500 quartz: Use a separate critical section for events. This undoes dc836b85c1458c916c5ad3b86ff8df59ce634dd9. 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/quartz/filtergraph.c | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index a8c6cc3391c..825bef9e12e 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -104,6 +104,11 @@ struct filter_graph IReferenceClock *refClock; IBaseFilter *refClockProvider; + /* We may indirectly wait for streaming threads while holding graph->cs in + * IMediaFilter::Stop() or IMediaSeeking::SetPositions(). Since streaming + * threads call IMediaEventSink::Notify() to queue EC_COMPLETE, we must + * use a separate lock to avoid them deadlocking on graph->cs. */ + CRITICAL_SECTION event_cs; struct list media_events; HANDLE media_event_handle; HWND media_event_window; @@ -116,6 +121,8 @@ struct filter_graph int HandleEcComplete; int HandleEcRepaint; int HandleEcClockChanged; + unsigned int got_ec_complete : 1; + unsigned int media_events_disabled : 1; CRITICAL_SECTION cs; ITF_CACHE_ENTRY ItfCacheEntries[MAX_ITF_CACHE_ENTRIES]; @@ -135,8 +142,6 @@ struct filter_graph LONGLONG current_pos; unsigned int needs_async_run : 1; - unsigned int got_ec_complete : 1; - unsigned int media_events_disabled : 1; }; struct enum_filters @@ -467,6 +472,7 @@ static ULONG WINAPI FilterGraphInner_Release(IUnknown *iface) CloseHandle(This->message_thread); CloseHandle(This->message_thread_ret); } + DeleteCriticalSection(&This->event_cs); DeleteCriticalSection(&This->cs); free(This); @@ -1695,8 +1701,10 @@ static HRESULT graph_start(struct filter_graph *graph, REFERENCE_TIME stream_sta struct filter *filter; HRESULT hr = S_OK; + EnterCriticalSection(&graph->event_cs); graph->EcCompleteCount = 0; update_render_count(graph); + LeaveCriticalSection(&graph->event_cs); LIST_FOR_EACH_ENTRY_SAFE(event, next, &graph->media_events, struct media_event, entry) { @@ -1813,7 +1821,10 @@ static HRESULT WINAPI MediaControl_Run(IMediaControl *iface) } sort_filters(graph); + + EnterCriticalSection(&graph->event_cs); update_render_count(graph); + LeaveCriticalSection(&graph->event_cs); if (graph->state == State_Stopped) { @@ -4752,12 +4763,12 @@ static HRESULT WINAPI MediaEvent_GetEvent(IMediaEventEx *iface, LONG *code, if (WaitForSingleObject(graph->media_event_handle, timeout)) return E_ABORT; - EnterCriticalSection(&graph->cs); + EnterCriticalSection(&graph->event_cs); if (!(entry = list_head(&graph->media_events))) { ResetEvent(graph->media_event_handle); - LeaveCriticalSection(&graph->cs); + LeaveCriticalSection(&graph->event_cs); return E_ABORT; } event = LIST_ENTRY(entry, struct media_event, entry); @@ -4767,7 +4778,7 @@ static HRESULT WINAPI MediaEvent_GetEvent(IMediaEventEx *iface, LONG *code, *param2 = event->param2; free(event); - LeaveCriticalSection(&graph->cs); + LeaveCriticalSection(&graph->event_cs); return S_OK; } @@ -5015,7 +5026,10 @@ static HRESULT WINAPI MediaFilter_Pause(IMediaFilter *iface) } sort_filters(graph); + + EnterCriticalSection(&graph->event_cs); update_render_count(graph); + LeaveCriticalSection(&graph->event_cs); if (graph->defaultclock && !graph->refClock) IFilterGraph2_SetDefaultSyncSource(&graph->IFilterGraph2_iface); @@ -5261,7 +5275,7 @@ static HRESULT WINAPI MediaEventSink_Notify(IMediaEventSink *iface, LONG code, TRACE("graph %p, code %#x, param1 %#Ix, param2 %#Ix.\n", graph, code, param1, param2); - EnterCriticalSection(&graph->cs); + EnterCriticalSection(&graph->event_cs); if (code == EC_COMPLETE && graph->HandleEcComplete) { @@ -5285,7 +5299,7 @@ static HRESULT WINAPI MediaEventSink_Notify(IMediaEventSink *iface, LONG code, queue_media_event(graph, code, param1, param2); } - LeaveCriticalSection(&graph->cs); + LeaveCriticalSection(&graph->event_cs); return S_OK; } @@ -5591,6 +5605,8 @@ static HRESULT filter_graph_common_create(IUnknown *outer, IUnknown **out, BOOL InitializeCriticalSection(&object->cs); object->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": filter_graph.cs"); + InitializeCriticalSection(&object->event_cs); + object->event_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": filter_graph.event_cs"); object->defaultclock = TRUE;

1 0

Anton Baskanov : amstream/tests: Add more tests for IMediaStreamFilter::EndOfStream.
by Alexandre Julliard 12 Apr '21

12 Apr '21

Module: wine Branch: master Commit: 4fb348315fb203593b8e801de4e2c1b55aa1a7d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4fb348315fb203593b8e801d… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Sat Apr 10 02:02:55 2021 +0700 amstream/tests: Add more tests for IMediaStreamFilter::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/tests/amstream.c | 97 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 97 insertions(+) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index bf0a0016beb..79cc4f52801 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -7027,6 +7027,35 @@ static void test_mediastreamfilter_end_of_stream(void) todo_wine ok(graph.got_notify == 1, "Got %d calls to IMediaEventSink::Notify().\n", graph.got_notify); + hr = IMediaControl_Run(media_control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + todo_wine ok(graph.got_notify == 1, "Got %d calls to IMediaEventSink::Notify().\n", graph.got_notify); + + hr = IMediaControl_Stop(media_control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + /* EC_COMPLETE is sent on paused->running state transition + * if EndOfStream has been called for all streams. */ + graph.got_notify = 0; + + hr = IMediaStreamFilter_EndOfStream(filter); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaStreamFilter_EndOfStream(filter); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + ok(graph.got_notify == 0, "Got %d calls to IMediaEventSink::Notify().\n", graph.got_notify); + + hr = IMediaControl_Pause(media_control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ok(graph.got_notify == 0, "Got %d calls to IMediaEventSink::Notify().\n", graph.got_notify); + + hr = IMediaControl_Run(media_control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + todo_wine ok(graph.got_notify == 1, "Got %d calls to IMediaEventSink::Notify().\n", graph.got_notify); + hr = IMediaControl_Stop(media_control); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -7074,6 +7103,26 @@ static void test_mediastreamfilter_end_of_stream(void) hr = IMediaControl_Stop(media_control); ok(hr == S_OK, "Got hr %#x.\n", hr); + /* EndOfStream count is not reset when Stop() is called on an already stopped filter. */ + hr = IMediaStreamFilter_EndOfStream(filter); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaStreamFilter_Stop(filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaStreamFilter_EndOfStream(filter); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + graph.got_notify = 0; + + hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_RUN); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + todo_wine ok(graph.got_notify == 1, "Got %d calls to IMediaEventSink::Notify().\n", graph.got_notify); + + hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_STOP); + ok(hr == S_OK, "Got hr %#x.\n", hr); + /* Flush with cancel_eos=TRUE decrements EOS count. */ hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_RUN); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -7093,6 +7142,54 @@ static void test_mediastreamfilter_end_of_stream(void) hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_STOP); ok(hr == S_OK, "Got hr %#x.\n", hr); + /* Flush followed by EndOfStream causes another EC_COMPLETE to be sent. */ + hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_RUN); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + graph.got_notify = 0; + + hr = IMediaStreamFilter_EndOfStream(filter); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaStreamFilter_EndOfStream(filter); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + todo_wine ok(graph.got_notify == 1, "Got %d calls to IMediaEventSink::Notify().\n", graph.got_notify); + + hr = IMediaStreamFilter_Flush(filter, TRUE); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaStreamFilter_EndOfStream(filter); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + todo_wine ok(graph.got_notify == 2, "Got %d calls to IMediaEventSink::Notify().\n", graph.got_notify); + + hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_STOP); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + /* Flush decrements EOS count event when it is 0. */ + hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_RUN); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + graph.got_notify = 0; + + hr = IMediaStreamFilter_Flush(filter, TRUE); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaStreamFilter_EndOfStream(filter); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaStreamFilter_EndOfStream(filter); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + ok(graph.got_notify == 0, "Got %d calls to IMediaEventSink::Notify().\n", graph.got_notify); + + hr = IMediaStreamFilter_EndOfStream(filter); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + todo_wine ok(graph.got_notify == 1, "Got %d calls to IMediaEventSink::Notify().\n", graph.got_notify); + + hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_STOP); + ok(hr == S_OK, "Got hr %#x.\n", hr); + /* Flush with cancel_eos=FALSE does not decrement EOS count. */ hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_RUN); ok(hr == S_OK, "Got hr %#x.\n", hr);

1 0

Alexandre Julliard : ntdll: Cleanup the path with collapse_path() in unix_to_nt_file_name().
by Alexandre Julliard 12 Apr '21

12 Apr '21

Module: wine Branch: master Commit: cdb1f3ae55f37318e99590b5f5ae8917ce826bc8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cdb1f3ae55f37318e99590b5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 12 10:27:53 2021 +0200 ntdll: Cleanup the path with collapse_path() in unix_to_nt_file_name(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 116 ++++++++++++++++++++++++------------------------- 1 file changed, 57 insertions(+), 59 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 9ee5e84ee43..0ba0ee7b586 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -3431,64 +3431,6 @@ NTSTATUS CDECL wine_nt_to_unix_file_name( const UNICODE_STRING *nameW, char *nam } -/****************************************************************** - * unix_to_nt_file_name - */ -NTSTATUS unix_to_nt_file_name( const char *name, WCHAR **nt ) -{ - static const WCHAR unix_prefixW[] = {'\\','?','?','\\','u','n','i','x',0}; - WCHAR dos_prefixW[] = {'\\','?','?','\\','A',':','\\',0}; - const WCHAR *prefix = unix_prefixW; - unsigned int lenW, lenA = strlen(name); - const char *path = name; - NTSTATUS status; - WCHAR *p, *buffer; - int drive; - - status = find_drive_rootA( &path, lenA, &drive ); - lenA -= path - name; - - if (status == STATUS_SUCCESS) - { - while (lenA && path[0] == '/') { lenA--; path++; } - dos_prefixW[4] += drive; - prefix = dos_prefixW; - } - else if (status != STATUS_OBJECT_PATH_NOT_FOUND) return status; - - lenW = wcslen( prefix ); - if (!(buffer = malloc( (lenA + lenW + 1) * sizeof(WCHAR) ))) return STATUS_NO_MEMORY; - memcpy( buffer, prefix, lenW * sizeof(WCHAR) ); - lenW += ntdll_umbstowcs( path, lenA, buffer + lenW, lenA ); - buffer[lenW] = 0; - for (p = buffer; *p; p++) if (*p == '/') *p = '\\'; - *nt = buffer; - return STATUS_SUCCESS; -} - - -/****************************************************************** - * wine_unix_to_nt_file_name - */ -NTSTATUS CDECL wine_unix_to_nt_file_name( const char *name, WCHAR *buffer, SIZE_T *size ) -{ - WCHAR *nt_name = NULL; - NTSTATUS status; - - if (name[0] != '/') return STATUS_INVALID_PARAMETER; /* relative paths are not supported */ - - status = unix_to_nt_file_name( name, &nt_name ); - if (nt_name) - { - if (*size > wcslen(nt_name)) wcscpy( buffer, nt_name ); - else status = STATUS_BUFFER_TOO_SMALL; - *size = wcslen(nt_name) + 1; - free( nt_name ); - } - return status; -} - - /****************************************************************** * collapse_path * @@ -3567,7 +3509,63 @@ static void collapse_path( WCHAR *path ) } -#define IS_SEPARATOR(ch) ((ch) == '\\' || (ch) == '/') +/****************************************************************** + * unix_to_nt_file_name + */ +NTSTATUS unix_to_nt_file_name( const char *name, WCHAR **nt ) +{ + static const WCHAR unix_prefixW[] = {'\\','?','?','\\','u','n','i','x',0}; + WCHAR dos_prefixW[] = {'\\','?','?','\\','A',':','\\',0}; + const WCHAR *prefix = unix_prefixW; + unsigned int lenW, lenA = strlen(name); + const char *path = name; + NTSTATUS status; + WCHAR *buffer; + int drive; + + status = find_drive_rootA( &path, lenA, &drive ); + lenA -= path - name; + + if (status == STATUS_SUCCESS) + { + while (lenA && path[0] == '/') { lenA--; path++; } + dos_prefixW[4] += drive; + prefix = dos_prefixW; + } + else if (status != STATUS_OBJECT_PATH_NOT_FOUND) return status; + + lenW = wcslen( prefix ); + if (!(buffer = malloc( (lenA + lenW + 1) * sizeof(WCHAR) ))) return STATUS_NO_MEMORY; + memcpy( buffer, prefix, lenW * sizeof(WCHAR) ); + lenW += ntdll_umbstowcs( path, lenA, buffer + lenW, lenA ); + buffer[lenW] = 0; + collapse_path( buffer ); + *nt = buffer; + return STATUS_SUCCESS; +} + + +/****************************************************************** + * wine_unix_to_nt_file_name + */ +NTSTATUS CDECL wine_unix_to_nt_file_name( const char *name, WCHAR *buffer, SIZE_T *size ) +{ + WCHAR *nt_name = NULL; + NTSTATUS status; + + if (name[0] != '/') return STATUS_INVALID_PARAMETER; /* relative paths are not supported */ + + status = unix_to_nt_file_name( name, &nt_name ); + if (nt_name) + { + if (*size > wcslen(nt_name)) wcscpy( buffer, nt_name ); + else status = STATUS_BUFFER_TOO_SMALL; + *size = wcslen(nt_name) + 1; + free( nt_name ); + } + return status; +} + /*********************************************************************** * get_full_path

1 0

← Newer
1
...
59
60
61
62
63
64
65
...
87
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2021