September 2014 - Wine-commits

André Hentschel : Add WWN 376
by Jeremy Newman 30 Sep '14

30 Sep '14

Module: website Branch: master Commit: bcecd9e369defb582e129d5391cf53b122245c1a URL: http://source.winehq.org/git/website.git/?a=commit;h=bcecd9e369defb582e129d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Sep 30 23:12:12 2014 +0200 Add WWN 376 --- news/de/2014093001.xml | 13 + news/en/2014093001.xml | 13 + wwn/en/wn20140930_376.xml | 613 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 639 insertions(+) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=bcecd9e369defb582e…

1 0

Jacek Caban : jscript: Added conditional compilation @set support.
by Alexandre Julliard 30 Sep '14

30 Sep '14

Module: wine Branch: master Commit: 5ec69474cf52c4f2f28a230d093455e46a728d0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ec69474cf52c4f2f28a230d0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 30 16:51:57 2014 +0200 jscript: Added conditional compilation @set support. --- dlls/jscript/Makefile.in | 1 + dlls/jscript/cc_parser.y | 123 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/jscript/jscript.h | 4 ++ dlls/jscript/jscript.rc | 4 ++ dlls/jscript/lex.c | 94 +++++++++++++++++++++++++++++++++++- dlls/jscript/parser.h | 15 ++++++ dlls/jscript/resource.h | 4 ++ po/ar.po | 72 ++++++++++++++++++--------- po/bg.po | 64 +++++++++++++++--------- po/ca.po | 72 ++++++++++++++++++--------- po/cs.po | 72 ++++++++++++++++++--------- po/da.po | 72 ++++++++++++++++++--------- po/de.po | 72 ++++++++++++++++++--------- po/el.po | 64 +++++++++++++++--------- po/en.po | 64 +++++++++++++++--------- po/en_US.po | 64 +++++++++++++++--------- po/eo.po | 64 +++++++++++++++--------- po/es.po | 72 ++++++++++++++++++--------- po/fa.po | 64 +++++++++++++++--------- po/fi.po | 72 ++++++++++++++++++--------- po/fr.po | 72 ++++++++++++++++++--------- po/he.po | 68 +++++++++++++++++--------- po/hi.po | 64 +++++++++++++++--------- po/hr.po | 72 ++++++++++++++++++--------- po/hu.po | 72 ++++++++++++++++++--------- po/it.po | 72 ++++++++++++++++++--------- po/ja.po | 72 ++++++++++++++++++--------- po/ko.po | 72 ++++++++++++++++++--------- po/lt.po | 72 ++++++++++++++++++--------- po/ml.po | 64 +++++++++++++++--------- po/nb_NO.po | 72 ++++++++++++++++++--------- po/nl.po | 72 ++++++++++++++++++--------- po/or.po | 64 +++++++++++++++--------- po/pa.po | 64 +++++++++++++++--------- po/pl.po | 72 ++++++++++++++++++--------- po/pt_BR.po | 72 ++++++++++++++++++--------- po/pt_PT.po | 72 ++++++++++++++++++--------- po/rm.po | 64 +++++++++++++++--------- po/ro.po | 72 ++++++++++++++++++--------- po/ru.po | 72 ++++++++++++++++++--------- po/sk.po | 64 +++++++++++++++--------- po/sl.po | 72 ++++++++++++++++++--------- po/sr_RS(a)cyrillic.po | 70 ++++++++++++++++++--------- po/sr_RS(a)latin.po | 70 ++++++++++++++++++--------- po/sv.po | 70 ++++++++++++++++++--------- po/te.po | 64 +++++++++++++++--------- po/th.po | 64 +++++++++++++++--------- po/tr.po | 72 ++++++++++++++++++--------- po/uk.po | 72 ++++++++++++++++++--------- po/wa.po | 64 +++++++++++++++--------- po/wine.pot | 64 +++++++++++++++--------- po/zh_CN.po | 64 +++++++++++++++--------- po/zh_TW.po | 72 ++++++++++++++++++--------- 53 files changed, 2305 insertions(+), 1106 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5ec69474cf52c4f2f28a2…

1 0

Jacek Caban : jscript/tests: Added @set tests.
by Alexandre Julliard 30 Sep '14

30 Sep '14

