March 2018 - Wine-devel - list.winehq.org

Wine staging 3.5 release
by Alistair Leslie-Hughes 31 Mar '18

31 Mar '18

Packages have been published to the following repository. https://repos.wine-staging.com/alesliehughes/ Summary of the past few weeks * Rebased to current wine 3.5 (950 patches are applied to wine vanilla) * All existing bcrypt patches accepted upstream (Thank Hans for reviewing) * Removed patches that have already being fixed upstream. * Reviewed and upstreamed patches. Fixes * Corrected 1D Texture support. New Patches * Added support for Implicit MTA. * Added more ntoskrnl stubs for BattlEye service * Added support for fucntion BCryptDeriveKeyPBKDF2 * Added function _crtCaptureCurrentContext for Rise of the Tomb Raider Where can you help * Run Steam/Battle.net/UPlay. * Try you favorite game: Banished, Claybook, Diablo 2 * Test your favorite applications. * Steal staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.com Best Regards Alistair.

1 0

[PATCH v2 1/4] devenum: Register waveOut devices as codec devices.
by Zebediah Figura 31 Mar '18

31 Mar '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/devenum/createdevenum.c | 131 +++++++++++++++++++++++++---------------- dlls/devenum/devenum.rc | 1 - dlls/devenum/devenum_private.h | 1 - dlls/devenum/tests/Makefile.in | 2 +- dlls/devenum/tests/devenum.c | 109 ++++++++++++++++++++++++++++++++++ 5 files changed, 190 insertions(+), 54 deletions(-) diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c index 6884ffc..e3fe049 100644 --- a/dlls/devenum/createdevenum.c +++ b/dlls/devenum/createdevenum.c @@ -594,6 +594,85 @@ cleanup: return TRUE; } +static void register_waveout_devices(void) +{ + static const WCHAR defaultW[] = {'D','e','f','a','u','l','t',' ','W','a','v','e','O','u','t',' ','D','e','v','i','c','e',0}; + static const WCHAR waveoutidW[] = {'W','a','v','e','O','u','t','I','d',0}; + IPropertyBag *prop_bag = NULL; + REGFILTERPINS2 rgpins = {0}; + REGPINTYPES rgtypes = {0}; + REGFILTER2 rgf = {0}; + WCHAR clsid[CHARS_IN_GUID]; + IMoniker *mon = NULL; + WAVEOUTCAPSW caps; + int i, count; + VARIANT var; + HRESULT hr; + + hr = DEVENUM_CreateAMCategoryKey(&CLSID_AudioRendererCategory); + if (FAILED(hr)) return; + + count = waveOutGetNumDevs(); + + for (i = -1; i < count; i++) + { + waveOutGetDevCapsW(i, &caps, sizeof(caps)); + + V_VT(&var) = VT_BSTR; + + if (i == -1) /* WAVE_MAPPER */ + V_BSTR(&var) = SysAllocString(defaultW); + else + V_BSTR(&var) = SysAllocString(caps.szPname); + if (!(V_BSTR(&var))) + goto cleanup; + + hr = register_codec(&CLSID_AudioRendererCategory, V_BSTR(&var), &mon); + if (FAILED(hr)) goto cleanup; + + hr = IMoniker_BindToStorage(mon, NULL, NULL, &IID_IPropertyBag, (void **)&prop_bag); + if (FAILED(hr)) goto cleanup; + + /* write friendly name */ + hr = IPropertyBag_Write(prop_bag, wszFriendlyName, &var); + if (FAILED(hr)) goto cleanup; + VariantClear(&var); + + /* write clsid */ + V_VT(&var) = VT_BSTR; + StringFromGUID2(&CLSID_AudioRender, clsid, CHARS_IN_GUID); + if (!(V_BSTR(&var) = SysAllocString(clsid))) + goto cleanup; + hr = IPropertyBag_Write(prop_bag, clsid_keyname, &var); + if (FAILED(hr)) goto cleanup; + VariantClear(&var); + + /* write filter data */ + rgf.dwVersion = 2; + rgf.dwMerit = MERIT_DO_NOT_USE; + rgf.u.s2.cPins2 = 1; + rgf.u.s2.rgPins2 = &rgpins; + rgpins.dwFlags = REG_PINFLAG_B_RENDERER; + rgpins.nMediaTypes = 1; + rgpins.lpMediaType = &rgtypes; + rgtypes.clsMajorType = &MEDIATYPE_Audio; + rgtypes.clsMinorType = &MEDIASUBTYPE_NULL; + + write_filter_data(prop_bag, &rgf); + + /* write WaveOutId */ + V_VT(&var) = VT_I4; + V_I4(&var) = i; + hr = IPropertyBag_Write(prop_bag, waveoutidW, &var); + if (FAILED(hr)) goto cleanup; + +cleanup: + VariantClear(&var); + if (prop_bag) IPropertyBag_Release(prop_bag); + if (mon) IMoniker_Release(mon); + } +} + /********************************************************************** * DEVENUM_ICreateDevEnum_CreateClassEnumerator */ @@ -616,6 +695,7 @@ static HRESULT WINAPI DEVENUM_ICreateDevEnum_CreateClassEnumerator( register_legacy_filters(); hr = DirectSoundEnumerateW(&register_dsound_devices, NULL); if (FAILED(hr)) return hr; + register_waveout_devices(); return create_EnumMoniker(clsidDeviceClass, ppEnumMoniker); } @@ -752,62 +832,11 @@ static HRESULT register_codecs(void) if (SUCCEEDED(res)) { UINT i; - WAVEOUTCAPSW wocaps; WAVEINCAPSW wicaps; MIDIOUTCAPSW mocaps; REGPINTYPES * pTypes; IPropertyBag * pPropBag = NULL; - numDevs = waveOutGetNumDevs(); - - res = DEVENUM_CreateAMCategoryKey(&CLSID_AudioRendererCategory); - if (FAILED(res)) /* can't register any devices in this category */ - numDevs = 0; - - rfp2.dwFlags = REG_PINFLAG_B_RENDERER; - for (i = 0; i < numDevs; i++) - { - if (waveOutGetDevCapsW(i, &wocaps, sizeof(WAVEOUTCAPSW)) - == MMSYSERR_NOERROR) - { - IMoniker * pMoniker = NULL; - - rfp2.nMediaTypes = 1; - pTypes = CoTaskMemAlloc(rfp2.nMediaTypes * sizeof(REGPINTYPES)); - if (!pTypes) - { - IFilterMapper2_Release(pMapper); - return E_OUTOFMEMORY; - } - /* FIXME: Native devenum seems to register a lot more types for - * DSound than we do. Not sure what purpose they serve */ - pTypes[0].clsMajorType = &MEDIATYPE_Audio; - pTypes[0].clsMinorType = &MEDIASUBTYPE_PCM; - - rfp2.lpMediaType = pTypes; - - res = IFilterMapper2_RegisterFilter(pMapper, - &CLSID_AudioRender, - wocaps.szPname, - &pMoniker, - &CLSID_AudioRendererCategory, - wocaps.szPname, - &rf2); - - /* FIXME: do additional stuff with IMoniker here, depending on what RegisterFilter does */ - - if (pMoniker) - IMoniker_Release(pMoniker); - - if (i == iDefaultDevice) - { - FIXME("Default device\n"); - } - - CoTaskMemFree(pTypes); - } - } - numDevs = waveInGetNumDevs(); res = DEVENUM_CreateAMCategoryKey(&CLSID_AudioInputDeviceCategory); diff --git a/dlls/devenum/devenum.rc b/dlls/devenum/devenum.rc index d9262e1..95e39d6 100644 --- a/dlls/devenum/devenum.rc +++ b/dlls/devenum/devenum.rc @@ -29,7 +29,6 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STRINGTABLE { - IDS_DEVENUM_WODEFAULT "Default WaveOut Device" IDS_DEVENUM_MIDEFAULT "Default MidiOut Device" } diff --git a/dlls/devenum/devenum_private.h b/dlls/devenum/devenum_private.h index 93147ad..c891083 100644 --- a/dlls/devenum/devenum_private.h +++ b/dlls/devenum/devenum_private.h @@ -101,7 +101,6 @@ extern const WCHAR clsid_keyname[6] DECLSPEC_HIDDEN; /********************************************************************** * Resource IDs */ -#define IDS_DEVENUM_WODEFAULT 9 #define IDS_DEVENUM_MIDEFAULT 10 #define IDS_DEVENUM_KSDEFAULT 11 #define IDS_DEVENUM_KS 12 diff --git a/dlls/devenum/tests/Makefile.in b/dlls/devenum/tests/Makefile.in index 028ba27..a673f20 100644 --- a/dlls/devenum/tests/Makefile.in +++ b/dlls/devenum/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = devenum.dll -IMPORTS = advapi32 dsound oleaut32 ole32 +IMPORTS = advapi32 dsound oleaut32 ole32 winmm C_SRCS = \ devenum.c diff --git a/dlls/devenum/tests/devenum.c b/dlls/devenum/tests/devenum.c index c4bf8af..79f5ed8 100644 --- a/dlls/devenum/tests/devenum.c +++ b/dlls/devenum/tests/devenum.c @@ -30,6 +30,7 @@ #include "vfwmsgs.h" #include "mmsystem.h" #include "dsound.h" +#include "mmddk.h" DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); @@ -37,11 +38,25 @@ static const WCHAR friendly_name[] = {'F','r','i','e','n','d','l','y','N','a','m static const WCHAR fcc_handlerW[] = {'F','c','c','H','a','n','d','l','e','r',0}; static const WCHAR deviceW[] = {'@','d','e','v','i','c','e',':',0}; static const WCHAR clsidW[] = {'C','L','S','I','D',0}; +static const WCHAR waveW[] = {'w','a','v','e',':',0}; static const WCHAR mrleW[] = {'m','r','l','e',0}; static const WCHAR swW[] = {'s','w',':',0}; static const WCHAR cmW[] = {'c','m',':',0}; static const WCHAR backslashW[] = {'\\',0}; +static inline WCHAR *strchrW( const WCHAR *str, WCHAR ch ) +{ + do { if (*str == ch) return (WCHAR *)str; } while (*str++); + return NULL; +} + +static inline int strncmpW( const WCHAR *str1, const WCHAR *str2, int n ) +{ + if (n <= 0) return 0; + while ((--n > 0) && *str1 && (*str1 == *str2)) { str1++; str2++; } + return *str1 - *str2; +} + static void test_devenum(IBindCtx *bind_ctx) { IEnumMoniker *enum_cat, *enum_moniker; @@ -618,6 +633,99 @@ static BOOL CALLBACK test_dsound(GUID *guid, const WCHAR *desc, const WCHAR *mod return TRUE; } +static void test_waveout(void) +{ + static const WCHAR defaultW[] = {'D','e','f','a','u','l','t',' ','W','a','v','e','O','u','t',' ','D','e','v','i','c','e',0}; + static const WCHAR waveoutidW[] = {'W','a','v','e','O','u','t','I','d',0}; + IParseDisplayName *parser; + IPropertyBag *prop_bag; + IMoniker *mon; + WCHAR endpoint[200]; + WAVEOUTCAPSW caps; + WCHAR buffer[200]; + const WCHAR *name; + MMRESULT mmr; + int count, i; + VARIANT var; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_CDeviceMoniker, NULL, CLSCTX_INPROC, &IID_IParseDisplayName, (void **)&parser); + ok(hr == S_OK, "Failed to create ParseDisplayName: %#x\n", hr); + + count = waveOutGetNumDevs(); + + for (i = -1; i < count; i++) + { + waveOutGetDevCapsW(i, &caps, sizeof(caps)); + + if (i == -1) /* WAVE_MAPPER */ + name = defaultW; + else + name = caps.szPname; + + lstrcpyW(buffer, deviceW); + lstrcatW(buffer, cmW); + StringFromGUID2(&CLSID_AudioRendererCategory, buffer + lstrlenW(buffer), CHARS_IN_GUID); + lstrcatW(buffer, backslashW); + lstrcatW(buffer, name); + + mon = check_display_name(parser, buffer); + + hr = IMoniker_BindToStorage(mon, NULL, NULL, &IID_IPropertyBag, (void **)&prop_bag); + ok(hr == S_OK, "BindToStorage failed: %#x\n", hr); + + VariantInit(&var); + hr = IPropertyBag_Read(prop_bag, friendly_name, &var, NULL); + if (hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)) + { + IPropertyBag_Release(prop_bag); + IMoniker_Release(mon); + + /* Win8+ uses the endpoint GUID instead of the device name */ + mmr = waveOutMessage((HWAVEOUT)(DWORD_PTR) i, DRV_QUERYFUNCTIONINSTANCEID, + (DWORD_PTR) endpoint, sizeof(endpoint)); + ok(!mmr, "waveOutMessage failed: %u\n", mmr); + + lstrcpyW(buffer, deviceW); + lstrcatW(buffer, cmW); + StringFromGUID2(&CLSID_AudioRendererCategory, buffer + lstrlenW(buffer), CHARS_IN_GUID); + lstrcatW(buffer, backslashW); + lstrcatW(buffer, waveW); + lstrcatW(buffer, strchrW(endpoint, '}') + 2); + + mon = check_display_name(parser, buffer); + + hr = IMoniker_BindToStorage(mon, NULL, NULL, &IID_IPropertyBag, (void **)&prop_bag); + ok(hr == S_OK, "BindToStorage failed: %#x\n", hr); + + hr = IPropertyBag_Read(prop_bag, friendly_name, &var, NULL); + } + ok(hr == S_OK, "Read failed: %#x\n", hr); + + ok(!strncmpW(name, V_BSTR(&var), lstrlenW(name)), "expected %s, got %s\n", + wine_dbgstr_w(name), wine_dbgstr_w(V_BSTR(&var))); + + VariantClear(&var); + hr = IPropertyBag_Read(prop_bag, clsidW, &var, NULL); + ok(hr == S_OK, "Read failed: %#x\n", hr); + + StringFromGUID2(&CLSID_AudioRender, buffer, CHARS_IN_GUID); + ok(!lstrcmpW(buffer, V_BSTR(&var)), "expected %s, got %s\n", + wine_dbgstr_w(buffer), wine_dbgstr_w(V_BSTR(&var))); + + VariantClear(&var); + hr = IPropertyBag_Read(prop_bag, waveoutidW, &var, NULL); + ok(hr == S_OK, "Read failed: %#x\n", hr); + + ok(V_I4(&var) == i, "expected %d, got %d\n", i, V_I4(&var)); + + IPropertyBag_Release(prop_bag); + IMoniker_Release(mon); + } + + IParseDisplayName_Release(parser); +} + START_TEST(devenum) { IBindCtx *bind_ctx = NULL; @@ -643,6 +751,7 @@ START_TEST(devenum) test_legacy_filter(); hr = DirectSoundEnumerateW(test_dsound, NULL); ok(hr == S_OK, "got %#x\n", hr); + test_waveout(); CoUninitialize(); } -- 2.7.4

