wine-commits October 2017

wine-commits@winehq.org

2 participants
478 discussions

Francois Gouget : testbot: Document WineTestBot::Log::SetupRedirects().
by Alexandre Julliard 03 Oct '17

03 Oct '17

Module: tools Branch: master Commit: de1b849b3db677c3cba3fd4565b8e018bf39798d URL: http://source.winehq.org/git/tools.git/?a=commit;h=de1b849b3db677c3cba3fd45… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Oct 3 03:26:50 2017 +0200 testbot: Document WineTestBot::Log::SetupRedirects(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Log.pm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/testbot/lib/WineTestBot/Log.pm b/testbot/lib/WineTestBot/Log.pm index 4b1d35e..7abf2cb 100644 --- a/testbot/lib/WineTestBot/Log.pm +++ b/testbot/lib/WineTestBot/Log.pm @@ -58,6 +58,17 @@ sub LogMsg(@) print $logfile scalar localtime, " ", $logprefix, "[$$]: ", @_ if ($logfile); } +=pod +=over 12 + +=item C<SetupRedirects()> + +This redirects stderr so it writes to our log. This is typically called before +exec()-ing external tools so their error messages are not lost. + +=back +=cut + sub SetupRedirects() { if (defined $logfile)

1 0

Francois Gouget : testbot: Rename DBIBackEnd::PrepareForFork() to Close().
by Alexandre Julliard 03 Oct '17

03 Oct '17

Module: tools Branch: master Commit: 540136bbd6898e7b913e39016a088059896f8b20 URL: http://source.winehq.org/git/tools.git/?a=commit;h=540136bbd6898e7b913e3901… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Oct 3 03:26:36 2017 +0200 testbot: Rename DBIBackEnd::PrepareForFork() to Close(). It can also be useful after the fork() and before the exec() so a more generic name describing what it does is more appropriate. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Engine.pl | 4 +++- testbot/lib/ObjectModel/DBIBackEnd.pm | 2 +- testbot/lib/WineTestBot/Tasks.pm | 4 +++- testbot/lib/WineTestBot/VMs.pm | 4 +++- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 6dddc8f..6a05277 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -280,7 +280,9 @@ sub HandleJobStatusChange($$$) if ($OldStatus eq "running" && $NewStatus ne "running") { - $ActiveBackEnds{'WineTestBot'}->PrepareForFork(); + # Make sure the child process does not inherit the database connection + $ActiveBackEnds{'WineTestBot'}->Close(); + my $Pid = fork; if (!defined $Pid) { diff --git a/testbot/lib/ObjectModel/DBIBackEnd.pm b/testbot/lib/ObjectModel/DBIBackEnd.pm index d65182d..4082a0a 100644 --- a/testbot/lib/ObjectModel/DBIBackEnd.pm +++ b/testbot/lib/ObjectModel/DBIBackEnd.pm @@ -565,7 +565,7 @@ sub DeleteAll($$) return undef; } -sub PrepareForFork($) +sub Close($) { my ($self) = @_; diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index 900498a..520d403 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -99,7 +99,9 @@ sub Run($$) $RunScript = "RunTask.pl"; } - $self->GetBackEnd()->PrepareForFork(); + # Make sure the child process does not inherit the database connection + $self->GetBackEnd()->Close(); + my $Pid = fork; if (!defined $Pid) { diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index dafce67..d6bb537 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -516,7 +516,9 @@ sub RunRevert($) my ($ErrProperty, $ErrMessage) = $self->Save(); return $ErrMessage if (defined $ErrMessage); - $self->GetBackEnd()->PrepareForFork(); + # Make sure the child process does not inherit the database connection + $self->GetBackEnd()->Close(); + my $Pid = fork; if (!defined $Pid) {

1 0

Francois Gouget : testbot: Better document the configuration options.
by Alexandre Julliard 03 Oct '17

03 Oct '17

