- wine-devel - winehq.org

[PATCH 04/13] secur32: Implement InitializeSecurityContext in the SSP/AP wrapper.
by Dmitry Timoshkov 31 Jan '18

31 Jan '18

Partially based on Hans Leidekker's work. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/secur32/lsa.c | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 72 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index ad3223c166..fe7ccb418d 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -396,6 +396,76 @@ static SECURITY_STATUS WINAPI lsa_FreeCredentialsHandle(CredHandle *credential) return lsa_package->lsa_api->FreeCredentialsHandle(lsa_credential); } +static SECURITY_STATUS WINAPI lsa_InitializeSecurityContextW( + CredHandle *credential, CtxtHandle *context, SEC_WCHAR *target_name, ULONG context_req, + ULONG reserved1, ULONG target_data_rep, SecBufferDesc *input, ULONG reserved2, + 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; + UNICODE_STRING target_name_us; + BOOLEAN mapped_context; + + 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, + reserved2, new_context, output, context_attr, ts_expiry); + + if (credential) + { + lsa_package = (struct lsa_package *)credential->dwUpper; + lsa_credential = (LSA_SEC_HANDLE)credential->dwLower; + } + else if (context) + { + lsa_package = (struct lsa_package *)context->dwUpper; + lsa_context = (LSA_SEC_HANDLE)context->dwLower; + } + + if (!lsa_package || !new_context) return SEC_E_INVALID_HANDLE; + + if (!lsa_package->lsa_api || !lsa_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 */); + if (status == SEC_E_OK) + { + new_context->dwLower = (ULONG_PTR)new_lsa_context; + new_context->dwUpper = (ULONG_PTR)lsa_package; + } + return status; +} + +static SECURITY_STATUS WINAPI lsa_InitializeSecurityContextA( + CredHandle *credential, CtxtHandle *context, SEC_CHAR *target_name, ULONG context_req, + ULONG reserved1, ULONG target_data_rep, SecBufferDesc *input, ULONG reserved2, + CtxtHandle *new_context, SecBufferDesc *output, ULONG *context_attr, TimeStamp *ts_expiry) +{ + SECURITY_STATUS status; + SEC_WCHAR *targetW = NULL; + + TRACE("%p %p %s %#x %d %d %p %d %p %p %p %p\n", credential, context, + debugstr_a(target_name), context_req, reserved1, target_data_rep, input, + reserved2, new_context, output, context_attr, ts_expiry); + + if (target_name) + { + int len = MultiByteToWideChar( CP_ACP, 0, target_name, -1, NULL, 0 ); + if (!(targetW = HeapAlloc( GetProcessHeap(), 0, len * sizeof(SEC_WCHAR) ))) return SEC_E_INSUFFICIENT_MEMORY; + MultiByteToWideChar( CP_ACP, 0, target_name, -1, targetW, len ); + } + + status = lsa_InitializeSecurityContextW( credential, context, targetW, context_req, reserved1, target_data_rep, + input, reserved2, new_context, output, context_attr, ts_expiry ); + HeapFree( GetProcessHeap(), 0, targetW ); + return status; +} + static const SecurityFunctionTableW lsa_sspi_tableW = { 1, @@ -404,7 +474,7 @@ static const SecurityFunctionTableW lsa_sspi_tableW = lsa_AcquireCredentialsHandleW, lsa_FreeCredentialsHandle, NULL, /* Reserved2 */ - NULL, /* InitializeSecurityContextW */ + lsa_InitializeSecurityContextW, NULL, /* AcceptSecurityContext */ NULL, /* CompleteAuthToken */ NULL, /* DeleteSecurityContext */ @@ -436,7 +506,7 @@ static const SecurityFunctionTableA lsa_sspi_tableA = lsa_AcquireCredentialsHandleA, lsa_FreeCredentialsHandle, NULL, /* Reserved2 */ - NULL, /* InitializeSecurityContextA */ + lsa_InitializeSecurityContextA, NULL, /* AcceptSecurityContext */ NULL, /* CompleteAuthToken */ NULL, /* DeleteSecurityContext */ -- 2.15.1

2 2

[PATCH 13/13] secur32: Add support for switching between Kerberos and NTLM in Negotiate provider.
by Dmitry Timoshkov 31 Jan '18

31 Jan '18

