October 2010 - Wine-commits

Aric Stewart : strmbase: Add the EnumMediaTypes base implementation.
by Alexandre Julliard 06 Oct '10

06 Oct '10

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 enumpins from quartz to strmbase.
by Alexandre Julliard 06 Oct '10

06 Oct '10

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

Aric Stewart : strmbase: Move BasePin implementation to strmbase.
by Alexandre Julliard 06 Oct '10

06 Oct '10

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

Aric Stewart : strmbase: Move OutputPin implementation to strmbase.
by Alexandre Julliard 06 Oct '10

06 Oct '10

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 InputPin implementation to strmbase.
by Alexandre Julliard 06 Oct '10

06 Oct '10

Module: wine Branch: master Commit: 66e1ad8a96c1b17ce7c981e2490bd3721de8ff16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66e1ad8a96c1b17ce7c981e24… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Oct 5 14:38:11 2010 -0500 strmbase: Move InputPin implementation to strmbase. --- dlls/quartz/acmwrapper.c | 7 +- dlls/quartz/avidec.c | 7 +- dlls/quartz/dsoundrender.c | 37 ++-- dlls/quartz/nullrenderer.c | 33 ++-- dlls/quartz/parser.c | 2 +- dlls/quartz/pin.c | 392 +-------------------------------- dlls/quartz/pin.h | 31 --- dlls/quartz/transform.c | 36 ++-- dlls/quartz/transform.h | 14 +- dlls/quartz/videorenderer.c | 37 ++-- dlls/strmbase/pin.c | 518 +++++++++++++++++++++++++++++++++++++++++++ include/wine/strmbase.h | 32 +++ 12 files changed, 640 insertions(+), 506 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=66e1ad8a96c1b17ce7c98…

1 0

Hans Leidekker : msi: Add package validation tests.
by Alexandre Julliard 06 Oct '10

06 Oct '10

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: Look at the requested action instead of the action taken in MSI_SetFeatureStates .
by Alexandre Julliard 06 Oct '10

06 Oct '10

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 Set the feature action to INSTALLSTATE_UNKNOWN if msidbFeatureAttributesUIDisallowAbsent is set .
by Alexandre Julliard 06 Oct '10

06 Oct '10

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/tests: Fix some test failures on 64-bit.
by Alexandre Julliard 06 Oct '10

06 Oct '10

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

Jacek Caban : urlmon: Report error on synchronous bindings that don' t have a cache file and are not read in callback.
by Alexandre Julliard 06 Oct '10

06 Oct '10

Module: wine Branch: master Commit: 87242c5fb6fcf3996d00d38f009b0bee5404527a URL: http://source.winehq.org/git/wine.git/?a=commit;h=87242c5fb6fcf3996d00d38f0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 6 14:10:25 2010 +0200 urlmon: Report error on synchronous bindings that don't have a cache file and are not read in callback. --- dlls/urlmon/binding.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index 02053b0..49e9ac1 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -76,6 +76,7 @@ typedef enum { #define BINDING_LOCKED 0x0001 #define BINDING_STOPPED 0x0002 #define BINDING_OBJAVAIL 0x0004 +#define BINDING_ABORTED 0x0008 struct Binding { const IBindingVtbl *lpBindingVtbl; @@ -682,6 +683,10 @@ static HRESULT stgmed_stream_get_result(stgmed_obj_t *obj, DWORD bindf, void **r { ProtocolStream *stream = (ProtocolStream*)obj; + if(!(bindf & BINDF_ASYNCHRONOUS) && stream->buf->file == INVALID_HANDLE_VALUE + && (stream->buf->hres != S_FALSE || stream->buf->size)) + return INET_E_DATA_NOT_AVAILABLE; + IStream_AddRef(STREAM(stream)); *result = STREAM(stream); return S_OK; @@ -1573,8 +1578,10 @@ HRESULT bind_to_storage(LPCWSTR url, IBindCtx *pbc, REFIID riid, void **ppv) IInternetProtocol_UnlockRequest(binding->protocol); hres = binding->stgmed_obj->vtbl->get_result(binding->stgmed_obj, binding->bindf, ppv); - }else { + }else if(binding->bindf & BINDF_ASYNCHRONOUS) { hres = MK_S_ASYNCHRONOUS; + }else { + hres = FAILED(binding->hres) ? binding->hres : S_OK; } IBinding_Release(BINDING(binding));

1 0