May 2015 - Wine-Commits - list.winehq.org

Alexandre Julliard : Wine release 1.7.43
by Alexandre Julliard May 15, 2015

May 15, 2015

Module: website Branch: master Commit: ca8593fbcc5a7db9f5945acc13737599c59de0d7 URL: http://source.winehq.org/git/website.git/?a=commit;h=ca8593fbcc5a7db9f5945a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 15 22:38:53 2015 +0900 Wine release 1.7.43 --- news/en/2015051501.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2015051501.xml b/news/en/2015051501.xml new file mode 100644 index 0000000..10848fd --- /dev/null +++ b/news/en/2015051501.xml @@ -0,0 +1,17 @@ +<news> +<date>May 15, 2015</date> +<title>Wine 1.7.43 Released</title> +<body> + The Wine development release 1.7.43 is now available. + <a href="{$root}/announce/1.7.43">What's new</a> in this release: +<ul> + <li>Improved support for Shell Browser windows.</li> + <li>Some more API Sets libraries. </li> + <li>Read/write operations support with built-in devices.</li> + <li>Major Catalan translation update.</li> + <li>Support for WoW64 mode on ARM64.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.43.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Nikolay Sivov : oleaut32: Added IEnumConnectionPoints::Next proxy/stub.
by Alexandre Julliard May 15, 2015

May 15, 2015

Module: wine Branch: master Commit: 298929c840f3ec18a0bccb63d434065f848ff969 URL: http://source.winehq.org/git/wine.git/?a=commit;h=298929c840f3ec18a0bccb63d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 15 14:18:35 2015 +0300 oleaut32: Added IEnumConnectionPoints::Next proxy/stub. --- dlls/oleaut32/usrmarshal.c | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index 4db2b76..32c089c 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -2232,21 +2232,35 @@ HRESULT __RPC_STUB IEnumConnections_Next_Stub( HRESULT CALLBACK IEnumConnectionPoints_Next_Proxy( IEnumConnectionPoints* This, ULONG cConnections, - LPCONNECTIONPOINT *ppCP, + IConnectionPoint **ppCP, ULONG *pcFetched) { - FIXME("not implemented\n"); - return E_NOTIMPL; + ULONG fetched; + + TRACE("(%u, %p %p)\n", cConnections, ppCP, pcFetched); + + if (!pcFetched) + pcFetched = &fetched; + + return IEnumConnectionPoints_RemoteNext_Proxy(This, cConnections, ppCP, pcFetched); } HRESULT __RPC_STUB IEnumConnectionPoints_Next_Stub( IEnumConnectionPoints* This, ULONG cConnections, - LPCONNECTIONPOINT *ppCP, + IConnectionPoint **ppCP, ULONG *pcFetched) { - FIXME("not implemented\n"); - return E_NOTIMPL; + HRESULT hr; + + TRACE("(%u, %p, %p)\n", cConnections, ppCP, pcFetched); + + *pcFetched = 0; + hr = IEnumConnectionPoints_Next(This, cConnections, ppCP, pcFetched); + if (hr == S_OK) + *pcFetched = cConnections; + + return hr; } HRESULT CALLBACK IPersistMemory_Load_Proxy(

1 0

Bruno Jesus : iphlpapi/tests: Improve IcmpSendEcho trace.
by Alexandre Julliard May 15, 2015

May 15, 2015

