wine-commits November 2020

wine-commits@winehq.org

1 participants
851 discussions

Liam Middlebrook : winevulkan: Update to VK spec version 1.2.162.
by Alexandre Julliard 23 Nov '20

23 Nov '20

Module: wine Branch: master Commit: 7d8c50e4371f2fc5300b90b323210c922d80d4e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d8c50e4371f2fc5300b90b3… Author: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Date: Mon Nov 23 05:56:49 2020 -0800 winevulkan: Update to VK spec version 1.2.162. Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Daniel Koch <dkoch(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 2 +- dlls/winevulkan/vulkan_thunks.c | 616 +++++++++- dlls/winevulkan/vulkan_thunks.h | 245 +++- dlls/winevulkan/winevulkan.json | 2 +- include/wine/vulkan.h | 2552 +++++++++++++++++++++++---------------- 5 files changed, 2317 insertions(+), 1100 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7d8c50e4371f2fc5300b…

1 0

Liam Middlebrook : winevulkan: Make_vulkan handle VkDeviceAddress basetype.
by Alexandre Julliard 23 Nov '20

23 Nov '20

Module: wine Branch: master Commit: b84d11d18e867ab78bb7a28cdd37e46e385a84e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b84d11d18e867ab78bb7a28c… Author: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Date: Mon Nov 23 05:56:48 2020 -0800 winevulkan: Make_vulkan handle VkDeviceAddress basetype. Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Daniel Koch <dkoch(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 6675a813c05..336f09f125e 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -1387,7 +1387,7 @@ class VkParam(object): self.format_conv = "wine_dbgstr_longlong({0})" elif self.type in ["uint16_t", "uint32_t", "VkBool32"]: self.format_str = "%u" - elif self.type in ["uint64_t", "VkDeviceSize"]: + elif self.type in ["uint64_t", "VkDeviceAddress", "VkDeviceSize"]: self.format_str = "0x%s" self.format_conv = "wine_dbgstr_longlong({0})" elif self.type == "HANDLE":

1 0

Robert Wilhelm : vbscript: Support property set with parameters.
by Alexandre Julliard 23 Nov '20

23 Nov '20

Module: wine Branch: master Commit: c39cd37383f402286c79a58e064adb98c0e7c6dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=c39cd37383f402286c79a58e… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Sat Nov 21 10:27:32 2020 +0100 vbscript: Support property set with parameters. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=33996 Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/interp.c | 11 +++-------- dlls/vbscript/parser.y | 2 +- dlls/vbscript/tests/lang.vbs | 16 ++++++++++++++++ 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 560d3b16e69..11d95e57758 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -988,12 +988,7 @@ static HRESULT interp_set_member(exec_ctx_t *ctx) TRACE("%s\n", debugstr_w(identifier)); - if(arg_cnt) { - FIXME("arguments not supported\n"); - return E_NOTIMPL; - } - - hres = stack_assume_disp(ctx, 1, &obj); + hres = stack_assume_disp(ctx, arg_cnt+1, &obj); if(FAILED(hres)) return hres; @@ -1002,7 +997,7 @@ static HRESULT interp_set_member(exec_ctx_t *ctx) return E_FAIL; } - hres = stack_assume_disp(ctx, 0, NULL); + hres = stack_assume_disp(ctx, arg_cnt, NULL); if(FAILED(hres)) return hres; @@ -1014,7 +1009,7 @@ static HRESULT interp_set_member(exec_ctx_t *ctx) if(FAILED(hres)) return hres; - stack_popn(ctx, 2); + stack_popn(ctx, arg_cnt+2); return S_OK; } diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 8f1c1307794..034baffa4dd 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -456,7 +456,7 @@ PropertyDecl { $$ = new_function_decl(ctx, $4, FUNC_PROPGET, $1, $5, $7); CHECK_ERROR; } | Storage_opt tPROPERTY tLET Identifier '(' ArgumentDeclList ')' StSep BodyStatements tEND tPROPERTY { $$ = new_function_decl(ctx, $4, FUNC_PROPLET, $1, $6, $9); CHECK_ERROR; } - | Storage_opt tPROPERTY tSET Identifier '(' ArgumentDecl ')' StSep BodyStatements tEND tPROPERTY + | Storage_opt tPROPERTY tSET Identifier '(' ArgumentDeclList ')' StSep BodyStatements tEND tPROPERTY { $$ = new_function_decl(ctx, $4, FUNC_PROPSET, $1, $6, $9); CHECK_ERROR; } FunctionDecl diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index ed89906c9cf..419a4349896 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -1772,6 +1772,17 @@ end class Class TestPropParam Public oDict + Public gotNothing + Public m_obj + + Public Property Set bar(obj) + Set m_obj = obj + End Property + Public Property Set foo(par,obj) + Set m_obj = obj + if obj is Nothing Then gotNothing = True + oDict = par + End Property Public Property Let Key(oldKey,newKey) oDict = oldKey & newKey End Property @@ -1790,6 +1801,11 @@ x.three(1,2) = 3 call ok(x.oDict = "123","x.oDict = " & x.oDict & " expected 123") x.ten(1,2,3,4,5,6,7,8,9) = 0 call ok(x.oDict = "1234567890","x.oDict = " & x.oDict & " expected 1234567890") +Set x.bar = Nothing +call ok(x.gotNothing=Empty,"x.gotNothing = " & x.gotNothing & " expected Empty") +Set x.foo("123") = Nothing +call ok(x.oDict = "123","x.oDict = " & x.oDict & " expected 123") +call ok(x.gotNothing=True,"x.gotNothing = " & x.gotNothing & " expected true") set x = new TestPropSyntax set x.prop = new TestPropSyntax

