wine-commits May 2018

wine-commits@winehq.org

2 participants
716 discussions

Dmitry Timoshkov : schedsvc: Pass full task file name to remove_job()/ add_job().
by Alexandre Julliard 11 May '18

11 May '18

Module: wine Branch: master Commit: 0932d858aae649bfa4fc36e7207a84cad18b017d URL: https://source.winehq.org/git/wine.git/?a=commit;h=0932d858aae649bfa4fc36e7… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri May 11 12:36:26 2018 +0800 schedsvc: Pass full task file name to remove_job()/add_job(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/schedsvc/svc_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/schedsvc/svc_main.c b/dlls/schedsvc/svc_main.c index 848e4fc..f021d63 100644 --- a/dlls/schedsvc/svc_main.c +++ b/dlls/schedsvc/svc_main.c @@ -118,8 +118,8 @@ static DWORD WINAPI tasks_monitor_thread(void *arg) GetWindowsDirectoryW(path, MAX_PATH); lstrcatW(path, tasksW); lstrcatW(path, info.data.FileName); - remove_job(info.data.FileName); - add_job(info.data.FileName); + remove_job(path); + add_job(path); break; default:

1 0

Dmitry Timoshkov : mstask: Implement ITaskScheduler::Delete().
by Alexandre Julliard 11 May '18

11 May '18

Module: wine Branch: master Commit: 4bd663629d6bce8bd9c109740f7b9698d25605b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4bd663629d6bce8bd9c10974… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri May 11 12:36:23 2018 +0800 mstask: Implement ITaskScheduler::Delete(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mstask/task_scheduler.c | 23 ++++++++++++++++++----- dlls/mstask/tests/task_scheduler.c | 17 +++++++++++++---- 2 files changed, 31 insertions(+), 9 deletions(-) diff --git a/dlls/mstask/task_scheduler.c b/dlls/mstask/task_scheduler.c index 42e7738..416a321 100644 --- a/dlls/mstask/task_scheduler.c +++ b/dlls/mstask/task_scheduler.c @@ -302,12 +302,25 @@ static HRESULT WINAPI MSTASK_ITaskScheduler_Activate(ITaskScheduler *iface, return hr; } -static HRESULT WINAPI MSTASK_ITaskScheduler_Delete( - ITaskScheduler* iface, - LPCWSTR pwszName) +static HRESULT WINAPI MSTASK_ITaskScheduler_Delete(ITaskScheduler *iface, LPCWSTR name) { - FIXME("%p, %s: stub\n", iface, debugstr_w(pwszName)); - return E_NOTIMPL; + static const WCHAR tasksW[] = { '\\','T','a','s','k','s','\\',0 }; + static const WCHAR jobW[] = { '.','j','o','b',0 }; + WCHAR task_name[MAX_PATH]; + + TRACE("%p, %s\n", iface, debugstr_w(name)); + + if (strchrW(name, '.')) return E_INVALIDARG; + + GetWindowsDirectoryW(task_name, MAX_PATH); + lstrcatW(task_name, tasksW); + lstrcatW(task_name, name); + lstrcatW(task_name, jobW); + + if (!DeleteFileW(task_name)) + return HRESULT_FROM_WIN32(GetLastError()); + + return S_OK; } static HRESULT WINAPI MSTASK_ITaskScheduler_NewWorkItem( diff --git a/dlls/mstask/tests/task_scheduler.c b/dlls/mstask/tests/task_scheduler.c index 8b93b56..d476638 100644 --- a/dlls/mstask/tests/task_scheduler.c +++ b/dlls/mstask/tests/task_scheduler.c @@ -249,7 +249,7 @@ static void test_save_task_curfile(ITask *task) curfile = NULL; hr = IPersistFile_GetCurFile(pfile, &curfile); ok(hr == S_OK, "GetCurFile error %#x\n", hr); - ok(curfile && curfile[0] , "curfile should not be NULL\n"); + ok(curfile && curfile[0], "curfile should not be NULL\n"); ok(file_exists(curfile), "curfile should exist\n"); @@ -343,6 +343,12 @@ static void test_task_storage(void) return; } + hr = ITaskScheduler_Delete(scheduler, Task1_ext); + ok(hr == E_INVALIDARG, "wrong error %#x\n", hr); + + hr = ITaskScheduler_Delete(scheduler, Task1); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "wrong error %#x\n", hr); + hr = ITaskScheduler_NewWorkItem(scheduler, Task1_ext, &CLSID_CTask, &IID_ITask, (IUnknown **)&task); ok(hr == E_INVALIDARG, "wrong error %#x\n", hr); @@ -418,9 +424,12 @@ static void test_task_storage(void) test_save_task_curfile(task); - DeleteFileW(task1_full_name); - DeleteFileW(task2_full_name); - DeleteFileW(task3_full_name); + hr = ITaskScheduler_Delete(scheduler, Task1); + ok(hr == S_OK, "got %#x\n", hr); + hr = ITaskScheduler_Delete(scheduler, Task2); + ok(hr == S_OK, "got %#x\n", hr); + hr = ITaskScheduler_Delete(scheduler, Task3); + ok(hr == S_OK, "got %#x\n", hr); ITask_Release(task); ITaskScheduler_Release(scheduler);

