October 2013 - Wine-Commits

Francois Gouget : testbot: Add the VM 'off' state to the database creation SQL script.
by Alexandre Julliard Oct. 9, 2013

Oct. 9, 2013

Module: tools Branch: master Commit: ec2175d73b0c704b99be4adfff350449bf431ed7 URL: http://source.winehq.org/git/tools.git/?a=commit;h=ec2175d73b0c704b99be4adf… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Oct 9 17:39:28 2013 +0200 testbot: Add the VM 'off' state to the database creation SQL script. --- testbot/ddl/winetestbot.sql | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/testbot/ddl/winetestbot.sql b/testbot/ddl/winetestbot.sql index e46d5e0..5e79bd3 100644 --- a/testbot/ddl/winetestbot.sql +++ b/testbot/ddl/winetestbot.sql @@ -48,7 +48,7 @@ CREATE TABLE VMs SortOrder INT(3) NOT NULL, Type ENUM('win32', 'win64', 'build') NOT NULL, Role ENUM('extra', 'base', 'winetest', 'retired', 'deleted') NOT NULL, - Status ENUM('dirty', 'reverting', 'sleeping', 'idle', 'running', 'offline', 'maintenance') NOT NULL, + Status ENUM('dirty', 'reverting', 'sleeping', 'idle', 'running', 'off', 'offline', 'maintenance') NOT NULL, ChildPid INT(5) NULL, VirtURI VARCHAR(64) NOT NULL, VirtDomain VARCHAR(32) NOT NULL,

1 0

Jacek Caban : crypt32: Get rid of no longer used contextSize argument in Context_CopyProperties.
by Alexandre Julliard Oct. 8, 2013

Oct. 8, 2013

