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

[PATCH v2 1/5] wined3d: Introduce wined3d_device_context_draw_indexed().
by Zebediah Figura 02 Apr '21

02 Apr '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/device.c | 19 +++++++++++++++---- dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e578e51de68..9c37cd97db9 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2409,6 +2409,18 @@ void CDECL wined3d_device_context_draw(struct wined3d_device_context *context, u 0, start_vertex, vertex_count, start_instance, instance_count, false); } +void CDECL wined3d_device_context_draw_indexed(struct wined3d_device_context *context, int base_vertex_index, + unsigned int start_index, unsigned int index_count, unsigned int start_instance, unsigned int instance_count) +{ + struct wined3d_state *state = context->state; + + TRACE("context %p, base_vertex_index %d, start_index %u, index_count %u, start_instance %u, instance_count %u.\n", + context, base_vertex_index, start_index, index_count, start_instance, instance_count); + + wined3d_device_context_emit_draw(context, state->primitive_type, state->patch_vertex_count, + base_vertex_index, start_index, index_count, 0, 0, true); +} + void CDECL wined3d_device_set_vertex_shader(struct wined3d_device *device, struct wined3d_shader *shader) { TRACE("device %p, shader %p.\n", device, shader); @@ -4486,8 +4498,7 @@ void CDECL wined3d_device_draw_indexed_primitive(struct wined3d_device *device, TRACE("device %p, start_idx %u, index_count %u.\n", device, start_idx, index_count); - wined3d_device_context_emit_draw(&device->cs->c, state->primitive_type, state->patch_vertex_count, - state->base_vertex_index, start_idx, index_count, 0, 0, true); + wined3d_device_context_draw_indexed(&device->cs->c, state->base_vertex_index, start_idx, index_count, 0, 0); } void CDECL wined3d_device_draw_indexed_primitive_instanced(struct wined3d_device *device, @@ -4498,8 +4509,8 @@ void CDECL wined3d_device_draw_indexed_primitive_instanced(struct wined3d_device TRACE("device %p, start_idx %u, index_count %u, start_instance %u, instance_count %u.\n", device, start_idx, index_count, start_instance, instance_count); - wined3d_device_context_emit_draw(&device->cs->c, state->primitive_type, state->patch_vertex_count, - state->base_vertex_index, start_idx, index_count, start_instance, instance_count, true); + wined3d_device_context_draw_indexed(&device->cs->c, state->base_vertex_index, + start_idx, index_count, start_instance, instance_count); } void CDECL wined3d_device_draw_indexed_primitive_instanced_indirect(struct wined3d_device *device, diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 087a6bead13..bae5a6d42f0 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -167,6 +167,7 @@ @ cdecl wined3d_device_validate_device(ptr ptr) @ cdecl wined3d_device_context_draw(ptr long long long long) +@ cdecl wined3d_device_context_draw_indexed(ptr long long long long long) @ cdecl wined3d_device_context_dispatch(ptr long long long) @ cdecl wined3d_device_context_dispatch_indirect(ptr ptr long) @ cdecl wined3d_device_context_set_blend_state(ptr ptr ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 3316d6f6653..ee02914b0fe 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2562,6 +2562,8 @@ void __cdecl wined3d_device_context_dispatch_indirect(struct wined3d_device_cont struct wined3d_buffer *buffer, unsigned int offset); void __cdecl wined3d_device_context_draw(struct wined3d_device_context *context, unsigned int start_vertex, unsigned int vertex_count, unsigned int start_instance, unsigned int instance_count); +void __cdecl wined3d_device_context_draw_indexed(struct wined3d_device_context *context, int base_vertex_index, + unsigned int start_index, unsigned int index_count, unsigned int start_instance, unsigned int instance_count); void __cdecl wined3d_device_context_set_blend_state(struct wined3d_device_context *context, struct wined3d_blend_state *state, const struct wined3d_color *blend_factor, unsigned int sample_mask); void __cdecl wined3d_device_context_set_constant_buffer(struct wined3d_device_context *context, -- 2.30.2

2 7

[PATCH 1/3] reg: Abort 'add' operation when parsing command-line arguments that are not switches
by Hugh McMaster 02 Apr '21

02 Apr '21

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/reg/add.c | 74 ++++++++++++++++++++++++---------------------- 1 file changed, 38 insertions(+), 36 deletions(-) diff --git a/programs/reg/add.c b/programs/reg/add.c index e1fd2223716..f259f0a4100 100644 --- a/programs/reg/add.c +++ b/programs/reg/add.c @@ -222,46 +222,48 @@ int reg_add(int argc, WCHAR *argvW[]) for (i = 3; i < argc; i++) { - if (argvW[i][0] == '/' || argvW[i][0] == '-') + WCHAR *str; + + if (argvW[i][0] != '/' && argvW[i][0] != '-') + goto invalid; + + str = &argvW[i][1]; + + if (!lstrcmpiW(str, L"ve")) { - WCHAR *str = &argvW[i][1]; + if (value_empty) goto invalid; + value_empty = TRUE; + continue; + } + else if (!str[0] || str[1]) + goto invalid; - if (!lstrcmpiW(str, L"ve")) - { - if (value_empty) goto invalid; - value_empty = TRUE; - continue; - } - else if (!str[0] || str[1]) + switch (towlower(*str)) + { + case 'v': + if (value_name || !(value_name = argvW[++i])) goto invalid; - - switch (towlower(*str)) - { - case 'v': - if (value_name || !(value_name = argvW[++i])) - goto invalid; - break; - case 't': - if (type || !(type = argvW[++i])) - goto invalid; - break; - case 'd': - if (data || !(data = argvW[++i])) - goto invalid; - break; - case 's': - str = argvW[++i]; - if (separator || !str || lstrlenW(str) != 1) - goto invalid; - separator = str[0]; - break; - case 'f': - if (force) goto invalid; - force = TRUE; - break; - default: + break; + case 't': + if (type || !(type = argvW[++i])) goto invalid; - } + break; + case 'd': + if (data || !(data = argvW[++i])) + goto invalid; + break; + case 's': + str = argvW[++i]; + if (separator || !str || lstrlenW(str) != 1) + goto invalid; + separator = str[0]; + break; + case 'f': + if (force) goto invalid; + force = TRUE; + break; + default: + goto invalid; } } -- 2.31.0

1 2

[PATCH 1/6] user32/tests: Factor GetKeyState test checks together.
by Rémi Bernon 02 Apr '21

