December 2019 - Wine-Commits

Francois Gouget : usp10: Fix the spelling of some index array variables and function.
by Alexandre Julliard Dec. 11, 2019

Dec. 11, 2019

Module: wine Branch: master Commit: 490b245a2069418293296c1982dab59729804c4e URL: https://source.winehq.org/git/wine.git/?a=commit;h=490b245a2069418293296c19… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Dec 11 02:58:34 2019 +0100 usp10: Fix the spelling of some index array variables and function. Indices is the plural used by related APIs so use it for consistency. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/bidi.c | 14 ++++++------- dlls/usp10/shape.c | 48 ++++++++++++++++++++++----------------------- dlls/usp10/usp10.c | 18 ++++++++--------- dlls/usp10/usp10_internal.h | 4 ++-- 4 files changed, 42 insertions(+), 42 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=490b245a206941829329…

1 0

Alexandre Julliard : kernel32: Move FindFirst/NextFile functions to kernelbase.
by Alexandre Julliard Dec. 11, 2019

Dec. 11, 2019

Module: wine Branch: master Commit: 9b0877db4ada321b0f8a93f0620a7a4fbdae29f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b0877db4ada321b0f8a93f0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 11 10:48:34 2019 +0100 kernel32: Move FindFirst/NextFile functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/file.c | 473 ---------------------------------------- dlls/kernel32/kernel32.spec | 14 +- dlls/kernelbase/file.c | 400 +++++++++++++++++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 14 +- 4 files changed, 414 insertions(+), 487 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9b0877db4ada321b0f8a…

1 0

Alexandre Julliard : server: Add status code for ELOOP error.
by Alexandre Julliard Dec. 11, 2019

Dec. 11, 2019

Module: wine Branch: master Commit: b851f1ca2bb488d5f957b27abf59680b0adea2ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=b851f1ca2bb488d5f957b27a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 11 10:28:49 2019 +0100 server: Add status code for ELOOP error. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/file.c | 1 + server/trace.c | 1 + 2 files changed, 2 insertions(+) diff --git a/server/file.c b/server/file.c index 4f34857514..71b84486b0 100644 --- a/server/file.c +++ b/server/file.c @@ -678,6 +678,7 @@ void file_set_error(void) case ENODEV: set_error( STATUS_NO_SUCH_DEVICE ); break; case ENXIO: set_error( STATUS_NO_SUCH_DEVICE ); break; case EXDEV: set_error( STATUS_NOT_SAME_DEVICE ); break; + case ELOOP: set_error( STATUS_REPARSE_POINT_NOT_RESOLVED ); break; #ifdef EOVERFLOW case EOVERFLOW: set_error( STATUS_INVALID_PARAMETER ); break; #endif diff --git a/server/trace.c b/server/trace.c index 411369a4f6..5b1d3ddea9 100644 --- a/server/trace.c +++ b/server/trace.c @@ -5619,6 +5619,7 @@ static const struct { "PROCESS_IN_JOB", STATUS_PROCESS_IN_JOB }, { "PROCESS_IS_TERMINATING", STATUS_PROCESS_IS_TERMINATING }, { "PROCESS_NOT_IN_JOB", STATUS_PROCESS_NOT_IN_JOB }, + { "REPARSE_POINT_NOT_RESOLVED", STATUS_REPARSE_POINT_NOT_RESOLVED }, { "SECTION_TOO_BIG", STATUS_SECTION_TOO_BIG }, { "SEMAPHORE_LIMIT_EXCEEDED", STATUS_SEMAPHORE_LIMIT_EXCEEDED }, { "SHARING_VIOLATION", STATUS_SHARING_VIOLATION },

1 0

Zebediah Figura : qcap/avimux: Use strmbase sink connection methods.
by Alexandre Julliard Dec. 11, 2019

Dec. 11, 2019

