March 2020 - Wine-commits - list.winehq.org

Francois Gouget : testbot/LogUtils: Highlight the failed -Werror build status lines.
by Alexandre Julliard 27 Mar '20

27 Mar '20

Module: tools Branch: master Commit: 6529a06300ed400d4910a319d947978fb980e8bb URL: https://source.winehq.org/git/tools.git/?a=commit;h=6529a06300ed400d4910a31… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 25 23:43:58 2020 +0100 testbot/LogUtils: Highlight the failed -Werror build status lines. The compiler errors are already highlighted. But in case the Wine build really fails they will be shown twice: once with -Werror and once without. The -Werror build status line will show where the first build errors end and the second build errors start. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 99c30e0..77837fb 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -280,6 +280,10 @@ sub ParseTaskLog($) { $LogInfo->{$1} = "updated"; } + elsif ($Line =~ /^Task: With -Werror the .* Wine build fails/) + { + ; # Show these non-fatal build errors + } elsif ($Line =~ /^Task: / or _IsPerlError($Line)) { $LogInfo->{Task} = "failed";

1 0

Nikolay Sivov : mfreadwrite: Move Sink Writer stubs to separate file.
by Alexandre Julliard 26 Mar '20

26 Mar '20

Module: wine Branch: master Commit: 120505ed6b590daea11486a512dd563600d0329f URL: https://source.winehq.org/git/wine.git/?a=commit;h=120505ed6b590daea11486a5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 26 22:09:54 2020 +0300 mfreadwrite: Move Sink Writer stubs to separate file. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/Makefile.in | 3 +- dlls/mfreadwrite/mf_private.h | 22 ++++ dlls/mfreadwrite/{main.c => reader.c} | 209 +----------------------------- dlls/mfreadwrite/writer.c | 237 ++++++++++++++++++++++++++++++++++ 4 files changed, 263 insertions(+), 208 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=120505ed6b590daea114…

1 0

Zebediah Figura : winegstreamer: Also clear the pixel-aspect-ratio field in amt_to_gst_caps_video().
by Alexandre Julliard 26 Mar '20

26 Mar '20

Module: wine Branch: master Commit: 5814d193730766f4c0a34017a7b8594573612917 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5814d193730766f4c0a34017… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 26 12:04:31 2020 -0500 winegstreamer: Also clear the pixel-aspect-ratio field in amt_to_gst_caps_video(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 412aab2a3b..b489c36f96 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -407,11 +407,12 @@ static GstCaps *amt_to_gst_caps_video(const AM_MEDIA_TYPE *mt) gst_video_info_set_format(&info, format, vih->bmiHeader.biWidth, vih->bmiHeader.biHeight); if ((caps = gst_video_info_to_caps(&info))) { - /* Clear the framerate; we don't actually care about it. (Yes, - * VIDEOINFOHEADER has an AvgTimePerFrame field, but that shouldn't - * matter for checking compatible caps.) */ + /* Clear some fields that shouldn't prevent us from connecting. */ for (i = 0; i < gst_caps_get_size(caps); ++i) + { gst_structure_remove_field(gst_caps_get_structure(caps, i), "framerate"); + gst_structure_remove_field(gst_caps_get_structure(caps, i), "pixel-aspect-ratio"); + } } return caps; }

1 0

Zebediah Figura : strmbase: Support FORMAT_VideoInfo2 in strmbase_dump_media_type().
by Alexandre Julliard 26 Mar '20

26 Mar '20

