September 2007 - Wine-commits

Jacek Caban : shdocvw: Don't use BSTR in navigate_url prototype.
by Alexandre Julliard 10 Sep '07

10 Sep '07

Module: wine Branch: master Commit: c6f8b270134b542b022ffcab8b4f80a12a6d4bc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6f8b270134b542b022ffcab8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 9 20:12:39 2007 +0200 shdocvw: Don't use BSTR in navigate_url prototype. --- dlls/shdocvw/navigate.c | 2 +- dlls/shdocvw/shdocvw.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shdocvw/navigate.c b/dlls/shdocvw/navigate.c index fb71682..7249a85 100644 --- a/dlls/shdocvw/navigate.c +++ b/dlls/shdocvw/navigate.c @@ -514,7 +514,7 @@ static HRESULT bind_url_to_object(DocHost *This, LPCWSTR url, PBYTE post_data, U return hres; } -HRESULT navigate_url(DocHost *This, BSTR url, const VARIANT *Flags, +HRESULT navigate_url(DocHost *This, LPCWSTR url, const VARIANT *Flags, const VARIANT *TargetFrameName, VARIANT *PostData, VARIANT *Headers) { PBYTE post_data = NULL; diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index d421025..c499a1d 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -194,7 +194,7 @@ HRESULT WebBrowserV2_Create(IUnknown*,REFIID,void**); void create_doc_view_hwnd(DocHost*); void deactivate_document(DocHost*); void call_sink(ConnectionPoint*,DISPID,DISPPARAMS*); -HRESULT navigate_url(DocHost*,BSTR,const VARIANT*,const VARIANT*,VARIANT*,VARIANT*); +HRESULT navigate_url(DocHost*,LPCWSTR,const VARIANT*,const VARIANT*,VARIANT*,VARIANT*); HRESULT InternetExplorer_Create(IUnknown*,REFIID,void**); void InternetExplorer_WebBrowser_Init(InternetExplorer*);

1 0

Jacek Caban : shdocvw: Added better GoHome stub implementation.
by Alexandre Julliard 10 Sep '07

10 Sep '07

