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

Nikolay Sivov : oleaut32/tests: Fixed a couple of string leaks (Valgrind).
by Alexandre Julliard May 6, 2014

May 6, 2014

Module: wine Branch: master Commit: 29eace89e9d6379a4ca33a8ea5d121ab7ccec99e URL: http://source.winehq.org/git/wine.git/?a=commit;h=29eace89e9d6379a4ca33a8ea… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 6 11:57:48 2014 +0400 oleaut32/tests: Fixed a couple of string leaks (Valgrind). --- dlls/oleaut32/tests/olefont.c | 2 ++ dlls/oleaut32/tests/vartest.c | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/oleaut32/tests/olefont.c b/dlls/oleaut32/tests/olefont.c index ded1838..4f421e4 100644 --- a/dlls/oleaut32/tests/olefont.c +++ b/dlls/oleaut32/tests/olefont.c @@ -412,10 +412,12 @@ static void test_font_events_disp(void) IConnectionPoint_Release(pCP); fonteventsdisp_invoke_called = 0; + fonteventsdisp_invoke_arg0 = NULL; hr = IFont_put_Bold(pFont, TRUE); EXPECT_HR(hr, S_OK); ok(fonteventsdisp_invoke_called == 1, "IFontEventDisp::Invoke wasn't called once\n"); + SysFreeString(fonteventsdisp_invoke_arg0); hr = IFont_QueryInterface(pFont, &IID_IFontDisp, (void **)&pFontDisp); EXPECT_HR(hr, S_OK); diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index bfbc0b2..d139b42 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -5611,6 +5611,7 @@ static void test_VarCat(void) VARTYPE leftvt, rightvt, resultvt; HRESULT hres; HRESULT expected_error_num; + int cmp; CHECKPTR(VarCat); @@ -5952,7 +5953,11 @@ static void test_VarCat(void) V_BSTR(&right) = SysAllocStringLen(NULL,0); hres = pVarCat(&left, &right, &result); ok(hres == S_OK, "VarCat failed: %08x\n", hres); - if(!strcmp_wa(V_BSTR(&result), "True")) { + VariantClear(&right); + + cmp = strcmp_wa(V_BSTR(&result), "True"); + VariantClear(&result); + if(!cmp) { V_VT(&right) = VT_BOOL; V_BOOL(&right) = 100; hres = pVarCat(&left, &right, &result);

1 0

Vijay Kiran Kamuju : usp10: Show fixme once in ScriptShapeOpenType.
by Alexandre Julliard May 6, 2014

May 6, 2014

Module: wine Branch: master Commit: 8b50762b18fce7de81133b7ef82f12431b47ac01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b50762b18fce7de81133b7ef… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Mon May 5 18:55:37 2014 +0000 usp10: Show fixme once in ScriptShapeOpenType. --- dlls/usp10/usp10.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index ae164d2..ac9c0fd 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -2848,6 +2848,7 @@ HRESULT WINAPI ScriptShapeOpenType( HDC hdc, SCRIPT_CACHE *psc, unsigned int g; BOOL rtl; int cluster; + static int once = 0; TRACE("(%p, %p, %p, %s, %s, %p, %p, %d, %s, %d, %d, %p, %p, %p, %p, %p )\n", hdc, psc, psa, @@ -2862,7 +2863,7 @@ HRESULT WINAPI ScriptShapeOpenType( HDC hdc, SCRIPT_CACHE *psc, if (cChars > cMaxGlyphs) return E_OUTOFMEMORY; if (cRanges) - FIXME("Ranges not supported yet\n"); + if(!once++) FIXME("Ranges not supported yet\n"); rtl = (psa && !psa->fLogicalOrder && psa->fRTL);

1 0

Nikolay Sivov : ntdll/tests: Fix some string leaks (Valgrind).
by Alexandre Julliard May 6, 2014

May 6, 2014

Module: wine Branch: master Commit: 0563c78cb63b8e021fdba2b9049c6875b784ff0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0563c78cb63b8e021fdba2b90… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 6 11:58:03 2014 +0400 ntdll/tests: Fix some string leaks (Valgrind). --- dlls/ntdll/tests/file.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 6406930..d70ed6b 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -267,6 +267,7 @@ static void create_file_test(void) FILE_NON_DIRECTORY_FILE|FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0); ok(status == STATUS_OBJECT_NAME_INVALID, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status); + pRtlFreeUnicodeString(&nameW); pRtlDosPathNameToNtPathName_U(pipeInvalidNameW, &nameW, NULL, NULL); attr.ObjectName = &nameW; @@ -281,6 +282,7 @@ static void create_file_test(void) FILE_NON_DIRECTORY_FILE|FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0); ok(status == STATUS_OBJECT_NAME_INVALID, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status); + pRtlFreeUnicodeString(&nameW); } static void open_file_test(void) @@ -1966,6 +1968,7 @@ static void test_NtCreateFile(void) } } + pRtlFreeUnicodeString( &nameW ); SetFileAttributesW(path, FILE_ATTRIBUTE_ARCHIVE); DeleteFileW( path ); }

1 0

Jacek Caban : mshtml: Use debugstr_mshtml_guid in a few more places.
by Alexandre Julliard May 6, 2014

May 6, 2014

