wine-commits May 2013

wine-commits@winehq.org

2 participants
498 discussions

Dmitry Timoshkov : kernel32: Fix a typo.
by Alexandre Julliard 29 May '13

29 May '13

Module: wine Branch: master Commit: 495c1c0086b59ebcd84caace1d630f4ad2c5e11f URL: http://source.winehq.org/git/wine.git/?a=commit;h=495c1c0086b59ebcd84caace1… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed May 29 10:39:54 2013 +0900 kernel32: Fix a typo. --- dlls/kernel32/tests/process.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 350c858..64e333e 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -1612,8 +1612,8 @@ static void test_GetProcessVersion(void) si.cb = sizeof(si); si.dwFlags = STARTF_USESHOWWINDOW; si.wShowWindow = SW_HIDE; - ret = CreateProcessA(NULL, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); SetLastError(0xdeadbeef); + ret = CreateProcessA(NULL, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); ok(ret, "CreateProcess error %u\n", GetLastError()); SetLastError(0xdeadbeef);

1 0

Andrew Eikum : oleaut32: Implement ICreateTypeInfo::SetFuncHelpContext.
by Alexandre Julliard 29 May '13

29 May '13

Module: wine Branch: master Commit: aec4504c8ad60b1c3830debd11e0b3e4ceaf4bba URL: http://source.winehq.org/git/wine.git/?a=commit;h=aec4504c8ad60b1c3830debd1… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue May 28 17:00:36 2013 -0500 oleaut32: Implement ICreateTypeInfo::SetFuncHelpContext. --- dlls/oleaut32/typelib.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 9b84c06..922e9ab 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -8888,8 +8888,16 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetFuncHelpContext(ICreateTypeInfo2 *if UINT index, DWORD helpContext) { ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface); - FIXME("%p %u %d - stub\n", This, index, helpContext); - return E_NOTIMPL; + TLBFuncDesc *func_desc = &This->funcdescs[index]; + + TRACE("%p %u %d\n", This, index, helpContext); + + if(index >= This->TypeAttr.cFuncs) + return TYPE_E_ELEMENTNOTFOUND; + + func_desc->helpcontext = helpContext; + + return S_OK; } static HRESULT WINAPI ICreateTypeInfo2_fnSetVarHelpContext(ICreateTypeInfo2 *iface,

1 0

Andrew Eikum : oleaut32: Implement ICreateTypeInfo::AddFuncDesc.
by Alexandre Julliard 29 May '13

29 May '13

