November 2012 - Wine-commits

Jacek Caban : jscript: Use jsdisp_propput_dontenum where appropriate.
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: ea34e01493e736f8745829acf7339614f8edec6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea34e01493e736f8745829acf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 5 15:04:01 2012 +0100 jscript: Use jsdisp_propput_dontenum where appropriate. --- dlls/jscript/error.c | 6 +++--- dlls/jscript/function.c | 13 +++++++++---- dlls/jscript/global.c | 8 ++++---- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/dlls/jscript/error.c b/dlls/jscript/error.c index e127bfc..f7b0443 100644 --- a/dlls/jscript/error.c +++ b/dlls/jscript/error.c @@ -190,7 +190,7 @@ static HRESULT create_error(script_ctx_t *ctx, jsdisp_t *constr, if(FAILED(hres)) return hres; - hres = jsdisp_propput_name(err, numberW, jsval_number((INT)number)); + hres = jsdisp_propput_dontenum(err, numberW, jsval_number((INT)number)); if(FAILED(hres)) { jsdisp_release(err); return hres; @@ -201,7 +201,7 @@ static HRESULT create_error(script_ctx_t *ctx, jsdisp_t *constr, if(str) { hres = jsdisp_propput_name(err, messageW, jsval_string(str)); if(SUCCEEDED(hres)) - hres = jsdisp_propput_name(err, descriptionW, jsval_string(str)); + hres = jsdisp_propput_dontenum(err, descriptionW, jsval_string(str)); jsstr_release(str); }else { hres = E_OUTOFMEMORY; @@ -357,7 +357,7 @@ HRESULT init_error_constr(script_ctx_t *ctx, jsdisp_t *object_prototype) return E_OUTOFMEMORY; } - hres = jsdisp_propput_name(err, nameW, jsval_string(str)); + hres = jsdisp_propput_dontenum(err, nameW, jsval_string(str)); jsstr_release(str); if(SUCCEEDED(hres)) hres = create_builtin_constructor(ctx, constr_val[i], names[i], NULL, diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index c5bcd2e..299fafb 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -104,16 +104,21 @@ static HRESULT create_arguments(script_ctx_t *ctx, IDispatch *calee, unsigned ar } for(i=0; i < argc; i++) { - hres = jsdisp_propput_idx(args, i, argv[i]); + WCHAR buf[12]; + + static const WCHAR formatW[] = {'%','d',0}; + + sprintfW(buf, formatW, i); + hres = jsdisp_propput_dontenum(args, buf, argv[i]); if(FAILED(hres)) break; } if(SUCCEEDED(hres)) { - hres = jsdisp_propput_name(args, lengthW, jsval_number(argc)); + hres = jsdisp_propput_dontenum(args, lengthW, jsval_number(argc)); if(SUCCEEDED(hres)) - hres = jsdisp_propput_name(args, caleeW, jsval_disp(calee)); + hres = jsdisp_propput_dontenum(args, caleeW, jsval_disp(calee)); } if(FAILED(hres)) { @@ -592,7 +597,7 @@ static HRESULT create_function(script_ctx_t *ctx, const builtin_info_t *builtin_ static inline HRESULT set_prototype(script_ctx_t *ctx, jsdisp_t *dispex, jsdisp_t *prototype) { - return jsdisp_propput_name(dispex, prototypeW, jsval_obj(prototype)); + return jsdisp_propput_dontenum(dispex, prototypeW, jsval_obj(prototype)); } HRESULT create_builtin_function(script_ctx_t *ctx, builtin_invoke_t value_proc, const WCHAR *name, diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index 8809ddc..0668e86 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -1245,19 +1245,19 @@ HRESULT init_global(script_ctx_t *ctx) if(FAILED(hres)) return hres; - hres = jsdisp_propput_name(ctx->global, MathW, jsval_obj(math)); + hres = jsdisp_propput_dontenum(ctx->global, MathW, jsval_obj(math)); jsdisp_release(math); if(FAILED(hres)) return hres; - hres = jsdisp_propput_name(ctx->global, undefinedW, jsval_undefined()); + hres = jsdisp_propput_dontenum(ctx->global, undefinedW, jsval_undefined()); if(FAILED(hres)) return hres; - hres = jsdisp_propput_name(ctx->global, NaNW, jsval_number(NAN)); + hres = jsdisp_propput_dontenum(ctx->global, NaNW, jsval_number(NAN)); if(FAILED(hres)) return hres; - hres = jsdisp_propput_name(ctx->global, InfinityW, jsval_number(INFINITY)); + hres = jsdisp_propput_dontenum(ctx->global, InfinityW, jsval_number(INFINITY)); return hres; }

1 0

Jacek Caban : jscript: Added propertyIsEnumerable implementation.
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: 78652f76022bf4c7bf6311948aa62addd047bf83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78652f76022bf4c7bf6311948… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 5 15:04:19 2012 +0100 jscript: Added propertyIsEnumerable implementation. --- dlls/jscript/dispex.c | 13 +++++++++++++ dlls/jscript/jscript.h | 1 + dlls/jscript/object.c | 30 ++++++++++++++++++++++++++++-- 3 files changed, 42 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index b01619e..f68a031 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1444,3 +1444,16 @@ HRESULT jsdisp_is_own_prop(jsdisp_t *obj, const WCHAR *name, BOOL *ret) *ret = prop && (prop->type == PROP_JSVAL || prop->type == PROP_BUILTIN); return S_OK; } + +HRESULT jsdisp_is_enumerable(jsdisp_t *obj, const WCHAR *name, BOOL *ret) +{ + dispex_prop_t *prop; + HRESULT hres; + + hres = find_prop_name(obj, string_hash(name), name, &prop); + if(FAILED(hres)) + return hres; + + *ret = prop && (prop->flags & PROPF_ENUM) && prop->type != PROP_PROTREF; + return S_OK; +} diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 18ac1db..6b7c5a1 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -273,6 +273,7 @@ HRESULT jsdisp_get_idx(jsdisp_t*,DWORD,jsval_t*) DECLSPEC_HIDDEN; HRESULT jsdisp_get_id(jsdisp_t*,const WCHAR*,DWORD,DISPID*) DECLSPEC_HIDDEN; HRESULT jsdisp_delete_idx(jsdisp_t*,DWORD) DECLSPEC_HIDDEN; HRESULT jsdisp_is_own_prop(jsdisp_t*,const WCHAR*,BOOL*) DECLSPEC_HIDDEN; +HRESULT jsdisp_is_enumerable(jsdisp_t*,const WCHAR*,BOOL*) DECLSPEC_HIDDEN; HRESULT create_builtin_function(script_ctx_t*,builtin_invoke_t,const WCHAR*,const builtin_info_t*,DWORD, jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index 6c585f7..34c572f 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -160,8 +160,34 @@ static HRESULT Object_hasOwnProperty(script_ctx_t *ctx, vdisp_t *jsthis, WORD fl static HRESULT Object_propertyIsEnumerable(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - FIXME("\n"); - return E_NOTIMPL; + jsstr_t *name; + BOOL ret; + HRESULT hres; + + TRACE("\n"); + + if(argc != 1) { + FIXME("argc %d not supported\n", argc); + return E_NOTIMPL; + } + + if(!is_jsdisp(jsthis)) { + FIXME("Host object this\n"); + return E_FAIL; + } + + hres = to_string(ctx, argv[0], &name); + if(FAILED(hres)) + return hres; + + hres = jsdisp_is_enumerable(jsthis->u.jsdisp, name->str, &ret); + jsstr_release(name); + if(FAILED(hres)) + return hres; + + if(r) + *r = jsval_bool(ret); + return S_OK; } static HRESULT Object_isPrototypeOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,

1 0

Jacek Caban : jscript: Added more enumerable attribute tests.
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: 25ffa3d97b33af2eaf2bae7ef536d20202135d79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25ffa3d97b33af2eaf2bae7ef… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 5 15:04:38 2012 +0100 jscript: Added more enumerable attribute tests. --- dlls/jscript/tests/api.js | 80 +++++++++++++++++++++++++++++++++++++++++- dlls/jscript/tests/regexp.js | 5 +++ 2 files changed, 84 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 03d1a71..ce2f153 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -26,6 +26,74 @@ ok(ScriptEngineMajorVersion() === ScriptEngineMajorVersion(2), "ScriptEngineMajo ok(ScriptEngineMinorVersion() === ScriptEngineMinorVersion(2), "ScriptEngineMinorVersion() !== ScriptEngineMinorVersion(2)"); ok(ScriptEngineBuildVersion() === ScriptEngineBuildVersion(2), "ScriptEngineBuildVersion() !== ScriptEngineBuildVersion(2)"); +function testNoEnumerables(expr) { + for(var iter in obj) + ok(false, expr + " has property " + iter); +} + +testNoEnumerables("Object"); +testNoEnumerables("Object.prototype"); +testNoEnumerables("new Object()"); +testNoEnumerables("Math"); +testNoEnumerables("String"); +testNoEnumerables("String.prototype"); +testNoEnumerables("new String()"); +testNoEnumerables("Number"); +testNoEnumerables("Number.prototype"); +testNoEnumerables("new Number(1)"); +testNoEnumerables("ActiveXObject"); +testNoEnumerables("Array"); +testNoEnumerables("Array.prototype"); +testNoEnumerables("new Array()"); +testNoEnumerables("Boolean"); +testNoEnumerables("Boolean.prototype"); +testNoEnumerables("new Boolean()"); +testNoEnumerables("Date"); +testNoEnumerables("Date.prototype"); +testNoEnumerables("new Date()"); +testNoEnumerables("TypeError"); +testNoEnumerables("TypeError.prototype"); +testNoEnumerables("new TypeError()"); +testNoEnumerables("Function"); +testNoEnumerables("Function.prototype"); +testNoEnumerables("testNoEnumerates"); +testNoEnumerables("VBArray"); + +ok(Object.propertyIsEnumerable("prototype") === false, "Object.prototype is enumerable"); +ok(Math.propertyIsEnumerable("E") === false, "Math.E is enumerable"); +ok(Math.propertyIsEnumerable("SQRT2") === false, "Math.SQRT2 is enumerable"); +ok(Math.propertyIsEnumerable("PI") === false, "Math.PI is enumerable"); +ok("test".propertyIsEnumerable("length") === false, "'test'.length is enumerable"); +ok([1].propertyIsEnumerable("length") === false, "[1].length is enumerable"); +ok((new TypeError()).propertyIsEnumerable("message") === true, "(new TypeError()).message is not enumerable"); +ok((new TypeError()).propertyIsEnumerable("description") === false, "(new TypeError()).description is enumerable"); +ok((new TypeError()).propertyIsEnumerable("name") === false, "(new TypeError()).name is enumerable"); +ok((new TypeError()).propertyIsEnumerable("number") === false, "(new TypeError()).number is enumerable"); +ok(Object.propertyIsEnumerable.propertyIsEnumerable("length") === false, "Object.propertyIsEnumerable.length is enumerable"); + +tmp = new Object(); +tmp.test = "1"; +ok(tmp.propertyIsEnumerable("test"), "tmp.test is not enumerable"); + +tmp = { test: 1 }; +ok(tmp.propertyIsEnumerable("test"), "tmp.test is not enumerable"); + +ok([1].concat([2]).propertyIsEnumerable("1"), "[1].concat([2]).1 is not enumerable"); +ok("t.e.s.t".split(".").propertyIsEnumerable("0"), "'test'.split().0 is not enumerable"); + +(function() { + ok(arguments.propertyIsEnumerable("0") === false, "arguments.0 is enumerable"); + ok(arguments.propertyIsEnumerable("length") === false, "arguments.length is enumerable"); + ok(arguments.propertyIsEnumerable("calee") === false, "arguments.calee is enumerable"); +})(); + +tmp = [1]; +tmp.push(""); +ok(tmp.propertyIsEnumerable("1"), "[1].push() ... 1 is not enumerable"); + +ok([1,2].reverse().propertyIsEnumerable("1"), "[1,2].rverse().1 is not enumerable"); +ok([1,2].propertyIsEnumerable("0"), "[1,2].0 is not enumerable"); + i = parseInt("0"); ok(i === 0, "parseInt('0') = " + i); i = parseInt("123"); @@ -489,7 +557,6 @@ ok(r[0] === "1", "r[0] = " + r[0]); ok(r[1] === "2", "r[1] = " + r[1]); ok(r[2] === "3", "r[2] = " + r[2]); - r = "1,2,3".split(",*"); ok(r.length === 1, "r.length = " + r.length); ok(r[0] === "1,2,3", "r[0] = " + r[0]); @@ -811,6 +878,14 @@ tmp = arr.pop(); ok(arr.length === 5, "arr.length = " + arr.length); ok(tmp === undefined, "tmp = " + tmp); +function PseudoArray() { + this[0] = 0; +} +PseudoArray.prototype = {length: 1}; +arr = new PseudoArray(); +Array.prototype.push.call(arr, 2); +ok(arr.propertyIsEnumerable("length"), "arr.length is not enumerable"); + arr = [1,2,null,false,undefined,,"a"]; tmp = arr.join(); @@ -1998,6 +2073,7 @@ ok(err.valueOf === Object.prototype.valueOf, "err.valueOf !== Object.prototype.v ok(Error.prototype.name === "Error", "Error.prototype.name = " + Error.prototype.name); ok(err.name === "Error", "err.name = " + err.name); EvalError.prototype.message = "test"; +ok(EvalError.prototype.message === "test", "EvalError.prototype.message = " + EvalError.prototype.message); ok(err.toString !== Object.prototype.toString, "err.toString === Object.prototype.toString"); ok(err.toString() === (invokeVersion < 2 ? "[object Error]" : "Error"), "err.toString() = " + err.toString()); err = new EvalError(); @@ -2440,6 +2516,8 @@ function testFunctions(obj, arr) { for(var i=0; i<arr.length; i++) { l = obj[arr[i][0]].length; ok(l === arr[i][1], arr[i][0] + ".length = " + l); + + ok(obj.propertyIsEnumerable(arr[i][0]) === false, arr[i][0] + " is enumerable"); } } diff --git a/dlls/jscript/tests/regexp.js b/dlls/jscript/tests/regexp.js index 6274f93..69aa6b7 100644 --- a/dlls/jscript/tests/regexp.js +++ b/dlls/jscript/tests/regexp.js @@ -41,6 +41,11 @@ ok(m.index === 1, "m.index = " + m.index); ok(m.input === " aabaaa", "m.input = " + m.input); ok(m.length === 1, "m.length = " + m.length); ok(m[0] === "aa", "m[0] = " + m[0]); +ok(m.propertyIsEnumerable("0"), "m.0 is not enumerable"); +ok(m.propertyIsEnumerable("input"), "m.input is not enumerable"); +ok(m.propertyIsEnumerable("index"), "m.index is not enumerable"); +ok(m.propertyIsEnumerable("lastIndex"), "m.lastIndex is not enumerable"); +ok(m.propertyIsEnumerable("length") === false, "m.length is not enumerable"); ok(RegExp.leftContext === " ", "RegExp.leftContext = " + RegExp.leftContext); ok(RegExp.rightContext === "baaa", "RegExp.rightContext = " + RegExp.rightContext);

1 0

Hans Leidekker : msi: Fix handling of strings with embedded nulls in msi_addstring.
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: 8d21f998c3c7fd4e469fab81229f07eb763cd6ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d21f998c3c7fd4e469fab812… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Nov 5 16:29:30 2012 +0100 msi: Fix handling of strings with embedded nulls in msi_addstring. --- dlls/msi/string.c | 15 +++++---------- 1 files changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/msi/string.c b/dlls/msi/string.c index 486cdf9..8e3e575 100644 --- a/dlls/msi/string.c +++ b/dlls/msi/string.c @@ -258,14 +258,12 @@ static UINT msi_string2idA( const string_table *st, LPCSTR buffer, UINT *id ) return r; } -static int msi_addstring( string_table *st, UINT n, const CHAR *data, int len, USHORT refcount, enum StringPersistence persistence ) +static int msi_addstring( string_table *st, UINT n, const char *data, UINT len, USHORT refcount, enum StringPersistence persistence ) { LPWSTR str; int sz; - if( !data ) - return 0; - if( !data[0] ) + if( !data || !len ) return 0; if( n > 0 ) { @@ -295,8 +293,6 @@ static int msi_addstring( string_table *st, UINT n, const CHAR *data, int len, U } /* allocate a new string */ - if( len < 0 ) - len = strlen(data); sz = MultiByteToWideChar( st->codepage, 0, data, len, NULL, 0 ); str = msi_alloc( (sz+1)*sizeof(WCHAR) ); if( !str ) @@ -305,7 +301,6 @@ static int msi_addstring( string_table *st, UINT n, const CHAR *data, int len, U str[sz] = 0; set_st_entry( st, n, str, sz, refcount, persistence ); - return n; } @@ -316,6 +311,9 @@ int msi_addstringW( string_table *st, const WCHAR *data, int len, USHORT refcoun if( !data ) return 0; + + if (len < 0) len = strlenW( data ); + if( !data[0] && !len ) return 0; @@ -333,8 +331,6 @@ int msi_addstringW( string_table *st, const WCHAR *data, int len, USHORT refcoun return -1; /* allocate a new string */ - if(len<0) - len = strlenW(data); TRACE( "%s, n = %d len = %d\n", debugstr_wn(data, len), n, len ); str = msi_alloc( (len+1)*sizeof(WCHAR) ); @@ -344,7 +340,6 @@ int msi_addstringW( string_table *st, const WCHAR *data, int len, USHORT refcoun str[len] = 0; set_st_entry( st, n, str, len, refcount, persistence ); - return n; }

1 0

Nikolay Sivov : dwrite: Support eight more script ranges.
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: aeb5950e6f1edb2f687934524a9ac3aaec459bdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=aeb5950e6f1edb2f687934524… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 5 17:08:12 2012 -0500 dwrite: Support eight more script ranges. --- dlls/dwrite/analyzer.c | 40 +++++++++++++++++++- dlls/dwrite/tests/analyzer.c | 84 ++++++++++++++++++++++++++++++++++++++---- 2 files changed, 114 insertions(+), 10 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 34b9faf..d71220c 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -30,7 +30,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(dwrite); enum scriptcode { Script_Arabic = 0, Script_Armenian = 1, + Script_Balinese = 2, Script_Bengali = 3, + Script_Buginese = 6, Script_Canadian = 8, Script_Cherokee = 11, Script_Controls = 12, @@ -47,16 +49,22 @@ enum scriptcode { Script_Kannada = 32, Script_Khmer = 36, Script_Lao = 37, - Script_Latin = 38, + Script_Latin = 38, + Script_Lepcha = 39, + Script_Limbu = 40, Script_Malayalam = 44, Script_Mongolian = 45, Script_Myanmar = 46, + Script_New_TaiLue = 47, Script_NKo = 48, Script_Ogham = 49, + Script_OlChiki = 50, Script_Oriya = 53, Script_Runic = 58, Script_Sinhala = 61, + Script_Sundanese = 62, Script_Syriac = 64, + Script_TaiLe = 67, Script_Tamil = 68, Script_Telugu = 69, Script_Thaana = 70, @@ -167,7 +175,35 @@ static const struct script_range script_ranges[] = { /* Khmer: U+1780–U+17FF */ { Script_Khmer, 0x1780, 0x17ff }, /* Mongolian: U+1800–U+18AF */ - { Script_Mongolian, 0x1800, 0x18af}, + { Script_Mongolian, 0x1800, 0x18af }, + /* Limbu: U+1900–U+194F */ + { Script_Limbu, 0x1900, 0x194f }, + /* Tai Le: U+1950–U+197F */ + { Script_TaiLe, 0x1950, 0x197f }, + /* New Tai Lue: U+1980–U+19DF */ + { Script_New_TaiLue, 0x1980, 0x19df }, + /* Khmer Symbols: U+19E0–U+19FF */ + { Script_Khmer, 0x19e0, 0x19ff }, + /* Buginese: U+1A00–U+1A1F */ + { Script_Buginese, 0x1a00, 0x1a1f }, + /* Tai Tham: U+1A20–U+1AAF */ + { Script_Symbol, 0x1a20, 0x1aaf }, + /* Balinese: U+1B00–U+1B7F */ + { Script_Balinese, 0x1b00, 0x1b7f }, + /* Sundanese: U+1B80–U+1BBF */ + { Script_Sundanese, 0x1b80, 0x1bbf }, + /* Batak: U+1BC0–U+1BFF */ + { Script_Symbol, 0x1bc0, 0x1bff }, + /* Lepcha: U+1C00–U+1C4F */ + { Script_Lepcha, 0x1c00, 0x1c4f }, + /* Ol Chiki: U+1C50–U+1C7F */ + { Script_OlChiki, 0x1c50, 0x1c7f }, + /* Sundanese Supplement: U+1CC0–U+1CCF */ + { Script_Symbol, 0x1cc0, 0x1ccf }, + /* Vedic Extensions: U+1CD0-U+1CFF */ + { Script_Devanagari, 0x1cd0, 0x1cff }, + /* Phonetic Extensions: U+1D00–U+1DBF */ + { Script_Latin, 0x1d00, 0x1dbf }, /* unsupported range */ { Script_Unknown } }; diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index 050837e..05dc036 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -399,7 +399,9 @@ struct sa_test { enum scriptcode { Script_Arabic = 0, Script_Armenian = 1, + Script_Balinese = 2, Script_Bengali = 3, + Script_Buginese = 6, Script_Canadian = 8, Script_Cherokee = 11, Script_Controls = 12, @@ -416,22 +418,28 @@ enum scriptcode { Script_Kannada = 32, Script_Khmer = 36, Script_Lao = 37, - Script_Latin = 38, + Script_Latin = 38, + Script_Lepcha = 39, + Script_Limbu = 40, Script_Malayalam = 44, Script_Mongolian = 45, Script_Myanmar = 46, + Script_New_TaiLue = 47, Script_NKo = 48, Script_Ogham = 49, + Script_OlChiki = 50, Script_Oriya = 53, Script_Runic = 58, Script_Sinhala = 61, + Script_Sundanese = 62, Script_Syriac = 64, + Script_TaiLe = 67, Script_Tamil = 68, Script_Telugu = 69, Script_Thaana = 70, Script_Thai = 71, Script_Tibetan = 72, - Script_Symbol = 77 + Script_Undefined = 77 }; static struct sa_test sa_tests[] = { @@ -446,16 +454,16 @@ static struct sa_test sa_tests[] = { }, { {' ',' ',' ',' ','!','$','[','^','{','~',0}, 1, - { { 0, 10, { Script_Symbol, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + { { 0, 10, { Script_Undefined, DWRITE_SCRIPT_SHAPES_DEFAULT } }} }, { {' ',' ',' ','1','2',' ',0}, 1, - { { 0, 6, { Script_Symbol, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + { { 0, 6, { Script_Undefined, DWRITE_SCRIPT_SHAPES_DEFAULT } }} }, { /* digits only */ {'1','2',0}, 1, - { { 0, 2, { Script_Symbol, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + { { 0, 2, { Script_Undefined, DWRITE_SCRIPT_SHAPES_DEFAULT } }} }, { /* Arabic */ @@ -526,7 +534,7 @@ static struct sa_test sa_tests[] = { { /* Combining Diacritical Marks */ {0x300,0x320,0x340,0x345,0x350,0x36f,0}, 1, - { { 0, 6, { Script_Symbol, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + { { 0, 6, { Script_Undefined, DWRITE_SCRIPT_SHAPES_DEFAULT } }} }, { /* Greek and Coptic */ @@ -694,14 +702,74 @@ static struct sa_test sa_tests[] = { }, { /* Khmer */ - {0x1781,0x17c1,0x1798,0x179a,0x1797,0x17b6,0x179f,0x17b6,0}, 1, - { { 0, 8, { Script_Khmer, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + {0x1781,0x17c1,0x1798,0x179a,0x1797,0x17b6,0x179f,0x17b6,0x19e0,0}, 1, + { { 0, 9, { Script_Khmer, DWRITE_SCRIPT_SHAPES_DEFAULT } }} }, { /* Mongolian */ {0x182e,0x1823,0x1829,0x182d,0x1823,0x182f,0x0020,0x182a,0x1822,0x1834,0x1822,0x182d,0x180c,0}, 1, { { 0, 13, { Script_Mongolian, DWRITE_SCRIPT_SHAPES_DEFAULT } }} }, + { + /* Limbu */ + {0x1900,0x1910,0x1920,0x1930,0}, 1, + { { 0, 4, { Script_Limbu, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { + /* Tai Le */ + {0x1956,0x196d,0x1970,0x1956,0x196c,0x1973,0x1951,0x1968,0x1952,0x1970,0}, 1, + { { 0, 10, { Script_TaiLe, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { + /* New Tai Lue */ + {0x1992,0x19c4,0}, 1, + { { 0, 2, { Script_New_TaiLue, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { + /* Buginese */ + {0x1a00,0x1a10,0}, 1, + { { 0, 2, { Script_Buginese, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { + /* Tai Tham */ + {0x1a20,0x1a40,0x1a50,0}, 1, + { { 0, 3, { Script_Undefined, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { + /* Balinese */ + {0x1b00,0x1b05,0x1b20,0}, 1, + { { 0, 3, { Script_Balinese, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { + /* Sundanese */ + {0x1b80,0x1b85,0x1ba0,0}, 1, + { { 0, 3, { Script_Sundanese, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { + /* Batak */ + {0x1bc0,0x1be5,0x1bfc,0}, 1, + { { 0, 3, { Script_Undefined, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { + /* Lepcha */ + {0x1c00,0x1c20,0x1c40,0}, 1, + { { 0, 3, { Script_Lepcha, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { + /* Ol Chiki */ + {0x1c50,0x1c5a,0x1c77,0}, 1, + { { 0, 3, { Script_OlChiki, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { + /* Sundanese Supplement */ + {0x1cc0,0x1cc5,0x1cc8,0}, 1, + { { 0, 3, { Script_Undefined, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { + /* Phonetic Extensions */ + {0x1d00,0x1d40,0x1d70,0}, 1, + { { 0, 3, { Script_Latin, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, /* keep this as end marker */ { {0} } };

1 0

Hans Leidekker : msi: Preserve strings with embedded nulls in the record formatting implementation .
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: 570322069c98c8cddd98e67152f54a1ba0ec2fe5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=570322069c98c8cddd98e6715… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Nov 5 16:29:50 2012 +0100 msi: Preserve strings with embedded nulls in the record formatting implementation. --- dlls/msi/format.c | 268 +++++++++++++++++++++++++++-------------------------- 1 files changed, 135 insertions(+), 133 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=570322069c98c8cddd98e…

1 0

Hans Leidekker : msi: Fix handling of REG_MULTI_SZ values in the WriteRegistryValues action.
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: 7d3f903db17e69dde66bedd53a23f8bf0a5a2ed0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d3f903db17e69dde66bedd53… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Nov 5 16:30:27 2012 +0100 msi: Fix handling of REG_MULTI_SZ values in the WriteRegistryValues action. --- dlls/msi/action.c | 270 +++++++++++++++++++++++++++++++++++++---------- dlls/msi/msipriv.h | 1 + dlls/msi/record.c | 2 +- dlls/msi/tests/action.c | 103 ++++++++++++++++++- 4 files changed, 318 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7d3f903db17e69dde66be…

1 0

Frédéric Delanoy : msi: Fix a leak (coverity).
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: 84541cc5e358a39e8a1bc3a3387e1e189571567e URL: http://source.winehq.org/git/wine.git/?a=commit;h=84541cc5e358a39e8a1bc3a33… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Nov 5 15:46:45 2012 +0100 msi: Fix a leak (coverity). --- dlls/msi/table.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index a7798e5..c5aa685 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -2267,6 +2267,7 @@ static UINT msi_record_encoded_stream_name( const MSITABLEVIEW *tv, MSIRECORD *r if ( !p ) { r = ERROR_OUTOFMEMORY; + msi_free(sval); goto err; } stname = p;

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: 34951f3154616f59568e668b354a244a0603867d URL: http://source.winehq.org/git/wine.git/?a=commit;h=34951f3154616f59568e668b3… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Nov 5 11:27:57 2012 +0100 po: Update German translation. --- po/de.po | 25 +++++++++---------------- 1 files changed, 9 insertions(+), 16 deletions(-) diff --git a/po/de.po b/po/de.po index 98fa447..6087487 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-10-27 03:40+0200\n" +"PO-Revision-Date: 2012-11-05 11:27+0100\n" "Last-Translator: Julian Rüger\n" "Language-Team: none\n" "Language: German\n" @@ -8278,44 +8278,37 @@ msgid "Security Warning" msgstr "Sicherheitswarnung" #: urlmon.rc:32 -#, fuzzy -#| msgid "Do you want to continue anyway?" msgid "Do you want to install this software?" -msgstr "Möchten Sie dennoch fortfahren?" +msgstr "Möchten Sie diese Software installieren?" #: urlmon.rc:34 explorer.rc:29 msgid "Location:" msgstr "Ort:" #: urlmon.rc:36 -#, fuzzy -#| msgid "Install/Uninstall" msgid "Don't install" -msgstr "Software" +msgstr "Nicht installieren" #: urlmon.rc:40 msgid "" "When installed, ActiveX has full access to your computer.Do not click " "install unless you have absolute trust in the above source." msgstr "" +"Wenn ActiveX installiert ist, hat es Vollzugriff auf ihren Computer. Klicken " +"Sie nicht auf Installieren, wenn Sie der obigen Quelle nicht absolut " +"vertrauen." #: urlmon.rc:47 -#, fuzzy -#| msgid "Installation transform failed to apply.\n" msgid "Installation of component failed: %08x" -msgstr "Installationsumwandlung konnte nicht angewendet werden.\n" +msgstr "Installation der Komponente fehlgeschlagen: %08x" #: urlmon.rc:48 -#, fuzzy -#| msgid "&Install" msgid "Install (%d)" -msgstr "&Installieren" +msgstr "Installieren (%d)" #: urlmon.rc:49 -#, fuzzy -#| msgid "&Install" msgid "Install" -msgstr "&Installieren" +msgstr "Installieren" #: user32.rc:27 user32.rc:40 taskmgr.rc:138 msgctxt "window"

1 0

Piotr Caban : msvcrt: Improved scanf precision.
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: 74ec93bab77d387018f170ae2e3576329ae207e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74ec93bab77d387018f170ae2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Nov 5 11:40:20 2012 +0100 msvcrt: Improved scanf precision. --- dlls/msvcrt/scanf.h | 23 +++++++++++++++++++++-- 1 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/scanf.h b/dlls/msvcrt/scanf.h index 89fdac3..7f618f4 100644 --- a/dlls/msvcrt/scanf.h +++ b/dlls/msvcrt/scanf.h @@ -310,9 +310,11 @@ _FUNCTION_ { case 'f': case 'g': case 'G': { /* read a float */ - long double cur; + long double cur = 1, expcnt = 10; ULONGLONG d, hlp; int exp = 0, negative = 0; + unsigned fpcontrol; + BOOL negexp; /* skip initial whitespace */ while ((nch!=_EOF_) && _ISSPACE_(nch)) @@ -401,7 +403,24 @@ _FUNCTION_ { else exp += e; } - cur = (exp>=0 ? d*pow(10, exp) : d/pow(10, -exp)); + fpcontrol = _control87(0, 0); + _control87(MSVCRT__EM_DENORMAL|MSVCRT__EM_INVALID|MSVCRT__EM_ZERODIVIDE + |MSVCRT__EM_OVERFLOW|MSVCRT__EM_UNDERFLOW|MSVCRT__EM_INEXACT, 0xffffffff); + + negexp = (exp < 0); + if(negexp) + exp = -exp; + /* update 'cur' with this exponent. */ + while(exp) { + if(exp & 1) + cur *= expcnt; + exp /= 2; + expcnt = expcnt*expcnt; + } + cur = (negexp ? d/cur : d*cur); + + _control87(fpcontrol, 0xffffffff); + st = 1; if (!suppress) { if (L_prefix) _SET_NUMBER_(double);

1 0