November 2020 - Wine-devel - list.winehq.org

[PATCH] crypt32: Fix adding trusted roots to store.
by Paul Gofman 10 Nov '20

10 Nov '20

Fixes Steam client errors on SSL connections (regression from bd59aa6d66001cb1f8b308300a5ce57a7f7b65d5). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/crypt32/rootstore.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/crypt32/rootstore.c b/dlls/crypt32/rootstore.c index 87c9808f51b..d93de8fb37a 100644 --- a/dlls/crypt32/rootstore.c +++ b/dlls/crypt32/rootstore.c @@ -629,7 +629,7 @@ static void read_trusted_roots_from_known_locations(HCERTSTORE store) buffer = HeapAlloc( GetProcessHeap(), 0, needed ); size = needed; } - else CertAddEncodedCertificateToStore( store, X509_ASN_ENCODING, buffer, size, + else CertAddEncodedCertificateToStore( from, X509_ASN_ENCODING, buffer, needed, CERT_STORE_ADD_NEW, NULL ); } HeapFree( GetProcessHeap(), 0, buffer ); -- 2.28.0

1 0

[PATCH] server: Only allocate the required size in get_rawinput_buffer.
by Rémi Bernon 10 Nov '20

10 Nov '20

Instead of allocating the maximum reply size. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- CoD: WWII calls this with large buffer and it causes a high load on wineserver, although there may not even be any message to return. server/queue.c | 60 ++++++++++++++++++++++++++++++++------------------ 1 file changed, 38 insertions(+), 22 deletions(-) diff --git a/server/queue.c b/server/queue.c index 7e7e6fbdf29..3de4d241b8e 100644 --- a/server/queue.c +++ b/server/queue.c @@ -3251,19 +3251,13 @@ DECL_HANDLER(get_cursor_history) pos[i] = cursor_history[(i + cursor_history_latest) % ARRAY_SIZE(cursor_history)]; } -DECL_HANDLER(get_rawinput_buffer) +static void copy_rawinput_buffer( struct thread_input *input, char *reply_buf, data_size_t reply_buf_size, data_size_t *reply_size, + data_size_t client_buf_size, data_size_t client_elt_size, data_size_t *next_size, unsigned int *count ) { - struct thread_input *input = current->queue->input; - data_size_t size = 0, next_size = 0; + unsigned int n = 0; struct list *ptr; - char *buf, *cur; - int count = 0; + char *reply_ptr = reply_buf; - if (!req->buffer_size) buf = NULL; - else if (!(buf = mem_alloc( get_reply_max_size() ))) - return; - - cur = buf; ptr = list_head( &input->msg_list ); while (ptr) { @@ -3273,22 +3267,44 @@ DECL_HANDLER(get_rawinput_buffer) ptr = list_next( &input->msg_list, ptr ); if (msg->msg != WM_INPUT) continue; - next_size = req->rawinput_size; - if (size + next_size > req->buffer_size) break; - if (cur + sizeof(*data) > buf + get_reply_max_size()) break; + if (next_size) *next_size = client_elt_size; + if (client_buf_size < client_elt_size) break; + if (reply_buf_size < sizeof(*data)) break; - memcpy(cur, data, sizeof(*data)); - list_remove( &msg->entry ); - free_message( msg ); + if (reply_buf) + { + memcpy( reply_ptr, data, sizeof(*data) ); + list_remove( &msg->entry ); + free_message( msg ); + } - size += next_size; - cur += sizeof(*data); - count++; + client_buf_size -= client_elt_size; + reply_buf_size -= sizeof(*data); + reply_ptr += sizeof(*data); + n++; } - reply->next_size = next_size; - reply->count = count; - set_reply_data_ptr( buf, cur - buf ); + if (reply_size) *reply_size = reply_ptr - reply_buf; + if (count) *count = n; +} + +DECL_HANDLER(get_rawinput_buffer) +{ + struct thread_input *input = current->queue->input; + data_size_t reply_size; + char *reply_buf; + + reply->next_size = 0; + reply->count = 0; + + copy_rawinput_buffer( input, NULL, get_reply_max_size(), &reply_size, req->buffer_size, + req->rawinput_size, &reply->next_size, &reply->count ); + + if (!req->buffer_size || !reply_size) return; + if (!(reply_buf = set_reply_data_size( reply_size ))) return; + + copy_rawinput_buffer( input, reply_buf, reply_size, NULL, req->buffer_size, + req->rawinput_size, NULL, NULL ); } DECL_HANDLER(update_rawinput_devices) -- 2.29.2

