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

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

May 29, 2013

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 : ole32: Fix test under NT.
by Alexandre Julliard May 29, 2013

May 29, 2013

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: Correct typos.
by Alexandre Julliard May 29, 2013

May 29, 2013

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

Andrew Eikum : oleaut32: Improve TYPEFLAG_FDUAL handling.
by Alexandre Julliard May 29, 2013

May 29, 2013

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 May 29, 2013

May 29, 2013

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 May 29, 2013

May 29, 2013

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 May 28, 2013

May 28, 2013

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

Marcus Meissner : wininet/tests: Avoid overflowing the buffer (Coverity).
by Alexandre Julliard May 28, 2013

May 28, 2013

Module: wine Branch: master Commit: 4c20fec04555a1a3053e7414e339fcc67bff9338 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c20fec04555a1a3053e7414e… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun May 26 14:40:12 2013 +0200 wininet/tests: Avoid overflowing the buffer (Coverity). --- dlls/wininet/tests/http.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 60fbe57..b42e732 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -613,7 +613,7 @@ static void InternetReadFile_test(int flags, const test_data_t *test) res = InternetQueryOptionA(hor,INTERNET_OPTION_URL,buffer,&length); ok(res, "InternetQueryOptionA(INTERNET_OPTION_URL) failed with error %d\n", GetLastError()); - length = sizeof(buffer); + length = sizeof(buffer)-1; res = HttpQueryInfoA(hor,HTTP_QUERY_RAW_HEADERS,buffer,&length,0x0); ok(res, "HttpQueryInfoA(HTTP_QUERY_RAW_HEADERS) failed with error %d\n", GetLastError()); buffer[length]=0;

1 0

Henri Verbeet : wined3d: Expose WINED3DVTXPCAPS_TEXGEN_SPHEREMAP.
by Alexandre Julliard May 28, 2013

May 28, 2013

