June 2022 - Wine-Devel - list.winehq.org

[tools resend] testbot/orm: Make the Itemref columns read-only.

by Francois Gouget

The columns used by an Itemref should be modified through the Itemref property to ensure that they remain in sync with it. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Same as before, just out of the patch series since the other two are deferred. --- testbot/lib/ObjectModel/CGI/FormPage.pm | 3 +- testbot/lib/ObjectModel/Item.pm | 8 ++++++ .../ObjectModel/ItemrefPropertyDescriptor.pm | 28 ++++++++++++++++++- testbot/lib/ObjectModel/PropertyDescriptor.pm | 7 +++++ testbot/lib/WineTestBot/CGI/Sessions.pm | 1 + testbot/lib/WineTestBot/Jobs.pm | 1 + testbot/lib/WineTestBot/PendingPatches.pm | 1 + testbot/lib/WineTestBot/StepsTasks.pm | 1 + testbot/lib/WineTestBot/Tasks.pm | 1 + testbot/lib/WineTestBot/UserRoles.pm | 1 + 10 files changed, 50 insertions(+), 2 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index 224bf3687..6f3449b5b 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -198,7 +198,8 @@ sub DisplayProperty($$) # type the appropriate key value would also be cumbersome so this is # currently not supported. But they can be displayed. $PropertyDescriptor->GetClass() eq "Itemref" ? "ro" : - # All other properties can displayed, + $PropertyDescriptor->GetIsReadOnly() ? "ro" : + # All other properties can be displayed, !$self->{RW} ? "ro" : # and even edited if in read-write mode... $PropertyDescriptor->GetClass() ne "Basic" ? "rw" : diff --git a/testbot/lib/ObjectModel/Item.pm b/testbot/lib/ObjectModel/Item.pm index b07b76066..11d09be67 100644 --- a/testbot/lib/ObjectModel/Item.pm +++ b/testbot/lib/ObjectModel/Item.pm @@ -270,6 +270,10 @@ sub AUTOLOAD { if (@_) { + if ($PropertyDescriptor->GetIsReadOnly()) + { + die "$PropertyName is read-only"; + } my $Value = shift; if ($self->ValuesDiffer($Value, $self->{ColValues}{$PropertyName})) { @@ -283,6 +287,10 @@ sub AUTOLOAD { if (@_) { + if ($PropertyDescriptor->GetIsReadOnly()) + { + die "$PropertyName is read-only"; + } my $Item = shift; if (!$Item and !$self->{Itemrefs}{$PropertyName}) { diff --git a/testbot/lib/ObjectModel/ItemrefPropertyDescriptor.pm b/testbot/lib/ObjectModel/ItemrefPropertyDescriptor.pm index 6895e801a..171d00a9e 100644 --- a/testbot/lib/ObjectModel/ItemrefPropertyDescriptor.pm +++ b/testbot/lib/ObjectModel/ItemrefPropertyDescriptor.pm @@ -28,7 +28,7 @@ ObjectModel::ItemrefPropertyDescriptor - A property referencing an ObjectModel:: use Exporter 'import'; use ObjectModel::PropertyDescriptor; our @ISA = qw(ObjectModel::PropertyDescriptor); -our @EXPORT = qw(CreateItemrefPropertyDescriptor); +our @EXPORT = qw(CreateItemrefPropertyDescriptor SetupItemrefColumns); sub _initialize($$$) { @@ -78,4 +78,30 @@ sub CreateItemrefPropertyDescriptor($$$$$) return ObjectModel::ItemrefPropertyDescriptor->new($Name, $DisplayName, !1, $IsRequired, $Creator, $RefColNames); } +sub SetupItemrefColumns($) +{ + my ($PropertyDescriptors) = @_; + + my (@Itemrefs, %Properties); + foreach my $PropertyDescriptor (@$PropertyDescriptors) + { + $Properties{$PropertyDescriptor->GetName()} = $PropertyDescriptor; + if ($PropertyDescriptor->GetClass() eq "Itemref") + { + push @Itemrefs, $PropertyDescriptor; + } + } + + # Mark the Itemref columns as read-only so they are only modified + # through the Itemref. + foreach my $Itemref (@Itemrefs) + { + foreach my $ColName (@{$Itemref->GetRefColNames()}) + { + my $ColDescriptor = $Properties{$ColName}; + $ColDescriptor->{IsReadOnly} = 1; + } + } +} + 1; diff --git a/testbot/lib/ObjectModel/PropertyDescriptor.pm b/testbot/lib/ObjectModel/PropertyDescriptor.pm index f13a4b248..2f9411aa2 100644 --- a/testbot/lib/ObjectModel/PropertyDescriptor.pm +++ b/testbot/lib/ObjectModel/PropertyDescriptor.pm @@ -86,6 +86,13 @@ sub GetIsRequired($) return $self->{IsRequired}; } +sub GetIsReadOnly($) +{ + my ($self) = @_; + + return $self->{IsReadOnly}; +} + sub GetClass($) { my ($self) = @_; diff --git a/testbot/lib/WineTestBot/CGI/Sessions.pm b/testbot/lib/WineTestBot/CGI/Sessions.pm index 5ca84e734..8594cfcdf 100644 --- a/testbot/lib/WineTestBot/CGI/Sessions.pm +++ b/testbot/lib/WineTestBot/CGI/Sessions.pm @@ -75,6 +75,7 @@ my @PropertyDescriptors = ( CreateItemrefPropertyDescriptor("User", "User", 1, \&CreateUsers, ["UserName"]), CreateBasicPropertyDescriptor("Permanent", "Permanent session", !1, 1, "B", 1), ); +SetupItemrefColumns(\@PropertyDescriptors); =pod =over 12 diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index 140bd572b..7f15a9c57 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -524,6 +524,7 @@ my @PropertyDescriptors = ( CreateItemrefPropertyDescriptor("Patch", "Submitted from patch", !1, \&WineTestBot::Patches::CreatePatches, ["PatchId"]), CreateDetailrefPropertyDescriptor("Steps", "Steps", \&CreateSteps), ); +SetupItemrefColumns(\@PropertyDescriptors); SetDetailrefKeyPrefix("Job", @PropertyDescriptors); =pod diff --git a/testbot/lib/WineTestBot/PendingPatches.pm b/testbot/lib/WineTestBot/PendingPatches.pm index f4768b823..32a6af44f 100644 --- a/testbot/lib/WineTestBot/PendingPatches.pm +++ b/testbot/lib/WineTestBot/PendingPatches.pm @@ -68,6 +68,7 @@ my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("PatchId", "Patch id", !1, 1, "N", 10), CreateItemrefPropertyDescriptor("Patch", "Submitted via patch", 1, \&CreatePatches, ["PatchId"]), ); +SetupItemrefColumns(\@PropertyDescriptors); my @FlatPropertyDescriptors = ( CreateBasicPropertyDescriptor("PendingPatchSetEMail", "EMail of series author", 1, 1, "A", 40), CreateBasicPropertyDescriptor("PendingPatchSetVersion", "Expected version of the series", 1, 1, "N", 2), diff --git a/testbot/lib/WineTestBot/StepsTasks.pm b/testbot/lib/WineTestBot/StepsTasks.pm index 2533c6a01..87146b277 100644 --- a/testbot/lib/WineTestBot/StepsTasks.pm +++ b/testbot/lib/WineTestBot/StepsTasks.pm @@ -192,6 +192,7 @@ my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("Ended", "Ended", !1, !1, "DT", 19), CreateBasicPropertyDescriptor("TestFailures", "Failures", !1, !1, "N", 6), ); +SetupItemrefColumns(\@PropertyDescriptors); sub CreateStepsTasks(;$$) { diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index 5c5813cd9..0360e4ebc 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -363,6 +363,7 @@ my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("Ended", "Ended", !1, !1, "DT", 19), CreateBasicPropertyDescriptor("TestFailures", "Failures", !1, !1, "N", 6), ); +SetupItemrefColumns(\@PropertyDescriptors); my @FlatPropertyDescriptors = ( CreateBasicPropertyDescriptor("JobId", "Job id", 1, 1, "N", 10), CreateBasicPropertyDescriptor("StepNo", "Step no", 1, 1, "N", 2), diff --git a/testbot/lib/WineTestBot/UserRoles.pm b/testbot/lib/WineTestBot/UserRoles.pm index 90c4332c3..900f41fc5 100644 --- a/testbot/lib/WineTestBot/UserRoles.pm +++ b/testbot/lib/WineTestBot/UserRoles.pm @@ -61,6 +61,7 @@ my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("RoleName", "Role", 1, 1, "A", 20), CreateItemrefPropertyDescriptor("Role", "Role", 1, \&CreateRoles, ["RoleName"]), ); +SetupItemrefColumns(\@PropertyDescriptors); my @FlatPropertyDescriptors = ( CreateBasicPropertyDescriptor("UserName", "Username", 1, 1, "A", 40), @PropertyDescriptors -- 2.30.2

