November 2012 - Wine-Commits

Juan Lang : rsaenh: Ensure a PKCS1 data block has at least minimum length.
by Alexandre Julliard Nov. 2, 2012

Nov. 2, 2012

Module: wine Branch: master Commit: 373e472db99bda0ec1e9656b3629a3836241b86d URL: http://source.winehq.org/git/wine.git/?a=commit;h=373e472db99bda0ec1e9656b3… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Feb 1 10:19:48 2012 -0800 rsaenh: Ensure a PKCS1 data block has at least minimum length. --- dlls/rsaenh/rsaenh.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 9d38793..a428cc7 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -1697,6 +1697,11 @@ static BOOL unpad_data(CONST BYTE *abData, DWORD dwDataLen, BYTE *abBuffer, DWOR { DWORD i; + if (dwDataLen < 3) + { + SetLastError(NTE_BAD_DATA); + return FALSE; + } for (i=2; i<dwDataLen; i++) if (!abData[i]) break;

1 0

Francois Gouget : winemenubuilder: Return the icon identifier instead of the full path on Mac OS X too.
by Alexandre Julliard Nov. 2, 2012

Nov. 2, 2012

Module: wine Branch: master Commit: ed04a730f90ae9c91556e4aa20e0fe3e272c1931 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed04a730f90ae9c91556e4aa2… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Nov 1 23:21:00 2012 +0100 winemenubuilder: Return the icon identifier instead of the full path on Mac OS X too. --- programs/winemenubuilder/winemenubuilder.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 8c941e2..5a5789f 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -1223,10 +1223,7 @@ static HRESULT platform_write_icon(IStream *icoStream, int exeIndex, LPCWSTR ico end: HeapFree(GetProcessHeap(), 0, iconDirEntries); - if (SUCCEEDED(hr)) - *nativeIdentifier = icnsPath; - else - HeapFree(GetProcessHeap(), 0, icnsPath); + HeapFree(GetProcessHeap(), 0, icnsPath); return hr; } #else

1 0

Juan Lang : Revert "crypt32: Correct CryptVerifyMessageSignature' s use of pcbDecoded.".
by Alexandre Julliard Nov. 2, 2012

Nov. 2, 2012

Module: wine Branch: master Commit: 1040e4151642a89ef1f5c3025f00933dd812becc URL: http://source.winehq.org/git/wine.git/?a=commit;h=1040e4151642a89ef1f5c3025… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Nov 1 20:28:30 2012 -0700 Revert "crypt32: Correct CryptVerifyMessageSignature's use of pcbDecoded.". This reverts commit 78c901586193d20092e992a460f00f4070c67ae9. The comments in the tests indicate that the tests are a little funny anyway, so they clearly weren't enough justification for the change introduced here. --- dlls/crypt32/message.c | 17 +++-------------- dlls/crypt32/tests/message.c | 1 + 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/dlls/crypt32/message.c b/dlls/crypt32/message.c index 8668cb1..7e163de 100644 --- a/dlls/crypt32/message.c +++ b/dlls/crypt32/message.c @@ -210,6 +210,9 @@ BOOL WINAPI CryptVerifyMessageSignature(PCRYPT_VERIFY_MESSAGE_PARA pVerifyPara, if (msg) { ret = CryptMsgUpdate(msg, pbSignedBlob, cbSignedBlob, TRUE); + if (ret && pcbDecoded) + ret = CryptMsgGetParam(msg, CMSG_CONTENT_PARAM, 0, pbDecoded, + pcbDecoded); if (ret) { CERT_INFO *certInfo = CRYPT_GetSignerCertInfoFromMsg(msg, @@ -241,20 +244,6 @@ BOOL WINAPI CryptVerifyMessageSignature(PCRYPT_VERIFY_MESSAGE_PARA pVerifyPara, } CryptMemFree(certInfo); } - if (ret) - { - /* The caller is expected to pass a valid pointer to pcbDecoded - * when the message verifies successfully. - */ - if (pcbDecoded) - ret = CryptMsgGetParam(msg, CMSG_CONTENT_PARAM, 0, pbDecoded, - pcbDecoded); - else - { - SetLastError(CRYPT_E_NOT_FOUND); - ret = FALSE; - } - } CryptMsgClose(msg); } if(!ret && pcbDecoded) diff --git a/dlls/crypt32/tests/message.c b/dlls/crypt32/tests/message.c index be3a03b..7e2e8aa 100644 --- a/dlls/crypt32/tests/message.c +++ b/dlls/crypt32/tests/message.c @@ -608,6 +608,7 @@ static void test_verify_message_signature(void) ret = CryptVerifyMessageSignature(&para, 0, signedWithCertWithValidPubKeyContent, sizeof(signedWithCertWithValidPubKeyContent), NULL, 0, NULL); + todo_wine ok(!ret, "Expected failure\n"); /* Finally, a message signed with a valid public key verifies successfully */

