December 2011 - Wine-commits

Ričardas Barkauskas : ws2_32: Don' t post completion packet if sending fails with error immediately.
by Alexandre Julliard 28 Dec '11

28 Dec '11

Module: wine Branch: master Commit: 1bbe92e79b77d7eeb13afe506512ae018db37095 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bbe92e79b77d7eeb13afe506… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Wed Dec 28 01:25:20 2011 +0200 ws2_32: Don't post completion packet if sending fails with error immediately. --- dlls/ws2_32/socket.c | 2 -- dlls/ws2_32/tests/sock.c | 8 ++++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 0e9524e..d3a4590 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3885,9 +3885,7 @@ static int WS2_sendto( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, } if (n == -1 && errno != EAGAIN) { - int loc_errno = errno; err = wsaErrno(); - if (cvalue) WS_AddCompletion( s, cvalue, sock_get_ntstatus(loc_errno), 0 ); goto error; } diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 7016dfb..5677a2c 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5321,10 +5321,10 @@ static void test_completion_port(void) bret = GetQueuedCompletionStatus( io_port, &num_bytes, &key, &olp, 200 ); ok(bret == FALSE, "GetQueuedCompletionStatus returned %u\n", bret ); - todo_wine ok(GetLastError() == WAIT_TIMEOUT, "Last error was %d\n", GetLastError()); - todo_wine ok(key == 0xdeadbeef, "Key is %lu\n", key); - todo_wine ok(num_bytes == 0xdeadbeef, "Number of bytes transfered is %u\n", num_bytes); - todo_wine ok(!olp, "Overlaped structure is at %p\n", olp); + ok(GetLastError() == WAIT_TIMEOUT, "Last error was %d\n", GetLastError()); + ok(key == 0xdeadbeef, "Key is %lu\n", key); + ok(num_bytes == 0xdeadbeef, "Number of bytes transfered is %u\n", num_bytes); + ok(!olp, "Overlaped structure is at %p\n", olp); if (dest != INVALID_SOCKET) closesocket(dest);

1 0

André Hentschel : po: Update German translation.
by Alexandre Julliard 28 Dec '11

28 Dec '11

Module: wine Branch: master Commit: 277361d7be206e1ff7634998f0d750f7c6d66498 URL: http://source.winehq.org/git/wine.git/?a=commit;h=277361d7be206e1ff7634998f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Dec 28 19:23:46 2011 +0100 po: Update German translation. --- po/de.po | 195 ++++++++++++++++++++++++++++++------------------------------- 1 files changed, 96 insertions(+), 99 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=277361d7be206e1ff7634…

1 0

Francois Gouget : include: Move the ITargetFramePriv* interfaces to htiface .idl.
by Alexandre Julliard 28 Dec '11

28 Dec '11