Module: wine Branch: master Commit: e759105cdd14d7db09881520dc601adf057a959d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e759105cdd14d7db09881520d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 6 10:41:19 2014 +0200 mshtml: Use debugstr_mshtml_guid in a few more places. --- dlls/mshtml/htmlattr.c | 6 +++--- dlls/mshtml/htmlcurstyle.c | 20 +++++++------------- dlls/mshtml/htmlelemcol.c | 23 +++++++++-------------- dlls/mshtml/main.c | 23 +++++++++++++++-------- 4 files changed, 34 insertions(+), 38 deletions(-) diff --git a/dlls/mshtml/htmlattr.c b/dlls/mshtml/htmlattr.c index 1b01662..420a275 100644 --- a/dlls/mshtml/htmlattr.c +++ b/dlls/mshtml/htmlattr.c @@ -43,16 +43,16 @@ static HRESULT WINAPI HTMLDOMAttribute_QueryInterface(IHTMLDOMAttribute *iface, { HTMLDOMAttribute *This = impl_from_IHTMLDOMAttribute(iface); + TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); + if(IsEqualGUID(&IID_IUnknown, riid)) { - TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); *ppv = &This->IHTMLDOMAttribute_iface; }else if(IsEqualGUID(&IID_IHTMLDOMAttribute, riid)) { - TRACE("(%p)->(IID_IHTMLDOMAttribute %p)\n", This, ppv); *ppv = &This->IHTMLDOMAttribute_iface; }else if(dispex_query_interface(&This->dispex, riid, ppv)) { return *ppv ? S_OK : E_NOINTERFACE; }else { - WARN("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + WARN("%s not supported\n", debugstr_mshtml_guid(riid)); *ppv = NULL; return E_NOINTERFACE; } diff --git a/dlls/mshtml/htmlcurstyle.c b/dlls/mshtml/htmlcurstyle.c index 71d57a1..ca5d60f 100644 --- a/dlls/mshtml/htmlcurstyle.c +++ b/dlls/mshtml/htmlcurstyle.c @@ -69,34 +69,28 @@ static HRESULT WINAPI HTMLCurrentStyle_QueryInterface(IHTMLCurrentStyle *iface, { HTMLCurrentStyle *This = impl_from_IHTMLCurrentStyle(iface); - *ppv = NULL; + TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); if(IsEqualGUID(&IID_IUnknown, riid)) { - TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); *ppv = &This->IHTMLCurrentStyle_iface; }else if(IsEqualGUID(&IID_IHTMLCurrentStyle, riid)) { - TRACE("(%p)->(IID_IHTMLCurrentStyle %p)\n", This, ppv); *ppv = &This->IHTMLCurrentStyle_iface; }else if(IsEqualGUID(&IID_IHTMLCurrentStyle2, riid)) { - TRACE("(%p)->(IID_IHTMLCurrentStyle2 %p)\n", This, ppv); *ppv = &This->IHTMLCurrentStyle2_iface; }else if(IsEqualGUID(&IID_IHTMLCurrentStyle3, riid)) { - TRACE("(%p)->(IID_IHTMLCurrentStyle3 %p)\n", This, ppv); *ppv = &This->IHTMLCurrentStyle3_iface; }else if(IsEqualGUID(&IID_IHTMLCurrentStyle4, riid)) { - TRACE("(%p)->(IID_IHTMLCurrentStyle4 %p)\n", This, ppv); *ppv = &This->IHTMLCurrentStyle4_iface; }else if(dispex_query_interface(&This->dispex, riid, ppv)) { return *ppv ? S_OK : E_NOINTERFACE; + }else { + *ppv = NULL; + WARN("unsupported %s\n", debugstr_mshtml_guid(riid)); + return E_NOINTERFACE; } - if(*ppv) { - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; - } - - WARN("unsupported %s\n", debugstr_guid(riid)); - return E_NOINTERFACE; + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; } static ULONG WINAPI HTMLCurrentStyle_AddRef(IHTMLCurrentStyle *iface) diff --git a/dlls/mshtml/htmlelemcol.c b/dlls/mshtml/htmlelemcol.c index 5819d44..cb7bad1 100644 --- a/dlls/mshtml/htmlelemcol.c +++ b/dlls/mshtml/htmlelemcol.c @@ -104,14 +104,14 @@ static HRESULT WINAPI HTMLElementCollectionEnum_QueryInterface(IEnumVARIANT *ifa { HTMLElementCollectionEnum *This = impl_from_IEnumVARIANT(iface); + TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); + if(IsEqualGUID(riid, &IID_IUnknown)) { - TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); *ppv = &This->IEnumVARIANT_iface; }else if(IsEqualGUID(riid, &IID_IEnumVARIANT)) { - TRACE("(%p)->(IID_IEnumVARIANT %p)\n", This, ppv); *ppv = &This->IEnumVARIANT_iface; }else { - FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + FIXME("Unsupported iface %s\n", debugstr_mshtml_guid(riid)); *ppv = NULL; return E_NOINTERFACE; } @@ -217,25 +217,20 @@ static HRESULT WINAPI HTMLElementCollection_QueryInterface(IHTMLElementCollectio { HTMLElementCollection *This = impl_from_IHTMLElementCollection(iface); - *ppv = NULL; - if(IsEqualGUID(&IID_IUnknown, riid)) { - TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); *ppv = &This->IHTMLElementCollection_iface; }else if(IsEqualGUID(&IID_IHTMLElementCollection, riid)) { - TRACE("(%p)->(IID_IHTMLElementCollection %p)\n", This, ppv); *ppv = &This->IHTMLElementCollection_iface; }else if(dispex_query_interface(&This->dispex, riid, ppv)) { return *ppv ? S_OK : E_NOINTERFACE; + }else { + *ppv = NULL; + FIXME("Unsupported iface %s\n", debugstr_mshtml_guid(riid)); + return E_NOINTERFACE; } - if(*ppv) { - IHTMLElementCollection_AddRef(&This->IHTMLElementCollection_iface); - return S_OK; - } - - FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); - return E_NOINTERFACE; + IHTMLElementCollection_AddRef(&This->IHTMLElementCollection_iface); + return S_OK; } static ULONG WINAPI HTMLElementCollection_AddRef(IHTMLElementCollection *iface) diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index 1f90686..0bdc145 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -204,7 +204,7 @@ static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFGUID return S_OK; } - WARN("not supported iid %s\n", debugstr_guid(riid)); + WARN("not supported iid %s\n", debugstr_mshtml_guid(riid)); *ppvObject = NULL; return E_NOINTERFACE; } @@ -277,25 +277,25 @@ static HRESULT ClassFactory_Create(REFIID riid, void **ppv, CreateInstanceFunc f HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { if(IsEqualGUID(&CLSID_HTMLDocument, rclsid)) { - TRACE("(CLSID_HTMLDocument %s %p)\n", debugstr_guid(riid), ppv); + TRACE("(CLSID_HTMLDocument %s %p)\n", debugstr_mshtml_guid(riid), ppv); return ClassFactory_Create(riid, ppv, HTMLDocument_Create); }else if(IsEqualGUID(&CLSID_AboutProtocol, rclsid)) { - TRACE("(CLSID_AboutProtocol %s %p)\n", debugstr_guid(riid), ppv); + TRACE("(CLSID_AboutProtocol %s %p)\n", debugstr_mshtml_guid(riid), ppv); return ProtocolFactory_Create(rclsid, riid, ppv); }else if(IsEqualGUID(&CLSID_JSProtocol, rclsid)) { - TRACE("(CLSID_JSProtocol %s %p)\n", debugstr_guid(riid), ppv); + TRACE("(CLSID_JSProtocol %s %p)\n", debugstr_mshtml_guid(riid), ppv); return ProtocolFactory_Create(rclsid, riid, ppv); }else if(IsEqualGUID(&CLSID_MailtoProtocol, rclsid)) { - TRACE("(CLSID_MailtoProtocol %s %p)\n", debugstr_guid(riid), ppv); + TRACE("(CLSID_MailtoProtocol %s %p)\n", debugstr_mshtml_guid(riid), ppv); return ProtocolFactory_Create(rclsid, riid, ppv); }else if(IsEqualGUID(&CLSID_ResProtocol, rclsid)) { - TRACE("(CLSID_ResProtocol %s %p)\n", debugstr_guid(riid), ppv); + TRACE("(CLSID_ResProtocol %s %p)\n", debugstr_mshtml_guid(riid), ppv); return ProtocolFactory_Create(rclsid, riid, ppv); }else if(IsEqualGUID(&CLSID_SysimageProtocol, rclsid)) { - TRACE("(CLSID_SysimageProtocol %s %p)\n", debugstr_guid(riid), ppv); + TRACE("(CLSID_SysimageProtocol %s %p)\n", debugstr_mshtml_guid(riid), ppv); return ProtocolFactory_Create(rclsid, riid, ppv); }else if(IsEqualGUID(&CLSID_HTMLLoadOptions, rclsid)) { - TRACE("(CLSID_HTMLLoadOptions %s %p)\n", debugstr_guid(riid), ppv); + TRACE("(CLSID_HTMLLoadOptions %s %p)\n", debugstr_mshtml_guid(riid), ppv); return ClassFactory_Create(riid, ppv, HTMLLoadOptions_Create); } @@ -540,7 +540,12 @@ const char *debugstr_mshtml_guid(const GUID *iid) X(IID_ICustomDoc); X(IID_IDispatch); X(IID_IDispatchEx); + X(IID_IEnumVARIANT); X(IID_IHlinkTarget); + X(IID_IHTMLCurrentStyle); + X(IID_IHTMLCurrentStyle2); + X(IID_IHTMLCurrentStyle3); + X(IID_IHTMLCurrentStyle4); X(IID_IHTMLDocument); X(IID_IHTMLDocument2); X(IID_IHTMLDocument3); @@ -548,6 +553,8 @@ const char *debugstr_mshtml_guid(const GUID *iid) X(IID_IHTMLDocument5); X(IID_IHTMLDocument6); X(IID_IHTMLDocument7); + X(IID_IHTMLDOMAttribute); + X(IID_IHTMLElementCollection); X(IID_IInternetHostSecurityManager); X(IID_IMonikerProp); X(IID_IObjectSafety);

1 0

Hans Leidekker : wininet: Use a semicolon to delimit registered proxy servers.
by Alexandre Julliard May 6, 2014

May 6, 2014

Module: wine Branch: master Commit: 282b9c7bb7c5939a5ed55d70680f1e18b9cd165c URL: http://source.winehq.org/git/wine.git/?a=commit;h=282b9c7bb7c5939a5ed55d706… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 6 11:31:35 2014 +0200 wininet: Use a semicolon to delimit registered proxy servers. --- dlls/wininet/internet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index a37606a..08bdd7c 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -585,7 +585,7 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) p += lstrlenW( szHttp ); lstrcpyW( szProxy, p ); } - p = strchrW( szProxy, ' ' ); + p = strchrW( szProxy, ';' ); if (p) *p = 0; lpwpi->proxy = szProxy;

1 0

Hans Leidekker : wininet: Fix a couple of memory leaks.
by Alexandre Julliard May 6, 2014

May 6, 2014

Module: wine Branch: master Commit: 9946e8a87ed3a49a5c54e9f3f7e817dbb3bfc4d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9946e8a87ed3a49a5c54e9f3f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 6 11:31:53 2014 +0200 wininet: Fix a couple of memory leaks. --- dlls/wininet/internet.c | 37 +++++++++++++++++++++++++++++-------- 1 file changed, 29 insertions(+), 8 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 08bdd7c..7f325a5 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -538,6 +538,8 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) LPCSTR envproxy; LONG ret; + memset( lpwpi, 0, sizeof(*lpwpi) ); + EnterCriticalSection( &WININET_cs ); if (global_proxy) { @@ -548,7 +550,10 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) LeaveCriticalSection( &WININET_cs ); if ((ret = RegOpenKeyW( HKEY_CURRENT_USER, szInternetSettings, &key ))) + { + FreeProxyInfo( lpwpi ); return ret; + } len = sizeof(DWORD); if (RegQueryValueExW( key, szProxyEnable, NULL, &type, (BYTE *)&lpwpi->proxyEnabled, &len ) || type != REG_DWORD) @@ -556,6 +561,7 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) lpwpi->proxyEnabled = 0; if((ret = RegSetValueExW( key, szProxyEnable, 0, REG_DWORD, (BYTE *)&lpwpi->proxyEnabled, sizeof(DWORD) ))) { + FreeProxyInfo( lpwpi ); RegCloseKey( key ); return ret; } @@ -563,8 +569,6 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) if (!(envproxy = getenv( "http_proxy" )) || lpwpi->proxyEnabled) { - TRACE("Proxy is enabled.\n"); - /* figure out how much memory the proxy setting takes */ if (!RegQueryValueExW( key, szProxyServer, NULL, &type, NULL, &len ) && len && (type == REG_SZ)) { @@ -574,6 +578,7 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) if (!(szProxy = heap_alloc(len))) { RegCloseKey( key ); + FreeProxyInfo( lpwpi ); return ERROR_OUTOFMEMORY; } RegQueryValueExW( key, szProxyServer, NULL, &type, (BYTE*)szProxy, &len ); @@ -588,14 +593,18 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) p = strchrW( szProxy, ';' ); if (p) *p = 0; + FreeProxyInfo( lpwpi ); lpwpi->proxy = szProxy; + lpwpi->proxyBypass = NULL; - TRACE("http proxy = %s\n", debugstr_w(lpwpi->proxy)); + TRACE("http proxy (from registry) = %s\n", debugstr_w(lpwpi->proxy)); } else { TRACE("No proxy server settings in registry.\n"); + FreeProxyInfo( lpwpi ); lpwpi->proxy = NULL; + lpwpi->proxyBypass = NULL; } } else if (envproxy) @@ -604,18 +613,23 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) len = MultiByteToWideChar( CP_UNIXCP, 0, envproxy, -1, NULL, 0 ); if (!(envproxyW = heap_alloc(len * sizeof(WCHAR)))) + { + RegCloseKey( key ); return ERROR_OUTOFMEMORY; + } MultiByteToWideChar( CP_UNIXCP, 0, envproxy, -1, envproxyW, len ); + FreeProxyInfo( lpwpi ); lpwpi->proxyEnabled = 1; lpwpi->proxy = envproxyW; TRACE("http proxy (from environment) = %s\n", debugstr_w(lpwpi->proxy)); } - lpwpi->proxyBypass = NULL; if (lpwpi->proxyEnabled) { + TRACE("Proxy is enabled.\n"); + if (!(envproxy = getenv( "no_proxy" ))) { /* figure out how much memory the proxy setting takes */ @@ -630,24 +644,32 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) } RegQueryValueExW( key, szProxyOverride, NULL, &type, (BYTE*)szProxy, &len ); + heap_free( lpwpi->proxyBypass ); lpwpi->proxyBypass = szProxy; - TRACE("http proxy bypass = %s\n", debugstr_w(lpwpi->proxyBypass)); + TRACE("http proxy bypass (from registry) = %s\n", debugstr_w(lpwpi->proxyBypass)); } else { + heap_free( lpwpi->proxyBypass ); + lpwpi->proxyBypass = NULL; + TRACE("No proxy bypass server settings in registry.\n"); } } - else if (envproxy) + else { WCHAR *envproxyW; len = MultiByteToWideChar( CP_UNIXCP, 0, envproxy, -1, NULL, 0 ); if (!(envproxyW = heap_alloc(len * sizeof(WCHAR)))) + { + RegCloseKey( key ); return ERROR_OUTOFMEMORY; + } MultiByteToWideChar( CP_UNIXCP, 0, envproxy, -1, envproxyW, len ); + heap_free( lpwpi->proxyBypass ); lpwpi->proxyBypass = envproxyW; TRACE("http proxy bypass (from environment) = %s\n", debugstr_w(lpwpi->proxyBypass)); @@ -655,7 +677,6 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) } RegCloseKey( key ); - return ERROR_SUCCESS; } @@ -2890,7 +2911,7 @@ BOOL WINAPI InternetSetOptionW(HINTERNET hInternet, DWORD dwOption, unsigned int i; proxyinfo_t pi; - INTERNET_LoadProxySettings(&pi); + if (INTERNET_LoadProxySettings(&pi)) return FALSE; for (i = 0; i < con->dwOptionCount; i++) { INTERNET_PER_CONN_OPTIONW *option = con->pOptions + i;

1 0

Hans Leidekker : wininet: Only parse proxy URLs taken from the environment.
by Alexandre Julliard May 6, 2014

May 6, 2014

Module: wine Branch: master Commit: 4036475dc6d2c134f20b49cb34a1c8714bbb6ba5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4036475dc6d2c134f20b49cb3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 6 11:32:26 2014 +0200 wininet: Only parse proxy URLs taken from the environment. Proxy server strings stored in the registry use a different format. --- dlls/wininet/internet.c | 118 ++++++++++++++++++++++++++++------------------- 1 file changed, 71 insertions(+), 47 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 7f325a5..30e8f60 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -105,6 +105,8 @@ typedef struct DWORD proxyEnabled; LPWSTR proxy; LPWSTR proxyBypass; + LPWSTR proxyUsername; + LPWSTR proxyPassword; } proxyinfo_t; static ULONG max_conns = 2, max_1_0_conns = 4; @@ -504,6 +506,8 @@ static void FreeProxyInfo( proxyinfo_t *lpwpi ) { heap_free(lpwpi->proxy); heap_free(lpwpi->proxyBypass); + heap_free(lpwpi->proxyUsername); + heap_free(lpwpi->proxyPassword); } static proxyinfo_t *global_proxy; @@ -519,6 +523,50 @@ static void free_global_proxy( void ) LeaveCriticalSection( &WININET_cs ); } +static BOOL parse_proxy_url( proxyinfo_t *info, const WCHAR *url ) +{ + static const WCHAR fmt[] = {'%','s',':','%','u',0}; + WCHAR hostname[INTERNET_MAX_HOST_NAME_LENGTH] = {}; + WCHAR username[INTERNET_MAX_USER_NAME_LENGTH] = {}; + WCHAR password[INTERNET_MAX_PASSWORD_LENGTH] = {}; + URL_COMPONENTSW uc; + + memset( &uc, 0, sizeof(uc) ); + uc.dwStructSize = sizeof(uc); + uc.lpszHostName = hostname; + uc.dwHostNameLength = INTERNET_MAX_HOST_NAME_LENGTH; + uc.lpszUserName = username; + uc.dwUserNameLength = INTERNET_MAX_USER_NAME_LENGTH; + uc.lpszPassword = password; + uc.dwPasswordLength = INTERNET_MAX_PASSWORD_LENGTH; + + if (!InternetCrackUrlW( url, 0, 0, &uc )) return FALSE; + if (!hostname[0]) + { + if (!(info->proxy = heap_strdupW( url ))) return FALSE; + info->proxyUsername = NULL; + info->proxyPassword = NULL; + return TRUE; + } + if (!(info->proxy = heap_alloc( (strlenW(hostname) + 12) * sizeof(WCHAR) ))) return FALSE; + sprintfW( info->proxy, fmt, hostname, uc.nPort ); + + if (!username[0]) info->proxyUsername = NULL; + else if (!(info->proxyUsername = heap_strdupW( username ))) + { + heap_free( info->proxy ); + return FALSE; + } + if (!password[0]) info->proxyPassword = NULL; + else if (!(info->proxyPassword = heap_strdupW( password ))) + { + heap_free( info->proxyUsername ); + heap_free( info->proxy ); + return FALSE; + } + return TRUE; +} + /*********************************************************************** * INTERNET_LoadProxySettings * @@ -620,10 +668,20 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) MultiByteToWideChar( CP_UNIXCP, 0, envproxy, -1, envproxyW, len ); FreeProxyInfo( lpwpi ); - lpwpi->proxyEnabled = 1; - lpwpi->proxy = envproxyW; - - TRACE("http proxy (from environment) = %s\n", debugstr_w(lpwpi->proxy)); + if (parse_proxy_url( lpwpi, envproxyW )) + { + TRACE("http proxy (from environment) = %s\n", debugstr_w(lpwpi->proxy)); + lpwpi->proxyEnabled = 1; + lpwpi->proxyBypass = NULL; + } + else + { + WARN("failed to parse http_proxy value %s\n", debugstr_w(envproxyW)); + lpwpi->proxyEnabled = 0; + lpwpi->proxy = NULL; + lpwpi->proxyBypass = NULL; + } + heap_free( envproxyW ); } if (lpwpi->proxyEnabled) @@ -675,6 +733,7 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) TRACE("http proxy bypass (from environment) = %s\n", debugstr_w(lpwpi->proxyBypass)); } } + else TRACE("Proxy is disabled.\n"); RegCloseKey( key ); return ERROR_SUCCESS; @@ -685,56 +744,21 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) */ static BOOL INTERNET_ConfigureProxy( appinfo_t *lpwai ) { - proxyinfo_t wpi = {0}; + proxyinfo_t wpi; if (INTERNET_LoadProxySettings( &wpi )) return FALSE; if (wpi.proxyEnabled) { - WCHAR proxyurl[INTERNET_MAX_URL_LENGTH]; - WCHAR username[INTERNET_MAX_USER_NAME_LENGTH]; - WCHAR password[INTERNET_MAX_PASSWORD_LENGTH]; - WCHAR hostname[INTERNET_MAX_HOST_NAME_LENGTH]; - URL_COMPONENTSW UrlComponents; - - UrlComponents.dwStructSize = sizeof UrlComponents; - UrlComponents.dwSchemeLength = 0; - UrlComponents.lpszHostName = hostname; - UrlComponents.dwHostNameLength = INTERNET_MAX_HOST_NAME_LENGTH; - UrlComponents.lpszUserName = username; - UrlComponents.dwUserNameLength = INTERNET_MAX_USER_NAME_LENGTH; - UrlComponents.lpszPassword = password; - UrlComponents.dwPasswordLength = INTERNET_MAX_PASSWORD_LENGTH; - UrlComponents.dwUrlPathLength = 0; - UrlComponents.dwExtraInfoLength = 0; - - if(InternetCrackUrlW(wpi.proxy, 0, 0, &UrlComponents)) - { - static const WCHAR szFormat[] = { 'h','t','t','p',':','/','/','%','s',':','%','u',0 }; - - if(UrlComponents.nPort == INTERNET_INVALID_PORT_NUMBER) - UrlComponents.nPort = INTERNET_DEFAULT_HTTP_PORT; - sprintfW(proxyurl, szFormat, hostname, UrlComponents.nPort); + TRACE("http proxy = %s bypass = %s\n", debugstr_w(lpwai->proxy), debugstr_w(lpwai->proxyBypass)); - lpwai->accessType = INTERNET_OPEN_TYPE_PROXY; - lpwai->proxy = heap_strdupW(proxyurl); - lpwai->proxyBypass = heap_strdupW(wpi.proxyBypass); - if (UrlComponents.dwUserNameLength) - { - lpwai->proxyUsername = heap_strdupW(UrlComponents.lpszUserName); - lpwai->proxyPassword = heap_strdupW(UrlComponents.lpszPassword); - } - - TRACE("http proxy = %s bypass = %s\n", debugstr_w(lpwai->proxy), debugstr_w(lpwai->proxyBypass)); - FreeProxyInfo(&wpi); - return TRUE; - } - else - { - TRACE("Failed to parse proxy: %s\n", debugstr_w(wpi.proxy)); - lpwai->proxy = NULL; - } + lpwai->accessType = INTERNET_OPEN_TYPE_PROXY; + lpwai->proxy = wpi.proxy; + lpwai->proxyBypass = wpi.proxyBypass; + lpwai->proxyUsername = wpi.proxyUsername; + lpwai->proxyPassword = wpi.proxyPassword; + return TRUE; } lpwai->accessType = INTERNET_OPEN_TYPE_DIRECT;

1 0

Hans Leidekker : wininet: Handle secure proxy connections inside the main loop.
by Alexandre Julliard May 6, 2014

May 6, 2014

Module: wine Branch: master Commit: 5b56624a1bc6d4ff7768f15700ef3ef00c073d65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b56624a1bc6d4ff7768f1570… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 6 11:32:53 2014 +0200 wininet: Handle secure proxy connections inside the main loop. This adds support for authenticated secure proxy connections. --- dlls/wininet/http.c | 145 +++++++++++++++++++++++---------------------------- 1 file changed, 66 insertions(+), 79 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 07b4787..97becd4 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4176,43 +4176,6 @@ static LPWSTR HTTP_build_req( LPCWSTR *list, int len ) return str; } -static DWORD HTTP_SecureProxyConnect(http_request_t *request) -{ - server_t *server = request->server; - LPWSTR requestString; - INT len; - INT cnt; - INT responseLen; - char *ascii_req; - DWORD res; - - static const WCHAR connectW[] = {'C','O','N','N','E','C','T',0}; - - TRACE("\n"); - - requestString = build_request_header( request, connectW, server->host_port, g_szHttp1_1, TRUE ); - - len = WideCharToMultiByte( CP_ACP, 0, requestString, -1, - NULL, 0, NULL, NULL ); - len--; /* the nul terminator isn't needed */ - ascii_req = heap_alloc(len); - WideCharToMultiByte( CP_ACP, 0, requestString, -1, ascii_req, len, NULL, NULL ); - heap_free( requestString ); - - TRACE("full request -> %s\n", debugstr_an( ascii_req, len ) ); - - NETCON_set_timeout( request->netconn, TRUE, request->send_timeout ); - res = NETCON_send( request->netconn, ascii_req, len, 0, &cnt ); - heap_free( ascii_req ); - if (res != ERROR_SUCCESS) - return res; - - if (HTTP_GetResponseHeaders( request, &responseLen ) || !responseLen) - return ERROR_HTTP_INVALID_HEADER; - - return ERROR_SUCCESS; -} - static void HTTP_InsertCookies(http_request_t *request) { DWORD cookie_size, size, cnt = 0; @@ -4837,29 +4800,24 @@ static DWORD open_http_connection(http_request_t *request, BOOL *reusing) INTERNET_STATUS_CONNECTED_TO_SERVER, request->server->addr_str, strlen(request->server->addr_str)+1); - if(is_https) { - /* Note: we differ from Microsoft's WinINet here. they seem to have - * a bug that causes no status callbacks to be sent when starting - * a tunnel to a proxy server using the CONNECT verb. i believe our - * behaviour to be more correct and to not cause any incompatibilities - * because using a secure connection through a proxy server is a rare - * case that would be hard for anyone to depend on */ - if(request->proxy) - res = HTTP_SecureProxyConnect(request); - if(res == ERROR_SUCCESS) - res = NETCON_secure_connect(request->netconn, request->server); - } - - if(res != ERROR_SUCCESS) { - http_release_netconn(request, FALSE); - return res; - } - *reusing = FALSE; TRACE("Created connection to %s: %p\n", debugstr_w(request->server->name), netconn); return ERROR_SUCCESS; } +static char *build_ascii_request( const WCHAR *str, void *data, DWORD data_len, DWORD *out_len ) +{ + int len = WideCharToMultiByte( CP_ACP, 0, str, -1, NULL, 0, NULL, NULL ); + char *ret; + + if (!(ret = heap_alloc( len + data_len ))) return NULL; + WideCharToMultiByte( CP_ACP, 0, str, -1, ret, len, NULL, NULL ); + if (data_len) memcpy( ret + len - 1, data, data_len ); + *out_len = len + data_len - 1; + ret[*out_len] = 0; + return ret; +} + /*********************************************************************** * HTTP_HttpSendRequestW (internal) * @@ -4874,13 +4832,11 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, DWORD dwHeaderLength, LPVOID lpOptional, DWORD dwOptionalLength, DWORD dwContentLength, BOOL bEndRequest) { - INT cnt; - BOOL redirected = FALSE; - LPWSTR requestString = NULL; - INT responseLen; - BOOL loop_next; static const WCHAR szContentLength[] = { 'C','o','n','t','e','n','t','-','L','e','n','g','t','h',':',' ','%','l','i','\r','\n',0 }; + BOOL redirected = FALSE, secure_proxy_connect = FALSE, loop_next; + LPWSTR requestString = NULL; + INT responseLen, cnt; WCHAR contentLengthStr[sizeof szContentLength/2 /* includes \r\n */ + 20 /* int */ ]; DWORD res; @@ -4929,7 +4885,7 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, do { - DWORD len; + DWORD len, data_len = dwOptionalLength; BOOL reusing_connection; char *ascii_req; @@ -4957,7 +4913,31 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, if (!(request->hdr.dwFlags & INTERNET_FLAG_NO_COOKIES)) HTTP_InsertCookies(request); - if (request->proxy) + res = open_http_connection(request, &reusing_connection); + if (res != ERROR_SUCCESS) + break; + + if (!reusing_connection && (request->hdr.dwFlags & INTERNET_FLAG_SECURE)) + { + if (request->proxy) secure_proxy_connect = TRUE; + else + { + res = NETCON_secure_connect(request->netconn, request->server); + if (res != ERROR_SUCCESS) + { + WARN("failed to upgrade to secure connection\n"); + http_release_netconn(request, FALSE); + break; + } + } + } + if (secure_proxy_connect) + { + static const WCHAR connectW[] = {'C','O','N','N','E','C','T',0}; + const WCHAR *target = request->server->host_port; + requestString = build_request_header(request, connectW, target, g_szHttp1_1, TRUE); + } + else if (request->proxy && !(request->hdr.dwFlags & INTERNET_FLAG_SECURE)) { WCHAR *url = build_proxy_path_url(request); requestString = build_request_header(request, request->verb, url, request->version, TRUE); @@ -4966,25 +4946,13 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, else requestString = build_request_header(request, request->verb, request->path, request->version, TRUE); - TRACE("Request header -> %s\n", debugstr_w(requestString) ); - res = open_http_connection(request, &reusing_connection); - if (res != ERROR_SUCCESS) - break; - /* send the request as ASCII, tack on the optional data */ - if (!lpOptional || redirected) - dwOptionalLength = 0; - len = WideCharToMultiByte( CP_ACP, 0, requestString, -1, - NULL, 0, NULL, NULL ); - ascii_req = heap_alloc(len + dwOptionalLength); - WideCharToMultiByte( CP_ACP, 0, requestString, -1, - ascii_req, len, NULL, NULL ); - if( lpOptional ) - memcpy( &ascii_req[len-1], lpOptional, dwOptionalLength ); - len = (len + dwOptionalLength - 1); - ascii_req[len] = 0; + if (!lpOptional || redirected || secure_proxy_connect) + data_len = 0; + + ascii_req = build_ascii_request( requestString, lpOptional, data_len, &len ); TRACE("full request -> %s\n", debugstr_a(ascii_req) ); INTERNET_SendCallback(&request->hdr, request->hdr.dwContext, @@ -5002,7 +4970,7 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, continue; } - request->bytesWritten = dwOptionalLength; + request->bytesWritten = data_len; INTERNET_SendCallback(&request->hdr, request->hdr.dwContext, INTERNET_STATUS_REQUEST_SENT, @@ -5139,6 +5107,25 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, } } } + if (secure_proxy_connect && request->status_code == HTTP_STATUS_OK) + { + int index; + + res = NETCON_secure_connect(request->netconn, request->server); + if (res != ERROR_SUCCESS) + { + WARN("failed to upgrade to secure proxy connection\n"); + http_release_netconn( request, FALSE ); + break; + } + index = HTTP_GetCustomHeaderIndex(request, szProxy_Authorization, 0, TRUE); + if (index != -1) HTTP_DeleteCustomHeader(request, index); + destroy_authinfo(request->proxyAuthInfo); + request->proxyAuthInfo = NULL; + + secure_proxy_connect = FALSE; + loop_next = TRUE; + } } else res = ERROR_SUCCESS;

