November 2011 - Wine-commits

André Hentschel : winemaker: Add support for compiling static libraries.
by Alexandre Julliard 21 Nov '11

21 Nov '11

Module: wine Branch: master Commit: 49c35fca933c955be8d1142155eb47b06c6ab30b URL: http://source.winehq.org/git/wine.git/?a=commit;h=49c35fca933c955be8d114215… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Nov 19 19:42:56 2011 +0100 winemaker: Add support for compiling static libraries. --- tools/winemaker | 55 +++++++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 43 insertions(+), 12 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index e783ce7..bc8452c 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -20,7 +20,7 @@ use strict; # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA # -my $version="0.7.6"; +my $version="0.8.0"; use Cwd; use File::Basename; @@ -209,20 +209,24 @@ my $T_INCLUDE_PATH=11; my $T_LDFLAGS=12; ## +# Flags for the archiver +my $T_ARFLAGS=13; + +## # Same as T_INCLUDE_PATH but for the dll search path -my $T_DLL_PATH=13; +my $T_DLL_PATH=14; ## # The list of Windows dlls to import -my $T_DLLS=14; +my $T_DLLS=15; ## # Same as T_INCLUDE_PATH but for the library search path -my $T_LIBRARY_PATH=15; +my $T_LIBRARY_PATH=16; ## # The list of Unix libraries to link with -my $T_LIBRARIES=16; +my $T_LIBRARIES=17; # The following constants define the recognized types of target @@ -246,6 +250,10 @@ my $TT_CUIEXE=2; # For dynamically linked libraries my $TT_DLL=3; +## +# For static libraries +my $TT_LIB=4; + # The following constants further refine how the target should be handled @@ -289,6 +297,7 @@ sub target_init($) @$target[$T_DEFINES]=[]; @$target[$T_INCLUDE_PATH]=[]; @$target[$T_LDFLAGS]=[]; + @$target[$T_ARFLAGS]=[]; @$target[$T_DLL_PATH]=[]; @$target[$T_DLLS]=[]; @$target[$T_LIBRARY_PATH]=[]; @@ -600,6 +609,7 @@ sub source_scan_project_file($$$) $prj_target_type=$TT_CUIEXE; }elsif (/[[:space:]]0+x0*104$/) { # Static Library + $prj_target_type=$TT_LIB; } next; } elsif (/^# ADD CPP(.*)/ && $found_cfg==1) { @@ -916,6 +926,8 @@ sub source_scan_project_file($$$) $prj_target_type=$TT_GUIEXE; # Application } elsif ($vc_configuration_attr->getValue==2) { $prj_target_type=$TT_DLL; # Dynamic-Link Library + } elsif ($vc_configuration_attr->getValue==4) { + $prj_target_type=$TT_LIB; # Static Library } } } @@ -1005,10 +1017,14 @@ sub source_scan_project_file($$$) my $target=[]; target_init($target); - if ($prj_target_type!=$TT_DLL) { + if ($prj_target_type==$TT_GUIEXE or $prj_target_type==$TT_CUIEXE) { $prj_name=lc($prj_name.".exe"); @$target[$T_TYPE]=$opt_target_type; push @{@$target[$T_LDFLAGS]},(@$target[$T_TYPE] == $TT_CUIEXE ? "-mconsole" : "-mwindows"); + } elsif ($prj_target_type==$TT_LIB) { + $prj_name=lc("lib".$prj_name.".a"); + @$target[$T_TYPE]=$TT_LIB; + push @{@$target[$T_ARFLAGS]},("rc"); } else { $prj_name=lc($prj_name.".dll"); @$target[$T_TYPE]=$TT_DLL; @@ -2305,18 +2321,22 @@ sub generate_project_files($) my $project=$_[0]; my $project_settings=@$project[$P_SETTINGS]; my @dll_list=(); + my @lib_list=(); my @exe_list=(); # Then sort the targets and separate the libraries from the programs foreach my $target (sort { @$a[$T_NAME] cmp @$b[$T_NAME] } @{@$project[$P_TARGETS]}) { if (@$target[$T_TYPE] == $TT_DLL) { push @dll_list,$target; + } elsif (@$target[$T_TYPE] == $TT_LIB) { + push @lib_list,$target; } else { push @exe_list,$target; } } @$project[$P_TARGETS]=[]; push @{@$project[$P_TARGETS]}, @dll_list; + push @{@$project[$P_TARGETS]}, @lib_list; push @{@$project[$P_TARGETS]}, @exe_list; if (!open(FILEO,">@$project[$P_PATH]Makefile")) { @@ -2347,6 +2367,10 @@ sub generate_project_files($) { return @{$_[0]}[$T_NAME]; }); + generate_list("LIBS",1,\@lib_list,sub + { + return @{$_[0]}[$T_NAME]; + }); generate_list("EXES",1,\@exe_list,sub { return "@{$_[0]}[$T_NAME]"; @@ -2391,6 +2415,7 @@ sub generate_project_files($) generate_list("${canon}_CXX_SRCS",1,@$target[$T_SOURCES_CXX]); generate_list("${canon}_RC_SRCS",1,@$target[$T_SOURCES_RC]); generate_list("${canon}_LDFLAGS",1,@$target[$T_LDFLAGS]); + generate_list("${canon}_ARFLAGS",1,@$target[$T_ARFLAGS]); generate_list("${canon}_DLL_PATH",1,@$target[$T_DLL_PATH]); generate_list("${canon}_DLLS",1,@$target[$T_DLLS]); generate_list("${canon}_LIBRARY_PATH",1,@$target[$T_LIBRARY_PATH]); @@ -2433,6 +2458,7 @@ sub generate_project_files($) print FILEO "CC = winegcc\n"; print FILEO "CXX = wineg++\n"; print FILEO "RC = wrc\n"; + print FILEO "AR = ar\n"; print FILEO "\n\n"; print FILEO "### Generic targets\n\n"; @@ -2441,7 +2467,7 @@ sub generate_project_files($) print FILEO " \$(SUBDIRS)"; } if (@{@$project[$P_TARGETS]} > 0) { - print FILEO " \$(DLLS:%=%.so) \$(EXES)"; + print FILEO " \$(DLLS:%=%.so) \$(LIBS) \$(EXES)"; } print FILEO "\n\n"; print FILEO "### Build rules\n"; @@ -2475,7 +2501,7 @@ sub generate_project_files($) print FILEO "\n"; print FILEO "clean:: \$(SUBDIRS:%=%/__clean__) \$(EXTRASUBDIRS:%=%/__clean__)\n"; print FILEO "\t\$(RM) \$(CLEAN_FILES) \$(RC_SRCS:.rc=.res) \$(C_SRCS:.c=.o) \$(CXX_SRCS:.cpp=.o)\n"; - print FILEO "\t\$(RM) \$(DLLS:%=%.so) \$(EXES) \$(EXES:%=%.so)\n"; + print FILEO "\t\$(RM) \$(DLLS:%=%.so) \$(LIBS) \$(EXES) \$(EXES:%=%.so)\n"; print FILEO "\n"; print FILEO "\$(SUBDIRS:%=%/__clean__): dummy\n"; print FILEO "\tcd `dirname \$\@` && \$(MAKE) clean\n"; @@ -2498,12 +2524,17 @@ sub generate_project_files($) } else { print FILEO "\$(${canon}_MODULE): \$(${canon}_OBJS)\n"; } - if (@{@$target[$T_SOURCES_CXX]} > 0 or @{@$project_settings[$T_SOURCES_CXX]} > 0) { - print FILEO "\t\$(CXX)"; + + if (@$target[$T_TYPE] == $TT_LIB) { + print FILEO "\t\$(AR) \$(${canon}_ARFLAGS) \$\@ \$(${canon}_OBJS)\n"; } else { - print FILEO "\t\$(CC)"; + if (@{@$target[$T_SOURCES_CXX]} > 0 or @{@$project_settings[$T_SOURCES_CXX]} > 0) { + print FILEO "\t\$(CXX)"; + } else { + print FILEO "\t\$(CC)"; + } + print FILEO " \$(${canon}_LDFLAGS) -o \$\@ \$(${canon}_OBJS) \$(${canon}_LIBRARY_PATH) \$(DEFLIB) \$(${canon}_DLLS:%=-l%) \$(${canon}_LIBRARIES:%=-l%)\n"; } - print FILEO " \$(${canon}_LDFLAGS) -o \$\@ \$(${canon}_OBJS) \$(${canon}_LIBRARY_PATH) \$(DEFLIB) \$(${canon}_DLLS:%=-l%) \$(${canon}_LIBRARIES:%=-l%)\n"; print FILEO "\n\n"; } }

