February 2021 - Wine-Commits

Chao Long : gdiplus/metafile: Implement GdipRecordMetafileFileName.
by Alexandre Julliard Feb. 8, 2021

Feb. 8, 2021

Module: wine Branch: master Commit: 3c2da5b9c98aebbde84702e7dd84e2221cf4235f URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c2da5b9c98aebbde84702e7… Author: Chao Long <longchao(a)uniontech.com> Date: Sun Feb 7 10:03:04 2021 +0800 gdiplus/metafile: Implement GdipRecordMetafileFileName. Signed-off-by: Chao Long <longchao(a)uniontech.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 205 ++++++++++++++++++++++++------------------------ 1 file changed, 103 insertions(+), 102 deletions(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index d506d0dc8bf..5ff6b113c3d 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -759,109 +759,10 @@ static GpStatus METAFILE_WriteEndOfFile(GpMetafile *metafile) GpStatus WINGDIPAPI GdipRecordMetafile(HDC hdc, EmfType type, GDIPCONST GpRectF *frameRect, MetafileFrameUnit frameUnit, GDIPCONST WCHAR *desc, GpMetafile **metafile) { - HDC record_dc; - REAL dpix, dpiy; - REAL framerect_factor_x, framerect_factor_y; - RECT rc, *lprc; - GpStatus stat; TRACE("(%p %d %s %d %p %p)\n", hdc, type, debugstr_rectf(frameRect), frameUnit, desc, metafile); - if (!hdc || type < EmfTypeEmfOnly || type > EmfTypeEmfPlusDual || !metafile) - return InvalidParameter; - - dpix = (REAL)GetDeviceCaps(hdc, HORZRES) / GetDeviceCaps(hdc, HORZSIZE) * 25.4; - dpiy = (REAL)GetDeviceCaps(hdc, VERTRES) / GetDeviceCaps(hdc, VERTSIZE) * 25.4; - - if (frameRect) - { - switch (frameUnit) - { - case MetafileFrameUnitPixel: - framerect_factor_x = 2540.0 / dpix; - framerect_factor_y = 2540.0 / dpiy; - break; - case MetafileFrameUnitPoint: - framerect_factor_x = framerect_factor_y = 2540.0 / 72.0; - break; - case MetafileFrameUnitInch: - framerect_factor_x = framerect_factor_y = 2540.0; - break; - case MetafileFrameUnitDocument: - framerect_factor_x = framerect_factor_y = 2540.0 / 300.0; - break; - case MetafileFrameUnitMillimeter: - framerect_factor_x = framerect_factor_y = 100.0; - break; - case MetafileFrameUnitGdi: - framerect_factor_x = framerect_factor_y = 1.0; - break; - default: - return InvalidParameter; - } - - rc.left = framerect_factor_x * frameRect->X; - rc.top = framerect_factor_y * frameRect->Y; - rc.right = rc.left + framerect_factor_x * frameRect->Width; - rc.bottom = rc.top + framerect_factor_y * frameRect->Height; - - lprc = &rc; - } - else - lprc = NULL; - - record_dc = CreateEnhMetaFileW(hdc, NULL, lprc, desc); - - if (!record_dc) - return GenericError; - - *metafile = heap_alloc_zero(sizeof(GpMetafile)); - if(!*metafile) - { - DeleteEnhMetaFile(CloseEnhMetaFile(record_dc)); - return OutOfMemory; - } - - (*metafile)->image.type = ImageTypeMetafile; - (*metafile)->image.flags = ImageFlagsNone; - (*metafile)->image.palette = NULL; - (*metafile)->image.xres = dpix; - (*metafile)->image.yres = dpiy; - (*metafile)->bounds.X = (*metafile)->bounds.Y = 0.0; - (*metafile)->bounds.Width = (*metafile)->bounds.Height = 1.0; - (*metafile)->unit = UnitPixel; - (*metafile)->metafile_type = type; - (*metafile)->record_dc = record_dc; - (*metafile)->comment_data = NULL; - (*metafile)->comment_data_size = 0; - (*metafile)->comment_data_length = 0; - (*metafile)->limit_dpi = 96; - (*metafile)->hemf = NULL; - (*metafile)->printer_display = (GetDeviceCaps(record_dc, TECHNOLOGY) == DT_RASPRINTER); - (*metafile)->logical_dpix = (REAL)GetDeviceCaps(record_dc, LOGPIXELSX); - (*metafile)->logical_dpiy = (REAL)GetDeviceCaps(record_dc, LOGPIXELSY); - list_init(&(*metafile)->containers); - - if (!frameRect) - { - (*metafile)->auto_frame = TRUE; - (*metafile)->auto_frame_min.X = 0; - (*metafile)->auto_frame_min.Y = 0; - (*metafile)->auto_frame_max.X = -1; - (*metafile)->auto_frame_max.Y = -1; - } - - stat = METAFILE_WriteHeader(*metafile, hdc); - - if (stat != Ok) - { - DeleteEnhMetaFile(CloseEnhMetaFile(record_dc)); - heap_free(*metafile); - *metafile = NULL; - return OutOfMemory; - } - - return stat; + return GdipRecordMetafileFileName(NULL, hdc, type, frameRect, frameUnit, desc, metafile); } /***************************************************************************** @@ -4266,10 +4167,110 @@ GpStatus WINGDIPAPI GdipRecordMetafileFileName(GDIPCONST WCHAR* fileName, MetafileFrameUnit frameUnit, GDIPCONST WCHAR *desc, GpMetafile **metafile) { - FIXME("%s %p %d %s %d %s %p stub!\n", debugstr_w(fileName), hdc, type, debugstr_rectf(pFrameRect), + HDC record_dc; + REAL dpix, dpiy; + REAL framerect_factor_x, framerect_factor_y; + RECT rc, *lprc; + GpStatus stat; + + TRACE("%s %p %d %s %d %s %p\n", debugstr_w(fileName), hdc, type, debugstr_rectf(pFrameRect), frameUnit, debugstr_w(desc), metafile); - return NotImplemented; + if (!hdc || type < EmfTypeEmfOnly || type > EmfTypeEmfPlusDual || !metafile) + return InvalidParameter; + + dpix = (REAL)GetDeviceCaps(hdc, HORZRES) / GetDeviceCaps(hdc, HORZSIZE) * 25.4; + dpiy = (REAL)GetDeviceCaps(hdc, VERTRES) / GetDeviceCaps(hdc, VERTSIZE) * 25.4; + + if (pFrameRect) + { + switch (frameUnit) + { + case MetafileFrameUnitPixel: + framerect_factor_x = 2540.0 / dpix; + framerect_factor_y = 2540.0 / dpiy; + break; + case MetafileFrameUnitPoint: + framerect_factor_x = framerect_factor_y = 2540.0 / 72.0; + break; + case MetafileFrameUnitInch: + framerect_factor_x = framerect_factor_y = 2540.0; + break; + case MetafileFrameUnitDocument: + framerect_factor_x = framerect_factor_y = 2540.0 / 300.0; + break; + case MetafileFrameUnitMillimeter: + framerect_factor_x = framerect_factor_y = 100.0; + break; + case MetafileFrameUnitGdi: + framerect_factor_x = framerect_factor_y = 1.0; + break; + default: + return InvalidParameter; + } + + rc.left = framerect_factor_x * pFrameRect->X; + rc.top = framerect_factor_y * pFrameRect->Y; + rc.right = rc.left + framerect_factor_x * pFrameRect->Width; + rc.bottom = rc.top + framerect_factor_y * pFrameRect->Height; + + lprc = &rc; + } + else + lprc = NULL; + + record_dc = CreateEnhMetaFileW(hdc, fileName, lprc, desc); + + if (!record_dc) + return GenericError; + + *metafile = heap_alloc_zero(sizeof(GpMetafile)); + if(!*metafile) + { + DeleteEnhMetaFile(CloseEnhMetaFile(record_dc)); + return OutOfMemory; + } + + (*metafile)->image.type = ImageTypeMetafile; + (*metafile)->image.flags = ImageFlagsNone; + (*metafile)->image.palette = NULL; + (*metafile)->image.xres = dpix; + (*metafile)->image.yres = dpiy; + (*metafile)->bounds.X = (*metafile)->bounds.Y = 0.0; + (*metafile)->bounds.Width = (*metafile)->bounds.Height = 1.0; + (*metafile)->unit = UnitPixel; + (*metafile)->metafile_type = type; + (*metafile)->record_dc = record_dc; + (*metafile)->comment_data = NULL; + (*metafile)->comment_data_size = 0; + (*metafile)->comment_data_length = 0; + (*metafile)->limit_dpi = 96; + (*metafile)->hemf = NULL; + (*metafile)->printer_display = (GetDeviceCaps(record_dc, TECHNOLOGY) == DT_RASPRINTER); + (*metafile)->logical_dpix = (REAL)GetDeviceCaps(record_dc, LOGPIXELSX); + (*metafile)->logical_dpiy = (REAL)GetDeviceCaps(record_dc, LOGPIXELSY); + list_init(&(*metafile)->containers); + + if (!pFrameRect) + { + (*metafile)->auto_frame = TRUE; + (*metafile)->auto_frame_min.X = 0; + (*metafile)->auto_frame_min.Y = 0; + (*metafile)->auto_frame_max.X = -1; + (*metafile)->auto_frame_max.Y = -1; + } + + stat = METAFILE_WriteHeader(*metafile, hdc); + + if (stat != Ok) + { + DeleteEnhMetaFile(CloseEnhMetaFile(record_dc)); + heap_free(*metafile); + *metafile = NULL; + return OutOfMemory; + } + + return stat; } GpStatus WINGDIPAPI GdipRecordMetafileFileNameI(GDIPCONST WCHAR* fileName, HDC hdc, EmfType type,

1 0

Rémi Bernon : wmphoto: Implement WMP decoder using jxrlib.
by Alexandre Julliard Feb. 8, 2021

Feb. 8, 2021

Module: wine Branch: master Commit: 958b43327243d98b2d7fa9b641d6e7140a6a12fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=958b43327243d98b2d7fa9b6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Feb 5 09:10:59 2021 +0100 wmphoto: Implement WMP decoder using jxrlib. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 122 +++++++++++ configure.ac | 16 ++ dlls/d3dx10_43/tests/d3dx10.c | 7 +- dlls/windowscodecs/tests/wmpformat.c | 4 +- dlls/wmphoto/unix_lib.c | 380 ++++++++++++++++++++++++++++++++++- include/config.h.in | 6 + 6 files changed, 525 insertions(+), 10 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=958b43327243d98b2d7f…

1 0

Floris Renaud : Add Dutch translation.
by Alexandre Julliard Feb. 8, 2021

Feb. 8, 2021

Module: website Branch: master Commit: 5305e44227a52d437a3f80e25d771503fcbba9cb URL: https://source.winehq.org/git/website.git/?a=commit;h=5305e44227a52d437a3f8… Author: Floris Renaud <jkfloris(a)dds.nl> Date: Sat Feb 6 17:48:39 2021 +0100 Add Dutch translation. Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- templates/en/global/xml/trans/lang.xml | 2 + templates/nl/about.template | 68 ++++++++++++ templates/nl/announce.template | 7 ++ templates/nl/documentation.template | 30 ++++++ templates/nl/donate.template | 62 +++++++++++ templates/nl/forums.template | 109 ++++++++++++++++++++ templates/nl/getinvolved.template | 82 +++++++++++++++ templates/nl/global/404.template | 17 +++ templates/nl/global/xml/trans/global.xml | 18 ++++ templates/nl/help.template | 91 ++++++++++++++++ templates/nl/home.template | 171 +++++++++++++++++++++++++++++++ templates/nl/irc.template | 131 +++++++++++++++++++++++ templates/nl/lang.template | 12 +++ templates/nl/news.template | 7 ++ templates/nl/search.template | 17 +++ 15 files changed, 824 insertions(+) Diff: https://source.winehq.org/git/website.git/?a=commitdiff;h=5305e44227a52d437…

1 0

Francois Gouget : testbot/reporttest: Remove tests for legacy TestLauncher and Wine versions.
by Alexandre Julliard Feb. 8, 2021

Feb. 8, 2021

Module: tools Branch: master Commit: 5985ad320c525d44998564e88d6989cba9f5a925 URL: https://source.winehq.org/git/tools.git/?a=commit;h=5985ad320c525d44998564e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 8 15:21:53 2021 +0100 testbot/reporttest: Remove tests for legacy TestLauncher and Wine versions. Remove tests for line formats that neither the TestBot nor the WineTest website support anymore. This is the case of lines missing pids, run times or using signed exit codes. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/reporttest/report.template | 64 +++++++--------------------------- 1 file changed, 12 insertions(+), 52 deletions(-) diff --git a/testbot/src/reporttest/report.template b/testbot/src/reporttest/report.template index b541e41..c08b4d4 100644 --- a/testbot/src/reporttest/report.template +++ b/testbot/src/reporttest/report.template @@ -313,29 +313,10 @@ advpack:install start dlls/advpack/tests/install.c - 07b0:install: unhandled exception c0000005 at 0040167C advpack:install:07b0 done (-1073741819) in 0s -amstream:amstream start dlls/amstream/tests/amstream.c - ------ No pid at all ------ Expected assessement: Success -amstream: 152 tests executed (0 marked as todo, 0 failures), 0 skipped. -amstream:amstream done (0) in 0s - -apphelp:apphelp start dlls/apphelp/tests/apphelp.c - ------ A test unit with no execution time ------ Expected assessement: Success -0860:apphelp: 15 tests executed (0 marked as todo, 0 failures), 0 skipped. -apphelp:apphelp:0860 done (0) - -atl:atl_ax start dlls/atl/tests/atl_ax.c - ------ Pid on the test summary line, but no pid on the done one ------ Expected assessement: Success -0938:atl_ax: 12 tests executed (0 marked as todo, 0 failures), 0 skipped. -atl:atl_ax done (0) in 0s - -atl:module start dlls/atl/tests/module.c - ------ Pid on the done line, but no pid on the test summary line ------ Expected assessement: Success -module: 544 tests executed (0 marked as todo, 0 failures), 0 skipped. -atl:module:0920 done (0) in 0s +stub amstream:amstream +stub apphelp:apphelp +stub atl:atl_ax +stub atl:module atl:registrar start dlls/atl/tests/registrar.c - ----- A test unit with a foreign test summary line @@ -481,10 +462,7 @@ comctl32:progress start dlls/comctl32/tests/progress.c - 0148:progress: 2251 tests executed (0 marked as todo, 0 failures), 0 skipped. comctl32:progress:0148 done (0) in 9s -comctl32:propsheet start dlls/comctl32/tests/propsheet.c - ------ A test unit with no main process test summary line and no pid anywhere ------ Expected assessement: "Missing test summary" error -comctl32:propsheet done (0) in 9s +stub comctl32:propsheet comctl32:rebar start dlls/comctl32/tests/rebar.c - ----- A test unit with an unreported crash in a subprocess @@ -499,22 +477,16 @@ 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 - ------ A test unit with a subprocess crash but no pid ------ Expected assessement: "Zero exit code" error -See the comctl32:rebar comment. -status: unhandled exception c0000005 at 0040167C -status: 2251 tests executed (0 marked as todo, 0 failures), 0 skipped. -comctl32:status:07b0 done (0) in 0s +stub comctl32:status comctl32:subclass start dlls/comctl32/tests/subclass.c - ------ A test unit with a subprocess crash, no pid and a non-zero exit code +----- 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 claim success. Also note that the exit code does not correspond to that of a crashed process which makes sense since it did not crash. -subclass: unhandled exception c0000005 at 0040167C -subclass: 2251 tests executed (0 marked as todo, 0 failures), 0 skipped. +1234:subclass: unhandled exception c0000005 at 0040167C +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 - @@ -534,28 +506,16 @@ 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 - ------ A test unit crash with no pid ------ Expected assessement: crashed -tab: unhandled exception c0000005 at 0040167C -comctl32:tab done (-1073741819) in 0s +stub comctl32:tab -comctl32:taskdialog start dlls/comctl32/tests/taskdialog.c - ------ A test unit crash with unsigned exit code (TestLauncher) ------ Expected assessement: crashed -taskdialog: unhandled exception c0000005 at 0040167C -comctl32:taskdialog done (3221225477) in 0s +stub comctl32:taskdialog 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/toolbar.c - ------ A test unit crash with no unhandled exception line ------ and an unsigned exit code. ------ Expected assessement: crashed -comctl32:tooltips done (3221225477) in 0s +stub comctl32:tooltips comctl32:trackbar start dlls/comctl32/tests/trackbar.c - ----- A test unit with a subtest

1 0

Francois Gouget : testbot/TestWTBS: Update the description in the usage message.
by Alexandre Julliard Feb. 8, 2021

Feb. 8, 2021

Module: tools Branch: master Commit: 7456be821eda0684e170a93aefc9ae04d56a5415 URL: https://source.winehq.org/git/tools.git/?a=commit;h=7456be821eda0684e170a93… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 8 15:21:03 2021 +0100 testbot/TestWTBS: Update the description in the usage message. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/tests/TestWTBS | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index 1cbec2e..4a4aba9 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -165,7 +165,12 @@ if (defined $Usage) } print "Usage: $name0 [--jobs RANGES] [--mbox FILE] [--help]\n"; print "\n"; - print "Tests the Patches subject parser.\n"; + print "Automate checking the Wine TestBot test Suite results.\n"; + print "\n"; + print "The expectations are described in the form of directives that specify\n"; + print "expected job, task, patch or webpatch property values; and errors or strings in\n"; + print "logs and reports.\n"; + print "For more details, see the documentation in the $name0 source.\n"; print "\n"; print "Where:\n"; print " --jobs RANGES Only check the jobs in one of the specified comma-separated\n";

1 0

Francois Gouget : testbot/reporttest: Match the tests to the wtbsuite.
by Alexandre Julliard Feb. 8, 2021

Feb. 8, 2021

Module: tools Branch: master Commit: a26e789fad7cc0486b6e967ad97b4113082aa24c URL: https://source.winehq.org/git/tools.git/?a=commit;h=a26e789fad7cc0486b6e967… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 8 15:21:56 2021 +0100 testbot/reporttest: Match the tests to the wtbsuite. Where a test mirrors a wtbsuite test, add the latter's commit message as a comment to make it simpler to compare the two. Also tweak some comments to better describe the tests. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/reporttest/report.template | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/testbot/src/reporttest/report.template b/testbot/src/reporttest/report.template index c08b4d4..8da3d82 100644 --- a/testbot/src/reporttest/report.template +++ b/testbot/src/reporttest/report.template @@ -209,8 +209,11 @@ Dll info: xmllite=1.0.1018.0 Test output: stub advapi32:cred +----- WTBS Simple test patch +----- Expected assessement: Success advapi32:crypt start dlls/advapi32/tests/crypt.c - +----- WTBS Simple test failure ----- A test unit with one failed test ----- Expected assessement: 1 failure This also has a valid source file name which one can link to. @@ -219,10 +222,11 @@ crypt.c:1: Test failed: Something wrong advapi32:crypt:031c done (1) in 0s 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 +----- Expected assessement: 2 failures despite exit code crypt_lmhash.c:10: Test failed: Something wrong -crypt_lmhash.c:20: Test failed: Second failure here +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 @@ -246,7 +250,8 @@ Note that this also applies to the todo and skip counts. advapi32:crypt_md5:087c done (3) in 0s advapi32:crypt_sha start dlls/advapi32/tests/crypt_sha.c - ------ A test unit with a failed subprocess test ignored by the parent +----- 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 crypt_sha.c:20: Test failed: A failure here, presumably in the subprocess 0456:crypt_sha: 1 tests executed (0 marked as todo, 1 failure), 0 skipped. @@ -256,6 +261,7 @@ subprocess. advapi32:crypt_sha:08f8 done (3) in 0s advapi32:eventlog start dlls/advapi32/tests/eventlog.c - +----- WTBS Unreported test failures ----- A test unit with an unreported failed test ----- Expected assessement: 1 failure, "Unreported failure" error eventlog.c:20: Test failed: Something wrong @@ -263,6 +269,7 @@ eventlog.c:20: Test failed: Something wrong advapi32:eventlog:088c done (3) in 4s 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 @@ -308,6 +315,7 @@ files.c:20: Test failed: A failure in the main process advpack:files:0880 done (3) in 0s advpack:install start dlls/advpack/tests/install.c - +----- WTBS Simple test crash ----- A test unit with a crash ----- Expected assessement: Crash 07b0:install: unhandled exception c0000005 at 0040167C @@ -371,6 +379,8 @@ comcat:comcat start dlls/comcat/tests/comcat.c - comcat:comcat:0948 done (0) in 0s 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 @@ -380,7 +390,10 @@ comctl32:button skipped dlls/comctl32/tests/button.c - ----- Expected assessement: Skipped by user comctl32:comboex start dlls/comctl32/tests/comboex.c - ------ A test unit with failed, todo and skipped tests in the main process +----- 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 +----- main process. ----- Expected assessement: 2 failures, 1 todo, 1 skip comboex.c:40: Test failed: A failure in the main process comboex.c:41: Test succeeded inside todo block: Success in the main process @@ -394,6 +407,7 @@ comctl32:comboex:0c9c done (2) in 0s 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 @@ -425,8 +439,10 @@ comctl32:ipaddress start dlls/comctl32/tests/ipaddress.c - Issued upon seeing the next start line. 0998:ipaddress: 16 tests executed (0 marked as todo, 0 failure), 0 skipped. +----- Keep this stub in case the previous test is mishandled stub comctl32:listview +----- WTBS A test unit with no start line ----- A test unit with a missing start line ----- Expected assessement: "Missing start line" error 0998:misc: 16 tests executed (0 marked as todo, 0 failure), 0 skipped. @@ -490,6 +506,7 @@ crashed process which makes sense since it did not crash. comctl32:subclass:07b0 done (1) in 0s 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 Multi-threaded and multi-process tests should really try to avoid races in @@ -518,13 +535,14 @@ comctl32:toolbar done (-1073741819) in 0s stub comctl32:tooltips 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 trackbar.c:496: Subtest driver driver.c:40: Test failed: Something wrong driver.c:41: Test succeeded inside todo block: Something right! driver.c:42: Test marked todo: Hello Wine! driver.c:43: Tests skipped: Another time ------ Expected assessement: 2 failures, 1 todo, 1 skip 07b1:trackbar: 3 tests executed (1 marked as todo, 2 failures), 1 skipped. comctl32:trackbar:07b1 done (2) in 0s @@ -1011,7 +1029,7 @@ stub xcopy.exe:xcopy stub xmllite:reader xmllite:writer start dlls/xmllite/tests/writer.c - ------ A test unit with a misplaced test failed line +----- 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 here. Also beware of the end-of-file.

1 0

Francois Gouget : testbot/TestWTBS: Allow side-loading of the TestWTBS directives.
by Alexandre Julliard Feb. 8, 2021

Feb. 8, 2021

Module: tools Branch: master Commit: fbd3cc15bb6ffd253b307e3ab443c5dffd602dc9 URL: https://source.winehq.org/git/tools.git/?a=commit;h=fbd3cc15bb6ffd253b307e3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 8 15:20:43 2021 +0100 testbot/TestWTBS: Allow side-loading of the TestWTBS directives. This allows checking the results of non-patch jobs, such as reporttest.exe runs. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/tests/TestWTBS | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index 4a4aba9..4837664 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -108,6 +108,7 @@ sub check_opt_val($$) } my $OptJobs; +my %OptJobInfoPath; my $OptMbox; while (@ARGV) { @@ -120,6 +121,15 @@ while (@ARGV) { $OptMbox = check_opt_val($Arg, $OptMbox); } + elsif ($Arg eq "--job-wtbs") + { + my $JobId = check_opt_val($Arg, undef); + if ($JobId) + { + my $Path = check_opt_val("$Arg $JobId", $OptJobInfoPath{$JobId}); + $OptJobInfoPath{$JobId} = $Path if ($Path); + } + } elsif ($Arg eq "--help") { $Usage = 0; @@ -163,7 +173,7 @@ if (defined $Usage) error("try '$name0 --help' for more information\n"); exit $Usage; } - print "Usage: $name0 [--jobs RANGES] [--mbox FILE] [--help]\n"; + print "Usage: $name0 [--jobs RANGES] [--job-wtbs ID PATH] [--mbox FILE] [--help]\n"; print "\n"; print "Automate checking the Wine TestBot test Suite results.\n"; print "\n"; @@ -179,6 +189,8 @@ if (defined $Usage) print " or of the form 'FIRST..LAST' where FIRST and LAST are either the\n"; print " empty string or a job id.\n"; print " --mbox FILE Check the TestBot's emails in this mbox-format file.\n"; + print " --job-wtbs ID PATH Use the specified file to load the directives for job ID.\n"; + print " This option can be specified multiple times.\n"; print " --help Shows this usage message.\n"; exit 0; } @@ -1057,6 +1069,11 @@ sub CheckJobTree($;$) return if ($CheckedJobs{$JobId}); $CheckedJobs{$JobId} = 1; + if (!$TestInfo and $OptJobInfoPath{$JobId}) + { + $TestInfo = LoadTestInfo($OptJobInfoPath{$JobId}); + } + my ($HasTask, $HasNewFailures); my $TestUnits = {}; my $Email = $Emails{$JobId};

1 0

Georg Lehmann : winevulkan: Fix vkDestroyDebugUtilsMessengerEXT with NULL object.
by Alexandre Julliard Feb. 5, 2021

Feb. 5, 2021

Module: wine Branch: master Commit: ffd58f6275101bcf7bc5ef5bd433123460ad0f4f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ffd58f6275101bcf7bc5ef5b… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Wed Feb 3 21:13:34 2021 +0100 winevulkan: Fix vkDestroyDebugUtilsMessengerEXT with NULL object. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/vulkan.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 2a503a7430d..640b3ee7b67 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -1940,6 +1940,9 @@ void WINAPI wine_vkDestroyDebugUtilsMessengerEXT( object = wine_debug_utils_messenger_from_handle(messenger); + if (!object) + return; + instance->funcs.p_vkDestroyDebugUtilsMessengerEXT(instance->instance, object->debug_messenger, NULL); WINE_VK_REMOVE_HANDLE_MAPPING(instance, object);

1 0

Piotr Caban : msvcrt: Add x87 asin implementation.
by Alexandre Julliard Feb. 5, 2021

Feb. 5, 2021

Module: wine Branch: master Commit: a6e3987e5b58cac29f003b20325373deadbd90af URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6e3987e5b58cac29f003b20… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 5 16:07:10 2021 +0100 msvcrt: Add x87 asin implementation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50429 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 85 +++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 62 insertions(+), 23 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index bebd3e2cef9..83e5d1e65da 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -94,6 +94,31 @@ static inline double CDECL ret_nan( BOOL update_sw ) return (x - x) / (x - x); } +#define SET_X87_CW(MASK) \ + "subl $4, %esp\n\t" \ + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") \ + "fnstcw (%esp)\n\t" \ + "movw (%esp), %ax\n\t" \ + "movw %ax, 2(%esp)\n\t" \ + "testw $" #MASK ", %ax\n\t" \ + "jz 1f\n\t" \ + "andw $~" #MASK ", %ax\n\t" \ + "movw %ax, 2(%esp)\n\t" \ + "fldcw 2(%esp)\n\t" \ + "1:\n\t" + +#define RESET_X87_CW \ + "movw (%esp), %ax\n\t" \ + "cmpw %ax, 2(%esp)\n\t" \ + "je 1f\n\t" \ + "fstpl 8(%esp)\n\t" \ + "fldcw (%esp)\n\t" \ + "fldl 8(%esp)\n\t" \ + "fwait\n\t" \ + "1:\n\t" \ + "addl $4, %esp\n\t" \ + __ASM_CFI(".cfi_adjust_cfa_offset -4\n\t") + /********************************************************************* * _matherr (CRTDLL.@) */ @@ -886,6 +911,23 @@ static double asin_R(double z) return p / q; } +#ifdef __i386__ +double CDECL x87_asin(double); +__ASM_GLOBAL_FUNC( x87_asin, + "fldl 4(%esp)\n\t" + SET_X87_CW(~0x37f) + "fld %st\n\t" + "fld1\n\t" + "fsubp\n\t" + "fld1\n\t" + "fadd %st(2)\n\t" + "fmulp\n\t" + "fsqrt\n\t" + "fpatan\n\t" + RESET_X87_CW + "ret" ) +#endif + double CDECL asin( double x ) { static const double pio2_hi = 1.57079632679489655800e+00, @@ -894,6 +936,9 @@ double CDECL asin( double x ) double z, r, s; unsigned int hx, ix; ULONGLONG llx; +#ifdef __i386__ + unsigned int x87_cw, sse2_cw; +#endif hx = *(ULONGLONG*)&x >> 32; ix = hx & 0x7fffffff; @@ -904,9 +949,24 @@ double CDECL asin( double x ) if (((ix - 0x3ff00000) | lx) == 0) /* asin(1) = +-pi/2 with inexact */ return x * pio2_hi + 7.5231638452626401e-37; - if (isnan(x)) return x; + if (isnan(x)) + { +#ifdef __i386__ + return math_error(_DOMAIN, "sqrt", x, 0, x); +#else + return x; +#endif + } return math_error(_DOMAIN, "asin", x, 0, 0 / (x - x)); } + +#ifdef __i386__ + __control87_2(0, 0, &x87_cw, &sse2_cw); + if (!sse2_enabled || (x87_cw & _MCW_EM) != _MCW_EM + || (sse2_cw & (_MCW_EM | _MCW_RC)) != _MCW_EM) + return x87_asin(x); +#endif + /* |x| < 0.5 */ if (ix < 0x3fe00000) { /* if 0x1p-1022 <= |x| < 0x1p-26, avoid raising underflow */ @@ -1231,31 +1291,10 @@ __ASM_GLOBAL_FUNC( sse2_sqrt, #endif #ifdef __i386__ -#define SET_X87_CW \ - "subl $4, %esp\n\t" \ - __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") \ - "fnstcw (%esp)\n\t" \ - "movw (%esp), %ax\n\t" \ - "testw $0xc00, %ax\n\t" \ - "jz 1f\n\t" \ - "andw $0xf3ff, %ax\n\t" \ - "movw %ax, 2(%esp)\n\t" \ - "fldcw 2(%esp)\n\t" \ - "1:\n\t" - -#define RESET_X87_CW \ - "movw (%esp), %ax\n\t" \ - "testw $0xc00, %ax\n\t" \ - "jz 1f\n\t" \ - "fldcw (%esp)\n\t" \ - "1:\n\t" \ - "addl $4, %esp\n\t" \ - __ASM_CFI(".cfi_adjust_cfa_offset -4\n\t") - double CDECL x87_sqrt(double); __ASM_GLOBAL_FUNC( x87_sqrt, "fldl 4(%esp)\n\t" - SET_X87_CW + SET_X87_CW(0xc00) "fsqrt\n\t" RESET_X87_CW "ret" )