Based on generic wrapper.c implementation. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/secur32/negotiate.c | 330 ++++++++++++++++++++++++++++++++++++-------- dlls/secur32/ntlm.c | 4 +- dlls/secur32/secur32_priv.h | 19 +-- dlls/secur32/wrapper.c | 2 +- 4 files changed, 277 insertions(+), 78 deletions(-) diff --git a/dlls/secur32/negotiate.c b/dlls/secur32/negotiate.c index bf16258fc2..c7ab97ef79 100644 --- a/dlls/secur32/negotiate.c +++ b/dlls/secur32/negotiate.c @@ -62,20 +62,41 @@ static SECURITY_STATUS SEC_ENTRY nego_AcquireCredentialsHandleW( PVOID pGetKeyArgument, PCredHandle phCredential, PTimeStamp ptsExpiry ) { static SEC_WCHAR ntlmW[] = {'N','T','L','M',0}; + static SEC_WCHAR kerberosW[] = {'K','e','r','b','e','r','o','s',0}; SECURITY_STATUS ret; + SecurePackage *package; + CredHandle myCred; TRACE("%s, %s, 0x%08x, %p, %p, %p, %p, %p, %p\n", debugstr_w(pszPrincipal), debugstr_w(pszPackage), fCredentialUse, pLogonID, pAuthData, pGetKeyFn, pGetKeyArgument, phCredential, ptsExpiry); - FIXME("forwarding to NTLM\n"); - ret = ntlm_AcquireCredentialsHandleW( pszPrincipal, ntlmW, fCredentialUse, - pLogonID, pAuthData, pGetKeyFn, pGetKeyArgument, - phCredential, ptsExpiry ); + if (!pszPackage) + return SEC_E_SECPKG_NOT_FOUND; + + package = SECUR32_findPackageW(kerberosW); + if (!package || !package->provider) + { + package = SECUR32_findPackageW(ntlmW); + if (!package || !package->provider) + return SEC_E_SECPKG_NOT_FOUND; + } + + if (!package->provider->fnTableW.AcquireCredentialsHandleW) + { + FIXME("Package doesn't support this API\n"); + return SEC_E_UNSUPPORTED_FUNCTION; + } + + ret = package->provider->fnTableW.AcquireCredentialsHandleW( + pszPrincipal, package->infoW.Name, fCredentialUse, pLogonID, + pAuthData, pGetKeyFn, pGetKeyArgument, &myCred, + ptsExpiry); if (ret == SEC_E_OK) { - NtlmCredentials *cred = (NtlmCredentials *)phCredential->dwLower; - cred->no_cached_credentials = (pAuthData == NULL); + ret = SECUR32_makeSecHandle(phCredential, package, &myCred); + if (ret != SEC_E_OK) + package->provider->fnTableW.FreeCredentialsHandle(&myCred); } return ret; } @@ -173,15 +194,56 @@ static SECURITY_STATUS SEC_ENTRY nego_InitializeSecurityContextW( PSecBufferDesc pInput, ULONG Reserved2, PCtxtHandle phNewContext, PSecBufferDesc pOutput, ULONG *pfContextAttr, PTimeStamp ptsExpiry ) { + SECURITY_STATUS ret; + SecurePackage *package = NULL; + PCredHandle cred = NULL; + PCredHandle ctxt = NULL; + CtxtHandle myCtxt; + TRACE("%p, %p, %s, 0x%08x, %u, %u, %p, %u, %p, %p, %p, %p\n", phCredential, phContext, debugstr_w(pszTargetName), fContextReq, Reserved1, TargetDataRep, pInput, Reserved1, phNewContext, pOutput, pfContextAttr, ptsExpiry); - return ntlm_InitializeSecurityContextW( phCredential, phContext, pszTargetName, - fContextReq, Reserved1, TargetDataRep, - pInput, Reserved2, 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 (!package || !package->provider) + return SEC_E_INVALID_HANDLE; + + if (!package->provider->fnTableW.InitializeSecurityContextW) + { + FIXME("Package doesn't support this API\n"); + return SEC_E_UNSUPPORTED_FUNCTION; + } + + 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, + pOutput, pfContextAttr, ptsExpiry); + if ((ret == SEC_E_OK || ret == SEC_I_CONTINUE_NEEDED) && + phNewContext && phNewContext != phContext) + { + if (SECUR32_makeSecHandle(phNewContext, package, &myCtxt) != SEC_E_OK) + package->provider->fnTableW.DeleteSecurityContext(&myCtxt); + } + + return ret; } /*********************************************************************** @@ -223,13 +285,49 @@ static SECURITY_STATUS SEC_ENTRY nego_AcceptSecurityContext( ULONG fContextReq, ULONG TargetDataRep, PCtxtHandle phNewContext, PSecBufferDesc pOutput, ULONG *pfContextAttr, PTimeStamp ptsExpiry) { + SecurePackage *package; + PCredHandle cred; + CtxtHandle myCtxt; + SECURITY_STATUS ret; + TRACE("%p, %p, %p, 0x%08x, %u, %p, %p, %p, %p\n", phCredential, phContext, pInput, fContextReq, TargetDataRep, phNewContext, pOutput, pfContextAttr, ptsExpiry); - return ntlm_AcceptSecurityContext( phCredential, phContext, pInput, - fContextReq, TargetDataRep, phNewContext, - pOutput, pfContextAttr, ptsExpiry ); + if (!phCredential) + return SEC_E_INVALID_HANDLE; + + package = (SecurePackage *)phCredential->dwUpper; + cred = (PCredHandle)phCredential->dwLower; + + if (!package || !package->provider) + return SEC_E_INVALID_HANDLE; + + if (!package->provider->fnTableW.AcceptSecurityContext) + { + FIXME("Package doesn't support this API\n"); + return SEC_E_UNSUPPORTED_FUNCTION; + } + + 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) + { + if (SECUR32_makeSecHandle(phNewContext, package, &myCtxt) != SEC_E_OK) + package->provider->fnTableW.DeleteSecurityContext(&myCtxt); + } + + return ret; } /*********************************************************************** @@ -257,9 +355,31 @@ static SECURITY_STATUS SEC_ENTRY nego_CompleteAuthToken(PCtxtHandle phContext, */ static SECURITY_STATUS SEC_ENTRY nego_DeleteSecurityContext(PCtxtHandle phContext) { + SecurePackage *package; + PCtxtHandle ctxt; + SECURITY_STATUS ret; + TRACE("%p\n", phContext); + if (!phContext) + return SEC_E_INVALID_HANDLE; + + package = (SecurePackage *)phContext->dwUpper; + + if (!package || !package->provider) + return SEC_E_INVALID_HANDLE; + + if (!package->provider->fnTableW.DeleteSecurityContext) + { + FIXME("Package doesn't support this API\n"); + return SEC_E_UNSUPPORTED_FUNCTION; + } + + ctxt = (PCtxtHandle)phContext->dwLower; - return ntlm_DeleteSecurityContext( phContext ); + ret = package->provider->fnTableW.DeleteSecurityContext(ctxt); + HeapFree(GetProcessHeap(), 0, ctxt); + + return ret; } /*********************************************************************** @@ -288,29 +408,28 @@ static SECURITY_STATUS SEC_ENTRY nego_ApplyControlToken(PCtxtHandle phContext, static SECURITY_STATUS SEC_ENTRY nego_QueryContextAttributesW( PCtxtHandle phContext, ULONG ulAttribute, void *pBuffer) { + SecurePackage *package; + PCtxtHandle ctxt; + TRACE("%p, %u, %p\n", phContext, ulAttribute, pBuffer); - switch (ulAttribute) - { - case SECPKG_ATTR_SIZES: - { - SecPkgContext_Sizes *sizes = (SecPkgContext_Sizes *)pBuffer; - sizes->cbMaxToken = 2888; - sizes->cbMaxSignature = 16; - sizes->cbSecurityTrailer = 16; - sizes->cbBlockSize = 0; - return SEC_E_OK; - } - case SECPKG_ATTR_NEGOTIATION_INFO: + if (!phContext) + return SEC_E_INVALID_HANDLE; + + package = (SecurePackage *)phContext->dwUpper; + + if (!package || !package->provider) + return SEC_E_INVALID_HANDLE; + + if (!package->provider->fnTableW.QueryContextAttributesW) { - SecPkgContext_NegotiationInfoW *info = (SecPkgContext_NegotiationInfoW *)pBuffer; - info->PackageInfo = ntlm_package_infoW; - info->NegotiationState = SECPKG_NEGOTIATION_COMPLETE; - return SEC_E_OK; - } - default: - return ntlm_QueryContextAttributesW( phContext, ulAttribute, pBuffer ); + FIXME("Package doesn't support this API\n"); + return SEC_E_UNSUPPORTED_FUNCTION; } + + ctxt = (PCtxtHandle)phContext->dwLower; + + return package->provider->fnTableW.QueryContextAttributesW(ctxt, ulAttribute, pBuffer); } /*********************************************************************** @@ -319,29 +438,28 @@ static SECURITY_STATUS SEC_ENTRY nego_QueryContextAttributesW( static SECURITY_STATUS SEC_ENTRY nego_QueryContextAttributesA(PCtxtHandle phContext, ULONG ulAttribute, void *pBuffer) { + SecurePackage *package; + PCtxtHandle ctxt; + TRACE("%p, %u, %p\n", phContext, ulAttribute, pBuffer); - switch (ulAttribute) - { - case SECPKG_ATTR_SIZES: - { - SecPkgContext_Sizes *sizes = (SecPkgContext_Sizes *)pBuffer; - sizes->cbMaxToken = 2888; - sizes->cbMaxSignature = 16; - sizes->cbSecurityTrailer = 16; - sizes->cbBlockSize = 0; - return SEC_E_OK; - } - case SECPKG_ATTR_NEGOTIATION_INFO: + if (!phContext) + return SEC_E_INVALID_HANDLE; + + package = (SecurePackage *)phContext->dwUpper; + + if (!package || !package->provider) + return SEC_E_INVALID_HANDLE; + + if (!package->provider->fnTableA.QueryContextAttributesA) { - SecPkgContext_NegotiationInfoA *info = (SecPkgContext_NegotiationInfoA *)pBuffer; - info->PackageInfo = ntlm_package_infoA; - info->NegotiationState = SECPKG_NEGOTIATION_COMPLETE; - return SEC_E_OK; - } - default: - return ntlm_QueryContextAttributesA( phContext, ulAttribute, pBuffer ); + FIXME("Package doesn't support this API\n"); + return SEC_E_UNSUPPORTED_FUNCTION; } + + ctxt = (PCtxtHandle)phContext->dwLower; + + return package->provider->fnTableA.QueryContextAttributesA(ctxt, ulAttribute, pBuffer); } /*********************************************************************** @@ -388,9 +506,28 @@ static SECURITY_STATUS SEC_ENTRY nego_RevertSecurityContext(PCtxtHandle phContex static SECURITY_STATUS SEC_ENTRY nego_MakeSignature(PCtxtHandle phContext, ULONG fQOP, PSecBufferDesc pMessage, ULONG MessageSeqNo) { + SecurePackage *package; + PCtxtHandle ctxt; + TRACE("%p, 0x%08x, %p, %u\n", phContext, fQOP, pMessage, MessageSeqNo); - return ntlm_MakeSignature( phContext, fQOP, pMessage, MessageSeqNo ); + if (!phContext) + return SEC_E_INVALID_HANDLE; + + package = (SecurePackage *)phContext->dwUpper; + + if (!package || !package->provider) + return SEC_E_INVALID_HANDLE; + + if (!package->provider->fnTableW.MakeSignature) + { + FIXME("Package doesn't support this API\n"); + return SEC_E_UNSUPPORTED_FUNCTION; + } + + ctxt = (PCtxtHandle)phContext->dwLower; + + return package->provider->fnTableW.MakeSignature(ctxt, fQOP, pMessage, MessageSeqNo); } /*********************************************************************** @@ -399,9 +536,28 @@ static SECURITY_STATUS SEC_ENTRY nego_MakeSignature(PCtxtHandle phContext, static SECURITY_STATUS SEC_ENTRY nego_VerifySignature(PCtxtHandle phContext, PSecBufferDesc pMessage, ULONG MessageSeqNo, PULONG pfQOP) { + SecurePackage *package; + PCtxtHandle ctxt; + TRACE("%p, %p, %u, %p\n", phContext, pMessage, MessageSeqNo, pfQOP); - return ntlm_VerifySignature( phContext, pMessage, MessageSeqNo, pfQOP ); + if (!phContext) + return SEC_E_INVALID_HANDLE; + + package = (SecurePackage *)phContext->dwUpper; + + if (!package || !package->provider) + return SEC_E_INVALID_HANDLE; + + if (!package->provider->fnTableW.VerifySignature) + { + FIXME("Package doesn't support this API\n"); + return SEC_E_UNSUPPORTED_FUNCTION; + } + + ctxt = (PCtxtHandle)phContext->dwLower; + + return package->provider->fnTableW.VerifySignature(ctxt, pMessage, MessageSeqNo, pfQOP); } /*********************************************************************** @@ -409,9 +565,31 @@ static SECURITY_STATUS SEC_ENTRY nego_VerifySignature(PCtxtHandle phContext, */ static SECURITY_STATUS SEC_ENTRY nego_FreeCredentialsHandle(PCredHandle phCredential) { + SecurePackage *package; + PCredHandle cred; + SECURITY_STATUS ret; + TRACE("%p\n", phCredential); - return ntlm_FreeCredentialsHandle( phCredential ); + if (!phCredential) + return SEC_E_INVALID_HANDLE; + + package = (SecurePackage *)phCredential->dwUpper; + if (!package || !package->provider) + return SEC_E_INVALID_HANDLE; + + if (!package->provider->fnTableW.FreeCredentialsHandle) + { + FIXME("Package doesn't support this API\n"); + return SEC_E_UNSUPPORTED_FUNCTION; + } + + cred = (PCredHandle)phCredential->dwLower; + + ret = package->provider->fnTableW.FreeCredentialsHandle(cred); + HeapFree(GetProcessHeap(), 0, cred); + + return ret; } /*********************************************************************** @@ -420,9 +598,28 @@ static SECURITY_STATUS SEC_ENTRY nego_FreeCredentialsHandle(PCredHandle phCreden static SECURITY_STATUS SEC_ENTRY nego_EncryptMessage(PCtxtHandle phContext, ULONG fQOP, PSecBufferDesc pMessage, ULONG MessageSeqNo) { + SecurePackage *package; + PCtxtHandle ctxt; + TRACE("%p, 0x%08x, %p, %u\n", phContext, fQOP, pMessage, MessageSeqNo); - return ntlm_EncryptMessage( phContext, fQOP, pMessage, MessageSeqNo ); + if (!phContext) + return SEC_E_INVALID_HANDLE; + + package = (SecurePackage *)phContext->dwUpper; + + if (!package || !package->provider) + return SEC_E_INVALID_HANDLE; + + if (!package->provider->fnTableW.EncryptMessage) + { + FIXME("Package doesn't support this API\n"); + return SEC_E_UNSUPPORTED_FUNCTION; + } + + ctxt = (PCtxtHandle)phContext->dwLower; + + return package->provider->fnTableW.EncryptMessage(ctxt, fQOP, pMessage, MessageSeqNo); } /*********************************************************************** @@ -431,9 +628,28 @@ static SECURITY_STATUS SEC_ENTRY nego_EncryptMessage(PCtxtHandle phContext, static SECURITY_STATUS SEC_ENTRY nego_DecryptMessage(PCtxtHandle phContext, PSecBufferDesc pMessage, ULONG MessageSeqNo, PULONG pfQOP) { + SecurePackage *package; + PCtxtHandle ctxt; + TRACE("%p, %p, %u, %p\n", phContext, pMessage, MessageSeqNo, pfQOP); - return ntlm_DecryptMessage( phContext, pMessage, MessageSeqNo, pfQOP ); + if (!phContext) + return SEC_E_INVALID_HANDLE; + + package = (SecurePackage *)phContext->dwUpper; + + if (!package || !package->provider) + return SEC_E_INVALID_HANDLE; + + if (!package->provider->fnTableW.DecryptMessage) + { + FIXME("Package doesn't support this API\n"); + return SEC_E_UNSUPPORTED_FUNCTION; + } + + ctxt = (PCtxtHandle)phContext->dwLower; + + return package->provider->fnTableW.DecryptMessage(ctxt, pMessage, MessageSeqNo, pfQOP); } static const SecurityFunctionTableA negoTableA = { diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index 94b94f48ce..2d0557b200 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -151,7 +151,7 @@ SECURITY_STATUS SEC_ENTRY ntlm_AcquireCredentialsHandleW( ntlm_cred->domain_arg = NULL; ntlm_cred->password = NULL; ntlm_cred->pwlen = 0; - ntlm_cred->no_cached_credentials = 0; + ntlm_cred->no_cached_credentials = (pAuthData == NULL); phCredential->dwUpper = fCredentialUse; phCredential->dwLower = (ULONG_PTR)ntlm_cred; @@ -172,7 +172,7 @@ SECURITY_STATUS SEC_ENTRY ntlm_AcquireCredentialsHandleW( ntlm_cred->domain_arg = NULL; ntlm_cred->password = NULL; ntlm_cred->pwlen = 0; - ntlm_cred->no_cached_credentials = 0; + ntlm_cred->no_cached_credentials = (pAuthData == NULL); if(pAuthData != NULL) { diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h index 973b75c699..e029ea12c4 100644 --- a/dlls/secur32/secur32_priv.h +++ b/dlls/secur32/secur32_priv.h @@ -189,24 +189,7 @@ void SECUR32_arc4Cleanup(arc4_info *a4i) DECLSPEC_HIDDEN; #define NTLMSSP_NEGOTIATE_KEY_EXCHANGE 0x40000000 #define NTLMSSP_NEGOTIATE_56 0x80000000 -SECURITY_STATUS SEC_ENTRY ntlm_AcquireCredentialsHandleW(SEC_WCHAR *, SEC_WCHAR *, - ULONG, PLUID, PVOID, SEC_GET_KEY_FN, PVOID, PCredHandle, PTimeStamp) DECLSPEC_HIDDEN; -SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextW(PCredHandle, PCtxtHandle, - SEC_WCHAR *, ULONG fContextReq, ULONG, ULONG, PSecBufferDesc, ULONG, PCtxtHandle, - PSecBufferDesc, ULONG *, PTimeStamp) DECLSPEC_HIDDEN; -SECURITY_STATUS SEC_ENTRY ntlm_AcceptSecurityContext(PCredHandle, PCtxtHandle, PSecBufferDesc, - ULONG, ULONG, PCtxtHandle, PSecBufferDesc, ULONG *, PTimeStamp) DECLSPEC_HIDDEN; -SECURITY_STATUS SEC_ENTRY ntlm_QueryContextAttributesA(PCtxtHandle, ULONG, void *) DECLSPEC_HIDDEN; -SECURITY_STATUS SEC_ENTRY ntlm_QueryContextAttributesW(PCtxtHandle, ULONG, void *) DECLSPEC_HIDDEN; -SECURITY_STATUS SEC_ENTRY ntlm_EncryptMessage(PCtxtHandle, ULONG, PSecBufferDesc, ULONG) DECLSPEC_HIDDEN; -SECURITY_STATUS SEC_ENTRY ntlm_DecryptMessage(PCtxtHandle, PSecBufferDesc, ULONG, PULONG) DECLSPEC_HIDDEN; -SECURITY_STATUS SEC_ENTRY ntlm_FreeCredentialsHandle(PCredHandle) DECLSPEC_HIDDEN; -SECURITY_STATUS SEC_ENTRY ntlm_DeleteSecurityContext(PCtxtHandle) DECLSPEC_HIDDEN; -SECURITY_STATUS SEC_ENTRY ntlm_MakeSignature(PCtxtHandle, ULONG, PSecBufferDesc, ULONG) DECLSPEC_HIDDEN; -SECURITY_STATUS SEC_ENTRY ntlm_VerifySignature(PCtxtHandle, PSecBufferDesc, ULONG, PULONG) DECLSPEC_HIDDEN; - -SecPkgInfoW *ntlm_package_infoW DECLSPEC_HIDDEN; -SecPkgInfoA *ntlm_package_infoA DECLSPEC_HIDDEN; +SECURITY_STATUS SECUR32_makeSecHandle(PSecHandle phSec, SecurePackage *package, PSecHandle realHandle) DECLSPEC_HIDDEN; /* schannel internal interface */ typedef struct schan_imp_session_opaque *schan_imp_session; diff --git a/dlls/secur32/wrapper.c b/dlls/secur32/wrapper.c index dba675422d..85941d0361 100644 --- a/dlls/secur32/wrapper.c +++ b/dlls/secur32/wrapper.c @@ -32,7 +32,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(secur32); * and stored in phSec->dwLower). SecHandle is equivalent to both a * CredHandle and a CtxtHandle. */ -static SECURITY_STATUS SECUR32_makeSecHandle(PSecHandle phSec, +SECURITY_STATUS SECUR32_makeSecHandle(PSecHandle phSec, SecurePackage *package, PSecHandle realHandle) { SECURITY_STATUS ret; -- 2.15.1

2 1

[PATCH 12/13] secur32: Remove Kerberos SSPI stubs.
by Dmitry Timoshkov 31 Jan '18

31 Jan '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/secur32/Makefile.in | 1 - dlls/secur32/kerberos.c | 323 -------------------------------------------- dlls/secur32/secur32.c | 3 +- dlls/secur32/secur32_priv.h | 2 +- 4 files changed, 3 insertions(+), 326 deletions(-) delete mode 100644 dlls/secur32/kerberos.c diff --git a/dlls/secur32/Makefile.in b/dlls/secur32/Makefile.in index 6548521f53..c9acdee457 100644 --- a/dlls/secur32/Makefile.in +++ b/dlls/secur32/Makefile.in @@ -9,7 +9,6 @@ C_SRCS = \ base64_codec.c \ dispatcher.c \ hmac_md5.c \ - kerberos.c \ lsa.c \ negotiate.c \ ntlm.c \ diff --git a/dlls/secur32/kerberos.c b/dlls/secur32/kerberos.c deleted file mode 100644 index 753e9748d2..0000000000 --- a/dlls/secur32/kerberos.c +++ /dev/null @@ -1,323 +0,0 @@ -/* - * Copyright 2005, 2006 Kai Blin - * Copyright 2016 Jacek Caban for CodeWeavers - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include <assert.h> -#include <stdarg.h> -#include <stdio.h> - -#include "windef.h" -#include "winbase.h" -#include "rpc.h" -#include "sspi.h" - -#include "secur32_priv.h" - -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(secur32); - -#define KERBEROS_MAX_BUF 12000 - -/*********************************************************************** - * QueryCredentialsAttributesA - */ -static SECURITY_STATUS SEC_ENTRY kerberos_QueryCredentialsAttributesA(CredHandle *phCredential, ULONG ulAttribute, void *pBuffer) -{ - FIXME("(%p %d %p)\n", phCredential, ulAttribute, pBuffer); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * QueryCredentialsAttributesW - */ -static SECURITY_STATUS SEC_ENTRY kerberos_QueryCredentialsAttributesW(CredHandle *phCredential, ULONG ulAttribute, void *pBuffer) -{ - FIXME("(%p, %d, %p)\n", phCredential, ulAttribute, pBuffer); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * AcquireCredentialsHandleW - */ -static SECURITY_STATUS SEC_ENTRY kerberos_AcquireCredentialsHandleW(SEC_WCHAR *pszPrincipal, SEC_WCHAR *pszPackage, ULONG fCredentialUse, - LUID *pLogonID, void *pAuthData, SEC_GET_KEY_FN pGetKeyFn, void *pGetKeyArgument, CredHandle *phCredential, TimeStamp *ptsExpiry) -{ - FIXME("(%s %s 0x%08x %p %p %p %p %p %p)\n", debugstr_w(pszPrincipal), debugstr_w(pszPackage), fCredentialUse, - pLogonID, pAuthData, pGetKeyFn, pGetKeyArgument, phCredential, ptsExpiry); - return SEC_E_NO_CREDENTIALS; -} - -/*********************************************************************** - * AcquireCredentialsHandleA - */ -static SECURITY_STATUS SEC_ENTRY kerberos_AcquireCredentialsHandleA(SEC_CHAR *pszPrincipal, SEC_CHAR *pszPackage, ULONG fCredentialUse, - LUID *pLogonID, void *pAuthData, SEC_GET_KEY_FN pGetKeyFn, void *pGetKeyArgument, CredHandle *phCredential, TimeStamp *ptsExpiry) -{ - FIXME("(%s %s 0x%08x %p %p %p %p %p %p)\n", debugstr_a(pszPrincipal), debugstr_a(pszPackage), fCredentialUse, - pLogonID, pAuthData, pGetKeyFn, pGetKeyArgument, phCredential, ptsExpiry); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * InitializeSecurityContextW - */ -static SECURITY_STATUS SEC_ENTRY kerberos_InitializeSecurityContextW(CredHandle *phCredential, CtxtHandle *phContext, SEC_WCHAR *pszTargetName, - ULONG fContextReq, ULONG Reserved1, ULONG TargetDataRep, SecBufferDesc *pInput, ULONG Reserved2, CtxtHandle *phNewContext, - SecBufferDesc *pOutput, ULONG *pfContextAttr, TimeStamp *ptsExpiry) -{ - FIXME("(%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); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * InitializeSecurityContextA - */ -static SECURITY_STATUS SEC_ENTRY kerberos_InitializeSecurityContextA(CredHandle *phCredential, CtxtHandle *phContext, SEC_CHAR *pszTargetName, - ULONG fContextReq, ULONG Reserved1, ULONG TargetDataRep, SecBufferDesc *pInput, ULONG Reserved2, CtxtHandle *phNewContext, - SecBufferDesc *pOutput, ULONG *pfContextAttr, TimeStamp *ptsExpiry) -{ - FIXME("%p %p %s %d %d %d %p %d %p %p %p %p\n", phCredential, phContext, debugstr_a(pszTargetName), fContextReq, - Reserved1, TargetDataRep, pInput, Reserved1, phNewContext, pOutput, pfContextAttr, ptsExpiry); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * AcceptSecurityContext - */ -static SECURITY_STATUS SEC_ENTRY kerberos_AcceptSecurityContext(CredHandle *phCredential, CtxtHandle *phContext, SecBufferDesc *pInput, - ULONG fContextReq, ULONG TargetDataRep, CtxtHandle *phNewContext, SecBufferDesc *pOutput, ULONG *pfContextAttr, TimeStamp *ptsExpiry) -{ - FIXME("(%p %p %p %d %d %p %p %p %p)\n", phCredential, phContext, pInput, fContextReq, TargetDataRep, phNewContext, pOutput, - pfContextAttr, ptsExpiry); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * CompleteAuthToken - */ -static SECURITY_STATUS SEC_ENTRY kerberos_CompleteAuthToken(CtxtHandle *phContext, SecBufferDesc *pToken) -{ - FIXME("(%p %p)\n", phContext, pToken); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * DeleteSecurityContext - */ -static SECURITY_STATUS SEC_ENTRY kerberos_DeleteSecurityContext(CtxtHandle *phContext) -{ - FIXME("(%p)\n", phContext); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * QueryContextAttributesW - */ -static SECURITY_STATUS SEC_ENTRY kerberos_QueryContextAttributesW(CtxtHandle *phContext, ULONG ulAttribute, void *pBuffer) -{ - FIXME("(%p %d %p)\n", phContext, ulAttribute, pBuffer); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * QueryContextAttributesA - */ -static SECURITY_STATUS SEC_ENTRY kerberos_QueryContextAttributesA(CtxtHandle *phContext, ULONG ulAttribute, void *pBuffer) -{ - FIXME("(%p %d %p)\n", phContext, ulAttribute, pBuffer); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * ImpersonateSecurityContext - */ -static SECURITY_STATUS SEC_ENTRY kerberos_ImpersonateSecurityContext(CtxtHandle *phContext) -{ - FIXME("(%p)\n", phContext); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * RevertSecurityContext - */ -static SECURITY_STATUS SEC_ENTRY kerberos_RevertSecurityContext(CtxtHandle *phContext) -{ - FIXME("(%p)\n", phContext); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * MakeSignature - */ -static SECURITY_STATUS SEC_ENTRY kerberos_MakeSignature(CtxtHandle *phContext, ULONG fQOP, SecBufferDesc *pMessage, ULONG MessageSeqNo) -{ - FIXME("(%p %d %p %d)\n", phContext, fQOP, pMessage, MessageSeqNo); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * VerifySignature - */ -static SECURITY_STATUS SEC_ENTRY kerberos_VerifySignature(CtxtHandle *phContext, SecBufferDesc *pMessage, ULONG MessageSeqNo, PULONG pfQOP) -{ - FIXME("(%p %p %d %p)\n", phContext, pMessage, MessageSeqNo, pfQOP); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * FreeCredentialsHandle - */ -static SECURITY_STATUS SEC_ENTRY kerberos_FreeCredentialsHandle(PCredHandle phCredential) -{ - FIXME("(%p)\n", phCredential); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * EncryptMessage - */ -static SECURITY_STATUS SEC_ENTRY kerberos_EncryptMessage(CtxtHandle *phContext, ULONG fQOP, SecBufferDesc *pMessage, ULONG MessageSeqNo) -{ - FIXME("(%p %d %p %d)\n", phContext, fQOP, pMessage, MessageSeqNo); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * DecryptMessage - */ -static SECURITY_STATUS SEC_ENTRY kerberos_DecryptMessage(CtxtHandle *phContext, SecBufferDesc *pMessage, ULONG MessageSeqNo, PULONG pfQOP) -{ - FIXME("(%p %p %d %p)\n", phContext, pMessage, MessageSeqNo, pfQOP); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -static const SecurityFunctionTableA kerberosTableA = { - 1, - NULL, /* EnumerateSecurityPackagesA */ - kerberos_QueryCredentialsAttributesA, /* QueryCredentialsAttributesA */ - kerberos_AcquireCredentialsHandleA, /* AcquireCredentialsHandleA */ - kerberos_FreeCredentialsHandle, /* FreeCredentialsHandle */ - NULL, /* Reserved2 */ - kerberos_InitializeSecurityContextA, /* InitializeSecurityContextA */ - kerberos_AcceptSecurityContext, /* AcceptSecurityContext */ - kerberos_CompleteAuthToken, /* CompleteAuthToken */ - kerberos_DeleteSecurityContext, /* DeleteSecurityContext */ - NULL, /* ApplyControlToken */ - kerberos_QueryContextAttributesA, /* QueryContextAttributesA */ - kerberos_ImpersonateSecurityContext, /* ImpersonateSecurityContext */ - kerberos_RevertSecurityContext, /* RevertSecurityContext */ - kerberos_MakeSignature, /* MakeSignature */ - kerberos_VerifySignature, /* VerifySignature */ - FreeContextBuffer, /* FreeContextBuffer */ - NULL, /* QuerySecurityPackageInfoA */ - NULL, /* Reserved3 */ - NULL, /* Reserved4 */ - NULL, /* ExportSecurityContext */ - NULL, /* ImportSecurityContextA */ - NULL, /* AddCredentialsA */ - NULL, /* Reserved8 */ - NULL, /* QuerySecurityContextToken */ - kerberos_EncryptMessage, /* EncryptMessage */ - kerberos_DecryptMessage, /* DecryptMessage */ - NULL, /* SetContextAttributesA */ -}; - -static const SecurityFunctionTableW kerberosTableW = { - 1, - NULL, /* EnumerateSecurityPackagesW */ - kerberos_QueryCredentialsAttributesW, /* QueryCredentialsAttributesW */ - kerberos_AcquireCredentialsHandleW, /* AcquireCredentialsHandleW */ - kerberos_FreeCredentialsHandle, /* FreeCredentialsHandle */ - NULL, /* Reserved2 */ - kerberos_InitializeSecurityContextW, /* InitializeSecurityContextW */ - kerberos_AcceptSecurityContext, /* AcceptSecurityContext */ - kerberos_CompleteAuthToken, /* CompleteAuthToken */ - kerberos_DeleteSecurityContext, /* DeleteSecurityContext */ - NULL, /* ApplyControlToken */ - kerberos_QueryContextAttributesW, /* QueryContextAttributesW */ - kerberos_ImpersonateSecurityContext, /* ImpersonateSecurityContext */ - kerberos_RevertSecurityContext, /* RevertSecurityContext */ - kerberos_MakeSignature, /* MakeSignature */ - kerberos_VerifySignature, /* VerifySignature */ - FreeContextBuffer, /* FreeContextBuffer */ - NULL, /* QuerySecurityPackageInfoW */ - NULL, /* Reserved3 */ - NULL, /* Reserved4 */ - NULL, /* ExportSecurityContext */ - NULL, /* ImportSecurityContextW */ - NULL, /* AddCredentialsW */ - NULL, /* Reserved8 */ - NULL, /* QuerySecurityContextToken */ - kerberos_EncryptMessage, /* EncryptMessage */ - kerberos_DecryptMessage, /* DecryptMessage */ - NULL, /* SetContextAttributesW */ -}; - -#define KERBEROS_COMMENT \ - {'M','i','c','r','o','s','o','f','t',' ','K','e','r','b','e','r','o','s',' ','V','1','.','0',0} -static CHAR kerberos_comment_A[] = KERBEROS_COMMENT; -static WCHAR kerberos_comment_W[] = KERBEROS_COMMENT; - -#define KERBEROS_NAME {'K','e','r','b','e','r','o','s',0} -static char kerberos_name_A[] = KERBEROS_NAME; -static WCHAR kerberos_name_W[] = KERBEROS_NAME; - -#define CAPS \ - ( SECPKG_FLAG_INTEGRITY \ - | SECPKG_FLAG_PRIVACY \ - | SECPKG_FLAG_TOKEN_ONLY \ - | SECPKG_FLAG_DATAGRAM \ - | SECPKG_FLAG_CONNECTION \ - | SECPKG_FLAG_MULTI_REQUIRED \ - | SECPKG_FLAG_EXTENDED_ERROR \ - | SECPKG_FLAG_IMPERSONATION \ - | SECPKG_FLAG_ACCEPT_WIN32_NAME \ - | SECPKG_FLAG_NEGOTIABLE \ - | SECPKG_FLAG_GSS_COMPATIBLE \ - | SECPKG_FLAG_LOGON \ - | SECPKG_FLAG_MUTUAL_AUTH \ - | SECPKG_FLAG_DELEGATION \ - | SECPKG_FLAG_READONLY_WITH_CHECKSUM \ - | SECPKG_FLAG_RESTRICTED_TOKENS \ - | SECPKG_FLAG_APPCONTAINER_CHECKS) - -static const SecPkgInfoW infoW = { - CAPS, - 1, - RPC_C_AUTHN_GSS_KERBEROS, - KERBEROS_MAX_BUF, - kerberos_name_W, - kerberos_comment_W -}; - -static const SecPkgInfoA infoA = { - CAPS, - 1, - RPC_C_AUTHN_GSS_KERBEROS, - KERBEROS_MAX_BUF, - kerberos_name_A, - kerberos_comment_A -}; - -void SECUR32_initKerberosSP(void) -{ - SecureProvider *provider = SECUR32_addProvider(&kerberosTableA, &kerberosTableW, NULL); - SECUR32_addPackages(provider, 1, &infoA, &infoW); -} diff --git a/dlls/secur32/secur32.c b/dlls/secur32/secur32.c index 1e12f3c543..f7b1ec2d98 100644 --- a/dlls/secur32/secur32.c +++ b/dlls/secur32/secur32.c @@ -564,7 +564,8 @@ static void SECUR32_initializeProviders(void) /* First load built-in providers */ SECUR32_initSchannelSP(); SECUR32_initNTLMSP(); - SECUR32_initKerberosSP(); + /* Load SSP/AP packages (Kerberos and others) */ + load_auth_packages(); /* Load the Negotiate provider last so apps stumble over the working NTLM * provider first. Attempting to fix bug #16905 while keeping the * application reported on wine-users on 2006-09-12 working. */ diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h index 9a60d65788..973b75c699 100644 --- a/dlls/secur32/secur32_priv.h +++ b/dlls/secur32/secur32_priv.h @@ -136,7 +136,7 @@ PSTR SECUR32_AllocMultiByteFromWide(PCWSTR str) DECLSPEC_HIDDEN; void SECUR32_initSchannelSP(void) DECLSPEC_HIDDEN; void SECUR32_initNegotiateSP(void) DECLSPEC_HIDDEN; void SECUR32_initNTLMSP(void) DECLSPEC_HIDDEN; -void SECUR32_initKerberosSP(void) DECLSPEC_HIDDEN; +void load_auth_packages(void) DECLSPEC_HIDDEN; /* Cleanup functions for built-in providers */ void SECUR32_deinitSchannelSP(void) DECLSPEC_HIDDEN; -- 2.15.1

2 1

[PATCH 11/13] secur32: Implement DecryptMessage in the SSP/AP wrapper.
by Dmitry Timoshkov 31 Jan '18

31 Jan '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/secur32/lsa.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index 548aff4576..e8939a2d6e 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -643,6 +643,27 @@ static SECURITY_STATUS WINAPI lsa_EncryptMessage(CtxtHandle *context, ULONG qual return lsa_package->user_api->SealMessage(lsa_context, 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; + + TRACE("%p %p %u %p)\n", context, message, message_seq_no, quality_of_protection); + + if (!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->user_api->UnsealMessage) + return SEC_E_UNSUPPORTED_FUNCTION; + + return lsa_package->user_api->UnsealMessage(lsa_context, message, message_seq_no, quality_of_protection); +} + static const SecurityFunctionTableW lsa_sspi_tableW = { 1, @@ -671,7 +692,7 @@ static const SecurityFunctionTableW lsa_sspi_tableW = NULL, /* Reserved8 */ NULL, /* QuerySecurityContextToken */ lsa_EncryptMessage, - NULL, /* DecryptMessage */ + lsa_DecryptMessage, NULL, /* SetContextAttributesW */ }; @@ -703,7 +724,7 @@ static const SecurityFunctionTableA lsa_sspi_tableA = NULL, /* Reserved8 */ NULL, /* QuerySecurityContextToken */ lsa_EncryptMessage, - NULL, /* DecryptMessage */ + lsa_DecryptMessage, NULL, /* SetContextAttributesA */ }; -- 2.15.1

2 1

[PATCH 10/13] secur32: Implement EncryptMessage in the SSP/AP wrapper.
by Dmitry Timoshkov 31 Jan '18

31 Jan '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/secur32/lsa.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index 374f0b1010..548aff4576 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -622,6 +622,27 @@ static SECURITY_STATUS WINAPI lsa_VerifySignature(CtxtHandle *context, SecBuffer return lsa_package->user_api->VerifySignature(lsa_context, 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; + + TRACE("%p %#x %p %u)\n", context, quality_of_protection, message, message_seq_no); + + if (!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->user_api->SealMessage) + return SEC_E_UNSUPPORTED_FUNCTION; + + return lsa_package->user_api->SealMessage(lsa_context, quality_of_protection, message, message_seq_no); +} + static const SecurityFunctionTableW lsa_sspi_tableW = { 1, @@ -649,7 +670,7 @@ static const SecurityFunctionTableW lsa_sspi_tableW = NULL, /* AddCredentialsW */ NULL, /* Reserved8 */ NULL, /* QuerySecurityContextToken */ - NULL, /* EncryptMessage */ + lsa_EncryptMessage, NULL, /* DecryptMessage */ NULL, /* SetContextAttributesW */ }; @@ -681,7 +702,7 @@ static const SecurityFunctionTableA lsa_sspi_tableA = NULL, /* AddCredentialsA */ NULL, /* Reserved8 */ NULL, /* QuerySecurityContextToken */ - NULL, /* EncryptMessage */ + lsa_EncryptMessage, NULL, /* DecryptMessage */ NULL, /* SetContextAttributesA */ }; -- 2.15.1

2 1

[PATCH 09/13] secur32: Implement VerifySignature in the SSP/AP wrapper.
by Dmitry Timoshkov 31 Jan '18

31 Jan '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/secur32/lsa.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index 4991e6ec32..374f0b1010 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -601,6 +601,27 @@ static SECURITY_STATUS WINAPI lsa_MakeSignature(CtxtHandle *context, ULONG quali return lsa_package->user_api->MakeSignature(lsa_context, 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; + + TRACE("%p %p %u %p)\n", context, message, message_seq_no, quality_of_protection); + + if (!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->user_api->VerifySignature) + return SEC_E_UNSUPPORTED_FUNCTION; + + return lsa_package->user_api->VerifySignature(lsa_context, message, message_seq_no, quality_of_protection); +} + static const SecurityFunctionTableW lsa_sspi_tableW = { 1, @@ -618,7 +639,7 @@ static const SecurityFunctionTableW lsa_sspi_tableW = NULL, /* ImpersonateSecurityContext */ NULL, /* RevertSecurityContext */ lsa_MakeSignature, - NULL, /* VerifySignature */ + lsa_VerifySignature, NULL, /* FreeContextBuffer */ NULL, /* QuerySecurityPackageInfoW */ NULL, /* Reserved3 */ @@ -650,7 +671,7 @@ static const SecurityFunctionTableA lsa_sspi_tableA = NULL, /* ImpersonateSecurityContext */ NULL, /* RevertSecurityContext */ lsa_MakeSignature, - NULL, /* VerifySignature */ + lsa_VerifySignature, NULL, /* FreeContextBuffer */ NULL, /* QuerySecurityPackageInfoA */ NULL, /* Reserved3 */ -- 2.15.1

2 1

[PATCH 08/13] secur32: Implement MakeSignature in the SSP/AP wrapper.
by Dmitry Timoshkov 31 Jan '18

31 Jan '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/secur32/lsa.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index c255bd2b96..4991e6ec32 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -580,6 +580,27 @@ static SECURITY_STATUS WINAPI lsa_QueryContextAttributesA(CtxtHandle *context, U return SEC_E_UNSUPPORTED_FUNCTION; } +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; + + TRACE("%p %#x %p %u)\n", context, quality_of_protection, message, message_seq_no); + + if (!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->user_api->MakeSignature) + return SEC_E_UNSUPPORTED_FUNCTION; + + return lsa_package->user_api->MakeSignature(lsa_context, quality_of_protection, message, message_seq_no); +} + static const SecurityFunctionTableW lsa_sspi_tableW = { 1, @@ -596,7 +617,7 @@ static const SecurityFunctionTableW lsa_sspi_tableW = lsa_QueryContextAttributesW, NULL, /* ImpersonateSecurityContext */ NULL, /* RevertSecurityContext */ - NULL, /* MakeSignature */ + lsa_MakeSignature, NULL, /* VerifySignature */ NULL, /* FreeContextBuffer */ NULL, /* QuerySecurityPackageInfoW */ @@ -628,7 +649,7 @@ static const SecurityFunctionTableA lsa_sspi_tableA = lsa_QueryContextAttributesA, NULL, /* ImpersonateSecurityContext */ NULL, /* RevertSecurityContext */ - NULL, /* MakeSignature */ + lsa_MakeSignature, NULL, /* VerifySignature */ NULL, /* FreeContextBuffer */ NULL, /* QuerySecurityPackageInfoA */ -- 2.15.1

2 1

[PATCH 07/13] secur32: Implement QueryContextAttributes in the SSP/AP wrapper.
by Dmitry Timoshkov 31 Jan '18

31 Jan '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/secur32/lsa.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 56 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index 09eff78bbe..c255bd2b96 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -526,6 +526,60 @@ static SECURITY_STATUS WINAPI lsa_DeleteSecurityContext(CtxtHandle *context) return lsa_package->lsa_api->DeleteContext(lsa_context); } +static SECURITY_STATUS WINAPI lsa_QueryContextAttributesW(CtxtHandle *context, ULONG attribute, void *buffer) +{ + struct lsa_package *lsa_package; + LSA_SEC_HANDLE lsa_context; + + TRACE("%p %d %p\n", context, attribute, buffer); + + if (!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) + return SEC_E_UNSUPPORTED_FUNCTION; + + return lsa_package->lsa_api->SpQueryContextAttributes(lsa_context, attribute, buffer); +} + +static SECURITY_STATUS WINAPI lsa_QueryContextAttributesA(CtxtHandle *context, ULONG attribute, void *buffer) +{ + TRACE("%p %d %p\n", context, attribute, buffer); + + if (!context) return SEC_E_INVALID_HANDLE; + + switch (attribute) + { + case SECPKG_ATTR_SIZES: + return lsa_QueryContextAttributesW( context, attribute, buffer ); + +#define X(x) case (x) : FIXME(#x" stub\n"); break + X(SECPKG_ATTR_ACCESS_TOKEN); + X(SECPKG_ATTR_AUTHORITY); + X(SECPKG_ATTR_DCE_INFO); + X(SECPKG_ATTR_KEY_INFO); + X(SECPKG_ATTR_LIFESPAN); + X(SECPKG_ATTR_NAMES); + X(SECPKG_ATTR_NATIVE_NAMES); + X(SECPKG_ATTR_PACKAGE_INFO); + X(SECPKG_ATTR_PASSWORD_EXPIRY); + X(SECPKG_ATTR_SESSION_KEY); + X(SECPKG_ATTR_STREAM_SIZES); + X(SECPKG_ATTR_TARGET_INFORMATION); + X(SECPKG_ATTR_NEGOTIATION_INFO); +#undef X + default: + FIXME( "unknown attribute %u\n", attribute ); + break; + } + + return SEC_E_UNSUPPORTED_FUNCTION; +} + static const SecurityFunctionTableW lsa_sspi_tableW = { 1, @@ -539,7 +593,7 @@ static const SecurityFunctionTableW lsa_sspi_tableW = NULL, /* CompleteAuthToken */ lsa_DeleteSecurityContext, NULL, /* ApplyControlToken */ - NULL, /* QueryContextAttributesW */ + lsa_QueryContextAttributesW, NULL, /* ImpersonateSecurityContext */ NULL, /* RevertSecurityContext */ NULL, /* MakeSignature */ @@ -571,7 +625,7 @@ static const SecurityFunctionTableA lsa_sspi_tableA = NULL, /* CompleteAuthToken */ lsa_DeleteSecurityContext, NULL, /* ApplyControlToken */ - NULL, /* QueryContextAttributesA */ + lsa_QueryContextAttributesA, NULL, /* ImpersonateSecurityContext */ NULL, /* RevertSecurityContext */ NULL, /* MakeSignature */ -- 2.15.1

2 1

[PATCH 06/13] secur32: Implement AcceptSecurityContext in the SSP/AP wrapper.
by Dmitry Timoshkov 31 Jan '18

31 Jan '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/secur32/lsa.c | 44 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 42 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index 6cc55f4b34..09eff78bbe 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -466,6 +466,46 @@ static SECURITY_STATUS WINAPI lsa_InitializeSecurityContextA( return status; } +static SECURITY_STATUS WINAPI lsa_AcceptSecurityContext( + CredHandle *credential, CtxtHandle *context, SecBufferDesc *input, + ULONG context_req, ULONG target_data_rep, 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; + BOOLEAN mapped_context; + + 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 (credential) + { + lsa_package = (struct lsa_package *)credential->dwUpper; + lsa_credential = (LSA_SEC_HANDLE)credential->dwLower; + } + else if (context) + { + lsa_package = (struct lsa_package *)context->dwUpper; + lsa_context = (LSA_SEC_HANDLE)context->dwLower; + } + + if (!lsa_package || !new_context) return SEC_E_INVALID_HANDLE; + + if (!lsa_package->lsa_api || !lsa_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 */); + if (status == SEC_E_OK) + { + new_context->dwLower = (ULONG_PTR)new_lsa_context; + new_context->dwUpper = (ULONG_PTR)lsa_package; + } + return status; +} + static SECURITY_STATUS WINAPI lsa_DeleteSecurityContext(CtxtHandle *context) { struct lsa_package *lsa_package; @@ -495,7 +535,7 @@ static const SecurityFunctionTableW lsa_sspi_tableW = lsa_FreeCredentialsHandle, NULL, /* Reserved2 */ lsa_InitializeSecurityContextW, - NULL, /* AcceptSecurityContext */ + lsa_AcceptSecurityContext, NULL, /* CompleteAuthToken */ lsa_DeleteSecurityContext, NULL, /* ApplyControlToken */ @@ -527,7 +567,7 @@ static const SecurityFunctionTableA lsa_sspi_tableA = lsa_FreeCredentialsHandle, NULL, /* Reserved2 */ lsa_InitializeSecurityContextA, - NULL, /* AcceptSecurityContext */ + lsa_AcceptSecurityContext, NULL, /* CompleteAuthToken */ lsa_DeleteSecurityContext, NULL, /* ApplyControlToken */ -- 2.15.1

2 1

[PATCH 05/13] secur32: Implement DeleteSecurityContext in the SSP/AP wrapper.
by Dmitry Timoshkov 31 Jan '18

31 Jan '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/secur32/lsa.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index fe7ccb418d..6cc55f4b34 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -466,6 +466,26 @@ static SECURITY_STATUS WINAPI lsa_InitializeSecurityContextA( return status; } +static SECURITY_STATUS WINAPI lsa_DeleteSecurityContext(CtxtHandle *context) +{ + struct lsa_package *lsa_package; + LSA_SEC_HANDLE lsa_context; + + TRACE("%p\n", context); + + if (!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) + return SEC_E_UNSUPPORTED_FUNCTION; + + return lsa_package->lsa_api->DeleteContext(lsa_context); +} + static const SecurityFunctionTableW lsa_sspi_tableW = { 1, @@ -477,7 +497,7 @@ static const SecurityFunctionTableW lsa_sspi_tableW = lsa_InitializeSecurityContextW, NULL, /* AcceptSecurityContext */ NULL, /* CompleteAuthToken */ - NULL, /* DeleteSecurityContext */ + lsa_DeleteSecurityContext, NULL, /* ApplyControlToken */ NULL, /* QueryContextAttributesW */ NULL, /* ImpersonateSecurityContext */ @@ -509,7 +529,7 @@ static const SecurityFunctionTableA lsa_sspi_tableA = lsa_InitializeSecurityContextA, NULL, /* AcceptSecurityContext */ NULL, /* CompleteAuthToken */ - NULL, /* DeleteSecurityContext */ + lsa_DeleteSecurityContext, NULL, /* ApplyControlToken */ NULL, /* QueryContextAttributesA */ NULL, /* ImpersonateSecurityContext */ -- 2.15.1

2 1

[PATCH 03/13] secur32: Implement FreeCredentialsHandle in the SSP/AP wrapper.
by Dmitry Timoshkov 31 Jan '18

31 Jan '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/secur32/lsa.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index 8e676fd3a9..ad3223c166 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -377,13 +377,32 @@ done: return status; } +static SECURITY_STATUS WINAPI lsa_FreeCredentialsHandle(CredHandle *credential) +{ + struct lsa_package *lsa_package; + LSA_SEC_HANDLE lsa_credential; + + 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; + + if (!lsa_package->lsa_api || !lsa_package->lsa_api->FreeCredentialsHandle) + return SEC_E_UNSUPPORTED_FUNCTION; + + return lsa_package->lsa_api->FreeCredentialsHandle(lsa_credential); +} + static const SecurityFunctionTableW lsa_sspi_tableW = { 1, NULL, /* EnumerateSecurityPackagesW */ NULL, /* QueryCredentialsAttributesW */ lsa_AcquireCredentialsHandleW, - NULL, /* FreeCredentialsHandle */ + lsa_FreeCredentialsHandle, NULL, /* Reserved2 */ NULL, /* InitializeSecurityContextW */ NULL, /* AcceptSecurityContext */ @@ -415,7 +434,7 @@ static const SecurityFunctionTableA lsa_sspi_tableA = NULL, /* EnumerateSecurityPackagesA */ NULL, /* QueryCredentialsAttributesA */ lsa_AcquireCredentialsHandleA, - NULL, /* FreeCredentialsHandle */ + lsa_FreeCredentialsHandle, NULL, /* Reserved2 */ NULL, /* InitializeSecurityContextA */ NULL, /* AcceptSecurityContext */ -- 2.15.1

2 1

[PATCH 02/13] secur32: Implement AcquireCredentialsHandle in the SSP/AP wrapper.
by Dmitry Timoshkov 31 Jan '18

31 Jan '18

Partially based on Hans Leidekker's work. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/secur32/lsa.c | 138 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 136 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index a683fcb25f..8e676fd3a9 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -243,12 +243,146 @@ static SECPKG_DLL_FUNCTIONS lsa_dll_dispatch = lsa_RegisterCallback }; +static SECURITY_STATUS lsa_lookup_package(SEC_WCHAR *nameW, struct lsa_package **lsa_package) +{ + ULONG i; + UNICODE_STRING package_name, name; + + for (i = 0; i < loaded_packages_count; i++) + { + if (RtlAnsiStringToUnicodeString(&package_name, loaded_packages[i].name, TRUE)) + return SEC_E_INSUFFICIENT_MEMORY; + + RtlInitUnicodeString(&name, nameW); + + if (RtlEqualUnicodeString(&package_name, &name, TRUE)) + { + RtlFreeUnicodeString(&package_name); + *lsa_package = &loaded_packages[i]; + return SEC_E_OK; + } + + RtlFreeUnicodeString(&package_name); + } + + return SEC_E_SECPKG_NOT_FOUND; +} + +static SECURITY_STATUS WINAPI lsa_AcquireCredentialsHandleW( + SEC_WCHAR *principal, SEC_WCHAR *package, ULONG credentials_use, + LUID *logon_id, void *auth_data, SEC_GET_KEY_FN get_key_fn, + void *get_key_arg, CredHandle *credential, TimeStamp *ts_expiry) +{ + SECURITY_STATUS status; + struct lsa_package *lsa_package; + UNICODE_STRING principal_us; + LSA_SEC_HANDLE lsa_credential; + + TRACE("%s %s %#x %p %p %p %p %p\n", debugstr_w(principal), debugstr_w(package), + credentials_use, auth_data, get_key_fn, get_key_arg, credential, ts_expiry); + + if (!credential) return SEC_E_INVALID_HANDLE; + if (!package) return SEC_E_SECPKG_NOT_FOUND; + + status = lsa_lookup_package(package, &lsa_package); + if (status != SEC_E_OK) return status; + + if (!lsa_package->lsa_api || !lsa_package->lsa_api->SpAcquireCredentialsHandle) + return SEC_E_UNSUPPORTED_FUNCTION; + + if (principal) + RtlInitUnicodeString(&principal_us, principal); + + status = lsa_package->lsa_api->SpAcquireCredentialsHandle(principal ? &principal_us : NULL, + 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; + } + return status; +} + +static SECURITY_STATUS WINAPI lsa_AcquireCredentialsHandleA( + SEC_CHAR *principal, SEC_CHAR *package, ULONG credentials_use, + LUID *logon_id, void *auth_data, SEC_GET_KEY_FN get_key_fn, + void *get_key_arg, CredHandle *credential, TimeStamp *ts_expiry) +{ + SECURITY_STATUS status = SEC_E_INSUFFICIENT_MEMORY; + int len_user = 0, len_domain = 0, len_passwd = 0; + SEC_WCHAR *principalW = NULL, *packageW = NULL, *user = NULL, *domain = NULL, *passwd = NULL; + SEC_WINNT_AUTH_IDENTITY_W *auth_dataW = NULL; + SEC_WINNT_AUTH_IDENTITY_A *id = NULL; + + TRACE("%s %s %#x %p %p %p %p %p\n", debugstr_a(principal), debugstr_a(package), + credentials_use, auth_data, get_key_fn, get_key_arg, credential, ts_expiry); + + if (principal) + { + int len = MultiByteToWideChar( CP_ACP, 0, principal, -1, NULL, 0 ); + if (!(principalW = HeapAlloc( GetProcessHeap(), 0, len * sizeof(SEC_WCHAR) ))) goto done; + MultiByteToWideChar( CP_ACP, 0, principal, -1, principalW, len ); + } + if (package) + { + int len = MultiByteToWideChar( CP_ACP, 0, package, -1, NULL, 0 ); + if (!(packageW = HeapAlloc( GetProcessHeap(), 0, len * sizeof(SEC_WCHAR) ))) goto done; + MultiByteToWideChar( CP_ACP, 0, package, -1, packageW, len ); + } + if (auth_data) + { + id = (PSEC_WINNT_AUTH_IDENTITY_A)auth_data; + + if (id->Flags == SEC_WINNT_AUTH_IDENTITY_ANSI) + { + if (!(auth_dataW = HeapAlloc( GetProcessHeap(), 0, sizeof(SEC_WINNT_AUTH_IDENTITY_W) ))) goto done; + if (id->UserLength) + { + len_user = MultiByteToWideChar( CP_ACP, 0, (char *)id->User, id->UserLength, NULL, 0 ); + if (!(user = HeapAlloc( GetProcessHeap(), 0, len_user * sizeof(SEC_WCHAR) ))) goto done; + MultiByteToWideChar( CP_ACP, 0, (char *)id->User, id->UserLength, user, len_user ); + } + if (id->DomainLength) + { + len_domain = MultiByteToWideChar( CP_ACP, 0, (char *)id->Domain, id->DomainLength, NULL, 0 ); + if (!(domain = HeapAlloc( GetProcessHeap(), 0, len_domain * sizeof(SEC_WCHAR) ))) goto done; + MultiByteToWideChar( CP_ACP, 0, (char *)id->Domain, id->DomainLength, domain, len_domain ); + } + if (id->PasswordLength) + { + len_passwd = MultiByteToWideChar( CP_ACP, 0, (char *)id->Password, id->PasswordLength, NULL, 0 ); + if (!(passwd = HeapAlloc( GetProcessHeap(), 0, len_passwd * sizeof(SEC_WCHAR) ))) goto done; + MultiByteToWideChar( CP_ACP, 0, (char *)id->Password, id->PasswordLength, passwd, len_passwd ); + } + auth_dataW->Flags = SEC_WINNT_AUTH_IDENTITY_UNICODE; + auth_dataW->User = user; + auth_dataW->UserLength = len_user; + auth_dataW->Domain = domain; + auth_dataW->DomainLength = len_domain; + auth_dataW->Password = passwd; + auth_dataW->PasswordLength = len_passwd; + } + else auth_dataW = (PSEC_WINNT_AUTH_IDENTITY_W)auth_data; + } + + status = lsa_AcquireCredentialsHandleW( principalW, packageW, credentials_use, logon_id, auth_dataW, get_key_fn, + get_key_arg, credential, ts_expiry ); +done: + if (auth_dataW != (SEC_WINNT_AUTH_IDENTITY_W *)id) HeapFree( GetProcessHeap(), 0, auth_dataW ); + HeapFree( GetProcessHeap(), 0, packageW ); + HeapFree( GetProcessHeap(), 0, principalW ); + HeapFree( GetProcessHeap(), 0, user ); + HeapFree( GetProcessHeap(), 0, domain ); + HeapFree( GetProcessHeap(), 0, passwd ); + return status; +} + static const SecurityFunctionTableW lsa_sspi_tableW = { 1, NULL, /* EnumerateSecurityPackagesW */ NULL, /* QueryCredentialsAttributesW */ - NULL, /* AcquireCredentialsHandleW */ + lsa_AcquireCredentialsHandleW, NULL, /* FreeCredentialsHandle */ NULL, /* Reserved2 */ NULL, /* InitializeSecurityContextW */ @@ -280,7 +414,7 @@ static const SecurityFunctionTableA lsa_sspi_tableA = 1, NULL, /* EnumerateSecurityPackagesA */ NULL, /* QueryCredentialsAttributesA */ - NULL, /* AcquireCredentialsHandleA */ + lsa_AcquireCredentialsHandleA, NULL, /* FreeCredentialsHandle */ NULL, /* Reserved2 */ NULL, /* InitializeSecurityContextA */ -- 2.15.1

2 1

[PATCH 01/13] secur32: Add support for loading SSP/AP dll as an SSPI provider.
by Dmitry Timoshkov 31 Jan '18

31 Jan '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/secur32/lsa.c | 154 ++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 135 insertions(+), 19 deletions(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index 1028c18e71..a683fcb25f 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -1,7 +1,7 @@ /* * Copyright (C) 2004 Juan Lang * Copyright (C) 2007 Kai Blin - * Copyright (C) 2017 Dmitry Timoshkov + * Copyright (C) 2017,2018 Dmitry Timoshkov * * Local Security Authority functions, as far as secur32 has them. * @@ -31,10 +31,12 @@ #include "ntsecapi.h" #include "ntsecpkg.h" #include "winternl.h" +#include "rpc.h" +#include "secur32_priv.h" #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(lsa); +WINE_DEFAULT_DEBUG_CHANNEL(secur32); #define LSA_MAGIC ('L' << 24 | 'S' << 16 | 'A' << 8 | ' ') @@ -42,10 +44,10 @@ struct lsa_package { ULONG package_id; HMODULE mod; - ULONG version; LSA_STRING *name; - SECPKG_FUNCTION_TABLE *api; - ULONG table_count; + ULONG lsa_api_version, lsa_table_count, user_api_version, user_table_count; + SECPKG_FUNCTION_TABLE *lsa_api; + SECPKG_USER_FUNCTION_TABLE *user_api; }; static struct lsa_package *loaded_packages; @@ -69,8 +71,8 @@ NTSTATUS WINAPI LsaCallAuthenticationPackage(HANDLE lsa_handle, ULONG package_id { if (loaded_packages[i].package_id == package_id) { - if (loaded_packages[i].api->CallPackageUntrusted) - return loaded_packages[i].api->CallPackageUntrusted(NULL /* FIXME*/, + if (loaded_packages[i].lsa_api->CallPackageUntrusted) + return loaded_packages[i].lsa_api->CallPackageUntrusted(NULL /* FIXME*/, in_buffer, NULL, in_buffer_length, out_buffer, out_buffer_length, status); return SEC_E_UNSUPPORTED_FUNCTION; @@ -228,6 +230,83 @@ static LSA_DISPATCH_TABLE lsa_dispatch = lsa_CopyFromClientBuffer }; +static NTSTATUS NTAPI lsa_RegisterCallback(ULONG callback_id, PLSA_CALLBACK_FUNCTION callback) +{ + FIXME("%u,%p: stub\n", callback_id, callback); + return STATUS_NOT_IMPLEMENTED; +} + +static SECPKG_DLL_FUNCTIONS lsa_dll_dispatch = +{ + lsa_AllocateLsaHeap, + lsa_FreeLsaHeap, + lsa_RegisterCallback +}; + +static const SecurityFunctionTableW lsa_sspi_tableW = +{ + 1, + NULL, /* EnumerateSecurityPackagesW */ + NULL, /* QueryCredentialsAttributesW */ + NULL, /* AcquireCredentialsHandleW */ + NULL, /* FreeCredentialsHandle */ + NULL, /* Reserved2 */ + NULL, /* InitializeSecurityContextW */ + NULL, /* AcceptSecurityContext */ + NULL, /* CompleteAuthToken */ + NULL, /* DeleteSecurityContext */ + NULL, /* ApplyControlToken */ + NULL, /* QueryContextAttributesW */ + NULL, /* ImpersonateSecurityContext */ + NULL, /* RevertSecurityContext */ + NULL, /* MakeSignature */ + NULL, /* VerifySignature */ + NULL, /* FreeContextBuffer */ + NULL, /* QuerySecurityPackageInfoW */ + NULL, /* Reserved3 */ + NULL, /* Reserved4 */ + NULL, /* ExportSecurityContext */ + NULL, /* ImportSecurityContextW */ + NULL, /* AddCredentialsW */ + NULL, /* Reserved8 */ + NULL, /* QuerySecurityContextToken */ + NULL, /* EncryptMessage */ + NULL, /* DecryptMessage */ + NULL, /* SetContextAttributesW */ +}; + +static const SecurityFunctionTableA lsa_sspi_tableA = +{ + 1, + NULL, /* EnumerateSecurityPackagesA */ + NULL, /* QueryCredentialsAttributesA */ + NULL, /* AcquireCredentialsHandleA */ + NULL, /* FreeCredentialsHandle */ + NULL, /* Reserved2 */ + NULL, /* InitializeSecurityContextA */ + NULL, /* AcceptSecurityContext */ + NULL, /* CompleteAuthToken */ + NULL, /* DeleteSecurityContext */ + NULL, /* ApplyControlToken */ + NULL, /* QueryContextAttributesA */ + NULL, /* ImpersonateSecurityContext */ + NULL, /* RevertSecurityContext */ + NULL, /* MakeSignature */ + NULL, /* VerifySignature */ + NULL, /* FreeContextBuffer */ + NULL, /* QuerySecurityPackageInfoA */ + NULL, /* Reserved3 */ + NULL, /* Reserved4 */ + NULL, /* ExportSecurityContext */ + NULL, /* ImportSecurityContextA */ + NULL, /* AddCredentialsA */ + NULL, /* Reserved8 */ + NULL, /* QuerySecurityContextToken */ + NULL, /* EncryptMessage */ + NULL, /* DecryptMessage */ + NULL, /* SetContextAttributesA */ +}; + static void add_package(struct lsa_package *package) { struct lsa_package *new_loaded_packages; @@ -247,26 +326,41 @@ static void add_package(struct lsa_package *package) static BOOL load_package(const WCHAR *name, struct lsa_package *package, ULONG package_id) { - NTSTATUS (NTAPI *lsa_mode_init)(ULONG,PULONG,PSECPKG_FUNCTION_TABLE *, PULONG); + NTSTATUS (NTAPI *pSpLsaModeInitialize)(ULONG, PULONG, PSECPKG_FUNCTION_TABLE *, PULONG); + NTSTATUS (NTAPI *pSpUserModeInitialize)(ULONG, PULONG, PSECPKG_USER_FUNCTION_TABLE *, PULONG); + + memset(package, 0, sizeof(*package)); package->mod = LoadLibraryW(name); if (!package->mod) return FALSE; - lsa_mode_init = (void *)GetProcAddress(package->mod, "SpLsaModeInitialize"); - if (lsa_mode_init) + pSpLsaModeInitialize = (void *)GetProcAddress(package->mod, "SpLsaModeInitialize"); + if (pSpLsaModeInitialize) { NTSTATUS status; - status = lsa_mode_init(SECPKG_INTERFACE_VERSION, &package->version, &package->api, &package->table_count); + status = pSpLsaModeInitialize(SECPKG_INTERFACE_VERSION, &package->lsa_api_version, &package->lsa_api, &package->lsa_table_count); if (status == STATUS_SUCCESS) { - status = package->api->InitializePackage(package_id, &lsa_dispatch, NULL, NULL, &package->name); + status = package->lsa_api->InitializePackage(package_id, &lsa_dispatch, NULL, NULL, &package->name); if (status == STATUS_SUCCESS) { TRACE("%s => %p, name %s, version %#x, api table %p, table count %u\n", debugstr_w(name), package->mod, debugstr_an(package->name->Buffer, package->name->Length), - package->version, package->api, package->table_count); + package->lsa_api_version, package->lsa_api, package->lsa_table_count); package->package_id = package_id; + + status = package->lsa_api->Initialize(package_id, NULL /* FIXME: params */, NULL); + if (status == STATUS_SUCCESS) + { + pSpUserModeInitialize = (void *)GetProcAddress(package->mod, "SpUserModeInitialize"); + if (pSpUserModeInitialize) + { + status = pSpUserModeInitialize(SECPKG_INTERFACE_VERSION, &package->user_api_version, &package->user_api, &package->user_table_count); + if (status == STATUS_SUCCESS) + package->user_api->InstanceInit(SECPKG_INTERFACE_VERSION, &lsa_dll_dispatch, NULL); + } + } return TRUE; } } @@ -278,16 +372,17 @@ static BOOL load_package(const WCHAR *name, struct lsa_package *package, ULONG p #define MAX_SERVICE_NAME 260 -static BOOL WINAPI load_auth_packages(INIT_ONCE *init_once, void *param, void **context) +void load_auth_packages(void) { static const WCHAR LSA_KEY[] = { 'S','y','s','t','e','m','\\', 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', 'C','o','n','t','r','o','l','\\','L','s','a',0 }; DWORD err, i; HKEY root; + SecureProvider *provider; err = RegOpenKeyExW(HKEY_LOCAL_MACHINE, LSA_KEY, 0, KEY_READ, &root); - if (err != ERROR_SUCCESS) return FALSE; + if (err != ERROR_SUCCESS) return; i = 0; for (;;) @@ -310,19 +405,40 @@ static BOOL WINAPI load_auth_packages(INIT_ONCE *init_once, void *param, void ** RegCloseKey(root); - return TRUE; + if (!loaded_packages_count) return; + + provider = SECUR32_addProvider(&lsa_sspi_tableA, &lsa_sspi_tableW, NULL); + if (!provider) + { + ERR("Failed to add SSP/AP provider\n"); + return; + } + + for (i = 0; i < loaded_packages_count; i++) + { + SecPkgInfoW *info; + + info = HeapAlloc(GetProcessHeap(), 0, loaded_packages[i].lsa_table_count * sizeof(*info)); + if (info) + { + NTSTATUS status; + + status = loaded_packages[i].lsa_api->GetInfo(info); + if (status == STATUS_SUCCESS) + SECUR32_addPackages(provider, loaded_packages[i].lsa_table_count, NULL, info); + + HeapFree(GetProcessHeap(), 0, info); + } + } } NTSTATUS WINAPI LsaLookupAuthenticationPackage(HANDLE lsa_handle, PLSA_STRING package_name, PULONG package_id) { - static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; ULONG i; TRACE("%p %p %p\n", lsa_handle, package_name, package_id); - InitOnceExecuteOnce(&init_once, load_auth_packages, NULL, NULL); - for (i = 0; i < loaded_packages_count; i++) { if (!RtlCompareString(loaded_packages[i].name, package_name, FALSE)) -- 2.15.1

2 1

[PATCH] ole32: Return error from IStream Clone.
by Daniel Lehman 31 Jan '18

31 Jan '18

2 1

[PATCH] ole32/tests: Move stream creation to test function that's using it
by Nikolay Sivov 31 Jan '18

31 Jan '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ole32/tests/hglobalstream.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/ole32/tests/hglobalstream.c b/dlls/ole32/tests/hglobalstream.c index e20d81b8b0..6a0498aa60 100644 --- a/dlls/ole32/tests/hglobalstream.c +++ b/dlls/ole32/tests/hglobalstream.c @@ -43,16 +43,20 @@ do { \ } \ } while(0) -static void test_streamonhglobal(IStream *pStream) +static void test_streamonhglobal(void) { const char data[] = "Test String"; ULARGE_INTEGER ull; + IStream *pStream; LARGE_INTEGER ll; char buffer[128]; ULONG read; STATSTG statstg; HRESULT hr; + hr = CreateStreamOnHGlobal(NULL, TRUE, &pStream); + ok(hr == S_OK, "Failed to create a stream, hr %#x.\n", hr); + ull.QuadPart = sizeof(data); hr = IStream_SetSize(pStream, ull); ok_ole_success(hr, "IStream_SetSize"); @@ -293,6 +297,8 @@ static void test_streamonhglobal(IStream *pStream) hr = IStream_SetSize(pStream, ull); ok(hr == E_OUTOFMEMORY || broken(hr == S_OK), /* win9x */ "IStream_SetSize with large size should have returned E_OUTOFMEMORY instead of 0x%08x\n", hr); + + IStream_Release(pStream); } static HRESULT WINAPI TestStream_QueryInterface(IStream *iface, REFIID riid, void **ppv) @@ -510,14 +516,7 @@ static void test_freed_hglobal(void) START_TEST(hglobalstream) { - HRESULT hr; - IStream *pStream; - - hr = CreateStreamOnHGlobal(NULL, TRUE, &pStream); - ok_ole_success(hr, "CreateStreamOnHGlobal"); - - test_streamonhglobal(pStream); - IStream_Release(pStream); + test_streamonhglobal(); test_copyto(); test_freed_hglobal(); } -- 2.15.1

2 1

[PATCH] ole32/tests: Add a trailing '\n' to ok() calls.
by Francois Gouget 31 Jan '18

31 Jan '18

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/ole32/tests/compobj.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index aef10376d1c..f1e0134731c 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -2795,7 +2795,7 @@ static DWORD CALLBACK test_CoWaitForMultipleHandles_thread(LPVOID arg) ok(hr == S_OK, "CoInitializeEx failed with error 0x%08x\n", hr); hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); - ok(hr == S_OK, "CreateStreamOnHGlobal failed: %08x", hr); + ok(hr == S_OK, "CreateStreamOnHGlobal failed: %08x\n", hr); hr = CoMarshalInterface(stream, &IID_IUnknown, &Test_Unknown, MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL); ok(hr == S_OK, "CoMarshalInterface should have returned S_OK instead of 0x%08x\n", hr); @@ -2806,7 +2806,7 @@ static DWORD CALLBACK test_CoWaitForMultipleHandles_thread(LPVOID arg) PostThreadMessageW(GetCurrentThreadId(), WM_QUIT, 0, 0); hr = CoRegisterMessageFilter(&MessageFilter, NULL); - ok(hr == S_OK, "CoRegisterMessageFilter failed: %08x", hr); + ok(hr == S_OK, "CoRegisterMessageFilter failed: %08x\n", hr); thread = CreateThread(NULL, 0, cowait_unmarshal_thread, stream, 0, &tid); ok(thread != NULL, "CreateThread failed, error %u\n", GetLastError()); @@ -2817,7 +2817,7 @@ static DWORD CALLBACK test_CoWaitForMultipleHandles_thread(LPVOID arg) CloseHandle(thread); hr = CoRegisterMessageFilter(NULL, NULL); - ok(hr == S_OK, "CoRegisterMessageFilter failed: %08x", hr); + ok(hr == S_OK, "CoRegisterMessageFilter failed: %08x\n", hr); IStream_Release(stream); -- 2.15.1

2 1

[PATCH] gdi32/tests: Use the global HeapAlloc() wrappers
by Michael Stefaniuc 31 Jan '18

31 Jan '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdi32/tests/font.c | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 117a14f153..70e44f3822 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -28,6 +28,7 @@ #include "winuser.h" #include "winnls.h" +#include "wine/heap.h" #include "wine/test.h" static inline BOOL match_off_by_n(int a, int b, unsigned int n) @@ -109,22 +110,6 @@ static void init(void) system_lang_id = PRIMARYLANGID(GetSystemDefaultLangID()); } -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t size) -{ - if (!mem) return heap_alloc(size); - return HeapReAlloc(GetProcessHeap(), 0, mem, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static INT CALLBACK is_truetype_font_installed_proc(const LOGFONTA *elf, const TEXTMETRICA *ntm, DWORD type, LPARAM lParam) { if (type != TRUETYPE_FONTTYPE) return 1; -- 2.14.3

2 1

[PATCH] dwrite/tests: Use the global HeapAlloc() wrappers
by Michael Stefaniuc 31 Jan '18

31 Jan '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dwrite/tests/font.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 24e8e73b2c..c226dba19f 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -30,6 +30,7 @@ #include "initguid.h" #include "d2d1.h" +#include "wine/heap.h" #include "wine/test.h" #define MS_CMAP_TAG DWRITE_MAKE_OPENTYPE_TAG('c','m','a','p') @@ -121,16 +122,6 @@ static void _expect_ref_broken(IUnknown* obj, ULONG ref, ULONG brokenref, int li ok_(__FILE__,line)(rc == ref || broken(rc == brokenref), "expected refcount %d, got %d\n", ref, rc); } -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static const WCHAR test_fontfile[] = {'w','i','n','e','_','t','e','s','t','_','f','o','n','t','.','t','t','f',0}; static const WCHAR tahomaW[] = {'T','a','h','o','m','a',0}; static const WCHAR arialW[] = {'A','r','i','a','l',0}; -- 2.14.3

2 1

[PATCH] d3dx9: Added D3DXCreateKeyframedAnimationSet stub
by Alistair Leslie-Hughes 31 Jan '18

31 Jan '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/d3dx9_24/d3dx9_24.spec | 2 +- dlls/d3dx9_25/d3dx9_25.spec | 2 +- dlls/d3dx9_26/d3dx9_26.spec | 2 +- dlls/d3dx9_27/d3dx9_27.spec | 2 +- dlls/d3dx9_28/d3dx9_28.spec | 2 +- dlls/d3dx9_29/d3dx9_29.spec | 2 +- dlls/d3dx9_30/d3dx9_30.spec | 2 +- dlls/d3dx9_31/d3dx9_31.spec | 2 +- dlls/d3dx9_32/d3dx9_32.spec | 2 +- dlls/d3dx9_33/d3dx9_33.spec | 2 +- dlls/d3dx9_34/d3dx9_34.spec | 2 +- dlls/d3dx9_35/d3dx9_35.spec | 2 +- dlls/d3dx9_36/animation.c | 12 ++++++++++++ dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_37/d3dx9_37.spec | 2 +- dlls/d3dx9_38/d3dx9_38.spec | 2 +- dlls/d3dx9_39/d3dx9_39.spec | 2 +- dlls/d3dx9_40/d3dx9_40.spec | 2 +- dlls/d3dx9_41/d3dx9_41.spec | 2 +- dlls/d3dx9_42/d3dx9_42.spec | 2 +- dlls/d3dx9_43/d3dx9_43.spec | 2 +- 21 files changed, 32 insertions(+), 20 deletions(-) diff --git a/dlls/d3dx9_24/d3dx9_24.spec b/dlls/d3dx9_24/d3dx9_24.spec index d816fd8..0b9626f 100644 --- a/dlls/d3dx9_24/d3dx9_24.spec +++ b/dlls/d3dx9_24/d3dx9_24.spec @@ -64,7 +64,7 @@ @ stdcall D3DXCreateFontIndirectW(ptr ptr ptr) @ stdcall D3DXCreateFontW(ptr long long long long long long long long long wstr ptr) @ stdcall D3DXCreateFragmentLinker(ptr long ptr) -@ stub D3DXCreateKeyframedAnimationSet(ptr long long long long ptr ptr) +@ stdcall D3DXCreateKeyframedAnimationSet(str long long long long ptr ptr) @ stdcall D3DXCreateLine(ptr ptr) @ stdcall D3DXCreateMatrixStack(long ptr) @ stdcall D3DXCreateMesh(long long long ptr ptr ptr) diff --git a/dlls/d3dx9_25/d3dx9_25.spec b/dlls/d3dx9_25/d3dx9_25.spec index e15230d..a957005 100644 --- a/dlls/d3dx9_25/d3dx9_25.spec +++ b/dlls/d3dx9_25/d3dx9_25.spec @@ -64,7 +64,7 @@ @ stdcall D3DXCreateFontIndirectW(ptr ptr ptr) @ stdcall D3DXCreateFontW(ptr long long long long long long long long long wstr ptr) @ stdcall D3DXCreateFragmentLinker(ptr long ptr) -@ stub D3DXCreateKeyframedAnimationSet(ptr long long long long ptr ptr) +@ stdcall D3DXCreateKeyframedAnimationSet(str long long long long ptr ptr) @ stdcall D3DXCreateLine(ptr ptr) @ stdcall D3DXCreateMatrixStack(long ptr) @ stdcall D3DXCreateMesh(long long long ptr ptr ptr) diff --git a/dlls/d3dx9_26/d3dx9_26.spec b/dlls/d3dx9_26/d3dx9_26.spec index ac25d06..1caa9ea 100644 --- a/dlls/d3dx9_26/d3dx9_26.spec +++ b/dlls/d3dx9_26/d3dx9_26.spec @@ -68,7 +68,7 @@ @ stdcall D3DXCreateFontIndirectW(ptr ptr ptr) @ stdcall D3DXCreateFontW(ptr long long long long long long long long long wstr ptr) @ stdcall D3DXCreateFragmentLinker(ptr long ptr) -@ stub D3DXCreateKeyframedAnimationSet(ptr long long long long ptr ptr) +@ stdcall D3DXCreateKeyframedAnimationSet(str long long long long ptr ptr) @ stdcall D3DXCreateLine(ptr ptr) @ stdcall D3DXCreateMatrixStack(long ptr) @ stdcall D3DXCreateMesh(long long long ptr ptr ptr) diff --git a/dlls/d3dx9_27/d3dx9_27.spec b/dlls/d3dx9_27/d3dx9_27.spec index ac25d06..1caa9ea 100644 --- a/dlls/d3dx9_27/d3dx9_27.spec +++ b/dlls/d3dx9_27/d3dx9_27.spec @@ -68,7 +68,7 @@ @ stdcall D3DXCreateFontIndirectW(ptr ptr ptr) @ stdcall D3DXCreateFontW(ptr long long long long long long long long long wstr ptr) @ stdcall D3DXCreateFragmentLinker(ptr long ptr) -@ stub D3DXCreateKeyframedAnimationSet(ptr long long long long ptr ptr) +@ stdcall D3DXCreateKeyframedAnimationSet(str long long long long ptr ptr) @ stdcall D3DXCreateLine(ptr ptr) @ stdcall D3DXCreateMatrixStack(long ptr) @ stdcall D3DXCreateMesh(long long long ptr ptr ptr) diff --git a/dlls/d3dx9_28/d3dx9_28.spec b/dlls/d3dx9_28/d3dx9_28.spec index a6378d8..8b46ac9 100644 --- a/dlls/d3dx9_28/d3dx9_28.spec +++ b/dlls/d3dx9_28/d3dx9_28.spec @@ -68,7 +68,7 @@ @ stdcall D3DXCreateFontIndirectW(ptr ptr ptr) @ stdcall D3DXCreateFontW(ptr long long long long long long long long long wstr ptr) @ stdcall D3DXCreateFragmentLinker(ptr long ptr) -@ stub D3DXCreateKeyframedAnimationSet(ptr long long long long ptr ptr) +@ stdcall D3DXCreateKeyframedAnimationSet(str long long long long ptr ptr) @ stdcall D3DXCreateLine(ptr ptr) @ stdcall D3DXCreateMatrixStack(long ptr) @ stdcall D3DXCreateMesh(long long long ptr ptr ptr) diff --git a/dlls/d3dx9_29/d3dx9_29.spec b/dlls/d3dx9_29/d3dx9_29.spec index a6378d8..8b46ac9 100644 --- a/dlls/d3dx9_29/d3dx9_29.spec +++ b/dlls/d3dx9_29/d3dx9_29.spec @@ -68,7 +68,7 @@ @ stdcall D3DXCreateFontIndirectW(ptr ptr ptr) @ stdcall D3DXCreateFontW(ptr long long long long long long long long long wstr ptr) @ stdcall D3DXCreateFragmentLinker(ptr long ptr) -@ stub D3DXCreateKeyframedAnimationSet(ptr long long long long ptr ptr) +@ stdcall D3DXCreateKeyframedAnimationSet(str long long long long ptr ptr) @ stdcall D3DXCreateLine(ptr ptr) @ stdcall D3DXCreateMatrixStack(long ptr) @ stdcall D3DXCreateMesh(long long long ptr ptr ptr) diff --git a/dlls/d3dx9_30/d3dx9_30.spec b/dlls/d3dx9_30/d3dx9_30.spec index f122583..d4eee10 100644 --- a/dlls/d3dx9_30/d3dx9_30.spec +++ b/dlls/d3dx9_30/d3dx9_30.spec @@ -68,7 +68,7 @@ @ stdcall D3DXCreateFontIndirectW(ptr ptr ptr) @ stdcall D3DXCreateFontW(ptr long long long long long long long long long wstr ptr) @ stdcall D3DXCreateFragmentLinker(ptr long ptr) -@ stub D3DXCreateKeyframedAnimationSet(ptr long long long long ptr ptr) +@ stdcall D3DXCreateKeyframedAnimationSet(str long long long long ptr ptr) @ stdcall D3DXCreateLine(ptr ptr) @ stdcall D3DXCreateMatrixStack(long ptr) @ stdcall D3DXCreateMesh(long long long ptr ptr ptr) diff --git a/dlls/d3dx9_31/d3dx9_31.spec b/dlls/d3dx9_31/d3dx9_31.spec index a0a74a5..b6ba5a7 100644 --- a/dlls/d3dx9_31/d3dx9_31.spec +++ b/dlls/d3dx9_31/d3dx9_31.spec @@ -67,7 +67,7 @@ @ stdcall D3DXCreateFontIndirectW(ptr ptr ptr) @ stdcall D3DXCreateFontW(ptr long long long long long long long long long wstr ptr) @ stdcall D3DXCreateFragmentLinker(ptr long ptr) -@ stub D3DXCreateKeyframedAnimationSet(ptr long long long long ptr ptr) +@ stdcall D3DXCreateKeyframedAnimationSet(str long long long long ptr ptr) @ stdcall D3DXCreateLine(ptr ptr) @ stdcall D3DXCreateMatrixStack(long ptr) @ stdcall D3DXCreateMesh(long long long ptr ptr ptr) diff --git a/dlls/d3dx9_32/d3dx9_32.spec b/dlls/d3dx9_32/d3dx9_32.spec index e4e4fc6..983dabb 100644 --- a/dlls/d3dx9_32/d3dx9_32.spec +++ b/dlls/d3dx9_32/d3dx9_32.spec @@ -67,7 +67,7 @@ @ stdcall D3DXCreateFontIndirectW(ptr ptr ptr) @ stdcall D3DXCreateFontW(ptr long long long long long long long long long wstr ptr) @ stdcall D3DXCreateFragmentLinker(ptr long ptr) -@ stub D3DXCreateKeyframedAnimationSet(ptr long long long long ptr ptr) +@ stdcall D3DXCreateKeyframedAnimationSet(str long long long long ptr ptr) @ stdcall D3DXCreateLine(ptr ptr) @ stdcall D3DXCreateMatrixStack(long ptr) @ stdcall D3DXCreateMesh(long long long ptr ptr ptr) diff --git a/dlls/d3dx9_33/d3dx9_33.spec b/dlls/d3dx9_33/d3dx9_33.spec index e4e4fc6..983dabb 100644 --- a/dlls/d3dx9_33/d3dx9_33.spec +++ b/dlls/d3dx9_33/d3dx9_33.spec @@ -67,7 +67,7 @@ @ stdcall D3DXCreateFontIndirectW(ptr ptr ptr) @ stdcall D3DXCreateFontW(ptr long long long long long long long long long wstr ptr) @ stdcall D3DXCreateFragmentLinker(ptr long ptr) -@ stub D3DXCreateKeyframedAnimationSet(ptr long long long long ptr ptr) +@ stdcall D3DXCreateKeyframedAnimationSet(str long long long long ptr ptr) @ stdcall D3DXCreateLine(ptr ptr) @ stdcall D3DXCreateMatrixStack(long ptr) @ stdcall D3DXCreateMesh(long long long ptr ptr ptr) diff --git a/dlls/d3dx9_34/d3dx9_34.spec b/dlls/d3dx9_34/d3dx9_34.spec index e4e4fc6..983dabb 100644 --- a/dlls/d3dx9_34/d3dx9_34.spec +++ b/dlls/d3dx9_34/d3dx9_34.spec @@ -67,7 +67,7 @@ @ stdcall D3DXCreateFontIndirectW(ptr ptr ptr) @ stdcall D3DXCreateFontW(ptr long long long long long long long long long wstr ptr) @ stdcall D3DXCreateFragmentLinker(ptr long ptr) -@ stub D3DXCreateKeyframedAnimationSet(ptr long long long long ptr ptr) +@ stdcall D3DXCreateKeyframedAnimationSet(str long long long long ptr ptr) @ stdcall D3DXCreateLine(ptr ptr) @ stdcall D3DXCreateMatrixStack(long ptr) @ stdcall D3DXCreateMesh(long long long ptr ptr ptr) diff --git a/dlls/d3dx9_35/d3dx9_35.spec b/dlls/d3dx9_35/d3dx9_35.spec index e4e4fc6..983dabb 100644 --- a/dlls/d3dx9_35/d3dx9_35.spec +++ b/dlls/d3dx9_35/d3dx9_35.spec @@ -67,7 +67,7 @@ @ stdcall D3DXCreateFontIndirectW(ptr ptr ptr) @ stdcall D3DXCreateFontW(ptr long long long long long long long long long wstr ptr) @ stdcall D3DXCreateFragmentLinker(ptr long ptr) -@ stub D3DXCreateKeyframedAnimationSet(ptr long long long long ptr ptr) +@ stdcall D3DXCreateKeyframedAnimationSet(str long long long long ptr ptr) @ stdcall D3DXCreateLine(ptr ptr) @ stdcall D3DXCreateMatrixStack(long ptr) @ stdcall D3DXCreateMesh(long long long ptr ptr ptr) diff --git a/dlls/d3dx9_36/animation.c b/dlls/d3dx9_36/animation.c index 818bd7a..420ecc6 100644 --- a/dlls/d3dx9_36/animation.c +++ b/dlls/d3dx9_36/animation.c @@ -469,3 +469,15 @@ HRESULT WINAPI D3DXCreateAnimationController(UINT max_outputs, UINT max_sets, return D3D_OK; } + +HRESULT WINAPI D3DXCreateKeyframedAnimationSet(const char *name, double ticks_per_second, + D3DXPLAYBACK_TYPE playback_type, UINT animation_count, UINT callback_key_count, + const D3DXKEY_CALLBACK *callback_keys, ID3DXKeyframedAnimationSet **animation_set) +{ + FIXME("name %s, ticks_per_second %.16e, playback_type %u, animation_count %u, " + "callback_key_count %u, callback_keys %p, animation_set %p stub.\n", + debugstr_a(name), ticks_per_second, playback_type, animation_count, + callback_key_count, callback_keys, animation_set); + + return E_NOTIMPL; +} diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index 0d9fdab..80c6ba5 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -68,7 +68,7 @@ @ stdcall D3DXCreateFontW(ptr long long long long long long long long long wstr ptr) @ stdcall D3DXCreateFragmentLinker(ptr long ptr) @ stdcall D3DXCreateFragmentLinkerEx(ptr long long ptr) -@ stub D3DXCreateKeyframedAnimationSet(ptr long long long long ptr ptr) +@ stdcall D3DXCreateKeyframedAnimationSet(str long long long long ptr ptr) @ stdcall D3DXCreateLine(ptr ptr) @ stdcall D3DXCreateMatrixStack(long ptr) @ stdcall D3DXCreateMesh(long long long ptr ptr ptr) diff --git a/dlls/d3dx9_37/d3dx9_37.spec b/dlls/d3dx9_37/d3dx9_37.spec index 0d9fdab..80c6ba5 100644 --- a/dlls/d3dx9_37/d3dx9_37.spec +++ b/dlls/d3dx9_37/d3dx9_37.spec @@ -68,7 +68,7 @@ @ stdcall D3DXCreateFontW(ptr long long long long long long long long long wstr ptr) @ stdcall D3DXCreateFragmentLinker(ptr long ptr) @ stdcall D3DXCreateFragmentLinkerEx(ptr long long ptr) -@ stub D3DXCreateKeyframedAnimationSet(ptr long long long long ptr ptr) +@ stdcall D3DXCreateKeyframedAnimationSet(str long long long long ptr ptr) @ stdcall D3DXCreateLine(ptr ptr) @ stdcall D3DXCreateMatrixStack(long ptr) @ stdcall D3DXCreateMesh(long long long ptr ptr ptr) diff --git a/dlls/d3dx9_38/d3dx9_38.spec b/dlls/d3dx9_38/d3dx9_38.spec index 0d9fdab..80c6ba5 100644 --- a/dlls/d3dx9_38/d3dx9_38.spec +++ b/dlls/d3dx9_38/d3dx9_38.spec @@ -68,7 +68,7 @@ @ stdcall D3DXCreateFontW(ptr long long long long long long long long long wstr ptr) @ stdcall D3DXCreateFragmentLinker(ptr long ptr) @ stdcall D3DXCreateFragmentLinkerEx(ptr long long ptr) -@ stub D3DXCreateKeyframedAnimationSet(ptr long long long long ptr ptr) +@ stdcall D3DXCreateKeyframedAnimationSet(str long long long long ptr ptr) @ stdcall D3DXCreateLine(ptr ptr) @ stdcall D3DXCreateMatrixStack(long ptr) @ stdcall D3DXCreateMesh(long long long ptr ptr ptr) diff --git a/dlls/d3dx9_39/d3dx9_39.spec b/dlls/d3dx9_39/d3dx9_39.spec index 0d9fdab..80c6ba5 100644 --- a/dlls/d3dx9_39/d3dx9_39.spec +++ b/dlls/d3dx9_39/d3dx9_39.spec @@ -68,7 +68,7 @@ @ stdcall D3DXCreateFontW(ptr long long long long long long long long long wstr ptr) @ stdcall D3DXCreateFragmentLinker(ptr long ptr) @ stdcall D3DXCreateFragmentLinkerEx(ptr long long ptr) -@ stub D3DXCreateKeyframedAnimationSet(ptr long long long long ptr ptr) +@ stdcall D3DXCreateKeyframedAnimationSet(str long long long long ptr ptr) @ stdcall D3DXCreateLine(ptr ptr) @ stdcall D3DXCreateMatrixStack(long ptr) @ stdcall D3DXCreateMesh(long long long ptr ptr ptr) diff --git a/dlls/d3dx9_40/d3dx9_40.spec b/dlls/d3dx9_40/d3dx9_40.spec index 0d9fdab..80c6ba5 100644 --- a/dlls/d3dx9_40/d3dx9_40.spec +++ b/dlls/d3dx9_40/d3dx9_40.spec @@ -68,7 +68,7 @@ @ stdcall D3DXCreateFontW(ptr long long long long long long long long long wstr ptr) @ stdcall D3DXCreateFragmentLinker(ptr long ptr) @ stdcall D3DXCreateFragmentLinkerEx(ptr long long ptr) -@ stub D3DXCreateKeyframedAnimationSet(ptr long long long long ptr ptr) +@ stdcall D3DXCreateKeyframedAnimationSet(str long long long long ptr ptr) @ stdcall D3DXCreateLine(ptr ptr) @ stdcall D3DXCreateMatrixStack(long ptr) @ stdcall D3DXCreateMesh(long long long ptr ptr ptr) diff --git a/dlls/d3dx9_41/d3dx9_41.spec b/dlls/d3dx9_41/d3dx9_41.spec index 0d9fdab..80c6ba5 100644 --- a/dlls/d3dx9_41/d3dx9_41.spec +++ b/dlls/d3dx9_41/d3dx9_41.spec @@ -68,7 +68,7 @@ @ stdcall D3DXCreateFontW(ptr long long long long long long long long long wstr ptr) @ stdcall D3DXCreateFragmentLinker(ptr long ptr) @ stdcall D3DXCreateFragmentLinkerEx(ptr long long ptr) -@ stub D3DXCreateKeyframedAnimationSet(ptr long long long long ptr ptr) +@ stdcall D3DXCreateKeyframedAnimationSet(str long long long long ptr ptr) @ stdcall D3DXCreateLine(ptr ptr) @ stdcall D3DXCreateMatrixStack(long ptr) @ stdcall D3DXCreateMesh(long long long ptr ptr ptr) diff --git a/dlls/d3dx9_42/d3dx9_42.spec b/dlls/d3dx9_42/d3dx9_42.spec index 086d0b5..ca07eda 100644 --- a/dlls/d3dx9_42/d3dx9_42.spec +++ b/dlls/d3dx9_42/d3dx9_42.spec @@ -66,7 +66,7 @@ @ stdcall D3DXCreateFontIndirectA(ptr ptr ptr) @ stdcall D3DXCreateFontIndirectW(ptr ptr ptr) @ stdcall D3DXCreateFontW(ptr long long long long long long long long long wstr ptr) -@ stub D3DXCreateKeyframedAnimationSet(ptr long long long long ptr ptr) +@ stdcall D3DXCreateKeyframedAnimationSet(str long long long long ptr ptr) @ stdcall D3DXCreateLine(ptr ptr) @ stdcall D3DXCreateMatrixStack(long ptr) @ stdcall D3DXCreateMesh(long long long ptr ptr ptr) diff --git a/dlls/d3dx9_43/d3dx9_43.spec b/dlls/d3dx9_43/d3dx9_43.spec index 086d0b5..ca07eda 100644 --- a/dlls/d3dx9_43/d3dx9_43.spec +++ b/dlls/d3dx9_43/d3dx9_43.spec @@ -66,7 +66,7 @@ @ stdcall D3DXCreateFontIndirectA(ptr ptr ptr) @ stdcall D3DXCreateFontIndirectW(ptr ptr ptr) @ stdcall D3DXCreateFontW(ptr long long long long long long long long long wstr ptr) -@ stub D3DXCreateKeyframedAnimationSet(ptr long long long long ptr ptr) +@ stdcall D3DXCreateKeyframedAnimationSet(str long long long long ptr ptr) @ stdcall D3DXCreateLine(ptr ptr) @ stdcall D3DXCreateMatrixStack(long ptr) @ stdcall D3DXCreateMesh(long long long ptr ptr ptr) -- 1.9.1

2 1

[PATCH 1/2] user32: Kill focus before minimizing a window.
by Zebediah Figura 31 Jan '18

31 Jan '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/user32/tests/win.c | 31 ++++++++++++++++++++++++++++++- dlls/user32/winpos.c | 8 ++++++++ 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index d95b831..e134d54 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -3113,7 +3113,6 @@ todo_wine ShowWindow(hwnd, SW_SHOWMINIMIZED); ok( GetActiveWindow() == hwnd, "parent window %p should be active\n", hwnd); ok( GetFocus() != child, "Focus should not be on child %p\n", child ); -todo_wine ok( GetFocus() != hwnd, "Focus should not be on parent %p\n", hwnd ); old_wnd_proc = (WNDPROC)SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (LONG_PTR)set_focus_on_activate_proc); ShowWindow(hwnd, SW_RESTORE); @@ -10273,6 +10272,13 @@ static void test_minimize_window(HWND hwndMain) ShowWindow(hwnd2, SW_RESTORE); check_active_state(hwnd2, hwnd2, hwnd2); + /* try SW_SHOWMINIMIZED */ + ShowWindow(hwnd2, SW_SHOWMINIMIZED); + check_active_state(hwnd2, hwnd2, 0); + + ShowWindow(hwnd2, SW_RESTORE); + check_active_state(hwnd2, hwnd2, hwnd2); + /* hide a non-active window */ ShowWindow(hwnd, SW_MINIMIZE); check_active_state(hwnd2, hwnd2, hwnd2); @@ -10316,6 +10322,11 @@ static void test_minimize_window(HWND hwndMain) todo_wine check_active_state(hwnd2, hwnd2, hwnd2); + /* with SW_SHOWMINIMIZED */ + ShowWindow(hwnd3, SW_RESTORE); + ShowWindow(hwnd3, SW_SHOWMINIMIZED); + check_active_state(hwnd3, hwnd3, 0); + /* hide an owner window */ ShowWindow(hwnd, SW_RESTORE); ShowWindow(hwnd2, SW_RESTORE); @@ -10325,6 +10336,24 @@ static void test_minimize_window(HWND hwndMain) check_active_state(hwnd2, hwnd2, hwnd2); DestroyWindow(hwnd3); + + /* test a child window - focus should be yielded back to the parent */ + ShowWindow(hwnd, SW_RESTORE); + hwnd3 = CreateWindowExA(0, "MainWindowClass", "Child window 3", WS_CHILD|WS_VISIBLE, + 100, 100, 200, 200, hwnd, 0, GetModuleHandleA(NULL), NULL); + SetFocus(hwnd3); + check_active_state(hwnd, hwnd, hwnd3); + ShowWindow(hwnd3, SW_MINIMIZE); + check_active_state(hwnd, hwnd, hwnd); + + /* with SW_SHOWMINIMIZED */ + ShowWindow(hwnd3, SW_RESTORE); + SetFocus(hwnd3); + check_active_state(hwnd, hwnd, hwnd3); + ShowWindow(hwnd3, SW_SHOWMINIMIZED); + check_active_state(hwnd, hwnd, hwnd); + + DestroyWindow(hwnd3); DestroyWindow(hwnd2); DestroyWindow(hwnd); diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 5579de4..f68227a 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -928,6 +928,14 @@ UINT WINPOS_MinMaximize( HWND hwnd, UINT cmd, LPRECT rect ) if (IsZoomed( hwnd )) win_set_flags( hwnd, WIN_RESTORE_MAX, 0 ); else win_set_flags( hwnd, 0, WIN_RESTORE_MAX ); + if (GetFocus() == hwnd) + { + if (GetWindowLongW(hwnd, GWL_STYLE) & WS_CHILD) + SetFocus(GetAncestor(hwnd, GA_PARENT)); + else + SetFocus(0); + } + old_style = WIN_SetStyle( hwnd, WS_MINIMIZE, WS_MAXIMIZE ); wpl.ptMinPosition = WINPOS_GetMinimizedPos( hwnd, wpl.ptMinPosition ); -- 2.7.4

2 3

[PATCH] iccvid: Use the global HeapAlloc() wrappers
by Michael Stefaniuc 30 Jan '18

30 Jan '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/iccvid/iccvid.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/dlls/iccvid/iccvid.c b/dlls/iccvid/iccvid.c index e5d514703e..89d282ba78 100644 --- a/dlls/iccvid/iccvid.c +++ b/dlls/iccvid/iccvid.c @@ -51,6 +51,7 @@ #include "iccvid_private.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(iccvid); @@ -81,16 +82,6 @@ typedef struct _ICCVID_Info cinepak_info *cvinfo; } ICCVID_Info; -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - /* ------------------------------------------------------------------------ */ static unsigned char *in_buffer, uiclip[1024], *uiclp = NULL; -- 2.14.3

1 0

[PATCH] hhctrl.ocx: Use the global HeapAlloc() wrappers
by Michael Stefaniuc 30 Jan '18

30 Jan '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/hhctrl.ocx/hhctrl.h | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/dlls/hhctrl.ocx/hhctrl.h b/dlls/hhctrl.ocx/hhctrl.h index 5318b5f06f..b358f54378 100644 --- a/dlls/hhctrl.ocx/hhctrl.h +++ b/dlls/hhctrl.ocx/hhctrl.h @@ -40,6 +40,7 @@ #include "wine/itss.h" #include "wine/unicode.h" +#include "wine/heap.h" #include "wine/list.h" #define WB_GOBACK 0 @@ -244,31 +245,11 @@ HHInfo *find_window(const WCHAR *window) DECLSPEC_HIDDEN; /* memory allocation functions */ -static inline void * __WINE_ALLOC_SIZE(1) heap_alloc(size_t len) -{ - return HeapAlloc(GetProcessHeap(), 0, len); -} - -static inline void * __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t len) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); -} - -static inline void * __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t len) -{ - return HeapReAlloc(GetProcessHeap(), 0, mem, len); -} - static inline void * __WINE_ALLOC_SIZE(2) heap_realloc_zero(void *mem, size_t len) { return HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, len); } -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static inline LPWSTR strdupW(LPCWSTR str) { LPWSTR ret; -- 2.14.3

1 0

[PATCH] dnsapi: Use the global HeapAlloc() wrappers
by Michael Stefaniuc 30 Jan '18

30 Jan '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dnsapi/dnsapi.h | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/dlls/dnsapi/dnsapi.h b/dlls/dnsapi/dnsapi.h index 8a025211af..0b679731e9 100644 --- a/dlls/dnsapi/dnsapi.h +++ b/dlls/dnsapi/dnsapi.h @@ -22,20 +22,7 @@ # error You must include config.h to use this header #endif -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} +#include "wine/heap.h" static inline LPSTR dns_strdup_a( LPCSTR src ) { -- 2.14.3

1 0

[PATCH] explorerframe: Use the global HeapAlloc() wrappers
by Michael Stefaniuc 30 Jan '18

30 Jan '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/explorerframe/explorerframe_main.h | 10 ---------- dlls/explorerframe/taskbarlist.c | 1 + 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/dlls/explorerframe/explorerframe_main.h b/dlls/explorerframe/explorerframe_main.h index ec8b3634c4..14e551c48d 100644 --- a/dlls/explorerframe/explorerframe_main.h +++ b/dlls/explorerframe/explorerframe_main.h @@ -34,14 +34,4 @@ static inline void EFRAME_UnlockModule(void) { InterlockedDecrement( &EFRAME_ref HRESULT NamespaceTreeControl_Constructor(IUnknown *pUnkOuter, REFIID riid, void **ppv) DECLSPEC_HIDDEN; HRESULT TaskbarList_Constructor(IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - #endif /* __WINE_EXPLORERFRAME_H */ diff --git a/dlls/explorerframe/taskbarlist.c b/dlls/explorerframe/taskbarlist.c index 26a2c1a487..a50f8a97d3 100644 --- a/dlls/explorerframe/taskbarlist.c +++ b/dlls/explorerframe/taskbarlist.c @@ -21,6 +21,7 @@ #include "explorerframe_main.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(explorerframe); -- 2.14.3

1 0

[PATCH 1/5] wined3d: Enable the multi-threaded command stream by default.
by Henri Verbeet 30 Jan '18

30 Jan '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/wined3d_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 28a34a7..6c23d0b 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -72,7 +72,7 @@ static CRITICAL_SECTION wined3d_wndproc_cs = {&wined3d_wndproc_cs_debug, -1, 0, * where appropriate. */ struct wined3d_settings wined3d_settings = { - FALSE, /* No multithreaded CS by default. */ + TRUE, /* Multithreaded CS by default. */ FALSE, /* explicit_gl_version */ MAKEDWORD_VERSION(1, 0), /* Default to legacy OpenGL */ TRUE, /* Use of GLSL enabled by default */ -- 2.1.4

3 2

[PATCH] kernel32: add QueryProcessCycleTime stub (try 2)
by Austin English 30 Jan '18

30 Jan '18

Try 2: remove accidental double pointer (Thanks Nikolay) Signed-off-by: Austin English <austinenglish(a)gmail.com> --- .../api-ms-win-core-realtime-l1-1-0.spec | 2 +- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/time.c | 12 ++++++++++++ dlls/kernelbase/kernelbase.spec | 2 +- 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-core-realtime-l1-1-0/api-ms-win-core-realtime-l1-1-0.spec b/dlls/api-ms-win-core-realtime-l1-1-0/api-ms-win-core-realtime-l1-1-0.spec index 9c70db1f6f..0def2d7b3a 100644 --- a/dlls/api-ms-win-core-realtime-l1-1-0/api-ms-win-core-realtime-l1-1-0.spec +++ b/dlls/api-ms-win-core-realtime-l1-1-0/api-ms-win-core-realtime-l1-1-0.spec @@ -1,5 +1,5 @@ @ stub QueryIdleProcessorCycleTime @ stub QueryIdleProcessorCycleTimeEx -@ stub QueryProcessCycleTime +@ stdcall QueryProcessCycleTime(long ptr) kernel32.QueryProcessCycleTime @ stdcall QueryThreadCycleTime(long ptr) kernel32.QueryThreadCycleTime @ stdcall QueryUnbiasedInterruptTime(ptr) kernel32.QueryUnbiasedInterruptTime diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 2c719d437e..5ce637233a 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1171,7 +1171,7 @@ @ stdcall QueryPerformanceCounter(ptr) @ stdcall QueryPerformanceFrequency(ptr) # @ stub QueryProcessAffinityUpdateMode -# @ stub QueryProcessCycleTime +@ stdcall QueryProcessCycleTime(long ptr) @ stdcall QueryThreadCycleTime(long ptr) # @ stub QueryThreadProfiling # @ stub QueryThreadpoolStackInformation diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index fbe58118fd..b0b866967c 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -1408,6 +1408,18 @@ DWORD WINAPI GetDynamicTimeZoneInformation(DYNAMIC_TIME_ZONE_INFORMATION *tzinfo } /*********************************************************************** + * QueryProcessCycleTime (KERNEL32.@) + */ +BOOL WINAPI QueryProcessCycleTime(HANDLE process, PULONG64 cycle) +{ + static int once; + if (!once++) + FIXME("(%p,%p): stub!\n", process, cycle); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/*********************************************************************** * QueryThreadCycleTime (KERNEL32.@) */ BOOL WINAPI QueryThreadCycleTime(HANDLE thread, PULONG64 cycle) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index b9eb4fcf87..ca33bfdce7 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1206,7 +1206,7 @@ @ stdcall QueryPerformanceCounter(ptr) kernel32.QueryPerformanceCounter @ stdcall QueryPerformanceFrequency(ptr) kernel32.QueryPerformanceFrequency @ stub QueryProcessAffinityUpdateMode -# @ stub QueryProcessCycleTime +@ stdcall QueryProcessCycleTime(long ptr) kernel32.QueryProcessCycleTime # @ stub QueryProtectedPolicy @ stub QuerySecurityAccessMask # @ stub QueryStateAtomValueInfo -- 2.13.6

1 0

[PATCH 1/2] include: Add CertRegisterSystemStore and CertUnregisterSystemStore
by Alex Henrie 30 Jan '18

30 Jan '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/crypt32/store.c | 2 +- include/wincrypt.h | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index 91a3cbc0dc..bc4ebde5f6 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -1414,7 +1414,7 @@ BOOL WINAPI CertRegisterSystemStore(const void *pvSystemStore, DWORD dwFlags, return FALSE; } -BOOL WINAPI CertUnregisterSystemStore(void *pvSystemStore, DWORD dwFlags) +BOOL WINAPI CertUnregisterSystemStore(const void *pvSystemStore, DWORD dwFlags) { HCERTSTORE hstore; diff --git a/include/wincrypt.h b/include/wincrypt.h index 6986bd819e..a793e8ad22 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -4084,6 +4084,11 @@ BOOL WINAPI CertEnumSystemStoreLocation(DWORD dwFlags, void *pvArg, BOOL WINAPI CertEnumSystemStore(DWORD dwFlags, void *pvSystemStoreLocationPara, void *pvArg, PFN_CERT_ENUM_SYSTEM_STORE pfnEnum); +BOOL WINAPI CertRegisterSystemStore(const void *store, DWORD flags, + CERT_SYSTEM_STORE_INFO *info, void *reserved); + +BOOL WINAPI CertUnregisterSystemStore(const void *store, DWORD flags); + BOOL WINAPI CertEnumPhysicalStore(const void *pvSystemStore, DWORD dwFlags, void *pvArg, PFN_CERT_ENUM_PHYSICAL_STORE pfnEnum); -- 2.16.1

1 1

[PATCH 0/7] Minimal headless WMP implementation
by Anton Romanov 30 Jan '18

30 Jan '18

This series implement enough of WMP for WPF's MediaPlayer class to be mostly functional and makes "Magic The Gathering: Online" have sound. Anton Romanov (7): wmp: Add IWMPPlayer interface wmp: Implement IConnectionPoint[Container] and add _WMPOCXEvents wmp: add IWMPControls stub implementation wmp: Add wmp defs wmp: Add IWMPMedia stub wmp: Add IWMPNetwork stub wmp: Implement minimal headless WMP dlls/wmp/Makefile.in | 3 +- dlls/wmp/events.c | 388 ++++++++++++++++++ dlls/wmp/oleobj.c | 81 +--- dlls/wmp/player.c | 1013 +++++++++++++++++++++++++++++++++++++++++++++-- dlls/wmp/tests/oleobj.c | 2 +- dlls/wmp/wmp_main.c | 2 + dlls/wmp/wmp_private.h | 59 ++- dlls/wmp/wmpids.h | 437 ++++++++++++++++++++ include/wmp.idl | 27 +- 9 files changed, 1924 insertions(+), 88 deletions(-) create mode 100644 dlls/wmp/events.c create mode 100644 dlls/wmp/wmpids.h -- 2.15.1

1 7

[PATCH 1/6] dxgi: Add FIXME messages for unhandled DXGI_SWAP_CHAIN_FULLSCREEN_DESC fields.
by Józef Kucia 30 Jan '18

30 Jan '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/factory.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index 3f8816b3c23b..aa9cdb88fb6c 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -254,8 +254,8 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChainForHwnd(IDXGIFactor IWineDXGIDevice *dxgi_device; HRESULT hr; - FIXME("iface %p, device %p, window %p, swapchain_desc %p, fullscreen_desc %p, " - "output %p, swapchain %p partial stub!\n", + TRACE("iface %p, device %p, window %p, swapchain_desc %p, fullscreen_desc %p, " + "output %p, swapchain %p.\n", iface, device, window, swapchain_desc, fullscreen_desc, output, swapchain); if (!device || !swapchain_desc || !swapchain) @@ -309,6 +309,10 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChainForHwnd(IDXGIFactor FIXME("Ignoring swap effect %#x.\n", swapchain_desc->SwapEffect); if (swapchain_desc->AlphaMode != DXGI_ALPHA_MODE_IGNORE) FIXME("Ignoring alpha mode %#x.\n", swapchain_desc->AlphaMode); + if (fullscreen_desc && fullscreen_desc->ScanlineOrdering) + FIXME("Unhandled scanline ordering %#x.\n", fullscreen_desc->ScanlineOrdering); + if (fullscreen_desc && fullscreen_desc->Scaling) + FIXME("Unhandled mode scaling %#x.\n", fullscreen_desc->Scaling); wined3d_desc.backbuffer_width = swapchain_desc->Width; wined3d_desc.backbuffer_height = swapchain_desc->Height; -- 2.13.6

2 11

[PATCH 1/4] wined3d: Simplify code paths in wined3d_cs_exec_update_sub_resource().
by Józef Kucia 30 Jan '18

30 Jan '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/cs.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 78443d174a27..bb9b915a5980 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2170,31 +2170,31 @@ void wined3d_cs_emit_blt_sub_resource(struct wined3d_cs *cs, struct wined3d_reso static void wined3d_cs_exec_update_sub_resource(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_update_sub_resource *op = data; + struct wined3d_resource *resource = op->resource; const struct wined3d_box *box = &op->box; unsigned int width, height, depth, level; struct wined3d_const_bo_address addr; struct wined3d_context *context; struct wined3d_texture *texture; - if (op->resource->type == WINED3D_RTYPE_BUFFER) + context = context_acquire(cs->device, NULL, 0); + + if (resource->type == WINED3D_RTYPE_BUFFER) { - struct wined3d_buffer *buffer = buffer_from_resource(op->resource); + struct wined3d_buffer *buffer = buffer_from_resource(resource); - context = context_acquire(op->resource->device, NULL, 0); if (!wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_BUFFER)) { ERR("Failed to load buffer location.\n"); - context_release(context); goto done; } wined3d_buffer_upload_data(buffer, context, box, op->data.data); wined3d_buffer_invalidate_location(buffer, ~WINED3D_LOCATION_BUFFER); - context_release(context); goto done; } - texture = wined3d_texture_from_resource(op->resource); + texture = wined3d_texture_from_resource(resource); level = op->sub_resource_idx % texture->level_count; width = wined3d_texture_get_level_width(texture, level); @@ -2204,8 +2204,6 @@ static void wined3d_cs_exec_update_sub_resource(struct wined3d_cs *cs, const voi addr.buffer_object = 0; addr.addr = op->data.data; - context = context_acquire(op->resource->device, NULL, 0); - /* Only load the sub-resource for partial updates. */ if (!box->left && !box->top && !box->front && box->right == width && box->bottom == height && box->back == depth) @@ -2217,13 +2215,13 @@ static void wined3d_cs_exec_update_sub_resource(struct wined3d_cs *cs, const voi wined3d_texture_upload_data(texture, op->sub_resource_idx, context, box, &addr, op->data.row_pitch, op->data.slice_pitch); - context_release(context); - wined3d_texture_validate_location(texture, op->sub_resource_idx, WINED3D_LOCATION_TEXTURE_RGB); wined3d_texture_invalidate_location(texture, op->sub_resource_idx, ~WINED3D_LOCATION_TEXTURE_RGB); done: - wined3d_resource_release(op->resource); + context_release(context); + + wined3d_resource_release(resource); } void wined3d_cs_emit_update_sub_resource(struct wined3d_cs *cs, struct wined3d_resource *resource, -- 2.13.6

3 7

[v2 PATCH] winedbg: Remove some unnecessary pointer casts
by Nikolay Sivov 30 Jan '18

30 Jan '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: missed one changed file programs/winedbg/info.c | 2 +- programs/winedbg/winedbg.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c index e521252ec3..89a2dc43fa 100644 --- a/programs/winedbg/info.c +++ b/programs/winedbg/info.c @@ -218,7 +218,7 @@ void info_win32_module(DWORD64 base) * enumeration */ SymSetOptions((opt = SymGetOptions()) | 0x40000000); - SymEnumerateModules64(dbg_curr_process->handle, info_mod_cb, (void*)&im); + SymEnumerateModules64(dbg_curr_process->handle, info_mod_cb, &im); SymSetOptions(opt); qsort(im.mi, im.num_used, sizeof(im.mi[0]), module_compare); diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index 11782fea97..e0ad4d8751 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -425,7 +425,7 @@ BOOL dbg_get_debuggee_info(HANDLE hProcess, IMAGEHLP_MODULE64* imh_mod) * enumeration */ SymSetOptions((opt = SymGetOptions()) | 0x40000000); - SymEnumerateModules64(hProcess, mod_loader_cb, (void*)&mli); + SymEnumerateModules64(hProcess, mod_loader_cb, &mli); SymSetOptions(opt); return imh_mod->BaseOfImage != 0; -- 2.15.1

1 0

[PATCH] winedbg: Remove some unnecessary pointer casts
by Nikolay Sivov 30 Jan '18

30 Jan '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- programs/winedbg/info.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c index e521252ec3..89a2dc43fa 100644 --- a/programs/winedbg/info.c +++ b/programs/winedbg/info.c @@ -218,7 +218,7 @@ void info_win32_module(DWORD64 base) * enumeration */ SymSetOptions((opt = SymGetOptions()) | 0x40000000); - SymEnumerateModules64(dbg_curr_process->handle, info_mod_cb, (void*)&im); + SymEnumerateModules64(dbg_curr_process->handle, info_mod_cb, &im); SymSetOptions(opt); qsort(im.mi, im.num_used, sizeof(im.mi[0]), module_compare); -- 2.15.1

1 0

[PATCH 1/3] dbghelp: Preserve caller supplied structure size member in SymGetModuleInfo() functions
by Nikolay Sivov 30 Jan '18

30 Jan '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dbghelp/module.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index c6c9d5eb19..765a7235a1 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -934,7 +934,7 @@ BOOL WINAPI SymGetModuleInfo(HANDLE hProcess, DWORD dwAddr, miw64.SizeOfStruct = sizeof(miw64); if (!SymGetModuleInfoW64(hProcess, dwAddr, &miw64)) return FALSE; - mi.SizeOfStruct = miw64.SizeOfStruct; + mi.SizeOfStruct = ModuleInfo->SizeOfStruct; mi.BaseOfImage = miw64.BaseOfImage; mi.ImageSize = miw64.ImageSize; mi.TimeDateStamp = miw64.TimeDateStamp; @@ -968,7 +968,7 @@ BOOL WINAPI SymGetModuleInfoW(HANDLE hProcess, DWORD dwAddr, miw64.SizeOfStruct = sizeof(miw64); if (!SymGetModuleInfoW64(hProcess, dwAddr, &miw64)) return FALSE; - miw.SizeOfStruct = miw64.SizeOfStruct; + miw.SizeOfStruct = ModuleInfo->SizeOfStruct; miw.BaseOfImage = miw64.BaseOfImage; miw.ImageSize = miw64.ImageSize; miw.TimeDateStamp = miw64.TimeDateStamp; @@ -1003,7 +1003,7 @@ BOOL WINAPI SymGetModuleInfo64(HANDLE hProcess, DWORD64 dwAddr, miw64.SizeOfStruct = sizeof(miw64); if (!SymGetModuleInfoW64(hProcess, dwAddr, &miw64)) return FALSE; - mi64.SizeOfStruct = miw64.SizeOfStruct; + mi64.SizeOfStruct = ModuleInfo->SizeOfStruct; mi64.BaseOfImage = miw64.BaseOfImage; mi64.ImageSize = miw64.ImageSize; mi64.TimeDateStamp = miw64.TimeDateStamp; -- 2.15.1

1 2

[PATCH 5/5] d2d1: Use the global memory allocation helpers.
by Henri Verbeet 30 Jan '18

30 Jan '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d2d1/bitmap.c | 14 +++++----- dlls/d2d1/bitmap_render_target.c | 2 +- dlls/d2d1/brush.c | 29 ++++++++++---------- dlls/d2d1/d2d1_private.h | 1 + dlls/d2d1/dc_render_target.c | 2 +- dlls/d2d1/factory.c | 32 +++++++++++----------- dlls/d2d1/geometry.c | 57 ++++++++++++++++++---------------------- dlls/d2d1/hwnd_render_target.c | 2 +- dlls/d2d1/layer.c | 4 +-- dlls/d2d1/mesh.c | 4 +-- dlls/d2d1/render_target.c | 20 +++++++------- dlls/d2d1/state_block.c | 2 +- dlls/d2d1/stroke.c | 6 ++--- dlls/d2d1/wic_render_target.c | 2 +- include/wine/heap.h | 2 +- 15 files changed, 88 insertions(+), 91 deletions(-) diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c index b03482a..43ed094 100644 --- a/dlls/d2d1/bitmap.c +++ b/dlls/d2d1/bitmap.c @@ -70,7 +70,7 @@ static ULONG STDMETHODCALLTYPE d2d_bitmap_Release(ID2D1Bitmap *iface) { ID3D10ShaderResourceView_Release(bitmap->view); ID2D1Factory_Release(bitmap->factory); - HeapFree(GetProcessHeap(), 0, bitmap); + heap_free(bitmap); } return refcount; @@ -286,7 +286,7 @@ HRESULT d2d_bitmap_create(ID2D1Factory *factory, ID3D10Device *device, D2D1_SIZE return hr; } - if ((*bitmap = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(**bitmap)))) + if ((*bitmap = heap_alloc_zero(sizeof(**bitmap)))) { d2d_bitmap_init(*bitmap, factory, view, size, desc); TRACE("Created bitmap %p.\n", *bitmap); @@ -340,7 +340,7 @@ HRESULT d2d_bitmap_create_shared(ID2D1RenderTarget *render_target, ID3D10Device goto failed; } - if (!(*bitmap = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(**bitmap)))) + if (!(*bitmap = heap_alloc_zero(sizeof(**bitmap)))) { hr = E_OUTOFMEMORY; goto failed; @@ -386,7 +386,7 @@ HRESULT d2d_bitmap_create_shared(ID2D1RenderTarget *render_target, ID3D10Device return hr; } - if (!(*bitmap = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(**bitmap)))) + if (!(*bitmap = heap_alloc_zero(sizeof(**bitmap)))) { ID3D10ShaderResourceView_Release(view); return E_OUTOFMEMORY; @@ -510,7 +510,7 @@ HRESULT d2d_bitmap_create_from_wic_bitmap(ID2D1Factory *factory, ID3D10Device *d pitch = ((bpp * size.width) + 15) & ~15; data_size = pitch * size.height; - if (!(data = HeapAlloc(GetProcessHeap(), 0, data_size))) + if (!(data = heap_alloc(data_size))) return E_OUTOFMEMORY; rect.X = 0; @@ -520,13 +520,13 @@ HRESULT d2d_bitmap_create_from_wic_bitmap(ID2D1Factory *factory, ID3D10Device *d if (FAILED(hr = IWICBitmapSource_CopyPixels(bitmap_source, &rect, pitch, data_size, data))) { WARN("Failed to copy bitmap pixels, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, data); + heap_free(data); return hr; } hr = d2d_bitmap_create(factory, device, size, data, pitch, &bitmap_desc, bitmap); - HeapFree(GetProcessHeap(), 0, data); + heap_free(data); return hr; } diff --git a/dlls/d2d1/bitmap_render_target.c b/dlls/d2d1/bitmap_render_target.c index 105caa9..de58872 100644 --- a/dlls/d2d1/bitmap_render_target.c +++ b/dlls/d2d1/bitmap_render_target.c @@ -75,7 +75,7 @@ static ULONG STDMETHODCALLTYPE d2d_bitmap_render_target_Release(ID2D1BitmapRende { ID2D1RenderTarget_Release(render_target->dxgi_target); ID2D1Bitmap_Release(render_target->bitmap); - HeapFree(GetProcessHeap(), 0, render_target); + heap_free(render_target); } return refcount; diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index ba07006..6759019 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -67,10 +67,10 @@ static ULONG STDMETHODCALLTYPE d2d_gradient_Release(ID2D1GradientStopCollection if (!refcount) { - HeapFree(GetProcessHeap(), 0, gradient->stops); + heap_free(gradient->stops); ID3D10ShaderResourceView_Release(gradient->view); ID2D1Factory_Release(gradient->factory); - HeapFree(GetProcessHeap(), 0, gradient); + heap_free(gradient); } return refcount; @@ -142,7 +142,7 @@ HRESULT d2d_gradient_create(ID2D1Factory *factory, ID3D10Device *device, const D unsigned int i; HRESULT hr; - if (!(data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, 2 * stop_count * sizeof(*data)))) + if (!(data = heap_alloc_zero(2 * stop_count * sizeof(*data)))) { ERR("Failed to allocate data.\n"); return E_OUTOFMEMORY; @@ -168,7 +168,7 @@ HRESULT d2d_gradient_create(ID2D1Factory *factory, ID3D10Device *device, const D buffer_data.SysMemSlicePitch = 0; hr = ID3D10Device_CreateBuffer(device, &buffer_desc, &buffer_data, &buffer); - HeapFree(GetProcessHeap(), 0, data); + heap_free(data); if (FAILED(hr)) { ERR("Failed to create buffer, hr %#x.\n", hr); @@ -188,7 +188,7 @@ HRESULT d2d_gradient_create(ID2D1Factory *factory, ID3D10Device *device, const D return hr; } - if (!(*gradient = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(**gradient)))) + if (!(*gradient = heap_alloc_zero(sizeof(**gradient)))) { ID3D10ShaderResourceView_Release(view); return E_OUTOFMEMORY; @@ -205,10 +205,10 @@ HRESULT d2d_gradient_create(ID2D1Factory *factory, ID3D10Device *device, const D (*gradient)->view = view; (*gradient)->stop_count = stop_count; - if (!((*gradient)->stops = HeapAlloc(GetProcessHeap(), 0, stop_count * sizeof(*stops)))) + if (!((*gradient)->stops = heap_alloc(stop_count * sizeof(*stops)))) { ID3D10ShaderResourceView_Release(view); - HeapFree(GetProcessHeap(), 0, *gradient); + heap_free(*gradient); return E_OUTOFMEMORY; } memcpy((*gradient)->stops, stops, stop_count * sizeof(*stops)); @@ -233,7 +233,7 @@ static void d2d_gradient_bind(struct d2d_gradient *gradient, ID3D10Device *devic static void d2d_brush_destroy(struct d2d_brush *brush) { ID2D1Factory_Release(brush->factory); - HeapFree(GetProcessHeap(), 0, brush); + heap_free(brush); } static void d2d_brush_init(struct d2d_brush *brush, ID2D1Factory *factory, @@ -386,7 +386,7 @@ static const struct ID2D1SolidColorBrushVtbl d2d_solid_color_brush_vtbl = HRESULT d2d_solid_color_brush_create(ID2D1Factory *factory, const D2D1_COLOR_F *color, const D2D1_BRUSH_PROPERTIES *desc, struct d2d_brush **brush) { - if (!(*brush = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(**brush)))) + if (!(*brush = heap_alloc_zero(sizeof(**brush)))) return E_OUTOFMEMORY; d2d_brush_init(*brush, factory, D2D_BRUSH_TYPE_SOLID, desc, @@ -566,10 +566,11 @@ static const struct ID2D1LinearGradientBrushVtbl d2d_linear_gradient_brush_vtbl d2d_linear_gradient_brush_GetGradientStopCollection, }; -HRESULT d2d_linear_gradient_brush_create(ID2D1Factory *factory, const D2D1_LINEAR_GRADIENT_BRUSH_PROPERTIES *gradient_brush_desc, - const D2D1_BRUSH_PROPERTIES *brush_desc, ID2D1GradientStopCollection *gradient, struct d2d_brush **brush) +HRESULT d2d_linear_gradient_brush_create(ID2D1Factory *factory, + const D2D1_LINEAR_GRADIENT_BRUSH_PROPERTIES *gradient_brush_desc, const D2D1_BRUSH_PROPERTIES *brush_desc, + ID2D1GradientStopCollection *gradient, struct d2d_brush **brush) { - if (!(*brush = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(**brush)))) + if (!(*brush = heap_alloc_zero(sizeof(**brush)))) return E_OUTOFMEMORY; d2d_brush_init(*brush, factory, D2D_BRUSH_TYPE_LINEAR, brush_desc, @@ -798,7 +799,7 @@ HRESULT d2d_radial_gradient_brush_create(ID2D1Factory *factory, { struct d2d_brush *b; - if (!(b = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*b)))) + if (!(b = heap_alloc_zero(sizeof(*b)))) return E_OUTOFMEMORY; d2d_brush_init(b, factory, D2D_BRUSH_TYPE_RADIAL, brush_desc, (ID2D1BrushVtbl *)&d2d_radial_gradient_brush_vtbl); @@ -1034,7 +1035,7 @@ static const struct ID2D1BitmapBrushVtbl d2d_bitmap_brush_vtbl = HRESULT d2d_bitmap_brush_create(ID2D1Factory *factory, ID2D1Bitmap *bitmap, const D2D1_BITMAP_BRUSH_PROPERTIES *bitmap_brush_desc, const D2D1_BRUSH_PROPERTIES *brush_desc, struct d2d_brush **brush) { - if (!(*brush = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(**brush)))) + if (!(*brush = heap_alloc_zero(sizeof(**brush)))) return E_OUTOFMEMORY; d2d_brush_init(*brush, factory, D2D_BRUSH_TYPE_BITMAP, diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index f876cbf..caeb4b9 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -20,6 +20,7 @@ #define __WINE_D2D1_PRIVATE_H #include "wine/debug.h" +#include "wine/heap.h" #include <assert.h> #include <limits.h> diff --git a/dlls/d2d1/dc_render_target.c b/dlls/d2d1/dc_render_target.c index cdd43b12..d5e4f47 100644 --- a/dlls/d2d1/dc_render_target.c +++ b/dlls/d2d1/dc_render_target.c @@ -94,7 +94,7 @@ static ULONG STDMETHODCALLTYPE d2d_dc_render_target_Release(ID2D1DCRenderTarget { ID2D1RenderTarget_Release(render_target->dxgi_target); IDXGISurface1_Release(render_target->dxgi_surface); - HeapFree(GetProcessHeap(), 0, render_target); + heap_free(render_target); } return refcount; diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index f202332..9bacc85 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -104,7 +104,7 @@ static ULONG STDMETHODCALLTYPE d2d_factory_Release(ID2D1Factory1 *iface) { if (factory->device) ID3D10Device1_Release(factory->device); - HeapFree(GetProcessHeap(), 0, factory); + heap_free(factory); } return refcount; @@ -137,13 +137,13 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateRectangleGeometry(ID2D1Factor TRACE("iface %p, rect %s, geometry %p.\n", iface, debug_d2d_rect_f(rect), geometry); - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; if (FAILED(hr = d2d_rectangle_geometry_init(object, (ID2D1Factory *)iface, rect))) { WARN("Failed to initialize rectangle geometry, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); return hr; } @@ -187,7 +187,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateTransformedGeometry(ID2D1Fact TRACE("iface %p, src_geometry %p, transform %p, transformed_geometry %p.\n", iface, src_geometry, transform, transformed_geometry); - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; d2d_transformed_geometry_init(object, (ID2D1Factory *)iface, src_geometry, transform); @@ -204,7 +204,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreatePathGeometry(ID2D1Factory1 *i TRACE("iface %p, geometry %p.\n", iface, geometry); - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; d2d_path_geometry_init(object, (ID2D1Factory *)iface); @@ -225,13 +225,13 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateStrokeStyle(ID2D1Factory1 *if TRACE("iface %p, desc %p, dashes %p, dash_count %u, stroke_style %p.\n", iface, desc, dashes, dash_count, stroke_style); - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; if (FAILED(hr = d2d_stroke_style_init(object, (ID2D1Factory *)iface, desc, dashes, dash_count))) { WARN("Failed to initialize stroke style, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); return hr; } @@ -250,7 +250,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDrawingStateBlock(ID2D1Factor TRACE("iface %p, desc %p, text_rendering_params %p, state_block %p.\n", iface, desc, text_rendering_params, state_block); - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; d2d_state_block_init(object, (ID2D1Factory *)iface, desc, text_rendering_params); @@ -283,19 +283,19 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateWicBitmapRenderTarget(ID2D1Fa TRACE("iface %p, target %p, desc %p, render_target %p.\n", iface, target, desc, render_target); - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; if (FAILED(hr = d2d_factory_get_device(factory, &device))) { - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); return hr; } if (FAILED(hr = d2d_wic_render_target_init(object, (ID2D1Factory *)iface, device, target, desc))) { WARN("Failed to initialize render target, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); return hr; } @@ -319,13 +319,13 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateHwndRenderTarget(ID2D1Factory if (FAILED(hr = d2d_factory_get_device(factory, &device))) return hr; - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; if (FAILED(hr = d2d_hwnd_render_target_init(object, (ID2D1Factory *)iface, device, desc, hwnd_rt_desc))) { WARN("Failed to initialize render target, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); return hr; } @@ -356,13 +356,13 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDCRenderTarget(ID2D1Factory1 if (FAILED(hr = d2d_factory_get_device(factory, &device))) return hr; - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; if (FAILED(hr = d2d_dc_render_target_init(object, (ID2D1Factory *)iface, device, desc))) { WARN("Failed to initialize render target, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); return hr; } @@ -512,7 +512,7 @@ HRESULT WINAPI D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, TRACE("factory_type %#x, iid %s, factory_options %p, factory %p.\n", factory_type, debugstr_guid(iid), factory_options, factory); - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; d2d_factory_init(object, factory_type, factory_options); diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index ab5a0b5..88beee2 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -581,12 +581,7 @@ static BOOL d2d_array_reserve(void **elements, size_t *capacity, size_t element_ if (new_capacity < element_count) new_capacity = max_capacity; - if (*elements) - new_elements = HeapReAlloc(GetProcessHeap(), 0, *elements, new_capacity * element_size); - else - new_elements = HeapAlloc(GetProcessHeap(), 0, new_capacity * element_size); - - if (!new_elements) + if (!(new_elements = heap_realloc(*elements, new_capacity * element_size))) return FALSE; *elements = new_elements; @@ -1438,7 +1433,7 @@ static BOOL d2d_cdt_generate_faces(const struct d2d_cdt *cdt, struct d2d_geometr return TRUE; fail: - HeapFree(GetProcessHeap(), 0, geometry->fill.faces); + heap_free(geometry->fill.faces); geometry->fill.faces = NULL; geometry->fill.faces_size = 0; geometry->fill.face_count = 0; @@ -2035,7 +2030,7 @@ static BOOL d2d_geometry_intersect_self(struct d2d_geometry *geometry) ret = d2d_geometry_apply_intersections(geometry, &intersections); done: - HeapFree(GetProcessHeap(), 0, intersections.intersections); + heap_free(intersections.intersections); return ret; } @@ -2057,7 +2052,7 @@ static HRESULT d2d_path_geometry_triangulate(struct d2d_geometry *geometry) return S_OK; } - if (!(vertices = HeapAlloc(GetProcessHeap(), 0, vertex_count * sizeof(*vertices)))) + if (!(vertices = heap_alloc(vertex_count * sizeof(*vertices)))) return E_OUTOFMEMORY; for (i = 0, j = 0; i < geometry->u.path.figure_count; ++i) @@ -2091,14 +2086,14 @@ static HRESULT d2d_path_geometry_triangulate(struct d2d_geometry *geometry) if (!d2d_cdt_generate_faces(&cdt, geometry)) goto fail; - HeapFree(GetProcessHeap(), 0, cdt.edges); + heap_free(cdt.edges); return S_OK; fail: geometry->fill.vertices = NULL; geometry->fill.vertex_count = 0; - HeapFree(GetProcessHeap(), 0, vertices); - HeapFree(GetProcessHeap(), 0, cdt.edges); + heap_free(vertices); + heap_free(cdt.edges); return E_FAIL; } @@ -2368,13 +2363,13 @@ static BOOL d2d_geometry_add_figure_outline(struct d2d_geometry *geometry, static void d2d_geometry_cleanup(struct d2d_geometry *geometry) { - HeapFree(GetProcessHeap(), 0, geometry->outline.bezier_faces); - HeapFree(GetProcessHeap(), 0, geometry->outline.beziers); - HeapFree(GetProcessHeap(), 0, geometry->outline.faces); - HeapFree(GetProcessHeap(), 0, geometry->outline.vertices); - HeapFree(GetProcessHeap(), 0, geometry->fill.bezier_vertices); - HeapFree(GetProcessHeap(), 0, geometry->fill.faces); - HeapFree(GetProcessHeap(), 0, geometry->fill.vertices); + heap_free(geometry->outline.bezier_faces); + heap_free(geometry->outline.beziers); + heap_free(geometry->outline.faces); + heap_free(geometry->outline.vertices); + heap_free(geometry->fill.bezier_vertices); + heap_free(geometry->fill.faces); + heap_free(geometry->fill.vertices); ID2D1Factory_Release(geometry->factory); } @@ -2604,11 +2599,11 @@ static void d2d_path_geometry_free_figures(struct d2d_geometry *geometry) for (i = 0; i < geometry->u.path.figure_count; ++i) { - HeapFree(GetProcessHeap(), 0, geometry->u.path.figures[i].bezier_controls); - HeapFree(GetProcessHeap(), 0, geometry->u.path.figures[i].original_bezier_controls); - HeapFree(GetProcessHeap(), 0, geometry->u.path.figures[i].vertices); + heap_free(geometry->u.path.figures[i].bezier_controls); + heap_free(geometry->u.path.figures[i].original_bezier_controls); + heap_free(geometry->u.path.figures[i].vertices); } - HeapFree(GetProcessHeap(), 0, geometry->u.path.figures); + heap_free(geometry->u.path.figures); geometry->u.path.figures = NULL; geometry->u.path.figures_size = 0; } @@ -2824,8 +2819,8 @@ static HRESULT d2d_geometry_resolve_beziers(struct d2d_geometry *geometry) geometry->fill.bezier_vertex_count += 3 * geometry->u.path.figures[i].bezier_control_count; } - if (!(geometry->fill.bezier_vertices = HeapAlloc(GetProcessHeap(), 0, - geometry->fill.bezier_vertex_count * sizeof(*geometry->fill.bezier_vertices)))) + if (!(geometry->fill.bezier_vertices = heap_alloc(geometry->fill.bezier_vertex_count + * sizeof(*geometry->fill.bezier_vertices)))) { ERR("Failed to allocate bezier vertices array.\n"); geometry->fill.bezier_vertex_count = 0; @@ -2889,7 +2884,7 @@ static HRESULT STDMETHODCALLTYPE d2d_geometry_sink_Close(ID2D1GeometrySink *ifac { struct d2d_figure *figure = &geometry->u.path.figures[i]; size_t size = figure->bezier_control_count * sizeof(*figure->original_bezier_controls); - if (!(figure->original_bezier_controls = HeapAlloc(GetProcessHeap(), 0, size))) + if (!(figure->original_bezier_controls = heap_alloc(size))) goto done; memcpy(figure->original_bezier_controls, figure->bezier_controls, size); } @@ -2904,7 +2899,7 @@ static HRESULT STDMETHODCALLTYPE d2d_geometry_sink_Close(ID2D1GeometrySink *ifac done: if (FAILED(hr)) { - HeapFree(GetProcessHeap(), 0, geometry->fill.bezier_vertices); + heap_free(geometry->fill.bezier_vertices); geometry->fill.bezier_vertex_count = 0; d2d_path_geometry_free_figures(geometry); geometry->u.path.state = D2D_GEOMETRY_STATE_ERROR; @@ -3063,7 +3058,7 @@ static ULONG STDMETHODCALLTYPE d2d_path_geometry_Release(ID2D1PathGeometry *ifac { d2d_path_geometry_free_figures(geometry); d2d_geometry_cleanup(geometry); - HeapFree(GetProcessHeap(), 0, geometry); + heap_free(geometry); } return refcount; @@ -3579,7 +3574,7 @@ static ULONG STDMETHODCALLTYPE d2d_rectangle_geometry_Release(ID2D1RectangleGeom if (!refcount) { d2d_geometry_cleanup(geometry); - HeapFree(GetProcessHeap(), 0, geometry); + heap_free(geometry); } return refcount; @@ -3821,7 +3816,7 @@ HRESULT d2d_rectangle_geometry_init(struct d2d_geometry *geometry, ID2D1Factory d2d_geometry_init(geometry, factory, &identity, (ID2D1GeometryVtbl *)&d2d_rectangle_geometry_vtbl); geometry->u.rectangle.rect = *rect; - if (!(geometry->fill.vertices = HeapAlloc(GetProcessHeap(), 0, 4 * sizeof(*geometry->fill.vertices)))) + if (!(geometry->fill.vertices = heap_alloc(4 * sizeof(*geometry->fill.vertices)))) goto fail; if (!d2d_array_reserve((void **)&geometry->fill.faces, &geometry->fill.faces_size, 2, sizeof(*geometry->fill.faces))) @@ -3923,7 +3918,7 @@ static ULONG STDMETHODCALLTYPE d2d_transformed_geometry_Release(ID2D1Transformed geometry->fill.vertices = NULL; ID2D1Geometry_Release(geometry->u.transformed.src_geometry); d2d_geometry_cleanup(geometry); - HeapFree(GetProcessHeap(), 0, geometry); + heap_free(geometry); } return refcount; diff --git a/dlls/d2d1/hwnd_render_target.c b/dlls/d2d1/hwnd_render_target.c index 7cbbbaa..04d3353 100644 --- a/dlls/d2d1/hwnd_render_target.c +++ b/dlls/d2d1/hwnd_render_target.c @@ -83,7 +83,7 @@ static ULONG STDMETHODCALLTYPE d2d_hwnd_render_target_Release(ID2D1HwndRenderTar { ID2D1RenderTarget_Release(render_target->dxgi_target); IDXGISwapChain_Release(render_target->swapchain); - HeapFree(GetProcessHeap(), 0, render_target); + heap_free(render_target); } return refcount; diff --git a/dlls/d2d1/layer.c b/dlls/d2d1/layer.c index 25a331b..0f7ade2 100644 --- a/dlls/d2d1/layer.c +++ b/dlls/d2d1/layer.c @@ -67,7 +67,7 @@ static ULONG STDMETHODCALLTYPE d2d_layer_Release(ID2D1Layer *iface) if (!refcount) { ID2D1Factory_Release(layer->factory); - HeapFree(GetProcessHeap(), 0, layer); + heap_free(layer); } return refcount; @@ -103,7 +103,7 @@ static const struct ID2D1LayerVtbl d2d_layer_vtbl = HRESULT d2d_layer_create(ID2D1Factory *factory, const D2D1_SIZE_F *size, struct d2d_layer **layer) { - if (!(*layer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(**layer)))) + if (!(*layer = heap_alloc_zero(sizeof(**layer)))) return E_OUTOFMEMORY; (*layer)->ID2D1Layer_iface.lpVtbl = &d2d_layer_vtbl; diff --git a/dlls/d2d1/mesh.c b/dlls/d2d1/mesh.c index eb223ad..ee53c69 100644 --- a/dlls/d2d1/mesh.c +++ b/dlls/d2d1/mesh.c @@ -67,7 +67,7 @@ static ULONG STDMETHODCALLTYPE d2d_mesh_Release(ID2D1Mesh *iface) if (!refcount) { ID2D1Factory_Release(mesh->factory); - HeapFree(GetProcessHeap(), 0, mesh); + heap_free(mesh); } return refcount; @@ -100,7 +100,7 @@ static const struct ID2D1MeshVtbl d2d_mesh_vtbl = HRESULT d2d_mesh_create(ID2D1Factory *factory, struct d2d_mesh **mesh) { - if (!(*mesh = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(**mesh)))) + if (!(*mesh = heap_alloc_zero(sizeof(**mesh)))) return E_OUTOFMEMORY; (*mesh)->ID2D1Mesh_iface.lpVtbl = &d2d_mesh_vtbl; diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 0c44014..73f15f7 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -77,7 +77,7 @@ static void d2d_size_set(D2D1_SIZE_U *dst, float width, float height) static BOOL d2d_clip_stack_init(struct d2d_clip_stack *stack) { - if (!(stack->stack = HeapAlloc(GetProcessHeap(), 0, INITIAL_CLIP_STACK_SIZE * sizeof(*stack->stack)))) + if (!(stack->stack = heap_alloc(INITIAL_CLIP_STACK_SIZE * sizeof(*stack->stack)))) return FALSE; stack->size = INITIAL_CLIP_STACK_SIZE; @@ -88,7 +88,7 @@ static BOOL d2d_clip_stack_init(struct d2d_clip_stack *stack) static void d2d_clip_stack_cleanup(struct d2d_clip_stack *stack) { - HeapFree(GetProcessHeap(), 0, stack->stack); + heap_free(stack->stack); } static BOOL d2d_clip_stack_push(struct d2d_clip_stack *stack, const D2D1_RECT_F *rect) @@ -104,7 +104,7 @@ static BOOL d2d_clip_stack_push(struct d2d_clip_stack *stack, const D2D1_RECT_F return FALSE; new_size = stack->size * 2; - if (!(new_stack = HeapReAlloc(GetProcessHeap(), 0, stack->stack, new_size * sizeof(*stack->stack)))) + if (!(new_stack = heap_realloc(stack->stack, new_size * sizeof(*stack->stack)))) return FALSE; stack->stack = new_stack; @@ -272,7 +272,7 @@ static ULONG STDMETHODCALLTYPE d2d_d3d_render_target_Release(ID2D1RenderTarget * ID3D10RenderTargetView_Release(render_target->view); ID3D10Device_Release(render_target->device); ID2D1Factory_Release(render_target->factory); - HeapFree(GetProcessHeap(), 0, render_target); + heap_free(render_target); } return refcount; @@ -434,14 +434,14 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateCompatibleRenderTar TRACE("iface %p, size %p, pixel_size %p, format %p, options %#x, render_target %p.\n", iface, size, pixel_size, format, options, rt); - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; if (FAILED(hr = d2d_bitmap_render_target_init(object, render_target, size, pixel_size, format, options))) { WARN("Failed to initialize render target, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); return hr; } @@ -1176,7 +1176,7 @@ static void d2d_rt_draw_glyph_run_bitmap(struct d2d_d3d_render_target *render_ta if (texture_type == DWRITE_TEXTURE_CLEARTYPE_3x1) bitmap_size.width *= 3; opacity_values_size = bitmap_size.width * bitmap_size.height; - if (!(opacity_values = HeapAlloc(GetProcessHeap(), 0, opacity_values_size))) + if (!(opacity_values = heap_alloc(opacity_values_size))) { ERR("Failed to allocate opacity values.\n"); goto done; @@ -1237,7 +1237,7 @@ done: ID2D1BitmapBrush_Release(opacity_brush); if (opacity_bitmap) ID2D1Bitmap_Release(opacity_bitmap); - HeapFree(GetProcessHeap(), 0, opacity_values); + heap_free(opacity_values); IDWriteGlyphRunAnalysis_Release(analysis); } @@ -3243,13 +3243,13 @@ HRESULT d2d_d3d_create_render_target(ID2D1Factory *factory, IDXGISurface *surfac struct d2d_d3d_render_target *object; HRESULT hr; - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; if (FAILED(hr = d2d_d3d_render_target_init(object, factory, surface, outer_unknown, desc))) { WARN("Failed to initialize render target, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); return hr; } diff --git a/dlls/d2d1/state_block.c b/dlls/d2d1/state_block.c index 90195fe..3a3cb2e 100644 --- a/dlls/d2d1/state_block.c +++ b/dlls/d2d1/state_block.c @@ -69,7 +69,7 @@ static ULONG STDMETHODCALLTYPE d2d_state_block_Release(ID2D1DrawingStateBlock *i if (state_block->text_rendering_params) IDWriteRenderingParams_Release(state_block->text_rendering_params); ID2D1Factory_Release(state_block->factory); - HeapFree(GetProcessHeap(), 0, state_block); + heap_free(state_block); } return refcount; diff --git a/dlls/d2d1/stroke.c b/dlls/d2d1/stroke.c index c5a1d50..a0830e3 100644 --- a/dlls/d2d1/stroke.c +++ b/dlls/d2d1/stroke.c @@ -68,8 +68,8 @@ static ULONG STDMETHODCALLTYPE d2d_stroke_style_Release(ID2D1StrokeStyle *iface) { ID2D1Factory_Release(style->factory); if (style->desc.dashStyle == D2D1_DASH_STYLE_CUSTOM) - HeapFree(GetProcessHeap(), 0, style->dashes); - HeapFree(GetProcessHeap(), 0, style); + heap_free(style->dashes); + heap_free(style); } return refcount; @@ -212,7 +212,7 @@ HRESULT d2d_stroke_style_init(struct d2d_stroke_style *style, ID2D1Factory *fact if (!dashes || !dash_count) return E_INVALIDARG; - if (!(style->dashes = HeapAlloc(GetProcessHeap(), 0, dash_count * sizeof(*style->dashes)))) + if (!(style->dashes = heap_alloc(dash_count * sizeof(*style->dashes)))) return E_OUTOFMEMORY; memcpy(style->dashes, dashes, dash_count * sizeof(*style->dashes)); style->dash_count = dash_count; diff --git a/dlls/d2d1/wic_render_target.c b/dlls/d2d1/wic_render_target.c index ef8b356..5642fd4 100644 --- a/dlls/d2d1/wic_render_target.c +++ b/dlls/d2d1/wic_render_target.c @@ -144,7 +144,7 @@ static ULONG STDMETHODCALLTYPE d2d_wic_render_target_Release(ID2D1RenderTarget * ID3D10Texture2D_Release(render_target->readback_texture); ID2D1RenderTarget_Release(render_target->dxgi_target); IDXGISurface_Release(render_target->dxgi_surface); - HeapFree(GetProcessHeap(), 0, render_target); + heap_free(render_target); } return refcount; diff --git a/include/wine/heap.h b/include/wine/heap.h index 014ef61..681887b 100644 --- a/include/wine/heap.h +++ b/include/wine/heap.h @@ -22,7 +22,7 @@ #ifndef __WINE_WINE_HEAP_H #define __WINE_WINE_HEAP_H -#include <windef.h> +#include <winbase.h> static inline void * __WINE_ALLOC_SIZE(1) heap_alloc(SIZE_T len) { -- 2.1.4

1 0

[PATCH 4/5] wined3d: Use the resource access flags in wined3d_device_evict_managed_resources().
by Henri Verbeet 30 Jan '18

30 Jan '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6a642c9..3ad0d97 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4651,7 +4651,7 @@ void CDECL wined3d_device_evict_managed_resources(struct wined3d_device *device) { TRACE("Checking resource %p for eviction.\n", resource); - if (resource->pool == WINED3D_POOL_MANAGED && !resource->map_count) + if (wined3d_resource_access_is_managed(resource->access) && !resource->map_count) { TRACE("Evicting %p.\n", resource); wined3d_cs_emit_unload_resource(device->cs, resource); -- 2.1.4

1 0

[PATCH 3/5] wined3d: Use the resource access flags in wined3d_device_update_texture().
by Henri Verbeet 30 Jan '18

30 Jan '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/device.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 67c1855..6a642c9 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3768,14 +3768,15 @@ HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device, return WINED3DERR_INVALIDCALL; } - if (src_texture->resource.pool != WINED3D_POOL_SYSTEM_MEM || src_texture->resource.usage & WINED3DUSAGE_SCRATCH) + if (src_texture->resource.access & WINED3D_RESOURCE_ACCESS_GPU + || src_texture->resource.usage & WINED3DUSAGE_SCRATCH) { - WARN("Source texture not in WINED3D_POOL_SYSTEM_MEM, returning WINED3DERR_INVALIDCALL.\n"); + WARN("Source resource is GPU accessible or a scratch resource.\n"); return WINED3DERR_INVALIDCALL; } - if (dst_texture->resource.pool != WINED3D_POOL_DEFAULT) + if (dst_texture->resource.access & WINED3D_RESOURCE_ACCESS_CPU) { - WARN("Destination texture not in WINED3D_POOL_DEFAULT, returning WINED3DERR_INVALIDCALL.\n"); + WARN("Destination resource is CPU accessible.\n"); return WINED3DERR_INVALIDCALL; } -- 2.1.4

1 0

[PATCH 2/5] wined3d: Use the resource access flags in buffer_init().
by Henri Verbeet 30 Jan '18

30 Jan '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/buffer.c | 7 ++++--- dlls/wined3d/wined3d_private.h | 5 +++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 49b189e..fd26611 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1365,7 +1365,8 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device buffer, buffer->resource.size, buffer->resource.usage, debug_d3dformat(buffer->resource.format->id), buffer->resource.heap_memory); - if (device->create_parms.flags & WINED3DCREATE_SOFTWARE_VERTEXPROCESSING || pool == WINED3D_POOL_MANAGED) + if (device->create_parms.flags & WINED3DCREATE_SOFTWARE_VERTEXPROCESSING + || wined3d_resource_access_is_managed(buffer->resource.access)) { /* SWvp and managed buffers always return the same pointer in buffer * maps and retain data in DISCARD maps. Keep a system memory copy of @@ -1383,9 +1384,9 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device { TRACE("Not creating a BO because GL_ARB_vertex_buffer is not supported.\n"); } - else if (buffer->resource.pool == WINED3D_POOL_SYSTEM_MEM) + else if (!(buffer->resource.access & WINED3D_RESOURCE_ACCESS_GPU)) { - TRACE("Not creating a BO because the buffer is in system memory.\n"); + TRACE("Not creating a BO because the buffer is not GPU accessible.\n"); } else if (!dynamic_buffer_ok && (buffer->resource.usage & WINED3DUSAGE_DYNAMIC)) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 082c1ec..f95330f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2965,6 +2965,11 @@ static inline BOOL isStateDirty(const struct wined3d_context *context, DWORD sta #define WINED3D_RESOURCE_ACCESS_CPU 0x2u #define WINED3D_RESOURCE_ACCESS_MAP 0x4u +static inline BOOL wined3d_resource_access_is_managed(unsigned int access) +{ + return !(~access & (WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_CPU)); +} + struct wined3d_resource_ops { ULONG (*resource_incref)(struct wined3d_resource *resource); -- 2.1.4

1 0

[PATCH 4/4] localspl: Use the global HeapAlloc() wrappers
by Michael Stefaniuc 30 Jan '18

30 Jan '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/localspl/localmon.c | 1 + dlls/localspl/localspl_private.h | 23 ----------------------- dlls/localspl/provider.c | 3 ++- 3 files changed, 3 insertions(+), 24 deletions(-) diff --git a/dlls/localspl/localmon.c b/dlls/localspl/localmon.c index 4ee3efb8cd..4be1ad6101 100644 --- a/dlls/localspl/localmon.c +++ b/dlls/localspl/localmon.c @@ -33,6 +33,7 @@ #include "localspl_private.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/list.h" #include "wine/unicode.h" diff --git a/dlls/localspl/localspl_private.h b/dlls/localspl/localspl_private.h index 8c49623622..f27005c16d 100644 --- a/dlls/localspl/localspl_private.h +++ b/dlls/localspl/localspl_private.h @@ -51,27 +51,4 @@ void setup_provider(void) DECLSPEC_HIDDEN; #define PORT_IS_LPR 8 -/* ## Memory allocation functions ## */ - -static inline void * __WINE_ALLOC_SIZE(1) heap_alloc( size_t len ) -{ - return HeapAlloc( GetProcessHeap(), 0, len ); -} - -static inline void * __WINE_ALLOC_SIZE(1) heap_alloc_zero( size_t len ) -{ - return HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, len ); -} - -static inline void * __WINE_ALLOC_SIZE(2) heap_realloc_zero( void * mem, size_t len ) -{ - return HeapReAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, mem, len ); -} - -static inline BOOL heap_free( void *mem ) -{ - return HeapFree( GetProcessHeap(), 0, mem ); -} - - #endif /* __WINE_LOCALSPL_PRIVATE__ */ diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index 4f6bac376e..3538947281 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -31,8 +31,9 @@ #include "ddk/winddiui.h" #include "ddk/winsplp.h" -#include "wine/list.h" #include "wine/debug.h" +#include "wine/heap.h" +#include "wine/list.h" #include "wine/unicode.h" #include "localspl_private.h" -- 2.14.3

2 1

[PATCH] kerberos: Add support for KerbQueryTicketCacheMessage. (v3)
by Dmitry Timoshkov 30 Jan '18

30 Jan '18

Based on the code written by George Popoff. v2: Copy full ticket info (including Realm/Server name) to flat buffer. v3: Fix compilation without libkrb5. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kerberos/krb5_ap.c | 417 +++++++++++++++++++++++++++++++++++++++++++++++- include/ntsecapi.h | 105 ++++++++++++ 2 files changed, 519 insertions(+), 3 deletions(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index b4a37f754f..78e4e932c1 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -1,5 +1,6 @@ /* * Copyright 2017 Dmitry Timoshkov + * Copyright 2017 George Popoff * Copyright 2008 Robert Shearman for CodeWeavers * Copyright 2017 Hans Leidekker for CodeWeavers * @@ -36,6 +37,7 @@ #define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" +#include "winnls.h" #include "rpc.h" #include "sspi.h" #include "ntsecapi.h" @@ -88,8 +90,37 @@ static void *libkrb5_handle; #define MAKE_FUNCPTR(f) static typeof(f) * p_##f MAKE_FUNCPTR(krb5_init_context); +MAKE_FUNCPTR(krb5_free_context); +MAKE_FUNCPTR(krb5_free_ticket); +MAKE_FUNCPTR(krb5_cccol_cursor_new); +MAKE_FUNCPTR(krb5_cccol_cursor_next); +MAKE_FUNCPTR(krb5_cccol_cursor_free); +MAKE_FUNCPTR(krb5_cc_close); +MAKE_FUNCPTR(krb5_cc_start_seq_get); +MAKE_FUNCPTR(krb5_cc_end_seq_get); +MAKE_FUNCPTR(krb5_cc_next_cred); +MAKE_FUNCPTR(krb5_is_config_principal); +MAKE_FUNCPTR(krb5_decode_ticket); +MAKE_FUNCPTR(krb5_unparse_name_flags); +MAKE_FUNCPTR(krb5_free_unparsed_name); +MAKE_FUNCPTR(krb5_free_cred_contents); #undef MAKE_FUNCPTR +static inline void *heap_alloc(SIZE_T size) +{ + return HeapAlloc(GetProcessHeap(), 0, size); +} + +static inline void *heap_realloc(void *p, SIZE_T size) +{ + return HeapReAlloc(GetProcessHeap(), 0, p, size); +} + +static inline void heap_free(void *p) +{ + HeapFree(GetProcessHeap(), 0, p); +} + static void load_krb5(void) { if (!(libkrb5_handle = wine_dlopen(SONAME_LIBKRB5, RTLD_NOW, NULL, 0))) @@ -106,6 +137,20 @@ static void load_krb5(void) } LOAD_FUNCPTR(krb5_init_context) + LOAD_FUNCPTR(krb5_free_context) + LOAD_FUNCPTR(krb5_free_ticket) + LOAD_FUNCPTR(krb5_cccol_cursor_new) + LOAD_FUNCPTR(krb5_cccol_cursor_next) + LOAD_FUNCPTR(krb5_cccol_cursor_free) + LOAD_FUNCPTR(krb5_cc_close) + LOAD_FUNCPTR(krb5_cc_start_seq_get) + LOAD_FUNCPTR(krb5_cc_end_seq_get) + LOAD_FUNCPTR(krb5_cc_next_cred) + LOAD_FUNCPTR(krb5_is_config_principal) + LOAD_FUNCPTR(krb5_decode_ticket) + LOAD_FUNCPTR(krb5_unparse_name_flags) + LOAD_FUNCPTR(krb5_free_unparsed_name) + LOAD_FUNCPTR(krb5_free_cred_contents) #undef LOAD_FUNCPTR return; @@ -157,15 +202,381 @@ static NTSTATUS NTAPI kerberos_LsaApInitializePackage(ULONG package_id, PLSA_DIS return STATUS_SUCCESS; } +#ifdef SONAME_LIBKRB5 + +struct ticket_info +{ + ULONG count, allocated; + KERB_TICKET_CACHE_INFO *info; +}; + +static NTSTATUS krb5_error_to_status(krb5_error_code error) +{ + switch (error) + { + case 0: return STATUS_SUCCESS; + default: + /* FIXME */ + return STATUS_UNSUCCESSFUL; + } +} + +static void free_ticket_info(struct ticket_info *info) +{ + ULONG i; + + for (i = 0; i < info->count; i++) + { + heap_free(info->info[i].RealmName.Buffer); + heap_free(info->info[i].ServerName.Buffer); + } + + heap_free(info->info); +} + +static WCHAR *utf8_to_wstr(const char *utf8) +{ + int len; + WCHAR *wstr; + + len = MultiByteToWideChar(CP_UTF8, 0, utf8, -1, NULL, 0); + wstr = heap_alloc(len * sizeof(WCHAR)); + if (wstr) + MultiByteToWideChar(CP_UTF8, 0, utf8, -1, wstr, len); + + return wstr; +} + +static NTSTATUS copy_tickets_from_cache(krb5_context context, krb5_ccache cache, struct ticket_info *info) +{ + NTSTATUS status; + krb5_cc_cursor cursor; + krb5_error_code error; + krb5_creds credentials; + krb5_ticket *ticket; + char *name_with_realm, *name_without_realm, *realm_name; + WCHAR *realm_nameW, *name_without_realmW; + + error = p_krb5_cc_start_seq_get(context, cache, &cursor); + if (error) return krb5_error_to_status(error); + + for (;;) + { + error = p_krb5_cc_next_cred(context, cache, &cursor, &credentials); + if (error) + { + if (error == KRB5_CC_END) + status = STATUS_SUCCESS; + else + status = krb5_error_to_status(error); + break; + } + + if (p_krb5_is_config_principal(context, credentials.server)) + { + p_krb5_free_cred_contents(context, &credentials); + continue; + } + + if (info->count == info->allocated) + { + KERB_TICKET_CACHE_INFO *new_info; + ULONG new_allocated; + + if (info->allocated) + { + new_allocated = info->allocated * 2; + new_info = heap_realloc(info->info, sizeof(*new_info) * new_allocated); + } + else + { + new_allocated = 16; + new_info = heap_alloc(sizeof(*new_info) * new_allocated); + } + if (!new_info) + { + p_krb5_free_cred_contents(context, &credentials); + status = STATUS_NO_MEMORY; + break; + } + + info->info = new_info; + info->allocated = new_allocated; + } + + error = p_krb5_unparse_name_flags(context, credentials.server, 0, &name_with_realm); + if (error) + { + p_krb5_free_cred_contents(context, &credentials); + status = krb5_error_to_status(error); + break; + } + + TRACE("name_with_realm: %s\n", debugstr_a(name_with_realm)); + + error = p_krb5_unparse_name_flags(context, credentials.server, + KRB5_PRINCIPAL_UNPARSE_NO_REALM, &name_without_realm); + if (error) + { + p_krb5_free_unparsed_name(context, name_with_realm); + p_krb5_free_cred_contents(context, &credentials); + status = krb5_error_to_status(error); + break; + } + + TRACE("name_without_realm: %s\n", debugstr_a(name_without_realm)); + + name_without_realmW = utf8_to_wstr(name_without_realm); + RtlInitUnicodeString(&info->info[info->count].ServerName, name_without_realmW); + + realm_name = strchr(name_with_realm, '@'); + if (!realm_name) + { + ERR("wrong name with realm %s\n", debugstr_a(name_with_realm)); + realm_name = name_with_realm; + } + else + realm_name++; + + /* realm_name - now contains only realm! */ + + realm_nameW = utf8_to_wstr(realm_name); + RtlInitUnicodeString(&info->info[info->count].RealmName, realm_nameW); + + if (!credentials.times.starttime) + credentials.times.starttime = credentials.times.authtime; + + /* TODO: if krb5_is_config_principal = true */ + RtlSecondsSince1970ToTime(credentials.times.starttime, &info->info[info->count].StartTime); + RtlSecondsSince1970ToTime(credentials.times.endtime, &info->info[info->count].EndTime); + RtlSecondsSince1970ToTime(credentials.times.renew_till, &info->info[info->count].RenewTime); + + info->info[info->count].TicketFlags = credentials.ticket_flags; + + error = p_krb5_decode_ticket(&credentials.ticket, &ticket); + + p_krb5_free_unparsed_name(context, name_with_realm); + p_krb5_free_unparsed_name(context, name_without_realm); + p_krb5_free_cred_contents(context, &credentials); + + if (error) + { + status = krb5_error_to_status(error); + break; + } + + info->info[info->count].EncryptionType = ticket->enc_part.enctype; + + p_krb5_free_ticket(context, ticket); + + info->count++; + } + + p_krb5_cc_end_seq_get(context, cache, &cursor); + + return status; +} + +static inline void init_client_us(UNICODE_STRING *dst, void *client_ws, const UNICODE_STRING *src) +{ + dst->Buffer = client_ws; + dst->Length = src->Length; + dst->MaximumLength = src->MaximumLength; +} + +static NTSTATUS copy_to_client(PLSA_CLIENT_REQUEST lsa_req, struct ticket_info *info, void **out, ULONG *out_size) +{ + NTSTATUS status; + ULONG i; + SIZE_T size, client_str_off; + char *client_resp, *client_ticket, *client_str; + KERB_QUERY_TKT_CACHE_RESPONSE resp; + + size = sizeof(KERB_QUERY_TKT_CACHE_RESPONSE); + if (info->count != 0) + size += (info->count - 1) * sizeof(KERB_TICKET_CACHE_INFO); + + client_str_off = size; + + for (i = 0; i < info->count; i++) + { + size += info->info[i].RealmName.MaximumLength; + size += info->info[i].ServerName.MaximumLength; + } + + status = lsa_dispatch.AllocateClientBuffer(lsa_req, size, (void **)&client_resp); + if (status != STATUS_SUCCESS) return status; + + resp.MessageType = KerbQueryTicketCacheMessage; + resp.CountOfTickets = info->count; + size = FIELD_OFFSET(KERB_QUERY_TKT_CACHE_RESPONSE, Tickets); + status = lsa_dispatch.CopyToClientBuffer(lsa_req, size, client_resp, &resp); + if (status != STATUS_SUCCESS) goto fail; + + if (!info->count) + { + *out = client_resp; + *out_size = sizeof(resp); + return STATUS_SUCCESS; + } + + *out_size = size; + + client_ticket = client_resp + size; + client_str = client_resp + client_str_off; + + for (i = 0; i < info->count; i++) + { + KERB_TICKET_CACHE_INFO ticket; + + ticket = info->info[i]; + + init_client_us(&ticket.RealmName, client_str, &info->info[i].RealmName); + + size = info->info[i].RealmName.MaximumLength; + status = lsa_dispatch.CopyToClientBuffer(lsa_req, size, client_str, info->info[i].RealmName.Buffer); + if (status != STATUS_SUCCESS) goto fail; + client_str += size; + *out_size += size; + + init_client_us(&ticket.ServerName, client_str, &info->info[i].ServerName); + + size = info->info[i].ServerName.MaximumLength; + status = lsa_dispatch.CopyToClientBuffer(lsa_req, size, client_str, info->info[i].ServerName.Buffer); + if (status != STATUS_SUCCESS) goto fail; + client_str += size; + *out_size += size; + + status = lsa_dispatch.CopyToClientBuffer(lsa_req, sizeof(ticket), client_ticket, &ticket); + if (status != STATUS_SUCCESS) goto fail; + + client_ticket += sizeof(ticket); + *out_size += sizeof(ticket); + } + + *out = client_resp; + return STATUS_SUCCESS; + +fail: + lsa_dispatch.FreeClientBuffer(lsa_req, client_resp); + return status; +} + +static NTSTATUS query_ticket_cache(PLSA_CLIENT_REQUEST lsa_req, void *in, ULONG in_len, void **out, ULONG *out_len) +{ + NTSTATUS status; + KERB_QUERY_TKT_CACHE_REQUEST *query; + struct ticket_info info; + krb5_error_code error; + krb5_context context = NULL; + krb5_cccol_cursor cursor = NULL; + krb5_ccache cache; + + if (!in || in_len != sizeof(KERB_QUERY_TKT_CACHE_REQUEST) || !out || !out_len) + return STATUS_INVALID_PARAMETER; + + query = (KERB_QUERY_TKT_CACHE_REQUEST *)in; + + if (query->LogonId.HighPart != 0 || query->LogonId.LowPart != 0) + return STATUS_ACCESS_DENIED; + + info.count = 0; + info.allocated = 0; + info.info = NULL; + + error = p_krb5_init_context(&context); + if (error) + { + status = krb5_error_to_status(error); + goto done; + } + + error = p_krb5_cccol_cursor_new(context, &cursor); + if (error) + { + status = krb5_error_to_status(error); + goto done; + } + + for (;;) + { + error = p_krb5_cccol_cursor_next(context, cursor, &cache); + if (error) + { + status = krb5_error_to_status(error); + goto done; + } + if (!cache) break; + + status = copy_tickets_from_cache(context, cache, &info); + + p_krb5_cc_close(context, cache); + + if (status != STATUS_SUCCESS) + goto done; + } + + status = copy_to_client(lsa_req, &info, out, out_len); + +done: + if (cursor) + p_krb5_cccol_cursor_free(context, &cursor); + + if (context) + p_krb5_free_context(context); + + free_ticket_info(&info); + + return status; +} + +#else /* SONAME_LIBKRB5 */ + +static NTSTATUS query_ticket_cache(PLSA_CLIENT_REQUEST lsa_req, void *in, ULONG in_len, void **out, ULONG *out_len) +{ + FIXME("%p,%p,%u,%p,%p: stub\n", lsa_req, in, in_len, out, out_len); + return STATUS_NOT_IMPLEMENTED; +} + +#endif /* SONAME_LIBKRB5 */ + static NTSTATUS NTAPI kerberos_LsaApCallPackageUntrusted(PLSA_CLIENT_REQUEST request, PVOID in_buffer, PVOID client_buffer_base, ULONG in_buffer_length, PVOID *out_buffer, PULONG out_buffer_length, PNTSTATUS status) { - FIXME("%p,%p,%p,%u,%p,%p,%p: stub\n", request, in_buffer, client_buffer_base, + KERB_PROTOCOL_MESSAGE_TYPE msg; + + TRACE("%p,%p,%p,%u,%p,%p,%p\n", request, in_buffer, client_buffer_base, in_buffer_length, out_buffer, out_buffer_length, status); - *status = STATUS_NOT_IMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + if (!in_buffer || in_buffer_length < sizeof(msg)) + return STATUS_INVALID_PARAMETER; + + msg = *(KERB_PROTOCOL_MESSAGE_TYPE *)in_buffer; + + switch (msg) + { + case KerbQueryTicketCacheMessage: + *status = query_ticket_cache(request, in_buffer, in_buffer_length, out_buffer, out_buffer_length); + break; + + case KerbRetrieveTicketMessage: + FIXME("KerbRetrieveTicketMessage stub\n"); + *status = STATUS_NOT_IMPLEMENTED; + break; + + case KerbPurgeTicketCacheMessage: + FIXME("KerbPurgeTicketCacheMessage stub\n"); + *status = STATUS_NOT_IMPLEMENTED; + break; + + default: /* All other requests should call LsaApCallPackage */ + WARN("%u => access denied\n", msg); + *status = STATUS_ACCESS_DENIED; + break; + } + + return *status; } static NTSTATUS NTAPI kerberos_SpGetInfo(SecPkgInfoW *info) diff --git a/include/ntsecapi.h b/include/ntsecapi.h index d0339a97ef..6d5e01d675 100644 --- a/include/ntsecapi.h +++ b/include/ntsecapi.h @@ -169,6 +169,15 @@ typedef struct _OBJECT_ATTRIBUTES { } OBJECT_ATTRIBUTES, *POBJECT_ATTRIBUTES; #endif +#ifndef __SECHANDLE_DEFINED__ +#define __SECHANDLE_DEFINED__ +typedef struct _SecHandle +{ + ULONG_PTR dwLower; + ULONG_PTR dwUpper; +} SecHandle, *PSecHandle; +#endif + typedef UNICODE_STRING LSA_UNICODE_STRING, *PLSA_UNICODE_STRING; typedef STRING LSA_STRING, *PLSA_STRING; typedef OBJECT_ATTRIBUTES LSA_OBJECT_ATTRIBUTES, *PLSA_OBJECT_ATTRIBUTES; @@ -349,6 +358,102 @@ typedef enum _POLICY_NOTIFICATION_INFORMATION_CLASS static const WCHAR MICROSOFT_KERBEROS_NAME_W[] = { 'K','e','r','b','e','r','o','s',0 }; #endif +#define KERB_TICKET_FLAGS_reserved 0x80000000 +#define KERB_TICKET_FLAGS_forwardable 0x40000000 +#define KERB_TICKET_FLAGS_forwarded 0x20000000 +#define KERB_TICKET_FLAGS_proxiable 0x10000000 +#define KERB_TICKET_FLAGS_proxy 0x08000000 +#define KERB_TICKET_FLAGS_may_postdate 0x04000000 +#define KERB_TICKET_FLAGS_postdated 0x02000000 +#define KERB_TICKET_FLAGS_invalid 0x01000000 +#define KERB_TICKET_FLAGS_renewable 0x00800000 +#define KERB_TICKET_FLAGS_initial 0x00400000 +#define KERB_TICKET_FLAGS_pre_authent 0x00200000 +#define KERB_TICKET_FLAGS_hw_authent 0x00100000 +#define KERB_TICKET_FLAGS_ok_as_delegate 0x00040000 +#define KERB_TICKET_FLAGS_name_canonicalize 0x00010000 +#define KERB_TICKET_FLAGS_cname_in_pa_data 0x00040000 +#define KERB_TICKET_FLAGS_reserved1 0x00000001 + +typedef enum _KERB_PROTOCOL_MESSAGE_TYPE +{ + KerbDebugRequestMessage = 0, + KerbQueryTicketCacheMessage, + KerbChangeMachinePasswordMessage, + KerbVerifyPacMessage, + KerbRetrieveTicketMessage, + KerbUpdateAddressesMessage, + KerbPurgeTicketCacheMessage, + KerbChangePasswordMessage, + KerbRetrieveEncodedTicketMessage, + KerbDecryptDataMessage, + KerbAddBindingCacheEntryMessage, + KerbSetPasswordMessage, + KerbSetPasswordExMessage, + KerbVerifyCredentialsMessage, + KerbQueryTicketCacheExMessage, + KerbPurgeTicketCacheExMessage, + KerbRefreshSmartcardCredentialsMessage, + KerbAddExtraCredentialsMessage, + KerbQuerySupplementalCredentialsMessage, + KerbTransferCredentialsMessage, + KerbQueryTicketCacheEx2Message, + KerbSubmitTicketMessage, + KerbAddExtraCredentialsExMessage, + KerbQueryKdcProxyCacheMessage, + KerbPurgeKdcProxyCacheMessage, + KerbQueryTicketCacheEx3Message, + KerbCleanupMachinePkinitCredsMessage, + KerbAddBindingCacheEntryExMessage, + KerbQueryBindingCacheMessage, + KerbPurgeBindingCacheMessage, + KerbQueryDomainExtendedPoliciesMessage, + KerbQueryS4U2ProxyCacheMessage +} KERB_PROTOCOL_MESSAGE_TYPE, *PKERB_PROTOCOL_MESSAGE_TYPE; + +typedef struct _KERB_TICKET_CACHE_INFO +{ + UNICODE_STRING ServerName; + UNICODE_STRING RealmName; + LARGE_INTEGER StartTime; + LARGE_INTEGER EndTime; + LARGE_INTEGER RenewTime; + LONG EncryptionType; + ULONG TicketFlags; +} KERB_TICKET_CACHE_INFO, *PKERB_TICKET_CACHE_INFO; + +typedef struct _KERB_QUERY_TKT_CACHE_REQUEST +{ + KERB_PROTOCOL_MESSAGE_TYPE MessageType; + LUID LogonId; +} KERB_QUERY_TKT_CACHE_REQUEST, *PKERB_QUERY_TKT_CACHE_REQUEST; + +typedef struct _KERB_QUERY_TKT_CACHE_RESPONSE +{ + KERB_PROTOCOL_MESSAGE_TYPE MessageType; + ULONG CountOfTickets; + KERB_TICKET_CACHE_INFO Tickets[ANYSIZE_ARRAY]; +} KERB_QUERY_TKT_CACHE_RESPONSE, *PKERB_QUERY_TKT_CACHE_RESPONSE; + +typedef struct _KERB_RETRIEVE_TKT_REQUEST +{ + KERB_PROTOCOL_MESSAGE_TYPE MessageType; + LUID LogonId; + UNICODE_STRING TargetName; + ULONG TicketFlags; + ULONG CacheOptions; + LONG EncryptionType; + SecHandle CredentialsHandle; +} KERB_RETRIEVE_TKT_REQUEST, *PKERB_RETRIEVE_TKT_REQUEST; + +typedef struct _KERB_PURGE_TKT_CACHE_REQUEST +{ + KERB_PROTOCOL_MESSAGE_TYPE MessageType; + LUID LogonId; + UNICODE_STRING ServerName; + UNICODE_STRING RealmName; +} KERB_PURGE_TKT_CACHE_REQUEST, *PKERB_PURGE_TKT_CACHE_REQUEST; + #define RtlGenRandom SystemFunction036 #define RtlEncryptMemory SystemFunction040 #define RtlDecryptMemory SystemFunction041 -- 2.15.1

2 1

[PATCH 1/2] include: Add activation.idl with IActivationFactory interface.
by Nikolay Sivov 30 Jan '18

30 Jan '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- include/Makefile.in | 1 + include/activation.idl | 31 +++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 include/activation.idl diff --git a/include/Makefile.in b/include/Makefile.in index b975dd585e..fdf736e4eb 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -1,5 +1,6 @@ IDL_SRCS = \ access.idl \ + activation.idl \ activaut.idl \ activdbg.idl \ activscp.idl \ diff --git a/include/activation.idl b/include/activation.idl new file mode 100644 index 0000000000..b86c9f6b6f --- /dev/null +++ b/include/activation.idl @@ -0,0 +1,31 @@ +/* + * Copyright 2016 Michael Müller + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef DO_NO_IMPORTS +import "inspectable.idl"; +#endif + +[ + object, + uuid(00000035-0000-0000-c000-000000000046), + pointer_default(unique) +] +interface IActivationFactory : IInspectable +{ + HRESULT ActivateInstance([out] IInspectable **instance); +} -- 2.15.1

1 1

[PATCH 1/2] comctl32/tests: Enable IP address control tests on version 6
by Nikolay Sivov 30 Jan '18

30 Jan '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/tests/ipaddress.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/comctl32/tests/ipaddress.c b/dlls/comctl32/tests/ipaddress.c index 6d8e9ccf4b..52581899a7 100644 --- a/dlls/comctl32/tests/ipaddress.c +++ b/dlls/comctl32/tests/ipaddress.c @@ -22,6 +22,7 @@ #include <commctrl.h> #include "wine/test.h" +#include "v6util.h" #define expect(expected, got) ok(expected == got, "expected %d, got %d\n", expected,got) @@ -63,5 +64,15 @@ static void test_get_set_text(void) START_TEST(ipaddress) { + ULONG_PTR cookie; + HANDLE ctxt; + + test_get_set_text(); + + if (!load_v6_module(&cookie, &ctxt)) + return; + test_get_set_text(); + + unload_v6_module(cookie, ctxt); } -- 2.15.1

1 1

[PATCH 3/4] dwrite: Use the global HeapAlloc() wrappers
by Michael Stefaniuc 30 Jan '18

30 Jan '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 457d863d7b..31b977a159 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -20,6 +20,7 @@ #include "d2d1.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/list.h" #include "wine/unicode.h" @@ -30,31 +31,6 @@ static const DWRITE_MATRIX identity = 0.0f, 0.0f }; -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); -} - -static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t size) -{ - return HeapReAlloc(GetProcessHeap(), 0, mem, size); -} - -static inline void* __WINE_ALLOC_SIZE(2) heap_realloc_zero(void *mem, size_t size) -{ - return HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static inline LPWSTR heap_strdupW(const WCHAR *str) { LPWSTR ret = NULL; -- 2.14.3

2 1

[PATCH] advapi32: Support WinLogonIdsSid in IsWellKnownSid
by Alistair Leslie-Hughes 29 Jan '18

29 Jan '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/advapi32/security.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index e666062..84aa2f1 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -104,6 +104,7 @@ static const WELLKNOWNSID WellKnownSids[] = { {'R','C'}, WinRestrictedCodeSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_RESTRICTED_CODE_RID } } }, { {0,0}, WinTerminalServerSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_TERMINAL_SERVER_RID } } }, { {0,0}, WinRemoteLogonIdSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_REMOTE_LOGON_RID } } }, + { {0,0}, WinLogonIdsSid, { SID_REVISION, SECURITY_LOGON_IDS_RID_COUNT, { SECURITY_NT_AUTHORITY }, { SECURITY_LOGON_IDS_RID } } }, { {'S','Y'}, WinLocalSystemSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_LOCAL_SYSTEM_RID } } }, { {'L','S'}, WinLocalServiceSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_LOCAL_SERVICE_RID } } }, { {'N','S'}, WinNetworkServiceSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_NETWORK_SERVICE_RID } } }, -- 1.9.1

1 0

[PATCH] dpnet: Use the global HeapAlloc() wrappers
by Alistair Leslie-Hughes 29 Jan '18

29 Jan '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dpnet/dpnet_private.h | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/dlls/dpnet/dpnet_private.h b/dlls/dpnet/dpnet_private.h index 44ff289d..2e72360 100644 --- a/dlls/dpnet/dpnet_private.h +++ b/dlls/dpnet/dpnet_private.h @@ -25,6 +25,7 @@ # error You must include config.h to use this header #endif +#include "wine/heap.h" #include <wine/list.h> #include "winsock2.h" #include "wine/unicode.h" @@ -154,21 +155,6 @@ typedef struct { #define FE(x) { x, #x } #define GE(x) { &x, #x } -static inline void __WINE_ALLOC_SIZE(1) *heap_alloc( size_t len ) -{ - return HeapAlloc( GetProcessHeap(), 0, len ); -} - -static inline void __WINE_ALLOC_SIZE(2) *heap_realloc(void *mem, size_t len) -{ - return HeapReAlloc( GetProcessHeap(), 0, mem, len); -} - -static inline BOOL heap_free( void *mem ) -{ - return HeapFree( GetProcessHeap(), 0, mem ); -} - static inline WCHAR *heap_strdupW( const WCHAR *src ) { WCHAR *dst; -- 1.9.1

1 0

[PATCH resend 1/2] user32/tests: Add a helper to check clipboard sequence and messages.
by Zebediah Figura 29 Jan '18

29 Jan '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/user32/tests/clipboard.c | 390 ++++++------------------------------------ 1 file changed, 51 insertions(+), 339 deletions(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index aa3bd04..4fd37fa 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -995,13 +995,41 @@ static void get_clipboard_data_process(void) ok(r, "CloseClipboard failed: %d\n", GetLastError()); } +static UINT old_seq; + +static void check_messages_(int line, HWND win, UINT seq_diff, UINT draw, UINT update, UINT destroy, UINT render) +{ + MSG msg; + UINT count, fmt, seq; + + seq = GetClipboardSequenceNumber(); + ok_(__FILE__, line)(seq - old_seq == seq_diff, "sequence diff %d\n", seq - old_seq); + old_seq = seq; + + if (!cross_thread) + { + while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); + } + + count = SendMessageA( win, WM_USER + 1, 0, 0 ); + ok_(__FILE__, line)(count == draw, "WM_DRAWCLIPBOARD %sreceived\n", draw ? "not " : ""); + count = SendMessageA( win, WM_USER + 2, 0, 0 ); + ok_(__FILE__, line)(count == update || broken(!pAddClipboardFormatListener), + "WM_CLIPBOARDUPDATE %sreceived\n", update ? "not " : ""); + count = SendMessageA( win, WM_USER + 3, 0, 0 ); + ok_(__FILE__, line)(count == destroy, "WM_DESTROYCLIPBOARD %sreceived\n", destroy ? "not " : ""); + fmt = SendMessageA( win, WM_USER + 4, 0, 0 ); + ok_(__FILE__, line)(fmt == render, "WM_RENDERFORMAT received %04x, expected %04x\n", fmt, render); +} +#define check_messages(a,b,c,d,e,f) check_messages_(__LINE__,a,b,c,d,e,f) + static DWORD WINAPI clipboard_thread(void *param) { HWND ret, win = param; BOOL r; MSG msg; HANDLE handle; - UINT count, fmt, formats, old_seq = 0, seq; + UINT count, fmt, formats; cross_thread = (GetWindowThreadProcessId( win, NULL ) != GetCurrentThreadId()); trace( "%s-threaded test\n", cross_thread ? "multi" : "single" ); @@ -1045,21 +1073,7 @@ static DWORD WINAPI clipboard_thread(void *param) ok( r, "RemoveClipboardFormatListener failed err %d\n", GetLastError()); } - seq = GetClipboardSequenceNumber(); - ok( seq == old_seq, "sequence changed\n" ); - if (!cross_thread) - { - ok( wm_drawclipboard == 1, "WM_DRAWCLIPBOARD not received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER + 1, 0, 0 ); - ok( count == 1, "WM_DRAWCLIPBOARD not received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( !count, "WM_CLIPBOARDUPDATE received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received\n" ); + check_messages(win, 0, 1, 0, 0, 0); SetLastError( 0xdeadbeef ); r = OpenClipboard( (HWND)0xdead ); @@ -1069,125 +1083,32 @@ static DWORD WINAPI clipboard_thread(void *param) r = OpenClipboard(win); ok(r, "OpenClipboard failed: %d\n", GetLastError()); - seq = GetClipboardSequenceNumber(); - ok( seq == old_seq, "sequence changed\n" ); - if (!cross_thread) - { - ok( !wm_drawclipboard, "WM_DRAWCLIPBOARD received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( !count, "WM_DRAWCLIPBOARD received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( !count, "WM_CLIPBOARDUPDATE received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received\n" ); + check_messages(win, 0, 0, 0, 0, 0); r = EmptyClipboard(); ok(r, "EmptyClipboard failed: %d\n", GetLastError()); - seq = GetClipboardSequenceNumber(); - ok( (int)(seq - old_seq) == 1, "sequence diff %d\n", seq - old_seq ); - old_seq = seq; - if (!cross_thread) - { - ok( !wm_drawclipboard, "WM_DRAWCLIPBOARD received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( !count, "WM_DRAWCLIPBOARD received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( !count, "WM_CLIPBOARDUPDATE received\n" ); - count = SendMessageA( win, WM_USER+3, 0, 0 ); - ok( !count, "WM_DESTROYCLIPBOARD received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received\n" ); + check_messages(win, 1, 0, 0, 0, 0); r = EmptyClipboard(); ok(r, "EmptyClipboard failed: %d\n", GetLastError()); /* sequence changes again, even though it was already empty */ - seq = GetClipboardSequenceNumber(); - ok( (int)(seq - old_seq) == 1, "sequence diff %d\n", seq - old_seq ); - old_seq = seq; - if (!cross_thread) - { - ok( !wm_drawclipboard, "WM_DRAWCLIPBOARD received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( !count, "WM_DRAWCLIPBOARD received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( !count, "WM_CLIPBOARDUPDATE received\n" ); - count = SendMessageA( win, WM_USER+3, 0, 0 ); - ok( count, "WM_DESTROYCLIPBOARD not received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received\n" ); + check_messages(win, 1, 0, 0, 1, 0); count = SendMessageA( win, WM_USER+5, 0, 0 ); ok( !count, "wrong format count %u on WM_DESTROYCLIPBOARD\n", count ); handle = SetClipboardData( CF_TEXT, create_textA() ); ok(handle != 0, "SetClipboardData failed: %d\n", GetLastError()); - seq = GetClipboardSequenceNumber(); - ok( (int)(seq - old_seq) == 1, "sequence diff %d\n", seq - old_seq ); - old_seq = seq; - if (!cross_thread) - { - ok( !wm_drawclipboard, "WM_DRAWCLIPBOARD received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( !count, "WM_DRAWCLIPBOARD received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( !count, "WM_CLIPBOARDUPDATE received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received\n" ); + check_messages(win, 1, 0, 0, 0, 0); SetClipboardData( CF_UNICODETEXT, 0 ); - seq = GetClipboardSequenceNumber(); - ok( (int)(seq - old_seq) == 1, "sequence diff %d\n", seq - old_seq ); - old_seq = seq; - if (!cross_thread) - { - ok( !wm_drawclipboard, "WM_DRAWCLIPBOARD received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( !count, "WM_DRAWCLIPBOARD received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( !count, "WM_CLIPBOARDUPDATE received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received\n" ); + check_messages(win, 1, 0, 0, 0, 0); SetClipboardData( CF_UNICODETEXT, 0 ); /* same data again */ - seq = GetClipboardSequenceNumber(); - ok( (int)(seq - old_seq) == 1, "sequence diff %d\n", seq - old_seq ); - old_seq = seq; - if (!cross_thread) - { - ok( !wm_drawclipboard, "WM_DRAWCLIPBOARD received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( !count, "WM_DRAWCLIPBOARD received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( !count, "WM_CLIPBOARDUPDATE received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received\n" ); + check_messages(win, 1, 0, 0, 0, 0); ok( IsClipboardFormatAvailable( CF_TEXT ), "CF_TEXT available\n" ); ok( IsClipboardFormatAvailable( CF_UNICODETEXT ), "CF_UNICODETEXT available\n" ); @@ -1198,40 +1119,12 @@ static DWORD WINAPI clipboard_thread(void *param) ok(r, "CloseClipboard failed: %d\n", GetLastError()); LeaveCriticalSection(&clipboard_cs); - seq = GetClipboardSequenceNumber(); - ok( (int)(seq - old_seq) == 2, "sequence diff %d\n", seq - old_seq ); - old_seq = seq; - if (!cross_thread) - { - ok( wm_drawclipboard == 1, "WM_DRAWCLIPBOARD not received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( count == 1, "WM_DRAWCLIPBOARD not received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( count == 1 || broken(!pAddClipboardFormatListener), "WM_CLIPBOARDUPDATE not received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received %04x\n", fmt ); + check_messages(win, 2, 1, 1, 0, 0); r = OpenClipboard(win); ok(r, "OpenClipboard failed: %d\n", GetLastError()); - seq = GetClipboardSequenceNumber(); - ok( seq == old_seq, "sequence changed\n" ); - if (!cross_thread) - { - ok( !wm_drawclipboard, "WM_DRAWCLIPBOARD received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( !count, "WM_DRAWCLIPBOARD received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( !count, "WM_CLIPBOARDUPDATE received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received\n" ); + check_messages(win, 0, 0, 0, 0, 0); ok( IsClipboardFormatAvailable( CF_TEXT ), "CF_TEXT available\n" ); ok( IsClipboardFormatAvailable( CF_UNICODETEXT ), "CF_UNICODETEXT available\n" ); @@ -1251,65 +1144,19 @@ static DWORD WINAPI clipboard_thread(void *param) do_render_format = FALSE; SetClipboardData( CF_WAVE, 0 ); - seq = GetClipboardSequenceNumber(); - ok( (int)(seq - old_seq) == 1, "sequence diff %d\n", seq - old_seq ); - old_seq = seq; - if (!cross_thread) - { - ok( !wm_drawclipboard, "WM_DRAWCLIPBOARD received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( !count, "WM_DRAWCLIPBOARD received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( !count, "WM_CLIPBOARDUPDATE received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received %04x\n", fmt ); + check_messages(win, 1, 0, 0, 0, 0); r = CloseClipboard(); ok(r, "CloseClipboard failed: %d\n", GetLastError()); /* no synthesized format, so CloseClipboard doesn't change the sequence */ - seq = GetClipboardSequenceNumber(); - ok( seq == old_seq, "sequence changed\n" ); - old_seq = seq; - if (!cross_thread) - { - ok( wm_drawclipboard == 1, "WM_DRAWCLIPBOARD not received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( count == 1, "WM_DRAWCLIPBOARD not received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( count == 1 || broken(!pAddClipboardFormatListener), "WM_CLIPBOARDUPDATE not received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received %04x\n", fmt ); + check_messages(win, 0, 1, 1, 0, 0); r = OpenClipboard(win); ok(r, "OpenClipboard failed: %d\n", GetLastError()); r = CloseClipboard(); ok(r, "CloseClipboard failed: %d\n", GetLastError()); /* nothing changed */ - seq = GetClipboardSequenceNumber(); - ok( seq == old_seq, "sequence changed\n" ); - if (!cross_thread) - { - ok( !wm_drawclipboard, "WM_DRAWCLIPBOARD received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( !count, "WM_DRAWCLIPBOARD received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( !count, "WM_CLIPBOARDUPDATE received\n" ); - count = SendMessageA( win, WM_USER+3, 0, 0 ); - ok( !count, "WM_DESTROYCLIPBOARD received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received %04x\n", fmt ); + check_messages(win, 0, 0, 0, 0, 0); formats = CountClipboardFormats(); r = OpenClipboard(0); @@ -1319,195 +1166,67 @@ static DWORD WINAPI clipboard_thread(void *param) r = CloseClipboard(); ok(r, "CloseClipboard failed: %d\n", GetLastError()); - if (!cross_thread) - { - ok( wm_drawclipboard == 1, "WM_DRAWCLIPBOARD not received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( count == 1, "WM_DRAWCLIPBOARD not received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( count == 1 || broken(!pAddClipboardFormatListener), "WM_CLIPBOARDUPDATE not received\n" ); - count = SendMessageA( win, WM_USER+3, 0, 0 ); - ok( count == 1, "WM_DESTROYCLIPBOARD not received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received %04x\n", fmt ); + check_messages(win, 1, 1, 1, 1, 0); count = SendMessageA( win, WM_USER+5, 0, 0 ); ok( count == formats, "wrong format count %u on WM_DESTROYCLIPBOARD\n", count ); r = OpenClipboard(win); ok(r, "OpenClipboard failed: %d\n", GetLastError()); SetClipboardData( CF_WAVE, GlobalAlloc( GMEM_FIXED, 1 )); - seq = GetClipboardSequenceNumber(); - ok( (int)(seq - old_seq) == 2, "sequence diff %d\n", seq - old_seq ); - old_seq = seq; - if (!cross_thread) - { - ok( !wm_drawclipboard, "WM_DRAWCLIPBOARD received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( !count, "WM_DRAWCLIPBOARD received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( !count, "WM_CLIPBOARDUPDATE received\n" ); - count = SendMessageA( win, WM_USER+3, 0, 0 ); - ok( !count, "WM_DESTROYCLIPBOARD received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received %04x\n", fmt ); + check_messages(win, 1, 0, 0, 0, 0); EnterCriticalSection(&clipboard_cs); r = CloseClipboard(); ok(r, "CloseClipboard failed: %d\n", GetLastError()); LeaveCriticalSection(&clipboard_cs); - seq = GetClipboardSequenceNumber(); - ok( seq == old_seq, "sequence changed\n" ); - old_seq = seq; - if (!cross_thread) - { - ok( wm_drawclipboard == 1, "WM_DRAWCLIPBOARD not received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( count == 1, "WM_DRAWCLIPBOARD not received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( count == 1 || broken(!pAddClipboardFormatListener), "WM_CLIPBOARDUPDATE not received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received\n" ); + check_messages(win, 0, 1, 1, 0, 0); run_process( "grab_clipboard 0" ); - seq = GetClipboardSequenceNumber(); - ok( (int)(seq - old_seq) == 1, "sequence diff %d\n", seq - old_seq ); - old_seq = seq; if (!cross_thread) { - ok( !wm_drawclipboard, "WM_DRAWCLIPBOARD received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); /* in this case we get a cross-thread WM_DRAWCLIPBOARD */ cross_thread = TRUE; while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); cross_thread = FALSE; } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( count == 1, "WM_DRAWCLIPBOARD not received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( count == 1 || broken(!pAddClipboardFormatListener), "WM_CLIPBOARDUPDATE not received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received\n" ); + check_messages(win, 1, 1, 1, 0, 0); r = OpenClipboard(0); ok(r, "OpenClipboard failed: %d\n", GetLastError()); SetClipboardData( CF_WAVE, GlobalAlloc( GMEM_FIXED, 1 )); - seq = GetClipboardSequenceNumber(); - ok( (int)(seq - old_seq) == 1, "sequence diff %d\n", seq - old_seq ); - old_seq = seq; - if (!cross_thread) - { - ok( !wm_drawclipboard, "WM_DRAWCLIPBOARD received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( !count, "WM_DRAWCLIPBOARD received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( !count, "WM_CLIPBOARDUPDATE received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received\n" ); + check_messages(win, 1, 0, 0, 0, 0); EnterCriticalSection(&clipboard_cs); r = CloseClipboard(); ok(r, "CloseClipboard failed: %d\n", GetLastError()); LeaveCriticalSection(&clipboard_cs); - seq = GetClipboardSequenceNumber(); - ok( seq == old_seq, "sequence changed\n" ); - old_seq = seq; - if (!cross_thread) - { - ok( wm_drawclipboard == 1, "WM_DRAWCLIPBOARD received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( count == 1, "WM_DRAWCLIPBOARD not received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( count == 1 || broken(!pAddClipboardFormatListener), "WM_CLIPBOARDUPDATE not received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received\n" ); + check_messages(win, 0, 1, 1, 0, 0); run_process( "grab_clipboard 1" ); - seq = GetClipboardSequenceNumber(); - ok( (int)(seq - old_seq) == 2, "sequence diff %d\n", seq - old_seq ); - old_seq = seq; if (!cross_thread) { - ok( !wm_drawclipboard, "WM_DRAWCLIPBOARD received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); /* in this case we get a cross-thread WM_DRAWCLIPBOARD */ cross_thread = TRUE; while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); cross_thread = FALSE; } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( count == 1, "WM_DRAWCLIPBOARD not received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( count == 1 || broken(!pAddClipboardFormatListener), "WM_CLIPBOARDUPDATE not received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received\n" ); + check_messages(win, 2, 1, 1, 0, 0); r = OpenClipboard(0); ok(r, "OpenClipboard failed: %d\n", GetLastError()); SetClipboardData( CF_WAVE, GlobalAlloc( GMEM_FIXED, 1 )); - seq = GetClipboardSequenceNumber(); - ok( (int)(seq - old_seq) == 1, "sequence diff %d\n", seq - old_seq ); - old_seq = seq; - if (!cross_thread) - { - ok( !wm_drawclipboard, "WM_DRAWCLIPBOARD received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( !count, "WM_DRAWCLIPBOARD received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( !count, "WM_CLIPBOARDUPDATE received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received\n" ); + check_messages(win, 1, 0, 0, 0, 0); EnterCriticalSection(&clipboard_cs); r = CloseClipboard(); ok(r, "CloseClipboard failed: %d\n", GetLastError()); LeaveCriticalSection(&clipboard_cs); - seq = GetClipboardSequenceNumber(); - ok( seq == old_seq, "sequence changed\n" ); - old_seq = seq; - if (!cross_thread) - { - ok( wm_drawclipboard == 1, "WM_DRAWCLIPBOARD not received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( count == 1, "WM_DRAWCLIPBOARD not received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( count == 1 || broken(!pAddClipboardFormatListener), "WM_CLIPBOARDUPDATE not received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received\n" ); + check_messages(win, 0, 1, 1, 0, 0); if (cross_thread) { @@ -1522,16 +1241,9 @@ static DWORD WINAPI clipboard_thread(void *param) do_render_format = TRUE; old_seq = GetClipboardSequenceNumber(); run_process( "get_clipboard_data" ); - seq = GetClipboardSequenceNumber(); - ok( seq == old_seq, "sequence changed\n" ); do_render_format = FALSE; - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( count == 1, "WM_DRAWCLIPBOARD not received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( count == 1 || broken(!pAddClipboardFormatListener) /* < Vista */, "WM_CLIPBOARDUPDATE not received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( fmt == CF_TEXT, "WM_RENDERFORMAT received\n" ); + check_messages(win, 0, 1, 1, 0, CF_TEXT); } r = PostMessageA(win, WM_USER, 0, 0); -- 2.7.4

1 1

[PATCH 1/2] user32/tests: Add a helper to check clipboard sequence and messages.
by Zebediah Figura 29 Jan '18

29 Jan '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/user32/tests/clipboard.c | 390 ++++++------------------------------------ 1 file changed, 51 insertions(+), 339 deletions(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index aa3bd04..4fd37fa 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -995,13 +995,41 @@ static void get_clipboard_data_process(void) ok(r, "CloseClipboard failed: %d\n", GetLastError()); } +static UINT old_seq; + +static void check_messages_(int line, HWND win, UINT seq_diff, UINT draw, UINT update, UINT destroy, UINT render) +{ + MSG msg; + UINT count, fmt, seq; + + seq = GetClipboardSequenceNumber(); + ok_(__FILE__, line)(seq - old_seq == seq_diff, "sequence diff %d\n", seq - old_seq); + old_seq = seq; + + if (!cross_thread) + { + while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); + } + + count = SendMessageA( win, WM_USER + 1, 0, 0 ); + ok_(__FILE__, line)(count == draw, "WM_DRAWCLIPBOARD %sreceived\n", draw ? "not " : ""); + count = SendMessageA( win, WM_USER + 2, 0, 0 ); + ok_(__FILE__, line)(count == update || broken(!pAddClipboardFormatListener), + "WM_CLIPBOARDUPDATE %sreceived\n", update ? "not " : ""); + count = SendMessageA( win, WM_USER + 3, 0, 0 ); + ok_(__FILE__, line)(count == destroy, "WM_DESTROYCLIPBOARD %sreceived\n", destroy ? "not " : ""); + fmt = SendMessageA( win, WM_USER + 4, 0, 0 ); + ok_(__FILE__, line)(fmt == render, "WM_RENDERFORMAT received %04x, expected %04x\n", fmt, render); +} +#define check_messages(a,b,c,d,e,f) check_messages_(__LINE__,a,b,c,d,e,f) + static DWORD WINAPI clipboard_thread(void *param) { HWND ret, win = param; BOOL r; MSG msg; HANDLE handle; - UINT count, fmt, formats, old_seq = 0, seq; + UINT count, fmt, formats; cross_thread = (GetWindowThreadProcessId( win, NULL ) != GetCurrentThreadId()); trace( "%s-threaded test\n", cross_thread ? "multi" : "single" ); @@ -1045,21 +1073,7 @@ static DWORD WINAPI clipboard_thread(void *param) ok( r, "RemoveClipboardFormatListener failed err %d\n", GetLastError()); } - seq = GetClipboardSequenceNumber(); - ok( seq == old_seq, "sequence changed\n" ); - if (!cross_thread) - { - ok( wm_drawclipboard == 1, "WM_DRAWCLIPBOARD not received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER + 1, 0, 0 ); - ok( count == 1, "WM_DRAWCLIPBOARD not received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( !count, "WM_CLIPBOARDUPDATE received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received\n" ); + check_messages(win, 0, 1, 0, 0, 0); SetLastError( 0xdeadbeef ); r = OpenClipboard( (HWND)0xdead ); @@ -1069,125 +1083,32 @@ static DWORD WINAPI clipboard_thread(void *param) r = OpenClipboard(win); ok(r, "OpenClipboard failed: %d\n", GetLastError()); - seq = GetClipboardSequenceNumber(); - ok( seq == old_seq, "sequence changed\n" ); - if (!cross_thread) - { - ok( !wm_drawclipboard, "WM_DRAWCLIPBOARD received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( !count, "WM_DRAWCLIPBOARD received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( !count, "WM_CLIPBOARDUPDATE received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received\n" ); + check_messages(win, 0, 0, 0, 0, 0); r = EmptyClipboard(); ok(r, "EmptyClipboard failed: %d\n", GetLastError()); - seq = GetClipboardSequenceNumber(); - ok( (int)(seq - old_seq) == 1, "sequence diff %d\n", seq - old_seq ); - old_seq = seq; - if (!cross_thread) - { - ok( !wm_drawclipboard, "WM_DRAWCLIPBOARD received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( !count, "WM_DRAWCLIPBOARD received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( !count, "WM_CLIPBOARDUPDATE received\n" ); - count = SendMessageA( win, WM_USER+3, 0, 0 ); - ok( !count, "WM_DESTROYCLIPBOARD received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received\n" ); + check_messages(win, 1, 0, 0, 0, 0); r = EmptyClipboard(); ok(r, "EmptyClipboard failed: %d\n", GetLastError()); /* sequence changes again, even though it was already empty */ - seq = GetClipboardSequenceNumber(); - ok( (int)(seq - old_seq) == 1, "sequence diff %d\n", seq - old_seq ); - old_seq = seq; - if (!cross_thread) - { - ok( !wm_drawclipboard, "WM_DRAWCLIPBOARD received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( !count, "WM_DRAWCLIPBOARD received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( !count, "WM_CLIPBOARDUPDATE received\n" ); - count = SendMessageA( win, WM_USER+3, 0, 0 ); - ok( count, "WM_DESTROYCLIPBOARD not received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received\n" ); + check_messages(win, 1, 0, 0, 1, 0); count = SendMessageA( win, WM_USER+5, 0, 0 ); ok( !count, "wrong format count %u on WM_DESTROYCLIPBOARD\n", count ); handle = SetClipboardData( CF_TEXT, create_textA() ); ok(handle != 0, "SetClipboardData failed: %d\n", GetLastError()); - seq = GetClipboardSequenceNumber(); - ok( (int)(seq - old_seq) == 1, "sequence diff %d\n", seq - old_seq ); - old_seq = seq; - if (!cross_thread) - { - ok( !wm_drawclipboard, "WM_DRAWCLIPBOARD received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( !count, "WM_DRAWCLIPBOARD received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( !count, "WM_CLIPBOARDUPDATE received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received\n" ); + check_messages(win, 1, 0, 0, 0, 0); SetClipboardData( CF_UNICODETEXT, 0 ); - seq = GetClipboardSequenceNumber(); - ok( (int)(seq - old_seq) == 1, "sequence diff %d\n", seq - old_seq ); - old_seq = seq; - if (!cross_thread) - { - ok( !wm_drawclipboard, "WM_DRAWCLIPBOARD received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( !count, "WM_DRAWCLIPBOARD received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( !count, "WM_CLIPBOARDUPDATE received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received\n" ); + check_messages(win, 1, 0, 0, 0, 0); SetClipboardData( CF_UNICODETEXT, 0 ); /* same data again */ - seq = GetClipboardSequenceNumber(); - ok( (int)(seq - old_seq) == 1, "sequence diff %d\n", seq - old_seq ); - old_seq = seq; - if (!cross_thread) - { - ok( !wm_drawclipboard, "WM_DRAWCLIPBOARD received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( !count, "WM_DRAWCLIPBOARD received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( !count, "WM_CLIPBOARDUPDATE received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received\n" ); + check_messages(win, 1, 0, 0, 0, 0); ok( IsClipboardFormatAvailable( CF_TEXT ), "CF_TEXT available\n" ); ok( IsClipboardFormatAvailable( CF_UNICODETEXT ), "CF_UNICODETEXT available\n" ); @@ -1198,40 +1119,12 @@ static DWORD WINAPI clipboard_thread(void *param) ok(r, "CloseClipboard failed: %d\n", GetLastError()); LeaveCriticalSection(&clipboard_cs); - seq = GetClipboardSequenceNumber(); - ok( (int)(seq - old_seq) == 2, "sequence diff %d\n", seq - old_seq ); - old_seq = seq; - if (!cross_thread) - { - ok( wm_drawclipboard == 1, "WM_DRAWCLIPBOARD not received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( count == 1, "WM_DRAWCLIPBOARD not received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( count == 1 || broken(!pAddClipboardFormatListener), "WM_CLIPBOARDUPDATE not received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received %04x\n", fmt ); + check_messages(win, 2, 1, 1, 0, 0); r = OpenClipboard(win); ok(r, "OpenClipboard failed: %d\n", GetLastError()); - seq = GetClipboardSequenceNumber(); - ok( seq == old_seq, "sequence changed\n" ); - if (!cross_thread) - { - ok( !wm_drawclipboard, "WM_DRAWCLIPBOARD received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( !count, "WM_DRAWCLIPBOARD received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( !count, "WM_CLIPBOARDUPDATE received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received\n" ); + check_messages(win, 0, 0, 0, 0, 0); ok( IsClipboardFormatAvailable( CF_TEXT ), "CF_TEXT available\n" ); ok( IsClipboardFormatAvailable( CF_UNICODETEXT ), "CF_UNICODETEXT available\n" ); @@ -1251,65 +1144,19 @@ static DWORD WINAPI clipboard_thread(void *param) do_render_format = FALSE; SetClipboardData( CF_WAVE, 0 ); - seq = GetClipboardSequenceNumber(); - ok( (int)(seq - old_seq) == 1, "sequence diff %d\n", seq - old_seq ); - old_seq = seq; - if (!cross_thread) - { - ok( !wm_drawclipboard, "WM_DRAWCLIPBOARD received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( !count, "WM_DRAWCLIPBOARD received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( !count, "WM_CLIPBOARDUPDATE received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received %04x\n", fmt ); + check_messages(win, 1, 0, 0, 0, 0); r = CloseClipboard(); ok(r, "CloseClipboard failed: %d\n", GetLastError()); /* no synthesized format, so CloseClipboard doesn't change the sequence */ - seq = GetClipboardSequenceNumber(); - ok( seq == old_seq, "sequence changed\n" ); - old_seq = seq; - if (!cross_thread) - { - ok( wm_drawclipboard == 1, "WM_DRAWCLIPBOARD not received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( count == 1, "WM_DRAWCLIPBOARD not received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( count == 1 || broken(!pAddClipboardFormatListener), "WM_CLIPBOARDUPDATE not received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received %04x\n", fmt ); + check_messages(win, 0, 1, 1, 0, 0); r = OpenClipboard(win); ok(r, "OpenClipboard failed: %d\n", GetLastError()); r = CloseClipboard(); ok(r, "CloseClipboard failed: %d\n", GetLastError()); /* nothing changed */ - seq = GetClipboardSequenceNumber(); - ok( seq == old_seq, "sequence changed\n" ); - if (!cross_thread) - { - ok( !wm_drawclipboard, "WM_DRAWCLIPBOARD received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( !count, "WM_DRAWCLIPBOARD received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( !count, "WM_CLIPBOARDUPDATE received\n" ); - count = SendMessageA( win, WM_USER+3, 0, 0 ); - ok( !count, "WM_DESTROYCLIPBOARD received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received %04x\n", fmt ); + check_messages(win, 0, 0, 0, 0, 0); formats = CountClipboardFormats(); r = OpenClipboard(0); @@ -1319,195 +1166,67 @@ static DWORD WINAPI clipboard_thread(void *param) r = CloseClipboard(); ok(r, "CloseClipboard failed: %d\n", GetLastError()); - if (!cross_thread) - { - ok( wm_drawclipboard == 1, "WM_DRAWCLIPBOARD not received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( count == 1, "WM_DRAWCLIPBOARD not received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( count == 1 || broken(!pAddClipboardFormatListener), "WM_CLIPBOARDUPDATE not received\n" ); - count = SendMessageA( win, WM_USER+3, 0, 0 ); - ok( count == 1, "WM_DESTROYCLIPBOARD not received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received %04x\n", fmt ); + check_messages(win, 1, 1, 1, 1, 0); count = SendMessageA( win, WM_USER+5, 0, 0 ); ok( count == formats, "wrong format count %u on WM_DESTROYCLIPBOARD\n", count ); r = OpenClipboard(win); ok(r, "OpenClipboard failed: %d\n", GetLastError()); SetClipboardData( CF_WAVE, GlobalAlloc( GMEM_FIXED, 1 )); - seq = GetClipboardSequenceNumber(); - ok( (int)(seq - old_seq) == 2, "sequence diff %d\n", seq - old_seq ); - old_seq = seq; - if (!cross_thread) - { - ok( !wm_drawclipboard, "WM_DRAWCLIPBOARD received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( !count, "WM_DRAWCLIPBOARD received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( !count, "WM_CLIPBOARDUPDATE received\n" ); - count = SendMessageA( win, WM_USER+3, 0, 0 ); - ok( !count, "WM_DESTROYCLIPBOARD received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received %04x\n", fmt ); + check_messages(win, 1, 0, 0, 0, 0); EnterCriticalSection(&clipboard_cs); r = CloseClipboard(); ok(r, "CloseClipboard failed: %d\n", GetLastError()); LeaveCriticalSection(&clipboard_cs); - seq = GetClipboardSequenceNumber(); - ok( seq == old_seq, "sequence changed\n" ); - old_seq = seq; - if (!cross_thread) - { - ok( wm_drawclipboard == 1, "WM_DRAWCLIPBOARD not received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( count == 1, "WM_DRAWCLIPBOARD not received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( count == 1 || broken(!pAddClipboardFormatListener), "WM_CLIPBOARDUPDATE not received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received\n" ); + check_messages(win, 0, 1, 1, 0, 0); run_process( "grab_clipboard 0" ); - seq = GetClipboardSequenceNumber(); - ok( (int)(seq - old_seq) == 1, "sequence diff %d\n", seq - old_seq ); - old_seq = seq; if (!cross_thread) { - ok( !wm_drawclipboard, "WM_DRAWCLIPBOARD received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); /* in this case we get a cross-thread WM_DRAWCLIPBOARD */ cross_thread = TRUE; while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); cross_thread = FALSE; } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( count == 1, "WM_DRAWCLIPBOARD not received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( count == 1 || broken(!pAddClipboardFormatListener), "WM_CLIPBOARDUPDATE not received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received\n" ); + check_messages(win, 1, 1, 1, 0, 0); r = OpenClipboard(0); ok(r, "OpenClipboard failed: %d\n", GetLastError()); SetClipboardData( CF_WAVE, GlobalAlloc( GMEM_FIXED, 1 )); - seq = GetClipboardSequenceNumber(); - ok( (int)(seq - old_seq) == 1, "sequence diff %d\n", seq - old_seq ); - old_seq = seq; - if (!cross_thread) - { - ok( !wm_drawclipboard, "WM_DRAWCLIPBOARD received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( !count, "WM_DRAWCLIPBOARD received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( !count, "WM_CLIPBOARDUPDATE received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received\n" ); + check_messages(win, 1, 0, 0, 0, 0); EnterCriticalSection(&clipboard_cs); r = CloseClipboard(); ok(r, "CloseClipboard failed: %d\n", GetLastError()); LeaveCriticalSection(&clipboard_cs); - seq = GetClipboardSequenceNumber(); - ok( seq == old_seq, "sequence changed\n" ); - old_seq = seq; - if (!cross_thread) - { - ok( wm_drawclipboard == 1, "WM_DRAWCLIPBOARD received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( count == 1, "WM_DRAWCLIPBOARD not received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( count == 1 || broken(!pAddClipboardFormatListener), "WM_CLIPBOARDUPDATE not received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received\n" ); + check_messages(win, 0, 1, 1, 0, 0); run_process( "grab_clipboard 1" ); - seq = GetClipboardSequenceNumber(); - ok( (int)(seq - old_seq) == 2, "sequence diff %d\n", seq - old_seq ); - old_seq = seq; if (!cross_thread) { - ok( !wm_drawclipboard, "WM_DRAWCLIPBOARD received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); /* in this case we get a cross-thread WM_DRAWCLIPBOARD */ cross_thread = TRUE; while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); cross_thread = FALSE; } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( count == 1, "WM_DRAWCLIPBOARD not received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( count == 1 || broken(!pAddClipboardFormatListener), "WM_CLIPBOARDUPDATE not received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received\n" ); + check_messages(win, 2, 1, 1, 0, 0); r = OpenClipboard(0); ok(r, "OpenClipboard failed: %d\n", GetLastError()); SetClipboardData( CF_WAVE, GlobalAlloc( GMEM_FIXED, 1 )); - seq = GetClipboardSequenceNumber(); - ok( (int)(seq - old_seq) == 1, "sequence diff %d\n", seq - old_seq ); - old_seq = seq; - if (!cross_thread) - { - ok( !wm_drawclipboard, "WM_DRAWCLIPBOARD received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( !count, "WM_DRAWCLIPBOARD received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( !count, "WM_CLIPBOARDUPDATE received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received\n" ); + check_messages(win, 1, 0, 0, 0, 0); EnterCriticalSection(&clipboard_cs); r = CloseClipboard(); ok(r, "CloseClipboard failed: %d\n", GetLastError()); LeaveCriticalSection(&clipboard_cs); - seq = GetClipboardSequenceNumber(); - ok( seq == old_seq, "sequence changed\n" ); - old_seq = seq; - if (!cross_thread) - { - ok( wm_drawclipboard == 1, "WM_DRAWCLIPBOARD not received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( count == 1, "WM_DRAWCLIPBOARD not received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( count == 1 || broken(!pAddClipboardFormatListener), "WM_CLIPBOARDUPDATE not received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received\n" ); + check_messages(win, 0, 1, 1, 0, 0); if (cross_thread) { @@ -1522,16 +1241,9 @@ static DWORD WINAPI clipboard_thread(void *param) do_render_format = TRUE; old_seq = GetClipboardSequenceNumber(); run_process( "get_clipboard_data" ); - seq = GetClipboardSequenceNumber(); - ok( seq == old_seq, "sequence changed\n" ); do_render_format = FALSE; - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( count == 1, "WM_DRAWCLIPBOARD not received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( count == 1 || broken(!pAddClipboardFormatListener) /* < Vista */, "WM_CLIPBOARDUPDATE not received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( fmt == CF_TEXT, "WM_RENDERFORMAT received\n" ); + check_messages(win, 0, 1, 1, 0, CF_TEXT); } r = PostMessageA(win, WM_USER, 0, 0); -- 2.7.4

1 1

[PATCH] browseui: Use the global HeapAlloc() wrappers
by Michael Stefaniuc 29 Jan '18

29 Jan '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/browseui/aclmulti.c | 1 + dlls/browseui/aclsource.c | 1 + dlls/browseui/browseui.h | 21 --------------------- dlls/browseui/browseui_main.c | 1 + dlls/browseui/compcatcachedaemon.c | 1 + dlls/browseui/progressdlg.c | 1 + 6 files changed, 5 insertions(+), 21 deletions(-) diff --git a/dlls/browseui/aclmulti.c b/dlls/browseui/aclmulti.c index 3a6525fc7a..412a18d3ab 100644 --- a/dlls/browseui/aclmulti.c +++ b/dlls/browseui/aclmulti.c @@ -36,6 +36,7 @@ #include "shlguid.h" #include "shlobj.h" +#include "wine/heap.h" #include "wine/unicode.h" #include "browseui.h" diff --git a/dlls/browseui/aclsource.c b/dlls/browseui/aclsource.c index 71e9d39a71..0ade9cce55 100644 --- a/dlls/browseui/aclsource.c +++ b/dlls/browseui/aclsource.c @@ -36,6 +36,7 @@ #include "shlguid.h" #include "shlobj.h" +#include "wine/heap.h" #include "wine/unicode.h" #include "browseui.h" diff --git a/dlls/browseui/browseui.h b/dlls/browseui/browseui.h index 27691a1cce..73780f1ce2 100644 --- a/dlls/browseui/browseui.h +++ b/dlls/browseui/browseui.h @@ -31,25 +31,4 @@ extern HRESULT ACLShellSource_Constructor(IUnknown *punkOuter, IUnknown **ppOut) extern const GUID CLSID_CompCatCacheDaemon; -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); -} - -static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t size) -{ - if (!mem) return heap_alloc(size); - return HeapReAlloc(GetProcessHeap(), 0, mem, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - #endif /* __WINE_BROWSEUI_H */ diff --git a/dlls/browseui/browseui_main.c b/dlls/browseui/browseui_main.c index 1b3cecc996..2e31b37fc8 100644 --- a/dlls/browseui/browseui_main.c +++ b/dlls/browseui/browseui_main.c @@ -34,6 +34,7 @@ #include "shlguid.h" #include "rpcproxy.h" +#include "wine/heap.h" #include "browseui.h" #include "initguid.h" diff --git a/dlls/browseui/compcatcachedaemon.c b/dlls/browseui/compcatcachedaemon.c index a5c97e9507..1f62441727 100644 --- a/dlls/browseui/compcatcachedaemon.c +++ b/dlls/browseui/compcatcachedaemon.c @@ -36,6 +36,7 @@ #include "shlguid.h" #include "shlobj.h" +#include "wine/heap.h" #include "wine/unicode.h" #include "browseui.h" diff --git a/dlls/browseui/progressdlg.c b/dlls/browseui/progressdlg.c index 24183bdc04..09c1996a59 100644 --- a/dlls/browseui/progressdlg.c +++ b/dlls/browseui/progressdlg.c @@ -36,6 +36,7 @@ #include "shlguid.h" #include "shlobj.h" +#include "wine/heap.h" #include "wine/unicode.h" #include "browseui.h" -- 2.14.3

1 0

[PATCH] atl: Use the global HeapAlloc() wrappers
by Michael Stefaniuc 29 Jan '18

29 Jan '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/atl/atl.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/dlls/atl/atl.c b/dlls/atl/atl.c index 0e48a391d9..e753429327 100644 --- a/dlls/atl/atl.c +++ b/dlls/atl/atl.c @@ -23,6 +23,7 @@ #include "atlcom.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(atl); @@ -33,16 +34,6 @@ HINSTANCE atl_instance; typedef unsigned char cpp_bool; -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static ICatRegister *catreg; /*********************************************************************** -- 2.14.3

1 0

[PATCH] appwiz.cpl: Use the global HeapAlloc() wrappers
by Michael Stefaniuc 29 Jan '18

29 Jan '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/appwiz.cpl/appwiz.h | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/dlls/appwiz.cpl/appwiz.h b/dlls/appwiz.cpl/appwiz.h index 1e60daf6c3..2165ce11b1 100644 --- a/dlls/appwiz.cpl/appwiz.h +++ b/dlls/appwiz.cpl/appwiz.h @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "wine/heap.h" #include "wine/unicode.h" typedef enum { @@ -27,21 +28,6 @@ BOOL install_addon(addon_t) DECLSPEC_HIDDEN; extern HINSTANCE hInst DECLSPEC_HIDDEN; -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t len) -{ - return HeapAlloc(GetProcessHeap(), 0, len); -} - -static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t len) -{ - return HeapReAlloc(GetProcessHeap(), 0, mem, len); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static inline WCHAR *heap_strdupW(const WCHAR *str) { WCHAR *ret; -- 2.14.3

1 0

[PATCH] advpack: Use the global HeapAlloc() wrappers
by Michael Stefaniuc 29 Jan '18

29 Jan '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/advpack/advpack_private.h | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/dlls/advpack/advpack_private.h b/dlls/advpack/advpack_private.h index 252974f8ea..fc3b26f393 100644 --- a/dlls/advpack/advpack_private.h +++ b/dlls/advpack/advpack_private.h @@ -21,22 +21,14 @@ #ifndef __ADVPACK_PRIVATE_H #define __ADVPACK_PRIVATE_H +#include "wine/heap.h" + HRESULT do_ocx_reg(HMODULE hocx, BOOL do_reg, const WCHAR *flags, const WCHAR *param) DECLSPEC_HIDDEN; LPWSTR get_parameter(LPWSTR *params, WCHAR separator, BOOL quoted) DECLSPEC_HIDDEN; void set_ldids(HINF hInf, LPCWSTR pszInstallSection, LPCWSTR pszWorkingDir) DECLSPEC_HIDDEN; HRESULT launch_exe(LPCWSTR cmd, LPCWSTR dir, HANDLE *phEXE) DECLSPEC_HIDDEN; -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static inline char *heap_strdupWtoA(const WCHAR *str) { char *ret = NULL; -- 2.14.3

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel