June 2008 - Wine-commits - list.winehq.org

Jacek Caban : mshtml: Added IHTMLElement2::get_clientWidth implementation.
by Alexandre Julliard 19 Jun '08

19 Jun '08

Module: wine Branch: master Commit: 1acddbf5c9c66e9dc31d782298fbe880da7f70be URL: http://source.winehq.org/git/wine.git/?a=commit;h=1acddbf5c9c66e9dc31d78229… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 18 17:08:52 2008 -0500 mshtml: Added IHTMLElement2::get_clientWidth implementation. --- dlls/mshtml/htmlelem2.c | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlelem2.c b/dlls/mshtml/htmlelem2.c index a1fba29..d68d0f4 100644 --- a/dlls/mshtml/htmlelem2.c +++ b/dlls/mshtml/htmlelem2.c @@ -507,8 +507,22 @@ static HRESULT WINAPI HTMLElement2_get_clientHeight(IHTMLElement2 *iface, long * static HRESULT WINAPI HTMLElement2_get_clientWidth(IHTMLElement2 *iface, long *p) { HTMLElement *This = HTMLELEM2_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsIDOMNSHTMLElement *nselem; + PRInt32 width=0; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMHTMLElement_QueryInterface(This->nselem, &IID_nsIDOMNSHTMLElement, (void**)&nselem); + if(NS_SUCCEEDED(nsres)) { + nsIDOMNSHTMLElement_GetClientWidth(nselem, &width); + nsIDOMNSHTMLElement_Release(nselem); + }else { + ERR("Could not get nsIDOMHTMLNSElement: %08x\n", nsres); + } + + *p = width; + return S_OK; } static HRESULT WINAPI HTMLElement2_get_clientTop(IHTMLElement2 *iface, long *p)

1 0

Jacek Caban : mshtml: Better stub for IHTMLElement:: setAttribute with NULL nselem.
by Alexandre Julliard 19 Jun '08

19 Jun '08

Module: wine Branch: master Commit: 591bab3726228119e1b6eb8e789edf8df8671611 URL: http://source.winehq.org/git/wine.git/?a=commit;h=591bab3726228119e1b6eb8e7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 18 17:08:14 2008 -0500 mshtml: Better stub for IHTMLElement::setAttribute with NULL nselem. --- dlls/mshtml/htmlelem.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 4ad3c73..8a3d3bc 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -194,7 +194,8 @@ static HRESULT WINAPI HTMLElement_getAttribute(IHTMLElement *iface, BSTR strAttr if(!This->nselem) { FIXME("NULL nselem\n"); - return E_NOTIMPL; + V_VT(AttributeValue) = VT_NULL; + return S_OK; } V_VT(AttributeValue) = VT_NULL;

1 0

Jacek Caban : mshtml: Added IHTMLElement2::put_accessKey implementation.
by Alexandre Julliard 19 Jun '08

19 Jun '08

