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

Hans Leidekker : winhttp: Handle renegotiate requests.
by Alexandre Julliard April 7, 2020

April 7, 2020

Module: wine Branch: master Commit: 034b5e70cebfaa56f6b351e91183c580b64a5e11 URL: https://source.winehq.org/git/wine.git/?a=commit;h=034b5e70cebfaa56f6b351e9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 7 10:22:05 2020 +0200 winhttp: Handle renegotiate requests. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/net.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index c88def5b51..2905d5c535 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -484,6 +484,10 @@ static DWORD read_ssl_chunk( struct netconn *conn, void *buf, SIZE_T buf_size, S case SEC_E_OK: break; + case SEC_I_RENEGOTIATE: + TRACE("renegotiate\n"); + return ERROR_WINHTTP_CLIENT_AUTH_CERT_NEEDED; + case SEC_I_CONTEXT_EXPIRED: TRACE("context expired\n"); *eof = TRUE;

1 0

Rémi Bernon : winedbg: Don't wait or load the wine loader module.
by Alexandre Julliard April 7, 2020

April 7, 2020

Module: wine Branch: master Commit: 86ed5e563dc75bc5dae30f9647eefa63efb132d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=86ed5e563dc75bc5dae30f96… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Apr 7 19:34:16 2020 +0200 winedbg: Don't wait or load the wine loader module. Sometimes it's not there and now that we have qXfer:libraries:read request support, we don't need to tell gdb to load it. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/gdbproxy.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 3903f11347..b3c4002b3b 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -2094,7 +2094,7 @@ static int fetch_data(struct gdb_context* gdbctx) #define FLAG_NO_START 1 #define FLAG_WITH_XTERM 2 -static BOOL gdb_exec(const char* wine_path, unsigned port, unsigned flags) +static BOOL gdb_exec(unsigned port, unsigned flags) { char buf[MAX_PATH]; int fd; @@ -2108,7 +2108,6 @@ static BOOL gdb_exec(const char* wine_path, unsigned port, unsigned flags) fd = mkstemps(buf, 0); if (fd == -1) return FALSE; if ((f = fdopen(fd, "w+")) == NULL) return FALSE; - fprintf(f, "file \"%s\"\n", wine_path); fprintf(f, "target remote localhost:%d\n", ntohs(port)); fprintf(f, "set prompt Wine-gdb>\\ \n"); /* gdb 5.1 seems to require it, won't hurt anyway */ @@ -2138,7 +2137,6 @@ static BOOL gdb_startup(struct gdb_context* gdbctx, unsigned flags, unsigned por struct sockaddr_in s_addrs = {0}; socklen_t s_len = sizeof(s_addrs); struct pollfd pollfd; - IMAGEHLP_MODULE64 imh_mod; BOOL ret = FALSE; /* step 1: create socket for gdb connection request */ @@ -2160,11 +2158,7 @@ static BOOL gdb_startup(struct gdb_context* gdbctx, unsigned flags, unsigned por /* step 2: do the process internal creation */ handle_debug_event(gdbctx); - /* step3: get the wine loader name */ - if (!dbg_get_debuggee_info(gdbctx->process->handle, &imh_mod)) - goto cleanup; - - /* step 4: fire up gdb (if requested) */ + /* step 3: fire up gdb (if requested) */ if (flags & FLAG_NO_START) fprintf(stderr, "target remote localhost:%d\n", ntohs(s_addrs.sin_port)); else @@ -2177,12 +2171,12 @@ static BOOL gdb_startup(struct gdb_context* gdbctx, unsigned flags, unsigned por signal(SIGINT, SIG_IGN); break; case 0: /* in child... and alive */ - gdb_exec(imh_mod.LoadedImageName, s_addrs.sin_port, flags); + gdb_exec(s_addrs.sin_port, flags); /* if we're here, exec failed, so report failure */ goto cleanup; } - /* step 5: wait for gdb to connect actually */ + /* step 4: wait for gdb to connect actually */ pollfd.fd = sock; pollfd.events = POLLIN; pollfd.revents = 0;

1 0

Rémi Bernon : winedbg: Use debug event code in packet_reply_status.
by Alexandre Julliard April 7, 2020

April 7, 2020

Module: wine Branch: master Commit: dafa8b52d081c21befe44831bd3f94e619330adf URL: https://source.winehq.org/git/wine.git/?a=commit;h=dafa8b52d081c21befe44831… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Apr 7 19:34:17 2020 +0200 winedbg: Use debug event code in packet_reply_status. This will help expand later the cases to tell gdb about the cause of the break. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/gdbproxy.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index b3c4002b3b..332fb0c9d3 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -874,10 +874,11 @@ static enum packet_return packet_reply_status(struct gdb_context* gdbctx) dbg_ctx_t ctx; size_t i; - if (process != NULL) + switch (gdbctx->de.dwDebugEventCode) { + default: + if (!process) return packet_error; if (!(backend = process->be_cpu)) return packet_error; - if (!(thread = dbg_get_thread(process, gdbctx->de.dwThreadId)) || !backend->get_context(thread->handle, &ctx)) return packet_error; @@ -900,13 +901,13 @@ static enum packet_return packet_reply_status(struct gdb_context* gdbctx) packet_reply_close(gdbctx); return packet_done; - } - else - { - /* Try to put an exit code - * Cannot use GetExitCodeProcess, wouldn't fit in a 8 bit value, so - * just indicate the end of process and exit */ - return packet_reply(gdbctx, "W00") | packet_last_f; + + case EXIT_PROCESS_DEBUG_EVENT: + packet_reply_open(gdbctx); + packet_reply_add(gdbctx, "W"); + packet_reply_val(gdbctx, gdbctx->de.u.ExitProcess.dwExitCode, 4); + packet_reply_close(gdbctx); + return packet_done | packet_last_f; } }

1 0

Dmitry Timoshkov : adsldp: Map "1.3.6.1.4.1.1466.115.121.1.24" to ADSTYPE_UTC_TIME.
by Alexandre Julliard April 7, 2020

April 7, 2020

Module: wine Branch: master Commit: c7656ffd186a480a7bf269a8fe3e234366909434 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7656ffd186a480a7bf269a8… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Apr 7 18:14:03 2020 +0800 adsldp: Map "1.3.6.1.4.1.1466.115.121.1.24" to ADSTYPE_UTC_TIME. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/adsldp.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ dlls/adsldp/schema.c | 2 ++ 2 files changed, 46 insertions(+) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index f2773262a6..8897545e4f 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -1528,6 +1528,50 @@ static HRESULT add_column_values(LDAP_namespace *ldap, struct ldap_search_contex col->hReserved = values; break; } + + case ADSTYPE_UTC_TIME: + { + struct berval **values = ldap_get_values_lenW(ldap->ld, ldap_ctx->entry, name); + if (!values) + return E_ADS_COLUMN_NOT_SET; + count = ldap_count_values_len(values); + + col->pADsValues = heap_alloc_zero(count * sizeof(col->pADsValues[0])); + if (!col->pADsValues) + { + ldap_value_free_len(values); + return E_OUTOFMEMORY; + } + + for (i = 0; i < count; i++) + { + col->pADsValues[i].dwType = type; + if (values[i]->bv_len < 14 || + _snscanf_l(values[i]->bv_val, values[i]->bv_len, "%04u%02u%02u%02u%02u%02u", NULL, + &col->pADsValues[i].u.UTCTime.wYear, &col->pADsValues[i].u.UTCTime.wMonth, + &col->pADsValues[i].u.UTCTime.wDay, &col->pADsValues[i].u.UTCTime.wHour, + &col->pADsValues[i].u.UTCTime.wMinute, &col->pADsValues[i].u.UTCTime.wSecond) != 6) + { + FIXME("not recognized UTCTime: %s\n", debugstr_an(values[i]->bv_val, values[i]->bv_len)); + memset(&col->pADsValues[i].u.UTCTime, 0, sizeof(col->pADsValues[i].u.UTCTime)); + continue; + } + + if ((values[i]->bv_val[14] != '.' && values[i]->bv_val[14] != ',') || + values[i]->bv_val[15] != '0' || values[i]->bv_val[16] != 'Z') + FIXME("not handled time zone: %s\n", debugstr_an(values[i]->bv_val + 14, values[i]->bv_len - 14)); + + TRACE("%s => %02u.%02u.%04u %02u:%02u:%02u\n", debugstr_an(values[i]->bv_val, values[i]->bv_len), + col->pADsValues[i].u.UTCTime.wDay, col->pADsValues[i].u.UTCTime.wMonth, + col->pADsValues[i].u.UTCTime.wYear, col->pADsValues[i].u.UTCTime.wHour, + col->pADsValues[i].u.UTCTime.wMinute, col->pADsValues[i].u.UTCTime.wSecond); + } + + ldap_value_free_len(values); + col->hReserved = NULL; + break; + } + } col->dwADsType = type; diff --git a/dlls/adsldp/schema.c b/dlls/adsldp/schema.c index f0ecfc3ac6..6965dc3274 100644 --- a/dlls/adsldp/schema.c +++ b/dlls/adsldp/schema.c @@ -93,6 +93,8 @@ ADSTYPEENUM get_schema_type(const WCHAR *name, const struct attribute_type *at, return ADSTYPE_DN_STRING; if (!wcscmp(type->syntax, L"1.3.6.1.4.1.1466.115.121.1.15")) return ADSTYPE_CASE_IGNORE_STRING; + if (!wcscmp(type->syntax, L"1.3.6.1.4.1.1466.115.121.1.24")) + return ADSTYPE_UTC_TIME; if (!wcscmp(type->syntax, L"1.3.6.1.4.1.1466.115.121.1.27")) return ADSTYPE_INTEGER; if (!wcscmp(type->syntax, L"1.3.6.1.4.1.1466.115.121.1.38"))

1 0

Chip Davis : d2d1: Introduce a function to convert D2D1.0 interpolation modes to D2D1.1.
by Alexandre Julliard April 7, 2020

April 7, 2020

Module: wine Branch: master Commit: e771fc8dde7d124429908dab157591d1287a3e1d URL: https://source.winehq.org/git/wine.git/?a=commit;h=e771fc8dde7d124429908dab… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Mon Apr 6 17:51:59 2020 -0500 d2d1: Introduce a function to convert D2D1.0 interpolation modes to D2D1.1. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/brush.c | 2 +- dlls/d2d1/d2d1_private.h | 5 +++++ dlls/d2d1/device.c | 3 ++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index 675fa52e72..1f455897f6 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -962,7 +962,7 @@ static void STDMETHODCALLTYPE d2d_bitmap_brush_SetInterpolationMode(ID2D1BitmapB return; } - brush->u.bitmap.interpolation_mode = mode; + brush->u.bitmap.interpolation_mode = d2d1_1_interp_mode_from_d2d1(mode); if (brush->u.bitmap.sampler_state) { ID3D10SamplerState_Release(brush->u.bitmap.sampler_state); diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index a2546a5b1c..4eb7e33142 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -634,6 +634,11 @@ static inline void d2d_rect_expand(D2D1_RECT_F *dst, const D2D1_POINT_2F *point) dst->bottom = point->y; } +static inline D2D1_INTERPOLATION_MODE d2d1_1_interp_mode_from_d2d1(D2D1_BITMAP_INTERPOLATION_MODE mode) +{ + return (D2D1_INTERPOLATION_MODE)mode; +} + static inline const char *debug_d2d_point_2f(const D2D1_POINT_2F *point) { if (!point) diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 146f7009da..acecb2058a 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -1143,7 +1143,8 @@ static void STDMETHODCALLTYPE d2d_device_context_DrawBitmap(ID2D1DeviceContext * return; } - d2d_device_context_draw_bitmap(context, bitmap, dst_rect, opacity, interpolation_mode, src_rect, NULL); + d2d_device_context_draw_bitmap(context, bitmap, dst_rect, opacity, d2d1_1_interp_mode_from_d2d1(interpolation_mode), + src_rect, NULL); } static void STDMETHODCALLTYPE d2d_device_context_DrawText(ID2D1DeviceContext *iface,

1 0

Nikolay Sivov : include: Add ISpatialAudioClient definition.
by Alexandre Julliard April 7, 2020

April 7, 2020

Module: wine Branch: master Commit: 138aee4fc581502cff0134d05e88e83973490b3c URL: https://source.winehq.org/git/wine.git/?a=commit;h=138aee4fc581502cff0134d0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 7 18:09:16 2020 +0300 include: Add ISpatialAudioClient definition. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/spatialaudioclient.idl | 100 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 101 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index eea1543822..778818dca5 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -628,6 +628,7 @@ SOURCES = \ slpublic.h \ snmp.h \ softpub.h \ + spatialaudioclient.idl \ sperror.h \ sql.h \ sqlext.h \ diff --git a/include/spatialaudioclient.idl b/include/spatialaudioclient.idl new file mode 100644 index 0000000000..16a1541fd1 --- /dev/null +++ b/include/spatialaudioclient.idl @@ -0,0 +1,100 @@ +/* + * Copyright 2020 Nikolay Sivov for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "unknwn.idl"; +import "audioclient.idl"; +import "propsys.idl"; + +typedef [v1_enum] enum AudioObjectType +{ + AudioObjectType_None = 0, + AudioObjectType_Dynamic = 0x00000001, + AudioObjectType_FrontLeft = 0x00000002, + AudioObjectType_FrontRight = 0x00000004, + AudioObjectType_FrontCenter = 0x00000008, + AudioObjectType_LowFrequency = 0x00000010, + AudioObjectType_SideLeft = 0x00000020, + AudioObjectType_SideRight = 0x00000040, + AudioObjectType_BackLeft = 0x00000080, + AudioObjectType_BackRight = 0x00000100, + AudioObjectType_TopFrontLeft = 0x00000200, + AudioObjectType_TopFrontRight = 0x00000400, + AudioObjectType_TopBackLeft = 0x00000800, + AudioObjectType_TopBackRight = 0x00001000, + AudioObjectType_BottomFrontLeft = 0x00002000, + AudioObjectType_BottomFrontRight = 0x00004000, + AudioObjectType_BottomBackLeft = 0x00008000, + AudioObjectType_BottomBackRight = 0x00010000, + AudioObjectType_BackCenter = 0x00020000, +} AudioObjectType; + +[ + object, + uuid(dcdaa858-895a-4a22-a5eb-67bda506096d), + pointer_default(unique), + local +] +interface IAudioFormatEnumerator : IUnknown +{ + HRESULT GetCount( + [out] UINT32 *count); + + HRESULT GetFormat( + [in] UINT32 index, + [out] WAVEFORMATEX **format); +} + +[ + object, + uuid(bbf8e066-aaaa-49be-9a4d-fd2a858ea27f), + pointer_default(unique), + local +] +interface ISpatialAudioClient : IUnknown +{ + HRESULT GetStaticObjectPosition( + [in] AudioObjectType type, + [out] float *x, + [out] float *y, + [out] float *z); + + HRESULT GetNativeStaticObjectTypeMask( + [out] AudioObjectType *mask); + + HRESULT GetMaxDynamicObjectCount( + [out] UINT32 *value); + + HRESULT GetSupportedAudioObjectFormatEnumerator( + [out] IAudioFormatEnumerator **enumerator); + + HRESULT GetMaxFrameCount( + [in] WAVEFORMATEX const *format, + [out] UINT32 *count); + + HRESULT IsAudioObjectFormatSupported( + [in] WAVEFORMATEX const *format); + + HRESULT IsSpatialAudioStreamAvailable( + [in] REFIID stream_uuid, + [in] PROPVARIANT const *info); + + HRESULT ActivateSpatialAudioStream( + [in] PROPVARIANT const *params, + [in] REFIID riid, + [out, iid_is(riid)] void **stream); +}

1 0

Nikolay Sivov : mf: Return sink flags for SAR.
by Alexandre Julliard April 7, 2020

April 7, 2020

Module: wine Branch: master Commit: 0070860ef8cee982617bd66243b372e0df81ad95 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0070860ef8cee982617bd662… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 7 10:54:59 2020 +0300 mf: Return sink flags for SAR. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/sar.c | 11 +++++++++-- dlls/mf/tests/mf.c | 13 ++++++++++++- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/mf/sar.c b/dlls/mf/sar.c index 3c6820cd68..90098b93bd 100644 --- a/dlls/mf/sar.c +++ b/dlls/mf/sar.c @@ -99,9 +99,16 @@ static ULONG WINAPI audio_renderer_sink_Release(IMFMediaSink *iface) static HRESULT WINAPI audio_renderer_sink_GetCharacteristics(IMFMediaSink *iface, DWORD *flags) { - FIXME("%p, %p.\n", iface, flags); + struct audio_renderer *renderer = impl_from_IMFMediaSink(iface); - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, flags); + + if (renderer->is_shut_down) + return MF_E_SHUTDOWN; + + *flags = MEDIASINK_FIXED_STREAMS | MEDIASINK_CAN_PREROLL; + + return S_OK; } static HRESULT WINAPI audio_renderer_sink_AddStreamSink(IMFMediaSink *iface, DWORD stream_sink_id, diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 578c5bcaf7..e278f73ef1 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -2639,6 +2639,7 @@ static void test_sar(void) MFCLOCK_STATE state; DWORD flags, count; IMFClock *clock; + IUnknown *unk; HRESULT hr; hr = CoInitialize(NULL); @@ -2693,6 +2694,14 @@ if (SUCCEEDED(hr)) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(count == 1, "Unexpected count %u.\n", count); + hr = IMFMediaSink_GetCharacteristics(sink, &flags); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(flags == (MEDIASINK_FIXED_STREAMS | MEDIASINK_CAN_PREROLL), "Unexpected flags %#x.\n", flags); + + hr = IMFMediaSink_QueryInterface(sink, &IID_IMFMediaSinkPreroll, (void **)&unk); + ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr); + IUnknown_Release(unk); + /* Shutdown */ hr = IMFMediaSink_Shutdown(sink); ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); @@ -2712,6 +2721,9 @@ if (SUCCEEDED(hr)) hr = IMFMediaSink_GetStreamSinkCount(sink, &count); ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + hr = IMFMediaSink_GetCharacteristics(sink, &flags); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + IMFMediaSink_Release(sink); /* Activation */ @@ -2727,7 +2739,6 @@ if (SUCCEEDED(hr)) IMFMediaSink_Release(sink2); hr = IMFMediaSink_GetCharacteristics(sink, &flags); -todo_wine ok(hr == S_OK, "Failed to get sink flags, hr %#x.\n", hr); hr = IMFActivate_ShutdownObject(activate);

