September 2009 - Wine-Commits

Michael Stefaniuc : shell32: Use FAILED instead of !SUCCEEDED.
by Alexandre Julliard Sept. 10, 2009

Sept. 10, 2009

Module: wine Branch: master Commit: 5ea23d616b5b673b657d7988c176e2a4c1e6cc27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ea23d616b5b673b657d7988c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Sep 10 00:28:56 2009 +0200 shell32: Use FAILED instead of !SUCCEEDED. --- dlls/shell32/cpanelfolder.c | 3 +-- dlls/shell32/shellitem.c | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/cpanelfolder.c b/dlls/shell32/cpanelfolder.c index af3e0ca..cd2f3b8 100644 --- a/dlls/shell32/cpanelfolder.c +++ b/dlls/shell32/cpanelfolder.c @@ -688,8 +688,7 @@ static HRESULT WINAPI ISF_ControlPanel_fnGetDisplayNameOf(IShellFolder2 * iface, PathAddBackslashW(wszPath); len = lstrlenW(wszPath); - if (!SUCCEEDED - (SHELL32_GetDisplayNameOfChild(iface, pidl, dwFlags | SHGDN_INFOLDER, wszPath + len, MAX_PATH + 1 - len))) + if (FAILED(SHELL32_GetDisplayNameOfChild(iface, pidl, dwFlags | SHGDN_INFOLDER, wszPath + len, MAX_PATH + 1 - len))) return E_OUTOFMEMORY; if (!WideCharToMultiByte(CP_ACP, 0, wszPath, -1, szPath, MAX_PATH, NULL, NULL)) wszPath[0] = '\0'; diff --git a/dlls/shell32/shellitem.c b/dlls/shell32/shellitem.c index 13cb1f6..29f072f 100644 --- a/dlls/shell32/shellitem.c +++ b/dlls/shell32/shellitem.c @@ -350,13 +350,13 @@ HRESULT WINAPI SHCreateShellItem(LPCITEMIDLIST pidlParent, { IPersistFolder2* ppf2Parent; - if (!SUCCEEDED(IPersistFolder2_QueryInterface(psfParent, &IID_IPersistFolder2, (void**)&ppf2Parent))) + if (FAILED(IPersistFolder2_QueryInterface(psfParent, &IID_IPersistFolder2, (void**)&ppf2Parent))) { FIXME("couldn't get IPersistFolder2 interface of parent\n"); return E_NOINTERFACE; } - if (!SUCCEEDED(IPersistFolder2_GetCurFolder(ppf2Parent, &temp_parent))) + if (FAILED(IPersistFolder2_GetCurFolder(ppf2Parent, &temp_parent))) { FIXME("couldn't get parent PIDL\n"); IPersistFolder2_Release(ppf2Parent);

1 0

Michael Stefaniuc : setupapi: Use FAILED instead of !SUCCEEDED.
by Alexandre Julliard Sept. 10, 2009

Sept. 10, 2009

Module: wine Branch: master Commit: 8b3f3ef82192c14752c6169341be96d13ed0f7fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b3f3ef82192c14752c616934… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Sep 10 00:28:47 2009 +0200 setupapi: Use FAILED instead of !SUCCEEDED. --- dlls/setupapi/install.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c index b68aa0b..f90c2d8 100644 --- a/dlls/setupapi/install.c +++ b/dlls/setupapi/install.c @@ -875,8 +875,8 @@ static BOOL profile_items_callback( HINF hinf, PCWSTR field, void *arg ) initresult = CoInitialize(NULL); - if (!SUCCEEDED(CoCreateInstance( &CLSID_ShellLink, NULL, - CLSCTX_INPROC_SERVER, &IID_IShellLinkW, (LPVOID*)&shelllink))) + if (FAILED(CoCreateInstance( &CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, + &IID_IShellLinkW, (LPVOID*)&shelllink ))) goto done; IShellLinkW_SetPath( shelllink, cmdline );

1 0

Michael Stefaniuc : windowscodecs: Use FAILED instead of !SUCCEEDED.
by Alexandre Julliard Sept. 10, 2009

Sept. 10, 2009

Module: wine Branch: master Commit: 78cfd137307a976120cb3349650ee89b5ba91778 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78cfd137307a976120cb33496… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Sep 10 00:28:37 2009 +0200 windowscodecs: Use FAILED instead of !SUCCEEDED. --- dlls/windowscodecs/info.c | 2 +- dlls/windowscodecs/tests/bmpformat.c | 12 ++++++------ dlls/windowscodecs/tests/palette.c | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index 64c3855..f909d3a 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -952,7 +952,7 @@ HRESULT CreateComponentEnumerator(DWORD componentTypes, DWORD options, IEnumUnkn list_add_tail(&This->objects, &item->entry); } - if (!SUCCEEDED(hr)) + if (FAILED(hr)) { HeapFree(GetProcessHeap(), 0, item); hr = S_OK; diff --git a/dlls/windowscodecs/tests/bmpformat.c b/dlls/windowscodecs/tests/bmpformat.c index c793dd7..1f114a2 100644 --- a/dlls/windowscodecs/tests/bmpformat.c +++ b/dlls/windowscodecs/tests/bmpformat.c @@ -70,7 +70,7 @@ static void test_decode_24bpp(void) hr = CoCreateInstance(&CLSID_WICBmpDecoder, NULL, CLSCTX_INPROC_SERVER, &IID_IWICBitmapDecoder, (void**)&decoder); ok(SUCCEEDED(hr), "CoCreateInstance failed, hr=%x\n", hr); - if (!SUCCEEDED(hr)) return; + if (FAILED(hr)) return; hbmpdata = GlobalAlloc(GMEM_MOVEABLE, sizeof(testbmp_24bpp)); ok(hbmpdata != 0, "GlobalAlloc failed\n"); @@ -277,7 +277,7 @@ static void test_decode_1bpp(void) hr = CoCreateInstance(&CLSID_WICBmpDecoder, NULL, CLSCTX_INPROC_SERVER, &IID_IWICBitmapDecoder, (void**)&decoder); ok(SUCCEEDED(hr), "CoCreateInstance failed, hr=%x\n", hr); - if (!SUCCEEDED(hr)) return; + if (FAILED(hr)) return; hbmpdata = GlobalAlloc(GMEM_MOVEABLE, sizeof(testbmp_1bpp)); ok(hbmpdata != 0, "GlobalAlloc failed\n"); @@ -435,7 +435,7 @@ static void test_decode_4bpp(void) hr = CoCreateInstance(&CLSID_WICBmpDecoder, NULL, CLSCTX_INPROC_SERVER, &IID_IWICBitmapDecoder, (void**)&decoder); ok(SUCCEEDED(hr), "CoCreateInstance failed, hr=%x\n", hr); - if (!SUCCEEDED(hr)) return; + if (FAILED(hr)) return; hbmpdata = GlobalAlloc(GMEM_MOVEABLE, sizeof(testbmp_4bpp)); ok(hbmpdata != 0, "GlobalAlloc failed\n"); @@ -614,7 +614,7 @@ static void test_decode_rle8(void) hr = CoCreateInstance(&CLSID_WICBmpDecoder, NULL, CLSCTX_INPROC_SERVER, &IID_IWICBitmapDecoder, (void**)&decoder); ok(SUCCEEDED(hr), "CoCreateInstance failed, hr=%x\n", hr); - if (!SUCCEEDED(hr)) return; + if (FAILED(hr)) return; hbmpdata = GlobalAlloc(GMEM_MOVEABLE, sizeof(testbmp_rle8)); ok(hbmpdata != 0, "GlobalAlloc failed\n"); @@ -780,7 +780,7 @@ static void test_decode_rle4(void) hr = CoCreateInstance(&CLSID_WICBmpDecoder, NULL, CLSCTX_INPROC_SERVER, &IID_IWICBitmapDecoder, (void**)&decoder); ok(SUCCEEDED(hr), "CoCreateInstance failed, hr=%x\n", hr); - if (!SUCCEEDED(hr)) return; + if (FAILED(hr)) return; hbmpdata = GlobalAlloc(GMEM_MOVEABLE, sizeof(testbmp_rle4)); ok(hbmpdata != 0, "GlobalAlloc failed\n"); @@ -999,7 +999,7 @@ static void test_createfromstream(void) hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, &IID_IWICImagingFactory, (void**)&factory); ok(SUCCEEDED(hr), "CoCreateInstance failed, hr=%x\n", hr); - if (!SUCCEEDED(hr)) return; + if (FAILED(hr)) return; hbmpdata = GlobalAlloc(GMEM_MOVEABLE, sizeof(testbmp_1bpp)); ok(hbmpdata != 0, "GlobalAlloc failed\n"); diff --git a/dlls/windowscodecs/tests/palette.c b/dlls/windowscodecs/tests/palette.c index d1e5c88..ee9dfbc 100644 --- a/dlls/windowscodecs/tests/palette.c +++ b/dlls/windowscodecs/tests/palette.c @@ -39,7 +39,7 @@ static void test_custom_palette(void) hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, &IID_IWICImagingFactory, (void**)&factory); ok(SUCCEEDED(hr), "CoCreateInstance failed, hr=%x\n", hr); - if (!SUCCEEDED(hr)) return; + if (FAILED(hr)) return; hr = IWICImagingFactory_CreatePalette(factory, &palette); ok(SUCCEEDED(hr), "CreatePalette failed, hr=%x\n", hr);

1 0

Jacek Caban : mshtml: Use ActiveScript for JavaScript in about protocol documents.
by Alexandre Julliard Sept. 10, 2009

Sept. 10, 2009

Module: wine Branch: master Commit: f3fc00503c3388977dd3a982d5757b9bf866b5fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3fc00503c3388977dd3a982d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 9 21:32:11 2009 +0200 mshtml: Use ActiveScript for JavaScript in about protocol documents. --- dlls/mshtml/persist.c | 5 ++++- dlls/mshtml/tests/dom.c | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 875a4e8..e9fc9c6 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -42,7 +42,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); static BOOL use_gecko_script(LPCWSTR url) { static const WCHAR fileW[] = {'f','i','l','e',':'}; - return strncmpiW(fileW, url, sizeof(fileW)/sizeof(WCHAR)); + static const WCHAR aboutW[] = {'a','b','o','u','t',':'}; + + return strncmpiW(fileW, url, sizeof(fileW)/sizeof(WCHAR)) + && strncmpiW(aboutW, url, sizeof(aboutW)/sizeof(WCHAR)); } void set_current_mon(HTMLDocument *This, IMoniker *mon) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 49f5ab1..b9a3ff8 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -4755,8 +4755,8 @@ static void test_elems(IHTMLDocument2 *doc) DISPID pid = -1; BSTR str = a2bstr("Testing"); hres = IDispatchEx_GetDispID(dispex, str, 1, &pid); - todo_wine ok(hres == S_OK, "GetDispID failed: %08x\n", hres); - todo_wine ok(pid != -1, "pid == -1\n"); + ok(hres == S_OK, "GetDispID failed: %08x\n", hres); + ok(pid != -1, "pid == -1\n"); SysFreeString(str); IDispatchEx_Release(dispex); }

1 0

Jacek Caban : mshtml: Added window global properties test.
by Alexandre Julliard Sept. 10, 2009

Sept. 10, 2009

Module: wine Branch: master Commit: 3d99a99851104f30a2a8496c42827eedb7ac7ce3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d99a99851104f30a2a8496c4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 9 21:31:49 2009 +0200 mshtml: Added window global properties test. --- dlls/mshtml/tests/script.c | 107 ++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 104 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index f197251..bc140bd 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -1,5 +1,5 @@ /* - * Copyright 2008 Jacek Caban for CodeWeavers + * Copyright 2008-2009 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 @@ -107,15 +107,20 @@ DEFINE_EXPECT(AddNamedItem); DEFINE_EXPECT(ParseScriptText); DEFINE_EXPECT(GetScriptDispatch); DEFINE_EXPECT(funcDisp); +DEFINE_EXPECT(script_testprop_d); +DEFINE_EXPECT(script_testprop_i); #define TESTSCRIPT_CLSID "{178fc163-f585-4e24-9c13-4bb7faf80746}" +#define DISPID_SCRIPT_TESTPROP 0x100000 + static const GUID CLSID_TestScript = {0x178fc163,0xf585,0x4e24,{0x9c,0x13,0x4b,0xb7,0xfa,0xf8,0x07,0x46}}; static IHTMLDocument2 *notif_doc; static IDispatchEx *window_dispex; static BOOL doc_complete; +static IDispatch *script_disp; static const char *debugstr_guid(REFIID riid) { @@ -344,6 +349,67 @@ static IDispatchExVtbl testObjVtbl = { static IDispatchEx funcDisp = { &testObjVtbl }; +static HRESULT WINAPI scriptDisp_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD grfdex, DISPID *pid) +{ + if(!strcmp_wa(bstrName, "testProp")) { + CHECK_EXPECT(script_testprop_d); + ok(grfdex == fdexNameCaseSensitive, "grfdex = %x\n", grfdex); + *pid = DISPID_SCRIPT_TESTPROP; + return S_OK; + } + + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI scriptDisp_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, + VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) +{ + switch(id) { + case DISPID_SCRIPT_TESTPROP: + CHECK_EXPECT(script_testprop_i); + + ok(lcid == 0, "lcid = %x\n", lcid); + ok(wFlags == DISPATCH_PROPERTYGET, "wFlags = %x\n", wFlags); + ok(pdp != NULL, "pdp == NULL\n"); + ok(pdp->cArgs == 0, "pdp->cArgs = %d\n", pdp->cArgs); + ok(pdp->cNamedArgs == 0, "pdp->cNamedArgs = %d\n", pdp->cNamedArgs); + ok(!pdp->rgdispidNamedArgs, "pdp->rgdispidNamedArgs != NULL\n"); + ok(!pdp->rgvarg, "rgvarg != NULL\n"); + ok(pvarRes != NULL, "pvarRes == NULL\n"); + ok(pei != NULL, "pei == NULL\n"); + ok(!pspCaller, "pspCaller != NULL\n"); + + V_VT(pvarRes) = VT_NULL; + break; + default: + ok(0, "unexpected call\n"); + return E_NOTIMPL; + } + + return S_OK; +} + +static IDispatchExVtbl scriptDispVtbl = { + DispatchEx_QueryInterface, + DispatchEx_AddRef, + DispatchEx_Release, + DispatchEx_GetTypeInfoCount, + DispatchEx_GetTypeInfo, + DispatchEx_GetIDsOfNames, + DispatchEx_Invoke, + scriptDisp_GetDispID, + scriptDisp_InvokeEx, + DispatchEx_DeleteMemberByName, + DispatchEx_DeleteMemberByDispID, + DispatchEx_GetMemberProperties, + DispatchEx_GetMemberName, + DispatchEx_GetNextDispID, + DispatchEx_GetNameSpaceParent +}; + +static IDispatchEx scriptDisp = { &scriptDispVtbl }; + static IHTMLDocument2 *create_document(void) { IHTMLDocument2 *doc; @@ -764,7 +830,7 @@ static HRESULT WINAPI ActiveScriptParse_ParseScriptText(IActiveScriptParse *ifac ok(hres == S_OK, "GetDispID(document) failed: %08x\n", hres); ok(id == DISPID_IHTMLWINDOW2_DOCUMENT, "id=%x\n", id); - todo_wine CHECK_CALLED(GetScriptDispatch); + CHECK_CALLED(GetScriptDispatch); VariantInit(&var); memset(&dp, 0, sizeof(dp)); @@ -865,6 +931,34 @@ static HRESULT WINAPI ActiveScriptParse_ParseScriptText(IActiveScriptParse *ifac test_nextdispid(dispex); IDispatchEx_Release(dispex); + script_disp = (IDispatch*)&scriptDisp; + + SET_EXPECT(GetScriptDispatch); + SET_EXPECT(script_testprop_d); + tmp = a2bstr("testProp"); + hres = IDispatchEx_GetDispID(window_dispex, tmp, fdexNameCaseSensitive, &id); + ok(hres == S_OK, "GetDispID failed: %08x\n", hres); + ok(id != DISPID_SCRIPT_TESTPROP, "id == DISPID_SCRIPT_TESTPROP\n"); + CHECK_CALLED(GetScriptDispatch); + CHECK_CALLED(script_testprop_d); + SysFreeString(tmp); + + tmp = a2bstr("testProp"); + hres = IDispatchEx_GetDispID(window_dispex, tmp, fdexNameCaseSensitive, &id); + ok(hres == S_OK, "GetDispID failed: %08x\n", hres); + ok(id != DISPID_SCRIPT_TESTPROP, "id == DISPID_SCRIPT_TESTPROP\n"); + SysFreeString(tmp); + + SET_EXPECT(GetScriptDispatch); + SET_EXPECT(script_testprop_i); + memset(&ei, 0, sizeof(ei)); + memset(&dp, 0, sizeof(dp)); + hres = IDispatchEx_InvokeEx(window_dispex, id, 0, DISPATCH_PROPERTYGET, &dp, &var, &ei, NULL); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + ok(V_VT(&var) == VT_NULL, "V_VT(var) = %d\n", V_VT(&var)); + CHECK_CALLED(GetScriptDispatch); + CHECK_CALLED(script_testprop_i); + return S_OK; } @@ -1059,7 +1153,14 @@ static HRESULT WINAPI ActiveScript_GetScriptDispatch(IActiveScript *iface, LPCOL IDispatch **ppdisp) { CHECK_EXPECT(GetScriptDispatch); - return E_NOTIMPL; + + ok(!strcmp_wa(pstrItemName, "window"), "pstrItemName = %s\n", wine_dbgstr_w(pstrItemName)); + + if(!script_disp) + return E_NOTIMPL; + + *ppdisp = script_disp; + return S_OK; } static HRESULT WINAPI ActiveScript_GetCurrentScriptThreadID(IActiveScript *iface,

1 0

Jacek Caban : mshtml: Added support for quering global variables from window object.
by Alexandre Julliard Sept. 10, 2009

Sept. 10, 2009

Module: wine Branch: master Commit: a50c4edb930798c0fbd5d2b9c0ead1ec795fe72f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a50c4edb930798c0fbd5d2b9c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 9 21:31:32 2009 +0200 mshtml: Added support for quering global variables from window object. --- dlls/mshtml/htmlwindow.c | 88 +++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/mshtml_private.h | 14 +++++++ dlls/mshtml/script.c | 50 +++++++++++++++++++++++- 3 files changed, 149 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 81bcebd..f268a0a 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -93,8 +93,13 @@ static ULONG WINAPI HTMLWindow2_Release(IHTMLWindow2 *iface) TRACE("(%p) ref=%d\n", This, ref); if(!ref) { + DWORD i; + if(This->event_target) release_event_target(This->event_target); + for(i=0; i < This->global_prop_cnt; i++) + heap_free(This->global_props[i].name); + heap_free(This->global_props); release_script_hosts(This); list_remove(&This->entry); release_dispex(&This->dispex); @@ -840,6 +845,40 @@ static HRESULT WINAPI HTMLWindow2_get_external(IHTMLWindow2 *iface, IDispatch ** return IDocHostUIHandler_GetExternal(This->doc->hostui, p); } +static HRESULT HTMLWindow_invoke(IUnknown *iface, DISPID id, LCID lcid, WORD flags, DISPPARAMS *params, + VARIANT *res, EXCEPINFO *ei, IServiceProvider *caller) +{ + HTMLWindow *This = HTMLWINDOW2_THIS(iface); + IDispatchEx *dispex; + IDispatch *disp; + DWORD idx; + HRESULT hres; + + idx = id - MSHTML_DISPID_CUSTOM_MIN; + if(idx >= This->global_prop_cnt) + return DISP_E_MEMBERNOTFOUND; + + disp = get_script_disp(This->global_props[idx].script_host); + if(!disp) + return E_UNEXPECTED; + + hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); + if(SUCCEEDED(hres)) { + TRACE("%s >>>\n", debugstr_w(This->global_props[idx].name)); + hres = IDispatchEx_InvokeEx(dispex, This->global_props[idx].id, lcid, flags, params, res, ei, caller); + if(hres == S_OK) + TRACE("%s <<<\n", debugstr_w(This->global_props[idx].name)); + else + WARN("%s <<< %08x\n", debugstr_w(This->global_props[idx].name), hres); + IDispatchEx_Release(dispex); + }else { + FIXME("No IDispatchEx\n"); + } + + IDispatch_Release(disp); + return hres; +} + #undef HTMLWINDOW2_THIS static const IHTMLWindow2Vtbl HTMLWindow2Vtbl = { @@ -1207,9 +1246,49 @@ static HRESULT WINAPI WindowDispEx_Invoke(IDispatchEx *iface, DISPID dispIdMembe static HRESULT WINAPI WindowDispEx_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD grfdex, DISPID *pid) { HTMLWindow *This = DISPEX_THIS(iface); + ScriptHost *script_host; + DISPID id; + DWORD i; TRACE("(%p)->(%s %x %p)\n", This, debugstr_w(bstrName), grfdex, pid); + for(i=0; i < This->global_prop_cnt; i++) { + /* FIXME: case sensitivity */ + if(!strcmpW(This->global_props[i].name, bstrName)) { + *pid = MSHTML_DISPID_CUSTOM_MIN+i; + return S_OK; + } + } + + if(find_global_prop(This, bstrName, grfdex, &script_host, &id)) { + if(This->global_prop_cnt == This->global_prop_size) { + global_prop_t *new_props; + DWORD new_size; + + if(This->global_props) { + new_size = This->global_prop_size*2; + new_props = heap_realloc(This->global_props, new_size*sizeof(global_prop_t)); + }else { + new_size = 16; + new_props = heap_alloc(new_size*sizeof(global_prop_t)); + } + if(!new_props) + return E_OUTOFMEMORY; + This->global_props = new_props; + This->global_prop_size = new_size; + } + + This->global_props[This->global_prop_cnt].name = heap_strdupW(bstrName); + if(!This->global_props[This->global_prop_cnt].name) + return E_OUTOFMEMORY; + + This->global_props[This->global_prop_cnt].script_host = script_host; + This->global_props[This->global_prop_cnt].id = id; + + *pid = MSHTML_DISPID_CUSTOM_MIN + (This->global_prop_cnt++); + return S_OK; + } + return IDispatchEx_GetDispID(DISPATCHEX(&This->dispex), bstrName, grfdex, pid); } @@ -1303,8 +1382,15 @@ static const tid_t HTMLWindow_iface_tids[] = { IHTMLWindow3_tid, 0 }; -static dispex_static_data_t HTMLWindow_dispex = { + +static const dispex_static_data_vtbl_t HTMLWindow_dispex_vtbl = { + NULL, NULL, + HTMLWindow_invoke +}; + +static dispex_static_data_t HTMLWindow_dispex = { + &HTMLWindow_dispex_vtbl, DispHTMLWindow2_tid, NULL, HTMLWindow_iface_tids diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index f74b220..e202688 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -158,6 +158,14 @@ typedef enum { SCRIPTMODE_ACTIVESCRIPT } SCRIPTMODE; +typedef struct ScriptHost ScriptHost; + +typedef struct { + WCHAR *name; + ScriptHost *script_host; + DISPID id; +} global_prop_t; + typedef struct { DispatchEx dispex; const IHTMLWindow2Vtbl *lpHTMLWindow2Vtbl; @@ -175,6 +183,10 @@ typedef struct { SCRIPTMODE scriptmode; struct list script_hosts; + global_prop_t *global_props; + DWORD global_prop_cnt; + DWORD global_prop_size; + struct list entry; } HTMLWindow; @@ -628,6 +640,8 @@ void connect_scripts(HTMLWindow*); void doc_insert_script(HTMLDocument*,nsIDOMHTMLScriptElement*); IDispatch *script_parse_event(HTMLDocument*,LPCWSTR); void set_script_mode(HTMLWindow*,SCRIPTMODE); +BOOL find_global_prop(HTMLWindow*,BSTR,DWORD,ScriptHost**,DISPID*); +IDispatch *get_script_disp(ScriptHost*); IHTMLElementCollection *create_all_collection(HTMLDOMNode*,BOOL); IHTMLElementCollection *create_collection_from_nodelist(HTMLDocument*,IUnknown*,nsIDOMNodeList*); diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 3046a7d..96dbb47 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -42,7 +42,7 @@ static const WCHAR emptyW[] = {0}; static const CLSID CLSID_JScript = {0xf414c260,0x6ac0,0x11cf,{0xb6,0xd1,0x00,0xaa,0x00,0xbb,0xbb,0x58}}; -typedef struct { +struct ScriptHost { const IActiveScriptSiteVtbl *lpIActiveScriptSiteVtbl; const IActiveScriptSiteInterruptPollVtbl *lpIActiveScriptSiteInterruptPollVtbl; const IActiveScriptSiteWindowVtbl *lpIActiveScriptSiteWindowVtbl; @@ -60,7 +60,7 @@ typedef struct { GUID guid; struct list entry; -} ScriptHost; +}; #define ACTSCPSITE(x) ((IActiveScriptSite*) &(x)->lpIActiveScriptSiteVtbl) #define ACTSCPPOLL(x) (&(x)->lpIActiveScriptSiteInterruptPollVtbl) @@ -811,6 +811,52 @@ IDispatch *script_parse_event(HTMLDocument *doc, LPCWSTR text) return disp; } +IDispatch *get_script_disp(ScriptHost *script_host) +{ + IDispatch *disp; + HRESULT hres; + + if(!script_host->script) + return NULL; + + hres = IActiveScript_GetScriptDispatch(script_host->script, windowW, &disp); + if(FAILED(hres)) + return NULL; + + return disp; +} + +BOOL find_global_prop(HTMLWindow *window, BSTR name, DWORD flags, ScriptHost **ret_host, DISPID *ret_id) +{ + IDispatchEx *dispex; + IDispatch *disp; + ScriptHost *iter; + HRESULT hres; + + LIST_FOR_EACH_ENTRY(iter, &window->script_hosts, ScriptHost, entry) { + disp = get_script_disp(iter); + if(!disp) + continue; + + hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); + if(SUCCEEDED(hres)) { + hres = IDispatchEx_GetDispID(dispex, name, flags, ret_id); + IDispatchEx_Release(dispex); + }else { + FIXME("No IDispatchEx\n"); + hres = E_NOTIMPL; + } + + IDispatch_Release(disp); + if(SUCCEEDED(hres)) { + *ret_host = iter; + return TRUE; + } + } + + return FALSE; +} + static BOOL is_jscript_available(void) { static BOOL available, checked;

1 0

Jacek Caban : mshtml: Moved script host objects to HTMLWindow.
by Alexandre Julliard Sept. 10, 2009

Sept. 10, 2009

Module: wine Branch: master Commit: 705fb0f239cf74be0d4d10651f440fbcefb17a94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=705fb0f239cf74be0d4d10651… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 9 21:30:41 2009 +0200 mshtml: Moved script host objects to HTMLWindow. --- dlls/mshtml/htmldoc.c | 3 -- dlls/mshtml/htmlwindow.c | 4 +++ dlls/mshtml/mshtml_private.h | 22 +++++++++--------- dlls/mshtml/nsevents.c | 2 +- dlls/mshtml/persist.c | 2 +- dlls/mshtml/script.c | 52 +++++++++++++++++++++--------------------- 6 files changed, 43 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=705fb0f239cf74be0d4d1…

1 0

Aric Stewart : msctf/tests: Fix tests for Windows Vista.
by Alexandre Julliard Sept. 10, 2009

Sept. 10, 2009

Module: wine Branch: master Commit: 43256560e9c35d784ef01edcb0eacd4c66f2be87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43256560e9c35d784ef01edcb… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Sep 9 13:33:36 2009 -0500 msctf/tests: Fix tests for Windows Vista. --- dlls/msctf/tests/inputprocessor.c | 54 +++++++++++++++++++++++++++--------- 1 files changed, 40 insertions(+), 14 deletions(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 815dbbb..732ab0f 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -52,6 +52,8 @@ static ITextStoreACPSink *ACPSink; #define SINK_OPTION_TODO 0x0100 +#define FOCUS_IGNORE (ITfDocumentMgr*)0xffffffff + static BOOL test_ShouldActivate = FALSE; static BOOL test_ShouldDeactivate = FALSE; @@ -122,8 +124,10 @@ inline void _sink_check_ok(INT *sink, const CHAR* name) switch (action) { - case SINK_FIRED: case SINK_OPTIONAL: + if (winetest_interactive) + winetest_trace("optional sink %s not fired\n",name); + case SINK_FIRED: break; case SINK_IGNORE: return; @@ -490,8 +494,10 @@ static HRESULT WINAPI ThreadMgrEventSink_OnSetFocus(ITfThreadMgrEventSink *iface ITfDocumentMgr *pdimFocus, ITfDocumentMgr *pdimPrevFocus) { sink_fire_ok(&test_OnSetFocus,"ThreadMgrEventSink_OnSetFocus"); - ok(pdimFocus == test_CurrentFocus,"Sink reports wrong focus\n"); - ok(pdimPrevFocus == test_PrevFocus,"Sink reports wrong previous focus\n"); + if (test_CurrentFocus != FOCUS_IGNORE) + ok(pdimFocus == test_CurrentFocus,"Sink reports wrong focus\n"); + if (test_PrevFocus != FOCUS_IGNORE) + ok(pdimPrevFocus == test_PrevFocus,"Sink reports wrong previous focus\n"); return S_OK; } @@ -1935,24 +1941,35 @@ static void test_AssociateFocus(void) hr = ITfThreadMgr_CreateDocumentMgr(g_tm,&dm2); ok(SUCCEEDED(hr),"CreateDocumentMgr failed\n"); - wnd1 = CreateWindow("edit",NULL,WS_POPUP|WS_VISIBLE,0,0,200,60,NULL,NULL,NULL,NULL); + wnd1 = CreateWindow("edit",NULL,WS_POPUP,0,0,200,60,NULL,NULL,NULL,NULL); ok(wnd1!=NULL,"Unable to create window 1\n"); - wnd2 = CreateWindow("edit",NULL,WS_POPUP|WS_VISIBLE,0,0,200,60,NULL,NULL,NULL,NULL); + wnd2 = CreateWindow("edit",NULL,WS_POPUP,0,65,200,60,NULL,NULL,NULL,NULL); ok(wnd2!=NULL,"Unable to create window 2\n"); - wnd3 = CreateWindow("edit",NULL,WS_POPUP|WS_VISIBLE,0,0,200,60,NULL,NULL,NULL,NULL); + wnd3 = CreateWindow("edit",NULL,WS_POPUP,0,130,200,60,NULL,NULL,NULL,NULL); ok(wnd3!=NULL,"Unable to create window 3\n"); processPendingMessages(); + test_OnInitDocumentMgr = SINK_OPTIONAL; /* Vista and greater */ + test_OnPushContext = SINK_OPTIONAL; /* Vista and greater */ + + ShowWindow(wnd1,SW_SHOWNORMAL); SetFocus(wnd1); + sink_check_ok(&test_OnInitDocumentMgr,"OnInitDocumentMgr"); + sink_check_ok(&test_OnPushContext,"OnPushContext"); + + test_OnSetFocus = SINK_OPTIONAL; /* Vista and greater */ + ITfThreadMgr_GetFocus(g_tm, &test_PrevFocus); + test_CurrentFocus = FOCUS_IGNORE; /* This is a default system context */ processPendingMessages(); + sink_check_ok(&test_OnSetFocus,"OnSetFocus"); + test_CurrentFocus = dm1; - test_PrevFocus = NULL; + test_PrevFocus = FOCUS_IGNORE; test_OnSetFocus = SINK_EXPECTED; hr = ITfThreadMgr_AssociateFocus(g_tm,wnd1,dm1,&olddm); ok(SUCCEEDED(hr),"AssociateFocus failed\n"); sink_check_ok(&test_OnSetFocus,"OnSetFocus"); - ok(olddm == NULL, "unexpected old DocumentMgr\n"); processPendingMessages(); @@ -1977,10 +1994,12 @@ static void test_AssociateFocus(void) test_CurrentFocus = dm2; test_PrevFocus = dm1; test_OnSetFocus = SINK_EXPECTED; + ShowWindow(wnd2,SW_SHOWNORMAL); SetFocus(wnd2); processPendingMessages(); sink_check_ok(&test_OnSetFocus,"OnSetFocus"); + ShowWindow(wnd3,SW_SHOWNORMAL); SetFocus(wnd3); processPendingMessages(); @@ -2003,7 +2022,7 @@ static void test_AssociateFocus(void) ITfThreadMgr_SetFocus(g_tm,dmorig); sink_check_ok(&test_OnSetFocus,"OnSetFocus"); - test_CurrentFocus = NULL; + test_CurrentFocus = FOCUS_IGNORE; /* NULL on XP, system default on Vista */ test_PrevFocus = dmorig; test_OnSetFocus = SINK_EXPECTED; SetFocus(wnd3); @@ -2026,16 +2045,23 @@ static void test_AssociateFocus(void) ITfDocumentMgr_Release(dm1); ITfDocumentMgr_Release(dm2); - DestroyWindow(wnd1); - DestroyWindow(wnd2); - DestroyWindow(wnd3); test_CurrentFocus = dmorig; - test_PrevFocus = NULL; + test_PrevFocus = FOCUS_IGNORE; test_OnSetFocus = SINK_EXPECTED; test_ACP_GetStatus = SINK_IGNORE; ITfThreadMgr_SetFocus(g_tm,dmorig); sink_check_ok(&test_OnSetFocus,"OnSetFocus"); + + DestroyWindow(wnd1); + DestroyWindow(wnd2); + test_OnPopContext = SINK_OPTIONAL; /* Vista and greater */ + test_OnSetFocus = SINK_OPTIONAL; /* Vista and greater */ + ITfThreadMgr_GetFocus(g_tm, &test_PrevFocus); + test_CurrentFocus = NULL; + DestroyWindow(wnd3); + sink_check_ok(&test_OnSetFocus,"OnSetFocus"); + sink_check_ok(&test_OnPopContext,"OnPopContext"); } START_TEST(inputprocessor) @@ -2044,6 +2070,7 @@ START_TEST(inputprocessor) { test_Register(); test_RegisterCategory(); + test_EnumLanguageProfiles(); test_EnumInputProcessorInfo(); test_Enable(); test_ThreadMgrAdviseSinks(); @@ -2056,7 +2083,6 @@ START_TEST(inputprocessor) test_Compartments(); test_AssociateFocus(); test_endSession(); - test_EnumLanguageProfiles(); test_FindClosestCategory(); test_Disable(); test_ThreadMgrUnadviseSinks();

1 0

Aric Stewart : msctf/tests: Correct wine_todo handling in sinks.
by Alexandre Julliard Sept. 10, 2009

Sept. 10, 2009

Module: wine Branch: master Commit: 017c84e75ec26135956f1e228845bdc19a8a1689 URL: http://source.winehq.org/git/wine.git/?a=commit;h=017c84e75ec26135956f1e228… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Sep 9 13:33:23 2009 -0500 msctf/tests: Correct wine_todo handling in sinks. --- dlls/msctf/tests/inputprocessor.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 591deff..815dbbb 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -106,10 +106,10 @@ static inline void _sink_fire_ok(INT *sink, const CHAR* name) winetest_trace("Ignoring %s\n",name); return; default: - if (todo) todo_wine - { + if (todo) + todo_wine winetest_ok(0, "Unexpected %s sink\n",name); + else winetest_ok(0, "Unexpected %s sink\n",name); - } } *sink = SINK_FIRED; } @@ -1121,8 +1121,10 @@ static void test_KeystrokeMgr(void) tfpk.uVKey = 'A'; tfpk.uModifiers = TF_MOD_SHIFT; + test_KEV_OnSetFocus = SINK_EXPECTED; hr = ITfKeystrokeMgr_AdviseKeyEventSink(keymgr,tid,sink,TRUE); ok(SUCCEEDED(hr),"ITfKeystrokeMgr_AdviseKeyEventSink failed\n"); + sink_check_ok(&test_KEV_OnSetFocus,"KeyEventSink_OnSetFocus"); hr = ITfKeystrokeMgr_AdviseKeyEventSink(keymgr,tid,sink,TRUE); ok(hr == CONNECT_E_ADVISELIMIT,"Wrong return, expected CONNECT_E_ADVISELIMIT\n"); hr = ITfKeystrokeMgr_AdviseKeyEventSink(keymgr,cid,sink,TRUE);

1 0

Alexandre Julliard : ntdll: Make sure that serial ioctl calls fail on non-serial handles.
by Alexandre Julliard Sept. 10, 2009

Sept. 10, 2009

Module: wine Branch: master Commit: 72241b5d47ddd5a4373f206502e876e7ef13683d URL: http://source.winehq.org/git/wine.git/?a=commit;h=72241b5d47ddd5a4373f20650… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 10 11:06:01 2009 +0200 ntdll: Make sure that serial ioctl calls fail on non-serial handles. --- dlls/kernel32/tests/comm.c | 10 ++++++++++ dlls/ntdll/serial.c | 11 ++++++++++- 2 files changed, 20 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/comm.c b/dlls/kernel32/tests/comm.c index 2fb95cd..3d0d17b 100644 --- a/dlls/kernel32/tests/comm.c +++ b/dlls/kernel32/tests/comm.c @@ -1643,6 +1643,15 @@ static void test_WaitBreak(HANDLE hcom) ok(ClearCommBreak(hcom), "ClearCommBreak failed\n"); } +static void test_stdio(void) +{ + DCB dcb; + + /* cygwin tries this to determine the stdin handle type */ + ok( !GetCommState( GetStdHandle(STD_INPUT_HANDLE), &dcb ), "GetCommState succeeded on stdin\n" ); + ok( GetLastError() == ERROR_INVALID_HANDLE, "got error %u\n", GetLastError() ); +} + START_TEST(comm) { HANDLE hcom; @@ -1735,4 +1744,5 @@ START_TEST(comm) test_WaitBreak(hcom); CloseHandle(hcom); } + test_stdio(); } diff --git a/dlls/ntdll/serial.c b/dlls/ntdll/serial.c index 2aff6fc..1936428 100644 --- a/dlls/ntdll/serial.c +++ b/dlls/ntdll/serial.c @@ -1110,8 +1110,17 @@ static inline NTSTATUS io_control(HANDLE hDevice, if (dwIoControlCode != IOCTL_SERIAL_GET_TIMEOUTS && dwIoControlCode != IOCTL_SERIAL_SET_TIMEOUTS) - if ((status = server_get_unix_fd( hDevice, access, &fd, &needs_close, NULL, NULL ))) + { + enum server_fd_type type; + if ((status = server_get_unix_fd( hDevice, access, &fd, &needs_close, &type, NULL ))) + goto error; + if (type != FD_TYPE_SERIAL) + { + if (needs_close) close( fd ); + status = STATUS_OBJECT_TYPE_MISMATCH; goto error; + } + } switch (dwIoControlCode) {

1 0