Module: wine Branch: master Commit: ec8e1df8a9f9af4016e1173a0ec4993543f7ed7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec8e1df8a9f9af4016e1173a0… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu May 14 23:27:47 2015 -0300 iphlpapi/tests: Improve IcmpSendEcho trace. --- dlls/iphlpapi/tests/iphlpapi.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 847ba49..bc70b51 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -1043,7 +1043,15 @@ todo_wine if (ret) { PICMP_ECHO_REPLY pong = (PICMP_ECHO_REPLY) replydata; - trace ("ping roundtrip: %u ms\n", pong->RoundTripTime); + trace ("send addr : %s\n", ntoa(address)); + trace ("send size : %u\n", sizeof(senddata)); + trace ("reply addr : %s\n", ntoa(pong->Address)); + trace ("reply size : %u\n", replysz); + trace ("roundtrip : %u ms\n", pong->RoundTripTime); + trace ("status : %u\n", pong->Status); + trace ("recv size : %u\n", pong->DataSize); + trace ("ttl : %u\n", pong->Options.Ttl); + trace ("flags : 0x%x\n", pong->Options.Flags); } else {

1 0

Huw Davies : ntdll/tests: Fix incorrect prototype.
by Alexandre Julliard May 15, 2015

May 15, 2015

Module: wine Branch: master Commit: d6d703b5927b0dd35695851ab5a2fe81e508b82e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6d703b5927b0dd35695851ab… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu May 14 13:45:04 2015 +0100 ntdll/tests: Fix incorrect prototype. --- dlls/ntdll/tests/port.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/port.c b/dlls/ntdll/tests/port.c index e01316b..9525232 100644 --- a/dlls/ntdll/tests/port.c +++ b/dlls/ntdll/tests/port.c @@ -115,7 +115,7 @@ static UNICODE_STRING port; static HMODULE hntdll = 0; static NTSTATUS (WINAPI *pNtCompleteConnectPort)(HANDLE); static NTSTATUS (WINAPI *pNtAcceptConnectPort)(PHANDLE,ULONG,PLPC_MESSAGE,ULONG, - ULONG,PLPC_SECTION_READ); + PLPC_SECTION_WRITE,PLPC_SECTION_READ); static NTSTATUS (WINAPI *pNtReplyPort)(HANDLE,PLPC_MESSAGE); static NTSTATUS (WINAPI *pNtReplyWaitReceivePort)(PHANDLE,PULONG,PLPC_MESSAGE, PLPC_MESSAGE); @@ -182,7 +182,7 @@ static void ProcessConnectionRequest(union lpc_message *LpcMessage, PHANDLE pAcc ok(!*LpcMessage->msg.Data, "Expected empty string!\n"); } - status = pNtAcceptConnectPort(pAcceptPortHandle, 0, &LpcMessage->msg, 1, 0, NULL); + status = pNtAcceptConnectPort(pAcceptPortHandle, 0, &LpcMessage->msg, 1, NULL, NULL); ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %x\n", status); status = pNtCompleteConnectPort(*pAcceptPortHandle);

1 0

Jacek Caban : mshtml: Get rid of get_node_event_target.
by Alexandre Julliard May 15, 2015

May 15, 2015