1 0

Frédéric Delanoy : French translation for release 1.3.33
by Jeremy Newman 21 Nov '11

21 Nov '11

Module: website Branch: master Commit: a06da55084f8e0262de617dd09a9f64e200b1025 URL: http://source.winehq.org/git/website.git/?a=commit;h=a06da55084f8e0262de617… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Nov 18 22:49:38 2011 +0100 French translation for release 1.3.33 --- news/fr/2011111801.xml | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/news/fr/2011111801.xml b/news/fr/2011111801.xml new file mode 100644 index 0000000..53bc5c0 --- /dev/null +++ b/news/fr/2011111801.xml @@ -0,0 +1,20 @@ +<news> +<date>18 novembre 2011</date> +<title>Sortie de Wine 1.3.33</title> +<body> + La version de développement 1.3.33 de Wine est disponible. + <a href="{$root}/announce/1.3.33">Nouveautés</a> de cette version : +<ul> + <li>Prise en charge de la sortie de texte dans le moteur DIB.</li> + <li>Meilleure prise en charge des proxys HTTP.</li> + <li>Nouvelle version du moteur Gecko.</li> + <li>Quelques correctifs pour les curseurs.</li> + <li>Plusieurs correctifs dans la mise en forme de texte bidirectionnelle.</li> + <li>Diverses corrections de bogues.</li> +</ul> +Le <a +href="http://prdownloads.sourceforge.net/wine/wine-1.3.33.tar.bz2">code +source</a> est disponible dès à présent. +Les paquets binaires sont en cours de construction, et apparaîtront sous peu +sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

