October 2013 - Wine-commits

Francois Gouget : testbot: Allow doing a revert while some VMs are running.
by Alexandre Julliard 09 Oct '13

09 Oct '13

Module: tools Branch: master Commit: d929c00e54a4ae700dd0a8657366d938cecdc0b1 URL: http://source.winehq.org/git/tools.git/?a=commit;h=d929c00e54a4ae700dd0a865… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Oct 9 17:39:49 2013 +0200 testbot: Allow doing a revert while some VMs are running. --- testbot/lib/WineTestBot/Config.pm | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm index 501a530..48eb3f0 100644 --- a/testbot/lib/WineTestBot/Config.pm +++ b/testbot/lib/WineTestBot/Config.pm @@ -61,7 +61,7 @@ $DataDir = "$::RootDir/var"; $BinDir = "$::RootDir/bin"; $MaxRevertingVMs = 1; -$MaxRevertsWhileRunningVMs = 0; +$MaxRevertsWhileRunningVMs = 1; $MaxActiveVMs = 2; $MaxVMsWhenIdle = undef; $SleepAfterRevert = 30;

1 0

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

08 Oct '13

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 08 Oct '13

08 Oct '13

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_CopyProperties.
by Alexandre Julliard 08 Oct '13

08 Oct '13

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

Stefan Dösinger : wined3d: Avoid duplicated code in wined3d_surface_blt.
by Alexandre Julliard 08 Oct '13

08 Oct '13

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

Stefan Dösinger : wined3d: Get rid of SFLAG_LOCKABLE.
by Alexandre Julliard 08 Oct '13

08 Oct '13

