January 2015 - Wine-commits

Hans Leidekker : wbemdisp: Add IDispatch support to the services object.
by Alexandre Julliard 08 Jan '15

08 Jan '15

Module: wine Branch: master Commit: cbb2b35ec1e0ef31ca843fed7cfb00a98d8620a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbb2b35ec1e0ef31ca843fed7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 8 13:52:19 2015 +0100 wbemdisp: Add IDispatch support to the services object. --- dlls/wbemdisp/locator.c | 146 +++++++++++++++++++++++++++++------------------- 1 file changed, 90 insertions(+), 56 deletions(-) diff --git a/dlls/wbemdisp/locator.c b/dlls/wbemdisp/locator.c index c7c31ef..5740dcd 100644 --- a/dlls/wbemdisp/locator.c +++ b/dlls/wbemdisp/locator.c @@ -32,6 +32,57 @@ WINE_DEFAULT_DEBUG_CHANNEL(wbemdisp); +enum type_id +{ + ISWbemLocator_tid, + ISWbemServices_tid, + last_tid +}; + +static ITypeLib *wbemdisp_typelib; +static ITypeInfo *wbemdisp_typeinfo[last_tid]; + +static REFIID wbemdisp_tid_id[] = +{ + &IID_ISWbemLocator, + &IID_ISWbemServices +}; + +static HRESULT get_typeinfo( enum type_id tid, ITypeInfo **ret ) +{ + HRESULT hr; + + if (!wbemdisp_typelib) + { + ITypeLib *typelib; + + hr = LoadRegTypeLib( &LIBID_WbemScripting, 1, 2, LOCALE_SYSTEM_DEFAULT, &typelib ); + if (FAILED( hr )) + { + ERR( "LoadRegTypeLib failed: %08x\n", hr ); + return hr; + } + if (InterlockedCompareExchangePointer( (void **)&wbemdisp_typelib, typelib, NULL )) + ITypeLib_Release( typelib ); + } + if (!wbemdisp_typeinfo[tid]) + { + ITypeInfo *typeinfo; + + hr = ITypeLib_GetTypeInfoOfGuid( wbemdisp_typelib, wbemdisp_tid_id[tid], &typeinfo ); + if (FAILED( hr )) + { + ERR( "GetTypeInfoOfGuid(%s) failed: %08x\n", debugstr_guid(wbemdisp_tid_id[tid]), hr ); + return hr; + } + if (InterlockedCompareExchangePointer( (void **)(wbemdisp_typeinfo + tid), typeinfo, NULL )) + ITypeInfo_Release( typeinfo ); + } + *ret = wbemdisp_typeinfo[tid]; + ITypeInfo_AddRef( *ret ); + return S_OK; +} + struct services { ISWbemServices ISWbemServices_iface; @@ -92,8 +143,11 @@ static HRESULT WINAPI services_GetTypeInfoCount( ISWbemServices *iface, UINT *count ) { - FIXME( "\n" ); - return E_NOTIMPL; + struct services *services = impl_from_ISWbemServices( iface ); + TRACE( "%p, %p\n", services, count ); + + *count = 1; + return S_OK; } static HRESULT WINAPI services_GetTypeInfo( @@ -102,8 +156,10 @@ static HRESULT WINAPI services_GetTypeInfo( LCID lcid, ITypeInfo **info ) { - FIXME( "\n" ); - return E_NOTIMPL; + struct services *services = impl_from_ISWbemServices( iface ); + TRACE( "%p, %u, %u, %p\n", services, index, lcid, info ); + + return get_typeinfo( ISWbemServices_tid, info ); } static HRESULT WINAPI services_GetIDsOfNames( @@ -114,8 +170,21 @@ static HRESULT WINAPI services_GetIDsOfNames( LCID lcid, DISPID *dispid ) { - FIXME( "\n" ); - return E_NOTIMPL; + struct services *services = impl_from_ISWbemServices( iface ); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE( "%p, %s, %p, %u, %u, %p\n", services, debugstr_guid(riid), names, count, lcid, dispid ); + + if (!names || !count || !dispid) return E_INVALIDARG; + + hr = get_typeinfo( ISWbemServices_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames( typeinfo, names, count, dispid ); + ITypeInfo_Release( typeinfo ); + } + return hr; } static HRESULT WINAPI services_Invoke( @@ -129,8 +198,21 @@ static HRESULT WINAPI services_Invoke( EXCEPINFO *excep_info, UINT *arg_err ) { - FIXME( "\n" ); - return E_NOTIMPL; + struct services *services = impl_from_ISWbemServices( iface ); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", services, member, debugstr_guid(riid), + lcid, flags, params, result, excep_info, arg_err ); + + hr = get_typeinfo( ISWbemServices_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke( typeinfo, &services->ISWbemServices_iface, member, flags, + params, result, excep_info, arg_err ); + ITypeInfo_Release( typeinfo ); + } + return hr; } static HRESULT WINAPI services_Get( @@ -493,54 +575,6 @@ static HRESULT WINAPI locator_GetTypeInfoCount( return S_OK; } -enum type_id -{ - ISWbemLocator_tid, - last_tid -}; - -static ITypeLib *wbemdisp_typelib; -static ITypeInfo *wbemdisp_typeinfo[last_tid]; - -static REFIID wbemdisp_tid_id[] = -{ - &IID_ISWbemLocator -}; - -static HRESULT get_typeinfo( enum type_id tid, ITypeInfo **ret ) -{ - HRESULT hr; - - if (!wbemdisp_typelib) - { - ITypeLib *typelib; - - hr = LoadRegTypeLib( &LIBID_WbemScripting, 1, 2, LOCALE_SYSTEM_DEFAULT, &typelib ); - if (FAILED( hr )) - { - ERR( "LoadRegTypeLib failed: %08x\n", hr ); - return hr; - } - if (InterlockedCompareExchangePointer( (void **)&wbemdisp_typelib, typelib, NULL )) - ITypeLib_Release( typelib ); - } - if (!wbemdisp_typeinfo[tid]) - { - ITypeInfo *typeinfo; - - hr = ITypeLib_GetTypeInfoOfGuid( wbemdisp_typelib, wbemdisp_tid_id[tid], &typeinfo ); - if (FAILED( hr )) - { - ERR( "GetTypeInfoOfGuid(%s) failed: %08x\n", debugstr_guid(wbemdisp_tid_id[tid]), hr ); - return hr; - } - if (InterlockedCompareExchangePointer( (void **)(wbemdisp_typeinfo + tid), typeinfo, NULL )) - ITypeInfo_Release( typeinfo ); - } - *ret = wbemdisp_typeinfo[tid]; - return S_OK; -} - static HRESULT WINAPI locator_GetTypeInfo( ISWbemLocator *iface, UINT index,

1 0

Hans Leidekker : wbemdisp: Forward SWbemLocator:: ConnectServer to IWbemLocator::ConnectServer.
by Alexandre Julliard 08 Jan '15

08 Jan '15

Module: wine Branch: master Commit: 301cc6aedeb09d4b7395e7cc1a9b7719df112850 URL: http://source.winehq.org/git/wine.git/?a=commit;h=301cc6aedeb09d4b7395e7cc1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 8 13:52:41 2015 +0100 wbemdisp: Forward SWbemLocator::ConnectServer to IWbemLocator::ConnectServer. --- dlls/wbemdisp/Makefile.in | 2 +- dlls/wbemdisp/locator.c | 66 ++++++++++++++++++++++++++++++++++++++++++++--- dlls/wbemdisp/main.c | 1 - 3 files changed, 63 insertions(+), 6 deletions(-) diff --git a/dlls/wbemdisp/Makefile.in b/dlls/wbemdisp/Makefile.in index d9e8915..3b4ee4f 100644 --- a/dlls/wbemdisp/Makefile.in +++ b/dlls/wbemdisp/Makefile.in @@ -1,5 +1,5 @@ MODULE = wbemdisp.dll -IMPORTS = oleaut32 +IMPORTS = oleaut32 ole32 C_SRCS = \ locator.c \ diff --git a/dlls/wbemdisp/locator.c b/dlls/wbemdisp/locator.c index 5740dcd..b82d218 100644 --- a/dlls/wbemdisp/locator.c +++ b/dlls/wbemdisp/locator.c @@ -23,12 +23,15 @@ #include "windef.h" #include "winbase.h" +#include "initguid.h" #include "objbase.h" +#include "wbemcli.h" #include "wbemdisp.h" #include "wine/debug.h" #include "wine/unicode.h" #include "wbemdisp_private.h" +#include "wbemdisp_classes.h" WINE_DEFAULT_DEBUG_CHANNEL(wbemdisp); @@ -87,6 +90,7 @@ struct services { ISWbemServices ISWbemServices_iface; LONG refs; + IWbemServices *services; }; static inline struct services *impl_from_ISWbemServices( @@ -110,6 +114,7 @@ static ULONG WINAPI services_Release( if (!refs) { TRACE( "destroying %p\n", services ); + IWbemServices_Release( services->services ); heap_free( services ); } return refs; @@ -494,15 +499,17 @@ static const ISWbemServicesVtbl services_vtbl = services_get_Security_ }; -static HRESULT SWbemServices_create( ISWbemServices **obj ) +static HRESULT SWbemServices_create( IWbemServices *wbem_services, ISWbemServices **obj ) { struct services *services; - TRACE( "%p\n", obj ); + TRACE( "%p, %p\n", obj, wbem_services ); if (!(services = heap_alloc( sizeof(*services) ))) return E_OUTOFMEMORY; services->ISWbemServices_iface.lpVtbl = &services_vtbl; services->refs = 1; + services->services = wbem_services; + IWbemServices_AddRef( services->services ); *obj = &services->ISWbemServices_iface; TRACE( "returning iface %p\n", *obj ); @@ -513,6 +520,7 @@ struct locator { ISWbemLocator ISWbemLocator_iface; LONG refs; + IWbemLocator *locator; }; static inline struct locator *impl_from_ISWbemLocator( ISWbemLocator *iface ) @@ -535,6 +543,7 @@ static ULONG WINAPI locator_Release( if (!refs) { TRACE( "destroying %p\n", locator ); + IWbemLocator_Release( locator->locator ); heap_free( locator ); } return refs; @@ -640,6 +649,31 @@ static HRESULT WINAPI locator_Invoke( return hr; } +static BSTR build_resource_string( BSTR server, BSTR namespace ) +{ + static const WCHAR defaultW[] = {'r','o','o','t','\\','d','e','f','a','u','l','t',0}; + ULONG len, len_server = 0, len_namespace = 0; + BSTR ret; + + if (server && *server) len_server = strlenW( server ); + else len_server = 1; + if (namespace && *namespace) len_namespace = strlenW( namespace ); + else len_namespace = sizeof(defaultW) / sizeof(defaultW[0]) - 1; + + if (!(ret = SysAllocStringLen( NULL, 2 + len_server + 1 + len_namespace ))) return NULL; + + ret[0] = ret[1] = '\\'; + if (server && *server) strcpyW( ret + 2, server ); + else ret[2] = '.'; + + len = len_server + 2; + ret[len++] = '\\'; + + if (namespace && *namespace) strcpyW( ret + len, namespace ); + else strcpyW( ret + len, defaultW ); + return ret; +} + static HRESULT WINAPI locator_ConnectServer( ISWbemLocator *iface, BSTR strServer, @@ -652,10 +686,33 @@ static HRESULT WINAPI locator_ConnectServer( IDispatch *objWbemNamedValueSet, ISWbemServices **objWbemServices ) { - FIXME( "%p, %s, %s, %s, %p, %s, %s, 0x%08x, %p, %p\n", iface, debugstr_w(strServer), + struct locator *locator = impl_from_ISWbemLocator( iface ); + IWbemServices *services; + BSTR resource; + HRESULT hr; + + TRACE( "%p, %s, %s, %s, %p, %s, %s, 0x%08x, %p, %p\n", iface, debugstr_w(strServer), debugstr_w(strNamespace), debugstr_w(strUser), strPassword, debugstr_w(strLocale), debugstr_w(strAuthority), iSecurityFlags, objWbemNamedValueSet, objWbemServices ); - return SWbemServices_create( objWbemServices ); + + if (objWbemNamedValueSet) FIXME( "context not supported\n" ); + + if (!locator->locator) + { + hr = CoCreateInstance( &CLSID_WbemLocator, NULL, CLSCTX_INPROC_SERVER, &IID_IWbemLocator, + (void **)&locator->locator ); + if (hr != S_OK) return hr; + } + + if (!(resource = build_resource_string( strServer, strNamespace ))) return E_OUTOFMEMORY; + hr = IWbemLocator_ConnectServer( locator->locator, resource, strUser, strPassword, strLocale, + iSecurityFlags, strAuthority, NULL, &services ); + SysFreeString( resource ); + if (hr != S_OK) return hr; + + hr = SWbemServices_create( services, objWbemServices ); + IWbemServices_Release( services ); + return hr; } static HRESULT WINAPI locator_get_Security_( @@ -688,6 +745,7 @@ HRESULT SWbemLocator_create( void **obj ) if (!(locator = heap_alloc( sizeof(*locator) ))) return E_OUTOFMEMORY; locator->ISWbemLocator_iface.lpVtbl = &locator_vtbl; locator->refs = 1; + locator->locator = NULL; *obj = &locator->ISWbemLocator_iface; TRACE( "returning iface %p\n", *obj ); diff --git a/dlls/wbemdisp/main.c b/dlls/wbemdisp/main.c index af99975..97f2892 100644 --- a/dlls/wbemdisp/main.c +++ b/dlls/wbemdisp/main.c @@ -23,7 +23,6 @@ #include "windef.h" #include "winbase.h" -#include "initguid.h" #include "objbase.h" #include "wbemdisp.h" #include "rpcproxy.h"

1 0

Hans Leidekker : wbemdisp: Add a stub implementation of ISWbemObject.
by Alexandre Julliard 08 Jan '15

08 Jan '15

Module: wine Branch: master Commit: d7d18892efde37b3a9ccd955c053722c63a44606 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7d18892efde37b3a9ccd955c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 8 13:53:03 2015 +0100 wbemdisp: Add a stub implementation of ISWbemObject. --- dlls/wbemdisp/locator.c | 191 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 189 insertions(+), 2 deletions(-) diff --git a/dlls/wbemdisp/locator.c b/dlls/wbemdisp/locator.c index b82d218..5e9f437 100644 --- a/dlls/wbemdisp/locator.c +++ b/dlls/wbemdisp/locator.c @@ -38,6 +38,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wbemdisp); enum type_id { ISWbemLocator_tid, + ISWbemObject_tid, ISWbemServices_tid, last_tid }; @@ -48,6 +49,7 @@ static ITypeInfo *wbemdisp_typeinfo[last_tid]; static REFIID wbemdisp_tid_id[] = { &IID_ISWbemLocator, + &IID_ISWbemObject, &IID_ISWbemServices }; @@ -86,6 +88,179 @@ static HRESULT get_typeinfo( enum type_id tid, ITypeInfo **ret ) return S_OK; } +struct object +{ + ISWbemObject ISWbemObject_iface; + LONG refs; + IWbemClassObject *object; +}; + +static inline struct object *impl_from_ISWbemObject( + ISWbemObject *iface ) +{ + return CONTAINING_RECORD( iface, struct object, ISWbemObject_iface ); +} + +static ULONG WINAPI object_AddRef( + ISWbemObject *iface ) +{ + struct object *object = impl_from_ISWbemObject( iface ); + return InterlockedIncrement( &object->refs ); +} + +static ULONG WINAPI object_Release( + ISWbemObject *iface ) +{ + struct object *object = impl_from_ISWbemObject( iface ); + LONG refs = InterlockedDecrement( &object->refs ); + if (!refs) + { + TRACE( "destroying %p\n", object ); + IWbemClassObject_Release( object->object ); + heap_free( object ); + } + return refs; +} + +static HRESULT WINAPI object_QueryInterface( + ISWbemObject *iface, + REFIID riid, + void **ppvObject ) +{ + struct object *object = impl_from_ISWbemObject( iface ); + + TRACE( "%p %s %p\n", object, debugstr_guid(riid), ppvObject ); + + if (IsEqualGUID( riid, &IID_ISWbemObject ) || + IsEqualGUID( riid, &IID_IDispatch ) || + IsEqualGUID( riid, &IID_IUnknown )) + { + *ppvObject = object; + } + else + { + FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); + return E_NOINTERFACE; + } + ISWbemObject_AddRef( iface ); + return S_OK; +} + +static HRESULT WINAPI object_GetTypeInfoCount( + ISWbemObject *iface, + UINT *count ) +{ + struct object *object = impl_from_ISWbemObject( iface ); + + TRACE( "%p, %p\n", object, count ); + *count = 1; + return S_OK; +} + +static HRESULT WINAPI object_GetTypeInfo( + ISWbemObject *iface, + UINT index, + LCID lcid, + ITypeInfo **info ) +{ + struct object *object = impl_from_ISWbemObject( iface ); + TRACE( "%p, %u, %u, %p\n", object, index, lcid, info ); + + return get_typeinfo( ISWbemObject_tid, info ); +} + +static HRESULT WINAPI object_GetIDsOfNames( + ISWbemObject *iface, + REFIID riid, + LPOLESTR *names, + UINT count, + LCID lcid, + DISPID *dispid ) +{ + struct object *object = impl_from_ISWbemObject( iface ); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE( "%p, %s, %p, %u, %u, %p\n", object, debugstr_guid(riid), names, count, lcid, dispid ); + + if (!names || !count || !dispid) return E_INVALIDARG; + + hr = get_typeinfo( ISWbemObject_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames( typeinfo, names, count, dispid ); + ITypeInfo_Release( typeinfo ); + } + return hr; +} + +static HRESULT WINAPI object_Invoke( + ISWbemObject *iface, + DISPID member, + REFIID riid, + LCID lcid, + WORD flags, + DISPPARAMS *params, + VARIANT *result, + EXCEPINFO *excep_info, + UINT *arg_err ) +{ + struct object *object = impl_from_ISWbemObject( iface ); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", object, member, debugstr_guid(riid), + lcid, flags, params, result, excep_info, arg_err ); + + hr = get_typeinfo( ISWbemObject_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke( typeinfo, &object->ISWbemObject_iface, member, flags, + params, result, excep_info, arg_err ); + ITypeInfo_Release( typeinfo ); + } + return hr; +} + +static HRESULT WINAPI object_Put_( + ISWbemObject *iface, + LONG iFlags, + IDispatch *objWbemNamedValueSet, + ISWbemObjectPath **objWbemObjectPath ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static const ISWbemObjectVtbl object_vtbl = +{ + object_QueryInterface, + object_AddRef, + object_Release, + object_GetTypeInfoCount, + object_GetTypeInfo, + object_GetIDsOfNames, + object_Invoke, + object_Put_ +}; + +static HRESULT SWbemObject_create( IWbemClassObject *wbem_object, ISWbemObject **obj ) +{ + struct object *object; + + TRACE( "%p, %p\n", obj, wbem_object ); + + if (!(object = heap_alloc( sizeof(*object) ))) return E_OUTOFMEMORY; + object->ISWbemObject_iface.lpVtbl = &object_vtbl; + object->refs = 1; + object->object = wbem_object; + IWbemClassObject_AddRef( object->object ); + + *obj = &object->ISWbemObject_iface; + TRACE( "returning iface %p\n", *obj ); + return S_OK; +} + struct services { ISWbemServices ISWbemServices_iface; @@ -227,9 +402,21 @@ static HRESULT WINAPI services_Get( IDispatch *objWbemNamedValueSet, ISWbemObject **objWbemObject ) { - FIXME( "%p, %s, %d, %p, %p\n", iface, debugstr_w(strObjectPath), iFlags, objWbemNamedValueSet, + struct services *services = impl_from_ISWbemServices( iface ); + IWbemClassObject *obj; + HRESULT hr; + + TRACE( "%p, %s, %d, %p, %p\n", iface, debugstr_w(strObjectPath), iFlags, objWbemNamedValueSet, objWbemObject ); - return E_NOTIMPL; + + if (objWbemNamedValueSet) FIXME( "ignoring context\n" ); + + hr = IWbemServices_GetObject( services->services, strObjectPath, iFlags, NULL, &obj, NULL ); + if (hr != S_OK) return hr; + + hr = SWbemObject_create( obj, objWbemObject ); + IWbemClassObject_Release( obj ); + return hr; } static HRESULT WINAPI services_GetAsync(

1 0

Hans Leidekker : wbemdisp: Add a stub implementation of ISWbemObjectSet.
by Alexandre Julliard 08 Jan '15

08 Jan '15

Module: wine Branch: master Commit: bc6270e3f9a0f422cd82139b84589a1b2b46a3ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc6270e3f9a0f422cd82139b8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 8 13:53:22 2015 +0100 wbemdisp: Add a stub implementation of ISWbemObjectSet. --- dlls/wbemdisp/locator.c | 234 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 232 insertions(+), 2 deletions(-) diff --git a/dlls/wbemdisp/locator.c b/dlls/wbemdisp/locator.c index 5e9f437..7f5756a 100644 --- a/dlls/wbemdisp/locator.c +++ b/dlls/wbemdisp/locator.c @@ -39,6 +39,7 @@ enum type_id { ISWbemLocator_tid, ISWbemObject_tid, + ISWbemObjectSet_tid, ISWbemServices_tid, last_tid }; @@ -50,6 +51,7 @@ static REFIID wbemdisp_tid_id[] = { &IID_ISWbemLocator, &IID_ISWbemObject, + &IID_ISWbemObjectSet, &IID_ISWbemServices }; @@ -261,6 +263,221 @@ static HRESULT SWbemObject_create( IWbemClassObject *wbem_object, ISWbemObject * return S_OK; } +struct objectset +{ + ISWbemObjectSet ISWbemObjectSet_iface; + LONG refs; + IEnumWbemClassObject *objectenum; +}; + +static inline struct objectset *impl_from_ISWbemObjectSet( + ISWbemObjectSet *iface ) +{ + return CONTAINING_RECORD( iface, struct objectset, ISWbemObjectSet_iface ); +} + +static ULONG WINAPI objectset_AddRef( + ISWbemObjectSet *iface ) +{ + struct objectset *objectset = impl_from_ISWbemObjectSet( iface ); + return InterlockedIncrement( &objectset->refs ); +} + +static ULONG WINAPI objectset_Release( + ISWbemObjectSet *iface ) +{ + struct objectset *objectset = impl_from_ISWbemObjectSet( iface ); + LONG refs = InterlockedDecrement( &objectset->refs ); + if (!refs) + { + TRACE( "destroying %p\n", objectset ); + IEnumWbemClassObject_Release( objectset->objectenum ); + heap_free( objectset ); + } + return refs; +} + +static HRESULT WINAPI objectset_QueryInterface( + ISWbemObjectSet *iface, + REFIID riid, + void **ppvObject ) +{ + struct objectset *objectset = impl_from_ISWbemObjectSet( iface ); + + TRACE( "%p %s %p\n", objectset, debugstr_guid(riid), ppvObject ); + + if (IsEqualGUID( riid, &IID_ISWbemObjectSet ) || + IsEqualGUID( riid, &IID_IDispatch ) || + IsEqualGUID( riid, &IID_IUnknown )) + { + *ppvObject = objectset; + } + else + { + FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); + return E_NOINTERFACE; + } + ISWbemObjectSet_AddRef( iface ); + return S_OK; +} + +static HRESULT WINAPI objectset_GetTypeInfoCount( + ISWbemObjectSet *iface, + UINT *count ) +{ + struct objectset *objectset = impl_from_ISWbemObjectSet( iface ); + TRACE( "%p, %p\n", objectset, count ); + *count = 1; + return S_OK; +} + +static HRESULT WINAPI objectset_GetTypeInfo( + ISWbemObjectSet *iface, + UINT index, + LCID lcid, + ITypeInfo **info ) +{ + struct objectset *objectset = impl_from_ISWbemObjectSet( iface ); + TRACE( "%p, %u, %u, %p\n", objectset, index, lcid, info ); + + return get_typeinfo( ISWbemObjectSet_tid, info ); +} + +static HRESULT WINAPI objectset_GetIDsOfNames( + ISWbemObjectSet *iface, + REFIID riid, + LPOLESTR *names, + UINT count, + LCID lcid, + DISPID *dispid ) +{ + struct objectset *objectset = impl_from_ISWbemObjectSet( iface ); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE( "%p, %s, %p, %u, %u, %p\n", objectset, debugstr_guid(riid), names, count, lcid, dispid ); + + if (!names || !count || !dispid) return E_INVALIDARG; + + hr = get_typeinfo( ISWbemObjectSet_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames( typeinfo, names, count, dispid ); + ITypeInfo_Release( typeinfo ); + } + return hr; +} + +static HRESULT WINAPI objectset_Invoke( + ISWbemObjectSet *iface, + DISPID member, + REFIID riid, + LCID lcid, + WORD flags, + DISPPARAMS *params, + VARIANT *result, + EXCEPINFO *excep_info, + UINT *arg_err ) +{ + struct objectset *objectset = impl_from_ISWbemObjectSet( iface ); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", objectset, member, debugstr_guid(riid), + lcid, flags, params, result, excep_info, arg_err ); + + hr = get_typeinfo( ISWbemObjectSet_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke( typeinfo, &objectset->ISWbemObjectSet_iface, member, flags, + params, result, excep_info, arg_err ); + ITypeInfo_Release( typeinfo ); + } + return hr; +} + +static HRESULT WINAPI objectset_get__NewEnum( + ISWbemObjectSet *iface, + IUnknown **pUnk ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI objectset_Item( + ISWbemObjectSet *iface, + BSTR strObjectPath, + LONG iFlags, + ISWbemObject **objWbemObject ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI objectset_get_Count( + ISWbemObjectSet *iface, + LONG *iCount ) +{ + struct objectset *objectset = impl_from_ISWbemObjectSet( iface ); + + TRACE( "%p, %p\n", objectset, iCount ); + + *iCount = 0; + IEnumWbemClassObject_Reset( objectset->objectenum ); + while (!IEnumWbemClassObject_Skip( objectset->objectenum, WBEM_INFINITE, 1 )) (*iCount)++; + return S_OK; +} + +static HRESULT WINAPI objectset_get_Security_( + ISWbemObjectSet *iface, + ISWbemSecurity **objWbemSecurity ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI objectset_ItemIndex( + ISWbemObjectSet *iface, + LONG lIndex, + ISWbemObject **objWbemObject ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static const ISWbemObjectSetVtbl objectset_vtbl = +{ + objectset_QueryInterface, + objectset_AddRef, + objectset_Release, + objectset_GetTypeInfoCount, + objectset_GetTypeInfo, + objectset_GetIDsOfNames, + objectset_Invoke, + objectset_get__NewEnum, + objectset_Item, + objectset_get_Count, + objectset_get_Security_, + objectset_ItemIndex +}; + +static HRESULT SWbemObjectSet_create( IEnumWbemClassObject *wbem_objectenum, ISWbemObjectSet **obj ) +{ + struct objectset *objectset; + + TRACE( "%p, %p\n", obj, wbem_objectenum ); + + if (!(objectset = heap_alloc( sizeof(*objectset) ))) return E_OUTOFMEMORY; + objectset->ISWbemObjectSet_iface.lpVtbl = &objectset_vtbl; + objectset->refs = 1; + objectset->objectenum = wbem_objectenum; + IEnumWbemClassObject_AddRef( objectset->objectenum ); + + *obj = &objectset->ISWbemObjectSet_iface; + TRACE( "returning iface %p\n", *obj ); + return S_OK; +} + struct services { ISWbemServices ISWbemServices_iface; @@ -507,8 +724,21 @@ static HRESULT WINAPI services_ExecQuery( IDispatch *objWbemNamedValueSet, ISWbemObjectSet **objWbemObjectSet ) { - FIXME( "\n" ); - return E_NOTIMPL; + struct services *services = impl_from_ISWbemServices( iface ); + IEnumWbemClassObject *iter; + HRESULT hr; + + TRACE( "%p, %s, %s, %x, %p, %p\n", iface, debugstr_w(strQuery), debugstr_w(strQueryLanguage), + iFlags, objWbemNamedValueSet, objWbemObjectSet ); + + if (objWbemNamedValueSet) FIXME( "ignoring context\n" ); + + hr = IWbemServices_ExecQuery( services->services, strQueryLanguage, strQuery, iFlags, NULL, &iter ); + if (hr != S_OK) return hr; + + hr = SWbemObjectSet_create( iter, objWbemObjectSet ); + IEnumWbemClassObject_Release( iter ); + return hr; } static HRESULT WINAPI services_ExecQueryAsync(

1 0

Hans Leidekker : wbemdisp: Add support for parsing WMI monikers.
by Alexandre Julliard 08 Jan '15

08 Jan '15

Module: wine Branch: master Commit: ff251092a7b400b128e1b0096cf0dc95db500c02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff251092a7b400b128e1b0096… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 8 13:53:47 2015 +0100 wbemdisp: Add support for parsing WMI monikers. --- dlls/wbemdisp/locator.c | 1 + dlls/wbemdisp/main.c | 355 +++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 354 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ff251092a7b400b128e1b…

1 0

Hans Leidekker : wbemdisp/tests: Add initial tests.
by Alexandre Julliard 08 Jan '15

08 Jan '15

Module: wine Branch: master Commit: 041ab23d0b49a98b169db00c20f77fd1d7c9c071 URL: http://source.winehq.org/git/wine.git/?a=commit;h=041ab23d0b49a98b169db00c2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 8 13:54:07 2015 +0100 wbemdisp/tests: Add initial tests. --- configure | 1 + configure.ac | 1 + dlls/wbemdisp/tests/Makefile.in | 5 ++ dlls/wbemdisp/tests/wbemdisp.c | 102 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 109 insertions(+) diff --git a/configure b/configure index 79d6632..062287e 100755 --- a/configure +++ b/configure @@ -17468,6 +17468,7 @@ wine_fn_config_dll vwin32.vxd enable_win16 wine_fn_config_dll w32skrnl enable_win16 wine_fn_config_dll w32sys.dll16 enable_win16 wine_fn_config_dll wbemdisp enable_wbemdisp clean +wine_fn_config_test dlls/wbemdisp/tests wbemdisp_test wine_fn_config_dll wbemprox enable_wbemprox clean wine_fn_config_test dlls/wbemprox/tests wbemprox_test wine_fn_config_dll webservices enable_webservices implib diff --git a/configure.ac b/configure.ac index b67a7e7..50efb9f 100644 --- a/configure.ac +++ b/configure.ac @@ -3292,6 +3292,7 @@ WINE_CONFIG_DLL(vwin32.vxd,enable_win16) WINE_CONFIG_DLL(w32skrnl,enable_win16) WINE_CONFIG_DLL(w32sys.dll16,enable_win16) WINE_CONFIG_DLL(wbemdisp,,[clean]) +WINE_CONFIG_TEST(dlls/wbemdisp/tests) WINE_CONFIG_DLL(wbemprox,,[clean]) WINE_CONFIG_TEST(dlls/wbemprox/tests) WINE_CONFIG_DLL(webservices,,[implib]) diff --git a/dlls/wbemdisp/tests/Makefile.in b/dlls/wbemdisp/tests/Makefile.in new file mode 100644 index 0000000..f509d37 --- /dev/null +++ b/dlls/wbemdisp/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = wbemdisp.dll +IMPORTS = oleaut32 ole32 + +C_SRCS = \ + wbemdisp.c diff --git a/dlls/wbemdisp/tests/wbemdisp.c b/dlls/wbemdisp/tests/wbemdisp.c new file mode 100644 index 0000000..8c0b628 --- /dev/null +++ b/dlls/wbemdisp/tests/wbemdisp.c @@ -0,0 +1,102 @@ +/* + * Copyright 2015 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include <stdio.h> +#include "windows.h" +#include "initguid.h" +#include "objidl.h" +#include "wbemdisp.h" +#include "wine/test.h" + +DEFINE_GUID(CLSID_WINMGMTS,0x172bddf8,0xceea,0x11d1,0x8b,0x05,0x00,0x60,0x08,0x06,0xd9,0xb6); + +static void test_ParseDisplayName(void) +{ + static const WCHAR name1[] = + {'w','i','n','m','g','m','t','s',':',0}; + static const WCHAR name2[] = + {'w','i','n','m','g','m','t','s',':','\\','\\','.','\\','r','o','o','t','\\','c','i','m','v','2',0}; + static const WCHAR name3[] = + {'w','i','n','m','g','m','t','s',':','\\','\\','.','\\','r','o','o','t','\\','c','i','m','v','2',':', + 'W','i','n','3','2','_','L','o','g','i','c','a','l','D','i','s','k','.', + 'D','e','v','i','c','e','I','D','=','\'','C',':','\'',0}; + static const WCHAR name4[] = + {'w','i','n','m','g','m','t','s',':','\\','\\','.','\\','r','o','o','t','\\','c','i','m','v','2',':', + 'W','i','n','3','2','_','S','e','r','v','i','c','e',0}; + static const struct + { + const WCHAR *name; + HRESULT hr; + REFIID iid; + ULONG eaten; + } tests[] = + { + { name1, S_OK, &IID_ISWbemServices, sizeof(name1)/sizeof(name1[0]) - 1 }, + { name2, S_OK, &IID_ISWbemServices, sizeof(name2)/sizeof(name2[0]) - 1 }, + { name3, S_OK, &IID_ISWbemObject, sizeof(name3)/sizeof(name3[0]) - 1 }, + { name4, S_OK, &IID_ISWbemObject, sizeof(name4)/sizeof(name4[0]) - 1 } + }; + IParseDisplayName *displayname; + IBindCtx *ctx; + IMoniker *moniker; + IUnknown *obj; + BSTR str; + ULONG i, eaten; + HRESULT hr; + + hr = CoCreateInstance( &CLSID_WINMGMTS, NULL, CLSCTX_INPROC_SERVER, &IID_IParseDisplayName, (void **)&displayname ); + if (hr != S_OK) + { + win_skip( "can't create instance of WINMGMTS\n" ); + return; + } + + hr = CreateBindCtx( 0, &ctx ); + ok( hr == S_OK, "got %x\n", hr ); + + for (i =0; i < sizeof(tests)/sizeof(tests[0]); i++) + { + str = SysAllocString( tests[i].name ); + eaten = 0xdeadbeef; + moniker = NULL; + hr = IParseDisplayName_ParseDisplayName( displayname, NULL, str, &eaten, &moniker ); + SysFreeString( str ); + ok( hr == tests[i].hr, "%u: got %x\n", i, hr ); + ok( eaten == tests[i].eaten, "%u: got %u\n", i, eaten ); + if (moniker) + { + obj = NULL; + hr = IMoniker_BindToObject( moniker, ctx, NULL, tests[i].iid, (void **)&obj ); + ok( hr == S_OK, "%u: got %x\n", i, hr ); + if (obj) IUnknown_Release( obj ); + IMoniker_Release( moniker ); + } + } + + IBindCtx_Release( ctx ); + IParseDisplayName_Release( displayname ); +} + +START_TEST(wbemdisp) +{ + CoInitialize( NULL ); + test_ParseDisplayName(); + CoUninitialize(); +}

1 0

Axel Davy : d3d9/tests: Fix volume_dxt5_test getPixelColor check.
by Alexandre Julliard 08 Jan '15

08 Jan '15

Module: wine Branch: master Commit: fc84368f87faec3d974158c2239274d7f0d94c7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc84368f87faec3d974158c22… Author: Axel Davy <axel.davy(a)ens.fr> Date: Wed Jan 7 14:21:48 2015 +0100 d3d9/tests: Fix volume_dxt5_test getPixelColor check. getPixelColor should be called before Present, because the device swapchain was created with discard mode. --- dlls/d3d9/tests/visual.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index acc3a44..a656a0d 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -15991,8 +15991,6 @@ static void volume_dxt5_test(void) hr = IDirect3DDevice9_EndScene(device); ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); - hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); - ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); for (i = 0; i < 4; i++) { color = getPixelColor(device, 80 + 160 * i, 240); @@ -16000,6 +15998,8 @@ static void volume_dxt5_test(void) "Expected color 0x%08x, got 0x%08x, case %u.\n", expected_colors[i], color, i); } + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); IDirect3DVolumeTexture9_Release(texture); refcount = IDirect3DDevice9_Release(device); ok(!refcount, "Device has %u references left.\n", refcount);