Module: wine Branch: master Commit: 72060f04fe4b07adac00ce116a4b3f246c855c67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72060f04fe4b07adac00ce116… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 9 20:13:31 2007 +0200 shdocvw: Added better GoHome stub implementation. --- dlls/shdocvw/ie.c | 4 ++-- dlls/shdocvw/navigate.c | 9 +++++++++ dlls/shdocvw/shdocvw.h | 1 + dlls/shdocvw/webbrowser.c | 4 ++-- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/shdocvw/ie.c b/dlls/shdocvw/ie.c index 4091323..7627691 100644 --- a/dlls/shdocvw/ie.c +++ b/dlls/shdocvw/ie.c @@ -134,8 +134,8 @@ static HRESULT WINAPI InternetExplorer_GoForward(IWebBrowser2 *iface) static HRESULT WINAPI InternetExplorer_GoHome(IWebBrowser2 *iface) { InternetExplorer *This = WEBBROWSER_THIS(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + TRACE("(%p)\n", This); + return go_home(&This->doc_host); } static HRESULT WINAPI InternetExplorer_GoSearch(IWebBrowser2 *iface) diff --git a/dlls/shdocvw/navigate.c b/dlls/shdocvw/navigate.c index 7249a85..ae6104b 100644 --- a/dlls/shdocvw/navigate.c +++ b/dlls/shdocvw/navigate.c @@ -610,6 +610,15 @@ static HRESULT navigate_hlink(DocHost *This, IMoniker *mon, IBindCtx *bindctx, return navigate(This, mon, bindctx); } +HRESULT go_home(DocHost *This) +{ + static const WCHAR wszAboutBlank[] = {'a','b','o','u','t',':','b','l','a','n','k',0}; + + FIXME("stub\n"); + + return navigate_url(This, wszAboutBlank, NULL, NULL, NULL, NULL); +} + #define HLINKFRAME_THIS(iface) DEFINE_THIS(WebBrowser, HlinkFrame, iface) static HRESULT WINAPI HlinkFrame_QueryInterface(IHlinkFrame *iface, REFIID riid, void **ppv) diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index c499a1d..0e2a739 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -195,6 +195,7 @@ void create_doc_view_hwnd(DocHost*); void deactivate_document(DocHost*); void call_sink(ConnectionPoint*,DISPID,DISPPARAMS*); HRESULT navigate_url(DocHost*,LPCWSTR,const VARIANT*,const VARIANT*,VARIANT*,VARIANT*); +HRESULT go_home(DocHost*); HRESULT InternetExplorer_Create(IUnknown*,REFIID,void**); void InternetExplorer_WebBrowser_Init(InternetExplorer*); diff --git a/dlls/shdocvw/webbrowser.c b/dlls/shdocvw/webbrowser.c index f62df9c..ff7f699 100644 --- a/dlls/shdocvw/webbrowser.c +++ b/dlls/shdocvw/webbrowser.c @@ -210,8 +210,8 @@ static HRESULT WINAPI WebBrowser_GoForward(IWebBrowser2 *iface) static HRESULT WINAPI WebBrowser_GoHome(IWebBrowser2 *iface) { WebBrowser *This = WEBBROWSER_THIS(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + TRACE("(%p)\n", This); + return go_home(&This->doc_host); } static HRESULT WINAPI WebBrowser_GoSearch(IWebBrowser2 *iface)

1 0

Jacek Caban : mshtml: Added IHTMLTxtRange::parentElement implementation.
by Alexandre Julliard 10 Sep '07

10 Sep '07

Module: wine Branch: master Commit: 6e905fd62da49941e1045a0660f7b6415bf93091 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e905fd62da49941e1045a066… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 9 20:17:54 2007 +0200 mshtml: Added IHTMLTxtRange::parentElement implementation. --- dlls/mshtml/txtrange.c | 37 +++++++++++++++++++++++++++++++++++-- 1 files changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/txtrange.c b/dlls/mshtml/txtrange.c index 37a836d..f684df7 100644 --- a/dlls/mshtml/txtrange.c +++ b/dlls/mshtml/txtrange.c @@ -77,6 +77,16 @@ static int string_to_nscmptype(LPCWSTR str) return -1; } +static PRUint16 get_node_type(nsIDOMNode *node) +{ + PRUint16 type = 0xfff; + + if(node) + nsIDOMNode_GetNodeType(node, &type); + + return type; +} + #define HTMLTXTRANGE_THIS(iface) DEFINE_THIS(HTMLTxtRange, HTMLTxtRange, iface) static HRESULT WINAPI HTMLTxtRange_QueryInterface(IHTMLTxtRange *iface, REFIID riid, void **ppv) @@ -280,8 +290,31 @@ static HRESULT WINAPI HTMLTxtRange_get_text(IHTMLTxtRange *iface, BSTR *p) static HRESULT WINAPI HTMLTxtRange_parentElement(IHTMLTxtRange *iface, IHTMLElement **parent) { HTMLTxtRange *This = HTMLTXTRANGE_THIS(iface); - FIXME("(%p)->(%p)\n", This, parent); - return E_NOTIMPL; + nsIDOMNode *nsnode, *tmp; + HTMLDOMNode *node; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, parent); + + nsIDOMRange_GetCommonAncestorContainer(This->nsrange, &nsnode); + while(nsnode && get_node_type(nsnode) != ELEMENT_NODE) { + nsIDOMNode_GetParentNode(nsnode, &tmp); + nsIDOMNode_Release(nsnode); + nsnode = tmp; + } + + if(!nsnode) { + *parent = NULL; + return S_OK; + } + + node = get_node(This->doc, nsnode); + nsIDOMNode_Release(nsnode); + + hres = IHTMLDOMNode_QueryInterface(HTMLDOMNODE(node), &IID_IHTMLElement, (void**)parent); + + IHTMLDOMNode_Release(HTMLDOMNODE(node)); + return hres; } static HRESULT WINAPI HTMLTxtRange_duplicate(IHTMLTxtRange *iface, IHTMLTxtRange **Duplicate)

1 0

Jacek Caban : mshtml: Added IHTMLTxtRange::inRange implementation.
by Alexandre Julliard 10 Sep '07

10 Sep '07