June 13, 2022

Re: [PATCH 1/5] mfplat/buffer: Fix size for IMC2/IMC4 buffers with odd height.

by Giovanni Mascellani

Hi, Il 13/06/22 15:42, Marvin ha scritto: > === debian11 (32 bit report) === > > Report validation errors: > mfplat:mfplat prints too much data (38251 bytes) > > === debian11 (32 bit Hindi:India report) === > > mfplat: > Unhandled exception: assertion failed in 32-bit code (0xf7fa8559). > > === debian11 (32 bit WoW report) === > > Report validation errors: > mfplat:mfplat prints too much data (38238 bytes) I don't think these failures are related to my patches. They appear even with a trivial empty patch. Giovanni.

June 13, 2022

Re: HLSL offsetting

by Matteo Bruni

Nothing to say about the last two replies (i.e. I generally agree), just a couple of side-comments. On Fri, Jun 10, 2022 at 11:13 PM Zebediah Figura <zfigura(a)codeweavers.com> wrote: > > On 6/10/22 14:13, Francisco Casas wrote: > > So, as Matteo summarized, we are between 2 main options: > > > > a) Multiple register offsets. > > b) Component offsets with structured dereference info. > > > > How I see it, (a) changes hlsl_deref to: > > > > --- > > enum register_set { > > HLSL_REGSET_OBJ, > > HLSL_REGSET_NUM, > > /* ... add more as needed, to cover for all SMs. */ > > > > HLSL_REGSET_COUNT, > > }; > > > > struct hlsl_deref > > { > > struct hlsl_ir_var *var; > > struct hlsl_src offset[HLSL_REGSET_COUNT]; > > }; > > --- > > > > Also, the types' reg_size becomes reg_size[HLSL_REGSET_COUNT], and so do > > field offsets. Many functions have to receive an additional register_set > > argument or an array of offsets instead of a single offset. > > > > > > On the other hand, the version of (b) I imagine changes hlsl_deref to: > > --- > > struct hlsl_deref > > { > > struct hlsl_ir_var *var; > > unsigned int route_len; > > struct hlsl_src *route; > > }; > > --- > > Where route is intended to be a variable size array of component > > offsets. > > I was envisioning something more explicit, but this is simpler, so my > guess is that this is what we want. This is roughly what I was thinking too, although we probably want to find a better name than "route" :D > > It would make sense to remove reg_size from the types and also > > field offsets. > > Yes, absolutely. > > > Functions that cannot receive structs or arrays may > > receive a "flattened" component offset that can then be translated into > > a route, other functions would require the route as an array. > > Not immediately sure what functions you're thinking of, but I imagine > things like hlsl_compute_component_offset() would now have to translate > the offset into an array. > > > At this point I can see the benefits of (b) over (a), but also, several > > complications that may arise (you have pointed most of them): > > - We will have to translate many things that are already in terms of > > register offsets into component offsets. > > How many things, though? As far as I can see it's: > > - copy-prop > > - copy splitting > > - hlsl_offset_from_deref() [which is part of the point of the whole > exercise] > > That's pretty much it. > > > - We will have to move all optimization passes (like vectorization) that > > require register offsets to their specific SMxIR, RA too. > > I think we want to do RA per backend anyway. (It kind of already is > per-backend, in a very awkward way.) Yes indeed, it really is. That's one of the places where, I think, we could potentially gain in clarity by making the per-backend stuff more explicit. If we were going for register offsets all the way. > Vectorization is the main downside but it's possible that we wanted that > to be per-backend too. And this is where it might turn out to be helpful to share the same fundamental structure between backends / SMxIR. Again, sharing stuff bottom-up, or after the fact, is certainly fine to me. > > - We will have to do the proper translation to register offsets, on each > > SMxIR level, and probably some sort of constant folding for them. > > Sure, but in a sense this is the point. The translation is > backend-specific (what with alignment and register sets and all) and we > should structure things accordingly. > > hlsl_offset_from_deref() will need constant folding in a sense, but > it'll be a pretty restricted form thereof. > > > - Once we start supporting non-constant offsets, we may also want to > > introduce a common subexpression elimination pass for the registers > > offsets expressions that will arise (currently, the creation of common > > expressions is mainly avoided by the recursive structure of the split > > passes). > > What cases are you thinking of that would want CSE? The most obvious case I can think of is when some non-trivial variable is dynamically accessed multiple times inside a loop at the same, or similar, offset (e.g. accessing multiple fields of the same element of an array of structures). > > Solely because I have spent a considerable amount of time implementing > > option (a) (and some time giving up on implementing component offsets as > > a single hlsl_src, instead of a path) I am rushing (a) to see how the > > patch turns out in the end, before trying (b). > > > > I so think that (a) can be cleansed one step at the time. Even if the > > register sizes and offsets depend on the SM, we can write an interface > > to abstract the rest of the code of using them directly, and gradually > > migrate the code that does to use this interface instead. > > > > > > But so far, yeah, I am being convinced that (b) is better, however more > > difficult. > > If we do (b), I suggest we try to do it in separate steps, with some > > "scaffolding code": > > > > - Add the component offset route to hlsl_deref without deleting the > > register offset. > > - Create a simple pass that initializes the register offset field using > > the route in all the hlsl_derefs. > > - Translate all the parse code first to work with the routes, and apply > > the pass just after parsing. > > - Translate some more compilation passes and move the translation pass > > forward. > > - Repeat until all the passes that can be written in terms of component > > offsets are. > > - Write the SMxIR·s and the SMxIR translations. > > - Only then, remove the the register offset from hlsl_deref and the > > translation pass from the codebase. > > > > > > Otherwise we may end up writing a very big patch that may take too long > > to complete (!). > > Ech, I think that trying to do two things at once is going to be more > confusing than the alternative. I also don't think there's *that* much > code that we'd have to change, i.e. a monolithic patch wouldn't be that bad. > > For that matter, I'd be happy to try writing those patches myself :-) > > ἔρρωσθε, > Zeb