1 0

[PATCH] advapi32: Implement LsaGetUserName.
by Dmitry Timoshkov 10 Nov '20

10 Nov '20

This is a resend, previous patch fell out of the list. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/lsa.c | 58 +++++++++++++++++++++++++++++++++++++ dlls/advapi32/tests/lsa.c | 50 +++++++++++++++++++++++++++++++- 3 files changed, 108 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index fcef859a7c..d5235c6adb 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -463,7 +463,7 @@ # @ stub LsaGetQuotasForAccount # @ stub LsaGetRemoteUserName @ stub LsaGetSystemAccessAccount -# @ stub LsaGetUserName +@ stdcall LsaGetUserName(ptr ptr) @ stub LsaICLookupNames # @ stub LsaICLookupNamesWithCreds @ stub LsaICLookupSids diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c index bd3585f8d0..12ba243a49 100644 --- a/dlls/advapi32/lsa.c +++ b/dlls/advapi32/lsa.c @@ -104,6 +104,64 @@ static void* ADVAPI_GetDomainName(unsigned sz, unsigned ofs) return ptr; } +/****************************************************************************** + * LsaGetUserName [ADVAPI32.@] + * + */ +NTSTATUS WINAPI LsaGetUserName(PUNICODE_STRING *user_name, PUNICODE_STRING *domain_name) +{ + UNICODE_STRING *user; + DWORD user_size; + + user_size = 0; + if (GetUserNameW(NULL, &user_size) || GetLastError() != ERROR_INSUFFICIENT_BUFFER) + return STATUS_UNSUCCESSFUL; + + user = heap_alloc(sizeof(*user) + user_size * sizeof(WCHAR)); + if (!user) return STATUS_NO_MEMORY; + + user->Buffer = (WCHAR *)(user + 1); + user->Length = user_size * sizeof(WCHAR); + user->MaximumLength = user->Length + sizeof(WCHAR); + if (!GetUserNameW(user->Buffer, &user_size)) + { + heap_free(user); + return STATUS_UNSUCCESSFUL; + } + + if (domain_name) + { + UNICODE_STRING *domain; + WCHAR computer[MAX_COMPUTERNAME_LENGTH + 1]; + DWORD domain_size; + + domain_size = ARRAY_SIZE(computer); + if (!GetComputerNameW(computer, &domain_size)) + { + heap_free(user); + return STATUS_UNSUCCESSFUL; + } + + domain = heap_alloc(sizeof(*domain) + domain_size * sizeof(WCHAR)); + if (!domain) + { + heap_free(user); + return STATUS_NO_MEMORY; + } + + domain->Buffer = (WCHAR *)(domain + 1); + domain->Length = domain_size * sizeof(WCHAR); + domain->MaximumLength = domain->Length + sizeof(WCHAR); + wcscpy(domain->Buffer, computer); + + *domain_name = domain; + } + + *user_name = user; + + return STATUS_SUCCESS; +} + /****************************************************************************** * LsaAddAccountRights [ADVAPI32.@] * diff --git a/dlls/advapi32/tests/lsa.c b/dlls/advapi32/tests/lsa.c index f2e10671a4..d616d509c8 100644 --- a/dlls/advapi32/tests/lsa.c +++ b/dlls/advapi32/tests/lsa.c @@ -2,6 +2,7 @@ * Unit tests for lsa functions * * Copyright (c) 2006 Robert Reif + * Copyright (c) 2020 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -38,6 +39,7 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); static BOOL (WINAPI *pGetSystemPreferredUILanguages)(DWORD, ULONG*, WCHAR*, ULONG*); +static NTSTATUS (WINAPI *pLsaGetUserName)(PUNICODE_STRING *user, PUNICODE_STRING *domain); static void test_lsa(void) { @@ -463,13 +465,59 @@ static void test_LsaLookupPrivilegeName(void) LsaFreeMemory(name); } +static void test_LsaGetUserName(void) +{ + NTSTATUS status; + BOOL ret; + UNICODE_STRING *lsa_user, *lsa_domain; + WCHAR user[256], computer[256]; + DWORD size; + + if (!pLsaGetUserName) + { + skip("LsaGetUserName is not available on this platform\n"); + return; + } + + size = ARRAY_SIZE(user); + ret = GetUserNameW(user, &size); + ok(ret, "GetUserName error %u\n", GetLastError()); + + size = ARRAY_SIZE(computer); + ret = GetComputerNameW(computer, &size); + ok(ret, "GetComputerName error %u\n", GetLastError()); + + if (0) /* crashes under Windows */ + status = pLsaGetUserName(NULL, NULL); + + if (0) /* crashes under Windows */ + status = pLsaGetUserName(NULL, &lsa_domain); + + status = pLsaGetUserName(&lsa_user, NULL); + ok(!status, "got %#x\n", status); + ok(!lstrcmpW(user, lsa_user->Buffer), "%s != %s\n", wine_dbgstr_w(user), wine_dbgstr_wn(lsa_user->Buffer, lsa_user->Length/sizeof(WCHAR))); + LsaFreeMemory(lsa_user); + + status = pLsaGetUserName(&lsa_user, &lsa_domain); + ok(!status, "got %#x\n", status); + ok(!lstrcmpW(user, lsa_user->Buffer), "%s != %s\n", wine_dbgstr_w(user), wine_dbgstr_wn(lsa_user->Buffer, lsa_user->Length/sizeof(WCHAR))); + /* Some Windows versions need case insensitive comparison */ + ok(!lstrcmpiW(computer, lsa_domain->Buffer), "%s != %s\n", wine_dbgstr_w(computer), wine_dbgstr_wn(lsa_domain->Buffer, lsa_domain->Length/sizeof(WCHAR))); + LsaFreeMemory(lsa_user); + LsaFreeMemory(lsa_domain); +} + START_TEST(lsa) { - HMODULE hkernel32 = GetModuleHandleA("kernel32"); + HMODULE hkernel32 = GetModuleHandleA("kernel32.dll"); + HMODULE hadvapi32 = GetModuleHandleA("advapi32.dll"); + pGetSystemPreferredUILanguages = (void*)GetProcAddress(hkernel32, "GetSystemPreferredUILanguages"); + pLsaGetUserName = (void *)GetProcAddress(hadvapi32, "LsaGetUserName"); test_lsa(); test_LsaLookupNames2(); test_LsaLookupSids(); test_LsaLookupPrivilegeName(); + test_LsaGetUserName(); } -- 2.29.2