2 5

[PATCH] testbot: Standardize the packages inheritance and exports.
by Francois Gouget 31 Mar '18

31 Mar '18

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 packages. 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> --- testbot/lib/ObjectModel/BackEnd.pm | 7 ++----- testbot/lib/ObjectModel/BasicPropertyDescriptor.pm | 8 +++----- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 9 +++------ .../lib/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 +++++------- .../lib/ObjectModel/DetailrefPropertyDescriptor.pm | 8 ++++---- testbot/lib/ObjectModel/EnumPropertyDescriptor.pm | 8 +++----- testbot/lib/ObjectModel/Item.pm | 8 +++----- .../lib/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 37d519ce9..843579361 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 $HackVirtURI = 1; 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.16.2

1 0

[PATCH 1/4] devenum: Register waveOut devices as codec devices.
by Zebediah Figura 31 Mar '18

31 Mar '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/devenum/createdevenum.c | 131 +++++++++++++++++++++++++---------------- dlls/devenum/devenum.rc | 1 - dlls/devenum/devenum_private.h | 1 - dlls/devenum/tests/Makefile.in | 2 +- dlls/devenum/tests/devenum.c | 109 ++++++++++++++++++++++++++++++++++ 5 files changed, 190 insertions(+), 54 deletions(-) diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c index 6884ffc..e3fe049 100644 --- a/dlls/devenum/createdevenum.c +++ b/dlls/devenum/createdevenum.c @@ -594,6 +594,85 @@ cleanup: return TRUE; } +static void register_waveout_devices(void) +{ + static const WCHAR defaultW[] = {'D','e','f','a','u','l','t',' ','W','a','v','e','O','u','t',' ','D','e','v','i','c','e',0}; + static const WCHAR waveoutidW[] = {'W','a','v','e','O','u','t','I','d',0}; + IPropertyBag *prop_bag = NULL; + REGFILTERPINS2 rgpins = {0}; + REGPINTYPES rgtypes = {0}; + REGFILTER2 rgf = {0}; + WCHAR clsid[CHARS_IN_GUID]; + IMoniker *mon = NULL; + WAVEOUTCAPSW caps; + int i, count; + VARIANT var; + HRESULT hr; + + hr = DEVENUM_CreateAMCategoryKey(&CLSID_AudioRendererCategory); + if (FAILED(hr)) return; + + count = waveOutGetNumDevs(); + + for (i = -1; i < count; i++) + { + waveOutGetDevCapsW(i, &caps, sizeof(caps)); + + V_VT(&var) = VT_BSTR; + + if (i == -1) /* WAVE_MAPPER */ + V_BSTR(&var) = SysAllocString(defaultW); + else + V_BSTR(&var) = SysAllocString(caps.szPname); + if (!(V_BSTR(&var))) + goto cleanup; + + hr = register_codec(&CLSID_AudioRendererCategory, V_BSTR(&var), &mon); + if (FAILED(hr)) goto cleanup; + + hr = IMoniker_BindToStorage(mon, NULL, NULL, &IID_IPropertyBag, (void **)&prop_bag); + if (FAILED(hr)) goto cleanup; + + /* write friendly name */ + hr = IPropertyBag_Write(prop_bag, wszFriendlyName, &var); + if (FAILED(hr)) goto cleanup; + VariantClear(&var); + + /* write clsid */ + V_VT(&var) = VT_BSTR; + StringFromGUID2(&CLSID_AudioRender, clsid, CHARS_IN_GUID); + if (!(V_BSTR(&var) = SysAllocString(clsid))) + goto cleanup; + hr = IPropertyBag_Write(prop_bag, clsid_keyname, &var); + if (FAILED(hr)) goto cleanup; + VariantClear(&var); + + /* write filter data */ + rgf.dwVersion = 2; + rgf.dwMerit = MERIT_DO_NOT_USE; + rgf.u.s2.cPins2 = 1; + rgf.u.s2.rgPins2 = &rgpins; + rgpins.dwFlags = REG_PINFLAG_B_RENDERER; + rgpins.nMediaTypes = 1; + rgpins.lpMediaType = &rgtypes; + rgtypes.clsMajorType = &MEDIATYPE_Audio; + rgtypes.clsMinorType = &MEDIASUBTYPE_NULL; + + write_filter_data(prop_bag, &rgf); + + /* write WaveOutId */ + V_VT(&var) = VT_I4; + V_I4(&var) = i; + hr = IPropertyBag_Write(prop_bag, waveoutidW, &var); + if (FAILED(hr)) goto cleanup; + +cleanup: + VariantClear(&var); + if (prop_bag) IPropertyBag_Release(prop_bag); + if (mon) IMoniker_Release(mon); + } +} + /********************************************************************** * DEVENUM_ICreateDevEnum_CreateClassEnumerator */ @@ -616,6 +695,7 @@ static HRESULT WINAPI DEVENUM_ICreateDevEnum_CreateClassEnumerator( register_legacy_filters(); hr = DirectSoundEnumerateW(&register_dsound_devices, NULL); if (FAILED(hr)) return hr; + register_waveout_devices(); return create_EnumMoniker(clsidDeviceClass, ppEnumMoniker); } @@ -752,62 +832,11 @@ static HRESULT register_codecs(void) if (SUCCEEDED(res)) { UINT i; - WAVEOUTCAPSW wocaps; WAVEINCAPSW wicaps; MIDIOUTCAPSW mocaps; REGPINTYPES * pTypes; IPropertyBag * pPropBag = NULL; - numDevs = waveOutGetNumDevs(); - - res = DEVENUM_CreateAMCategoryKey(&CLSID_AudioRendererCategory); - if (FAILED(res)) /* can't register any devices in this category */ - numDevs = 0; - - rfp2.dwFlags = REG_PINFLAG_B_RENDERER; - for (i = 0; i < numDevs; i++) - { - if (waveOutGetDevCapsW(i, &wocaps, sizeof(WAVEOUTCAPSW)) - == MMSYSERR_NOERROR) - { - IMoniker * pMoniker = NULL; - - rfp2.nMediaTypes = 1; - pTypes = CoTaskMemAlloc(rfp2.nMediaTypes * sizeof(REGPINTYPES)); - if (!pTypes) - { - IFilterMapper2_Release(pMapper); - return E_OUTOFMEMORY; - } - /* FIXME: Native devenum seems to register a lot more types for - * DSound than we do. Not sure what purpose they serve */ - pTypes[0].clsMajorType = &MEDIATYPE_Audio; - pTypes[0].clsMinorType = &MEDIASUBTYPE_PCM; - - rfp2.lpMediaType = pTypes; - - res = IFilterMapper2_RegisterFilter(pMapper, - &CLSID_AudioRender, - wocaps.szPname, - &pMoniker, - &CLSID_AudioRendererCategory, - wocaps.szPname, - &rf2); - - /* FIXME: do additional stuff with IMoniker here, depending on what RegisterFilter does */ - - if (pMoniker) - IMoniker_Release(pMoniker); - - if (i == iDefaultDevice) - { - FIXME("Default device\n"); - } - - CoTaskMemFree(pTypes); - } - } - numDevs = waveInGetNumDevs(); res = DEVENUM_CreateAMCategoryKey(&CLSID_AudioInputDeviceCategory); diff --git a/dlls/devenum/devenum.rc b/dlls/devenum/devenum.rc index d9262e1..95e39d6 100644 --- a/dlls/devenum/devenum.rc +++ b/dlls/devenum/devenum.rc @@ -29,7 +29,6 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STRINGTABLE { - IDS_DEVENUM_WODEFAULT "Default WaveOut Device" IDS_DEVENUM_MIDEFAULT "Default MidiOut Device" } diff --git a/dlls/devenum/devenum_private.h b/dlls/devenum/devenum_private.h index 93147ad..c891083 100644 --- a/dlls/devenum/devenum_private.h +++ b/dlls/devenum/devenum_private.h @@ -101,7 +101,6 @@ extern const WCHAR clsid_keyname[6] DECLSPEC_HIDDEN; /********************************************************************** * Resource IDs */ -#define IDS_DEVENUM_WODEFAULT 9 #define IDS_DEVENUM_MIDEFAULT 10 #define IDS_DEVENUM_KSDEFAULT 11 #define IDS_DEVENUM_KS 12 diff --git a/dlls/devenum/tests/Makefile.in b/dlls/devenum/tests/Makefile.in index 028ba27..a673f20 100644 --- a/dlls/devenum/tests/Makefile.in +++ b/dlls/devenum/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = devenum.dll -IMPORTS = advapi32 dsound oleaut32 ole32 +IMPORTS = advapi32 dsound oleaut32 ole32 winmm C_SRCS = \ devenum.c diff --git a/dlls/devenum/tests/devenum.c b/dlls/devenum/tests/devenum.c index c4bf8af..79f5ed8 100644 --- a/dlls/devenum/tests/devenum.c +++ b/dlls/devenum/tests/devenum.c @@ -30,6 +30,7 @@ #include "vfwmsgs.h" #include "mmsystem.h" #include "dsound.h" +#include "mmddk.h" DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); @@ -37,11 +38,25 @@ static const WCHAR friendly_name[] = {'F','r','i','e','n','d','l','y','N','a','m static const WCHAR fcc_handlerW[] = {'F','c','c','H','a','n','d','l','e','r',0}; static const WCHAR deviceW[] = {'@','d','e','v','i','c','e',':',0}; static const WCHAR clsidW[] = {'C','L','S','I','D',0}; +static const WCHAR waveW[] = {'w','a','v','e',':',0}; static const WCHAR mrleW[] = {'m','r','l','e',0}; static const WCHAR swW[] = {'s','w',':',0}; static const WCHAR cmW[] = {'c','m',':',0}; static const WCHAR backslashW[] = {'\\',0}; +static inline WCHAR *strchrW( const WCHAR *str, WCHAR ch ) +{ + do { if (*str == ch) return (WCHAR *)str; } while (*str++); + return NULL; +} + +static inline int strncmpW( const WCHAR *str1, const WCHAR *str2, int n ) +{ + if (n <= 0) return 0; + while ((--n > 0) && *str1 && (*str1 == *str2)) { str1++; str2++; } + return *str1 - *str2; +} + static void test_devenum(IBindCtx *bind_ctx) { IEnumMoniker *enum_cat, *enum_moniker; @@ -618,6 +633,99 @@ static BOOL CALLBACK test_dsound(GUID *guid, const WCHAR *desc, const WCHAR *mod return TRUE; } +static void test_waveout(void) +{ + static const WCHAR defaultW[] = {'D','e','f','a','u','l','t',' ','W','a','v','e','O','u','t',' ','D','e','v','i','c','e',0}; + static const WCHAR waveoutidW[] = {'W','a','v','e','O','u','t','I','d',0}; + IParseDisplayName *parser; + IPropertyBag *prop_bag; + IMoniker *mon; + WCHAR endpoint[200]; + WAVEOUTCAPSW caps; + WCHAR buffer[200]; + const WCHAR *name; + MMRESULT mmr; + int count, i; + VARIANT var; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_CDeviceMoniker, NULL, CLSCTX_INPROC, &IID_IParseDisplayName, (void **)&parser); + ok(hr == S_OK, "Failed to create ParseDisplayName: %#x\n", hr); + + count = waveOutGetNumDevs(); + + for (i = -1; i < count; i++) + { + waveOutGetDevCapsW(i, &caps, sizeof(caps)); + + if (i == -1) /* WAVE_MAPPER */ + name = defaultW; + else + name = caps.szPname; + + lstrcpyW(buffer, deviceW); + lstrcatW(buffer, cmW); + StringFromGUID2(&CLSID_AudioRendererCategory, buffer + lstrlenW(buffer), CHARS_IN_GUID); + lstrcatW(buffer, backslashW); + lstrcatW(buffer, name); + + mon = check_display_name(parser, buffer); + + hr = IMoniker_BindToStorage(mon, NULL, NULL, &IID_IPropertyBag, (void **)&prop_bag); + ok(hr == S_OK, "BindToStorage failed: %#x\n", hr); + + VariantInit(&var); + hr = IPropertyBag_Read(prop_bag, friendly_name, &var, NULL); + if (hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)) + { + IPropertyBag_Release(prop_bag); + IMoniker_Release(mon); + + /* Win8+ uses the endpoint GUID instead of the device name */ + mmr = waveOutMessage((HWAVEOUT)(DWORD_PTR) i, DRV_QUERYFUNCTIONINSTANCEID, + (DWORD_PTR) endpoint, sizeof(endpoint)); + ok(!mmr, "waveOutMessage failed: %u\n", mmr); + + lstrcpyW(buffer, deviceW); + lstrcatW(buffer, cmW); + StringFromGUID2(&CLSID_AudioRendererCategory, buffer + lstrlenW(buffer), CHARS_IN_GUID); + lstrcatW(buffer, backslashW); + lstrcatW(buffer, waveW); + lstrcatW(buffer, strchrW(endpoint, '}') + 2); + + mon = check_display_name(parser, buffer); + + hr = IMoniker_BindToStorage(mon, NULL, NULL, &IID_IPropertyBag, (void **)&prop_bag); + ok(hr == S_OK, "BindToStorage failed: %#x\n", hr); + + hr = IPropertyBag_Read(prop_bag, friendly_name, &var, NULL); + } + ok(hr == S_OK, "Read failed: %#x\n", hr); + + ok(!strncmpW(name, V_BSTR(&var), lstrlenW(name)), "expected %s, got %s\n", + wine_dbgstr_w(name), wine_dbgstr_w(V_BSTR(&var))); + + VariantClear(&var); + hr = IPropertyBag_Read(prop_bag, clsidW, &var, NULL); + ok(hr == S_OK, "Read failed: %#x\n", hr); + + StringFromGUID2(&CLSID_AudioRender, buffer, CHARS_IN_GUID); + ok(!lstrcmpW(buffer, V_BSTR(&var)), "expected %s, got %s\n", + wine_dbgstr_w(buffer), wine_dbgstr_w(V_BSTR(&var))); + + VariantClear(&var); + hr = IPropertyBag_Read(prop_bag, waveoutidW, &var, NULL); + ok(hr == S_OK, "Read failed: %#x\n", hr); + + ok(V_I4(&var) == i, "expected %d, got %d\n", i, V_I4(&var)); + + IPropertyBag_Release(prop_bag); + IMoniker_Release(mon); + } + + IParseDisplayName_Release(parser); +} + START_TEST(devenum) { IBindCtx *bind_ctx = NULL; @@ -643,6 +751,7 @@ START_TEST(devenum) test_legacy_filter(); hr = DirectSoundEnumerateW(test_dsound, NULL); ok(hr == S_OK, "got %#x\n", hr); + test_waveout(); CoUninitialize(); } -- 2.7.4

