December 2011 - Wine-Commits

Aric Stewart : usp10: Improve selection drawing if selection starts in the middle of a cluster.
by Alexandre Julliard Dec. 20, 2011

Dec. 20, 2011

Module: wine Branch: master Commit: dbe168fe9991e0dc8783a3cc468d880c4ff71dae URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbe168fe9991e0dc8783a3cc4… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Dec 20 08:38:24 2011 -0600 usp10: Improve selection drawing if selection starts in the middle of a cluster. --- dlls/usp10/usp10.c | 25 ++++++++++++++++++++++++- 1 files changed, 24 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 4f532f5..93d7b0f 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1877,6 +1877,8 @@ static HRESULT SS_ItemOut( SCRIPT_STRING_ANALYSIS ssa, INT runStart, runEnd; INT iGlyph, cGlyphs; HFONT oldFont = 0x0; + RECT crc; + int i; TRACE("(%p,%d,%d,%d,%d,%d, 0x%1x, %d, %d)\n", ssa, iX, iY, iItem, cStart, cEnd, uOptions, fSelected, fDisabled); @@ -1887,6 +1889,7 @@ static HRESULT SS_ItemOut( SCRIPT_STRING_ANALYSIS ssa, (cEnd >= 0 && analysis->pItem[iItem].iCharPos >= cEnd)) return S_OK; + CopyRect(&crc,prc); if (fSelected) { BkMode = GetBkMode(analysis->hdc); @@ -1917,6 +1920,7 @@ static HRESULT SS_ItemOut( SCRIPT_STRING_ANALYSIS ssa, ScriptStringCPtoX(ssa, cEnd, FALSE, &off_x); else ScriptStringCPtoX(ssa, analysis->pItem[iItem+1].iCharPos-1, TRUE, &off_x); + crc.left = iX + off_x; } else { @@ -1924,6 +1928,7 @@ static HRESULT SS_ItemOut( SCRIPT_STRING_ANALYSIS ssa, ScriptStringCPtoX(ssa, cStart, FALSE, &off_x); else ScriptStringCPtoX(ssa, analysis->pItem[iItem].iCharPos, FALSE, &off_x); + crc.left = iX + off_x; } if (analysis->pItem[iItem].a.fRTL) @@ -1938,6 +1943,24 @@ static HRESULT SS_ItemOut( SCRIPT_STRING_ANALYSIS ssa, cGlyphs++; + /* adjust for cluster glyphs when starting */ + if (analysis->pItem[iItem].a.fRTL) + i = analysis->pItem[iItem+1].iCharPos - 1; + else + i = analysis->pItem[iItem].iCharPos; + + for (; i >=analysis->pItem[iItem].iCharPos && i < analysis->pItem[iItem+1].iCharPos; (analysis->pItem[iItem].a.fRTL)?i--:i++) + { + if (analysis->glyphs[iItem].pwLogClust[i - analysis->pItem[iItem].iCharPos] == iGlyph) + { + if (analysis->pItem[iItem].a.fRTL) + ScriptStringCPtoX(ssa, i, TRUE, &off_x); + else + ScriptStringCPtoX(ssa, i, FALSE, &off_x); + break; + } + } + if (cEnd < 0 || scriptInformation[analysis->pItem[iItem].a.eScript].props.fNeedsCaretInfo) { INT direction; @@ -1959,7 +1982,7 @@ static HRESULT SS_ItemOut( SCRIPT_STRING_ANALYSIS ssa, hr = ScriptTextOut(analysis->hdc, (SCRIPT_CACHE *)&analysis->glyphs[iItem].sc, iX + off_x, - iY, uOptions, prc, &analysis->pItem[iItem].a, NULL, 0, + iY, uOptions, &crc, &analysis->pItem[iItem].a, NULL, 0, &analysis->glyphs[iItem].glyphs[iGlyph], cGlyphs, &analysis->glyphs[iItem].piAdvance[iGlyph], NULL, &analysis->glyphs[iItem].pGoffset[iGlyph]);

1 0

Kusanagi Kouichi : gdi32: Split AddFontToList into two functions.
by Alexandre Julliard Dec. 20, 2011

Dec. 20, 2011

Module: wine Branch: master Commit: 65f809248f521b7c53120b76543715ed0b0e8b12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65f809248f521b7c53120b765… Author: Kusanagi Kouichi <slash(a)ac.auone-net.jp> Date: Tue Dec 20 21:05:43 2011 +0900 gdi32: Split AddFontToList into two functions. --- dlls/gdi32/freetype.c | 408 +++++++++++++++++++++++++------------------------ 1 files changed, 211 insertions(+), 197 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=65f809248f521b7c53120…

1 0

Jacek Caban : jscript: Added new jmp_z opcode, more appropriate for branches.
by Alexandre Julliard Dec. 20, 2011

Dec. 20, 2011

Module: wine Branch: master Commit: 95677c5099c35c94a5346dcdd53f753fcacd7fac URL: http://source.winehq.org/git/wine.git/?a=commit;h=95677c5099c35c94a5346dcdd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 20 11:47:37 2011 +0100 jscript: Added new jmp_z opcode, more appropriate for branches. --- dlls/jscript/compile.c | 5 +---- dlls/jscript/engine.c | 22 ++++++++++++++++++++++ dlls/jscript/engine.h | 1 + 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 3633493..ceed228 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -915,7 +915,7 @@ static HRESULT compile_if_statement(compiler_ctx_t *ctx, if_statement_t *stat) if(FAILED(hres)) return hres; - jmp_else = push_instr(ctx, OP_cnd_z); + jmp_else = push_instr(ctx, OP_jmp_z); if(jmp_else == -1) return E_OUTOFMEMORY; @@ -929,9 +929,6 @@ static HRESULT compile_if_statement(compiler_ctx_t *ctx, if_statement_t *stat) instr_ptr(ctx, jmp_else)->arg1.uint = ctx->code_off; - if(push_instr(ctx, OP_pop) == -1) - return E_OUTOFMEMORY; - if(stat->else_stat) { hres = compile_statement(ctx, stat->else_stat); if(FAILED(hres)) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 80486b8..9f4a5a7 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2884,6 +2884,28 @@ static HRESULT interp_jmp(exec_ctx_t *ctx) return S_OK; } +static HRESULT interp_jmp_z(exec_ctx_t *ctx) +{ + const unsigned arg = ctx->parser->code->instrs[ctx->ip].arg1.uint; + VARIANT_BOOL b; + VARIANT *v; + HRESULT hres; + + TRACE("\n"); + + v = stack_pop(ctx); + hres = to_boolean(v, &b); + VariantClear(v); + if(FAILED(hres)) + return hres; + + if(b) + ctx->ip++; + else + ctx->ip = arg; + return S_OK; +} + static HRESULT interp_pop(exec_ctx_t *ctx) { TRACE("\n"); diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 3e58db2..2f0ba53 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -69,6 +69,7 @@ typedef struct _func_stack { X(instanceof, 1, 0,0) \ X(int, 1, ARG_INT, 0) \ X(jmp, 0, ARG_ADDR, 0) \ + X(jmp_z, 0, ARG_ADDR, 0) \ X(lshift, 1, 0,0) \ X(lt, 1, 0,0) \ X(lteq, 1, 0,0) \

1 0

Jacek Caban : jscript: Renamed jmp_z and jmp_nz to cnd_z and cnd_nz.
by Alexandre Julliard Dec. 20, 2011

Dec. 20, 2011

Module: wine Branch: master Commit: e5d7d50faaf572980bcb7aa6a71a71e0385b85c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5d7d50faaf572980bcb7aa6a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 20 11:47:23 2011 +0100 jscript: Renamed jmp_z and jmp_nz to cnd_z and cnd_nz. --- dlls/jscript/compile.c | 8 ++++---- dlls/jscript/engine.c | 4 ++-- dlls/jscript/engine.h | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 07bd65f..3633493 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -377,7 +377,7 @@ static HRESULT compile_conditional_expression(compiler_ctx_t *ctx, conditional_e if(FAILED(hres)) return hres; - jmp_false = push_instr(ctx, OP_jmp_z); + jmp_false = push_instr(ctx, OP_cnd_z); if(jmp_false == -1) return E_OUTOFMEMORY; @@ -716,7 +716,7 @@ static HRESULT compile_expression_noret(compiler_ctx_t *ctx, expression_t *expr, case EXPR_ADD: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_add); case EXPR_AND: - return compile_logical_expression(ctx, (binary_expression_t*)expr, OP_jmp_z); + return compile_logical_expression(ctx, (binary_expression_t*)expr, OP_cnd_z); case EXPR_ARRAY: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_array); case EXPR_ARRAYLIT: @@ -802,7 +802,7 @@ static HRESULT compile_expression_noret(compiler_ctx_t *ctx, expression_t *expr, case EXPR_NOTEQEQ: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_neq2); case EXPR_OR: - return compile_logical_expression(ctx, (binary_expression_t*)expr, OP_jmp_nz); + return compile_logical_expression(ctx, (binary_expression_t*)expr, OP_cnd_nz); case EXPR_PLUS: return compile_unary_expression(ctx, (unary_expression_t*)expr, OP_tonum); case EXPR_POSTDEC: @@ -915,7 +915,7 @@ static HRESULT compile_if_statement(compiler_ctx_t *ctx, if_statement_t *stat) if(FAILED(hres)) return hres; - jmp_else = push_instr(ctx, OP_jmp_z); + jmp_else = push_instr(ctx, OP_cnd_z); if(jmp_else == -1) return E_OUTOFMEMORY; diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 14bd250..80486b8 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1765,7 +1765,7 @@ HRESULT interp_obj_prop(exec_ctx_t *ctx) } /* ECMA-262 3rd Edition 11.11 */ -static HRESULT interp_jmp_nz(exec_ctx_t *ctx) +static HRESULT interp_cnd_nz(exec_ctx_t *ctx) { const unsigned arg = ctx->parser->code->instrs[ctx->ip].arg1.uint; VARIANT_BOOL b; @@ -1787,7 +1787,7 @@ static HRESULT interp_jmp_nz(exec_ctx_t *ctx) } /* ECMA-262 3rd Edition 11.11 */ -static HRESULT interp_jmp_z(exec_ctx_t *ctx) +static HRESULT interp_cnd_z(exec_ctx_t *ctx) { const unsigned arg = ctx->parser->code->instrs[ctx->ip].arg1.uint; VARIANT_BOOL b; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 071c98b..3e58db2 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -52,6 +52,8 @@ typedef struct _func_stack { X(call, 1, ARG_UINT, ARG_UINT) \ X(call_member,1, ARG_UINT, ARG_UINT) \ X(carray, 1, ARG_UINT, 0) \ + X(cnd_nz, 0, ARG_ADDR, 0) \ + X(cnd_z, 0, ARG_ADDR, 0) \ X(delete, 1, 0,0) \ X(delete_ident,1,ARG_BSTR, 0) \ X(div, 1, 0,0) \ @@ -67,8 +69,6 @@ typedef struct _func_stack { X(instanceof, 1, 0,0) \ X(int, 1, ARG_INT, 0) \ X(jmp, 0, ARG_ADDR, 0) \ - X(jmp_nz, 0, ARG_ADDR, 0) \ - X(jmp_z, 0, ARG_ADDR, 0) \ X(lshift, 1, 0,0) \ X(lt, 1, 0,0) \ X(lteq, 1, 0,0) \

1 0

Jacek Caban : jscript: Get rid of no longer needed identifier in exprval_t.
by Alexandre Julliard Dec. 20, 2011

Dec. 20, 2011

Module: wine Branch: master Commit: 00030ff66f79e356dcb1feb7183c92f93f236440 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00030ff66f79e356dcb1feb71… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 20 11:47:02 2011 +0100 jscript: Get rid of no longer needed identifier in exprval_t. --- dlls/jscript/engine.c | 11 +++++------ dlls/jscript/engine.h | 1 - 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 5ed5751..14bd250 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -220,7 +220,7 @@ static void exprval_release(exprval_t *val) IDispatch_Release(val->u.idref.disp); return; case EXPRVAL_INVALID: - SysFreeString(val->u.identifier); + return; } } @@ -240,7 +240,7 @@ static HRESULT exprval_value(script_ctx_t *ctx, exprval_t *val, jsexcept_t *ei, return disp_propget(ctx, val->u.idref.disp, val->u.idref.id, ret, ei, NULL/*FIXME*/); case EXPRVAL_INVALID: - return throw_type_error(ctx, ei, JS_E_UNDEFINED_VARIABLE, val->u.identifier); + assert(0); } ERR("type %d\n", val->type); @@ -653,10 +653,6 @@ static HRESULT identifier_eval(script_ctx_t *ctx, BSTR identifier, DWORD flags, } ret->type = EXPRVAL_INVALID; - ret->u.identifier = SysAllocString(identifier); - if(!ret->u.identifier) - return E_OUTOFMEMORY; - return S_OK; } @@ -1585,6 +1581,9 @@ static HRESULT interp_ident(exec_ctx_t *ctx) if(FAILED(hres)) return hres; + if(exprval.type == EXPRVAL_INVALID) + return throw_type_error(ctx->parser->script, ctx->ei, JS_E_UNDEFINED_VARIABLE, arg); + hres = exprval_to_value(ctx->parser->script, &exprval, ctx->ei, &v); exprval_release(&exprval); if(FAILED(hres)) diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 8c4b666..071c98b 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -423,7 +423,6 @@ typedef struct { IDispatch *disp; DISPID id; } idref; - BSTR identifier; } u; } exprval_t;

1 0

Piotr Caban : msvcp90: Correctly export collate<short> constructors.
by Alexandre Julliard Dec. 20, 2011

Dec. 20, 2011

Module: wine Branch: master Commit: 9e8e6e6dac73a8b04c566132244bb0434b579f66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e8e6e6dac73a8b04c5661322… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 20 15:57:34 2011 +0100 msvcp90: Correctly export collate<short> constructors. --- dlls/msvcp90/msvcp90.spec | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 3c62462..687bacc 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -854,12 +854,12 @@ @ cdecl -arch=win64 ??0?$collate(a)D@std@@QEAA(a)AEBV_Locinfo@1(a)_K@Z(ptr ptr long) collate_char_ctor_locinfo @ thiscall -arch=win32 ??0?$collate(a)D@std@@QAE(a)I@Z(ptr long) collate_char_ctor_refs @ cdecl -arch=win64 ??0?$collate(a)D@std@@QEAA(a)_K@Z(ptr long) collate_char_ctor_refs -@ thiscall -arch=win32 ??0?$collate(a)G@std@@IAE(a)PBDI@Z(ptr str long) collate_char_ctor_name -@ cdecl -arch=win64 ??0?$collate(a)G@std@@IEAA(a)PEBD_K@Z(ptr str long) collate_char_ctor_name -@ thiscall -arch=win32 ??0?$collate(a)G@std@@QAE(a)ABV_Locinfo@1(a)I@Z(ptr ptr long) collate_char_ctor_locinfo -@ cdecl -arch=win64 ??0?$collate(a)G@std@@QEAA(a)AEBV_Locinfo@1(a)_K@Z(ptr ptr long) collate_char_ctor_locinfo -@ thiscall -arch=win32 ??0?$collate(a)G@std@@QAE(a)I@Z(ptr long) collate_char_ctor_refs -@ cdecl -arch=win64 ??0?$collate(a)G@std@@QEAA(a)_K@Z(ptr long) collate_char_ctor_refs +@ thiscall -arch=win32 ??0?$collate(a)G@std@@IAE(a)PBDI@Z(ptr str long) collate_short_ctor_name +@ cdecl -arch=win64 ??0?$collate(a)G@std@@IEAA(a)PEBD_K@Z(ptr str long) collate_short_ctor_name +@ thiscall -arch=win32 ??0?$collate(a)G@std@@QAE(a)ABV_Locinfo@1(a)I@Z(ptr ptr long) collate_short_ctor_locinfo +@ cdecl -arch=win64 ??0?$collate(a)G@std@@QEAA(a)AEBV_Locinfo@1(a)_K@Z(ptr ptr long) collate_short_ctor_locinfo +@ thiscall -arch=win32 ??0?$collate(a)G@std@@QAE(a)I@Z(ptr long) collate_short_ctor_refs +@ cdecl -arch=win64 ??0?$collate(a)G@std@@QEAA(a)_K@Z(ptr long) collate_short_ctor_refs @ thiscall -arch=win32 ??0?$collate(a)_W@std@@IAE(a)PBDI@Z(ptr str long) collate_wchar_ctor_name @ cdecl -arch=win64 ??0?$collate(a)_W@std@@IEAA(a)PEBD_K@Z(ptr str long) collate_wchar_ctor_name @ thiscall -arch=win32 ??0?$collate(a)_W@std@@QAE(a)ABV_Locinfo@1(a)I@Z(ptr ptr long) collate_wchar_ctor_locinfo @@ -1999,8 +1999,8 @@ @ stub -arch=win64 ??_F?$codecvt(a)_WDH@std@@QEAAXXZ @ thiscall -arch=win32 ??_F?$collate(a)D@std@@QAEXXZ(ptr) collate_char_ctor @ cdecl -arch=win64 ??_F?$collate(a)D@std@@QEAAXXZ(ptr) collate_char_ctor -@ thiscall -arch=win32 ??_F?$collate(a)G@std@@QAEXXZ(ptr) collate_char_ctor -@ cdecl -arch=win64 ??_F?$collate(a)G@std@@QEAAXXZ(ptr) collate_char_ctor +@ thiscall -arch=win32 ??_F?$collate(a)G@std@@QAEXXZ(ptr) collate_short_ctor +@ cdecl -arch=win64 ??_F?$collate(a)G@std@@QEAAXXZ(ptr) collate_short_ctor @ thiscall -arch=win32 ??_F?$collate(a)_W@std@@QAEXXZ(ptr) collate_wchar_ctor @ cdecl -arch=win64 ??_F?$collate(a)_W@std@@QEAAXXZ(ptr) collate_wchar_ctor @ stub -arch=win32 ??_F?$complex(a)M@std@@QAEXXZ

1 0

Kusanagi Kouichi : gdi32: Add vertical fonts to font list.
by Alexandre Julliard Dec. 20, 2011

Dec. 20, 2011

Module: wine Branch: master Commit: 69a26387b311c318b2a6845bc827664a645d464a URL: http://source.winehq.org/git/wine.git/?a=commit;h=69a26387b311c318b2a6845bc… Author: Kusanagi Kouichi <slash(a)ac.auone-net.jp> Date: Tue Dec 20 21:05:53 2011 +0900 gdi32: Add vertical fonts to font list. --- dlls/gdi32/freetype.c | 34 +++++++++++++++++++++++++++++++--- dlls/gdi32/tests/font.c | 4 ---- 2 files changed, 31 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 3b40442..d9607e6 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1450,11 +1450,25 @@ static void AddFaceToFamily(Face *face, Family *family) list_add_before( entry, &face->entry ); } +static WCHAR *prepend_at(WCHAR *family) +{ + WCHAR *str; + + if (!family) + return NULL; + + str = HeapAlloc(GetProcessHeap(), 0, sizeof (WCHAR) * (strlenW(family) + 2)); + str[0] = '@'; + strcpyW(str + 1, family); + HeapFree(GetProcessHeap(), 0, family); + return str; +} + #define ADDFONT_EXTERNAL_FONT 0x01 #define ADDFONT_FORCE_BITMAP 0x02 #define ADDFONT_ADD_TO_CACHE 0x04 -static void AddFaceToList(FT_Face ft_face, char *fake_family, const char *file, void *font_data_ptr, DWORD font_data_size, FT_Long face_index, DWORD flags) +static void AddFaceToList(FT_Face ft_face, char *fake_family, const char *file, void *font_data_ptr, DWORD font_data_size, FT_Long face_index, DWORD flags, BOOL vertical) { int bitmap_num = 0; Family *family; @@ -1494,6 +1508,12 @@ static void AddFaceToList(FT_Face ft_face, char *fake_family, const char *file, } } + if (vertical) + { + english_family = prepend_at(english_family); + localised_family = prepend_at(localised_family); + } + family = find_family_from_name(localised_family ? localised_family : english_family); if(!family) { family = HeapAlloc(GetProcessHeap(), 0, sizeof(*family)); @@ -1671,6 +1691,7 @@ static INT AddFontToList(const char *file, void *font_data_ptr, DWORD font_data_ WCHAR *localised_family; FT_Error err; FT_Long face_index = 0, num_faces; + INT ret = 0; /* we always load external fonts from files - otherwise we would get a crash in update_reg_entries */ assert(file || !(flags & ADDFONT_EXTERNAL_FONT)); @@ -1779,12 +1800,19 @@ static INT AddFontToList(const char *file, void *font_data_ptr, DWORD font_data_ HeapFree(GetProcessHeap(), 0, localised_family); } - AddFaceToList(ft_face, fake_family, file, font_data_ptr, font_data_size, face_index, flags); + AddFaceToList(ft_face, fake_family, file, font_data_ptr, font_data_size, face_index, flags, FALSE); + ++ret; + + if (FT_HAS_VERTICAL(ft_face)) + { + AddFaceToList(ft_face, fake_family, file, font_data_ptr, font_data_size, face_index, flags, TRUE); + ++ret; + } num_faces = ft_face->num_faces; pFT_Done_Face(ft_face); } while(num_faces > ++face_index); - return num_faces; + return ret; } static INT AddFontFileToList(const char *file, char *fake_family, const WCHAR *target_family, DWORD flags) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 98c61a0..710ee56 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4121,7 +4121,6 @@ static void test_vertical_font(void) } num = pAddFontResourceExA(ttf_name, FR_PRIVATE, 0); - todo_wine ok(num == 2, "AddFontResourceExA should add 2 fonts from vertical.ttf\n"); check_vertical_font("@WineTestVertical", &installed, &selected, &gm); @@ -4133,11 +4132,8 @@ static void test_vertical_font(void) gm.gmBlackBoxX, gm.gmBlackBoxY); check_vertical_font("@@WineTestVertical", &installed, &selected, &gm); - todo_wine ok(installed, "@@WineTestVertical is not installed\n"); - todo_wine ok(selected, "@@WineTestVertical is not selected\n"); - todo_wine ok(gm.gmBlackBoxX < gm.gmBlackBoxY, "gmBlackBoxX(%u) should be less than gmBlackBoxY(%u) if vertical\n", gm.gmBlackBoxX, gm.gmBlackBoxY);

1 0

Kusanagi Kouichi : gdi32: Add a helper function to convert a string from A to W.
by Alexandre Julliard Dec. 20, 2011

Dec. 20, 2011

Module: wine Branch: master Commit: 5bdbf6c681ad37bbba597173fbd30e93357a10c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bdbf6c681ad37bbba597173f… Author: Kusanagi Kouichi <slash(a)ac.auone-net.jp> Date: Tue Dec 20 21:04:56 2011 +0900 gdi32: Add a helper function to convert a string from A to W. --- dlls/gdi32/freetype.c | 36 ++++++++++++++++-------------------- 1 files changed, 16 insertions(+), 20 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 9b07b97..41d4392 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1020,19 +1020,27 @@ static BOOL add_font_subst(struct list *subst_list, FontSubst *subst, INT flags) return FALSE; } +static WCHAR *towstr(UINT cp, const char *str) +{ + int len; + WCHAR *wstr; + + len = MultiByteToWideChar(cp, 0, str, -1, NULL, 0); + wstr = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(cp, 0, str, -1, wstr, len); + return wstr; +} + static void split_subst_info(NameCs *nc, LPSTR str) { CHAR *p = strrchr(str, ','); - DWORD len; nc->charset = -1; if(p && *(p+1)) { nc->charset = strtol(p+1, NULL, 10); *p = '\0'; } - len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); - nc->name = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, str, -1, nc->name, len); + nc->name = towstr(CP_ACP, str); } static void LoadSubstList(void) @@ -1452,7 +1460,6 @@ static INT AddFontToList(const char *file, void *font_data_ptr, DWORD font_data_ TT_OS2 *pOS2; TT_Header *pHeader = NULL; WCHAR *english_family, *localised_family, *StyleW; - DWORD len; Family *family; Face *face; struct list *family_elem_ptr, *face_elem_ptr; @@ -1579,19 +1586,13 @@ static INT AddFontToList(const char *file, void *font_data_ptr, DWORD font_data_ if(fake_family) { - len = MultiByteToWideChar(CP_ACP, 0, fake_family, -1, NULL, 0); - english_family = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, fake_family, -1, english_family, len); + english_family = towstr(CP_ACP, fake_family); } else { english_family = get_face_name(ft_face, TT_NAME_ID_FONT_FAMILY, TT_MS_LANGID_ENGLISH_UNITED_STATES); if(!english_family) - { - len = MultiByteToWideChar(CP_ACP, 0, ft_face->family_name, -1, NULL, 0); - english_family = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, ft_face->family_name, -1, english_family, len); - } + english_family = towstr(CP_ACP, ft_face->family_name); } localised_family = NULL; @@ -1629,9 +1630,7 @@ static INT AddFontToList(const char *file, void *font_data_ptr, DWORD font_data_ HeapFree(GetProcessHeap(), 0, localised_family); HeapFree(GetProcessHeap(), 0, english_family); - len = MultiByteToWideChar(CP_ACP, 0, ft_face->style_name, -1, NULL, 0); - StyleW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, ft_face->style_name, -1, StyleW, len); + StyleW = towstr(CP_ACP, ft_face->style_name); internal_leading = 0; memset(&fs, 0, sizeof(fs)); @@ -2779,7 +2778,6 @@ static void populate_system_links(HKEY hkey, const WCHAR *name, const WCHAR *con Face *face; const char *file; WCHAR *fileW; - int fileLen; WCHAR buff[MAX_PATH]; WCHAR *data; int entryLen; @@ -2817,9 +2815,7 @@ static void populate_system_links(HKEY hkey, const WCHAR *name, const WCHAR *con } if (!file) continue; - fileLen = MultiByteToWideChar(CP_UNIXCP, 0, file, -1, NULL, 0); - fileW = HeapAlloc(GetProcessHeap(), 0, fileLen * sizeof(WCHAR)); - MultiByteToWideChar(CP_UNIXCP, 0, file, -1, fileW, fileLen); + fileW = towstr(CP_UNIXCP, file); entryLen = strlenW(fileW) + 1 + strlenW(value) + 1; if (sizeof(buff)-(data-buff) < entryLen + 1) {

1 0

Jacek Caban : jscript: Get rid of no longer used expr_eval flags.
by Alexandre Julliard Dec. 20, 2011

Dec. 20, 2011

Module: wine Branch: master Commit: f5a3f1417e2e71311b32eef7f036b4d3ecad8f30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5a3f1417e2e71311b32eef7f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 20 11:46:20 2011 +0100 jscript: Get rid of no longer used expr_eval flags. --- dlls/jscript/compile.c | 5 ++--- dlls/jscript/engine.c | 40 +++++++++++++++++++--------------------- dlls/jscript/engine.h | 2 +- 3 files changed, 22 insertions(+), 25 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 5bfbb09..07bd65f 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -1003,9 +1003,8 @@ static HRESULT init_compiler(parser_ctx_t *parser) return S_OK; } -HRESULT compile_subscript(parser_ctx_t *parser, expression_t *expr, BOOL do_ret, unsigned *ret_off) +HRESULT compile_subscript(parser_ctx_t *parser, expression_t *expr, unsigned *ret_off) { - BOOL no_ret = FALSE; HRESULT hres; hres = init_compiler(parser); @@ -1013,7 +1012,7 @@ HRESULT compile_subscript(parser_ctx_t *parser, expression_t *expr, BOOL do_ret, return hres; *ret_off = parser->compiler->code_off; - hres = compile_expression_noret(parser->compiler, expr, do_ret ? NULL : &no_ret); + hres = compile_expression(parser->compiler, expr); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 2663833..5ed5751 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -29,8 +29,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(jscript); -#define EXPR_NOVAL 0x0001 - static const WCHAR booleanW[] = {'b','o','o','l','e','a','n',0}; static const WCHAR functionW[] = {'f','u','n','c','t','i','o','n',0}; static const WCHAR numberW[] = {'n','u','m','b','e','r',0}; @@ -54,7 +52,7 @@ static inline HRESULT stat_eval(script_ctx_t *ctx, statement_t *stat, return_typ return stat->eval(ctx, stat, rt, ret); } -static HRESULT expr_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,VARIANT*); +static HRESULT expr_eval(script_ctx_t*,expression_t*,jsexcept_t*,VARIANT*); static HRESULT stack_push(exec_ctx_t *ctx, VARIANT *v) { @@ -674,7 +672,7 @@ static HRESULT variable_list_eval(script_ctx_t *ctx, variable_declaration_t *var if(!iter->expr) continue; - hres = expr_eval(ctx, iter->expr, 0, ei, &val); + hres = expr_eval(ctx, iter->expr, ei, &val); if(FAILED(hres)) break; @@ -718,7 +716,7 @@ HRESULT while_statement_eval(script_ctx_t *ctx, statement_t *_stat, return_type_ while(1) { if(test_expr) { - hres = expr_eval(ctx, stat->expr, 0, &rt->ei, &tmp); + hres = expr_eval(ctx, stat->expr, &rt->ei, &tmp); if(FAILED(hres)) break; @@ -770,7 +768,7 @@ HRESULT for_statement_eval(script_ctx_t *ctx, statement_t *_stat, return_type_t if(FAILED(hres)) return hres; }else if(stat->begin_expr) { - hres = expr_eval(ctx, stat->begin_expr, 0, &rt->ei, &val); + hres = expr_eval(ctx, stat->begin_expr, &rt->ei, &val); if(FAILED(hres)) return hres; @@ -781,7 +779,7 @@ HRESULT for_statement_eval(script_ctx_t *ctx, statement_t *_stat, return_type_t while(1) { if(stat->expr) { - hres = expr_eval(ctx, stat->expr, 0, &rt->ei, &tmp); + hres = expr_eval(ctx, stat->expr, &rt->ei, &tmp); if(FAILED(hres)) break; @@ -804,7 +802,7 @@ HRESULT for_statement_eval(script_ctx_t *ctx, statement_t *_stat, return_type_t break; if(stat->end_expr) { - hres = expr_eval(ctx, stat->end_expr, 0, &rt->ei, &val); + hres = expr_eval(ctx, stat->end_expr, &rt->ei, &val); if(FAILED(hres)) break; @@ -847,7 +845,7 @@ HRESULT forin_statement_eval(script_ctx_t *ctx, statement_t *_stat, return_type_ return hres; } - hres = expr_eval(ctx, stat->in_expr, 0, &rt->ei, &val); + hres = expr_eval(ctx, stat->in_expr, &rt->ei, &val); if(FAILED(hres)) return hres; @@ -896,7 +894,7 @@ HRESULT forin_statement_eval(script_ctx_t *ctx, statement_t *_stat, return_type_ hres = member_expression_eval(ctx, stat->expr, &rt->ei, &exprval); break; default: - hres = expr_eval(ctx, stat->expr, 0, &rt->ei, &tmp); + hres = expr_eval(ctx, stat->expr, &rt->ei, &tmp); if(FAILED(hres)) break; @@ -985,7 +983,7 @@ HRESULT return_statement_eval(script_ctx_t *ctx, statement_t *_stat, return_type TRACE("\n"); if(stat->expr) { - hres = expr_eval(ctx, stat->expr, 0, &rt->ei, ret); + hres = expr_eval(ctx, stat->expr, &rt->ei, ret); if(FAILED(hres)) return hres; }else { @@ -1008,7 +1006,7 @@ HRESULT with_statement_eval(script_ctx_t *ctx, statement_t *_stat, return_type_t TRACE("\n"); - hres = expr_eval(ctx, stat->expr, 0, &rt->ei, &val); + hres = expr_eval(ctx, stat->expr, &rt->ei, &val); if(FAILED(hres)) return hres; @@ -1054,7 +1052,7 @@ HRESULT switch_statement_eval(script_ctx_t *ctx, statement_t *_stat, return_type TRACE("\n"); - hres = expr_eval(ctx, stat->expr, 0, &rt->ei, &val); + hres = expr_eval(ctx, stat->expr, &rt->ei, &val); if(FAILED(hres)) return hres; @@ -1064,7 +1062,7 @@ HRESULT switch_statement_eval(script_ctx_t *ctx, statement_t *_stat, return_type continue; } - hres = expr_eval(ctx, iter->expr, 0, &rt->ei, &cval); + hres = expr_eval(ctx, iter->expr, &rt->ei, &cval); if(FAILED(hres)) break; @@ -1119,7 +1117,7 @@ HRESULT throw_statement_eval(script_ctx_t *ctx, statement_t *_stat, return_type_ TRACE("\n"); - hres = expr_eval(ctx, stat->expr, 0, &rt->ei, &val); + hres = expr_eval(ctx, stat->expr, &rt->ei, &val); if(FAILED(hres)) return hres; @@ -1240,11 +1238,11 @@ static HRESULT array_expression_eval(script_ctx_t *ctx, expression_t *_expr, jse TRACE("\n"); - hres = expr_eval(ctx, expr->expression1, 0, ei, &member); + hres = expr_eval(ctx, expr->expression1, ei, &member); if(FAILED(hres)) return hres; - hres = expr_eval(ctx, expr->expression2, 0, ei, &val); + hres = expr_eval(ctx, expr->expression2, ei, &val); if(SUCCEEDED(hres)) { hres = to_object(ctx, &member, &obj); if(FAILED(hres)) @@ -1321,7 +1319,7 @@ static HRESULT member_expression_eval(script_ctx_t *ctx, expression_t *_expr, js TRACE("\n"); - hres = expr_eval(ctx, expr->expression, 0, ei, &member); + hres = expr_eval(ctx, expr->expression, ei, &member); if(FAILED(hres)) return hres; @@ -2983,7 +2981,7 @@ HRESULT compiled_statement_eval(script_ctx_t *ctx, statement_t *stat, return_typ return S_OK; } -static HRESULT expr_eval(script_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, VARIANT *ret) +static HRESULT expr_eval(script_ctx_t *ctx, expression_t *expr, jsexcept_t *ei, VARIANT *ret) { exec_ctx_t *exec_ctx = ctx->exec_ctx; unsigned prev_ip, prev_top; @@ -2994,7 +2992,7 @@ static HRESULT expr_eval(script_ctx_t *ctx, expression_t *expr, DWORD flags, jse TRACE("\n"); if(expr->instr_off == -1) { - hres = compile_subscript(ctx->exec_ctx->parser, expr, !(flags & EXPR_NOVAL), &expr->instr_off); + hres = compile_subscript(ctx->exec_ctx->parser, expr, &expr->instr_off); if(FAILED(hres)) return hres; } @@ -3021,7 +3019,7 @@ static HRESULT expr_eval(script_ctx_t *ctx, expression_t *expr, DWORD flags, jse return hres; } - assert(exec_ctx->top == prev_top+1 || ((flags&EXPR_NOVAL) && exec_ctx->top == prev_top)); + assert(exec_ctx->top == prev_top+1); if(exec_ctx->top == prev_top) V_VT(ret) = VT_EMPTY; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index ebcfa45..8c4b666 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -586,5 +586,5 @@ typedef struct { prop_val_t *property_list; } property_value_expression_t; -HRESULT compile_subscript(parser_ctx_t*,expression_t*,BOOL,unsigned*) DECLSPEC_HIDDEN; +HRESULT compile_subscript(parser_ctx_t*,expression_t*,unsigned*) DECLSPEC_HIDDEN; HRESULT compile_subscript_stat(parser_ctx_t*,statement_t*,BOOL,unsigned*) DECLSPEC_HIDDEN;

1 0

Piotr Caban : msvcp90: Added macro to call functions from vtable.
by Alexandre Julliard Dec. 20, 2011

Dec. 20, 2011

Module: wine Branch: master Commit: ddebdbf1e6580f5fbc1f4a954312e6e281df41af URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddebdbf1e6580f5fbc1f4a954… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 20 15:56:42 2011 +0100 msvcp90: Added macro to call functions from vtable. --- dlls/msvcp90/locale.c | 21 ++------------------- dlls/msvcp90/msvcp90.h | 12 ++++++++++++ dlls/msvcp90/msvcp90_main.c | 14 ++++++++++++++ 3 files changed, 28 insertions(+), 19 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 16eda98..0c441c9 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -117,6 +117,8 @@ void __thiscall locale_facet_dtor(locale_facet *this) } DEFINE_THISCALL_WRAPPER(MSVCP_locale_facet_vector_dtor, 8) +#define call_locale_facet_vector_dtor(this, flags) CALL_VTBL_FUNC(this, 0, \ + locale_facet*, (locale_facet*, unsigned int), (this, flags)) locale_facet* __thiscall MSVCP_locale_facet_vector_dtor(locale_facet *this, unsigned int flags) { TRACE("(%p %x)\n", this, flags); @@ -139,25 +141,6 @@ locale_facet* __thiscall MSVCP_locale_facet_vector_dtor(locale_facet *this, unsi const vtable_ptr MSVCP_locale_facet_vtable[] = { (vtable_ptr)THISCALL_NAME(MSVCP_locale_facet_vector_dtor) }; -#ifdef __i386__ -static inline locale_facet* call_locale_facet_vector_dtor(locale_facet *this, unsigned int flags) -{ - locale_facet *ret; - void *dummy; - - __asm__ __volatile__ ("pushl %3\n\tcall *%2" - : "=a" (ret), "=c" (dummy) - : "r" (this->vtable[0]), "r" (flags), "1" (this) - : "edx", "memory" ); - return ret; -} -#else -static inline locale_facet* call_locale_facet_vector_dtor(locale_facet *this, unsigned int flags) -{ - locale_facet * (__thiscall *dtor)(locale_facet *, unsigned int) = (void *)this->vtable[0]; - return dtor(this, flags); -} -#endif /* ??0id(a)locale@std@@QAE(a)I@Z */ /* ??0id(a)locale@std@@QEAA(a)_K@Z */ diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index e906c6c..ee793b1 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -130,6 +130,18 @@ const rtti_object_locator name ## _rtti = { \ &name ## _hierarchy \ } +#ifdef __i386__ + +#define CALL_VTBL_FUNC(this, off, ret, type, args) ((ret (WINAPI*)type)&vtbl_wrapper_##off)args + +extern void *vtbl_wrapper_0; + +#else + +#define CALL_VTBL_FUNC(this, off, ret, type, args) ((ret (__cdecl***)type)this)[0][off/4]args + +#endif + /* exception object */ typedef void (*vtable_ptr)(void); typedef struct __exception diff --git a/dlls/msvcp90/msvcp90_main.c b/dlls/msvcp90/msvcp90_main.c index 35fabfc..3aacf6d 100644 --- a/dlls/msvcp90/msvcp90_main.c +++ b/dlls/msvcp90/msvcp90_main.c @@ -28,6 +28,20 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcp90); +#ifdef __i386__ + +#define DEFINE_VTBL_WRAPPER(off) \ + __ASM_GLOBAL_FUNC(vtbl_wrapper_ ## off, \ + "popl %eax\n\t" \ + "popl %ecx\n\t" \ + "pushl %eax\n\t" \ + "movl 0(%ecx), %eax\n\t" \ + "jmp *" #off "(%eax)\n\t") + +DEFINE_VTBL_WRAPPER(0); + +#endif + void* (__cdecl *MSVCRT_operator_new)(MSVCP_size_t); void (__cdecl *MSVCRT_operator_delete)(void*); void* (__cdecl *MSVCRT_set_new_handler)(void*);

1 0