wine-commits September 2012

wine-commits@winehq.org

2 participants
828 discussions

Jacek Caban : mshtml: Added IActiveScriptSiteUIControl implementation.
by Alexandre Julliard 26 Sep '12

26 Sep '12

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

Jacek Caban : mshtml: Added better IActiveScriptSiteWindow implementation.
by Alexandre Julliard 26 Sep '12

26 Sep '12

Module: wine Branch: master Commit: c9e6a96318eea4386cfd59164cae859bcba4c908 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9e6a96318eea4386cfd59164… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 26 14:37:16 2012 +0200 mshtml: Added better IActiveScriptSiteWindow implementation. --- dlls/mshtml/script.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 9aa875a..d1b4c41 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -469,15 +469,21 @@ static ULONG WINAPI ActiveScriptSiteWindow_Release(IActiveScriptSiteWindow *ifac static HRESULT WINAPI ActiveScriptSiteWindow_GetWindow(IActiveScriptSiteWindow *iface, HWND *phwnd) { ScriptHost *This = impl_from_IActiveScriptSiteWindow(iface); - FIXME("(%p)->(%p)\n", This, phwnd); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, phwnd); + + if(!This->window || !This->window->base.outer_window || !This->window->base.outer_window->doc_obj) + return E_UNEXPECTED; + + *phwnd = This->window->base.outer_window->doc_obj->hwnd; + return S_OK; } static HRESULT WINAPI ActiveScriptSiteWindow_EnableModeless(IActiveScriptSiteWindow *iface, BOOL fEnable) { ScriptHost *This = impl_from_IActiveScriptSiteWindow(iface); FIXME("(%p)->(%x)\n", This, fEnable); - return E_NOTIMPL; + return S_OK; } static const IActiveScriptSiteWindowVtbl ActiveScriptSiteWindowVtbl = {

1 0

Jacek Caban : vbscript: Added MsgBox tests.
by Alexandre Julliard 26 Sep '12

26 Sep '12

Module: wine Branch: master Commit: 44fb2605663fa9a027f70b6e8e9d2999e4583c6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=44fb2605663fa9a027f70b6e8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 26 14:36:58 2012 +0200 vbscript: Added MsgBox tests. --- dlls/vbscript/tests/run.c | 152 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 151 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 9c3725b..ae590bf 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -73,6 +73,9 @@ extern const CLSID CLSID_VBScript; expect_ ## func = called_ ## func = FALSE; \ }while(0) +#define CLEAR_CALLED(func) \ + expect_ ## func = called_ ## func = FALSE + DEFINE_EXPECT(global_success_d); DEFINE_EXPECT(global_success_i); DEFINE_EXPECT(global_vbvar_d); @@ -87,6 +90,9 @@ DEFINE_EXPECT(global_propargput1_d); DEFINE_EXPECT(global_propargput1_i); DEFINE_EXPECT(collectionobj_newenum_i); DEFINE_EXPECT(Next); +DEFINE_EXPECT(GetWindow); +DEFINE_EXPECT(GetUIBehavior); +DEFINE_EXPECT(EnableModeless); #define DISPID_GLOBAL_REPORTSUCCESS 1000 #define DISPID_GLOBAL_TRACE 1001 @@ -112,9 +118,10 @@ DEFINE_EXPECT(Next); static const WCHAR testW[] = {'t','e','s','t',0}; static const WCHAR emptyW[] = {0}; -static BOOL strict_dispid_check, is_english; +static BOOL strict_dispid_check, is_english, allow_ui; static const char *test_name = "(null)"; static int test_counter; +static SCRIPTUICHANDLING uic_handling = SCRIPTUICHANDLING_NOUIERROR; static BSTR a2bstr(const char *str) { @@ -1178,6 +1185,86 @@ static IDispatchExVtbl GlobalVtbl = { static IDispatchEx Global = { &GlobalVtbl }; +static HRESULT WINAPI ActiveScriptSiteWindow_QueryInterface(IActiveScriptSiteWindow *iface, REFIID riid, void **ppv) +{ + ok(0, "unexpected call\n"); + return E_NOINTERFACE; +} + +static ULONG WINAPI ActiveScriptSiteWindow_AddRef(IActiveScriptSiteWindow *iface) +{ + return 2; +} + +static ULONG WINAPI ActiveScriptSiteWindow_Release(IActiveScriptSiteWindow *iface) +{ + return 1; +} + +static HRESULT WINAPI ActiveScriptSiteWindow_GetWindow(IActiveScriptSiteWindow *iface, HWND *phwnd) +{ + if(!allow_ui) + CHECK_EXPECT(GetWindow); + *phwnd = NULL; + return S_OK; +} + +static HRESULT WINAPI ActiveScriptSiteWindow_EnableModeless(IActiveScriptSiteWindow *iface, BOOL fEnable) +{ + if(allow_ui) + return S_OK; + + CHECK_EXPECT(EnableModeless); + ok(!fEnable, "fEnable = %x\n", fEnable); + return E_FAIL; +} + +static const IActiveScriptSiteWindowVtbl ActiveScriptSiteWindowVtbl = { + ActiveScriptSiteWindow_QueryInterface, + ActiveScriptSiteWindow_AddRef, + ActiveScriptSiteWindow_Release, + ActiveScriptSiteWindow_GetWindow, + ActiveScriptSiteWindow_EnableModeless +}; + +static IActiveScriptSiteWindow ActiveScriptSiteWindow = { &ActiveScriptSiteWindowVtbl }; + +static HRESULT WINAPI ActiveScriptSiteUIControl_QueryInterface(IActiveScriptSiteUIControl *iface, REFIID riid, void **ppv) +{ + ok(0, "unexpected call\n"); + return E_NOINTERFACE; +} + +static ULONG WINAPI ActiveScriptSiteUIControl_AddRef(IActiveScriptSiteUIControl *iface) +{ + return 2; +} + +static ULONG WINAPI ActiveScriptSiteUIControl_Release(IActiveScriptSiteUIControl *iface) +{ + return 1; +} + +static HRESULT WINAPI ActiveScriptSiteUIControl_GetUIBehavior(IActiveScriptSiteUIControl *iface, SCRIPTUICITEM UicItem, + SCRIPTUICHANDLING *pUicHandling) +{ + if(!allow_ui) { + CHECK_EXPECT(GetUIBehavior); + ok(UicItem == SCRIPTUICITEM_MSGBOX, "UidItem = %d\n", UicItem); + } + *pUicHandling = uic_handling; + return S_OK; +} + +static const IActiveScriptSiteUIControlVtbl ActiveScriptSiteUIControlVtbl = { + ActiveScriptSiteUIControl_QueryInterface, + ActiveScriptSiteUIControl_AddRef, + ActiveScriptSiteUIControl_Release, + ActiveScriptSiteUIControl_GetUIBehavior +}; + +static IActiveScriptSiteUIControl ActiveScriptSiteUIControl = { &ActiveScriptSiteUIControlVtbl }; + static HRESULT WINAPI ActiveScriptSite_QueryInterface(IActiveScriptSite *iface, REFIID riid, void **ppv) { *ppv = NULL; @@ -1186,6 +1273,10 @@ static HRESULT WINAPI ActiveScriptSite_QueryInterface(IActiveScriptSite *iface, *ppv = iface; else if(IsEqualGUID(&IID_IActiveScriptSite, riid)) *ppv = iface; + else if(IsEqualGUID(&IID_IActiveScriptSiteWindow, riid)) + *ppv = &ActiveScriptSiteWindow; + else if(IsEqualGUID(&IID_IActiveScriptSiteUIControl, riid)) + *ppv = &ActiveScriptSiteUIControl; else return E_NOINTERFACE; @@ -1376,6 +1467,17 @@ static void parse_script_af(DWORD flags, const char *src) ok(hres == S_OK, "parse_script failed: %08x\n", hres); } +static HRESULT parse_script_ar(const char *src) +{ + BSTR tmp; + HRESULT hres; + + tmp = a2bstr(src); + hres = parse_script(SCRIPTITEM_GLOBALMEMBERS, tmp); + SysFreeString(tmp); + return hres; +} + static void parse_script_a(const char *src) { parse_script_af(SCRIPTITEM_GLOBALMEMBERS, src); @@ -1488,6 +1590,51 @@ static void test_gc(void) IActiveScriptParse_Release(parser); } +static void test_msgbox(void) +{ + HRESULT hres; + + uic_handling = SCRIPTUICHANDLING_NOUIDEFAULT; + + SET_EXPECT(GetUIBehavior); + SET_EXPECT(GetWindow); + SET_EXPECT(EnableModeless); + hres = parse_script_ar("MsgBox \"testing...\""); + CLEAR_CALLED(GetUIBehavior); + CLEAR_CALLED(GetWindow); + CLEAR_CALLED(EnableModeless); + if(FAILED(hres)) { + win_skip("Skipping MsgBox tests, broken (probably too old) vbscript\n"); + return; + } + + SET_EXPECT(GetUIBehavior); + parse_script_a("dim r\n r=MsgBox(\"testing...\")\n Call ok(r=0, \"r=\"&r)"); + CHECK_CALLED(GetUIBehavior); + + SET_EXPECT(GetUIBehavior); + parse_script_a("MsgBox 10"); + CHECK_CALLED(GetUIBehavior); + + uic_handling = SCRIPTUICHANDLING_ALLOW; + + SET_EXPECT(GetUIBehavior); + SET_EXPECT(GetWindow); + SET_EXPECT(EnableModeless); + hres = parse_script_ar("MsgBox \"testing...\""); + ok(FAILED(hres), "script not failed\n"); + CHECK_CALLED(GetUIBehavior); + CHECK_CALLED(GetWindow); + CHECK_CALLED(EnableModeless); + + uic_handling = SCRIPTUICHANDLING_NOUIERROR; + + SET_EXPECT(GetUIBehavior); + hres = parse_script_ar("MsgBox \"testing...\""); + ok(FAILED(hres), "script not failed\n"); + CHECK_CALLED(GetUIBehavior); +} + static HRESULT test_global_vars_ref(BOOL use_close) { IActiveScriptParse *parser; @@ -1736,6 +1883,7 @@ static void run_tests(void) test_procedures(); test_gc(); + test_msgbox(); } static BOOL check_vbscript(void) @@ -1767,6 +1915,8 @@ START_TEST(run) if(!check_vbscript()) { win_skip("Broken engine, probably too old\n"); }else if(argc > 2) { + allow_ui = TRUE; + uic_handling = SCRIPTUICHANDLING_ALLOW; run_from_file(argv[2]); }else { run_tests();

1 0

Jacek Caban : vbscript: Added MsgBox implementation.
by Alexandre Julliard 26 Sep '12

26 Sep '12

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 : activscp.idl: Added IActiveScriptSiteUIControl declaration.
by Alexandre Julliard 26 Sep '12

26 Sep '12

Module: wine Branch: master Commit: 3ad33050287c9f4d8c54e996a8be45df5ad0ab57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ad33050287c9f4d8c54e996a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 26 14:36:34 2012 +0200 activscp.idl: Added IActiveScriptSiteUIControl declaration. --- include/activscp.idl | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/include/activscp.idl b/include/activscp.idl index 9be7ec4..c7fc2d2 100644 --- a/include/activscp.idl +++ b/include/activscp.idl @@ -60,6 +60,17 @@ typedef enum tagSCRIPTTHREADSTATE { SCRIPTTHREADSTATE_RUNNING = 1 } SCRIPTTHREADSTATE; +typedef enum tagSCRIPTUICITEM { + SCRIPTUICITEM_INPUTBOX = 1, + SCRIPTUICITEM_MSGBOX = 2 +} SCRIPTUICITEM; + +typedef enum tagSCRIPTUICHANDLING { + SCRIPTUICHANDLING_ALLOW = 0, + SCRIPTUICHANDLING_NOUIERROR = 1, + SCRIPTUICHANDLING_NOUIDEFAULT = 2 +} SCRIPTUICHANDLING; + typedef DWORD SCRIPTTHREADID; cpp_quote("#define SCRIPTTHREADID_CURRENT ((SCRIPTTHREADID)-1)") cpp_quote("#define SCRIPTTHREADID_BASE ((SCRIPTTHREADID)-2)") @@ -187,6 +198,18 @@ interface IActiveScriptSiteWindow : IUnknown } [ + object, + uuid(aedae97e-d7ee-4796-b960-7f092ae844ab), + pointer_default(unique) +] +interface IActiveScriptSiteUIControl : IUnknown +{ + HRESULT GetUIBehavior( + [in] SCRIPTUICITEM UicItem, + [out] SCRIPTUICHANDLING *pUicHandling); +} + +[ object, uuid(539698A0-CDCA-11CF-A5EB-00AA0047A063), pointer_default(unique)

1 0

Jacek Caban : vbscript: Added VT_R8 support to to_int.
by Alexandre Julliard 26 Sep '12

26 Sep '12

Module: wine Branch: master Commit: 1fc2896c7c57e6feb8dbcf6156da1f505ad2668e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fc2896c7c57e6feb8dbcf615… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 26 14:36:15 2012 +0200 vbscript: Added VT_R8 support to to_int. --- dlls/vbscript/global.c | 9 +++++++++ dlls/vbscript/tests/api.vbs | 12 ++++++++++++ dlls/vbscript/vbscript.h | 13 +++++++++++++ 3 files changed, 34 insertions(+), 0 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 0facdf0..6e62a34 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -125,6 +125,15 @@ static HRESULT to_int(VARIANT *v, int *ret) case VT_I4: *ret = V_I4(v); break; + case VT_R8: { + double n = round(V_R8(v)); + if(!is_int32(n)) { + FIXME("%lf is out of int range\n", n); + return E_FAIL; + } + *ret = n; + break; + } default: FIXME("not supported %s\n", debugstr_variant(v)); return E_NOTIMPL; diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index f7b4295..5efde28 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -124,6 +124,15 @@ Call ok(isNull(x), "InStr returned " & x) x = InStr(2, null, "abcd") Call ok(isNull(x), "InStr returned " & x) +x = InStr(1.3, "abcd", "bc") +Call ok(x = 2, "InStr returned " & x) + +x = InStr(2.3, "abcd", "bc") +Call ok(x = 2, "InStr returned " & x) + +x = InStr(2.6, "abcd", "bc") +Call ok(x = 0, "InStr returned " & x) + Sub TestMid(str, start, len, ex) x = Mid(str, start, len) Call ok(x = ex, "Mid(" & str & ", " & start & ", " & len & ") = " & x & " expected " & ex) @@ -182,6 +191,9 @@ Call ok(Len(empty) = 0, "Len(empty) = " & Len(empty)) Call ok(Space(1) = " ", "Space(1) = " & Space(1) & """") Call ok(Space(0) = "", "Space(0) = " & Space(0) & """") Call ok(Space(5) = " ", "Space(5) = " & Space(5) & """") +Call ok(Space(5.2) = " ", "Space(5.2) = " & Space(5.2) & """") +Call ok(Space(5.8) = " ", "Space(5.8) = " & Space(5.8) & """") +Call ok(Space(5.5) = " ", "Space(5.5) = " & Space(5.5) & """") Sub TestRound(val, exval, vt) Call ok(Round(val) = exval, "Round(" & val & ") = " & Round(val)) diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 77cf0e7..41982da 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -343,6 +343,19 @@ TID_LIST HRESULT get_typeinfo(tid_t,ITypeInfo**) DECLSPEC_HIDDEN; +#ifndef INT32_MIN +#define INT32_MIN (-2147483647-1) +#endif + +#ifndef INT32_MAX +#define INT32_MAX (2147483647) +#endif + +static inline BOOL is_int32(double d) +{ + return INT32_MIN <= d && d <= INT32_MAX && (double)(int)d == d; +} + HRESULT WINAPI VBScriptFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; const char *debugstr_variant(const VARIANT*) DECLSPEC_HIDDEN;

1 0

Jacek Caban : vbscript: Added Round implementation.
by Alexandre Julliard 26 Sep '12

26 Sep '12

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

Rico Schüller : d3dx9: Avoid variable assignment in D3DXQuaternionNormalize().
by Alexandre Julliard 26 Sep '12

26 Sep '12

Module: wine Branch: master Commit: 5accb12c1298a81a59e7d19080543ebf75635aed URL: http://source.winehq.org/git/wine.git/?a=commit;h=5accb12c1298a81a59e7d1908… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Sep 26 13:57:21 2012 +0200 d3dx9: Avoid variable assignment in D3DXQuaternionNormalize(). --- dlls/d3dx9_36/math.c | 19 ++++++++----------- 1 files changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index c6fa19a..9be3011 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -1338,23 +1338,20 @@ D3DXQUATERNION* WINAPI D3DXQuaternionMultiply(D3DXQUATERNION *pout, CONST D3DXQU return pout; } -D3DXQUATERNION* WINAPI D3DXQuaternionNormalize(D3DXQUATERNION *pout, CONST D3DXQUATERNION *pq) +D3DXQUATERNION * WINAPI D3DXQuaternionNormalize(D3DXQUATERNION *out, const D3DXQUATERNION *q) { - D3DXQUATERNION out; FLOAT norm; - TRACE("(%p, %p)\n", pout, pq); - - norm = D3DXQuaternionLength(pq); + TRACE("out %p, q %p\n", out, q); - out.x = pq->x / norm; - out.y = pq->y / norm; - out.z = pq->z / norm; - out.w = pq->w / norm; + norm = D3DXQuaternionLength(q); - *pout=out; + out->x = q->x / norm; + out->y = q->y / norm; + out->z = q->z / norm; + out->w = q->w / norm; - return pout; + return out; } D3DXQUATERNION * WINAPI D3DXQuaternionRotationAxis(D3DXQUATERNION *out, const D3DXVECTOR3 *v, FLOAT angle)

1 0

Rico Schüller : d3dx9: Use float functions in D3DXQuaternionRotationAxis().
by Alexandre Julliard 26 Sep '12

26 Sep '12

Module: wine Branch: master Commit: db8df8bc7c5e03427f07a596125dec4c52d638be URL: http://source.winehq.org/git/wine.git/?a=commit;h=db8df8bc7c5e03427f07a5961… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Sep 26 13:57:11 2012 +0200 d3dx9: Use float functions in D3DXQuaternionRotationAxis(). --- dlls/d3dx9_36/math.c | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 3f0e8e4..c6fa19a 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -1357,18 +1357,20 @@ D3DXQUATERNION* WINAPI D3DXQuaternionNormalize(D3DXQUATERNION *pout, CONST D3DXQ return pout; } -D3DXQUATERNION* WINAPI D3DXQuaternionRotationAxis(D3DXQUATERNION *pout, CONST D3DXVECTOR3 *pv, FLOAT angle) +D3DXQUATERNION * WINAPI D3DXQuaternionRotationAxis(D3DXQUATERNION *out, const D3DXVECTOR3 *v, FLOAT angle) { D3DXVECTOR3 temp; - TRACE("(%p, %p, %f)\n", pout, pv, angle); + TRACE("out %p, v %p, angle %f\n", out, v, angle); - D3DXVec3Normalize(&temp, pv); - pout->x = sin( angle / 2.0f ) * temp.x; - pout->y = sin( angle / 2.0f ) * temp.y; - pout->z = sin( angle / 2.0f ) * temp.z; - pout->w = cos( angle / 2.0f ); - return pout; + D3DXVec3Normalize(&temp, v); + + out->x = sinf(angle / 2.0f) * temp.x; + out->y = sinf(angle / 2.0f) * temp.y; + out->z = sinf(angle / 2.0f) * temp.z; + out->w = cosf(angle / 2.0f); + + return out; } D3DXQUATERNION* WINAPI D3DXQuaternionRotationMatrix(D3DXQUATERNION *pout, CONST D3DXMATRIX *pm)

1 0

Rico Schüller : d3dx9: Use float functions in D3DXQuaternionRotationYawPitchRoll().
by Alexandre Julliard 26 Sep '12

26 Sep '12

Module: wine Branch: master Commit: 7d75ad8230e182fe4c6724aed20b6a9302d7fa54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d75ad8230e182fe4c6724aed… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Sep 26 13:57:05 2012 +0200 d3dx9: Use float functions in D3DXQuaternionRotationYawPitchRoll(). --- dlls/d3dx9_36/math.c | 24 +++++++++++++++++------- 1 files changed, 17 insertions(+), 7 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 7599a0a..3f0e8e4 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -1424,15 +1424,25 @@ D3DXQUATERNION* WINAPI D3DXQuaternionRotationMatrix(D3DXQUATERNION *pout, CONST return pout; } -D3DXQUATERNION* WINAPI D3DXQuaternionRotationYawPitchRoll(D3DXQUATERNION *pout, FLOAT yaw, FLOAT pitch, FLOAT roll) +D3DXQUATERNION * WINAPI D3DXQuaternionRotationYawPitchRoll(D3DXQUATERNION *out, FLOAT yaw, FLOAT pitch, FLOAT roll) { - TRACE("(%p, %f, %f, %f)\n", pout, yaw, pitch, roll); + FLOAT syaw, cyaw, spitch, cpitch, sroll, croll; - pout->x = sin( yaw / 2.0f) * cos(pitch / 2.0f) * sin(roll / 2.0f) + cos(yaw / 2.0f) * sin(pitch / 2.0f) * cos(roll / 2.0f); - pout->y = sin( yaw / 2.0f) * cos(pitch / 2.0f) * cos(roll / 2.0f) - cos(yaw / 2.0f) * sin(pitch / 2.0f) * sin(roll / 2.0f); - pout->z = cos(yaw / 2.0f) * cos(pitch / 2.0f) * sin(roll / 2.0f) - sin( yaw / 2.0f) * sin(pitch / 2.0f) * cos(roll / 2.0f); - pout->w = cos( yaw / 2.0f) * cos(pitch / 2.0f) * cos(roll / 2.0f) + sin(yaw / 2.0f) * sin(pitch / 2.0f) * sin(roll / 2.0f); - return pout; + TRACE("out %p, yaw %f, pitch %f, roll %f\n", out, yaw, pitch, roll); + + syaw = sinf(yaw / 2.0f); + cyaw = cosf(yaw / 2.0f); + spitch = sinf(pitch / 2.0f); + cpitch = cosf(pitch / 2.0f); + sroll = sinf(roll / 2.0f); + croll = cosf(roll / 2.0f); + + out->x = syaw * cpitch * sroll + cyaw * spitch * croll; + out->y = syaw * cpitch * croll - cyaw * spitch * sroll; + out->z = cyaw * cpitch * sroll - syaw * spitch * croll; + out->w = cyaw * cpitch * croll + syaw * spitch * sroll; + + return out; } D3DXQUATERNION * WINAPI D3DXQuaternionSlerp(D3DXQUATERNION *out, const D3DXQUATERNION *q1,

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
83
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2012