December 2011 - Wine-commits

Jacek Caban : jscript: Call expressions needling EXPR_NEWREF flag directly.
by Alexandre Julliard 15 Dec '11

15 Dec '11

Module: wine Branch: master Commit: 595646066b16e0018527e351d535343701a6e77e URL: http://source.winehq.org/git/wine.git/?a=commit;h=595646066b16e0018527e351d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 15 15:43:20 2011 +0100 jscript: Call expressions needling EXPR_NEWREF flag directly. --- dlls/jscript/engine.c | 19 ++++++++++++++++--- 1 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 46bdffb..c7ed6d7 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1071,10 +1071,23 @@ HRESULT forin_statement_eval(script_ctx_t *ctx, statement_t *_stat, return_type_ TRACE("iter %s\n", debugstr_w(str)); - if(stat->variable) + if(stat->variable) { hres = identifier_eval(ctx, identifier, 0, NULL, &exprval); - else - hres = expr_eval(ctx, stat->expr, EXPR_NEWREF, &rt->ei, &exprval); + }else { + switch(stat->expr->type) { + case EXPR_ARRAY: + hres = array_expression_eval(ctx, stat->expr, EXPR_NEWREF, &rt->ei, &exprval); + break; + case EXPR_IDENT: + hres = identifier_expression_eval(ctx, stat->expr, EXPR_NEWREF, &rt->ei, &exprval); + break; + case EXPR_MEMBER: + hres = member_expression_eval(ctx, stat->expr, EXPR_NEWREF, &rt->ei, &exprval); + break; + default: + hres = expr_eval(ctx, stat->expr, 0, &rt->ei, &exprval); + } + } if(SUCCEEDED(hres)) { V_VT(&name) = VT_BSTR; V_BSTR(&name) = str;

1 0

Jacek Caban : jscript: Don' t pass EXPR_NEWREF to name expression in array_expression_eval.
by Alexandre Julliard 15 Dec '11

15 Dec '11

Module: wine Branch: master Commit: 43a2d8b9901d3616745a38eef85ab0599e18f3c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43a2d8b9901d3616745a38eef… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 15 15:43:43 2011 +0100 jscript: Don't pass EXPR_NEWREF to name expression in array_expression_eval. --- dlls/jscript/engine.c | 2 +- dlls/jscript/tests/lang.js | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index c7ed6d7..cdfc4e3 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1473,7 +1473,7 @@ HRESULT array_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flag if(FAILED(hres)) return hres; - hres = expr_eval(ctx, expr->expression2, EXPR_NEWREF, ei, &exprval); + hres = expr_eval(ctx, expr->expression2, 0, ei, &exprval); if(SUCCEEDED(hres)) { hres = exprval_to_value(ctx, &exprval, ei, &val); exprval_release(&exprval); diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 5677d32..165e70e 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -220,9 +220,13 @@ ok((~tmp.nonexistent) === -1, "!tmp.nonexistent = " + ~tmp.nonexistent); ok(!("nonexistent" in tmp), "nonexistent is in tmp after '~' expression") tmp = new Object(); -ok(isNaN(tmp.nonexistent), "!tmp.nonexistent = " + (+tmp.nonexistent)); +ok(isNaN(+tmp.nonexistent), "!tmp.nonexistent = " + (+tmp.nonexistent)); ok(!("nonexistent" in tmp), "nonexistent is in tmp after '+' expression") +tmp = new Object(); +tmp[tmp.nonexistent]; +ok(!("nonexistent" in tmp), "nonexistent is in tmp after array expression") + tmp = 0; if(true) tmp = 1;

1 0

Jacek Caban : jscript: Always use compiler for member, array and identifier expressions.
by Alexandre Julliard 15 Dec '11

15 Dec '11