2 1

[PATCH 1/5] evr/presenter: Create sample allocator on object creation.
by Nikolay Sivov 10 Nov '20

10 Nov '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/evr/presenter.c | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 335e5df2459..2102882e084 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -70,6 +70,7 @@ struct video_presenter IMediaEventSink *event_sink; IDirect3DDeviceManager9 *device_manager; + IMFVideoSampleAllocator *allocator; struct streaming_thread thread; IMFMediaType *media_type; UINT reset_token; @@ -175,12 +176,13 @@ static void video_presenter_reset_media_type(struct video_presenter *presenter) IMFMediaType_Release(presenter->media_type); presenter->media_type = NULL; - /* FIXME: release samples pool */ + IMFVideoSampleAllocator_UninitializeSampleAllocator(presenter->allocator); } static HRESULT video_presenter_set_media_type(struct video_presenter *presenter, IMFMediaType *media_type) { unsigned int flags; + HRESULT hr; if (!media_type) { @@ -193,12 +195,15 @@ static HRESULT video_presenter_set_media_type(struct video_presenter *presenter, video_presenter_reset_media_type(presenter); - /* FIXME: allocate samples pool */ - - presenter->media_type = media_type; - IMFMediaType_AddRef(presenter->media_type); + if (SUCCEEDED(hr = IMFVideoSampleAllocator_InitializeSampleAllocator(presenter->allocator, 3, media_type))) + { + presenter->media_type = media_type; + IMFMediaType_AddRef(presenter->media_type); + } + else + WARN("Failed to initialize sample allocator, hr %#x.\n", hr); - return S_OK; + return hr; } static HRESULT video_presenter_invalidate_media_type(struct video_presenter *presenter) @@ -220,7 +225,9 @@ static HRESULT video_presenter_invalidate_media_type(struct video_presenter *pre if (SUCCEEDED(hr)) hr = video_presenter_set_media_type(presenter, media_type); - hr = IMFTransform_SetOutputType(presenter->mixer, 0, media_type, 0); + if (SUCCEEDED(hr)) + hr = IMFTransform_SetOutputType(presenter->mixer, 0, media_type, 0); + IMFMediaType_Release(media_type); if (SUCCEEDED(hr)) @@ -388,9 +395,12 @@ static ULONG WINAPI video_presenter_inner_Release(IUnknown *iface) { video_presenter_end_streaming(presenter); video_presenter_clear_container(presenter); + video_presenter_reset_media_type(presenter); DeleteCriticalSection(&presenter->cs); if (presenter->device_manager) IDirect3DDeviceManager9_Release(presenter->device_manager); + if (presenter->allocator) + IMFVideoSampleAllocator_Release(presenter->allocator); heap_free(presenter); } @@ -1179,6 +1189,11 @@ static HRESULT video_presenter_init_d3d(struct video_presenter *presenter) if (FAILED(hr)) WARN("Failed to set new device for the manager, hr %#x.\n", hr); + if (SUCCEEDED(hr = MFCreateVideoSampleAllocator(&IID_IMFVideoSampleAllocator, (void **)&presenter->allocator))) + { + hr = IMFVideoSampleAllocator_SetDirectXManager(presenter->allocator, (IUnknown *)presenter->device_manager); + } + return hr; } -- 2.28.0

