May 2022 - Wine-devel - list.winehq.org

[PATCH v2 4/4] mshtml/tests: Add HTMLStorage tests.
by Hans Leidekker 25 May '22

25 May '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/mshtml/tests/misc.c | 190 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 190 insertions(+) diff --git a/dlls/mshtml/tests/misc.c b/dlls/mshtml/tests/misc.c index 1702a24c804..410d24884ee 100644 --- a/dlls/mshtml/tests/misc.c +++ b/dlls/mshtml/tests/misc.c @@ -24,6 +24,7 @@ #include "windef.h" #include "winbase.h" #include "ole2.h" +#include "mshtml.h" #include "initguid.h" #include "optary.h" @@ -106,11 +107,200 @@ static void test_HTMLLoadOptions(void) IHtmlLoadOptions_Release(loadopts); } +static IHTMLDocument2 *create_doc_from_url(const WCHAR *start_url) +{ + BSTR url; + IBindCtx *bc; + IMoniker *url_mon; + IPersistMoniker *persist_mon; + IHTMLDocument2 *doc; + HRESULT hres; + + hres = CreateBindCtx(0, &bc); + ok(hres == S_OK, "CreateBindCtx failed: 0x%08lx\n", hres); + + url = SysAllocString(start_url); + hres = CreateURLMoniker(NULL, url, &url_mon); + ok(hres == S_OK, "CreateURLMoniker failed: 0x%08lx\n", hres); + + hres = CoCreateInstance(&CLSID_HTMLDocument, NULL, + CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, &IID_IHTMLDocument2, + (void**)&doc); + ok(hres == S_OK, "CoCreateInstance failed: 0x%08lx\n", hres); + + hres = IHTMLDocument2_QueryInterface(doc, &IID_IPersistMoniker, + (void**)&persist_mon); + ok(hres == S_OK, "IHTMLDocument2_QueryInterface failed: 0x%08lx\n", hres); + + hres = IPersistMoniker_Load(persist_mon, FALSE, url_mon, bc, + STGM_SHARE_EXCLUSIVE | STGM_READWRITE); + ok(hres == S_OK, "IPersistMoniker_Load failed: 0x%08lx\n", hres); + + IPersistMoniker_Release(persist_mon); + IMoniker_Release(url_mon); + IBindCtx_Release(bc); + SysFreeString(url); + return doc; +} + +static HRESULT get_localstorage(IHTMLDocument2 *doc, IHTMLStorage **storage) +{ + IHTMLWindow2 *window; + IHTMLWindow6 *window6; + HRESULT hres; + + hres = IHTMLDocument2_get_parentWindow(doc, &window); + ok(hres == S_OK, "get_parentWindow failed: %08lx\n", hres); + ok(window != NULL, "window == NULL\n"); + + hres = IHTMLWindow2_QueryInterface(window, &IID_IHTMLWindow6, (void**)&window6); + IHTMLWindow2_Release(window); + if(FAILED(hres)) { + win_skip("IHTMLWindow6 not supported\n"); + return hres; + } + + hres = IHTMLWindow6_get_localStorage(window6, storage); + ok(hres == S_OK, "get_localStorage failed: %08lx\n", hres); + ok(*storage != NULL, "*storage == NULL\n"); + + IHTMLWindow6_Release(window6); + return hres; +} + +static void test_HTMLStorage(void) +{ + IHTMLDocument2 *doc, *doc2; + IHTMLStorage *storage, *storage2; + VARIANT var; + BSTR key, value; + HRESULT hres; + + doc = create_doc_from_url(L"http://www.codeweavers.com/"); + doc2 = create_doc_from_url(L"http://www.codeweavers.com/"); + + hres = get_localstorage(doc, &storage); + ok(hres == S_OK, "got %08lx\n", hres); + + hres = get_localstorage(doc2, &storage2); + ok(hres == S_OK, "got %08lx\n", hres); + + key = SysAllocString(L""); + V_VT(&var) = 0xdead; + hres = IHTMLStorage_getItem(storage, key, &var); + ok(hres == S_OK, "getItem failed: %08lx\n", hres); + ok(V_VT(&var) == VT_NULL, "got %d\n", V_VT(&var)); + + key = SysAllocString(L"undefined"); + hres = IHTMLStorage_removeItem(storage, key); + ok(hres == S_OK, "removeItem failed: %08lx\n", hres); + + value = SysAllocString(L"null"); + hres = IHTMLStorage_setItem(storage, key, value); + ok(hres == S_OK, "setItem failed: %08lx\n", hres); + + V_VT(&var) = 0xdead; + hres = IHTMLStorage_getItem(storage, key, &var); + ok(hres == S_OK, "getItem failed: %08lx\n", hres); + ok(V_VT(&var) == VT_BSTR, "got %d\n", V_VT(&var)); + if (V_VT(&var) == VT_BSTR) ok(!wcscmp(V_BSTR(&var), L"null"), "got %s\n", wine_dbgstr_w(V_BSTR(&var))); + hres = IHTMLStorage_removeItem(storage, key); + ok(hres == S_OK, "removeItem failed: %08lx\n", hres); + SysFreeString(key); + SysFreeString(value); + + key = SysAllocString(L"winetest"); + value = SysAllocString(L"winetest"); + hres = IHTMLStorage_setItem(storage, key, value); + ok(hres == S_OK, "setItem failed: %08lx\n", hres); + + /* retrieve value from different storage instance */ + V_VT(&var) = 0xdead; + hres = IHTMLStorage_getItem(storage2, key, &var); + ok(hres == S_OK, "getItem failed: %08lx\n", hres); + ok(V_VT(&var) == VT_BSTR, "got %d\n", V_VT(&var)); + if (V_VT(&var) == VT_BSTR) ok(!wcscmp(V_BSTR(&var), L"winetest"), "got %s\n", wine_dbgstr_w(V_BSTR(&var))); + + hres = IHTMLStorage_removeItem(storage, key); + ok(hres == S_OK, "removeItem failed: %08lx\n", hres); + + V_VT(&var) = 0xdead; + hres = IHTMLStorage_getItem(storage2, key, &var); + ok(hres == S_OK, "getItem failed: %08lx\n", hres); + ok(V_VT(&var) == VT_NULL, "got %d\n", V_VT(&var)); + SysFreeString(key); + SysFreeString(value); + + /* item doesn't exist */ + key = SysAllocString(L"nosuch"); + hres = IHTMLStorage_removeItem(storage, key); + ok(hres == S_OK, "removeItem failed: %08lx\n", hres); + + V_VT(&var) = 0xdead; + hres = IHTMLStorage_getItem(storage, key, &var); + ok(hres == S_OK, "getItem failed: %08lx\n", hres); + ok(V_VT(&var) == VT_NULL, "got %d\n", V_VT(&var)); + SysFreeString(key); + + hres = IHTMLStorage_getItem(storage, NULL, NULL); + ok(hres == E_POINTER, "getItem returned: %08lx\n", hres); + + hres = IHTMLStorage_getItem(storage, key, NULL); + ok(hres == E_POINTER, "getItem failed: %08lx\n", hres); + + V_VT(&var) = 0xdead; + hres = IHTMLStorage_getItem(storage, NULL, &var); + ok(hres == S_OK, "getItem returned: %08lx\n", hres); + ok(V_VT(&var) == VT_NULL, "got %d\n", V_VT(&var)); + + hres = IHTMLStorage_setItem(storage, NULL, NULL); + ok(hres == S_OK, "setItem failed: %08lx\n", hres); + + key = SysAllocString(L"winetest2"); + hres = IHTMLStorage_setItem(storage, key, NULL); + ok(hres == S_OK, "setItem failed: %08lx\n", hres); + + hres = IHTMLStorage_setItem(storage, NULL, key); + ok(hres == S_OK, "setItem failed: %08lx\n", hres); + + hres = IHTMLStorage_removeItem(storage, key); + ok(hres == S_OK, "removeItem failed: %08lx\n", hres); + SysFreeString(key); + + hres = IHTMLStorage_removeItem(storage, NULL); + ok(hres == S_OK, "removeItem failed: %08lx\n", hres); + + /* Unicode characters */ + key = SysAllocString(L"winetest"); + value = SysAllocString(L"\x20ac"); + hres = IHTMLStorage_setItem(storage, key, value); + ok(hres == S_OK, "setItem failed: %08lx\n", hres); + hres = IHTMLStorage_removeItem(storage, key); + ok(hres == S_OK, "removeItem failed: %08lx\n", hres); + SysFreeString(value); + SysFreeString(key); + + key = SysAllocString(L"\x20ac"); + value = SysAllocString(L"winetest"); + hres = IHTMLStorage_setItem(storage, key, value); + ok(hres == S_OK, "setItem failed: %08lx\n", hres); + hres = IHTMLStorage_removeItem(storage, key); + ok(hres == S_OK, "removeItem failed: %08lx\n", hres); + SysFreeString(value); + SysFreeString(key); + + IHTMLStorage_Release(storage); + IHTMLStorage_Release(storage2); + IHTMLDocument2_Release(doc); + IHTMLDocument2_Release(doc2); +} + START_TEST(misc) { CoInitialize(NULL); test_HTMLLoadOptions(); + test_HTMLStorage(); CoUninitialize(); } -- 2.30.2

