November 2012 - Wine-commits

Hans Leidekker : advapi32: Export more tracing functions.
by Alexandre Julliard 30 Nov '12

30 Nov '12

Module: wine Branch: master Commit: d008771bd24ed8506c0542e773595dee944b0cc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d008771bd24ed8506c0542e77… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Nov 30 10:43:00 2012 +0100 advapi32: Export more tracing functions. --- dlls/advapi32/advapi32.spec | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 0cb3e15..21357fa 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -351,9 +351,9 @@ @ stub GetSiteSidFromToken # @ stub GetThreadWaitChain @ stdcall GetTokenInformation(long long ptr long ptr) -# @ stub GetTraceEnableFlags -# @ stub GetTraceEnableLevel -# @ stub GetTraceLoggerHandle +@ stub GetTraceEnableFlags +@ stub GetTraceEnableLevel +@ stub GetTraceLoggerHandle @ stdcall GetTrusteeFormA(ptr) @ stdcall GetTrusteeFormW(ptr) @ stdcall GetTrusteeNameA(ptr)

1 0

Charles Davis : ntdll: Add support for nanosecond precision file times on *BSD.
by Alexandre Julliard 30 Nov '12

30 Nov '12

Module: wine Branch: master Commit: ed5e0a6e4127ff0acacef01708d8d9d6ef0d6a34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed5e0a6e4127ff0acacef0170… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Thu Nov 29 21:50:45 2012 -0700 ntdll: Add support for nanosecond precision file times on *BSD. --- configure | 27 +++++++++++++++++++++++++++ configure.ac | 2 +- dlls/ntdll/file.c | 10 ++++++++++ include/config.h.in | 9 +++++++++ 4 files changed, 47 insertions(+), 1 deletions(-) diff --git a/configure b/configure index b437a78..638ddfb 100755 --- a/configure +++ b/configure @@ -14132,6 +14132,15 @@ _ACEOF fi +ac_fn_c_check_member "$LINENO" "struct stat" "st_mtimespec" "ac_cv_member_struct_stat_st_mtimespec" "$ac_includes_default" +if test "x$ac_cv_member_struct_stat_st_mtimespec" = xyes; then : + +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_STAT_ST_MTIMESPEC 1 +_ACEOF + + +fi ac_fn_c_check_member "$LINENO" "struct stat" "st_ctim" "ac_cv_member_struct_stat_st_ctim" "$ac_includes_default" if test "x$ac_cv_member_struct_stat_st_ctim" = xyes; then : @@ -14141,6 +14150,15 @@ _ACEOF fi +ac_fn_c_check_member "$LINENO" "struct stat" "st_ctimespec" "ac_cv_member_struct_stat_st_ctimespec" "$ac_includes_default" +if test "x$ac_cv_member_struct_stat_st_ctimespec" = xyes; then : + +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_STAT_ST_CTIMESPEC 1 +_ACEOF + + +fi ac_fn_c_check_member "$LINENO" "struct stat" "st_atim" "ac_cv_member_struct_stat_st_atim" "$ac_includes_default" if test "x$ac_cv_member_struct_stat_st_atim" = xyes; then : @@ -14150,6 +14168,15 @@ _ACEOF fi +ac_fn_c_check_member "$LINENO" "struct stat" "st_atimespec" "ac_cv_member_struct_stat_st_atimespec" "$ac_includes_default" +if test "x$ac_cv_member_struct_stat_st_atimespec" = xyes; then : + +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_STAT_ST_ATIMESPEC 1 +_ACEOF + + +fi ac_fn_c_check_member "$LINENO" "struct sockaddr_in6" "sin6_scope_id" "ac_cv_member_struct_sockaddr_in6_sin6_scope_id" "#ifdef HAVE_SYS_TYPES_H diff --git a/configure.ac b/configure.ac index 8e6a70f..5d2b4f4 100644 --- a/configure.ac +++ b/configure.ac @@ -2269,7 +2269,7 @@ AC_CHECK_MEMBERS([struct option.name],,, #endif]) dnl Check for stat.st_blocks and ns-resolved times -AC_CHECK_MEMBERS([struct stat.st_blocks,struct stat.st_mtim,struct stat.st_ctim,struct stat.st_atim]) +AC_CHECK_MEMBERS([struct stat.st_blocks,struct stat.st_mtim,struct stat.st_mtimespec,struct stat.st_ctim,struct stat.st_ctimespec,struct stat.st_atim,struct stat.st_atimespec]) dnl Check for sin6_scope_id AC_CHECK_MEMBERS([struct sockaddr_in6.sin6_scope_id],,, diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index da5be8e..ccf5933 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1594,9 +1594,13 @@ static NTSTATUS set_file_times( int fd, const LARGE_INTEGER *mtime, const LARGE_ tv[1].tv_sec = st.st_mtime; #ifdef HAVE_STRUCT_STAT_ST_ATIM tv[0].tv_usec = st.st_atim.tv_nsec / 1000; +#elif defined(HAVE_STRUCT_STAT_ST_ATIMESPEC) + tv[0].tv_usec = st.st_atimespec.tv_nsec / 1000; #endif #ifdef HAVE_STRUCT_STAT_ST_MTIM tv[1].tv_usec = st.st_mtim.tv_nsec / 1000; +#elif defined(HAVE_STRUCT_STAT_ST_MTIMESPEC) + tv[1].tv_usec = st.st_mtimespec.tv_nsec / 1000; #endif } } @@ -1631,12 +1635,18 @@ static inline void get_file_times( const struct stat *st, LARGE_INTEGER *mtime, RtlSecondsSince1970ToTime( st->st_atime, atime ); #ifdef HAVE_STRUCT_STAT_ST_MTIM mtime->QuadPart += st->st_mtim.tv_nsec / 100; +#elif defined(HAVE_STRUCT_STAT_ST_MTIMESPEC) + mtime->QuadPart += st->st_mtimespec.tv_nsec / 100; #endif #ifdef HAVE_STRUCT_STAT_ST_CTIM ctime->QuadPart += st->st_ctim.tv_nsec / 100; +#elif defined(HAVE_STRUCT_STAT_ST_CTIMESPEC) + ctime->QuadPart += st->st_ctimespec.tv_nsec / 100; #endif #ifdef HAVE_STRUCT_STAT_ST_ATIM atime->QuadPart += st->st_atim.tv_nsec / 100; +#elif defined(HAVE_STRUCT_STAT_ST_ATIMESPEC) + atime->QuadPart += st->st_atimespec.tv_nsec / 100; #endif *creation = *mtime; } diff --git a/include/config.h.in b/include/config.h.in index 4b3a5d2..f22c5eb 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -857,15 +857,24 @@ /* Define to 1 if `st_atim' is a member of `struct stat'. */ #undef HAVE_STRUCT_STAT_ST_ATIM +/* Define to 1 if `st_atimespec' is a member of `struct stat'. */ +#undef HAVE_STRUCT_STAT_ST_ATIMESPEC + /* Define to 1 if `st_blocks' is a member of `struct stat'. */ #undef HAVE_STRUCT_STAT_ST_BLOCKS /* Define to 1 if `st_ctim' is a member of `struct stat'. */ #undef HAVE_STRUCT_STAT_ST_CTIM +/* Define to 1 if `st_ctimespec' is a member of `struct stat'. */ +#undef HAVE_STRUCT_STAT_ST_CTIMESPEC + /* Define to 1 if `st_mtim' is a member of `struct stat'. */ #undef HAVE_STRUCT_STAT_ST_MTIM +/* Define to 1 if `st_mtimespec' is a member of `struct stat'. */ +#undef HAVE_STRUCT_STAT_ST_MTIMESPEC + /* Define to 1 if `tcps_connattempt' is a member of `struct tcpstat'. */ #undef HAVE_STRUCT_TCPSTAT_TCPS_CONNATTEMPT

