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

Julian Rüger : opengl32: Fix typos in comments.
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: 2f3810755648814dad0ab355937326f82ac6bc18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f3810755648814dad0ab3559… Author: Julian Rüger <jr98(a)gmx.net> Date: Wed Jun 27 14:54:23 2012 +0200 opengl32: Fix typos in comments. --- dlls/opengl32/wgl.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index e400f2e..64add99 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -224,11 +224,11 @@ INT WINAPI wglChoosePixelFormat(HDC hdc, const PIXELFORMATDESCRIPTOR* ppfd) * without. In case PFD_STEREO_DONTCARE is set, stereo is ignored. * * To summarize the following is most likely the correct behavior: - * stereo not set -> prefer no-stereo formats, else also accept stereo formats - * stereo set -> prefer stereo formats, else also accept no-stereo formats + * stereo not set -> prefer non-stereo formats, but also accept stereo formats + * stereo set -> prefer stereo formats, but also accept non-stereo formats * stereo don't care -> it doesn't matter whether we get stereo or not * - * In Wine we will treat no-stereo the same way as don't care because it makes + * In Wine we will treat non-stereo the same way as don't care because it makes * format selection even more complicated and second drivers with Stereo advertise * each format twice anyway. */ @@ -426,7 +426,7 @@ static BOOL is_extension_supported(const char* extension) /* We use the GetProcAddress function from the display driver to retrieve function pointers * for OpenGL and WGL extensions. In case of winex11.drv the OpenGL extension lookup is done * using glXGetProcAddress. This function is quite unreliable in the sense that its specs don't - * require the function to return NULL when a extension isn't found. For this reason we check + * require the function to return NULL when an extension isn't found. For this reason we check * 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. */ @@ -487,11 +487,11 @@ PROC WINAPI wglGetProcAddress(LPCSTR lpszProc) { /* If nothing was found, we are looking for a WGL extension or an unknown GL extension. */ if (ext_ret == NULL) { - /* If the function name starts with a w it is a WGL extension */ + /* If the function name starts with a 'w', it is a WGL extension */ if(lpszProc[0] == 'w') return wine_wgl.p_wglGetProcAddress(lpszProc); - /* We are dealing with an unknown GL extension. */ + /* We are dealing with an unknown GL extension */ WARN("Extension '%s' not defined in opengl32.dll's function table!\n", lpszProc); return NULL; } else { /* We are looking for an OpenGL extension */ @@ -508,7 +508,7 @@ PROC WINAPI wglGetProcAddress(LPCSTR lpszProc) { char buf[256]; void *ret = NULL; - /* Remove the 3 last letters (EXT, ARB, ...). + /* Remove the last 3 letters (EXT, ARB, ...). I know that some extensions have more than 3 letters (MESA, NV, INTEL, ...), but this is only a stop-gap measure to fix buggy @@ -879,7 +879,7 @@ static BOOL wglUseFontOutlines_common(HDC hdc, case TT_PRIM_QSPLINE: for(i = 0; i < ppc->cpfx/2; i++) { - /* FIXME just connecting the control points for now */ + /* FIXME: just connecting the control points for now */ TRACE("\t\tcurve %d,%d %d,%d\n", ppc->apfx[i * 2].x.value, ppc->apfx[i * 3].y.value, ppc->apfx[i * 2 + 1].x.value, ppc->apfx[i * 3 + 1].y.value);

1 0

Julian Rüger : opengl32: Remove spaces preceding punctuation, streamline some debug messages.
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: 581c705ccc3eb953615fb2f9b0aedb9e4826f4a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=581c705ccc3eb953615fb2f9b… Author: Julian Rüger <jr98(a)gmx.net> Date: Wed Jun 27 15:39:17 2012 +0200 opengl32: Remove spaces preceding punctuation, streamline some debug messages. --- dlls/opengl32/wgl.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 64add99..5a14125 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -361,7 +361,7 @@ HGLRC WINAPI wglCreateLayerContext(HDC hdc, if (iLayerPlane == 0) { return wglCreateContext(hdc); } - FIXME(" no handler for layer %d\n", iLayerPlane); + FIXME("no handler for layer %d\n", iLayerPlane); return NULL; } @@ -387,7 +387,7 @@ int WINAPI wglGetLayerPaletteEntries(HDC hdc, int iStart, int cEntries, const COLORREF *pcr) { - FIXME("(): stub !\n"); + FIXME("(): stub!\n"); return 0; } @@ -443,7 +443,7 @@ static BOOL is_extension_supported(const char* extension) const char *version = extension + 11; /* Move past 'GL_VERSION_' */ if(!gl_version) { - ERR("Error no OpenGL version found,\n"); + ERR("No OpenGL version found!\n"); return FALSE; } @@ -517,18 +517,18 @@ PROC WINAPI wglGetProcAddress(LPCSTR lpszProc) { */ memcpy(buf, ext_ret->name, strlen(ext_ret->name) - 3); buf[strlen(ext_ret->name) - 3] = '\0'; - TRACE(" extension not found in the Linux OpenGL library, checking against libGL bug with %s..\n", buf); + TRACE("Extension not found in the Linux OpenGL library, checking against libGL bug with %s..\n", buf); ret = GetProcAddress(opengl32_handle, buf); if (ret != NULL) { - TRACE(" found function in main OpenGL library (%p) !\n", ret); + TRACE("Found function in main OpenGL library (%p)!\n", ret); } else { - WARN("Did not find function %s (%s) in your OpenGL library !\n", lpszProc, ext_ret->name); + WARN("Did not find function %s (%s) in your OpenGL library!\n", lpszProc, ext_ret->name); } return ret; } else { - TRACE(" returning function (%p)\n", ext_ret->func); + TRACE("returning function (%p)\n", ext_ret->func); extension_funcs[ext_ret - extension_registry] = local_func; return ext_ret->func; @@ -555,7 +555,7 @@ int WINAPI wglSetLayerPaletteEntries(HDC hdc, int iStart, int cEntries, const COLORREF *pcr) { - FIXME("(): stub !\n"); + FIXME("(): stub!\n"); return 0; } @@ -573,7 +573,7 @@ BOOL WINAPI wglSwapLayerBuffers(HDC hdc, } if (fuPlanes) { - WARN("Following layers unhandled : %08x\n", fuPlanes); + WARN("Following layers unhandled: %08x\n", fuPlanes); } return TRUE; @@ -602,7 +602,7 @@ static BOOL wglUseFontBitmaps_common( HDC hdc, DWORD first, DWORD count, DWORD l else needed_size = GetGlyphOutlineA(hdc, glyph, GGO_BITMAP, &gm, 0, NULL, &identity); - TRACE("Glyph : %3d / List : %d size %d\n", glyph, listBase, needed_size); + TRACE("Glyph: %3d / List: %d size %d\n", glyph, listBase, needed_size); if (needed_size == GDI_ERROR) { ret = FALSE; break; @@ -625,11 +625,11 @@ static BOOL wglUseFontBitmaps_common( HDC hdc, DWORD first, DWORD count, DWORD l unsigned int bitmask; unsigned char *bitmap_ = bitmap; - TRACE(" - bbox : %d x %d\n", gm.gmBlackBoxX, gm.gmBlackBoxY); - TRACE(" - origin : (%d , %d)\n", gm.gmptGlyphOrigin.x, gm.gmptGlyphOrigin.y); - TRACE(" - increment : %d - %d\n", gm.gmCellIncX, gm.gmCellIncY); + TRACE(" - bbox: %d x %d\n", gm.gmBlackBoxX, gm.gmBlackBoxY); + TRACE(" - origin: (%d, %d)\n", gm.gmptGlyphOrigin.x, gm.gmptGlyphOrigin.y); + TRACE(" - increment: %d - %d\n", gm.gmCellIncX, gm.gmCellIncY); if (needed_size != 0) { - TRACE(" - bitmap :\n"); + TRACE(" - bitmap:\n"); for (height = 0; height < gm.gmBlackBoxY; height++) { TRACE(" "); for (width = 0, bitmask = 0x80; width < gm.gmBlackBoxX; width++, bitmask >>= 1) {

1 0

Hans Leidekker : wbemprox: Implement more properties of Win32_VideoController.
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: 8f0da0eaad185534d1a6461b1f05031b49ac50e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f0da0eaad185534d1a6461b1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jun 28 09:24:05 2012 +0200 wbemprox: Implement more properties of Win32_VideoController. --- dlls/wbemprox/Makefile.in | 2 +- dlls/wbemprox/builtin.c | 50 +++++++++++++++++++++++++++++++++++++++----- 2 files changed, 45 insertions(+), 7 deletions(-) diff --git a/dlls/wbemprox/Makefile.in b/dlls/wbemprox/Makefile.in index 837a47e..2b6b34e 100644 --- a/dlls/wbemprox/Makefile.in +++ b/dlls/wbemprox/Makefile.in @@ -1,5 +1,5 @@ MODULE = wbemprox.dll -IMPORTS = iphlpapi dxgi oleaut32 ole32 advapi32 user32 +IMPORTS = iphlpapi dxgi oleaut32 ole32 advapi32 user32 gdi32 C_SRCS = \ builtin.c \ diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index a40fff6..62d089a 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -63,6 +63,12 @@ static const WCHAR prop_commandlineW[] = {'C','o','m','m','a','n','d','L','i','n','e',0}; static const WCHAR prop_cpustatusW[] = {'C','p','u','S','t','a','t','u','s',0}; +static const WCHAR prop_currentbitsperpixelW[] = + {'C','u','r','r','e','n','t','B','i','t','s','P','e','r','P','i','x','e','l',0}; +static const WCHAR prop_currenthorizontalresW[] = + {'C','u','r','r','e','n','t','H','o','r','i','z','o','n','t','a','l','R','e','s','o','l','u','t','i','o','n',0}; +static const WCHAR prop_currentverticalresW[] = + {'C','u','r','r','e','n','t','V','e','r','t','i','c','a','l','R','e','s','o','l','u','t','i','o','n',0}; static const WCHAR prop_descriptionW[] = {'D','e','s','c','r','i','p','t','i','o','n',0}; static const WCHAR prop_deviceidW[] = @@ -75,6 +81,8 @@ static const WCHAR prop_manufacturerW[] = {'M','a','n','u','f','a','c','t','u','r','e','r',0}; static const WCHAR prop_modelW[] = {'M','o','d','e','l',0}; +static const WCHAR prop_nameW[] = + {'N','a','m','e',0}; static const WCHAR prop_netconnectionstatusW[] = {'N','e','t','C','o','n','n','e','c','t','i','o','n','S','t','a','t','u','s',0}; static const WCHAR prop_numlogicalprocessorsW[] = @@ -152,8 +160,12 @@ static const struct column col_processor[] = }; static const struct column col_videocontroller[] = { - { prop_adapterramW, CIM_UINT32 }, - { prop_deviceidW, CIM_STRING|COL_FLAG_KEY } + { prop_adapterramW, CIM_UINT32 }, + { prop_currentbitsperpixelW, CIM_UINT32 }, + { prop_currenthorizontalresW, CIM_UINT32 }, + { prop_currentverticalresW, CIM_UINT32 }, + { prop_deviceidW, CIM_STRING|COL_FLAG_KEY }, + { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC } }; static const WCHAR bios_descriptionW[] = @@ -235,7 +247,11 @@ struct record_processor struct record_videocontroller { UINT32 adapter_ram; + UINT32 current_bitsperpixel; + UINT32 current_horizontalres; + UINT32 current_verticalres; const WCHAR *device_id; + const WCHAR *name; }; #include "poppack.h" @@ -438,6 +454,19 @@ static void fill_os( struct table *table ) table->num_rows = 1; } +static UINT32 get_bits_per_pixel( UINT *hres, UINT *vres ) +{ + HDC hdc = GetDC( NULL ); + UINT32 ret; + + if (!hdc) return 32; + ret = GetDeviceCaps( hdc, BITSPIXEL ); + *hres = GetDeviceCaps( hdc, HORZRES ); + *vres = GetDeviceCaps( hdc, VERTRES ); + ReleaseDC( NULL, hdc ); + return ret; +} + static void fill_videocontroller( struct table *table ) { @@ -446,7 +475,8 @@ static void fill_videocontroller( struct table *table ) IDXGIFactory *factory = NULL; IDXGIAdapter *adapter = NULL; DXGI_ADAPTER_DESC desc; - UINT vidmem = 512 * 1024 * 1024; + UINT hres = 1024, vres = 768, vidmem = 512 * 1024 * 1024; + const WCHAR *name = videocontroller_deviceidW; if (!(table->data = heap_alloc( sizeof(*rec) ))) return; @@ -457,12 +487,20 @@ static void fill_videocontroller( struct table *table ) if (FAILED(hr)) goto done; hr = IDXGIAdapter_GetDesc( adapter, &desc ); - if (SUCCEEDED(hr)) vidmem = desc.DedicatedVideoMemory; + if (SUCCEEDED(hr)) + { + vidmem = desc.DedicatedVideoMemory; + name = desc.Description; + } done: rec = (struct record_videocontroller *)table->data; - rec->device_id = videocontroller_deviceidW; - rec->adapter_ram = vidmem; + rec->adapter_ram = vidmem; + rec->current_bitsperpixel = get_bits_per_pixel( &hres, &vres ); + rec->current_horizontalres = hres; + rec->current_verticalres = vres; + rec->device_id = videocontroller_deviceidW; + rec->name = heap_strdupW( name ); TRACE("created 1 row\n"); table->num_rows = 1;

1 0

Hans Leidekker : wbemprox: Implement IWbemServices::GetObject.
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: dc0e478d5cfa1cdf9b2504110238c10012ab2d19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc0e478d5cfa1cdf9b2504110… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jun 28 09:24:21 2012 +0200 wbemprox: Implement IWbemServices::GetObject. --- dlls/wbemprox/services.c | 26 ++++++++++++++++++++++++-- 1 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/services.c b/dlls/wbemprox/services.c index aeca7c8..05a9811 100644 --- a/dlls/wbemprox/services.c +++ b/dlls/wbemprox/services.c @@ -239,8 +239,30 @@ static HRESULT WINAPI wbem_services_GetObject( IWbemClassObject **ppObject, IWbemCallResult **ppCallResult ) { - FIXME("\n"); - return WBEM_E_FAILED; + static const WCHAR selectW[] = {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ',0}; + IEnumWbemClassObject *iter; + WCHAR *query; + HRESULT hr; + + TRACE("%p, %s, 0x%08x, %p, %p, %p\n", iface, debugstr_w(strObjectPath), lFlags, + pCtx, ppObject, ppCallResult); + + if (lFlags) FIXME("unsupported flags 0x%08x\n", lFlags); + + /* FIXME: parse path */ + + if (!(query = heap_alloc( strlenW( strObjectPath ) * sizeof(WCHAR) + sizeof(selectW) ))) + return E_OUTOFMEMORY; + strcpyW( query, selectW ); + strcatW( query, strObjectPath ); + + hr = exec_query( query, &iter ); + heap_free( query ); + if (hr != S_OK) return hr; + + hr = WbemClassObject_create( NULL, iter, 0, (void **)ppObject ); + IEnumWbemClassObject_Release( iter ); + return hr; } static HRESULT WINAPI wbem_services_GetObjectAsync(

1 0

Hans Leidekker : wbemprox: Support IClientSecurity on the class enumerator object; .
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: 0ceee481fe16ac6f731f4cb13717d5b404bb3147 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ceee481fe16ac6f731f4cb13… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jun 28 09:24:42 2012 +0200 wbemprox: Support IClientSecurity on the class enumerator object;. --- dlls/wbemprox/class.c | 5 +++++ dlls/wbemprox/services.c | 2 +- dlls/wbemprox/wbemprox_private.h | 2 ++ 3 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index bb2c5e6..f32ee35 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -80,6 +80,11 @@ static HRESULT WINAPI enum_class_object_QueryInterface( { *ppvObject = ec; } + else if ( IsEqualGUID( riid, &IID_IClientSecurity ) ) + { + *ppvObject = &client_security; + return S_OK; + } else { FIXME("interface %s not implemented\n", debugstr_guid(riid)); diff --git a/dlls/wbemprox/services.c b/dlls/wbemprox/services.c index 05a9811..2e8a34a 100644 --- a/dlls/wbemprox/services.c +++ b/dlls/wbemprox/services.c @@ -130,7 +130,7 @@ static const IClientSecurityVtbl client_security_vtbl = client_security_CopyProxy }; -static IClientSecurity client_security = { &client_security_vtbl }; +IClientSecurity client_security = { &client_security_vtbl }; struct wbem_services { diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index db3cb3a..6865ddd 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -19,6 +19,8 @@ #include "wine/list.h" #include "wine/unicode.h" +IClientSecurity client_security; + #define SIZEOF(array) (sizeof(array)/sizeof((array)[0])) #define COL_TYPE_MASK 0x0000ffff

1 0

Hans Leidekker : wbemprox: Add reference counting to the query object.
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: 992d1e15597389b0d378d86a03ae160050458cb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=992d1e15597389b0d378d86a0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jun 28 09:25:13 2012 +0200 wbemprox: Add reference counting to the query object. --- dlls/wbemprox/class.c | 3 ++- dlls/wbemprox/query.c | 19 +++++++++++++++---- dlls/wbemprox/wbemprox_private.h | 4 +++- 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index f32ee35..e826202 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -60,7 +60,7 @@ static ULONG WINAPI enum_class_object_Release( if (!refs) { TRACE("destroying %p\n", ec); - free_query( ec->query ); + release_query( ec->query ); heap_free( ec ); } return refs; @@ -198,6 +198,7 @@ HRESULT EnumWbemClassObject_create( ec->IEnumWbemClassObject_iface.lpVtbl = &enum_class_object_vtbl; ec->refs = 1; ec->query = query; + addref_query( query ); ec->index = 0; *ppObj = &ec->IEnumWbemClassObject_iface; diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 0f41d44..7e5872a 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -395,16 +395,17 @@ static HRESULT execute_view( struct view *view ) return S_OK; } -static struct query *alloc_query(void) +static struct query *create_query(void) { struct query *query; if (!(query = heap_alloc( sizeof(*query) ))) return NULL; list_init( &query->mem ); + query->refs = 1; return query; } -void free_query( struct query *query ) +static void free_query( struct query *query ) { struct list *mem, *next; @@ -416,13 +417,23 @@ void free_query( struct query *query ) heap_free( query ); } +void addref_query( struct query *query ) +{ + InterlockedIncrement( &query->refs ); +} + +void release_query( struct query *query ) +{ + if (!InterlockedDecrement( &query->refs )) free_query( query ); +} + HRESULT exec_query( const WCHAR *str, IEnumWbemClassObject **result ) { HRESULT hr; struct query *query; *result = NULL; - if (!(query = alloc_query())) return E_OUTOFMEMORY; + if (!(query = create_query())) return E_OUTOFMEMORY; hr = parse_query( str, &query->view, &query->mem ); if (hr != S_OK) goto done; hr = execute_view( query->view ); @@ -430,7 +441,7 @@ HRESULT exec_query( const WCHAR *str, IEnumWbemClassObject **result ) hr = EnumWbemClassObject_create( NULL, query, (void **)result ); done: - if (hr != S_OK) free_query( query ); + release_query( query ); return hr; } diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index 6865ddd..e2ffce1 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -106,11 +106,13 @@ struct view struct query { + LONG refs; struct view *view; struct list mem; }; -void free_query( struct query * ) DECLSPEC_HIDDEN; +void addref_query( struct query * ) DECLSPEC_HIDDEN; +void release_query( struct query *query ) DECLSPEC_HIDDEN; HRESULT exec_query( const WCHAR *, IEnumWbemClassObject ** ) DECLSPEC_HIDDEN; HRESULT parse_query( const WCHAR *, struct view **, struct list * ) DECLSPEC_HIDDEN; HRESULT create_view( const struct property *, const WCHAR *, const struct expr *,

1 0

Hans Leidekker : wbemprox: Implement IEnumWbemClassObject::Clone.
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: 02b00ffb27f9a275b338c069d380154918da7f82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02b00ffb27f9a275b338c069d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jun 28 09:25:39 2012 +0200 wbemprox: Implement IEnumWbemClassObject::Clone. --- dlls/wbemprox/class.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index e826202..d60f726 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -148,8 +148,11 @@ static HRESULT WINAPI enum_class_object_Clone( IEnumWbemClassObject *iface, IEnumWbemClassObject **ppEnum ) { - FIXME("%p, %p\n", iface, ppEnum); - return E_NOTIMPL; + struct enum_class_object *ec = impl_from_IEnumWbemClassObject( iface ); + + TRACE("%p, %p\n", iface, ppEnum); + + return EnumWbemClassObject_create( NULL, ec->query, (void **)ppEnum ); } static HRESULT WINAPI enum_class_object_Skip(

1 0

Alexandre Julliard : winex11: Simplify wglSetPixelFormatWINE and export it as a standard extension function .
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: db25d4022aad801a455bea09267a4be8ed0206fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=db25d4022aad801a455bea092… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 28 12:00:45 2012 +0200 winex11: Simplify wglSetPixelFormatWINE and export it as a standard extension function. --- dlls/gdi32/opengl.c | 23 ------------ dlls/wined3d/context.c | 2 +- dlls/wined3d/wined3d_gl.h | 3 +- dlls/winex11.drv/opengl.c | 83 +++++++++++++++++++++++++-------------------- 4 files changed, 48 insertions(+), 63 deletions(-) diff --git a/dlls/gdi32/opengl.c b/dlls/gdi32/opengl.c index 90c2a87..df7424d 100644 --- a/dlls/gdi32/opengl.c +++ b/dlls/gdi32/opengl.c @@ -101,27 +101,6 @@ static HGLRC WINAPI wglCreateContextAttribsARB(HDC hdc, HGLRC hShareContext, con return ret; } -/************************************************************************************** - * WINE-specific wglSetPixelFormat which can set the iPixelFormat multiple times - * - */ -static BOOL WINAPI wglSetPixelFormatWINE(HDC hdc, int iPixelFormat, const PIXELFORMATDESCRIPTOR *ppfd) -{ - INT bRet = FALSE; - DC * dc = get_dc_ptr( hdc ); - - TRACE("(%p,%d,%p)\n", hdc, iPixelFormat, ppfd); - - if (dc) - { - PHYSDEV physdev = GET_DC_PHYSDEV( dc, pwglSetPixelFormatWINE ); - update_dc( dc ); - bRet = physdev->funcs->pwglSetPixelFormatWINE( physdev, iPixelFormat, ppfd ); - release_dc_ptr( dc ); - } - return bRet; -} - /*********************************************************************** * Internal wglGetProcAddress for retrieving WGL extensions */ @@ -151,8 +130,6 @@ PROC WINAPI wglGetProcAddress(LPCSTR func) */ if(ret && strcmp(func, "wglCreateContextAttribsARB") == 0) return (PROC)wglCreateContextAttribsARB; - else if(ret && strcmp(func, "wglSetPixelFormatWINE") == 0) - return (PROC)wglSetPixelFormatWINE; return ret; } diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index b5db3e1..e53936f 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -741,7 +741,7 @@ static BOOL context_set_pixel_format(const struct wined3d_gl_info *gl_info, HDC * when really needed. */ if (gl_info->supported[WGL_WINE_PIXEL_FORMAT_PASSTHROUGH]) { - if (!GL_EXTCALL(wglSetPixelFormatWINE(dc, format, NULL))) + if (!GL_EXTCALL(wglSetPixelFormatWINE(dc, format))) { ERR("wglSetPixelFormatWINE failed to set pixel format %d on device context %p.\n", format, dc); diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index fe156d0..51281e4 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -3770,8 +3770,7 @@ typedef BOOL (WINAPI *WINED3D_PFNWGLCHOOSEPIXELFORMATARBPROC)(HDC hdc, const int #endif /* WGL_WINE_pixel_format_passthrough */ -typedef BOOL (WINAPI *WINED3D_PFNWGLSETPIXELFORMATWINE)(HDC hdc, int iPixelFormat, - const PIXELFORMATDESCRIPTOR *ppfd); +typedef BOOL (WINAPI *WINED3D_PFNWGLSETPIXELFORMATWINE)(HDC hdc, int iPixelFormat); typedef BOOL (WINAPI *WINED3D_PFNWGLSWAPINTERVALEXTPROC)(int interval); diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index b78edc3..09694f1 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1310,17 +1310,25 @@ static int glxdrv_GetPixelFormat(PHYSDEV dev) return physdev->pixel_format; } -/* This function is the core of X11DRV_SetPixelFormat and X11DRV_SetPixelFormatWINE. - * Both functions are the same except that X11DRV_SetPixelFormatWINE allows you to - * set the pixel format multiple times. */ -static BOOL internal_SetPixelFormat( struct glx_physdev *physdev, - int iPixelFormat, - const PIXELFORMATDESCRIPTOR *ppfd) +/** + * glxdrv_SetPixelFormat + * + * Set the pixel-format id used by this DC + */ +static BOOL glxdrv_SetPixelFormat(PHYSDEV dev, int iPixelFormat, const PIXELFORMATDESCRIPTOR *ppfd) { + struct glx_physdev *physdev = get_glxdrv_dev( dev ); WineGLPixelFormat *fmt; int value; HWND hwnd; + TRACE("(%p,%d,%p)\n", dev->hdc, iPixelFormat, ppfd); + + if (!has_opengl()) return FALSE; + + if(physdev->pixel_format) /* cannot change it if already set */ + return (physdev->pixel_format == iPixelFormat); + /* SetPixelFormat is not allowed on the X root_window e.g. GetDC(0) */ if(physdev->x11dev->drawable == root_window) { @@ -1385,26 +1393,6 @@ static BOOL internal_SetPixelFormat( struct glx_physdev *physdev, return TRUE; } - -/** - * glxdrv_SetPixelFormat - * - * Set the pixel-format id used by this DC - */ -static BOOL glxdrv_SetPixelFormat(PHYSDEV dev, int iPixelFormat, const PIXELFORMATDESCRIPTOR *ppfd) -{ - struct glx_physdev *physdev = get_glxdrv_dev( dev ); - - TRACE("(%p,%d,%p)\n", dev->hdc, iPixelFormat, ppfd); - - if (!has_opengl()) return FALSE; - - if(physdev->pixel_format) /* cannot change it if already set */ - return (physdev->pixel_format == iPixelFormat); - - return internal_SetPixelFormat(physdev, iPixelFormat, ppfd); -} - /** * X11DRV_wglCopyContext * @@ -2991,24 +2979,45 @@ static void WINAPI X11DRV_wglFreeMemoryNV(GLvoid* pointer) { } /** - * glxdrv_wglSetPixelFormatWINE + * X11DRV_wglSetPixelFormatWINE * * WGL_WINE_pixel_format_passthrough: wglSetPixelFormatWINE * This is a WINE-specific wglSetPixelFormat which can set the pixel format multiple times. */ -static BOOL glxdrv_wglSetPixelFormatWINE(PHYSDEV dev, int iPixelFormat, const PIXELFORMATDESCRIPTOR *ppfd) +static BOOL WINAPI X11DRV_wglSetPixelFormatWINE(HDC hdc, int format) { - struct glx_physdev *physdev = get_glxdrv_dev( dev ); + WineGLPixelFormat *fmt; + int value; + HWND hwnd; - TRACE("(%p,%d,%p)\n", dev->hdc, iPixelFormat, ppfd); + TRACE("(%p,%d)\n", hdc, format); - if (!has_opengl()) return FALSE; + fmt = ConvertPixelFormatWGLtoGLX(gdi_display, format, FALSE /* Offscreen */, &value); + if (!fmt) + { + ERR( "Invalid format %d\n", format ); + return FALSE; + } - if (physdev->pixel_format == iPixelFormat) return TRUE; + hwnd = WindowFromDC( hdc ); + if (!hwnd || hwnd == GetDesktopWindow()) + { + ERR( "not a valid window DC %p\n", hdc ); + return FALSE; + } + + wine_tsx11_lock(); + pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_DRAWABLE_TYPE, &value); + wine_tsx11_unlock(); + + if (!(value & GLX_WINDOW_BIT)) + { + WARN( "Pixel format %d is not compatible for window rendering\n", format ); + return FALSE; + } - /* Relay to the core SetPixelFormat */ - TRACE("Changing iPixelFormat from %d to %d\n", physdev->pixel_format, iPixelFormat); - return internal_SetPixelFormat(physdev, iPixelFormat, ppfd); + return SendMessageW(hwnd, WM_X11DRV_SET_WIN_FORMAT, fmt->fmt_id, 0); + /* DC pixel format will be set by the DCE update */ } /** @@ -3167,7 +3176,7 @@ static const WineGLExtension WGL_WINE_pixel_format_passthrough = { "WGL_WINE_pixel_format_passthrough", { - { "wglSetPixelFormatWINE", (void *)1 /* not called directly */ }, + { "wglSetPixelFormatWINE", X11DRV_wglSetPixelFormatWINE }, } }; @@ -3586,7 +3595,7 @@ static const struct gdi_dc_funcs glxdrv_funcs = glxdrv_wglGetProcAddress, /* pwglGetProcAddress */ NULL, /* pwglMakeContextCurrentARB */ NULL, /* pwglMakeCurrent */ - glxdrv_wglSetPixelFormatWINE, /* pwglSetPixelFormatWINE */ + NULL, /* pwglSetPixelFormatWINE */ GDI_PRIORITY_GRAPHICS_DRV + 20 /* priority */ };

1 0

Alexandre Julliard : opengl32: Add the concept of a WGL driver.
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: 7a031d9b92320f1cb2d30d112d0e7a7afcf10c73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a031d9b92320f1cb2d30d112… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 28 14:13:24 2012 +0200 opengl32: Add the concept of a WGL driver. --- dlls/gdi32/dibdrv/dc.c | 4 +-- dlls/gdi32/driver.c | 18 ++-------- dlls/gdi32/enhmfdrv/init.c | 4 +-- dlls/gdi32/freetype.c | 4 +-- dlls/gdi32/gdi32.spec | 3 ++ dlls/gdi32/mfdrv/init.c | 4 +-- dlls/gdi32/opengl.c | 17 +++++++++ dlls/gdi32/path.c | 4 +-- dlls/opengl32/wgl.c | 28 ++++++-------- dlls/wineps.drv/init.c | 4 +-- dlls/winex11.drv/init.c | 13 +------ dlls/winex11.drv/opengl.c | 83 ++++++++++++++++++++++++------------------- dlls/winex11.drv/xrender.c | 4 +-- include/wine/gdi_driver.h | 19 ++++++++-- 14 files changed, 104 insertions(+), 105 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7a031d9b92320f1cb2d30…

1 0

Alexandre Julliard : opengl32: Move wglMakeContextCurrentARB to the WGL driver.
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: 47fe838b152b54742e5af612ca4ad4fa1fb213e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47fe838b152b54742e5af612c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 28 14:49:49 2012 +0200 opengl32: Move wglMakeContextCurrentARB to the WGL driver. --- dlls/opengl32/wgl.c | 23 ++++++++++++++++++++++- dlls/winex11.drv/opengl.c | 11 +++++------ include/wine/gdi_driver.h | 3 ++- 3 files changed, 29 insertions(+), 8 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 16a76db..9761bba 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -133,6 +133,14 @@ BOOL WINAPI wglMakeCurrent(HDC hdc, HGLRC hglrc) } /*********************************************************************** + * wglMakeContextCurrentARB (wrapper for the extension function returned by the driver) + */ +static BOOL WINAPI wglMakeContextCurrentARB( HDC draw_hdc, HDC read_hdc, HGLRC hglrc ) +{ + return wgl_driver->p_wglMakeContextCurrentARB( draw_hdc, read_hdc, hglrc ); +} + +/*********************************************************************** * wglShareLists (OPENGL32.@) */ BOOL WINAPI wglShareLists(HGLRC hglrc1, HGLRC hglrc2) @@ -487,7 +495,20 @@ PROC WINAPI wglGetProcAddress(LPCSTR lpszProc) { if (ext_ret == NULL) { /* If the function name starts with a 'w', it is a WGL extension */ if(lpszProc[0] == 'w') - return wine_wgl.p_wglGetProcAddress(lpszProc); + { + local_func = wine_wgl.p_wglGetProcAddress( lpszProc ); + if (local_func == (void *)1) /* special function that needs a wrapper */ + { + if (!strcmp( lpszProc, "wglMakeContextCurrentARB" )) + local_func = wglMakeContextCurrentARB; + else + { + FIXME( "wrapper missing for %s\n", lpszProc ); + local_func = NULL; + } + } + return local_func; + } /* We are dealing with an unknown GL extension */ WARN("Extension '%s' not defined in opengl32.dll's function table!\n", lpszProc); diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 4c1ce9c..f99e98c 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1654,12 +1654,10 @@ static BOOL glxdrv_wglMakeCurrent(HDC hdc, HGLRC hglrc) return ret; } -/** - * X11DRV_wglMakeContextCurrentARB - * - * For OpenGL32 wglMakeContextCurrentARB +/*********************************************************************** + * glxdrv_wglMakeContextCurrentARB */ -static BOOL WINAPI X11DRV_wglMakeContextCurrentARB( HDC draw_hdc, HDC read_hdc, HGLRC hglrc ) +static BOOL glxdrv_wglMakeContextCurrentARB( HDC draw_hdc, HDC read_hdc, HGLRC hglrc ) { Wine_GLContext *ctx = (Wine_GLContext *)hglrc; Wine_GLContext *prev_ctx = NtCurrentTeb()->glContext; @@ -3095,7 +3093,7 @@ static const WineGLExtension WGL_ARB_make_current_read = "WGL_ARB_make_current_read", { { "wglGetCurrentReadDCARB", X11DRV_wglGetCurrentReadDCARB }, - { "wglMakeContextCurrentARB", X11DRV_wglMakeContextCurrentARB }, + { "wglMakeContextCurrentARB", (void *)1 /* called through the glxdrv_wgl_funcs driver */ }, } }; @@ -3604,6 +3602,7 @@ static const struct wgl_funcs glxdrv_wgl_funcs = glxdrv_wglCopyContext, /* p_wglCopyContext */ glxdrv_wglDeleteContext, /* p_wglDeleteContext */ glxdrv_wglGetCurrentDC, /* p_wglGetCurrentDC */ + glxdrv_wglMakeContextCurrentARB, /* p_wglMakeContextCurrentARB */ glxdrv_wglMakeCurrent, /* p_wglMakeCurrent */ glxdrv_wglShareLists, /* p_wglShareLists */ }; diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index 7a17d09..4f4ad94 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -203,7 +203,7 @@ struct gdi_dc_funcs }; /* increment this when you change the DC function table */ -#define WINE_GDI_DRIVER_VERSION 33 +#define WINE_GDI_DRIVER_VERSION 34 #define GDI_PRIORITY_NULL_DRV 0 /* null driver */ #define GDI_PRIORITY_FONT_DRV 100 /* any font driver */ @@ -236,6 +236,7 @@ struct wgl_funcs BOOL (*p_wglCopyContext)(HGLRC,HGLRC,UINT); BOOL (*p_wglDeleteContext)(HGLRC); HDC (*p_wglGetCurrentDC)(void); + BOOL (*p_wglMakeContextCurrentARB)(HDC,HDC,HGLRC); BOOL (*p_wglMakeCurrent)(HDC,HGLRC); BOOL (*p_wglShareLists)(HGLRC,HGLRC); };

1 0