Module: wine Branch: master Commit: ce75124a741b709f7cf533b11600f5b03c1ca8d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce75124a741b709f7cf533b116...
Author: Jacek Caban jacek@codeweavers.com Date: Fri Mar 21 14:36:45 2014 +0100
vbscript: Moved Error object implementation to global.c.
---
dlls/vbscript/Makefile.in | 1 - dlls/vbscript/error.c | 91 --------------------------------------------- dlls/vbscript/global.c | 62 +++++++++++++++++++++++++++++- 3 files changed, 61 insertions(+), 93 deletions(-)
diff --git a/dlls/vbscript/Makefile.in b/dlls/vbscript/Makefile.in index dd0c6d7..5ad0600 100644 --- a/dlls/vbscript/Makefile.in +++ b/dlls/vbscript/Makefile.in @@ -3,7 +3,6 @@ IMPORTS = oleaut32 ole32 user32
C_SRCS = \ compile.c \ - error.c \ global.c \ interp.c \ lex.c \ diff --git a/dlls/vbscript/error.c b/dlls/vbscript/error.c deleted file mode 100644 index 9739ba7..0000000 --- a/dlls/vbscript/error.c +++ /dev/null @@ -1,91 +0,0 @@ -/* - * Copyright 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 - */ - -#include "vbscript.h" -#include "vbscript_defs.h" - -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(vbscript); - -static HRESULT Err_Description(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Err_HelpContext(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Err_HelpFile(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Err_Number(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Err_Source(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Err_Clear(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Err_Raise(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static const builtin_prop_t err_props[] = { - {DISPID_ERR_DESCRIPTION, Err_Description, BP_GETPUT}, - {DISPID_ERR_HELPCONTEXT, Err_HelpContext, BP_GETPUT}, - {DISPID_ERR_HELPFILE, Err_HelpFile, BP_GETPUT}, - {DISPID_ERR_NUMBER, Err_Number, BP_GETPUT}, - {DISPID_ERR_SOURCE, Err_Source, BP_GETPUT}, - {DISPID_ERR_CLEAR, Err_Clear}, - {DISPID_ERR_RAISE, Err_Raise, 0, 5}, -}; - -HRESULT init_err(script_ctx_t *ctx) -{ - HRESULT hres; - - ctx->err_desc.ctx = ctx; - ctx->err_desc.builtin_prop_cnt = sizeof(err_props)/sizeof(*err_props); - ctx->err_desc.builtin_props = err_props; - - hres = get_typeinfo(ErrObj_tid, &ctx->err_desc.typeinfo); - if(FAILED(hres)) - return hres; - - return create_vbdisp(&ctx->err_desc, &ctx->err_obj); -} diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 9d8f021..7846bc0 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1866,6 +1866,58 @@ static const builtin_prop_t global_props[] = { {DISPID_GLOBAL_VBMSGBOXRTLREADING, NULL, BP_GET, VT_I4, MB_RTLREADING} };
+static HRESULT Err_Description(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT Err_HelpContext(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT Err_HelpFile(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT Err_Number(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT Err_Source(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT Err_Clear(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT Err_Raise(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static const builtin_prop_t err_props[] = { + {DISPID_ERR_DESCRIPTION, Err_Description, BP_GETPUT}, + {DISPID_ERR_HELPCONTEXT, Err_HelpContext, BP_GETPUT}, + {DISPID_ERR_HELPFILE, Err_HelpFile, BP_GETPUT}, + {DISPID_ERR_NUMBER, Err_Number, BP_GETPUT}, + {DISPID_ERR_SOURCE, Err_Source, BP_GETPUT}, + {DISPID_ERR_CLEAR, Err_Clear}, + {DISPID_ERR_RAISE, Err_Raise, 0, 5}, +}; + HRESULT init_global(script_ctx_t *ctx) { HRESULT hres; @@ -1886,5 +1938,13 @@ HRESULT init_global(script_ctx_t *ctx) if(FAILED(hres)) return hres;
- return init_err(ctx); + ctx->err_desc.ctx = ctx; + ctx->err_desc.builtin_prop_cnt = sizeof(err_props)/sizeof(*err_props); + ctx->err_desc.builtin_props = err_props; + + hres = get_typeinfo(ErrObj_tid, &ctx->err_desc.typeinfo); + if(FAILED(hres)) + return hres; + + return create_vbdisp(&ctx->err_desc, &ctx->err_obj); }