- Wine-Devel - list.winehq.org

[PATCH 2/2] d3dx10: Implement D3DX10GetImageInfoFromResource{A, W}().
by Ziqing Hui Nov. 11, 2020

Nov. 11, 2020

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/d3dx10_43/tests/d3dx10.c | 7 +--- dlls/d3dx10_43/texture.c | 69 +++++++++++++++++++++++++++++++++-- 2 files changed, 67 insertions(+), 9 deletions(-)

2 1

[PATCH] ucrtbase: Add support for utf8 codepage in setlocale.
by Piotr Caban Nov. 11, 2020

Nov. 11, 2020

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- Fixes ucrtbase part of bug 50019. dlls/msvcrt/locale.c | 5 +++++ 1 file changed, 5 insertions(+)

1 0

[PATCH] mshtml: Check for EVENTID_LAST in ensure_doc_nsevent_handler().
by Paul Gofman Nov. 11, 2020

Nov. 11, 2020

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50110 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/mshtml/htmlevent.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 0f041cbae6c..0bf3de54a96 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -2832,6 +2832,8 @@ HRESULT ensure_doc_nsevent_handler(HTMLDocumentNode *doc, nsIDOMNode *nsnode, ev doc->event_vector[eid] = TRUE; eid = EVENTID_BLUR; break; + case EVENTID_LAST: + return S_OK; default: break; } -- 2.28.0

2 1

[PATCH] kernel32: Add string for E_FAIL error.
by Paul Gofman Nov. 11, 2020

Nov. 11, 2020

Fixes a crash in Horizon Zero Dawn. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/kernel32/tests/format_msg.c | 1 + dlls/kernel32/winerror.mc | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/dlls/kernel32/tests/format_msg.c b/dlls/kernel32/tests/format_msg.c index 52b7b6925e4..359d036a22a 100644 --- a/dlls/kernel32/tests/format_msg.c +++ b/dlls/kernel32/tests/format_msg.c @@ -1755,6 +1755,7 @@ static void test_message_system_errors(void) {E_NOTIMPL}, {DXGI_ERROR_INVALID_CALL, TRUE /* Available since Win8 */}, {DXGI_ERROR_NOT_CURRENTLY_AVAILABLE, TRUE /* Available since Win8 */}, + {E_FAIL}, }; char buffer[256]; diff --git a/dlls/kernel32/winerror.mc b/dlls/kernel32/winerror.mc index 341c9572710..5359e07173c 100644 --- a/dlls/kernel32/winerror.mc +++ b/dlls/kernel32/winerror.mc @@ -3778,3 +3778,10 @@ SymbolicName=DXGI_ERROR_NOT_CURRENTLY_AVAILABLE Language=ENU Resource is not currently available. . +MessageId=0x4005 +Severity=CoError +Facility=Null +SymbolicName=E_FAIL +Language=ENU +Call failed. +. -- 2.28.0

2 1

[PATCH 1/2] quartz/tests: Add some more tests for seeking formats.
by Zebediah Figura Nov. 11, 2020

