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

[PATCH] programs/start: remove workaround for /exec without console
by Eric Pouech April 13, 2022

April 13, 2022

rather use inheritange of SHELL_NO_WINDOW pseudo console in this case Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- programs/start/start.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/programs/start/start.c b/programs/start/start.c index 7252d54e046..835128ebf28 100644 --- a/programs/start/start.c +++ b/programs/start/start.c @@ -516,10 +516,7 @@ int __cdecl wmain (int argc, WCHAR *argv[]) break; } else if (is_option(argv[i], L"/exec")) { - /* If start.exe isn't attached to a console, force that no console would be created. - * This is needed when target process belongs to CUI subsystem. - */ - creation_flags = GetConsoleCP() == 0 ? DETACHED_PROCESS : 0; + creation_flags = 0; sei.fMask = SEE_MASK_NOCLOSEPROCESS | SEE_MASK_NO_CONSOLE | SEE_MASK_FLAG_NO_UI; i++; break;

2 1

[PATCH v2 1/7] jscript: Defer lookup to the actual locals for function statements.
by Gabriel Ivăncescu April 13, 2022

April 13, 2022

Functions declared as function statements have an associated local_ref and can be changed from within themselves by using their name (by literally changing the local variable), while function expressions can not. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/engine.c | 6 ++++-- dlls/mshtml/tests/es5.js | 28 ++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index c483f2a..73b9d86 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -587,7 +587,8 @@ static HRESULT detach_scope(script_ctx_t *ctx, call_frame_t *frame, scope_chain_ scope->obj = to_disp(scope->jsobj); } - if (scope == frame->base_scope && func->name && ctx->version >= SCRIPTLANGUAGEVERSION_ES5) + if (scope == frame->base_scope && func->name && func->local_ref == INVALID_LOCAL_REF && + ctx->version >= SCRIPTLANGUAGEVERSION_ES5) jsdisp_propput_name(scope->jsobj, func->name, jsval_obj(jsdisp_addref(frame->function_instance))); index = scope->scope_index; @@ -716,7 +717,8 @@ static HRESULT identifier_eval(script_ctx_t *ctx, BSTR identifier, exprval_t *re } /* ECMA-262 5.1 Edition 13 */ - if(func->name && ctx->version >= SCRIPTLANGUAGEVERSION_ES5 && !wcscmp(identifier, func->name)) { + if(func->name && ctx->version >= SCRIPTLANGUAGEVERSION_ES5 && + func->local_ref == INVALID_LOCAL_REF && !wcscmp(identifier, func->name)) { TRACE("returning a function from scope chain\n"); ret->type = EXPRVAL_JSVAL; ret->u.val = jsval_obj(jsdisp_addref(scope->frame->function_instance)); diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index e8ee713..43a6ce7 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -1691,6 +1691,34 @@ sync_test("functions scope", function() { func_outer(o); func(); ok(ret === o, "ret != o"); + + func_outer = function g() { + var g2 = g; + g = 10; + ok(g !== 10, "g was redefined to 10"); + g = function() {}; + ok(g === g2, "g !== g2: " + g); + } + func_outer(); + + function h() { + h = 1; + ok(h === 1, "h was not redefined: " + h); + } + h(); + ok(h === 1, "h = " + h); + + function h2() { return function() { h2 = 2; }; } + h2()(); + ok(h2 === 2, "h2 = " + h2); + + (function e() { + var f = e; + ok(typeof(f) === "function", "f = " + f); + (function () { e = 1; })(); + e = 2; + ok(f === e, "f != e"); + })(); }); sync_test("console", function() { -- 2.34.1

3 14

[tools] testbot/web: Use Collection::GetSortedItems() for collection blocks.
by Francois Gouget April 13, 2022

April 13, 2022

This adds default Compare() methods to the Jobs and Patches classes which allows removing all the CollectionBlock SortKeys() methods. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- A problem with SortKeys() is that it's passed the keys but not the other fields of the object. But sometimes we want to sort the objects based on non-key attributes, such as their status (scheduled for deletion or not), a start date, etc. Such sorting is much more practical if the function doing the comparison has access to all the fields. This can also have large performance implications however. Specifically it can cause a lot more property accesses and the AUTOLOAD-based ones ($Patch->Id) are really really slow. Namely, when sorting the patches 100 times I get the following results: * 21.94 s { $b->Id <=> $a->Id } -> using the Item::AUTOLOAD mechanism * 18.60 s still AUTOLOAD but with the substr+rindex patch (15% faster) * 11.03 s Item::Compare() !!! -> Much faster despite the PropertyDescriptors loop because it replaces the AUTOLOAD mechanism with direct hash accesses. * 6.03 s { $b->GetColValue("Id") <=> $a->GetColValue("Id") } * 2.47 s { $b->{ColValues}{Id} <=> $a->{ColValues}{Id} } -> The implementation I went with in this patch. * 0.82 s sort @{$Patches->GetKeys()} + GetItem() calls in the main loop So that part of generating the Wine-devel page went from ~8 ms to ~25 ms which I think is still acceptable. But 220 ms would have started being quite noticeable. Now sorting the 6000-ish Patches and Jobs is easy. Where it gets dicey is with the much larger Records (153591 entries) and RecordGroups tables (half as much) but that's mostly an issue for the Activity and Stats pages [1]. [1] Generating the Stats page for the full history takes ~150 seconds of CPU. That's embarassing. At least I expect it's not a widely used page so it shouldn't put too much load on the server. But still I've analysed what's going on and will try to send some patches to speed it up. Sorting is not the only or even the main issue but it does contribute. --- .../lib/ObjectModel/CGI/CollectionBlock.pm | 15 +++++----- testbot/lib/WineTestBot/Jobs.pm | 8 ++++++ testbot/lib/WineTestBot/Patches.pm | 8 ++++++ testbot/lib/WineTestBot/VMs.pm | 23 --------------- testbot/web/JobDetails.pl | 28 +++++++------------ testbot/web/Submit.pl | 13 ++++----- testbot/web/admin/VMsList.pl | 7 ----- testbot/web/index.pl | 15 ---------- 8 files changed, 39 insertions(+), 78 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index 23825d757..f124e646b 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -176,11 +176,11 @@ sub DisplayProperty($$) return $PropertyDescriptor->GetClass ne "Detailref"; } -sub SortKeys($$) +sub GetSortedItems($$) { - my ($self, $Keys) = @_; + my ($self, $Items) = @_; - return $Keys; + return $self->{Collection}->GetSortedItems($Items); } sub GetDisplayValue($$$) @@ -428,16 +428,15 @@ EOF print "<tbody>\n"; my $DetailsPage = $self->GetDetailsPage(); my $Row = 0; - my $Keys = $self->SortKeys($self->{Collection}->GetKeys()); - foreach my $Key (@$Keys) + my $Items = $self->{Collection}->GetSortedItems(); + foreach my $Item (@$Items) { my $Class = ($Row % 2) == 0 ? "even" : "odd"; - my $Item = $self->{Collection}->GetItem($Key); $self->GenerateDataRow($Item, $PropertyDescriptors, $DetailsPage, $Class, $ItemActions); $Row++; } - if (@$Keys == 0) + if (@$Items == 0) { print "<tr class='even'><td colspan='0'>No entries</td></tr>\n"; } @@ -445,7 +444,7 @@ EOF print "</tbody>\n"; print "</table>\n"; - if (@$ItemActions != 0 && @$Keys != 0) + if (@$ItemActions != 0 && @$Items != 0) { print <<EOF; <div class='CollectionBlockActions'> diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index a5ae13525..c082a36ab 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -111,6 +111,14 @@ sub InitializeNew($$) $self->SUPER::InitializeNew($Collection); } +sub Compare($$) +{ + my ($self, $B) = @_; + + # Hack: Use direct attribute access for performance + return $B->{ColValues}{Id} <=> $self->{ColValues}{Id}; # newest first by default +} + =pod =over 12 diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index 6891fa509..d2ac52e4e 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -58,6 +58,14 @@ sub InitializeNew($$) $self->SUPER::InitializeNew($Collection); } +sub Compare($$) +{ + my ($self, $B) = @_; + + # Hack: Use direct attribute access for performance + return $B->{ColValues}{Id} <=> $self->{ColValues}{Id}; # newest first by default +} + =pod =over 12 diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 2e475b722..f0c16d19e 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -809,29 +809,6 @@ sub CreateVMs(;$) \@PropertyDescriptors, $ScopeObject); } -sub SortKeysBySortOrder($$) -{ - my ($self, $Keys) = @_; - - # Sort retired and deleted VMs last - my %RoleOrders = ("retired" => 1, "deleted" => 2); - - my %SortOrder; - foreach my $Key (@$Keys) - { - my $Item = $self->GetItem($Key); - $SortOrder{$Key} = [$RoleOrders{$Item->Role} || 0, $Item->SortOrder, $Item->Name]; - } - - my @SortedKeys = sort { - my ($soa, $sob) = ($SortOrder{$a}, $SortOrder{$b}); - return @$soa[0] <=> @$sob[0] || - @$soa[1] <=> @$sob[1] || - @$soa[2] cmp @$sob[2]; - } @$Keys; - return \@SortedKeys; -} - sub FilterEnabledRole($) { my ($self) = @_; diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 5a2420436..da4ad7e96 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -56,14 +56,6 @@ sub DisplayProperty($$) $PropertyName eq "Ended" || $PropertyName eq "TestFailures"; } -sub SortKeys($$) -{ - my ($self, $Keys) = @_; - - my @SortedKeys = sort { $a <=> $b } @$Keys; - return \@SortedKeys; -} - # # Item cell generation @@ -361,10 +353,10 @@ sub InitMoreInfo($) my ($self) = @_; my $More = $self->{More} = {}; - my $Keys = $self->{CollectionBlock}->SortKeys($self->{Collection}->GetKeys()); - foreach my $Key (@$Keys) + my $SortedStepTasks = $self->{Collection}->GetSortedItems(); + foreach my $StepTask (@$SortedStepTasks) { - my $StepTask = $self->{Collection}->GetItem($Key); + my $Key = $StepTask->GetKey(); $More->{$Key}->{Screenshot} = $self->GetParam("s$Key"); my $Value = $self->GetParam("f$Key"); @@ -569,17 +561,17 @@ function HideLog(event, url) EOF print "<div class='Content'>\n"; - my $Keys = $self->{CollectionBlock}->SortKeys($self->{Collection}->GetKeys()); - my $KeyIndex = 0; - foreach my $Key (@$Keys) + my $Index = 0; + my $SortedStepTasks = $self->{Collection}->GetSortedItems(); + foreach my $StepTask (@$SortedStepTasks) { - my $StepTask = $self->{Collection}->GetItem($Key); + my $Key = $StepTask->GetKey(); my $TaskDir = $StepTask->GetTaskDir(); my $VM = $StepTask->VM; - my $Prev = $KeyIndex > 0 ? "k". $Keys->[$KeyIndex-1] : "PageTitle"; - my $Next = $KeyIndex + 1 < @$Keys ? "k". $Keys->[$KeyIndex+1] : "PageEnd"; - $KeyIndex++; + my $Prev = $Index > 0 ? "k". $SortedStepTasks->[$Index-1]->GetKey() : "PageTitle"; + my $Next = $Index + 1 < @$SortedStepTasks ? "k". $SortedStepTasks->[$Index+1]->GetKey() : "PageEnd"; + $Index++; print "<h2><a name='k", $self->escapeHTML($Key), "'></a>", $self->escapeHTML($StepTask->GetTitle()), " <span class='right'><a class='title' href='#$Prev'>↑</a><a class='title' href='#$Next'>↓</a></span></h2>\n"; diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 1ad94e4a4..8a1cc3c1d 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -474,10 +474,9 @@ sub _initialize($$$) $VMs->AddFilter("Type", ["win32", "win64", "wine"]); $VMs->FilterEnabledRole(); - my $SortedKeys = $VMs->SortKeysBySortOrder($VMs->GetKeys()); - foreach my $VMKey (@$SortedKeys) + my $SortedVMs = $VMs->GetSortedItems(); + foreach my $VM (@$SortedVMs) { - my $VM = $VMs->GetItem($VMKey); my ($ErrMessage, $Caps) = GetMissionCaps($VM->Missions, $VM->MissionCaps); LogMsg "$ErrMessage\n" if (defined $ErrMessage); @@ -492,7 +491,7 @@ sub _initialize($$$) } } - my $FieldBase = $self->escapeHTML($VMKey); + my $FieldBase = $self->escapeHTML($VM->GetKey()); foreach my $Build (sort @Builds) { my $VMRow = { @@ -752,10 +751,10 @@ sub GenerateFields($) print "<div class='ItemProperty'><label>Branch</label>", "<div class='ItemValue'>", "<select name='Branch' size='1'>"; - my @SortedKeys = sort { $a cmp $b } @{$Branches->GetKeys()}; - foreach my $Key (@SortedKeys) + my $SortedBranches = $Branches->GetSortedItems(); + foreach my $Branch (@$SortedBranches) { - my $Branch = $Branches->GetItem($Key); + my $Key = $Branch->GetKey(); print "<option value='", $self->escapeHTML($Key), "'"; if (defined $self->{Branch} and $Key eq $self->{Branch}) { diff --git a/testbot/web/admin/VMsList.pl b/testbot/web/admin/VMsList.pl index cfd5b91f5..f8162c63e 100644 --- a/testbot/web/admin/VMsList.pl +++ b/testbot/web/admin/VMsList.pl @@ -43,13 +43,6 @@ sub DisplayProperty($$) $PropertyName eq "Description"; } -sub SortKeys($$) -{ - my ($self, $Keys) = @_; - - return $self->{Collection}->SortKeysBySortOrder($Keys); -} - sub OnItemAction($$$) { my ($self, $VM, $Action) = @_; diff --git a/testbot/web/index.pl b/testbot/web/index.pl index 85f8df39f..478cb61c1 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -35,14 +35,6 @@ use WineTestBot::Utils; my $DAYS_DEFAULT = 4; -sub SortKeys($$) -{ - my ($self, $Keys) = @_; - - my @SortedKeys = sort { $b <=> $a } @$Keys; - return \@SortedKeys; -} - sub DisplayProperty($$) { my ($self, $PropertyDescriptor) = @_; @@ -188,13 +180,6 @@ use ObjectModel::CGI::CollectionBlock; our @ISA = qw(ObjectModel::CGI::CollectionBlock); -sub SortKeys($$) -{ - my ($self, $Keys) = @_; - - return $self->{Collection}->SortKeysBySortOrder($Keys); -} - sub DisplayProperty($$) { my ($self, $PropertyDescriptor) = @_; -- 2.30.2

1 0

[tools] testbot: Rename Collection::ItemExists() to HasItem().
by Francois Gouget April 13, 2022

April 13, 2022

Unlike ItemExists(), HasItem() does not imply that a database query is performed to check whether there is a row for that Item. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/Collection.pm | 16 ++++++++++------ testbot/lib/WineTestBot/Activity.pm | 8 ++++---- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/testbot/lib/ObjectModel/Collection.pm b/testbot/lib/ObjectModel/Collection.pm index 93a4502ef..bec5b1c5c 100644 --- a/testbot/lib/ObjectModel/Collection.pm +++ b/testbot/lib/ObjectModel/Collection.pm @@ -325,7 +325,7 @@ sub GetItem($$) my ($self, $Key) = @_; return undef if (!defined $Key); - return $self->{Items}{$Key} if (defined $self->{Items}{$Key}); + return $self->{Items}{$Key} if (exists $self->{Items}{$Key}); # The Item is not present in this Collection. # See if another in-scope Collection loaded it already. @@ -352,16 +352,20 @@ sub GetItem($$) =pod =over 12 -=item C<ItemExists()> +=item C<HasItem()> -Returns true if the specified item is present in the collection, that is if it -either matches the specified filter, or has been explicitly loaded through -GetItem(). +Returns true if the specified item is present in the collection. + +Note that unlike GetItem() this does not query the database to check if it +contains a matching item. Instead it only checks whether the Collection +already contains a matching Item, which would mean it was either loaded +because it either matches the Collection filter, or because of a GetItem() +call. =back =cut -sub ItemExists($$) +sub HasItem($$) { my ($self, $Key) = @_; diff --git a/testbot/lib/WineTestBot/Activity.pm b/testbot/lib/WineTestBot/Activity.pm index b82d265f8..53aff0582 100644 --- a/testbot/lib/WineTestBot/Activity.pm +++ b/testbot/lib/WineTestBot/Activity.pm @@ -159,7 +159,7 @@ sub GetActivity($;$) { # Ignore retired / deleted VMs my ($RecordName, $RecordHost) = split / /, $Record->Name; - next if (!$VMs->ItemExists($RecordName)); + next if (!$VMs->HasItem($RecordName)); my $StatusVMs = ( $Group->{statusvms} ||= {} ); my $VMStatus = ( $StatusVMs->{$RecordName} ||= {} ); @@ -202,7 +202,7 @@ sub GetActivity($;$) elsif ($Record->Type eq "vmresult") { my ($RecordName, $RecordHost) = split / /, $Record->Name; - next if (!$VMs->ItemExists($RecordName)); + next if (!$VMs->HasItem($RecordName)); my $ResultVMs = ( $Group->{resultvms} ||= {} ); my $VMResult = ( $ResultVMs->{$RecordName} ||= {} ); @@ -362,7 +362,7 @@ sub GetStatistics($;$) foreach my $Task (@{$Tasks->GetItems()}) { my $HostStats; - if ($VMs->ItemExists($Task->VM->GetKey())) + if ($VMs->HasItem($Task->VM->GetKey())) { my $Host = $Task->VM->GetHost(); $HostStats = ($HostsStats->{items}->{$Host} ||= {}); @@ -389,7 +389,7 @@ sub GetStatistics($;$) { my $ReportSize = -s $ReportFileName; _AddFullStat($GlobalStats, "$StepType.size", $ReportSize, undef, $Task); - if ($VMs->ItemExists($Task->VM->GetKey())) + if ($VMs->HasItem($Task->VM->GetKey())) { my $VMStats = ($VMsStats->{items}->{$Task->VM->Name} ||= {}); _AddFullStat($VMStats, "report.size", $ReportSize, undef, $Task); -- 2.30.2

1 0

[tools] testbot: Slightly speed up the Item property accesses.
by Francois Gouget April 13, 2022

April 13, 2022

substr()+rindex() is a bit faster than the regular expression for separating the class name from the property name. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- The gain is about 15%. There are much bigger gains to be had here but the way Collections and Items sometimes put properties in the MasterColNames and MasterColValues arrays gets in the way. I've come to the conclusion that MasterCol*s makes no sense and should go away. The question is whether that theory will be confirmed in practice. --- testbot/lib/ObjectModel/Item.pm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/testbot/lib/ObjectModel/Item.pm b/testbot/lib/ObjectModel/Item.pm index 9cec7b47b..c086aec40 100644 --- a/testbot/lib/ObjectModel/Item.pm +++ b/testbot/lib/ObjectModel/Item.pm @@ -228,9 +228,8 @@ sub AUTOLOAD { my $self = shift; - my $PropertyName = $ObjectModel::Item::AUTOLOAD; # strip fully-qualified portion - $PropertyName =~ s/.*://; + my $PropertyName = substr($ObjectModel::Item::AUTOLOAD, rindex($ObjectModel::Item::AUTOLOAD, ':') + 1); if ($PropertyName eq "DESTROY") { return; -- 2.30.2

1 0

[PATCH 10/10] user32: Get rid of __wine_set_pixel_format.
by Jacek Caban April 13, 2022

April 13, 2022

Use NtUserSetWindowPixelFormat in drivers instead. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/opengl32/make_opengl | 3 +-- dlls/user32/user32.spec | 8 -------- dlls/user32/win.c | 9 --------- dlls/wineandroid.drv/opengl.c | 2 +- dlls/winemac.drv/opengl.c | 2 +- dlls/winex11.drv/opengl.c | 4 ++-- include/wine/wgl_driver.h | 1 - 7 files changed, 5 insertions(+), 24 deletions(-)

3 2

[PATCH 1/2] d2d1/tests: Add tests for context unit mode.
by Ziqing Hui April 13, 2022

April 13, 2022

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/d2d1/tests/d2d1.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index e412459ebf2..9937d9d4a82 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -9584,6 +9584,38 @@ static void test_dpi(BOOL d3d11) release_test_context(&ctx); } +static void test_unit_mode(BOOL d3d11) +{ + struct d2d1_test_context ctx; + ID2D1DeviceContext *context; + D2D1_UNIT_MODE unit_mode; + HRESULT hr; + + if (!init_test_context(&ctx, d3d11)) + return; + + hr = ID2D1RenderTarget_QueryInterface(ctx.rt, &IID_ID2D1DeviceContext, (void **)&context); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + unit_mode = ID2D1DeviceContext_GetUnitMode(context); + ok(unit_mode == D2D1_UNIT_MODE_DIPS, "Got unexpected unit mode %#x.\n", unit_mode); + + ID2D1DeviceContext_SetUnitMode(context, 0xdeadbeef); + unit_mode = ID2D1DeviceContext_GetUnitMode(context); + ok(unit_mode == D2D1_UNIT_MODE_DIPS, "Got unexpected unit mode %#x.\n", unit_mode); + + ID2D1DeviceContext_SetUnitMode(context, D2D1_UNIT_MODE_PIXELS); + unit_mode = ID2D1DeviceContext_GetUnitMode(context); + todo_wine ok(unit_mode == D2D1_UNIT_MODE_PIXELS, "Got unexpected unit mode %#x.\n", unit_mode); + + ID2D1DeviceContext_SetUnitMode(context, 0xdeadbeef); + unit_mode = ID2D1DeviceContext_GetUnitMode(context); + todo_wine ok(unit_mode == D2D1_UNIT_MODE_PIXELS, "Got unexpected unit mode %#x.\n", unit_mode); + + ID2D1DeviceContext_Release(context); + release_test_context(&ctx); +} + static void test_wic_bitmap_format(BOOL d3d11) { IWICImagingFactory *wic_factory; @@ -10919,6 +10951,7 @@ START_TEST(d2d1) queue_test(test_command_list); queue_d3d10_test(test_max_bitmap_size); queue_test(test_dpi); + queue_test(test_unit_mode); queue_test(test_wic_bitmap_format); queue_d3d10_test(test_math); queue_d3d10_test(test_colour_space); -- 2.25.1

3 3

[PATCH 1/3] ddrawex: Build without -DWINE_NO_LONG_TYPES.
by Nikolay Sivov April 13, 2022

April 13, 2022

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ddrawex/Makefile.in | 1 - dlls/ddrawex/ddraw.c | 64 ++++++++++++++++----------------- dlls/ddrawex/main.c | 8 ++--- dlls/ddrawex/surface.c | 78 ++++++++++++++++++++-------------------- 4 files changed, 75 insertions(+), 76 deletions(-) diff --git a/dlls/ddrawex/Makefile.in b/dlls/ddrawex/Makefile.in index 1f467777c7b..0d67f9eb07e 100644 --- a/dlls/ddrawex/Makefile.in +++ b/dlls/ddrawex/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = ddrawex.dll IMPORTS = dxguid uuid ddraw ole32 advapi32 diff --git a/dlls/ddrawex/ddraw.c b/dlls/ddrawex/ddraw.c index 2bb7e90fa42..736cb585eb9 100644 --- a/dlls/ddrawex/ddraw.c +++ b/dlls/ddrawex/ddraw.c @@ -124,7 +124,7 @@ static ULONG WINAPI ddrawex4_AddRef(IDirectDraw4 *iface) struct ddrawex *ddrawex = impl_from_IDirectDraw4(iface); ULONG refcount = InterlockedIncrement(&ddrawex->ref); - TRACE("%p increasing refcount to %u.\n", iface, refcount); + TRACE("%p increasing refcount to %lu.\n", iface, refcount); return refcount; } @@ -161,7 +161,7 @@ static ULONG WINAPI ddrawex4_Release(IDirectDraw4 *iface) struct ddrawex *ddrawex = impl_from_IDirectDraw4(iface); ULONG refcount = InterlockedDecrement(&ddrawex->ref); - TRACE("%p decreasing refcount to %u.\n", iface, refcount); + TRACE("%p decreasing refcount to %lu.\n", iface, refcount); if (!refcount) { @@ -240,7 +240,7 @@ static HRESULT WINAPI ddrawex4_CreateClipper(IDirectDraw4 *iface, DWORD flags, { struct ddrawex *ddrawex = impl_from_IDirectDraw4(iface); - TRACE("iface %p, flags %#x, clipper %p, outer_unknown %p.\n", + TRACE("iface %p, flags %#lx, clipper %p, outer_unknown %p.\n", iface, flags, clipper, outer_unknown); /* This may require a wrapper interface for clippers too which handles this. */ @@ -255,7 +255,7 @@ static HRESULT WINAPI ddrawex3_CreateClipper(IDirectDraw3 *iface, DWORD flags, { struct ddrawex *ddrawex = impl_from_IDirectDraw3(iface); - TRACE("iface %p, flags %#x, clipper %p, outer_unknown %p.\n", + TRACE("iface %p, flags %#lx, clipper %p, outer_unknown %p.\n", iface, flags, clipper, outer_unknown); return ddrawex4_CreateClipper(&ddrawex->IDirectDraw4_iface, flags, clipper, outer_unknown); @@ -266,7 +266,7 @@ static HRESULT WINAPI ddrawex2_CreateClipper(IDirectDraw2 *iface, DWORD flags, { struct ddrawex *ddrawex = impl_from_IDirectDraw2(iface); - TRACE("iface %p, flags %#x, clipper %p, outer_unknown %p.\n", + TRACE("iface %p, flags %#lx, clipper %p, outer_unknown %p.\n", iface, flags, clipper, outer_unknown); return ddrawex4_CreateClipper(&ddrawex->IDirectDraw4_iface, flags, clipper, outer_unknown); @@ -277,7 +277,7 @@ static HRESULT WINAPI ddrawex1_CreateClipper(IDirectDraw *iface, DWORD flags, { struct ddrawex *ddrawex = impl_from_IDirectDraw(iface); - TRACE("iface %p, flags %#x, clipper %p, outer_unknown %p.\n", + TRACE("iface %p, flags %#lx, clipper %p, outer_unknown %p.\n", iface, flags, clipper, outer_unknown); return ddrawex4_CreateClipper(&ddrawex->IDirectDraw4_iface, flags, clipper, outer_unknown); @@ -288,7 +288,7 @@ static HRESULT WINAPI ddrawex4_CreatePalette(IDirectDraw4 *iface, DWORD flags, { struct ddrawex *ddrawex = impl_from_IDirectDraw4(iface); - TRACE("iface %p, flags %#x. entries %p, palette %p, outer_unknown %p.\n", + TRACE("iface %p, flags %#lx, entries %p, palette %p, outer_unknown %p.\n", iface, flags, entries, palette, outer_unknown); /* This may require a wrapper interface for palettes too which handles this. */ @@ -303,7 +303,7 @@ static HRESULT WINAPI ddrawex3_CreatePalette(IDirectDraw3 *iface, DWORD flags, { struct ddrawex *ddrawex = impl_from_IDirectDraw3(iface); - TRACE("iface %p, flags %#x. entries %p, palette %p, outer_unknown %p.\n", + TRACE("iface %p, flags %#lx, entries %p, palette %p, outer_unknown %p.\n", iface, flags, entries, palette, outer_unknown); return ddrawex4_CreatePalette(&ddrawex->IDirectDraw4_iface, flags, entries, palette, outer_unknown); @@ -314,7 +314,7 @@ static HRESULT WINAPI ddrawex2_CreatePalette(IDirectDraw2 *iface, DWORD flags, { struct ddrawex *ddrawex = impl_from_IDirectDraw2(iface); - TRACE("iface %p, flags %#x. entries %p, palette %p, outer_unknown %p.\n", + TRACE("iface %p, flags %#lx, entries %p, palette %p, outer_unknown %p.\n", iface, flags, entries, palette, outer_unknown); return ddrawex4_CreatePalette(&ddrawex->IDirectDraw4_iface, flags, entries, palette, outer_unknown); @@ -325,7 +325,7 @@ static HRESULT WINAPI ddrawex1_CreatePalette(IDirectDraw *iface, DWORD flags, { struct ddrawex *ddrawex = impl_from_IDirectDraw(iface); - TRACE("iface %p, flags %#x. entries %p, palette %p, outer_unknown %p.\n", + TRACE("iface %p, flags %#lx, entries %p, palette %p, outer_unknown %p.\n", iface, flags, entries, palette, outer_unknown); return ddrawex4_CreatePalette(&ddrawex->IDirectDraw4_iface, flags, entries, palette, outer_unknown); @@ -546,7 +546,7 @@ static HRESULT WINAPI ddrawex4_EnumDisplayModes(IDirectDraw4 *iface, DWORD flags { struct ddrawex *ddrawex = impl_from_IDirectDraw4(iface); - TRACE("iface %p, flags %#x, desc %p, ctx %p, cb %p.\n", iface, flags, desc, ctx, cb); + TRACE("iface %p, flags %#lx, desc %p, ctx %p, cb %p.\n", iface, flags, desc, ctx, cb); return IDirectDraw4_EnumDisplayModes(ddrawex->parent, flags, desc, ctx, cb); } @@ -574,7 +574,7 @@ static HRESULT WINAPI ddrawex3_EnumDisplayModes(IDirectDraw3 *iface, DWORD flags struct enummodes_ctx cb_ctx; DDSURFACEDESC2 ddsd2; - TRACE("iface %p, flags %#x, desc %p, ctx %p, cb %p.\n", iface, flags, desc, ctx, cb); + TRACE("iface %p, flags %#lx, desc %p, ctx %p, cb %p.\n", iface, flags, desc, ctx, cb); DDSD_to_DDSD2(desc, &ddsd2); cb_ctx.orig_cb = cb; @@ -587,7 +587,7 @@ static HRESULT WINAPI ddrawex2_EnumDisplayModes(IDirectDraw2 *iface, DWORD flags { struct ddrawex *ddrawex = impl_from_IDirectDraw2(iface); - TRACE("iface %p, flags %#x, desc %p, ctx %p, cb %p.\n", iface, flags, desc, ctx, cb); + TRACE("iface %p, flags %#lx, desc %p, ctx %p, cb %p.\n", iface, flags, desc, ctx, cb); return ddrawex3_EnumDisplayModes(&ddrawex->IDirectDraw3_iface, flags, desc, ctx, cb); } @@ -597,7 +597,7 @@ static HRESULT WINAPI ddrawex1_EnumDisplayModes(IDirectDraw *iface, DWORD flags, { struct ddrawex *ddrawex = impl_from_IDirectDraw(iface); - TRACE("iface %p, flags %#x, desc %p, ctx %p, cb %p.\n", iface, flags, desc, ctx, cb); + TRACE("iface %p, flags %#lx, desc %p, ctx %p, cb %p.\n", iface, flags, desc, ctx, cb); return ddrawex3_EnumDisplayModes(&ddrawex->IDirectDraw3_iface, flags, desc, ctx, cb); } @@ -625,7 +625,7 @@ static HRESULT WINAPI ddrawex4_EnumSurfaces(IDirectDraw4 *iface, DWORD flags, struct ddrawex *ddrawex = impl_from_IDirectDraw4(iface); struct enumsurfaces4_ctx cb_ctx; - TRACE("iface %p, flags %#x, desc %p, ctx %p, cb %p.\n", iface, flags, desc, ctx, cb); + TRACE("iface %p, flags %#lx, desc %p, ctx %p, cb %p.\n", iface, flags, desc, ctx, cb); cb_ctx.orig_cb = cb; cb_ctx.orig_ctx = ctx; @@ -661,7 +661,7 @@ static HRESULT WINAPI ddrawex3_EnumSurfaces(IDirectDraw3 *iface, DWORD flags, DDSURFACEDESC2 ddsd2; struct enumsurfaces_ctx cb_ctx; - TRACE("iface %p, flags %#x, desc %p, ctx %p, cb %p.\n", iface, flags, desc, ctx, cb); + TRACE("iface %p, flags %#lx, desc %p, ctx %p, cb %p.\n", iface, flags, desc, ctx, cb); DDSD_to_DDSD2(desc, &ddsd2); cb_ctx.orig_cb = cb; @@ -674,7 +674,7 @@ static HRESULT WINAPI ddrawex2_EnumSurfaces(IDirectDraw2 *iface, DWORD flags, { struct ddrawex *ddrawex = impl_from_IDirectDraw2(iface); - TRACE("iface %p, flags %#x, desc %p, ctx %p, cb %p.\n", iface, flags, desc, ctx, cb); + TRACE("iface %p, flags %#lx, desc %p, ctx %p, cb %p.\n", iface, flags, desc, ctx, cb); return ddrawex3_EnumSurfaces(&ddrawex->IDirectDraw3_iface, flags, desc, ctx, cb); } @@ -684,7 +684,7 @@ static HRESULT WINAPI ddrawex1_EnumSurfaces(IDirectDraw *iface, DWORD flags, { struct ddrawex *ddrawex = impl_from_IDirectDraw(iface); - TRACE("iface %p, flags %#x, desc %p, ctx %p, cb %p.\n", iface, flags, desc, ctx, cb); + TRACE("iface %p, flags %#lx, desc %p, ctx %p, cb %p.\n", iface, flags, desc, ctx, cb); return ddrawex3_EnumSurfaces(&ddrawex->IDirectDraw3_iface, flags, desc, ctx, cb); } @@ -1079,7 +1079,7 @@ static HRESULT WINAPI ddrawex4_SetCooperativeLevel(IDirectDraw4 *iface, HWND win { struct ddrawex *ddrawex = impl_from_IDirectDraw4(iface); - TRACE("iface %p, window %p, flags %#x.\n", iface, window, flags); + TRACE("iface %p, window %p, flags %#lx.\n", iface, window, flags); return IDirectDraw4_SetCooperativeLevel(ddrawex->parent, window, flags); } @@ -1088,7 +1088,7 @@ static HRESULT WINAPI ddrawex3_SetCooperativeLevel(IDirectDraw3 *iface, HWND win { struct ddrawex *ddrawex = impl_from_IDirectDraw3(iface); - TRACE("iface %p, window %p, flags %#x.\n", iface, window, flags); + TRACE("iface %p, window %p, flags %#lx.\n", iface, window, flags); return ddrawex4_SetCooperativeLevel(&ddrawex->IDirectDraw4_iface, window, flags); } @@ -1097,7 +1097,7 @@ static HRESULT WINAPI ddrawex2_SetCooperativeLevel(IDirectDraw2 *iface, HWND win { struct ddrawex *ddrawex = impl_from_IDirectDraw2(iface); - TRACE("iface %p, window %p, flags %#x.\n", iface, window, flags); + TRACE("iface %p, window %p, flags %#lx.\n", iface, window, flags); return ddrawex4_SetCooperativeLevel(&ddrawex->IDirectDraw4_iface, window, flags); } @@ -1106,7 +1106,7 @@ static HRESULT WINAPI ddrawex1_SetCooperativeLevel(IDirectDraw *iface, HWND wind { struct ddrawex *ddrawex = impl_from_IDirectDraw(iface); - TRACE("iface %p, window %p, flags %#x.\n", iface, window, flags); + TRACE("iface %p, window %p, flags %#lx.\n", iface, window, flags); return ddrawex4_SetCooperativeLevel(&ddrawex->IDirectDraw4_iface, window, flags); } @@ -1116,7 +1116,7 @@ static HRESULT WINAPI ddrawex4_SetDisplayMode(IDirectDraw4 *iface, DWORD width, { struct ddrawex *ddrawex = impl_from_IDirectDraw4(iface); - TRACE("iface %p, width %u, height %u, bpp %u, refresh_rate %u, flags %#x.\n", + TRACE("iface %p, width %lu, height %lu, bpp %lu, refresh_rate %lu, flags %#lx.\n", iface, width, height, bpp, refresh_rate, flags); return IDirectDraw4_SetDisplayMode(ddrawex->parent, width, height, bpp, refresh_rate, flags); @@ -1127,7 +1127,7 @@ static HRESULT WINAPI ddrawex3_SetDisplayMode(IDirectDraw3 *iface, DWORD width, { struct ddrawex *ddrawex = impl_from_IDirectDraw3(iface); - TRACE("iface %p, width %u, height %u, bpp %u, refresh_rate %u, flags %#x.\n", + TRACE("iface %p, width %lu, height %lu, bpp %lu, refresh_rate %lu, flags %#lx.\n", iface, width, height, bpp, refresh_rate, flags); return ddrawex4_SetDisplayMode(&ddrawex->IDirectDraw4_iface, width, height, bpp, refresh_rate, flags); @@ -1138,7 +1138,7 @@ static HRESULT WINAPI ddrawex2_SetDisplayMode(IDirectDraw2 *iface, DWORD width, { struct ddrawex *ddrawex = impl_from_IDirectDraw2(iface); - TRACE("iface %p, width %u, height %u, bpp %u, refresh_rate %u, flags %#x.\n", + TRACE("iface %p, width %lu, height %lu, bpp %lu, refresh_rate %lu, flags %#lx.\n", iface, width, height, bpp, refresh_rate, flags); return ddrawex4_SetDisplayMode(&ddrawex->IDirectDraw4_iface, width, height, bpp, refresh_rate, flags); @@ -1149,7 +1149,7 @@ static HRESULT WINAPI ddrawex1_SetDisplayMode(IDirectDraw *iface, DWORD width, { struct ddrawex *ddrawex = impl_from_IDirectDraw(iface); - TRACE("iface %p, width %u, height %u, bpp %u.\n", iface, width, height, bpp); + TRACE("iface %p, width %lu, height %lu, bpp %lu.\n", iface, width, height, bpp); return ddrawex4_SetDisplayMode(&ddrawex->IDirectDraw4_iface, width, height, bpp, 0, 0); } @@ -1158,7 +1158,7 @@ static HRESULT WINAPI ddrawex4_WaitForVerticalBlank(IDirectDraw4 *iface, DWORD f { struct ddrawex *ddrawex = impl_from_IDirectDraw4(iface); - TRACE("iface %p, flags %#x, event %p.\n", iface, flags, event); + TRACE("iface %p, flags %#lx, event %p.\n", iface, flags, event); return IDirectDraw4_WaitForVerticalBlank(ddrawex->parent, flags, event); } @@ -1167,7 +1167,7 @@ static HRESULT WINAPI ddrawex3_WaitForVerticalBlank(IDirectDraw3 *iface, DWORD f { struct ddrawex *ddrawex = impl_from_IDirectDraw3(iface); - TRACE("iface %p, flags %#x, event %p.\n", iface, flags, event); + TRACE("iface %p, flags %#lx, event %p.\n", iface, flags, event); return ddrawex4_WaitForVerticalBlank(&ddrawex->IDirectDraw4_iface, flags, event); } @@ -1176,7 +1176,7 @@ static HRESULT WINAPI ddrawex2_WaitForVerticalBlank(IDirectDraw2 *iface, DWORD f { struct ddrawex *ddrawex = impl_from_IDirectDraw2(iface); - TRACE("iface %p, flags %#x, event %p.\n", iface, flags, event); + TRACE("iface %p, flags %#lx, event %p.\n", iface, flags, event); return ddrawex4_WaitForVerticalBlank(&ddrawex->IDirectDraw4_iface, flags, event); } @@ -1185,7 +1185,7 @@ static HRESULT WINAPI ddrawex1_WaitForVerticalBlank(IDirectDraw *iface, DWORD fl { struct ddrawex *ddrawex = impl_from_IDirectDraw(iface); - TRACE("iface %p, flags %#x, event %p.\n", iface, flags, event); + TRACE("iface %p, flags %#lx, event %p.\n", iface, flags, event); return ddrawex4_WaitForVerticalBlank(&ddrawex->IDirectDraw4_iface, flags, event); } @@ -1292,7 +1292,7 @@ static HRESULT WINAPI ddrawex4_GetDeviceIdentifier(IDirectDraw4 *iface, { struct ddrawex *ddrawex = impl_from_IDirectDraw4(iface); - TRACE("iface %p, identifier %p, flags %#x.\n", iface, identifier, flags); + TRACE("iface %p, identifier %p, flags %#lx.\n", iface, identifier, flags); return IDirectDraw4_GetDeviceIdentifier(ddrawex->parent, identifier, flags); } @@ -1420,7 +1420,7 @@ HRESULT WINAPI ddrawex_factory_CreateDirectDraw(IDirectDrawFactory *iface, GUID struct ddrawex *object; HRESULT hr; - TRACE("iface %p, guid %s, window %p, coop_level %#x, reserved %#x, outer_unknown %p, ddraw %p.\n", + TRACE("iface %p, guid %s, window %p, coop_level %#lx, reserved %#lx, outer_unknown %p, ddraw %p.\n", iface, debugstr_guid(guid), window, coop_level, reserved, outer_unknown, ddraw); if (outer_unknown) diff --git a/dlls/ddrawex/main.c b/dlls/ddrawex/main.c index 8ecc24f824c..fd6d7219c12 100644 --- a/dlls/ddrawex/main.c +++ b/dlls/ddrawex/main.c @@ -69,7 +69,7 @@ static ULONG WINAPI ddrawex_class_factory_AddRef(IClassFactory *iface) struct ddrawex_class_factory *factory = impl_from_IClassFactory(iface); ULONG refcount = InterlockedIncrement(&factory->ref); - TRACE("%p increasing refcount to %u.\n", iface, refcount); + TRACE("%p increasing refcount to %lu.\n", iface, refcount); return refcount; } @@ -79,7 +79,7 @@ static ULONG WINAPI ddrawex_class_factory_Release(IClassFactory *iface) struct ddrawex_class_factory *factory = impl_from_IClassFactory(iface); ULONG refcount = InterlockedDecrement(&factory->ref); - TRACE("%p decreasing refcount to %u.\n", iface, refcount); + TRACE("%p decreasing refcount to %lu.\n", iface, refcount); if (!refcount) heap_free(factory); @@ -148,7 +148,7 @@ static ULONG WINAPI ddrawex_factory_AddRef(IDirectDrawFactory *iface) struct ddrawex_factory *factory = impl_from_IDirectDrawFactory(iface); ULONG refcount = InterlockedIncrement(&factory->ref); - TRACE("%p increasing refcount to %u.\n", iface, refcount); + TRACE("%p increasing refcount to %lu.\n", iface, refcount); return refcount; } @@ -158,7 +158,7 @@ static ULONG WINAPI ddrawex_factory_Release(IDirectDrawFactory *iface) struct ddrawex_factory *factory = impl_from_IDirectDrawFactory(iface); ULONG refcount = InterlockedDecrement(&factory->ref); - TRACE("%p decreasing refcount to %u.\n", iface, refcount); + TRACE("%p decreasing refcount to %lu.\n", iface, refcount); if (!refcount) heap_free(factory); diff --git a/dlls/ddrawex/surface.c b/dlls/ddrawex/surface.c index 9fcda86979f..cc18494905c 100644 --- a/dlls/ddrawex/surface.c +++ b/dlls/ddrawex/surface.c @@ -99,7 +99,7 @@ static ULONG WINAPI ddrawex_surface4_AddRef(IDirectDrawSurface4 *iface) struct ddrawex_surface *surface = impl_from_IDirectDrawSurface4(iface); ULONG refcount = InterlockedIncrement(&surface->ref); - TRACE("%p increasing refcount to %u.\n", iface, refcount); + TRACE("%p increasing refcount to %lu.\n", iface, refcount); return refcount; } @@ -118,7 +118,7 @@ static ULONG WINAPI ddrawex_surface4_Release(IDirectDrawSurface4 *iface) struct ddrawex_surface *surface = impl_from_IDirectDrawSurface4(iface); ULONG refcount = InterlockedDecrement(&surface->ref); - TRACE("%p decreasing refcount to %u.\n", iface, refcount); + TRACE("%p decreasing refcount to %lu.\n", iface, refcount); if (!refcount) { @@ -186,7 +186,7 @@ static HRESULT WINAPI ddrawex_surface4_Blt(IDirectDrawSurface4 *iface, RECT *dst struct ddrawex_surface *dst = impl_from_IDirectDrawSurface4(iface); struct ddrawex_surface *src = unsafe_impl_from_IDirectDrawSurface4(src_surface); - TRACE("iface %p, dst_rect %s, src_surface %p, src_rect %s, flags %#x, fx %p.\n", + TRACE("iface %p, dst_rect %s, src_surface %p, src_rect %s, flags %#lx, fx %p.\n", iface, wine_dbgstr_rect(dst_rect), src_surface, wine_dbgstr_rect(src_rect), flags, fx); return IDirectDrawSurface4_Blt(dst->parent, dst_rect, src ? src->parent : NULL, src_rect, flags, fx); @@ -198,7 +198,7 @@ static HRESULT WINAPI ddrawex_surface3_Blt(IDirectDrawSurface3 *iface, RECT *dst struct ddrawex_surface *dst = impl_from_IDirectDrawSurface3(iface); struct ddrawex_surface *src = unsafe_impl_from_IDirectDrawSurface3(src_surface); - TRACE("iface %p, dst_rect %s, src_surface %p, src_rect %s, flags %#x, fx %p.\n", + TRACE("iface %p, dst_rect %s, src_surface %p, src_rect %s, flags %#lx, fx %p.\n", iface, wine_dbgstr_rect(dst_rect), src_surface, wine_dbgstr_rect(src_rect), flags, fx); return ddrawex_surface4_Blt(&dst->IDirectDrawSurface4_iface, dst_rect, @@ -210,7 +210,7 @@ static HRESULT WINAPI ddrawex_surface4_BltBatch(IDirectDrawSurface4 *iface, { struct ddrawex_surface *surface = impl_from_IDirectDrawSurface4(iface); - TRACE("iface %p, batch %p, count %u, flags %#x.\n", iface, batch, count, flags); + TRACE("iface %p, batch %p, count %lu, flags %#lx.\n", iface, batch, count, flags); return IDirectDrawSurface4_BltBatch(surface->parent, batch, count, flags); } @@ -220,7 +220,7 @@ static HRESULT WINAPI ddrawex_surface3_BltBatch(IDirectDrawSurface3 *iface, { struct ddrawex_surface *surface = impl_from_IDirectDrawSurface3(iface); - TRACE("iface %p, batch %p, count %u, flags %#x.\n", iface, batch, count, flags); + TRACE("iface %p, batch %p, count %lu, flags %#lx.\n", iface, batch, count, flags); return ddrawex_surface4_BltBatch(&surface->IDirectDrawSurface4_iface, batch, count, flags); } @@ -231,7 +231,7 @@ static HRESULT WINAPI ddrawex_surface4_BltFast(IDirectDrawSurface4 *iface, DWORD struct ddrawex_surface *dst = impl_from_IDirectDrawSurface4(iface); struct ddrawex_surface *src = unsafe_impl_from_IDirectDrawSurface4(src_surface); - TRACE("iface %p, dst_x %u, dst_y %u, src_surface %p, src_rect %s, flags %#x.\n", + TRACE("iface %p, dst_x %lu, dst_y %lu, src_surface %p, src_rect %s, flags %#lx.\n", iface, dst_x, dst_y, src_surface, wine_dbgstr_rect(src_rect), flags); return IDirectDrawSurface4_BltFast(dst->parent, dst_x, dst_y, @@ -244,7 +244,7 @@ static HRESULT WINAPI ddrawex_surface3_BltFast(IDirectDrawSurface3 *iface, DWORD struct ddrawex_surface *dst = impl_from_IDirectDrawSurface3(iface); struct ddrawex_surface *src = unsafe_impl_from_IDirectDrawSurface3(src_surface); - TRACE("iface %p, dst_x %u, dst_y %u, src_surface %p, src_rect %s, flags %#x.\n", + TRACE("iface %p, dst_x %lu, dst_y %lu, src_surface %p, src_rect %s, flags %#lx.\n", iface, dst_x, dst_y, src_surface, wine_dbgstr_rect(src_rect), flags); return ddrawex_surface4_BltFast(&dst->IDirectDrawSurface4_iface, dst_x, dst_y, @@ -257,7 +257,7 @@ static HRESULT WINAPI ddrawex_surface4_DeleteAttachedSurface(IDirectDrawSurface4 struct ddrawex_surface *surface = impl_from_IDirectDrawSurface4(iface); struct ddrawex_surface *attachment_impl = unsafe_impl_from_IDirectDrawSurface4(attachment); - TRACE("iface %p, flags %#x, attachment %p.\n", iface, flags, attachment); + TRACE("iface %p, flags %#lx, attachment %p.\n", iface, flags, attachment); return IDirectDrawSurface4_DeleteAttachedSurface(surface->parent, flags, attachment_impl ? attachment_impl->parent : NULL); @@ -269,7 +269,7 @@ static HRESULT WINAPI ddrawex_surface3_DeleteAttachedSurface(IDirectDrawSurface3 struct ddrawex_surface *surface = impl_from_IDirectDrawSurface3(iface); struct ddrawex_surface *attachment_impl = unsafe_impl_from_IDirectDrawSurface3(attachment); - TRACE("iface %p, flags %#x, attachment %p.\n", iface, flags, attachment); + TRACE("iface %p, flags %#lx, attachment %p.\n", iface, flags, attachment); return ddrawex_surface4_DeleteAttachedSurface(&surface->IDirectDrawSurface4_iface, flags, attachment_impl ? &attachment_impl->IDirectDrawSurface4_iface : NULL); @@ -345,7 +345,7 @@ static HRESULT WINAPI ddrawex_surface4_EnumOverlayZOrders(IDirectDrawSurface4 *i struct ddrawex_surface *surface = impl_from_IDirectDrawSurface4(iface); struct enumsurfaces_wrap cb_ctx; - TRACE("iface %p, flags %#x, ctx %p, cb %p.\n", iface, flags, ctx, cb); + TRACE("iface %p, flags %#lx, ctx %p, cb %p.\n", iface, flags, ctx, cb); cb_ctx.orig_cb = cb; cb_ctx.orig_ctx = ctx; @@ -358,7 +358,7 @@ static HRESULT WINAPI ddrawex_surface3_EnumOverlayZOrders(IDirectDrawSurface3 *i struct ddrawex_surface *surface = impl_from_IDirectDrawSurface3(iface); struct enumsurfaces_thunk cb_ctx; - TRACE("iface %p, flags %#x, ctx %p, cb %p.\n", iface, flags, ctx, cb); + TRACE("iface %p, flags %#lx, ctx %p, cb %p.\n", iface, flags, ctx, cb); cb_ctx.orig_cb = cb; cb_ctx.orig_ctx = ctx; @@ -371,7 +371,7 @@ static HRESULT WINAPI ddrawex_surface4_Flip(IDirectDrawSurface4 *iface, IDirectD struct ddrawex_surface *surface = impl_from_IDirectDrawSurface4(iface); struct ddrawex_surface *dst_impl = unsafe_impl_from_IDirectDrawSurface4(dst); - TRACE("iface %p, dst %p, flags %#x.\n", iface, dst, flags); + TRACE("iface %p, dst %p, flags %#lx.\n", iface, dst, flags); return IDirectDrawSurface4_Flip(surface->parent, dst_impl ? dst_impl->parent : NULL, flags); } @@ -381,7 +381,7 @@ static HRESULT WINAPI ddrawex_surface3_Flip(IDirectDrawSurface3 *iface, IDirectD struct ddrawex_surface *surface = impl_from_IDirectDrawSurface3(iface); struct ddrawex_surface *dst_impl = unsafe_impl_from_IDirectDrawSurface3(dst); - TRACE("iface %p, dst %p, flags %#x.\n", iface, dst, flags); + TRACE("iface %p, dst %p, flags %#lx.\n", iface, dst, flags); return ddrawex_surface4_Flip(&surface->IDirectDrawSurface4_iface, dst_impl ? &dst_impl->IDirectDrawSurface4_iface : NULL, flags); @@ -437,7 +437,7 @@ static HRESULT WINAPI ddrawex_surface4_GetBltStatus(IDirectDrawSurface4 *iface, { struct ddrawex_surface *surface = impl_from_IDirectDrawSurface4(iface); - TRACE("iface %p, flags %#x.\n", iface, flags); + TRACE("iface %p, flags %#lx.\n", iface, flags); return IDirectDrawSurface4_GetBltStatus(surface->parent, flags); } @@ -446,7 +446,7 @@ static HRESULT WINAPI ddrawex_surface3_GetBltStatus(IDirectDrawSurface3 *iface, { struct ddrawex_surface *surface = impl_from_IDirectDrawSurface3(iface); - TRACE("iface %p, flags %#x.\n", iface, flags); + TRACE("iface %p, flags %#lx.\n", iface, flags); return ddrawex_surface4_GetBltStatus(&surface->IDirectDrawSurface4_iface, flags); } @@ -497,7 +497,7 @@ static HRESULT WINAPI ddrawex_surface4_GetColorKey(IDirectDrawSurface4 *iface, D { struct ddrawex_surface *surface = impl_from_IDirectDrawSurface4(iface); - TRACE("iface %p, flags %#x, color_key %p.\n", iface, flags, color_key); + TRACE("iface %p, flags %#lx, color_key %p.\n", iface, flags, color_key); return IDirectDrawSurface4_GetColorKey(surface->parent, flags, color_key); } @@ -506,7 +506,7 @@ static HRESULT WINAPI ddrawex_surface3_GetColorKey(IDirectDrawSurface3 *iface, D { struct ddrawex_surface *surface = impl_from_IDirectDrawSurface3(iface); - TRACE("iface %p, flags %#x, color_key %p.\n", iface, flags, color_key); + TRACE("iface %p, flags %#lx, color_key %p.\n", iface, flags, color_key); return ddrawex_surface4_GetColorKey(&surface->IDirectDrawSurface4_iface, flags, color_key); } @@ -540,7 +540,7 @@ static HRESULT WINAPI ddrawex_surface4_GetFlipStatus(IDirectDrawSurface4 *iface, { struct ddrawex_surface *surface = impl_from_IDirectDrawSurface4(iface); - TRACE("iface %p, flags %#x.\n", iface, flags); + TRACE("iface %p, flags %#lx.\n", iface, flags); return IDirectDrawSurface4_GetFlipStatus(surface->parent, flags); } @@ -549,7 +549,7 @@ static HRESULT WINAPI ddrawex_surface3_GetFlipStatus(IDirectDrawSurface3 *iface, { struct ddrawex_surface *surface = impl_from_IDirectDrawSurface3(iface); - TRACE("iface %p, flags %#x.\n", iface, flags); + TRACE("iface %p, flags %#lx.\n", iface, flags); return ddrawex_surface4_GetFlipStatus(&surface->IDirectDrawSurface4_iface, flags); } @@ -697,7 +697,7 @@ static HRESULT WINAPI ddrawex_surface4_Lock(IDirectDrawSurface4 *iface, RECT *re struct ddrawex_surface *surface = impl_from_IDirectDrawSurface4(iface); HRESULT hr; - TRACE("iface %p, rect %s, desc %p, flags %#x, h %p.\n", + TRACE("iface %p, rect %s, desc %p, flags %#lx, h %p.\n", iface, wine_dbgstr_rect(rect), desc, flags, h); if (SUCCEEDED(hr = IDirectDrawSurface4_Lock(surface->parent, rect, desc, flags, h)) @@ -717,7 +717,7 @@ static HRESULT WINAPI ddrawex_surface3_Lock(IDirectDrawSurface3 *iface, RECT *re DDSURFACEDESC2 ddsd2; HRESULT hr; - TRACE("iface %p, rect %s, desc %p, flags %#x, h %p.\n", + TRACE("iface %p, rect %s, desc %p, flags %#lx, h %p.\n", iface, wine_dbgstr_rect(rect), desc, flags, h); memset(&ddsd2, 0, sizeof(ddsd2)); @@ -793,7 +793,7 @@ static HRESULT WINAPI ddrawex_surface4_SetColorKey(IDirectDrawSurface4 *iface, { struct ddrawex_surface *surface = impl_from_IDirectDrawSurface4(iface); - TRACE("iface %p, flags %#x, color_key %p.\n", iface, flags, color_key); + TRACE("iface %p, flags %#lx, color_key %p.\n", iface, flags, color_key); return IDirectDrawSurface4_SetColorKey(surface->parent, flags, color_key); } @@ -803,7 +803,7 @@ static HRESULT WINAPI ddrawex_surface3_SetColorKey(IDirectDrawSurface3 *iface, { struct ddrawex_surface *surface = impl_from_IDirectDrawSurface3(iface); - TRACE("iface %p, flags %#x, color_key %p.\n", iface, flags, color_key); + TRACE("iface %p, flags %#lx, color_key %p.\n", iface, flags, color_key); return ddrawex_surface4_SetColorKey(&surface->IDirectDrawSurface4_iface, flags, color_key); } @@ -812,7 +812,7 @@ static HRESULT WINAPI ddrawex_surface4_SetOverlayPosition(IDirectDrawSurface4 *i { struct ddrawex_surface *surface = impl_from_IDirectDrawSurface4(iface); - TRACE("iface %p, x %d, y %d.\n", iface, x, y); + TRACE("iface %p, x %ld, y %ld.\n", iface, x, y); return IDirectDrawSurface4_SetOverlayPosition(surface->parent, x, y); } @@ -821,7 +821,7 @@ static HRESULT WINAPI ddrawex_surface3_SetOverlayPosition(IDirectDrawSurface3 *i { struct ddrawex_surface *surface = impl_from_IDirectDrawSurface3(iface); - TRACE("iface %p, x %d, y %d.\n", iface, x, y); + TRACE("iface %p, x %ld, y %ld.\n", iface, x, y); return ddrawex_surface4_SetOverlayPosition(&surface->IDirectDrawSurface4_iface, x, y); } @@ -868,7 +868,7 @@ static HRESULT WINAPI ddrawex_surface4_UpdateOverlay(IDirectDrawSurface4 *iface, struct ddrawex_surface *src_impl = impl_from_IDirectDrawSurface4(iface); struct ddrawex_surface *dst_impl = unsafe_impl_from_IDirectDrawSurface4(dst_surface); - TRACE("iface %p, src_rect %s, dst_surface %p, dst_rect %s, flags %#x, fx %p.\n", + TRACE("iface %p, src_rect %s, dst_surface %p, dst_rect %s, flags %#lx, fx %p.\n", iface, wine_dbgstr_rect(src_rect), dst_surface, wine_dbgstr_rect(dst_rect), flags, fx); return IDirectDrawSurface4_UpdateOverlay(src_impl->parent, src_rect, @@ -881,7 +881,7 @@ static HRESULT WINAPI ddrawex_surface3_UpdateOverlay(IDirectDrawSurface3 *iface, struct ddrawex_surface *src_impl = impl_from_IDirectDrawSurface3(iface); struct ddrawex_surface *dst_impl = unsafe_impl_from_IDirectDrawSurface3(dst_surface); - TRACE("iface %p, src_rect %s, dst_surface %p, dst_rect %s, flags %#x, fx %p.\n", + TRACE("iface %p, src_rect %s, dst_surface %p, dst_rect %s, flags %#lx, fx %p.\n", iface, wine_dbgstr_rect(src_rect), dst_surface, wine_dbgstr_rect(dst_rect), flags, fx); return ddrawex_surface4_UpdateOverlay(&src_impl->IDirectDrawSurface4_iface, src_rect, @@ -892,7 +892,7 @@ static HRESULT WINAPI ddrawex_surface4_UpdateOverlayDisplay(IDirectDrawSurface4 { struct ddrawex_surface *surface = impl_from_IDirectDrawSurface4(iface); - TRACE("iface %p, flags %#x.\n", iface, flags); + TRACE("iface %p, flags %#lx.\n", iface, flags); return IDirectDrawSurface4_UpdateOverlayDisplay(surface->parent, flags); } @@ -901,7 +901,7 @@ static HRESULT WINAPI ddrawex_surface3_UpdateOverlayDisplay(IDirectDrawSurface3 { struct ddrawex_surface *surface = impl_from_IDirectDrawSurface3(iface); - TRACE("iface %p, flags %#x.\n", iface, flags); + TRACE("iface %p, flags %#lx.\n", iface, flags); return ddrawex_surface4_UpdateOverlayDisplay(&surface->IDirectDrawSurface4_iface, flags); } @@ -912,7 +912,7 @@ static HRESULT WINAPI ddrawex_surface4_UpdateOverlayZOrder(IDirectDrawSurface4 * struct ddrawex_surface *surface = impl_from_IDirectDrawSurface4(iface); struct ddrawex_surface *reference_impl = unsafe_impl_from_IDirectDrawSurface4(reference); - TRACE("iface %p, flags %#x, reference %p.\n", iface, flags, reference); + TRACE("iface %p, flags %#lx, reference %p.\n", iface, flags, reference); return IDirectDrawSurface4_UpdateOverlayZOrder(surface->parent, flags, reference_impl ? reference_impl->parent : NULL); @@ -924,7 +924,7 @@ static HRESULT WINAPI ddrawex_surface3_UpdateOverlayZOrder(IDirectDrawSurface3 * struct ddrawex_surface *surface = impl_from_IDirectDrawSurface3(iface); struct ddrawex_surface *reference_impl = unsafe_impl_from_IDirectDrawSurface3(reference); - TRACE("iface %p, flags %#x, reference %p.\n", iface, flags, reference); + TRACE("iface %p, flags %#lx, reference %p.\n", iface, flags, reference); return ddrawex_surface4_UpdateOverlayZOrder(&surface->IDirectDrawSurface4_iface, flags, reference_impl ? &reference_impl->IDirectDrawSurface4_iface : NULL); @@ -957,7 +957,7 @@ static HRESULT WINAPI ddrawex_surface4_PageLock(IDirectDrawSurface4 *iface, DWOR { struct ddrawex_surface *surface = impl_from_IDirectDrawSurface4(iface); - TRACE("iface %p, flags %#x.\n", iface, flags); + TRACE("iface %p, flags %#lx.\n", iface, flags); return IDirectDrawSurface4_PageLock(surface->parent, flags); } @@ -966,7 +966,7 @@ static HRESULT WINAPI ddrawex_surface3_PageLock(IDirectDrawSurface3 *iface, DWOR { struct ddrawex_surface *surface = impl_from_IDirectDrawSurface3(iface); - TRACE("iface %p, flags %#x.\n", iface, flags); + TRACE("iface %p, flags %#lx.\n", iface, flags); return ddrawex_surface4_PageLock(&surface->IDirectDrawSurface4_iface, flags); } @@ -975,7 +975,7 @@ static HRESULT WINAPI ddrawex_surface4_PageUnlock(IDirectDrawSurface4 *iface, DW { struct ddrawex_surface *surface = impl_from_IDirectDrawSurface4(iface); - TRACE("iface %p, flags %#x.\n", iface, flags); + TRACE("iface %p, flags %#lx.\n", iface, flags); return IDirectDrawSurface4_PageUnlock(surface->parent, flags); } @@ -984,7 +984,7 @@ static HRESULT WINAPI ddrawex_surface3_PageUnlock(IDirectDrawSurface3 *iface, DW { struct ddrawex_surface *surface = impl_from_IDirectDrawSurface3(iface); - TRACE("iface %p, flags %#x.\n", iface, flags); + TRACE("iface %p, flags %#lx.\n", iface, flags); return ddrawex_surface4_PageUnlock(&surface->IDirectDrawSurface4_iface, flags); } @@ -994,7 +994,7 @@ static HRESULT WINAPI ddrawex_surface4_SetSurfaceDesc(IDirectDrawSurface4 *iface { struct ddrawex_surface *surface = impl_from_IDirectDrawSurface4(iface); - TRACE("iface %p, desc %p, flags %#x.\n", iface, desc, flags); + TRACE("iface %p, desc %p, flags %#lx.\n", iface, desc, flags); return IDirectDrawSurface4_SetSurfaceDesc(surface->parent, desc, flags); } @@ -1005,7 +1005,7 @@ static HRESULT WINAPI ddrawex_surface3_SetSurfaceDesc(IDirectDrawSurface3 *iface struct ddrawex_surface *surface = impl_from_IDirectDrawSurface3(iface); DDSURFACEDESC2 ddsd; - TRACE("iface %p, desc %p, flags %#x.\n", iface, desc, flags); + TRACE("iface %p, desc %p, flags %#lx.\n", iface, desc, flags); DDSD_to_DDSD2(desc, &ddsd); return ddrawex_surface4_SetSurfaceDesc(&surface->IDirectDrawSurface4_iface, &ddsd, flags); @@ -1016,7 +1016,7 @@ static HRESULT WINAPI ddrawex_surface4_SetPrivateData(IDirectDrawSurface4 *iface { struct ddrawex_surface *surface = impl_from_IDirectDrawSurface4(iface); - TRACE("iface %p, tag %s, data %p, data_size %u, flags %#x.\n", + TRACE("iface %p, tag %s, data %p, data_size %lu, flags %#lx.\n", iface, debugstr_guid(tag), data, data_size, flags); /* To completely avoid this we'd have to clone the private data API in -- 2.35.1

2 5

[PATCH 07/10] win32u: Introduce inline helpers for NtUserCallHwndParam calls.
by Jacek Caban April 13, 2022

April 13, 2022

3 2

[PATCH 06/10] win32u: Introduce inline helpers for NtUserCallHwnd calls.
by Jacek Caban April 13, 2022

April 13, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/win.c | 20 +++++------ dlls/user32/winpos.c | 2 +- dlls/win32u/window.c | 30 ++++++++++------ include/ntuser.h | 81 ++++++++++++++++++++++++++++++++++++-------- 4 files changed, 97 insertions(+), 36 deletions(-)

3 2