July 2016 - Wine-Commits - list.winehq.org

Michael Stefaniuc : quartz: Remove redundant NULL checks before CoTaskMemFree().
by Alexandre Julliard July 8, 2016

July 8, 2016

Module: wine Branch: master Commit: b5a7853b861c02f350935813b7503a28d38fa7f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5a7853b861c02f350935813b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 8 10:10:14 2016 +0200 quartz: Remove redundant NULL checks before CoTaskMemFree(). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/avidec.c | 7 ++----- dlls/quartz/filtermapper.c | 3 +-- dlls/quartz/mpegsplit.c | 3 +-- dlls/quartz/tests/filtermapper.c | 3 +-- 4 files changed, 5 insertions(+), 11 deletions(-) diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index eb9b223..7e29318 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -349,11 +349,8 @@ static HRESULT WINAPI AVIDec_BreakConnect(TransformFilter *tf, PIN_DIRECTION dir { if (This->hvid) ICClose(This->hvid); - if (This->pBihIn) - CoTaskMemFree(This->pBihIn); - if (This->pBihOut) - CoTaskMemFree(This->pBihOut); - + CoTaskMemFree(This->pBihIn); + CoTaskMemFree(This->pBihOut); This->hvid = NULL; This->pBihIn = NULL; This->pBihOut = NULL; diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index 6564155..8a1fc3a 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -609,8 +609,7 @@ static void FM2_DeleteRegFilter(REGFILTER2 * prf2) for (i = 0; i < prf2->u.s2.cPins2; i++) { UINT j; - if (prf2->u.s2.rgPins2[i].clsPinCategory) - CoTaskMemFree((LPVOID)prf2->u.s2.rgPins2[i].clsPinCategory); + CoTaskMemFree((void*)prf2->u.s2.rgPins2[i].clsPinCategory); for (j = 0; j < prf2->u.s2.rgPins2[i].nMediaTypes; j++) { diff --git a/dlls/quartz/mpegsplit.c b/dlls/quartz/mpegsplit.c index 1fd8002..9b581e9 100644 --- a/dlls/quartz/mpegsplit.c +++ b/dlls/quartz/mpegsplit.c @@ -589,8 +589,7 @@ static HRESULT MPEGSplitter_pre_connect(IPin *iface, IPin *pConnectPin, ALLOCATO if (FAILED(hr)) { - if (amt.pbFormat) - CoTaskMemFree(amt.pbFormat); + CoTaskMemFree(amt.pbFormat); ERR("Could not create pin for MPEG audio stream (%x)\n", hr); break; } diff --git a/dlls/quartz/tests/filtermapper.c b/dlls/quartz/tests/filtermapper.c index 11b7d39..f044a31 100644 --- a/dlls/quartz/tests/filtermapper.c +++ b/dlls/quartz/tests/filtermapper.c @@ -528,8 +528,7 @@ static void test_parse_filter_data(void) ok(pRegFilter->dwMerit == 0x5fffff,"Incorrect merit returned\n"); out: - if (pRegFilter) - CoTaskMemFree(pRegFilter); + CoTaskMemFree(pRegFilter); if (psa) { SafeArrayUnaccessData(psa);

1 0

Kirill Smirnov : winex11.drv: Fix an uninitialized variable (clang).
by Alexandre Julliard July 8, 2016

July 8, 2016

Module: wine Branch: master Commit: 827f97c1ab87c11d38b31e21f593e4d99a954004 URL: http://source.winehq.org/git/wine.git/?a=commit;h=827f97c1ab87c11d38b31e21f… Author: Kirill Smirnov <kirill.k.smirnov(a)gmail.com> Date: Fri Jul 8 01:50:19 2016 +0300 winex11.drv: Fix an uninitialized variable (clang). dst_bits structure is valid only if copy_image_bits() succeeded. Signed-off-by: Kirill K. Smirnov <kirill.k.smirnov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/bitblt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index 8d61a4b..80256dc 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1436,10 +1436,10 @@ static DWORD put_pixmap_image( Pixmap pixmap, const XVisualInfo *vis, XPutImage( gdi_display, pixmap, gc, image, 0, 0, 0, 0, coords.width, coords.height ); XFreeGC( gdi_display, gc ); image->data = NULL; + if (dst_bits.free) dst_bits.free( &dst_bits ); } XDestroyImage( image ); - if (dst_bits.free) dst_bits.free( &dst_bits ); return ret; update_format:

1 0

Nikolay Sivov : crypt32: Use regular list iterator when there' s no need for safe one.
by Alexandre Julliard July 7, 2016

July 7, 2016

Module: wine Branch: master Commit: 94b6a885a880728f5e0a865fc17a82532723e756 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94b6a885a880728f5e0a865fc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 6 23:34:20 2016 +0300 crypt32: Use regular list iterator when there's no need for safe one. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/collectionstore.c | 9 ++++----- dlls/crypt32/proplist.c | 5 ++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/crypt32/collectionstore.c b/dlls/crypt32/collectionstore.c index f565745..8b90270 100644 --- a/dlls/crypt32/collectionstore.c +++ b/dlls/crypt32/collectionstore.c @@ -114,10 +114,10 @@ static BOOL CRYPT_CollectionAddContext(WINE_COLLECTIONSTORE *store, } else { - WINE_STORE_LIST_ENTRY *entry, *next; + WINE_STORE_LIST_ENTRY *entry; EnterCriticalSection(&store->cs); - LIST_FOR_EACH_ENTRY_SAFE(entry, next, &store->stores, WINE_STORE_LIST_ENTRY, entry) + LIST_FOR_EACH_ENTRY(entry, &store->stores, WINE_STORE_LIST_ENTRY, entry) { if (entry->dwUpdateFlags & CERT_PHYSICAL_STORE_ADD_ENABLE_FLAG) { @@ -559,7 +559,7 @@ void WINAPI CertRemoveStoreFromCollection(HCERTSTORE hCollectionStore, { WINE_COLLECTIONSTORE *collection = hCollectionStore; WINECRYPT_CERTSTORE *sibling = hSiblingStore; - WINE_STORE_LIST_ENTRY *store, *next; + WINE_STORE_LIST_ENTRY *store; TRACE("(%p, %p)\n", hCollectionStore, hSiblingStore); @@ -578,8 +578,7 @@ void WINAPI CertRemoveStoreFromCollection(HCERTSTORE hCollectionStore, return; } EnterCriticalSection(&collection->cs); - LIST_FOR_EACH_ENTRY_SAFE(store, next, &collection->stores, - WINE_STORE_LIST_ENTRY, entry) + LIST_FOR_EACH_ENTRY(store, &collection->stores, WINE_STORE_LIST_ENTRY, entry) { if (store->store == sibling) { diff --git a/dlls/crypt32/proplist.c b/dlls/crypt32/proplist.c index d849fd6..f5ae221 100644 --- a/dlls/crypt32/proplist.c +++ b/dlls/crypt32/proplist.c @@ -148,11 +148,10 @@ BOOL ContextPropertyList_SetProperty(CONTEXT_PROPERTY_LIST *list, DWORD id, void ContextPropertyList_RemoveProperty(CONTEXT_PROPERTY_LIST *list, DWORD id) { - CONTEXT_PROPERTY *prop, *next; + CONTEXT_PROPERTY *prop; EnterCriticalSection(&list->cs); - LIST_FOR_EACH_ENTRY_SAFE(prop, next, &list->properties, CONTEXT_PROPERTY, - entry) + LIST_FOR_EACH_ENTRY(prop, &list->properties, CONTEXT_PROPERTY, entry) { if (prop->propID == id) {

1 0

Józef Kucia : wined3d: Implement SM5 cut_stream instruction for stream 0.
by Alexandre Julliard July 7, 2016

July 7, 2016

Module: wine Branch: master Commit: 422f0a87c48f595ca512d5278c4f3631e0aa599c URL: http://source.winehq.org/git/wine.git/?a=commit;h=422f0a87c48f595ca512d5278… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jul 7 12:22:35 2016 +0200 wined3d: Implement SM5 cut_stream instruction for stream 0. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 9a2025f..7ad5acd 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3437,7 +3437,12 @@ static void shader_glsl_cross(const struct wined3d_shader_instruction *ins) static void shader_glsl_cut(const struct wined3d_shader_instruction *ins) { - shader_addline(ins->ctx->buffer, "EndPrimitive();\n"); + unsigned int stream = ins->handler_idx == WINED3DSIH_CUT ? 0 : ins->src[0].reg.idx[0].offset; + + if (!stream) + shader_addline(ins->ctx->buffer, "EndPrimitive();\n"); + else + FIXME("Unhandled primitive stream %u.\n", stream); } /* Process the WINED3DSIO_POW instruction in GLSL (dst = |src0|^src1) @@ -8600,7 +8605,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_CONTINUE */ shader_glsl_continue, /* WINED3DSIH_CRS */ shader_glsl_cross, /* WINED3DSIH_CUT */ shader_glsl_cut, - /* WINED3DSIH_CUT_STREAM */ NULL, + /* WINED3DSIH_CUT_STREAM */ shader_glsl_cut, /* WINED3DSIH_DCL */ shader_glsl_nop, /* WINED3DSIH_DCL_CONSTANT_BUFFER */ shader_glsl_nop, /* WINED3DSIH_DCL_GLOBAL_FLAGS */ shader_glsl_nop,

1 0

Józef Kucia : d3d11: Implement d3d10_query_GetData().
by Alexandre Julliard July 7, 2016

July 7, 2016

Module: wine Branch: master Commit: a9f09cf06037e43b5a987e8e7d1bd5177c53c754 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9f09cf06037e43b5a987e8e7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jul 7 12:22:31 2016 +0200 d3d11: Implement d3d10_query_GetData(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/async.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/async.c b/dlls/d3d11/async.c index 2e57ed6..fa38484 100644 --- a/dlls/d3d11/async.c +++ b/dlls/d3d11/async.c @@ -292,9 +292,27 @@ static void STDMETHODCALLTYPE d3d10_query_End(ID3D10Query *iface) static HRESULT STDMETHODCALLTYPE d3d10_query_GetData(ID3D10Query *iface, void *data, UINT data_size, UINT flags) { - FIXME("iface %p, data %p, data_size %u, flags %#x stub!\n", iface, data, data_size, flags); + struct d3d_query *query = impl_from_ID3D10Query(iface); + unsigned int wined3d_flags; + HRESULT hr; + + TRACE("iface %p, data %p, data_size %u, flags %#x.\n", iface, data, data_size, flags); + + wined3d_flags = wined3d_getdata_flags_from_d3d11_async_getdata_flags(flags); + + wined3d_mutex_lock(); + if (!data_size || wined3d_query_get_data_size(query->wined3d_query) == data_size) + { + hr = wined3d_query_get_data(query->wined3d_query, data, data_size, wined3d_flags); + } + else + { + WARN("Invalid data size %u.\n", data_size); + hr = E_INVALIDARG; + } + wined3d_mutex_unlock(); - return E_NOTIMPL; + return hr; } static UINT STDMETHODCALLTYPE d3d10_query_GetDataSize(ID3D10Query *iface)

1 0

Józef Kucia : d3d11: Implement d3d10_query_End().
by Alexandre Julliard July 7, 2016

July 7, 2016

Module: wine Branch: master Commit: 2cadc6793bcc4bc831865eddb3e0c518714fd032 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cadc6793bcc4bc831865eddb… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jul 7 12:22:30 2016 +0200 d3d11: Implement d3d10_query_End(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/async.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/async.c b/dlls/d3d11/async.c index 494a23b..2e57ed6 100644 --- a/dlls/d3d11/async.c +++ b/dlls/d3d11/async.c @@ -279,7 +279,15 @@ static void STDMETHODCALLTYPE d3d10_query_Begin(ID3D10Query *iface) static void STDMETHODCALLTYPE d3d10_query_End(ID3D10Query *iface) { - FIXME("iface %p stub!\n", iface); + struct d3d_query *query = impl_from_ID3D10Query(iface); + HRESULT hr; + + TRACE("iface %p.\n", iface); + + wined3d_mutex_lock(); + if (FAILED(hr = wined3d_query_issue(query->wined3d_query, WINED3DISSUE_END))) + ERR("Failed to issue query, hr %#x.\n", hr); + wined3d_mutex_unlock(); } static HRESULT STDMETHODCALLTYPE d3d10_query_GetData(ID3D10Query *iface, void *data, UINT data_size, UINT flags)

1 0

Józef Kucia : d3d11: Implement d3d10_query_Begin().
by Alexandre Julliard July 7, 2016

July 7, 2016

Module: wine Branch: master Commit: 718d3119e56a6e56dd929015b59d8fba4596412e URL: http://source.winehq.org/git/wine.git/?a=commit;h=718d3119e56a6e56dd929015b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jul 7 12:22:29 2016 +0200 d3d11: Implement d3d10_query_Begin(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/async.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/async.c b/dlls/d3d11/async.c index 323a348..494a23b 100644 --- a/dlls/d3d11/async.c +++ b/dlls/d3d11/async.c @@ -266,7 +266,15 @@ static HRESULT STDMETHODCALLTYPE d3d10_query_SetPrivateDataInterface(ID3D10Query static void STDMETHODCALLTYPE d3d10_query_Begin(ID3D10Query *iface) { - FIXME("iface %p stub!\n", iface); + struct d3d_query *query = impl_from_ID3D10Query(iface); + HRESULT hr; + + TRACE("iface %p.\n", iface); + + wined3d_mutex_lock(); + if (FAILED(hr = wined3d_query_issue(query->wined3d_query, WINED3DISSUE_BEGIN))) + ERR("Failed to issue query, hr %#x.\n", hr); + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d10_query_End(ID3D10Query *iface)

1 0

Huw Davies : gdi32: Use a binary search for PtInRegion() and RectInRegion( ).
by Alexandre Julliard July 7, 2016

July 7, 2016

Module: wine Branch: master Commit: f59d3f60e1ada4fbd37a8c7a71f917b309cee837 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f59d3f60e1ada4fbd37a8c7a7… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jul 6 11:09:13 2016 +0100 gdi32: Use a binary search for PtInRegion() and RectInRegion(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/region.c | 27 +++++++-------------------- 1 file changed, 7 insertions(+), 20 deletions(-) diff --git a/dlls/gdi32/region.c b/dlls/gdi32/region.c index 646512f..cea2dab 100644 --- a/dlls/gdi32/region.c +++ b/dlls/gdi32/region.c @@ -1038,15 +1038,7 @@ BOOL WINAPI PtInRegion( HRGN hrgn, INT x, INT y ) if ((obj = GDI_GetObjPtr( hrgn, OBJ_REGION ))) { - int i; - - if (obj->numRects > 0 && is_in_rect(&obj->extents, x, y)) - for (i = 0; i < obj->numRects; i++) - if (is_in_rect(&obj->rects[i], x, y)) - { - ret = TRUE; - break; - } + region_find_pt( obj, x, y, &ret ); GDI_ReleaseObj( hrgn ); } return ret; @@ -1071,6 +1063,7 @@ BOOL WINAPI RectInRegion( HRGN hrgn, const RECT *rect ) WINEREGION *obj; BOOL ret = FALSE; RECT rc; + int i; /* swap the coordinates to make right >= left and bottom >= top */ /* (region building rectangles are normalized the same way) */ @@ -1079,29 +1072,23 @@ BOOL WINAPI RectInRegion( HRGN hrgn, const RECT *rect ) if ((obj = GDI_GetObjPtr( hrgn, OBJ_REGION ))) { - RECT *pCurRect, *pRectEnd; - - /* this is (just) a useful optimization */ if ((obj->numRects > 0) && overlapping(&obj->extents, &rc)) { - for (pCurRect = obj->rects, pRectEnd = pCurRect + - obj->numRects; pCurRect < pRectEnd; pCurRect++) + for (i = region_find_pt( obj, rc.left, rc.top, &ret ); !ret && i < obj->numRects; i++ ) { - if (pCurRect->bottom <= rc.top) + if (obj->rects[i].bottom <= rc.top) continue; /* not far enough down yet */ - if (pCurRect->top >= rc.bottom) + if (obj->rects[i].top >= rc.bottom) break; /* too far down */ - if (pCurRect->right <= rc.left) + if (obj->rects[i].right <= rc.left) continue; /* not far enough over yet */ - if (pCurRect->left >= rc.right) { + if (obj->rects[i].left >= rc.right) continue; - } ret = TRUE; - break; } } GDI_ReleaseObj(hrgn);

1 0

Huw Davies : gdi32: Use a binary search to generate the clipped rects.
by Alexandre Julliard July 7, 2016

July 7, 2016

Module: wine Branch: master Commit: 7fd44a511f1093c79361485ba80e803b272bbb26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fd44a511f1093c79361485ba… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jul 6 11:09:12 2016 +0100 gdi32: Use a binary search to generate the clipped rects. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dibdrv/dc.c | 2 +- dlls/gdi32/gdi_private.h | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 314c651..9bd263c 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -280,7 +280,7 @@ int get_clipped_rects( const dib_info *dib, const RECT *rc, HRGN clip, struct cl if (!(region = get_wine_region( clip ))) return 0; - for (i = 0; i < region->numRects; i++) + for (i = region_find_pt( region, rect.left, rect.top, NULL ); i < region->numRects; i++) { if (region->rects[i].top >= rect.bottom) break; if (!intersect_rect( out, &rect, &region->rects[i] )) continue; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 15e50e1..9c58747 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -370,6 +370,39 @@ static inline void release_wine_region(HRGN rgn) GDI_ReleaseObj(rgn); } +/********************************************************** + * region_find_pt + * + * Return either the index of the rectangle that contains (x,y) or the first + * rectangle after it. Sets *hit to TRUE if the region contains (x,y). + * Note if (x,y) follows all rectangles, then the return value will be rgn->numRects. + */ +static inline int region_find_pt( const WINEREGION *rgn, int x, int y, BOOL *hit ) +{ + int i, start = 0, end = rgn->numRects - 1; + BOOL h = FALSE; + + while (start <= end) + { + i = (start + end) / 2; + + if (rgn->rects[i].bottom <= y || + (rgn->rects[i].top <= y && rgn->rects[i].right <= x)) + start = i + 1; + else if (rgn->rects[i].top > y || + (rgn->rects[i].bottom > y && rgn->rects[i].left > x)) + end = i - 1; + else + { + h = TRUE; + break; + } + } + + if (hit) *hit = h; + return h ? i : start; +} + /* null driver entry points */ extern BOOL nulldrv_AbortPath( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL nulldrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst,

1 0

Jacek Caban : mshtml: Properly handle duplicated names with different DISPIDs in add_func_info.
by Alexandre Julliard July 7, 2016

July 7, 2016

Module: wine Branch: master Commit: c20c47b85ebb59f01e6ddb6a8da264ff465ebf8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c20c47b85ebb59f01e6ddb6a8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 7 12:50:03 2016 +0200 mshtml: Properly handle duplicated names with different DISPIDs in add_func_info. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/dispex.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index d934f56..2013cee 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -231,12 +231,19 @@ static BOOL is_arg_type_supported(VARTYPE vt) static void add_func_info(dispex_data_t *data, tid_t tid, const FUNCDESC *desc, ITypeInfo *dti) { func_info_t *info; + BSTR name; HRESULT hres; + hres = ITypeInfo_GetDocumentation(dti, desc->memid, &name, NULL, NULL, NULL); + if(FAILED(hres)) + return; + for(info = data->funcs; info < data->funcs+data->func_cnt; info++) { - if(info->id == desc->memid) { - if(info->tid != tid) + if(info->id == desc->memid || !strcmpW(info->name, name)) { + if(info->tid != tid) { + SysFreeString(name); return; /* Duplicated in other interface */ + } break; } } @@ -246,16 +253,15 @@ static void add_func_info(dispex_data_t *data, tid_t tid, const FUNCDESC *desc, data->funcs = heap_realloc_zero(data->funcs, (data->func_size <<= 1)*sizeof(func_info_t)); info = data->funcs+data->func_cnt; - hres = ITypeInfo_GetDocumentation(dti, desc->memid, &info->name, NULL, NULL, NULL); - if(FAILED(hres)) - return; - data->func_cnt++; info->id = desc->memid; + info->name = name; info->tid = tid; info->func_disp_idx = -1; info->prop_vt = VT_EMPTY; + }else { + SysFreeString(name); } if(desc->invkind & DISPATCH_METHOD) {

1 0