Module: wine Branch: master Commit: 63366f8f1b4cec1350874fda6b2eb3b0ddf7ee36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63366f8f1b4cec1350874fda6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 15 15:44:08 2011 +0100 jscript: Always use compiler for member, array and identifier expressions. --- dlls/jscript/engine.c | 40 +++++++++++++++------------------------- dlls/jscript/engine.h | 3 --- dlls/jscript/parser.y | 6 +++--- 3 files changed, 18 insertions(+), 31 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index cdfc4e3..31781ef 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -282,12 +282,6 @@ static HRESULT exprval_to_boolean(script_ctx_t *ctx, exprval_t *exprval, jsexcep return to_boolean(&exprval->u.var, b); } -static void exprval_init(exprval_t *val) -{ - val->type = EXPRVAL_VARIANT; - V_VT(&val->u.var) = VT_EMPTY; -} - static void exprval_set_idref(exprval_t *val, IDispatch *disp, DISPID id) { val->type = EXPRVAL_IDREF; @@ -1012,6 +1006,10 @@ HRESULT for_statement_eval(script_ctx_t *ctx, statement_t *_stat, return_type_t return S_OK; } +static HRESULT array_expression_eval(script_ctx_t*,expression_t*,jsexcept_t*,exprval_t*); +static HRESULT member_expression_eval(script_ctx_t*,expression_t*,jsexcept_t*,exprval_t*); +static HRESULT identifier_expression_eval(script_ctx_t*,expression_t*,jsexcept_t*,exprval_t*); + /* ECMA-262 3rd Edition 12.6.4 */ HRESULT forin_statement_eval(script_ctx_t *ctx, statement_t *_stat, return_type_t *rt, VARIANT *ret) { @@ -1076,13 +1074,13 @@ HRESULT forin_statement_eval(script_ctx_t *ctx, statement_t *_stat, return_type_ }else { switch(stat->expr->type) { case EXPR_ARRAY: - hres = array_expression_eval(ctx, stat->expr, EXPR_NEWREF, &rt->ei, &exprval); + hres = array_expression_eval(ctx, stat->expr, &rt->ei, &exprval); break; case EXPR_IDENT: - hres = identifier_expression_eval(ctx, stat->expr, EXPR_NEWREF, &rt->ei, &exprval); + hres = identifier_expression_eval(ctx, stat->expr, &rt->ei, &exprval); break; case EXPR_MEMBER: - hres = member_expression_eval(ctx, stat->expr, EXPR_NEWREF, &rt->ei, &exprval); + hres = member_expression_eval(ctx, stat->expr, &rt->ei, &exprval); break; default: hres = expr_eval(ctx, stat->expr, 0, &rt->ei, &exprval); @@ -1452,7 +1450,7 @@ HRESULT function_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD f } /* ECMA-262 3rd Edition 11.2.1 */ -HRESULT array_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +static HRESULT array_expression_eval(script_ctx_t *ctx, expression_t *_expr, jsexcept_t *ei, exprval_t *ret) { binary_expression_t *expr = (binary_expression_t*)_expr; exprval_t exprval; @@ -1489,16 +1487,12 @@ HRESULT array_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flag hres = to_string(ctx, &val, ei, &str); VariantClear(&val); if(SUCCEEDED(hres)) { - hres = disp_get_id(ctx, obj, str, flags & EXPR_NEWREF ? fdexNameEnsure : 0, &id); + hres = disp_get_id(ctx, obj, str, fdexNameEnsure, &id); SysFreeString(str); } - if(SUCCEEDED(hres)) { + if(SUCCEEDED(hres)) exprval_set_idref(ret, obj, id); - }else if(!(flags & EXPR_NEWREF) && hres == DISP_E_UNKNOWNNAME) { - exprval_init(ret); - hres = S_OK; - } IDispatch_Release(obj); } @@ -1548,7 +1542,7 @@ static HRESULT interp_array(exec_ctx_t *ctx) } /* ECMA-262 3rd Edition 11.2.1 */ -HRESULT member_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +static HRESULT member_expression_eval(script_ctx_t *ctx, expression_t *_expr, jsexcept_t *ei, exprval_t *ret) { member_expression_t *expr = (member_expression_t*)_expr; IDispatch *obj = NULL; @@ -1580,14 +1574,10 @@ HRESULT member_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD fla return E_OUTOFMEMORY; } - hres = disp_get_id(ctx, obj, str, flags & EXPR_NEWREF ? fdexNameEnsure : 0, &id); + hres = disp_get_id(ctx, obj, str, fdexNameEnsure, &id); SysFreeString(str); - if(SUCCEEDED(hres)) { + if(SUCCEEDED(hres)) exprval_set_idref(ret, obj, id); - }else if(!(flags & EXPR_NEWREF) && hres == DISP_E_UNKNOWNNAME) { - exprval_init(ret); - hres = S_OK; - } IDispatch_Release(obj); return hres; @@ -1803,7 +1793,7 @@ static HRESULT interp_this(exec_ctx_t *ctx) } /* ECMA-262 3rd Edition 10.1.4 */ -HRESULT identifier_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +static HRESULT identifier_expression_eval(script_ctx_t *ctx, expression_t *_expr, jsexcept_t *ei, exprval_t *ret) { identifier_expression_t *expr = (identifier_expression_t*)_expr; BSTR identifier; @@ -1815,7 +1805,7 @@ HRESULT identifier_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD if(!identifier) return E_OUTOFMEMORY; - hres = identifier_eval(ctx, identifier, flags, ei, ret); + hres = identifier_eval(ctx, identifier, EXPR_NEWREF, ei, ret); SysFreeString(identifier); return hres; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index b2707cf..2cea63d 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -566,9 +566,6 @@ typedef struct { } property_value_expression_t; HRESULT function_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; -HRESULT array_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; -HRESULT member_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; -HRESULT identifier_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT property_value_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT compiled_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 013b7fe..c791e9c 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1352,13 +1352,13 @@ static const expression_eval_t expression_eval_table[] = { compiled_expression_eval, compiled_expression_eval, compiled_expression_eval, - array_expression_eval, - member_expression_eval, + compiled_expression_eval, + compiled_expression_eval, compiled_expression_eval, compiled_expression_eval, compiled_expression_eval, function_expression_eval, - identifier_expression_eval, + compiled_expression_eval, compiled_expression_eval, property_value_expression_eval, compiled_expression_eval

1 0

Jacek Caban : jscript: Get rid of no longer needed EXPR_NEWREF flag.
by Alexandre Julliard 15 Dec '11

15 Dec '11

Module: wine Branch: master Commit: 5086bb2cd9d8696d481d40dc3628f44a3a437f6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5086bb2cd9d8696d481d40dc3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 15 15:44:23 2011 +0100 jscript: Get rid of no longer needed EXPR_NEWREF flag. --- dlls/jscript/engine.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 31781ef..98e4158 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -30,7 +30,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(jscript); #define EXPR_NOVAL 0x0001 -#define EXPR_NEWREF 0x0002 static const WCHAR booleanW[] = {'b','o','o','l','e','a','n',0}; static const WCHAR functionW[] = {'f','u','n','c','t','i','o','n',0}; @@ -715,7 +714,7 @@ static HRESULT identifier_eval(script_ctx_t *ctx, BSTR identifier, DWORD flags, if(lookup_global_members(ctx, identifier, ret)) return S_OK; - if(flags & EXPR_NEWREF) { + if(flags & fdexNameEnsure) { hres = jsdisp_get_id(ctx->global, identifier, fdexNameEnsure, &id); if(FAILED(hres)) return hres; @@ -1805,7 +1804,7 @@ static HRESULT identifier_expression_eval(script_ctx_t *ctx, expression_t *_expr if(!identifier) return E_OUTOFMEMORY; - hres = identifier_eval(ctx, identifier, EXPR_NEWREF, ei, ret); + hres = identifier_eval(ctx, identifier, fdexNameEnsure, ei, ret); SysFreeString(identifier); return hres; @@ -1843,7 +1842,7 @@ static HRESULT interp_identid(exec_ctx_t *ctx) TRACE("%s %x\n", debugstr_w(arg), flags); - hres = identifier_eval(ctx->parser->script, arg, (flags&fdexNameEnsure) ? EXPR_NEWREF : 0, &ctx->ei, &exprval); + hres = identifier_eval(ctx->parser->script, arg, flags, &ctx->ei, &exprval); if(FAILED(hres)) return hres;

1 0

Aric Stewart : usp10: Do not try to fallback if no fallback font is specified.
by Alexandre Julliard 15 Dec '11

15 Dec '11

Module: wine Branch: master Commit: 6fe14a015335eb50a5e03ae59fcc882b019479ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fe14a015335eb50a5e03ae59… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Dec 15 09:51:21 2011 -0600 usp10: Do not try to fallback if no fallback font is specified. --- dlls/usp10/usp10.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 3b99052..6cdf740 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1719,12 +1719,16 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString, LOGFONTW lf; GetObjectW(GetCurrentObject(hdc, OBJ_FONT), sizeof(lf), & lf); lf.lfCharSet = scriptInformation[analysis->pItem[i].a.eScript].props.bCharSet; + lf.lfFaceName[0] = 0; find_fallback_font(analysis->pItem[i].a.eScript, lf.lfFaceName); - analysis->glyphs[i].fallbackFont = CreateFontIndirectW(&lf); - if (analysis->glyphs[i].fallbackFont) + if (lf.lfFaceName[0]) { - ScriptFreeCache(sc); - originalFont = SelectObject(hdc, analysis->glyphs[i].fallbackFont); + analysis->glyphs[i].fallbackFont = CreateFontIndirectW(&lf); + if (analysis->glyphs[i].fallbackFont) + { + ScriptFreeCache(sc); + originalFont = SelectObject(hdc, analysis->glyphs[i].fallbackFont); + } } }

1 0

Akihiro Sagawa : cmd: Improve the message when the volume has no label.
by Alexandre Julliard 15 Dec '11

15 Dec '11

1 0

Adam Martinson : ntdll: Properly set flags in NtCreateNamedPipe().
by Alexandre Julliard 15 Dec '11

15 Dec '11

Module: wine Branch: master Commit: 759d76ae23ef2916af6ebb13ab9219c357af17ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=759d76ae23ef2916af6ebb13a… Author: Adam Martinson <adam.r.martinson(a)gmail.com> Date: Sun Dec 11 13:10:32 2011 -0600 ntdll: Properly set flags in NtCreateNamedPipe(). --- dlls/ntdll/file.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 744e09f..d9be9fb 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -2797,9 +2797,9 @@ NTSTATUS WINAPI NtCreateNamedPipeFile( PHANDLE handle, ULONG access, req->options = options; req->sharing = sharing; req->flags = - (pipe_type) ? NAMED_PIPE_MESSAGE_STREAM_WRITE : 0 | - (read_mode) ? NAMED_PIPE_MESSAGE_STREAM_READ : 0 | - (completion_mode) ? NAMED_PIPE_NONBLOCKING_MODE : 0; + (pipe_type ? NAMED_PIPE_MESSAGE_STREAM_WRITE : 0) | + (read_mode ? NAMED_PIPE_MESSAGE_STREAM_READ : 0) | + (completion_mode ? NAMED_PIPE_NONBLOCKING_MODE : 0); req->maxinstances = max_inst; req->outsize = outbound_quota; req->insize = inbound_quota;

1 0

Francois Gouget : configure: Use errno.h instead of the non-standard sys/ errno.h header.
by Alexandre Julliard 15 Dec '11

15 Dec '11

Module: wine Branch: master Commit: c7cb3e6cb21598281cf2b00b2ccd8323598b12ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7cb3e6cb21598281cf2b00b2… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Dec 15 11:16:27 2011 +0100 configure: Use errno.h instead of the non-standard sys/errno.h header. --- configure | 1 - configure.ac | 1 - dlls/avicap32/avicap32_main.c | 4 +--- dlls/dinput/joystick_linux.c | 3 --- dlls/dinput/joystick_linuxinput.c | 3 --- dlls/ntdll/file.c | 3 --- dlls/ntdll/virtual.c | 3 --- dlls/qcap/v4l.c | 4 +--- dlls/winejoystick.drv/joystick.c | 4 +--- dlls/wineoss.drv/midi.c | 3 --- dlls/wineoss.drv/mmaux.c | 3 --- dlls/ws2_32/socket.c | 3 --- include/config.h.in | 3 --- server/change.c | 3 --- server/file.c | 3 --- server/sock.c | 3 --- 16 files changed, 3 insertions(+), 44 deletions(-) diff --git a/configure b/configure index dd54f3d..98080e2 100755 --- a/configure +++ b/configure @@ -5815,7 +5815,6 @@ for ac_header in \ sys/cdio.h \ sys/elf32.h \ sys/epoll.h \ - sys/errno.h \ sys/event.h \ sys/exec_elf.h \ sys/filio.h \ diff --git a/configure.ac b/configure.ac index d96e78f..99704c7 100644 --- a/configure.ac +++ b/configure.ac @@ -460,7 +460,6 @@ AC_CHECK_HEADERS(\ sys/cdio.h \ sys/elf32.h \ sys/epoll.h \ - sys/errno.h \ sys/event.h \ sys/exec_elf.h \ sys/filio.h \ diff --git a/dlls/avicap32/avicap32_main.c b/dlls/avicap32/avicap32_main.c index 3d0b661..7ee7b63 100644 --- a/dlls/avicap32/avicap32_main.c +++ b/dlls/avicap32/avicap32_main.c @@ -29,9 +29,7 @@ #ifdef HAVE_SYS_STAT_H # include <sys/stat.h> #endif -#ifdef HAVE_SYS_ERRNO_H -# include <sys/errno.h> -#endif +#include <errno.h> #ifdef HAVE_SYS_TIME_H # include <sys/time.h> #endif diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 3ad592d..d951e76 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -43,9 +43,6 @@ # include <sys/ioctl.h> #endif #include <errno.h> -#ifdef HAVE_SYS_ERRNO_H -# include <sys/errno.h> -#endif #ifdef HAVE_LINUX_IOCTL_H # include <linux/ioctl.h> #endif diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index a88391c..2902f9f 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -39,9 +39,6 @@ # include <sys/ioctl.h> #endif #include <errno.h> -#ifdef HAVE_SYS_ERRNO_H -# include <sys/errno.h> -#endif #ifdef HAVE_LINUX_INPUT_H # include <linux/input.h> # undef SW_MAX diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index d9be9fb..8e48602 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -27,9 +27,6 @@ #ifdef HAVE_UNISTD_H # include <unistd.h> #endif -#ifdef HAVE_SYS_ERRNO_H -#include <sys/errno.h> -#endif #ifdef HAVE_LINUX_MAJOR_H # include <linux/major.h> #endif diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 9853628..e6ca21a 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -23,9 +23,6 @@ #include <assert.h> #include <errno.h> -#ifdef HAVE_SYS_ERRNO_H -#include <sys/errno.h> -#endif #include <fcntl.h> #ifdef HAVE_UNISTD_H # include <unistd.h> diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index a7995e2..119eb29 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -38,9 +38,7 @@ #ifdef HAVE_SYS_MMAN_H #include <sys/mman.h> #endif -#ifdef HAVE_SYS_ERRNO_H -#include <sys/errno.h> -#endif +#include <errno.h> #ifdef HAVE_SYS_TIME_H #include <sys/time.h> #endif diff --git a/dlls/winejoystick.drv/joystick.c b/dlls/winejoystick.drv/joystick.c index df73b4c..577e593 100644 --- a/dlls/winejoystick.drv/joystick.c +++ b/dlls/winejoystick.drv/joystick.c @@ -60,9 +60,7 @@ #define JOYDEV_NEW "/dev/input/js%d" #define JOYDEV_OLD "/dev/js%d" #endif -#ifdef HAVE_SYS_ERRNO_H -#include <sys/errno.h> -#endif +#include <errno.h> #include "windef.h" #include "winbase.h" diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index 72ceb1a..b1c60da 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -60,9 +60,6 @@ #ifdef HAVE_SYS_POLL_H #include <sys/poll.h> #endif -#ifdef HAVE_SYS_ERRNO_H -#include <sys/errno.h> -#endif #include <sys/soundcard.h> #include "windef.h" diff --git a/dlls/wineoss.drv/mmaux.c b/dlls/wineoss.drv/mmaux.c index 3dbc6a0..216d2e2 100644 --- a/dlls/wineoss.drv/mmaux.c +++ b/dlls/wineoss.drv/mmaux.c @@ -31,9 +31,6 @@ #ifdef HAVE_SYS_IOCTL_H # include <sys/ioctl.h> #endif -#ifdef HAVE_SYS_ERRNO_H -#include <sys/errno.h> -#endif #include <sys/soundcard.h> #include "windef.h" diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 13ee0a4..b3a79f3 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -76,9 +76,6 @@ #include <ctype.h> #include <fcntl.h> #include <errno.h> -#ifdef HAVE_SYS_ERRNO_H -#include <sys/errno.h> -#endif #ifdef HAVE_NETDB_H #include <netdb.h> #endif diff --git a/include/config.h.in b/include/config.h.in index 60179db..34c6db4 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -884,9 +884,6 @@ /* Define to 1 if you have the <sys/epoll.h> header file. */ #undef HAVE_SYS_EPOLL_H -/* Define to 1 if you have the <sys/errno.h> header file. */ -#undef HAVE_SYS_ERRNO_H - /* Define to 1 if you have the <sys/event.h> header file. */ #undef HAVE_SYS_EVENT_H diff --git a/server/change.c b/server/change.c index 6461e95..f6d56b0 100644 --- a/server/change.c +++ b/server/change.c @@ -32,9 +32,6 @@ #include <limits.h> #include <dirent.h> #include <errno.h> -#ifdef HAVE_SYS_ERRNO_H -#include <sys/errno.h> -#endif #include "ntstatus.h" #define WIN32_NO_STATUS diff --git a/server/file.c b/server/file.c index 07dab39..02a1e37 100644 --- a/server/file.c +++ b/server/file.c @@ -28,9 +28,6 @@ #include <string.h> #include <stdlib.h> #include <errno.h> -#ifdef HAVE_SYS_ERRNO_H -#include <sys/errno.h> -#endif #include <sys/stat.h> #include <sys/time.h> #include <sys/types.h> diff --git a/server/sock.c b/server/sock.c index 9f62da2..7e4acd8 100644 --- a/server/sock.c +++ b/server/sock.c @@ -30,9 +30,6 @@ #include <string.h> #include <stdlib.h> #include <errno.h> -#ifdef HAVE_SYS_ERRNO_H -# include <sys/errno.h> -#endif #include <sys/time.h> #include <sys/types.h> #ifdef HAVE_SYS_SOCKET_H

1 0

Nikolay Sivov : msxml3: Get rid of libxml2 output buffer implementation.
by Alexandre Julliard 15 Dec '11

15 Dec '11

Module: wine Branch: master Commit: fda8c2177d01c767c020864370cf9dfaf7b6755d URL: http://source.winehq.org/git/wine.git/?a=commit;h=fda8c2177d01c767c02086437… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 15 16:03:21 2011 +0300 msxml3: Get rid of libxml2 output buffer implementation. --- dlls/msxml3/mxwriter.c | 410 ++++++++++++++++++++++++++++------------------- 1 files changed, 244 insertions(+), 166 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fda8c2177d01c767c0208…

1 0

Jacek Caban : jscript: Use byte code for deleting identifier expressions.
by Alexandre Julliard 15 Dec '11

15 Dec '11

Module: wine Branch: master Commit: 3fd2979fba51dc21faf03d5ebdb093e0353749f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fd2979fba51dc21faf03d5eb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 15 15:42:27 2011 +0100 jscript: Use byte code for deleting identifier expressions. --- dlls/jscript/compile.c | 2 + dlls/jscript/engine.c | 79 ++++++++++++++++++++++------------------------- dlls/jscript/engine.h | 1 + 3 files changed, 40 insertions(+), 42 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index ff53c90..7188f4c1 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -487,6 +487,8 @@ static HRESULT compile_delete_expression(compiler_ctx_t *ctx, unary_expression_t return E_OUTOFMEMORY; break; } + case EXPR_IDENT: + return push_instr_bstr(ctx, OP_delete_ident, ((identifier_expression_t*)expr->expression)->identifier); default: expr->expr.eval = delete_expression_eval; return compile_interp_fallback(ctx, &expr->expr); diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index e399aa8..2dcdd44 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1399,15 +1399,6 @@ HRESULT try_statement_eval(script_ctx_t *ctx, statement_t *_stat, return_type_t return S_OK; } -static HRESULT return_bool(exprval_t *ret, DWORD b) -{ - ret->type = EXPRVAL_VARIANT; - V_VT(&ret->u.var) = VT_BOOL; - V_BOOL(&ret->u.var) = b ? VARIANT_TRUE : VARIANT_FALSE; - - return S_OK; -} - /* ECMA-262 3rd Edition 13 */ HRESULT function_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) { @@ -2377,39 +2368,8 @@ static HRESULT interp_mod(exec_ctx_t *ctx) /* ECMA-262 3rd Edition 11.4.2 */ HRESULT delete_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) { - unary_expression_t *expr = (unary_expression_t*)_expr; - VARIANT_BOOL b = VARIANT_FALSE; - exprval_t exprval; - HRESULT hres; - - TRACE("\n"); - - hres = expr_eval(ctx, expr->expression, 0, ei, &exprval); - if(FAILED(hres)) - return hres; - - switch(exprval.type) { - case EXPRVAL_IDREF: { - IDispatchEx *dispex; - - hres = IDispatch_QueryInterface(exprval.u.idref.disp, &IID_IDispatchEx, (void**)&dispex); - if(SUCCEEDED(hres)) { - hres = IDispatchEx_DeleteMemberByDispID(dispex, exprval.u.idref.id); - b = VARIANT_TRUE; - IDispatchEx_Release(dispex); - } - break; - } - default: - FIXME("unsupported type %d\n", exprval.type); - hres = E_NOTIMPL; - } - - exprval_release(&exprval); - if(FAILED(hres)) - return hres; - - return return_bool(ret, b); + FIXME("\n"); + return E_NOTIMPL; } /* ECMA-262 3rd Edition 11.4.2 */ @@ -2460,6 +2420,41 @@ static HRESULT interp_delete(exec_ctx_t *ctx) } /* ECMA-262 3rd Edition 11.4.2 */ +static HRESULT interp_delete_ident(exec_ctx_t *ctx) +{ + const BSTR arg = ctx->parser->code->instrs[ctx->ip].arg1.bstr; + IDispatchEx *dispex; + exprval_t exprval; + BOOL ret = FALSE; + HRESULT hres; + + TRACE("%s\n", debugstr_w(arg)); + + hres = identifier_eval(ctx->parser->script, arg, 0, &ctx->ei, &exprval); + if(FAILED(hres)) + return hres; + + if(exprval.type != EXPRVAL_IDREF) { + FIXME("Unsupported exprval\n"); + exprval_release(&exprval); + return E_NOTIMPL; + } + + hres = IDispatch_QueryInterface(exprval.u.idref.disp, &IID_IDispatchEx, (void**)&dispex); + 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; + } + + return stack_push_bool(ctx, ret); +} + +/* ECMA-262 3rd Edition 11.4.2 */ static HRESULT interp_void(exec_ctx_t *ctx) { VARIANT v; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 0c46383..3147092 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -52,6 +52,7 @@ typedef struct _func_stack { X(call_member,1, ARG_UINT, ARG_UINT) \ X(carray, 1, ARG_UINT, 0) \ X(delete, 1, 0,0) \ + X(delete_ident,1,ARG_BSTR, 0) \ X(div, 1, 0,0) \ X(double, 1, ARG_SBL, 0) \ X(eq, 1, 0,0) \

1 0