December 2011 - Wine-Commits

Aric Stewart : usp10: Standard features are only ccmp and locl.
by Alexandre Julliard Dec. 1, 2011

Dec. 1, 2011

Module: wine Branch: master Commit: 711dd9b13a59ed3c43237531dc044d630f25785f URL: http://source.winehq.org/git/wine.git/?a=commit;h=711dd9b13a59ed3c43237531d… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Dec 1 09:08:42 2011 -0600 usp10: Standard features are only ccmp and locl. --- dlls/usp10/shape.c | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 3911c1c..e1cadd1 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -340,6 +340,12 @@ static const char* contextual_features[] = static OPENTYPE_FEATURE_RECORD standard_features[] = { + { MS_MAKE_TAG('c','c','m','p'), 1}, + { MS_MAKE_TAG('l','o','c','l'), 1}, +}; + +static OPENTYPE_FEATURE_RECORD latin_features[] = +{ { MS_MAKE_TAG('l','i','g','a'), 1}, { MS_MAKE_TAG('c','l','i','g'), 1}, }; @@ -539,11 +545,11 @@ typedef struct ScriptShapeDataTag { static const ScriptShapeData ShapingData[] = { {{ standard_features, 2}, NULL, "", "", NULL, NULL}, - {{ standard_features, 2}, NULL, "latn", "", NULL, NULL}, - {{ standard_features, 2}, NULL, "latn", "", NULL, NULL}, - {{ standard_features, 2}, NULL, "latn", "", NULL, NULL}, + {{ latin_features, 2}, NULL, "latn", "", NULL, NULL}, + {{ latin_features, 2}, NULL, "latn", "", NULL, NULL}, + {{ latin_features, 2}, NULL, "latn", "", NULL, NULL}, {{ standard_features, 2}, NULL, "" , "", NULL, NULL}, - {{ standard_features, 2}, NULL, "latn", "", NULL, NULL}, + {{ latin_features, 2}, NULL, "latn", "", NULL, NULL}, {{ arabic_features, 6}, required_arabic_features, "arab", "", ContextualShape_Arabic, ShapeCharGlyphProp_Arabic}, {{ arabic_features, 6}, required_arabic_features, "arab", "", ContextualShape_Arabic, ShapeCharGlyphProp_Arabic}, {{ hebrew_features, 1}, NULL, "hebr", "", NULL, NULL}, @@ -583,7 +589,7 @@ static const ScriptShapeData ShapingData[] = {{ devanagari_features, 6}, required_telugu_features, "mlym", "mlm2", ContextualShape_Malayalam, ShapeCharGlyphProp_Malayalam}, {{ devanagari_features, 6}, required_telugu_features, "mlym", "mlm2", ContextualShape_Malayalam, ShapeCharGlyphProp_Malayalam}, {{ standard_features, 2}, NULL, "" , "", NULL, NULL}, - {{ standard_features, 2}, NULL, "latn" , "", NULL, NULL}, + {{ latin_features, 2}, NULL, "latn" , "", NULL, NULL}, {{ standard_features, 2}, NULL, "" , "", NULL, NULL}, };

1 0

Aric Stewart : usp10: Handle the Gurmukhi addak.
by Alexandre Julliard Dec. 1, 2011

Dec. 1, 2011

