October 2022 - Wine-Commits

Alex Henrie : shell32: Move strndupW to dde.c.
by Alexandre Julliard Oct. 17, 2022

Oct. 17, 2022

Module: wine Branch: master Commit: 6664991f2471004b3166397f6e2c3895d58ffa81 URL: https://gitlab.winehq.org/wine/wine/-/commit/6664991f2471004b3166397f6e2c38… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Oct 14 09:51:08 2022 -0600 shell32: Move strndupW to dde.c. --- dlls/shell32/dde.c | 13 +++++++++++++ dlls/shell32/shell32_main.h | 13 ------------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/shell32/dde.c b/dlls/shell32/dde.c index 5ab63136092..cd956def797 100644 --- a/dlls/shell32/dde.c +++ b/dlls/shell32/dde.c @@ -54,6 +54,19 @@ static const char *debugstr_hsz( HSZ hsz ) return debugstr_w( buffer ); } +static WCHAR *strndupW(const WCHAR *src, DWORD len) +{ + WCHAR *dest; + if (!src) return NULL; + dest = heap_alloc((len + 1) * sizeof(*dest)); + if (dest) + { + memcpy(dest, src, len * sizeof(WCHAR)); + dest[len] = '\0'; + } + return dest; +} + static inline BOOL Dde_OnConnect(HSZ hszTopic, HSZ hszService) { if ((hszTopic == hszProgmanTopic) && (hszService == hszProgmanService)) diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index 7bb26e46a6e..33b85ee2726 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -241,19 +241,6 @@ static inline WCHAR *strdupW(const WCHAR *src) return dest; } -static inline WCHAR *strndupW(const WCHAR *src, DWORD len) -{ - WCHAR *dest; - if (!src) return NULL; - dest = heap_alloc((len + 1) * sizeof(*dest)); - if (dest) - { - memcpy(dest, src, len * sizeof(WCHAR)); - dest[len] = '\0'; - } - return dest; -} - static inline WCHAR *strdupAtoW(const char *str) { WCHAR *ret;

1 0

Alex Henrie : shell32: Introduce combine_path helper for DDE.
by Alexandre Julliard Oct. 17, 2022

Oct. 17, 2022

Module: wine Branch: master Commit: 6004f5b0da788c645535455a9ae6d4d2e3c163b9 URL: https://gitlab.winehq.org/wine/wine/-/commit/6004f5b0da788c645535455a9ae6d4… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Oct 14 09:51:08 2022 -0600 shell32: Introduce combine_path helper for DDE. --- dlls/shell32/dde.c | 45 +++++++++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 20 deletions(-) diff --git a/dlls/shell32/dde.c b/dlls/shell32/dde.c index 39e7de9c2c9..51aa8f88927 100644 --- a/dlls/shell32/dde.c +++ b/dlls/shell32/dde.c @@ -91,20 +91,30 @@ static inline BOOL Dde_OnWildConnect(HSZ hszTopic, HSZ hszService) return FALSE; } +static WCHAR *combine_path(const WCHAR *directory, const WCHAR *name, const WCHAR *extension) +{ + WCHAR *path; + int len; + + len = wcslen(directory) + 1 + wcslen(name); + if (extension) len += wcslen(extension); + path = malloc((len + 1) * sizeof(WCHAR)); + + PathCombineW(path, directory, name); + + if (extension) + wcscat(path, extension); + + return path; +} + /* Returned string must be freed by caller */ static WCHAR *get_programs_path(const WCHAR *name) { WCHAR *programs, *path; - int len; SHGetKnownFolderPath(&FOLDERID_Programs, 0, NULL, &programs); - - len = lstrlenW(programs) + 1 + lstrlenW(name); - path = malloc((len + 1) * sizeof(*path)); - lstrcpyW(path, programs); - lstrcatW(path, L"/"); - lstrcatW(path, name); - + path = combine_path(programs, name, NULL); CoTaskMemFree(programs); return path; @@ -265,16 +275,15 @@ static DWORD PROGMAN_OnExecute(WCHAR *command, int argc, WCHAR **argv) } if (argc >= 2) { - len = lstrlenW(last_group) + 1 + lstrlenW(argv[1]) + 5; - name = malloc(len * sizeof(*name)); - swprintf( name, len, L"%s/%s.lnk", last_group, argv[1] ); + name = combine_path(last_group, argv[1], L".lnk"); } else { - const WCHAR *filename = PathFindFileNameW(argv[0]); - len = PathFindExtensionW(filename) - filename; - name = malloc((lstrlenW(last_group) + 1 + len + 5) * sizeof(*name)); - swprintf( name, lstrlenW(last_group) + 1 + len + 5, L"%s/%.*s.lnk", last_group, len, filename ); + WCHAR *filename = wcsdup(PathFindFileNameW(argv[0])); + WCHAR *ext = PathFindExtensionW(filename); + *ext = '\0'; + name = combine_path(last_group, filename, L".lnk"); + free(filename); } hres = IPersistFile_Save(file, name, TRUE); @@ -291,12 +300,8 @@ static DWORD PROGMAN_OnExecute(WCHAR *command, int argc, WCHAR **argv) if (argc < 1) return DDE_FNOTPROCESSED; - len = lstrlenW(last_group) + 1 + lstrlenW(argv[0]) + 5; - name = malloc(len * sizeof(*name)); - swprintf( name, len, L"%s/%s.lnk", last_group, argv[0]); - + name = combine_path(last_group, argv[0], L".lnk"); ret = DeleteFileW(name); - free(name); if (!ret) return DDE_FNOTPROCESSED;

