wine-commits June 2020

wine-commits@winehq.org

1 participants
947 discussions

Jacek Caban : winmm: Introduce compare_uint helper.
by Alexandre Julliard 03 Jun '20

03 Jun '20

Module: wine Branch: master Commit: 12f6e8086b7dcf7738953d4d2eeb63d310654447 URL: https://source.winehq.org/git/wine.git/?a=commit;h=12f6e8086b7dcf7738953d4d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 27 23:55:50 2020 +0200 winmm: Introduce compare_uint helper. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/joystick.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/winmm/joystick.c b/dlls/winmm/joystick.c index e844be1837..2b1811d377 100644 --- a/dlls/winmm/joystick.c +++ b/dlls/winmm/joystick.c @@ -55,6 +55,12 @@ typedef struct tagWINE_JOYSTICK { static WINE_JOYSTICK JOY_Sticks[MAXJOYSTICK]; +static BOOL compare_uint(unsigned int x, unsigned int y, unsigned int max_diff) +{ + unsigned int diff = x > y ? x - y : y - x; + return diff <= max_diff; +} + /************************************************************************** * JOY_LoadDriver [internal] */ @@ -106,14 +112,14 @@ static void CALLBACK JOY_Timer(HWND hWnd, UINT wMsg, UINT_PTR wTimer, DWORD dwTi pos = MAKELONG(ji.wXpos, ji.wYpos); if (!joy->bChanged || - abs(joy->ji.wXpos - ji.wXpos) > joy->threshold || - abs(joy->ji.wYpos - ji.wYpos) > joy->threshold) { + !compare_uint(joy->ji.wXpos, ji.wXpos, joy->threshold) || + !compare_uint(joy->ji.wYpos, ji.wYpos, joy->threshold)) { SendMessageA(joy->hCapture, MM_JOY1MOVE + i, ji.wButtons, pos); joy->ji.wXpos = ji.wXpos; joy->ji.wYpos = ji.wYpos; } if (!joy->bChanged || - abs(joy->ji.wZpos - ji.wZpos) > joy->threshold) { + !compare_uint(joy->ji.wZpos, ji.wZpos, joy->threshold)) { SendMessageA(joy->hCapture, MM_JOY1ZMOVE + i, ji.wButtons, pos); joy->ji.wZpos = ji.wZpos; }

1 0

Jacek Caban : winmm/tests: Introduce compare_uint helper.
by Alexandre Julliard 03 Jun '20

03 Jun '20

Module: wine Branch: master Commit: 72a36736a95787376675656a8d940ab3ce984a3a URL: https://source.winehq.org/git/wine.git/?a=commit;h=72a36736a95787376675656a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 27 23:55:44 2020 +0200 winmm/tests: Introduce compare_uint helper. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/tests/mixer.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/winmm/tests/mixer.c b/dlls/winmm/tests/mixer.c index f03a71e1f3..b9e35aa519 100644 --- a/dlls/winmm/tests/mixer.c +++ b/dlls/winmm/tests/mixer.c @@ -36,6 +36,12 @@ #include "winmm_test.h" +static BOOL compare_uint(unsigned int x, unsigned int y, unsigned int max_diff) +{ + unsigned int diff = x > y ? x - y : y - x; + return diff <= max_diff; +} + static const char * line_flags(DWORD fdwLine) { static char flags[100]; @@ -253,11 +259,11 @@ static void mixer_test_controlA(HMIXEROBJ mix, MIXERCONTROLA *control) mmsys_error(rc)); if (rc==MMSYSERR_NOERROR) { /* result may not match exactly because of rounding */ - ok(abs(ret_value.dwValue-new_value.dwValue)<=1, + ok(compare_uint(ret_value.dwValue, new_value.dwValue, 1), "Couldn't change value from %d to %d, returned %d\n", value.dwValue,new_value.dwValue,ret_value.dwValue); - if (abs(ret_value.dwValue-new_value.dwValue)<=1) { + if (compare_uint(ret_value.dwValue, new_value.dwValue, 1)) { details.cbStruct = sizeof(MIXERCONTROLDETAILS); details.dwControlID = control->dwControlID; details.cChannels = 1; @@ -632,11 +638,11 @@ static void mixer_test_controlW(HMIXEROBJ mix, MIXERCONTROLW *control) mmsys_error(rc)); if (rc==MMSYSERR_NOERROR) { /* result may not match exactly because of rounding */ - ok(abs(ret_value.dwValue-new_value.dwValue)<=1, + ok(compare_uint(ret_value.dwValue, new_value.dwValue, 1), "Couldn't change value from %d to %d, returned %d\n", value.dwValue,new_value.dwValue,ret_value.dwValue); - if (abs(ret_value.dwValue-new_value.dwValue)<=1) { + if (compare_uint(ret_value.dwValue, new_value.dwValue, 1)) { details.cbStruct = sizeof(MIXERCONTROLDETAILS); details.dwControlID = control->dwControlID; details.cChannels = 1;