Module: wine Branch: master Commit: 14a51f57b6c6d39d5845e2b37e157916fa680c95 URL: https://source.winehq.org/git/wine.git/?a=commit;h=14a51f57b6c6d39d5845e2b3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Dec 10 21:53:33 2019 -0600 qcap/avimux: Use strmbase sink connection methods. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/avimux.c | 71 +++++++++++++++++++----------------------------------- 1 file changed, 25 insertions(+), 46 deletions(-) diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c index 63e98e8877..c17d91322b 100644 --- a/dlls/qcap/avimux.c +++ b/dlls/qcap/avimux.c @@ -1410,41 +1410,15 @@ static HRESULT WINAPI AviMuxIn_Receive(struct strmbase_sink *base, IMediaSample return hr; } -static const struct strmbase_sink_ops sink_ops = -{ - .base.pin_query_interface = sink_query_interface, - .base.pin_query_accept = sink_query_accept, - .base.pin_get_media_type = strmbase_pin_get_media_type, - .pfnReceive = AviMuxIn_Receive, -}; - -static inline AviMux* impl_from_in_IPin(IPin *iface) +static HRESULT avi_mux_sink_connect(struct strmbase_sink *iface, IPin *peer, const AM_MEDIA_TYPE *pmt) { - struct strmbase_pin *pin = CONTAINING_RECORD(iface, struct strmbase_pin, IPin_iface); - return impl_from_strmbase_filter(pin->filter); -} - -static inline AviMuxIn* AviMuxIn_from_IPin(IPin *iface) -{ - return CONTAINING_RECORD(iface, AviMuxIn, pin.pin.IPin_iface); -} - -static HRESULT WINAPI AviMuxIn_ReceiveConnection(IPin *iface, - IPin *pConnector, const AM_MEDIA_TYPE *pmt) -{ - AviMux *This = impl_from_in_IPin(iface); - AviMuxIn *avimuxin = AviMuxIn_from_IPin(iface); + AviMuxIn *avimuxin = impl_sink_from_strmbase_pin(&iface->pin); + AviMux *This = impl_from_strmbase_filter(iface->pin.filter); HRESULT hr; - TRACE("pin %p, pConnector %p, pmt %p.\n", avimuxin, pConnector, pmt); - if(!pmt) return E_POINTER; - hr = BaseInputPinImpl_ReceiveConnection(iface, pConnector, pmt); - if(FAILED(hr)) - return hr; - if(IsEqualIID(&pmt->majortype, &MEDIATYPE_Video) && IsEqualIID(&pmt->formattype, &FORMAT_VideoInfo)) { ALLOCATOR_PROPERTIES req, act; @@ -1468,10 +1442,8 @@ static HRESULT WINAPI AviMuxIn_ReceiveConnection(IPin *iface, hr = IMemAllocator_SetProperties(avimuxin->samples_allocator, &req, &act); if(SUCCEEDED(hr)) hr = IMemAllocator_Commit(avimuxin->samples_allocator); - if(FAILED(hr)) { - BaseInputPinImpl_Disconnect(iface); + if (FAILED(hr)) return hr; - } size = pmt->cbFormat - FIELD_OFFSET(VIDEOINFOHEADER, bmiHeader); avimuxin->strf = CoTaskMemAlloc(sizeof(RIFFCHUNK) + ALIGN(FIELD_OFFSET(BITMAPINFO, bmiColors[vih->bmiHeader.biClrUsed]))); @@ -1489,23 +1461,15 @@ static HRESULT WINAPI AviMuxIn_ReceiveConnection(IPin *iface, return create_input_pin(This); } -static HRESULT WINAPI AviMuxIn_Disconnect(IPin *iface) +static void avi_mux_sink_disconnect(struct strmbase_sink *iface) { - AviMuxIn *avimuxin = AviMuxIn_from_IPin(iface); + AviMuxIn *avimuxin = impl_sink_from_strmbase_pin(&iface->pin); IMediaSample **prev, *cur; - HRESULT hr; - - TRACE("pin %p.\n", avimuxin); - - hr = BaseInputPinImpl_Disconnect(iface); - if(FAILED(hr)) - return hr; IMemAllocator_Decommit(avimuxin->samples_allocator); while(avimuxin->samples_head) { cur = avimuxin->samples_head; - hr = IMediaSample_GetPointer(cur, (BYTE**)&prev); - if(FAILED(hr)) + if (FAILED(IMediaSample_GetPointer(cur, (BYTE **)&prev))) break; prev--; @@ -1518,7 +1482,22 @@ static HRESULT WINAPI AviMuxIn_Disconnect(IPin *iface) } CoTaskMemFree(avimuxin->strf); avimuxin->strf = NULL; - return hr; +} + +static const struct strmbase_sink_ops sink_ops = +{ + .base.pin_query_interface = sink_query_interface, + .base.pin_query_accept = sink_query_accept, + .base.pin_get_media_type = strmbase_pin_get_media_type, + .pfnReceive = AviMuxIn_Receive, + .sink_connect = avi_mux_sink_connect, + .sink_disconnect = avi_mux_sink_disconnect, +}; + +static inline AviMux* impl_from_in_IPin(IPin *iface) +{ + struct strmbase_pin *pin = CONTAINING_RECORD(iface, struct strmbase_pin, IPin_iface); + return impl_from_strmbase_filter(pin->filter); } static const IPinVtbl AviMuxIn_PinVtbl = { @@ -1526,8 +1505,8 @@ static const IPinVtbl AviMuxIn_PinVtbl = { BasePinImpl_AddRef, BasePinImpl_Release, BaseInputPinImpl_Connect, - AviMuxIn_ReceiveConnection, - AviMuxIn_Disconnect, + BaseInputPinImpl_ReceiveConnection, + BaseInputPinImpl_Disconnect, BasePinImpl_ConnectedTo, BasePinImpl_ConnectionMediaType, BasePinImpl_QueryPinInfo,