1 0

Gabriel Ivăncescu : jscript: Implement `reviver` argument for JSON.parse.
by Alexandre Julliard Oct. 17, 2022

Oct. 17, 2022

Module: wine Branch: master Commit: 2dcc5a70269e8bb875c76dcf4c4a906de52975b0 URL: https://gitlab.winehq.org/wine/wine/-/commit/2dcc5a70269e8bb875c76dcf4c4a90… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Oct 14 22:14:43 2022 +0300 jscript: Implement `reviver` argument for JSON.parse. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/array.c | 2 +- dlls/jscript/jscript.h | 1 + dlls/jscript/json.c | 120 ++++++++++++++++++++++++++++++++++++++++++++-- dlls/jscript/tests/api.js | 57 +++++++++++++++++++++- 4 files changed, 173 insertions(+), 7 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index 5a8131f092c..d69c9f7edf4 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -93,7 +93,7 @@ static HRESULT set_length(jsdisp_t *obj, DWORD length) return jsdisp_propput_name(obj, L"length", jsval_number(length)); } -static WCHAR *idx_to_str(DWORD idx, WCHAR *ptr) +WCHAR *idx_to_str(DWORD idx, WCHAR *ptr) { if(!idx) { *ptr = '0'; diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 0f8baea0188..757abf8aa6d 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -318,6 +318,7 @@ HRESULT variant_date_to_string(script_ctx_t*,double,jsstr_t**) DECLSPEC_HIDDEN; HRESULT decode_source(WCHAR*) DECLSPEC_HIDDEN; HRESULT double_to_string(double,jsstr_t**) DECLSPEC_HIDDEN; +WCHAR *idx_to_str(DWORD,WCHAR*) DECLSPEC_HIDDEN; static inline BOOL is_digit(WCHAR c) { diff --git a/dlls/jscript/json.c b/dlls/jscript/json.c index dfcc39daa2a..d354768b486 100644 --- a/dlls/jscript/json.c +++ b/dlls/jscript/json.c @@ -267,20 +267,104 @@ static HRESULT parse_json_value(json_parse_ctx_t *ctx, jsval_t *r) return E_FAIL; } +struct transform_json_object_ctx +{ + script_ctx_t *ctx; + IDispatch *reviver; + HRESULT hres; +}; + +static jsval_t transform_json_object(struct transform_json_object_ctx *proc_ctx, jsdisp_t *holder, jsstr_t *name) +{ + jsval_t res, args[2]; + const WCHAR *str; + + if(!(str = jsstr_flatten(name))) + proc_ctx->hres = E_OUTOFMEMORY; + else + proc_ctx->hres = jsdisp_propget_name(holder, str, &args[1]); + if(FAILED(proc_ctx->hres)) + return jsval_undefined(); + + if(is_object_instance(args[1])) { + jsdisp_t *obj = to_jsdisp(get_object(args[1])); + jsstr_t *jsstr; + DISPID id; + BOOL b; + + if(!obj) { + FIXME("non-JS obj in JSON object: %p\n", get_object(args[1])); + proc_ctx->hres = E_NOTIMPL; + return jsval_undefined(); + }else if(is_class(obj, JSCLASS_ARRAY)) { + unsigned i, length = array_get_length(obj); + WCHAR buf[14], *buf_end; + + buf_end = buf + ARRAY_SIZE(buf) - 1; + *buf_end-- = 0; + for(i = 0; i < length; i++) { + str = idx_to_str(i, buf_end); + if(!(jsstr = jsstr_alloc(str))) { + proc_ctx->hres = E_OUTOFMEMORY; + return jsval_undefined(); + } + res = transform_json_object(proc_ctx, obj, jsstr); + jsstr_release(jsstr); + if(is_undefined(res)) { + if(FAILED(proc_ctx->hres)) + return jsval_undefined(); + if(FAILED(jsdisp_get_id(obj, str, 0, &id))) + continue; + proc_ctx->hres = disp_delete((IDispatch*)&obj->IDispatchEx_iface, id, &b); + }else { + proc_ctx->hres = jsdisp_define_data_property(obj, str, PROPF_WRITABLE | PROPF_ENUMERABLE | PROPF_CONFIGURABLE, res); + jsval_release(res); + } + if(FAILED(proc_ctx->hres)) + return jsval_undefined(); + } + }else { + id = DISPID_STARTENUM; + for(;;) { + proc_ctx->hres = jsdisp_next_prop(obj, id, JSDISP_ENUM_OWN_ENUMERABLE, &id); + if(proc_ctx->hres == S_FALSE) + break; + if(FAILED(proc_ctx->hres) || FAILED(proc_ctx->hres = jsdisp_get_prop_name(obj, id, &jsstr))) + return jsval_undefined(); + res = transform_json_object(proc_ctx, obj, jsstr); + if(is_undefined(res)) { + if(SUCCEEDED(proc_ctx->hres)) + proc_ctx->hres = disp_delete((IDispatch*)&obj->IDispatchEx_iface, id, &b); + }else { + if(!(str = jsstr_flatten(jsstr))) + proc_ctx->hres = E_OUTOFMEMORY; + else + proc_ctx->hres = jsdisp_define_data_property(obj, str, PROPF_WRITABLE | PROPF_ENUMERABLE | PROPF_CONFIGURABLE, res); + jsval_release(res); + } + jsstr_release(jsstr); + if(FAILED(proc_ctx->hres)) + return jsval_undefined(); + } + } + } + + args[0] = jsval_string(name); + proc_ctx->hres = disp_call_value(proc_ctx->ctx, proc_ctx->reviver, (IDispatch*)&holder->IDispatchEx_iface, + DISPATCH_METHOD, ARRAY_SIZE(args), args, &res); + return FAILED(proc_ctx->hres) ? jsval_undefined() : res; +} + /* ECMA-262 5.1 Edition 15.12.2 */ static HRESULT JSON_parse(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { json_parse_ctx_t parse_ctx; const WCHAR *buf; + jsdisp_t *root; jsstr_t *str; jsval_t ret; HRESULT hres; - if(argc != 1) { - FIXME("Unsupported args\n"); - return E_INVALIDARG; - } - hres = to_flat_string(ctx, argv[0], &str, &buf); if(FAILED(hres)) return hres; @@ -293,12 +377,38 @@ static HRESULT JSON_parse(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned hres = parse_json_value(&parse_ctx, &ret); if(SUCCEEDED(hres) && skip_spaces(&parse_ctx)) { FIXME("syntax error\n"); + jsval_release(ret); hres = E_FAIL; } jsstr_release(str); if(FAILED(hres)) return hres; + /* FIXME: check IsCallable */ + if(argc > 1 && is_object_instance(argv[1])) { + hres = create_object(ctx, NULL, &root); + if(FAILED(hres)) { + jsval_release(ret); + return hres; + } + hres = jsdisp_define_data_property(root, L"", PROPF_WRITABLE | PROPF_ENUMERABLE | PROPF_CONFIGURABLE, ret); + jsval_release(ret); + + if(SUCCEEDED(hres)) { + struct transform_json_object_ctx proc_ctx = { ctx, get_object(argv[1]), S_OK }; + if(!(str = jsstr_alloc(L""))) + hres = E_OUTOFMEMORY; + else { + ret = transform_json_object(&proc_ctx, root, str); + jsstr_release(str); + hres = proc_ctx.hres; + } + } + jsdisp_release(root); + if(FAILED(hres)) + return hres; + } + if(r) *r = ret; else diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index e47e2759abb..c33791f1fb1 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1960,7 +1960,7 @@ ok(isNaN(tmp), "Math.tan(-Infinity) is not NaN"); [[[,2,undefined,3,{prop:0},],undefined," "],"[\n null,\n 2,\n null,\n 3,\n {\n \"prop\": 0\n },\n null\n]"] ]; - var i, s, v; + var i, s, v, t; for(i=0; i < stringify_tests.length; i++) { s = JSON.stringify.apply(null, stringify_tests[i][0]); @@ -2043,6 +2043,61 @@ ok(isNaN(tmp), "Math.tan(-Infinity) is not NaN"); v = JSON.parse(parse_tests[i][0]); ok(json_cmp(v, parse_tests[i][1]), "parse[" + i + "] returned " + v + ", expected " + parse_tests[i][1]); } + + v = [ [-1, "b"], {"length": -2, "0": -4, "1": -5}, [{}], [{"x": [null]}] ]; + s = + '{' + + '"foo": true,' + + '"bar": [],' + + '"baz": "remove_me",' + + '"obj": {' + + ' "arr": [ [1, "b"], {"length": 2, "0": 4, "1": 5}, [{}], [{"x": [null]}] ],' + + ' "": "empty"' + + '},' + + '"last": false' + + '}'; + o = JSON.parse(s), t = JSON.parse(s), i = new Object(); + i[""] = t; + delete t.baz; /* baz gets removed */ + t.obj.arr = v; /* has negative values */ + + var walk_expect = [ + [ o, "foo", true ], + [ o, "bar", [] ], + [ o, "baz", "remove_me" ], + [ [1, "b"], "0", 1 ], + [ [-1, "b"], "1", "b" ], + [ [ [-1, "b"], {"length": 2, "0": 4, "1": 5}, [{}], [{"x": [null]}] ], "0", [-1, "b"] ], + [ {"length": 2, "0": 4, "1": 5}, "length", 2 ], + [ {"length": -2, "0": 4, "1": 5}, "0", 4 ], + [ {"length": -2, "0": -4, "1": 5}, "1", 5 ], + [ v, "1", {"length": -2, "0": -4, "1": -5} ], + [ [{}], "0", {} ], + [ v, "2", [{}] ], + [ [null], "0", null ], + [ {"x": [null]}, "x", [null] ], + [ [{"x": [null]}], "0", {"x": [null]} ], + [ v, "3", [{"x": [null]}] ], + [ { "arr": v, "": "empty" }, "arr", v ], + [ { "arr": v, "": "empty" }, "", "empty" ], + [ t, "obj", { "arr": v, "": "empty" } ], + [ t, "last", false ], + [ i, "", t ] + ]; + i = 0; + v = JSON.parse(s, function(prop, value) { + var a = [this, prop, value]; + ok(json_cmp(a, walk_expect[i]), "[walk step " + i + "] got [" + a + "], expected [" + walk_expect[i] + "]"); + i++; + return (typeof value === 'number') ? -value : (value === "remove_me" ? undefined : value); + }); + ok(i === walk_expect.length, "parse with reviver walked " + i + " steps, expected " + walk_expect.length); + ok(json_cmp(v, t), "parse with reviver returned wrong object"); + + v = JSON.parse('true', function(prop, value) { return prop === "" ? undefined : value; }); + ok(v === undefined, "parse with reviver removing last prop returned " + v); + v = JSON.parse('true', function(prop, value) { return prop === "" ? false : value; }); + ok(v === false, "parse with reviver setting last prop to false returned " + v); })(); var func = function (a) {

