- wine-devel - winehq.org

[PATCH v2 0/5] MR307: dnsapi: Fix wow64 translation.
by Zebediah Figura (＠zfigura) 26 Jun '22

26 Jun '22

-- v2: ntdll: Add some documentation for ntdll_umbstowcs() and ntdll_wcstoumbs(). dnsapi: Return a double-null-terminated string from DnsQueryConfig(DnsConfigSearchList). dnsapi: ntdll_umbstowcs() deals in characters, not bytes. dnsapi: Clarify that Windows does not implement DnsQueryConfig(DnsConfigSearchList). https://gitlab.winehq.org/wine/wine/-/merge_requests/307

4 6

[PATCH v4 0/2] MR296: nsiproxy.sys: Add static ARP entries which are always present on Windows.
by Paul Gofman (＠gofman) 25 Jun '22

25 Jun '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53175 Split off from MR https://gitlab.winehq.org/wine/wine/-/merge_requests/286. -- v4: Apply 1 suggestion(s) to 1 file(s) https://gitlab.winehq.org/wine/wine/-/merge_requests/296

4 3

[PATCH 0/5] MR242: winegstreamer: Don't try using src_getrange_cb input buffer.
by Rémi Bernon (＠rbernon) 25 Jun '22

25 Jun '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/242

3 13

[PATCH v3 0/1] MR296: nsiproxy.sys: Add static ARP entries which are always present on Windows.
by Paul Gofman (＠gofman) 25 Jun '22

25 Jun '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53175 Split off from MR https://gitlab.winehq.org/wine/wine/-/merge_requests/286. -- v3: nsiproxy.sys: Add static ARP entries which are always present on Windows. https://gitlab.winehq.org/wine/wine/-/merge_requests/296

3 3

[PATCH 0/1] MR312: winex11.drv: Increment configure_serial in X11DRV_WindowPosChanged() even if...
by Paul Gofman (＠gofman) 25 Jun '22

25 Jun '22

Once we reached that place where sync_window_position() is called (or not called if window is about to be minimized or maximized) the old in-flight X_ConfigureNotify do not make sense anymore. sync_window_position() does that unconditionally but if we don't call it for minimize / maximize we should probably discard them regardless. An example of the failing scenario which this patch is fixing is the following: 1. App calls SetWindowPos() with some size, X_ConfigureNotify is in flight; 2. App calls ShowWindow(SW_MAXIMIZE), old X_ConfigureNotify is still in flight; sync_window_position() is not called and configure_serial is not updated; 3. Now X_ConfigureNotify from p.1 arrives and it gets processed like WM is changing window size back, that confuses the app and since the reaction on the new app's SetWindowPos / maximizing is also delayed and then X events triggered by p. 2. also arribe later. That may cause endless loop with non-functional window. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/312

2 1

[PATCH] po: Update Dutch translation.
by Floris Renaud 24 Jun '22

24 Jun '22

Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> --- po/nl.po | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/po/nl.po b/po/nl.po index bf4ff469379..8e3074e26e5 100644 --- a/po/nl.po +++ b/po/nl.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2022-04-15 18:10+0200\n" +"PO-Revision-Date: 2022-06-25 00:15+0200\n" "Last-Translator: Floris Renaud <jkfloris(a)dds.nl>\n" "Language-Team: Dutch\n" "Language: nl\n" @@ -16455,10 +16455,8 @@ msgstr "&DWORD-waarde" #: programs/regedit/regedit.rc:52 programs/regedit/regedit.rc:105 #: programs/regedit/regedit.rc:128 -#, fuzzy -#| msgid "&DWORD Value" msgid "&QWORD Value" -msgstr "&DWORD-waarde" +msgstr "&QWORD-waarde" #: programs/regedit/regedit.rc:53 programs/regedit/regedit.rc:106 #: programs/regedit/regedit.rc:129 @@ -17017,16 +17015,12 @@ msgid "Collapse" msgstr "Invouwen" #: programs/regedit/regedit.rc:178 -#, fuzzy -#| msgid "Adds a new 32-bit value" msgid "Adds a new 64-bit value" -msgstr "Een nieuwe 32-bit waarde toevoegen" +msgstr "Een nieuwe 64-bit waarde toevoegen" #: programs/regedit/regedit.rc:221 -#, fuzzy -#| msgid "Edit DWORD" msgid "Edit QWORD" -msgstr "DWORD waarde bewerken" +msgstr "QWORD waarde bewerken" #: programs/regsvr32/regsvr32.rc:33 msgid "" -- 2.36.1

1 0

[PATCH] Suppress below message, with fix mojibake for japanese filename in LANG=ja_JP.SJIS environment. "err:environ:init_unix_codepage unrecognized charset 'SJIS'"
by Yoshiji Emoto 24 Jun '22

24 Jun '22

In past I sent patch for "dlls/winex11.drv/window.c" is not needed. Cancel it please. Signed-off-by: Yoshiji Emoto <alumina.from.ceramix(a)gmail.com> --- dlls/ntdll/unix/env.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index a71df03966f..90035f683e7 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -270,6 +270,7 @@ static const struct { const char *name; UINT cp; } charset_names[] = { "ISO88599", 28599 }, { "KOI8R", 20866 }, { "KOI8U", 21866 }, + { "SJIS", 932 }, { "TIS620", 28601 }, { "UTF8", CP_UTF8 } }; -- 2.35.2

1 0

[PATCH] po: Update Lithuanian translation.
by Aurimas Fišeras 24 Jun '22

24 Jun '22

1 0

[PATCH 0/2] MR308: Add "wine/str.h", use "wine/heap.h" and it in winemenubuilder
by Davide Beatrici (＠davidebeatrici) 24 Jun '22

24 Jun '22

I originally wanted to add these utils into `unicode.h`, but it cannot be used with msvcrt headers. This prompted the creation of a new header called `str.h`. The name is generic and broad, but the file may grow to contain more general stuff in the future. The rationale behind writing the UTF helpers is mainly to solve, at least in part, the complexity. `WideCharToMultiByte()` and `MultiByteToWideChar()` in particular are quite dangerous as they treat the buffer size as bytes for `char` (8 bits) and as number of characters for `WCHAR` (16 bits). There are already several wrappers around the codebase, mine should be able to replace them. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/308

3 12

Re: [PATCH v4 0/1] MR303: win32u: Don't report cloned monitors in EnumDisplayMonitors(). - approved
by Alexandre Julliard (＠julliard) 24 Jun '22

24 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/303

1 0

Re: [PATCH v2 0/1] MR309: wow64: Report the correct size for SystemLogicalProcessorInformationEx. - approved
by Alexandre Julliard (＠julliard) 24 Jun '22

24 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/309

1 0

Re: [PATCH v2 0/1] MR293: winedbg: Clarify options specific to GDB proxy mode. - approved
by Alexandre Julliard (＠julliard) 24 Jun '22

24 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/293

1 0

Re: [PATCH v2 0/3] MR311: win32u: menu conversion - approved
by Alexandre Julliard (＠julliard) 24 Jun '22

24 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/311

1 0

Re: [PATCH v2 0/1] MR304: mshtml: Enable CSS grid layout. - approved
by Alexandre Julliard (＠julliard) 24 Jun '22

24 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/304

1 0

Re: [PATCH v3 0/4] MR271: win32u: Move rawinput APIs. - approved
by Alexandre Julliard (＠julliard) 24 Jun '22

24 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/271

1 0

Re: [PATCH v5 0/5] MR255: d3d11: Fix reporting of some format caps. - approved
by Alexandre Julliard (＠julliard) 24 Jun '22

24 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/255

1 0

[PATCH 0/5] MR307: dnsapi: Fix wow64 translation.
by Zebediah Figura (＠zfigura) 24 Jun '22

24 Jun '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/307

5 9

[PATCH v3 0/1] MR303: win32u: Don't report cloned monitors in EnumDisplayMonitors().
by Arek Hiler (＠ivyl) 24 Jun '22

24 Jun '22

Based on: ca39b1c22dfa ("user32: Don't report mirrored slave monitors in EnumDisplayMonitors.") 2affb854e524 ("user32: Change slave to a more neutral word.") Which seems to got lost during: 318673405c62 ("win32u: Move NtUserEnumDisplayMonitors implementation from user32.") Fixes regression with Elite Dangerous launcher freezing when cloned displays are present. Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> CC: @zhiyi @jacek -- v3: win32u: Don't report cloned monitors in EnumDisplayMonitors(). https://gitlab.winehq.org/wine/wine/-/merge_requests/303

4 3

[tools] testbot/web: The task failures list is read-only.
by Francois Gouget 24 Jun '22

24 Jun '22

Manually adding and removing task failures is not supported. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/FailureDetails.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/web/FailureDetails.pl b/testbot/web/FailureDetails.pl index f39af5ac91..ae4ccb4041 100644 --- a/testbot/web/FailureDetails.pl +++ b/testbot/web/FailureDetails.pl @@ -167,7 +167,7 @@ sub GenerateBody($) { print "<h2><a name='TaskFailures'></a>Task Failures</h2>\n"; my $TaskFailuresBlock = new TaskFailuresBlock($self->{Item}->TaskFailures, $self); - $TaskFailuresBlock->SetReadWrite(0) if (!$self->{RW}); + $TaskFailuresBlock->SetReadWrite(0); $TaskFailuresBlock->GenerateList(); } } -- 2.30.2

1 0

[tools] testbot/UpdateFailures: Truncate the bug status and description if needed.
by Francois Gouget 24 Jun '22

24 Jun '22

They have to fit otherwise Failure::Validate() will prevent saving to the database. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/UpdateFailures.pl | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/testbot/bin/UpdateFailures.pl b/testbot/bin/UpdateFailures.pl index 7c89b7b99b..f324cca280 100755 --- a/testbot/bin/UpdateFailures.pl +++ b/testbot/bin/UpdateFailures.pl @@ -157,6 +157,7 @@ foreach my $FailureId (@FailureIds) # Update the failures bug information my $Bugs = CollectBugInfo([keys %$BugIds]); +my ($MaxStatusLen, $MaxDescriptionLen); foreach my $FailureId (@FailureIds) { my $Failure = $Failures->GetItem($FailureId); @@ -167,9 +168,19 @@ foreach my $FailureId (@FailureIds) { my $Resolution = $Bug->{Resolution} || " ---"; $Resolution = $Resolution eq " ---" ? "" : " $Resolution"; - $Failure->BugStatus("$Bug->{Status}$Resolution"); + if (!defined $MaxStatusLen) + { + my $PropertyDescriptor = $Failure->GetPropertyDescriptorByName("BugStatus"); + $MaxStatusLen = $PropertyDescriptor->GetMaxLength(); + } + $Failure->BugStatus(substr("$Bug->{Status}$Resolution", 0, $MaxStatusLen)); + } + if (!defined $MaxDescriptionLen) + { + my $PropertyDescriptor = $Failure->GetPropertyDescriptorByName("BugDescription"); + $MaxDescriptionLen = $PropertyDescriptor->GetMaxLength(); } - $Failure->BugDescription($Bug->{Description}); + $Failure->BugDescription(substr($Bug->{Description}, 0, $MaxDescriptionLen)); } else { -- 2.30.2

1 0

[tools] testbot: Sort failures on their notes as a last resort.
by Francois Gouget 24 Jun '22

24 Jun '22

Sometimes a bug is spread across multiple failures and the Notes field normally describes what each one corresponds to. Sorting on the Notes field as a last resort typically ensures that all the parts are in an order that makes sense. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Failures.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/lib/WineTestBot/Failures.pm b/testbot/lib/WineTestBot/Failures.pm index 21b1610ca9..4a65374988 100644 --- a/testbot/lib/WineTestBot/Failures.pm +++ b/testbot/lib/WineTestBot/Failures.pm @@ -50,11 +50,11 @@ sub Compare($$) # Sort deleted entries last my %StatusOrders = ("deleted" => 1); - my $Cmp = ($StatusOrders{$self->GetColValue("BugStatus")} || 0) <=> ($StatusOrders{$B->GetColValue("BugStatus")} || 0) || + return ($StatusOrders{$self->GetColValue("BugStatus")} || 0) <=> ($StatusOrders{$B->GetColValue("BugStatus")} || 0) || $self->GetColValue("ErrorGroup") cmp $B->GetColValue("ErrorGroup") || $self->GetColValue("TestUnit") cmp $B->GetColValue("TestUnit") || - $self->GetColValue("BugDescription") cmp $B->GetColValue("BugDescription"); - return $Cmp + $self->GetColValue("BugDescription") cmp $B->GetColValue("BugDescription") || + $self->GetColValue("Notes") cmp $B->GetColValue("Notes"); } sub BugId($;$) -- 2.30.2

1 0

[tools] testbot: Treat regular expression warnings as errors.
by Francois Gouget 24 Jun '22

24 Jun '22

