- Wine-Commits - list.winehq.org

Santino Mazza : mshtml: Implement HTMLDocument_get_body for document fragments.
by Alexandre Julliard Jan. 26, 2023

Jan. 26, 2023

Module: wine Branch: master Commit: 84f1b60e331cc77f94301c55c98592eddff5672c URL: https://gitlab.winehq.org/wine/wine/-/commit/84f1b60e331cc77f94301c55c98592… Author: Santino Mazza <smazza(a)codeweavers.com> Date: Mon Dec 19 19:54:57 2022 -0300 mshtml: Implement HTMLDocument_get_body for document fragments. --- dlls/mshtml/htmldoc.c | 22 ++++++++++++++++------ dlls/mshtml/tests/dom.c | 4 ++-- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 7b71ec1c1ae..414a39ae702 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -497,20 +497,30 @@ static HRESULT WINAPI HTMLDocument_get_all(IHTMLDocument2 *iface, IHTMLElementCo static HRESULT WINAPI HTMLDocument_get_body(IHTMLDocument2 *iface, IHTMLElement **p) { HTMLDocumentNode *This = impl_from_IHTMLDocument2(iface); - nsIDOMHTMLElement *nsbody = NULL; + nsIDOMElement *nsbody = NULL; HTMLElement *element; + nsresult nsres; HRESULT hres; TRACE("(%p)->(%p)\n", This, p); if(This->html_document) { - nsresult nsres; - - nsres = nsIDOMHTMLDocument_GetBody(This->html_document, &nsbody); + nsres = nsIDOMHTMLDocument_GetBody(This->html_document, (nsIDOMHTMLElement **)&nsbody); if(NS_FAILED(nsres)) { TRACE("Could not get body: %08lx\n", nsres); return E_UNEXPECTED; } + }else { + nsAString nsnode_name; + nsIDOMDocumentFragment *frag; + + nsres = nsIDOMNode_QueryInterface(This->node.nsnode, &IID_nsIDOMDocumentFragment, (void**)&frag); + if(!NS_FAILED(nsres)) { + nsAString_InitDepend(&nsnode_name, L"BODY"); + nsIDOMDocumentFragment_QuerySelector(frag, &nsnode_name, &nsbody); + nsAString_Finish(&nsnode_name); + nsIDOMDocumentFragment_Release(frag); + } } if(!nsbody) { @@ -518,8 +528,8 @@ static HRESULT WINAPI HTMLDocument_get_body(IHTMLDocument2 *iface, IHTMLElement return S_OK; } - hres = get_element((nsIDOMElement*)nsbody, &element); - nsIDOMHTMLElement_Release(nsbody); + hres = get_element(nsbody, &element); + nsIDOMElement_Release(nsbody); if(FAILED(hres)) return hres; diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 4e92c1c1447..dc236a27f1c 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -11081,9 +11081,9 @@ static void test_docfrag(IHTMLDocument2 *doc) hres = IHTMLDocument2_get_body(frag, &frag_body); ok(hres == S_OK, "get_body failed: %08lx\n", hres); - todo_wine ok(frag_body != NULL, "body == NULL\n"); + ok(frag_body != NULL, "body == NULL\n"); if (frag_body) { - todo_wine ok(!iface_cmp((IUnknown *) frag_body, (IUnknown *) main_body), "frag_body == main_body\n"); + ok(!iface_cmp((IUnknown *) frag_body, (IUnknown *) main_body), "frag_body == main_body\n"); IHTMLElement_Release(frag_body); } IHTMLElement_Release(main_body);

1 0

Jacek Caban : ieframe/tests: Relax session count test.
by Alexandre Julliard Jan. 26, 2023

Jan. 26, 2023

Module: wine Branch: master Commit: 26e5482acf7a6951d16171662216d4bd8082d623 URL: https://gitlab.winehq.org/wine/wine/-/commit/26e5482acf7a6951d16171662216d4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 26 14:55:41 2023 +0100 ieframe/tests: Relax session count test. --- dlls/ieframe/tests/webbrowser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 584da6e9022..15ce0272654 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -2021,7 +2021,7 @@ static void test_ClientSite(IWebBrowser2 *unk, IOleClientSite *client, BOOL stop if(client) { DWORD count = pSetQueryNetSessionCount(SESSION_QUERY); - ok(count == session_count + 1, "count = %lu expected %lu\n", count, session_count + 1); + ok(count >= session_count + 1, "count = %lu expected %lu\n", count, session_count + 1); CHECK_CALLED(GetContainer); CHECK_CALLED(Site_GetWindow);

1 0

Nikolay Sivov : propsys: Add InitPropVariantFromStringVector().
by Alexandre Julliard Jan. 26, 2023

Jan. 26, 2023

