May 2013 - Wine-commits - list.winehq.org

Daniel Jelinski : xolehlp: Implement ITransactionImport.
by Alexandre Julliard 29 May '13

29 May '13

Module: wine Branch: master Commit: 9cc5cdc174f0f9a90a87228177b149b48e6e9d20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cc5cdc174f0f9a90a8722817… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Sat May 4 20:09:34 2013 +0200 xolehlp: Implement ITransactionImport. --- dlls/xolehlp/xolehlp.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 44 insertions(+), 0 deletions(-) diff --git a/dlls/xolehlp/xolehlp.c b/dlls/xolehlp/xolehlp.c index 595b578..70bae1c 100644 --- a/dlls/xolehlp/xolehlp.c +++ b/dlls/xolehlp/xolehlp.c @@ -153,6 +153,7 @@ typedef struct { LONG ref; IResourceManagerFactory2 IResourceManagerFactory2_iface; ITransactionImportWhereabouts ITransactionImportWhereabouts_iface; + ITransactionImport ITransactionImport_iface; } TransactionManager; static inline TransactionManager *impl_from_ITransactionDispenser(ITransactionDispenser *iface) @@ -182,6 +183,10 @@ static HRESULT WINAPI TransactionDispenser_QueryInterface(ITransactionDispenser { *ppv = &This->ITransactionImportWhereabouts_iface; } + else if (IsEqualIID(&IID_ITransactionImport, iid)) + { + *ppv = &This->ITransactionImport_iface; + } else { FIXME("(%s): not implemented\n", debugstr_guid(iid)); @@ -345,6 +350,44 @@ static const ITransactionImportWhereaboutsVtbl TransactionImportWhereabouts_Vtbl TransactionImportWhereabouts_GetWhereabouts }; +static inline TransactionManager *impl_from_ITransactionImport(ITransactionImport *iface) +{ + return CONTAINING_RECORD(iface, TransactionManager, ITransactionImport_iface); +} + +static HRESULT WINAPI TransactionImport_QueryInterface(ITransactionImport *iface, REFIID iid, + void **ppv) +{ + TransactionManager *This = impl_from_ITransactionImport(iface); + return TransactionDispenser_QueryInterface(&This->ITransactionDispenser_iface, iid, ppv); +} + +static ULONG WINAPI TransactionImport_AddRef(ITransactionImport *iface) +{ + TransactionManager *This = impl_from_ITransactionImport(iface); + return TransactionDispenser_AddRef(&This->ITransactionDispenser_iface); +} + +static ULONG WINAPI TransactionImport_Release(ITransactionImport *iface) +{ + TransactionManager *This = impl_from_ITransactionImport(iface); + return TransactionDispenser_Release(&This->ITransactionDispenser_iface); +} +static HRESULT WINAPI TransactionImport_Import(ITransactionImport *iface, + ULONG cbTransactionCookie, byte *rgbTransactionCookie, IID *piid, void **ppvTransaction) +{ + FIXME("(%p, %u, %p, %s, %p): stub\n", iface, cbTransactionCookie, rgbTransactionCookie, debugstr_guid(piid), ppvTransaction); + + if (!rgbTransactionCookie || !piid || !ppvTransaction) return E_INVALIDARG; + return E_NOTIMPL; +} +static const ITransactionImportVtbl TransactionImport_Vtbl = { + TransactionImport_QueryInterface, + TransactionImport_AddRef, + TransactionImport_Release, + TransactionImport_Import +}; + static HRESULT TransactionManager_Create(REFIID riid, void **ppv) { TransactionManager *This; @@ -356,6 +399,7 @@ static HRESULT TransactionManager_Create(REFIID riid, void **ppv) This->ITransactionDispenser_iface.lpVtbl = &TransactionDispenser_Vtbl; This->IResourceManagerFactory2_iface.lpVtbl = &ResourceManagerFactory2_Vtbl; This->ITransactionImportWhereabouts_iface.lpVtbl = &TransactionImportWhereabouts_Vtbl; + This->ITransactionImport_iface.lpVtbl = &TransactionImport_Vtbl; This->ref = 1; ret = ITransactionDispenser_QueryInterface(&This->ITransactionDispenser_iface, riid, ppv);

1 0

Daniel Jelinski : xolehlp: Implement TransactionOptions.
by Alexandre Julliard 29 May '13

29 May '13

Module: wine Branch: master Commit: b062977fb476010424a95cd139cd6011ddf2abb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b062977fb476010424a95cd13… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Sat May 4 21:53:30 2013 +0200 xolehlp: Implement TransactionOptions. --- dlls/xolehlp/xolehlp.c | 114 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 111 insertions(+), 3 deletions(-) diff --git a/dlls/xolehlp/xolehlp.c b/dlls/xolehlp/xolehlp.c index 70bae1c..616fe57 100644 --- a/dlls/xolehlp/xolehlp.c +++ b/dlls/xolehlp/xolehlp.c @@ -145,6 +145,114 @@ static HRESULT ResourceManager_Create(REFIID riid, void **ppv) /* Resource manager end */ +/* Transaction options start */ + +typedef struct { + ITransactionOptions ITransactionOptions_iface; + LONG ref; + XACTOPT opts; +} TransactionOptions; + +static inline TransactionOptions *impl_from_ITransactionOptions(ITransactionOptions *iface) +{ + return CONTAINING_RECORD(iface, TransactionOptions, ITransactionOptions_iface); +} + +static HRESULT WINAPI TransactionOptions_QueryInterface(ITransactionOptions *iface, REFIID iid, + void **ppv) +{ + TransactionOptions *This = impl_from_ITransactionOptions(iface); + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); + + if (!ppv) return E_INVALIDARG; + + if (IsEqualIID(&IID_IUnknown, iid) || + IsEqualIID(&IID_ITransactionOptions, iid)) + { + *ppv = &This->ITransactionOptions_iface; + } + else + { + FIXME("(%s): not implemented\n", debugstr_guid(iid)); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI TransactionOptions_AddRef(ITransactionOptions *iface) +{ + TransactionOptions *This = impl_from_ITransactionOptions(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + return ref; +} + +static ULONG WINAPI TransactionOptions_Release(ITransactionOptions *iface) +{ + TransactionOptions *This = impl_from_ITransactionOptions(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + if (ref == 0) + { + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} +static HRESULT WINAPI TransactionOptions_SetOptions(ITransactionOptions *iface, + XACTOPT *pOptions) +{ + TransactionOptions *This = impl_from_ITransactionOptions(iface); + + if (!pOptions) return E_INVALIDARG; + TRACE("(%p, %u, %s)\n", iface, pOptions->ulTimeout, debugstr_a(pOptions->szDescription)); + This->opts = *pOptions; + return S_OK; +} +static HRESULT WINAPI TransactionOptions_GetOptions(ITransactionOptions *iface, + XACTOPT *pOptions) +{ + TransactionOptions *This = impl_from_ITransactionOptions(iface); + + TRACE("(%p, %p)\n", iface, pOptions); + if (!pOptions) return E_INVALIDARG; + *pOptions = This->opts; + return S_OK; +} + +static const ITransactionOptionsVtbl TransactionOptions_Vtbl = { + TransactionOptions_QueryInterface, + TransactionOptions_AddRef, + TransactionOptions_Release, + TransactionOptions_SetOptions, + TransactionOptions_GetOptions +}; + +static HRESULT TransactionOptions_Create(ITransactionOptions **ppv) +{ + TransactionOptions *This; + + if (!ppv) return E_INVALIDARG; + + This = HeapAlloc(GetProcessHeap(), 0, sizeof(TransactionOptions)); + if (!This) return E_OUTOFMEMORY; + + This->ITransactionOptions_iface.lpVtbl = &TransactionOptions_Vtbl; + This->ref = 1; + + *ppv = &This->ITransactionOptions_iface; + + return S_OK; +} + +/* Transaction options end */ /* DTC Proxy Core Object start */ @@ -226,10 +334,10 @@ static ULONG WINAPI TransactionDispenser_Release(ITransactionDispenser *iface) static HRESULT WINAPI TransactionDispenser_GetOptionsObject(ITransactionDispenser *iface, ITransactionOptions **ppOptions) { - FIXME("(%p, %p): stub\n", iface, ppOptions); + TRACE("(%p, %p)\n", iface, ppOptions); + if (!ppOptions) return E_INVALIDARG; - *ppOptions = NULL; - return E_NOTIMPL; + return TransactionOptions_Create(ppOptions); } static HRESULT WINAPI TransactionDispenser_BeginTransaction(ITransactionDispenser *iface, IUnknown *punkOuter,

1 0

Daniel Jelinski : xolehlp: Implement ITransaction.
by Alexandre Julliard 29 May '13

29 May '13

Module: wine Branch: master Commit: 11589fa6e728b633524455b1a4514430a018fb40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11589fa6e728b633524455b1a… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Sat May 4 23:39:03 2013 +0200 xolehlp: Implement ITransaction. --- dlls/xolehlp/xolehlp.c | 120 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 117 insertions(+), 3 deletions(-) diff --git a/dlls/xolehlp/xolehlp.c b/dlls/xolehlp/xolehlp.c index 616fe57..4714f8c 100644 --- a/dlls/xolehlp/xolehlp.c +++ b/dlls/xolehlp/xolehlp.c @@ -254,6 +254,121 @@ static HRESULT TransactionOptions_Create(ITransactionOptions **ppv) /* Transaction options end */ +/* Transaction start */ + +typedef struct { + ITransaction ITransaction_iface; + LONG ref; + XACTTRANSINFO info; +} Transaction; + +static inline Transaction *impl_from_ITransaction(ITransaction *iface) +{ + return CONTAINING_RECORD(iface, Transaction, ITransaction_iface); +} + +static HRESULT WINAPI Transaction_QueryInterface(ITransaction *iface, REFIID iid, + void **ppv) +{ + Transaction *This = impl_from_ITransaction(iface); + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); + + if (!ppv) return E_INVALIDARG; + + if (IsEqualIID(&IID_IUnknown, iid) || + IsEqualIID(&IID_ITransaction, iid)) + { + *ppv = &This->ITransaction_iface; + } + else + { + FIXME("(%s): not implemented\n", debugstr_guid(iid)); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI Transaction_AddRef(ITransaction *iface) +{ + Transaction *This = impl_from_ITransaction(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + return ref; +} + +static ULONG WINAPI Transaction_Release(ITransaction *iface) +{ + Transaction *This = impl_from_ITransaction(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + if (ref == 0) + { + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} +static HRESULT WINAPI Transaction_Commit(ITransaction *iface, + BOOL fRetaining, DWORD grfTC, DWORD grfRM) +{ + FIXME("(%p, %d, %08x, %08x): stub\n", iface, fRetaining, grfTC, grfRM); + return E_NOTIMPL; +} +static HRESULT WINAPI Transaction_Abort(ITransaction *iface, + BOID *pboidReason, BOOL fRetaining, BOOL fAsync) +{ + FIXME("(%p, %p, %d, %d): stub\n", iface, pboidReason, fRetaining, fAsync); + return E_NOTIMPL; +} +static HRESULT WINAPI Transaction_GetTransactionInfo(ITransaction *iface, + XACTTRANSINFO *pinfo) +{ + Transaction *This = impl_from_ITransaction(iface); + TRACE("(%p, %p)\n", iface, pinfo); + if (!pinfo) return E_INVALIDARG; + *pinfo = This->info; + return S_OK; +} + +static const ITransactionVtbl Transaction_Vtbl = { + Transaction_QueryInterface, + Transaction_AddRef, + Transaction_Release, + Transaction_Commit, + Transaction_Abort, + Transaction_GetTransactionInfo +}; + +static HRESULT Transaction_Create(ISOLEVEL isoLevel, ULONG isoFlags, + ITransactionOptions *pOptions, ITransaction **ppv) +{ + Transaction *This; + + if (!ppv) return E_INVALIDARG; + + This = HeapAlloc(GetProcessHeap(), 0, sizeof(Transaction)); + if (!This) return E_OUTOFMEMORY; + ZeroMemory(&This->info, sizeof(This->info)); + + This->ITransaction_iface.lpVtbl = &Transaction_Vtbl; + This->ref = 1; + This->info.isoLevel = isoLevel; + This->info.isoFlags = isoFlags; + + *ppv = &This->ITransaction_iface; + + return S_OK; +} + +/* Transaction end */ + /* DTC Proxy Core Object start */ typedef struct { @@ -346,13 +461,12 @@ static HRESULT WINAPI TransactionDispenser_BeginTransaction(ITransactionDispense ITransactionOptions *pOptions, ITransaction **ppTransaction) { - FIXME("(%p, %p, %08x, %08x, %p, %p): stub\n", iface, punkOuter, + FIXME("(%p, %p, %08x, %08x, %p, %p): semi-stub\n", iface, punkOuter, isoLevel, isoFlags, pOptions, ppTransaction); if (!ppTransaction) return E_INVALIDARG; - *ppTransaction = NULL; if (punkOuter) return CLASS_E_NOAGGREGATION; - return E_NOTIMPL; + return Transaction_Create(isoLevel, isoFlags, pOptions, ppTransaction); } static const ITransactionDispenserVtbl TransactionDispenser_Vtbl = { TransactionDispenser_QueryInterface,

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: 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

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

Francois Gouget : oleaut32/tests: Add a trailing '\n' to a couple of ok() calls.
by Alexandre Julliard 29 May '13

29 May '13

Module: wine Branch: master Commit: 440e936abe234fa5f6378d9ca76ef018b816f89a URL: http://source.winehq.org/git/wine.git/?a=commit;h=440e936abe234fa5f6378d9ca… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed May 29 07:45:54 2013 +0200 oleaut32/tests: Add a trailing '\n' to a couple of ok() calls. --- dlls/oleaut32/tests/typelib.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 32d8a04..0bc1854 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -3410,14 +3410,14 @@ static void test_TypeInfo2_GetContainingTypeLib(void) Index = 888; hr = ITypeInfo2_GetContainingTypeLib(ti2, &tl, &Index); ok_ole_success(hr, ITypeInfo2_GetContainingTypeLib); - ok(tl != NULL, "ITypeInfo2_GetContainingTypeLib returned empty TypeLib"); + ok(tl != NULL, "ITypeInfo2_GetContainingTypeLib returned empty TypeLib\n"); 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"); + ok(tl != NULL, "ITypeInfo2_GetContainingTypeLib returned empty TypeLib\n"); if(tl) ITypeLib_Release(tl); Index = 888;

1 0

Alistair Leslie-Hughes : ole32: Fix test under NT.
by Alexandre Julliard 29 May '13

29 May '13

Module: wine Branch: master Commit: 97ac6943c39156abfd905e2e63b849a2a9152cc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97ac6943c39156abfd905e2e6… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue May 28 20:51:01 2013 +1000 ole32: Fix test under NT. --- dlls/ole32/tests/storage32.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index 4f12d8b..9d99c38 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -1962,7 +1962,9 @@ static void test_access(void) IStorage_Release(stg); hr = StgOpenStorage(fileW, NULL, STGM_DIRECT_SWMR | STGM_READ | STGM_SHARE_DENY_NONE, NULL, 0, &stg); - ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK || broken(hr == STG_E_INVALIDFLAG), "got %08x\n", hr); + if(hr != S_OK) + return; test_file_access(fileA, create);

1 0

Alistair Leslie-Hughes : oledb32: Implement DataConvert DBTYPE_R4-> DBTYPE_VARIANT.
by Alexandre Julliard 29 May '13

29 May '13

Module: wine Branch: master Commit: 4f2aefd8d52f76b731b2487b3145f30c8e6eb1ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f2aefd8d52f76b731b2487b3… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed May 29 08:30:57 2013 +1000 oledb32: Implement DataConvert DBTYPE_R4->DBTYPE_VARIANT. --- dlls/oledb32/convert.c | 5 +++++ dlls/oledb32/tests/convert.c | 11 +++++++++++ 2 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index abbc76b..811a165 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -884,6 +884,11 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, V_VT(v) = VT_DECIMAL; hr = VarDecFromI8( *(LONGLONG*)src, &V_DECIMAL(v)); break; + case DBTYPE_R4: + V_VT(v) = VT_R4; + V_R4(v) = *(FLOAT*)src; + hr = S_OK; + break; case DBTYPE_R8: V_VT(v) = VT_R8; V_R8(v) = *(double*)src; diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index ff44e0a..49d8be0 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -2575,6 +2575,7 @@ static void test_converttovar(void) INT i4; LARGE_INTEGER i8; VARIANT_BOOL boolean = VARIANT_TRUE; + FLOAT fvalue = 543.21f; V_VT(&dst) = VT_EMPTY; dst_len = 0; @@ -2611,6 +2612,16 @@ static void test_converttovar(void) V_VT(&dst) = VT_EMPTY; dst_len = 0; dst_status = DBSTATUS_S_DEFAULT; + hr = IDataConvert_DataConvert(convert, DBTYPE_R4, DBTYPE_VARIANT, sizeof(fvalue), &dst_len, &fvalue, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(dst), "got %ld\n", dst_len); + ok(V_VT(&dst) == VT_R4, "got %d\n", V_VT(&dst)); + ok(V_R4(&dst) == 543.21f, "got %f\n", V_R4(&dst)); + + V_VT(&dst) = VT_EMPTY; + dst_len = 0; + dst_status = DBSTATUS_S_DEFAULT; hr = IDataConvert_DataConvert(convert, DBTYPE_R8, DBTYPE_VARIANT, sizeof(dvalue), &dst_len, &dvalue, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); ok(hr == S_OK, "got %08x\n", hr); ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status);

1 0

Alistair Leslie-Hughes : oledb32: Correct typos.
by Alexandre Julliard 29 May '13

29 May '13

Module: wine Branch: master Commit: 5137fa71eda0d28e9316395bf513b14e31e0e002 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5137fa71eda0d28e9316395bf… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed May 29 19:05:44 2013 +1000 oledb32: Correct typos. --- dlls/oledb32/convert.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 811a165..ef2019c 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -1338,7 +1338,7 @@ static HRESULT WINAPI convert_GetConversionSize(IDataConvert* iface, if(V_VT((VARIANT*)src) == VT_BSTR) *dst_len = (SysStringLen(V_BSTR((VARIANT*)src))+1) * sizeof(WCHAR); else - WARN("DBTYPE_BYTES->DBTYPE_VARIANT(%d) unimplemented\n", V_VT((VARIANT*)src)); + WARN("DBTYPE_VARIANT(%d)->DBTYPE_WSTR unimplemented\n", V_VT((VARIANT*)src)); break; case DBTYPE_STR: if(src_len) @@ -1364,7 +1364,7 @@ static HRESULT WINAPI convert_GetConversionSize(IDataConvert* iface, if(V_VT((VARIANT*)src) == VT_BSTR) *dst_len = (SysStringLen(V_BSTR((VARIANT*)src))) / sizeof(WCHAR); else - WARN("DBTYPE_BYTES->DBTYPE_VARIANT(%d) unimplemented\n", V_VT((VARIANT*)src)); + WARN("DBTYPE_VARIANT(%d)->DBTYPE_BYTES unimplemented\n", V_VT((VARIANT*)src)); break; default: FIXME("unimplemented for %04x -> DBTYPE_BYTES\n", src_type);

1 0