Module: wine Branch: master Commit: e4a0767e2dfd69e7b6473ec9247a39fa6e5b44c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4a0767e2dfd69e7b6473ec92… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Oct 8 00:27:07 2013 +0200 wined3d: Get rid of SFLAG_LOCKABLE. --- dlls/wined3d/surface.c | 5 +++-- dlls/wined3d/wined3d_private.h | 39 +++++++++++++++++++-------------------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index cc5a7a5..52eac16 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3476,7 +3476,7 @@ HRESULT CDECL wined3d_surface_map(struct wined3d_surface *surface, ++surface->resource.map_count; - if (!(surface->flags & SFLAG_LOCKABLE)) + if (!(surface->resource.access_flags & WINED3D_RESOURCE_ACCESS_CPU)) WARN("Trying to lock unlockable surface.\n"); /* Performance optimization: Count how often a surface is mapped, if it is @@ -6876,7 +6876,8 @@ static HRESULT surface_init(struct wined3d_surface *surface, UINT alignment, UIN if (flags & WINED3D_SURFACE_PIN_SYSMEM) surface->flags |= SFLAG_PIN_SYSMEM; if (lockable || format_id == WINED3DFMT_D16_LOCKABLE) - surface->flags |= SFLAG_LOCKABLE; + surface->resource.access_flags |= WINED3D_RESOURCE_ACCESS_CPU; + /* I'm not sure if this qualifies as a hack or as an optimization. It * seems reasonable to assume that lockable render targets will get * locked, so we might as well set SFLAG_DYNLOCK right at surface diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c28643a..69738d5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2298,26 +2298,25 @@ void flip_surface(struct wined3d_surface *front, struct wined3d_surface *back) D #define SFLAG_DISCARD 0x00000002 /* ??? */ #define SFLAG_NONPOW2 0x00000004 /* Surface sizes are not a power of 2 */ #define SFLAG_NORMCOORD 0x00000008 /* Set if GL texture coordinates are normalized (non-texture rectangle). */ -#define SFLAG_LOCKABLE 0x00000010 /* Surface can be locked. */ -#define SFLAG_DYNLOCK 0x00000020 /* Surface is often locked by the application. */ -#define SFLAG_PIN_SYSMEM 0x00000040 /* Keep the surface in sysmem, at the same address. */ -#define SFLAG_DCINUSE 0x00000080 /* Set between GetDC and ReleaseDC calls. */ -#define SFLAG_LOST 0x00000100 /* Surface lost flag for ddraw. */ -#define SFLAG_GLCKEY 0x00000200 /* The GL texture was created with a color key. */ -#define SFLAG_CLIENT 0x00000400 /* GL_APPLE_client_storage is used with this surface. */ -#define SFLAG_INOVERLAYDRAW 0x00000800 /* Overlay drawing is in progress. Recursion prevention. */ -#define SFLAG_DIBSECTION 0x00001000 /* Has a DIB section attached for GetDC. */ -#define SFLAG_USERPTR 0x00002000 /* The application allocated the memory for this surface. */ -#define SFLAG_ALLOCATED 0x00004000 /* A GL texture is allocated for this surface. */ -#define SFLAG_SRGBALLOCATED 0x00008000 /* A sRGB GL texture is allocated for this surface. */ -#define SFLAG_PBO 0x00010000 /* The surface has a PBO. */ -#define SFLAG_INSYSMEM 0x00020000 /* The system memory copy is current. */ -#define SFLAG_INTEXTURE 0x00040000 /* The GL texture is current. */ -#define SFLAG_INSRGBTEX 0x00080000 /* The GL sRGB texture is current. */ -#define SFLAG_INDRAWABLE 0x00100000 /* The GL drawable is current. */ -#define SFLAG_INRB_MULTISAMPLE 0x00200000 /* The multisample renderbuffer is current. */ -#define SFLAG_INRB_RESOLVED 0x00400000 /* The resolved renderbuffer is current. */ -#define SFLAG_DISCARDED 0x00800000 /* Surface was discarded, allocating new location is enough. */ +#define SFLAG_DYNLOCK 0x00000010 /* Surface is often locked by the application. */ +#define SFLAG_PIN_SYSMEM 0x00000020 /* Keep the surface in sysmem, at the same address. */ +#define SFLAG_DCINUSE 0x00000040 /* Set between GetDC and ReleaseDC calls. */ +#define SFLAG_LOST 0x00000080 /* Surface lost flag for ddraw. */ +#define SFLAG_GLCKEY 0x00000100 /* The GL texture was created with a color key. */ +#define SFLAG_CLIENT 0x00000200 /* GL_APPLE_client_storage is used with this surface. */ +#define SFLAG_INOVERLAYDRAW 0x00000400 /* Overlay drawing is in progress. Recursion prevention. */ +#define SFLAG_DIBSECTION 0x00000800 /* Has a DIB section attached for GetDC. */ +#define SFLAG_USERPTR 0x00001000 /* The application allocated the memory for this surface. */ +#define SFLAG_ALLOCATED 0x00002000 /* A GL texture is allocated for this surface. */ +#define SFLAG_SRGBALLOCATED 0x00004000 /* A sRGB GL texture is allocated for this surface. */ +#define SFLAG_PBO 0x00008000 /* The surface has a PBO. */ +#define SFLAG_INSYSMEM 0x00010000 /* The system memory copy is current. */ +#define SFLAG_INTEXTURE 0x00020000 /* The GL texture is current. */ +#define SFLAG_INSRGBTEX 0x00040000 /* The GL sRGB texture is current. */ +#define SFLAG_INDRAWABLE 0x00080000 /* The GL drawable is current. */ +#define SFLAG_INRB_MULTISAMPLE 0x00100000 /* The multisample renderbuffer is current. */ +#define SFLAG_INRB_RESOLVED 0x00200000 /* The resolved renderbuffer is current. */ +#define SFLAG_DISCARDED 0x00400000 /* Surface was discarded, allocating new location is enough. */ /* In some conditions the surface memory must not be freed: * SFLAG_CONVERTED: Converting the data back would take too long

1 0

Stefan Dösinger : wined3d: Remove the D3DSWAPEFFECT_DISCARD debug clear code.
by Alexandre Julliard 08 Oct '13

08 Oct '13

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

Stefan Dösinger : wined3d: Remove redundant surface location changes.
by Alexandre Julliard 08 Oct '13

08 Oct '13

Module: wine Branch: master Commit: 1631603986d55f4e0382a0f8cf7a2d0e79f383fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=1631603986d55f4e0382a0f8c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Oct 8 00:27:10 2013 +0200 wined3d: Remove redundant surface location changes. fb_copy_to_texture_direct and fb_copy_to_texture_hwstretch already invalidate everything but the RGB texture. --- dlls/wined3d/surface.c | 10 +--------- 1 files changed, 1 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 52eac16..860296b 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4984,15 +4984,7 @@ static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RE fb_copy_to_texture_hwstretch(dst_surface, src_surface, src_rect, dst_rect, filter); } - if (!dst_surface->resource.map_count && !(dst_surface->flags & SFLAG_DONOTFREE)) - { - wined3d_resource_free_sysmem(&dst_surface->resource); - dst_surface->resource.allocatedMemory = NULL; - } - else - { - dst_surface->flags &= ~SFLAG_INSYSMEM; - } + surface_evict_sysmem(dst_surface); return WINED3D_OK; }

