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

Nikolay Sivov : oledlg: Partially implement OleUIAddVerbMenuW(), with basic tests.
by Alexandre Julliard 15 May '15

15 May '15

Module: wine Branch: master Commit: 04ed24fb79b03aa825d684cacaa3c8ef3157552c URL: http://source.winehq.org/git/wine.git/?a=commit;h=04ed24fb79b03aa825d684cac… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 14 19:00:43 2015 +0300 oledlg: Partially implement OleUIAddVerbMenuW(), with basic tests. --- configure | 1 + configure.ac | 1 + dlls/oledlg/oledlg_main.c | 124 +++++++++++-- dlls/oledlg/tests/Makefile.in | 5 + dlls/oledlg/tests/main.c | 413 ++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 533 insertions(+), 11 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=04ed24fb79b03aa825d68…

1 0

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

15 May '15

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

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

15 May '15

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

Alexandre Julliard : Release 1.7.43.
by Alexandre Julliard 15 May '15

15 May '15

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

Tag wine-1.7.43 : Alexandre Julliard : Release 1.7.43
by Alexandre Julliard 15 May '15

15 May '15

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

Jacek Caban : mshtml: Added new EventTarget struct representing event targets.
by Alexandre Julliard 15 May '15

15 May '15

Module: wine Branch: master Commit: f908f03cd98524686cc3e3b42b233bede4538796 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f908f03cd98524686cc3e3b42… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 14 13:24:19 2015 +0200 mshtml: Added new EventTarget struct representing event targets. --- dlls/mshtml/htmlanchor.c | 8 +++--- dlls/mshtml/htmlattr.c | 6 ++--- dlls/mshtml/htmlbody.c | 8 +++--- dlls/mshtml/htmlcomment.c | 8 +++--- dlls/mshtml/htmldoc.c | 12 ++++----- dlls/mshtml/htmlelem.c | 60 ++++++++++++++++++++++---------------------- dlls/mshtml/htmlembed.c | 8 +++--- dlls/mshtml/htmlevent.c | 4 +-- dlls/mshtml/htmlevent.h | 6 ++--- dlls/mshtml/htmlform.c | 8 +++--- dlls/mshtml/htmlframe.c | 8 +++--- dlls/mshtml/htmlframebase.c | 8 +++--- dlls/mshtml/htmlgeneric.c | 8 +++--- dlls/mshtml/htmlhead.c | 16 ++++++------ dlls/mshtml/htmliframe.c | 24 +++++++++--------- dlls/mshtml/htmlimg.c | 8 +++--- dlls/mshtml/htmlinput.c | 32 +++++++++++------------ dlls/mshtml/htmllink.c | 8 +++--- dlls/mshtml/htmlmeta.c | 8 +++--- dlls/mshtml/htmlnode.c | 30 +++++++++++----------- dlls/mshtml/htmlobject.c | 16 ++++++------ dlls/mshtml/htmloption.c | 8 +++--- dlls/mshtml/htmlscript.c | 8 +++--- dlls/mshtml/htmlselect.c | 8 +++--- dlls/mshtml/htmlstyleelem.c | 8 +++--- dlls/mshtml/htmltable.c | 24 +++++++++--------- dlls/mshtml/htmltablecell.c | 8 +++--- dlls/mshtml/htmltablerow.c | 8 +++--- dlls/mshtml/htmltextarea.c | 8 +++--- dlls/mshtml/htmltextcont.c | 8 +++--- dlls/mshtml/htmltextnode.c | 18 ++++++------- dlls/mshtml/mshtml_private.h | 8 ++++-- dlls/mshtml/script.c | 8 +++--- 33 files changed, 209 insertions(+), 207 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f908f03cd98524686cc3e…

1 0

Jacek Caban : mshtml: Moved getting event target data pointer to DispatchEx vtbl.
by Alexandre Julliard 15 May '15

15 May '15