1 4

[PATCH] user32: Remove usp10 from delayed imports.
by Nikolay Sivov 10 Nov '20

10 Nov '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/user32/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/Makefile.in b/dlls/user32/Makefile.in index c371e1fc28e..49a52eeff32 100644 --- a/dlls/user32/Makefile.in +++ b/dlls/user32/Makefile.in @@ -3,7 +3,7 @@ MODULE = user32.dll IMPORTLIB = user32 IMPORTS = setupapi gdi32 version sechost advapi32 kernelbase EXTRAINCL = $(PNG_CFLAGS) -DELAYIMPORTS = hid imm32 usp10 +DELAYIMPORTS = hid imm32 EXTRADLLFLAGS = -mno-cygwin -- 2.28.0

2 1

[PATCH] mshtml: Fix the spelling of the filter attribute.
by Francois Gouget 10 Nov '20

10 Nov '20

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- I found no indication that this is supposed to be misspelt. dlls/mshtml/htmlstyle.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index dc5b136edb3..ae21c1f7299 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -415,7 +415,7 @@ static const style_tbl_entry_t style_tbl[] = { DISPID_A_DISPLAY }, { - L"fileter", + L"filter", DISPID_IHTMLCSSSTYLEDECLARATION_FILTER, DISPID_A_FILTER }, -- 2.20.1

2 1

[PATCH] vbscript: Allow keywords to be used as property name.
by Robert Wilhelm 10 Nov '20

10 Nov '20

Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> --- dlls/vbscript/parser.y | 6 +++--- dlls/vbscript/tests/lang.vbs | 13 +++++++++++++ 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 7c749b5ef77..a9f4c540fcb 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -452,11 +452,11 @@ ClassBody | PropertyDecl StSep ClassBody { $$ = add_class_function(ctx, $3, $1); CHECK_ERROR; } PropertyDecl - : Storage_opt tPROPERTY tGET tIdentifier ArgumentsDecl_opt StSep BodyStatements tEND tPROPERTY + : Storage_opt tPROPERTY tGET Identifier ArgumentsDecl_opt StSep BodyStatements tEND tPROPERTY { $$ = new_function_decl(ctx, $4, FUNC_PROPGET, $1, $5, $7); CHECK_ERROR; } - | Storage_opt tPROPERTY tLET tIdentifier '(' ArgumentDecl ')' StSep BodyStatements tEND tPROPERTY + | Storage_opt tPROPERTY tLET Identifier '(' ArgumentDecl ')' StSep BodyStatements tEND tPROPERTY { $$ = new_function_decl(ctx, $4, FUNC_PROPLET, $1, $6, $9); CHECK_ERROR; } - | Storage_opt tPROPERTY tSET tIdentifier '(' ArgumentDecl ')' StSep BodyStatements tEND tPROPERTY + | Storage_opt tPROPERTY tSET Identifier '(' ArgumentDecl ')' StSep BodyStatements tEND tPROPERTY { $$ = new_function_decl(ctx, $4, FUNC_PROPSET, $1, $6, $9); CHECK_ERROR; } FunctionDecl diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 570bb7fbcb3..53f36b6e710 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -1656,6 +1656,19 @@ Class class_test_identifiers_as_function_name End Sub End Class +Class class_test_identifiers_as_property_name + Public Property Get Property() + End Property + + Public Property Let Error(par) + Error = par + End Property + + Public Property Set Default(par) + Set Default = par + End Property +End Class + sub test_dotIdentifiers ' test keywords that can also be an identifier after a dot Call ok(testObj.rem = 10, "testObj.rem = " & testObj.rem & " expected 10") -- 2.26.2

