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

Andrew Talbot : rpcrt4: Remove unneeded address-of operator from array name .
by Alexandre Julliard 14 Jul '08

14 Jul '08

Module: wine Branch: master Commit: ab6efdd1e45bab8b9dc2bce35f0860fc26eb443c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab6efdd1e45bab8b9dc2bce35… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Jul 11 21:58:18 2008 +0100 rpcrt4: Remove unneeded address-of operator from array name. --- dlls/rpcrt4/rpc_async.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/rpc_async.c b/dlls/rpcrt4/rpc_async.c index 4ff86a3..33fdc77 100644 --- a/dlls/rpcrt4/rpc_async.c +++ b/dlls/rpcrt4/rpc_async.c @@ -64,7 +64,7 @@ RPC_STATUS WINAPI RpcAsyncInitializeHandle(PRPC_ASYNC_STATE pAsync, unsigned int pAsync->Flags = 0; pAsync->StubInfo = NULL; pAsync->RuntimeInfo = NULL; - memset(&pAsync->Reserved, 0, sizeof(*pAsync) - FIELD_OFFSET(RPC_ASYNC_STATE, Reserved)); + memset(pAsync->Reserved, 0, sizeof(*pAsync) - FIELD_OFFSET(RPC_ASYNC_STATE, Reserved)); return RPC_S_OK; }

1 0

Andrew Talbot : setupapi: Remove unneeded address-of operator from array name.
by Alexandre Julliard 14 Jul '08

14 Jul '08

