April 2018 - Wine-Devel - list.winehq.org

[PATCH v17 1/3] wmp: Add seeking and duration
by Anton Romanov April 19, 2018

April 19, 2018

Signed-off-by: Anton Romanov <theli.ua(a)gmail.com> --- Was able to reproduce aj's test failure. Happens if built without gstreamer. This patch was tested both with and without gstreamer. test.mp3 is now 64k cbr 3s file. dlls/wmp/tests/ dlls/wmp/player.c | 65 +++++++++++++++++++++++++++++++++------- dlls/wmp/tests/media.c | 39 +++++++++++++++++++++++- dlls/wmp/tests/rsrc.rc | 2 +- dlls/wmp/tests/test.mp3 | Bin 240333 -> 24494 bytes dlls/wmp/wmp_private.h | 3 ++ 5 files changed, 97 insertions(+), 12 deletions(-) diff --git a/dlls/wmp/player.c b/dlls/wmp/player.c index f4ce62a447..8448916a80 100644 --- a/dlls/wmp/player.c +++ b/dlls/wmp/player.c @@ -1396,8 +1396,21 @@ static HRESULT WINAPI WMPControls_Invoke(IWMPControls *iface, DISPID dispIdMembe static HRESULT WINAPI WMPControls_get_isAvailable(IWMPControls *iface, BSTR bstrItem, VARIANT_BOOL *pIsAvailable) { WindowsMediaPlayer *This = impl_from_IWMPControls(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(bstrItem)); - return E_NOTIMPL; + static const WCHAR currentPosition[] = {'c','u','r','r','e','n','t','P','o','s','i','t','i','o','n',0}; + TRACE("(%p)->(%s %p)\n", This, debugstr_w(bstrItem), pIsAvailable); + if (!This->filter_graph) { + *pIsAvailable = VARIANT_FALSE; + } else if (strcmpW(currentPosition, bstrItem) == 0) { + DWORD capabilities; + IMediaSeeking_GetCapabilities(This->media_seeking, &capabilities); + *pIsAvailable = (capabilities & AM_SEEKING_CanSeekAbsolute) ? + VARIANT_TRUE : VARIANT_FALSE; + } else { + FIXME("%s not implemented\n", debugstr_w(bstrItem)); + return E_NOTIMPL; + } + + return S_OK; } static HRESULT WINAPI WMPControls_play(IWMPControls *iface) @@ -1428,11 +1441,16 @@ static HRESULT WINAPI WMPControls_play(IWMPControls *iface) if (SUCCEEDED(hres)) hres = IGraphBuilder_RenderFile(This->filter_graph, media->url, NULL); + if (SUCCEEDED(hres)) + update_state(This, DISPID_WMPCOREEVENT_OPENSTATECHANGE, wmposMediaOpen); if (SUCCEEDED(hres)) hres = IGraphBuilder_QueryInterface(This->filter_graph, &IID_IMediaControl, (void**)&This->media_control); if (SUCCEEDED(hres)) - update_state(This, DISPID_WMPCOREEVENT_OPENSTATECHANGE, wmposMediaOpen); + hres = IGraphBuilder_QueryInterface(This->filter_graph, &IID_IMediaSeeking, + (void**)&This->media_seeking); + if (SUCCEEDED(hres)) + hres = IMediaSeeking_SetTimeFormat(This->media_seeking, &TIME_FORMAT_MEDIA_TIME); if (SUCCEEDED(hres)) hres = IGraphBuilder_QueryInterface(This->filter_graph, &IID_IMediaEvent, (void**)&This->media_event); @@ -1459,7 +1477,10 @@ static HRESULT WINAPI WMPControls_play(IWMPControls *iface) } if (SUCCEEDED(hres)) { + LONGLONG duration; update_state(This, DISPID_WMPCOREEVENT_PLAYSTATECHANGE, wmppsPlaying); + if (SUCCEEDED(IMediaSeeking_GetDuration(This->media_seeking, &duration))) + media->duration = (DOUBLE)duration / 10000000.0f; } else { update_state(This, DISPID_WMPCOREEVENT_PLAYSTATECHANGE, wmppsUndefined); } @@ -1482,11 +1503,14 @@ static HRESULT WINAPI WMPControls_stop(IWMPControls *iface) if (This->media_event) { IMediaEvent_Release(This->media_event); } - + if (This->media_seeking) { + IMediaSeeking_Release(This->media_seeking); + } IGraphBuilder_Release(This->filter_graph); This->filter_graph = NULL; This->media_control = NULL; This->media_event = NULL; + This->media_seeking = NULL; update_state(This, DISPID_WMPCOREEVENT_OPENSTATECHANGE, wmposPlaylistOpenNoMedia); update_state(This, DISPID_WMPCOREEVENT_PLAYSTATECHANGE, wmppsStopped); @@ -1517,15 +1541,33 @@ static HRESULT WINAPI WMPControls_fastReverse(IWMPControls *iface) static HRESULT WINAPI WMPControls_get_currentPosition(IWMPControls *iface, DOUBLE *pdCurrentPosition) { WindowsMediaPlayer *This = impl_from_IWMPControls(iface); - FIXME("(%p)->(%p)\n", This, pdCurrentPosition); - return E_NOTIMPL; + HRESULT hres; + LONGLONG currentPosition; + + TRACE("(%p)->(%p)\n", This, pdCurrentPosition); + if (!This->media_seeking) + return S_FALSE; + + hres = IMediaSeeking_GetCurrentPosition(This->media_seeking, &currentPosition); + *pdCurrentPosition = (DOUBLE) currentPosition / 10000000.0f; + TRACE("hres: %d, pos: %f\n", hres, *pdCurrentPosition); + return hres; } static HRESULT WINAPI WMPControls_put_currentPosition(IWMPControls *iface, DOUBLE dCurrentPosition) { + LONGLONG Current; + HRESULT hres; WindowsMediaPlayer *This = impl_from_IWMPControls(iface); - FIXME("(%p)->(%f)\n", This, dCurrentPosition); - return E_NOTIMPL; + TRACE("(%p)->(%f)\n", This, dCurrentPosition); + if (!This->media_seeking) + return S_FALSE; + + Current = 10000000 * dCurrentPosition; + hres = IMediaSeeking_SetPositions(This->media_seeking, &Current, + AM_SEEKING_AbsolutePositioning, NULL, AM_SEEKING_NoPositioning); + + return hres; } static HRESULT WINAPI WMPControls_get_currentPositionString(IWMPControls *iface, BSTR *pbstrCurrentPosition) @@ -1762,9 +1804,12 @@ static HRESULT WINAPI WMPMedia_getMarkerName(IWMPMedia *iface, LONG MarkerNum, B static HRESULT WINAPI WMPMedia_get_duration(IWMPMedia *iface, DOUBLE *pDuration) { + /* MSDN: If this property is used with a media item other than the one + * specified in Player.currentMedia, it may not contain a valid value. */ WMPMedia *This = impl_from_IWMPMedia(iface); - FIXME("(%p)->(%p)\n", This, pDuration); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, pDuration); + *pDuration = This->duration; + return S_OK; } static HRESULT WINAPI WMPMedia_get_durationString(IWMPMedia *iface, BSTR *pbstrDuration) diff --git a/dlls/wmp/tests/media.c b/dlls/wmp/tests/media.c index c2cd1cf941..2372763d25 100644 --- a/dlls/wmp/tests/media.c +++ b/dlls/wmp/tests/media.c @@ -303,6 +303,11 @@ static BOOL test_wmp(void) static DWORD dw = 100; IWMPSettings *settings; BOOL test_ran = TRUE; + DOUBLE duration; + VARIANT_BOOL vbool; + IWMPMedia *media; + static const WCHAR currentPosition[] = {'c','u','r','r','e','n','t','P','o','s','i','t','i','o','n',0}; + BSTR bstrcurrentPosition = SysAllocString(currentPosition); hres = CoCreateInstance(&CLSID_WindowsMediaPlayer, NULL, CLSCTX_INPROC_SERVER, &IID_IOleObject, (void**)&oleobj); if(hres == REGDB_E_CLASSNOTREG) { @@ -338,6 +343,10 @@ static BOOL test_wmp(void) ok(hres == S_OK, "get_controls failed: %08x\n", hres); ok(controls != NULL, "controls = NULL\n"); + hres = IWMPControls_get_isAvailable(controls, bstrcurrentPosition, &vbool); + ok(hres == S_OK, "IWMPControls_get_isAvailable failed: %08x\n", hres); + ok(vbool == VARIANT_FALSE, "unexpected value\n"); + hres = IWMPControls_play(controls); ok(hres == NS_S_WMPCORE_COMMAND_NOT_AVAILABLE, "IWMPControls_play is available: %08x\n", hres); @@ -364,7 +373,7 @@ static BOOL test_wmp(void) SET_EXPECT(OPENSTATE, wmposMediaOpening); hres = IWMPControls_play(controls); ok(hres == S_OK, "IWMPControls_play failed: %08x\n", hres); - res = pump_messages(5000, 1, &playing_event); + res = pump_messages(1000, 1, &playing_event); ok(res == WAIT_OBJECT_0 || broken(res == WAIT_TIMEOUT), "Timed out while waiting for media to become ready\n"); if (res == WAIT_TIMEOUT) { /* This happens on Vista Ultimate 64 vms @@ -380,6 +389,33 @@ static BOOL test_wmp(void) /* MediaOpening happens only on xp, 2003 */ CLEAR_CALLED(OPENSTATE, wmposMediaOpening); + hres = IWMPControls_get_isAvailable(controls, bstrcurrentPosition, &vbool); + ok(hres == S_OK, "IWMPControls_get_isAvailable failed: %08x\n", hres); + ok(vbool == VARIANT_TRUE, "unexpected value\n"); + + duration = 0.0; + hres = IWMPControls_get_currentPosition(controls, &duration); + ok(hres == S_OK, "IWMPControls_get_currentPosition failed: %08x\n", hres); + ok((int)duration == 0, "unexpected value %f\n", duration); + + duration = 1.1; + hres = IWMPControls_put_currentPosition(controls, duration); + ok(hres == S_OK, "IWMPControls_put_currentPosition failed: %08x\n", hres); + + duration = 0.0; + hres = IWMPControls_get_currentPosition(controls, &duration); + ok(hres == S_OK, "IWMPControls_get_currentPosition failed: %08x\n", hres); + /* builtin quartz does not handle this currently and resets to 0.0, works + * with native quartz */ + todo_wine ok(duration >= 1.05 /* save some fp errors */, "unexpected value %f\n", duration); + + hres = IWMPPlayer4_get_currentMedia(player4, &media); + ok(hres == S_OK, "IWMPPlayer4_get_currentMedia failed: %08x\n", hres); + hres = IWMPMedia_get_duration(media, &duration); + ok(hres == S_OK, "IWMPMedia_get_duration failed: %08x\n", hres); + ok(round(duration) == 3, "unexpected value: %f\n", duration); + IWMPMedia_Release(media); + SET_EXPECT(PLAYSTATE, wmppsStopped); /* The following happens on wine only since we close media on stop */ SET_EXPECT(OPENSTATE, wmposPlaylistOpenNoMedia); @@ -414,6 +450,7 @@ playback_skip: IOleObject_Release(oleobj); DeleteFileW(filename); SysFreeString(filename); + SysFreeString(bstrcurrentPosition); return test_ran; } diff --git a/dlls/wmp/tests/rsrc.rc b/dlls/wmp/tests/rsrc.rc index a92079e798..c781df97a4 100644 --- a/dlls/wmp/tests/rsrc.rc +++ b/dlls/wmp/tests/rsrc.rc @@ -18,7 +18,7 @@ #include "windef.h" -/* ffmpeg -ar 48000 -t 60 -f s16le -acodec pcm_s16le -ac 2 -i /dev/zero -acodec libmp3lame -aq 4 output.mp3 */ +/* ffmpeg -f lavfi -i anullsrc -t 3 -acodec libmp3lame -b:a 64k dlls/wmp/tests/test.mp3 */ /* @makedep: test.mp3 */ test.mp3 RCDATA "test.mp3" /* ffmpeg -ar 48000 -t 1 -f s16le -acodec pcm_s16le -ac 2 -i /dev/zero -acodec libmp3lame -aq 4 test1s.mp3 */ diff --git a/dlls/wmp/tests/test.mp3 b/dlls/wmp/tests/test.mp3 index 149a2cd346ee52ae179c46198ce290a5dd4d6251..5328ce2425e41393626cf01a5423d828471f469f 100644 GIT binary patch literal 24494 zcmeI&Z)BBG9Ki8kYcgZ5UPLk(l~gu&w$+$PYU$>dtMx32Rd!t_wHM3GB+Vp|>O~?m zdo$A#y+{)2#f)U8H%T&jkwlWrGIM2}Xa5>^ryQqW?sI(~*L}|Od;EURdCuoN&zqAt zP*W`7vE_JkbCWs8MAjzHc4g}JRMpp1RmbD=cNhNVvZ)nUt2YxDG9BiQDI*s}PWQ^X zlG3u+`VAX5m2a-twtdI0%6RSW`i926`wt#EoIIKePMkc|dM2G|KX<;Pv#Y!3(&fIZ z*RJ2VdHc(a)Yd;J50L&NtUJbd){$<t(a)gUyP2ud^JAt`pw&S?<YTe{Pg+D*KbolW(a)fWL z!=9Kvx0yayuk5dEEt(GRh5cwr?5td9|Nb}QNlWazNV|!Zh?G@`tTDeKb7`8jS44`F z`;IgPK(a)gtiABSn@?J<`<mTvjWc$PXJnE{P3prtv>!*fWE8Op<nS?&@u6n(a)2)A4eWG zm?389KeL1!<RItw1Xx3?AwNOR*^q;rGaA1H$U)9ekaITVAm(a)z6F9C9p^AqHp4LQg; zqw!0C9OV22IcGx-a?WV{5+DaTKS9pfkb|5v8ova{6%e^dY{m*4$VFv9sr1OLKkxrr zT&0m1ki!H;XG0^q%ltkRy4jE`pwAF51>MDBsm>Z=4OwVtg&_wyEnAklkb|6shE^DI zkkhhdsS7#CS!ig5AqP1vTb8<zgPetiRv2=S)3Rl$3pvPHXlR8Y2RSWUmb#FGoP~x~ z7;=!)vSq0YImlUPXoVffMPhdu`~O%%T5H8p*I@~<cggY$b;HaMF9ls;In^Ntxf~R_ d0mwm4S6EJU$U!a#g>JxwoNiD4QT2iw&@UK&&2s<% literal 240333 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 diff --git a/dlls/wmp/wmp_private.h b/dlls/wmp/wmp_private.h index 3792e52abd..e8d534803f 100644 --- a/dlls/wmp/wmp_private.h +++ b/dlls/wmp/wmp_private.h @@ -42,6 +42,8 @@ typedef struct { LONG ref; WCHAR *url; + + DOUBLE duration; } WMPMedia; struct WindowsMediaPlayer { @@ -76,6 +78,7 @@ struct WindowsMediaPlayer { IGraphBuilder* filter_graph; IMediaControl* media_control; IMediaEvent* media_event; + IMediaSeeking* media_seeking; /* Async event notification */ HWND msg_window; -- 2.17.0