June 13, 2022

Re: [PATCH 4/5] mfplat/tests: Test interaction between Lock2D() and LockRect().

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=116850 Your paranoid android. === w7u_adm (32 bit report) === mfplat: 0868:mfplat: unhandled exception c0000005 at 6F0B7D1C === w8 (32 bit report) === mfplat: mfplat.c:6480: Test failed: Unexpected length 0 instead of 1228800. mfplat.c:6497: Test failed: Unexpected hr 0x80070057. mfplat.c:6514: Test failed: Unexpected hr 0x80070057. mfplat.c:6586: Test failed: Unexpected leading byte. mfplat.c:6588: Test failed: Unexpected hr 0x80070057. === w8adm (32 bit report) === mfplat: mfplat.c:6480: Test failed: Unexpected length 0 instead of 1228800. mfplat.c:6497: Test failed: Unexpected hr 0x80070057. mfplat.c:6514: Test failed: Unexpected hr 0x80070057. mfplat.c:6586: Test failed: Unexpected leading byte. mfplat.c:6588: Test failed: Unexpected hr 0x80070057. === w864 (32 bit report) === mfplat: mfplat.c:6480: Test failed: Unexpected length 0 instead of 1228800. mfplat.c:6497: Test failed: Unexpected hr 0x80070057. mfplat.c:6514: Test failed: Unexpected hr 0x80070057. mfplat.c:6586: Test failed: Unexpected leading byte. mfplat.c:6588: Test failed: Unexpected hr 0x80070057. === w1064v1507 (32 bit report) === mfplat: mfplat.c:6480: Test failed: Unexpected length 0 instead of 1228800. mfplat.c:6497: Test failed: Unexpected hr 0x80070057. mfplat.c:6514: Test failed: Unexpected hr 0x80070057. mfplat.c:6586: Test failed: Unexpected leading byte. mfplat.c:6588: Test failed: Unexpected hr 0x80070057. === w864 (64 bit report) === mfplat: mfplat.c:6480: Test failed: Unexpected length 0 instead of 1228800. mfplat.c:6497: Test failed: Unexpected hr 0x80070057. mfplat.c:6514: Test failed: Unexpected hr 0x80070057. mfplat.c:6586: Test failed: Unexpected leading byte. mfplat.c:6588: Test failed: Unexpected hr 0x80070057. === w1064v1507 (64 bit report) === mfplat: mfplat.c:6480: Test failed: Unexpected length 0 instead of 1228800. mfplat.c:6497: Test failed: Unexpected hr 0x80070057. mfplat.c:6514: Test failed: Unexpected hr 0x80070057. mfplat.c:6586: Test failed: Unexpected leading byte. mfplat.c:6588: Test failed: Unexpected hr 0x80070057. === debian11 (32 bit report) === Report validation errors: mfplat:mfplat prints too much data (41310 bytes) === debian11 (32 bit WoW report) === Report validation errors: mfplat:mfplat prints too much data (41338 bytes)

