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

Marcus Meissner : dsound: Do not test undefined behaviour (Coverity).
by Alexandre Julliard 09 May '13

09 May '13

Module: wine Branch: master Commit: 81ea726e647bab7ba651c901e0e77a2ec8e96505 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81ea726e647bab7ba651c901e… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu May 9 13:08:45 2013 +0200 dsound: Do not test undefined behaviour (Coverity). --- dlls/dsound/tests/dsound.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index ed17f2a..4291e7a 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -1578,12 +1578,6 @@ START_TEST(dsound) ret = FreeLibrary(hDsound); ok( ret, "FreeLibrary(1) returned %d\n", GetLastError()); - SetLastError(0xdeadbeef); - ret = FreeLibrary(hDsound); - ok( ret || - broken(!ret && GetLastError() == ERROR_MOD_NOT_FOUND), /* NT4 */ - "FreeLibrary(2) returned %d\n", GetLastError()); - ok(!FreeLibrary(hDsound), "DirectSound DLL still loaded\n"); } hDsound = LoadLibrary("dsound.dll");

1 0

Marcus Meissner : dplayx: Remove wrong HeapFree (Coverity).
by Alexandre Julliard 09 May '13

09 May '13

Module: wine Branch: master Commit: cef28ff30cca633f27bb599c926424f89fb9637e URL: http://source.winehq.org/git/wine.git/?a=commit;h=cef28ff30cca633f27bb599c9… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu May 9 13:19:50 2013 +0200 dplayx: Remove wrong HeapFree (Coverity). --- dlls/dplayx/dplaysp.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/dplayx/dplaysp.c b/dlls/dplayx/dplaysp.c index 9a70901..899348e 100644 --- a/dlls/dplayx/dplaysp.c +++ b/dlls/dplayx/dplaysp.c @@ -384,13 +384,11 @@ static HRESULT WINAPI IDirectPlaySPImpl_GetSPPlayerData /* What to do in the case where there is nothing set yet? */ if( dwFlags == DPSET_LOCAL ) { - HeapFree( GetProcessHeap(), 0, lpPlayerData->lpPlayerLocalData ); *lplpData = lpPlayerData->lpPlayerLocalData; *lpdwDataSize = lpPlayerData->dwPlayerLocalDataSize; } else if( dwFlags == DPSET_REMOTE ) { - HeapFree( GetProcessHeap(), 0, lpPlayerData->lpPlayerRemoteData ); *lplpData = lpPlayerData->lpPlayerRemoteData; *lpdwDataSize = lpPlayerData->dwPlayerRemoteDataSize; }

1 0

André Hentschel : d3drm: Add IDirect3DRMFace interface .
by Alexandre Julliard 09 May '13

09 May '13

Module: wine Branch: master Commit: 9bce3a920bbe651cccb8fe892871f35dfe8570df URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bce3a920bbe651cccb8fe892… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu May 9 14:43:12 2013 +0200 d3drm: Add IDirect3DRMFace interface. --- dlls/d3drm/Makefile.in | 1 + dlls/d3drm/d3drm.c | 8 +- dlls/d3drm/d3drm_private.h | 1 + dlls/d3drm/face.c | 419 ++++++++++++++++++++++++++++++++++++++++++++ dlls/d3drm/meshbuilder.c | 4 +- 5 files changed, 427 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9bce3a920bbe651cccb8f…

1 0

André Hentschel : d3drm: Add IDirect3DRMFace2 interface.
by Alexandre Julliard 09 May '13

09 May '13

Module: wine Branch: master Commit: 9dcdbfab49efae2060d2ceb2010ccd8a7d330205 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9dcdbfab49efae2060d2ceb20… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu May 9 14:43:39 2013 +0200 d3drm: Add IDirect3DRMFace2 interface. --- dlls/d3drm/d3drm.c | 8 +- dlls/d3drm/d3drm_private.h | 2 +- dlls/d3drm/face.c | 359 ++++++++++++++++++++++++++++++++++++++++++- dlls/d3drm/meshbuilder.c | 6 +- 4 files changed, 358 insertions(+), 17 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9dcdbfab49efae2060d2c…

1 0

André Hentschel : d3drm/tests: Initial IDirect3DRMFace tests.
by Alexandre Julliard 09 May '13

09 May '13

