June 2012 - Wine-commits - list.winehq.org

Jacek Caban : mshtml: Call HTMLDOMNode_Init directly in HTMLCommentElement_Create.
by Alexandre Julliard 26 Jun '12

26 Jun '12

Module: wine Branch: master Commit: 8c396ed437eb907a2251d5120e50243f3e6c72de URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c396ed437eb907a2251d5120… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 26 12:34:21 2012 +0200 mshtml: Call HTMLDOMNode_Init directly in HTMLCommentElement_Create. --- dlls/mshtml/htmlcomment.c | 4 +--- dlls/mshtml/htmlelem.c | 3 ++- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlcomment.c b/dlls/mshtml/htmlcomment.c index 525f0db..d552b30 100644 --- a/dlls/mshtml/htmlcomment.c +++ b/dlls/mshtml/htmlcomment.c @@ -200,9 +200,7 @@ HRESULT HTMLCommentElement_Create(HTMLDocumentNode *doc, nsIDOMNode *nsnode, HTM ret->IHTMLCommentElement_iface.lpVtbl = &HTMLCommentElementVtbl; HTMLElement_Init(&ret->element, doc, NULL, &HTMLCommentElement_dispex); - - nsIDOMNode_AddRef(nsnode); - ret->element.node.nsnode = nsnode; + HTMLDOMNode_Init(doc, &ret->element.node, nsnode); *elem = &ret->element; return S_OK; diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 10d5108..7ab1856 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1776,7 +1776,8 @@ void HTMLElement_Init(HTMLElement *This, HTMLDocumentNode *doc, nsIDOMHTMLElemen nsIDOMHTMLElement_AddRef(nselem); This->nselem = nselem; - HTMLDOMNode_Init(doc, &This->node, (nsIDOMNode*)nselem); + if(nselem) + HTMLDOMNode_Init(doc, &This->node, (nsIDOMNode*)nselem); ConnectionPointContainer_Init(&This->cp_container, (IUnknown*)&This->IHTMLElement_iface); }

1 0

Jacek Caban : mshtml: Share nselem reference with nsnode.
by Alexandre Julliard 26 Jun '12

26 Jun '12

Module: wine Branch: master Commit: f878c9983d5b875ede709a5015ded368ccb653b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f878c9983d5b875ede709a501… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 26 12:34:36 2012 +0200 mshtml: Share nselem reference with nsnode. --- dlls/mshtml/htmlelem.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 7ab1856..5f59385 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -16,8 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - #include <stdarg.h> +#include <assert.h> #define COBJMACROS @@ -1772,13 +1772,14 @@ void HTMLElement_Init(HTMLElement *This, HTMLDocumentNode *doc, nsIDOMHTMLElemen init_dispex(&This->node.dispex, (IUnknown*)&This->IHTMLElement_iface, dispex_data ? dispex_data : &HTMLElement_dispex); - if(nselem) - nsIDOMHTMLElement_AddRef(nselem); - This->nselem = nselem; - - if(nselem) + if(nselem) { HTMLDOMNode_Init(doc, &This->node, (nsIDOMNode*)nselem); + /* No AddRef, share reference with HTMLDOMNode */ + assert((nsIDOMNode*)nselem == This->node.nsnode); + This->nselem = nselem; + } + ConnectionPointContainer_Init(&This->cp_container, (IUnknown*)&This->IHTMLElement_iface); }

1 0

Jacek Caban : mshtml: Share nsanchor reference with nsnode.
by Alexandre Julliard 26 Jun '12

26 Jun '12

Module: wine Branch: master Commit: a384fbee2040df3d5ca25aaf10940d48d4d4163f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a384fbee2040df3d5ca25aaf1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 26 12:34:48 2012 +0200 mshtml: Share nsanchor reference with nsnode. --- dlls/mshtml/htmlanchor.c | 23 ++++++----------------- 1 files changed, 6 insertions(+), 17 deletions(-) diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index cf289cd..6e0fc71 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -615,16 +615,6 @@ static HRESULT HTMLAnchorElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) return HTMLElement_QI(&This->element.node, riid, ppv); } -static void HTMLAnchorElement_destructor(HTMLDOMNode *iface) -{ - HTMLAnchorElement *This = impl_from_HTMLDOMNode(iface); - - if(This->nsanchor) - nsIDOMHTMLAnchorElement_Release(This->nsanchor); - - HTMLElement_destructor(&This->element.node); -} - static HRESULT HTMLAnchorElement_handle_event(HTMLDOMNode *iface, eventid_t eid, nsIDOMEvent *event, BOOL *prevent_default) { HTMLAnchorElement *This = impl_from_HTMLDOMNode(iface); @@ -662,7 +652,7 @@ static HRESULT HTMLAnchorElement_handle_event(HTMLDOMNode *iface, eventid_t eid, static const NodeImplVtbl HTMLAnchorElementImplVtbl = { HTMLAnchorElement_QI, - HTMLAnchorElement_destructor, + HTMLElement_destructor, HTMLElement_clone, HTMLElement_get_attr_col, NULL, @@ -697,14 +687,13 @@ HRESULT HTMLAnchorElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nsele ret->IHTMLAnchorElement_iface.lpVtbl = &HTMLAnchorElementVtbl; ret->element.node.vtbl = &HTMLAnchorElementImplVtbl; + HTMLElement_Init(&ret->element, doc, nselem, &HTMLAnchorElement_dispex); + nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLAnchorElement, (void**)&ret->nsanchor); - if(NS_FAILED(nsres)) { - ERR("Could not get nsIDOMHTMLAnchorElement iface: %08x\n", nsres); - heap_free(ret); - return E_FAIL; - } - HTMLElement_Init(&ret->element, doc, nselem, &HTMLAnchorElement_dispex); + /* Shere the reference with nsnode */ + assert(nsres == NS_OK && (nsIDOMNode*)ret->nsanchor == ret->element.node.nsnode); + nsIDOMNode_Release(ret->element.node.nsnode); *elem = &ret->element; return S_OK;

1 0

Alexandre Julliard : opengl32: Add a helper function to correctly compare extension strings.
by Alexandre Julliard 26 Jun '12

26 Jun '12

Module: wine Branch: master Commit: b349aa676facb465c127ad33623c06038b4f666b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b349aa676facb465c127ad336… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 26 16:12:06 2012 +0200 opengl32: Add a helper function to correctly compare extension strings. --- dlls/opengl32/wgl.c | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index eca42e2..6d94716 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -393,6 +393,20 @@ int WINAPI wglGetLayerPaletteEntries(HDC hdc, return 0; } +/* check if the extension is present in the list */ +static BOOL has_extension( const char *list, const char *ext ) +{ + size_t len = strlen( ext ); + + while (list) + { + while (*list == ' ') list++; + if (!strncmp( list, ext, len ) && (!list[len] || list[len] == ' ')) return TRUE; + list = strchr( list, ' ' ); + } + return FALSE; +} + static int compar(const void *elt_a, const void *elt_b) { return strcmp(((const OpenGL_extension *) elt_a)->name, ((const OpenGL_extension *) elt_b)->name); @@ -417,7 +431,7 @@ static BOOL is_extension_supported(const char* extension) * if the OpenGL extension required for the function we are looking up is supported. */ /* Check if the extension is part of the GL extension string to see if it is supported. */ - if(strstr(gl_ext_string, extension) != NULL) + if (has_extension(gl_ext_string, extension)) return TRUE; /* In general an OpenGL function starts as an ARB/EXT extension and at some stage @@ -1028,7 +1042,7 @@ const GLubyte * WINAPI wine_glGetString( GLenum name ) TRACE("- %s:", ThisExtn); /* test if supported API is disabled by config */ - if (!internal_gl_disabled_extensions || !strstr(internal_gl_disabled_extensions, ThisExtn)) { + if (!has_extension(internal_gl_disabled_extensions, ThisExtn)) { strcat(internal_gl_extensions, " "); strcat(internal_gl_extensions, ThisExtn); TRACE(" active\n");

1 0

Alexandre Julliard : opengl32: Add a helper function to build the extension list, and do it only when requested.
by Alexandre Julliard 26 Jun '12

26 Jun '12

Module: wine Branch: master Commit: 370a8c10d239375c737d59cf15c96079f1115ec1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=370a8c10d239375c737d59cf1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 26 16:49:43 2012 +0200 opengl32: Add a helper function to build the extension list, and do it only when requested. --- dlls/opengl32/wgl.c | 99 ++++++++++++++++++++++++++------------------------- 1 files changed, 50 insertions(+), 49 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 6d94716..f3b4405 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -82,9 +82,6 @@ void (*wine_tsx11_unlock_ptr)(void) = NULL; static HMODULE opengl32_handle; static void* libglu_handle = NULL; -static char* internal_gl_disabled_extensions = NULL; -static char* internal_gl_extensions = NULL; - const GLubyte * WINAPI wine_glGetString( GLenum name ); /* internal GDI functions */ @@ -1000,11 +997,58 @@ void WINAPI wine_glFlush( void ) wine_wgl.p_wglFlush(); } +/* build the extension string by filtering out the disabled extensions */ +static char *build_gl_extensions( const char *extensions ) +{ + char *p, *str, *disabled = NULL; + const char *end; + HKEY hkey; + + TRACE( "GL_EXTENSIONS:\n" ); + + if (!extensions) extensions = ""; + + /* @@ Wine registry key: HKCU\Software\Wine\OpenGL */ + if (!RegOpenKeyA( HKEY_CURRENT_USER, "Software\\Wine\\OpenGL", &hkey )) + { + DWORD size, ret = RegQueryValueExA( hkey, "DisabledExtensions", 0, NULL, NULL, &size ); + if (!ret && (disabled = HeapAlloc( GetProcessHeap(), 0, size ))) + ret = RegQueryValueExA( hkey, "DisabledExtensions", 0, NULL, (BYTE *)disabled, &size ); + RegCloseKey( hkey ); + if (ret) *disabled = 0; + } + + if ((str = HeapAlloc( GetProcessHeap(), 0, strlen(extensions) + 2 ))) + { + p = str; + for (;;) + { + while (*extensions == ' ') extensions++; + if (!*extensions) break; + if (!(end = strchr( extensions, ' ' ))) end = extensions + strlen( extensions ); + memcpy( p, extensions, end - extensions ); + p[end - extensions] = 0; + if (!has_extension( disabled, p )) + { + TRACE("++ %s\n", p ); + p += end - extensions; + *p++ = ' '; + } + else TRACE("-- %s (disabled by config)\n", p ); + extensions = end; + } + *p = 0; + } + HeapFree( GetProcessHeap(), 0, disabled ); + return str; +} + /*********************************************************************** * glGetString (OPENGL32.@) */ const GLubyte * WINAPI wine_glGetString( GLenum name ) { + static const char *gl_extensions; const GLubyte *ret; const char* GL_Extensions = NULL; @@ -1020,42 +1064,13 @@ const GLubyte * WINAPI wine_glGetString( GLenum name ) return ret; } - if (NULL == internal_gl_extensions) { + if (!gl_extensions) { ENTER_GL(); GL_Extensions = (const char *) glGetString(GL_EXTENSIONS); - - if (GL_Extensions) - { - size_t len = strlen(GL_Extensions); - internal_gl_extensions = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len + 2); - - TRACE("GL_EXTENSIONS reported:\n"); - while (*GL_Extensions != 0x00) { - const char* Start = GL_Extensions; - char ThisExtn[256]; - - while (*GL_Extensions != ' ' && *GL_Extensions != 0x00) { - GL_Extensions++; - } - memcpy(ThisExtn, Start, (GL_Extensions - Start)); - ThisExtn[GL_Extensions - Start] = 0; - TRACE("- %s:", ThisExtn); - - /* test if supported API is disabled by config */ - if (!has_extension(internal_gl_disabled_extensions, ThisExtn)) { - strcat(internal_gl_extensions, " "); - strcat(internal_gl_extensions, ThisExtn); - TRACE(" active\n"); - } else { - TRACE(" deactived (by config)\n"); - } - - if (*GL_Extensions == ' ') GL_Extensions++; - } - } + gl_extensions = build_gl_extensions( GL_Extensions ); LEAVE_GL(); } - return (const GLubyte *) internal_gl_extensions; + return (const GLubyte *)gl_extensions; } /*********************************************************************** @@ -1079,8 +1094,6 @@ BOOL WINAPI DECLSPEC_HOTPATCH wglSwapBuffers( HDC hdc ) static BOOL process_attach(void) { HMODULE mod_x11, mod_gdi32; - DWORD size; - HKEY hkey = 0; GetDesktopWindow(); /* make sure winex11 is loaded (FIXME) */ mod_x11 = GetModuleHandleA( "winex11.drv" ); @@ -1109,16 +1122,6 @@ static BOOL process_attach(void) wine_wgl.p_wglGetCurrentDC = (void *)wine_wgl.p_wglGetProcAddress("wglGetCurrentDC"); wine_wgl.p_wglGetIntegerv = (void *)wine_wgl.p_wglGetProcAddress("wglGetIntegerv"); wine_wgl.p_wglShareLists = (void *)wine_wgl.p_wglGetProcAddress("wglShareLists"); - - if (!RegOpenKeyA( HKEY_CURRENT_USER, "Software\\Wine\\OpenGL", &hkey)) { - if (!RegQueryValueExA( hkey, "DisabledExtensions", 0, NULL, NULL, &size)) { - internal_gl_disabled_extensions = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); - RegQueryValueExA( hkey, "DisabledExtensions", 0, NULL, (LPBYTE)internal_gl_disabled_extensions, &size); - TRACE("found DisabledExtensions=%s\n", debugstr_a(internal_gl_disabled_extensions)); - } - RegCloseKey(hkey); - } - return TRUE; } @@ -1128,8 +1131,6 @@ static BOOL process_attach(void) static void process_detach(void) { if (libglu_handle) wine_dlclose(libglu_handle, NULL, 0); - HeapFree(GetProcessHeap(), 0, internal_gl_extensions); - HeapFree(GetProcessHeap(), 0, internal_gl_disabled_extensions); } /***********************************************************************

1 0

Alexandre Julliard : opengl32: Generate an entry point for glDebugEntry.
by Alexandre Julliard 26 Jun '12

26 Jun '12

Module: wine Branch: master Commit: b6a7a3fe238f45895bfb1190d3bd18f590dabcdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6a7a3fe238f45895bfb1190d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 26 15:15:36 2012 +0200 opengl32: Generate an entry point for glDebugEntry. --- dlls/opengl32/make_opengl | 4 +++- dlls/opengl32/opengl32.spec | 2 +- dlls/opengl32/wgl.c | 8 ++++++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index 09f38cb..f31f921 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -235,6 +235,7 @@ sub GenerateThunk($$$$$) my $trace_call_arg = ""; my $trace_arg = ""; + return "" if $func_ref->[0] eq "glDebugEntry"; return "" if $func_ref->[0] eq "glGetString"; return "" if $func_ref->[0] eq "glGetIntegerv"; return "" if $func_ref->[0] eq "glFinish"; @@ -409,7 +410,8 @@ $pseudo_to_opengl{"UInt64EXT"} = "UINT64"; # [ "GLfloat", "ymove" ], # [ "GLubyte *", "bitmap"] ] ]; # -my %norm_functions = (); +my %norm_functions = ( "glDebugEntry" => [ "glDebugEntry", "GLint", [[ "GLint", "unknown1" ], + [ "GLint", "unknown2" ]] ] ); # # This stores various extensions NOT part of the GL extension registry but still diff --git a/dlls/opengl32/opengl32.spec b/dlls/opengl32/opengl32.spec index b0853a9..6ada793 100644 --- a/dlls/opengl32/opengl32.spec +++ b/dlls/opengl32/opengl32.spec @@ -56,7 +56,7 @@ @ stdcall glCopyTexSubImage1D( long long long long long long ) wine_glCopyTexSubImage1D @ stdcall glCopyTexSubImage2D( long long long long long long long long ) wine_glCopyTexSubImage2D @ stdcall glCullFace( long ) wine_glCullFace -@ stub glDebugEntry +@ stdcall glDebugEntry( long long ) wine_glDebugEntry @ stdcall glDeleteLists( long long ) wine_glDeleteLists @ stdcall glDeleteTextures( long ptr ) wine_glDeleteTextures @ stdcall glDepthFunc( long ) wine_glDepthFunc diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index f3b4405..5a8df35 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -980,6 +980,14 @@ BOOL WINAPI wglUseFontOutlinesW(HDC hdc, } /*********************************************************************** + * glDebugEntry (OPENGL32.@) + */ +GLint WINAPI wine_glDebugEntry( GLint unknown1, GLint unknown2 ) +{ + return 0; +} + +/*********************************************************************** * glFinish (OPENGL32.@) */ void WINAPI wine_glFinish( void )

1 0

Alexandre Julliard : opengl32: Get rid of the X11 locking.
by Alexandre Julliard 26 Jun '12

26 Jun '12

Module: wine Branch: master Commit: 312dd5297b7edfaab059ac2a75d61a5d1ec73664 URL: http://source.winehq.org/git/wine.git/?a=commit;h=312dd5297b7edfaab059ac2a7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 26 15:23:05 2012 +0200 opengl32: Get rid of the X11 locking. --- dlls/opengl32/make_opengl | 31 +- dlls/opengl32/opengl_ext.c | 4568 ++----------------------------------------- dlls/opengl32/opengl_ext.h | 9 - dlls/opengl32/opengl_norm.c | 692 +------- dlls/opengl32/wgl.c | 57 +- 5 files changed, 150 insertions(+), 5207 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=312dd5297b7edfaab059a…

1 0

Piotr Caban : msvcp90: Added basic_istream<wchar> implementation.
by Alexandre Julliard 26 Jun '12

26 Jun '12

Module: wine Branch: master Commit: 07ccbb6351dd163e9d232cc32bea531b0b17d47e URL: http://source.winehq.org/git/wine.git/?a=commit;h=07ccbb6351dd163e9d232cc32… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 26 14:34:26 2012 +0200 msvcp90: Added basic_istream<wchar> implementation. --- dlls/msvcp90/ios.c | 1047 ++++++++++++++++++++++++++++++++++++++++++++- dlls/msvcp90/locale.c | 26 ++ dlls/msvcp90/msvcp90.h | 27 ++ dlls/msvcp90/msvcp90.spec | 184 ++++---- 4 files changed, 1191 insertions(+), 93 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=07ccbb6351dd163e9d232…

1 0

Piotr Caban : msvcp90: Added basic_iostream<wchar> class implementation.
by Alexandre Julliard 26 Jun '12

26 Jun '12

Module: wine Branch: master Commit: 6ad43ea61f9981c7da597957582b4d5b0c3e2aef URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ad43ea61f9981c7da5979575… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 26 14:34:49 2012 +0200 msvcp90: Added basic_iostream<wchar> class implementation. --- dlls/msvcp90/ios.c | 90 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 18 ++++---- 2 files changed, 99 insertions(+), 9 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6ad43ea61f9981c7da597…

1 0

Vincent Povirk : gdiplus: Remove FIXME from GdipAddPathString.
by Alexandre Julliard 26 Jun '12

26 Jun '12

Module: wine Branch: master Commit: 697dd42ed2c66a9d77065f2c42cece76a69ba2c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=697dd42ed2c66a9d77065f2c4… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Jun 25 10:40:36 2012 -0500 gdiplus: Remove FIXME from GdipAddPathString. --- dlls/gdiplus/graphicspath.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 471f915..370bb1f 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -953,7 +953,7 @@ GpStatus WINGDIPAPI GdipAddPathString(GpPath* path, GDIPCONST WCHAR* string, INT RectF scaled_layout_rect; TEXTMETRICW textmetric; - FIXME("(%p, %s, %d, %p, %d, %f, %p, %p): stub\n", path, debugstr_w(string), length, family, style, emSize, layoutRect, format); + TRACE("(%p, %s, %d, %p, %d, %f, %p, %p)\n", path, debugstr_w(string), length, family, style, emSize, layoutRect, format); if (!path || !string || !family || !emSize || !layoutRect || !format) return InvalidParameter;

1 0