1 0

Jacek Caban : explorerframe: Moved TaskbarList implementation to explorerframe.
by Alexandre Julliard Nov. 2, 2012

Nov. 2, 2012

Module: wine Branch: master Commit: deeb14e0ee39087a4f629cf332d586b44559427c URL: http://source.winehq.org/git/wine.git/?a=commit;h=deeb14e0ee39087a4f629cf33… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 2 10:26:26 2012 +0100 explorerframe: Moved TaskbarList implementation to explorerframe. --- dlls/explorerframe/Makefile.in | 3 ++- dlls/explorerframe/explorerframe.idl | 7 +++++++ dlls/explorerframe/explorerframe_main.c | 4 ++++ dlls/explorerframe/explorerframe_main.h | 13 +++++++++++++ dlls/{ieframe => explorerframe}/taskbarlist.c | 10 +++++----- dlls/ieframe/Makefile.in | 1 - dlls/ieframe/ieframe.h | 1 - dlls/ieframe/ieframe_main.c | 17 ----------------- dlls/ieframe/ieframe_v1.idl | 6 ------ 9 files changed, 31 insertions(+), 31 deletions(-) diff --git a/dlls/explorerframe/Makefile.in b/dlls/explorerframe/Makefile.in index 975f197..dcb2826 100644 --- a/dlls/explorerframe/Makefile.in +++ b/dlls/explorerframe/Makefile.in @@ -4,7 +4,8 @@ IMPORTS = uuid ole32 shell32 user32 C_SRCS = \ explorerframe_main.c \ - nstc.c + nstc.c \ + taskbarlist.c IDL_R_SRCS = explorerframe.idl diff --git a/dlls/explorerframe/explorerframe.idl b/dlls/explorerframe/explorerframe.idl index 8171396..f7d6ece 100644 --- a/dlls/explorerframe/explorerframe.idl +++ b/dlls/explorerframe/explorerframe.idl @@ -24,3 +24,10 @@ uuid(ae054212-3535-4430-83ed-d501aa6680e6) ] coclass NamespaceTreeControl { interface INameSpaceTreeControl2; } + +[ + helpstring("Task Bar Communication"), + threading(apartment), + uuid(56fdf344-fd6d-11d0-958a-006097c9a090) +] +coclass TaskbarList { interface ITaskbarList; } diff --git a/dlls/explorerframe/explorerframe_main.c b/dlls/explorerframe/explorerframe_main.c index e26082f..bdb77a1 100644 --- a/dlls/explorerframe/explorerframe_main.c +++ b/dlls/explorerframe/explorerframe_main.c @@ -199,12 +199,16 @@ static const IClassFactoryVtbl EFCF_Vtbl = HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) { static IClassFactoryImpl NSTCClassFactory = {{&EFCF_Vtbl}, NamespaceTreeControl_Constructor}; + static IClassFactoryImpl TaskbarListFactory = {{&EFCF_Vtbl}, TaskbarList_Constructor}; TRACE("%s, %s, %p\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); if(IsEqualGUID(&CLSID_NamespaceTreeControl, rclsid)) return IClassFactory_QueryInterface(&NSTCClassFactory.IClassFactory_iface, riid, ppv); + if(IsEqualGUID(&CLSID_TaskbarList, rclsid)) + return IClassFactory_QueryInterface(&TaskbarListFactory.IClassFactory_iface, riid, ppv); + return CLASS_E_CLASSNOTAVAILABLE; } diff --git a/dlls/explorerframe/explorerframe_main.h b/dlls/explorerframe/explorerframe_main.h index 7fc2b45..44e7253 100644 --- a/dlls/explorerframe/explorerframe_main.h +++ b/dlls/explorerframe/explorerframe_main.h @@ -21,6 +21,8 @@ #ifndef __WINE_EXPLORERFRAME_H #define __WINE_EXPLORERFRAME_H +#define COBJMACROS + #include "shlobj.h" /* Not declared in commctrl.h ("for internal use (msdn)") */ @@ -33,5 +35,16 @@ static inline void EFRAME_LockModule(void) { InterlockedIncrement( &EFRAME_refCo static inline void EFRAME_UnlockModule(void) { InterlockedDecrement( &EFRAME_refCount ); } HRESULT NamespaceTreeControl_Constructor(IUnknown *pUnkOuter, REFIID riid, void **ppv) DECLSPEC_HIDDEN; +HRESULT TaskbarList_Constructor(IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; + +static inline void *heap_alloc(size_t len) +{ + return HeapAlloc(GetProcessHeap(), 0, len); +} + +static inline BOOL heap_free(void *mem) +{ + return HeapFree(GetProcessHeap(), 0, mem); +} #endif /* __WINE_EXPLORERFRAME_H */ diff --git a/dlls/ieframe/taskbarlist.c b/dlls/explorerframe/taskbarlist.c similarity index 97% rename from dlls/ieframe/taskbarlist.c rename to dlls/explorerframe/taskbarlist.c index f432317..d40f652 100644 --- a/dlls/ieframe/taskbarlist.c +++ b/dlls/explorerframe/taskbarlist.c @@ -18,7 +18,7 @@ * */ -#include "ieframe.h" +#include "explorerframe_main.h" #include "wine/debug.h" @@ -78,7 +78,7 @@ static ULONG STDMETHODCALLTYPE taskbar_list_Release(ITaskbarList4 *iface) if (!refcount) { heap_free(This); - unlock_module(); + EFRAME_UnlockModule(); } return refcount; @@ -289,7 +289,7 @@ static const struct ITaskbarList4Vtbl taskbar_list_vtbl = taskbar_list_SetTabProperties, }; -HRESULT WINAPI TaskbarList_Create(IClassFactory *iface, IUnknown *outer, REFIID riid, void **taskbar_list) +HRESULT TaskbarList_Constructor(IUnknown *outer, REFIID riid, void **taskbar_list) { struct taskbar_list *object; HRESULT hres; @@ -303,7 +303,7 @@ HRESULT WINAPI TaskbarList_Create(IClassFactory *iface, IUnknown *outer, REFIID return CLASS_E_NOAGGREGATION; } - object = heap_alloc_zero(sizeof(*object)); + object = heap_alloc(sizeof(*object)); if (!object) { ERR("Failed to allocate taskbar list object memory\n"); @@ -313,7 +313,7 @@ HRESULT WINAPI TaskbarList_Create(IClassFactory *iface, IUnknown *outer, REFIID object->ITaskbarList4_iface.lpVtbl = &taskbar_list_vtbl; object->refcount = 1; - lock_module(); + EFRAME_LockModule(); TRACE("Created ITaskbarList4 %p\n", object); diff --git a/dlls/ieframe/Makefile.in b/dlls/ieframe/Makefile.in index dca216b..38800f1 100644 --- a/dlls/ieframe/Makefile.in +++ b/dlls/ieframe/Makefile.in @@ -18,7 +18,6 @@ C_SRCS = \ persist.c \ shellbrowser.c \ shelluihelper.c \ - taskbarlist.c \ urlhist.c \ view.c \ webbrowser.c diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h index 4698008..8dd3f17 100644 --- a/dlls/ieframe/ieframe.h +++ b/dlls/ieframe/ieframe.h @@ -305,7 +305,6 @@ HRESULT register_class_object(BOOL) DECLSPEC_HIDDEN; HRESULT WINAPI CUrlHistory_Create(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; HRESULT WINAPI InternetExplorer_Create(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; HRESULT WINAPI InternetShortcut_Create(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; -HRESULT WINAPI TaskbarList_Create(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; HRESULT WINAPI WebBrowser_Create(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; HRESULT WINAPI WebBrowserV1_Create(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; diff --git a/dlls/ieframe/ieframe_main.c b/dlls/ieframe/ieframe_main.c index 56cd663..7c0b37b 100644 --- a/dlls/ieframe/ieframe_main.c +++ b/dlls/ieframe/ieframe_main.c @@ -201,16 +201,6 @@ static const IClassFactoryVtbl CUrlHistoryFactoryVtbl = { static IClassFactory CUrlHistoryFactory = { &CUrlHistoryFactoryVtbl }; -static const IClassFactoryVtbl TaskbarListFactoryVtbl = { - ClassFactory_QueryInterface, - ClassFactory_AddRef, - ClassFactory_Release, - TaskbarList_Create, - ClassFactory_LockServer -}; - -static IClassFactory TaskbarListFactory = { &TaskbarListFactoryVtbl }; - /****************************************************************** * DllMain (ieframe.@) */ @@ -250,7 +240,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) return IClassFactory_QueryInterface(&WebBrowserV1Factory, riid, ppv); } - if(IsEqualGUID(rclsid, &CLSID_InternetShortcut)) { TRACE("(CLSID_InternetShortcut %s %p)\n", debugstr_guid(riid), ppv); return IClassFactory_QueryInterface(&InternetShortcutFactory, riid, ppv); @@ -261,12 +250,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) return IClassFactory_QueryInterface(&CUrlHistoryFactory, riid, ppv); } - if(IsEqualGUID(&CLSID_TaskbarList, rclsid)) { - TRACE("(CLSID_TaskbarList %s %p)\n", debugstr_guid(riid), ppv); - return IClassFactory_QueryInterface(&TaskbarListFactory, riid, ppv); - } - - FIXME("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); return CLASS_E_CLASSNOTAVAILABLE; } diff --git a/dlls/ieframe/ieframe_v1.idl b/dlls/ieframe/ieframe_v1.idl index f4f7954..a7d3543 100644 --- a/dlls/ieframe/ieframe_v1.idl +++ b/dlls/ieframe/ieframe_v1.idl @@ -30,12 +30,6 @@ ] coclass CUrlHistory { interface IUrlHistoryStg2; } [ - helpstring("Task Bar Communication"), - threading(apartment), - uuid(56fdf344-fd6d-11d0-958a-006097c9a090) -] coclass TaskbarList { interface ITaskbarList; } - -[ helpstring("Internet Shortcut"), threading(apartment), progid("InternetShortcut"),