1 0

Nikolay Sivov : msxml3: Fix some string leaks (Valgrind).
by Alexandre Julliard May 6, 2014

May 6, 2014

Module: wine Branch: master Commit: 9e576e1089a376c3fdc793e5ec1aeec390bd5530 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e576e1089a376c3fdc793e5e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 6 11:47:46 2014 +0400 msxml3: Fix some string leaks (Valgrind). --- dlls/msxml3/element.c | 1 + dlls/msxml3/tests/domdoc.c | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 4fe53a8..0de9c34 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -1287,6 +1287,7 @@ static HRESULT WINAPI domelem_setAttribute( { int cmp = xmlStrEqual(ns->href, xml_value); heap_free(xml_value); + heap_free(xml_name); return cmp ? S_OK : E_INVALIDARG; } } diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 8d8c7c0..19b2951 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -1940,6 +1940,7 @@ static void test_domnode( void ) ok( r == E_FAIL, "getAttribute ret %08x\n", r ); ok( V_VT(&var) == VT_NULL || V_VT(&var) == VT_EMPTY, "vt = %x\n", V_VT(&var)); VariantClear(&var); + SysFreeString(str); str = SysAllocString( szdl ); V_VT(&var) = VT_I4; @@ -8121,6 +8122,7 @@ static void test_put_nodeTypedValue(void) EXPECT_HR(hr, S_OK); ok(!lstrcmpW(str, _bstr_("ABCD")), "%s\n", wine_dbgstr_w(str)); IXMLDOMNode_Release(node); + SysFreeString(str); array = SafeArrayCreateVector(VT_UI1, 0, 7); hr = SafeArrayAccessData(array, (void*)&ptr); @@ -8160,6 +8162,7 @@ static void test_put_nodeTypedValue(void) ok(!lstrcmpW(str, _bstr_("ZEdWemRBPQ==")), "%s\n", wine_dbgstr_w(str)); IXMLDOMNode_Release(node); SafeArrayDestroyData(array); + SysFreeString(str); /* bin.hex */ V_VT(&value) = VT_BSTR; @@ -8208,6 +8211,7 @@ static void test_put_nodeTypedValue(void) ok(!lstrcmpW(str, _bstr_("000102030405060708090a0b0c0d0e0f")), "%s\n", wine_dbgstr_w(str)); IXMLDOMNode_Release(node); SafeArrayDestroyData(array); + SysFreeString(str); IXMLDOMElement_Release(elem); IXMLDOMDocument_Release(doc); @@ -9509,6 +9513,7 @@ static void test_selection(void) EXPECT_HR(hr, S_OK); ok(!lstrcmpW(name, _bstr_("c")), "got node name %s\n", wine_dbgstr_w(name)); IXMLDOMNode_Release(node); + SysFreeString(name); V_VT(&v) = VT_I2; hr = IEnumVARIANT_Next(enum1, 1, &v, NULL); @@ -9530,6 +9535,7 @@ static void test_selection(void) EXPECT_HR(hr, S_OK); ok(!lstrcmpW(name, _bstr_("d")), "got node name %s\n", wine_dbgstr_w(name)); IXMLDOMNode_Release(node); + SysFreeString(name); IXMLDOMSelection_Release(selection); IXMLDOMNodeList_Release(list); @@ -11784,6 +11790,7 @@ static void test_create_attribute(void) ok(hr == S_FALSE, "%d: got 0x%08x\n", i, hr); ok(str == NULL, "%d: got prefix %s\n", i, wine_dbgstr_w(str)); } + SysFreeString(str); str = NULL; hr = IXMLDOMNode_get_namespaceURI(node, &str);