1 0

Piotr Caban : msvcrt: Remove traces from printf.
by Alexandre Julliard 23 Nov '20

23 Nov '20

Module: wine Branch: master Commit: 1b053519755242a561feec91df4a60f07c322c3a URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b053519755242a561feec91… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Nov 23 14:01:27 2020 +0100 msvcrt: Remove traces from printf. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/printf.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index f8b200c7e54..3be60db369b 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -601,8 +601,6 @@ static inline int FUNC_NAME(pf_output_fp)(FUNC_NAME(puts_clbk) pf_puts, void *pu ULONGLONG m; DWORD l; - TRACE("floating point argument: %.16le\n", v); - if(flags->Precision == -1) flags->Precision = 6; @@ -973,8 +971,6 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API BOOL standard_rounding = FALSE; #endif - TRACE("Format is: %s\n", FUNC_NAME(debugstr)(fmt)); - if (!MSVCRT_CHECK_PMT(fmt != NULL)) return -1;

1 0

Alexandre Julliard : kernel32: Implement BaseThreadInitThunk in assembly also for PE builds.
by Alexandre Julliard 23 Nov '20

23 Nov '20

Module: wine Branch: master Commit: d896b1195d876085f7127accd445c3ecd504da3f URL: https://source.winehq.org/git/wine.git/?a=commit;h=d896b1195d876085f7127acc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 23 13:58:27 2020 +0100 kernel32: Implement BaseThreadInitThunk in assembly also for PE builds. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50171 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/thread.c | 13 ++++++------- include/wine/asm.h | 12 +++++++----- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/kernel32/thread.c b/dlls/kernel32/thread.c index 1cd309d84b4..1f4f938af51 100644 --- a/dlls/kernel32/thread.c +++ b/dlls/kernel32/thread.c @@ -33,8 +33,11 @@ #include "kernel_private.h" +/*********************************************************************** + * BaseThreadInitThunk (KERNEL32.@) + */ #ifdef __i386__ -__ASM_STDCALL_FUNC( __fastcall_BaseThreadInitThunk, 12, +__ASM_FASTCALL_FUNC( BaseThreadInitThunk, 12, "pushl %ebp\n\t" __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") @@ -50,16 +53,12 @@ __ASM_STDCALL_FUNC( __fastcall_BaseThreadInitThunk, 12, "call *%edx\n\t" "movl %eax,(%esp)\n\t" "call " __ASM_STDCALL( "RtlExitUserThread", 4 )) -#endif - -/*********************************************************************** - * BaseThreadInitThunk (KERNEL32.@) - */ +#else void __fastcall BaseThreadInitThunk( DWORD unknown, LPTHREAD_START_ROUTINE entry, void *arg ) { RtlExitUserThread( entry( arg ) ); } - +#endif /*********************************************************************** * FreeLibraryAndExitThread (KERNEL32.@) diff --git a/include/wine/asm.h b/include/wine/asm.h index 788e26126cb..2d1607ca772 100644 --- a/include/wine/asm.h +++ b/include/wine/asm.h @@ -28,9 +28,11 @@ #endif #if defined(_WIN32) && defined(__i386__) -# define __ASM_STDCALL(name,args) __ASM_NAME(name) "@" #args +# define __ASM_STDCALL(name,args) "_" name "@" #args +# define __ASM_FASTCALL(name,args) "@" name "@" #args #else -# define __ASM_STDCALL(name,args) __ASM_NAME(name) +# define __ASM_STDCALL(name,args) __ASM_NAME(name) +# define __ASM_FASTCALL(name,args) __ASM_NAME("__fastcall_" name) #endif #if defined(__GCC_HAVE_DWARF2_CFI_ASM) || (defined(__clang__) && defined(__GNUC__) && !defined(__SEH__)) @@ -78,21 +80,21 @@ __ASM_BLOCK_END #define __ASM_GLOBAL_FUNC(name,code) __ASM_DEFINE_FUNC(__ASM_NAME(#name),code) - #define __ASM_STDCALL_FUNC(name,args,code) __ASM_DEFINE_FUNC(__ASM_STDCALL(#name,args),code) +#define __ASM_FASTCALL_FUNC(name,args,code) __ASM_DEFINE_FUNC(__ASM_FASTCALL(#name,args),code) /* fastcall support */ #if defined(__i386__) && !defined(_WIN32) # define DEFINE_FASTCALL1_WRAPPER(func) \ - __ASM_STDCALL_FUNC( __fastcall_ ## func, 4, \ + __ASM_FASTCALL_FUNC( func, 4, \ "popl %eax\n\t" \ "pushl %ecx\n\t" \ "pushl %eax\n\t" \ "jmp " __ASM_STDCALL(#func,4) ) # define DEFINE_FASTCALL_WRAPPER(func,args) \ - __ASM_STDCALL_FUNC( __fastcall_ ## func, args, \ + __ASM_FASTCALL_FUNC( func, args, \ "popl %eax\n\t" \ "pushl %edx\n\t" \ "pushl %ecx\n\t" \

1 0

Alistair Leslie-Hughes : include: Add some DB_S_ defines.
by Alexandre Julliard 23 Nov '20

23 Nov '20

Module: wine Branch: master Commit: 6b17d4d90b6648a782356036958a9a9ac2b64703 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b17d4d90b6648a782356036… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Nov 23 19:32:46 2020 +1100 include: Add some DB_S_ defines. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/oledberr.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/oledberr.h b/include/oledberr.h index 61093ea1491..c0eccba1e97 100644 --- a/include/oledberr.h +++ b/include/oledberr.h @@ -83,6 +83,9 @@ #define DB_E_MISMATCHEDPROVIDER 0x80040e75 +#define DB_S_BOOKMARKSKIPPED 0x00040ec3 +#define DB_S_NONEXTROWSET 0x00040ec5 +#define DB_S_ENDOFROWSET 0x00040ec6 #define DB_S_ERRORSOCCURRED 0x00040eda #endif /* __WINE_OLEDBERR_H */

1 0

Gijs Vermeulen : msctf/tests: Add ITfSource::[Un]AdviseSink() test with ITfActiveLanguageProfileNotifySink.
by Alexandre Julliard 23 Nov '20

23 Nov '20

Module: wine Branch: master Commit: 4a103ea9612997ffb04be2c721a25b487d63ada3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a103ea9612997ffb04be2c7… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Sun Nov 22 17:13:32 2020 +0100 msctf/tests: Add ITfSource::[Un]AdviseSink() test with ITfActiveLanguageProfileNotifySink. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctf/tests/inputprocessor.c | 48 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 47 insertions(+), 1 deletion(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index f21042a794c..1c97d2c5d1c 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -63,7 +63,7 @@ static BOOL test_ShouldDeactivate = FALSE; static DWORD tmSinkCookie; static DWORD dmSinkCookie; static DWORD documentStatus; -static DWORD key_trace_sink_cookie, ui_element_sink_cookie, profile_activation_sink_cookie; +static DWORD key_trace_sink_cookie, ui_element_sink_cookie, profile_activation_sink_cookie, active_lang_sink_cookie; static DWORD fake_service_onactivated_flags = 0; static ITfDocumentMgr *test_CurrentFocus = NULL; static ITfDocumentMgr *test_PrevFocus = NULL; @@ -801,6 +801,45 @@ static const ITfTransitoryExtensionSinkVtbl TfTransitoryExtensionSinkVtbl = { static ITfTransitoryExtensionSink TfTransitoryExtensionSink = { &TfTransitoryExtensionSinkVtbl }; +static HRESULT WINAPI TfActiveLanguageProfileNotifySink_QueryInterface(ITfActiveLanguageProfileNotifySink *iface, REFIID riid, void **ppv) +{ + if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_ITfActiveLanguageProfileNotifySink, riid)) { + *ppv = iface; + return S_OK; + } + + *ppv = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI TfActiveLanguageProfileNotifySink_AddRef(ITfActiveLanguageProfileNotifySink *iface) +{ + return 2; +} + +static ULONG WINAPI TfActiveLanguageProfileNotifySink_Release(ITfActiveLanguageProfileNotifySink *iface) +{ + return 1; +} + +static HRESULT WINAPI TfActiveLanguageProfileNotifySink_OnActivated(ITfActiveLanguageProfileNotifySink *iface, REFCLSID clsid, + REFGUID guidProfile, BOOL activated) +{ + trace("Got OnActivated: {clsid %s, guidProfile %s, activated %d}\n", wine_dbgstr_guid(clsid), + wine_dbgstr_guid(guidProfile), activated); + + return S_OK; +} + +static const ITfActiveLanguageProfileNotifySinkVtbl TfActiveLanguageProfileNotifySinkVtbl = { + TfActiveLanguageProfileNotifySink_QueryInterface, + TfActiveLanguageProfileNotifySink_AddRef, + TfActiveLanguageProfileNotifySink_Release, + TfActiveLanguageProfileNotifySink_OnActivated +}; + +static ITfActiveLanguageProfileNotifySink TfActiveLanguageProfileNotifySink = { &TfActiveLanguageProfileNotifySinkVtbl }; + /******************************************************************************************** * Stub text service for testing ********************************************************************************************/ @@ -1231,6 +1270,10 @@ static void test_ThreadMgrAdviseSinks(void) &profile_activation_sink_cookie); ok(hr == S_OK, "Failed to Advise ITfInputProcessorProfileActivationSink\n"); + hr = ITfSource_AdviseSink(source, &IID_ITfActiveLanguageProfileNotifySink, (IUnknown*)&TfActiveLanguageProfileNotifySink, + &active_lang_sink_cookie); + ok(hr == S_OK, "Failed to Advise ITfActiveLanguageProfileNotifySink\n"); + ITfSource_Release(source); } @@ -1258,6 +1301,9 @@ static void test_ThreadMgrUnadviseSinks(void) hr = ITfSource_UnadviseSink(source, profile_activation_sink_cookie); ok(hr == S_OK, "Failed to unadvise ITfInputProcessorProfileActivationSink\n"); + hr = ITfSource_UnadviseSink(source, active_lang_sink_cookie); + ok(hr == S_OK, "Failed to unadvise ITfActiveLanguageProfileNotifySink\n"); + ITfSource_Release(source); }