Module: wine Branch: master Commit: c713b2958f758b47db6292290759aa9a462bbc89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c713b2958f758b47db629229… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 26 14:55:33 2020 -0500 strmbase: Support FORMAT_VideoInfo2 in strmbase_dump_media_type(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/mediatype.c | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/dlls/strmbase/mediatype.c b/dlls/strmbase/mediatype.c index 64035b5e6b..c2560352aa 100644 --- a/dlls/strmbase/mediatype.c +++ b/dlls/strmbase/mediatype.c @@ -20,6 +20,7 @@ */ #include "strmbase_private.h" +#include "dvdmedia.h" WINE_DEFAULT_DEBUG_CHANNEL(strmbase); @@ -103,9 +104,34 @@ void strmbase_dump_media_type(const AM_MEDIA_TYPE *mt) { VIDEOINFOHEADER *vih = (VIDEOINFOHEADER *)mt->pbFormat; - TRACE("source %s, target %s, bitrate %u, error rate %u, %s sec/frame, ", - wine_dbgstr_rect(&vih->rcSource), wine_dbgstr_rect(&vih->rcTarget), - vih->dwBitRate, vih->dwBitErrorRate, debugstr_time(vih->AvgTimePerFrame)); + if (!IsRectEmpty(&vih->rcSource)) TRACE("source %s, ", wine_dbgstr_rect(&vih->rcSource)); + if (!IsRectEmpty(&vih->rcTarget)) TRACE("target %s, ", wine_dbgstr_rect(&vih->rcTarget)); + if (vih->dwBitRate) TRACE("bitrate %u, ", vih->dwBitRate); + if (vih->dwBitErrorRate) TRACE("error rate %u, ", vih->dwBitErrorRate); + TRACE("%s sec/frame, ", debugstr_time(vih->AvgTimePerFrame)); + TRACE("size %dx%d, %u planes, %u bpp, compression %s, image size %u", + vih->bmiHeader.biWidth, vih->bmiHeader.biHeight, vih->bmiHeader.biPlanes, + vih->bmiHeader.biBitCount, debugstr_fourcc(vih->bmiHeader.biCompression), + vih->bmiHeader.biSizeImage); + if (vih->bmiHeader.biXPelsPerMeter || vih->bmiHeader.biYPelsPerMeter) + TRACE(", resolution %dx%d", vih->bmiHeader.biXPelsPerMeter, vih->bmiHeader.biYPelsPerMeter); + if (vih->bmiHeader.biClrUsed) TRACE(", %d colours", vih->bmiHeader.biClrUsed); + if (vih->bmiHeader.biClrImportant) TRACE(", %d important colours", vih->bmiHeader.biClrImportant); + TRACE(".\n"); + } + else if (IsEqualGUID(&mt->formattype, &FORMAT_VideoInfo2) && mt->cbFormat >= sizeof(VIDEOINFOHEADER2)) + { + VIDEOINFOHEADER2 *vih = (VIDEOINFOHEADER2 *)mt->pbFormat; + + if (!IsRectEmpty(&vih->rcSource)) TRACE("source %s, ", wine_dbgstr_rect(&vih->rcSource)); + if (!IsRectEmpty(&vih->rcTarget)) TRACE("target %s, ", wine_dbgstr_rect(&vih->rcTarget)); + if (vih->dwBitRate) TRACE("bitrate %u, ", vih->dwBitRate); + if (vih->dwBitErrorRate) TRACE("error rate %u, ", vih->dwBitErrorRate); + TRACE("%s sec/frame, ", debugstr_time(vih->AvgTimePerFrame)); + if (vih->dwInterlaceFlags) TRACE("interlace flags %#x, ", vih->dwInterlaceFlags); + if (vih->dwCopyProtectFlags) TRACE("copy-protection flags %#x, ", vih->dwCopyProtectFlags); + TRACE("aspect ratio %u/%u, ", vih->dwPictAspectRatioX, vih->dwPictAspectRatioY); + if (vih->u.dwControlFlags) TRACE("control flags %#x, ", vih->u.dwControlFlags); TRACE("size %dx%d, %u planes, %u bpp, compression %s, image size %u", vih->bmiHeader.biWidth, vih->bmiHeader.biHeight, vih->bmiHeader.biPlanes, vih->bmiHeader.biBitCount, debugstr_fourcc(vih->bmiHeader.biCompression),

1 0

Zebediah Figura : strmbase: Strip trailing zeroes in debugstr_time().
by Alexandre Julliard 26 Mar '20

26 Mar '20

Module: wine Branch: master Commit: 7e226781fabb773ef2f45055aa571755c8ea28c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e226781fabb773ef2f45055… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 26 12:08:46 2020 -0500 strmbase: Strip trailing zeroes in debugstr_time(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/strmbase_private.h | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/strmbase/strmbase_private.h b/dlls/strmbase/strmbase_private.h index e0628c13a1..0a23592bd2 100644 --- a/dlls/strmbase/strmbase_private.h +++ b/dlls/strmbase/strmbase_private.h @@ -47,6 +47,7 @@ static inline const char *debugstr_time(REFERENCE_TIME time) if (time < 0) buffer[i++] = '-'; while (i--) rev[j++] = buffer[i]; + while (rev[j-1] == '0' && rev[j-2] != '.') --j; rev[j] = 0; return wine_dbg_sprintf("%s", rev);

1 0

Zebediah Figura : mf: Strip trailing zeroes in debugstr_time().
by Alexandre Julliard 26 Mar '20

26 Mar '20

Module: wine Branch: master Commit: ad9c30a1ad2773da2bfe8adf16a535daf2de040b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad9c30a1ad2773da2bfe8adf… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 26 12:09:17 2020 -0500 mf: Strip trailing zeroes in debugstr_time(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/mf_private.h | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mf/mf_private.h b/dlls/mf/mf_private.h index dd8f49e1bc..14f7288c9b 100644 --- a/dlls/mf/mf_private.h +++ b/dlls/mf/mf_private.h @@ -72,6 +72,7 @@ static inline const char *debugstr_time(LONGLONG time) if (time < 0) buffer[i++] = '-'; while (i--) rev[j++] = buffer[i]; + while (rev[j-1] == '0' && rev[j-2] != '.') --j; rev[j] = 0; return wine_dbg_sprintf("%s", rev);

1 0

Zebediah Figura : mfplat: Strip trailing zeroes in debugstr_time().
by Alexandre Julliard 26 Mar '20

26 Mar '20

Module: wine Branch: master Commit: 920715108f12cc6a71a56cafdf41390e7d316a8c URL: https://source.winehq.org/git/wine.git/?a=commit;h=920715108f12cc6a71a56caf… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 26 12:09:18 2020 -0500 mfplat: Strip trailing zeroes in debugstr_time(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mfplat_private.h | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mfplat/mfplat_private.h b/dlls/mfplat/mfplat_private.h index 0f1c5479e6..5c696ccc42 100644 --- a/dlls/mfplat/mfplat_private.h +++ b/dlls/mfplat/mfplat_private.h @@ -198,6 +198,7 @@ static inline const char *debugstr_time(LONGLONG time) if (time < 0) buffer[i++] = '-'; while (i--) rev[j++] = buffer[i]; + while (rev[j-1] == '0' && rev[j-2] != '.') --j; rev[j] = 0; return wine_dbg_sprintf("%s", rev);

1 0

Zebediah Figura : quartz: Strip trailing zeroes in debugstr_time().
by Alexandre Julliard 26 Mar '20

26 Mar '20

Module: wine Branch: master Commit: be4b34590805d37fef3970da370cb0dfbf464962 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be4b34590805d37fef3970da… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 26 12:08:45 2020 -0500 quartz: Strip trailing zeroes in debugstr_time(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/quartz_private.h | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/quartz/quartz_private.h b/dlls/quartz/quartz_private.h index 1812b1c37e..946daeb484 100644 --- a/dlls/quartz/quartz_private.h +++ b/dlls/quartz/quartz_private.h @@ -51,6 +51,7 @@ static inline const char *debugstr_time(REFERENCE_TIME time) if (time < 0) buffer[i++] = '-'; while (i--) rev[j++] = buffer[i]; + while (rev[j-1] == '0' && rev[j-2] != '.') --j; rev[j] = 0; return wine_dbg_sprintf("%s", rev);

1 0

Jacek Caban : rpcrt4: Fix use after free in get_iface_info.
by Alexandre Julliard 26 Mar '20

26 Mar '20

Module: wine Branch: master Commit: bfab009e67338d3f6b0142c55ec3383a5147f6a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bfab009e67338d3f6b0142c5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 26 20:54:05 2020 +0100 rpcrt4: Fix use after free in get_iface_info. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/ndr_typelib.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/rpcrt4/ndr_typelib.c b/dlls/rpcrt4/ndr_typelib.c index 91c4a07464..f1f25885b7 100644 --- a/dlls/rpcrt4/ndr_typelib.c +++ b/dlls/rpcrt4/ndr_typelib.c @@ -1276,18 +1276,18 @@ static HRESULT get_iface_info(ITypeInfo *typeinfo, WORD *funcs, WORD *parentfunc if (FAILED(hr)) goto err; hr = ITypeInfo_GetRefTypeInfo(*real_typeinfo, reftype, &parentinfo); - if (SUCCEEDED(hr)) - { - hr = ITypeInfo_GetTypeAttr(parentinfo, &typeattr); - ITypeInfo_Release(parentinfo); - } if (FAILED(hr)) goto err; - *parentiid = typeattr->guid; - ITypeInfo_ReleaseTypeAttr(parentinfo, typeattr); - - return S_OK; + hr = ITypeInfo_GetTypeAttr(parentinfo, &typeattr); + if (SUCCEEDED(hr)) + { + *parentiid = typeattr->guid; + ITypeInfo_ReleaseTypeAttr(parentinfo, typeattr); + } + ITypeInfo_Release(parentinfo); + if (SUCCEEDED(hr)) + return hr; err: ITypeInfo_Release(*real_typeinfo);

1 0

Jacek Caban : oleaut32: Fix handling dual interfaces in ITypeInfo::GetRefTypeInfo.
by Alexandre Julliard 26 Mar '20

26 Mar '20

Module: wine Branch: master Commit: 8fac69ba50d957599869d6a62355efaf0f68f182 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8fac69ba50d957599869d6a6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 26 20:54:17 2020 +0100 oleaut32: Fix handling dual interfaces in ITypeInfo::GetRefTypeInfo. Based on patch by Puetz Kevin. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/tmarshal.idl | 23 ++++++++++++++++ dlls/oleaut32/tests/typelib.c | 58 +++++++++++++++++++++++++++++++++++++-- dlls/oleaut32/typelib.c | 59 ++++++++++++++++++++++++---------------- 3 files changed, 114 insertions(+), 26 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.idl b/dlls/oleaut32/tests/tmarshal.idl index 9182def313..a594f9137d 100644 --- a/dlls/oleaut32/tests/tmarshal.idl +++ b/dlls/oleaut32/tests/tmarshal.idl @@ -582,4 +582,27 @@ cpp_quote("struct Coclass3 { ICoclass1 *iface; };") interface ItestIF7; } + [ + object, + uuid(ec236d8e-2cc7-44f2-b394-46c86ff3da74), + dual, + oleautomation + ] + interface ItestIF12 : IDispatch + { + [id(0x1234)] HRESULT fn4([in] int a); + [id(0x1235)] HRESULT fn5([in] int a); + } + + [ + object, + uuid(f711b105-554d-4751-818c-56fcc5d7c0d5), + dual, + oleautomation + ] + interface ItestIF13 : ItestIF12 + { + [id(0x1236)] HRESULT fn6([in] GUID a); + } + }; diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 75f8d78f07..5e5b44a034 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -1577,7 +1577,7 @@ static void test_inheritance(void) { HRESULT hr; ITypeLib *pTL; - ITypeInfo *pTI, *pTI_p; + ITypeInfo *pTI, *pTI_p, *dual_ti; TYPEATTR *pTA; HREFTYPE href; FUNCDESC *pFD; @@ -1720,7 +1720,7 @@ static void test_inheritance(void) hr = ITypeInfo_GetTypeAttr(pTI, &pTA); ok(hr == S_OK, "hr %08x\n", hr); ok(pTA->typekind == TKIND_DISPATCH, "kind %04x\n", pTA->typekind); - ok(pTA->cbSizeVft == 7 * sizeof(void *), "sizevft %d\n", pTA->cbSizeVft); + ok(pTA->cbSizeVft == sizeof(IDispatchVtbl), "sizevft %d\n", pTA->cbSizeVft); ok(pTA->wTypeFlags == TYPEFLAG_FDISPATCHABLE, "typeflags %x\n", pTA->wTypeFlags); ok(pTA->cFuncs == 3, "cfuncs %d\n", pTA->cFuncs); ok(pTA->cImplTypes == 1, "cimpltypes %d\n", pTA->cImplTypes); @@ -1815,6 +1815,60 @@ static void test_inheritance(void) ITypeInfo_ReleaseFuncDesc(pTI, pFD); ITypeInfo_Release(pTI); + /* ItestIF13 is dual with inherited dual ifaces */ + hr = ITypeLib_GetTypeInfoOfGuid(pTL, &IID_ItestIF13, &pTI); + ok(hr == S_OK, "hr %08x\n", hr); + + hr = ITypeInfo_GetTypeAttr(pTI, &pTA); + ok(hr == S_OK, "hr %08x\n", hr); + ok(pTA->typekind == TKIND_DISPATCH, "kind %04x\n", pTA->typekind); + ok(pTA->cbSizeVft == 7 * sizeof(void *), "sizevft %d\n", pTA->cbSizeVft); + ok(pTA->wTypeFlags == (TYPEFLAG_FDISPATCHABLE|TYPEFLAG_FDUAL), "typeflags %x\n", pTA->wTypeFlags); + ok(pTA->cFuncs == 10, "cfuncs %d\n", pTA->cFuncs); + ok(pTA->cImplTypes == 1, "cimpltypes %d\n", pTA->cImplTypes); + ITypeInfo_ReleaseTypeAttr(pTI, pTA); + + hr = ITypeInfo_GetRefTypeOfImplType(pTI, 0, &href); + ok(hr == S_OK, "hr %08x\n", hr); + hr = ITypeInfo_GetRefTypeInfo(pTI, href, &pTI_p); + ok(hr == S_OK, "hr %08x\n", hr); + hr = ITypeInfo_GetTypeAttr(pTI_p, &pTA); + ok(hr == S_OK, "got %08x\n", hr); + ok(IsEqualGUID(&pTA->guid, &IID_IDispatch), "guid %s\n", wine_dbgstr_guid(&pTA->guid)); + ITypeInfo_ReleaseTypeAttr(pTI_p, pTA); + + hr = ITypeInfo_GetFuncDesc(pTI, 9, &pFD); + ok(hr == S_OK, "hr %08x\n", hr); + ok(pFD->memid == 0x1236, "memid %08x\n", pFD->memid); + ITypeInfo_ReleaseFuncDesc(pTI, pFD); + + hr = ITypeInfo_GetRefTypeInfo(pTI, -2, &dual_ti); + ok(hr == S_OK, "hr %08x\n", hr); + + hr = ITypeInfo_GetTypeAttr(dual_ti, &pTA); + ok(hr == S_OK, "hr %08x\n", hr); + ok(pTA->typekind == TKIND_INTERFACE, "kind %04x\n", pTA->typekind); + ok(pTA->cbSizeVft == sizeof(ItestIF13Vtbl), "sizevft %d\n", pTA->cbSizeVft); + ok(pTA->wTypeFlags == (TYPEFLAG_FDISPATCHABLE|TYPEFLAG_FOLEAUTOMATION|TYPEFLAG_FDUAL), "typeflags %x\n", pTA->wTypeFlags); + ok(pTA->cFuncs == 1, "cfuncs %d\n", pTA->cFuncs); + ok(pTA->cImplTypes == 1, "cimpltypes %d\n", pTA->cImplTypes); + ITypeInfo_ReleaseTypeAttr(dual_ti, pTA); + + hr = ITypeInfo_GetRefTypeOfImplType(dual_ti, 0, &href); + ok(hr == S_OK, "hr %08x\n", hr); + hr = ITypeInfo_GetRefTypeInfo(dual_ti, href, &pTI_p); + ok(hr == S_OK, "hr %08x\n", hr); + hr = ITypeInfo_GetTypeAttr(pTI_p, &pTA); + ok(hr == S_OK, "got %08x\n", hr); + ok(pTA->typekind == TKIND_INTERFACE, "kind %04x\n", pTA->typekind); + ok(pTA->cbSizeVft == sizeof(ItestIF12Vtbl), "sizevft %d\n", pTA->cbSizeVft); + ok(IsEqualGUID(&pTA->guid, &IID_ItestIF12), "guid %s\n", wine_dbgstr_guid(&pTA->guid)); + ITypeInfo_ReleaseTypeAttr(pTI_p, pTA); + ITypeInfo_Release(pTI_p); + + ITypeInfo_Release(dual_ti); + ITypeInfo_Release(pTI); + ITypeLib_Release(pTL); return; diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 68c31e1d88..f8d7136834 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -7911,7 +7911,10 @@ static HRESULT WINAPI ITypeInfo_fnGetRefTypeInfo( ITypeInfo **ppTInfo) { ITypeInfoImpl *This = impl_from_ITypeInfo2(iface); + ITypeInfo *type_info = NULL; HRESULT result = E_FAIL; + TLBRefType *ref_type; + UINT i; if(!ppTInfo) return E_INVALIDARG; @@ -7944,32 +7947,32 @@ static HRESULT WINAPI ITypeInfo_fnGetRefTypeInfo( * refcount goes to zero, but we need to signal to the new instance to * not free its data structures when it is destroyed */ pTypeInfoImpl->not_attached_to_typelib = TRUE; - ITypeInfo_AddRef(*ppTInfo); - result = S_OK; - } else if ((hRefType & DISPATCH_HREF_MASK) && - (This->typeattr.typekind == TKIND_DISPATCH)) - { - HREFTYPE href_dispatch = hRefType; - result = ITypeInfoImpl_GetDispatchRefTypeInfo((ITypeInfo *)iface, &href_dispatch, ppTInfo); - } else { - TLBRefType *ref_type; - ITypeLib *pTLib = NULL; - UINT i; + TRACE("got dual interface %p\n", *ppTInfo); + return S_OK; + } - if(!(hRefType & 0x1)){ - for(i = 0; i < This->pTypeLib->TypeInfoCount; ++i) + if ((hRefType & DISPATCH_HREF_MASK) && (This->typeattr.typekind == TKIND_DISPATCH)) + return ITypeInfoImpl_GetDispatchRefTypeInfo((ITypeInfo *)iface, &hRefType, ppTInfo); + + if(!(hRefType & 0x1)) + { + for(i = 0; i < This->pTypeLib->TypeInfoCount; ++i) + { + if (This->pTypeLib->typeinfos[i]->hreftype == (hRefType&(~0x3))) { - if (This->pTypeLib->typeinfos[i]->hreftype == (hRefType&(~0x3))) - { - result = S_OK; - *ppTInfo = (ITypeInfo*)&This->pTypeLib->typeinfos[i]->ITypeInfo2_iface; - ITypeInfo_AddRef(*ppTInfo); - goto end; - } + result = S_OK; + type_info = (ITypeInfo*)&This->pTypeLib->typeinfos[i]->ITypeInfo2_iface; + ITypeInfo_AddRef(type_info); + break; } } + } + + if (!type_info) + { + ITypeLib *pTLib = NULL; LIST_FOR_EACH_ENTRY(ref_type, &This->pTypeLib->ref_list, TLBRefType, entry) { @@ -7979,7 +7982,7 @@ static HRESULT WINAPI ITypeInfo_fnGetRefTypeInfo( if(&ref_type->entry == &This->pTypeLib->ref_list) { FIXME("Can't find pRefType for ref %x\n", hRefType); - goto end; + return E_FAIL; } if(ref_type->pImpTLInfo == TLB_REF_INTERNAL) { @@ -8057,15 +8060,23 @@ static HRESULT WINAPI ITypeInfo_fnGetRefTypeInfo( } if(SUCCEEDED(result)) { if(ref_type->index == TLB_REF_USE_GUID) - result = ITypeLib_GetTypeInfoOfGuid(pTLib, TLB_get_guid_null(ref_type->guid), ppTInfo); + result = ITypeLib_GetTypeInfoOfGuid(pTLib, TLB_get_guid_null(ref_type->guid), &type_info); else - result = ITypeLib_GetTypeInfo(pTLib, ref_type->index, ppTInfo); + result = ITypeLib_GetTypeInfo(pTLib, ref_type->index, &type_info); } if (pTLib != NULL) ITypeLib_Release(pTLib); + if (FAILED(result)) + { + WARN("(%p) failed hreftype 0x%04x\n", This, hRefType); + return result; + } } -end: + if ((hRefType & 0x2) && SUCCEEDED(ITypeInfo_GetRefTypeInfo(type_info, -2, ppTInfo))) + ITypeInfo_Release(type_info); + else *ppTInfo = type_info; + TRACE("(%p) hreftype 0x%04x loaded %s (%p)\n", This, hRefType, SUCCEEDED(result)? "SUCCESS":"FAILURE", *ppTInfo); return result;

1 0