1 0

Qian Hong : server: Map EXDEV to STATUS_NOT_SAME_DEVICE.
by Alexandre Julliard 11 May '18

11 May '18

Module: wine Branch: master Commit: 9ec4b572f8ce388fbc19eae70573f8c6d1c984bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ec4b572f8ce388fbc19eae7… Author: Qian Hong <qhong(a)codeweavers.com> Date: Fri May 11 04:42:48 2018 +0000 server: Map EXDEV to STATUS_NOT_SAME_DEVICE. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/file.c | 1 + 1 file changed, 1 insertion(+) diff --git a/server/file.c b/server/file.c index 390b072..446621a 100644 --- a/server/file.c +++ b/server/file.c @@ -671,6 +671,7 @@ void file_set_error(void) case EFBIG: set_error( STATUS_SECTION_TOO_BIG ); break; case ENODEV: set_error( STATUS_NO_SUCH_DEVICE ); break; case ENXIO: set_error( STATUS_NO_SUCH_DEVICE ); break; + case EXDEV: set_error( STATUS_NOT_SAME_DEVICE ); break; #ifdef EOVERFLOW case EOVERFLOW: set_error( STATUS_INVALID_PARAMETER ); break; #endif

1 0

Michael Müller : feclient: Add stub dll.
by Alexandre Julliard 11 May '18

11 May '18

