April 2020 - Wine-Commits - list.winehq.org

Zebediah Figura : rpcrt4: Handle FC_NON_ENCAPSULATED_UNION in calc_arg_size().
by Alexandre Julliard April 6, 2020

April 6, 2020

Module: wine Branch: master Commit: ff7f92c0b076d7801274f2423dd44ddd10f895b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff7f92c0b076d7801274f242… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Apr 4 18:15:29 2020 -0500 rpcrt4: Handle FC_NON_ENCAPSULATED_UNION in calc_arg_size(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45699 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/ndr_stubless.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index cc52ee27e8..0ef421daf2 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -210,6 +210,12 @@ static DWORD calc_arg_size(MIDL_STUB_MESSAGE *pStubMsg, PFORMAT_STRING pFormat) pStubMsg->MaxCount = 0; size *= pStubMsg->MaxCount; break; + case FC_NON_ENCAPSULATED_UNION: + { + DWORD offset = *(const WORD *)(pFormat + 6 + pStubMsg->CorrDespIncrement); + size = *(const WORD *)(pFormat + 8 + pStubMsg->CorrDespIncrement + offset); + break; + } default: FIXME("Unhandled type %02x\n", *pFormat); /* fallthrough */

1 0

Chip Davis : winegcc: Put quotes around arguments with spaces when printing them.
by Alexandre Julliard April 6, 2020

April 6, 2020

Module: wine Branch: master Commit: f83646736b91188c226a86760b41f86449580d12 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f83646736b91188c226a8676… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Sun Apr 5 14:45:24 2020 -0500 winegcc: Put quotes around arguments with spaces when printing them. This makes it easier to copy and paste the command into the shell. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/utils.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/winegcc/utils.c b/tools/winegcc/utils.c index 1a9bc0a63c..cc5d67977f 100644 --- a/tools/winegcc/utils.c +++ b/tools/winegcc/utils.c @@ -365,7 +365,11 @@ int spawn(const strarray* prefix, const strarray* args, int ignore_errors) if (verbose) { - for(i = 0; argv[i]; i++) printf("%s ", argv[i]); + for(i = 0; argv[i]; i++) + { + if (strpbrk(argv[i], " \t\n\r")) printf("\"%s\" ", argv[i]); + else printf("%s ", argv[i]); + } printf("\n"); }

1 0

Zebediah Figura : rpcrt4: Implement Ndr64AsyncClientCall().
by Alexandre Julliard April 6, 2020

April 6, 2020

Module: wine Branch: master Commit: 36c5adca377dada3e86a765e4ba5b2fdb000eb19 URL: https://source.winehq.org/git/wine.git/?a=commit;h=36c5adca377dada3e86a765e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Apr 4 18:15:31 2020 -0500 rpcrt4: Implement Ndr64AsyncClientCall(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45699 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/ndr_stubless.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/rpcrt4/rpcrt4.spec | 1 + include/rpcndr.h | 2 ++ 3 files changed, 63 insertions(+) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 13a60522fe..3a38137f7f 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -2273,3 +2273,63 @@ CLIENT_CALL_RETURN WINAPIV NdrClientCall3( MIDL_STUBLESS_PROXY_INFO *info, ULONG } #endif + +LONG_PTR CDECL DECLSPEC_HIDDEN ndr64_async_client_call( MIDL_STUBLESS_PROXY_INFO *info, + ULONG proc, void *retval, void **stack_top, void **fpu_stack ) +{ + ULONG_PTR i; + + TRACE("info %p, proc %u, retval %p, stack_top %p, fpu_stack %p\n", + info, proc, retval, stack_top, fpu_stack); + + for (i = 0; i < info->nCount; ++i) + { + const MIDL_SYNTAX_INFO *syntax_info = &info->pSyntaxInfo[i]; + const RPC_SYNTAX_IDENTIFIER *id = &syntax_info->TransferSyntax; + + TRACE("Found syntax %s, version %u.%u.\n", debugstr_guid(&id->SyntaxGUID), + id->SyntaxVersion.MajorVersion, id->SyntaxVersion.MinorVersion); + if (!memcmp(id, &ndr_syntax_id, sizeof(RPC_SYNTAX_IDENTIFIER))) + { + if (retval) + FIXME("Complex return types are not supported.\n"); + + return ndr_async_client_call( info->pStubDesc, + syntax_info->ProcString + syntax_info->FmtStringOffset[proc], stack_top ); + } + } + + FIXME("NDR64 syntax is not supported.\n"); + return 0; +} + +#ifdef __x86_64__ + +__ASM_GLOBAL_FUNC( Ndr64AsyncClientCall, + "movq %r9,0x20(%rsp)\n\t" + "leaq 0x20(%rsp),%r9\n\t" + "pushq $0\n\t" + "subq $0x20,%rsp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 0x28\n\t") + "call " __ASM_NAME("ndr64_async_client_call") "\n\t" + "addq $0x28,%rsp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset -0x28\n\t") + "ret" ); + +#elif defined(_WIN64) + +/*********************************************************************** + * Ndr64AsyncClientCall [RPCRT4.@] + */ +CLIENT_CALL_RETURN WINAPIV Ndr64AsyncClientCall( MIDL_STUBLESS_PROXY_INFO *info, ULONG proc, void *retval, ... ) +{ + __ms_va_list args; + LONG_PTR ret; + + __ms_va_start( args, retval ); + ret = ndr64_async_client_call( info, proc, retval, va_arg( args, void ** ), NULL ); + __ms_va_end( args ); + return *(CLIENT_CALL_RETURN *)&ret; +} + +#endif diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec index 2673771ef5..04927764ef 100644 --- a/dlls/rpcrt4/rpcrt4.spec +++ b/dlls/rpcrt4/rpcrt4.spec @@ -115,6 +115,7 @@ @ stdcall NDRSContextUnmarshall(ptr long) @ stdcall NDRSContextUnmarshallEx(ptr ptr long) @ stub NDRcopy +@ varargs -arch=win64 Ndr64AsyncClientCall(ptr long ptr) @ stdcall NdrAllocate(ptr long) @ varargs NdrAsyncClientCall(ptr ptr) @ stdcall NdrAsyncServerCall(ptr) diff --git a/include/rpcndr.h b/include/rpcndr.h index 729b881c9b..86cbe5f6c6 100644 --- a/include/rpcndr.h +++ b/include/rpcndr.h @@ -671,6 +671,8 @@ CLIENT_CALL_RETURN RPC_VAR_ENTRY NdrClientCall3( MIDL_STUBLESS_PROXY_INFO *info, ULONG proc, void *retval, ... ); CLIENT_CALL_RETURN RPC_VAR_ENTRY NdrAsyncClientCall( PMIDL_STUB_DESC pStubDescriptor, PFORMAT_STRING pFormat, ... ); +CLIENT_CALL_RETURN RPC_VAR_ENTRY + Ndr64AsyncClientCall( MIDL_STUBLESS_PROXY_INFO *info, ULONG proc, void *retval, ... ); CLIENT_CALL_RETURN RPC_VAR_ENTRY NdrDcomAsyncClientCall( PMIDL_STUB_DESC pStubDescriptor, PFORMAT_STRING pFormat, ... );

1 0

Chip Davis : dbghelp: Ignore N_INDR symbols.
by Alexandre Julliard April 6, 2020

April 6, 2020

Module: wine Branch: master Commit: 53b5c3b6c674f4bd6d02f20986598b5b6580a2d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=53b5c3b6c674f4bd6d02f209… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Sun Apr 5 15:09:44 2020 -0500 dbghelp: Ignore N_INDR symbols. These are aliases for another symbol. They are often seen on Mac OS when a dylib reexports some symbols defined in another dylib. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/stabs.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/dbghelp/stabs.c b/dlls/dbghelp/stabs.c index 9ac3089d02..a723865527 100644 --- a/dlls/dbghelp/stabs.c +++ b/dlls/dbghelp/stabs.c @@ -74,6 +74,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp_stabs); #ifndef N_ABS #define N_ABS 0x02 #endif +#ifndef N_INDR +#define N_INDR 0x0a +#endif #ifndef N_SECT #define N_SECT 0x0e #endif @@ -1617,6 +1620,7 @@ BOOL stabs_parse(struct module* module, ULONG_PTR load_offset, case N_BNSYM: case N_ENSYM: case N_OSO: + case N_INDR: /* Always ignore these, they seem to be used only on Darwin. */ break; case N_ABS:

1 0

Zebediah Figura : strmbase: Check the peer direction in source_Connect().
by Alexandre Julliard April 6, 2020

April 6, 2020

Module: wine Branch: master Commit: 0c1d9312434bb47a4e8135926a79cf3a0b2f44f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c1d9312434bb47a4e813592… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Apr 5 19:49:45 2020 -0500 strmbase: Check the peer direction in source_Connect(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/tests/qcap.c | 2 +- dlls/strmbase/pin.c | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/qcap/tests/qcap.c b/dlls/qcap/tests/qcap.c index 45fd98b7f9..56eaf77513 100644 --- a/dlls/qcap/tests/qcap.c +++ b/dlls/qcap/tests/qcap.c @@ -1433,7 +1433,7 @@ static void test_AviMux(char *arg) pin, &source_filter.IPin_iface); hr = IPin_Connect(avimux_out, &source_filter.IPin_iface, NULL); - todo_wine ok(hr == VFW_E_INVALID_DIRECTION, "Connect returned %x\n", hr); + ok(hr == VFW_E_INVALID_DIRECTION, "Connect returned %x\n", hr); hr = IBaseFilter_JoinFilterGraph(avimux, (IFilterGraph*)&GraphBuilder, NULL); ok(hr == S_OK, "JoinFilterGraph returned %x\n", hr); diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index b2a0c39110..4676c9d82b 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -447,6 +447,7 @@ static HRESULT WINAPI source_Connect(IPin *iface, IPin *peer, const AM_MEDIA_TYP struct strmbase_source *pin = impl_source_from_IPin(iface); AM_MEDIA_TYPE candidate, *candidate_ptr; IEnumMediaTypes *enummt; + PIN_DIRECTION dir; unsigned int i; ULONG count; HRESULT hr; @@ -458,10 +459,12 @@ static HRESULT WINAPI source_Connect(IPin *iface, IPin *peer, const AM_MEDIA_TYP if (!peer) return E_POINTER; - /* If we try to connect to ourselves, we will definitely deadlock. - * There are other cases where we could deadlock too, but this - * catches the obvious case */ - assert(peer != iface); + IPin_QueryDirection(peer, &dir); + if (dir != PINDIR_INPUT) + { + WARN("Attempt to connect to another source pin, returning VFW_E_INVALID_DIRECTION.\n"); + return VFW_E_INVALID_DIRECTION; + } EnterCriticalSection(&pin->pin.filter->csFilter);

1 0

Alexandre Julliard : capi2032: Use standard dlopen() instead of the libwine wrappers.
by Alexandre Julliard April 6, 2020

April 6, 2020

Module: wine Branch: master Commit: e39b3a2faff8fd9a3aa4807c7035be310e215a89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e39b3a2faff8fd9a3aa4807c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 6 11:44:41 2020 +0200 capi2032: Use standard dlopen() instead of the libwine wrappers. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/capi2032/cap20wxx.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/capi2032/cap20wxx.c b/dlls/capi2032/cap20wxx.c index a6f3e3fc95..6f22a020f3 100644 --- a/dlls/capi2032/cap20wxx.c +++ b/dlls/capi2032/cap20wxx.c @@ -37,7 +37,6 @@ #ifdef HAVE_CAPI20_H # include <capi20.h> #endif -#include "wine/library.h" #include "wine/debug.h" #include "cap20wxx.h" @@ -61,12 +60,12 @@ static void load_functions(void) { if (pcapi20_register) /* loaded already */ return; - capi_handle = wine_dlopen(SONAME_LIBCAPI20, RTLD_NOW, NULL, 0); + capi_handle = dlopen(SONAME_LIBCAPI20, RTLD_NOW); if(!capi_handle) { FIXME("Wine cannot find the library %s, capi2032.dll not working.\n", SONAME_LIBCAPI20); return; } -#define LOAD_FUNCPTR(f) if((p##f = wine_dlsym(capi_handle, #f, NULL, 0)) == NULL){WARN("Can't find symbol %s\n", #f); return;} +#define LOAD_FUNCPTR(f) if((p##f = dlsym(capi_handle, #f)) == NULL){WARN("Can't find symbol %s\n", #f); return;} LOAD_FUNCPTR(capi20_register); LOAD_FUNCPTR(capi20_release); LOAD_FUNCPTR(capi20_put_message);

1 0

Alexandre Julliard : ctapi32: Use standard dlopen() instead of the libwine wrappers.
by Alexandre Julliard April 6, 2020

April 6, 2020

Module: wine Branch: master Commit: 3b9ddb66add8a361c9288817d508c29b5ccd1f10 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b9ddb66add8a361c9288817… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 6 11:45:10 2020 +0200 ctapi32: Use standard dlopen() instead of the libwine wrappers. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ctapi32/ctapi32.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/ctapi32/ctapi32.c b/dlls/ctapi32/ctapi32.c index a2dc5bca87..10adacb65d 100644 --- a/dlls/ctapi32/ctapi32.c +++ b/dlls/ctapi32/ctapi32.c @@ -21,7 +21,6 @@ #include "config.h" #include "wine/port.h" #include <string.h> -#include "wine/library.h" #include "wine/debug.h" #include "windef.h" #include "winreg.h" @@ -72,7 +71,7 @@ static BOOL load_functions(void) { } TRACE("Loading library '%s'\n", soname); - ctapi_handle = wine_dlopen(soname, RTLD_NOW, NULL, 0); + ctapi_handle = dlopen(soname, RTLD_NOW); if (ctapi_handle) { TRACE("Successfully loaded '%s'\n", soname); } @@ -83,7 +82,7 @@ static BOOL load_functions(void) { return FALSE; } -#define LOAD_FUNCPTR(f) if((p##f = wine_dlsym(ctapi_handle, #f, NULL, 0)) == NULL){WARN("Can't find symbol %s\n", #f); return FALSE;} +#define LOAD_FUNCPTR(f) if((p##f = dlsym(ctapi_handle, #f)) == NULL){WARN("Can't find symbol %s\n", #f); return FALSE;} LOAD_FUNCPTR(CT_init); LOAD_FUNCPTR(CT_data); LOAD_FUNCPTR(CT_close); @@ -134,7 +133,7 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) break; case DLL_PROCESS_DETACH: if (lpvReserved) break; - if (ctapi_handle) wine_dlclose(ctapi_handle, NULL, 0); + if (ctapi_handle) dlclose(ctapi_handle); break; }

1 0

Alexandre Julliard : dwrite: Use standard dlopen() instead of the libwine wrappers.
by Alexandre Julliard April 6, 2020

April 6, 2020

Module: wine Branch: master Commit: 51903ba30e8e9989358b750f08f283d89883e061 URL: https://source.winehq.org/git/wine.git/?a=commit;h=51903ba30e8e9989358b750f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 6 11:45:32 2020 +0200 dwrite: Use standard dlopen() instead of the libwine wrappers. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/freetype.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/dwrite/freetype.c b/dlls/dwrite/freetype.c index 86c8315e6a..26b0d7bde1 100644 --- a/dlls/dwrite/freetype.c +++ b/dlls/dwrite/freetype.c @@ -32,7 +32,6 @@ #endif /* HAVE_FT2BUILD_H */ #include "windef.h" -#include "wine/library.h" #include "wine/debug.h" #include "dwrite_private.h" @@ -179,13 +178,13 @@ BOOL init_freetype(void) { FT_Version_t FT_Version; - ft_handle = wine_dlopen(SONAME_LIBFREETYPE, RTLD_NOW, NULL, 0); + ft_handle = dlopen(SONAME_LIBFREETYPE, RTLD_NOW); if (!ft_handle) { WINE_MESSAGE("Wine cannot find the FreeType font library.\n"); return FALSE; } -#define LOAD_FUNCPTR(f) if((p##f = wine_dlsym(ft_handle, #f, NULL, 0)) == NULL){WARN("Can't find symbol %s\n", #f); goto sym_not_found;} +#define LOAD_FUNCPTR(f) if((p##f = dlsym(ft_handle, #f)) == NULL){WARN("Can't find symbol %s\n", #f); goto sym_not_found;} LOAD_FUNCPTR(FT_Done_FreeType) LOAD_FUNCPTR(FT_Done_Glyph) LOAD_FUNCPTR(FT_Get_First_Char) @@ -217,11 +216,11 @@ BOOL init_freetype(void) LOAD_FUNCPTR(FTC_Manager_LookupSize) LOAD_FUNCPTR(FTC_Manager_RemoveFaceID) #undef LOAD_FUNCPTR - pFT_Outline_EmboldenXY = wine_dlsym(ft_handle, "FT_Outline_EmboldenXY", NULL, 0); + pFT_Outline_EmboldenXY = dlsym(ft_handle, "FT_Outline_EmboldenXY"); if (pFT_Init_FreeType(&library) != 0) { ERR("Can't init FreeType library\n"); - wine_dlclose(ft_handle, NULL, 0); + dlclose(ft_handle); ft_handle = NULL; return FALSE; } @@ -235,7 +234,7 @@ BOOL init_freetype(void) ERR("Failed to init FreeType cache\n"); pFTC_Manager_Done(cache_manager); pFT_Done_FreeType(library); - wine_dlclose(ft_handle, NULL, 0); + dlclose(ft_handle); ft_handle = NULL; return FALSE; } @@ -245,7 +244,7 @@ BOOL init_freetype(void) sym_not_found: WINE_MESSAGE("Wine cannot find certain functions that it needs from FreeType library.\n"); - wine_dlclose(ft_handle, NULL, 0); + dlclose(ft_handle); ft_handle = NULL; return FALSE; }

1 0

Alexandre Julliard : crypt32: Use standard dlopen() instead of the libwine wrappers.
by Alexandre Julliard April 6, 2020

April 6, 2020

Module: wine Branch: master Commit: 12157fac9f4e33a8cd14bf7c728635eba04ed042 URL: https://source.winehq.org/git/wine.git/?a=commit;h=12157fac9f4e33a8cd14bf7c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 6 11:44:59 2020 +0200 crypt32: Use standard dlopen() instead of the libwine wrappers. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/pfx.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/crypt32/pfx.c b/dlls/crypt32/pfx.c index a515585586..711cf76de2 100644 --- a/dlls/crypt32/pfx.c +++ b/dlls/crypt32/pfx.c @@ -31,7 +31,6 @@ #include "wine/debug.h" #include "wine/heap.h" -#include "wine/library.h" #include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(crypt); @@ -72,14 +71,14 @@ BOOL gnutls_initialize(void) { int ret; - if (!(libgnutls_handle = wine_dlopen( SONAME_LIBGNUTLS, RTLD_NOW, NULL, 0 ))) + if (!(libgnutls_handle = dlopen( SONAME_LIBGNUTLS, RTLD_NOW ))) { ERR_(winediag)( "failed to load libgnutls, no support for pfx import/export\n" ); return FALSE; } #define LOAD_FUNCPTR(f) \ - if (!(p##f = wine_dlsym( libgnutls_handle, #f, NULL, 0 ))) \ + if (!(p##f = dlsym( libgnutls_handle, #f ))) \ { \ ERR( "failed to load %s\n", #f ); \ goto fail; \ @@ -114,7 +113,7 @@ BOOL gnutls_initialize(void) return TRUE; fail: - wine_dlclose( libgnutls_handle, NULL, 0 ); + dlclose( libgnutls_handle ); libgnutls_handle = NULL; return FALSE; } @@ -122,7 +121,7 @@ fail: void gnutls_uninitialize(void) { pgnutls_global_deinit(); - wine_dlclose( libgnutls_handle, NULL, 0 ); + dlclose( libgnutls_handle ); libgnutls_handle = NULL; }

1 0

Zebediah Figura : quartz/filesource: Remove unused callbacks.
by Alexandre Julliard April 6, 2020

April 6, 2020

Module: wine Branch: master Commit: bd80194abde8136d8a4fd39ba6977b22d526d7a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd80194abde8136d8a4fd39b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Apr 5 19:49:44 2020 -0500 quartz/filesource: Remove unused callbacks. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filesource.c | 27 --------------------------- 1 file changed, 27 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index a464352922..3b19d6e7df 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -63,7 +63,6 @@ struct async_reader LPOLESTR pszFileName; AM_MEDIA_TYPE mt; - ALLOCATOR_PROPERTIES allocProps; HANDLE file, port, io_thread; CRITICAL_SECTION sample_cs; BOOL flushing; @@ -550,11 +549,6 @@ static inline struct async_reader *impl_from_strmbase_pin(struct strmbase_pin *i return CONTAINING_RECORD(iface, struct async_reader, source.pin); } -static inline struct async_reader *impl_from_strmbase_source(struct strmbase_source *iface) -{ - return CONTAINING_RECORD(iface, struct async_reader, source); -} - static inline struct async_reader *impl_from_IAsyncReader(IAsyncReader *iface) { return CONTAINING_RECORD(iface, struct async_reader, IAsyncReader_iface); @@ -630,32 +624,12 @@ static HRESULT WINAPI FileAsyncReaderPin_AttemptConnection(struct strmbase_sourc return hr; } -static HRESULT WINAPI FileAsyncReaderPin_DecideBufferSize(struct strmbase_source *iface, - IMemAllocator *pAlloc, ALLOCATOR_PROPERTIES *ppropInputRequest) -{ - struct async_reader *This = impl_from_strmbase_source(iface); - ALLOCATOR_PROPERTIES actual; - - if (ppropInputRequest->cbAlign && ppropInputRequest->cbAlign != This->allocProps.cbAlign) - FIXME("Requested Buffer cbAlign mismatch %i,%i\n",This->allocProps.cbAlign, ppropInputRequest->cbAlign); - if (ppropInputRequest->cbPrefix) - FIXME("Requested Buffer cbPrefix mismatch %i,%i\n",This->allocProps.cbPrefix, ppropInputRequest->cbPrefix); - if (ppropInputRequest->cbBuffer) - FIXME("Requested Buffer cbBuffer mismatch %i,%i\n",This->allocProps.cbBuffer, ppropInputRequest->cbBuffer); - if (ppropInputRequest->cBuffers) - FIXME("Requested Buffer cBuffers mismatch %i,%i\n",This->allocProps.cBuffers, ppropInputRequest->cBuffers); - - return IMemAllocator_SetProperties(pAlloc, &This->allocProps, &actual); -} - static const struct strmbase_source_ops source_ops = { .base.pin_query_accept = source_query_accept, .base.pin_get_media_type = source_get_media_type, .base.pin_query_interface = source_query_interface, .pfnAttemptConnection = FileAsyncReaderPin_AttemptConnection, - .pfnDecideBufferSize = FileAsyncReaderPin_DecideBufferSize, - .pfnDecideAllocator = BaseOutputPinImpl_DecideAllocator, }; static HRESULT WINAPI FileAsyncReader_QueryInterface(IAsyncReader *iface, REFIID iid, void **out) @@ -720,7 +694,6 @@ static HRESULT WINAPI FileAsyncReader_RequestAllocator(IAsyncReader *iface, for (i = 0; i < filter->max_requests; ++i) filter->requests[i].ovl.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); - filter->allocProps = *props; *ret_allocator = allocator; return S_OK;

1 0