1 0

Axel Davy : d3d9/tests: Fix test_3dc_formats getPixelColor check.
by Alexandre Julliard 08 Jan '15

08 Jan '15

Module: wine Branch: master Commit: b83825509e64b4b8523add72988f7723a75f780b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b83825509e64b4b8523add729… Author: Axel Davy <axel.davy(a)ens.fr> Date: Wed Jan 7 14:21:49 2015 +0100 d3d9/tests: Fix test_3dc_formats getPixelColor check. getPixelColor should be called before Present, because the device swapchain was created with discard mode. --- dlls/d3d9/tests/visual.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index a656a0d..0c10ffa 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -16798,8 +16798,6 @@ static void test_3dc_formats(void) hr = IDirect3DDevice9_EndScene(device); ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); - hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); - ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); for (i = 0; i < 4; ++i) { color = getPixelColor(device, expected_colors[i].position.x, expected_colors[i].position.y); @@ -16808,6 +16806,8 @@ static void test_3dc_formats(void) expected_colors[i].amd, expected_colors[i].nvidia, color, i); } + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); IDirect3DTexture9_Release(ati2n_texture); IDirect3DTexture9_Release(ati1n_texture); refcount = IDirect3DDevice9_Release(device);

1 0

Jacek Caban : mshtml: Use debugstr_mshtml_guid in omnavigator.c.
by Alexandre Julliard 08 Jan '15

