October 2010 - Wine-Commits

Aric Stewart : strmbase: Add the EnumMediaTypes base implementation.
by Alexandre Julliard Oct. 6, 2010

Oct. 6, 2010

Module: wine Branch: master Commit: 89ea07f7d0c344afe5f32afbe49bde6cea31b91c URL: http://source.winehq.org/git/wine.git/?a=commit;h=89ea07f7d0c344afe5f32afbe… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Oct 5 14:37:30 2010 -0500 strmbase: Add the EnumMediaTypes base implementation. --- dlls/qcap/enummedia.c | 181 ---------------------------------- dlls/qcap/pin.h | 1 - dlls/qcap/qcap_main.h | 7 -- dlls/qcap/vfwcapture.c | 29 +++++- dlls/quartz/enummedia.c | 169 ------------------------------- dlls/quartz/filesource.c | 19 +++-- dlls/quartz/parser.c | 18 +++- dlls/quartz/pin.c | 18 +++- dlls/quartz/pin.h | 1 - dlls/quartz/quartz_private.h | 11 +-- dlls/quartz/transform.c | 19 +++- dlls/strmbase/mediatype.c | 224 ++++++++++++++++++++++++++++++++++++++++++ include/wine/strmbase.h | 5 + 13 files changed, 309 insertions(+), 393 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=89ea07f7d0c344afe5f32…

1 0

Aric Stewart : strmbase: Move OutputPin implementation to strmbase.
by Alexandre Julliard Oct. 6, 2010

Oct. 6, 2010

Module: wine Branch: master Commit: 5c1409b55fed15a44accaceb223eaebc1f3c88d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c1409b55fed15a44accaceb2… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Oct 5 14:37:56 2010 -0500 strmbase: Move OutputPin implementation to strmbase. --- dlls/qcap/Makefile.in | 1 - dlls/qcap/enummedia.c | 15 -- dlls/qcap/pin.c | 314 -------------------------- dlls/qcap/pin.h | 58 ----- dlls/qcap/qcap_main.h | 1 - dlls/qcap/v4l.c | 9 +- dlls/qcap/vfwcapture.c | 24 +-- dlls/quartz/acmwrapper.c | 6 +- dlls/quartz/avidec.c | 6 +- dlls/quartz/avisplit.c | 2 +- dlls/quartz/enummedia.c | 10 - dlls/quartz/filesource.c | 23 +- dlls/quartz/mpegsplit.c | 2 +- dlls/quartz/parser.c | 22 +- dlls/quartz/parser.h | 2 +- dlls/quartz/pin.c | 526 ------------------------------------------- dlls/quartz/pin.h | 31 --- dlls/quartz/transform.c | 22 +- dlls/quartz/waveparser.c | 2 +- dlls/strmbase/pin.c | 553 ++++++++++++++++++++++++++++++++++++++++++++++ include/wine/strmbase.h | 32 +++ 21 files changed, 641 insertions(+), 1020 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5c1409b55fed15a44acca…

1 0

Aric Stewart : strmbase: Move BasePin implementation to strmbase.
by Alexandre Julliard Oct. 6, 2010

Oct. 6, 2010

Module: wine Branch: master Commit: 0410e50e009e0b10da1bb01fa5e04c357addd69c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0410e50e009e0b10da1bb01fa… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Oct 5 14:37:42 2010 -0500 strmbase: Move BasePin implementation to strmbase. --- dlls/qcap/pin.c | 102 +--------------- dlls/qcap/pin.h | 24 +---- dlls/qcap/vfwcapture.c | 22 ++-- dlls/quartz/dsoundrender.c | 24 ++-- dlls/quartz/filesource.c | 31 +++--- dlls/quartz/nullrenderer.c | 20 ++-- dlls/quartz/parser.c | 44 +++---- dlls/quartz/pin.c | 276 ++++++++++-------------------------------- dlls/quartz/pin.h | 38 ++----- dlls/quartz/quartz_private.h | 4 - dlls/quartz/transform.c | 51 ++++---- dlls/quartz/videorenderer.c | 20 ++-- dlls/strmbase/Makefile.in | 3 +- dlls/strmbase/pin.c | 207 +++++++++++++++++++++++++++++++ include/wine/strmbase.h | 26 ++++ 15 files changed, 415 insertions(+), 477 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0410e50e009e0b10da1bb…

1 0

Hans Leidekker : advapi32: Fix a buffer size query in LsaLookupSids.
by Alexandre Julliard Oct. 6, 2010

Oct. 6, 2010