Module: wine Branch: master Commit: 7f0b93c7f17af709fe5fbe17e8407ffc65dbba13 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f0b93c7f17af709fe5fbe17… Author: Michael Müller <michael(a)fds-team.de> Date: Thu May 10 16:35:14 2018 +0200 feclient: Add stub dll. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/feclient/Makefile.in | 4 ++++ dlls/feclient/feclient.spec | 50 +++++++++++++++++++++++++++++++++++++++++++++ dlls/feclient/main.c | 45 ++++++++++++++++++++++++++++++++++++++++ 5 files changed, 102 insertions(+) diff --git a/configure b/configure index ed45350..a38763c 100755 --- a/configure +++ b/configure @@ -1285,6 +1285,7 @@ enable_ext_ms_win_security_credui_l1_1_0 enable_ext_ms_win_security_cryptui_l1_1_0 enable_ext_ms_win_uxtheme_themes_l1_1_0 enable_faultrep +enable_feclient enable_fltlib enable_fltmgr_sys enable_fntcache @@ -18694,6 +18695,7 @@ wine_fn_config_makefile dlls/ext-ms-win-security-cryptui-l1-1-0 enable_ext_ms_wi wine_fn_config_makefile dlls/ext-ms-win-uxtheme-themes-l1-1-0 enable_ext_ms_win_uxtheme_themes_l1_1_0 wine_fn_config_makefile dlls/faultrep enable_faultrep wine_fn_config_makefile dlls/faultrep/tests enable_tests +wine_fn_config_makefile dlls/feclient enable_feclient wine_fn_config_makefile dlls/fltlib enable_fltlib wine_fn_config_makefile dlls/fltmgr.sys enable_fltmgr_sys wine_fn_config_makefile dlls/fntcache enable_fntcache diff --git a/configure.ac b/configure.ac index f306078..5d60559 100644 --- a/configure.ac +++ b/configure.ac @@ -3291,6 +3291,7 @@ WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-security-cryptui-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-uxtheme-themes-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/faultrep) WINE_CONFIG_MAKEFILE(dlls/faultrep/tests) +WINE_CONFIG_MAKEFILE(dlls/feclient) WINE_CONFIG_MAKEFILE(dlls/fltlib) WINE_CONFIG_MAKEFILE(dlls/fltmgr.sys) WINE_CONFIG_MAKEFILE(dlls/fntcache) diff --git a/dlls/feclient/Makefile.in b/dlls/feclient/Makefile.in new file mode 100644 index 0000000..d3eeefb --- /dev/null +++ b/dlls/feclient/Makefile.in @@ -0,0 +1,4 @@ +MODULE = feclient.dll + +C_SRCS = \ + main.c diff --git a/dlls/feclient/feclient.spec b/dlls/feclient/feclient.spec new file mode 100644 index 0000000..3534610 --- /dev/null +++ b/dlls/feclient/feclient.spec @@ -0,0 +1,50 @@ +@ stub EfsUtilGetCurrentKey +@ stub EdpAllowFileAccessForProcess +@ stub EdpConsumerCredentialCreate +@ stub EdpConsumerCredentialQuery +@ stub EdpContainerizeFile +@ stub EdpCredentialCreate +@ stub EdpCredentialDelete +@ stub EdpCredentialExists +@ stub EdpCredentialQuery +@ stub EdpDecontainerizeFile +@ stub EdpDplPolicyEnabledForUser +@ stub EdpDplStartCredServiceIfDplEnabledForUser +@ stub EdpDplUpgradePinInfo +@ stub EdpDplUpgradeVerifyUser +@ stub EdpDplUserCredentialsSet +@ stub EdpDplUserUnlockComplete +@ stub EdpDplUserUnlockStart +@ stub EdpFree +@ stub EdpGetContainerIdentity +@ stub EdpGetCredServiceState +@ stub EdpIsConsumerDataProtectionEnforced +@ stub EdpIsConsumerDataProtectionSupported +@ stub EdpPurgeAppLearningEvents +@ stub EdpQueryCredServiceInfo +@ stub EdpQueryDplEnforcedPolicyOwnerIds +@ stub EdpQueryRevokedPolicyOwnerIds +@ stub EdpRmsClearKeys +@ stub EdpSetCredServiceInfo +@ stub EdpUnprotectFile +@ stub EdpWriteLogSiteLearningEvents +@ stub EfsClientCloseFileRaw +@ stub EfsClientCopyFileRaw +@ stub EfsClientDecryptFile +@ stub EfsClientDuplicateEncryptionInfo +@ stub EfsClientEncryptFileEx +@ stub EfsClientFileEncryptionStatus +@ stub EfsClientFreeKeyInfo +@ stub EfsClientFreeProtectorList +@ stub EfsClientGetEncryptedFileVersion +@ stub EfsClientGetKeyInfo +@ stub EfsClientOpenFileRaw +@ stub EfsClientQueryProtectors +@ stub EfsClientReadFileRaw +@ stub EfsClientWriteFileRaw +@ stub EfsClientWriteFileWithHeaderRaw +@ stub EfsReprotectFile +@ stub FeClientInitialize +@ stub GetLockSessionUnwrappedKey +@ stub GetLockSessionWrappedKey +@ stub OefsCheckSupport diff --git a/dlls/feclient/main.c b/dlls/feclient/main.c new file mode 100644 index 0000000..91aed70 --- /dev/null +++ b/dlls/feclient/main.c @@ -0,0 +1,45 @@ +/* + * feclient API + * + * Copyright 2016 Michael Müller + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(feclient); + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) +{ + TRACE("(%p, %u, %p)\n", instance, reason, reserved); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + break; + } + + return TRUE; +}

1 0

Hans Leidekker : ws2_32: Enable IP_DONTFRAGMENT by default for SOCK_STREAM sockets.
by Alexandre Julliard 10 May '18

10 May '18

Module: wine Branch: master Commit: 6d6b4bffb3f619ae298669b888775350223e281f URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d6b4bffb3f619ae298669b8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 10 11:30:10 2018 +0200 ws2_32: Enable IP_DONTFRAGMENT by default for SOCK_STREAM sockets. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 9 ++++++-- dlls/ws2_32/tests/sock.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 387ec54..914df17 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -7606,9 +7606,14 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, if (ipxptype > 0) set_ipx_packettype(ret, ipxptype); - /* ensure IP_DONTFRAGMENT is disabled, in Linux the global default can be enabled */ if (unixaf == AF_INET || unixaf == AF_INET6) - set_dont_fragment(ret, unixaf == AF_INET6 ? IPPROTO_IPV6 : IPPROTO_IP, FALSE); + { + /* ensure IP_DONTFRAGMENT is disabled for SOCK_DGRAM and SOCK_RAW, enabled for SOCK_STREAM */ + if (unixtype == SOCK_DGRAM || unixtype == SOCK_RAW) /* in Linux the global default can be enabled */ + set_dont_fragment(ret, unixaf == AF_INET6 ? IPPROTO_IPV6 : IPPROTO_IP, FALSE); + else if (unixtype == SOCK_STREAM) + set_dont_fragment(ret, unixaf == AF_INET6 ? IPPROTO_IPV6 : IPPROTO_IP, TRUE); + } #ifdef IPV6_V6ONLY if (unixaf == AF_INET6) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 05495b4..6dd1491 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1908,6 +1908,59 @@ todo_wine ok(value == 1, "Expected 1, got %d\n", value); closesocket(s); + + s = socket(family, SOCK_STREAM, 0); + if (s == INVALID_SOCKET && i) + { + skip("IPv6 is not supported\n"); + break; + } + ok(s != INVALID_SOCKET, "socket failed with error %d\n", GetLastError()); + + size = sizeof(value); + value = 0xdead; + err = getsockopt(s, level, IP_DONTFRAGMENT, (char *) &value, &size); + ok(!err, "Expected 0, got %d with error %d\n", err, GetLastError()); + ok(value == 1 || broken(value == 0) /* < vista */, "Expected 1, got %d\n", value); + + size = sizeof(value); + value = 0; + err = setsockopt(s, level, IP_DONTFRAGMENT, (char *) &value, size); + ok(!err, "Expected 0, got %d with error %d\n", err, GetLastError()); + + value = 0xdead; + err = getsockopt(s, level, IP_DONTFRAGMENT, (char *) &value, &size); + ok(!err, "Expected 0, got %d with error %d\n", err, GetLastError()); + ok(value == 0, "Expected 0, got %d\n", value); + + closesocket(s); + + s = socket(family, SOCK_RAW, 0); + if (s == INVALID_SOCKET) + { + if (WSAGetLastError() == WSAEACCES) skip("SOCK_RAW is not available\n"); + else if (i) skip("IPv6 is not supported\n"); + break; + } + ok(s != INVALID_SOCKET, "socket failed with error %d\n", GetLastError()); + + size = sizeof(value); + value = 0xdead; + err = getsockopt(s, level, IP_DONTFRAGMENT, (char *) &value, &size); + ok(!err, "Expected 0, got %d with error %d\n", err, GetLastError()); + ok(value == 0, "Expected 0, got %d\n", value); + + size = sizeof(value); + value = 1; + err = setsockopt(s, level, IP_DONTFRAGMENT, (char *) &value, size); + ok(!err, "Expected 0, got %d with error %d\n", err, GetLastError()); + + value = 0xdead; + err = getsockopt(s, level, IP_DONTFRAGMENT, (char *) &value, &size); + ok(!err, "Expected 0, got %d with error %d\n", err, GetLastError()); + ok(value == 1, "Expected 1, got %d\n", value); + + closesocket(s); } }