1 0

[PATCH v2 3/4] mshtml: Implement HTMLStorage_removeItem().
by Hans Leidekker 25 May '22

25 May '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/mshtml/htmlstorage.c | 51 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 49 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlstorage.c b/dlls/mshtml/htmlstorage.c index 107ae7ad720..b68cd11ae64 100644 --- a/dlls/mshtml/htmlstorage.c +++ b/dlls/mshtml/htmlstorage.c @@ -484,11 +484,58 @@ static HRESULT WINAPI HTMLStorage_setItem(IHTMLStorage *iface, BSTR bstrKey, BST return set_item(This->filename, bstrKey, bstrValue); } +static HRESULT remove_item(const WCHAR *filename, BSTR key) +{ + struct storage *storage; + IXMLDOMNode *root = NULL, *node = NULL; + BSTR query = NULL; + HRESULT hres; + + hres = open_storage(filename, &storage); + if(hres != S_OK) + return hres; + + hres = get_root_node(storage->doc, &root); + if(hres != S_OK) + goto done; + + query = build_query(key); + if(!query) { + hres = E_OUTOFMEMORY; + goto done; + } + + hres = IXMLDOMNode_selectSingleNode(root, query, &node); + if(hres == S_OK) { + hres = IXMLDOMNode_removeChild(root, node, NULL); + if(hres != S_OK) + goto done; + } + + hres = save_storage(storage, filename); + +done: + SysFreeString(query); + if(root) + IXMLDOMNode_Release(root); + if(node) + IXMLDOMNode_Release(node); + close_storage(storage); + return hres; +} + static HRESULT WINAPI HTMLStorage_removeItem(IHTMLStorage *iface, BSTR bstrKey) { HTMLStorage *This = impl_from_IHTMLStorage(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(bstrKey)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_w(bstrKey)); + + if(!This->filename) { + FIXME("session storage not supported\n"); + return E_NOTIMPL; + } + + return remove_item(This->filename, bstrKey); } static HRESULT WINAPI HTMLStorage_clear(IHTMLStorage *iface) -- 2.30.2

1 0

[PATCH v2 2/4] mshtml: Implement HTMLStorage_setItem().
by Hans Leidekker 25 May '22

25 May '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/mshtml/htmlstorage.c | 109 +++++++++++++++++++++++++++++++++++++- 1 file changed, 107 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlstorage.c b/dlls/mshtml/htmlstorage.c index 8f154291e36..107ae7ad720 100644 --- a/dlls/mshtml/htmlstorage.c +++ b/dlls/mshtml/htmlstorage.c @@ -372,11 +372,116 @@ static HRESULT WINAPI HTMLStorage_getItem(IHTMLStorage *iface, BSTR bstrKey, VAR return get_item(This->filename, bstrKey, value); } +static HRESULT set_attribute(IXMLDOMElement *elem, const WCHAR *name, BSTR value) +{ + BSTR str; + VARIANT var; + HRESULT hres; + + str = SysAllocString(name); + if(!str) + return E_OUTOFMEMORY; + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = value; + + hres = IXMLDOMElement_setAttribute(elem, str, var); + + SysFreeString(str); + return hres; +} + +static HRESULT save_storage(struct storage *storage, const WCHAR *filename) +{ + VARIANT var; + HRESULT hres; + + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString(filename); + if(!V_BSTR(&var)) + return E_OUTOFMEMORY; + + hres = IXMLDOMDocument_save(storage->doc, var); + SysFreeString(V_BSTR(&var)); + return hres; +} + +static HRESULT set_item(const WCHAR *filename, BSTR key, BSTR value) +{ + struct storage *storage; + IXMLDOMNode *root = NULL, *node = NULL; + IXMLDOMElement *elem = NULL; + BSTR query = NULL; + HRESULT hres; + + hres = open_storage(filename, &storage); + if(hres != S_OK) + return hres; + + hres = get_root_node(storage->doc, &root); + if(hres != S_OK) + goto done; + + query = build_query(key); + if(!query) { + hres = E_OUTOFMEMORY; + goto done; + } + + hres = IXMLDOMNode_selectSingleNode(root, query, &node); + if(hres == S_OK) { + hres = IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMElement, (void**)&elem); + if(hres != S_OK) + goto done; + + hres = set_attribute(elem, L"value", value); + if(hres != S_OK) + goto done; + }else { + BSTR str = SysAllocString(L"item"); + hres = IXMLDOMDocument_createElement(storage->doc, str, &elem); + SysFreeString(str); + if(hres != S_OK) + goto done; + + hres = set_attribute(elem, L"name", key); + if(hres != S_OK) + goto done; + + hres = set_attribute(elem, L"value", value); + if(hres != S_OK) + goto done; + + hres = IXMLDOMNode_appendChild(root, (IXMLDOMNode*)elem, NULL); + if(hres != S_OK) + goto done; + } + + hres = save_storage(storage, filename); + +done: + SysFreeString(query); + if(root) + IXMLDOMNode_Release(root); + if(node) + IXMLDOMNode_Release(node); + if(elem) + IXMLDOMElement_Release(elem); + close_storage(storage); + return hres; +} + static HRESULT WINAPI HTMLStorage_setItem(IHTMLStorage *iface, BSTR bstrKey, BSTR bstrValue) { HTMLStorage *This = impl_from_IHTMLStorage(iface); - FIXME("(%p)->(%s %s)\n", This, debugstr_w(bstrKey), debugstr_w(bstrValue)); - return E_NOTIMPL; + + TRACE("(%p)->(%s %s)\n", This, debugstr_w(bstrKey), debugstr_w(bstrValue)); + + if(!This->filename) { + FIXME("session storage not supported\n"); + return E_NOTIMPL; + } + + return set_item(This->filename, bstrKey, bstrValue); } static HRESULT WINAPI HTMLStorage_removeItem(IHTMLStorage *iface, BSTR bstrKey) -- 2.30.2

1 0

[PATCH 0/1] MR110: ntdll: Generalize check for IMAGE_FILE_MACHINE_AMD64 to other 64-bit archs in loader_exec.
by Jinoh Kang (＠iamahuman) 25 May '22

25 May '22

Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/110

3 3

[PATCH] secur32: Add support for SCH_CREDENTIALS.
by Hans Leidekker 25 May '22