Module: wine Branch: master Commit: ce2184e2f14e6ace87cd50c938b5e99d35ca80c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce2184e2f14e6ace87cd50c93… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Jul 11 21:58:21 2008 +0100 setupapi: Remove unneeded address-of operator from array name. --- dlls/setupapi/queue.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/queue.c b/dlls/setupapi/queue.c index 3212d5a..7605bc1 100644 --- a/dlls/setupapi/queue.c +++ b/dlls/setupapi/queue.c @@ -183,7 +183,7 @@ UINT CALLBACK QUEUE_callback_WtoA( void *context, UINT notification, switch(notification) { case SPFILENOTIFY_COPYERROR: - param2 = (UINT_PTR)&buffer; + param2 = (UINT_PTR)buffer; /* fall through */ case SPFILENOTIFY_STARTDELETE: case SPFILENOTIFY_ENDDELETE:

1 0

Alexandre Julliard : msxml3: Fix compile without xml headers.
by Alexandre Julliard 14 Jul '08

14 Jul '08

Module: wine Branch: master Commit: 8e8d63933b5e904ec183f2b3eb6c8f7c52ee5c1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e8d63933b5e904ec183f2b3e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 14 11:48:37 2008 +0200 msxml3: Fix compile without xml headers. --- dlls/msxml3/main.c | 2 +- dlls/msxml3/msxml_private.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c index 1bf3a98..8c7d0d3 100644 --- a/dlls/msxml3/main.c +++ b/dlls/msxml3/main.c @@ -188,8 +188,8 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) #endif #ifdef HAVE_LIBXML2 xmlCleanupParser(); - process_detach(); #endif + process_detach(); break; } return TRUE; diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index f0c6093..34e4800 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -82,6 +82,8 @@ static inline xmlnode *impl_from_IXMLDOMNode( IXMLDOMNode *iface ) return (xmlnode *)((char*)iface - FIELD_OFFSET(xmlnode, lpVtbl)); } +extern HRESULT DOMDocument_create_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument2 **document); + #endif extern IXMLDOMParseError *create_parseError( LONG code, BSTR url, BSTR reason, BSTR srcText, @@ -91,8 +93,6 @@ extern HRESULT SchemaCache_create( IUnknown *pUnkOuter, LPVOID *ppObj ); extern HRESULT XMLDocument_create( IUnknown *pUnkOuter, LPVOID *ppObj ); extern HRESULT SAXXMLReader_create(IUnknown *pUnkOuter, LPVOID *ppObj ); -extern HRESULT DOMDocument_create_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument2 **document); - /* typelibs */ enum tid_t { IXMLDOMAttribute_tid,

1 0

Jacek Caban : mshtml: Allow timers to be cleaned during processing.
by Alexandre Julliard 14 Jul '08

14 Jul '08

Module: wine Branch: master Commit: 1de0055cc0d47088cb9011954cf3f05b014156fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=1de0055cc0d47088cb9011954… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 11 23:44:38 2008 +0200 mshtml: Allow timers to be cleaned during processing. --- dlls/mshtml/task.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/task.c b/dlls/mshtml/task.c index d863fba..93edd65 100644 --- a/dlls/mshtml/task.c +++ b/dlls/mshtml/task.c @@ -128,6 +128,8 @@ static BOOL queue_timer(thread_data_t *thread_data, task_timer_t *timer) { task_timer_t *iter; + list_remove(&timer->entry); + if(list_empty(&thread_data->timer_list) || LIST_ENTRY(list_head(&thread_data->timer_list), task_timer_t, entry)->time > timer->time) { @@ -159,6 +161,7 @@ DWORD set_task_timer(HTMLDocument *doc, DWORD msec, BOOL interval, IDispatch *di timer->doc = doc; timer->time = tc + msec; timer->interval = interval ? msec : 0; + list_init(&timer->entry); IDispatch_AddRef(disp); timer->disp = disp; @@ -363,6 +366,8 @@ static void process_task(task_t *task) static LRESULT process_timer(void) { thread_data_t *thread_data = get_thread_data(TRUE); + HTMLDocument *doc; + IDispatch *disp; DWORD tc; task_timer_t *timer; @@ -377,10 +382,9 @@ static LRESULT process_timer(void) return 0; } - list_remove(&timer->entry); - list_init(&timer->entry); - - call_disp_func(timer->doc, timer->disp); + doc = timer->doc; + disp = timer->disp; + IDispatch_AddRef(disp); if(timer->interval) { timer->time += timer->interval; @@ -388,6 +392,10 @@ static LRESULT process_timer(void) }else { release_task_timer(thread_data->thread_hwnd, timer); } + + call_disp_func(doc, disp); + + IDispatch_Release(disp); } KillTimer(thread_data->thread_hwnd, TIMER_ID);

1 0

Jacek Caban : mshtml: Added IHTMLElement2:: getElementsByTagName implementation.
by Alexandre Julliard 14 Jul '08

14 Jul '08

Module: wine Branch: master Commit: 952a54cbd933dbee18cbcc88521db11fb4ee7747 URL: http://source.winehq.org/git/wine.git/?a=commit;h=952a54cbd933dbee18cbcc885… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 11 23:45:04 2008 +0200 mshtml: Added IHTMLElement2::getElementsByTagName implementation. --- dlls/mshtml/htmlelem.c | 25 +++++++++++++++++++++++++ dlls/mshtml/htmlelem2.c | 23 +++++++++++++++++++---- dlls/mshtml/mshtml_private.h | 1 + 3 files changed, 45 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 5f67356..670c615 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1896,6 +1896,31 @@ IHTMLElementCollection *create_all_collection(HTMLDOMNode *node) return HTMLElementCollection_Create((IUnknown*)HTMLDOMNODE(node), buf.buf, buf.len); } +IHTMLElementCollection *create_collection_from_nodelist(HTMLDocument *doc, IUnknown *unk, nsIDOMNodeList *nslist) +{ + PRUint32 length = 0, i; + elem_vector buf; + + nsIDOMNodeList_GetLength(nslist, &length); + + buf.len = buf.size = length; + if(buf.len) { + nsIDOMNode *nsnode; + + buf.buf = heap_alloc(buf.size*sizeof(HTMLElement*)); + + for(i=0; i<length; i++) { + nsIDOMNodeList_Item(nslist, i, &nsnode); + buf.buf[i] = HTMLELEM_NODE_THIS(get_node(doc, nsnode, TRUE)); + nsIDOMNode_Release(nsnode); + } + }else { + buf.buf = NULL; + } + + return HTMLElementCollection_Create(unk, buf.buf, buf.len); +} + static IHTMLElementCollection *HTMLElementCollection_Create(IUnknown *ref_unk, HTMLElement **elems, DWORD len) { diff --git a/dlls/mshtml/htmlelem2.c b/dlls/mshtml/htmlelem2.c index d12c60c..5d0443e 100644 --- a/dlls/mshtml/htmlelem2.c +++ b/dlls/mshtml/htmlelem2.c @@ -917,12 +917,27 @@ static HRESULT WINAPI HTMLElement2_get_readyStateValue(IHTMLElement2 *iface, lon return E_NOTIMPL; } -static HRESULT WINAPI HTMLElement2_getElementByTagName(IHTMLElement2 *iface, BSTR v, +static HRESULT WINAPI HTMLElement2_getElementsByTagName(IHTMLElement2 *iface, BSTR v, IHTMLElementCollection **pelColl) { HTMLElement *This = HTMLELEM2_THIS(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_w(v), pelColl); - return E_NOTIMPL; + nsIDOMNodeList *nslist; + nsAString tag_str; + nsresult nsres; + + TRACE("(%p)->(%s %p)\n", This, debugstr_w(v), pelColl); + + nsAString_Init(&tag_str, v); + nsres = nsIDOMHTMLElement_GetElementsByTagName(This->nselem, &tag_str, &nslist); + nsAString_Finish(&tag_str); + if(NS_FAILED(nsres)) { + ERR("GetElementByTagName failed: %08x\n", nsres); + return E_FAIL; + } + + *pelColl = create_collection_from_nodelist(This->node.doc, (IUnknown*)HTMLELEM(This), nslist); + nsIDOMNodeList_Release(nslist); + return S_OK; } #undef HTMLELEM2_THIS @@ -1032,7 +1047,7 @@ static const IHTMLElement2Vtbl HTMLElement2Vtbl = { HTMLElement2_put_onbeforeeditfocus, HTMLElement2_get_onbeforeeditfocus, HTMLElement2_get_readyStateValue, - HTMLElement2_getElementByTagName, + HTMLElement2_getElementsByTagName, }; void HTMLElement2_Init(HTMLElement *This) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index ef7868d..88f444d 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -566,6 +566,7 @@ void doc_insert_script(HTMLDocument*,nsIDOMHTMLScriptElement*); IDispatch *script_parse_event(HTMLDocument*,LPCWSTR); IHTMLElementCollection *create_all_collection(HTMLDOMNode*); +IHTMLElementCollection *create_collection_from_nodelist(HTMLDocument*,IUnknown*,nsIDOMNodeList*); /* commands */ typedef struct {

1 0

Jacek Caban : mshtml: Added IHTMLElement2::getElementsByTagName tests.
by Alexandre Julliard 14 Jul '08

14 Jul '08

Module: wine Branch: master Commit: 1c1f8e206f62ff8f54f3a2a5f3f67d4c8d813072 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c1f8e206f62ff8f54f3a2a5f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 11 23:45:22 2008 +0200 mshtml: Added IHTMLElement2::getElementsByTagName tests. --- dlls/mshtml/tests/dom.c | 34 +++++++++++++++++++++++++++++++++- 1 files changed, 33 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 4540ed4..2c25870 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -841,7 +841,7 @@ static void _test_elem_collection(unsigned line, IUnknown *unk, HRESULT hres; hres = IUnknown_QueryInterface(unk, &IID_IHTMLElementCollection, (void**)&col); - ok(hres == S_OK, "Could not get IHTMLElementCollection: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLElementCollection: %08x\n", hres); test_disp((IUnknown*)col, &DIID_DispHTMLElementCollection); @@ -883,6 +883,34 @@ static void _test_elem_collection(unsigned line, IUnknown *unk, IHTMLElementCollection_Release(col); } +#define test_elem_getelembytag(u,t,l) _test_elem_getelembytag(__LINE__,u,t,l) +static void _test_elem_getelembytag(unsigned line, IUnknown *unk, elem_type_t type, long exlen) +{ + IHTMLElement2 *elem = _get_elem2_iface(line, unk); + IHTMLElementCollection *col = NULL; + elem_type_t *types = NULL; + BSTR tmp; + int i; + HRESULT hres; + + tmp = a2bstr(elem_type_infos[type].tag); + hres = IHTMLElement2_getElementsByTagName(elem, tmp, &col); + SysFreeString(tmp); + IHTMLElement2_Release(elem); + ok_(__FILE__,line) (hres == S_OK, "getElementByTagName failed: %08x\n", hres); + ok_(__FILE__,line) (col != NULL, "col == NULL\n"); + + if(exlen) { + types = HeapAlloc(GetProcessHeap(), 0, exlen*sizeof(elem_type_t)); + for(i=0; i<exlen; i++) + types[i] = type; + } + + _test_elem_collection(line, (IUnknown*)col, types, exlen); + + HeapFree(GetProcessHeap(), 0, types); +} + #define get_first_child(n) _get_first_child(__LINE__,n) static IHTMLDOMNode *_get_first_child(unsigned line, IUnknown *unk) { @@ -2146,6 +2174,10 @@ static void test_elems(IHTMLDocument2 *doc) IHTMLDOMNode_Release(node); ok(node2 == NULL, "node != NULL\n"); + test_elem_getelembytag((IUnknown*)elem, ET_OPTION, 2); + test_elem_getelembytag((IUnknown*)elem, ET_SELECT, 0); + test_elem_getelembytag((IUnknown*)elem, ET_HTML, 0); + IHTMLElement_Release(elem); }

1 0

Rob Shearman : rpcrt4: Ignore the return value of functions when unmarshalling a pickled procedure .
by Alexandre Julliard 14 Jul '08

14 Jul '08

Module: wine Branch: master Commit: 09f343b1355d563f998096fc92cb1db02cd62a70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09f343b1355d563f998096fc9… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Thu Apr 24 14:30:59 2008 +0100 rpcrt4: Ignore the return value of functions when unmarshalling a pickled procedure. --- dlls/rpcrt4/ndr_es.c | 6 +++--- dlls/rpcrt4/ndr_stubless.c | 9 +++++---- dlls/rpcrt4/ndr_stubless.h | 3 ++- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/rpcrt4/ndr_es.c b/dlls/rpcrt4/ndr_es.c index 4f70dd1..3423d39 100644 --- a/dlls/rpcrt4/ndr_es.c +++ b/dlls/rpcrt4/ndr_es.c @@ -398,7 +398,7 @@ void WINAPIV NdrMesProcEncodeDecode(handle_t Handle, const MIDL_STUB_DESC * pStu client_do_args_old_format(&pEsMsg->StubMsg, pFormat, PROXY_CALCSIZE, pEsMsg->StubMsg.StackTop, stack_size, (unsigned char *)&RetVal, - FALSE /* object_proc */); + FALSE /* object_proc */, TRUE /* ignore_retval */); pEsMsg->ByteCount = pEsMsg->StubMsg.BufferLength - mes_proc_header_buffer_size(); es_data_alloc(pEsMsg, pEsMsg->StubMsg.BufferLength); @@ -407,7 +407,7 @@ void WINAPIV NdrMesProcEncodeDecode(handle_t Handle, const MIDL_STUB_DESC * pStu client_do_args_old_format(&pEsMsg->StubMsg, pFormat, PROXY_MARSHAL, pEsMsg->StubMsg.StackTop, stack_size, (unsigned char *)&RetVal, - FALSE /* object_proc */); + FALSE /* object_proc */, TRUE /* ignore_retval */); es_data_write(pEsMsg, pEsMsg->ByteCount); break; @@ -418,7 +418,7 @@ void WINAPIV NdrMesProcEncodeDecode(handle_t Handle, const MIDL_STUB_DESC * pStu client_do_args_old_format(&pEsMsg->StubMsg, pFormat, PROXY_UNMARSHAL, pEsMsg->StubMsg.StackTop, stack_size, (unsigned char *)&RetVal, - FALSE /* object_proc */); + FALSE /* object_proc */, TRUE /* ignore_retval */); break; default: RpcRaiseException(RPC_S_INTERNAL_ERROR); diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 9d28b36..275502a 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -441,7 +441,7 @@ static unsigned int type_stack_size(unsigned char fc) void client_do_args_old_format(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat, int phase, unsigned char *args, unsigned short stack_size, - unsigned char *pRetVal, BOOL object_proc) + unsigned char *pRetVal, BOOL object_proc, BOOL ignore_retval) { /* current format string offset */ int current_offset = 0; @@ -492,7 +492,8 @@ void client_do_args_old_format(PMIDL_STUB_MESSAGE pStubMsg, call_marshaller(pStubMsg, pArg, pTypeFormat); break; case PROXY_UNMARSHAL: - if (pParam->param_direction == RPC_FC_RETURN_PARAM_BASETYPE) + if (!ignore_retval && + pParam->param_direction == RPC_FC_RETURN_PARAM_BASETYPE) { if (pParam->param_direction & RPC_FC_RETURN_PARAM) call_unmarshaller(pStubMsg, &pRetVal, pTypeFormat, 0); @@ -723,7 +724,7 @@ LONG_PTR WINAPIV NdrClientCall2(PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pForma else client_do_args_old_format(&stubMsg, pFormat, phase, stubMsg.StackTop, stack_size, (unsigned char *)&RetVal, - (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_OBJECT)); + (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_OBJECT), FALSE); break; default: ERR("shouldn't reach here. phase %d\n", phase); @@ -801,7 +802,7 @@ LONG_PTR WINAPIV NdrClientCall2(PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pForma else client_do_args_old_format(&stubMsg, pFormat, phase, stubMsg.StackTop, stack_size, (unsigned char *)&RetVal, - (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_OBJECT)); + (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_OBJECT), FALSE); break; default: ERR("shouldn't reach here. phase %d\n", phase); diff --git a/dlls/rpcrt4/ndr_stubless.h b/dlls/rpcrt4/ndr_stubless.h index 06b552c..9a6fb44 100644 --- a/dlls/rpcrt4/ndr_stubless.h +++ b/dlls/rpcrt4/ndr_stubless.h @@ -238,4 +238,5 @@ typedef struct _NDR_EHD_CONTEXT void client_do_args_old_format(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat, int phase, unsigned char *args, - unsigned short stack_size, unsigned char *pRetVal, BOOL object_proc); + unsigned short stack_size, unsigned char *pRetVal, BOOL object_proc, + BOOL ignore_retval);

1 0

Rob Shearman : rpcrt4: Implement MesDecodeBufferHandleCreate and MesEncodeFixedBufferHandleCreate .
by Alexandre Julliard 14 Jul '08

14 Jul '08

Module: wine Branch: master Commit: 2b0ad6e6e7a32a1a0f35a85edde4f695154df27b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b0ad6e6e7a32a1a0f35a85ed… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Nov 5 11:21:09 2007 +0000 rpcrt4: Implement MesDecodeBufferHandleCreate and MesEncodeFixedBufferHandleCreate. --- dlls/rpcrt4/ndr_es.c | 70 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/rpcrt4/rpcrt4.spec | 4 +- 2 files changed, 72 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/ndr_es.c b/dlls/rpcrt4/ndr_es.c index 097d8a9..4f70dd1 100644 --- a/dlls/rpcrt4/ndr_es.c +++ b/dlls/rpcrt4/ndr_es.c @@ -132,6 +132,58 @@ RPC_STATUS WINAPI MesHandleFree(handle_t Handle) return RPC_S_OK; } +/*********************************************************************** + * MesEncodeFixedBufferHandleCreate [RPCRT4.@] + */ +RPC_STATUS RPC_ENTRY MesEncodeFixedBufferHandleCreate( + char *Buffer, ULONG BufferSize, ULONG *pEncodedSize, handle_t *pHandle) +{ + MIDL_ES_MESSAGE *pEsMsg; + + TRACE("(%p, %d, %p, %p)\n", Buffer, BufferSize, pEncodedSize, pHandle); + + pEsMsg = HeapAlloc(GetProcessHeap(), 0, sizeof(*pEsMsg)); + if (!pEsMsg) + return ERROR_OUTOFMEMORY; + + init_MIDL_ES_MESSAGE(pEsMsg); + + pEsMsg->Operation = MES_ENCODE; + pEsMsg->HandleStyle = MES_FIXED_BUFFER_HANDLE; + pEsMsg->Buffer = (unsigned char *)Buffer; + pEsMsg->BufferSize = BufferSize; + pEsMsg->pEncodedSize = pEncodedSize; + + *pHandle = (handle_t)pEsMsg; + + return RPC_S_OK;} + +/*********************************************************************** + * MesDecodeBufferHandleCreate [RPCRT4.@] + */ +RPC_STATUS RPC_ENTRY MesDecodeBufferHandleCreate( + char *Buffer, ULONG BufferSize, handle_t *pHandle) +{ + MIDL_ES_MESSAGE *pEsMsg; + + TRACE("(%p, %d, %p)\n", Buffer, BufferSize, pHandle); + + pEsMsg = HeapAlloc(GetProcessHeap(), 0, sizeof(*pEsMsg)); + if (!pEsMsg) + return ERROR_OUTOFMEMORY; + + init_MIDL_ES_MESSAGE(pEsMsg); + + pEsMsg->Operation = MES_DECODE; + pEsMsg->HandleStyle = MES_FIXED_BUFFER_HANDLE; + pEsMsg->Buffer = (unsigned char *)Buffer; + pEsMsg->BufferSize = BufferSize; + + *pHandle = (handle_t)pEsMsg; + + return RPC_S_OK; +} + static void es_data_alloc(MIDL_ES_MESSAGE *pEsMsg, ULONG size) { if (pEsMsg->HandleStyle == MES_INCREMENTAL_HANDLE) @@ -145,6 +197,11 @@ static void es_data_alloc(MIDL_ES_MESSAGE *pEsMsg, ULONG size) RpcRaiseException(ERROR_OUTOFMEMORY); } } + else if (pEsMsg->HandleStyle == MES_FIXED_BUFFER_HANDLE) + { + TRACE("%d with fixed buffer handle\n", size); + pEsMsg->StubMsg.Buffer = pEsMsg->Buffer; + } pEsMsg->StubMsg.RpcMsg->Buffer = pEsMsg->StubMsg.BufferStart = pEsMsg->StubMsg.Buffer; } @@ -161,6 +218,14 @@ static void es_data_read(MIDL_ES_MESSAGE *pEsMsg, ULONG size) RpcRaiseException(ERROR_OUTOFMEMORY); } } + else + { + TRACE("%d from fixed or dynamic buffer handle\n", size); + /* FIXME: validate BufferSize? */ + pEsMsg->StubMsg.Buffer = pEsMsg->Buffer; + pEsMsg->Buffer += size; + pEsMsg->BufferSize -= size; + } pEsMsg->StubMsg.BufferLength = size; pEsMsg->StubMsg.RpcMsg->Buffer = pEsMsg->StubMsg.BufferStart = pEsMsg->StubMsg.Buffer; pEsMsg->StubMsg.BufferEnd = pEsMsg->StubMsg.Buffer + size; @@ -173,6 +238,11 @@ static void es_data_write(MIDL_ES_MESSAGE *pEsMsg, ULONG size) TRACE("%d to incremental handle\n", size); pEsMsg->Write(pEsMsg->UserState, (char *)pEsMsg->StubMsg.BufferStart, size); } + else + { + TRACE("%d to dynamic or fixed buffer handle\n", size); + *pEsMsg->pEncodedSize += size; + } } static inline ULONG mes_proc_header_buffer_size(void) diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec index f2fa80a..1d33c64 100644 --- a/dlls/rpcrt4/rpcrt4.spec +++ b/dlls/rpcrt4/rpcrt4.spec @@ -97,10 +97,10 @@ @ stub MIDL_wchar_strcpy @ stub MIDL_wchar_strlen @ stub MesBufferHandleReset -@ stub MesDecodeBufferHandleCreate +@ stdcall MesDecodeBufferHandleCreate(ptr long ptr) @ stdcall MesDecodeIncrementalHandleCreate(ptr ptr ptr) @ stub MesEncodeDynBufferHandleCreate -@ stub MesEncodeFixedBufferHandleCreate +@ stdcall MesEncodeFixedBufferHandleCreate(ptr long ptr ptr) @ stdcall MesEncodeIncrementalHandleCreate(ptr ptr ptr ptr) @ stdcall MesHandleFree(ptr) @ stdcall MesIncrementalHandleReset(ptr ptr ptr ptr ptr long)

1 0

Rob Shearman : rpcrt4: Implement NdrMesProcEncodeDecode.
by Alexandre Julliard 14 Jul '08

14 Jul '08

Module: wine Branch: master Commit: 734094ed2c2db2187f6c6785203f5a76cc22ccaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=734094ed2c2db2187f6c67852… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Nov 5 11:16:43 2007 +0000 rpcrt4: Implement NdrMesProcEncodeDecode. --- dlls/rpcrt4/ndr_es.c | 230 ++++++++++++++++++++++++++++++++++++++++++++ dlls/rpcrt4/ndr_stubless.c | 46 +++++---- dlls/rpcrt4/ndr_stubless.h | 4 + dlls/rpcrt4/rpcrt4.spec | 2 +- 4 files changed, 259 insertions(+), 23 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=734094ed2c2db2187f6c6…

1 0

Rob Shearman : rpcrt4: Implement MesEncodeIncrementalHandleCreate, MesDecodeIncrementalHandleCreate, MesIncrementalHandleReset and MesHandleFree.
by Alexandre Julliard 14 Jul '08

14 Jul '08

Module: wine Branch: master Commit: 0879041cd240aaa4f2819c2fb4e2a8858f00e98f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0879041cd240aaa4f2819c2fb… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Nov 4 23:10:32 2007 +0000 rpcrt4: Implement MesEncodeIncrementalHandleCreate, MesDecodeIncrementalHandleCreate, MesIncrementalHandleReset and MesHandleFree. --- dlls/rpcrt4/Makefile.in | 1 + dlls/rpcrt4/ndr_es.c | 130 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/rpcrt4/rpcrt4.spec | 8 ++-- 3 files changed, 135 insertions(+), 4 deletions(-) diff --git a/dlls/rpcrt4/Makefile.in b/dlls/rpcrt4/Makefile.in index 8672ced..14ee4a3 100644 --- a/dlls/rpcrt4/Makefile.in +++ b/dlls/rpcrt4/Makefile.in @@ -14,6 +14,7 @@ C_SRCS = \ cstub.c \ ndr_clientserver.c \ ndr_contexthandle.c \ + ndr_es.c \ ndr_fullpointer.c \ ndr_marshall.c \ ndr_ole.c \ diff --git a/dlls/rpcrt4/ndr_es.c b/dlls/rpcrt4/ndr_es.c new file mode 100644 index 0000000..4b32602 --- /dev/null +++ b/dlls/rpcrt4/ndr_es.c @@ -0,0 +1,130 @@ +/* + * NDR Serialization Services + * + * Copyright (c) 2007 Robert Shearman for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include <stdio.h> + +#include "windef.h" +#include "winbase.h" +#include "winerror.h" +#include "rpc.h" +#include "midles.h" + +#include "ndr_misc.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(ole); + +static inline void init_MIDL_ES_MESSAGE(MIDL_ES_MESSAGE *pEsMsg) +{ + memset(pEsMsg, 0, sizeof(*pEsMsg)); + /* even if we are unmarshalling, as we don't want pointers to be pointed + * to buffer memory */ + pEsMsg->StubMsg.IsClient = TRUE; +} + +/*********************************************************************** + * MesEncodeIncrementalHandleCreate [RPCRT4.@] + */ +RPC_STATUS WINAPI MesEncodeIncrementalHandleCreate( + void *UserState, MIDL_ES_ALLOC AllocFn, MIDL_ES_WRITE WriteFn, + handle_t *pHandle) +{ + MIDL_ES_MESSAGE *pEsMsg; + + TRACE("(%p, %p, %p, %p)\n", UserState, AllocFn, WriteFn, pHandle); + + pEsMsg = HeapAlloc(GetProcessHeap(), 0, sizeof(*pEsMsg)); + if (!pEsMsg) + return ERROR_OUTOFMEMORY; + + init_MIDL_ES_MESSAGE(pEsMsg); + + pEsMsg->Operation = MES_ENCODE; + pEsMsg->UserState = UserState; + pEsMsg->HandleStyle = MES_INCREMENTAL_HANDLE; + pEsMsg->Alloc = AllocFn; + pEsMsg->Write = WriteFn; + + *pHandle = (handle_t)pEsMsg; + + return RPC_S_OK; +} + +/*********************************************************************** + * MesDecodeIncrementalHandleCreate [RPCRT4.@] + */ +RPC_STATUS WINAPI MesDecodeIncrementalHandleCreate( + void *UserState, MIDL_ES_READ ReadFn, handle_t *pHandle) +{ + MIDL_ES_MESSAGE *pEsMsg; + + TRACE("(%p, %p, %p)\n", UserState, ReadFn, pHandle); + + pEsMsg = HeapAlloc(GetProcessHeap(), 0, sizeof(*pEsMsg)); + if (!pEsMsg) + return ERROR_OUTOFMEMORY; + + init_MIDL_ES_MESSAGE(pEsMsg); + + pEsMsg->Operation = MES_DECODE; + pEsMsg->UserState = UserState; + pEsMsg->HandleStyle = MES_INCREMENTAL_HANDLE; + pEsMsg->Read = ReadFn; + + *pHandle = (handle_t)pEsMsg; + + return RPC_S_OK; +} + +/*********************************************************************** + * MesIncrementalHandleReset [RPCRT4.@] + */ +RPC_STATUS WINAPI MesIncrementalHandleReset( + handle_t Handle, void *UserState, MIDL_ES_ALLOC AllocFn, + MIDL_ES_WRITE WriteFn, MIDL_ES_READ ReadFn, MIDL_ES_CODE Operation) +{ + MIDL_ES_MESSAGE *pEsMsg = (MIDL_ES_MESSAGE *)Handle; + + TRACE("(%p, %p, %p, %p, %p, %d)\n", Handle, UserState, AllocFn, + WriteFn, ReadFn, Operation); + + init_MIDL_ES_MESSAGE(pEsMsg); + + pEsMsg->Operation = Operation; + pEsMsg->UserState = UserState; + pEsMsg->HandleStyle = MES_INCREMENTAL_HANDLE; + pEsMsg->Alloc = AllocFn; + pEsMsg->Write = WriteFn; + pEsMsg->Read = ReadFn; + + return RPC_S_OK; +} + +/*********************************************************************** + * MesHandleFree [RPCRT4.@] + */ +RPC_STATUS WINAPI MesHandleFree(handle_t Handle) +{ + TRACE("(%p)\n", Handle); + HeapFree(GetProcessHeap(), 0, Handle); + return RPC_S_OK; +} diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec index 95f13d8..3300512 100644 --- a/dlls/rpcrt4/rpcrt4.spec +++ b/dlls/rpcrt4/rpcrt4.spec @@ -98,12 +98,12 @@ @ stub MIDL_wchar_strlen @ stub MesBufferHandleReset @ stub MesDecodeBufferHandleCreate -@ stub MesDecodeIncrementalHandleCreate +@ stdcall MesDecodeIncrementalHandleCreate(ptr ptr ptr) @ stub MesEncodeDynBufferHandleCreate @ stub MesEncodeFixedBufferHandleCreate -@ stub MesEncodeIncrementalHandleCreate -@ stub MesHandleFree -@ stub MesIncrementalHandleReset +@ stdcall MesEncodeIncrementalHandleCreate(ptr ptr ptr ptr) +@ stdcall MesHandleFree(ptr) +@ stdcall MesIncrementalHandleReset(ptr ptr ptr ptr ptr long) @ stub MesInqProcEncodingId @ stdcall NDRCContextBinding(ptr) @ stdcall NDRCContextMarshall(ptr ptr)

1 0