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

Hans Leidekker : wbemprox: Implement IWbemServices::CreateInstanceEnum.
by Alexandre Julliard June 26, 2012

June 26, 2012

Module: wine Branch: master Commit: 1bf73ea81d50b363e8798407675025d3cf6148ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bf73ea81d50b363e87984076… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 26 16:02:04 2012 +0200 wbemprox: Implement IWbemServices::CreateInstanceEnum. --- dlls/wbemprox/services.c | 20 +++++++++++++++++--- 1 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/wbemprox/services.c b/dlls/wbemprox/services.c index b4bc8fb..aeca7c8 100644 --- a/dlls/wbemprox/services.c +++ b/dlls/wbemprox/services.c @@ -366,13 +366,27 @@ static HRESULT WINAPI wbem_services_DeleteInstanceAsync( static HRESULT WINAPI wbem_services_CreateInstanceEnum( IWbemServices *iface, - const BSTR strFilter, + const BSTR strClass, LONG lFlags, IWbemContext *pCtx, IEnumWbemClassObject **ppEnum ) { - FIXME("\n"); - return WBEM_E_FAILED; + static const WCHAR selectW[] = {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ',0}; + WCHAR *query; + HRESULT hr; + + TRACE("%p, %s, 0%08x, %p, %p\n", iface, debugstr_w(strClass), lFlags, pCtx, ppEnum); + + if (lFlags) FIXME("unsupported flags 0x%08x\n", lFlags); + + if (!(query = heap_alloc( strlenW( strClass ) * sizeof(WCHAR) + sizeof(selectW) ))) + return E_OUTOFMEMORY; + strcpyW( query, selectW ); + strcatW( query, strClass ); + + hr = exec_query( query, ppEnum ); + heap_free( query ); + return hr; } static HRESULT WINAPI wbem_services_CreateInstanceEnumAsync(

1 0

Henri Verbeet : wined3d: Only unset the onscreen depth / stencil buffer once in wined3d_device_reset().
by Alexandre Julliard June 26, 2012

June 26, 2012

Module: wine Branch: master Commit: 0ee3007963f6b63c265c2e34da49deac65e3d5ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ee3007963f6b63c265c2e34d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 26 15:32:09 2012 +0200 wined3d: Only unset the onscreen depth / stencil buffer once in wined3d_device_reset(). --- dlls/wined3d/device.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ed1ebbd..cae76ff 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5289,12 +5289,6 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, } } - if (device->onscreen_depth_stencil) - { - wined3d_surface_decref(device->onscreen_depth_stencil); - device->onscreen_depth_stencil = NULL; - } - /* Reset the depth stencil */ if (swapchain_desc->enable_auto_depth_stencil) wined3d_device_set_depth_stencil(device, device->auto_depth_stencil);

1 0

Piotr Caban : msvcp90: Added basic_iostream<wchar> class implementation.
by Alexandre Julliard June 26, 2012

June 26, 2012

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

Alexandre Julliard : opengl32: Get rid of the X11 locking.
by Alexandre Julliard June 26, 2012

June 26, 2012

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 June 26, 2012

June 26, 2012

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

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

June 26, 2012

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

Jacek Caban : mshtml: Share nselem reference with nsnode.
by Alexandre Julliard June 26, 2012

June 26, 2012

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: Moved image_factory to HTMLInnerWindow.
by Alexandre Julliard June 26, 2012

June 26, 2012

Module: wine Branch: master Commit: b85631bab675b867a1d3f7c2f0bca6e0a0b8a417 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b85631bab675b867a1d3f7c2f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 26 12:32:27 2012 +0200 mshtml: Moved image_factory to HTMLInnerWindow. --- dlls/mshtml/htmlimg.c | 7 +++++-- dlls/mshtml/htmlwindow.c | 21 +++++++++++++-------- dlls/mshtml/mshtml_private.h | 6 +++--- 3 files changed, 21 insertions(+), 13 deletions(-) diff --git a/dlls/mshtml/htmlimg.c b/dlls/mshtml/htmlimg.c index 300218b..adb40d5 100644 --- a/dlls/mshtml/htmlimg.c +++ b/dlls/mshtml/htmlimg.c @@ -920,11 +920,13 @@ static dispex_static_data_t HTMLImageElementFactory_dispex = { HTMLImageElementFactory_iface_tids }; -HTMLImageElementFactory *HTMLImageElementFactory_Create(HTMLOuterWindow *window) +HRESULT HTMLImageElementFactory_Create(HTMLInnerWindow *window, HTMLImageElementFactory **ret_val) { HTMLImageElementFactory *ret; ret = heap_alloc(sizeof(HTMLImageElementFactory)); + if(!ret) + return E_OUTOFMEMORY; ret->IHTMLImageElementFactory_iface.lpVtbl = &HTMLImageElementFactoryVtbl; ret->ref = 1; @@ -933,5 +935,6 @@ HTMLImageElementFactory *HTMLImageElementFactory_Create(HTMLOuterWindow *window) init_dispex(&ret->dispex, (IUnknown*)&ret->IHTMLImageElementFactory_iface, &HTMLImageElementFactory_dispex); - return ret; + *ret_val = ret; + return S_OK; } diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index dc6d9af..5852a26 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -192,11 +192,6 @@ static void release_outer_window(HTMLOuterWindow *This) if(This->frame_element) This->frame_element->content_window = NULL; - if(This->image_factory) { - This->image_factory->window = NULL; - IHTMLImageElementFactory_Release(&This->image_factory->IHTMLImageElementFactory_iface); - } - if(This->location) { This->location->window = NULL; IHTMLLocation_Release(&This->location->IHTMLLocation_iface); @@ -228,6 +223,11 @@ static void release_inner_window(HTMLInnerWindow *This) heap_free(This->global_props[i].name); heap_free(This->global_props); + if(This->image_factory) { + This->image_factory->window = NULL; + IHTMLImageElementFactory_Release(&This->image_factory->IHTMLImageElementFactory_iface); + } + if(This->option_factory) { This->option_factory->window = NULL; IHTMLOptionElementFactory_Release(&This->option_factory->IHTMLOptionElementFactory_iface); @@ -647,12 +647,17 @@ static HRESULT WINAPI HTMLWindow2_prompt(IHTMLWindow2 *iface, BSTR message, static HRESULT WINAPI HTMLWindow2_get_Image(IHTMLWindow2 *iface, IHTMLImageElementFactory **p) { HTMLWindow *This = impl_from_IHTMLWindow2(iface); - HTMLOuterWindow *window = This->outer_window; + HTMLInnerWindow *window = This->inner_window; TRACE("(%p)->(%p)\n", This, p); - if(!window->image_factory) - window->image_factory = HTMLImageElementFactory_Create(window); + if(!window->image_factory) { + HRESULT hres; + + hres = HTMLImageElementFactory_Create(window, &window->image_factory); + if(FAILED(hres)) + return hres; + } *p = &window->image_factory->IHTMLImageElementFactory_iface; IHTMLImageElementFactory_AddRef(*p); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 31532cd..d9f0639 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -278,7 +278,7 @@ typedef struct { LONG ref; - HTMLOuterWindow *window; + HTMLInnerWindow *window; } HTMLImageElementFactory; struct HTMLLocation { @@ -335,7 +335,6 @@ struct HTMLOuterWindow { IInternetSecurityManager *secmgr; - HTMLImageElementFactory *image_factory; HTMLLocation *location; IHTMLScreen *screen; IOmHistory *history; @@ -355,6 +354,7 @@ struct HTMLInnerWindow { IHTMLEventObj *event; + HTMLImageElementFactory *image_factory; HTMLOptionElementFactory *option_factory; global_prop_t *global_props; @@ -663,7 +663,7 @@ HRESULT update_window_doc(HTMLOuterWindow*) DECLSPEC_HIDDEN; HTMLOuterWindow *nswindow_to_window(const nsIDOMWindow*) DECLSPEC_HIDDEN; void get_top_window(HTMLOuterWindow*,HTMLOuterWindow**) DECLSPEC_HIDDEN; HRESULT HTMLOptionElementFactory_Create(HTMLInnerWindow*,HTMLOptionElementFactory**) DECLSPEC_HIDDEN; -HTMLImageElementFactory *HTMLImageElementFactory_Create(HTMLOuterWindow*) DECLSPEC_HIDDEN; +HRESULT HTMLImageElementFactory_Create(HTMLInnerWindow*,HTMLImageElementFactory**) DECLSPEC_HIDDEN; HRESULT HTMLLocation_Create(HTMLOuterWindow*,HTMLLocation**) DECLSPEC_HIDDEN; IOmNavigator *OmNavigator_Create(void) DECLSPEC_HIDDEN; HRESULT HTMLScreen_Create(IHTMLScreen**) DECLSPEC_HIDDEN;

1 0

Francois Gouget : msvcp90: Make numpunct_char_use_facet() static.
by Alexandre Julliard June 26, 2012

June 26, 2012

Module: wine Branch: master Commit: 98748efbf5cf57272dc469ad678fc46625392747 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98748efbf5cf57272dc469ad6… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jun 26 12:32:56 2012 +0200 msvcp90: Make numpunct_char_use_facet() static. --- dlls/msvcp90/locale.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 01fb1a6..2c16147 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -3445,7 +3445,7 @@ MSVCP_size_t __cdecl numpunct_char__Getcat(const locale_facet **facet, const loc return LC_NUMERIC; } -numpunct_char* numpunct_char_use_facet(const locale *loc) +static numpunct_char* numpunct_char_use_facet(const locale *loc) { static numpunct_char *obj = NULL;

1 0

Francois Gouget : jscript: Make int_to_bstr() static.
by Alexandre Julliard June 26, 2012

June 26, 2012

Module: wine Branch: master Commit: b7f74922a48b285358301da7477cca73a33042d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7f74922a48b285358301da74… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jun 26 12:33:28 2012 +0200 jscript: Make int_to_bstr() static. --- dlls/jscript/jscript.h | 1 - dlls/jscript/jsutils.c | 2 +- 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 4662afa..11b6ec9 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -266,7 +266,6 @@ HRESULT variant_change_type(script_ctx_t*,VARIANT*,VARIANT*,VARTYPE) DECLSPEC_HI HRESULT decode_source(WCHAR*) DECLSPEC_HIDDEN; -BSTR int_to_bstr(int) DECLSPEC_HIDDEN; HRESULT double_to_bstr(double,BSTR*) DECLSPEC_HIDDEN; typedef struct named_item_t { diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 0e8e304..9f5eb58 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -517,7 +517,7 @@ HRESULT to_uint32(script_ctx_t *ctx, VARIANT *v, jsexcept_t *ei, DWORD *ret) return S_OK; } -BSTR int_to_bstr(int i) +static BSTR int_to_bstr(int i) { WCHAR buf[12], *p; BOOL neg = FALSE;

1 0