Module: wine Branch: master Commit: 34bf93fc51c78960a009f87b71c1223bf0edc7a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34bf93fc51c78960a009f87b71...
Author: Jacek Caban jacek@codeweavers.com Date: Wed Feb 27 12:55:32 2013 +0100
vbscript: Added color constants.
---
dlls/vbscript/global.c | 64 +++++------------------------------------- dlls/vbscript/tests/api.vbs | 8 +++++ 2 files changed, 16 insertions(+), 56 deletions(-)
diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index ab3965e..cba611f 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1609,54 +1609,6 @@ static HRESULT Global_GetRef(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VA return E_NOTIMPL; }
-static HRESULT Global_vbBlack(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbBlue(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbCyan(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbGreen(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbMagenta(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbRed(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbWhite(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbYellow(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - static HRESULT Global_vbCr(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { FIXME("\n"); @@ -1776,14 +1728,14 @@ static const builtin_prop_t global_props[] = { {DISPID_GLOBAL_VBLONGTIME, NULL, BP_GET, VT_I2, 3}, {DISPID_GLOBAL_VBSHORTTIME, NULL, BP_GET, VT_I2, 4}, {DISPID_GLOBAL_VBOBJECTERROR, NULL, BP_GET, VT_I4, 0x80040000}, - {DISPID_GLOBAL_VBBLACK, Global_vbBlack, BP_GET}, - {DISPID_GLOBAL_VBBLUE, Global_vbBlue, BP_GET}, - {DISPID_GLOBAL_VBCYAN, Global_vbCyan, BP_GET}, - {DISPID_GLOBAL_VBGREEN, Global_vbGreen, BP_GET}, - {DISPID_GLOBAL_VBMAGENTA, Global_vbMagenta, BP_GET}, - {DISPID_GLOBAL_VBRED, Global_vbRed, BP_GET}, - {DISPID_GLOBAL_VBWHITE, Global_vbWhite, BP_GET}, - {DISPID_GLOBAL_VBYELLOW, Global_vbYellow, BP_GET}, + {DISPID_GLOBAL_VBBLACK, NULL, BP_GET, VT_I4, 0x000000}, + {DISPID_GLOBAL_VBBLUE, NULL, BP_GET, VT_I4, 0xff0000}, + {DISPID_GLOBAL_VBCYAN, NULL, BP_GET, VT_I4, 0xffff00}, + {DISPID_GLOBAL_VBGREEN, NULL, BP_GET, VT_I4, 0x00ff00}, + {DISPID_GLOBAL_VBMAGENTA, NULL, BP_GET, VT_I4, 0xff00ff}, + {DISPID_GLOBAL_VBRED, NULL, BP_GET, VT_I4, 0x0000ff}, + {DISPID_GLOBAL_VBWHITE, NULL, BP_GET, VT_I4, 0xffffff}, + {DISPID_GLOBAL_VBYELLOW, NULL, BP_GET, VT_I4, 0x00ffff}, {DISPID_GLOBAL_VBCR, Global_vbCr, BP_GET}, {DISPID_GLOBAL_VBCRLF, Global_vbCrLf, BP_GET}, {DISPID_GLOBAL_VBNEWLINE, Global_vbNewLine, BP_GET}, diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index ee68e9e..fc057d8 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -95,6 +95,14 @@ TestConstant "vbShortDate", vbShortDate, 2 TestConstant "vbLongTime", vbLongTime, 3 TestConstant "vbShortTime", vbShortTime, 4 TestConstantI4 "vbObjectError", vbObjectError, &h80040000& +TestConstantI4 "vbBlack", vbBlack, 0 +TestConstantI4 "vbBlue", vbBlue, &hff0000& +TestConstantI4 "vbCyan", vbCyan, &hffff00& +TestConstantI4 "vbGreen", vbGreen, &h00ff00& +TestConstantI4 "vbMagenta", vbMagenta, &hff00ff& +TestConstantI4 "vbRed", vbRed, &h0000ff& +TestConstantI4 "vbWhite", vbWhite, &hffffff& +TestConstantI4 "vbYellow", vbYellow, &h00ffff&
Sub TestCStr(arg, exval) dim x
-
Alexandre Julliard