October 2013 - Wine-commits

Hans Leidekker : iphlpapi: Add support for GAA_FLAG_INCLUDE_PREFIX in GetAdaptersAddresses.
by Alexandre Julliard 08 Oct '13

08 Oct '13

Module: wine Branch: master Commit: 5674f16649838e46e36f80e2e5c14bd1d15d612d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5674f16649838e46e36f80e2e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 8 13:30:00 2013 +0200 iphlpapi: Add support for GAA_FLAG_INCLUDE_PREFIX in GetAdaptersAddresses. --- dlls/iphlpapi/ifenum.c | 27 ++++++- dlls/iphlpapi/ifenum.h | 3 +- dlls/iphlpapi/iphlpapi_main.c | 157 +++++++++++++++++++++++++++++++++++------ 3 files changed, 160 insertions(+), 27 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5674f16649838e46e36f8…

1 0

Jacek Caban : crypt32: Allocate BASE_CONTEXT in the beginning of the memory block.
by Alexandre Julliard 08 Oct '13

08 Oct '13

Module: wine Branch: master Commit: ad912961db613daae200eb1d05d7496a1bd3a840 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad912961db613daae200eb1d0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 8 16:23:48 2013 +0200 crypt32: Allocate BASE_CONTEXT in the beginning of the memory block. --- dlls/crypt32/context.c | 105 +++++++++++++++++++++--------------------------- dlls/crypt32/store.c | 3 +- 2 files changed, 48 insertions(+), 60 deletions(-) diff --git a/dlls/crypt32/context.c b/dlls/crypt32/context.c index e52f096..19fe98a 100644 --- a/dlls/crypt32/context.c +++ b/dlls/crypt32/context.c @@ -41,123 +41,110 @@ typedef struct _BASE_CONTEXT } u; } BASE_CONTEXT; -#define CONTEXT_FROM_BASE_CONTEXT(p, s) ((LPBYTE)(p) - (s)) -#define BASE_CONTEXT_FROM_CONTEXT(p, s) (BASE_CONTEXT*)((LPBYTE)(p) + (s)) +#define CONTEXT_FROM_BASE_CONTEXT(p) (LPBYTE)(p+1) +#define BASE_CONTEXT_FROM_CONTEXT(p) ((BASE_CONTEXT*)(p)-1) void *Context_CreateDataContext(size_t contextSize) { - void *ret = CryptMemAlloc(contextSize + sizeof(BASE_CONTEXT)); + BASE_CONTEXT *context; - if (ret) - { - BASE_CONTEXT *context = (BASE_CONTEXT*)((LPBYTE)ret + contextSize); + context = CryptMemAlloc(contextSize + sizeof(BASE_CONTEXT)); + if (!context) + return NULL; - context->ref = 1; - context->type = ContextTypeData; - context->u.properties = ContextPropertyList_Create(); - if (!context->u.properties) - { - CryptMemFree(ret); - ret = NULL; - } + context->ref = 1; + context->type = ContextTypeData; + context->u.properties = ContextPropertyList_Create(); + if (!context->u.properties) + { + CryptMemFree(context); + return NULL; } - TRACE("returning %p\n", ret); - return ret; + + TRACE("returning %p\n", context); + return CONTEXT_FROM_BASE_CONTEXT(context); } void *Context_CreateLinkContext(unsigned int contextSize, void *linked, unsigned int extra, BOOL addRef) { - void *context = CryptMemAlloc(contextSize + sizeof(BASE_CONTEXT) + extra); + BASE_CONTEXT *context; TRACE("(%d, %p, %d)\n", contextSize, linked, extra); - if (context) - { - BASE_CONTEXT *linkContext = (BASE_CONTEXT*)BASE_CONTEXT_FROM_CONTEXT( - context, contextSize); - BASE_CONTEXT *linkedBase = BASE_CONTEXT_FROM_CONTEXT(linked, - contextSize); - - memcpy(context, linked, contextSize); - linkContext->ref = 1; - linkContext->type = ContextTypeLink; - linkContext->u.linked = linkedBase; - if (addRef) - Context_AddRef(linked, contextSize); - TRACE("%p's ref count is %d\n", context, linkContext->ref); - } + context = CryptMemAlloc(contextSize + sizeof(BASE_CONTEXT) + extra); + if (!context) + return NULL; + + memcpy(CONTEXT_FROM_BASE_CONTEXT(context), linked, contextSize); + context->ref = 1; + context->type = ContextTypeLink; + context->u.linked = BASE_CONTEXT_FROM_CONTEXT(linked); + if (addRef) + Context_AddRef(linked, contextSize); + TRACE("returning %p\n", context); - return context; + return CONTEXT_FROM_BASE_CONTEXT(context); } void Context_AddRef(void *context, size_t contextSize) { - BASE_CONTEXT *baseContext = BASE_CONTEXT_FROM_CONTEXT(context, contextSize); + BASE_CONTEXT *baseContext = BASE_CONTEXT_FROM_CONTEXT(context); InterlockedIncrement(&baseContext->ref); TRACE("%p's ref count is %d\n", context, baseContext->ref); if (baseContext->type == ContextTypeLink) { - void *linkedContext = Context_GetLinkedContext(context, contextSize); - BASE_CONTEXT *linkedBase = BASE_CONTEXT_FROM_CONTEXT(linkedContext, - contextSize); + BASE_CONTEXT *linkedBase = baseContext->u.linked; /* Add-ref the linked contexts too */ - while (linkedContext && linkedBase->type == ContextTypeLink) + while (linkedBase && linkedBase->type == ContextTypeLink) { InterlockedIncrement(&linkedBase->ref); - TRACE("%p's ref count is %d\n", linkedContext, linkedBase->ref); - linkedContext = Context_GetLinkedContext(linkedContext, - contextSize); - if (linkedContext) - linkedBase = BASE_CONTEXT_FROM_CONTEXT(linkedContext, - contextSize); - else - linkedBase = NULL; + TRACE("%p's ref count is %d\n", linkedBase, linkedBase->ref); + linkedBase = linkedBase->u.linked; } - if (linkedContext) + if (linkedBase) { /* It's not a link context, so it wasn't add-ref'ed in the while * loop, so add-ref it here. */ - linkedBase = BASE_CONTEXT_FROM_CONTEXT(linkedContext, - contextSize); InterlockedIncrement(&linkedBase->ref); - TRACE("%p's ref count is %d\n", linkedContext, linkedBase->ref); + TRACE("%p's ref count is %d\n", linkedBase, linkedBase->ref); } } } void *Context_GetExtra(const void *context, size_t contextSize) { - BASE_CONTEXT *baseContext = BASE_CONTEXT_FROM_CONTEXT(context, contextSize); + BASE_CONTEXT *baseContext = BASE_CONTEXT_FROM_CONTEXT(context); assert(baseContext->type == ContextTypeLink); - return (LPBYTE)baseContext + sizeof(BASE_CONTEXT); + return (LPBYTE)CONTEXT_FROM_BASE_CONTEXT(baseContext) + contextSize; } void *Context_GetLinkedContext(void *context, size_t contextSize) { - BASE_CONTEXT *baseContext = BASE_CONTEXT_FROM_CONTEXT(context, contextSize); + BASE_CONTEXT *baseContext = BASE_CONTEXT_FROM_CONTEXT(context); assert(baseContext->type == ContextTypeLink); - return CONTEXT_FROM_BASE_CONTEXT(baseContext->u.linked, contextSize); + return CONTEXT_FROM_BASE_CONTEXT(baseContext->u.linked); } CONTEXT_PROPERTY_LIST *Context_GetProperties(const void *context, size_t contextSize) { - BASE_CONTEXT *ptr = BASE_CONTEXT_FROM_CONTEXT(context, contextSize); + BASE_CONTEXT *ptr = BASE_CONTEXT_FROM_CONTEXT(context); while (ptr && ptr->type == ContextTypeLink) ptr = ptr->u.linked; + return (ptr && ptr->type == ContextTypeData) ? ptr->u.properties : NULL; } BOOL Context_Release(void *context, size_t contextSize, ContextFreeFunc dataContextFree) { - BASE_CONTEXT *base = BASE_CONTEXT_FROM_CONTEXT(context, contextSize); + BASE_CONTEXT *base = BASE_CONTEXT_FROM_CONTEXT(context); BOOL ret = TRUE; if (base->ref <= 0) @@ -171,7 +158,7 @@ BOOL Context_Release(void *context, size_t contextSize, * it as well, using the same offset and data free function. */ ret = Context_Release(CONTEXT_FROM_BASE_CONTEXT( - base->u.linked, contextSize), contextSize, dataContextFree); + base->u.linked), contextSize, dataContextFree); } if (InterlockedDecrement(&base->ref) == 0) { @@ -181,7 +168,7 @@ BOOL Context_Release(void *context, size_t contextSize, ContextPropertyList_Free(base->u.properties); dataContextFree(context); } - CryptMemFree(context); + CryptMemFree(base); } else TRACE("%p's ref count is %d\n", context, base->ref); @@ -238,7 +225,7 @@ static inline struct list *ContextList_ContextToEntry(const struct ContextList * static inline void *ContextList_EntryToContext(const struct ContextList *list, struct list *entry) { - return (LPBYTE)entry - sizeof(BASE_CONTEXT) - list->contextSize; + return (LPBYTE)entry - list->contextSize; } void *ContextList_Add(struct ContextList *list, void *toLink, void *toReplace) diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index 0fffa5b..5e60644 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -160,8 +160,9 @@ static BOOL CRYPT_MemAddCert(WINECRYPT_CERTSTORE *store, void *cert, if (context) { context->hCertStore = store; - if (ppStoreContext) + if (ppStoreContext) { *ppStoreContext = CertDuplicateCertificateContext(context); + } } return context != 0; }