Module: wine Branch: master Commit: 4930b51bb8b891a1fa36abbbc4f3c3b826000cdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=4930b51bb8b891a1fa36abbbc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 9 20:18:14 2007 +0200 mshtml: Added IHTMLTxtRange::inRange implementation. --- dlls/mshtml/txtrange.c | 27 +++++++++++++++++++++++++-- 1 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/txtrange.c b/dlls/mshtml/txtrange.c index f684df7..c29b3c9 100644 --- a/dlls/mshtml/txtrange.c +++ b/dlls/mshtml/txtrange.c @@ -335,8 +335,31 @@ static HRESULT WINAPI HTMLTxtRange_inRange(IHTMLTxtRange *iface, IHTMLTxtRange * VARIANT_BOOL *InRange) { HTMLTxtRange *This = HTMLTXTRANGE_THIS(iface); - FIXME("(%p)->(%p %p)\n", This, Range, InRange); - return E_NOTIMPL; + HTMLTxtRange *src_range; + PRInt16 nsret = 0; + nsresult nsres; + + TRACE("(%p)->(%p %p)\n", This, Range, InRange); + + *InRange = VARIANT_FALSE; + + src_range = get_range_object(This->doc, Range); + if(!src_range) + return E_FAIL; + + nsres = nsIDOMRange_CompareBoundaryPoints(This->nsrange, NS_START_TO_START, + src_range->nsrange, &nsret); + if(NS_SUCCEEDED(nsres) && nsret <= 0) { + nsres = nsIDOMRange_CompareBoundaryPoints(This->nsrange, NS_END_TO_END, + src_range->nsrange, &nsret); + if(NS_SUCCEEDED(nsres) && nsret >= 0) + *InRange = VARIANT_TRUE; + } + + if(NS_FAILED(nsres)) + ERR("CompareBoundaryPoints failed: %08x\n", nsres); + + return S_OK; } static HRESULT WINAPI HTMLTxtRange_isEqual(IHTMLTxtRange *iface, IHTMLTxtRange *Range,

1 0

Jacek Caban : mshtml: Added IHTMLTxtRange::isEqual implementation.
by Alexandre Julliard 10 Sep '07

10 Sep '07

Module: wine Branch: master Commit: 410abcfb25c0a64464d0e1fef843b03aebfcf8a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=410abcfb25c0a64464d0e1fef… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 9 20:18:28 2007 +0200 mshtml: Added IHTMLTxtRange::isEqual implementation. --- dlls/mshtml/txtrange.c | 27 +++++++++++++++++++++++++-- 1 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/txtrange.c b/dlls/mshtml/txtrange.c index c29b3c9..2821e02 100644 --- a/dlls/mshtml/txtrange.c +++ b/dlls/mshtml/txtrange.c @@ -366,8 +366,31 @@ static HRESULT WINAPI HTMLTxtRange_isEqual(IHTMLTxtRange *iface, IHTMLTxtRange * VARIANT_BOOL *IsEqual) { HTMLTxtRange *This = HTMLTXTRANGE_THIS(iface); - FIXME("(%p)->(%p %p)\n", This, Range, IsEqual); - return E_NOTIMPL; + HTMLTxtRange *src_range; + PRInt16 nsret = 0; + nsresult nsres; + + TRACE("(%p)->(%p %p)\n", This, Range, IsEqual); + + *IsEqual = VARIANT_FALSE; + + src_range = get_range_object(This->doc, Range); + if(!src_range) + return E_FAIL; + + nsres = nsIDOMRange_CompareBoundaryPoints(This->nsrange, NS_START_TO_START, + src_range->nsrange, &nsret); + if(NS_SUCCEEDED(nsres) && !nsret) { + nsres = nsIDOMRange_CompareBoundaryPoints(This->nsrange, NS_END_TO_END, + src_range->nsrange, &nsret); + if(NS_SUCCEEDED(nsres) && !nsret) + *IsEqual = VARIANT_TRUE; + } + + if(NS_FAILED(nsres)) + ERR("CompareBoundaryPoints failed: %08x\n", nsres); + + return S_OK; } static HRESULT WINAPI HTMLTxtRange_scrollIntoView(IHTMLTxtRange *iface, VARIANT_BOOL fStart)

1 0

Jacek Caban : mshtml: Call Exec in show_context_menu only if user selected menu item.
by Alexandre Julliard 10 Sep '07

10 Sep '07

Module: wine Branch: master Commit: c66843693f4c99478897af9280d2639195a381a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c66843693f4c99478897af928… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 9 20:11:32 2007 +0200 mshtml: Call Exec in show_context_menu only if user selected menu item. --- dlls/mshtml/olecmd.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index c481e6a..88c456a 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -873,7 +873,8 @@ void show_context_menu(HTMLDocument *This, DWORD dwID, POINT *ppt) ppt->x, ppt->y, 0, This->hwnd, NULL); DestroyMenu(menu_res); - IOleCommandTarget_Exec(CMDTARGET(This), &CGID_MSHTML, cmdid, 0, NULL, NULL); + if(cmdid) + IOleCommandTarget_Exec(CMDTARGET(This), &CGID_MSHTML, cmdid, 0, NULL, NULL); } void HTMLDocument_OleCmd_Init(HTMLDocument *This)

1 0

Jacek Caban : mshtml: Added IOleUndoManager stub implementation.
by Alexandre Julliard 10 Sep '07

10 Sep '07

Module: wine Branch: master Commit: fbdab049623b98b8e982da874f7be0047b5a829a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbdab049623b98b8e982da874… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 9 20:17:30 2007 +0200 mshtml: Added IOleUndoManager stub implementation. --- dlls/mshtml/htmldoc.c | 2 + dlls/mshtml/mshtml_private.h | 2 + dlls/mshtml/service.c | 182 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 186 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 19da49a..5e9f0ff 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -160,6 +160,8 @@ static ULONG WINAPI HTMLDocument_Release(IHTMLDocument2 *iface) IOleInPlaceObjectWindowless_InPlaceDeactivate(INPLACEWIN(This)); if(This->ipsite) IOleDocumentView_SetInPlaceSite(DOCVIEW(This), NULL); + if(This->undomgr) + IOleUndoManager_Release(This->undomgr); set_document_bscallback(This, NULL); set_current_mon(This, NULL); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index fbe572f..1f11d7d 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -124,6 +124,8 @@ struct HTMLDocument { IOleInPlaceFrame *frame; IOleInPlaceUIWindow *ip_window; + IOleUndoManager *undomgr; + BSCallback *bscallback; IMoniker *mon; BSTR url; diff --git a/dlls/mshtml/service.c b/dlls/mshtml/service.c index ce4dc2e..d69c778 100644 --- a/dlls/mshtml/service.c +++ b/dlls/mshtml/service.c @@ -34,6 +34,175 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); +typedef struct { + const IOleUndoManagerVtbl *lpOleUndoManagerVtbl; + + LONG ref; +} UndoManager; + +#define UNDOMGR(x) ((IOleUndoManager*) &(x)->lpOleUndoManagerVtbl) + +#define UNDOMGR_THIS(iface) DEFINE_THIS(UndoManager, OleUndoManager, iface) + +static HRESULT WINAPI OleUndoManager_QueryInterface(IOleUndoManager *iface, REFIID riid, void **ppv) +{ + UndoManager *This = UNDOMGR_THIS(iface); + + *ppv = NULL; + + if(IsEqualGUID(riid, &IID_IUnknown)) { + TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); + *ppv = UNDOMGR(This); + }else if(IsEqualGUID(riid, &IID_IOleUndoManager)) { + TRACE("(%p)->(IID_IOleUndoManager %p)\n", This, ppv); + *ppv = UNDOMGR(This); + } + + + FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + return E_NOINTERFACE; +} + +static ULONG WINAPI OleUndoManager_AddRef(IOleUndoManager *iface) +{ + UndoManager *This = UNDOMGR_THIS(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI OleUndoManager_Release(IOleUndoManager *iface) +{ + UndoManager *This = UNDOMGR_THIS(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if(!ref) + mshtml_free(This); + + return ref; +} + +static HRESULT WINAPI OleUndoManager_Open(IOleUndoManager *iface, IOleParentUndoUnit *pPUU) +{ + UndoManager *This = UNDOMGR_THIS(iface); + FIXME("(%p)->(%p)\n", This, pPUU); + return E_NOTIMPL; +} + +static HRESULT WINAPI OleUndoManager_Close(IOleUndoManager *iface, IOleParentUndoUnit *pPUU, + BOOL fCommit) +{ + UndoManager *This = UNDOMGR_THIS(iface); + FIXME("(%p)->(%p %x)\n", This, pPUU, fCommit); + return E_NOTIMPL; +} + +static HRESULT WINAPI OleUndoManager_Add(IOleUndoManager *iface, IOleUndoUnit *pUU) +{ + UndoManager *This = UNDOMGR_THIS(iface); + FIXME("(%p)->(%p)\n", This, pUU); + return E_NOTIMPL; +} + +static HRESULT WINAPI OleUndoManager_GetOpenParentState(IOleUndoManager *iface, DWORD *pdwState) +{ + UndoManager *This = UNDOMGR_THIS(iface); + FIXME("(%p)->(%p)\n", This, pdwState); + return E_NOTIMPL; +} + +static HRESULT WINAPI OleUndoManager_DiscardFrom(IOleUndoManager *iface, IOleUndoUnit *pUU) +{ + UndoManager *This = UNDOMGR_THIS(iface); + FIXME("(%p)->(%p)\n", This, pUU); + return S_OK; +} + +static HRESULT WINAPI OleUndoManager_UndoTo(IOleUndoManager *iface, IOleUndoUnit *pUU) +{ + UndoManager *This = UNDOMGR_THIS(iface); + FIXME("(%p)->(%p)\n", This, pUU); + return E_NOTIMPL; +} + +static HRESULT WINAPI OleUndoManager_RedoTo(IOleUndoManager *iface, IOleUndoUnit *pUU) +{ + UndoManager *This = UNDOMGR_THIS(iface); + FIXME("(%p)->(%p)\n", This, pUU); + return E_NOTIMPL; +} + +static HRESULT WINAPI OleUndoManager_EnumUndoable(IOleUndoManager *iface, + IEnumOleUndoUnits **ppEnum) +{ + UndoManager *This = UNDOMGR_THIS(iface); + FIXME("(%p)->(%p)\n", This, ppEnum); + return E_NOTIMPL; +} + +static HRESULT WINAPI OleUndoManager_EnumRedoable(IOleUndoManager *iface, + IEnumOleUndoUnits **ppEnum) +{ + UndoManager *This = UNDOMGR_THIS(iface); + FIXME("(%p)->(%p)\n", This, ppEnum); + return E_NOTIMPL; +} + +static HRESULT WINAPI OleUndoManager_GetLastUndoDescription(IOleUndoManager *iface, BSTR *pBstr) +{ + UndoManager *This = UNDOMGR_THIS(iface); + FIXME("(%p)->(%p)\n", This, pBstr); + return E_NOTIMPL; +} + +static HRESULT WINAPI OleUndoManager_GetLastRedoDescription(IOleUndoManager *iface, BSTR *pBstr) +{ + UndoManager *This = UNDOMGR_THIS(iface); + FIXME("(%p)->(%p)\n", This, pBstr); + return E_NOTIMPL; +} + +static HRESULT WINAPI OleUndoManager_Enable(IOleUndoManager *iface, BOOL fEnable) +{ + UndoManager *This = UNDOMGR_THIS(iface); + FIXME("(%p)->(%x)\n", This, fEnable); + return E_NOTIMPL; +} + +#undef UNDOMGR_THIS + +static const IOleUndoManagerVtbl OleUndoManagerVtbl = { + OleUndoManager_QueryInterface, + OleUndoManager_AddRef, + OleUndoManager_Release, + OleUndoManager_Open, + OleUndoManager_Close, + OleUndoManager_Add, + OleUndoManager_GetOpenParentState, + OleUndoManager_DiscardFrom, + OleUndoManager_UndoTo, + OleUndoManager_RedoTo, + OleUndoManager_EnumUndoable, + OleUndoManager_EnumRedoable, + OleUndoManager_GetLastUndoDescription, + OleUndoManager_GetLastRedoDescription, + OleUndoManager_Enable +}; + +static IOleUndoManager *create_undomgr(void) +{ + UndoManager *ret = mshtml_alloc(sizeof(UndoManager)); + + ret->lpOleUndoManagerVtbl = &OleUndoManagerVtbl; + ret->ref = 1; + + return UNDOMGR(ret); +} + /********************************************************** * IServiceProvider impementation */ @@ -69,6 +238,17 @@ static HRESULT WINAPI ServiceProvider_QueryService(IServiceProvider *iface, REFG return E_NOINTERFACE; } + if(IsEqualGUID(&IID_IOleUndoManager, riid)) { + TRACE("(%p)->(IID_IOleUndoManager %p)\n", This, ppv); + + if(!This->undomgr) + This->undomgr = create_undomgr(); + + IOleUndoManager_AddRef(This->undomgr); + *ppv = This->undomgr; + return S_OK; + } + FIXME("(%p)->(%s %s %p)\n", This, debugstr_guid(guidService), debugstr_guid(riid), ppv); return E_UNEXPECTED; @@ -84,4 +264,6 @@ static const IServiceProviderVtbl ServiceProviderVtbl = { void HTMLDocument_Service_Init(HTMLDocument *This) { This->lpServiceProviderVtbl = &ServiceProviderVtbl; + + This->undomgr = NULL; }