Module: wine Branch: master Commit: ad842c42f07562ebd8b3d4e8da0a02d1dbdd5177 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad842c42f07562ebd8b3d4e8d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 30 16:52:03 2014 +0200 jscript/tests: Added @set tests. --- dlls/jscript/tests/cc.js | 93 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 93 insertions(+) diff --git a/dlls/jscript/tests/cc.js b/dlls/jscript/tests/cc.js index 1fee93f..b96f21e 100644 --- a/dlls/jscript/tests/cc.js +++ b/dlls/jscript/tests/cc.js @@ -72,4 +72,97 @@ try { } ok(tmp, "expected syntax exception"); +ok(isNaN(@test), "@test = " + @test); + +(a)set @test = 1 +ok(@test === 1, "@test = " + @test); + +(a)set @test = 0 +ok(@test === 0, "@test = " + @test); + +tmp = false +(a)set @test = @test tmp=true +ok(@test === 0, "@test = " + @test); +ok(tmp, "expr after @set not evaluated"); + +(a)set @test = !@test +ok(@test === true, "@test = " + @test); + +(a)set @test = (@test+1+true) +ok(@test === 3, "@test = " + @test); + +(a)set + @test + = + 2 +ok(@test === 2, "@test = " + @test); + +(a)set + @test + = + ( + 2 + + + 2 + ) +ok(@test === 4, "@test = " + @test); + +(a)set @test = 2.5 +ok(@test === 2.5, "@test = " + @test); + +(a)set @test = 0x4 +ok(@test === 4, "@test = " + @test); + +(a)set @test = (2 + 2/2) +ok(@test === 3, "@test = " + @test); + +(a)set @test = (false+false) +ok(@test === 0, "@test = " + @test); + +(a)set @test = ((1+1)*((3)+1)) +ok(@test === 8, "@test = " + @test); + +(a)set @_test = true +ok(@_test === true, "@_test = " + @_test); + +(a)set @$test = true +ok(@$test === true, "@$test = " + @$test); + +(a)set @newtest = (@newtest != @newtest) +ok(@newtest === true, "@newtest = " + @newtest); + +(a)set @test = (false != 0) +ok(@test === false, "@test = " + @test); + +(a)set @test = (1 != true) +ok(@test === false, "@test = " + @test); + +(a)set @test = (0 != true) +ok(@test === true, "@test = " + @test); + +var exception_map = { + JS_E_EXPECTED_IDENTIFIER: {type: "SyntaxError", number: -2146827278}, + JS_E_EXPECTED_ASSIGN: {type: "SyntaxError", number: -2146827277}, + JS_E_EXPECTED_AT: {type: "SyntaxError", number: -2146827256} +}; + +function testException(src, id) { + var ex = exception_map[id]; + var ret = "", num = ""; + + try { + eval(src); + } catch(e) { + ret = e.name; + num = e.number; + } + + ok(ret === ex.type, "Exception test, ret = " + ret + ", expected " + ex.type +". Executed code: " + src); + ok(num === ex.number, "Exception test, num = " + num + ", expected " + ex.number + ". Executed function: " + src); +} + +testException("@set test=true", "JS_E_EXPECTED_AT"); +testException("@set @1=true", "JS_E_EXPECTED_IDENTIFIER"); +testException("@set @test x=true", "JS_E_EXPECTED_ASSIGN"); + reportSuccess();

1 0

Jactry Zeng : riched20: Set editor-> reOle to NULL when IRichEditOle is released.
by Alexandre Julliard 30 Sep '14

30 Sep '14

Module: wine Branch: master Commit: a3b8065600ec43349a65a707e45bf4c8ed111360 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3b8065600ec43349a65a707e… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Tue Sep 30 20:11:55 2014 +0800 riched20: Set editor->reOle to NULL when IRichEditOle is released. --- dlls/riched20/richole.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index f7e7870..9e7c123 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -142,6 +142,7 @@ IRichEditOle_fnRelease(IRichEditOle *me) ITextRangeImpl *txtRge; TRACE ("Destroying %p\n", This); This->txtSel->reOle = NULL; + This->editor->reOle = NULL; ITextSelection_Release(&This->txtSel->ITextSelection_iface); IOleClientSite_Release(&This->clientSite->IOleClientSite_iface); LIST_FOR_EACH_ENTRY(txtRge, &This->rangelist, ITextRangeImpl, entry)

1 0

Henri Verbeet : wined3d: Use a lookup table in d3dfmt_get_conv().
by Alexandre Julliard 30 Sep '14

30 Sep '14

