ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

vbscript: Moved Error object implementation to global.c.

This commit is contained in:
Jacek Caban 2014-03-21 14:36:45 +01:00 committed by Alexandre Julliard
parent 9183e5847d
commit ce75124a74
3 changed files with 61 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dlls/vbscript/Makefile.in
View File

@ -3,7 +3,6 @@ IMPORTS = oleaut32 ole32 user32
C_SRCS = \
compile.c \
error.c \
global.c \
interp.c \
lex.c \

91
dlls/vbscript/error.c
View File

@ -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);
}

62
dlls/vbscript/global.c
View File

@ -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);
}