December 2009 - Wine-commits

Jacek Caban : mshtml: Don't change nsIWineURI in OnStartBinding if it' s already marked as document URI.
by Alexandre Julliard 01 Dec '09

01 Dec '09

Module: wine Branch: master Commit: ec13e51087b66a29683ff3ae387046458dd57538 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec13e51087b66a29683ff3ae3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 30 18:01:09 2009 +0100 mshtml: Don't change nsIWineURI in OnStartBinding if it's already marked as document URI. --- dlls/mshtml/nsembed.c | 41 +++++++++++++++++++++++------------------ 1 files changed, 23 insertions(+), 18 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 2150a0f..a33f88d 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -1149,6 +1149,7 @@ static nsresult NSAPI nsURIContentListener_OnStartURIOpen(nsIURIContentListener nsIWineURI *wine_uri; nsACString spec_str; const char *spec; + BOOL is_doc_uri; nsresult nsres; nsACString_Init(&spec_str, NULL); @@ -1165,30 +1166,34 @@ static nsresult NSAPI nsURIContentListener_OnStartURIOpen(nsIURIContentListener return NS_ERROR_NOT_IMPLEMENTED; } - nsIWineURI_SetNSContainer(wine_uri, This); - nsIWineURI_SetIsDocumentURI(wine_uri, TRUE); + nsIWineURI_GetIsDocumentURI(wine_uri, &is_doc_uri); - if(This->bscallback) { - IMoniker *mon = get_channelbsc_mon(This->bscallback); + if(!is_doc_uri) { + nsIWineURI_SetNSContainer(wine_uri, This); + nsIWineURI_SetIsDocumentURI(wine_uri, TRUE); - if(mon) { - LPWSTR wine_url; - HRESULT hres; + if(This->bscallback) { + IMoniker *mon = get_channelbsc_mon(This->bscallback); - hres = IMoniker_GetDisplayName(mon, NULL, 0, &wine_url); - if(SUCCEEDED(hres)) { - nsIWineURI_SetWineURL(wine_uri, wine_url); - CoTaskMemFree(wine_url); - }else { - WARN("GetDisplayName failed: %08x\n", hres); + if(mon) { + LPWSTR wine_url; + HRESULT hres; + + hres = IMoniker_GetDisplayName(mon, NULL, 0, &wine_url); + if(SUCCEEDED(hres)) { + nsIWineURI_SetWineURL(wine_uri, wine_url); + CoTaskMemFree(wine_url); + }else { + WARN("GetDisplayName failed: %08x\n", hres); + } + + IMoniker_Release(mon); } - IMoniker_Release(mon); + *_retval = FALSE; + }else if(This->doc) { + *_retval = translate_url(This->doc->basedoc.doc_obj, wine_uri); } - - *_retval = FALSE; - }else if(This->doc) { - *_retval = translate_url(This->doc->basedoc.doc_obj, wine_uri); } nsIWineURI_Release(wine_uri);

1 0

Jacek Caban : mshtml: Added IHTMLWindow2::get_screen implementation.
by Alexandre Julliard 01 Dec '09

01 Dec '09

Module: wine Branch: master Commit: 06884fb1810ceb8d6c34439522f0edc9ef19238f URL: http://source.winehq.org/git/wine.git/?a=commit;h=06884fb1810ceb8d6c3443952… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 30 17:56:01 2009 +0100 mshtml: Added IHTMLWindow2::get_screen implementation. --- dlls/mshtml/Makefile.in | 1 + dlls/mshtml/htmlscreen.c | 230 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/htmlwindow.c | 16 +++- dlls/mshtml/mshtml_private.h | 6 +- dlls/mshtml/tests/dom.c | 21 ++++ 5 files changed, 270 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=06884fb1810ceb8d6c344…

1 0

Jacek Caban : mshtml.idl: Added DispHTMLScreen declaration and use it in HTMLScreen object.
by Alexandre Julliard 01 Dec '09

01 Dec '09

Module: wine Branch: master Commit: 1ddc01c09b0aba60c21a7fa5c55fc0fd8cea5912 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ddc01c09b0aba60c21a7fa5c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 30 17:56:53 2009 +0100 mshtml.idl: Added DispHTMLScreen declaration and use it in HTMLScreen object. --- dlls/mshtml/dispex.c | 2 + dlls/mshtml/htmlscreen.c | 23 ++++++++++++-- dlls/mshtml/mshtml_private.h | 2 + dlls/mshtml/tests/dom.c | 2 + include/mshtmdid.h | 10 ++++++ include/mshtml.idl | 63 ++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 98 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index f93fc8c..f26f897 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -97,6 +97,7 @@ static REFIID tid_ids[] = { &DIID_DispHTMLLocation, &DIID_DispHTMLNavigator, &DIID_DispHTMLOptionElement, + &DIID_DispHTMLScreen, &DIID_DispHTMLSelectElement, &DIID_DispHTMLStyle, &DIID_DispHTMLTable, @@ -134,6 +135,7 @@ static REFIID tid_ids[] = { &IID_IHTMLInputElement, &IID_IHTMLLocation, &IID_IHTMLOptionElement, + &IID_IHTMLScreen, &IID_IHTMLSelectElement, &IID_IHTMLStyle, &IID_IHTMLStyle2, diff --git a/dlls/mshtml/htmlscreen.c b/dlls/mshtml/htmlscreen.c index 0ac9801..b504b20 100644 --- a/dlls/mshtml/htmlscreen.c +++ b/dlls/mshtml/htmlscreen.c @@ -32,6 +32,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); typedef struct { + DispatchEx dispex; const IHTMLScreenVtbl *lpIHTMLScreenVtbl; LONG ref; @@ -50,12 +51,11 @@ static HRESULT WINAPI HTMLScreen_QueryInterface(IHTMLScreen *iface, REFIID riid, if(IsEqualGUID(&IID_IUnknown, riid)) { TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); *ppv = HTMLSCREEN(This); - }else if(IsEqualGUID(&IID_IDispatch, riid)) { - TRACE("(%p)->(IID_IDispatch %p)\n", This, ppv); - *ppv = HTMLSCREEN(This); }else if(IsEqualGUID(&IID_IHTMLScreen, riid)) { TRACE("(%p)->(IID_IHTMLScreen %p)\n", This, ppv); *ppv = HTMLSCREEN(This); + }else if(dispex_query_interface(&This->dispex, riid, ppv)) { + return *ppv ? S_OK : E_NOINTERFACE; } if(*ppv) { @@ -84,8 +84,10 @@ static ULONG WINAPI HTMLScreen_Release(IHTMLScreen *iface) TRACE("(%p) ref=%d\n", This, ref); - if(!ref) + if(!ref) { + release_dispex(&This->dispex); heap_free(This); + } return ref; } @@ -214,6 +216,17 @@ static const IHTMLScreenVtbl HTMLSreenVtbl = { HTMLScreen_get_fontSmoothingEnabled }; +static const tid_t HTMLScreen_iface_tids[] = { + IHTMLScreen_tid, + 0 +}; +static dispex_static_data_t HTMLScreen_dispex = { + NULL, + DispHTMLScreen_tid, + NULL, + HTMLScreen_iface_tids +}; + HRESULT HTMLScreen_Create(IHTMLScreen **ret) { HTMLScreen *screen; @@ -225,6 +238,8 @@ HRESULT HTMLScreen_Create(IHTMLScreen **ret) screen->lpIHTMLScreenVtbl = &HTMLSreenVtbl; screen->ref = 1; + init_dispex(&screen->dispex, (IUnknown*)HTMLSCREEN(screen), &HTMLScreen_dispex); + *ret = HTMLSCREEN(screen); return S_OK; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 8ccc402..33f9c96 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -74,6 +74,7 @@ typedef enum { DispHTMLLocation_tid, DispHTMLNavigator_tid, DispHTMLOptionElement_tid, + DispHTMLScreen_tid, DispHTMLSelectElement_tid, DispHTMLStyle_tid, DispHTMLTable_tid, @@ -111,6 +112,7 @@ typedef enum { IHTMLInputElement_tid, IHTMLLocation_tid, IHTMLOptionElement_tid, + IHTMLScreen_tid, IHTMLSelectElement_tid, IHTMLStyle_tid, IHTMLStyle2_tid, diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 86e74c3..bc012f5 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -3049,6 +3049,8 @@ static void test_screen(IHTMLWindow2 *window) ok(iface_cmp((IUnknown*)screen2, (IUnknown*)screen), "screen2 != screen\n"); IHTMLScreen_Release(screen2); + test_disp((IUnknown*)screen, &DIID_DispHTMLScreen, "[object]"); + IHTMLScreen_Release(screen); } diff --git a/include/mshtmdid.h b/include/mshtmdid.h index 59b04a4..36bc870 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -1781,6 +1781,16 @@ #define DISPID_IHTMLSCREEN_AVAILWIDTH (DISPID_SCREEN+7) #define DISPID_IHTMLSCREEN_FONTSMOOTHINGENABLED (DISPID_SCREEN+8) +/* IHTMLScreen2 */ +#define DISPID_IHTMLSCREEN2_LOGICALXDPI DISPID_SCREEN+9 +#define DISPID_IHTMLSCREEN2_LOGICALYDPI DISPID_SCREEN+10 +#define DISPID_IHTMLSCREEN2_DEVICEXDPI DISPID_SCREEN+11 +#define DISPID_IHTMLSCREEN2_DEVICEYDPI DISPID_SCREEN+12 + +/* IHTMLScreen3 */ +#define DISPID_IHTMLSCREEN3_SYSTEMXDPI DISPID_SCREEN+13 +#define DISPID_IHTMLSCREEN3_SYSTEMYDPI DISPID_SCREEN+14 + /* IHTMLOptionElementFactory */ #define DISPID_IHTMLOPTIONELEMENTFACTORY_CREATE DISPID_VALUE diff --git a/include/mshtml.idl b/include/mshtml.idl index f004e74..68f6478 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -9759,6 +9759,69 @@ interface IHTMLWindow5 : IDispatch }; /***************************************************************************** + * DispHTMLScreen dispinterface + */ +[ + hidden, + uuid(3050f591-98b5-11cf-bb82-00aa00bdce0b) +] +dispinterface DispHTMLScreen +{ +properties: +methods: + [propget, id(DISPID_IHTMLSCREEN_COLORDEPTH)] + long colorDepth(); + + [propput, id(DISPID_IHTMLSCREEN_BUFFERDEPTH)] + void bufferDepth(long v); + + [propget, id(DISPID_IHTMLSCREEN_BUFFERDEPTH)] + long bufferDepth(); + + [propget, id(DISPID_IHTMLSCREEN_WIDTH)] + long width(); + + [propget, id(DISPID_IHTMLSCREEN_HEIGHT)] + long height(); + + [propput, id(DISPID_IHTMLSCREEN_UPDATEINTERVAL)] + void updateInterval(long v); + + [propget, id(DISPID_IHTMLSCREEN_UPDATEINTERVAL)] + long updateInterval(); + + [propget, id(DISPID_IHTMLSCREEN_AVAILHEIGHT)] + long availHeight(); + + [propget, id(DISPID_IHTMLSCREEN_AVAILWIDTH)] + long availWidth(); + + [propget, id(DISPID_IHTMLSCREEN_FONTSMOOTHINGENABLED)] + VARIANT_BOOL fontSmoothingEnabled(); + + [propget, id(DISPID_IHTMLSCREEN2_LOGICALXDPI)] + long logicalXDPI(); + + [propget, id(DISPID_IHTMLSCREEN2_LOGICALYDPI)] + long logicalYDPI(); + + [propget, id(DISPID_IHTMLSCREEN2_DEVICEXDPI)] + long deviceXDPI(); + + [propget, id(DISPID_IHTMLSCREEN2_DEVICEYDPI)] + long deviceYDPI(); + + [propget, id(DISPID_IHTMLSCREEN3_SYSTEMXDPI)] + long systemXDPI(); + + [propget, id(DISPID_IHTMLSCREEN3_SYSTEMYDPI)] + long systemYDPI(); + + [propget, id(DISPID_IHTMLDOMCONSTRUCTOR_CONSTRUCTOR), hidden] + IDispatch *constructor(); +} + +/***************************************************************************** * DispHTMLWindow2 dispinterface */ [

1 0