March 2019 - Wine-commits - list.winehq.org

Nikolay Sivov : mfplat: Fix EndCreateObject*() when events are used.
by Alexandre Julliard 29 Mar '19

29 Mar '19

Module: wine Branch: master Commit: 663af65eb9fb8576139641313015633331c33fbc URL: https://source.winehq.org/git/wine.git/?a=commit;h=663af65eb9fb857613964131… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 29 14:46:52 2019 +0300 mfplat: Fix EndCreateObject*() when events are used. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index c6cf471..4444e49 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -4259,6 +4259,7 @@ struct resolver_queued_result IUnknown *object; MF_OBJECT_TYPE obj_type; HRESULT hr; + IMFAsyncResult *inner_result; enum resolved_object_origin origin; }; @@ -4313,7 +4314,7 @@ static HRESULT resolver_handler_end_create(struct source_resolver *resolver, enu IMFSchemeHandler *scheme_handler; } handler; - queued_result = heap_alloc(sizeof(*queued_result)); + queued_result = heap_alloc_zero(sizeof(*queued_result)); IMFAsyncResult_GetObject(inner_result, &handler.handler); @@ -4337,6 +4338,12 @@ static HRESULT resolver_handler_end_create(struct source_resolver *resolver, enu { MFASYNCRESULT *data = (MFASYNCRESULT *)inner_result; + if (data->hEvent) + { + queued_result->inner_result = inner_result; + IMFAsyncResult_AddRef(queued_result->inner_result); + } + /* Push resolved object type and created object, so we don't have to guess on End*() call. */ EnterCriticalSection(&resolver->cs); list_add_tail(&resolver->pending, &queued_result->entry); @@ -4687,7 +4694,7 @@ static HRESULT resolver_end_create_object(struct source_resolver *resolver, enum LIST_FOR_EACH_ENTRY(iter, &resolver->pending, struct resolver_queued_result, entry) { - if (iter->object == object && iter->origin == origin) + if (iter->inner_result == result || (iter->object == object && iter->origin == origin)) { list_remove(&iter->entry); queued_result = iter; @@ -4704,6 +4711,8 @@ static HRESULT resolver_end_create_object(struct source_resolver *resolver, enum *out = queued_result->object; *obj_type = queued_result->obj_type; hr = queued_result->hr; + if (queued_result->inner_result) + IMFAsyncResult_Release(queued_result->inner_result); heap_free(queued_result); } else

1 0

Nikolay Sivov : mfplat: Use correct callback for CreateObjectFromURL().
by Alexandre Julliard 29 Mar '19

29 Mar '19