June 13, 2022

Re: [PATCH 3/5] mfplat/tests: Test interaction between Lock() and LockRect().

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=116849 Your paranoid android. === w7u_adm (32 bit report) === mfplat: 0868:mfplat: unhandled exception c0000005 at 6F0B7D1C === w8 (32 bit report) === mfplat: mfplat.c:6480: Test failed: Unexpected length 0 instead of 1228800. mfplat.c:6497: Test failed: Unexpected hr 0x80070057. mfplat.c:6514: Test failed: Unexpected hr 0x80070057. mfplat.c:6572: Test failed: Unexpected leading byte. mfplat.c:6574: Test failed: Unexpected hr 0x80070057. === w8adm (32 bit report) === mfplat: mfplat.c:6480: Test failed: Unexpected length 0 instead of 1228800. mfplat.c:6497: Test failed: Unexpected hr 0x80070057. mfplat.c:6514: Test failed: Unexpected hr 0x80070057. mfplat.c:6572: Test failed: Unexpected leading byte. mfplat.c:6574: Test failed: Unexpected hr 0x80070057. === w864 (32 bit report) === mfplat: mfplat.c:6480: Test failed: Unexpected length 0 instead of 1228800. mfplat.c:6497: Test failed: Unexpected hr 0x80070057. mfplat.c:6514: Test failed: Unexpected hr 0x80070057. mfplat.c:6572: Test failed: Unexpected leading byte. mfplat.c:6574: Test failed: Unexpected hr 0x80070057. === w1064v1507 (32 bit report) === mfplat: mfplat.c:6480: Test failed: Unexpected length 0 instead of 1228800. mfplat.c:6497: Test failed: Unexpected hr 0x80070057. mfplat.c:6514: Test failed: Unexpected hr 0x80070057. mfplat.c:6572: Test failed: Unexpected leading byte. mfplat.c:6574: Test failed: Unexpected hr 0x80070057. === w864 (64 bit report) === mfplat: mfplat.c:6480: Test failed: Unexpected length 0 instead of 1228800. mfplat.c:6497: Test failed: Unexpected hr 0x80070057. mfplat.c:6514: Test failed: Unexpected hr 0x80070057. mfplat.c:6572: Test failed: Unexpected leading byte. mfplat.c:6574: Test failed: Unexpected hr 0x80070057. === w1064v1507 (64 bit report) === mfplat: mfplat.c:6480: Test failed: Unexpected length 0 instead of 1228800. mfplat.c:6497: Test failed: Unexpected hr 0x80070057. mfplat.c:6514: Test failed: Unexpected hr 0x80070057. mfplat.c:6572: Test failed: Unexpected leading byte. mfplat.c:6574: Test failed: Unexpected hr 0x80070057. === debian11 (32 bit report) === Report validation errors: mfplat:mfplat prints too much data (41310 bytes) === debian11 (32 bit Hindi:India report) === mfplat: Unhandled exception: assertion failed in 32-bit code (0xf7f70559). === debian11 (32 bit WoW report) === Report validation errors: mfplat:mfplat prints too much data (38258 bytes)