1 0

Charles Davis : ntdll: Add support for BSD-style creation ("birth") time.
by Alexandre Julliard 30 Nov '12

30 Nov '12

Module: wine Branch: master Commit: 5da1eaf2131f29264b734bdf4cde072115b0762f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5da1eaf2131f29264b734bdf4… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Thu Nov 29 21:50:46 2012 -0700 ntdll: Add support for BSD-style creation ("birth") time. --- configure | 45 +++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 14 +++++++++++++- dlls/ntdll/file.c | 14 ++++++++++++++ include/config.h.in | 15 +++++++++++++++ 4 files changed, 87 insertions(+), 1 deletions(-) diff --git a/configure b/configure index 638ddfb..bf5c81c 100755 --- a/configure +++ b/configure @@ -14177,6 +14177,51 @@ _ACEOF fi +ac_fn_c_check_member "$LINENO" "struct stat" "st_birthtime" "ac_cv_member_struct_stat_st_birthtime" "$ac_includes_default" +if test "x$ac_cv_member_struct_stat_st_birthtime" = xyes; then : + +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_STAT_ST_BIRTHTIME 1 +_ACEOF + + +fi +ac_fn_c_check_member "$LINENO" "struct stat" "st_birthtim" "ac_cv_member_struct_stat_st_birthtim" "$ac_includes_default" +if test "x$ac_cv_member_struct_stat_st_birthtim" = xyes; then : + +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_STAT_ST_BIRTHTIM 1 +_ACEOF + + +fi +ac_fn_c_check_member "$LINENO" "struct stat" "st_birthtimespec" "ac_cv_member_struct_stat_st_birthtimespec" "$ac_includes_default" +if test "x$ac_cv_member_struct_stat_st_birthtimespec" = xyes; then : + +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC 1 +_ACEOF + + +fi +ac_fn_c_check_member "$LINENO" "struct stat" "__st_birthtime" "ac_cv_member_struct_stat___st_birthtime" "$ac_includes_default" +if test "x$ac_cv_member_struct_stat___st_birthtime" = xyes; then : + +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_STAT___ST_BIRTHTIME 1 +_ACEOF + + +fi +ac_fn_c_check_member "$LINENO" "struct stat" "__st_birthtim" "ac_cv_member_struct_stat___st_birthtim" "$ac_includes_default" +if test "x$ac_cv_member_struct_stat___st_birthtim" = xyes; then : + +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_STAT___ST_BIRTHTIM 1 +_ACEOF + + +fi ac_fn_c_check_member "$LINENO" "struct sockaddr_in6" "sin6_scope_id" "ac_cv_member_struct_sockaddr_in6_sin6_scope_id" "#ifdef HAVE_SYS_TYPES_H diff --git a/configure.ac b/configure.ac index 5d2b4f4..2f1032b 100644 --- a/configure.ac +++ b/configure.ac @@ -2269,7 +2269,19 @@ AC_CHECK_MEMBERS([struct option.name],,, #endif]) dnl Check for stat.st_blocks and ns-resolved times -AC_CHECK_MEMBERS([struct stat.st_blocks,struct stat.st_mtim,struct stat.st_mtimespec,struct stat.st_ctim,struct stat.st_ctimespec,struct stat.st_atim,struct stat.st_atimespec]) +AC_CHECK_MEMBERS([ + struct stat.st_blocks, + struct stat.st_mtim, + struct stat.st_mtimespec, + struct stat.st_ctim, + struct stat.st_ctimespec, + struct stat.st_atim, + struct stat.st_atimespec, + struct stat.st_birthtime, + struct stat.st_birthtim, + struct stat.st_birthtimespec, + struct stat.__st_birthtime, + struct stat.__st_birthtim]) dnl Check for sin6_scope_id AC_CHECK_MEMBERS([struct sockaddr_in6.sin6_scope_id],,, diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index ccf5933..93695f0 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1648,7 +1648,21 @@ static inline void get_file_times( const struct stat *st, LARGE_INTEGER *mtime, #elif defined(HAVE_STRUCT_STAT_ST_ATIMESPEC) atime->QuadPart += st->st_atimespec.tv_nsec / 100; #endif +#ifdef HAVE_STRUCT_STAT_ST_BIRTHTIME + RtlSecondsSince1970ToTime( st->st_birthtime, creation ); +#ifdef HAVE_STRUCT_STAT_ST_BIRTHTIM + creation->QuadPart += st->st_birthtim.tv_nsec / 100; +#elif defined(HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC) + creation->QuadPart += st->st_birthtimespec.tv_nsec / 100; +#endif +#elif defined(HAVE_STRUCT_STAT___ST_BIRTHTIME) + RtlSecondsSince1970ToTime( st->__st_birthtime, creation ); +#ifdef HAVE_STRUCT_STAT___ST_BIRTHTIM + creation->QuadPart += st->__st_birthtim.tv_nsec / 100; +#endif +#else *creation = *mtime; +#endif } /* fill in the file information that depends on the stat info */ diff --git a/include/config.h.in b/include/config.h.in index f22c5eb..0081c25 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -860,6 +860,15 @@ /* Define to 1 if `st_atimespec' is a member of `struct stat'. */ #undef HAVE_STRUCT_STAT_ST_ATIMESPEC +/* Define to 1 if `st_birthtim' is a member of `struct stat'. */ +#undef HAVE_STRUCT_STAT_ST_BIRTHTIM + +/* Define to 1 if `st_birthtime' is a member of `struct stat'. */ +#undef HAVE_STRUCT_STAT_ST_BIRTHTIME + +/* Define to 1 if `st_birthtimespec' is a member of `struct stat'. */ +#undef HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC + /* Define to 1 if `st_blocks' is a member of `struct stat'. */ #undef HAVE_STRUCT_STAT_ST_BLOCKS @@ -875,6 +884,12 @@ /* Define to 1 if `st_mtimespec' is a member of `struct stat'. */ #undef HAVE_STRUCT_STAT_ST_MTIMESPEC +/* Define to 1 if `__st_birthtim' is a member of `struct stat'. */ +#undef HAVE_STRUCT_STAT___ST_BIRTHTIM + +/* Define to 1 if `__st_birthtime' is a member of `struct stat'. */ +#undef HAVE_STRUCT_STAT___ST_BIRTHTIME + /* Define to 1 if `tcps_connattempt' is a member of `struct tcpstat'. */ #undef HAVE_STRUCT_TCPSTAT_TCPS_CONNATTEMPT