Module: wine Branch: master Commit: 3a1146d8e63d7ceff38441fee08f7f7080527020 URL: https://gitlab.winehq.org/wine/wine/-/commit/3a1146d8e63d7ceff38441fee08f7f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Dec 10 15:21:00 2022 +0300 propsys: Add InitPropVariantFromStringVector(). --- dlls/propsys/propsys.spec | 2 +- dlls/propsys/propvar.c | 32 ++++++++++++++++++++++++++++++++ dlls/propsys/tests/propsys.c | 39 +++++++++++++++++++++++++++++++++++---- include/propvarutil.h | 1 + 4 files changed, 69 insertions(+), 5 deletions(-) diff --git a/dlls/propsys/propsys.spec b/dlls/propsys/propsys.spec index 7391cf4aaa2..cf7a4c299f4 100644 --- a/dlls/propsys/propsys.spec +++ b/dlls/propsys/propsys.spec @@ -41,7 +41,7 @@ @ stub InitPropVariantFromResource @ stub InitPropVariantFromStrRet @ stub InitPropVariantFromStringAsVector -@ stub InitPropVariantFromStringVector +@ stdcall InitPropVariantFromStringVector(ptr long ptr) @ stub InitPropVariantFromUInt16Vector @ stub InitPropVariantFromUInt32Vector @ stub InitPropVariantFromUInt64Vector diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index cd92912fde5..86670a51adf 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -657,6 +657,38 @@ HRESULT WINAPI InitPropVariantFromCLSID(REFCLSID clsid, PROPVARIANT *ppropvar) return S_OK; } +HRESULT WINAPI InitPropVariantFromStringVector(PCWSTR *strs, ULONG count, PROPVARIANT *ppropvar) +{ + unsigned int i; + + TRACE("(%p %lu %p)\n", strs, count, ppropvar); + + ppropvar->calpwstr.pElems = CoTaskMemAlloc(count * sizeof(*ppropvar->calpwstr.pElems)); + if(!ppropvar->calpwstr.pElems) + return E_OUTOFMEMORY; + + ppropvar->vt = VT_LPWSTR | VT_VECTOR; + ppropvar->calpwstr.cElems = 0; + if (count) + memset(ppropvar->calpwstr.pElems, 0, count * sizeof(*ppropvar->calpwstr.pElems)); + + for (i = 0; i < count; ++i) + { + if (strs[i]) + { + if (!(ppropvar->calpwstr.pElems[i] = CoTaskMemAlloc((wcslen(strs[i]) + 1)*sizeof(**strs)))) + { + PropVariantClear(ppropvar); + return E_OUTOFMEMORY; + } + } + wcscpy(ppropvar->calpwstr.pElems[i], strs[i]); + ppropvar->calpwstr.cElems++; + } + + return S_OK; +} + HRESULT WINAPI InitVariantFromBuffer(const VOID *pv, UINT cb, VARIANT *pvar) { SAFEARRAY *arr; diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c index 47a7930a18b..fb9decd7ab0 100644 --- a/dlls/propsys/tests/propsys.c +++ b/dlls/propsys/tests/propsys.c @@ -1419,6 +1419,35 @@ static void test_InitPropVariantFromCLSID(void) PropVariantClear(&propvar); } +static void test_InitPropVariantFromStringVector(void) +{ + static const WCHAR *strs[2] = { L"abc", L"def" }; + PROPVARIANT propvar; + HRESULT hr; + + memset(&propvar, 0, sizeof(propvar)); + propvar.vt = VT_I4; + propvar.lVal = 15; + + hr = InitPropVariantFromStringVector(NULL, 0, &propvar); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(propvar.vt == (VT_LPWSTR|VT_VECTOR), "Unexpected type %#x.\n", propvar.vt); + ok(!propvar.calpwstr.cElems, "Unexpected number of elements.\n"); + ok(!!propvar.calpwstr.pElems, "Unexpected vector pointer.\n"); + PropVariantClear(&propvar); + + hr = InitPropVariantFromStringVector(strs, 2, &propvar); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(propvar.vt == (VT_LPWSTR|VT_VECTOR), "Unexpected type %#x.\n", propvar.vt); + ok(propvar.calpwstr.cElems == 2, "Unexpected number of elements.\n"); + ok(!!propvar.calpwstr.pElems, "Unexpected vector pointer.\n"); + ok(propvar.calpwstr.pElems[0] != strs[0], "Unexpected string pointer.\n"); + ok(!wcscmp(propvar.calpwstr.pElems[0], strs[0]), "Unexpected string %s.\n", debugstr_w(propvar.calpwstr.pElems[0])); + ok(propvar.calpwstr.pElems[1] != strs[1], "Unexpected string pointer.\n"); + ok(!wcscmp(propvar.calpwstr.pElems[1], strs[1]), "Unexpected string %s.\n", debugstr_w(propvar.calpwstr.pElems[1])); + PropVariantClear(&propvar); +} + static void test_PropVariantToDouble(void) { PROPVARIANT propvar; @@ -2252,11 +2281,15 @@ static void test_VariantToStringWithDefault(void) START_TEST(propsys) { + test_InitPropVariantFromGUIDAsString(); + test_InitPropVariantFromBuffer(); + test_InitPropVariantFromCLSID(); + test_InitPropVariantFromStringVector(); + test_InitVariantFromFileTime(); + test_PSStringFromPropertyKey(); test_PSPropertyKeyFromString(); test_PSRefreshPropertySchema(); - test_InitPropVariantFromGUIDAsString(); - test_InitPropVariantFromBuffer(); test_PropVariantToGUID(); test_PropVariantToStringAlloc(); test_PropVariantCompareEx(); @@ -2264,7 +2297,6 @@ START_TEST(propsys) test_PropVariantChangeType_LPWSTR(); test_PropVariantToBoolean(); test_PropVariantToStringWithDefault(); - test_InitPropVariantFromCLSID(); test_PropVariantToDouble(); test_PropVariantToString(); test_PropVariantToBuffer(); @@ -2273,6 +2305,5 @@ START_TEST(propsys) test_PSCreateMemoryPropertyStore(); test_propertystore(); test_PSCreatePropertyStoreFromObject(); - test_InitVariantFromFileTime(); test_VariantToStringWithDefault(); } diff --git a/include/propvarutil.h b/include/propvarutil.h index b82c3d90274..575c498b230 100644 --- a/include/propvarutil.h +++ b/include/propvarutil.h @@ -81,6 +81,7 @@ HRESULT WINAPI VariantToGUID(const VARIANT *pvar, GUID *guid); INT WINAPI PropVariantCompareEx(REFPROPVARIANT propvar1, REFPROPVARIANT propvar2, PROPVAR_COMPARE_UNIT uint, PROPVAR_COMPARE_FLAGS flags); HRESULT WINAPI InitPropVariantFromFileTime(const FILETIME *pftIn, PROPVARIANT *ppropvar); +HRESULT WINAPI InitPropVariantFromStringVector(PCWSTR *strs, ULONG count, PROPVARIANT *ppropvar); HRESULT WINAPI PropVariantToDouble(REFPROPVARIANT propvarIn, double *ret); HRESULT WINAPI PropVariantToInt16(REFPROPVARIANT propvarIn, SHORT *ret);