1 0

Jacek Caban : mshtml/tests: Introduce sync_test helper.
by Alexandre Julliard 03 Jun '20

03 Jun '20

Module: wine Branch: master Commit: 0c9f9efda0b947d51efff74a8b277f5633ac52b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c9f9efda0b947d51efff74a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 3 16:04:28 2020 +0200 mshtml/tests: Introduce sync_test helper. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/es5.js | 132 ++++++++++++------------------------------ dlls/mshtml/tests/winetest.js | 18 +++++- 2 files changed, 54 insertions(+), 96 deletions(-) diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index 2a8549ba1d..dca5821c0c 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -21,18 +21,18 @@ var JS_E_INVALID_WRITABLE_PROP_DESC = 0x800a13ac; var JS_E_NONCONFIGURABLE_REDEFINED = 0x800a13d6; var JS_E_NONWRITABLE_MODIFIED = 0x800a13d7; -function test_date_now() { +var tests = []; + +sync_test("date_now", function() { var now = Date.now(); var time = (new Date()).getTime(); ok(time >= now && time-now < 50, "unexpected Date.now() result " + now + " expected " + time); Date.now(1, 2, 3); +}); - next_test(); -} - -function test_toISOString() { +sync_test("toISOString", function() { function expect(date, expected) { var s = date.toISOString(); ok(s === expected, "toISOString returned " + s + " expected " + expected); @@ -58,11 +58,9 @@ function test_toISOString() { expect_exception(function() { new Date(NaN).toISOString(); }); expect_exception(function() { new Date(31494784780800001).toISOString(); }); +}); - next_test(); -} - -function test_indexOf() { +sync_test("indexOf", function() { function expect(array, args, exr) { var r = Array.prototype.indexOf.apply(array, args); ok(r == exr, "indexOf returned " + r + " expected " + exr); @@ -86,11 +84,9 @@ function test_indexOf() { expect({"4": 4, length: 3}, [4], -1); expect({"test": true}, [true], -1); expect([1,2,3], [2, 1.9], 1); +}); - next_test(); -} - -function test_array_forEach() { +sync_test("forEach", function() { ok(Array.prototype.forEach.length === 1, "forEach.length = " + Array.prototype.forEach.length); function test(array, expect) { @@ -121,11 +117,9 @@ function test_array_forEach() { ok(array === a, "array != a"); ok(this === o, "this != o"); }, o); +}); - next_test(); -} - -function test_isArray() { +sync_test("isArray", function() { function expect_array(a, exr) { var r = Array.isArray(a); ok(r === exr, "isArray returned " + r + " expected " + exr); @@ -139,11 +133,9 @@ function test_isArray() { function C() {} C.prototype = Array.prototype; expect_array(new C(), false); +}); - next_test(); -} - -function test_array_map() { +sync_test("array_map", function() { var calls, m, arr, ctx; /* basic map call with context */ @@ -190,11 +182,9 @@ function test_array_map() { [1,2].map(function() { ok(this === window, "this != window"); }, undefined); +}); - next_test(); -} - -function test_array_sort() { +sync_test("array_sort", function() { var r; r = [3,1,2].sort(function(x,y) { return y-x; }, 1, 2, 3, true, undefined ).join(); @@ -209,11 +199,9 @@ function test_array_sort() { }catch(e) { ok(e.name === "TypeError", "got exception " + e.name); } +}); - next_test(); -} - -function test_identifier_keywords() { +sync_test("identifier_keywords", function() { var o = { if: 1, default: 2, @@ -249,9 +237,7 @@ function test_identifier_keywords() { ok(o.if === 1, "o.if = " + o.if); ok(ro().default === 2, "ro().default = " + ro().default); ok(o.false === true, "o.false = " + o.false); - - next_test(); -} +}); function test_own_data_prop_desc(obj, prop, expected_writable, expected_enumerable, expected_configurable) { @@ -266,7 +252,7 @@ function test_own_data_prop_desc(obj, prop, expected_writable, expected_enumerab + " expected " + expected_configurable); } -function test_getOwnPropertyDescriptor() { +sync_test("getOwnPropertyDescriptor", function() { var obj; obj = { test: 1 }; @@ -304,11 +290,9 @@ function test_getOwnPropertyDescriptor() { test_own_data_prop_desc(function(){}, "prototype", true, false, false); test_own_data_prop_desc(Function, "prototype", false, false, false); test_own_data_prop_desc(String.prototype, "constructor", true, false, true); +}); - next_test(); -} - -function test_defineProperty() { +sync_test("defineProperty", function() { function test_accessor_prop_desc(obj, prop, orig_desc) { var expected_enumerable = "enumerable" in orig_desc && !!orig_desc.enumerable; var expected_configurable = "configurable" in orig_desc && !!orig_desc.configurable; @@ -529,11 +513,9 @@ function test_defineProperty() { test_accessor_prop_desc(obj, "no_setter", desc); obj.no_setter = false; ok(obj.no_setter === true, "no_setter = " + obj.no_setter); +}); - next_test(); -} - -function test_defineProperties() { +sync_test("defineProperties", function() { var o, defined, descs; descs = { @@ -571,11 +553,9 @@ function test_defineProperties() { descs = Object.create(desc_proto); o = Object.create(null, descs); ok(!("proto_prop" in o), "proto_prop is in o"); +}); - next_test(); -} - -function test_property_definitions() { +sync_test("property_definitions", function() { var obj, val, i, arr; function test_accessor_prop_desc(obj, prop, have_getter, have_setter) { @@ -636,11 +616,9 @@ function test_property_definitions() { ok(obj.prop === 6, "obj.prop = " + obj.prop); test_accessor_prop_desc(obj, "0", true, false); ok(obj[0] === 7, "obj.prop = " + obj[0]); +}); - next_test(); -} - -function test_string_trim() { +sync_test("string_trim", function() { function test_trim(value, expected) { var r = String.prototype.trim.call(value); ok(r === expected, "trim(" + value + ") = " + r); @@ -652,11 +630,9 @@ function test_string_trim() { test_trim({ toString: function() { return " test "; } }, "test"); test_trim("", ""); test_trim(" \t\n", ""); +}); - next_test(); -} - -function test_global_properties() { +sync_test("global_properties", function() { var o; /* Make sure that global properties are not writable. */ @@ -669,17 +645,14 @@ function test_global_properties() { o = Infinity; Infinity = 1; ok(Infinity === o, "Infinity = " + NaN); +}); - next_test(); -} - -function test_string_split() { +sync_test("string_split", function() { var r; /* IE9 got this wrong*/ if("1undefined2".split(undefined).length != 1) { win_skip("detected broken String.prototype.split implementation"); - next_test(); return; } @@ -749,11 +722,9 @@ function test_string_split() { ok(typeof(r) === "object", "typeof(r) = " + typeof(r)); ok(r.length === 1, "r.length = " + r.length); ok(r[0] === "", "r[0] = " + r[0]); +}); - next_test(); -} - -function test_getPrototypeOf() { +sync_test("getPrototypeOf", function() { ok(Object.create.length === 2, "Object.create.length = " + Object.create.length); ok(Object.getPrototypeOf.length === 1, "Object.getPrototypeOf.length = " + Object.getPrototypeOf.length); @@ -788,11 +759,9 @@ function test_getPrototypeOf() { obj = Object.create(null); ok(!("toString" in obj), "toString is in obj"); ok(Object.getPrototypeOf(obj) === null, "Object.getPrototypeOf(obj) = " + Object.getPrototypeOf(obj)); +}); - next_test(); -} - -function test_toString() { +sync_test("toString", function() { var tmp, obj; (function () { tmp = Object.prototype.toString.call(arguments); })(); @@ -817,11 +786,9 @@ function test_toString() { obj = Object.create(Number.prototype); tmp = Object.prototype.toString.call(obj); ok(tmp === "[object Object]", "toString.call(Object.create(Number.prototype)) = " + tmp); +}); - next_test(); -} - -function test_bind() { +sync_test("bind", function() { var f, r; var o = new Object(), o2 = new Object(); @@ -897,27 +864,4 @@ function test_bind() { ok(t != a, "t == a"); ok(Function.prototype.bind.length === 1, "Function.prototype.bind.length = " + Function.prototype.bind.length); - - next_test(); -} - -var tests = [ - test_date_now, - test_toISOString, - test_indexOf, - test_array_forEach, - test_isArray, - test_array_map, - test_array_sort, - test_identifier_keywords, - test_getOwnPropertyDescriptor, - test_defineProperty, - test_defineProperties, - test_property_definitions, - test_string_trim, - test_global_properties, - test_string_split, - test_getPrototypeOf, - test_toString, - test_bind -]; +}); diff --git a/dlls/mshtml/tests/winetest.js b/dlls/mshtml/tests/winetest.js index 2af1b33414..7e8cbfc9b2 100644 --- a/dlls/mshtml/tests/winetest.js +++ b/dlls/mshtml/tests/winetest.js @@ -70,8 +70,22 @@ function todo_wine_if(expr) { var file_prefix = document.location.pathname; if(document.location.search) file_prefix += document.location.search; -file_prefix += ": "; +file_prefix += ":"; + +var test_name; function format_message(msg) { - return file_prefix + msg; + var p = file_prefix; + if(test_name) p += test_name + ":"; + return p + " " + msg; +} + +function sync_test(name, f) +{ + tests.push(function() { + test_name = name; + f(); + test_name = undefined; + next_test(); + }); }

1 0

Jacek Caban : jscript: Throw proper exception in RegExp.prototype.toString when called on non-RegExp object.
by Alexandre Julliard 03 Jun '20

03 Jun '20

Module: wine Branch: master Commit: 6de0a658f1768a72ce1b07b418985991a482d19e URL: https://source.winehq.org/git/wine.git/?a=commit;h=6de0a658f1768a72ce1b07b4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 3 16:04:15 2020 +0200 jscript: Throw proper exception in RegExp.prototype.toString when called on non-RegExp object. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/error.c | 1 + dlls/jscript/jscript.h | 3 ++- dlls/jscript/jscript.rc | 2 ++ dlls/jscript/jsregexp.c | 4 ++-- dlls/jscript/resource.h | 3 ++- dlls/jscript/tests/api.js | 2 ++ po/ar.po | 40 ++++++++++++++++++++++++++-------------- po/ast.po | 36 ++++++++++++++++++++++-------------- po/bg.po | 36 ++++++++++++++++++++++-------------- po/ca.po | 40 ++++++++++++++++++++++++++-------------- po/cs.po | 40 ++++++++++++++++++++++++++-------------- po/da.po | 40 ++++++++++++++++++++++++++-------------- po/de.po | 40 ++++++++++++++++++++++++++-------------- po/el.po | 36 ++++++++++++++++++++++-------------- po/en.po | 36 ++++++++++++++++++++++-------------- po/en_US.po | 36 ++++++++++++++++++++++-------------- po/eo.po | 36 ++++++++++++++++++++++-------------- po/es.po | 40 ++++++++++++++++++++++++++-------------- po/fa.po | 36 ++++++++++++++++++++++-------------- po/fi.po | 40 ++++++++++++++++++++++++++-------------- po/fr.po | 40 ++++++++++++++++++++++++++-------------- po/he.po | 36 ++++++++++++++++++++++-------------- po/hi.po | 36 ++++++++++++++++++++++-------------- po/hr.po | 40 ++++++++++++++++++++++++++-------------- po/hu.po | 40 ++++++++++++++++++++++++++-------------- po/it.po | 40 ++++++++++++++++++++++++++-------------- po/ja.po | 40 ++++++++++++++++++++++++++-------------- po/ko.po | 40 ++++++++++++++++++++++++++-------------- po/lt.po | 40 ++++++++++++++++++++++++++-------------- po/ml.po | 36 ++++++++++++++++++++++-------------- po/nb_NO.po | 40 ++++++++++++++++++++++++++-------------- po/nl.po | 40 ++++++++++++++++++++++++++-------------- po/or.po | 36 ++++++++++++++++++++++-------------- po/pa.po | 36 ++++++++++++++++++++++-------------- po/pl.po | 40 ++++++++++++++++++++++++++-------------- po/pt_BR.po | 40 ++++++++++++++++++++++++++-------------- po/pt_PT.po | 40 ++++++++++++++++++++++++++-------------- po/rm.po | 36 ++++++++++++++++++++++-------------- po/ro.po | 40 ++++++++++++++++++++++++++-------------- po/ru.po | 40 ++++++++++++++++++++++++++-------------- po/si.po | 40 ++++++++++++++++++++++++++-------------- po/sk.po | 38 ++++++++++++++++++++++++-------------- po/sl.po | 40 ++++++++++++++++++++++++++-------------- po/sr_RS(a)cyrillic.po | 40 ++++++++++++++++++++++++++-------------- po/sr_RS(a)latin.po | 40 ++++++++++++++++++++++++++-------------- po/sv.po | 40 ++++++++++++++++++++++++++-------------- po/ta.po | 36 ++++++++++++++++++++++-------------- po/te.po | 36 ++++++++++++++++++++++-------------- po/th.po | 36 ++++++++++++++++++++++-------------- po/tr.po | 40 ++++++++++++++++++++++++++-------------- po/uk.po | 40 ++++++++++++++++++++++++++-------------- po/wa.po | 36 ++++++++++++++++++++++-------------- po/wine.pot | 36 ++++++++++++++++++++++-------------- po/zh_CN.po | 40 ++++++++++++++++++++++++++-------------- po/zh_TW.po | 40 ++++++++++++++++++++++++++-------------- 55 files changed, 1211 insertions(+), 690 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6de0a658f1768a72ce1b…

1 0

Jacek Caban : jscript: Support context argument in Array.prototype.forEach.
by Alexandre Julliard 03 Jun '20

03 Jun '20

Module: wine Branch: master Commit: f207ded345e5f6a5b834833c1f0de32c451196ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=f207ded345e5f6a5b834833c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 3 16:03:47 2020 +0200 jscript: Support context argument in Array.prototype.forEach. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/array.c | 11 ++++++++--- dlls/mshtml/tests/es5.js | 6 ++++++ 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index 9d1014ec0b..f8ae12a7d8 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -949,6 +949,7 @@ static HRESULT Array_toLocaleString(script_ctx_t *ctx, vdisp_t *vthis, WORD flag static HRESULT Array_forEach(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { + IDispatch *context_obj = NULL, *callback; jsval_t value, args[3], res; jsdisp_t *jsthis; unsigned length, i; @@ -965,10 +966,14 @@ static HRESULT Array_forEach(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsi FIXME("Invalid arg %s\n", debugstr_jsval(argc ? argv[0] : jsval_undefined())); return E_INVALIDARG; } + callback = get_object(argv[0]); if(argc > 1 && !is_undefined(argv[1])) { - FIXME("Unsupported context this %s\n", debugstr_jsval(argv[1])); - return E_NOTIMPL; + if(!is_object_instance(argv[1]) || !get_object(argv[1])) { + FIXME("Unsupported context this %s\n", debugstr_jsval(argv[1])); + return E_NOTIMPL; + } + context_obj = get_object(argv[1]); } for(i = 0; i < length; i++) { @@ -981,7 +986,7 @@ static HRESULT Array_forEach(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsi args[0] = value; args[1] = jsval_number(i); args[2] = jsval_obj(jsthis); - hres = disp_call_value(ctx, get_object(argv[0]), NULL, DISPATCH_METHOD, ARRAY_SIZE(args), args, &res); + hres = disp_call_value(ctx, callback, context_obj, DISPATCH_METHOD, ARRAY_SIZE(args), args, &res); jsval_release(value); if(FAILED(hres)) return hres; diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index 533c35e861..2a8549ba1d 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -116,6 +116,12 @@ function test_array_forEach() { ok(this === window, "this != window"); }, undefined); + var o = new Object(), a = [1,2]; + a.forEach(function(value, index, array) { + ok(array === a, "array != a"); + ok(this === o, "this != o"); + }, o); + next_test(); }

1 0

Jacek Caban : jscript: Support ES5 Array.prototype.sort arguments handling.
by Alexandre Julliard 03 Jun '20

03 Jun '20

Module: wine Branch: master Commit: 6682290d17bffca101a8150a4427dcec9371852a URL: https://source.winehq.org/git/wine.git/?a=commit;h=6682290d17bffca101a8150a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 3 16:03:27 2020 +0200 jscript: Support ES5 Array.prototype.sort arguments handling. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/array.c | 33 ++++++++++++++++----------------- dlls/jscript/tests/api.js | 13 +++++++++++++ dlls/mshtml/tests/es5.js | 20 ++++++++++++++++++++ 3 files changed, 49 insertions(+), 17 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index 55b7dd5d71..9d1014ec0b 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -685,23 +685,22 @@ static HRESULT Array_sort(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigne if(FAILED(hres)) return hres; - if(argc > 1) { - WARN("invalid arg_cnt %d\n", argc); - return E_FAIL; - } - - if(argc == 1) { - if(!is_object_instance(argv[0])) { - WARN("arg is not dispatch\n"); - return E_FAIL; - } - - cmp_func = iface_to_jsdisp(get_object(argv[0])); - if(!cmp_func || !is_class(cmp_func, JSCLASS_FUNCTION)) { - WARN("cmp_func is not a function\n"); - if(cmp_func) - jsdisp_release(cmp_func); - return E_FAIL; + if(argc >= 1) { + if(is_object_instance(argv[0])) { + if(argc > 1 && ctx->version < SCRIPTLANGUAGEVERSION_ES5) { + WARN("invalid arg_cnt %d\n", argc); + return JS_E_JSCRIPT_EXPECTED; + } + cmp_func = iface_to_jsdisp(get_object(argv[0])); + if(!cmp_func || !is_class(cmp_func, JSCLASS_FUNCTION)) { + WARN("cmp_func is not a function\n"); + if(cmp_func) + jsdisp_release(cmp_func); + return JS_E_JSCRIPT_EXPECTED; + } + }else if(ctx->version >= SCRIPTLANGUAGEVERSION_ES5 ? !is_undefined(argv[0]) : !is_null(argv[0])) { + WARN("invalid arg %s\n", debugstr_jsval(argv[0])); + return JS_E_JSCRIPT_EXPECTED; } } diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index df6ff785d0..74cf0ae357 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1039,6 +1039,19 @@ tmp = [5,3,"2.5",2,true,false,-1]; for(var i=0; i < arr.length; i++) ok(arr[i] === tmp[i], "arr[" + i + "] = " + arr[i] + " expected " + tmp[i]); +tmp = [3,1,2].sort(function(x,y) { return y-x; }).join(); +ok(tmp === "3,2,1", "reverse sorted [3,1,2] = " + tmp); + +tmp = [3,1,2].sort(null).join(); +ok(tmp === "1,2,3", "null sorted [3,1,2] = " + tmp); + +try { + tmp = [3,1,2].sort(function(x,y) { return y-x; }, 1, 2, 3); + ok(false, "expected sort(undefined) exception"); +} catch(e) { + ok(e.name === "TypeError", "got exception " + e.name); +} + arr = [5,false,2,0,"abc",3,"a",-1]; tmp = arr.sort(); ok(tmp === arr, "tmp !== arr"); diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index a24f61fcd5..533c35e861 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -188,6 +188,25 @@ function test_array_map() { next_test(); } +function test_array_sort() { + var r; + + r = [3,1,2].sort(function(x,y) { return y-x; }, 1, 2, 3, true, undefined ).join(); + ok(r === "3,2,1", "reverse sorted [3,1,2] = " + r); + + r = [3,1,2].sort(undefined).join(); + ok(r === "1,2,3", "null sorted [3,1,2] = " + r); + + try { + r = [3,1,2].sort(null); + ok(false, "expected sort(null) exception"); + }catch(e) { + ok(e.name === "TypeError", "got exception " + e.name); + } + + next_test(); +} + function test_identifier_keywords() { var o = { if: 1, @@ -883,6 +902,7 @@ var tests = [ test_array_forEach, test_isArray, test_array_map, + test_array_sort, test_identifier_keywords, test_getOwnPropertyDescriptor, test_defineProperty,

1 0

Paul Gofman : netio.sys: Add stub for WskReleaseProviderNPI().
by Alexandre Julliard 03 Jun '20

03 Jun '20

Module: wine Branch: master Commit: 8a9bbe4963fc480a3dad778a291df773ae9161f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a9bbe4963fc480a3dad778a… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Jun 3 00:11:38 2020 +0300 netio.sys: Add stub for WskReleaseProviderNPI(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netio.sys/netio.c | 5 +++++ dlls/netio.sys/netio.sys.spec | 2 +- include/ddk/wsk.h | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/netio.sys/netio.c b/dlls/netio.sys/netio.c index 539ea012e0..839a06d30d 100644 --- a/dlls/netio.sys/netio.c +++ b/dlls/netio.sys/netio.c @@ -43,6 +43,11 @@ NTSTATUS WINAPI WskCaptureProviderNPI(WSK_REGISTRATION *wsk_registration, ULONG return STATUS_NOT_IMPLEMENTED; } +void WINAPI WskReleaseProviderNPI(WSK_REGISTRATION *wsk_registration) +{ + FIXME("wsk_registration %p stub.\n", wsk_registration); +} + NTSTATUS WINAPI WskRegister(WSK_CLIENT_NPI *wsk_client_npi, WSK_REGISTRATION *wsk_registration) { FIXME("wsk_client_npi %p, wsk_registration %p stub.\n", wsk_client_npi, wsk_registration); diff --git a/dlls/netio.sys/netio.sys.spec b/dlls/netio.sys/netio.sys.spec index 53891a7d27..facd8ab999 100644 --- a/dlls/netio.sys/netio.sys.spec +++ b/dlls/netio.sys/netio.sys.spec @@ -388,4 +388,4 @@ @ stdcall WskDeregister(ptr) @ stub WskQueryProviderCharacteristics @ stdcall WskRegister(ptr ptr) -@ stub WskReleaseProviderNPI +@ stdcall WskReleaseProviderNPI(ptr) diff --git a/include/ddk/wsk.h b/include/ddk/wsk.h index ead8f830a2..d19da999be 100644 --- a/include/ddk/wsk.h +++ b/include/ddk/wsk.h @@ -114,6 +114,7 @@ NTSTATUS WINAPI WskRegister(WSK_CLIENT_NPI *wsk_client_npi, WSK_REGISTRATION *ws void WINAPI WskDeregister(WSK_REGISTRATION *wsk_registration); NTSTATUS WINAPI WskCaptureProviderNPI(WSK_REGISTRATION *wsk_registration, ULONG wait_timeout, WSK_PROVIDER_NPI *wsk_provider_npi); +void WINAPI WskReleaseProviderNPI(WSK_REGISTRATION *wsk_registration); #ifdef __cplusplus }

1 0

Paul Gofman : netio.sys: Add stub for WskCaptureProviderNPI().
by Alexandre Julliard 03 Jun '20

03 Jun '20

Module: wine Branch: master Commit: bdb4d8225110c5a3c4acdea86f17a0aae0b7a059 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bdb4d8225110c5a3c4acdea8… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Jun 3 00:11:37 2020 +0300 netio.sys: Add stub for WskCaptureProviderNPI(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netio.sys/netio.c | 9 +++++++++ dlls/netio.sys/netio.sys.spec | 2 +- include/ddk/wsk.h | 2 ++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/netio.sys/netio.c b/dlls/netio.sys/netio.c index ef4089c68e..539ea012e0 100644 --- a/dlls/netio.sys/netio.c +++ b/dlls/netio.sys/netio.c @@ -34,6 +34,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(netio); +NTSTATUS WINAPI WskCaptureProviderNPI(WSK_REGISTRATION *wsk_registration, ULONG wait_timeout, + WSK_PROVIDER_NPI *wsk_provider_npi) +{ + FIXME("wsk_registration %p, wait_timeout %u, wsk_provider_npi %p stub.\n", + wsk_registration, wait_timeout, wsk_provider_npi); + + return STATUS_NOT_IMPLEMENTED; +} + NTSTATUS WINAPI WskRegister(WSK_CLIENT_NPI *wsk_client_npi, WSK_REGISTRATION *wsk_registration) { FIXME("wsk_client_npi %p, wsk_registration %p stub.\n", wsk_client_npi, wsk_registration); diff --git a/dlls/netio.sys/netio.sys.spec b/dlls/netio.sys/netio.sys.spec index 915259c6f4..53891a7d27 100644 --- a/dlls/netio.sys/netio.sys.spec +++ b/dlls/netio.sys/netio.sys.spec @@ -384,7 +384,7 @@ @ stub WfpStreamInspectSend @ stub WfpStreamIsFilterPresent @ stub WfpUninitializeLeastRecentlyUsedList -@ stub WskCaptureProviderNPI +@ stdcall WskCaptureProviderNPI(ptr long ptr) @ stdcall WskDeregister(ptr) @ stub WskQueryProviderCharacteristics @ stdcall WskRegister(ptr ptr) diff --git a/include/ddk/wsk.h b/include/ddk/wsk.h index e990d054bd..ead8f830a2 100644 --- a/include/ddk/wsk.h +++ b/include/ddk/wsk.h @@ -112,6 +112,8 @@ typedef struct _WSK_PROVIDER_NPI NTSTATUS WINAPI WskRegister(WSK_CLIENT_NPI *wsk_client_npi, WSK_REGISTRATION *wsk_registration); void WINAPI WskDeregister(WSK_REGISTRATION *wsk_registration); +NTSTATUS WINAPI WskCaptureProviderNPI(WSK_REGISTRATION *wsk_registration, ULONG wait_timeout, + WSK_PROVIDER_NPI *wsk_provider_npi); #ifdef __cplusplus }

1 0

Paul Gofman : netio.sys: Add stub for WskDeregister().
by Alexandre Julliard 03 Jun '20

03 Jun '20

Module: wine Branch: master Commit: 1e3ef06d3724aaef8880734617fc84b749588c7a URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e3ef06d3724aaef88807346… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Jun 3 00:11:36 2020 +0300 netio.sys: Add stub for WskDeregister(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netio.sys/netio.c | 5 +++++ dlls/netio.sys/netio.sys.spec | 2 +- include/ddk/wsk.h | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/netio.sys/netio.c b/dlls/netio.sys/netio.c index 6a8a002ebe..ef4089c68e 100644 --- a/dlls/netio.sys/netio.c +++ b/dlls/netio.sys/netio.c @@ -41,6 +41,11 @@ NTSTATUS WINAPI WskRegister(WSK_CLIENT_NPI *wsk_client_npi, WSK_REGISTRATION *ws return STATUS_NOT_IMPLEMENTED; } +void WINAPI WskDeregister(WSK_REGISTRATION *wsk_registration) +{ + FIXME("wsk_registration %p stub.\n", wsk_registration); +} + static void WINAPI driver_unload(DRIVER_OBJECT *driver) { TRACE("driver %p.\n", driver); diff --git a/dlls/netio.sys/netio.sys.spec b/dlls/netio.sys/netio.sys.spec index d886ab8db9..915259c6f4 100644 --- a/dlls/netio.sys/netio.sys.spec +++ b/dlls/netio.sys/netio.sys.spec @@ -385,7 +385,7 @@ @ stub WfpStreamIsFilterPresent @ stub WfpUninitializeLeastRecentlyUsedList @ stub WskCaptureProviderNPI -@ stub WskDeregister +@ stdcall WskDeregister(ptr) @ stub WskQueryProviderCharacteristics @ stdcall WskRegister(ptr ptr) @ stub WskReleaseProviderNPI diff --git a/include/ddk/wsk.h b/include/ddk/wsk.h index 835adbba9d..e990d054bd 100644 --- a/include/ddk/wsk.h +++ b/include/ddk/wsk.h @@ -111,6 +111,7 @@ typedef struct _WSK_PROVIDER_NPI } WSK_PROVIDER_NPI, *PWSK_PROVIDER_NPI; NTSTATUS WINAPI WskRegister(WSK_CLIENT_NPI *wsk_client_npi, WSK_REGISTRATION *wsk_registration); +void WINAPI WskDeregister(WSK_REGISTRATION *wsk_registration); #ifdef __cplusplus }

1 0

Paul Gofman : netio.sys: Add stub for WskRegister().
by Alexandre Julliard 03 Jun '20

03 Jun '20

Module: wine Branch: master Commit: 392e4437d8e4e5c61e970344ea4e896764c48e57 URL: https://source.winehq.org/git/wine.git/?a=commit;h=392e4437d8e4e5c61e970344… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Jun 3 00:11:35 2020 +0300 netio.sys: Add stub for WskRegister(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netio.sys/netio.c | 8 ++++++++ dlls/netio.sys/netio.sys.spec | 2 +- include/ddk/wsk.h | 2 ++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/netio.sys/netio.c b/dlls/netio.sys/netio.c index 5cd847dfcd..6a8a002ebe 100644 --- a/dlls/netio.sys/netio.c +++ b/dlls/netio.sys/netio.c @@ -29,10 +29,18 @@ #include "winioctl.h" #include "winternl.h" #include "ddk/wdm.h" +#include "ddk/wsk.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(netio); +NTSTATUS WINAPI WskRegister(WSK_CLIENT_NPI *wsk_client_npi, WSK_REGISTRATION *wsk_registration) +{ + FIXME("wsk_client_npi %p, wsk_registration %p stub.\n", wsk_client_npi, wsk_registration); + + return STATUS_NOT_IMPLEMENTED; +} + static void WINAPI driver_unload(DRIVER_OBJECT *driver) { TRACE("driver %p.\n", driver); diff --git a/dlls/netio.sys/netio.sys.spec b/dlls/netio.sys/netio.sys.spec index a390f96674..d886ab8db9 100644 --- a/dlls/netio.sys/netio.sys.spec +++ b/dlls/netio.sys/netio.sys.spec @@ -387,5 +387,5 @@ @ stub WskCaptureProviderNPI @ stub WskDeregister @ stub WskQueryProviderCharacteristics -@ stub WskRegister +@ stdcall WskRegister(ptr ptr) @ stub WskReleaseProviderNPI diff --git a/include/ddk/wsk.h b/include/ddk/wsk.h index c7100bb799..835adbba9d 100644 --- a/include/ddk/wsk.h +++ b/include/ddk/wsk.h @@ -110,6 +110,8 @@ typedef struct _WSK_PROVIDER_NPI const WSK_PROVIDER_DISPATCH *Dispatch; } WSK_PROVIDER_NPI, *PWSK_PROVIDER_NPI; +NTSTATUS WINAPI WskRegister(WSK_CLIENT_NPI *wsk_client_npi, WSK_REGISTRATION *wsk_registration); + #ifdef __cplusplus } #endif

1 0

← Newer
1
...
72
73
74
75
76
77
78
...
95
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2020