wine-commits November 2018

wine-commits@winehq.org

2 participants
951 discussions

Zebediah Figura : rpcrt4: Add a stub implementation of CreateStubFromTypeInfo().
by Alexandre Julliard 08 Nov '18

08 Nov '18

Module: wine Branch: master Commit: 57493dc224fcfcb0cffc2894cf8c9522e8de8c5d URL: https://source.winehq.org/git/wine.git/?a=commit;h=57493dc224fcfcb0cffc2894… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Nov 3 18:07:14 2018 -0500 rpcrt4: Add a stub implementation of CreateStubFromTypeInfo(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/cproxy.c | 21 --------------------- dlls/rpcrt4/ndr_typelib.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 21 deletions(-) diff --git a/dlls/rpcrt4/cproxy.c b/dlls/rpcrt4/cproxy.c index 7ca05e7..6f15ed5 100644 --- a/dlls/rpcrt4/cproxy.c +++ b/dlls/rpcrt4/cproxy.c @@ -512,24 +512,3 @@ HRESULT WINAPI NdrProxyErrorHandler(DWORD dwExceptionCode) else return HRESULT_FROM_WIN32(dwExceptionCode); } - -HRESULT WINAPI -CreateStubFromTypeInfo(ITypeInfo *pTypeInfo, REFIID riid, IUnknown *pUnkServer, - IRpcStubBuffer **ppStub ) -{ - typedef INT (WINAPI *MessageBoxA)(HWND,LPCSTR,LPCSTR,UINT); - HMODULE hUser32 = LoadLibraryA("user32"); - MessageBoxA pMessageBoxA = (void *)GetProcAddress(hUser32, "MessageBoxA"); - - FIXME("%p %s %p %p\n", pTypeInfo, debugstr_guid(riid), pUnkServer, ppStub); - if (pMessageBoxA) - { - pMessageBoxA(NULL, - "The native implementation of OLEAUT32.DLL cannot be used " - "with Wine's RPCRT4.DLL. Remove OLEAUT32.DLL and try again.\n", - "Wine: Unimplemented CreateProxyFromTypeInfo", - 0x10); - ExitProcess(1); - } - return E_NOTIMPL; -} diff --git a/dlls/rpcrt4/ndr_typelib.c b/dlls/rpcrt4/ndr_typelib.c index 13075ac..c0db6b7 100644 --- a/dlls/rpcrt4/ndr_typelib.c +++ b/dlls/rpcrt4/ndr_typelib.c @@ -91,3 +91,39 @@ HRESULT WINAPI CreateProxyFromTypeInfo(ITypeInfo *typeinfo, IUnknown *outer, return hr; } + +struct typelib_stub +{ + CStdStubBuffer stub; +}; + +static HRESULT typelib_stub_init(struct typelib_stub *stub, IUnknown *server, + IRpcStubBuffer **stub_buffer) +{ + stub->stub.RefCount = 1; + *stub_buffer = (IRpcStubBuffer *)&stub->stub; + + return E_NOTIMPL; +} + +HRESULT WINAPI CreateStubFromTypeInfo(ITypeInfo *typeinfo, REFIID iid, + IUnknown *server, IRpcStubBuffer **stub_buffer) +{ + struct typelib_stub *stub; + HRESULT hr; + + TRACE("typeinfo %p, iid %s, server %p, stub_buffer %p.\n", + typeinfo, debugstr_guid(iid), server, stub_buffer); + + if (!(stub = heap_alloc_zero(sizeof(*stub)))) + { + ERR("Failed to allocate stub object.\n"); + return E_OUTOFMEMORY; + } + + hr = typelib_stub_init(stub, server, stub_buffer); + if (FAILED(hr)) + heap_free(stub); + + return hr; +}

1 0

Zebediah Figura : rpcrt4: Add a stub implementation of CreateProxyFromTypeInfo().
by Alexandre Julliard 08 Nov '18

08 Nov '18