Module: wine Branch: master Commit: 09121895fda57e9c4f8ba66435abd70530442422 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09121895fda57e9c4f8ba6643… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 8 16:24:44 2013 +0200 crypt32: Get rid of no longer used contextSize argument in Context_CopyProperties. --- dlls/crypt32/context.c | 3 +-- dlls/crypt32/crypt32_private.h | 3 +-- dlls/crypt32/ctl.c | 9 +++------ dlls/crypt32/store.c | 15 ++++++--------- 4 files changed, 11 insertions(+), 19 deletions(-) diff --git a/dlls/crypt32/context.c b/dlls/crypt32/context.c index 83e6133..cda1f4c 100644 --- a/dlls/crypt32/context.c +++ b/dlls/crypt32/context.c @@ -174,8 +174,7 @@ BOOL Context_Release(void *context, ContextFreeFunc dataContextFree) return ret; } -void Context_CopyProperties(const void *to, const void *from, - size_t contextSize) +void Context_CopyProperties(const void *to, const void *from) { CONTEXT_PROPERTY_LIST *toProperties, *fromProperties; diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h index e98bc75..d978e5c 100644 --- a/dlls/crypt32/crypt32_private.h +++ b/dlls/crypt32/crypt32_private.h @@ -351,8 +351,7 @@ void *Context_GetExtra(const 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, - size_t contextSize) DECLSPEC_HIDDEN; +void Context_CopyProperties(const void *to, const void *from) DECLSPEC_HIDDEN; /* Returns context's properties, or the linked context's properties if context * is a link context. diff --git a/dlls/crypt32/ctl.c b/dlls/crypt32/ctl.c index 6daa53a..ce534e9 100644 --- a/dlls/crypt32/ctl.c +++ b/dlls/crypt32/ctl.c @@ -29,9 +29,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(crypt); -#define CtlContext_CopyProperties(to, from) \ - Context_CopyProperties((to), (from), sizeof(CTL_CONTEXT)) - BOOL WINAPI CertAddCTLContextToStore(HCERTSTORE hCertStore, PCCTL_CONTEXT pCtlContext, DWORD dwAddDisposition, PCCTL_CONTEXT* ppStoreContext) @@ -91,7 +88,7 @@ BOOL WINAPI CertAddCTLContextToStore(HCERTSTORE hCertStore, if (newer < 0) { toAdd = CertDuplicateCTLContext(pCtlContext); - CtlContext_CopyProperties(existing, pCtlContext); + Context_CopyProperties(existing, pCtlContext); } else { @@ -109,12 +106,12 @@ BOOL WINAPI CertAddCTLContextToStore(HCERTSTORE hCertStore, case CERT_STORE_ADD_REPLACE_EXISTING_INHERIT_PROPERTIES: toAdd = CertDuplicateCTLContext(pCtlContext); if (existing) - CtlContext_CopyProperties(toAdd, existing); + Context_CopyProperties(toAdd, existing); break; case CERT_STORE_ADD_USE_EXISTING: if (existing) { - CtlContext_CopyProperties(existing, pCtlContext); + Context_CopyProperties(existing, pCtlContext); if (ppStoreContext) *ppStoreContext = CertDuplicateCTLContext(existing); } diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index 5e60644..9bc14de 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -877,9 +877,6 @@ HCERTSTORE WINAPI CertOpenSystemStoreW(HCRYPTPROV_LEGACY hProv, CERT_SYSTEM_STORE_CURRENT_USER, szSubSystemProtocol); } -#define CertContext_CopyProperties(to, from) \ - Context_CopyProperties((to), (from), sizeof(CERT_CONTEXT)) - BOOL WINAPI CertAddCertificateContextToStore(HCERTSTORE hCertStore, PCCERT_CONTEXT pCertContext, DWORD dwAddDisposition, PCCERT_CONTEXT *ppStoreContext) @@ -944,12 +941,12 @@ BOOL WINAPI CertAddCertificateContextToStore(HCERTSTORE hCertStore, case CERT_STORE_ADD_REPLACE_EXISTING_INHERIT_PROPERTIES: toAdd = CertDuplicateCertificateContext(pCertContext); if (existing) - CertContext_CopyProperties(toAdd, existing); + Context_CopyProperties(toAdd, existing); break; case CERT_STORE_ADD_USE_EXISTING: if (existing) { - CertContext_CopyProperties(existing, pCertContext); + Context_CopyProperties(existing, pCertContext); if (ppStoreContext) *ppStoreContext = CertDuplicateCertificateContext(existing); } @@ -985,7 +982,7 @@ BOOL WINAPI CertAddCertificateContextToStore(HCERTSTORE hCertStore, else { toAdd = CertDuplicateCertificateContext(pCertContext); - CertContext_CopyProperties(toAdd, existing); + Context_CopyProperties(toAdd, existing); } } else @@ -1116,7 +1113,7 @@ BOOL WINAPI CertAddCRLContextToStore(HCERTSTORE hCertStore, if (newer < 0) { toAdd = CertDuplicateCRLContext(pCrlContext); - CrlContext_CopyProperties(toAdd, existing); + Context_CopyProperties(toAdd, existing); } else { @@ -1134,12 +1131,12 @@ BOOL WINAPI CertAddCRLContextToStore(HCERTSTORE hCertStore, case CERT_STORE_ADD_REPLACE_EXISTING_INHERIT_PROPERTIES: toAdd = CertDuplicateCRLContext(pCrlContext); if (existing) - CrlContext_CopyProperties(toAdd, existing); + Context_CopyProperties(toAdd, existing); break; case CERT_STORE_ADD_USE_EXISTING: if (existing) { - CrlContext_CopyProperties(existing, pCrlContext); + Context_CopyProperties(existing, pCrlContext); if (ppStoreContext) *ppStoreContext = CertDuplicateCRLContext(existing); }

1 0

Jacek Caban : crypt32: Get rid of no longer used contextSize argument in Context_Release.
by Alexandre Julliard Oct. 8, 2013

Oct. 8, 2013

Module: wine Branch: master Commit: c1fa23ac5d8e4b2ec77d40a50a721c6c6a13c8fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1fa23ac5d8e4b2ec77d40a50… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 8 16:24:28 2013 +0200 crypt32: Get rid of no longer used contextSize argument in Context_Release. --- dlls/crypt32/cert.c | 3 +-- dlls/crypt32/context.c | 5 ++--- dlls/crypt32/crl.c | 3 +-- dlls/crypt32/crypt32_private.h | 3 +-- dlls/crypt32/ctl.c | 3 +-- 5 files changed, 6 insertions(+), 11 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 7c6a18c..e9d8717 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -203,8 +203,7 @@ BOOL WINAPI CertFreeCertificateContext(PCCERT_CONTEXT pCertContext) TRACE("(%p)\n", pCertContext); if (pCertContext) - ret = Context_Release((void *)pCertContext, sizeof(CERT_CONTEXT), - CertDataContext_Free); + ret = Context_Release((void *)pCertContext, CertDataContext_Free); return ret; } diff --git a/dlls/crypt32/context.c b/dlls/crypt32/context.c index 53fb022..83e6133 100644 --- a/dlls/crypt32/context.c +++ b/dlls/crypt32/context.c @@ -141,8 +141,7 @@ CONTEXT_PROPERTY_LIST *Context_GetProperties(const void *context) return (ptr && ptr->type == ContextTypeData) ? ptr->u.properties : NULL; } -BOOL Context_Release(void *context, size_t contextSize, - ContextFreeFunc dataContextFree) +BOOL Context_Release(void *context, ContextFreeFunc dataContextFree) { BASE_CONTEXT *base = BASE_CONTEXT_FROM_CONTEXT(context); BOOL ret = TRUE; @@ -158,7 +157,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, dataContextFree); + base->u.linked), dataContextFree); } if (InterlockedDecrement(&base->ref) == 0) { diff --git a/dlls/crypt32/crl.c b/dlls/crypt32/crl.c index e79dd4a..6ed27f7 100644 --- a/dlls/crypt32/crl.c +++ b/dlls/crypt32/crl.c @@ -346,8 +346,7 @@ BOOL WINAPI CertFreeCRLContext( PCCRL_CONTEXT pCrlContext) TRACE("(%p)\n", pCrlContext); if (pCrlContext) - ret = Context_Release((void *)pCrlContext, sizeof(CRL_CONTEXT), - CrlDataContext_Free); + ret = Context_Release((void *)pCrlContext, CrlDataContext_Free); return ret; } diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h index f60bfae..e98bc75 100644 --- a/dlls/crypt32/crypt32_private.h +++ b/dlls/crypt32/crypt32_private.h @@ -368,8 +368,7 @@ typedef void (*ContextFreeFunc)(void *context); * If a data context has its ref count reach 0, calls dataContextFree on it. * Returns FALSE if the reference count is <= 0 when called. */ -BOOL Context_Release(void *context, size_t contextSize, - ContextFreeFunc dataContextFree) DECLSPEC_HIDDEN; +BOOL Context_Release(void *context, ContextFreeFunc dataContextFree) DECLSPEC_HIDDEN; /** * Context property list functions diff --git a/dlls/crypt32/ctl.c b/dlls/crypt32/ctl.c index 04ec03d..6daa53a 100644 --- a/dlls/crypt32/ctl.c +++ b/dlls/crypt32/ctl.c @@ -481,8 +481,7 @@ BOOL WINAPI CertFreeCTLContext(PCCTL_CONTEXT pCTLContext) TRACE("(%p)\n", pCTLContext); if (pCTLContext) - ret = Context_Release((void *)pCTLContext, sizeof(CTL_CONTEXT), - CTLDataContext_Free); + ret = Context_Release((void *)pCTLContext, CTLDataContext_Free); return ret; }

1 0

Jacek Caban : crypt32: Don't follow linked contexts in AddRef/ Release implementations.
by Alexandre Julliard Oct. 8, 2013

Oct. 8, 2013

Module: wine Branch: master Commit: bb2c32d776f9be3773e9297d3627ab72a85c880e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb2c32d776f9be3773e9297d3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 8 17:01:38 2013 +0200 crypt32: Don't follow linked contexts in AddRef/Release implementations. --- dlls/crypt32/context.c | 32 +++----------------------------- 1 files changed, 3 insertions(+), 29 deletions(-) diff --git a/dlls/crypt32/context.c b/dlls/crypt32/context.c index cda1f4c..915ad5e 100644 --- a/dlls/crypt32/context.c +++ b/dlls/crypt32/context.c @@ -41,7 +41,7 @@ typedef struct _BASE_CONTEXT } u; } BASE_CONTEXT; -#define CONTEXT_FROM_BASE_CONTEXT(p) (LPBYTE)(p+1) +#define CONTEXT_FROM_BASE_CONTEXT(p) (void*)(p+1) #define BASE_CONTEXT_FROM_CONTEXT(p) ((BASE_CONTEXT*)(p)-1) void *Context_CreateDataContext(size_t contextSize) @@ -93,26 +93,6 @@ void Context_AddRef(void *context) InterlockedIncrement(&baseContext->ref); TRACE("%p's ref count is %d\n", context, baseContext->ref); - if (baseContext->type == ContextTypeLink) - { - BASE_CONTEXT *linkedBase = baseContext->u.linked; - - /* Add-ref the linked contexts too */ - while (linkedBase && linkedBase->type == ContextTypeLink) - { - InterlockedIncrement(&linkedBase->ref); - TRACE("%p's ref count is %d\n", linkedBase, linkedBase->ref); - linkedBase = linkedBase->u.linked; - } - if (linkedBase) - { - /* It's not a link context, so it wasn't add-ref'ed in the while - * loop, so add-ref it here. - */ - InterlockedIncrement(&linkedBase->ref); - TRACE("%p's ref count is %d\n", linkedBase, linkedBase->ref); - } - } } void *Context_GetExtra(const void *context, size_t contextSize) @@ -151,14 +131,6 @@ BOOL Context_Release(void *context, ContextFreeFunc dataContextFree) ERR("%p's ref count is %d\n", context, base->ref); return FALSE; } - if (base->type == ContextTypeLink) - { - /* The linked context is of the same type as this, so release - * it as well, using the same offset and data free function. - */ - ret = Context_Release(CONTEXT_FROM_BASE_CONTEXT( - base->u.linked), dataContextFree); - } if (InterlockedDecrement(&base->ref) == 0) { TRACE("freeing %p\n", context); @@ -166,6 +138,8 @@ BOOL Context_Release(void *context, ContextFreeFunc dataContextFree) { ContextPropertyList_Free(base->u.properties); dataContextFree(context); + } else { + Context_Release(CONTEXT_FROM_BASE_CONTEXT(base->u.linked), dataContextFree); } CryptMemFree(base); }