1 0

Francois Gouget : tesbot/ddl: Allow up to 128 characters for the job titles (aka Remarks).
by Alexandre Julliard Nov. 2, 2012

Nov. 2, 2012

Module: tools Branch: master Commit: 577c3452e53e57f6838cf29cdbebfc7541e3fff3 URL: http://source.winehq.org/git/tools.git/?a=commit;h=577c3452e53e57f6838cf29c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Nov 2 00:08:35 2012 +0100 tesbot/ddl: Allow up to 128 characters for the job titles (aka Remarks). --- testbot/ddl/update19.sql | 4 ++++ testbot/ddl/winetestbot.sql | 2 +- testbot/lib/WineTestBot/Jobs.pm | 2 +- testbot/web/Submit.pl | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/testbot/ddl/update19.sql b/testbot/ddl/update19.sql new file mode 100644 index 0000000..ca2d462 --- /dev/null +++ b/testbot/ddl/update19.sql @@ -0,0 +1,4 @@ +USE winetestbot; + +ALTER TABLE Jobs + MODIFY Remarks VARCHAR(128) NULL; diff --git a/testbot/ddl/winetestbot.sql b/testbot/ddl/winetestbot.sql index 75e3318..bd06ec8 100644 --- a/testbot/ddl/winetestbot.sql +++ b/testbot/ddl/winetestbot.sql @@ -110,7 +110,7 @@ CREATE TABLE Jobs UserName VARCHAR(40) NOT NULL, Priority INT(1) NOT NULL, Status ENUM('queued', 'running', 'completed', 'failed') NOT NULL, - Remarks VARCHAR(50) NULL, + Remarks VARCHAR(128) NULL, Submitted DATETIME NULL, Ended DATETIME NULL, PatchId INT(7) NULL, diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index f4be9dc..e1401be 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -325,7 +325,7 @@ BEGIN CreateItemrefPropertyDescriptor("User", "Author", !1, 1, \&WineTestBot::Users::CreateUsers, ["UserName"]), CreateBasicPropertyDescriptor("Priority", "Priority", !1, 1, "N", 1), CreateEnumPropertyDescriptor("Status", "Status", !1, 1, ['queued', 'running', 'completed', 'failed']), - CreateBasicPropertyDescriptor("Remarks", "Remarks", !1, !1, "A", 50), + CreateBasicPropertyDescriptor("Remarks", "Remarks", !1, !1, "A", 128), CreateBasicPropertyDescriptor("Submitted", "Submitted", !1, !1, "DT", 19), CreateBasicPropertyDescriptor("Ended", "Ended", !1, !1, "DT", 19), CreateItemrefPropertyDescriptor("Patch", "Submitted from patch", !1, !1, \&WineTestBot::Patches::CreatePatches, ["PatchId"]), diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index d774b9a..56e542d 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -42,7 +42,7 @@ sub _initialize $self->{Page} = $self->GetParam("Page") || 1; my @PropertyDescriptors1 = ( - CreateBasicPropertyDescriptor("Remarks", "Remarks", !1, !1, "A", 50), + CreateBasicPropertyDescriptor("Remarks", "Remarks", !1, !1, "A", 128), ); $self->{PropertyDescriptors1} = \@PropertyDescriptors1;