1 0

Jacek Caban : hhctrl.ocx: Added import library.
by Alexandre Julliard 30 Nov '12

30 Nov '12

Module: wine Branch: master Commit: 4821b06ed11cbd3e7648c81e884cde4a8abc89d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4821b06ed11cbd3e7648c81e8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 30 11:12:39 2012 +0100 hhctrl.ocx: Added import library. --- .gitignore | 1 + configure | 2 +- configure.ac | 2 +- dlls/hhctrl.ocx/Makefile.in | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index dde97a4..036a810 100644 --- a/.gitignore +++ b/.gitignore @@ -64,6 +64,7 @@ dlls/jscript/parser.tab.c dlls/jscript/parser.tab.h dlls/libd3dcompiler.def dlls/libd3dx9.def +dlls/libhtmlhelp.def dlls/libkernel.def dlls/libwinspool.def dlls/libxinput.def diff --git a/configure b/configure index bf5c81c..61f3f9a 100755 --- a/configure +++ b/configure @@ -15497,7 +15497,7 @@ wine_fn_config_dll glu32 enable_glu32 implib wine_fn_config_dll gphoto2.ds enable_gphoto2_ds po wine_fn_config_dll gpkcsp enable_gpkcsp wine_fn_config_dll hal enable_hal -wine_fn_config_dll hhctrl.ocx enable_hhctrl_ocx po +wine_fn_config_dll hhctrl.ocx enable_hhctrl_ocx implib,po htmlhelp wine_fn_config_dll hid enable_hid implib wine_fn_config_dll hlink enable_hlink implib wine_fn_config_test dlls/hlink/tests hlink_test diff --git a/configure.ac b/configure.ac index 2f1032b..c8a5e0d 100644 --- a/configure.ac +++ b/configure.ac @@ -2703,7 +2703,7 @@ WINE_CONFIG_DLL(glu32,,[implib]) WINE_CONFIG_DLL(gphoto2.ds,,[po]) WINE_CONFIG_DLL(gpkcsp) WINE_CONFIG_DLL(hal) -WINE_CONFIG_DLL(hhctrl.ocx,,[po]) +WINE_CONFIG_DLL(hhctrl.ocx,,[implib,po],[htmlhelp]) WINE_CONFIG_DLL(hid,,[implib]) WINE_CONFIG_DLL(hlink,,[implib]) WINE_CONFIG_TEST(dlls/hlink/tests) diff --git a/dlls/hhctrl.ocx/Makefile.in b/dlls/hhctrl.ocx/Makefile.in index 289cc39..4545bde 100644 --- a/dlls/hhctrl.ocx/Makefile.in +++ b/dlls/hhctrl.ocx/Makefile.in @@ -1,4 +1,5 @@ MODULE = hhctrl.ocx +IMPORTLIB = htmlhelp IMPORTS = uuid advapi32 comctl32 shlwapi ole32 oleaut32 user32 gdi32 C_SRCS = \