June 13, 2022

Re: [PATCH 2/5] mfplat/buffer: Fix image copy function for IMC2/IMC4 buffers with odd height.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=116848 Your paranoid android. === w7u_adm (32 bit report) === mfplat: 0864:mfplat: unhandled exception c0000005 at 6F1C7D1C === w7u_el (32 bit report) === mfplat: 0868:mfplat: unhandled exception c0000005 at 72297D1C === debian11 (32 bit report) === Report validation errors: mfplat:mfplat prints too much data (36954 bytes) === debian11 (32 bit WoW report) === Report validation errors: mfplat:mfplat prints too much data (41318 bytes)

June 13, 2022

Re: [PATCH 5/5] mfplat/buffer: Redirect all Lock2D() implementations to Lock2DSize().

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=116851 Your paranoid android. === debian11 (32 bit report) === Report validation errors: mfplat:mfplat prints too much data (38279 bytes) === debian11 (32 bit WoW report) === Report validation errors: mfplat:mfplat prints too much data (41338 bytes)

June 13, 2022

Re: [PATCH 1/5] mfplat/buffer: Fix size for IMC2/IMC4 buffers with odd height.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=116847 Your paranoid android. === debian11 (32 bit report) === Report validation errors: mfplat:mfplat prints too much data (38251 bytes) === debian11 (32 bit Hindi:India report) === mfplat: Unhandled exception: assertion failed in 32-bit code (0xf7fa8559). === debian11 (32 bit WoW report) === Report validation errors: mfplat:mfplat prints too much data (38238 bytes)