Module: wine Branch: master Commit: df1a5cb9d0d5120d359cc8cfbbc1b3eb853fc3ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=df1a5cb9d0d5120d359cc8cfb… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Dec 28 10:40:07 2011 +0100 include: Move the ITargetFramePriv* interfaces to htiface.idl. --- .gitignore | 1 + dlls/uuid/uuid.c | 1 + include/Makefile.in | 1 + include/htiface.idl | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++ include/htiframe.idl | 61 ------------------------------------ 5 files changed, 87 insertions(+), 61 deletions(-) diff --git a/.gitignore b/.gitignore index 97c1f18..f8756f7 100644 --- a/.gitignore +++ b/.gitignore @@ -166,6 +166,7 @@ include/exdisp.h include/fusion.h include/gameux.h include/hlink.h +include/htiface.h include/htiframe.h include/httprequest.h include/iads.h diff --git a/dlls/uuid/uuid.c b/dlls/uuid/uuid.c index 0a60a5c..3318dd6 100644 --- a/dlls/uuid/uuid.c +++ b/dlls/uuid/uuid.c @@ -69,6 +69,7 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); #include "hlink.h" #include "optary.h" #include "indexsrv.h" +#include "htiface.h" #include "htiframe.h" #include "urlhist.h" #include "hlguids.h" diff --git a/include/Makefile.in b/include/Makefile.in index 2d139e4..0c4122e 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -38,6 +38,7 @@ PUBLIC_IDL_H_SRCS = \ fusion.idl \ gameux.idl \ hlink.idl \ + htiface.idl \ htiframe.idl \ httprequest.idl \ iads.idl \ diff --git a/include/htiface.idl b/include/htiface.idl new file mode 100644 index 0000000..2c98ec2 --- /dev/null +++ b/include/htiface.idl @@ -0,0 +1,84 @@ +/* + * Copyright 2006,2011 Jacek Caban for CodeWeavers + * + * 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 + */ + +import "objidl.idl"; +import "oleidl.idl"; +import "urlmon.idl"; + +cpp_quote("#include <htiframe.h>") + + +/***************************************************************************** + * ITargetFramePriv interface + */ +[ + object, + uuid(9216e421-2bf5-11d0-82b4-00a0c90c29c5), + pointer_default(unique) +] +interface ITargetFramePriv : IUnknown +{ + typedef [unique] ITargetFramePriv *LPTARGETFRAMEPRIV; + + HRESULT FindFrameDownwards( + [in] LPCWSTR pszTargetName, + [in] DWORD dwFlags, + [out] IUnknown **ppunkTargetFrame); + + HRESULT FindFrameInContext( + [in] LPCWSTR pszTargetName, + [in] IUnknown *punkContextFrame, + [in] DWORD dwFlags, + [out] IUnknown **ppunkTargetFrame); + + HRESULT OnChildFrameActivate([in] IUnknown *pUnkChildFrame); + HRESULT OnChildFrameDeactivate([in] IUnknown *pUnkChildFrame); + + HRESULT NavigateHack( + [in] DWORD grfHLNF, + [in, unique] LPBC pbc, + [in, unique] IBindStatusCallback *pibsc, + [in, unique] LPCWSTR pszTargetName, + [in] LPCWSTR pszUrl, + [in, unique] LPCWSTR pszLocation); + + HRESULT FindBrowserByIndex( + [in] DWORD dwID, + [out] IUnknown **ppunkBrowser); +} + +/***************************************************************************** + * ITargetFramePriv2 interface + */ +[ + object, + uuid(b2c867e6-69d6-46f2-a611-ded9a4bd7fef), + pointer_default(unique) +] +interface ITargetFramePriv2 : ITargetFramePriv +{ + typedef [unique] ITargetFramePriv2 *LPTARGETFRAMEPRIV2; + + HRESULT AggregatedNavigation2( + [in] DWORD grfHLNF, + [in, unique] LPBC pbc, + [in, unique] IBindStatusCallback *pibsc, + [in, unique] LPCWSTR pszTargetName, + [in] IUri *pUri, + [in, unique] LPCWSTR pszLocation); +} diff --git a/include/htiframe.idl b/include/htiframe.idl index 6bf0680..a14de89 100644 --- a/include/htiframe.idl +++ b/include/htiframe.idl @@ -18,7 +18,6 @@ import "objidl.idl"; import "oleidl.idl"; -import "urlmon.idl"; /***************************************************************************** * ITargetNotify interface @@ -133,63 +132,3 @@ interface ITargetContainer : IUnknown HRESULT GetFramesContainer([out] IOleContainer **ppContainer); } - -/***************************************************************************** - * ITargetFramePriv interface - */ -[ - object, - uuid(9216e421-2bf5-11d0-82b4-00a0c90c29c5), - pointer_default(unique) -] -interface ITargetFramePriv : IUnknown -{ - typedef [unique] ITargetFramePriv *LPTARGETFRAMEPRIV; - - HRESULT FindFrameDownwards( - [in] LPCWSTR pszTargetName, - [in] DWORD dwFlags, - [out] IUnknown **ppunkTargetFrame); - - HRESULT FindFrameInContext( - [in] LPCWSTR pszTargetName, - [in] IUnknown *punkContextFrame, - [in] DWORD dwFlags, - [out] IUnknown **ppunkTargetFrame); - - HRESULT OnChildFrameActivate([in] IUnknown *pUnkChildFrame); - HRESULT OnChildFrameDeactivate([in] IUnknown *pUnkChildFrame); - - HRESULT NavigateHack( - [in] DWORD grfHLNF, - [in, unique] LPBC pbc, - [in, unique] IBindStatusCallback *pibsc, - [in, unique] LPCWSTR pszTargetName, - [in] LPCWSTR pszUrl, - [in, unique] LPCWSTR pszLocation); - - HRESULT FindBrowserByIndex( - [in] DWORD dwID, - [out] IUnknown **ppunkBrowser); -} - -/***************************************************************************** - * ITargetFramePriv2 interface - */ -[ - object, - uuid(b2c867e6-69d6-46f2-a611-ded9a4bd7fef), - pointer_default(unique) -] -interface ITargetFramePriv2 : ITargetFramePriv -{ - typedef [unique] ITargetFramePriv2 *LPTARGETFRAMEPRIV2; - - HRESULT AggregatedNavigation2( - [in] DWORD grfHLNF, - [in, unique] LPBC pbc, - [in, unique] IBindStatusCallback *pibsc, - [in, unique] LPCWSTR pszTargetName, - [in] IUri *pUri, - [in, unique] LPCWSTR pszLocation); -}