Nov. 11, 2020

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/filtergraph.c | 100 +++++++++++++++++++++++++++----- 1 file changed, 85 insertions(+), 15 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index cf641a4306e..ba63853ec7b 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -1181,7 +1181,8 @@ struct testfilter IMediaSeeking IMediaSeeking_iface; LONG seeking_ref; DWORD seek_caps; - BOOL support_testguid; + BOOL support_testguid, support_media_time; + GUID time_format; LONGLONG seek_duration, seek_current, seek_stop; double seek_rate; @@ -1578,6 +1579,8 @@ static HRESULT WINAPI testseek_IsFormatSupported(IMediaSeeking *iface, const GUI if (winetest_debug > 1) trace("%p->IsFormatSupported(%s)\n", iface, wine_dbgstr_guid(format)); if (IsEqualGUID(format, &testguid) && !filter->support_testguid) return S_FALSE; + if (IsEqualGUID(format, &TIME_FORMAT_MEDIA_TIME) && !filter->support_media_time) + return S_FALSE; return S_OK; } @@ -1603,8 +1606,10 @@ static HRESULT WINAPI testseek_SetTimeFormat(IMediaSeeking *iface, const GUID *f { struct testfilter *filter = impl_from_IMediaSeeking(iface); if (winetest_debug > 1) trace("%p->SetTimeFormat(%s)\n", iface, wine_dbgstr_guid(format)); + ok(!IsEqualGUID(format, &GUID_NULL), "Got unexpected GUID_NULL.\n"); if (IsEqualGUID(format, &testguid) && !filter->support_testguid) return E_INVALIDARG; + filter->time_format = *format; return S_OK; } @@ -1841,6 +1846,8 @@ static void testfilter_init(struct testfilter *filter, struct testpin *pins, int filter->state = State_Stopped; filter->expect_stop_prev = filter->expect_run_prev = State_Paused; + filter->support_media_time = TRUE; + filter->time_format = TIME_FORMAT_MEDIA_TIME; } static HRESULT WINAPI testfilter_cf_QueryInterface(IClassFactory *iface, REFIID iid, void **out) @@ -3751,8 +3758,8 @@ static HRESULT check_ec_complete(IFilterGraph2 *graph, IBaseFilter *filter) static void test_ec_complete(void) { - struct testpin filter1_pin, filter2_pin, filter3_pin, source_pins[3]; - struct testfilter filter1, filter2, filter3, source; + struct testpin filter1_pin, filter2_pin, filter3_pin; + struct testfilter filter1, filter2, filter3; IFilterGraph2 *graph = create_graph(); IMediaEventSink *eventsink; @@ -3768,10 +3775,6 @@ static void test_ec_complete(void) testfilter_init(&filter1, &filter1_pin, 1); testfilter_init(&filter2, &filter2_pin, 1); testfilter_init(&filter3, &filter3_pin, 1); - testsource_init(&source_pins[0], NULL, 0); - testsource_init(&source_pins[1], NULL, 0); - testsource_init(&source_pins[2], NULL, 0); - testfilter_init(&source, source_pins, 3); IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&control); IFilterGraph2_QueryInterface(graph, &IID_IMediaEvent, (void **)&eventsrc); @@ -3780,10 +3783,6 @@ static void test_ec_complete(void) IFilterGraph2_AddFilter(graph, &filter1.IBaseFilter_iface, NULL); IFilterGraph2_AddFilter(graph, &filter2.IBaseFilter_iface, NULL); IFilterGraph2_AddFilter(graph, &filter3.IBaseFilter_iface, NULL); - IFilterGraph2_AddFilter(graph, &source.IBaseFilter_iface, NULL); - IFilterGraph2_ConnectDirect(graph, &source_pins[0].IPin_iface, &filter1_pin.IPin_iface, NULL); - IFilterGraph2_ConnectDirect(graph, &source_pins[1].IPin_iface, &filter2_pin.IPin_iface, NULL); - IFilterGraph2_ConnectDirect(graph, &source_pins[2].IPin_iface, &filter3_pin.IPin_iface, NULL); /* EC_COMPLETE is only delivered to the user after all renderers deliver it. */ @@ -3883,7 +3882,6 @@ static void test_ec_complete(void) IFilterGraph2_RemoveFilter(graph, &filter3.IBaseFilter_iface); filter1.misc_flags = 0; IFilterGraph2_AddFilter(graph, &filter1.IBaseFilter_iface, NULL); - IFilterGraph2_ConnectDirect(graph, &source_pins[0].IPin_iface, &filter1_pin.IPin_iface, NULL); hr = check_ec_complete(graph, &filter1.IBaseFilter_iface); ok(hr == E_ABORT, "Got hr %#x.\n", hr); @@ -3893,7 +3891,6 @@ static void test_ec_complete(void) filter1.IAMFilterMiscFlags_iface.lpVtbl = NULL; filter1.IMediaSeeking_iface.lpVtbl = &testseek_vtbl; IFilterGraph2_AddFilter(graph, &filter1.IBaseFilter_iface, NULL); - IFilterGraph2_ConnectDirect(graph, &source_pins[0].IPin_iface, &filter1_pin.IPin_iface, NULL); hr = check_ec_complete(graph, &filter1.IBaseFilter_iface); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -3912,12 +3909,21 @@ static void test_ec_complete(void) IFilterGraph2_RemoveFilter(graph, &filter1.IBaseFilter_iface); ok(filter1.seeking_ref == 0, "Unexpected seeking refcount %d.\n", filter1.seeking_ref); + filter1_pin.dir = PINDIR_INPUT; + filter1.support_media_time = FALSE; + IFilterGraph2_AddFilter(graph, &filter1.IBaseFilter_iface, NULL); + + hr = check_ec_complete(graph, &filter1.IBaseFilter_iface); + todo_wine ok(hr == E_ABORT, "Got hr %#x.\n", hr); + + todo_wine ok(filter1.seeking_ref == 0, "Unexpected seeking refcount %d.\n", filter1.seeking_ref); + IFilterGraph2_RemoveFilter(graph, &filter1.IBaseFilter_iface); + filter1.IMediaSeeking_iface.lpVtbl = NULL; filter1_pin.dir = PINDIR_INPUT; filter1.pin_count = 1; filter1_pin.QueryInternalConnections_hr = S_OK; IFilterGraph2_AddFilter(graph, &filter1.IBaseFilter_iface, NULL); - IFilterGraph2_ConnectDirect(graph, &source_pins[0].IPin_iface, &filter1_pin.IPin_iface, NULL); hr = check_ec_complete(graph, &filter1.IBaseFilter_iface); ok(hr == E_ABORT, "Got hr %#x.\n", hr); @@ -4145,6 +4151,21 @@ static void test_graph_seeking(void) * IMediaSeeking—no other heuristics are used to determine if it is a * renderer. */ + IFilterGraph2_AddFilter(graph, &filter1.IBaseFilter_iface, NULL); + filter1.IMediaSeeking_iface.lpVtbl = &testseek_vtbl; + filter1.support_media_time = FALSE; + filter1.support_testguid = TRUE; + + hr = IMediaSeeking_GetDuration(seeking, &time); + todo_wine ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + + hr = IMediaSeeking_SetTimeFormat(seeking, &testguid); + todo_wine ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + + IFilterGraph2_RemoveFilter(graph, &filter1.IBaseFilter_iface); + filter1.support_media_time = TRUE; + filter1.support_testguid = FALSE; + IFilterGraph2_AddFilter(graph, &filter1.IBaseFilter_iface, NULL); IFilterGraph2_AddFilter(graph, &filter2.IBaseFilter_iface, NULL); filter1.IMediaSeeking_iface.lpVtbl = &testseek_vtbl; @@ -4211,6 +4232,10 @@ static void test_graph_seeking(void) filter1.support_testguid = TRUE; hr = IMediaSeeking_SetTimeFormat(seeking, &testguid); todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(IsEqualGUID(&filter1.time_format, &testguid), "Got format %s.\n", + debugstr_guid(&filter1.time_format)); + ok(IsEqualGUID(&filter2.time_format, &TIME_FORMAT_MEDIA_TIME), + "Got format %s.\n", debugstr_guid(&filter2.time_format)); hr = IMediaSeeking_GetTimeFormat(seeking, &format); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -4225,8 +4250,53 @@ static void test_graph_seeking(void) hr = IMediaSeeking_IsUsingTimeFormat(seeking, &testguid); todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IMediaSeeking_SetTimeFormat(seeking, &TIME_FORMAT_MEDIA_TIME); + hr = IMediaSeeking_GetCapabilities(seeking, &caps); ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(caps == AM_SEEKING_CanDoSegments, "Got caps %#x.\n", caps); + ok(filter1.seeking_ref > 0, "Unexpected seeking refcount %d.\n", filter1.seeking_ref); + ok(filter2.seeking_ref > 0, "Unexpected seeking refcount %d.\n", filter2.seeking_ref); + + filter2.support_testguid = TRUE; + hr = IMediaSeeking_SetTimeFormat(seeking, &testguid); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(IsEqualGUID(&filter1.time_format, &TIME_FORMAT_MEDIA_TIME), + "Got format %s.\n", debugstr_guid(&filter1.time_format)); + todo_wine ok(IsEqualGUID(&filter2.time_format, &testguid), + "Got format %s.\n", debugstr_guid(&filter2.time_format)); + + filter1.support_media_time = FALSE; + flush_cached_seeking(graph, &filter1); + + hr = IMediaSeeking_GetCapabilities(seeking, &caps); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(caps == (AM_SEEKING_CanDoSegments | AM_SEEKING_CanGetDuration), "Got caps %#x.\n", caps); + todo_wine ok(!filter1.seeking_ref, "Unexpected seeking refcount %d.\n", filter1.seeking_ref); + ok(filter2.seeking_ref > 0, "Unexpected seeking refcount %d.\n", filter2.seeking_ref); + + filter1.support_media_time = TRUE; + filter1.support_testguid = FALSE; + flush_cached_seeking(graph, &filter1); + + hr = IMediaSeeking_GetCapabilities(seeking, &caps); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(caps == AM_SEEKING_CanDoSegments, "Got caps %#x.\n", caps); + ok(filter1.seeking_ref > 0, "Unexpected seeking refcount %d.\n", filter1.seeking_ref); + ok(filter2.seeking_ref > 0, "Unexpected seeking refcount %d.\n", filter2.seeking_ref); + + ok(IsEqualGUID(&filter1.time_format, &TIME_FORMAT_MEDIA_TIME), + "Got format %s.\n", debugstr_guid(&filter1.time_format)); + todo_wine ok(IsEqualGUID(&filter2.time_format, &testguid), + "Got format %s.\n", debugstr_guid(&filter2.time_format)); + hr = IMediaSeeking_GetTimeFormat(seeking, &format); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(IsEqualGUID(&format, &testguid), "Got format %s.\n", wine_dbgstr_guid(&format)); + + hr = IMediaSeeking_SetTimeFormat(seeking, &TIME_FORMAT_NONE); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaSeeking_GetTimeFormat(seeking, &format); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(IsEqualGUID(&format, &TIME_FORMAT_MEDIA_TIME), "Got format %s.\n", wine_dbgstr_guid(&format)); time = 0xdeadbeef; hr = IMediaSeeking_ConvertTimeFormat(seeking, &time, &testguid, 0x123456789a, &testguid); -- 2.29.0

2 2

[PATCH 1/3] bcrypt: Prevent gnutls from using system priority file.
by Paul Gofman Nov. 11, 2020

Nov. 11, 2020

Fedora 33 disabled protocols below TLS 1.2 through crypto policy [1]. https://fedoraproject.org/wiki/Changes/StrongCryptoSettings2#Strong_crypto_… Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- I suppose other distros are also likely to move this way. So we need to overrides that to keep earlier protocols working which still work on Windows. Gnutls finds and loads the system priority file during library initialization, so the override has effect only for the first dlopen( SONAME_LIBGNUTLS ) in the process and needs to be done in each place where Wine loads gnutls library. dlls/bcrypt/gnutls.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index e85085499ca..976fa44214a 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -224,6 +224,7 @@ static BOOL gnutls_initialize(void) { int ret; + setenv("GNUTLS_SYSTEM_PRIORITY_FILE", "/dev/null", 0); if (!(libgnutls_handle = dlopen( SONAME_LIBGNUTLS, RTLD_NOW ))) { ERR_(winediag)( "failed to load libgnutls, no support for encryption\n" ); -- 2.28.0

3 7

[PATCH 1/6] mf/evr: Handle sample requests from the mixer.
by Nikolay Sivov Nov. 11, 2020

Nov. 11, 2020

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/evr.c | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index 486958f5f79..a77372977c7 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -21,6 +21,7 @@ #include "mf_private.h" #include "uuids.h" #include "evr.h" +#include "evcode.h" #include "d3d9.h" #include "initguid.h" #include "dxva2api.h" @@ -1723,9 +1724,34 @@ static ULONG WINAPI video_renderer_event_sink_Release(IMediaEventSink *iface) static HRESULT WINAPI video_renderer_event_sink_Notify(IMediaEventSink *iface, LONG event, LONG_PTR param1, LONG_PTR param2) { - FIXME("%p, %d, %ld, %ld.\n", iface, event, param1, param2); + struct video_renderer *renderer = impl_from_IMediaEventSink(iface); + HRESULT hr = S_OK; + unsigned int idx; - return E_NOTIMPL; + TRACE("%p, %d, %ld, %ld.\n", iface, event, param1, param2); + + EnterCriticalSection(&renderer->cs); + + if (event == EC_SAMPLE_NEEDED) + { + idx = param1; + if (idx >= renderer->stream_count) + hr = MF_E_INVALIDSTREAMNUMBER; + else + { + hr = IMFMediaEventQueue_QueueEventParamVar(renderer->streams[idx]->event_queue, + MEStreamSinkRequestSample, &GUID_NULL, S_OK, NULL); + } + } + else + { + WARN("Unhandled event %d.\n", event); + hr = MF_E_UNEXPECTED; + } + + LeaveCriticalSection(&renderer->cs); + + return hr; } static const IMediaEventSinkVtbl media_event_sink_vtbl = -- 2.28.0

1 5

[PATCH 3/3] include: Add IRowsetUpdate interface
by Alistair Leslie-Hughes Nov. 11, 2020

Nov. 11, 2020

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/oledb.idl | 1 + include/rstupd.idl | 57 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+) create mode 100644 include/rstupd.idl diff --git a/include/oledb.idl b/include/oledb.idl index 256d5fc7917..5609e219320 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -75,6 +75,7 @@ typedef DWORD_PTR DBHASHVALUE; #include "cvttyp.idl" #include "cmdpre.idl" #include "rstchg.idl" +#include "rstupd.idl" cpp_quote("#include <accctrl.h>") diff --git a/include/rstupd.idl b/include/rstupd.idl new file mode 100644 index 00000000000..c823658edba --- /dev/null +++ b/include/rstupd.idl @@ -0,0 +1,57 @@ +/* + * Copyright (C) 2020 Alistair Leslie-Hughes + * + * 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 + */ +#if 0 +#pragma makedep install +#endif + +[ + local, + object, + uuid(0c733a6d-2a1c-11ce-ade5-00aa0044773d), + pointer_default(unique) +] +interface IRowsetUpdate : IRowsetChange +{ + typedef DWORD DBPENDINGSTATUS; + + enum DBPENDINGSTATUSENUM + { + DBPENDINGSTATUS_NEW = 0x01, + DBPENDINGSTATUS_CHANGED = 0x02, + DBPENDINGSTATUS_DELETED = 0x04, + DBPENDINGSTATUS_UNCHANGED = 0x08, + DBPENDINGSTATUS_INVALIDROW = 0x10, + }; + + HRESULT GetOriginalData([in] HROW row, [in] HACCESSOR accessor, [out] void *data ); + + HRESULT GetPendingRows([in] HCHAPTER reserved, [in] DBPENDINGSTATUS status, [in, out] DBCOUNTITEM *pending_cnt, + [out, size_is(,*pending_cnt)] HROW **rending_rows, + [out, size_is(,*pending_cnt)] DBPENDINGSTATUS **pending_status); + + HRESULT GetRowStatus([in] HCHAPTER reserved, [in] DBCOUNTITEM count, [in, size_is(count)] const HROW rows[], + [out, size_is(count)] DBPENDINGSTATUS status[]); + + HRESULT Undo([in] HCHAPTER reserved, [in] DBCOUNTITEM count, [in, size_is(count)] const HROW rows[], + [in, out] DBCOUNTITEM *undone_cnt, [out, size_is(,*undone_cnt)] HROW **undone, + [out, size_is(,*undone_cnt)] DBROWSTATUS ** status); + + HRESULT Update([in] HCHAPTER reserved, [in] DBCOUNTITEM count, [in, size_is(count)] const HROW rows[], + [in, out] DBCOUNTITEM *row_cnt, [out, size_is(,*row_cnt)] HROW **hrows, + [out, size_is(,*row_cnt)] DBROWSTATUS **status); +} -- 2.28.0

