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

Hans Leidekker : msi: The UI sequence exists if there are runnable actions in the InstallUISequence table .
by Alexandre Julliard 29 May '13

29 May '13

Module: wine Branch: master Commit: 74aa47fa8e3fbb7541723b1fcb051cc4ed0ad268 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74aa47fa8e3fbb7541723b1fc… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed May 29 12:15:39 2013 +0200 msi: The UI sequence exists if there are runnable actions in the InstallUISequence table. --- dlls/msi/action.c | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index e6422a7..1fa065b 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -409,18 +409,16 @@ static BOOL ui_sequence_exists( MSIPACKAGE *package ) static const WCHAR query [] = { 'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', '`','I','n','s','t','a','l','l','U','I','S','e','q','u','e','n','c','e','`',' ', - 'W','H','E','R','E',' ','`','S','e','q','u','e','n','c','e','`',' ','>',' ','0',' ', - 'O','R','D','E','R',' ','B','Y',' ','`','S','e','q','u','e','n','c','e','`',0}; + 'W','H','E','R','E',' ','`','S','e','q','u','e','n','c','e','`',' ','>',' ','0',0}; MSIQUERY *view; - UINT rc; + DWORD count = 0; - rc = MSI_DatabaseOpenViewW(package->db, query, &view); - if (rc == ERROR_SUCCESS) + if (!(MSI_DatabaseOpenViewW( package->db, query, &view ))) { - msiobj_release(&view->hdr); - return TRUE; + MSI_IterateRecords( view, &count, NULL, package ); + msiobj_release( &view->hdr ); } - return FALSE; + return count != 0; } UINT msi_set_sourcedir_props(MSIPACKAGE *package, BOOL replace)

1 0

Hans Leidekker : msi: Remove an unused parameter from action_type_matches_script.
by Alexandre Julliard 29 May '13

29 May '13

