October 2017 - Wine-Commits

Francois Gouget : testbot: Better document the configuration options.
by Alexandre Julliard Oct. 3, 2017

Oct. 3, 2017

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: Document WineTestBot::Log::SetupRedirects().
by Alexandre Julliard Oct. 3, 2017

Oct. 3, 2017

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 Oct. 3, 2017

Oct. 3, 2017

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: Remove unused VM filtering and counting functions.
by Alexandre Julliard Oct. 3, 2017

Oct. 3, 2017

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

Francois Gouget : testbot: Add Emacs directives to automatically get 2-space indentation.
by Alexandre Julliard Oct. 3, 2017

Oct. 3, 2017

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

Nikolay Sivov : usp10: Make string analysis size part of a main structure.
by Alexandre Julliard Oct. 2, 2017

Oct. 2, 2017

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

Akihiro Sagawa : po: Update Japanese translation.
by Alexandre Julliard Oct. 2, 2017

Oct. 2, 2017

Module: wine Branch: master Commit: b96688aa0bffd47322ec4a647cded1821b2df265 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b96688aa0bffd47322ec4a647… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Oct 2 23:05:10 2017 +0900 po: Update Japanese translation. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ja.po | 116 ++++++++++++++------------------------------------------------- 1 file changed, 25 insertions(+), 91 deletions(-) diff --git a/po/ja.po b/po/ja.po index 6bc81a3..b787108 100644 --- a/po/ja.po +++ b/po/ja.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-07-08 15:45+0900\n" +"PO-Revision-Date: 2017-10-02 22:05+0900\n" "Last-Translator: Akihiro Sagawa <sagawa.aki(a)gmail.com>\n" "Language-Team: Japanese\n" "Language: ja\n" @@ -7250,19 +7250,19 @@ msgstr "キー: [1], 名前: [2], 値: [3]" #: msi.rc:71 msgid "{{Fatal error: }}" -msgstr "" +msgstr "{{致命的エラー: }}" #: msi.rc:72 msgid "{{Error [1]. }}" -msgstr "" +msgstr "{{エラー [1]。 }}" #: msi.rc:73 msgid "Warning [1]." -msgstr "" +msgstr "警告 [1]。" #: msi.rc:74 msgid "Info [1]." -msgstr "情報 [1]." +msgstr "情報 [1]。" #: msi.rc:75 msgid "" @@ -7275,48 +7275,40 @@ msgstr "" "[3], [4]}}" #: msi.rc:76 -#, fuzzy -#| msgid "Disk full.\n" msgid "{{Disk full: }}" -msgstr "ディスクがいっぱいです。\n" +msgstr "{{ディスク領域不足: }}" #: msi.rc:77 -#, fuzzy -#| msgid "Action %s: [1]. [2]" msgid "Action [Time]: [1]. [2]" -msgstr "アクション %s: [1]. [2]" +msgstr "アクション [Time]: [1]。 [2]" #: msi.rc:78 msgid "Message type: [1], Argument: [2]{, [3]}" msgstr "メッセージ種別: [1], 引数: [2]{, [3]}" #: msi.rc:81 -#, fuzzy -#| msgid "=== Logging started: %s %s ===" msgid "=== Logging started: [Date] [Time] ===" -msgstr "=== ログの開始: %s %s ===" +msgstr "=== ログの開始: [Date] [Time] ===" #: msi.rc:79 -#, fuzzy -#| msgid "Action start %s: [1]." msgid "Action start [Time]: [1]." -msgstr "アクション開始 %s: [1]." +msgstr "アクション開始 [Time]: [1]。" #: msi.rc:80 -#, fuzzy -#| msgid "Action ended %s: [1]. Return value [2]." msgid "Action ended [Time]: [1]. Return value [2]." -msgstr "アクション終了 %s: [1]. 戻り値 [2]." +msgstr "アクション終了 [Time]: [1]。戻り値 [2]。" #: msi.rc:83 msgid "Please insert the disk: [2]" -msgstr "" +msgstr "ディスクを挿入してください: [2]" #: msi.rc:84 msgid "" "Source file not found{{(cabinet)}}: [2]. Verify that the file exists and " "that you can access it." msgstr "" +"コピー元のファイルが見つかりません{{(cabファイル))}}: [2]。ファイルが存在" +"し、アクセスできることを確認してください。" #: msrle32.rc:31 msgid "Wine MS-RLE video codec" @@ -11975,17 +11967,6 @@ msgid "Icons (*.ico)" msgstr "アイコン (*.ico)" #: reg.rc:35 -#, fuzzy -#| msgid "" -#| "Usage:\n" -#| " REG [operation] [parameters]\n" -#| "\n" -#| "Supported operations:\n" -#| " ADD | DELETE | QUERY\n" -#| "\n" -#| "For help on a specific operation, type:\n" -#| " REG [operation] /?\n" -#| "\n" msgid "" "Usage:\n" " REG [operation] [parameters]\n" @@ -12001,7 +11982,7 @@ msgstr "" " REG [操作] [パラメータ]\n" "\n" "対応している操作:\n" -" ADD | DELETE | QUERY\n" +" ADD | DELETE | IMPORT | QUERY\n" "\n" "特定の操作に対するヘルプは以下を入力:\n" " REG [操作] /?\n" @@ -12129,25 +12110,19 @@ msgstr "(値の設定なし)" #: reg.rc:66 msgid "REG IMPORT file.reg\n" -msgstr "" +msgstr "REG IMPORT ファイル.reg\n" #: reg.rc:67 -#, fuzzy -#| msgid "regedit: The file '%1' was not found.\n" msgid "reg: The file '%1' was not found.\n" -msgstr "regedit: ファイル '%1' が見つかりません。\n" +msgstr "reg: ファイル '%1' が見つかりません。\n" #: reg.rc:68 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "reg: Unable to open the registry key '%1'.\n" -msgstr "regedit: レジストリキー '%1' を開けません。\n" +msgstr "reg: レジストリキー '%1' を開けません。\n" #: reg.rc:69 -#, fuzzy -#| msgid "regedit: Unrecognized escape sequence [\\%1!c!]\n" msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" -msgstr "regedit: 認識できないエスケープシーケンスです [%1!c!]\n" +msgstr "reg: 認識できないエスケープシーケンスです [\\%1!c!]\n" #: regedit.rc:34 msgid "&Registry" @@ -12414,38 +12389,6 @@ msgstr "" "ファイルではありません。" #: regedit.rc:408 -#, fuzzy -#| msgid "" -#| "Usage:\n" -#| " regedit [options] [filename] [reg_key]\n" -#| "\n" -#| "Options:\n" -#| " [no option] Launch the graphical version of this program.\n" -#| " /L:system.dat The location of the system.dat file to be modified.\n" -#| " Compatible with any other switch. Ignored.\n" -#| " /R:user.dat The location of the user.dat file to be modified.\n" -#| " Compatible with any other switch. Ignored.\n" -#| " /C Import the contents of a registry file.\n" -#| " /D Delete a specified registry key.\n" -#| " /E Export the contents of a specified registry key to a " -#| "file.\n" -#| " If no key is specified, the entire registry is " -#| "exported.\n" -#| " /S Silent mode. No messages will be displayed.\n" -#| " /V Launch the GUI in advanced mode. Ignored.\n" -#| " /? Display this information and exit.\n" -#| " [filename] The location of the file containing registry information " -#| "to\n" -#| " be imported. When used with [/E], this option specifies " -#| "the\n" -#| " file location where registry information will be " -#| "exported.\n" -#| " [reg_key] The registry key to be modified.\n" -#| "\n" -#| "Usage examples:\n" -#| " regedit \"import.reg\"\n" -#| " regedit /E \"export.reg\" \"HKEY_CURRENT_USER\\Console\"\n" -#| " regedit /D \"HKEY_LOCAL_MACHINE\\Error\\Path\"\n" msgid "" "Usage:\n" " regedit [options] [filename] [reg_key]\n" @@ -12501,7 +12444,7 @@ msgstr "" "使い方の例:\n" " regedit \"import.reg\"\n" " regedit /E \"export.reg\" \"HKEY_CURRENT_USER\\Console\"\n" -" regedit /D \"HKEY_LOCAL_MACHINE\\Error\\Path\"\n" +" regedit /D \"HKEY_LOCAL_MACHINE\\Key\\Path\"\n" #: regedit.rc:409 msgid "regedit: Invalid or unrecognized switch [%1]\n" @@ -12549,7 +12492,7 @@ msgstr "" #: regedit.rc:419 msgid "regedit: Unrecognized escape sequence [\\%1!c!]\n" -msgstr "regedit: 認識できないエスケープシーケンスです [%1!c!]\n" +msgstr "regedit: 認識できないエスケープシーケンスです [\\%1!c!]\n" #: regedit.rc:420 msgid "regedit: Unsupported registry data type [0x%1!x!]\n" @@ -12572,12 +12515,11 @@ msgid "regedit: Unable to open the registry key '%1'.\n" msgstr "regedit: レジストリキー '%1' を開けません。\n" #: regedit.rc:425 -#, fuzzy -#| msgid "regedit: Unsupported registry data type [%1] encountered in '%2'.\n" msgid "" "regedit: Unsupported registry data type [0x%1!x!] encountered in '%2'.\n" msgstr "" -"regedit: サポートされていないレジストリデータ型 [%1] が '%2' にあります。\n" +"regedit: サポートされていないレジストリデータ型 [0x%1!x!] が '%2' にありま" +"す。\n" #: regedit.rc:426 msgid "regedit: The registry value '%1' will be exported as binary data.\n" @@ -12585,10 +12527,8 @@ msgstr "" "regedit: レジストリ値 '%1' はバイナリデータとしてエクスポートされます。\n" #: regedit.rc:427 -#, fuzzy -#| msgid "reg: Invalid key name\n" msgid "regedit: Invalid system key [%1]\n" -msgstr "reg: キー名が無効です\n" +msgstr "regedit: システムキーが無効です [%1]\n" #: regedit.rc:428 msgid "" @@ -12597,10 +12537,8 @@ msgstr "" "regedit: '%1' をエクスポートできません。指定されたキーが見つかりません。\n" #: regedit.rc:429 -#, fuzzy -#| msgid "regedit: Unable to delete the registry class '%1'.\n" msgid "regedit: Unable to delete the registry key '%1'.\n" -msgstr "regedit: レジストリクラス '%1' を削除できません。\n" +msgstr "regedit: レジストリキー '%1' を削除できません。\n" #: regedit.rc:431 msgid "regedit: The line contains invalid syntax.\n" @@ -12747,13 +12685,9 @@ msgid "Confirm Key Delete" msgstr "値の削除確認" #: regedit.rc:213 -#, fuzzy -#| msgid "" -#| "Are you sure you want to delete the registry key '%1' and all of its " -#| "subkeys?" msgid "" "Are you sure you want to delete this registry key and all of its subkeys?" -msgstr "本当にレジストリキー '%1' とそのサブキーを削除しますか?" +msgstr "本当にこのレジストリキーとそのサブキーすべてを削除しますか?" #: regedit.rc:199 msgid "Expands or collapses the selected node"