1 0

Hans Leidekker : wbemprox: Implement Win32_Volume.
by Alexandre Julliard Jan. 26, 2023

Jan. 26, 2023

Module: wine Branch: master Commit: 337f3848a8d0a36c5b7858589f35bcf26b7f6d38 URL: https://gitlab.winehq.org/wine/wine/-/commit/337f3848a8d0a36c5b7858589f35bc… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Dec 22 13:07:05 2022 +0100 wbemprox: Implement Win32_Volume. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54030 --- dlls/wbemprox/builtin.c | 69 +++++++++++++++++++++++++++++++++++++++++++++ dlls/wbemprox/tests/query.c | 40 ++++++++++++++++++++++++++ 2 files changed, 109 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index faab5d51af6..a2c21a2a6de 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -482,6 +482,13 @@ static const struct column col_videocontroller[] = { L"VideoModeDescription", CIM_STRING|COL_FLAG_DYNAMIC }, { L"VideoProcessor", CIM_STRING|COL_FLAG_DYNAMIC }, }; + +static const struct column col_volume[] = +{ + { L"DeviceId", CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, + { L"DriveLetter", CIM_STRING|COL_FLAG_DYNAMIC }, +}; + static const struct column col_winsat[] = { { L"CPUScore", CIM_REAL32 }, @@ -923,6 +930,13 @@ struct record_videocontroller const WCHAR *videomodedescription; const WCHAR *videoprocessor; }; + +struct record_volume +{ + const WCHAR *deviceid; + const WCHAR *driveletter; +}; + struct record_winsat { FLOAT cpuscore; @@ -4180,6 +4194,60 @@ static enum fill_status fill_videocontroller( struct table *table, const struct return status; } +static WCHAR *get_volume_driveletter( const WCHAR *volume ) +{ + DWORD len = 0; + WCHAR *ret; + + if (!GetVolumePathNamesForVolumeNameW( volume, NULL, 0, &len ) && GetLastError() != ERROR_MORE_DATA) return NULL; + if (!(ret = malloc( len * sizeof(WCHAR) ))) return NULL; + if (!GetVolumePathNamesForVolumeNameW( volume, ret, len, &len ) || !wcschr( ret, ':' )) + { + free( ret ); + return NULL; + } + wcschr( ret, ':' )[1] = 0; + return ret; +} + +static enum fill_status fill_volume( struct table *table, const struct expr *cond ) +{ + struct record_volume *rec; + enum fill_status status = FILL_STATUS_UNFILTERED; + UINT row = 0, offset = 0; + WCHAR path[MAX_PATH]; + HANDLE handle; + + if (!resize_table( table, 2, sizeof(*rec) )) return FILL_STATUS_FAILED; + + handle = FindFirstVolumeW( path, ARRAY_SIZE(path) ); + while (handle != INVALID_HANDLE_VALUE) + { + if (!resize_table( table, row + 1, sizeof(*rec) )) return FILL_STATUS_FAILED; + + rec = (struct record_volume *)(table->data + offset); + rec->deviceid = wcsdup( path ); + rec->driveletter = get_volume_driveletter( path ); + + if (!match_row( table, row, cond, &status )) free_row_values( table, row ); + else + { + offset += sizeof(*rec); + row++; + } + + if (!FindNextVolumeW( handle, path, ARRAY_SIZE(path) )) + { + FindVolumeClose( handle ); + handle = INVALID_HANDLE_VALUE; + } + } + + TRACE("created %u rows\n", row); + table->num_rows = row; + return status; +} + static WCHAR *get_sounddevice_pnpdeviceid( DXGI_ADAPTER_DESC *desc ) { static const WCHAR fmtW[] = L"HDAUDIO\\FUNC_01&VEN_%04X&DEV_%04X&SUBSYS_%08X&REV_%04X\\0&DEADBEEF&0&DEAD"; @@ -4262,6 +4330,7 @@ static struct table cimv2_builtin_classes[] = { L"Win32_SoundDevice", C(col_sounddevice), 0, 0, NULL, fill_sounddevice }, { L"Win32_SystemEnclosure", C(col_systemenclosure), 0, 0, NULL, fill_systemenclosure }, { L"Win32_VideoController", C(col_videocontroller), 0, 0, NULL, fill_videocontroller }, + { L"Win32_Volume", C(col_volume), 0, 0, NULL, fill_volume }, { L"Win32_WinSAT", C(col_winsat), D(data_winsat) }, }; diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 4503ace0b68..f777c2a9c61 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1752,6 +1752,45 @@ static void test_Win32_VideoController( IWbemServices *services ) SysFreeString( wql ); } +static void test_Win32_Volume( IWbemServices *services ) +{ + BSTR wql = SysAllocString( L"wql" ), query = SysAllocString( L"SELECT * FROM Win32_Volume" ); + IEnumWbemClassObject *result; + IWbemClassObject *obj; + HRESULT hr; + VARIANT val; + CIMTYPE type; + DWORD count; + + hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); + if (hr != S_OK) + { + win_skip( "Win32_Volume not available\n" ); + return; + } + + for (;;) + { + hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); + if (hr != S_OK) break; + + check_property( obj, L"DeviceID", VT_BSTR, CIM_STRING ); + + type = 0xdeadbeef; + memset( &val, 0, sizeof(val) ); + hr = IWbemClassObject_Get( obj, L"DriveLetter", 0, &val, &type, NULL ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( V_VT( &val ) == VT_BSTR || V_VT( &val ) == VT_NULL, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_STRING, "unexpected type %#lx\n", type ); + trace( "driveletter %s\n", wine_dbgstr_w(V_BSTR( &val )) ); + VariantClear( &val ); + } + + IEnumWbemClassObject_Release( result ); + SysFreeString( query ); + SysFreeString( wql ); +} + static void test_Win32_Printer( IWbemServices *services ) { BSTR wql = SysAllocString( L"wql" ), query = SysAllocString( L"SELECT * FROM Win32_Printer" ); @@ -2306,6 +2345,7 @@ START_TEST(query) test_Win32_SoundDevice( services ); test_Win32_SystemEnclosure( services ); test_Win32_VideoController( services ); + test_Win32_Volume( services ); test_Win32_WinSAT( services ); test_SystemRestore( services ); test_empty_namespace( locator );

