March 2022 - Wine-commits - list.winehq.org

Paul Gofman : kernelbase: Query FileStandardInformation instead of FileEndOfFileInformation in SetFilePointerEx().
by Alexandre Julliard 18 Mar '22

18 Mar '22

Module: wine Branch: master Commit: b3132be8199a2d7d3aaa24ba243d48dbab4d2bbd URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3132be8199a2d7d3aaa24ba… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Mar 18 15:59:04 2022 +0300 kernelbase: Query FileStandardInformation instead of FileEndOfFileInformation in SetFilePointerEx(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/file.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c index a3a4b4f480b..1662db55cc1 100644 --- a/dlls/kernelbase/file.c +++ b/dlls/kernelbase/file.c @@ -3621,7 +3621,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetFilePointerEx( HANDLE file, LARGE_INTEGER dista LONGLONG pos; IO_STATUS_BLOCK io; FILE_POSITION_INFORMATION info; - FILE_END_OF_FILE_INFORMATION eof; + FILE_STANDARD_INFORMATION eof; switch(method) { @@ -3634,7 +3634,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetFilePointerEx( HANDLE file, LARGE_INTEGER dista pos = info.CurrentByteOffset.QuadPart + distance.QuadPart; break; case FILE_END: - if (NtQueryInformationFile( file, &io, &eof, sizeof(eof), FileEndOfFileInformation )) + if (NtQueryInformationFile( file, &io, &eof, sizeof(eof), FileStandardInformation )) goto error; pos = eof.EndOfFile.QuadPart + distance.QuadPart; break;

1 0

Paul Gofman : kernelbase: Use FILE_LIST_DIRECTORY instead of GENERIC_READ in FindFirstFileExW().
by Alexandre Julliard 18 Mar '22

18 Mar '22

Module: wine Branch: master Commit: d67129a7776381f81fa36e16cbfd1e065e47f158 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d67129a7776381f81fa36e16… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Mar 18 15:59:05 2022 +0300 kernelbase: Use FILE_LIST_DIRECTORY instead of GENERIC_READ in FindFirstFileExW(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c index 1662db55cc1..2d5a6a8ba9a 100644 --- a/dlls/kernelbase/file.c +++ b/dlls/kernelbase/file.c @@ -1205,7 +1205,7 @@ HANDLE WINAPI DECLSPEC_HOTPATCH FindFirstFileExW( LPCWSTR filename, FINDEX_INFO_ attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - status = NtOpenFile( &info->handle, GENERIC_READ | SYNCHRONIZE, &attr, &io, + status = NtOpenFile( &info->handle, FILE_LIST_DIRECTORY | SYNCHRONIZE, &attr, &io, FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT | FILE_OPEN_FOR_BACKUP_INTENT ); if (status != STATUS_SUCCESS)

1 0

Dmitry Timoshkov : sc: Fix parsing parameter name in the 'switch=param' constructs.
by Alexandre Julliard 18 Mar '22

18 Mar '22

Module: wine Branch: master Commit: 8b38c91d83844dea882922055ced7cdeb79c1693 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b38c91d83844dea88292205… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Mar 18 17:10:47 2022 +0300 sc: Fix parsing parameter name in the 'switch=param' constructs. So that 'sc create test binpath=test.exe' actually works. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/sc/sc.c | 63 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 31 insertions(+), 32 deletions(-) diff --git a/programs/sc/sc.c b/programs/sc/sc.c index 6cf27d93ac2..bd3064da2d8 100644 --- a/programs/sc/sc.c +++ b/programs/sc/sc.c @@ -58,44 +58,44 @@ static BOOL parse_create_params( int argc, const WCHAR *argv[], struct create_pa for (i = 0; i < argc; i++) { - if (!wcsicmp( argv[i], L"displayname=" ) && i < argc - 1) cp->displayname = argv[i + 1]; - if (!wcsicmp( argv[i], L"binpath=" ) && i < argc - 1) cp->binpath = argv[i + 1]; - if (!wcsicmp( argv[i], L"group=" ) && i < argc - 1) cp->group = argv[i + 1]; - if (!wcsicmp( argv[i], L"depend=" ) && i < argc - 1) cp->depend = argv[i + 1]; - if (!wcsicmp( argv[i], L"obj=" ) && i < argc - 1) cp->obj = argv[i + 1]; - if (!wcsicmp( argv[i], L"password=" ) && i < argc - 1) cp->password = argv[i + 1]; + if (!wcsnicmp( argv[i], L"displayname=", 12 )) cp->displayname = argv[i] + 12; + if (!wcsnicmp( argv[i], L"binpath=", 8 )) cp->binpath = argv[i] + 8; + if (!wcsnicmp( argv[i], L"group=", 6 )) cp->group = argv[i] + 6; + if (!wcsnicmp( argv[i], L"depend=", 7 )) cp->depend = argv[i] + 7; + if (!wcsnicmp( argv[i], L"obj=", 4 )) cp->obj = argv[i] + 4; + if (!wcsnicmp( argv[i], L"password=", 9 )) cp->password = argv[i] + 9; - if (!wcsicmp( argv[i], L"tag=" ) && i < argc - 1) + if (!wcsnicmp( argv[i], L"tag=", 4 )) { - if (!wcsicmp( argv[i], L"yes" )) + if (!wcsicmp( argv[i] + 4, L"yes" )) { WINE_FIXME("tag argument not supported\n"); cp->tag = TRUE; } } - if (!wcsicmp( argv[i], L"type=" ) && i < argc - 1) + if (!wcsnicmp( argv[i], L"type=", 5 )) { - if (!wcsicmp( argv[i + 1], L"own" )) cp->type = SERVICE_WIN32_OWN_PROCESS; - if (!wcsicmp( argv[i + 1], L"share" )) cp->type = SERVICE_WIN32_SHARE_PROCESS; - if (!wcsicmp( argv[i + 1], L"kernel" )) cp->type = SERVICE_KERNEL_DRIVER; - if (!wcsicmp( argv[i + 1], L"filesys" )) cp->type = SERVICE_FILE_SYSTEM_DRIVER; - if (!wcsicmp( argv[i + 1], L"rec" )) cp->type = SERVICE_RECOGNIZER_DRIVER; - if (!wcsicmp( argv[i + 1], L"interact" )) cp->type |= SERVICE_INTERACTIVE_PROCESS; + if (!wcsicmp( argv[i] + 5, L"own" )) cp->type = SERVICE_WIN32_OWN_PROCESS; + if (!wcsicmp( argv[i] + 5, L"share" )) cp->type = SERVICE_WIN32_SHARE_PROCESS; + if (!wcsicmp( argv[i] + 5, L"kernel" )) cp->type = SERVICE_KERNEL_DRIVER; + if (!wcsicmp( argv[i] + 5, L"filesys" )) cp->type = SERVICE_FILE_SYSTEM_DRIVER; + if (!wcsicmp( argv[i] + 5, L"rec" )) cp->type = SERVICE_RECOGNIZER_DRIVER; + if (!wcsicmp( argv[i] + 5, L"interact" )) cp->type |= SERVICE_INTERACTIVE_PROCESS; } - if (!wcsicmp( argv[i], L"start=" ) && i < argc - 1) + if (!wcsnicmp( argv[i], L"start=", 6 )) { - if (!wcsicmp( argv[i + 1], L"boot" )) cp->start = SERVICE_BOOT_START; - if (!wcsicmp( argv[i + 1], L"system" )) cp->start = SERVICE_SYSTEM_START; - if (!wcsicmp( argv[i + 1], L"auto" )) cp->start = SERVICE_AUTO_START; - if (!wcsicmp( argv[i + 1], L"demand" )) cp->start = SERVICE_DEMAND_START; - if (!wcsicmp( argv[i + 1], L"disabled" )) cp->start = SERVICE_DISABLED; + if (!wcsicmp( argv[i] + 6, L"boot" )) cp->start = SERVICE_BOOT_START; + if (!wcsicmp( argv[i] + 6, L"system" )) cp->start = SERVICE_SYSTEM_START; + if (!wcsicmp( argv[i] + 6, L"auto" )) cp->start = SERVICE_AUTO_START; + if (!wcsicmp( argv[i] + 6, L"demand" )) cp->start = SERVICE_DEMAND_START; + if (!wcsicmp( argv[i] + 6, L"disabled" )) cp->start = SERVICE_DISABLED; } - if (!wcsicmp( argv[i], L"error=" ) && i < argc - 1) + if (!wcsnicmp( argv[i], L"error=", 6 )) { - if (!wcsicmp( argv[i + 1], L"normal" )) cp->error = SERVICE_ERROR_NORMAL; - if (!wcsicmp( argv[i + 1], L"severe" )) cp->error = SERVICE_ERROR_SEVERE; - if (!wcsicmp( argv[i + 1], L"critical" )) cp->error = SERVICE_ERROR_CRITICAL; - if (!wcsicmp( argv[i + 1], L"ignore" )) cp->error = SERVICE_ERROR_IGNORE; + if (!wcsicmp( argv[i] + 6, L"normal" )) cp->error = SERVICE_ERROR_NORMAL; + if (!wcsicmp( argv[i] + 6, L"severe" )) cp->error = SERVICE_ERROR_SEVERE; + if (!wcsicmp( argv[i] + 6, L"critical" )) cp->error = SERVICE_ERROR_CRITICAL; + if (!wcsicmp( argv[i] + 6, L"ignore" )) cp->error = SERVICE_ERROR_IGNORE; } } if (!cp->binpath) return FALSE; @@ -158,13 +158,12 @@ static BOOL parse_failure_params( int argc, const WCHAR *argv[], SERVICE_FAILURE for (i = 0; i < argc; i++) { - if (!wcsicmp( argv[i], L"reset=" ) && i < argc - 1) fa->dwResetPeriod = wcstol( argv[i + 1], NULL, 10 ); - if (!wcsicmp( argv[i], L"reboot=" ) && i < argc - 1) fa->lpRebootMsg = (WCHAR *)argv[i + 1]; - if (!wcsicmp( argv[i], L"command=" ) && i < argc - 1) fa->lpCommand = (WCHAR *)argv[i + 1]; - if (!wcsicmp( argv[i], L"actions=" )) + if (!wcsnicmp( argv[i], L"reset=", 6 )) fa->dwResetPeriod = wcstol( argv[i] + 6, NULL, 10 ); + if (!wcsnicmp( argv[i], L"reboot=", 7 )) fa->lpRebootMsg = (WCHAR *)argv[i] + 7; + if (!wcsnicmp( argv[i], L"command=", 8 )) fa->lpCommand = (WCHAR *)argv[i] + 8; + if (!wcsnicmp( argv[i], L"actions=", 8 )) { - if (i == argc - 1) return FALSE; - if (!parse_failure_actions( argv[i + 1], fa )) return FALSE; + if (!parse_failure_actions( argv[i] + 8, fa )) return FALSE; } } return TRUE;

1 0

Dmitry Timoshkov : sc: Don't silently fail when something doesn't work as expected.
by Alexandre Julliard 18 Mar '22

18 Mar '22

Module: wine Branch: master Commit: 1447872b0c993113b7bd8215967a502e7aa644e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1447872b0c993113b7bd8215… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Mar 18 17:10:52 2022 +0300 sc: Don't silently fail when something doesn't work as expected. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/sc/sc.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/programs/sc/sc.c b/programs/sc/sc.c index bd3064da2d8..4e642874237 100644 --- a/programs/sc/sc.c +++ b/programs/sc/sc.c @@ -207,7 +207,7 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) } if (!parse_create_params( argc - 3, argv + 3, &cp )) { - WINE_WARN("failed to parse create parameters\n"); + WINE_ERR("failed to parse create parameters\n"); CloseServiceHandle( manager ); return 1; } @@ -219,7 +219,7 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) CloseServiceHandle( service ); ret = TRUE; } - else WINE_TRACE("failed to create service %lu\n", GetLastError()); + else WINE_ERR("failed to create service %lu\n", GetLastError()); } else if (!wcsicmp( argv[1], L"description" )) { @@ -229,10 +229,10 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) SERVICE_DESCRIPTIONW sd; sd.lpDescription = argc > 3 ? (WCHAR *)argv[3] : NULL; ret = ChangeServiceConfig2W( service, SERVICE_CONFIG_DESCRIPTION, &sd ); - if (!ret) WINE_TRACE("failed to set service description %lu\n", GetLastError()); + if (!ret) WINE_ERR("failed to set service description %lu\n", GetLastError()); CloseServiceHandle( service ); } - else WINE_TRACE("failed to open service %lu\n", GetLastError()); + else WINE_ERR("failed to open service %lu\n", GetLastError()); } else if (!wcsicmp( argv[1], L"failure" )) { @@ -247,10 +247,10 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) HeapFree( GetProcessHeap(), 0, sfa.lpsaActions ); } else - WINE_WARN("failed to parse failure parameters\n"); + WINE_ERR("failed to parse failure parameters\n"); CloseServiceHandle( service ); } - else WINE_TRACE("failed to open service %lu\n", GetLastError()); + else WINE_ERR("failed to open service %lu\n", GetLastError()); } else if (!wcsicmp( argv[1], L"delete" )) { @@ -261,7 +261,7 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) if (!ret) WINE_TRACE("failed to delete service %lu\n", GetLastError()); CloseServiceHandle( service ); } - else WINE_TRACE("failed to open service %lu\n", GetLastError()); + else WINE_ERR("failed to open service %lu\n", GetLastError()); } else if (!wcsicmp( argv[1], L"start" )) { @@ -272,7 +272,7 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) if (!ret) WINE_TRACE("failed to start service %lu\n", GetLastError()); CloseServiceHandle( service ); } - else WINE_TRACE("failed to open service %lu\n", GetLastError()); + else WINE_ERR("failed to open service %lu\n", GetLastError()); } else if (!wcsicmp( argv[1], L"stop" )) { @@ -283,7 +283,7 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) if (!ret) WINE_TRACE("failed to stop service %lu\n", GetLastError()); CloseServiceHandle( service ); } - else WINE_TRACE("failed to open service %lu\n", GetLastError()); + else WINE_ERR("failed to open service %lu\n", GetLastError()); } else if (!wcsicmp( argv[1], L"sdset" )) {

1 0

Paul Gofman : wbemprox: Bump video driver version and date.
by Alexandre Julliard 18 Mar '22

18 Mar '22

Module: wine Branch: master Commit: 5c5dfb3d601235ee71fbf98a1f731a2b99ebf5e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c5dfb3d601235ee71fbf98a… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Mar 18 18:24:41 2022 +0300 wbemprox: Bump video driver version and date. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index fb6fb654400..bb1c10ac2fd 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -4060,8 +4060,8 @@ static enum fill_status fill_videocontroller( struct table *table, const struct rec->current_verticalres = vres; rec->description = heap_strdupW( name ); rec->device_id = L"VideoController1"; - rec->driverdate = L"20170101000000.000000+000"; - rec->driverversion = L"1.0"; + rec->driverdate = L"20220118000000.000000-000"; + rec->driverversion = L"30.0.14023.3004"; rec->installeddriver = get_videocontroller_installeddriver( desc.VendorId ); rec->name = heap_strdupW( name ); rec->pnpdevice_id = get_videocontroller_pnpdeviceid( &desc );

1 0

Gabriel Ivăncescu : jscript: Pass null jsval to builtin functions instead of the global host.
by Alexandre Julliard 18 Mar '22

18 Mar '22

Module: wine Branch: master Commit: 8fa923ca2cad482c1bba6bf3f7b51d64f294cfc9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8fa923ca2cad482c1bba6bf3… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Mar 18 17:24:08 2022 +0200 jscript: Pass null jsval to builtin functions instead of the global host. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/function.c | 2 +- dlls/jscript/tests/api.js | 45 ++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/es5.js | 53 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 99 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index fd1380d7cc2..e0b7310fb20 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -599,7 +599,7 @@ static HRESULT NativeFunction_call(script_ctx_t *ctx, FunctionInstance *func, ID if(this_disp) vthis = jsval_disp(this_disp); else - vthis = jsval_disp(lookup_global_host(ctx)); + vthis = jsval_null(); return function->proc(ctx, vthis, flags & ~DISPATCH_JSCRIPT_INTERNAL_MASK, argc, argv, r); } diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index d5d8e7d34b9..44e0eaac903 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -16,6 +16,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +var JS_E_NUMBER_EXPECTED = 0x800a1389; +var JS_E_FUNCTION_EXPECTED = 0x800a138a; +var JS_E_DATE_EXPECTED = 0x800a138e; +var JS_E_OBJECT_EXPECTED = 0x800a138f; +var JS_E_BOOLEAN_EXPECTED = 0x800a1392; +var JS_E_VBARRAY_EXPECTED = 0x800a1395; +var JS_E_ENUMERATOR_EXPECTED = 0x800a1397; +var JS_E_REGEXP_EXPECTED = 0x800a1398; + var tmp, i; var bigInt = Math.pow(2,40); @@ -3061,6 +3070,42 @@ ok(unescape.length == 1, "unescape.length = " + unescape.length); String.length = 3; ok(String.length == 1, "String.length = " + String.length); +(function() { + var tests = [ + [ "Array.sort", JS_E_OBJECT_EXPECTED, function(ctx) { Array.prototype.sort.call(ctx); } ], + [ "Boolean.valueOf", JS_E_BOOLEAN_EXPECTED, function(ctx) { Boolean.prototype.valueOf.call(ctx); } ], + [ "Date.getYear", JS_E_DATE_EXPECTED, function(ctx) { Date.prototype.getYear.call(ctx); } ], + [ "Enumerator.atEnd", JS_E_ENUMERATOR_EXPECTED, function(ctx) { Enumerator.prototype.atEnd.call(ctx); } ], + [ "Function.apply", JS_E_FUNCTION_EXPECTED, function(ctx) { Function.prototype.apply.call(ctx, [ function() {} ]); } ], + [ "Number.toExponential", JS_E_NUMBER_EXPECTED, function(ctx) { Number.prototype.toExponential.call(ctx); } ], + [ "Object.hasOwnProperty", JS_E_OBJECT_EXPECTED, function(ctx) { Object.prototype.hasOwnProperty.call(ctx, "toString"); } ], + [ "RegExp.test", JS_E_REGEXP_EXPECTED, function(ctx) { RegExp.prototype.test.call(ctx, "foobar"); } ], + [ "VBArray.lbound", JS_E_VBARRAY_EXPECTED, function(ctx) { VBArray.prototype.lbound.call(ctx); } ] + ]; + + for(var i = 0; i < tests.length; i++) { + try { + tests[i][2](null); + ok(false, "expected exception calling " + tests[i][0] + " with null context"); + }catch(ex) { + var n = ex.number >>> 0; /* make it unsigned like HRESULT */ + ok(n === tests[i][1], tests[i][0] + " with null context exception code = " + n); + } + try { + tests[i][2](undefined); + ok(false, "expected exception calling " + tests[i][0] + " with undefined context"); + }catch(ex) { + var n = ex.number >>> 0; + ok(n === tests[i][1], tests[i][0] + " with undefined context exception code = " + n); + } + } + + var r = Error.prototype.toString.call(undefined); + ok(r === "[object Error]", "Error.toString with undefined context returned " + r); + r = String.prototype.slice.call(null, 1, 3); + ok(r === "ul", "String.slice with null context returned " + r); +})(); + var tmp = createArray(); ok(getVT(tmp) == "VT_ARRAY|VT_VARIANT", "getVT(createArray()) = " + getVT(tmp)); ok(getVT(VBArray(tmp)) == "VT_ARRAY|VT_VARIANT", "getVT(VBArray(tmp)) = " + getVT(VBArray(tmp))); diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index 58b0d43e274..0fa6f7fc175 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -17,6 +17,14 @@ */ var JS_E_PROP_DESC_MISMATCH = 0x800a01bd; +var JS_E_NUMBER_EXPECTED = 0x800a1389; +var JS_E_FUNCTION_EXPECTED = 0x800a138a; +var JS_E_DATE_EXPECTED = 0x800a138e; +var JS_E_OBJECT_EXPECTED = 0x800a138f; +var JS_E_BOOLEAN_EXPECTED = 0x800a1392; +var JS_E_VBARRAY_EXPECTED = 0x800a1395; +var JS_E_ENUMERATOR_EXPECTED = 0x800a1397; +var JS_E_REGEXP_EXPECTED = 0x800a1398; var JS_E_INVALID_WRITABLE_PROP_DESC = 0x800a13ac; var JS_E_NONCONFIGURABLE_REDEFINED = 0x800a13d6; var JS_E_NONWRITABLE_MODIFIED = 0x800a13d7; @@ -1222,6 +1230,51 @@ sync_test("isFrozen", function() { ok(Object.isExtensible(o) === false, "o is extensible"); }); +sync_test("builtin_context", function() { + var tests = [ + [ "Array.map", JS_E_OBJECT_EXPECTED, function(ctx) { Array.prototype.map.call(ctx, function(a, b) {}); } ], + [ "Array.sort", JS_E_OBJECT_EXPECTED, function(ctx) { Array.prototype.sort.call(ctx); } ], + [ "Boolean.toString", JS_E_BOOLEAN_EXPECTED, function(ctx) { Boolean.prototype.toString.call(ctx); } ], + [ "Date.getTime", JS_E_DATE_EXPECTED, function(ctx) { Date.prototype.getTime.call(ctx); } ], + [ "Date.toGMTString", JS_E_DATE_EXPECTED, function(ctx) { Date.prototype.toGMTString.call(ctx); } ], + [ "Enumerator.item", JS_E_ENUMERATOR_EXPECTED, function(ctx) { Enumerator.prototype.item.call(ctx); } ], + [ "Error.toString", JS_E_OBJECT_EXPECTED, function(ctx) { Error.prototype.toString.call(ctx); } ], + [ "Function.call", JS_E_FUNCTION_EXPECTED, function(ctx) { Function.prototype.call.call(ctx, function() {}); } ], + [ "Map.clear", JS_E_OBJECT_EXPECTED, function(ctx) { Map.prototype.clear.call(ctx); } ], + [ "Number.toFixed", JS_E_NUMBER_EXPECTED, function(ctx) { Number.prototype.toFixed.call(ctx); } ], + [ "Object.isPrototypeOf", JS_E_OBJECT_EXPECTED, function(ctx) { Object.prototype.isPrototypeOf.call(ctx, Object); } ], + [ "RegExp.exec", JS_E_REGEXP_EXPECTED, function(ctx) { RegExp.prototype.exec.call(ctx, "foobar"); } ], + [ "String.search", JS_E_OBJECT_EXPECTED, function(ctx) { String.prototype.search.call(ctx, /foobar/g); } ], + [ "String.trim", JS_E_OBJECT_EXPECTED, function(ctx) { String.prototype.trim.call(ctx); } ], + [ "VBArray.dimensions", JS_E_VBARRAY_EXPECTED, function(ctx) { VBArray.prototype.dimensions.call(ctx); } ] + ]; + + /* make global object suitable for some calls */ + window[0] = "foo"; + window[1] = "bar"; + window.length = 2; + + for(var i = 0; i < tests.length; i++) { + try { + tests[i][2](null); + ok(false, "expected exception calling " + tests[i][0] + " with null context"); + }catch(ex) { + var n = ex.number >>> 0; /* make it unsigned like HRESULT */ + ok(n === tests[i][1], tests[i][0] + " with null context exception code = " + n); + } + try { + tests[i][2](undefined); + ok(false, "expected exception calling " + tests[i][0] + " with undefined context"); + }catch(ex) { + var n = ex.number >>> 0; + ok(n === tests[i][1], tests[i][0] + " with undefined context exception code = " + n); + } + } + + var obj = (function() { return this; }).call(null); + ok(obj === window, "obj = " + obj); +}); + sync_test("head_setter", function() { document.head = ""; ok(typeof(document.head) === "object", "typeof(document.head) = " + typeof(document.head));

1 0

Gabriel Ivăncescu : jscript: Return the correct string for Object.toString(null) in ES5+ modes.
by Alexandre Julliard 18 Mar '22

18 Mar '22

Module: wine Branch: master Commit: 22ce4d7ec9746e57b4e1eef092fd6882f567f927 URL: https://source.winehq.org/git/wine.git/?a=commit;h=22ce4d7ec9746e57b4e1eef0… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Mar 18 17:24:09 2022 +0200 jscript: Return the correct string for Object.toString(null) in ES5+ modes. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/object.c | 5 ++++- dlls/mshtml/tests/documentmode.js | 2 +- dlls/mshtml/tests/es5.js | 1 - 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index 3b5a1f8310a..0f5f2c105e3 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -57,7 +57,10 @@ static HRESULT Object_toString(script_ctx_t *ctx, jsval_t vthis, WORD flags, uns TRACE("\n"); if(is_undefined(vthis) || is_null(vthis)) { - str = L"[object Object]"; + if(ctx->version < SCRIPTLANGUAGEVERSION_ES5) + str = L"[object Object]"; + else + str = is_null(vthis) ? L"[object Null]" : L"[object Object]"; goto set_output; } diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index ddcb738ab26..243a8faf263 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -1243,7 +1243,7 @@ sync_test("elem_attr", function() { r = elem.removeAttribute("ondblclick"); ok(r === (v < 8 ? false : (v < 9 ? true : undefined)), "ondblclick removeAttribute returned " + r); r = Object.prototype.toString.call(elem.ondblclick); - todo_wine_if(v >= 9). + todo_wine_if(v >= 11). ok(r === (v < 8 ? "[object Array]" : (v < 9 ? "[object Object]" : (v < 11 ? "[object Null]" : "[object Function]"))), "removed ondblclick Object.toString returned " + r); diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index 0fa6f7fc175..98d14303d70 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -805,7 +805,6 @@ sync_test("toString", function() { todo_wine. ok(tmp === "[object Window]", "toString.call(null) = " + tmp); tmp = Object.prototype.toString.call(null); - todo_wine. ok(tmp === "[object Null]", "toString.call(null) = " + tmp); tmp = Object.prototype.toString.call(undefined); todo_wine.

1 0

Gabriel Ivăncescu : jscript: Pass jsval "this" to function calls instead of a dispatch.
by Alexandre Julliard 18 Mar '22

18 Mar '22

Module: wine Branch: master Commit: 598709f872b15b7fe3c71b7c1bc2180dcead1bb5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=598709f872b15b7fe3c71b7c… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Mar 18 17:24:10 2022 +0200 jscript: Pass jsval "this" to function calls instead of a dispatch. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/function.c | 70 ++++++++++++++++++++++++++++------------------- dlls/jscript/tests/api.js | 8 ++++++ dlls/mshtml/tests/es5.js | 4 +++ 3 files changed, 54 insertions(+), 28 deletions(-) diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index e0b7310fb20..fc8a85c1ddd 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -35,7 +35,7 @@ typedef struct { } FunctionInstance; struct _function_vtbl_t { - HRESULT (*call)(script_ctx_t*,FunctionInstance*,IDispatch*,unsigned,unsigned,jsval_t*,jsval_t*); + HRESULT (*call)(script_ctx_t*,FunctionInstance*,jsval_t,unsigned,unsigned,jsval_t*,jsval_t*); HRESULT (*toString)(FunctionInstance*,jsstr_t**); function_code_t* (*get_code)(FunctionInstance*); void (*destructor)(FunctionInstance*); @@ -256,7 +256,7 @@ HRESULT Function_invoke(jsdisp_t *func_this, IDispatch *jsthis, WORD flags, unsi assert(is_class(func_this, JSCLASS_FUNCTION)); function = function_from_jsdisp(func_this); - return function->vtbl->call(function->dispex.ctx, function, jsthis, flags, argc, argv, r); + return function->vtbl->call(function->dispex.ctx, function, jsval_disp(jsthis), flags, argc, argv, r); } static HRESULT Function_get_length(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t *r) @@ -328,10 +328,10 @@ static HRESULT array_to_args(script_ctx_t *ctx, jsdisp_t *arg_array, unsigned *a static HRESULT Function_apply(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { + jsval_t this_val = jsval_undefined(); FunctionInstance *function; jsval_t *args = NULL; unsigned i, cnt = 0; - IDispatch *this_obj = NULL; HRESULT hres = S_OK; TRACE("\n"); @@ -340,10 +340,16 @@ static HRESULT Function_apply(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsi return JS_E_FUNCTION_EXPECTED; if(argc) { - if(!is_undefined(argv[0]) && !is_null(argv[0])) { + if(ctx->version < SCRIPTLANGUAGEVERSION_ES5 && !is_undefined(argv[0]) && !is_null(argv[0])) { + IDispatch *this_obj; hres = to_object(ctx, argv[0], &this_obj); if(FAILED(hres)) return hres; + this_val = jsval_disp(this_obj); + }else { + hres = jsval_copy(argv[0], &this_val); + if(FAILED(hres)) + return hres; } } @@ -370,10 +376,11 @@ static HRESULT Function_apply(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsi if(SUCCEEDED(hres)) { if(function) { - hres = function->vtbl->call(ctx, function, this_obj, flags, cnt, args, r); + hres = function->vtbl->call(ctx, function, this_val, flags, cnt, args, r); }else { jsval_t res; - hres = disp_call_value(ctx, get_object(vthis), this_obj, DISPATCH_METHOD, cnt, args, &res); + hres = disp_call_value(ctx, get_object(vthis), is_object_instance(this_val) ? get_object(this_val) : NULL, + DISPATCH_METHOD, cnt, args, &res); if(SUCCEEDED(hres)) { if(r) *r = res; @@ -383,8 +390,7 @@ static HRESULT Function_apply(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsi } } - if(this_obj) - IDispatch_Release(this_obj); + jsval_release(this_val); for(i=0; i < cnt; i++) jsval_release(args[i]); heap_free(args); @@ -394,8 +400,8 @@ static HRESULT Function_apply(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsi static HRESULT Function_call(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { + jsval_t this_val = jsval_undefined(); FunctionInstance *function; - IDispatch *this_obj = NULL; unsigned cnt = 0; HRESULT hres; @@ -405,19 +411,23 @@ static HRESULT Function_call(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsig return JS_E_FUNCTION_EXPECTED; if(argc) { - if(!is_undefined(argv[0]) && !is_null(argv[0])) { + if(ctx->version < SCRIPTLANGUAGEVERSION_ES5 && !is_undefined(argv[0]) && !is_null(argv[0])) { + IDispatch *this_obj; hres = to_object(ctx, argv[0], &this_obj); if(FAILED(hres)) return hres; + this_val = jsval_disp(this_obj); + }else { + hres = jsval_copy(argv[0], &this_val); + if(FAILED(hres)) + return hres; } - cnt = argc-1; } - hres = function->vtbl->call(ctx, function, this_obj, flags, cnt, argv + 1, r); + hres = function->vtbl->call(ctx, function, this_val, flags, cnt, argv + 1, r); - if(this_obj) - IDispatch_Release(this_obj); + jsval_release(this_val); return hres; } @@ -469,7 +479,7 @@ HRESULT Function_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned ar return E_FAIL; } - return function->vtbl->call(ctx, function, NULL, flags, argc, argv, r); + return function->vtbl->call(ctx, function, vthis, flags, argc, argv, r); } HRESULT Function_get_value(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t *r) @@ -590,16 +600,10 @@ static HRESULT create_function(script_ctx_t *ctx, const builtin_info_t *builtin_ return S_OK; } -static HRESULT NativeFunction_call(script_ctx_t *ctx, FunctionInstance *func, IDispatch *this_disp, unsigned flags, +static HRESULT NativeFunction_call(script_ctx_t *ctx, FunctionInstance *func, jsval_t vthis, unsigned flags, unsigned argc, jsval_t *argv, jsval_t *r) { NativeFunction *function = (NativeFunction*)func; - jsval_t vthis; - - if(this_disp) - vthis = jsval_disp(this_disp); - else - vthis = jsval_null(); return function->proc(ctx, vthis, flags & ~DISPATCH_JSCRIPT_INTERNAL_MASK, argc, argv, r); } @@ -698,12 +702,13 @@ HRESULT create_builtin_constructor(script_ctx_t *ctx, builtin_invoke_t value_pro return S_OK; } -static HRESULT InterpretedFunction_call(script_ctx_t *ctx, FunctionInstance *func, IDispatch *this_obj, unsigned flags, +static HRESULT InterpretedFunction_call(script_ctx_t *ctx, FunctionInstance *func, jsval_t vthis, unsigned flags, unsigned argc, jsval_t *argv, jsval_t *r) { InterpretedFunction *function = (InterpretedFunction*)func; - jsdisp_t *new_obj = NULL; + IDispatch *this_obj = NULL; DWORD exec_flags = 0; + jsdisp_t *new_obj; HRESULT hres; TRACE("%p\n", function); @@ -718,6 +723,14 @@ static HRESULT InterpretedFunction_call(script_ctx_t *ctx, FunctionInstance *fun if(FAILED(hres)) return hres; this_obj = to_disp(new_obj); + }else if(is_object_instance(vthis)) { + this_obj = get_object(vthis); + if(this_obj) + IDispatch_AddRef(this_obj); + }else if(ctx->version >= SCRIPTLANGUAGEVERSION_ES5 && !is_undefined(vthis) && !is_null(vthis)) { + hres = to_object(ctx, vthis, &this_obj); + if(FAILED(hres)) + return hres; } if(flags & DISPATCH_JSCRIPT_CALLEREXECSSOURCE) @@ -726,8 +739,8 @@ static HRESULT InterpretedFunction_call(script_ctx_t *ctx, FunctionInstance *fun exec_flags |= EXEC_CONSTRUCTOR; hres = exec_source(ctx, exec_flags, function->code, function->func_code, function->scope_chain, this_obj, &function->function.dispex, argc, argv, r); - if(new_obj) - jsdisp_release(new_obj); + if(this_obj) + IDispatch_Release(this_obj); return hres; } @@ -801,7 +814,7 @@ HRESULT create_source_function(script_ctx_t *ctx, bytecode_t *code, function_cod return S_OK; } -static HRESULT BindFunction_call(script_ctx_t *ctx, FunctionInstance *func, IDispatch *this_obj, unsigned flags, +static HRESULT BindFunction_call(script_ctx_t *ctx, FunctionInstance *func, jsval_t vthis, unsigned flags, unsigned argc, jsval_t *argv, jsval_t *r) { BindFunction *function = (BindFunction*)func; @@ -823,7 +836,8 @@ static HRESULT BindFunction_call(script_ctx_t *ctx, FunctionInstance *func, IDis memcpy(call_args + function->argc, argv, argc * sizeof(*call_args)); } - hres = function->target->vtbl->call(ctx, function->target, function->this, flags, call_argc, call_args, r); + hres = function->target->vtbl->call(ctx, function->target, jsval_disp(function->this), + flags, call_argc, call_args, r); heap_free(call_args); return hres; diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 44e0eaac903..8e2b0d6a1ff 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -3104,6 +3104,14 @@ ok(String.length == 1, "String.length = " + String.length); ok(r === "[object Error]", "Error.toString with undefined context returned " + r); r = String.prototype.slice.call(null, 1, 3); ok(r === "ul", "String.slice with null context returned " + r); + r = String.prototype.slice.call(undefined, 2, 5); + ok(r === "def", "String.slice with undefined context returned " + r); + r = (function() { return this; }).call(null); + ok(r === test, "wrong 'this' of function with null context"); + r = (function() { return this; }).call(undefined); + ok(r === test, "wrong 'this' of function with undefined context"); + r = (function() { return this; }).call(42); + ok(r.valueOf() === 42, "'this' of function with 42 context = " + r); })(); var tmp = createArray(); diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index 98d14303d70..857d47d75aa 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -1272,6 +1272,10 @@ sync_test("builtin_context", function() { var obj = (function() { return this; }).call(null); ok(obj === window, "obj = " + obj); + var obj = (function() { return this; }).call(undefined); + ok(obj === window, "obj = " + obj); + obj = (function() { return this; }).call(42); + ok(obj.valueOf() === 42, "obj = " + obj); }); sync_test("head_setter", function() {

1 0

Gabriel Ivăncescu : jscript: Return the correct string for Object.toString(undefined) in ES5+ modes.
by Alexandre Julliard 18 Mar '22

18 Mar '22

Module: wine Branch: master Commit: 47b02e8c1ea4ad82cd572dc3dcf60af753222f39 URL: https://source.winehq.org/git/wine.git/?a=commit;h=47b02e8c1ea4ad82cd572dc3… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Mar 18 17:24:11 2022 +0200 jscript: Return the correct string for Object.toString(undefined) in ES5+ modes. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/object.c | 2 +- dlls/mshtml/tests/es5.js | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index 0f5f2c105e3..c01fbcce085 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -60,7 +60,7 @@ static HRESULT Object_toString(script_ctx_t *ctx, jsval_t vthis, WORD flags, uns if(ctx->version < SCRIPTLANGUAGEVERSION_ES5) str = L"[object Object]"; else - str = is_null(vthis) ? L"[object Null]" : L"[object Object]"; + str = is_null(vthis) ? L"[object Null]" : L"[object Undefined]"; goto set_output; } diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index 857d47d75aa..6e92fb6a00f 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -807,10 +807,8 @@ sync_test("toString", function() { tmp = Object.prototype.toString.call(null); ok(tmp === "[object Null]", "toString.call(null) = " + tmp); tmp = Object.prototype.toString.call(undefined); - todo_wine. ok(tmp === "[object Undefined]", "toString.call(undefined) = " + tmp); tmp = Object.prototype.toString.call(); - todo_wine. ok(tmp === "[object Undefined]", "toString.call() = " + tmp); obj = Object.create(null);

1 0

Jacek Caban : win32u: Move NtUserCreateWindowEx implementation from user32.
by Alexandre Julliard 18 Mar '22

18 Mar '22

Module: wine Branch: master Commit: d765edc411a6844f6322dd9da280aa0436391828 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d765edc411a6844f6322dd9d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 18 14:27:55 2022 +0100 win32u: Move NtUserCreateWindowEx implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/class.c | 11 - dlls/user32/controls.h | 1 - dlls/user32/driver.c | 13 +- dlls/user32/user_main.c | 12 +- dlls/user32/user_private.h | 3 - dlls/user32/win.c | 544 ++----------------------------------------- dlls/user32/win.h | 1 - dlls/user32/winpos.c | 176 -------------- dlls/user32/winproc.c | 39 ---- dlls/win32u/class.c | 29 +++ dlls/win32u/dce.c | 11 + dlls/win32u/driver.c | 6 + dlls/win32u/gdiobj.c | 1 + dlls/win32u/menu.c | 8 + dlls/win32u/message.c | 19 +- dlls/win32u/ntuser_private.h | 39 +--- dlls/win32u/sysparams.c | 5 +- dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 10 +- dlls/win32u/window.c | 488 +++++++++++++++++++++++++++++++++++++- dlls/win32u/wrappers.c | 12 + include/ntuser.h | 10 +- 22 files changed, 616 insertions(+), 824 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d765edc411a6844f6322…

1 0