02 Apr '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=26269 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=27238 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=31899 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=35907 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45385 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- This series should be no-op and just adds some tests and does some refactoring in preparation for the actual bug fixes. dlls/user32/tests/input.c | 128 +++++++++++++++++++------------------- 1 file changed, 63 insertions(+), 65 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 9d75daa0bd5..9540566867f 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -3739,15 +3739,48 @@ struct get_key_state_thread_params int index; }; +#define check_get_keyboard_state(i, c, x, todo) check_get_keyboard_state_(i, c, x, todo, __LINE__) +static void check_get_keyboard_state_(int i, int c, int x, int todo, int line) +{ + unsigned char keystate[256]; + BOOL ret; + + memset(keystate, 0, sizeof(keystate)); + ret = GetKeyboardState(keystate); + ok_(__FILE__, line)(ret, "GetKeyboardState failed, %u\n", GetLastError()); + todo_wine_if(todo) ok_(__FILE__, line)(!(keystate['X'] & 0x80) == !x, "%d: expected that X keystate is %s\n", i, x ? "set" : "unset"); + ok_(__FILE__, line)(!(keystate['C'] & 0x80) == !c, "%d: expected that C keystate is %s\n", i, c ? "set" : "unset"); + + /* calling it twice shouldn't change */ + memset(keystate, 0, sizeof(keystate)); + ret = GetKeyboardState(keystate); + ok_(__FILE__, line)(ret, "GetKeyboardState failed, %u\n", GetLastError()); + todo_wine_if(todo) ok_(__FILE__, line)(!(keystate['X'] & 0x80) == !x, "%d: expected that X keystate is %s\n", i, x ? "set" : "unset"); + ok_(__FILE__, line)(!(keystate['C'] & 0x80) == !c, "%d: expected that C keystate is %s\n", i, c ? "set" : "unset"); +} + +#define check_get_key_state(i, c, x, todo) check_get_key_state_(i, c, x, todo, __LINE__) +static void check_get_key_state_(int i, int c, int x, int todo, int line) +{ + SHORT state; + + state = GetKeyState('X'); + todo_wine_if(todo) ok_(__FILE__, line)(!(state & 0x8000) == !x, "%d: expected that X highest bit is %s, got %#x\n", i, x ? "set" : "unset", state); + ok_(__FILE__, line)(!(state & 0x007e), "%d: expected that X undefined bits are unset, got %#x\n", i, state); + + state = GetKeyState('C'); + ok_(__FILE__, line)(!(state & 0x8000) == !c, "%d: expected that C highest bit is %s, got %#x\n", i, c ? "set" : "unset", state); + ok_(__FILE__, line)(!(state & 0x007e), "%d: expected that C undefined bits are unset, got %#x\n", i, state); +} + static DWORD WINAPI get_key_state_thread(void *arg) { struct get_key_state_thread_params *params = arg; struct get_key_state_test_desc* test; HANDLE *semaphores = params->semaphores; DWORD result; - BYTE keystate[256]; BOOL has_queue; - BOOL ret; + BOOL expect_x; MSG msg; int i = params->index; @@ -3770,67 +3803,21 @@ static DWORD WINAPI get_key_state_thread(void *arg) result = WaitForSingleObject(semaphores[1], 1000); ok(result == WAIT_OBJECT_0, "%d: WaitForSingleObject returned %u\n", i, result); - memset(keystate, 0, sizeof(keystate)); - ret = GetKeyboardState(keystate); - ok(ret, "GetKeyboardState failed, %u\n", GetLastError()); - result = keystate['X']; - todo_wine_if(!has_queue) - ok(!result, "%d: expected that keystate is not set, got %#x\n", i, result); - - result = keystate['C']; - ok(!result, "%d: expected that C keystate is not set, got %#x\n", i, result); + if (!has_queue) expect_x = FALSE; + else expect_x = TRUE; - result = GetKeyState('X'); - if (!has_queue) todo_wine ok(!(result & 0x8000), "%d: expected that highest bit is unset, got %#x\n", i, result); - else todo_wine ok((result & 0x8000), "%d: expected that highest bit is set, got %#x\n", i, result); - ok(!(result & 0x007e), "%d: expected that undefined bits are unset, got %#x\n", i, result); - - result = GetKeyState('C'); - ok(!(result & 0x8000), "%d: expected that C highest bit is unset, got %#x\n", i, result); - ok(!(result & 0x007e), "%d: expected that C undefined bits are unset, got %#x\n", i, result); - - memset(keystate, 0, sizeof(keystate)); - ret = GetKeyboardState(keystate); - ok(ret, "GetKeyboardState failed, %u\n", GetLastError()); - result = keystate['X']; - if (!has_queue) todo_wine ok(!result, "%d: expected that keystate is unset, got %#x\n", i, result); - else todo_wine ok(result, "%d: expected that keystate is set, got %#x\n", i, result); - - result = keystate['C']; - ok(!result, "%d: expected that C keystate is not set, got %#x\n", i, result); + check_get_keyboard_state(i, FALSE, FALSE, /* todo */ !has_queue); + check_get_key_state(i, FALSE, expect_x, /* todo */ TRUE); + check_get_keyboard_state(i, FALSE, expect_x, /* todo */ TRUE); /* key released */ ReleaseSemaphore(semaphores[0], 1, NULL); result = WaitForSingleObject(semaphores[1], 1000); ok(result == WAIT_OBJECT_0, "%d: WaitForSingleObject returned %u\n", i, result); - memset(keystate, 0, sizeof(keystate)); - ret = GetKeyboardState(keystate); - ok(ret, "GetKeyboardState failed, %u\n", GetLastError()); - result = keystate['X']; - if (!has_queue) ok(!result, "%d: expected that keystate is unset, got %#x\n", i, result); - else todo_wine ok(result, "%d: expected that keystate is set, got %#x\n", i, result); - - result = keystate['C']; - ok(!result, "%d: expected that C keystate is not set, got %#x\n", i, result); - - result = GetKeyState('X'); - ok(!(result & 0x8000), "%d: expected that highest bit is unset, got %#x\n", i, result); - ok(!(result & 0x007e), "%d: expected that undefined bits are unset, got %#x\n", i, result); - - result = GetKeyState('C'); - ok(!(result & 0x8000), "%d: expected that C highest bit is unset, got %#x\n", i, result); - ok(!(result & 0x007e), "%d: expected that C undefined bits are unset, got %#x\n", i, result); - - memset(keystate, 0, sizeof(keystate)); - ret = GetKeyboardState(keystate); - ok(ret, "GetKeyboardState failed, %u\n", GetLastError()); - result = keystate['X']; - if (!has_queue) ok(!result || broken(result) /* w2008 */, "%d: expected that keystate is unset, got %#x\n", i, result); - else todo_wine ok(result || broken(!result) /* w2008 */, "%d: expected that keystate is set, got %#x\n", i, result); - - result = keystate['C']; - ok(!result, "%d: expected that C keystate is not set, got %#x\n", i, result); + check_get_keyboard_state(i, FALSE, expect_x, /* todo */ has_queue); + check_get_key_state(i, FALSE, FALSE, /* todo */ FALSE); + check_get_keyboard_state(i, FALSE, FALSE, /* todo */ FALSE); return 0; } @@ -3841,6 +3828,7 @@ static void test_GetKeyState(void) HANDLE thread; DWORD result; BYTE keystate[256]; + BOOL expect_x; HWND hwnd; MSG msg; int i; @@ -3888,13 +3876,19 @@ static void test_GetKeyState(void) keybd_event('X', 0, 0, 0); keystate['C'] = 0xff; SetKeyboardState(keystate); + + check_get_keyboard_state(i, TRUE, FALSE, /* todo */ FALSE); + check_get_key_state(i, TRUE, FALSE, /* todo */ FALSE); + check_get_keyboard_state(i, TRUE, FALSE, /* todo */ FALSE); + if (test->peek_message_main) while (PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); - result = GetKeyState('C'); - ok((result & 0x8000), "%d: expected that highest bit is set, got %#x\n", i, result); - result = GetKeyState('X'); - if (test->peek_message_main) ok((result & 0x8000), "%d: expected that highest bit is set, got %#x\n", i, result); - else ok(!(result & 0x8000), "%d: expected that highest bit is unset, got %#x\n", i, result); + if (test->peek_message_main) expect_x = TRUE; + else expect_x = FALSE; + + check_get_keyboard_state(i, TRUE, expect_x, /* todo */ FALSE); + check_get_key_state(i, TRUE, expect_x, /* todo */ FALSE); + check_get_keyboard_state(i, TRUE, expect_x, /* todo */ FALSE); ReleaseSemaphore(params.semaphores[1], 1, NULL); @@ -3905,12 +3899,16 @@ static void test_GetKeyState(void) keybd_event('X', 0, KEYEVENTF_KEYUP, 0); keystate['C'] = 0x00; SetKeyboardState(keystate); + + check_get_keyboard_state(i, FALSE, FALSE, /* todo */ FALSE); + check_get_key_state(i, FALSE, FALSE, /* todo */ FALSE); + check_get_keyboard_state(i, FALSE, FALSE, /* todo */ FALSE); + if (test->peek_message_main) while (PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); - result = GetKeyState('C'); - ok(!(result & 0x8000), "%d: expected that highest bit is unset, got %#x\n", i, result); - result = GetKeyState('X'); - ok(!(result & 0x8000), "%d: expected that highest bit is unset, got %#x\n", i, result); + check_get_keyboard_state(i, FALSE, FALSE, /* todo */ FALSE); + check_get_key_state(i, FALSE, FALSE, /* todo */ FALSE); + check_get_keyboard_state(i, FALSE, FALSE, /* todo */ FALSE); ReleaseSemaphore(params.semaphores[1], 1, NULL); -- 2.30.2