1 0

Gabriel Ivăncescu : jscript: Implement Function.prototype.bind's `thisArg` properly.
by Alexandre Julliard Oct. 17, 2022

Oct. 17, 2022

Module: wine Branch: master Commit: 35a65559293e6ef57f0423ab488d489939074204 URL: https://gitlab.winehq.org/wine/wine/-/commit/35a65559293e6ef57f0423ab488d48… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Oct 14 22:14:43 2022 +0300 jscript: Implement Function.prototype.bind's `thisArg` properly. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/function.c | 40 +++++++++++++++++++++------------------- dlls/mshtml/tests/es5.js | 17 +++++++++++++++++ 2 files changed, 38 insertions(+), 19 deletions(-) diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index bf152e22868..8009f3a5d8b 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -57,7 +57,7 @@ typedef struct { typedef struct { FunctionInstance function; FunctionInstance *target; - IDispatch *this; + jsval_t this; unsigned argc; jsval_t args[1]; } BindFunction; @@ -70,7 +70,7 @@ typedef struct { unsigned argc; } ArgumentsInstance; -static HRESULT create_bind_function(script_ctx_t*,FunctionInstance*,IDispatch*,unsigned,jsval_t*,jsdisp_t**r); +static HRESULT create_bind_function(script_ctx_t*,FunctionInstance*,jsval_t,unsigned,jsval_t*,jsdisp_t**r); static inline FunctionInstance *function_from_jsdisp(jsdisp_t *jsdisp) { @@ -448,7 +448,7 @@ static HRESULT Function_call(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsig static HRESULT Function_bind(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - IDispatch *bound_this = NULL; + jsval_t bound_this = jsval_undefined(); FunctionInstance *function; jsdisp_t *new_function; HRESULT hres; @@ -459,18 +459,19 @@ static HRESULT Function_bind(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsig return JS_E_FUNCTION_EXPECTED; if(argc < 1) { - FIXME("no this argument\n"); - return E_NOTIMPL; - } - - if(is_object_instance(argv[0])) { - bound_this = get_object(argv[0]); - }else if(!is_null(argv[0])) { - FIXME("%s is not an object instance\n", debugstr_jsval(argv[0])); - return E_NOTIMPL; + argc = 1; + }else if(is_null(argv[0])) { + bound_this = argv[0]; + }else if(!is_undefined(argv[0])) { + IDispatch *obj; + hres = to_object(ctx, argv[0], &obj); + if(FAILED(hres)) + return hres; + bound_this = jsval_disp(obj); } hres = create_bind_function(ctx, function, bound_this, argc - 1, argv + 1, &new_function); + jsval_release(bound_this); if(FAILED(hres)) return hres; @@ -849,8 +850,7 @@ static HRESULT BindFunction_call(script_ctx_t *ctx, FunctionInstance *func, jsva memcpy(call_args + function->argc, argv, argc * sizeof(*call_args)); } - hres = function->target->vtbl->call(ctx, function->target, function->this ? jsval_disp(function->this) : jsval_null(), - flags, call_argc, call_args, r); + hres = function->target->vtbl->call(ctx, function->target, function->this, flags, call_argc, call_args, r); heap_free(call_args); return hres; @@ -877,8 +877,7 @@ static void BindFunction_destructor(FunctionInstance *func) for(i = 0; i < function->argc; i++) jsval_release(function->args[i]); jsdisp_release(&function->target->dispex); - if(function->this) - IDispatch_Release(function->this); + jsval_release(function->this); } static const function_vtbl_t BindFunctionVtbl = { @@ -888,7 +887,7 @@ static const function_vtbl_t BindFunctionVtbl = { BindFunction_destructor }; -static HRESULT create_bind_function(script_ctx_t *ctx, FunctionInstance *target, IDispatch *bound_this, unsigned argc, +static HRESULT create_bind_function(script_ctx_t *ctx, FunctionInstance *target, jsval_t bound_this, unsigned argc, jsval_t *argv, jsdisp_t **ret) { BindFunction *function; @@ -902,8 +901,11 @@ static HRESULT create_bind_function(script_ctx_t *ctx, FunctionInstance *target, jsdisp_addref(&target->dispex); function->target = target; - if(bound_this) - IDispatch_AddRef(function->this = bound_this); + hres = jsval_copy(bound_this, &function->this); + if(FAILED(hres)) { + jsdisp_release(&function->function.dispex); + return hres; + } for(function->argc = 0; function->argc < argc; function->argc++) { hres = jsval_copy(argv[function->argc], function->args + function->argc); diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index bfaacd1bd5b..e22f610e197 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -1188,6 +1188,23 @@ sync_test("bind", function() { ok(t != a, "t == a"); ok(Function.prototype.bind.length === 1, "Function.prototype.bind.length = " + Function.prototype.bind.length); + + ((function() { ok(this === window, "bind() this = " + this); }).bind())(); + ((function() { ok(this === window, "bind(undefined) = " + this); }).bind(undefined))(); + ((function() { ok(this === window, "bind(nullDisp) = " + this); }).bind(external.nullDisp))(); + ((function() { + ok(typeof(this) === "object", "bind(42) typeof(this) = " + typeof(this)); + ok(this.valueOf() === 42, "bind(42) this = " + this); + }).bind(42))(); + + r = (Object.prototype.toString.bind())(); + ok(r === "[object Undefined]", "toString.bind() returned " + r); + r = (Object.prototype.toString.bind(undefined))(); + ok(r === "[object Undefined]", "toString.bind(undefined) returned " + r); + r = (Object.prototype.toString.bind(null))(); + ok(r === "[object Null]", "toString.bind(null) returned " + r); + r = (Object.prototype.toString.bind(external.nullDisp))(); + ok(r === "[object Null]", "toString.bind(nullDisp) returned " + r); }); sync_test("keys", function() {