Module: wine Branch: master Commit: 1be1b8433a6ccdf26e6bf6f8f8b8c236ac23e35e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1be1b8433a6ccdf26e6bf6f8f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed May 29 12:16:17 2013 +0200 msi: Remove an unused parameter from action_type_matches_script. --- dlls/msi/custom.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 5b58976..33be99b 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -1118,7 +1118,7 @@ static UINT HANDLE_CustomType53_54( MSIPACKAGE *package, const WCHAR *source, co return wait_thread_handle( info ); } -static BOOL action_type_matches_script( MSIPACKAGE *package, UINT type, UINT script ) +static BOOL action_type_matches_script( UINT type, UINT script ) { switch (script) { @@ -1212,7 +1212,7 @@ UINT ACTION_CustomAction(MSIPACKAGE *package, LPCWSTR action, UINT script, BOOL if (type & msidbCustomActionTypeNoImpersonate) WARN("msidbCustomActionTypeNoImpersonate not handled\n"); - if (!execute || !action_type_matches_script( package, type, script )) + if (!execute || !action_type_matches_script( type, script )) { rc = defer_custom_action( package, action, type ); goto end;

1 0

Hans Leidekker : wbemprox: Add a partial implementation of Win32_Directory.
by Alexandre Julliard 29 May '13

29 May '13

Module: wine Branch: master Commit: 074e6c74542e5aeef26a68a0ac1b274e66ce4a6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=074e6c74542e5aeef26a68a0a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed May 29 12:16:44 2013 +0200 wbemprox: Add a partial implementation of Win32_Directory. --- dlls/wbemprox/builtin.c | 256 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 250 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=074e6c74542e5aeef26a6…

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

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

Marcus Meissner : ws2_32: Close the dest socket (Coverity).
by Alexandre Julliard 28 May '13

28 May '13

Module: wine Branch: master Commit: 1a10d4d0cd27ddf4fca1a4dd910fe7498a7b0f00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a10d4d0cd27ddf4fca1a4dd9… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun May 26 14:33:25 2013 +0200 ws2_32: Close the dest socket (Coverity). --- dlls/ws2_32/tests/sock.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 804c66b..4612116 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4176,6 +4176,8 @@ static void test_WSARecv(void) todo_wine ok(!bret && (GetLastError() == ERROR_NETNAME_DELETED || broken(GetLastError() == ERROR_IO_INCOMPLETE) /* win9x */), "Did not get disconnect event: %d, error %d\n", bret, GetLastError()); ok(bytesReturned == 0, "Bytes received is %d\n", bytesReturned); + closesocket(dest); + dest = INVALID_SOCKET; src = WSASocketW(AF_INET, SOCK_STREAM, IPPROTO_TCP, NULL, 0, 0); ok(src != INVALID_SOCKET, "failed to create socket %d\n", WSAGetLastError());

1 0

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

28 May '13

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

Marcus Meissner : services: Fix handle leak for service handles (Coverity).
by Alexandre Julliard 28 May '13

28 May '13

Module: wine Branch: master Commit: d82de9b9a7f32a0d093f615ce61ea8f9ff121813 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d82de9b9a7f32a0d093f615ce… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun May 26 15:31:51 2013 +0200 services: Fix handle leak for service handles (Coverity). --- programs/services/tests/service.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/programs/services/tests/service.c b/programs/services/tests/service.c index 99d28eb..a2cd0b5 100644 --- a/programs/services/tests/service.c +++ b/programs/services/tests/service.c @@ -328,6 +328,7 @@ static void test_service(void) ok(res, "StartService failed: %u\n", GetLastError()); if(!res) { DeleteService(service_handle); + CloseServiceHandle(service_handle); return; } expect_event("RUNNING"); @@ -368,6 +369,7 @@ static inline void test_no_stop(void) ok(res, "StartService failed: %u\n", GetLastError()); if(!res) { DeleteService(service_handle); + CloseServiceHandle(service_handle); return; } expect_event("RUNNING");

1 0

Marcus Meissner : ver: curdirlen and destdirlen are in&out parameters ( Coverity).
by Alexandre Julliard 28 May '13

28 May '13

Module: wine Branch: master Commit: 90a9698f16f3063783305d292dbdff2c31ceaa0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=90a9698f16f3063783305d292… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun May 26 15:49:42 2013 +0200 ver: curdirlen and destdirlen are in&out parameters (Coverity). --- dlls/ver.dll16/version.c | 20 ++++++++++++++++---- 1 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/ver.dll16/version.c b/dlls/ver.dll16/version.c index 45b9277..5e6692f 100644 --- a/dlls/ver.dll16/version.c +++ b/dlls/ver.dll16/version.c @@ -494,11 +494,23 @@ DWORD WINAPI VerFindFile16( UINT16 flags, LPSTR lpszFilename, LPSTR lpszDestDir, UINT16 *lpuDestDirLen ) { UINT curDirLen, destDirLen; - DWORD retv = VerFindFileA( flags, lpszFilename, lpszWinDir, lpszAppDir, - lpszCurDir, &curDirLen, lpszDestDir, &destDirLen ); + UINT *pcurDirLen = NULL, *pdestDirLen = NULL; + DWORD retv; - *lpuCurDirLen = (UINT16)curDirLen; - *lpuDestDirLen = (UINT16)destDirLen; + if (lpuCurDirLen) { + curDirLen = *lpuCurDirLen; + pcurDirLen = &curDirLen; + } + if (lpuDestDirLen) { + destDirLen = *lpuDestDirLen; + pdestDirLen = &destDirLen; + } + retv = VerFindFileA( flags, lpszFilename, lpszWinDir, lpszAppDir, + lpszCurDir, pcurDirLen, lpszDestDir, pdestDirLen ); + if (lpuCurDirLen) + *lpuCurDirLen = (UINT16)curDirLen; + if (lpuDestDirLen) + *lpuDestDirLen = (UINT16)destDirLen; return retv; }

1 0