2 1

[PATCH 3/3] include: Add IConvertType interface
by Alistair Leslie-Hughes 10 Nov '20

10 Nov '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdaps/usrmarshal.c | 15 +++++++++++- include/cvttyp.idl | 50 ++++++++++++++++++++++++++++++++++++++++ include/oledb.idl | 1 + 3 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 include/cvttyp.idl diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index 98f732fac44..fa086290061 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -1615,4 +1615,17 @@ HRESULT __RPC_STUB ICommandProperties_SetProperties_Stub(ICommandProperties* Thi { FIXME("(%p)->(%d %p %d %p %p): stub\n", This, count, propertyset, total, propstatus, error); return E_NOTIMPL; -} \ No newline at end of file +} + +HRESULT CALLBACK IConvertType_CanConvert_Proxy(IConvertType* This, DBTYPE from, DBTYPE to, DBCONVERTFLAGS flags) +{ + FIXME("(%p)->(%d %d 0x%08x): stub\n", This, from, to, flags); + return E_NOTIMPL; +} + +HRESULT __RPC_STUB IConvertType_CanConvert_Stub(IConvertType* This, DBTYPE from, DBTYPE to, + DBCONVERTFLAGS flags, IErrorInfo **error) +{ + FIXME("(%p)->(%d %d 0x%08x %p): stub\n", This, from, to, flags, error); + return E_NOTIMPL; +} diff --git a/include/cvttyp.idl b/include/cvttyp.idl new file mode 100644 index 00000000000..87bc385a5ba --- /dev/null +++ b/include/cvttyp.idl @@ -0,0 +1,50 @@ +/* + * 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(0c733a88-2a1c-11ce-ade5-00aa0044773d), + pointer_default(unique) +] +interface IConvertType : IUnknown +{ + typedef DWORD DBCONVERTFLAGS; + + enum DBCONVERTFLAGSENUM + { + DBCONVERTFLAGS_COLUMN = 0x000, + DBCONVERTFLAGS_PARAMETER = 0x001, + }; + + enum DBCONVERTFLAGSENUM20 + { + DBCONVERTFLAGS_ISLONG = 0x002, + DBCONVERTFLAGS_ISFIXEDLENGTH = 0x004, + DBCONVERTFLAGS_FROMVARIANT = 0x008, + }; + + [local] + HRESULT CanConvert([in] DBTYPE from, [in] DBTYPE to, [in] DBCONVERTFLAGS flags); + + [call_as(CanConvert)] + HRESULT RemoteCanConvert([in] DBTYPE from, [in] DBTYPE to, [in] DBCONVERTFLAGS flags, [out] IErrorInfo **error); +} diff --git a/include/oledb.idl b/include/oledb.idl index 4370c7f6bcc..c56460262f5 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -72,6 +72,7 @@ typedef DWORD_PTR DBHASHVALUE; #include "getdts.idl" #include "cmdstrm.idl" #include "cmdprp.idl" +#include "cvttyp.idl" cpp_quote("#include <accctrl.h>") -- 2.28.0

1 0

[PATCH 2/3] include: Add ICommandProperties interface
by Alistair Leslie-Hughes 10 Nov '20

