- Wine-Devel - list.winehq.org

[PATCH 1/8] winebus.sys: Pass bus id instead of vtbl to lookup functions.
by Rémi Bernon Aug. 16, 2021

Aug. 16, 2021

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winebus.sys/bus.h | 4 ++-- dlls/winebus.sys/bus_iohid.c | 2 +- dlls/winebus.sys/bus_sdl.c | 6 +++--- dlls/winebus.sys/bus_udev.c | 9 ++++----- dlls/winebus.sys/main.c | 12 ++++++------ 5 files changed, 16 insertions(+), 17 deletions(-) diff --git a/dlls/winebus.sys/bus.h b/dlls/winebus.sys/bus.h index bf2e157af4d..72bd071135b 100644 --- a/dlls/winebus.sys/bus.h +++ b/dlls/winebus.sys/bus.h @@ -53,11 +53,11 @@ void *get_platform_private(DEVICE_OBJECT *device) DECLSPEC_HIDDEN; DEVICE_OBJECT *bus_create_hid_device(const WCHAR *busidW, WORD vid, WORD pid, WORD input, DWORD version, DWORD uid, const WCHAR *serialW, BOOL is_gamepad, const platform_vtbl *vtbl, DWORD platform_data_size) DECLSPEC_HIDDEN; -DEVICE_OBJECT *bus_find_hid_device(const platform_vtbl *vtbl, void *platform_dev) DECLSPEC_HIDDEN; +DEVICE_OBJECT *bus_find_hid_device(const WCHAR *bus_id, void *platform_dev) DECLSPEC_HIDDEN; void bus_unlink_hid_device(DEVICE_OBJECT *device) DECLSPEC_HIDDEN; void bus_remove_hid_device(DEVICE_OBJECT *device) DECLSPEC_HIDDEN; void process_hid_report(DEVICE_OBJECT *device, BYTE *report, DWORD length) DECLSPEC_HIDDEN; -DEVICE_OBJECT* bus_enumerate_hid_devices(const platform_vtbl *vtbl, enum_func function, void* context) DECLSPEC_HIDDEN; +DEVICE_OBJECT *bus_enumerate_hid_devices(const WCHAR *bus_id, enum_func function, void *context) DECLSPEC_HIDDEN; /* General Bus Functions */ DWORD check_bus_option(const UNICODE_STRING *option, DWORD default_value) DECLSPEC_HIDDEN; diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c index f660a3c789a..eb6765d6aac 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -377,7 +377,7 @@ static void handle_RemovalCallback(void *context, IOReturn result, void *sender, safe way to deallocate that buffer. */ IOHIDDeviceUnscheduleFromRunLoop(IOHIDDevice, CFRunLoopGetCurrent(), kCFRunLoopDefaultMode); IOHIDDeviceClose(IOHIDDevice, 0); - device = bus_find_hid_device(&iohid_vtbl, IOHIDDevice); + device = bus_find_hid_device(busidW, IOHIDDevice); if (device) { bus_unlink_hid_device(device); diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 8c9886c7d3c..3607634b7a0 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -617,7 +617,7 @@ static BOOL set_report_from_event(SDL_Event *event) struct platform_private *private; /* All the events coming in will have 'which' as a 3rd field */ SDL_JoystickID id = ((SDL_JoyButtonEvent*)event)->which; - device = bus_enumerate_hid_devices(&sdl_vtbl, compare_joystick_id, ULongToPtr(id)); + device = bus_enumerate_hid_devices(sdl_busidW, compare_joystick_id, ULongToPtr(id)); if (!device) { ERR("Failed to find device at index %i\n",id); @@ -681,7 +681,7 @@ static BOOL set_mapped_report_from_event(SDL_Event *event) struct platform_private *private; /* All the events coming in will have 'which' as a 3rd field */ SDL_JoystickID id = ((SDL_ControllerButtonEvent*)event)->which; - device = bus_enumerate_hid_devices(&sdl_vtbl, compare_joystick_id, ULongToPtr(id)); + device = bus_enumerate_hid_devices(sdl_busidW, compare_joystick_id, ULongToPtr(id)); if (!device) { ERR("Failed to find device at index %i\n",id); @@ -748,7 +748,7 @@ static void try_remove_device(SDL_JoystickID id) { DEVICE_OBJECT *device = NULL; - device = bus_enumerate_hid_devices(&sdl_vtbl, compare_joystick_id, ULongToPtr(id)); + device = bus_enumerate_hid_devices(sdl_busidW, compare_joystick_id, ULongToPtr(id)); if (!device) return; bus_unlink_hid_device(device); diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 887996daf49..864ffc0bf09 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -1095,8 +1095,8 @@ static void try_add_device(struct udev_device *dev) TRACE("udev %s syspath %s\n", debugstr_a(devnode), udev_device_get_syspath(dev)); #ifdef HAS_PROPER_INPUT_HEADER - device = bus_enumerate_hid_devices(&lnxev_vtbl, check_device_syspath, (void *)get_device_syspath(dev)); - if (!device) device = bus_enumerate_hid_devices(&hidraw_vtbl, check_device_syspath, (void *)get_device_syspath(dev)); + device = bus_enumerate_hid_devices(lnxev_busidW, check_device_syspath, (void *)get_device_syspath(dev)); + if (!device) device = bus_enumerate_hid_devices(hidraw_busidW, check_device_syspath, (void *)get_device_syspath(dev)); if (device) { TRACE("duplicate device found, not adding the new one\n"); @@ -1212,10 +1212,9 @@ static void try_remove_device(struct udev_device *dev) { DEVICE_OBJECT *device = NULL; - device = bus_find_hid_device(&hidraw_vtbl, dev); + device = bus_find_hid_device(hidraw_busidW, dev); #ifdef HAS_PROPER_INPUT_HEADER - if (device == NULL) - device = bus_find_hid_device(&lnxev_vtbl, dev); + if (device == NULL) device = bus_find_hid_device(lnxev_busidW, dev); #endif if (!device) return; diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index b7230cf2e33..23c40e6895e 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -312,18 +312,18 @@ DEVICE_OBJECT *bus_create_hid_device(const WCHAR *busidW, WORD vid, WORD pid, return device; } -DEVICE_OBJECT *bus_find_hid_device(const platform_vtbl *vtbl, void *platform_dev) +DEVICE_OBJECT *bus_find_hid_device(const WCHAR *bus_id, void *platform_dev) { struct pnp_device *dev; DEVICE_OBJECT *ret = NULL; - TRACE("(%p, %p)\n", vtbl, platform_dev); + TRACE("bus_id %s, platform_dev %p\n", debugstr_w(bus_id), platform_dev); EnterCriticalSection(&device_list_cs); LIST_FOR_EACH_ENTRY(dev, &pnp_devset, struct pnp_device, entry) { struct device_extension *ext = (struct device_extension *)dev->device->DeviceExtension; - if (ext->vtbl != vtbl) continue; + if (strcmpW(ext->busid, bus_id)) continue; if (ext->vtbl->compare_platform_device(dev->device, platform_dev) == 0) { ret = dev->device; @@ -336,19 +336,19 @@ DEVICE_OBJECT *bus_find_hid_device(const platform_vtbl *vtbl, void *platform_dev return ret; } -DEVICE_OBJECT* bus_enumerate_hid_devices(const platform_vtbl *vtbl, enum_func function, void* context) +DEVICE_OBJECT *bus_enumerate_hid_devices(const WCHAR *bus_id, enum_func function, void *context) { struct pnp_device *dev, *dev_next; DEVICE_OBJECT *ret = NULL; int cont; - TRACE("(%p)\n", vtbl); + TRACE("bus_id %p\n", debugstr_w(bus_id)); EnterCriticalSection(&device_list_cs); LIST_FOR_EACH_ENTRY_SAFE(dev, dev_next, &pnp_devset, struct pnp_device, entry) { struct device_extension *ext = (struct device_extension *)dev->device->DeviceExtension; - if (ext->vtbl != vtbl) continue; + if (strcmpW(ext->busid, bus_id)) continue; LeaveCriticalSection(&device_list_cs); cont = function(dev->device, context); EnterCriticalSection(&device_list_cs); -- 2.32.0

1 7

[PATCH v2 4/5] ntdll: Error out when trying to use a UDP-only option on a TCP socket
by Alex Henrie Aug. 16, 2021

Aug. 16, 2021

Windows supports none of these options on TCP. Linux supports all of them on TCP. Mac OS supports some of them on TCP, but sets EOPNOTSUPP instead of EINVAL for the ones that it doesn't support. So, Wine needs to do its own check for whether the option may be used with the socket. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/ntdll/unix/socket.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 1ac4365c012..4523ded1be7 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1200,6 +1200,14 @@ static NTSTATUS do_setsockopt( HANDLE handle, IO_STATUS_BLOCK *io, int level, } +static BOOL is_datagram_socket( HANDLE handle, IO_STATUS_BLOCK *io ) +{ + int sock_type = -1; + do_getsockopt( handle, io, SOL_SOCKET, SO_TYPE, &sock_type, sizeof(sock_type) ); + return sock_type == SOCK_DGRAM; +} + + NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, IO_STATUS_BLOCK *io, ULONG code, void *in_buffer, ULONG in_size, void *out_buffer, ULONG out_size ) { @@ -1767,18 +1775,23 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc #endif case IOCTL_AFD_WINE_GET_IP_MULTICAST_IF: + if (!is_datagram_socket( handle, io )) return STATUS_INVALID_PARAMETER; return do_getsockopt( handle, io, IPPROTO_IP, IP_MULTICAST_IF, out_buffer, out_size ); case IOCTL_AFD_WINE_SET_IP_MULTICAST_IF: + if (!is_datagram_socket( handle, io )) return STATUS_INVALID_PARAMETER; return do_setsockopt( handle, io, IPPROTO_IP, IP_MULTICAST_IF, in_buffer, in_size ); case IOCTL_AFD_WINE_GET_IP_MULTICAST_LOOP: + if (!is_datagram_socket( handle, io )) return STATUS_INVALID_PARAMETER; return do_getsockopt( handle, io, IPPROTO_IP, IP_MULTICAST_LOOP, out_buffer, out_size ); case IOCTL_AFD_WINE_SET_IP_MULTICAST_LOOP: + if (!is_datagram_socket( handle, io )) return STATUS_INVALID_PARAMETER; return do_setsockopt( handle, io, IPPROTO_IP, IP_MULTICAST_LOOP, in_buffer, in_size ); case IOCTL_AFD_WINE_GET_IP_MULTICAST_TTL: + if (!is_datagram_socket( handle, io )) return STATUS_INVALID_PARAMETER; return do_getsockopt( handle, io, IPPROTO_IP, IP_MULTICAST_TTL, out_buffer, out_size ); case IOCTL_AFD_WINE_SET_IP_MULTICAST_TTL: @@ -1792,15 +1805,19 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc #ifdef IP_PKTINFO case IOCTL_AFD_WINE_GET_IP_PKTINFO: + if (!is_datagram_socket( handle, io )) return STATUS_INVALID_PARAMETER; return do_getsockopt( handle, io, IPPROTO_IP, IP_PKTINFO, out_buffer, out_size ); case IOCTL_AFD_WINE_SET_IP_PKTINFO: + if (!is_datagram_socket( handle, io )) return STATUS_INVALID_PARAMETER; return do_setsockopt( handle, io, IPPROTO_IP, IP_PKTINFO, in_buffer, in_size ); #elif defined(IP_RECVDSTADDR) case IOCTL_AFD_WINE_GET_IP_PKTINFO: + if (!is_datagram_socket( handle, io )) return STATUS_INVALID_PARAMETER; return do_getsockopt( handle, io, IPPROTO_IP, IP_RECVDSTADDR, out_buffer, out_size ); case IOCTL_AFD_WINE_SET_IP_PKTINFO: + if (!is_datagram_socket( handle, io )) return STATUS_INVALID_PARAMETER; return do_setsockopt( handle, io, IPPROTO_IP, IP_RECVDSTADDR, in_buffer, in_size ); #endif @@ -1890,18 +1907,21 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc #endif case IOCTL_AFD_WINE_GET_IPV6_MULTICAST_HOPS: + if (!is_datagram_socket( handle, io )) return STATUS_INVALID_PARAMETER; return do_getsockopt( handle, io, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, out_buffer, out_size ); case IOCTL_AFD_WINE_SET_IPV6_MULTICAST_HOPS: return do_setsockopt( handle, io, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, in_buffer, in_size ); case IOCTL_AFD_WINE_GET_IPV6_MULTICAST_IF: + if (!is_datagram_socket( handle, io )) return STATUS_INVALID_PARAMETER; return do_getsockopt( handle, io, IPPROTO_IPV6, IPV6_MULTICAST_IF, out_buffer, out_size ); case IOCTL_AFD_WINE_SET_IPV6_MULTICAST_IF: return do_setsockopt( handle, io, IPPROTO_IPV6, IPV6_MULTICAST_IF, in_buffer, in_size ); case IOCTL_AFD_WINE_GET_IPV6_MULTICAST_LOOP: + if (!is_datagram_socket( handle, io )) return STATUS_INVALID_PARAMETER; return do_getsockopt( handle, io, IPPROTO_IPV6, IPV6_MULTICAST_LOOP, out_buffer, out_size ); case IOCTL_AFD_WINE_SET_IPV6_MULTICAST_LOOP: @@ -1909,25 +1929,31 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc #ifdef IPV6_RECVHOPLIMIT case IOCTL_AFD_WINE_GET_IPV6_RECVHOPLIMIT: + if (!is_datagram_socket( handle, io )) return STATUS_INVALID_PARAMETER; return do_getsockopt( handle, io, IPPROTO_IPV6, IPV6_RECVHOPLIMIT, out_buffer, out_size ); case IOCTL_AFD_WINE_SET_IPV6_RECVHOPLIMIT: + if (!is_datagram_socket( handle, io )) return STATUS_INVALID_PARAMETER; return do_setsockopt( handle, io, IPPROTO_IPV6, IPV6_RECVHOPLIMIT, in_buffer, in_size ); #endif #ifdef IPV6_RECVPKTINFO case IOCTL_AFD_WINE_GET_IPV6_RECVPKTINFO: + if (!is_datagram_socket( handle, io )) return STATUS_INVALID_PARAMETER; return do_getsockopt( handle, io, IPPROTO_IPV6, IPV6_RECVPKTINFO, out_buffer, out_size ); case IOCTL_AFD_WINE_SET_IPV6_RECVPKTINFO: + if (!is_datagram_socket( handle, io )) return STATUS_INVALID_PARAMETER; return do_setsockopt( handle, io, IPPROTO_IPV6, IPV6_RECVPKTINFO, in_buffer, in_size ); #endif #ifdef IPV6_RECVTCLASS case IOCTL_AFD_WINE_GET_IPV6_RECVTCLASS: + if (!is_datagram_socket( handle, io )) return STATUS_INVALID_PARAMETER; return do_getsockopt( handle, io, IPPROTO_IPV6, IPV6_RECVTCLASS, out_buffer, out_size ); case IOCTL_AFD_WINE_SET_IPV6_RECVTCLASS: + if (!is_datagram_socket( handle, io )) return STATUS_INVALID_PARAMETER; return do_setsockopt( handle, io, IPPROTO_IPV6, IPV6_RECVTCLASS, in_buffer, in_size ); #endif -- 2.32.0

1 0

[PATCH vkd3d] tests: Remove radv bug_if from test_draw_uav_only().
by Conor McCarthy Aug. 16, 2021

Aug. 16, 2021

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- tests/d3d12.c | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 073c590c..4f783325 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -6886,7 +6886,6 @@ static void test_draw_uav_only(void) transition_resource_state(command_list, resource, D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE); - bug_if(is_radv_device(context.device)) check_sub_resource_uint(resource, 0, queue, command_list, 500, 0); ID3D12DescriptorHeap_Release(cpu_descriptor_heap); -- 2.32.0

1 0

[PATCH 1/2] bthprops.cpl: Add BluetoothGetRadioInfo stub.
by Esdras Tarsis Aug. 14, 2021

Aug. 14, 2021

Needed for War Dust. Signed-off-by: Esdras Tarsis <esdrastarsis(a)gmail.com> --- dlls/bthprops.cpl/bthprops.cpl.spec | 2 +- dlls/bthprops.cpl/main.c | 9 +++++++++ dlls/irprops.cpl/irprops.cpl.spec | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/bthprops.cpl/bthprops.cpl.spec b/dlls/bthprops.cpl/bthprops.cpl.spec index 49b181763ee..d57eb9136e6 100644 --- a/dlls/bthprops.cpl/bthprops.cpl.spec +++ b/dlls/bthprops.cpl/bthprops.cpl.spec @@ -35,7 +35,7 @@ @ stdcall BluetoothFindRadioClose(ptr) @ stub BluetoothFindServiceClose @ stub BluetoothGetDeviceInfo -@ stub BluetoothGetRadioInfo +@ stdcall BluetoothGetRadioInfo(ptr ptr) @ stub BluetoothIsConnectable @ stub BluetoothIsDiscoverable @ stub BluetoothIsVersionAvailable diff --git a/dlls/bthprops.cpl/main.c b/dlls/bthprops.cpl/main.c index 943c9dcb764..672b682a29d 100644 --- a/dlls/bthprops.cpl/main.c +++ b/dlls/bthprops.cpl/main.c @@ -80,3 +80,12 @@ BOOL WINAPI BluetoothFindNextRadio(HBLUETOOTH_RADIO_FIND find, HANDLE *radio) SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } + +/********************************************************************* + * BluetoothGetRadioInfo + */ +DWORD WINAPI BluetoothGetRadioInfo(HANDLE radio, PBLUETOOTH_RADIO_INFO info) +{ + FIXME("(%p, %p): stub!\n", radio, info); + return ERROR_CALL_NOT_IMPLEMENTED; +} diff --git a/dlls/irprops.cpl/irprops.cpl.spec b/dlls/irprops.cpl/irprops.cpl.spec index f2fa18aab89..a3e5faa7076 100644 --- a/dlls/irprops.cpl/irprops.cpl.spec +++ b/dlls/irprops.cpl/irprops.cpl.spec @@ -31,7 +31,7 @@ @ stdcall BluetoothFindRadioClose(ptr) bthprops.cpl.BluetoothFindRadioClose @ stub BluetoothFindServiceClose @ stub BluetoothGetDeviceInfo -@ stub BluetoothGetRadioInfo +@ stdcall BluetoothGetRadioInfo(ptr ptr) bthprops.cpl.BluetoothGetRadioInfo @ stub BluetoothIsConnectable @ stub BluetoothIsDiscoverable @ stub BluetoothMapClassOfDeviceToImageIndex -- 2.32.0

1 1

Managing test differences on 32/64-bit systems
by Hugh McMaster Aug. 14, 2021

Aug. 14, 2021

I'm adding tests for SetCurrentConsoleFontEx to dlls/kernel32/tests/console.c. The behaviour is unusual on Windows and changes on 32-bit and 64-bit systems. For example, when deliberately testing failure, the 32-bit function returns ERROR_INVALID_HANDLE, while the 64-bit equivalent returns ERROR_INVALID_PARAMETER. In one particular test, the 32-bit function even returns non-zero (success), while the 64-bit function correctly returns zero (failure). Should I mark the the 32-bit return codes as broken? And what should I do about the zero/non-zero difference? Writing something like ok(!ret || broken(ret), ...) seems rather strange. I'm also wondering how to manage this when implementing the function. Thanks

2 1

Re: [PATCH v2] conhost: Use font face length as number of characters, not size
by Jacek Caban Aug. 14, 2021

Aug. 14, 2021

On 8/13/21 3:52 PM, Hugh McMaster wrote: > Hi Jacek, > > On Fri, 13 Aug 2021 at 23:11, Jacek Caban wrote: >> On 8/12/21 3:18 PM, Hugh McMaster wrote: >>> - if (!(screen_buffer->font.face_name = malloc( screen_buffer->font.face_len ))) return NULL; >>> - memcpy( screen_buffer->font.face_name, console->active->font.face_name, >>> - screen_buffer->font.face_len ); >>> + if (screen_buffer->font.face_len) >>> + { >>> + screen_buffer->font.face_name = malloc((screen_buffer->font.face_len + 1) * sizeof(WCHAR)); >>> + if (!screen_buffer->font.face_name) return NULL; >>> + lstrcpyW(screen_buffer->font.face_name, console->active->font.face_name); >> >> This does not only change the meaning of length, but also >> null-terminates the string. Is there any reason for that? It doesn't >> make much sense to both store the length and null-terminate string at >> the same time. > The FaceName value is stored null-terminated in the registry. It's > also null-terminated in the LOGFONTW structure, when copied to the > config and in dialogs. > > We can probably get rid of face_len though. While in this case it doesn't matter all that much, I don't see a point in having it null-terminated. Storing the length separately has the advantage that we don't need to recalculate it whenever we need it and it's easy enough to null-terminate it when copying to structs that need it. Thanks, Jacek

1 0

[tools] winetest: Detect Windows 10 21H1.
by Francois Gouget Aug. 14, 2021

Aug. 14, 2021

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- winetest/dissect | 1 + 1 file changed, 1 insertion(+) diff --git a/winetest/dissect b/winetest/dissect index 4371c90f7..43f7790d2 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -393,6 +393,7 @@ my @idmatch = ( [ "win1909", 2, 10, 0, 18363, 1, 0 ], [ "win2004", 2, 10, 0, 19041, 1, 0 ], [ "win2009", 2, 10, 0, 19042, 1, 0 ], + [ "win21H1", 2, 10, 0, 19043, 1, 0 ], # [ "ce", 3, undef, undef, undef, undef, 0 ], [ "unknown", 2, undef, undef, undef, undef, 0 ], [ "unknown", undef, undef, undef, undef, undef, 1 ], -- 2.20.1

1 1

[tools] testbot/TestLauncher: Report CreateProcess() errors like WineTest.
by Francois Gouget Aug. 14, 2021

Aug. 14, 2021

Show the GetLastError() value on the done line instead of exiting with a non-standard error message. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/src/TestLauncher/TestLauncher.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/testbot/src/TestLauncher/TestLauncher.c b/testbot/src/TestLauncher/TestLauncher.c index fc67f92ae..41fb90427 100644 --- a/testbot/src/TestLauncher/TestLauncher.c +++ b/testbot/src/TestLauncher/TestLauncher.c @@ -238,16 +238,15 @@ DWORD RunTest(char *TestExeFileName, char* CommandLine, DWORD TimeOut, DWORD *Pi */ if (! CreateProcessA(NULL, CommandLine, NULL, NULL, TRUE, CREATE_DEFAULT_ERROR_MODE, NULL, NULL, &StartupInfo, &ProcessInformation)) { + *Pid = 0; if (GetLastError() == ERROR_SXS_CANT_GEN_ACTCTX) { Skips++; printf("%s.c:0: Tests skipped: Side-by-side dll version not found\n", (*Subtest ? Subtest : "testlauncher")); - *Pid = 0; return 0; } - Error("CreateProcess failed (error %lu)\n", GetLastError()); - ExitProcess(1); + return -GetLastError(); } CloseHandle(ProcessInformation.hThread); *Pid = ProcessInformation.dwProcessId; -- 2.20.1

1 0

[tools] testbot/WineRunTask: Extract the tests to a WineTest.exe subdirectory.
by Francois Gouget Aug. 14, 2021

Aug. 14, 2021

This simplifies shielding all the test executables from anti-virus tools like Microsoft Defender by excluding the directory WineTest is in. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunTask.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index bb199d126..58e055ca8 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -478,7 +478,7 @@ elsif ($Step->Type eq "suite") $Info .= $VM->Details; } # Escape the arguments for cmd's command interpreter - $Script .= "-q -o $RptFileName -t $Tag -m ". BatchQuote($AdminEMail) ." -i ". BatchQuote($Info) ."\r\n"; + $Script .= "-q -d tests -o $RptFileName -t $Tag -m ". BatchQuote($AdminEMail) ." -i ". BatchQuote($Info) ."\r\n"; $Script .= "$FileName -q -s $RptFileName\r\n" if (!$Mission->{nosubmit}); $Script .= "$FileName -q -s $RptFileName -S http://amboise.vmbr/submit\r\n" if (!$Mission->{nosubmit}); } -- 2.20.1

1 0

[tools] winetest: Detect Windows 10 21H1.
by Francois Gouget Aug. 14, 2021

Aug. 14, 2021

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- winetest/dissect | 1 + 1 file changed, 1 insertion(+) diff --git a/winetest/dissect b/winetest/dissect index 4371c90f7..43f7790d2 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -393,6 +393,7 @@ my @idmatch = ( [ "win1909", 2, 10, 0, 18363, 1, 0 ], [ "win2004", 2, 10, 0, 19041, 1, 0 ], [ "win2009", 2, 10, 0, 19042, 1, 0 ], + [ "win21H1", 2, 10, 0, 19043, 1, 0 ], # [ "ce", 3, undef, undef, undef, undef, 0 ], [ "unknown", 2, undef, undef, undef, undef, 0 ], [ "unknown", undef, undef, undef, undef, undef, 1 ], -- 2.20.1

1 0