September 2018 - Wine-devel

[PATCH] xmllite/writer: Fix writing prefixed attributes.
by Nikolay Sivov 21 Sep '18

21 Sep '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/xmllite/tests/writer.c | 27 +++++++++++++++++++++++++++ dlls/xmllite/writer.c | 8 +++++--- 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index 2cd9cea6cc..5ddb1ef2a7 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -1768,6 +1768,33 @@ todo_wine "</p:a>"); IStream_Release(stream); + + /* Define prefix, write attribute with it. */ + stream = writer_set_output(writer); + + hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = write_start_element(writer, NULL, "e", NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = write_attribute_string(writer, "xmlns", "prefix", NULL, "uri"); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = write_attribute_string(writer, "prefix", "attr", NULL, "value"); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteEndDocument(writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + CHECK_OUTPUT(stream, + "<e xmlns:prefix=\"uri\" prefix:attr=\"value\" />"); + + IStream_Release(stream); + IXmlWriter_Release(writer); } diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index bf2a7514ac..8d1fb3a2da 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -843,8 +843,8 @@ static HRESULT WINAPI xmlwriter_WriteAttributeString(IXmlWriter *iface, LPCWSTR static const WCHAR xmlnsW[] = {'x','m','l','n','s',0}; static const WCHAR xmlW[] = {'x','m','l',0}; xmlwriter *This = impl_from_IXmlWriter(iface); + BOOL is_xmlns_prefix, is_xmlns_local; int prefix_len, local_len; - BOOL is_xmlns_prefix; struct ns *ns; HRESULT hr; @@ -879,6 +879,8 @@ static HRESULT WINAPI xmlwriter_WriteAttributeString(IXmlWriter *iface, LPCWSTR if (FAILED(hr = is_valid_ncname(local, &local_len))) return hr; + is_xmlns_local = !strcmpW(local, xmlnsW); + /* Trivial case, no prefix. */ if (prefix_len == 0 && is_empty_string(uri)) { @@ -918,9 +920,9 @@ static HRESULT WINAPI xmlwriter_WriteAttributeString(IXmlWriter *iface, LPCWSTR } /* Ignore prefix is URI wasn't specified. */ - if (is_empty_string(uri)) + if (is_xmlns_local && is_empty_string(uri)) { - write_output_attribute(This, NULL, 0, local, local_len, value); + write_output_attribute(This, NULL, 0, xmlnsW, ARRAY_SIZE(xmlnsW) - 1, value); return S_OK; } -- 2.18.0

1 0

[PATCH 1/3] opcservices: Add content type entry for relationship parts.
by Nikolay Sivov 21 Sep '18

21 Sep '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/opcservices/package.c | 70 +++++++++++++++++++++++++++++++++----- 1 file changed, 62 insertions(+), 8 deletions(-) diff --git a/dlls/opcservices/package.c b/dlls/opcservices/package.c index d7467a5ef8..a6f3b9046d 100644 --- a/dlls/opcservices/package.c +++ b/dlls/opcservices/package.c @@ -1535,6 +1535,7 @@ HRESULT opc_package_create(IOpcFactory *factory, IOpcPackage **out) struct content_types { struct list types; + BOOL has_rels_part; }; enum content_type_element @@ -1653,9 +1654,26 @@ static HRESULT opc_package_add_content_type(struct content_types *types, IOpcPar return hr; } +static BOOL opc_package_has_rels_part(IOpcRelationshipSet *rel_set) +{ + IOpcRelationshipEnumerator *enumerator; + BOOL has_next; + HRESULT hr; + + if (FAILED(hr = IOpcRelationshipSet_GetEnumerator(rel_set, &enumerator))) + return FALSE; + + has_next = FALSE; + IOpcRelationshipEnumerator_MoveNext(enumerator, &has_next); + IOpcRelationshipEnumerator_Release(enumerator); + + return has_next; +} + static HRESULT opc_package_collect_content_types(IOpcPackage *package, struct content_types *types) { IOpcPartEnumerator *enumerator; + IOpcRelationshipSet *rel_set; IOpcPartSet *parts; BOOL has_next; HRESULT hr; @@ -1663,6 +1681,13 @@ static HRESULT opc_package_collect_content_types(IOpcPackage *package, struct co if (FAILED(hr = IOpcPackage_GetPartSet(package, &parts))) return hr; + hr = IOpcPackage_GetRelationshipSet(package, &rel_set); + if (SUCCEEDED(hr)) + { + types->has_rels_part |= opc_package_has_rels_part(rel_set); + IOpcRelationshipSet_Release(rel_set); + } + hr = IOpcPartSet_GetEnumerator(parts, &enumerator); IOpcPartSet_Release(parts); if (FAILED(hr)) @@ -1681,6 +1706,16 @@ static HRESULT opc_package_collect_content_types(IOpcPackage *package, struct co if (FAILED(hr = IOpcPartEnumerator_GetCurrent(enumerator, &part))) break; + if (!types->has_rels_part) + { + hr = IOpcPart_GetRelationshipSet(part, &rel_set); + if (SUCCEEDED(hr)) + { + types->has_rels_part |= opc_package_has_rels_part(rel_set); + IOpcRelationshipSet_Release(rel_set); + } + } + hr = opc_package_add_content_type(types, part); IOpcPart_Release(part); if (FAILED(hr)) @@ -1694,23 +1729,40 @@ static HRESULT opc_package_collect_content_types(IOpcPackage *package, struct co return hr; } +static HRESULT opc_package_write_default_type(const WCHAR *ext, const WCHAR *type, IXmlWriter *writer) +{ + static const WCHAR contenttypeW[] = {'C','o','n','t','e','n','t','T','y','p','e',0}; + static const WCHAR extensionW[] = {'E','x','t','e','n','s','i','o','n',0}; + static const WCHAR defaultW[] = {'D','e','f','a','u','l','t',0}; + HRESULT hr; + + hr = IXmlWriter_WriteStartElement(writer, NULL, defaultW, NULL); + if (SUCCEEDED(hr)) + hr = IXmlWriter_WriteAttributeString(writer, NULL, extensionW, NULL, ext); + if (SUCCEEDED(hr)) + hr = IXmlWriter_WriteAttributeString(writer, NULL, contenttypeW, NULL, type); + return hr; +} + static HRESULT opc_package_write_contenttypes(IOpcPackage *package, struct zip_archive *archive, IXmlWriter *writer) { static const WCHAR uriW[] = {'h','t','t','p',':','/','/','s','c','h','e','m','a','s','.','o','p','e','n','x','m','l','f','o','r','m','a','t','s','.','o','r','g','/', 'p','a','c','k','a','g','e','/','2','0','0','6','/','c','o','n','t','e','n','t','-','t','y','p','e','s',0}; + static const WCHAR relstypeW[] = {'a','p','p','l','i','c','a','t','i','o','n','/','v','n','d','.','o','p','e','n','x','m','l','f','o','r','m','a','t','s','-', + 'p','a','c','k','a','g','e','.','r','e','l','a','t','i','o','n','s','h','i','p','s','+','x','m','l',0}; static const WCHAR contenttypesW[] = {'[','C','o','n','t','e','n','t','_','T','y','p','e','s',']','.','x','m','l',0}; static const WCHAR contenttypeW[] = {'C','o','n','t','e','n','t','T','y','p','e',0}; - static const WCHAR extensionW[] = {'E','x','t','e','n','s','i','o','n',0}; static const WCHAR overrideW[] = {'O','v','e','r','r','i','d','e',0}; static const WCHAR partnameW[] = {'P','a','r','t','N','a','m','e',0}; - static const WCHAR defaultW[] = {'D','e','f','a','u','l','t',0}; static const WCHAR typesW[] = {'T','y','p','e','s',0}; + static const WCHAR relsW[] = {'r','e','l','s',0}; struct content_type *content_type, *content_type2; struct content_types types; IStream *content = NULL; HRESULT hr; list_init(&types.types); + types.has_rels_part = FALSE; hr = CreateStreamOnHGlobal(NULL, TRUE, &content); if (SUCCEEDED(hr)) @@ -1722,16 +1774,18 @@ static HRESULT opc_package_write_contenttypes(IOpcPackage *package, struct zip_a if (SUCCEEDED(hr)) hr = IXmlWriter_WriteStartElement(writer, NULL, typesW, uriW); + if (SUCCEEDED(hr) && types.has_rels_part) + { + hr = opc_package_write_default_type(relsW, relstypeW, writer); + if (SUCCEEDED(hr)) + hr = IXmlWriter_WriteEndElement(writer); + } + LIST_FOR_EACH_ENTRY_SAFE(content_type, content_type2, &types.types, struct content_type, entry) { if (content_type->element == CONTENT_TYPE_DEFAULT) { - if (SUCCEEDED(hr)) - hr = IXmlWriter_WriteStartElement(writer, NULL, defaultW, NULL); - if (SUCCEEDED(hr)) - hr = IXmlWriter_WriteAttributeString(writer, NULL, extensionW, NULL, content_type->u.def.ext + 1); - if (SUCCEEDED(hr)) - hr = IXmlWriter_WriteAttributeString(writer, NULL, contenttypeW, NULL, content_type->u.def.type); + hr = opc_package_write_default_type(content_type->u.def.ext + 1, content_type->u.def.type, writer); CoTaskMemFree(content_type->u.def.ext); CoTaskMemFree(content_type->u.def.type); -- 2.18.0