1 0

Zebediah Figura : strmbase: Check for a NULL media type in IPin::ReceiveConnection().
by Alexandre Julliard Dec. 11, 2019

Dec. 11, 2019

Module: wine Branch: master Commit: 88898cf56057daee3bd9a10a0296da5ab178aa05 URL: https://source.winehq.org/git/wine.git/?a=commit;h=88898cf56057daee3bd9a10a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Dec 10 21:53:32 2019 -0600 strmbase: Check for a NULL media type in IPin::ReceiveConnection(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/pin.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index 5255a6c7b0..3dd00b27cc 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -633,6 +633,9 @@ HRESULT WINAPI BaseInputPinImpl_ReceiveConnection(IPin * iface, IPin * pReceiveP TRACE("(%p)->(%p, %p)\n", This, pReceivePin, pmt); strmbase_dump_media_type(pmt); + if (!pmt) + return E_POINTER; + EnterCriticalSection(&This->pin.filter->csFilter); { if (This->pin.filter->state != State_Stopped)

1 0

Francois Gouget : urlmon/tests: Fix the spelling of a variable name.
by Alexandre Julliard Dec. 11, 2019

Dec. 11, 2019

Module: wine Branch: master Commit: 48e9595c329997cd5d1b068180fb7d190a219853 URL: https://source.winehq.org/git/wine.git/?a=commit;h=48e9595c329997cd5d1b0681… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Dec 11 02:58:22 2019 +0100 urlmon/tests: Fix the spelling of a variable name. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/tests/stream.c | 4 ++-- dlls/urlmon/tests/url.c | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/urlmon/tests/stream.c b/dlls/urlmon/tests/stream.c index 6717198b31..bf8867290f 100644 --- a/dlls/urlmon/tests/stream.c +++ b/dlls/urlmon/tests/stream.c @@ -204,7 +204,7 @@ static HRESULT WINAPI statusclb_OnDataAvailable(IBindStatusCallback *iface, DWOR DWORD dwSize, FORMATETC* pformatetc, STGMEDIUM* pstgmed) { HRESULT hres; - DWORD readed; + DWORD read; BYTE buf[512]; CHECK_EXPECT2(OnDataAvailable); @@ -230,7 +230,7 @@ static HRESULT WINAPI statusclb_OnDataAvailable(IBindStatusCallback *iface, DWOR } if(U(*pstgmed).pstm) { - do hres = IStream_Read(U(*pstgmed).pstm, buf, 512, &readed); + do hres = IStream_Read(U(*pstgmed).pstm, buf, 512, &read); while(hres == S_OK); ok(hres == S_FALSE || hres == E_PENDING, "IStream_Read returned %08x\n", hres); } diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 287eb2702e..7c8d1abdb7 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -1988,7 +1988,7 @@ static HRESULT WINAPI statusclb_OnDataAvailable(IBindStatusCallbackEx *iface, DW DWORD dwSize, FORMATETC* pformatetc, STGMEDIUM* pstgmed) { HRESULT hres; - DWORD readed; + DWORD read; BYTE buf[512]; CHAR clipfmt[512]; @@ -2075,8 +2075,8 @@ static HRESULT WINAPI statusclb_OnDataAvailable(IBindStatusCallbackEx *iface, DW if(callback_read) { do { - hres = IStream_Read(stream, buf, 512, &readed); - if(test_protocol == HTTP_TEST && emulate_protocol && readed) + hres = IStream_Read(stream, buf, 512, &read); + if(test_protocol == HTTP_TEST && emulate_protocol && read) ok(buf[0] == (use_cache_file && !(bindf&BINDF_ASYNCHRONOUS) ? 'X' : '?'), "buf[0] = '%c'\n", buf[0]); }while(hres == S_OK); ok(hres == S_FALSE || hres == E_PENDING, "IStream_Read returned %08x\n", hres); @@ -3245,7 +3245,7 @@ static void test_BindToStorage(int protocol, DWORD flags, DWORD t) if(unk) { BYTE buf[512]; - DWORD readed; + DWORD read; IStream *stream; hres = IUnknown_QueryInterface(unk, &IID_IStream, (void**)&stream); @@ -3253,14 +3253,14 @@ static void test_BindToStorage(int protocol, DWORD flags, DWORD t) IUnknown_Release(unk); do { - readed = 0xdeadbeef; - hres = IStream_Read(stream, buf, sizeof(buf), &readed); - ok(readed != 0xdeadbeef, "readed = 0xdeadbeef\n"); - if(emulate_protocol && test_protocol == HTTP_TEST && readed) + read = 0xdeadbeef; + hres = IStream_Read(stream, buf, sizeof(buf), &read); + ok(read != 0xdeadbeef, "read = 0xdeadbeef\n"); + if(emulate_protocol && test_protocol == HTTP_TEST && read) ok(buf[0] == (use_cache_file && !(bindf&BINDF_ASYNCHRONOUS) ? 'X' : '?'), "buf[0] = '%c'\n", buf[0]); }while(hres == S_OK); ok(hres == S_FALSE, "IStream_Read returned %08x\n", hres); - ok(!readed, "readed = %d\n", readed); + ok(!read, "read = %d\n", read); IStream_Release(stream); }