1 0

Alistair Leslie-Hughes : msctf: Accept ITfActiveLanguageProfileNotifySink in ThreadMgr AdviseSink.
by Alexandre Julliard 23 Nov '20

23 Nov '20

Module: wine Branch: master Commit: 5d70611f305b52d75af7fca6c0614dcc25af7ebe URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d70611f305b52d75af7fca6… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Nov 22 17:13:31 2020 +0100 msctf: Accept ITfActiveLanguageProfileNotifySink in ThreadMgr AdviseSink. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44502 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctf/msctf_internal.h | 1 + dlls/msctf/threadmgr.c | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/msctf/msctf_internal.h b/dlls/msctf/msctf_internal.h index 584bb1044ed..9d60e18e6f3 100644 --- a/dlls/msctf/msctf_internal.h +++ b/dlls/msctf/msctf_internal.h @@ -34,6 +34,7 @@ #define COOKIE_MAGIC_KEYTRACESINK 0x0090 #define COOKIE_MAGIC_UIELEMENTSINK 0x00a0 #define COOKIE_MAGIC_INPUTPROCESSORPROFILEACTIVATIONSINK 0x00b0 +#define COOKIE_MAGIC_ACTIVELANGSINK 0x00c0 extern DWORD tlsIndex DECLSPEC_HIDDEN; extern TfClientId processId DECLSPEC_HIDDEN; diff --git a/dlls/msctf/threadmgr.c b/dlls/msctf/threadmgr.c index 77cf47ca4f6..0e054d4e654 100644 --- a/dlls/msctf/threadmgr.c +++ b/dlls/msctf/threadmgr.c @@ -621,6 +621,13 @@ static HRESULT WINAPI ThreadMgrSource_AdviseSink(ITfSource *iface, return advise_sink(&This->ThreadFocusSink, &IID_ITfThreadFocusSink, COOKIE_MAGIC_THREADFOCUSSINK, punk, pdwCookie); } + if (IsEqualIID(riid, &IID_ITfActiveLanguageProfileNotifySink)) + { + WARN("semi-stub for ITfActiveLanguageProfileNotifySink: sink won't be used.\n"); + return advise_sink(&This->ActiveLanguageProfileNotifySink, &IID_ITfActiveLanguageProfileNotifySink, + COOKIE_MAGIC_ACTIVELANGSINK, punk, pdwCookie); + } + if (IsEqualIID(riid, &IID_ITfKeyTraceEventSink)) { WARN("semi-stub for ITfKeyTraceEventSink: sink won't be used.\n"); @@ -656,7 +663,8 @@ static HRESULT WINAPI ThreadMgrSource_UnadviseSink(ITfSource *iface, DWORD pdwCo magic = get_Cookie_magic(pdwCookie); if (magic != COOKIE_MAGIC_TMSINK && magic != COOKIE_MAGIC_THREADFOCUSSINK && magic != COOKIE_MAGIC_KEYTRACESINK && magic != COOKIE_MAGIC_UIELEMENTSINK - && magic != COOKIE_MAGIC_INPUTPROCESSORPROFILEACTIVATIONSINK) + && magic != COOKIE_MAGIC_INPUTPROCESSORPROFILEACTIVATIONSINK + && magic != COOKIE_MAGIC_ACTIVELANGSINK) return E_INVALIDARG; return unadvise_sink(pdwCookie);