1 2

[PATCH] shlwapi: Avoid ARRAY_SIZE-like macros
by Michael Stefaniuc 20 Sep '18

20 Sep '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shlwapi/path.c | 10 ++++------ dlls/shlwapi/reg.c | 7 +++---- dlls/shlwapi/url.c | 2 +- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/shlwapi/path.c b/dlls/shlwapi/path.c index ae05381b66..e24835f238 100644 --- a/dlls/shlwapi/path.c +++ b/dlls/shlwapi/path.c @@ -4217,8 +4217,6 @@ HRESULT WINAPI SHGetWebFolderFilePathW(LPCWSTR lpszFile, LPWSTR lpszPath, DWORD { static const WCHAR szWeb[] = {'\\','W','e','b','\\','\0'}; static const WCHAR szWebMui[] = {'m','u','i','\\','%','0','4','x','\\','\0'}; -#define szWebLen (sizeof(szWeb)/sizeof(WCHAR)) -#define szWebMuiLen ((sizeof(szWebMui)+1)/sizeof(WCHAR)) DWORD dwLen, dwFileLen; LANGID lidSystem, lidUser; @@ -4231,11 +4229,11 @@ HRESULT WINAPI SHGetWebFolderFilePathW(LPCWSTR lpszFile, LPWSTR lpszPath, DWORD dwFileLen = strlenW(lpszFile); - if (dwLen + dwFileLen + szWebLen >= dwPathLen) + if (dwLen + dwFileLen + ARRAY_SIZE(szWeb) >= dwPathLen) return E_FAIL; /* lpszPath too short */ strcpyW(lpszPath+dwLen, szWeb); - dwLen += szWebLen; + dwLen += ARRAY_SIZE(szWeb); dwPathLen = dwPathLen - dwLen; /* Remaining space */ lidSystem = GetSystemDefaultUILanguage(); @@ -4243,11 +4241,11 @@ HRESULT WINAPI SHGetWebFolderFilePathW(LPCWSTR lpszFile, LPWSTR lpszPath, DWORD if (lidSystem != lidUser) { - if (dwFileLen + szWebMuiLen < dwPathLen) + if (dwFileLen + ARRAY_SIZE(szWebMui) < dwPathLen) { /* Use localised content in the users UI language if present */ wsprintfW(lpszPath + dwLen, szWebMui, lidUser); - strcpyW(lpszPath + dwLen + szWebMuiLen, lpszFile); + strcpyW(lpszPath + dwLen + ARRAY_SIZE(szWebMui), lpszFile); if (PathFileExistsW(lpszPath)) return S_OK; } diff --git a/dlls/shlwapi/reg.c b/dlls/shlwapi/reg.c index a72f4c24e4..375c25429d 100644 --- a/dlls/shlwapi/reg.c +++ b/dlls/shlwapi/reg.c @@ -2426,19 +2426,18 @@ HRESULT WINAPI SHRegGetCLSIDKeyW(REFGUID guid, LPCWSTR lpszValue, BOOL bUseHKCU, 'M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\', 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', 'E','x','p','l','o','r','e','r','\\','C','L','S','I','D','\\' }; -#define szClassIdKeyLen (sizeof(szClassIdKey)/sizeof(WCHAR)) WCHAR szKey[MAX_PATH]; DWORD dwRet; HKEY hkey; /* Create the key string */ memcpy(szKey, szClassIdKey, sizeof(szClassIdKey)); - SHStringFromGUIDW(guid, szKey + szClassIdKeyLen, 39); /* Append guid */ + SHStringFromGUIDW(guid, szKey + ARRAY_SIZE(szClassIdKey), 39); /* Append guid */ if(lpszValue) { - szKey[szClassIdKeyLen + 39] = '\\'; - strcpyW(szKey + szClassIdKeyLen + 40, lpszValue); /* Append value name */ + szKey[ARRAY_SIZE(szClassIdKey) + 39] = '\\'; + strcpyW(szKey + ARRAY_SIZE(szClassIdKey) + 40, lpszValue); /* Append value name */ } hkey = bUseHKCU ? HKEY_CURRENT_USER : HKEY_CLASSES_ROOT; diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index c7d717b2d7..92b4a216cb 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -2570,7 +2570,7 @@ HRESULT WINAPI MLBuildResURLW(LPCWSTR lpszLibName, HMODULE hMod, DWORD dwFlags, LPCWSTR lpszRes, LPWSTR lpszDest, DWORD dwDestLen) { static const WCHAR szRes[] = { 'r','e','s',':','/','/','\0' }; -#define szResLen ((sizeof(szRes) - sizeof(WCHAR))/sizeof(WCHAR)) + static const unsigned int szResLen = ARRAY_SIZE(szRes) - 1; HRESULT hRet = E_FAIL; TRACE("(%s,%p,0x%08x,%s,%p,%d)\n", debugstr_w(lpszLibName), hMod, dwFlags, -- 2.14.4