25 May '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/secur32/schannel.c | 104 +++++++++++++++++++++++++--------- dlls/secur32/tests/schannel.c | 11 +++- include/schannel.h | 49 ++++++++++++++++ 3 files changed, 137 insertions(+), 27 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index c7d62c47758..bbbac37c6bb 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -31,6 +31,7 @@ #include "winnls.h" #include "lmcons.h" #include "sspi.h" +#define SCHANNEL_USE_BLACKLISTS #include "schannel.h" #include "wine/unixlib.h" @@ -333,46 +334,74 @@ static SECURITY_STATUS SEC_ENTRY schan_QueryCredentialsAttributesW( return ret; } -static SECURITY_STATUS get_cert(const SCHANNEL_CRED *cred, CERT_CONTEXT const **cert) +static SECURITY_STATUS get_cert(const void *credentials, CERT_CONTEXT const **cert) { SECURITY_STATUS status; - DWORD i; - - TRACE("dwVersion = %lu\n", cred->dwVersion); - TRACE("cCreds = %lu\n", cred->cCreds); - TRACE("paCred = %p\n", cred->paCred); - TRACE("hRootStore = %p\n", cred->hRootStore); - TRACE("cMappers = %lu\n", cred->cMappers); - TRACE("cSupportedAlgs = %lu:\n", cred->cSupportedAlgs); - for (i = 0; i < cred->cSupportedAlgs; i++) TRACE("%08x\n", cred->palgSupportedAlgs[i]); - TRACE("grbitEnabledProtocols = %08lx\n", cred->grbitEnabledProtocols); - TRACE("dwMinimumCipherStrength = %lu\n", cred->dwMinimumCipherStrength); - TRACE("dwMaximumCipherStrength = %lu\n", cred->dwMaximumCipherStrength); - TRACE("dwSessionLifespan = %lu\n", cred->dwSessionLifespan); - TRACE("dwFlags = %08lx\n", cred->dwFlags); - TRACE("dwCredFormat = %lu\n", cred->dwCredFormat); + const SCHANNEL_CRED *cred_old; + const SCH_CREDENTIALS *cred = credentials; + PCCERT_CONTEXT *cert_list; + DWORD i, cert_count; switch (cred->dwVersion) { case SCH_CRED_V3: case SCHANNEL_CRED_VERSION: + cred_old = credentials; + TRACE("dwVersion = %lu\n", cred_old->dwVersion); + TRACE("cCreds = %lu\n", cred_old->cCreds); + TRACE("paCred = %p\n", cred_old->paCred); + TRACE("hRootStore = %p\n", cred_old->hRootStore); + TRACE("cMappers = %lu\n", cred_old->cMappers); + TRACE("cSupportedAlgs = %lu:\n", cred_old->cSupportedAlgs); + for (i = 0; i < cred_old->cSupportedAlgs; i++) TRACE("%08x\n", cred_old->palgSupportedAlgs[i]); + TRACE("grbitEnabledProtocols = %08lx\n", cred_old->grbitEnabledProtocols); + TRACE("dwMinimumCipherStrength = %lu\n", cred_old->dwMinimumCipherStrength); + TRACE("dwMaximumCipherStrength = %lu\n", cred_old->dwMaximumCipherStrength); + TRACE("dwSessionLifespan = %lu\n", cred_old->dwSessionLifespan); + TRACE("dwFlags = %08lx\n", cred_old->dwFlags); + TRACE("dwCredFormat = %lu\n", cred_old->dwCredFormat); + cert_list = cred_old->paCred; + cert_count = cred_old->cCreds; break; + + case SCH_CREDENTIALS_VERSION: + TRACE("dwVersion = %lu\n", cred->dwVersion); + TRACE("dwCredFormat = %lu\n", cred->dwCredFormat); + TRACE("cCreds = %lu\n", cred->cCreds); + TRACE("paCred = %p\n", cred->paCred); + TRACE("hRootStore = %p\n", cred->hRootStore); + TRACE("cMappers = %lu\n", cred->cMappers); + TRACE("dwSessionLifespan = %lu\n", cred->dwSessionLifespan); + TRACE("dwFlags = %08lx\n", cred->dwFlags); + TRACE("cTlsParameters = %lu:\n", cred->cTlsParameters); + for (i = 0; i < cred->cTlsParameters; i++) + { + TRACE(" cAlpnIds %lu\n", cred->pTlsParameters[i].cAlpnIds); + TRACE(" grbitDisabledProtocols %08lx\n", cred->pTlsParameters[i].grbitDisabledProtocols); + TRACE(" cDisabledCrypto %lu\n", cred->pTlsParameters[i].cDisabledCrypto); + TRACE(" dwFlags %08lx\n", cred->pTlsParameters[i].dwFlags); + } + cert_list = cred->paCred; + cert_count = cred->cCreds; + break; + default: + FIXME("unhandled version %lu\n", cred->dwVersion); return SEC_E_INTERNAL_ERROR; } - if (!cred->cCreds) status = SEC_E_NO_CREDENTIALS; - else if (cred->cCreds > 1) status = SEC_E_UNKNOWN_CREDENTIALS; + if (!cert_count) status = SEC_E_NO_CREDENTIALS; + else if (cert_count > 1) status = SEC_E_UNKNOWN_CREDENTIALS; else { DWORD spec; HCRYPTPROV prov; BOOL free; - if (CryptAcquireCertificatePrivateKey(cred->paCred[0], CRYPT_ACQUIRE_CACHE_FLAG, NULL, &prov, &spec, &free)) + if (CryptAcquireCertificatePrivateKey(cert_list[0], CRYPT_ACQUIRE_CACHE_FLAG, NULL, &prov, &spec, &free)) { if (free) CryptReleaseContext(prov, 0); - *cert = cred->paCred[0]; + *cert = cert_list[0]; status = SEC_E_OK; } else status = SEC_E_UNKNOWN_CREDENTIALS; @@ -381,6 +410,28 @@ static SECURITY_STATUS get_cert(const SCHANNEL_CRED *cred, CERT_CONTEXT const ** return status; } +static DWORD get_enabled_protocols(const void *credentials) +{ + const SCHANNEL_CRED *cred_old; + const SCH_CREDENTIALS *cred = credentials; + + switch (cred->dwVersion) + { + case SCH_CRED_V3: + case SCHANNEL_CRED_VERSION: + cred_old = credentials; + return cred_old->grbitEnabledProtocols; + + case SCH_CREDENTIALS_VERSION: + if (cred->cTlsParameters) FIXME("handle TLS parameters\n"); + return 0; + + default: + FIXME("unhandled version %lu\n", cred->dwVersion); + return 0; + } +} + static WCHAR *get_key_container_path(const CERT_CONTEXT *ctx) { CERT_KEY_CONTEXT keyctx; @@ -486,11 +537,11 @@ static BYTE *get_key_blob(const CERT_CONTEXT *ctx, DWORD *size) return ret; } -static SECURITY_STATUS schan_AcquireClientCredentials(const SCHANNEL_CRED *schanCred, +static SECURITY_STATUS schan_AcquireClientCredentials(const void *schanCred, PCredHandle phCredential, PTimeStamp ptsExpiry) { struct schan_credentials *creds; - unsigned enabled_protocols; + DWORD enabled_protocols, cred_enabled_protocols; ULONG_PTR handle; SECURITY_STATUS status = SEC_E_OK; const CERT_CONTEXT *cert = NULL; @@ -509,15 +560,16 @@ static SECURITY_STATUS schan_AcquireClientCredentials(const SCHANNEL_CRED *schan if (status != SEC_E_OK && status != SEC_E_NO_CREDENTIALS) return status; - if ((schanCred->grbitEnabledProtocols & tls_protocols) && - (schanCred->grbitEnabledProtocols & dtls_protocols)) return SEC_E_ALGORITHM_MISMATCH; + cred_enabled_protocols = get_enabled_protocols(schanCred); + if ((cred_enabled_protocols & tls_protocols) && + (cred_enabled_protocols & dtls_protocols)) return SEC_E_ALGORITHM_MISMATCH; status = SEC_E_OK; } read_config(); - if(schanCred && schanCred->grbitEnabledProtocols) - enabled_protocols = schanCred->grbitEnabledProtocols & config_enabled_protocols; + if(schanCred && cred_enabled_protocols) + enabled_protocols = cred_enabled_protocols & config_enabled_protocols; else enabled_protocols = config_enabled_protocols & ~config_default_disabled_protocols; if(!enabled_protocols) { diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index 1cf751a3198..2bf0336f3f5 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -25,6 +25,7 @@ #include <stdio.h> #define SECURITY_WIN32 #include <security.h> +#define SCHANNEL_USE_BLACKLISTS #include <schannel.h> #include "wine/test.h" @@ -272,6 +273,7 @@ static void testAcquireSecurityContext(void) SecPkgCredentials_NamesA names; TimeStamp exp; SCHANNEL_CRED schanCred; + SCH_CREDENTIALS schCred; PCCERT_CONTEXT certs[2]; HCRYPTPROV csp; WCHAR ms_def_prov_w[MAX_PATH]; @@ -279,7 +281,6 @@ static void testAcquireSecurityContext(void) HCRYPTKEY key; CRYPT_KEY_PROV_INFO keyProvInfo; - if (SUCCEEDED(EnumerateSecurityPackagesA(&i, &package_info))) { while(i--) @@ -545,6 +546,14 @@ static void testAcquireSecurityContext(void) CryptDestroyKey(key); } + memset(&schCred, 0, sizeof(schCred)); + schCred.dwVersion = SCH_CREDENTIALS_VERSION; + st = AcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_OUTBOUND, + NULL, &schCred, NULL, NULL, &cred, NULL); + ok(st == SEC_E_OK || broken(st == SEC_E_UNKNOWN_CREDENTIALS) /* <= win10v1570 */, + "AcquireCredentialsHandleA failed: %08lx\n", st); + FreeCredentialsHandle(&cred); + CryptReleaseContext(csp, 0); CryptAcquireContextW(&csp, cspNameW, MS_DEF_PROV_W, PROV_RSA_FULL, CRYPT_DELETEKEYSET); diff --git a/include/schannel.h b/include/schannel.h index b60fdf7ad47..556ec1882c9 100644 --- a/include/schannel.h +++ b/include/schannel.h @@ -80,6 +80,7 @@ static const WCHAR SCHANNEL_NAME_W[] = { 'S','c','h','a','n','n','e','l',0 }; #define SCH_CRED_VERSION 2 #define SCH_CRED_V3 3 #define SCHANNEL_CRED_VERSION 4 +#define SCH_CREDENTIALS_VERSION 5 #define SCHANNEL_RENEGOTIATE 0 #define SCHANNEL_SHUTDOWN 1 @@ -216,6 +217,54 @@ typedef struct _SCHANNEL_CRED DWORD dwCredFormat; } SCHANNEL_CRED, *PSCHANNEL_CRED; +#ifdef SCHANNEL_USE_BLACKLISTS + +typedef enum _eTlsAlgorithmUsage +{ + TlsParametersCngAlgUsageKeyExchange, + TlsParametersCngAlgUsageSignature, + TlsParametersCngAlgUsageCipher, + TlsParametersCngAlgUsageDigest, + TlsParametersCngAlgUsageCertSig, +} eTlsAlgorithmUsage; + +typedef struct _CRYPTO_SETTINGS +{ + eTlsAlgorithmUsage eAlgorithmUsage; + UNICODE_STRING strCngAlgId; + DWORD cChainingModes; + PUNICODE_STRING rgstrChainingModes; + DWORD dwMinBitLength; + DWORD dwMaxBitLength; +} CRYPTO_SETTINGS, *PCRYPTO_SETTINGS; + +typedef struct _TLS_PARAMETERS +{ + DWORD cAlpnIds; + PUNICODE_STRING rgstrAlpnIds; + DWORD grbitDisabledProtocols; + DWORD cDisabledCrypto; + PCRYPTO_SETTINGS pDisabledCrypto; + DWORD dwFlags; +} TLS_PARAMETERS, *PTLS_PARAMETERS; + +typedef struct _SCH_CREDENTIALS +{ + DWORD dwVersion; + DWORD dwCredFormat; + DWORD cCreds; + PCCERT_CONTEXT *paCred; + HCERTSTORE hRootStore; + DWORD cMappers; + struct _HMAPPER **aphMappers; + DWORD dwSessionLifespan; + DWORD dwFlags; + DWORD cTlsParameters; + PTLS_PARAMETERS pTlsParameters; +} SCH_CREDENTIALS, *PSCH_CREDENTIALS; + +#endif + typedef struct _SecPkgCred_SupportedAlgs { DWORD cSupportedAlgs; -- 2.30.2