2 4

[PATCH] oleaut32/typelib.c: fix cursor2 having the wrong type
by Adeniyi Mayokun 31 Mar '18

31 Mar '18

>From 275d93c9ab0f533fa70d698726afc8adaaefb664 Mon Sep 17 00:00:00 2001 From: Adeniyi Mayokun <adeniyimayokun17(a)gmail.com> Date: Wed, 14 Mar 2018 06:55:15 +0100 Subject: [PATCH] oleaut32/typelib.c: fix cursor2 having the wrong type Signed-off-by: Adeniyi Mayokun <adeniyimayokun17(a)gmail> --- dlls/oleaut32/typelib.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 1c00d715f4..247d383ff7 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -4725,10 +4725,9 @@ static ULONG WINAPI ITypeLib2_fnRelease( ITypeLib2 *iface) if (!ref) { TLBImpLib *pImpLib, *pImpLibNext; - TLBRefType *ref_type; + TLBRefType *ref_type, *ref_type_next; TLBString *tlbstr, *tlbstr_next; TLBGuid *tlbguid, *tlbguid_next; - void *cursor2; int i; /* remove cache entry */ @@ -4778,7 +4777,7 @@ static ULONG WINAPI ITypeLib2_fnRelease( ITypeLib2 *iface) heap_free(pImpLib); } - LIST_FOR_EACH_ENTRY_SAFE(ref_type, cursor2, &This->ref_list, TLBRefType, entry) + LIST_FOR_EACH_ENTRY_SAFE(ref_type, ref_type_next, &This->ref_list, TLBRefType, entry) { list_remove(&ref_type->entry); heap_free(ref_type); -- 2.14.1

3 2

WineConf and sound recording
by M. GOUJON 31 Mar '18

31 Mar '18

Hi everyone, Recordings of previous wine confs have been somewhat disappointing especially the sound part: microphone buggy, people asking question too far from the micro... Some of you are native English speakers, others not and understanding everyone quickly becomes a challenge (and you ends up with a headache). May I suggest you to buy some clip-on microphones ? Handheld ones ones are heavy and people always forget to speak in it. If you wanna invest some bucks, digital recorders are the best option. If needed, I can donate those missing bucks.

4 4

[PATCH] ntdll: Throw exception if invalid handle is passed to NtClose and debugger enabled.
by Alistair Leslie-Hughes 31 Mar '18

31 Mar '18

From: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/ntdll/om.c | 26 ++++++++++++++++ dlls/ntdll/tests/exception.c | 71 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 96 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/om.c b/dlls/ntdll/om.c index febe5bd81d..0b56251348 100644 --- a/dlls/ntdll/om.c +++ b/dlls/ntdll/om.c @@ -38,6 +38,7 @@ #include "winternl.h" #include "ntdll_misc.h" #include "wine/server.h" +#include "wine/exception.h" WINE_DEFAULT_DEBUG_CHANNEL(ntdll); @@ -377,6 +378,12 @@ NTSTATUS WINAPI NtDuplicateObject( HANDLE source_process, HANDLE source, return ret; } +static LONG WINAPI invalid_handle_exception_handler( EXCEPTION_POINTERS *eptr ) +{ + EXCEPTION_RECORD *rec = eptr->ExceptionRecord; + return (rec->ExceptionCode == EXCEPTION_INVALID_HANDLE) ? EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH; +} + /* Everquest 2 / Pirates of the Burning Sea hooks NtClose, so we need a wrapper */ NTSTATUS close_handle( HANDLE handle ) { @@ -390,6 +397,25 @@ NTSTATUS close_handle( HANDLE handle ) } SERVER_END_REQ; if (fd != -1) close( fd ); + + if (ret == STATUS_INVALID_HANDLE && handle && NtCurrentTeb()->Peb->BeingDebugged) + { + __TRY + { + EXCEPTION_RECORD record; + record.ExceptionCode = EXCEPTION_INVALID_HANDLE; + record.ExceptionFlags = 0; + record.ExceptionRecord = NULL; + record.ExceptionAddress = NULL; + record.NumberParameters = 0; + RtlRaiseException( &record ); + } + __EXCEPT(invalid_handle_exception_handler) + { + } + __ENDTRY + } + return ret; } diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index b3592e6e1e..64a23110a5 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -52,6 +52,7 @@ static NTSTATUS (WINAPI *pNtTerminateProcess)(HANDLE handle, LONG exit_code); static NTSTATUS (WINAPI *pNtQueryInformationProcess)(HANDLE, PROCESSINFOCLASS, PVOID, ULONG, PULONG); static NTSTATUS (WINAPI *pNtSetInformationProcess)(HANDLE, PROCESSINFOCLASS, PVOID, ULONG); static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); +static NTSTATUS (WINAPI *pNtClose)(HANDLE); #if defined(__x86_64__) typedef struct @@ -1091,6 +1092,16 @@ static void test_debugger(void) if (stage == 10) continuestatus = DBG_EXCEPTION_NOT_HANDLED; } + else if (stage == 11 || stage == 12 || stage == 13) + { + ok(de.u.Exception.ExceptionRecord.ExceptionCode == EXCEPTION_INVALID_HANDLE, + "unexpected exception code %08x, expected %08x\n", de.u.Exception.ExceptionRecord.ExceptionCode, + EXCEPTION_INVALID_HANDLE); + ok(de.u.Exception.ExceptionRecord.NumberParameters == 0, + "unexpected number of parameters %d, expected 0\n", de.u.Exception.ExceptionRecord.NumberParameters); + + if (stage == 12|| stage == 13) continuestatus = DBG_EXCEPTION_NOT_HANDLED; + } else ok(FALSE, "unexpected stage %x\n", stage); @@ -2895,6 +2906,54 @@ static void test_breakpoint(DWORD numexc) pRtlRemoveVectoredExceptionHandler(vectored_handler); } +static DWORD invalid_handle_exceptions; + +static LONG CALLBACK invalid_handle_vectored_handler(EXCEPTION_POINTERS *ExceptionInfo) +{ + PEXCEPTION_RECORD rec = ExceptionInfo->ExceptionRecord; + trace("vect. handler %08x addr:%p\n", rec->ExceptionCode, rec->ExceptionAddress); + + ok(rec->ExceptionCode == EXCEPTION_INVALID_HANDLE, "ExceptionCode is %08x instead of %08x\n", + rec->ExceptionCode, EXCEPTION_INVALID_HANDLE); + ok(rec->NumberParameters == 0, "ExceptionParameters is %d instead of 0\n", rec->NumberParameters); + + invalid_handle_exceptions++; + return (rec->ExceptionCode == EXCEPTION_INVALID_HANDLE) ? EXCEPTION_CONTINUE_EXECUTION : EXCEPTION_CONTINUE_SEARCH; +} + +static void test_closehandle(DWORD numexc, HANDLE handle) +{ + PVOID vectored_handler; + NTSTATUS status; + DWORD res; + + if (!pRtlAddVectoredExceptionHandler || !pRtlRemoveVectoredExceptionHandler || !pRtlRaiseException) + { + skip("RtlAddVectoredExceptionHandler or RtlRemoveVectoredExceptionHandler or RtlRaiseException not found\n"); + return; + } + + vectored_handler = pRtlAddVectoredExceptionHandler(TRUE, &invalid_handle_vectored_handler); + ok(vectored_handler != 0, "RtlAddVectoredExceptionHandler failed\n"); + + invalid_handle_exceptions = 0; + res = CloseHandle(handle); + + ok(!res || (is_wow64 && res), "CloseHandle(%p) unexpectedly succeeded\n", handle); + ok(GetLastError() == ERROR_INVALID_HANDLE, "wrong error code %d instead of %d\n", + GetLastError(), ERROR_INVALID_HANDLE); + ok(invalid_handle_exceptions == numexc, "CloseHandle generated %d exceptions, expected %d\n", + invalid_handle_exceptions, numexc); + + invalid_handle_exceptions = 0; + status = pNtClose(handle); + ok(status == STATUS_INVALID_HANDLE || (is_wow64 && status == 0), "NtClose(%p) returned status %08x\n", handle, status); + ok(invalid_handle_exceptions == numexc, "NtClose generated %d exceptions, expected %d\n", + invalid_handle_exceptions, numexc); + + pRtlRemoveVectoredExceptionHandler(vectored_handler); +} + static void test_vectored_continue_handler(void) { PVOID handler1, handler2; @@ -2949,6 +3008,7 @@ START_TEST(exception) pNtGetContextThread = (void *)GetProcAddress( hntdll, "NtGetContextThread" ); pNtSetContextThread = (void *)GetProcAddress( hntdll, "NtSetContextThread" ); pNtReadVirtualMemory = (void *)GetProcAddress( hntdll, "NtReadVirtualMemory" ); + pNtClose = (void *)GetProcAddress( hntdll, "NtClose" ); pRtlUnwind = (void *)GetProcAddress( hntdll, "RtlUnwind" ); pRtlRaiseException = (void *)GetProcAddress( hntdll, "RtlRaiseException" ); pRtlCaptureContext = (void *)GetProcAddress( hntdll, "RtlCaptureContext" ); @@ -2997,6 +3057,7 @@ START_TEST(exception) if (pRtlRaiseException) { test_stage = 1; + run_rtlraiseexception_test(0x12345); run_rtlraiseexception_test(EXCEPTION_BREAKPOINT); run_rtlraiseexception_test(EXCEPTION_INVALID_HANDLE); @@ -3004,6 +3065,7 @@ START_TEST(exception) run_rtlraiseexception_test(0x12345); run_rtlraiseexception_test(EXCEPTION_BREAKPOINT); run_rtlraiseexception_test(EXCEPTION_INVALID_HANDLE); + test_stage = 3; test_outputdebugstring(0, FALSE); test_stage = 4; @@ -3020,6 +3082,12 @@ START_TEST(exception) test_breakpoint(0); test_stage = 10; test_breakpoint(1); + test_stage = 11; + test_closehandle(0, (HANDLE)0xdeadbeef); + test_stage = 12; + test_closehandle(1, (HANDLE)0xdeadbeef); + test_stage = 13; + test_closehandle(0, 0); /* Special case. */ } else skip( "RtlRaiseException not found\n" ); @@ -3036,6 +3104,7 @@ START_TEST(exception) test_ripevent(1); test_debug_service(1); test_breakpoint(1); + test_closehandle(0, (HANDLE)0xdeadbeef); test_vectored_continue_handler(); test_debugger(); test_simd_exceptions(); @@ -3043,7 +3112,6 @@ START_TEST(exception) test_dpe_exceptions(); test_prot_fault(); test_thread_context(); - #elif defined(__x86_64__) pRtlAddFunctionTable = (void *)GetProcAddress( hntdll, "RtlAddFunctionTable" ); @@ -3069,6 +3137,7 @@ START_TEST(exception) test_ripevent(1); test_debug_service(1); test_breakpoint(1); + test_closehandle(0, (HANDLE)0xdeadbeef); test_vectored_continue_handler(); test_virtual_unwind(); test___C_specific_handler(); -- 2.16.2

1 0

[PATCH 2/2] kernel32: improve stub for SetThreadUILanguage a bit
by Louis Lenders 31 Mar '18

31 Mar '18

For https://bugs.winehq.org/show_bug.cgi?id=44469

1 0

[PATCH 1/2] Add simple test for SetThreadUILanguage
by Louis Lenders 31 Mar '18

31 Mar '18

1 0

[PATCH] shell32: Fix destination buffer size (Coverity)
by Nikolay Sivov 31 Mar '18

31 Mar '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/shell32/shell32_main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index 525eba4544..e78e8f8c56 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -1082,8 +1082,7 @@ static INT_PTR CALLBACK AboutDlgProc( HWND hWnd, UINT msg, WPARAM wParam, SetWindowTextW( GetDlgItem(hWnd, IDC_ABOUT_STATIC_TEXT2), info->szOtherStuff ); GetWindowTextW( GetDlgItem(hWnd, IDC_ABOUT_STATIC_TEXT3), template, ARRAY_SIZE(template) ); - MultiByteToWideChar( CP_UTF8, 0, wine_get_build_id(), -1, - version, ARRAY_SIZE(template) ); + MultiByteToWideChar( CP_UTF8, 0, wine_get_build_id(), -1, version, ARRAY_SIZE(version) ); sprintfW( buffer, template, version ); SetWindowTextW( GetDlgItem(hWnd, IDC_ABOUT_STATIC_TEXT3), buffer ); hWndCtl = GetDlgItem(hWnd, IDC_ABOUT_LISTBOX); -- 2.16.2

1 0