1 0

Francois Gouget : winetest: Always report errors and fatal errors, even in quiet mode.
by Alexandre Julliard 28 Dec '11

28 Dec '11

Module: wine Branch: master Commit: 043c7fc0760736ea1bafcea8e64b7d2da9550c89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=043c7fc0760736ea1bafcea8e… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Dec 28 10:42:11 2011 +0100 winetest: Always report errors and fatal errors, even in quiet mode. --- programs/winetest/gui.c | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) diff --git a/programs/winetest/gui.c b/programs/winetest/gui.c index a9f3465..d5e3e27 100644 --- a/programs/winetest/gui.c +++ b/programs/winetest/gui.c @@ -402,12 +402,6 @@ qNoOp (va_list ap) } static int -qFatal (va_list ap) -{ - exit (1); -} - -static int qAsk (va_list ap) { return MBdefault (va_arg (ap, int)); @@ -507,7 +501,7 @@ report (enum report_type t, ...) static r_fun_t * const quiet_funcs[] = {qNoOp, qNoOp, qNoOp, qNoOp, qNoOp, qNoOp, qNoOp, - qNoOp, qNoOp, qFatal, qAsk}; + qNoOp, textError, textFatal, qAsk}; static r_fun_t * const * funcs = NULL; switch (t) {

1 0

Francois Gouget : sensapi: Define the SensEvents library in sensevts.idl.
by Alexandre Julliard 28 Dec '11

28 Dec '11

Module: wine Branch: master Commit: 862377f123f4821aa3e3ac62065a3d7131cfc8d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=862377f123f4821aa3e3ac620… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Dec 28 10:44:33 2011 +0100 sensapi: Define the SensEvents library in sensevts.idl. Also import wtypes.idl. --- include/sensevts.idl | 191 ++++++++++++++++++++++++++----------------------- 1 files changed, 101 insertions(+), 90 deletions(-) diff --git a/include/sensevts.idl b/include/sensevts.idl index 1ecb9f7..70a469a 100644 --- a/include/sensevts.idl +++ b/include/sensevts.idl @@ -16,101 +16,112 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +import "wtypes.idl"; import "oaidl.idl"; -typedef struct SENS_QOCINFO -{ - DWORD dwSize; - DWORD dwFlags; - DWORD dwOutSpeed; - DWORD dwInSpeed; -} SENS_QOCINFO, *LPSENS_QOCINFO; - [ - object, - uuid(d597bab1-5b9f-11d1-8dd2-00aa004abd5e), - pointer_default(unique) + version(2.0), + uuid(d597deed-5b9f-11d1-8dd2-00aa004abd5e) ] -interface ISensNetwork : IDispatch +library SensEvents { - HRESULT ConnectionMade( - [in] BSTR bstrConnection, - [in] ULONG ulType, - [in] LPSENS_QOCINFO lpQOCInfo ); - HRESULT ConnectionMadeNoQOCInfo( - [in] BSTR bstrConnection, - [in] ULONG ulType ); - HRESULT ConnectionLost( - [in] BSTR bstrConnection, - [in] ULONG ulType ); - HRESULT DestinationReachable( - [in] BSTR bstrDestination, - [in] BSTR bstrConnection, - [in] ULONG ulType, - [in] LPSENS_QOCINFO lpQOCInfo ); - HRESULT DestinationReachableNoQOCInfo( - [in] BSTR bstrDestination, - [in] BSTR bstrConnection, - [in] ULONG ulType ); -} + importlib("stdole2.tlb"); -[ - object, - uuid(d597bab2-5b9f-11d1-8dd2-00aa004abd5e), - pointer_default(unique) -] -interface ISensOnNow : IDispatch -{ - HRESULT OnAcPower( void ); - HRESULT OnBatteryPower( - [in] DWORD dwBatteryLifePercent ); - HRESULT BatteryLow( - [in] DWORD dwBatteryLifePercent ); -} + typedef struct SENS_QOCINFO + { + DWORD dwSize; + DWORD dwFlags; + DWORD dwOutSpeed; + DWORD dwInSpeed; + } SENS_QOCINFO, *LPSENS_QOCINFO; -[ - object, - uuid(d597bab3-5b9f-11d1-8dd2-00aa004abd5e), - pointer_default(unique) -] -interface ISensLogon : IDispatch -{ - HRESULT Logon( - [in] BSTR bstrUserName ); - HRESULT Logoff( - [in] BSTR bstrUserName ); - HRESULT StartShell( - [in] BSTR bstrUserName ); - HRESULT DisplayLock( - [in] BSTR bstrUserName ); - HRESULT DisplayUnlock( - [in] BSTR bstrUserName ); - HRESULT StartScreenSaver( - [in] BSTR bstrUserName ); - HRESULT StopScreenSaver( - [in] BSTR bstrUserName ); -} + [ + object, + uuid(d597bab1-5b9f-11d1-8dd2-00aa004abd5e), + pointer_default(unique) + ] + interface ISensNetwork : IDispatch + { + HRESULT ConnectionMade( + [in] BSTR bstrConnection, + [in] ULONG ulType, + [in] LPSENS_QOCINFO lpQOCInfo ); + HRESULT ConnectionMadeNoQOCInfo( + [in] BSTR bstrConnection, + [in] ULONG ulType ); + HRESULT ConnectionLost( + [in] BSTR bstrConnection, + [in] ULONG ulType ); + HRESULT DestinationReachable( + [in] BSTR bstrDestination, + [in] BSTR bstrConnection, + [in] ULONG ulType, + [in] LPSENS_QOCINFO lpQOCInfo ); + HRESULT DestinationReachableNoQOCInfo( + [in] BSTR bstrDestination, + [in] BSTR bstrConnection, + [in] ULONG ulType ); + } -[ - object, - uuid(d597bab4-5b9f-11d1-8dd2-00aa004abd5e), - pointer_default(unique) -] -interface ISensLogon2 : IDispatch -{ - HRESULT Logon( - [in] BSTR bstrUserName, - [in] DWORD dwSessionId ); - HRESULT Logoff( - [in] BSTR bstrUserName, - [in] DWORD dwSessionId ); - HRESULT SessionDisconnect( - [in] BSTR bstrUserName, - [in] DWORD dwSessionId ); - HRESULT SessionReconnect( - [in] BSTR bstrUserName, - [in] DWORD dwSessionId ); - HRESULT PostShell( - [in] BSTR bstrUserName, - [in] DWORD dwSessionId ); -} + [ + object, + uuid(d597bab2-5b9f-11d1-8dd2-00aa004abd5e), + pointer_default(unique) + ] + interface ISensOnNow : IDispatch + { + HRESULT OnAcPower( void ); + HRESULT OnBatteryPower( + [in] DWORD dwBatteryLifePercent ); + HRESULT BatteryLow( + [in] DWORD dwBatteryLifePercent ); + } + + [ + object, + uuid(d597bab3-5b9f-11d1-8dd2-00aa004abd5e), + pointer_default(unique) + ] + interface ISensLogon : IDispatch + { + HRESULT Logon( + [in] BSTR bstrUserName ); + HRESULT Logoff( + [in] BSTR bstrUserName ); + HRESULT StartShell( + [in] BSTR bstrUserName ); + HRESULT DisplayLock( + [in] BSTR bstrUserName ); + HRESULT DisplayUnlock( + [in] BSTR bstrUserName ); + HRESULT StartScreenSaver( + [in] BSTR bstrUserName ); + HRESULT StopScreenSaver( + [in] BSTR bstrUserName ); + } + + [ + object, + uuid(d597bab4-5b9f-11d1-8dd2-00aa004abd5e), + pointer_default(unique) + ] + interface ISensLogon2 : IDispatch + { + HRESULT Logon( + [in] BSTR bstrUserName, + [in] DWORD dwSessionId ); + HRESULT Logoff( + [in] BSTR bstrUserName, + [in] DWORD dwSessionId ); + HRESULT SessionDisconnect( + [in] BSTR bstrUserName, + [in] DWORD dwSessionId ); + HRESULT SessionReconnect( + [in] BSTR bstrUserName, + [in] DWORD dwSessionId ); + HRESULT PostShell( + [in] BSTR bstrUserName, + [in] DWORD dwSessionId ); + } + +} /* library SensEvents */