Module: wine Branch: master Commit: 12021a565a7f2e90952a8ec31cbd779d44e1c26d URL: https://source.winehq.org/git/wine.git/?a=commit;h=12021a565a7f2e90952a8ec3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Nov 3 18:07:13 2018 -0500 rpcrt4: Add a stub implementation of CreateProxyFromTypeInfo(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/Makefile.in | 1 + dlls/rpcrt4/cproxy.c | 47 ++---------------------- dlls/rpcrt4/cpsf.h | 20 ++++++++++ dlls/rpcrt4/ndr_typelib.c | 93 +++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 118 insertions(+), 43 deletions(-) diff --git a/dlls/rpcrt4/Makefile.in b/dlls/rpcrt4/Makefile.in index 92070ea..ad67edf 100644 --- a/dlls/rpcrt4/Makefile.in +++ b/dlls/rpcrt4/Makefile.in @@ -15,6 +15,7 @@ C_SRCS = \ ndr_marshall.c \ ndr_ole.c \ ndr_stubless.c \ + ndr_typelib.c \ rpc_assoc.c \ rpc_async.c \ rpc_binding.c \ diff --git a/dlls/rpcrt4/cproxy.c b/dlls/rpcrt4/cproxy.c index 71ae560..7ca05e7 100644 --- a/dlls/rpcrt4/cproxy.c +++ b/dlls/rpcrt4/cproxy.c @@ -42,21 +42,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); -/* I don't know what MS's std proxy structure looks like, - so this probably doesn't match, but that shouldn't matter */ -typedef struct { - IRpcProxyBuffer IRpcProxyBuffer_iface; - LPVOID *PVtbl; - LONG RefCount; - const IID* piid; - LPUNKNOWN pUnkOuter; - IUnknown *base_object; /* must be at offset 0x10 from PVtbl */ - IRpcProxyBuffer *base_proxy; - PCInterfaceName name; - LPPSFACTORYBUFFER pPSFactory; - LPRPCCHANNELBUFFER pChannel; -} StdProxyImpl; - static const IRpcProxyBufferVtbl StdProxy_Vtbl; static inline StdProxyImpl *impl_from_IRpcProxyBuffer(IRpcProxyBuffer *iface) @@ -296,9 +281,7 @@ HRESULT StdProxy_Construct(REFIID riid, return S_OK; } -static HRESULT WINAPI StdProxy_QueryInterface(LPRPCPROXYBUFFER iface, - REFIID riid, - LPVOID *obj) +HRESULT WINAPI StdProxy_QueryInterface(IRpcProxyBuffer *iface, REFIID riid, void **obj) { StdProxyImpl *This = impl_from_IRpcProxyBuffer(iface); TRACE("(%p)->QueryInterface(%s,%p)\n",This,debugstr_guid(riid),obj); @@ -319,7 +302,7 @@ static HRESULT WINAPI StdProxy_QueryInterface(LPRPCPROXYBUFFER iface, return E_NOINTERFACE; } -static ULONG WINAPI StdProxy_AddRef(LPRPCPROXYBUFFER iface) +ULONG WINAPI StdProxy_AddRef(IRpcProxyBuffer *iface) { StdProxyImpl *This = impl_from_IRpcProxyBuffer(iface); TRACE("(%p)->AddRef()\n",This); @@ -349,8 +332,7 @@ static ULONG WINAPI StdProxy_Release(LPRPCPROXYBUFFER iface) return refs; } -static HRESULT WINAPI StdProxy_Connect(LPRPCPROXYBUFFER iface, - LPRPCCHANNELBUFFER pChannel) +HRESULT WINAPI StdProxy_Connect(IRpcProxyBuffer *iface, IRpcChannelBuffer *pChannel) { StdProxyImpl *This = impl_from_IRpcProxyBuffer(iface); TRACE("(%p)->Connect(%p)\n",This,pChannel); @@ -361,7 +343,7 @@ static HRESULT WINAPI StdProxy_Connect(LPRPCPROXYBUFFER iface, return S_OK; } -static VOID WINAPI StdProxy_Disconnect(LPRPCPROXYBUFFER iface) +void WINAPI StdProxy_Disconnect(IRpcProxyBuffer *iface) { StdProxyImpl *This = impl_from_IRpcProxyBuffer(iface); TRACE("(%p)->Disconnect()\n",This); @@ -532,27 +514,6 @@ HRESULT WINAPI NdrProxyErrorHandler(DWORD dwExceptionCode) } HRESULT WINAPI -CreateProxyFromTypeInfo( LPTYPEINFO pTypeInfo, LPUNKNOWN pUnkOuter, REFIID riid, - LPRPCPROXYBUFFER *ppProxy, LPVOID *ppv ) -{ - typedef INT (WINAPI *MessageBoxA)(HWND,LPCSTR,LPCSTR,UINT); - HMODULE hUser32 = LoadLibraryA("user32"); - MessageBoxA pMessageBoxA = (void *)GetProcAddress(hUser32, "MessageBoxA"); - - FIXME("%p %p %s %p %p\n", pTypeInfo, pUnkOuter, debugstr_guid(riid), ppProxy, ppv); - if (pMessageBoxA) - { - pMessageBoxA(NULL, - "The native implementation of OLEAUT32.DLL cannot be used " - "with Wine's RPCRT4.DLL. Remove OLEAUT32.DLL and try again.\n", - "Wine: Unimplemented CreateProxyFromTypeInfo", - 0x10); - ExitProcess(1); - } - return E_NOTIMPL; -} - -HRESULT WINAPI CreateStubFromTypeInfo(ITypeInfo *pTypeInfo, REFIID riid, IUnknown *pUnkServer, IRpcStubBuffer **ppStub ) { diff --git a/dlls/rpcrt4/cpsf.h b/dlls/rpcrt4/cpsf.h index 964fb45..0ada0d1 100644 --- a/dlls/rpcrt4/cpsf.h +++ b/dlls/rpcrt4/cpsf.h @@ -21,9 +21,29 @@ #ifndef __WINE_CPSF_H #define __WINE_CPSF_H +typedef struct +{ + IRpcProxyBuffer IRpcProxyBuffer_iface; + void **PVtbl; + LONG RefCount; + const IID *piid; + IUnknown *pUnkOuter; + /* offset of base_object from PVtbl must match assembly thunks; see + * fill_delegated_proxy_table() */ + IUnknown *base_object; + IRpcProxyBuffer *base_proxy; + PCInterfaceName name; + IPSFactoryBuffer *pPSFactory; + IRpcChannelBuffer *pChannel; +} StdProxyImpl; + HRESULT StdProxy_Construct(REFIID riid, LPUNKNOWN pUnkOuter, const ProxyFileInfo *ProxyInfo, int Index, LPPSFACTORYBUFFER pPSFactory, LPRPCPROXYBUFFER *ppProxy, LPVOID *ppvObj) DECLSPEC_HIDDEN; +HRESULT WINAPI StdProxy_QueryInterface(IRpcProxyBuffer *iface, REFIID iid, void **obj) DECLSPEC_HIDDEN; +ULONG WINAPI StdProxy_AddRef(IRpcProxyBuffer *iface) DECLSPEC_HIDDEN; +HRESULT WINAPI StdProxy_Connect(IRpcProxyBuffer *iface, IRpcChannelBuffer *channel) DECLSPEC_HIDDEN; +void WINAPI StdProxy_Disconnect(IRpcProxyBuffer *iface) DECLSPEC_HIDDEN; HRESULT CStdStubBuffer_Construct(REFIID riid, LPUNKNOWN pUnkServer, PCInterfaceName name, CInterfaceStubVtbl *vtbl, LPPSFACTORYBUFFER pPSFactory, diff --git a/dlls/rpcrt4/ndr_typelib.c b/dlls/rpcrt4/ndr_typelib.c new file mode 100644 index 0000000..13075ac --- /dev/null +++ b/dlls/rpcrt4/ndr_typelib.c @@ -0,0 +1,93 @@ +/* + * Type library proxy/stub implementation + * + * Copyright 2018 Zebediah Figura + * + * 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 + */ + +#define COBJMACROS +#include "oaidl.h" +#include "rpcproxy.h" +#include "wine/debug.h" +#include "wine/heap.h" + +#include "cpsf.h" + +WINE_DEFAULT_DEBUG_CHANNEL(ole); + +struct typelib_proxy +{ + StdProxyImpl proxy; +}; + +static ULONG WINAPI typelib_proxy_Release(IRpcProxyBuffer *iface) +{ + struct typelib_proxy *proxy = CONTAINING_RECORD(iface, struct typelib_proxy, proxy.IRpcProxyBuffer_iface); + ULONG refcount = InterlockedDecrement(&proxy->proxy.RefCount); + + TRACE("(%p) decreasing refs to %d\n", proxy, refcount); + + if (!refcount) + { + heap_free(proxy); + } + return refcount; +} + +static const IRpcProxyBufferVtbl typelib_proxy_vtbl = +{ + StdProxy_QueryInterface, + StdProxy_AddRef, + typelib_proxy_Release, + StdProxy_Connect, + StdProxy_Disconnect, +}; + +static HRESULT typelib_proxy_init(struct typelib_proxy *proxy, IUnknown *outer, + IRpcProxyBuffer **proxy_buffer, void **out) +{ + if (!outer) outer = (IUnknown *)&proxy->proxy; + + proxy->proxy.IRpcProxyBuffer_iface.lpVtbl = &typelib_proxy_vtbl; + proxy->proxy.RefCount = 1; + proxy->proxy.pUnkOuter = outer; + + *proxy_buffer = &proxy->proxy.IRpcProxyBuffer_iface; + + return E_NOTIMPL; +} + +HRESULT WINAPI CreateProxyFromTypeInfo(ITypeInfo *typeinfo, IUnknown *outer, + REFIID iid, IRpcProxyBuffer **proxy_buffer, void **out) +{ + struct typelib_proxy *proxy; + HRESULT hr; + + TRACE("typeinfo %p, outer %p, iid %s, proxy %p, out %p.\n", + typeinfo, outer, debugstr_guid(iid), proxy_buffer, out); + + if (!(proxy = heap_alloc_zero(sizeof(*proxy)))) + { + ERR("Failed to allocate proxy object.\n"); + return E_OUTOFMEMORY; + } + + hr = typelib_proxy_init(proxy, outer, proxy_buffer, out); + if (FAILED(hr)) + heap_free(proxy); + + return hr; +}