1 0

Louis Lenders : wined3d: Add WINED3DPRESENT_INTERVAL_ONE flag.
by Alexandre Julliard 10 Sep '07

10 Sep '07

Module: wine Branch: master Commit: a7558ce756c62b4b282f1acdfee23870a04a9a8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7558ce756c62b4b282f1acdf… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Fri Sep 7 17:29:02 2007 +0100 wined3d: Add WINED3DPRESENT_INTERVAL_ONE flag. --- dlls/wined3d/directx.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index e199f36..774bf38 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1810,7 +1810,8 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter, WINED3DCAPS2_FULLSCREENGAMMA | WINED3DCAPS2_DYNAMICTEXTURES; *pCaps->Caps3 = WINED3DCAPS3_ALPHA_FULLSCREEN_FLIP_OR_DISCARD; - *pCaps->PresentationIntervals = WINED3DPRESENT_INTERVAL_IMMEDIATE; + *pCaps->PresentationIntervals = WINED3DPRESENT_INTERVAL_IMMEDIATE | + WINED3DPRESENT_INTERVAL_ONE; *pCaps->CursorCaps = WINED3DCURSORCAPS_COLOR | WINED3DCURSORCAPS_LOWRES;

1 0

Mikolaj Zalewski : mshtml: Hide the progress bar while asking the user if Gecko should be installed.
by Alexandre Julliard 10 Sep '07