1 0

Huw Davies : winhttp: Send basic authorization credentials with the first request if they' ve been set.
by Alexandre Julliard Oct. 2, 2017

Oct. 2, 2017

Module: wine Branch: master Commit: 6ce8624760a219cea311b70246df6b455c706ab3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ce8624760a219cea311b7024… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 2 09:47:27 2017 +0100 winhttp: Send basic authorization credentials with the first request if they've been set. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 10 ++++++--- dlls/winhttp/tests/winhttp.c | 50 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+), 3 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 05f4b96..a355887 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1142,24 +1142,25 @@ static BOOL do_authorization( request_t *request, DWORD target, DWORD scheme_fla const WCHAR *auth_target, *username, *password; WCHAR auth_value[2048], *auth_reply; DWORD len = sizeof(auth_value), len_scheme, flags; - BOOL ret; + BOOL ret, has_auth_value; if (scheme == SCHEME_INVALID) return FALSE; switch (target) { case WINHTTP_AUTH_TARGET_SERVER: - if (!get_authvalue( request, WINHTTP_QUERY_WWW_AUTHENTICATE, scheme_flag, auth_value, len )) - return FALSE; + has_auth_value = get_authvalue( request, WINHTTP_QUERY_WWW_AUTHENTICATE, scheme_flag, auth_value, len ); auth_ptr = &request->authinfo; auth_target = attr_authorization; if (request->creds[TARGET_SERVER][scheme].username) { + if (scheme != SCHEME_BASIC && !has_auth_value) return FALSE; username = request->creds[TARGET_SERVER][scheme].username; password = request->creds[TARGET_SERVER][scheme].password; } else { + if (!has_auth_value) return FALSE; username = request->connect->username; password = request->connect->password; } @@ -2086,6 +2087,9 @@ static BOOL send_request( request_t *request, LPCWSTR headers, DWORD headers_len if (connect->hostname) add_host_header( request, WINHTTP_ADDREQ_FLAG_ADD_IF_NEW ); + if (request->creds[TARGET_SERVER][SCHEME_BASIC].username) + do_authorization( request, WINHTTP_AUTH_TARGET_SERVER, WINHTTP_AUTH_SCHEME_BASIC ); + if (total_len || (request->verb && !strcmpW( request->verb, postW ))) { WCHAR length[21]; /* decimal long int + null */ diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 2babe98..469b882 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -2075,6 +2075,7 @@ static const char largeauth[] = static const char unauthorized[] = "Unauthorized"; static const char hello_world[] = "Hello World"; +static const char auth_unseen[] = "Auth Unseen"; struct server_info { @@ -2134,6 +2135,15 @@ static DWORD CALLBACK server_thread(LPVOID param) send(c, okmsg, sizeof okmsg - 1, 0); send(c, page1, sizeof page1 - 1, 0); } + if (strstr(buffer, "/auth_with_creds")) + { + send(c, okauthmsg, sizeof okauthmsg - 1, 0); + if (strstr(buffer, "Authorization: Basic dXNlcjpwd2Q=")) + send(c, hello_world, sizeof hello_world - 1, 0); + else + send(c, auth_unseen, sizeof auth_unseen - 1, 0); + continue; + } if (strstr(buffer, "/auth")) { if (strstr(buffer, "Authorization: Basic dXNlcjpwd2Q=")) @@ -2309,6 +2319,7 @@ static void test_basic_request(int port, const WCHAR *verb, const WCHAR *path) static void test_basic_authentication(int port) { static const WCHAR authW[] = {'/','a','u','t','h',0}; + static const WCHAR auth_with_credsW[] = {'/','a','u','t','h','_','w','i','t','h','_','c','r','e','d','s',0}; static WCHAR userW[] = {'u','s','e','r',0}; static WCHAR passW[] = {'p','w','d',0}; static WCHAR pass2W[] = {'p','w','d','2',0}; @@ -2472,6 +2483,45 @@ static void test_basic_authentication(int port) WinHttpCloseHandle(con); WinHttpCloseHandle(ses); + /* now set the credentials first to show that they get sent with the first request */ + ses = WinHttpOpen(test_useragent, WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0); + ok(ses != NULL, "failed to open session %u\n", GetLastError()); + + con = WinHttpConnect(ses, localhostW, port, 0); + ok(con != NULL, "failed to open a connection %u\n", GetLastError()); + + req = WinHttpOpenRequest(con, NULL, auth_with_credsW, NULL, NULL, NULL, 0); + ok(req != NULL, "failed to open a request %u\n", GetLastError()); + + ret = WinHttpSetCredentials(req, WINHTTP_AUTH_TARGET_SERVER, WINHTTP_AUTH_SCHEME_BASIC, userW, passW, NULL); + ok(ret, "failed to set credentials %u\n", GetLastError()); + + ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); + ok(ret, "failed to send request %u\n", GetLastError()); + + ret = WinHttpReceiveResponse(req, NULL); + ok(ret, "failed to receive response %u\n", GetLastError()); + + status = 0xdeadbeef; + size = sizeof(status); + ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); + ok(ret, "failed to query status code %u\n", GetLastError()); + ok(status == HTTP_STATUS_OK, "request failed unexpectedly %u\n", status); + + size = 0; + ret = WinHttpReadData(req, buffer, sizeof(buffer), &size); + error = GetLastError(); + ok(ret || broken(error == ERROR_WINHTTP_SHUTDOWN || error == ERROR_WINHTTP_TIMEOUT) /* XP */, "failed to read data %u\n", GetLastError()); + if (ret) + { + ok(size == 11, "expected 11, got %u\n", size); + ok(!memcmp(buffer, hello_world, 11), "got %s\n", buffer); + } + + WinHttpCloseHandle(req); + WinHttpCloseHandle(con); + WinHttpCloseHandle(ses); + /* credentials set with WinHttpSetCredentials take precedence over those set through options */ ses = WinHttpOpen(test_useragent, WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0);