Module: wine Branch: master Commit: ff9ae10ba567bf72b512e545fb398d33e9a9eea0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff9ae10ba567bf72b512e545f… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Dec 1 10:13:34 2011 -0600 usp10: Handle the Gurmukhi addak. --- dlls/usp10/shape.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 7583326..36fa404 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -2597,7 +2597,10 @@ static void ContextualShape_Bengali(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS * static int gurmukhi_lex(WCHAR c) { - return unicode_lex(c); + if (c == 0x0A71) + return lex_Modifier; + else + return unicode_lex(c); } static const ConsonantComponents Gurmukhi_consonants[] = {

1 0

Aric Stewart : usp10: Always apply features in logical order.
by Alexandre Julliard Dec. 1, 2011

Dec. 1, 2011

Module: wine Branch: master Commit: 302409ebe49fb42f434c3adbe8e351c6cdd18c45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=302409ebe49fb42f434c3adbe… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Dec 1 09:09:41 2011 -0600 usp10: Always apply features in logical order. --- dlls/usp10/shape.c | 26 +++++++++++++++----------- 1 files changed, 15 insertions(+), 11 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 9e09c86..7583326 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -726,7 +726,7 @@ static INT GSUB_apply_SingleSubst(const GSUB_LookupTable *look, WORD *glyphs, IN TRACE(" Glyph 0x%x ->",glyphs[glyph_index]); glyphs[glyph_index] = glyphs[glyph_index] + GET_BE_WORD(ssf1->DeltaGlyphID); TRACE(" 0x%x\n",glyphs[glyph_index]); - return glyph_index + 1; + return glyph_index + write_dir; } } else @@ -748,7 +748,7 @@ static INT GSUB_apply_SingleSubst(const GSUB_LookupTable *look, WORD *glyphs, IN TRACE(" Glyph is 0x%x ->",glyphs[glyph_index]); glyphs[glyph_index] = GET_BE_WORD(ssf2->Substitute[index]); TRACE("0x%x\n",glyphs[glyph_index]); - return glyph_index + 1; + return glyph_index + write_dir; } } } @@ -797,7 +797,7 @@ static INT GSUB_apply_MultipleSubst(const GSUB_LookupTable *look, WORD *glyphs, TRACE("\n"); } - return glyph_index + sub_count; + return glyph_index + (sub_count * write_dir); } } return GSUB_E_NOGLYPH; @@ -831,7 +831,7 @@ static INT GSUB_apply_AlternateSubst(const GSUB_LookupTable *look, WORD *glyphs, TRACE(" Glyph 0x%x ->",glyphs[glyph_index]); glyphs[glyph_index] = GET_BE_WORD(as->Alternate[0]); TRACE(" 0x%x\n",glyphs[glyph_index]); - return glyph_index + 1; + return glyph_index + write_dir; } } return GSUB_E_NOGLYPH; @@ -894,7 +894,7 @@ static INT GSUB_apply_LigatureSubst(const GSUB_LookupTable *look, WORD *glyphs, glyphs[j] =glyphs[j+CompCount]; *glyph_count = *glyph_count - CompCount; } - return replaceIdx + 1; + return replaceIdx + write_dir; } } } @@ -1338,7 +1338,7 @@ static void UpdateClusters(int nextIndex, int changeCount, int write_dir, int ch else { int i; - int target_glyph = nextIndex - 1; + int target_glyph = nextIndex - write_dir; int seeking_glyph; int target_index = -1; int replacing_glyph = -1; @@ -1346,7 +1346,7 @@ static void UpdateClusters(int nextIndex, int changeCount, int write_dir, int ch if (changeCount > 0) - target_glyph = nextIndex - (changeCount+1); + target_glyph = nextIndex - ((changeCount+1)*write_dir); seeking_glyph = target_glyph; @@ -1437,21 +1437,25 @@ static int apply_GSUB_feature(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, W for (lookup_index = 0; lookup_index < lookup_count; lookup_index++) { int i; - i = 0; + + if (write_dir > 0) + i = 0; + else + i = *pcGlyphs-1; TRACE("applying lookup (%i/%i)\n",lookup_index,lookup_count); - while(i < *pcGlyphs) + while(i < *pcGlyphs && i >= 0) { INT nextIndex; INT prevCount = *pcGlyphs; nextIndex = GSUB_apply_lookup(lookup, GET_BE_WORD(feature->LookupListIndex[lookup_index]), pwOutGlyphs, i, write_dir, pcGlyphs); - if (nextIndex > GSUB_E_NOGLYPH) + if (*pcGlyphs != prevCount) { UpdateClusters(nextIndex, *pcGlyphs - prevCount, write_dir, cChars, pwLogClust); i = nextIndex; } else - i++; + i+=write_dir; } } return *pcGlyphs;

1 0

Aric Stewart : usp10: Apply lookups in order over the whole range of glyphs instead of individually to each glyph .
by Alexandre Julliard Dec. 1, 2011

Dec. 1, 2011

Module: wine Branch: master Commit: c4c9f8b041280535388ac10f50446fba899f1028 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4c9f8b041280535388ac10f5… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Dec 1 09:09:25 2011 -0600 usp10: Apply lookups in order over the whole range of glyphs instead of individually to each glyph. --- dlls/usp10/shape.c | 28 +++++++++++++++++++--------- 1 files changed, 19 insertions(+), 9 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index e1cadd1..9e09c86 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -1027,7 +1027,7 @@ static INT GSUB_apply_lookup(const GSUB_LookupList* lookup, INT lookup_index, WO return GSUB_E_NOGLYPH; } -static INT GSUB_apply_feature(const GSUB_Header * header, const GSUB_Feature* feature, WORD *glyphs, INT glyph_index, INT write_dir, INT *glyph_count) +static INT GSUB_apply_feature_all_lookups(const GSUB_Header * header, const GSUB_Feature* feature, WORD *glyphs, INT glyph_index, INT write_dir, INT *glyph_count) { int i; int out_index = GSUB_E_NOGLYPH; @@ -1047,7 +1047,7 @@ static INT GSUB_apply_feature(const GSUB_Header * header, const GSUB_Feature* fe else { int out2; - out2 = GSUB_apply_feature(header, feature, glyphs, glyph_index, write_dir, glyph_count); + out2 = GSUB_apply_feature_all_lookups(header, feature, glyphs, glyph_index, write_dir, glyph_count); if (out2!=GSUB_E_NOGLYPH) out_index = out2; } @@ -1171,7 +1171,7 @@ static INT apply_GSUB_feature_to_glyph(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCach return GSUB_E_NOFEATURE; TRACE("applying feature %s\n",feat); - return GSUB_apply_feature(psc->GSUB_Table, feature, glyphs, index, write_dir, glyph_count); + return GSUB_apply_feature_all_lookups(psc->GSUB_Table, feature, glyphs, index, write_dir, glyph_count); } static VOID *load_gsub_table(HDC hdc) @@ -1419,23 +1419,32 @@ static void UpdateClusters(int nextIndex, int changeCount, int write_dir, int ch static int apply_GSUB_feature(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, WORD *pwOutGlyphs, int write_dir, INT* pcGlyphs, INT cChars, const char* feat, WORD *pwLogClust ) { - int i; - if (psc->GSUB_Table) { const GSUB_Feature *feature; + const GSUB_LookupList *lookup; + const GSUB_Header *header = psc->GSUB_Table; + int lookup_index, lookup_count; feature = load_GSUB_feature(hdc, psa, psc, feat); if (!feature) return GSUB_E_NOFEATURE; - i = 0; TRACE("applying feature %s\n",debugstr_an(feat,4)); - while(i < *pcGlyphs) - { + lookup = (const GSUB_LookupList*)((const BYTE*)header + GET_BE_WORD(header->LookupList)); + lookup_count = GET_BE_WORD(feature->LookupCount); + TRACE("%i lookups\n", lookup_count); + for (lookup_index = 0; lookup_index < lookup_count; lookup_index++) + { + int i; + i = 0; + TRACE("applying lookup (%i/%i)\n",lookup_index,lookup_count); + while(i < *pcGlyphs) + { INT nextIndex; INT prevCount = *pcGlyphs; - nextIndex = GSUB_apply_feature(psc->GSUB_Table, feature, pwOutGlyphs, i, write_dir, pcGlyphs); + + nextIndex = GSUB_apply_lookup(lookup, GET_BE_WORD(feature->LookupListIndex[lookup_index]), pwOutGlyphs, i, write_dir, pcGlyphs); if (nextIndex > GSUB_E_NOGLYPH) { UpdateClusters(nextIndex, *pcGlyphs - prevCount, write_dir, cChars, pwLogClust); @@ -1443,6 +1452,7 @@ static int apply_GSUB_feature(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, W } else i++; + } } return *pcGlyphs; } @@ -2134,7 +2144,7 @@ static void Apply_Indic_BasicForm(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *ps { INT nextIndex; INT prevCount = *pcGlyphs; - nextIndex = GSUB_apply_feature(psc->GSUB_Table, feature, pwOutGlyphs, index, 1, pcGlyphs); + nextIndex = GSUB_apply_feature_all_lookups(psc->GSUB_Table, feature, pwOutGlyphs, index, 1, pcGlyphs); if (nextIndex > GSUB_E_NOGLYPH) { UpdateClusters(nextIndex, *pcGlyphs - prevCount, 1, cChars, pwLogClust);

1 0

Frédéric Delanoy : gameux: Do not use RegCloseKey on invalid/uninitialized registry key handle ( Coverity).
by Alexandre Julliard Dec. 1, 2011

Dec. 1, 2011

Module: wine Branch: master Commit: 46229acde9869209619cb76f9d50b8b4490d18f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46229acde9869209619cb76f9… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Nov 30 16:26:17 2011 +0100 gameux: Do not use RegCloseKey on invalid/uninitialized registry key handle (Coverity). --- dlls/gameux/gamestatistics.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/gameux/gamestatistics.c b/dlls/gameux/gamestatistics.c index cfe14b9..5cdd516 100644 --- a/dlls/gameux/gamestatistics.c +++ b/dlls/gameux/gamestatistics.c @@ -388,17 +388,18 @@ static HRESULT GAMEUX_getAppIdFromGDFPath( /* game is registered, let's read it's application id from registry */ hr = GAMEUX_buildGameRegistryPath(installScope, &instanceId, &lpRegistryPath); - if(SUCCEEDED(hr)) + if(SUCCEEDED(hr)) { hr = HRESULT_FROM_WIN32(RegOpenKeyExW(HKEY_LOCAL_MACHINE, lpRegistryPath, 0, KEY_READ | KEY_WOW64_64KEY, &hKey)); - - if(SUCCEEDED(hr)) - hr = HRESULT_FROM_WIN32(RegGetValueW(hKey, - NULL, sApplicationId, RRF_RT_REG_SZ, - NULL, lpApplicationId, &dwLength)); + if(SUCCEEDED(hr)) { + hr = HRESULT_FROM_WIN32(RegGetValueW(hKey, + NULL, sApplicationId, RRF_RT_REG_SZ, + NULL, lpApplicationId, &dwLength)); + RegCloseKey(hKey); + } + } HeapFree(GetProcessHeap(), 0, lpRegistryPath); - RegCloseKey(hKey); TRACE("found app id: %s, return: %#x\n", debugstr_w(lpApplicationId), hr); return hr;

1 0

Jacek Caban : jscript: Use bytecode for '>' expression implementation.
by Alexandre Julliard Dec. 1, 2011

Dec. 1, 2011

Module: wine Branch: master Commit: f3e18fbf03d0894b83b949542ec2975b742d71d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3e18fbf03d0894b83b949542… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 1 13:23:16 2011 +0100 jscript: Use bytecode for '>' expression implementation. --- dlls/jscript/compile.c | 2 ++ dlls/jscript/engine.c | 20 +++++++++----------- dlls/jscript/engine.h | 2 +- dlls/jscript/parser.y | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 04c247e..7a82683 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -404,6 +404,8 @@ static HRESULT compile_expression(compiler_ctx_t *ctx, expression_t *expr) return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_eq); case EXPR_EQEQ: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_eq2); + case EXPR_GREATER: + return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_gt); case EXPR_IDENT: return push_instr_bstr(ctx, OP_ident, ((identifier_expression_t*)expr)->identifier); case EXPR_IN: diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 76cc0c8..8d177c2 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -3058,26 +3058,24 @@ static HRESULT interp_lteq(exec_ctx_t *ctx) } /* ECMA-262 3rd Edition 11.8.2 */ -HRESULT greater_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +static HRESULT interp_gt(exec_ctx_t *ctx) { - binary_expression_t *expr = (binary_expression_t*)_expr; - VARIANT rval, lval; + VARIANT *l, *r; BOOL b; HRESULT hres; - TRACE("\n"); + r = stack_pop(ctx); + l = stack_pop(ctx); - hres = get_binary_expr_values(ctx, expr, ei, &lval, &rval); - if(FAILED(hres)) - return hres; + TRACE("%s > %s\n", debugstr_variant(l), debugstr_variant(r)); - hres = less_eval(ctx, &rval, &lval, FALSE, ei, &b); - VariantClear(&lval); - VariantClear(&rval); + hres = less_eval(ctx->parser->script, r, l, FALSE, &ctx->ei, &b); + VariantClear(l); + VariantClear(r); if(FAILED(hres)) return hres; - return return_bool(ret, b); + return stack_push_bool(ctx, b); } /* ECMA-262 3rd Edition 11.8.4 */ diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 8131b5f..c176180 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -50,6 +50,7 @@ typedef struct _func_stack { X(double, 1, ARG_SBL, 0) \ X(eq, 1, 0,0) \ X(eq2, 1, 0,0) \ + X(gt, 1, 0,0) \ X(ident, 1, ARG_BSTR, 0) \ X(in, 1, 0,0) \ X(int, 1, ARG_INT, 0) \ @@ -562,7 +563,6 @@ HRESULT post_increment_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcep HRESULT post_decrement_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT pre_increment_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT pre_decrement_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; -HRESULT greater_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT greatereq_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT left_shift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT right_shift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index e815667..39bcba6 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1333,7 +1333,7 @@ static const expression_eval_t expression_eval_table[] = { compiled_expression_eval, compiled_expression_eval, compiled_expression_eval, - greater_expression_eval, + compiled_expression_eval, greatereq_expression_eval, compiled_expression_eval, compiled_expression_eval,

1 0

Hans Leidekker : winhttp: Double the handle table size on reallocation.
by Alexandre Julliard Dec. 1, 2011

Dec. 1, 2011

Module: wine Branch: master Commit: 5683433f9cc4d3d8f05a11b5f9fa25cb27c6ebf9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5683433f9cc4d3d8f05a11b5f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Dec 1 13:02:53 2011 +0100 winhttp: Double the handle table size on reallocation. --- dlls/winhttp/handle.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/handle.c b/dlls/winhttp/handle.c index 7010727..7a346a8 100644 --- a/dlls/winhttp/handle.c +++ b/dlls/winhttp/handle.c @@ -103,7 +103,7 @@ HINTERNET alloc_handle( object_header_t *hdr ) } if (max_handles == next_handle) { - num = max_handles + HANDLE_CHUNK_SIZE; + num = max_handles * 2; if (!(p = heap_realloc_zero( handles, sizeof(ULONG_PTR) * num ))) goto end; handles = p; max_handles = num;

1 0

Akihiro Sagawa : msvcrt: Fix wctob in C locale.
by Alexandre Julliard Dec. 1, 2011

Dec. 1, 2011

Module: wine Branch: master Commit: 13aff6dc56278cd5323af0d7bee53b0ebc5a643e URL: http://source.winehq.org/git/wine.git/?a=commit;h=13aff6dc56278cd5323af0d7b… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Nov 30 22:34:13 2011 +0900 msvcrt: Fix wctob in C locale. --- dlls/msvcrt/tests/string.c | 3 +++ dlls/msvcrt/wcs.c | 10 ++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 5fe69cf..c923684 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -2002,6 +2002,9 @@ static void test_wctob(void) ret = p_wctob(0x81); ok(ret == (int)(char)0x81, "ret = %x\n", ret); + ret = p_wctob(0x9f); + ok(ret == (int)(char)0x9f, "ret = %x\n", ret); + ret = p_wctob(0xe0); ok(ret == (int)(char)0xe0, "ret = %x\n", ret); } diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 1a685de..17ff532 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1056,8 +1056,14 @@ INT CDECL MSVCRT_wctob( MSVCRT_wint_t wchar ) { char out; BOOL error; + UINT codepage = get_locinfo()->lc_codepage; - if(WideCharToMultiByte( get_locinfo()->lc_codepage, 0, &wchar, 1, &out, 1, NULL, &error ) && !error) + if(!codepage) { + if (wchar < 0xff) + return (signed char)wchar; + else + return MSVCRT_EOF; + } else if(WideCharToMultiByte( codepage, 0, &wchar, 1, &out, 1, NULL, &error ) && !error) return (INT)out; return MSVCRT_EOF; }

1 0

Rico Schüller : d3dx9: Implement ID3DXBaseEffect:: SetMatrixTranspose().
by Alexandre Julliard Dec. 1, 2011

Dec. 1, 2011

Module: wine Branch: master Commit: 90415ebdfacbe22824ad1857ce37b200cc66d77c URL: http://source.winehq.org/git/wine.git/?a=commit;h=90415ebdfacbe22824ad1857c… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Dec 1 13:45:07 2011 +0100 d3dx9: Implement ID3DXBaseEffect::SetMatrixTranspose(). --- dlls/d3dx9_36/effect.c | 30 ++++++++++++++++++++++++++++-- 1 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 2cf12ac..927e067 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -2257,10 +2257,36 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetMatrixPointerArray(ID3DXBaseEffect static HRESULT WINAPI ID3DXBaseEffectImpl_SetMatrixTranspose(ID3DXBaseEffect *iface, D3DXHANDLE parameter, CONST D3DXMATRIX *matrix) { struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(This, parameter); + D3DXMATRIX m; - FIXME("iface %p, parameter %p, matrix %p stub\n", This, parameter, matrix); + TRACE("iface %p, parameter %p, matrix %p\n", This, parameter, matrix); - return E_NOTIMPL; + if (param && !param->element_count) + { + TRACE("Class %s\n", debug_d3dxparameter_class(param->class)); + + switch (param->class) + { + case D3DXPC_MATRIX_ROWS: + set_matrix(param, D3DXMatrixTranspose(&m, matrix)); + return D3D_OK; + + case D3DXPC_SCALAR: + case D3DXPC_VECTOR: + case D3DXPC_OBJECT: + case D3DXPC_STRUCT: + break; + + default: + FIXME("Unhandled class %s\n", debug_d3dxparameter_class(param->class)); + break; + } + } + + WARN("Invalid argument specified\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI ID3DXBaseEffectImpl_GetMatrixTranspose(ID3DXBaseEffect *iface, D3DXHANDLE parameter, D3DXMATRIX *matrix)

1 0

Jacek Caban : jscript: Use bytecode for '>=' expression implementation.
by Alexandre Julliard Dec. 1, 2011

Dec. 1, 2011

Module: wine Branch: master Commit: 9f9f5ae0a7a5ec9ce31bd110c6a30fd172f8ee37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f9f5ae0a7a5ec9ce31bd110c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 1 13:23:36 2011 +0100 jscript: Use bytecode for '>=' expression implementation. --- dlls/jscript/compile.c | 2 ++ dlls/jscript/engine.c | 20 +++++++++----------- dlls/jscript/engine.h | 2 +- dlls/jscript/parser.y | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 7a82683..ed42b4d 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -406,6 +406,8 @@ static HRESULT compile_expression(compiler_ctx_t *ctx, expression_t *expr) return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_eq2); case EXPR_GREATER: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_gt); + case EXPR_GREATEREQ: + return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_gteq); case EXPR_IDENT: return push_instr_bstr(ctx, OP_ident, ((identifier_expression_t*)expr)->identifier); case EXPR_IN: diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 8d177c2..d24392c 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -3079,26 +3079,24 @@ static HRESULT interp_gt(exec_ctx_t *ctx) } /* ECMA-262 3rd Edition 11.8.4 */ -HRESULT greatereq_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +static HRESULT interp_gteq(exec_ctx_t *ctx) { - binary_expression_t *expr = (binary_expression_t*)_expr; - VARIANT rval, lval; + VARIANT *l, *r; BOOL b; HRESULT hres; - TRACE("\n"); + r = stack_pop(ctx); + l = stack_pop(ctx); - hres = get_binary_expr_values(ctx, expr, ei, &lval, &rval); - if(FAILED(hres)) - return hres; + TRACE("%s >= %s\n", debugstr_variant(l), debugstr_variant(r)); - hres = less_eval(ctx, &lval, &rval, TRUE, ei, &b); - VariantClear(&lval); - VariantClear(&rval); + hres = less_eval(ctx->parser->script, l, r, TRUE, &ctx->ei, &b); + VariantClear(l); + VariantClear(r); if(FAILED(hres)) return hres; - return return_bool(ret, b); + return stack_push_bool(ctx, b); } /* ECMA-262 3rd Edition 11.4.8 */ diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index c176180..e86db0f 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -51,6 +51,7 @@ typedef struct _func_stack { X(eq, 1, 0,0) \ X(eq2, 1, 0,0) \ X(gt, 1, 0,0) \ + X(gteq, 1, 0,0) \ X(ident, 1, ARG_BSTR, 0) \ X(in, 1, 0,0) \ X(int, 1, ARG_INT, 0) \ @@ -563,7 +564,6 @@ HRESULT post_increment_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcep HRESULT post_decrement_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT pre_increment_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT pre_decrement_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; -HRESULT greatereq_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT left_shift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT right_shift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT right2_shift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 39bcba6..c1c5df6 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1334,7 +1334,7 @@ static const expression_eval_t expression_eval_table[] = { compiled_expression_eval, compiled_expression_eval, compiled_expression_eval, - greatereq_expression_eval, + compiled_expression_eval, compiled_expression_eval, compiled_expression_eval, left_shift_expression_eval,

1 0