December 2011 - Wine-commits

Hans Leidekker : msi: Don' t set the LOGVERBOSE property in MsiReinstallFeatureW.
by Alexandre Julliard 13 Dec '11

13 Dec '11

Module: wine Branch: master Commit: 12e106613a0024ba2561fa60311a10f09fa93857 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12e106613a0024ba2561fa603… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 13 13:19:32 2011 +0100 msi: Don't set the LOGVERBOSE property in MsiReinstallFeatureW. --- dlls/msi/msi.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index d062ad0..09b2d36 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -3773,8 +3773,6 @@ UINT WINAPI MsiGetShortcutTargetW( LPCWSTR szShortcutTarget, UINT WINAPI MsiReinstallFeatureW( LPCWSTR szProduct, LPCWSTR szFeature, DWORD dwReinstallMode ) { - static const WCHAR szLogVerbose[] = - {' ','L','O','G','V','E','R','B','O','S','E',0}; MSIPACKAGE *package; MSIINSTALLCONTEXT context; UINT r; @@ -3831,7 +3829,6 @@ UINT WINAPI MsiReinstallFeatureW( LPCWSTR szProduct, LPCWSTR szFeature, return r; msi_set_property( package->db, szReinstallMode, reinstallmode ); - msi_set_property( package->db, szLogVerbose, szOne ); msi_set_property( package->db, szReinstall, szFeature ); r = MSI_InstallPackage( package, sourcepath, NULL );

1 0

Hans Leidekker : msi: Pass REINSTALL and REINSTALLMODE properties on the command line in MsiReinstallFeatureW .
by Alexandre Julliard 13 Dec '11

13 Dec '11