1 0

Jacek Caban : jscript: Make RegExp object properties non-writable.
by Alexandre Julliard 10 May '18

10 May '18

Module: wine Branch: master Commit: 2538a74c801230941c326f2629ba07962e14fa4b URL: https://source.winehq.org/git/wine.git/?a=commit;h=2538a74c801230941c326f26… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 10 19:20:45 2018 +0200 jscript: Make RegExp object properties non-writable. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/jsregexp.c | 40 ++++++++-------------------------------- dlls/mshtml/tests/es5.js | 4 ++++ 2 files changed, 12 insertions(+), 32 deletions(-) diff --git a/dlls/jscript/jsregexp.c b/dlls/jscript/jsregexp.c index 5798635..821c016 100644 --- a/dlls/jscript/jsregexp.c +++ b/dlls/jscript/jsregexp.c @@ -256,12 +256,6 @@ static HRESULT RegExp_get_source(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t *r return S_OK; } -static HRESULT RegExp_set_source(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t value) -{ - FIXME("\n"); - return E_NOTIMPL; -} - static HRESULT RegExp_get_global(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t *r) { TRACE("\n"); @@ -270,12 +264,6 @@ static HRESULT RegExp_get_global(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t *r return S_OK; } -static HRESULT RegExp_set_global(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t value) -{ - FIXME("\n"); - return E_NOTIMPL; -} - static HRESULT RegExp_get_ignoreCase(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t *r) { TRACE("\n"); @@ -284,12 +272,6 @@ static HRESULT RegExp_get_ignoreCase(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_ return S_OK; } -static HRESULT RegExp_set_ignoreCase(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t value) -{ - FIXME("\n"); - return E_NOTIMPL; -} - static HRESULT RegExp_get_multiline(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t *r) { TRACE("\n"); @@ -298,12 +280,6 @@ static HRESULT RegExp_get_multiline(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t return S_OK; } -static HRESULT RegExp_set_multiline(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t value) -{ - FIXME("\n"); - return E_NOTIMPL; -} - static INT index_from_val(script_ctx_t *ctx, jsval_t v) { double n; @@ -607,11 +583,11 @@ static void RegExp_destructor(jsdisp_t *dispex) static const builtin_prop_t RegExp_props[] = { {execW, RegExp_exec, PROPF_METHOD|1}, - {globalW, NULL,0, RegExp_get_global, RegExp_set_global}, - {ignoreCaseW, NULL,0, RegExp_get_ignoreCase, RegExp_set_ignoreCase}, + {globalW, NULL,0, RegExp_get_global}, + {ignoreCaseW, NULL,0, RegExp_get_ignoreCase}, {lastIndexW, NULL,0, RegExp_get_lastIndex, RegExp_set_lastIndex}, - {multilineW, NULL,0, RegExp_get_multiline, RegExp_set_multiline}, - {sourceW, NULL,0, RegExp_get_source, RegExp_set_source}, + {multilineW, NULL,0, RegExp_get_multiline}, + {sourceW, NULL,0, RegExp_get_source}, {testW, RegExp_test, PROPF_METHOD|1}, {toStringW, RegExp_toString, PROPF_METHOD} }; @@ -626,11 +602,11 @@ static const builtin_info_t RegExp_info = { }; static const builtin_prop_t RegExpInst_props[] = { - {globalW, NULL,0, RegExp_get_global, RegExp_set_global}, - {ignoreCaseW, NULL,0, RegExp_get_ignoreCase, RegExp_set_ignoreCase}, + {globalW, NULL,0, RegExp_get_global}, + {ignoreCaseW, NULL,0, RegExp_get_ignoreCase}, {lastIndexW, NULL,0, RegExp_get_lastIndex, RegExp_set_lastIndex}, - {multilineW, NULL,0, RegExp_get_multiline, RegExp_set_multiline}, - {sourceW, NULL,0, RegExp_get_source, RegExp_set_source} + {multilineW, NULL,0, RegExp_get_multiline}, + {sourceW, NULL,0, RegExp_get_source} }; static const builtin_info_t RegExpInst_info = { diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index 6b84b40..a769a49 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -179,7 +179,11 @@ function test_getOwnPropertyDescriptor() { test_own_data_prop_desc(obj, "arguments", false, false, false); obj = /test/; + test_own_data_prop_desc(obj, "global", false, false, false); + test_own_data_prop_desc(obj, "ignoreCase", false, false, false); test_own_data_prop_desc(obj, "lastIndex", true, false, false); + test_own_data_prop_desc(obj, "multiline", false, false, false); + test_own_data_prop_desc(obj, "source", false, false, false); next_test(); }