1 0

Evan Tang : secur32: Add test for schannel AcceptSecurityContext.
by Alexandre Julliard Jan. 26, 2023

Jan. 26, 2023

Module: wine Branch: master Commit: d423d76f10da57255a2d65e950ee796703966959 URL: https://gitlab.winehq.org/wine/wine/-/commit/d423d76f10da57255a2d65e950ee79… Author: Evan Tang <etang(a)codeweavers.com> Date: Mon Dec 12 16:39:45 2022 -0600 secur32: Add test for schannel AcceptSecurityContext. --- dlls/secur32/tests/schannel.c | 141 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 141 insertions(+) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index 455fcb97aa7..f0b0b20b08a 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -1671,6 +1671,146 @@ static void test_application_protocol_negotiation(void) closesocket(sock); } +static void test_server_protocol_negotiation(void) { + BOOL ret; + SECURITY_STATUS status; + ULONG attrs; + SCHANNEL_CRED client_cred, server_cred; + CredHandle client_cred_handle, server_cred_handle; + CtxtHandle client_context, server_context, client_context2, server_context2; + SecPkgContext_ApplicationProtocol protocol; + SecBufferDesc buffers[3]; + PCCERT_CONTEXT cert; + HCRYPTPROV csp; + HCRYPTKEY key; + CRYPT_KEY_PROV_INFO keyProvInfo; + WCHAR ms_def_prov_w[MAX_PATH]; + unsigned buf_size = 8192; + unsigned char *alpn_buffer; + unsigned int *extension_len; + unsigned short *list_len; + int list_start_index, offset = 0; + + if (!pQueryContextAttributesA) + { + win_skip("Required secur32 functions not available\n"); + return; + } + + lstrcpyW(ms_def_prov_w, MS_DEF_PROV_W); + keyProvInfo.pwszContainerName = cspNameW; + keyProvInfo.pwszProvName = ms_def_prov_w; + keyProvInfo.dwProvType = PROV_RSA_FULL; + keyProvInfo.dwFlags = 0; + keyProvInfo.cProvParam = 0; + keyProvInfo.rgProvParam = NULL; + keyProvInfo.dwKeySpec = AT_SIGNATURE; + + cert = CertCreateCertificateContext(X509_ASN_ENCODING, selfSignedCert, sizeof(selfSignedCert)); + ret = CertSetCertificateContextProperty(cert, CERT_KEY_PROV_INFO_PROP_ID, 0, &keyProvInfo); + ok(ret, "CertSetCertificateContextProperty failed: %08lx", GetLastError()); + ret = CryptAcquireContextW(&csp, cspNameW, MS_DEF_PROV_W, PROV_RSA_FULL, CRYPT_NEWKEYSET); + ok(ret, "CryptAcquireContextW failed: %08lx\n", GetLastError()); + ret = CryptImportKey(csp, privKey, sizeof(privKey), 0, 0, &key); + ok(ret, "CryptImportKey failed: %08lx\n", GetLastError()); + if (!ret) return; + + init_cred(&client_cred); + init_cred(&server_cred); + client_cred.grbitEnabledProtocols = SP_PROT_TLS1_CLIENT; + client_cred.dwFlags = SCH_CRED_NO_DEFAULT_CREDS|SCH_CRED_MANUAL_CRED_VALIDATION; + server_cred.grbitEnabledProtocols = SP_PROT_TLS1_SERVER; + server_cred.dwFlags = SCH_CRED_NO_DEFAULT_CREDS|SCH_CRED_MANUAL_CRED_VALIDATION; + server_cred.cCreds = 1; + server_cred.paCred = &cert; + + status = AcquireCredentialsHandleA(NULL, (SEC_CHAR *)UNISP_NAME_A, SECPKG_CRED_OUTBOUND, NULL, &client_cred, NULL, NULL, &client_cred_handle, NULL); + ok(status == SEC_E_OK, "got %08lx\n", status); + if (status != SEC_E_OK) return; + status = AcquireCredentialsHandleA(NULL, (SEC_CHAR *)UNISP_NAME_A, SECPKG_CRED_INBOUND, NULL, &server_cred, NULL, NULL, &server_cred_handle, NULL); + ok(status == SEC_E_OK, "got %08lx\n", status); + if (status != SEC_E_OK) return; + + init_buffers(&buffers[0], 4, buf_size); + init_buffers(&buffers[1], 4, buf_size); + init_buffers(&buffers[2], 1, 128); + + alpn_buffer = buffers[2].pBuffers[0].pvBuffer; + extension_len = (unsigned int *)&alpn_buffer[offset]; + offset += sizeof(*extension_len); + *(unsigned int *)&alpn_buffer[offset] = SecApplicationProtocolNegotiationExt_ALPN; + offset += sizeof(unsigned int); + list_len = (unsigned short *)&alpn_buffer[offset]; + offset += sizeof(*list_len); + list_start_index = offset; + + alpn_buffer[offset++] = sizeof("http/1.1") - 1; + memcpy(&alpn_buffer[offset], "http/1.1", sizeof("http/1.1") - 1); + offset += sizeof("http/1.1") - 1; + alpn_buffer[offset++] = sizeof("h2") - 1; + memcpy(&alpn_buffer[offset], "h2", sizeof("h2") - 1); + offset += sizeof("h2") - 1; + + *list_len = offset - list_start_index; + *extension_len = *list_len + sizeof(*extension_len) + sizeof(*list_len); + + buffers[2].pBuffers[0].BufferType = SECBUFFER_APPLICATION_PROTOCOLS; + buffers[2].pBuffers[0].cbBuffer = offset; + buffers[0].pBuffers[0].BufferType = SECBUFFER_TOKEN; + status = InitializeSecurityContextA(&client_cred_handle, NULL, (SEC_CHAR *)"localhost", ISC_REQ_CONFIDENTIALITY|ISC_REQ_STREAM, 0, 0, &buffers[2], 0, &client_context, &buffers[0], &attrs, NULL); + ok(status == SEC_I_CONTINUE_NEEDED, "got %08lx\n", status); + + buffers[1].pBuffers[0].cbBuffer = buf_size; + buffers[1].pBuffers[0].BufferType = SECBUFFER_TOKEN; + buffers[0].pBuffers[1] = buffers[2].pBuffers[0]; + status = AcceptSecurityContext(&server_cred_handle, NULL, &buffers[0], ASC_REQ_CONFIDENTIALITY|ASC_REQ_STREAM, 0, &server_context, &buffers[1], &attrs, NULL); + ok(status == SEC_I_CONTINUE_NEEDED, "got %08lx\n", status); + memset(&buffers[0].pBuffers[1], 0, sizeof(buffers[0].pBuffers[1])); + + client_context2.dwLower = client_context2.dwUpper = 0xdeadbeef; + buffers[0].pBuffers[0].cbBuffer = buf_size; + status = InitializeSecurityContextA(&client_cred_handle, &client_context, (SEC_CHAR *)"localhost", ISC_REQ_CONFIDENTIALITY|ISC_REQ_STREAM|ISC_REQ_USE_SUPPLIED_CREDS, 0, 0, &buffers[1], 0, &client_context2, &buffers[0], &attrs, NULL); + ok(client_context.dwLower == client_context2.dwLower, "dwLower mismatch, expected %#Ix, got %#Ix\n", client_context.dwLower, client_context2.dwLower); + ok(client_context.dwUpper == client_context2.dwUpper, "dwUpper mismatch, expected %#Ix, got %#Ix\n", client_context.dwUpper, client_context2.dwUpper); + ok(status == SEC_I_CONTINUE_NEEDED, "got %08lx\n", status); + + server_context2.dwLower = server_context2.dwUpper = 0xdeadbeef; + buffers[1].pBuffers[0].cbBuffer = buf_size; + status = AcceptSecurityContext(&server_cred_handle, &server_context, &buffers[0], ASC_REQ_CONFIDENTIALITY|ASC_REQ_STREAM, 0, &server_context2, &buffers[1], &attrs, NULL); + ok(server_context.dwLower == server_context2.dwLower, "dwLower mismatch, expected %#Ix, got %#Ix\n", server_context.dwLower, server_context2.dwLower); + ok(server_context.dwUpper == server_context2.dwUpper, "dwUpper mismatch, expected %#Ix, got %#Ix\n", server_context.dwUpper, server_context2.dwUpper); + ok(status == SEC_E_OK, "got %08lx\n", status); + + buffers[0].pBuffers[0].cbBuffer = buf_size; + status = InitializeSecurityContextA(&client_cred_handle, &client_context, (SEC_CHAR *)"localhost", ISC_REQ_USE_SUPPLIED_CREDS, 0, 0, &buffers[1], 0, NULL, &buffers[0], &attrs, NULL); + ok(status == SEC_E_OK, "got %08lx\n", status); + + memset(&protocol, 0, sizeof(protocol)); + status = pQueryContextAttributesA(&client_context, SECPKG_ATTR_APPLICATION_PROTOCOL, &protocol); + ok(status == SEC_E_OK || broken(status == SEC_E_UNSUPPORTED_FUNCTION) /* win2k8 */, "got %08lx\n", status); + if (status == SEC_E_OK) + { + ok(protocol.ProtoNegoStatus == SecApplicationProtocolNegotiationStatus_Success, "got %u\n", protocol.ProtoNegoStatus); + ok(protocol.ProtoNegoExt == SecApplicationProtocolNegotiationExt_ALPN, "got %u\n", protocol.ProtoNegoExt); + ok(protocol.ProtocolIdSize == 8, "got %u\n", protocol.ProtocolIdSize); + ok(!memcmp(protocol.ProtocolId, "http/1.1", 8), "wrong protocol id\n"); + } + + DeleteSecurityContext(&client_context); + DeleteSecurityContext(&server_context); + FreeCredentialsHandle(&client_cred_handle); + FreeCredentialsHandle(&server_cred_handle); + + free_buffers(&buffers[0]); + free_buffers(&buffers[1]); + free_buffers(&buffers[2]); + + CryptDestroyKey(key); + CryptReleaseContext(csp, 0); + CryptAcquireContextW(&csp, cspNameW, MS_DEF_PROV_W, PROV_RSA_FULL, CRYPT_DELETEKEYSET); + CertFreeCertificateContext(cert); +} + static void init_dtls_output_buffer(SecBufferDesc *buffer) { buffer->pBuffers[0].BufferType = SECBUFFER_TOKEN; @@ -1949,6 +2089,7 @@ START_TEST(schannel) test_InitializeSecurityContext(); test_communication(); test_application_protocol_negotiation(); + test_server_protocol_negotiation(); test_dtls(); test_connection_shutdown(); }

