November 2016 - Wine-commits

Hans Leidekker : webservices: Add support for repeating element field mappings in WsWriteType.
by Alexandre Julliard 17 Nov '16

17 Nov '16

Module: wine Branch: master Commit: 0a235233133019a44484416e7e4c1720a3435b73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a235233133019a44484416e7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 17 10:11:03 2016 -0600 webservices: Add support for repeating element field mappings in WsWriteType. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 110 ++++++++++++++++++++++++++ dlls/webservices/writer.c | 167 ++++++++++++++++++++++------------------ 2 files changed, 201 insertions(+), 76 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0a235233133019a444844…

1 0

Hans Leidekker : webservices: Add support for serializing array parameters in WsCall.
by Alexandre Julliard 17 Nov '16

17 Nov '16

Module: wine Branch: master Commit: e4288daa62c012fa73fc430332bd602328699446 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4288daa62c012fa73fc43033… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 17 10:11:08 2016 -0600 webservices: Add support for serializing array parameters in WsCall. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/proxy.c | 68 +++++++++++++++++++++++++++++------------- dlls/webservices/writer.c | 23 +++++++++++++- 2 files changed, 70 insertions(+), 21 deletions(-) diff --git a/dlls/webservices/tests/proxy.c b/dlls/webservices/tests/proxy.c index f1676cd..61dff79 100644 --- a/dlls/webservices/tests/proxy.c +++ b/dlls/webservices/tests/proxy.c @@ -289,7 +289,7 @@ static HRESULT create_proxy( int port, WS_SERVICE_PROXY **ret ) static const char req_test2[] = "<s:Envelope xmlns:s=\"http://schemas.xmlsoap.org/soap/envelope/\"><s:Body>" - "<req_test2 xmlns=\"ns\"><val>1</val></req_test2>" + "<req_test2 xmlns=\"ns\"><val>1</val><str>test</str><str>test2</str></req_test2>" "</s:Body></s:Envelope>"; static const char resp_test2[] = @@ -299,7 +299,7 @@ static const char resp_test2[] = static void test_WsCall( int port ) { - static WCHAR testW[] = {'t','e','s','t',0}; + static const WCHAR testW[] = {'t','e','s','t',0}, test2W[] = {'t','e','s','t','2',0}; WS_XML_STRING str = {3, (BYTE *)"str"}; WS_XML_STRING req = {3, (BYTE *)"req"}; WS_XML_STRING resp = {4, (BYTE *)"resp"}; @@ -315,16 +315,19 @@ static void test_WsCall( int port ) WS_MESSAGE_DESCRIPTION input_msg, output_msg; WS_ELEMENT_DESCRIPTION input_elem, output_elem; WS_STRUCT_DESCRIPTION input_struct, output_struct; - WS_FIELD_DESCRIPTION f, f2, f3, *fields[2], *fields2[2]; - WS_PARAMETER_DESCRIPTION param[4]; - const void *args[4]; + WS_FIELD_DESCRIPTION f, f2, f3, f4, *fields[2], *fields2[2]; + WS_PARAMETER_DESCRIPTION param[6]; + const void *args[6]; WS_HEAP *heap; INT32 **val_ptr; WCHAR **str_ptr; ULONG *count_ptr; + const WCHAR *str_array[2]; struct input { - INT32 val; + INT32 val; + ULONG count; + const WCHAR **str; } in; struct output { @@ -352,11 +355,20 @@ static void test_WsCall( int port ) f.type = WS_INT32_TYPE; fields[0] = &f; + memset( &f4, 0, sizeof(f4) ); + f4.mapping = WS_REPEATING_ELEMENT_FIELD_MAPPING; + f4.type = WS_WSZ_TYPE; + f4.offset = FIELD_OFFSET(struct input, str); + f4.countOffset = FIELD_OFFSET(struct input, count); + f4.itemLocalName = &str; + f4.itemNs = &ns; + fields[1] = &f4; + memset( &input_struct, 0, sizeof(input_struct) ); input_struct.size = sizeof(struct input); input_struct.alignment = TYPE_ALIGNMENT(struct input); input_struct.fields = fields; - input_struct.fieldCount = 1; + input_struct.fieldCount = 2; input_struct.typeLocalName = &req; input_struct.typeNs = &ns; @@ -403,24 +415,32 @@ static void test_WsCall( int port ) param[0].inputMessageIndex = 0; param[0].outputMessageIndex = 0xffff; - param[1].parameterType = WS_PARAMETER_TYPE_NORMAL; - param[1].inputMessageIndex = 0xffff; - param[1].outputMessageIndex = 0; + param[1].parameterType = WS_PARAMETER_TYPE_ARRAY; + param[1].inputMessageIndex = 1; + param[1].outputMessageIndex = 0xffff; - param[2].parameterType = WS_PARAMETER_TYPE_ARRAY; - param[2].inputMessageIndex = 0xffff; - param[2].outputMessageIndex = 1; + param[2].parameterType = WS_PARAMETER_TYPE_ARRAY_COUNT; + param[2].inputMessageIndex = 1; + param[2].outputMessageIndex = 0xffff; - param[3].parameterType = WS_PARAMETER_TYPE_ARRAY_COUNT; + param[3].parameterType = WS_PARAMETER_TYPE_NORMAL; param[3].inputMessageIndex = 0xffff; - param[3].outputMessageIndex = 1; + param[3].outputMessageIndex = 0; + + param[4].parameterType = WS_PARAMETER_TYPE_ARRAY; + param[4].inputMessageIndex = 0xffff; + param[4].outputMessageIndex = 1; + + param[5].parameterType = WS_PARAMETER_TYPE_ARRAY_COUNT; + param[5].inputMessageIndex = 0xffff; + param[5].outputMessageIndex = 1; op.versionInfo = 1; op.inputMessageDescription = &input_msg; op.outputMessageDescription = &output_msg; op.inputMessageOptions = 0; op.outputMessageOptions = 0; - op.parameterCount = 4; + op.parameterCount = 6; op.parameterDescription = param; op.stubCallback = NULL; op.style = 0; @@ -428,17 +448,25 @@ static void test_WsCall( int port ) ok( hr == E_INVALIDARG, "got %08x\n", hr ); in.val = 1; + str_array[0] = testW; + str_array[1] = test2W; + in.str = str_array; + in.count = 2; + args[0] = &in.val; + args[1] = &in.str; + args[2] = &in.count; out.str = NULL; out.count = 0; - out.val = 0; + out.val = NULL; str_ptr = &out.str; val_ptr = &out.val; count_ptr = &out.count; - args[1] = &str_ptr; - args[2] = &val_ptr; - args[3] = &count_ptr; + + args[3] = &str_ptr; + args[4] = &val_ptr; + args[5] = &count_ptr; hr = WsCall( proxy, &op, args, heap, NULL, 0, NULL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index d5c953c..c1f1b0c 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -2813,6 +2813,25 @@ static HRESULT write_param( struct writer *writer, const WS_FIELD_DESCRIPTION *d return write_type_struct_field( writer, desc, value, 0 ); } +static ULONG get_array_len( const WS_PARAMETER_DESCRIPTION *params, ULONG count, ULONG index, const void **args ) +{ + ULONG i, ret = 0; + for (i = 0; i < count; i++) + { + if (params[i].inputMessageIndex != index || params[i].parameterType != WS_PARAMETER_TYPE_ARRAY_COUNT) + continue; + if (args[i]) ret = *(const ULONG *)args[i]; + break; + } + return ret; +} + +static HRESULT write_param_array( struct writer *writer, const WS_FIELD_DESCRIPTION *desc, const void *value, + ULONG len ) +{ + return write_type_repeating_element( writer, desc, value, len ); +} + HRESULT write_input_params( WS_XML_WRITER *handle, const WS_ELEMENT_DESCRIPTION *desc, const WS_PARAMETER_DESCRIPTION *params, ULONG count, const void **args ) { @@ -2841,7 +2860,9 @@ HRESULT write_input_params( WS_XML_WRITER *handle, const WS_ELEMENT_DESCRIPTION } else if (params[i].parameterType == WS_PARAMETER_TYPE_ARRAY) { - FIXME( "no support for writing array parameters\n" ); + const void *ptr = *(const void **)args[i]; + ULONG len = get_array_len( params, count, params[i].inputMessageIndex, args ); + if ((hr = write_param_array( writer, desc_field, ptr, len )) != S_OK) return hr; } }

1 0

Hans Leidekker : wbemprox: Return a non-null UUID for Win32_ComputerSystemProduct.UUID if nothing better is available.
by Alexandre Julliard 17 Nov '16

17 Nov '16

Module: wine Branch: master Commit: 9842bf333a646cfe62135767d8ea05ebc6faa897 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9842bf333a646cfe62135767d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 17 13:07:34 2016 -0600 wbemprox: Return a non-null UUID for Win32_ComputerSystemProduct.UUID if nothing better is available. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 718b818..b0f5faa 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -714,8 +714,8 @@ static const WCHAR compsys_modelW[] = static const WCHAR compsysproduct_identifyingnumberW[] = {'0',0}; static const WCHAR compsysproduct_uuidW[] = - {'0','0','0','0','0','0','0','0','-','0','0','0','0','-','0','0','0','0','-','0','0','0','0','-', - '0','0','0','0','0','0','0','0','0','0','0','0',0}; + {'d','e','a','d','d','e','a','d','-','d','e','a','d','-','d','e','a','d','-','d','e','a','d','-', + 'd','e','a','d','d','e','a','d','d','e','a','d',0}; static const WCHAR diskdrive_interfacetypeW[] = {'I','D','E',0}; static const WCHAR diskdrive_manufacturerW[] =

1 0

Hans Leidekker : wbemprox: Return the machine ID for Win32_ComputerSystemProduct.UUID on Linux.
by Alexandre Julliard 17 Nov '16

17 Nov '16

Module: wine Branch: master Commit: a2545727fea4c0e91dd67aa5000ad67645d6ed62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2545727fea4c0e91dd67aa50… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 17 13:07:59 2016 -0600 wbemprox: Return the machine ID for Win32_ComputerSystemProduct.UUID on Linux. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index b0f5faa..cf9ae5c 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -22,6 +22,7 @@ #include "config.h" #include <stdarg.h> +#include <fcntl.h> #ifdef HAVE_UNISTD_H # include <unistd.h> #endif @@ -1346,6 +1347,33 @@ static WCHAR *get_compsysproduct_uuid(void) return ret; } #endif +#ifdef __linux__ + int file; + if ((file = open( "/var/lib/dbus/machine-id", O_RDONLY )) != -1) + { + unsigned char buf[32]; + if (read( file, buf, sizeof(buf) ) == sizeof(buf)) + { + unsigned int i, j; + WCHAR *ret, *p; + + close( file ); + if (!(p = ret = heap_alloc( 37 * sizeof(WCHAR) ))) return NULL; + for (i = 0, j = 0; i < 8; i++) p[i] = toupperW( buf[j++] ); + p[8] = '-'; + for (i = 9; i < 13; i++) p[i] = toupperW( buf[j++] ); + p[13] = '-'; + for (i = 14; i < 18; i++) p[i] = toupperW( buf[j++] ); + p[18] = '-'; + for (i = 19; i < 23; i++) p[i] = toupperW( buf[j++] ); + p[23] = '-'; + for (i = 24; i < 36; i++) p[i] = toupperW( buf[j++] ); + ret[i] = 0; + return ret; + } + close( file ); + } +#endif return heap_strdupW( compsysproduct_uuidW ); }

1 0

Jacek Caban : mshtml: Added IHTMLDocument3::dir property implementation.
by Alexandre Julliard 16 Nov '16

16 Nov '16

Module: wine Branch: master Commit: cb11d67035592bf4428656288e2e69a42421a236 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb11d67035592bf4428656288… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 16 10:16:51 2016 -0600 mshtml: Added IHTMLDocument3::dir property implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 35 +++++++++++++++++++++++++++++++---- dlls/mshtml/tests/dom.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 8fa3f52..47e087d 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -2173,15 +2173,42 @@ static HRESULT WINAPI HTMLDocument3_get_onpropertychange(IHTMLDocument3 *iface, static HRESULT WINAPI HTMLDocument3_put_dir(IHTMLDocument3 *iface, BSTR v) { HTMLDocument *This = impl_from_IHTMLDocument3(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + nsAString dir_str; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + if(!This->doc_node->nsdoc) { + FIXME("NULL nsdoc\n"); + return E_UNEXPECTED; + } + + nsAString_InitDepend(&dir_str, v); + nsres = nsIDOMHTMLDocument_SetDir(This->doc_node->nsdoc, &dir_str); + nsAString_Finish(&dir_str); + if(NS_FAILED(nsres)) { + ERR("SetDir failed: %08x\n", nsres); + return E_FAIL; + } + + return S_OK; } static HRESULT WINAPI HTMLDocument3_get_dir(IHTMLDocument3 *iface, BSTR *p) { HTMLDocument *This = impl_from_IHTMLDocument3(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString dir_str; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + if(!This->doc_node->nsdoc) { + FIXME("NULL nsdoc\n"); + return E_UNEXPECTED; + } + + nsres = nsIDOMHTMLDocument_GetDir(This->doc_node->nsdoc, &dir_str); + return return_nsstr(nsres, &dir_str, p); } static HRESULT WINAPI HTMLDocument3_put_oncontextmenu(IHTMLDocument3 *iface, VARIANT v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index be279cc..60e1bf8 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -6304,6 +6304,42 @@ static void test_default_selection(IHTMLDocument2 *doc) IHTMLTxtRange_Release(range); } +static void test_doc_dir(IHTMLDocument2 *doc2) +{ + IHTMLDocument3 *doc = get_doc3_iface(doc2); + BSTR dir; + HRESULT hres; + + dir = (BSTR)0xdeadbeef; + hres = IHTMLDocument3_get_dir(doc, &dir); + ok(hres == S_OK, "get_dir failed: %08x\n", hres); + ok(!dir, "dir = %s\n", wine_dbgstr_w(dir)); + + dir = a2bstr("rtl"); + hres = IHTMLDocument3_put_dir(doc, dir); + ok(hres == S_OK, "put_dir failed: %08x\n", hres); + SysFreeString(dir); + + dir = NULL; + hres = IHTMLDocument3_get_dir(doc, &dir); + ok(hres == S_OK, "get_dir failed: %08x\n", hres); + ok(!strcmp_wa(dir, "rtl"), "dir = %s\n", wine_dbgstr_w(dir)); + SysFreeString(dir); + + dir = a2bstr("ltr"); + hres = IHTMLDocument3_put_dir(doc, dir); + ok(hres == S_OK, "put_dir failed: %08x\n", hres); + SysFreeString(dir); + + dir = NULL; + hres = IHTMLDocument3_get_dir(doc, &dir); + ok(hres == S_OK, "get_dir failed: %08x\n", hres); + ok(!strcmp_wa(dir, "ltr"), "dir = %s\n", wine_dbgstr_w(dir)); + SysFreeString(dir); + + IHTMLDocument3_Release(doc); +} + static void test_unique_id(IHTMLDocument2 *doc, IHTMLElement *elem) { IHTMLDocument3 *doc3 = get_doc3_iface(doc); @@ -6393,6 +6429,7 @@ static void test_doc_elem(IHTMLDocument2 *doc) test_elem_client_rect((IUnknown*)elem); test_unique_id(doc, elem); + test_doc_dir(doc); IHTMLElement_Release(elem); }

1 0

Nikolay Sivov : oledb32: Use better naming for IErrorRecords implementation structure.
by Alexandre Julliard 16 Nov '16

16 Nov '16

Module: wine Branch: master Commit: 9a084ab6d3d81cb26ccd88412cfd39733c9a9149 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a084ab6d3d81cb26ccd88412… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 16 16:48:34 2016 +0300 oledb32: Use better naming for IErrorRecords implementation structure. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/errorinfo.c | 80 ++++++++++++++++++++++++------------------------ 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/dlls/oledb32/errorinfo.c b/dlls/oledb32/errorinfo.c index dd39173..02939ed 100644 --- a/dlls/oledb32/errorinfo.c +++ b/dlls/oledb32/errorinfo.c @@ -46,7 +46,7 @@ struct ErrorEntry DWORD lookupID; }; -typedef struct ErrorInfoImpl +typedef struct errorrecords { IErrorInfo IErrorInfo_iface; IErrorRecords IErrorRecords_iface; @@ -55,21 +55,21 @@ typedef struct ErrorInfoImpl struct ErrorEntry *records; unsigned int allocated; unsigned int count; -} ErrorInfoImpl; +} errorrecords; -static inline ErrorInfoImpl *impl_from_IErrorInfo( IErrorInfo *iface ) +static inline errorrecords *impl_from_IErrorInfo( IErrorInfo *iface ) { - return CONTAINING_RECORD(iface, ErrorInfoImpl, IErrorInfo_iface); + return CONTAINING_RECORD(iface, errorrecords, IErrorInfo_iface); } -static inline ErrorInfoImpl *impl_from_IErrorRecords( IErrorRecords *iface ) +static inline errorrecords *impl_from_IErrorRecords( IErrorRecords *iface ) { - return CONTAINING_RECORD(iface, ErrorInfoImpl, IErrorRecords_iface); + return CONTAINING_RECORD(iface, errorrecords, IErrorRecords_iface); } -static HRESULT WINAPI IErrorInfoImpl_QueryInterface(IErrorInfo* iface, REFIID riid, void **ppvoid) +static HRESULT WINAPI errorrecords_QueryInterface(IErrorInfo* iface, REFIID riid, void **ppvoid) { - ErrorInfoImpl *This = impl_from_IErrorInfo(iface); + errorrecords *This = impl_from_IErrorInfo(iface); TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid),ppvoid); *ppvoid = NULL; @@ -93,16 +93,16 @@ static HRESULT WINAPI IErrorInfoImpl_QueryInterface(IErrorInfo* iface, REFIID ri return E_NOINTERFACE; } -static ULONG WINAPI IErrorInfoImpl_AddRef(IErrorInfo* iface) +static ULONG WINAPI errorrecords_AddRef(IErrorInfo* iface) { - ErrorInfoImpl *This = impl_from_IErrorInfo(iface); + errorrecords *This = impl_from_IErrorInfo(iface); TRACE("(%p)->%u\n",This,This->ref); return InterlockedIncrement(&This->ref); } -static ULONG WINAPI IErrorInfoImpl_Release(IErrorInfo* iface) +static ULONG WINAPI errorrecords_Release(IErrorInfo* iface) { - ErrorInfoImpl *This = impl_from_IErrorInfo(iface); + errorrecords *This = impl_from_IErrorInfo(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE("(%p)->%u\n",This,ref+1); @@ -122,9 +122,9 @@ static ULONG WINAPI IErrorInfoImpl_Release(IErrorInfo* iface) return ref; } -static HRESULT WINAPI IErrorInfoImpl_GetGUID(IErrorInfo* iface, GUID *guid) +static HRESULT WINAPI errorrecords_GetGUID(IErrorInfo* iface, GUID *guid) { - ErrorInfoImpl *This = impl_from_IErrorInfo(iface); + errorrecords *This = impl_from_IErrorInfo(iface); TRACE("(%p)->(%p)\n", This, guid); @@ -136,9 +136,9 @@ static HRESULT WINAPI IErrorInfoImpl_GetGUID(IErrorInfo* iface, GUID *guid) return S_OK; } -static HRESULT WINAPI IErrorInfoImpl_GetSource(IErrorInfo* iface, BSTR *source) +static HRESULT WINAPI errorrecords_GetSource(IErrorInfo* iface, BSTR *source) { - ErrorInfoImpl *This = impl_from_IErrorInfo(iface); + errorrecords *This = impl_from_IErrorInfo(iface); TRACE("(%p)->(%p)\n", This, source); @@ -150,9 +150,9 @@ static HRESULT WINAPI IErrorInfoImpl_GetSource(IErrorInfo* iface, BSTR *source) return E_FAIL; } -static HRESULT WINAPI IErrorInfoImpl_GetDescription(IErrorInfo* iface, BSTR *description) +static HRESULT WINAPI errorrecords_GetDescription(IErrorInfo* iface, BSTR *description) { - ErrorInfoImpl *This = impl_from_IErrorInfo(iface); + errorrecords *This = impl_from_IErrorInfo(iface); TRACE("(%p)->(%p)\n", This, description); @@ -164,9 +164,9 @@ static HRESULT WINAPI IErrorInfoImpl_GetDescription(IErrorInfo* iface, BSTR *des return E_FAIL; } -static HRESULT WINAPI IErrorInfoImpl_GetHelpFile(IErrorInfo* iface, BSTR *helpfile) +static HRESULT WINAPI errorrecords_GetHelpFile(IErrorInfo* iface, BSTR *helpfile) { - ErrorInfoImpl *This = impl_from_IErrorInfo(iface); + errorrecords *This = impl_from_IErrorInfo(iface); TRACE("(%p)->(%p)\n", This, helpfile); @@ -178,9 +178,9 @@ static HRESULT WINAPI IErrorInfoImpl_GetHelpFile(IErrorInfo* iface, BSTR *helpfi return E_FAIL; } -static HRESULT WINAPI IErrorInfoImpl_GetHelpContext(IErrorInfo* iface, DWORD *context) +static HRESULT WINAPI errorrecords_GetHelpContext(IErrorInfo* iface, DWORD *context) { - ErrorInfoImpl *This = impl_from_IErrorInfo(iface); + errorrecords *This = impl_from_IErrorInfo(iface); TRACE("(%p)->(%p)\n", This, context); @@ -194,38 +194,38 @@ static HRESULT WINAPI IErrorInfoImpl_GetHelpContext(IErrorInfo* iface, DWORD *co static const IErrorInfoVtbl ErrorInfoVtbl = { - IErrorInfoImpl_QueryInterface, - IErrorInfoImpl_AddRef, - IErrorInfoImpl_Release, - IErrorInfoImpl_GetGUID, - IErrorInfoImpl_GetSource, - IErrorInfoImpl_GetDescription, - IErrorInfoImpl_GetHelpFile, - IErrorInfoImpl_GetHelpContext + errorrecords_QueryInterface, + errorrecords_AddRef, + errorrecords_Release, + errorrecords_GetGUID, + errorrecords_GetSource, + errorrecords_GetDescription, + errorrecords_GetHelpFile, + errorrecords_GetHelpContext }; static HRESULT WINAPI errorrec_QueryInterface(IErrorRecords *iface, REFIID riid, void **ppvObject) { - ErrorInfoImpl *This = impl_from_IErrorRecords(iface); + errorrecords *This = impl_from_IErrorRecords(iface); return IErrorInfo_QueryInterface(&This->IErrorInfo_iface, riid, ppvObject); } static ULONG WINAPI WINAPI errorrec_AddRef(IErrorRecords *iface) { - ErrorInfoImpl *This = impl_from_IErrorRecords(iface); + errorrecords *This = impl_from_IErrorRecords(iface); return IErrorInfo_AddRef(&This->IErrorInfo_iface); } static ULONG WINAPI WINAPI errorrec_Release(IErrorRecords *iface) { - ErrorInfoImpl *This = impl_from_IErrorRecords(iface); + errorrecords *This = impl_from_IErrorRecords(iface); return IErrorInfo_Release(&This->IErrorInfo_iface); } static HRESULT WINAPI errorrec_AddErrorRecord(IErrorRecords *iface, ERRORINFO *pErrorInfo, DWORD dwLookupID, DISPPARAMS *pdispparams, IUnknown *punkCustomError, DWORD dwDynamicErrorID) { - ErrorInfoImpl *This = impl_from_IErrorRecords(iface); + errorrecords *This = impl_from_IErrorRecords(iface); struct ErrorEntry *entry; TRACE("(%p)->(%p %d %p %p %d)\n", This, pErrorInfo, dwLookupID, pdispparams, punkCustomError, dwDynamicErrorID); @@ -269,7 +269,7 @@ static HRESULT WINAPI errorrec_AddErrorRecord(IErrorRecords *iface, ERRORINFO *p static HRESULT WINAPI errorrec_GetBasicErrorInfo(IErrorRecords *iface, ULONG index, ERRORINFO *info) { - ErrorInfoImpl *This = impl_from_IErrorRecords(iface); + errorrecords *This = impl_from_IErrorRecords(iface); TRACE("(%p)->(%u %p)\n", This, index, info); @@ -287,7 +287,7 @@ static HRESULT WINAPI errorrec_GetBasicErrorInfo(IErrorRecords *iface, ULONG ind static HRESULT WINAPI errorrec_GetCustomErrorObject(IErrorRecords *iface, ULONG index, REFIID riid, IUnknown **object) { - ErrorInfoImpl *This = impl_from_IErrorRecords(iface); + errorrecords *This = impl_from_IErrorRecords(iface); TRACE("(%p)->(%u %s %p)\n", This, index, debugstr_guid(riid), object); @@ -309,7 +309,7 @@ static HRESULT WINAPI errorrec_GetCustomErrorObject(IErrorRecords *iface, ULONG static HRESULT WINAPI errorrec_GetErrorInfo(IErrorRecords *iface, ULONG index, LCID lcid, IErrorInfo **ppErrorInfo) { - ErrorInfoImpl *This = impl_from_IErrorRecords(iface); + errorrecords *This = impl_from_IErrorRecords(iface); FIXME("(%p)->(%u %d, %p)\n", This, index, lcid, ppErrorInfo); @@ -324,7 +324,7 @@ static HRESULT WINAPI errorrec_GetErrorInfo(IErrorRecords *iface, ULONG index, static HRESULT WINAPI errorrec_GetErrorParameters(IErrorRecords *iface, ULONG index, DISPPARAMS *pdispparams) { - ErrorInfoImpl *This = impl_from_IErrorRecords(iface); + errorrecords *This = impl_from_IErrorRecords(iface); FIXME("(%p)->(%u %p)\n", This, index, pdispparams); @@ -339,7 +339,7 @@ static HRESULT WINAPI errorrec_GetErrorParameters(IErrorRecords *iface, ULONG in static HRESULT WINAPI errorrec_GetRecordCount(IErrorRecords *iface, ULONG *count) { - ErrorInfoImpl *This = impl_from_IErrorRecords(iface); + errorrecords *This = impl_from_IErrorRecords(iface); TRACE("(%p)->(%p)\n", This, count); @@ -368,7 +368,7 @@ static const IErrorRecordsVtbl ErrorRecordsVtbl = HRESULT create_error_info(IUnknown *outer, void **obj) { - ErrorInfoImpl *This; + errorrecords *This; TRACE("(%p, %p)\n", outer, obj);

1 0

Nikolay Sivov : oledb32: Implement GetErrorParameters().
by Alexandre Julliard 16 Nov '16

16 Nov '16

Module: wine Branch: master Commit: 275790c767aad404a9b680dc783bc0578de158ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=275790c767aad404a9b680dc7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 16 16:48:35 2016 +0300 oledb32: Implement GetErrorParameters(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/errorinfo.c | 51 +++++++++++++++++++++++++++++++++++++++---- dlls/oledb32/tests/database.c | 48 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 95 insertions(+), 4 deletions(-) diff --git a/dlls/oledb32/errorinfo.c b/dlls/oledb32/errorinfo.c index 02939ed..e1c3204 100644 --- a/dlls/oledb32/errorinfo.c +++ b/dlls/oledb32/errorinfo.c @@ -113,8 +113,16 @@ static ULONG WINAPI errorrecords_Release(IErrorInfo* iface) for (i = 0; i < This->count; i++) { + DISPPARAMS *dispparams = &This->records[i].dispparams; + unsigned int j; + if (This->records[i].custom_error) IUnknown_Release(This->records[i].custom_error); + + for (j = 0; j < dispparams->cArgs && dispparams->rgvarg; j++) + VariantClear(&dispparams->rgvarg[i]); + CoTaskMemFree(dispparams->rgvarg); + CoTaskMemFree(dispparams->rgdispidNamedArgs); } heap_free(This->records); heap_free(This); @@ -222,11 +230,43 @@ static ULONG WINAPI WINAPI errorrec_Release(IErrorRecords *iface) return IErrorInfo_Release(&This->IErrorInfo_iface); } +static HRESULT dup_dispparams(DISPPARAMS *src, DISPPARAMS *dest) +{ + unsigned int i; + + if (!src) + { + memset(dest, 0, sizeof(*dest)); + return S_OK; + } + + *dest = *src; + + if (src->cArgs) + { + dest->rgvarg = CoTaskMemAlloc(dest->cArgs * sizeof(*dest->rgvarg)); + for (i = 0; i < src->cArgs; i++) + { + VariantInit(&dest->rgvarg[i]); + VariantCopy(&dest->rgvarg[i], &src->rgvarg[i]); + } + } + + if (src->cNamedArgs) + { + dest->rgdispidNamedArgs = CoTaskMemAlloc(dest->cNamedArgs * sizeof(*dest->rgdispidNamedArgs)); + memcpy(dest->rgdispidNamedArgs, src->rgdispidNamedArgs, dest->cNamedArgs * sizeof(*dest->rgdispidNamedArgs)); + } + + return S_OK; +} + static HRESULT WINAPI errorrec_AddErrorRecord(IErrorRecords *iface, ERRORINFO *pErrorInfo, DWORD dwLookupID, DISPPARAMS *pdispparams, IUnknown *punkCustomError, DWORD dwDynamicErrorID) { errorrecords *This = impl_from_IErrorRecords(iface); struct ErrorEntry *entry; + HRESULT hr; TRACE("(%p)->(%p %d %p %p %d)\n", This, pErrorInfo, dwLookupID, pdispparams, punkCustomError, dwDynamicErrorID); @@ -255,8 +295,10 @@ static HRESULT WINAPI errorrec_AddErrorRecord(IErrorRecords *iface, ERRORINFO *p entry = This->records + This->count; entry->info = *pErrorInfo; - if(pdispparams) - entry->dispparams = *pdispparams; + + if (FAILED(hr = dup_dispparams(pdispparams, &entry->dispparams))) + return hr; + entry->custom_error = punkCustomError; if (entry->custom_error) IUnknown_AddRef(entry->custom_error); @@ -326,7 +368,7 @@ static HRESULT WINAPI errorrec_GetErrorParameters(IErrorRecords *iface, ULONG in { errorrecords *This = impl_from_IErrorRecords(iface); - FIXME("(%p)->(%u %p)\n", This, index, pdispparams); + TRACE("(%p)->(%u %p)\n", This, index, pdispparams); if (!pdispparams) return E_INVALIDARG; @@ -334,7 +376,8 @@ static HRESULT WINAPI errorrec_GetErrorParameters(IErrorRecords *iface, ULONG in if (index >= This->count) return DB_E_BADRECORDNUM; - return E_NOTIMPL; + index = This->count - index - 1; + return dup_dispparams(&This->records[index].dispparams, pdispparams); } static HRESULT WINAPI errorrec_GetRecordCount(IErrorRecords *iface, ULONG *count) diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index b45ef4d..44a2561 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -314,6 +314,16 @@ static void test_database(void) test_GetDataSource2(extended_prop); } +static void free_dispparams(DISPPARAMS *params) +{ + unsigned int i; + + for (i = 0; i < params->cArgs && params->rgvarg; i++) + VariantClear(&params->rgvarg[i]); + CoTaskMemFree(params->rgvarg); + CoTaskMemFree(params->rgdispidNamedArgs); +} + static void test_errorinfo(void) { ICreateErrorInfo *createerror; @@ -322,8 +332,10 @@ static void test_errorinfo(void) IErrorRecords *errrecs; IUnknown *unk = NULL, *unk2; DISPPARAMS dispparams; + DISPID dispid; DWORD context; ULONG cnt = 0; + VARIANT arg; HRESULT hr; GUID guid; BSTR str; @@ -437,6 +449,42 @@ static void test_errorinfo(void) ok(hr == S_OK, "got %08x\n", hr); ok(info3.dwMinor == 2, "expected 2 got %d\n", info3.dwMinor); + hr = IErrorRecords_GetErrorParameters(errrecs, 0, NULL); + ok(hr == E_INVALIDARG, "got %08x\n", hr); + + memset(&dispparams, 0xcc, sizeof(dispparams)); + hr = IErrorRecords_GetErrorParameters(errrecs, 0, &dispparams); + ok(hr == S_OK, "got %08x\n", hr); + ok(dispparams.rgvarg == NULL, "Got arguments %p\n", dispparams.rgvarg); + ok(dispparams.rgdispidNamedArgs == NULL, "Got named arguments %p\n", dispparams.rgdispidNamedArgs); + ok(dispparams.cArgs == 0, "Got argument count %u\n", dispparams.cArgs); + ok(dispparams.cNamedArgs == 0, "Got named argument count %u\n", dispparams.cNamedArgs); + + V_VT(&arg) = VT_BSTR; + V_BSTR(&arg) = SysAllocStringLen(NULL, 0); + dispid = 0x123; + + dispparams.rgvarg = &arg; + dispparams.cArgs = 1; + dispparams.rgdispidNamedArgs = &dispid; + dispparams.cNamedArgs = 1; + hr = IErrorRecords_AddErrorRecord(errrecs, &info2, 0, &dispparams, NULL, 0); + ok(hr == S_OK, "got %08x\n", hr); + + memset(&dispparams, 0, sizeof(dispparams)); + hr = IErrorRecords_GetErrorParameters(errrecs, 0, &dispparams); + ok(hr == S_OK, "got %08x\n", hr); + + ok(V_VT(&dispparams.rgvarg[0]) == VT_BSTR, "Got arg type %d\n", V_VT(&dispparams.rgvarg[0])); + ok(V_BSTR(&dispparams.rgvarg[0]) != V_BSTR(&arg), "Got arg bstr %d\n", V_VT(&dispparams.rgvarg[0])); + + ok(dispparams.rgdispidNamedArgs[0] == 0x123, "Got named argument %d\n", dispparams.rgdispidNamedArgs[0]); + ok(dispparams.cArgs == 1, "Got argument count %u\n", dispparams.cArgs); + ok(dispparams.cNamedArgs == 1, "Got named argument count %u\n", dispparams.cNamedArgs); + + free_dispparams(&dispparams); + VariantClear(&arg); + IErrorRecords_Release(errrecs); IUnknown_Release(unk); }

1 0

Nikolay Sivov : dwrite: Make it clear that wine_dbgstr_longlong() output is in hex.
by Alexandre Julliard 16 Nov '16

16 Nov '16

Module: wine Branch: master Commit: 89565b5e1e41a89c4ad449b149c8fa49d7bd35f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89565b5e1e41a89c4ad449b14… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 16 19:57:00 2016 +0300 dwrite: Make it clear that wine_dbgstr_longlong() output is in hex. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 7672aa6..2e1eab0 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -4373,11 +4373,12 @@ static ULONG WINAPI localfontfilestream_Release(IDWriteFontFileStream *iface) return ref; } -static HRESULT WINAPI localfontfilestream_ReadFileFragment(IDWriteFontFileStream *iface, void const **fragment_start, UINT64 offset, UINT64 fragment_size, void **fragment_context) +static HRESULT WINAPI localfontfilestream_ReadFileFragment(IDWriteFontFileStream *iface, void const **fragment_start, + UINT64 offset, UINT64 fragment_size, void **fragment_context) { struct dwrite_localfontfilestream *This = impl_from_IDWriteFontFileStream(iface); - TRACE_(dwrite_file)("(%p)->(%p, %s, %s, %p)\n",This, fragment_start, + TRACE_(dwrite_file)("(%p)->(%p, 0x%s, 0x%s, %p)\n", This, fragment_start, wine_dbgstr_longlong(offset), wine_dbgstr_longlong(fragment_size), fragment_context); *fragment_context = NULL; @@ -5744,7 +5745,7 @@ static HRESULT WINAPI fontfacereference_EnqueueFileFragmentDownloadRequest(IDWri { struct dwrite_fontfacereference *This = impl_from_IDWriteFontFaceReference(iface); - FIXME("(%p)->(%s %s): stub\n", This, wine_dbgstr_longlong(offset), wine_dbgstr_longlong(size)); + FIXME("(%p)->(0x%s 0x%s): stub\n", This, wine_dbgstr_longlong(offset), wine_dbgstr_longlong(size)); return E_NOTIMPL; }

1 0

Piotr Caban : ucrtbase: Add __intrinsic_setjmp implementation.
by Alexandre Julliard 16 Nov '16

16 Nov '16

Module: wine Branch: master Commit: f8683fc8c42095f23e26a76b978e1180b60e1048 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8683fc8c42095f23e26a76b9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 16 15:31:01 2016 -0600 ucrtbase: Add __intrinsic_setjmp implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 2 +- dlls/vcruntime140/vcruntime140.spec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec index e52b904..d1cd0b4 100644 --- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec +++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec @@ -38,7 +38,7 @@ @ stub __dcrt_get_wide_environment_from_os @ stub __dcrt_initial_narrow_environment @ stub __intrinsic_abnormal_termination -@ stub __intrinsic_setjmp +@ cdecl -arch=i386,x86_64,arm -norelay __intrinsic_setjmp(ptr) ucrtbase.__intrinsic_setjmp @ stub __intrinsic_setjmpex @ stub __processing_throw @ stub __report_gsfailure diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 83143b6..2aa0563 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -93,7 +93,7 @@ @ cdecl __fpecode() @ stub __initialize_lconv_for_unsigned_char @ stub __intrinsic_abnormal_termination -@ stub __intrinsic_setjmp +@ cdecl -arch=i386,x86_64,arm -norelay __intrinsic_setjmp(ptr) MSVCRT__setjmp @ stub __intrinsic_setjmpex @ cdecl __isascii(long) MSVCRT___isascii @ cdecl __iscsym(long) MSVCRT___iscsym diff --git a/dlls/vcruntime140/vcruntime140.spec b/dlls/vcruntime140/vcruntime140.spec index b91d976..1b9f3f9 100644 --- a/dlls/vcruntime140/vcruntime140.spec +++ b/dlls/vcruntime140/vcruntime140.spec @@ -32,7 +32,7 @@ @ stub __TypeMatch @ stub __current_exception @ stub __current_exception_context -@ stub __intrinsic_setjmp +@ cdecl -arch=i386,x86_64,arm -norelay __intrinsic_setjmp(ptr) ucrtbase.__intrinsic_setjmp @ stub __intrinsic_setjmpex @ stub __processing_throw @ stub __report_gsfailure

1 0

Hans Leidekker : winhttp/tests: Fix test failures on Windows XP.
by Alexandre Julliard 16 Nov '16

16 Nov '16

Module: wine Branch: master Commit: bfa0e4b840075857e1c6850aa6a99b98e052e6cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfa0e4b840075857e1c6850aa… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 16 16:46:57 2016 -0600 winhttp/tests: Fix test failures on Windows XP. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/tests/winhttp.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index e5a8be3..61c4acf 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -995,7 +995,10 @@ static void test_secure_connection(void) ok(req != NULL, "failed to open a request %u\n", GetLastError()); ret = WinHttpSetOption(req, WINHTTP_OPTION_CLIENT_CERT_CONTEXT, WINHTTP_NO_CLIENT_CERT_CONTEXT, 0); - ok(!ret && GetLastError() == ERROR_WINHTTP_INCORRECT_HANDLE_STATE, "setting client cert context returned %x (%u)\n", ret, GetLastError()); + err = GetLastError(); + ok(!ret, "unexpected success\n"); + ok(err == ERROR_WINHTTP_INCORRECT_HANDLE_STATE || broken(err == ERROR_INVALID_PARAMETER) /* winxp */, + "setting client cert context returned %u\n", err); ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); err = GetLastError(); @@ -1021,7 +1024,8 @@ static void test_secure_connection(void) ok(req != NULL, "failed to open a request %u\n", GetLastError()); ret = WinHttpSetOption(req, WINHTTP_OPTION_CLIENT_CERT_CONTEXT, WINHTTP_NO_CLIENT_CERT_CONTEXT, 0); - ok(ret, "failed to set client cert context %u\n", GetLastError()); + err = GetLastError(); + ok(ret || broken(!ret && err == ERROR_INVALID_PARAMETER) /* winxp */, "failed to set client cert context %u\n", err); WinHttpSetStatusCallback(req, cert_error, WINHTTP_CALLBACK_STATUS_SECURE_FAILURE, 0);

1 0