1 0

Zebediah Figura : quartz: Correct return value handling in IMediaSeeking::GetDuration().
by Alexandre Julliard 23 Nov '20

23 Nov '20

Module: wine Branch: master Commit: 627b6b29cd083208ccf0c4f8403a450432e523ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=627b6b29cd083208ccf0c4f8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Nov 21 15:25:02 2020 -0600 quartz: Correct return value handling in IMediaSeeking::GetDuration(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 53 ++++++++++++++++++++++++----------------- dlls/quartz/tests/filtergraph.c | 4 ++-- 2 files changed, 33 insertions(+), 24 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index b3aebabbdad..fb0890fda1f 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -2237,36 +2237,45 @@ static HRESULT WINAPI MediaSeeking_SetTimeFormat(IMediaSeeking *iface, const GUI return S_OK; } -static HRESULT WINAPI FoundDuration(struct filter_graph *This, IMediaSeeking *seek, DWORD_PTR pduration) +static HRESULT WINAPI MediaSeeking_GetDuration(IMediaSeeking *iface, LONGLONG *duration) { - HRESULT hr; - LONGLONG duration = 0, *pdur = (LONGLONG*)pduration; + struct filter_graph *graph = impl_from_IMediaSeeking(iface); + HRESULT hr = E_NOTIMPL, filter_hr; + LONGLONG filter_duration; + struct filter *filter; - hr = IMediaSeeking_GetDuration(seek, &duration); - if (FAILED(hr)) - return hr; + TRACE("graph %p, duration %p.\n", graph, duration); - if (*pdur < duration) - *pdur = duration; - return hr; -} + if (!duration) + return E_POINTER; -static HRESULT WINAPI MediaSeeking_GetDuration(IMediaSeeking *iface, LONGLONG *pDuration) -{ - struct filter_graph *This = impl_from_IMediaSeeking(iface); - HRESULT hr; + *duration = 0; - TRACE("(%p/%p)->(%p)\n", This, iface, pDuration); + EnterCriticalSection(&graph->cs); - if (!pDuration) - return E_POINTER; + LIST_FOR_EACH_ENTRY(filter, &graph->filters, struct filter, entry) + { + update_seeking(filter); + if (!filter->seeking) + continue; - EnterCriticalSection(&This->cs); - *pDuration = 0; - hr = all_renderers_seek(This, FoundDuration, (DWORD_PTR)pDuration); - LeaveCriticalSection(&This->cs); + filter_hr = IMediaSeeking_GetDuration(filter->seeking, &filter_duration); + if (SUCCEEDED(filter_hr)) + { + hr = S_OK; + *duration = max(*duration, filter_duration); + } + else if (filter_hr != E_NOTIMPL) + { + LeaveCriticalSection(&graph->cs); + return filter_hr; + } + } + + LeaveCriticalSection(&graph->cs); - TRACE("--->%08x\n", hr); + TRACE("Returning hr %#x, duration %s (%s seconds).\n", hr, + wine_dbgstr_longlong(*duration), debugstr_time(*duration)); return hr; } diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 853155ab100..b6e68f3f6b9 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -4401,13 +4401,13 @@ static void test_graph_seeking(void) filter1.seek_hr = filter2.seek_hr = 0xbeef; hr = IMediaSeeking_GetDuration(seeking, &time); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); ok(time == 0x23456, "Got time %s.\n", wine_dbgstr_longlong(time)); filter1.seek_hr = E_NOTIMPL; filter2.seek_hr = S_OK; hr = IMediaSeeking_GetDuration(seeking, &time); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); ok(time == 0x12345, "Got time %s.\n", wine_dbgstr_longlong(time)); filter1.seek_hr = 0xdeadbeef;