2 9

[PATCH v3 1/7] ntoskrnl: Store root PnP devices in a linked list.
by Zebediah Figura 02 Apr '21

02 Apr '21

It is quite rare to have more than one or two of these, and lists are slightly easier to work with. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntoskrnl.exe/pnp.c | 40 +++++++++++++++++++--------------------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c index 6652be73c47..913a63e8f0d 100644 --- a/dlls/ntoskrnl.exe/pnp.c +++ b/dlls/ntoskrnl.exe/pnp.c @@ -42,6 +42,7 @@ #include "wine/exception.h" #include "wine/heap.h" #include "wine/rbtree.h" +#include "wine/list.h" #include "ntoskrnl_private.h" #include "plugplay.h" @@ -923,20 +924,25 @@ static DRIVER_OBJECT *pnp_manager; struct root_pnp_device { WCHAR id[MAX_DEVICE_ID_LEN]; - struct wine_rb_entry entry; + struct list entry; DEVICE_OBJECT *device; }; -static int root_pnp_devices_rb_compare( const void *key, const struct wine_rb_entry *entry ) +static struct list root_pnp_devices = LIST_INIT(root_pnp_devices); + +static struct root_pnp_device *find_root_pnp_device( const WCHAR *id ) { - const struct root_pnp_device *device = WINE_RB_ENTRY_VALUE( entry, const struct root_pnp_device, entry ); - const WCHAR *k = key; + struct root_pnp_device *device; - return wcsicmp( k, device->id ); + LIST_FOR_EACH_ENTRY( device, &root_pnp_devices, struct root_pnp_device, entry ) + { + if (!wcsicmp( id, device->id )) + return device; + } + + return NULL; } -static struct wine_rb_tree root_pnp_devices = { root_pnp_devices_rb_compare }; - static NTSTATUS WINAPI pnp_manager_device_pnp( DEVICE_OBJECT *device, IRP *irp ) { IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation( irp ); @@ -1043,15 +1049,12 @@ void pnp_manager_start(void) ERR("RpcBindingFromStringBinding() failed, error %#x\n", err); } -static void destroy_root_pnp_device( struct wine_rb_entry *entry, void *context ) -{ - struct root_pnp_device *device = WINE_RB_ENTRY_VALUE(entry, struct root_pnp_device, entry); - remove_device( device->device ); -} - void pnp_manager_stop(void) { - wine_rb_destroy( &root_pnp_devices, destroy_root_pnp_device, NULL ); + struct root_pnp_device *device, *next; + + LIST_FOR_EACH_ENTRY_SAFE( device, next, &root_pnp_devices, struct root_pnp_device, entry ) + remove_device( device->device ); IoDeleteDriver( pnp_manager ); RpcBindingFree( &plugplay_binding_handle ); } @@ -1088,7 +1091,7 @@ void pnp_manager_enumerate_root_devices( const WCHAR *driver_name ) SetupDiGetDeviceInstanceIdW( set, &sp_device, id, ARRAY_SIZE(id), NULL ); - if (wine_rb_get( &root_pnp_devices, id )) + if (find_root_pnp_device( id )) continue; TRACE("Adding new root-enumerated device %s.\n", debugstr_w(id)); @@ -1103,12 +1106,7 @@ void pnp_manager_enumerate_root_devices( const WCHAR *driver_name ) pnp_device = device->DeviceExtension; wcscpy( pnp_device->id, id ); pnp_device->device = device; - if (wine_rb_put( &root_pnp_devices, id, &pnp_device->entry )) - { - ERR("Failed to insert device %s into tree.\n", debugstr_w(id)); - IoDeleteDevice( device ); - continue; - } + list_add_tail( &root_pnp_devices, &pnp_device->entry ); start_device( device, set, &sp_device ); } -- 2.30.2

2 7

[PATCH v2 1/6] ntoskrnl: Store root PnP devices in a linked list.
by Zebediah Figura 02 Apr '21

02 Apr '21

It is quite rare to have more than one or two of these, and lists are slightly easier to work with. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntoskrnl.exe/pnp.c | 40 +++++++++++++++++++--------------------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c index 6652be73c47..913a63e8f0d 100644 --- a/dlls/ntoskrnl.exe/pnp.c +++ b/dlls/ntoskrnl.exe/pnp.c @@ -42,6 +42,7 @@ #include "wine/exception.h" #include "wine/heap.h" #include "wine/rbtree.h" +#include "wine/list.h" #include "ntoskrnl_private.h" #include "plugplay.h" @@ -923,19 +924,24 @@ static DRIVER_OBJECT *pnp_manager; struct root_pnp_device { WCHAR id[MAX_DEVICE_ID_LEN]; - struct wine_rb_entry entry; + struct list entry; DEVICE_OBJECT *device; }; -static int root_pnp_devices_rb_compare( const void *key, const struct wine_rb_entry *entry ) +static struct list root_pnp_devices = LIST_INIT(root_pnp_devices); + +static struct root_pnp_device *find_root_pnp_device( const WCHAR *id ) { - const struct root_pnp_device *device = WINE_RB_ENTRY_VALUE( entry, const struct root_pnp_device, entry ); - const WCHAR *k = key; + struct root_pnp_device *device; - return wcsicmp( k, device->id ); -} + LIST_FOR_EACH_ENTRY( device, &root_pnp_devices, struct root_pnp_device, entry ) + { + if (!wcsicmp( id, device->id )) + return device; + } -static struct wine_rb_tree root_pnp_devices = { root_pnp_devices_rb_compare }; + return NULL; +} static NTSTATUS WINAPI pnp_manager_device_pnp( DEVICE_OBJECT *device, IRP *irp ) { @@ -1043,15 +1049,12 @@ void pnp_manager_start(void) ERR("RpcBindingFromStringBinding() failed, error %#x\n", err); } -static void destroy_root_pnp_device( struct wine_rb_entry *entry, void *context ) -{ - struct root_pnp_device *device = WINE_RB_ENTRY_VALUE(entry, struct root_pnp_device, entry); - remove_device( device->device ); -} - void pnp_manager_stop(void) { - wine_rb_destroy( &root_pnp_devices, destroy_root_pnp_device, NULL ); + struct root_pnp_device *device, *next; + + LIST_FOR_EACH_ENTRY_SAFE( device, next, &root_pnp_devices, struct root_pnp_device, entry ) + remove_device( device->device ); IoDeleteDriver( pnp_manager ); RpcBindingFree( &plugplay_binding_handle ); } @@ -1088,7 +1091,7 @@ void pnp_manager_enumerate_root_devices( const WCHAR *driver_name ) SetupDiGetDeviceInstanceIdW( set, &sp_device, id, ARRAY_SIZE(id), NULL ); - if (wine_rb_get( &root_pnp_devices, id )) + if (find_root_pnp_device( id )) continue; TRACE("Adding new root-enumerated device %s.\n", debugstr_w(id)); @@ -1103,12 +1106,7 @@ void pnp_manager_enumerate_root_devices( const WCHAR *driver_name ) pnp_device = device->DeviceExtension; wcscpy( pnp_device->id, id ); pnp_device->device = device; - if (wine_rb_put( &root_pnp_devices, id, &pnp_device->entry )) - { - ERR("Failed to insert device %s into tree.\n", debugstr_w(id)); - IoDeleteDevice( device ); - continue; - } + list_add_tail( &root_pnp_devices, &pnp_device->entry ); start_device( device, set, &sp_device ); } -- 2.30.2

