wine-devel

wine-devel@winehq.org

3 participants
84400 discussions

Re: [PATCH v2 0/6] MR147: d2d1: Implement bitmap mapping methods. - approved
by Alexandre Julliard (＠julliard) 30 May '22

30 May '22

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

1 0

Re: [PATCH v2 0/1] MR148: ntoskrnl: Add ExNotifyCallback stub. - approved
by Alexandre Julliard (＠julliard) 30 May '22

30 May '22

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

1 0

Re: [PATCH v2 0/1] MR153: include: Mark IPersistFolder3::InitializeEx's optional parameters as [unique]. - approved
by Alexandre Julliard (＠julliard) 30 May '22

30 May '22

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

1 0

Re: [PATCH v3 0/1] MR152: include: Make IShellItem::BindToHandler's pbc parameter as [unique]. - approved
by Alexandre Julliard (＠julliard) 30 May '22

30 May '22

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

1 0

Re: [PATCH v2 0/1] MR150: win32u: Create a dummy bitmap for display device contexts. - approved
by Alexandre Julliard (＠julliard) 30 May '22

30 May '22

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

1 0

[PATCH 0/1] MR155: ntdll: Fix reading state Information from IOSB.
by Jinoh Kang (＠iamahuman) 30 May '22

30 May '22

Enforce proper atomic update so that other threads do not read stale data from IO_STATUS_BLOCK. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/155

2 1

[PATCH 1/3] jscript: Don't allow starting script using state from uninitialized.
by Gabriel Ivăncescu 30 May '22

30 May '22

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/jscript.c | 2 +- dlls/jscript/tests/jscript.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 8cf141d..d6028e6 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -824,7 +824,7 @@ static HRESULT WINAPI JScript_SetScriptState(IActiveScript *iface, SCRIPTSTATE s switch(ss) { case SCRIPTSTATE_STARTED: case SCRIPTSTATE_CONNECTED: /* FIXME */ - if(This->ctx->state == SCRIPTSTATE_CLOSED) + if(This->ctx->state == SCRIPTSTATE_UNINITIALIZED || This->ctx->state == SCRIPTSTATE_CLOSED) return E_UNEXPECTED; exec_queued_code(This); diff --git a/dlls/jscript/tests/jscript.c b/dlls/jscript/tests/jscript.c index 8c985e5..8723541 100644 --- a/dlls/jscript/tests/jscript.c +++ b/dlls/jscript/tests/jscript.c @@ -863,6 +863,12 @@ static void test_jscript_uninitializing(void) hres = IActiveScript_SetScriptState(script, SCRIPTSTATE_UNINITIALIZED); ok(hres == S_OK, "SetScriptState(SCRIPTSTATE_UNINITIALIZED) failed: %08lx\n", hres); + hres = IActiveScript_SetScriptState(script, SCRIPTSTATE_STARTED); + ok(hres == E_UNEXPECTED, "SetScriptState(SCRIPTSTATE_STARTED) returned: %08lx\n", hres); + + hres = IActiveScript_SetScriptState(script, SCRIPTSTATE_CONNECTED); + ok(hres == E_UNEXPECTED, "SetScriptState(SCRIPTSTATE_CONNECTED) returned: %08lx\n", hres); + SET_EXPECT(GetLCID); SET_EXPECT(OnStateChange_INITIALIZED); hres = IActiveScript_SetScriptSite(script, &ActiveScriptSite); -- 2.34.1

2 4

[tools] testbot: Fix the type of inherited auto-increment columns.
by Francois Gouget 30 May '22

30 May '22

Some objects, such as jobs, use a database-generated auto-increment integer as their primary key. However objects that 'inherit' such primary keys, such as Steps, do not. So the corresponding property descriptor should be a regular integer. Otherwise the DBIBackend will try to fetch a unique id that does not exist. Fortunately this issue has so far been masked by the 'master columns' mechanism. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Records.pm | 2 +- testbot/lib/WineTestBot/Steps.pm | 2 +- testbot/lib/WineTestBot/Tasks.pm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/lib/WineTestBot/Records.pm b/testbot/lib/WineTestBot/Records.pm index fd8e574ea..6002d1c2f 100644 --- a/testbot/lib/WineTestBot/Records.pm +++ b/testbot/lib/WineTestBot/Records.pm @@ -83,7 +83,7 @@ my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("Value", "Value", !1, !1, "A", 64), ); my @FlatPropertyDescriptors = ( - CreateBasicPropertyDescriptor("RecordGroupId", "Group id", 1, 1, "S", 10), + CreateBasicPropertyDescriptor("RecordGroupId", "Group id", 1, 1, "N", 10), @PropertyDescriptors ); diff --git a/testbot/lib/WineTestBot/Steps.pm b/testbot/lib/WineTestBot/Steps.pm index 0f65d631c..860dc4920 100644 --- a/testbot/lib/WineTestBot/Steps.pm +++ b/testbot/lib/WineTestBot/Steps.pm @@ -247,7 +247,7 @@ my @PropertyDescriptors = ( ); SetDetailrefKeyPrefix("Step", @PropertyDescriptors); my @FlatPropertyDescriptors = ( - CreateBasicPropertyDescriptor("JobId", "Job id", 1, 1, "S", 10), + CreateBasicPropertyDescriptor("JobId", "Job id", 1, 1, "N", 10), @PropertyDescriptors ); diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index 5cc2cc667..50ce9604a 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -368,7 +368,7 @@ my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("TestFailures", "Failures", !1, !1, "N", 6), ); my @FlatPropertyDescriptors = ( - CreateBasicPropertyDescriptor("JobId", "Job id", 1, 1, "S", 10), + CreateBasicPropertyDescriptor("JobId", "Job id", 1, 1, "N", 10), CreateBasicPropertyDescriptor("StepNo", "Step no", 1, 1, "N", 2), @PropertyDescriptors ); -- 2.30.2