Module: wine Branch: master Commit: 6919c866014d3023727d9b71e2cb6dd92e65ef9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6919c866014d3023727d9b71e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 14 13:26:02 2015 +0200 mshtml: Get rid of get_node_event_target. --- dlls/mshtml/htmlevent.c | 37 +++++++++++++++---------------------- dlls/mshtml/htmlevent.h | 7 ------- 2 files changed, 15 insertions(+), 29 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 3713389..6468b38 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -883,6 +883,19 @@ HRESULT create_event_obj(IHTMLEventObj **ret) return S_OK; } +static inline event_target_t *get_event_target_data(EventTarget *event_target, BOOL alloc) +{ + event_target_t **ptr; + + ptr = event_target->dispex.data->vtbl && event_target->dispex.data->vtbl->get_event_target_ptr + ? event_target->dispex.data->vtbl->get_event_target_ptr(&event_target->dispex) + : &event_target->ptr; + if(*ptr || !alloc) + return *ptr; + + return *ptr = heap_alloc_zero(sizeof(event_target_t)); +} + static HRESULT call_disp_func(IDispatch *disp, DISPPARAMS *dp, VARIANT *retv) { IDispatchEx *dispex; @@ -1107,7 +1120,7 @@ static void fire_event_obj(HTMLDocumentNode *doc, eventid_t eid, HTMLEventObj *e do { hres = get_node(doc, nsnode, FALSE, &node); if(SUCCEEDED(hres) && node) { - call_event_handlers(doc, event_obj, *get_node_event_target(node), + call_event_handlers(doc, event_obj, get_event_target_data(&node->event_target, FALSE), node->cp_container, eid, script_this ? script_this : (IDispatch*)&node->IHTMLDOMNode_iface); node_release(node); } @@ -1136,7 +1149,7 @@ static void fire_event_obj(HTMLDocumentNode *doc, eventid_t eid, HTMLEventObj *e if(NS_SUCCEEDED(nsres) && nsbody) { hres = get_node(doc, (nsIDOMNode*)nsbody, FALSE, &node); if(SUCCEEDED(hres) && node) { - call_event_handlers(doc, event_obj, *get_node_event_target(node), + call_event_handlers(doc, event_obj, get_event_target_data(&node->event_target, FALSE), node->cp_container, eid, script_this ? script_this : (IDispatch*)&node->IHTMLDOMNode_iface); node_release(node); } @@ -1301,26 +1314,6 @@ HRESULT call_fire_event(HTMLDOMNode *node, eventid_t eid) return S_OK; } -static inline event_target_t *get_event_target(event_target_t **event_target_ptr) -{ - if(!*event_target_ptr) - *event_target_ptr = heap_alloc_zero(sizeof(event_target_t)); - return *event_target_ptr; -} - -static inline event_target_t *get_event_target_data(EventTarget *event_target, BOOL alloc) -{ - event_target_t **ptr; - - ptr = event_target->dispex.data->vtbl && event_target->dispex.data->vtbl->get_event_target_ptr - ? event_target->dispex.data->vtbl->get_event_target_ptr(&event_target->dispex) - : &event_target->ptr; - if(*ptr || !alloc) - return *ptr; - - return *ptr = heap_alloc_zero(sizeof(event_target_t)); -} - static BOOL alloc_handler_vector(event_target_t *event_target, eventid_t eid, int cnt) { handler_vector_t *new_vector, *handler_vector = event_target->event_table[eid]; diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 85f056c..6133737 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -71,13 +71,6 @@ void release_nsevents(HTMLDocumentNode*) DECLSPEC_HIDDEN; void add_nsevent_listener(HTMLDocumentNode*,nsIDOMNode*,LPCWSTR) DECLSPEC_HIDDEN; void detach_nsevent(HTMLDocumentNode*,const WCHAR*) DECLSPEC_HIDDEN; -static inline event_target_t **get_node_event_target(HTMLDOMNode *node) -{ - return node->event_target.dispex.data->vtbl->get_event_target_ptr - ? node->event_target.dispex.data->vtbl->get_event_target_ptr(&node->event_target.dispex) - : &node->event_target.ptr; -} - static inline HRESULT set_node_event(HTMLDOMNode *node, eventid_t eid, VARIANT *var) { return set_event_handler(&node->event_target, node->doc, eid, var);

1 0

Jacek Caban : mshtml: Pass EventTarget to update_cp_events.
by Alexandre Julliard May 15, 2015

May 15, 2015

Module: wine Branch: master Commit: 760f9de85126d891b3f50f99b99d487295825792 URL: http://source.winehq.org/git/wine.git/?a=commit;h=760f9de85126d891b3f50f99b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 14 13:25:56 2015 +0200 mshtml: Pass EventTarget to update_cp_events. --- dlls/mshtml/htmldoc.c | 2 +- dlls/mshtml/htmlevent.c | 10 +++++----- dlls/mshtml/htmlevent.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index b293367..1b72a32 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -3962,7 +3962,7 @@ static void HTMLDocument_on_advise(IUnknown *iface, cp_static_data_t *cp) HTMLDocument *This = impl_from_IHTMLDocument2((IHTMLDocument2*)iface); if(This->window) - update_cp_events(This->window->base.inner_window, &This->doc_node->node.event_target.ptr, cp); + update_cp_events(This->window->base.inner_window, &This->doc_node->node.event_target, cp); } static inline HTMLDocument *impl_from_ISupportErrorInfo(ISupportErrorInfo *iface) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 18bca41..3713389 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1563,18 +1563,18 @@ void bind_target_event(HTMLDocumentNode *doc, EventTarget *event_target, const W set_event_handler_disp(event_target, doc, eid, disp); } -void update_cp_events(HTMLInnerWindow *window, event_target_t **event_target_ptr, cp_static_data_t *cp) +void update_cp_events(HTMLInnerWindow *window, EventTarget *event_target, cp_static_data_t *cp) { - event_target_t *event_target; + event_target_t *data; int i; - event_target = get_event_target(event_target_ptr); - if(!event_target) + data = get_event_target_data(event_target, FALSE); + if(!data) return; /* FIXME */ for(i=0; i < EVENTID_LAST; i++) { if((event_info[i].flags & EVENT_DEFAULTLISTENER) && is_cp_event(cp, event_info[i].dispid)) - ensure_nsevent_handler(window->doc, event_target, i); + ensure_nsevent_handler(window->doc, data, i); } } diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 8c3163e..85f056c 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -60,7 +60,7 @@ HRESULT attach_event(EventTarget*,HTMLDocument*,BSTR,IDispatch*,VARIANT_BOOL*) D HRESULT detach_event(EventTarget*,HTMLDocument*,BSTR,IDispatch*) DECLSPEC_HIDDEN; HRESULT dispatch_event(HTMLDOMNode*,const WCHAR*,VARIANT*,VARIANT_BOOL*) DECLSPEC_HIDDEN; HRESULT call_fire_event(HTMLDOMNode*,eventid_t) DECLSPEC_HIDDEN; -void update_cp_events(HTMLInnerWindow*,event_target_t**,cp_static_data_t*) DECLSPEC_HIDDEN; +void update_cp_events(HTMLInnerWindow*,EventTarget*,cp_static_data_t*) DECLSPEC_HIDDEN; HRESULT doc_init_events(HTMLDocumentNode*) DECLSPEC_HIDDEN; void detach_events(HTMLDocumentNode *doc) DECLSPEC_HIDDEN; HRESULT create_event_obj(IHTMLEventObj**) DECLSPEC_HIDDEN;

1 0

Jacek Caban : mshtml: Pass EventTarget to attach_event.
by Alexandre Julliard May 15, 2015

May 15, 2015

Module: wine Branch: master Commit: 513c77d9e42902b154fd277f57589fe9dbe9d11a URL: http://source.winehq.org/git/wine.git/?a=commit;h=513c77d9e42902b154fd277f5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 14 13:25:31 2015 +0200 mshtml: Pass EventTarget to attach_event. --- dlls/mshtml/htmldoc.c | 2 +- dlls/mshtml/htmlelem.c | 2 +- dlls/mshtml/htmlevent.c | 20 ++++++++++---------- dlls/mshtml/htmlevent.h | 2 +- dlls/mshtml/htmlwindow.c | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 0316be2..2b30c67 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -2032,7 +2032,7 @@ static HRESULT WINAPI HTMLDocument3_attachEvent(IHTMLDocument3 *iface, BSTR even TRACE("(%p)->(%s %p %p)\n", This, debugstr_w(event), pDisp, pfResult); - return attach_event(&This->doc_node->node.event_target.ptr, This, event, pDisp, pfResult); + return attach_event(&This->doc_node->node.event_target, This, event, pDisp, pfResult); } static HRESULT WINAPI HTMLDocument3_detachEvent(IHTMLDocument3 *iface, BSTR event, diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 77ccc52..8777e45 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -2566,7 +2566,7 @@ static HRESULT WINAPI HTMLElement2_attachEvent(IHTMLElement2 *iface, BSTR event, TRACE("(%p)->(%s %p %p)\n", This, debugstr_w(event), pDisp, pfResult); - return attach_event(get_node_event_target(&This->node), &This->node.doc->basedoc, event, pDisp, pfResult); + return attach_event(&This->node.event_target, &This->node.doc->basedoc, event, pDisp, pfResult); } static HRESULT WINAPI HTMLElement2_detachEvent(IHTMLElement2 *iface, BSTR event, IDispatch *pDisp) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index fe22b36..527bed2 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1484,10 +1484,10 @@ HRESULT get_event_handler(EventTarget *event_target, eventid_t eid, VARIANT *var return S_OK; } -HRESULT attach_event(event_target_t **event_target_ptr, HTMLDocument *doc, BSTR name, +HRESULT attach_event(EventTarget *event_target, HTMLDocument *doc, BSTR name, IDispatch *disp, VARIANT_BOOL *res) { - event_target_t *event_target; + event_target_t *data; eventid_t eid; DWORD i = 0; @@ -1498,24 +1498,24 @@ HRESULT attach_event(event_target_t **event_target_ptr, HTMLDocument *doc, BSTR return S_OK; } - event_target = get_event_target(event_target_ptr); - if(!event_target) + data = get_event_target_data(event_target, TRUE); + if(!data) return E_OUTOFMEMORY; - if(event_target->event_table[eid]) { - while(i < event_target->event_table[eid]->handler_cnt && event_target->event_table[eid]->handlers[i]) + if(data->event_table[eid]) { + while(i < data->event_table[eid]->handler_cnt && data->event_table[eid]->handlers[i]) i++; - if(i == event_target->event_table[eid]->handler_cnt && !alloc_handler_vector(event_target, eid, i+1)) + if(i == data->event_table[eid]->handler_cnt && !alloc_handler_vector(data, eid, i+1)) return E_OUTOFMEMORY; - }else if(!alloc_handler_vector(event_target, eid, i+1)) { + }else if(!alloc_handler_vector(data, eid, i+1)) { return E_OUTOFMEMORY; } IDispatch_AddRef(disp); - event_target->event_table[eid]->handlers[i] = disp; + data->event_table[eid]->handlers[i] = disp; *res = VARIANT_TRUE; - return ensure_nsevent_handler(doc->doc_node, event_target, eid); + return ensure_nsevent_handler(doc->doc_node, data, eid); } HRESULT detach_event(event_target_t *event_target, HTMLDocument *doc, BSTR name, IDispatch *disp) diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 1ca1cf7..e3a4e7f 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -56,7 +56,7 @@ void release_event_target(event_target_t*) DECLSPEC_HIDDEN; void fire_event(HTMLDocumentNode*,eventid_t,BOOL,nsIDOMNode*,nsIDOMEvent*,IDispatch*) DECLSPEC_HIDDEN; HRESULT set_event_handler(EventTarget*,HTMLDocumentNode*,eventid_t,VARIANT*) DECLSPEC_HIDDEN; HRESULT get_event_handler(EventTarget*,eventid_t,VARIANT*) DECLSPEC_HIDDEN; -HRESULT attach_event(event_target_t**,HTMLDocument*,BSTR,IDispatch*,VARIANT_BOOL*) DECLSPEC_HIDDEN; +HRESULT attach_event(EventTarget*,HTMLDocument*,BSTR,IDispatch*,VARIANT_BOOL*) DECLSPEC_HIDDEN; HRESULT detach_event(event_target_t*,HTMLDocument*,BSTR,IDispatch*) DECLSPEC_HIDDEN; HRESULT dispatch_event(HTMLDOMNode*,const WCHAR*,VARIANT*,VARIANT_BOOL*) DECLSPEC_HIDDEN; HRESULT call_fire_event(HTMLDOMNode*,eventid_t) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index f31fb83..b98d618 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -1654,7 +1654,7 @@ static HRESULT WINAPI HTMLWindow3_attachEvent(IHTMLWindow3 *iface, BSTR event, I return E_FAIL; } - return attach_event(&window->doc->body_event_target, &window->doc->basedoc, event, pDisp, pfResult); + return attach_event(&window->event_target, &window->doc->basedoc, event, pDisp, pfResult); } static HRESULT WINAPI HTMLWindow3_detachEvent(IHTMLWindow3 *iface, BSTR event, IDispatch *pDisp)

1 0

Tag wine-1.7.43 : Alexandre Julliard : Release 1.7.43
by Alexandre Julliard May 15, 2015

May 15, 2015

Module: wine Branch: refs/tags/wine-1.7.43 Tag: 8c4d910ac245774ed807fb1a8755232debff5ee7 URL: http://source.winehq.org/git/wine.git/?a=tag;h=8c4d910ac245774ed807fb1a8755… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 15 22:36:39 2015 +0900 Release 1.7.43

1 0

Alexandre Julliard : Release 1.7.43.
by Alexandre Julliard May 15, 2015

May 15, 2015

Module: wine Branch: master Commit: 566077a2cdb7ea6ee17eedc1b1f8395c02643633 URL: http://source.winehq.org/git/wine.git/?a=commit;h=566077a2cdb7ea6ee17eedc1b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 15 22:36:39 2015 +0900 Release 1.7.43. --- ANNOUNCE | 596 +++++++++++++++++++++++++++++--------------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 293 insertions(+), 324 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=566077a2cdb7ea6ee17ee…

1 0

Nikolay Sivov : ole32: Implement SNB marshalling.
by Alexandre Julliard May 15, 2015

May 15, 2015

Module: wine Branch: master Commit: aa3a23480308a2bc222e6087cbefb32427aff9a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa3a23480308a2bc222e6087c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 15 14:03:35 2015 +0300 ole32: Implement SNB marshalling. --- dlls/ole32/tests/usrmarshal.c | 94 ++++++++++++++++++++++++++++++++++++ dlls/ole32/usrmarshal.c | 108 ++++++++++++++++++++++++++++++++++++++---- 2 files changed, 194 insertions(+), 8 deletions(-) diff --git a/dlls/ole32/tests/usrmarshal.c b/dlls/ole32/tests/usrmarshal.c index c994af5..51ccc59 100644 --- a/dlls/ole32/tests/usrmarshal.c +++ b/dlls/ole32/tests/usrmarshal.c @@ -768,6 +768,99 @@ static void test_marshal_STGMEDIUM(void) HeapFree(GetProcessHeap(), 0, expect_buffer); } +static void test_marshal_SNB(void) +{ + static const WCHAR str1W[] = {'s','t','r','i','n','g','1',0}; + static const WCHAR str2W[] = {'s','t','r','2',0}; + unsigned char *buffer, *src, *mbuf; + MIDL_STUB_MESSAGE stub_msg; + WCHAR **ptrW, *dataW; + USER_MARSHAL_CB umcb; + RPC_MESSAGE rpc_msg; + RemSNB *wiresnb; + SNB snb, snb2; + ULONG size; + + /* 4 bytes alignment */ + snb = NULL; + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_LOCAL); + size = SNB_UserSize(&umcb.Flags, 3, &snb); + ok(size == 16, "Size should be 16, instead of %d\n", size); + + /* NULL block */ + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_LOCAL); + size = SNB_UserSize(&umcb.Flags, 0, &snb); + ok(size == 12, "Size should be 12, instead of %d\n", size); + + buffer = HeapAlloc(GetProcessHeap(), 0, size); + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_LOCAL); + mbuf = SNB_UserMarshal(&umcb.Flags, buffer, &snb); + ok(mbuf == buffer + size, "got %p, %p\n", mbuf, buffer + size); + + wiresnb = (RemSNB*)buffer; + ok(wiresnb->ulCntStr == 0, "got %u\n", wiresnb->ulCntStr); + ok(wiresnb->ulCntChar == 0, "got %u\n", wiresnb->ulCntChar); + ok(*(ULONG*)wiresnb->rgString == 0, "got %u\n", *(ULONG*)wiresnb->rgString); + + snb2 = NULL; + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_LOCAL); + SNB_UserUnmarshal(&umcb.Flags, buffer, &snb2); + ok(snb2 == NULL, "got %p\n", snb2); + + HeapFree(GetProcessHeap(), 0, buffer); + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_LOCAL); + SNB_UserFree(&umcb.Flags, &snb2); + + /* block with actual data */ + + /* allocate source block, n+1 pointers first, then data */ + src = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR*)*3 + sizeof(str1W) + sizeof(str2W)); + ptrW = (WCHAR**)src; + dataW = *ptrW = (WCHAR*)(src + 3*sizeof(WCHAR*)); + ptrW++; + *ptrW = (WCHAR*)(src + 3*sizeof(WCHAR*) + sizeof(str1W)); + ptrW++; + *ptrW = NULL; + lstrcpyW(dataW, str1W); + dataW += lstrlenW(str1W) + 1; + lstrcpyW(dataW, str2W); + + snb = (SNB)src; + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_LOCAL); + size = SNB_UserSize(&umcb.Flags, 0, &snb); + ok(size == 38, "Size should be 38, instead of %d\n", size); + + buffer = HeapAlloc(GetProcessHeap(), 0, size); + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_LOCAL); + SNB_UserMarshal(&umcb.Flags, buffer, &snb); + + wiresnb = (RemSNB*)buffer; + ok(wiresnb->ulCntStr == 13, "got %u\n", wiresnb->ulCntStr); + ok(wiresnb->ulCntChar == 2, "got %u\n", wiresnb->ulCntChar); + /* payload length is stored one more time, as ULONG */ + ok(*(ULONG*)wiresnb->rgString == wiresnb->ulCntStr, "got %u\n", *(ULONG*)wiresnb->rgString); + dataW = &wiresnb->rgString[2]; + ok(!lstrcmpW(dataW, str1W), "marshalled string 0: %s\n", wine_dbgstr_w(dataW)); + dataW += sizeof(str1W)/sizeof(WCHAR); + ok(!lstrcmpW(dataW, str2W), "marshalled string 1: %s\n", wine_dbgstr_w(dataW)); + + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_LOCAL); + + snb2 = NULL; + SNB_UserUnmarshal(&umcb.Flags, buffer, &snb2); + + ptrW = snb2; + ok(!lstrcmpW(*ptrW, str1W), "unmarshalled string 0: %s\n", wine_dbgstr_w(*ptrW)); + ptrW++; + ok(!lstrcmpW(*ptrW, str2W), "unmarshalled string 1: %s\n", wine_dbgstr_w(*ptrW)); + ptrW++; + ok(*ptrW == NULL, "expected terminating NULL ptr, got %p, start %p\n", *ptrW, snb2); + + HeapFree(GetProcessHeap(), 0, buffer); + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_LOCAL); + SNB_UserFree(&umcb.Flags, &snb2); +} + START_TEST(usrmarshal) { CoInitialize(NULL); @@ -780,6 +873,7 @@ START_TEST(usrmarshal) test_marshal_HMETAFILEPICT(); test_marshal_WdtpInterfacePointer(); test_marshal_STGMEDIUM(); + test_marshal_SNB(); CoUninitialize(); } diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index cd16fb2..7875bef 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -2160,25 +2160,117 @@ void __RPC_USER FLAG_STGMEDIUM_UserFree(ULONG *pFlags, FLAG_STGMEDIUM *pStgMediu ULONG __RPC_USER SNB_UserSize(ULONG *pFlags, ULONG StartingSize, SNB *pSnb) { - FIXME(":stub\n"); - return StartingSize; + ULONG size = StartingSize; + + TRACE("(%s, %d, %p\n", debugstr_user_flags(pFlags), StartingSize, pSnb); + + ALIGN_LENGTH(size, 3); + + /* two counters from RemSNB header, plus one more ULONG */ + size += 3*sizeof(ULONG); + + /* now actual data length */ + if (*pSnb) + { + WCHAR **ptrW = *pSnb; + + while (*ptrW) + { + size += (strlenW(*ptrW) + 1)*sizeof(WCHAR); + ptrW++; + } + } + + return size; } -unsigned char * __RPC_USER SNB_UserMarshal( ULONG *pFlags, unsigned char *pBuffer, SNB *pSnb) +struct SNB_wire { + ULONG charcnt; + ULONG strcnt; + ULONG datalen; + WCHAR data[1]; +}; + +unsigned char * __RPC_USER SNB_UserMarshal(ULONG *pFlags, unsigned char *pBuffer, SNB *pSnb) { - FIXME(":stub\n"); - return pBuffer; + struct SNB_wire *wire; + ULONG size; + + TRACE("(%s, %p, %p)\n", debugstr_user_flags(pFlags), pBuffer, pSnb); + + ALIGN_POINTER(pBuffer, 3); + + wire = (struct SNB_wire*)pBuffer; + wire->charcnt = wire->strcnt = 0; + size = 3*sizeof(ULONG); + + if (*pSnb) + { + WCHAR **ptrW = *pSnb; + WCHAR *dataW = wire->data; + + while (*ptrW) + { + ULONG len = strlenW(*ptrW) + 1; + + wire->strcnt++; + wire->charcnt += len; + memcpy(dataW, *ptrW, len*sizeof(WCHAR)); + dataW += len; + + size += len*sizeof(WCHAR); + ptrW++; + } + } + + wire->datalen = wire->charcnt; + return pBuffer + size; } unsigned char * __RPC_USER SNB_UserUnmarshal(ULONG *pFlags, unsigned char *pBuffer, SNB *pSnb) { - FIXME(":stub\n"); - return pBuffer; + USER_MARSHAL_CB *umcb = (USER_MARSHAL_CB*)pFlags; + struct SNB_wire *wire; + + TRACE("(%s, %p, %p)\n", debugstr_user_flags(pFlags), pBuffer, pSnb); + + wire = (struct SNB_wire*)pBuffer; + + if (*pSnb) + umcb->pStubMsg->pfnFree(*pSnb); + + if (wire->datalen == 0) + *pSnb = NULL; + else + { + WCHAR *src = wire->data, *dest; + WCHAR **ptrW; + ULONG i; + + ptrW = *pSnb = umcb->pStubMsg->pfnAllocate((wire->strcnt+1)*sizeof(WCHAR*) + wire->datalen); + dest = (WCHAR*)(*pSnb + wire->strcnt + 1); + + for (i = 0; i < wire->strcnt; i++) + { + ULONG len = strlenW(src); + memcpy(dest, src, (len + 1)*sizeof(WCHAR)); + *ptrW = dest; + src += len + 1; + dest += len + 1; + ptrW++; + } + *ptrW = NULL; + } + + return pBuffer + 3*sizeof(ULONG) + wire->datalen*sizeof(WCHAR); } void __RPC_USER SNB_UserFree(ULONG *pFlags, SNB *pSnb) { - FIXME(":stub\n"); + USER_MARSHAL_CB *umcb = (USER_MARSHAL_CB*)pFlags; + TRACE("(%p)\n", pSnb); + if (*pSnb) + umcb->pStubMsg->pfnFree(*pSnb); } /* call_as/local stubs for unknwn.idl */

1 0