June 13, 2022

Re: [PATCH v2 0/6] MR220: winegstreamer: Add zero-copy support to quartz_transform.

by Rémi Bernon

v2: Use a destroy callback, avoid putting logic in the unixlib entry points. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/220#note_1947

June 13, 2022

[PATCH 5/5] mfplat/buffer: Redirect all Lock2D() implementations to Lock2DSize().

by Giovanni Mascellani

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- dlls/mfplat/buffer.c | 114 +++++++------------------------------------ 1 file changed, 18 insertions(+), 96 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index a7ba306223d..2bf06469576 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -485,44 +485,14 @@ static ULONG WINAPI memory_2d_buffer_Release(IMF2DBuffer2 *iface) return IMFMediaBuffer_Release(&buffer->IMFMediaBuffer_iface); } -static HRESULT memory_2d_buffer_lock(struct buffer *buffer, BYTE **scanline0, LONG *pitch, - BYTE **buffer_start, DWORD *buffer_length) -{ - HRESULT hr = S_OK; - - if (buffer->_2d.linear_buffer) - hr = MF_E_UNEXPECTED; - else - { - ++buffer->_2d.locks; - *scanline0 = buffer->_2d.scanline0; - *pitch = buffer->_2d.pitch; - if (buffer_start) - *buffer_start = buffer->data; - if (buffer_length) - *buffer_length = buffer->max_length; - } - - return hr; -} - static HRESULT WINAPI memory_2d_buffer_Lock2D(IMF2DBuffer2 *iface, BYTE **scanline0, LONG *pitch) { - struct buffer *buffer = impl_from_IMF2DBuffer2(iface); - HRESULT hr; + DWORD buffer_length; + BYTE *buffer_start; TRACE("%p, %p, %p.\n", iface, scanline0, pitch); - if (!scanline0 || !pitch) - return E_POINTER; - - EnterCriticalSection(&buffer->cs); - - hr = memory_2d_buffer_lock(buffer, scanline0, pitch, NULL, NULL); - - LeaveCriticalSection(&buffer->cs); - - return hr; + return IMF2DBuffer2_Lock2DSize(iface, MF2DBuffer_LockFlags_ReadWrite, scanline0, pitch, &buffer_start, &buffer_length); } static HRESULT WINAPI memory_2d_buffer_Unlock2D(IMF2DBuffer2 *iface) @@ -616,7 +586,7 @@ static HRESULT WINAPI memory_2d_buffer_Lock2DSize(IMF2DBuffer2 *iface, MF2DBuffe LONG *pitch, BYTE **buffer_start, DWORD *buffer_length) { struct buffer *buffer = impl_from_IMF2DBuffer2(iface); - HRESULT hr; + HRESULT hr = S_OK; TRACE("%p, %#x, %p, %p, %p, %p.\n", iface, flags, scanline0, pitch, buffer_start, buffer_length); @@ -625,7 +595,18 @@ static HRESULT WINAPI memory_2d_buffer_Lock2DSize(IMF2DBuffer2 *iface, MF2DBuffe EnterCriticalSection(&buffer->cs); - hr = memory_2d_buffer_lock(buffer, scanline0, pitch, buffer_start, buffer_length); + if (buffer->_2d.linear_buffer) + hr = MF_E_UNEXPECTED; + else + { + ++buffer->_2d.locks; + *scanline0 = buffer->_2d.scanline0; + *pitch = buffer->_2d.pitch; + if (buffer_start) + *buffer_start = buffer->data; + if (buffer_length) + *buffer_length = buffer->max_length; + } LeaveCriticalSection(&buffer->cs); @@ -655,37 +636,6 @@ static const IMF2DBuffer2Vtbl memory_2d_buffer_vtbl = memory_2d_buffer_Copy2DTo, }; -static HRESULT WINAPI d3d9_surface_buffer_Lock2D(IMF2DBuffer2 *iface, BYTE **scanline0, LONG *pitch) -{ - struct buffer *buffer = impl_from_IMF2DBuffer2(iface); - HRESULT hr = S_OK; - - TRACE("%p, %p, %p.\n", iface, scanline0, pitch); - - if (!scanline0 || !pitch) - return E_POINTER; - - EnterCriticalSection(&buffer->cs); - - if (buffer->_2d.linear_buffer) - hr = MF_E_UNEXPECTED; - else if (!buffer->_2d.locks) - { - hr = IDirect3DSurface9_LockRect(buffer->d3d9_surface.surface, &buffer->d3d9_surface.rect, NULL, 0); - } - - if (SUCCEEDED(hr)) - { - buffer->_2d.locks++; - *scanline0 = buffer->d3d9_surface.rect.pBits; - *pitch = buffer->d3d9_surface.rect.Pitch; - } - - LeaveCriticalSection(&buffer->cs); - - return hr; -} - static HRESULT WINAPI d3d9_surface_buffer_Unlock2D(IMF2DBuffer2 *iface) { struct buffer *buffer = impl_from_IMF2DBuffer2(iface); @@ -781,7 +731,7 @@ static const IMF2DBuffer2Vtbl d3d9_surface_buffer_vtbl = memory_2d_buffer_QueryInterface, memory_2d_buffer_AddRef, memory_2d_buffer_Release, - d3d9_surface_buffer_Lock2D, + memory_2d_buffer_Lock2D, d3d9_surface_buffer_Unlock2D, d3d9_surface_buffer_GetScanline0AndPitch, memory_2d_buffer_IsContiguousFormat, @@ -1030,34 +980,6 @@ static HRESULT WINAPI dxgi_surface_buffer_SetCurrentLength(IMFMediaBuffer *iface return S_OK; } -static HRESULT WINAPI dxgi_surface_buffer_Lock2D(IMF2DBuffer2 *iface, BYTE **scanline0, LONG *pitch) -{ - struct buffer *buffer = impl_from_IMF2DBuffer2(iface); - HRESULT hr = S_OK; - - TRACE("%p, %p, %p.\n", iface, scanline0, pitch); - - if (!scanline0 || !pitch) - return E_POINTER; - - EnterCriticalSection(&buffer->cs); - - if (buffer->_2d.linear_buffer) - hr = MF_E_UNEXPECTED; - else if (!buffer->_2d.locks++) - hr = dxgi_surface_buffer_map(buffer); - - if (SUCCEEDED(hr)) - { - *scanline0 = buffer->dxgi_surface.map_desc.pData; - *pitch = buffer->dxgi_surface.map_desc.RowPitch; - } - - LeaveCriticalSection(&buffer->cs); - - return hr; -} - static HRESULT WINAPI dxgi_surface_buffer_Unlock2D(IMF2DBuffer2 *iface) { struct buffer *buffer = impl_from_IMF2DBuffer2(iface); @@ -1236,7 +1158,7 @@ static const IMF2DBuffer2Vtbl dxgi_surface_buffer_vtbl = memory_2d_buffer_QueryInterface, memory_2d_buffer_AddRef, memory_2d_buffer_Release, - dxgi_surface_buffer_Lock2D, + memory_2d_buffer_Lock2D, dxgi_surface_buffer_Unlock2D, dxgi_surface_buffer_GetScanline0AndPitch, memory_2d_buffer_IsContiguousFormat, -- 2.36.1

June 13, 2022