1 0

Francois Gouget : quartz: Define the QuartzTypeLib library in control.idl.
by Alexandre Julliard 28 Dec '11

28 Dec '11

Module: wine Branch: master Commit: 209132724a8cfefaef6a7c2b95c41d97b0ba04a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=209132724a8cfefaef6a7c2b9… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Dec 28 10:45:12 2011 +0100 quartz: Define the QuartzTypeLib library in control.idl. Also remove some unneeded forward declarations. --- include/control.idl | 446 ++++++++++++++++++++++++++------------------------- 1 files changed, 224 insertions(+), 222 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=209132724a8cfefaef6a7…

1 0

Jacek Caban : jscript: Added bytecode version of for..in statement.
by Alexandre Julliard 28 Dec '11

28 Dec '11

Module: wine Branch: master Commit: 661241a392bb90b931e8637f4f3e28f1369bc3a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=661241a392bb90b931e8637f4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 28 12:05:53 2011 +0100 jscript: Added bytecode version of for..in statement. --- dlls/jscript/compile.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/jscript/engine.c | 67 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/jscript/engine.h | 1 + dlls/jscript/parser.y | 2 +- 4 files changed, 137 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 5f25598..585520d 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -1097,6 +1097,72 @@ static HRESULT compile_for_statement(compiler_ctx_t *ctx, for_statement_t *stat) return S_OK; } +/* ECMA-262 3rd Edition 12.6.4 */ +static HRESULT compile_forin_statement(compiler_ctx_t *ctx, forin_statement_t *stat) +{ + unsigned loop_addr, off_backup = ctx->code_off; + BOOL prev_no_fallback; + HRESULT hres; + + if(stat->variable) { + hres = compile_variable_list(ctx, stat->variable); + if(FAILED(hres)) + return hres; + } + + hres = compile_expression(ctx, stat->in_expr); + if(FAILED(hres)) + return hres; + + if(stat->variable) { + hres = push_instr_bstr_uint(ctx, OP_identid, stat->variable->identifier, fdexNameEnsure); + if(FAILED(hres)) + return hres; + }else if(is_memberid_expr(stat->expr->type)) { + hres = compile_memberid_expression(ctx, stat->expr, fdexNameEnsure); + if(FAILED(hres)) + return hres; + }else { + hres = push_instr_uint(ctx, OP_throw, JS_E_ILLEGAL_ASSIGN); + if(FAILED(hres)) + return hres; + + /* FIXME: compile statement anyways when we depend on compiler to check errors */ + return S_OK; + } + + hres = push_instr_int(ctx, OP_int, DISPID_STARTENUM); + if(FAILED(hres)) + return hres; + + /* FIXME: avoid */ + if(push_instr(ctx, OP_undefined) == -1) + return E_OUTOFMEMORY; + + loop_addr = ctx->code_off; + if(push_instr(ctx, OP_forin) == -1) + return E_OUTOFMEMORY; + + prev_no_fallback = ctx->no_fallback; + ctx->no_fallback = TRUE; + hres = compile_statement(ctx, stat->statement); + ctx->no_fallback = prev_no_fallback; + if(hres == E_NOTIMPL) { + ctx->code_off = off_backup; + stat->stat.eval = forin_statement_eval; + return compile_interp_fallback(ctx, &stat->stat); + } + if(FAILED(hres)) + return hres; + + hres = push_instr_uint(ctx, OP_jmp, loop_addr); + if(FAILED(hres)) + return hres; + + instr_ptr(ctx, loop_addr)->arg1.uint = ctx->code_off; + return S_OK; +} + /* ECMA-262 3rd Edition 12.10 */ static HRESULT compile_with_statement(compiler_ctx_t *ctx, with_statement_t *stat) { @@ -1244,6 +1310,8 @@ static HRESULT compile_statement(compiler_ctx_t *ctx, statement_t *stat) return compile_expression_statement(ctx, (expression_statement_t*)stat); case STAT_FOR: return compile_for_statement(ctx, (for_statement_t*)stat); + case STAT_FORIN: + return compile_forin_statement(ctx, (forin_statement_t*)stat); case STAT_IF: return compile_if_statement(ctx, (if_statement_t*)stat); case STAT_LABEL: diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index fbeee6f..f3268ba 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -936,6 +936,73 @@ HRESULT forin_statement_eval(script_ctx_t *ctx, statement_t *_stat, return_type_ return S_OK; } +/* ECMA-262 3rd Edition 12.6.4 */ +static HRESULT interp_forin(exec_ctx_t *ctx) +{ + const HRESULT arg = ctx->parser->code->instrs[ctx->ip].arg1.uint; + IDispatch *var_obj, *obj = NULL; + IDispatchEx *dispex; + DISPID id, var_id; + BSTR name = NULL; + VARIANT *val; + HRESULT hres; + + TRACE("\n"); + + val = stack_pop(ctx); + + assert(V_VT(stack_top(ctx)) == VT_I4); + id = V_I4(stack_top(ctx)); + + var_obj = stack_topn_objid(ctx, 1, &var_id); + if(!var_obj) { + FIXME("invalid ref\n"); + VariantClear(val); + return E_FAIL; + } + + if(V_VT(stack_topn(ctx, 3)) == VT_DISPATCH) + obj = V_DISPATCH(stack_topn(ctx, 3)); + + if(obj) { + hres = IDispatch_QueryInterface(obj, &IID_IDispatchEx, (void**)&dispex); + if(SUCCEEDED(hres)) { + hres = IDispatchEx_GetNextDispID(dispex, fdexEnumDefault, id, &id); + if(hres == S_OK) + hres = IDispatchEx_GetMemberName(dispex, id, &name); + IDispatchEx_Release(dispex); + if(FAILED(hres)) { + VariantClear(val); + return hres; + } + }else { + TRACE("No IDispatchEx\n"); + } + } + + if(name) { + VARIANT v; + + VariantClear(val); + + V_I4(stack_top(ctx)) = id; + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = name; + hres = disp_propput(ctx->parser->script, var_obj, var_id, &v, ctx->ei, NULL/*FIXME*/); + SysFreeString(name); + if(FAILED(hres)) + return hres; + + ctx->ip++; + }else { + stack_popn(ctx, 4); + ctx->ip = arg; + return stack_push(ctx, val); + } + return S_OK; +} + /* ECMA-262 3rd Edition 12.7 */ HRESULT continue_statement_eval(script_ctx_t *ctx, statement_t *_stat, return_type_t *rt, VARIANT *ret) { diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 7dbaeb2..b2f2f82 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -61,6 +61,7 @@ typedef struct _func_stack { X(double, 1, ARG_SBL, 0) \ X(eq, 1, 0,0) \ X(eq2, 1, 0,0) \ + X(forin, 0, ARG_UINT, 0) \ X(func, 1, ARG_FUNC, 0) \ X(gt, 1, 0,0) \ X(gteq, 1, 0,0) \ diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 02d35bd..a184202 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -842,7 +842,7 @@ static const statement_eval_t stat_eval_table[] = { compiled_statement_eval, compiled_statement_eval, compiled_statement_eval, - forin_statement_eval, + compiled_statement_eval, compiled_statement_eval, compiled_statement_eval, return_statement_eval,

1 0

Jacek Caban : jscript: Rename throw opcode to throw_ref.
by Alexandre Julliard 28 Dec '11

28 Dec '11

Module: wine Branch: master Commit: 3f4f9f0f40d607a60ad3263489a747e679d0d696 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f4f9f0f40d607a60ad326348… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 28 12:06:03 2011 +0100 jscript: Rename throw opcode to throw_ref. --- dlls/jscript/compile.c | 6 +++--- dlls/jscript/engine.c | 2 +- dlls/jscript/engine.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 585520d..c02db25 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -322,7 +322,7 @@ static HRESULT compile_increment_expression(compiler_ctx_t *ctx, unary_expressio if(FAILED(hres)) return hres; - return push_instr_uint(ctx, OP_throw, JS_E_ILLEGAL_ASSIGN); + return push_instr_uint(ctx, OP_throw_ref, JS_E_ILLEGAL_ASSIGN); } hres = compile_memberid_expression(ctx, expr->expression, fdexNameEnsure); @@ -545,7 +545,7 @@ static HRESULT compile_assign_expression(compiler_ctx_t *ctx, binary_expression_ if(op != OP_LAST && push_instr(ctx, op) == -1) return E_OUTOFMEMORY; - return push_instr_uint(ctx, OP_throw, JS_E_ILLEGAL_ASSIGN); + return push_instr_uint(ctx, OP_throw_ref, JS_E_ILLEGAL_ASSIGN); } hres = compile_memberid_expression(ctx, expr->expression1, fdexNameEnsure); @@ -1123,7 +1123,7 @@ static HRESULT compile_forin_statement(compiler_ctx_t *ctx, forin_statement_t *s if(FAILED(hres)) return hres; }else { - hres = push_instr_uint(ctx, OP_throw, JS_E_ILLEGAL_ASSIGN); + hres = push_instr_uint(ctx, OP_throw_ref, JS_E_ILLEGAL_ASSIGN); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index f3268ba..5c4852b 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1250,7 +1250,7 @@ HRESULT throw_statement_eval(script_ctx_t *ctx, statement_t *_stat, return_type_ return DISP_E_EXCEPTION; } -static HRESULT interp_throw(exec_ctx_t *ctx) +static HRESULT interp_throw_ref(exec_ctx_t *ctx) { const HRESULT arg = ctx->parser->code->instrs[ctx->ip].arg1.uint; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index b2f2f82..147bcad 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -99,7 +99,7 @@ typedef struct _func_stack { X(rshift2, 1, 0,0) \ X(str, 1, ARG_STR, 0) \ X(this, 1, 0,0) \ - X(throw, 0, ARG_UINT, 0) \ + X(throw_ref, 0, ARG_UINT, 0) \ X(throw_type, 0, ARG_UINT, ARG_STR) \ X(tonum, 1, 0,0) \ X(tree, 1, ARG_STAT, 0) \

1 0

Jacek Caban : jscript: Use bytecode for throw statement.
by Alexandre Julliard 28 Dec '11

28 Dec '11

Module: wine Branch: master Commit: 02ff8d18539455cfda8efa2c0b719e9998dea396 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02ff8d18539455cfda8efa2c0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 28 12:06:17 2011 +0100 jscript: Use bytecode for throw statement. --- dlls/jscript/compile.c | 14 ++++++++++++++ dlls/jscript/engine.c | 12 ++---------- dlls/jscript/engine.h | 2 +- dlls/jscript/parser.y | 2 +- 4 files changed, 18 insertions(+), 12 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index c02db25..9e8cb47 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -1299,6 +1299,18 @@ static HRESULT compile_switch_statement(compiler_ctx_t *ctx, switch_statement_t return S_OK; } +/* ECMA-262 3rd Edition 12.13 */ +static HRESULT compile_throw_statement(compiler_ctx_t *ctx, expression_statement_t *stat) +{ + HRESULT hres; + + hres = compile_expression(ctx, stat->expr); + if(FAILED(hres)) + return hres; + + return push_instr(ctx, OP_throw) == -1 ? E_OUTOFMEMORY : S_OK; +} + static HRESULT compile_statement(compiler_ctx_t *ctx, statement_t *stat) { switch(stat->type) { @@ -1318,6 +1330,8 @@ static HRESULT compile_statement(compiler_ctx_t *ctx, statement_t *stat) return push_instr(ctx, OP_label) == -1 ? E_OUTOFMEMORY : S_OK; /* FIXME */ case STAT_SWITCH: return compile_switch_statement(ctx, (switch_statement_t*)stat); + case STAT_THROW: + return compile_throw_statement(ctx, (expression_statement_t*)stat); case STAT_VAR: return compile_var_statement(ctx, (var_statement_t*)stat); case STAT_WHILE: diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 5c4852b..b7b3248 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1234,19 +1234,11 @@ HRESULT switch_statement_eval(script_ctx_t *ctx, statement_t *_stat, return_type } /* ECMA-262 3rd Edition 12.13 */ -HRESULT throw_statement_eval(script_ctx_t *ctx, statement_t *_stat, return_type_t *rt, VARIANT *ret) +static HRESULT interp_throw(exec_ctx_t *ctx) { - expression_statement_t *stat = (expression_statement_t*)_stat; - VARIANT val; - HRESULT hres; - TRACE("\n"); - hres = expr_eval(ctx, stat->expr, &rt->ei, &val); - if(FAILED(hres)) - return hres; - - rt->ei.var = val; + ctx->rt->ei.var = *stack_pop(ctx); return DISP_E_EXCEPTION; } diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 147bcad..9aa5616 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -99,6 +99,7 @@ typedef struct _func_stack { X(rshift2, 1, 0,0) \ X(str, 1, ARG_STR, 0) \ X(this, 1, 0,0) \ + X(throw, 0, 0,0) \ X(throw_ref, 0, ARG_UINT, 0) \ X(throw_type, 0, ARG_UINT, ARG_STR) \ X(tonum, 1, 0,0) \ @@ -413,7 +414,6 @@ HRESULT break_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) HRESULT return_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) DECLSPEC_HIDDEN; HRESULT with_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) DECLSPEC_HIDDEN; HRESULT switch_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) DECLSPEC_HIDDEN; -HRESULT throw_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) DECLSPEC_HIDDEN; HRESULT try_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) DECLSPEC_HIDDEN; typedef struct { diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index a184202..570eb5b 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -847,7 +847,7 @@ static const statement_eval_t stat_eval_table[] = { compiled_statement_eval, return_statement_eval, compiled_statement_eval, - throw_statement_eval, + compiled_statement_eval, try_statement_eval, compiled_statement_eval, compiled_statement_eval,

1 0

Jacek Caban : jscript: Added bytecode version of try statement.
by Alexandre Julliard 28 Dec '11

28 Dec '11

Module: wine Branch: master Commit: 3b56e49ef9769671a904cb5ca8d1ce16e4b6bf39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b56e49ef9769671a904cb5ca… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 28 12:06:28 2011 +0100 jscript: Added bytecode version of try statement. --- dlls/jscript/compile.c | 92 ++++++++++++++++++++++++++ dlls/jscript/engine.c | 157 +++++++++++++++++++++++++++++++++++++++++++- dlls/jscript/engine.h | 7 ++- dlls/jscript/parser.y | 2 +- dlls/jscript/tests/lang.js | 23 +++++++ 5 files changed, 276 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3b56e49ef9769671a904c…

1 0