3 2

[PATCH] wininet: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 20 Sep '18

20 Sep '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wininet/cookie.c | 24 ++++++++++++------------ dlls/wininet/dialogs.c | 24 +++++++++++------------- dlls/wininet/http.c | 31 ++++++++++++++----------------- dlls/wininet/internet.c | 10 +++++----- dlls/wininet/netconnection.c | 8 ++++---- dlls/wininet/urlcache.c | 8 ++++---- dlls/wininet/utility.c | 2 +- 7 files changed, 51 insertions(+), 56 deletions(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index 60b8335639..a1ea1deb1b 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -151,18 +151,18 @@ static WCHAR *create_cookie_url(substr_t domain, substr_t path, substr_t *ret_pa static const WCHAR cookie_prefix[] = {'C','o','o','k','i','e',':'}; - user_len = sizeof(user)/sizeof(WCHAR); + user_len = ARRAY_SIZE(user); if(!GetUserNameW(user, &user_len)) return FALSE; user_len--; - len = sizeof(cookie_prefix)/sizeof(WCHAR) + user_len + 1 /* @ */ + domain.len + path.len; + len = ARRAY_SIZE(cookie_prefix) + user_len + 1 /* @ */ + domain.len + path.len; url = heap_alloc((len+1) * sizeof(WCHAR)); if(!url) return NULL; memcpy(url, cookie_prefix, sizeof(cookie_prefix)); - p = url + sizeof(cookie_prefix)/sizeof(WCHAR); + p = url + ARRAY_SIZE(cookie_prefix); memcpy(p, user, user_len*sizeof(WCHAR)); p += user_len; @@ -658,7 +658,7 @@ DWORD get_cookie_header(const WCHAR *host, const WCHAR *path, WCHAR **ret) ptr = header = heap_alloc(sizeof(cookieW) + (cookie_set.string_len + 3 /* crlf0 */) * sizeof(WCHAR)); if(header) { memcpy(ptr, cookieW, sizeof(cookieW)); - ptr += sizeof(cookieW)/sizeof(*cookieW); + ptr += ARRAY_SIZE(cookieW); cookie_set_to_string(&cookie_set, ptr); heap_free(cookie_set.cookies); @@ -949,7 +949,7 @@ DWORD set_cookie(substr_t domain, substr_t path, substr_t name, substr_t data, D if(!(end_ptr = memchrW(data.str, ';', data.len))) end_ptr = data.str + data.len; - if(data.len >= (len = sizeof(szDomain)/sizeof(WCHAR)) && !strncmpiW(data.str, szDomain, len)) { + if(data.len >= (len = ARRAY_SIZE(szDomain)) && !strncmpiW(data.str, szDomain, len)) { substr_skip(&data, len); if(data.len && *data.str == '.') @@ -960,17 +960,17 @@ DWORD set_cookie(substr_t domain, substr_t path, substr_t name, substr_t data, D domain = substr(data.str, end_ptr-data.str); TRACE("Parsing new domain %s\n", debugstr_wn(domain.str, domain.len)); - }else if(data.len >= (len = sizeof(szPath)/sizeof(WCHAR)) && !strncmpiW(data.str, szPath, len)) { + }else if(data.len >= (len = ARRAY_SIZE(szPath)) && !strncmpiW(data.str, szPath, len)) { substr_skip(&data, len); path = substr(data.str, end_ptr - data.str); TRACE("Parsing new path %s\n", debugstr_wn(path.str, path.len)); - }else if(data.len >= (len = sizeof(szExpires)/sizeof(WCHAR)) && !strncmpiW(data.str, szExpires, len)) { + }else if(data.len >= (len = ARRAY_SIZE(szExpires)) && !strncmpiW(data.str, szExpires, len)) { SYSTEMTIME st; WCHAR buf[128]; substr_skip(&data, len); - if(end_ptr - data.str < sizeof(buf)/sizeof(WCHAR)-1) { + if(end_ptr - data.str < ARRAY_SIZE(buf)-1) { memcpy(buf, data.str, data.len*sizeof(WCHAR)); buf[data.len] = 0; @@ -983,10 +983,10 @@ DWORD set_cookie(substr_t domain, substr_t path, substr_t name, substr_t data, D } } } - }else if(data.len >= (len = sizeof(szSecure)/sizeof(WCHAR)) && !strncmpiW(data.str, szSecure, len)) { + }else if(data.len >= (len = ARRAY_SIZE(szSecure)) && !strncmpiW(data.str, szSecure, len)) { substr_skip(&data, len); FIXME("secure not handled\n"); - }else if(data.len >= (len = sizeof(szHttpOnly)/sizeof(WCHAR)) && !strncmpiW(data.str, szHttpOnly, len)) { + }else if(data.len >= (len = ARRAY_SIZE(szHttpOnly)) && !strncmpiW(data.str, szHttpOnly, len)) { substr_skip(&data, len); if(!(flags & INTERNET_COOKIE_HTTPONLY)) { @@ -996,11 +996,11 @@ DWORD set_cookie(substr_t domain, substr_t path, substr_t name, substr_t data, D } cookie_flags |= INTERNET_COOKIE_HTTPONLY; - }else if(data.len >= (len = sizeof(szVersion)/sizeof(WCHAR)) && !strncmpiW(data.str, szVersion, len)) { + }else if(data.len >= (len = ARRAY_SIZE(szVersion)) && !strncmpiW(data.str, szVersion, len)) { substr_skip(&data, len); FIXME("version not handled (%s)\n",debugstr_wn(data.str, data.len)); - }else if(data.len >= (len = sizeof(max_ageW)/sizeof(WCHAR)) && !strncmpiW(data.str, max_ageW, len)) { + }else if(data.len >= (len = ARRAY_SIZE(max_ageW)) && !strncmpiW(data.str, max_ageW, len)) { /* Native doesn't support Max-Age attribute. */ WARN("Max-Age ignored\n"); }else if(data.len) { diff --git a/dlls/wininet/dialogs.c b/dlls/wininet/dialogs.c index b13b566a8e..b4aa49c0eb 100644 --- a/dlls/wininet/dialogs.c +++ b/dlls/wininet/dialogs.c @@ -135,12 +135,10 @@ static BOOL WININET_GetSetPassword( HWND hdlg, LPCWSTR szServer, if( bSet ) { szUserPass[0] = 0; - GetWindowTextW( hUserItem, szUserPass, - (sizeof szUserPass-1)/sizeof(WCHAR) ); + GetWindowTextW( hUserItem, szUserPass, ARRAY_SIZE( szUserPass ) - 1 ); lstrcatW(szUserPass, szColon); u_len = strlenW( szUserPass ); - GetWindowTextW( hPassItem, szUserPass+u_len, - (sizeof szUserPass)/sizeof(WCHAR)-u_len ); + GetWindowTextW( hPassItem, szUserPass+u_len, ARRAY_SIZE( szUserPass ) - u_len ); r_len = (strlenW( szResource ) + 1)*sizeof(WCHAR); u_len = (strlenW( szUserPass ) + 1)*sizeof(WCHAR); @@ -230,7 +228,7 @@ static INT_PTR WINAPI WININET_ProxyPasswordDialog( /* extract the Realm from the proxy response and show it */ if( WININET_GetAuthRealm( params->req->hdr.hInternet, - szRealm, sizeof szRealm/sizeof(WCHAR), TRUE ) ) + szRealm, ARRAY_SIZE( szRealm ), TRUE ) ) { hitem = GetDlgItem( hdlg, IDC_REALM ); SetWindowTextW( hitem, szRealm ); @@ -257,18 +255,18 @@ static INT_PTR WINAPI WININET_ProxyPasswordDialog( username[0] = 0; hitem = GetDlgItem( hdlg, IDC_USERNAME ); if( hitem ) - GetWindowTextW( hitem, username, sizeof username/sizeof(WCHAR) ); - + GetWindowTextW( hitem, username, ARRAY_SIZE( username )); + password[0] = 0; hitem = GetDlgItem( hdlg, IDC_PASSWORD ); if( hitem ) - GetWindowTextW( hitem, password, sizeof password/sizeof(WCHAR) ); + GetWindowTextW( hitem, password, ARRAY_SIZE( password )); hitem = GetDlgItem( hdlg, IDC_SAVEPASSWORD ); if( hitem && SendMessageW( hitem, BM_GETSTATE, 0, 0 ) && WININET_GetAuthRealm( params->req->hdr.hInternet, - szRealm, sizeof szRealm/sizeof(WCHAR), TRUE) ) + szRealm, ARRAY_SIZE( szRealm ), TRUE) ) WININET_GetSetPassword( hdlg, params->req->session->appInfo->proxy, szRealm, TRUE ); WININET_SetAuthorization( params->req, username, password, TRUE ); @@ -305,7 +303,7 @@ static INT_PTR WINAPI WININET_PasswordDialog( /* extract the Realm from the response and show it */ if( WININET_GetAuthRealm( params->req->hdr.hInternet, - szRealm, sizeof szRealm/sizeof(WCHAR), FALSE ) ) + szRealm, ARRAY_SIZE( szRealm ), FALSE ) ) { hitem = GetDlgItem( hdlg, IDC_REALM ); SetWindowTextW( hitem, szRealm ); @@ -332,18 +330,18 @@ static INT_PTR WINAPI WININET_PasswordDialog( username[0] = 0; hitem = GetDlgItem( hdlg, IDC_USERNAME ); if( hitem ) - GetWindowTextW( hitem, username, sizeof username/sizeof(WCHAR) ); + GetWindowTextW( hitem, username, ARRAY_SIZE( username )); password[0] = 0; hitem = GetDlgItem( hdlg, IDC_PASSWORD ); if( hitem ) - GetWindowTextW( hitem, password, sizeof password/sizeof(WCHAR) ); + GetWindowTextW( hitem, password, ARRAY_SIZE( password )); hitem = GetDlgItem( hdlg, IDC_SAVEPASSWORD ); if( hitem && SendMessageW( hitem, BM_GETSTATE, 0, 0 ) && WININET_GetAuthRealm( params->req->hdr.hInternet, - szRealm, sizeof szRealm/sizeof(WCHAR), FALSE )) + szRealm, ARRAY_SIZE( szRealm ), FALSE )) { WININET_GetSetPassword( hdlg, params->req->session->hostName, szRealm, TRUE ); } diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 9e839ce16f..4122067e41 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1712,7 +1712,7 @@ static BOOL HTTP_DomainMatches(LPCWSTR server, substr_t domain) const WCHAR *dot, *ptr; int len; - if(domain.len == sizeof(localW)/sizeof(WCHAR)-1 && !strncmpiW(domain.str, localW, domain.len) && !strchrW(server, '.' )) + if(domain.len == ARRAY_SIZE(localW)-1 && !strncmpiW(domain.str, localW, domain.len) && !strchrW(server, '.' )) return TRUE; if(domain.len && *domain.str != '*') @@ -2409,8 +2409,8 @@ static void create_cache_entry(http_request_t *req) if(!end) end = ptr + strlenW(ptr); - if(!strncmpiW(ptr, no_cacheW, sizeof(no_cacheW)/sizeof(*no_cacheW)-1) - || !strncmpiW(ptr, no_storeW, sizeof(no_storeW)/sizeof(*no_storeW)-1)) { + if(!strncmpiW(ptr, no_cacheW, ARRAY_SIZE(no_cacheW)-1) + || !strncmpiW(ptr, no_storeW, ARRAY_SIZE(no_storeW)-1)) { b = FALSE; break; } @@ -3871,18 +3871,18 @@ BOOL WINAPI HttpQueryInfoW(HINTERNET hHttpRequest, DWORD dwInfoLevel, TRACE("(%p, 0x%08x)--> %d\n", hHttpRequest, dwInfoLevel, info); TRACE(" Attribute:"); - for (i = 0; i < (sizeof(query_flags) / sizeof(query_flags[0])); i++) { + for (i = 0; i < ARRAY_SIZE(query_flags); i++) { if (query_flags[i].val == info) { TRACE(" %s", query_flags[i].name); break; } } - if (i == (sizeof(query_flags) / sizeof(query_flags[0]))) { + if (i == ARRAY_SIZE(query_flags)) { TRACE(" Unknown (%08x)", info); } TRACE(" Modifier:"); - for (i = 0; i < (sizeof(modifier_flags) / sizeof(modifier_flags[0])); i++) { + for (i = 0; i < ARRAY_SIZE(modifier_flags); i++) { if (modifier_flags[i].val & info_mod) { TRACE(" %s", modifier_flags[i].name); info_mod &= ~ modifier_flags[i].val; @@ -4208,7 +4208,7 @@ static WORD HTTP_ParseWkday(LPCWSTR day) { 'f','r','i',0 }, { 's','a','t',0 }}; unsigned int i; - for (i = 0; i < sizeof(days)/sizeof(*days); i++) + for (i = 0; i < ARRAY_SIZE(days); i++) if (!strcmpiW(day, days[i])) return i; @@ -4313,7 +4313,7 @@ static BOOL HTTP_ParseDateAsAsctime(LPCWSTR value, FILETIME *ft) unsigned long num; for (ptr = value, dayPtr = day; *ptr && !isspaceW(*ptr) && - dayPtr - day < sizeof(day) / sizeof(day[0]) - 1; ptr++, dayPtr++) + dayPtr - day < ARRAY_SIZE(day) - 1; ptr++, dayPtr++) *dayPtr = *ptr; *dayPtr = 0; st.wDayOfWeek = HTTP_ParseWkday(day); @@ -4326,8 +4326,7 @@ static BOOL HTTP_ParseDateAsAsctime(LPCWSTR value, FILETIME *ft) while (isspaceW(*ptr)) ptr++; - for (monthPtr = month; !isspaceW(*ptr) && - monthPtr - month < sizeof(month) / sizeof(month[0]) - 1; + for (monthPtr = month; !isspaceW(*ptr) && monthPtr - month < ARRAY_SIZE(month) - 1; monthPtr++, ptr++) *monthPtr = *ptr; *monthPtr = 0; @@ -4423,8 +4422,7 @@ static BOOL HTTP_ParseRfc1123Date(LPCWSTR value, FILETIME *ft) while (isspaceW(*ptr)) ptr++; - for (monthPtr = month; !isspaceW(*ptr) && - monthPtr - month < sizeof(month) / sizeof(month[0]) - 1; + for (monthPtr = month; !isspaceW(*ptr) && monthPtr - month < ARRAY_SIZE(month) - 1; monthPtr++, ptr++) *monthPtr = *ptr; *monthPtr = 0; @@ -4471,7 +4469,7 @@ static WORD HTTP_ParseWeekday(LPCWSTR day) { 'f','r','i','d','a','y',0 }, { 's','a','t','u','r','d','a','y',0 }}; unsigned int i; - for (i = 0; i < sizeof(days)/sizeof(*days); i++) + for (i = 0; i < ARRAY_SIZE(days); i++) if (!strcmpiW(day, days[i])) return i; @@ -4501,7 +4499,7 @@ static BOOL HTTP_ParseRfc850Date(LPCWSTR value, FILETIME *ft) return FALSE; } } - else if (ptr - value < sizeof(day) / sizeof(day[0])) + else if (ptr - value < ARRAY_SIZE(day)) { memcpy(day, value, (ptr - value) * sizeof(WCHAR)); day[ptr - value + 1] = 0; @@ -4538,8 +4536,7 @@ static BOOL HTTP_ParseRfc850Date(LPCWSTR value, FILETIME *ft) } ptr++; - for (monthPtr = month; *ptr != '-' && - monthPtr - month < sizeof(month) / sizeof(month[0]) - 1; + for (monthPtr = month; *ptr != '-' && monthPtr - month < ARRAY_SIZE(month) - 1; monthPtr++, ptr++) *monthPtr = *ptr; *monthPtr = 0; @@ -4827,7 +4824,7 @@ static void set_content_length_header( http_request_t *request, DWORD len, DWORD { static const WCHAR fmtW[] = {'C','o','n','t','e','n','t','-','L','e','n','g','t','h',':',' ','%','u','\r','\n',0}; - WCHAR buf[sizeof(fmtW)/sizeof(fmtW[0]) + 10]; + WCHAR buf[ARRAY_SIZE(fmtW) + 10]; sprintfW( buf, fmtW, len ); HTTP_HttpAddRequestHeadersW( request, buf, ~0u, flags ); diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index b407e851af..6db42d692d 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -777,7 +777,7 @@ static void dump_INTERNET_FLAGS(DWORD dwFlags) #undef FE unsigned int i; - for (i = 0; i < (sizeof(flag) / sizeof(flag[0])); i++) { + for (i = 0; i < ARRAY_SIZE(flag); i++) { if (flag[i].val & dwFlags) { TRACE(" %s", flag[i].name); dwFlags &= ~flag[i].val; @@ -1018,7 +1018,7 @@ HINTERNET WINAPI InternetOpenW(LPCWSTR lpszAgent, DWORD dwAccessType, TRACE("(%s, %i, %s, %s, %i)\n", debugstr_w(lpszAgent), dwAccessType, debugstr_w(lpszProxy), debugstr_w(lpszProxyBypass), dwFlags); - for (i = 0; i < (sizeof(access_type) / sizeof(access_type[0])); i++) { + for (i = 0; i < ARRAY_SIZE(access_type); i++) { if (access_type[i].val == dwAccessType) { access_type_str = access_type[i].name; break; @@ -1623,7 +1623,7 @@ static INTERNET_SCHEME GetInternetSchemeW(LPCWSTR lpszScheme, DWORD nMaxCmp) if(lpszScheme==NULL) return INTERNET_SCHEME_UNKNOWN; - for (i = 0; i < sizeof(url_schemes)/sizeof(url_schemes[0]); i++) + for (i = 0; i < ARRAY_SIZE(url_schemes); i++) if (!strncmpiW(lpszScheme, url_schemes[i], nMaxCmp)) return INTERNET_SCHEME_FIRST + i; @@ -4066,7 +4066,7 @@ static LPCWSTR INTERNET_GetSchemeString(INTERNET_SCHEME scheme) if (scheme < INTERNET_SCHEME_FIRST) return NULL; index = scheme - INTERNET_SCHEME_FIRST; - if (index >= sizeof(url_schemes)/sizeof(url_schemes[0])) + if (index >= ARRAY_SIZE(url_schemes)) return NULL; return (LPCWSTR)url_schemes[index]; } @@ -4343,7 +4343,7 @@ BOOL WINAPI InternetCreateUrlW(LPURL_COMPONENTSW lpUrlComponents, DWORD dwFlags, if (!scheme_is_opaque(nScheme) || lpUrlComponents->lpszHostName) { memcpy(lpszUrl, slashSlashW, sizeof(slashSlashW)); - lpszUrl += sizeof(slashSlashW)/sizeof(slashSlashW[0]); + lpszUrl += ARRAY_SIZE(slashSlashW); } if (lpUrlComponents->lpszUserName) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index ccdb8818d7..4ad22177ee 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -639,7 +639,7 @@ static BOOL send_ssl_chunk(netconn_t *conn, const void *msg, size_t size) {conn->ssl_sizes.cbTrailer, SECBUFFER_STREAM_TRAILER, conn->ssl_buf+conn->ssl_sizes.cbHeader+size}, {0, SECBUFFER_EMPTY, NULL} }; - SecBufferDesc buf_desc = {SECBUFFER_VERSION, sizeof(bufs)/sizeof(*bufs), bufs}; + SecBufferDesc buf_desc = {SECBUFFER_VERSION, ARRAY_SIZE(bufs), bufs}; SECURITY_STATUS res; memcpy(bufs[1].pvBuffer, msg, size); @@ -698,7 +698,7 @@ static BOOL read_ssl_chunk(netconn_t *conn, void *buf, SIZE_T buf_size, BOOL blo { const SIZE_T ssl_buf_size = conn->ssl_sizes.cbHeader+conn->ssl_sizes.cbMaximumMessage+conn->ssl_sizes.cbTrailer; SecBuffer bufs[4]; - SecBufferDesc buf_desc = {SECBUFFER_VERSION, sizeof(bufs)/sizeof(*bufs), bufs}; + SecBufferDesc buf_desc = {SECBUFFER_VERSION, ARRAY_SIZE(bufs), bufs}; SSIZE_T size, buf_len = 0; int i; SECURITY_STATUS res; @@ -781,7 +781,7 @@ static BOOL read_ssl_chunk(netconn_t *conn, void *buf, SIZE_T buf_size, BOOL blo } } while(res != SEC_E_OK); - for(i=0; i < sizeof(bufs)/sizeof(*bufs); i++) { + for(i = 0; i < ARRAY_SIZE(bufs); i++) { if(bufs[i].BufferType == SECBUFFER_DATA) { size = min(buf_size, bufs[i].cbBuffer); memcpy(buf, bufs[i].pvBuffer, size); @@ -798,7 +798,7 @@ static BOOL read_ssl_chunk(netconn_t *conn, void *buf, SIZE_T buf_size, BOOL blo } } - for(i=0; i < sizeof(bufs)/sizeof(*bufs); i++) { + for(i = 0; i < ARRAY_SIZE(bufs); i++) { if(bufs[i].BufferType == SECBUFFER_EXTRA) { conn->extra_buf = heap_alloc(bufs[i].cbBuffer); if(!conn->extra_buf) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index c7b5f9ecad..55cffb7911 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -766,7 +766,7 @@ static void cache_containers_init(void) }; DWORD i; - for (i = 0; i < sizeof(DefaultContainerData) / sizeof(DefaultContainerData[0]); i++) + for (i = 0; i < ARRAY_SIZE(DefaultContainerData); i++) { WCHAR wszCachePath[MAX_PATH]; WCHAR wszMutexName[MAX_PATH]; @@ -1478,12 +1478,12 @@ static DWORD urlcache_hash_key(LPCSTR lpszKey) BYTE key[4]; DWORD i; - for (i = 0; i < sizeof(key) / sizeof(key[0]); i++) + for (i = 0; i < ARRAY_SIZE(key); i++) key[i] = lookupTable[(*lpszKey + i) & 0xFF]; for (lpszKey++; *lpszKey; lpszKey++) { - for (i = 0; i < sizeof(key) / sizeof(key[0]); i++) + for (i = 0; i < ARRAY_SIZE(key); i++) key[i] = lookupTable[*lpszKey ^ key[i]]; } @@ -2441,7 +2441,7 @@ BOOL WINAPI FreeUrlCacheSpaceW(LPCWSTR cache_path, DWORD size, DWORD filter) hash_table_entry = 0; rate_no = 0; GetSystemTimeAsFileTime(&cur_time); - while(rate_no<sizeof(rate)/sizeof(*rate) && + while(rate_no < ARRAY_SIZE(rate) && urlcache_next_entry(header, &hash_table_off, &hash_table_entry, &hash_entry, &entry)) { if(entry->signature != URL_SIGNATURE) { WARN("only url entries are currently supported\n"); diff --git a/dlls/wininet/utility.c b/dlls/wininet/utility.c index 1492c039ef..90058dc28b 100644 --- a/dlls/wininet/utility.c +++ b/dlls/wininet/utility.c @@ -214,7 +214,7 @@ static const char *get_callback_name(DWORD dwInternetStatus) { }; DWORD i; - for (i = 0; i < (sizeof(internet_status) / sizeof(internet_status[0])); i++) { + for (i = 0; i < ARRAY_SIZE(internet_status); i++) { if (internet_status[i].val == dwInternetStatus) return internet_status[i].name; } return "Unknown"; -- 2.14.4

1 0

[PATCH] wininet: Avoid an ARRAY_SIZE-like macro
by Michael Stefaniuc 20 Sep '18

20 Sep '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wininet/http.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index b7be9939a1..9e839ce16f 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3513,8 +3513,6 @@ static const LPCWSTR header_lookup[] = { szUnless_Modified_Since, /* HTTP_QUERY_UNLESS_MODIFIED_SINCE = 70 */ }; -#define LAST_TABLE_HEADER (sizeof(header_lookup)/sizeof(header_lookup[0])) - /*********************************************************************** * HTTP_HttpQueryInfoW (internal) */ @@ -3700,9 +3698,9 @@ static DWORD HTTP_HttpQueryInfoW(http_request_t *request, DWORD dwInfoLevel, return res; } default: - assert (LAST_TABLE_HEADER == (HTTP_QUERY_UNLESS_MODIFIED_SINCE + 1)); + assert (ARRAY_SIZE(header_lookup) == (HTTP_QUERY_UNLESS_MODIFIED_SINCE + 1)); - if (level < LAST_TABLE_HEADER && header_lookup[level]) + if (level < ARRAY_SIZE(header_lookup) && header_lookup[level]) index = HTTP_GetCustomHeaderIndex(request, header_lookup[level], requested_index,request_only); } -- 2.14.4

1 0

[PATCH v2 1/8] comctl32/listbox: Make SetCount fail if LBS_NODATA is not set
by Gabriel Ivăncescu 20 Sep '18

20 Sep '18

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- Supersedes series starting with 151474. v2: Looks like Windows accepts both LBS_OWNERDRAWFIXED and LBS_OWNERDRAWVARIABLE at once, for some stupid reason, and only LBS_OWNERDRAWFIXED takes effect (based on testing on Windows XP). So keep LBS_NODATA if they're both set. dlls/comctl32/listbox.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index 2137ef8..0a7c341 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -1752,7 +1752,7 @@ static LRESULT LISTBOX_SetCount( LB_DESCR *descr, INT count ) { LRESULT ret; - if (HAS_STRINGS(descr)) + if (!(descr->style & LBS_NODATA)) { SetLastError(ERROR_SETCOUNT_ON_BAD_LB); return LB_ERR; @@ -2518,6 +2518,9 @@ static BOOL LISTBOX_Create( HWND hwnd, LPHEADCOMBO lphc ) if (descr->style & LBS_OWNERDRAWVARIABLE) descr->style |= LBS_NOINTEGRALHEIGHT; descr->item_height = LISTBOX_SetFont( descr, 0 ); + if ((descr->style & (LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_SORT)) != LBS_OWNERDRAWFIXED) + descr->style &= ~LBS_NODATA; + if (descr->style & LBS_OWNERDRAWFIXED) { if( descr->lphc && (descr->lphc->dwStyle & CBS_DROPDOWN)) -- 1.9.1

2 11

[PATCH 1/5] quartz/tests: Add some tests for IFilterGraph_ConnectDirect() and IFilterGraph_Disconnect().
by Zebediah Figura 20 Sep '18

20 Sep '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/filtergraph.c | 184 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 168 insertions(+), 16 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 5035f80..b1059ca 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -767,6 +767,7 @@ struct testpin PIN_DIRECTION dir; IBaseFilter *filter; IPin *peer; + AM_MEDIA_TYPE *mt; IEnumMediaTypes IEnumMediaTypes_iface; const AM_MEDIA_TYPE *types; @@ -991,7 +992,19 @@ static HRESULT WINAPI testpin_EndOfStream(IPin *iface) return E_NOTIMPL; } -static HRESULT WINAPI testsink_Connect(IPin *iface, IPin *peer, const AM_MEDIA_TYPE *mt) +static HRESULT WINAPI no_Connect(IPin *iface, IPin *peer, const AM_MEDIA_TYPE *mt) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI no_ReceiveConnection(IPin *iface, IPin *peer, const AM_MEDIA_TYPE *mt) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI no_EnumMediaTypes(IPin *iface, IEnumMediaTypes **out) { ok(0, "Unexpected call.\n"); return E_NOTIMPL; @@ -1007,18 +1020,12 @@ static HRESULT WINAPI testsink_ReceiveConnection(IPin *iface, IPin *peer, const return S_OK; } -static HRESULT WINAPI testsink_EnumMediaTypes(IPin *iface, IEnumMediaTypes **out) -{ - ok(0, "Unexpected call.\n"); - return E_NOTIMPL; -} - static const IPinVtbl testsink_vtbl = { testpin_QueryInterface, testpin_AddRef, testpin_Release, - testsink_Connect, + no_Connect, testsink_ReceiveConnection, testpin_Disconnect, testpin_ConnectedTo, @@ -1027,7 +1034,7 @@ static const IPinVtbl testsink_vtbl = testpin_QueryDirection, testpin_QueryId, testpin_QueryAccept, - testsink_EnumMediaTypes, + no_EnumMediaTypes, testpin_QueryInternalConnections, testpin_EndOfStream, testpin_BeginFlush, @@ -1057,19 +1064,13 @@ static HRESULT WINAPI testsource_Connect(IPin *iface, IPin *peer, const AM_MEDIA return IPin_ReceiveConnection(peer, &pin->IPin_iface, mt); } -static HRESULT WINAPI testsource_ReceiveConnection(IPin *iface, IPin *peer, const AM_MEDIA_TYPE *mt) -{ - ok(0, "Unexpected call.\n"); - return E_NOTIMPL; -} - static const IPinVtbl testsource_vtbl = { testpin_QueryInterface, testpin_AddRef, testpin_Release, testsource_Connect, - testsource_ReceiveConnection, + no_ReceiveConnection, testpin_Disconnect, testpin_ConnectedTo, testpin_ConnectionMediaType, @@ -1864,6 +1865,156 @@ static void test_add_remove_filter(void) ok(filter.ref == 1, "Got outstanding refcount %d.\n", filter.ref); } +static HRESULT WINAPI test_connect_direct_Connect(IPin *iface, IPin *peer, const AM_MEDIA_TYPE *mt) +{ + struct testpin *pin = impl_from_IPin(iface); + if (winetest_debug > 1) trace("%p->Connect()\n", pin); + + pin->peer = peer; + IPin_AddRef(peer); + pin->mt = (AM_MEDIA_TYPE *)mt; + return S_OK; +} + +static const IPinVtbl test_connect_direct_vtbl = +{ + testpin_QueryInterface, + testpin_AddRef, + testpin_Release, + test_connect_direct_Connect, + no_ReceiveConnection, + testpin_Disconnect, + testpin_ConnectedTo, + testpin_ConnectionMediaType, + testpin_QueryPinInfo, + testpin_QueryDirection, + testpin_QueryId, + testpin_QueryAccept, + no_EnumMediaTypes, + testpin_QueryInternalConnections, + testpin_EndOfStream, + testpin_BeginFlush, + testpin_EndFlush, + testpin_NewSegment +}; + +static void test_connect_direct_init(struct testpin *pin, PIN_DIRECTION dir) +{ + memset(pin, 0, sizeof(*pin)); + pin->IPin_iface.lpVtbl = &test_connect_direct_vtbl; + pin->ref = 1; + pin->dir = dir; +} + +static void test_connect_direct(void) +{ + struct testpin source_pin, sink_pin; + struct testfilter source, sink; + + IFilterGraph2 *graph = create_graph(); + AM_MEDIA_TYPE mt; + HRESULT hr; + + test_connect_direct_init(&source_pin, PINDIR_OUTPUT); + test_connect_direct_init(&sink_pin, PINDIR_INPUT); + testfilter_init(&source, &source_pin, 1); + testfilter_init(&sink, &sink_pin, 1); + + hr = IFilterGraph2_AddFilter(graph, &source.IBaseFilter_iface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IFilterGraph2_AddFilter(graph, &sink.IBaseFilter_iface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IFilterGraph2_ConnectDirect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(source_pin.peer == &sink_pin.IPin_iface, "Got peer %p.\n", source_pin.peer); + ok(!source_pin.mt, "Got mt %p.\n", source_pin.mt); + ok(!sink_pin.peer, "Got peer %p.\n", sink_pin.peer); + + hr = IFilterGraph2_Disconnect(graph, &sink_pin.IPin_iface); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(source_pin.peer == &sink_pin.IPin_iface, "Got peer %p.\n", source_pin.peer); + ok(!sink_pin.peer, "Got peer %p.\n", sink_pin.peer); + + hr = IFilterGraph2_Disconnect(graph, &source_pin.IPin_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!source_pin.peer, "Got peer %p.\n", source_pin.peer); + ok(!sink_pin.peer, "Got peer %p.\n", sink_pin.peer); + + /* Swap the pins when connecting. */ + hr = IFilterGraph2_ConnectDirect(graph, &sink_pin.IPin_iface, &source_pin.IPin_iface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); +todo_wine + ok(sink_pin.peer == &source_pin.IPin_iface, "Got peer %p.\n", sink_pin.peer); + ok(!sink_pin.mt, "Got mt %p.\n", sink_pin.mt); +todo_wine + ok(!source_pin.peer, "Got peer %p.\n", source_pin.peer); + + hr = IFilterGraph2_Disconnect(graph, &sink_pin.IPin_iface); +todo_wine + ok(hr == S_OK, "Got hr %#x.\n", hr); +todo_wine + ok(!source_pin.peer, "Got peer %p.\n", source_pin.peer); + ok(!sink_pin.peer, "Got peer %p.\n", sink_pin.peer); + + /* Disconnect() does not disconnect the peer. */ + hr = IFilterGraph2_ConnectDirect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(source_pin.peer == &sink_pin.IPin_iface, "Got peer %p.\n", source_pin.peer); + ok(!source_pin.mt, "Got mt %p.\n", source_pin.mt); + ok(!sink_pin.peer, "Got peer %p.\n", sink_pin.peer); + + sink_pin.peer = &source_pin.IPin_iface; + IPin_AddRef(sink_pin.peer); + + hr = IFilterGraph2_Disconnect(graph, &sink_pin.IPin_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(source_pin.peer == &sink_pin.IPin_iface, "Got peer %p.\n", source_pin.peer); + ok(!sink_pin.peer, "Got peer %p.\n", sink_pin.peer); + + hr = IFilterGraph2_Disconnect(graph, &source_pin.IPin_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!source_pin.peer, "Got peer %p.\n", source_pin.peer); + ok(!sink_pin.peer, "Got peer %p.\n", sink_pin.peer); + + /* Test specifying the media type. */ + hr = IFilterGraph2_ConnectDirect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(source_pin.peer == &sink_pin.IPin_iface, "Got peer %p.\n", source_pin.peer); + ok(source_pin.mt == &mt, "Got mt %p.\n", source_pin.mt); + ok(!sink_pin.peer, "Got peer %p.\n", sink_pin.peer); + + /* Both pins are disconnected when a filter is removed. */ + sink_pin.peer = &source_pin.IPin_iface; + IPin_AddRef(sink_pin.peer); + hr = IFilterGraph2_RemoveFilter(graph, &source.IBaseFilter_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!source_pin.peer, "Got peer %p.\n", source_pin.peer); + ok(!sink_pin.peer, "Got peer %p.\n", sink_pin.peer); + + /* Or when the graph is destroyed. */ + hr = IFilterGraph2_AddFilter(graph, &source.IBaseFilter_iface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IFilterGraph2_ConnectDirect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(source_pin.peer == &sink_pin.IPin_iface, "Got peer %p.\n", source_pin.peer); + ok(!source_pin.mt, "Got mt %p.\n", source_pin.mt); + ok(!sink_pin.peer, "Got peer %p.\n", sink_pin.peer); + IPin_AddRef(sink_pin.peer = &source_pin.IPin_iface); + + hr = IFilterGraph2_Release(graph); + ok(!hr, "Got outstanding refcount %d.\n", hr); + ok(source.ref == 1, "Got outstanding refcount %d.\n", source.ref); + ok(sink.ref == 1, "Got outstanding refcount %d.\n", sink.ref); + ok(source_pin.ref == 1, "Got outstanding refcount %d.\n", source_pin.ref); +todo_wine + ok(sink_pin.ref == 1, "Got outstanding refcount %d.\n", sink_pin.ref); + ok(!source_pin.peer, "Got peer %p.\n", source_pin.peer); + ok(!sink_pin.peer, "Got peer %p.\n", sink_pin.peer); +} + START_TEST(filtergraph) { CoInitializeEx(NULL, COINIT_MULTITHREADED); @@ -1876,6 +2027,7 @@ START_TEST(filtergraph) test_aggregate_filter_graph(); test_control_delegation(); test_add_remove_filter(); + test_connect_direct(); CoUninitialize(); test_render_with_multithread(); -- 2.7.4

2 5

[PATCH v2] user32: Make sure that passed window handle is scroll control before accessing wExtra in SCROLL_GetInternalInfo.
by Jacek Caban 20 Sep '18

20 Sep '18

Fixes memory corruption in Office 2016. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/scroll.c | 3 ++- dlls/user32/tests/scroll.c | 21 +++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-)

1 0

[PATCH 5/5] wined3d: Store max_clip_distances in struct d3d_info.
by Józef Kucia 20 Sep '18

20 Sep '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 1 + dlls/wined3d/device.c | 4 ++-- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 0198a97d6022..e0c1954f69d1 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -3651,6 +3651,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, adapter->fragment_pipe = select_fragment_implementation(gl_info, adapter->shader_backend); d3d_info->limits.max_rt_count = gl_info->limits.buffers; + d3d_info->limits.max_clip_distances = gl_info->limits.user_clip_distances; d3d_info->limits.pointsize_max = gl_info->limits.pointsize_max; adapter->shader_backend->shader_get_caps(gl_info, &shader_caps); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 96e7a3dbfaa6..3fc3ae557dc6 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1762,7 +1762,7 @@ HRESULT CDECL wined3d_device_set_clip_plane(struct wined3d_device *device, { TRACE("device %p, plane_idx %u, plane %p.\n", device, plane_idx, plane); - if (plane_idx >= device->adapter->gl_info.limits.user_clip_distances) + if (plane_idx >= device->adapter->d3d_info.limits.max_clip_distances) { TRACE("Application has requested clipplane this device doesn't support.\n"); return WINED3DERR_INVALIDCALL; @@ -1790,7 +1790,7 @@ HRESULT CDECL wined3d_device_get_clip_plane(const struct wined3d_device *device, { TRACE("device %p, plane_idx %u, plane %p.\n", device, plane_idx, plane); - if (plane_idx >= device->adapter->gl_info.limits.user_clip_distances) + if (plane_idx >= device->adapter->d3d_info.limits.max_clip_distances) { TRACE("Application has requested clipplane this device doesn't support.\n"); return WINED3DERR_INVALIDCALL; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2a5a0eceeb98..122d4c7825de 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -165,6 +165,7 @@ struct wined3d_d3d_limits unsigned int active_light_count; unsigned int max_rt_count; + unsigned int max_clip_distances; float pointsize_max; }; -- 2.16.4

2 1

[PATCH 4/5] wined3d: Allocate memory for formats in wined3d_adapter_init_format_info().
by Józef Kucia 20 Sep '18

20 Sep '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/utils.c | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 9627b13e8e9a..bf32953032ea 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1994,23 +1994,15 @@ static enum wined3d_channel_type map_channel_type(char t) } } -static BOOL init_format_base_info(struct wined3d_adapter *adapter, size_t format_size) +static BOOL init_format_base_info(struct wined3d_adapter *adapter) { struct wined3d_format *format; unsigned int i, j; - adapter->format_size = format_size; - if (!(adapter->formats = heap_calloc(WINED3D_FORMAT_COUNT - + ARRAY_SIZE(typeless_depth_stencil_formats), adapter->format_size))) - { - ERR("Failed to allocate memory.\n"); - return FALSE; - } - for (i = 0; i < ARRAY_SIZE(formats); ++i) { if (!(format = get_format_internal(adapter, formats[i].id))) - goto fail; + return FALSE; format->id = formats[i].id; format->red_size = formats[i].red_size; @@ -2036,10 +2028,10 @@ static BOOL init_format_base_info(struct wined3d_adapter *adapter, size_t format DWORD flags = 0; if (!(format = get_format_internal(adapter, typed_formats[i].id))) - goto fail; + return FALSE; if (!(typeless_format = get_format_internal(adapter, typed_formats[i].typeless_id))) - goto fail; + return FALSE; format->id = typed_formats[i].id; format->red_size = typeless_format->red_size; @@ -2087,7 +2079,7 @@ static BOOL init_format_base_info(struct wined3d_adapter *adapter, size_t format for (i = 0; i < ARRAY_SIZE(ddi_formats); ++i) { if (!(format = get_format_internal(adapter, ddi_formats[i].id))) - goto fail; + return FALSE; format->ddi_format = ddi_formats[i].ddi_format; } @@ -2095,16 +2087,12 @@ static BOOL init_format_base_info(struct wined3d_adapter *adapter, size_t format for (i = 0; i < ARRAY_SIZE(format_base_flags); ++i) { if (!(format = get_format_internal(adapter, format_base_flags[i].id))) - goto fail; + return FALSE; format_set_flag(format, format_base_flags[i].flags); } return TRUE; - -fail: - heap_free(adapter->formats); - return FALSE; } static BOOL init_format_block_info(struct wined3d_adapter *adapter) @@ -3951,9 +3939,21 @@ static void init_format_depth_bias_scale(struct wined3d_adapter *adapter, BOOL wined3d_adapter_init_format_info(struct wined3d_adapter *adapter, size_t format_size) { - if (!init_format_base_info(adapter, format_size)) return FALSE; - if (!init_format_block_info(adapter)) goto fail; - if (!init_format_decompress_info(adapter)) goto fail; + unsigned int count = WINED3D_FORMAT_COUNT + ARRAY_SIZE(typeless_depth_stencil_formats); + + if (!(adapter->formats = heap_calloc(count, format_size))) + { + ERR("Failed to allocate memory.\n"); + return FALSE; + } + adapter->format_size = format_size; + + if (!init_format_base_info(adapter)) + goto fail; + if (!init_format_block_info(adapter)) + goto fail; + if (!init_format_decompress_info(adapter)) + goto fail; return TRUE; -- 2.16.4

2 1