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

Józef Kucia : wined3d: Introduce wined3d_device_get_cs_cb().
by Alexandre Julliard 07 Mar '17

07 Mar '17

Module: wine Branch: master Commit: e527b1035a417c230d3260710fdd73fd967afe50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e527b1035a417c230d3260710… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 7 09:50:14 2017 +0100 wined3d: Introduce wined3d_device_get_cs_cb(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 13 +++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 1 + 3 files changed, 15 insertions(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c576f02..f7ce15d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2752,6 +2752,19 @@ void CDECL wined3d_device_set_cs_cb(struct wined3d_device *device, unsigned int wined3d_device_set_constant_buffer(device, WINED3D_SHADER_TYPE_COMPUTE, idx, buffer); } +struct wined3d_buffer * CDECL wined3d_device_get_cs_cb(const struct wined3d_device *device, unsigned int idx) +{ + TRACE("device %p, idx %u.\n", device, idx); + + if (idx >= MAX_CONSTANT_BUFFERS) + { + WARN("Invalid constant buffer index %u.\n", idx); + return NULL; + } + + return device->state.cb[WINED3D_SHADER_TYPE_COMPUTE][idx]; +} + void CDECL wined3d_device_set_cs_resource_view(struct wined3d_device *device, unsigned int idx, struct wined3d_shader_resource_view *view) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 1e187f9..b255d77 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -53,6 +53,7 @@ @ cdecl wined3d_device_get_clip_status(ptr ptr) @ cdecl wined3d_device_get_compute_shader(ptr) @ cdecl wined3d_device_get_creation_parameters(ptr ptr) +@ cdecl wined3d_device_get_cs_cb(ptr long) @ cdecl wined3d_device_get_depth_stencil_view(ptr) @ cdecl wined3d_device_get_device_caps(ptr ptr) @ cdecl wined3d_device_get_display_mode(ptr long ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 69241fc..d0ee2e0 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2165,6 +2165,7 @@ HRESULT __cdecl wined3d_device_get_clip_status(const struct wined3d_device *devi struct wined3d_shader * __cdecl wined3d_device_get_compute_shader(const struct wined3d_device *device); void __cdecl wined3d_device_get_creation_parameters(const struct wined3d_device *device, struct wined3d_device_creation_parameters *creation_parameters); +struct wined3d_buffer * __cdecl wined3d_device_get_cs_cb(const struct wined3d_device *device, unsigned int idx); struct wined3d_rendertarget_view * __cdecl wined3d_device_get_depth_stencil_view(const struct wined3d_device *device); HRESULT __cdecl wined3d_device_get_device_caps(const struct wined3d_device *device, WINED3DCAPS *caps); HRESULT __cdecl wined3d_device_get_display_mode(const struct wined3d_device *device, UINT swapchain_idx,

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_CSGetConstantBuffers().
by Alexandre Julliard 07 Mar '17

07 Mar '17

Module: wine Branch: master Commit: befff5eefb9240201b3a8a0f7423854969a5ccd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=befff5eefb9240201b3a8a0f7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 7 09:50:15 2017 +0100 d3d11: Implement d3d11_immediate_context_CSGetConstantBuffers(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 5e5c7a4..43e61c0 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2035,8 +2035,28 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_CSGetSamplers(ID3D11Device static void STDMETHODCALLTYPE d3d11_immediate_context_CSGetConstantBuffers(ID3D11DeviceContext *iface, UINT start_slot, UINT buffer_count, ID3D11Buffer **buffers) { - FIXME("iface %p, start_slot %u, buffer_count %u, buffer %p stub!\n", + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + unsigned int i; + + TRACE("iface %p, start_slot %u, buffer_count %u, buffer %p.\n", iface, start_slot, buffer_count, buffers); + + wined3d_mutex_lock(); + for (i = 0; i < buffer_count; ++i) + { + struct wined3d_buffer *wined3d_buffer; + struct d3d_buffer *buffer_impl; + + if (!(wined3d_buffer = wined3d_device_get_cs_cb(device->wined3d_device, start_slot + i))) + { + buffers[i] = NULL; + continue; + } + + buffer_impl = wined3d_buffer_get_parent(wined3d_buffer); + ID3D11Buffer_AddRef(buffers[i] = &buffer_impl->ID3D11Buffer_iface); + } + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_ClearState(ID3D11DeviceContext *iface)

1 0

Józef Kucia : wined3d: Introduce wined3d_device_get_cs_resource_view().
by Alexandre Julliard 07 Mar '17

07 Mar '17

Module: wine Branch: master Commit: e093774c2ab4d0515ff601a64caf501670998f2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e093774c2ab4d0515ff601a64… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 7 09:50:16 2017 +0100 wined3d: Introduce wined3d_device_get_cs_resource_view(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 14 ++++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 3 files changed, 17 insertions(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index f7ce15d..ea229f8 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2773,6 +2773,20 @@ void CDECL wined3d_device_set_cs_resource_view(struct wined3d_device *device, wined3d_device_set_shader_resource_view(device, WINED3D_SHADER_TYPE_COMPUTE, idx, view); } +struct wined3d_shader_resource_view * CDECL wined3d_device_get_cs_resource_view(const struct wined3d_device *device, + unsigned int idx) +{ + TRACE("device %p, idx %u.\n", device, idx); + + if (idx >= MAX_SHADER_RESOURCE_VIEWS) + { + WARN("Invalid view index %u.\n", idx); + return NULL; + } + + return device->state.shader_resource_view[WINED3D_SHADER_TYPE_COMPUTE][idx]; +} + void CDECL wined3d_device_set_cs_sampler(struct wined3d_device *device, unsigned int idx, struct wined3d_sampler *sampler) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index b255d77..869fa35 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -54,6 +54,7 @@ @ cdecl wined3d_device_get_compute_shader(ptr) @ cdecl wined3d_device_get_creation_parameters(ptr ptr) @ cdecl wined3d_device_get_cs_cb(ptr long) +@ cdecl wined3d_device_get_cs_resource_view(ptr long) @ cdecl wined3d_device_get_depth_stencil_view(ptr) @ cdecl wined3d_device_get_device_caps(ptr ptr) @ cdecl wined3d_device_get_display_mode(ptr long ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index d0ee2e0..482568f 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2166,6 +2166,8 @@ struct wined3d_shader * __cdecl wined3d_device_get_compute_shader(const struct w void __cdecl wined3d_device_get_creation_parameters(const struct wined3d_device *device, struct wined3d_device_creation_parameters *creation_parameters); struct wined3d_buffer * __cdecl wined3d_device_get_cs_cb(const struct wined3d_device *device, unsigned int idx); +struct wined3d_shader_resource_view * __cdecl wined3d_device_get_cs_resource_view(const struct wined3d_device *device, + unsigned int idx); struct wined3d_rendertarget_view * __cdecl wined3d_device_get_depth_stencil_view(const struct wined3d_device *device); HRESULT __cdecl wined3d_device_get_device_caps(const struct wined3d_device *device, WINED3DCAPS *caps); HRESULT __cdecl wined3d_device_get_display_mode(const struct wined3d_device *device, UINT swapchain_idx,

1 0

Alexandre Julliard : patches: Add a patch status for missing authorship information.
by Alexandre Julliard 07 Mar '17

07 Mar '17

Module: tools Branch: master Commit: 34dd20b4de6c0971813b930b718ebe33ee086f31 URL: http://source.winehq.org/git/tools.git/?a=commit;h=34dd20b4de6c0971813b930b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 7 10:49:32 2017 +0100 patches: Add a patch status for missing authorship information. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- patches/expire | 15 +++++++++++---- patches/patches.css | 1 + patches/update | 5 +++-- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/patches/expire b/patches/expire index 6bbd5c8..fd5ba22 100755 --- a/patches/expire +++ b/patches/expire @@ -31,6 +31,7 @@ my %status_expiry = "applyfail" => 7, "buildfail" => 7, "deferred" => 7, + "authorship" => 7, "formatting" => 7, "other" => 7, "nopatch" => 3, @@ -54,6 +55,7 @@ my %status_descr = "applyfail" => "Apply failure", "buildfail" => "Build failure", "deferred" => "Deferred", + "authorship" => "Authorship", "formatting" => "Formatting", "other" => "Other project", "nopatch" => "No patch", @@ -98,12 +100,17 @@ mode implies -Werror). You need to resend a fixed patch.", upcoming release. You need to either resend after the release, make the patch less intrusive, or make a convincing argument that it needs to be included in the release.", + "authorship" => +"This means that there are some authorship issues with your patch. The +author's full name, email address, or Signed-off-by headers are +missing or incorrectly formatted. You need to resend a patch with +corrected author information.", "formatting" => "This means that there are some formatting issues with your -patch. Either the author's full name, email address, or Signed-off-by -headers are missing, indentation is messed up (usually from editing -with a non-standard tab size), or there are gratuitous formatting -changes to the code. You need to resend a fixed patch.", +patch. Either the indentation is messed up (usually from editing with +a non-standard tab size), some characters got mangled in transit, or +there are gratuitous formatting changes to the code. You need to +resend a fixed patch.", "other" => "This means that the patch belongs to another WineHQ project (website, appdb, etc.) and will be applied by the respective maintainer.", diff --git a/patches/patches.css b/patches/patches.css index 020d48c..2799827 100644 --- a/patches/patches.css +++ b/patches/patches.css @@ -162,6 +162,7 @@ tr.odd { background-color: #f8e8e8; } .other, .other :link, .other :visited { color: #e08000; } .applyfail, .applyfail :link, .applyfail :visited { color: red; } .buildfail, .buildfail :link, .buildfail :visited { color: red; } +.authorship, .authorship :link, .authorship :visited { color: red; } .formatting, .formatting :link, .formatting :visited { color: red; } .nopatch, .nopatch :link, .nopatch :visited { color: red; } .rejected, .rejected :link, .rejected :visited { color: red; } diff --git a/patches/update b/patches/update index ddf1396..ad2b82a 100755 --- a/patches/update +++ b/patches/update @@ -31,6 +31,7 @@ my %status_descr = "applyfail" => "Apply failure", "buildfail" => "Build failure", "deferred" => "Deferred", + "authorship" => "Authorship", "formatting" => "Formatting", "other" => "Other project", "nopatch" => "No patch", @@ -66,8 +67,8 @@ my @legend = [ "buildfail", "<ul><li>Syntax error or other compile problem.</li>" . "<li>You forgot to include some changes or new files required for compilation.</li>" . "<li>The patch causes compiler warnings (maintainer mode implies -Werror).</li></ul>" ], - [ "formatting", "<ul><li>The patch author's full name, email address, or Signed-off-by headers are incorrect or missing.</li>" . - "<li>Whitespace got mangled in transit.</li>" . + [ "authorship", "<ul><li>The patch author's full name, email address, or Signed-off-by headers are incorrect or missing.</li></ul>" ], + [ "formatting", "<ul><li>Whitespace got mangled in transit.</li>" . "<li>Indentation is messed up (usually from editing with a non-standard tab size).</li>" . "<li>8-bit chars got mangled in transit (usually when sending patches to translation files).</li>" . "<li>You are making gratuitous formatting changes to the code.</li>" .

1 0

Julian Rüger : readme: Update German translation.
by Alexandre Julliard 06 Mar '17

06 Mar '17

Module: wine Branch: master Commit: e2f677212a4b417fcb97cde2119f22b6b9ee423b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2f677212a4b417fcb97cde21… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Mar 6 17:15:07 2017 +0100 readme: Update German translation. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- documentation/README.de | 131 ++++++++++++++++++++++++------------------------ 1 file changed, 66 insertions(+), 65 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e2f677212a4b417fcb97c…

1 0

Henri Verbeet : usp10/tests: Add a latn shaping test with ligatures.
by Alexandre Julliard 06 Mar '17

06 Mar '17

Module: wine Branch: master Commit: 04cd6029ea7a599c78a36d6a71a4d74bef11d5de URL: http://source.winehq.org/git/wine.git/?a=commit;h=04cd6029ea7a599c78a36d6a7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 2 09:38:39 2017 +0100 usp10/tests: Add a latn shaping test with ligatures. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/tests/usp10.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index c5cc401..b8c7b70 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -1185,6 +1185,13 @@ static void test_ScriptShapeOpenType(HDC hdc) {1,{{SCRIPT_JUSTIFY_CHARACTER,1,0,0,0,0},0}}, {0,{{SCRIPT_JUSTIFY_CHARACTER,1,0,0,0,0},0}} }; + static const WCHAR test3[] = {'t', 't', 'f', 'f', 'f', 'i', 0}; + static const shapeTest_char t3_c[] = {{0, {0, 0}}, {0, {0, 0}}, {0, {0, 0}}, + {1, {0, 0}}, {1, {0, 0}}, {1, {0, 0}}}; + static const shapeTest_glyph t3_g[] = { + {1, {{SCRIPT_JUSTIFY_CHARACTER, 1, 0, 0, 0, 0}, 0}}, + {1, {{SCRIPT_JUSTIFY_CHARACTER, 1, 0, 0, 0, 0}, 0}}}; + /* Hebrew */ static const WCHAR test_hebrew[] = {0x05e9, 0x05dc, 0x05d5, 0x05dd,0}; static const shapeTest_char hebrew_c[] = {{3,{0,0}},{2,{0,0}},{1,{0,0}},{0,{0,0}}}; @@ -1467,6 +1474,14 @@ static void test_ScriptShapeOpenType(HDC hdc) test_shape_ok(hdc, test2, 4, &Control, &State, 1, 4, t2_c, glyph_test); + test_valid = find_font_for_range(hdc, "Calibri", 0, test3[0], &hfont, &hfont_orig); + if (hfont != NULL) + { + test_shape_ok_valid(test_valid, hdc, test3, 6, &Control, &State, 0, 2, t3_c, t3_g); + SelectObject(hdc, hfont_orig); + DeleteObject(hfont); + } + test_valid = find_font_for_range(hdc, "Microsoft Sans Serif", 11, test_hebrew[0], &hfont, &hfont_orig); if (hfont != NULL) {

1 0

Henri Verbeet : usp10/tests: Add a ligature and diacritic to the syrc shaping test.
by Alexandre Julliard 06 Mar '17

06 Mar '17

Module: wine Branch: master Commit: badb0a7530c2d7c5a96eebc15b3d8dc5a0cf7f18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=badb0a7530c2d7c5a96eebc15… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 2 09:38:40 2017 +0100 usp10/tests: Add a ligature and diacritic to the syrc shaping test. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/tests/usp10.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index b8c7b70..010e906 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -1017,11 +1017,16 @@ static inline void _test_shape_ok(int valid, HDC hdc, LPCWSTR string, winetest_trace("%i: Glyph present when it should not be\n",x); } if (valid > 0) - winetest_ok(glyphProp[x].sva.uJustification == glyphItems[x].GlyphProp.sva.uJustification || - (props2 && glyphProp[x].sva.uJustification == props2[x].sva.uJustification), - "%i: uJustification incorrect (%i)\n",x,glyphProp[x].sva.uJustification); + { + todo_wine_if(tags[item] == syrc_tag && !x) + winetest_ok(glyphProp[x].sva.uJustification == glyphItems[x].GlyphProp.sva.uJustification || + (props2 && glyphProp[x].sva.uJustification == props2[x].sva.uJustification), + "%i: uJustification incorrect (%i)\n",x,glyphProp[x].sva.uJustification); + } else if (glyphProp[x].sva.uJustification != glyphItems[x].GlyphProp.sva.uJustification) + { winetest_trace("%i: uJustification incorrect (%i)\n",x,glyphProp[x].sva.uJustification); + } if (valid > 0) winetest_ok(glyphProp[x].sva.fClusterStart == glyphItems[x].GlyphProp.sva.fClusterStart || (props2 && glyphProp[x].sva.fClusterStart == props2[x].sva.fClusterStart), @@ -1225,12 +1230,14 @@ static void test_ScriptShapeOpenType(HDC hdc) {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}}; /* Syriac */ - static const WCHAR test_syriac[] = {0x0710, 0x0710, 0x0710, 0x0728, 0x0718, 0x0723,0}; - static const shapeTest_char syriac_c[] = {{5,{0,0}},{4,{0,0}},{3,{0,0}},{2,{0,0}},{1,{0,0}},{0,{0,0}}}; + static const WCHAR test_syriac[] = {0x0710, 0x072c, 0x0728, 0x0742, 0x0718, 0x0723, 0x0720, 0x0710, 0}; + static const shapeTest_char syriac_c[] = {{6, {0, 0}}, {5, {0, 0}}, {4, {0, 0}}, + {4, {0, 0}}, {2, {0, 0}}, {1, {0, 0}}, {0, {0, 0}}, {0, {0, 0}}}; static const shapeTest_glyph syriac_g[] = { + {1,{{SCRIPT_JUSTIFY_ARABIC_NORMAL,1,0,0,0,0},0}}, {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, - {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,0,1,1,0,0},0}}, {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}} }; @@ -1509,7 +1516,7 @@ static void test_ScriptShapeOpenType(HDC hdc) test_valid = find_font_for_range(hdc, "Estrangelo Edessa", 71, test_syriac[0], &hfont, &hfont_orig); if (hfont != NULL) { - test_shape_ok_valid(test_valid, hdc, test_syriac, 6, &Control, &State, 0, 6, syriac_c, syriac_g); + test_shape_ok_valid(test_valid, hdc, test_syriac, 8, &Control, &State, 0, 7, syriac_c, syriac_g); SelectObject(hdc, hfont_orig); DeleteObject(hfont); }

1 0

Henri Verbeet : usp10: Take the script direction into account when applying OpenType features.
by Alexandre Julliard 06 Mar '17

06 Mar '17

Module: wine Branch: master Commit: c94a5fd28c1a0009f4f6e968fc3bec624549e4b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c94a5fd28c1a0009f4f6e968f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 2 09:38:41 2017 +0100 usp10: Take the script direction into account when applying OpenType features. As opposed to just looking at the run direction. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/shape.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 9e0addc..aa98366 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -751,6 +751,7 @@ static void UpdateClusters(int nextIndex, int changeCount, int write_dir, int ch return; else { + int cluster_dir = pwLogClust[0] < pwLogClust[chars-1] ? 1 : -1; int i; int target_glyph = nextIndex - write_dir; int target_index = -1; @@ -775,7 +776,7 @@ static void UpdateClusters(int nextIndex, int changeCount, int write_dir, int ch if (changeCount < 0) { /* merge glyphs */ - for(i = target_index; i < chars && i >= 0; i+=write_dir) + for (i = target_index; i < chars && i >= 0; i += cluster_dir) { if (pwLogClust[i] == target_glyph) continue; @@ -794,8 +795,8 @@ static void UpdateClusters(int nextIndex, int changeCount, int write_dir, int ch } } - /* renumber trailing indexes*/ - for(i = target_index; i < chars && i >= 0; i+=write_dir) + /* renumber trailing indexes */ + for (i = target_index; i < chars && i >= 0; i += cluster_dir) { if (pwLogClust[i] != target_glyph) pwLogClust[i] += changeCount; @@ -803,8 +804,8 @@ static void UpdateClusters(int nextIndex, int changeCount, int write_dir, int ch } else { - for(i = target_index; i < chars && i >= 0; i+=write_dir) - pwLogClust[i] += changeCount; + for (i = target_index; i < chars && i >= 0; i += cluster_dir) + pwLogClust[i] += changeCount; } } } @@ -3382,7 +3383,7 @@ static void SHAPE_ApplyOpenTypeFeatures(HDC hdc, ScriptCache *psc, SCRIPT_ANALYS if (!psc->GSUB_Table) return; - if (!psa->fLogicalOrder && psa->fRTL) + if (scriptInformation[psa->eScript].a.fRTL && (!psa->fLogicalOrder || !psa->fRTL)) dirL = -1; else dirL = 1;

1 0

Henri Verbeet : usp10: Properly determine the glyph run direction when shaping Script_Arabic.
by Alexandre Julliard 06 Mar '17

06 Mar '17

Module: wine Branch: master Commit: f13dea5684f2fe3d93981d98a761995a44bce7bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=f13dea5684f2fe3d93981d98a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 2 09:38:42 2017 +0100 usp10: Properly determine the glyph run direction when shaping Script_Arabic. In particular, if fLogicalOrder and fRTL are both set, the glyph order is swapped compared to the character order. In all other cases it's the same. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/shape.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index aa98366..ce19465 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -1055,15 +1055,15 @@ static void ContextualShape_Arabic(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *p return; } - if (!psa->fLogicalOrder && psa->fRTL) + if (psa->fLogicalOrder && psa->fRTL) { - dirR = 1; - dirL = -1; + dirR = -1; + dirL = 1; } else { - dirR = -1; - dirL = 1; + dirR = 1; + dirL = -1; } load_ot_tables(hdc, psc); @@ -2946,20 +2946,20 @@ static void ShapeCharGlyphProp_Arabic( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSI spaces = HeapAlloc(GetProcessHeap(),0,cGlyphs); memset(spaces,0,cGlyphs); - if (!psa->fLogicalOrder && psa->fRTL) - { - initGlyph = cGlyphs-1; - finaGlyph = 0; - dirR = 1; - dirL = -1; - } - else + if (psa->fLogicalOrder && psa->fRTL) { initGlyph = 0; finaGlyph = cGlyphs-1; dirR = -1; dirL = 1; } + else + { + initGlyph = cGlyphs-1; + finaGlyph = 0; + dirR = 1; + dirL = -1; + } for (i = 0; i < cGlyphs; i++) {

1 0

Henri Verbeet : usp10/tests: Add shaping tests for fLogicalOrder and fRTL.
by Alexandre Julliard 06 Mar '17

06 Mar '17

Module: wine Branch: master Commit: 9db12225f47e8fc9e0aabf8f4ee50e46337d358d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9db12225f47e8fc9e0aabf8f4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 2 09:38:43 2017 +0100 usp10/tests: Add shaping tests for fLogicalOrder and fRTL. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/tests/usp10.c | 153 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 148 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9db12225f47e8fc9e0aab…

1 0