August 2007 - Wine-Commits - list.winehq.org

Louis Lenders : kernel32: Set USERNAME environment variable.
by Alexandre Julliard Aug. 17, 2007

Aug. 17, 2007

Module: wine Branch: master Commit: 7475599b4099f1d6b12b2c7885a3f144f13a3792 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7475599b4099f1d6b12b2c788… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Thu Aug 16 14:50:29 2007 +0100 kernel32: Set USERNAME environment variable. --- dlls/kernel32/process.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 1eaf195..a08235a 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -418,6 +418,24 @@ static void set_registry_environment(void) NtClose( attr.RootDirectory ); } +/*********************************************************************** + * set_additional_environment + * + * Set some additional environment variables not specified in the registry. + */ +static void set_additional_environment(void) +{ + static const WCHAR usernameW[] = {'U','S','E','R','N','A','M','E',0}; + const char *name = wine_get_user_name(); + DWORD len = MultiByteToWideChar( CP_UNIXCP, 0, name, -1, NULL, 0 ); + if (len) + { + LPWSTR nameW = HeapAlloc( GetProcessHeap(), 0, len*sizeof(WCHAR) ); + MultiByteToWideChar( CP_UNIXCP, 0, name, -1, nameW, len ); + SetEnvironmentVariableW( usernameW, nameW ); + HeapFree( GetProcessHeap(), 0, nameW ); + } +} /*********************************************************************** * set_library_wargv @@ -745,6 +763,7 @@ static BOOL process_init(void) convert_old_config(); set_registry_environment(); + set_additional_environment(); } init_windows_dirs();

1 0

Roderick Colenbrander : wgl: Fix a render_texture regression. Only enable GLX_ATI_render_texture when the ati extension is around.
by Alexandre Julliard Aug. 17, 2007

Aug. 17, 2007

Module: wine Branch: master Commit: d068bdd82092651db10cff59da6e44e567aafc07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d068bdd82092651db10cff59d… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Fri Aug 17 11:16:29 2007 +0200 wgl: Fix a render_texture regression. Only enable GLX_ATI_render_texture when the ati extension is around. --- dlls/winex11.drv/opengl.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 516de5f..5eed1ed 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -139,7 +139,7 @@ typedef struct wine_glpbuffer { static Wine_GLContext *context_list; static struct WineGLInfo WineGLInfo = { 0 }; static int use_render_texture_emulation = 1; -static int use_render_texture_ati = 1; +static int use_render_texture_ati = 0; static int swap_interval = 1; #define MAX_EXTENSIONS 16 @@ -507,6 +507,7 @@ LOAD_FUNCPTR(glXFreeMemoryNV) } if(glxRequireExtension("GLX_ATI_render_texture")) { + use_render_texture_ati = 1; pglXBindTexImageATI = (void*)pglXGetProcAddressARB((const GLubyte *) "glXBindTexImageATI"); pglXReleaseTexImageATI = (void*)pglXGetProcAddressARB((const GLubyte *) "glXReleaseTexImageATI"); pglXDrawableAttribATI = (void*)pglXGetProcAddressARB((const GLubyte *) "glXDrawableAttribATI");

1 0

Mikolaj Zalewski : msvcrt: __mb_cur_max is not updated in _setmbcp ( with testcase) and should not be used in _ismbblead.
by Alexandre Julliard Aug. 17, 2007

Aug. 17, 2007

Module: wine Branch: master Commit: e9ec5d4aff33a76890ff6cb7254e8483267d7e08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9ec5d4aff33a76890ff6cb72… Author: Mikolaj Zalewski <mikolajz(a)google.com> Date: Thu Aug 16 11:14:48 2007 -0700 msvcrt: __mb_cur_max is not updated in _setmbcp (with testcase) and should not be used in _ismbblead. --- dlls/msvcrt/mbcs.c | 2 +- dlls/msvcrt/tests/string.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 07e38ec..0dc0120 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -911,7 +911,7 @@ int CDECL _ismbckata(unsigned int c) int CDECL _ismbblead(unsigned int c) { /* FIXME: should reference MSVCRT_mbctype */ - return MSVCRT___mb_cur_max > 1 && MSVCRT_isleadbyte(c); + return MSVCRT_isleadbyte(c); } diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 7b434f7..d7148da 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -78,8 +78,10 @@ static void test_swab( void ) { static void test_ismbblead(void) { unsigned int s = '\354'; + int mb_orig_max = __mb_cur_max; _setmbcp(936); + ok(__mb_cur_max == mb_orig_max, "__mb_cur_max shouldn't be updated (is %d != %d)\n", __mb_cur_max, mb_orig_max); todo_wine ok(_ismbblead(s), "got result %d\n", _ismbblead(s)); _setmbcp(1252); }

1 0

Jacek Caban : mshtml: Added IHTMLTxtRange::compareEndPoints implementation.
by Alexandre Julliard Aug. 17, 2007

Aug. 17, 2007

Module: wine Branch: master Commit: d6e29316e6afeec229e9343f1545296cb9c79ed9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6e29316e6afeec229e9343f1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 17 02:40:33 2007 +0200 mshtml: Added IHTMLTxtRange::compareEndPoints implementation. --- dlls/mshtml/nsiface.idl | 7 ++++++ dlls/mshtml/txtrange.c | 51 +++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 56 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index f402b36..120c2f6 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -819,6 +819,13 @@ interface nsIDOMHTMLDocument : nsIDOMDocument ] interface nsIDOMRange : nsISupports { + enum { + NS_START_TO_START, + NS_START_TO_END, + NS_END_TO_END, + NS_END_TO_START + }; + nsresult GetStartContainer(nsIDOMNode **aStartContainer); nsresult GetStartOffset(PRInt32 *aStartOffset); nsresult GetEndContainer(nsIDOMNode **aEndContainer); diff --git a/dlls/mshtml/txtrange.c b/dlls/mshtml/txtrange.c index 373b7b6..37a836d 100644 --- a/dlls/mshtml/txtrange.c +++ b/dlls/mshtml/txtrange.c @@ -49,6 +49,34 @@ typedef struct { #define HTMLTXTRANGE(x) ((IHTMLTxtRange*) &(x)->lpHTMLTxtRangeVtbl) +static HTMLTxtRange *get_range_object(HTMLDocument *doc, IHTMLTxtRange *iface) +{ + HTMLTxtRange *iter; + + LIST_FOR_EACH_ENTRY(iter, &doc->range_list, HTMLTxtRange, entry) { + if(HTMLTXTRANGE(iter) == iface) + return iter; + } + + ERR("Could not find range in document\n"); + return NULL; +} + +static int string_to_nscmptype(LPCWSTR str) +{ + static const WCHAR seW[] = {'S','t','a','r','t','T','o','E','n','d',0}; + static const WCHAR ssW[] = {'S','t','a','r','t','T','o','S','t','a','r','t',0}; + static const WCHAR esW[] = {'E','n','d','T','o','S','t','a','r','t',0}; + static const WCHAR eeW[] = {'E','n','d','T','o','E','n','d',0}; + + if(!strcmpiW(str, seW)) return NS_START_TO_END; + if(!strcmpiW(str, ssW)) return NS_START_TO_START; + if(!strcmpiW(str, esW)) return NS_END_TO_START; + if(!strcmpiW(str, eeW)) return NS_END_TO_END; + + return -1; +} + #define HTMLTXTRANGE_THIS(iface) DEFINE_THIS(HTMLTxtRange, HTMLTxtRange, iface) static HRESULT WINAPI HTMLTxtRange_QueryInterface(IHTMLTxtRange *iface, REFIID riid, void **ppv) @@ -383,8 +411,27 @@ static HRESULT WINAPI HTMLTxtRange_compareEndPoints(IHTMLTxtRange *iface, BSTR h IHTMLTxtRange *SourceRange, long *ret) { HTMLTxtRange *This = HTMLTXTRANGE_THIS(iface); - FIXME("(%p)->(%s %p %p)\n", This, debugstr_w(how), SourceRange, ret); - return E_NOTIMPL; + HTMLTxtRange *src_range; + PRInt16 nsret = 0; + int nscmpt; + nsresult nsres; + + TRACE("(%p)->(%s %p %p)\n", This, debugstr_w(how), SourceRange, ret); + + nscmpt = string_to_nscmptype(how); + if(nscmpt == -1) + return E_INVALIDARG; + + src_range = get_range_object(This->doc, SourceRange); + if(!src_range) + return E_FAIL; + + nsres = nsIDOMRange_CompareBoundaryPoints(This->nsrange, nscmpt, src_range->nsrange, &nsret); + if(NS_FAILED(nsres)) + ERR("CompareBoundaryPoints failed: %08x\n", nsres); + + *ret = nsret; + return S_OK; } static HRESULT WINAPI HTMLTxtRange_findText(IHTMLTxtRange *iface, BSTR String,

1 0

Jacek Caban : mshtml: Added IHTMLTxtRange::select implementation.
by Alexandre Julliard Aug. 17, 2007

Aug. 17, 2007

Module: wine Branch: master Commit: cbfef31895b3d689e3baa75cf8a1bcab12a38fe5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbfef31895b3d689e3baa75cf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 17 02:39:56 2007 +0200 mshtml: Added IHTMLTxtRange::select implementation. --- dlls/mshtml/txtrange.c | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/txtrange.c b/dlls/mshtml/txtrange.c index ee5cbe7..373b7b6 100644 --- a/dlls/mshtml/txtrange.c +++ b/dlls/mshtml/txtrange.c @@ -337,8 +337,24 @@ static HRESULT WINAPI HTMLTxtRange_moveEnd(IHTMLTxtRange *iface, BSTR Unit, static HRESULT WINAPI HTMLTxtRange_select(IHTMLTxtRange *iface) { HTMLTxtRange *This = HTMLTXTRANGE_THIS(iface); - FIXME("(%p)->()\n", This); - return E_NOTIMPL; + + TRACE("(%p)\n", This); + + if(This->doc->nscontainer) { + nsIDOMWindow *dom_window = NULL; + nsISelection *nsselection; + + nsIWebBrowser_GetContentDOMWindow(This->doc->nscontainer->webbrowser, &dom_window); + nsIDOMWindow_GetSelection(dom_window, &nsselection); + nsIDOMWindow_Release(dom_window); + + nsISelection_RemoveAllRanges(nsselection); + nsISelection_AddRange(nsselection, This->nsrange); + + nsISelection_Release(nsselection); + } + + return S_OK; } static HRESULT WINAPI HTMLTxtRange_pasteHTML(IHTMLTxtRange *iface, BSTR html)

1 0

Jacek Caban : mshtml: Added get_scrollWidth and get_scrollHeight implementation.
by Alexandre Julliard Aug. 17, 2007

Aug. 17, 2007

Module: wine Branch: master Commit: dab6474b66fdb468663809e2e8982cc1c921260f URL: http://source.winehq.org/git/wine.git/?a=commit;h=dab6474b66fdb468663809e2e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 17 02:39:19 2007 +0200 mshtml: Added get_scrollWidth and get_scrollHeight implementation. --- dlls/mshtml/htmltextcont.c | 40 ++++++++++++++++++++++++++++++++++++---- 1 files changed, 36 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmltextcont.c b/dlls/mshtml/htmltextcont.c index 42f0805..ed079db 100644 --- a/dlls/mshtml/htmltextcont.c +++ b/dlls/mshtml/htmltextcont.c @@ -101,15 +101,47 @@ static HRESULT WINAPI HTMLTextContainer_createControlRange(IHTMLTextContainer *i static HRESULT WINAPI HTMLTextContainer_get_scrollHeight(IHTMLTextContainer *iface, long *p) { HTMLTextContainer *This = HTMLTEXTCONT_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsIDOMNSHTMLElement *nselem; + PRInt32 height; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMElement_QueryInterface(This->element->nselem, &IID_nsIDOMNSHTMLElement, (void**)&nselem); + if(NS_SUCCEEDED(nsres)) { + nsIDOMNSHTMLElement_GetScrollHeight(nselem, &height); + nsIDOMNSHTMLElement_Release(nselem); + }else { + ERR("Could not get nsIDOMNSHTMLElement interface: %08x\n", nsres); + } + + *p = height; + TRACE("*p = %ld\n", *p); + + return S_OK; } static HRESULT WINAPI HTMLTextContainer_get_scrollWidth(IHTMLTextContainer *iface, long *p) { HTMLTextContainer *This = HTMLTEXTCONT_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsIDOMNSHTMLElement *nselem; + PRInt32 width = 0; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMElement_QueryInterface(This->element->nselem, &IID_nsIDOMNSHTMLElement, (void**)&nselem); + if(NS_SUCCEEDED(nsres)) { + nsIDOMNSHTMLElement_GetScrollWidth(nselem, &width); + nsIDOMNSHTMLElement_Release(nselem); + }else { + ERR("Could not get nsIDOMNSHTMLElement interface: %08x\n", nsres); + } + + *p = width; + TRACE("*p = %ld\n", *p); + + return S_OK; } static HRESULT WINAPI HTMLTextContainer_put_scrollTop(IHTMLTextContainer *iface, long v)

1 0

Jacek Caban : mshtml: Don't create element object for document node.
by Alexandre Julliard Aug. 17, 2007

Aug. 17, 2007

Module: wine Branch: master Commit: 6ee709039f2c419ceb77d03f4869af4e52d5f601 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ee709039f2c419ceb77d03f4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 17 02:38:41 2007 +0200 mshtml: Don't create element object for document node. --- dlls/mshtml/htmlnode.c | 3 +-- dlls/mshtml/mshtml_private.h | 3 --- 2 files changed, 1 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index c226db3..cb32930 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -370,8 +370,7 @@ HTMLDOMNode *get_node(HTMLDocument *This, nsIDOMNode *nsnode) nsIDOMNode_GetNodeType(nsnode, &node_type); - if(node_type == NS_ELEMENT_NODE - || node_type == NS_DOCUMENT_NODE) + if(node_type == ELEMENT_NODE) HTMLElement_Create(ret); return ret; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 347a61c..fbe572f 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -47,9 +47,6 @@ #define NSAPI WINAPI -#define NS_ELEMENT_NODE 1 -#define NS_DOCUMENT_NODE 9 - #define MSHTML_E_NODOC 0x800a025c typedef struct HTMLDOMNode HTMLDOMNode;

1 0

Jacek Caban : mshtml: Added IHTMLTxtRange::put_text implementation.
by Alexandre Julliard Aug. 17, 2007

Aug. 17, 2007

Module: wine Branch: master Commit: 77e8a6800d18ca8d3758067003e0a3ff0b3f55a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77e8a6800d18ca8d375806700… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 17 02:38:00 2007 +0200 mshtml: Added IHTMLTxtRange::put_text implementation. --- dlls/mshtml/mshtml_private.h | 2 ++ dlls/mshtml/txtrange.c | 34 ++++++++++++++++++++++++++++++++-- 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 63e2027..347a61c 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -50,6 +50,8 @@ #define NS_ELEMENT_NODE 1 #define NS_DOCUMENT_NODE 9 +#define MSHTML_E_NODOC 0x800a025c + typedef struct HTMLDOMNode HTMLDOMNode; typedef struct ConnectionPoint ConnectionPoint; typedef struct BSCallback BSCallback; diff --git a/dlls/mshtml/txtrange.c b/dlls/mshtml/txtrange.c index 70791a3..ee5cbe7 100644 --- a/dlls/mshtml/txtrange.c +++ b/dlls/mshtml/txtrange.c @@ -180,8 +180,38 @@ static HRESULT WINAPI HTMLTxtRange_get_htmlText(IHTMLTxtRange *iface, BSTR *p) static HRESULT WINAPI HTMLTxtRange_put_text(IHTMLTxtRange *iface, BSTR v) { HTMLTxtRange *This = HTMLTXTRANGE_THIS(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + nsIDOMDocument *nsdoc; + nsIDOMText *text_node; + nsAString text_str; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + if(!This->doc) + return MSHTML_E_NODOC; + + nsres = nsIWebNavigation_GetDocument(This->doc->nscontainer->navigation, &nsdoc); + if(NS_FAILED(nsres)) { + ERR("GetDocument failed: %08x\n", nsres); + return S_OK; + } + + nsAString_Init(&text_str, v); + nsres = nsIDOMDocument_CreateTextNode(nsdoc, &text_str, &text_node); + nsAString_Finish(&text_str); + if(NS_FAILED(nsres)) { + ERR("CreateTextNode failed: %08x\n", nsres); + return S_OK; + } + nsres = nsIDOMRange_DeleteContents(This->nsrange); + if(NS_FAILED(nsres)) + ERR("DeleteContents failed: %08x\n", nsres); + + nsres = nsIDOMRange_InsertNode(This->nsrange, (nsIDOMNode*)text_node); + if(NS_FAILED(nsres)) + ERR("InsertNode failed: %08x\n", nsres); + + return S_OK; } static HRESULT WINAPI HTMLTxtRange_get_text(IHTMLTxtRange *iface, BSTR *p)

1 0

Jacek Caban : mshtml: Store HTMLDocument reference in HTMLTxtRange object.
by Alexandre Julliard Aug. 17, 2007

Aug. 17, 2007

Module: wine Branch: master Commit: cfaf00fa51d4812ba25a221b78e76f514f58487b URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfaf00fa51d4812ba25a221b7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 17 02:37:01 2007 +0200 mshtml: Store HTMLDocument reference in HTMLTxtRange object. --- dlls/mshtml/htmlbody.c | 2 +- dlls/mshtml/htmldoc.c | 2 ++ dlls/mshtml/mshtml_private.h | 4 +++- dlls/mshtml/selection.c | 2 +- dlls/mshtml/txtrange.c | 21 +++++++++++++++++++-- 5 files changed, 26 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index 40d8983..b6b78f6 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -427,7 +427,7 @@ static HRESULT WINAPI HTMLBodyElement_createTextRange(IHTMLBodyElement *iface, I nsIDOMDocumentRange_Release(nsdocrange); } - *range = HTMLTxtRange_Create(nsrange); + *range = HTMLTxtRange_Create(This->element->node->doc, nsrange); return S_OK; } diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index f70b96e..19da49a 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -173,6 +173,7 @@ static ULONG WINAPI HTMLDocument_Release(IHTMLDocument2 *iface) IHTMLWindow2_Release(HTMLWINDOW2(This->window)); detach_selection(This); + detach_ranges(This); release_nodes(This); ConnectionPointContainer_Destroy(&This->cp_container); @@ -1130,6 +1131,7 @@ HRESULT HTMLDocument_Create(IUnknown *pUnkOuter, REFIID riid, void** ppvObject) ret->window = NULL; list_init(&ret->selection_list); + list_init(&ret->range_list); hres = IHTMLDocument_QueryInterface(HTMLDOC(ret), riid, ppvObject); if(FAILED(hres)) { diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 69472ff..63e2027 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -151,6 +151,7 @@ struct HTMLDocument { ConnectionPoint cp_propnotif; struct list selection_list; + struct list range_list; HTMLDOMNode *nodes; }; @@ -404,11 +405,12 @@ void set_document_bscallback(HTMLDocument*,BSCallback*); void set_current_mon(HTMLDocument*,IMoniker*); IHTMLSelectionObject *HTMLSelectionObject_Create(HTMLDocument*,nsISelection*); -IHTMLTxtRange *HTMLTxtRange_Create(nsIDOMRange*); +IHTMLTxtRange *HTMLTxtRange_Create(HTMLDocument*,nsIDOMRange*); IHTMLStyle *HTMLStyle_Create(nsIDOMCSSStyleDeclaration*); IHTMLStyleSheet *HTMLStyleSheet_Create(void); void detach_selection(HTMLDocument*); +void detach_ranges(HTMLDocument*); void HTMLElement_Create(HTMLDOMNode*); void HTMLBodyElement_Create(HTMLElement*); diff --git a/dlls/mshtml/selection.c b/dlls/mshtml/selection.c index 1ee3b97..4139d3b 100644 --- a/dlls/mshtml/selection.c +++ b/dlls/mshtml/selection.c @@ -161,7 +161,7 @@ static HRESULT WINAPI HTMLSelectionObject_createRange(IHTMLSelectionObject *ifac ERR("GetRangeAt failed: %08x\n", nsres); } - *range = (IDispatch*)HTMLTxtRange_Create(nsrange); + *range = (IDispatch*)HTMLTxtRange_Create(This->doc, nsrange); return S_OK; } diff --git a/dlls/mshtml/txtrange.c b/dlls/mshtml/txtrange.c index ae90e81..70791a3 100644 --- a/dlls/mshtml/txtrange.c +++ b/dlls/mshtml/txtrange.c @@ -42,6 +42,9 @@ typedef struct { LONG ref; nsIDOMRange *nsrange; + HTMLDocument *doc; + + struct list entry; } HTMLTxtRange; #define HTMLTXTRANGE(x) ((IHTMLTxtRange*) &(x)->lpHTMLTxtRangeVtbl) @@ -94,6 +97,8 @@ static ULONG WINAPI HTMLTxtRange_Release(IHTMLTxtRange *iface) if(!ref) { if(This->nsrange) nsISelection_Release(This->nsrange); + if(This->doc) + list_remove(&This->entry); mshtml_free(This); } @@ -229,7 +234,7 @@ static HRESULT WINAPI HTMLTxtRange_duplicate(IHTMLTxtRange *iface, IHTMLTxtRange TRACE("(%p)->(%p)\n", This, Duplicate); nsIDOMRange_CloneRange(This->nsrange, &nsrange); - *Duplicate = HTMLTxtRange_Create(nsrange); + *Duplicate = HTMLTxtRange_Create(This->doc, nsrange); nsIDOMRange_Release(nsrange); return S_OK; @@ -472,7 +477,7 @@ static const IHTMLTxtRangeVtbl HTMLTxtRangeVtbl = { HTMLTxtRange_execCommandShowHelp }; -IHTMLTxtRange *HTMLTxtRange_Create(nsIDOMRange *nsrange) +IHTMLTxtRange *HTMLTxtRange_Create(HTMLDocument *doc, nsIDOMRange *nsrange) { HTMLTxtRange *ret = mshtml_alloc(sizeof(HTMLTxtRange)); @@ -483,5 +488,17 @@ IHTMLTxtRange *HTMLTxtRange_Create(nsIDOMRange *nsrange) nsIDOMRange_AddRef(nsrange); ret->nsrange = nsrange; + ret->doc = doc; + list_add_head(&doc->range_list, &ret->entry); + return HTMLTXTRANGE(ret); } + +void detach_ranges(HTMLDocument *This) +{ + HTMLTxtRange *iter; + + LIST_FOR_EACH_ENTRY(iter, &This->range_list, HTMLTxtRange, entry) { + iter->doc = NULL; + } +}

1 0

Roderick Colenbrander : wined3d: Dynamically load WGL functions.
by Alexandre Julliard Aug. 17, 2007

Aug. 17, 2007

Module: wine Branch: master Commit: 9ca3a2248705c46a8f2371d446caa73b2b0d3352 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ca3a2248705c46a8f2371d44… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Thu Aug 16 15:04:47 2007 +0200 wined3d: Dynamically load WGL functions. --- dlls/wined3d/context.c | 22 +++++++++--------- dlls/wined3d/directx.c | 53 ++++++++++++++++++++++----------------------- include/wine/wined3d_gl.h | 18 +++++++++++++++ 3 files changed, 55 insertions(+), 38 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 0727aee..2507835 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -266,8 +266,8 @@ WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *tar } } - ctx = wglCreateContext(hdc); - if(This->numContexts) wglShareLists(This->contexts[0]->glCtx, ctx); + ctx = pwglCreateContext(hdc); + if(This->numContexts) pwglShareLists(This->contexts[0]->glCtx, ctx); if(!ctx) { ERR("Failed to create a WGL context\n"); @@ -280,7 +280,7 @@ WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *tar ret = AddContextToArray(This, win_handle, hdc, ctx, pbuffer); if(!ret) { ERR("Failed to add the newly created context to the context list\n"); - wglDeleteContext(ctx); + pwglDeleteContext(ctx); if(create_pbuffer) { GL_EXTCALL(wglReleasePbufferDCARB(pbuffer, hdc)); GL_EXTCALL(wglDestroyPbufferARB(pbuffer)); @@ -294,9 +294,9 @@ WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *tar TRACE("Successfully created new context %p\n", ret); /* Set up the context defaults */ - oldCtx = wglGetCurrentContext(); - oldDrawable = wglGetCurrentDC(); - if(wglMakeCurrent(hdc, ctx) == FALSE) { + oldCtx = pwglGetCurrentContext(); + oldDrawable = pwglGetCurrentDC(); + if(pwglMakeCurrent(hdc, ctx) == FALSE) { ERR("Cannot activate context to set up defaults\n"); goto out; } @@ -368,7 +368,7 @@ WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *tar } if(oldDrawable && oldCtx) { - wglMakeCurrent(oldDrawable, oldCtx); + pwglMakeCurrent(oldDrawable, oldCtx); } out: @@ -430,15 +430,15 @@ void DestroyContext(IWineD3DDeviceImpl *This, WineD3DContext *context) { /* check that we are the current context first */ TRACE("Destroying ctx %p\n", context); - if(wglGetCurrentContext() == context->glCtx){ - wglMakeCurrent(NULL, NULL); + if(pwglGetCurrentContext() == context->glCtx){ + pwglMakeCurrent(NULL, NULL); } if(context->isPBuffer) { GL_EXTCALL(wglReleasePbufferDCARB(context->pbuffer, context->hdc)); GL_EXTCALL(wglDestroyPbufferARB(context->pbuffer)); } else ReleaseDC(context->win_handle, context->hdc); - wglDeleteContext(context->glCtx); + pwglDeleteContext(context->glCtx); RemoveContextFromArray(This, context); } @@ -831,7 +831,7 @@ void ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, ContextU BOOL ret; TRACE("Switching gl ctx to %p, hdc=%p ctx=%p\n", context, context->hdc, context->glCtx); LEAVE_GL(); - ret = wglMakeCurrent(context->hdc, context->glCtx); + ret = pwglMakeCurrent(context->hdc, context->glCtx); ENTER_GL(); if(ret == FALSE) { ERR("Failed to activate the new context\n"); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index b294004..e9b2aca 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -168,14 +168,14 @@ static void WineD3D_ReleaseFakeGLContext(void) { return; } - glCtx = wglGetCurrentContext(); + glCtx = pwglGetCurrentContext(); TRACE_(d3d_caps)("decrementing ref from %i\n", wined3d_fake_gl_context_ref); if (0 == (--wined3d_fake_gl_context_ref) ) { if(!wined3d_fake_gl_context_foreign && glCtx) { TRACE_(d3d_caps)("destroying fake GL context\n"); - wglMakeCurrent(NULL, NULL); - wglDeleteContext(glCtx); + pwglMakeCurrent(NULL, NULL); + pwglDeleteContext(glCtx); } if(wined3d_fake_gl_context_hdc) ReleaseDC(wined3d_fake_gl_context_hwnd, wined3d_fake_gl_context_hdc); @@ -203,7 +203,7 @@ static BOOL WineD3D_CreateFakeGLContext(void) { wined3d_fake_gl_context_foreign = TRUE; - glCtx = wglGetCurrentContext(); + glCtx = pwglGetCurrentContext(); if (!glCtx) { PIXELFORMATDESCRIPTOR pfd; int iPixelFormat; @@ -241,14 +241,14 @@ static BOOL WineD3D_CreateFakeGLContext(void) { SetPixelFormat(wined3d_fake_gl_context_hdc, iPixelFormat, &pfd); /* Create a GL context */ - glCtx = wglCreateContext(wined3d_fake_gl_context_hdc); + glCtx = pwglCreateContext(wined3d_fake_gl_context_hdc); if (!glCtx) { WARN_(d3d_caps)("Error creating default context for capabilities initialization\n"); goto fail; } /* Make it the current GL context */ - if (!wglMakeCurrent(wined3d_fake_gl_context_hdc, glCtx)) { + if (!pwglMakeCurrent(wined3d_fake_gl_context_hdc, glCtx)) { WARN_(d3d_caps)("Error setting default context as current for capabilities initialization\n"); goto fail; } @@ -267,7 +267,7 @@ static BOOL WineD3D_CreateFakeGLContext(void) { if(wined3d_fake_gl_context_hwnd) DestroyWindow(wined3d_fake_gl_context_hwnd); wined3d_fake_gl_context_hwnd = NULL; - if(glCtx) wglDeleteContext(glCtx); + if(glCtx) pwglDeleteContext(glCtx); LeaveCriticalSection(&wined3d_fake_gl_context_cs); LEAVE_GL(); return FALSE; @@ -404,35 +404,26 @@ BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { int i; HDC hdc; HMODULE mod_gl; - PROC (WINAPI *p_wglGetProcAddress)(LPCSTR lpszProc); - - /* Make sure that we've got a context */ - /* TODO: CreateFakeGLContext should really take a display as a parameter */ - /* Only save the values obtained when a display is provided */ - if (!WineD3D_CreateFakeGLContext() || wined3d_fake_gl_context_foreign) - return_value = FALSE; - - TRACE_(d3d_caps)("(%p)\n", gl_info); #ifdef USE_WIN32_OPENGL -#define USE_GL_FUNC(pfn) pfn = (void*)GetProcAddress(mod_gl, (const char *) #pfn); +#define USE_GL_FUNC(pfn) pfn = (void*)GetProcAddress(mod_gl, #pfn); mod_gl = LoadLibraryA("opengl32.dll"); if(!mod_gl) { ERR("Can't load opengl32.dll!\n"); return FALSE; } #else -#define USE_GL_FUNC(pfn) pfn = (void*)p_wglGetProcAddress( (const char *) #pfn); +#define USE_GL_FUNC(pfn) pfn = (void*)pwglGetProcAddress(#pfn); /* To bypass the opengl32 thunks load wglGetProcAddress from gdi32 (glXGetProcAddress wrapper) instead of opengl32's */ - mod_gl = LoadLibraryA("gdi32.dll"); - if(!mod_gl) { - ERR("Can't load gdi32.dll!\n"); - return FALSE; - } + mod_gl = GetModuleHandleA("gdi32.dll"); #endif - p_wglGetProcAddress = (void*)GetProcAddress(mod_gl, "wglGetProcAddress"); - if(!p_wglGetProcAddress) { +/* Load WGL core functions from opengl32.dll */ +#define USE_WGL_FUNC(pfn) p##pfn = (void*)GetProcAddress(mod_gl, #pfn); + WGL_FUNCS_GEN; +#undef USE_WGL_FUNC + + if(!pwglGetProcAddress) { ERR("Unable to load wglGetProcAddress!\n"); return FALSE; } @@ -441,6 +432,14 @@ BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { GL_FUNCS_GEN; #undef USE_GL_FUNC + /* Make sure that we've got a context */ + /* TODO: CreateFakeGLContext should really take a display as a parameter */ + /* Only save the values obtained when a display is provided */ + if (!WineD3D_CreateFakeGLContext() || wined3d_fake_gl_context_foreign) + return_value = FALSE; + + TRACE_(d3d_caps)("(%p)\n", gl_info); + gl_string = (const char *) glGetString(GL_RENDERER); if (NULL == gl_string) gl_string = "None"; @@ -607,7 +606,7 @@ BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { gl_info->ps_arb_constantsF = 0; /* Now work out what GL support this card really has */ -#define USE_GL_FUNC(type, pfn) gl_info->pfn = (type) p_wglGetProcAddress( (const char *) #pfn); +#define USE_GL_FUNC(type, pfn) gl_info->pfn = (type) pwglGetProcAddress(#pfn); GL_EXT_FUNCS_GEN; WGL_EXT_FUNCS_GEN; #undef USE_GL_FUNC @@ -1009,7 +1008,7 @@ BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { /* TODO: config lookups */ /* Make sure there's an active HDC else the WGL extensions will fail */ - hdc = wglGetCurrentDC(); + hdc = pwglGetCurrentDC(); if (hdc) { WGL_Extensions = GL_EXTCALL(wglGetExtensionsStringARB(hdc)); TRACE_(d3d_caps)("WGL_Extensions reported:\n"); diff --git a/include/wine/wined3d_gl.h b/include/wine/wined3d_gl.h index b381b1c..7348b83 100644 --- a/include/wine/wined3d_gl.h +++ b/include/wine/wined3d_gl.h @@ -1138,6 +1138,15 @@ void (WINE_GLAPI *glVertex4sv) (const GLshort* v); void (WINE_GLAPI *glVertexPointer) (GLint size, GLenum type, GLsizei stride, const GLvoid* pointer); void (WINE_GLAPI *glViewport) (GLint x, GLint y, GLsizei width, GLsizei height); +/* WGL functions */ +HGLRC (WINAPI *pwglCreateContext)(HDC); +BOOL (WINAPI *pwglDeleteContext)(HGLRC); +HGLRC (WINAPI *pwglGetCurrentContext)(void); +HDC (WINAPI *pwglGetCurrentDC)(void); +PROC (WINAPI *pwglGetProcAddress)(LPCSTR); +BOOL (WINAPI *pwglMakeCurrent)(HDC,HGLRC); +BOOL (WINAPI *pwglShareLists)(HGLRC,HGLRC); + #define GL_FUNCS_GEN \ USE_GL_FUNC(glAccum) \ USE_GL_FUNC(glAlphaFunc) \ @@ -1476,6 +1485,15 @@ void (WINE_GLAPI *glViewport) (GLint x, GLint y, GLsizei width, GLsizei height); USE_GL_FUNC(glVertexPointer) \ USE_GL_FUNC(glViewport) +#define WGL_FUNCS_GEN \ + USE_WGL_FUNC(wglCreateContext) \ + USE_WGL_FUNC(wglDeleteContext) \ + USE_WGL_FUNC(wglGetCurrentContext) \ + USE_WGL_FUNC(wglGetCurrentDC) \ + USE_WGL_FUNC(wglGetProcAddress) \ + USE_WGL_FUNC(wglMakeCurrent) \ + USE_WGL_FUNC(wglShareLists) + /**************************************************** * OpenGL Extensions (EXT and ARB)

1 0