1 0

[v3 PATCH] shell32: Implement SHCreateSessionKey.
by Alistair Leslie-Hughes April 19, 2018

April 19, 2018

This implementation is based on the Geoff Chappell description. Based off patch by Dmitry Timoshkov. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/shell32/shellreg.c | 25 ++++++++++++++++++++++--- dlls/shell32/tests/shellole.c | 29 +++++++++++++++++++++++++---- 2 files changed, 47 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/shellreg.c b/dlls/shell32/shellreg.c index 356ec4e..514f994 100644 --- a/dlls/shell32/shellreg.c +++ b/dlls/shell32/shellreg.c @@ -34,6 +34,7 @@ #include "undocshell.h" +#include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(shell); @@ -154,7 +155,25 @@ HRESULT WINAPI SHRegCloseKey (HKEY hkey) */ HRESULT WINAPI SHCreateSessionKey(REGSAM access, HKEY *hkey) { - FIXME("stub: %d %p\n", access, hkey); - *hkey = NULL; - return E_NOTIMPL; + static const WCHAR session_format[] = { + 'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', + 'E','x','p','l','o','r','e','r','\\','S','e','s','s','i','o','n','I','n','f','o','\\','%','d',0}; + DWORD session; + static WCHAR session_reg_str[sizeof(session_format) + 16]; + + if(hkey) + *hkey = NULL; + + if(!access) + return E_ACCESSDENIED; + + if(!ProcessIdToSessionId( GetCurrentProcessId(), &session)) + return E_INVALIDARG; + + sprintfW(session_reg_str, session_format, session); + + TRACE("using session key %s\n", debugstr_w(session_reg_str)); + return RegCreateKeyExW(HKEY_CURRENT_USER, session_reg_str, 0, NULL, + REG_OPTION_VOLATILE, access, NULL, hkey, NULL); } diff --git a/dlls/shell32/tests/shellole.c b/dlls/shell32/tests/shellole.c index f611faf..9e3836a 100644 --- a/dlls/shell32/tests/shellole.c +++ b/dlls/shell32/tests/shellole.c @@ -862,8 +862,15 @@ static void test_DragQueryFile(void) static void test_SHCreateSessionKey(void) { + static const WCHAR session_format[] = { + 'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', + 'E','x','p','l','o','r','e','r','\\','S','e','s','s','i','o','n','I','n','f','o','\\','%','d',0}; HKEY hkey, hkey2; HRESULT hr; + DWORD session; + WCHAR sessionW[MAX_PATH]; + LONG ret; if (!pSHCreateSessionKey) { @@ -876,18 +883,32 @@ static void test_SHCreateSessionKey(void) hkey = (HKEY)0xdeadbeef; hr = pSHCreateSessionKey(0, &hkey); - todo_wine ok(hr == E_ACCESSDENIED, "got 0x%08x\n", hr); + ok(hr == E_ACCESSDENIED, "got 0x%08x\n", hr); ok(hkey == NULL, "got %p\n", hkey); hr = pSHCreateSessionKey(KEY_READ, &hkey); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08x\n", hr); hr = pSHCreateSessionKey(KEY_READ, &hkey2); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); - todo_wine ok(hkey != hkey2, "got %p, %p\n", hkey, hkey2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hkey != hkey2, "got %p, %p\n", hkey, hkey2); RegCloseKey(hkey); RegCloseKey(hkey2); + + /* Check the registery */ + if(ProcessIdToSessionId( GetCurrentProcessId(), &session)) + { + wsprintfW(sessionW, session_format, session); + + trace("key: %016x\n", session); + + ret = RegOpenKeyW(HKEY_CURRENT_USER, sessionW, &hkey); + ok(!ret, "key not found\n"); + RegCloseKey(hkey); + } + else + win_skip("Skipping registry check (%d).\n", GetLastError()); } static void test_dragdrophelper(void) -- 1.9.1

3 2

[PATCH] kernel32: Init TimezoneInformation registry.
by Alistair Leslie-Hughes April 19, 2018

April 19, 2018