Module: tools Branch: master Commit: 6b2f134e38bcd8926c95f64ca23c894e74e22e12 URL: http://source.winehq.org/git/tools.git/?a=commit;h=6b2f134e38bcd8926c95f64c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Oct 3 03:26:23 2017 +0200 testbot: Better document the configuration options. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Config.pm | 17 ++++++++++++++++- testbot/lib/WineTestBot/Jobs.pm | 3 ++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm index 0047770..c5586c7 100644 --- a/testbot/lib/WineTestBot/Config.pm +++ b/testbot/lib/WineTestBot/Config.pm @@ -65,18 +65,33 @@ $LogDir = "$::RootDir/var"; $DataDir = "$::RootDir/var"; $BinDir = "$::RootDir/bin"; +# See the ScheduleOnHost() documentation in lib/WineTestBot/Jobs.pm $MaxRevertingVMs = 1; $MaxRevertsWhileRunningVMs = 1; $MaxActiveVMs = 2; $MaxVMsWhenIdle = undef; -$SleepAfterRevert = 0; + +# How long to wait when connecting to the VM's TestAgent server after a revert +# (in seconds). $WaitForToolsInVM = 30; +# How long to let the VM settle down after the revert before starting a task on +# it (in seconds). +$SleepAfterRevert = 0; +# How many times to run a test that fails before giving up. $MaxTaskTries = 3; +# How long to let a test suite run before forcibly shutting it down +# (in seconds). $SuiteTimeout = 30 * 60; +# How long to let a regular test run before forcibly shutting it down +# (in seconds). $SingleTimeout = 2 * 60; +# How long to let a regular build run before forcibly shutting it down +# (in seconds). $BuildTimeout = 5 * 60; +# How long to let a full recompilation run before forcibly shutting it down +# (in seconds). $ReconfigTimeout = 45 * 60; $ProjectName = "Wine"; diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index 633d9dd..39f9c18 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -419,7 +419,8 @@ reverting too many VMs at once. =item * Once there are no jobs to run anymore the scheduler can prepare up to -$MaxVMsWhenIdle VMs (or $MaxActiveVMs if not set) for future jobs. +$MaxVMsWhenIdle VMs (or $MaxActiveVMs if not set) for future jobs. This can be +set to 0 to minimize the TestBot resource usage when idle. =cut

1 0

Francois Gouget : testbot: Add Emacs directives to automatically get 2-space indentation.
by Alexandre Julliard 03 Oct '17

03 Oct '17