In particular do so when validating failures so errors are caught when the failure is created / modified. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Failures.pm | 1 + testbot/lib/WineTestBot/LogUtils.pm | 10 ++++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/Failures.pm b/testbot/lib/WineTestBot/Failures.pm index 4a65374988..dee8b68558 100644 --- a/testbot/lib/WineTestBot/Failures.pm +++ b/testbot/lib/WineTestBot/Failures.pm @@ -104,6 +104,7 @@ sub Validate($) my ($Field, $Name) = @$Pair; my $RegExp = $self->$Field; my $ErrMessage = eval { + use warnings FATAL => qw(regexp); if ($RegExp and "" =~ /$RegExp/) { return "The $Name regular expression should not match empty strings"; diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 99941b54a1..651c1d0a47 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -1391,7 +1391,10 @@ sub MatchLogFailures($$) { # Ignore failures that don't apply to this configuration my $ConfigRegExp = $Failure->ConfigRegExp; - my $Match = eval { !$ConfigRegExp or $ConfigName =~ /$ConfigRegExp/ }; + my $Match = eval { + use warnings FATAL => qw(regexp); + !$ConfigRegExp or $ConfigName =~ /$ConfigRegExp/; + }; next if (!$Match); my $UnitFailures = $FailureTree{$Failure->ErrorGroup}->{$Failure->TestUnit} ||= []; @@ -1413,7 +1416,10 @@ sub MatchLogFailures($$) foreach my $UnitFailure (@$UnitFailures) { my $RegExp = $UnitFailure->FailureRegExp; - my $Match = eval { $RegExp and $Line =~ /$RegExp/ }; + my $Match = eval { + use warnings FATAL => qw(regexp); + $RegExp and $Line =~ /$RegExp/; + }; next if (!$Match); my $LineFailures = $Group->{Failures}->{$ErrIndex} ||= []; -- 2.30.2

1 0

[PATCH v2 0/1] MR306: reg: Add REG_QWORD support to 'add'.
by Nikolay Sivov (＠nsivov) 24 Jun '22

24 Jun '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> -- v2: reg: Add REG_QWORD support to 'add'. https://gitlab.winehq.org/wine/wine/-/merge_requests/306

2 2

[PATCH 0/3] MR311: win32u: menu conversion
by Jacek Caban (＠jacek) 24 Jun '22

24 Jun '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/311

4 5

[PATCH 0/1] MR304: mshtml: Enable CSS grid layout.
by Arek Hiler (＠ivyl) 24 Jun '22

24 Jun '22

This helps with Final Fantasy XIV launcher not rendering correctly under Wine. The login form should be to the right of the news section but due to grid layout being unsupported it renders below and requires scrolling to be accessed which is non-obvious. The CSS grid is not fully implemented in Gecko version we are using. https://bugzilla.mozilla.org/show_bug.cgi?id=1217086 + bugs it depends on seems to be representative of the state of the implementation in version ~47. Looks like it's mostly some nesting cases that were still being implemented. The only real problem seems to require a very specific setup https://bugzilla.mozilla.org/show_bug.cgi?id=1316649 but we still may want to pick up the fix for it for wine-gecko. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/304

3 2

[PATCH] maintainers: Remove myself as maintainer.
by Andrew Eikum 24 Jun '22

24 Jun '22

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- I'm moving on to another job opportunity. I'm happy to discuss the audio modules. MAINTAINERS | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index c60a383b3b9..c5f560b2617 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -36,7 +36,7 @@ F: dlls/ntdll/signal_arm* F: programs/winedbg/be_arm* Audio I/O -M: Andrew Eikum <aeikum(a)codeweavers.com> +P: Andrew Eikum <coldpie(a)fastmail.com> F: dlls/dsound/ F: dlls/mmdevapi/ F: dlls/winealsa.drv/ @@ -104,7 +104,6 @@ F: dlls/dpwsockx/ DirectShow M: Zebediah Figura <z.figura12(a)gmail.com> -P: Andrew Eikum <aeikum(a)codeweavers.com> F: dlls/amstream/ F: dlls/devenum/ F: dlls/mciqtz32/ @@ -188,7 +187,6 @@ F: dlls/jscript/ Joystick input M: Rémi Bernon <rbernon(a)codeweavers.com> -P: Andrew Eikum <aeikum(a)codeweavers.com> F: dlls/dinput*/ F: dlls/windows.gaming.input/ F: dlls/winebus.sys/ @@ -196,7 +194,7 @@ F: dlls/winexinput.sys/ F: dlls/xinput*/ Media format conversion -M: Andrew Eikum <aeikum(a)codeweavers.com> +P: Andrew Eikum <coldpie(a)fastmail.com> F: dlls/*.acm/ F: dlls/msacm32/ @@ -252,7 +250,6 @@ F: dlls/ole32/storage32.h F: dlls/ole32/tests/storage32.c OLE Typelibs -P: Andrew Eikum <aeikum(a)codeweavers.com> P: Huw Davies <huw(a)codeweavers.com> F: dlls/oleaut32/typelib.c @@ -388,7 +385,6 @@ F: dlls/xmllite/ THE REST M: Alexandre Julliard <julliard(a)winehq.org> P: Alex Henrie <alexhenrie24(a)gmail.com> -P: Andrew Eikum <aeikum(a)codeweavers.com> P: Huw Davies <huw(a)codeweavers.com> P: Jacek Caban <jacek(a)codeweavers.com> P: Esme Povirk <esme(a)codeweavers.com> -- 2.36.1

1 0

[PATCH v2 0/1] MR296: nsiproxy.sys: Add static ARP entries which are always present on Windows.
by Paul Gofman (＠gofman) 24 Jun '22

24 Jun '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53175 Split off from MR https://gitlab.winehq.org/wine/wine/-/merge_requests/286. -- v2: nsiproxy.sys: Add static ARP entries which are always present on Windows. https://gitlab.winehq.org/wine/wine/-/merge_requests/296

3 3

[PATCH v2 0/1] MR303: win32u: Don't report cloned monitors in EnumDisplayMonitors().
by Arek Hiler (＠ivyl) 24 Jun '22

24 Jun '22

Based on: ca39b1c22dfa ("user32: Don't report mirrored slave monitors in EnumDisplayMonitors.") 2affb854e524 ("user32: Change slave to a more neutral word.") Which seems to got lost during: 318673405c62 ("win32u: Move NtUserEnumDisplayMonitors implementation from user32.") Fixes regression with Elite Dangerous launcher freezing when cloned displays are present. Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> CC: @zhiyi @jacek -- v2: win32u: Don't report cloned monitors in EnumDisplayMonitors(). https://gitlab.winehq.org/wine/wine/-/merge_requests/303

4 3

[PATCH 0/1] MR306: reg: Add REG_QWORD support to 'add'.
by Nikolay Sivov (＠nsivov) 24 Jun '22

24 Jun '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/306

3 7

Re: [PATCH v2 0/3] MR310: mf: Fix several reference leaks.
by Rémi Bernon (＠rbernon) 24 Jun '22

24 Jun '22

v2: Move some todo_wine around to fix the spurious successes. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/310#note_2638

1 0

[PATCH v2 0/4] MR271: win32u: Move rawinput APIs.
by Zebediah Figura (＠zfigura) 24 Jun '22

24 Jun '22

-- v2: win32u: Use syscall interface for NtUserGetRawInputBuffer. win32u: Use syscall interface for NtUserGetRawInputData. win32u: Move raw input thread data allocation from user32. win32u: Move process_rawinput_message() from user32. https://gitlab.winehq.org/wine/wine/-/merge_requests/271

5 7

[PATCH 0/3] MR310: mf: Fix several reference leaks.
by Rémi Bernon (＠rbernon) 24 Jun '22

24 Jun '22

So that the mf tests pass again on 32bit on the testbot, though they still fail locally with `LIBGL_ALWAYS_SOFTWARE=true GALLIUM_DRIVER=softpipe`. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/310

3 5

[PATCH 0/1] MR309: wow64: Report the correct size for SystemLogicalProcessorInformationEx.
by Huw Davies (＠huw) 24 Jun '22

24 Jun '22

Spotted by Brendan Shanks. Signed-off-by: Huw Davies <huw(a)codeweavers.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/309

2 1

[PATCH v4 0/5] MR255: d3d11: Fix reporting of some format caps.
by Zebediah Figura (＠zfigura) 24 Jun '22

24 Jun '22

-- v4: d3d11: Check for WINED3DUSAGE_QUERY_POSTPIXELSHADER_BLENDING with WINED3D_RTYPE_TEXTURE_2D. wined3d: Retrieve caps from both WINED3D_GL_RES_TYPE_TEX_2D and WINED3D_GL_RES_TYPE_RB for 2D textures in wined3d_check_device_format(). wined3d: Report WINED3D_FORMAT_CAP_BLIT for formats supporting VK_FORMAT_FEATURE_TRANSFER_SRC and VK_FORMAT_FEATURE_TRANSFER_DST. wined3d: Add Vulkan format information for WINED3DFMT_B5G6R5_UNORM. d3d11/tests: Add tests for D3D11_FORMAT_SUPPORT_BLENDABLE. https://gitlab.winehq.org/wine/wine/-/merge_requests/255

4 8

Mailing list spam - the many dnsapi patches that were mailed out
by Jeremy White 24 Jun '22

24 Jun '22

So Zeb's evil plan to break my mailing list script worked! The moderately fragile bit that parses the patches relies on a regex matching '^From '. She included a comment in her code referencing another patch; a 'From <sha> here'. That caused it to crash after sending 3 out of 4 emails, and before it marked that MR as done. So every time it woke up, it thought it needed to send that MR, would send 3, and then crash. I have, in theory, mitigated that with this change: https://gitlab.winehq.org/winehq/tools/-/merge_requests/15 Sorry for the over flowing mailbox. Hopefully this patch set will get a *very* thorough review :-). Cheers, Jeremy

3 4

[PATCH v3 0/6] MR302: winegstreamer: Some wg_transform H264 fixes for Mortal Kombat 11 and Yakuza 4.
by Rémi Bernon (＠rbernon) 24 Jun '22

24 Jun '22

-- v3: winegstreamer: Use an atomic queue for wg_transform input buffers. winegstreamer: Check H264 ProcessOutput sample against actual image size. winegstreamer: Use H264 input media type frame size when specified. winegstreamer: Implement H264 SetOutputType by reconfiguring the pipeline. winegstreamer: Release wg_transform output sample when too small. mf/tests: Add todo_wine for newer FFmpeg versions. https://gitlab.winehq.org/wine/wine/-/merge_requests/302

4 15

[PATCH 0/4] MR271: win32u: Move rawinput APIs.
by Zebediah Figura (＠zfigura) 24 Jun '22

24 Jun '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/271

6 9

[PATCH vkd3d 1/7] tests: Test dot() intrinsic.
by Giovanni Mascellani 24 Jun '22

24 Jun '22

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- Makefile.am | 1 + tests/hlsl-dot.shader_test | 94 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 95 insertions(+) create mode 100644 tests/hlsl-dot.shader_test diff --git a/Makefile.am b/Makefile.am index ad6a0a41..400e79e1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -68,6 +68,7 @@ vkd3d_shader_tests = \ tests/hlsl-clamp.shader_test \ tests/hlsl-comma.shader_test \ tests/hlsl-cross.shader_test \ + tests/hlsl-dot.shader_test \ tests/hlsl-duplicate-modifiers.shader_test \ tests/hlsl-for.shader_test \ tests/hlsl-function.shader_test \ diff --git a/tests/hlsl-dot.shader_test b/tests/hlsl-dot.shader_test new file mode 100644 index 00000000..123ee73e --- /dev/null +++ b/tests/hlsl-dot.shader_test @@ -0,0 +1,94 @@ +[pixel shader] +uniform float4 x; +uniform float4 y; + +float4 main() : SV_TARGET +{ + return dot(x, y); +} + +[test] +uniform 0 float4 2.0 3.0 4.0 5.0 +uniform 4 float4 10.0 11.0 12.0 13.0 +todo draw quad +probe all rgba (166.0, 166.0, 166.0, 166.0) + +[pixel shader] +uniform float2 x; +uniform float4 y; + +float4 main() : SV_TARGET +{ + return dot(x, y); +} + +[test] +uniform 0 float4 2.0 3.0 0.0 0.0 +uniform 4 float4 10.0 11.0 12.0 13.0 +todo draw quad +probe all rgba (53.0, 53.0, 53.0, 53.0) + +[pixel shader] +uniform float x; +uniform float4 y; + +float4 main() : SV_TARGET +{ + return dot(x, y); +} + +[test] +uniform 0 float4 2.0 0.0 0.0 0.0 +uniform 4 float4 10.0 11.0 12.0 13.0 +todo draw quad +probe all rgba (92.0, 92.0, 92.0, 92.0) + +[pixel shader] +uniform float x; +uniform float y; + +float4 main() : SV_TARGET +{ + return dot(x, y); +} + +[test] +uniform 0 float4 2.0 3.0 0.0 0.0 +todo draw quad +probe all rgba (6.0, 6.0, 6.0, 6.0) + +[pixel shader fail] +uniform float1x1 x; +uniform float4 y; + +float4 main() : SV_TARGET +{ + return dot(x, y); +} + +[pixel shader fail] +uniform float1x4 x; +uniform float4 y; + +float4 main() : SV_TARGET +{ + return dot(x, y); +} + +[pixel shader fail] +uniform float4x1 x; +uniform float4 y; + +float4 main() : SV_TARGET +{ + return dot(x, y); +} + +[pixel shader fail] +uniform float4x4 x; +uniform float4 y; + +float4 main() : SV_TARGET +{ + return dot(x, y); +} -- 2.36.1

2 7

[PATCH v3 0/5] MR255: d3d11: Fix reporting of some format caps.
by Zebediah Figura (＠zfigura) 23 Jun '22

23 Jun '22

-- v3: d3d11: Check for WINED3DUSAGE_QUERY_POSTPIXELSHADER_BLENDING with WINED3D_RTYPE_TEXTURE_2D. wined3d: Retrieve caps from both WINED3D_GL_RES_TYPE_TEX_2D and WINED3D_GL_RES_TYPE_RB for 2D textures in wined3d_check_device_format(). wined3d: Report WINED3D_FORMAT_CAP_BLIT for formats supporting VK_FORMAT_FEATURE_TRANSFER_SRC and VK_FORMAT_FEATURE_TRANSFER_DST. wined3d: Add Vulkan format information for WINED3DFMT_B5G6R5_UNORM. d3d11/tests: Add tests for D3D11_FORMAT_SUPPORT_BLENDABLE. https://gitlab.winehq.org/wine/wine/-/merge_requests/255

4 8

[PATCH v2 0/5] MR255: d3d11: Fix reporting of some format caps.
by Zebediah Figura (＠zfigura) 23 Jun '22

23 Jun '22

-- v2: d3d11: Check for WINED3DUSAGE_QUERY_POSTPIXELSHADER_BLENDING with WINED3D_RTYPE_TEXTURE_2D. wined3d: Retrieve caps from both WINED3D_GL_RES_TYPE_TEX_2D and WINED3D_GL_RES_TYPE_RB for 2D textures in wined3d_check_device_format(). wined3d: Report WINED3D_FORMAT_CAP_BLIT for formats supporting VK_FORMAT_FEATURE_TRANSFER_SRC and VK_FORMAT_FEATURE_TRANSFER_DST. https://gitlab.winehq.org/wine/wine/-/merge_requests/255

5 9

[PATCH 0/2] MR305: regedit: Add support for REG_QWORD type.
by Nikolay Sivov (＠nsivov) 23 Jun '22

23 Jun '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/305

2 2

Re: [PATCH v2 0/1] MR301: iphlpapi: Don't allocate the IO status block on the stack. - approved
by Alexandre Julliard (＠julliard) 23 Jun '22

23 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/301

1 0

Re: [PATCH v2 0/2] MR300: d2d1: Implement IsBufferPrecisionSupported(). - approved
by Alexandre Julliard (＠julliard) 23 Jun '22

23 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/300

1 0

Re: [PATCH v2 0/6] MR299: uxtheme: Support parsing more tab parts. - approved
by Alexandre Julliard (＠julliard) 23 Jun '22

23 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/299

1 0

TestBot News : Failure tracking
by Francois Gouget 23 Jun '22

23 Jun '22

The TestBot now has a list of known failures which it can identify and link to the corresponding Wine bug. The main benefit is that the TestBot knows your patches cannot be the cause of known failures, even if they look new [1]. The list of known failures is not yet complete [2] but you can expect that over the next few weeks the cases where the TestBot incorrectly claims your patch introduces new failures should get much rarer. Failure tracking also provides you with other benefits: The task full logs now have an index of the known failures they contain to help you quickly go to the first corresponding failure line. (and a pair of additional entries point you to the first and last failure) Also the failure lines are annotated with the corresponding bug id(s). This id is a link that takes you to a page that: * Shows how the TestBot identified the failure. * Links to the Wine bug discussing the failure. * And show all the tasks and logs where the failure occurred. You can use this to quickly access these logs and look for common patterns. You can also get a list of the known failures by clicking on the Failures entry in the TestBot's sidebar. https://testbot.winehq.org/FailuresList.pl For each failure you will see when it last happened and the status of the corresponding bug (new, closed, etc). This is a good way to identify failures that seem to be fixed. Finally the job report emails also list the known failures that happened while testing your patch. Consider this a reminder that your help in fixing them would be greatly appreciated, particularly as you may already know the area since you patched it. [1] The TestBot normally diffs the test run's failures against the past WineTest reports and considers any line marked as new (literally '+' in unified diff parlance), as a new failure. This means any failure that's rare enough to not be present in any of the past WineTest runs of the same test configuration, will be flagged as new. Failures where the message changes (beyond basic line number changes, addresses in exceptions, etc.) will also look new. This could be because a patch changed the failure message, but more often it is because the message itself contains a pointer, handle, uninitialized data, elapsed time, etc. [2] The goal is not necessarily to track every test failure but to track all those that can cause false positives. So a test that fails systematically may not be tracked (although if it has a Wine bug it probably should be). But tests that tend to be incorrectly tagged as new due to the issues in [1] should all be. The way I plan to get there is to monitor the TestBot's WineTest jobs for a while and add to the known failure list whenever new unknown failures appear there. -- Francois Gouget <fgouget(a)codeweavers.com>

1 0

vkd3d release schedule
by Henri Verbeet 23 Jun '22

23 Jun '22

Hi all, As you may have noticed, the time between the vkd3d 1.3 and 1.4 releases was a fair bit shorter than the time between the 1.2 and 1.3 releases. That was deliberate; at the start of the year the plan was made to aim for about 4 vkd3d releases per year. I think that has worked out well so far, so we'd like to continue along those lines. In practical terms, that puts the tentative release dates for vkd3d 1.5 and 1.6 at late September and late December this year. Henri

3 4

[PATCH v2 0/6] MR302: winegstreamer: Some wg_transform H264 fixes for Mortal Kombat 11 and Yakuza 4.
by Rémi Bernon (＠rbernon) 23 Jun '22

23 Jun '22

-- v2: winegstreamer: Use an atomic queue for wg_transform input buffers. winegstreamer: Check H264 ProcessOutput sample against actual image size. winegstreamer: Use H264 input media type frame size when specified. winegstreamer: Implement H264 SetOutputType by reconfiguring the pipeline. winegstreamer: Release wg_transform output sample when too small. mf/tests: Add todo_wine for newer FFmpeg versions. https://gitlab.winehq.org/wine/wine/-/merge_requests/302

3 11

[PATCH 0/1] MR303: win32u: Don't report cloned monitors in EnumDisplayMonitors().
by Arek Hiler (＠ivyl) 23 Jun '22

23 Jun '22

Based on: ca39b1c22dfa ("user32: Don't report mirrored slave monitors in EnumDisplayMonitors.") 2affb854e524 ("user32: Change slave to a more neutral word.") Which seems to got lost during: 318673405c62 ("win32u: Move NtUserEnumDisplayMonitors implementation from user32.") Fixes regression with Elite Dangerous launcher freezing when cloned displays are present. Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> CC: @zhiyi @jacek -- https://gitlab.winehq.org/wine/wine/-/merge_requests/303

3 2

[PATCH 0/6] MR302: winegstreamer: Some wg_transform H264 fixes for Mortal Kombat 11 and Yakuza 4.
by Rémi Bernon (＠rbernon) 23 Jun '22

23 Jun '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/302

3 10

[PATCH v4 1/7] mfplat/buffer: Fix size for IMC2/IMC4 buffers with odd height.
by Giovanni Mascellani 23 Jun '22

23 Jun '22

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- v2: * Remove the multiplier * The missing test cases will be reinsterted in a later commit --- dlls/mfplat/buffer.c | 22 ++++++++++++++++++--- dlls/mfplat/tests/mfplat.c | 40 ++++++++++++++++---------------------- 2 files changed, 36 insertions(+), 26 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index eada3df18ad..39407ccc9e2 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -1351,8 +1351,25 @@ static HRESULT create_2d_buffer(DWORD width, DWORD height, DWORD fourcc, BOOL bo if (is_yuv && bottom_up) return MF_E_INVALIDMEDIATYPE; - if (FAILED(hr = MFGetPlaneSize(fourcc, width, height, &plane_size))) - return hr; + switch (fourcc) + { + case MAKEFOURCC('I','M','C','1'): + case MAKEFOURCC('I','M','C','3'): + plane_size = stride * height * 2; + break; + case MAKEFOURCC('I','M','C','2'): + case MAKEFOURCC('I','M','C','4'): + plane_size = stride * 3 / 2 * height; + break; + case MAKEFOURCC('N','V','1','2'): + case MAKEFOURCC('Y','V','1','2'): + case MAKEFOURCC('I','4','2','0'): + case MAKEFOURCC('I','Y','U','V'): + plane_size = stride * height * 3 / 2; + break; + default: + plane_size = stride * height; + } if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; @@ -1377,7 +1394,6 @@ static HRESULT create_2d_buffer(DWORD width, DWORD height, DWORD fourcc, BOOL bo case MAKEFOURCC('I','M','C','1'): case MAKEFOURCC('I','M','C','3'): max_length = pitch * height * 2; - plane_size *= 2; break; case MAKEFOURCC('N','V','1','2'): case MAKEFOURCC('Y','V','1','2'): diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 67cf8954c36..6ad667a7404 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -5723,48 +5723,49 @@ static void test_MFCreate2DMediaBuffer(void) unsigned int fourcc; unsigned int contiguous_length; int pitch; - unsigned int plane_multiplier; unsigned int max_length; } _2d_buffer_tests[] = { - { 2, 2, MAKEFOURCC('N','V','1','2'), 6, 64, 0, 192 }, + { 2, 2, MAKEFOURCC('N','V','1','2'), 6, 64, 192 }, { 4, 2, MAKEFOURCC('N','V','1','2'), 12, 64 }, { 2, 4, MAKEFOURCC('N','V','1','2'), 12, 64 }, { 1, 3, MAKEFOURCC('N','V','1','2'), 4, 64 }, - { 4, 16, MAKEFOURCC('N','V','1','2'), 96, 64, 0, 1536 }, + { 4, 16, MAKEFOURCC('N','V','1','2'), 96, 64, 1536 }, - { 2, 2, MAKEFOURCC('I','M','C','2'), 6, 128, 0, 384 }, + { 2, 2, MAKEFOURCC('I','M','C','2'), 6, 128, 384 }, { 4, 2, MAKEFOURCC('I','M','C','2'), 12, 128 }, { 2, 4, MAKEFOURCC('I','M','C','2'), 12, 128 }, + { 3, 5, MAKEFOURCC('I','M','C','2'), 20, 128 }, { 2, 2, MAKEFOURCC('I','M','C','4'), 6, 128 }, { 4, 2, MAKEFOURCC('I','M','C','4'), 12, 128 }, { 2, 4, MAKEFOURCC('I','M','C','4'), 12, 128 }, + { 3, 5, MAKEFOURCC('I','M','C','4'), 20, 128 }, - { 4, 2, MAKEFOURCC('I','M','C','1'), 32, 128, 2 }, - { 4, 4, MAKEFOURCC('I','M','C','1'), 64, 128, 2 }, - { 4, 16, MAKEFOURCC('I','M','C','1'), 256, 128, 2, 4096 }, - { 4, 20, MAKEFOURCC('I','M','C','1'), 320, 128, 2 }, + { 4, 2, MAKEFOURCC('I','M','C','1'), 32, 128 }, + { 4, 4, MAKEFOURCC('I','M','C','1'), 64, 128 }, + { 4, 16, MAKEFOURCC('I','M','C','1'), 256, 128, 4096 }, + { 4, 20, MAKEFOURCC('I','M','C','1'), 320, 128 }, - { 4, 2, MAKEFOURCC('I','M','C','3'), 32, 128, 2 }, - { 4, 4, MAKEFOURCC('I','M','C','3'), 64, 128, 2 }, - { 4, 16, MAKEFOURCC('I','M','C','3'), 256, 128, 2, 4096 }, - { 4, 20, MAKEFOURCC('I','M','C','3'), 320, 128, 2 }, + { 4, 2, MAKEFOURCC('I','M','C','3'), 32, 128 }, + { 4, 4, MAKEFOURCC('I','M','C','3'), 64, 128 }, + { 4, 16, MAKEFOURCC('I','M','C','3'), 256, 128, 4096 }, + { 4, 20, MAKEFOURCC('I','M','C','3'), 320, 128 }, { 4, 2, MAKEFOURCC('Y','V','1','2'), 12, 128 }, { 4, 4, MAKEFOURCC('Y','V','1','2'), 24, 128 }, - { 4, 16, MAKEFOURCC('Y','V','1','2'), 96, 128, 0, 3072 }, + { 4, 16, MAKEFOURCC('Y','V','1','2'), 96, 128, 3072 }, { 4, 2, MAKEFOURCC('A','Y','U','V'), 32, 64 }, { 4, 4, MAKEFOURCC('A','Y','U','V'), 64, 64 }, - { 4, 16, MAKEFOURCC('A','Y','U','V'), 256, 64, 0, 1024 }, + { 4, 16, MAKEFOURCC('A','Y','U','V'), 256, 64, 1024 }, { 4, 2, MAKEFOURCC('Y','U','Y','2'), 16, 64 }, { 4, 4, MAKEFOURCC('Y','U','Y','2'), 32, 64 }, - { 4, 16, MAKEFOURCC('Y','U','Y','2'), 128, 64, 0, 1024 }, + { 4, 16, MAKEFOURCC('Y','U','Y','2'), 128, 64, 1024 }, { 4, 2, MAKEFOURCC('U','Y','V','Y'), 16, 64 }, { 4, 4, MAKEFOURCC('U','Y','V','Y'), 32, 64 }, - { 4, 16, MAKEFOURCC('U','Y','V','Y'), 128, 64, 0, 1024 }, + { 4, 16, MAKEFOURCC('U','Y','V','Y'), 128, 64, 1024 }, { 2, 4, D3DFMT_A8R8G8B8, 32, 64 }, { 1, 4, D3DFMT_A8R8G8B8, 16, 64 }, @@ -5998,13 +5999,6 @@ static void test_MFCreate2DMediaBuffer(void) hr = IMFMediaBuffer_Unlock(buffer); ok(hr == S_OK, "Failed to unlock buffer, hr %#lx.\n", hr); - hr = pMFGetPlaneSize(ptr->fourcc, ptr->width, ptr->height, &length2); - ok(hr == S_OK, "Failed to get plane size, hr %#lx.\n", hr); - if (ptr->plane_multiplier) - length2 *= ptr->plane_multiplier; - ok(length2 == length, "%d: contiguous length %lu does not match plane size %lu, %u x %u, format %s.\n", i, length, - length2, ptr->width, ptr->height, wine_dbgstr_an((char *)&ptr->fourcc, 4)); - hr = IMF2DBuffer_Lock2D(_2dbuffer, &data, &pitch); ok(hr == S_OK, "Failed to lock buffer, hr %#lx.\n", hr); -- 2.36.1

3 14

[PATCH 0/1] MR301: iphlpapi: Don't allocate the IO status block on the stack.
by Huw Davies (＠huw) 23 Jun '22

23 Jun '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/301

2 1

[PATCH 0/2] MR300: d2d1: Implement IsBufferPrecisionSupported().
by Nikolay Sivov (＠nsivov) 23 Jun '22

23 Jun '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/300

2 2

[PATCH 0/1] MR296: nsiproxy.sys: Add static ARP entries which are always present on Windows.
by Paul Gofman (＠gofman) 23 Jun '22

23 Jun '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53175 Split off from MR https://gitlab.winehq.org/wine/wine/-/merge_requests/286. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/296

3 9

[PATCH v2] ntdll: Add RtlGetDeviceFamilyInfoEnum and RtlConvertDeviceFamilyInfoToString
by Kacper Raczy 23 Jun '22

23 Jun '22

APIs introduced in Windows 10 (NT10.0). Device form and family is fixed to Desktop configuration. Unit tests included in dlls/ntdll/tests/version.c Signed-off-by: Kacper Raczy <gfw.kra(a)gmail.com> --- dlls/ntdll/ntdll.spec | 2 + dlls/ntdll/rtl.c | 2 +- dlls/ntdll/tests/Makefile.in | 3 +- dlls/ntdll/tests/version.c | 71 ++++++++++++++++++++++++++++++++++++ dlls/ntdll/version.c | 48 +++++++++++++++++++++++- include/winnt.h | 10 +++++ 6 files changed, 133 insertions(+), 3 deletions(-) create mode 100644 dlls/ntdll/tests/version.c diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index b1650ab4306..4539a9bd0ed 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -712,6 +712,8 @@ @ stdcall RtlGetCurrentProcessorNumberEx(ptr) @ stdcall RtlGetCurrentTransaction() @ stdcall RtlGetDaclSecurityDescriptor(ptr ptr ptr ptr) +@ stdcall RtlGetDeviceFamilyInfoEnum(ptr ptr ptr) +@ stdcall RtlConvertDeviceFamilyInfoToString(ptr ptr ptr ptr) @ stdcall RtlGetElementGenericTable(ptr long) # @ stub RtlGetElementGenericTableAvl @ stdcall RtlGetEnabledExtendedFeatures(int64) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index 11067f44941..421cf377d32 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -2211,4 +2211,4 @@ char WINAPI RtlQueryProcessPlaceholderCompatibilityMode(void) { FIXME("stub\n"); return PHCM_APPLICATION_DEFAULT; -} +} \ No newline at end of file diff --git a/dlls/ntdll/tests/Makefile.in b/dlls/ntdll/tests/Makefile.in index 90deb5865f8..e64b70b15e4 100644 --- a/dlls/ntdll/tests/Makefile.in +++ b/dlls/ntdll/tests/Makefile.in @@ -25,5 +25,6 @@ C_SRCS = \ thread.c \ threadpool.c \ time.c \ + version.c \ virtual.c \ - wow64.c + wow64.c \ No newline at end of file diff --git a/dlls/ntdll/tests/version.c b/dlls/ntdll/tests/version.c new file mode 100644 index 00000000000..6b2d86e3464 --- /dev/null +++ b/dlls/ntdll/tests/version.c @@ -0,0 +1,71 @@ +/* + * Unit test suite for Rtl* Version API functions + * + * Copyright 2022 Kacper Rączy + * + * 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 "ntdll_test.h" +#include "wine/test.h" + +static void test_RtlGetDeviceFamilyInfoEnum(void) +{ + DWORD family, form; + ULONGLONG uap; + RTL_OSVERSIONINFOEXW version; + + RtlGetVersion(&version); + RtlGetDeviceFamilyInfoEnum(&uap, &family, &form); + ok( ((uap >> 48) & 0xffff) == version.dwMajorVersion, + "First 16-bit chunk of UAP does not match major system version %llx\n", uap ); + ok( ((uap >> 32) & 0xffff) == version.dwMinorVersion, + "Second 16-bit chunk of UAP does not match minor system version %llx\n", uap ); + ok( ((uap >> 16) & 0xffff) == version.dwBuildNumber, + "Third 16-bit chunk of UAP does not match build number %llx\n", uap ); + ok( form == DEVICEFAMILYDEVICEFORM_DESKTOP, + "Device form does not match Desktop value: %lx\n", form ); + ok( family == DEVICEFAMILYINFOENUM_DESKTOP, + "Device family does not match Windows.Desktop value: %lx\n", family ); +} + +static void test_RtlConvertDeviceFamilyInfoToString(void) +{ + DWORD family_bufsize = 0, form_bufsize = 0; + WCHAR *family, *form; + + RtlConvertDeviceFamilyInfoToString(&family_bufsize, &form_bufsize, NULL, NULL); + ok( family_bufsize == sizeof(WCHAR) * 16, /* Windows.Desktop length */ + "Device family bufsize does not match: %u\n", family_bufsize ); + ok( form_bufsize == sizeof(WCHAR) * 8, /* Desktop length */ + "Device family bufsize does not match: %u\n", form_bufsize ); + + family = (WCHAR*)malloc(family_bufsize); + form = (WCHAR*)malloc(form_bufsize); + RtlConvertDeviceFamilyInfoToString(&family_bufsize, &form_bufsize, family, form); + ok( wcscmp(family, L"Windows.Desktop") == 0, + "Device family string is not equal to Windows.Desktop: %ls", family ); + ok( wcscmp(form, L"Desktop") == 0, + "Device form string is not equal to Desktop: %ls", form ); + + free(family); + free(form); +} + +START_TEST(version) +{ + test_RtlGetDeviceFamilyInfoEnum(); + test_RtlConvertDeviceFamilyInfoToString(); +} \ No newline at end of file diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c index 492c24cc636..e988a17311b 100644 --- a/dlls/ntdll/version.c +++ b/dlls/ntdll/version.c @@ -609,7 +609,6 @@ void WINAPI RtlGetNtVersionNumbers( LPDWORD major, LPDWORD minor, LPDWORD build if (build) *build = (0xF0000000 | current_version->dwBuildNumber); } - /****************************************************************************** * RtlGetNtProductType (NTDLL.@) */ @@ -760,6 +759,53 @@ NTSTATUS WINAPI RtlVerifyVersionInfo( const RTL_OSVERSIONINFOEXW *info, return STATUS_SUCCESS; } +/********************************************************************* + * RtlGetDeviceFamilyInfoEnum (NTDLL.@) + * + * NOTES + * Introduced in Windows 10 (NT10.0) + */ +void WINAPI RtlGetDeviceFamilyInfoEnum( ULONGLONG *uap_info, DWORD *device_family, DWORD *device_form ) +{ + if (device_form) + *device_form = DEVICEFAMILYDEVICEFORM_DESKTOP; + if (device_family) + *device_family = DEVICEFAMILYINFOENUM_DESKTOP; + if (!uap_info) + return; + + /** + UAP info is 64 bit unsigned integer which contains four 16-bit chunks: + 1. os version major + 2. os version minor + 3. current build number + 4. UBR + */ + *uap_info = 0; + *uap_info |= (((ULONGLONG)current_version->dwMajorVersion & 0xffff) << 48); /* os version major */ + *uap_info |= (((ULONGLONG)current_version->dwMinorVersion & 0xffff) << 32); /* os version minor */ + *uap_info |= (((ULONGLONG)current_version->dwBuildNumber & 0xffff) << 16); /* current build number */ + /* UBR not available */ +} + +/********************************************************************* + * RtlConvertDeviceFamilyInfoToString (NTDLL.@) + * + * NOTES + * Introduced in Windows 10 (NT10.0) + */ +void WINAPI RtlConvertDeviceFamilyInfoToString( DWORD *device_family_bufsize, DWORD *device_form_bufsize, + const WCHAR *device_family, const WCHAR *device_form) +{ + DWORD device_family_len = (wcslen( DEVICEFAMILYINFOENUM_DESKTOP_STR ) + 1) * sizeof(WCHAR); + DWORD device_form_len = (wcslen( DEVICEFAMILYDEVICEFORM_DESKTOP_STR ) + 1) * sizeof(WCHAR); + if (*device_family_bufsize >= device_family_len) + wcscpy( device_family, DEVICEFAMILYINFOENUM_DESKTOP_STR ); + if (*device_form_bufsize >= device_form_len) + wcscpy( device_form, DEVICEFAMILYDEVICEFORM_DESKTOP_STR ); + *device_family_bufsize = device_family_len; + *device_form_bufsize = device_form_len; +} /****************************************************************************** * VerSetConditionMask (NTDLL.@) diff --git a/include/winnt.h b/include/winnt.h index 87c4b4da92d..eeb4e1cb494 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6224,6 +6224,16 @@ typedef struct _SYSTEM_CPU_SET_INFORMATION } DUMMYUNIONNAME; } SYSTEM_CPU_SET_INFORMATION, *PSYSTEM_CPU_SET_INFORMATION; +/* Windows 10 Rtl apis */ + +#define DEVICEFAMILYDEVICEFORM_DESKTOP 0x00000003 +#define DEVICEFAMILYINFOENUM_DESKTOP 0x00000003 +#define DEVICEFAMILYDEVICEFORM_DESKTOP_STR L"Desktop" +#define DEVICEFAMILYINFOENUM_DESKTOP_STR L"Windows.Desktop" + +NTSYSAPI VOID WINAPI RtlGetDeviceFamilyInfoEnum(ULONGLONG*, DWORD*, DWORD*); +NTSYSAPI VOID WINAPI RtlConvertDeviceFamilyInfoToString(DWORD*, DWORD*, const WCHAR*, const WCHAR*); + /* Threadpool things */ typedef DWORD TP_VERSION,*PTP_VERSION; -- 2.36.1

2 2

[PATCH 0/6] MR299: uxtheme: Support parsing more tab parts.
by Zhiyi Zhang (＠zhiyi) 23 Jun '22

23 Jun '22

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/299

2 6

Re: [PATCH v2 0/2] MR270: include: Add interface declarations in dxgidebug.idl - approved
by Alexandre Julliard (＠julliard) 22 Jun '22

22 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/270

1 0

Re: [PATCH v3 0/2] MR132: opengl32: Don't prioritize low bit depth formats with non-matching stencil. - approved
by Alexandre Julliard (＠julliard) 22 Jun '22

22 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/132

1 0

Re: [PATCH v2 0/5] MR297: uxtheme: Support parsing more listview parts and states. - approved
by Alexandre Julliard (＠julliard) 22 Jun '22

22 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/297

1 0

[PATCH resend] ntdll: Add RtlGetDeviceFamilyInfoEnum and RtlGetDeviceFamilyInfoEnum
by Kacper Raczy 22 Jun '22

22 Jun '22

APIs introduced in Windows 10 (NT10.0). DeviceForm and Family is fixed to Desktop configuration. Signed-off-by: Kacper Raczy <gfw.kra(a)gmail.com> --- dlls/ntdll/ntdll.spec | 2 ++ dlls/ntdll/rtl.c | 2 +- dlls/ntdll/version.c | 54 ++++++++++++++++++++++++++++++++++++++++++- include/winnt.h | 10 ++++++++ 4 files changed, 66 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index b1650ab4306..4539a9bd0ed 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -712,6 +712,8 @@ @ stdcall RtlGetCurrentProcessorNumberEx(ptr) @ stdcall RtlGetCurrentTransaction() @ stdcall RtlGetDaclSecurityDescriptor(ptr ptr ptr ptr) +@ stdcall RtlGetDeviceFamilyInfoEnum(ptr ptr ptr) +@ stdcall RtlConvertDeviceFamilyInfoToString(ptr ptr ptr ptr) @ stdcall RtlGetElementGenericTable(ptr long) # @ stub RtlGetElementGenericTableAvl @ stdcall RtlGetEnabledExtendedFeatures(int64) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index 11067f44941..421cf377d32 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -2211,4 +2211,4 @@ char WINAPI RtlQueryProcessPlaceholderCompatibilityMode(void) { FIXME("stub\n"); return PHCM_APPLICATION_DEFAULT; -} +} \ No newline at end of file diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c index 492c24cc636..b9af53452a2 100644 --- a/dlls/ntdll/version.c +++ b/dlls/ntdll/version.c @@ -609,7 +609,6 @@ void WINAPI RtlGetNtVersionNumbers( LPDWORD major, LPDWORD minor, LPDWORD build if (build) *build = (0xF0000000 | current_version->dwBuildNumber); } - /****************************************************************************** * RtlGetNtProductType (NTDLL.@) */ @@ -760,6 +759,59 @@ NTSTATUS WINAPI RtlVerifyVersionInfo( const RTL_OSVERSIONINFOEXW *info, return STATUS_SUCCESS; } +/********************************************************************* + * RtlGetDeviceFamilyInfoEnum (NTDLL.@) + * + * NOTES + * Introduced in Windows 10 (NT10.0) + */ +VOID WINAPI RtlGetDeviceFamilyInfoEnum(ULONGLONG *uap_info, DWORD *device_family, DWORD *device_form) +{ + ULONGLONG uap_info_temp; + + if (device_form != NULL) + *device_form = DEVICEFAMILYDEVICEFORM_DESKTOP; + if (device_family != NULL) + *device_family = DEVICEFAMILYINFOENUM_DESKTOP; + if (uap_info == NULL) + return; + + /** + UAP info is 64 bit unsigned integer which contains four 16-bit chunks: + 1. os version major + 2. os version minor + 3. current build number + 4. UBR + */ + uap_info_temp = 0; + uap_info_temp |= (((ULONGLONG) current_version->dwMajorVersion & 0xffff) << 48); /* os version major */ + uap_info_temp |= (((ULONGLONG) current_version->dwMinorVersion & 0xffff) << 32); /* os version minor */ + uap_info_temp |= (((ULONGLONG) current_version->dwBuildNumber & 0xffff) << 16); /* current build number */ + /* UBR not available */ + *uap_info = uap_info_temp; +} + +/********************************************************************* + * RtlConvertDeviceFamilyInfoToString (NTDLL.@) + * + * NOTES + * Introduced in Windows 10 (NT10.0) + */ +VOID WINAPI RtlConvertDeviceFamilyInfoToString( + DWORD *device_family_bufsize, + DWORD *device_form_bufsize, + const LPWSTR device_family, + const LPWSTR device_form +) { + if (device_family_bufsize != NULL) + *device_family_bufsize = (DWORD)wcslen(DEVICEFAMILYDEVICEFORM_DESKTOP_STR) + 1; + if (device_family != NULL) + wcscpy(device_family, DEVICEFAMILYDEVICEFORM_DESKTOP_STR); + if (device_form_bufsize != NULL) + *device_form_bufsize = (DWORD)wcslen(DEVICEFAMILYINFOENUM_DESKTOP_STR) + 1; + if (device_form != NULL) + wcscpy(device_form, DEVICEFAMILYINFOENUM_DESKTOP_STR); +} /****************************************************************************** * VerSetConditionMask (NTDLL.@) diff --git a/include/winnt.h b/include/winnt.h index 87c4b4da92d..b07df911c69 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6224,6 +6224,16 @@ typedef struct _SYSTEM_CPU_SET_INFORMATION } DUMMYUNIONNAME; } SYSTEM_CPU_SET_INFORMATION, *PSYSTEM_CPU_SET_INFORMATION; +/* Windows 10 Rtl apis */ + +#define DEVICEFAMILYDEVICEFORM_DESKTOP 0x00000003 +#define DEVICEFAMILYINFOENUM_DESKTOP 0x00000003 +#define DEVICEFAMILYDEVICEFORM_DESKTOP_STR L"Desktop" +#define DEVICEFAMILYINFOENUM_DESKTOP_STR L"Windows.Desktop" + +NTSYSAPI VOID WINAPI RtlGetDeviceFamilyInfoEnum(ULONGLONG*, DWORD*, DWORD*); +NTSYSAPI VOID WINAPI RtlConvertDeviceFamilyInfoToString(DWORD*, DWORD*, const LPWSTR, const LPWSTR); + /* Threadpool things */ typedef DWORD TP_VERSION,*PTP_VERSION; -- 2.36.1

2 2

[PATCH 0/6] MR298: Improve support for types out of PDB files
by eric pouech (＠epo) 22 Jun '22

22 Jun '22

Current dbghelp support for reading C/C++ types out of PDB files suffer from some defaults: - several records for the same type (ie struct/class/union/enum with same name) can be present in a PDB file. This can happen when recompiling a compilation unit after modifying the definition of such type (eg adding a field a struct). The PDB file seems to be incrementally modified, and ends up with the old and new definition of such type inside the PDB file. - this of course can lead to erroneous information out of dbghelp. When looking for a type by name, dbghelp must return the new definition. - such errors have been experienced in two situations: + some type definition are stored in two different records in PDB file. A simple example is 'struct list { struct list* next; };' where the circular reference is broken by first generating a forward record for struct list, followed by the full definition of struct list (using the forward record as the type for the 'next' field. Resolution from forward record to find implementation record is done by name lookup. + finding a type by its name (SymGetTypeFromName) - PDB uses the order of elements in its hash table to pick up the "newest" one. - the incremental linker can also modify the hash table order (but I didn't find out yet what triggers it), using specific entries (ie like patching the hash table order). This series: - improve winedump to dump information stored in stream of types' hash - cleans up some type handling related code - modifies type loader out of PDB files to handle correctly the defaults listed above. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/298

2 6

[PATCH] wined3d: Restore the vkd3d-shader version TRACE.
by Henri Verbeet 22 Jun '22

22 Jun '22

This was lost in commit 24432a24d5e922cbd824b0af8f7b0c66ff2b66e8, but is useful, particularly when using external vkd3d-shader. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/shader_spirv.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/shader_spirv.c b/dlls/wined3d/shader_spirv.c index cf07b81711e..14665dee0f2 100644 --- a/dlls/wined3d/shader_spirv.c +++ b/dlls/wined3d/shader_spirv.c @@ -1089,6 +1089,8 @@ static const struct wined3d_shader_backend_ops spirv_shader_backend_vk = const struct wined3d_shader_backend_ops *wined3d_spirv_shader_backend_init_vk(void) { + TRACE("Using %s.\n", vkd3d_shader_get_version(NULL, NULL)); + return &spirv_shader_backend_vk; } -- 2.30.2

1 0

[PATCH vkd3d 4/4] Release 1.4.
by Henri Verbeet 22 Jun '22

22 Jun '22

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- ANNOUNCE | 170 +++++++++------------------- AUTHORS | 2 + Makefile.am | 6 +- configure.ac | 2 +- demos/demo_xcb.h | 2 +- include/vkd3d.h | 1 + include/vkd3d_shader.h | 1 + libs/vkd3d-shader/spirv.c | 2 +- libs/vkd3d-utils/vkd3d_utils_main.c | 4 +- libs/vkd3d/state.c | 4 +- programs/vkd3d-compiler/main.c | 2 +- 11 files changed, 70 insertions(+), 126 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 163e24d9..8a80ea4e 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,16 +1,17 @@ -The Wine team is proud to announce that release 1.3 of vkd3d, the Direct3D to +The Wine team is proud to announce that release 1.4 of vkd3d, the Direct3D to Vulkan translation library, is now available. This release contains improvements that are listed in the release notes below. The main highlights are: - - Initial HLSL compilation support. - - Shader model 5.1 descriptor array support. - - Support for disassembling Direct3D shaders. + - Many improvements to the HLSL compiler. + - A new descriptor heap implementation using the VK_EXT_descriptor_indexing + extension. + - A new fence implementation using the VK_KHR_timeline_semaphore extension. The source is available from the following location: - https://dl.winehq.org/vkd3d/source/vkd3d-1.3.tar.xz + https://dl.winehq.org/vkd3d/source/vkd3d-1.4.tar.xz The current source can also be pulled directly from the git repository: @@ -21,136 +22,75 @@ for the complete list. ---------------------------------------------------------------- -What's new in vkd3d 1.3 +What's new in vkd3d 1.4 ======================= *** libvkd3d -- Newly implemented Direct3D 12 features: - - Root signature support for unbounded descriptor tables. - - Unordered-access view counters in pixel shaders. These were previously - only supported in compute shaders. - - Output merger logical operations. - - Retrieving CPU/GPU timestamp calibration values. This requires support for - the VK_EXT_calibrated_timestamps extension. - - The `mirror_once' texture addressing mode. This requires support for the - VK_KHR_sampler_mirror_clamp_to_edge extension. +- A new descriptor heap implementation using the VK_EXT_descriptor_indexing + extension. In particular, the new implementation is more efficient when + large descriptor heaps are used by multiple command lists. The new + `virtual_heaps' configuration option can be used to select the original + implementation even when the VK_EXT_descriptor_indexing extension is + available. -- New interfaces: - - The vkd3d_host_time_domain_info structure extends the - vkd3d_instance_create_info structure, and can be used to specify how to - convert between timestamps and tick counts. If left unspecified, a tick - is assumed to take 100 nanoseconds. +- A new fence implementation using the VK_KHR_timeline_semaphore extension. + The new implementation addresses a number of edge cases the original + implementation was unable to, as well as being somewhat more efficient. + +- When the VK_EXT_robustness2 extension is available, it is used to implement + null views. This more accurately matches Direct3D 12 behaviour. For example, + all reads from such a null view return zeroes, while that isn't necessarily + the case for out-of-bounds reads with the original implementation. -- Various bug fixes. +- New interfaces: + - vkd3d_set_log_callback() allows writing log output via a custom callback. + This can be used to integrate vkd3d's log output with other logging + systems. *** libvkd3d-shader -- New features: - - Initial support for HLSL compilation and preprocessing. This is an ongoing - effort; although support for many features is already implemented, support - for many more isn't yet. - - Support for disassembling Direct3D byte-code shaders to Direct3D assembly. - - Support for parsing the legacy Direct3D byte-code format used by Direct3D - shader model 1, 2, and 3 shaders. In the current vkd3d-shader release, - only Direct3D assembly is supported as a target for these; we intend to - support SPIR-V as a target in a future release. - -- New features for the SPIR-V target: - - Support for various aspects of Direct3D shader model 5.1 descriptor - arrays, including unbounded descriptor arrays, UAV counter arrays, dynamic - indexing of descriptor arrays, and non-uniform indexing of descriptor - arrays. With the exception of some special cases, this requires support - for the SPV_EXT_descriptor_indexing extension in the target environment. - - Support for double precision floating-point operations. - - Support for indirect addressing of tessellation control shader inputs. - - Stencil export. I.e., writing stencil values from shaders. This requires - support for the SPV_EXT_shader_stencil_export extension in the target - environment. - - Support for the Direct3D shader model 4+ `precise' modifier. - - Support for Direct3D shader model 4+ global resource memory barriers. - -New interfaces: - - vkd3d_shader_preprocess() provides support for preprocessing shaders. - - The vkd3d_shader_preprocess_info structure extends the - vkd3d_shader_compile_info structure, and can be used to specify - preprocessing parameters like preprocessor macro definitions. - - The vkd3d_shader_hlsl_source_info structure extends the - vkd3d_shader_compile_info structure, and can be used to specify HLSL - compilation parameters like the target profile and entry point. - - The vkd3d_shader_descriptor_offset_info structure extends the - vkd3d_shader_interface_info structure, and can be used to specify offsets - into descriptor arrays referenced by shader interface bindings. This - allows mapping multiple descriptor arrays in a shader to a single binding - point in the target environment, and helps with mapping between the - Direct3D 12 and Vulkan binding models. - - The VKD3D_SHADER_COMPILE_OPTION_API_VERSION compile option can - be used to specify the version of the libvkd3d-shader API the - application is targeting. If left unspecified, - VKD3D_SHADER_API_VERSION_1_2 will be used. - -- Various shader translation fixes, for tessellation shaders in particular. - - -*** vkd3d-compiler - -- New source and target types: - - The `hlsl' source type specifies High Level Shader Language source code. - - The `d3d-asm' target type specifies Direct3D assembly shaders. - - The `d3dbc' format specifies legacy Direct3D byte-code, which is used for - Direct3D shader model 1, 2, and 3 shaders. - - The existing `dxbc-tpf' format can now also be used as a target format. - -- New command line options: - - `-E' can be used to specify the input should only be preprocessed. - - `-e'/`--entry' can be used to specify the entry point for HLSL and/or - SPIR-V shaders. - - `-p'/`--profile' can be used to specify the target profile for HLSL - shaders. - -- When no source type is explicitly specified, vkd3d-compiler will attempt to - determine the source type from the provided input. Note that this is - intended as a convenience for interactive usage only, and the heuristics - used are subject to future change. Non-interactive usage of vkd3d-compiler, - for example in build scripts, should always explicitly specify source and - target types. - -- When no target type is explicitly specified, a default will be chosen based - on the source type. Like the earlier mentioned source type detection, this - is intended for interactive usage only. - -- vkd3d-compiler will default to colour output if it can determine that the - output is a colour-capable teleprinter. - -- New environment variables: - - NO_COLOUR/NO_COLOR can be used to disable default colour output. - See the README for more detailed descriptions and how to use these. +- New features for the HLSL source type: + - Support for integer arithmetic, bitwise and shift operations. + - Support for matrix and vector subscripting. + - Support for the mul() intrinsic function. + - Support for matrix copying, casting, and entry-wise operations. + - Support for complex initialisers. + - Support for the `nointerpolation' modifier. This modifier is applied by + default to integer variables. + - Support for the SV_VertexID semantic. + - Support for matrix-typed varyings. + - Constant folding for a number of operators. + - Copy propagation across branches and loops. This allows use of non-numeric + variables anywhere in a program, as well as more optimised code for + accessing numeric variables within branches and loops. + +- The disassembler supports the shader model 5 `msad' instruction. + +- New interfaces: + - vkd3d_shader_set_log_callback() allows writing log output via a custom + callback. *** libvkd3d-utils - New interfaces: - - D3DCreateBlob() provides support for creating ID3DBlob objects. - - D3DPreprocess() provides support for preprocessing HLSL source code. - - D3DCompile() and D3DCompile2() provide support for compiling HLSL source - code. + - vkd3d_utils_set_log_callback() allows writing log output via a custom + callback. *** build -- The `gears' and `triangle' demo applications are installed as `vkd3d-gears' - and `vkd3d-triangle'. These were originally intended more as documentation - than as end-user executables, but there's some value in using them for - diagnostic purposes, much like e.g. `glxgears'. - -- The VULKAN_LIBS configure variable is used when detecting the Vulkan - library. +- The minimum required version of Vulkan-Headers and SPIRV-Headers for this + release is version 1.2.139. -- Builds for the Microsoft Windows target platform no longer require support - for POSIX threads. Windows synchronisation primitives are used instead. +- The SONAME_LIBVULKAN configure variable can be used to specify the shared + object name of the Vulkan library. Because vkd3d loads the Vulkan library + dynamically, specifying this removes the need for a Vulkan import library at + build time. -- If ncurses is available, it will be use by vkd3d-compiler to determine the - capabilities of the connected teleprinter, if any. +- The `crosstests' target no longer builds Win32/PE demos or tests when these + were not enabled at configure time. diff --git a/AUTHORS b/AUTHORS index bc2e08f6..18a8b207 100644 --- a/AUTHORS +++ b/AUTHORS @@ -5,8 +5,10 @@ Atharva Nimbalkar Biswapriyo Nath Chip Davis Conor McCarthy +David Gow Derek Lesho Francisco Casas +Francois Gouget Giovanni Mascellani Hans-Kristian Arntzen Henri Verbeet diff --git a/Makefile.am b/Makefile.am index fe8133a5..ad6a0a41 100644 --- a/Makefile.am +++ b/Makefile.am @@ -237,7 +237,7 @@ libvkd3d_shader_la_SOURCES = \ libs/vkd3d-shader/vkd3d_shader_main.c \ libs/vkd3d-shader/vkd3d_shader_private.h libvkd3d_shader_la_CFLAGS = $(AM_CFLAGS) -DLIBVKD3D_SHADER_SOURCE -I$(srcdir)/libs/vkd3d-shader @SPIRV_TOOLS_CFLAGS@ -libvkd3d_shader_la_LDFLAGS = $(AM_LDFLAGS) -version-info 2:0:1 +libvkd3d_shader_la_LDFLAGS = $(AM_LDFLAGS) -version-info 3:0:2 libvkd3d_shader_la_LIBADD = libvkd3d-common.la @SPIRV_TOOLS_LIBS@ -lm if HAVE_LD_VERSION_SCRIPT libvkd3d_shader_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libs/vkd3d-shader/vkd3d_shader.map @@ -271,7 +271,7 @@ libvkd3d_la_SOURCES = \ libs/vkd3d/vkd3d_shaders.h \ libs/vkd3d/vulkan_procs.h libvkd3d_la_CFLAGS = $(AM_CFLAGS) -DLIBVKD3D_SOURCE -libvkd3d_la_LDFLAGS = $(AM_LDFLAGS) -version-info 4:0:3 +libvkd3d_la_LDFLAGS = $(AM_LDFLAGS) -version-info 5:0:4 libvkd3d_la_LIBADD = libvkd3d-common.la libvkd3d-shader.la @DL_LIBS@ @PTHREAD_LIBS@ if HAVE_LD_VERSION_SCRIPT libvkd3d_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libs/vkd3d/vkd3d.map @@ -283,7 +283,7 @@ libvkd3d_utils_la_SOURCES = \ libs/vkd3d-utils/vkd3d_utils_main.c \ libs/vkd3d-utils/vkd3d_utils_private.h libvkd3d_utils_la_CFLAGS = $(AM_CFLAGS) -DLIBVKD3D_UTILS_SOURCE -libvkd3d_utils_la_LDFLAGS = $(AM_LDFLAGS) -version-info 3:0:2 +libvkd3d_utils_la_LDFLAGS = $(AM_LDFLAGS) -version-info 4:0:3 libvkd3d_utils_la_LIBADD = libvkd3d-common.la libvkd3d-shader.la libvkd3d.la @PTHREAD_LIBS@ if HAVE_LD_VERSION_SCRIPT libvkd3d_utils_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libs/vkd3d-utils/vkd3d_utils.map diff --git a/configure.ac b/configure.ac index 7796ae8d..423b3e76 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.69]) -AC_INIT([vkd3d],[1.3]) +AC_INIT([vkd3d],[1.4]) AC_CONFIG_AUX_DIR([bin]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/demos/demo_xcb.h b/demos/demo_xcb.h index bb43d8a4..e4d6145c 100644 --- a/demos/demo_xcb.h +++ b/demos/demo_xcb.h @@ -19,7 +19,7 @@ #define VK_NO_PROTOTYPES #define VK_USE_PLATFORM_XCB_KHR -#define VKD3D_UTILS_API_VERSION VKD3D_API_VERSION_1_3 +#define VKD3D_UTILS_API_VERSION VKD3D_API_VERSION_1_4 #include "config.h" #include <vkd3d.h> #include <vkd3d_utils.h> diff --git a/include/vkd3d.h b/include/vkd3d.h index f3c3fdc6..8aeb4c18 100644 --- a/include/vkd3d.h +++ b/include/vkd3d.h @@ -60,6 +60,7 @@ enum vkd3d_api_version VKD3D_API_VERSION_1_1, VKD3D_API_VERSION_1_2, VKD3D_API_VERSION_1_3, + VKD3D_API_VERSION_1_4, }; typedef HRESULT (*PFN_vkd3d_signal_event)(HANDLE event); diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 1e5a332e..ebddbba7 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -45,6 +45,7 @@ enum vkd3d_shader_api_version VKD3D_SHADER_API_VERSION_1_1, VKD3D_SHADER_API_VERSION_1_2, VKD3D_SHADER_API_VERSION_1_3, + VKD3D_SHADER_API_VERSION_1_4, }; /** The type of a chained structure. */ diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index d361b8a6..776533cb 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -206,7 +206,7 @@ static enum vkd3d_shader_input_sysval_semantic vkd3d_siv_from_sysval(enum vkd3d_ #define VKD3D_SPIRV_VERSION 0x00010000 #define VKD3D_SPIRV_GENERATOR_ID 18 -#define VKD3D_SPIRV_GENERATOR_VERSION 3 +#define VKD3D_SPIRV_GENERATOR_VERSION 4 #define VKD3D_SPIRV_GENERATOR_MAGIC vkd3d_make_u32(VKD3D_SPIRV_GENERATOR_VERSION, VKD3D_SPIRV_GENERATOR_ID) struct vkd3d_spirv_stream diff --git a/libs/vkd3d-utils/vkd3d_utils_main.c b/libs/vkd3d-utils/vkd3d_utils_main.c index 64418893..f5e1e0e7 100644 --- a/libs/vkd3d-utils/vkd3d_utils_main.c +++ b/libs/vkd3d-utils/vkd3d_utils_main.c @@ -210,7 +210,7 @@ HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filen option = &options[0]; option->name = VKD3D_SHADER_COMPILE_OPTION_API_VERSION; - option->value = VKD3D_SHADER_API_VERSION_1_3; + option->value = VKD3D_SHADER_API_VERSION_1_4; compile_info.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO; compile_info.next = &preprocess_info; @@ -315,7 +315,7 @@ HRESULT WINAPI D3DPreprocess(const void *data, SIZE_T size, const char *filename static const struct vkd3d_shader_compile_option options[] = { - {VKD3D_SHADER_COMPILE_OPTION_API_VERSION, VKD3D_SHADER_API_VERSION_1_3}, + {VKD3D_SHADER_COMPILE_OPTION_API_VERSION, VKD3D_SHADER_API_VERSION_1_4}, }; TRACE("data %p, size %lu, filename %s, macros %p, include %p, preprocessed_blob %p, messages_blob %p.\n", diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 97e2856d..7a29ade8 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1957,7 +1957,7 @@ static HRESULT create_shader_stage(struct d3d12_device *device, static const struct vkd3d_shader_compile_option options[] = { - {VKD3D_SHADER_COMPILE_OPTION_API_VERSION, VKD3D_SHADER_API_VERSION_1_3}, + {VKD3D_SHADER_COMPILE_OPTION_API_VERSION, VKD3D_SHADER_API_VERSION_1_4}, }; stage_desc->sType = VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO; @@ -2008,7 +2008,7 @@ static int vkd3d_scan_dxbc(const D3D12_SHADER_BYTECODE *code, static const struct vkd3d_shader_compile_option options[] = { - {VKD3D_SHADER_COMPILE_OPTION_API_VERSION, VKD3D_SHADER_API_VERSION_1_3}, + {VKD3D_SHADER_COMPILE_OPTION_API_VERSION, VKD3D_SHADER_API_VERSION_1_4}, }; compile_info.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO; diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 9cb90cd5..2347bee0 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -726,7 +726,7 @@ int main(int argc, char **argv) if (!options.explicit_colour && !getenv("NO_COLOUR") && !getenv("NO_COLOR") && has_colour(output)) options.formatting |= VKD3D_SHADER_COMPILE_OPTION_FORMATTING_COLOUR; add_compile_option(&options, VKD3D_SHADER_COMPILE_OPTION_FORMATTING, options.formatting); - add_compile_option(&options, VKD3D_SHADER_COMPILE_OPTION_API_VERSION, VKD3D_SHADER_API_VERSION_1_3); + add_compile_option(&options, VKD3D_SHADER_COMPILE_OPTION_API_VERSION, VKD3D_SHADER_API_VERSION_1_4); info.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO; info.next = &hlsl_source_info; -- 2.20.1

2 1

[PATCH vkd3d 1/4] vkd3d-compiler: Default to VKD3D_SHADER_SOURCE_HLSL when the source size is smaller than a uint32_t.
by Henri Verbeet 22 Jun '22

22 Jun '22

For example, when the input is an empty file. Leaving the source type as VKD3D_SHADER_SOURCE_NONE would cause (potential) subsequent get_source_type_info() calls to return NULL, resulting in a segmentation fault. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- programs/vkd3d-compiler/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index ab475617..9cb90cd5 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -663,11 +663,11 @@ int main(int argc, char **argv) { uint32_t token; - if (options.preprocess_only) + if (options.preprocess_only || info.source.size < sizeof(token)) { options.source_type = VKD3D_SHADER_SOURCE_HLSL; } - else if (info.source.size >= sizeof(token)) + else { memcpy(&token, info.source.code, sizeof(token)); if (token == TAG_DXBC) -- 2.20.1

2 1

[PATCH vkd3d 3/4] build: Add tests/vulkan_procs.h to the distribution.
by Henri Verbeet 22 Jun '22

22 Jun '22

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 0f10a56f..fe8133a5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -144,7 +144,8 @@ vkd3d_test_headers = \ tests/d3d12_crosstest.h \ tests/d3d12_test_utils.h \ tests/shader_runner.h \ - tests/utils.h + tests/utils.h \ + tests/vulkan_procs.h vkd3d_demos = \ demos/vkd3d-gears \ -- 2.20.1

1 0

[PATCH vkd3d 2/4] build: Add the d3d9 and d3d11 shader runners to the distribution.
by Henri Verbeet 22 Jun '22

22 Jun '22

We don't want to add these to tests_shader_runner_SOURCES, because they're only supposed to get built for the "crosstest" target. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile.am b/Makefile.am index bdbf8e40..0f10a56f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -404,6 +404,7 @@ cross_implibs = crosslibs/d3d12 CROSS_CPPFLAGS = -I$(srcdir)/include -I$(srcdir)/include/private -I$(builddir)/include CROSS_CFLAGS = -g -O2 -Wall -municode ${CROSS_CPPFLAGS} -D__USE_MINGW_ANSI_STDIO=0 EXTRA_DIST += $(cross_implibs:=.cross32.def) $(cross_implibs:=.cross64.def) +EXTRA_DIST += tests/shader_runner_d3d11.c tests/shader_runner_d3d9.c shader_runner_cross_sources = \ $(srcdir)/tests/shader_runner.c \ -- 2.20.1

1 0

[PATCH v2 0/2] MR132: opengl32: Don't prioritize low bit depth formats with non-matching stencil.
by Paul Gofman (＠gofman) 22 Jun '22

22 Jun '22

Fixes ClaDun X2 missing rendering parts on AMD. The GL game uses stencil and requests pixel format with depth 16, stencil 8. On Wine / AMD that ends up with 16x0 format as there is no 16x8 advertised (16x0 only) and depth takes absolute priority. On the same Windows machine I see both 16x0 and 16x8 formats, but when 16x8 is requested 24x8 is returned (and 16x0 if 16x0 is requested). That currently works under Wine / Nvidia because there is no 16 bit depth formats advertised at all and it ends up with 24x8 without this patch. -- v2: opengl32/tests: Add more tests for ChoosePixelFormat(). opengl32: Prioritize stencil check over depth check in wglChoosePixelFormat(). https://gitlab.winehq.org/wine/wine/-/merge_requests/132

3 5

[PATCH 1/5] d2d1/tests: Add tests for system property name, type, value size.
by Ziqing Hui 22 Jun '22

22 Jun '22

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- PS: I'll submit v2 version of the patch set I sent yesterday after this patch set is approved. dlls/d2d1/tests/d2d1.c | 77 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 74 insertions(+), 3 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index f1cec1d7a0b..68d2716a118 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -10310,19 +10310,21 @@ static void test_mt_factory(BOOL d3d11) ID2D1Factory_Release(factory); } -static void test_effect(BOOL d3d11) +static void test_builtin_effect(BOOL d3d11) { - unsigned int i, j, min_inputs, max_inputs, str_size, input_count; + unsigned int i, j, min_inputs, max_inputs, str_size, input_count, value_size; D2D1_BITMAP_PROPERTIES bitmap_desc; D2D1_BUFFER_PRECISION precision; ID2D1Image *image_a, *image_b; struct d2d1_test_context ctx; ID2D1DeviceContext *context; + D2D1_PROPERTY_TYPE type; ID2D1Factory1 *factory; ID2D1Bitmap *bitmap; ID2D1Effect *effect; D2D1_SIZE_U size; BYTE buffer[256]; + WCHAR name[32]; BOOL cached; CLSID clsid; HRESULT hr; @@ -10345,6 +10347,27 @@ static void test_effect(BOOL d3d11) {&CLSID_D2D1Grayscale, 3, 1, 1, 1}, }; + const struct property_test + { + UINT32 index; + const WCHAR *name; + D2D1_PROPERTY_TYPE type; + UINT32 value_size; + } + property_tests[] = + { + {D2D1_PROPERTY_CLSID, L"CLSID", D2D1_PROPERTY_TYPE_CLSID, sizeof(CLSID)}, + {D2D1_PROPERTY_DISPLAYNAME, L"DisplayName", D2D1_PROPERTY_TYPE_STRING, 0}, + {D2D1_PROPERTY_AUTHOR, L"Author", D2D1_PROPERTY_TYPE_STRING, 0}, + {D2D1_PROPERTY_CATEGORY, L"Category", D2D1_PROPERTY_TYPE_STRING, 0}, + {D2D1_PROPERTY_DESCRIPTION, L"Description", D2D1_PROPERTY_TYPE_STRING, 0}, + {D2D1_PROPERTY_INPUTS, L"Inputs", D2D1_PROPERTY_TYPE_ARRAY, sizeof(UINT32)}, + {D2D1_PROPERTY_CACHED, L"Cached", D2D1_PROPERTY_TYPE_BOOL, sizeof(UINT32)}, + {D2D1_PROPERTY_PRECISION, L"Precision", D2D1_PROPERTY_TYPE_ENUM, sizeof(UINT32)}, + {D2D1_PROPERTY_MIN_INPUTS, L"MinInputs", D2D1_PROPERTY_TYPE_UINT32, sizeof(UINT32)}, + {D2D1_PROPERTY_MAX_INPUTS, L"MaxInputs", D2D1_PROPERTY_TYPE_UINT32, sizeof(UINT32)}, + }; + if (!init_test_context(&ctx, d3d11)) return; @@ -10372,6 +10395,7 @@ static void test_effect(BOOL d3d11) hr = ID2D1DeviceContext_CreateEffect(context, test->clsid, &effect); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + /* Test output image pointer */ hr = ID2D1Effect_QueryInterface(effect, &IID_ID2D1Image, (void **)&image_a); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID2D1Effect_GetOutput(effect, &image_b); @@ -10379,6 +10403,48 @@ static void test_effect(BOOL d3d11) ID2D1Image_Release(image_b); ID2D1Image_Release(image_a); + /* Test system property name, type, value size */ + for (j = 0; j < ARRAY_SIZE(property_tests); ++j) + { + const struct property_test *property_test = &property_tests[j]; + winetest_push_context("Property %u", j); + + name[0] = 0; + hr = ID2D1Effect_GetPropertyName(effect, 0xdeadbeef, name, sizeof(name)); + todo_wine ok(hr == D2DERR_INVALID_PROPERTY, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1Effect_GetPropertyName(effect, property_test->index, name, sizeof(name)); + todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + todo_wine ok(!wcscmp(name, property_test->name), "Got unexpected property name %s, expected %s.\n", + debugstr_w(name), debugstr_w(property_test->name)); + + type = ID2D1Effect_GetType(effect, 0xdeadbeef); + ok(type == D2D1_PROPERTY_TYPE_UNKNOWN, "Got unexpected property type %#x.\n", type); + type = ID2D1Effect_GetType(effect, property_test->index); + todo_wine ok(type == property_test->type, "Got unexpected property type %#x, expected %#x.\n", + type, property_test->type); + + value_size = ID2D1Effect_GetValueSize(effect, 0xdeadbeef); + ok(value_size == 0, "Got unexpected value size %u.\n", value_size); + value_size = ID2D1Effect_GetValueSize(effect, property_test->index); + if (property_test->value_size != 0) + { + todo_wine ok(value_size == property_test->value_size, "Got unexpected value size %u, expected %u.\n", + value_size, property_test->value_size); + } + else if (property_test->type == D2D1_PROPERTY_TYPE_STRING) + { + hr = ID2D1Effect_GetValue(effect, property_test->index, + D2D1_PROPERTY_TYPE_STRING, buffer, sizeof(buffer)); + todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + str_size = (wcslen((WCHAR *)buffer) + 1) * sizeof(WCHAR); + todo_wine ok(value_size == str_size, "Got unexpected value size %u, expected %u.\n", + value_size, str_size); + } + + winetest_pop_context(); + } + + /* Test GetValue() */ hr = ID2D1Effect_GetValue(effect, 0xdeadbeef, D2D1_PROPERTY_TYPE_CLSID, (BYTE *)&clsid, sizeof(clsid)); ok(hr == D2DERR_INVALID_PROPERTY, "Got unexpected hr %#lx.\n", hr); @@ -10436,10 +10502,12 @@ static void test_effect(BOOL d3d11) ok(max_inputs == test->max_inputs, "Got unexpected max inputs %u, expected %u.\n", max_inputs, test->max_inputs); + /* Test default input count */ input_count = ID2D1Effect_GetInputCount(effect); ok(input_count == test->default_input_count, "Got unexpected input count %u, expected %u.\n", input_count, test->default_input_count); + /* Test SetInputCount() */ input_count = (test->max_inputs < 16 ? test->max_inputs : 16); for (j = 0; j < input_count + 4; ++j) { @@ -10452,6 +10520,7 @@ static void test_effect(BOOL d3d11) winetest_pop_context(); } + /* Test GetInput() before any input is set */ input_count = ID2D1Effect_GetInputCount(effect); for (j = 0; j < input_count + 4; ++j) { @@ -10461,6 +10530,7 @@ static void test_effect(BOOL d3d11) winetest_pop_context(); } + /* Test GetInput() after an input is set */ set_size_u(&size, 1, 1); bitmap_desc.pixelFormat.format = DXGI_FORMAT_B8G8R8A8_UNORM; bitmap_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_IGNORE; @@ -10487,6 +10557,7 @@ static void test_effect(BOOL d3d11) winetest_pop_context(); } + /* Test setting inputs with out-of-bounds index */ for (j = input_count; j < input_count + 4; ++j) { winetest_push_context("Input %u", j); @@ -12304,7 +12375,7 @@ START_TEST(d2d1) queue_test(test_effect_register); queue_test(test_effect_context); queue_test(test_effect_properties); - queue_test(test_effect); + queue_test(test_builtin_effect); queue_test(test_effect_2d_affine); queue_test(test_effect_crop); queue_test(test_effect_grayscale); -- 2.25.1

2 6

[PATCH 1/3] d2d1: Support registering builtin effect.
by Ziqing Hui 22 Jun '22

22 Jun '22

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/d2d1/d2d1_private.h | 44 +++++++++++++++++++++++-- dlls/d2d1/effect.c | 69 ++++++++++++++++++++++++++++++---------- dlls/d2d1/factory.c | 44 ++----------------------- 3 files changed, 96 insertions(+), 61 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 9be553c72d8..75a9c4f9366 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -20,6 +20,7 @@ #define __WINE_D2D1_PRIVATE_H #include "wine/debug.h" +#include "wine/list.h" #include <assert.h> #include <limits.h> @@ -61,6 +62,22 @@ struct d2d_settings }; extern struct d2d_settings d2d_settings DECLSPEC_HIDDEN; +struct d2d_factory +{ + ID2D1Factory3 ID2D1Factory3_iface; + ID2D1Multithread ID2D1Multithread_iface; + LONG refcount; + + ID3D10Device1 *device; + + float dpi_x; + float dpi_y; + + struct list effects; + + CRITICAL_SECTION cs; +}; + struct d2d_clip_stack { D2D1_RECT_F *stack; @@ -602,12 +619,30 @@ struct d2d_effect_context void d2d_effect_context_init(struct d2d_effect_context *effect_context, struct d2d_device_context *device_context) DECLSPEC_HIDDEN; -struct d2d_effect_info +struct d2d_effect_property { - const CLSID *clsid; + WCHAR *name; + D2D1_PROPERTY_TYPE type; + BYTE *value; + PD2D1_PROPERTY_SET_FUNCTION set_function; + PD2D1_PROPERTY_GET_FUNCTION get_function; +}; + +struct d2d_effect_registration +{ + struct list entry; + BOOL is_builtin; + PD2D1_EFFECT_FACTORY factory; + UINT32 registration_count; + CLSID id; + UINT32 default_input_count; UINT32 min_inputs; UINT32 max_inputs; + + struct d2d_effect_property *properties; + size_t property_size; + size_t property_count; }; struct d2d_effect @@ -616,7 +651,9 @@ struct d2d_effect ID2D1Image ID2D1Image_iface; LONG refcount; - const struct d2d_effect_info *info; + CLSID id; + UINT32 min_inputs; + UINT32 max_inputs; struct d2d_effect_context *effect_context; ID2D1Image **inputs; @@ -626,6 +663,7 @@ struct d2d_effect HRESULT d2d_effect_init(struct d2d_effect *effect, struct d2d_effect_context *effect_context, const CLSID *effect_id) DECLSPEC_HIDDEN; +HRESULT d2d_register_builtin_effects(struct d2d_factory *factory) DECLSPEC_HIDDEN; static inline BOOL d2d_array_reserve(void **elements, size_t *capacity, size_t count, size_t size) { diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index f5d5494c67a..a87fedd0742 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -20,14 +20,23 @@ WINE_DEFAULT_DEBUG_CHANNEL(d2d); -static const struct d2d_effect_info builtin_effects[] = +struct d2d_builtin_effect_registration { - {&CLSID_D2D12DAffineTransform, 1, 1, 1}, - {&CLSID_D2D13DPerspectiveTransform, 1, 1, 1}, - {&CLSID_D2D1Composite, 2, 1, 0xffffffff}, - {&CLSID_D2D1Crop, 1, 1, 1}, - {&CLSID_D2D1Shadow, 1, 1, 1}, - {&CLSID_D2D1Grayscale, 1, 1, 1}, + const CLSID *id; + PD2D1_EFFECT_FACTORY factory; + UINT32 default_input_count; + UINT32 min_inputs; + UINT32 max_inputs; +}; + +static const struct d2d_builtin_effect_registration builtin_effects[] = +{ + {&CLSID_D2D12DAffineTransform, NULL, 1, 1, 1}, + {&CLSID_D2D13DPerspectiveTransform, NULL, 1, 1, 1}, + {&CLSID_D2D1Composite, NULL, 2, 1, 0xffffffff}, + {&CLSID_D2D1Crop, NULL, 1, 1, 1}, + {&CLSID_D2D1Shadow, NULL, 1, 1, 1}, + {&CLSID_D2D1Grayscale, NULL, 1, 1, 1}, }; static inline struct d2d_effect_context *impl_from_ID2D1EffectContext(ID2D1EffectContext *iface) @@ -554,21 +563,21 @@ static HRESULT STDMETHODCALLTYPE d2d_effect_GetValue(ID2D1Effect *iface, UINT32 { case D2D1_PROPERTY_CLSID: if ((type != D2D1_PROPERTY_TYPE_UNKNOWN && type != D2D1_PROPERTY_TYPE_CLSID) - || value_size != sizeof(*effect->info->clsid)) + || value_size != sizeof(effect->id)) return E_INVALIDARG; - src = effect->info->clsid; + src = &effect->id; break; case D2D1_PROPERTY_MIN_INPUTS: if ((type != D2D1_PROPERTY_TYPE_UNKNOWN && type != D2D1_PROPERTY_TYPE_UINT32) - || value_size != sizeof(effect->info->min_inputs)) + || value_size != sizeof(effect->min_inputs)) return E_INVALIDARG; - src = &effect->info->min_inputs; + src = &effect->min_inputs; break; case D2D1_PROPERTY_MAX_INPUTS: if ((type != D2D1_PROPERTY_TYPE_UNKNOWN && type != D2D1_PROPERTY_TYPE_UINT32) - || value_size != sizeof(effect->info->max_inputs)) + || value_size != sizeof(effect->max_inputs)) return E_INVALIDARG; - src = &effect->info->max_inputs; + src = &effect->max_inputs; break; default: if (index < D2D1_PROPERTY_CLSID) @@ -619,7 +628,7 @@ static HRESULT STDMETHODCALLTYPE d2d_effect_SetInputCount(ID2D1Effect *iface, UI TRACE("iface %p, count %u.\n", iface, count); - if (count < effect->info->min_inputs || count > effect->info->max_inputs) + if (count < effect->min_inputs || count > effect->max_inputs) return E_INVALIDARG; if (count == effect->input_count) return S_OK; @@ -760,10 +769,11 @@ HRESULT d2d_effect_init(struct d2d_effect *effect, struct d2d_effect_context *ef for (i = 0; i < ARRAY_SIZE(builtin_effects); ++i) { - if (IsEqualGUID(effect_id, builtin_effects[i].clsid)) + if (IsEqualGUID(effect_id, &builtin_effects[i].id)) { - effect->info = &builtin_effects[i]; - d2d_effect_SetInputCount(&effect->ID2D1Effect_iface, effect->info->default_input_count); + effect->min_inputs = builtin_effects[i].min_inputs; + effect->max_inputs = builtin_effects[i].max_inputs; + d2d_effect_SetInputCount(&effect->ID2D1Effect_iface, builtin_effects[i].default_input_count); effect->effect_context = effect_context; ID2D1EffectContext_AddRef(&effect_context->ID2D1EffectContext_iface); return S_OK; @@ -773,3 +783,28 @@ HRESULT d2d_effect_init(struct d2d_effect *effect, struct d2d_effect_context *ef WARN("Unsupported effect clsid %s.\n", debugstr_guid(effect_id)); return E_FAIL; } + +HRESULT d2d_register_builtin_effects(struct d2d_factory *factory) +{ + struct d2d_effect_registration *reg; + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(builtin_effects); ++i) + { + const struct d2d_builtin_effect_registration *builtin_reg = &builtin_effects[i]; + + if (!(reg = calloc(1, sizeof(*reg)))) + return E_OUTOFMEMORY; + + reg->is_builtin = TRUE; + reg->factory = builtin_reg->factory; + reg->registration_count = 1; + reg->id = *builtin_reg->id; + reg->default_input_count = builtin_reg->default_input_count; + reg->min_inputs = builtin_reg->min_inputs; + reg->max_inputs = builtin_reg->max_inputs; + list_add_tail(&factory->effects, &reg->entry); + } + + return S_OK; +} diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index 5c79d1791ff..7eec52c01a1 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -20,7 +20,6 @@ #include "d2d1_private.h" #include "xmllite.h" -#include "wine/list.h" WINE_DECLARE_DEBUG_CHANNEL(winediag); WINE_DEFAULT_DEBUG_CHANNEL(d2d); @@ -30,29 +29,6 @@ struct d2d_settings d2d_settings = ~0u, /* No ID2D1Factory version limit by default. */ }; -struct d2d_effect_property -{ - WCHAR *name; - D2D1_PROPERTY_TYPE type; - BYTE *value; - PD2D1_PROPERTY_SET_FUNCTION set_function; - PD2D1_PROPERTY_GET_FUNCTION get_function; -}; - -struct d2d_effect_registration -{ - struct list entry; - PD2D1_EFFECT_FACTORY factory; - UINT32 registration_count; - CLSID id; - - UINT32 input_count; - - struct d2d_effect_property *properties; - size_t property_size; - size_t property_count; -}; - static void d2d_effect_registration_cleanup(struct d2d_effect_registration *reg) { size_t i; @@ -66,22 +42,6 @@ static void d2d_effect_registration_cleanup(struct d2d_effect_registration *reg) free(reg); } -struct d2d_factory -{ - ID2D1Factory3 ID2D1Factory3_iface; - ID2D1Multithread ID2D1Multithread_iface; - LONG refcount; - - ID3D10Device1 *device; - - float dpi_x; - float dpi_y; - - struct list effects; - - CRITICAL_SECTION cs; -}; - static inline struct d2d_factory *impl_from_ID2D1Factory3(ID2D1Factory3 *iface) { return CONTAINING_RECORD(iface, struct d2d_factory, ID2D1Factory3_iface); @@ -916,6 +876,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_RegisterEffectFromStream(ID2D1Facto property->set_function = bindings[i].setFunction; } + effect->is_builtin = FALSE; effect->registration_count = 1; effect->id = *effect_id; effect->factory = effect_factory; @@ -960,7 +921,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_UnregisterEffect(ID2D1Factory3 *ifa LIST_FOR_EACH_ENTRY(effect, &factory->effects, struct d2d_effect_registration, entry) { - if (IsEqualGUID(effect_id, &effect->id)) + if (!effect->is_builtin && IsEqualGUID(effect_id, &effect->id)) { if (!--effect->registration_count) { @@ -1126,6 +1087,7 @@ static void d2d_factory_init(struct d2d_factory *factory, D2D1_FACTORY_TYPE fact factory->refcount = 1; d2d_factory_reload_sysmetrics(factory); list_init(&factory->effects); + d2d_register_builtin_effects(factory); InitializeCriticalSection(&factory->cs); } -- 2.25.1

3 12

[PATCH v2 0/4] MR47: kernel32/tests: Add tests for CancelSynchronousIo.
by Daniel Lehman (＠dlehman25) 22 Jun '22

22 Jun '22

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> -- v2: kernelbase: Call NtCancelSynchronousIoFile in CancelSynchronousIo. ntdll: Partially implement NtCancelSynchronousIoFile. ntdll: Add NtCancelSynchronousIoFile stub. kernel32/tests: Add tests for CancelSynchronousIo. https://gitlab.winehq.org/wine/wine/-/merge_requests/47

3 6

[PATCH 0/5] MR297: uxtheme: Support parsing more listview parts and states.
by Zhiyi Zhang (＠zhiyi) 22 Jun '22

22 Jun '22

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/297

2 5

[PATCH v2 0/1] MR289: d3drm: Implement IDirect3DRMFrame2::SetSceneBackgroundImage
by Alistair Leslie-Hughes (＠alesliehughes) 21 Jun '22

21 Jun '22

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> -- v2: d3drm: Implement IDirect3DRMFrame{1/2/3}::SetSceneBackgroundImage https://gitlab.winehq.org/wine/wine/-/merge_requests/289

5 5

[PATCH v2 0/5] MR266: iphlpapi/tests: Add win98+ API tests
by Jinoh Kang (＠iamahuman) 21 Jun '22

21 Jun '22

Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> -- v2: iphlpapi/tests: Add more tests for interface identifier conversion failure. iphlpapi/tests: Factor out interface identifier conversion with invalid parameters. iphlpapi/tests: Add tests for GetBestInterfaceEx. iphlpapi/tests: Add tests for GetBestRoute. iphlpapi/tests: Add tests for GetBestInterface. https://gitlab.winehq.org/wine/wine/-/merge_requests/266

4 8

Re: [PATCH v2 0/1] MR295: uiautomationcore: Initialize VARIANT in UIAutomation test. - approved
by Alexandre Julliard (＠julliard) 21 Jun '22

21 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/295

1 0

[PATCH v3 0/3] MR286: nsiproxy.sys: Add static ARP entries which are always present on Windows.
by Paul Gofman (＠gofman) 21 Jun '22

21 Jun '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53175 Commit 910d58520a6d75cada82d992757ca013099d9345 (iphlpapi: Return ERROR_NO_DATA from GetIpNetTable() if no entries are found.) introduced a regression in Roon application. It looks like the app doesn't tolerate an error return from GetIpNetTable() if there are active interfaces found. The blamed patch still looks correct to me per se, that is, if number of entries ends up being zero Windows returns ERROR_NO_DATA. However, number of entries is never zero on Windows if there is any network adapter. There are two things why Windows always has some arp entries and we do not: 1. We currently parse /proc/net/arp line on Linux a bit wrong and end up getting no entries from there (patch 1 fixes that); 2. With the patch patch 1 there Roon seems happy (at least as far as I could test it right at start), at least as long we have an entry in /proc/sys/net (which might not be necessarily the case if there is, e. g., no actual network connection). But that breaks SCP: Secret Laboratory again the same way as before 910d58520a6d75cada82d992757ca013099d9345. It turns out the latter game depends on GetIpNetTable() returning at least 4 entries when returning success (for some reason, I am not sure why but I think I saw that quite clearly). And both apps can actually work reliably on Windows as there are always at least 4 static arp entries if there is any network adaptere configured at all. There are "224.0.0.22" and "239.255.255.250" static arp multicast entries which are always there for any interface on Windows, including loopback (starting from Win10; earlier versions might be missing "239.255.255.250" but have "224.0.0.22"). So adding those like on Windows should hopefully fix all those cases. -- v3: iphlpapi: Sort by adapter index first in GetIpNetTable(). iphlpapi: Correctly index dynamic data array. nsiproxy.sys: Strip trailing end of line for iface name on Linux. https://gitlab.winehq.org/wine/wine/-/merge_requests/286

3 4

Re: [PATCH v3 0/6] MR294: win32u: menu and def window proc conversion - approved
by Alexandre Julliard (＠julliard) 21 Jun '22

21 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/294

1 0

Re: [PATCH v3 0/2] MR291: secur32: Implement SECPKG_ATTR_CIPHER_INFO. - approved
by Alexandre Julliard (＠julliard) 21 Jun '22

21 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/291

1 0

Re: [PATCH v3 0/2] MR292: nsiproxy: Small improvements - approved
by Alexandre Julliard (＠julliard) 21 Jun '22

21 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/292

1 0

Re: [PATCH v2 0/1] MR290: iphlpapi/tests: Allow the route's age to differ by one second. - approved
by Alexandre Julliard (＠julliard) 21 Jun '22

21 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/290

1 0

[PATCH v2 0/3] MR288: comctl32/toolbar: Add support for TBCDRF_NOBACKGROUND.
by Zhiyi Zhang (＠zhiyi) 21 Jun '22

21 Jun '22

Tested manually on XP, Win 7 and Win 10. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53049 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> -- v2: comctl32/toolbar: Don't use pattern brushes to draw checked background. comctl32/tests: Test that themed toolbar buttons don't use pattern brushes to draw checked background. comctl32/toolbar: Add support for TBCDRF_NOBACKGROUND. https://gitlab.winehq.org/wine/wine/-/merge_requests/288

3 4

Re: [PATCH v2 0/5] MR287: uxtheme: Support parsing more button parts and states. - approved
by Alexandre Julliard (＠julliard) 21 Jun '22

21 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/287

1 0

Re: [PATCH v3 0/1] MR273: ntdll/tests: Add more tests for \Device\NamedPipe\ root directory. - approved
by Alexandre Julliard (＠julliard) 21 Jun '22

21 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/273

1 0

HLSL compiler change log
by Giovanni Mascellani 21 Jun '22

21 Jun '22

Hi, I tried to put together a quick change log for the HLSL compiler since vkd3d 1.3. I concentrated on user-visible changes (so mostly ignoring tests and internal refactoring), a possible side effect of which is that my contributions are somehow more evident. I don't mean to belittle the work of who did more plumbing job. --- * Support integer arithmetic, bitwise and shift operations. * Fold constant operations for a number of operators. * Support matrix and vector subscripting. * Support matrix copying, casting, entry-wise operations and row-by-column multiplication. * Support complex initializers. * Support the "nointerpolation" modifier, and assume it for integer variables. * Perform copy propagation even when the code has branches and/or loops. --- Francisco, are there relevant cases of complex initializers that are still unsupported in master? Anything else I skipped? Thanks, Giovanni.

2 1

[PATCH 0/1] MR295: uiautomationcore: Initialize VARIANT in UIAutomation test.
by Connor McAdams (＠cmcadams) 21 Jun '22

21 Jun '22

Initialize VARIANT before calling VariantClear in UIAutomation. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/295

2 1

[PATCH v2 0/3] MR286: nsiproxy.sys: Add static ARP entries which are always present on Windows.
by Paul Gofman (＠gofman) 21 Jun '22

21 Jun '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53175 Commit 910d58520a6d75cada82d992757ca013099d9345 (iphlpapi: Return ERROR_NO_DATA from GetIpNetTable() if no entries are found.) introduced a regression in Roon application. It looks like the app doesn't tolerate an error return from GetIpNetTable() if there are active interfaces found. The blamed patch still looks correct to me per se, that is, if number of entries ends up being zero Windows returns ERROR_NO_DATA. However, number of entries is never zero on Windows if there is any network adapter. There are two things why Windows always has some arp entries and we do not: 1. We currently parse /proc/net/arp line on Linux a bit wrong and end up getting no entries from there (patch 1 fixes that); 2. With the patch patch 1 there Roon seems happy (at least as far as I could test it right at start), at least as long we have an entry in /proc/sys/net (which might not be necessarily the case if there is, e. g., no actual network connection). But that breaks SCP: Secret Laboratory again the same way as before 910d58520a6d75cada82d992757ca013099d9345. It turns out the latter game depends on GetIpNetTable() returning at least 4 entries when returning success (for some reason, I am not sure why but I think I saw that quite clearly). And both apps can actually work reliably on Windows as there are always at least 4 static arp entries if there is any network adaptere configured at all. There are "224.0.0.22" and "239.255.255.250" static arp multicast entries which are always there for any interface on Windows, including loopback (starting from Win10; earlier versions might be missing "239.255.255.250" but have "224.0.0.22"). So adding those like on Windows should hopefully fix all those cases. -- v2: iphlpapi: Sort by adapter index first in GetIpNetTable(). iphlpapi: Correctly index dynamic data array. nsiproxy.sys: Strip trailing end of line for iface name on Linux. https://gitlab.winehq.org/wine/wine/-/merge_requests/286

3 5

[PATCH 0/5] MR266: iphlpapi/tests: Add win95+ API tests
by Jinoh Kang (＠iamahuman) 21 Jun '22

21 Jun '22

Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/266

3 6

[PATCH v2 0/6] MR294: win32u: menu and def window proc conversion
by Jacek Caban (＠jacek) 21 Jun '22

21 Jun '22

-- v2: win32u: Move GetMenuItemID implementation from user32. user32: Reimplement GetMenuStringW on top of NtUserThunkedMenuItemInfo. user32: Reimplement GetMenuStringA on top of NtUserThunkedMenuItemInfo. win32u: Move get_menu_item_info implementation from user32. https://gitlab.winehq.org/wine/wine/-/merge_requests/294

3 8

[PATCH 0/6] MR294: win32u: menu and def window proc conversion
by Jacek Caban (＠jacek) 21 Jun '22

21 Jun '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/294

3 9

[PATCH 0/2] MR291: secur32: Implement SECPKG_ATTR_CIPHER_INFO.
by Hans Leidekker (＠hans) 21 Jun '22

21 Jun '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/291

4 4

[PATCH v2 0/2] MR291: secur32: Implement SECPKG_ATTR_CIPHER_INFO.
by Hans Leidekker (＠hans) 21 Jun '22

21 Jun '22

-- v2: secur32: Implement SECPKG_ATTR_CIPHER_INFO. https://gitlab.winehq.org/wine/wine/-/merge_requests/291

2 2

[PATCH v2 0/2] MR292: nsiproxy: Add wow64 entry points
by Huw Davies (＠huw) 21 Jun '22

21 Jun '22

-- v2: https://gitlab.winehq.org/wine/wine/-/merge_requests/292

2 2

[PATCH 0/4] MR292: nsiproxy: Add wow64 entry points
by Huw Davies (＠huw) 21 Jun '22

21 Jun '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/292

3 6

[PATCH 0/1] MR293: winedbg: Clarify options specific to GDB proxy mode.
by Jinoh Kang (＠iamahuman) 21 Jun '22

21 Jun '22

Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/293

2 1

[PATCH 0/1] MR289: d3drm: Implement IDirect3DRMFrame2::SetSceneBackgroundImage
by Alistair Leslie-Hughes (＠alesliehughes) 21 Jun '22

21 Jun '22

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/289

3 2

[PATCH 0/1] MR290: iphlpapi/tests: Allow the route's age to differ by one second.
by Huw Davies (＠huw) 21 Jun '22

21 Jun '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/290

2 1

[PATCH 0/4] MR286: nsiproxy.sys: Add static ARP entries which are always present on Windows.
by Paul Gofman (＠gofman) 21 Jun '22

21 Jun '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53175 Commit 910d58520a6d75cada82d992757ca013099d9345 (iphlpapi: Return ERROR_NO_DATA from GetIpNetTable() if no entries are found.) introduced a regression in Roon application. It looks like the app doesn't tolerate an error return from GetIpNetTable() if there are active interfaces found. The blamed patch still looks correct to me per se, that is, if number of entries ends up being zero Windows returns ERROR_NO_DATA. However, number of entries is never zero on Windows if there is any network adapter. There are two things why Windows always has some arp entries and we do not: 1. We currently parse /proc/net/arp line on Linux a bit wrong and end up getting no entries from there (patch 1 fixes that); 2. With the patch patch 1 there Roon seems happy (at least as far as I could test it right at start), at least as long we have an entry in /proc/sys/net (which might not be necessarily the case if there is, e. g., no actual network connection). But that breaks SCP: Secret Laboratory again the same way as before 910d58520a6d75cada82d992757ca013099d9345. It turns out the latter game depends on GetIpNetTable() returning at least 4 entries when returning success (for some reason, I am not sure why but I think I saw that quite clearly). And both apps can actually work reliably on Windows as there are always at least 4 static arp entries if there is any network adaptere configured at all. There are "224.0.0.22" and "239.255.255.250" static arp multicast entries which are always there for any interface on Windows, including loopback (starting from Win10; earlier versions might be missing "239.255.255.250" but have "224.0.0.22"). So adding those like on Windows should hopefully fix all those cases. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/286

5 8

[PATCH 0/3] MR288: comctl32/toolbar: Add support for TBCDRF_NOBACKGROUND.
by Zhiyi Zhang (＠zhiyi) 21 Jun '22

21 Jun '22

Tested manually on XP, Win 7 and Win 10. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53049 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/288

2 3

[PATCH v4 0/1] MR23: shell32: Sanitize Program Manager icon and group names
by Alex Henrie (＠alexhenrie) 21 Jun '22

21 Jun '22

All of the new tests that are marked todo_wine fail because Wine's PathCombineW does not handle ".", "...", "....", or "foobar." correctly. They will pass once PathCombineW is fixed. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52506 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> -- v4: shell32: Sanitize Program Manager icon and group names. https://gitlab.winehq.org/wine/wine/-/merge_requests/23

2 1

[PATCH v3 0/1] MR23: shell32: Sanitize Program Manager icon and group names
by Alex Henrie (＠alexhenrie) 21 Jun '22

21 Jun '22

All of the new tests that are marked todo_wine fail because Wine's PathCombineW does not handle ".", "...", "....", or "foobar." correctly. They will pass once PathCombineW is fixed. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52506 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> -- v3: shell32: Sanitize Program Manager icon and group names https://gitlab.winehq.org/wine/wine/-/merge_requests/23

2 4

[PATCH 0/5] MR287: uxtheme: Support parsing more button parts and states.
by Zhiyi Zhang (＠zhiyi) 21 Jun '22

21 Jun '22

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/287

2 5

[PATCH v3 0/2] MR283: ntdll: Filter EFlags from user-supplied CONTEXT on x86 and x64.
by Jinoh Kang (＠iamahuman) 21 Jun '22

21 Jun '22

-- v3: ntdll: Filter EFlags from user-supplied CONTEXT on x86 and x64. ntdll/tests: Test for setting x86 / x64 EFLAGS register in context. https://gitlab.winehq.org/wine/wine/-/merge_requests/283

2 3

[PATCH 0/2] MR283: ntdll: Filter EFlags from user-supplied CONTEXT on x86 and x64.
by Jinoh Kang (＠iamahuman) 21 Jun '22

21 Jun '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/283

5 6

[PATCH 0/1] MR132: opengl32: Don't prioritize low bit depth formats with non-matching stencil.
by Paul Gofman (＠gofman) 20 Jun '22

20 Jun '22

Fixes ClaDun X2 missing rendering parts on AMD. The GL game uses stencil and requests pixel format with depth 16, stencil 8. On Wine / AMD that ends up with 16x0 format as there is no 16x8 advertised (16x0 only) and depth takes absolute priority. On the same Windows machine I see both 16x0 and 16x8 formats, but when 16x8 is requested 24x8 is returned (and 16x0 if 16x0 is requested). That currently works under Wine / Nvidia because there is no 16 bit depth formats advertised at all and it ends up with 24x8 without this patch. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/132

3 6

Re: [PATCH v3 0/1] MR259: d3d11: Remove null dxgi object checks. - approved
by Alexandre Julliard (＠julliard) 20 Jun '22

20 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/259

1 0

Re: [PATCH v3 0/1] MR279: d3drm: IDirect3DRMMeshBuilder3 Optimize fake success - approved
by Alexandre Julliard (＠julliard) 20 Jun '22

20 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/279

1 0

Re: [PATCH v4 0/2] MR244: winex11.drv: Keep GLX pbuffer alive while its drawable is used - approved
by Alexandre Julliard (＠julliard) 20 Jun '22

20 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/244

1 0

Re: [PATCH v4 0/3] MR281: A few fixes in xmllite - approved
by Alexandre Julliard (＠julliard) 20 Jun '22

20 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/281

1 0

Re: [PATCH v2 0/1] MR284: riched20: Commit and wrap paragraphs after changing text properties. (#53170) - approved
by Alexandre Julliard (＠julliard) 20 Jun '22

20 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/284

1 0

[PATCH v5 0/1] MR192: ws2_32: Allow getsockname after AcceptEx
by DavidCurtiss (＠DavidCurtiss) 20 Jun '22

20 Jun '22

.NET 6's HTTP/Socket code queries this. Winsock allows getsockname on the AcceptEx AcceptSocket, but only if SO_UPDATE_ACCEPT_CONTEXT is set. Signed-off-by: David Curtiss <david.curtiss(a)ni.com> -- v5: ws2_32: Allow getsockname after AcceptEx. https://gitlab.winehq.org/wine/wine/-/merge_requests/192

3 2

Re: [PATCH v2 0/7] MR285: win32u: Default window proc conversion - approved
by Alexandre Julliard (＠julliard) 20 Jun '22

20 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/285

1 0

Re: [PATCH v2 0/1] MR280: include: Add definition of ScriptPlaceOpenType(). - approved
by Alexandre Julliard (＠julliard) 20 Jun '22

20 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/280

1 0

Re: [PATCH v5 0/1] MR252: shell32/tests: Add tests for Program Manager name sanitization. - approved
by Alexandre Julliard (＠julliard) 20 Jun '22

20 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/252

1 0

Re: [PATCH v2 0/9] MR278: d2d1: Partially implement effect registration parsing. - approved
by Alexandre Julliard (＠julliard) 20 Jun '22

20 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/278

1 0

Re: [PATCH v3 0/1] MR274: winedbg: Fix typos in manpage. - approved
by Alexandre Julliard (＠julliard) 20 Jun '22

20 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/274

1 0

Re: [PATCH v2 0/1] MR276: include: Add _tcsto[u]ll declarations. - approved
by Alexandre Julliard (＠julliard) 20 Jun '22

20 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/276

1 0

Re: [PATCH v2 0/4] MR275: ntdll: Plumb zero_bits parameter from virtual_map_section to virtual_map_builtin_module. - approved
by Alexandre Julliard (＠julliard) 20 Jun '22

20 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/275

1 0

[PATCH 0/1] MR284: riched20: Commit and wrap paragraphs after changing text properties. (#53170)
by Jinoh Kang (＠iamahuman) 20 Jun '22

20 Jun '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/284

3 2

[PATCH] wined3d: Add GPU information for NVIDIA Ampere A10 and AMD Radeon Pro V620 GPUs.
by Bhavesh Davda 20 Jun '22

20 Jun '22

Signed-off-by: Bhavesh Davda <bhaveshd(a)hotmail.com> --- dlls/wined3d/adapter_gl.c | 1 + dlls/wined3d/directx.c | 3 +++ dlls/wined3d/wined3d_private.h | 3 +++ 3 files changed, 7 insertions(+) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 05e8c11..d341668 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -1311,6 +1311,7 @@ cards_nvidia_binary[] = { /* Direct 3D 11 */ {"Tesla T4", CARD_NVIDIA_TESLA_T4}, + {"Ampere A10", CARD_NVIDIA_AMPERE_A10}, {"RTX 2080 Ti", CARD_NVIDIA_GEFORCE_RTX2080TI}, /* GeForce 2000 - highend */ {"RTX 2080", CARD_NVIDIA_GEFORCE_RTX2080}, /* GeForce 2000 - highend */ {"RTX 2070", CARD_NVIDIA_GEFORCE_RTX2070}, /* GeForce 2000 - highend */ diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 925b2df..6f8d1ed 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -475,6 +475,7 @@ static const struct wined3d_gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_RTX2080, "NVIDIA GeForce RTX 2080", DRIVER_NVIDIA_KEPLER, 8192}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_RTX2080TI, "NVIDIA GeForce RTX 2080 Ti", DRIVER_NVIDIA_KEPLER, 11264}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_TESLA_T4, "NVIDIA Tesla T4", DRIVER_NVIDIA_KEPLER, 16384}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_AMPERE_A10, "NVIDIA Ampere A10", DRIVER_NVIDIA_KEPLER, 24576}, /* AMD cards */ {HW_VENDOR_AMD, CARD_AMD_RAGE_128PRO, "ATI Rage Fury", DRIVER_AMD_RAGE_128PRO, 16 }, @@ -536,6 +537,8 @@ static const struct wined3d_gpu_description gpu_description_table[] = {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_NAVI_10, "Radeon RX 5700 / 5700 XT", DRIVER_AMD_RX, 8192}, {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_NAVI_14, "Radeon RX 5500M", DRIVER_AMD_RX, 4096}, {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_NAVI_21, "Radeon RX 6800/6800 XT / 6900 XT", DRIVER_AMD_RX, 16384}, + {HW_VENDOR_AMD, CARD_AMD_RADEON_PRO_V620, "Radeon Pro V620", DRIVER_AMD_RX, 32768}, + {HW_VENDOR_AMD, CARD_AMD_RADEON_PRO_V620_VF, "Radeon Pro V620 VF", DRIVER_AMD_RX, 32768}, {HW_VENDOR_AMD, CARD_AMD_VANGOGH, "AMD VANGOGH", DRIVER_AMD_RX, 4096}, /* Red Hat */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 73d13d6..5f058d1 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3014,6 +3014,8 @@ enum wined3d_pci_device CARD_AMD_RADEON_RX_NAVI_10 = 0x731f, CARD_AMD_RADEON_RX_NAVI_14 = 0x7340, CARD_AMD_RADEON_RX_NAVI_21 = 0x73bf, + CARD_AMD_RADEON_PRO_V620 = 0x73a1, + CARD_AMD_RADEON_PRO_V620_VF = 0x73ae, CARD_AMD_VANGOGH = 0x163f, CARD_NVIDIA_RIVA_128 = 0x0018, @@ -3160,6 +3162,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_RTX2080 = 0x1e87, CARD_NVIDIA_GEFORCE_RTX2080TI = 0x1e07, CARD_NVIDIA_TESLA_T4 = 0x1eb8, + CARD_NVIDIA_AMPERE_A10 = 0x2236, CARD_REDHAT_VIRGL = 0x1010, -- 1.8.3.1

2 1

Re: [PATCH v4 0/1] MR192: ws2_32: Allow getsockname after AcceptEx
by DavidCurtiss (＠DavidCurtiss) 20 Jun '22

20 Jun '22

On Thu Jun 9 18:18:23 2022 +0000, **** wrote: > Zebediah Figura replied on the mailing list: > ``` > Can you please make this a single, self-contained commit, instead of > fixing it up with a separate commit? We don't squash anything when > merging, and we want to have a sensible commit history. > ``` Zebediah, since you have reviewed this, can you also Approve it? How do I get this (or any) change moved forward? -- https://gitlab.winehq.org/wine/wine/-/merge_requests/192#note_2370

2 1

Re: [PATCH v4 0/1] MR192: ws2_32: Allow getsockname after AcceptEx - approved
by Zebediah Figura (＠zfigura) 20 Jun '22

20 Jun '22

This merge request was approved by Zebediah Figura. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/192

1 0

Re: [PATCH v2 0/1] MR259: d3d11: Remove null dxgi object checks. - approved
by Zebediah Figura (＠zfigura) 20 Jun '22

20 Jun '22

This merge request was approved by Zebediah Figura. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/259

1 0

Re: [PATCH v2 0/1] MR279: d3drm: IDirect3DRMMeshBuilder3 Optimize fake success - approved
by Zebediah Figura (＠zfigura) 20 Jun '22

20 Jun '22

This merge request was approved by Zebediah Figura. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/279

1 0

[PATCH v3 0/3] MR281: A few fixes in xmllite
by David Kahurani (＠kahurani) 20 Jun '22

20 Jun '22

-- v3: xmllite/writer: Fix typo in a comment xmllite/writer: Handle possible memory allocation failures xmllite/reader: Avoid memory leak on error path https://gitlab.winehq.org/wine/wine/-/merge_requests/281

3 4

[PATCH v2 0/2] MR283: ntdll: Filter EFlags from user-supplied CONTEXT on x86 and x64.
by Jinoh Kang (＠iamahuman) 20 Jun '22

20 Jun '22

-- v2: ntdll: Filter EFlags from user-supplied CONTEXT on x86 and x64. ntdll/tests: Test for setting x86 / x64 EFLAGS register in context. https://gitlab.winehq.org/wine/wine/-/merge_requests/283

3 3

[tools] testbot/Engine: Don't schedule jobs until the initialization is done.
by Francois Gouget 20 Jun '22

20 Jun '22

On startup the Engine starts processes to check the state of each VM, marking them as dirty in the process. But the VM status change causes ScheduleJobs() to be called through the VMStatusChange notification, potentially before all check processes have been started. So make sure no job is scheduled until the Engine is ready. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/Engine.pl | 1 + testbot/lib/WineTestBot/Engine/Scheduler.pm | 21 +++++++++++++++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 9d836529c3..39577d14ca 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -780,6 +780,7 @@ sub main() # Cleanup starts processes to update the VMs. Run ScheduleJobs() now so it # can detect if these processes get stuck. + StartJobScheduler(); ScheduleJobs(); # Check for patches that arrived while the server was off. diff --git a/testbot/lib/WineTestBot/Engine/Scheduler.pm b/testbot/lib/WineTestBot/Engine/Scheduler.pm index 1b21ab9742..f91bf3fd03 100644 --- a/testbot/lib/WineTestBot/Engine/Scheduler.pm +++ b/testbot/lib/WineTestBot/Engine/Scheduler.pm @@ -28,7 +28,7 @@ WineTestBot::Engine::Scheduler - Schedules the TestBot tasks =cut use Exporter 'import'; -our @EXPORT = qw(ScheduleJobs CheckJobs); +our @EXPORT = qw(StartJobScheduler ScheduleJobs CheckJobs); use File::Copy; @@ -945,7 +945,24 @@ sub _PowerOffDirtyVMs($) } } -my $_InScheduleJobs; +my $_InScheduleJobs = 1; + +=pod +=over 12 + +=item C<StartJobScheduler()> + +Job scheduling is disabled initially to let the Engine perform its +initialization without interference. + +=back +=cut + +sub StartJobScheduler() +{ + $_InScheduleJobs = undef; +} + my $_LastTaskCounts = ""; =pod -- 2.30.2

1 0

[tools] testbot/web: Show the web patch id as a tooltip.
by Francois Gouget 20 Jun '22

20 Jun '22

This helps cross-reference the TestBot patch list with the jobs and patches website. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/PatchesList.pl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/testbot/web/PatchesList.pl b/testbot/web/PatchesList.pl index fc074ada1a..bf7c52b203 100644 --- a/testbot/web/PatchesList.pl +++ b/testbot/web/PatchesList.pl @@ -53,7 +53,9 @@ sub GenerateDataView($$$) $Row->{Item}->Disposition =~ /job ([0-9]+)$/) { my $JobId = $1; - print "<a href='/JobDetails.pl?Key=$JobId'>Job $JobId</a>"; + my $Title = $Row->{Item}->WebPatchId; + $Title = " title='Web patch $Title'" if ($Title); + print "<a href='/JobDetails.pl?Key=$JobId'$Title>Job $JobId</a>"; } else { -- 2.30.2

1 0

[PATCH v3 0/6] Fix LVS_OWNERDATA list view multi select.
by Angelo Haller 20 Jun '22

20 Jun '22

From: Angelo Haller <angelo(a)szanni.org> The following patches fix sending of the LVN_ODSTATECHANGED notification for LVS_OWNERDATA list views, adding more refined tests in the process and fixing various bugs. This is v3 addressing most of the concerns that were raised in v2, especially adding even more tests. I was sadly not able to trigger any deselect sequences through emulating mouse clicks. I was actually completely unable even send a lef mouse button down at all. Both SendMessage and SendInput fail, on wind and windows. I am unsure if programmatic mouse clicks are even supported in list views? Some forums seem to suggest, that this is only the case for buttons and similar elements. I was following the code snippets in other parts of the comctl32 tests. The other thing might be that the signal is getting caught somewhere in the test code. If anybody has any more insight in this regard, I'd be happy to add additional mouse click tests as well. The other thing I was unable to do is activate the single select tests via SHIFT/+COMMAND to show we need patch 6/6. Windows weirdly informs about the selected item twice, once to inform the item has been selected and then in another call later about the item being focused as well. This seemingly only affects LVS_OWNERDATA listviews from my tests. Warning: I have had access to the Windows Research Kernel (WRK) 1.2 ~10 years ago. These changes are regarding comctrl32 & tests which are NOT part of the WRK. As outlined in https://wiki.winehq.org/Developer_FAQ this should therefore satisfy the requirement of ONLY submitting patches to components I have NOT had access to. Angelo Haller (6): comctl32/tests: Expand ownerdata listview tests. comctl32/listview: Fix deselect on LVS_OWNERDATA. comctl32/listview: Move sending LVN_ODSTATECHANGED notifications to a function. comctl32/listview: Send LVN_ODSTATECHANGED only for virtual lists. comctl32/listview: Send LVN_ODSTATECHANGED notification. comctl32/listview: Send LVN_ODSTATECHANGED only for true ranges. dlls/comctl32/listview.c | 55 ++++--- dlls/comctl32/tests/listview.c | 253 +++++++++++++++++++++++++++++++-- 2 files changed, 281 insertions(+), 27 deletions(-) Signed-off-by: Angelo Haller <angelo(a)szanni.org> -- 2.36.1

3 14

[PATCH 0/7] MR285: win32u: Default window proc conversion
by Jacek Caban (＠jacek) 20 Jun '22

20 Jun '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/285

5 13

[PATCH 0/3] MR263: iphlpapi: Implement GetBestRoute2.
by Jinoh Kang (＠iamahuman) 20 Jun '22

20 Jun '22

A major problem with this patch is that the function is agnostic to the source argument. Even after some tinkering I still haven't figured out how exactly Windows uses this argument. Also, possibly move GetBestRoute2 implementation to nsiproxy.sys if applicable? -- https://gitlab.winehq.org/wine/wine/-/merge_requests/263

3 4

[PATCH v3 0/2] MR244: winex11.drv: Keep GLX pbuffer alive while its drawable is used
by Paul Gofman (＠gofman) 20 Jun '22

20 Jun '22

Other drawable types are ref counted and destroyed only when nothing (e. g., existing contexts) reference them anymore, making sure that if we have a context referencing drawable the GLX drawable is still valid. That was probably left behind for PBuffers. -- v3: winex11.drv: Destroy GLX pbuffer when destroying drawable. winex11.drv: Store wgl_drawable instead of GLX drawable in wgl_pbuffer. https://gitlab.winehq.org/wine/wine/-/merge_requests/244

2 3

[PATCH 0/1] MR253: Allow Wine to display custom boot initialization resource
by Dan Mondrik (＠danrm) 20 Jun '22

20 Jun '22

The problem being solved is that the first-time initialization of Wine displays a dialog saying it is Wine. If a custom packaged application uses its own prefix directory and wants to appear native, that dialog can appear surprising. When the environment variable `WINEBOOTRESOURCEMODULE` is set, use it to load the dialog and icon on the first application run. If that module does not exist or does not supply the appropriate resources, fall back to the default ones. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/253

2 2

[PATCH v2 0/3] MR281: A few fixes in xmllite
by David Kahurani (＠kahurani) 20 Jun '22

20 Jun '22

-- v2: dlls/xmllite: Fix typo in a comment dlls/xmllite: Handle possible memory allocation failures dlls/xmllite: Avoid memory leak on error path https://gitlab.winehq.org/wine/wine/-/merge_requests/281

3 4

[PATCH v2 0/2] MR244: winex11.drv: Keep GLX pbuffer alive while its drawable is used
by Paul Gofman (＠gofman) 20 Jun '22

20 Jun '22

Other drawable types are ref counted and destroyed only when nothing (e. g., existing contexts) reference them anymore, making sure that if we have a context referencing drawable the GLX drawable is still valid. That was probably left behind for PBuffers. -- v2: winex11.drv: Destroy GLX pbuffer when destroying drawable. winex11.drv: Store sgl_drawable instead of GLX drawable in wgl_pbuffer. https://gitlab.winehq.org/wine/wine/-/merge_requests/244

3 4

[PATCH v2 0/1] MR268: riched20: Commit and repaint after the SetFont method is called. (#53169)
by Jinoh Kang (＠iamahuman) 20 Jun '22

20 Jun '22

Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> -- v2: riched20: Commit and repaint after the SetFont method is called. https://gitlab.winehq.org/wine/wine/-/merge_requests/268

2 3

[PATCH v2 0/1] MR267: riched20: Commit and repaint after changing TextFont properties. (#53170)
by Jinoh Kang (＠iamahuman) 20 Jun '22

20 Jun '22

Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> -- v2: riched20: Commit and repaint after changing TextFont properties. https://gitlab.winehq.org/wine/wine/-/merge_requests/267

3 4

[PATCH 0/2] MR282: ntdll: Set r11 on exit from syscall dispatcher on x64.
by Jinoh Kang (＠iamahuman) 20 Jun '22

20 Jun '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/282

2 2

[PATCH 0/3] MR281: A few fixes in xmllite
by David Kahurani (＠kahurani) 20 Jun '22

20 Jun '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/281

2 3

[PATCH 0/1] MR280: include: Add definition of ScriptPlaceOpenType().
by Jactry Zeng (＠jactry) 20 Jun '22

20 Jun '22

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/280

3 2

[PATCH 0/2] MR269: ntdll: Respect zero_bits when mapping a builtin or native PE file.
by Brendan Shanks (＠bshanks) 20 Jun '22

20 Jun '22

Without the changes, the test passes or fails based on the binutils version being used. v2.35 (used on the Debian 11 testbot) gives 64-bit DLLs an image base under 4GB, and the test always passes. On a system with binutils 2.37 or later, 64-bit DLLs are based above 4GBs, and the test will fail. The map_view() change fixes native DLLs, and virtual_map_section() for builtin DLLs. I wasn't sure how to test a native DLL. This showed up under Wow64 when running the 64-bit Notepad++ installer (a 32-bit EXE), which runs 32-bit regsvr32 to register a 64-bit DLL. regsvr32 calls LoadLibraryExW() with LOAD_LIBRARY_AS_IMAGE_RESOURCE, which was returning a truncated pointer to the DLLs base address. Accessing this then crashed. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/269

3 3

[PATCH 0/1] MR277: cmd: Handle lines with just spaces in bracket blocks.
by Bernhard Übelacker (＠bernhardu) 20 Jun '22

20 Jun '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51599 This patch attempts to ignore lines with just spaces inside bracket blocks like it does already for completely empty lines. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/277

3 4

[PATCH 0/1] MR279: d3drm: IDirect3DRMMeshBuilder3 Optimize fake success
by Alistair Leslie-Hughes (＠alesliehughes) 20 Jun '22

20 Jun '22

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/279

2 1

[PATCH 0/9] MR278: d2d1: Partially implement effect registration parsing.
by Nikolay Sivov (＠nsivov) 19 Jun '22

19 Jun '22

This slightly reworks xmllite integration comparing to earlier patches, and add a proper forward to CreateEffect(). -- https://gitlab.winehq.org/wine/wine/-/merge_requests/278

3 9

[PATCH v4 1/8] server: Actually set initial status in set_async_direct_result handler.
by Jinoh Kang 19 Jun '22

19 Jun '22

Commit 15483b1a126 (server: Allow calling async_handoff() with status code STATUS_ALERTED., 2022-02-10) introduced the set_async_direct_result handler which calls async_set_initial_status(). However, the async_set_initial_status() call does nothing since async->terminated is set, leaving the async in a confusing state (unknown_status = 1 but pending/completed). So far, this issue is unlikely to have been a problem in practice for the following reasons: 1. async_set_initial_status() would have unset unknown_status, but it remains set instead. This is usually not a problem, since unknown_status is usually ever read by code paths effectively unreachable for non-device (e.g. socket) asyncs. It would still potentially allow set_async_direct_result to be called multiple times, but it wouldn't actually happen in practice unless something goes wrong. 2. async_set_initial_status() would have set initial_status; however, it is left with the default value STATUS_PENDING. If the actual status is something other than that, the handler closes the wait handle and async_satisfied (the only realconsumer of initial_status) would never be called anyway. For reasons above, this issue is not effectively observable or testable. Nonetheless, the current code does leave the async object in an inconsistent state. Fix this by removing the !async->terminated check in async_set_initial_status(). Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- Notes: v1 -> v2: no changes v2 -> v3: no changes v3 -> v4: reuse async_set_initial_status() per feedback server/async.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/server/async.c b/server/async.c index 7d0ff10f7a4..e92d4583c1e 100644 --- a/server/async.c +++ b/server/async.c @@ -303,11 +303,8 @@ struct async *create_async( struct fd *fd, struct thread *thread, const async_da void async_set_initial_status( struct async *async, unsigned int status ) { assert( async->unknown_status ); - if (!async->terminated) - { - async->initial_status = status; - async->unknown_status = 0; - } + async->initial_status = status; + async->unknown_status = 0; } void set_async_pending( struct async *async ) -- 2.34.1

3 10

[PATCH v2 0/1] MR274: winedbg: Fix typos in manpage.
by Jinoh Kang (＠iamahuman) 19 Jun '22

19 Jun '22

Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> -- v2: winedbg: Fix typos in manpage. https://gitlab.winehq.org/wine/wine/-/merge_requests/274

2 1

[PATCH 0/1] MR274: winedbg: Fix typos in manpage.
by Jinoh Kang (＠iamahuman) 18 Jun '22

18 Jun '22

Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/274

3 2

[PATCH 0/1] MR276: include: Add _tcsto[u]ll declarations.
by Daniel Lehman (＠dlehman25) 18 Jun '22

18 Jun '22

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/276

2 1

[PATCH 0/4] MR275: ntdll: Plumb zero_bits parameter from virtual_map_section to virtual_map_builtin_module.
by Brendan Shanks (＠bshanks) 18 Jun '22

18 Jun '22

When running a 32-bit EXE in Wow64 mode with a fairly full address space, a builtin DLL may be loaded above the 4GB line. This is due to virtual_map_builtin_module calling virtual_map_image with zero_bits hardcoded to 0. virtual_map_section is called with the correct zero_bits, this patch propagates that parameter down through load_builtin, find_builtin_dll, open_builtin_pe_file, and virtual_map_builtin_module. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/275

2 4

[PATCH v2 0/9] MR272: d3dx10: Add D3DX10CreateThreadPump implementation.
by Piotr Caban (＠piotr) 18 Jun '22

18 Jun '22

The GetWorkItemCount implementation may look strange. It's done this way because of how WaitForAllItems is implemented. Alternative solution is to introduce separate counter for GetWorkItemCount. -- v2: d3dx10/tests: Add D3DX10CreateThreadPump tests. d3dx10: Add ID3DX10ThreadPump:PurgeAllItems implementation. d3dx10: Add ID3DX10ThreadPump:GetQueueStatus implementation. d3dx10: Add ID3DX10ThreadPump:WaitForAllItems implementation. d3dx10: Add ID3DX10ThreadPump:ProcessDeviceWorkItems implementation. d3dx10: Add ID3DX10ThreadPump:GetWorkItemCount implementation. d3dx10: Add ID3DX10ThreadPump:AddWorkItem implementation. d3dx10: Add D3DX10CreateThreadPump stub. d3dx10/tests: Fix texture leak in check_resource_data. https://gitlab.winehq.org/wine/wine/-/merge_requests/272

2 9

[PATCH 0/8] MR272: d3dx10: Add D3DX10CreateThreadPump implementation.
by Piotr Caban (＠piotr) 18 Jun '22

18 Jun '22

The GetWorkItemCount implementation may look strange. It's done this way because of how WaitForAllItems is implemented. Alternative solution is to introduce separate counter for GetWorkItemCount. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/272

4 11

How to identify the primary battery (for Wine)
by Alex Henrie 18 Jun '22

18 Jun '22

Hi Sebastian, I've been working to improve battery status reporting for applications running on Wine on Linux. However, we Wine developers are not sure what the best way is to determine which battery is the computer's primary battery. Could you take a look at https://gitlab.winehq.org/wine/wine/-/merge_requests/134 and leave a comment there or on the wine-devel mailing list? Thanks in advance, -Alex

4 6

[PATCH v2 0/1] MR273: ntdll/tests: Add more tests for \Device\NamedPipe\ root directory.
by Jinoh Kang (＠iamahuman) 18 Jun '22

18 Jun '22

Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> -- v2: ntdll/tests: Add more tests for \Device\NamedPipe\ root directory. https://gitlab.winehq.org/wine/wine/-/merge_requests/273

2 1

[PATCH 0/1] MR273: ntdll/tests: Add more tests for \Device\NamedPipe\ root directory.
by Jinoh Kang (＠iamahuman) 18 Jun '22

18 Jun '22

Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/273

2 1

Re: [PATCH v2 0/5] MR257: d3dx: Add support for ID3DX10ThreadPump parameter in D3DX10CreateTexture* functions
by Piotr Caban (＠piotr) 18 Jun '22

18 Jun '22

On Sat Jun 18 11:22:29 2022 +0000, Matteo Bruni wrote: > Any particular reason the new test isn't inside the for loop right above > so to check every test_image[] with the thread pump? It will be added in next set of patches that implements D3DX10CreateThreadPump so it also tests thread pump implementation. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/257#note_2310

1 0

[PATCH] ntdll: Implement NtQueryVolumeInformationFile FileFsFullSizeInformation.
by Michal Suchanek 18 Jun '22

18 Jun '22

Some programs refuse to write to disk when they cannot determine there is enough disk space. Implement the ntdll subfunction for it. Signed-off-by: Michal Suchanek <msuchanek(a)suse.de> --- dlls/ntdll/tests/file.c | 8 +------- dlls/ntdll/unix/file.c | 24 ++++++++++++++++++++++-- 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 106413a83fc..ede578081fc 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -1289,7 +1289,7 @@ static void test_file_full_size_information(void) /* Assume No Quota Settings configured on Wine Testbot */ res = pNtQueryVolumeInformationFile(h, &io, &ffsi, sizeof ffsi, FileFsFullSizeInformation); - todo_wine ok(res == STATUS_SUCCESS, "cannot get attributes, res %lx\n", res); + ok(res == STATUS_SUCCESS, "cannot get attributes, res %lx\n", res); res = pNtQueryVolumeInformationFile(h, &io, &fsi, sizeof fsi, FileFsSizeInformation); ok(res == STATUS_SUCCESS, "cannot get attributes, res %lx\n", res); @@ -1305,8 +1305,6 @@ static void test_file_full_size_information(void) ok(fsi.BytesPerSector == 512, "[fsi] BytesPerSector expected 512, got %ld\n",fsi.BytesPerSector); ok(fsi.SectorsPerAllocationUnit == 8, "[fsi] SectorsPerAllocationUnit expected 8, got %ld\n",fsi.SectorsPerAllocationUnit); - todo_wine - { ok(ffsi.TotalAllocationUnits.QuadPart > 0, "[ffsi] TotalAllocationUnits expected positive, got negative value 0x%s\n", wine_dbgstr_longlong(ffsi.TotalAllocationUnits.QuadPart)); @@ -1324,14 +1322,10 @@ static void test_file_full_size_information(void) "[ffsi] CallerAvailableAllocationUnits error fsi:0x%s, ffsi: 0x%s\n", wine_dbgstr_longlong(fsi.AvailableAllocationUnits.QuadPart), wine_dbgstr_longlong(ffsi.CallerAvailableAllocationUnits.QuadPart)); - } /* Assume file system is NTFS */ - todo_wine - { ok(ffsi.BytesPerSector == 512, "[ffsi] BytesPerSector expected 512, got %ld\n",ffsi.BytesPerSector); ok(ffsi.SectorsPerAllocationUnit == 8, "[ffsi] SectorsPerAllocationUnit expected 8, got %ld\n",ffsi.SectorsPerAllocationUnit); - } CloseHandle( h ); } diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index cc8bf0c6e82..c2586ca39d8 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -6630,9 +6630,29 @@ NTSTATUS WINAPI NtQueryVolumeInformationFile( HANDLE handle, IO_STATUS_BLOCK *io break; case FileFsFullSizeInformation: - FIXME( "%p: full size info not supported\n", handle ); - status = STATUS_NOT_IMPLEMENTED; + { + FILE_FS_FULL_SIZE_INFORMATION *info = buffer; + struct statfs stfs; + unsigned long sector_size = 512; + + if (length < sizeof(FILE_FS_FULL_SIZE_INFORMATION)) + { + status = STATUS_INFO_LENGTH_MISMATCH; + break; + } + + status = STATUS_UNSUCCESSFUL; + if (!fstatfs( fd, &stfs )) + { + info->TotalAllocationUnits.QuadPart = stfs.f_blocks; + info->CallerAvailableAllocationUnits.QuadPart = stfs.f_bavail; + info->ActualAvailableAllocationUnits.QuadPart = stfs.f_bfree; + info->SectorsPerAllocationUnit = stfs.f_bsize / sector_size; + info->BytesPerSector = sector_size; + status = STATUS_SUCCESS; + } break; + } case FileFsObjectIdInformation: FIXME( "%p: object id info not supported\n", handle ); -- 2.36.1

1 0

Wine staging 7.11 release
by Alistair Leslie-Hughes 18 Jun '22

18 Jun '22

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 7.11 (542 patches are applied to wine vanilla) Upstreamed (Either directly from staging or fixed with a similar patch). * faudio: Send NOTIFY_CUESTOP when Stop is called. * dwmapi: Fill rateRefresh/rateCompose and qpcRefreshPeriod of DWM_TIMING_INFO from DwmGetCompositionTimingInfo(). * dwmapi: Return S_OK from DwmFlush(). Added: * None Updated: * None Where can you help * Run Steam/Battle.net/GOG/UPlay/Epic * Test your favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH 0/2] MR270: include: Add interface declarations in dxgidebug.idl
by Biswapriyo Nath (＠Biswa96) 17 Jun '22

17 Jun '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/270

2 2

Gitlab transition roadmap
by Alexandre Julliard 17 Jun '22

17 Jun '22

Folks, Here's my current roadmap for the transition to Gitlab. Feedback and help are welcome. In particular, it would be nice if people would volunteer to update the documentation, I'm no good at that. - Make gitlab.winehq.org the canonical git repository, setup mirroring to source.winehq.org. - Refine behavior of mailing list gateway, possibly send output to separate list. - Update Wiki documentation (SubmittingPatches etc.), define signoff policy, document the new workflow. - Implement bot to automatically assign reviewers based on the MAINTAINERS file. - Make testbot work directly from MRs instead of mailing list patches. Integrate test reports with Gitlab CI. - Import Gitlab sources and build our own version, to enable making changes to the code. - Work with respective maintainers to plan if/when/how to move other Wine projects to Gitlab: - tools (done) - website (done) - wine-gecko (done) - wine-mono - wine-staging - vkd3d - appdb - bugzilla - fontforge - Require MRs for all patches, retire the source.winehq.org/patches tracker (direct links to old patches must of course be preserved). - Retire the gitweb browser, redirect to Gitlab. - Investigate moving the Wiki to Gitlab. - Investigate switching to the Gitlab bug tracker. -- Alexandre Julliard julliard(a)winehq.org

5 5

[PATCH v3 0/4] MR233: win32u: Partially move raw input APIs.
by Zebediah Figura (＠zfigura) 17 Jun '22

17 Jun '22

-- v3: win32u: Move NtUserGetRawInputBuffer from user32. win32u: Move NtUserGetRawInputData from user32. user32: Correctly fill the RAWINPUT structure on WoW64. user32/tests: Add some more tests related to the RAWINPUT structure. https://gitlab.winehq.org/wine/wine/-/merge_requests/233

4 7

Re: [PATCH v2 0/5] MR257: d3dx: Add support for ID3DX10ThreadPump parameter in D3DX10CreateTexture* functions - approved
by Alexandre Julliard (＠julliard) 17 Jun '22

17 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/257

1 0

Re: [PATCH v2 0/1] MR249: include: Emit CFI directives when building on Mac with gcc. - approved
by Alexandre Julliard (＠julliard) 17 Jun '22

17 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/249

1 0

Re: [PATCH v2 0/1] MR262: winhttp: Release object on allocation failure. - approved
by Alexandre Julliard (＠julliard) 17 Jun '22

17 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/262

1 0

Re: [PATCH v3 0/5] MR261: win32u: nonclient conversion - approved
by Alexandre Julliard (＠julliard) 17 Jun '22

17 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/261

1 0

Re: [PATCH v3 0/1] MR229: comctl32: Always paint SS_BITMAP static control background with WM_CTLCOLORSTATIC brush. - approved
by Alexandre Julliard (＠julliard) 17 Jun '22

17 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/229

1 0

[PATCH v4 0/1] MR252: shell32/tests: Add tests for Program Manager name sanitization.
by Alex Henrie (＠alexhenrie) 17 Jun '22

17 Jun '22

Split from https://gitlab.winehq.org/wine/wine/-/merge_requests/23 -- v4: shell32/tests: Add tests for Program Manager name sanitization. https://gitlab.winehq.org/wine/wine/-/merge_requests/252

2 2

[PATCH 0/5] MR257: d3dx: Add support for ID3DX10ThreadPump parameter in D3DX10CreateTexture* functions
by Piotr Caban (＠piotr) 17 Jun '22

17 Jun '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/257

3 7

[PATCH 0/1] MR268: riched20: Commit and repaint after the SetFont method is called.
by Jinoh Kang (＠iamahuman) 17 Jun '22

17 Jun '22

Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/268

3 2

[PATCH 0/1] MR267: riched20: Commit and repaint after changing TextFont properties.
by Jinoh Kang (＠iamahuman) 17 Jun '22

17 Jun '22

Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/267

3 2

[PATCH v3 0/1] MR252: shell32/tests: Add tests for Program Manager name sanitization.
by Alex Henrie (＠alexhenrie) 17 Jun '22

17 Jun '22

Split from https://gitlab.winehq.org/wine/wine/-/merge_requests/23 -- v3: shell32/tests: Add tests for Program Manager name sanitization. https://gitlab.winehq.org/wine/wine/-/merge_requests/252

3 3

[PATCH v2 0/4] MR233: win32u: Partially move raw input APIs.
by Zebediah Figura (＠zfigura) 17 Jun '22

17 Jun '22

-- v2: win32u: Move NtUserGetRawInputBuffer from user32. win32u: Move NtUserGetRawInputData from user32. user32: Correctly fill the RAWINPUT structure on WoW64. user32/tests: Add some more tests related to the RAWINPUT structure. https://gitlab.winehq.org/wine/wine/-/merge_requests/233

4 8

[PATCH v2 0/1] MR252: shell32/tests: Add tests for Program Manager name sanitization.
by Alex Henrie (＠alexhenrie) 17 Jun '22

17 Jun '22

Split from https://gitlab.winehq.org/wine/wine/-/merge_requests/23 -- v2: shell32/tests: Add tests for Program Manager name sanitization. https://gitlab.winehq.org/wine/wine/-/merge_requests/252

4 4

[PATCH 0/1] MR264: winex11.drv: Always call XSync() in destroy_whole_window() if there is client window.
by Paul Gofman (＠gofman) 17 Jun '22

17 Jun '22

XSync() is already called when there is a whole window only. When GL child window is deleted shortly after resize X error (request code 12, which is X_ConfigureWindow) may happen. XConfigureWindow is called for child window from sync_client_position. Then, destroy_whole_window() doesn't hit XSync() path because there is no whole_window. client_window is destroyed from opengl.c:release_gl_drawable() independently (that may happen right from X11DRV_DestroyWindow() or later if the drawable is still referenced elsewhere) and that may happen before XConfigureWindow request is processed. We can't flush in release_gl_drawable() as window data is unavailable at that moment and it is unknown which display to flush. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/264

2 1

[tools 1/2] patches: <span> must have an end tag.
by Francois Gouget 17 Jun '22

17 Jun '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- <span/> is not allowed, at least according to the Mozilla documentation: | Tag omission: None, both the starting and ending tag are mandatory. --- patches/update | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/patches/update b/patches/update index 494d2e1575..f3eac9eeac 100755 --- a/patches/update +++ b/patches/update @@ -344,8 +344,8 @@ foreach my $file (sort { $patches{$b}->{"order"} <=> $patches{$a}->{"order"} } k foreach my $child (@{$patch->{"children"}}) { printf INDEX "<tr class=\"%s\ $file.reply\" id=\"%s\" style=\"display: none;\" onclick=\"toggle_display('$file.reply')\">" . - "<td colspan=\"2\" /><td colspan=\"2\" class=\"reply author\"><span class=\"indent\" />%s</td> " . - "<td class=\"reply author\"><span class=\"indent\" /><a href=\"data/%s\">%s</a></td> " . + "<td colspan=\"2\" /><td colspan=\"2\" class=\"reply author\"><span class=\"indent\">%s</span></td> " . + "<td class=\"reply author\"><span class=\"indent\"><a href=\"data/%s\">%s</a></span></td> " . "<td colspan=\"4\" /></tr>\n", $row & 1 ? "odd" : "even", $child->{"id"}, escapeHTML($child->{"author"}), $child->{"id"}, escapeHTML($child->{"subject"}); } -- 2.30.2

1 1

[tools] testbot/WineSendLog: Remove an unused variable.
by Francois Gouget 17 Jun '22

17 Jun '22

The failure count has been split between $NewCount and $OldCount. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineSendLog.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index a2f2369b63..0848bf596c 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -179,7 +179,7 @@ sub SendLog($) # my ($JobInfo, @New, %BugDescriptions); - my ($NewCount, $FailCount, $OldCount, $BotCount, $NotRun) = (0, 0, 0, 0, 0); + my ($NewCount, $OldCount, $BotCount, $NotRun) = (0, 0, 0, 0); my $FileType = "test executable"; my $Failures = CreateFailures($Job); -- 2.30.2

1 0

[tools] testbot: Fix the default Failures sort order.
by Francois Gouget 17 Jun '22

17 Jun '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Initially the last criterion was the failure id but then I decided sorting by the bug description made more sense. Unfortunately I forgot to switch the comparison from integers to strings. --- testbot/lib/WineTestBot/Failures.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/Failures.pm b/testbot/lib/WineTestBot/Failures.pm index f0f78b6ff7..906205119c 100644 --- a/testbot/lib/WineTestBot/Failures.pm +++ b/testbot/lib/WineTestBot/Failures.pm @@ -53,7 +53,7 @@ sub Compare($$) my $Cmp = ($StatusOrders{$self->GetColValue("BugStatus")} || 0) <=> ($StatusOrders{$B->GetColValue("BugStatus")} || 0) || $self->GetColValue("ErrorGroup") cmp $B->GetColValue("ErrorGroup") || $self->GetColValue("TestUnit") cmp $B->GetColValue("TestUnit") || - $self->GetColValue("BugDescription") <=> $B->GetColValue("BugDescription"); + $self->GetColValue("BugDescription") cmp $B->GetColValue("BugDescription"); return $Cmp } -- 2.30.2

1 0

[tools] testbot/web: Preserve the bug status when changing a deleted failure bug id.
by Francois Gouget 17 Jun '22

17 Jun '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/FailureDetails.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/web/FailureDetails.pl b/testbot/web/FailureDetails.pl index c510d8d480..f39af5ac91 100644 --- a/testbot/web/FailureDetails.pl +++ b/testbot/web/FailureDetails.pl @@ -202,7 +202,7 @@ sub OnAction($$) } if (($self->{Item}->BugId || "") ne $self->GetParam("BugId")) { - $self->{Item}->BugStatus(""); + $self->{Item}->BugStatus("") if ($self->{Item}->BugStatus ne "deleted"); $self->{Item}->BugDescription(""); } return undef if (!$self->Save()); -- 2.30.2

1 0

[tools] testbot/LibvirtTool: Add a trailing linefeed to a log message.
by Francois Gouget 17 Jun '22

17 Jun '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/LibvirtTool.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index a9622de7d8..d087b3583e 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -461,7 +461,7 @@ sub Monitor() # does not exist. But only revert can tell. For this reason, let revert # announce when the VM works again. return 1 if (ChangeStatus("offline", "off", "done")); - LogMsg("Switching $VMKey from offline to off after ". PrettyElapsed($Start) ."."); + LogMsg("Switching $VMKey from offline to off after ". PrettyElapsed($Start) .".\n"); return 0; } -- 2.30.2

1 0

[tools] testbot: Empty configuration regexps match any configuration.
by Francois Gouget 17 Jun '22

17 Jun '22

Unlike the failure regexps which must not be empty. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/LogUtils.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index e25ea3ae27..4c643b9e09 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -1387,7 +1387,7 @@ sub MatchLogFailures($$) { # Ignore failures that don't apply to this configuration my $ConfigRegExp = $Failure->ConfigRegExp; - my $Match = eval { $ConfigRegExp and $ConfigName =~ /$ConfigRegExp/ }; + my $Match = eval { !$ConfigRegExp or $ConfigName =~ /$ConfigRegExp/ }; next if (!$Match); my $UnitFailures = $FailureTree{$Failure->ErrorGroup}->{$Failure->TestUnit} ||= []; -- 2.30.2

1 0

[tools] testbot/LogUtils: Make the compilation error detection stricter.
by Francois Gouget 17 Jun '22

17 Jun '22

This avoids some false positives in the d3d WINE_ERR() messages. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Specifically this type of messages in the Wine log which are simple WINE_ERR() messages and should thus be ignored by the TestBot: 059c:err:d3d:wined3d_debug_callback 0016A650: "0:43(1): error: error index must be >= 0". 059c:fixme:d3d_shader:print_glsl_info_log 0:43(1): error: error index must be >= 0 --- testbot/lib/WineTestBot/LogUtils.pm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 4c643b9e09..9e73b5f63d 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -102,7 +102,10 @@ sub GetLogLineCategory($) $Line =~ /^error: patch failed:/ or $Line =~ /^error: corrupt patch / or # Build errors - $Line =~ /: error: / or + # Note that just ': error:' leads to false positives. So assume the + # error location (source filename + line number) contains no space. + $Line =~ /^[^ ]+: fatal error: / or # nonexistent include file + $Line =~ /^[^ ]+: error: / or $Line =~ /: undefined reference to `/ or $Line =~ /^make: [*]{3} No rule to make target / or $Line =~ /^Makefile:\d+: recipe for target .* failed$/ or -- 2.30.2

1 0

[PATCH v2 0/5] MR261: win32u: nonclient conversion
by Jacek Caban (＠jacek) 17 Jun '22

17 Jun '22

-- v2: win32u: Move NtUserGetTitleBarInfo implementation from user32. win32u: Move more WM_SYSCOMMAND implementation from user32. win32u: Move WM_NCLBUTTONDBLCLK and WM_LBUTTONDBLCLK implementation from user32. win32u: Move WM_SETCURSOR implementation from user32. win32u: Move NtUserDrawCaptionTemp implementation from user32. https://gitlab.winehq.org/wine/wine/-/merge_requests/261

4 8

[PATCH 0/6] MR261: win32u: nonclient conversion
by Jacek Caban (＠jacek) 17 Jun '22

17 Jun '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/261

4 12

[PATCH v4 0/4] MR231: SetWindowPos() parent window exposure fixes (#53153)
by Jinoh Kang (＠iamahuman) 17 Jun '22

17 Jun '22

Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> -- v4: server: Don't invalidate the newly exposed child region on the parent if it doesn't clip children. server: Redraw composited window child when its z-order changes. server: Correctly expose composited parent window and its child on position change. user32/tests: Test for window exposure behaviours. https://gitlab.winehq.org/wine/wine/-/merge_requests/231

3 12

[PATCH v2 0/5] MR237: winegstreamer: Implement Resampler and ColorConvert MF transforms.
by Rémi Bernon (＠rbernon) 17 Jun '22

17 Jun '22

I don't think this will cause any conflicts with the other MR, as long as the `wg_sample` API doesn't change. -- v2: winegstreamer: Implement ColorConvertDMO transform. winegstreamer: Register stub ColorConvertDMO transform. winegstreamer: Remove unnecessary WineAudioConverter transform. winegstreamer: Implement ResamplerMediaObject transform. winegstreamer: Register stub ResamplerMediaObject transform. https://gitlab.winehq.org/wine/wine/-/merge_requests/237

4 12

[PATCH 0/1] MR262: winhttp: Release object on allocation failure.
by Hans Leidekker (＠hans) 17 Jun '22

17 Jun '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/262

2 1

[tools] testbot/Engine: Prevent recursion into ScheduleJobs().
by Francois Gouget 17 Jun '22

17 Jun '22

Recursion may happen through the ScheduleJobs() -> VM::Run() -> VMStatusChange() -> ScheduleJobs() chain. It can cause multiple revert processes to run on the same VM, or even a revert process to run at the same time as a task. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This issue is caused by the patch to process notifications originating from the Engine (9b0894ed386f). What's strange is I'm not seeing this issue in my test environment. --- testbot/lib/WineTestBot/Engine/Scheduler.pm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/testbot/lib/WineTestBot/Engine/Scheduler.pm b/testbot/lib/WineTestBot/Engine/Scheduler.pm index b9304c1c8f..bba7e6a2cc 100644 --- a/testbot/lib/WineTestBot/Engine/Scheduler.pm +++ b/testbot/lib/WineTestBot/Engine/Scheduler.pm @@ -946,6 +946,7 @@ sub _PowerOffDirtyVMs($) } } +my $_InScheduleJobs; my $_LastTaskCounts = ""; =pod @@ -1004,6 +1005,11 @@ kept on standby so they are ready when their turn comes. sub ScheduleJobs() { + # Don't let Engine notifications (specifically VMStatusChange) cause + # recursion into ScheduleJobs(). + return if ($_InScheduleJobs); + $_InScheduleJobs = 1; + my $Sched = _CheckAndClassifyVMs(); my $NeededVMs = _ScheduleTasks($Sched); _RevertVMs($Sched, $NeededVMs); @@ -1053,6 +1059,8 @@ sub ScheduleJobs() $Timeout = 600; } AddEvent("ScheduleJobs", $Timeout, 0, \&ScheduleJobs); + + $_InScheduleJobs = undef; } -- 2.30.2

1 0

[PATCH v3 0/4] MR231: SetWindowPos() parent window exposure fixes (#53153)
by Jinoh Kang (＠iamahuman) 17 Jun '22

17 Jun '22

Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> -- v3: server: Don't invalidate the newly exposed child region on the parent with WS_CLIPCHILDREN. server: Redraw composited window child on its z-order change on SetWindowPos(). server: Correctly expose composited parent window on SetWindowPos(). user32/tests: Test for parent window exposure by SetWindowPos(). https://gitlab.winehq.org/wine/wine/-/merge_requests/231

3 8

[PATCH v2 0/1] MR229: comctl32: Always paint SS_BITMAP static control background with WM_CTLCOLORSTATIC brush.
by Jinoh Kang (＠iamahuman) 17 Jun '22

17 Jun '22

This is consistent with the behaviour of other static control styles. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> -- v2: comctl32: Always paint SS_BITMAP static control background with WM_CTLCOLORSTATIC brush. https://gitlab.winehq.org/wine/wine/-/merge_requests/229

3 2

Re: [PATCH v2 0/2] MR258: win32u: Move menu tracking implementation from user32. - approved
by Alexandre Julliard (＠julliard) 16 Jun '22

16 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/258

1 0

[PATCH v2 0/1] MR254: winex11.drv: Change order register_extension for WGL_ARB_pixel_format_float.
by Sebastián Aedo (＠saedo) 16 Jun '22

16 Jun '22

Some processes use very naive string matching when detecting extensions, for example, Cossacks III checks if the extension is "contained" in the current extension is checking, causing that `WGL_ARB_pixel_format` is contained in `WGL_ARB_pixel_format_float`, but it ends up with the flag deactivated because they aren't the same. This makes it consistent with the behavior on winemac.drv/opengl.c too. -- v2: winex11.drv: Change order register_extension for WGL_ARB_pixel_format_float. https://gitlab.winehq.org/wine/wine/-/merge_requests/254

3 2

Re: [PATCH v5 0/1] MR134: ntdll: Don't hard-code the battery and AC adapter names on Linux - approved
by Alexandre Julliard (＠julliard) 16 Jun '22

16 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/134

1 0

Re: [PATCH v7 0/1] MR167: d3drm: IDirect3DRMMeshBuilder3::Load support loading from resource - approved
by Alexandre Julliard (＠julliard) 16 Jun '22

16 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/167

1 0

[PATCH 0/7] MR212: d3d11: Create dxgi resource objects for textures and buffers.
by Nikolay Sivov (＠nsivov) 16 Jun '22

16 Jun '22

Surface interface is only supported for 1D and 2D texture, but all objects are represented as resources. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/212

6 28

[PATCH] po: Update Finnish translation.
by Lauri Kenttä 16 Jun '22

16 Jun '22

Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> --- po/fi.po | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/po/fi.po b/po/fi.po index 79d5cd82706..9db084ccc45 100644 --- a/po/fi.po +++ b/po/fi.po @@ -3984,10 +3984,8 @@ msgid "Cannot modify non-writable property '|'" msgstr "Kirjoitussuojattua ominaisuutta '|' ei voi muokata" #: dlls/jscript/jscript.rc:79 -#, fuzzy -#| msgid "'this' is not a Map object" msgid "'this' is not a | object" -msgstr "'this' ei ole Map-objekti" +msgstr "'this' ei ole |-objekti" #: dlls/jscript/jscript.rc:80 msgid "Property cannot have both accessors and a value" -- 2.36.1

1 0

[PATCH 0/3] MR260: ntdll: Improve xstate validation in NtGetContextThread()
by Paul Gofman (＠gofman) 16 Jun '22

16 Jun '22

Supposed to fix SCP: Secret Laboratory intermittent crash at main menu. The first two patches make the existing validation also work for other thread context query (as context_from_server called through get_thread_context() doesn't do that). The last patch adds xstate alignment validation with corresponding test. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/260

2 3

[PATCH 0/5] MR255: d3d11: Fix reporting of some format caps.
by Zebediah Figura (＠zfigura) 16 Jun '22

16 Jun '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/255

5 11

[PATCH v2 1/4] httpapi/tests: Move sleep statement.
by Julian Klemann 16 Jun '22

16 Jun '22

The mentioned bug randomly occurred after some subsequent patches, so the sleep should happen before GetOverlappedResult is called. Signed-off-by: Julian Klemann <jklemann(a)codeweavers.com> --- v2: No change. --- dlls/httpapi/tests/httpapi.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/httpapi/tests/httpapi.c b/dlls/httpapi/tests/httpapi.c index be1d31c12ad..9d344f26d02 100644 --- a/dlls/httpapi/tests/httpapi.c +++ b/dlls/httpapi/tests/httpapi.c @@ -228,10 +228,6 @@ static void test_v1_server(void) ret = send(s, req_text, strlen(req_text), 0); ok(ret == strlen(req_text), "send() returned %d.\n", ret); - ret = GetOverlappedResult(queue, &ovl, &ret_size, TRUE); - ok(ret, "Got error %lu.\n", GetLastError()); - ok(ret_size > sizeof(*req), "Got size %lu.\n", ret_size); - /* Various versions of Windows (observed on 64-bit Windows 8 and Windows 10 * version 1507, but probably affecting others) suffer from a bug where the * kernel will report success before completely filling the buffer or @@ -239,6 +235,10 @@ static void test_v1_server(void) * around this. */ Sleep(100); + ret = GetOverlappedResult(queue, &ovl, &ret_size, TRUE); + ok(ret, "Got error %lu.\n", GetLastError()); + ok(ret_size > sizeof(*req), "Got size %lu.\n", ret_size); + ok(!req->Flags, "Got flags %#lx.\n", req->Flags); ok(req->ConnectionId, "Expected nonzero connection ID.\n"); ok(req->RequestId, "Expected nonzero connection ID.\n"); -- 2.36.1

2 7

Re: [PATCH v2 0/1] MR246: Allow renaming a file/directory to a different case of itself
by Gabriel Ivăncescu (＠insn) 16 Jun '22

16 Jun '22

1 0

Re: [PATCH v2 0/1] MR246: Allow renaming a file/directory to a different case of itself
by Huw Davies (＠huw) 16 Jun '22

16 Jun '22

Since this has been around for a while and been through several iterations, could you add links to the previous email threads so I can refresh my memory? -- https://gitlab.winehq.org/wine/wine/-/merge_requests/246#note_2201

1 0

[PATCH v3 0/1] MR256: ntdll: Do not open directory file when setting the same directory path.
by Paul Gofman (＠gofman) 16 Jun '22

16 Jun '22

Fixes The Rising of The Shield Hero: Relieve the Animation hangs on start (and maybe something else with ENIGMA protector). The protector implements virtual file system which hotpatches a lot of file related functions, in particular, NtOpenFile(). When NtOpenFile() is called from RtlSetCurrentDirectory_U() with peb lock held the hotpatcher takes its own lock and that can deadlock with other threads performing file / path operations ending up in get_full_path_helper() which also takes PEB lock. Once the hotpatcher is initialized the game only sets "." or the same full path as current and may do that rather often. It seems that reopening the file handle for the same directory is redundant anyway, so probably makes sense to just avoid that part. -- v3: ntdll: Do not open directory file when setting the same directory path. https://gitlab.winehq.org/wine/wine/-/merge_requests/256

2 2

[PATCH v2 0/1] MR256: ntdll: Do not open directory file when setting the same directory path.
by Paul Gofman (＠gofman) 16 Jun '22

16 Jun '22

Fixes The Rising of The Shield Hero: Relieve the Animation hangs on start (and maybe something else with ENIGMA protector). The protector implements virtual file system which hotpatches a lot of file related functions, in particular, NtOpenFile(). When NtOpenFile() is called from RtlSetCurrentDirectory_U() with peb lock held the hotpatcher takes its own lock and that can deadlock with other threads performing file / path operations ending up in get_full_path_helper() which also takes PEB lock. Once the hotpatcher is initialized the game only sets "." or the same full path as current and may do that rather often. It seems that reopening the file handle for the same directory is redundant anyway, so probably makes sense to just avoid that part. -- v2: ntdll: Do not open directory file when setting the same directory path. https://gitlab.winehq.org/wine/wine/-/merge_requests/256

2 1

[tools v2 1/2] testbot/web: Automatically refresh the failure bug information.
by Francois Gouget 16 Jun '22

16 Jun '22

Automatically refresh the failure bug information when the bug id is modified. Also trigger a refresh when a failure is undeleted. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48912 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- v2: No change, only part 2/2 changed. This ensures failures have an initial bug status and description as soon as they are added. Later refreshes happen when UpdateFailures is called by cron. --- testbot/bin/Engine.pl | 39 ++++++++++++++++++++++++ testbot/lib/WineTestBot/Engine/Notify.pm | 20 +++++++++++- testbot/lib/WineTestBot/Failures.pm | 31 +++++++++++++++++++ testbot/web/FailureDetails.pl | 1 - testbot/web/FailuresList.pl | 5 ++- 5 files changed, 91 insertions(+), 5 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 88852730e..29dce183b 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -49,6 +49,7 @@ use WineTestBot::Config; use WineTestBot::Engine::Events; use WineTestBot::Engine::Notify; use WineTestBot::Engine::Scheduler; +use WineTestBot::Failures; use WineTestBot::Jobs; use WineTestBot::Log; use WineTestBot::Patches; @@ -548,6 +549,43 @@ sub HandleGetScreenshot($) return "1" . $ImageBytes; } +sub HandleUpdateFailure($) +{ + my ($FailureId) = @_; + + # Validate FailureId + if ($FailureId !~ /^(\d+)$/) + { + LogMsg "Invalid failure id\n"; + return "0Invalid Failure Id"; + } + $FailureId = $1; + + if (!CreateFailures()->GetItem($FailureId)) + { + LogMsg "Unknown Failure $FailureId\n"; + return "0Unknown Failure $FailureId"; + } + + my $Pid = fork; + if (!defined $Pid) + { + LogMsg "Unable to fork for UpdateFailures.pl: $!\n"; + } + elsif (!$Pid) + { + # Clean up the child environment + CloseAllDBBackEnds(); + WineTestBot::Log::SetupRedirects(); + + exec("$BinDir/UpdateFailures.pl --log-only $FailureId") or + LogMsg "Unable to exec ${ProjectName}UpdateFailures.pl: $!\n"; + exit(1); + } + + return "1"; +} + my %Handlers=( "getscreenshot" => \&HandleGetScreenshot, "jobcontrol" => \&HandleJobControl, @@ -558,6 +596,7 @@ my %Handlers=( "vmstatuschange" => \&HandleVMStatusChange, "winepatchmlsubmission" => \&HandleWinePatchMLSubmission, "winepatchwebsubmission" => \&HandleWinePatchWebSubmission, + "updatefailure" => \&HandleUpdateFailure, ); sub HandleClientCmd(@) diff --git a/testbot/lib/WineTestBot/Engine/Notify.pm b/testbot/lib/WineTestBot/Engine/Notify.pm index 82221c9ed..9c1802984 100644 --- a/testbot/lib/WineTestBot/Engine/Notify.pm +++ b/testbot/lib/WineTestBot/Engine/Notify.pm @@ -31,7 +31,8 @@ use Exporter 'import'; our $RunningInEngine; our @EXPORT = qw(Shutdown PingEngine JobStatusChange JobControl RescheduleJobs VMStatusChange - WinePatchMLSubmission WinePatchWebSubmission GetScreenshot); + WinePatchMLSubmission WinePatchWebSubmission + UpdateFailure GetScreenshot); our @EXPORT_OK = qw($RunningInEngine); use Socket; @@ -194,6 +195,23 @@ sub WinePatchWebSubmission() return substr($Reply, 1); } +sub UpdateFailure($) +{ + my ($FailureId) = @_; + + my $Reply = SendCmdReceiveReply("updatefailure $FailureId\n"); + if (length($Reply) < 1) + { + return "The Engine did not acknowledge the UpdateFailure command"; + } + if (substr($Reply, 0, 1) eq "1") + { + return (undef, substr($Reply, 1)); + } + + return (substr($Reply, 1), undef); +} + sub GetScreenshot($) { my ($VMName) = @_; diff --git a/testbot/lib/WineTestBot/Failures.pm b/testbot/lib/WineTestBot/Failures.pm index b37b9e046..a9118f64b 100644 --- a/testbot/lib/WineTestBot/Failures.pm +++ b/testbot/lib/WineTestBot/Failures.pm @@ -40,6 +40,8 @@ TaskFailure objects. use WineTestBot::WineTestBotObjects; our @ISA = qw(WineTestBot::WineTestBotItem); +use WineTestBot::Engine::Notify; + sub Compare($$) { @@ -55,6 +57,35 @@ sub Compare($$) return $Cmp } +sub BugId($;$) +{ + my ($self, $NewBugId) = @_; + + my $CurrentBugId = $self->SUPER::BugId; + return $CurrentBugId if (!defined $NewBugId); + + if (!defined $CurrentBugId or $NewBugId ne $CurrentBugId) + { + $self->{OldBugId} = $CurrentBugId if (!defined $self->{OldBugId}); + $self->SUPER::BugId($NewBugId); + } + + return $NewBugId; +} + +sub OnSaved($) +{ + my ($self) = @_; + + $self->SUPER::OnSaved(); + if ((defined $self->{OldBugId} and $self->{OldBugId} ne $self->BugId) or + !$self->BugStatus or !$self->BugDescription) + { + UpdateFailure($self->Id); + } + delete $self->{OldBugId}; +} + sub Validate($) { my ($self) = @_; diff --git a/testbot/web/FailureDetails.pl b/testbot/web/FailureDetails.pl index 7cab1d2a6..c05146448 100644 --- a/testbot/web/FailureDetails.pl +++ b/testbot/web/FailureDetails.pl @@ -105,7 +105,6 @@ sub OnAction($$) $self->{Item}->BugDescription(""); } return undef if (!$self->Save()); - # FIXME Notify the TestBot Engine so it updates the bug information exit($self->RedirectToParent()); } return $self->SUPER::OnAction($Action); diff --git a/testbot/web/FailuresList.pl b/testbot/web/FailuresList.pl index f2608dc45..8825fea69 100644 --- a/testbot/web/FailuresList.pl +++ b/testbot/web/FailuresList.pl @@ -129,9 +129,9 @@ sub OnItemAction($$$) return 1 if ($Action eq "Restore" and $Failure->BugStatus ne "deleted"); my $NewStatus = $Action eq "Delete" ? "deleted" : - $Action eq "Restore" ? "unknown" : + $Action eq "Restore" ? "" : undef; - if ($NewStatus) + if (defined $NewStatus) { $Failure->BugStatus($NewStatus); my ($_ErrProperty, $ErrMessage) = $Failure->Save(); @@ -141,7 +141,6 @@ sub OnItemAction($$$) $self->{EnclosingPage}->SetError(undef, $ErrMessage); return 0; } - # FIXME Notify the TestBot Engine so it updates the bug information return 1; } } -- 2.30.2

1 1

[tools] testbot/web: Add failure links to full logs on the job details page.
by Francois Gouget 16 Jun '22

16 Jun '22

Long logs can make it hard to find the lines for a given failure. So add an index pointing to the first line of a given failure (identified by its bug id). Also add links to the first and last failure. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/JobDetails.pl | 38 ++++++++++++++++++++++++++++++++------ 1 file changed, 32 insertions(+), 6 deletions(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index efdd4d9b0..6d3f13cd0 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -404,9 +404,9 @@ sub GetFailureLinks($$) } @$FailureIds); } -sub GenerateFullLog($$$$) +sub GenerateFullLog($$$$$) { - my ($self, $Dir, $LogName, $HideLog) = @_; + my ($self, $Dir, $LogId, $LogName, $HideLog) = @_; my $LogInfo = LoadLogErrors("$Dir/$LogName"); if (defined $LogInfo->{BadLog}) @@ -426,7 +426,7 @@ sub GenerateFullLog($$$$) print "<pre class='log-note'>Some WineTest results could not be used to detect new errors: $LogInfo->{BadRef}</pre>\n"; } - my (%ErrCategory, %ErrFailures); + my (%ErrCategory, %ErrFailures, %LogBugs); foreach my $GroupName (@{$LogInfo->{ErrGroupNames}}) { my $Group = $LogInfo->{ErrGroups}->{$GroupName}; @@ -437,8 +437,31 @@ sub GenerateFullLog($$$$) { $ErrCategory{$LineNo} = $Group->{IsNew}->[$ErrIndex] ? "fullnew" : "error"; $ErrFailures{$LineNo} = $Group->{Failures}->{$ErrIndex}; + + if ($ErrFailures{$LineNo}) + { + foreach my $FailureId (@{$ErrFailures{$LineNo}}) + { + my $Failure = $self->{Failures}->GetItem($FailureId); + $LogBugs{$Failure->BugId} ||= [$LineNo, $Failure->BugDescription]; + } + } } + $LogBugs{-1} ||= [$LineNo, ""]; + $LogBugs{9999999} = [$LineNo, ""]; + } + } + if (%LogBugs) + { + print "<p>Failures index:"; + foreach my $Label (sort { $a <=> $b } keys %LogBugs) + { + my ($LineNo, $Title) = @{$LogBugs{$Label}}; + $Label = $Label < 0 ? "First" : $Label == 9999999 ? "Last" : $Label; + $Title = " title='". $self->escapeHTML($Title) ."'" if ($Title); + print " <a href='#k${LogId}L$LineNo'$Title>$Label</a>" } + print "</p>\n"; } my $GetCategory = $LogName =~ /\.report$/ ? \&GetReportLineCategory : @@ -463,7 +486,7 @@ sub GenerateFullLog($$$$) my $Category = $ErrCategory{$LineNo} || $GetCategory->($Line); if ($Category ne "none") { - $Html =~ s~^(.*\S)\s*\r?$~<span class='log-$Category'>$1</span>~; + $Html =~ s~^(.*\S)\s*\r?$~<span id='k${LogId}L$LineNo' class='log-$Category'>$1</span>~; } if ($ErrFailures{$LineNo}) { @@ -487,7 +510,10 @@ sub GenerateFullLog($$$$) # Extra groups don't have a line number next if ($Group->{LineNo}); - print "<div class='LogDllName'>$GroupName</div>\n"; + # Extra errors don't have line numbers but there should be few of them. + # So just create one id for them all so the shortcut to the first / last + # error has somewhere to go even if it's not 100% accurate. + print "<div id='k${LogId}L0' class='LogDllName'>$GroupName</div>\n"; for my $ErrIndex (0..$#{$Group->{Errors}}) { if ($IsEmpty) @@ -592,7 +618,7 @@ EOF $Url = $self->escapeHTML($Url); my $HideLog = $Action eq "Hide" ? " ondblclick='HideLog(event, \"$Url\")'" : ""; - my $LogIsEmpty = $self->GenerateFullLog($TaskDir, $MoreInfo->{Full}, $HideLog); + my $LogIsEmpty = $self->GenerateFullLog($TaskDir, $StepTask->GetKey(), $MoreInfo->{Full}, $HideLog); if ($LogIsEmpty) { if ($StepTask->Status eq "canceled") -- 2.30.2

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel