December 2007 - Wine-Commits

Rob Shearman : rpcrt4: Document NdrAllocate.
by Alexandre Julliard Dec. 14, 2007

Dec. 14, 2007

Module: wine Branch: master Commit: 4a028589eb67e72ecdd9110209ee0270f22253d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a028589eb67e72ecdd911020… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Dec 13 16:14:51 2007 +0000 rpcrt4: Document NdrAllocate. --- dlls/rpcrt4/ndr_marshall.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 5e77d18..0efa4d2 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -341,6 +341,23 @@ typedef struct _NDR_MEMORY_LIST #define MEML_MAGIC ('M' << 24 | 'E' << 16 | 'M' << 8 | 'L') +/*********************************************************************** + * NdrAllocate [RPCRT4.@] + * + * Allocates a block of memory using pStubMsg->pfnAllocate. + * + * PARAMS + * pStubMsg [I/O] MIDL_STUB_MESSAGE structure. + * len [I] Size of memory block to allocate. + * + * RETURNS + * The memory block of size len that was allocated. + * + * NOTES + * The memory block is always 8-byte aligned. + * If the function is unable to allocate memory an ERROR_OUTOFMEMORY + * exception is raised. + */ void * WINAPI NdrAllocate(MIDL_STUB_MESSAGE *pStubMsg, size_t len) { size_t aligned_len;

1 0

Rob Shearman : rpcrt4: Partially revert commit 18faf3184b2ea263d77c2a7ad92eef27bc4ba08f.
by Alexandre Julliard Dec. 14, 2007

Dec. 14, 2007

Module: wine Branch: master Commit: c7261b732b722f5181c1a2119abba1103fbdb871 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7261b732b722f5181c1a2119… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Dec 13 16:13:59 2007 +0000 rpcrt4: Partially revert commit 18faf3184b2ea263d77c2a7ad92eef27bc4ba08f. Tests show that NdrPointerFree (and hence NdrFree) don't check whether the memory was allocated with NdrAllocate before freeing it. This makes sense as servers don't need to use NdrAllocate to allocate memory being returned and so this commit caused that memory to be leaked. NdrAllocate hasn't been changed as the tests show it is correct and it appears that the memory list is used to implement the RpcSs memory model. --- dlls/rpcrt4/ndr_marshall.c | 25 +------------------------ dlls/rpcrt4/tests/ndr_marshall.c | 6 ------ 2 files changed, 1 insertions(+), 30 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index bd5c81d..5e77d18 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -373,32 +373,9 @@ void * WINAPI NdrAllocate(MIDL_STUB_MESSAGE *pStubMsg, size_t len) static void WINAPI NdrFree(MIDL_STUB_MESSAGE *pStubMsg, unsigned char *Pointer) { - NDR_MEMORY_LIST *mem_list, *prev_mem_list; - TRACE("(%p, %p)\n", pStubMsg, Pointer); - for (prev_mem_list = NULL, mem_list = pStubMsg->pMemoryList; - mem_list; - prev_mem_list = mem_list, mem_list = mem_list->next) - { - const unsigned char *base_pointer = (unsigned char *)mem_list - mem_list->size; - if (base_pointer == Pointer) - { - if (mem_list->magic != MEML_MAGIC) - { - ERR("memory linked list corrupted, magic changed to 0x%08x\n", mem_list->magic); - break; - } - - /* fixup next pointers */ - if (prev_mem_list) - prev_mem_list->next = mem_list->next; - else - pStubMsg->pMemoryList = mem_list->next; - pStubMsg->pfnFree(Pointer); - break; - } - } + pStubMsg->pfnFree(Pointer); } static inline BOOL IsConformanceOrVariancePresent(PFORMAT_STRING pFormat) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index 391f277..ba5243b 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -1193,17 +1193,13 @@ todo_wine { my_free_called = 0; StubMsg.Buffer = StubMsg.BufferStart; NdrPointerFree( &StubMsg, mem, fmtstr_conf_str ); -todo_wine { ok(my_free_called == 1, "free called %d\n", my_free_called); -} mem = my_alloc(10); my_free_called = 0; StubMsg.Buffer = StubMsg.BufferStart; NdrPointerFree( &StubMsg, mem, fmtstr_conf_str ); -todo_wine { ok(my_free_called == 1, "free called %d\n", my_free_called); -} /* Server */ my_alloc_called = 0; @@ -1246,9 +1242,7 @@ todo_wine { my_free_called = 0; StubMsg.Buffer = StubMsg.BufferStart; NdrPointerFree( &StubMsg, mem, fmtstr_conf_str ); -todo_wine { ok(my_free_called == 1, "free called %d\n", my_free_called); -} HeapFree(GetProcessHeap(), 0, mem_orig); HeapFree(GetProcessHeap(), 0, StubMsg.RpcMsg->Buffer);

1 0

Rob Shearman : rpcrt4: Free the base pointer in PointerFree when freeing a pointer with RPC_FC_P_DEREF .
by Alexandre Julliard Dec. 14, 2007

Dec. 14, 2007

Module: wine Branch: master Commit: ce220e2b5f17b6b3698d5731b317f4c729b8076f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce220e2b5f17b6b3698d5731b… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Dec 13 16:13:20 2007 +0000 rpcrt4: Free the base pointer in PointerFree when freeing a pointer with RPC_FC_P_DEREF. --- dlls/rpcrt4/ndr_marshall.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index b57f0a3..bd5c81d 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -1245,6 +1245,7 @@ static void PointerFree(PMIDL_STUB_MESSAGE pStubMsg, unsigned type = pFormat[0], attr = pFormat[1]; PFORMAT_STRING desc; NDR_FREE m; + unsigned char *current_pointer = Pointer; TRACE("(%p,%p,%p)\n", pStubMsg, Pointer, pFormat); TRACE("type=0x%x, attr=", type); dump_pointer_attr(attr); @@ -1263,12 +1264,12 @@ static void PointerFree(PMIDL_STUB_MESSAGE pStubMsg, } if (attr & RPC_FC_P_DEREF) { - Pointer = *(unsigned char**)Pointer; - TRACE("deref => %p\n", Pointer); + current_pointer = *(unsigned char**)Pointer; + TRACE("deref => %p\n", current_pointer); } m = NdrFreer[*desc & NDR_TABLE_MASK]; - if (m) m(pStubMsg, Pointer, desc); + if (m) m(pStubMsg, current_pointer, desc); /* this check stops us from trying to free buffer memory. we don't have to * worry about clients, since they won't call this function.

1 0

Rob Shearman : rpcrt4: NdrStubGetBuffer shouldn' t set BufferStart and BufferEnd.
by Alexandre Julliard Dec. 14, 2007

Dec. 14, 2007

Module: wine Branch: master Commit: 9d8ebc1a247201a3b6dc9801a2efeda47860b5e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d8ebc1a247201a3b6dc9801a… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Dec 13 16:11:37 2007 +0000 rpcrt4: NdrStubGetBuffer shouldn't set BufferStart and BufferEnd. These are supposed to point to the original buffer when the types were unmarshalled. --- dlls/rpcrt4/cstub.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/cstub.c b/dlls/rpcrt4/cstub.c index b04c494..cd07c29 100644 --- a/dlls/rpcrt4/cstub.c +++ b/dlls/rpcrt4/cstub.c @@ -595,7 +595,5 @@ void WINAPI NdrStubGetBuffer(LPRPCSTUBBUFFER iface, return; } - pStubMsg->BufferStart = pStubMsg->RpcMsg->Buffer; - pStubMsg->BufferEnd = pStubMsg->BufferStart + pStubMsg->BufferLength; - pStubMsg->Buffer = pStubMsg->BufferStart; + pStubMsg->Buffer = pStubMsg->RpcMsg->Buffer; }

1 0

Rob Shearman : rpcrt4: Fix the check in NdrPointerFree.
by Alexandre Julliard Dec. 14, 2007

Dec. 14, 2007

Module: wine Branch: master Commit: d5ff3467bca0781d1e4f8a4247b985a0f5a45518 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5ff3467bca0781d1e4f8a424… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Dec 13 16:11:58 2007 +0000 rpcrt4: Fix the check in NdrPointerFree. Add comments to justify why this is the only check that is needed. --- dlls/rpcrt4/ndr_marshall.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 0fd2456..b57f0a3 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -1270,12 +1270,14 @@ static void PointerFree(PMIDL_STUB_MESSAGE pStubMsg, m = NdrFreer[*desc & NDR_TABLE_MASK]; if (m) m(pStubMsg, Pointer, desc); - /* we should check if the memory comes from NdrAllocate, - * and deallocate only if so - checking if the pointer is between - * BufferStart and BufferEnd will not always work since the buffer - * may be reallocated when the server wants to marshal the reply */ - if (Pointer >= (unsigned char *)pStubMsg->RpcMsg->Buffer || - Pointer <= (unsigned char *)pStubMsg->RpcMsg->Buffer + pStubMsg->BufferLength) + /* this check stops us from trying to free buffer memory. we don't have to + * worry about clients, since they won't call this function. + * we don't have to check for the buffer being reallocated because + * BufferStart and BufferEnd won't be reset when allocating memory for + * sending the response. we don't have to check for the new buffer here as + * it won't be used a type memory, only for buffer memory */ + if (Pointer >= (unsigned char *)pStubMsg->BufferStart && + Pointer < (unsigned char *)pStubMsg->BufferEnd) goto notfree; if (attr & RPC_FC_P_ONSTACK) {

1 0

Rob Shearman : Revert "rpcrt4: Try to free every non-stack pointer in PointerFree now that NdrFree does the sanity checking for us .".
by Alexandre Julliard Dec. 14, 2007

Dec. 14, 2007

Module: wine Branch: master Commit: ded4b866257947d7c365a8179775a0426de148e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ded4b866257947d7c365a8179… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Dec 13 16:11:28 2007 +0000 Revert "rpcrt4: Try to free every non-stack pointer in PointerFree now that NdrFree does the sanity checking for us.". This reverts commit 6db648302ce43f625a073426a35a6f40b7869d8b. Tests show the assumptions in a commit that this commit depends on are not valid. --- dlls/rpcrt4/ndr_marshall.c | 14 ++++++++++---- dlls/rpcrt4/tests/ndr_marshall.c | 2 ++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 8c79751..0fd2456 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -1270,17 +1270,23 @@ static void PointerFree(PMIDL_STUB_MESSAGE pStubMsg, m = NdrFreer[*desc & NDR_TABLE_MASK]; if (m) m(pStubMsg, Pointer, desc); + /* we should check if the memory comes from NdrAllocate, + * and deallocate only if so - checking if the pointer is between + * BufferStart and BufferEnd will not always work since the buffer + * may be reallocated when the server wants to marshal the reply */ + if (Pointer >= (unsigned char *)pStubMsg->RpcMsg->Buffer || + Pointer <= (unsigned char *)pStubMsg->RpcMsg->Buffer + pStubMsg->BufferLength) + goto notfree; + if (attr & RPC_FC_P_ONSTACK) { TRACE("not freeing stack ptr %p\n", Pointer); return; } - - /* try to free everything else. NdrFree will do the job of sorting out - * whether we allocated it or whether the app did */ - TRACE("freeing %p\n", Pointer); NdrFree(pStubMsg, Pointer); return; +notfree: + TRACE("not freeing %p\n", Pointer); } /*********************************************************************** diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index d19d50f..391f277 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -1193,7 +1193,9 @@ todo_wine { my_free_called = 0; StubMsg.Buffer = StubMsg.BufferStart; NdrPointerFree( &StubMsg, mem, fmtstr_conf_str ); +todo_wine { ok(my_free_called == 1, "free called %d\n", my_free_called); +} mem = my_alloc(10); my_free_called = 0;

1 0

Rob Shearman : widl: Don' t write redundant FC_RP type format out for conformant strings, unless it is a top level variable.
by Alexandre Julliard Dec. 14, 2007

Dec. 14, 2007

Module: wine Branch: master Commit: 9896938fab639367e706a0938cda9fda6374ce35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9896938fab639367e706a0938… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Dec 13 16:12:13 2007 +0000 widl: Don't write redundant FC_RP type format out for conformant strings, unless it is a top level variable. --- tools/widl/typegen.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 3bb88da..6dbbf7f 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1431,14 +1431,15 @@ int is_declptr(const type_t *t) static size_t write_string_tfs(FILE *file, const attr_list_t *attrs, type_t *type, - const char *name, unsigned int *typestring_offset) + const char *name, unsigned int *typestring_offset, + int toplevel) { size_t start_offset = *typestring_offset; unsigned char rtype; update_tfsoff(type, start_offset, file); - if (is_declptr(type)) + if (toplevel && is_declptr(type)) { unsigned char flag = is_conformant_array(type) ? 0 : RPC_FC_P_SIMPLEPOINTER; int pointer_type = is_ptr(type) ? type->type : get_attrv(attrs, ATTR_POINTERTYPE); @@ -1453,10 +1454,9 @@ static size_t write_string_tfs(FILE *file, const attr_list_t *attrs, print_file(file, 2, "NdrFcShort(0x2),\n"); *typestring_offset += 2; } - rtype = type->ref->type; } - else - rtype = type->ref->type; + + rtype = type->ref->type; if ((rtype != RPC_FC_BYTE) && (rtype != RPC_FC_CHAR) && (rtype != RPC_FC_WCHAR)) { @@ -1721,7 +1721,7 @@ static size_t write_struct_tfs(FILE *file, type_t *type, if (array && !processed(array->type)) array_offset = is_attr(array->attrs, ATTR_STRING) - ? write_string_tfs(file, array->attrs, array->type, array->name, tfsoff) + ? write_string_tfs(file, array->attrs, array->type, array->name, tfsoff, FALSE) : write_array_tfs(file, array->attrs, array->type, array->name, tfsoff); corroff = *tfsoff; @@ -2071,7 +2071,7 @@ static size_t write_typeformatstring_var(FILE *file, int indent, const func_t *f } if ((last_ptr(type) || last_array(type)) && is_ptrchain_attr(var, ATTR_STRING)) - return write_string_tfs(file, var->attrs, type, var->name, typeformat_offset); + return write_string_tfs(file, var->attrs, type, var->name, typeformat_offset, TRUE); if (is_array(type)) { @@ -2198,7 +2198,7 @@ static int write_embedded_types(FILE *file, const attr_list_t *attrs, type_t *ty } else if (last_array(type) && is_attr(attrs, ATTR_STRING)) { - write_string_tfs(file, attrs, type, name, tfsoff); + write_string_tfs(file, attrs, type, name, tfsoff, FALSE); } else if (type->declarray && is_conformant_array(type)) ; /* conformant arrays and strings are handled specially */

1 0

Lei Zhang : quartz: Make video renderer aggregatable.
by Alexandre Julliard Dec. 13, 2007

Dec. 13, 2007

Module: wine Branch: master Commit: 932cc2d7f910ec9a7df17384610832922e67b861 URL: http://source.winehq.org/git/wine.git/?a=commit;h=932cc2d7f910ec9a7df173846… Author: Lei Zhang <thestig(a)google.com> Date: Thu Dec 13 03:16:27 2007 -0800 quartz: Make video renderer aggregatable. --- dlls/quartz/tests/videorenderer.c | 4 -- dlls/quartz/videorenderer.c | 84 ++++++++++++++++++++++++++++++++---- 2 files changed, 74 insertions(+), 14 deletions(-) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index ce0a43f..3c15772 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -69,18 +69,14 @@ static void test_aggregation(void) /* for aggregation, we should only be able to request IUnknown */ hr = CoCreateInstance(&CLSID_VideoRenderer, pUnkOuter, CLSCTX_INPROC_SERVER, &IID_IVideoWindow, (LPVOID*)&pVideoWindowInner); - todo_wine { ok(hr == E_NOINTERFACE, "CoCreateInstance returned %x\n", hr); - } ok(pVideoWindowInner == NULL, "pVideoWindowInner is not NULL\n"); /* aggregation, request IUnknown */ hr = CoCreateInstance(&CLSID_VideoRenderer, pUnkOuter, CLSCTX_INPROC_SERVER, &IID_IUnknown, (LPVOID*)&pUnkInner); - todo_wine { ok(hr == S_OK, "CoCreateInstance returned %x\n", hr); ok(pUnkInner != NULL, "pUnkInner is NULL\n"); - } if (!pUnkInner) { diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 67e601e..1a4594c 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -46,6 +46,7 @@ static BOOL wnd_class_registered = FALSE; static const WCHAR wcsInputPinName[] = {'i','n','p','u','t',' ','p','i','n',0}; static const IBaseFilterVtbl VideoRenderer_Vtbl; +static const IUnknownVtbl IInner_VTable; static const IBasicVideoVtbl IBasicVideo_VTable; static const IVideoWindowVtbl IVideoWindow_VTable; static const IPinVtbl VideoRenderer_InputPin_Vtbl; @@ -55,6 +56,7 @@ typedef struct VideoRendererImpl const IBaseFilterVtbl * lpVtbl; const IBasicVideoVtbl * IBasicVideo_vtbl; const IVideoWindowVtbl * IVideoWindow_vtbl; + const IUnknownVtbl * IInner_vtbl; LONG refCount; CRITICAL_SECTION csFilter; @@ -79,6 +81,9 @@ typedef struct VideoRendererImpl RECT WindowPos; long VideoWidth; long VideoHeight; + IUnknown * pUnkOuter; + BOOL bUnkOuterValid; + BOOL bAggregatable; } VideoRendererImpl; static LRESULT CALLBACK VideoWndProcA(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) @@ -436,10 +441,11 @@ HRESULT VideoRenderer_create(IUnknown * pUnkOuter, LPVOID * ppv) *ppv = NULL; - if (pUnkOuter) - return CLASS_E_NOAGGREGATION; - pVideoRenderer = CoTaskMemAlloc(sizeof(VideoRendererImpl)); + pVideoRenderer->pUnkOuter = pUnkOuter; + pVideoRenderer->bUnkOuterValid = FALSE; + pVideoRenderer->bAggregatable = FALSE; + pVideoRenderer->IInner_vtbl = &IInner_VTable; pVideoRenderer->lpVtbl = &VideoRenderer_Vtbl; pVideoRenderer->IBasicVideo_vtbl = &IBasicVideo_VTable; @@ -482,15 +488,18 @@ HRESULT VideoRenderer_create(IUnknown * pUnkOuter, LPVOID * ppv) return hr; } -static HRESULT WINAPI VideoRenderer_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * ppv) +static HRESULT WINAPI Inner_QueryInterface(IUnknown * iface, REFIID riid, LPVOID * ppv) { - VideoRendererImpl *This = (VideoRendererImpl *)iface; + ICOM_THIS_MULTI(VideoRendererImpl, IInner_vtbl, iface); TRACE("(%p/%p)->(%s, %p)\n", This, iface, qzdebugstr_guid(riid), ppv); + if (This->bAggregatable) + This->bUnkOuterValid = TRUE; + *ppv = NULL; if (IsEqualIID(riid, &IID_IUnknown)) - *ppv = (LPVOID)This; + *ppv = (LPVOID)&(This->IInner_vtbl); else if (IsEqualIID(riid, &IID_IPersist)) *ppv = (LPVOID)This; else if (IsEqualIID(riid, &IID_IMediaFilter)) @@ -513,9 +522,9 @@ static HRESULT WINAPI VideoRenderer_QueryInterface(IBaseFilter * iface, REFIID r return E_NOINTERFACE; } -static ULONG WINAPI VideoRenderer_AddRef(IBaseFilter * iface) +static ULONG WINAPI Inner_AddRef(IUnknown * iface) { - VideoRendererImpl *This = (VideoRendererImpl *)iface; + ICOM_THIS_MULTI(VideoRendererImpl, IInner_vtbl, iface); ULONG refCount = InterlockedIncrement(&This->refCount); TRACE("(%p/%p)->() AddRef from %d\n", This, iface, refCount - 1); @@ -523,9 +532,9 @@ static ULONG WINAPI VideoRenderer_AddRef(IBaseFilter * iface) return refCount; } -static ULONG WINAPI VideoRenderer_Release(IBaseFilter * iface) +static ULONG WINAPI Inner_Release(IUnknown * iface) { - VideoRendererImpl *This = (VideoRendererImpl *)iface; + ICOM_THIS_MULTI(VideoRendererImpl, IInner_vtbl, iface); ULONG refCount = InterlockedDecrement(&This->refCount); TRACE("(%p/%p)->() Release from %d\n", This, iface, refCount + 1); @@ -566,6 +575,61 @@ static ULONG WINAPI VideoRenderer_Release(IBaseFilter * iface) return refCount; } +static const IUnknownVtbl IInner_VTable = +{ + Inner_QueryInterface, + Inner_AddRef, + Inner_Release +}; + +static HRESULT WINAPI VideoRenderer_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * ppv) +{ + VideoRendererImpl *This = (VideoRendererImpl *)iface; + + if (This->bAggregatable) + This->bUnkOuterValid = TRUE; + + if (This->pUnkOuter) + { + if (This->bAggregatable) + return IUnknown_QueryInterface(This->pUnkOuter, riid, ppv); + + if (IsEqualIID(riid, &IID_IUnknown)) + { + HRESULT hr; + + IUnknown_AddRef((IUnknown *)&(This->IInner_vtbl)); + hr = IUnknown_QueryInterface((IUnknown *)&(This->IInner_vtbl), riid, ppv); + IUnknown_Release((IUnknown *)&(This->IInner_vtbl)); + This->bAggregatable = TRUE; + return hr; + } + + *ppv = NULL; + return E_NOINTERFACE; + } + + return IUnknown_QueryInterface((IUnknown *)&(This->IInner_vtbl), riid, ppv); +} + +static ULONG WINAPI VideoRenderer_AddRef(IBaseFilter * iface) +{ + VideoRendererImpl *This = (VideoRendererImpl *)iface; + + if (This->pUnkOuter && This->bUnkOuterValid) + return IUnknown_AddRef(This->pUnkOuter); + return IUnknown_AddRef((IUnknown *)&(This->IInner_vtbl)); +} + +static ULONG WINAPI VideoRenderer_Release(IBaseFilter * iface) +{ + VideoRendererImpl *This = (VideoRendererImpl *)iface; + + if (This->pUnkOuter && This->bUnkOuterValid) + return IUnknown_Release(This->pUnkOuter); + return IUnknown_Release((IUnknown *)&(This->IInner_vtbl)); +} + /** IPersist methods **/ static HRESULT WINAPI VideoRenderer_GetClassID(IBaseFilter * iface, CLSID * pClsid)

1 0

Lei Zhang : quartz: Add referenceclock QueryInterface test.
by Alexandre Julliard Dec. 13, 2007

Dec. 13, 2007

Module: wine Branch: master Commit: 29cc256b9a92e91258a0df69a6c09f3a3641ac01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29cc256b9a92e91258a0df69a… Author: Lei Zhang <thestig(a)google.com> Date: Thu Dec 13 03:12:42 2007 -0800 quartz: Add referenceclock QueryInterface test. --- dlls/quartz/tests/referenceclock.c | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/tests/referenceclock.c b/dlls/quartz/tests/referenceclock.c index 2e50c5a..628fee0 100644 --- a/dlls/quartz/tests/referenceclock.c +++ b/dlls/quartz/tests/referenceclock.c @@ -27,6 +27,26 @@ #include "dshow.h" #include "control.h" +static void test_IReferenceClock_query_interface(const char * clockdesc, IReferenceClock * pClock) +{ + HRESULT hr; + IUnknown *pF; + + hr = IReferenceClock_QueryInterface(pClock, &IID_IUnknown, (LPVOID *)&pF); + ok(hr == S_OK, "IReferenceClock_QueryInterface returned %x\n", hr); + ok(pF != NULL, "pF is NULL\n"); + + hr = IReferenceClock_QueryInterface(pClock, &IID_IDirectDraw, (LPVOID *)&pF); + ok(hr == E_NOINTERFACE, "IReferenceClock_QueryInterface returned %x\n", hr); + todo_wine { + ok(pF == NULL, "pF is not NULL\n"); + } + + hr = IReferenceClock_QueryInterface(pClock, &IID_IReferenceClock, (LPVOID *)&pF); + ok(hr == S_OK, "IReferenceClock_QueryInterface returned %x\n", hr); + ok(pF != NULL, "pF is NULL\n"); +} + /* The following method expects a reference clock that will keep ticking for * at least 5 seconds since its creation. This method assumes no other methods * were called on the IReferenceClock interface since its creation. @@ -81,6 +101,7 @@ static void test_IReferenceClock_SystemClock(void) ok(hr == S_OK, "Unable to create reference clock from system clock %x\n", hr); if (hr == S_OK) { + test_IReferenceClock_query_interface("SystemClock", pReferenceClock); test_IReferenceClock_methods("SystemClock", pReferenceClock); IReferenceClock_Release(pReferenceClock); }

1 0

Lei Zhang : quartz: Add videorenderer aggregation test.
by Alexandre Julliard Dec. 13, 2007

Dec. 13, 2007

Module: wine Branch: master Commit: 766046d4ab5ad649bbf2203b573319b8e8667478 URL: http://source.winehq.org/git/wine.git/?a=commit;h=766046d4ab5ad649bbf2203b5… Author: Lei Zhang <thestig(a)google.com> Date: Thu Dec 13 02:53:06 2007 -0800 quartz: Add videorenderer aggregation test. --- dlls/quartz/tests/videorenderer.c | 103 +++++++++++++++++++++++++++++++++++++ 1 files changed, 103 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index dde6886..ce0a43f 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -27,6 +27,10 @@ ok(hr == S_OK, "IUnknown_QueryInterface returned %x\n", hr); \ ok(ppv != NULL, "Pointer is NULL\n"); +#define QI_FAIL(iface, riid, ppv) hr = IUnknown_QueryInterface(iface, &riid, (LPVOID*)&ppv); \ + ok(hr == E_NOINTERFACE, "IUnknown_QueryInterface returned %x\n", hr); \ + ok(ppv == NULL, "Pointer is %p\n", ppv); + #define ADDREF_EXPECT(iface, num) if (iface) { \ hr = IUnknown_AddRef(iface); \ ok(hr == num, "IUnknown_AddRef should return %d, got %d\n", num, hr); \ @@ -39,6 +43,104 @@ static IUnknown *pVideoRenderer = NULL; +static void test_aggregation(void) +{ + HRESULT hr; + IUnknown *pUnkOuter = NULL; + IUnknown *pUnkInner = NULL; + IVideoWindow *pVideoWindowInner = NULL; + IUnknown *pUnkOuterTest = NULL; + IUnknown *pUnkInnerTest = NULL; + IVideoWindow *pVideoWindowTest = NULL; + IReferenceClock *pReferenceClockTest = NULL; + IUnknown *pUnkTest = NULL; + + hr = CoCreateInstance(&CLSID_SystemClock, NULL, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (LPVOID*)&pUnkOuter); + ok(hr == S_OK, "CoCreateInstance failed with %x\n", hr); + ok(pUnkOuter != NULL, "pUnkOuter is NULL\n"); + + if (!pUnkOuter) + { + skip("pUnkOuter is NULL\n"); + return; + } + + /* for aggregation, we should only be able to request IUnknown */ + hr = CoCreateInstance(&CLSID_VideoRenderer, pUnkOuter, CLSCTX_INPROC_SERVER, + &IID_IVideoWindow, (LPVOID*)&pVideoWindowInner); + todo_wine { + ok(hr == E_NOINTERFACE, "CoCreateInstance returned %x\n", hr); + } + ok(pVideoWindowInner == NULL, "pVideoWindowInner is not NULL\n"); + + /* aggregation, request IUnknown */ + hr = CoCreateInstance(&CLSID_VideoRenderer, pUnkOuter, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (LPVOID*)&pUnkInner); + todo_wine { + ok(hr == S_OK, "CoCreateInstance returned %x\n", hr); + ok(pUnkInner != NULL, "pUnkInner is NULL\n"); + } + + if (!pUnkInner) + { + skip("pUnkInner is NULL\n"); + return; + } + + ADDREF_EXPECT(pUnkOuter, 2); + ADDREF_EXPECT(pUnkInner, 2); + RELEASE_EXPECT(pUnkOuter, 1); + RELEASE_EXPECT(pUnkInner, 1); + + QI_FAIL(pUnkOuter, IID_IVideoWindow, pVideoWindowTest); + QI_FAIL(pUnkInner, IID_IReferenceClock, pReferenceClockTest); + + /* these QueryInterface calls should work */ + QI_SUCCEED(pUnkOuter, IID_IReferenceClock, pReferenceClockTest); + QI_SUCCEED(pUnkOuter, IID_IUnknown, pUnkOuterTest); + QI_SUCCEED(pUnkInner, IID_IVideoWindow, pVideoWindowTest); + QI_SUCCEED(pUnkInner, IID_IUnknown, pUnkInnerTest); + + if (!pReferenceClockTest || !pUnkOuterTest || !pVideoWindowTest \ + || !pUnkInnerTest) + { + skip("One of the required interfaces is NULL\n"); + return; + } + + ADDREF_EXPECT(pReferenceClockTest, 5); + ADDREF_EXPECT(pUnkOuterTest, 6); + ADDREF_EXPECT(pVideoWindowTest, 7); + ADDREF_EXPECT(pUnkInnerTest, 3); + RELEASE_EXPECT(pReferenceClockTest, 6); + RELEASE_EXPECT(pUnkOuterTest, 5); + RELEASE_EXPECT(pVideoWindowTest, 4); + RELEASE_EXPECT(pUnkInnerTest, 2); + + QI_SUCCEED(pReferenceClockTest, IID_IUnknown, pUnkTest); + QI_SUCCEED(pUnkOuterTest, IID_IUnknown, pUnkTest); + QI_SUCCEED(pVideoWindowTest, IID_IUnknown, pUnkTest); + QI_SUCCEED(pUnkInnerTest, IID_IUnknown, pUnkTest); + + QI_FAIL(pReferenceClockTest, IID_IVideoWindow, pUnkTest); + QI_FAIL(pUnkOuterTest, IID_IVideoWindow, pUnkTest); + QI_FAIL(pVideoWindowTest, IID_IVideoWindow, pUnkTest); + QI_SUCCEED(pUnkInnerTest, IID_IVideoWindow, pUnkTest); + + QI_SUCCEED(pReferenceClockTest, IID_IReferenceClock, pUnkTest); + QI_SUCCEED(pUnkOuterTest, IID_IReferenceClock, pUnkTest); + QI_SUCCEED(pVideoWindowTest, IID_IReferenceClock, pUnkTest); + QI_FAIL(pUnkInnerTest, IID_IReferenceClock, pUnkTest); + + RELEASE_EXPECT(pReferenceClockTest, 10); + RELEASE_EXPECT(pUnkOuterTest, 9); + RELEASE_EXPECT(pVideoWindowTest, 8); + RELEASE_EXPECT(pUnkInnerTest, 2); + RELEASE_EXPECT(pUnkOuter, 7); + RELEASE_EXPECT(pUnkInner, 1); +} + static int create_video_renderer(void) { HRESULT hr; @@ -98,6 +200,7 @@ START_TEST(videorenderer) return; test_query_interface(); + test_aggregation(); release_video_renderer(); }

1 0