1 0

Jacek Caban : crypt32: Get rid of no longer used contextSize argument in Context_GetLinkedContext .
by Alexandre Julliard 08 Oct '13

08 Oct '13

Module: wine Branch: master Commit: 5b5bb5085251043d01c356f03925633378e29ee2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b5bb5085251043d01c356f03… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 8 16:24:09 2013 +0200 crypt32: Get rid of no longer used contextSize argument in Context_GetLinkedContext. --- dlls/crypt32/collectionstore.c | 10 +++++----- dlls/crypt32/context.c | 2 +- dlls/crypt32/crypt32_private.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/crypt32/collectionstore.c b/dlls/crypt32/collectionstore.c index 677f7bd..6ab2d2b 100644 --- a/dlls/crypt32/collectionstore.c +++ b/dlls/crypt32/collectionstore.c @@ -87,7 +87,7 @@ static BOOL CRYPT_CollectionAddContext(WINE_COLLECTIONSTORE *store, ret = FALSE; if (toReplace) { - void *existingLinked = Context_GetLinkedContext(toReplace, contextSize); + void *existingLinked = Context_GetLinkedContext(toReplace); CONTEXT_FUNCS *contextFuncs; storeEntry = *(WINE_STORE_LIST_ENTRY **)Context_GetExtra(toReplace, @@ -147,7 +147,7 @@ static void *CRYPT_CollectionAdvanceEnum(WINE_COLLECTIONSTORE *store, /* Ref-counting funny business: "duplicate" (addref) the child, because * the free(pPrev) below can cause the ref count to become negative. */ - child = Context_GetLinkedContext(pPrev, contextSize); + child = Context_GetLinkedContext(pPrev); contextInterface->duplicate(child); child = contextFuncs->enumContext(storeEntry->store, child); contextInterface->free(pPrev); @@ -265,7 +265,7 @@ static BOOL CRYPT_CollectionDeleteCert(WINECRYPT_CERTSTORE *store, * CertFreeCertificateContext. Increase ref count of linked context to * compensate. */ - linked = Context_GetLinkedContext(pCertContext, sizeof(CERT_CONTEXT)); + linked = Context_GetLinkedContext(pCertContext); CertDuplicateCertificateContext(linked); ret = CertDeleteCertificateFromStore(linked); return ret; @@ -349,7 +349,7 @@ static BOOL CRYPT_CollectionDeleteCRL(WINECRYPT_CERTSTORE *store, void *pCrlCont * decreases pCrlContext's ref count, by calling CertFreeCRLContext. * Increase ref count of linked context to compensate. */ - linked = Context_GetLinkedContext(pCrlContext, sizeof(CRL_CONTEXT)); + linked = Context_GetLinkedContext(pCrlContext); CertDuplicateCRLContext(linked); ret = CertDeleteCRLFromStore(linked); return ret; @@ -433,7 +433,7 @@ static BOOL CRYPT_CollectionDeleteCTL(WINECRYPT_CERTSTORE *store, * decreases pCtlContext's ref count, by calling CertFreeCTLContext. * Increase ref count of linked context to compensate. */ - linked = Context_GetLinkedContext(pCtlContext, sizeof(CTL_CONTEXT)); + linked = Context_GetLinkedContext(pCtlContext); CertDuplicateCTLContext(linked); ret = CertDeleteCTLFromStore(linked); return ret; diff --git a/dlls/crypt32/context.c b/dlls/crypt32/context.c index a31dccf..d57e0bf 100644 --- a/dlls/crypt32/context.c +++ b/dlls/crypt32/context.c @@ -123,7 +123,7 @@ void *Context_GetExtra(const void *context, size_t contextSize) return (LPBYTE)CONTEXT_FROM_BASE_CONTEXT(baseContext) + contextSize; } -void *Context_GetLinkedContext(void *context, size_t contextSize) +void *Context_GetLinkedContext(void *context) { BASE_CONTEXT *baseContext = BASE_CONTEXT_FROM_CONTEXT(context); diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h index d1cc4ad..5a0232f 100644 --- a/dlls/crypt32/crypt32_private.h +++ b/dlls/crypt32/crypt32_private.h @@ -348,7 +348,7 @@ void *Context_CreateLinkContext(unsigned int contextSize, void *linked, unsigned void *Context_GetExtra(const void *context, size_t contextSize) DECLSPEC_HIDDEN; /* Gets the context linked to by context, which must be a link context. */ -void *Context_GetLinkedContext(void *context, size_t contextSize) DECLSPEC_HIDDEN; +void *Context_GetLinkedContext(void *context) DECLSPEC_HIDDEN; /* Copies properties from fromContext to toContext. */ void Context_CopyProperties(const void *to, const void *from,

1 0

Jacek Caban : crypt32: Get rid of no longer used contextSize argument in Context_AddRef.
by Alexandre Julliard 08 Oct '13

08 Oct '13

Module: wine Branch: master Commit: f82237102b30baaa70b8ad0702127342bae843c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f82237102b30baaa70b8ad070… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 8 16:24:00 2013 +0200 crypt32: Get rid of no longer used contextSize argument in Context_AddRef. --- dlls/crypt32/cert.c | 2 +- dlls/crypt32/context.c | 4 ++-- dlls/crypt32/crl.c | 2 +- dlls/crypt32/crypt32_private.h | 2 +- dlls/crypt32/ctl.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 04d16a0..3c60310 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -184,7 +184,7 @@ PCCERT_CONTEXT WINAPI CertDuplicateCertificateContext( if (!pCertContext) return NULL; - Context_AddRef((void *)pCertContext, sizeof(CERT_CONTEXT)); + Context_AddRef((void *)pCertContext); return pCertContext; } diff --git a/dlls/crypt32/context.c b/dlls/crypt32/context.c index 19fe98a..a31dccf 100644 --- a/dlls/crypt32/context.c +++ b/dlls/crypt32/context.c @@ -81,13 +81,13 @@ void *Context_CreateLinkContext(unsigned int contextSize, void *linked, unsigned context->type = ContextTypeLink; context->u.linked = BASE_CONTEXT_FROM_CONTEXT(linked); if (addRef) - Context_AddRef(linked, contextSize); + Context_AddRef(linked); TRACE("returning %p\n", context); return CONTEXT_FROM_BASE_CONTEXT(context); } -void Context_AddRef(void *context, size_t contextSize) +void Context_AddRef(void *context) { BASE_CONTEXT *baseContext = BASE_CONTEXT_FROM_CONTEXT(context); diff --git a/dlls/crypt32/crl.c b/dlls/crypt32/crl.c index dfb9a60..dc23183 100644 --- a/dlls/crypt32/crl.c +++ b/dlls/crypt32/crl.c @@ -327,7 +327,7 @@ PCCRL_CONTEXT WINAPI CertDuplicateCRLContext(PCCRL_CONTEXT pCrlContext) { TRACE("(%p)\n", pCrlContext); if (pCrlContext) - Context_AddRef((void *)pCrlContext, sizeof(CRL_CONTEXT)); + Context_AddRef((void *)pCrlContext); return pCrlContext; } diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h index 6793e3d..d1cc4ad 100644 --- a/dlls/crypt32/crypt32_private.h +++ b/dlls/crypt32/crypt32_private.h @@ -359,7 +359,7 @@ void Context_CopyProperties(const void *to, const void *from, */ CONTEXT_PROPERTY_LIST *Context_GetProperties(const void *context, size_t contextSize) DECLSPEC_HIDDEN; -void Context_AddRef(void *context, size_t contextSize) DECLSPEC_HIDDEN; +void Context_AddRef(void *context) DECLSPEC_HIDDEN; typedef void (*ContextFreeFunc)(void *context); diff --git a/dlls/crypt32/ctl.c b/dlls/crypt32/ctl.c index 005f6ba..bb29a71 100644 --- a/dlls/crypt32/ctl.c +++ b/dlls/crypt32/ctl.c @@ -460,7 +460,7 @@ PCCTL_CONTEXT WINAPI CertDuplicateCTLContext(PCCTL_CONTEXT pCtlContext) { TRACE("(%p)\n", pCtlContext); if (pCtlContext) - Context_AddRef((void *)pCtlContext, sizeof(CTL_CONTEXT)); + Context_AddRef((void *)pCtlContext); return pCtlContext; }

1 0

Jacek Caban : crypt32: Get rid of no longer used contextSize argument in Context_GetProperties.
by Alexandre Julliard 08 Oct '13

08 Oct '13

Module: wine Branch: master Commit: c6fd036b54fd1ee832ab59a96a564f1f24e4b58f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6fd036b54fd1ee832ab59a96… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 8 16:24:19 2013 +0200 crypt32: Get rid of no longer used contextSize argument in Context_GetProperties. --- dlls/crypt32/cert.c | 9 +++------ dlls/crypt32/context.c | 6 +++--- dlls/crypt32/crl.c | 9 +++------ dlls/crypt32/crypt32_private.h | 2 +- dlls/crypt32/ctl.c | 8 +++----- 5 files changed, 13 insertions(+), 21 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 3c60310..7c6a18c 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -211,8 +211,7 @@ BOOL WINAPI CertFreeCertificateContext(PCCERT_CONTEXT pCertContext) DWORD WINAPI CertEnumCertificateContextProperties(PCCERT_CONTEXT pCertContext, DWORD dwPropId) { - CONTEXT_PROPERTY_LIST *properties = Context_GetProperties( - pCertContext, sizeof(CERT_CONTEXT)); + CONTEXT_PROPERTY_LIST *properties = Context_GetProperties(pCertContext); DWORD ret; TRACE("(%p, %d)\n", pCertContext, dwPropId); @@ -264,8 +263,7 @@ static BOOL CertContext_GetProperty(void *context, DWORD dwPropId, void *pvData, DWORD *pcbData) { PCCERT_CONTEXT pCertContext = context; - CONTEXT_PROPERTY_LIST *properties = - Context_GetProperties(context, sizeof(CERT_CONTEXT)); + CONTEXT_PROPERTY_LIST *properties = Context_GetProperties(context); BOOL ret; CRYPT_DATA_BLOB blob; @@ -515,8 +513,7 @@ static BOOL CertContext_SetKeyProvInfoProperty(CONTEXT_PROPERTY_LIST *properties static BOOL CertContext_SetProperty(void *context, DWORD dwPropId, DWORD dwFlags, const void *pvData) { - CONTEXT_PROPERTY_LIST *properties = - Context_GetProperties(context, sizeof(CERT_CONTEXT)); + CONTEXT_PROPERTY_LIST *properties = Context_GetProperties(context); BOOL ret; TRACE("(%p, %d, %08x, %p)\n", context, dwPropId, dwFlags, pvData); diff --git a/dlls/crypt32/context.c b/dlls/crypt32/context.c index d57e0bf..53fb022 100644 --- a/dlls/crypt32/context.c +++ b/dlls/crypt32/context.c @@ -131,7 +131,7 @@ void *Context_GetLinkedContext(void *context) return CONTEXT_FROM_BASE_CONTEXT(baseContext->u.linked); } -CONTEXT_PROPERTY_LIST *Context_GetProperties(const void *context, size_t contextSize) +CONTEXT_PROPERTY_LIST *Context_GetProperties(const void *context) { BASE_CONTEXT *ptr = BASE_CONTEXT_FROM_CONTEXT(context); @@ -180,8 +180,8 @@ void Context_CopyProperties(const void *to, const void *from, { CONTEXT_PROPERTY_LIST *toProperties, *fromProperties; - toProperties = Context_GetProperties(to, contextSize); - fromProperties = Context_GetProperties(from, contextSize); + toProperties = Context_GetProperties(to); + fromProperties = Context_GetProperties(from); assert(toProperties && fromProperties); ContextPropertyList_Copy(toProperties, fromProperties); } diff --git a/dlls/crypt32/crl.c b/dlls/crypt32/crl.c index dc23183..e79dd4a 100644 --- a/dlls/crypt32/crl.c +++ b/dlls/crypt32/crl.c @@ -354,8 +354,7 @@ BOOL WINAPI CertFreeCRLContext( PCCRL_CONTEXT pCrlContext) DWORD WINAPI CertEnumCRLContextProperties(PCCRL_CONTEXT pCRLContext, DWORD dwPropId) { - CONTEXT_PROPERTY_LIST *properties = Context_GetProperties( - pCRLContext, sizeof(CRL_CONTEXT)); + CONTEXT_PROPERTY_LIST *properties = Context_GetProperties(pCRLContext); DWORD ret; TRACE("(%p, %d)\n", pCRLContext, dwPropId); @@ -388,8 +387,7 @@ static BOOL CRLContext_GetHashProp(PCCRL_CONTEXT context, DWORD dwPropId, static BOOL CRLContext_GetProperty(PCCRL_CONTEXT context, DWORD dwPropId, void *pvData, DWORD *pcbData) { - CONTEXT_PROPERTY_LIST *properties = - Context_GetProperties(context, sizeof(CRL_CONTEXT)); + CONTEXT_PROPERTY_LIST *properties = Context_GetProperties(context); BOOL ret; CRYPT_DATA_BLOB blob; @@ -488,8 +486,7 @@ BOOL WINAPI CertGetCRLContextProperty(PCCRL_CONTEXT pCRLContext, static BOOL CRLContext_SetProperty(PCCRL_CONTEXT context, DWORD dwPropId, DWORD dwFlags, const void *pvData) { - CONTEXT_PROPERTY_LIST *properties = - Context_GetProperties(context, sizeof(CRL_CONTEXT)); + CONTEXT_PROPERTY_LIST *properties = Context_GetProperties(context); BOOL ret; TRACE("(%p, %d, %08x, %p)\n", context, dwPropId, dwFlags, pvData); diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h index 5a0232f..f60bfae 100644 --- a/dlls/crypt32/crypt32_private.h +++ b/dlls/crypt32/crypt32_private.h @@ -357,7 +357,7 @@ void Context_CopyProperties(const void *to, const void *from, /* Returns context's properties, or the linked context's properties if context * is a link context. */ -CONTEXT_PROPERTY_LIST *Context_GetProperties(const void *context, size_t contextSize) DECLSPEC_HIDDEN; +CONTEXT_PROPERTY_LIST *Context_GetProperties(const void *context) DECLSPEC_HIDDEN; void Context_AddRef(void *context) DECLSPEC_HIDDEN; diff --git a/dlls/crypt32/ctl.c b/dlls/crypt32/ctl.c index bb29a71..04ec03d 100644 --- a/dlls/crypt32/ctl.c +++ b/dlls/crypt32/ctl.c @@ -489,8 +489,7 @@ BOOL WINAPI CertFreeCTLContext(PCCTL_CONTEXT pCTLContext) DWORD WINAPI CertEnumCTLContextProperties(PCCTL_CONTEXT pCTLContext, DWORD dwPropId) { - CONTEXT_PROPERTY_LIST *properties = Context_GetProperties( - pCTLContext, sizeof(CTL_CONTEXT)); + CONTEXT_PROPERTY_LIST *properties = Context_GetProperties(pCTLContext); DWORD ret; TRACE("(%p, %d)\n", pCTLContext, dwPropId); @@ -523,8 +522,7 @@ static BOOL CTLContext_GetHashProp(PCCTL_CONTEXT context, DWORD dwPropId, static BOOL CTLContext_GetProperty(PCCTL_CONTEXT context, DWORD dwPropId, void *pvData, DWORD *pcbData) { - CONTEXT_PROPERTY_LIST *properties = - Context_GetProperties(context, sizeof(CTL_CONTEXT)); + CONTEXT_PROPERTY_LIST *properties = Context_GetProperties(context); BOOL ret; CRYPT_DATA_BLOB blob; @@ -621,7 +619,7 @@ BOOL WINAPI CertGetCTLContextProperty(PCCTL_CONTEXT pCTLContext, static BOOL CTLContext_SetProperty(PCCTL_CONTEXT context, DWORD dwPropId, DWORD dwFlags, const void *pvData) { - CONTEXT_PROPERTY_LIST *properties = Context_GetProperties(context, sizeof(CTL_CONTEXT)); + CONTEXT_PROPERTY_LIST *properties = Context_GetProperties(context); BOOL ret; TRACE("(%p, %d, %08x, %p)\n", context, dwPropId, dwFlags, pvData);

1 0

Qian Hong : user32/tests: Fixed typo in comments.
by Alexandre Julliard 08 Oct '13

08 Oct '13

Module: wine Branch: master Commit: a07e0c5a4a40979844ef97497099dab3ebf52798 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a07e0c5a4a40979844ef97497… Author: Qian Hong <qhong(a)codeweavers.com> Date: Tue Oct 8 11:39:30 2013 +0800 user32/tests: Fixed typo in comments. --- dlls/user32/tests/winstation.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/winstation.c b/dlls/user32/tests/winstation.c index 1804345..d6a4879 100644 --- a/dlls/user32/tests/winstation.c +++ b/dlls/user32/tests/winstation.c @@ -526,7 +526,7 @@ todo_wine ok(GetLastError() == 0xdeadbeef, "unexpected last error %08x\n", GetLastError()); ok(ret == 1, "unexpected return count %d\n", ret); - /* Set thread desktop to the new desktop, SendInput should failed. */ + /* Set thread desktop to the new desktop, SendInput should fail. */ new_desk = CreateDesktopA("new_desk", NULL, NULL, 0, DESKTOP_ALL_ACCESS, NULL); ok(new_desk != NULL, "CreateDesktop failed!\n"); ret = SetThreadDesktop(new_desk); @@ -573,7 +573,7 @@ todo_wine ok(GetLastError() == 0xdeadbeef, "unexpected last error %08x\n", GetLastError()); ok(ret == 1, "unexpected return count %d\n", ret); - /* Switch input desktop to the new desktop, SendInput should failed. */ + /* Switch input desktop to the new desktop, SendInput should fail. */ ret = SwitchDesktop(new_desk); ok(ret, "SwitchDesktop failed!\n"); input_desk = OpenInputDesktop(0, FALSE, DESKTOP_ALL_ACCESS);

1 0

Qian Hong : user32/tests: Clean side effect after testing winstation.
by Alexandre Julliard 08 Oct '13

08 Oct '13

Module: wine Branch: master Commit: 834ce9a2d7115440517552ea449d5a627d69514f URL: http://source.winehq.org/git/wine.git/?a=commit;h=834ce9a2d7115440517552ea4… Author: Qian Hong <qhong(a)codeweavers.com> Date: Tue Oct 8 11:39:54 2013 +0800 user32/tests: Clean side effect after testing winstation. --- dlls/user32/tests/winstation.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/winstation.c b/dlls/user32/tests/winstation.c index d6a4879..560b34f 100644 --- a/dlls/user32/tests/winstation.c +++ b/dlls/user32/tests/winstation.c @@ -270,6 +270,9 @@ static void test_handles(void) trace( "get other thread desktop: %p\n", GetThreadDesktop(id) ); WaitForSingleObject( hthread, INFINITE ); CloseHandle( hthread ); + + /* clean side effect */ + SetProcessWindowStation( w1 ); } /* Enumeration tests */

1 0

Qian Hong : user32/tests: Added input desktop tests on different winstations.
by Alexandre Julliard 08 Oct '13

08 Oct '13

Module: wine Branch: master Commit: 43e1df02d2fdb0f4a3aa3d273e9666dfe5f74b26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43e1df02d2fdb0f4a3aa3d273… Author: Qian Hong <qhong(a)codeweavers.com> Date: Tue Oct 8 11:40:13 2013 +0800 user32/tests: Added input desktop tests on different winstations. --- dlls/user32/tests/winstation.c | 66 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 66 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/winstation.c b/dlls/user32/tests/winstation.c index 560b34f..d9b8a0e 100644 --- a/dlls/user32/tests/winstation.c +++ b/dlls/user32/tests/winstation.c @@ -652,6 +652,71 @@ todo_wine ok(ret, "CloseDesktop failed!\n"); } +static void test_inputdesktop2(void) +{ + HWINSTA w1, w2; + HDESK thread_desk, new_desk, input_desk, hdesk; + DWORD ret; + + thread_desk = GetThreadDesktop(GetCurrentThreadId()); + ok(thread_desk != NULL, "GetThreadDesktop failed!\n"); + w1 = GetProcessWindowStation(); + ok(w1 != NULL, "GetProcessWindowStation failed!\n"); + w2 = CreateWindowStation("winsta_test", 0, WINSTA_ALL_ACCESS, NULL); + ok(w2 != NULL, "CreateWindowStation failed!\n"); + ret = EnumDesktopsA(GetProcessWindowStation(), desktop_callbackA, 0); + ok(!ret, "EnumDesktopsA failed!\n"); + input_desk = OpenInputDesktop(0, FALSE, DESKTOP_ALL_ACCESS); +todo_wine + ok(input_desk != NULL, "OpenInputDesktop failed!\n"); + ret = CloseDesktop(input_desk); +todo_wine + ok(ret, "CloseDesktop failed!\n"); + + ret = SetProcessWindowStation(w2); + ok(ret, "SetProcessWindowStation failed!\n"); + hdesk = GetThreadDesktop(GetCurrentThreadId()); + ok(hdesk != NULL, "GetThreadDesktop failed!\n"); + ok(hdesk == thread_desk, "thread desktop should not change after winstation changed!\n"); + ret = EnumDesktopsA(GetProcessWindowStation(), desktop_callbackA, 0); + + new_desk = CreateDesktop("desk_test", NULL, NULL, 0, DESKTOP_ALL_ACCESS, NULL); + ok(new_desk != NULL, "CreateDesktop failed!\n"); + ret = EnumDesktopsA(GetProcessWindowStation(), desktop_callbackA, 0); + ok(!ret, "EnumDesktopsA failed!\n"); + SetLastError(0xdeadbeef); + input_desk = OpenInputDesktop(0, FALSE, DESKTOP_ALL_ACCESS); + ok(input_desk == NULL, "OpenInputDesktop should fail on non default winstation!\n"); +todo_wine + ok(GetLastError() == ERROR_INVALID_FUNCTION || broken(GetLastError() == 0xdeadbeef), "last error %08x\n", GetLastError()); + + hdesk = OpenDesktop("desk_test", 0, TRUE, DESKTOP_ALL_ACCESS); + ok(hdesk != NULL, "OpenDesktop failed!\n"); + SetLastError(0xdeadbeef); + ret = SwitchDesktop(hdesk); +todo_wine + ok(!ret, "Switch to desktop belong to non default winstation should fail!\n"); +todo_wine + ok(GetLastError() == ERROR_ACCESS_DENIED || broken(GetLastError() == 0xdeadbeef), "last error %08x\n", GetLastError()); + ret = SetThreadDesktop(hdesk); + ok(ret, "SetThreadDesktop failed!\n"); + + /* clean side effect */ + ret = SetThreadDesktop(thread_desk); +todo_wine + ok(ret, "SetThreadDesktop should success even desktop is not belong to process winstation!\n"); + ret = SetProcessWindowStation(w1); + ok(ret, "SetProcessWindowStation failed!\n"); + ret = SetThreadDesktop(thread_desk); + ok(ret, "SetThreadDesktop failed!\n"); + ret = CloseWindowStation(w2); + ok(ret, "CloseWindowStation failed!\n"); + ret = CloseDesktop(new_desk); + ok(ret, "CloseDesktop failed!\n"); + ret = CloseDesktop(hdesk); + ok(ret, "CloseDesktop failed!\n"); +} + START_TEST(winstation) { /* Check whether this platform supports WindowStation calls */ @@ -665,6 +730,7 @@ START_TEST(winstation) } test_inputdesktop(); + test_inputdesktop2(); test_enumstations(); test_enumdesktops(); test_handles();

1 0

Qian Hong : user32/tests: Added foreground window tests on different desktops.
by Alexandre Julliard 08 Oct '13

08 Oct '13

Module: wine Branch: master Commit: 5da10c9a0e405c4b502be820ae0385d634306a76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5da10c9a0e405c4b502be820a… Author: Qian Hong <qhong(a)codeweavers.com> Date: Tue Oct 8 11:40:26 2013 +0800 user32/tests: Added foreground window tests on different desktops. --- dlls/user32/tests/winstation.c | 147 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 147 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/winstation.c b/dlls/user32/tests/winstation.c index d9b8a0e..f4e86ee 100644 --- a/dlls/user32/tests/winstation.c +++ b/dlls/user32/tests/winstation.c @@ -717,6 +717,152 @@ todo_wine ok(ret, "CloseDesktop failed!\n"); } +static LRESULT CALLBACK WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + if (msg == WM_DESTROY) + { + trace("destroying hwnd %p\n", hWnd); + PostQuitMessage(0); + return 0; + } + return DefWindowProcA( hWnd, msg, wParam, lParam ); +} + +typedef struct tag_wnd_param +{ + const char *wnd_name; + HWND hwnd; + HDESK hdesk; + HANDLE hevent; +} wnd_param; + +static DWORD WINAPI create_window(LPVOID param) +{ + wnd_param *param1 = param; + DWORD ret; + MSG msg; + + ret = SetThreadDesktop(param1->hdesk); + ok(ret, "SetThreadDesktop failed!\n"); + param1->hwnd = CreateWindowA("test_class", param1->wnd_name, WS_POPUP, 0, 0, 100, 100, NULL, NULL, NULL, NULL); + ok(param1->hwnd != 0, "CreateWindowA failed!\n"); + ret = SetEvent(param1->hevent); + ok(ret, "SetEvent failed!\n"); + + while (GetMessageA(&msg, 0, 0, 0)) + { + TranslateMessage(&msg); + DispatchMessage(&msg); + } + + return 0; +} + +static void test_foregroundwindow(void) +{ + HWND hwnd, hwnd_test, partners[2], hwnds[2]; + HDESK hdesks[2]; + int thread_desk_id, input_desk_id, hwnd_id; + WNDCLASSA wclass; + wnd_param param; + DWORD ret; + +#define DESKTOPS 2 + + memset( &wclass, 0, sizeof(wclass) ); + wclass.lpszClassName = "test_class"; + wclass.lpfnWndProc = WndProc; + RegisterClassA(&wclass); + param.wnd_name = "win_name"; + + hdesks[0] = GetThreadDesktop(GetCurrentThreadId()); + ok(hdesks[0] != NULL, "OpenDesktop failed!\n"); + hdesks[1] = CreateDesktop("desk2", NULL, NULL, 0, DESKTOP_ALL_ACCESS, NULL); + ok(hdesks[1] != NULL, "CreateDesktop failed!\n"); + + for (thread_desk_id = 0; thread_desk_id < DESKTOPS; thread_desk_id++) + { + param.hdesk = hdesks[thread_desk_id]; + param.hevent = CreateEventA(NULL, TRUE, FALSE, NULL); + CreateThread(NULL, 0, create_window, &param, 0, NULL); + ret = WaitForSingleObject(param.hevent, INFINITE); + ok(ret == WAIT_OBJECT_0, "wait failed!\n"); + hwnds[thread_desk_id] = param.hwnd; + } + + for (thread_desk_id = 0; thread_desk_id < DESKTOPS; thread_desk_id++) + { + param.hdesk = hdesks[thread_desk_id]; + param.hevent = CreateEventA(NULL, TRUE, FALSE, NULL); + CreateThread(NULL, 0, create_window, &param, 0, NULL); + ret = WaitForSingleObject(param.hevent, INFINITE); + ok(ret == WAIT_OBJECT_0, "wait failed!\n"); + partners[thread_desk_id] = param.hwnd; + } + + trace("hwnd0 %p hwnd1 %p partner0 %p partner1 %p\n", hwnds[0], hwnds[1], partners[0], partners[1]); + + for (hwnd_id = 0; hwnd_id < DESKTOPS; hwnd_id++) + for (thread_desk_id = 0; thread_desk_id < DESKTOPS; thread_desk_id++) + for (input_desk_id = 0; input_desk_id < DESKTOPS; input_desk_id++) + { + trace("testing thread_desk %d input_desk %d hwnd %d\n", + thread_desk_id, input_desk_id, hwnd_id); + hwnd_test = hwnds[hwnd_id]; + ret = SetThreadDesktop(hdesks[thread_desk_id]); + ok(ret, "set thread desktop failed!\n"); + ret = SwitchDesktop(hdesks[input_desk_id]); + ok(ret, "switch desktop failed!\n"); + SetForegroundWindow(partners[0]); + SetForegroundWindow(partners[1]); + hwnd = GetForegroundWindow(); + ok(hwnd != hwnd_test, "unexpected foreground window %p\n", hwnd); + ret = SetForegroundWindow(hwnd_test); + Sleep(250); + hwnd = GetForegroundWindow(); + if (input_desk_id == hwnd_id) + { + if (input_desk_id == thread_desk_id) + { + ok(ret, "SetForegroundWindow failed!\n"); + ok(hwnd == hwnd_test , "unexpected foreground window %p\n", hwnd); + } + else + { + todo_wine ok(ret, "SetForegroundWindow failed!\n"); + todo_wine ok(hwnd == 0, "unexpected foreground window %p\n", hwnd); + } + } + else + { + if (input_desk_id == thread_desk_id) + { + ok(!ret, "SetForegroundWindow should fail!\n"); + ok(hwnd == partners[input_desk_id] , "unexpected foreground window %p\n", hwnd); + } + else + { + todo_wine ok(!ret, "SetForegroundWindow should fail!\n"); + todo_wine ok(hwnd == 0, "unexpected foreground window %p\n", hwnd); + } + } + } + + /* Clean up */ + + for (thread_desk_id = DESKTOPS - 1; thread_desk_id >= 0; thread_desk_id--) + { + ret = SetThreadDesktop(hdesks[thread_desk_id]); + ok(ret, "set thread desktop failed!\n"); + SendMessage(hwnds[thread_desk_id], WM_DESTROY, 0, 0); + SendMessage(partners[thread_desk_id], WM_DESTROY, 0, 0); + } + + ret = SwitchDesktop(hdesks[0]); + ok(ret, "switch desktop failed!\n"); + CloseDesktop(hdesks[1]); +} + START_TEST(winstation) { /* Check whether this platform supports WindowStation calls */ @@ -735,4 +881,5 @@ START_TEST(winstation) test_enumdesktops(); test_handles(); test_getuserobjectinformation(); + test_foregroundwindow(); }

1 0

Ken Thomases : winemac: Use unsigned type for bitfields.
by Alexandre Julliard 08 Oct '13

08 Oct '13

Module: wine Branch: master Commit: 0e8e45cf99c479dbef4bca491e4f1cc58992c1f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e8e45cf99c479dbef4bca491… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Oct 8 02:21:21 2013 -0500 winemac: Use unsigned type for bitfields. --- dlls/winemac.drv/macdrv.h | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index e6b5295..e2a54cc 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -131,12 +131,12 @@ struct macdrv_win_data macdrv_view gl_view; /* view for GL */ RECT gl_rect; /* GL view rectangle relative to whole_rect */ COLORREF color_key; /* color key for layered window; CLR_INVALID is not color keyed */ - BOOL on_screen : 1; /* is window ordered in? (minimized or not) */ - BOOL shaped : 1; /* is window using a custom region shape? */ - BOOL layered : 1; /* is window layered and with valid attributes? */ - BOOL ulw_layered : 1; /* has UpdateLayeredWindow() been called for window? */ - BOOL per_pixel_alpha : 1; /* is window using per-pixel alpha? */ - BOOL minimized : 1; /* is window minimized? */ + unsigned int on_screen : 1; /* is window ordered in? (minimized or not) */ + unsigned int shaped : 1; /* is window using a custom region shape? */ + unsigned int layered : 1; /* is window layered and with valid attributes? */ + unsigned int ulw_layered : 1; /* has UpdateLayeredWindow() been called for window? */ + unsigned int per_pixel_alpha : 1; /* is window using per-pixel alpha? */ + unsigned int minimized : 1; /* is window minimized? */ struct window_surface *surface; struct window_surface *unminimized_surface; };

1 0