1 0

Francois Gouget : vbscript/tests: Fix the spelling of a vbscript comment.
by Alexandre Julliard Dec. 11, 2019

Dec. 11, 2019

Module: wine Branch: master Commit: 975bc319d59d97bc189a7bbfd0eff2debd970957 URL: https://source.winehq.org/git/wine.git/?a=commit;h=975bc319d59d97bc189a7bbf… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Dec 11 02:57:32 2019 +0100 vbscript/tests: Fix the spelling of a vbscript comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/tests/lang.vbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 6eebe287fe..fb9f96e427 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -1573,7 +1573,7 @@ sub test_dotIdentifiers end sub call test_dotIdentifiers -' Test End statements not required to be preceeded by a newline or separator +' Test End statements not required to be preceded by a newline or separator Sub EndTestSub x = 1 End Sub

1 0

Jacek Caban : winnt.h: Add missing NTSYSAPI attributes.
by Alexandre Julliard Dec. 11, 2019

Dec. 11, 2019

Module: wine Branch: master Commit: 7ceca2183508a5d61d1a309b5e69405dabccde7c URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ceca2183508a5d61d1a309b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 11 14:30:53 2019 +0100 winnt.h: Add missing NTSYSAPI attributes. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnt.h | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index d18b2e03b4..1db7fdd28e 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -1262,7 +1262,7 @@ typedef struct _DISPATCHER_CONTEXT typedef LONG (CALLBACK *PEXCEPTION_FILTER)(struct _EXCEPTION_POINTERS*,PVOID); typedef void (CALLBACK *PTERMINATION_HANDLER)(BOOLEAN,PVOID); -PVOID WINAPI RtlVirtualUnwind(ULONG,ULONG64,ULONG64,RUNTIME_FUNCTION*,CONTEXT*,PVOID*,ULONG64*,KNONVOLATILE_CONTEXT_POINTERS*); +NTSYSAPI PVOID WINAPI RtlVirtualUnwind(ULONG,ULONG64,ULONG64,RUNTIME_FUNCTION*,CONTEXT*,PVOID*,ULONG64*,KNONVOLATILE_CONTEXT_POINTERS*); #define UNW_FLAG_NHANDLER 0 #define UNW_FLAG_EHANDLER 1 @@ -1580,7 +1580,7 @@ typedef struct _KNONVOLATILE_CONTEXT_POINTERS PULONGLONG Cflag; } KNONVOLATILE_CONTEXT_POINTERS, *PKNONVOLATILE_CONTEXT_POINTERS; -ULONGLONG WINAPI RtlVirtualUnwind(ULONGLONG,ULONGLONG,RUNTIME_FUNCTION*,CONTEXT*,BOOLEAN*,FRAME_POINTERS*,KNONVOLATILE_CONTEXT_POINTERS*); +NTSYSAPI ULONGLONG WINAPI RtlVirtualUnwind(ULONGLONG,ULONGLONG,RUNTIME_FUNCTION*,CONTEXT*,BOOLEAN*,FRAME_POINTERS*,KNONVOLATILE_CONTEXT_POINTERS*); #endif /* __ia64__ */ @@ -1829,7 +1829,7 @@ typedef struct _DISPATCHER_CONTEXT typedef LONG (CALLBACK *PEXCEPTION_FILTER)(struct _EXCEPTION_POINTERS*,DWORD); typedef void (CALLBACK *PTERMINATION_HANDLER)(BOOLEAN,DWORD); -PVOID WINAPI RtlVirtualUnwind(DWORD,DWORD,DWORD,RUNTIME_FUNCTION*,CONTEXT*,PVOID*,DWORD*,KNONVOLATILE_CONTEXT_POINTERS*); +NTSYSAPI PVOID WINAPI RtlVirtualUnwind(DWORD,DWORD,DWORD,RUNTIME_FUNCTION*,CONTEXT*,PVOID*,DWORD*,KNONVOLATILE_CONTEXT_POINTERS*); #define UNW_FLAG_NHANDLER 0 #define UNW_FLAG_EHANDLER 1 @@ -2007,7 +2007,7 @@ typedef struct _DISPATCHER_CONTEXT typedef LONG (CALLBACK *PEXCEPTION_FILTER)(struct _EXCEPTION_POINTERS*,DWORD64); typedef void (CALLBACK *PTERMINATION_HANDLER)(BOOLEAN,DWORD64); -PVOID WINAPI RtlVirtualUnwind(DWORD,ULONG_PTR,ULONG_PTR,RUNTIME_FUNCTION*,CONTEXT*,PVOID*,ULONG_PTR*,KNONVOLATILE_CONTEXT_POINTERS*); +NTSYSAPI PVOID WINAPI RtlVirtualUnwind(DWORD,ULONG_PTR,ULONG_PTR,RUNTIME_FUNCTION*,CONTEXT*,PVOID*,ULONG_PTR*,KNONVOLATILE_CONTEXT_POINTERS*); #define UNW_FLAG_NHANDLER 0 #define UNW_FLAG_EHANDLER 1 @@ -2326,14 +2326,14 @@ typedef struct _WOW64_CONTEXT typedef PRUNTIME_FUNCTION (CALLBACK *PGET_RUNTIME_FUNCTION_CALLBACK)(DWORD_PTR,PVOID); -BOOLEAN CDECL RtlAddFunctionTable(RUNTIME_FUNCTION*,DWORD,DWORD_PTR); -DWORD WINAPI RtlAddGrowableFunctionTable(void**,PRUNTIME_FUNCTION,DWORD,DWORD,ULONG_PTR,ULONG_PTR); -BOOLEAN CDECL RtlDeleteFunctionTable(RUNTIME_FUNCTION*); -void WINAPI RtlDeleteGrowableFunctionTable(void*); -void WINAPI RtlGrowFunctionTable(void*,DWORD); -BOOLEAN CDECL RtlInstallFunctionTableCallback(DWORD_PTR,DWORD_PTR,DWORD,PGET_RUNTIME_FUNCTION_CALLBACK,PVOID,PCWSTR); -PRUNTIME_FUNCTION WINAPI RtlLookupFunctionEntry(DWORD_PTR,DWORD_PTR*,UNWIND_HISTORY_TABLE*); -void WINAPI RtlUnwindEx(PVOID,PVOID,struct _EXCEPTION_RECORD*,PVOID,CONTEXT*,UNWIND_HISTORY_TABLE*); +NTSYSAPI BOOLEAN CDECL RtlAddFunctionTable(RUNTIME_FUNCTION*,DWORD,DWORD_PTR); +NTSYSAPI DWORD WINAPI RtlAddGrowableFunctionTable(void**,PRUNTIME_FUNCTION,DWORD,DWORD,ULONG_PTR,ULONG_PTR); +NTSYSAPI BOOLEAN CDECL RtlDeleteFunctionTable(RUNTIME_FUNCTION*); +NTSYSAPI void WINAPI RtlDeleteGrowableFunctionTable(void*); +NTSYSAPI void WINAPI RtlGrowFunctionTable(void*,DWORD); +NTSYSAPI BOOLEAN CDECL RtlInstallFunctionTableCallback(DWORD_PTR,DWORD_PTR,DWORD,PGET_RUNTIME_FUNCTION_CALLBACK,PVOID,PCWSTR); +NTSYSAPI PRUNTIME_FUNCTION WINAPI RtlLookupFunctionEntry(DWORD_PTR,DWORD_PTR*,UNWIND_HISTORY_TABLE*); +NTSYSAPI void WINAPI RtlUnwindEx(PVOID,PVOID,struct _EXCEPTION_RECORD*,PVOID,CONTEXT*,UNWIND_HISTORY_TABLE*); #endif /*

