April 2008 - Wine-commits - list.winehq.org

Alam Arias : include: Fix wingdi. h to define AW version of wglUseFontBitmaps and wglUseFontOutlines.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: 09d460f422c612456451f79f02734d0c3ecf7ea6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09d460f422c612456451f79f0… Author: Alam Arias <Alam.GBC(a)gmail.com> Date: Fri Apr 18 19:30:03 2008 -0400 include: Fix wingdi.h to define AW version of wglUseFontBitmaps and wglUseFontOutlines. --- include/wingdi.h | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/include/wingdi.h b/include/wingdi.h index ea65928..14c307d 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -3722,8 +3722,12 @@ WINGDIAPI BOOL WINAPI wglRealizeLayerPalette(HDC,INT,BOOL); WINGDIAPI INT WINAPI wglSetLayerPaletteEntries(HDC,INT,INT,INT,const COLORREF *); WINGDIAPI BOOL WINAPI wglShareLists(HGLRC,HGLRC); WINGDIAPI BOOL WINAPI wglSwapLayerBuffers(HDC,UINT); -WINGDIAPI BOOL WINAPI wglUseFontBitmaps(HDC,DWORD,DWORD,DWORD); -WINGDIAPI BOOL WINAPI wglUseFontOutlines(HDC,DWORD,DWORD,DWORD,FLOAT,FLOAT,INT,LPGLYPHMETRICSFLOAT); +WINGDIAPI BOOL WINAPI wglUseFontBitmapsA(HDC,DWORD,DWORD,DWORD); +WINGDIAPI BOOL WINAPI wglUseFontBitmapsW(HDC,DWORD,DWORD,DWORD); +#define wglUseFontBitmaps WINELIB_NAME_AW(wglUseFontBitmaps) +WINGDIAPI BOOL WINAPI wglUseFontOutlinesA(HDC,DWORD,DWORD,DWORD,FLOAT,FLOAT,INT,LPGLYPHMETRICSFLOAT); +WINGDIAPI BOOL WINAPI wglUseFontOutlinesW(HDC,DWORD,DWORD,DWORD,FLOAT,FLOAT,INT,LPGLYPHMETRICSFLOAT); +#define wglUseFontOutlines WINELIB_NAME_AW(wglUseFontOutlines) #ifdef __WINESRC__ /* the DC hook support is only exported on Win16, the 32-bit version is a Wine extension */

1 0