1 0

Francois Gouget : testbot/VMs: Make sure the VM status has been set to ' reverting' before starting RevertVM.
by Alexandre Julliard May 6, 2014

May 6, 2014

Module: tools Branch: master Commit: 8fee9165bb6b1026e8eaf3913098d9942e482cea URL: http://source.winehq.org/git/tools.git/?a=commit;h=8fee9165bb6b1026e8eaf391… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue May 6 11:56:10 2014 +0200 testbot/VMs: Make sure the VM status has been set to 'reverting' before starting RevertVM. --- testbot/lib/WineTestBot/VMs.pm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index be95bcc..3c7f3fa 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -1,5 +1,5 @@ # Copyright 2009 Ge van Geldorp -# Copyright 2012 Francois Gouget +# Copyright 2012-2014 Francois Gouget # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -533,7 +533,8 @@ sub RunRevert my $self = shift; $self->Status("reverting"); - $self->Save(); + my ($ErrProperty, $ErrMessage) = $self->Save(); + return $ErrMessage if (defined $ErrMessage); $self->GetBackEnd()->PrepareForFork(); my $Pid = fork;

1 0

Francois Gouget : testbot/lib: Pass the Step object to Task::Run() so it does not have to look it up.
by Alexandre Julliard May 6, 2014

