- Wine-Devel - list.winehq.org

[PATCH 1/5] mountmgr.sys: Move query_unix_drive to drive.c.
by Erich E. Hoover March 24, 2021

March 24, 2021

The purpose of this patchset is to further consolidate the volume information in the mountmgr. Currently there are a couple of different paths that can be taken to obtain the volume information, by the end of this set all FileFsAttributeInformation/FileFsVolumeInformation queries run through the same code in the mountmgr. This particular patch just moves query_unix_device to facilitate code reuse in later patches. Best, Erich

2 1

[PATCH vkd3d 1/6] vkd3d-shader: Forbid storage modifiers on struct fields.
by Zebediah Figura March 24, 2021

March 24, 2021

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.c | 1 - libs/vkd3d-shader/hlsl.h | 1 - libs/vkd3d-shader/hlsl.y | 15 +++++++++++---- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 85859ada..4526348e 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -340,7 +340,6 @@ struct hlsl_type *hlsl_type_clone(struct hlsl_ctx *ctx, struct hlsl_type *old, u field->name = vkd3d_strdup(old_field->name); if (old_field->semantic) field->semantic = vkd3d_strdup(old_field->semantic); - field->modifiers = old_field->modifiers; field->reg_offset = reg_size; reg_size += field->type->reg_size; list_add_tail(type->e.elements, &field->entry); diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 819b8826..523d156d 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -134,7 +134,6 @@ struct hlsl_struct_field struct hlsl_type *type; const char *name; const char *semantic; - DWORD modifiers; unsigned int reg_offset; }; diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 45767de9..4b0ddea4 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -721,8 +721,7 @@ static struct hlsl_type *apply_type_modifiers(struct hlsl_ctx *ctx, struct hlsl_ return new_type; } -static struct list *gen_struct_fields(struct hlsl_ctx *ctx, struct hlsl_type *type, - DWORD modifiers, struct list *fields) +static struct list *gen_struct_fields(struct hlsl_ctx *ctx, struct hlsl_type *type, struct list *fields) { struct parse_variable_def *v, *v_next; struct hlsl_struct_field *field; @@ -748,7 +747,6 @@ static struct list *gen_struct_fields(struct hlsl_ctx *ctx, struct hlsl_type *ty field->type = hlsl_new_array_type(ctx, field->type, v->arrays.sizes[i]); field->loc = v->loc; field->name = v->name; - field->modifiers = modifiers; field->semantic = v->semantic; if (v->initializer.args_count) { @@ -1937,7 +1935,16 @@ field: if (!(type = apply_type_modifiers(ctx, $2, &modifiers, @1))) YYABORT; - $$ = gen_struct_fields(ctx, type, modifiers, $3); + if (modifiers) + { + struct vkd3d_string_buffer *string; + + if ((string = hlsl_modifiers_to_string(&ctx->string_buffers, modifiers))) + hlsl_error(ctx, @1, VKD3D_SHADER_ERROR_HLSL_INVALID_MODIFIER, + "Modifiers '%s' are not allowed on struct fields.", string->buffer); + vkd3d_string_buffer_release(&ctx->string_buffers, string); + } + $$ = gen_struct_fields(ctx, type, $3); } func_declaration: -- 2.31.0

5 19

[PATCH] ws2_32: Copy send buffer data in WS2_ConnectEx().
by Paul Gofman March 24, 2021

March 24, 2021

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50738 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ws2_32/socket.c | 11 +++++++++-- dlls/ws2_32/tests/sock.c | 1 + 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 28b14e71c9c..366aa969c36 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3447,14 +3447,18 @@ static BOOL WINAPI WS2_ConnectEx(SOCKET s, const struct WS_sockaddr* name, int n else if (ret == WSAEINPROGRESS) { struct ws2_async *wsa; + DWORD size; + ULONG_PTR cvalue = (((ULONG_PTR)ov->hEvent & 1) == 0) ? (ULONG_PTR)ov : 0; _enable_event(SOCKET2HANDLE(s), FD_CONNECT|FD_READ|FD_WRITE, FD_CONNECT, FD_WINE_CONNECTED|FD_WINE_LISTENING); + size = offsetof( struct ws2_async, iovec[1] ) + sendBufLen; + /* Indirectly call WSASend */ - if (!(wsa = (struct ws2_async *)alloc_async_io( offsetof( struct ws2_async, iovec[1] ), WS2_async_send ))) + if (!(wsa = (struct ws2_async *)alloc_async_io( size, WS2_async_send ))) { SetLastError(WSAEFAULT); } @@ -3473,9 +3477,12 @@ static BOOL WINAPI WS2_ConnectEx(SOCKET s, const struct WS_sockaddr* name, int n wsa->n_iovecs = sendBuf ? 1 : 0; wsa->first_iovec = 0; wsa->completion_func = NULL; - wsa->iovec[0].iov_base = sendBuf; + wsa->iovec[0].iov_base = sendBuf ? (BYTE *)wsa + offsetof( struct ws2_async, iovec[1] ) : NULL; wsa->iovec[0].iov_len = sendBufLen; + if (sendBuf) + memcpy( wsa->iovec[0].iov_base, sendBuf, sendBufLen ); + status = register_async( ASYNC_TYPE_WRITE, wsa->hSocket, &wsa->io, ov->hEvent, NULL, (void *)cvalue, iosb ); if (status != STATUS_PENDING) HeapFree(GetProcessHeap(), 0, wsa); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index cab25baf1d1..cedbf423d97 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -7296,6 +7296,7 @@ static void test_ConnectEx(void) buffer[1] = '2'; buffer[2] = '3'; bret = pConnectEx(connector, (struct sockaddr*)&address, addrlen, buffer, 3, &bytesReturned, &overlapped); + memset(buffer, 0, 3); ok(bret == FALSE && WSAGetLastError() == ERROR_IO_PENDING, "ConnectEx failed: " "returned %d + errno %d\n", bret, WSAGetLastError()); dwret = WaitForSingleObject(overlapped.hEvent, 15000); -- 2.30.2

3 3

[PATCH v2] ws2_32: Copy send buffer data for async send in WS2_ConnectEx().
by Paul Gofman March 24, 2021

March 24, 2021

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50738 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ws2_32/socket.c | 11 +++++++++-- dlls/ws2_32/tests/sock.c | 1 + 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 28b14e71c9c..6436eb5ef99 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3447,14 +3447,18 @@ static BOOL WINAPI WS2_ConnectEx(SOCKET s, const struct WS_sockaddr* name, int n else if (ret == WSAEINPROGRESS) { struct ws2_async *wsa; + DWORD size; + ULONG_PTR cvalue = (((ULONG_PTR)ov->hEvent & 1) == 0) ? (ULONG_PTR)ov : 0; _enable_event(SOCKET2HANDLE(s), FD_CONNECT|FD_READ|FD_WRITE, FD_CONNECT, FD_WINE_CONNECTED|FD_WINE_LISTENING); + size = offsetof( struct ws2_async, iovec[1] ) + sendBufLen; + /* Indirectly call WSASend */ - if (!(wsa = (struct ws2_async *)alloc_async_io( offsetof( struct ws2_async, iovec[1] ), WS2_async_send ))) + if (!(wsa = (struct ws2_async *)alloc_async_io( size, WS2_async_send ))) { SetLastError(WSAEFAULT); } @@ -3473,9 +3477,12 @@ static BOOL WINAPI WS2_ConnectEx(SOCKET s, const struct WS_sockaddr* name, int n wsa->n_iovecs = sendBuf ? 1 : 0; wsa->first_iovec = 0; wsa->completion_func = NULL; - wsa->iovec[0].iov_base = sendBuf; + wsa->iovec[0].iov_base = sendBuf ? &wsa->iovec[1] : NULL; wsa->iovec[0].iov_len = sendBufLen; + if (sendBuf) + memcpy( wsa->iovec[0].iov_base, sendBuf, sendBufLen ); + status = register_async( ASYNC_TYPE_WRITE, wsa->hSocket, &wsa->io, ov->hEvent, NULL, (void *)cvalue, iosb ); if (status != STATUS_PENDING) HeapFree(GetProcessHeap(), 0, wsa); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index cab25baf1d1..cedbf423d97 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -7296,6 +7296,7 @@ static void test_ConnectEx(void) buffer[1] = '2'; buffer[2] = '3'; bret = pConnectEx(connector, (struct sockaddr*)&address, addrlen, buffer, 3, &bytesReturned, &overlapped); + memset(buffer, 0, 3); ok(bret == FALSE && WSAGetLastError() == ERROR_IO_PENDING, "ConnectEx failed: " "returned %d + errno %d\n", bret, WSAGetLastError()); dwret = WaitForSingleObject(overlapped.hEvent, 15000); -- 2.30.2

1 0

[PATCH] jscript: Fallback to begin of input in script_parse if error location was not recorded.
by Jacek Caban March 24, 2021

March 24, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/parser.y | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)

1 0

[PATCH v3 1/4] include: Move SIGNER_* definitions to a new public header.
by Zebediah Figura March 24, 2021

March 24, 2021

Thereby making it easier to use them from ntoskrnl, setupapi, and other modules. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/mssign32/mssign32_main.c | 3 +-- dlls/mssign32/mssign32_private.h => include/wine/mssign.h | 0 2 files changed, 1 insertion(+), 2 deletions(-) rename dlls/mssign32/mssign32_private.h => include/wine/mssign.h (100%) diff --git a/dlls/mssign32/mssign32_main.c b/dlls/mssign32/mssign32_main.c index 86825bf0ec1..c76d467f3f4 100644 --- a/dlls/mssign32/mssign32_main.c +++ b/dlls/mssign32/mssign32_main.c @@ -26,8 +26,7 @@ #include "wine/debug.h" #include "wine/heap.h" - -#include "mssign32_private.h" +#include "wine/mssign.h" WINE_DEFAULT_DEBUG_CHANNEL(mssign); diff --git a/dlls/mssign32/mssign32_private.h b/include/wine/mssign.h similarity index 100% rename from dlls/mssign32/mssign32_private.h rename to include/wine/mssign.h -- 2.30.2

1 3

[PATCH] hidclass.sys: Fix parsed report descriptor length index.
by Rémi Bernon March 24, 2021

March 24, 2021

This is likely a typo, we previously iterated the HID reports to find one of type HID_REPORT_DESCRIPTOR_TYPE, and allocated a buffer of its length. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/hidclass.sys/pnp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index a50e7382466..a499aec93bb 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -161,7 +161,7 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) return status; } - ext->preparseData = ParseDescriptor(reportDescriptor, descriptor.DescriptorList[0].wReportLength); + ext->preparseData = ParseDescriptor(reportDescriptor, descriptor.DescriptorList[i].wReportLength); HeapFree(GetProcessHeap(), 0, reportDescriptor); if (!ext->preparseData) -- 2.30.2

1 0

[tools] testbot/reporttest: Remove the revision placeholder from start lines.
by Francois Gouget March 24, 2021

March 24, 2021

Back in the CVS days the start line contained the revision of the test file. But it has been replaced by a placeholder since the switch to Git. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/src/reporttest/report.template | 99 +++++++++++++------------- testbot/src/reporttest/reporttest.c | 2 +- 2 files changed, 51 insertions(+), 50 deletions(-) diff --git a/testbot/src/reporttest/report.template b/testbot/src/reporttest/report.template index 8e5f72c2b..9624c9065 100644 --- a/testbot/src/reporttest/report.template +++ b/testbot/src/reporttest/report.template @@ -214,7 +214,7 @@ stub advapi32:cred ----- Stubs automatically generate a successful dlls or programs test. ----- Expected assessement: Success -advapi32:crypt start dlls/advapi32/tests/crypt.c - +advapi32:crypt start dlls/advapi32/tests/crypt.c ----- WTBS Simple test failure ----- A test unit with one failed test ----- Expected assessement: 1 failure @@ -223,7 +223,7 @@ crypt.c:1: Test failed: Something wrong 031c:crypt: 108 tests executed (0 marked as todo, 1 failure), 0 skipped. advapi32:crypt:031c done (1) in 0s -advapi32:crypt_lmhash start dlls/advapi32/tests/crypt_lmhash.c - +advapi32:crypt_lmhash start dlls/advapi32/tests/crypt_lmhash.c ----- WTBS Simple diacritic failure ----- A test unit with two failed tests ----- Expected assessement: 2 failures despite exit code @@ -232,14 +232,14 @@ crypt_lmhash.c:20: Test failed: Second failure with added diacritics: ?????????? 07c0:crypt_lmhash: 95 tests executed (0 marked as todo, 2 failures), 0 skipped. advapi32:crypt_lmhash:07c0 done (1) in 0s -advapi32:crypt_md4 start dlls/advapi32/tests/crypt_md4.c - +advapi32:crypt_md4 start dlls/advapi32/tests/crypt_md4.c ----- A test unit with two test summary lines ----- Expected assessement: Success 0123:crypt_md4: 11 tests executed (0 marked as todo, 0 failures), 0 skipped. 0ca0:crypt_md4: 11 tests executed (0 marked as todo, 0 failures), 0 skipped. advapi32:crypt_md4:0ca0 done (0) in 0s -advapi32:crypt_md5 start dlls/advapi32/tests/crypt_md5.c - +advapi32:crypt_md5 start dlls/advapi32/tests/crypt_md5.c ----- A test unit with a failed subprocess test repeated in the parent ----- Expected assessement: 1 failure (also acceptable: 2 failures) crypt_md5.c:20: Test failed: A failure here, presumably in the subprocess @@ -251,7 +251,7 @@ Note that this also applies to the todo and skip counts. 087c:crypt_md5: 5 tests executed (0 marked as todo, 1 failure), 0 skipped. advapi32:crypt_md5:087c done (3) in 0s -advapi32:crypt_sha start dlls/advapi32/tests/crypt_sha.c - +advapi32:crypt_sha start dlls/advapi32/tests/crypt_sha.c ----- A test unit with a failed subprocess test ignored by the parent test ----- summary but accounted for in the exit code. ----- Expected assessement: 1 failure @@ -262,26 +262,26 @@ subprocess. 08f8:crypt_sha: 1 tests executed (0 marked as todo, 0 failures), 0 skipped. advapi32:crypt_sha:08f8 done (3) in 0s -advapi32:eventlog start dlls/advapi32/tests/eventlog.c - +advapi32:eventlog start dlls/advapi32/tests/eventlog.c ----- A test unit with an unreported failed test despite a non-zero exit code. ----- Expected assessement: 1 failure, "Unreported failure" error eventlog.c:20: Test failed: Something wrong 088c:eventlog: 408 tests executed (0 marked as todo, 0 failures), 0 skipped. advapi32:eventlog:088c done (3) in 4s -advapi32:lsa start dlls/advapi32/tests/lsa.c - +advapi32:lsa start dlls/advapi32/tests/lsa.c ----- WTBS Missing test summary line ----- A test unit with no test summary line ----- Expected assessement: "Missing test summary" error advapi32:lsa:083c done (0) in 0s -advapi32:registry start dlls/advapi32/tests/registry.c - +advapi32:registry start dlls/advapi32/tests/registry.c ----- A test unit with no main process test summary line ----- Expected assessement: "Missing test summary" error 1234:registry: 765 tests executed (0 marked as todo, 0 failures), 0 skipped. advapi32:registry:0804 done (0) in 0s -advapi32:security start dlls/advapi32/tests/security.c - +advapi32:security start dlls/advapi32/tests/security.c ----- A test unit with a misplaced but successful subprocess test summary line ----- Expected assessement: Success The subprocess may be a server process that exits automatically once the test @@ -290,7 +290,7 @@ is complete. That's ok as long as it's not meant to report failures. advapi32:security:0148 done (0) in 9s 0954:security: 18 tests executed (0 marked as todo, 0 failures), 0 skipped. -advapi32:service start dlls/advapi32/tests/service.c - +advapi32:service start dlls/advapi32/tests/service.c ----- A test unit with a misplaced and failed subprocess test summary line ----- Expected assessement: "Misplaced test summary line" error Same scenario as above but the subprocess can actually report failures so the @@ -304,7 +304,7 @@ service.c:20: Test failed: A failure in the subprocess ----- Keep this stub in case the previous test is mishandled stub advpack:advpack -advpack:files start dlls/advpack/tests/files.c - +advpack:files start dlls/advpack/tests/files.c ----- A test unit with a failed test in the main process before a subprocess ----- Expected assessement: 1 failure files.c:20: Test failed: A failure in the main process @@ -312,14 +312,14 @@ files.c:20: Test failed: A failure in the main process 0880:files: 99 tests executed (0 marked as todo, 1 failure), 0 skipped. advpack:files:0880 done (3) in 0s -advpack:install start dlls/advpack/tests/install.c - +advpack:install start dlls/advpack/tests/install.c ----- WTBS Simple test crash ----- 1/2: A test unit with a wine/test.h "unhandled exception" line ----- Expected assessement: Crash 07b0:install: unhandled exception c0000005 at 0040167C advpack:install:07b0 done (-1073741819) in 0s -amstream:amstream start dlls/amstream/tests/amstream.c - +amstream:amstream start dlls/amstream/tests/amstream.c ----- WTBS Unreported test failures ----- A test unit with an unreported failed test ----- Expected assessement: 1 failure + "Unreported failure" error @@ -327,7 +327,7 @@ amstream.c:20: Test failed: Something wrong 088c:amstream: 408 tests executed (0 marked as todo, 0 failures), 0 skipped. amstream:amstream:088c done (0) in 4s -apphelp:apphelp start dlls/apphelp/tests/apphelp.c - +apphelp:apphelp start dlls/apphelp/tests/apphelp.c ----- WTBS Failure propagation from child processes ----- A test unit with a subprocess and failed, todo and skipped tests in the ----- child process. @@ -342,19 +342,19 @@ apphelp.c:44: 2 failures in child process 0c9c:apphelp: 116 tests executed (0 marked as todo, 3 failures), 0 skipped. apphelp:apphelp:0c9c done (3) in 0s -atl:atl_ax start dlls/atl/tests/atl_ax.c - +atl:atl_ax start dlls/atl/tests/atl_ax.c ----- WTBS Timeout after a test failure ----- Expected assessement: Timeout atl_ax.c:20: Test failed: A failure before timing out atl:atl_ax:0b14 done (258) in 120s -atl:module start dlls/atl/tests/module.c - +atl:module start dlls/atl/tests/module.c ----- WTBS Timeout after a subprocess ----- Expected assessement: Timeout 1234:module: 116 tests executed (0 marked as todo, 0 failures), 0 skipped. atl:module:0b14 done (258) in 120s -atl:registrar start dlls/atl/tests/registrar.c - +atl:registrar start dlls/atl/tests/registrar.c ----- A test unit with a foreign test summary line ----- Expected assessement: "Misplaced test summary line" error 9876:alien: 10 tests executed (0 marked as todo, 1 failures), 0 skipped. @@ -366,64 +366,64 @@ atl:registrar:0922 done (0) in 0s avifil32 is missing and thus no test will be run for it and no entry will be found in the test report. -browseui:autocomplete start dlls/browseui/tests/autocomplete.c - +browseui:autocomplete start dlls/browseui/tests/autocomplete.c ----- A test unit with a skipped test ----- Expected assessement: Success, 1 skipped autocomplete.c:42: Tests skipped: Another time 052c:autocomplete: 66 tests executed (0 marked as todo, 0 failures), 1 skipped. browseui:autocomplete:052c done (0) in 0s -browseui:progressdlg start dlls/browseui/tests/progressdlg.c - +browseui:progressdlg start dlls/browseui/tests/progressdlg.c ----- A test unit with an unreported skipped test ----- Expected assessement: 1 skipped, "Unreported skip" error progressdlg.c:42: Tests skipped: Another time 0680:progressdlg: 4 tests executed (0 marked as todo, 0 failures), 0 skipped. browseui:progressdlg:0680 done (0) in 0s -cabinet:extract start dlls/cabinet/tests/extract.c - +cabinet:extract start dlls/cabinet/tests/extract.c ----- A test unit with a missing skipped test line ----- Expected assessement: "Missing tests skipped line" error 0fd4:extract: 347 tests executed (0 marked as todo, 0 failures), 1 skipped. cabinet:extract:0fd4 done (0) in 0s -cabinet:fdi start dlls/cabinet/tests/fdi.c - +cabinet:fdi start dlls/cabinet/tests/fdi.c ----- A test unit with a todo test ----- Expected assessement: Success, 1 todo fdi.c:42: Test marked todo: Hello Wine! 0690:fdi: 265 tests executed (1 marked as todo, 0 failures), 0 skipped. cabinet:fdi:0690 done (0) in 0s -chcp.com:chcp start programs/chcp.com/tests/chcp.c - +chcp.com:chcp start programs/chcp.com/tests/chcp.c ----- WTBS New .com program test directory ----- Expected assessement: Success 2021:chcp: 1 tests executed (0 marked as todo, 0 failures), 0 skipped. chcp.com:chcp:2021 done (0) in 9s -cmd.exe:batch start programs/cmd/tests/batch.c - +cmd.exe:batch start programs/cmd/tests/batch.c ----- A test unit with an unreported todo test ----- Expected assessement: "Unreported todo line" error batch.c:42: Test marked todo: Hello Wine! 0ddc:batch: 1701 tests executed (0 marked as todo, 0 failures), 0 skipped. cmd.exe:batch:0ddc done (0) in 3s -comcat:comcat start dlls/comcat/tests/comcat.c - +comcat:comcat start dlls/comcat/tests/comcat.c ----- A test unit with a missing todo test line ----- Expected assessement: "Missing todo line" error 0948:comcat: 9 tests executed (1 marked as todo, 0 failures), 0 skipped. comcat:comcat:0948 done (0) in 0s -comctl32:animate start dlls/comctl32/tests/animate.c - +comctl32:animate start dlls/comctl32/tests/animate.c ----- WTBS Timeout in a test ----- WTBS Timeout in a test - barely ----- A test unit with a timeout ----- Expected assessement: Timeout comctl32:animate:0b14 done (258) in 42s -comctl32:button skipped dlls/comctl32/tests/button.c - +comctl32:button skipped dlls/comctl32/tests/button.c ----- Skipping a test unit by user request ----- Expected assessement: Skipped by user -comctl32:comboex start dlls/comctl32/tests/comboex.c - +comctl32:comboex start dlls/comctl32/tests/comboex.c ----- WTBS Simple success in a todo test ----- WTBS Simple trace, ok, todo, skip sampler ----- A test unit with a subprocess and failed, todo and skipped tests in the @@ -438,21 +438,21 @@ This line says nothing is wrong because it's from the subprocess 0c9c:comboex: 116 tests executed (1 marked as todo, 2 failures), 1 skipped. comctl32:comboex:0c9c done (2) in 0s -comctl32:datetime start dlls/comctl32/tests/datetime.c - +comctl32:datetime start dlls/comctl32/tests/datetime.c ----- A test unit reporting a failure but with no test failed line ----- Expected assessement: "Missing test failed line" error ----- + TestFailures=2 (1 for the exit code + 1 for the missing failure line) 0998:datetime: 651 tests executed (0 marked as todo, 1 failures), 0 skipped. comctl32:datetime:0998 done (1) in 0s -comctl32:dpa start dlls/comctl32/tests/dpa.c - +comctl32:dpa start dlls/comctl32/tests/dpa.c ----- A test unit with a non-zero exit code ----- Expected assessement: "Non-zero exit code" error This would cause things like 'make test' to consider the test unit failed. 0998:dpa: 16 tests executed (0 marked as todo, 0 failures), 0 skipped. comctl32:dpa:0998 done (1) in 0s -comctl32:header start dlls/comctl32/tests/header.c - +comctl32:header start dlls/comctl32/tests/header.c ----- A test unit with a zero exit code despite failures ----- Expected assessement: 1 failure, "Zero exit code" error A non-zero exit code is necessary for 'make test'. @@ -467,7 +467,7 @@ TestLauncher does not set the source filename field. 0998:imagelist: 16 tests executed (0 marked as todo, 0 failure), 0 skipped. comctl32:imagelist:0998 done (0) in 0s -comctl32:ipaddress start dlls/comctl32/tests/ipaddress.c - +comctl32:ipaddress start dlls/comctl32/tests/ipaddress.c ----- A test unit with a missing done line ----- Expected assessement: "Missing done line" error Issued upon seeing the next start line. @@ -482,7 +482,7 @@ stub comctl32:listview 0998:misc: 16 tests executed (0 marked as todo, 0 failure), 0 skipped. comctl32:misc:0998 done (0) in 0s -comctl32:monthcal start dlls/comctl32/tests/monthcal.c - +comctl32:monthcal start dlls/comctl32/tests/monthcal.c ----- A test unit with a misplaced todo subprocess test summary line ----- Expected assessement: 1 todo, "Misplaced summary line" error See the previous misplaced test summary line scenarios. @@ -494,7 +494,7 @@ security.c:41: Test marked todo: Hello Wine! ----- Keep this stub in case the previous test is mishandled stub comctl32:mru -comctl32:pager start dlls/comctl32/tests/pager.c - +comctl32:pager start dlls/comctl32/tests/pager.c ----- A test unit with a misplaced subprocess skip test summary line ----- Expected assessement: Success See the previous misplaced test summary line scenarios. @@ -506,13 +506,13 @@ security.c:42: Tests skipped: Another time ----- Keep this stub in case the previous test is mishandled stub comctl32:progress -comctl32:propsheet start dlls/comctl32/tests/propsheet.c - +comctl32:propsheet start dlls/comctl32/tests/propsheet.c ----- WTBS Exit abruptly after a subprocess ----- Expected assessement: Missing summary line 1234:propsheet: 2251 tests executed (0 marked as todo, 0 failures), 0 skipped. comctl32:propsheet:0148 done (0) in 9s -comctl32:rebar start dlls/comctl32/tests/rebar.c - +comctl32:rebar start dlls/comctl32/tests/rebar.c ----- A test unit with an unreported crash in a subprocess ----- Expected assessement: "Zero exit code" error Even in subprocesses crashes are equivalent to 'Test failed' errors and as @@ -525,7 +525,7 @@ subprocess crashes either. This is why the error is "Zero exit code" and not 07b0:rebar: 2251 tests executed (0 marked as todo, 0 failures), 0 skipped. comctl32:rebar:07b0 done (0) in 0s -comctl32:status start dlls/comctl32/tests/status.c - +comctl32:status start dlls/comctl32/tests/status.c ----- A test unit with a garbled exception and summary pids, and garbled done ----- line. ----- Expected assessement: Crash @@ -535,7 +535,7 @@ status.c:33: unhandled exception c0000005 in child process 0123dead garbled07b0:status: 5 tests executed (0 marked as todo, 1 failures), 0 skipped. garbledcomctl32:status:07b0 done (1) in 0s -comctl32:subclass start dlls/comctl32/tests/subclass.c - +comctl32:subclass start dlls/comctl32/tests/subclass.c ----- A test unit with a subprocess crash, and a non-zero exit code ----- Expected assessement: 1 failure See the comctl32:rebar comment. Then note that here the main process does not @@ -545,7 +545,7 @@ crashed process which makes sense since it did not crash. 07b0:subclass: 2251 tests executed (0 marked as todo, 0 failures), 0 skipped. comctl32:subclass:07b0 done (1) in 0s -comctl32:syslink start dlls/comctl32/tests/syslink.c - +comctl32:syslink start dlls/comctl32/tests/syslink.c ----- WTBS Garbled trace, ok, todo, skip sampler ----- A test unit with garbled test lines ----- Expected assessement: 2 failures, 1 todo, 1 skip @@ -563,14 +563,14 @@ Do not cut 07b0:syslink: 2251 tests executed (1 marked as todo, 2 failures), 1 s me off comctl32:syslink:07b0 done (2) in 0s -comctl32:tab start dlls/comctl32/tests/tab.c - +comctl32:tab start dlls/comctl32/tests/tab.c ----- WTBS Simple test crash ----- 2/2: A test unit with a winedbg "unhandled exception" line ----- Expected assessement: Crash Unhandled exception: page fault on write access to 0x00000000 in 32-bit code (0x0054376d). comctl32:tab:07b0 done (-1073741819) in 0s -comctl32:taskdialog start dlls/comctl32/tests/taskdialog.c - +comctl32:taskdialog start dlls/comctl32/tests/taskdialog.c ----- WTBS Crash in a child process ----- A test unit with a proper subprocess crash reported by the framework ----- Ignore the wine/test.h vs. winedbg difference here. What matters is the @@ -581,12 +581,12 @@ taskdialog.c:33: unhandled exception c0000005 in child process 1234 07b0:taskdialog: 3 tests executed (0 marked as todo, 1 failures), 0 skipped. comctl32:taskdialog:07b0 done (1) in 0s -comctl32:toolbar start dlls/comctl32/tests/toolbar.c - +comctl32:toolbar start dlls/comctl32/tests/toolbar.c ----- A test unit crash with no unhandled exception line ----- Expected assessement: crashed comctl32:toolbar done (-1073741819) in 0s -comctl32:tooltips start dlls/comctl32/tests/tooltips.c - +comctl32:tooltips start dlls/comctl32/tests/tooltips.c ----- WTBS Timeout in a child process ----- The time out for child processes is normally shorter than for full test ----- units and the framework issues a test failure. @@ -595,7 +595,7 @@ tooltips.c:350: Test failed: Timed out waiting for the child process 0b14:tooltips: 3 tests executed (0 marked as todo, 1 failure), 0 skipped. comctl32:tooltips:0b14 done (1) in 42s -comctl32:trackbar start dlls/comctl32/tests/trackbar.c - +comctl32:trackbar start dlls/comctl32/tests/trackbar.c ----- WTBS Test failures, todos and skips in a subtest ----- A test unit with a subtest ----- Expected assessement: 2 failures, 1 todo, 1 skip @@ -607,7 +607,7 @@ driver.c:43: Tests skipped: Another time 07b1:trackbar: 3 tests executed (1 marked as todo, 2 failures), 1 skipped. comctl32:trackbar:07b1 done (2) in 0s -comctl32:treeview start dlls/comctl32/tests/treeview.c - +comctl32:treeview start dlls/comctl32/tests/treeview.c ----- WTBS Unreported child process failure ----- Expected assessement: 2 failures (1+"Returned success despite failure") treeview.c:40: Test failed: Unreported failure @@ -615,21 +615,22 @@ treeview.c:40: Test failed: Unreported failure 01a8:treeview: 1 tests executed (0 marked as todo, 0 failures), 0 skipped. comctl32:treeview:01a8 done (0) in 0s -comctl32:updown start dlls/comctl32/tests/updown.c - +comctl32:updown start dlls/comctl32/tests/updown.c ----- WTBS A misplaced test failure ----- Expected assessement: 2 failures (1+"Returned success despite failure") vorlon.c:40: Test failed: Unreported failure 01a8:updown: 2 tests executed (0 marked as todo, 0 failures), 0 skipped. comctl32:updown:01a8 done (0) in 0s -comdlg32:filedlg start dlls/comdlg32/tests/filedlg.c - +comdlg32:filedlg start dlls/comdlg32/tests/filedlg.c ----- WTBS A misplaced subtest line ----- Expected assessement: 1 failure shadow.c:222: Subtest black 01a8:filedlg: 10 tests executed (0 marked as todo, 0 failures), 0 skipped. comdlg32:filedlg:01a8 done (0) in 0s -comdlg32:finddlg start dlls/comdlg32/tests/finddlg.c - +comdlg32:finddlg start dlls/comdlg32/tests/finddlg.c +tart lines. ----- WTBS Trace, ok, todo, skips with timing information ----- Tests messages starting generated when WINETEST_TIME=1. ----- Expected assessement: 2 failures, 1 todo, 1 skip @@ -641,7 +642,7 @@ finddlg.c:229:0.145 Tests skipped: WTBS A plain skip 01a8:finddlg:0.146 10 tests executed (1 marked as todo, 2 failures), 1 skipped. comdlg32:finddlg:01a8 done (2) in 0s -comdlg32:fontdlg start dlls/comdlg32/tests/fontdlg.c - +comdlg32:fontdlg start dlls/comdlg32/tests/fontdlg.c ----- Check support for IgnoreExceptions ----- Expected assessement: 6 failures 01bd:fontdlg: unhandled exception c0000005 at 00001111 @@ -1135,7 +1136,7 @@ stub wtsapi32:wtsapi stub xcopy.exe:xcopy stub xmllite:reader -xmllite:writer start dlls/xmllite/tests/writer.c - +xmllite:writer start dlls/xmllite/tests/writer.c ----- A test unit with a misplaced (late) test failed line ----- Expected assessement: "Misplaced test failed line" error See the similar scenario before but note the lack of the extra test summary line diff --git a/testbot/src/reporttest/reporttest.c b/testbot/src/reporttest/reporttest.c index 67dca248b..3b3b904bb 100644 --- a/testbot/src/reporttest/reporttest.c +++ b/testbot/src/reporttest/reporttest.c @@ -263,7 +263,7 @@ int main(int argc, char** argv) else root = strstr(module, ".com") ? "programs" : "dlls"; - fprintf(logfile, "%s:%s start %s/%.*s/tests/%s.c -\n", module, unit, root, dirlen, module, unit); + fprintf(logfile, "%s:%s start %s/%.*s/tests/%s.c\n", module, unit, root, dirlen, module, unit); fprintf(logfile, "----- A standard successful test unit\n"); fprintf(logfile, "----- Expected assessment: Success\n"); fprintf(logfile, "1234:%s: 2 tests executed (0 marked as todo, 0 failures), 0 skipped.\n", unit); -- 2.20.1

1 0

[tools] testbot/TestLauncher: Remove the revision placeholder from start lines.
by Francois Gouget March 24, 2021

March 24, 2021

Back in the CVS days the start line contained the revision of the test file. But it has been replaced by a placeholder since the switch to Git. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Neither test.winehq.org nor the TestBot require the CVS version placeholder to be present anymore. --- testbot/src/TestLauncher/TestLauncher.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/src/TestLauncher/TestLauncher.c b/testbot/src/TestLauncher/TestLauncher.c index dd34a7626..58eed7650 100644 --- a/testbot/src/TestLauncher/TestLauncher.c +++ b/testbot/src/TestLauncher/TestLauncher.c @@ -231,7 +231,7 @@ int main(int argc, char *argv[]) } Start = GetTickCount(); - printf("%s:%s start - -\n", TestName, Subtest); + printf("%s:%s start -\n", TestName, Subtest); fflush(stdout); StartupInfo.cb = sizeof(STARTUPINFOA); -- 2.20.1

1 0

[PATCH] winetest: Remove the obsolete revision placeholder.
by Francois Gouget March 24, 2021

March 24, 2021

Back in the CVS days the start line contained the revision of the test file. But it has been replaced by a placeholder since the switch to Git. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Neither test.winehq.org nor the TestBot require the CVS version placeholder to be present anymore. --- programs/winetest/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 6056dee2a75..a04796e6d0d 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -796,7 +796,7 @@ run_test (struct wine_test* test, const char* subtest, HANDLE out_file, const ch if (test_filtered_out( test->name, subtest )) { report (R_STEP, "Skipping: %s:%s", test->name, subtest); - xprintf ("%s:%s skipped %s -\n", test->name, subtest, file); + xprintf ("%s:%s skipped %s\n", test->name, subtest, file); nr_of_skips++; } else @@ -805,7 +805,7 @@ run_test (struct wine_test* test, const char* subtest, HANDLE out_file, const ch DWORD pid, start = GetTickCount(); char *cmd = strmake (NULL, "%s %s", test->exename, subtest); report (R_STEP, "Running: %s:%s", test->name, subtest); - xprintf ("%s:%s start %s -\n", test->name, subtest, file); + xprintf ("%s:%s start %s\n", test->name, subtest, file); status = run_ex (cmd, out_file, tempdir, 120000, FALSE, &pid); heap_free (cmd); xprintf ("%s:%s:%04x done (%d) in %ds\n", test->name, subtest, pid, status, (GetTickCount()-start)/1000); -- 2.20.1

1 0