Module: wine Branch: master Commit: 6305be26b34f69862162194c89a7bb4af15ae5b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6305be26b34f69862162194c8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 18 17:07:27 2008 -0500 mshtml: Added IHTMLElement2::put_accessKey implementation. --- dlls/mshtml/htmlelem2.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlelem2.c b/dlls/mshtml/htmlelem2.c index 6ef3098..a1fba29 100644 --- a/dlls/mshtml/htmlelem2.c +++ b/dlls/mshtml/htmlelem2.c @@ -416,8 +416,15 @@ static HRESULT WINAPI HTMLElement2_focus(IHTMLElement2 *iface) static HRESULT WINAPI HTMLElement2_put_accessKey(IHTMLElement2 *iface, BSTR v) { HTMLElement *This = HTMLELEM2_THIS(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + VARIANT var; + + static WCHAR accessKeyW[] = {'a','c','c','e','s','s','K','e','y',0}; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = v; + return IHTMLElement_setAttribute(HTMLELEM(This), accessKeyW, var, 0); } static HRESULT WINAPI HTMLElement2_get_accessKey(IHTMLElement2 *iface, BSTR *p)

1 0

Jacek Caban : mshtml: Added IHTMLDOMNode::put_nodeValue implementation.
by Alexandre Julliard 19 Jun '08

19 Jun '08

Module: wine Branch: master Commit: 568f26959839e940cb0b9e4ea04d261c17dbc701 URL: http://source.winehq.org/git/wine.git/?a=commit;h=568f26959839e940cb0b9e4ea… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 18 17:06:34 2008 -0500 mshtml: Added IHTMLDOMNode::put_nodeValue implementation. --- dlls/mshtml/htmlnode.c | 21 ++++++++++++++++++- dlls/mshtml/tests/dom.c | 50 +++++++++++++++++++++++++--------------------- 2 files changed, 47 insertions(+), 24 deletions(-) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index f5c6771..2f37c54 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -460,7 +460,26 @@ static HRESULT WINAPI HTMLDOMNode_get_nodeName(IHTMLDOMNode *iface, BSTR *p) static HRESULT WINAPI HTMLDOMNode_put_nodeValue(IHTMLDOMNode *iface, VARIANT v) { HTMLDOMNode *This = HTMLDOMNODE_THIS(iface); - FIXME("(%p)->()\n", This); + + TRACE("(%p)->()\n", This); + + switch(V_VT(&v)) { + case VT_BSTR: { + nsAString val_str; + + TRACE("bstr %s\n", debugstr_w(V_BSTR(&v))); + + nsAString_Init(&val_str, V_BSTR(&v)); + nsIDOMNode_SetNodeValue(This->nsnode, &val_str); + nsAString_Finish(&val_str); + + return S_OK; + } + + default: + FIXME("unsupported vt %d\n", V_VT(&v)); + } + return E_NOTIMPL; } diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index de48508..7269ad1 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -390,13 +390,10 @@ static IHTMLDOMNode *_get_node_iface(unsigned line, IUnknown *unk) #define test_node_name(u,n) _test_node_name(__LINE__,u,n) static void _test_node_name(unsigned line, IUnknown *unk, const char *exname) { - IHTMLDOMNode *node; + IHTMLDOMNode *node = _get_node_iface(line, unk); BSTR name; HRESULT hres; - hres = IUnknown_QueryInterface(unk, &IID_IHTMLDOMNode, (void**)&node); - ok_(__FILE__, line) (hres == S_OK, "QueryInterface(IID_IHTMLNode) failed: %08x\n", hres); - hres = IHTMLDOMNode_get_nodeName(node, &name); IHTMLDOMNode_Release(node); ok_(__FILE__, line) (hres == S_OK, "get_nodeName failed: %08x\n", hres); @@ -798,14 +795,10 @@ static void _test_elem_collection(unsigned line, IHTMLElementCollection *col, #define get_first_child(n) _get_first_child(__LINE__,n) static IHTMLDOMNode *_get_first_child(unsigned line, IUnknown *unk) { - IHTMLDOMNode *node, *child = NULL; + IHTMLDOMNode *node = _get_node_iface(line, unk); + IHTMLDOMNode *child = NULL; HRESULT hres; - hres = IUnknown_QueryInterface(unk, &IID_IHTMLDOMNode, (void**)&node); - ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLDOMNode: %08x\n", hres); - if(FAILED(hres)) - return NULL; - hres = IHTMLDOMNode_get_firstChild(node, &child); IHTMLDOMNode_Release(node); ok_(__FILE__,line) (hres == S_OK, "get_firstChild failed: %08x\n", hres); @@ -816,13 +809,10 @@ static IHTMLDOMNode *_get_first_child(unsigned line, IUnknown *unk) #define get_node_type(n) _get_node_type(__LINE__,n) static long _get_node_type(unsigned line, IUnknown *unk) { - IHTMLDOMNode *node; + IHTMLDOMNode *node = _get_node_iface(line, unk); long type = -1; HRESULT hres; - hres = IUnknown_QueryInterface(unk, &IID_IHTMLDOMNode, (void**)&node); - ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLDOMNode: %08x\n", hres); - hres = IHTMLDOMNode_get_nodeType(node, &type); ok(hres == S_OK, "get_nodeType failed: %08x\n", hres); @@ -845,16 +835,11 @@ static void _test_input_get_disabled(unsigned line, IHTMLInputElement *input, VA #define get_child_nodes(u) _get_child_nodes(__LINE__,u) static IHTMLDOMChildrenCollection *_get_child_nodes(unsigned line, IUnknown *unk) { + IHTMLDOMNode *node = _get_node_iface(line, unk); IHTMLDOMChildrenCollection *col = NULL; - IHTMLDOMNode *node; IDispatch *disp; HRESULT hres; - hres = IUnknown_QueryInterface(unk, &IID_IHTMLDOMNode, (void**)&node); - ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLDOMNode: %08x\n", hres); - if(FAILED(hres)) - return NULL; - hres = IHTMLDOMNode_get_childNodes(node, &disp); IHTMLDOMNode_Release(node); ok_(__FILE__,line) (hres == S_OK, "get_childNodes failed: %08x\n", hres); @@ -878,9 +863,8 @@ static IHTMLDOMNode *_get_child_item(unsigned line, IHTMLDOMChildrenCollection * hres = IHTMLDOMChildrenCollection_item(col, idx, &disp); ok(hres == S_OK, "item failed: %08x\n", hres); - hres = IDispatch_QueryInterface(disp, &IID_IHTMLDOMNode, (void**)&node); + node = _get_node_iface(line, (IUnknown*)disp); IDispatch_Release(disp); - ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLDOMNode: %08x\n", hres); return node; } @@ -940,6 +924,22 @@ static void _test_node_get_value_str(unsigned line, IUnknown *unk, const char *e VariantClear(&var); } +#define test_node_put_value_str(u,v) _test_node_put_value_str(__LINE__,u,v) +static void _test_node_put_value_str(unsigned line, IUnknown *unk, const char *val) +{ + IHTMLDOMNode *node = _get_node_iface(line, unk); + VARIANT var; + HRESULT hres; + + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = a2bstr(val); + + hres = IHTMLDOMNode_put_nodeValue(node, var); + ok_(__FILE__,line) (hres == S_OK, "get_nodeValue failed: %08x, expected VT_BSTR\n", hres); + IHTMLDOMNode_Release(node); + VariantClear(&var); +} + static void test_elem_col_item(IHTMLElementCollection *col, LPCWSTR n, const elem_type_t *elem_types, long len) { @@ -1706,6 +1706,8 @@ static void test_elems(IHTMLDocument2 *doc) test_input_get_disabled(input, VARIANT_FALSE); test_node_get_value_str((IUnknown*)elem, NULL); + test_node_put_value_str((IUnknown*)elem, "test"); + test_node_get_value_str((IUnknown*)elem, NULL); IHTMLInputElement_Release(input); IHTMLElement_Release(elem); @@ -1727,6 +1729,8 @@ static void test_elems(IHTMLDocument2 *doc) ok(type == 3, "type=%ld\n", type); test_node_get_value_str((IUnknown*)node, "text test"); + test_node_put_value_str((IUnknown*)elem, "test text"); + test_node_get_value_str((IUnknown*)node, "text test"); IHTMLDOMNode_Release(node); } @@ -1868,7 +1872,7 @@ static HRESULT WINAPI PropertyNotifySink_OnChanged(IPropertyNotifySink *iface, D if(!lstrcmpW(state, completeW)) doc_complete = TRUE; - SysFreeString(state); + SysFreeString(state); } return S_OK;

1 0

Jacek Caban : mshtml: Added IHTMLDOMNode::get_nodeValue implementation.
by Alexandre Julliard 19 Jun '08

19 Jun '08

Module: wine Branch: master Commit: 26e23bdd0718a42fd1df07c60a6d77418ed0dce2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26e23bdd0718a42fd1df07c60… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 18 17:06:00 2008 -0500 mshtml: Added IHTMLDOMNode::get_nodeValue implementation. --- dlls/mshtml/htmlnode.c | 21 +++++++++++++++++++-- dlls/mshtml/tests/dom.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index f217893..f5c6771 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -467,8 +467,25 @@ static HRESULT WINAPI HTMLDOMNode_put_nodeValue(IHTMLDOMNode *iface, VARIANT v) static HRESULT WINAPI HTMLDOMNode_get_nodeValue(IHTMLDOMNode *iface, VARIANT *p) { HTMLDOMNode *This = HTMLDOMNODE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + const PRUnichar *val; + nsAString val_str; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&val_str, NULL); + nsIDOMNode_GetNodeValue(This->nsnode, &val_str); + nsAString_GetData(&val_str, &val); + + if(*val) { + V_VT(p) = VT_BSTR; + V_BSTR(p) = SysAllocString(val); + }else { + V_VT(p) = VT_NULL; + } + + nsAString_Finish(&val_str); + + return S_OK; } static HRESULT WINAPI HTMLDOMNode_get_firstChild(IHTMLDOMNode *iface, IHTMLDOMNode **p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 45a5383..de48508 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -376,6 +376,17 @@ static IHTMLElement *_get_elem_iface(unsigned line, IUnknown *unk) return elem; } +#define get_node_iface(u) _get_node_iface(__LINE__,u) +static IHTMLDOMNode *_get_node_iface(unsigned line, IUnknown *unk) +{ + IHTMLDOMNode *node; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IHTMLDOMNode, (void**)&node); + ok_(__FILE__,line) (hres == S_OK, "Coule not get IHTMLDOMNode: %08x\n", hres); + return node; +} + #define test_node_name(u,n) _test_node_name(__LINE__,u,n) static void _test_node_name(unsigned line, IUnknown *unk, const char *exname) { @@ -908,6 +919,27 @@ static void _test_elem_put_id(unsigned line, IUnknown *unk, const char *new_id) _test_elem_id(line, unk, new_id); } +#define test_node_get_value_str(u,e) _test_node_get_value_str(__LINE__,u,e) +static void _test_node_get_value_str(unsigned line, IUnknown *unk, const char *exval) +{ + IHTMLDOMNode *node = _get_node_iface(line, unk); + VARIANT var; + HRESULT hres; + + hres = IHTMLDOMNode_get_nodeValue(node, &var); + IHTMLDOMNode_Release(node); + ok_(__FILE__,line) (hres == S_OK, "get_nodeValue failed: %08x, expected VT_BSTR\n", hres); + + if(exval) { + ok_(__FILE__,line) (V_VT(&var) == VT_BSTR, "vt=%d\n", V_VT(&var)); + ok_(__FILE__,line) (!strcmp_wa(V_BSTR(&var), exval), "unexpected value %s\n", dbgstr_w(V_BSTR(&var))); + }else { + ok_(__FILE__,line) (V_VT(&var) == VT_NULL, "vt=%d, expected VT_NULL\n", V_VT(&var)); + } + + VariantClear(&var); +} + static void test_elem_col_item(IHTMLElementCollection *col, LPCWSTR n, const elem_type_t *elem_types, long len) { @@ -1673,6 +1705,8 @@ static void test_elems(IHTMLDocument2 *doc) test_elem_put_id((IUnknown*)elem, "newin"); test_input_get_disabled(input, VARIANT_FALSE); + test_node_get_value_str((IUnknown*)elem, NULL); + IHTMLInputElement_Release(input); IHTMLElement_Release(elem); } @@ -1692,6 +1726,8 @@ static void test_elems(IHTMLDocument2 *doc) type = get_node_type((IUnknown*)node); ok(type == 3, "type=%ld\n", type); + test_node_get_value_str((IUnknown*)node, "text test"); + IHTMLDOMNode_Release(node); }