Module: wine Branch: master Commit: 97b6299eaf882a5702fbbfe48fbc1adbeac4b927 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97b6299eaf882a5702fbbfe48… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 28 08:55:18 2013 +0200 wined3d: Expose WINED3DVTXPCAPS_TEXGEN_SPHEREMAP. Since we already implement it. Tweening will likely never work with fixed function GL. --- dlls/wined3d/state.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index bad4166..cdccb47 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -5658,13 +5658,13 @@ static void vp_ffp_get_caps(const struct wined3d_gl_info *gl_info, struct wined3 caps->max_active_lights = gl_info->limits.lights; caps->max_vertex_blend_matrices = gl_info->limits.blends; caps->max_vertex_blend_matrix_index = 0; - /* FIXME: Add D3DVTXPCAPS_TWEENING, D3DVTXPCAPS_TEXGEN_SPHEREMAP */ caps->vertex_processing_caps = WINED3DVTXPCAPS_DIRECTIONALLIGHTS | WINED3DVTXPCAPS_MATERIALSOURCE7 | WINED3DVTXPCAPS_POSITIONALLIGHTS | WINED3DVTXPCAPS_LOCALVIEWER | WINED3DVTXPCAPS_VERTEXFOG - | WINED3DVTXPCAPS_TEXGEN; + | WINED3DVTXPCAPS_TEXGEN + | WINED3DVTXPCAPS_TEXGEN_SPHEREMAP; caps->fvf_caps = WINED3DFVFCAPS_PSIZE | 0x0008; /* 8 texture coords */ caps->max_user_clip_planes = gl_info->limits.clipplanes; caps->raster_caps = 0;

1 0

Qian Hong : server: Automatically sets a socket to non-blocking mode when WSAAsyncSelect or WSAEventSelect is called even when lEvent is zero .
by Alexandre Julliard May 28, 2013

May 28, 2013

Module: wine Branch: master Commit: 31b9455b7e6d29f8cc46c59c1252d6e266e86f8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=31b9455b7e6d29f8cc46c59c1… Author: Qian Hong <qhong(a)codeweavers.com> Date: Wed May 22 16:51:38 2013 +0800 server: Automatically sets a socket to non-blocking mode when WSAAsyncSelect or WSAEventSelect is called even when lEvent is zero. --- dlls/ws2_32/tests/sock.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++ server/sock.c | 3 +- 2 files changed, 58 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 4612116..ff0d538 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3571,6 +3571,8 @@ static void test_events(int useMessages) goto end; } + ok(!set_blocking(src, TRUE), "set_blocking failed, error %d\n", WSAGetLastError()); + src2 = socket(AF_INET, SOCK_STREAM, 0); if (src2 == INVALID_SOCKET) { @@ -3578,6 +3580,8 @@ static void test_events(int useMessages) goto end; } + ok(!set_blocking(src2, TRUE), "set_blocking failed, error %d\n", WSAGetLastError()); + len = sizeof(BOOL); if (getsockopt(src, SOL_SOCKET, SO_OOBINLINE, (void *)&bret, &len) == SOCKET_ERROR) { @@ -3618,12 +3622,18 @@ static void test_events(int useMessages) goto end; } + ok(set_blocking(src, TRUE) == SOCKET_ERROR, "set_blocking should failed!\n"); + ok(WSAGetLastError() == WSAEINVAL, "expect WSAEINVAL, returned %x\n", WSAGetLastError()); + ret = WSAAsyncSelect(src2, hWnd, WM_SOCKET, FD_CONNECT | FD_READ | FD_OOB | FD_WRITE | FD_CLOSE); if (ret) { ok(0, "WSAAsyncSelect failed, error %d\n", ret); goto end; } + + ok(set_blocking(src2, TRUE) == SOCKET_ERROR, "set_blocking should failed!\n"); + ok(WSAGetLastError() == WSAEINVAL, "expect WSAEINVAL, returned %x\n", WSAGetLastError()); } else { @@ -3650,12 +3660,18 @@ static void test_events(int useMessages) goto end; } + ok(set_blocking(src, TRUE) == SOCKET_ERROR, "set_blocking should failed!\n"); + ok(WSAGetLastError() == WSAEINVAL, "expect WSAEINVAL, returned %x\n", WSAGetLastError()); + ret = WSAEventSelect(src2, hEvent2, FD_CONNECT | FD_READ | FD_OOB | FD_WRITE | FD_CLOSE); if (ret) { ok(0, "WSAEventSelect failed, error %d\n", ret); goto end; } + + ok(set_blocking(src2, TRUE) == SOCKET_ERROR, "set_blocking should failed!\n"); + ok(WSAGetLastError() == WSAEINVAL, "expect WSAEINVAL, returned %x\n", WSAGetLastError()); } server = socket(AF_INET, SOCK_STREAM, 0); @@ -3988,6 +4004,47 @@ static void test_events(int useMessages) ok(ret == 1, "Sending to half-closed socket failed %d err %d\n", ret, GetLastError()); ok_event_seq(src2, hEvent2, empty_seq, NULL, 0); + if (useMessages) + { + ret = WSAAsyncSelect(src, hWnd, WM_SOCKET, 0); + if (ret) + { + ok(0, "WSAAsyncSelect failed, error %d\n", ret); + goto end; + } + + ok(!set_blocking(src, TRUE), "set_blocking failed, error %d\n", WSAGetLastError()); + + ret = WSAAsyncSelect(src2, hWnd, WM_SOCKET, 0); + if (ret) + { + ok(0, "WSAAsyncSelect failed, error %d\n", ret); + goto end; + } + + ok(!set_blocking(src2, TRUE), "set_blocking failed, error %d\n", WSAGetLastError()); + } + else + { + ret = WSAEventSelect(src, hEvent2, 0); + if (ret) + { + ok(0, "WSAAsyncSelect failed, error %d\n", ret); + goto end; + } + + ok(!set_blocking(src, TRUE), "set_blocking failed, error %d\n", WSAGetLastError()); + + ret = WSAEventSelect(src2, hEvent2, 0); + if (ret) + { + ok(0, "WSAAsyncSelect failed, error %d\n", ret); + goto end; + } + + ok(!set_blocking(src2, TRUE), "set_blocking failed, error %d\n", WSAGetLastError()); + } + end: if (src != INVALID_SOCKET) { diff --git a/server/sock.c b/server/sock.c index ba18a66..5cb6d31 100644 --- a/server/sock.c +++ b/server/sock.c @@ -978,8 +978,7 @@ DECL_HANDLER(set_socket_event) sock_reselect( sock ); - if (sock->mask) - sock->state |= FD_WINE_NONBLOCKING; + sock->state |= FD_WINE_NONBLOCKING; /* if a network event is pending, signal the event object it is possible that FD_CONNECT or FD_ACCEPT network events has happened

1 0