1 0

Gabriel Ivăncescu : jscript/tests: Fix copy paste mistake in JSON test.
by Alexandre Julliard Oct. 17, 2022

Oct. 17, 2022

Module: wine Branch: master Commit: a4697901ccef210d8f6690772a42b948bac8912f URL: https://gitlab.winehq.org/wine/wine/-/commit/a4697901ccef210d8f6690772a42b9… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Oct 14 22:14:43 2022 +0300 jscript/tests: Fix copy paste mistake in JSON test. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/tests/api.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 123665cfdde..e47e2759abb 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -2025,7 +2025,7 @@ ok(isNaN(tmp), "Math.tan(-Infinity) is not NaN"); for(var prop in x) { if(!x.hasOwnProperty(prop)) continue; - if(!x.hasOwnProperty(prop)) + if(!y.hasOwnProperty(prop)) return false; if(!json_cmp(x[prop], y[prop])) return false;

1 0

Piotr Caban : winedump: Dump metafiles in EMF spool files.
by Alexandre Julliard Oct. 17, 2022

Oct. 17, 2022

Module: wine Branch: master Commit: 4d649c6232fc53ebfcc1adf3ead93a8401c0cefb URL: https://gitlab.winehq.org/wine/wine/-/commit/4d649c6232fc53ebfcc1adf3ead93a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Oct 15 20:36:33 2022 +0200 winedump: Dump metafiles in EMF spool files. --- tools/winedump/emf.c | 2 +- tools/winedump/emfspool.c | 19 ++++++++++++++++++- tools/winedump/winedump.h | 1 + 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/tools/winedump/emf.c b/tools/winedump/emf.c index f27a9903320..9f73fc365e9 100644 --- a/tools/winedump/emf.c +++ b/tools/winedump/emf.c @@ -77,7 +77,7 @@ static unsigned int read_int(const unsigned char *buffer) #define EMRCASE(x) case x: printf("%-20s %08x\n", #x, length); break #define EMRPLUSCASE(x) case x: printf(" %-20s %04x %08x %08x\n", #x, (UINT)header->Flags, (UINT)header->Size, (UINT)header->DataSize); break -static unsigned long dump_emfrecord(unsigned long offset) +unsigned long dump_emfrecord(unsigned long offset) { const unsigned char* ptr; unsigned int type, length, i; diff --git a/tools/winedump/emfspool.c b/tools/winedump/emfspool.c index a10b3be2788..d65e580b22e 100644 --- a/tools/winedump/emfspool.c +++ b/tools/winedump/emfspool.c @@ -120,7 +120,24 @@ static unsigned long dump_emfspool_record(unsigned long off) break; } - dump_data((const unsigned char *)(hdr + 1), hdr->cjSize, ""); + switch (hdr->ulID) + { + case EMRI_METAFILE: + case EMRI_FORM_METAFILE: + case EMRI_BW_METAFILE: + case EMRI_BW_FORM_METAFILE: + case EMRI_METAFILE_DATA: + { + unsigned long emf_off = off + sizeof(*hdr); + while ((emf_off = dump_emfrecord(emf_off)) && emf_off < off + sizeof(*hdr) + hdr->cjSize); + break; + } + + default: + dump_data((const unsigned char *)(hdr + 1), hdr->cjSize, ""); + break; + } + return off + sizeof(*hdr) + hdr->cjSize; } diff --git a/tools/winedump/winedump.h b/tools/winedump/winedump.h index 505470436d0..09f4a9301e7 100644 --- a/tools/winedump/winedump.h +++ b/tools/winedump/winedump.h @@ -248,6 +248,7 @@ void dbg_dump( void ); enum FileSig get_kind_lnk(void); void lnk_dump( void ); enum FileSig get_kind_emf(void); +unsigned long dump_emfrecord(unsigned long offset); void emf_dump( void ); enum FileSig get_kind_emfspool(void); void emfspool_dump(void);