1 0

[tools] testbot/orm: Add documentation to the database backend.
by Francois Gouget 30 May '22

30 May '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/DBIBackEnd.pm | 107 ++++++++++++++++++++++++++ 1 file changed, 107 insertions(+) diff --git a/testbot/lib/ObjectModel/DBIBackEnd.pm b/testbot/lib/ObjectModel/DBIBackEnd.pm index dc527d465..94e4be6b7 100644 --- a/testbot/lib/ObjectModel/DBIBackEnd.pm +++ b/testbot/lib/ObjectModel/DBIBackEnd.pm @@ -63,6 +63,17 @@ sub GetDb($) return $self->{Db}; } +=pod +=over 12 + +=item C<ToDb()> + +Convert the property value to a format suitable for the database. +This is only needed for boolean and timestamp properties. + +=back +=cut + sub ToDb($$$) { my ($self, $Value, $PropertyDescriptor) = @_; @@ -101,6 +112,16 @@ sub ToDb($$$) return $Value; } +=pod +=over 12 + +=item C<FromDb()> + +Convert the database values to a format suitable for Perl. See ToDb(). + +=back +=cut + sub FromDb($$$) { my ($self, $Value, $PropertyDescriptor) = @_; @@ -132,6 +153,18 @@ sub FromDb($$$) return $Value; } +=pod +=over 12 + +=item C<BuildKeyWhere()> + +Augments the specified WHERE clause with statements to match the key columns. +It is up to the caller to then append the corresponding key components to the +query's data array. + +=back +=cut + sub BuildKeyWhere($$$) { my ($self, $PropertyDescriptors, $Where) = @_; @@ -154,6 +187,17 @@ sub BuildKeyWhere($$$) return $Where; } +=pod +=over 12 + +=item C<BuildFieldList()> + +Build the comma-separated SELECT list of columns to load from the database. +Note that only the non-master columns are loaded. + +=back +=cut + sub BuildFieldList($$) { my ($self, $PropertyDescriptors) = @_; @@ -277,6 +321,19 @@ sub GetFilterWhere($$$) die "unsupported '$Filter->{Type}' filter type"; } +=pod +=over 12 + +=item C<LoadCollection()> + +Loads the collection from the corresponding database table, filtering it on +both the master columns and the collection's filter if any. + +Note that only the non-master columns are loaded (see BuildFieldList()). + +=back +=cut + sub LoadCollection($$) { my ($self, $Collection) = @_; @@ -346,6 +403,8 @@ By design this method will not check if the Item is already present in the Collection scope. Such checks belong in the higher levels. This method will however put the Item in the Collection's scope. +Note that only the non-master columns are loaded (see BuildFieldList()). + =back =cut @@ -395,6 +454,17 @@ sub LoadItem($$$) return $Item; } +=pod +=over 12 + +=item C<BuildInsertStatement()> + +Builds the SQL statement for saving new Items to the database. +This can be reused multiple times when saving a collection. + +=back +=cut + sub BuildInsertStatement($$$$) { my ($self, $TableName, $PropertyDescriptors, $MasterColNames) = @_; @@ -432,6 +502,18 @@ sub BuildInsertStatement($$$$) return "INSERT INTO $TableName ($Fields) VALUES($PlaceHolders)"; } +=pod +=over 12 + +=item C<GetInsertData()> + +Builds a data array suitable for use with the SQL statement returned by +BuildInsertStatement() for the specified Item. This simply includes all +of the object's properties. + +=back +=cut + sub GetInsertData($$$) { my ($self, $MasterColValues, $Item) = @_; @@ -454,6 +536,17 @@ sub GetInsertData($$$) return \@Data; } +=pod +=over 12 + +=item C<BuildUpdateStatement()> + +Builds the SQL statement for saving *modified* Items to the database. +This can be reused multiple times when saving a collection. + +=back +=cut + sub BuildUpdateStatement($$$$) { my ($self, $TableName, $PropertyDescriptors, $MasterColNames) = @_; @@ -484,6 +577,20 @@ sub BuildUpdateStatement($$$$) return "UPDATE $TableName SET $Fields WHERE $Where"; } +=pod +=over 12 + +=item C<GetUpdateData()> + +Returns a data array suitable for use with the SQL statement returned by +BuildUpdateStatement() for the specified Item. It is composed of: +* The non-key properties for the SET part of the statement since only those + could have been modified. +* The key properties for the WHERE part of the statement. + +=back +=cut + sub GetUpdateData($$$) { my ($self, $MasterColValues, $Item) = @_; -- 2.30.2

1 0

[tools] testbot: Use GetSortedItems() to sort the Steps.
by Francois Gouget 30 May '22

30 May '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Jobs.pm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index e4d76d356..617222233 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -218,8 +218,7 @@ sub UpdateStatus($) my %Has; my $Steps = $self->Steps->Clone(); - my @SortedSteps = sort { $a->No <=> $b->No } @{$Steps->GetItems()}; - foreach my $Step (@SortedSteps) + foreach my $Step (@{$Steps->GetSortedItems()}) { my $Skip; if ($Step->PreviousNo) @@ -419,8 +418,7 @@ sub Restart($) } my $Steps = $self->Steps; - my @SortedSteps = sort { $a->No <=> $b->No } @{$Steps->GetItems()}; - foreach my $Step (@SortedSteps) + foreach my $Step (@{$Steps->GetSortedItems()}) { my $Tasks = $Step->Tasks; foreach my $Task (@{$Tasks->GetItems()}) -- 2.30.2

1 0

Jump to page:

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