From: Qian Hong <qhong(a)codeweavers.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/kernel32/kernel_main.c | 3 +++ dlls/kernel32/kernel_private.h | 3 +++ dlls/kernel32/time.c | 48 ++++++++++++++++++++++++++++++++++ 3 files changed, 54 insertions(+) diff --git a/dlls/kernel32/kernel_main.c b/dlls/kernel32/kernel_main.c index e24100b30c..d3420ece06 100644 --- a/dlls/kernel32/kernel_main.c +++ b/dlls/kernel32/kernel_main.c @@ -88,6 +88,9 @@ static BOOL process_attach( HMODULE module ) /* Setup registry locale information */ LOCALE_InitRegistry(); + /* Setup registry timezone information */ + TIMEZONE_InitRegistry(); + /* Setup computer name */ COMPUTERNAME_Init(); diff --git a/dlls/kernel32/kernel_private.h b/dlls/kernel32/kernel_private.h index 848ba95bbc..9073e18489 100644 --- a/dlls/kernel32/kernel_private.h +++ b/dlls/kernel32/kernel_private.h @@ -104,6 +104,9 @@ extern void COMPUTERNAME_Init(void) DECLSPEC_HIDDEN; extern void LOCALE_Init(void) DECLSPEC_HIDDEN; extern void LOCALE_InitRegistry(void) DECLSPEC_HIDDEN; +/* time.c */ +extern void TIMEZONE_InitRegistry(void) DECLSPEC_HIDDEN; + /* oldconfig.c */ extern void convert_old_config(void) DECLSPEC_HIDDEN; diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index b0b866967c..a63bfe8ac7 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -778,6 +778,54 @@ static void TIME_ClockTimeToFileTime(clock_t unix_time, LPFILETIME filetime) filetime->dwHighDateTime = (DWORD)(secs >> 32); } +/*********************************************************************** + * TIMEZONE_InitRegistry + * + * Update registry contents on startup if the user timezone has changed. + * This simulates the action of the Windows control panel. + */ +void TIMEZONE_InitRegistry(void) +{ + static const WCHAR szTimezoneInformation[] = { + 'M','a','c','h','i','n','e','\\','S','y','s','t','e','m','\\', + 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', + 'C','o','n','t','r','o','l','\\', + 'T','i','m','e','Z','o','n','e','I','n','f','o','r','m','a','t','i','o','n','\0' + }; + WCHAR standardnameW[] = {'S','t','a','n','d','a','r','d','N','a','m','e','\0'}; + WCHAR timezonekeynameW[] = {'T','i','m','e','Z','o','n','e','K','e','y','N','a','m','e','\0'}; + DYNAMIC_TIME_ZONE_INFORMATION tzinfo; + UNICODE_STRING keyName; + OBJECT_ATTRIBUTES attr; + HANDLE hkey; + DWORD tzid; + + tzid = GetDynamicTimeZoneInformation(&tzinfo); + if (tzid == TIME_ZONE_ID_INVALID) + { + ERR("fail to get timezone information.\n"); + return; + } + + RtlInitUnicodeString(&keyName, szTimezoneInformation); + InitializeObjectAttributes(&attr, &keyName, 0, 0, NULL); + if (NtCreateKey(&hkey, KEY_ALL_ACCESS, &attr, 0, NULL, 0, NULL) != STATUS_SUCCESS) + { + ERR("fail to create timezone information key.\n"); + return; + } + + RtlInitUnicodeString(&keyName, standardnameW); + NtSetValueKey(hkey, &keyName, 0, REG_SZ, tzinfo.StandardName, + (strlenW(tzinfo.StandardName) + 1) * sizeof(WCHAR)); + + RtlInitUnicodeString(&keyName, timezonekeynameW); + NtSetValueKey(hkey, &keyName, 0, REG_SZ, tzinfo.TimeZoneKeyName, + (strlenW(tzinfo.TimeZoneKeyName) + 1) * sizeof(WCHAR)); + + NtClose( hkey ); +} + /********************************************************************* * GetProcessTimes (KERNEL32.@) * -- 2.17.0

2 1

[PATCH] testbot: Standardize the packages inheritance and exports.
by Francois Gouget April 19, 2018

April 19, 2018

Use "our" instead of the antiquated 'use vars'. Use "use Exporter 'import'" as this form avoid exporting the whole Exporter interface from each of our package. This means we can also drop @ISA in those cases where we don't need to inherit from another package. Also we don't need the Exporter module just to inherit an interface so remove unneeded uses of Exporter. Defining the package inheritance and public interface does not depend on the rest of the package so move these statements first, even before all the other imports. Remove the ampersands from the exported functions names: they are unnecessary (and reportedly slower). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Last time it did not apply cleanly which is a bit strange. This time I made sure it was the first patch in the stack so it should really apply fine (if not I guess it means it's getting munged by my email client). testbot/lib/ObjectModel/BackEnd.pm | 7 ++----- .../ObjectModel/BasicPropertyDescriptor.pm | 8 +++---- .../lib/ObjectModel/CGI/CollectionBlock.pm | 9 +++----- .../ObjectModel/CGI/CollectionBlockForPage.pm | 5 +---- testbot/lib/ObjectModel/CGI/CollectionPage.pm | 7 ++----- testbot/lib/ObjectModel/CGI/FormPage.pm | 5 +---- testbot/lib/ObjectModel/CGI/FreeFormPage.pm | 6 +----- testbot/lib/ObjectModel/CGI/ItemPage.pm | 7 ++----- testbot/lib/ObjectModel/CGI/Page.pm | 8 +++---- testbot/lib/ObjectModel/Collection.pm | 7 ++----- testbot/lib/ObjectModel/DBIBackEnd.pm | 12 +++++------ .../DetailrefPropertyDescriptor.pm | 8 +++---- .../lib/ObjectModel/EnumPropertyDescriptor.pm | 8 +++---- testbot/lib/ObjectModel/Item.pm | 8 +++---- .../ObjectModel/ItemrefPropertyDescriptor.pm | 9 ++++---- testbot/lib/ObjectModel/PropertyDescriptor.pm | 4 ---- testbot/lib/WineTestBot/Activity.pm | 9 +++----- testbot/lib/WineTestBot/Branches.pm | 16 +++++++------- testbot/lib/WineTestBot/CGI/PageBase.pm | 9 +++----- testbot/lib/WineTestBot/CGI/Sessions.pm | 18 +++++++--------- testbot/lib/WineTestBot/Engine/Events.pm | 6 ++---- testbot/lib/WineTestBot/Engine/Notify.pm | 16 +++++++------- testbot/lib/WineTestBot/Jobs.pm | 20 +++++++----------- testbot/lib/WineTestBot/LibvirtDomain.pm | 8 +++---- testbot/lib/WineTestBot/Log.pm | 9 +++----- testbot/lib/WineTestBot/Patches.pm | 21 ++++++++----------- testbot/lib/WineTestBot/PendingPatchSets.pm | 20 +++++++----------- testbot/lib/WineTestBot/PendingPatches.pm | 17 ++++++--------- testbot/lib/WineTestBot/RecordGroups.pm | 18 ++++++---------- testbot/lib/WineTestBot/Records.pm | 18 +++++++--------- testbot/lib/WineTestBot/Roles.pm | 16 +++++--------- testbot/lib/WineTestBot/Steps.pm | 20 +++++++----------- testbot/lib/WineTestBot/StepsTasks.pm | 19 +++++++---------- testbot/lib/WineTestBot/Tasks.pm | 21 +++++++------------ testbot/lib/WineTestBot/TestAgent.pm | 17 +++++++-------- testbot/lib/WineTestBot/UserRoles.pm | 17 ++++++--------- testbot/lib/WineTestBot/Users.pm | 21 ++++++++----------- testbot/lib/WineTestBot/Utils.pm | 12 +++++------ testbot/lib/WineTestBot/VMs.pm | 20 +++++++----------- testbot/lib/WineTestBot/WineTestBotObjects.pm | 18 +++++++--------- testbot/web/index.pl | 17 ++++++++------- 41 files changed, 199 insertions(+), 322 deletions(-) diff --git a/testbot/lib/ObjectModel/BackEnd.pm b/testbot/lib/ObjectModel/BackEnd.pm index 0bb48cf7c..ae209a4c1 100644 --- a/testbot/lib/ObjectModel/BackEnd.pm +++ b/testbot/lib/ObjectModel/BackEnd.pm @@ -30,11 +30,8 @@ should provide. =cut -use vars qw(@ISA @EXPORT); - -require Exporter; -(a)ISA = qw(Exporter); -(a)EXPORT = qw(&AddDBBackEnd &GetDBBackEnd &RemoveDBBackEnd &CloseAllDBBackEnds); +use Exporter 'import'; +our @EXPORT = qw(AddDBBackEnd GetDBBackEnd RemoveDBBackEnd CloseAllDBBackEnds); sub new($@) { diff --git a/testbot/lib/ObjectModel/BasicPropertyDescriptor.pm b/testbot/lib/ObjectModel/BasicPropertyDescriptor.pm index 4c3382cb0..766a34230 100644 --- a/testbot/lib/ObjectModel/BasicPropertyDescriptor.pm +++ b/testbot/lib/ObjectModel/BasicPropertyDescriptor.pm @@ -30,13 +30,11 @@ This handles the boolean, a number and string columns. =cut +use Exporter 'import'; use ObjectModel::PropertyDescriptor; +our @ISA = qw(ObjectModel::PropertyDescriptor); +our @EXPORT = qw(CreateBasicPropertyDescriptor); -use vars qw(@ISA @EXPORT); - -require Exporter; -(a)ISA = qw(ObjectModel::PropertyDescriptor Exporter); -(a)EXPORT = qw(&CreateBasicPropertyDescriptor); sub _initialize($$$) { diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index ca2c6d3e1..155717aee 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -27,15 +27,12 @@ ObjectModel::CGI::CollectionBlock - Base class for list blocks package ObjectModel::CGI::CollectionBlock; +use Exporter 'import'; +our @EXPORT = qw(new); + use POSIX qw(strftime); use URI::Escape; -use vars qw(@ISA @EXPORT); - -require Exporter; -(a)ISA = qw(Exporter); - -(a)EXPORT = qw(new); sub new($$$@) { diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlockForPage.pm b/testbot/lib/ObjectModel/CGI/CollectionBlockForPage.pm index 3dd8154a7..ff8247ec9 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlockForPage.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlockForPage.pm @@ -28,11 +28,8 @@ ObjectModel::CGI::CollectionBlockForPage - Collection block for list pages =cut use ObjectModel::CGI::CollectionBlock; +our @ISA = qw(ObjectModel::CGI::CollectionBlock); -use vars qw(@ISA @EXPORT); - -require Exporter; -(a)ISA = qw(ObjectModel::CGI::CollectionBlock Exporter); sub CallGenerateFormStart($) { diff --git a/testbot/lib/ObjectModel/CGI/CollectionPage.pm b/testbot/lib/ObjectModel/CGI/CollectionPage.pm index e45b2a4a7..6593afcd2 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionPage.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionPage.pm @@ -27,13 +27,10 @@ ObjectModel::CGI::CollectionPage - Base class for list pages =cut -use ObjectModel::CGI::CollectionBlockForPage; use ObjectModel::CGI::Page; +our @ISA = qw(ObjectModel::CGI::Page); -use vars qw(@ISA @EXPORT); - -require Exporter; -(a)ISA = qw(ObjectModel::CGI::Page Exporter); +use ObjectModel::CGI::CollectionBlockForPage; sub _initialize($$$$) diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index 1745ec87b..b3861dd2a 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -29,11 +29,8 @@ ObjectModel::CGI::FormPage - Base class for web forms =cut use ObjectModel::CGI::Page; +our @ISA = qw(ObjectModel::CGI::Page); -use vars qw(@ISA @EXPORT); - -require Exporter; -(a)ISA = qw(ObjectModel::CGI::Page Exporter); sub _initialize($$$$) { diff --git a/testbot/lib/ObjectModel/CGI/FreeFormPage.pm b/testbot/lib/ObjectModel/CGI/FreeFormPage.pm index 7af04c498..c4f00101b 100644 --- a/testbot/lib/ObjectModel/CGI/FreeFormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FreeFormPage.pm @@ -28,10 +28,6 @@ ObjectModel::CGI::FreeFormPage - Base class for unbound web forms =cut use ObjectModel::CGI::FormPage; - -use vars qw(@ISA @EXPORT); - -require Exporter; -(a)ISA = qw(ObjectModel::CGI::FormPage Exporter); +our @ISA = qw(ObjectModel::CGI::FormPage); 1; diff --git a/testbot/lib/ObjectModel/CGI/ItemPage.pm b/testbot/lib/ObjectModel/CGI/ItemPage.pm index b44e5b2d3..c208aea31 100644 --- a/testbot/lib/ObjectModel/CGI/ItemPage.pm +++ b/testbot/lib/ObjectModel/CGI/ItemPage.pm @@ -28,13 +28,10 @@ ObjectModel::CGI::ItemPage - Base class for bound web forms =cut -use URI::Escape; use ObjectModel::CGI::FormPage; +our @ISA = qw(ObjectModel::CGI::FormPage); -use vars qw(@ISA @EXPORT); - -require Exporter; -(a)ISA = qw(ObjectModel::CGI::FormPage Exporter); +use URI::Escape; sub _initialize($$$$) { diff --git a/testbot/lib/ObjectModel/CGI/Page.pm b/testbot/lib/ObjectModel/CGI/Page.pm index ff7e8487a..b91022832 100644 --- a/testbot/lib/ObjectModel/CGI/Page.pm +++ b/testbot/lib/ObjectModel/CGI/Page.pm @@ -27,13 +27,13 @@ ObjectModel::CGI::Page - Base class for web pages =cut +use Exporter 'import'; +our @EXPORT = qw(new SetPageBaseCreator); + use CGI; -use vars qw(@ISA @EXPORT $PageBaseCreator); -require Exporter; -(a)ISA = qw(Exporter); -(a)EXPORT = qw(new SetPageBaseCreator); +my $PageBaseCreator; sub new($$$@) { diff --git a/testbot/lib/ObjectModel/Collection.pm b/testbot/lib/ObjectModel/Collection.pm index 032c7386d..712172bca 100644 --- a/testbot/lib/ObjectModel/Collection.pm +++ b/testbot/lib/ObjectModel/Collection.pm @@ -37,11 +37,8 @@ criteria. =cut -use vars qw(@ISA @EXPORT_OK); - -require Exporter; -(a)ISA = qw(Exporter); -(a)EXPORT_OK = qw(&new &ComputeMasterKey); +use Exporter 'import'; +our @EXPORT_OK = qw(new ComputeMasterKey); use Scalar::Util qw(weaken); use ObjectModel::BackEnd; diff --git a/testbot/lib/ObjectModel/DBIBackEnd.pm b/testbot/lib/ObjectModel/DBIBackEnd.pm index 0016e19c6..40bfe85f7 100644 --- a/testbot/lib/ObjectModel/DBIBackEnd.pm +++ b/testbot/lib/ObjectModel/DBIBackEnd.pm @@ -30,16 +30,14 @@ ObjectModel::BackEnd =cut -use DBI; -use Time::Local; - +use Exporter 'import'; use ObjectModel::BackEnd; +our @ISA = qw(ObjectModel::BackEnd); +our @EXPORT = qw(UseDBIBackEnd); -use vars qw(@ISA @EXPORT); +use DBI; +use Time::Local; -require Exporter; -(a)ISA = qw(ObjectModel::BackEnd Exporter); -(a)EXPORT = qw(&UseDBIBackEnd); sub GetDb($) { diff --git a/testbot/lib/ObjectModel/DetailrefPropertyDescriptor.pm b/testbot/lib/ObjectModel/DetailrefPropertyDescriptor.pm index d60fe6395..25144d08c 100644 --- a/testbot/lib/ObjectModel/DetailrefPropertyDescriptor.pm +++ b/testbot/lib/ObjectModel/DetailrefPropertyDescriptor.pm @@ -25,11 +25,11 @@ ObjectModel::DetailrefPropertyDescriptor - A reference to a collection of relate =cut -use vars qw(@ISA @EXPORT); +use Exporter 'import'; +use ObjectModel::PropertyDescriptor; +our @ISA = qw(ObjectModel::PropertyDescriptor); +our @EXPORT = qw(CreateDetailrefPropertyDescriptor SetDetailrefKeyPrefix); -require Exporter; -(a)ISA = qw(ObjectModel::PropertyDescriptor Exporter); -(a)EXPORT = qw(&CreateDetailrefPropertyDescriptor &SetDetailrefKeyPrefix); sub _initialize($$) { diff --git a/testbot/lib/ObjectModel/EnumPropertyDescriptor.pm b/testbot/lib/ObjectModel/EnumPropertyDescriptor.pm index 3e116ba72..d5850698e 100644 --- a/testbot/lib/ObjectModel/EnumPropertyDescriptor.pm +++ b/testbot/lib/ObjectModel/EnumPropertyDescriptor.pm @@ -30,13 +30,11 @@ new value is allowed. =cut +use Exporter 'import'; use ObjectModel::PropertyDescriptor; +our @ISA = qw(ObjectModel::PropertyDescriptor); +our @EXPORT = qw(CreateEnumPropertyDescriptor); -use vars qw(@ISA @EXPORT); - -require Exporter; -(a)ISA = qw(ObjectModel::PropertyDescriptor Exporter); -(a)EXPORT = qw(&CreateEnumPropertyDescriptor); sub _initialize($$) { diff --git a/testbot/lib/ObjectModel/Item.pm b/testbot/lib/ObjectModel/Item.pm index 201577c98..fb125f015 100644 --- a/testbot/lib/ObjectModel/Item.pm +++ b/testbot/lib/ObjectModel/Item.pm @@ -26,15 +26,13 @@ ObjectModel::Item - Base class for items =cut +use Exporter 'import'; +our @EXPORT_OK = qw(new); + use Scalar::Util qw(weaken); use ObjectModel::BackEnd; use ObjectModel::Collection; -use vars qw(@ISA @EXPORT_OK); - -require Exporter; -(a)ISA = qw(Exporter); -(a)EXPORT_OK = qw(&new); =pod diff --git a/testbot/lib/ObjectModel/ItemrefPropertyDescriptor.pm b/testbot/lib/ObjectModel/ItemrefPropertyDescriptor.pm index 21806a269..cba4f9af1 100644 --- a/testbot/lib/ObjectModel/ItemrefPropertyDescriptor.pm +++ b/testbot/lib/ObjectModel/ItemrefPropertyDescriptor.pm @@ -25,11 +25,10 @@ ObjectModel::ItemrefPropertyDescriptor - A property referencing an ObjectModel:: =cut -use vars qw(@ISA @EXPORT); - -require Exporter; -(a)ISA = qw(ObjectModel::PropertyDescriptor Exporter); -(a)EXPORT = qw(&CreateItemrefPropertyDescriptor); +use Exporter 'import'; +use ObjectModel::PropertyDescriptor; +our @ISA = qw(ObjectModel::PropertyDescriptor); +our @EXPORT = qw(CreateItemrefPropertyDescriptor); sub _initialize($$$) { diff --git a/testbot/lib/ObjectModel/PropertyDescriptor.pm b/testbot/lib/ObjectModel/PropertyDescriptor.pm index 583082e81..f13a4b248 100644 --- a/testbot/lib/ObjectModel/PropertyDescriptor.pm +++ b/testbot/lib/ObjectModel/PropertyDescriptor.pm @@ -32,10 +32,6 @@ required or not. =cut -use vars qw(@ISA @EXPORT); - -require Exporter; -(a)ISA = qw(Exporter); sub new($$$$$@) { diff --git a/testbot/lib/WineTestBot/Activity.pm b/testbot/lib/WineTestBot/Activity.pm index acec6064c..b3e576a19 100644 --- a/testbot/lib/WineTestBot/Activity.pm +++ b/testbot/lib/WineTestBot/Activity.pm @@ -25,18 +25,15 @@ WineTestBot::Activity - reconstruct the TestBot's activity from its history rec =cut +use Exporter 'import'; +our @EXPORT = qw(GetActivity GetStatistics); + use Scalar::Util qw(weaken); use WineTestBot::Config; use WineTestBot::Jobs; use WineTestBot::RecordGroups; use WineTestBot::Records; -use vars qw (@ISA @EXPORT); - -require Exporter; -(a)ISA = qw(Exporter); -(a)EXPORT = qw(&GetActivity &GetStatistics); - sub _UpdateMin($$) { diff --git a/testbot/lib/WineTestBot/Branches.pm b/testbot/lib/WineTestBot/Branches.pm index a67832590..a18fafcbd 100644 --- a/testbot/lib/WineTestBot/Branches.pm +++ b/testbot/lib/WineTestBot/Branches.pm @@ -27,12 +27,10 @@ WineTestBot::Branch - Describes a Wine branch =cut use WineTestBot::WineTestBotObjects; -use WineTestBot::Config; +our @ISA = qw(WineTestBot::WineTestBotItem); -use vars qw (@ISA @EXPORT); +use WineTestBot::Config; -require Exporter; -(a)ISA = qw(WineTestBot::WineTestBotItem Exporter); sub InitializeNew($$) { @@ -42,6 +40,7 @@ sub InitializeNew($$) $self->SUPER::InitializeNew($Collection); } + package WineTestBot::Branches; =head1 NAME @@ -50,14 +49,13 @@ WineTestBot::Branches - A collection of WineTestBot::Branch objects =cut -use ObjectModel::BasicPropertyDescriptor; +use Exporter 'import'; use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotCollection); +our @EXPORT = qw(CreateBranches); -use vars qw (@ISA @EXPORT); +use ObjectModel::BasicPropertyDescriptor; -require Exporter; -(a)ISA = qw(WineTestBot::WineTestBotCollection Exporter); -(a)EXPORT = qw(&CreateBranches); sub GetDefaultBranch($) { diff --git a/testbot/lib/WineTestBot/CGI/PageBase.pm b/testbot/lib/WineTestBot/CGI/PageBase.pm index fa383c512..67e8fc86f 100644 --- a/testbot/lib/WineTestBot/CGI/PageBase.pm +++ b/testbot/lib/WineTestBot/CGI/PageBase.pm @@ -28,6 +28,9 @@ WineTestBot::CGI::PageBase - Base class for web pages =cut +use Exporter 'import'; +our @EXPORT = qw(CreatePageBase); + use Apache2::Const -compile => qw(REDIRECT); use Apache2::ServerRec; use CGI::Cookie; @@ -36,12 +39,6 @@ use WineTestBot::CGI::Sessions; use WineTestBot::Config; use WineTestBot::Utils; -use vars qw(@ISA @EXPORT); - -require Exporter; -(a)ISA = qw(Exporter); -(a)EXPORT = qw(&CreatePageBase); - sub new($$$$@) { my $class = shift; diff --git a/testbot/lib/WineTestBot/CGI/Sessions.pm b/testbot/lib/WineTestBot/CGI/Sessions.pm index 87fd15fb2..af30fbb85 100644 --- a/testbot/lib/WineTestBot/CGI/Sessions.pm +++ b/testbot/lib/WineTestBot/CGI/Sessions.pm @@ -28,12 +28,10 @@ WineTestBot::CGI::Session - A web user's session =cut -use WineTestBot::Utils; use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotItem); -require Exporter; -use vars qw(@ISA @EXPORT); -(a)ISA = qw(WineTestBot::WineTestBotItem Exporter); +use WineTestBot::Utils; sub InitializeNew($$) { @@ -53,19 +51,17 @@ WineTestBot::CGI::Sessions - A Session collection =cut +use Exporter 'import'; +use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotCollection); +our @EXPORT = qw(CreateSessions DeleteSessions NewSession); + use CGI::Cookie; use ObjectModel::BasicPropertyDescriptor; use ObjectModel::ItemrefPropertyDescriptor; use WineTestBot::Config; use WineTestBot::Users; use WineTestBot::Utils; -use WineTestBot::WineTestBotObjects; - -use vars qw(@ISA @EXPORT); - -require Exporter; -(a)ISA = qw(WineTestBot::WineTestBotCollection Exporter); -(a)EXPORT = qw(&CreateSessions &DeleteSessions &NewSession); sub CreateItem($) diff --git a/testbot/lib/WineTestBot/Engine/Events.pm b/testbot/lib/WineTestBot/Engine/Events.pm index c3ebe9baf..677debfbf 100644 --- a/testbot/lib/WineTestBot/Engine/Events.pm +++ b/testbot/lib/WineTestBot/Engine/Events.pm @@ -27,11 +27,9 @@ WineTestBot::Engine::Events - Engine events =cut -use vars qw (@ISA @EXPORT); +use Exporter 'import'; +our @EXPORT = qw(AddEvent DeleteEvent EventScheduled RunEvents); -require Exporter; -(a)ISA = qw(Exporter); -(a)EXPORT = qw(&AddEvent &DeleteEvent &EventScheduled &RunEvents); my %Events; diff --git a/testbot/lib/WineTestBot/Engine/Notify.pm b/testbot/lib/WineTestBot/Engine/Notify.pm index c277f7aa9..ddb14d2fa 100644 --- a/testbot/lib/WineTestBot/Engine/Notify.pm +++ b/testbot/lib/WineTestBot/Engine/Notify.pm @@ -27,18 +27,16 @@ WineTestBot::Engine::Notify - Engine notification =cut +use Exporter 'import'; +our $RunningInEngine; +our @EXPORT = qw(Shutdown PingEngine JobStatusChange JobCancel + JobRestart RescheduleJobs VMStatusChange + WinePatchMLSubmission WinePatchWebSubmission GetScreenshot); +our @EXPORT_OK = qw($RunningInEngine); + use Socket; use WineTestBot::Config; -use vars qw (@ISA @EXPORT @EXPORT_OK $RunningInEngine); - -require Exporter; -(a)ISA = qw(Exporter); -(a)EXPORT = qw(&Shutdown &PingEngine &JobStatusChange &JobCancel - &JobRestart &RescheduleJobs &VMStatusChange - &WinePatchMLSubmission &WinePatchWebSubmission &GetScreenshot); -(a)EXPORT_OK = qw($RunningInEngine); - sub SendCmdReceiveReply($) { diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index f810b4f12..29f7860cb 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -51,17 +51,15 @@ A Job is composed of multiple WineTestBot::Step objects. =cut +use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotItem); + use File::Path; use WineTestBot::Config; use WineTestBot::Branches; use WineTestBot::Engine::Notify; -use WineTestBot::WineTestBotObjects; -use vars qw(@ISA @EXPORT); - -require Exporter; -(a)ISA = qw(WineTestBot::WineTestBotItem Exporter); sub _initialize($$) { @@ -391,11 +389,15 @@ those that are yet to be run. =cut +use Exporter 'import'; +use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotCollection); +our @EXPORT = qw(CreateJobs ScheduleJobs CheckJobs); + use ObjectModel::BasicPropertyDescriptor; use ObjectModel::EnumPropertyDescriptor; use ObjectModel::DetailrefPropertyDescriptor; use ObjectModel::ItemrefPropertyDescriptor; -use WineTestBot::WineTestBotObjects; use WineTestBot::Branches; use WineTestBot::Config; use WineTestBot::Patches; @@ -404,12 +406,6 @@ use WineTestBot::Steps; use WineTestBot::Users; use WineTestBot::VMs; -use vars qw(@ISA @EXPORT); - -require Exporter; -(a)ISA = qw(WineTestBot::WineTestBotCollection Exporter); -(a)EXPORT = qw(&CreateJobs &ScheduleJobs &CheckJobs); - sub CreateItem($) { diff --git a/testbot/lib/WineTestBot/LibvirtDomain.pm b/testbot/lib/WineTestBot/LibvirtDomain.pm index 9ca98eb91..bab5d7e36 100644 --- a/testbot/lib/WineTestBot/LibvirtDomain.pm +++ b/testbot/lib/WineTestBot/LibvirtDomain.pm @@ -32,14 +32,12 @@ technologies. =cut +use Exporter 'import'; +our @EXPORT_OK = qw(new); + use Sys::Virt; use Image::Magick; -use vars qw (@ISA @EXPORT_OK); - -require Exporter; -(a)ISA = qw(Exporter); -(a)EXPORT_OK = qw(new); my %_Hypervisors; my %_Domains; diff --git a/testbot/lib/WineTestBot/Log.pm b/testbot/lib/WineTestBot/Log.pm index 65782c514..36efb48a2 100644 --- a/testbot/lib/WineTestBot/Log.pm +++ b/testbot/lib/WineTestBot/Log.pm @@ -25,14 +25,11 @@ WineTestBot::Log - Logging =cut -use WineTestBot::Config; -use WineTestBot::Utils; +use Exporter 'import'; +our @EXPORT = qw(LogMsg OpenLog Time Elapsed PrettyElapsed); -use vars qw (@ISA @EXPORT); +use WineTestBot::Config; -require Exporter; -(a)ISA = qw(Exporter); -(a)EXPORT = qw(&LogMsg &OpenLog &Time &Elapsed &PrettyElapsed); my $logfile; my $logprefix; diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index 7906f1cb6..e4b9b0089 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -33,6 +33,9 @@ linked to this patch through a WineTestBot::PendingPatch object. =cut +use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotItem); + use Encode qw/decode/; use File::Basename; @@ -42,13 +45,8 @@ use WineTestBot::Jobs; use WineTestBot::Users; use WineTestBot::Utils; use WineTestBot::VMs; -use WineTestBot::WineTestBotObjects; use WineTestBot::Engine::Notify; -use vars qw(@ISA @EXPORT); - -require Exporter; -(a)ISA = qw(WineTestBot::WineTestBotItem Exporter); sub InitializeNew($$) { @@ -357,6 +355,7 @@ sub GetEMailRecipient($) return BuildEMailRecipient($self->FromEMail, $self->FromName); } + package WineTestBot::Patches; =head1 NAME @@ -365,15 +364,13 @@ WineTestBot::Patches - A collection of WineTestBot::Patch objects =cut -use ObjectModel::BasicPropertyDescriptor; -use WineTestBot::Config; +use Exporter 'import'; use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotCollection); +our @EXPORT = qw(CreatePatches); -use vars qw(@ISA @EXPORT); - -require Exporter; -(a)ISA = qw(WineTestBot::WineTestBotCollection Exporter); -(a)EXPORT = qw(&CreatePatches); +use ObjectModel::BasicPropertyDescriptor; +use WineTestBot::Config; sub CreateItem($) diff --git a/testbot/lib/WineTestBot/PendingPatchSets.pm b/testbot/lib/WineTestBot/PendingPatchSets.pm index d51652221..88dc73677 100644 --- a/testbot/lib/WineTestBot/PendingPatchSets.pm +++ b/testbot/lib/WineTestBot/PendingPatchSets.pm @@ -38,15 +38,13 @@ The WineTestBot::PendingPatchSet class is where this tracking is implemented. =cut +use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotItem); + use WineTestBot::Config; use WineTestBot::Patches; use WineTestBot::Utils; -use WineTestBot::WineTestBotObjects; -use vars qw(@ISA @EXPORT); - -require Exporter; -(a)ISA = qw(WineTestBot::WineTestBotItem Exporter); =pod =over 12 @@ -153,19 +151,17 @@ WineTestBot::PendingPatchSets - A collection of WineTestBot::PendingPatchSet obj =cut +use Exporter 'import'; +use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotCollection); +our @EXPORT = qw(CreatePendingPatchSets); + use ObjectModel::BasicPropertyDescriptor; use ObjectModel::DetailrefPropertyDescriptor; use WineTestBot::Config; use WineTestBot::PendingPatches; use WineTestBot::Patches; use WineTestBot::Utils; -use WineTestBot::WineTestBotObjects; - -use vars qw(@ISA @EXPORT); - -require Exporter; -(a)ISA = qw(WineTestBot::WineTestBotCollection Exporter); -(a)EXPORT = qw(&CreatePendingPatchSets); sub CreateItem($) diff --git a/testbot/lib/WineTestBot/PendingPatches.pm b/testbot/lib/WineTestBot/PendingPatches.pm index 281db60ef..4de599dac 100644 --- a/testbot/lib/WineTestBot/PendingPatches.pm +++ b/testbot/lib/WineTestBot/PendingPatches.pm @@ -32,11 +32,8 @@ identifying the patch series it belongs to. =cut use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotItem); -use vars qw(@ISA @EXPORT); - -require Exporter; -(a)ISA = qw(WineTestBot::WineTestBotItem Exporter); package WineTestBot::PendingPatches; @@ -46,16 +43,14 @@ WineTestBot::PendingPatches - A collection of WineTestBot::PendingPatch objects =cut +use Exporter 'import'; +use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotCollection); +our @EXPORT = qw(CreatePendingPatches); + use ObjectModel::BasicPropertyDescriptor; use ObjectModel::ItemrefPropertyDescriptor; use WineTestBot::Patches; -use WineTestBot::WineTestBotObjects; - -use vars qw(@ISA @EXPORT); - -require Exporter; -(a)ISA = qw(WineTestBot::WineTestBotCollection Exporter); -(a)EXPORT = qw(&CreatePendingPatches); sub CreateItem($) diff --git a/testbot/lib/WineTestBot/RecordGroups.pm b/testbot/lib/WineTestBot/RecordGroups.pm index 1e5dbbdd4..9f0f52036 100644 --- a/testbot/lib/WineTestBot/RecordGroups.pm +++ b/testbot/lib/WineTestBot/RecordGroups.pm @@ -31,12 +31,8 @@ or the state of the TestBot at at a given time. =cut use WineTestBot::WineTestBotObjects; -use WineTestBot::Config; +our @ISA = qw(WineTestBot::WineTestBotItem); -use vars qw (@ISA @EXPORT); - -require Exporter; -(a)ISA = qw(WineTestBot::WineTestBotItem Exporter); sub InitializeNew($$) { @@ -56,17 +52,15 @@ WineTestBot::RecordGroups - A collection of WineTestBot::RecordGroup objects =cut +use Exporter 'import'; +use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotCollection); +our @EXPORT = qw(CreateRecordGroups CompareRecordGroups SaveRecord); + use ObjectModel::BasicPropertyDescriptor; use ObjectModel::DetailrefPropertyDescriptor; -use WineTestBot::WineTestBotObjects; use WineTestBot::Records; -use vars qw (@ISA @EXPORT); - -require Exporter; -(a)ISA = qw(WineTestBot::WineTestBotCollection Exporter); -(a)EXPORT = qw(&CreateRecordGroups &CompareRecordGroups &SaveRecord); - sub CreateItem($) { diff --git a/testbot/lib/WineTestBot/Records.pm b/testbot/lib/WineTestBot/Records.pm index 98d5ee7d9..990ae421e 100644 --- a/testbot/lib/WineTestBot/Records.pm +++ b/testbot/lib/WineTestBot/Records.pm @@ -38,13 +38,11 @@ only limited by the amount of data dumped into the Records table. =cut -use WineTestBot::Config; use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotItem); -use vars qw (@ISA @EXPORT); +use WineTestBot::Config; -require Exporter; -(a)ISA = qw(WineTestBot::WineTestBotItem Exporter); sub InitializeNew($$) { @@ -62,15 +60,13 @@ WineTestBot::Records - A collection of WineTestBot::Record objects =cut -use ObjectModel::BasicPropertyDescriptor; -use ObjectModel::EnumPropertyDescriptor; +use Exporter 'import'; use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotCollection); +our @EXPORT = qw(CreateRecords); -use vars qw (@ISA @EXPORT); - -require Exporter; -(a)ISA = qw(WineTestBot::WineTestBotCollection Exporter); -(a)EXPORT = qw(&CreateRecords); +use ObjectModel::BasicPropertyDescriptor; +use ObjectModel::EnumPropertyDescriptor; sub CreateItem($) diff --git a/testbot/lib/WineTestBot/Roles.pm b/testbot/lib/WineTestBot/Roles.pm index a617ac14e..45f370f1d 100644 --- a/testbot/lib/WineTestBot/Roles.pm +++ b/testbot/lib/WineTestBot/Roles.pm @@ -30,11 +30,7 @@ A Role is a class of users and defines what they can do. =cut use WineTestBot::WineTestBotObjects; - -use vars qw (@ISA @EXPORT); - -require Exporter; -(a)ISA = qw(WineTestBot::WineTestBotItem Exporter); +our @ISA = qw(WineTestBot::WineTestBotItem); package WineTestBot::Roles; @@ -45,14 +41,12 @@ WineTestBot::Roles - A collection of WineTestBot::Role objects =cut -use ObjectModel::BasicPropertyDescriptor; +use Exporter 'import'; use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotCollection); +our @EXPORT = qw(CreateRoles); -use vars qw (@ISA @EXPORT); - -require Exporter; -(a)ISA = qw(WineTestBot::WineTestBotCollection Exporter); -(a)EXPORT = qw(&CreateRoles); +use ObjectModel::BasicPropertyDescriptor; sub CreateItem($) diff --git a/testbot/lib/WineTestBot/Steps.pm b/testbot/lib/WineTestBot/Steps.pm index ef2b3872b..237347347 100644 --- a/testbot/lib/WineTestBot/Steps.pm +++ b/testbot/lib/WineTestBot/Steps.pm @@ -36,16 +36,14 @@ or to reset their PreviousNo fields beforehand. =cut +use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotItem); + use File::Copy; use File::Path; use WineTestBot::Config; -use WineTestBot::WineTestBotObjects; -use vars qw(@ISA @EXPORT); - -require Exporter; -(a)ISA = qw(WineTestBot::WineTestBotItem Exporter); sub InitializeNew($$) { @@ -184,17 +182,15 @@ WineTestBot::Steps - A collection of Job Steps =cut +use Exporter 'import'; +use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotCollection); +our @EXPORT = qw(CreateSteps); + use ObjectModel::BasicPropertyDescriptor; use ObjectModel::EnumPropertyDescriptor; use ObjectModel::DetailrefPropertyDescriptor; use WineTestBot::Tasks; -use WineTestBot::WineTestBotObjects; - -use vars qw(@ISA @EXPORT); - -require Exporter; -(a)ISA = qw(WineTestBot::WineTestBotCollection Exporter); -(a)EXPORT = qw(&CreateSteps); sub CreateItem($) diff --git a/testbot/lib/WineTestBot/StepsTasks.pm b/testbot/lib/WineTestBot/StepsTasks.pm index 3610492ba..9dec8060a 100644 --- a/testbot/lib/WineTestBot/StepsTasks.pm +++ b/testbot/lib/WineTestBot/StepsTasks.pm @@ -26,13 +26,11 @@ WineTestBot::StepTask - Merged Step + Task object =cut -use WineTestBot::Config; use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotItem); -use vars qw(@ISA @EXPORT); +use WineTestBot::Config; -require Exporter; -(a)ISA = qw(WineTestBot::WineTestBotItem Exporter); sub GetStepDir($) { @@ -82,6 +80,7 @@ sub GetTitle($) return $Title; } + package WineTestBot::StepsTasks; =head1 NAME @@ -97,18 +96,16 @@ a specific database table. =cut +use Exporter 'import'; +use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotCollection); +our @EXPORT = qw(CreateStepsTasks); + use ObjectModel::BasicPropertyDescriptor; use ObjectModel::ItemrefPropertyDescriptor; use WineTestBot::Steps; use WineTestBot::Tasks; use WineTestBot::VMs; -use WineTestBot::WineTestBotObjects; - -use vars qw(@ISA @EXPORT); - -require Exporter; -(a)ISA = qw(WineTestBot::WineTestBotCollection Exporter); -(a)EXPORT = qw(&CreateStepsTasks); sub _initialize($$) { diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index f16dfe201..4473df217 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -33,18 +33,15 @@ virtual machine that the test must be performed in. =cut +use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotItem); + use POSIX qw(:errno_h); use File::Path; use ObjectModel::BackEnd; use WineTestBot::Config; use WineTestBot::Jobs; use WineTestBot::Steps; -use WineTestBot::WineTestBotObjects; - -use vars qw(@ISA @EXPORT); - -require Exporter; -(a)ISA = qw(WineTestBot::WineTestBotItem Exporter); sub InitializeNew($$) { @@ -203,17 +200,15 @@ WineTestBot::Tasks - A collection of WineTestBot::Task objects =cut +use Exporter 'import'; +use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotCollection); +our @EXPORT = qw(CreateTasks); + use ObjectModel::BasicPropertyDescriptor; use ObjectModel::EnumPropertyDescriptor; use ObjectModel::ItemrefPropertyDescriptor; use WineTestBot::VMs; -use WineTestBot::WineTestBotObjects; - -use vars qw(@ISA @EXPORT); - -require Exporter; -(a)ISA = qw(WineTestBot::WineTestBotCollection Exporter); -(a)EXPORT = qw(&CreateTasks); sub CreateItem($) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index 2f7ec4def..8957b9f82 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -22,11 +22,8 @@ package TestAgent; use strict; -use vars qw (@ISA @EXPORT_OK $SENDFILE_EXE $RUN_DNT $RUN_DNTRUNC_OUT $RUN_DNTRUNC_ERR $RUN_DNTRUNC); - -require Exporter; -(a)ISA = qw(Exporter); -(a)EXPORT_OK = qw(new); +use Exporter 'import'; +our @EXPORT_OK = qw(new); my $BLOCK_SIZE = 65536; @@ -1097,7 +1094,7 @@ sub GetVersion($) return $self->{agentversion}; } -$SENDFILE_EXE = 1; +our $SENDFILE_EXE = 1; sub _SendStringOrFile($$$$$$) { @@ -1173,10 +1170,10 @@ sub GetFileToString($$) return $self->_GetStringOrFile($ServerPathName, undef, undef); } -$RUN_DNT = 1; -$RUN_DNTRUNC_OUT = 2; -$RUN_DNTRUNC_ERR = 4; -$RUN_DNTRUNC = $RUN_DNTRUNC_OUT | $RUN_DNTRUNC_ERR; +our $RUN_DNT = 1; +our $RUN_DNTRUNC_OUT = 2; +our $RUN_DNTRUNC_ERR = 4; +our $RUN_DNTRUNC = $RUN_DNTRUNC_OUT | $RUN_DNTRUNC_ERR; sub Run($$$;$$$) { diff --git a/testbot/lib/WineTestBot/UserRoles.pm b/testbot/lib/WineTestBot/UserRoles.pm index 972bdc0e9..585537ae8 100644 --- a/testbot/lib/WineTestBot/UserRoles.pm +++ b/testbot/lib/WineTestBot/UserRoles.pm @@ -26,11 +26,8 @@ WineTestBot::UserRole - A UserRole item =cut use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotItem); -use vars qw(@ISA @EXPORT); - -require Exporter; -(a)ISA = qw(WineTestBot::WineTestBotItem Exporter); package WineTestBot::UserRoles; @@ -40,16 +37,14 @@ WineTestBot::UserRoles - A collection of WineTestBot::UserRole objects =cut +use Exporter 'import'; +use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotCollection); +our @EXPORT = qw(CreateUserRoles); + use ObjectModel::BasicPropertyDescriptor; use ObjectModel::ItemrefPropertyDescriptor; use WineTestBot::Roles; -use WineTestBot::WineTestBotObjects; - -use vars qw(@ISA @EXPORT); - -require Exporter; -(a)ISA = qw(WineTestBot::WineTestBotCollection Exporter); -(a)EXPORT = qw(&CreateUserRoles); sub CreateItem($) diff --git a/testbot/lib/WineTestBot/Users.pm b/testbot/lib/WineTestBot/Users.pm index 178b377b9..4752006ab 100644 --- a/testbot/lib/WineTestBot/Users.pm +++ b/testbot/lib/WineTestBot/Users.pm @@ -26,18 +26,16 @@ WineTestBot::User - A User =cut +use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotItem); + use Digest::SHA qw(sha1_hex); use URI::Escape; use WineTestBot::Config; use WineTestBot::Roles; use WineTestBot::UserRoles; use WineTestBot::Utils; -use WineTestBot::WineTestBotObjects; -use vars qw (@ISA @EXPORT); - -require Exporter; -(a)ISA = qw(WineTestBot::WineTestBotItem Exporter); sub InitializeNew($$) { @@ -287,6 +285,7 @@ sub HasRole($$) return defined($self->Roles->GetItem($RoleName)); } + package WineTestBot::Users; =head1 NAME @@ -295,19 +294,17 @@ WineTestBot::Users - A collection of WineTestBot::User objects =cut +use Exporter 'import'; +use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotCollection); +our @EXPORT = qw(CreateUsers GetBatchUser Authenticate); + use Net::LDAP; use ObjectModel::BasicPropertyDescriptor; use ObjectModel::EnumPropertyDescriptor; use ObjectModel::DetailrefPropertyDescriptor; use WineTestBot::Config; use WineTestBot::UserRoles; -use WineTestBot::WineTestBotObjects; - -use vars qw (@ISA @EXPORT); - -require Exporter; -(a)ISA = qw(WineTestBot::WineTestBotCollection Exporter); -(a)EXPORT = qw(&CreateUsers &GetBatchUser &Authenticate); sub CreateItem($) diff --git a/testbot/lib/WineTestBot/Utils.pm b/testbot/lib/WineTestBot/Utils.pm index 63b906242..81a2eda39 100644 --- a/testbot/lib/WineTestBot/Utils.pm +++ b/testbot/lib/WineTestBot/Utils.pm @@ -25,17 +25,15 @@ WineTestBot::Utils - Utility functions =cut +use Exporter 'import'; +our @EXPORT = qw(MakeSecureURL SecureConnection GenerateRandomString + OpenNewFile CreateNewFile CreateNewLink CreateNewDir + DurationToString BuildEMailRecipient); + use Fcntl; use WineTestBot::Config; -use vars qw (@ISA @EXPORT); - -require Exporter; -(a)ISA = qw(Exporter); -(a)EXPORT = qw(&MakeSecureURL &SecureConnection &GenerateRandomString - &OpenNewFile &CreateNewFile &CreateNewLink &CreateNewDir - &DurationToString &BuildEMailRecipient); sub MakeSecureURL($) { diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index e74640bf2..b6305e83e 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -142,6 +142,9 @@ are undergoing maintenance. =cut +use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotItem); + use File::Basename; use ObjectModel::BackEnd; @@ -150,12 +153,7 @@ use WineTestBot::Engine::Notify; use WineTestBot::LibvirtDomain; use WineTestBot::RecordGroups; use WineTestBot::TestAgent; -use WineTestBot::WineTestBotObjects; -use vars qw (@ISA @EXPORT); - -require Exporter; -(a)ISA = qw(WineTestBot::WineTestBotItem Exporter); sub _initialize($$) { @@ -637,15 +635,13 @@ role or status. =cut -use ObjectModel::BasicPropertyDescriptor; -use ObjectModel::EnumPropertyDescriptor; +use Exporter 'import'; use WineTestBot::WineTestBotObjects; +our @ISA = qw(WineTestBot::WineTestBotCollection); +our @EXPORT = qw(CreateVMs); -use vars qw (@ISA @EXPORT); - -require Exporter; -(a)ISA = qw(WineTestBot::WineTestBotCollection Exporter); -(a)EXPORT = qw(&CreateVMs); +use ObjectModel::BasicPropertyDescriptor; +use ObjectModel::EnumPropertyDescriptor; sub CreateItem($) diff --git a/testbot/lib/WineTestBot/WineTestBotObjects.pm b/testbot/lib/WineTestBot/WineTestBotObjects.pm index 20ff6b1e3..bc34b74c8 100644 --- a/testbot/lib/WineTestBot/WineTestBotObjects.pm +++ b/testbot/lib/WineTestBot/WineTestBotObjects.pm @@ -25,14 +25,12 @@ WineTestBot::WineTestBotItem - Base item class for WineTestBot =cut -use ObjectModel::BackEnd; use ObjectModel::Item; -use WineTestBot::Config; +our @ISA = qw(ObjectModel::Item); -use vars qw (@ISA @EXPORT); +use ObjectModel::BackEnd; +use WineTestBot::Config; -require Exporter; -(a)ISA = qw(ObjectModel::Item Exporter); sub GetBackEnd($) { @@ -49,15 +47,13 @@ WineTestBot::WineTestBotCollection - Base collection class for WineTestBot =cut +use ObjectModel::Collection; +our @ISA = qw(ObjectModel::Collection); + use ObjectModel::BackEnd; -use ObjectModel::Item; +use WineTestBot::Item; use WineTestBot::Config; -use vars qw (@ISA @EXPORT); - -require Exporter; -(a)ISA = qw(ObjectModel::Collection Exporter); - sub GetBackEnd($) { #my ($self) = @_; diff --git a/testbot/web/index.pl b/testbot/web/index.pl index 427d7f6b9..72bd307d5 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -21,13 +21,12 @@ use strict; package JobStatusBlock; -use URI::Escape; use ObjectModel::CGI::CollectionBlock; -use WineTestBot::Branches; +our @ISA = qw(ObjectModel::CGI::CollectionBlock); -use vars qw(@ISA); +use URI::Escape; +use WineTestBot::Branches; -(a)ISA = qw(ObjectModel::CGI::CollectionBlock); sub SortKeys($$) { @@ -140,13 +139,12 @@ sub GenerateDataCell($$$$) } } + package VMStatusBlock; use ObjectModel::CGI::CollectionBlock; +our @ISA = qw(ObjectModel::CGI::CollectionBlock); -use vars qw(@ISA); - -(a)ISA = qw(ObjectModel::CGI::CollectionBlock); sub SortKeys($$) { @@ -183,16 +181,18 @@ sub GetDetailsPage($) return undef; } + package StatusPage; use ObjectModel::CGI::Page; +our @ISA = qw(ObjectModel::CGI::Page); + use WineTestBot::Config; use WineTestBot::Engine::Notify; use WineTestBot::Jobs; use WineTestBot::Log; use WineTestBot::VMs; -(a)StatusPage::ISA = qw(ObjectModel::CGI::Page); sub _initialize($$$) { @@ -303,6 +303,7 @@ EOF print "<p class='GeneralFooterText'>Generated in ", Elapsed($self->{start}), " s</p>\n"; } + package main; my $Request = shift; -- 2.17.0

1 0

[PATCH] testbot/build: Update the source before the native build!
by Francois Gouget April 19, 2018

April 19, 2018

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/build/Build.pl | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index 96cf74140..c0a9a059c 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -138,16 +138,7 @@ sub ApplyPatch($$$) if ($? != 0) { LogMsg "Patch failed to apply\n"; - return (-1, $NeedMakeInclude, $NeedBuildDeps, $NeedImplib, $NeedConfigure); - } - - if ($NeedBuildNative) - { - InfoMsg "Building tools\n"; - if (!BuildNative()) - { - return (-1, $NeedMakeInclude, $NeedBuildDeps, $NeedImplib, $NeedConfigure); - } + return (-1, $NeedMakeInclude, $NeedBuildDeps, $NeedImplib, $NeedConfigure, $NeedBuildNative); } if ($NeedMakeMakefiles) @@ -159,7 +150,7 @@ sub ApplyPatch($$$) if ($? != 0) { LogMsg "make_makefiles failed\n"; - return (-1, $NeedMakeInclude, $NeedBuildDeps, $NeedImplib, $NeedConfigure); + return (-1, $NeedMakeInclude, $NeedBuildDeps, $NeedImplib, $NeedConfigure, $NeedBuildNative); } } @@ -173,7 +164,7 @@ sub ApplyPatch($$$) { LogMsg "Autoconf failed\n"; return (-1, $NeedMakeInclude, $NeedBuildDeps, $NeedImplib, - $NeedConfigure); + $NeedConfigure, $NeedBuildNative); } $NeedConfigure = 1; } @@ -193,7 +184,7 @@ sub ApplyPatch($$$) } return ($NeedMakefile, $NeedMakeInclude, $NeedBuildDeps, $NeedImplib, - $NeedConfigure); + $NeedConfigure, $NeedBuildNative); } my $ncpus; @@ -418,7 +409,7 @@ else } my ($NeedMakefile, $NeedMakeInclude, $NeedBuildDeps, $NeedImplib, - $NeedConfigure) = ApplyPatch($PatchFile, $PatchType, $BaseName); + $NeedConfigure, $NeedBuildNative) = ApplyPatch($PatchFile, $PatchType, $BaseName); if ($NeedMakefile < 0) { exit(1); @@ -426,6 +417,15 @@ if ($NeedMakefile < 0) CountCPUs(); +if ($NeedBuildNative) +{ + InfoMsg "Building tools\n"; + if (!BuildNative()) + { + exit(1); + } +} + if ($Run32 && ! BuildTestExecutable($BaseName, $PatchType, 32, $NeedConfigure, 0 < $NeedMakefile, $NeedMakeInclude, $NeedBuildDeps, -- 2.17.0

1 0

[PATCH] testbot/build: Also re-run autoconf if aclocal.m4 is modified.
by Francois Gouget April 19, 2018

April 19, 2018

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/build/Build.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index c0a9a059c..7291ff046 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -105,7 +105,7 @@ sub ApplyPatch($$$) { $NeedImplib = 1; } - elsif ($Line =~ m=^diff.*configure\.ac=) + elsif ($Line =~ m=^diff.*(?:aclocal\.m4|configure\.ac)=) { $NeedAutoconf = 1; } -- 2.17.0

1 0

[PATCH] testbot/build: Escape dots in regular expressions.
by Francois Gouget April 19, 2018

April 19, 2018

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/build/Build.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index 7291ff046..19f220b64 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -118,7 +118,7 @@ sub ApplyPatch($$$) { $NeedMakeMakefiles = $NeedConfigure = 1; } - elsif ($Line =~ m=^diff.*tools/makedep.c=) + elsif ($Line =~ m=^diff.*tools/makedep\.c=) { $NeedBuildNative = $NeedMakeMakefiles = $NeedConfigure = 1; } -- 2.17.0

1 0

[PATCH] dmime: Add a trailing '\n' to a FIXME().
by Francois Gouget April 18, 2018

April 18, 2018

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/dmime/segment.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index cbc2b3cf0af..77c94f173d7 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -924,7 +924,7 @@ static HRESULT parse_segment_form(IDirectMusicSegment8Impl *This, IStream *strea return hr; break; case FOURCC_RIFF: - FIXME("Loading of embedded RIFF form %s", debugstr_fourcc(chunk.type)); + FIXME("Loading of embedded RIFF form %s\n", debugstr_fourcc(chunk.type)); break; } } -- 2.17.0

2 1

[PATCH] dmime: Make IDirectMusicUtils_IPersistStream_ParseDescGeneric() static.
by Francois Gouget April 18, 2018

April 18, 2018

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/dmime/dmutils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dmime/dmutils.c b/dlls/dmime/dmutils.c index 9bb8df366b6..c51d5798498 100644 --- a/dlls/dmime/dmutils.c +++ b/dlls/dmime/dmutils.c @@ -45,7 +45,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmfile); -HRESULT IDirectMusicUtils_IPersistStream_ParseDescGeneric (DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm, LPDMUS_OBJECTDESC pDesc) { +static HRESULT IDirectMusicUtils_IPersistStream_ParseDescGeneric (DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm, LPDMUS_OBJECTDESC pDesc) { switch (pChunk->fccID) { case DMUS_FOURCC_GUID_CHUNK: { -- 2.17.0

2 1

[PATCH 1/3] wined3d: Add support for returning multiple viewports.
by Nikolay Sivov April 18, 2018

April 18, 2018

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d11/device.c | 4 ++-- dlls/d3d8/device.c | 2 +- dlls/d3d9/device.c | 2 +- dlls/ddraw/device.c | 2 +- dlls/wined3d/device.c | 15 +++++++++++---- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 3 ++- 7 files changed, 19 insertions(+), 11 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 248cac69f8..0ee756dfa2 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2107,7 +2107,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSGetViewports(ID3D11Devic return; wined3d_mutex_lock(); - wined3d_device_get_viewport(device->wined3d_device, &wined3d_vp); + wined3d_device_get_viewports(device->wined3d_device, NULL, &wined3d_vp); wined3d_mutex_unlock(); viewports[0].TopLeftX = wined3d_vp.x; @@ -4909,7 +4909,7 @@ static void STDMETHODCALLTYPE d3d10_device_RSGetViewports(ID3D10Device1 *iface, return; wined3d_mutex_lock(); - wined3d_device_get_viewport(device->wined3d_device, &wined3d_vp); + wined3d_device_get_viewports(device->wined3d_device, NULL, &wined3d_vp); wined3d_mutex_unlock(); viewports[0].TopLeftX = wined3d_vp.x; diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 3bdb278ec5..616886bcaf 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1664,7 +1664,7 @@ static HRESULT WINAPI d3d8_device_GetViewport(IDirect3DDevice8 *iface, D3DVIEWPO TRACE("iface %p, viewport %p.\n", iface, viewport); wined3d_mutex_lock(); - wined3d_device_get_viewport(device->wined3d_device, &wined3d_viewport); + wined3d_device_get_viewports(device->wined3d_device, NULL, &wined3d_viewport); wined3d_mutex_unlock(); viewport->X = wined3d_viewport.x; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 5c0d6779c5..0a77b3e316 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2082,7 +2082,7 @@ static HRESULT WINAPI d3d9_device_GetViewport(IDirect3DDevice9Ex *iface, D3DVIEW TRACE("iface %p, viewport %p.\n", iface, viewport); wined3d_mutex_lock(); - wined3d_device_get_viewport(device->wined3d_device, &wined3d_viewport); + wined3d_device_get_viewports(device->wined3d_device, NULL, &wined3d_viewport); wined3d_mutex_unlock(); viewport->X = wined3d_viewport.x; diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 23c61c5d80..5db0b81a81 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -5367,7 +5367,7 @@ static HRESULT d3d_device7_GetViewport(IDirect3DDevice7 *iface, D3DVIEWPORT7 *vi return DDERR_INVALIDPARAMS; wined3d_mutex_lock(); - wined3d_device_get_viewport(device->wined3d_device, &wined3d_viewport); + wined3d_device_get_viewports(device->wined3d_device, NULL, &wined3d_viewport); wined3d_mutex_unlock(); viewport->dwX = wined3d_viewport.x; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4ee948019b..8d4f4cde0e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1940,11 +1940,18 @@ void CDECL wined3d_device_set_viewports(struct wined3d_device *device, unsigned wined3d_cs_emit_set_viewports(device->cs, viewport_count, viewports); } -void CDECL wined3d_device_get_viewport(const struct wined3d_device *device, struct wined3d_viewport *viewport) +void CDECL wined3d_device_get_viewports(const struct wined3d_device *device, unsigned int *viewport_count, + struct wined3d_viewport *viewports) { - TRACE("device %p, viewport %p.\n", device, viewport); + unsigned int count; - *viewport = device->state.viewports[0]; + TRACE("device %p, viewport_count %p, viewports %p.\n", device, viewport_count, viewports); + + count = viewport_count ? min(*viewport_count, device->state.viewport_count) : 1; + if (count && viewports) + memcpy(viewports, device->state.viewports, count * sizeof(*viewports)); + if (viewport_count) + *viewport_count = device->state.viewport_count; } static void resolve_depth_buffer(struct wined3d_device *device) @@ -3139,7 +3146,7 @@ static HRESULT process_vertices_strided(const struct wined3d_device *device, DWO TRACE("%.8e %.8e %.8e %.8e\n", world_mat._41, world_mat._42, world_mat._43, world_mat._44); /* Get the viewport */ - wined3d_device_get_viewport(device, &vp); + wined3d_device_get_viewports(device, NULL, &vp); TRACE("viewport x %.8e, y %.8e, width %.8e, height %.8e, min_z %.8e, max_z %.8e.\n", vp.x, vp.y, vp.width, vp.height, vp.min_z, vp.max_z); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index b4c41cc59a..1b59178296 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -114,7 +114,7 @@ @ cdecl wined3d_device_get_unordered_access_view(ptr long) @ cdecl wined3d_device_get_vertex_declaration(ptr) @ cdecl wined3d_device_get_vertex_shader(ptr) -@ cdecl wined3d_device_get_viewport(ptr ptr) +@ cdecl wined3d_device_get_viewports(ptr ptr ptr) @ cdecl wined3d_device_get_vs_cb(ptr long) @ cdecl wined3d_device_get_vs_consts_b(ptr long long ptr) @ cdecl wined3d_device_get_vs_consts_f(ptr long long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 3539b4eb06..ccda987405 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2324,7 +2324,8 @@ struct wined3d_unordered_access_view * __cdecl wined3d_device_get_unordered_acce const struct wined3d_device *device, unsigned int idx); struct wined3d_vertex_declaration * __cdecl wined3d_device_get_vertex_declaration(const struct wined3d_device *device); struct wined3d_shader * __cdecl wined3d_device_get_vertex_shader(const struct wined3d_device *device); -void __cdecl wined3d_device_get_viewport(const struct wined3d_device *device, struct wined3d_viewport *viewport); +void __cdecl wined3d_device_get_viewports(const struct wined3d_device *device, unsigned int *viewport_count, + struct wined3d_viewport *viewports); struct wined3d_buffer * __cdecl wined3d_device_get_vs_cb(const struct wined3d_device *device, UINT idx); HRESULT __cdecl wined3d_device_get_vs_consts_b(const struct wined3d_device *device, unsigned int start_idx, unsigned int count, BOOL *constants); -- 2.17.0

2 5