1 0

Jacek Caban : crypt32: Get rid of no longer used contextSize argument in Context_GetProperties.
by Alexandre Julliard Oct. 8, 2013

Oct. 8, 2013

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

Jacek Caban : crypt32: Get rid of no longer used contextSize argument in Context_GetLinkedContext .
by Alexandre Julliard Oct. 8, 2013

Oct. 8, 2013

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

Austin English : dxdiagn: Add a few more stub properties.
by Alexandre Julliard Oct. 8, 2013

Oct. 8, 2013

Module: wine Branch: master Commit: d66f7cdb529203563c82319b1cf2ec5720b138fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=d66f7cdb529203563c82319b1… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Oct 4 18:20:37 2013 -0700 dxdiagn: Add a few more stub properties. --- dlls/dxdiagn/provider.c | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index 8132b8f..145e5a3 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -66,6 +66,9 @@ static const WCHAR szSubSysId[] = {'s','z','S','u','b','S','y','s','I','d',0}; static const WCHAR szRevisionId[] = {'s','z','R','e','v','i','s','i','o','n','I','d',0}; static const WCHAR dwRefreshRate[] = {'d','w','R','e','f','r','e','s','h','R','a','t','e',0}; static const WCHAR szManufacturer[] = {'s','z','M','a','n','u','f','a','c','t','u','r','e','r',0}; +static const WCHAR szChipType[] = {'s','z','C','h','i','p','T','y','p','e',0}; +static const WCHAR szDACType[] = {'s','z','D','A','C','T','y','p','e',0}; +static const WCHAR szRevision[] = {'s','z','R','e','v','i','s','i','o','n',0}; struct IDxDiagProviderImpl { @@ -1016,6 +1019,18 @@ static HRESULT fill_display_information_d3d(IDxDiagContainerImpl_Container *node if (FAILED(hr)) goto cleanup; + hr = add_bstr_property(display_adapter, szChipType, szEmpty); + if (FAILED(hr)) + goto cleanup; + + hr = add_bstr_property(display_adapter, szDACType, szEmpty); + if (FAILED(hr)) + goto cleanup; + + hr = add_bstr_property(display_adapter, szRevision, szEmpty); + if (FAILED(hr)) + goto cleanup; + if (!get_texture_memory(&adapter_info.DeviceIdentifier, &available_mem)) WARN("get_texture_memory helper failed\n"); @@ -1042,7 +1057,7 @@ static HRESULT fill_display_information_fallback(IDxDiagContainerImpl_Container static const WCHAR *empty_properties[] = {szDeviceIdentifier, szVendorId, szDeviceId, szKeyDeviceKey, szKeyDeviceID, szDriverName, szDriverVersion, szSubSysId, szRevisionId, - szManufacturer}; + szManufacturer, szChipType, szDACType, szRevision}; IDxDiagContainerImpl_Container *display_adapter; HRESULT hr;

1 0

Stefan Dösinger : wined3d: Avoid duplicated code in wined3d_surface_blt.
by Alexandre Julliard Oct. 8, 2013

Oct. 8, 2013

Module: wine Branch: master Commit: bff422f340f72aa73aca139eed5059562dcdd265 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bff422f340f72aa73aca139ee… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Oct 8 00:27:06 2013 +0200 wined3d: Avoid duplicated code in wined3d_surface_blt. --- dlls/wined3d/surface.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 9d7accd..cc5a7a5 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -6610,7 +6610,7 @@ HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const REC if (dst_surface->flags & SFLAG_CONVERTED) { WARN_(d3d_perf)("Converted surface, using CPU blit.\n"); - return surface_cpu_blt(dst_surface, &dst_rect, src_surface, &src_rect, flags, fx, filter); + goto cpu; } if (flags & ~simple_blit) @@ -6687,7 +6687,7 @@ HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const REC else if (convert) TRACE("Not doing sysmem blit because of format conversion.\n"); else - return surface_cpu_blt(dst_surface, &dst_rect, src_surface, &src_rect, flags, fx, filter); + goto cpu; } if (flags & WINEDDBLT_COLORFILL)

1 0

Jacek Caban : crypt32: Get rid of no longer used contextSize argument in Context_AddRef.
by Alexandre Julliard Oct. 8, 2013

Oct. 8, 2013

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

Stefan Dösinger : wined3d: Remove the D3DSWAPEFFECT_DISCARD debug clear code.
by Alexandre Julliard Oct. 8, 2013

Oct. 8, 2013

Module: wine Branch: master Commit: 9331c791e87d057728c45f3ff2956c807d83f250 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9331c791e87d057728c45f3ff… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Oct 8 00:27:09 2013 +0200 wined3d: Remove the D3DSWAPEFFECT_DISCARD debug clear code. --- dlls/wined3d/swapchain.c | 25 ------------------------- 1 files changed, 0 insertions(+), 25 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 2bab9ed..73243a9 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -566,31 +566,6 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, const RECT } } - /* This is disabled, but the code left in for debug purposes. - * - * Since we're allowed to modify the new back buffer on a D3DSWAPEFFECT_DISCARD flip, - * we can clear it with some ugly color to make bad drawing visible and ease debugging. - * The Debug runtime does the same on Windows. However, a few games do not redraw the - * screen properly, like Max Payne 2, which leaves a few pixels undefined. - * - * Tests show that the content of the back buffer after a discard flip is indeed not - * reliable, so no game can depend on the exact content. However, it resembles the - * old contents in some way, for example by showing fragments at other locations. In - * general, the color theme is still intact. So Max payne, which draws rather dark scenes - * gets a dark background image. If we clear it with a bright ugly color, the game's - * bug shows up much more than it does on Windows, and the players see single pixels - * with wrong colors. - * (The Max Payne bug has been confirmed on Windows with the debug runtime) */ - if (FALSE && swapchain->desc.swap_effect == WINED3D_SWAP_EFFECT_DISCARD) - { - static const struct wined3d_color cyan = {0.0f, 1.0f, 1.0f, 1.0f}; - - TRACE("Clearing the color buffer with cyan color\n"); - - wined3d_device_clear(swapchain->device, 0, NULL, - WINED3DCLEAR_TARGET, &cyan, 1.0f, 0); - } - if (!swapchain->render_to_fbo && ((swapchain->front_buffer->flags & SFLAG_INSYSMEM) || (back_buffer->flags & SFLAG_INSYSMEM))) {

1 0