1 0

Hans Leidekker : wbemprox: Remove reg_ prefix from static functions.
by Alexandre Julliard Jan. 26, 2023

Jan. 26, 2023

Module: wine Branch: master Commit: de6c2f9c7bb32a5f37b383c75ce15da8b5106f1e URL: https://gitlab.winehq.org/wine/wine/-/commit/de6c2f9c7bb32a5f37b383c75ce15d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 23 13:16:14 2022 +0100 wbemprox: Remove reg_ prefix from static functions. --- dlls/wbemprox/reg.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/wbemprox/reg.c b/dlls/wbemprox/reg.c index 4092cd90886..cd7db81aed7 100644 --- a/dlls/wbemprox/reg.c +++ b/dlls/wbemprox/reg.c @@ -75,7 +75,7 @@ static HRESULT to_i4_array( DWORD *values, DWORD count, VARIANT *var ) return S_OK; } -static unsigned int reg_get_access_mask( IWbemContext *context ) +static unsigned int get_access_mask( IWbemContext *context ) { VARIANT value; @@ -106,7 +106,7 @@ static HRESULT create_key( HKEY root, const WCHAR *subkey, IWbemContext *context TRACE("%p, %s\n", root, debugstr_w(subkey)); - res = RegCreateKeyExW( root, subkey, 0, NULL, 0, reg_get_access_mask( context ), NULL, &hkey, NULL ); + res = RegCreateKeyExW( root, subkey, 0, NULL, 0, get_access_mask( context ), NULL, &hkey, NULL ); set_variant( VT_UI4, res, NULL, retval ); if (!res) { @@ -172,7 +172,7 @@ static HRESULT enum_key( HKEY root, const WCHAR *subkey, VARIANT *names, IWbemCo TRACE("%p, %s\n", root, debugstr_w(subkey)); if (!(strings = malloc( count * sizeof(BSTR) ))) return E_OUTOFMEMORY; - if ((res = RegOpenKeyExW( root, subkey, 0, KEY_ENUMERATE_SUB_KEYS | reg_get_access_mask( context ), &hkey ))) + if ((res = RegOpenKeyExW( root, subkey, 0, KEY_ENUMERATE_SUB_KEYS | get_access_mask( context ), &hkey ))) { set_variant( VT_UI4, res, NULL, retval ); free( strings ); @@ -282,7 +282,7 @@ static HRESULT enum_values( HKEY root, const WCHAR *subkey, VARIANT *names, VARI TRACE("%p, %s\n", root, debugstr_w(subkey)); - if ((res = RegOpenKeyExW( root, subkey, 0, KEY_QUERY_VALUE | reg_get_access_mask( context ), &hkey ))) goto done; + if ((res = RegOpenKeyExW( root, subkey, 0, KEY_QUERY_VALUE | get_access_mask( context ), &hkey ))) goto done; if ((res = RegQueryInfoKeyW( hkey, NULL, NULL, NULL, NULL, NULL, NULL, &count, &buflen, NULL, NULL, NULL ))) goto done; @@ -395,7 +395,7 @@ static HRESULT get_stringvalue( HKEY root, const WCHAR *subkey, const WCHAR *nam TRACE("%p, %s, %s\n", root, debugstr_w(subkey), debugstr_w(name)); - mask = reg_get_access_mask( context ); + mask = get_access_mask( context ); if (mask & KEY_WOW64_64KEY) flags |= RRF_SUBKEY_WOW6464KEY; @@ -504,7 +504,7 @@ static HRESULT get_binaryvalue( HKEY root, const WCHAR *subkey, const WCHAR *nam TRACE("%p, %s, %s\n", root, debugstr_w(subkey), debugstr_w(name)); - mask = reg_get_access_mask( context ); + mask = get_access_mask( context ); if (mask & KEY_WOW64_64KEY) flags |= RRF_SUBKEY_WOW6464KEY; @@ -592,7 +592,7 @@ static void set_stringvalue( HKEY root, const WCHAR *subkey, const WCHAR *name, TRACE("%p, %s, %s, %s\n", root, debugstr_w(subkey), debugstr_w(name), debugstr_w(value)); - if ((res = RegOpenKeyExW( root, subkey, 0, KEY_SET_VALUE | reg_get_access_mask( context ), &hkey ))) + if ((res = RegOpenKeyExW( root, subkey, 0, KEY_SET_VALUE | get_access_mask( context ), &hkey ))) { set_variant( VT_UI4, res, NULL, retval ); return; @@ -675,7 +675,7 @@ static void set_dwordvalue( HKEY root, const WCHAR *subkey, const WCHAR *name, D TRACE( "%p, %s, %s, %#lx\n", root, debugstr_w(subkey), debugstr_w(name), value ); - if ((res = RegOpenKeyExW( root, subkey, 0, KEY_SET_VALUE | reg_get_access_mask( context ), &hkey ))) + if ((res = RegOpenKeyExW( root, subkey, 0, KEY_SET_VALUE | get_access_mask( context ), &hkey ))) { set_variant( VT_UI4, res, NULL, retval ); return; @@ -752,7 +752,7 @@ static void delete_key( HKEY root, const WCHAR *subkey, IWbemContext *context, V TRACE("%p, %s\n", root, debugstr_w(subkey)); - res = RegDeleteKeyExW( root, subkey, reg_get_access_mask( context ), 0 ); + res = RegDeleteKeyExW( root, subkey, get_access_mask( context ), 0 ); set_variant( VT_UI4, res, NULL, retval ); }