May 6, 2014

Module: tools Branch: master Commit: 25d01cd2b4496290c5fc0b257e72efc04d2734f3 URL: http://source.winehq.org/git/tools.git/?a=commit;h=25d01cd2b4496290c5fc0b25… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue May 6 12:41:31 2014 +0200 testbot/lib: Pass the Step object to Task::Run() so it does not have to look it up. --- testbot/lib/WineTestBot/Jobs.pm | 4 ++-- testbot/lib/WineTestBot/Tasks.pm | 16 ++++++---------- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index 8e36a32..b042bea 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -1,5 +1,5 @@ # Copyright 2009 Ge van Geldorp -# Copyright 2012 Francois Gouget +# Copyright 2012-2014 Francois Gouget # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -511,7 +511,7 @@ sub ScheduleOnHost($$$) my ($ErrProperty, $ErrMessage) = $VM->Save(); return $ErrMessage if (defined $ErrMessage); - $ErrMessage = $Task->Run($Job->Id, $Step->No); + $ErrMessage = $Task->Run($Step); return $ErrMessage if (defined $ErrMessage); $Job->UpdateStatus(); diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index 28e0727..fd848f2 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -1,5 +1,5 @@ # Copyright 2009 Ge van Geldorp -# Copyright 2012 Francois Gouget +# Copyright 2012-2014 Francois Gouget # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -72,16 +72,13 @@ Where $Type corresponds to the Task's type. =back =cut -sub Run +sub Run($$) { - my $self = shift; - my ($JobId, $StepNo) = @_; + my ($self, $Step) = @_; $self->Status("running"); $self->Save(); - my $Job = WineTestBot::Jobs::CreateJobs()->GetItem($JobId); - my $Step = $Job->Steps->GetItem($StepNo); my $RunScript; if ($Step->Type eq "build") { @@ -95,8 +92,6 @@ sub Run { $RunScript = "RunTask.pl"; } - $Step = undef; - $Job = undef; $self->GetBackEnd()->PrepareForFork(); my $Pid = fork; @@ -107,7 +102,8 @@ sub Run elsif (!$Pid) { # Capture Perl errors in the task's generic error log - my $TaskDir = "$DataDir/jobs/$JobId/$StepNo/" . $self->No; + my ($JobId, $StepNo, $TaskNo) = @{$self->GetMasterKey()}; + my $TaskDir = "$DataDir/jobs/$JobId/$StepNo/$TaskNo"; mkdir $TaskDir; unlink "$TaskDir/err"; # truncate the log since this is a new run if (open(STDERR, ">>", "$TaskDir/err")) @@ -123,7 +119,7 @@ sub Run } $ENV{PATH} = "/usr/bin:/bin"; delete $ENV{ENV}; - exec("$BinDir/${ProjectName}$RunScript", $JobId, $StepNo, $self->No) or + exec("$BinDir/${ProjectName}$RunScript", $JobId, $StepNo, $TaskNo) or require WineTestBot::Log; WineTestBot::Log::LogMsg("Unable to exec ${ProjectName}$RunScript: $!\n"); exit(1);