1 0

[PATCH 2/3] include: Add IRowsetChange interface
by Alistair Leslie-Hughes Nov. 11, 2020

Nov. 11, 2020

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/oledb.idl | 1 + include/rstchg.idl | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 include/rstchg.idl diff --git a/include/oledb.idl b/include/oledb.idl index 5060378b351..256d5fc7917 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -74,6 +74,7 @@ typedef DWORD_PTR DBHASHVALUE; #include "cmdprp.idl" #include "cvttyp.idl" #include "cmdpre.idl" +#include "rstchg.idl" cpp_quote("#include <accctrl.h>") diff --git a/include/rstchg.idl b/include/rstchg.idl new file mode 100644 index 00000000000..973db1aab13 --- /dev/null +++ b/include/rstchg.idl @@ -0,0 +1,36 @@ +/* + * Copyright (C) 2020 Alistair Leslie-Hughes + * + * 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 + */ +#if 0 +#pragma makedep install +#endif + +[ + local, + object, + uuid(0c733a05-2a1c-11ce-ade5-00aa0044773d), + pointer_default(unique) +] +interface IRowsetChange : IUnknown +{ + HRESULT DeleteRows([in] HCHAPTER reserved, [in] DBCOUNTITEM count, [in, size_is(count)] const HROW rows[], + [out, size_is(count)] DBROWSTATUS status[] ); + + HRESULT SetData([in] HROW row, [in] HACCESSOR accessor, [in] void *data); + + HRESULT InsertRow([in] HCHAPTER reserved, [in] HACCESSOR accessor, [in] void *data, [out] HROW *row); +} -- 2.28.0