1 0

Evan Tang : secur32: Schannel AcceptSecurityContext support.
by Alexandre Julliard Jan. 26, 2023

Jan. 26, 2023

Module: wine Branch: master Commit: 24e276a92860131749e9f792784bfc6407874576 URL: https://gitlab.winehq.org/wine/wine/-/commit/24e276a92860131749e9f792784bfc… Author: Evan Tang <etang(a)codeweavers.com> Date: Tue Dec 6 11:58:36 2022 -0600 secur32: Schannel AcceptSecurityContext support. --- dlls/secur32/schannel.c | 103 ++++++++++++++++++++++++++++------------- dlls/secur32/schannel_gnutls.c | 51 ++++++++++++++------ 2 files changed, 107 insertions(+), 47 deletions(-)

1 0

Evan Tang : secur32: Share code for schannel Acquire and AcceptCredentialsHandle.
by Alexandre Julliard Jan. 26, 2023

Jan. 26, 2023

Module: wine Branch: master Commit: ee0c01cb3b97d9e3ded414f5f02452923217476b URL: https://gitlab.winehq.org/wine/wine/-/commit/ee0c01cb3b97d9e3ded414f5f02452… Author: Evan Tang <etang(a)codeweavers.com> Date: Wed Dec 7 11:30:32 2022 -0600 secur32: Share code for schannel Acquire and AcceptCredentialsHandle. --- dlls/secur32/schannel.c | 161 +++++++++++++++++++----------------------------- 1 file changed, 65 insertions(+), 96 deletions(-)