Module: wine Branch: master Commit: 479ffebf40ab43fc32df90ef41a4606f9c63c6e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=479ffebf40ab43fc32df90ef4… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue May 28 17:00:29 2013 -0500 oleaut32: Implement ICreateTypeInfo::AddFuncDesc. --- dlls/oleaut32/typelib.c | 156 ++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 148 insertions(+), 8 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 827b6b4..9b84c06 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -1697,7 +1697,12 @@ static TLBParDesc *TLBParDesc_Constructor(UINT n) return ret; } -static TLBFuncDesc *TLBFuncDesc_Constructor(UINT n) +static void TLBFuncDesc_Constructor(TLBFuncDesc *func_desc) +{ + list_init(&func_desc->custdata_list); +} + +static TLBFuncDesc *TLBFuncDesc_Alloc(UINT n) { TLBFuncDesc *ret; @@ -1706,7 +1711,7 @@ static TLBFuncDesc *TLBFuncDesc_Constructor(UINT n) return NULL; while(n){ - list_init(&ret[n-1].custdata_list); + TLBFuncDesc_Constructor(&ret[n-1]); --n; } @@ -2093,7 +2098,7 @@ MSFT_DoFuncs(TLBContext* pcx, MSFT_ReadLEDWords(&infolen, sizeof(INT), pcx, offset); - *pptfd = TLBFuncDesc_Constructor(cFuncs); + *pptfd = TLBFuncDesc_Alloc(cFuncs); ptfd = *pptfd; for ( i = 0; i < cFuncs ; i++ ) { @@ -3725,7 +3730,7 @@ static void SLTG_DoFuncs(char *pBlk, char *pFirstItem, ITypeInfoImpl *pTI, unsigned short i; TLBFuncDesc *pFuncDesc; - pTI->funcdescs = TLBFuncDesc_Constructor(cFuncs); + pTI->funcdescs = TLBFuncDesc_Alloc(cFuncs); pFuncDesc = pTI->funcdescs; for(pFunc = (SLTG_Function*)pFirstItem, i = 0; i < cFuncs && pFunc != (SLTG_Function*)0xFFFF; @@ -5339,6 +5344,27 @@ static HRESULT TLB_CopyElemDesc( const ELEMDESC *src, ELEMDESC *dest, char **buf return S_OK; } +static HRESULT TLB_SanitizeBSTR(BSTR str) +{ + UINT len = SysStringLen(str), i; + for (i = 0; i < len; ++i) + if (str[i] > 0x7f) + str[i] = '?'; + return S_OK; +} + +static HRESULT TLB_SanitizeVariant(VARIANT *var) +{ + if (V_VT(var) == VT_INT) + return VariantChangeType(var, var, 0, VT_I4); + else if (V_VT(var) == VT_UINT) + return VariantChangeType(var, var, 0, VT_UI4); + else if (V_VT(var) == VT_BSTR) + return TLB_SanitizeBSTR(V_BSTR(var)); + + return S_OK; +} + static void TLB_FreeElemDesc( ELEMDESC *elemdesc ) { if (elemdesc->u.paramdesc.wParamFlags & PARAMFLAG_FHASDEFAULT) @@ -5369,6 +5395,8 @@ static HRESULT TLB_AllocAndInitFuncDesc( const FUNCDESC *src, FUNCDESC **dest_pt dest->funckind = FUNC_DISPATCH; buffer = (char *)(dest + 1); + dest->oVft = dest->oVft & 0xFFFC; + if (dest->cScodes) { dest->lprgscode = (SCODE *)buffer; memcpy(dest->lprgscode, src->lprgscode, sizeof(*src->lprgscode) * src->cScodes); @@ -6713,7 +6741,7 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( if (FAILED(hres)) goto func_fail; /* FIXME: we don't free changed types here */ } - hres = DispCallFunc(pIUnk, func_desc->oVft, func_desc->callconv, + hres = DispCallFunc(pIUnk, func_desc->oVft & 0xFFFC, func_desc->callconv, V_VT(&varresult), func_desc->cParams, rgvt, prgpvarg, &varresult); @@ -7885,7 +7913,7 @@ HRESULT WINAPI CreateDispTypeInfo( pTIIface->TypeAttr.wTypeFlags = 0; pTIIface->hreftype = 0; - pTIIface->funcdescs = TLBFuncDesc_Constructor(pidata->cMembers); + pTIIface->funcdescs = TLBFuncDesc_Alloc(pidata->cMembers); pFuncDesc = pTIIface->funcdescs; for(func = 0; func < pidata->cMembers; func++) { METHODDATA *md = pidata->pmethdata + func; @@ -8578,8 +8606,120 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddFuncDesc(ICreateTypeInfo2 *iface, UINT index, FUNCDESC *funcDesc) { ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface); - FIXME("%p %u %p - stub\n", This, index, funcDesc); - return E_NOTIMPL; + TLBFuncDesc tmp_func_desc, *func_desc; + int buf_size, i; + char *buffer; + HRESULT hres; + + TRACE("%p %u %p\n", This, index, funcDesc); + + if (!funcDesc || funcDesc->oVft & 3) + return E_INVALIDARG; + + switch (This->TypeAttr.typekind) { + case TKIND_MODULE: + if (funcDesc->funckind != FUNC_STATIC) + return TYPE_E_BADMODULEKIND; + break; + case TKIND_DISPATCH: + if (funcDesc->funckind != FUNC_DISPATCH) + return TYPE_E_BADMODULEKIND; + break; + default: + if (funcDesc->funckind != FUNC_PUREVIRTUAL) + return TYPE_E_BADMODULEKIND; + } + + if (index > This->TypeAttr.cFuncs) + return TYPE_E_ELEMENTNOTFOUND; + + if (funcDesc->invkind & (INVOKE_PROPERTYPUT | INVOKE_PROPERTYPUTREF) && + !funcDesc->cParams) + return TYPE_E_INCONSISTENTPROPFUNCS; + + memset(&tmp_func_desc, 0, sizeof(tmp_func_desc)); + TLBFuncDesc_Constructor(&tmp_func_desc); + + tmp_func_desc.funcdesc = *funcDesc; + + if (tmp_func_desc.funcdesc.oVft != 0) + tmp_func_desc.funcdesc.oVft |= 1; + + if (funcDesc->cScodes) { + tmp_func_desc.funcdesc.lprgscode = heap_alloc(sizeof(SCODE) * funcDesc->cScodes); + memcpy(tmp_func_desc.funcdesc.lprgscode, funcDesc->lprgscode, sizeof(SCODE) * funcDesc->cScodes); + } else + tmp_func_desc.funcdesc.lprgscode = NULL; + + buf_size = TLB_SizeElemDesc(&funcDesc->elemdescFunc); + for (i = 0; i < funcDesc->cParams; ++i) { + buf_size += sizeof(ELEMDESC); + buf_size += TLB_SizeElemDesc(funcDesc->lprgelemdescParam + i); + } + tmp_func_desc.funcdesc.lprgelemdescParam = heap_alloc(buf_size); + buffer = (char*)(tmp_func_desc.funcdesc.lprgelemdescParam + funcDesc->cParams); + + hres = TLB_CopyElemDesc(&funcDesc->elemdescFunc, &tmp_func_desc.funcdesc.elemdescFunc, &buffer); + if (FAILED(hres)) { + heap_free(tmp_func_desc.funcdesc.lprgelemdescParam); + heap_free(tmp_func_desc.funcdesc.lprgscode); + return hres; + } + + for (i = 0; i < funcDesc->cParams; ++i) { + hres = TLB_CopyElemDesc(funcDesc->lprgelemdescParam + i, + tmp_func_desc.funcdesc.lprgelemdescParam + i, &buffer); + if (FAILED(hres)) { + heap_free(tmp_func_desc.funcdesc.lprgelemdescParam); + heap_free(tmp_func_desc.funcdesc.lprgscode); + return hres; + } + if (tmp_func_desc.funcdesc.lprgelemdescParam[i].u.paramdesc.wParamFlags & PARAMFLAG_FHASDEFAULT && + tmp_func_desc.funcdesc.lprgelemdescParam[i].tdesc.vt != VT_VARIANT && + tmp_func_desc.funcdesc.lprgelemdescParam[i].tdesc.vt != VT_USERDEFINED){ + hres = TLB_SanitizeVariant(&tmp_func_desc.funcdesc.lprgelemdescParam[i].u.paramdesc.pparamdescex->varDefaultValue); + if (FAILED(hres)) { + heap_free(tmp_func_desc.funcdesc.lprgelemdescParam); + heap_free(tmp_func_desc.funcdesc.lprgscode); + return hres; + } + } + } + + tmp_func_desc.pParamDesc = TLBParDesc_Constructor(funcDesc->cParams); + + if (This->funcdescs) { + This->funcdescs = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, This->funcdescs, + sizeof(TLBFuncDesc) * (This->TypeAttr.cFuncs + 1)); + + if (index < This->TypeAttr.cFuncs) { + memmove(This->funcdescs + index + 1, This->funcdescs + index, + (This->TypeAttr.cFuncs - index) * sizeof(TLBFuncDesc)); + func_desc = This->funcdescs + index; + } else + func_desc = This->funcdescs + This->TypeAttr.cFuncs; + + /* move custdata lists to the new memory location */ + for(i = 0; i < This->TypeAttr.cFuncs + 1; ++i){ + if(index != i){ + TLBFuncDesc *fd = &This->funcdescs[i]; + if(fd->custdata_list.prev == fd->custdata_list.next) + list_init(&fd->custdata_list); + else{ + fd->custdata_list.prev->next = &fd->custdata_list; + fd->custdata_list.next->prev = &fd->custdata_list; + } + } + } + } else + func_desc = This->funcdescs = heap_alloc(sizeof(TLBFuncDesc)); + + memcpy(func_desc, &tmp_func_desc, sizeof(tmp_func_desc)); + list_init(&func_desc->custdata_list); + + ++This->TypeAttr.cFuncs; + + return S_OK; } static HRESULT WINAPI ICreateTypeInfo2_fnAddImplType(ICreateTypeInfo2 *iface,

1 0

Andrew Eikum : oleaut32: Improve TYPEFLAG_FDUAL handling.
by Alexandre Julliard 29 May '13

29 May '13

Module: wine Branch: master Commit: 8c6984ab7a509b95116710b29b533c5da6947af7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c6984ab7a509b95116710b29… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue May 28 17:00:18 2013 -0500 oleaut32: Improve TYPEFLAG_FDUAL handling. --- dlls/oleaut32/typelib.c | 91 +++++++++++++++++++++++++++++------------------ 1 files changed, 56 insertions(+), 35 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index c5a8e8d..827b6b4 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5730,11 +5730,10 @@ static HRESULT WINAPI ITypeInfo_fnGetRefTypeOfImplType( /* only valid on dual interfaces; retrieve the associated TKIND_INTERFACE handle for the current TKIND_DISPATCH */ - if( This->TypeAttr.typekind != TKIND_DISPATCH) return E_INVALIDARG; if (This->TypeAttr.wTypeFlags & TYPEFLAG_FDUAL) { - *pRefType = -1; + *pRefType = -2; } else { @@ -7083,44 +7082,44 @@ static HRESULT WINAPI ITypeInfo_fnGetRefTypeInfo( if(!ppTInfo) return E_INVALIDARG; - if ((This->hreftype != -1) && (This->hreftype == hRefType)) - { - *ppTInfo = (ITypeInfo *)&This->ITypeInfo2_iface; - ITypeInfo_AddRef(*ppTInfo); - result = S_OK; - } - else if (hRefType == -1 && - (This->TypeAttr.typekind == TKIND_DISPATCH) && - (This->TypeAttr.wTypeFlags & TYPEFLAG_FDUAL)) - { - /* when we meet a DUAL dispinterface, we must create the interface - * version of it. - */ - ITypeInfoImpl *pTypeInfoImpl = ITypeInfoImpl_Constructor(); - + if ((INT)hRefType < 0) { + ITypeInfoImpl *pTypeInfoImpl; - /* the interface version contains the same information as the dispinterface - * copy the contents of the structs. - */ - *pTypeInfoImpl = *This; - pTypeInfoImpl->ref = 0; + if (!(This->TypeAttr.wTypeFlags & TYPEFLAG_FDUAL) || + !(This->TypeAttr.typekind == TKIND_INTERFACE || + This->TypeAttr.typekind == TKIND_DISPATCH)) + return TYPE_E_ELEMENTNOTFOUND; - /* change the type to interface */ - pTypeInfoImpl->TypeAttr.typekind = TKIND_INTERFACE; + /* when we meet a DUAL typeinfo, we must create the alternate + * version of it. + */ + pTypeInfoImpl = ITypeInfoImpl_Constructor(); - *ppTInfo = (ITypeInfo*) pTypeInfoImpl; + *pTypeInfoImpl = *This; + pTypeInfoImpl->ref = 0; - /* the AddRef implicitly adds a reference to the parent typelib, which - * stops the copied data from being destroyed until the new typeinfo's - * 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; + if (This->TypeAttr.typekind == TKIND_INTERFACE) + pTypeInfoImpl->TypeAttr.typekind = TKIND_DISPATCH; + else + pTypeInfoImpl->TypeAttr.typekind = TKIND_INTERFACE; - ITypeInfo_AddRef(*ppTInfo); + *ppTInfo = (ITypeInfo *)&pTypeInfoImpl->ITypeInfo2_iface; + /* the AddRef implicitly adds a reference to the parent typelib, which + * stops the copied data from being destroyed until the new typeinfo's + * 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; - result = S_OK; + ITypeInfo_AddRef(*ppTInfo); - } else if ((hRefType != -1) && (hRefType & DISPATCH_HREF_MASK) && + result = S_OK; + } + else if (This->hreftype == hRefType) + { + *ppTInfo = (ITypeInfo *)&This->ITypeInfo2_iface; + ITypeInfo_AddRef(*ppTInfo); + result = S_OK; + } else if ((hRefType & DISPATCH_HREF_MASK) && (This->TypeAttr.typekind == TKIND_DISPATCH)) { HREFTYPE href_dispatch = hRefType; @@ -8399,8 +8398,27 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetTypeFlags(ICreateTypeInfo2 *iface, TRACE("%p %x\n", This, typeFlags); - if (typeFlags & TYPEFLAG_FDUAL) - typeFlags |= TYPEFLAG_FDISPATCHABLE; + if (typeFlags & TYPEFLAG_FDUAL) { + static const WCHAR stdole2tlb[] = { 's','t','d','o','l','e','2','.','t','l','b',0 }; + ITypeLib *stdole; + ITypeInfo *dispatch; + HREFTYPE hreftype; + HRESULT hres; + + hres = LoadTypeLib(stdole2tlb, &stdole); + if(FAILED(hres)) + return hres; + + hres = ITypeLib_GetTypeInfoOfGuid(stdole, &IID_IDispatch, &dispatch); + ITypeLib_Release(stdole); + if(FAILED(hres)) + return hres; + + hres = ICreateTypeInfo2_AddRefTypeInfo(iface, dispatch, &hreftype); + ITypeInfo_Release(dispatch); + if(FAILED(hres)) + return hres; + } This->TypeAttr.wTypeFlags = typeFlags; @@ -8628,6 +8646,9 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddImplType(ICreateTypeInfo2 *iface, ++This->TypeAttr.cImplTypes; + if((refType & (~0x3)) == (This->pTypeLib->dispatch_href & (~0x3))) + This->TypeAttr.wTypeFlags |= TYPEFLAG_FDISPATCHABLE; + return S_OK; }

1 0

Andrew Eikum : oleaut32: Implement ICreateTypeInfo::AddImplType.
by Alexandre Julliard 29 May '13

29 May '13

Module: wine Branch: master Commit: 0082256a3f0b55fa8d3188af23b6fe307b840aeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=0082256a3f0b55fa8d3188af2… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue May 28 17:00:07 2013 -0500 oleaut32: Implement ICreateTypeInfo::AddImplType. --- dlls/oleaut32/typelib.c | 82 +++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 73 insertions(+), 9 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 90d8c4d..c5a8e8d 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -1713,7 +1713,12 @@ static TLBFuncDesc *TLBFuncDesc_Constructor(UINT n) return ret; } -static TLBImplType *TLBImplType_Constructor(UINT n) +static void TLBImplType_Constructor(TLBImplType *impl) +{ + list_init(&impl->custdata_list); +} + +static TLBImplType *TLBImplType_Alloc(UINT n) { TLBImplType *ret; @@ -1722,7 +1727,7 @@ static TLBImplType *TLBImplType_Constructor(UINT n) return NULL; while(n){ - list_init(&ret[n-1].custdata_list); + TLBImplType_Constructor(&ret[n-1]); --n; } @@ -2369,7 +2374,7 @@ static void MSFT_DoImplTypes(TLBContext *pcx, ITypeInfoImpl *pTI, int count, TRACE_(typelib)("\n"); - pTI->impltypes = TLBImplType_Constructor(count); + pTI->impltypes = TLBImplType_Alloc(count); pImpl = pTI->impltypes; for(i=0;i<count;i++){ if(offset<0) break; /* paranoia */ @@ -2465,13 +2470,13 @@ static ITypeInfoImpl * MSFT_DoTypeInfo( if (tiBase.datatype1 != -1) { - ptiRet->impltypes = TLBImplType_Constructor(1); + ptiRet->impltypes = TLBImplType_Alloc(1); ptiRet->impltypes[0].hRef = tiBase.datatype1; MSFT_DoRefType(pcx, pLibInfo, tiBase.datatype1); } break; default: - ptiRet->impltypes = TLBImplType_Constructor(1); + ptiRet->impltypes = TLBImplType_Alloc(1); MSFT_DoRefType(pcx, pLibInfo, tiBase.datatype1); ptiRet->impltypes[0].hRef = tiBase.datatype1; break; @@ -3585,7 +3590,7 @@ static char *SLTG_DoImpls(char *pBlk, ITypeInfoImpl *pTI, } info = (SLTG_ImplInfo*)pBlk; - pTI->impltypes = TLBImplType_Constructor(pTI->TypeAttr.cImplTypes); + pTI->impltypes = TLBImplType_Alloc(pTI->TypeAttr.cImplTypes); pImplType = pTI->impltypes; while(1) { sltg_get_typelib_ref(ref_lookup, info->ref, &pImplType->hRef); @@ -7936,7 +7941,7 @@ HRESULT WINAPI CreateDispTypeInfo( pTIClass->TypeAttr.wTypeFlags = 0; pTIClass->hreftype = sizeof(MSFT_TypeInfoBase); - pTIClass->impltypes = TLBImplType_Constructor(1); + pTIClass->impltypes = TLBImplType_Alloc(1); ref = heap_alloc_zero(sizeof(*ref)); ref->pImpTLInfo = TLB_REF_INTERNAL; @@ -8563,8 +8568,67 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddImplType(ICreateTypeInfo2 *iface, UINT index, HREFTYPE refType) { ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface); - FIXME("%p %u %d - stub\n", This, index, refType); - return E_NOTIMPL; + TLBImplType *impl_type; + + TRACE("%p %u %d\n", This, index, refType); + + switch(This->TypeAttr.typekind){ + case TKIND_COCLASS: { + if (index == -1) { + FIXME("Unhandled index: -1\n"); + return E_NOTIMPL; + } + + if(index != This->TypeAttr.cImplTypes) + return TYPE_E_ELEMENTNOTFOUND; + + break; + } + case TKIND_INTERFACE: + case TKIND_DISPATCH: + if (index != 0 || This->TypeAttr.cImplTypes) + return TYPE_E_ELEMENTNOTFOUND; + break; + default: + FIXME("Unimplemented typekind: %d\n", This->TypeAttr.typekind); + return E_NOTIMPL; + } + + if (This->impltypes){ + UINT i; + + This->impltypes = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, This->impltypes, + sizeof(TLBImplType) * (This->TypeAttr.cImplTypes + 1)); + + if (index < This->TypeAttr.cImplTypes) { + memmove(This->impltypes + index + 1, This->impltypes + index, + (This->TypeAttr.cImplTypes - index) * sizeof(TLBImplType)); + impl_type = This->impltypes + index; + } else + impl_type = This->impltypes + This->TypeAttr.cImplTypes; + + /* move custdata lists to the new memory location */ + for(i = 0; i < This->TypeAttr.cImplTypes + 1; ++i){ + if(index != i){ + TLBImplType *it = &This->impltypes[i]; + if(it->custdata_list.prev == it->custdata_list.next) + list_init(&it->custdata_list); + else{ + it->custdata_list.prev->next = &it->custdata_list; + it->custdata_list.next->prev = &it->custdata_list; + } + } + } + } else + impl_type = This->impltypes = heap_alloc(sizeof(TLBImplType)); + + memset(impl_type, 0, sizeof(TLBImplType)); + TLBImplType_Constructor(impl_type); + impl_type->hRef = refType; + + ++This->TypeAttr.cImplTypes; + + return S_OK; } static HRESULT WINAPI ICreateTypeInfo2_fnSetImplTypeFlags(ICreateTypeInfo2 *iface,

1 0

Andrew Eikum : oleaut32: Implement ICreateTypeInfo::AddRefTypeInfo.
by Alexandre Julliard 29 May '13

29 May '13

Module: wine Branch: master Commit: f9d42aee53dc5b728b847c0c26bb05f75979fb16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9d42aee53dc5b728b847c0c2… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue May 28 16:59:33 2013 -0500 oleaut32: Implement ICreateTypeInfo::AddRefTypeInfo. This also corrects our HREFTYPE values a little bit. --- dlls/oleaut32/typelib.c | 204 +++++++++++++++++++++++++++++++++++----------- 1 files changed, 155 insertions(+), 49 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f9d42aee53dc5b728b847…

1 0

Tatyana Fokina : oleaut32: Ignore NULL ppTLib/ pIndex in ITypeInfo2_fnGetContainingTypeLib.
by Alexandre Julliard 28 May '13

28 May '13

Module: wine Branch: master Commit: 97f501bec3d97f25f24e2b099bbc83f4a813a35c URL: http://source.winehq.org/git/wine.git/?a=commit;h=97f501bec3d97f25f24e2b099… Author: Tatyana Fokina <tatyana(a)etersoft.ru> Date: Mon May 27 14:43:38 2013 +0400 oleaut32: Ignore NULL ppTLib/pIndex in ITypeInfo2_fnGetContainingTypeLib. --- dlls/oleaut32/tests/typelib.c | 49 +++++++++++++++++++++++++++++++++++++++++ dlls/oleaut32/typelib2.c | 9 +++++-- 2 files changed, 55 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index a20b3bf..32d8a04 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -3385,6 +3385,54 @@ todo_wine { ITypeLib_Release(tl); } +static void test_TypeInfo2_GetContainingTypeLib(void) +{ + static const WCHAR test[] = {'t','e','s','t','.','t','l','b',0}; + static OLECHAR testTI[] = {'t','e','s','t','T','y','p','e','I','n','f','o',0}; + + ICreateTypeLib2 *ctl2; + ICreateTypeInfo *cti; + ITypeInfo2 *ti2; + ITypeLib *tl; + UINT Index; + HRESULT hr; + + hr = CreateTypeLib2(SYS_WIN32, test, &ctl2); + ok_ole_success(hr, CreateTypeLib2); + + hr = ICreateTypeLib2_CreateTypeInfo(ctl2, testTI, TKIND_DISPATCH, &cti); + ok_ole_success(hr, ICreateTypeLib2_CreateTypeInfo); + + hr = ICreateTypeInfo_QueryInterface(cti, &IID_ITypeInfo2, (void**)&ti2); + ok_ole_success(hr, ICreateTypeInfo2_QueryInterface); + + tl = NULL; + Index = 888; + hr = ITypeInfo2_GetContainingTypeLib(ti2, &tl, &Index); + ok_ole_success(hr, ITypeInfo2_GetContainingTypeLib); + ok(tl != NULL, "ITypeInfo2_GetContainingTypeLib returned empty TypeLib"); + ok(Index == 0, "ITypeInfo2_GetContainingTypeLib returned Index = %u, expected 0\n", Index); + if(tl) ITypeLib_Release(tl); + + tl = NULL; + hr = ITypeInfo2_GetContainingTypeLib(ti2, &tl, NULL); + ok_ole_success(hr, ITypeInfo2_GetContainingTypeLib); + ok(tl != NULL, "ITypeInfo2_GetContainingTypeLib returned empty TypeLib"); + if(tl) ITypeLib_Release(tl); + + Index = 888; + hr = ITypeInfo2_GetContainingTypeLib(ti2, NULL, &Index); + ok_ole_success(hr, ITypeInfo2_GetContainingTypeLib); + ok(Index == 0, "ITypeInfo2_GetContainingTypeLib returned Index = %u, expected 0\n", Index); + + hr = ITypeInfo2_GetContainingTypeLib(ti2, NULL, NULL); + ok_ole_success(hr, ITypeInfo2_GetContainingTypeLib); + + ITypeInfo2_Release(ti2); + ICreateTypeInfo_Release(cti); + ICreateTypeLib2_Release(ctl2); +} + START_TEST(typelib) { const char *filename; @@ -3416,4 +3464,5 @@ START_TEST(typelib) test_register_typelib(FALSE); test_create_typelibs(); test_LoadTypeLib(); + test_TypeInfo2_GetContainingTypeLib(); } diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index 1aeb27a..98f9d62 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -3707,9 +3707,12 @@ static HRESULT WINAPI ITypeInfo2_fnGetContainingTypeLib( TRACE("(%p,%p,%p)\n", iface, ppTLib, pIndex); - *ppTLib = (ITypeLib *)&This->typelib->ITypeLib2_iface; - ICreateTypeLib_AddRef((ICreateTypeLib*)This->typelib); - *pIndex = This->typeinfo->typekind >> 16; + if (ppTLib) + { + *ppTLib = (ITypeLib *)&This->typelib->ITypeLib2_iface; + ICreateTypeLib2_AddRef(&This->typelib->ICreateTypeLib2_iface); + } + if (pIndex) *pIndex = This->typeinfo->typekind >> 16; return S_OK; }

1 0

Christian Costa : d3dx9_36: Implement skin mesh loading.
by Alexandre Julliard 28 May '13

28 May '13

Module: wine Branch: master Commit: e558925d75eac467ea793697a299fb90cd4d4c24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e558925d75eac467ea793697a… Author: Christian Costa <titan.costa(a)gmail.com> Date: Wed May 22 00:03:11 2013 +0200 d3dx9_36: Implement skin mesh loading. --- dlls/d3dx9_36/mesh.c | 95 +++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 90 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 2b7579e..82b3134 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -7,6 +7,7 @@ * Copyright (C) 2010 Tony Wasserka * Copyright (C) 2011 Dylan Smith * Copyright (C) 2011 Michael Mc Donnell + * Copyright (C) 2013 Christian Costa * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -2632,6 +2633,9 @@ struct mesh_data { DWORD num_materials; D3DXMATERIAL *materials; DWORD *material_indices; + + struct ID3DXSkinInfo *skin_info; + DWORD nb_bones; }; static HRESULT parse_texture_filename(ID3DXFileData *filedata, LPSTR *filename_out) @@ -3099,6 +3103,64 @@ end: return hr; } +static HRESULT parse_skin_mesh_info(ID3DXFileData *filedata, struct mesh_data *mesh_data, DWORD index) +{ + HRESULT hr; + SIZE_T data_size; + const BYTE *data; + + TRACE("(%p, %p, %u)\n", filedata, mesh_data, index); + + hr = filedata->lpVtbl->Lock(filedata, &data_size, (const void**)&data); + if (FAILED(hr)) return hr; + + hr = E_FAIL; + + if (!mesh_data->skin_info) { + if (data_size < sizeof(WORD) * 3) { + WARN("truncated data (%ld bytes)\n", data_size); + goto end; + } + /* Skip nMaxSkinWeightsPerVertex and nMaxSkinWeightsPerFace */ + data += 2 * sizeof(WORD); + mesh_data->nb_bones = *(WORD*)data; + hr = D3DXCreateSkinInfoFVF(mesh_data->num_vertices, mesh_data->fvf, mesh_data->nb_bones, &mesh_data->skin_info); + if (FAILED(hr)) + goto end; + } else { + const char *name; + DWORD nb_influences; + + /* FIXME: String must be retrieved directly instead of through a pointer once ID3DXFILE is fixed */ + name = *(const char**)data; + data += sizeof(char*); + + nb_influences = *(DWORD*)data; + data += sizeof(DWORD); + + if (data_size < (sizeof(char*) + sizeof(DWORD) + nb_influences * (sizeof(DWORD) + sizeof(FLOAT)) + 16 * sizeof(FLOAT))) { + WARN("truncated data (%ld bytes)\n", data_size); + goto end; + } + + hr = mesh_data->skin_info->lpVtbl->SetBoneName(mesh_data->skin_info, index, name); + if (SUCCEEDED(hr)) + hr = mesh_data->skin_info->lpVtbl->SetBoneInfluence(mesh_data->skin_info, index, nb_influences, + (const DWORD*)data, (const FLOAT*)(data + nb_influences * sizeof(DWORD))); + if (SUCCEEDED(hr)) + hr = mesh_data->skin_info->lpVtbl->SetBoneOffsetMatrix(mesh_data->skin_info, index, + (const D3DMATRIX*)(data + nb_influences * (sizeof(DWORD) + sizeof(FLOAT)))); + if (FAILED(hr)) + goto end; + } + + hr = D3D_OK; + +end: + filedata->lpVtbl->Unlock(filedata); + return hr; +} + /* for provide_flags parameters */ #define PROVIDE_MATERIALS 0x1 #define PROVIDE_SKININFO 0x2 @@ -3114,6 +3176,7 @@ static HRESULT parse_mesh(ID3DXFileData *filedata, struct mesh_data *mesh_data, ID3DXFileData *child; DWORD i; SIZE_T nb_children; + DWORD nb_skin_weigths_info = 0; /* * template Mesh { @@ -3236,17 +3299,37 @@ static HRESULT parse_mesh(ID3DXFileData *filedata, struct mesh_data *mesh_data, hr = parse_material_list(child, mesh_data); } else if (provide_flags & PROVIDE_SKININFO) { if (IsEqualGUID(&type, &DXFILEOBJ_XSkinMeshHeader)) { - FIXME("Skin mesh loading not implemented.\n"); - hr = E_NOTIMPL; - goto end; + if (mesh_data->skin_info) { + WARN("Skin mesh header already encountered\n"); + hr = E_FAIL; + goto end; + } + hr = parse_skin_mesh_info(child, mesh_data, 0); + if (FAILED(hr)) + goto end; } else if (IsEqualGUID(&type, &DXFILEOBJ_SkinWeights)) { - /* ignored without XSkinMeshHeader */ + if (!mesh_data->skin_info) { + WARN("Skin weigths found but skin mesh header not encountered yet\n"); + hr = E_FAIL; + goto end; + } + hr = parse_skin_mesh_info(child, mesh_data, nb_skin_weigths_info); + if (FAILED(hr)) + goto end; + nb_skin_weigths_info++; } } if (FAILED(hr)) goto end; } + if (mesh_data->skin_info && (nb_skin_weigths_info != mesh_data->nb_bones)) { + WARN("Mismatch between nb skin weights info %u encountered and nb bones %u from skin mesh header\n", + nb_skin_weigths_info, mesh_data->nb_bones); + hr = E_FAIL; + goto end; + } + hr = D3D_OK; end: @@ -3571,7 +3654,7 @@ HRESULT WINAPI D3DXLoadSkinMeshFromXof(struct ID3DXFileData *filedata, DWORD opt if (num_materials_out) *num_materials_out = mesh_data.num_materials; if (materials_out) *materials_out = materials; if (effects_out) *effects_out = effects; - if (skin_info_out) *skin_info_out = NULL; + if (skin_info_out) *skin_info_out = mesh_data.skin_info; hr = D3D_OK; cleanup: @@ -3580,6 +3663,8 @@ cleanup: if (adjacency) ID3DXBuffer_Release(adjacency); if (materials) ID3DXBuffer_Release(materials); if (effects) ID3DXBuffer_Release(effects); + if (mesh_data.skin_info) mesh_data.skin_info->lpVtbl->Release(mesh_data.skin_info); + if (skin_info_out) *skin_info_out = NULL; } HeapFree(GetProcessHeap(), 0, mesh_data.vertices); HeapFree(GetProcessHeap(), 0, mesh_data.num_tri_per_face);

1 0

Christian Costa : d3dx9_36: Port mesh code to use ID3DXFile instead of IDirectXFile and enable D3DXLoadSkinMeshFromXof .
by Alexandre Julliard 28 May '13

28 May '13

Module: wine Branch: master Commit: 31ae8b6a1252dc1553b3f4e8fd6e6d9df4395140 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31ae8b6a1252dc1553b3f4e8f… Author: Christian Costa <titan.costa(a)gmail.com> Date: Wed May 22 00:03:01 2013 +0200 d3dx9_36: Port mesh code to use ID3DXFile instead of IDirectXFile and enable D3DXLoadSkinMeshFromXof. --- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/mesh.c | 580 ++++++++++++++++++++++++++----------------- 2 files changed, 351 insertions(+), 231 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=31ae8b6a1252dc1553b3f…

1 0

Daniel Jelinski : wine.inf: Add HKLM\\System\\CurrentControlSet\\Services\\Eventlog\\Application registry key .
by Alexandre Julliard 28 May '13

28 May '13

Module: wine Branch: master Commit: 240172f108e7800548c9bc41872c240199c14a61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=240172f108e7800548c9bc418… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Sat May 25 20:12:51 2013 +0200 wine.inf: Add HKLM\\System\\CurrentControlSet\\Services\\Eventlog\\Application registry key. --- dlls/advapi32/tests/eventlog.c | 7 ++++--- tools/wine.inf.in | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/tests/eventlog.c b/dlls/advapi32/tests/eventlog.c index 543b41c..b028354 100644 --- a/dlls/advapi32/tests/eventlog.c +++ b/dlls/advapi32/tests/eventlog.c @@ -637,7 +637,6 @@ static BOOL create_new_eventlog(void) /* First create our eventlog */ lret = RegOpenKeyA(HKEY_LOCAL_MACHINE, eventlogsvc, &key); - /* FIXME: Wine stops here */ if (lret != ERROR_SUCCESS) { skip("Could not open the EventLog service registry key\n"); @@ -832,11 +831,13 @@ static void test_readwrite(void) SetLastError(0xdeadbeef); ret = GetNumberOfEventLogRecords(handle, &count); ok(ret, "Expected GetNumberOfEventLogRecords success : %d\n", GetLastError()); + todo_wine ok(count == (i + 1), "Expected %d records, got %d\n", i + 1, count); oldest = 0xdeadbeef; ret = GetOldestEventLogRecord(handle, &oldest); ok(ret, "Expected GetOldestEventLogRecord success : %d\n", GetLastError()); + todo_wine ok(oldest == 1 || (oldest > 1 && oldest != 0xdeadbeef), /* Vista SP1+, W2K8 and Win7 */ "Expected oldest to be 1 or higher, got %d\n", oldest); @@ -855,6 +856,7 @@ static void test_readwrite(void) count = 0xdeadbeef; ret = GetNumberOfEventLogRecords(handle, &count); ok(ret, "Expected success\n"); + todo_wine ok(count == i, "Expected %d records, got %d\n", i, count); CloseEventLog(handle); @@ -1083,6 +1085,7 @@ static void test_autocreation(void) lstrcatA(eventlogfile, ".evtx"); } + todo_wine ok(GetFileAttributesA(eventlogfile) != INVALID_FILE_ATTRIBUTES, "Expected an eventlog file\n"); @@ -1109,14 +1112,12 @@ static void cleanup_eventlog(void) RegDeleteValueA(key, "Sources"); RegCloseKey(key); lret = RegDeleteKeyA(HKEY_LOCAL_MACHINE, winesvc); - todo_wine ok(lret == ERROR_SUCCESS, "Could not delete the registry tree : %d\n", lret); /* A handle to the eventlog is locked by services.exe. We can only * delete the eventlog file after reboot. */ bret = MoveFileExA(eventlogfile, NULL, MOVEFILE_DELAY_UNTIL_REBOOT); - todo_wine ok(bret, "Expected MoveFileEx to succeed: %d\n", GetLastError()); } diff --git a/tools/wine.inf.in b/tools/wine.inf.in index e48d824..14fde79 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -3005,8 +3005,9 @@ HKR,Parameters,"ServiceDll",,"%11%\srvsvc.dll" [Services] HKLM,%CurrentVersion%\RunServices,"winemenubuilder",2,"%11%\winemenubuilder.exe -a -r" -HKLM,"System\CurrentControlSet\Services\VxD\MSTCP",,16 +HKLM,"System\CurrentControlSet\Services\Eventlog\Application",,16 HKLM,"System\CurrentControlSet\Services\Tcpip\Parameters",,16 +HKLM,"System\CurrentControlSet\Services\VxD\MSTCP",,16 HKLM,"System\CurrentControlSet\Services\Winsock\Parameters",,16 HKLM,"System\CurrentControlSet\Services\Winsock2\Parameters\Protocol_Catalog9\Catalog_Entries",,16

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
50
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2013