1 0

Francois Gouget : testbot/lib: Fix job cancellation so a rescheduling happens in short order.
by Alexandre Julliard Nov. 2, 2012

Nov. 2, 2012

Module: tools Branch: master Commit: 138a6920df88a81f505449309f9ac7aa32ba44a0 URL: http://source.winehq.org/git/tools.git/?a=commit;h=138a6920df88a81f50544930… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Nov 2 00:11:58 2012 +0100 testbot/lib: Fix job cancellation so a rescheduling happens in short order. Previously testbot would only be noticing cancelled jobs through the SafetyNet() function which is called every 10 minutes by default. Now we wait a couple of seconds for the SIGTERM to be served to the child process and then rechedule so other tasks can start. --- testbot/bin/Engine.pl | 11 +++++++++++ testbot/lib/WineTestBot/Jobs.pm | 39 ++++++++++++++------------------------- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 1cc8a9b..f9be03a 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -153,6 +153,17 @@ sub HandleJobCancel return "0$ErrMessage"; } + # Wait a couple of seconds before rescheduling so the child processes have + # the time to die. + AddEvent("JobCancel$JobKey", 2, 0, sub { + $Job->UpdateStatus(); + $ErrMessage = ScheduleJobs(); + if (defined($ErrMessage)) + { + LogMsg "Scheduling problem in HandleJobCancel: $ErrMessage\n"; + } + }); + return "1OK"; } diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index 74547d2..c15c7af 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -179,39 +179,28 @@ sub Cancel { my $self = shift; - foreach my $Step (@{$self->Steps->GetItems()}) + my $Steps = $self->Steps; + $Steps->AddFilter("Status", ["queued", "running"]); + foreach my $Step (@{$Steps->GetItems()}) { - my $Status = $Step->Status; - if ($Status eq "queued" || $Status eq "running") + my $Tasks = $Step->Tasks; + $Tasks->AddFilter("Status", ["queued", "running"]); + foreach my $Task (@{$Tasks->GetItems()}) { - foreach my $Task (@{$Step->Tasks->GetItems()}) + if ($Task->Status eq "queued") { - if ($Task->Status eq "queued") - { - $Task->Status("skipped"); - $Task->Save(); - } + $Task->Status("skipped"); + $Task->Save(); } - } - } - - foreach my $Step (@{$self->Steps->GetItems()}) - { - my $Status = $Step->Status; - if ($Status eq "queued" || $Status eq "running") - { - foreach my $Task (@{$Step->Tasks->GetItems()}) + elsif (defined $Task->ChildPid) { - if ($Task->Status eq "running") - { - if (defined($Task->ChildPid)) - { - kill "TERM", $Task->ChildPid; - } - } + # We don't unset ChildPid so Task::UpdateStatus() + # will add a trace in the log + kill("TERM", $Task->ChildPid); } } } + # Let the higher layers handle updating the overall job status return undef; }