Jacek Caban : mshtml: Forward window IDispatch methods.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: 951084abcf16766f8c5636738ffd614089acf793 URL: http://source.winehq.org/git/wine.git/?a=commit;h=951084abcf16766f8c5636738… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Apr 19 18:41:44 2008 +0200 mshtml: Forward window IDispatch methods. --- dlls/mshtml/htmlwindow.c | 57 +++++++++++---------------------------------- 1 files changed, 14 insertions(+), 43 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 39d54d6..5ed5701 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -101,25 +101,15 @@ static HRESULT WINAPI HTMLWindow2_GetTypeInfoCount(IHTMLWindow2 *iface, UINT *pc { HTMLWindow *This = HTMLWINDOW2_THIS(iface); - TRACE("(%p)->(%p)\n", This, pctinfo); - - *pctinfo = 1; - return S_OK; + return IDispatchEx_GetTypeInfoCount(DISPATCHEX(This), pctinfo); } static HRESULT WINAPI HTMLWindow2_GetTypeInfo(IHTMLWindow2 *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { HTMLWindow *This = HTMLWINDOW2_THIS(iface); - HRESULT hres; - - TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); - - hres = get_typeinfo(IHTMLWindow2_tid, ppTInfo); - if(SUCCEEDED(hres)) - ITypeInfo_AddRef(*ppTInfo); - return hres; + return IDispatchEx_GetTypeInfo(DISPATCHEX(This), iTInfo, lcid, ppTInfo); } static HRESULT WINAPI HTMLWindow2_GetIDsOfNames(IHTMLWindow2 *iface, REFIID riid, @@ -127,17 +117,8 @@ static HRESULT WINAPI HTMLWindow2_GetIDsOfNames(IHTMLWindow2 *iface, REFIID riid LCID lcid, DISPID *rgDispId) { HTMLWindow *This = HTMLWINDOW2_THIS(iface); - ITypeInfo *typeinfo; - HRESULT hres; - TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, - lcid, rgDispId); - - hres = get_typeinfo(IHTMLWindow2_tid, &typeinfo); - if(SUCCEEDED(hres)) - hres = ITypeInfo_GetIDsOfNames(typeinfo, rgszNames, cNames, rgDispId); - - return hres; + return IDispatchEx_GetIDsOfNames(DISPATCHEX(This), riid, rgszNames, cNames, lcid, rgDispId); } static HRESULT WINAPI HTMLWindow2_Invoke(IHTMLWindow2 *iface, DISPID dispIdMember, @@ -145,18 +126,9 @@ static HRESULT WINAPI HTMLWindow2_Invoke(IHTMLWindow2 *iface, DISPID dispIdMembe VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { HTMLWindow *This = HTMLWINDOW2_THIS(iface); - ITypeInfo *typeinfo; - HRESULT hres; - - TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); - - hres = get_typeinfo(IHTMLWindow2_tid, &typeinfo); - if(SUCCEEDED(hres)) - hres = ITypeInfo_Invoke(typeinfo, HTMLWINDOW2(This), dispIdMember, wFlags, pDispParams, - pVarResult, pExcepInfo, puArgErr); - return hres; + return IDispatchEx_Invoke(DISPATCHEX(This), dispIdMember, riid, lcid, wFlags, pDispParams, + pVarResult, pExcepInfo, puArgErr); } static HRESULT WINAPI HTMLWindow2_item(IHTMLWindow2 *iface, VARIANT *pvarIndex, VARIANT *pvarResult) @@ -794,16 +766,16 @@ static ULONG WINAPI HTMLWindow3_Release(IHTMLWindow3 *iface) static HRESULT WINAPI HTMLWindow3_GetTypeInfoCount(IHTMLWindow3 *iface, UINT *pctinfo) { HTMLWindow *This = HTMLWINDOW3_THIS(iface); - FIXME("(%p)->(%p)\n", This, pctinfo); - return E_NOTIMPL; + + return IDispatchEx_GetTypeInfoCount(DISPATCHEX(This), pctinfo); } static HRESULT WINAPI HTMLWindow3_GetTypeInfo(IHTMLWindow3 *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { HTMLWindow *This = HTMLWINDOW3_THIS(iface); - FIXME("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); - return E_NOTIMPL; + + return IDispatchEx_GetTypeInfo(DISPATCHEX(This), iTInfo, lcid, ppTInfo); } static HRESULT WINAPI HTMLWindow3_GetIDsOfNames(IHTMLWindow3 *iface, REFIID riid, @@ -811,9 +783,8 @@ static HRESULT WINAPI HTMLWindow3_GetIDsOfNames(IHTMLWindow3 *iface, REFIID riid LCID lcid, DISPID *rgDispId) { HTMLWindow *This = HTMLWINDOW3_THIS(iface); - FIXME("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, - lcid, rgDispId); - return E_NOTIMPL; + + return IDispatchEx_GetIDsOfNames(DISPATCHEX(This), riid, rgszNames, cNames, lcid, rgDispId); } static HRESULT WINAPI HTMLWindow3_Invoke(IHTMLWindow3 *iface, DISPID dispIdMember, @@ -821,9 +792,9 @@ static HRESULT WINAPI HTMLWindow3_Invoke(IHTMLWindow3 *iface, DISPID dispIdMembe VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { HTMLWindow *This = HTMLWINDOW3_THIS(iface); - FIXME("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); - return E_NOTIMPL; + + return IDispatchEx_Invoke(DISPATCHEX(This), dispIdMember, riid, lcid, wFlags, pDispParams, + pVarResult, pExcepInfo, puArgErr); } static HRESULT WINAPI HTMLWindow3_get_screenLeft(IHTMLWindow3 *iface, long *p)

1 0

