October 2013 - Wine-Commits

Jacek Caban : crypt32: Allocate BASE_CONTEXT in the beginning of the memory block.
by Alexandre Julliard Oct. 8, 2013

Oct. 8, 2013

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

Hans Leidekker : iphlpapi: Add support for GAA_FLAG_INCLUDE_PREFIX in GetAdaptersAddresses.
by Alexandre Julliard Oct. 8, 2013

Oct. 8, 2013

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: Use BASE_CONTEXT for both data and link contexts.
by Alexandre Julliard Oct. 8, 2013

Oct. 8, 2013

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

Stefan Dösinger : wined3d: Get rid of SFLAG_LOCKABLE.
by Alexandre Julliard Oct. 8, 2013

Oct. 8, 2013

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 redundant surface location changes.
by Alexandre Julliard Oct. 8, 2013

Oct. 8, 2013

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

Piotr Caban : riched20: Fix loop condition while processing control content in WM_CREATE.
by Alexandre Julliard Oct. 8, 2013

Oct. 8, 2013

Module: wine Branch: master Commit: d31048f0aecadfd6d9698ca9c8ac1d947470ab5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d31048f0aecadfd6d9698ca9c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 8 13:17:05 2013 +0200 riched20: Fix loop condition while processing control content in WM_CREATE. --- dlls/riched20/editor.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 4e3d978..e70bbbe 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -4039,7 +4039,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, if (!(editor->styleFlags & ES_MULTILINE)) { len = 0; - while(textW[len] != '0' && textW[len] != '\r' && textW[len] != '\n') + while(textW[len] != '\0' && textW[len] != '\r' && textW[len] != '\n') len++; } ME_InsertTextFromCursor(editor, 0, textW, len, editor->pBuffer->pDefaultStyle);

1 0

Ken Thomases : winemac: Don' t accidentally clear Cocoa window style mask bits.
by Alexandre Julliard Oct. 8, 2013

Oct. 8, 2013

Module: wine Branch: master Commit: bdcb8138fe5549071eb3339ced67180b00bafb5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdcb8138fe5549071eb3339ce… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Oct 8 02:21:27 2013 -0500 winemac: Don't accidentally clear Cocoa window style mask bits. --- dlls/winemac.drv/cocoa_window.m | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index ede86d5..9b3fa9d 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -569,8 +569,10 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) - (void) setWindowFeatures:(const struct macdrv_window_features*)wf { + static const NSUInteger usedStyles = NSTitledWindowMask | NSClosableWindowMask | NSMiniaturizableWindowMask | + NSResizableWindowMask | NSUtilityWindowMask | NSBorderlessWindowMask; NSUInteger currentStyle = [self styleMask]; - NSUInteger newStyle = style_mask_for_features(wf); + NSUInteger newStyle = style_mask_for_features(wf) | (currentStyle & ~usedStyles); if (newStyle != currentStyle) {

1 0

Qian Hong : user32/tests: Clean side effect after testing winstation.
by Alexandre Julliard Oct. 8, 2013

Oct. 8, 2013

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: Fixed typo in comments.
by Alexandre Julliard Oct. 8, 2013

Oct. 8, 2013

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

Ken Thomases : winemac: If the app doesn't specify a custom max. tracking size, don't restrict Cocoa.
by Alexandre Julliard Oct. 8, 2013

Oct. 8, 2013

Module: wine Branch: master Commit: 9779f0ace4c4f5a0e361b6d6c2c6b9d1b92d058a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9779f0ace4c4f5a0e361b6d6c… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Oct 8 02:21:31 2013 -0500 winemac: If the app doesn't specify a custom max. tracking size, don't restrict Cocoa. --- dlls/winemac.drv/window.c | 18 +++++++++++++----- 1 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 1afe294..6e92d13 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -479,8 +479,6 @@ static void sync_window_min_max_info(HWND hwnd) WINDOWPLACEMENT wpl; HMONITOR monitor; struct macdrv_win_data *data; - RECT min_rect, max_rect; - CGSize min_size, max_size; TRACE("win %p\n", hwnd); @@ -573,12 +571,22 @@ static void sync_window_min_max_info(HWND hwnd) if ((data = get_win_data(hwnd)) && data->cocoa_window) { + RECT min_rect, max_rect; + CGSize min_size, max_size; + SetRect(&min_rect, 0, 0, minmax.ptMinTrackSize.x, minmax.ptMinTrackSize.y); - SetRect(&max_rect, 0, 0, minmax.ptMaxTrackSize.x, minmax.ptMaxTrackSize.y); macdrv_window_to_mac_rect(data, style, &min_rect); - macdrv_window_to_mac_rect(data, style, &max_rect); min_size = CGSizeMake(min_rect.right - min_rect.left, min_rect.bottom - min_rect.top); - max_size = CGSizeMake(max_rect.right - max_rect.left, max_rect.bottom - max_rect.top); + + if (minmax.ptMaxTrackSize.x == GetSystemMetrics(SM_CXMAXTRACK) && + minmax.ptMaxTrackSize.y == GetSystemMetrics(SM_CYMAXTRACK)) + max_size = CGSizeMake(CGFLOAT_MAX, CGFLOAT_MAX); + else + { + SetRect(&max_rect, 0, 0, minmax.ptMaxTrackSize.x, minmax.ptMaxTrackSize.y); + macdrv_window_to_mac_rect(data, style, &max_rect); + max_size = CGSizeMake(max_rect.right - max_rect.left, max_rect.bottom - max_rect.top); + } TRACE("min_size (%g,%g) max_size (%g,%g)\n", min_size.width, min_size.height, max_size.width, max_size.height); macdrv_set_window_min_max_sizes(data->cocoa_window, min_size, max_size);

1 0