1 0

Piotr Caban : winedump: Don't use static offset in dump_emfrecord.
by Alexandre Julliard Oct. 17, 2022

Oct. 17, 2022

Module: wine Branch: master Commit: d745c8d4a07949b379085f99b68b15580c42168d URL: https://gitlab.winehq.org/wine/wine/-/commit/d745c8d4a07949b379085f99b68b15… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Oct 15 20:14:44 2022 +0200 winedump: Don't use static offset in dump_emfrecord. --- tools/winedump/emf.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/tools/winedump/emf.c b/tools/winedump/emf.c index 8c74702ecff..f27a9903320 100644 --- a/tools/winedump/emf.c +++ b/tools/winedump/emf.c @@ -77,15 +77,13 @@ static unsigned int read_int(const unsigned char *buffer) #define EMRCASE(x) case x: printf("%-20s %08x\n", #x, length); break #define EMRPLUSCASE(x) case x: printf(" %-20s %04x %08x %08x\n", #x, (UINT)header->Flags, (UINT)header->Size, (UINT)header->DataSize); break -static unsigned offset = 0; - -static int dump_emfrecord(void) +static unsigned long dump_emfrecord(unsigned long offset) { const unsigned char* ptr; unsigned int type, length, i; ptr = PRD(offset, 8); - if (!ptr) return -1; + if (!ptr) return 0; type = read_int(ptr); length = read_int(ptr + 4); @@ -277,7 +275,7 @@ static int dump_emfrecord(void) } if (length<sizeof(*header) || header->Size%4) - return -1; + return 0; length -= sizeof(*header); offset += sizeof(*header); @@ -286,7 +284,7 @@ static int dump_emfrecord(void) { if (i%16 == 0) printf(" "); - if (!(ptr = PRD(offset, 4))) return -1; + if (!(ptr = PRD(offset, 4))) return 0; length -= 4; offset += 4; printf("%08x ", read_int(ptr)); @@ -295,7 +293,7 @@ static int dump_emfrecord(void) } } - return 0; + return offset; } break; @@ -463,7 +461,7 @@ static int dump_emfrecord(void) } if ( (length < 8) || (length % 4) ) - return -1; + return 0; length -= 8; @@ -473,14 +471,14 @@ static int dump_emfrecord(void) { if (i%16 == 0) printf(" "); - if (!(ptr = PRD(offset, 4))) return -1; + if (!(ptr = PRD(offset, 4))) return 0; offset += 4; printf("%08x ", read_int(ptr)); if ( (i % 16 == 12) || (i + 4 == length)) printf("\n"); } - return 0; + return offset; } enum FileSig get_kind_emf(void) @@ -495,6 +493,6 @@ enum FileSig get_kind_emf(void) void emf_dump(void) { - offset = 0; - while (!dump_emfrecord()); + unsigned long offset = 0; + while ((offset = dump_emfrecord(offset))); }

