October 2014 - Wine-commits

Alexandre Julliard : Import of upstream bugzilla release 4.4.6.
by Alexandre Julliard 07 Oct '14

07 Oct '14

1 0

Alexandre Julliard : Merge branch 'upstream'.
by Alexandre Julliard 07 Oct '14

07 Oct '14

Module: bugzilla Branch: master Commit: 4aa9cb17e1cb97fcef476441f57687ca7c0a67ca URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=4aa9cb17e1cb97fcef476… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 7 17:14:08 2014 +0200 Merge branch 'upstream'. ---

1 0

Alexandre Julliard : Import of upstream bugzilla release 4.4.6.
by Alexandre Julliard 07 Oct '14

07 Oct '14

1 0

Henri Verbeet : wined3d: Just use glGammaInternal/ rtInternal from the destination format in d3dfmt_get_conv().
by Alexandre Julliard 06 Oct '14

06 Oct '14

Module: wine Branch: master Commit: b0ce89d81015fe23ecc4584e1e2dea17960e5c33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0ce89d81015fe23ecc4584e1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 6 08:24:18 2014 +0200 wined3d: Just use glGammaInternal/rtInternal from the destination format in d3dfmt_get_conv(). Using glGammaInternal or rtInternal should do the right thing in principle, although in practice they should never get used either way. --- dlls/wined3d/surface.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index a8e0f51..41dc2ac 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1649,8 +1649,8 @@ static void d3dfmt_get_conv(const struct wined3d_texture *texture, BOOL need_alp { dst_format = wined3d_get_format(gl_info, dst_format_id); format->glInternal = dst_format->glInternal; - format->glGammaInternal = format->glInternal; - format->rtInternal = format->glInternal; + format->glGammaInternal = dst_format->glGammaInternal; + format->rtInternal = dst_format->rtInternal; format->glFormat = dst_format->glFormat; format->glType = dst_format->glType; format->conv_byte_count = dst_format->byte_count;

1 0

Henri Verbeet : wined3d: Don' t abuse conv_byte_count for color-key conversions.
by Alexandre Julliard 06 Oct '14

06 Oct '14

Module: wine Branch: master Commit: dffcc36dd4c0da91de692aa93c4a1ffb953d4e37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dffcc36dd4c0da91de692aa93… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 6 08:24:19 2014 +0200 wined3d: Don't abuse conv_byte_count for color-key conversions. --- dlls/wined3d/surface.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 41dc2ac..9d41fef 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1653,7 +1653,7 @@ static void d3dfmt_get_conv(const struct wined3d_texture *texture, BOOL need_alp format->rtInternal = dst_format->rtInternal; format->glFormat = dst_format->glFormat; format->glType = dst_format->glType; - format->conv_byte_count = dst_format->byte_count; + format->byte_count = dst_format->byte_count; } } @@ -4611,8 +4611,8 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, /* This code is entered for texture formats which need a fixup. */ UINT height = surface->resource.height; - /* Stick to the alignment for the converted surface too, makes it easier to load the surface */ - dst_pitch = width * format.conv_byte_count; + format.byte_count = format.conv_byte_count; + dst_pitch = wined3d_format_calculate_pitch(&format, width); dst_pitch = (dst_pitch + device->surface_alignment - 1) & ~(device->surface_alignment - 1); if (!(mem = HeapAlloc(GetProcessHeap(), 0, dst_pitch * height))) @@ -4623,7 +4623,6 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, } format.convert(data.addr, mem, src_pitch, src_pitch * height, dst_pitch, dst_pitch * height, width, height, 1); - format.byte_count = format.conv_byte_count; src_pitch = dst_pitch; data.addr = mem; } @@ -4632,8 +4631,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, /* This code is only entered for color keying fixups */ UINT height = surface->resource.height; - /* Stick to the alignment for the converted surface too, makes it easier to load the surface */ - dst_pitch = width * format.conv_byte_count; + dst_pitch = wined3d_format_calculate_pitch(&format, width); dst_pitch = (dst_pitch + device->surface_alignment - 1) & ~(device->surface_alignment - 1); if (!(mem = HeapAlloc(GetProcessHeap(), 0, dst_pitch * height))) @@ -4644,7 +4642,6 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, } d3dfmt_convert_surface(data.addr, mem, src_pitch, width, height, dst_pitch, convert, surface); - format.byte_count = format.conv_byte_count; src_pitch = dst_pitch; data.addr = mem; }

1 0

Henri Verbeet : wined3d: Print a FIXME for any unhandled format in d3dfmt_get_conv().
by Alexandre Julliard 06 Oct '14

06 Oct '14

Module: wine Branch: master Commit: c5bf229287b820b26f8fe9d7f5cbd7ec0b369f9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5bf229287b820b26f8fe9d7f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 6 08:24:20 2014 +0200 wined3d: Print a FIXME for any unhandled format in d3dfmt_get_conv(). --- dlls/wined3d/surface.c | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 9d41fef..f2be4c9 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1625,24 +1625,18 @@ static void d3dfmt_get_conv(const struct wined3d_texture *texture, BOOL need_alp dst_format_id = color_key_info[i].dst_format; break; } - } - 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] && texture->swapchain - && texture == texture->swapchain->front_buffer)) || colorkey_active) - { - *conversion_type = WINED3D_CT_P8; - dst_format_id = WINED3DFMT_B8G8R8A8_UNORM; - } + FIXME("Color-keying not supported with format %s.\n", debug_d3dformat(texture->resource.format->id)); } - else if (texture->resource.format->id == WINED3DFMT_B2G3R3_UNORM && colorkey_active) + + /* FIXME: This should check if the blitter backend can do P8 conversion, + * instead of checking for ARB_fragment_program. */ + if (texture->resource.format->id == WINED3DFMT_P8_UINT + && (!(gl_info->supported[ARB_FRAGMENT_PROGRAM] && texture->swapchain + && texture == texture->swapchain->front_buffer) || 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"); + *conversion_type = WINED3D_CT_P8; + dst_format_id = WINED3DFMT_B8G8R8A8_UNORM; } if (*conversion_type != WINED3D_CT_NONE)

1 0

Henri Verbeet : wined3d: Don't check for color-keying for WINED3D_CT_P8.
by Alexandre Julliard 06 Oct '14

06 Oct '14

Module: wine Branch: master Commit: fd342cce3eb780567ee3c9278e097bc7a1575d77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd342cce3eb780567ee3c9278… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 6 08:24:21 2014 +0200 wined3d: Don't check for color-keying for WINED3D_CT_P8. We don't support p8 color keying either way. --- dlls/wined3d/surface.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index f2be4c9..ee51f6b 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1588,7 +1588,6 @@ static void surface_upload_data(struct wined3d_surface *surface, const struct wi 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 && (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; const struct wined3d_format *dst_format; @@ -1614,7 +1613,7 @@ static void d3dfmt_get_conv(const struct wined3d_texture *texture, BOOL need_alp *conversion_type = WINED3D_CT_NONE; dst_format_id = format->id; - if (colorkey_active) + if (need_alpha_ck && (texture->color_key_flags & WINEDDSD_CKSRCBLT)) { for (i = 0; i < sizeof(color_key_info) / sizeof(*color_key_info); ++i) { @@ -1632,8 +1631,8 @@ static void d3dfmt_get_conv(const struct wined3d_texture *texture, BOOL need_alp /* FIXME: This should check if the blitter backend can do P8 conversion, * instead of checking for ARB_fragment_program. */ if (texture->resource.format->id == WINED3DFMT_P8_UINT - && (!(gl_info->supported[ARB_FRAGMENT_PROGRAM] && texture->swapchain - && texture == texture->swapchain->front_buffer) || colorkey_active)) + && !(gl_info->supported[ARB_FRAGMENT_PROGRAM] && texture->swapchain + && texture == texture->swapchain->front_buffer)) { *conversion_type = WINED3D_CT_P8; dst_format_id = WINED3DFMT_B8G8R8A8_UNORM;

1 0

Nikolay Sivov : dwrite: Initial implementation of GetGlyphs().
by Alexandre Julliard 06 Oct '14

06 Oct '14

Module: wine Branch: master Commit: 1843972e0e223a98e0c815e7e5f6be668d15a347 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1843972e0e223a98e0c815e7e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 5 17:07:46 2014 +0400 dwrite: Initial implementation of GetGlyphs(). --- dlls/dwrite/Makefile.in | 3 +- dlls/dwrite/analyzer.c | 116 ++++++++++++++++++++++++++++++++-- dlls/dwrite/dwrite_private.h | 32 ++++++++++ dlls/dwrite/shape.c | 147 +++++++++++++++++++++++++++++++++++++++++++ dlls/dwrite/tests/analyzer.c | 112 ++++++++++++++++++++++++++------- 5 files changed, 382 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1843972e0e223a98e0c81…

1 0

Nikolay Sivov : dwrite: Mirror characters in case of RTL direction.
by Alexandre Julliard 06 Oct '14

06 Oct '14

Module: wine Branch: master Commit: 370407291111af7a8d4032b57bdb6c285cec6162 URL: http://source.winehq.org/git/wine.git/?a=commit;h=370407291111af7a8d4032b57… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 5 17:16:49 2014 +0400 dwrite: Mirror characters in case of RTL direction. --- dlls/dwrite/Makefile.in | 1 + dlls/dwrite/analyzer.c | 3 +- dlls/dwrite/bidi.c | 6 + dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/mirror.c | 437 +++++++++++++++++++++++++++++++++++++++++++ dlls/dwrite/tests/analyzer.c | 15 ++ tools/make_unicode | 1 + 7 files changed, 462 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=370407291111af7a8d403…

1 0

Piotr Caban : oleacc: Fix allocation error handling in ObjectFromLresult.
by Alexandre Julliard 06 Oct '14

06 Oct '14

Module: wine Branch: master Commit: 964ab4b6f22fa7930024b8d0475605b0c57a840c URL: http://source.winehq.org/git/wine.git/?a=commit;h=964ab4b6f22fa7930024b8d04… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 6 10:57:49 2014 +0200 oleacc: Fix allocation error handling in ObjectFromLresult. --- dlls/oleacc/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleacc/main.c b/dlls/oleacc/main.c index 18a43fb..e5fe6cd 100644 --- a/dlls/oleacc/main.c +++ b/dlls/oleacc/main.c @@ -219,10 +219,10 @@ HRESULT WINAPI ObjectFromLresult( LRESULT result, REFIID riid, WPARAM wParam, vo return E_FAIL; data = GlobalAlloc(GMEM_FIXED, size); - memcpy(data, view, size); - UnmapViewOfFile(view); if(!data) return E_OUTOFMEMORY; + memcpy(data, view, size); + UnmapViewOfFile(view); hr = CreateStreamOnHGlobal(data, TRUE, &stream); if(FAILED(hr)) {

1 0