1 0

Francois Gouget : testbot/lib: Turn the Jobs::Schedule() and Jobs::Check() methods into functions.
by Alexandre Julliard Nov. 2, 2012

Nov. 2, 2012

Module: tools Branch: master Commit: 73c62ab7dc4bafb83bfc676b018b5db55e5edd3a URL: http://source.winehq.org/git/tools.git/?a=commit;h=73c62ab7dc4bafb83bfc676b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Nov 2 00:11:12 2012 +0100 testbot/lib: Turn the Jobs::Schedule() and Jobs::Check() methods into functions. Their typical usage pattern shows there is no reason for them to be methods. This even more true for Check() since it modifies the object it is called on. --- testbot/bin/Engine.pl | 15 ++++------- testbot/lib/WineTestBot/Jobs.pm | 46 ++++++++++++++++------------------- testbot/lib/WineTestBot/Patches.pm | 6 ++-- 3 files changed, 30 insertions(+), 37 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 7bd14a1..1cc8a9b 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -81,7 +81,7 @@ sub HandleJobSubmit } } - $ErrMessage = $Jobs->Schedule(); + $ErrMessage = ScheduleJobs(); if (defined($ErrMessage)) { LogMsg "Scheduling problem in HandleJobSubmit: $ErrMessage\n"; @@ -158,7 +158,7 @@ sub HandleJobCancel sub HandleTaskComplete { - my $ErrMessage = CreateJobs()->Schedule(); + my $ErrMessage = ScheduleJobs(); if (defined($ErrMessage)) { LogMsg "Scheduling problem in HandleTaskComplete: $ErrMessage\n"; @@ -180,7 +180,7 @@ sub HandleVMStatusChange if ($OldStatus eq "reverting" || $OldStatus eq "running" || $NewStatus eq "idle" || $NewStatus eq "dirty") { - my $ErrMessage = CreateJobs()->Schedule(); + my $ErrMessage = ScheduleJobs(); if (defined($ErrMessage)) { LogMsg "Scheduling problem in HandleVMStatusChange: $ErrMessage\n"; @@ -266,7 +266,7 @@ sub HandleFoundWinetestUpdate DeleteEvent("GiveUpOnWinetestUpdate"); } - my $ErrMessage = CreateJobs()->Schedule(); + my $ErrMessage = ScheduleJobs(); if (defined($ErrMessage)) { LogMsg "Scheduling problem in HandleFoundWinetestUpdate: $ErrMessage\n"; @@ -511,11 +511,8 @@ checks whether any pending patchsets are now complete and thus can be scheduled. sub SafetyNet { - my $Jobs = CreateJobs(); - $Jobs->Check(); - $Jobs = undef; - $Jobs = CreateJobs(); - $Jobs->Schedule(); + CheckJobs(); + ScheduleJobs(); if (opendir STAGING, "$DataDir/staging") { diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index 649f3ca..74547d2 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -277,7 +277,7 @@ use vars qw(@ISA @EXPORT @PropertyDescriptors); require Exporter; @ISA = qw(WineTestBot::WineTestBotCollection Exporter); -(a)EXPORT = qw(&CreateJobs); +(a)EXPORT = qw(&CreateJobs &ScheduleJobs &CheckJobs); my @PropertyDescriptors; @@ -374,10 +374,9 @@ VM. =back =cut -sub ScheduleOnHost +sub ScheduleOnHost($$) { - my $self = shift; - my $Hypervisors = $_[0]; + my ($SortedJobs, $Hypervisors) = @_; my $HostVMs = CreateVMs(); $HostVMs->FilterHypervisor($Hypervisors); @@ -385,11 +384,8 @@ sub ScheduleOnHost my $PoweredOnNonBaseVMs = $HostVMs->CountPoweredOnNonBaseVMs(); my %DirtyVMsBlockingJobs; - $self->AddFilter("Status", ["queued", "running"]); - my @SortedJobs = sort CompareJobPriority @{$self->GetItems()}; - my $DirtyIndex = 0; - foreach my $Job (@SortedJobs) + foreach my $Job (@$SortedJobs) { my $Steps = $Job->Steps; $Steps->AddFilter("Status", ["queued", "running"]); @@ -489,7 +485,7 @@ sub ScheduleOnHost =pod =over 12 -=item C<Schedule()> +=item C<ScheduleJobs()> Goes through the WineTestBot hosts and schedules the Job tasks on each of them using WineTestBot::Jobs::ScheduleOnHost(). @@ -497,9 +493,13 @@ them using WineTestBot::Jobs::ScheduleOnHost(). =back =cut -sub Schedule +sub ScheduleJobs() { - my $self = shift; + my $Jobs = CreateJobs(); + $Jobs->AddFilter("Status", ["queued", "running"]); + my @SortedJobs = sort CompareJobPriority @{$Jobs->GetItems()}; + # Note that even if there are no jobs to schedule + # we should check if there are VMs to revert my %Hosts; foreach my $VM (@{CreateVMs()->GetItems()}) @@ -507,24 +507,21 @@ sub Schedule my $Host = $VM->GetHost(); $Hosts{$Host}->{$VM->VirtURI} = 1; } - my $ErrMessage; + + my @ErrMessages; foreach my $Host (keys %Hosts) { my @HostHypervisors = keys %{$Hosts{$Host}}; - my $HostErrMessage = $self->ScheduleOnHost(\@HostHypervisors); - if (! defined($ErrMessage)) - { - $ErrMessage = $HostErrMessage; - } + my $HostErrMessage = ScheduleOnHost(\@SortedJobs, \@HostHypervisors); + push @ErrMessages, $HostErrMessage if (defined $HostErrMessage); } - - return $ErrMessage; + return @ErrMessages ? join("\n", @ErrMessages) : undef; } =pod =over 12 -=item C<Check()> +=item C<CheckJobs()> Goes through the list of Jobs and updates their status. As a side-effect this detects failed builds, dead child processes, etc. @@ -532,12 +529,11 @@ detects failed builds, dead child processes, etc. =back =cut -sub Check +sub CheckJobs() { - my $self = shift; - - $self->AddFilter("Status", ["queued", "running"]); - map { $_->UpdateStatus(); } @{$self->GetItems()}; + my $Jobs = CreateJobs(); + $Jobs->AddFilter("Status", ["queued", "running"]); + map { $_->UpdateStatus(); } @{$Jobs->GetItems()}; return undef; } diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index 2852242..232e767 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -110,7 +110,7 @@ Analyzes the current patch to determine which Wine tests are impacted. Then for each impacted test it creates a high priority WineTestBot::Job to run that test. This also creates the WineTestBot::Step objects for that Job, as well as the WineTestBot::Task objects to run the test on each 'base' VM. Finally it calls -C<WineTestBot::Jobs::Schedule()> to run the new Jobs. +C<WineTestBot::Jobs::ScheduleJobs()> to run the new Jobs. Note that the path to the file containing the actual patch is passed as a parameter. This is used to apply a combined patch for patch series. See @@ -187,7 +187,7 @@ sub Submit my $First = 1; foreach my $BaseName (keys %Targets) { - my $Jobs = WineTestBot::Jobs::CreateJobs(); + my $Jobs = CreateJobs(); # Create a new job for this patch my $NewJob = $Jobs->Add(); @@ -283,7 +283,7 @@ sub Submit } $self->Disposition($Disposition); - WineTestBot::Jobs::CreateJobs()->Schedule(); + ScheduleJobs(); return undef; }