2 6

[tools resubmit] testbot/PatchUtils: Rework GetPatchImpacts() to fix patchset handling.
by Francois Gouget 02 Apr '21

02 Apr '21

Rename the Tests set to Modules since it contains information about each module impacted by the patch, including a full list of the still existing and patched test units. Better separate the build impacts from the test impacts: the former impact the build of all following parts, while only the last part impacts the tests that need to be run. This stops the TestBot from running test units which were not impacted by the _last part_ of the patchset. Document the returned $Impacts structure. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- With the Signed-off-by line this time! For the following wtbsuite tests: WTBS S8.2 - Check the make_* scripts are still run (advpack:advpack). WTBS S5.6 - Rerun a single test despite previous patches (serialui:confdlg). WTBS S5.5 - A non-test patch to another dll (serialui). WTBS S5.4 - Rerun a single test despite previous patches (msi:source). WTBS S4.3 - Trigger an autoconf run. WTBS S4.2 - Another non-test Wine patch (api-ms-win-core-timezone-l1-1-0). --- testbot/bin/WineRunBuild.pl | 6 +- testbot/bin/build/WineTest.pl | 30 +-- testbot/lib/WineTestBot/PatchUtils.pm | 370 ++++++++++++++++---------- testbot/lib/WineTestBot/Patches.pm | 15 +- testbot/web/Submit.pl | 36 ++- 5 files changed, 266 insertions(+), 191 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index adb1959f0..8a92f88d1 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -461,16 +461,16 @@ foreach my $TestStep (@{$Job->Steps->GetItems()}) my $Impacts = GetPatchImpacts($FileName); my $StepDir = $Step->CreateDir(); -foreach my $TestInfo (values %{$Impacts->{Tests}}) +foreach my $Module (values %{$Impacts->{Modules}}) { foreach my $Bits ("", "64") { - my $Local = "$TestInfo->{ExeBase}$Bits.exe"; + my $Local = "$Module->{ExeBase}$Bits.exe"; next if (!$TestExes{$Local}); Debug(Elapsed($Start), " Retrieving '$Local'\n"); my $BuildDir = "wine-$TestExes{$Local}"; - if ($TA->GetFile("$BuildDir/$TestInfo->{Path}/$TestInfo->{ExeBase}.exe", + if ($TA->GetFile("$BuildDir/$Module->{Path}/$Module->{ExeBase}.exe", "$StepDir/$Local")) { chmod 0664, "$StepDir/$Local"; diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl index 3e13637d0..ffd665faa 100755 --- a/testbot/bin/build/WineTest.pl +++ b/testbot/bin/build/WineTest.pl @@ -118,21 +118,21 @@ sub TestPatch($$) } else { - foreach my $Module (sort keys %{$Impacts->{Tests}}) + foreach my $ModuleName (sort keys %{$Impacts->{Modules}}) { - my $TestInfo = $Impacts->{Tests}->{$Module}; - if ($TestInfo->{All} or - ($Mission->{test} eq "module" and $TestInfo->{PatchedModule})) + my $Module = $Impacts->{Modules}->{$ModuleName}; + if ($Module->{All} or + ($Mission->{test} eq "module" and $Module->{Patched})) { # When given a module name WineTest runs all its tests. # But make sure the module actually has tests first! - push @TestList, $Module if (%{$TestInfo->{Files}}); + push @TestList, $ModuleName if (@{$Module->{TestUnits}}); } else { - foreach my $PatchedUnit (sort keys %{$TestInfo->{PatchedUnits}}) + foreach my $TestUnit (@{$Module->{RunTestUnits}}) { - push @TestList, "$Module:$PatchedUnit"; + push @TestList, "$ModuleName:$TestUnit"; } } } @@ -157,15 +157,15 @@ sub TestPatch($$) sub GetExecutable($$$) { - my ($Mission, $Impacts, $Module) = @_; + my ($Mission, $Impacts, $ModuleName) = @_; - my $TestInfo = $Impacts->{Tests}->{$Module}; - my $TestExecutable = "$TestInfo->{ExeBase}.exe"; + my $Module = $Impacts->{Modules}->{$ModuleName}; + my $TestExecutable = "$Module->{ExeBase}.exe"; my $Dst = "$DataDir/staging/$TestExecutable"; unlink $Dst; my $WineDir = GetWineDir($Mission); - if (!symlink "$WineDir/$TestInfo->{Path}/$TestExecutable", $Dst) + if (!symlink "$WineDir/$Module->{Path}/$TestExecutable", $Dst) { LogMsg "Could not find $TestExecutable: $!\n"; return undef; @@ -207,7 +207,7 @@ sub TestExe($$$) # my $Action = ""; -my ($Usage, $OptNoSubmit, $MissionStatement, $FileName, $Module, $BaseTag); +my ($Usage, $OptNoSubmit, $MissionStatement, $FileName, $ModuleName, $BaseTag); while (@ARGV) { my $Arg = shift @ARGV; @@ -268,9 +268,9 @@ while (@ARGV) last; # The remainder are the executable's arguments } } - elsif ($Action eq "testpatch" and !defined $Module) + elsif ($Action eq "testpatch" and !defined $ModuleName) { - $Module = $Arg; + $ModuleName = $Arg; last; # The remainder are the executable's arguments } else @@ -431,7 +431,7 @@ foreach my $Mission (@{$TaskMissions->{Missions}}) } elsif (@ARGV) { - my $FileName = GetExecutable($Mission, $Impacts, $Module); + my $FileName = GetExecutable($Mission, $Impacts, $ModuleName); exit(1) if (!$FileName or !TestExe($Mission, $FileName, \@ARGV)); } else diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 87e4508ba..0d60fdb29 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -187,25 +187,24 @@ sub LastPartSeparator() return "===== TestBot: Last patchset part =====\n"; } -sub _CreateTestInfo($$$) +sub _CreateModuleInfo($$$) { my ($Impacts, $Root, $Dir) = @_; - my $Module = _Dir2ModuleName($Root, $Dir); - $Impacts->{BuildModules}->{$Module} = 1; + my $ModuleName = _Dir2ModuleName($Root, $Dir); $Impacts->{IsWinePatch} = 1; - my $Tests = $Impacts->{Tests}; - if (!$Tests->{$Module}) + my $Module = $Impacts->{Modules}->{$ModuleName}; + if (!$Module) { - $Tests->{$Module} = { - "Module" => $Module, + $Impacts->{Modules}->{$ModuleName} = $Module = { + "Name" => $ModuleName, "Path" => "$Root/$Dir/tests", - "ExeBase" => "${Module}_test", + "ExeBase" => "${ModuleName}_test", }; - foreach my $File (keys %{$_TestList->{$Module}}) + foreach my $File (keys %{$_TestList->{$ModuleName}}) { - $Tests->{$Module}->{Files}->{$File} = 0; # not modified + $Module->{TestFiles}->{$File} = 0; # not modified } } @@ -231,9 +230,9 @@ sub _HandleFile($$$) { my ($Root, $Dir, $File) = ($1, $2, $3); - my $Module = _CreateTestInfo($Impacts, $Root, $Dir); - $Impacts->{PatchedTests} = 1; - $Impacts->{Tests}->{$Module}->{Files}->{$File} = $Change; + my $Module = _CreateModuleInfo($Impacts, $Root, $Dir); + $Module->{TestFiles}->{$File} = $Change; + $Module->{PatchedTests} = 1; if ($File eq "Makefile.in" and $Change ne "modify") { @@ -247,10 +246,9 @@ sub _HandleFile($$$) foreach my $Dir ($PatchedDir, keys %{$_WineParentDirs->{$PatchedDir} || {}}) { - my $Module = _CreateTestInfo($Impacts, $Root, $Dir); - $Impacts->{Tests}->{$Module}->{PatchedModule} = 1; + my $Module = _CreateModuleInfo($Impacts, $Root, $Dir); + $Module->{Patched} = 1; } - $Impacts->{PatchedModules} = 1; if ($File eq "Makefile.in" and $Change ne "modify") { @@ -258,35 +256,31 @@ sub _HandleFile($$$) $Impacts->{MakeMakefiles} = 1; } } - else + elsif ($Impacts->{WineFiles}->{$FilePath}) { - my $WineFiles = $Impacts->{WineFiles} || $_WineFiles; - if ($WineFiles->{$FilePath}) + if ($FilePath !~ /^(?:$AmbiguousPathsRe)/) { - if ($FilePath !~ /^(?:$AmbiguousPathsRe)/) - { - $Impacts->{IsWinePatch} = 1; - } - # Else this file exists in Wine but has a very common name so it may just - # as well belong to another repository. + $Impacts->{IsWinePatch} = 1; + } + # Else this file exists in Wine but has a very common name so it may just + # as well belong to another repository. - if ($FilePath !~ /^(?:$IgnoredPathsRe)/) + if ($FilePath !~ /^(?:$IgnoredPathsRe)/) + { + $Impacts->{BuildRoot} = $Impacts->{PatchedRoot} = 1; + if ($FilePath =~ m~/Makefile\.in$~ and $Change ne "modify") { - $Impacts->{PatchedRoot} = 1; - if ($FilePath =~ m~/Makefile\.in$~ and $Change ne "modify") - { - # This adds / removes a directory - $Impacts->{MakeMakefiles} = 1; - } + # This adds / removes a directory + $Impacts->{MakeMakefiles} = 1; } - # Else patches to this file don't impact the Wine build. - } - elsif ($FilePath =~ m~/Makefile\.in$~ and $Change eq "new") - { - # This may or may not be a Wine patch but the new Makefile.in will be - # added to the build by make_makefiles. - $Impacts->{PatchedRoot} = $Impacts->{MakeMakefiles} = 1; } + # Else patches to this file don't impact the Wine build. + } + elsif ($FilePath =~ m~/Makefile\.in$~ and $Change eq "new") + { + # This may or may not be a Wine patch but the new Makefile.in will be + # added to the build by make_makefiles. + $Impacts->{BuildRoot} = $Impacts->{PatchedRoot} = $Impacts->{MakeMakefiles} = 1; } } @@ -299,6 +293,121 @@ Analyzes a patch and returns a hashtable describing the impact it has on the Wine build: whether it requires updating the makefiles, re-running autoconf or configure, whether it impacts the tests, etc. +Notes: A module is a dlls/ or programs/ directory. All references to patchsets +mean the patchset as being tested. So if a patch series has 5 parts and the +TestBot is testing part 3, the LAST PART is part 3, and ANY PART means part 1, +2 or 3. + +=over +=item IsWinePatch + +This flag is set if the LAST PART of the patchset has been identified as a +Wine patch. + +=item BuildModules + +This is a count of the number of modules where either the source or the tests +have been modified by ANY PART of the patchset. + +=item BuildRoot + +This flag is set if ANY PART of the patchset modified the Wine source +outside of a specific module in a way that impacts the build. + +=item Autoconf +=item MakeErrors +=item MakeFir +=item MakeMakefiles +=item MakeOpenGL +=item MakeRequests +=item MakeUnicode +=item MakeVulkan + +These flags are set if ANY PART of the patchset requires running the +corresponding script before building Wine. + +=item TestBuild + +This flag is set if the LAST PART of the patchset modified the Wine source +such that the build needs to be tested. + +=item RunTestUnits +=item PatchedModules +=item PatchedModuleOrTests + +These are counts based on the LAST PART of the patchset, so excluding any +impact from PREVIOUS PARTS. They count, respectively, the test units that need +to be rerun (so excluding deleted ones), the modules whose source has been +modified (including file deletions), and the modules where either the source +or the tests have been modified (again including deletions). + +=item PatchedRoot + +This flag is set if the LAST PART of the patchset modified the Wine source +outside of a specific module. + +=item Modules + +A set of structures containing information about each module impacted by +ANY PART of the patchset, indexed by module name. Each module has the +following information: + +=over + +=item Patched + +This flag is true if the LAST PART of the patchset has modified the module +itself, so excluding its test units. + +=item PatchedTests + +This flag is true if the LAST PART of the patchset has modified the tests of +the module. + +=item TestUnits + +This is an alphabetical list of the module's test units, after applying the +patchset (so excluding any test unit deleted by the patchset). + +=item All + +This flag is true if all the module's test units are impacted by the LAST PART +of the patchset. This is typically true if a resource file or helper dll is +modified. + +=item RunTestUnits + +This is an alphabetical list of the module's test units that are impacted by +the LAST PART of the patchset such that they should be rerun. In particular if +All is true this is identical to TestUnits. + +=item TestFiles + +This hashtable is indexed by the filenames of the files in the module's tests +directory. Note that this is not limited to the test unit C files but also +includes the resource files, makefile and helper dlls (but not testlist.c). +For each file the value describes the modification performed by the +LAST PART of the patchset: 0 (false) if there is no modification, "modify" for +modified files, "new" for added files and "rm" for deletions. + +=back + +=item WineFiles + +The keys of this hashtable enumerate all the Wine source files, including all +files added and removed by PREVIOUS PARTS of the patchset. +This is mostly for the internal use of the impact analyzer and should be +treated as read-only by outside code (and copy-on-write by the analyzer). + +=item NewFiles +=item DeletedFiles + +The keys of these hashtables enumerate, respectively, the files added and +removed by the LAST PART of the patchset. +This is mostly for the internal use of the impact analyzer. + +=back + =back =cut @@ -309,39 +418,31 @@ sub GetPatchImpacts($) my $fh; return undef if (!open($fh, "<", $PatchFileName)); - my $Impacts = { - # Number of test units impacted either directly, or indirectly by a module - # patch. - ModuleUnitCount => 0, - # Number of patched test units. - TestUnitCount => 0, - # The modules that need a rebuild, even if only for the tests. - BuildModules => {}, - # Information about 'tests' directories. - Tests => {}, - }; _LoadWineFiles(); - my $PastImpacts; + my $Impacts = { Modules => {}, WineFiles => $_WineFiles }; my ($Path, $Change); while (my $Line = <$fh>) { + # All the files on '---' lines will be passed to _HandleFile() when the + # corresponding '+++' line comes. if ($Line =~ m=^--- \w+/(aclocal\.m4|configure\.ac)$=) { $Path = $1; - $Impacts->{PatchedRoot} = $Impacts->{Autoconf} = 1; + $Impacts->{BuildRoot} = $Impacts->{Autoconf} = 1; + $Impacts->{PatchedRoot} = 1; } elsif ($Line =~ m=^--- \w+/(tools/make_makefiles)$=) { $Path = $1; - $Impacts->{PatchedRoot} = $Impacts->{MakeMakefiles} = 1; - $Impacts->{IsWinePatch} = 1; + $Impacts->{BuildRoot} = $Impacts->{MakeMakefiles} = 1; + $Impacts->{PatchedRoot} = $Impacts->{IsWinePatch} = 1; } elsif ($Line =~ m=^--- \w+/(tools/make_requests|server/protocol\.def)$=) { $Path = $1; - $Impacts->{PatchedRoot} = $Impacts->{MakeRequests} = 1; - $Impacts->{IsWinePatch} = 1; + $Impacts->{BuildRoot} = $Impacts->{MakeRequests} = 1; + $Impacts->{PatchedRoot} = $Impacts->{IsWinePatch} = 1; } elsif ($Line =~ m=^--- \w+/(dlls/dsound/make_fir)$=) { @@ -358,20 +459,20 @@ sub GetPatchImpacts($) elsif ($Line =~ m=^--- \w+/(dlls/opengl32/make_opengl|dlls/opengl32/winegl\.xml|include/wine/wgl_driver\.h)$=) { $Path = $1; - $Impacts->{PatchedRoot} = $Impacts->{MakeOpenGL} = 1; - $Impacts->{IsWinePatch} = 1; + $Impacts->{BuildRoot} = $Impacts->{MakeOpenGL} = 1; + $Impacts->{PatchedRoot} = $Impacts->{IsWinePatch} = 1; } elsif ($Line =~ m=^--- \w+/(dlls/winevulkan/make_vulkan)$=) { $Path = $1; - $Impacts->{PatchedRoot} = $Impacts->{MakeVulkan} = 1; - $Impacts->{IsWinePatch} = 1; + $Impacts->{BuildRoot} = $Impacts->{MakeVulkan} = 1; + $Impacts->{PatchedRoot} = $Impacts->{IsWinePatch} = 1; } elsif ($Line =~ m=^--- \w+/(tools/make_unicode)$=) { $Path = $1; - $Impacts->{PatchedRoot} = $Impacts->{MakeUnicode} = 1; - $Impacts->{IsWinePatch} = 1; + $Impacts->{BuildRoot} = $Impacts->{MakeUnicode} = 1; + $Impacts->{PatchedRoot} = $Impacts->{IsWinePatch} = 1; } elsif ($Line =~ m=^--- /dev/null$=) { @@ -398,16 +499,18 @@ sub GetPatchImpacts($) elsif ($Line eq LastPartSeparator()) { # All the diffs so far belong to previous parts of this patchset. - # But: - # - Only the last part must be taken into account to determine if a - # rebuild and testing is needed. - # - Yet if a rebuild is needed the previous parts' patches will impact - # the scope of the rebuild so that information must be preserved. - # So save current impacts in $PastImpacts and reset the current state. - $PastImpacts = {}; - - # Build a copy of the Wine files list reflecting the current situation. - $Impacts->{WineFiles} = { %$_WineFiles } if (!$Impacts->{WineFiles}); + # But only the last part must be taken into account to determine if + # testing is needed. So reset all the Patched* fields. + + delete $Impacts->{PatchedRoot}; + foreach my $Module (values %{$Impacts->{Modules}}) + { + delete $Module->{Patched}; + delete $Module->{PatchedTests}; + } + + # Make a copy of the Wine files list reflecting the current situation. + $Impacts->{WineFiles} = { %{$Impacts->{WineFiles}} }; if ($Impacts->{IsWinePatch} or $Impacts->{MakeMakefiles}) { map { $Impacts->{WineFiles}->{$_} = 1 } keys %{$Impacts->{NewFiles}}; @@ -417,30 +520,23 @@ sub GetPatchImpacts($) delete $Impacts->{IsWinePatch}; } - # The modules impacted by previous parts will still need to be built, - # but only if the last part justifies a build. So make a backup. - $PastImpacts->{BuildModules} = $Impacts->{BuildModules}; - $Impacts->{BuildModules} = {}; - - # Also backup the build-related fields. - foreach my $Field ("PatchedRoot", "PatchedModules", "PatchedTests") + # Reset the status of all modified test unit files to not modified + # (deleted files won't come back). + foreach my $Module (values %{$Impacts->{Modules}}) { - $PastImpacts->{$Field} = $Impacts->{$Field}; - $Impacts->{$Field} = undef; - } - - # Reset the status of all test unit files to not modified. - foreach my $TestInfo (values %{$Impacts->{Tests}}) - { - foreach my $File (keys %{$TestInfo->{Files}}) + my $TestFiles = $Module->{TestFiles}; + foreach my $File (keys %$TestFiles) { - if ($TestInfo->{Files}->{$File} ne "rm") + if ($TestFiles->{$File} eq "rm") + { + delete $TestFiles->{$File}; + } + else { - $TestInfo->{Files}->{$File} = 0; + $TestFiles->{$File} = 0; } } } - $Impacts->{ModuleUnitCount} = $Impacts->{TestUnitCount} = 0; } else { @@ -450,76 +546,58 @@ sub GetPatchImpacts($) } close($fh); - foreach my $TestInfo (values %{$Impacts->{Tests}}) + # Calculate the impact counts and lists of test units. + foreach my $Module (values %{$Impacts->{Modules}}) { - # For each module, identify modifications to non-C files and helper dlls - foreach my $File (keys %{$TestInfo->{Files}}) + $Module->{TestUnits} = []; + $Module->{RunTestUnits} = []; + + # For each module build the lists of test units + my $TestFiles = $Module->{TestFiles}; + foreach my $File (sort keys %$TestFiles) { - # Skip unmodified files - next if (!$TestInfo->{Files}->{$File}); # Assume makefile modifications may break the build but not the tests next if ($File eq "Makefile.in"); my $Base = $File; if ($Base !~ s/(?:\.c|\.spec)$//) { - # Any change to a non-C non-Spec file can potentially impact all tests - $TestInfo->{All} = 1; - last; + # Any change to a non-C non-Spec file (including deletions) can + # potentially impact all tests + $Module->{All} = 1 if ($TestFiles->{$File}); + next; } - if (exists $TestInfo->{Files}->{"$Base.spec"} and - ($TestInfo->{Files}->{"$Base.c"} or - $TestInfo->{Files}->{"$Base.spec"})) - { - # Any change to a helper dll can potentially impact all tests - $TestInfo->{All} = 1; - last; - } - } - $TestInfo->{PatchedUnits} = {}; - foreach my $File (keys %{$TestInfo->{Files}}) - { - my $Base = $File; - # Non-C files are not test units - next if ($Base !~ s/(?:\.c|\.spec)$//); - # Helper dlls are not test units - next if (exists $TestInfo->{Files}->{"$Base.spec"}); - # Don't try running a deleted test unit obviously - next if ($TestInfo->{Files}->{$File} eq "rm"); - $TestInfo->{AllUnits}->{$Base} = 1; - - if ($TestInfo->{All} or $TestInfo->{Files}->{$File}) + if (exists $TestFiles->{"$Base.spec"}) { - $TestInfo->{PatchedUnits}->{$Base} = 1; - $Impacts->{ModuleUnitCount}++; + # This is a helper dll, not a test unit. + # Any change, including deletions, could impact all tests. + $Module->{All} ||= ($TestFiles->{"$Base.c"} or + $TestFiles->{"$Base.spec"}); + next; } - elsif ($TestInfo->{PatchedModule}) + + if ($TestFiles->{$File} ne "rm") { - # The module has been patched so this test unit is impacted indirectly. - $Impacts->{ModuleUnitCount}++; + push @{$Module->{TestUnits}}, $Base; + push @{$Module->{RunTestUnits}}, $Base if ($TestFiles->{$File}); } } + $Module->{All} ||= (@{$Module->{TestUnits}} == @{$Module->{RunTestUnits}}); + $Module->{RunTestUnits} = $Module->{TestUnits} if ($Module->{All}); - $TestInfo->{UnitCount} = scalar(keys %{$TestInfo->{PatchedUnits}}); - $Impacts->{TestUnitCount} += $TestInfo->{UnitCount}; - } - - if ($Impacts->{PatchedRoot} or $Impacts->{PatchedModules} or - $Impacts->{PatchedTests}) - { - # Any patched area will need to be rebuilt... - $Impacts->{RebuildRoot} = $Impacts->{PatchedRoot}; - $Impacts->{RebuildModules} = $Impacts->{PatchedModules}; + my $RunTestUnits = scalar(@{$Module->{RunTestUnits}}); + $Impacts->{RunTestUnits} += $RunTestUnits; + $Impacts->{ModuleTestUnits} += $Module->{Patched} ? scalar(@{$Module->{TestUnits}}) : $RunTestUnits; - # ... even if the patch was in previous parts - if ($PastImpacts) + if ($Module->{Patched} or $Module->{PatchedTests}) { - $Impacts->{RebuildRoot} ||= $PastImpacts->{PatchedRoot}; - $Impacts->{RebuildModules} ||= $PastImpacts->{PatchedModules}; - map { $Impacts->{BuildModules}->{$_} = 1 } keys %{$PastImpacts->{BuildModules}}; + $Impacts->{PatchedModuleOrTests}++; + $Impacts->{PatchedModules}++ if ($Module->{Patched}); } + $Impacts->{BuildModules}++; } + $Impacts->{TestBuild} = $Impacts->{PatchedRoot} || $Impacts->{PatchedModuleOrTests}; return $Impacts; } @@ -534,11 +612,11 @@ sub GetBuildTimeout($$) my ($Impacts, $TaskMissions) = @_; my ($ExeCount, $WineCount); - map {$_ =~ /^exe/ ? $ExeCount++ : $WineCount++ } keys %{$TaskMissions->{Builds}}; + map { $_ =~ /^exe/ ? $ExeCount++ : $WineCount++ } keys %{$TaskMissions->{Builds}}; # Set $ModuleCount to 0 if a full rebuild is needed - my $ModuleCount = (!$Impacts or $Impacts->{RebuildRoot}) ? 0 : - scalar(keys %{$Impacts->{BuildModules}}); + my $ModuleCount = (!$Impacts or $Impacts->{BuildRoot}) ? 0 : + $Impacts->{BuildModules}; my $Reconfig = (!$Impacts or $Impacts->{Autoconf} or $Impacts->{MakeMakefiles}); my ($ExeTimeout, $WineTimeout) = (0, 0); @@ -575,9 +653,9 @@ sub GetTestTimeout($$) elsif ($Mission->{test} ne "build") { # Note: If only test units have been patched then - # ModuleUnitCount == TestUnitCount. - my $UnitCount = $Mission->{test} eq "test" ? $Impacts->{TestUnitCount} : - $Impacts->{ModuleUnitCount}; + # ModuleTestUnits == RunTestUnits. + my $UnitCount = $Mission->{test} eq "test" ? $Impacts->{RunTestUnits} : + $Impacts->{ModuleTestUnits}; my $TestsTimeout = min(2, $UnitCount) * $SingleTimeout + max(0, $UnitCount - 2) * $SingleAvgTime; $Timeout += min($SuiteTimeout, $TestsTimeout); diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index b6a8af4c4..cc0fbe94a 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -213,8 +213,7 @@ sub Submit($$;$) $SubjectInfo ||= $self->ParseSubject(); my $Impacts = GetPatchImpacts($PatchFileName); - if (!$Impacts->{PatchedRoot} and !$Impacts->{PatchedModules} and - !$Impacts->{PatchedTests}) + if (!$Impacts->{TestBuild}) { if ($Impacts->{IsWinePatch}) { @@ -255,14 +254,14 @@ sub Submit($$;$) my $BuildVMs = CreateVMs(); $BuildVMs->AddFilter("Type", ["build"]); $BuildVMs->AddFilter("Role", ["base"]); - if ($Impacts->{TestUnitCount} and !$BuildVMs->IsEmpty()) + if ($Impacts->{RunTestUnits} and !$BuildVMs->IsEmpty()) { # Create steps for the Windows tests my ($BuildStep, $BuildMissions); - foreach my $Module (sort keys %{$Impacts->{Tests}}) + foreach my $ModuleName (sort keys %{$Impacts->{Modules}}) { - my $TestInfo = $Impacts->{Tests}->{$Module}; - foreach my $PatchedUnit (sort keys %{$TestInfo->{PatchedUnits}}) + my $Module = $Impacts->{Modules}->{$ModuleName}; + foreach my $TestUnit (@{$Module->{RunTestUnits}}) { foreach my $Bits ("32", "64") { @@ -305,7 +304,7 @@ sub Submit($$;$) # Create one Step per (module, unit, bitness) combination my $NewStep = $NewJob->Steps->Add(); $NewStep->PreviousNo($BuildStep->No); - my $FileName = $TestInfo->{ExeBase}; + my $FileName = $Module->{ExeBase}; $FileName .= "64" if ($Bits eq "64"); $NewStep->FileName("$FileName.exe"); $NewStep->FileType("exe$Bits"); @@ -317,7 +316,7 @@ sub Submit($$;$) $Task->VM($VM); $Task->Timeout($SingleTimeout); $Task->Missions($TaskMissions->{Statement}); - $Task->CmdLineArg($PatchedUnit); + $Task->CmdLineArg($TestUnit); } } } diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 68978f089..76069bbc3 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -168,15 +168,13 @@ sub _AnalyzePatch($) $self->{Impacts} ||= GetPatchImpacts($self->_GetStagingFilePath()); - if (!$self->{Impacts}->{PatchedRoot} and - !$self->{Impacts}->{PatchedModules} and - !$self->{Impacts}->{PatchedTests}) + if (!$self->{Impacts}->{TestBuild}) { $self->{ErrField} = "FileName"; $self->{ErrMessage} = "'$self->{FileName}' is not a valid patch"; return undef; } - if ($self->{Impacts}->{ModuleUnitCount} == 0) + if ($self->{Impacts}->{PatchedModuleOrTests} == 0) { $self->{ErrField} = "FileName"; $self->{ErrMessage} = "The patch does not directly impact the Wine dlls and programs"; @@ -307,11 +305,10 @@ sub _GetTestExecutables($) { if ($self->{FileType} eq "patch") { - foreach my $Module (sort keys %{$self->{Impacts}->{Tests}}) + foreach my $Module (values %{$self->{Impacts}->{Modules}}) { - my $TestInfo = $self->{Impacts}->{Tests}->{$Module}; - next if (!%{$TestInfo->{Files}}); - $self->{TestExecutables}->{"$TestInfo->{ExeBase}.exe"} = $Module; + next if (!@{$Module->{TestUnits}}); + $self->{TestExecutables}->{"$Module->{ExeBase}.exe"} = $Module->{Name}; } } else @@ -332,10 +329,10 @@ sub _ValidateTestExecutable($;$) $self->{TestExecutable} = (sort keys %{$self->{TestExecutables}})[0]; if (!defined $self->{CmdLineArg} and $self->{Impacts}) { - my $Module = $self->{TestExecutables}->{$self->{TestExecutable}}; - my $TestInfo = $self->{Impacts}->{Tests}->{$Module}; - $self->{CmdLineArg} = (sort keys %{$TestInfo->{PatchedUnits}})[0] || - (sort keys %{$TestInfo->{AllUnits}})[0]; + my $ModuleName = $self->{TestExecutables}->{$self->{TestExecutable}}; + my $Module = $self->{Impacts}->{Modules}->{$ModuleName}; + $self->{CmdLineArg} = ($Module->{RunTestUnits}->[0] || + $Module->{TestUnits}->[0]); } } @@ -640,21 +637,22 @@ sub GetHeaderText($) $self->_GetTestExecutables(); foreach my $TestExecutable (sort keys %{$self->{TestExecutables}}) { - my $Module = $self->{TestExecutables}->{$TestExecutable}; - my $TestInfo = $self->{Impacts}->{Tests}->{$Module}; + my $ModuleName = $self->{TestExecutables}->{$TestExecutable}; + my $Module = $self->{Impacts}->{Modules}->{$ModuleName}; my @TestUnits; - foreach my $TestUnit (sort keys %{$TestInfo->{AllUnits}}) + foreach my $TestUnit (@{$Module->{TestUnits}}) { - if ($TestInfo->{PatchedUnits}->{$TestUnit}) + if ($Module->{TestFiles}->{"$TestUnit.c"}) { + # This test unit was patched push @TestUnits, "<i>$TestUnit</i>"; } - elsif ($TestInfo->{All} or $TestInfo->{PatchedModule}) + elsif ($Module->{All} or $Module->{Patched}) { push @TestUnits, $TestUnit; } } - push @TestExecutables, "$Module: ". join(" ", @TestUnits) if (@TestUnits); + push @TestExecutables, "$ModuleName: ". join(" ", @TestUnits) if (@TestUnits); } push @Headers, join("<br>\n", "Here is a list of the test executables impacted by the patch (patched test units, if any, are in italics).", @TestExecutables); } @@ -788,7 +786,7 @@ sub GenerateFields($) if (!$self->{UserVMSelection} and !$VMRow->{Extra} and $VMRow->{VM}->Status !~ /^(?:offline|maintenance)$/ and ($VMRow->{VM}->Type eq "wine" or !$self->{Impacts} or - $self->{Impacts}->{TestUnitCount})) + $self->{Impacts}->{RunTestUnits})) { $VMRow->{Checked} = 1; } -- 2.20.1

1 0

[v2 PATCH 1/3] mfuuid: Add mfplay GUIDs.
by Nikolay Sivov 01 Apr '21

01 Apr '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfuuid/Makefile.in | 1 + dlls/mfuuid/mfplay.c | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 dlls/mfuuid/mfplay.c diff --git a/dlls/mfuuid/Makefile.in b/dlls/mfuuid/Makefile.in index 5fbb522782c..b42583bbb73 100644 --- a/dlls/mfuuid/Makefile.in +++ b/dlls/mfuuid/Makefile.in @@ -1,4 +1,5 @@ MODULE = libmfuuid.a C_SRCS = \ + mfplay.c \ mfuuid.c diff --git a/dlls/mfuuid/mfplay.c b/dlls/mfuuid/mfplay.c new file mode 100644 index 00000000000..1d28306fe4f --- /dev/null +++ b/dlls/mfuuid/mfplay.c @@ -0,0 +1,21 @@ +/* + * Copyright 2021 Nikolay Sivov for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "evr.h" +#include "initguid.h" +#include "mfplay.h" -- 2.30.2

2 3

[PATCH 1/3] mfuuid: Add mfplay GUIDs.
by Nikolay Sivov 01 Apr '21

01 Apr '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfuuid/mfuuid.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/mfuuid/mfuuid.c b/dlls/mfuuid/mfuuid.c index 537eaef6427..ae649cce633 100644 --- a/dlls/mfuuid/mfuuid.c +++ b/dlls/mfuuid/mfuuid.c @@ -35,3 +35,8 @@ DEFINE_GUID(MF_SCRUBBING_SERVICE, 0xdd0ac3d8,0x40e3,0x4128,0xac,0x48,0xc0,0xad,0xd0,0x67,0xb7,0x14); DEFINE_GUID(CLSID_FileSchemePlugin, 0x477ec299,0x1421,0x4bdd,0x97,0x1f,0x7c,0xcb,0x93,0x3f,0x21,0xad); + +/* mfplay.h is not used here because of the other header it includes, particularly evr.idl */ +DEFINE_GUID(IID_IMFPMediaPlayer, 0xa714590a,0x58af,0x430a,0x85,0xbf,0x44,0xf5,0xec,0x83,0x8d,0x85); +DEFINE_GUID(IID_IMFPMediaPlayerCallback, 0x766c8ffb,0x5fdb,0x4fea,0xa2,0x8d,0xb9,0x12,0x99,0x6f,0x51,0xbd); +DEFINE_GUID(IID_IMFPMediaItem, 0x90eb3e6b,0xecbf,0x45cc,0xb1,0xda,0xc6,0xfe,0x3e,0xa7,0x0d,0x57); -- 2.30.2

3 7

[PATCH 6/6] jscript: Add Object.seal implementation.
by Jacek Caban 01 Apr '21

01 Apr '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/dispex.c | 4 ++-- dlls/jscript/jscript.h | 2 +- dlls/jscript/object.c | 26 ++++++++++++++++++++++++- dlls/mshtml/tests/es5.js | 41 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 69 insertions(+), 4 deletions(-)

2 1

[PATCH] msvcrt: Handle negative zero (-0.0) in _ecvt and others.
by Lauri Kenttä 01 Apr '21

01 Apr '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50885 Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> --- v2: More compact version. dlls/msvcrt/math.c | 18 ++++++++---------- dlls/msvcrt/tests/printf.c | 4 ++++ 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 6b2d08a8294..eb25b578a2b 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2585,7 +2585,7 @@ char * CDECL _ecvt( double number, int ndigits, int *decpt, int *sign ) if (!data->efcvt_buffer) data->efcvt_buffer = malloc( 80 ); /* ought to be enough */ - if( number < 0) { + if (number < 0 || (number == 0 && signbit(number))) { *sign = TRUE; number = -number; } else @@ -2648,7 +2648,7 @@ int CDECL _ecvt_s( char *buffer, size_t length, double number, int ndigits, int if( prec < 1) prec = 2; result = malloc(prec + 7); - if( number < 0) { + if (number < 0 || (number == 0 && signbit(number))) { *sign = TRUE; number = -number; } else @@ -2690,10 +2690,9 @@ char * CDECL _fcvt( double number, int ndigits, int *decpt, int *sign ) if (!data->efcvt_buffer) data->efcvt_buffer = malloc( 80 ); /* ought to be enough */ - if (number < 0) - { - *sign = 1; - number = -number; + if (number < 0 || (number == 0 && signbit(number))) { + *sign = 1; + number = -number; } else *sign = 0; stop = _snprintf(buf, 80, "%.*f", ndigits < 0 ? 0 : ndigits, number); @@ -2774,10 +2773,9 @@ int CDECL _fcvt_s(char* outbuffer, size_t size, double number, int ndigits, int return EINVAL; } - if (number < 0) - { - *sign = 1; - number = -number; + if (number < 0 || (number == 0 && signbit(number))) { + *sign = 1; + number = -number; } else *sign = 0; stop = _snprintf(buf, 80, "%.*f", ndigits < 0 ? 0 : ndigits, number); diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index 8960671f23e..14fd75d2b3c 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -647,6 +647,10 @@ static struct { { 0.0, 5, "00000", "00000", 0, 0, 0 }, { 0.0, 0, "", "", 0, 0, 0 }, { 0.0, -1, "", "", 0, 0, 0 }, + /* -0.0 with different precisions */ + { -0.0, 5, "00000", "00000", 0, 0, 1 }, + { -0.0, 0, "", "", 0, 0, 1 }, + { -0.0, -1, "", "", 0, 0, 1 }, /* Numbers > 1.0 with 0 or -ve precision */ { -123.0001, 0, "", "123", 3, 3, 1 }, { -123.0001, -1, "", "12", 3, 3, 1 }, -- 2.31.0

2 2