10 Sep '07

Module: wine Branch: master Commit: a0de33b4871ba5d2a7890d527421f6fa00ababc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0de33b4871ba5d2a7890d527… Author: Mikolaj Zalewski <mikolajz(a)google.com> Date: Fri Sep 7 16:25:16 2007 -0700 mshtml: Hide the progress bar while asking the user if Gecko should be installed. --- dlls/mshtml/install.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/install.c b/dlls/mshtml/install.c index 845598e..d4fb1f9 100644 --- a/dlls/mshtml/install.c +++ b/dlls/mshtml/install.c @@ -368,6 +368,7 @@ static INT_PTR CALLBACK installer_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARA { switch(msg) { case WM_INITDIALOG: + ShowWindow(GetDlgItem(hwnd, ID_DWL_PROGRESS), SW_HIDE); install_dialog = hwnd; return TRUE; @@ -378,6 +379,7 @@ static INT_PTR CALLBACK installer_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARA return FALSE; case ID_DWL_INSTALL: + ShowWindow(GetDlgItem(hwnd, ID_DWL_PROGRESS), SW_SHOW); EnableWindow(GetDlgItem(hwnd, ID_DWL_INSTALL), 0); EnableWindow(GetDlgItem(hwnd, IDCANCEL), 0); /* FIXME */ CreateThread(NULL, 0, download_proc, NULL, 0, NULL);

1 0

Mikolaj Zalewski : mshtml: Make the Install button the default on the Gecko installation dialog.
by Alexandre Julliard 10 Sep '07

10 Sep '07

Module: wine Branch: master Commit: b21cd5885f956c435a9239b108f1737104cd1607 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b21cd5885f956c435a9239b10… Author: Mikolaj Zalewski <mikolajz(a)google.com> Date: Fri Sep 7 16:40:41 2007 -0700 mshtml: Make the Install button the default on the Gecko installation dialog. --- dlls/mshtml/Bg.rc | 2 +- dlls/mshtml/De.rc | 4 ++-- dlls/mshtml/En.rc | 4 ++-- dlls/mshtml/Es.rc | 4 ++-- dlls/mshtml/Fr.rc | 4 ++-- dlls/mshtml/Ko.rc | 2 +- dlls/mshtml/Nl.rc | 4 ++-- dlls/mshtml/No.rc | 4 ++-- dlls/mshtml/Sv.rc | 4 ++-- dlls/mshtml/Tr.rc | 4 ++-- 10 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/mshtml/Bg.rc b/dlls/mshtml/Bg.rc index ecc2ada..92c86b6 100644 --- a/dlls/mshtml/Bg.rc +++ b/dlls/mshtml/Bg.rc @@ -37,6 +37,6 @@ FONT 8, "MS Shell Dlg" "�� Gecko (HTML �� Mozilla) ��. �� Gecko " \ "�� ?", ID_DWL_STATUS, 10, 10, 240, 30, SS_LEFT CONTROL "��", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 40, 240, 12 + DEFPUSHBUTTON "��", ID_DWL_INSTALL, 200, 60, 50, 15, WS_GROUP | WS_TABSTOP PUSHBUTTON "��", IDCANCEL, 140, 60, 50, 15, WS_GROUP | WS_TABSTOP - PUSHBUTTON "��", ID_DWL_INSTALL, 200, 60, 50, 15, WS_GROUP | WS_TABSTOP } diff --git a/dlls/mshtml/De.rc b/dlls/mshtml/De.rc index 474e00e..5c15b90 100644 --- a/dlls/mshtml/De.rc +++ b/dlls/mshtml/De.rc @@ -39,6 +39,6 @@ FONT 8, "MS Shell Dlg" "anzuzeigen. Klicken Sie auf �Installieren�, um Gecko automatisch " \ "herunterzuladen und zu installieren.", ID_DWL_STATUS, 10, 10, 240, 40, SS_LEFT CONTROL "Fortschritt", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 50, 240, 12 - PUSHBUTTON "Abbrechen", IDCANCEL, 140, 70, 50, 15, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Installieren", ID_DWL_INSTALL, 200, 70, 50, 15, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "&Installieren", ID_DWL_INSTALL, 200, 70, 50, 15, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Abbrechen", IDCANCEL, 140, 70, 50, 15, WS_GROUP | WS_TABSTOP } diff --git a/dlls/mshtml/En.rc b/dlls/mshtml/En.rc index 1d72f49..cf77ed7 100644 --- a/dlls/mshtml/En.rc +++ b/dlls/mshtml/En.rc @@ -36,6 +36,6 @@ FONT 8, "MS Shell Dlg" "engine) to be installed to show the page. Click install if you want Wine to " \ "automatically download and install Gecko.", ID_DWL_STATUS, 10, 10, 240, 30, SS_LEFT CONTROL "Progress", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 40, 240, 12 - PUSHBUTTON "Cancel", IDCANCEL, 140, 60, 50, 15, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Install", ID_DWL_INSTALL, 200, 60, 50, 15, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "&Install", ID_DWL_INSTALL, 200, 60, 50, 15, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Cancel", IDCANCEL, 140, 60, 50, 15, WS_GROUP | WS_TABSTOP } diff --git a/dlls/mshtml/Es.rc b/dlls/mshtml/Es.rc index d151a2a..c4623ae 100644 --- a/dlls/mshtml/Es.rc +++ b/dlls/mshtml/Es.rc @@ -38,6 +38,6 @@ FONT 8, "MS Shell Dlg" " de Mozilla) est� instalado para mostrar la p�gina. Pulse Instalar si desea que Wine " \ "descargue e instale autom�ticamente Gecko.", ID_DWL_STATUS, 10, 10, 240, 40, SS_LEFT CONTROL "Progreso", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 50, 240, 12 - PUSHBUTTON "Cancelar", IDCANCEL, 140, 70, 50, 15, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Instalar", ID_DWL_INSTALL, 200, 70, 50, 15, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "&Instalar", ID_DWL_INSTALL, 200, 70, 50, 15, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Cancelar", IDCANCEL, 140, 70, 50, 15, WS_GROUP | WS_TABSTOP } diff --git a/dlls/mshtml/Fr.rc b/dlls/mshtml/Fr.rc index a462a9a..d378ea1 100644 --- a/dlls/mshtml/Fr.rc +++ b/dlls/mshtml/Fr.rc @@ -39,6 +39,6 @@ FONT 8, "MS Shell Dlg" "pour afficher cette page. Cliquez sur Installer si vous souhaitez que Wine " \ "t�l�charge et installe automatiquement Gecko.", ID_DWL_STATUS, 10, 10, 240, 40, SS_LEFT CONTROL "Progression", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 50, 240, 12 - PUSHBUTTON "Annuler", IDCANCEL, 140, 70, 50, 15, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Installer", ID_DWL_INSTALL, 200, 70, 50, 15, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "&Installer", ID_DWL_INSTALL, 200, 70, 50, 15, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Annuler", IDCANCEL, 140, 70, 50, 15, WS_GROUP | WS_TABSTOP } diff --git a/dlls/mshtml/Ko.rc b/dlls/mshtml/Ko.rc index a3a294b..04f0190 100644 --- a/dlls/mshtml/Ko.rc +++ b/dlls/mshtml/Ko.rc @@ -37,6 +37,6 @@ FONT 8, "MS Shell Dlg" "Gecko (Mozilla HTML ��)�� ġ�� Դϴ�. Wine�� ڵ�� Gecko�� ٿ�ε��ϰ� ��ġ�ϱ⸦ ��Ѵٸ� " \ "[��ġ]��ư�� Ŭ��Ͻʽÿ�", ID_DWL_STATUS, 10, 10, 240, 30, SS_LEFT CONTROL "Progress", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 40, 240, 12 + DEFPUSHBUTTON "��ġ", ID_DWL_INSTALL, 200, 60, 50, 15, WS_GROUP | WS_TABSTOP PUSHBUTTON "��", IDCANCEL, 140, 60, 50, 15, WS_GROUP | WS_TABSTOP - PUSHBUTTON "��ġ", ID_DWL_INSTALL, 200, 60, 50, 15, WS_GROUP | WS_TABSTOP } diff --git a/dlls/mshtml/Nl.rc b/dlls/mshtml/Nl.rc index 7378ff8..ef5c799 100644 --- a/dlls/mshtml/Nl.rc +++ b/dlls/mshtml/Nl.rc @@ -39,6 +39,6 @@ FONT 8, "MS Shell Dlg" "weer te kunnen geven. Klik op Installeren, om Gecko automatisch " \ "te downloaden en te installeren.", ID_DWL_STATUS, 10, 10, 240, 40, SS_LEFT CONTROL "Voortgang", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 50, 240, 12 - PUSHBUTTON "Afbreken", IDCANCEL, 140, 70, 50, 15, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Installeren", ID_DWL_INSTALL, 200, 70, 50, 15, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "&Installeren", ID_DWL_INSTALL, 200, 70, 50, 15, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Afbreken", IDCANCEL, 140, 70, 50, 15, WS_GROUP | WS_TABSTOP } diff --git a/dlls/mshtml/No.rc b/dlls/mshtml/No.rc index 1722138..e354820 100644 --- a/dlls/mshtml/No.rc +++ b/dlls/mshtml/No.rc @@ -36,6 +36,6 @@ STRINGTABLE DISCARDABLE "(Mozillas HTML-motor) for � vise denne siden. Velg �Installer� hvis " \ "du vil at Wine skal laste ned og installere Gecko automatisk.", ID_DWL_STATUS, 10, 10, 240, 30, SS_LEFT CONTROL "Progress", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 40, 240, 12 - PUSHBUTTON "Avbryt", IDCANCEL, 140, 60, 50, 15, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Installer", ID_DWL_INSTALL, 200, 60, 50, 15, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "&Installer", ID_DWL_INSTALL, 200, 60, 50, 15, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Avbryt", IDCANCEL, 140, 60, 50, 15, WS_GROUP | WS_TABSTOP } diff --git a/dlls/mshtml/Sv.rc b/dlls/mshtml/Sv.rc index 01f3896..fe332cc 100644 --- a/dlls/mshtml/Sv.rc +++ b/dlls/mshtml/Sv.rc @@ -36,6 +36,6 @@ FONT 8, "MS Shell Dlg" "programvara) installerad f�r att visa sidan. V�lj Installera om du vill att Wine " \ "automatiskt ska h�mta och installera Gecko.", ID_DWL_STATUS, 10, 10, 240, 30, SS_LEFT CONTROL "Progress", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 40, 240, 12 - PUSHBUTTON "Avbryt", IDCANCEL, 140, 60, 50, 15, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Installera", ID_DWL_INSTALL, 200, 60, 50, 15, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "&Installera", ID_DWL_INSTALL, 200, 60, 50, 15, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Avbryt", IDCANCEL, 140, 60, 50, 15, WS_GROUP | WS_TABSTOP } diff --git a/dlls/mshtml/Tr.rc b/dlls/mshtml/Tr.rc index 90221fd..6d843a1 100644 --- a/dlls/mshtml/Tr.rc +++ b/dlls/mshtml/Tr.rc @@ -36,6 +36,6 @@ FONT 8, "MS Shell Dlg" "i�in Gecko (Mozilla HTML motoru)'nun kurulu olmas�n� gerektirir. Gecko motorunun " \ "otomatik olarak indirilmesi ve kurulmas� i�in Kur'u t�klay�n.", ID_DWL_STATUS, 10, 10, 240, 40, SS_LEFT CONTROL "�lerleme", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 50, 240, 12 - PUSHBUTTON "�ptal", IDCANCEL, 140, 70, 50, 15, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Kur", ID_DWL_INSTALL, 200, 70, 50, 15, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "&Kur", ID_DWL_INSTALL, 200, 70, 50, 15, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&�ptal", IDCANCEL, 140, 70, 50, 15, WS_GROUP | WS_TABSTOP }

1 0