1 0

Evan Tang : secur32: Fix schannel AcquireCredentialsHandle algorithm mismatch error return.
by Alexandre Julliard Jan. 26, 2023

Jan. 26, 2023

Module: wine Branch: master Commit: 610fd134b71c27e3c09b7345032dfe29c5a31850 URL: https://gitlab.winehq.org/wine/wine/-/commit/610fd134b71c27e3c09b7345032dfe… Author: Evan Tang <etang(a)codeweavers.com> Date: Wed Dec 7 11:32:23 2022 -0600 secur32: Fix schannel AcquireCredentialsHandle algorithm mismatch error return. --- dlls/secur32/schannel.c | 13 ++++++++----- dlls/secur32/tests/schannel.c | 33 ++++++++++++++++++++++++++++++++- 2 files changed, 40 insertions(+), 6 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 0d07286cf11..6b5df3520a7 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -555,16 +555,15 @@ static SECURITY_STATUS acquire_credentials_handle(ULONG fCredentialUse, if (schanCred) { - const unsigned dtls_protocols = SP_PROT_DTLS_CLIENT | SP_PROT_DTLS1_2_CLIENT; - const unsigned tls_protocols = SP_PROT_TLS1_CLIENT | SP_PROT_TLS1_0_CLIENT | SP_PROT_TLS1_1_CLIENT | - SP_PROT_TLS1_2_CLIENT | SP_PROT_TLS1_3_CLIENT; + const unsigned dtls_protocols = SP_PROT_DTLS1_X; + const unsigned non_dtls_protocols = (SP_PROT_X_CLIENTS | SP_PROT_X_SERVERS) & ~SP_PROT_DTLS1_X; status = get_cert(schanCred, &cert); if (status != SEC_E_OK && status != SEC_E_NO_CREDENTIALS) return status; cred_enabled_protocols = get_enabled_protocols(schanCred); - if ((cred_enabled_protocols & tls_protocols) && + if ((cred_enabled_protocols & non_dtls_protocols) && (cred_enabled_protocols & dtls_protocols)) return SEC_E_ALGORITHM_MISMATCH; status = SEC_E_OK; @@ -579,9 +578,13 @@ static SECURITY_STATUS acquire_credentials_handle(ULONG fCredentialUse, enabled_protocols = cred_enabled_protocols & config_enabled_protocols; else enabled_protocols = config_enabled_protocols & ~config_default_disabled_protocols; + if (!(fCredentialUse & SECPKG_CRED_OUTBOUND)) + enabled_protocols &= ~SP_PROT_X_CLIENTS; + if (!(fCredentialUse & SECPKG_CRED_INBOUND)) + enabled_protocols &= ~SP_PROT_X_SERVERS; if(!enabled_protocols) { ERR("Could not find matching protocol\n"); - return SEC_E_NO_AUTHENTICATING_AUTHORITY; + return SEC_E_ALGORITHM_MISMATCH; } if (!(creds = malloc(sizeof(*creds)))) return SEC_E_INSUFFICIENT_MEMORY; diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index 33915351cb3..455fcb97aa7 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -351,6 +351,8 @@ static void testAcquireSecurityContext(void) ok(st == SEC_E_OK, "AcquireCredentialsHandleA failed: %08lx\n", st); if(st == SEC_E_OK) FreeCredentialsHandle(&cred); + st = AcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_INBOUND, NULL, NULL, NULL, NULL, &cred, NULL); + ok(st == SEC_E_NO_CREDENTIALS, "st = %08lx\n", st); memset(&cred, 0, sizeof(cred)); st = AcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_OUTBOUND, NULL, NULL, NULL, NULL, &cred, &exp); @@ -363,6 +365,22 @@ static void testAcquireSecurityContext(void) FreeCredentialsHandle(&cred); + /* Should fail if no enabled protocols are available */ + init_cred(&schanCred); + schanCred.grbitEnabledProtocols = SP_PROT_TLS1_X_SERVER; + st = AcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_OUTBOUND, NULL, &schanCred, NULL, NULL, &cred, &exp); + ok(st == SEC_E_ALGORITHM_MISMATCH, "st = %08lx\n", st); + st = AcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_INBOUND, NULL, &schanCred, NULL, NULL, &cred, &exp); + ok(st == SEC_E_OK, "AcquireCredentialsHandleA failed: %08lx\n", st); + FreeCredentialsHandle(&cred); + + schanCred.grbitEnabledProtocols = SP_PROT_TLS1_X_CLIENT; + st = AcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_OUTBOUND, NULL, &schanCred, NULL, NULL, &cred, &exp); + ok(st == SEC_E_OK, "AcquireCredentialsHandleA failed: %08lx\n", st); + FreeCredentialsHandle(&cred); + st = AcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_INBOUND, NULL, &schanCred, NULL, NULL, &cred, &exp); + ok(st == SEC_E_ALGORITHM_MISMATCH, "st = %08lx\n", st); + /* Bad version in SCHANNEL_CRED */ memset(&schanCred, 0, sizeof(schanCred)); st = AcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_OUTBOUND, @@ -1668,7 +1686,7 @@ static void test_dtls(void) SECURITY_STATUS status; TimeStamp exp; SCHANNEL_CRED cred; - CredHandle cred_handle; + CredHandle cred_handle, cred_handle2; CtxtHandle ctx_handle, ctx_handle2; SecBufferDesc buffers[3]; ULONG flags_req, flags_ret, attr, prev_buf_len; @@ -1687,6 +1705,19 @@ static void test_dtls(void) } ok( status == SEC_E_OK, "got %08lx\n", status ); + /* Should fail if both DTLS and TLS protocols are requested */ + cred.grbitEnabledProtocols |= SP_PROT_TLS1_CLIENT; + status = AcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_OUTBOUND, NULL, &cred, NULL, NULL, &cred_handle2, &exp); + ok(status == SEC_E_ALGORITHM_MISMATCH, "status = %08lx\n", status); + + cred.grbitEnabledProtocols = SP_PROT_DTLS1_X_CLIENT | SP_PROT_TLS1_SERVER; + status = AcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_OUTBOUND, NULL, &cred, NULL, NULL, &cred_handle2, &exp); + ok(status == SEC_E_ALGORITHM_MISMATCH, "status = got %08lx\n", status); + + cred.grbitEnabledProtocols = SP_PROT_DTLS1_X_CLIENT | SP_PROT_SSL3_SERVER; + status = AcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_OUTBOUND, NULL, &cred, NULL, NULL, &cred_handle2, &exp); + ok(status == SEC_E_ALGORITHM_MISMATCH, "status = got %08lx\n", status); + flags_req = ISC_REQ_MANUAL_CRED_VALIDATION | ISC_REQ_EXTENDED_ERROR | ISC_REQ_DATAGRAM | ISC_REQ_USE_SUPPLIED_CREDS | ISC_REQ_CONFIDENTIALITY | ISC_REQ_SEQUENCE_DETECT | ISC_REQ_REPLAY_DETECT; test_context_output_buffer_size(SP_PROT_DTLS_CLIENT | SP_PROT_DTLS1_2_CLIENT, SCH_CRED_NO_DEFAULT_CREDS, flags_req);

1 0

Nikolay Sivov : ktmw32: Use syscall interface for transaction objects stubs.
by Alexandre Julliard Jan. 26, 2023

Jan. 26, 2023

Module: wine Branch: master Commit: 5267fccae6bd10d899bbc41e1efc5d1113ba062b URL: https://gitlab.winehq.org/wine/wine/-/commit/5267fccae6bd10d899bbc41e1efc5d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 9 20:05:15 2022 +0300 ktmw32: Use syscall interface for transaction objects stubs. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ktmw32/ktmw32_main.c | 46 ++++++++++++++++++++++++++++------------ dlls/ntdll/ntdll.spec | 3 +++ dlls/ntdll/unix/loader.c | 3 +++ dlls/ntdll/unix/sync.c | 34 +++++++++++++++++++++++++++++ dlls/wow64/sync.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/wow64/syscall.h | 3 +++ include/winternl.h | 3 +++ 7 files changed, 133 insertions(+), 13 deletions(-)

1 0