Module: wine Branch: master Commit: 0932567faf10551f372d4caff0f66ba7cf18269b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0932567faf10551f372d4caff… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 30 07:59:19 2014 +0200 wined3d: Use a lookup table in d3dfmt_get_conv(). --- dlls/wined3d/surface.c | 154 +++++++++++++++++-------------------------------- 1 file changed, 52 insertions(+), 102 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index f8ea858..b7868dc 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1591,115 +1591,65 @@ static HRESULT d3dfmt_get_conv(const struct wined3d_surface *surface, BOOL need_ BOOL colorkey_active = need_alpha_ck && (surface->container->color_key_flags & WINEDDSD_CKSRCBLT); const struct wined3d_device *device = surface->resource.device; const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; - BOOL blit_supported = FALSE; + unsigned int i; + + static const struct + { + enum wined3d_format_id src_format; + enum wined3d_conversion_type conversion_type; + GLint gl_internal; + GLint gl_format; + GLint gl_type; + unsigned int conv_byte_count; + } + 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}, + }; - /* Copy the default values from the surface. Below we might perform fixups */ - /* TODO: get rid of color keying desc fixups by using e.g. a table. */ *format = *surface->resource.format; *conversion_type = WINED3D_CT_NONE; - /* Ok, now look if we have to do any conversion */ - switch (surface->resource.format->id) + if (colorkey_active) { - case WINED3DFMT_P8_UINT: - /* Below the call to blit_supported is disabled for Wine 1.2 - * because the function isn't operating correctly yet. At the - * moment 8-bit blits are handled in software and if certain GL - * extensions are around, surface conversion is performed at - * upload time. The blit_supported call recognizes it as a - * destination fixup. This type of upload 'fixup' and 8-bit to - * 8-bit blits need to be handled by the blit_shader. - * TODO: get rid of this #if 0. */ -#if 0 - blit_supported = device->blitter->blit_supported(&device->adapter->gl_info, WINED3D_BLIT_OP_COLOR_BLIT, - &rect, surface->resource.usage, surface->resource.pool, surface->resource.format, - &rect, surface->resource.usage, surface->resource.pool, surface->resource.format); -#endif - blit_supported = gl_info->supported[ARB_FRAGMENT_PROGRAM]; - - /* Use conversion when the blit_shader backend supports it. It only supports this in case of - * texturing. Further also use conversion in case of color keying. - * Paletted textures can be emulated using shaders but only do that for 2D purposes e.g. situations - * in which the main render target uses p8. Some games like GTA Vice City use P8 for texturing which - * conflicts with this. - */ - if (!((blit_supported && surface->container->swapchain - && surface->container == surface->container->swapchain->front_buffer)) - || colorkey_active || !use_texturing) - { - format->glFormat = GL_RGBA; - format->glInternal = GL_RGBA; - format->glType = GL_UNSIGNED_BYTE; - format->conv_byte_count = 4; - *conversion_type = WINED3D_CT_PALETTED; - } - break; - - case WINED3DFMT_B2G3R3_UNORM: - /* ********************** - GL_UNSIGNED_BYTE_3_3_2 - ********************** */ - if (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 :-) */ - FIXME(" ColorKeying not supported in the RGB 332 format !\n"); - } - break; - - case WINED3DFMT_B5G6R5_UNORM: - if (colorkey_active) - { - *conversion_type = WINED3D_CT_CK_565; - format->glFormat = GL_RGBA; - format->glInternal = GL_RGB5_A1; - format->glType = GL_UNSIGNED_SHORT_5_5_5_1; - format->conv_byte_count = 2; - } - break; - - case WINED3DFMT_B5G5R5X1_UNORM: - if (colorkey_active) - { - *conversion_type = WINED3D_CT_CK_5551; - format->glFormat = GL_BGRA; - format->glInternal = GL_RGB5_A1; - format->glType = GL_UNSIGNED_SHORT_1_5_5_5_REV; - format->conv_byte_count = 2; - } - break; - - case WINED3DFMT_B8G8R8_UNORM: - if (colorkey_active) - { - *conversion_type = WINED3D_CT_CK_RGB24; - format->glFormat = GL_RGBA; - format->glInternal = GL_RGBA8; - format->glType = GL_UNSIGNED_INT_8_8_8_8; - format->conv_byte_count = 4; - } - break; - - case WINED3DFMT_B8G8R8X8_UNORM: - if (colorkey_active) - { - *conversion_type = WINED3D_CT_RGB32_888; - format->glFormat = GL_RGBA; - format->glInternal = GL_RGBA8; - format->glType = GL_UNSIGNED_INT_8_8_8_8; - format->conv_byte_count = 4; - } - break; - - case WINED3DFMT_B8G8R8A8_UNORM: - if (colorkey_active) - { - *conversion_type = WINED3D_CT_CK_ARGB32; - format->conv_byte_count = 4; - } + for (i = 0; i < sizeof(color_key_info) / sizeof(*color_key_info); ++i) + { + if (color_key_info[i].src_format != surface->resource.format->id) + continue; + + *conversion_type = color_key_info[i].conversion_type; + format->glInternal = color_key_info[i].gl_internal; + format->glFormat = color_key_info[i].gl_format; + format->glType = color_key_info[i].gl_type; + format->conv_byte_count = color_key_info[i].conv_byte_count; break; + } + } - default: - break; + if (surface->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 || !use_texturing) + { + *conversion_type = WINED3D_CT_PALETTED; + format->glInternal = GL_RGBA; + format->glFormat = GL_RGBA; + format->glType = GL_UNSIGNED_BYTE; + format->conv_byte_count = 4; + } + } + else if (surface->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. */ + FIXME("Color-keying not supported with WINED3DFMT_B2G3R3_UNORM.\n"); } if (*conversion_type != WINED3D_CT_NONE)

1 0

Henri Verbeet : wined3d: Get rid of the "use_texturing" parameter to d3dfmt_get_conv().
by Alexandre Julliard 30 Sep '14

30 Sep '14

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

Henri Verbeet : wined3d: Pass a texture to d3dfmt_get_conv().
by Alexandre Julliard 30 Sep '14

30 Sep '14

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: Use a more consistent naming for wined3d_conversion_type elements.
by Alexandre Julliard 30 Sep '14

30 Sep '14

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

Jacek Caban : mshtml: Use proper type for text node in exec_hyperlink.
by Alexandre Julliard 30 Sep '14

30 Sep '14

Module: wine Branch: master Commit: 07751840acd8d9a7af2c0ebb47fff5810c11d858 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07751840acd8d9a7af2c0ebb4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 30 10:30:33 2014 +0200 mshtml: Use proper type for text node in exec_hyperlink. --- dlls/mshtml/editor.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index 14aab53..b059a95 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -1170,13 +1170,14 @@ static HRESULT exec_hyperlink(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, /* create an element with text of URL */ if (insert_link_at_caret) { - nsIDOMNode *text_node, *unused_node; + nsIDOMNode *unused_node; + nsIDOMText *text_node; - nsIDOMHTMLDocument_CreateTextNode(This->doc_node->nsdoc, &ns_url, (nsIDOMText **)&text_node); + nsIDOMHTMLDocument_CreateTextNode(This->doc_node->nsdoc, &ns_url, &text_node); /* wrap the <a> tags around the text element */ - nsIDOMHTMLElement_AppendChild(anchor_elem, text_node, &unused_node); - nsIDOMNode_Release(text_node); + nsIDOMHTMLElement_AppendChild(anchor_elem, (nsIDOMNode*)text_node, &unused_node); + nsIDOMText_Release(text_node); nsIDOMNode_Release(unused_node); }

1 0

Jacek Caban : mshtml: Don' t assume that nsIDOMHTMLElement inherits from nsIDOMNode in HTMLDocument_createStyleSheet.
by Alexandre Julliard 30 Sep '14

30 Sep '14

Module: wine Branch: master Commit: fc38aea9ba41652d134391c45e332da76e9f587f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc38aea9ba41652d134391c45… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 30 10:14:06 2014 +0200 mshtml: Don't assume that nsIDOMHTMLElement inherits from nsIDOMNode in HTMLDocument_createStyleSheet. This will change after the next Gecko update. --- dlls/mshtml/htmldoc.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 4837a89..a8d6d76 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1625,10 +1625,14 @@ static HRESULT WINAPI HTMLDocument_createStyleSheet(IHTMLDocument2 *iface, BSTR nsres = nsIDOMHTMLDocument_GetHead(This->doc_node->nsdoc, &head_elem); if(NS_SUCCEEDED(nsres)) { - nsIDOMNode *tmp_node; + nsIDOMNode *head_node, *tmp_node; - nsres = nsIDOMHTMLHeadElement_AppendChild(head_elem, (nsIDOMNode*)elem->nselem, &tmp_node); + nsres = nsIDOMHTMLHeadElement_QueryInterface(head_elem, &IID_nsIDOMNode, (void**)&head_node); nsIDOMHTMLHeadElement_Release(head_elem); + assert(nsres == NS_OK); + + nsres = nsIDOMNode_AppendChild(head_node, elem->node.nsnode, &tmp_node); + nsIDOMNode_Release(head_node); if(NS_SUCCEEDED(nsres) && tmp_node) nsIDOMNode_Release(tmp_node); }

1 0