Reece Dunn : shlwapi/tests: Fix the return codes for Windows 2000 ( without IE6 installed).
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: cd16e22252710e6f81cde4c7d57275322c5f6598 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd16e22252710e6f81cde4c7d… Author: Reece Dunn <msclrhd(a)googlemail.com> Date: Fri Apr 18 21:03:29 2008 +0100 shlwapi/tests: Fix the return codes for Windows 2000 (without IE6 installed). --- dlls/shlwapi/tests/istream.c | 21 ++++++++++++++------- 1 files changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/shlwapi/tests/istream.c b/dlls/shlwapi/tests/istream.c index 527fa24..ef7191c 100644 --- a/dlls/shlwapi/tests/istream.c +++ b/dlls/shlwapi/tests/istream.c @@ -76,35 +76,40 @@ static void test_IStream_invalid_operations(IStream * stream, DWORD mode) ret = stream->lpVtbl->Write(stream, NULL, 0, &count); if (mode == STGM_READ) - ok(ret == STG_E_ACCESSDENIED, "expected STG_E_ACCESSDENIED, got 0x%08x\n", ret); + ok(ret == STG_E_ACCESSDENIED /* XP */ || ret == S_OK /* 2000 */, + "expected STG_E_ACCESSDENIED or S_OK, got 0x%08x\n", ret); else ok(ret == S_OK, "expected S_OK, got 0x%08x\n", ret); strcpy(data, "Hello"); ret = stream->lpVtbl->Write(stream, data, 5, NULL); if (mode == STGM_READ) - ok(ret == STG_E_ACCESSDENIED, "expected STG_E_ACCESSDENIED, got 0x%08x\n", ret); + ok(ret == STG_E_ACCESSDENIED /* XP */ || ret == S_OK /* 2000 */, + "expected STG_E_ACCESSDENIED or S_OK, got 0x%08x\n", ret); else ok(ret == S_OK, "expected S_OK, got 0x%08x\n", ret); strcpy(data, "Hello"); ret = stream->lpVtbl->Write(stream, data, 0, NULL); if (mode == STGM_READ) - ok(ret == STG_E_ACCESSDENIED, "expected STG_E_ACCESSDENIED, got 0x%08x\n", ret); + ok(ret == STG_E_ACCESSDENIED /* XP */ || ret == S_OK /* 2000 */, + "expected STG_E_ACCESSDENIED or S_OK, got 0x%08x\n", ret); else ok(ret == S_OK, "expected S_OK, got 0x%08x\n", ret); strcpy(data, "Hello"); ret = stream->lpVtbl->Write(stream, data, 0, &count); if (mode == STGM_READ) - ok(ret == STG_E_ACCESSDENIED, "expected STG_E_ACCESSDENIED, got 0x%08x\n", ret); + ok(ret == STG_E_ACCESSDENIED /* XP */ || ret == S_OK /* 2000 */, + "expected STG_E_ACCESSDENIED or S_OK, got 0x%08x\n", ret); else ok(ret == S_OK, "expected S_OK, got 0x%08x\n", ret); strcpy(data, "Hello"); ret = stream->lpVtbl->Write(stream, data, 3, &count); if (mode == STGM_READ) - ok(ret == STG_E_ACCESSDENIED, "expected STG_E_ACCESSDENIED, got 0x%08x\n", ret); + ok(ret == STG_E_ACCESSDENIED /* XP */ || ret == S_OK /* 2000 */, + "expected STG_E_ACCESSDENIED or S_OK, got 0x%08x\n", ret); else ok(ret == S_OK, "expected S_OK, got 0x%08x\n", ret); @@ -114,7 +119,8 @@ static void test_IStream_invalid_operations(IStream * stream, DWORD mode) ok(ret == S_OK, "expected S_OK, got 0x%08x\n", ret); ret = IStream_Seek(stream, zero, 20, NULL); - ok(ret == E_INVALIDARG, "expected E_INVALIDARG, got 0x%08x\n", ret); + ok(ret == E_INVALIDARG /* XP */ || ret == S_OK /* 2000 */, + "expected E_INVALIDARG or S_OK, got 0x%08x\n", ret); /* IStream::CopyTo */ @@ -166,7 +172,8 @@ static void test_IStream_invalid_operations(IStream * stream, DWORD mode) /* IStream::Stat */ ret = IStream_Stat(stream, NULL, 0); - ok(ret == STG_E_INVALIDPOINTER, "expected STG_E_INVALIDPOINTER, got 0x%08x\n", ret); + ok(ret == STG_E_INVALIDPOINTER /* XP */ || ret == E_NOTIMPL /* 2000 */, + "expected STG_E_INVALIDPOINTER or E_NOTIMPL, got 0x%08x\n", ret); /* IStream::Clone */

1 0

