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

Piotr Caban : oleaut32: Improve ICreateTypeInfo_LayOut implementation.
by Alexandre Julliard 16 Mar '10

16 Mar '10

Module: wine Branch: master Commit: 21846747798e26d0dccfed5e92e28995bfe7f960 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21846747798e26d0dccfed5e9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 15 23:40:31 2010 +0100 oleaut32: Improve ICreateTypeInfo_LayOut implementation. --- dlls/oleaut32/typelib2.c | 30 +++++++++++++++++++++++++++++- 1 files changed, 29 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index 3a92bad..a275845 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -2360,6 +2360,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnLayOut( TRACE("(%p)\n", iface); + /* FIXME: LayOut should be run on all ImplTypes */ if(This->typekind == TKIND_COCLASS) return S_OK; @@ -2429,7 +2430,34 @@ static HRESULT WINAPI ICreateTypeInfo2_fnLayOut( ITypeInfo_Release(cur); } - This->typeinfo->cbSizeVft = (This->typeinfo->datatype2>>16) * 4; + /* Get cbSizeVft of inherited interface */ + /* Makes LayOut running recursively */ + if(This->typeinfo->datatype1 != -1) { + ITypeInfo *cur, *inherited; + TYPEATTR *typeattr; + + hres = ICreateTypeInfo_QueryInterface(iface, &IID_ITypeInfo, (void**)&cur); + if(FAILED(hres)) + return hres; + + hres = ITypeInfo_GetRefTypeInfo(cur, This->typeinfo->datatype1, &inherited); + ITypeInfo_Release(cur); + if(FAILED(hres)) + return hres; + + hres = ITypeInfo_GetTypeAttr(inherited, &typeattr); + if(FAILED(hres)) { + ITypeInfo_Release(inherited); + return hres; + } + + This->typeinfo->cbSizeVft = typeattr->cbSizeVft; + + ITypeInfo_ReleaseTypeAttr(inherited, typeattr); + ITypeInfo_Release(inherited); + } else + This->typeinfo->cbSizeVft = 0; + if(!This->typedata) return S_OK;

1 0

Piotr Caban : oleaut32: Set parameter to NULL in GetMops stub.
by Alexandre Julliard 16 Mar '10

16 Mar '10

Module: wine Branch: master Commit: 914472ab818c3726a0bfa1b86798636a838ec890 URL: http://source.winehq.org/git/wine.git/?a=commit;h=914472ab818c3726a0bfa1b86… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 15 23:40:46 2010 +0100 oleaut32: Set parameter to NULL in GetMops stub. --- dlls/oleaut32/typelib.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 87aba81..c3f5fc2 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -6872,7 +6872,8 @@ static HRESULT WINAPI ITypeInfo_fnGetMops( ITypeInfo2 *iface, MEMBERID memid, BSTR *pBstrMops) { ITypeInfoImpl *This = (ITypeInfoImpl *)iface; - FIXME("(%p) stub!\n", This); + FIXME("(%p %d) stub!\n", This, memid); + *pBstrMops = NULL; return S_OK; }

1 0

Piotr Caban : oleaut32: Improve TypeInfos with changed TypeKind handling.
by Alexandre Julliard 16 Mar '10

16 Mar '10

Module: wine Branch: master Commit: d9fd33e3a9533b0d3afb11e0d67dc8ffea41193f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9fd33e3a9533b0d3afb11e0d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 15 23:38:24 2010 +0100 oleaut32: Improve TypeInfos with changed TypeKind handling. --- dlls/oleaut32/tests/typelib.c | 25 ++++++++++++++++++++++--- dlls/oleaut32/typelib2.c | 31 ++++++++++++++++++++++++------- 2 files changed, 46 insertions(+), 10 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 452ab7d..02a7027 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -1087,6 +1087,9 @@ static void test_CreateTypeLib(void) { ok(hres == S_OK, "got %08x\n", hres); ok(hreftype == 3, "hreftype = %d\n", hreftype); + hres = ITypeInfo_GetRefTypeOfImplType(interface1, -1, &hreftype); + ok(hres == TYPE_E_ELEMENTNOTFOUND, "got %08x\n", hres); + memset(&funcdesc, 0, sizeof(FUNCDESC)); funcdesc.funckind = FUNC_PUREVIRTUAL; funcdesc.invkind = INVOKE_PROPERTYGET; @@ -1237,6 +1240,9 @@ static void test_CreateTypeLib(void) { ok(hres == S_OK, "got %08x\n", hres); ok(hreftype == 2, "hreftype = %d\n", hreftype); + hres = ITypeInfo_GetRefTypeOfImplType(interface2, -1, &hreftype); + ok(hres == TYPE_E_ELEMENTNOTFOUND, "got %08x\n", hres); + hres = ICreateTypeInfo_SetImplTypeFlags(createti, 0, IMPLTYPEFLAG_FDEFAULT); ok(hres == TYPE_E_BADMODULEKIND, "got %08x\n", hres); @@ -1309,6 +1315,9 @@ static void test_CreateTypeLib(void) { ok(hres == S_OK, "got %08x\n", hres); ok(hreftype == 1, "hreftype = %d\n", hreftype); + hres = ITypeInfo_GetRefTypeOfImplType(ti, -1, &hreftype); + ok(hres == TYPE_E_ELEMENTNOTFOUND, "got %08x\n", hres); + ITypeInfo_Release(ti); ICreateTypeInfo_Release(createti); @@ -1316,6 +1325,12 @@ static void test_CreateTypeLib(void) { hres = ICreateTypeLib_CreateTypeInfo(createtl, dualW, TKIND_INTERFACE, &createti); ok(hres == S_OK, "got %08x\n", hres); + hres = ICreateTypeInfo_SetTypeFlags(createti, TYPEFLAG_FDUAL); + ok(hres == S_OK, "got %08x\n", hres); + + hres = ICreateTypeInfo_AddFuncDesc(createti, 0, &funcdesc); + ok(hres == S_OK, "got %08x\n", hres); + hres = ICreateTypeInfo_AddRefTypeInfo(createti, dispatch, &hreftype); ok(hres == S_OK, "got %08x\n", hres); @@ -1329,15 +1344,19 @@ static void test_CreateTypeLib(void) { ok(hres == S_OK, "got %08x\n", hres); ok(typeattr->cbSizeInstance == 4, "cbSizeInstance = %d\n", typeattr->cbSizeInstance); ok(typeattr->typekind == 3, "typekind = %d\n", typeattr->typekind); - ok(typeattr->cFuncs == 0, "cFuncs = %d\n", typeattr->cFuncs); + ok(typeattr->cFuncs == 1, "cFuncs = %d\n", typeattr->cFuncs); ok(typeattr->cVars == 0, "cVars = %d\n", typeattr->cVars); ok(typeattr->cImplTypes == 1, "cImplTypes = %d\n", typeattr->cImplTypes); - ok(typeattr->cbSizeVft == 28, "cbSizeVft = %d\n", typeattr->cbSizeVft); + ok(typeattr->cbSizeVft == 32, "cbSizeVft = %d\n", typeattr->cbSizeVft); ok(typeattr->cbAlignment == 4, "cbAlignment = %d\n", typeattr->cbAlignment); - ok(typeattr->wTypeFlags == TYPEFLAG_FDISPATCHABLE, "wTypeFlags = %d\n", typeattr->wTypeFlags); + ok(typeattr->wTypeFlags == (TYPEFLAG_FDISPATCHABLE|TYPEFLAG_FDUAL), "wTypeFlags = %d\n", typeattr->wTypeFlags); ok(typeattr->wMajorVerNum == 0, "wMajorVerNum = %d\n", typeattr->wMajorVerNum); ok(typeattr->wMinorVerNum == 0, "wMinorVerNum = %d\n", typeattr->wMinorVerNum); + hres = ITypeInfo_GetRefTypeOfImplType(ti, -1, &hreftype); + ok(hres == S_OK, "got %08x\n", hres); + ok(hreftype == -2, "got %08x\n", hreftype); + ITypeInfo_ReleaseTypeAttr(ti, typeattr); ITypeInfo_Release(ti); diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index dd42ab4..99fc07f 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -1640,6 +1640,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddFuncDesc( int *typedata; int i, num_defaults = 0; int decoded_size; + TYPEKIND tkind; HRESULT hres; TRACE("(%p,%d,%p)\n", iface, index, pFuncDesc); @@ -1653,7 +1654,9 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddFuncDesc( pFuncDesc->cParamsOpt, pFuncDesc->oVft, pFuncDesc->cScodes, pFuncDesc->elemdescFunc.tdesc.vt, pFuncDesc->wFuncFlags); - switch(This->typeinfo->typekind&0xf) { + tkind = This->typeinfo->typekind&0x10?TKIND_INTERFACE:This->typeinfo->typekind&0xf; + + switch(tkind) { case TKIND_MODULE: if(pFuncDesc->funckind != FUNC_STATIC) return TYPE_E_BADMODULEKIND; @@ -1814,15 +1817,16 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddImplType( ref->flags = 0; ref->oCustData = -1; ref->onext = -1; - } else if ((This->typeinfo->typekind & 15) == TKIND_DISPATCH) { - FIXME("dispatch case unhandled.\n"); - } else if ((This->typeinfo->typekind & 15) == TKIND_INTERFACE) { + } else if ((This->typeinfo->typekind & 15) == TKIND_INTERFACE || + (This->typeinfo->typekind&0x10)) { if (This->typeinfo->cImplTypes && index==1) return TYPE_E_BADMODULEKIND; if( index != 0) return TYPE_E_ELEMENTNOTFOUND; This->typeinfo->datatype1 = hRefType; + } else if ((This->typeinfo->typekind & 15) == TKIND_DISPATCH) { + FIXME("dispatch case unhandled.\n"); } else { FIXME("AddImplType unsupported on typekind %d\n", This->typeinfo->typekind & 15); return E_OUTOFMEMORY; @@ -2779,7 +2783,10 @@ static HRESULT WINAPI ITypeInfo2_fnGetTypeAttr( (*ppTypeAttr)->lcid = This->typelib->typelib_header.lcid; (*ppTypeAttr)->cbSizeInstance = This->typeinfo->size; - (*ppTypeAttr)->typekind = This->typeinfo->typekind&0xf; + if(This->typeinfo->typekind & 0x10) + (*ppTypeAttr)->typekind = TKIND_INTERFACE; + else + (*ppTypeAttr)->typekind = This->typeinfo->typekind&0xf; (*ppTypeAttr)->cFuncs = This->typeinfo->cElement&0xffff; (*ppTypeAttr)->cVars = This->typeinfo->cElement>>16; (*ppTypeAttr)->cImplTypes = This->typeinfo->cImplTypes; @@ -2872,8 +2879,13 @@ static HRESULT WINAPI ITypeInfo2_fnGetRefTypeOfImplType( return E_INVALIDARG; if(index == -1) { - FIXME("Dual interfaces not handled yet\n"); - return E_NOTIMPL; + if((This->typeinfo->typekind&0xf)==TKIND_DISPATCH + && (This->typeinfo->flags&TYPEFLAG_FDUAL)) { + *pRefType = -2; /* FIXME: is it correct? */ + return S_OK; + } + + return TYPE_E_ELEMENTNOTFOUND; } if(index >= This->typeinfo->cImplTypes) @@ -3014,6 +3026,11 @@ static HRESULT WINAPI ITypeInfo2_fnGetRefTypeInfo( if(!ppTInfo) return E_INVALIDARG; + if(hRefType == -2) { + FIXME("Negative hreftype not handled yet\n"); + return E_NOTIMPL; + } + if(hRefType&1) { ITypeLib *tl; MSFT_ImpInfo *impinfo;

1 0

Piotr Caban : oleaut32: Improve dual interfaces creation in typelib.
by Alexandre Julliard 16 Mar '10

16 Mar '10

Module: wine Branch: master Commit: eb15921ff57ad9577825d1a8857aecf1f30d5c3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb15921ff57ad9577825d1a88… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 15 23:38:40 2010 +0100 oleaut32: Improve dual interfaces creation in typelib. --- dlls/oleaut32/tests/typelib.c | 27 ++++++++-- dlls/oleaut32/typelib2.c | 117 ++++++++++++++++++++++++++++------------- 2 files changed, 104 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=eb15921ff57ad9577825d…

1 0

Piotr Caban : oleaut32: Added ICreateTypeInfo2_SetFuncHelpContext implementation.
by Alexandre Julliard 16 Mar '10

16 Mar '10

Module: wine Branch: master Commit: 3c747fec5024394fc35d5f5321f1f4cc87421f76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c747fec5024394fc35d5f532… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 15 23:38:57 2010 +0100 oleaut32: Added ICreateTypeInfo2_SetFuncHelpContext implementation. --- dlls/oleaut32/tests/typelib.c | 12 ++++++++++++ dlls/oleaut32/typelib2.c | 38 ++++++++++++++++++++++++++++++++++++-- 2 files changed, 48 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 7b1d0fe..0b26e6c 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -1106,6 +1106,9 @@ static void test_CreateTypeLib(void) { hres = ICreateTypeInfo_AddFuncDesc(createti, 0, &funcdesc); ok(hres == S_OK, "got %08x\n", hres); + hres = ICreateTypeInfo_SetFuncHelpContext(createti, 0, 0xabcdefab); + ok(hres == S_OK, "got %08x\n", hres); + funcdesc.invkind = INVOKE_PROPERTYPUT; hres = ICreateTypeInfo_AddFuncDesc(createti, 1, &funcdesc); ok(hres == TYPE_E_INCONSISTENTPROPFUNCS, "got %08x\n", hres); @@ -1126,10 +1129,19 @@ static void test_CreateTypeLib(void) { hres = ICreateTypeInfo_AddFuncDesc(createti, 1, &funcdesc); ok(hres == S_OK, "got %08x\n", hres); + hres = ICreateTypeInfo_SetFuncHelpContext(createti, 1, 0xabcdefab); + ok(hres == S_OK, "got %08x\n", hres); + funcdesc.invkind = INVOKE_PROPERTYPUTREF; hres = ICreateTypeInfo_AddFuncDesc(createti, 0, &funcdesc); ok(hres == S_OK, "got %08x\n", hres); + hres = ICreateTypeInfo_SetFuncHelpContext(createti, 0, 0xabcdefab); + ok(hres == S_OK, "got %08x\n", hres); + + hres = ICreateTypeInfo_SetFuncHelpContext(createti, 0, 0x201); + ok(hres == S_OK, "got %08x\n", hres); + funcdesc.memid = 1; funcdesc.lprgelemdescParam = NULL; funcdesc.invkind = INVOKE_FUNC; diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index d931c45..08f650c 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -2264,8 +2264,42 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetFuncHelpContext( UINT index, DWORD dwHelpContext) { - FIXME("(%p,%d,%d), stub!\n", iface, index, dwHelpContext); - return E_OUTOFMEMORY; + ICreateTypeInfo2Impl *This = (ICreateTypeInfo2Impl *)iface; + CyclicList *func; + int *typedata; + int size; + + TRACE("(%p,%d,%d)\n", iface, index, dwHelpContext); + + if(This->typeinfo->cElement<index) + return TYPE_E_ELEMENTNOTFOUND; + + if(This->typeinfo->cElement == index) + func = This->typedata; + else + for(func=This->typedata->next->next; func!=This->typedata; func=func->next) + if(index-- == 0) + break; + + typedata = func->u.data; + + /* Compute func size without arguments */ + size = typedata[0] - typedata[5]*(typedata[4]&0x1000?16:12); + + /* Allocate memory for HelpContext if needed */ + if(size < 7*sizeof(int)) { + typedata = HeapReAlloc(GetProcessHeap(), 0, typedata, typedata[0]+sizeof(int)); + if(!typedata) + return E_OUTOFMEMORY; + + memmove(&typedata[7], &typedata[6], typedata[0]-sizeof(int)*6); + typedata[0] += sizeof(int); + This->typedata->next->u.val += sizeof(int); + func->u.data = typedata; + } + + typedata[6] = dwHelpContext; + return S_OK; } /******************************************************************************

1 0

Piotr Caban : oleaut32: Fix some reference leaks.
by Alexandre Julliard 16 Mar '10

16 Mar '10

Module: wine Branch: master Commit: e119aceb7cc7e52822b289d8f0c068f7cd43bb06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e119aceb7cc7e52822b289d8f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 15 23:39:15 2010 +0100 oleaut32: Fix some reference leaks. --- dlls/oleaut32/tests/typelib.c | 16 ++++++++-------- dlls/oleaut32/typelib2.c | 40 +++++++++++++++++++++++++++++----------- 2 files changed, 37 insertions(+), 19 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 0b26e6c..b31466e 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -1425,19 +1425,19 @@ static void test_CreateTypeLib(void) { hres = ICreateTypeLib2_SaveAllChanges(createtl); ok(hres == S_OK, "got %08x\n", hres); - ICreateTypeLib2_Release(createtl); hres = LoadTypeLibEx(filenameW, REGKIND_NONE, &tl); ok(hres == S_OK, "got %08x\n", hres); - ITypeInfo_Release(interface2); - ITypeInfo_Release(interface1); - ITypeInfo_Release(dual); - ITypeInfo_Release(dispatch); - ITypeInfo_Release(unknown); + ok(ITypeInfo_Release(interface2)==0, "Object should be freed\n"); + ok(ITypeInfo_Release(interface1)==0, "Object should be freed\n"); + ok(ITypeInfo_Release(dual)==0, "Object should be freed\n"); + ok(ICreateTypeLib2_Release(createtl)==0, "Object should be freed\n"); + ok(ITypeInfo_Release(dispatch)==0, "Object should be freed\n"); + ok(ITypeInfo_Release(unknown)==0, "Object should be freed\n"); - ITypeLib_Release(tl); - ITypeLib_Release(stdole); + ok(ITypeLib_Release(tl)==0, "Object should be freed\n"); + ok(ITypeLib_Release(stdole)==0, "Object should be freed\n"); DeleteFileA(filename); } diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index 08f650c..60b9f73 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -1315,7 +1315,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnQueryInterface( if(*ppvObject) { - ICreateTypeLib2_AddRef(iface); + ICreateTypeInfo2_AddRef(iface); TRACE("-- Interface: (%p)->(%p)\n",ppvObject,*ppvObject); return S_OK; } @@ -1583,8 +1583,10 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddRefTypeInfo( /* Allocate container GUID */ hres = ITypeLib_GetLibAttr(container, &tlibattr); - if(FAILED(hres)) + if(FAILED(hres)) { + ITypeLib_Release(container); return hres; + } guid.guid = tlibattr->guid; guid.hreftype = This->typelib->typelib_guids*12+2; @@ -1593,6 +1595,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddRefTypeInfo( guid_offset = ctl2_alloc_guid(This->typelib, &guid); if(guid_offset == -1) { ITypeLib_ReleaseTLibAttr(container, tlibattr); + ITypeLib_Release(container); return E_OUTOFMEMORY; } @@ -1613,6 +1616,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddRefTypeInfo( || (p=strrchrW(name, '\\'))==NULL) { ERR("Error guessing typelib filename\n"); ITypeLib_ReleaseTLibAttr(container, tlibattr); + ITypeLib_Release(container); return E_NOTIMPL; } memmove(name, p+1, strlenW(p)*sizeof(WCHAR)); @@ -1622,13 +1626,17 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddRefTypeInfo( tlibattr->lcid, tlibattr->wMajorVerNum, tlibattr->wMinorVerNum, name); ITypeLib_ReleaseTLibAttr(container, tlibattr); - if(import_offset == -1) + if(import_offset == -1) { + ITypeLib_Release(container); return E_OUTOFMEMORY; + } /* Allocate referenced guid */ hres = ITypeInfo_GetTypeAttr(pTInfo, &typeattr); - if(FAILED(hres)) + if(FAILED(hres)) { + ITypeLib_Release(container); return hres; + } guid.guid = typeattr->guid; guid.hreftype = This->typelib->typeinfo_guids*12+1; @@ -1636,8 +1644,10 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddRefTypeInfo( ITypeInfo_ReleaseTypeAttr(pTInfo, typeattr); guid_offset = ctl2_alloc_guid(This->typelib, &guid); - if(guid_offset == -1) + if(guid_offset == -1) { + ITypeLib_Release(container); return E_OUTOFMEMORY; + } check_guid = (MSFT_GuidEntry*)&This->typelib->typelib_segment_data[MSFT_SEG_GUID][guid_offset]; if(check_guid->hreftype == guid.hreftype) @@ -2390,15 +2400,17 @@ static HRESULT WINAPI ICreateTypeInfo2_fnLayOut( return hres; hres = ITypeInfo_GetRefTypeInfo(next, hreftype, &cur); + ITypeInfo_Release(next); if(FAILED(hres)) return hres; - ITypeInfo_Release(next); while(1) { hres = ITypeInfo_GetTypeAttr(cur, &typeattr); - if(FAILED(hres)) + if(FAILED(hres)) { + ITypeInfo_Release(cur); return hres; + } if(!memcmp(&typeattr->guid, &IID_IDispatch, sizeof(IDispatch))) This->typeinfo->flags |= TYPEFLAG_FDISPATCHABLE; @@ -2409,16 +2421,21 @@ static HRESULT WINAPI ICreateTypeInfo2_fnLayOut( hres = ITypeInfo_GetRefTypeOfImplType(cur, 0, &hreftype); if(hres == TYPE_E_ELEMENTNOTFOUND) break; - if(FAILED(hres)) + if(FAILED(hres)) { + ITypeInfo_Release(cur); return hres; + } hres = ITypeInfo_GetRefTypeInfo(cur, hreftype, &next); - if(FAILED(hres)) + if(FAILED(hres)) { + ITypeInfo_Release(cur); return hres; + } ITypeInfo_Release(cur); cur = next; } + ITypeInfo_Release(cur); } This->typeinfo->cbSizeVft = (This->typeinfo->datatype2>>16) * 4; @@ -3102,6 +3119,7 @@ static HRESULT WINAPI ITypeInfo2_fnGetRefTypeInfo( if(hRefType==-2 && This->dual) { *ppTInfo = (ITypeInfo*)&This->dual->lpVtblTypeInfo2; + ITypeInfo_AddRef(*ppTInfo); return S_OK; } @@ -3207,7 +3225,7 @@ static HRESULT WINAPI ITypeInfo2_fnGetContainingTypeLib( TRACE("(%p,%p,%p)\n", iface, ppTLib, pIndex); *ppTLib = (ITypeLib *)&This->typelib->lpVtblTypeLib2; - This->typelib->ref++; + ICreateTypeLib_AddRef((ICreateTypeLib*)This->typelib); *pIndex = This->typeinfo->typekind >> 16; return S_OK; @@ -3656,7 +3674,7 @@ static ICreateTypeInfo2 *ICreateTypeInfo2_Constructor(ICreateTypeLib2Impl *typel pCreateTypeInfo2Impl->ref = 1; pCreateTypeInfo2Impl->typelib = typelib; - typelib->ref++; + ICreateTypeLib_AddRef((ICreateTypeLib*)typelib); nameoffset = ctl2_alloc_name(typelib, szName); typeinfo_offset = ctl2_alloc_typeinfo(typelib, nameoffset);

1 0

Henri Verbeet : wined3d: Store the swapchain instead of the surface in the context.
by Alexandre Julliard 16 Mar '10

16 Mar '10

Module: wine Branch: master Commit: 18ec2525a438f75a1e961a19b36dfb3a65fd3cc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18ec2525a438f75a1e961a19b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 15 21:07:25 2010 +0100 wined3d: Store the swapchain instead of the surface in the context. --- dlls/wined3d/arb_program_shader.c | 8 ++-- dlls/wined3d/context.c | 76 ++++++++++++++++++------------------ dlls/wined3d/device.c | 12 ++--- dlls/wined3d/glsl_shader.c | 4 +- dlls/wined3d/swapchain.c | 11 +---- dlls/wined3d/wined3d_private.h | 5 +- 6 files changed, 54 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=18ec2525a438f75a1e961…

1 0

Henri Verbeet : wined3d: Use the context' s window handle in stretch_rect_fbo().
by Alexandre Julliard 16 Mar '10

16 Mar '10

Module: wine Branch: master Commit: 7b0b16fafeb80a9df0e813f07b7c775f56daaa98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b0b16fafeb80a9df0e813f07… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 15 21:07:26 2010 +0100 wined3d: Use the context's window handle in stretch_rect_fbo(). --- dlls/wined3d/device.c | 30 ++++++------------------------ 1 files changed, 6 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index fb10c3e..5dfc560 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5425,19 +5425,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_DeletePatch(IWineD3DDevice *iface, UINT return WINED3DERR_INVALIDCALL; } -static IWineD3DSwapChain *get_swapchain(IWineD3DSurface *target) { - HRESULT hr; - IWineD3DSwapChain *swapchain; - - hr = IWineD3DSurface_GetContainer(target, &IID_IWineD3DSwapChain, (void **)&swapchain); - if (SUCCEEDED(hr)) { - IWineD3DSwapChain_Release((IUnknown *)swapchain); - return swapchain; - } - - return NULL; -} - static void color_fill_fbo(IWineD3DDevice *iface, IWineD3DSurface *surface, const WINED3DRECT *rect, const float color[4]) { @@ -5827,7 +5814,6 @@ void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, WINED { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; GLbitfield mask = GL_COLOR_BUFFER_BIT; /* TODO: Support blitting depth/stencil surfaces */ - IWineD3DSwapChain *src_swapchain, *dst_swapchain; const struct wined3d_gl_info *gl_info; struct wined3d_context *context; GLenum gl_filter; @@ -5857,12 +5843,8 @@ void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, WINED IWineD3DSurface_LoadLocation(src_surface, SFLAG_INDRAWABLE, NULL); IWineD3DSurface_LoadLocation(dst_surface, SFLAG_INDRAWABLE, NULL); - /* Attach src surface to src fbo */ - src_swapchain = get_swapchain(src_surface); - dst_swapchain = get_swapchain(dst_surface); - - if (src_swapchain) context = context_acquire(This, src_surface, CTXUSAGE_RESOURCELOAD); - else if (dst_swapchain) context = context_acquire(This, dst_surface, CTXUSAGE_RESOURCELOAD); + if (!surface_is_offscreen(src_surface)) context = context_acquire(This, src_surface, CTXUSAGE_RESOURCELOAD); + else if (!surface_is_offscreen(dst_surface)) context = context_acquire(This, dst_surface, CTXUSAGE_RESOURCELOAD); else context = context_acquire(This, NULL, CTXUSAGE_RESOURCELOAD); gl_info = context->gl_info; @@ -5876,8 +5858,8 @@ void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, WINED if(buffer == GL_FRONT) { RECT windowsize; UINT h; - ClientToScreen(((IWineD3DSwapChainImpl *)src_swapchain)->win_handle, &offset); - GetClientRect(((IWineD3DSwapChainImpl *)src_swapchain)->win_handle, &windowsize); + ClientToScreen(context->win_handle, &offset); + GetClientRect(context->win_handle, &windowsize); h = windowsize.bottom - windowsize.top; src_rect->x1 -= offset.x; src_rect->x2 -=offset.x; src_rect->y1 = offset.y + h - src_rect->y1; @@ -5912,8 +5894,8 @@ void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, WINED if(buffer == GL_FRONT) { RECT windowsize; UINT h; - ClientToScreen(((IWineD3DSwapChainImpl *)dst_swapchain)->win_handle, &offset); - GetClientRect(((IWineD3DSwapChainImpl *)dst_swapchain)->win_handle, &windowsize); + ClientToScreen(context->win_handle, &offset); + GetClientRect(context->win_handle, &windowsize); h = windowsize.bottom - windowsize.top; dst_rect->x1 -= offset.x; dst_rect->x2 -=offset.x; dst_rect->y1 = offset.y + h - dst_rect->y1;

1 0

Henri Verbeet : wined3d: Use the context' s window handle in IWineD3DSurfaceImpl_BltOverride().
by Alexandre Julliard 16 Mar '10

16 Mar '10

Module: wine Branch: master Commit: 0ae49c35fbb63e9f3b3d9cbbe3ccb7e60b783f7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ae49c35fbb63e9f3b3d9cbbe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 15 21:07:27 2010 +0100 wined3d: Use the context's window handle in IWineD3DSurfaceImpl_BltOverride(). --- dlls/wined3d/surface.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 5f5be60..74c84bd 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3973,8 +3973,8 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, const RECT windowsize; POINT offset = {0,0}; UINT h; - ClientToScreen(dstSwapchain->win_handle, &offset); - GetClientRect(dstSwapchain->win_handle, &windowsize); + ClientToScreen(context->win_handle, &offset); + GetClientRect(context->win_handle, &windowsize); h = windowsize.bottom - windowsize.top; rect.x1 -= offset.x; rect.x2 -=offset.x; rect.y1 -= offset.y; rect.y2 -=offset.y;

1 0

Henri Verbeet : wined3d: The swapchain should always have a window handle.
by Alexandre Julliard 16 Mar '10

16 Mar '10

Module: wine Branch: master Commit: d6bbe90b859f304741a2fbecf081d71b93c0e885 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6bbe90b859f304741a2fbecf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 15 21:07:28 2010 +0100 wined3d: The swapchain should always have a window handle. --- dlls/wined3d/device.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 5dfc560..dc1cf29 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6625,7 +6625,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Reset(IWineD3DDevice* iface, WINED3DPRE IWineD3DDevice_SetDisplayMode(iface, 0, &mode); - if(swapchain->win_handle && !pPresentationParameters->Windowed) { + if (!pPresentationParameters->Windowed) + { if(swapchain->presentParms.Windowed) { /* switch from windowed to fs */ swapchain_setup_fullscreen_window(swapchain, pPresentationParameters->BackBufferWidth, @@ -6636,7 +6637,9 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Reset(IWineD3DDevice* iface, WINED3DPRE pPresentationParameters->BackBufferWidth, pPresentationParameters->BackBufferHeight, TRUE); } - } else if(swapchain->win_handle && !swapchain->presentParms.Windowed) { + } + else if (!swapchain->presentParms.Windowed) + { /* Fullscreen -> windowed switch */ swapchain_restore_fullscreen_window(swapchain); }

1 0