1 0

Jacek Caban : jscript: Make Function instance object properties non-writable.
by Alexandre Julliard 10 May '18

10 May '18

Module: wine Branch: master Commit: 7f01473a388529853f1552c15711bdf71c92daa0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f01473a388529853f1552c1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 10 19:20:36 2018 +0200 jscript: Make Function instance object properties non-writable. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/function.c | 14 ++++---------- dlls/mshtml/tests/es5.js | 4 ++++ 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index ac0640f..af0b9a4 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -358,12 +358,6 @@ static HRESULT Function_get_length(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t return S_OK; } -static HRESULT Function_set_length(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t value) -{ - FIXME("\n"); - return E_NOTIMPL; -} - static HRESULT Function_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { @@ -588,9 +582,9 @@ static void Function_destructor(jsdisp_t *dispex) static const builtin_prop_t Function_props[] = { {applyW, Function_apply, PROPF_METHOD|2}, - {argumentsW, NULL, 0, Function_get_arguments, builtin_set_const}, + {argumentsW, NULL, 0, Function_get_arguments}, {callW, Function_call, PROPF_METHOD|1}, - {lengthW, NULL, 0, Function_get_length, Function_set_length}, + {lengthW, NULL, 0, Function_get_length}, {toStringW, Function_toString, PROPF_METHOD} }; @@ -604,8 +598,8 @@ static const builtin_info_t Function_info = { }; static const builtin_prop_t FunctionInst_props[] = { - {argumentsW, NULL, 0, Function_get_arguments, builtin_set_const}, - {lengthW, NULL, 0, Function_get_length, Function_set_length} + {argumentsW, NULL, 0, Function_get_arguments}, + {lengthW, NULL, 0, Function_get_length} }; static const builtin_info_t FunctionInst_info = { diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index 1096307..6b84b40 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -174,6 +174,10 @@ function test_getOwnPropertyDescriptor() { obj = new Array(); test_own_data_prop_desc(obj, "length", true, false, false); + obj = new Function(); + test_own_data_prop_desc(obj, "length", false, false, false); + test_own_data_prop_desc(obj, "arguments", false, false, false); + obj = /test/; test_own_data_prop_desc(obj, "lastIndex", true, false, false);

1 0

Jacek Caban : jscript: Make String.length non-writable.
by Alexandre Julliard 10 May '18

10 May '18

Module: wine Branch: master Commit: a9f8c2c7c189aef11e47dede0260f364d49c65ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9f8c2c7c189aef11e47dede… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 10 19:20:28 2018 +0200 jscript: Make String.length non-writable. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/string.c | 10 ++-------- dlls/jscript/tests/api.js | 6 ++++++ dlls/mshtml/tests/es5.js | 1 + 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index ad978f2..737c878 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -119,12 +119,6 @@ static HRESULT String_get_length(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t *r return S_OK; } -static HRESULT String_set_length(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t value) -{ - FIXME("%p\n", jsthis); - return E_NOTIMPL; -} - static HRESULT stringobj_to_string(vdisp_t *jsthis, jsval_t *r) { StringInstance *string; @@ -1539,7 +1533,7 @@ static const builtin_prop_t String_props[] = { {indexOfW, String_indexOf, PROPF_METHOD|2}, {italicsW, String_italics, PROPF_METHOD}, {lastIndexOfW, String_lastIndexOf, PROPF_METHOD|2}, - {lengthW, NULL,0, String_get_length, String_set_length}, + {lengthW, NULL,0, String_get_length}, {linkW, String_link, PROPF_METHOD|1}, {localeCompareW, String_localeCompare, PROPF_METHOD|1}, {matchW, String_match, PROPF_METHOD|1}, @@ -1571,7 +1565,7 @@ static const builtin_info_t String_info = { }; static const builtin_prop_t StringInst_props[] = { - {lengthW, NULL,0, String_get_length, String_set_length} + {lengthW, NULL,0, String_get_length} }; static const builtin_info_t StringInst_info = { diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index f124c46..f9178a9 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -408,6 +408,12 @@ ok(str.toString() === "", "str.toString() = " + str.toString()); var str = new String("test", "abc"); ok(str.toString() === "test", "str.toString() = " + str.toString()); +str = new String("test"); +ok(str.length === 4, "str.length = " + str.length); +str.length = 3; +str.length = 5; +ok(str.length === 4, "str.length = " + str.length); + var strObj = new Object(); strObj.toString = function() { return "abcd" }; strObj.substr = String.prototype.substr; diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index efdfb0a..1096307 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -166,6 +166,7 @@ function test_getOwnPropertyDescriptor() { test_own_data_prop_desc(Math, "PI", false, false, false); var obj = new String(); + test_own_data_prop_desc(obj, "length", false, false, false); ok(Object.getOwnPropertyDescriptor(obj, "slice") === undefined, "getOwnPropertyDescriptor(slice) did not return undefined"); test_own_data_prop_desc(String.prototype, "slice", true, false, true);

1 0

Jacek Caban : jscript: Use jsdisp_get_own_property in Object.propertyIsEnumerable implementation.
by Alexandre Julliard 10 May '18

10 May '18

Module: wine Branch: master Commit: fc639fa271657bb4db30dbf1a0e2d9e2b6164013 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc639fa271657bb4db30dbf1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 10 19:20:16 2018 +0200 jscript: Use jsdisp_get_own_property in Object.propertyIsEnumerable implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 13 ------------- dlls/jscript/jscript.h | 1 - dlls/jscript/object.c | 8 ++++---- 3 files changed, 4 insertions(+), 18 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 5ec6830..1c9595f 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1589,19 +1589,6 @@ HRESULT disp_delete_name(script_ctx_t *ctx, IDispatch *disp, jsstr_t *name, BOOL return hres; } -HRESULT jsdisp_is_enumerable(jsdisp_t *obj, const WCHAR *name, BOOL *ret) -{ - dispex_prop_t *prop; - HRESULT hres; - - hres = find_prop_name(obj, string_hash(name), name, &prop); - if(FAILED(hres)) - return hres; - - *ret = prop && (prop->flags & PROPF_ENUMERABLE) && prop->type != PROP_PROTREF; - return S_OK; -} - HRESULT jsdisp_get_own_property(jsdisp_t *obj, const WCHAR *name, BOOL flags_only, property_desc_t *desc) { diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 9f2220f..4f2acc5 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -294,7 +294,6 @@ HRESULT disp_delete(IDispatch*,DISPID,BOOL*) DECLSPEC_HIDDEN; HRESULT disp_delete_name(script_ctx_t*,IDispatch*,jsstr_t*,BOOL*) DECLSPEC_HIDDEN; HRESULT jsdisp_delete_idx(jsdisp_t*,DWORD) DECLSPEC_HIDDEN; HRESULT jsdisp_get_own_property(jsdisp_t*,const WCHAR*,BOOL,property_desc_t*) DECLSPEC_HIDDEN; -HRESULT jsdisp_is_enumerable(jsdisp_t*,const WCHAR*,BOOL*) DECLSPEC_HIDDEN; HRESULT create_builtin_function(script_ctx_t*,builtin_invoke_t,const WCHAR*,const builtin_info_t*,DWORD, jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index 56b6e8e..315c846 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -178,9 +178,9 @@ static HRESULT Object_hasOwnProperty(script_ctx_t *ctx, vdisp_t *jsthis, WORD fl static HRESULT Object_propertyIsEnumerable(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { + property_desc_t prop_desc; const WCHAR *name; jsstr_t *name_str; - BOOL ret; HRESULT hres; TRACE("\n"); @@ -199,13 +199,13 @@ static HRESULT Object_propertyIsEnumerable(script_ctx_t *ctx, vdisp_t *jsthis, W if(FAILED(hres)) return hres; - hres = jsdisp_is_enumerable(jsthis->u.jsdisp, name, &ret); + hres = jsdisp_get_own_property(jsthis->u.jsdisp, name, TRUE, &prop_desc); jsstr_release(name_str); - if(FAILED(hres)) + if(FAILED(hres) && hres != DISP_E_UNKNOWNNAME) return hres; if(r) - *r = jsval_bool(ret); + *r = jsval_bool(hres == S_OK && (prop_desc.flags & PROPF_ENUMERABLE) != 0); return S_OK; }

1 0

Jacek Caban : jscript: Use jsdisp_get_own_property in Object.hasOwnProperty implementation.
by Alexandre Julliard 10 May '18

10 May '18

Module: wine Branch: master Commit: f82bc09f28d66b4d9250fd8d918c08176d194f23 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f82bc09f28d66b4d9250fd8d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 10 19:20:06 2018 +0200 jscript: Use jsdisp_get_own_property in Object.hasOwnProperty implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 13 ------------- dlls/jscript/jscript.h | 1 - dlls/jscript/object.c | 17 +++++++++-------- 3 files changed, 9 insertions(+), 22 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 5ba5b70..5ec6830 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1589,19 +1589,6 @@ HRESULT disp_delete_name(script_ctx_t *ctx, IDispatch *disp, jsstr_t *name, BOOL return hres; } -HRESULT jsdisp_is_own_prop(jsdisp_t *obj, const WCHAR *name, BOOL *ret) -{ - dispex_prop_t *prop; - HRESULT hres; - - hres = find_prop_name(obj, string_hash(name), name, &prop); - if(FAILED(hres)) - return hres; - - *ret = prop && (prop->type == PROP_JSVAL || prop->type == PROP_BUILTIN); - return S_OK; -} - HRESULT jsdisp_is_enumerable(jsdisp_t *obj, const WCHAR *name, BOOL *ret) { dispex_prop_t *prop; diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index ab7d634..9f2220f 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -294,7 +294,6 @@ HRESULT disp_delete(IDispatch*,DISPID,BOOL*) DECLSPEC_HIDDEN; HRESULT disp_delete_name(script_ctx_t*,IDispatch*,jsstr_t*,BOOL*) DECLSPEC_HIDDEN; HRESULT jsdisp_delete_idx(jsdisp_t*,DWORD) DECLSPEC_HIDDEN; HRESULT jsdisp_get_own_property(jsdisp_t*,const WCHAR*,BOOL,property_desc_t*) DECLSPEC_HIDDEN; -HRESULT jsdisp_is_own_prop(jsdisp_t*,const WCHAR*,BOOL*) DECLSPEC_HIDDEN; HRESULT jsdisp_is_enumerable(jsdisp_t*,const WCHAR*,BOOL*) DECLSPEC_HIDDEN; HRESULT create_builtin_function(script_ctx_t*,builtin_invoke_t,const WCHAR*,const builtin_info_t*,DWORD, diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index 72365c7..56b6e8e 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -138,20 +138,21 @@ static HRESULT Object_hasOwnProperty(script_ctx_t *ctx, vdisp_t *jsthis, WORD fl return hres; if(is_jsdisp(jsthis)) { + property_desc_t prop_desc; const WCHAR *name_str; - BOOL result; name_str = jsstr_flatten(name); - if(name_str) - hres = jsdisp_is_own_prop(jsthis->u.jsdisp, name_str, &result); - else - hres = E_OUTOFMEMORY; + if(!name_str) { + jsstr_release(name); + return E_OUTOFMEMORY; + } + + hres = jsdisp_get_own_property(jsthis->u.jsdisp, name_str, TRUE, &prop_desc); jsstr_release(name); - if(FAILED(hres)) + if(FAILED(hres) && hres != DISP_E_UNKNOWNNAME) return hres; - if(r) - *r = jsval_bool(result); + if(r) *r = jsval_bool(hres == S_OK); return S_OK; }

1 0

← Newer
1
...
52
53
54
55
56
57
58
...
72
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 May 2018