Module: wine Branch: master Commit: ee18ead5457761c2a330d0005bb5bf1b8711ca80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee18ead5457761c2a330d0005… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 6 15:45:30 2010 +0200 advapi32: Fix a buffer size query in LsaLookupSids. --- dlls/advapi32/lsa.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c index e12e312..863ddb2 100644 --- a/dlls/advapi32/lsa.c +++ b/dlls/advapi32/lsa.c @@ -483,7 +483,9 @@ NTSTATUS WINAPI LsaLookupSids( (*Names)[i].Name.Length = 0; (*Names)[i].Name.MaximumLength = 0; (*Names)[i].Name.Buffer = NULL; - if (LookupAccountSidW(NULL, Sids[i], NULL, &name_size, NULL, &domain_size, &use)) + + if (!LookupAccountSidW(NULL, Sids[i], NULL, &name_size, NULL, &domain_size, &use) && + GetLastError() == ERROR_INSUFFICIENT_BUFFER) { LSA_UNICODE_STRING domain; @@ -502,11 +504,11 @@ NTSTATUS WINAPI LsaLookupSids( domain.Buffer = NULL; } - (*Names)[i].Use = use; (*Names)[i].Name.Length = (name_size - 1) * sizeof(WCHAR); (*Names)[i].Name.MaximumLength = name_size * sizeof(WCHAR); - (*Names)[i].Name.Buffer = HeapAlloc(GetProcessHeap(),0,name_size * sizeof(WCHAR)); + (*Names)[i].Name.Buffer = HeapAlloc(GetProcessHeap(), 0, name_size * sizeof(WCHAR)); LookupAccountSidW(NULL, Sids[i], (*Names)[i].Name.Buffer, &name_size, domain.Buffer, &domain_size, &use); + (*Names)[i].Use = use; if (domain_size) (*Names)[i].DomainIndex = build_domain(*ReferencedDomains, &domain);

1 0

Aric Stewart : strmbase: Move enumpins from quartz to strmbase.
by Alexandre Julliard Oct. 6, 2010

Oct. 6, 2010

Module: wine Branch: master Commit: bb110c7749708be6f9ef8c2d95728c6035a214cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb110c7749708be6f9ef8c2d9… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Oct 6 09:48:07 2010 -0500 strmbase: Move enumpins from quartz to strmbase. --- dlls/qcap/Makefile.in | 1 - dlls/qcap/enumpins.c | 186 ---------------------------------- dlls/qcap/qcap_main.h | 8 -- dlls/qcap/vfwcapture.c | 28 ++++- dlls/quartz/Makefile.in | 1 - dlls/quartz/dsoundrender.c | 26 +++-- dlls/quartz/filesource.c | 32 ++++-- dlls/quartz/nullrenderer.c | 25 +++-- dlls/quartz/parser.c | 29 ++++-- dlls/quartz/quartz_private.h | 3 - dlls/quartz/transform.c | 27 ++++-- dlls/quartz/videorenderer.c | 25 +++-- dlls/strmbase/Makefile.in | 1 + dlls/{quartz => strmbase}/enumpins.c | 66 ++++++------ include/wine/strmbase.h | 6 + 15 files changed, 172 insertions(+), 292 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bb110c7749708be6f9ef8…

1 0

Hans Leidekker : msi/tests: Fix some test failures on 64-bit.
by Alexandre Julliard Oct. 6, 2010

Oct. 6, 2010

Module: wine Branch: master Commit: 9e166a969013440e586087dfa4d28eb9a1166690 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e166a969013440e586087dfa… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 6 15:45:16 2010 +0200 msi/tests: Fix some test failures on 64-bit. --- dlls/msi/tests/install.c | 36 ++++++++++++++++++++++++++++++------ 1 files changed, 30 insertions(+), 6 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index b69a21a..71dd168 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -10160,8 +10160,16 @@ static void test_remove_registry_values(void) ok(res == ERROR_SUCCESS, "key removed\n"); RegCloseKey(key); - res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine\\key2", 0, access, &key); - ok(res == ERROR_FILE_NOT_FOUND, "key not removed\n"); + if (is_64bit && !wow64) + { + res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wow6432Node\\Wine\\key2", 0, KEY_ALL_ACCESS, &key); + ok(res == ERROR_FILE_NOT_FOUND, "key not removed\n"); + } + else + { + res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine\\key2", 0, KEY_ALL_ACCESS, &key); + ok(res == ERROR_FILE_NOT_FOUND, "key not removed\n"); + } res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine\\key2", 0, NULL, 0, access, NULL, &key, NULL); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); @@ -10170,8 +10178,16 @@ static void test_remove_registry_values(void) r = MsiInstallProductA(msifile, "REMOVE=ALL"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine\\key1", 0, access, &key); - ok(res == ERROR_FILE_NOT_FOUND, "key not removed\n"); + if (is_64bit && !wow64) + { + res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wow6432Node\\Wine\\key1", 0, KEY_ALL_ACCESS, &key); + ok(res == ERROR_FILE_NOT_FOUND, "key not removed\n"); + } + else + { + res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine\\key1", 0, KEY_ALL_ACCESS, &key); + ok(res == ERROR_FILE_NOT_FOUND, "key not removed\n"); + } res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine\\key2", 0, access, &key); ok(res == ERROR_SUCCESS, "key removed\n"); @@ -10181,8 +10197,16 @@ static void test_remove_registry_values(void) ok(res == ERROR_SUCCESS, "key removed\n"); RegCloseKey(key); - res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine\\keyB", 0, access, &key); - ok(res == ERROR_FILE_NOT_FOUND, "key not removed\n"); + if (is_64bit && !wow64) + { + res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wow6432Node\\Wine\\keyB", 0, KEY_ALL_ACCESS, &key); + ok(res == ERROR_FILE_NOT_FOUND, "key not removed\n"); + } + else + { + res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine\\keyB", 0, KEY_ALL_ACCESS, &key); + ok(res == ERROR_FILE_NOT_FOUND, "key not removed\n"); + } delete_key(HKEY_LOCAL_MACHINE, "Software\\Wine\\keyA", access); delete_key(HKEY_LOCAL_MACHINE, "Software\\Wine\\key2", access);

1 0

Hans Leidekker : msi: Add package validation tests.
by Alexandre Julliard Oct. 6, 2010

Oct. 6, 2010

Module: wine Branch: master Commit: a9c3195eb8a25b8b3fcb7736af17c10aed44a646 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9c3195eb8a25b8b3fcb7736a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 6 15:44:34 2010 +0200 msi: Add package validation tests. --- dlls/msi/tests/install.c | 196 ++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 189 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a9c3195eb8a25b8b3fcb7…

1 0

Hans Leidekker : msi Set the feature action to INSTALLSTATE_UNKNOWN if msidbFeatureAttributesUIDisallowAbsent is set .
by Alexandre Julliard Oct. 6, 2010

Oct. 6, 2010

Module: wine Branch: master Commit: 3cd55cc916ad8d74710f435845d8f970161f77fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cd55cc916ad8d74710f43584… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 6 15:45:05 2010 +0200 msi Set the feature action to INSTALLSTATE_UNKNOWN if msidbFeatureAttributesUIDisallowAbsent is set. --- dlls/msi/msipriv.h | 5 + dlls/msi/tests/package.c | 286 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 291 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3cd55cc916ad8d74710f4…

1 0

Hans Leidekker : msi: Look at the requested action instead of the action taken in MSI_SetFeatureStates .
by Alexandre Julliard Oct. 6, 2010

Oct. 6, 2010

Module: wine Branch: master Commit: 85874c07b90986551a46f8c674e77887084e4924 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85874c07b90986551a46f8c67… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 6 15:44:54 2010 +0200 msi: Look at the requested action instead of the action taken in MSI_SetFeatureStates. --- dlls/msi/action.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index b17c074..4cebbea 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1785,7 +1785,7 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *package) BOOL feature_state = ((feature->Level > 0) && (feature->Level <= level)); - if ((feature_state) && (feature->Action == INSTALLSTATE_UNKNOWN)) + if (feature_state && feature->ActionRequest == INSTALLSTATE_UNKNOWN) { if (feature->Attributes & msidbFeatureAttributesFavorSource) msi_feature_set_state(package, feature, INSTALLSTATE_SOURCE); @@ -1814,7 +1814,7 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *package) { BOOL selected = feature->Level > 0 && feature->Level <= level; - if (selected && feature->Action == INSTALLSTATE_UNKNOWN) + if (selected && feature->ActionRequest == INSTALLSTATE_UNKNOWN) { msi_feature_set_state(package, feature, feature->Installed); } @@ -1839,7 +1839,7 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *package) LIST_FOR_EACH_ENTRY( cl, &feature->Components, ComponentList, entry ) { if (cl->component->ForceLocalState && - feature->Action == INSTALLSTATE_SOURCE) + feature->ActionRequest == INSTALLSTATE_SOURCE) { msi_feature_set_state(package, feature, INSTALLSTATE_LOCAL); break; @@ -1850,7 +1850,7 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *package) { component = cl->component; - switch (feature->Action) + switch (feature->ActionRequest) { case INSTALLSTATE_ABSENT: component->anyAbsent = 1;

1 0

Hans Leidekker : msi: Validate packages based on supported version, platform and languages.
by Alexandre Julliard Oct. 6, 2010

Oct. 6, 2010

Module: wine Branch: master Commit: ca7cd1bf89d057d9c48896b70c441fad941e6ee0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca7cd1bf89d057d9c48896b70… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 6 15:44:08 2010 +0200 msi: Validate packages based on supported version, platform and languages. --- dlls/msi/msipriv.h | 2 ++ dlls/msi/package.c | 37 ++++++++++++++++++++++++++++++++++++- dlls/msi/suminfo.c | 12 ++++++++++++ 3 files changed, 50 insertions(+), 1 deletions(-) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 9149aa6..bff9990 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -315,6 +315,7 @@ typedef struct tagMSIPACKAGE { MSIOBJECTHDR hdr; MSIDATABASE *db; + INT version; enum platform platform; UINT num_langids; LANGID *langids; @@ -855,6 +856,7 @@ extern UINT msi_spawn_error_dialog( MSIPACKAGE*, LPWSTR, LPWSTR ); /* summary information */ extern MSISUMMARYINFO *MSI_GetSummaryInformationW( IStorage *stg, UINT uiUpdateCount ); extern LPWSTR msi_suminfo_dup_string( MSISUMMARYINFO *si, UINT uiProperty ); +extern INT msi_suminfo_get_int32( MSISUMMARYINFO *si, UINT uiProperty ); extern LPWSTR msi_get_suminfo_product( IStorage *stg ); extern UINT msi_add_suminfo( MSIDATABASE *db, LPWSTR **records, int num_records, int num_columns ); diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 2b44e64..cd1cdf8 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1292,6 +1292,9 @@ static UINT msi_parse_summary( MSISUMMARYINFO *si, MSIPACKAGE *package ) WCHAR *template, *p, *q; DWORD i, count; + package->version = msi_suminfo_get_int32( si, PID_PAGECOUNT ); + TRACE("version: %d\n", package->version); + template = msi_suminfo_dup_string( si, PID_TEMPLATE ); if (!template) return ERROR_SUCCESS; /* native accepts missing template property */ @@ -1316,7 +1319,7 @@ static UINT msi_parse_summary( MSISUMMARYINFO *si, MSIPACKAGE *package ) { WARN("unknown platform %s\n", debugstr_w(template)); msi_free( template ); - return ERROR_PATCH_PACKAGE_INVALID; + return ERROR_INSTALL_PLATFORM_UNSUPPORTED; } count = 1; @@ -1345,6 +1348,32 @@ static UINT msi_parse_summary( MSISUMMARYINFO *si, MSIPACKAGE *package ) return ERROR_SUCCESS; } +static UINT validate_package( MSIPACKAGE *package ) +{ + static const BOOL is_64bit = sizeof(void *) > sizeof(int); + BOOL is_wow64; + UINT i; + + IsWow64Process( GetCurrentProcess(), &is_wow64 ); + if (package->platform == PLATFORM_X64) + { + if (!is_64bit && !is_wow64) + return ERROR_INSTALL_PLATFORM_UNSUPPORTED; + if (package->version < 200) + return ERROR_INSTALL_PACKAGE_INVALID; + } + if (!package->num_langids) + { + return ERROR_SUCCESS; + } + for (i = 0; i < package->num_langids; i++) + { + if (!package->langids[i] || IsValidLocale( package->langids[i], LCID_INSTALLED )) + return ERROR_SUCCESS; + } + return ERROR_INSTALL_LANGUAGE_UNSUPPORTED; +} + UINT MSI_OpenPackageW(LPCWSTR szPackage, MSIPACKAGE **pPackage) { static const WCHAR Database[] = {'D','A','T','A','B','A','S','E',0}; @@ -1474,6 +1503,12 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, MSIPACKAGE **pPackage) return r; } + r = validate_package( package ); + if (r != ERROR_SUCCESS) + { + msiobj_release( &package->hdr ); + return r; + } msi_set_property( package->db, Database, db->path ); if( UrlIsW( szPackage, URLIS_URL ) ) diff --git a/dlls/msi/suminfo.c b/dlls/msi/suminfo.c index b174e5b..2a9cd71 100644 --- a/dlls/msi/suminfo.c +++ b/dlls/msi/suminfo.c @@ -644,6 +644,18 @@ LPWSTR msi_suminfo_dup_string( MSISUMMARYINFO *si, UINT uiProperty ) return strdupAtoW( prop->u.pszVal ); } +INT msi_suminfo_get_int32( MSISUMMARYINFO *si, UINT uiProperty ) +{ + PROPVARIANT *prop; + + if ( uiProperty >= MSI_MAX_PROPS ) + return -1; + prop = &si->property[uiProperty]; + if( prop->vt != VT_I4 ) + return -1; + return prop->u.lVal; +} + LPWSTR msi_get_suminfo_product( IStorage *stg ) { MSISUMMARYINFO *si;

1 0