08 Jan '15

Module: wine Branch: master Commit: 9d911d6ffe4d2be6cc4dd7118a5779b2bb77a672 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d911d6ffe4d2be6cc4dd7118… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 8 14:42:10 2015 +0100 mshtml: Use debugstr_mshtml_guid in omnavigator.c. --- dlls/mshtml/omnavigator.c | 46 ++++++++++++++++++++-------------------------- 1 file changed, 20 insertions(+), 26 deletions(-) diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index 932d1c1..e943b70 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -195,25 +195,22 @@ static HRESULT WINAPI OmHistory_QueryInterface(IOmHistory *iface, REFIID riid, v { OmHistory *This = impl_from_IOmHistory(iface); - *ppv = NULL; + TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); if(IsEqualGUID(&IID_IUnknown, riid)) { - TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); *ppv = &This->IOmHistory_iface; }else if(IsEqualGUID(&IID_IOmHistory, riid)) { - TRACE("(%p)->(IID_IOmHistory %p)\n", This, ppv); *ppv = &This->IOmHistory_iface; }else if(dispex_query_interface(&This->dispex, riid, ppv)) { return *ppv ? S_OK : E_NOINTERFACE; + }else { + WARN("Unsupported interface %s\n", debugstr_mshtml_guid(riid)); + *ppv = NULL; + return E_NOINTERFACE; } - if(*ppv) { - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; - } - - WARN("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); - return E_NOINTERFACE; + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; } static ULONG WINAPI OmHistory_AddRef(IOmHistory *iface) @@ -373,17 +370,17 @@ static HRESULT WINAPI HTMLPluginsCollection_QueryInterface(IHTMLPluginsCollectio { HTMLPluginsCollection *This = impl_from_IHTMLPluginsCollection(iface); + TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); + if(IsEqualGUID(&IID_IUnknown, riid)) { - TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); *ppv = &This->IHTMLPluginsCollection_iface; }else if(IsEqualGUID(&IID_IHTMLPluginsCollection, riid)) { - TRACE("(%p)->(IID_IHTMLPluginCollection %p)\n", This, ppv); *ppv = &This->IHTMLPluginsCollection_iface; }else if(dispex_query_interface(&This->dispex, riid, ppv)) { return *ppv ? S_OK : E_NOINTERFACE; }else { *ppv = NULL; - WARN("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + WARN("Unsupported interface %s\n", debugstr_mshtml_guid(riid)); return E_NOINTERFACE; } @@ -526,17 +523,17 @@ static HRESULT WINAPI HTMLMimeTypesCollection_QueryInterface(IHTMLMimeTypesColle { HTMLMimeTypesCollection *This = impl_from_IHTMLMimeTypesCollection(iface); + TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); + if(IsEqualGUID(&IID_IUnknown, riid)) { - TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); *ppv = &This->IHTMLMimeTypesCollection_iface; }else if(IsEqualGUID(&IID_IHTMLMimeTypesCollection, riid)) { - TRACE("(%p)->(IID_IHTMLMimeTypesCollection %p)\n", This, ppv); *ppv = &This->IHTMLMimeTypesCollection_iface; }else if(dispex_query_interface(&This->dispex, riid, ppv)) { return *ppv ? S_OK : E_NOINTERFACE; }else { + WARN("Unsupported interface %s\n", debugstr_mshtml_guid(riid)); *ppv = NULL; - WARN("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); return E_NOINTERFACE; } @@ -662,25 +659,22 @@ static HRESULT WINAPI OmNavigator_QueryInterface(IOmNavigator *iface, REFIID rii { OmNavigator *This = impl_from_IOmNavigator(iface); - *ppv = NULL; + TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); if(IsEqualGUID(&IID_IUnknown, riid)) { - TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); *ppv = &This->IOmNavigator_iface; }else if(IsEqualGUID(&IID_IOmNavigator, riid)) { - TRACE("(%p)->(IID_IOmNavigator %p)\n", This, ppv); *ppv = &This->IOmNavigator_iface; }else if(dispex_query_interface(&This->dispex, riid, ppv)) { return *ppv ? S_OK : E_NOINTERFACE; + }else { + WARN("Unsupported interface %s\n", debugstr_mshtml_guid(riid)); + *ppv = NULL; + return E_NOINTERFACE; } - if(*ppv) { - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; - } - - WARN("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); - return E_NOINTERFACE; + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; } static ULONG WINAPI OmNavigator_AddRef(IOmNavigator *iface)