1 0

Francois Gouget : testbot: Fix the Job and Step status update.
by Alexandre Julliard Nov. 2, 2012

Nov. 2, 2012

Module: tools Branch: master Commit: 4c266ab9e904222186b0fae0c28b190b80d22ce1 URL: http://source.winehq.org/git/tools.git/?a=commit;h=4c266ab9e904222186b0fae0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Nov 2 00:11:00 2012 +0100 testbot: Fix the Job and Step status update. A job that has a non-build step fail should still be marked as failed. That's because when there are test failures the TestFailures field gets set to a non-zero value but the task's Status is still set to completed. So a failed Step really reflects a bot error. Also simplify the code and avoid duplicating the UpdateStatus() logic in the Check() method. --- testbot/lib/WineTestBot/Jobs.pm | 253 +++++++------------------------------- testbot/lib/WineTestBot/Steps.pm | 36 ++++++ testbot/lib/WineTestBot/Tasks.pm | 43 +++++++ 3 files changed, 125 insertions(+), 207 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=4c266ab9e904222186b0…

1 0

André Hentschel : winspool: Avoid memory leaks ( coverity).
by Alexandre Julliard Nov. 1, 2012

Nov. 1, 2012

Module: wine Branch: master Commit: 2cefbaab97ef4536b58b2bf21192c4a2fdf042d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cefbaab97ef4536b58b2bf21… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Nov 1 16:08:29 2012 +0100 winspool: Avoid memory leaks (coverity). --- dlls/winspool.drv/info.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 7509a8e..af336cb 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -944,7 +944,11 @@ static BOOL CUPS_LoadPrinters(void) unlink_ppd( ppd ); } HeapFree( GetProcessHeap(), 0, ppd ); - if (!added_driver) continue; + if (!added_driver) + { + HeapFree( GetProcessHeap(), 0, port ); + continue; + } memset(&pi2, 0, sizeof(PRINTER_INFO_2W)); pi2.pPrinterName = nameW; @@ -2374,7 +2378,7 @@ LONG WINAPI DocumentPropertiesW(HWND hWnd, HANDLE hPrinter, { LPSTR pDeviceNameA = strdupWtoA(pDeviceName); - LPDEVMODEA pDevModeInputA = DEVMODEdupWtoA(pDevModeInput); + LPDEVMODEA pDevModeInputA; LPDEVMODEA pDevModeOutputA = NULL; LONG ret; @@ -2386,6 +2390,7 @@ LONG WINAPI DocumentPropertiesW(HWND hWnd, HANDLE hPrinter, if(ret < 0) return ret; pDevModeOutputA = HeapAlloc(GetProcessHeap(), 0, ret); } + pDevModeInputA = DEVMODEdupWtoA(pDevModeInput); ret = DocumentPropertiesA(hWnd, hPrinter, pDeviceNameA, pDevModeOutputA, pDevModeInputA, fMode); if(pDevModeOutput) {

1 0

Daniel Lehman : msvcrt: Return value from MSVCRT____mb_cur_max_func instead of pointer.
by Alexandre Julliard Nov. 1, 2012

Nov. 1, 2012

Module: wine Branch: master Commit: ffa7ac73317f3e89c05d2a07d8e63cdf037bd17e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffa7ac73317f3e89c05d2a07d… Author: Daniel Lehman <dlehman(a)esri.com> Date: Wed Oct 31 16:20:16 2012 -0700 msvcrt: Return value from MSVCRT____mb_cur_max_func instead of pointer. --- dlls/msvcrt/mbcs.c | 12 ++++++++++-- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/tests/locale.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 55 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 9623653..3c575e9 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -174,13 +174,21 @@ unsigned char* CDECL __p__mbctype(void) } /********************************************************************* - * ___mb_cur_max_func(MSVCRT.@) + * __p___mb_cur_max(MSVCRT.@) */ -int* CDECL MSVCRT____mb_cur_max_func(void) +int* CDECL __p___mb_cur_max(void) { return &get_locinfo()->mb_cur_max; } +/********************************************************************* + * ___mb_cur_max_func(MSVCRT.@) + */ +int CDECL MSVCRT____mb_cur_max_func(void) +{ + return get_locinfo()->mb_cur_max; +} + /* ___mb_cur_max_l_func - not exported in native msvcrt */ int* CDECL ___mb_cur_max_l_func(MSVCRT__locale_t locale) { diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 03181c0..f5cad22 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -221,7 +221,7 @@ @ cdecl __p___argc() @ cdecl __p___argv() @ cdecl __p___initenv() -@ cdecl __p___mb_cur_max() MSVCRT____mb_cur_max_func +@ cdecl __p___mb_cur_max() @ cdecl __p___wargv() @ cdecl __p___winitenv() @ cdecl __p__acmdln() diff --git a/dlls/msvcrt/tests/locale.c b/dlls/msvcrt/tests/locale.c index 225cbb9..73eeb91 100644 --- a/dlls/msvcrt/tests/locale.c +++ b/dlls/msvcrt/tests/locale.c @@ -25,6 +25,8 @@ static BOOL (__cdecl *p__crtGetStringTypeW)(DWORD, DWORD, const wchar_t*, int, WORD*); static int (__cdecl *pmemcpy_s)(void *, size_t, void*, size_t); +static int (__cdecl *p___mb_cur_max_func)(void); +static int *(__cdecl *p__p___mb_cur_max)(void); void* __cdecl _Gettnames(void); static void init(void) @@ -33,6 +35,8 @@ static void init(void) p__crtGetStringTypeW = (void*)GetProcAddress(hmod, "__crtGetStringTypeW"); pmemcpy_s = (void*)GetProcAddress(hmod, "memcpy_s"); + p___mb_cur_max_func = (void*)GetProcAddress(hmod, "___mb_cur_max_func"); + p__p___mb_cur_max = (void*)GetProcAddress(hmod, "__p___mb_cur_max"); } static void test_setlocale(void) @@ -738,6 +742,45 @@ static void test__Gettnames(void) setlocale(LC_ALL, "C"); } +static void test___mb_cur_max_func(void) +{ + int mb_cur_max; + + /* for newer Windows */ + if(!p___mb_cur_max_func) + win_skip("Skipping ___mb_cur_max_func tests\n"); + else { + mb_cur_max = p___mb_cur_max_func(); + ok(mb_cur_max == 1, "mb_cur_max = %d, expected 1\n", mb_cur_max); + + /* some old Windows don't set chinese */ + if (!setlocale(LC_ALL, "chinese")) + win_skip("Skipping test with chinese locale\n"); + else { + mb_cur_max = p___mb_cur_max_func(); + ok(mb_cur_max == 2, "mb_cur_max = %d, expected 2\n", mb_cur_max); + setlocale(LC_ALL, "C"); + } + } + + /* for older Windows */ + if (!p__p___mb_cur_max) + win_skip("Skipping __p___mb_cur_max tests\n"); + else { + mb_cur_max = *p__p___mb_cur_max(); + ok(mb_cur_max == 1, "mb_cur_max = %d, expected 1\n", mb_cur_max); + + /* some old Windows don't set chinese */ + if (!setlocale(LC_ALL, "chinese")) + win_skip("Skipping test with chinese locale\n"); + else { + mb_cur_max = *p__p___mb_cur_max(); + ok(mb_cur_max == 2, "mb_cur_max = %d, expected 2\n", mb_cur_max); + setlocale(LC_ALL, "C"); + } + } +} + START_TEST(locale) { init(); @@ -745,4 +788,5 @@ START_TEST(locale) test_crtGetStringTypeW(); test_setlocale(); test__Gettnames(); + test___mb_cur_max_func(); }

1 0