1 0

Jacek Caban : mshtml: Use heap_alloc_zero to allocate OmNavigator.
by Alexandre Julliard 19 Jun '08

19 Jun '08

Module: wine Branch: master Commit: 0cb99eef5a866c363f0054c4af6bf06de78e6505 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cb99eef5a866c363f0054c4a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 18 17:05:23 2008 -0500 mshtml: Use heap_alloc_zero to allocate OmNavigator. --- dlls/mshtml/omnavigator.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index 26287e8..9a6d537 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -315,7 +315,7 @@ IOmNavigator *OmNavigator_Create(void) { OmNavigator *ret; - ret = heap_alloc(sizeof(*ret)); + ret = heap_alloc_zero(sizeof(*ret)); ret->lpIOmNavigatorVtbl = &OmNavigatorVtbl; ret->ref = 1;

1 0

Jacek Caban : mshtml: Added IHTMLElement2::focus implementation.
by Alexandre Julliard 19 Jun '08

19 Jun '08

Module: wine Branch: master Commit: 590b185e3a05fe8900a215a4d11cd4cac191f96c URL: http://source.winehq.org/git/wine.git/?a=commit;h=590b185e3a05fe8900a215a4d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 18 17:04:54 2008 -0500 mshtml: Added IHTMLElement2::focus implementation. --- dlls/mshtml/htmlelem2.c | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlelem2.c b/dlls/mshtml/htmlelem2.c index 4430703..6ef3098 100644 --- a/dlls/mshtml/htmlelem2.c +++ b/dlls/mshtml/htmlelem2.c @@ -397,8 +397,20 @@ static HRESULT WINAPI HTMLElement2_get_tabIndex(IHTMLElement2 *iface, short *p) static HRESULT WINAPI HTMLElement2_focus(IHTMLElement2 *iface) { HTMLElement *This = HTMLELEM2_THIS(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + nsIDOMNSHTMLElement *nselem; + nsresult nsres; + + TRACE("(%p)\n", This); + + nsres = nsIDOMHTMLElement_QueryInterface(This->nselem, &IID_nsIDOMNSHTMLElement, (void**)&nselem); + if(NS_SUCCEEDED(nsres)) { + nsIDOMNSHTMLElement_focus(nselem); + nsIDOMNSHTMLElement_Release(nselem); + }else { + ERR("Could not get nsIDOMHTMLNSElement: %08x\n", nsres); + } + + return S_OK; } static HRESULT WINAPI HTMLElement2_put_accessKey(IHTMLElement2 *iface, BSTR v)

1 0

Philip Nilsson : msvcrt: Make EXCEPTION_PRIV_INSTRUCTION generate SIGILL.
by Alexandre Julliard 19 Jun '08

19 Jun '08

Module: wine Branch: master Commit: 5d583c3ac7f3d5f9d6a1d19a8d1f9faa064fa100 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d583c3ac7f3d5f9d6a1d19a8… Author: Philip Nilsson <pnilsson(a)nullref.se> Date: Mon Mar 24 21:53:49 2008 +0100 msvcrt: Make EXCEPTION_PRIV_INSTRUCTION generate SIGILL. --- dlls/msvcrt/except.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c index 4cb1436..296c656 100644 --- a/dlls/msvcrt/except.c +++ b/dlls/msvcrt/except.c @@ -497,6 +497,7 @@ static LONG WINAPI msvcrt_exception_filter(struct _EXCEPTION_POINTERS *except) } break; case EXCEPTION_ILLEGAL_INSTRUCTION: + case EXCEPTION_PRIV_INSTRUCTION: if ((handler = sighandlers[MSVCRT_SIGILL]) != MSVCRT_SIG_DFL) { if (handler != MSVCRT_SIG_IGN)

1 0

Rob Shearman : rpcrt4: Make RpcAssoc_BindConnection use RPCRT4_ReceiveWithAuth instead of RPCRT4_Receive .
by Alexandre Julliard 19 Jun '08

19 Jun '08

Module: wine Branch: master Commit: 6bb26abe8181693272be13408273132d54a81712 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bb26abe8181693272be13408… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Wed Jun 18 17:32:22 2008 +0100 rpcrt4: Make RpcAssoc_BindConnection use RPCRT4_ReceiveWithAuth instead of RPCRT4_Receive. Move the special handling of the PKT_BIND_ACK packet from RPCRT4_ReceiveWithAuth to RpcAssoc_BindConnection, where it belongs. --- dlls/rpcrt4/rpc_assoc.c | 21 ++++++++++++++++----- dlls/rpcrt4/rpc_message.c | 14 ++------------ dlls/rpcrt4/rpc_message.h | 1 + 3 files changed, 19 insertions(+), 17 deletions(-) diff --git a/dlls/rpcrt4/rpc_assoc.c b/dlls/rpcrt4/rpc_assoc.c index 6075278..e8f3676 100644 --- a/dlls/rpcrt4/rpc_assoc.c +++ b/dlls/rpcrt4/rpc_assoc.c @@ -222,6 +222,8 @@ static RPC_STATUS RpcAssoc_BindConnection(const RpcAssoc *assoc, RpcConnection * RpcPktHdr *response_hdr; RPC_MESSAGE msg; RPC_STATUS status; + unsigned char *auth_data = NULL; + unsigned long auth_length; TRACE("sending bind request to server\n"); @@ -235,10 +237,10 @@ static RPC_STATUS RpcAssoc_BindConnection(const RpcAssoc *assoc, RpcConnection * if (status != RPC_S_OK) return status; - status = RPCRT4_Receive(conn, &response_hdr, &msg); + status = RPCRT4_ReceiveWithAuth(conn, &response_hdr, &msg, &auth_data, &auth_length); if (status != RPC_S_OK) { - ERR("receive failed\n"); + ERR("receive failed with error %ld\n", status); return status; } @@ -259,9 +261,17 @@ static RPC_STATUS RpcAssoc_BindConnection(const RpcAssoc *assoc, RpcConnection * switch (results->results[0].result) { case RESULT_ACCEPT: - conn->assoc_group_id = response_hdr->bind_ack.assoc_gid; - conn->MaxTransmissionSize = response_hdr->bind_ack.max_tsize; - conn->ActiveInterface = *InterfaceId; + /* respond to authorization request */ + if (auth_length > sizeof(RpcAuthVerifier)) + status = RPCRT4_AuthorizeConnection(conn, + auth_data + sizeof(RpcAuthVerifier), + auth_length); + if (status == RPC_S_OK) + { + conn->assoc_group_id = response_hdr->bind_ack.assoc_gid; + conn->MaxTransmissionSize = response_hdr->bind_ack.max_tsize; + conn->ActiveInterface = *InterfaceId; + } break; case RESULT_PROVIDER_REJECTION: switch (results->results[0].reason) @@ -334,6 +344,7 @@ static RPC_STATUS RpcAssoc_BindConnection(const RpcAssoc *assoc, RpcConnection * I_RpcFree(msg.Buffer); RPCRT4_FreeHeader(response_hdr); + HeapFree(GetProcessHeap(), 0, auth_data); return status; } diff --git a/dlls/rpcrt4/rpc_message.c b/dlls/rpcrt4/rpc_message.c index fc89e2a..48c7df0 100644 --- a/dlls/rpcrt4/rpc_message.c +++ b/dlls/rpcrt4/rpc_message.c @@ -631,8 +631,8 @@ failed: /*********************************************************************** * RPCRT4_AuthorizeBinding (internal) */ -static RPC_STATUS RPCRT_AuthorizeConnection(RpcConnection* conn, - BYTE *challenge, ULONG count) +RPC_STATUS RPCRT4_AuthorizeConnection(RpcConnection* conn, BYTE *challenge, + ULONG count) { SecBuffer inp, out; RpcPktHdr *resp_hdr; @@ -948,16 +948,6 @@ RPC_STATUS RPCRT4_ReceiveWithAuth(RpcConnection *Connection, RpcPktHdr **Header, } pMsg->BufferLength = buffer_length; - /* respond to authorization request */ - if ((*Header)->common.ptype == PKT_BIND_ACK && auth_length > sizeof(RpcAuthVerifier)) - { - status = RPCRT_AuthorizeConnection(Connection, - auth_data + sizeof(RpcAuthVerifier), - auth_length); - if (status) - goto fail; - } - /* success */ status = RPC_S_OK; diff --git a/dlls/rpcrt4/rpc_message.h b/dlls/rpcrt4/rpc_message.h index a9378fa..95eb807 100644 --- a/dlls/rpcrt4/rpc_message.h +++ b/dlls/rpcrt4/rpc_message.h @@ -37,5 +37,6 @@ RPC_STATUS RPCRT4_Receive(RpcConnection *Connection, RpcPktHdr **Header, PRPC_ME RPC_STATUS RPCRT4_ReceiveWithAuth(RpcConnection *Connection, RpcPktHdr **Header, PRPC_MESSAGE pMsg, unsigned char **auth_data_out, unsigned long *auth_length_out); NCA_STATUS RPC2NCA_STATUS(RPC_STATUS status); RPC_STATUS NCA2RPC_STATUS(NCA_STATUS status); +RPC_STATUS RPCRT4_AuthorizeConnection(RpcConnection* conn, BYTE *challenge, ULONG count); #endif

1 0

Rob Shearman : rpcrt4: Add new function RPCRT4_ReceiveWithAuth to receive a fragment and return the authentication data received , if any.
by Alexandre Julliard 19 Jun '08

19 Jun '08

Module: wine Branch: master Commit: 6bb03d7dbad1c713916734099c4136751bc4f1a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bb03d7dbad1c713916734099… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Wed Jun 18 17:32:12 2008 +0100 rpcrt4: Add new function RPCRT4_ReceiveWithAuth to receive a fragment and return the authentication data received, if any. --- dlls/rpcrt4/rpc_message.c | 37 +++++++++++++++++++++++++++---------- dlls/rpcrt4/rpc_message.h | 1 + 2 files changed, 28 insertions(+), 10 deletions(-) diff --git a/dlls/rpcrt4/rpc_message.c b/dlls/rpcrt4/rpc_message.c index f686726..fc89e2a 100644 --- a/dlls/rpcrt4/rpc_message.c +++ b/dlls/rpcrt4/rpc_message.c @@ -795,19 +795,22 @@ fail: } /*********************************************************************** - * RPCRT4_Receive (internal) + * RPCRT4_ReceiveWithAuth (internal) * - * Receive a packet from connection and merge the fragments. + * Receive a packet from connection, merge the fragments and return the auth + * data. */ -RPC_STATUS RPCRT4_Receive(RpcConnection *Connection, RpcPktHdr **Header, - PRPC_MESSAGE pMsg) +RPC_STATUS RPCRT4_ReceiveWithAuth(RpcConnection *Connection, RpcPktHdr **Header, + PRPC_MESSAGE pMsg, + unsigned char **auth_data_out, + unsigned long *auth_length_out) { RPC_STATUS status; DWORD hdr_length; unsigned short first_flag; unsigned long data_length; unsigned long buffer_length; - unsigned long auth_length; + unsigned long auth_length = 0; unsigned char *auth_data = NULL; RpcPktHdr *CurrentHeader = NULL; void *payload = NULL; @@ -815,7 +818,7 @@ RPC_STATUS RPCRT4_Receive(RpcConnection *Connection, RpcPktHdr **Header, *Header = NULL; pMsg->Buffer = NULL; - TRACE("(%p, %p, %p)\n", Connection, Header, pMsg); + TRACE("(%p, %p, %p, %p)\n", Connection, Header, pMsg, auth_data_out); RPCRT4_SetThreadCurrentConnection(Connection); @@ -911,9 +914,7 @@ RPC_STATUS RPCRT4_Receive(RpcConnection *Connection, RpcPktHdr **Header, /* these packets are handled specially, not by the generic SecurePacket * function */ - if (((*Header)->common.ptype != PKT_BIND) && - ((*Header)->common.ptype != PKT_BIND_ACK) && - ((*Header)->common.ptype != PKT_AUTH3)) + if (!auth_data_out && SecIsValidHandle(&Connection->ctx)) { status = RPCRT4_SecurePacket(Connection, SECURE_PACKET_RECEIVE, CurrentHeader, hdr_length, @@ -970,12 +971,28 @@ fail: RPCRT4_FreeHeader(*Header); *Header = NULL; } - HeapFree(GetProcessHeap(), 0, auth_data); + if (auth_data_out && status == RPC_S_OK) { + *auth_length_out = auth_length; + *auth_data_out = auth_data; + } + else + HeapFree(GetProcessHeap(), 0, auth_data); HeapFree(GetProcessHeap(), 0, payload); return status; } /*********************************************************************** + * RPCRT4_Receive (internal) + * + * Receive a packet from connection and merge the fragments. + */ +RPC_STATUS RPCRT4_Receive(RpcConnection *Connection, RpcPktHdr **Header, + PRPC_MESSAGE pMsg) +{ + return RPCRT4_ReceiveWithAuth(Connection, Header, pMsg, NULL, NULL); +} + +/*********************************************************************** * I_RpcNegotiateTransferSyntax [RPCRT4.@] * * Negotiates the transfer syntax used by a client connection by connecting diff --git a/dlls/rpcrt4/rpc_message.h b/dlls/rpcrt4/rpc_message.h index cbf83d3..a9378fa 100644 --- a/dlls/rpcrt4/rpc_message.h +++ b/dlls/rpcrt4/rpc_message.h @@ -34,6 +34,7 @@ RpcPktHdr *RPCRT4_BuildBindAckHeader(unsigned long DataRepresentation, unsigned VOID RPCRT4_FreeHeader(RpcPktHdr *Header); RPC_STATUS RPCRT4_Send(RpcConnection *Connection, RpcPktHdr *Header, void *Buffer, unsigned int BufferLength); RPC_STATUS RPCRT4_Receive(RpcConnection *Connection, RpcPktHdr **Header, PRPC_MESSAGE pMsg); +RPC_STATUS RPCRT4_ReceiveWithAuth(RpcConnection *Connection, RpcPktHdr **Header, PRPC_MESSAGE pMsg, unsigned char **auth_data_out, unsigned long *auth_length_out); NCA_STATUS RPC2NCA_STATUS(RPC_STATUS status); RPC_STATUS NCA2RPC_STATUS(NCA_STATUS status);

1 0