Module: wine Branch: master Commit: a1d837c341e8c01dba774d459963812de2b423a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1d837c341e8c01dba774d459… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 14 13:24:34 2015 +0200 mshtml: Moved getting event target data pointer to DispatchEx vtbl. --- dlls/mshtml/htmlbody.c | 6 +++--- dlls/mshtml/htmlelem.c | 11 ++++++++++- dlls/mshtml/htmlevent.h | 4 +++- dlls/mshtml/mshtml_private.h | 4 +++- 4 files changed, 19 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index e91f20e..e4b7990 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -824,13 +824,13 @@ static void HTMLBodyElement_unlink(HTMLDOMNode *iface) } } -static event_target_t **HTMLBodyElement_get_event_target(HTMLDOMNode *iface) +static event_target_t **HTMLBodyElement_get_event_target_ptr(HTMLDOMNode *iface) { HTMLBodyElement *This = impl_from_HTMLDOMNode(iface); return This->textcont.element.node.doc ? &This->textcont.element.node.doc->body_event_target - : &This->textcont.element.node.event_target; + : &This->textcont.element.node.event_target.ptr; } static BOOL HTMLBodyElement_is_text_edit(HTMLDOMNode *iface) @@ -852,7 +852,7 @@ static const NodeImplVtbl HTMLBodyElementImplVtbl = { HTMLElement_clone, HTMLElement_handle_event, HTMLElement_get_attr_col, - HTMLBodyElement_get_event_target, + HTMLBodyElement_get_event_target_ptr, NULL, NULL, NULL, diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 68be24f..77ccc52 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -3988,6 +3988,14 @@ static HRESULT HTMLElement_populate_props(DispatchEx *dispex) return S_OK; } +static event_target_t **HTMLElement_get_event_target_ptr(DispatchEx *dispex) +{ + HTMLElement *This = impl_from_DispatchEx(dispex); + return This->node.vtbl->get_event_target_ptr + ? This->node.vtbl->get_event_target_ptr(&This->node) + : &This->node.event_target.ptr; +} + static const tid_t HTMLElement_iface_tids[] = { HTMLELEMENT_TIDS, 0 @@ -3997,7 +4005,8 @@ static dispex_static_data_vtbl_t HTMLElement_dispex_vtbl = { NULL, HTMLElement_get_dispid, HTMLElement_invoke, - HTMLElement_populate_props + HTMLElement_populate_props, + HTMLElement_get_event_target_ptr }; static dispex_static_data_t HTMLElement_dispex = { diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 6d0d9f8..0c86f86 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -73,7 +73,9 @@ void detach_nsevent(HTMLDocumentNode*,const WCHAR*) DECLSPEC_HIDDEN; static inline event_target_t **get_node_event_target(HTMLDOMNode *node) { - return node->vtbl->get_event_target ? node->vtbl->get_event_target(node) : &node->event_target.ptr; + 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) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 92ff5cd..032ca9a 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -230,6 +230,8 @@ typedef struct { HRESULT (*get_dispid)(DispatchEx*,BSTR,DWORD,DISPID*); HRESULT (*invoke)(DispatchEx*,DISPID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,IServiceProvider*); HRESULT (*populate_props)(DispatchEx*); + /* We abuse this vtbl for EventTarget functions to avoid separated vtbl. */ + event_target_t **(*get_event_target_ptr)(DispatchEx*); } dispex_static_data_vtbl_t; typedef struct { @@ -642,7 +644,7 @@ typedef struct { HRESULT (*clone)(HTMLDOMNode*,nsIDOMNode*,HTMLDOMNode**); HRESULT (*handle_event)(HTMLDOMNode*,DWORD,nsIDOMEvent*,BOOL*); HRESULT (*get_attr_col)(HTMLDOMNode*,HTMLAttributeCollection**); - event_target_t **(*get_event_target)(HTMLDOMNode*); + event_target_t **(*get_event_target_ptr)(HTMLDOMNode*); HRESULT (*fire_event)(HTMLDOMNode*,DWORD,BOOL*); HRESULT (*put_disabled)(HTMLDOMNode*,VARIANT_BOOL); HRESULT (*get_disabled)(HTMLDOMNode*,VARIANT_BOOL*);

1 0

Jacek Caban : mshtml: Make HTMLInnerWindow inherit from EventTarget.
by Alexandre Julliard 15 May '15

15 May '15

Module: wine Branch: master Commit: 2f4e85abb8a15a7227a9e7e0091b31c21b0bf48b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f4e85abb8a15a7227a9e7e00… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 14 13:24:44 2015 +0200 mshtml: Make HTMLInnerWindow inherit from EventTarget. --- dlls/mshtml/htmlwindow.c | 48 +++++++++++++++++++++++++------------------- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/script.c | 2 +- 3 files changed, 29 insertions(+), 23 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2f4e85abb8a15a7227a9e…

1 0

Nikolay Sivov : ieframe: Properly trace variant arguments.
by Alexandre Julliard 14 May '15

14 May '15

Module: wine Branch: master Commit: e0fa7ff465dd2d9bf3931747cd4b278fd1eec40b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0fa7ff465dd2d9bf3931747c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 13 21:31:03 2015 +0300 ieframe: Properly trace variant arguments. --- dlls/ieframe/ie.c | 16 +++++++++------- dlls/ieframe/iehtmlwnd.c | 29 +++++++++++++++-------------- dlls/ieframe/oleobject.c | 4 ++-- dlls/ieframe/shellbrowser.c | 4 ++-- 4 files changed, 28 insertions(+), 25 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e0fa7ff465dd2d9bf3931…

1 0

Bruno Jesus : iphlpapi: Set MIB_IPADDR_PRIMARY as wType for GetIpAddrTable entries.
by Alexandre Julliard 14 May '15

14 May '15

Module: wine Branch: master Commit: 084bcaa76b4e8c02b5dbc2f9f400d25271067874 URL: http://source.winehq.org/git/wine.git/?a=commit;h=084bcaa76b4e8c02b5dbc2f9f… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed May 13 22:02:24 2015 -0300 iphlpapi: Set MIB_IPADDR_PRIMARY as wType for GetIpAddrTable entries. --- dlls/iphlpapi/ifenum.c | 6 +++++- dlls/iphlpapi/tests/iphlpapi.c | 9 +++++++++ include/ipmib.h | 7 +++++++ 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/ifenum.c b/dlls/iphlpapi/ifenum.c index a12450e..3070ae5 100644 --- a/dlls/iphlpapi/ifenum.c +++ b/dlls/iphlpapi/ifenum.c @@ -807,7 +807,11 @@ static DWORD getIPAddrRowByName(PMIB_IPADDRROW ipAddrRow, const char *ifName, /* FIXME: hardcoded reasm size, not sure where to get it */ ipAddrRow->dwReasmSize = 65535; ipAddrRow->unused1 = 0; - ipAddrRow->wType = 0; + /* wType is a bit field composed of MIB_IPADDR_* flags. Windows <= XP seems + * to like returning undocumented values 0x20 + 0x02 but for our current + * needs returning MIB_IPADDR_PRIMARY is enough. + */ + ipAddrRow->wType = MIB_IPADDR_PRIMARY; return ret; } diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 58fb843..847ba49 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -226,7 +226,16 @@ static void testGetIpAddrTable(void) "GetIpAddrTable(buf, &dwSize, FALSE) returned %d, expected NO_ERROR\n", apiReturn); if (apiReturn == NO_ERROR && buf->dwNumEntries) + { + int i; testGetIfEntry(buf->table[0].dwIndex); + for (i = 0; i < buf->dwNumEntries; i++) + { + ok (buf->table[i].wType != 0, "Test[%d]: expected wType > 0\n", i); + trace("Entry[%d]: addr %s, dwIndex %u, wType 0x%x\n", i, + ntoa(buf->table[i].dwAddr), buf->table[i].dwIndex, buf->table[i].wType); + } + } HeapFree(GetProcessHeap(), 0, buf); } } diff --git a/include/ipmib.h b/include/ipmib.h index 65576be..d85ee5a 100644 --- a/include/ipmib.h +++ b/include/ipmib.h @@ -21,6 +21,13 @@ #include <ifmib.h> #include <nldef.h> +/* Flags used in the wType field from MIB_IPADDRROW */ + +#define MIB_IPADDR_PRIMARY 0x0001 +#define MIB_IPADDR_DYNAMIC 0x0004 +#define MIB_IPADDR_DISCONNECTED 0x0008 +#define MIB_IPADDR_DELETED 0x0040 +#define MIB_IPADDR_TRANSIENT 0x0080 /* IPADDR table */

1 0