1 0

Piotr Caban : winedump: Add support for EMRI_METAFILE_EXT records.
by Alexandre Julliard Oct. 17, 2022

Oct. 17, 2022

Module: wine Branch: master Commit: 0e49547c7ae1ce33ffd293bb784650572bbd75cc URL: https://gitlab.winehq.org/wine/wine/-/commit/0e49547c7ae1ce33ffd293bb784650… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Oct 15 20:52:44 2022 +0200 winedump: Add support for EMRI_METAFILE_EXT records. --- tools/winedump/emfspool.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/tools/winedump/emfspool.c b/tools/winedump/emfspool.c index 9e591f6dd67..7d6344facd1 100644 --- a/tools/winedump/emfspool.c +++ b/tools/winedump/emfspool.c @@ -61,6 +61,14 @@ typedef struct unsigned int cjSize; } record_hdr; +static inline void print_longlong(ULONGLONG value) +{ + if (sizeof(value) > sizeof(unsigned long) && value >> 32) + printf("0x%lx%08lx", (unsigned long)(value >> 32), (unsigned long)value); + else + printf("0x%lx", (unsigned long)value); +} + static const WCHAR* read_wstr(unsigned long off) { const WCHAR *beg, *end; @@ -133,6 +141,20 @@ static unsigned long dump_emfspool_record(unsigned long off) break; } + case EMRI_METAFILE_EXT: + case EMRI_BW_METAFILE_EXT: + { + const ULONGLONG *emf_off = PRD(off + sizeof(*hdr), sizeof(*emf_off)); + if (!emf_off) + fatal("truncated file\n"); + printf(" %-20s ", "offset"); + print_longlong(*emf_off); + printf(" (absolute position "); + print_longlong(off - *emf_off); + printf(")\n"); + break; + } + default: dump_data((const unsigned char *)(hdr + 1), hdr->cjSize, ""); break;

