wine-commits May 2014

wine-commits@winehq.org

2 participants
404 discussions

Zhenbo Li : mshtml: Removed invalid nsAString_InitDepend from HTMLTableRow_put_bgColor and fixed error handling.
by Alexandre Julliard 05 May '14

05 May '14

Module: wine Branch: master Commit: 8192f54998b8ed3f892243ea5f6e84c6ca5d662a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8192f54998b8ed3f892243ea5… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Sat May 3 17:40:17 2014 +0800 mshtml: Removed invalid nsAString_InitDepend from HTMLTableRow_put_bgColor and fixed error handling. --- dlls/mshtml/htmltablerow.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmltablerow.c b/dlls/mshtml/htmltablerow.c index 74750bd..331d6c9 100644 --- a/dlls/mshtml/htmltablerow.c +++ b/dlls/mshtml/htmltablerow.c @@ -175,8 +175,9 @@ static HRESULT WINAPI HTMLTableRow_put_bgColor(IHTMLTableRow *iface, VARIANT v) TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); - nsAString_InitDepend(&val, V_BSTR(&v)); - variant_to_nscolor(&v, &val); + if (!variant_to_nscolor(&v, &val)) + return S_OK; + nsres = nsIDOMHTMLTableRowElement_SetBgColor(This->nsrow, &val); nsAString_Finish(&val);

1 0

Vincent Povirk : ole32: Initial implementation of transaction locking.
by Alexandre Julliard 05 May '14

05 May '14

Module: wine Branch: master Commit: 4f0d36d9a0339f5f853064bbf4fdc0d320ab82f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f0d36d9a0339f5f853064bbf… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Apr 23 14:55:56 2014 -0500 ole32: Initial implementation of transaction locking. --- dlls/ole32/storage32.c | 310 ++++++++++++++++++++++++++++++++---------- dlls/ole32/storage32.h | 28 ++++ dlls/ole32/tests/storage32.c | 4 +- 3 files changed, 268 insertions(+), 74 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4f0d36d9a0339f5f85306…

1 0

Vincent Povirk : ole32: Accept STGM_TRANSACTED with no share mode specified.
by Alexandre Julliard 05 May '14

05 May '14