1 0

Hans Leidekker : webservices: Fix handling of union fields that match noneEnumValue.
by Alexandre Julliard 08 Nov '18

08 Nov '18

Module: wine Branch: master Commit: 7dd6388c1ed61b6e56b19b4d4b02cbb2d1b44a40 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7dd6388c1ed61b6e56b19b4d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 8 09:54:22 2018 +0100 webservices: Fix handling of union fields that match noneEnumValue. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 31 ++++++++++++++++++++++++++++--- dlls/webservices/writer.c | 19 +++---------------- 2 files changed, 31 insertions(+), 19 deletions(-) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index f46578b..a55da60 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -3913,11 +3913,11 @@ static void test_union_type(void) { static const WCHAR testW[] = {'t','e','s','t',0}; static WS_XML_STRING str_ns = {0, NULL}, str_a = {1, (BYTE *)"a"}, str_b = {1, (BYTE *)"b"}; - static WS_XML_STRING str_s = {1, (BYTE *)"s"}, str_t = {1, (BYTE *)"t"}; + static WS_XML_STRING str_none = {4, (BYTE *)"none"}, str_s = {1, (BYTE *)"s"}, str_t = {1, (BYTE *)"t"}; HRESULT hr; WS_XML_WRITER *writer; WS_UNION_DESCRIPTION u; - WS_UNION_FIELD_DESCRIPTION f, f2, *fields[2]; + WS_UNION_FIELD_DESCRIPTION f, f2, f3, *fields[3]; WS_FIELD_DESCRIPTION f_struct, *fields_struct[1]; WS_STRUCT_DESCRIPTION s; enum choice {CHOICE_A = 30, CHOICE_B = 20, CHOICE_C = 10, CHOICE_NONE = 0}; @@ -3929,6 +3929,7 @@ static void test_union_type(void) { const WCHAR *a; UINT32 b; + BOOL none; } value; } test; @@ -4020,11 +4021,35 @@ static void test_union_type(void) WS_WRITE_REQUIRED_VALUE, &test, sizeof(test), NULL ); ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + /* field value equals noneEnumValue */ + memset( &f3, 0, sizeof(f3) ); + f3.value = CHOICE_NONE; + f3.field.mapping = WS_ELEMENT_FIELD_MAPPING; + f3.field.localName = &str_none; + f3.field.ns = &str_ns; + f3.field.type = WS_BOOL_TYPE; + f3.field.offset = FIELD_OFFSET(struct test, value.none); + fields[2] = &f3; + + u.fieldCount = 3; + u.valueIndices = NULL; + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsWriteStartElement( writer, NULL, &str_t, &str_ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + test.choice = CHOICE_NONE; + test.value.none = TRUE; + hr = WsWriteType( writer, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, + WS_WRITE_REQUIRED_VALUE, &test, sizeof(test), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "<t><none>true</none></t>", __LINE__ ); + hr = set_output( writer ); ok( hr == S_OK, "got %08x\n", hr ); hr = WsWriteStartElement( writer, NULL, &str_t, &str_ns, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - test.choice = CHOICE_NONE; f_struct.options = WS_FIELD_OPTIONAL; hr = WsWriteType( writer, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_WRITE_REQUIRED_VALUE, &test, sizeof(test), NULL ); diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 0f20049..0a28d9d 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -3626,24 +3626,11 @@ static HRESULT write_type_union( struct writer *writer, const WS_UNION_DESCRIPTI int enum_value; HRESULT hr; - if ((hr = get_value_ptr( option, value, size, desc->size, &ptr )) != S_OK) return hr; - if (size < sizeof(enum_value)) return E_INVALIDARG; - if ((enum_value = *(int *)(char *)ptr + desc->enumOffset) == desc->noneEnumValue) - { - switch (option) - { - case WS_WRITE_REQUIRED_VALUE: - return WS_E_INVALID_FORMAT; - - case WS_WRITE_NILLABLE_VALUE: - return S_OK; + if ((hr = get_value_ptr( option, value, size, desc->size, &ptr )) != S_OK) return hr; - default: - ERR( "unhandled write option %u\n", option ); - return E_INVALIDARG; - } - } + enum_value = *(int *)(char *)ptr + desc->enumOffset; + if (enum_value == desc->noneEnumValue && option == WS_WRITE_NILLABLE_VALUE) return S_OK; if ((hr = find_index( desc, enum_value, &i )) != S_OK) return hr; return write_type_field( writer, &desc->fields[i]->field, ptr, desc->fields[i]->field.offset );

1 0

Hans Leidekker : webservices: Use the search index to look up the union field, if available.
by Alexandre Julliard 08 Nov '18

08 Nov '18

Module: wine Branch: master Commit: 90baefe6d549e658d9c906dfd8118375efb54068 URL: https://source.winehq.org/git/wine.git/?a=commit;h=90baefe6d549e658d9c906df… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 8 09:54:21 2018 +0100 webservices: Use the search index to look up the union field, if available. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 13 +++++++++- dlls/webservices/writer.c | 56 ++++++++++++++++++++++++++++++----------- 2 files changed, 54 insertions(+), 15 deletions(-) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index e33c389..f46578b 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -3920,7 +3920,8 @@ static void test_union_type(void) WS_UNION_FIELD_DESCRIPTION f, f2, *fields[2]; WS_FIELD_DESCRIPTION f_struct, *fields_struct[1]; WS_STRUCT_DESCRIPTION s; - enum choice {CHOICE_A, CHOICE_B, CHOICE_NONE}; + enum choice {CHOICE_A = 30, CHOICE_B = 20, CHOICE_C = 10, CHOICE_NONE = 0}; + ULONG index[2] = {1, 0}; struct test { enum choice choice; @@ -3987,6 +3988,7 @@ static void test_union_type(void) ok( hr == S_OK, "got %08x\n", hr ); check_output( writer, "<t><a>test</a></t>", __LINE__ ); + u.valueIndices = index; hr = set_output( writer ); ok( hr == S_OK, "got %08x\n", hr ); hr = WsWriteStartElement( writer, NULL, &str_t, &str_ns, NULL ); @@ -4004,6 +4006,15 @@ static void test_union_type(void) ok( hr == S_OK, "got %08x\n", hr ); hr = WsWriteStartElement( writer, NULL, &str_t, &str_ns, NULL ); ok( hr == S_OK, "got %08x\n", hr ); + test.choice = CHOICE_C; + hr = WsWriteType( writer, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, + WS_WRITE_REQUIRED_VALUE, &test, sizeof(test), NULL ); + ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsWriteStartElement( writer, NULL, &str_t, &str_ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); test.choice = CHOICE_NONE; hr = WsWriteType( writer, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_WRITE_REQUIRED_VALUE, &test, sizeof(test), NULL ); diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index ff633a6..0f20049 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -3580,15 +3580,48 @@ static WS_WRITE_OPTION get_field_write_option( WS_TYPE type, ULONG options ) } } -static HRESULT write_type_field( struct writer *, const WS_FIELD_DESCRIPTION *, const char *, ULONG ); +static HRESULT find_index( const WS_UNION_DESCRIPTION *desc, int value, ULONG *idx ) +{ + ULONG i; -static HRESULT write_type( struct writer *, WS_TYPE_MAPPING, WS_TYPE, const void *, WS_WRITE_OPTION, - const void *, ULONG ); + if (desc->valueIndices) + { + int c, min = 0, max = desc->fieldCount - 1; + while (min <= max) + { + i = (min + max) / 2; + c = value - desc->fields[desc->valueIndices[i]]->value; + if (c < 0) + max = i - 1; + else if (c > 0) + min = i + 1; + else + { + *idx = desc->valueIndices[i]; + return S_OK; + } + } + return WS_E_INVALID_FORMAT; + } + + /* fall back to linear search */ + for (i = 0; i < desc->fieldCount; i++) + { + if (desc->fields[i]->value == value) + { + *idx = i; + return S_OK; + } + } + return WS_E_INVALID_FORMAT; +} + +static HRESULT write_type_field( struct writer *, const WS_FIELD_DESCRIPTION *, const char *, ULONG ); static HRESULT write_type_union( struct writer *writer, const WS_UNION_DESCRIPTION *desc, WS_WRITE_OPTION option, const void *value, ULONG size ) { - ULONG i, offset; + ULONG i; const void *ptr; int enum_value; HRESULT hr; @@ -3612,18 +3645,13 @@ static HRESULT write_type_union( struct writer *writer, const WS_UNION_DESCRIPTI } } - for (i = 0; i < desc->fieldCount; i++) - { - if (desc->fields[i]->value == enum_value) - { - offset = desc->fields[i]->field.offset; - return write_type_field( writer, &desc->fields[i]->field, ptr, offset ); - } - } - - return E_INVALIDARG; + if ((hr = find_index( desc, enum_value, &i )) != S_OK) return hr; + return write_type_field( writer, &desc->fields[i]->field, ptr, desc->fields[i]->field.offset ); } +static HRESULT write_type( struct writer *, WS_TYPE_MAPPING, WS_TYPE, const void *, WS_WRITE_OPTION, + const void *, ULONG ); + static HRESULT write_type_array( struct writer *writer, const WS_FIELD_DESCRIPTION *desc, const char *buf, ULONG count ) {

1 0

Gabriel Ivăncescu : shell32/autocomplete: Pass the mouse wheel to the auto-suggest listbox, if visible.
by Alexandre Julliard 08 Nov '18

08 Nov '18

Module: wine Branch: master Commit: 4234e597ef7e9fbf8e29ab68b0e5b2231b753a02 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4234e597ef7e9fbf8e29ab68… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Nov 7 17:14:19 2018 +0200 shell32/autocomplete: Pass the mouse wheel to the auto-suggest listbox, if visible. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/autocomplete.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 22fc62c..705b28b 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -637,6 +637,10 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, ret = CallWindowProcW(This->wpOrigEditProc, hwnd, uMsg, wParam, lParam); autocomplete_text(This, hwnd, autoappend_flag_yes); return ret; + case WM_MOUSEWHEEL: + if ((This->options & ACO_AUTOSUGGEST) && IsWindowVisible(This->hwndListBox)) + return SendMessageW(This->hwndListBox, WM_MOUSEWHEEL, wParam, lParam); + break; case WM_SETFONT: if (This->hwndListBox) SendMessageW(This->hwndListBox, WM_SETFONT, wParam, lParam);

1 0

Gabriel Ivăncescu : shell32/autocomplete: Implement ACO_NOPREFIXFILTERING option.
by Alexandre Julliard 08 Nov '18

08 Nov '18

Module: wine Branch: master Commit: 1649680bf910c2c042c0070893fb23e8112ad3c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1649680bf910c2c042c00708… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Nov 7 17:14:18 2018 +0200 shell32/autocomplete: Implement ACO_NOPREFIXFILTERING option. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/autocomplete.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 8437d2d..22fc62c 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -24,6 +24,7 @@ - implement ACO_SEARCH style - implement ACO_FILTERPREFIXES style - implement ACO_RTLREADING style + - implement ACO_WORD_FILTER style */ #include "config.h" @@ -406,7 +407,8 @@ static BOOL display_matching_strs(IAutoCompleteImpl *ac, WCHAR *text, UINT len, UINT cnt, start, end; if (!str) return (ac->options & ACO_AUTOSUGGEST) ? FALSE : TRUE; - if (len) + /* Windows seems to disable autoappend if ACO_NOPREFIXFILTERING is set */ + if (!(ac->options & ACO_NOPREFIXFILTERING) && len) { start = find_matching_enum_str(ac, 0, text, len, -1); if (start == ~0) @@ -811,6 +813,7 @@ static HRESULT WINAPI IAutoComplete2_fnInit( if (This->options & ACO_SEARCH) FIXME(" ACO_SEARCH not supported\n"); if (This->options & ACO_FILTERPREFIXES) FIXME(" ACO_FILTERPREFIXES not supported\n"); if (This->options & ACO_RTLREADING) FIXME(" ACO_RTLREADING not supported\n"); + if (This->options & ACO_WORD_FILTER) FIXME(" ACO_WORD_FILTER not supported\n"); if (!hwndEdit || !punkACL) return E_INVALIDARG;

1 0

Gabriel Ivăncescu : include/shldisp: Add missing AUTOCOMPLETEOPTIONS constants.
by Alexandre Julliard 08 Nov '18

08 Nov '18

Module: wine Branch: master Commit: b28a41a0166875f3070f68236b504476ed6798bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=b28a41a0166875f3070f6823… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Nov 7 17:14:17 2018 +0200 include/shldisp: Add missing AUTOCOMPLETEOPTIONS constants. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/shldisp.idl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/shldisp.idl b/include/shldisp.idl index f5372c4..19f2d73 100644 --- a/include/shldisp.idl +++ b/include/shldisp.idl @@ -99,6 +99,8 @@ interface IAutoComplete2 : IAutoComplete ACO_USETAB = 0x10, /* use tab to select autosuggest entries */ ACO_UPDOWNKEYDROPSLIST = 0x20, /* up/down arrow key invokes autosuggest dropdown (if enabled) */ ACO_RTLREADING = 0x40, /* enable RTL reading order for dropdown */ + ACO_WORD_FILTER = 0x80, /* treat the autocompleted suggestion as a phrase for search purposes */ + ACO_NOPREFIXFILTERING = 0x100, /* always display all suggestions */ } AUTOCOMPLETEOPTIONS; HRESULT SetOptions( [in] DWORD dwFlag);

1 0

Gabriel Ivăncescu : shell32/tests: Add tests for ResetEnumerator.
by Alexandre Julliard 08 Nov '18

08 Nov '18

Module: wine Branch: master Commit: 17213acd171b897a4d53a6bdaca22ac18b87b46c URL: https://source.winehq.org/git/wine.git/?a=commit;h=17213acd171b897a4d53a6bd… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Nov 7 17:14:16 2018 +0200 shell32/tests: Add tests for ResetEnumerator. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/autocomplete.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/shell32/tests/autocomplete.c b/dlls/shell32/tests/autocomplete.c index 8265bf9..6921202 100644 --- a/dlls/shell32/tests/autocomplete.c +++ b/dlls/shell32/tests/autocomplete.c @@ -514,6 +514,7 @@ static void test_custom_source(void) struct string_enumerator *obj; IUnknown *enumerator; IAutoComplete2 *autocomplete; + IAutoCompleteDropDown *acdropdown; HWND hwnd_edit; WCHAR buffer[20]; HRESULT hr; @@ -525,11 +526,16 @@ static void test_custom_source(void) hr = CoCreateInstance(&CLSID_AutoComplete, NULL, CLSCTX_INPROC_SERVER, &IID_IAutoComplete2, (void**)&autocomplete); ok(hr == S_OK, "CoCreateInstance failed: %x\n", hr); + hr = IAutoComplete2_QueryInterface(autocomplete, &IID_IAutoCompleteDropDown, (LPVOID*)&acdropdown); + ok(hr == S_OK, "No IAutoCompleteDropDown interface: %x\n", hr); + string_enumerator_create((void**)&enumerator, suggestions, ARRAY_SIZE(suggestions)); obj = (struct string_enumerator*)enumerator; hr = IAutoComplete2_SetOptions(autocomplete, ACO_AUTOSUGGEST | ACO_AUTOAPPEND); ok(hr == S_OK, "IAutoComplete2_SetOptions failed: %x\n", hr); + hr = IAutoCompleteDropDown_ResetEnumerator(acdropdown); + ok(hr == S_OK, "IAutoCompleteDropDown_ResetEnumerator failed: %x\n", hr); hr = IAutoComplete2_Init(autocomplete, hwnd_edit, enumerator, NULL, NULL); ok(hr == S_OK, "IAutoComplete_Init failed: %x\n", hr); @@ -546,6 +552,9 @@ static void test_custom_source(void) SendMessageW(hwnd_edit, WM_GETTEXT, ARRAY_SIZE(buffer), (LPARAM)buffer); ok(buffer[0] == '\0', "Expected empty string, got %s\n", wine_dbgstr_w(buffer)); ok(obj->num_resets == 1, "Expected 1 reset, got %u\n", obj->num_resets); + hr = IAutoCompleteDropDown_ResetEnumerator(acdropdown); + ok(hr == S_OK, "IAutoCompleteDropDown_ResetEnumerator failed: %x\n", hr); + ok(obj->num_resets == 1, "Expected 1 reset, got %u\n", obj->num_resets); obj->num_resets = 0; /* hijack the window procedure */ @@ -565,6 +574,8 @@ static void test_custom_source(void) dispatch_messages(); SendMessageW(hwnd_edit, WM_GETTEXT, ARRAY_SIZE(buffer), (LPARAM)buffer); ok(buffer[0] == '\0', "Expected empty string, got %s\n", wine_dbgstr_w(buffer)); + hr = IAutoCompleteDropDown_ResetEnumerator(acdropdown); + ok(hr == S_OK, "IAutoCompleteDropDown_ResetEnumerator failed: %x\n", hr); HijackerWndProc_prev = (WNDPROC)SetWindowLongPtrW(hwnd_edit, GWLP_WNDPROC, (LONG_PTR)HijackerWndProc2); SendMessageW(hwnd_edit, WM_CHAR, 'a', 1); @@ -577,6 +588,17 @@ static void test_custom_source(void) /* end of hijacks */ test_aclist_expand(hwnd_edit, enumerator); + obj->num_resets = 0; + + hr = IAutoCompleteDropDown_ResetEnumerator(acdropdown); + ok(hr == S_OK, "IAutoCompleteDropDown_ResetEnumerator failed: %x\n", hr); + SendMessageW(hwnd_edit, WM_CHAR, 'x', 1); + dispatch_messages(); + ok(obj->num_resets == 1, "Expected 1 reset, got %u\n", obj->num_resets); + SendMessageW(hwnd_edit, WM_CHAR, 'x', 1); + dispatch_messages(); + ok(obj->num_resets == 1, "Expected 1 reset, got %u\n", obj->num_resets); + IAutoCompleteDropDown_Release(acdropdown); ShowWindow(hMainWnd, SW_HIDE); DestroyWindow(hwnd_edit);

1 0

Gabriel Ivăncescu : shell32/autocomplete: Implement ResetEnumerator.
by Alexandre Julliard 08 Nov '18

08 Nov '18

Module: wine Branch: master Commit: 7348ffd9bd7eea4910f3649c53bebdb86496cbf0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7348ffd9bd7eea4910f3649c… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Nov 7 17:14:15 2018 +0200 shell32/autocomplete: Implement ResetEnumerator. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/autocomplete.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index a6404ca..8437d2d 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -24,8 +24,6 @@ - implement ACO_SEARCH style - implement ACO_FILTERPREFIXES style - implement ACO_RTLREADING style - - implement ResetEnumerator - */ #include "config.h" @@ -1041,9 +1039,15 @@ static HRESULT WINAPI IAutoCompleteDropDown_fnResetEnumerator( { IAutoCompleteImpl *This = impl_from_IAutoCompleteDropDown(iface); - FIXME("(%p): stub\n", This); + TRACE("(%p)\n", This); - return E_NOTIMPL; + if (This->initialized) + { + free_enum_strs(This); + if ((This->options & ACO_AUTOSUGGEST) && IsWindowVisible(This->hwndListBox)) + autocomplete_text(This, This->hwndEdit, autoappend_flag_displayempty); + } + return S_OK; } /**************************************************************************

1 0

Alistair Leslie-Hughes : mfplat/tests: Use correct interface macro.
by Alexandre Julliard 08 Nov '18

08 Nov '18

Module: wine Branch: master Commit: b6d8ea6253b69183ca7a93d9ebf129a356309173 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6d8ea6253b69183ca7a93d9… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Nov 8 03:37:18 2018 +0000 mfplat/tests: Use correct interface macro. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 61cfbbf..2ee81ce 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -307,7 +307,7 @@ static void test_MFCreateMFByteStreamOnStream(void) hr = pMFCreateMFByteStreamOnStream(stream, &bytestream); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IUnknown_QueryInterface(bytestream, &IID_IUnknown, + hr = IMFByteStream_QueryInterface(bytestream, &IID_IUnknown, (void **)&unknown); ok(hr == S_OK, "got 0x%08x\n", hr); ok((void *)unknown == (void *)bytestream, "got %p\n", unknown); @@ -321,7 +321,7 @@ static void test_MFCreateMFByteStreamOnStream(void) ref = IMFByteStream_Release(bytestream2); ok(ref == 1, "got %u\n", ref); - hr = IUnknown_QueryInterface(bytestream, &IID_IMFAttributes, + hr = IMFByteStream_QueryInterface(bytestream, &IID_IMFAttributes, (void **)&attributes); ok(hr == S_OK || /* w7pro64 */ @@ -337,14 +337,14 @@ static void test_MFCreateMFByteStreamOnStream(void) ok(attributes != NULL, "got NULL\n"); - hr = IUnknown_QueryInterface(attributes, &IID_IUnknown, + hr = IMFAttributes_QueryInterface(attributes, &IID_IUnknown, (void **)&unknown); ok(hr == S_OK, "got 0x%08x\n", hr); ok((void *)unknown == (void *)bytestream, "got %p\n", unknown); ref = IUnknown_Release(unknown); ok(ref == 2, "got %u\n", ref); - hr = IUnknown_QueryInterface(attributes, &IID_IMFByteStream, + hr = IMFAttributes_QueryInterface(attributes, &IID_IMFByteStream, (void **)&bytestream2); ok(hr == S_OK, "got 0x%08x\n", hr); ok(bytestream2 == bytestream, "got %p\n", bytestream2); @@ -375,7 +375,7 @@ static void test_MFCreateFile(void) MF_FILEFLAGS_NONE, filename, &bytestream); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IUnknown_QueryInterface(bytestream, &IID_IMFAttributes, + hr = IMFByteStream_QueryInterface(bytestream, &IID_IMFAttributes, (void **)&attributes); ok(hr == S_OK, "got 0x%08x\n", hr); ok(attributes != NULL, "got NULL\n");

1 0

← Newer
1
...
79
80
81
82
83
84
85
...
96
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2018