September 2012 - Wine-Commits

Jacek Caban : vbscript: Added MsgBox implementation.
by Alexandre Julliard Sept. 26, 2012

Sept. 26, 2012

Module: wine Branch: master Commit: 39da3b2ad765012092df376e4ec821d0e750d882 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39da3b2ad765012092df376e4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 26 14:36:45 2012 +0200 vbscript: Added MsgBox implementation. --- dlls/vbscript/Makefile.in | 2 +- dlls/vbscript/global.c | 76 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 75 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/Makefile.in b/dlls/vbscript/Makefile.in index e4765a0..6f91958 100644 --- a/dlls/vbscript/Makefile.in +++ b/dlls/vbscript/Makefile.in @@ -1,5 +1,5 @@ MODULE = vbscript.dll -IMPORTS = oleaut32 ole32 +IMPORTS = oleaut32 ole32 user32 C_SRCS = \ compile.c \ diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 6e62a34..ae5db24 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -35,6 +35,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(vbscript); const GUID GUID_CUSTOM_CONFIRMOBJECTSAFETY = {0x10200490,0xfa38,0x11d0,{0xac,0x0e,0x00,0xa0,0xc9,0xf,0xff,0xc0}}; +static const WCHAR emptyW[] = {0}; +static const WCHAR vbscriptW[] = {'V','B','S','c','r','i','p','t',0}; + static IInternetHostSecurityManager *get_sec_mgr(script_ctx_t *ctx) { IInternetHostSecurityManager *secmgr; @@ -272,6 +275,60 @@ static IUnknown *create_object(script_ctx_t *ctx, const WCHAR *progid) return obj; } +static HRESULT show_msgbox(script_ctx_t *ctx, BSTR prompt, VARIANT *res) +{ + SCRIPTUICHANDLING uic_handling = SCRIPTUICHANDLING_ALLOW; + IActiveScriptSiteUIControl *ui_control; + IActiveScriptSiteWindow *acts_window; + const WCHAR *title; + HWND hwnd = NULL; + int ret; + HRESULT hres; + + hres = IActiveScriptSite_QueryInterface(ctx->site, &IID_IActiveScriptSiteUIControl, (void**)&ui_control); + if(SUCCEEDED(hres)) { + hres = IActiveScriptSiteUIControl_GetUIBehavior(ui_control, SCRIPTUICITEM_MSGBOX, &uic_handling); + IActiveScriptSiteUIControl_Release(ui_control); + if(FAILED(hres)) + uic_handling = SCRIPTUICHANDLING_ALLOW; + } + + switch(uic_handling) { + case SCRIPTUICHANDLING_ALLOW: + break; + case SCRIPTUICHANDLING_NOUIDEFAULT: + return return_short(res, 0); + default: + FIXME("blocked\n"); + return E_FAIL; + } + + title = (ctx->safeopt & INTERFACE_USES_SECURITY_MANAGER) ? vbscriptW : emptyW; + + hres = IActiveScriptSite_QueryInterface(ctx->site, &IID_IActiveScriptSiteWindow, (void**)&acts_window); + if(FAILED(hres)) { + FIXME("No IActiveScriptSiteWindow\n"); + return hres; + } + + hres = IActiveScriptSiteWindow_GetWindow(acts_window, &hwnd); + if(SUCCEEDED(hres)) { + hres = IActiveScriptSiteWindow_EnableModeless(acts_window, FALSE); + if(SUCCEEDED(hres)) { + ret = MessageBoxW(hwnd, prompt, title, MB_OK); + hres = IActiveScriptSiteWindow_EnableModeless(acts_window, TRUE); + } + } + + IActiveScriptSiteWindow_Release(acts_window); + if(FAILED(hres)) { + FIXME("failed: %08x\n", hres); + return hres; + } + + return return_short(res, ret); +} + static HRESULT Global_CCur(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { FIXME("\n"); @@ -986,8 +1043,23 @@ static HRESULT Global_InputBox(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, static HRESULT Global_MsgBox(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + BSTR prompt; + HRESULT hres; + + TRACE("\n"); + + if(args_cnt != 1) { + FIXME("unsupported arg_cnt %d\n", args_cnt); + return E_NOTIMPL; + } + + hres = to_string(arg, &prompt); + if(FAILED(hres)) + return hres; + + hres = show_msgbox(This->desc->ctx, prompt, res); + SysFreeString(prompt); + return hres; } static HRESULT Global_CreateObject(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res)

1 0

Jacek Caban : mshtml: Added IActiveScriptSiteUIControl implementation.
by Alexandre Julliard Sept. 26, 2012

Sept. 26, 2012

Module: wine Branch: master Commit: d531c9ec2fa41047855e7279dc7cb0f6eeea14fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=d531c9ec2fa41047855e7279d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 26 14:37:34 2012 +0200 mshtml: Added IActiveScriptSiteUIControl implementation. --- dlls/mshtml/script.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 46 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index d1b4c41..54cee56 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -67,6 +67,7 @@ struct ScriptHost { IActiveScriptSite IActiveScriptSite_iface; IActiveScriptSiteInterruptPoll IActiveScriptSiteInterruptPoll_iface; IActiveScriptSiteWindow IActiveScriptSiteWindow_iface; + IActiveScriptSiteUIControl IActiveScriptSiteUIControl_iface; IActiveScriptSiteDebug IActiveScriptSiteDebug_iface; IServiceProvider IServiceProvider_iface; @@ -256,6 +257,9 @@ static HRESULT WINAPI ActiveScriptSite_QueryInterface(IActiveScriptSite *iface, }else if(IsEqualGUID(&IID_IActiveScriptSiteWindow, riid)) { TRACE("(%p)->(IID_IActiveScriptSiteWindow %p)\n", This, ppv); *ppv = &This->IActiveScriptSiteWindow_iface; + }else if(IsEqualGUID(&IID_IActiveScriptSiteUIControl, riid)) { + TRACE("(%p)->(IID_IActiveScriptSiteUIControl %p)\n", This, ppv); + *ppv = &This->IActiveScriptSiteUIControl_iface; }else if(IsEqualGUID(&IID_IActiveScriptSiteDebug, riid)) { TRACE("(%p)->(IID_IActiveScriptSiteDebug %p)\n", This, ppv); *ppv = &This->IActiveScriptSiteDebug_iface; @@ -494,6 +498,47 @@ static const IActiveScriptSiteWindowVtbl ActiveScriptSiteWindowVtbl = { ActiveScriptSiteWindow_EnableModeless }; +static inline ScriptHost *impl_from_IActiveScriptSiteUIControl(IActiveScriptSiteUIControl *iface) +{ + return CONTAINING_RECORD(iface, ScriptHost, IActiveScriptSiteUIControl_iface); +} + +static HRESULT WINAPI ActiveScriptSiteUIControl_QueryInterface(IActiveScriptSiteUIControl *iface, REFIID riid, void **ppv) +{ + ScriptHost *This = impl_from_IActiveScriptSiteUIControl(iface); + return IActiveScriptSite_QueryInterface(&This->IActiveScriptSite_iface, riid, ppv); +} + +static ULONG WINAPI ActiveScriptSiteUIControl_AddRef(IActiveScriptSiteUIControl *iface) +{ + ScriptHost *This = impl_from_IActiveScriptSiteUIControl(iface); + return IActiveScriptSite_AddRef(&This->IActiveScriptSite_iface); +} + +static ULONG WINAPI ActiveScriptSiteUIControl_Release(IActiveScriptSiteUIControl *iface) +{ + ScriptHost *This = impl_from_IActiveScriptSiteUIControl(iface); + return IActiveScriptSite_Release(&This->IActiveScriptSite_iface); +} + +static HRESULT WINAPI ActiveScriptSiteUIControl_GetUIBehavior(IActiveScriptSiteUIControl *iface, SCRIPTUICITEM UicItem, + SCRIPTUICHANDLING *pUicHandling) +{ + ScriptHost *This = impl_from_IActiveScriptSiteUIControl(iface); + + WARN("(%p)->(%d %p) semi-stub\n", This, UicItem, pUicHandling); + + *pUicHandling = SCRIPTUICHANDLING_ALLOW; + return S_OK; +} + +static const IActiveScriptSiteUIControlVtbl ActiveScriptSiteUIControlVtbl = { + ActiveScriptSiteUIControl_QueryInterface, + ActiveScriptSiteUIControl_AddRef, + ActiveScriptSiteUIControl_Release, + ActiveScriptSiteUIControl_GetUIBehavior +}; + static inline ScriptHost *impl_from_IActiveScriptSiteDebug(IActiveScriptSiteDebug *iface) { return CONTAINING_RECORD(iface, ScriptHost, IActiveScriptSiteDebug_iface); @@ -618,6 +663,7 @@ static ScriptHost *create_script_host(HTMLInnerWindow *window, const GUID *guid) ret->IActiveScriptSite_iface.lpVtbl = &ActiveScriptSiteVtbl; ret->IActiveScriptSiteInterruptPoll_iface.lpVtbl = &ActiveScriptSiteInterruptPollVtbl; ret->IActiveScriptSiteWindow_iface.lpVtbl = &ActiveScriptSiteWindowVtbl; + ret->IActiveScriptSiteUIControl_iface.lpVtbl = &ActiveScriptSiteUIControlVtbl; ret->IActiveScriptSiteDebug_iface.lpVtbl = &ActiveScriptSiteDebugVtbl; ret->IServiceProvider_iface.lpVtbl = &ASServiceProviderVtbl; ret->ref = 1;

1 0

Alexandre Julliard : wineps: Always escape Postscript reserved characters in font names.
by Alexandre Julliard Sept. 26, 2012

Sept. 26, 2012

Module: wine Branch: master Commit: 16f900fd5adc03317012cc7e02d2bc369352e378 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16f900fd5adc03317012cc7e0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 26 16:58:03 2012 +0200 wineps: Always escape Postscript reserved characters in font names. --- dlls/wineps.drv/download.c | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/wineps.drv/download.c b/dlls/wineps.drv/download.c index fbd868c..037ea34 100644 --- a/dlls/wineps.drv/download.c +++ b/dlls/wineps.drv/download.c @@ -49,6 +49,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(psdrv); */ static void get_download_name(PHYSDEV dev, LPOUTLINETEXTMETRICA potm, char **str) { + static const char reserved_chars[] = " %/(){}[]<>\n\r\t\b\f"; int len; char *p; DWORD size; @@ -92,7 +93,7 @@ static void get_download_name(PHYSDEV dev, LPOUTLINETEXTMETRICA potm, char **str memcpy(*str, strings + name_record->offset, name_record->length); *(*str + name_record->length) = '\0'; HeapFree(GetProcessHeap(), 0, name); - return; + goto done; } if(name_record->platform_id == 3 && name_record->encoding_id == 1 && name_record->language_id == 0x409 && name_record->name_id == 6) @@ -110,7 +111,7 @@ static void get_download_name(PHYSDEV dev, LPOUTLINETEXTMETRICA potm, char **str WideCharToMultiByte(1252, 0, unicode, -1, *str, len, NULL, NULL); HeapFree(GetProcessHeap(), 0, unicode); HeapFree(GetProcessHeap(), 0, name); - return; + goto done; } } TRACE("Unable to find PostScript name\n"); @@ -122,11 +123,8 @@ static void get_download_name(PHYSDEV dev, LPOUTLINETEXTMETRICA potm, char **str *str = HeapAlloc(GetProcessHeap(),0,len); strcpy(*str, (char*)potm + (ptrdiff_t)potm->otmpFaceName); - p = *str; - while((p = strchr(p, ' '))) - *p = '_'; - - return; +done: + for (p = *str; *p; p++) if (strchr( reserved_chars, *p )) *p = '_'; } /****************************************************************************

1 0

Nikolay Sivov : mlang: Ignore MLCONVCHARF_USEDEFCHAR in IMLangConvertCharset_Initialize().
by Alexandre Julliard Sept. 26, 2012

Sept. 26, 2012

Module: wine Branch: master Commit: b8228aaf980d7012b8e29430d5791b4c8c09664b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8228aaf980d7012b8e29430d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 26 17:30:09 2012 +0400 mlang: Ignore MLCONVCHARF_USEDEFCHAR in IMLangConvertCharset_Initialize(). --- dlls/mlang/mlang.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index 0253eec..d86f80a 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -3568,6 +3568,7 @@ static HRESULT WINAPI MLangConvertCharset_Initialize(IMLangConvertCharset *iface TRACE("(%p)->(%u %u 0x%08x)\n", This, src_cp, dst_cp, prop); + prop &= ~MLCONVCHARF_USEDEFCHAR; if (prop) FIXME("property 0x%08x not supported\n", prop);

1 0

Nikolay Sivov : mlang: Implement IMLangConvertCharset_DoConversionFromUnicode().
by Alexandre Julliard Sept. 26, 2012

Sept. 26, 2012

Module: wine Branch: master Commit: 97e30dfe70087e2e74226dc8520cee311c0dc7dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=97e30dfe70087e2e74226dc85… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 26 17:35:45 2012 +0400 mlang: Implement IMLangConvertCharset_DoConversionFromUnicode(). --- dlls/mlang/mlang.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index d86f80a..9cfcf16 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -3627,8 +3627,8 @@ static HRESULT WINAPI MLangConvertCharset_DoConversionFromUnicode(IMLangConvertC WCHAR *src, UINT *src_size, CHAR *dest, UINT *dest_size) { struct convert_charset *This = impl_from_IMLangConvertCharset(iface); - FIXME("(%p)->(%p %p %p %p): stub\n", This, src, src_size, dest, dest_size); - return E_NOTIMPL; + TRACE("(%p)->(%p %p %p %p)\n", This, src, src_size, dest, dest_size); + return ConvertINetUnicodeToMultiByte(NULL, This->dst_cp, src, (INT*)src_size, dest, (INT*)dest_size); } static const IMLangConvertCharsetVtbl MLangConvertCharsetVtbl =

1 0

Nikolay Sivov : mlang: Forward ConvertString() to IMultiLanguage3 implementation.
by Alexandre Julliard Sept. 26, 2012

Sept. 26, 2012

Module: wine Branch: master Commit: 9f16a0883d92f1086c5e7206abae9053f54bee0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f16a0883d92f1086c5e7206a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 26 17:39:11 2012 +0400 mlang: Forward ConvertString() to IMultiLanguage3 implementation. --- dlls/mlang/mlang.c | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index 9cfcf16..d56dd1a 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -2137,16 +2137,17 @@ static HRESULT WINAPI fnIMultiLanguage_IsConvertible( static HRESULT WINAPI fnIMultiLanguage_ConvertString( IMultiLanguage* iface, - DWORD* pdwMode, - DWORD dwSrcEncoding, - DWORD dwDstEncoding, - BYTE* pSrcStr, - UINT* pcSrcSize, - BYTE* pDstStr, - UINT* pcDstSize) + DWORD* mode, + DWORD src_enc, + DWORD dst_enc, + BYTE* src, + UINT* src_size, + BYTE* dest, + UINT* dest_size) { - return ConvertINetString(pdwMode, dwSrcEncoding, dwDstEncoding, - (LPCSTR)pSrcStr, (LPINT)pcSrcSize, (LPSTR)pDstStr, (LPINT)pcDstSize); + MLang_impl *This = impl_from_IMultiLanguage( iface ); + return IMultiLanguage3_ConvertString(&This->IMultiLanguage3_iface, mode, src_enc, + dst_enc, src, src_size, dest, dest_size); } static HRESULT WINAPI fnIMultiLanguage_ConvertStringToUnicode(

1 0

Nikolay Sivov : mlang: Forward ConvertStringReset() to IMultiLanguage3.
by Alexandre Julliard Sept. 26, 2012

Sept. 26, 2012

Module: wine Branch: master Commit: 1ed2bd14b71ebe140b2376570c01aa7f183344d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ed2bd14b71ebe140b2376570… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 26 17:43:40 2012 +0400 mlang: Forward ConvertStringReset() to IMultiLanguage3. --- dlls/mlang/mlang.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index 1d82291..67c318b 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -2180,8 +2180,8 @@ static HRESULT WINAPI fnIMultiLanguage_ConvertStringFromUnicode( static HRESULT WINAPI fnIMultiLanguage_ConvertStringReset( IMultiLanguage* iface) { - FIXME("\n"); - return E_NOTIMPL; + MLang_impl *This = impl_from_IMultiLanguage( iface ); + return IMultiLanguage3_ConvertStringReset(&This->IMultiLanguage3_iface); } static HRESULT WINAPI fnIMultiLanguage_GetRfc1766FromLcid(

1 0

Jason Edmeades : cmd: Fix parameterization around delimiters.
by Alexandre Julliard Sept. 26, 2012

Sept. 26, 2012

Module: wine Branch: master Commit: e35b239b41317e62659ab94534e34f029d26df3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e35b239b41317e62659ab9453… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Wed Sep 26 00:07:20 2012 +0100 cmd: Fix parameterization around delimiters. --- programs/cmd/batch.c | 63 ++++++++++++++++++++++-------- programs/cmd/builtins.c | 36 +++++++++-------- programs/cmd/directory.c | 2 +- programs/cmd/tests/test_builtins.cmd | 44 +++++++++++++++++++- programs/cmd/tests/test_builtins.cmd.exp | 59 ++++++++++++++++++++-------- programs/cmd/wcmd.h | 2 +- programs/cmd/wcmdmain.c | 8 ++-- 7 files changed, 154 insertions(+), 60 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e35b239b41317e62659ab…

1 0

Jason Edmeades : cmd: Display 'set' sort ordering correctly.
by Alexandre Julliard Sept. 26, 2012

Sept. 26, 2012

Module: wine Branch: master Commit: cd9451c4993ae852df69cac4fe22e2838ae9fbe1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd9451c4993ae852df69cac4f… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Tue Sep 25 23:16:54 2012 +0100 cmd: Display 'set' sort ordering correctly. --- programs/cmd/builtins.c | 5 ++++- programs/cmd/tests/test_builtins.cmd.exp | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index ad9d40c..8421194 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2234,13 +2234,16 @@ void WCMD_setshow_date (void) { /**************************************************************************** * WCMD_compare + * Note: Native displays 'fred' before 'fred ', so need to only compare up to + * the equals sign. */ static int WCMD_compare( const void *a, const void *b ) { int r; const WCHAR * const *str_a = a, * const *str_b = b; + static const WCHAR eqW[] = {'=','\0'}; r = CompareStringW( LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, - *str_a, -1, *str_b, -1 ); + *str_a, strcspnW(*str_a, eqW), *str_b, strcspnW(*str_b, eqW) ); if( r == CSTR_LESS_THAN ) return -1; if( r == CSTR_GREATER_THAN ) return 1; return 0; diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index d2938ce..57bc82a 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -235,8 +235,8 @@ FOOBAR = baz baz2 0 bar -(a)todo_wine@FOOBAR= bar -(a)todo_wine@FOOBAR = baz2 +FOOBAR= bar +FOOBAR = baz2 FOOBAR = baz2 FOOBAR not defined 1

1 0

Jacek Caban : vbscript: Added Round implementation.
by Alexandre Julliard Sept. 26, 2012

Sept. 26, 2012

Module: wine Branch: master Commit: 5c211059a0fa52c508bc7e9e0c67bb782655e339 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c211059a0fa52c508bc7e9e0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 26 14:36:01 2012 +0200 vbscript: Added Round implementation. --- dlls/vbscript/global.c | 71 +++++++++++++++++++++++++++++++++++++++++- dlls/vbscript/tests/api.vbs | 15 +++++++++ 2 files changed, 84 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index f7d8efe..0facdf0 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -17,6 +17,7 @@ */ #include <assert.h> +#include <math.h> #include "vbscript.h" #include "vbscript_defs.h" @@ -98,6 +99,16 @@ static HRESULT return_int(VARIANT *res, int val) return S_OK; } +static inline HRESULT return_double(VARIANT *res, double val) +{ + if(res) { + V_VT(res) = VT_R8; + V_R8(res) = val; + } + + return S_OK; +} + static inline HRESULT return_null(VARIANT *res) { if(res) @@ -122,6 +133,40 @@ static HRESULT to_int(VARIANT *v, int *ret) return S_OK; } +static HRESULT to_double(VARIANT *v, double *ret) +{ + switch(V_VT(v)) { + case VT_I2: + *ret = V_I2(v); + break; + case VT_I4: + *ret = V_I4(v); + break; + case VT_R4: + *ret = V_R4(v); + break; + case VT_R8: + *ret = V_R8(v); + break; + case VT_BSTR: { + VARIANT dst; + HRESULT hres; + + V_VT(&dst) = VT_EMPTY; + hres = VariantChangeType(&dst, v, VARIANT_LOCALBOOL, VT_R8); + if(FAILED(hres)) + return hres; + *ret = V_R8(&dst); + break; + } + default: + FIXME("arg %s not supported\n", debugstr_variant(v)); + return E_NOTIMPL; + } + + return S_OK; +} + static HRESULT to_string(VARIANT *v, BSTR *ret) { VARIANT dst; @@ -1110,8 +1155,30 @@ static HRESULT Global_MonthName(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, static HRESULT Global_Round(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + double n; + HRESULT hres; + + TRACE("%s\n", debugstr_variant(arg)); + + if(!res) + return S_OK; + + switch(V_VT(arg)) { + case VT_I2: + case VT_I4: + case VT_BOOL: + *res = *arg; + return S_OK; + case VT_R8: + n = V_R8(arg); + break; + default: + hres = to_double(arg, &n); + if(FAILED(hres)) + return hres; + } + + return return_double(res, round(n)); } static HRESULT Global_Escape(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 2ad9404..f7b4295 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -183,4 +183,19 @@ Call ok(Space(1) = " ", "Space(1) = " & Space(1) & """") Call ok(Space(0) = "", "Space(0) = " & Space(0) & """") Call ok(Space(5) = " ", "Space(5) = " & Space(5) & """") +Sub TestRound(val, exval, vt) + Call ok(Round(val) = exval, "Round(" & val & ") = " & Round(val)) + Call ok(getVT(Round(val)) = vt, "getVT(Round(" & val & ")) = " & getVT(Round(val))) +End Sub + +TestRound 3, 3, "VT_I2" +TestRound 3.3, 3, "VT_R8" +TestRound 3.8, 4, "VT_R8" +TestRound 3.5, 4, "VT_R8" +TestRound -3.3, -3, "VT_R8" +TestRound -3.5, -4, "VT_R8" +TestRound "2", 2, "VT_R8" +TestRound true, true, "VT_BOOL" +TestRound false, false, "VT_BOOL" + Call reportSuccess()

1 0