September 2012 - Wine-commits

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 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 : 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 : 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 : 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 IActiveScriptSiteUIControl tests.
by Alexandre Julliard 26 Sep '12

26 Sep '12

Module: wine Branch: master Commit: 62e340226cc968d24d67fff9bdec35cb16f19c4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=62e340226cc968d24d67fff9b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 26 14:37:47 2012 +0200 mshtml: Added IActiveScriptSiteUIControl tests. --- dlls/mshtml/tests/script.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index 0fa6eba..ddf3613 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -2084,6 +2084,22 @@ static void test_default_arg_conv(IHTMLWindow2 *window) IDispatchEx_Release(dispex); } +static void test_ui(void) +{ + IActiveScriptSiteUIControl *ui_control; + SCRIPTUICHANDLING uic_handling = 10; + HRESULT hres; + + hres = IActiveScriptSite_QueryInterface(site, &IID_IActiveScriptSiteUIControl, (void**)&ui_control); + ok(hres == S_OK, "Could not get IActiveScriptSiteUIControl: %08x\n", hres); + + hres = IActiveScriptSiteUIControl_GetUIBehavior(ui_control, SCRIPTUICITEM_MSGBOX, &uic_handling); + ok(hres == S_OK, "GetUIBehavior failed: %08x\n", hres); + ok(uic_handling == SCRIPTUICHANDLING_ALLOW, "uic_handling = %d\n", uic_handling); + + IActiveScriptSiteUIControl_Release(ui_control); +} + static void test_script_run(void) { IDispatchEx *document, *dispex; @@ -2308,6 +2324,7 @@ static void test_script_run(void) test_global_id(); test_security(); + test_ui(); } static HRESULT WINAPI ActiveScriptParse_ParseScriptText(IActiveScriptParse *iface,

1 0

Alexandre Julliard : wineps: Always escape Postscript reserved characters in font names.
by Alexandre Julliard 26 Sep '12

26 Sep '12

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 26 Sep '12

26 Sep '12

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 26 Sep '12

26 Sep '12

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 26 Sep '12

26 Sep '12

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