1 0

[PATCH 2/2] light.msstyles: Add Menu parts.
by Zhiyi Zhang 25 May '22

25 May '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53034 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/light.msstyles/Makefile.in | 8 + .../blue_menu_popup_check_16px.bmp | Bin 0 -> 4234 bytes .../blue_menu_popup_check_16px.svg | 9 + .../blue_menu_popup_check_18px.bmp | Bin 0 -> 5322 bytes .../blue_menu_popup_check_18px.svg | 9 + .../blue_menu_popup_separator.bmp | Bin 0 -> 162 bytes .../blue_menu_popup_separator.svg | 5 + .../blue_menu_popup_submenu.bmp | Bin 0 -> 786 bytes .../blue_menu_popup_submenu.svg | 9 + .../light.msstyles/blue_menu_system_close.bmp | Bin 0 -> 1018 bytes .../light.msstyles/blue_menu_system_close.svg | 5 + .../blue_menu_system_maximize.bmp | Bin 0 -> 1018 bytes .../blue_menu_system_maximize.svg | 5 + .../blue_menu_system_minimize.bmp | Bin 0 -> 1018 bytes .../blue_menu_system_minimize.svg | 5 + .../blue_menu_system_restore.bmp | Bin 0 -> 1018 bytes .../blue_menu_system_restore.svg | 15 ++ dlls/light.msstyles/light.rc | 154 ++++++++++++++++++ 18 files changed, 224 insertions(+) create mode 100644 dlls/light.msstyles/blue_menu_popup_check_16px.bmp create mode 100644 dlls/light.msstyles/blue_menu_popup_check_16px.svg create mode 100644 dlls/light.msstyles/blue_menu_popup_check_18px.bmp create mode 100644 dlls/light.msstyles/blue_menu_popup_check_18px.svg create mode 100644 dlls/light.msstyles/blue_menu_popup_separator.bmp create mode 100644 dlls/light.msstyles/blue_menu_popup_separator.svg create mode 100644 dlls/light.msstyles/blue_menu_popup_submenu.bmp create mode 100644 dlls/light.msstyles/blue_menu_popup_submenu.svg create mode 100644 dlls/light.msstyles/blue_menu_system_close.bmp create mode 100644 dlls/light.msstyles/blue_menu_system_close.svg create mode 100644 dlls/light.msstyles/blue_menu_system_maximize.bmp create mode 100644 dlls/light.msstyles/blue_menu_system_maximize.svg create mode 100644 dlls/light.msstyles/blue_menu_system_minimize.bmp create mode 100644 dlls/light.msstyles/blue_menu_system_minimize.svg create mode 100644 dlls/light.msstyles/blue_menu_system_restore.bmp create mode 100644 dlls/light.msstyles/blue_menu_system_restore.svg diff --git a/dlls/light.msstyles/Makefile.in b/dlls/light.msstyles/Makefile.in index 8ac2fcea0e6..a79a29d9c94 100644 --- a/dlls/light.msstyles/Makefile.in +++ b/dlls/light.msstyles/Makefile.in @@ -26,6 +26,14 @@ SVG_SRCS = \ blue_groupbox.svg \ blue_header.svg \ blue_header_item.svg \ + blue_menu_popup_check_16px.svg \ + blue_menu_popup_check_18px.svg \ + blue_menu_popup_separator.svg \ + blue_menu_popup_submenu.svg \ + blue_menu_system_close.svg \ + blue_menu_system_maximize.svg \ + blue_menu_system_minimize.svg \ + blue_menu_system_restore.svg \ blue_progress_chunk_horizontal.svg \ blue_progress_chunk_vertical.svg \ blue_progress_track_horizontal.svg \ diff --git a/dlls/light.msstyles/blue_menu_popup_check_16px.bmp b/dlls/light.msstyles/blue_menu_popup_check_16px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..555db6f6ae039f0fc7c7d0fc7c951b328f2b6589 GIT binary patch literal 4234 zcmeHKzfaph6n4}~WvS(a)Wi6uithf18SGIju#N-bfil#M(a)ty#qq(z)(?%f-0f-Or=KI zqa;q2Y-txJ0umz|6AKbU(<s<Z;QF1(Rkn%GhZ!hRth~JY(a)qO>!d*_$CEaWzyY5uc` z?@tikor7ewto8`nAK*IlFipGu(a)KLt#_QS`}v_j{x0_LGZ>h*fAR;&H2R;yhuybW1Y zi3|7*U|EcOme~MzDTepY9x(6YY=HYKiI4e~g#Sl@|ND;oj)Z?F|5fsb_(a)w)Y`7e?j zNcT^~HS~kOGd!PMl;0m=W32Bl0|SdJdZy9#sP1?sgzEbPs>jw{&{L0+ZQ#2Q77|nM zx>Wxf#75hWIg`VBH(a)U(V=45_&)Hn#ODR^PMA6-}Uhp~qJ4s#jD2z*pyZJsMR-y#=L zp6Dazhlzabi(a)-;<LyaZRB=PyfzVN+`@`8P(a)F!ODs4S!$Ab`TrazV-vLSi0*A_Jxnd z;m70uPX-uc8T?)sE0xN-G+x=Zy#+o$uX~U;x3K~ID(Aw+8uT9I9Dck~u>sC9(a)K-o{ zHaNaqE>EI=1UbcAHpvEXpjLnI_yra=rZ9d2IY#@r7$2oerP2g2{?#)$5AHPN3_i3Q zjmFd9oN606n1ziFq}6OTpQ!SJIK(y&z5{KK(a)-v8yYlEMMTp|`T4wEzv{tA3pPr{Ao z?<WI{X&IbD#lfzgs{V0yYz(a)z_Uf(3Qs{cMEtDM`X`Wo~e<lHR~rTTX%SqA<JcMQM& z+4t9z=pVt>>4l|dld{>TMiqA#)Ia`04xgSyreNa)a?ExNY5lX(+ypD<Z`8k2Ak*NV z;oi_@#h0n--`h22VWWflO^fZkNLByXi+R{^kPmy5pCV?NMsD-4afvfMb^RlT71z|) JW$QeoxxYVJ&^-VE literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_menu_popup_check_16px.svg b/dlls/light.msstyles/blue_menu_popup_check_16px.svg new file mode 100644 index 00000000000..b3eb3487299 --- /dev/null +++ b/dlls/light.msstyles/blue_menu_popup_check_16px.svg @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:16-32" width="16" height="64" version="1.1" viewBox="0 0 4.2333 16.933" xmlns="http://www.w3.org/2000/svg"> + <g stroke-width=".26458"> + <path d="m1.5394 2.8867-0.75766-0.82928-0.25256 0.27644 1.0102 1.1057 2.1648-2.3694-0.25256-0.27644z" fill="#3096fa"/> + <path d="m1.5394 7.12-0.75766-0.82928-0.25256 0.27644 1.0102 1.1057 2.1648-2.3694-0.25256-0.27644z" fill="#aeaeae"/> + <path d="m3.3073 10.583a1.1906 1.1906 0 0 1-1.1906 1.1906 1.1906 1.1906 0 0 1-1.1906-1.1906 1.1906 1.1906 0 0 1 1.1906-1.1906 1.1906 1.1906 0 0 1 1.1906 1.1906z" fill="#3096fa" stroke="#3096fa"/> + <path d="m3.4396 14.817a1.3229 1.3229 0 0 1-1.3229 1.3229 1.3229 1.3229 0 0 1-1.3229-1.3229 1.3229 1.3229 0 0 1 1.3229-1.3229 1.3229 1.3229 0 0 1 1.3229 1.3229z" fill="#aeaeae"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_menu_popup_check_18px.bmp b/dlls/light.msstyles/blue_menu_popup_check_18px.bmp new file mode 100644 index 0000000000000000000000000000000000000000..0bb15fadc28aa36cff1e825711dcc36f4e9bbb60 GIT binary patch literal 5322 zcmeHL&ubGw6yBg<4?;oo)JqQ1OQAE1J$h(+QLHIN$gO`s?;c9QLlF_w7NKM(6)d(a)j zY?4z>Ml19b6?*Kgr(Oy@^oQwYlXm<j*@4}3Co?g6+a+J#%=_`}n>WkkZRRtL`&RdQ zkMCE&J>V&jveMQq$l1V-Vd&zP)%yq?pMUb=WyokWylv!_IO!_jy6!@`T&@FWz$x&h zR4P5w#f9yNc?0k`R4SF%VPDm_TCHZ{;=?+Vyx{*W9HSW5Re4A~;?5PZ;dP!$f0Z=k zIakF?J$QBv^7$(LRTBHLq~j5Lp^6Xd@$9@)al!UB?5i6Gd3^`p?*O~tSk%QO_M`&; zvI3nvdG0&*51&!bcK}8k9Yz<1xrfilCgLst9)UwIT8w@$;qsj64DNrELvq4ql9$iy zpOGA7d{j1cIR&+dt|!XDg^!j;)U`jZf1W3oS{}##rRBjs>Ucb6FZvEq*BSdLo(Ua~ zu=}~`kFi|ceI%PE9MY$k7uJ}ktuC;SLMQEsOe*ldE5JEV;kS6lr0*J(3x3--f<B=M z`FN18%7(aA!2zx{$UWc$c}=PO<MfDKM%=aRO^U_hIOhAn5p3zWm^dB$LE(ND^^taP zO+bGL9ANxF>Ica}p)dwt(a)tPF5z%dCN0}a^kMvOyFP@@^}h~B<ltJUrd86I)Rn&-gd z0p+;7BhH!$D6+s6kkhzo&EQx;ZtGgd#38A`2o>PmN})I0>1(a)-X-jDlli5_7i=v|s^ zhy2xf*k)u^aI_g+gWLm7S~)V*dDvoP8FAO>NxScA{L`ax%=f{0beX5={=8N5HnUyy zyf_c>w(a)+|2^JD^Chrj{fvW?C|UYH%@#q5pq(94lY(a)EijT?o5qz9{St%40z7a7uWgL s!;#KI?A;u=ytYHjae2#Hm`LnF7F<`r$mb!}w$gIwy2*VLpI!z20Ddyiy8r+H literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_menu_popup_check_18px.svg b/dlls/light.msstyles/blue_menu_popup_check_18px.svg new file mode 100644 index 00000000000..228cac7bab0 --- /dev/null +++ b/dlls/light.msstyles/blue_menu_popup_check_18px.svg @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:18-32" width="18" height="72" version="1.1" viewBox="0 0 4.7625 19.05" xmlns="http://www.w3.org/2000/svg"> + <g stroke-width=".26458"> + <path d="m1.804 3.1513-0.75766-0.82928-0.25256 0.27644 1.0102 1.1057 2.1648-2.3694-0.25256-0.27644z" fill="#3096fa"/> + <path d="m1.804 7.9137-0.75766-0.82928-0.25256 0.27644 1.0102 1.1057 2.1648-2.3694-0.25256-0.27644z" fill="#aeaeae"/> + <path d="m3.5718 11.906a1.1906 1.1906 0 0 1-1.1906 1.1906 1.1906 1.1906 0 0 1-1.1906-1.1906 1.1906 1.1906 0 0 1 1.1906-1.1906 1.1906 1.1906 0 0 1 1.1906 1.1906z" fill="#3096fa" stroke="#3096fa"/> + <path d="m3.7041 16.668a1.3229 1.3229 0 0 1-1.3229 1.3229 1.3229 1.3229 0 0 1-1.3229-1.3229 1.3229 1.3229 0 0 1 1.3229-1.3229 1.3229 1.3229 0 0 1 1.3229 1.3229z" fill="#aeaeae"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_menu_popup_separator.bmp b/dlls/light.msstyles/blue_menu_popup_separator.bmp new file mode 100644 index 0000000000000000000000000000000000000000..ff904c3ede0619a00ac6428d29866c512e896893 GIT binary patch literal 162 zcmZ?rUBmzZT|lY^h#7&H4NNOAFav1`AjSm$85kf4B=z6PJ*XH{4So?8EYkmhVBNZP IK$8&w0Qj8_&Hw-a literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_menu_popup_separator.svg b/dlls/light.msstyles/blue_menu_popup_separator.svg new file mode 100644 index 00000000000..60da6ac4964 --- /dev/null +++ b/dlls/light.msstyles/blue_menu_popup_separator.svg @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:1-32" width="1" height="6" version="1.1" viewBox="0 0 .26458 1.5875" xmlns="http://www.w3.org/2000/svg"> + <path d="m0 0.79373h0.26458v0.26458h-0.26458z" fill="#aeaeae" stroke-width=".99999"/> + <path d="m0 1.0583h0.26458v0.26458h-0.26458z" fill="#fff" stroke-width=".99999"/> +</svg> diff --git a/dlls/light.msstyles/blue_menu_popup_submenu.bmp b/dlls/light.msstyles/blue_menu_popup_submenu.bmp new file mode 100644 index 0000000000000000000000000000000000000000..72066bd5c751bdad0389c409cb37ae54f3fc1d4b GIT binary patch literal 786 zcmZ?r6=G%pgDxOh1H_y_ECj(a)i3<?Y&sSYL}fdT$AFhCGU=D(ABP%(xQ0s<@q<OxZy zTeoh(+O=!t(a)u^$2YLy&N-TqCRHYrj=9nd}tpn2DDnFX{@0w}+0<Hn6D*whe`2k8Oo zpN&gDHZv&^`!&sA!S^YKc*F4fOk+8qy8YiL>){PUV%2?{re^^(4`&$upK2=cYpTJn XA5)F6h9Mz&P<Q~%pN&gDq3{9#2_jh3 literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_menu_popup_submenu.svg b/dlls/light.msstyles/blue_menu_popup_submenu.svg new file mode 100644 index 00000000000..826203b0398 --- /dev/null +++ b/dlls/light.msstyles/blue_menu_popup_submenu.svg @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:9-32" width="9" height="18" version="1.1" viewBox="0 0 2.3812 4.7625" xmlns="http://www.w3.org/2000/svg"> + <g stroke-width=".99996"> + <path d="m1.7209 1.3148-0.91789-0.91898 0.13113-0.13129 0.91789 0.91898z" fill="#3096fa"/> + <path d="m1.8427 1.1977-0.91789 0.91898-0.13113-0.13129 0.91789-0.91898z" fill="#3096fa"/> + <path d="m1.7209 3.6962-0.91789-0.91905 0.13113-0.1313 0.91789 0.91905z" fill="#aeaeae"/> + <path d="m1.8427 3.5789-0.91789 0.91905-0.13113-0.1313 0.91789-0.91905z" fill="#aeaeae"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_menu_system_close.bmp b/dlls/light.msstyles/blue_menu_system_close.bmp new file mode 100644 index 0000000000000000000000000000000000000000..fd74d533cce4cc5b14d0567765518b83a5a4188c GIT binary patch literal 1018 zcmdUsF%E)25JlH$XJKOp1!tkLveAQJVrxO|Nz5j(a)+j9sKIF1dxQAk#lWUP!6-p>4) zAF`Xt_xGiF#Fg^`YuLiVWJX4(VNMxEXUy}HUYG9<=V+)ZS1Q-MDTHu?W9$$u{kSK! zb1tP{lS|Rmh4;QCXQHQJt=%xMpph(k>KV1xi!agM0iXJ9<30W;%YI(=Ht4s#(NCd< g5+n*}A%jmLd#a!r^6cK2YrP3x?H#^(8^8Ts^fH8EHUIzs literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_menu_system_close.svg b/dlls/light.msstyles/blue_menu_system_close.svg new file mode 100644 index 00000000000..0bf10043a03 --- /dev/null +++ b/dlls/light.msstyles/blue_menu_system_close.svg @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:11-32" width="11" height="20" version="1.1" viewBox="0 0 2.9104 5.2917" xmlns="http://www.w3.org/2000/svg"> + <path d="m2.1166 0.95364-0.18653-0.15989-0.73951 0.63386-0.73951-0.63386-0.18653 0.15989 0.73951 0.63386-0.73951 0.63386 0.18653 0.15989 0.73951-0.63386 0.73951 0.63386 0.18653-0.15989-0.73951-0.63386z"/> + <path d="m2.1166 3.5995-0.18653-0.15989-0.73951 0.63386-0.73951-0.63386-0.18653 0.15989 0.73951 0.63386-0.73951 0.63386 0.18653 0.15989 0.73951-0.63386 0.73951 0.63386 0.18653-0.15989-0.73951-0.63386z" fill="#aeaeae"/> +</svg> diff --git a/dlls/light.msstyles/blue_menu_system_maximize.bmp b/dlls/light.msstyles/blue_menu_system_maximize.bmp new file mode 100644 index 0000000000000000000000000000000000000000..866154c99af25bb7a4624371c6f80a6a800a74a6 GIT binary patch literal 1018 zcmZ?r{l&}x23<h128g+VSOka}859^mQUy?XAQK7vXJCLJkl24G_n=}VNuro6M5)59 zXx+MX|M6jDo%qy&<glql76Y+iW+01W6QibDnEB{5HaDQFf$@>m4iYvfyzyaVXW~<b k5^qRmBI^gSVP+tUV-usMTA2ChG&VP&tAX*6)l!`e0Ann<_W%F@ literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_menu_system_maximize.svg b/dlls/light.msstyles/blue_menu_system_maximize.svg new file mode 100644 index 00000000000..22975e1eec0 --- /dev/null +++ b/dlls/light.msstyles/blue_menu_system_maximize.svg @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:11-32" width="11" height="20" version="1.1" viewBox="0 0 2.9104 5.2917" xmlns="http://www.w3.org/2000/svg"> + <rect x=".52915" y=".79375" width="1.5875" height="1.3229" fill="none" stroke="#000" stroke-width=".52917"/> + <rect x=".52915" y="3.4396" width="1.5875" height="1.3229" fill="none" stroke="#aeaeae" stroke-width=".52917"/> +</svg> diff --git a/dlls/light.msstyles/blue_menu_system_minimize.bmp b/dlls/light.msstyles/blue_menu_system_minimize.bmp new file mode 100644 index 0000000000000000000000000000000000000000..1255e9323e26225b7f9445024b8069ce93b529ac GIT binary patch literal 1018 zcmZ?r{l&}x23<h128g+VSOka}859^mQUy?XAQK7vXJCLJkl24G_n=}VNuro6M5)59 oXx+MX|M6jDo%qy&<dD^lvS}Uypzy|rksW|f-DtcahZKoy0A&727XSbN literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_menu_system_minimize.svg b/dlls/light.msstyles/blue_menu_system_minimize.svg new file mode 100644 index 00000000000..38c7a446c50 --- /dev/null +++ b/dlls/light.msstyles/blue_menu_system_minimize.svg @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:11-32" width="11" height="20" version="1.1" viewBox="0 0 2.9104 5.2917" xmlns="http://www.w3.org/2000/svg"> + <path d="m0.26457 1.8521h2.1167v0.52917h-2.1167z" stroke-width=".26458"/> + <path d="m0.26457 4.4979h2.1167v0.52917h-2.1167z" fill="#aeaeae" stroke-width=".26458"/> +</svg> diff --git a/dlls/light.msstyles/blue_menu_system_restore.bmp b/dlls/light.msstyles/blue_menu_system_restore.bmp new file mode 100644 index 0000000000000000000000000000000000000000..e40c4404f370d5fc8f29209e2138cc50b1733999 GIT binary patch literal 1018 zcmcJMF%H5&3<Qm!qvZj-B(a)Gn~FF~T^1w7^+NORc0NY=_1U6Uw|&%5i1lq}cx-oDq% zpHHu&*U4*VXAA58_x+fzZuYxF>&xZ#Naob>FqImIT5G+kYNN`9wwA(a)yUG(U9Xn9sX zo_07em^BBFp7ZR?Xk<rxWo$6Vcdx2?Rh29MTVle|UG(U9Xn9sXo_07em^BBFp7ZR? LXk<rxWvtF0hLOGh literal 0 HcmV?d00001 diff --git a/dlls/light.msstyles/blue_menu_system_restore.svg b/dlls/light.msstyles/blue_menu_system_restore.svg new file mode 100644 index 00000000000..f5f63511ede --- /dev/null +++ b/dlls/light.msstyles/blue_menu_system_restore.svg @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:11-32" width="11" height="20" version="1.1" viewBox="0 0 2.9104 5.2917" xmlns="http://www.w3.org/2000/svg"> + <rect x=".52915" y="1.0583" width="1.0583" height="1.0583" fill="none" stroke="#000" stroke-width=".52917"/> + <path d="m0.79374 0.26458h1.5875v0.26458h-1.5875z" stroke-width=".26458"/> + <path d="m0.79374 2.9104h1.5875v0.26458h-1.5875z" fill="#aeaeae" stroke-width=".26458"/> + <g stroke-width=".26458"> + <path d="m2.1167 0.52917h0.26458v1.3229h-0.26458z"/> + <path d="m2.1167 3.175h0.26458v1.3229h-0.26458z" fill="#aeaeae"/> + <path d="m1.8521 1.5875h0.26458v0.26458h-0.26458z"/> + <path d="m1.8521 4.2334h0.26458v0.26458h-0.26458z" fill="#aeaeae"/> + <path d="m0.79374 0.52917h0.26458v0.26458h-0.26458z"/> + <path d="m0.79374 3.175h0.26458v0.26458h-0.26458z" fill="#aeaeae"/> + </g> + <rect x=".52915" y="3.7042" width="1.0583" height="1.0583" fill="none" stroke="#aeaeae" stroke-width=".52917"/> +</svg> diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index 5073ad935b4..980854ae2d3 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -402,6 +402,135 @@ BLUE_INI TEXTFILE "[Menu]\r\n" "BgType = None\r\n" +"[Menu.BarBackground]\r\n" +"BgType = BorderFill\r\n" +"BorderSize = 0\r\n" +"FillType = Solid\r\n" +"FillColor = 255 255 255\r\n" + +"[Menu.BarItem]\r\n" +"BgType = BorderFill\r\n" +"BorderSize = 0\r\n" +"FillType = Solid\r\n" +"FillColor = 255 255 255\r\n" +"TextColor = 0 0 0\r\n" + +"[Menu.BarItem(Hot)]\r\n" +"FillColor = 48 150 250\r\n" +"TextColor = 255 255 255\r\n" + +"[Menu.BarItem(Pushed)]\r\n" +"FillColor = 48 150 250\r\n" +"TextColor = 255 255 255\r\n" + +"[Menu.BarItem(Disabled)]\r\n" +"FillColor = 255 255 255\r\n" +"TextColor = 166 166 166\r\n" + +"[Menu.BarItem(DisabledHot)]\r\n" +"FillColor = 255 255 255\r\n" +"TextColor = 166 166 166\r\n" + +"[Menu.BarItem(DisabledPushed)]\r\n" +"FillColor = 255 255 255\r\n" +"TextColor = 166 166 166\r\n" + +"[Menu.PopupBackground]\r\n" +"BgType = BorderFill\r\n" +"BorderSize = 0\r\n" +"FillType = Solid\r\n" +"FillColor = 255 255 255\r\n" + +"[Menu.PopupBorders]\r\n" +"BgType = BorderFill\r\n" +"BorderSize = 1\r\n" +"FillColor = 255 255 255\r\n" +"BorderColor = 174 174 174\r\n" + +"[Menu.PopupCheck]\r\n" +"BgType = ImageFile\r\n" +"ImageFile1 = blue_menu_popup_check_16px.bmp\r\n" +"ImageFile2 = blue_menu_popup_check_18px.bmp\r\n" +"ContentMargins = 3, 3, 3, 3\r\n" +"SizingType = TrueSize\r\n" +"ImageLayout = Vertical\r\n" +"ImageSelectType = Dpi\r\n" +"TrueSizeScalingType = Dpi\r\n" +"ImageCount = 4\r\n" +"MinDpi1 = 96\r\n" +"MinDpi2 = 120\r\n" + +"[Menu.PopupCheckBackground]\r\n" +"BgType = BorderFill\r\n" +"BorderSize = 0\r\n" +"FillType = Solid\r\n" +"FillColor = 255 255 255\r\n" + +"[Menu.PopupGutter]\r\n" +"BgType = None\r\n" + +"[Menu.PopupItem]\r\n" +"BgType = BorderFill\r\n" +"BorderSize = 0\r\n" +"FillType = Solid\r\n" +"FillColor = 255 255 255\r\n" +"TextColor = 0 0 0\r\n" + +"[Menu.PopupItem(Hot)]\r\n" +"FillColor = 48 150 250\r\n" +"TextColor = 255 255 255\r\n" + +"[Menu.PopupItem(Disabled)]\r\n" +"FillColor = 255 255 255\r\n" +"TextColor = 166 166 166\r\n" + +"[Menu.PopupItem(DisabledHot)]\r\n" +"FillColor = 255 255 255\r\n" +"TextColor = 166 166 166\r\n" + +"[Menu.PopupSeparator]\r\n" +"BgType = ImageFile\r\n" +"ImageFile = blue_menu_popup_separator.bmp\r\n" +"MinSize = 1, 4\r\n" +"SizingMargins = 0, 0, 3, 1\r\n" +"SizingType = Stretch\r\n" + +"[Menu.PopupSubmenu]\r\n" +"BgType = ImageFile\r\n" +"ImageFile = blue_menu_popup_submenu.bmp\r\n" +"ImageCount = 2\r\n" +"SizingMargins = 2, 7, 3, 3\r\n" +"SizingType = TrueSize\r\n" +"ImageLayout = Vertical\r\n" + +"[Menu.SystemClose]\r\n" +"BgType = ImageFile\r\n" +"ImageFile = blue_menu_system_close.bmp\r\n" +"ImageCount = 2\r\n" +"SizingType = TrueSize\r\n" +"ImageLayout = Vertical\r\n" + +"[Menu.SystemMaximize]\r\n" +"BgType = ImageFile\r\n" +"ImageFile = blue_menu_system_maximize.bmp\r\n" +"ImageCount = 2\r\n" +"SizingType = TrueSize\r\n" +"ImageLayout = Vertical\r\n" + +"[Menu.SystemMinimize]\r\n" +"BgType = ImageFile\r\n" +"ImageFile = blue_menu_system_minimize.bmp\r\n" +"ImageCount = 2\r\n" +"SizingType = TrueSize\r\n" +"ImageLayout = Vertical\r\n" + +"[Menu.SystemRestore]\r\n" +"BgType = ImageFile\r\n" +"ImageFile = blue_menu_system_restore.bmp\r\n" +"ImageCount = 2\r\n" +"SizingType = TrueSize\r\n" +"ImageLayout = Vertical\r\n" + "\r\n; Progress\r\n" "[Progress]\r\n" "ProgressChunkSize = 1\r\n" @@ -1279,6 +1408,31 @@ BLUE_HEADER_BMP BITMAP "blue_header.bmp" /* @makedep: blue_header_item.bmp */ BLUE_HEADER_ITEM_BMP BITMAP "blue_header_item.bmp" +/* Menu */ +/* @makedep: blue_menu_popup_check_16px.bmp */ +BLUE_MENU_POPUP_CHECK_16PX_BMP BITMAP "blue_menu_popup_check_16px.bmp" + +/* @makedep: blue_menu_popup_check_18px.bmp */ +BLUE_MENU_POPUP_CHECK_18PX_BMP BITMAP "blue_menu_popup_check_18px.bmp" + +/* @makedep: blue_menu_popup_separator.bmp */ +BLUE_MENU_POPUP_SEPARATOR_BMP BITMAP "blue_menu_popup_separator.bmp" + +/* @makedep: blue_menu_popup_submenu.bmp */ +BLUE_MENU_POPUP_SUBMENU_BMP BITMAP "blue_menu_popup_submenu.bmp" + +/* @makedep: blue_menu_system_close.bmp */ +BLUE_MENU_SYSTEM_CLOSE_BMP BITMAP "blue_menu_system_close.bmp" + +/* @makedep: blue_menu_system_maximize.bmp */ +BLUE_MENU_SYSTEM_MAXIMIZE_BMP BITMAP "blue_menu_system_maximize.bmp" + +/* @makedep: blue_menu_system_minimize.bmp */ +BLUE_MENU_SYSTEM_MINIMIZE_BMP BITMAP "blue_menu_system_minimize.bmp" + +/* @makedep: blue_menu_system_restore.bmp */ +BLUE_MENU_SYSTEM_RESTORE_BMP BITMAP "blue_menu_system_restore.bmp" + /* Progress */ /* @makedep: blue_progress_chunk_horizontal.bmp */ BLUE_PROGRESS_CHUNK_HORIZONTAL_BMP BITMAP "blue_progress_chunk_horizontal.bmp" -- 2.34.1