1 0

Matteo Bruni : winemac: Make the implementation of clearToBlackIfNeeded compatible with core contexts.
by Alexandre Julliard 08 Jan '15

08 Jan '15

Module: wine Branch: master Commit: e23f70b26698f5e6ba2236436482637bf9f1c3b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e23f70b26698f5e6ba2236436… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jan 8 15:07:47 2015 +0100 winemac: Make the implementation of clearToBlackIfNeeded compatible with core contexts. --- dlls/winemac.drv/cocoa_opengl.m | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/cocoa_opengl.m b/dlls/winemac.drv/cocoa_opengl.m index 32d182f..2f46b87 100644 --- a/dlls/winemac.drv/cocoa_opengl.m +++ b/dlls/winemac.drv/cocoa_opengl.m @@ -85,16 +85,41 @@ if (shouldClearToBlack) { NSOpenGLContext* origContext = [NSOpenGLContext currentContext]; + const char *gl_version; + unsigned int major; + GLint draw_framebuffer_binding, draw_buffer; + GLboolean scissor_test, color_mask[4]; + GLfloat clear_color[4]; [self makeCurrentContext]; - glPushAttrib(GL_COLOR_BUFFER_BIT | GL_SCISSOR_BIT); + gl_version = (const char *)glGetString(GL_VERSION); + major = gl_version[0] - '0'; + /* FIXME: Should check for GL_ARB_framebuffer_object and GL_EXT_framebuffer_object + * for older GL versions. */ + if (major >= 3) + { + glGetIntegerv(GL_DRAW_FRAMEBUFFER_BINDING, &draw_framebuffer_binding); + glBindFramebuffer(GL_DRAW_FRAMEBUFFER, 0); + } + glGetIntegerv(GL_DRAW_BUFFER, &draw_buffer); + scissor_test = glIsEnabled(GL_SCISSOR_TEST); + glGetBooleanv(GL_COLOR_WRITEMASK, color_mask); + glGetFloatv(GL_COLOR_CLEAR_VALUE, clear_color); glDrawBuffer(GL_FRONT_AND_BACK); glDisable(GL_SCISSOR_TEST); glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); glClearColor(0, 0, 0, 1); + glClear(GL_COLOR_BUFFER_BIT); - glPopAttrib(); + + glClearColor(clear_color[0], clear_color[1], clear_color[2], clear_color[3]); + glColorMask(color_mask[0], color_mask[1], color_mask[2], color_mask[3]); + if (scissor_test) + glEnable(GL_SCISSOR_TEST); + glDrawBuffer(draw_buffer); + if (major >= 3) + glBindFramebuffer(GL_DRAW_FRAMEBUFFER, draw_framebuffer_binding); glFlush(); if (origContext)

1 0