1 0

Alexandre Julliard : ntdll: Add status code for ELOOP error.
by Alexandre Julliard Dec. 11, 2019

Dec. 11, 2019

Module: wine Branch: master Commit: 6731f33d40e3347f7e11614fa1f1be845916456b URL: https://source.winehq.org/git/wine.git/?a=commit;h=6731f33d40e3347f7e11614f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 11 10:28:59 2019 +0100 ntdll: Add status code for ELOOP error. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index dd6d1341b0..a65703d6f9 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -495,6 +495,7 @@ NTSTATUS FILE_GetNtStatus(void) case ECONNRESET:return STATUS_PIPE_DISCONNECTED; case EFAULT: return STATUS_ACCESS_VIOLATION; case ESPIPE: return STATUS_ILLEGAL_FUNCTION; + case ELOOP: return STATUS_REPARSE_POINT_NOT_RESOLVED; #ifdef ETIME /* Missing on FreeBSD */ case ETIME: return STATUS_IO_TIMEOUT; #endif

1 0

Zebediah Figura : qcap/avico: Use base sink connection methods.
by Alexandre Julliard Dec. 11, 2019

Dec. 11, 2019

Module: wine Branch: master Commit: b5ddaa1337fc0b6dc62dcab248fb95de1f5b28f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5ddaa1337fc0b6dc62dcab2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Dec 10 21:53:36 2019 -0600 qcap/avico: Use base sink connection methods. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/avico.c | 58 ++++++++++++++++--------------------------------------- 1 file changed, 17 insertions(+), 41 deletions(-) diff --git a/dlls/qcap/avico.c b/dlls/qcap/avico.c index f822d4e461..ecda162be8 100644 --- a/dlls/qcap/avico.c +++ b/dlls/qcap/avico.c @@ -272,52 +272,13 @@ static const IPersistPropertyBagVtbl PersistPropertyBagVtbl = { AVICompressorPropertyBag_Save }; -static inline AVICompressor *impl_from_IPin(IPin *iface) -{ - return impl_from_strmbase_filter(CONTAINING_RECORD(iface, struct strmbase_pin, IPin_iface)->filter); -} - -static HRESULT WINAPI AVICompressorIn_ReceiveConnection(IPin *iface, - IPin *pConnector, const AM_MEDIA_TYPE *pmt) -{ - AVICompressor *This = impl_from_IPin(iface); - HRESULT hres; - - TRACE("(%p)->(%p AM_MEDIA_TYPE(%p))\n", This, pConnector, pmt); - - hres = BaseInputPinImpl_ReceiveConnection(iface, pConnector, pmt); - if(FAILED(hres)) - return hres; - - hres = fill_format_info(This, (VIDEOINFOHEADER*)pmt->pbFormat); - if(FAILED(hres)) - BaseInputPinImpl_Disconnect(iface); - return hres; -} - -static HRESULT WINAPI AVICompressorIn_Disconnect(IPin *iface) -{ - AVICompressor *This = impl_from_IPin(iface); - HRESULT hres; - - TRACE("(%p)\n", This); - - hres = BaseInputPinImpl_Disconnect(iface); - if(FAILED(hres)) - return hres; - - heap_free(This->videoinfo); - This->videoinfo = NULL; - return S_OK; -} - static const IPinVtbl AVICompressorInputPinVtbl = { BasePinImpl_QueryInterface, BasePinImpl_AddRef, BasePinImpl_Release, BaseInputPinImpl_Connect, - AVICompressorIn_ReceiveConnection, - AVICompressorIn_Disconnect, + BaseInputPinImpl_ReceiveConnection, + BaseInputPinImpl_Disconnect, BasePinImpl_ConnectedTo, BasePinImpl_ConnectionMediaType, BasePinImpl_QueryPinInfo, @@ -465,12 +426,27 @@ static HRESULT WINAPI AVICompressorIn_Receive(struct strmbase_sink *base, IMedia return hres; } +static HRESULT sink_connect(struct strmbase_sink *iface, IPin *peer, const AM_MEDIA_TYPE *mt) +{ + AVICompressor *filter = impl_from_strmbase_pin(&iface->pin); + return fill_format_info(filter, (VIDEOINFOHEADER *)mt->pbFormat); +} + +static void sink_disconnect(struct strmbase_sink *iface) +{ + AVICompressor *filter = impl_from_strmbase_pin(&iface->pin); + heap_free(filter->videoinfo); + filter->videoinfo = NULL; +} + static const struct strmbase_sink_ops sink_ops = { .base.pin_query_accept = sink_query_accept, .base.pin_get_media_type = strmbase_pin_get_media_type, .base.pin_query_interface = sink_query_interface, .pfnReceive = AVICompressorIn_Receive, + .sink_connect = sink_connect, + .sink_disconnect = sink_disconnect, }; static HRESULT source_get_media_type(struct strmbase_pin *base, unsigned int iPosition, AM_MEDIA_TYPE *amt)

1 0