1 0

[PATCH 1/2] uxtheme: Support parsing menu class.
by Zhiyi Zhang 25 May '22

25 May '22

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/stylemap.c | 54 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/dlls/uxtheme/stylemap.c b/dlls/uxtheme/stylemap.c index afeda659a36..07fafbe0bde 100644 --- a/dlls/uxtheme/stylemap.c +++ b/dlls/uxtheme/stylemap.c @@ -485,6 +485,59 @@ static const MSSTYLES_CLASS_MAP classListview[] = { {0, 0, L""} }; +static const MSSTYLES_CLASS_MAP classMenu[] = { + {MENU_MENUITEM_TMSCHEMA, 0, L"MENUITEM"}, + {MENU_MENUDROPDOWN_TMSCHEMA, 0, L"MENUDROPDOWN"}, + {MENU_MENUBARITEM_TMSCHEMA, 0, L"MENUBARITEM"}, + {MENU_MENUBARDROPDOWN_TMSCHEMA, 0, L"MENUBARDROPDOWN"}, + {MENU_CHEVRON_TMSCHEMA, 0, L"CHEVRON"}, + {MENU_SEPARATOR_TMSCHEMA, 0, L"SEPARATOR"}, + {MENU_BARBACKGROUND, 0, L"BARBACKGROUND"}, + {MENU_BARBACKGROUND, MB_ACTIVE, L"ACTIVE"}, + {MENU_BARBACKGROUND, MB_INACTIVE, L"INACTIVE"}, + {MENU_BARITEM, 0, L"BARITEM"}, + {MENU_BARITEM, MBI_NORMAL, L"NORMAL"}, + {MENU_BARITEM, MBI_HOT, L"HOT"}, + {MENU_BARITEM, MBI_PUSHED, L"PUSHED"}, + {MENU_BARITEM, MBI_DISABLED, L"DISABLED"}, + {MENU_BARITEM, MBI_DISABLEDHOT, L"DISABLEDHOT"}, + {MENU_BARITEM, MBI_DISABLEDPUSHED, L"DISABLEDPUSHED"}, + {MENU_POPUPBACKGROUND, 0, L"POPUPBACKGROUND"}, + {MENU_POPUPBORDERS, 0, L"POPUPBORDERS"}, + {MENU_POPUPCHECK, 0, L"POPUPCHECK"}, + {MENU_POPUPCHECK, MC_CHECKMARKNORMAL, L"CHECKMARKNORMAL"}, + {MENU_POPUPCHECK, MC_CHECKMARKDISABLED, L"CHECKMARKDISABLED"}, + {MENU_POPUPCHECK, MC_BULLETNORMAL, L"BULLETNORMAL"}, + {MENU_POPUPCHECK, MC_BULLETDISABLED, L"BULLETDISABLED"}, + {MENU_POPUPCHECKBACKGROUND, 0, L"POPUPCHECKBACKGROUND"}, + {MENU_POPUPCHECKBACKGROUND, MCB_DISABLED, L"DISABLED"}, + {MENU_POPUPCHECKBACKGROUND, MCB_NORMAL, L"NORMAL"}, + {MENU_POPUPCHECKBACKGROUND, MCB_BITMAP, L"BITMAP"}, + {MENU_POPUPGUTTER, 0, L"POPUPGUTTER"}, + {MENU_POPUPITEM, 0, L"POPUPITEM"}, + {MENU_POPUPITEM, MPI_NORMAL, L"NORMAL"}, + {MENU_POPUPITEM, MPI_HOT, L"HOT"}, + {MENU_POPUPITEM, MPI_DISABLED, L"DISABLED"}, + {MENU_POPUPITEM, MPI_DISABLEDHOT, L"DISABLEDHOT"}, + {MENU_POPUPSEPARATOR, 0, L"POPUPSEPARATOR"}, + {MENU_POPUPSUBMENU, 0, L"POPUPSUBMENU"}, + {MENU_POPUPSUBMENU, MSM_NORMAL, L"NORMAL"}, + {MENU_POPUPSUBMENU, MSM_DISABLED, L"DISABLED"}, + {MENU_SYSTEMCLOSE, 0, L"SYSTEMCLOSE"}, + {MENU_SYSTEMCLOSE, MSYSC_NORMAL, L"NORMAL"}, + {MENU_SYSTEMCLOSE, MSYSC_DISABLED, L"DISABLED"}, + {MENU_SYSTEMMAXIMIZE, 0, L"SYSTEMMAXIMIZE"}, + {MENU_SYSTEMMAXIMIZE, MSYSMX_NORMAL, L"NORMAL"}, + {MENU_SYSTEMMAXIMIZE, MSYSMX_DISABLED, L"DISABLED"}, + {MENU_SYSTEMMINIMIZE, 0, L"SYSTEMMINIMIZE"}, + {MENU_SYSTEMMINIMIZE, MSYSMN_NORMAL, L"NORMAL"}, + {MENU_SYSTEMMINIMIZE, MSYSMN_DISABLED, L"DISABLED"}, + {MENU_SYSTEMRESTORE, 0, L"SYSTEMRESTORE"}, + {MENU_SYSTEMRESTORE, MSYSR_NORMAL, L"NORMAL"}, + {MENU_SYSTEMRESTORE, MSYSR_DISABLED, L"DISABLED"}, + {0, 0, L""} +}; + static const MSSTYLES_CLASS_MAP classMenuband[] = { {MDP_NEWAPPBUTTON, 0, L"NEWAPPBUTTON"}, {MDP_NEWAPPBUTTON, MDS_NORMAL, L"NORMAL"}, @@ -1020,6 +1073,7 @@ static const MSSTYLES_CLASS_NAME mapClass[] = { {classExplorerbar, L"EXPLORERBAR"}, {classHeader, L"HEADER"}, {classListview, L"LISTVIEW"}, + {classMenu, L"MENU"}, {classMenuband, L"MENUBAND"}, {classPage, L"PAGE"}, {classProgress, L"PROGRESS"}, -- 2.34.1

1 0

[PATCH v4 0/3] MR115: winex11.drv: Define ControlMask when not available
by Alistair Leslie-Hughes (＠alesliehughes) 25 May '22

25 May '22

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> -- v4: ntdll: Fake success for ThreadPowerThrottlingState include: Add THREAD_POWER_THROTTLING_STATE type winex11.drv: Define ControlMask when not available https://gitlab.winehq.org/wine/wine/-/merge_requests/115

3 4

[PATCH] widl: Remove set but unused variable.
by Rémi Bernon 25 May '22

25 May '22

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- tools/widl/write_msft.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index abeb37f34a4..457b20df259 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -1056,7 +1056,7 @@ static int encode_var( var, type, type->name ? type->name : "NULL"); if (is_array(type) && !type_array_is_decl_as_ptr(type)) { - int num_dims, elements = 1, arrayoffset; + int num_dims, arrayoffset; type_t *atype; int *arraydata; @@ -1083,7 +1083,6 @@ static int encode_var( arraydata[0] = type_array_get_dim(atype); arraydata[1] = 0; arraydata += 2; - elements *= type_array_get_dim(atype); } typeoffset = ctl2_alloc_segment(typelib, MSFT_SEG_TYPEDESC, 8, 0); -- 2.35.1

1 0

[PATCH v2 0/5] MR116: qasf: Better implementation of ASF reader filter.
by Rémi Bernon 25 May '22

25 May '22

-- v2: qasf: Implement ASF Reader filter stream stubs. qasf: Create and open a WMReader in the ASF Reader filter. qasf: Rename variables and functions. qasf: Constify filter_ops. qasf/tests: Add more ASF Reader filter tests. https://gitlab.winehq.org/wine/wine/-/merge_requests/116

2 11