André Hentschel : Wine 1.3.33 freigegeben
by Jeremy Newman 21 Nov '11

21 Nov '11

Module: website Branch: master Commit: e63f1b9af373354eeda70272d84a72fe9b1cc1d2 URL: http://source.winehq.org/git/website.git/?a=commit;h=e63f1b9af373354eeda702… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Nov 19 19:43:25 2011 +0100 Wine 1.3.33 freigegeben --- news/de/2011111801.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/de/2011111801.xml b/news/de/2011111801.xml new file mode 100644 index 0000000..fc8aae7 --- /dev/null +++ b/news/de/2011111801.xml @@ -0,0 +1,17 @@ +<news> +<date>18. November 2011</date> +<title>Wine 1.3.33 freigegeben</title> +<body> + Die Entwicklungsversion 1.3.33 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.3.33">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Unterstützung für Textausgabe in der DIB Engine.</li> + <li>Verbesserte Unterstützung für HTTP Proxies.</li> + <li>Neue Version der Gecko Engine.</li> + <li>Einige Mauszeiger Fehlerbehebungen.</li> + <li>Ein paar Fehlerbehebungen am bidirektionalen Textlayout.</li> + <li>Verschiedene Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.33.tar.bz2">verfügbar</a>. +Binär-Downloads werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Download-Seiten</a> zur Verfügung. +</body></news>

1 0

Alexandre Julliard : Wine release 1.3.33
by Alexandre Julliard 18 Nov '11

18 Nov '11

Module: website Branch: master Commit: 5b0c34d48c8bcc19255d5bfd5f535665fefe911a URL: http://source.winehq.org/git/website.git/?a=commit;h=5b0c34d48c8bcc19255d5b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 18 20:03:19 2011 +0100 Wine release 1.3.33 --- news/en/2011111801.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/en/2011111801.xml b/news/en/2011111801.xml new file mode 100644 index 0000000..b69b918 --- /dev/null +++ b/news/en/2011111801.xml @@ -0,0 +1,17 @@ +<news> +<date>November 18, 2011</date> +<title>Wine 1.3.33 Released</title> +<body> + The Wine development release 1.3.33 is now available. + <a href="{$root}/announce/1.3.33">What's new</a> in this release: +<ul> + <li>Support for text output in the DIB engine.</li> + <li>Improved support for HTTP proxies.</li> + <li>New version of the Gecko engine.</li> + <li>A number of cursor fixes.</li> + <li>Some fixes in bidirectional text layout.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.33.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : wrc: Fix lookup of strings that contain a context.
by Alexandre Julliard 18 Nov '11

18 Nov '11

