March 2012 - Wine-commits - list.winehq.org

Aric Stewart : usp10: Add fallback font for Myanmar.
by Alexandre Julliard 27 Mar '12

27 Mar '12

Module: wine Branch: master Commit: 9f6217e8314d928fd3ccc95f0368a0bebb621fed URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f6217e8314d928fd3ccc95f0… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Mar 26 11:40:49 2012 -0500 usp10: Add fallback font for Myanmar. --- dlls/usp10/usp10.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 4d0d9f3..90b1259 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -492,7 +492,7 @@ const scriptData scriptInformation[] = { {{Script_Myanmar, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {0x55, 0, 1, 1, 1, DEFAULT_CHARSET, 0, 0, 0, 0, 1, 0, 0, 0, 0}, MS_MAKE_TAG('m','y','m','r'), - {0}}, + {'M','y','a','n','m','a','r',' ','T','e','x','t',0}}, {{Script_Myanmar_Numeric, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {0x55, 1, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, MS_MAKE_TAG('m','y','m','r'),

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 27 Mar '12

27 Mar '12

Module: wine Branch: master Commit: a57368243f0bb407263ea9ad808c599bbec94667 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a57368243f0bb407263ea9ad8… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Mon Mar 26 21:03:33 2012 +0300 po: Update Lithuanian translation. --- po/lt.po | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/po/lt.po b/po/lt.po index 574fb91..e9c99ac 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-03-13 20:55+0300\n" +"PO-Revision-Date: 2012-03-26 21:02+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -3460,10 +3460,8 @@ msgid "Expected ')'" msgstr "Tikėtasi „)“" #: jscript.rc:37 -#, fuzzy -#| msgid "Invalid parameter.\n" msgid "Invalid character" -msgstr "Neteisingas parametras.\n" +msgstr "Neteisingas simbolis" #: jscript.rc:38 msgid "Unterminated string constant"

1 0

Henri Verbeet : ddraw/tests: Add a helper function to create a viewport.
by Alexandre Julliard 27 Mar '12

27 Mar '12

Module: wine Branch: master Commit: 02b6e04a76ac4230675a902470544e23c0fec503 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02b6e04a76ac4230675a90247… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 26 20:28:08 2012 +0200 ddraw/tests: Add a helper function to create a viewport. --- dlls/ddraw/tests/ddraw1.c | 138 +++++++++++++---------------------- dlls/ddraw/tests/ddraw2.c | 163 +++++++++++++--------------------------- dlls/ddraw/tests/ddraw4.c | 180 +++++++++++++++------------------------------ 3 files changed, 161 insertions(+), 320 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=02b6e04a76ac4230675a9…

1 0

Henri Verbeet : wined3d: Drop an Apple hack.
by Alexandre Julliard 27 Mar '12

27 Mar '12

Module: wine Branch: master Commit: 337b63d878bc1b927a6ac19ce79ec82de5a91474 URL: http://source.winehq.org/git/wine.git/?a=commit;h=337b63d878bc1b927a6ac19ce… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 26 20:28:09 2012 +0200 wined3d: Drop an Apple hack. The hack actually breaks things on cards that do support more than 256 uniforms in GLSL. --- dlls/wined3d/directx.c | 15 --------------- 1 files changed, 0 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index a00a42c..e5be4ad 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -784,17 +784,8 @@ static BOOL match_fglrx(const struct wined3d_gl_info *gl_info, const char *gl_re return gl_vendor == GL_VENDOR_FGLRX; } -static void quirk_arb_constants(struct wined3d_gl_info *gl_info) -{ - TRACE_(d3d_caps)("Using ARB vs constant limit(=%u) for GLSL.\n", gl_info->limits.arb_vs_native_constants); - gl_info->limits.glsl_vs_float_constants = gl_info->limits.arb_vs_native_constants; - TRACE_(d3d_caps)("Using ARB ps constant limit(=%u) for GLSL.\n", gl_info->limits.arb_ps_native_constants); - gl_info->limits.glsl_ps_float_constants = gl_info->limits.arb_ps_native_constants; -} - static void quirk_apple_glsl_constants(struct wined3d_gl_info *gl_info) { - quirk_arb_constants(gl_info); /* MacOS needs uniforms for relative addressing offsets. This can accumulate to quite a few uniforms. * Beyond that the general uniform isn't optimal, so reserve a number of uniforms. 12 vec4's should * allow 48 different offsets or other helper immediate values. */ @@ -918,12 +909,6 @@ static const struct driver_quirk quirk_table[] = quirk_amd_dx9, "AMD normalized texrect quirk" }, - /* MacOS advertises more GLSL vertex shader uniforms than supported by the hardware, and if more are - * used it falls back to software. While the compiler can detect if the shader uses all declared - * uniforms, the optimization fails if the shader uses relative addressing. So any GLSL shader - * using relative addressing falls back to software. - * - * ARB vp gives the correct amount of uniforms, so use it instead of GLSL. */ { match_apple, quirk_apple_glsl_constants,

1 0

Henri Verbeet : wined3d: Load the backbuffer in the correct location before presenting in swapchain_gl_present ().
by Alexandre Julliard 27 Mar '12

27 Mar '12

Module: wine Branch: master Commit: 6f8b8bda2d94e436ce4788bbe9d06a4ef7bfd2e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f8b8bda2d94e436ce4788bbe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 26 20:28:10 2012 +0200 wined3d: Load the backbuffer in the correct location before presenting in swapchain_gl_present(). --- dlls/wined3d/swapchain.c | 31 ++++++++++++++++++------------- 1 files changed, 18 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index efe2293..2674ce6 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -449,13 +449,14 @@ static void swapchain_blit(const struct wined3d_swapchain *swapchain, static HRESULT swapchain_gl_present(struct wined3d_swapchain *swapchain, const RECT *src_rect_in, const RECT *dst_rect_in, const RGNDATA *dirty_region, DWORD flags) { + struct wined3d_surface *back_buffer = swapchain->back_buffers[0]; const struct wined3d_fb_state *fb = &swapchain->device->fb; const struct wined3d_gl_info *gl_info; struct wined3d_context *context; RECT src_rect, dst_rect; BOOL render_to_fbo; - context = context_acquire(swapchain->device, swapchain->back_buffers[0]); + context = context_acquire(swapchain->device, back_buffer); if (!context->valid) { context_release(context); @@ -504,8 +505,8 @@ static HRESULT swapchain_gl_present(struct wined3d_swapchain *swapchain, const R */ if (swapchain->desc.windowed) MapWindowPoints(NULL, swapchain->win_handle, (POINT *)&destRect, 2); - wined3d_surface_blt(swapchain->back_buffers[0], &destRect, - &cursor, NULL, WINEDDBLT_KEYSRC, NULL, WINED3D_TEXF_POINT); + wined3d_surface_blt(back_buffer, &destRect, &cursor, NULL, WINEDDBLT_KEYSRC, + NULL, WINED3D_TEXF_POINT); } if (swapchain->device->logo_surface) @@ -514,8 +515,8 @@ static HRESULT swapchain_gl_present(struct wined3d_swapchain *swapchain, const R RECT rect = {0, 0, src_surface->resource.width, src_surface->resource.height}; /* Blit the logo into the upper left corner of the drawable. */ - wined3d_surface_blt(swapchain->back_buffers[0], &rect, src_surface, &rect, - WINEDDBLT_KEYSRC, NULL, WINED3D_TEXF_POINT); + wined3d_surface_blt(back_buffer, &rect, src_surface, &rect, WINEDDBLT_KEYSRC, + NULL, WINED3D_TEXF_POINT); } TRACE("Presenting HDC %p.\n", context->hdc); @@ -559,11 +560,15 @@ static HRESULT swapchain_gl_present(struct wined3d_swapchain *swapchain, const R */ if (!swapchain->render_to_fbo && render_to_fbo && wined3d_settings.offscreen_rendering_mode == ORM_FBO) { - surface_load_location(swapchain->back_buffers[0], SFLAG_INTEXTURE, NULL); - surface_modify_location(swapchain->back_buffers[0], SFLAG_INDRAWABLE, FALSE); + surface_load_location(back_buffer, SFLAG_INTEXTURE, NULL); + surface_modify_location(back_buffer, SFLAG_INDRAWABLE, FALSE); swapchain->render_to_fbo = TRUE; swapchain_update_draw_bindings(swapchain); } + else + { + surface_load_location(back_buffer, back_buffer->draw_binding, NULL); + } if (swapchain->render_to_fbo) { @@ -626,17 +631,17 @@ static HRESULT swapchain_gl_present(struct wined3d_swapchain *swapchain, const R } if (!swapchain->render_to_fbo && ((swapchain->front_buffer->flags & SFLAG_INSYSMEM) - || (swapchain->back_buffers[0]->flags & SFLAG_INSYSMEM))) + || (back_buffer->flags & SFLAG_INSYSMEM))) { /* Both memory copies of the surfaces are ok, flip them around too instead of dirtifying * Doesn't work with render_to_fbo because we're not flipping */ struct wined3d_surface *front = swapchain->front_buffer; - struct wined3d_surface *back = swapchain->back_buffers[0]; - if(front->resource.size == back->resource.size) { + if (front->resource.size == back_buffer->resource.size) + { DWORD fbflags; - flip_surface(front, back); + flip_surface(front, back_buffer); /* Tell the front buffer surface that is has been modified. However, * the other locations were preserved during that, so keep the flags. @@ -648,7 +653,7 @@ static HRESULT swapchain_gl_present(struct wined3d_swapchain *swapchain, const R else { surface_modify_location(front, SFLAG_INDRAWABLE, TRUE); - surface_modify_location(back, SFLAG_INDRAWABLE, TRUE); + surface_modify_location(back_buffer, SFLAG_INDRAWABLE, TRUE); } } else @@ -660,7 +665,7 @@ static HRESULT swapchain_gl_present(struct wined3d_swapchain *swapchain, const R * the texture / sysmem copy needs to be reloaded from the drawable */ if (swapchain->desc.swap_effect == WINED3D_SWAP_EFFECT_FLIP) - surface_modify_location(swapchain->back_buffers[0], swapchain->back_buffers[0]->draw_binding, TRUE); + surface_modify_location(back_buffer, back_buffer->draw_binding, TRUE); } if (fb->depth_stencil)

1 0

Henri Verbeet : wined3d: Only update the drawable on surface unmap for the frontbuffer.
by Alexandre Julliard 27 Mar '12

27 Mar '12

Module: wine Branch: master Commit: d1e00648ff6aabb5921aaac27f2c697bbe7356a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1e00648ff6aabb5921aaac27… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 26 20:28:11 2012 +0200 wined3d: Only update the drawable on surface unmap for the frontbuffer. --- dlls/wined3d/surface.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 3148473..a96db7c 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -953,12 +953,8 @@ static void surface_unmap(struct wined3d_surface *surface) goto done; } - /* FIXME: The ORM_BACKBUFFER case probably isn't needed, but who knows - * what obscure bugs in backbuffer ORM removing it will uncover. Also, - * this should only be needed for the frontbuffer, but that requires - * present calls to call surface_load_location() on the backbuffer. - * Fix both of those after 1.4. */ - if (surface->container.type == WINED3D_CONTAINER_SWAPCHAIN + if ((surface->container.type == WINED3D_CONTAINER_SWAPCHAIN + && surface->container.u.swapchain->front_buffer == surface) || (wined3d_settings.offscreen_rendering_mode == ORM_BACKBUFFER && device->fb.render_targets && surface == device->fb.render_targets[0])) {

1 0

Henri Verbeet : wined3d: Drop the ORM_BACKBUFFER special case in surface_unmap().
by Alexandre Julliard 27 Mar '12

27 Mar '12

Module: wine Branch: master Commit: 00a40114255b3fbdd506f79875d3894b17a5217c URL: http://source.winehq.org/git/wine.git/?a=commit;h=00a40114255b3fbdd506f7987… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 26 20:28:12 2012 +0200 wined3d: Drop the ORM_BACKBUFFER special case in surface_unmap(). --- dlls/wined3d/surface.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index a96db7c..98d259c 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -953,10 +953,8 @@ static void surface_unmap(struct wined3d_surface *surface) goto done; } - if ((surface->container.type == WINED3D_CONTAINER_SWAPCHAIN + if (surface->container.type == WINED3D_CONTAINER_SWAPCHAIN && surface->container.u.swapchain->front_buffer == surface) - || (wined3d_settings.offscreen_rendering_mode == ORM_BACKBUFFER - && device->fb.render_targets && surface == device->fb.render_targets[0])) { if (!surface->dirtyRect.left && !surface->dirtyRect.top && surface->dirtyRect.right == surface->resource.width

1 0

Aric Stewart : wineqtdecoder: COM cleanup.
by Alexandre Julliard 27 Mar '12

27 Mar '12

Module: wine Branch: master Commit: e49e32556d86723a7fc503f4ec215dc1fbfc9d6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e49e32556d86723a7fc503f4e… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Mar 26 14:05:53 2012 -0500 wineqtdecoder: COM cleanup. --- dlls/wineqtdecoder/qtsplitter.c | 149 +++++++++++++++++++++++---------------- dlls/wineqtdecoder/qtvdecoder.c | 26 +++++-- 2 files changed, 107 insertions(+), 68 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e49e32556d86723a7fc50…

1 0

Aric Stewart : strmbase: COM cleanup for TransformFilter.
by Alexandre Julliard 27 Mar '12

27 Mar '12

Module: wine Branch: master Commit: f1c9bd444c02898d93e90981add512958c14b30b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1c9bd444c02898d93e90981a… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Mar 26 14:06:13 2012 -0500 strmbase: COM cleanup for TransformFilter. --- dlls/strmbase/transform.c | 98 +++++++++++++++++++++++++++++--------------- 1 files changed, 64 insertions(+), 34 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f1c9bd444c02898d93e90…

1 0

Jacek Caban : jscript: Return double instead of VARIANT from to_number.
by Alexandre Julliard 27 Mar '12

27 Mar '12

Module: wine Branch: master Commit: 451169fb93a645bdf992ea9d727a561903f3854c URL: http://source.winehq.org/git/wine.git/?a=commit;h=451169fb93a645bdf992ea9d7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 27 11:28:51 2012 +0200 jscript: Return double instead of VARIANT from to_number. --- dlls/jscript/array.c | 39 ++---- dlls/jscript/date.c | 322 +++++++++++++++++++++--------------------------- dlls/jscript/engine.c | 54 +++++---- dlls/jscript/error.c | 14 +-- dlls/jscript/global.c | 18 ++-- dlls/jscript/jscript.h | 9 ++- dlls/jscript/jsutils.c | 83 +++++++------ dlls/jscript/math.c | 101 +++++++--------- dlls/jscript/number.c | 17 ++- dlls/jscript/regexp.c | 12 +-- 10 files changed, 314 insertions(+), 355 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=451169fb93a645bdf992e…

1 0