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

David Hedberg : include: Add some new TreeView messages and extended style defines.
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: e4cf1466eda01625bec50de6d5628337d929f6ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4cf1466eda01625bec50de6d… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Sat Jul 17 17:11:36 2010 +0200 include: Add some new TreeView messages and extended style defines. --- include/commctrl.h | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/include/commctrl.h b/include/commctrl.h index 56f0029..d3a4de1 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -2342,6 +2342,12 @@ static const WCHAR WC_TREEVIEWW[] = { 'S','y','s', #define TVM_GETUNICODEFORMAT CCM_GETUNICODEFORMAT #define TVM_MAPACCIDTOHTREEITEM (TV_FIRST + 42) #define TVM_MAPHTREEITEMTOACCID (TV_FIRST + 43) +#define TVM_SETEXTENDEDSTYLE (TV_FIRST + 44) +#define TVM_GETEXTENDEDSTYLE (TV_FIRST + 45) +#define TVM_SETAUTOSCROLLINFO (TV_FIRST + 59) +#define TVM_GETSELECTEDCOUNT (TV_FIRST + 70) +#define TVM_SHOWINFOTIP (TV_FIRST + 71) +#define TVM_GETITEMPARTRECT (TV_FIRST + 72) #define TVN_FIRST (0U-400U) @@ -2411,6 +2417,8 @@ static const WCHAR WC_TREEVIEWW[] = { 'S','y','s', #define TVIF_SELECTEDIMAGE 0x0020 #define TVIF_CHILDREN 0x0040 #define TVIF_INTEGRAL 0x0080 +#define TVIF_STATEEX 0x0100 +#define TVIF_EXPANDEDIMAGE 0x0200 #define TVIF_DI_SETITEM 0x1000 #define TVI_ROOT ((HTREEITEM)-65536) @@ -2430,6 +2438,11 @@ static const WCHAR WC_TREEVIEWW[] = { 'S','y','s', #define TVIS_STATEIMAGEMASK 0xf000 #define TVIS_USERMASK 0xf000 +#define TVIS_EX_FLAT 0x0001 +#define TVIS_EX_DISABLED 0x0002 +/* TVIS_EX_HWND is listed on MSDN but apparently not in any header. */ +#define TVIS_EX_ALL 0x0002 + #define TVHT_NOWHERE 0x0001 #define TVHT_ONITEMICON 0x0002 #define TVHT_ONITEMLABEL 0x0004

1 0

Paul Vriens : atl/tests: Skip tests if function is not implemented.
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: 13a7ecff57a21caf402a48837c0d1fa734b9bbd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13a7ecff57a21caf402a48837… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Jul 19 13:14:51 2010 +0200 atl/tests: Skip tests if function is not implemented. --- dlls/atl/tests/atl_ax.c | 28 ++++++++++++++++++++-------- 1 files changed, 20 insertions(+), 8 deletions(-) diff --git a/dlls/atl/tests/atl_ax.c b/dlls/atl/tests/atl_ax.c index 8b9966c..d17046d 100644 --- a/dlls/atl/tests/atl_ax.c +++ b/dlls/atl/tests/atl_ax.c @@ -36,7 +36,14 @@ #include <ocidl.h> #include <exdisp.h> -HRESULT WINAPI AtlAxAttachControl(IUnknown *, HWND, IUnknown **); +static HRESULT (WINAPI *pAtlAxAttachControl)(IUnknown *, HWND, IUnknown **); + +static void init_function_pointers(void) +{ + HMODULE hatl = GetModuleHandleA("atl.dll"); + + pAtlAxAttachControl = (void *)GetProcAddress(hatl, "AtlAxAttachControl"); +} static ATOM register_class(void) { @@ -64,16 +71,16 @@ static void test_AtlAxAttachControl(void) HRESULT hr; IUnknown *pObj, *pContainer; - hr = AtlAxAttachControl(NULL, NULL, NULL); + hr = pAtlAxAttachControl(NULL, NULL, NULL); ok(hr == E_INVALIDARG, "Expected AtlAxAttachControl to return E_INVALIDARG, got 0x%08x\n", hr); pContainer = (IUnknown *)0xdeadbeef; - hr = AtlAxAttachControl(NULL, NULL, &pContainer); + hr = pAtlAxAttachControl(NULL, NULL, &pContainer); ok(hr == E_INVALIDARG, "Expected AtlAxAttachControl to return E_INVALIDARG, got 0x%08x\n", hr); ok(pContainer == (IUnknown *)0xdeadbeef, "Expected the output container pointer to be untouched, got %p\n", pContainer); - hr = AtlAxAttachControl(NULL, hwnd, NULL); + hr = pAtlAxAttachControl(NULL, hwnd, NULL); ok(hr == E_INVALIDARG, "Expected AtlAxAttachControl to return E_INVALIDARG, got 0x%08x\n", hr); hr = CoCreateInstance(&CLSID_WebBrowser, NULL, CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, @@ -86,12 +93,12 @@ static void test_AtlAxAttachControl(void) return; } - hr = AtlAxAttachControl(pObj, NULL, NULL); + hr = pAtlAxAttachControl(pObj, NULL, NULL); todo_wine ok(hr == S_FALSE, "Expected AtlAxAttachControl to return S_FALSE, got 0x%08x\n", hr); pContainer = (IUnknown *)0xdeadbeef; - hr = AtlAxAttachControl(pObj, NULL, &pContainer); + hr = pAtlAxAttachControl(pObj, NULL, &pContainer); todo_wine ok(hr == S_FALSE, "Expected AtlAxAttachControl to return S_FALSE, got 0x%08x\n", hr); ok(pContainer != (IUnknown *)0xdeadbeef && @@ -101,7 +108,7 @@ static void test_AtlAxAttachControl(void) if (pContainer != (IUnknown *)0xdeadbeef && pContainer != NULL) IUnknown_Release(pContainer); - hr = AtlAxAttachControl(pObj, hwnd, NULL); + hr = pAtlAxAttachControl(pObj, hwnd, NULL); ok(hr == S_OK, "Expected AtlAxAttachControl to return S_OK, got 0x%08x\n", hr); IUnknown_Release(pObj); @@ -111,12 +118,17 @@ static void test_AtlAxAttachControl(void) START_TEST(atl_ax) { + init_function_pointers(); + if (!register_class()) return; CoInitialize(NULL); - test_AtlAxAttachControl(); + if (pAtlAxAttachControl) + test_AtlAxAttachControl(); + else + win_skip("AtlAxAttachControl is not available\n"); CoUninitialize(); }

1 0

Greg Geldorp : msvcrt/tests: ecvt on Win9x and NT4 will corrupt memory if nrdigits < 0.
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: 913c91fd470f08342f2c07bbaee6cab362e55d3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=913c91fd470f08342f2c07bba… Author: Greg Geldorp <ggeldorp(a)vmware.com> Date: Mon Jul 19 13:24:53 2010 +0200 msvcrt/tests: ecvt on Win9x and NT4 will corrupt memory if nrdigits < 0. --- dlls/msvcrt/tests/printf.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index 19e21f9..4386bf1 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -713,6 +713,8 @@ static void test_fcvt(void) ok( 0 == sign, "sign wrong\n"); } +/* Don't test nrdigits < 0, msvcrt on Win9x and NT4 will corrupt memory by + * writing outside allocated memory */ static struct { double value; int nrdigits; @@ -725,7 +727,6 @@ static struct { { 45.0, 2, "45", "4500", 2, 2, 0 }, /* Numbers less than 1.0 with different precisions */ { 0.0001, 1, "1", "", -3, -3, 0 }, - { 0.0001, -10, "", "", -3, -3, 0 }, { 0.0001, 10,"1000000000", "1000000", -3, -3, 0 }, /* Basic sign test */ { -111.0001, 5, "11100", "11100010", 3, 3, 1 },

1 0

Paul Chitescu : t2embed: Forward several stdcall-decorated names to existing undecorated stubs.
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: d067814127c332e3b62e7896b963f678d2fc46e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d067814127c332e3b62e7896b… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Mon Jul 19 14:53:33 2010 +0300 t2embed: Forward several stdcall-decorated names to existing undecorated stubs. --- dlls/t2embed/t2embed.spec | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/t2embed/t2embed.spec b/dlls/t2embed/t2embed.spec index 12f8a6a..2566fa2 100644 --- a/dlls/t2embed/t2embed.spec +++ b/dlls/t2embed/t2embed.spec @@ -15,10 +15,10 @@ @ stub _TTEmbedFontFromFileA(a)52 @ stub _TTEnableEmbeddingForFacename(a)8 @ stub _TTGetEmbeddedFontInfo(a)28 -@ stub _TTGetEmbeddingType(a)8 -@ stub _TTIsEmbeddingEnabled(a)8 +@ stdcall _TTGetEmbeddingType(a)8(ptr ptr) TTGetEmbeddingType +@ stdcall _TTIsEmbeddingEnabled(a)8(ptr ptr) TTIsEmbeddingEnabled @ stub _TTIsEmbeddingEnabledForFacename(a)8 -@ stub _TTLoadEmbeddedFont(a)40 +@ stdcall _TTLoadEmbeddedFont(a)40(ptr long ptr long ptr ptr ptr wstr str ptr) TTLoadEmbeddedFont @ stub _TTRunValidationTests(a)8 @ stub TTEmbedFontEx @ stub TTRunValidationTestsEx

1 0

Detlef Riekenberg : winhelp.exe16: Add missing separator after command name .
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: 115bf743b86ec2d702161f93c38afcf3dda92b7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=115bf743b86ec2d702161f93c… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Jul 18 20:24:31 2010 +0200 winhelp.exe16: Add missing separator after command name. --- programs/winhelp.exe16/winhelp.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winhelp.exe16/winhelp.c b/programs/winhelp.exe16/winhelp.c index 6bfa3f6..f255d91 100644 --- a/programs/winhelp.exe16/winhelp.c +++ b/programs/winhelp.exe16/winhelp.c @@ -31,11 +31,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(winhelp); */ WORD WINAPI WinMain16( HINSTANCE16 inst, HINSTANCE16 prev, LPSTR cmdline, WORD show ) { - int len = GetSystemDirectoryA( NULL, 0 ) + sizeof("\\winhlp32.exe") + strlen(cmdline); + int len = GetSystemDirectoryA( NULL, 0 ) + sizeof("\\winhlp32.exe ") + strlen(cmdline); char *buffer = HeapAlloc( GetProcessHeap(), 0, len ); GetSystemDirectoryA( buffer, len ); - strcat( buffer, "\\winhlp32.exe" ); + strcat( buffer, "\\winhlp32.exe " ); strcat( buffer, cmdline ); WINE_TRACE( "starting %s\n", wine_dbgstr_a(buffer) );

1 0

Henri Verbeet : ddraw: Avoid some forward declarations.
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: 16b3f17f872d4803f5edbb479e30deba85beffe7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16b3f17f872d4803f5edbb479… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 19 12:47:56 2010 +0200 ddraw: Avoid some forward declarations. --- dlls/ddraw/ddraw.c | 314 +++++++++++++++++++++++++--------------------------- 1 files changed, 149 insertions(+), 165 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=16b3f17f872d4803f5edb…

1 0

Henri Verbeet : ddraw: Get rid of the useless "ddraw_owner" fields.
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: f461b39b765712561a6b0a83bb167ec509c170e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f461b39b765712561a6b0a83b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 19 12:47:57 2010 +0200 ddraw: Get rid of the useless "ddraw_owner" fields. --- dlls/ddraw/clipper.c | 6 ++---- dlls/ddraw/ddraw.c | 1 - dlls/ddraw/ddraw_private.h | 3 +-- dlls/ddraw/surface.c | 10 +++------- 4 files changed, 6 insertions(+), 14 deletions(-) diff --git a/dlls/ddraw/clipper.c b/dlls/ddraw/clipper.c index 4fa4c36..a8a3242 100644 --- a/dlls/ddraw/clipper.c +++ b/dlls/ddraw/clipper.c @@ -254,19 +254,17 @@ static HRESULT WINAPI IDirectDrawClipperImpl_GetHWnd( static HRESULT WINAPI IDirectDrawClipperImpl_Initialize( LPDIRECTDRAWCLIPPER iface, LPDIRECTDRAW lpDD, DWORD dwFlags ) { - IDirectDrawImpl* pOwner; IDirectDrawClipperImpl *This = (IDirectDrawClipperImpl *)iface; TRACE("(%p)->(%p,0x%08x)\n", This, lpDD, dwFlags); EnterCriticalSection(&ddraw_cs); - if (This->ddraw_owner != NULL) + if (This->initialized) { LeaveCriticalSection(&ddraw_cs); return DDERR_ALREADYINITIALIZED; } - pOwner = lpDD ? ddraw_from_ddraw1(lpDD) : NULL; - This->ddraw_owner = pOwner; + This->initialized = TRUE; LeaveCriticalSection(&ddraw_cs); return DD_OK; diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 69c663a..05c8c62 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -3041,7 +3041,6 @@ IDirectDrawImpl_CreatePalette(IDirectDraw7 *iface, object->lpVtbl = &IDirectDrawPalette_Vtbl; object->ref = 1; - object->ddraw_owner = This; hr = IWineD3DDevice_CreatePalette(This->wineD3DDevice, Flags, ColorTable, &object->wineD3DPalette, (IUnknown *)object); diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 1cb3070..3de8668 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -469,7 +469,7 @@ struct IDirectDrawClipperImpl LONG ref; IWineD3DClipper *wineD3DClipper; - IDirectDrawImpl *ddraw_owner; + BOOL initialized; }; extern const IDirectDrawClipperVtbl IDirectDrawClipper_Vtbl DECLSPEC_HIDDEN; @@ -489,7 +489,6 @@ struct IDirectDrawPaletteImpl IWineD3DPalette *wineD3DPalette; /* IDirectDrawPalette fields */ - IDirectDrawImpl *ddraw_owner; IUnknown *ifaceToRelease; }; extern const IDirectDrawPaletteVtbl IDirectDrawPalette_Vtbl DECLSPEC_HIDDEN; diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index e64ef3a..e8372ba 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1676,14 +1676,10 @@ IDirectDrawSurfaceImpl_GetSurfaceDesc(IDirectDrawSurface7 *iface, * DDERR_ALREADYINITIALIZED * *****************************************************************************/ -static HRESULT WINAPI -IDirectDrawSurfaceImpl_Initialize(IDirectDrawSurface7 *iface, - IDirectDraw *DD, - DDSURFACEDESC2 *DDSD) +static HRESULT WINAPI IDirectDrawSurfaceImpl_Initialize(IDirectDrawSurface7 *iface, + IDirectDraw *ddraw, DDSURFACEDESC2 *surface_desc) { - IDirectDrawSurfaceImpl *This = (IDirectDrawSurfaceImpl *)iface; - IDirectDrawImpl *ddimpl = DD ? ddraw_from_ddraw1(DD) : NULL; - TRACE("(%p)->(%p,%p)\n",This,ddimpl,DDSD); + TRACE("iface %p, ddraw %p, surface_desc %p.\n", iface, ddraw, surface_desc); return DDERR_ALREADYINITIALIZED; }

1 0

Henri Verbeet : ddraw: Get rid of some dead code.
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: 5bf9dd902c1a040b63e6a6dfddc56cb6dbb08e8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bf9dd902c1a040b63e6a6dfd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 19 12:47:58 2010 +0200 ddraw: Get rid of some dead code. --- dlls/ddraw/surface_thunks.c | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-) diff --git a/dlls/ddraw/surface_thunks.c b/dlls/ddraw/surface_thunks.c index d235ff9..be57c3b 100644 --- a/dlls/ddraw/surface_thunks.c +++ b/dlls/ddraw/surface_thunks.c @@ -150,16 +150,6 @@ EnumCallback(LPDIRECTDRAWSURFACE7 iface, LPDDSURFACEDESC2 pDDSD, { const struct callback_info* info = context; -#if 0 - /* This is an outgoing conversion so we have to do it. */ - DDSURFACEDESC ddsd; - memset(&ddsd, 0, sizeof(ddsd)); - ddsd.dwSize = sizeof(ddsd); - DDRAW_Convert_DDSURFACEDESC_2_To_1(pDDSD, &ddsd); -#endif - - /* the LPDDSURFACEDESC2 -> LPDDSURFACEDESC coercion is safe, since - * the data format is compatible with older enum procs */ return info->callback(iface ? (IDirectDrawSurface *)&((IDirectDrawSurfaceImpl *)iface)->IDirectDrawSurface3_vtbl : NULL, (LPDDSURFACEDESC)pDDSD, info->context);

1 0

Henri Verbeet : ddraw: The surface isn' t allowed to be NULL in EnumSurfacesCallbackThunk() and EnumCallback().
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: 1edda50c03cfce6f6f1e79fbbab88e41c1441b21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1edda50c03cfce6f6f1e79fbb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 19 12:47:59 2010 +0200 ddraw: The surface isn't allowed to be NULL in EnumSurfacesCallbackThunk() and EnumCallback(). --- dlls/ddraw/ddraw_thunks.c | 5 ++--- dlls/ddraw/surface_thunks.c | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/ddraw_thunks.c b/dlls/ddraw/ddraw_thunks.c index 28991d1..2c205e9 100644 --- a/dlls/ddraw/ddraw_thunks.c +++ b/dlls/ddraw/ddraw_thunks.c @@ -578,9 +578,8 @@ EnumSurfacesCallbackThunk(LPDIRECTDRAWSURFACE7 pSurf, LPDDSURFACEDESC2 pDDSD, /* This coercion is safe, since the IDirectDrawSurface3 vtable has the * IDirectDrawSurface vtable layout at the beginning */ - return cbcontext->func( - pSurf ? (IDirectDrawSurface *)&((IDirectDrawSurfaceImpl *)pSurf)->IDirectDrawSurface3_vtbl : NULL, - (LPDDSURFACEDESC)pDDSD, cbcontext->context); + return cbcontext->func((IDirectDrawSurface *)&((IDirectDrawSurfaceImpl *)pSurf)->IDirectDrawSurface3_vtbl, + (DDSURFACEDESC *)pDDSD, cbcontext->context); } static HRESULT WINAPI diff --git a/dlls/ddraw/surface_thunks.c b/dlls/ddraw/surface_thunks.c index be57c3b..6df6dcd 100644 --- a/dlls/ddraw/surface_thunks.c +++ b/dlls/ddraw/surface_thunks.c @@ -150,9 +150,8 @@ EnumCallback(LPDIRECTDRAWSURFACE7 iface, LPDDSURFACEDESC2 pDDSD, { const struct callback_info* info = context; - return info->callback(iface ? - (IDirectDrawSurface *)&((IDirectDrawSurfaceImpl *)iface)->IDirectDrawSurface3_vtbl : NULL, - (LPDDSURFACEDESC)pDDSD, info->context); + return info->callback((IDirectDrawSurface *)&((IDirectDrawSurfaceImpl *)iface)->IDirectDrawSurface3_vtbl, + (DDSURFACEDESC *)pDDSD, info->context); } static HRESULT WINAPI

1 0

Andrew Eikum : oleaut32: Don't fail if member is missing in ITypeComp::Bind .
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: 3173305e887775624d46f7cc65283723886930c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3173305e887775624d46f7cc6… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Jul 16 12:27:27 2010 -0500 oleaut32: Don't fail if member is missing in ITypeComp::Bind. --- dlls/oleaut32/tests/typelib.c | 12 ++++++++++++ dlls/oleaut32/typelib.c | 6 +++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index ff7defb..5487632 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -107,6 +107,7 @@ static void test_TypeComp(void) static WCHAR wszOLE_COLOR[] = {'O','L','E','_','C','O','L','O','R',0}; static WCHAR wszClone[] = {'C','l','o','n','e',0}; static WCHAR wszclone[] = {'c','l','o','n','e',0}; + static WCHAR wszJunk[] = {'J','u','n','k',0}; hr = LoadTypeLib(wszStdOle2, &pTypeLib); ok_ole_success(hr, LoadTypeLib); @@ -282,6 +283,17 @@ static void test_TypeComp(void) ITypeInfo_ReleaseFuncDesc(pTypeInfo, bindptr.lpfuncdesc); ITypeInfo_Release(pTypeInfo); + /* tests non-existent members */ + desckind = 0xdeadbeef; + bindptr.lptcomp = (ITypeComp*)0xdeadbeef; + pTypeInfo = (ITypeInfo*)0xdeadbeef; + ulHash = LHashValOfNameSys(SYS_WIN32, LOCALE_NEUTRAL, wszJunk); + hr = ITypeComp_Bind(pTypeComp, wszJunk, ulHash, 0, &pTypeInfo, &desckind, &bindptr); + ok_ole_success(hr, ITypeComp_Bind); + ok(desckind == DESCKIND_NONE, "desckind should have been DESCKIND_NONE, was: %d\n", desckind); + ok(pTypeInfo == NULL, "pTypeInfo should have been NULL, was: %p\n", pTypeInfo); + ok(bindptr.lptcomp == NULL, "bindptr should have been NULL, was: %p\n", bindptr.lptcomp); + ITypeComp_Release(pTypeComp); ITypeInfo_Release(pFontTypeInfo); ITypeLib_Release(pTypeLib); diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 7a56e93..b310a4b 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -7654,9 +7654,9 @@ static HRESULT WINAPI ITypeComp_fnBind( ITypeInfoImpl *This = info_impl_from_ITypeComp(iface); const TLBFuncDesc *pFDesc; const TLBVarDesc *pVDesc; - HRESULT hr = DISP_E_MEMBERNOTFOUND; + HRESULT hr = S_OK; - TRACE("(%s, %x, 0x%x, %p, %p, %p)\n", debugstr_w(szName), lHash, wFlags, ppTInfo, pDescKind, pBindPtr); + TRACE("(%p)->(%s, %x, 0x%x, %p, %p, %p)\n", This, debugstr_w(szName), lHash, wFlags, ppTInfo, pDescKind, pBindPtr); *pDescKind = DESCKIND_NONE; pBindPtr->lpfuncdesc = NULL; @@ -7716,7 +7716,7 @@ static HRESULT WINAPI ITypeComp_fnBind( } WARN("Could not search inherited interface!\n"); } - WARN("did not find member with name %s, flags 0x%x!\n", debugstr_w(szName), wFlags); + TRACE("did not find member with name %s, flags 0x%x\n", debugstr_w(szName), wFlags); return hr; }

1 0