1 0

Huw Davies : winhttp: Move the authorization code above send_request().
by Alexandre Julliard Oct. 2, 2017

Oct. 2, 2017

Module: wine Branch: master Commit: 9c2cce092358177b403fbd396fa2ee7b39eecc47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c2cce092358177b403fbd396… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 2 09:47:26 2017 +0100 winhttp: Move the authorization code above send_request(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 2095 ++++++++++++++++++++++++------------------------ 1 file changed, 1048 insertions(+), 1047 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9c2cce092358177b403fb…

1 0

Nikolay Sivov : usp10: Return whole SCRIPT_FONTPROPERTIES structure.
by Alexandre Julliard Oct. 2, 2017

Oct. 2, 2017

Module: wine Branch: master Commit: 40bc04ae6196d21716db736a9ba0e5ea5a77d6df URL: http://source.winehq.org/git/wine.git/?a=commit;h=40bc04ae6196d21716db736a9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 2 10:46:57 2017 +0300 usp10: Return whole SCRIPT_FONTPROPERTIES 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/tests/usp10.c | 1 + dlls/usp10/usp10.c | 8 +++----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index cd129ff..4d8d6a7 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -2515,6 +2515,7 @@ static void test_ScriptGetFontProperties(HDC hdc) hr = ScriptGetFontProperties(hdc,&psc,&sfp); ok( hr == E_INVALIDARG, "(hdc,&psc,&sfp) invalid, expected E_INVALIDARG, got %08x\n", hr); ok( psc != NULL, "Expected a pointer in psc, got NULL\n"); + ok( sfp.cBytes == sizeof(SCRIPT_FONTPROPERTIES) - 1, "Unexpected cBytes.\n"); ScriptFreeCache(&psc); ok( psc == NULL, "Expected psc to be NULL, got %p\n", psc); diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 40fc89a..a1f9c15 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -741,6 +741,8 @@ BOOL usp10_array_reserve(void **elements, SIZE_T *capacity, SIZE_T count, SIZE_T /* TODO Fix font properties on Arabic locale */ static inline BOOL set_cache_font_properties(const HDC hdc, ScriptCache *sc) { + sc->sfp.cBytes = sizeof(sc->sfp); + if (!sc->sfnt) { sc->sfp.wgBlank = sc->tm.tmBreakChar; @@ -788,11 +790,7 @@ static inline BOOL set_cache_font_properties(const HDC hdc, ScriptCache *sc) static inline void get_cache_font_properties(SCRIPT_FONTPROPERTIES *sfp, ScriptCache *sc) { - sfp->wgBlank = sc->sfp.wgBlank; - sfp->wgDefault = sc->sfp.wgDefault; - sfp->wgInvalid = sc->sfp.wgInvalid; - sfp->wgKashida = sc->sfp.wgKashida; - sfp->iKashidaWidth = sc->sfp.iKashidaWidth; + *sfp = sc->sfp; } static inline LONG get_cache_height(SCRIPT_CACHE *psc)

1 0