Module: wine Branch: master Commit: 9c146f285613854fbda4b0c2d9ac0d4dfde28e90 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c146f285613854fbda4b0c2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 29 14:46:53 2019 +0300 mfplat: Use correct callback for CreateObjectFromURL(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 4444e49..d800474 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -4802,7 +4802,7 @@ static HRESULT WINAPI source_resolver_CreateObjectFromURL(IMFSourceResolver *ifa data = (MFASYNCRESULT *)result; data->hEvent = CreateEventW(NULL, FALSE, FALSE, NULL); - hr = IMFSchemeHandler_BeginCreateObject(handler, url, flags, props, NULL, &resolver->stream_callback, + hr = IMFSchemeHandler_BeginCreateObject(handler, url, flags, props, NULL, &resolver->url_callback, (IUnknown *)result); if (FAILED(hr)) {

1 0

Nikolay Sivov : mfplat: Add traces for attributes methods of IMFMediaType.
by Alexandre Julliard 29 Mar '19

29 Mar '19

Module: wine Branch: master Commit: 6e34275f8483c8992f916e511c8331a765f0b383 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e34275f8483c8992f916e51… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 29 14:46:54 2019 +0300 mfplat: Add traces for attributes methods of IMFMediaType. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 2 +- dlls/mfplat/mediatype.c | 101 ++++++++++++++++++++++++++++++++++++++++--- dlls/mfplat/mfplat_private.h | 1 + 3 files changed, 98 insertions(+), 6 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6e34275f8483c8992f91…

1 0

Alexandre Julliard : crtdll: Share source with msvcrt.
by Alexandre Julliard 29 Mar '19

29 Mar '19

Module: wine Branch: master Commit: 1f7489d4931a0075d2354ac0a07cec730133139a URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f7489d4931a0075d2354ac0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 29 14:06:05 2019 +0100 crtdll: Share source with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crtdll/Makefile.in | 33 +- dlls/crtdll/crtdll.spec | 1036 ++++++++++++++++++++++----------------------- dlls/crtdll/crtdll_main.c | 199 --------- dlls/msvcrt/data.c | 23 + dlls/msvcrt/msvcrt.h | 4 + dlls/msvcrt/string.c | 44 ++ tools/make_specfiles | 1 - 7 files changed, 620 insertions(+), 720 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1f7489d4931a0075d235…

1 0

Nikolay Sivov : include: Add IMFMediaStream definition.
by Alexandre Julliard 29 Mar '19

29 Mar '19

Module: wine Branch: master Commit: d762d8636673ba2d199d21e8a28d277e7104cd79 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d762d8636673ba2d199d21e8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 29 14:46:51 2019 +0300 include: Add IMFMediaStream definition. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mfidl.idl | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/include/mfidl.idl b/include/mfidl.idl index 22a22a8..ac59e0c 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -525,6 +525,26 @@ interface IMFMediaSource : IMFMediaEventGenerator HRESULT Shutdown(); } +[ + object, + uuid(d182108f-4ec6-443f-aa42-a71106ec825f), +] +interface IMFMediaStream : IMFMediaEventGenerator +{ + HRESULT GetMediaSource( + [out] IMFMediaSource **source); + + HRESULT GetStreamDescriptor( + [out] IMFStreamDescriptor **descriptor); + + [local] + HRESULT RequestSample( + [in] IUnknown *token); + + [call_as(RequestSample)] + HRESULT RemoteRequestSample(); +} + interface IMFStreamSink; [

1 0

Alexandre Julliard : msvcrt: Only add the onexit functions to the import library of msvcrt itself.
by Alexandre Julliard 29 Mar '19

29 Mar '19

Module: wine Branch: master Commit: 4a5bff8368f60506e24fa9832abedd7c99d65932 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a5bff8368f60506e24fa983… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 29 11:37:27 2019 +0100 msvcrt: Only add the onexit functions to the import library of msvcrt itself. This partially reverts 0673ddf3a55eb524f8284be3b2fc9ab62a2acf52. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr100/Makefile.in | 1 - dlls/msvcr110/Makefile.in | 1 - dlls/msvcr120/Makefile.in | 1 - dlls/msvcr70/Makefile.in | 1 - dlls/msvcr71/Makefile.in | 1 - dlls/msvcr80/Makefile.in | 1 - dlls/msvcr90/Makefile.in | 1 - dlls/msvcrt/exit.c | 138 +++++++++++++++++++++++++++++++++++++++++--- dlls/ucrtbase/Makefile.in | 1 - dlls/ucrtbase/ucrtbase.spec | 12 ++-- 10 files changed, 135 insertions(+), 23 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4a5bff8368f60506e24f…

1 0

Alexandre Julliard : msvcrtd: Share source with msvcrt.
by Alexandre Julliard 29 Mar '19

29 Mar '19

Module: wine Branch: master Commit: 610d48ba77fb0b93ab5ce3bdaee39db612ac6d84 URL: https://source.winehq.org/git/wine.git/?a=commit;h=610d48ba77fb0b93ab5ce3bd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 29 13:01:47 2019 +0100 msvcrtd: Share source with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrtd/Makefile.in | 34 +- dlls/msvcrtd/debug.c | 14 +- dlls/msvcrtd/msvcrtd.spec | 1594 ++++++++++++++++++++++----------------------- tools/make_specfiles | 1 - 4 files changed, 830 insertions(+), 813 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=610d48ba77fb0b93ab5c…

1 0

Alexandre Julliard : msvcrt: Only add __acrt_iob_func() to the import library of msvcrt itself.
by Alexandre Julliard 29 Mar '19

29 Mar '19

Module: wine Branch: master Commit: 62fd803e5269d5935ed5bfabff58e9cc02c9ca08 URL: https://source.winehq.org/git/wine.git/?a=commit;h=62fd803e5269d5935ed5bfab… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 29 09:38:36 2019 +0100 msvcrt: Only add __acrt_iob_func() to the import library of msvcrt itself. This partially reverts ca50117418d6b8a6146dcecd5e78819b28da2e40. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr100/Makefile.in | 1 - dlls/msvcr110/Makefile.in | 1 - dlls/msvcr120/Makefile.in | 1 - dlls/msvcr70/Makefile.in | 1 - dlls/msvcr71/Makefile.in | 1 - dlls/msvcr80/Makefile.in | 1 - dlls/msvcr90/Makefile.in | 1 - dlls/msvcrt/file.c | 10 ++++++++++ dlls/ucrtbase/Makefile.in | 1 - dlls/ucrtbase/ucrtbase.spec | 4 ++-- 10 files changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/msvcr100/Makefile.in b/dlls/msvcr100/Makefile.in index e95c929..5018226 100644 --- a/dlls/msvcr100/Makefile.in +++ b/dlls/msvcr100/Makefile.in @@ -20,7 +20,6 @@ C_SRCS = \ exit.c \ file.c \ heap.c \ - iob.c \ locale.c \ lock.c \ main.c \ diff --git a/dlls/msvcr110/Makefile.in b/dlls/msvcr110/Makefile.in index 00928ca..d00d24e 100644 --- a/dlls/msvcr110/Makefile.in +++ b/dlls/msvcr110/Makefile.in @@ -20,7 +20,6 @@ C_SRCS = \ exit.c \ file.c \ heap.c \ - iob.c \ locale.c \ lock.c \ main.c \ diff --git a/dlls/msvcr120/Makefile.in b/dlls/msvcr120/Makefile.in index fa09d30..7f32a17 100644 --- a/dlls/msvcr120/Makefile.in +++ b/dlls/msvcr120/Makefile.in @@ -20,7 +20,6 @@ C_SRCS = \ exit.c \ file.c \ heap.c \ - iob.c \ locale.c \ lock.c \ main.c \ diff --git a/dlls/msvcr70/Makefile.in b/dlls/msvcr70/Makefile.in index c7d3edf..f44f437 100644 --- a/dlls/msvcr70/Makefile.in +++ b/dlls/msvcr70/Makefile.in @@ -20,7 +20,6 @@ C_SRCS = \ exit.c \ file.c \ heap.c \ - iob.c \ locale.c \ lock.c \ main.c \ diff --git a/dlls/msvcr71/Makefile.in b/dlls/msvcr71/Makefile.in index d7606cc..e2a8679 100644 --- a/dlls/msvcr71/Makefile.in +++ b/dlls/msvcr71/Makefile.in @@ -20,7 +20,6 @@ C_SRCS = \ exit.c \ file.c \ heap.c \ - iob.c \ locale.c \ lock.c \ main.c \ diff --git a/dlls/msvcr80/Makefile.in b/dlls/msvcr80/Makefile.in index 90c43f7..e935509 100644 --- a/dlls/msvcr80/Makefile.in +++ b/dlls/msvcr80/Makefile.in @@ -20,7 +20,6 @@ C_SRCS = \ exit.c \ file.c \ heap.c \ - iob.c \ locale.c \ lock.c \ main.c \ diff --git a/dlls/msvcr90/Makefile.in b/dlls/msvcr90/Makefile.in index 5d644a3..550878f 100644 --- a/dlls/msvcr90/Makefile.in +++ b/dlls/msvcr90/Makefile.in @@ -20,7 +20,6 @@ C_SRCS = \ exit.c \ file.c \ heap.c \ - iob.c \ locale.c \ lock.c \ main.c \ diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 0983d6e..851a89c 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -786,6 +786,16 @@ MSVCRT_FILE * CDECL __p__iob(void) return &MSVCRT__iob[0]; } +#if _MSVCR_VER >= 140 +/********************************************************************* + * __acrt_iob_func(UCRTBASE.@) + */ +MSVCRT_FILE * CDECL MSVCRT___acrt_iob_func(unsigned idx) +{ + return &MSVCRT__iob[idx]; +} +#endif + /********************************************************************* * _access (MSVCRT.@) */ diff --git a/dlls/ucrtbase/Makefile.in b/dlls/ucrtbase/Makefile.in index e023305..c7cc63d 100644 --- a/dlls/ucrtbase/Makefile.in +++ b/dlls/ucrtbase/Makefile.in @@ -20,7 +20,6 @@ C_SRCS = \ exit.c \ file.c \ heap.c \ - iob.c \ locale.c \ lock.c \ main.c \ diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 2fde50e..6dab5e7 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -72,7 +72,7 @@ @ cdecl ___lc_locale_name_func() @ cdecl ___mb_cur_max_func() MSVCRT____mb_cur_max_func @ cdecl ___mb_cur_max_l_func(ptr) -@ cdecl __acrt_iob_func(long) +@ cdecl __acrt_iob_func(long) MSVCRT___acrt_iob_func @ cdecl __conio_common_vcprintf(int64 str ptr ptr) MSVCRT__conio_common_vcprintf @ stub __conio_common_vcprintf_p @ stub __conio_common_vcprintf_s @@ -758,7 +758,7 @@ @ stub _o____lc_collate_cp_func @ stub _o____lc_locale_name_func @ stub _o____mb_cur_max_func -@ cdecl _o___acrt_iob_func(long) __acrt_iob_func +@ cdecl _o___acrt_iob_func(long) MSVCRT___acrt_iob_func @ stub _o___conio_common_vcprintf @ stub _o___conio_common_vcprintf_p @ stub _o___conio_common_vcprintf_s

1 0

Francois Gouget : testbot/WineRunReconfig: Fix error handling.
by Alexandre Julliard 29 Mar '19

29 Mar '19

Module: tools Branch: master Commit: 238f558da64b33df67b46fa9feea147c0b934b35 URL: https://source.winehq.org/git/tools.git/?a=commit;h=238f558da64b33df67b46fa… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Mar 29 15:18:17 2019 +0100 testbot/WineRunReconfig: Fix error handling. It only makes sense to defer errors until we have retrieved the reconfiguration log, at which point we either clear errors if it indicates success, or handle any previous error. Retrieving any binaries and data files should come after that. This avoids using an undefined $NewStatus when connection errors occur. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunReconfig.pl | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index fd9a56d..378bd94 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -413,6 +413,16 @@ elsif (!defined $TAError) $TAError = "An error occurred while retrieving the reconfig log: ". $TA->GetLastError(); } +# Report the reconfig errors even though they may have been caused by +# TestAgent trouble. +LogTaskError($ErrMessage) if (defined $ErrMessage); +FatalTAError(undef, $TAError) if (defined $TAError); + + +# +# Grab the test executables and reference files +# + if ($NewStatus eq "completed") { use File::Copy; @@ -427,7 +437,7 @@ if ($NewStatus eq "completed") } elsif (!defined $TAError) { - $TAError = "An error occurred while retrieving the $Bitness bit TestLauncher: ". $TA->GetLastError(); + FatalTAError($TA, "An error occurred while retrieving the $Bitness bit TestLauncher"); } } } @@ -441,18 +451,13 @@ if ($NewStatus eq "completed") } elsif (!defined $TAError) { - $TAError = "An error occurred while retrieving '$TaskDir/$FileName': ". $TA->GetLastError(); + FatalTAError($TA, "An error occurred while retrieving '$TaskDir/$FileName'"); } } } $TA->Disconnect(); -# Report the reconfig errors even though they may have been caused by -# TestAgent trouble. -LogTaskError($ErrMessage) if (defined $ErrMessage); -FatalTAError(undef, $TAError) if (defined $TAError); - # # Update the build VM's snapshot

1 0

Francois Gouget : testbot/TestAgent: Fix the non-tunneling case.
by Alexandre Julliard 29 Mar '19

29 Mar '19

Module: tools Branch: master Commit: 23d7731954e5780507b5e25e99b514fb6d04faf5 URL: https://source.winehq.org/git/tools.git/?a=commit;h=23d7731954e5780507b5e25… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Mar 29 15:18:29 2019 +0100 testbot/TestAgent: Fix the non-tunneling case. The TestAgent server address is now stored in agenthost:agentport. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/TestAgent.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index ca8a81b..a0a5efe 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -900,8 +900,8 @@ sub _Connect($) else { $Step = "create_socket"; - $self->{fd} = &$create_socket(PeerHost => $self->{host}, - PeerPort => $self->{port}, + $self->{fd} = &$create_socket(PeerHost => $self->{agenthost}, + PeerPort => $self->{agentport}, Type => SOCK_STREAM); if (!$self->{fd}) {

1 0