1 0

Zebediah Figura : quartz/tests: Add some more tests for IMediaSeeking return value handling.
by Alexandre Julliard 23 Nov '20

23 Nov '20

Module: wine Branch: master Commit: ec4feafcc04bdb7c04ef8c0e8d31436e30f38526 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec4feafcc04bdb7c04ef8c0e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Nov 21 15:25:01 2020 -0600 quartz/tests: Add some more tests for IMediaSeeking return value handling. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index e7ee4e5c446..853155ab100 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -1623,7 +1623,7 @@ static HRESULT WINAPI testseek_GetDuration(IMediaSeeking *iface, LONGLONG *durat struct testfilter *filter = impl_from_IMediaSeeking(iface); if (winetest_debug > 1) trace("%p->GetDuration()\n", iface); *duration = filter->seek_duration; - return S_OK; + return filter->seek_hr; } static HRESULT WINAPI testseek_GetStopPosition(IMediaSeeking *iface, LONGLONG *stop) @@ -4399,6 +4399,26 @@ static void test_graph_seeking(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ok(time == 0x23456, "Got time %s.\n", wine_dbgstr_longlong(time)); + filter1.seek_hr = filter2.seek_hr = 0xbeef; + hr = IMediaSeeking_GetDuration(seeking, &time); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(time == 0x23456, "Got time %s.\n", wine_dbgstr_longlong(time)); + + filter1.seek_hr = E_NOTIMPL; + filter2.seek_hr = S_OK; + hr = IMediaSeeking_GetDuration(seeking, &time); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(time == 0x12345, "Got time %s.\n", wine_dbgstr_longlong(time)); + + filter1.seek_hr = 0xdeadbeef; + hr = IMediaSeeking_GetDuration(seeking, &time); + ok(hr == 0xdeadbeef, "Got hr %#x.\n", hr); + + filter1.seek_hr = filter2.seek_hr = E_NOTIMPL; + hr = IMediaSeeking_GetDuration(seeking, &time); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + filter1.seek_hr = filter2.seek_hr = S_OK; + flush_cached_seeking(graph, &filter1); flush_cached_seeking(graph, &filter2); @@ -4420,6 +4440,7 @@ static void test_graph_seeking(void) ok(time == 0x65432, "Got time %s.\n", wine_dbgstr_longlong(time)); filter1.seek_hr = E_NOTIMPL; + filter2.seek_hr = S_OK; hr = IMediaSeeking_GetStopPosition(seeking, &time); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(time == 0x54321, "Got time %s.\n", wine_dbgstr_longlong(time)); @@ -4470,6 +4491,7 @@ static void test_graph_seeking(void) ok(hr == S_OK, "Got hr %#x.\n", hr); filter1.seek_hr = E_NOTIMPL; + filter2.seek_hr = S_OK; hr = IMediaSeeking_SetPositions(seeking, &current, AM_SEEKING_AbsolutePositioning, &stop, AM_SEEKING_AbsolutePositioning); ok(hr == S_OK, "Got hr %#x.\n", hr);

1 0

← Newer
1
...
22
23
24
25
26
27
28
...
86
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2020