1 0

Rémi Bernon : widl: Factor and cleanup interface type declaration and definition.
by Alexandre Julliard Feb. 5, 2021

Feb. 5, 2021

Module: wine Branch: master Commit: f8684cf953c5aae31e0b2858ab839e702b7cff20 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f8684cf953c5aae31e0b2858… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Feb 5 10:11:00 2021 +0100 widl: Factor and cleanup interface type declaration and definition. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.y | 34 ++++++++++------------------------ tools/widl/typetree.c | 19 ++++++++++++++++++- tools/widl/typetree.h | 4 +++- 3 files changed, 31 insertions(+), 26 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 1505e3e88a0..44716deb5b6 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -87,7 +87,6 @@ static void push_lookup_namespace(const char *name); static void check_arg_attrs(const var_t *arg); static void check_statements(const statement_list_t *stmts, int is_inside_library); static void check_all_user_types(const statement_list_t *stmts); -static attr_list_t *check_iface_attrs(const char *name, attr_list_t *attrs); static attr_list_t *check_function_attrs(const char *name, attr_list_t *attrs); static attr_list_t *check_typedef_attrs(attr_list_t *attrs); static attr_list_t *check_enum_attrs(attr_list_t *attrs); @@ -281,7 +280,6 @@ static typelib_t *current_typelib; %type <expr> m_expr expr expr_const expr_int_const array m_bitfield %type <expr_list> m_exprs /* exprs expr_list */ expr_list_int_const %type <expr> contract_req -%type <type> interfacehdr %type <stgclass> storage_cls_spec %type <type_qualifier> type_qualifier m_type_qual_list %type <function_specifier> function_specifier @@ -971,31 +969,20 @@ inherit: { $$ = NULL; } | ':' qualified_type { $$ = $2; } ; -interface: tINTERFACE aIDENTIFIER { $$ = get_type(TYPE_INTERFACE, $2, current_namespace, 0); } - | tINTERFACE aKNOWNTYPE { $$ = get_type(TYPE_INTERFACE, $2, current_namespace, 0); } +interface: + tINTERFACE aIDENTIFIER { $$ = type_interface_declare($2, current_namespace); } + | tINTERFACE aKNOWNTYPE { $$ = type_interface_declare($2, current_namespace); } ; -interfacehdr: attributes interface { $$ = $2; - check_def($2); - $2->attrs = check_iface_attrs($2->name, $1); - $2->defined = TRUE; - } - ; - -interfacedef: interfacehdr inherit - '{' int_statements '}' semicolon_opt { $$ = $1; - if($$ == $2) - error_loc("Interface can't inherit from itself\n"); - type_interface_define($$, $2, $4); +interfacedef: attributes interface inherit + '{' int_statements '}' semicolon_opt { $$ = type_interface_define($2, $1, $3, $5); check_async_uuid($$); } /* MIDL is able to import the definition of a base class from inside the * definition of a derived class, I'll try to support it with this rule */ - | interfacehdr ':' aIDENTIFIER + | attributes interface ':' aIDENTIFIER '{' import int_statements '}' - semicolon_opt { $$ = $1; - type_interface_define($$, find_type_or_error($3), $6); - } + semicolon_opt { $$ = type_interface_define($2, $1, find_type_or_error($4), $7); } | dispinterfacedef semicolon_opt { $$ = $1; } ; @@ -2340,7 +2327,7 @@ const char *get_attr_display_name(enum attr_type type) return allowed_attr[type].display_name; } -static attr_list_t *check_iface_attrs(const char *name, attr_list_t *attrs) +attr_list_t *check_interface_attrs(const char *name, attr_list_t *attrs) { const attr_t *attr; if (!attrs) return attrs; @@ -2978,8 +2965,7 @@ static void check_async_uuid(type_t *iface) if (!inherit) error_loc("async_uuid applied to an interface with incompatible parent\n"); - async_iface = get_type(TYPE_INTERFACE, strmake("Async%s", iface->name), iface->namespace, 0); - async_iface->attrs = map_attrs(iface->attrs, async_iface_attrs); + async_iface = type_interface_declare(strmake("Async%s", iface->name), iface->namespace); STATEMENTS_FOR_EACH_FUNC( stmt, type_iface_get_stmts(iface) ) { @@ -3010,7 +2996,7 @@ static void check_async_uuid(type_t *iface) stmts = append_statement(stmts, make_statement_declaration(finish_func)); } - type_interface_define(async_iface, inherit, stmts); + type_interface_define(async_iface, map_attrs(iface->attrs, async_iface_attrs), inherit, stmts); iface->details.iface->async_iface = async_iface->details.iface->async_iface = async_iface; } diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index 825348ddef4..84be75fa3b7 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -442,8 +442,24 @@ static unsigned int compute_method_indexes(type_t *iface) return idx; } -void type_interface_define(type_t *iface, type_t *inherit, statement_list_t *stmts) +type_t *type_interface_declare(char *name, struct namespace *namespace) { + type_t *type = get_type(TYPE_INTERFACE, name, namespace, 0); + if (type_get_type_detect_alias(type) != TYPE_INTERFACE) + error_loc("interface %s previously not declared an interface at %s:%d\n", + type->name, type->loc_info.input_name, type->loc_info.line_number); + return type; +} + +type_t *type_interface_define(type_t *iface, attr_list_t *attrs, type_t *inherit, statement_list_t *stmts) +{ + if (iface->defined) + error_loc("interface %s already defined at %s:%d\n", + iface->name, iface->loc_info.input_name, iface->loc_info.line_number); + if (iface == inherit) + error_loc("interface %s can't inherit from itself\n", + iface->name); + iface->attrs = check_interface_attrs(iface->name, attrs); iface->details.iface = xmalloc(sizeof(*iface->details.iface)); iface->details.iface->disp_props = NULL; iface->details.iface->disp_methods = NULL; @@ -453,6 +469,7 @@ void type_interface_define(type_t *iface, type_t *inherit, statement_list_t *stm iface->details.iface->async_iface = NULL; iface->defined = TRUE; compute_method_indexes(iface); + return iface; } void type_dispinterface_define(type_t *iface, var_list_t *props, var_list_t *methods) diff --git a/tools/widl/typetree.h b/tools/widl/typetree.h index 8a8e1c529ac..7b67f3b996a 100644 --- a/tools/widl/typetree.h +++ b/tools/widl/typetree.h @@ -30,6 +30,7 @@ enum name_type { }; attr_list_t *check_coclass_attrs(const char *name, attr_list_t *attrs); +attr_list_t *check_interface_attrs(const char *name, attr_list_t *attrs); attr_list_t *check_runtimeclass_attrs(const char *name, attr_list_t *attrs); type_t *type_new_function(var_list_t *args); @@ -48,7 +49,8 @@ type_t *type_new_nonencapsulated_union(const char *name, int defined, var_list_t type_t *type_new_encapsulated_union(char *name, var_t *switch_field, var_t *union_field, var_list_t *cases); type_t *type_new_bitfield(type_t *field_type, const expr_t *bits); type_t *type_runtimeclass_declare(char *name, struct namespace *namespace); -void type_interface_define(type_t *iface, type_t *inherit, statement_list_t *stmts); +type_t *type_interface_declare(char *name, struct namespace *namespace); +type_t *type_interface_define(type_t *iface, attr_list_t *attrs, type_t *inherit, statement_list_t *stmts); void type_dispinterface_define(type_t *iface, var_list_t *props, var_list_t *methods); void type_dispinterface_define_from_iface(type_t *dispiface, type_t *iface); void type_module_define(type_t *module, statement_list_t *stmts);

1 0