1 0

Francois Gouget : testbot/lib: Make Collections try harder to return existing Item objects to avoid inconsistencies.
by Alexandre Julliard May 6, 2014

May 6, 2014

Module: tools Branch: master Commit: c1658af0dac543ad77c327eecb7216b8cadc0fdc URL: http://source.winehq.org/git/tools.git/?a=commit;h=c1658af0dac543ad77c327ee… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue May 6 12:40:27 2014 +0200 testbot/lib: Make Collections try harder to return existing Item objects to avoid inconsistencies. Assume we have the following code: 1: my $Jobs = CreateJobs(); 2: my $VM1 = $Jobs->GetItem(100)->Steps->GetItem(1)->Tasks->GetItem(1)->VM; 3: my $VM2 = $Jobs->GetItem(101)->Steps->GetItem(1)->Tasks->GetItem(1)->VM; 4: my $VM2b = $Jobs->GetItem(101)->Steps->GetItem(1)->Tasks->GetItem(1)->VM; 5: print $VM1->Name, " is ", $VM1->Status, "\n"; # Prints 'buildvm is idle' 6: print $VM2->Name, " is ", $VM2->Status, "\n"; # Prints 'buildvm is idle' 7: $VM1->Status('running'); 8: $VM1->Save(); 9: print $VM1->Name, " is ", $VM1->Status, "\n"; # Prints 'buildvm is running' 10: print $VM2->Name, " is ", $VM2->Status, "\n"; # Prints 'buildvm is idle' !!! 11: print $VM2b->Name, " is ", $VM2b->Status, "\n"; # Prints 'buildvm is running' The problem is that although $VM1, $VM2 and $VM2b refer to the same VM (buildvm), they are all separate objects. Then $VM2->Status gets loaded from the database for the print statement on line 6, and is then never refreshed; hence the out-of-date value printed on line 10. In contrast $VM2b->Status is loaded from database for the print statement on line 11 and thus shows the up-to-date value that was saved on line 8. This is very confusing. This patch associates a scope to each Collection and ensures that there is no duplicate Item objects within that scope. Further, any object created from a Collection inherits its scope. So in the example above, because all objects can ultimately be traced back to the $Jobs collection, $VM1, $VM2 and $VM2b all point to the same object which avoids any inconsistency. It's also possible to ensure that two Collections share the same scope by passing the reference collection as a parameter. For instance, in the above sample code, CreateVMs($Jobs)->GetItem('buildvm') will return $VM1. As before, creating a new Collection normally, CreateVMs() for instance, ensures gets a new, empty, scope and thus reload the objects from the database. This ensures the new objects will reflect changes made to the database by other processes. This is also why having a global persistent cache would not work. --- testbot/bin/WineSendLog.pl | 2 +- testbot/lib/ObjectModel/Collection.pm | 199 +++++++++++++++++++++++---- testbot/lib/ObjectModel/DBIBackEnd.pm | 10 +- testbot/lib/ObjectModel/Item.pm | 27 +++- testbot/lib/WineTestBot/Branches.pm | 6 +- testbot/lib/WineTestBot/CGI/Sessions.pm | 5 +- testbot/lib/WineTestBot/Jobs.pm | 6 +- testbot/lib/WineTestBot/Patches.pm | 5 +- testbot/lib/WineTestBot/PendingPatchSets.pm | 5 +- testbot/lib/WineTestBot/PendingPatches.pm | 6 +- testbot/lib/WineTestBot/Roles.pm | 5 +- testbot/lib/WineTestBot/Steps.pm | 7 +- testbot/lib/WineTestBot/StepsTasks.pm | 6 +- testbot/lib/WineTestBot/Tasks.pm | 7 +- testbot/lib/WineTestBot/UserRoles.pm | 7 +- testbot/lib/WineTestBot/Users.pm | 6 +- testbot/lib/WineTestBot/VMs.pm | 6 +- testbot/web/JobDetails.pl | 2 +- 18 files changed, 250 insertions(+), 67 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=c1658af0dac543ad77c3…

1 0

Francois Gouget : testbot/lib: Set the VM status to running in Task::Run() .
by Alexandre Julliard May 6, 2014

May 6, 2014

Module: tools Branch: master Commit: cfde7ca87f7a2608b2c13939d9d41a52799ac751 URL: http://source.winehq.org/git/tools.git/?a=commit;h=cfde7ca87f7a2608b2c13939… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue May 6 12:43:14 2014 +0200 testbot/lib: Set the VM status to running in Task::Run(). It's Task::Run() that starts the WineRun* processes, so it should be its responsibility to update the VM status. --- testbot/lib/WineTestBot/Jobs.pm | 5 +---- testbot/lib/WineTestBot/Tasks.pm | 8 ++++++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index b042bea..4532d4e 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -507,11 +507,8 @@ sub ScheduleOnHost($$$) { $IdleVMs{$VMKey} = 0; $IdleCount--; - $VM->Status("running"); - my ($ErrProperty, $ErrMessage) = $VM->Save(); - return $ErrMessage if (defined $ErrMessage); - $ErrMessage = $Task->Run($Step); + my $ErrMessage = $Task->Run($Step); return $ErrMessage if (defined $ErrMessage); $Job->UpdateStatus(); diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index fd848f2..dd22749 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -79,6 +79,11 @@ sub Run($$) $self->Status("running"); $self->Save(); + my $VM = $self->VM; + $VM->Status("running"); + my ($ErrProperty, $ErrMessage) = $VM->Save(); + return $ErrMessage if (defined $ErrMessage); + my $RunScript; if ($Step->Type eq "build") { @@ -131,8 +136,7 @@ sub Run($$) # ChildPid should be ignored anyway if Status is not 'running'. $self->ChildPid($Pid); $self->Started(time); - my ($ErrProperty, $ErrMessage) = $self->Save(); - + ($ErrProperty, $ErrMessage) = $self->Save(); return $ErrMessage; }

1 0

Francois Gouget : testbot/lib: Make sure we have a consistent view of the VMs Status, no matter which Task we get the corresponding object from.
by Alexandre Julliard May 6, 2014

May 6, 2014

Module: tools Branch: master Commit: ad5dc5add5223edefd45ab693d238be5208b1c74 URL: http://source.winehq.org/git/tools.git/?a=commit;h=ad5dc5add5223edefd45ab69… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue May 6 12:40:49 2014 +0200 testbot/lib: Make sure we have a consistent view of the VMs Status, no matter which Task we get the corresponding object from. This ensures we don't schedule two tasks on the same VM when there is more than one VM host. Specifically, in the single VM host scenario the scheduler actions go like this: Schedule Jobs on Host1 Load Job1 from database Load Step1 from database Load Task1 from database Load VM1 (e.g. buildvm) from database VM1 is idle -> start Task1 VM1->Status = running Save VM1 to the database Load Job2 from database Load Step2 from database Load Task2 from database Load VM2 (e.g. the same buildvm) from database -> VM2->Status is up to date VM2->Status is running -> nothing to do All done But in the two (or more) VM hosts scenario the first pass is when all the objects are being loaded from database, while the second one just reuses the already created Collections and Items. So in some cases scheduling goes like this: Schedule Jobs on Host1 Load Job1 from database Load Step1 from database Load Task1 from database Load VM1 (e.g. buildvm) from database VM1 is not on Host1 so continue Load Job2 from database Load Step2 from database Load Task2 from database Load VM2 (e.g. the same buildvm) from database VM2 is not on Host1 so continue Schedule Jobs on Host2 Job1 is already in memory Step1 is already in memory Task1 is already in memory VM1 is already in memory VM1 is idle -> start Task1 VM1->Status = running Save VM1 to the database Job2 is already in memory Step2 is already in memory Task2 is already in memory VM2 is already in memory -> VM2->Status has not been updated so VM2->Status is still idle -> start Task2 -> Bug!!! At this point we have two tasks trying to run on a single VM. When the first one completes the VM gets powered off, leaving the second one hanging. With this patch VM1 and VM2 are the same object, and thus we always have VM1->Status == VM2->Status which fixes this issue. --- testbot/lib/WineTestBot/Jobs.pm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index 1bf9de6..8e36a32 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -429,11 +429,12 @@ $MaxVMsWhenIdle VMs (or $MaxActiveVMs if not set) for future jobs. =back =cut -sub ScheduleOnHost($$) +sub ScheduleOnHost($$$) { - my ($SortedJobs, $Hypervisors) = @_; + my ($ScopeObject, $SortedJobs, $Hypervisors) = @_; - my $HostVMs = CreateVMs(); + + my $HostVMs = CreateVMs($ScopeObject); $HostVMs->FilterEnabledRole(); $HostVMs->FilterHypervisors($Hypervisors); @@ -674,7 +675,7 @@ sub ScheduleJobs() # we should check if there are VMs to revert my %Hosts; - my $VMs = CreateVMs(); + my $VMs = CreateVMs($Jobs); $VMs->FilterEnabledRole(); foreach my $VM (@{$VMs->GetItems()}) { @@ -686,7 +687,7 @@ sub ScheduleJobs() foreach my $Host (keys %Hosts) { my @HostHypervisors = keys %{$Hosts{$Host}}; - my $HostErrMessage = ScheduleOnHost(\@SortedJobs, \@HostHypervisors); + my $HostErrMessage = ScheduleOnHost($Jobs, \@SortedJobs, \@HostHypervisors); push @ErrMessages, $HostErrMessage if (defined $HostErrMessage); } return @ErrMessages ? join("\n", @ErrMessages) : undef;

