October 2021 - Wine-commits

Zebediah Figura : winegstreamer: Implement IWMSyncReader::GetOutputProps().
by Alexandre Julliard 28 Oct '21

28 Oct '21

Module: wine Branch: master Commit: 0dc309ef6ac54484d92f6558d6ca2f8e50eb28e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0dc309ef6ac54484d92f6558… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Oct 28 11:45:57 2021 -0500 winegstreamer: Implement IWMSyncReader::GetOutputProps(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_private.h | 2 + dlls/winegstreamer/wm_reader.c | 133 +++++++++++++++++++++++++++++++++++++ dlls/winegstreamer/wm_syncreader.c | 11 +-- dlls/wmvcore/tests/wmvcore.c | 51 +++++++------- 4 files changed, 165 insertions(+), 32 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 7d5828a15d6..db715a9ad70 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -153,6 +153,8 @@ struct wm_reader_ops void wm_reader_cleanup(struct wm_reader *reader); HRESULT wm_reader_close(struct wm_reader *reader); +HRESULT wm_reader_get_output_props(struct wm_reader *reader, DWORD output, + IWMOutputMediaProps **props); void wm_reader_init(struct wm_reader *reader, const struct wm_reader_ops *ops); HRESULT wm_reader_open_stream(struct wm_reader *reader, IStream *stream); diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index feb000c96ed..2a93e6e1d35 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -20,6 +20,122 @@ WINE_DEFAULT_DEBUG_CHANNEL(wmvcore); +static struct wm_stream *get_stream_by_output_number(struct wm_reader *reader, DWORD output) +{ + if (output < reader->stream_count) + return &reader->streams[output]; + WARN("Invalid output number %u.\n", output); + return NULL; +} + +struct output_props +{ + IWMOutputMediaProps IWMOutputMediaProps_iface; + LONG refcount; +}; + +static inline struct output_props *impl_from_IWMOutputMediaProps(IWMOutputMediaProps *iface) +{ + return CONTAINING_RECORD(iface, struct output_props, IWMOutputMediaProps_iface); +} + +static HRESULT WINAPI output_props_QueryInterface(IWMOutputMediaProps *iface, REFIID iid, void **out) +{ + struct output_props *props = impl_from_IWMOutputMediaProps(iface); + + TRACE("props %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_IUnknown) || IsEqualGUID(iid, &IID_IWMOutputMediaProps)) + *out = &props->IWMOutputMediaProps_iface; + else + { + *out = NULL; + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown *)*out); + return S_OK; +} + +static ULONG WINAPI output_props_AddRef(IWMOutputMediaProps *iface) +{ + struct output_props *props = impl_from_IWMOutputMediaProps(iface); + ULONG refcount = InterlockedIncrement(&props->refcount); + + TRACE("%p increasing refcount to %u.\n", props, refcount); + + return refcount; +} + +static ULONG WINAPI output_props_Release(IWMOutputMediaProps *iface) +{ + struct output_props *props = impl_from_IWMOutputMediaProps(iface); + ULONG refcount = InterlockedDecrement(&props->refcount); + + TRACE("%p decreasing refcount to %u.\n", props, refcount); + + if (!refcount) + free(props); + + return refcount; +} + +static HRESULT WINAPI output_props_GetType(IWMOutputMediaProps *iface, GUID *major_type) +{ + FIXME("iface %p, major_type %p, stub!\n", iface, major_type); + return E_NOTIMPL; +} + +static HRESULT WINAPI output_props_GetMediaType(IWMOutputMediaProps *iface, WM_MEDIA_TYPE *mt, DWORD *size) +{ + FIXME("iface %p, mt %p, size %p, stub!\n", iface, mt, size); + return E_NOTIMPL; +} + +static HRESULT WINAPI output_props_SetMediaType(IWMOutputMediaProps *iface, WM_MEDIA_TYPE *mt) +{ + FIXME("iface %p, mt %p, stub!\n", iface, mt); + return E_NOTIMPL; +} + +static HRESULT WINAPI output_props_GetStreamGroupName(IWMOutputMediaProps *iface, WCHAR *name, WORD *len) +{ + FIXME("iface %p, name %p, len %p, stub!\n", iface, name, len); + return E_NOTIMPL; +} + +static HRESULT WINAPI output_props_GetConnectionName(IWMOutputMediaProps *iface, WCHAR *name, WORD *len) +{ + FIXME("iface %p, name %p, len %p, stub!\n", iface, name, len); + return E_NOTIMPL; +} + +static const struct IWMOutputMediaPropsVtbl output_props_vtbl = +{ + output_props_QueryInterface, + output_props_AddRef, + output_props_Release, + output_props_GetType, + output_props_GetMediaType, + output_props_SetMediaType, + output_props_GetStreamGroupName, + output_props_GetConnectionName, +}; + +static IWMOutputMediaProps *output_props_create(void) +{ + struct output_props *object; + + if (!(object = calloc(1, sizeof(*object)))) + return NULL; + object->IWMOutputMediaProps_iface.lpVtbl = &output_props_vtbl; + object->refcount = 1; + + TRACE("Created output properties %p.\n", object); + return &object->IWMOutputMediaProps_iface; +} + struct stream_config { IWMStreamConfig IWMStreamConfig_iface; @@ -1116,6 +1232,23 @@ HRESULT wm_reader_close(struct wm_reader *reader) return S_OK; } +HRESULT wm_reader_get_output_props(struct wm_reader *reader, DWORD output, IWMOutputMediaProps **props) +{ + struct wm_stream *stream; + + EnterCriticalSection(&reader->cs); + + if (!(stream = get_stream_by_output_number(reader, output))) + { + LeaveCriticalSection(&reader->cs); + return E_INVALIDARG; + } + + *props = output_props_create(); + LeaveCriticalSection(&reader->cs); + return *props ? S_OK : E_OUTOFMEMORY; +} + void wm_reader_init(struct wm_reader *reader, const struct wm_reader_ops *ops) { reader->IWMHeaderInfo3_iface.lpVtbl = &header_info_vtbl; diff --git a/dlls/winegstreamer/wm_syncreader.c b/dlls/winegstreamer/wm_syncreader.c index cb2e61a25bc..c89fb782a11 100644 --- a/dlls/winegstreamer/wm_syncreader.c +++ b/dlls/winegstreamer/wm_syncreader.c @@ -123,11 +123,14 @@ static HRESULT WINAPI WMSyncReader_GetOutputNumberForStream(IWMSyncReader2 *ifac return S_OK; } -static HRESULT WINAPI WMSyncReader_GetOutputProps(IWMSyncReader2 *iface, DWORD output_num, IWMOutputMediaProps **output) +static HRESULT WINAPI WMSyncReader_GetOutputProps(IWMSyncReader2 *iface, + DWORD output, IWMOutputMediaProps **props) { - struct sync_reader *This = impl_from_IWMSyncReader2(iface); - FIXME("(%p)->(%u %p): stub!\n", This, output_num, output); - return E_NOTIMPL; + struct sync_reader *reader = impl_from_IWMSyncReader2(iface); + + TRACE("reader %p, output %u, props %p.\n", reader, output, props); + + return wm_reader_get_output_props(&reader->reader, output, props); } static HRESULT WINAPI WMSyncReader_GetOutputSetting(IWMSyncReader2 *iface, DWORD output_num, const WCHAR *name, diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index 031a1841360..22184c98dc5 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -724,30 +724,28 @@ static void test_sync_reader_types(void) ok(stream_number2 == stream_number, "Expected stream number %u, got %u.\n", stream_number, stream_number2); hr = IWMSyncReader_GetOutputProps(reader, output_number, &output_props); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); - if (hr != S_OK) - { - winetest_pop_context(); - continue; - } + ok(hr == S_OK, "Got hr %#x.\n", hr); ret_size = sizeof(mt_buffer); hr = IWMOutputMediaProps_GetMediaType(output_props, mt, &ret_size); - ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); ref = IWMOutputMediaProps_Release(output_props); ok(!ref, "Got outstanding refcount %d.\n", ref); - if (IsEqualGUID(&majortype, &MEDIATYPE_Audio)) - { - got_audio = true; - check_audio_type(mt); - } - else + if (hr == S_OK) { - ok(IsEqualGUID(&majortype, &MEDIATYPE_Video), "Got major type %s.\n", debugstr_guid(&majortype)); - got_video = true; - check_video_type(mt); + if (IsEqualGUID(&majortype, &MEDIATYPE_Audio)) + { + got_audio = true; + check_audio_type(mt); + } + else + { + ok(IsEqualGUID(&majortype, &MEDIATYPE_Video), "Got major type %s.\n", debugstr_guid(&majortype)); + got_video = true; + check_video_type(mt); + } } count = 0; @@ -832,19 +830,16 @@ static void test_sync_reader_types(void) todo_wine ok(hr == NS_E_INVALID_OUTPUT_FORMAT, "Got hr %#x.\n", hr); hr = IWMSyncReader_GetOutputProps(reader, output_number, &output_props); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); - if (hr == S_OK) - { - hr = IWMSyncReader_GetOutputProps(reader, output_number, &output_props2); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(output_props2 != output_props, "Expected different objects.\n"); + hr = IWMSyncReader_GetOutputProps(reader, output_number, &output_props2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(output_props2 != output_props, "Expected different objects.\n"); - ref = IWMOutputMediaProps_Release(output_props2); - ok(!ref, "Got outstanding refcount %d.\n", ref); - ref = IWMOutputMediaProps_Release(output_props); - ok(!ref, "Got outstanding refcount %d.\n", ref); - } + ref = IWMOutputMediaProps_Release(output_props2); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IWMOutputMediaProps_Release(output_props); + ok(!ref, "Got outstanding refcount %d.\n", ref); winetest_pop_context(); } @@ -859,7 +854,7 @@ static void test_sync_reader_types(void) output_props = (void *)0xdeadbeef; hr = IWMSyncReader_GetOutputProps(reader, 2, &output_props); - todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); ok(output_props == (void *)0xdeadbeef, "Got output props %p.\n", output_props); output_props = (void *)0xdeadbeef;

1 0

Zebediah Figura : winegstreamer: Implement IWMOutputMediaProps::GetMediaType().
by Alexandre Julliard 28 Oct '21

28 Oct '21

Module: wine Branch: master Commit: 95ffc879882fdedaf9fdf40eb1c556a025ae5bfd URL: https://source.winehq.org/git/wine.git/?a=commit;h=95ffc879882fdedaf9fdf40e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Oct 28 11:45:58 2021 -0500 winegstreamer: Implement IWMOutputMediaProps::GetMediaType(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/wm_reader.c | 49 ++++++++++++++++++++++++++++++++++++++---- dlls/wmvcore/tests/wmvcore.c | 27 +++++++++++------------ 2 files changed, 57 insertions(+), 19 deletions(-) diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index 2a93e6e1d35..cd08bc96869 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -32,6 +32,8 @@ struct output_props { IWMOutputMediaProps IWMOutputMediaProps_iface; LONG refcount; + + AM_MEDIA_TYPE mt; }; static inline struct output_props *impl_from_IWMOutputMediaProps(IWMOutputMediaProps *iface) @@ -89,8 +91,23 @@ static HRESULT WINAPI output_props_GetType(IWMOutputMediaProps *iface, GUID *maj static HRESULT WINAPI output_props_GetMediaType(IWMOutputMediaProps *iface, WM_MEDIA_TYPE *mt, DWORD *size) { - FIXME("iface %p, mt %p, size %p, stub!\n", iface, mt, size); - return E_NOTIMPL; + const struct output_props *props = impl_from_IWMOutputMediaProps(iface); + const DWORD req_size = *size; + + TRACE("iface %p, mt %p, size %p.\n", iface, mt, size); + + *size = sizeof(*mt) + props->mt.cbFormat; + if (!mt) + return S_OK; + if (req_size < *size) + return ASF_E_BUFFERTOOSMALL; + + strmbase_dump_media_type(&props->mt); + + memcpy(mt, &props->mt, sizeof(*mt)); + memcpy(mt + 1, props->mt.pbFormat, props->mt.cbFormat); + mt->pbFormat = (BYTE *)(mt + 1); + return S_OK; } static HRESULT WINAPI output_props_SetMediaType(IWMOutputMediaProps *iface, WM_MEDIA_TYPE *mt) @@ -123,7 +140,7 @@ static const struct IWMOutputMediaPropsVtbl output_props_vtbl = output_props_GetConnectionName, }; -static IWMOutputMediaProps *output_props_create(void) +static IWMOutputMediaProps *output_props_create(const struct wg_format *format) { struct output_props *object; @@ -132,6 +149,12 @@ static IWMOutputMediaProps *output_props_create(void) object->IWMOutputMediaProps_iface.lpVtbl = &output_props_vtbl; object->refcount = 1; + if (!amt_from_wg_format(&object->mt, format)) + { + free(object); + return NULL; + } + TRACE("Created output properties %p.\n", object); return &object->IWMOutputMediaProps_iface; } @@ -1182,6 +1205,24 @@ HRESULT wm_reader_open_stream(struct wm_reader *reader, IStream *stream) stream->reader = reader; stream->index = i; wg_parser_stream_get_preferred_format(stream->wg_stream, &stream->format); + if (stream->format.major_type == WG_MAJOR_TYPE_AUDIO) + { + /* R.U.S.E enumerates available audio types, picks the first one it + * likes, and then sets the wrong stream to that type. libav might + * give us WG_AUDIO_FORMAT_F32LE by default, which will result in + * the game incorrectly interpreting float data as integer. + * Therefore just match native and always set our default format to + * S16LE. */ + stream->format.u.audio.format = WG_AUDIO_FORMAT_S16LE; + } + else if (stream->format.major_type == WG_MAJOR_TYPE_VIDEO) + { + /* Call of Juarez: Bound in Blood breaks if I420 is enumerated. + * Some native decoders output I420, but the msmpeg4v3 decoder + * never does. */ + if (stream->format.u.video.format == WG_VIDEO_FORMAT_I420) + stream->format.u.video.format = WG_VIDEO_FORMAT_YV12; + } } LeaveCriticalSection(&reader->cs); @@ -1244,7 +1285,7 @@ HRESULT wm_reader_get_output_props(struct wm_reader *reader, DWORD output, IWMOu return E_INVALIDARG; } - *props = output_props_create(); + *props = output_props_create(&stream->format); LeaveCriticalSection(&reader->cs); return *props ? S_OK : E_OUTOFMEMORY; } diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index 22184c98dc5..6fc74b62dba 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -728,24 +728,21 @@ static void test_sync_reader_types(void) ret_size = sizeof(mt_buffer); hr = IWMOutputMediaProps_GetMediaType(output_props, mt, &ret_size); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); ref = IWMOutputMediaProps_Release(output_props); ok(!ref, "Got outstanding refcount %d.\n", ref); - if (hr == S_OK) + if (IsEqualGUID(&majortype, &MEDIATYPE_Audio)) { - if (IsEqualGUID(&majortype, &MEDIATYPE_Audio)) - { - got_audio = true; - check_audio_type(mt); - } - else - { - ok(IsEqualGUID(&majortype, &MEDIATYPE_Video), "Got major type %s.\n", debugstr_guid(&majortype)); - got_video = true; - check_video_type(mt); - } + got_audio = true; + check_audio_type(mt); + } + else + { + ok(IsEqualGUID(&majortype, &MEDIATYPE_Video), "Got major type %s.\n", debugstr_guid(&majortype)); + got_video = true; + check_video_type(mt); } count = 0; @@ -844,8 +841,8 @@ static void test_sync_reader_types(void) winetest_pop_context(); } - todo_wine ok(got_audio, "No audio stream was enumerated.\n"); - todo_wine ok(got_video, "No video stream was enumerated.\n"); + ok(got_audio, "No audio stream was enumerated.\n"); + ok(got_video, "No video stream was enumerated.\n"); count = 0xdeadbeef; hr = IWMSyncReader_GetOutputFormatCount(reader, 2, &count);

1 0

Zebediah Figura : winegstreamer: Implement IWMSyncReader::GetOutputFormat().
by Alexandre Julliard 28 Oct '21

28 Oct '21

Module: wine Branch: master Commit: b3655b5be5f137281e8757db4e6985018b21c296 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3655b5be5f137281e8757db… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Oct 28 11:45:59 2021 -0500 winegstreamer: Implement IWMSyncReader::GetOutputFormat(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_private.h | 2 ++ dlls/winegstreamer/wm_reader.c | 62 ++++++++++++++++++++++++++++++++++++++ dlls/winegstreamer/wm_syncreader.c | 12 +++++--- dlls/wmvcore/tests/wmvcore.c | 2 +- 4 files changed, 72 insertions(+), 6 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index db715a9ad70..da36d53abff 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -153,6 +153,8 @@ struct wm_reader_ops void wm_reader_cleanup(struct wm_reader *reader); HRESULT wm_reader_close(struct wm_reader *reader); +HRESULT wm_reader_get_output_format(struct wm_reader *reader, DWORD output, + DWORD index, IWMOutputMediaProps **props); HRESULT wm_reader_get_output_props(struct wm_reader *reader, DWORD output, IWMOutputMediaProps **props); void wm_reader_init(struct wm_reader *reader, const struct wm_reader_ops *ops); diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index cd08bc96869..f6820121bf0 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -1290,6 +1290,68 @@ HRESULT wm_reader_get_output_props(struct wm_reader *reader, DWORD output, IWMOu return *props ? S_OK : E_OUTOFMEMORY; } +static const enum wg_video_format video_formats[] = +{ + /* Try to prefer YUV formats over RGB ones. Most decoders output in the + * YUV color space, and it's generally much less expensive for + * videoconvert to do YUV -> YUV transformations. */ + WG_VIDEO_FORMAT_NV12, + WG_VIDEO_FORMAT_YV12, + WG_VIDEO_FORMAT_YUY2, + WG_VIDEO_FORMAT_UYVY, + WG_VIDEO_FORMAT_YVYU, + WG_VIDEO_FORMAT_BGRx, + WG_VIDEO_FORMAT_BGR, + WG_VIDEO_FORMAT_RGB16, + WG_VIDEO_FORMAT_RGB15, +}; + +HRESULT wm_reader_get_output_format(struct wm_reader *reader, DWORD output, + DWORD index, IWMOutputMediaProps **props) +{ + struct wm_stream *stream; + struct wg_format format; + + EnterCriticalSection(&reader->cs); + + if (!(stream = get_stream_by_output_number(reader, output))) + { + LeaveCriticalSection(&reader->cs); + return E_INVALIDARG; + } + + wg_parser_stream_get_preferred_format(stream->wg_stream, &format); + + switch (format.major_type) + { + case WG_MAJOR_TYPE_VIDEO: + if (index >= ARRAY_SIZE(video_formats)) + { + LeaveCriticalSection(&reader->cs); + return NS_E_INVALID_OUTPUT_FORMAT; + } + format.u.video.format = video_formats[index]; + break; + + case WG_MAJOR_TYPE_AUDIO: + if (index) + { + LeaveCriticalSection(&reader->cs); + return NS_E_INVALID_OUTPUT_FORMAT; + } + format.u.audio.format = WG_AUDIO_FORMAT_S16LE; + break; + + case WG_MAJOR_TYPE_UNKNOWN: + break; + } + + LeaveCriticalSection(&reader->cs); + + *props = output_props_create(&format); + return *props ? S_OK : E_OUTOFMEMORY; +} + void wm_reader_init(struct wm_reader *reader, const struct wm_reader_ops *ops) { reader->IWMHeaderInfo3_iface.lpVtbl = &header_info_vtbl; diff --git a/dlls/winegstreamer/wm_syncreader.c b/dlls/winegstreamer/wm_syncreader.c index c89fb782a11..7becd88b63e 100644 --- a/dlls/winegstreamer/wm_syncreader.c +++ b/dlls/winegstreamer/wm_syncreader.c @@ -97,12 +97,14 @@ static HRESULT WINAPI WMSyncReader_GetOutputCount(IWMSyncReader2 *iface, DWORD * return S_OK; } -static HRESULT WINAPI WMSyncReader_GetOutputFormat(IWMSyncReader2 *iface, DWORD output_num, DWORD format_num, - IWMOutputMediaProps **props) +static HRESULT WINAPI WMSyncReader_GetOutputFormat(IWMSyncReader2 *iface, + DWORD output, DWORD index, IWMOutputMediaProps **props) { - struct sync_reader *This = impl_from_IWMSyncReader2(iface); - FIXME("(%p)->(%u %u %p): stub!\n", This, output_num, format_num, props); - return E_NOTIMPL; + struct sync_reader *reader = impl_from_IWMSyncReader2(iface); + + TRACE("reader %p, output %u, index %u, props %p.\n", reader, output, index, props); + + return wm_reader_get_output_format(&reader->reader, output, index, props); } static HRESULT WINAPI WMSyncReader_GetOutputFormatCount(IWMSyncReader2 *iface, DWORD output_num, DWORD *formats) diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index 6fc74b62dba..5c1a47b65d1 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -856,7 +856,7 @@ static void test_sync_reader_types(void) output_props = (void *)0xdeadbeef; hr = IWMSyncReader_GetOutputFormat(reader, 2, 0, &output_props); - todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); ok(output_props == (void *)0xdeadbeef, "Got output props %p.\n", output_props); IWMProfile_Release(profile);

1 0

Zebediah Figura : winegstreamer: Implement IWMSyncReader::GetOutputFormatCount().
by Alexandre Julliard 28 Oct '21

28 Oct '21

Module: wine Branch: master Commit: bc52edc19d8a45b9062d9568652403251872026e URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc52edc19d8a45b9062d9568… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Oct 28 11:46:00 2021 -0500 winegstreamer: Implement IWMSyncReader::GetOutputFormatCount(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_private.h | 1 + dlls/winegstreamer/wm_reader.c | 30 ++++++++++++++++++++++++++++++ dlls/winegstreamer/wm_syncreader.c | 10 ++++++---- dlls/wmvcore/tests/wmvcore.c | 8 ++++---- 4 files changed, 41 insertions(+), 8 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index da36d53abff..9219a86c094 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -155,6 +155,7 @@ void wm_reader_cleanup(struct wm_reader *reader); HRESULT wm_reader_close(struct wm_reader *reader); HRESULT wm_reader_get_output_format(struct wm_reader *reader, DWORD output, DWORD index, IWMOutputMediaProps **props); +HRESULT wm_reader_get_output_format_count(struct wm_reader *reader, DWORD output, DWORD *count); HRESULT wm_reader_get_output_props(struct wm_reader *reader, DWORD output, IWMOutputMediaProps **props); void wm_reader_init(struct wm_reader *reader, const struct wm_reader_ops *ops); diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index f6820121bf0..79a89c9a332 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -1306,6 +1306,36 @@ static const enum wg_video_format video_formats[] = WG_VIDEO_FORMAT_RGB15, }; +HRESULT wm_reader_get_output_format_count(struct wm_reader *reader, DWORD output, DWORD *count) +{ + struct wm_stream *stream; + struct wg_format format; + + EnterCriticalSection(&reader->cs); + + if (!(stream = get_stream_by_output_number(reader, output))) + { + LeaveCriticalSection(&reader->cs); + return E_INVALIDARG; + } + + wg_parser_stream_get_preferred_format(stream->wg_stream, &format); + switch (format.major_type) + { + case WG_MAJOR_TYPE_VIDEO: + *count = ARRAY_SIZE(video_formats); + break; + + case WG_MAJOR_TYPE_AUDIO: + case WG_MAJOR_TYPE_UNKNOWN: + *count = 1; + break; + } + + LeaveCriticalSection(&reader->cs); + return S_OK; +} + HRESULT wm_reader_get_output_format(struct wm_reader *reader, DWORD output, DWORD index, IWMOutputMediaProps **props) { diff --git a/dlls/winegstreamer/wm_syncreader.c b/dlls/winegstreamer/wm_syncreader.c index 7becd88b63e..54c53dee3bd 100644 --- a/dlls/winegstreamer/wm_syncreader.c +++ b/dlls/winegstreamer/wm_syncreader.c @@ -107,11 +107,13 @@ static HRESULT WINAPI WMSyncReader_GetOutputFormat(IWMSyncReader2 *iface, return wm_reader_get_output_format(&reader->reader, output, index, props); } -static HRESULT WINAPI WMSyncReader_GetOutputFormatCount(IWMSyncReader2 *iface, DWORD output_num, DWORD *formats) +static HRESULT WINAPI WMSyncReader_GetOutputFormatCount(IWMSyncReader2 *iface, DWORD output, DWORD *count) { - struct sync_reader *This = impl_from_IWMSyncReader2(iface); - FIXME("(%p)->(%u %p): stub!\n", This, output_num, formats); - return E_NOTIMPL; + struct sync_reader *reader = impl_from_IWMSyncReader2(iface); + + TRACE("reader %p, output %u, count %p.\n", reader, output, count); + + return wm_reader_get_output_format_count(&reader->reader, output, count); } static HRESULT WINAPI WMSyncReader_GetOutputNumberForStream(IWMSyncReader2 *iface, diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index 5c1a47b65d1..ebfdfdf0107 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -747,8 +747,8 @@ static void test_sync_reader_types(void) count = 0; hr = IWMSyncReader_GetOutputFormatCount(reader, output_number, &count); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(count > 0, "Got count %u.\n", count); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(count > 0, "Got count %u.\n", count); for (j = 0; j < count; ++j) { @@ -824,7 +824,7 @@ static void test_sync_reader_types(void) } hr = IWMSyncReader_GetOutputFormat(reader, output_number, count, &output_props); - todo_wine ok(hr == NS_E_INVALID_OUTPUT_FORMAT, "Got hr %#x.\n", hr); + ok(hr == NS_E_INVALID_OUTPUT_FORMAT, "Got hr %#x.\n", hr); hr = IWMSyncReader_GetOutputProps(reader, output_number, &output_props); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -846,7 +846,7 @@ static void test_sync_reader_types(void) count = 0xdeadbeef; hr = IWMSyncReader_GetOutputFormatCount(reader, 2, &count); - todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); ok(count == 0xdeadbeef, "Got count %#x.\n", count); output_props = (void *)0xdeadbeef;

1 0

Alistair Leslie-Hughes : msdasql: Add IGetDataSource support to session.
by Alexandre Julliard 28 Oct '21

28 Oct '21

Module: wine Branch: master Commit: 33563cf16f5e122a1800612ddc214aee3da30d6d URL: https://source.winehq.org/git/wine.git/?a=commit;h=33563cf16f5e122a1800612d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Oct 28 16:27:34 2021 +1100 msdasql: Add IGetDataSource support to session. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdasql/session.c | 47 +++++++++++++++++++++++++++++++++++++++++++ dlls/msdasql/tests/provider.c | 5 +++++ 2 files changed, 52 insertions(+) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index 57174be40f8..b79a80389ff 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -37,6 +37,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msdasql); struct msdasql_session { IUnknown session_iface; + IGetDataSource IGetDataSource_iface; LONG refs; }; @@ -45,6 +46,11 @@ static inline struct msdasql_session *impl_from_IUnknown( IUnknown *iface ) return CONTAINING_RECORD( iface, struct msdasql_session, session_iface ); } +static inline struct msdasql_session *impl_from_IGetDataSource( IGetDataSource *iface ) +{ + return CONTAINING_RECORD( iface, struct msdasql_session, IGetDataSource_iface ); +} + static HRESULT WINAPI session_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) { struct msdasql_session *session = impl_from_IUnknown( iface ); @@ -57,6 +63,11 @@ static HRESULT WINAPI session_QueryInterface(IUnknown *iface, REFIID riid, void TRACE("(%p)->(IID_IUnknown %p)\n", iface, ppv); *ppv = &session->session_iface; } + else if(IsEqualGUID(&IID_IGetDataSource, riid)) + { + TRACE("(%p)->(IID_IGetDataSource %p)\n", iface, ppv); + *ppv = &session->IGetDataSource_iface; + } if(*ppv) { @@ -96,6 +107,41 @@ static const IUnknownVtbl unkfactoryVtbl = session_Release, }; + +HRESULT WINAPI datasource_QueryInterface(IGetDataSource *iface, REFIID riid, void **out) +{ + struct msdasql_session *session = impl_from_IGetDataSource( iface ); + return IUnknown_QueryInterface(&session->session_iface, riid, out); +} + +ULONG WINAPI datasource_AddRef(IGetDataSource *iface) +{ + struct msdasql_session *session = impl_from_IGetDataSource( iface ); + return IUnknown_AddRef(&session->session_iface); +} + +ULONG WINAPI datasource_Release(IGetDataSource *iface) +{ + struct msdasql_session *session = impl_from_IGetDataSource( iface ); + return IUnknown_Release(&session->session_iface); +} + +HRESULT WINAPI datasource_GetDataSource(IGetDataSource *iface, REFIID riid, IUnknown **datasource) +{ + struct msdasql_session *session = impl_from_IGetDataSource( iface ); + FIXME("%p, %s, %p stub\n", session, debugstr_guid(riid), datasource); + + return E_NOTIMPL; +} + +static const IGetDataSourceVtbl datasourceVtbl = +{ + datasource_QueryInterface, + datasource_AddRef, + datasource_Release, + datasource_GetDataSource +}; + HRESULT create_db_session(REFIID riid, void **unk) { struct msdasql_session *session; @@ -106,6 +152,7 @@ HRESULT create_db_session(REFIID riid, void **unk) return E_OUTOFMEMORY; session->session_iface.lpVtbl = &unkfactoryVtbl; + session->IGetDataSource_iface.lpVtbl = &datasourceVtbl; session->refs = 1; hr = IUnknown_QueryInterface(&session->session_iface, riid, unk); diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index 4cab6a24daf..4eaf6c07355 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -159,6 +159,7 @@ static void test_sessions(void) IUnknown *session = NULL; IOpenRowset *openrowset = NULL; IDBCreateCommand *create_command = NULL; + IGetDataSource *datasource = NULL; IUnknown *cmd = NULL; HRESULT hr; BSTR connect_str; @@ -203,6 +204,10 @@ static void test_sessions(void) hr = IDBCreateSession_CreateSession( dbsession, NULL, &IID_IUnknown, &session ); ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IUnknown_QueryInterface(session, &IID_IGetDataSource, (void**)&datasource); + ok(hr == S_OK, "got 0x%08x\n", hr); + IGetDataSource_Release(datasource); + hr = IUnknown_QueryInterface(session, &IID_IOpenRowset, (void**)&openrowset); ok(hr == S_OK, "got 0x%08x\n", hr);

1 0

Alistair Leslie-Hughes : msdasql: Add IOpenRowset support to session.
by Alexandre Julliard 28 Oct '21

28 Oct '21

Module: wine Branch: master Commit: 4ba940afaab85d4f5ca68612bef59358bf0cc69f URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ba940afaab85d4f5ca68612… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Oct 28 16:27:35 2021 +1100 msdasql: Add IOpenRowset support to session. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdasql/session.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index b79a80389ff..465a89d199a 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -38,6 +38,7 @@ struct msdasql_session { IUnknown session_iface; IGetDataSource IGetDataSource_iface; + IOpenRowset IOpenRowset_iface; LONG refs; }; @@ -51,6 +52,11 @@ static inline struct msdasql_session *impl_from_IGetDataSource( IGetDataSource * return CONTAINING_RECORD( iface, struct msdasql_session, IGetDataSource_iface ); } +static inline struct msdasql_session *impl_from_IOpenRowset( IOpenRowset *iface ) +{ + return CONTAINING_RECORD( iface, struct msdasql_session, IOpenRowset_iface ); +} + static HRESULT WINAPI session_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) { struct msdasql_session *session = impl_from_IUnknown( iface ); @@ -68,6 +74,11 @@ static HRESULT WINAPI session_QueryInterface(IUnknown *iface, REFIID riid, void TRACE("(%p)->(IID_IGetDataSource %p)\n", iface, ppv); *ppv = &session->IGetDataSource_iface; } + else if(IsEqualGUID(&IID_IOpenRowset, riid)) + { + TRACE("(%p)->(IID_IOpenRowset %p)\n", iface, ppv); + *ppv = &session->IOpenRowset_iface; + } if(*ppv) { @@ -142,6 +153,42 @@ static const IGetDataSourceVtbl datasourceVtbl = datasource_GetDataSource }; +HRESULT WINAPI openrowset_QueryInterface(IOpenRowset *iface, REFIID riid, void **out) +{ + struct msdasql_session *session = impl_from_IOpenRowset( iface ); + return IUnknown_QueryInterface(&session->session_iface, riid, out); +} + +ULONG WINAPI openrowset_AddRef(IOpenRowset *iface) +{ + struct msdasql_session *session = impl_from_IOpenRowset( iface ); + return IUnknown_AddRef(&session->session_iface); +} + +ULONG WINAPI openrowset_Release(IOpenRowset *iface) +{ + struct msdasql_session *session = impl_from_IOpenRowset( iface ); + return IUnknown_Release(&session->session_iface); +} + +HRESULT WINAPI openrowset_OpenRowset(IOpenRowset *iface, IUnknown *pUnkOuter, DBID *table, + DBID *index, REFIID riid, ULONG count, DBPROPSET propertysets[], IUnknown **rowset) +{ + struct msdasql_session *session = impl_from_IOpenRowset( iface ); + FIXME("%p, %p, %p %p %s, %d %p %p stub\n", session, pUnkOuter, table, index, debugstr_guid(riid), + count, propertysets, rowset); + + return E_NOTIMPL; +} + +static const IOpenRowsetVtbl openrowsetVtbl = +{ + openrowset_QueryInterface, + openrowset_AddRef, + openrowset_Release, + openrowset_OpenRowset +}; + HRESULT create_db_session(REFIID riid, void **unk) { struct msdasql_session *session; @@ -153,6 +200,7 @@ HRESULT create_db_session(REFIID riid, void **unk) session->session_iface.lpVtbl = &unkfactoryVtbl; session->IGetDataSource_iface.lpVtbl = &datasourceVtbl; + session->IOpenRowset_iface.lpVtbl = &openrowsetVtbl; session->refs = 1; hr = IUnknown_QueryInterface(&session->session_iface, riid, unk);

1 0

Alistair Leslie-Hughes : msdasql: Add ISessionProperties to session.
by Alexandre Julliard 28 Oct '21

28 Oct '21

Module: wine Branch: master Commit: 2f4e22d05313f1641c51642c4bf7092ba9e6b8ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f4e22d05313f1641c51642c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Oct 28 16:27:36 2021 +1100 msdasql: Add ISessionProperties to session. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdasql/session.c | 58 +++++++++++++++++++++++++++++++++++++++++++ dlls/msdasql/tests/provider.c | 5 ++++ 2 files changed, 63 insertions(+) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index 465a89d199a..d4d55f76c3c 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -39,6 +39,7 @@ struct msdasql_session IUnknown session_iface; IGetDataSource IGetDataSource_iface; IOpenRowset IOpenRowset_iface; + ISessionProperties ISessionProperties_iface; LONG refs; }; @@ -57,6 +58,11 @@ static inline struct msdasql_session *impl_from_IOpenRowset( IOpenRowset *iface return CONTAINING_RECORD( iface, struct msdasql_session, IOpenRowset_iface ); } +static inline struct msdasql_session *impl_from_ISessionProperties( ISessionProperties *iface ) +{ + return CONTAINING_RECORD( iface, struct msdasql_session, ISessionProperties_iface ); +} + static HRESULT WINAPI session_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) { struct msdasql_session *session = impl_from_IUnknown( iface ); @@ -79,6 +85,11 @@ static HRESULT WINAPI session_QueryInterface(IUnknown *iface, REFIID riid, void TRACE("(%p)->(IID_IOpenRowset %p)\n", iface, ppv); *ppv = &session->IOpenRowset_iface; } + else if(IsEqualGUID(&IID_ISessionProperties, riid)) + { + TRACE("(%p)->(IID_ISessionProperties %p)\n", iface, ppv); + *ppv = &session->ISessionProperties_iface; + } if(*ppv) { @@ -189,6 +200,52 @@ static const IOpenRowsetVtbl openrowsetVtbl = openrowset_OpenRowset }; +static HRESULT WINAPI properties_QueryInterface(ISessionProperties *iface, REFIID riid, void **out) +{ + struct msdasql_session *session = impl_from_ISessionProperties( iface ); + return IUnknown_QueryInterface(&session->session_iface, riid, out); +} + +static ULONG WINAPI properties_AddRef(ISessionProperties *iface) +{ + struct msdasql_session *session = impl_from_ISessionProperties( iface ); + return IUnknown_AddRef(&session->session_iface); +} + +static ULONG WINAPI properties_Release(ISessionProperties *iface) +{ + struct msdasql_session *session = impl_from_ISessionProperties( iface ); + return IUnknown_Release(&session->session_iface); +} + + +static HRESULT WINAPI properties_GetProperties(ISessionProperties *iface, ULONG set_count, + const DBPROPIDSET id_sets[], ULONG *count, DBPROPSET **sets) +{ + struct msdasql_session *session = impl_from_ISessionProperties( iface ); + FIXME("%p %d %p %p %p\n", session, set_count, id_sets, count, sets); + + return E_NOTIMPL; +} + +static HRESULT WINAPI properties_SetProperties(ISessionProperties *iface, ULONG count, + DBPROPSET sets[]) +{ + struct msdasql_session *session = impl_from_ISessionProperties( iface ); + FIXME("%p %d %p\n", session, count, sets); + + return S_OK; +} + +static const ISessionPropertiesVtbl propertiesVtbl = +{ + properties_QueryInterface, + properties_AddRef, + properties_Release, + properties_GetProperties, + properties_SetProperties +}; + HRESULT create_db_session(REFIID riid, void **unk) { struct msdasql_session *session; @@ -201,6 +258,7 @@ HRESULT create_db_session(REFIID riid, void **unk) session->session_iface.lpVtbl = &unkfactoryVtbl; session->IGetDataSource_iface.lpVtbl = &datasourceVtbl; session->IOpenRowset_iface.lpVtbl = &openrowsetVtbl; + session->ISessionProperties_iface.lpVtbl = &propertiesVtbl; session->refs = 1; hr = IUnknown_QueryInterface(&session->session_iface, riid, unk); diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index 4eaf6c07355..0d9630070b3 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -160,6 +160,7 @@ static void test_sessions(void) IOpenRowset *openrowset = NULL; IDBCreateCommand *create_command = NULL; IGetDataSource *datasource = NULL; + ISessionProperties *session_props = NULL; IUnknown *cmd = NULL; HRESULT hr; BSTR connect_str; @@ -208,6 +209,10 @@ static void test_sessions(void) ok(hr == S_OK, "got 0x%08x\n", hr); IGetDataSource_Release(datasource); + hr = IUnknown_QueryInterface(session, &IID_ISessionProperties, (void**)&session_props); + ok(hr == S_OK, "got 0x%08x\n", hr); + ISessionProperties_Release(session_props); + hr = IUnknown_QueryInterface(session, &IID_IOpenRowset, (void**)&openrowset); ok(hr == S_OK, "got 0x%08x\n", hr);

1 0

Alistair Leslie-Hughes : msdasql: Add IDBCreateCommand to session.
by Alexandre Julliard 28 Oct '21

28 Oct '21

Module: wine Branch: master Commit: e5f7a73c83a2b50db27c084b7b913a371fa1d4bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5f7a73c83a2b50db27c084b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Oct 28 16:27:37 2021 +1100 msdasql: Add IDBCreateCommand to session. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdasql/session.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index d4d55f76c3c..e01dcf7ab7e 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -40,6 +40,7 @@ struct msdasql_session IGetDataSource IGetDataSource_iface; IOpenRowset IOpenRowset_iface; ISessionProperties ISessionProperties_iface; + IDBCreateCommand IDBCreateCommand_iface; LONG refs; }; @@ -63,6 +64,11 @@ static inline struct msdasql_session *impl_from_ISessionProperties( ISessionProp return CONTAINING_RECORD( iface, struct msdasql_session, ISessionProperties_iface ); } +static inline struct msdasql_session *impl_from_IDBCreateCommand( IDBCreateCommand *iface ) +{ + return CONTAINING_RECORD( iface, struct msdasql_session, IDBCreateCommand_iface ); +} + static HRESULT WINAPI session_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) { struct msdasql_session *session = impl_from_IUnknown( iface ); @@ -90,6 +96,11 @@ static HRESULT WINAPI session_QueryInterface(IUnknown *iface, REFIID riid, void TRACE("(%p)->(IID_ISessionProperties %p)\n", iface, ppv); *ppv = &session->ISessionProperties_iface; } + else if(IsEqualGUID(&IID_IDBCreateCommand, riid)) + { + TRACE("(%p)->(IDBCreateCommand_iface %p)\n", iface, ppv); + *ppv = &session->IDBCreateCommand_iface; + } if(*ppv) { @@ -246,6 +257,41 @@ static const ISessionPropertiesVtbl propertiesVtbl = properties_SetProperties }; +static HRESULT WINAPI createcommand_QueryInterface(IDBCreateCommand *iface, REFIID riid, void **out) +{ + struct msdasql_session *session = impl_from_IDBCreateCommand( iface ); + return IUnknown_QueryInterface(&session->session_iface, riid, out); +} + +static ULONG WINAPI createcommand_AddRef(IDBCreateCommand *iface) +{ + struct msdasql_session *session = impl_from_IDBCreateCommand( iface ); + return IUnknown_AddRef(&session->session_iface); +} + +static ULONG WINAPI createcommand_Release(IDBCreateCommand *iface) +{ + struct msdasql_session *session = impl_from_IDBCreateCommand( iface ); + return IUnknown_Release(&session->session_iface); +} + +static HRESULT WINAPI createcommand_CreateCommand(IDBCreateCommand *iface, IUnknown *outer, REFIID riid, + IUnknown **out) +{ + struct msdasql_session *session = impl_from_IDBCreateCommand( iface ); + FIXME("%p, %p, %s, %p\n", session, outer, debugstr_guid(riid), out); + + return E_NOTIMPL; +} + +static const IDBCreateCommandVtbl createcommandVtbl = +{ + createcommand_QueryInterface, + createcommand_AddRef, + createcommand_Release, + createcommand_CreateCommand +}; + HRESULT create_db_session(REFIID riid, void **unk) { struct msdasql_session *session; @@ -259,6 +305,7 @@ HRESULT create_db_session(REFIID riid, void **unk) session->IGetDataSource_iface.lpVtbl = &datasourceVtbl; session->IOpenRowset_iface.lpVtbl = &openrowsetVtbl; session->ISessionProperties_iface.lpVtbl = &propertiesVtbl; + session->IDBCreateCommand_iface.lpVtbl = &createcommandVtbl; session->refs = 1; hr = IUnknown_QueryInterface(&session->session_iface, riid, unk);

1 0

Alexandre Julliard : configure: Disable sane.ds if the Unix library is missing.
by Alexandre Julliard 28 Oct '21

28 Oct '21

Module: wine Branch: master Commit: cf5bad0ecc8976c66ecf73d987b870d917e625ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf5bad0ecc8976c66ecf73d9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 25 11:07:10 2021 +0200 configure: Disable sane.ds if the Unix library is missing. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 45 +++++++------------- configure.ac | 6 +-- dlls/sane.ds/Makefile.in | 1 + dlls/sane.ds/capability.c | 34 +++------------ dlls/sane.ds/ds_ctrl.c | 30 +++----------- dlls/sane.ds/ds_image.c | 80 +++++++++++++---------------------- dlls/sane.ds/options.c | 26 ++++++------ dlls/sane.ds/sane_i.h | 32 ++------------ dlls/sane.ds/sane_main.c | 103 ++++------------------------------------------ dlls/sane.ds/ui.c | 53 ++++++++++-------------- include/config.h.in | 3 -- 11 files changed, 101 insertions(+), 312 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cf5bad0ecc8976c66ecf…

1 0

Alexandre Julliard : sane.ds: Don't pass the device handle to the option helpers.
by Alexandre Julliard 28 Oct '21

28 Oct '21

Module: wine Branch: master Commit: ee280d8cc3b1f614b9a509644a5da312f163f8d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee280d8cc3b1f614b9a50964… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 25 16:17:21 2021 +0200 sane.ds: Don't pass the device handle to the option helpers. Use the global variable instead. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sane.ds/capability.c | 48 +++++++++++++++++----------------- dlls/sane.ds/ds_image.c | 13 +++++----- dlls/sane.ds/options.c | 66 +++++++++++++++++++++++------------------------ dlls/sane.ds/sane_i.h | 20 +++++++------- 4 files changed, 73 insertions(+), 74 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ee280d8cc3b1f614b9a5…

1 0