November 2011 - Wine-commits

Henri Verbeet : d3d10: Implement D3D10StateBlockMaskDifference().
by Alexandre Julliard 15 Nov '11

15 Nov '11

Module: wine Branch: master Commit: a11a171366d8626c1a0042f9c545b24689c63e75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a11a171366d8626c1a0042f9c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 14 21:11:41 2011 +0100 d3d10: Implement D3D10StateBlockMaskDifference(). --- dlls/d3d10/d3d10.spec | 2 +- dlls/d3d10/stateblock.c | 23 +++++++++++++++++++++++ dlls/d3d10/tests/device.c | 27 +++++++++++++++++++++++++++ include/d3d10effect.h | 3 +++ 4 files changed, 54 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10/d3d10.spec b/dlls/d3d10/d3d10.spec index 16d2d5f..baa0c10 100644 --- a/dlls/d3d10/d3d10.spec +++ b/dlls/d3d10/d3d10.spec @@ -19,7 +19,7 @@ @ stub D3D10PreprocessShader @ stdcall D3D10ReflectShader(ptr long ptr) @ stub D3D10RegisterLayers -@ stub D3D10StateBlockMaskDifference +@ stdcall D3D10StateBlockMaskDifference(ptr ptr ptr) @ stub D3D10StateBlockMaskDisableAll @ stub D3D10StateBlockMaskDisableCapture @ stub D3D10StateBlockMaskEnableAll diff --git a/dlls/d3d10/stateblock.c b/dlls/d3d10/stateblock.c index a254704..f121a5c 100644 --- a/dlls/d3d10/stateblock.c +++ b/dlls/d3d10/stateblock.c @@ -143,3 +143,26 @@ HRESULT WINAPI D3D10CreateStateBlock(ID3D10Device *device, return S_OK; } + +HRESULT WINAPI D3D10StateBlockMaskDifference(D3D10_STATE_BLOCK_MASK *mask_x, + D3D10_STATE_BLOCK_MASK *mask_y, D3D10_STATE_BLOCK_MASK *result) +{ + UINT count = sizeof(*result) / sizeof(DWORD); + UINT i; + + TRACE("mask_x %p, mask_y %p, result %p.\n", mask_x, mask_y, result); + + if (!mask_x || !mask_y || !result) + return E_INVALIDARG; + + for (i = 0; i < count; ++i) + { + ((DWORD *)result)[i] = ((DWORD *)mask_x)[i] ^ ((DWORD *)mask_y)[i]; + } + for (i = count * sizeof(DWORD); i < sizeof(*result); ++i) + { + ((BYTE *)result)[i] = ((BYTE *)mask_x)[i] ^ ((BYTE *)mask_y)[i]; + } + + return S_OK; +} diff --git a/dlls/d3d10/tests/device.c b/dlls/d3d10/tests/device.c index 8399cdb..1fc3a3b 100644 --- a/dlls/d3d10/tests/device.c +++ b/dlls/d3d10/tests/device.c @@ -64,6 +64,32 @@ static void test_device_interfaces(ID3D10Device *device) ok(SUCCEEDED(hr), "ID3D10Device does not implement IDXGIDevice (%#x)\n", hr); } +static void test_stateblock_mask(void) +{ + D3D10_STATE_BLOCK_MASK mask_x, mask_y, result; + HRESULT hr; + + memset(&mask_x, 0, sizeof(mask_x)); + memset(&mask_y, 0, sizeof(mask_y)); + memset(&result, 0, sizeof(result)); + + mask_x.VS = 0x33; + mask_y.VS = 0x55; + mask_x.Predication = 0x99; + mask_y.Predication = 0xaa; + + hr = D3D10StateBlockMaskDifference(&mask_x, &mask_y, &result); + ok(SUCCEEDED(hr), "D3D10StateBlockMaskDifference failed, hr %#x.\n", hr); + ok(result.VS == 0x66, "Got unexpected result.VS %#x.\n", result.VS); + ok(result.Predication == 0x33, "Got unexpected result.Predication %#x.\n", result.Predication); + hr = D3D10StateBlockMaskDifference(NULL, &mask_y, &result); + ok(hr == E_INVALIDARG, "Got unexpect hr %#x.\n", hr); + hr = D3D10StateBlockMaskDifference(&mask_x, NULL, &result); + ok(hr == E_INVALIDARG, "Got unexpect hr %#x.\n", hr); + hr = D3D10StateBlockMaskDifference(&mask_x, &mask_y, NULL); + ok(hr == E_INVALIDARG, "Got unexpect hr %#x.\n", hr); +} + START_TEST(device) { ID3D10Device *device; @@ -77,6 +103,7 @@ START_TEST(device) } test_device_interfaces(device); + test_stateblock_mask(); refcount = ID3D10Device_Release(device); ok(!refcount, "Device has %u references left\n", refcount); diff --git a/include/d3d10effect.h b/include/d3d10effect.h index 8c5cc63..d36c3da 100644 --- a/include/d3d10effect.h +++ b/include/d3d10effect.h @@ -804,6 +804,9 @@ HRESULT WINAPI D3D10CreateEffectFromMemory(void *data, SIZE_T data_size, UINT fl HRESULT WINAPI D3D10CreateStateBlock(ID3D10Device *device, D3D10_STATE_BLOCK_MASK *mask, ID3D10StateBlock **stateblock); +HRESULT WINAPI D3D10StateBlockMaskDifference(D3D10_STATE_BLOCK_MASK *mask_x, + D3D10_STATE_BLOCK_MASK *mask_y, D3D10_STATE_BLOCK_MASK *result); + #ifdef __cplusplus } #endif

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DSHADER_PARAM_SRCMOD_TYPE typedef.
by Alexandre Julliard 15 Nov '11

15 Nov '11

Module: wine Branch: master Commit: 563edce2fa6d116c94598fb99de4dfdad6720acf URL: http://source.winehq.org/git/wine.git/?a=commit;h=563edce2fa6d116c94598fb99… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 14 21:11:42 2011 +0100 wined3d: Get rid of the WINED3DSHADER_PARAM_SRCMOD_TYPE typedef. --- dlls/wined3d/arb_program_shader.c | 5 +++-- dlls/wined3d/glsl_shader.c | 11 +++++++---- dlls/wined3d/shader.c | 2 +- dlls/wined3d/wined3d_private.h | 6 +++--- 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 19e565e..17c5ba4 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1951,8 +1951,9 @@ static void pshader_hw_tex(const struct wined3d_shader_instruction *ins) } else if (shader_version < WINED3D_SHADER_VERSION(2,0)) { - DWORD src_mod = ins->src[0].modifiers; - if (src_mod == WINED3DSPSM_DZ) { + enum wined3d_shader_src_modifier src_mod = ins->src[0].modifiers; + if (src_mod == WINED3DSPSM_DZ) + { /* TXP cannot handle DZ natively, so move the z coordinate to .w. reg_coord is a read-only * varying register, so we need a temp reg */ diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ff17fcf..1746cb4 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1234,7 +1234,8 @@ static const char * const shift_glsl_tab[] = { }; /* Generate a GLSL parameter that does the input modifier computation and return the input register/mask to use */ -static void shader_glsl_gen_modifier(DWORD src_modifier, const char *in_reg, const char *in_regswizzle, char *out_str) +static void shader_glsl_gen_modifier(enum wined3d_shader_src_modifier src_modifier, + const char *in_reg, const char *in_regswizzle, char *out_str) { out_str[0] = 0; @@ -3054,7 +3055,7 @@ static void shader_glsl_tex(const struct wined3d_shader_instruction *ins) } else if (shader_version < WINED3D_SHADER_VERSION(2,0)) { - DWORD src_mod = ins->src[0].modifiers; + enum wined3d_shader_src_modifier src_mod = ins->src[0].modifiers; if (src_mod == WINED3DSPSM_DZ) { sample_flags |= WINED3D_GLSL_SAMPLE_PROJECTED; @@ -3187,9 +3188,11 @@ static void shader_glsl_texcoord(const struct wined3d_shader_instruction *ins) shader_glsl_get_write_mask(&ins->dst[0], dst_mask); shader_addline(buffer, "clamp(gl_TexCoord[%u], 0.0, 1.0)%s);\n", ins->dst[0].reg.idx, dst_mask); - } else { + } + else + { + enum wined3d_shader_src_modifier src_mod = ins->src[0].modifiers; DWORD reg = ins->src[0].reg.idx; - DWORD src_mod = ins->src[0].modifiers; char dst_swizzle[6]; shader_glsl_get_swizzle(&ins->src[0], FALSE, write_mask, dst_swizzle); diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 24b577a..447de8f 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1099,7 +1099,7 @@ void shader_dump_dst_param(const struct wined3d_shader_dst_param *param, void shader_dump_src_param(const struct wined3d_shader_src_param *param, const struct wined3d_shader_version *shader_version) { - DWORD src_modifier = param->modifiers; + enum wined3d_shader_src_modifier src_modifier = param->modifiers; DWORD swizzle = param->swizzle; if (src_modifier == WINED3DSPSM_NEG diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a331f4e..460c911 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -324,7 +324,7 @@ enum wined3d_immconst_type #define WINED3DSP_NOSWIZZLE (0 | (1 << 2) | (2 << 4) | (3 << 6)) -typedef enum _WINED3DSHADER_PARAM_SRCMOD_TYPE +enum wined3d_shader_src_modifier { WINED3DSPSM_NONE = 0, WINED3DSPSM_NEG = 1, @@ -340,7 +340,7 @@ typedef enum _WINED3DSHADER_PARAM_SRCMOD_TYPE WINED3DSPSM_ABS = 11, WINED3DSPSM_ABSNEG = 12, WINED3DSPSM_NOT = 13, -} WINED3DSHADER_PARAM_SRCMOD_TYPE; +}; #define WINED3DSP_WRITEMASK_0 0x1 /* .x r */ #define WINED3DSP_WRITEMASK_1 0x2 /* .y g */ @@ -617,7 +617,7 @@ struct wined3d_shader_src_param { struct wined3d_shader_register reg; DWORD swizzle; - DWORD modifiers; + enum wined3d_shader_src_modifier modifiers; }; struct wined3d_shader_instruction

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DSHADER_PARAM_DSTMOD_TYPE typedef.
by Alexandre Julliard 15 Nov '11

15 Nov '11

Module: wine Branch: master Commit: e43a185c173eb2705f077052d326a88cc5eef5fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=e43a185c173eb2705f077052d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 14 21:11:43 2011 +0100 wined3d: Get rid of the WINED3DSHADER_PARAM_DSTMOD_TYPE typedef. --- dlls/wined3d/wined3d_private.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 460c911..b8f3e84 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -348,13 +348,13 @@ enum wined3d_shader_src_modifier #define WINED3DSP_WRITEMASK_3 0x8 /* .w a */ #define WINED3DSP_WRITEMASK_ALL 0xf /* all */ -typedef enum _WINED3DSHADER_PARAM_DSTMOD_TYPE +enum wined3d_shader_dst_modifier { WINED3DSPDM_NONE = 0, WINED3DSPDM_SATURATE = 1, WINED3DSPDM_PARTIALPRECISION = 2, WINED3DSPDM_MSAMPCENTROID = 4, -} WINED3DSHADER_PARAM_DSTMOD_TYPE; +}; /* Undocumented opcode control to identify projective texture lookups in ps 2.0 and later */ #define WINED3DSI_TEXLD_PROJECT 1

1 0

Aric Stewart : usp10: Break with a better understanding on the handling of bidi strengths.
by Alexandre Julliard 15 Nov '11

15 Nov '11

Module: wine Branch: master Commit: 9c9513f94a632241ed7be0e9bd724696ed677d3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c9513f94a632241ed7be0e9b… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Nov 14 13:16:59 2011 -0700 usp10: Break with a better understanding on the handling of bidi strengths. --- dlls/usp10/bidi.c | 10 ++++++-- dlls/usp10/usp10.c | 44 +++++++++++++++++++++++++++++++++++------- dlls/usp10/usp10_internal.h | 3 ++ 3 files changed, 46 insertions(+), 11 deletions(-) diff --git a/dlls/usp10/bidi.c b/dlls/usp10/bidi.c index 9c3942c..a2edfa6 100644 --- a/dlls/usp10/bidi.c +++ b/dlls/usp10/bidi.c @@ -901,7 +901,7 @@ BOOL BIDI_GetStrengths(LPCWSTR lpString, INT uCount, const SCRIPT_CONTROL *c, case AL: case RLE: case RLO: - lpStrength[i] = 1; + lpStrength[i] = BIDI_STRONG; break; case PDF: case EN: @@ -910,10 +910,14 @@ BOOL BIDI_GetStrengths(LPCWSTR lpString, INT uCount, const SCRIPT_CONTROL *c, case AN: case CS: case BN: - lpStrength[i] = 2; + lpStrength[i] = BIDI_WEAK; break; + case B: + case S: + case WS: + case ON: default: /* Neutrals and NSM */ - lpStrength[i] = 0; + lpStrength[i] = BIDI_NEUTRAL; } } return TRUE; diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 4ac7b8f..0496a56 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -805,6 +805,7 @@ HRESULT WINAPI ScriptItemizeOpenType(const WCHAR *pwcInChars, int cInChars, int WORD *levels = NULL; WORD *strength = NULL; WORD baselevel = 0; + BOOL new_run; TRACE("%s,%d,%d,%p,%p,%p,%p\n", debugstr_wn(pwcInChars, cInChars), cInChars, cMaxItems, psControl, psState, pItems, pcItems); @@ -876,10 +877,13 @@ HRESULT WINAPI ScriptItemizeOpenType(const WCHAR *pwcInChars, int cInChars, int pItems[index].a = scriptInformation[get_char_script(pwcInChars[cnt])].a; pScriptTags[index] = scriptInformation[get_char_script(pwcInChars[cnt])].scriptTag; - if (strength) + if (strength && strength[cnt] == BIDI_STRONG) str = strength[cnt]; + else if (strength) + str = strength[0]; cnt = 0; + if (levels) { pItems[index].a.fRTL = odd(levels[cnt]); @@ -899,9 +903,6 @@ HRESULT WINAPI ScriptItemizeOpenType(const WCHAR *pwcInChars, int cInChars, int for (cnt=1; cnt < cInChars; cnt++) { - if (levels && (levels[cnt] == pItems[index].a.s.uBidiLevel && (!strength || (strength[cnt] == 0 || strength[cnt] == str)))) - continue; - if(pwcInChars[cnt] != Numeric_space && pwcInChars[cnt] != ZWJ && pwcInChars[cnt] != ZWNJ) New_Script = get_char_script(pwcInChars[cnt]); else if (levels) @@ -915,17 +916,44 @@ HRESULT WINAPI ScriptItemizeOpenType(const WCHAR *pwcInChars, int cInChars, int New_Script = get_char_script(pwcInChars[cnt]); } - if ((levels && (levels[cnt] != pItems[index].a.s.uBidiLevel || (strength && (strength[cnt] != str)))) || (New_Script != -1 && New_Script != pItems[index].a.eScript) || New_Script == Script_Control) + new_run = FALSE; + /* merge space strengths*/ + if (strength && strength[cnt] == BIDI_STRONG && str != BIDI_STRONG && New_Script == pItems[index].a.eScript) + str = BIDI_STRONG; + + if (strength && strength[cnt] == BIDI_NEUTRAL && str == BIDI_STRONG && pwcInChars[cnt] != Numeric_space && New_Script == pItems[index].a.eScript) + str = BIDI_NEUTRAL; + + /* changes in level */ + if (levels && (levels[cnt] != pItems[index].a.s.uBidiLevel)) { - TRACE("New_Level = %i, New_Strength = %i, New_Script=%d, eScript=%d\n", levels?levels[cnt]:-1, strength?strength[cnt]:str, New_Script, pItems[index].a.eScript); + TRACE("Level break(%i/%i)\n",pItems[index].a.s.uBidiLevel,levels[cnt]); + new_run = TRUE; + } + /* changes in strength */ + else if (strength && pwcInChars[cnt] != Numeric_space && str != strength[cnt]) + { + TRACE("Strength break (%i/%i)\n",str,strength[cnt]); + new_run = TRUE; + } + /* changes in script */ + else if ((!levels) && (((pwcInChars[cnt] != Numeric_space) && (New_Script != -1) && (New_Script != pItems[index].a.eScript)) || (New_Script == Script_Control))) + { + TRACE("Script break(%i/%i)\n",pItems[index].a.eScript,New_Script); + new_run = TRUE; + } - if (strength && strength[cnt] != 0) - str = strength[cnt]; + if (new_run) + { + TRACE("New_Level = %i, New_Strength = %i, New_Script=%d, eScript=%d\n", levels?levels[cnt]:-1, strength?strength[cnt]:str, New_Script, pItems[index].a.eScript); index++; if (index+1 > cMaxItems) return E_OUTOFMEMORY; + if (strength) + str = strength[cnt]; + pItems[index].iCharPos = cnt; memset(&pItems[index].a, 0, sizeof(SCRIPT_ANALYSIS)); diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index 7a88ac7..9f13b40 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -122,6 +122,9 @@ typedef int (*lexical_function)(WCHAR c); typedef void (*reorder_function)(LPWSTR pwChar, IndicSyllable *syllable, lexical_function lex); #define odd(x) ((x) & 1) +#define BIDI_STRONG 1 +#define BIDI_WEAK 2 +#define BIDI_NEUTRAL 0 BOOL BIDI_DetermineLevels( LPCWSTR lpString, INT uCount, const SCRIPT_STATE *s, const SCRIPT_CONTROL *c, WORD *lpOutLevels ) DECLSPEC_HIDDEN;

1 0

Aric Stewart : usp10: Move scripts to an array initialized once to minimize get_char_script calls .
by Alexandre Julliard 15 Nov '11

15 Nov '11

Module: wine Branch: master Commit: 3767cebc8846529d1dbf8b16d6959f128dd2450a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3767cebc8846529d1dbf8b16d… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Nov 14 13:17:11 2011 -0700 usp10: Move scripts to an array initialized once to minimize get_char_script calls. --- dlls/usp10/usp10.c | 29 +++++++++++++++++++++-------- 1 files changed, 21 insertions(+), 8 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 0496a56..f297125 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -802,8 +802,10 @@ HRESULT WINAPI ScriptItemizeOpenType(const WCHAR *pwcInChars, int cInChars, int int cnt = 0, index = 0, str = 0; int New_Script = -1; + int i; WORD *levels = NULL; WORD *strength = NULL; + WORD *scripts = NULL; WORD baselevel = 0; BOOL new_run; @@ -813,12 +815,21 @@ HRESULT WINAPI ScriptItemizeOpenType(const WCHAR *pwcInChars, int cInChars, int if (!pwcInChars || !cInChars || !pItems || cMaxItems < 2) return E_INVALIDARG; + scripts = heap_alloc(cInChars * sizeof(WORD)); + if (!scripts) + return E_OUTOFMEMORY; + + for (i = 0; i < cInChars; i++) + scripts[i] = get_char_script(pwcInChars[i]); + if (psState && psControl) { - int i; levels = heap_alloc_zero(cInChars * sizeof(WORD)); if (!levels) + { + heap_free(scripts); return E_OUTOFMEMORY; + } BIDI_DetermineLevels(pwcInChars, cInChars, psState, psControl, levels); baselevel = levels[0]; @@ -838,6 +849,7 @@ HRESULT WINAPI ScriptItemizeOpenType(const WCHAR *pwcInChars, int cInChars, int strength = heap_alloc_zero(cInChars * sizeof(WORD)); if (!strength) { + heap_free(scripts); heap_free(levels); return E_OUTOFMEMORY; } @@ -848,7 +860,7 @@ HRESULT WINAPI ScriptItemizeOpenType(const WCHAR *pwcInChars, int cInChars, int { if ((levels[i] == 0 || (odd(psState->uBidiLevel) && levels[i] == psState->uBidiLevel+1)) && inNumber && strchrW(math_punc,pwcInChars[i])) levels[i] = 2; - else if ((levels[i] == 0 || (odd(psState->uBidiLevel) && levels[i] == psState->uBidiLevel+1)) && get_char_script(pwcInChars[i]) == Script_Numeric) + else if ((levels[i] == 0 || (odd(psState->uBidiLevel) && levels[i] == psState->uBidiLevel+1)) && scripts[i] == Script_Numeric) { levels[i] = 2; inNumber = TRUE; @@ -870,12 +882,12 @@ HRESULT WINAPI ScriptItemizeOpenType(const WCHAR *pwcInChars, int cInChars, int if (cnt == cInChars) /* All Spaces */ { cnt = 0; - New_Script = get_char_script(pwcInChars[cnt]); + New_Script = scripts[cnt]; } pItems[index].iCharPos = 0; - pItems[index].a = scriptInformation[get_char_script(pwcInChars[cnt])].a; - pScriptTags[index] = scriptInformation[get_char_script(pwcInChars[cnt])].scriptTag; + pItems[index].a = scriptInformation[scripts[cnt]].a; + pScriptTags[index] = scriptInformation[scripts[cnt]].scriptTag; if (strength && strength[cnt] == BIDI_STRONG) str = strength[cnt]; @@ -904,16 +916,16 @@ HRESULT WINAPI ScriptItemizeOpenType(const WCHAR *pwcInChars, int cInChars, int for (cnt=1; cnt < cInChars; cnt++) { if(pwcInChars[cnt] != Numeric_space && pwcInChars[cnt] != ZWJ && pwcInChars[cnt] != ZWNJ) - New_Script = get_char_script(pwcInChars[cnt]); + New_Script = scripts[cnt]; else if (levels) { int j = 1; while (cnt + j < cInChars - 1 && (pwcInChars[cnt+j] == Numeric_space || pwcInChars[cnt+j] == ZWJ || pwcInChars[cnt+j] == ZWNJ) && levels[cnt] == levels[cnt+j]) j++; if (cnt + j < cInChars && levels[cnt] == levels[cnt+j]) - New_Script = get_char_script(pwcInChars[cnt+j]); + New_Script = scripts[cnt+j]; else - New_Script = get_char_script(pwcInChars[cnt]); + New_Script = scripts[cnt]; } new_run = FALSE; @@ -992,6 +1004,7 @@ HRESULT WINAPI ScriptItemizeOpenType(const WCHAR *pwcInChars, int cInChars, int pItems[index].iCharPos = cnt; /* the last item contains the ptr to the lastchar */ heap_free(levels); heap_free(strength); + heap_free(scripts); return S_OK; }

1 0

Aric Stewart : usp10: Merge neutral scripts.
by Alexandre Julliard 15 Nov '11

15 Nov '11

Module: wine Branch: master Commit: 145102c7fdd5968afa3a16135ed8478a2e642714 URL: http://source.winehq.org/git/wine.git/?a=commit;h=145102c7fdd5968afa3a16135… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Nov 14 13:17:25 2011 -0700 usp10: Merge neutral scripts. --- dlls/usp10/usp10.c | 37 +++++++++++++++++++++++++++++++++++-- 1 files changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index f297125..0ffab66 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -870,8 +870,41 @@ HRESULT WINAPI ScriptItemizeOpenType(const WCHAR *pwcInChars, int cInChars, int } if (psControl->fMergeNeutralItems) { - HeapFree(GetProcessHeap(),0,strength); - strength = NULL; + /* Merge the neutrals */ + for (i = 0; i < cInChars; i++) + { + if (strength[i] == BIDI_NEUTRAL || strength[i] == BIDI_WEAK) + { + int j; + for (j = i; j > 0; j--) + { + if (levels[i] != levels[j]) + break; + if ((strength[j] == BIDI_STRONG) || (strength[i] == BIDI_NEUTRAL && strength[j] == BIDI_WEAK)) + { + scripts[i] = scripts[j]; + strength[i] = strength[j]; + break; + } + } + } + /* Try going the other way */ + if (strength[i] == BIDI_NEUTRAL || strength[i] == BIDI_WEAK) + { + int j; + for (j = i; j < cInChars; j++) + { + if (levels[i] != levels[j]) + break; + if ((strength[j] == BIDI_STRONG) || (strength[i] == BIDI_NEUTRAL && strength[j] == BIDI_WEAK)) + { + scripts[i] = scripts[j]; + strength[i] = strength[j]; + break; + } + } + } + } } } }

1 0

Aric Stewart : usp10: Pay attention to script changes for bidi run itemization.
by Alexandre Julliard 15 Nov '11

15 Nov '11

Module: wine Branch: master Commit: 6c3398d9574e449628bfdaf250661104935db7a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c3398d9574e449628bfdaf25… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Nov 14 13:17:37 2011 -0700 usp10: Pay attention to script changes for bidi run itemization. --- dlls/usp10/usp10.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 0ffab66..50e8471 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -859,7 +859,10 @@ HRESULT WINAPI ScriptItemizeOpenType(const WCHAR *pwcInChars, int cInChars, int for (i = 0; i < cInChars; i++) { if ((levels[i] == 0 || (odd(psState->uBidiLevel) && levels[i] == psState->uBidiLevel+1)) && inNumber && strchrW(math_punc,pwcInChars[i])) + { + scripts[i] = Script_Numeric; levels[i] = 2; + } else if ((levels[i] == 0 || (odd(psState->uBidiLevel) && levels[i] == psState->uBidiLevel+1)) && scripts[i] == Script_Numeric) { levels[i] = 2; @@ -982,7 +985,7 @@ HRESULT WINAPI ScriptItemizeOpenType(const WCHAR *pwcInChars, int cInChars, int new_run = TRUE; } /* changes in script */ - else if ((!levels) && (((pwcInChars[cnt] != Numeric_space) && (New_Script != -1) && (New_Script != pItems[index].a.eScript)) || (New_Script == Script_Control))) + else if (((pwcInChars[cnt] != Numeric_space) && (New_Script != -1) && (New_Script != pItems[index].a.eScript)) || (New_Script == Script_Control)) { TRACE("Script break(%i/%i)\n",pItems[index].a.eScript,New_Script); new_run = TRUE;

1 0

Aric Stewart : usp10: Devanagari danda and double danda are used for all Indic scripts.
by Alexandre Julliard 15 Nov '11

15 Nov '11

Module: wine Branch: master Commit: e5d33f08c7282935c2c5315b1fa8eb154eedbf0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5d33f08c7282935c2c5315b1… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Nov 15 11:02:31 2011 -0700 usp10: Devanagari danda and double danda are used for all Indic scripts. --- dlls/usp10/usp10.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 50e8471..94c49fe 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -772,6 +772,11 @@ HRESULT WINAPI ScriptApplyDigitSubstitution(const SCRIPT_DIGITSUBSTITUTE *sds, } } +static inline BOOL is_indic(WORD script) +{ + return (script >= Script_Devanagari && script <= Script_Malayalam_Numeric); +} + /*********************************************************************** * ScriptItemizeOpenType (USP10.@) * @@ -808,6 +813,7 @@ HRESULT WINAPI ScriptItemizeOpenType(const WCHAR *pwcInChars, int cInChars, int WORD *scripts = NULL; WORD baselevel = 0; BOOL new_run; + WORD last_indic = -1; TRACE("%s,%d,%d,%p,%p,%p,%p\n", debugstr_wn(pwcInChars, cInChars), cInChars, cMaxItems, psControl, psState, pItems, pcItems); @@ -820,7 +826,15 @@ HRESULT WINAPI ScriptItemizeOpenType(const WCHAR *pwcInChars, int cInChars, int return E_OUTOFMEMORY; for (i = 0; i < cInChars; i++) + { scripts[i] = get_char_script(pwcInChars[i]); + /* Devanagari danda (U+0964) and double danda (U+0965) are used for + all Indic scripts */ + if ((pwcInChars[i] == 0x964 || pwcInChars[i] ==0x965) && last_indic > 0) + scripts[i] = last_indic; + else if (is_indic(scripts[i])) + last_indic = scripts[i]; + } if (psState && psControl) {

1 0

Aric Stewart : usp10: Properly set LayoutRTL.
by Alexandre Julliard 15 Nov '11

15 Nov '11

Module: wine Branch: master Commit: 7868be6e707404229ca7eedea743d280d146995b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7868be6e707404229ca7eedea… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Nov 14 13:18:02 2011 -0700 usp10: Properly set LayoutRTL. --- dlls/usp10/tests/usp10.c | 10 +++++----- dlls/usp10/usp10.c | 19 ++++++++++++++++--- 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index a6e75a1..0718451 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -148,13 +148,13 @@ static void test_ScriptItemize( void ) static const WCHAR test1c[] = {' ', ' ', ' ', '1', '2', ' ',0}; static const itemTest t1c1[2] = {{{0,0,0,0,0},0,0,0,0,0},{{0,0,0,0,0},6,0,0,0,-1}}; - static const itemTest t1c2[4] = {{{0,0,0,0,0},0,1,1,1,0},{{0,0,1,0,0},3,0,1,2,0},{{0,0,0,0,0},5,1,1,1,0},{{0,0,0,0,0},6,0,0,0,-1}}; + static const itemTest t1c2[4] = {{{0,0,0,0,0},0,1,1,1,0},{{0,0,0,0,0},3,0,1,2,0},{{0,0,0,0,0},5,1,1,1,0},{{0,0,0,0,0},6,0,0,0,-1}}; /* Arabic, English*/ static const WCHAR test2[] = {'1','2','3','-','5','2',0x064a,0x064f,0x0633,0x0627,0x0648,0x0650,0x064a,'7','1','.',0}; static const itemTest t21[7] = {{{0,0,0,0,0},0,0,0,0,0},{{0,0,0,0,0},3,0,0,0,0},{{0,0,0,0,0},4,0,0,0,0},{{0,0,0,0,0},6,1,1,1,arab_tag},{{0,0,0,0,0},13,0,0,0,0},{{0,0,0,0,0},15,0,0,0,0},{{0,0,0,0,0},16,0,0,0,-1}}; - static const itemTest t22[5] = {{{0,0,0,0,0},0,0,0,2,0},{{0,0,0,0,0},6,1,1,1,arab_tag},{{0,0,1,0,0},13,0,1,2,0},{{0,0,0,0,0},15,0,0,0,0},{{0,0,0,0,0},16,0,0,0,-1}}; - static const itemTest t23[5] = {{{0,0,1,0,0},0,0,1,2,0},{{0,0,0,0,0},6,1,1,1,arab_tag},{{0,0,1,0,0},13,0,1,2,0},{{0,0,0,0,0},15,1,1,1,0},{{0,0,0,0,0},16,0,0,0,-1}}; + static const itemTest t22[5] = {{{0,0,0,0,0},0,0,0,2,0},{{0,0,0,0,0},6,1,1,1,arab_tag},{{0,0,0,0,0},13,0,1,2,0},{{0,0,0,0,0},15,0,0,0,0},{{0,0,0,0,0},16,0,0,0,-1}}; + static const itemTest t23[5] = {{{0,0,0,0,0},0,0,1,2,0},{{0,0,0,0,0},6,1,1,1,arab_tag},{{0,0,0,0,0},13,0,1,2,0},{{0,0,0,0,0},15,1,1,1,0},{{0,0,0,0,0},16,0,0,0,-1}}; static const WCHAR test2b[] = {'A','B','C','-','D','E','F',' ',0x0621,0x0623,0x0624,0}; static const itemTest t2b1[5] = {{{0,0,0,0,0},0,0,0,0,latn_tag},{{0,0,0,0,0},3,0,0,0,0},{{0,0,0,0,0},4,0,0,0,latn_tag},{{0,0,0,0,0},8,1,1,1,arab_tag},{{0,0,0,0,0},11,0,0,0,-1}}; @@ -188,8 +188,8 @@ static void test_ScriptItemize( void ) static const WCHAR test4[] = {'1','2','3','-','5','2',' ','i','s',' ','7','1','.',0}; static const itemTest t41[6] = {{{0,0,0,0,0},0,0,0,0,0},{{0,0,0,0,0},3,0,0,0,0},{{0,0,0,0,0},4,0,0,0,0},{{0,0,0,0,0},7,0,0,0,latn_tag},{{0,0,0,0,0},10,0,0,0,0},{{0,0,0,0,0},12,0,0,0,-1}}; - static const itemTest t42[5] = {{{0,0,1,0,0},0,0,1,2,0},{{0,0,0,0,0},6,1,1,1,0},{{0,0,0,0,0},7,0,0,2,latn_tag},{{0,0,0,0,0},10,0,0,2,0},{{0,0,0,0,0},12,0,0,0,-1}}; - static const itemTest t43[4] = {{{0,0,1,0,0},0,0,1,2,0},{{0,0,0,0,0},6,1,1,1,0},{{0,0,0,0,0},7,0,0,2,latn_tag},{{0,0,0,0,0},12,0,0,0,-1}}; + static const itemTest t42[5] = {{{0,0,0,0,0},0,0,1,2,0},{{0,0,0,0,0},6,1,1,1,0},{{0,0,0,0,0},7,0,0,2,latn_tag},{{0,0,0,0,0},10,0,0,2,0},{{0,0,0,0,0},12,0,0,0,-1}}; + static const itemTest t43[4] = {{{0,0,0,0,0},0,0,1,2,0},{{0,0,0,0,0},6,1,1,1,0},{{0,0,0,0,0},7,0,0,2,latn_tag},{{0,0,0,0,0},12,0,0,0,-1}}; /* Arabic */ static const WCHAR test5[] = diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 94c49fe..589711d 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -814,6 +814,7 @@ HRESULT WINAPI ScriptItemizeOpenType(const WCHAR *pwcInChars, int cInChars, int WORD baselevel = 0; BOOL new_run; WORD last_indic = -1; + WORD layoutRTL = 0; TRACE("%s,%d,%d,%p,%p,%p,%p\n", debugstr_wn(pwcInChars, cInChars), cInChars, cMaxItems, psControl, psState, pItems, pcItems); @@ -948,12 +949,14 @@ HRESULT WINAPI ScriptItemizeOpenType(const WCHAR *pwcInChars, int cInChars, int if (levels) { + layoutRTL = (psState->uBidiLevel || odd(levels[cnt]))?1:0; pItems[index].a.fRTL = odd(levels[cnt]); - pItems[index].a.fLayoutRTL = odd(levels[cnt]); + pItems[index].a.fLayoutRTL = layoutRTL; pItems[index].a.s.uBidiLevel = levels[cnt]; } else if (!pItems[index].a.s.uBidiLevel) { + layoutRTL = (odd(baselevel))?1:0; pItems[index].a.s.uBidiLevel = baselevel; pItems[index].a.fLayoutRTL = odd(baselevel); pItems[index].a.fRTL = odd(baselevel); @@ -1005,6 +1008,12 @@ HRESULT WINAPI ScriptItemizeOpenType(const WCHAR *pwcInChars, int cInChars, int new_run = TRUE; } + if (!new_run && strength && str == BIDI_STRONG) + { + layoutRTL = odd(levels[cnt])?1:0; + pItems[index].a.fLayoutRTL = layoutRTL; + } + if (new_run) { TRACE("New_Level = %i, New_Strength = %i, New_Script=%d, eScript=%d\n", levels?levels[cnt]:-1, strength?strength[cnt]:str, New_Script, pItems[index].a.eScript); @@ -1023,14 +1032,18 @@ HRESULT WINAPI ScriptItemizeOpenType(const WCHAR *pwcInChars, int cInChars, int pScriptTags[index] = scriptInformation[New_Script].scriptTag; if (levels) { + if (levels[cnt] == 0) + layoutRTL = 0; + else + layoutRTL = (layoutRTL || odd(levels[cnt]))?1:0; pItems[index].a.fRTL = odd(levels[cnt]); - pItems[index].a.fLayoutRTL = odd(levels[cnt]); + pItems[index].a.fLayoutRTL = layoutRTL; pItems[index].a.s.uBidiLevel = levels[cnt]; } else if (!pItems[index].a.s.uBidiLevel) { pItems[index].a.s.uBidiLevel = baselevel; - pItems[index].a.fLayoutRTL = odd(baselevel); + pItems[index].a.fLayoutRTL = layoutRTL; pItems[index].a.fRTL = odd(baselevel); }

1 0

Alexandre Julliard : winex11: Remove check for DIB color table in ExtTextOut.
by Alexandre Julliard 15 Nov '11

15 Nov '11

Module: wine Branch: master Commit: 1ff5f3d56fcc3d4d49c13139a88a9c13edc4ada4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ff5f3d56fcc3d4d49c13139a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 14 21:25:47 2011 +0100 winex11: Remove check for DIB color table in ExtTextOut. --- dlls/winex11.drv/xrender.c | 29 ++--------------------------- 1 files changed, 2 insertions(+), 27 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 7ba61a3..e6fb9f0 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -1964,22 +1964,6 @@ static int XRenderErrorHandler(Display *dpy, XErrorEvent *event, void *arg) return 1; } -/******************************************************************** - * is_dib_with_colortable - * - * Return TRUE if physdev is backed by a dibsection with <= 8 bits per pixel - */ -static inline BOOL is_dib_with_colortable( X11DRV_PDEVICE *physDev ) -{ - DIBSECTION dib; - - if( physDev->bitmap && GetObjectW( physDev->bitmap->hbitmap, sizeof(dib), &dib ) == sizeof(dib) && - dib.dsBmih.biBitCount <= 8 ) - return TRUE; - - return FALSE; -} - /*********************************************************************** * xrenderdrv_ExtTextOut */ @@ -1993,7 +1977,6 @@ static BOOL xrenderdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, BOOL retv = FALSE; int textPixel, backgroundPixel; RGNDATA *saved_region = NULL; - BOOL disable_antialias = FALSE; AA_Type aa_type = AA_None; unsigned int idx; Picture tile_pict = 0; @@ -2004,12 +1987,6 @@ static BOOL xrenderdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, return dev->funcs->pExtTextOut( dev, x, y, flags, lprect, wstr, count, lpDx ); } - if(is_dib_with_colortable( physdev->x11dev )) - { - TRACE("Disabling antialiasing\n"); - disable_antialias = TRUE; - } - xgcval.function = GXcopy; xgcval.background = physdev->x11dev->backgroundPixel; xgcval.fill_style = FillSolid; @@ -2051,16 +2028,14 @@ static BOOL xrenderdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, EnterCriticalSection(&xrender_cs); entry = glyphsetCache + physdev->cache_index; - if( disable_antialias == FALSE ) - aa_type = entry->aa_default; + aa_type = entry->aa_default; formatEntry = entry->format[aa_type]; for(idx = 0; idx < count; idx++) { if( !formatEntry ) { UploadGlyph(physdev, wstr[idx], aa_type); /* re-evaluate antialias since aa_default may have changed */ - if( disable_antialias == FALSE ) - aa_type = entry->aa_default; + aa_type = entry->aa_default; formatEntry = entry->format[aa_type]; } else if( wstr[idx] >= formatEntry->nrealized || formatEntry->realized[wstr[idx]] == FALSE) { UploadGlyph(physdev, wstr[idx], aa_type);

1 0