September 2014 - Wine-Commits

Henri Verbeet : wined3d: Use a more consistent naming for wined3d_conversion_type elements.
by Alexandre Julliard Sept. 30, 2014

Sept. 30, 2014

Module: wine Branch: master Commit: 90e3312c8c476b5e4d6d513ff383a7bced999b05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90e3312c8c476b5e4d6d513ff… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 30 07:59:22 2014 +0200 wined3d: Use a more consistent naming for wined3d_conversion_type elements. --- dlls/wined3d/surface.c | 24 ++++++++++++------------ dlls/wined3d/wined3d_private.h | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index ee17daf..acf3f46 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1604,11 +1604,11 @@ static void d3dfmt_get_conv(const struct wined3d_texture *texture, BOOL need_alp } color_key_info[] = { - {WINED3DFMT_B5G6R5_UNORM, WINED3D_CT_CK_565, GL_RGB5_A1, GL_RGBA, GL_UNSIGNED_SHORT_5_5_5_1, 2}, - {WINED3DFMT_B5G5R5X1_UNORM, WINED3D_CT_CK_5551, GL_RGB5_A1, GL_BGRA, GL_UNSIGNED_SHORT_1_5_5_5_REV, 2}, - {WINED3DFMT_B8G8R8_UNORM, WINED3D_CT_CK_RGB24, GL_RGBA8, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8, 4}, - {WINED3DFMT_B8G8R8X8_UNORM, WINED3D_CT_RGB32_888, GL_RGBA8, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8, 4}, - {WINED3DFMT_B8G8R8A8_UNORM, WINED3D_CT_CK_ARGB32, GL_RGBA8, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, 4}, + {WINED3DFMT_B5G6R5_UNORM, WINED3D_CT_CK_B5G6R5, GL_RGB5_A1, GL_RGBA, GL_UNSIGNED_SHORT_5_5_5_1, 2}, + {WINED3DFMT_B5G5R5X1_UNORM, WINED3D_CT_CK_B5G5R5X1, GL_RGB5_A1, GL_BGRA, GL_UNSIGNED_SHORT_1_5_5_5_REV, 2}, + {WINED3DFMT_B8G8R8_UNORM, WINED3D_CT_CK_B8G8R8, GL_RGBA8, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8, 4}, + {WINED3DFMT_B8G8R8X8_UNORM, WINED3D_CT_CK_B8G8R8X8, GL_RGBA8, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8, 4}, + {WINED3DFMT_B8G8R8A8_UNORM, WINED3D_CT_CK_B8G8R8A8, GL_RGBA8, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, 4}, }; *format = *texture->resource.format; @@ -1637,7 +1637,7 @@ static void d3dfmt_get_conv(const struct wined3d_texture *texture, BOOL need_alp if (!((gl_info->supported[ARB_FRAGMENT_PROGRAM] && texture->swapchain && texture == texture->swapchain->front_buffer)) || colorkey_active) { - *conversion_type = WINED3D_CT_PALETTED; + *conversion_type = WINED3D_CT_P8; format->glInternal = GL_RGBA; format->glFormat = GL_RGBA; format->glType = GL_UNSIGNED_BYTE; @@ -3174,7 +3174,7 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI break; } - case WINED3D_CT_PALETTED: + case WINED3D_CT_P8: if (surface->container->swapchain && surface->container->swapchain->palette) { unsigned int x, y; @@ -3210,7 +3210,7 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI break; - case WINED3D_CT_CK_565: + case WINED3D_CT_CK_B5G6R5: { /* Converting the 565 format in 5551 packed to emulate color-keying. @@ -3242,7 +3242,7 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI } break; - case WINED3D_CT_CK_5551: + case WINED3D_CT_CK_B5G5R5X1: { /* Converting X1R5G5B5 format to R5G5B5A1 to emulate color-keying. */ unsigned int x, y; @@ -3265,7 +3265,7 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI } break; - case WINED3D_CT_CK_RGB24: + case WINED3D_CT_CK_B8G8R8: { /* Converting R8G8B8 format to R8G8B8A8 with color-keying. */ unsigned int x, y; @@ -3286,7 +3286,7 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI } break; - case WINED3D_CT_RGB32_888: + case WINED3D_CT_CK_B8G8R8X8: { /* Converting X8R8G8B8 format to R8G8B8A8 with color-keying. */ unsigned int x, y; @@ -3307,7 +3307,7 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI } break; - case WINED3D_CT_CK_ARGB32: + case WINED3D_CT_CK_B8G8R8A8: { unsigned int x, y; for (y = 0; y < height; ++y) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 110334b..0a65059 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2353,12 +2353,12 @@ void flip_surface(struct wined3d_surface *front, struct wined3d_surface *back) D enum wined3d_conversion_type { WINED3D_CT_NONE, - WINED3D_CT_PALETTED, - WINED3D_CT_CK_565, - WINED3D_CT_CK_5551, - WINED3D_CT_CK_RGB24, - WINED3D_CT_RGB32_888, - WINED3D_CT_CK_ARGB32, + WINED3D_CT_P8, + WINED3D_CT_CK_B5G6R5, + WINED3D_CT_CK_B5G5R5X1, + WINED3D_CT_CK_B8G8R8, + WINED3D_CT_CK_B8G8R8X8, + WINED3D_CT_CK_B8G8R8A8, }; struct wined3d_sampler

1 0

Henri Verbeet : wined3d: Pass a texture to d3dfmt_get_conv().
by Alexandre Julliard Sept. 30, 2014

Sept. 30, 2014

Module: wine Branch: master Commit: df21c2b346e88de95af08caaca73e52544bb810c URL: http://source.winehq.org/git/wine.git/?a=commit;h=df21c2b346e88de95af08caac… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 30 07:59:21 2014 +0200 wined3d: Pass a texture to d3dfmt_get_conv(). --- dlls/wined3d/surface.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index d6adf8c..ee17daf 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1585,11 +1585,11 @@ static void surface_upload_data(struct wined3d_surface *surface, const struct wi } } -static void d3dfmt_get_conv(const struct wined3d_surface *surface, BOOL need_alpha_ck, +static void d3dfmt_get_conv(const struct wined3d_texture *texture, BOOL need_alpha_ck, struct wined3d_format *format, enum wined3d_conversion_type *conversion_type) { - BOOL colorkey_active = need_alpha_ck && (surface->container->color_key_flags & WINEDDSD_CKSRCBLT); - const struct wined3d_device *device = surface->resource.device; + BOOL colorkey_active = need_alpha_ck && (texture->color_key_flags & WINEDDSD_CKSRCBLT); + const struct wined3d_device *device = texture->resource.device; const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; unsigned int i; @@ -1611,14 +1611,14 @@ static void d3dfmt_get_conv(const struct wined3d_surface *surface, BOOL need_alp {WINED3DFMT_B8G8R8A8_UNORM, WINED3D_CT_CK_ARGB32, GL_RGBA8, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, 4}, }; - *format = *surface->resource.format; + *format = *texture->resource.format; *conversion_type = WINED3D_CT_NONE; if (colorkey_active) { for (i = 0; i < sizeof(color_key_info) / sizeof(*color_key_info); ++i) { - if (color_key_info[i].src_format != surface->resource.format->id) + if (color_key_info[i].src_format != texture->resource.format->id) continue; *conversion_type = color_key_info[i].conversion_type; @@ -1630,12 +1630,12 @@ static void d3dfmt_get_conv(const struct wined3d_surface *surface, BOOL need_alp } } - if (surface->resource.format->id == WINED3DFMT_P8_UINT) + if (texture->resource.format->id == WINED3DFMT_P8_UINT) { /* FIXME: This should check if the blitter backend can do P8 * conversion, instead of checking for ARB_fragment_program. */ - if (!((gl_info->supported[ARB_FRAGMENT_PROGRAM] && surface->container->swapchain - && surface->container == surface->container->swapchain->front_buffer)) || colorkey_active) + if (!((gl_info->supported[ARB_FRAGMENT_PROGRAM] && texture->swapchain + && texture == texture->swapchain->front_buffer)) || colorkey_active) { *conversion_type = WINED3D_CT_PALETTED; format->glInternal = GL_RGBA; @@ -1644,7 +1644,7 @@ static void d3dfmt_get_conv(const struct wined3d_surface *surface, BOOL need_alp format->conv_byte_count = 4; } } - else if (surface->resource.format->id == WINED3DFMT_B2G3R3_UNORM && colorkey_active) + else if (texture->resource.format->id == WINED3DFMT_B2G3R3_UNORM && colorkey_active) { /* This texture format will never be used... So do not care about * color-keying up until the point in time it will be needed. */ @@ -1762,7 +1762,7 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P } /* Use wined3d_surface_blt() instead of uploading directly if we need conversion. */ - d3dfmt_get_conv(dst_surface, FALSE, &format, &convert); + d3dfmt_get_conv(dst_surface->container, FALSE, &format, &convert); if (convert != WINED3D_CT_NONE || format.convert) return wined3d_surface_blt(dst_surface, &dst_rect, src_surface, src_rect, 0, NULL, WINED3D_TEXF_POINT); @@ -3095,7 +3095,7 @@ static void surface_prepare_texture_internal(struct wined3d_surface *surface, if (surface->flags & alloc_flag) return; - d3dfmt_get_conv(surface, TRUE, &format, &convert); + d3dfmt_get_conv(surface->container, TRUE, &format, &convert); if (convert != WINED3D_CT_NONE || format.convert) surface->flags |= SFLAG_CONVERTED; else surface->flags &= ~SFLAG_CONVERTED; @@ -4518,7 +4518,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, /* Upload from system memory */ - d3dfmt_get_conv(surface, TRUE /* We need color keying */, &format, &convert); + d3dfmt_get_conv(surface->container, TRUE /* We need color keying */, &format, &convert); if (srgb) { @@ -5666,7 +5666,7 @@ HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const REC /* We want to avoid invalidating the sysmem location for converted * surfaces, since otherwise we'd have to convert the data back when * locking them. */ - d3dfmt_get_conv(dst_surface, TRUE, &dst_conv_fmt, &dst_convert_type); + d3dfmt_get_conv(dst_surface->container, TRUE, &dst_conv_fmt, &dst_convert_type); if (dst_convert_type != WINED3D_CT_NONE || dst_conv_fmt.convert || dst_surface->flags & SFLAG_CONVERTED) { WARN_(d3d_perf)("Converted surface, using CPU blit.\n");

1 0

Henri Verbeet : wined3d: Get rid of the "use_texturing" parameter to d3dfmt_get_conv().
by Alexandre Julliard Sept. 30, 2014

Sept. 30, 2014

Module: wine Branch: master Commit: 6323a26f6caebe8109b59b27cb74e62674e9a99e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6323a26f6caebe8109b59b27c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 30 07:59:20 2014 +0200 wined3d: Get rid of the "use_texturing" parameter to d3dfmt_get_conv(). --- dlls/wined3d/surface.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index b7868dc..d6adf8c 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1585,7 +1585,7 @@ static void surface_upload_data(struct wined3d_surface *surface, const struct wi } } -static HRESULT d3dfmt_get_conv(const struct wined3d_surface *surface, BOOL need_alpha_ck, BOOL use_texturing, +static void d3dfmt_get_conv(const struct wined3d_surface *surface, BOOL need_alpha_ck, struct wined3d_format *format, enum wined3d_conversion_type *conversion_type) { BOOL colorkey_active = need_alpha_ck && (surface->container->color_key_flags & WINEDDSD_CKSRCBLT); @@ -1635,8 +1635,7 @@ static HRESULT d3dfmt_get_conv(const struct wined3d_surface *surface, BOOL need_ /* FIXME: This should check if the blitter backend can do P8 * conversion, instead of checking for ARB_fragment_program. */ if (!((gl_info->supported[ARB_FRAGMENT_PROGRAM] && surface->container->swapchain - && surface->container == surface->container->swapchain->front_buffer)) - || colorkey_active || !use_texturing) + && surface->container == surface->container->swapchain->front_buffer)) || colorkey_active) { *conversion_type = WINED3D_CT_PALETTED; format->glInternal = GL_RGBA; @@ -1657,8 +1656,6 @@ static HRESULT d3dfmt_get_conv(const struct wined3d_surface *surface, BOOL need_ format->rtInternal = format->glInternal; format->glGammaInternal = format->glInternal; } - - return WINED3D_OK; } static BOOL surface_check_block_align(struct wined3d_surface *surface, const RECT *rect) @@ -1765,7 +1762,7 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P } /* Use wined3d_surface_blt() instead of uploading directly if we need conversion. */ - d3dfmt_get_conv(dst_surface, FALSE, TRUE, &format, &convert); + d3dfmt_get_conv(dst_surface, FALSE, &format, &convert); if (convert != WINED3D_CT_NONE || format.convert) return wined3d_surface_blt(dst_surface, &dst_rect, src_surface, src_rect, 0, NULL, WINED3D_TEXF_POINT); @@ -3098,7 +3095,7 @@ static void surface_prepare_texture_internal(struct wined3d_surface *surface, if (surface->flags & alloc_flag) return; - d3dfmt_get_conv(surface, TRUE, TRUE, &format, &convert); + d3dfmt_get_conv(surface, TRUE, &format, &convert); if (convert != WINED3D_CT_NONE || format.convert) surface->flags |= SFLAG_CONVERTED; else surface->flags &= ~SFLAG_CONVERTED; @@ -4521,8 +4518,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, /* Upload from system memory */ - d3dfmt_get_conv(surface, TRUE /* We need color keying */, - TRUE /* We will use textures */, &format, &convert); + d3dfmt_get_conv(surface, TRUE /* We need color keying */, &format, &convert); if (srgb) { @@ -5670,7 +5666,7 @@ HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const REC /* We want to avoid invalidating the sysmem location for converted * surfaces, since otherwise we'd have to convert the data back when * locking them. */ - d3dfmt_get_conv(dst_surface, TRUE, TRUE, &dst_conv_fmt, &dst_convert_type); + d3dfmt_get_conv(dst_surface, TRUE, &dst_conv_fmt, &dst_convert_type); if (dst_convert_type != WINED3D_CT_NONE || dst_conv_fmt.convert || dst_surface->flags & SFLAG_CONVERTED) { WARN_(d3d_perf)("Converted surface, using CPU blit.\n");

1 0

Jacek Caban : jscript: Return double from parse_numeric_literal and parse_double_literal.
by Alexandre Julliard Sept. 30, 2014

Sept. 30, 2014

Module: wine Branch: master Commit: 166c97d549acca63494c9e8ebf6c6c7d2eb296d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=166c97d549acca63494c9e8eb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 30 16:51:24 2014 +0200 jscript: Return double from parse_numeric_literal and parse_double_literal. --- dlls/jscript/lex.c | 58 +++++++++++++++++++++++++++++++++++------------------- 1 file changed, 38 insertions(+), 20 deletions(-) diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c index 7318838..1796aed 100644 --- a/dlls/jscript/lex.c +++ b/dlls/jscript/lex.c @@ -388,7 +388,7 @@ literal_t *new_boolean_literal(parser_ctx_t *ctx, BOOL bval) return ret; } -static int parse_double_literal(parser_ctx_t *ctx, LONG int_part, literal_t **literal) +static BOOL parse_double_literal(parser_ctx_t *ctx, LONG int_part, double *ret) { LONGLONG d, hlp; int exp = 0; @@ -435,13 +435,15 @@ static int parse_double_literal(parser_ctx_t *ctx, LONG int_part, literal_t **li ctx->ptr++; }else if(!isdigitW(*ctx->ptr)) { WARN("Expected exponent part\n"); - return lex_error(ctx, E_FAIL); + lex_error(ctx, E_FAIL); + return FALSE; } } if(ctx->ptr == ctx->end) { WARN("unexpected end of file\n"); - return lex_error(ctx, E_FAIL); + lex_error(ctx, E_FAIL); + return FALSE; } while(ctx->ptr < ctx->end && isdigitW(*ctx->ptr)) { @@ -457,14 +459,15 @@ static int parse_double_literal(parser_ctx_t *ctx, LONG int_part, literal_t **li if(is_identifier_char(*ctx->ptr)) { WARN("wrong char after zero\n"); - return lex_error(ctx, JS_E_MISSING_SEMICOLON); + lex_error(ctx, JS_E_MISSING_SEMICOLON); + return FALSE; } - *literal = new_double_literal(ctx, exp>=0 ? d*pow(10, exp) : d/pow(10, -exp)); - return tNumericLiteral; + *ret = exp>=0 ? d*pow(10, exp) : d/pow(10, -exp); + return TRUE; } -static int parse_numeric_literal(parser_ctx_t *ctx, literal_t **literal) +static BOOL parse_numeric_literal(parser_ctx_t *ctx, double *ret) { LONG l, d; @@ -473,7 +476,7 @@ static int parse_numeric_literal(parser_ctx_t *ctx, literal_t **literal) if(*ctx->ptr == 'x' || *ctx->ptr == 'X') { if(++ctx->ptr == ctx->end) { ERR("unexpected end of file\n"); - return 0; + return FALSE; } while(ctx->ptr < ctx->end && (d = hex_to_int(*ctx->ptr)) != -1) { @@ -483,11 +486,12 @@ static int parse_numeric_literal(parser_ctx_t *ctx, literal_t **literal) if(ctx->ptr < ctx->end && is_identifier_char(*ctx->ptr)) { WARN("unexpected identifier char\n"); - return lex_error(ctx, JS_E_MISSING_SEMICOLON); + lex_error(ctx, JS_E_MISSING_SEMICOLON); + return FALSE; } - *literal = new_double_literal(ctx, l); - return tNumericLiteral; + *ret = l; + return TRUE; } if(isdigitW(*ctx->ptr)) { @@ -509,20 +513,22 @@ static int parse_numeric_literal(parser_ctx_t *ctx, literal_t **literal) /* FIXME: Do we need it here? */ if(ctx->ptr < ctx->end && (is_identifier_char(*ctx->ptr) || *ctx->ptr == '.')) { WARN("wrong char after octal literal: '%c'\n", *ctx->ptr); - return lex_error(ctx, JS_E_MISSING_SEMICOLON); + lex_error(ctx, JS_E_MISSING_SEMICOLON); + return FALSE; } - *literal = new_double_literal(ctx, val); - return tNumericLiteral; + *ret = val; + return TRUE; } if(is_identifier_char(*ctx->ptr)) { WARN("wrong char after zero\n"); - return lex_error(ctx, JS_E_MISSING_SEMICOLON); + lex_error(ctx, JS_E_MISSING_SEMICOLON); + return FALSE; } } - return parse_double_literal(ctx, l, literal); + return parse_double_literal(ctx, l, ret); } static int next_token(parser_ctx_t *ctx, void *lval) @@ -550,8 +556,15 @@ static int next_token(parser_ctx_t *ctx, void *lval) return parse_identifier(ctx, lval); } - if(isdigitW(*ctx->ptr)) - return parse_numeric_literal(ctx, lval); + if(isdigitW(*ctx->ptr)) { + double n; + + if(!parse_numeric_literal(ctx, &n)) + return -1; + + *(literal_t**)lval = new_double_literal(ctx, n); + return tNumericLiteral; + } switch(*ctx->ptr) { case '{': @@ -571,8 +584,13 @@ static int next_token(parser_ctx_t *ctx, void *lval) return '}'; case '.': - if(++ctx->ptr < ctx->end && isdigitW(*ctx->ptr)) - return parse_double_literal(ctx, 0, lval); + if(++ctx->ptr < ctx->end && isdigitW(*ctx->ptr)) { + double n; + if(!parse_double_literal(ctx, 0, &n)) + return -1; + *(literal_t**)lval = new_double_literal(ctx, n); + return tNumericLiteral; + } return '.'; case '<':

1 0

Jacek Caban : mshtml: Removed no longer needed assert.
by Alexandre Julliard Sept. 30, 2014

Sept. 30, 2014

Module: wine Branch: master Commit: 9550189b4f6ee6835cd666ad502e3c403408bd99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9550189b4f6ee6835cd666ad5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 30 10:14:14 2014 +0200 mshtml: Removed no longer needed assert. --- dlls/mshtml/htmlframebase.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/mshtml/htmlframebase.c b/dlls/mshtml/htmlframebase.c index 92421b5..9808379 100644 --- a/dlls/mshtml/htmlframebase.c +++ b/dlls/mshtml/htmlframebase.c @@ -709,7 +709,6 @@ void HTMLFrameBase_Init(HTMLFrameBase *This, HTMLDocumentNode *doc, nsIDOMHTMLEl nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLIFrameElement, (void**)&This->nsiframe); assert(nsres == NS_OK); }else { - assert((nsIDOMNode*)This->nsframe == This->element.node.nsnode); This->nsiframe = NULL; } }

1 0

Henri Verbeet : wined3d: Use wined3d_texture_set_color_key() to manipulate the color-key in surface_blt_special().
by Alexandre Julliard Sept. 30, 2014

Sept. 30, 2014

Module: wine Branch: master Commit: a8ab56941577a01e17b947cddd374ba52ffd8245 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8ab56941577a01e17b947cdd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 30 07:59:18 2014 +0200 wined3d: Use wined3d_texture_set_color_key() to manipulate the color-key in surface_blt_special(). --- dlls/wined3d/surface.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 955c1b6..f8ea858 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4116,13 +4116,12 @@ static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RE else if (flags & WINEDDBLT_KEYSRCOVERRIDE) { /* Use color key from DDBltFx */ - src_surface->container->color_key_flags |= WINEDDSD_CKSRCBLT; - src_surface->container->src_blt_color_key = DDBltFx->ddckSrcColorkey; + wined3d_texture_set_color_key(src_surface->container, WINEDDSD_CKSRCBLT, &DDBltFx->ddckSrcColorkey); } else { /* Do not use color key */ - src_surface->container->color_key_flags &= ~WINEDDSD_CKSRCBLT; + wined3d_texture_set_color_key(src_surface->container, WINEDDSD_CKSRCBLT, NULL); } surface_blt_to_drawable(device, filter, @@ -4130,8 +4129,8 @@ static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RE src_surface, src_rect, dst_surface, dst_rect); /* Restore the color key parameters */ - src_surface->container->color_key_flags = old_color_key_flags; - src_surface->container->src_blt_color_key = old_blt_key; + wined3d_texture_set_color_key(src_surface->container, WINEDDSD_CKSRCBLT, + (old_color_key_flags & WINEDDSD_CKSRCBLT) ? &old_blt_key : NULL); surface_validate_location(dst_surface, dst_surface->container->resource.draw_binding); surface_invalidate_location(dst_surface, ~dst_surface->container->resource.draw_binding);

1 0

Qian Hong : winmm: Also initialize sound device thread in mixerGetControlDetails.
by Alexandre Julliard Sept. 29, 2014

Sept. 29, 2014

Module: wine Branch: master Commit: b3ebdd904c53231a4f721cf25821da49cf4fbb9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3ebdd904c53231a4f721cf25… Author: Qian Hong <qhong(a)codeweavers.com> Date: Tue Sep 30 00:25:36 2014 +0800 winmm: Also initialize sound device thread in mixerGetControlDetails. Fixed volume control in EveryonePiano. --- dlls/winmm/waveform.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 6b259ff..8d7f8ad 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -3850,12 +3850,10 @@ UINT WINAPI mixerGetControlDetailsW(HMIXEROBJ hmix, LPMIXERCONTROLDETAILS lpmcdW DWORD fdwDetails) { WINMM_ControlDetails details; - HRESULT hr; TRACE("(%p, %p, %x)\n", hmix, lpmcdW, fdwDetails); - hr = WINMM_InitMMDevices(); - if(FAILED(hr)) + if(!WINMM_StartDevicesThread()) return MMSYSERR_NODRIVER; if(!lpmcdW || !lpmcdW->paDetails)

1 0

Piotr Caban : user32/tests: Add initial WindowFromPoint tests.
by Alexandre Julliard Sept. 29, 2014

Sept. 29, 2014

Module: wine Branch: master Commit: d137a95fda3f0aeacec98ffeb9448c9c4cf3d23e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d137a95fda3f0aeacec98ffeb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 29 18:02:13 2014 +0200 user32/tests: Add initial WindowFromPoint tests. --- dlls/user32/tests/win.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index bf9bb2c..f59c1dc 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -7200,6 +7200,44 @@ todo_wine ok(ret, "UnregisterClass(my_window) failed\n"); } +static void test_window_from_point(void) +{ + HWND hwnd, child, win; + POINT pt; + + hwnd = CreateWindowExA(0, "MainWindowClass", NULL, WS_POPUP | WS_VISIBLE, + 100, 100, 200, 100, 0, 0, NULL, NULL); + ok(hwnd != 0, "CreateWindowEx failed\n"); + + pt.x = pt.y = 150; + win = WindowFromPoint(pt); + pt.x = 250; + if(win == hwnd) + win = WindowFromPoint(pt); + if(win != hwnd) { + skip("there's another window covering test window\n"); + DestroyWindow(hwnd); + return; + } + + child = CreateWindowExA(0, "static", "static", WS_CHILD | WS_VISIBLE, + 0, 0, 100, 100, hwnd, 0, NULL, NULL); + ok(child != 0, "CreateWindowEx failed\n"); + pt.x = pt.y = 150; + win = WindowFromPoint(pt); + ok(win == hwnd, "WindowFromPoint returned %p, expected %p\n", win, hwnd); + DestroyWindow(child); + + child = CreateWindowExA(0, "button", "button", WS_CHILD | WS_VISIBLE, + 0, 0, 100, 100, hwnd, 0, NULL, NULL); + ok(child != 0, "CreateWindowEx failed\n"); + win = WindowFromPoint(pt); + ok(win == child, "WindowFromPoint returned %p, expected %p\n", win, child); + DestroyWindow(child); + + DestroyWindow(hwnd); +} + static void test_map_points(void) { BOOL ret; @@ -7745,6 +7783,7 @@ START_TEST(win) /* Add the tests below this line */ test_child_window_from_point(); + test_window_from_point(); test_thick_child_size(hwndMain); test_fullscreen(); test_hwnd_message();

1 0

Henri Verbeet : wined3d: Get rid of SFLAG_DONOTFREE.
by Alexandre Julliard Sept. 29, 2014

Sept. 29, 2014

Module: wine Branch: master Commit: 2d5c8aff3ccbbdcf3a8c9d6e3262d894684d1a9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d5c8aff3ccbbdcf3a8c9d6e3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 29 09:11:55 2014 +0200 wined3d: Get rid of SFLAG_DONOTFREE. --- dlls/wined3d/surface.c | 7 ++++++- dlls/wined3d/wined3d_private.h | 10 ---------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index add864a..955c1b6 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -587,7 +587,12 @@ void surface_prepare_map_memory(struct wined3d_surface *surface) static void surface_evict_sysmem(struct wined3d_surface *surface) { - if (surface->resource.map_count || surface->flags & SFLAG_DONOTFREE) + /* In some conditions the surface memory must not be freed: + * SFLAG_CONVERTED: Converting the data back would take too long + * SFLAG_DYNLOCK: Avoid freeing the data for performance + * SFLAG_CLIENT: OpenGL uses our memory as backup */ + if (surface->resource.map_count || surface->flags & (SFLAG_CONVERTED | SFLAG_DYNLOCK + | SFLAG_CLIENT | SFLAG_PIN_SYSMEM)) return; wined3d_resource_free_sysmem(&surface->resource); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 76ac66a..110334b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2350,16 +2350,6 @@ void flip_surface(struct wined3d_surface *front, struct wined3d_surface *back) D #define SFLAG_ALLOCATED 0x00000800 /* A GL texture is allocated for this surface. */ #define SFLAG_SRGBALLOCATED 0x00001000 /* A sRGB GL texture is allocated for this surface. */ -/* In some conditions the surface memory must not be freed: - * SFLAG_CONVERTED: Converting the data back would take too long - * SFLAG_DYNLOCK: Avoid freeing the data for performance - * SFLAG_CLIENT: OpenGL uses our memory as backup - */ -#define SFLAG_DONOTFREE (SFLAG_CONVERTED | \ - SFLAG_DYNLOCK | \ - SFLAG_CLIENT | \ - SFLAG_PIN_SYSMEM) - enum wined3d_conversion_type { WINED3D_CT_NONE,

1 0

Henri Verbeet : wined3d: Replace wined3d_surface_update_desc() with wined3d_texture_update_desc().
by Alexandre Julliard Sept. 29, 2014

Sept. 29, 2014

Module: wine Branch: master Commit: 97856bcfee78122060e2caf80ad16804074401d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97856bcfee78122060e2caf80… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 29 09:11:54 2014 +0200 wined3d: Replace wined3d_surface_update_desc() with wined3d_texture_update_desc(). --- dlls/d3d9/device.c | 14 ++++-------- dlls/ddraw/surface.c | 4 ++-- dlls/wined3d/device.c | 6 ++--- dlls/wined3d/surface.c | 52 +++++++++++------------------------------- dlls/wined3d/texture.c | 48 ++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d.spec | 2 +- dlls/wined3d/wined3d_private.h | 2 ++ include/wine/wined3d.h | 8 +++---- 8 files changed, 76 insertions(+), 60 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=97856bcfee78122060e2c…

1 0