1 0

[PATCH 1/3] include: Add ICommandPrepare interface
by Alistair Leslie-Hughes Nov. 11, 2020

Nov. 11, 2020

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdaps/usrmarshal.c | 24 +++++++++++++++++++++++ include/cmdpre.idl | 41 ++++++++++++++++++++++++++++++++++++++++ include/oledb.idl | 1 + 3 files changed, 66 insertions(+) create mode 100644 include/cmdpre.idl diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index fa086290061..917395b37bd 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -1629,3 +1629,27 @@ HRESULT __RPC_STUB IConvertType_CanConvert_Stub(IConvertType* This, DBTYPE from, FIXME("(%p)->(%d %d 0x%08x %p): stub\n", This, from, to, flags, error); return E_NOTIMPL; } + +HRESULT CALLBACK ICommandPrepare_Prepare_Proxy(ICommandPrepare* This, ULONG runs) +{ + FIXME("(%p)->(%d): stub\n", This, runs); + return E_NOTIMPL; +} + +HRESULT __RPC_STUB ICommandPrepare_Prepare_Stub(ICommandPrepare* This, ULONG runs, IErrorInfo **error) +{ + FIXME("(%p)->(%d %p): stub\n", This, runs, error); + return E_NOTIMPL; +} + +HRESULT CALLBACK ICommandPrepare_Unprepare_Proxy(ICommandPrepare* This) +{ + FIXME("(%p)->(): stub\n", This); + return E_NOTIMPL; +} + +HRESULT __RPC_STUB ICommandPrepare_Unprepare_Stub(ICommandPrepare* This, IErrorInfo **error) +{ + FIXME("(%p)->(%p): stub\n", This, error); + return E_NOTIMPL; +} diff --git a/include/cmdpre.idl b/include/cmdpre.idl new file mode 100644 index 00000000000..695149aae50 --- /dev/null +++ b/include/cmdpre.idl @@ -0,0 +1,41 @@ +/* + * Copyright (C) 2020 Alistair Leslie-Hughes + * + * 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 + */ + +#if 0 +#pragma makedep install +#endif + +[ + object, + uuid(0c733a26-2a1c-11ce-ade5-00aa0044773d), + pointer_default(unique) +] +interface ICommandPrepare : IUnknown +{ + [local] + HRESULT Prepare([in] ULONG runs); + + [call_as(Prepare)] + HRESULT RemotePrepare([in] ULONG runs,[out] IErrorInfo **error); + + [local] + HRESULT Unprepare(); + + [call_as(Unprepare)] + HRESULT RemoteUnprepare([out] IErrorInfo **error); +} diff --git a/include/oledb.idl b/include/oledb.idl index c56460262f5..5060378b351 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -73,6 +73,7 @@ typedef DWORD_PTR DBHASHVALUE; #include "cmdstrm.idl" #include "cmdprp.idl" #include "cvttyp.idl" +#include "cmdpre.idl" cpp_quote("#include <accctrl.h>") -- 2.28.0

1 0