1 0

Austin English : dxdiagn: Add a few more stub properties.
by Alexandre Julliard 08 Oct '13

08 Oct '13

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

Jacek Caban : crypt32: Use BASE_CONTEXT for both data and link contexts.
by Alexandre Julliard 08 Oct '13

08 Oct '13

Module: wine Branch: master Commit: 12982d867a4ab45057fbdfbb139b150643a9d42d URL: http://source.winehq.org/git/wine.git/?a=commit;h=12982d867a4ab45057fbdfbb1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 8 16:23:29 2013 +0200 crypt32: Use BASE_CONTEXT for both data and link contexts. --- dlls/crypt32/context.c | 47 ++++++++++++++++++----------------------------- 1 files changed, 18 insertions(+), 29 deletions(-) diff --git a/dlls/crypt32/context.c b/dlls/crypt32/context.c index c5f609b..e52f096 100644 --- a/dlls/crypt32/context.c +++ b/dlls/crypt32/context.c @@ -35,37 +35,27 @@ typedef struct _BASE_CONTEXT { LONG ref; ContextType type; + union { + CONTEXT_PROPERTY_LIST *properties; + struct _BASE_CONTEXT *linked; + } u; } BASE_CONTEXT; -typedef struct _DATA_CONTEXT -{ - LONG ref; - ContextType type; /* always ContextTypeData */ - CONTEXT_PROPERTY_LIST *properties; -} DATA_CONTEXT; - -typedef struct _LINK_CONTEXT -{ - LONG ref; - ContextType type; /* always ContextTypeLink */ - BASE_CONTEXT *linked; -} LINK_CONTEXT; - #define CONTEXT_FROM_BASE_CONTEXT(p, s) ((LPBYTE)(p) - (s)) #define BASE_CONTEXT_FROM_CONTEXT(p, s) (BASE_CONTEXT*)((LPBYTE)(p) + (s)) void *Context_CreateDataContext(size_t contextSize) { - void *ret = CryptMemAlloc(contextSize + sizeof(DATA_CONTEXT)); + void *ret = CryptMemAlloc(contextSize + sizeof(BASE_CONTEXT)); if (ret) { - DATA_CONTEXT *context = (DATA_CONTEXT*)((LPBYTE)ret + contextSize); + BASE_CONTEXT *context = (BASE_CONTEXT*)((LPBYTE)ret + contextSize); context->ref = 1; context->type = ContextTypeData; - context->properties = ContextPropertyList_Create(); - if (!context->properties) + context->u.properties = ContextPropertyList_Create(); + if (!context->u.properties) { CryptMemFree(ret); ret = NULL; @@ -78,13 +68,13 @@ void *Context_CreateDataContext(size_t contextSize) void *Context_CreateLinkContext(unsigned int contextSize, void *linked, unsigned int extra, BOOL addRef) { - void *context = CryptMemAlloc(contextSize + sizeof(LINK_CONTEXT) + extra); + void *context = CryptMemAlloc(contextSize + sizeof(BASE_CONTEXT) + extra); TRACE("(%d, %p, %d)\n", contextSize, linked, extra); if (context) { - LINK_CONTEXT *linkContext = (LINK_CONTEXT*)BASE_CONTEXT_FROM_CONTEXT( + BASE_CONTEXT *linkContext = (BASE_CONTEXT*)BASE_CONTEXT_FROM_CONTEXT( context, contextSize); BASE_CONTEXT *linkedBase = BASE_CONTEXT_FROM_CONTEXT(linked, contextSize); @@ -92,7 +82,7 @@ void *Context_CreateLinkContext(unsigned int contextSize, void *linked, unsigned memcpy(context, linked, contextSize); linkContext->ref = 1; linkContext->type = ContextTypeLink; - linkContext->linked = linkedBase; + linkContext->u.linked = linkedBase; if (addRef) Context_AddRef(linked, contextSize); TRACE("%p's ref count is %d\n", context, linkContext->ref); @@ -144,7 +134,7 @@ void *Context_GetExtra(const void *context, size_t contextSize) BASE_CONTEXT *baseContext = BASE_CONTEXT_FROM_CONTEXT(context, contextSize); assert(baseContext->type == ContextTypeLink); - return (LPBYTE)baseContext + sizeof(LINK_CONTEXT); + return (LPBYTE)baseContext + sizeof(BASE_CONTEXT); } void *Context_GetLinkedContext(void *context, size_t contextSize) @@ -152,7 +142,7 @@ void *Context_GetLinkedContext(void *context, size_t contextSize) BASE_CONTEXT *baseContext = BASE_CONTEXT_FROM_CONTEXT(context, contextSize); assert(baseContext->type == ContextTypeLink); - return CONTEXT_FROM_BASE_CONTEXT(((LINK_CONTEXT*)baseContext)->linked, contextSize); + return CONTEXT_FROM_BASE_CONTEXT(baseContext->u.linked, contextSize); } CONTEXT_PROPERTY_LIST *Context_GetProperties(const void *context, size_t contextSize) @@ -160,8 +150,8 @@ CONTEXT_PROPERTY_LIST *Context_GetProperties(const void *context, size_t context BASE_CONTEXT *ptr = BASE_CONTEXT_FROM_CONTEXT(context, contextSize); while (ptr && ptr->type == ContextTypeLink) - ptr = ((LINK_CONTEXT*)ptr)->linked; - return (ptr && ptr->type == ContextTypeData) ? ((DATA_CONTEXT*)ptr)->properties : NULL; + ptr = ptr->u.linked; + return (ptr && ptr->type == ContextTypeData) ? ptr->u.properties : NULL; } BOOL Context_Release(void *context, size_t contextSize, @@ -181,15 +171,14 @@ 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( - ((LINK_CONTEXT*)base)->linked, contextSize), contextSize, - dataContextFree); + base->u.linked, contextSize), contextSize, dataContextFree); } if (InterlockedDecrement(&base->ref) == 0) { TRACE("freeing %p\n", context); if (base->type == ContextTypeData) { - ContextPropertyList_Free(((DATA_CONTEXT*)base)->properties); + ContextPropertyList_Free(base->u.properties); dataContextFree(context); } CryptMemFree(context); @@ -249,7 +238,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(LINK_CONTEXT) - list->contextSize; + return (LPBYTE)entry - sizeof(BASE_CONTEXT) - list->contextSize; } void *ContextList_Add(struct ContextList *list, void *toLink, void *toReplace)

1 0