10 Nov '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdaps/usrmarshal.c | 27 ++++++++++++++++++++++++ include/cmdprp.idl | 44 ++++++++++++++++++++++++++++++++++++++++ include/oledb.idl | 1 + 3 files changed, 72 insertions(+) create mode 100644 include/cmdprp.idl diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index 2fe4e60b68b..98f732fac44 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -1589,3 +1589,30 @@ HRESULT __RPC_STUB IGetDataSource_GetDataSource_Stub(IGetDataSource* This, REFII FIXME("(%p)->(%s %p %p): stub\n", This, debugstr_guid(riid), datasource, error); return E_NOTIMPL; } + +HRESULT CALLBACK ICommandProperties_GetProperties_Proxy(ICommandProperties* This, const ULONG count, + const DBPROPIDSET propertyidsets[], ULONG *sets_cnt, DBPROPSET **propertyset) +{ + FIXME("(%p)->(%d %p %p %p): stub\n", This, count, propertyidsets, sets_cnt, propertyset); + return E_NOTIMPL; +} + +HRESULT __RPC_STUB ICommandProperties_GetProperties_Stub(ICommandProperties* This, const ULONG count, + const DBPROPIDSET *propertyidsets, ULONG *sets_cnt, DBPROPSET **propertyset, IErrorInfo **error) +{ + FIXME("(%p)->(%d %p %p %p %p): stub\n", This, count, propertyidsets, sets_cnt, propertyset, error); + return E_NOTIMPL; +} + +HRESULT CALLBACK ICommandProperties_SetProperties_Proxy(ICommandProperties* This, ULONG count, DBPROPSET propertyset[]) +{ + FIXME("(%p)->(%d %p): stub\n", This, count, propertyset); + return E_NOTIMPL; +} + +HRESULT __RPC_STUB ICommandProperties_SetProperties_Stub(ICommandProperties* This, ULONG count, + DBPROPSET *propertyset, ULONG total, DBPROPSTATUS *propstatus, IErrorInfo **error) +{ + FIXME("(%p)->(%d %p %d %p %p): stub\n", This, count, propertyset, total, propstatus, error); + return E_NOTIMPL; +} \ No newline at end of file diff --git a/include/cmdprp.idl b/include/cmdprp.idl new file mode 100644 index 00000000000..ce9e7075523 --- /dev/null +++ b/include/cmdprp.idl @@ -0,0 +1,44 @@ +/* + * 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(0c733a79-2a1c-11ce-ade5-00aa0044773d), + pointer_default(unique) +] +interface ICommandProperties : IUnknown +{ + [local] + HRESULT GetProperties([in] ULONG count, [in, size_is(count)] const DBPROPIDSET propertyidsets[], + [in, out] ULONG *sets_cnt, [out, size_is(,*sets_cnt)] DBPROPSET **propertyset); + + [call_as(GetProperties)] + HRESULT RemoteGetProperties([in] ULONG count, [in, unique, size_is(count)] const DBPROPIDSET *propertyidsets, + [in, out] ULONG *sets_cnt, [out, size_is(,*sets_cnt)] DBPROPSET **propertyset, [out] IErrorInfo **error); + + [local] + HRESULT SetProperties([in] ULONG count, [in, out, unique, size_is(count)] DBPROPSET propertyset[]); + + [call_as(SetProperties)] + HRESULT RemoteSetProperties([in] ULONG count, [in, unique, size_is(count)] DBPROPSET *propertyset, + [in] ULONG total, [out, size_is(total)] DBPROPSTATUS *propstatus, [out] IErrorInfo **error); +} diff --git a/include/oledb.idl b/include/oledb.idl index 87d148f67b4..4370c7f6bcc 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -71,6 +71,7 @@ typedef DWORD_PTR DBHASHVALUE; #include "errrec.idl" #include "getdts.idl" #include "cmdstrm.idl" +#include "cmdprp.idl" cpp_quote("#include <accctrl.h>") -- 2.28.0

1 0

[PATCH 1/3] include: Add ICommandStream interface
by Alistair Leslie-Hughes 10 Nov '20

10 Nov '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/cmdstrm.idl | 35 +++++++++++++++++++++++++++++++++++ include/oledb.idl | 1 + 2 files changed, 36 insertions(+) create mode 100644 include/cmdstrm.idl diff --git a/include/cmdstrm.idl b/include/cmdstrm.idl new file mode 100644 index 00000000000..caadf046f1b --- /dev/null +++ b/include/cmdstrm.idl @@ -0,0 +1,35 @@ +/* + * 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(0c733abf-2a1c-11ce-ade5-00aa0044773d), + pointer_default(unique) +] +interface ICommandStream : IUnknown +{ + [local] + HRESULT GetCommandStream([out] IID *iid, [in,out] GUID *dialect, [out, iid_is(*iid)] IUnknown **commandstream); + + [local] + HRESULT SetCommandStream([in] REFIID riid, [in] REFGUID dialect, [in, iid_is(riid)] IUnknown *commandstream); +} diff --git a/include/oledb.idl b/include/oledb.idl index 1ffbefa9ffd..87d148f67b4 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -70,6 +70,7 @@ typedef DWORD_PTR DBHASHVALUE; #include "crtrow.idl" #include "errrec.idl" #include "getdts.idl" +#include "cmdstrm.idl" cpp_quote("#include <accctrl.h>") -- 2.28.0

1 0