1 0

Jacek Caban : jscript: Alias arguments properties to real values.
by Alexandre Julliard 30 Nov '12

30 Nov '12

Module: wine Branch: master Commit: 6b56c65f8db8dc733e356def032200f5a361ce23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b56c65f8db8dc733e356def0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 30 13:01:51 2012 +0100 jscript: Alias arguments properties to real values. --- dlls/jscript/dispex.c | 35 ++++++++++++++-- dlls/jscript/function.c | 98 ++++++++++++++++++++++++++++++++----------- dlls/jscript/jscript.h | 3 + dlls/jscript/tests/lang.js | 9 ++++ 4 files changed, 116 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6b56c65f8db8dc733e356…

1 0

Jacek Caban : jscript: Added disp_delete helper and use it in interp_delete_ident.
by Alexandre Julliard 30 Nov '12

30 Nov '12

Module: wine Branch: master Commit: e6fc8d9b0cb2f845cb011b0a081898633bb66237 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6fc8d9b0cb2f845cb011b0a0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 30 13:02:05 2012 +0100 jscript: Added disp_delete helper and use it in interp_delete_ident. --- dlls/jscript/dispex.c | 36 ++++++++++++++++++++++++++++++++++++ dlls/jscript/engine.c | 15 ++++----------- dlls/jscript/jscript.h | 1 + 3 files changed, 41 insertions(+), 11 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 640e954..d7ff77d 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1462,6 +1462,42 @@ HRESULT jsdisp_delete_idx(jsdisp_t *obj, DWORD idx) return delete_prop(prop); } +HRESULT disp_delete(IDispatch *disp, DISPID id, BOOL *ret) +{ + IDispatchEx *dispex; + jsdisp_t *jsdisp; + HRESULT hres; + + jsdisp = iface_to_jsdisp((IUnknown*)disp); + if(jsdisp) { + dispex_prop_t *prop; + + *ret = TRUE; + prop = get_prop(jsdisp, id); + if(prop) + hres = delete_prop(prop); + else + hres = DISP_E_MEMBERNOTFOUND; + + jsdisp_release(jsdisp); + return hres; + } + + hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); + if(FAILED(hres)) { + *ret = FALSE; + return S_OK; + } + + hres = IDispatchEx_DeleteMemberByDispID(dispex, id); + IDispatchEx_Release(dispex); + if(FAILED(hres)) + return hres; + + *ret = TRUE; + return S_OK; +} + HRESULT jsdisp_is_own_prop(jsdisp_t *obj, const WCHAR *name, BOOL *ret) { dispex_prop_t *prop; diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index f4dcc0f..20791bf 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1648,9 +1648,8 @@ static HRESULT interp_delete(exec_ctx_t *ctx) static HRESULT interp_delete_ident(exec_ctx_t *ctx) { const BSTR arg = get_op_bstr(ctx, 0); - IDispatchEx *dispex; exprval_t exprval; - BOOL ret = FALSE; + BOOL ret; HRESULT hres; TRACE("%s\n", debugstr_w(arg)); @@ -1665,16 +1664,10 @@ static HRESULT interp_delete_ident(exec_ctx_t *ctx) return E_NOTIMPL; } - hres = IDispatch_QueryInterface(exprval.u.idref.disp, &IID_IDispatchEx, (void**)&dispex); + hres = disp_delete(exprval.u.idref.disp, exprval.u.idref.id, &ret); IDispatch_Release(exprval.u.idref.disp); - if(SUCCEEDED(hres)) { - hres = IDispatchEx_DeleteMemberByDispID(dispex, exprval.u.idref.id); - IDispatchEx_Release(dispex); - if(FAILED(hres)) - return hres; - - ret = TRUE; - } + if(FAILED(hres)) + return ret; return stack_push(ctx, jsval_bool(ret)); } diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 1c84823..147cc1a 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -275,6 +275,7 @@ HRESULT jsdisp_propput_idx(jsdisp_t*,DWORD,jsval_t) DECLSPEC_HIDDEN; HRESULT jsdisp_propget_name(jsdisp_t*,LPCWSTR,jsval_t*) DECLSPEC_HIDDEN; HRESULT jsdisp_get_idx(jsdisp_t*,DWORD,jsval_t*) DECLSPEC_HIDDEN; HRESULT jsdisp_get_id(jsdisp_t*,const WCHAR*,DWORD,DISPID*) DECLSPEC_HIDDEN; +HRESULT disp_delete(IDispatch*,DISPID,BOOL*) DECLSPEC_HIDDEN; HRESULT jsdisp_delete_idx(jsdisp_t*,DWORD) DECLSPEC_HIDDEN; HRESULT jsdisp_is_own_prop(jsdisp_t*,const WCHAR*,BOOL*) DECLSPEC_HIDDEN; HRESULT jsdisp_is_enumerable(jsdisp_t*,const WCHAR*,BOOL*) DECLSPEC_HIDDEN;