Jacek Caban : mshtml: Forward IOmNavigator' s IDispatch method to IDispatchEx implementation.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: 835b3eb0e81673d627a999bf57192e72d0d2032e URL: http://source.winehq.org/git/wine.git/?a=commit;h=835b3eb0e81673d627a999bf5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 18 22:33:44 2008 +0200 mshtml: Forward IOmNavigator's IDispatch method to IDispatchEx implementation. --- dlls/mshtml/omnavigator.c | 17 ++++++++--------- 1 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index 7f7e8c0..742df19 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -53,7 +53,7 @@ static HRESULT WINAPI OmNavigator_QueryInterface(IOmNavigator *iface, REFIID rii *ppv = OMNAVIGATOR(This); }else if(IsEqualGUID(&IID_IDispatch, riid)) { TRACE("(%p)->(IID_IDispatch %p)\n", This, ppv); - *ppv = OMNAVIGATOR(This); + *ppv = DISPATCHEX(&This->dispex); }else if(IsEqualGUID(&IID_IDispatchEx, riid)) { TRACE("(%p)->(IID_IDispatchEx %p)\n", This, ppv); *ppv = DISPATCHEX(&This->dispex); @@ -105,8 +105,8 @@ static HRESULT WINAPI OmNavigator_GetTypeInfo(IOmNavigator *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { OmNavigator *This = OMNAVIGATOR_THIS(iface); - FIXME("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); - return E_NOTIMPL; + + return IDispatchEx_GetTypeInfo(DISPATCHEX(&This->dispex), iTInfo, lcid, ppTInfo); } static HRESULT WINAPI OmNavigator_GetIDsOfNames(IOmNavigator *iface, REFIID riid, @@ -114,9 +114,8 @@ static HRESULT WINAPI OmNavigator_GetIDsOfNames(IOmNavigator *iface, REFIID riid LCID lcid, DISPID *rgDispId) { OmNavigator *This = OMNAVIGATOR_THIS(iface); - FIXME("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, - lcid, rgDispId); - return E_NOTIMPL; + + return IDispatchEx_GetIDsOfNames(DISPATCHEX(&This->dispex), riid, rgszNames, cNames, lcid, rgDispId); } static HRESULT WINAPI OmNavigator_Invoke(IOmNavigator *iface, DISPID dispIdMember, @@ -124,9 +123,9 @@ static HRESULT WINAPI OmNavigator_Invoke(IOmNavigator *iface, DISPID dispIdMembe VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { OmNavigator *This = OMNAVIGATOR_THIS(iface); - FIXME("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); - return E_NOTIMPL; + + return IDispatchEx_Invoke(DISPATCHEX(&This->dispex), dispIdMember, riid, lcid, wFlags, pDispParams, + pVarResult, pExcepInfo, puArgErr); } static HRESULT WINAPI OmNavigator_get_appCodeName(IOmNavigator *iface, BSTR *p)

1 0

Jacek Caban : mshtml: Added window IDispatchEx implementation.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: a5843056c5c77c522b803e8a6dcea01e725ec303 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5843056c5c77c522b803e8a6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Apr 19 18:41:25 2008 +0200 mshtml: Added window IDispatchEx implementation. --- dlls/mshtml/dispex.c | 2 + dlls/mshtml/htmlwindow.c | 186 +++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/mshtml_private.h | 4 + 3 files changed, 189 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 5cffe0a..06b495b 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -51,7 +51,9 @@ static struct list dispex_data_list = LIST_INIT(dispex_data_list); static REFIID tid_ids[] = { &IID_NULL, + &DIID_DispHTMLWindow2, &IID_IHTMLWindow2, + &IID_IHTMLWindow3, &IID_IOmNavigator }; diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index e96e860..39d54d6 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -33,10 +33,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); -#define HTMLWINDOW2_THIS(iface) DEFINE_THIS(HTMLWindow, HTMLWindow2, iface) - static struct list window_list = LIST_INIT(window_list); +#define HTMLWINDOW2_THIS(iface) DEFINE_THIS(HTMLWindow, HTMLWindow2, iface) + static HRESULT WINAPI HTMLWindow2_QueryInterface(IHTMLWindow2 *iface, REFIID riid, void **ppv) { HTMLWindow *This = HTMLWINDOW2_THIS(iface); @@ -49,6 +49,9 @@ static HRESULT WINAPI HTMLWindow2_QueryInterface(IHTMLWindow2 *iface, REFIID rii }else if(IsEqualGUID(&IID_IDispatch, riid)) { TRACE("(%p)->(IID_IDispatch %p)\n", This, ppv); *ppv = HTMLWINDOW2(This); + }else if(IsEqualGUID(&IID_IDispatchEx, riid)) { + TRACE("(%p)->(IID_IDispatchEx %p)\n", This, ppv); + *ppv = DISPATCHEX(This); }else if(IsEqualGUID(&IID_IHTMLFramesCollection2, riid)) { TRACE("(%p)->(IID_IHTMLFramesCollection2 %p)\n", This, ppv); *ppv = HTMLWINDOW2(This); @@ -942,6 +945,180 @@ static const IHTMLWindow3Vtbl HTMLWindow3Vtbl = { HTMLWindow3_showModelessDialog }; +#define DISPEX_THIS(iface) DEFINE_THIS(HTMLWindow, IDispatchEx, iface) + +static HRESULT WINAPI WindowDispEx_QueryInterface(IDispatchEx *iface, REFIID riid, void **ppv) +{ + HTMLWindow *This = DISPEX_THIS(iface); + + return IHTMLWindow2_QueryInterface(HTMLWINDOW2(This), riid, ppv); +} + +static ULONG WINAPI WindowDispEx_AddRef(IDispatchEx *iface) +{ + HTMLWindow *This = DISPEX_THIS(iface); + + return IHTMLWindow2_AddRef(HTMLWINDOW2(This)); +} + +static ULONG WINAPI WindowDispEx_Release(IDispatchEx *iface) +{ + HTMLWindow *This = DISPEX_THIS(iface); + + return IHTMLWindow2_AddRef(HTMLWINDOW2(This)); +} + +static HRESULT WINAPI WindowDispEx_GetTypeInfoCount(IDispatchEx *iface, UINT *pctinfo) +{ + HTMLWindow *This = DISPEX_THIS(iface); + + TRACE("(%p)->(%p)\n", This, pctinfo); + + return IDispatchEx_GetTypeInfoCount(DISPATCHEX(&This->dispex), pctinfo); +} + +static HRESULT WINAPI WindowDispEx_GetTypeInfo(IDispatchEx *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + HTMLWindow *This = DISPEX_THIS(iface); + + TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); + + return IDispatchEx_GetTypeInfo(DISPATCHEX(&This->dispex), iTInfo, lcid, ppTInfo); +} + +static HRESULT WINAPI WindowDispEx_GetIDsOfNames(IDispatchEx *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, + LCID lcid, DISPID *rgDispId) +{ + HTMLWindow *This = DISPEX_THIS(iface); + + TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, + lcid, rgDispId); + + /* FIXME: Use script dispatch */ + + return IDispatchEx_GetIDsOfNames(DISPATCHEX(&This->dispex), riid, rgszNames, cNames, lcid, rgDispId); +} + +static HRESULT WINAPI WindowDispEx_Invoke(IDispatchEx *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, + VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + HTMLWindow *This = DISPEX_THIS(iface); + + TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + + /* FIXME: Use script dispatch */ + + return IDispatchEx_Invoke(DISPATCHEX(&This->dispex), dispIdMember, riid, lcid, wFlags, pDispParams, + pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI WindowDispEx_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD grfdex, DISPID *pid) +{ + HTMLWindow *This = DISPEX_THIS(iface); + + TRACE("(%p)->(%s %x %p)\n", This, debugstr_w(bstrName), grfdex, pid); + + return IDispatchEx_GetDispID(DISPATCHEX(&This->dispex), bstrName, grfdex, pid); +} + +static HRESULT WINAPI WindowDispEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, + VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) +{ + HTMLWindow *This = DISPEX_THIS(iface); + + TRACE("(%p)->(%x %x %x %p %p %p %p)\n", This, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller); + + return IDispatchEx_InvokeEx(DISPATCHEX(&This->dispex), id, lcid, wFlags, pdp, pvarRes, pei, pspCaller); +} + +static HRESULT WINAPI WindowDispEx_DeleteMemberByName(IDispatchEx *iface, BSTR bstrName, DWORD grfdex) +{ + HTMLWindow *This = DISPEX_THIS(iface); + + TRACE("(%p)->(%s %x)\n", This, debugstr_w(bstrName), grfdex); + + return IDispatchEx_DeleteMemberByName(DISPATCHEX(&This->dispex), bstrName, grfdex); +} + +static HRESULT WINAPI WindowDispEx_DeleteMemberByDispID(IDispatchEx *iface, DISPID id) +{ + HTMLWindow *This = DISPEX_THIS(iface); + + TRACE("(%p)->(%x)\n", This, id); + + return IDispatchEx_DeleteMemberByDispID(DISPATCHEX(&This->dispex), id); +} + +static HRESULT WINAPI WindowDispEx_GetMemberProperties(IDispatchEx *iface, DISPID id, DWORD grfdexFetch, DWORD *pgrfdex) +{ + HTMLWindow *This = DISPEX_THIS(iface); + + TRACE("(%p)->(%x %x %p)\n", This, id, grfdexFetch, pgrfdex); + + return IDispatchEx_GetMemberProperties(DISPATCHEX(&This->dispex), id, grfdexFetch, pgrfdex); +} + +static HRESULT WINAPI WindowDispEx_GetMemberName(IDispatchEx *iface, DISPID id, BSTR *pbstrName) +{ + HTMLWindow *This = DISPEX_THIS(iface); + + TRACE("(%p)->(%x %p)\n", This, id, pbstrName); + + return IDispatchEx_GetMemberName(DISPATCHEX(&This->dispex), id, pbstrName); +} + +static HRESULT WINAPI WindowDispEx_GetNextDispID(IDispatchEx *iface, DWORD grfdex, DISPID id, DISPID *pid) +{ + HTMLWindow *This = DISPEX_THIS(iface); + + TRACE("(%p)->(%x %x %p)\n", This, grfdex, id, pid); + + return IDispatchEx_GetNextDispID(DISPATCHEX(&This->dispex), grfdex, id, pid); +} + +static HRESULT WINAPI WindowDispEx_GetNameSpaceParent(IDispatchEx *iface, IUnknown **ppunk) +{ + HTMLWindow *This = DISPEX_THIS(iface); + + TRACE("(%p)->(%p)\n", This, ppunk); + + return IDispatchEx_GetNameSpaceParent(DISPATCHEX(&This->dispex), ppunk); +} + +#undef DISPEX_THIS + +static const IDispatchExVtbl WindowDispExVtbl = { + WindowDispEx_QueryInterface, + WindowDispEx_AddRef, + WindowDispEx_Release, + WindowDispEx_GetTypeInfoCount, + WindowDispEx_GetTypeInfo, + WindowDispEx_GetIDsOfNames, + WindowDispEx_Invoke, + WindowDispEx_GetDispID, + WindowDispEx_InvokeEx, + WindowDispEx_DeleteMemberByName, + WindowDispEx_DeleteMemberByDispID, + WindowDispEx_GetMemberProperties, + WindowDispEx_GetMemberName, + WindowDispEx_GetNextDispID, + WindowDispEx_GetNameSpaceParent +}; + +static dispex_static_data_t HTMLWindow_dispex = { + DispHTMLWindow2_tid, + NULL, + { + IHTMLWindow2_tid, + IHTMLWindow3_tid, + 0 + } +}; + static const char wineConfig_func[] = "window.__defineGetter__(\"external\",function() {\n" " return window.__wineWindow__.external;\n" @@ -1046,13 +1223,16 @@ void setup_nswindow(HTMLWindow *This) HTMLWindow *HTMLWindow_Create(HTMLDocument *doc) { - HTMLWindow *ret = heap_alloc_zero(sizeof(HTMLWindow)); + HTMLWindow *ret = heap_alloc(sizeof(HTMLWindow)); ret->lpHTMLWindow2Vtbl = &HTMLWindow2Vtbl; ret->lpHTMLWindow3Vtbl = &HTMLWindow3Vtbl; + ret->lpIDispatchExVtbl = &WindowDispExVtbl; ret->ref = 1; ret->doc = doc; + init_dispex(&ret->dispex, (IUnknown*)HTMLWINDOW2(ret), &HTMLWindow_dispex); + if(doc->nscontainer) { nsresult nsres; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index e0f28c7..8bca848 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -61,7 +61,9 @@ typedef struct event_target_t event_target_t; /* NOTE: make sure to keep in sync with dispex.c */ typedef enum { NULL_tid, + DispHTMLWindow2_tid, IHTMLWindow2_tid, + IHTMLWindow3_tid, IOmNavigator_tid, LAST_tid } tid_t; @@ -85,8 +87,10 @@ typedef struct { void init_dispex(DispatchEx*,IUnknown*,dispex_static_data_t*); typedef struct { + DispatchEx dispex; const IHTMLWindow2Vtbl *lpHTMLWindow2Vtbl; const IHTMLWindow3Vtbl *lpHTMLWindow3Vtbl; + const IDispatchExVtbl *lpIDispatchExVtbl; LONG ref;

1 0

Jacek Caban : mshtml: Added IDispatchEx::GetIDsOfNames implementation.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: a0e0bf6b15c207ae7c1fc93497ec036e33e7a55b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0e0bf6b15c207ae7c1fc9349… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 18 22:00:22 2008 +0200 mshtml: Added IDispatchEx::GetIDsOfNames implementation. --- dlls/mshtml/dispex.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 20b74f7..5cffe0a 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -315,9 +315,19 @@ static HRESULT WINAPI DispatchEx_GetIDsOfNames(IDispatchEx *iface, REFIID riid, LCID lcid, DISPID *rgDispId) { DispatchEx *This = DISPATCHEX_THIS(iface); - FIXME("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, + UINT i; + HRESULT hres; + + TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); - return E_NOTIMPL; + + for(i=0; i < cNames; i++) { + hres = IDispatchEx_GetDispID(DISPATCHEX(This), rgszNames[i], 0, rgDispId+i); + if(FAILED(hres)) + return hres; + } + + return S_OK; } static HRESULT WINAPI DispatchEx_Invoke(IDispatchEx *iface, DISPID dispIdMember,

1 0

Jacek Caban : mshtml: Added IDispatchEx::Invoke implementation.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: 5c6ea438a00e6ad86926a5062f808517884758da URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c6ea438a00e6ad86926a5062… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 18 22:00:00 2008 +0200 mshtml: Added IDispatchEx::Invoke implementation. --- dlls/mshtml/dispex.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 47a0443..20b74f7 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -325,9 +325,12 @@ static HRESULT WINAPI DispatchEx_Invoke(IDispatchEx *iface, DISPID dispIdMember, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { DispatchEx *This = DISPATCHEX_THIS(iface); - FIXME("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), + + TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); - return E_NOTIMPL; + + return IDispatchEx_InvokeEx(DISPATCHEX(This), dispIdMember, lcid, wFlags, + pDispParams, pVarResult, pExcepInfo, NULL); } static HRESULT WINAPI DispatchEx_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD grfdex, DISPID *pid)

1 0

Jacek Caban : mshtml: Parse and store onload attributes.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: 4c21a5d3b0a4bba4029d0debc0d3b894626f5bd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c21a5d3b0a4bba4029d0debc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 18 20:16:35 2008 +0200 mshtml: Parse and store onload attributes. --- dlls/mshtml/Makefile.in | 1 + dlls/mshtml/htmlevent.c | 101 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/htmlnode.c | 3 + dlls/mshtml/mshtml_private.h | 6 +++ dlls/mshtml/nsevents.c | 14 +++++- dlls/mshtml/script.c | 72 +++++++++++++++++++++++++----- 6 files changed, 183 insertions(+), 14 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4c21a5d3b0a4bba4029d0…

1 0

Jacek Caban : mshtml: Added load event support.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: 12f312daccf5201e4b26d2d76ab4a87411821c15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12f312daccf5201e4b26d2d76… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 21 00:48:18 2008 +0200 mshtml: Added load event support. --- dlls/mshtml/dispex.c | 29 ++++ dlls/mshtml/htmlevent.c | 339 +++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/htmlwindow.c | 3 +- dlls/mshtml/mshtml_private.h | 9 + dlls/mshtml/nsevents.c | 16 ++ 5 files changed, 389 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=12f312daccf5201e4b26d…

1 0

Jacek Caban : mshtml: Added IDispEx::GetDispID implementation.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: b81818e7ee209e49241f6d696cac6952a1ed89c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b81818e7ee209e49241f6d696… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Apr 19 12:55:24 2008 +0200 mshtml: Added IDispEx::GetDispID implementation. --- dlls/mshtml/dispex.c | 200 ++++++++++++++++++++++++++++++++++++++++-- dlls/mshtml/mshtml_private.h | 14 +++- dlls/mshtml/omnavigator.c | 11 ++- 3 files changed, 217 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 7dc0063..647b4d8 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -31,11 +31,28 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); +typedef struct { + DISPID id; + BSTR name; + tid_t tid; +} func_info_t; + +struct dispex_data_t { + DWORD func_cnt; + func_info_t *funcs; + func_info_t **name_table; + + struct list entry; +}; + static ITypeLib *typelib; static ITypeInfo *typeinfos[LAST_tid]; +static struct list dispex_data_list = LIST_INIT(dispex_data_list); static REFIID tid_ids[] = { + &IID_NULL, &IID_IHTMLWindow2, + &IID_IOmNavigator }; HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo) @@ -60,7 +77,7 @@ HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo) hres = ITypeLib_GetTypeInfoOfGuid(typelib, tid_ids[tid], &typeinfo); if(FAILED(hres)) { - ERR("GetTypeInfoOfGuid failed: %08x\n", hres); + ERR("GetTypeInfoOfGuid(%s) failed: %08x\n", debugstr_guid(tid_ids[tid]), hres); return hres; } @@ -74,8 +91,21 @@ HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo) void release_typelib(void) { + dispex_data_t *iter; unsigned i; + while(!list_empty(&dispex_data_list)) { + iter = LIST_ENTRY(list_head(&dispex_data_list), dispex_data_t, entry); + list_remove(&iter->entry); + + for(i=0; i < iter->func_cnt; i++) + SysFreeString(iter->funcs[i].name); + + heap_free(iter->funcs); + heap_free(iter->name_table); + heap_free(iter); + } + if(!typelib) return; @@ -86,6 +116,122 @@ void release_typelib(void) ITypeLib_Release(typelib); } +static void add_func_info(dispex_data_t *data, DWORD *size, tid_t tid, DISPID id, ITypeInfo *dti) +{ + HRESULT hres; + + if(data->func_cnt && data->funcs[data->func_cnt-1].id == id) + return; + + if(data->func_cnt == *size) + data->funcs = heap_realloc(data->funcs, (*size <<= 1)*sizeof(func_info_t)); + + hres = ITypeInfo_GetDocumentation(dti, id, &data->funcs[data->func_cnt].name, NULL, NULL, NULL); + if(FAILED(hres)) + return; + + data->funcs[data->func_cnt].id = id; + data->funcs[data->func_cnt].tid = tid; + + data->func_cnt++; +} + +static int dispid_cmp(const void *p1, const void *p2) +{ + return ((func_info_t*)p1)->id - ((func_info_t*)p2)->id; +} + +static int func_name_cmp(const void *p1, const void *p2) +{ + return strcmpiW((*(func_info_t**)p1)->name, (*(func_info_t**)p2)->name); +} + +static dispex_data_t *preprocess_dispex_data(DispatchEx *This) +{ + const tid_t *tid = This->data->iface_tids; + FUNCDESC *funcdesc; + dispex_data_t *data; + DWORD size = 16, i; + ITypeInfo *ti, *dti; + HRESULT hres; + + TRACE("(%p)\n", This); + + hres = get_typeinfo(This->data->disp_tid, &dti); + if(FAILED(hres)) { + ERR("Could not get disp type info: %08x\n", hres); + return NULL; + } + + data = heap_alloc(sizeof(dispex_data_t)); + data->func_cnt = 0; + data->funcs = heap_alloc(size*sizeof(func_info_t)); + list_add_tail(&dispex_data_list, &data->entry); + + while(*tid) { + hres = get_typeinfo(*tid, &ti); + if(FAILED(hres)) + break; + + i=7; + while(1) { + hres = ITypeInfo_GetFuncDesc(ti, i++, &funcdesc); + if(FAILED(hres)) + break; + + add_func_info(data, &size, *tid, funcdesc->memid, dti); + ITypeInfo_ReleaseFuncDesc(ti, funcdesc); + } + + tid++; + } + + if(!data->func_cnt) { + heap_free(data->funcs); + data->funcs = NULL; + }else if(data->func_cnt != size) { + data->funcs = heap_realloc(data->funcs, data->func_cnt * sizeof(func_info_t)); + } + + qsort(data->funcs, data->func_cnt, sizeof(func_info_t), dispid_cmp); + + if(data->funcs) { + data->name_table = heap_alloc(data->func_cnt * sizeof(func_info_t*)); + for(i=0; i < data->func_cnt; i++) + data->name_table[i] = data->funcs+i; + qsort(data->name_table, data->func_cnt, sizeof(func_info_t*), func_name_cmp); + }else { + data->name_table = NULL; + } + + return data; +} + +static CRITICAL_SECTION cs_dispex_static_data; +static CRITICAL_SECTION_DEBUG cs_dispex_static_data_dbg = +{ + 0, 0, &cs_dispex_static_data, + { &cs_dispex_static_data_dbg.ProcessLocksList, &cs_dispex_static_data_dbg.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": dispex_static_data") } +}; +static CRITICAL_SECTION cs_dispex_static_data = { &cs_dispex_static_data_dbg, -1, 0, 0, 0, 0 }; + + +static dispex_data_t *get_dispex_data(DispatchEx *This) +{ + if(This->data->data) + return This->data->data; + + EnterCriticalSection(&cs_dispex_static_data); + + if(!This->data->data) + This->data->data = preprocess_dispex_data(This); + + LeaveCriticalSection(&cs_dispex_static_data); + + return This->data->data; +} + void call_disp_func(HTMLDocument *doc, IDispatch *disp) { DISPID named_arg = DISPID_THIS; @@ -152,8 +298,16 @@ static HRESULT WINAPI DispatchEx_GetTypeInfo(IDispatchEx *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { DispatchEx *This = DISPATCHEX_THIS(iface); - FIXME("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); - return E_NOTIMPL; + HRESULT hres; + + TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); + + hres = get_typeinfo(This->data->disp_tid, ppTInfo); + if(FAILED(hres)) + return hres; + + ITypeInfo_AddRef(*ppTInfo); + return S_OK; } static HRESULT WINAPI DispatchEx_GetIDsOfNames(IDispatchEx *iface, REFIID riid, @@ -179,8 +333,41 @@ static HRESULT WINAPI DispatchEx_Invoke(IDispatchEx *iface, DISPID dispIdMember, static HRESULT WINAPI DispatchEx_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD grfdex, DISPID *pid) { DispatchEx *This = DISPATCHEX_THIS(iface); - FIXME("(%p)->(%s %x %p)\n", This, debugstr_w(bstrName), grfdex, pid); - return E_NOTIMPL; + dispex_data_t *data; + int min, max, n, c; + + TRACE("(%p)->(%s %x %p)\n", This, debugstr_w(bstrName), grfdex, pid); + + if(grfdex & (~fdexNameCaseSensitive)) + FIXME("Unsupported grfdex %x\n", grfdex); + + data = get_dispex_data(This); + if(!data) + return E_FAIL; + + min = 0; + max = data->func_cnt-1; + + while(min <= max) { + n = (min+max)/2; + + c = strcmpiW(data->name_table[n]->name, bstrName); + if(!c) { + if((grfdex & fdexNameCaseSensitive) && strcmpW(data->name_table[n]->name, bstrName)) + break; + + *pid = data->name_table[n]->id; + return S_OK; + } + + if(c > 0) + max = n-1; + else + min = n+1; + } + + TRACE("not found %s\n", debugstr_w(bstrName)); + return DISP_E_UNKNOWNNAME; } static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, @@ -253,8 +440,9 @@ static IDispatchExVtbl DispatchExVtbl = { DispatchEx_GetNameSpaceParent }; -void init_dispex(DispatchEx *dispex, IUnknown *outer) +void init_dispex(DispatchEx *dispex, IUnknown *outer, dispex_static_data_t *data) { dispex->lpIDispatchExVtbl = &DispatchExVtbl; dispex->outer = outer; + dispex->data = data; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 48f3b1b..e0f28c7 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -60,17 +60,29 @@ typedef struct event_target_t event_target_t; /* NOTE: make sure to keep in sync with dispex.c */ typedef enum { + NULL_tid, IHTMLWindow2_tid, + IOmNavigator_tid, LAST_tid } tid_t; +typedef struct dispex_data_t dispex_data_t; + +typedef struct { + const tid_t disp_tid; + dispex_data_t *data; + const tid_t iface_tids[]; +} dispex_static_data_t; + typedef struct { const IDispatchExVtbl *lpIDispatchExVtbl; IUnknown *outer; + + dispex_static_data_t *data; } DispatchEx; -void init_dispex(DispatchEx*,IUnknown*); +void init_dispex(DispatchEx*,IUnknown*,dispex_static_data_t*); typedef struct { const IHTMLWindow2Vtbl *lpHTMLWindow2Vtbl; diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index 1a1e7e8..7f7e8c0 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -301,6 +301,15 @@ static const IOmNavigatorVtbl OmNavigatorVtbl = { OmNavigator_get_userProfile }; +static dispex_static_data_t OmNavigator_dispex = { + IOmNavigator_tid, + NULL, + { + IOmNavigator_tid, + 0 + } +}; + IOmNavigator *OmNavigator_Create(void) { OmNavigator *ret; @@ -309,7 +318,7 @@ IOmNavigator *OmNavigator_Create(void) ret->lpIOmNavigatorVtbl = &OmNavigatorVtbl; ret->ref = 1; - init_dispex(&ret->dispex, (IUnknown*)OMNAVIGATOR(ret)); + init_dispex(&ret->dispex, (IUnknown*)OMNAVIGATOR(ret), &OmNavigator_dispex); return OMNAVIGATOR(ret); }

1 0