1 0

Piotr Caban : winedump: Add prefix when dumping EMF files.
by Alexandre Julliard Oct. 17, 2022

Oct. 17, 2022

Module: wine Branch: master Commit: 893ac008735fe3a7f56771fb3a854e9d1eff2ef1 URL: https://gitlab.winehq.org/wine/wine/-/commit/893ac008735fe3a7f56771fb3a854e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Oct 15 21:13:37 2022 +0200 winedump: Add prefix when dumping EMF files. --- tools/winedump/emf.c | 93 ++++++++++++++++++++++++----------------------- tools/winedump/emfspool.c | 2 +- tools/winedump/winedump.h | 2 +- 3 files changed, 49 insertions(+), 48 deletions(-)

1 0

Piotr Caban : winedump: Fix buffer overflow in debugstr_wn helper.
by Alexandre Julliard Oct. 17, 2022

Oct. 17, 2022

Module: wine Branch: master Commit: cf78df3612d0731f1254d03e381401655b508433 URL: https://gitlab.winehq.org/wine/wine/-/commit/cf78df3612d0731f1254d03e381401… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Oct 15 20:12:00 2022 +0200 winedump: Fix buffer overflow in debugstr_wn helper. --- tools/winedump/emf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winedump/emf.c b/tools/winedump/emf.c index 48a67141ace..8c74702ecff 100644 --- a/tools/winedump/emf.c +++ b/tools/winedump/emf.c @@ -49,7 +49,7 @@ static const char *debugstr_wn(const WCHAR *wstr, unsigned int n) i = 0; p = buf; *p++ = '\"'; - while (i < n && i < sizeof(buf) - 2 && wstr[i]) + while (i < n && i < sizeof(buf) - 3 && wstr[i]) { if (wstr[i] < 127) *p++ = wstr[i]; else *p++ = '.';

1 0