November 2011 - Wine-Commits

Frédéric Delanoy : shlwapi: Avoid harcoding array lengths.
by Alexandre Julliard Nov. 21, 2011

Nov. 21, 2011

Module: wine Branch: master Commit: ce3dd89b5411edfdf448bd80ac8dd2b71a972e53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce3dd89b5411edfdf448bd80a… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Nov 21 09:34:54 2011 +0100 shlwapi: Avoid harcoding array lengths. --- dlls/shlwapi/path.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/path.c b/dlls/shlwapi/path.c index 43c3225..92a830b 100644 --- a/dlls/shlwapi/path.c +++ b/dlls/shlwapi/path.c @@ -1074,7 +1074,7 @@ int WINAPI PathParseIconLocationW(LPWSTR lpszPath) */ BOOL WINAPI PathFileExistsDefExtW(LPWSTR lpszPath,DWORD dwWhich) { - static const WCHAR pszExts[7][5] = { { '.', 'p', 'i', 'f', 0}, + static const WCHAR pszExts[][5] = { { '.', 'p', 'i', 'f', 0}, { '.', 'c', 'o', 'm', 0}, { '.', 'e', 'x', 'e', 0}, { '.', 'b', 'a', 't', 0},

1 0

Aric Stewart : usp10: Cache the script with the feature so that in caches with multiple scripts we do not fetch the wrong feature from the cache .
by Alexandre Julliard Nov. 21, 2011

Nov. 21, 2011

Module: wine Branch: master Commit: 25d43d7a09f15fe84f19d31940a64160fc1c8c97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25d43d7a09f15fe84f19d3194… Author: Aric Stewart <aric(a)codeweavers.com> Date: Sun Nov 20 21:06:18 2011 -0700 usp10: Cache the script with the feature so that in caches with multiple scripts we do not fetch the wrong feature from the cache. --- dlls/usp10/shape.c | 8 +++++++- dlls/usp10/usp10_internal.h | 3 ++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index c463681..66d65c2 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -1094,11 +1094,16 @@ static const char* get_opentype_script(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCach static LPCVOID load_GSUB_feature(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache *psc, const char* feat) { const GSUB_Feature *feature; + const char* script; int i; + script = get_opentype_script(hdc,psa,psc,FALSE); + for (i = 0; i < psc->feature_count; i++) - if (strncmp(psc->features[i].tag,feat,4)==0) + { + if (strncmp(psc->features[i].tag,feat,4)==0 && strncmp(psc->features[i].script,script,4)==0) return psc->features[i].feature; + } feature = NULL; @@ -1146,6 +1151,7 @@ static LPCVOID load_GSUB_feature(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache *psc psc->features = HeapAlloc(GetProcessHeap(), 0, psc->feature_count * sizeof(LoadedFeature)); lstrcpynA(psc->features[psc->feature_count - 1].tag, feat, 5); + lstrcpynA(psc->features[psc->feature_count - 1].script, script, 5); psc->features[psc->feature_count - 1].feature = feature; return feature; } diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index ebf9667..6f5d3d1 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -82,7 +82,8 @@ #define GLYPH_MAX 65536 typedef struct { - char tag[4]; + char tag[5]; + char script[5]; LPCVOID feature; } LoadedFeature;

1 0

Nikolay Sivov : msxml3: Forward IDispatch to IDispatchEx when supported.
by Alexandre Julliard Nov. 21, 2011

Nov. 21, 2011

Module: wine Branch: master Commit: ed908b7b182f29fdd301ab9d4888d5fe63f7ade4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed908b7b182f29fdd301ab9d4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Nov 19 19:32:23 2011 +0300 msxml3: Forward IDispatch to IDispatchEx when supported. --- dlls/msxml3/attribute.c | 51 +++++---------------------------------- dlls/msxml3/cdata.c | 52 +++++----------------------------------- dlls/msxml3/comment.c | 52 +++++----------------------------------- dlls/msxml3/docfrag.c | 52 +++++----------------------------------- dlls/msxml3/doctype.c | 52 +++++----------------------------------- dlls/msxml3/domdoc.c | 58 ++++++--------------------------------------- dlls/msxml3/domimpl.c | 49 +++++--------------------------------- dlls/msxml3/element.c | 52 +++++----------------------------------- dlls/msxml3/entityref.c | 51 +++++---------------------------------- dlls/msxml3/nodemap.c | 47 +++++------------------------------- dlls/msxml3/parseerror.c | 49 +++++--------------------------------- dlls/msxml3/selection.c | 49 +++++--------------------------------- dlls/msxml3/text.c | 52 +++++----------------------------------- 13 files changed, 92 insertions(+), 574 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ed908b7b182f29fdd301a…

1 0

Henri Verbeet : wined3d: Recognize the SM4 eq opcode.
by Alexandre Julliard Nov. 21, 2011

Nov. 21, 2011

Module: wine Branch: master Commit: af11214562c6850d20e1fa37f58b52d0bc99c56b URL: http://source.winehq.org/git/wine.git/?a=commit;h=af11214562c6850d20e1fa37f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Nov 20 20:27:09 2011 +0100 wined3d: Recognize the SM4 eq opcode. --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 9b4659e..2399c82 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5053,6 +5053,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_ENDIF */ shader_hw_endif, /* WINED3DSIH_ENDLOOP */ shader_hw_endloop, /* WINED3DSIH_ENDREP */ shader_hw_endrep, + /* WINED3DSIH_EQ */ NULL, /* WINED3DSIH_EXP */ shader_hw_scalar_op, /* WINED3DSIH_EXPP */ shader_hw_scalar_op, /* WINED3DSIH_FRC */ shader_hw_map2gl, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 1746cb4..3e5efad 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5008,6 +5008,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_ENDIF */ shader_glsl_end, /* WINED3DSIH_ENDLOOP */ shader_glsl_end, /* WINED3DSIH_ENDREP */ shader_glsl_end, + /* WINED3DSIH_EQ */ NULL, /* WINED3DSIH_EXP */ shader_glsl_map2gl, /* WINED3DSIH_EXPP */ shader_glsl_expp, /* WINED3DSIH_FRC */ shader_glsl_map2gl, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 447de8f..3386070 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -64,6 +64,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_ENDIF */ "endif", /* WINED3DSIH_ENDLOOP */ "endloop", /* WINED3DSIH_ENDREP */ "endrep", + /* WINED3DSIH_EQ */ "eq", /* WINED3DSIH_EXP */ "exp", /* WINED3DSIH_EXPP */ "expp", /* WINED3DSIH_FRC */ "frc", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 0e81b4e..5739e1d 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -65,6 +65,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_EMIT = 0x13, WINED3D_SM4_OP_ENDIF = 0x15, WINED3D_SM4_OP_ENDLOOP = 0x16, + WINED3D_SM4_OP_EQ = 0x18, WINED3D_SM4_OP_EXP = 0x19, WINED3D_SM4_OP_FRC = 0x1a, WINED3D_SM4_OP_FTOI = 0x1b, @@ -148,6 +149,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_EMIT, WINED3DSIH_EMIT, 0, 0}, {WINED3D_SM4_OP_ENDIF, WINED3DSIH_ENDIF, 0, 0}, {WINED3D_SM4_OP_ENDLOOP, WINED3DSIH_ENDLOOP, 0, 0}, + {WINED3D_SM4_OP_EQ, WINED3DSIH_EQ, 1, 2}, {WINED3D_SM4_OP_EXP, WINED3DSIH_EXP, 1, 1}, {WINED3D_SM4_OP_FRC, WINED3DSIH_FRC, 1, 1}, {WINED3D_SM4_OP_FTOI, WINED3DSIH_FTOI, 1, 1}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index cac3668..5c4debc 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -437,6 +437,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_ENDIF, WINED3DSIH_ENDLOOP, WINED3DSIH_ENDREP, + WINED3DSIH_EQ, WINED3DSIH_EXP, WINED3DSIH_EXPP, WINED3DSIH_FRC,

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DMATERIAL typedef.
by Alexandre Julliard Nov. 21, 2011

Nov. 21, 2011

Module: wine Branch: master Commit: 02bb70fc3b8bdec341d4680aaba2c08531785e9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=02bb70fc3b8bdec341d4680aa… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Nov 20 20:27:13 2011 +0100 wined3d: Get rid of the WINED3DMATERIAL typedef. --- dlls/d3d8/device.c | 8 +++--- dlls/d3d9/device.c | 8 +++--- dlls/ddraw/device.c | 8 +++--- dlls/wined3d/device.c | 30 ++++++++++---------- dlls/wined3d/state.c | 56 ++++++++++++++++++++------------------- dlls/wined3d/wined3d_private.h | 2 +- include/wine/wined3d.h | 18 ++++++------ 7 files changed, 66 insertions(+), 64 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=02bb70fc3b8bdec341d46…

1 0

Henri Verbeet : wined3d: Recognize the SM4 round_ni opcode.
by Alexandre Julliard Nov. 21, 2011

Nov. 21, 2011

Module: wine Branch: master Commit: e2d099a14d29b3aa904cf8f7ccdc5ae3af22fc63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2d099a14d29b3aa904cf8f7c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Nov 20 20:27:11 2011 +0100 wined3d: Recognize the SM4 round_ni opcode. --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 34775a5..32197d5 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5093,6 +5093,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_RCP */ shader_hw_rcp, /* WINED3DSIH_REP */ shader_hw_rep, /* WINED3DSIH_RET */ shader_hw_ret, + /* WINED3DSIH_ROUND_NI */ NULL, /* WINED3DSIH_RSQ */ shader_hw_scalar_op, /* WINED3DSIH_SAMPLE */ NULL, /* WINED3DSIH_SAMPLE_GRAD */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 5e4153f..9d88794 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5048,6 +5048,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_RCP */ shader_glsl_rcp, /* WINED3DSIH_REP */ shader_glsl_rep, /* WINED3DSIH_RET */ shader_glsl_ret, + /* WINED3DSIH_ROUND_NI */ NULL, /* WINED3DSIH_RSQ */ shader_glsl_rsq, /* WINED3DSIH_SAMPLE */ NULL, /* WINED3DSIH_SAMPLE_GRAD */ NULL, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index a82c13c..e182435 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -104,6 +104,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_RCP */ "rcp", /* WINED3DSIH_REP */ "rep", /* WINED3DSIH_RET */ "ret", + /* WINED3DSIH_ROUND_NI */ "round_ni", /* WINED3DSIH_RSQ */ "rsq", /* WINED3DSIH_SAMPLE */ "sample", /* WINED3DSIH_SAMPLE_GRAD */ "sample_d", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index c9a96fc..973d606 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -87,6 +87,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_MOVC = 0x37, WINED3D_SM4_OP_MUL = 0x38, WINED3D_SM4_OP_RET = 0x3e, + WINED3D_SM4_OP_ROUND_NI = 0x41, WINED3D_SM4_OP_RSQ = 0x44, WINED3D_SM4_OP_SAMPLE = 0x45, WINED3D_SM4_OP_SAMPLE_LOD = 0x48, @@ -172,6 +173,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_MOVC, WINED3DSIH_MOVC, 1, 3}, {WINED3D_SM4_OP_MUL, WINED3DSIH_MUL, 1, 2}, {WINED3D_SM4_OP_RET, WINED3DSIH_RET, 0, 0}, + {WINED3D_SM4_OP_ROUND_NI, WINED3DSIH_ROUND_NI, 1, 1}, {WINED3D_SM4_OP_RSQ, WINED3DSIH_RSQ, 1, 1}, {WINED3D_SM4_OP_SAMPLE, WINED3DSIH_SAMPLE, 1, 3}, {WINED3D_SM4_OP_SAMPLE_LOD, WINED3DSIH_SAMPLE_LOD, 1, 4}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3a30c4d..ad179f3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -477,6 +477,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_RCP, WINED3DSIH_REP, WINED3DSIH_RET, + WINED3DSIH_ROUND_NI, WINED3DSIH_RSQ, WINED3DSIH_SAMPLE, WINED3DSIH_SAMPLE_GRAD,

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DLIGHT typedef.
by Alexandre Julliard Nov. 21, 2011

Nov. 21, 2011

Module: wine Branch: master Commit: f5973597274c3e74a40a30b6509cb6f5ad7e79d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5973597274c3e74a40a30b65… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Nov 20 20:27:12 2011 +0100 wined3d: Get rid of the WINED3DLIGHT typedef. --- dlls/d3d8/device.c | 8 ++-- dlls/d3d9/device.c | 8 ++-- dlls/ddraw/device.c | 8 ++-- dlls/wined3d/device.c | 64 ++++++++++++++++++++------------------- dlls/wined3d/state.c | 50 ++++++++++++++++--------------- dlls/wined3d/wined3d_private.h | 4 +- include/wine/wined3d.h | 38 ++++++++++++----------- 7 files changed, 93 insertions(+), 87 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f5973597274c3e74a40a3…

1 0

Francois Gouget : ddraw/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard Nov. 21, 2011

Nov. 21, 2011

Module: wine Branch: master Commit: 3315918eaccfbcd8296e161f189e0ecb529dbe89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3315918eaccfbcd8296e161f1… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Nov 20 22:53:21 2011 +0100 ddraw/tests: Fix compilation on systems that don't support nameless unions. --- dlls/ddraw/tests/dsurface.c | 6 +++--- dlls/ddraw/tests/overlay.c | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index ca9d3b7..9bf5643 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -4547,7 +4547,7 @@ static void set_surface_desc_test(void) IDirectDrawSurface_Release(surface); hr = IDirectDrawSurface3_GetSurfaceDesc(surface3, &ddsd); ok(SUCCEEDED(hr), "IDirectDrawSurface3_GetSurfaceDesc failed, hr %#x.\n", hr); - old_pitch = ddsd.lPitch; + old_pitch = U1(ddsd).lPitch; /* Setting width and height is an error */ reset_ddsd(&ddsd); @@ -4570,14 +4570,14 @@ static void set_surface_desc_test(void) /* Setting the pitch is an error */ reset_ddsd(&ddsd); ddsd.dwFlags = DDSD_PITCH; - ddsd.lPitch = 1024; + U1(ddsd).lPitch = 1024; hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0); ok(hr == DDERR_INVALIDPARAMS, "SetSurfaceDesc returned %#x, expected %#x\n", hr, DDERR_INVALIDPARAMS); ddsd.dwFlags = DDSD_PITCH | DDSD_LPSURFACE; ddsd.lpSurface = data; hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0); ok(hr == DDERR_INVALIDPARAMS, "SetSurfaceDesc returned %#x, expected %#x\n", hr, DDERR_INVALIDPARAMS); - ddsd.lPitch = old_pitch; + U1(ddsd).lPitch = old_pitch; hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0); ok(hr == DDERR_INVALIDPARAMS, "SetSurfaceDesc returned %#x, expected %#x\n", hr, DDERR_INVALIDPARAMS); diff --git a/dlls/ddraw/tests/overlay.c b/dlls/ddraw/tests/overlay.c index 64d0063..2cf48c7 100644 --- a/dlls/ddraw/tests/overlay.c +++ b/dlls/ddraw/tests/overlay.c @@ -225,17 +225,17 @@ static void yv12_test(void) /* Luminance */ for (y = 0; y < desc.dwHeight; y++) { - memset(base + desc.lPitch * y, 0x10, desc.dwWidth); + memset(base + U1(desc).lPitch * y, 0x10, desc.dwWidth); } /* V */ for (; y < desc.dwHeight + desc.dwHeight / 4; y++) { - memset(base + desc.lPitch * y, 0x20, desc.dwWidth); + memset(base + U1(desc).lPitch * y, 0x20, desc.dwWidth); } /* U */ for (; y < desc.dwHeight + desc.dwHeight / 2; y++) { - memset(base + desc.lPitch * y, 0x30, desc.dwWidth); + memset(base + U1(desc).lPitch * y, 0x30, desc.dwWidth); } hr = IDirectDrawSurface7_Unlock(surface, NULL); @@ -276,9 +276,9 @@ static void yv12_test(void) base = desc.lpSurface; ok(base[0] == 0x10, "Y data is 0x%02x, expected 0x10\n", base[0]); - base += desc.dwHeight * desc.lPitch; + base += desc.dwHeight * U1(desc).lPitch; todo_wine ok(base[0] == 0x20, "V data is 0x%02x, expected 0x20\n", base[0]); - base += desc.dwHeight / 4 * desc.lPitch; + base += desc.dwHeight / 4 * U1(desc).lPitch; todo_wine ok(base[0] == 0x30, "U data is 0x%02x, expected 0x30\n", base[0]); hr = IDirectDrawSurface7_Unlock(dst, NULL);

1 0

Aric Stewart : usp10: Improve handling for ZWJ and ZWNJ in itemization.
by Alexandre Julliard Nov. 21, 2011

Nov. 21, 2011

Module: wine Branch: master Commit: bba75dd0a71645103cf3d6c094a3eaa3f010fdb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bba75dd0a71645103cf3d6c09… Author: Aric Stewart <aric(a)codeweavers.com> Date: Sun Nov 20 21:03:53 2011 -0700 usp10: Improve handling for ZWJ and ZWNJ in itemization. --- dlls/usp10/usp10.c | 45 +++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 41 insertions(+), 4 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 535441f..ce4dbcd 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -866,6 +866,28 @@ HRESULT WINAPI ScriptItemizeOpenType(const WCHAR *pwcInChars, int cInChars, int last_indic = base_indic(scripts[i]); } + for (i = 0; i < cInChars; i++) + { + /* Joiners get merged preferencially right */ + if (i > 0 && (pwcInChars[i] == ZWJ || pwcInChars[i] == ZWNJ)) + { + int j; + if (i+1 == cInChars) + scripts[i] = scripts[i-1]; + else + { + for (j = i+1; j < cInChars; j++) + { + if (pwcInChars[j] != ZWJ && pwcInChars[j] != ZWNJ && pwcInChars[j] != Numeric_space) + { + scripts[i] = scripts[j]; + break; + } + } + } + } + } + if (psState && psControl) { levels = heap_alloc_zero(cInChars * sizeof(WORD)); @@ -899,9 +921,9 @@ HRESULT WINAPI ScriptItemizeOpenType(const WCHAR *pwcInChars, int cInChars, int } BIDI_GetStrengths(pwcInChars, cInChars, psControl, strength); - /* Script_Numeric and select puncuation at level 0 get bumped to level 2 */ for (i = 0; i < cInChars; i++) { + /* Script_Numeric and select puncuation at level 0 get bumped to level 2 */ if ((levels[i] == 0 || (odd(psState->uBidiLevel) && levels[i] == psState->uBidiLevel+1)) && inNumber && strchrW(math_punc,pwcInChars[i])) { scripts[i] = Script_Numeric; @@ -914,6 +936,21 @@ HRESULT WINAPI ScriptItemizeOpenType(const WCHAR *pwcInChars, int cInChars, int } else inNumber = FALSE; + + /* Joiners get merged preferencially right */ + if (i > 0 && (pwcInChars[i] == ZWJ || pwcInChars[i] == ZWNJ)) + { + int j; + if (i+1 == cInChars && levels[i-1] == levels[i]) + strength[i] = strength[i-1]; + else + for (j = i+1; j < cInChars && levels[i] == levels[j]; j++) + if (pwcInChars[j] != ZWJ && pwcInChars[j] != ZWNJ && pwcInChars[j] != Numeric_space) + { + strength[i] = strength[j]; + break; + } + } } if (psControl->fMergeNeutralItems) { @@ -956,7 +993,7 @@ HRESULT WINAPI ScriptItemizeOpenType(const WCHAR *pwcInChars, int cInChars, int } } - while ((!levels || (levels && levels[cnt+1] == levels[0])) && (pwcInChars[cnt] == Numeric_space || pwcInChars[cnt] == ZWJ || pwcInChars[cnt] == ZWNJ) && cnt < cInChars) + while ((!levels || (levels && levels[cnt+1] == levels[0])) && (pwcInChars[cnt] == Numeric_space) && cnt < cInChars) cnt++; if (cnt == cInChars) /* All Spaces */ @@ -1000,12 +1037,12 @@ 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) + if(pwcInChars[cnt] != Numeric_space) 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]) + while (cnt + j < cInChars - 1 && pwcInChars[cnt+j] == Numeric_space && levels[cnt] == levels[cnt+j]) j++; if (cnt + j < cInChars && levels[cnt] == levels[cnt+j]) New_Script = scripts[cnt+j];

1 0

Francois Gouget : windowscodecs/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard Nov. 21, 2011

Nov. 21, 2011

Module: wine Branch: master Commit: 361e3b1a0080c13643ad0da7b19a32e5b1608e2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=361e3b1a0080c13643ad0da7b… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Nov 20 22:53:25 2011 +0100 windowscodecs/tests: Fix compilation on systems that don't support nameless unions. --- dlls/windowscodecs/tests/metadata.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index 8495e4d..e3a51e5 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -31,9 +31,9 @@ #define expect_blob(propvar, data, length) do { \ ok((propvar).vt == VT_BLOB, "unexpected vt: %i\n", (propvar).vt); \ if ((propvar).vt == VT_BLOB) { \ - ok((propvar).blob.cbSize == (length), "expected size %i, got %i\n", (length), (propvar).blob.cbSize); \ - if ((propvar).blob.cbSize == (length)) { \ - ok(!memcmp((propvar).blob.pBlobData, (data), (length)), "unexpected data\n"); \ + ok(U(propvar).blob.cbSize == (length), "expected size %i, got %i\n", (length), U(propvar).blob.cbSize); \ + if (U(propvar).blob.cbSize == (length)) { \ + ok(!memcmp(U(propvar).blob.pBlobData, (data), (length)), "unexpected data\n"); \ } \ } \ } while (0) @@ -204,9 +204,9 @@ static void test_metadata_tEXt(void) { ok(schema.vt == VT_EMPTY, "unexpected vt: %i\n", schema.vt); ok(id.vt == VT_LPSTR, "unexpected vt: %i\n", id.vt); - ok(!strcmp(id.pszVal, "winetest"), "unexpected id: %s\n", id.pszVal); + ok(!strcmp(U(id).pszVal, "winetest"), "unexpected id: %s\n", U(id).pszVal); ok(value.vt == VT_LPSTR, "unexpected vt: %i\n", id.vt); - ok(!strcmp(value.pszVal, "value"), "unexpected value: %s\n", id.pszVal); + ok(!strcmp(U(value).pszVal, "value"), "unexpected value: %s\n", U(id).pszVal); PropVariantClear(&schema); PropVariantClear(&id); @@ -228,8 +228,8 @@ static void test_metadata_tEXt(void) ok(hr == E_INVALIDARG, "GetMetadataFormat failed, hr=%x\n", hr); id.vt = VT_LPSTR; - id.pszVal = CoTaskMemAlloc(strlen("winetest") + 1); - strcpy(id.pszVal, "winetest"); + U(id).pszVal = CoTaskMemAlloc(strlen("winetest") + 1); + strcpy(U(id).pszVal, "winetest"); hr = IWICMetadataReader_GetValue(reader, NULL, &id, NULL); ok(hr == S_OK, "GetValue failed, hr=%x\n", hr); @@ -240,10 +240,10 @@ static void test_metadata_tEXt(void) hr = IWICMetadataReader_GetValue(reader, &schema, &id, &value); ok(hr == S_OK, "GetValue failed, hr=%x\n", hr); ok(value.vt == VT_LPSTR, "unexpected vt: %i\n", id.vt); - ok(!strcmp(value.pszVal, "value"), "unexpected value: %s\n", id.pszVal); + ok(!strcmp(U(value).pszVal, "value"), "unexpected value: %s\n", U(id).pszVal); PropVariantClear(&value); - strcpy(id.pszVal, "test"); + strcpy(U(id).pszVal, "test"); hr = IWICMetadataReader_GetValue(reader, &schema, &id, &value); ok(hr == WINCODEC_ERR_PROPERTYNOTFOUND, "GetValue failed, hr=%x\n", hr); @@ -260,13 +260,13 @@ static void test_metadata_tEXt(void) hr = IWICMetadataReader_GetValueByIndex(reader, 0, NULL, &id, NULL); ok(hr == S_OK, "GetValueByIndex failed, hr=%x\n", hr); ok(id.vt == VT_LPSTR, "unexpected vt: %i\n", id.vt); - ok(!strcmp(id.pszVal, "winetest"), "unexpected id: %s\n", id.pszVal); + ok(!strcmp(U(id).pszVal, "winetest"), "unexpected id: %s\n", U(id).pszVal); PropVariantClear(&id); hr = IWICMetadataReader_GetValueByIndex(reader, 0, NULL, NULL, &value); ok(hr == S_OK, "GetValueByIndex failed, hr=%x\n", hr); ok(value.vt == VT_LPSTR, "unexpected vt: %i\n", id.vt); - ok(!strcmp(value.pszVal, "value"), "unexpected value: %s\n", id.pszVal); + ok(!strcmp(U(value).pszVal, "value"), "unexpected value: %s\n", U(id).pszVal); PropVariantClear(&value); hr = IWICMetadataReader_GetValueByIndex(reader, 1, NULL, NULL, NULL);

1 0