October 2017 - Wine-commits

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

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: 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: 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: 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

Akihiro Sagawa : ntdll: Treat CIFS/SMB2 file systems as remote devices.
by Alexandre Julliard 02 Oct '17

02 Oct '17

Module: wine Branch: master Commit: f9a5ad134836cf2e9acf6a93dd8460c9fd5b8833 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9a5ad134836cf2e9acf6a93d… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Oct 1 21:23:10 2017 +0900 ntdll: Treat CIFS/SMB2 file systems as remote devices. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/directory.c | 2 ++ dlls/ntdll/file.c | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 9d5cf92..3b76f9b 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -640,6 +640,7 @@ static char *parse_mount_entries( FILE *f, dev_t dev, ino_t ino ) { /* don't even bother stat'ing network mounts, there's no meaningful device anyway */ if (!strcmp( entry->mnt_type, "nfs" ) || + !strcmp( entry->mnt_type, "cifs" ) || !strcmp( entry->mnt_type, "smbfs" ) || !strcmp( entry->mnt_type, "ncpfs" )) continue; @@ -918,6 +919,7 @@ static char *get_device_mount_point( dev_t dev ) { /* don't even bother stat'ing network mounts, there's no meaningful device anyway */ if (!strcmp( entry->mnt_type, "nfs" ) || + !strcmp( entry->mnt_type, "cifs" ) || !strcmp( entry->mnt_type, "smbfs" ) || !strcmp( entry->mnt_type, "ncpfs" )) continue; diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index d498581..c12110e 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -3114,7 +3114,9 @@ static NTSTATUS get_device_info( int fd, FILE_FS_DEVICE_INFORMATION *info ) info->Characteristics |= FILE_REMOVABLE_MEDIA|FILE_READ_ONLY_DEVICE; break; case 0x6969: /* nfs */ - case 0x517B: /* smbfs */ + case 0xff534d42: /* cifs */ + case 0xfe534d42: /* smb2 */ + case 0x517b: /* smbfs */ case 0x564c: /* ncpfs */ info->DeviceType = FILE_DEVICE_NETWORK_FILE_SYSTEM; info->Characteristics |= FILE_REMOTE_DEVICE;

1 0

Fabian Maurer : midimap: Add warning for user in case midi won't work.
by Alexandre Julliard 02 Oct '17

02 Oct '17

Module: wine Branch: master Commit: e9d25b834ceb91544a81581320cc7f3327faef39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9d25b834ceb91544a8158132… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Sep 30 22:07:08 2017 +0200 midimap: Add warning for user in case midi won't work. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/midimap/midimap.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/midimap/midimap.c b/dlls/midimap/midimap.c index 64b4dc8..f36b252 100644 --- a/dlls/midimap/midimap.c +++ b/dlls/midimap/midimap.c @@ -77,6 +77,7 @@ */ WINE_DEFAULT_DEBUG_CHANNEL(msacm); +WINE_DECLARE_DEBUG_CHANNEL(winediag); typedef struct tagMIDIOUTPORT { @@ -553,6 +554,8 @@ static LRESULT MIDIMAP_drvOpen(void) { MIDIOUTCAPSW moc; unsigned dev, i; + WCHAR throughportW[] = {'M','i','d','i',' ','T','h','r','o','u','g','h',0}; + BOOL found_valid_port = FALSE; if (midiOutPorts) return 0; @@ -571,6 +574,8 @@ static LRESULT MIDIMAP_drvOpen(void) midiOutPorts[dev].lpbPatch = NULL; for (i = 0; i < 16; i++) midiOutPorts[dev].aChn[i] = i; + if (strncmpW(midiOutPorts[0].name, throughportW, strlenW(throughportW)) != 0) + found_valid_port = TRUE; } else { @@ -578,6 +583,9 @@ static LRESULT MIDIMAP_drvOpen(void) } } + if (!found_valid_port) + ERR_(winediag)("No software synthesizer midi port found, Midi sound output probably won't work.\n"); + return 1; }

1 0

Huw Davies : winhttp: Move the authorization code above send_request().
by Alexandre Julliard 02 Oct '17

02 Oct '17

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

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

02 Oct '17

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 : dwrite: Use the correct array index.
by Alexandre Julliard 02 Oct '17

02 Oct '17

Module: wine Branch: master Commit: cd746afd0dc81a0852212a8dd42aab7d23957898 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd746afd0dc81a0852212a8dd… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 2 10:26:22 2017 +0100 dwrite: Use the correct array index. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index ed66929..bb08017 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -2298,7 +2298,7 @@ static ULONG WINAPI fontfallbackbuilder_Release(IDWriteFontFallbackBuilder *ifac UINT32 j; for (j = 0; j < mapping->families_count; j++) - heap_free(mapping->families[i]); + heap_free(mapping->families[j]); heap_free(mapping->families); if (mapping->collection)

1 0