1 0

Nikolay Sivov : mf: Add IMFMediaSinkPreroll stub for SAR.
by Alexandre Julliard April 7, 2020

April 7, 2020

Module: wine Branch: master Commit: 509bef711ffdc60f59ff58d031545f46485024e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=509bef711ffdc60f59ff58d0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 7 10:54:58 2020 +0300 mf: Add IMFMediaSinkPreroll stub for SAR. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/sar.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 55 insertions(+), 5 deletions(-) diff --git a/dlls/mf/sar.c b/dlls/mf/sar.c index ca8800b06c..3c6820cd68 100644 --- a/dlls/mf/sar.c +++ b/dlls/mf/sar.c @@ -30,6 +30,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mfplat); struct audio_renderer { IMFMediaSink IMFMediaSink_iface; + IMFMediaSinkPreroll IMFMediaSinkPreroll_iface; LONG refcount; BOOL is_shut_down; CRITICAL_SECTION cs; @@ -40,21 +41,36 @@ static struct audio_renderer *impl_from_IMFMediaSink(IMFMediaSink *iface) return CONTAINING_RECORD(iface, struct audio_renderer, IMFMediaSink_iface); } +static struct audio_renderer *impl_from_IMFMediaSinkPreroll(IMFMediaSinkPreroll *iface) +{ + return CONTAINING_RECORD(iface, struct audio_renderer, IMFMediaSinkPreroll_iface); +} + static HRESULT WINAPI audio_renderer_sink_QueryInterface(IMFMediaSink *iface, REFIID riid, void **obj) { + struct audio_renderer *renderer = impl_from_IMFMediaSink(iface); + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); if (IsEqualIID(riid, &IID_IMFMediaSink) || IsEqualIID(riid, &IID_IUnknown)) { *obj = iface; - IMFMediaSink_AddRef(iface); - return S_OK; + } + else if (IsEqualIID(riid, &IID_IMFMediaSinkPreroll)) + { + *obj = &renderer->IMFMediaSinkPreroll_iface; + } + else + { + WARN("Unsupported %s.\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; } - WARN("Unsupported %s.\n", debugstr_guid(riid)); - *obj = NULL; - return E_NOINTERFACE; + IUnknown_AddRef((IUnknown *)*obj); + + return S_OK; } static ULONG WINAPI audio_renderer_sink_AddRef(IMFMediaSink *iface) @@ -186,6 +202,39 @@ static const IMFMediaSinkVtbl audio_renderer_sink_vtbl = audio_renderer_sink_Shutdown, }; +static HRESULT WINAPI audio_renderer_preroll_QueryInterface(IMFMediaSinkPreroll *iface, REFIID riid, void **obj) +{ + struct audio_renderer *renderer = impl_from_IMFMediaSinkPreroll(iface); + return IMFMediaSink_QueryInterface(&renderer->IMFMediaSink_iface, riid, obj); +} + +static ULONG WINAPI audio_renderer_preroll_AddRef(IMFMediaSinkPreroll *iface) +{ + struct audio_renderer *renderer = impl_from_IMFMediaSinkPreroll(iface); + return IMFMediaSink_AddRef(&renderer->IMFMediaSink_iface); +} + +static ULONG WINAPI audio_renderer_preroll_Release(IMFMediaSinkPreroll *iface) +{ + struct audio_renderer *renderer = impl_from_IMFMediaSinkPreroll(iface); + return IMFMediaSink_Release(&renderer->IMFMediaSink_iface); +} + +static HRESULT WINAPI audio_renderer_preroll_NotifyPreroll(IMFMediaSinkPreroll *iface, MFTIME start_time) +{ + FIXME("%p, %s.\n", iface, debugstr_time(start_time)); + + return E_NOTIMPL; +} + +static const IMFMediaSinkPrerollVtbl audio_renderer_preroll_vtbl = +{ + audio_renderer_preroll_QueryInterface, + audio_renderer_preroll_AddRef, + audio_renderer_preroll_Release, + audio_renderer_preroll_NotifyPreroll, +}; + static HRESULT sar_create_object(IMFAttributes *attributes, void *user_context, IUnknown **obj) { struct audio_renderer *renderer; @@ -196,6 +245,7 @@ static HRESULT sar_create_object(IMFAttributes *attributes, void *user_context, return E_OUTOFMEMORY; renderer->IMFMediaSink_iface.lpVtbl = &audio_renderer_sink_vtbl; + renderer->IMFMediaSinkPreroll_iface.lpVtbl = &audio_renderer_preroll_vtbl; renderer->refcount = 1; InitializeCriticalSection(&renderer->cs);

1 0

Andrew Guertin : d3d11: Stop warning about depth stencil view flags.
by Alexandre Julliard April 7, 2020

April 7, 2020

Module: wine Branch: master Commit: 1dd9b53a6a97de4f49f4a3f16fa40007e03c0a3f URL: https://source.winehq.org/git/wine.git/?a=commit;h=1dd9b53a6a97de4f49f4a3f1… Author: Andrew Guertin <aguertin+wine(a)aguertin.net> Date: Tue Apr 7 01:52:34 2020 -0400 d3d11: Stop warning about depth stencil view flags. Support for these flags was added in 600f39d4. Signed-off-by: Andrew Guertin <aguertin+wine(a)aguertin.net> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/view.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c index 40037989eb..4393d6540e 100644 --- a/dlls/d3d11/view.c +++ b/dlls/d3d11/view.c @@ -1212,9 +1212,6 @@ static void wined3d_depth_stencil_view_desc_from_d3d11(struct wined3d_view_desc { wined3d_desc->format_id = wined3dformat_from_dxgi_format(desc->Format); - if (desc->Flags) - FIXME("Unhandled depth stencil view flags %#x.\n", desc->Flags); - wined3d_desc->flags = 0; if (desc->Flags & D3D11_DSV_READ_ONLY_DEPTH) wined3d_desc->flags |= WINED3D_VIEW_READ_ONLY_DEPTH;

1 0

Nikolay Sivov : mf: Add event queue for SAR sink.
by Alexandre Julliard April 7, 2020

April 7, 2020

Module: wine Branch: master Commit: 0d5b9cdfa0c9b9146a7e5ae215107d5a93fcd621 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d5b9cdfa0c9b9146a7e5ae2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 7 10:55:00 2020 +0300 mf: Add event queue for SAR sink. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/sar.c | 94 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/mf/tests/mf.c | 5 +++ 2 files changed, 99 insertions(+) diff --git a/dlls/mf/sar.c b/dlls/mf/sar.c index 90098b93bd..71fd4ed850 100644 --- a/dlls/mf/sar.c +++ b/dlls/mf/sar.c @@ -18,6 +18,7 @@ #define COBJMACROS +#include "mfapi.h" #include "mfidl.h" #include "mferror.h" #include "mf_private.h" @@ -31,7 +32,9 @@ struct audio_renderer { IMFMediaSink IMFMediaSink_iface; IMFMediaSinkPreroll IMFMediaSinkPreroll_iface; + IMFMediaEventGenerator IMFMediaEventGenerator_iface; LONG refcount; + IMFMediaEventQueue *event_queue; BOOL is_shut_down; CRITICAL_SECTION cs; }; @@ -46,6 +49,11 @@ static struct audio_renderer *impl_from_IMFMediaSinkPreroll(IMFMediaSinkPreroll return CONTAINING_RECORD(iface, struct audio_renderer, IMFMediaSinkPreroll_iface); } +static struct audio_renderer *impl_from_IMFMediaEventGenerator(IMFMediaEventGenerator *iface) +{ + return CONTAINING_RECORD(iface, struct audio_renderer, IMFMediaEventGenerator_iface); +} + static HRESULT WINAPI audio_renderer_sink_QueryInterface(IMFMediaSink *iface, REFIID riid, void **obj) { struct audio_renderer *renderer = impl_from_IMFMediaSink(iface); @@ -61,6 +69,10 @@ static HRESULT WINAPI audio_renderer_sink_QueryInterface(IMFMediaSink *iface, RE { *obj = &renderer->IMFMediaSinkPreroll_iface; } + else if (IsEqualIID(riid, &IID_IMFMediaEventGenerator)) + { + *obj = &renderer->IMFMediaEventGenerator_iface; + } else { WARN("Unsupported %s.\n", debugstr_guid(riid)); @@ -90,6 +102,8 @@ static ULONG WINAPI audio_renderer_sink_Release(IMFMediaSink *iface) if (!refcount) { + if (renderer->event_queue) + IMFMediaEventQueue_Release(renderer->event_queue); DeleteCriticalSection(&renderer->cs); heap_free(renderer); } @@ -188,6 +202,7 @@ static HRESULT WINAPI audio_renderer_sink_Shutdown(IMFMediaSink *iface) EnterCriticalSection(&renderer->cs); renderer->is_shut_down = TRUE; + IMFMediaEventQueue_Shutdown(renderer->event_queue); LeaveCriticalSection(&renderer->cs); return S_OK; @@ -242,9 +257,78 @@ static const IMFMediaSinkPrerollVtbl audio_renderer_preroll_vtbl = audio_renderer_preroll_NotifyPreroll, }; +static HRESULT WINAPI audio_renderer_events_QueryInterface(IMFMediaEventGenerator *iface, REFIID riid, void **obj) +{ + struct audio_renderer *renderer = impl_from_IMFMediaEventGenerator(iface); + return IMFMediaSink_QueryInterface(&renderer->IMFMediaSink_iface, riid, obj); +} + +static ULONG WINAPI audio_renderer_events_AddRef(IMFMediaEventGenerator *iface) +{ + struct audio_renderer *renderer = impl_from_IMFMediaEventGenerator(iface); + return IMFMediaSink_AddRef(&renderer->IMFMediaSink_iface); +} + +static ULONG WINAPI audio_renderer_events_Release(IMFMediaEventGenerator *iface) +{ + struct audio_renderer *renderer = impl_from_IMFMediaEventGenerator(iface); + return IMFMediaSink_Release(&renderer->IMFMediaSink_iface); +} + +static HRESULT WINAPI audio_renderer_events_GetEvent(IMFMediaEventGenerator *iface, DWORD flags, IMFMediaEvent **event) +{ + struct audio_renderer *renderer = impl_from_IMFMediaEventGenerator(iface); + + TRACE("%p, %#x, %p.\n", iface, flags, event); + + return IMFMediaEventQueue_GetEvent(renderer->event_queue, flags, event); +} + +static HRESULT WINAPI audio_renderer_events_BeginGetEvent(IMFMediaEventGenerator *iface, IMFAsyncCallback *callback, + IUnknown *state) +{ + struct audio_renderer *renderer = impl_from_IMFMediaEventGenerator(iface); + + TRACE("%p, %p, %p.\n", iface, callback, state); + + return IMFMediaEventQueue_BeginGetEvent(renderer->event_queue, callback, state); +} + +static HRESULT WINAPI audio_renderer_events_EndGetEvent(IMFMediaEventGenerator *iface, IMFAsyncResult *result, + IMFMediaEvent **event) +{ + struct audio_renderer *renderer = impl_from_IMFMediaEventGenerator(iface); + + TRACE("%p, %p, %p.\n", iface, result, event); + + return IMFMediaEventQueue_EndGetEvent(renderer->event_queue, result, event); +} + +static HRESULT WINAPI audio_renderer_events_QueueEvent(IMFMediaEventGenerator *iface, MediaEventType event_type, + REFGUID ext_type, HRESULT hr, const PROPVARIANT *value) +{ + struct audio_renderer *renderer = impl_from_IMFMediaEventGenerator(iface); + + TRACE("%p, %u, %s, %#x, %p.\n", iface, event_type, debugstr_guid(ext_type), hr, value); + + return IMFMediaEventQueue_QueueEventParamVar(renderer->event_queue, event_type, ext_type, hr, value); +} + +static const IMFMediaEventGeneratorVtbl audio_renderer_events_vtbl = +{ + audio_renderer_events_QueryInterface, + audio_renderer_events_AddRef, + audio_renderer_events_Release, + audio_renderer_events_GetEvent, + audio_renderer_events_BeginGetEvent, + audio_renderer_events_EndGetEvent, + audio_renderer_events_QueueEvent, +}; + static HRESULT sar_create_object(IMFAttributes *attributes, void *user_context, IUnknown **obj) { struct audio_renderer *renderer; + HRESULT hr; TRACE("%p, %p, %p.\n", attributes, user_context, obj); @@ -253,12 +337,22 @@ static HRESULT sar_create_object(IMFAttributes *attributes, void *user_context, renderer->IMFMediaSink_iface.lpVtbl = &audio_renderer_sink_vtbl; renderer->IMFMediaSinkPreroll_iface.lpVtbl = &audio_renderer_preroll_vtbl; + renderer->IMFMediaEventGenerator_iface.lpVtbl = &audio_renderer_events_vtbl; renderer->refcount = 1; InitializeCriticalSection(&renderer->cs); + if (FAILED(hr = MFCreateEventQueue(&renderer->event_queue))) + goto failed; + *obj = (IUnknown *)&renderer->IMFMediaSink_iface; return S_OK; + +failed: + + IMFMediaSink_Release(&renderer->IMFMediaSink_iface); + + return hr; } static void sar_shutdown_object(void *user_context, IUnknown *obj) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index e278f73ef1..fcbbde36fb 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -2702,6 +2702,11 @@ if (SUCCEEDED(hr)) ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr); IUnknown_Release(unk); + /* Events */ + hr = IMFMediaSink_QueryInterface(sink, &IID_IMFMediaEventGenerator, (void **)&unk); + ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr); + IUnknown_Release(unk); + /* Shutdown */ hr = IMFMediaSink_Shutdown(sink); ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr);

1 0