Module: wine Branch: master Commit: b4ade51a84a8cf865e6980d480cacb878a66b0f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4ade51a84a8cf865e6980d48… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Apr 23 11:25:25 2014 -0500 ole32: Accept STGM_TRANSACTED with no share mode specified. --- dlls/ole32/storage32.c | 7 +++++++ dlls/ole32/tests/storage32.c | 9 +++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 72c52f1..a2d00b1 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -8251,6 +8251,10 @@ static HRESULT validateSTGM(DWORD stgm) case STGM_SHARE_DENY_WRITE: case STGM_SHARE_EXCLUSIVE: break; + case 0: + if (!(stgm & STGM_TRANSACTED)) + return E_FAIL; + break; default: return E_FAIL; } @@ -8306,6 +8310,9 @@ static DWORD GetShareModeFromSTGM(DWORD stgm) { switch (STGM_SHARE_MODE(stgm)) { + case 0: + assert(stgm & STGM_TRANSACTED); + /* fall-through */ case STGM_SHARE_DENY_NONE: return FILE_SHARE_READ | FILE_SHARE_WRITE; case STGM_SHARE_DENY_READ: diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index 2cb73ce..b5c93ae 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -3178,9 +3178,9 @@ static const struct lock_test lock_tests[] = { { STGM_CREATE|STGM_WRITE|STGM_SHARE_DENY_WRITE|STGM_TRANSACTED, TRUE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, wodw_locked_bytes, 0, FALSE }, { STGM_SHARE_EXCLUSIVE|STGM_READWRITE, FALSE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, rwex_locked_bytes, rwex_fail_ranges, FALSE }, { STGM_SHARE_EXCLUSIVE|STGM_READWRITE|STGM_TRANSACTED, FALSE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, rwex_locked_bytes, rwex_fail_ranges, FALSE }, - { STGM_READWRITE|STGM_TRANSACTED, FALSE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, rw_locked_bytes, rw_fail_ranges, TRUE }, + { STGM_READWRITE|STGM_TRANSACTED, FALSE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, rw_locked_bytes, rw_fail_ranges, FALSE }, { STGM_READ|STGM_SHARE_DENY_WRITE, FALSE, GENERIC_READ, FILE_SHARE_READ, no_locked_bytes, dw_fail_ranges, TRUE }, - { STGM_READ|STGM_TRANSACTED, FALSE, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, tr_locked_bytes, tr_fail_ranges, TRUE }, + { STGM_READ|STGM_TRANSACTED, FALSE, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, tr_locked_bytes, tr_fail_ranges, FALSE }, { STGM_READ|STGM_SHARE_EXCLUSIVE, FALSE, GENERIC_READ, FILE_SHARE_READ, roex_locked_bytes, roex_fail_ranges, TRUE }, { STGM_READ|STGM_SHARE_EXCLUSIVE|STGM_TRANSACTED, FALSE, GENERIC_READ, FILE_SHARE_READ, roex_locked_bytes, roex_fail_ranges, TRUE }, }; @@ -3280,10 +3280,7 @@ static void test_locking(void) IStorage_Release(stg); hr = StgOpenStorage(filename, NULL, current->stg_mode, NULL, 0, &stg); - if (current->stg_mode == (STGM_READ|STGM_TRANSACTED) || current->stg_mode == (STGM_READWRITE|STGM_TRANSACTED)) - todo_wine ok(SUCCEEDED(hr), "StgOpenStorage with mode %x failed with hr %x\n", current->stg_mode, hr); - else - ok(SUCCEEDED(hr), "StgOpenStorage with mode %x failed with hr %x\n", current->stg_mode, hr); + ok(SUCCEEDED(hr), "StgOpenStorage with mode %x failed with hr %x\n", current->stg_mode, hr); if (FAILED(hr)) { DeleteFileW(filename);

1 0

Vincent Povirk : ole32: Map STGM_SHARE_EXCLUSIVE to FILE_SHARE_READ.
by Alexandre Julliard 05 May '14

05 May '14

Module: wine Branch: master Commit: 6417a277cf4bdb3a739446d900d07269498d81a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6417a277cf4bdb3a739446d90… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Apr 23 10:53:26 2014 -0500 ole32: Map STGM_SHARE_EXCLUSIVE to FILE_SHARE_READ. --- dlls/ole32/storage32.c | 3 +-- dlls/ole32/tests/storage32.c | 10 ++++------ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index fd8fe32..72c52f1 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -8311,9 +8311,8 @@ static DWORD GetShareModeFromSTGM(DWORD stgm) case STGM_SHARE_DENY_READ: return FILE_SHARE_WRITE; case STGM_SHARE_DENY_WRITE: - return FILE_SHARE_READ; case STGM_SHARE_EXCLUSIVE: - return 0; + return FILE_SHARE_READ; } ERR("Invalid share mode!\n"); assert(0); diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index 5eb80bc..2cb73ce 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -868,11 +868,9 @@ static void test_storage_refcount(void) r = StgOpenStorage( filename, NULL, STGM_PRIORITY, NULL, 0, &stgprio); ok(r==S_OK, "StgOpenStorage failed with error 0x%08x\n", r); - todo_wine { /* non-transacted mode read/write fails */ r = StgOpenStorage( filename, NULL, STGM_SHARE_EXCLUSIVE|STGM_READWRITE, NULL, 0, &stg); ok(r==STG_E_LOCKVIOLATION, "StgOpenStorage should return STG_E_LOCKVIOLATION instead of 0x%08x\n", r); - } /* non-transacted mode read-only succeeds */ r = StgOpenStorage( filename, NULL, STGM_SHARE_DENY_WRITE|STGM_READ, NULL, 0, &stg); @@ -3173,13 +3171,13 @@ static const int roex_fail_ranges[] = { 0x0,-1 }; static const struct lock_test lock_tests[] = { { STGM_PRIORITY, FALSE, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, priority_locked_bytes, pr_fail_ranges, FALSE }, - { STGM_CREATE|STGM_SHARE_EXCLUSIVE|STGM_READWRITE, TRUE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, rwex_locked_bytes, 0, TRUE }, - { STGM_CREATE|STGM_SHARE_EXCLUSIVE|STGM_READWRITE|STGM_TRANSACTED, TRUE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, rwex_locked_bytes, 0, TRUE }, + { STGM_CREATE|STGM_SHARE_EXCLUSIVE|STGM_READWRITE, TRUE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, rwex_locked_bytes, 0, FALSE }, + { STGM_CREATE|STGM_SHARE_EXCLUSIVE|STGM_READWRITE|STGM_TRANSACTED, TRUE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, rwex_locked_bytes, 0, FALSE }, { STGM_CREATE|STGM_READWRITE|STGM_TRANSACTED, TRUE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, rw_locked_bytes, 0, FALSE }, { STGM_CREATE|STGM_READWRITE|STGM_SHARE_DENY_WRITE|STGM_TRANSACTED, TRUE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, rwdw_locked_bytes, 0, FALSE }, { STGM_CREATE|STGM_WRITE|STGM_SHARE_DENY_WRITE|STGM_TRANSACTED, TRUE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, wodw_locked_bytes, 0, FALSE }, - { STGM_SHARE_EXCLUSIVE|STGM_READWRITE, FALSE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, rwex_locked_bytes, rwex_fail_ranges, TRUE }, - { STGM_SHARE_EXCLUSIVE|STGM_READWRITE|STGM_TRANSACTED, FALSE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, rwex_locked_bytes, rwex_fail_ranges, TRUE }, + { STGM_SHARE_EXCLUSIVE|STGM_READWRITE, FALSE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, rwex_locked_bytes, rwex_fail_ranges, FALSE }, + { STGM_SHARE_EXCLUSIVE|STGM_READWRITE|STGM_TRANSACTED, FALSE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, rwex_locked_bytes, rwex_fail_ranges, FALSE }, { STGM_READWRITE|STGM_TRANSACTED, FALSE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, rw_locked_bytes, rw_fail_ranges, TRUE }, { STGM_READ|STGM_SHARE_DENY_WRITE, FALSE, GENERIC_READ, FILE_SHARE_READ, no_locked_bytes, dw_fail_ranges, TRUE }, { STGM_READ|STGM_TRANSACTED, FALSE, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, tr_locked_bytes, tr_fail_ranges, TRUE },

1 0

Vincent Povirk : ole32: Use share modes when creating storage files.
by Alexandre Julliard 05 May '14

05 May '14

Module: wine Branch: master Commit: 04735d6f398ffb4a93dbf81778765e35c4f414fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=04735d6f398ffb4a93dbf8177… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Apr 23 10:27:25 2014 -0500 ole32: Use share modes when creating storage files. --- dlls/ole32/storage32.c | 9 +-------- dlls/ole32/tests/storage32.c | 4 ++-- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index b9e20d8..fd8fe32 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -7562,7 +7562,7 @@ static HRESULT create_storagefile( /* * Interpret the STGM value grfMode */ - shareMode = FILE_SHARE_READ | FILE_SHARE_WRITE; + shareMode = GetShareModeFromSTGM(grfMode); accessMode = GetAccessModeFromSTGM(grfMode); if (grfMode & STGM_DELETEONRELEASE) @@ -7570,13 +7570,6 @@ static HRESULT create_storagefile( else fileAttributes = FILE_ATTRIBUTE_NORMAL | FILE_FLAG_RANDOM_ACCESS; - if (STGM_SHARE_MODE(grfMode) && !(grfMode & STGM_SHARE_DENY_NONE)) - { - static int fixme; - if (!fixme++) - FIXME("Storage share mode not implemented.\n"); - } - *ppstgOpen = 0; hFile = CreateFileW(pwcsName, diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index 6162e61..5eb80bc 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -3176,8 +3176,8 @@ static const struct lock_test lock_tests[] = { { STGM_CREATE|STGM_SHARE_EXCLUSIVE|STGM_READWRITE, TRUE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, rwex_locked_bytes, 0, TRUE }, { STGM_CREATE|STGM_SHARE_EXCLUSIVE|STGM_READWRITE|STGM_TRANSACTED, TRUE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, rwex_locked_bytes, 0, TRUE }, { STGM_CREATE|STGM_READWRITE|STGM_TRANSACTED, TRUE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, rw_locked_bytes, 0, FALSE }, - { STGM_CREATE|STGM_READWRITE|STGM_SHARE_DENY_WRITE|STGM_TRANSACTED, TRUE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, rwdw_locked_bytes, 0, TRUE }, - { STGM_CREATE|STGM_WRITE|STGM_SHARE_DENY_WRITE|STGM_TRANSACTED, TRUE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, wodw_locked_bytes, 0, TRUE }, + { STGM_CREATE|STGM_READWRITE|STGM_SHARE_DENY_WRITE|STGM_TRANSACTED, TRUE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, rwdw_locked_bytes, 0, FALSE }, + { STGM_CREATE|STGM_WRITE|STGM_SHARE_DENY_WRITE|STGM_TRANSACTED, TRUE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, wodw_locked_bytes, 0, FALSE }, { STGM_SHARE_EXCLUSIVE|STGM_READWRITE, FALSE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, rwex_locked_bytes, rwex_fail_ranges, TRUE }, { STGM_SHARE_EXCLUSIVE|STGM_READWRITE|STGM_TRANSACTED, FALSE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, rwex_locked_bytes, rwex_fail_ranges, TRUE }, { STGM_READWRITE|STGM_TRANSACTED, FALSE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, rw_locked_bytes, rw_fail_ranges, TRUE },

1 0

Vincent Povirk : ole32: Use symbolic names for range lock offsets.
by Alexandre Julliard 05 May '14

05 May '14

Module: wine Branch: master Commit: a60d41d70ad76df44e29051aa9f01a987ee3581c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a60d41d70ad76df44e29051aa… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri May 2 12:52:00 2014 -0500 ole32: Use symbolic names for range lock offsets. --- dlls/ole32/storage32.c | 61 +++++++++++++++++------------------------------- dlls/ole32/storage32.h | 47 ++++++++++++++++++++++++++++++++++++- 2 files changed, 67 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a60d41d70ad76df44e290…

1 0

Francois Gouget : testbot/CGI: Fix the GetCurrentSession() call in ObjectModel::CGI::Page.
by Alexandre Julliard 05 May '14

05 May '14

Module: tools Branch: master Commit: ca706ed1b11197b5e368ffd57544c2814f0852e7 URL: http://source.winehq.org/git/tools.git/?a=commit;h=ca706ed1b11197b5e368ffd5… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri May 2 19:51:39 2014 +0200 testbot/CGI: Fix the GetCurrentSession() call in ObjectModel::CGI::Page. It was passing too many parameters. --- testbot/lib/ObjectModel/CGI/Page.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/ObjectModel/CGI/Page.pm b/testbot/lib/ObjectModel/CGI/Page.pm index 0661519..331243c 100644 --- a/testbot/lib/ObjectModel/CGI/Page.pm +++ b/testbot/lib/ObjectModel/CGI/Page.pm @@ -172,7 +172,7 @@ sub GetCurrentSession { my $self = shift; - return $self->{PageBase}->GetCurrentSession($self, @_); + return $self->{PageBase}->GetCurrentSession(); } sub SetCurrentSession

1 0

Francois Gouget : testbot/Engine: Use rmtree() instead of running 'rm -rf' .
by Alexandre Julliard 05 May '14

05 May '14

Module: tools Branch: master Commit: 9c38a40a2e870b92b0161d0268ce8512b2e29be1 URL: http://source.winehq.org/git/tools.git/?a=commit;h=9c38a40a2e870b92b0161d02… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri May 2 19:51:19 2014 +0200 testbot/Engine: Use rmtree() instead of running 'rm -rf'. --- testbot/bin/Engine.pl | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index a12f263..f0570d7 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -40,7 +40,10 @@ use Fcntl; use MIME::Parser; use POSIX ":sys_wait_h"; use Socket; +use File::Path; + use ObjectModel::BackEnd; + use WineTestBot::Config; use WineTestBot::Engine::Events; use WineTestBot::Engine::Notify; @@ -465,7 +468,11 @@ sub HandleWinePatchMLSubmission CreatePatches()->NewPatch($Entity); # Clean up - system("rm -rf $WorkDir"); + if (!rmtree($WorkDir)) + { + # Not a fatal error but log it to help diagnosis + LogMsg "Unable to delete '$WorkDir': $!\n"; + } unlink($FullMessageFileName); return "1OK"; @@ -507,7 +514,11 @@ sub HandleWinePatchWebSubmission my $ErrMessage = CreatePatches()->NewPatch($Entity, $WebPatchId); # Clean up - system("rm -rf $WorkDir"); + if (!rmtree($WorkDir)) + { + # Not a fatal error but log it to help diagnosis + LogMsg "Unable to delete '$WorkDir': $!\n"; + } unlink($FullFileName); return defined($ErrMessage) ? "0" . $ErrMessage : "1OK";

1 0

Francois Gouget : testbot/CheckForWinetestUpdate: CreateJobs() is a function, not a class method.
by Alexandre Julliard 05 May '14

05 May '14

Module: tools Branch: master Commit: 7d089311a0f6430894251b0c47e2800bae94d59d URL: http://source.winehq.org/git/tools.git/?a=commit;h=7d089311a0f6430894251b0c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri May 2 19:51:06 2014 +0200 testbot/CheckForWinetestUpdate: CreateJobs() is a function, not a class method. --- testbot/bin/CheckForWinetestUpdate.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index c61fdba..6d33a5c 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -57,7 +57,7 @@ sub AddJob my ($BaseJob, $FileNameRandomPart, $Bits) = @_; # First create a new job - my $Jobs = WineTestBot::Jobs->CreateJobs(); + my $Jobs = CreateJobs(); my $NewJob = $Jobs->Add(); $NewJob->User(GetBatchUser()); $NewJob->Priority($BaseJob && $Bits == 32 ? 6 : 7); @@ -118,7 +118,7 @@ sub AddJob sub AddReconfigJob { # First create a new job - my $Jobs = WineTestBot::Jobs->CreateJobs(); + my $Jobs = CreateJobs(); my $NewJob = $Jobs->Add(); $NewJob->User(GetBatchUser()); $NewJob->Priority(3);

1 0

Francois Gouget : testbot: GetBatchUser() is a function, not a class method.
by Alexandre Julliard 05 May '14

05 May '14

Module: tools Branch: master Commit: e61a2389553d4e5e8d263ff8e04abae4ebc5623f URL: http://source.winehq.org/git/tools.git/?a=commit;h=e61a2389553d4e5e8d263ff8… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri May 2 19:50:42 2014 +0200 testbot: GetBatchUser() is a function, not a class method. CreateUsers() is not a class method so there it no reason for GetBatchUser() to call it as if it was. --- testbot/bin/CheckForWinetestUpdate.pl | 5 +++-- testbot/lib/WineTestBot/Patches.pm | 2 +- testbot/lib/WineTestBot/Users.pm | 6 ++---- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index 8cbcc9c..c61fdba 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -46,6 +46,7 @@ use HTTP::Response; use HTTP::Status; use WineTestBot::Config; use WineTestBot::Jobs; +use WineTestBot::Users; use WineTestBot::Log; use WineTestBot::Utils; use WineTestBot::VMs; @@ -58,7 +59,7 @@ sub AddJob # First create a new job my $Jobs = WineTestBot::Jobs->CreateJobs(); my $NewJob = $Jobs->Add(); - $NewJob->User(WineTestBot::Users->GetBatchUser()); + $NewJob->User(GetBatchUser()); $NewJob->Priority($BaseJob && $Bits == 32 ? 6 : 7); $NewJob->Remarks("WineTest: " . ($Bits == 32 ? ($BaseJob ? "base" : "other") : "64-bit") . @@ -119,7 +120,7 @@ sub AddReconfigJob # First create a new job my $Jobs = WineTestBot::Jobs->CreateJobs(); my $NewJob = $Jobs->Add(); - $NewJob->User(WineTestBot::Users->GetBatchUser()); + $NewJob->User(GetBatchUser()); $NewJob->Priority(3); $NewJob->Remarks("Update Wine to latest git"); diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index a478fbf..cebb064 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -180,7 +180,7 @@ sub Submit } if (! defined($User)) { - $User = $Users->GetBatchUser(); + $User = GetBatchUser(); } my $Disposition = "Submitted job "; diff --git a/testbot/lib/WineTestBot/Users.pm b/testbot/lib/WineTestBot/Users.pm index 1f09446..ba1f6c3 100644 --- a/testbot/lib/WineTestBot/Users.pm +++ b/testbot/lib/WineTestBot/Users.pm @@ -404,11 +404,9 @@ sub Authenticate $self->AuthenticateBuiltin(@_); } -sub GetBatchUser +sub GetBatchUser() { - my $class = shift; - - return $class->CreateUsers()->GetItem("batch"); + return CreateUsers()->GetItem("batch"); } 1;

1 0

← Newer
1
...
31
32
33
34
35
36
37
...
41
Older →

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 May 2014