1 0

Nikolay Sivov : oledb32/tests: Simplify IMalloc handling.
by Alexandre Julliard May 5, 2014

May 5, 2014

Module: wine Branch: master Commit: 51a4fce54d9807043534ccf139c694c8800b13b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51a4fce54d9807043534ccf13… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 4 20:34:27 2014 +0400 oledb32/tests: Simplify IMalloc handling. --- dlls/oledb32/tests/Makefile.in | 2 +- dlls/oledb32/tests/database.c | 14 +------------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/dlls/oledb32/tests/Makefile.in b/dlls/oledb32/tests/Makefile.in index df71d64..1a4e07e 100644 --- a/dlls/oledb32/tests/Makefile.in +++ b/dlls/oledb32/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = oledb32.dll -IMPORTS = uuid shell32 oleaut32 ole32 user32 gdi32 advapi32 +IMPORTS = uuid oleaut32 ole32 user32 gdi32 advapi32 C_SRCS = \ convert.c \ diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index b7020ab..a46725c 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -29,7 +29,6 @@ #include "ole2.h" #include "msdadc.h" #include "msdasc.h" -#include "shlobj.h" #include "msdaguid.h" #include "initguid.h" #include "oledberr.h" @@ -56,14 +55,6 @@ static void test_GetDataSource(WCHAR *initstring) if(SUCCEEDED(hr)) { IDBProperties *props = NULL; - IMalloc *ppM = NULL; - - hr = SHGetMalloc(&ppM); - if (FAILED(hr)) - { - ok(0, "Couldn't get IMalloc object.\n"); - goto end; - } hr = IDBInitialize_QueryInterface(dbinit, &IID_IDBProperties, (void**)&props); ok(hr == S_OK, "got %08x\n", hr); @@ -84,15 +75,12 @@ static void test_GetDataSource(WCHAR *initstring) pInfoset->rgPropertyInfos[i].vtType); } - IMalloc_Free(ppM, ary); + CoTaskMemFree(ary); } IDBProperties_Release(props); } - IMalloc_Release(ppM); - -end: IDBInitialize_Release(dbinit); }

1 0

Nikolay Sivov : msxml3/tests: Null-terminate a string before A-> W conversion (Valgrind).
by Alexandre Julliard May 5, 2014

May 5, 2014

Module: wine Branch: master Commit: 1742449ad8497d100d34f534b30ef6ecafa56d57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1742449ad8497d100d34f534b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 4 20:33:18 2014 +0400 msxml3/tests: Null-terminate a string before A->W conversion (Valgrind). --- dlls/msxml3/tests/saxreader.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 1032b8c..646984f 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -3297,8 +3297,9 @@ static void test_mxwriter_flush(void) ok(pos2.QuadPart == 0, "expected stream beginning\n"); len = 2048; - buff = HeapAlloc(GetProcessHeap(), 0, len); + buff = HeapAlloc(GetProcessHeap(), 0, len+1); memset(buff, 'A', len); + buff[len] = 0; hr = ISAXContentHandler_characters(content, _bstr_(buff), len); EXPECT_HR(hr, S_OK); @@ -3344,6 +3345,7 @@ todo_wine ok(pos2.QuadPart == 0, "expected stream beginning\n"); memset(buff, 'A', len); + buff[len] = 0; hr = ISAXContentHandler_characters(content, _bstr_(buff), len - 8); EXPECT_HR(hr, S_OK); @@ -3368,6 +3370,7 @@ todo_wine EXPECT_HR(hr, S_OK); memset(buff, 'A', len); + buff[len] = 0; hr = ISAXContentHandler_characters(content, _bstr_(buff), len); EXPECT_HR(hr, S_OK);

1 0

Victor Martinez Calvo : ieframe: Compare against the correct IID in ShellUIHelper.
by Alexandre Julliard May 5, 2014

May 5, 2014

Module: wine Branch: master Commit: 9e828995c9e6f85a0411918eaf45b0f41362784c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e828995c9e6f85a0411918ea… Author: Victor Martinez Calvo <vmartinez(a)reactos.org> Date: Fri May 2 19:20:05 2014 +0200 ieframe: Compare against the correct IID in ShellUIHelper. --- dlls/ieframe/shelluihelper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ieframe/shelluihelper.c b/dlls/ieframe/shelluihelper.c index 867505b..9dca681 100644 --- a/dlls/ieframe/shelluihelper.c +++ b/dlls/ieframe/shelluihelper.c @@ -45,7 +45,7 @@ static HRESULT WINAPI ShellUIHelper2_QueryInterface(IShellUIHelper2 *iface, REFI }else if(IsEqualGUID(&IID_IShellUIHelper, riid)) { TRACE("(%p)->(IID_IShellUIHelper %p)\n", This, ppv); *ppv = &This->IShellUIHelper2_iface; - }else if(IsEqualGUID(&IID_IShellUIHelper, riid)) { + }else if(IsEqualGUID(&IID_IShellUIHelper2, riid)) { TRACE("(%p)->(IID_IShellUIHelper2 %p)\n", This, ppv); *ppv = &This->IShellUIHelper2_iface; }else {

1 0

Piotr Caban : oleacc: Add GetProcessHandleFromHwnd implementation.
by Alexandre Julliard May 5, 2014

May 5, 2014

Module: wine Branch: master Commit: d8467aee7472d07158258138aa5144557833cf29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8467aee7472d07158258138a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat May 3 14:27:35 2014 +0200 oleacc: Add GetProcessHandleFromHwnd implementation. --- dlls/oleacc/main.c | 12 ++++++++++++ dlls/oleacc/oleacc.spec | 1 + dlls/oleacc/tests/main.c | 27 +++++++++++++++++++++++++++ 3 files changed, 40 insertions(+) diff --git a/dlls/oleacc/main.c b/dlls/oleacc/main.c index 2777a38..a80d6b4 100644 --- a/dlls/oleacc/main.c +++ b/dlls/oleacc/main.c @@ -332,6 +332,18 @@ void WINAPI GetOleaccVersionInfo(DWORD* pVersion, DWORD* pBuild) *pBuild = MAKELONG(0,0); } +HANDLE WINAPI GetProcessHandleFromHwnd(HWND hwnd) +{ + DWORD proc_id; + + TRACE("%p\n", hwnd); + + if(!GetWindowThreadProcessId(hwnd, &proc_id)) + return NULL; + return OpenProcess(PROCESS_DUP_HANDLE | PROCESS_VM_OPERATION | + PROCESS_VM_READ | PROCESS_VM_WRITE | SYNCHRONIZE, TRUE, proc_id); +} + UINT WINAPI GetRoleTextW(DWORD role, LPWSTR lpRole, UINT rolemax) { INT ret; diff --git a/dlls/oleacc/oleacc.spec b/dlls/oleacc/oleacc.spec index 6851454..dc92172 100644 --- a/dlls/oleacc/oleacc.spec +++ b/dlls/oleacc/oleacc.spec @@ -9,6 +9,7 @@ @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() @ stdcall GetOleaccVersionInfo(ptr ptr) +@ stdcall GetProcessHandleFromHwnd(ptr) @ stdcall GetRoleTextA(long ptr long) @ stdcall GetRoleTextW(long ptr long) @ stub GetStateTextA diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index 0162d72..186a71b 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -279,6 +279,32 @@ static void test_AccessibleObjectFromWindow(void) DestroyWindow(hwnd); } +static void test_GetProcessHandleFromHwnd(void) +{ + HANDLE (WINAPI *pGetProcessHandleFromHwnd)(HWND); + HANDLE proc; + HWND hwnd; + + pGetProcessHandleFromHwnd = (void*)GetProcAddress( + GetModuleHandleA("oleacc.dll"), "GetProcessHandleFromHwnd"); + if(!pGetProcessHandleFromHwnd) { + win_skip("GetProcessHandleFromHwnd not available\n"); + return; + } + + proc = pGetProcessHandleFromHwnd(NULL); + ok(!proc, "proc = %p\n", proc); + + hwnd = CreateWindowA("static", "", 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "CreateWindow failed\n"); + + proc = pGetProcessHandleFromHwnd(hwnd); + ok(proc != NULL, "proc == NULL\n"); + CloseHandle(proc); + + DestroyWindow(hwnd); +} + static void test_default_client_accessible_object(void) { static const WCHAR testW[] = {'t','e','s','t',' ','t',' ','&','j','u','n','k',0}; @@ -417,6 +443,7 @@ START_TEST(main) test_getroletext(); test_LresultFromObject(argv[0]); test_AccessibleObjectFromWindow(); + test_GetProcessHandleFromHwnd(); test_default_client_accessible_object(); unregister_window_class();

1 0

Zhenbo Li : mshtml: Removed invalid nsAString_InitDepend from HTMLTableRow_put_bgColor and fixed error handling.
by Alexandre Julliard May 5, 2014

May 5, 2014

Module: wine Branch: master Commit: 8192f54998b8ed3f892243ea5f6e84c6ca5d662a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8192f54998b8ed3f892243ea5… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Sat May 3 17:40:17 2014 +0800 mshtml: Removed invalid nsAString_InitDepend from HTMLTableRow_put_bgColor and fixed error handling. --- dlls/mshtml/htmltablerow.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmltablerow.c b/dlls/mshtml/htmltablerow.c index 74750bd..331d6c9 100644 --- a/dlls/mshtml/htmltablerow.c +++ b/dlls/mshtml/htmltablerow.c @@ -175,8 +175,9 @@ static HRESULT WINAPI HTMLTableRow_put_bgColor(IHTMLTableRow *iface, VARIANT v) TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); - nsAString_InitDepend(&val, V_BSTR(&v)); - variant_to_nscolor(&v, &val); + if (!variant_to_nscolor(&v, &val)) + return S_OK; + nsres = nsIDOMHTMLTableRowElement_SetBgColor(This->nsrow, &val); nsAString_Finish(&val);