Module: wine Branch: master Commit: 1a2271830b291831b2cccc4c2bf12b72b6731ea5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a2271830b291831b2cccc4c2… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu May 9 14:44:25 2013 +0200 d3drm/tests: Initial IDirect3DRMFace tests. --- dlls/d3drm/tests/d3drm.c | 154 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 154 insertions(+), 0 deletions(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 0f6fc10..db9d623 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -666,6 +666,159 @@ static void test_Mesh(void) IDirect3DRM_Release(d3drm); } +static void test_Face(void) +{ + HRESULT hr; + IDirect3DRM *d3drm; + IDirect3DRM2 *d3drm2; + IDirect3DRM3 *d3drm3; + IDirect3DRMMeshBuilder2 *MeshBuilder2; + IDirect3DRMMeshBuilder3 *MeshBuilder3; + IDirect3DRMFace *face1; + IDirect3DRMFace2 *face2; + IDirect3DRMFaceArray *array1; + DWORD count; + CHAR cname[64] = {0}; + int icount; + + hr = pDirect3DRMCreate(&d3drm); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); + + hr = IDirect3DRM_CreateFace(d3drm, &face1); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFace interface (hr = %x)\n", hr); + if (FAILED(hr)) + { + skip("Cannot get IDirect3DRMFace interface (hr = %x), skipping tests\n", hr); + IDirect3DRM_Release(d3drm); + return; + } + + hr = IDirect3DRMFace_GetClassName(face1, NULL, cname); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + hr = IDirect3DRMFace_GetClassName(face1, NULL, NULL); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + count = 1; + hr = IDirect3DRMFace_GetClassName(face1, &count, cname); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + count = sizeof(cname); + hr = IDirect3DRMFace_GetClassName(face1, &count, cname); + ok(hr == D3DRM_OK, "Cannot get classname (hr = %x)\n", hr); + ok(count == sizeof("Face"), "wrong size: %u\n", count); + ok(!strcmp(cname, "Face"), "Expected cname to be \"Face\", but got \"%s\"\n", cname); + + icount = IDirect3DRMFace_GetVertexCount(face1); + ok(!icount, "wrong VertexCount: %i\n", icount); + + IDirect3DRMFace_Release(face1); + + if (FAILED(hr = IDirect3DRM_QueryInterface(d3drm, &IID_IDirect3DRM2, (void **)&d3drm2))) + { + win_skip("Cannot get IDirect3DRM2 interface (hr = %x), skipping tests\n", hr); + IDirect3DRM_Release(d3drm); + return; + } + + hr = IDirect3DRM2_CreateMeshBuilder(d3drm2, &MeshBuilder2); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMeshBuilder2 interface (hr = %x)\n", hr); + + icount = IDirect3DRMMeshBuilder2_GetFaceCount(MeshBuilder2); + ok(!icount, "wrong FaceCount: %i\n", icount); + + array1 = NULL; + hr = IDirect3DRMMeshBuilder2_GetFaces(MeshBuilder2, &array1); + todo_wine + ok(hr == D3DRM_OK, "Cannot get FaceArray (hr = %x)\n", hr); + + hr = IDirect3DRMMeshBuilder2_CreateFace(MeshBuilder2, &face1); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFace interface (hr = %x)\n", hr); + + icount = IDirect3DRMMeshBuilder2_GetFaceCount(MeshBuilder2); + todo_wine + ok(icount == 1, "wrong FaceCount: %i\n", icount); + + array1 = NULL; + hr = IDirect3DRMMeshBuilder2_GetFaces(MeshBuilder2, &array1); + todo_wine + ok(hr == D3DRM_OK, "Cannot get FaceArray (hr = %x)\n", hr); + todo_wine + ok(array1 != NULL, "pArray = %p\n", array1); + if (array1) + { + IDirect3DRMFace *face; + count = IDirect3DRMFaceArray_GetSize(array1); + ok(count == 1, "count = %u\n", count); + hr = IDirect3DRMFaceArray_GetElement(array1, 0, &face); + ok(hr == D3DRM_OK, "Cannot get face (hr = %x)\n", hr); + IDirect3DRMFace_Release(face); + IDirect3DRMFaceArray_Release(array1); + } + + icount = IDirect3DRMFace_GetVertexCount(face1); + ok(!icount, "wrong VertexCount: %i\n", icount); + + IDirect3DRMFace_Release(face1); + IDirect3DRMMeshBuilder2_Release(MeshBuilder2); + + if (FAILED(hr = IDirect3DRM_QueryInterface(d3drm, &IID_IDirect3DRM3, (void **)&d3drm3))) + { + win_skip("Cannot get IDirect3DRM3 interface (hr = %x), skipping tests\n", hr); + IDirect3DRM_Release(d3drm); + return; + } + + hr = IDirect3DRM3_CreateMeshBuilder(d3drm3, &MeshBuilder3); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMeshBuilder3 interface (hr = %x)\n", hr); + + icount = IDirect3DRMMeshBuilder3_GetFaceCount(MeshBuilder3); + ok(!icount, "wrong FaceCount: %i\n", icount); + + hr = IDirect3DRMMeshBuilder3_CreateFace(MeshBuilder3, &face2); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFace2 interface (hr = %x)\n", hr); + + hr = IDirect3DRMFace2_GetClassName(face2, NULL, cname); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + hr = IDirect3DRMFace2_GetClassName(face2, NULL, NULL); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + count = 1; + hr = IDirect3DRMFace2_GetClassName(face2, &count, cname); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + count = sizeof(cname); + hr = IDirect3DRMFace2_GetClassName(face2, &count, cname); + ok(hr == D3DRM_OK, "Cannot get classname (hr = %x)\n", hr); + ok(count == sizeof("Face"), "wrong size: %u\n", count); + ok(!strcmp(cname, "Face"), "Expected cname to be \"Face\", but got \"%s\"\n", cname); + + icount = IDirect3DRMMeshBuilder3_GetFaceCount(MeshBuilder3); + todo_wine + ok(icount == 1, "wrong FaceCount: %i\n", icount); + + array1 = NULL; + hr = IDirect3DRMMeshBuilder3_GetFaces(MeshBuilder3, &array1); + todo_wine + ok(hr == D3DRM_OK, "Cannot get FaceArray (hr = %x)\n", hr); + todo_wine + ok(array1 != NULL, "pArray = %p\n", array1); + if (array1) + { + IDirect3DRMFace *face; + count = IDirect3DRMFaceArray_GetSize(array1); + ok(count == 1, "count = %u\n", count); + hr = IDirect3DRMFaceArray_GetElement(array1, 0, &face); + ok(hr == D3DRM_OK, "Cannot get face (hr = %x)\n", hr); + IDirect3DRMFace_Release(face); + IDirect3DRMFaceArray_Release(array1); + } + + icount = IDirect3DRMFace2_GetVertexCount(face2); + ok(!icount, "wrong VertexCount: %i\n", icount); + + IDirect3DRMFace2_Release(face2); + IDirect3DRMMeshBuilder3_Release(MeshBuilder3); + IDirect3DRM3_Release(d3drm3); + IDirect3DRM2_Release(d3drm2); + IDirect3DRM_Release(d3drm); +} + static void test_Frame(void) { HRESULT hr; @@ -1496,6 +1649,7 @@ START_TEST(d3drm) test_MeshBuilder(); test_MeshBuilder3(); test_Mesh(); + test_Face(); test_Frame(); test_Device(); test_Viewport();

1 0

Andrew Eikum : oleaut32: COM cleanup for ITypeLib object.
by Alexandre Julliard 09 May '13

09 May '13

Module: wine Branch: master Commit: 19f3bbc9034a8fcb19db27810f48597f716bdda5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19f3bbc9034a8fcb19db27810… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed May 8 15:12:41 2013 -0500 oleaut32: COM cleanup for ITypeLib object. --- dlls/oleaut32/typelib.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 6d37bd4..e62fa84 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -984,7 +984,7 @@ typedef struct tagTLBImpLib typedef struct tagITypeLibImpl { ITypeLib2 ITypeLib2_iface; - const ITypeCompVtbl *lpVtblTypeComp; + ITypeComp ITypeComp_iface; LONG ref; TLIBATTR LibAttr; /* guid,lcid,syskind,version,flags */ LCID lcid; @@ -1020,7 +1020,7 @@ static const ITypeCompVtbl tlbtcvt; static inline ITypeLibImpl *impl_from_ITypeComp( ITypeComp *iface ) { - return (ITypeLibImpl *)((char*)iface - FIELD_OFFSET(ITypeLibImpl, lpVtblTypeComp)); + return CONTAINING_RECORD(iface, ITypeLibImpl, ITypeComp_iface); } /* ITypeLib methods */ @@ -2988,7 +2988,7 @@ static ITypeLibImpl* TypeLibImpl_Constructor(void) if (!pTypeLibImpl) return NULL; pTypeLibImpl->ITypeLib2_iface.lpVtbl = &tlbvt; - pTypeLibImpl->lpVtblTypeComp = &tlbtcvt; + pTypeLibImpl->ITypeComp_iface.lpVtbl = &tlbtcvt; pTypeLibImpl->ref = 1; list_init(&pTypeLibImpl->implib_list); @@ -4438,7 +4438,7 @@ static HRESULT WINAPI ITypeLib2_fnGetTypeComp( ITypeLibImpl *This = impl_from_ITypeLib2(iface); TRACE("(%p)->(%p)\n",This,ppTComp); - *ppTComp = (ITypeComp *)&This->lpVtblTypeComp; + *ppTComp = &This->ITypeComp_iface; ITypeComp_AddRef(*ppTComp); return S_OK;

1 0

Andrew Eikum : oleaut32: COM cleanup for ITypeInfo object.
by Alexandre Julliard 09 May '13

09 May '13

Module: wine Branch: master Commit: ddcd368b281e0c7fb1a1fb7b890bab7cbd7bfdea URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddcd368b281e0c7fb1a1fb7b8… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed May 8 15:12:45 2013 -0500 oleaut32: COM cleanup for ITypeInfo object. --- dlls/oleaut32/typelib.c | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index e62fa84..c6d2189 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -1094,8 +1094,8 @@ typedef struct tagTLBImplType /* internal TypeInfo data */ typedef struct tagITypeInfoImpl { - const ITypeInfo2Vtbl *lpVtbl; - const ITypeCompVtbl *lpVtblTypeComp; + ITypeInfo2 ITypeInfo2_iface; + ITypeComp ITypeComp_iface; LONG ref; BOOL not_attached_to_typelib; TYPEATTR TypeAttr ; /* _lots_ of type information. */ @@ -1125,7 +1125,7 @@ typedef struct tagITypeInfoImpl static inline ITypeInfoImpl *info_impl_from_ITypeComp( ITypeComp *iface ) { - return (ITypeInfoImpl *)((char*)iface - FIELD_OFFSET(ITypeInfoImpl, lpVtblTypeComp)); + return CONTAINING_RECORD(iface, ITypeInfoImpl, ITypeComp_iface); } static const ITypeInfo2Vtbl tinfvt; @@ -4884,7 +4884,7 @@ static HRESULT WINAPI ITypeLibComp_fnBind( if (pTypeInfo->Name && !strcmpW(pTypeInfo->Name, szName)) { *pDescKind = DESCKIND_TYPECOMP; - pBindPtr->lptcomp = (ITypeComp *)&pTypeInfo->lpVtblTypeComp; + pBindPtr->lptcomp = &pTypeInfo->ITypeComp_iface; ITypeComp_AddRef(pBindPtr->lptcomp); TRACE("module or enum: %s\n", debugstr_w(szName)); return S_OK; @@ -4894,7 +4894,7 @@ static HRESULT WINAPI ITypeLibComp_fnBind( if ((pTypeInfo->TypeAttr.typekind == TKIND_MODULE) || (pTypeInfo->TypeAttr.typekind == TKIND_ENUM)) { - ITypeComp *pSubTypeComp = (ITypeComp *)&pTypeInfo->lpVtblTypeComp; + ITypeComp *pSubTypeComp = &pTypeInfo->ITypeComp_iface; HRESULT hr; hr = ITypeComp_Bind(pSubTypeComp, szName, lHash, wFlags, ppTInfo, pDescKind, pBindPtr); @@ -4910,7 +4910,7 @@ static HRESULT WINAPI ITypeLibComp_fnBind( if ((pTypeInfo->TypeAttr.typekind == TKIND_COCLASS) && (pTypeInfo->TypeAttr.wTypeFlags & TYPEFLAG_FAPPOBJECT)) { - ITypeComp *pSubTypeComp = (ITypeComp *)&pTypeInfo->lpVtblTypeComp; + ITypeComp *pSubTypeComp = &pTypeInfo->ITypeComp_iface; HRESULT hr; ITypeInfo *subtypeinfo; BINDPTR subbindptr; @@ -5013,9 +5013,9 @@ static HRESULT WINAPI ITypeLibComp_fnBindType( if (pTypeInfo->Name && !strcmpiW(pTypeInfo->Name, szName)) { TRACE("returning %p\n", pTypeInfo); - *ppTInfo = (ITypeInfo *)&pTypeInfo->lpVtbl; + *ppTInfo = (ITypeInfo *)&pTypeInfo->ITypeInfo2_iface; ITypeInfo_AddRef(*ppTInfo); - *ppTComp = (ITypeComp *)&pTypeInfo->lpVtblTypeComp; + *ppTComp = &pTypeInfo->ITypeComp_iface; ITypeComp_AddRef(*ppTComp); return S_OK; } @@ -5046,8 +5046,8 @@ static ITypeInfoImpl* ITypeInfoImpl_Constructor(void) pTypeInfoImpl = heap_alloc_zero(sizeof(ITypeInfoImpl)); if (pTypeInfoImpl) { - pTypeInfoImpl->lpVtbl = &tinfvt; - pTypeInfoImpl->lpVtblTypeComp = &tcompvt; + pTypeInfoImpl->ITypeInfo2_iface.lpVtbl = &tinfvt; + pTypeInfoImpl->ITypeComp_iface.lpVtbl = &tcompvt; pTypeInfoImpl->ref = 0; pTypeInfoImpl->hreftype = -1; pTypeInfoImpl->TypeAttr.memidConstructor = MEMBERID_NIL; @@ -5238,7 +5238,7 @@ static HRESULT WINAPI ITypeInfo_fnGetTypeComp( ITypeInfo2 *iface, TRACE("(%p)->(%p)\n", This, ppTComp); - *ppTComp = (ITypeComp *)&This->lpVtblTypeComp; + *ppTComp = &This->ITypeComp_iface; ITypeComp_AddRef(*ppTComp); return S_OK; } @@ -6999,7 +6999,7 @@ static HRESULT WINAPI ITypeInfo_fnGetRefTypeInfo( if ((This->hreftype != -1) && (This->hreftype == hRefType)) { - *ppTInfo = (ITypeInfo *)&This->lpVtbl; + *ppTInfo = (ITypeInfo *)&This->ITypeInfo2_iface; ITypeInfo_AddRef(*ppTInfo); result = S_OK; } @@ -7913,7 +7913,7 @@ static HRESULT WINAPI ITypeComp_fnBind( if (FAILED(hr)) return hr; *pDescKind = DESCKIND_FUNCDESC; - *ppTInfo = (ITypeInfo *)&This->lpVtbl; + *ppTInfo = (ITypeInfo *)&This->ITypeInfo2_iface; ITypeInfo_AddRef(*ppTInfo); return S_OK; } else { @@ -7923,7 +7923,7 @@ static HRESULT WINAPI ITypeComp_fnBind( if (FAILED(hr)) return hr; *pDescKind = DESCKIND_VARDESC; - *ppTInfo = (ITypeInfo *)&This->lpVtbl; + *ppTInfo = (ITypeInfo *)&This->ITypeInfo2_iface; ITypeInfo_AddRef(*ppTInfo); return S_OK; } @@ -7934,7 +7934,7 @@ static HRESULT WINAPI ITypeComp_fnBind( ITypeInfo *pTInfo; ITypeComp *pTComp; HRESULT hr; - hr=ITypeInfo_GetRefTypeInfo((ITypeInfo *)&This->lpVtbl, This->impltypes[0].hRef, &pTInfo); + hr=ITypeInfo2_GetRefTypeInfo(&This->ITypeInfo2_iface, This->impltypes[0].hRef, &pTInfo); if (SUCCEEDED(hr)) { hr = ITypeInfo_GetTypeComp(pTInfo,&pTComp);

1 0

Andrew Eikum : oleaut32: COM cleanup for internal loading structures.
by Alexandre Julliard 09 May '13

09 May '13

Module: wine Branch: master Commit: 8897f6034c384ccac5273af77cef6a0f748c12e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8897f6034c384ccac5273af77… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed May 8 15:12:49 2013 -0500 oleaut32: COM cleanup for internal loading structures. --- dlls/oleaut32/typelib.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index c6d2189..f13024e 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -2458,7 +2458,7 @@ static CRITICAL_SECTION cache_section = { &cache_section_debug, -1, 0, 0, 0, 0 } typedef struct TLB_PEFile { - const IUnknownVtbl *lpvtbl; + IUnknown IUnknown_iface; LONG refs; HMODULE dll; HRSRC typelib_resource; @@ -2515,7 +2515,7 @@ static HRESULT TLB_PEFile_Open(LPCWSTR path, INT index, LPVOID *ppBase, DWORD *p if (!This) return E_OUTOFMEMORY; - This->lpvtbl = &TLB_PEFile_Vtable; + This->IUnknown_iface.lpVtbl = &TLB_PEFile_Vtable; This->refs = 1; This->dll = NULL; This->typelib_resource = NULL; @@ -2540,7 +2540,7 @@ static HRESULT TLB_PEFile_Open(LPCWSTR path, INT index, LPVOID *ppBase, DWORD *p { *pdwTLBLength = SizeofResource(This->dll, This->typelib_resource); *ppBase = This->typelib_base; - *ppFile = (IUnknown *)&This->lpvtbl; + *ppFile = &This->IUnknown_iface; return S_OK; } } @@ -2550,13 +2550,13 @@ static HRESULT TLB_PEFile_Open(LPCWSTR path, INT index, LPVOID *ppBase, DWORD *p hr = E_FAIL; } - TLB_PEFile_Release((IUnknown *)&This->lpvtbl); + TLB_PEFile_Release(&This->IUnknown_iface); return hr; } typedef struct TLB_NEFile { - const IUnknownVtbl *lpvtbl; + IUnknown IUnknown_iface; LONG refs; LPVOID typelib_base; } TLB_NEFile; @@ -2738,7 +2738,7 @@ static HRESULT TLB_NEFile_Open(LPCWSTR path, INT index, LPVOID *ppBase, DWORD *p This = heap_alloc(sizeof(TLB_NEFile)); if (!This) return E_OUTOFMEMORY; - This->lpvtbl = &TLB_NEFile_Vtable; + This->IUnknown_iface.lpVtbl = &TLB_NEFile_Vtable; This->refs = 1; This->typelib_base = NULL; @@ -2758,20 +2758,20 @@ static HRESULT TLB_NEFile_Open(LPCWSTR path, INT index, LPVOID *ppBase, DWORD *p LZClose( lzfd ); *ppBase = This->typelib_base; *pdwTLBLength = reslen; - *ppFile = (IUnknown *)&This->lpvtbl; + *ppFile = &This->IUnknown_iface; return S_OK; } } } if( lzfd >= 0) LZClose( lzfd ); - TLB_NEFile_Release((IUnknown *)&This->lpvtbl); + TLB_NEFile_Release(&This->IUnknown_iface); return hr; } typedef struct TLB_Mapping { - const IUnknownVtbl *lpvtbl; + IUnknown IUnknown_iface; LONG refs; HANDLE file; HANDLE mapping; @@ -2828,7 +2828,7 @@ static HRESULT TLB_Mapping_Open(LPCWSTR path, LPVOID *ppBase, DWORD *pdwTLBLengt if (!This) return E_OUTOFMEMORY; - This->lpvtbl = &TLB_Mapping_Vtable; + This->IUnknown_iface.lpVtbl = &TLB_Mapping_Vtable; This->refs = 1; This->file = INVALID_HANDLE_VALUE; This->mapping = NULL; @@ -2846,13 +2846,13 @@ static HRESULT TLB_Mapping_Open(LPCWSTR path, LPVOID *ppBase, DWORD *pdwTLBLengt /* retrieve file size */ *pdwTLBLength = GetFileSize(This->file, NULL); *ppBase = This->typelib_base; - *ppFile = (IUnknown *)&This->lpvtbl; + *ppFile = &This->IUnknown_iface; return S_OK; } } } - IUnknown_Release((IUnknown *)&This->lpvtbl); + IUnknown_Release(&This->IUnknown_iface); return TYPE_E_CANTLOADLIBRARY; }

1 0

Hans Leidekker : msi: Set the PrimaryVolumePath and PrimaryVolumeSpaceAvailable properties.
by Alexandre Julliard 09 May '13

09 May '13

Module: wine Branch: master Commit: 10975967dfcca8956f4e9aead47f7562d731010b URL: http://source.winehq.org/git/wine.git/?a=commit;h=10975967dfcca8956f4e9aead… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 9 09:49:10 2013 +0200 msi: Set the PrimaryVolumePath and PrimaryVolumeSpaceAvailable properties. --- dlls/msi/action.c | 48 ++++++++++++++++++---- dlls/msi/tests/install.c | 101 +++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 140 insertions(+), 9 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index cf03fa2..f519f4b 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2365,14 +2365,21 @@ void msi_resolve_target_folder( MSIPACKAGE *package, const WCHAR *name, BOOL loa static UINT ACTION_CostFinalize(MSIPACKAGE *package) { - static const WCHAR query[] = { - 'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', - '`','C','o','n','d','i','t','i','o','n','`',0}; - static const WCHAR szOutOfDiskSpace[] = { - 'O','u','t','O','f','D','i','s','k','S','p','a','c','e',0}; + static const WCHAR query[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', + '`','C','o','n','d','i','t','i','o','n','`',0}; + static const WCHAR szOutOfDiskSpace[] = + {'O','u','t','O','f','D','i','s','k','S','p','a','c','e',0}; + static const WCHAR szPrimaryFolder[] = + {'P','R','I','M','A','R','Y','F','O','L','D','E','R',0}; + static const WCHAR szPrimaryVolumePath[] = + {'P','r','i','m','a','r','y','V','o','l','u','m','e','P','a','t','h',0}; + static const WCHAR szPrimaryVolumeSpaceAvailable[] = + {'P','r','i','m','a','r','y','V','o','l','u','m','e','S','p','a','c','e', + 'A','v','a','i','l','a','b','l','e',0}; MSICOMPONENT *comp; MSIQUERY *view; - LPWSTR level; + WCHAR *level, *primary_key, *primary_folder; UINT rc; TRACE("Building directory properties\n"); @@ -2415,10 +2422,35 @@ static UINT ACTION_CostFinalize(MSIPACKAGE *package) msi_set_property( package->db, szCostingComplete, szOne, -1 ); /* set default run level if not set */ level = msi_dup_property( package->db, szInstallLevel ); - if (!level) - msi_set_property( package->db, szInstallLevel, szOne, -1 ); + if (!level) msi_set_property( package->db, szInstallLevel, szOne, -1 ); msi_free(level); + if ((primary_key = msi_dup_property( package->db, szPrimaryFolder ))) + { + if ((primary_folder = msi_dup_property( package->db, primary_key ))) + { + if (((primary_folder[0] >= 'A' && primary_folder[0] <= 'Z') || + (primary_folder[0] >= 'a' && primary_folder[0] <= 'z')) && primary_folder[1] == ':') + { + ULARGE_INTEGER free; + + primary_folder[2] = 0; + if (GetDiskFreeSpaceExW( primary_folder, &free, NULL, NULL )) + { + static const WCHAR fmtW[] = {'%','l','u',0}; + WCHAR buf[21]; + + sprintfW( buf, fmtW, free.QuadPart / 512 ); + msi_set_property( package->db, szPrimaryVolumeSpaceAvailable, buf, -1 ); + } + toupperW( primary_folder[0] ); + msi_set_property( package->db, szPrimaryVolumePath, primary_folder, 2 ); + } + msi_free( primary_folder ); + } + msi_free( primary_key ); + } + /* FIXME: check volume disk space */ msi_set_property( package->db, szOutOfDiskSpace, szZero, -1 ); diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index f343c02..e910fa0 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -158,6 +158,7 @@ static const CHAR property_dat[] = "Property\tValue\n" "InstallMode\tTypical\n" "Manufacturer\tWine\n" "PIDTemplate\t12345<###-%%%%%%%>@@@@@\n" + "PRIMARYFOLDER\tTARGETDIR\n" "ProductCode\t{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}\n" "ProductID\tnone\n" "ProductLanguage\t1033\n" @@ -1288,6 +1289,65 @@ static const char mixed_install_exec_seq_dat[] = "PublishProduct\t\t1300\n" "InstallFinalize\t\t1400\n"; +static const char vp_file_dat[] = + "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" + "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" + "File\tFile\n" + "volumeprop\tcomp\tvolumeprop.txt\t1000\t\t\t8192\t1\n"; + +static const char vp_feature_dat[] = + "Feature\tFeature_Parent\tTitle\tDescription\tDisplay\tLevel\tDirectory_\tAttributes\n" + "s38\tS38\tL64\tL255\tI2\ti2\tS72\ti2\n" + "Feature\tFeature\n" + "feature\t\t\t\t1\t2\tMSITESTDIR\t0\n"; + +static const char vp_feature_comp_dat[] = + "Feature_\tComponent_\n" + "s38\ts72\n" + "FeatureComponents\tFeature_\tComponent_\n" + "feature\tcomp\n"; + +static const char vp_component_dat[] = + "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" + "s72\tS38\ts72\ti2\tS255\tS72\n" + "Component\tComponent\n" + "comp\t{24364AE7-5B7F-496C-AF5A-54893639C567}\tMSITESTDIR\t0\t\tvolumeprop\n"; + +static const char vp_custom_action_dat[] = + "Action\tType\tSource\tTarget\tISComments\n" + "s72\ti2\tS64\tS0\tS255\n" + "CustomAction\tAction\n" + "TestPrimaryVolumePath0\t19\t\tPrimaryVolumePath set before CostFinalize\t\n" + "TestPrimaryVolumeSpaceAvailable0\t19\t\tPrimaryVolumeSpaceAvailable set before CostFinalize\t\n" + "TestPrimaryVolumePath1\t19\t\tPrimaryVolumePath set before InstallValidate\t\n" + "TestPrimaryVolumeSpaceAvailable1\t19\t\tPrimaryVolumeSpaceAvailable not set before InstallValidate\t\n" + "TestPrimaryVolumePath2\t19\t\tPrimaryVolumePath not set after InstallValidate\t\n" + "TestPrimaryVolumeSpaceAvailable2\t19\t\tPrimaryVolumeSpaceAvailable not set after InstallValidate\t\n"; + +static const char vp_install_exec_seq_dat[] = + "Action\tCondition\tSequence\n" + "s72\tS255\tI2\n" + "InstallExecuteSequence\tAction\n" + "LaunchConditions\t\t100\n" + "CostInitialize\t\t200\n" + "FileCost\t\t300\n" + "TestPrimaryVolumePath0\tPrimaryVolumePath AND NOT REMOVE\t400\n" + "TestPrimaryVolumeSpaceAvailable0\tPrimaryVolumeSpaceAvailable AND NOT REMOVE\t500\n" + "CostFinalize\t\t600\n" + "TestPrimaryVolumePath1\tPrimaryVolumePath AND NOT REMOVE\t600\n" + "TestPrimaryVolumeSpaceAvailable1\tNOT PrimaryVolumeSpaceAvailable AND NOT REMOVE\t800\n" + "InstallValidate\t\t900\n" + "TestPrimaryVolumePath2\tNOT PrimaryVolumePath AND NOT REMOVE\t1000\n" + "TestPrimaryVolumeSpaceAvailable2\tNOT PrimaryVolumeSpaceAvailable AND NOT REMOVE\t1100\n" + "InstallInitialize\t\t1200\n" + "ProcessComponents\t\t1300\n" + "RemoveFiles\t\t1400\n" + "InstallFiles\t\t1500\n" + "RegisterProduct\t\t1600\n" + "PublishFeatures\t\t1700\n" + "PublishProduct\t\t1800\n" + "InstallFinalize\t\t1900\n"; + typedef struct _msi_table { const CHAR *filename; @@ -1991,6 +2051,19 @@ static const msi_table mixed_tables[] = ADD_TABLE(property) }; +static const msi_table vp_tables[] = +{ + ADD_TABLE(directory), + ADD_TABLE(vp_file), + ADD_TABLE(vp_component), + ADD_TABLE(vp_feature), + ADD_TABLE(vp_feature_comp), + ADD_TABLE(vp_custom_action), + ADD_TABLE(vp_install_exec_seq), + ADD_TABLE(media), + ADD_TABLE(property) +}; + /* cabinet definitions */ /* make the max size large so there is only one cab file */ @@ -6293,7 +6366,32 @@ static void test_mixed_package(void) error: DeleteFileA( msifile ); - return; +} + +static void test_volume_props(void) +{ + UINT r; + + if (is_process_limited()) + { + skip("process is limited\n"); + return; + } + CreateDirectoryA("msitest", NULL); + create_file("msitest\\volumeprop.txt", 1000); + create_database(msifile, vp_tables, sizeof(vp_tables)/sizeof(msi_table)); + + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); + + r = MsiInstallProductA(msifile, NULL); + ok(r == ERROR_SUCCESS, "got %u\n", r); + + r = MsiInstallProductA(msifile, "REMOVE=ALL"); + ok(r == ERROR_SUCCESS, "got %u\n", r); + + DeleteFileA("msitest\\volumeprop.txt"); + RemoveDirectoryA("msitest"); + DeleteFile(msifile); } START_TEST(install) @@ -6384,6 +6482,7 @@ START_TEST(install) test_command_line_parsing(); test_upgrade_code(); test_mixed_package(); + test_volume_props(); DeleteFileA(log_file);

1 0

Marcus Meissner : mshtml: Specify correct variable in TRACE (Coverity).
by Alexandre Julliard 09 May '13

09 May '13

Module: wine Branch: master Commit: 423a8ccce8ff6b2d97ea0a1b6573135ae46dc107 URL: http://source.winehq.org/git/wine.git/?a=commit;h=423a8ccce8ff6b2d97ea0a1b6… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu May 9 10:22:06 2013 +0200 mshtml: Specify correct variable in TRACE (Coverity). --- dlls/mshtml/dispex.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index d70ae2d..54154aa 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -267,7 +267,7 @@ static void add_func_info(dispex_data_t *data, DWORD *size, tid_t tid, const FUN info->prop_vt = desc->elemdescFunc.tdesc.vt; if(info->prop_vt != VT_VOID && !is_arg_type_supported(info->prop_vt)) { - TRACE("%s: return type %d\n", debugstr_w(info->name), info->arg_types[i]); + TRACE("%s: return type %d\n", debugstr_w(info->name), info->prop_vt); return; /* Fallback to ITypeInfo::Invoke */ }

1 0