- Wine-Devel - list.winehq.org

[PATCH 01/11] gdi32: Fix NT prefix handling in update_external_font_keys.
by Jacek Caban Sept. 29, 2021

Sept. 29, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/font.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

2 1

[PATCH 2/2] secur32: Don't allocate new handles in the wrapper.
by Hans Leidekker Sept. 29, 2021

Sept. 29, 2021

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/secur32/wrapper.c | 292 ++++++++--------------------------------- 1 file changed, 52 insertions(+), 240 deletions(-) diff --git a/dlls/secur32/wrapper.c b/dlls/secur32/wrapper.c index 4748de83d4f..e4475069b86 100644 --- a/dlls/secur32/wrapper.c +++ b/dlls/secur32/wrapper.c @@ -30,34 +30,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(secur32); -/* Tries to allocate a new SecHandle, into which it stores package (in - * phSec->dwUpper) and a copy of realHandle (stored in phSec->dwLower). - * SecHandle is equivalent to both a CredHandle and a CtxtHandle. - */ -static SECURITY_STATUS make_sec_handle(PSecHandle phSec, SecurePackage *package, PSecHandle realHandle) -{ - SECURITY_STATUS ret; - - TRACE("%p %p %p\n", phSec, package, realHandle); - - if (phSec && package && realHandle) - { - PSecHandle newSec = malloc(sizeof(*newSec)); - if (newSec) - { - *newSec = *realHandle; - phSec->dwUpper = (ULONG_PTR)package; - phSec->dwLower = (ULONG_PTR)newSec; - ret = SEC_E_OK; - } - else - ret = SEC_E_INSUFFICIENT_MEMORY; - } - else - ret = SEC_E_INVALID_HANDLE; - return ret; -} - /*********************************************************************** * AcquireCredentialsHandleA (SECUR32.@) */ @@ -74,24 +46,16 @@ SECURITY_STATUS WINAPI AcquireCredentialsHandleA( if (pszPackage) { SecurePackage *package = SECUR32_findPackageA(pszPackage); - if (package && package->provider) { if (package->provider->fnTableA.AcquireCredentialsHandleA) { - CredHandle myCred; - ret = package->provider->fnTableA.AcquireCredentialsHandleA( pszPrincipal, pszPackage, fCredentialsUse, pvLogonID, - pAuthData, pGetKeyFn, pvGetKeyArgument, &myCred, + pAuthData, pGetKeyFn, pvGetKeyArgument, phCredential, ptsExpiry); if (ret == SEC_E_OK) - { - ret = make_sec_handle(phCredential, package, &myCred); - if (ret != SEC_E_OK) - package->provider->fnTableW.FreeCredentialsHandle( - &myCred); - } + phCredential->dwUpper = (ULONG_PTR)package; } else ret = SEC_E_UNSUPPORTED_FUNCTION; @@ -120,24 +84,16 @@ SECURITY_STATUS WINAPI AcquireCredentialsHandleW( if (pszPackage) { SecurePackage *package = SECUR32_findPackageW(pszPackage); - if (package && package->provider) { if (package->provider->fnTableW.AcquireCredentialsHandleW) { - CredHandle myCred; - ret = package->provider->fnTableW.AcquireCredentialsHandleW( pszPrincipal, pszPackage, fCredentialsUse, pvLogonID, - pAuthData, pGetKeyFn, pvGetKeyArgument, &myCred, + pAuthData, pGetKeyFn, pvGetKeyArgument, phCredential, ptsExpiry); if (ret == SEC_E_OK) - { - ret = make_sec_handle(phCredential, package, &myCred); - if (ret != SEC_E_OK) - package->provider->fnTableW.FreeCredentialsHandle( - &myCred); - } + phCredential->dwUpper = (ULONG_PTR)package; } else ret = SEC_E_UNSUPPORTED_FUNCTION; @@ -162,14 +118,10 @@ SECURITY_STATUS WINAPI FreeCredentialsHandle( if (phCredential) { SecurePackage *package = (SecurePackage *)phCredential->dwUpper; - PCredHandle cred = (PCredHandle)phCredential->dwLower; - - if (package && package->provider && - package->provider->fnTableW.FreeCredentialsHandle) - ret = package->provider->fnTableW.FreeCredentialsHandle(cred); + if (package && package->provider && package->provider->fnTableW.FreeCredentialsHandle) + ret = package->provider->fnTableW.FreeCredentialsHandle(phCredential); else ret = SEC_E_INVALID_HANDLE; - free(cred); } else ret = SEC_E_INVALID_HANDLE; @@ -188,13 +140,11 @@ SECURITY_STATUS WINAPI QueryCredentialsAttributesA( if (phCredential) { SecurePackage *package = (SecurePackage *)phCredential->dwUpper; - PCredHandle cred = (PCredHandle)phCredential->dwLower; - if (package && package->provider) { if (package->provider->fnTableA.QueryCredentialsAttributesA) ret = package->provider->fnTableA.QueryCredentialsAttributesA( - cred, ulAttribute, pBuffer); + phCredential, ulAttribute, pBuffer); else ret = SEC_E_UNSUPPORTED_FUNCTION; } @@ -218,13 +168,10 @@ SECURITY_STATUS WINAPI QueryCredentialsAttributesW( if (phCredential) { SecurePackage *package = (SecurePackage *)phCredential->dwUpper; - PCredHandle cred = (PCredHandle)phCredential->dwLower; - if (package && package->provider) { if (package->provider->fnTableW.QueryCredentialsAttributesW) - ret = package->provider->fnTableW.QueryCredentialsAttributesW( - cred, ulAttribute, pBuffer); + ret = package->provider->fnTableW.QueryCredentialsAttributesW(phCredential, ulAttribute, pBuffer); else ret = SEC_E_UNSUPPORTED_FUNCTION; } @@ -248,49 +195,24 @@ SECURITY_STATUS WINAPI InitializeSecurityContextA( { SECURITY_STATUS ret; SecurePackage *package = NULL; - PCredHandle cred = NULL; - PCredHandle ctxt = NULL; TRACE("%p %p %s 0x%08x %d %d %p %d %p %p %p %p\n", phCredential, phContext, debugstr_a(pszTargetName), fContextReq, Reserved1, TargetDataRep, pInput, Reserved1, phNewContext, pOutput, pfContextAttr, ptsExpiry); - if (phContext) - { - package = (SecurePackage *)phContext->dwUpper; - ctxt = (PCtxtHandle)phContext->dwLower; - } - if (phCredential) - { - package = (SecurePackage *)phCredential->dwUpper; - cred = (PCredHandle)phCredential->dwLower; - } + if (phContext) package = (SecurePackage *)phContext->dwUpper; + else if (phCredential) package = (SecurePackage *)phCredential->dwUpper; if (package && package->provider) { if (package->provider->fnTableA.InitializeSecurityContextA) { - CtxtHandle myCtxt; - - if (phContext) - { - PCtxtHandle realCtxt = (PCtxtHandle)phContext->dwLower; - myCtxt.dwUpper = realCtxt->dwUpper; - myCtxt.dwLower = realCtxt->dwLower; - } - ret = package->provider->fnTableA.InitializeSecurityContextA( - cred, ctxt, pszTargetName, fContextReq, - Reserved1, TargetDataRep, pInput, Reserved2, phNewContext ? &myCtxt : NULL, + phCredential, phContext, pszTargetName, fContextReq, + Reserved1, TargetDataRep, pInput, Reserved2, phNewContext, pOutput, pfContextAttr, ptsExpiry); - if ((ret == SEC_E_OK || ret == SEC_I_CONTINUE_NEEDED) && - phNewContext && phNewContext != phContext) - { - SECURITY_STATUS ret2; - ret2 = make_sec_handle(phNewContext, package, &myCtxt); - if (ret2 != SEC_E_OK) - package->provider->fnTableA.DeleteSecurityContext(&myCtxt); - } + if ((ret == SEC_E_OK || ret == SEC_I_CONTINUE_NEEDED) && phNewContext) + phNewContext->dwUpper = (ULONG_PTR)package; } else ret = SEC_E_UNSUPPORTED_FUNCTION; @@ -312,49 +234,24 @@ SECURITY_STATUS WINAPI InitializeSecurityContextW( { SECURITY_STATUS ret; SecurePackage *package = NULL; - PCredHandle cred = NULL; - PCredHandle ctxt = NULL; TRACE("%p %p %s 0x%08x %d %d %p %d %p %p %p %p\n", phCredential, phContext, debugstr_w(pszTargetName), fContextReq, Reserved1, TargetDataRep, pInput, Reserved1, phNewContext, pOutput, pfContextAttr, ptsExpiry); - if (phContext) - { - package = (SecurePackage *)phContext->dwUpper; - ctxt = (PCtxtHandle)phContext->dwLower; - } - if (phCredential) - { - package = (SecurePackage *)phCredential->dwUpper; - cred = (PCredHandle)phCredential->dwLower; - } + if (phContext) package = (SecurePackage *)phContext->dwUpper; + else if (phCredential) package = (SecurePackage *)phCredential->dwUpper; if (package && package->provider) { if (package->provider->fnTableW.InitializeSecurityContextW) { - CtxtHandle myCtxt; - - if (phContext) - { - PCtxtHandle realCtxt = (PCtxtHandle)phContext->dwLower; - myCtxt.dwUpper = realCtxt->dwUpper; - myCtxt.dwLower = realCtxt->dwLower; - } - ret = package->provider->fnTableW.InitializeSecurityContextW( - cred, ctxt, pszTargetName, fContextReq, - Reserved1, TargetDataRep, pInput, Reserved2, phNewContext ? &myCtxt : NULL, + phCredential, phContext, pszTargetName, fContextReq, + Reserved1, TargetDataRep, pInput, Reserved2, phNewContext, pOutput, pfContextAttr, ptsExpiry); - if ((ret == SEC_E_OK || ret == SEC_I_CONTINUE_NEEDED) && - phNewContext && phNewContext != phContext) - { - SECURITY_STATUS ret2; - ret2 = make_sec_handle(phNewContext, package, &myCtxt); - if (ret2 != SEC_E_OK) - package->provider->fnTableW.DeleteSecurityContext(&myCtxt); - } + if ((ret == SEC_E_OK || ret == SEC_I_CONTINUE_NEEDED) && phNewContext) + phNewContext->dwUpper = (ULONG_PTR)package; } else ret = SEC_E_UNSUPPORTED_FUNCTION; @@ -380,34 +277,15 @@ SECURITY_STATUS WINAPI AcceptSecurityContext( if (phCredential) { SecurePackage *package = (SecurePackage *)phCredential->dwUpper; - PCredHandle cred = (PCredHandle)phCredential->dwLower; - if (package && package->provider) { if (package->provider->fnTableW.AcceptSecurityContext) { - CtxtHandle myCtxt; - - if(phContext) - { - PCtxtHandle realCtxt = (PCtxtHandle)phContext->dwLower; - TRACE("realCtx: %p\n", realCtxt); - myCtxt.dwUpper = realCtxt->dwUpper; - myCtxt.dwLower = realCtxt->dwLower; - } - ret = package->provider->fnTableW.AcceptSecurityContext( - cred, phContext ? &myCtxt : NULL, pInput, fContextReq, - TargetDataRep, &myCtxt, pOutput, pfContextAttr, ptsExpiry); - if ((ret == SEC_E_OK || ret == SEC_I_CONTINUE_NEEDED) && - phNewContext && phNewContext != phContext) - { - SECURITY_STATUS ret2; - ret2 = make_sec_handle(phNewContext, package, &myCtxt); - if (ret2 != SEC_E_OK) - package->provider->fnTableW.DeleteSecurityContext( - &myCtxt); - } + phCredential, phContext, pInput, fContextReq, + TargetDataRep, phNewContext, pOutput, pfContextAttr, ptsExpiry); + if ((ret == SEC_E_OK || ret == SEC_I_CONTINUE_NEEDED) && phNewContext) + phNewContext->dwUpper = (ULONG_PTR)package; } else ret = SEC_E_UNSUPPORTED_FUNCTION; @@ -432,13 +310,10 @@ SECURITY_STATUS WINAPI CompleteAuthToken(PCtxtHandle phContext, if (phContext) { SecurePackage *package = (SecurePackage *)phContext->dwUpper; - PCtxtHandle ctxt = (PCtxtHandle)phContext->dwLower; - if (package && package->provider) { if (package->provider->fnTableW.CompleteAuthToken) - ret = package->provider->fnTableW.CompleteAuthToken(ctxt, - pToken); + ret = package->provider->fnTableW.CompleteAuthToken(phContext, pToken); else ret = SEC_E_UNSUPPORTED_FUNCTION; } @@ -461,14 +336,10 @@ SECURITY_STATUS WINAPI DeleteSecurityContext(PCtxtHandle phContext) if (phContext) { SecurePackage *package = (SecurePackage *)phContext->dwUpper; - PCtxtHandle ctxt = (PCtxtHandle)phContext->dwLower; - - if (package && package->provider && - package->provider->fnTableW.DeleteSecurityContext) - ret = package->provider->fnTableW.DeleteSecurityContext(ctxt); + if (package && package->provider && package->provider->fnTableW.DeleteSecurityContext) + ret = package->provider->fnTableW.DeleteSecurityContext(phContext); else ret = SEC_E_INVALID_HANDLE; - free(ctxt); } else ret = SEC_E_INVALID_HANDLE; @@ -487,13 +358,10 @@ SECURITY_STATUS WINAPI ApplyControlToken(PCtxtHandle phContext, if (phContext) { SecurePackage *package = (SecurePackage *)phContext->dwUpper; - PCtxtHandle ctxt = (PCtxtHandle)phContext->dwLower; - if (package && package->provider) { if (package->provider->fnTableW.ApplyControlToken) - ret = package->provider->fnTableW.ApplyControlToken( - ctxt, pInput); + ret = package->provider->fnTableW.ApplyControlToken(phContext, pInput); else ret = SEC_E_UNSUPPORTED_FUNCTION; } @@ -517,13 +385,10 @@ SECURITY_STATUS WINAPI QueryContextAttributesA(PCtxtHandle phContext, if (phContext) { SecurePackage *package = (SecurePackage *)phContext->dwUpper; - PCtxtHandle ctxt = (PCtxtHandle)phContext->dwLower; - if (package && package->provider) { if (package->provider->fnTableA.QueryContextAttributesA) - ret = package->provider->fnTableA.QueryContextAttributesA( - ctxt, ulAttribute, pBuffer); + ret = package->provider->fnTableA.QueryContextAttributesA(phContext, ulAttribute, pBuffer); else ret = SEC_E_UNSUPPORTED_FUNCTION; } @@ -547,13 +412,10 @@ SECURITY_STATUS WINAPI QueryContextAttributesW(PCtxtHandle phContext, if (phContext) { SecurePackage *package = (SecurePackage *)phContext->dwUpper; - PCtxtHandle ctxt = (PCtxtHandle)phContext->dwLower; - if (package && package->provider) { if (package->provider->fnTableW.QueryContextAttributesW) - ret = package->provider->fnTableW.QueryContextAttributesW( - ctxt, ulAttribute, pBuffer); + ret = package->provider->fnTableW.QueryContextAttributesW(phContext, ulAttribute, pBuffer); else ret = SEC_E_UNSUPPORTED_FUNCTION; } @@ -576,13 +438,10 @@ SECURITY_STATUS WINAPI ImpersonateSecurityContext(PCtxtHandle phContext) if (phContext) { SecurePackage *package = (SecurePackage *)phContext->dwUpper; - PCtxtHandle ctxt = (PCtxtHandle)phContext->dwLower; - if (package && package->provider) { if (package->provider->fnTableW.ImpersonateSecurityContext) - ret = package->provider->fnTableW.ImpersonateSecurityContext( - ctxt); + ret = package->provider->fnTableW.ImpersonateSecurityContext(phContext); else ret = SEC_E_UNSUPPORTED_FUNCTION; } @@ -605,13 +464,10 @@ SECURITY_STATUS WINAPI RevertSecurityContext(PCtxtHandle phContext) if (phContext) { SecurePackage *package = (SecurePackage *)phContext->dwUpper; - PCtxtHandle ctxt = (PCtxtHandle)phContext->dwLower; - if (package && package->provider) { if (package->provider->fnTableW.RevertSecurityContext) - ret = package->provider->fnTableW.RevertSecurityContext( - ctxt); + ret = package->provider->fnTableW.RevertSecurityContext(phContext); else ret = SEC_E_UNSUPPORTED_FUNCTION; } @@ -635,13 +491,10 @@ SECURITY_STATUS WINAPI MakeSignature(PCtxtHandle phContext, ULONG fQOP, if (phContext) { SecurePackage *package = (SecurePackage *)phContext->dwUpper; - PCtxtHandle ctxt = (PCtxtHandle)phContext->dwLower; - if (package && package->provider) { if (package->provider->fnTableW.MakeSignature) - ret = package->provider->fnTableW.MakeSignature( - ctxt, fQOP, pMessage, MessageSeqNo); + ret = package->provider->fnTableW.MakeSignature(phContext, fQOP, pMessage, MessageSeqNo); else ret = SEC_E_UNSUPPORTED_FUNCTION; } @@ -665,13 +518,10 @@ SECURITY_STATUS WINAPI VerifySignature(PCtxtHandle phContext, if (phContext) { SecurePackage *package = (SecurePackage *)phContext->dwUpper; - PCtxtHandle ctxt = (PCtxtHandle)phContext->dwLower; - if (package && package->provider) { if (package->provider->fnTableW.VerifySignature) - ret = package->provider->fnTableW.VerifySignature( - ctxt, pMessage, MessageSeqNo, pfQOP); + ret = package->provider->fnTableW.VerifySignature(phContext, pMessage, MessageSeqNo, pfQOP); else ret = SEC_E_UNSUPPORTED_FUNCTION; } @@ -819,13 +669,10 @@ SECURITY_STATUS WINAPI ExportSecurityContext(PCtxtHandle phContext, if (phContext) { SecurePackage *package = (SecurePackage *)phContext->dwUpper; - PCtxtHandle ctxt = (PCtxtHandle)phContext->dwLower; - if (package && package->provider) { if (package->provider->fnTableW.ExportSecurityContext) - ret = package->provider->fnTableW.ExportSecurityContext( - ctxt, fFlags, pPackedContext, pToken); + ret = package->provider->fnTableW.ExportSecurityContext(phContext, fFlags, pPackedContext, pToken); else ret = SEC_E_UNSUPPORTED_FUNCTION; } @@ -846,22 +693,14 @@ SECURITY_STATUS WINAPI ImportSecurityContextA(SEC_CHAR *pszPackage, SECURITY_STATUS ret; SecurePackage *package = SECUR32_findPackageA(pszPackage); - TRACE("%s %p %p %p\n", debugstr_a(pszPackage), pPackedContext, Token, - phContext); + TRACE("%s %p %p %p\n", debugstr_a(pszPackage), pPackedContext, Token, phContext); if (package && package->provider) { if (package->provider->fnTableA.ImportSecurityContextA) { - CtxtHandle myCtxt; - - ret = package->provider->fnTableA.ImportSecurityContextA( - pszPackage, pPackedContext, Token, &myCtxt); + ret = package->provider->fnTableA.ImportSecurityContextA(pszPackage, pPackedContext, Token, phContext); if (ret == SEC_E_OK) - { - ret = make_sec_handle(phContext, package, &myCtxt); - if (ret != SEC_E_OK) - package->provider->fnTableW.DeleteSecurityContext(&myCtxt); - } + phContext->dwUpper = (ULONG_PTR)package; } else ret = SEC_E_UNSUPPORTED_FUNCTION; @@ -881,22 +720,14 @@ SECURITY_STATUS WINAPI ImportSecurityContextW(SEC_WCHAR *pszPackage, SECURITY_STATUS ret; SecurePackage *package = SECUR32_findPackageW(pszPackage); - TRACE("%s %p %p %p\n", debugstr_w(pszPackage), pPackedContext, Token, - phContext); + TRACE("%s %p %p %p\n", debugstr_w(pszPackage), pPackedContext, Token, phContext); if (package && package->provider) { if (package->provider->fnTableW.ImportSecurityContextW) { - CtxtHandle myCtxt; - - ret = package->provider->fnTableW.ImportSecurityContextW( - pszPackage, pPackedContext, Token, &myCtxt); + ret = package->provider->fnTableW.ImportSecurityContextW(pszPackage, pPackedContext, Token, phContext); if (ret == SEC_E_OK) - { - ret = make_sec_handle(phContext, package, &myCtxt); - if (ret != SEC_E_OK) - package->provider->fnTableW.DeleteSecurityContext(&myCtxt); - } + phContext->dwUpper = (ULONG_PTR)package; } else ret = SEC_E_UNSUPPORTED_FUNCTION; @@ -922,14 +753,12 @@ SECURITY_STATUS WINAPI AddCredentialsA(PCredHandle hCredentials, if (hCredentials) { SecurePackage *package = (SecurePackage *)hCredentials->dwUpper; - PCredHandle cred = (PCtxtHandle)hCredentials->dwLower; - if (package && package->provider) { if (package->provider->fnTableA.AddCredentialsA) - ret = package->provider->fnTableA.AddCredentialsA( - cred, pszPrincipal, pszPackage, fCredentialUse, pAuthData, - pGetKeyFn, pvGetKeyArgument, ptsExpiry); + ret = package->provider->fnTableA.AddCredentialsA(hCredentials, pszPrincipal, pszPackage, + fCredentialUse, pAuthData, pGetKeyFn, + pvGetKeyArgument, ptsExpiry); else ret = SEC_E_UNSUPPORTED_FUNCTION; } @@ -957,14 +786,12 @@ SECURITY_STATUS WINAPI AddCredentialsW(PCredHandle hCredentials, if (hCredentials) { SecurePackage *package = (SecurePackage *)hCredentials->dwUpper; - PCredHandle cred = (PCtxtHandle)hCredentials->dwLower; - if (package && package->provider) { if (package->provider->fnTableW.AddCredentialsW) - ret = package->provider->fnTableW.AddCredentialsW( - cred, pszPrincipal, pszPackage, fCredentialUse, pAuthData, - pGetKeyFn, pvGetKeyArgument, ptsExpiry); + ret = package->provider->fnTableW.AddCredentialsW(hCredentials, pszPrincipal, pszPackage, + fCredentialUse, pAuthData, pGetKeyFn, + pvGetKeyArgument, ptsExpiry); else ret = SEC_E_UNSUPPORTED_FUNCTION; } @@ -988,13 +815,10 @@ SECURITY_STATUS WINAPI QuerySecurityContextToken(PCtxtHandle phContext, if (phContext) { SecurePackage *package = (SecurePackage *)phContext->dwUpper; - PCtxtHandle ctxt = (PCtxtHandle)phContext->dwLower; - if (package && package->provider) { if (package->provider->fnTableW.QuerySecurityContextToken) - ret = package->provider->fnTableW.QuerySecurityContextToken( - ctxt, phToken); + ret = package->provider->fnTableW.QuerySecurityContextToken(phContext, phToken); else ret = SEC_E_UNSUPPORTED_FUNCTION; } @@ -1018,13 +842,10 @@ SECURITY_STATUS WINAPI EncryptMessage(PCtxtHandle phContext, ULONG fQOP, if (phContext) { SecurePackage *package = (SecurePackage *)phContext->dwUpper; - PCtxtHandle ctxt = (PCtxtHandle)phContext->dwLower; - if (package && package->provider) { if (package->provider->fnTableW.EncryptMessage) - ret = package->provider->fnTableW.EncryptMessage( - ctxt, fQOP, pMessage, MessageSeqNo); + ret = package->provider->fnTableW.EncryptMessage(phContext, fQOP, pMessage, MessageSeqNo); else ret = SEC_E_UNSUPPORTED_FUNCTION; } @@ -1048,13 +869,10 @@ SECURITY_STATUS WINAPI DecryptMessage(PCtxtHandle phContext, if (phContext) { SecurePackage *package = (SecurePackage *)phContext->dwUpper; - PCtxtHandle ctxt = (PCtxtHandle)phContext->dwLower; - if (package && package->provider) { if (package->provider->fnTableW.DecryptMessage) - ret = package->provider->fnTableW.DecryptMessage( - ctxt, pMessage, MessageSeqNo, pfQOP); + ret = package->provider->fnTableW.DecryptMessage(phContext, pMessage, MessageSeqNo, pfQOP); else ret = SEC_E_UNSUPPORTED_FUNCTION; } @@ -1078,13 +896,10 @@ SECURITY_STATUS WINAPI SetContextAttributesA(PCtxtHandle phContext, if (phContext) { SecurePackage *package = (SecurePackage *)phContext->dwUpper; - PCtxtHandle ctxt = (PCtxtHandle)phContext->dwLower; - if (package && package->provider) { if (package->provider->fnTableA.SetContextAttributesA) - ret = package->provider->fnTableA.SetContextAttributesA( - ctxt, ulAttribute, pBuffer, cbBuffer); + ret = package->provider->fnTableA.SetContextAttributesA(phContext, ulAttribute, pBuffer, cbBuffer); else ret = SEC_E_UNSUPPORTED_FUNCTION; } @@ -1108,13 +923,10 @@ SECURITY_STATUS WINAPI SetContextAttributesW(PCtxtHandle phContext, if (phContext) { SecurePackage *package = (SecurePackage *)phContext->dwUpper; - PCtxtHandle ctxt = (PCtxtHandle)phContext->dwLower; - if (package && package->provider) { if (package->provider->fnTableW.SetContextAttributesW) - ret = package->provider->fnTableW.SetContextAttributesW( - ctxt, ulAttribute, pBuffer, cbBuffer); + ret = package->provider->fnTableW.SetContextAttributesW(phContext, ulAttribute, pBuffer, cbBuffer); else ret = SEC_E_UNSUPPORTED_FUNCTION; } -- 2.30.2

1 0

[PATCH 1/2] secur32: Store LSA package and handle in the credential/context handle's dwLower field.
by Hans Leidekker Sept. 29, 2021

Sept. 29, 2021

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/secur32/lsa.c | 207 ++++++++++++++++++++++----------------------- 1 file changed, 103 insertions(+), 104 deletions(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index 74eba65e10c..bd3cac4704f 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -39,7 +39,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(secur32); -#define LSA_MAGIC ('L' << 24 | 'S' << 16 | 'A' << 8 | ' ') +#define LSA_MAGIC_CONNECTION ('L' << 24 | 'S' << 16 | 'A' << 8 | '0') +#define LSA_MAGIC_CREDENTIALS ('L' << 24 | 'S' << 16 | 'A' << 8 | '1') +#define LSA_MAGIC_CONTEXT ('L' << 24 | 'S' << 16 | 'A' << 8 | '2') struct lsa_package { @@ -54,9 +56,11 @@ struct lsa_package static struct lsa_package *loaded_packages; static ULONG loaded_packages_count; -struct lsa_connection +struct lsa_handle { DWORD magic; + struct lsa_package *package; + LSA_SEC_HANDLE handle; }; static const char *debugstr_as(const LSA_STRING *str) @@ -89,21 +93,21 @@ NTSTATUS WINAPI LsaCallAuthenticationPackage(HANDLE lsa_handle, ULONG package_id return STATUS_INVALID_PARAMETER; } -static struct lsa_connection *alloc_lsa_connection(void) +static struct lsa_handle *alloc_lsa_handle(ULONG magic) { - struct lsa_connection *ret; - if (!(ret = malloc(sizeof(*ret)))) return NULL; - ret->magic = LSA_MAGIC; + struct lsa_handle *ret; + if (!(ret = calloc(1, sizeof(*ret)))) return NULL; + ret->magic = magic; return ret; } NTSTATUS WINAPI LsaConnectUntrusted(PHANDLE LsaHandle) { - struct lsa_connection *lsa_conn; + struct lsa_handle *lsa_conn; TRACE("%p\n", LsaHandle); - if (!(lsa_conn = alloc_lsa_connection())) return STATUS_NO_MEMORY; + if (!(lsa_conn = alloc_lsa_handle(LSA_MAGIC_CONNECTION))) return STATUS_NO_MEMORY; *LsaHandle = lsa_conn; return STATUS_SUCCESS; } @@ -111,22 +115,22 @@ NTSTATUS WINAPI LsaConnectUntrusted(PHANDLE LsaHandle) NTSTATUS WINAPI LsaRegisterLogonProcess(PLSA_STRING LogonProcessName, PHANDLE LsaHandle, PLSA_OPERATIONAL_MODE SecurityMode) { - struct lsa_connection *lsa_conn; + struct lsa_handle *lsa_conn; FIXME("%s %p %p stub\n", debugstr_as(LogonProcessName), LsaHandle, SecurityMode); - if (!(lsa_conn = alloc_lsa_connection())) return STATUS_NO_MEMORY; + if (!(lsa_conn = alloc_lsa_handle(LSA_MAGIC_CONNECTION))) return STATUS_NO_MEMORY; *LsaHandle = lsa_conn; return STATUS_SUCCESS; } NTSTATUS WINAPI LsaDeregisterLogonProcess(HANDLE LsaHandle) { - struct lsa_connection *lsa_conn = (struct lsa_connection *)LsaHandle; + struct lsa_handle *lsa_conn = (struct lsa_handle *)LsaHandle; TRACE("%p\n", LsaHandle); - if (!lsa_conn || lsa_conn->magic != LSA_MAGIC) return STATUS_INVALID_HANDLE; + if (!lsa_conn || lsa_conn->magic != LSA_MAGIC_CONNECTION) return STATUS_INVALID_HANDLE; lsa_conn->magic = 0; free(lsa_conn); @@ -307,6 +311,7 @@ static SECURITY_STATUS WINAPI lsa_AcquireCredentialsHandleW( { SECURITY_STATUS status; struct lsa_package *lsa_package; + struct lsa_handle *lsa_handle; UNICODE_STRING principal_us; LSA_SEC_HANDLE lsa_credential; @@ -329,8 +334,11 @@ static SECURITY_STATUS WINAPI lsa_AcquireCredentialsHandleW( credentials_use, logon_id, auth_data, get_key_fn, get_key_arg, &lsa_credential, ts_expiry); if (status == SEC_E_OK) { - credential->dwLower = (ULONG_PTR)lsa_credential; - credential->dwUpper = (ULONG_PTR)lsa_package; + if (!(lsa_handle = alloc_lsa_handle(LSA_MAGIC_CREDENTIALS))) return STATUS_NO_MEMORY; + lsa_handle->package = lsa_package; + lsa_handle->handle = lsa_credential; + credential->dwLower = (ULONG_PTR)lsa_handle; + credential->dwUpper = 0; } return status; } @@ -411,21 +419,23 @@ done: static SECURITY_STATUS WINAPI lsa_FreeCredentialsHandle(CredHandle *credential) { - struct lsa_package *lsa_package; - LSA_SEC_HANDLE lsa_credential; + struct lsa_handle *lsa_cred; + SECURITY_STATUS status; TRACE("%p\n", credential); if (!credential) return SEC_E_INVALID_HANDLE; - lsa_package = (struct lsa_package *)credential->dwUpper; - lsa_credential = (LSA_SEC_HANDLE)credential->dwLower; - - if (!lsa_package) return SEC_E_INVALID_HANDLE; + lsa_cred = (struct lsa_handle *)credential->dwLower; + if (!lsa_cred || lsa_cred->magic != LSA_MAGIC_CREDENTIALS) return SEC_E_INVALID_HANDLE; - if (!lsa_package->lsa_api || !lsa_package->lsa_api->FreeCredentialsHandle) + if (!lsa_cred->package->lsa_api || !lsa_cred->package->lsa_api->FreeCredentialsHandle) return SEC_E_UNSUPPORTED_FUNCTION; - return lsa_package->lsa_api->FreeCredentialsHandle(lsa_credential); + status = lsa_cred->package->lsa_api->FreeCredentialsHandle(lsa_cred->handle); + + lsa_cred->magic = 0; + free(lsa_cred); + return status; } static SECURITY_STATUS WINAPI lsa_InitializeSecurityContextW( @@ -434,10 +444,11 @@ static SECURITY_STATUS WINAPI lsa_InitializeSecurityContextW( CtxtHandle *new_context, SecBufferDesc *output, ULONG *context_attr, TimeStamp *ts_expiry) { SECURITY_STATUS status; - struct lsa_package *lsa_package = NULL; - LSA_SEC_HANDLE lsa_credential = 0, lsa_context = 0, new_lsa_context; + struct lsa_handle *lsa_cred = NULL, *lsa_ctx = NULL, *new_lsa_ctx; + struct lsa_package *package = NULL; UNICODE_STRING target_name_us; BOOLEAN mapped_context; + LSA_SEC_HANDLE new_handle; TRACE("%p %p %s %#x %d %d %p %d %p %p %p %p\n", credential, context, debugstr_w(target_name), context_req, reserved1, target_data_rep, input, @@ -445,30 +456,34 @@ static SECURITY_STATUS WINAPI lsa_InitializeSecurityContextW( if (context) { - lsa_package = (struct lsa_package *)context->dwUpper; - lsa_context = (LSA_SEC_HANDLE)context->dwLower; + lsa_ctx = (struct lsa_handle *)context->dwLower; + if (lsa_ctx->magic != LSA_MAGIC_CONTEXT) return SEC_E_INVALID_HANDLE; + package = lsa_ctx->package; } else if (credential) { - lsa_package = (struct lsa_package *)credential->dwUpper; - lsa_credential = (LSA_SEC_HANDLE)credential->dwLower; + lsa_cred = (struct lsa_handle *)credential->dwLower; + if (lsa_cred->magic != LSA_MAGIC_CREDENTIALS) return SEC_E_INVALID_HANDLE; + package = lsa_cred->package; } + if (!package || !new_context) return SEC_E_INVALID_HANDLE; - if (!lsa_package || !new_context) return SEC_E_INVALID_HANDLE; - - if (!lsa_package->lsa_api || !lsa_package->lsa_api->InitLsaModeContext) + if (!package->lsa_api || !package->lsa_api->InitLsaModeContext) return SEC_E_UNSUPPORTED_FUNCTION; if (target_name) RtlInitUnicodeString(&target_name_us, target_name); - status = lsa_package->lsa_api->InitLsaModeContext(lsa_credential, lsa_context, - target_name ? &target_name_us : NULL, context_req, target_data_rep, input, - &new_lsa_context, output, context_attr, ts_expiry, &mapped_context, NULL /* FIXME */); + status = package->lsa_api->InitLsaModeContext(lsa_cred ? lsa_cred->handle : 0, + lsa_ctx ? lsa_ctx->handle : 0, target_name ? &target_name_us : NULL, context_req, target_data_rep, + input, &new_handle, output, context_attr, ts_expiry, &mapped_context, NULL /* FIXME */); if (status == SEC_E_OK || status == SEC_I_CONTINUE_NEEDED) { - new_context->dwLower = (ULONG_PTR)new_lsa_context; - new_context->dwUpper = (ULONG_PTR)lsa_package; + if (!(new_lsa_ctx = alloc_lsa_handle(LSA_MAGIC_CONTEXT))) return STATUS_NO_MEMORY; + new_lsa_ctx->package = package; + new_lsa_ctx->handle = new_handle; + new_context->dwLower = (ULONG_PTR)new_lsa_ctx; + new_context->dwUpper = 0; } return status; } @@ -504,78 +519,78 @@ static SECURITY_STATUS WINAPI lsa_AcceptSecurityContext( SecBufferDesc *output, ULONG *context_attr, TimeStamp *ts_expiry) { SECURITY_STATUS status; - struct lsa_package *lsa_package = NULL; - LSA_SEC_HANDLE lsa_credential = 0, lsa_context = 0, new_lsa_context; + struct lsa_package *package = NULL; + struct lsa_handle *lsa_cred = NULL, *lsa_ctx = NULL, *new_lsa_ctx; BOOLEAN mapped_context; + LSA_SEC_HANDLE new_handle; TRACE("%p %p %p %#x %#x %p %p %p %p\n", credential, context, input, context_req, target_data_rep, new_context, output, context_attr, ts_expiry); if (context) { - lsa_package = (struct lsa_package *)context->dwUpper; - lsa_context = (LSA_SEC_HANDLE)context->dwLower; + lsa_ctx = (struct lsa_handle *)context->dwLower; + if (lsa_ctx->magic != LSA_MAGIC_CONTEXT) return SEC_E_INVALID_HANDLE; + package = lsa_ctx->package; } else if (credential) { - lsa_package = (struct lsa_package *)credential->dwUpper; - lsa_credential = (LSA_SEC_HANDLE)credential->dwLower; + lsa_cred = (struct lsa_handle *)credential->dwLower; + if (lsa_cred->magic != LSA_MAGIC_CREDENTIALS) return SEC_E_INVALID_HANDLE; + package = lsa_cred->package; } + if (!package || !new_context) return SEC_E_INVALID_HANDLE; - if (!lsa_package || !new_context) return SEC_E_INVALID_HANDLE; - - if (!lsa_package->lsa_api || !lsa_package->lsa_api->AcceptLsaModeContext) + if (!package->lsa_api || !package->lsa_api->AcceptLsaModeContext) return SEC_E_UNSUPPORTED_FUNCTION; - status = lsa_package->lsa_api->AcceptLsaModeContext(lsa_credential, lsa_context, - input, context_req, target_data_rep, &new_lsa_context, output, context_attr, - ts_expiry, &mapped_context, NULL /* FIXME */); + status = package->lsa_api->AcceptLsaModeContext(lsa_cred ? lsa_cred->handle : 0, + lsa_ctx ? lsa_ctx->handle : 0, input, context_req, target_data_rep, &new_handle, output, + context_attr, ts_expiry, &mapped_context, NULL /* FIXME */); if (status == SEC_E_OK || status == SEC_I_CONTINUE_NEEDED) { - new_context->dwLower = (ULONG_PTR)new_lsa_context; - new_context->dwUpper = (ULONG_PTR)lsa_package; + if (!(new_lsa_ctx = alloc_lsa_handle(LSA_MAGIC_CONTEXT))) return STATUS_NO_MEMORY; + new_lsa_ctx->package = package; + new_lsa_ctx->handle = new_handle; + new_context->dwLower = (ULONG_PTR)new_lsa_ctx; + new_context->dwUpper = 0; } return status; } static SECURITY_STATUS WINAPI lsa_DeleteSecurityContext(CtxtHandle *context) { - struct lsa_package *lsa_package; - LSA_SEC_HANDLE lsa_context; + struct lsa_handle *lsa_ctx; + SECURITY_STATUS status; TRACE("%p\n", context); if (!context) return SEC_E_INVALID_HANDLE; + lsa_ctx = (struct lsa_handle *)context->dwLower; + if (!lsa_ctx || lsa_ctx->magic != LSA_MAGIC_CONTEXT) return SEC_E_INVALID_HANDLE; - lsa_package = (struct lsa_package *)context->dwUpper; - lsa_context = (LSA_SEC_HANDLE)context->dwLower; - - if (!lsa_package) return SEC_E_INVALID_HANDLE; - - if (!lsa_package->lsa_api || !lsa_package->lsa_api->DeleteContext) + if (!lsa_ctx->package->lsa_api || !lsa_ctx->package->lsa_api->DeleteContext) return SEC_E_UNSUPPORTED_FUNCTION; - return lsa_package->lsa_api->DeleteContext(lsa_context); + status = lsa_ctx->package->lsa_api->DeleteContext(lsa_ctx->handle); + free(lsa_ctx); + return status; } static SECURITY_STATUS WINAPI lsa_QueryContextAttributesW(CtxtHandle *context, ULONG attribute, void *buffer) { - struct lsa_package *lsa_package; - LSA_SEC_HANDLE lsa_context; + struct lsa_handle *lsa_ctx; TRACE("%p %d %p\n", context, attribute, buffer); if (!context) return SEC_E_INVALID_HANDLE; + lsa_ctx = (struct lsa_handle *)context->dwLower; + if (!lsa_ctx || lsa_ctx->magic != LSA_MAGIC_CONTEXT) return SEC_E_INVALID_HANDLE; - lsa_package = (struct lsa_package *)context->dwUpper; - lsa_context = (LSA_SEC_HANDLE)context->dwLower; - - if (!lsa_package) return SEC_E_INVALID_HANDLE; - - if (!lsa_package->lsa_api || !lsa_package->lsa_api->SpQueryContextAttributes) + if (!lsa_ctx->package->lsa_api || !lsa_ctx->package->lsa_api->SpQueryContextAttributes) return SEC_E_UNSUPPORTED_FUNCTION; - return lsa_package->lsa_api->SpQueryContextAttributes(lsa_context, attribute, buffer); + return lsa_ctx->package->lsa_api->SpQueryContextAttributes(lsa_ctx->handle, attribute, buffer); } static SecPkgInfoA *package_infoWtoA( const SecPkgInfoW *info ) @@ -653,85 +668,69 @@ static SECURITY_STATUS WINAPI lsa_QueryContextAttributesA(CtxtHandle *context, U static SECURITY_STATUS WINAPI lsa_MakeSignature(CtxtHandle *context, ULONG quality_of_protection, SecBufferDesc *message, ULONG message_seq_no) { - struct lsa_package *lsa_package; - LSA_SEC_HANDLE lsa_context; + struct lsa_handle *lsa_ctx; TRACE("%p %#x %p %u)\n", context, quality_of_protection, message, message_seq_no); if (!context) return SEC_E_INVALID_HANDLE; + lsa_ctx = (struct lsa_handle *)context->dwLower; + if (!lsa_ctx || lsa_ctx->magic != LSA_MAGIC_CONTEXT) return SEC_E_INVALID_HANDLE; - lsa_package = (struct lsa_package *)context->dwUpper; - lsa_context = (LSA_SEC_HANDLE)context->dwLower; - - if (!lsa_package) return SEC_E_INVALID_HANDLE; - - if (!lsa_package->user_api || !lsa_package->user_api->MakeSignature) + if (!lsa_ctx->package->user_api || !lsa_ctx->package->user_api->MakeSignature) return SEC_E_UNSUPPORTED_FUNCTION; - return lsa_package->user_api->MakeSignature(lsa_context, quality_of_protection, message, message_seq_no); + return lsa_ctx->package->user_api->MakeSignature(lsa_ctx->handle, quality_of_protection, message, message_seq_no); } static SECURITY_STATUS WINAPI lsa_VerifySignature(CtxtHandle *context, SecBufferDesc *message, ULONG message_seq_no, ULONG *quality_of_protection) { - struct lsa_package *lsa_package; - LSA_SEC_HANDLE lsa_context; + struct lsa_handle *lsa_ctx; TRACE("%p %p %u %p)\n", context, message, message_seq_no, quality_of_protection); if (!context) return SEC_E_INVALID_HANDLE; + lsa_ctx = (struct lsa_handle *)context->dwLower; + if (!lsa_ctx || lsa_ctx->magic != LSA_MAGIC_CONTEXT) return SEC_E_INVALID_HANDLE; - lsa_package = (struct lsa_package *)context->dwUpper; - lsa_context = (LSA_SEC_HANDLE)context->dwLower; - - if (!lsa_package) return SEC_E_INVALID_HANDLE; - - if (!lsa_package->user_api || !lsa_package->user_api->VerifySignature) + if (!lsa_ctx->package->user_api || !lsa_ctx->package->user_api->VerifySignature) return SEC_E_UNSUPPORTED_FUNCTION; - return lsa_package->user_api->VerifySignature(lsa_context, message, message_seq_no, quality_of_protection); + return lsa_ctx->package->user_api->VerifySignature(lsa_ctx->handle, message, message_seq_no, quality_of_protection); } static SECURITY_STATUS WINAPI lsa_EncryptMessage(CtxtHandle *context, ULONG quality_of_protection, SecBufferDesc *message, ULONG message_seq_no) { - struct lsa_package *lsa_package; - LSA_SEC_HANDLE lsa_context; + struct lsa_handle *lsa_ctx; TRACE("%p %#x %p %u)\n", context, quality_of_protection, message, message_seq_no); if (!context) return SEC_E_INVALID_HANDLE; + lsa_ctx = (struct lsa_handle *)context->dwLower; + if (!lsa_ctx || lsa_ctx->magic != LSA_MAGIC_CONTEXT) return SEC_E_INVALID_HANDLE; - lsa_package = (struct lsa_package *)context->dwUpper; - lsa_context = (LSA_SEC_HANDLE)context->dwLower; - - if (!lsa_package) return SEC_E_INVALID_HANDLE; - - if (!lsa_package->user_api || !lsa_package->user_api->SealMessage) + if (!lsa_ctx->package->user_api || !lsa_ctx->package->user_api->SealMessage) return SEC_E_UNSUPPORTED_FUNCTION; - return lsa_package->user_api->SealMessage(lsa_context, quality_of_protection, message, message_seq_no); + return lsa_ctx->package->user_api->SealMessage(lsa_ctx->handle, quality_of_protection, message, message_seq_no); } static SECURITY_STATUS WINAPI lsa_DecryptMessage(CtxtHandle *context, SecBufferDesc *message, ULONG message_seq_no, ULONG *quality_of_protection) { - struct lsa_package *lsa_package; - LSA_SEC_HANDLE lsa_context; + struct lsa_handle *lsa_ctx; TRACE("%p %p %u %p)\n", context, message, message_seq_no, quality_of_protection); if (!context) return SEC_E_INVALID_HANDLE; + lsa_ctx = (struct lsa_handle *)context->dwLower; + if (!lsa_ctx || lsa_ctx->magic != LSA_MAGIC_CONTEXT) return SEC_E_INVALID_HANDLE; - lsa_package = (struct lsa_package *)context->dwUpper; - lsa_context = (LSA_SEC_HANDLE)context->dwLower; - - if (!lsa_package) return SEC_E_INVALID_HANDLE; - - if (!lsa_package->user_api || !lsa_package->user_api->UnsealMessage) + if (!lsa_ctx->package->user_api || !lsa_ctx->package->user_api->UnsealMessage) return SEC_E_UNSUPPORTED_FUNCTION; - return lsa_package->user_api->UnsealMessage(lsa_context, message, message_seq_no, quality_of_protection); + return lsa_ctx->package->user_api->UnsealMessage(lsa_ctx->handle, message, message_seq_no, quality_of_protection); } static const SecurityFunctionTableW lsa_sspi_tableW = -- 2.30.2

1 0

[PATCH v2 8/9] gdi32: Move ntgdi functions to Unix library.
by Jacek Caban Sept. 29, 2021

Sept. 29, 2021

4 4

[PATCH v3] wininet: Reset context length for http status 304
by Alistair Leslie-Hughes Sept. 29, 2021

Sept. 29, 2021

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/wininet/http.c | 5 ++++- dlls/wininet/tests/http.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 1 deletion(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index e9363208471..b2862ead789 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2918,7 +2918,10 @@ static DWORD set_content_length(http_request_t *request) WCHAR encoding[20]; DWORD size; - if(request->status_code == HTTP_STATUS_NO_CONTENT || !wcscmp(request->verb, L"HEAD")) { + if(request->status_code == HTTP_STATUS_NO_CONTENT || request->status_code == HTTP_STATUS_NOT_MODIFIED || + !wcscmp(request->verb, L"HEAD")) + { + request->read_size = 0; request->contentLength = request->netconn_stream.content_length = 0; return ERROR_SUCCESS; } diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index bf4dce80bef..716d2b5cb76 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2381,6 +2381,13 @@ static DWORD CALLBACK server_thread(LPVOID param) static const char nocontentmsg[] = "HTTP/1.1 204 No Content\r\nConnection: close\r\n\r\n"; send(c, nocontentmsg, sizeof(nocontentmsg)-1, 0); } + if (strstr(buffer, "GET /test_not_modified")) + { + static const char notmodifiedmsg[] = "HTTP/1.1 304 Not Modified\r\nConnection: close\r\n" + "\r\n" + "0123456789"; + send(c, notmodifiedmsg, sizeof(notmodifiedmsg)-1, 0); + } if (strstr(buffer, "GET /test_conn_close")) { static const char conn_close_response[] = "HTTP/1.1 200 OK\r\nConnection: close\r\n\r\nsome content"; @@ -3487,6 +3494,36 @@ static void test_no_content(int port) CHECK_NOTIFIED(INTERNET_STATUS_CONNECTION_CLOSED); } +static void test_not_modified(int port) +{ + DWORD avail; + HINTERNET ses, con, req; + BOOL ret; + + ses = InternetOpenA("winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); + ok(ses != NULL, "InternetOpen failed\n"); + + con = InternetConnectA(ses, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); + ok(con != NULL, "InternetConnect failed\n"); + + req = HttpOpenRequestA(con, NULL, "/test_not_modified", NULL, NULL, NULL, 0, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + SetLastError(0xdeadbeef); + ret = HttpSendRequestW(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed: %u\n", GetLastError()); + test_status_code(req, 304); + + avail = 0; + ret = InternetQueryDataAvailable(req, &avail, 0, 0); + ok(ret, "InternetQueryDataAvailable failed: %u\n", GetLastError()); + ok(avail == 0, "got %d\n", avail); + + InternetCloseHandle(req); + InternetCloseHandle(con); + InternetCloseHandle(ses); +} + static void test_conn_close(int port) { HINTERNET session, connection, req; @@ -6060,6 +6097,7 @@ static void test_http_connection(void) test_HttpSendRequestW(si.port); test_options(si.port); test_no_content(si.port); + test_not_modified(si.port); test_conn_close(si.port); test_no_cache(si.port); test_cache_read_gzipped(si.port); -- 2.33.0

3 3

[PATCH 1/5] kernelbase: Fix incorrect pseudo console allocation size (GCC 11).
by Rémi Bernon Sept. 29, 2021

Sept. 29, 2021

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- GCC 11 is much more verbose with its array-bounds and stringop-overread warnings, and they are enabled by default. Some of these lead to some genuine fixes like the first two patches here while some are a bit more dubious but easy to fix, like the last three patches. Then there's a lot more additional array-bounds warnings emitted, caused by flexible array sizes which we define to 1 by default, in most cases. When a variable is allocated with the array size set to 0, GCC emits a warning each time the variable is used, as it assumes any of its members may be accessed (although the first array member may not be accessed at all). A possible fix for this would be to use true C99 flexible array sizes instead, but it then breaks a bunch of type size checks instead. dlls/kernelbase/console.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index c38e8e91955..a7eeb439232 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -1728,7 +1728,7 @@ HRESULT WINAPI CreatePseudoConsole( COORD size, HANDLE input, HANDLE output, DWO if (!size.X || !size.Y || !ret) return E_INVALIDARG; - if (!(pseudo_console = HeapAlloc( GetProcessHeap(), 0, HEAP_ZERO_MEMORY ))) return E_OUTOFMEMORY; + if (!(pseudo_console = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*pseudo_console) ))) return E_OUTOFMEMORY; swprintf( pipe_name, ARRAY_SIZE(pipe_name), L"\\\\.\\pipe\\wine_pty_signal_pipe%x", GetCurrentThreadId() ); -- 2.33.0

4 12

[PATCH v2 1/9] include: Add HID Physical Interface Device usage page.
by Rémi Bernon Sept. 29, 2021

Sept. 29, 2021

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- Sorry for the spam, a v2 seems actually worth it, to have IID_IDirectInputPIDDriver addition in a dedicated patch. Also stripped out the outdated comment. include/hidusage.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/hidusage.h b/include/hidusage.h index 002040bddc0..da7274b5945 100644 --- a/include/hidusage.h +++ b/include/hidusage.h @@ -197,6 +197,7 @@ typedef USHORT USAGE, *PUSAGE; #define HID_USAGE_PAGE_CONSUMER ((USAGE) 0x0C) #define HID_USAGE_PAGE_DIGITIZER ((USAGE) 0x0D) #define HID_USAGE_PAGE_HAPTICS ((USAGE) 0x0E) +#define HID_USAGE_PAGE_PID ((USAGE) 0x0F) #define HID_USAGE_PAGE_UNICODE ((USAGE) 0x10) #define HID_USAGE_PAGE_ALPHANUMERIC ((USAGE) 0x14) #define HID_USAGE_PAGE_VENDOR_DEFINED_BEGIN ((USAGE) 0xff00) -- 2.33.0

2 12

[PATCH 1/8] include: Add HID Physical Interface Device usage page.
by Rémi Bernon Sept. 29, 2021

Sept. 29, 2021

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- include/hidusage.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/hidusage.h b/include/hidusage.h index 002040bddc0..da7274b5945 100644 --- a/include/hidusage.h +++ b/include/hidusage.h @@ -197,6 +197,7 @@ typedef USHORT USAGE, *PUSAGE; #define HID_USAGE_PAGE_CONSUMER ((USAGE) 0x0C) #define HID_USAGE_PAGE_DIGITIZER ((USAGE) 0x0D) #define HID_USAGE_PAGE_HAPTICS ((USAGE) 0x0E) +#define HID_USAGE_PAGE_PID ((USAGE) 0x0F) #define HID_USAGE_PAGE_UNICODE ((USAGE) 0x10) #define HID_USAGE_PAGE_ALPHANUMERIC ((USAGE) 0x14) #define HID_USAGE_PAGE_VENDOR_DEFINED_BEGIN ((USAGE) 0xff00) -- 2.33.0

1 8

[PATCH 1/6] ole32/composite: Handle per-component failure in GetDisplayName().
by Nikolay Sivov Sept. 29, 2021

Sept. 29, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ole32/compositemoniker.c | 14 ++++--- dlls/ole32/tests/moniker.c | 79 ++++++++++++++++++++++++++++++++++- 2 files changed, 85 insertions(+), 8 deletions(-) diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c index 4451f0daae6..77e1e8aff35 100644 --- a/dlls/ole32/compositemoniker.c +++ b/dlls/ole32/compositemoniker.c @@ -1023,17 +1023,19 @@ static HRESULT WINAPI CompositeMonikerImpl_GetDisplayName(IMoniker *iface, IBind { CompositeMonikerImpl *moniker = impl_from_IMoniker(iface); WCHAR *left_name = NULL, *right_name = NULL; + HRESULT hr; TRACE("%p, %p, %p, %p\n", iface, pbc, pmkToLeft, displayname); - if (!displayname) - return E_POINTER; - - if (!moniker->comp_count) + if (!pbc || !displayname || !moniker->comp_count) return E_INVALIDARG; - IMoniker_GetDisplayName(moniker->left, pbc, NULL, &left_name); - IMoniker_GetDisplayName(moniker->right, pbc, NULL, &right_name); + if (FAILED(hr = IMoniker_GetDisplayName(moniker->left, pbc, NULL, &left_name))) return hr; + if (FAILED(hr = IMoniker_GetDisplayName(moniker->right, pbc, NULL, &right_name))) + { + CoTaskMemFree(left_name); + return hr; + } if (!(*displayname = CoTaskMemAlloc((lstrlenW(left_name) + lstrlenW(right_name) + 1) * sizeof(WCHAR)))) { diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 795d8750d05..fcd8dd8310d 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -145,6 +145,38 @@ static IMoniker *create_antimoniker(DWORD level) return moniker; } +static HRESULT WINAPI pointer_moniker_obj_QueryInterface(IUnknown *iface, + REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI pointer_moniker_obj_AddRef(IUnknown *iface) +{ + return 2; +} + +static ULONG WINAPI pointer_moniker_obj_Release(IUnknown *iface) +{ + return 1; +} + +static const IUnknownVtbl pointer_moniker_obj_vtbl = +{ + pointer_moniker_obj_QueryInterface, + pointer_moniker_obj_AddRef, + pointer_moniker_obj_Release, +}; + +static IUnknown pm_obj = { &pointer_moniker_obj_vtbl }; + static HRESULT create_moniker_parse_desc(const char *desc, unsigned int *eaten, IMoniker **moniker) { @@ -163,6 +195,9 @@ static HRESULT create_moniker_parse_desc(const char *desc, unsigned int *eaten, *eaten = 2; *moniker = create_antimoniker(desc[1] - '0'); return S_OK; + case 'P': + *eaten = 1; + return CreatePointerMoniker(&pm_obj, moniker); case 'C': *eaten = 1; desc++; @@ -860,7 +895,7 @@ static void test_ROT(void) '1','9','0','3','-','4','A','A','E','-','B','1','A','F','-', '2','0','4','6','E','5','8','6','C','9','2','5',0}; HRESULT hr; - IMoniker *pMoniker = NULL; + IMoniker *pMoniker = NULL, *moniker; struct test_moniker *test_moniker; IRunningObjectTable *pROT = NULL; struct test_factory factory; @@ -988,6 +1023,25 @@ static void test_ROT(void) IMoniker_Release(pMoniker); IMoniker_Release(&test_moniker->IMoniker_iface); + /* Pointer moniker does not implement IROTData or display name */ + hr = CreatePointerMoniker(NULL, &pMoniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IRunningObjectTable_Register(pROT, ROTFLAGS_REGISTRATIONKEEPSALIVE, (IUnknown *)&factory.IClassFactory_iface, + pMoniker, &dwCookie); +todo_wine + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + IMoniker_Release(pMoniker); + + hr = create_moniker_from_desc("I1", &moniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = CreatePointerMoniker((IUnknown *)moniker, &pMoniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IRunningObjectTable_Register(pROT, ROTFLAGS_REGISTRATIONKEEPSALIVE, (IUnknown *)&factory.IClassFactory_iface, + pMoniker, &dwCookie); + ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + IMoniker_Release(pMoniker); + IMoniker_Release(moniker); + IRunningObjectTable_Release(pROT); } @@ -3537,6 +3591,23 @@ todo_wine IMoniker_Release(&m->IMoniker_iface); IMoniker_Release(&m2->IMoniker_iface); + /* Display name */ + + /* One component does not support it. */ + hr = create_moniker_from_desc("CPI1", &moniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_GetDisplayName(moniker, NULL, NULL, &str); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_GetDisplayName(moniker, bindctx, NULL, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_GetDisplayName(moniker, bindctx, NULL, &str); + ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + + IMoniker_Release(moniker); + IBindCtx_Release(bindctx); } @@ -3616,7 +3687,11 @@ todo_wine ok_ole_success(hr, CreateBindCtx); hr = IMoniker_GetDisplayName(moniker, bindctx, NULL, &display_name); - ok(hr == E_NOTIMPL, "IMoniker_GetDisplayName should have returned E_NOTIMPL instead of 0x%08x\n", hr); + ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_GetDisplayName(moniker, NULL, NULL, &display_name); +todo_wine + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); IBindCtx_Release(bindctx); -- 2.33.0

1 5

Re: [PATCH 5/6] Workaround GCC11 complaining about sizeof(a)/sizeof(b) constructs when it's
by Eric Pouech Sept. 29, 2021

Sept. 29, 2021

to be more precise, gcc11 complains with: /home/eric/work/wine/dlls/d3dx9_36/tests/effect.c: In function 'test_effect_parameter_value_GetMatrixPointerArray': /home/eric/work/wine/dlls/d3dx9_36/tests/effect.c:1478:52: warning: expression does not compute the number of elements in this array; element type is 'FLOAT' {aka 'float'}, not 'D3DXMATRIX' {aka 'struct _D3DMATRIX'} [-Wsizeof-array-div] 1478 | D3DXMATRIX *matrix_pointer_array[sizeof(fvalue)/sizeof(D3DXMATRIX)]; | ^ /home/eric/work/wine/dlls/d3dx9_36/tests/effect.c:1478:52: note: add parentheses around the second 'sizeof' to silence this warning /home/eric/work/wine/dlls/d3dx9_36/tests/effect.c:1477:11: note: array 'fvalue' declared here 1477 | FLOAT fvalue[EFFECT_PARAMETER_VALUE_ARRAY_SIZE]; | ^~~~~~ so the patch mainly silences GCC11 by following gcc advice of adding parenthesis A+ On Tue, 28 Sept 2021 at 23:03, Marvin <testbot(a)winehq.org> wrote: > Thank you for your contribution to Wine! > > This is an automated notification to let you know that your patch has > been reviewed and its status set to "Assigned". > > This means that the patch has been assigned to a reviewer. If the > reviewer signs off on the patch, it will be committed, otherwise > you'll receive advice on how to improve it. If you don't hear anything > after a couple of weeks, please resend the patch. > -- -- Eric Pouech

1 0