1 0

Nikolay Sivov : ntdll: Fix a 'tlbid' string value leak (Valgrind).
by Alexandre Julliard May 5, 2014

May 5, 2014

Module: wine Branch: master Commit: 4a284644843913231d81997c302e8ceed20a33e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a284644843913231d81997c3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 4 20:32:39 2014 +0400 ntdll: Fix a 'tlbid' string value leak (Valgrind). --- dlls/ntdll/actctx.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 5d88b9a..14e196f 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -851,6 +851,7 @@ static void free_entity_array(struct entity_array *array) RtlFreeHeap(GetProcessHeap(), 0, entity->u.ifaceps.base); RtlFreeHeap(GetProcessHeap(), 0, entity->u.ifaceps.ps32); RtlFreeHeap(GetProcessHeap(), 0, entity->u.ifaceps.name); + RtlFreeHeap(GetProcessHeap(), 0, entity->u.ifaceps.tlib); break; case ACTIVATION_CONTEXT_SECTION_COM_TYPE_LIBRARY_REDIRECTION: RtlFreeHeap(GetProcessHeap(), 0, entity->u.typelib.tlbid);

1 0

Vincent Povirk : ole32: Initial implementation of transaction locking.
by Alexandre Julliard May 5, 2014

May 5, 2014

Module: wine Branch: master Commit: 4f0d36d9a0339f5f853064bbf4fdc0d320ab82f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f0d36d9a0339f5f853064bbf… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Apr 23 14:55:56 2014 -0500 ole32: Initial implementation of transaction locking. --- dlls/ole32/storage32.c | 310 ++++++++++++++++++++++++++++++++---------- dlls/ole32/storage32.h | 28 ++++ dlls/ole32/tests/storage32.c | 4 +- 3 files changed, 268 insertions(+), 74 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4f0d36d9a0339f5f85306…

1 0

Victor Martinez Calvo : quartz: Check correct dwReserved item before tracing.
by Alexandre Julliard May 5, 2014

May 5, 2014

Module: wine Branch: master Commit: 2dbfb2af840e3239435564f070c65876eb14b012 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2dbfb2af840e3239435564f07… Author: Victor Martinez Calvo <vmartinez(a)reactos.org> Date: Fri May 2 19:21:44 2014 +0200 quartz: Check correct dwReserved item before tracing. --- dlls/quartz/avisplit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c index 6cd28da..d74c8ab 100644 --- a/dlls/quartz/avisplit.c +++ b/dlls/quartz/avisplit.c @@ -820,7 +820,7 @@ static HRESULT AVISplitter_ProcessStreamList(AVISplitterImpl * This, const BYTE TRACE("dwChunkId: %.4s\n", (const char *)&pIndex->dwChunkId); if (pIndex->dwReserved[0]) TRACE("dwReserved[0]: %u\n", pIndex->dwReserved[0]); - if (pIndex->dwReserved[2]) + if (pIndex->dwReserved[1]) TRACE("dwReserved[1]: %u\n", pIndex->dwReserved[1]); if (pIndex->dwReserved[2]) TRACE("dwReserved[2]: %u\n", pIndex->dwReserved[2]);

1 0

Victor Martinez Calvo : msdmo: Actually copy output string in IEnumDMO_fnNext.
by Alexandre Julliard May 5, 2014

May 5, 2014

Module: wine Branch: master Commit: 0aea3728cca741913410534f411422905e3b8f2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0aea3728cca741913410534f4… Author: Victor Martinez Calvo <vmartinez(a)reactos.org> Date: Fri May 2 19:27:00 2014 +0200 msdmo: Actually copy output string in IEnumDMO_fnNext. --- dlls/msdmo/dmoreg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msdmo/dmoreg.c b/dlls/msdmo/dmoreg.c index fb1caa1..e0c0719 100644 --- a/dlls/msdmo/dmoreg.c +++ b/dlls/msdmo/dmoreg.c @@ -615,9 +615,9 @@ static HRESULT WINAPI IEnumDMO_fnNext( hres = RegQueryValueExW(hkey, NULL, NULL, NULL, (LPBYTE) szValue, &len); if (ERROR_SUCCESS == hres) { - Names[count] = HeapAlloc(GetProcessHeap(), 0, strlenW(szValue) + 1); + Names[count] = HeapAlloc(GetProcessHeap(), 0, (strlenW(szValue) + 1) * sizeof(WCHAR)); if (Names[count]) - strcmpW(Names[count], szValue); + strcpyW(Names[count], szValue); } wsprintfW(szGuidKey,szToGuidFmt,szNextKey); CLSIDFromString(szGuidKey, &pCLSID[count]);

1 0

Victor Martinez Calvo : shlwapi: Check correct attributes in PathRelativePath.
by Alexandre Julliard May 5, 2014

May 5, 2014

Module: wine Branch: master Commit: c2ff8f400568d875b87320048098543e78b16f72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2ff8f400568d875b87320048… Author: Victor Martinez Calvo <vmartinez(a)reactos.org> Date: Fri May 2 19:35:24 2014 +0200 shlwapi: Check correct attributes in PathRelativePath. --- dlls/shlwapi/path.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shlwapi/path.c b/dlls/shlwapi/path.c index eba1f69..080c243 100644 --- a/dlls/shlwapi/path.c +++ b/dlls/shlwapi/path.c @@ -3533,7 +3533,7 @@ BOOL WINAPI PathRelativePathToW(LPWSTR lpszPath, LPCWSTR lpszFrom, DWORD dwAttrF if(!(dwAttrFrom & FILE_ATTRIBUTE_DIRECTORY)) PathRemoveFileSpecW(szFrom); - if(!(dwAttrFrom & FILE_ATTRIBUTE_DIRECTORY)) + if(!(dwAttrTo & FILE_ATTRIBUTE_DIRECTORY)) PathRemoveFileSpecW(szTo); /* Paths can only be relative if they have a common root */

1 0

Nikolay Sivov : msxml3: Fix a string leak in msxml6 mode (Valgrind).
by Alexandre Julliard May 5, 2014

May 5, 2014

Module: wine Branch: master Commit: c7f1262613c83cef476dafe9bb7e912148b9c6f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7f1262613c83cef476dafe9b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 4 20:33:51 2014 +0400 msxml3: Fix a string leak in msxml6 mode (Valgrind). --- dlls/msxml3/schema.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c index a4aa083..d694cb3 100644 --- a/dlls/msxml3/schema.c +++ b/dlls/msxml3/schema.c @@ -1318,11 +1318,13 @@ static HRESULT WINAPI schema_cache_get(IXMLDOMSchemaCollection2* iface, BSTR uri static HRESULT WINAPI schema_cache_remove(IXMLDOMSchemaCollection2* iface, BSTR uri) { schema_cache* This = impl_from_IXMLDOMSchemaCollection2(iface); - xmlChar* name = uri ? xmlchar_from_wchar(uri) : xmlchar_from_wchar(emptyW); + xmlChar* name; + TRACE("(%p)->(%s)\n", This, debugstr_w(uri)); if (This->version == MSXML6) return E_NOTIMPL; + name = uri ? xmlchar_from_wchar(uri) : xmlchar_from_wchar(emptyW); cache_remove_entry(This, name); heap_free(name); return S_OK;

1 0