Module: wine Branch: master Commit: ceb26b809bf1a88a5954fa38c91cf11b4781cd0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ceb26b809bf1a88a5954fa38c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 18 19:26:42 2011 +0100 wrc: Fix lookup of strings that contain a context. --- tools/wrc/po.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/wrc/po.c b/tools/wrc/po.c index 1882d78..ffb584f 100644 --- a/tools/wrc/po.c +++ b/tools/wrc/po.c @@ -951,7 +951,7 @@ static const char *get_msgstr( const char *msgid, const char *context, int *foun while (min <= max) { pos = (min + max) / 2; - res = strcmp( get_mo_msgid(pos), msgid ); + res = strcmp( get_mo_msgid(pos), id ? id : msgid ); if (!res) { const char *str = get_mo_msgstr( pos );

1 0

Alexandre Julliard : Release 1.3.33.
by Alexandre Julliard 18 Nov '11

18 Nov '11

Module: wine Branch: master Commit: 65cfa70e2f570852f2324d4f1c24e339849a38f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65cfa70e2f570852f2324d4f1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 18 19:52:21 2011 +0100 Release 1.3.33. --- ANNOUNCE | 1099 +++++++++++++++++++++++++++++++------------------------------ VERSION | 2 +- configure | 18 +- 3 files changed, 573 insertions(+), 546 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=65cfa70e2f570852f2324…

1 0

Tag wine-1.3.33 : Alexandre Julliard : Release 1.3.33
by Alexandre Julliard 18 Nov '11

18 Nov '11

Module: wine Branch: refs/tags/wine-1.3.33 Tag: 33dfa8725930b1924a05f0ebab04dafce3a75f9d URL: http://source.winehq.org/git/wine.git/?a=tag;h=33dfa8725930b1924a05f0ebab04… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 18 19:52:21 2011 +0100 Release 1.3.33

1 0

Jacek Caban : jscript: Added minimal bytecode compiler/ interpreter and use it for '===' expressions.
by Alexandre Julliard 18 Nov '11

18 Nov '11

Module: wine Branch: master Commit: b473f5d5c66f1d71dc8d884e196c54da75e522fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=b473f5d5c66f1d71dc8d884e1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 18 14:09:44 2011 +0100 jscript: Added minimal bytecode compiler/interpreter and use it for '===' expressions. --- dlls/jscript/Makefile.in | 1 + dlls/jscript/compile.c | 144 ++++++++++++++++++++++++++++++++++++++++++ dlls/jscript/engine.c | 157 +++++++++++++++++++++++++++++++++++++++++++--- dlls/jscript/engine.h | 54 +++++++++++++++- dlls/jscript/parser.y | 6 ++- 5 files changed, 349 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b473f5d5c66f1d71dc8d8…

1 0

Jacek Caban : jscript: Use bytecode interpreter for '!==' expressions.
by Alexandre Julliard 18 Nov '11

18 Nov '11

Module: wine Branch: master Commit: 32602170a526a1116844cbfe6735d22b1349ac90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32602170a526a1116844cbfe6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 18 14:10:17 2011 +0100 jscript: Use bytecode interpreter for '!==' expressions. --- dlls/jscript/compile.c | 3 +++ dlls/jscript/engine.c | 18 ++++++++---------- dlls/jscript/engine.h | 2 +- dlls/jscript/parser.y | 2 +- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index c2f8eff..b93ab52 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -98,7 +98,10 @@ static HRESULT compile_expression(compiler_ctx_t *ctx, expression_t *expr) switch(expr->type) { case EXPR_EQEQ: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_eq2); + case EXPR_NOTEQEQ: + return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_neq2); default: + assert(expr->eval != compiled_expression_eval); return compile_interp_fallback(ctx, expr); } diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 102dadd..6353d12 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2864,26 +2864,24 @@ HRESULT not_equal_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD } /* ECMA-262 3rd Edition 11.9.5 */ -HRESULT not_equal2_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +static HRESULT interp_neq2(exec_ctx_t *ctx) { - binary_expression_t *expr = (binary_expression_t*)_expr; - VARIANT rval, lval; + VARIANT *l, *r; BOOL b; HRESULT hres; TRACE("\n"); - hres = get_binary_expr_values(ctx, expr, ei, &lval, &rval); - if(FAILED(hres)) - return hres; + r = stack_pop(ctx); + l = stack_pop(ctx); - hres = equal2_values(&lval, &rval, &b); - VariantClear(&lval); - VariantClear(&rval); + hres = equal2_values(r, l, &b); + VariantClear(l); + VariantClear(r); if(FAILED(hres)) return hres; - return return_bool(ret, !b); + return stack_push_bool(ctx, !b); } /* ECMA-262 3rd Edition 11.8.5 */ diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 09f6e11..5c46e39 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -43,6 +43,7 @@ typedef struct _func_stack { #define OP_LIST \ X(eq2, 1, 0) \ + X(neq2, 1, 0) \ X(tree, 1, ARG_EXPR) \ X(ret, 0, 0) @@ -541,7 +542,6 @@ HRESULT pre_increment_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept HRESULT pre_decrement_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT equal_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT not_equal_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; -HRESULT not_equal2_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT less_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT lesseq_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT greater_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 444871b..310ff2a 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1330,7 +1330,7 @@ static const expression_eval_t expression_eval_table[] = { equal_expression_eval, compiled_expression_eval, not_equal_expression_eval, - not_equal2_expression_eval, + compiled_expression_eval, less_expression_eval, lesseq_expression_eval, greater_expression_eval,

1 0

Jacek Caban : jscript: Use bytecode interpreter for logical negation expression.
by Alexandre Julliard 18 Nov '11

18 Nov '11

Module: wine Branch: master Commit: 418af7eda90715b6bb75adb9325c9be963ffcf3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=418af7eda90715b6bb75adb93… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 18 14:10:40 2011 +0100 jscript: Use bytecode interpreter for logical negation expression. --- dlls/jscript/compile.c | 13 +++++++++++++ dlls/jscript/engine.c | 16 ++++++---------- dlls/jscript/engine.h | 2 +- dlls/jscript/parser.y | 2 +- dlls/jscript/tests/lang.js | 3 +++ 5 files changed, 24 insertions(+), 12 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index b93ab52..b51f68f 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -81,6 +81,17 @@ static HRESULT compile_binary_expression(compiler_ctx_t *ctx, binary_expression_ return push_instr(ctx, op) == -1 ? E_OUTOFMEMORY : S_OK; } +static HRESULT compile_unary_expression(compiler_ctx_t *ctx, unary_expression_t *expr, jsop_t op) +{ + HRESULT hres; + + hres = compile_expression(ctx, expr->expression); + if(FAILED(hres)) + return hres; + + return push_instr(ctx, op) == -1 ? E_OUTOFMEMORY : S_OK; +} + static HRESULT compile_interp_fallback(compiler_ctx_t *ctx, expression_t *expr) { unsigned instr; @@ -98,6 +109,8 @@ static HRESULT compile_expression(compiler_ctx_t *ctx, expression_t *expr) switch(expr->type) { case EXPR_EQEQ: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_eq2); + case EXPR_LOGNEG: + return compile_unary_expression(ctx, (unary_expression_t*)expr, OP_neg); case EXPR_NOTEQEQ: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_neq2); default: diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 6353d12..29fb64b 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -3050,25 +3050,21 @@ HRESULT binary_negation_expression_eval(script_ctx_t *ctx, expression_t *_expr, } /* ECMA-262 3rd Edition 11.4.9 */ -HRESULT logical_negation_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +HRESULT interp_neg(exec_ctx_t *ctx) { - unary_expression_t *expr = (unary_expression_t*)_expr; - exprval_t exprval; + VARIANT *v; VARIANT_BOOL b; HRESULT hres; TRACE("\n"); - hres = expr_eval(ctx, expr->expression, EXPR_NEWREF, ei, &exprval); - if(FAILED(hres)) - return hres; - - hres = exprval_to_boolean(ctx, &exprval, ei, &b); - exprval_release(&exprval); + v = stack_pop(ctx); + hres = to_boolean(v, &b); + VariantClear(v); if(FAILED(hres)) return hres; - return return_bool(ret, !b); + return stack_push_bool(ctx, !b); } /* ECMA-262 3rd Edition 11.7.1 */ diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 5c46e39..55c29e8 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -43,6 +43,7 @@ typedef struct _func_stack { #define OP_LIST \ X(eq2, 1, 0) \ + X(neg, 1, 0) \ X(neq2, 1, 0) \ X(tree, 1, ARG_EXPR) \ X(ret, 0, 0) @@ -547,7 +548,6 @@ HRESULT lesseq_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exp HRESULT greater_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT greatereq_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT binary_negation_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; -HRESULT logical_negation_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT left_shift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT right_shift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT right2_shift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 310ff2a..fd294bd 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1336,7 +1336,7 @@ static const expression_eval_t expression_eval_table[] = { greater_expression_eval, greatereq_expression_eval, binary_negation_expression_eval, - logical_negation_expression_eval, + compiled_expression_eval, left_shift_expression_eval, right_shift_expression_eval, right2_shift_expression_eval, diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index b54eef2..92eb642 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -208,6 +208,9 @@ for(var iter in false) for(var iter in pureDisp) ok(false, "unexpected forin call in pureDisp object"); +tmp = new Object(); +ok(!tmp.nonexistent, "!tmp.nonexistent = " + !tmp.nonexistent); + tmp = 0; if(true) tmp = 1;

1 0