Module: wine Branch: master Commit: 8a5c700d786ee0490187d92c7b54eb7047ce2920 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a5c700d786ee0490187d92c7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 13 13:19:49 2011 +0100 msi: Pass REINSTALL and REINSTALLMODE properties on the command line in MsiReinstallFeatureW. --- dlls/msi/msi.c | 24 ++++++++++++++---------- 1 files changed, 14 insertions(+), 10 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 09b2d36..bdcb17a 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -3770,14 +3770,14 @@ UINT WINAPI MsiGetShortcutTargetW( LPCWSTR szShortcutTarget, return ERROR_FUNCTION_FAILED; } -UINT WINAPI MsiReinstallFeatureW( LPCWSTR szProduct, LPCWSTR szFeature, - DWORD dwReinstallMode ) +UINT WINAPI MsiReinstallFeatureW( LPCWSTR szProduct, LPCWSTR szFeature, DWORD dwReinstallMode ) { + static const WCHAR fmtW[] = {'%','s','=','%','s',' ','%','s','=','%','s',0}; MSIPACKAGE *package; MSIINSTALLCONTEXT context; UINT r; WCHAR sourcepath[MAX_PATH], filename[MAX_PATH], reinstallmode[11]; - LPWSTR ptr; + WCHAR *ptr, *cmdline; DWORD sz; TRACE("%s, %s, 0x%08x\n", debugstr_w(szProduct), debugstr_w(szFeature), dwReinstallMode); @@ -3813,12 +3813,10 @@ UINT WINAPI MsiReinstallFeatureW( LPCWSTR szProduct, LPCWSTR szFeature, sz = sizeof(sourcepath); MsiSourceListGetInfoW( szProduct, NULL, context, MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDSOURCEW, sourcepath, &sz ); - sz = sizeof(filename); MsiSourceListGetInfoW( szProduct, NULL, context, MSICODE_PRODUCT, INSTALLPROPERTY_PACKAGENAMEW, filename, &sz ); - - lstrcatW( sourcepath, filename ); + strcatW( sourcepath, filename ); if (dwReinstallMode & REINSTALLMODE_PACKAGE) r = MSI_OpenPackageW( sourcepath, &package ); @@ -3828,12 +3826,18 @@ UINT WINAPI MsiReinstallFeatureW( LPCWSTR szProduct, LPCWSTR szFeature, if (r != ERROR_SUCCESS) return r; - msi_set_property( package->db, szReinstallMode, reinstallmode ); - msi_set_property( package->db, szReinstall, szFeature ); - - r = MSI_InstallPackage( package, sourcepath, NULL ); + sz = (strlenW( fmtW ) + strlenW( szReinstallMode ) + strlenW( reinstallmode )) * sizeof(WCHAR); + sz += (strlenW( szReinstall ) + strlenW( szFeature )) * sizeof(WCHAR); + if (!(cmdline = msi_alloc( sz ))) + { + msiobj_release( &package->hdr ); + return ERROR_OUTOFMEMORY; + } + sprintfW( cmdline, fmtW, szReinstallMode, reinstallmode, szReinstall, szFeature ); + r = MSI_InstallPackage( package, sourcepath, cmdline ); msiobj_release( &package->hdr ); + msi_free( cmdline ); return r; }

1 0

Hans Leidekker : msi: Don't run the rollback script in reinstall mode.
by Alexandre Julliard 13 Dec '11

13 Dec '11

Module: wine Branch: master Commit: 8cc5561fbf9f3250fbd2d986390e4013e8c9f31b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cc5561fbf9f3250fbd2d9863… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 13 13:20:10 2011 +0100 msi: Don't run the rollback script in reinstall mode. --- dlls/msi/action.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index d4170f5..77749d8 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -7408,11 +7408,12 @@ static UINT ACTION_PerformActionSequence(MSIPACKAGE *package, UINT seq) UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath, LPCWSTR szCommandLine ) { - UINT rc; - BOOL ui_exists; static const WCHAR szDisableRollback[] = {'D','I','S','A','B','L','E','R','O','L','L','B','A','C','K',0}; static const WCHAR szAction[] = {'A','C','T','I','O','N',0}; static const WCHAR szInstall[] = {'I','N','S','T','A','L','L',0}; + WCHAR *reinstall = NULL; + BOOL ui_exists; + UINT rc; msi_set_property( package->db, szAction, szInstall ); @@ -7515,11 +7516,12 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath, /* finish up running custom actions */ ACTION_FinishCustomActions(package); - if (package->need_rollback) + if (package->need_rollback && !(reinstall = msi_dup_property( package->db, szReinstall ))) { WARN("installation failed, running rollback script\n"); execute_script( package, ROLLBACK_SCRIPT ); } + msi_free( reinstall ); if (rc == ERROR_SUCCESS && package->need_reboot) return ERROR_SUCCESS_REBOOT_REQUIRED;

1 0

Alexandre Julliard : widl: Zero-initialize [out] structures and unions that contain pointers.
by Alexandre Julliard 13 Dec '11

13 Dec '11

Module: wine Branch: master Commit: bf0c37d56a263194b229c5fd7e44ddd302b41de4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf0c37d56a263194b229c5fd7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 13 16:29:49 2011 +0100 widl: Zero-initialize [out] structures and unions that contain pointers. --- tools/widl/typegen.c | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index c1b5302..516d8e7 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -4588,6 +4588,7 @@ void assign_stub_out_args( FILE *file, int indent, const var_t *func, const char int in_attr, out_attr; int i = 0, sep = 0; const var_t *var; + type_t *ref; if (!type_get_function_args(func->type)) return; @@ -4646,7 +4647,8 @@ void assign_stub_out_args( FILE *file, int indent, const var_t *func, const char break; case TGT_POINTER: fprintf(file, " = &%s_W%u;\n", local_var_prefix, i); - switch (typegen_detect_type(type_pointer_get_ref(var->type), var->attrs, TDT_IGNORE_STRINGS)) + ref = type_pointer_get_ref(var->type); + switch (typegen_detect_type(ref, var->attrs, TDT_IGNORE_STRINGS)) { case TGT_BASIC: case TGT_ENUM: @@ -4659,9 +4661,20 @@ void assign_stub_out_args( FILE *file, int indent, const var_t *func, const char print_file(file, indent, "memset(&%s_W%u, 0, sizeof(%s_W%u));\n", local_var_prefix, i, local_var_prefix, i); break; + case TGT_ARRAY: + if (type_array_is_decl_as_ptr(ref)) + { + print_file(file, indent, "%s_W%u = 0;\n", local_var_prefix, i); + break; + } + ref = type_array_get_element(ref); + /* fall through */ case TGT_STRUCT: case TGT_UNION: - case TGT_ARRAY: + if (type_has_pointers(ref)) + print_file(file, indent, "memset(&%s_W%u, 0, sizeof(%s_W%u));\n", + local_var_prefix, i, local_var_prefix, i); + break; case TGT_CTXT_HANDLE: case TGT_CTXT_HANDLE_POINTER: case TGT_INVALID:

1 0

Piotr Caban : hlink: Fix leak in HlinkNavigateToStringReference.
by Alexandre Julliard 13 Dec '11

13 Dec '11

Module: wine Branch: master Commit: 445db0a54d4e8ec34c5a1a2b0f3fb6975b9369e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=445db0a54d4e8ec34c5a1a2b0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 13 15:14:13 2011 +0100 hlink: Fix leak in HlinkNavigateToStringReference. --- dlls/hlink/hlink_main.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/hlink/hlink_main.c b/dlls/hlink/hlink_main.c index 54cac9d..9823a5d 100644 --- a/dlls/hlink/hlink_main.c +++ b/dlls/hlink/hlink_main.c @@ -261,14 +261,16 @@ HRESULT WINAPI HlinkNavigateToStringReference( LPCWSTR pwzTarget, HRESULT r; IHlink *hlink = NULL; - FIXME("%s %s %p %08x %p %08x %p %p %p\n", + TRACE("%s %s %p %08x %p %08x %p %p %p\n", debugstr_w(pwzTarget), debugstr_w(pwzLocation), pihlsite, dwSiteData, pihlframe, grfHLNF, pibc, pibsc, pihlbc); r = HlinkCreateFromString( pwzTarget, pwzLocation, NULL, pihlsite, dwSiteData, NULL, &IID_IHlink, (LPVOID*) &hlink ); - if (SUCCEEDED(r)) + if (SUCCEEDED(r)) { r = HlinkNavigate(hlink, pihlframe, grfHLNF, pibc, pibsc, pihlbc); + IHlink_Release(hlink); + } return r; }

1 0

Jacek Caban : htiframe.idl: Added ITargetFramePriv and ITargetFramePriv2 declarations.
by Alexandre Julliard 13 Dec '11

13 Dec '11

Module: wine Branch: master Commit: 754106b5e963c581f504eaea31e9f76af9f41bbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=754106b5e963c581f504eaea3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 13 15:54:54 2011 +0100 htiframe.idl: Added ITargetFramePriv and ITargetFramePriv2 declarations. --- include/htiframe.idl | 63 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 62 insertions(+), 1 deletions(-) diff --git a/include/htiframe.idl b/include/htiframe.idl index 21a55a4..6bf0680 100644 --- a/include/htiframe.idl +++ b/include/htiframe.idl @@ -1,5 +1,5 @@ /* - * Copyright 2006 Jacek Caban for CodeWeavers + * 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 @@ -18,6 +18,7 @@ import "objidl.idl"; import "oleidl.idl"; +import "urlmon.idl"; /***************************************************************************** * ITargetNotify interface @@ -132,3 +133,63 @@ 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

Luca Bennati : po: Update Italian translation.
by Alexandre Julliard 13 Dec '11

13 Dec '11

Module: wine Branch: master Commit: 4918d914e43b0d7dcd444aed3309ae0d96e3d59b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4918d914e43b0d7dcd444aed3… Author: Luca Bennati <lucak3(a)gmail.com> Date: Tue Dec 13 08:21:55 2011 +0100 po: Update Italian translation. --- po/it.po | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/po/it.po b/po/it.po index 1126f0d..f350233 100644 --- a/po/it.po +++ b/po/it.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-12-07 18:06+0100\n" +"PO-Revision-Date: 2011-12-13 08:20+0100\n" "Last-Translator: Luca Bennati <lucak3(a)gmail.com>\n" "Language-Team: none\n" "Language: Italian\n" @@ -3485,7 +3485,6 @@ msgid "Subscript out of range" msgstr "Sottoscript fuori portata" #: jscript.rc:28 -#, fuzzy msgid "Object required" msgstr "Richiesto un oggetto" @@ -3543,7 +3542,7 @@ msgstr "'[oggetto]' non è un oggetto data" #: jscript.rc:42 msgid "Object expected" -msgstr "Richiesto un oggetto" +msgstr "Previsto un oggetto" #: jscript.rc:43 msgid "Illegal assignment" @@ -3555,15 +3554,15 @@ msgstr "'|' non è definito" #: jscript.rc:45 msgid "Boolean object expected" -msgstr "Richiesto un oggetto Booleano" +msgstr "Previsto un oggetto Booleano" #: jscript.rc:46 msgid "VBArray object expected" -msgstr "Richiesto un oggetto VBArray" +msgstr "Previsto un oggetto VBArray" #: jscript.rc:47 msgid "JScript object expected" -msgstr "Richiesto un oggetto JScript" +msgstr "Previsto un oggetto JScript" #: jscript.rc:48 msgid "Syntax error in regular expression" @@ -3583,7 +3582,7 @@ msgstr "La lunghezza dell'array deve essere un intero finito e positivo" #: jscript.rc:52 msgid "Array object expected" -msgstr "Richiesto un oggetto array" +msgstr "Previsto un oggetto array" #: winerror.mc:26 msgid "Success\n"

1 0

Frédéric Delanoy : msvfw32: Use appropriate abbreviation for seconds.
by Alexandre Julliard 13 Dec '11

13 Dec '11

1 0

Jacek Caban : jscript: Use bytecode for typeof expression implementation.
by Alexandre Julliard 13 Dec '11

13 Dec '11

Module: wine Branch: master Commit: 3caf287630279a2658dd99c0be0f9cf387a49132 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3caf287630279a2658dd99c0b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 13 11:57:11 2011 +0100 jscript: Use bytecode for typeof expression implementation. --- dlls/jscript/compile.c | 23 ++++++++ dlls/jscript/engine.c | 135 ++++++++++++++++++++++++++++++++---------------- dlls/jscript/engine.h | 4 +- dlls/jscript/parser.y | 2 +- 4 files changed, 118 insertions(+), 46 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 0d4ce79..ff53c90 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -534,6 +534,27 @@ static HRESULT compile_assign_expression(compiler_ctx_t *ctx, binary_expression_ return S_OK; } +static HRESULT compile_typeof_expression(compiler_ctx_t *ctx, unary_expression_t *expr) +{ + jsop_t op; + HRESULT hres; + + if(is_memberid_expr(expr->expression->type)) { + if(expr->expression->type == EXPR_IDENT) + return push_instr_str(ctx, OP_typeofident, ((identifier_expression_t*)expr->expression)->identifier); + + op = OP_typeofid; + hres = compile_memberid_expression(ctx, expr->expression, 0); + }else { + op = OP_typeof; + hres = compile_expression(ctx, expr->expression); + } + if(FAILED(hres)) + return hres; + + return push_instr(ctx, op) == -1 ? E_OUTOFMEMORY : S_OK; +} + static HRESULT compile_literal(compiler_ctx_t *ctx, literal_t *literal) { switch(literal->type) { @@ -707,6 +728,8 @@ static HRESULT compile_expression_noret(compiler_ctx_t *ctx, expression_t *expr, return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_sub); case EXPR_THIS: return push_instr(ctx, OP_this) == -1 ? E_OUTOFMEMORY : S_OK; + case EXPR_TYPEOF: + return compile_typeof_expression(ctx, (unary_expression_t*)expr); case EXPR_VOID: return compile_unary_expression(ctx, (unary_expression_t*)expr, OP_void); case EXPR_BXOR: diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index da02052..e399aa8 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -32,6 +32,14 @@ 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}; +static const WCHAR numberW[] = {'n','u','m','b','e','r',0}; +static const WCHAR objectW[] = {'o','b','j','e','c','t',0}; +static const WCHAR stringW[] = {'s','t','r','i','n','g',0}; +static const WCHAR undefinedW[] = {'u','n','d','e','f','i','n','e','d',0}; +static const WCHAR unknownW[] = {'u','n','k','n','o','w','n',0}; + struct _return_type_t { enum{ RT_NORMAL, @@ -102,6 +110,15 @@ static inline HRESULT stack_push_int(exec_ctx_t *ctx, INT n) return stack_push(ctx, &v); } +static inline HRESULT stack_push_string(exec_ctx_t *ctx, const WCHAR *str) +{ + VARIANT v; + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = SysAllocString(str); + return V_BSTR(&v) ? stack_push(ctx, &v) : E_OUTOFMEMORY; +} + static HRESULT stack_push_objid(exec_ctx_t *ctx, IDispatch *disp, DISPID id) { VARIANT v; @@ -2456,34 +2473,9 @@ static HRESULT interp_void(exec_ctx_t *ctx) } /* ECMA-262 3rd Edition 11.4.3 */ -static HRESULT typeof_exprval(script_ctx_t *ctx, exprval_t *exprval, jsexcept_t *ei, const WCHAR **ret) +static HRESULT typeof_string(VARIANT *v, const WCHAR **ret) { - VARIANT val; - HRESULT hres; - - 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}; - static const WCHAR numberW[] = {'n','u','m','b','e','r',0}; - static const WCHAR objectW[] = {'o','b','j','e','c','t',0}; - static const WCHAR stringW[] = {'s','t','r','i','n','g',0}; - static const WCHAR undefinedW[] = {'u','n','d','e','f','i','n','e','d',0}; - static const WCHAR unknownW[] = {'u','n','k','n','o','w','n',0}; - - if(exprval->type == EXPRVAL_INVALID) { - *ret = undefinedW; - return S_OK; - } - - hres = exprval_to_value(ctx, exprval, ei, &val); - if(FAILED(hres)) { - if(exprval->type == EXPRVAL_IDREF) { - *ret = unknownW; - return S_OK; - } - return hres; - } - - switch(V_VT(&val)) { + switch(V_VT(v)) { case VT_EMPTY: *ret = undefinedW; break; @@ -2503,7 +2495,7 @@ static HRESULT typeof_exprval(script_ctx_t *ctx, exprval_t *exprval, jsexcept_t case VT_DISPATCH: { jsdisp_t *dispex; - if(V_DISPATCH(&val) && (dispex = iface_to_jsdisp((IUnknown*)V_DISPATCH(&val)))) { + if(V_DISPATCH(v) && (dispex = iface_to_jsdisp((IUnknown*)V_DISPATCH(v)))) { *ret = is_class(dispex, JSCLASS_FUNCTION) ? functionW : objectW; jsdisp_release(dispex); }else { @@ -2512,39 +2504,94 @@ static HRESULT typeof_exprval(script_ctx_t *ctx, exprval_t *exprval, jsexcept_t break; } default: - FIXME("unhandled vt %d\n", V_VT(&val)); - hres = E_NOTIMPL; + FIXME("unhandled vt %d\n", V_VT(v)); + return E_NOTIMPL; } - VariantClear(&val); - return hres; + return S_OK; } -HRESULT typeof_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +/* ECMA-262 3rd Edition 11.4.3 */ +static HRESULT interp_typeofid(exec_ctx_t *ctx) { - unary_expression_t *expr = (unary_expression_t*)_expr; - const WCHAR *str = NULL; - exprval_t exprval; + const WCHAR *ret; + IDispatch *obj; + VARIANT v; + DISPID id; HRESULT hres; + static const WCHAR undefinedW[] = {'u','n','d','e','f','i','n','e','d',0}; + TRACE("\n"); - hres = expr_eval(ctx, expr->expression, 0, ei, &exprval); + obj = stack_pop_objid(ctx, &id); + if(!obj) + return stack_push_string(ctx, undefinedW); + + V_VT(&v) = VT_EMPTY; + hres = disp_propget(ctx->parser->script, obj, id, &v, &ctx->ei, NULL/*FIXME*/); + IDispatch_Release(obj); + if(FAILED(hres)) + return stack_push_string(ctx, unknownW); + + hres = typeof_string(&v, &ret); + VariantClear(&v); if(FAILED(hres)) return hres; - hres = typeof_exprval(ctx, &exprval, ei, &str); + return stack_push_string(ctx, ret); +} + +/* ECMA-262 3rd Edition 11.4.3 */ +static HRESULT interp_typeofident(exec_ctx_t *ctx) +{ + const BSTR arg = ctx->parser->code->instrs[ctx->ip].arg1.bstr; + exprval_t exprval; + const WCHAR *ret; + VARIANT v; + 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_INVALID) { + hres = stack_push_string(ctx, undefinedW); + exprval_release(&exprval); + return hres; + } + + hres = exprval_to_value(ctx->parser->script, &exprval, &ctx->ei, &v); exprval_release(&exprval); if(FAILED(hres)) return hres; - ret->type = EXPRVAL_VARIANT; - V_VT(&ret->u.var) = VT_BSTR; - V_BSTR(&ret->u.var) = SysAllocString(str); - if(!V_BSTR(&ret->u.var)) - return E_OUTOFMEMORY; + hres = typeof_string(&v, &ret); + VariantClear(&v); + if(FAILED(hres)) + return hres; - return S_OK; + return stack_push_string(ctx, ret); +} + +/* ECMA-262 3rd Edition 11.4.3 */ +static HRESULT interp_typeof(exec_ctx_t *ctx) +{ + const WCHAR *ret; + VARIANT *v; + HRESULT hres; + + TRACE("\n"); + + v = stack_pop(ctx); + hres = typeof_string(v, &ret); + VariantClear(v); + if(FAILED(hres)) + return hres; + + return stack_push_string(ctx, ret); } /* ECMA-262 3rd Edition 11.4.7 */ diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index b9e6441..0c46383 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -91,6 +91,9 @@ typedef struct _func_stack { X(throw, 0, ARG_UINT, 0) \ X(tonum, 1, 0,0) \ X(tree, 1, ARG_EXPR, 0) \ + X(typeof, 1, 0,0) \ + X(typeofid, 1, 0,0) \ + X(typeofident,1, 0,0) \ X(refval, 1, 0,0) \ X(ret, 0, 0,0) \ X(sub, 1, 0,0) \ @@ -567,7 +570,6 @@ HRESULT identifier_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t* HRESULT property_value_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT delete_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; -HRESULT typeof_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 88676dd..013b7fe 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1319,7 +1319,7 @@ static const expression_eval_t expression_eval_table[] = { compiled_expression_eval, compiled_expression_eval, compiled_expression_eval, - typeof_expression_eval, + compiled_expression_eval, compiled_expression_eval, compiled_expression_eval, compiled_expression_eval,

1 0

Kusanagi Kouichi : gdi32/tests: Add tests for vertical font.
by Alexandre Julliard 13 Dec '11

13 Dec '11

Module: wine Branch: master Commit: ad58ca235c8c23e22521553ad549e57117b3a9bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad58ca235c8c23e22521553ad… Author: Kusanagi Kouichi <slash(a)ac.auone-net.jp> Date: Tue Dec 13 19:44:00 2011 +0900 gdi32/tests: Add tests for vertical font. --- dlls/gdi32/tests/font.c | 104 +++++++++++++++++++++- dlls/gdi32/tests/resource.rc | 4 + dlls/gdi32/tests/vertical.sfd | 199 +++++++++++++++++++++++++++++++++++++++++ dlls/gdi32/tests/vertical.ttf | Bin 0 -> 2372 bytes 4 files changed, 304 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ad58ca235c8c23e225215…

1 0