Module: tools Branch: master Commit: 0be52c9c403dde301b537e7db1abfb81d75fe46e URL: http://source.winehq.org/git/tools.git/?a=commit;h=0be52c9c403dde301b537e7d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Oct 3 03:25:48 2017 +0200 testbot: Add Emacs directives to automatically get 2-space indentation. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Engine.pl | 1 + testbot/bin/Janitor.pl | 1 + testbot/bin/PingEngine.pl | 1 + testbot/bin/build/Build.pl | 1 + testbot/bin/build/Reconfig.pl | 1 + testbot/lib/ObjectModel/CGI/FreeFormPage.pm | 1 + testbot/lib/WineTestBot/ConfigLocalTemplate.pl | 1 + 7 files changed, 7 insertions(+) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 956f180..6dddc8f 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -1,4 +1,5 @@ #!/usr/bin/perl -Tw +# -*- Mode: Perl; perl-indent-level: 2; indent-tabs-mode: nil -*- # # The WineTestBot server, aka the engine that makes it all work. # diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index 6dcbf48..383ae31 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -1,4 +1,5 @@ #!/usr/bin/perl -Tw +# -*- Mode: Perl; perl-indent-level: 2; indent-tabs-mode: nil -*- # # This script performs janitorial tasks. It removes incomplete patch series, # archives old jobs and purges older jobs and patches. diff --git a/testbot/bin/PingEngine.pl b/testbot/bin/PingEngine.pl index 2fb1b70..618b844 100755 --- a/testbot/bin/PingEngine.pl +++ b/testbot/bin/PingEngine.pl @@ -1,4 +1,5 @@ #!/usr/bin/perl -Tw +# -*- Mode: Perl; perl-indent-level: 2; indent-tabs-mode: nil -*- # # Pings the WineTestBot engine to see if it is still alive. # diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index fb3235d..051039f 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -1,4 +1,5 @@ #!/usr/bin/perl -Tw +# -*- Mode: Perl; perl-indent-level: 2; indent-tabs-mode: nil -*- # # Performs the 'build' task in the build machine. Specifically this applies a # conformance test patch, rebuilds the impacted test and retrieves the diff --git a/testbot/bin/build/Reconfig.pl b/testbot/bin/build/Reconfig.pl index dfc338b..7e26709 100755 --- a/testbot/bin/build/Reconfig.pl +++ b/testbot/bin/build/Reconfig.pl @@ -1,4 +1,5 @@ #!/usr/bin/perl -Tw +# -*- Mode: Perl; perl-indent-level: 2; indent-tabs-mode: nil -*- # # Performs the 'reconfig' task in the build machine. Specifically this updates # the build machine's Wine repository, re-runs configure, and rebuilds the diff --git a/testbot/lib/ObjectModel/CGI/FreeFormPage.pm b/testbot/lib/ObjectModel/CGI/FreeFormPage.pm index 77cac6b..607fd7b 100644 --- a/testbot/lib/ObjectModel/CGI/FreeFormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FreeFormPage.pm @@ -1,3 +1,4 @@ +# -*- Mode: Perl; perl-indent-level: 2; indent-tabs-mode: nil -*- # Base class for web pages containing a form which is not bound to a db table # # Copyright 2009 Ge van Geldorp diff --git a/testbot/lib/WineTestBot/ConfigLocalTemplate.pl b/testbot/lib/WineTestBot/ConfigLocalTemplate.pl index 6d8128b..1b1a62e 100644 --- a/testbot/lib/WineTestBot/ConfigLocalTemplate.pl +++ b/testbot/lib/WineTestBot/ConfigLocalTemplate.pl @@ -1,3 +1,4 @@ +# -*- Mode: Perl; perl-indent-level: 2; indent-tabs-mode: nil -*- # WineTestBot configuration # # Copyright 2009 Ge van Geldorp

1 0

Francois Gouget : testbot: Remove unused VM filtering and counting functions.
by Alexandre Julliard 03 Oct '17

03 Oct '17

Module: tools Branch: master Commit: 050ffc835057b890df25552f36da1dbf829a02ea URL: http://source.winehq.org/git/tools.git/?a=commit;h=050ffc835057b890df25552f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Oct 3 03:25:35 2017 +0200 testbot: Remove unused VM filtering and counting functions. They have not been used since the last scheduler changes. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/VMs.pm | 59 ------------------------------------------ 1 file changed, 59 deletions(-) diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 1fd72ff..dafce67 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -480,25 +480,6 @@ sub Status($;$) return $NewStatus; } -sub HasPoweredOnStatus($) -{ - my ($self) = @_; - my $Status = $self->Status; - return ($Status eq "reverting" or - $Status eq "sleeping" or - $Status eq "idle" or - $Status eq "running"); -} - -sub HasEnabledRole($) -{ - my ($self) = @_; - my $Role = $self->Role; - return ($Role eq "extra" or - $Role eq "base" or - $Role eq "winetest"); -} - sub Validate($) { my ($self) = @_; @@ -628,46 +609,6 @@ sub CreateVMs(;$) \@PropertyDescriptors, $ScopeObject); } -sub CountRevertingRunningVMs($) -{ - my ($self) = @_; - - my $RevertingVMs = 0; - my $RunningVMs = 0; - - foreach my $VM (@{$self->GetItems()}) - { - my $VMStatus = $VM->Status; - if ($VMStatus eq "reverting") - { - $RevertingVMs++; - } - elsif ($VMStatus eq "running") - { - $RunningVMs++; - } - } - - return ($RevertingVMs, $RunningVMs); -} - -sub CountPoweredOnNonBaseVMs($) -{ - my ($self) = @_; - - my $PoweredOnVMs = 0; - foreach my $VM (@{$self->GetItems()}) - { - if ($VM->Role ne "base" and $VM->HasEnabledRole() and - $VM->HasPoweredOnStatus()) - { - $PoweredOnVMs++; - } - } - - return $PoweredOnVMs; -} - sub SortKeysBySortOrder($$) { my ($self, $Keys) = @_;