1 0

Jacek Caban : jscript: Added disp_delete_name helper and use it in interp_delete.
by Alexandre Julliard 30 Nov '12

30 Nov '12

Module: wine Branch: master Commit: 466fae6444f26b77c76ddde1fa1c807fe271fb17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=466fae6444f26b77c76ddde1f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 30 13:02:19 2012 +0100 jscript: Added disp_delete_name helper and use it in interp_delete. --- dlls/jscript/dispex.c | 43 +++++++++++++++++++++++++++++++++++++++++++ dlls/jscript/engine.c | 21 +-------------------- dlls/jscript/jscript.h | 1 + 3 files changed, 45 insertions(+), 20 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index d7ff77d..1b7ae50 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1498,6 +1498,49 @@ HRESULT disp_delete(IDispatch *disp, DISPID id, BOOL *ret) return S_OK; } +HRESULT disp_delete_name(script_ctx_t *ctx, IDispatch *disp, jsstr_t *name, BOOL *ret) +{ + IDispatchEx *dispex; + jsdisp_t *jsdisp; + HRESULT hres; + + jsdisp = iface_to_jsdisp((IUnknown*)disp); + if(jsdisp) { + dispex_prop_t *prop; + + *ret = TRUE; + hres = find_prop_name(jsdisp, string_hash(name->str), name->str, &prop); + if(prop) + hres = delete_prop(prop); + else + hres = DISP_E_MEMBERNOTFOUND; + + jsdisp_release(jsdisp); + return hres; + } + + hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); + if(SUCCEEDED(hres)) { + BSTR bstr; + + bstr = SysAllocStringLen(name->str, jsstr_length(name)); + if(bstr) { + hres = IDispatchEx_DeleteMemberByName(dispex, bstr, make_grfdex(ctx, fdexNameCaseSensitive)); + SysFreeString(bstr); + *ret = TRUE; + }else { + hres = E_OUTOFMEMORY; + } + + IDispatchEx_Release(dispex); + }else { + hres = S_OK; + ret = FALSE; + } + + return hres; +} + HRESULT jsdisp_is_own_prop(jsdisp_t *obj, const WCHAR *name, BOOL *ret) { dispex_prop_t *prop; diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 20791bf..3fedea1 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1592,7 +1592,6 @@ static HRESULT interp_mod(exec_ctx_t *ctx) static HRESULT interp_delete(exec_ctx_t *ctx) { jsval_t objv, namev; - IDispatchEx *dispex; IDispatch *obj; jsstr_t *name; BOOL ret; @@ -1617,25 +1616,7 @@ static HRESULT interp_delete(exec_ctx_t *ctx) return hres; } - hres = IDispatch_QueryInterface(obj, &IID_IDispatchEx, (void**)&dispex); - if(SUCCEEDED(hres)) { - BSTR bstr; - - bstr = SysAllocStringLen(name->str, jsstr_length(name)); - if(bstr) { - hres = IDispatchEx_DeleteMemberByName(dispex, bstr, make_grfdex(ctx->script, fdexNameCaseSensitive)); - SysFreeString(bstr); - ret = TRUE; - }else { - hres = E_OUTOFMEMORY; - } - - IDispatchEx_Release(dispex); - }else { - hres = S_OK; - ret = FALSE; - } - + hres = disp_delete_name(ctx->script, obj, name, &ret); IDispatch_Release(obj); jsstr_release(name); if(FAILED(hres)) diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 147cc1a..69ac417 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -276,6 +276,7 @@ HRESULT jsdisp_propget_name(jsdisp_t*,LPCWSTR,jsval_t*) DECLSPEC_HIDDEN; HRESULT jsdisp_get_idx(jsdisp_t*,DWORD,jsval_t*) DECLSPEC_HIDDEN; HRESULT jsdisp_get_id(jsdisp_t*,const WCHAR*,DWORD,DISPID*) DECLSPEC_HIDDEN; HRESULT disp_delete(IDispatch*,DISPID,BOOL*) DECLSPEC_HIDDEN; +HRESULT disp_delete_name(script_ctx_t*,IDispatch*,jsstr_t*,BOOL*); HRESULT jsdisp_delete_idx(jsdisp_t*,DWORD) DECLSPEC_HIDDEN; HRESULT jsdisp_is_own_prop(jsdisp_t*,const WCHAR*,BOOL*) DECLSPEC_HIDDEN; HRESULT jsdisp_is_enumerable(jsdisp_t*,const WCHAR*,BOOL*) DECLSPEC_HIDDEN;

1 0

Jacek Caban : jscript: Added support for DontDelete attribute and use it for arguments object.
by Alexandre Julliard 30 Nov '12

30 Nov '12

Module: wine Branch: master Commit: d9d8c8b71604b7edbd805c21af308ae4546f27d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9d8c8b71604b7edbd805c21a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 30 13:02:32 2012 +0100 jscript: Added support for DontDelete attribute and use it for arguments object. --- dlls/jscript/dispex.c | 42 ++++++++++++++++++++++++------------------ dlls/jscript/function.c | 2 +- dlls/jscript/jscript.h | 12 +++++++----- dlls/jscript/tests/lang.js | 4 ++++ 4 files changed, 36 insertions(+), 24 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 1b7ae50..2cd4ad5 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -740,8 +740,15 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc return hres; } -static HRESULT delete_prop(dispex_prop_t *prop) +static HRESULT delete_prop(dispex_prop_t *prop, BOOL *ret) { + if(prop->flags & PROPF_DONTDELETE) { + *ret = FALSE; + return S_OK; + } + + *ret = TRUE; /* FIXME: not exactly right */ + if(prop->type == PROP_JSVAL) { jsval_release(prop->u.val); prop->type = PROP_DELETED; @@ -753,6 +760,7 @@ static HRESULT WINAPI DispatchEx_DeleteMemberByName(IDispatchEx *iface, BSTR bst { jsdisp_t *This = impl_from_IDispatchEx(iface); dispex_prop_t *prop; + BOOL b; HRESULT hres; TRACE("(%p)->(%s %x)\n", This, debugstr_w(bstrName), grfdex); @@ -768,13 +776,14 @@ static HRESULT WINAPI DispatchEx_DeleteMemberByName(IDispatchEx *iface, BSTR bst return S_OK; } - return delete_prop(prop); + return delete_prop(prop, &b); } static HRESULT WINAPI DispatchEx_DeleteMemberByDispID(IDispatchEx *iface, DISPID id) { jsdisp_t *This = impl_from_IDispatchEx(iface); dispex_prop_t *prop; + BOOL b; TRACE("(%p)->(%x)\n", This, id); @@ -784,7 +793,7 @@ static HRESULT WINAPI DispatchEx_DeleteMemberByDispID(IDispatchEx *iface, DISPID return DISP_E_MEMBERNOTFOUND; } - return delete_prop(prop); + return delete_prop(prop, &b); } static HRESULT WINAPI DispatchEx_GetMemberProperties(IDispatchEx *iface, DISPID id, DWORD grfdexFetch, DWORD *pgrfdex) @@ -1266,18 +1275,23 @@ HRESULT disp_call_value(script_ctx_t *ctx, IDispatch *disp, IDispatch *jsthis, W return hres; } -HRESULT jsdisp_propput_name(jsdisp_t *obj, const WCHAR *name, jsval_t val) +HRESULT jsdisp_propput(jsdisp_t *obj, const WCHAR *name, DWORD flags, jsval_t val) { dispex_prop_t *prop; HRESULT hres; - hres = ensure_prop_name(obj, name, FALSE, PROPF_ENUM, &prop); + hres = ensure_prop_name(obj, name, FALSE, flags, &prop); if(FAILED(hres)) return hres; return prop_put(obj, prop, val, NULL); } +HRESULT jsdisp_propput_name(jsdisp_t *obj, const WCHAR *name, jsval_t val) +{ + return jsdisp_propput(obj, name, PROPF_ENUM, val); +} + HRESULT jsdisp_propput_const(jsdisp_t *obj, const WCHAR *name, jsval_t val) { dispex_prop_t *prop; @@ -1292,14 +1306,7 @@ HRESULT jsdisp_propput_const(jsdisp_t *obj, const WCHAR *name, jsval_t val) HRESULT jsdisp_propput_dontenum(jsdisp_t *obj, const WCHAR *name, jsval_t val) { - dispex_prop_t *prop; - HRESULT hres; - - hres = ensure_prop_name(obj, name, FALSE, 0, &prop); - if(FAILED(hres)) - return hres; - - return prop_put(obj, prop, val, NULL); + return jsdisp_propput(obj, name, 0, val); } HRESULT jsdisp_propput_idx(jsdisp_t *obj, DWORD idx, jsval_t val) @@ -1451,6 +1458,7 @@ HRESULT jsdisp_delete_idx(jsdisp_t *obj, DWORD idx) static const WCHAR formatW[] = {'%','d',0}; WCHAR buf[12]; dispex_prop_t *prop; + BOOL b; HRESULT hres; sprintfW(buf, formatW, idx); @@ -1459,7 +1467,7 @@ HRESULT jsdisp_delete_idx(jsdisp_t *obj, DWORD idx) if(FAILED(hres) || !prop) return hres; - return delete_prop(prop); + return delete_prop(prop, &b); } HRESULT disp_delete(IDispatch *disp, DISPID id, BOOL *ret) @@ -1472,10 +1480,9 @@ HRESULT disp_delete(IDispatch *disp, DISPID id, BOOL *ret) if(jsdisp) { dispex_prop_t *prop; - *ret = TRUE; prop = get_prop(jsdisp, id); if(prop) - hres = delete_prop(prop); + hres = delete_prop(prop, ret); else hres = DISP_E_MEMBERNOTFOUND; @@ -1508,10 +1515,9 @@ HRESULT disp_delete_name(script_ctx_t *ctx, IDispatch *disp, jsstr_t *name, BOOL if(jsdisp) { dispex_prop_t *prop; - *ret = TRUE; hres = find_prop_name(jsdisp, string_hash(name->str), name->str, &prop); if(prop) - hres = delete_prop(prop); + hres = delete_prop(prop, ret); else hres = DISP_E_MEMBERNOTFOUND; diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 329bec2..5c7f9b5 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -220,7 +220,7 @@ static HRESULT invoke_source(script_ctx_t *ctx, FunctionInstance *function, IDis return hres; } - hres = jsdisp_propput_name(var_disp, argumentsW, jsval_obj(arg_disp)); + hres = jsdisp_propput(var_disp, argumentsW, PROPF_DONTDELETE, jsval_obj(arg_disp)); if(SUCCEEDED(hres)) { hres = scope_push(function->scope_chain, var_disp, to_disp(var_disp), &scope); if(SUCCEEDED(hres)) { diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 69ac417..5bffc21 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -95,11 +95,12 @@ typedef struct jsdisp_t jsdisp_t; extern HINSTANCE jscript_hinstance DECLSPEC_HIDDEN; -#define PROPF_ARGMASK 0x00ff -#define PROPF_METHOD 0x0100 -#define PROPF_ENUM 0x0200 -#define PROPF_CONSTR 0x0400 -#define PROPF_CONST 0x0800 +#define PROPF_ARGMASK 0x00ff +#define PROPF_METHOD 0x0100 +#define PROPF_ENUM 0x0200 +#define PROPF_CONSTR 0x0400 +#define PROPF_CONST 0x0800 +#define PROPF_DONTDELETE 0x1000 /* NOTE: Keep in sync with names in Object.toString implementation */ typedef enum { @@ -268,6 +269,7 @@ HRESULT jsdisp_call_name(jsdisp_t*,const WCHAR*,WORD,unsigned,jsval_t*,jsval_t*) HRESULT disp_propget(script_ctx_t*,IDispatch*,DISPID,jsval_t*) DECLSPEC_HIDDEN; HRESULT disp_propput(script_ctx_t*,IDispatch*,DISPID,jsval_t) DECLSPEC_HIDDEN; HRESULT jsdisp_propget(jsdisp_t*,DISPID,jsval_t*) DECLSPEC_HIDDEN; +HRESULT jsdisp_propput(jsdisp_t*,const WCHAR*,DWORD,jsval_t) DECLSPEC_HIDDEN; HRESULT jsdisp_propput_name(jsdisp_t*,const WCHAR*,jsval_t) DECLSPEC_HIDDEN; HRESULT jsdisp_propput_const(jsdisp_t*,const WCHAR*,jsval_t) DECLSPEC_HIDDEN; HRESULT jsdisp_propput_dontenum(jsdisp_t*,const WCHAR*,jsval_t) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index fa3d6d2..92292a4 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -86,6 +86,10 @@ function testFunc1(x, y) { ok(this === test, "this !== test"); eval('ok(this === test, "this !== test");'); + tmp = delete arguments; + ok(tmp === false, "arguments deleted"); + ok(typeof(arguments) === "object", "typeof(arguments) = " + typeof(arguments)); + return true; }

1 0

Jacek Caban : jscript: Cut arguments circular reference after returning from the function.
by Alexandre Julliard 30 Nov '12

30 Nov '12

Module: wine Branch: master Commit: 956cb343b28a9d28883a89826c08e867576836a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=956cb343b28a9d28883a89826… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 30 13:02:50 2012 +0100 jscript: Cut arguments circular reference after returning from the function. --- dlls/jscript/function.c | 34 ++++++++++++++++++++++------------ 1 files changed, 22 insertions(+), 12 deletions(-) diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 5c7f9b5..b058460 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -221,25 +221,35 @@ static HRESULT invoke_source(script_ctx_t *ctx, FunctionInstance *function, IDis } hres = jsdisp_propput(var_disp, argumentsW, PROPF_DONTDELETE, jsval_obj(arg_disp)); + if(FAILED(hres)) { + jsdisp_release(arg_disp); + jsdisp_release(var_disp); + return hres; + } + + hres = scope_push(function->scope_chain, var_disp, to_disp(var_disp), &scope); if(SUCCEEDED(hres)) { - hres = scope_push(function->scope_chain, var_disp, to_disp(var_disp), &scope); + hres = create_exec_ctx(ctx, this_obj, var_disp, scope, FALSE, &exec_ctx); + scope_release(scope); + if(SUCCEEDED(hres)) { - hres = create_exec_ctx(ctx, this_obj, var_disp, scope, FALSE, &exec_ctx); - scope_release(scope); + jsdisp_t *prev_args; + + prev_args = function->arguments; + function->arguments = arg_disp; + hres = exec_source(exec_ctx, function->code, function->func_code, FALSE, r); + function->arguments = prev_args; + + exec_release(exec_ctx); } } - jsdisp_release(var_disp); - if(SUCCEEDED(hres)) { - jsdisp_t *prev_args; - prev_args = function->arguments; - function->arguments = arg_disp; - hres = exec_source(exec_ctx, function->code, function->func_code, FALSE, r); - function->arguments = prev_args; - } + /* Reset arguments value to cut the reference cycle. Note that since all activation contexts have + * their own arguments property, it's impossible to use prototype's one during name lookup */ + jsdisp_propput_name(var_disp, argumentsW, jsval_undefined()); jsdisp_release(arg_disp); - exec_release(exec_ctx); + jsdisp_release(var_disp); return hres; }

1 0

Jacek Caban : jscript: Added support for indexed string access.
by Alexandre Julliard 30 Nov '12

30 Nov '12

Module: wine Branch: master Commit: 0e5933f70a5f8ab127cce5ac6cbc4b23ebd84af8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e5933f70a5f8ab127cce5ac6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 30 13:03:07 2012 +0100 jscript: Added support for indexed string access. --- dlls/jscript/string.c | 33 ++++++++++++++++++++++++++++++++- dlls/jscript/tests/api.js | 3 +++ dlls/jscript/tests/lang.js | 14 ++++++++++++++ 3 files changed, 49 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index c7aaf64..ce5d702 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -1396,6 +1396,35 @@ static void String_destructor(jsdisp_t *dispex) heap_free(This); } +static unsigned String_idx_length(jsdisp_t *jsdisp) +{ + StringInstance *string = (StringInstance*)jsdisp; + + /* + * NOTE: For invoke version < 2, indexed array is not implemented at all. + * Newer jscript.dll versions implement it on string type, not class, + * which is not how it should work according to spec. IE9 implements it + * properly, but it uses its own JavaScript engine inside MSHTML. We + * implement it here, but in the way IE9 and spec work. + */ + return string->dispex.ctx->version < 2 ? 0 : jsstr_length(string->str); +} + +static HRESULT String_idx_get(jsdisp_t *jsdisp, unsigned idx, jsval_t *r) +{ + StringInstance *string = (StringInstance*)jsdisp; + jsstr_t *ret; + + TRACE("%p[%u] = %s\n", string, idx, debugstr_wn(string->str->str+idx, 1)); + + ret = jsstr_alloc_len(string->str->str+idx, 1); + if(!ret) + return E_OUTOFMEMORY; + + *r = jsval_string(ret); + return S_OK; +} + static const builtin_prop_t String_props[] = { {anchorW, String_anchor, PROPF_METHOD|1}, {bigW, String_big, PROPF_METHOD}, @@ -1451,7 +1480,9 @@ static const builtin_info_t StringInst_info = { sizeof(StringInst_props)/sizeof(*StringInst_props), StringInst_props, String_destructor, - NULL + NULL, + String_idx_length, + String_idx_get }; /* ECMA-262 3rd Edition 15.5.3.2 */ diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index ce2f153..5f5d009 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1785,6 +1785,9 @@ function callTest(argc) { ok(arguments.length === argc+1, "arguments.length = " + arguments.length + " expected " + (argc+1)); for(var i=1; i <= argc; i++) ok(arguments[i] === i, "arguments[i] = " + arguments[i]); + var a = arguments; + for(var i=1; i <= argc; i++) + ok(a[i] === i, "a[i] = " + a[i]); } callTest.call(tmp, 1, 1); diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 92292a4..5d1bbfa 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -1199,6 +1199,20 @@ try { }catch(e) {} ok(!("prop" in obj), "prop in obj"); +if(invokeVersion >= 2) { + ok("test"[0] === "t", '"test"[0] = ' + test[0]); + ok("test"[5] === undefined, '"test"[0] = ' + test[0]); + + tmp = "test"; + ok(tmp[1] === "e", "tmp[1] = " + tmp[1]); + tmp[1] = "x"; + ok(tmp[1] === "e", "tmp[1] = " + tmp[1]); + ok(tmp["1"] === "e", "tmp['1'] = " + tmp["1"]); + ok(tmp["0x1"] === undefined, "tmp['0x1'] = " + tmp["0x1"]); +}else { + ok("test"[0] === undefined, '"test"[0] = ' + test[0]); +} + ok(isNaN(NaN) === true, "isNaN(NaN) !== true"); ok(isNaN(0.5) === false, "isNaN(0.5) !== false"); ok(isNaN(Infinity) === false, "isNaN(Infinity) !== false");

1 0