1 0

Nikolay Sivov : shell32/tests: Fixed some leaks (Valgrind).
by Alexandre Julliard 02 Oct '17

02 Oct '17

Module: wine Branch: master Commit: e9c69fde09f0aca171652aaa2e26db2ef075d243 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9c69fde09f0aca171652aaa2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 2 21:46:35 2017 +0300 shell32/tests: Fixed some leaks (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shelldispatch.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index 3735c9b..9825c3a 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -638,6 +638,8 @@ static void test_items(void) SysFreeString(name); SysFreeString(bstr); + FolderItem_Release(item); + item = NULL; r = FolderItems_Item(items, str_index, &item); ok(r == S_OK, "file_defs[%d]: FolderItems::Item failed: %08x\n", i, r); @@ -1403,6 +1405,7 @@ static void test_ShellExecute(void) ok(hr == S_OK, "ShellExecute failed: %08x\n", hr); SysFreeString(name); + IShellDispatch2_Release(sd); } START_TEST(shelldispatch)

1 0

Nikolay Sivov : usp10: Remove separate invalid flag from string analysis structure.
by Alexandre Julliard 02 Oct '17

02 Oct '17

Module: wine Branch: master Commit: 3cbd598e814f9187d3a847e8b61820ac3b3bd3a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cbd598e814f9187d3a847e8b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 2 10:47:01 2017 +0300 usp10: Remove separate invalid flag from string analysis structure. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/usp10.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 5769240..0b8c28e 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -690,14 +690,14 @@ typedef struct { enum stringanalysis_flags { - SCRIPT_STRING_ANALYSIS_FLAGS_SIZE = 0x1, + SCRIPT_STRING_ANALYSIS_FLAGS_SIZE = 0x1, + SCRIPT_STRING_ANALYSIS_FLAGS_INVALID = 0x2, }; typedef struct { HDC hdc; DWORD ssa_flags; DWORD flags; - BOOL invalid; int clip_len; int cItems; int cMaxGlyphs; @@ -2367,7 +2367,7 @@ HRESULT WINAPI ScriptStringCPtoX(SCRIPT_STRING_ANALYSIS ssa, int icp, BOOL fTrai /* icp out of range */ if(icp < 0) { - analysis->invalid = TRUE; + analysis->flags |= SCRIPT_STRING_ANALYSIS_FLAGS_INVALID; return E_INVALIDARG; } @@ -2408,7 +2408,7 @@ HRESULT WINAPI ScriptStringCPtoX(SCRIPT_STRING_ANALYSIS ssa, int icp, BOOL fTrai } /* icp out of range */ - analysis->invalid = TRUE; + analysis->flags |= SCRIPT_STRING_ANALYSIS_FLAGS_INVALID; return E_INVALIDARG; } @@ -2508,7 +2508,7 @@ HRESULT WINAPI ScriptStringFree(SCRIPT_STRING_ANALYSIS *pssa) if (!pssa || !(analysis = *pssa)) return E_INVALIDARG; - invalid = analysis->invalid; + invalid = analysis->flags & SCRIPT_STRING_ANALYSIS_FLAGS_INVALID; if (analysis->glyphs) { @@ -3800,7 +3800,7 @@ HRESULT WINAPI ScriptStringValidate(SCRIPT_STRING_ANALYSIS ssa) TRACE("(%p)\n", ssa); if (!analysis) return E_INVALIDARG; - return (analysis->invalid) ? S_FALSE : S_OK; + return analysis->flags & SCRIPT_STRING_ANALYSIS_FLAGS_INVALID ? S_FALSE : S_OK; } /***********************************************************************

1 0

Nikolay Sivov : usp10: Make string analysis size part of a main structure.
by Alexandre Julliard 02 Oct '17

02 Oct '17

Module: wine Branch: master Commit: c5b41a45f92830fe64306e5b343cf0cc336fcd14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5b41a45f92830fe64306e5b3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 2 10:47:00 2017 +0300 usp10: Make string analysis size part of a main structure. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/usp10.c | 42 +++++++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index f6be836..5769240 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -688,9 +688,15 @@ typedef struct { HFONT fallbackFont; } StringGlyphs; +enum stringanalysis_flags +{ + SCRIPT_STRING_ANALYSIS_FLAGS_SIZE = 0x1, +}; + typedef struct { HDC hdc; - DWORD dwFlags; + DWORD ssa_flags; + DWORD flags; BOOL invalid; int clip_len; int cItems; @@ -699,7 +705,7 @@ typedef struct { int numItems; StringGlyphs* glyphs; SCRIPT_LOGATTR* logattrs; - SIZE* sz; + SIZE sz; int* logical2visual; } StringAnalysis; @@ -1954,7 +1960,7 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString, /* FIXME: handle clipping */ analysis->clip_len = cString; analysis->hdc = hdc; - analysis->dwFlags = dwFlags; + analysis->ssa_flags = dwFlags; if (psState) sState = *psState; @@ -2319,7 +2325,7 @@ HRESULT WINAPI ScriptStringOut(SCRIPT_STRING_ANALYSIS ssa, ssa, iX, iY, uOptions, wine_dbgstr_rect(prc), iMinSel, iMaxSel, fDisabled); if (!(analysis = ssa)) return E_INVALIDARG; - if (!(analysis->dwFlags & SSA_GLYPHS)) return E_INVALIDARG; + if (!(analysis->ssa_flags & SSA_GLYPHS)) return E_INVALIDARG; for (item = 0; item < analysis->numItems; item++) { @@ -2356,7 +2362,7 @@ HRESULT WINAPI ScriptStringCPtoX(SCRIPT_STRING_ANALYSIS ssa, int icp, BOOL fTrai TRACE("(%p), %d, %d, (%p)\n", ssa, icp, fTrailing, pX); if (!ssa || !pX) return S_FALSE; - if (!(analysis->dwFlags & SSA_GLYPHS)) return S_FALSE; + if (!(analysis->ssa_flags & SSA_GLYPHS)) return S_FALSE; /* icp out of range */ if(icp < 0) @@ -2418,7 +2424,7 @@ HRESULT WINAPI ScriptStringXtoCP(SCRIPT_STRING_ANALYSIS ssa, int iX, int* piCh, TRACE("(%p), %d, (%p), (%p)\n", ssa, iX, piCh, piTrailing); if (!ssa || !piCh || !piTrailing) return S_FALSE; - if (!(analysis->dwFlags & SSA_GLYPHS)) return S_FALSE; + if (!(analysis->ssa_flags & SSA_GLYPHS)) return S_FALSE; /* out of range */ if(iX < 0) @@ -2523,7 +2529,6 @@ HRESULT WINAPI ScriptStringFree(SCRIPT_STRING_ANALYSIS *pssa) heap_free(analysis->pItem); heap_free(analysis->logattrs); - heap_free(analysis->sz); heap_free(analysis->logical2visual); heap_free(analysis); @@ -3746,7 +3751,7 @@ HRESULT WINAPI ScriptStringGetLogicalWidths(SCRIPT_STRING_ANALYSIS ssa, int *piD TRACE("%p, %p\n", ssa, piDx); if (!analysis) return S_FALSE; - if (!(analysis->dwFlags & SSA_GLYPHS)) return S_FALSE; + if (!(analysis->ssa_flags & SSA_GLYPHS)) return S_FALSE; for (i = 0; i < analysis->numItems; i++) { @@ -3818,23 +3823,22 @@ const SIZE * WINAPI ScriptString_pSize(SCRIPT_STRING_ANALYSIS ssa) TRACE("(%p)\n", ssa); if (!analysis) return NULL; - if (!(analysis->dwFlags & SSA_GLYPHS)) return NULL; + if (!(analysis->ssa_flags & SSA_GLYPHS)) return NULL; - if (!analysis->sz) + if (!(analysis->flags & SCRIPT_STRING_ANALYSIS_FLAGS_SIZE)) { - if (!(analysis->sz = heap_alloc(sizeof(SIZE)))) return NULL; - analysis->sz->cy = analysis->glyphs[0].sc->tm.tmHeight; + analysis->sz.cy = analysis->glyphs[0].sc->tm.tmHeight; - analysis->sz->cx = 0; + analysis->sz.cx = 0; for (i = 0; i < analysis->numItems; i++) { - if (analysis->glyphs[i].sc->tm.tmHeight > analysis->sz->cy) - analysis->sz->cy = analysis->glyphs[i].sc->tm.tmHeight; + if (analysis->glyphs[i].sc->tm.tmHeight > analysis->sz.cy) + analysis->sz.cy = analysis->glyphs[i].sc->tm.tmHeight; for (j = 0; j < analysis->glyphs[i].numGlyphs; j++) - analysis->sz->cx += analysis->glyphs[i].piAdvance[j]; + analysis->sz.cx += analysis->glyphs[i].piAdvance[j]; } } - return analysis->sz; + return &analysis->sz; } /*********************************************************************** @@ -3856,7 +3860,7 @@ const SCRIPT_LOGATTR * WINAPI ScriptString_pLogAttr(SCRIPT_STRING_ANALYSIS ssa) TRACE("(%p)\n", ssa); if (!analysis) return NULL; - if (!(analysis->dwFlags & SSA_BREAK)) return NULL; + if (!(analysis->ssa_flags & SSA_BREAK)) return NULL; return analysis->logattrs; } @@ -3904,7 +3908,7 @@ HRESULT WINAPI ScriptStringGetOrder(SCRIPT_STRING_ANALYSIS ssa, UINT *order) TRACE("(%p)\n", ssa); if (!analysis) return S_FALSE; - if (!(analysis->dwFlags & SSA_GLYPHS)) return S_FALSE; + if (!(analysis->ssa_flags & SSA_GLYPHS)) return S_FALSE; /* FIXME: handle RTL scripts */ for (i = 0, k = 0; i < analysis->numItems; i++)

1 0

Nikolay Sivov : usp10: Store per-item ABC structure directly.
by Alexandre Julliard 02 Oct '17

02 Oct '17

Module: wine Branch: master Commit: abf71afdffe48a27801f23e116c7f999f2f4e7b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abf71afdffe48a27801f23e11… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 2 10:46:59 2017 +0300 usp10: Store per-item ABC structure directly. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/usp10.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index a1f9c15..f6be836 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -683,7 +683,7 @@ typedef struct { int* piAdvance; SCRIPT_VISATTR* psva; GOFFSET* pGoffset; - ABC* abc; + ABC abc; int iMaxPosX; HFONT fallbackFont; } StringGlyphs; @@ -2029,7 +2029,6 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString, int *piAdvance = heap_alloc_zero(sizeof(int) * numGlyphs); SCRIPT_VISATTR *psva = heap_alloc_zero(sizeof(SCRIPT_VISATTR) * numGlyphs); GOFFSET *pGoffset = heap_alloc_zero(sizeof(GOFFSET) * numGlyphs); - ABC *abc = heap_alloc_zero(sizeof(ABC)); int numGlyphsReturned; HFONT originalFont = 0x0; @@ -2037,7 +2036,7 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString, const WCHAR* pStr = (const WCHAR*)pString; analysis->glyphs[i].fallbackFont = NULL; - if (!glyphs || !pwLogClust || !piAdvance || !psva || !pGoffset || !abc) + if (!glyphs || !pwLogClust || !piAdvance || !psva || !pGoffset) { heap_free (BidiLevel); heap_free (glyphs); @@ -2045,7 +2044,6 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString, heap_free (piAdvance); heap_free (psva); heap_free (pGoffset); - heap_free (abc); hr = E_OUTOFMEMORY; goto error; } @@ -2078,7 +2076,7 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString, ScriptShape(hdc, sc, &pStr[analysis->pItem[i].iCharPos], cChar, numGlyphs, &analysis->pItem[i].a, glyphs, pwLogClust, psva, &numGlyphsReturned); hr = ScriptPlace(hdc, sc, glyphs, numGlyphsReturned, psva, &analysis->pItem[i].a, - piAdvance, pGoffset, abc); + piAdvance, pGoffset, &analysis->glyphs[i].abc); if (originalFont) SelectObject(hdc,originalFont); @@ -2099,7 +2097,6 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString, analysis->glyphs[i].piAdvance = piAdvance; analysis->glyphs[i].psva = psva; analysis->glyphs[i].pGoffset = pGoffset; - analysis->glyphs[i].abc = abc; analysis->glyphs[i].iMaxPosX= -1; BidiLevel[i] = analysis->pItem[i].a.s.uBidiLevel; @@ -2516,7 +2513,6 @@ HRESULT WINAPI ScriptStringFree(SCRIPT_STRING_ANALYSIS *pssa) heap_free(analysis->glyphs[i].piAdvance); heap_free(analysis->glyphs[i].psva); heap_free(analysis->glyphs[i].pGoffset); - heap_free(analysis->glyphs[i].abc); if (analysis->glyphs[i].fallbackFont) DeleteObject(analysis->glyphs[i].fallbackFont); ScriptFreeCache((SCRIPT_CACHE *)&analysis->glyphs[i].sc);

1 0

Nikolay Sivov : usp10/tests: Simple ScriptString_pSize() test.
by Alexandre Julliard 02 Oct '17

02 Oct '17

Module: wine Branch: master Commit: 82ed7410cb3cdd38b1aaa89678b10cd2f18fcb6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=82ed7410cb3cdd38b1aaa8967… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 2 10:46:58 2017 +0300 usp10/tests: Simple ScriptString_pSize() test. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/tests/usp10.c | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 4d8d6a7..47f83ee 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -3173,7 +3173,7 @@ static void test_ScriptString(HDC hdc) * This set of tests are for the string functions of uniscribe. The ScriptStringAnalyse * function allocates memory pointed to by the SCRIPT_STRING_ANALYSIS ssa pointer. This * memory is freed by ScriptStringFree. There needs to be a valid hdc for this as - * ScriptStringAnalyse calls ScriptSItemize, ScriptShape and ScriptPlace which require it. + * ScriptStringAnalyse calls ScriptItemize, ScriptShape and ScriptPlace which require it. * */ @@ -4048,6 +4048,36 @@ static void test_ScriptIsComplex(void) ok(hr == S_FALSE, "got 0x%08x\n", hr); } +static void test_ScriptString_pSize(HDC hdc) +{ + static const WCHAR textW[] = {'A',0}; + SCRIPT_STRING_ANALYSIS ssa; + const SIZE *size; + TEXTMETRICW tm; + HRESULT hr; + ABC abc; + + hr = ScriptStringAnalyse(hdc, textW, 1, 16, -1, SSA_GLYPHS, 0, NULL, NULL, NULL, NULL, NULL, &ssa); + ok(hr == S_OK, "ScriptStringAnalyse failed, hr %#x.\n", hr); + + size = ScriptString_pSize(NULL); + ok(size == NULL || broken(size != NULL) /* <win7 */, "Unexpected size pointer.\n"); + + GetCharABCWidthsW(hdc, textW[0], textW[0], &abc); + + memset(&tm, 0, sizeof(tm)); + GetTextMetricsW(hdc, &tm); + ok(tm.tmHeight > 0, "Unexpected tmHeight.\n"); + + size = ScriptString_pSize(ssa); + ok(size != NULL, "Unexpected size pointer.\n"); + ok(size->cx == abc.abcA + abc.abcB + abc.abcC, "Unexpected cx size %d.\n", size->cx); + ok(size->cy == tm.tmHeight, "Unexpected cy size %d.\n", size->cy); + + hr = ScriptStringFree(&ssa); + ok(hr == S_OK, "Failed to free ssa, hr %#x.\n", hr); +} + static void init_tests(void) { HMODULE module = GetModuleHandleA("usp10.dll"); @@ -4109,6 +4139,7 @@ START_TEST(usp10) test_ScriptXtoX(); test_ScriptString(hdc); test_ScriptStringXtoCP_CPtoX(hdc); + test_ScriptString_pSize(hdc); test_ScriptLayout(); test_digit_substitution();

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-commits October 2017