February 2008 - Wine-commits

James Hawkins : msi: Simplify the check for a valid product code.
by Alexandre Julliard 25 Feb '08

25 Feb '08

Module: wine Branch: master Commit: f178985db3fc492acee7b589bc0f46b78bb74b9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f178985db3fc492acee7b589b… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sun Feb 24 20:03:24 2008 -0600 msi: Simplify the check for a valid product code. --- dlls/msi/source.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/msi/source.c b/dlls/msi/source.c index c373df2..66a3af1 100644 --- a/dlls/msi/source.c +++ b/dlls/msi/source.c @@ -351,16 +351,13 @@ UINT WINAPI MsiSourceListGetInfoW( LPCWSTR szProduct, LPCWSTR szUserSid, LPCWSTR szProperty, LPWSTR szValue, LPDWORD pcchValue) { + WCHAR squished_pc[GUID_SIZE]; HKEY sourcekey; UINT rc; TRACE("%s %s\n", debugstr_w(szProduct), debugstr_w(szProperty)); - if (!szProduct || !*szProduct) - return ERROR_INVALID_PARAMETER; - - if (lstrlenW(szProduct) != GUID_SIZE - 1 || - (szProduct[0] != '{' && szProduct[GUID_SIZE - 2] != '}')) + if (!szProduct || !squash_guid(szProduct, squished_pc)) return ERROR_INVALID_PARAMETER; if (szValue && !pcchValue)

1 0

Jacek Caban : mshtml: Added IHTMLBodyElement::aLink implementation.
by Alexandre Julliard 25 Feb '08

25 Feb '08

Module: wine Branch: master Commit: 28cf008c3b580d183ef0943dff8c7392514f3795 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28cf008c3b580d183ef0943df… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Feb 24 22:18:47 2008 +0100 mshtml: Added IHTMLBodyElement::aLink implementation. --- dlls/mshtml/htmlbody.c | 32 ++++++++++++++++++++++++++++---- 1 files changed, 28 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index dd2c044..6ad26ee 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -369,15 +369,39 @@ static HRESULT WINAPI HTMLBodyElement_get_vLink(IHTMLBodyElement *iface, VARIANT static HRESULT WINAPI HTMLBodyElement_put_aLink(IHTMLBodyElement *iface, VARIANT v) { HTMLBodyElement *This = HTMLBODY_THIS(iface); - FIXME("(%p)->()\n", This); - return E_NOTIMPL; + nsAString alink_str; + nsresult nsres; + + TRACE("(%p)->(v%d)\n", This, V_VT(&v)); + + if(!variant_to_nscolor(&v, &alink_str)) + return S_OK; + + nsres = nsIDOMHTMLBodyElement_SetALink(This->nsbody, &alink_str); + nsAString_Finish(&alink_str); + if(NS_FAILED(nsres)) + ERR("SetALink failed: %08x\n", nsres); + + return S_OK; } static HRESULT WINAPI HTMLBodyElement_get_aLink(IHTMLBodyElement *iface, VARIANT *p) { HTMLBodyElement *This = HTMLBODY_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString alink_str; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&alink_str, NULL); + nsres = nsIDOMHTMLBodyElement_GetALink(This->nsbody, &alink_str); + if(NS_FAILED(nsres)) + ERR("GetALink failed: %08x\n", nsres); + + nscolor_to_variant(&alink_str, p); + nsAString_Finish(&alink_str); + + return S_OK; } static HRESULT WINAPI HTMLBodyElement_put_onload(IHTMLBodyElement *iface, VARIANT v)

1 0

Jacek Caban : mshtml: Added IHTMLBodyElement::vLink implementation.
by Alexandre Julliard 25 Feb '08

25 Feb '08

Module: wine Branch: master Commit: a81fb4ca0ca461ee0fe8a8a427263323ed5a98ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=a81fb4ca0ca461ee0fe8a8a42… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Feb 24 22:18:24 2008 +0100 mshtml: Added IHTMLBodyElement::vLink implementation. --- dlls/mshtml/htmlbody.c | 32 ++++++++++++++++++++++++++++---- 1 files changed, 28 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index d0ee45a..dd2c044 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -331,15 +331,39 @@ static HRESULT WINAPI HTMLBodyElement_get_link(IHTMLBodyElement *iface, VARIANT static HRESULT WINAPI HTMLBodyElement_put_vLink(IHTMLBodyElement *iface, VARIANT v) { HTMLBodyElement *This = HTMLBODY_THIS(iface); - FIXME("(%p)->()\n", This); - return E_NOTIMPL; + nsAString vlink_str; + nsresult nsres; + + TRACE("(%p)->(v%d)\n", This, V_VT(&v)); + + if(!variant_to_nscolor(&v, &vlink_str)) + return S_OK; + + nsres = nsIDOMHTMLBodyElement_SetVLink(This->nsbody, &vlink_str); + nsAString_Finish(&vlink_str); + if(NS_FAILED(nsres)) + ERR("SetLink failed: %08x\n", nsres); + + return S_OK; } static HRESULT WINAPI HTMLBodyElement_get_vLink(IHTMLBodyElement *iface, VARIANT *p) { HTMLBodyElement *This = HTMLBODY_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString vlink_str; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&vlink_str, NULL); + nsres = nsIDOMHTMLBodyElement_GetVLink(This->nsbody, &vlink_str); + if(NS_FAILED(nsres)) + ERR("GetLink failed: %08x\n", nsres); + + nscolor_to_variant(&vlink_str, p); + nsAString_Finish(&vlink_str); + + return S_OK; } static HRESULT WINAPI HTMLBodyElement_put_aLink(IHTMLBodyElement *iface, VARIANT v)

1 0

Jacek Caban : mshtml: Added IHTMLBodyElement::get_link implementation.
by Alexandre Julliard 25 Feb '08

25 Feb '08

Module: wine Branch: master Commit: 8d7e1922d834c1591f2d9a432023262adcb8b899 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d7e1922d834c1591f2d9a432… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Feb 24 22:17:55 2008 +0100 mshtml: Added IHTMLBodyElement::get_link implementation. --- dlls/mshtml/htmlbody.c | 31 +++++++++++++++++++++++++++++-- 1 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index 8bd60e2..d0ee45a 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -71,6 +71,21 @@ static BOOL variant_to_nscolor(const VARIANT *v, nsAString *nsstr) } +static void nscolor_to_variant(const nsAString *nsstr, VARIANT *p) +{ + const PRUnichar *color; + + nsAString_GetData(nsstr, &color); + + if(*color == '#') { + V_VT(p) = VT_I4; + V_I4(p) = strtolW(color+1, NULL, 16); + }else { + V_VT(p) = VT_BSTR; + V_BSTR(p) = SysAllocString(color); + } +} + #define HTMLBODY_THIS(iface) DEFINE_THIS(HTMLBodyElement, HTMLBodyElement, iface) static HRESULT WINAPI HTMLBodyElement_QueryInterface(IHTMLBodyElement *iface, @@ -297,8 +312,20 @@ static HRESULT WINAPI HTMLBodyElement_put_link(IHTMLBodyElement *iface, VARIANT static HRESULT WINAPI HTMLBodyElement_get_link(IHTMLBodyElement *iface, VARIANT *p) { HTMLBodyElement *This = HTMLBODY_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString link_str; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&link_str, NULL); + nsres = nsIDOMHTMLBodyElement_GetLink(This->nsbody, &link_str); + if(NS_FAILED(nsres)) + ERR("GetLink failed: %08x\n", nsres); + + nscolor_to_variant(&link_str, p); + nsAString_Finish(&link_str); + + return S_OK; } static HRESULT WINAPI HTMLBodyElement_put_vLink(IHTMLBodyElement *iface, VARIANT v)

1 0

Jacek Caban : mshtml: Added IHTMLBodyElement::put_link implementation.
by Alexandre Julliard 25 Feb '08

25 Feb '08

Module: wine Branch: master Commit: a7ba7647adf6ac2f25a8fa9c097bfd20537fd392 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7ba7647adf6ac2f25a8fa9c0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Feb 24 22:17:32 2008 +0100 mshtml: Added IHTMLBodyElement::put_link implementation. --- dlls/mshtml/htmlbody.c | 40 ++++++++++++++++++++++++++++++++++++++-- 1 files changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index d3bbfd0..8bd60e2 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -47,6 +47,30 @@ typedef struct { #define HTMLBODY(x) ((IHTMLBodyElement*) &(x)->lpHTMLBodyElementVtbl) +static BOOL variant_to_nscolor(const VARIANT *v, nsAString *nsstr) +{ + switch(V_VT(v)) { + case VT_BSTR: + nsAString_Init(nsstr, V_BSTR(v)); + return TRUE; + + case VT_I4: { + PRUnichar buf[10]; + static const WCHAR formatW[] = {'#','%','x',0}; + + wsprintfW(buf, formatW, V_I4(v)); + nsAString_Init(nsstr, buf); + return TRUE; + } + + default: + FIXME("invalid vt=%d\n", V_VT(v)); + } + + return FALSE; + +} + #define HTMLBODY_THIS(iface) DEFINE_THIS(HTMLBodyElement, HTMLBodyElement, iface) static HRESULT WINAPI HTMLBodyElement_QueryInterface(IHTMLBodyElement *iface, @@ -254,8 +278,20 @@ static HRESULT WINAPI HTMLBodyElement_get_text(IHTMLBodyElement *iface, VARIANT static HRESULT WINAPI HTMLBodyElement_put_link(IHTMLBodyElement *iface, VARIANT v) { HTMLBodyElement *This = HTMLBODY_THIS(iface); - FIXME("(%p)->()\n", This); - return E_NOTIMPL; + nsAString link_str; + nsresult nsres; + + TRACE("(%p)->(v%d)\n", This, V_VT(&v)); + + if(!variant_to_nscolor(&v, &link_str)) + return S_OK; + + nsres = nsIDOMHTMLBodyElement_SetLink(This->nsbody, &link_str); + nsAString_Finish(&link_str); + if(NS_FAILED(nsres)) + ERR("SetLink failed: %08x\n", nsres); + + return S_OK; } static HRESULT WINAPI HTMLBodyElement_get_link(IHTMLBodyElement *iface, VARIANT *p)

1 0

Steven Edwards : winecfg: Up the default desktop resolution to 800x600.
by Alexandre Julliard 25 Feb '08

25 Feb '08

Module: wine Branch: master Commit: 9af30c7987b0e4bff382854f2d9a77a2ad1eaacb URL: http://source.winehq.org/git/wine.git/?a=commit;h=9af30c7987b0e4bff382854f2… Author: Steven Edwards <steven(a)codeweavers.com> Date: Sun Feb 24 06:09:36 2008 -0500 winecfg: Up the default desktop resolution to 800x600. --- programs/winecfg/x11drvdlg.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/programs/winecfg/x11drvdlg.c b/programs/winecfg/x11drvdlg.c index 0a4e597..51098e4 100644 --- a/programs/winecfg/x11drvdlg.c +++ b/programs/winecfg/x11drvdlg.c @@ -78,7 +78,7 @@ static void update_gui_for_desktop_mode(HWND dialog) { char* buf, *bufindex; CheckDlgButton(dialog, IDC_ENABLE_DESKTOP, BST_CHECKED); - buf = get_reg_key(config_key, keypath("X11 Driver"), "Desktop", "640x480"); + buf = get_reg_key(config_key, keypath("X11 Driver"), "Desktop", "800x600"); /* note: this test must match the one in x11drv */ if( buf[0] != 'n' && buf[0] != 'N' && buf[0] != 'F' && buf[0] != 'f' && buf[0] != '0') { @@ -96,8 +96,8 @@ static void update_gui_for_desktop_mode(HWND dialog) { SetWindowText(GetDlgItem(dialog, IDC_DESKTOP_HEIGHT), bufindex); } else { WINE_TRACE("Desktop registry entry is malformed\n"); - SetWindowText(GetDlgItem(dialog, IDC_DESKTOP_WIDTH), "640"); - SetWindowText(GetDlgItem(dialog, IDC_DESKTOP_HEIGHT), "480"); + SetWindowText(GetDlgItem(dialog, IDC_DESKTOP_WIDTH), "800"); + SetWindowText(GetDlgItem(dialog, IDC_DESKTOP_HEIGHT), "600"); } } HeapFree(GetProcessHeap(), 0, buf); @@ -183,12 +183,12 @@ static void set_from_desktop_edits(HWND dialog) { if (width == NULL || strcmp(width, "") == 0) { HeapFree(GetProcessHeap(), 0, width); - width = strdupA("640"); + width = strdupA("800"); } if (height == NULL || strcmp(height, "") == 0) { HeapFree(GetProcessHeap(), 0, height); - height = strdupA("480"); + height = strdupA("600"); } new = HeapAlloc(GetProcessHeap(), 0, strlen(width) + strlen(height) + 2 /* x + terminator */);

1 0

Roderick Colenbrander : wgl: Add aux buffers support to DescribePixelFormat .
by Alexandre Julliard 25 Feb '08

25 Feb '08

Module: wine Branch: master Commit: 5374d623ce6ee7ab6913a3453ef64c3ac55320d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5374d623ce6ee7ab6913a3453… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sat Feb 23 15:00:54 2008 +0000 wgl: Add aux buffers support to DescribePixelFormat. --- dlls/winex11.drv/opengl.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 1d0ada0..fa6fac8 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1367,6 +1367,10 @@ int X11DRV_DescribePixelFormat(X11DRV_PDEVICE *physDev, ppfd->cAccumBlueBits = bb; ppfd->cAccumAlphaBits = ab; + /* Aux bits */ + pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_AUX_BUFFERS, &value); + ppfd->cAuxBuffers = value; + /* Depth bits */ pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_DEPTH_SIZE, &value); ppfd->cDepthBits = value; @@ -1377,8 +1381,6 @@ int X11DRV_DescribePixelFormat(X11DRV_PDEVICE *physDev, wine_tsx11_unlock(); - /* Aux : to do ... */ - ppfd->iLayerType = PFD_MAIN_PLANE; if (TRACE_ON(opengl)) {

1 0

Roderick Colenbrander : wined3d: Request aux buffers when using backbuffer rendering.
by Alexandre Julliard 25 Feb '08

25 Feb '08

Module: wine Branch: master Commit: e5bef99fbea6e5b7938511a0527f0b669546624b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5bef99fbea6e5b7938511a05… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sat Feb 23 15:15:11 2008 +0000 wined3d: Request aux buffers when using backbuffer rendering. --- dlls/wined3d/context.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 769949a..cc9574b 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -231,6 +231,9 @@ WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *tar fmt = WINED3DFMT_A4R4G4B4; else if(target->resource.format == WINED3DFMT_X8R8G8B8) fmt = WINED3DFMT_A8R8G8B8; + + /* We like to have two aux buffers in backbuffer mode */ + PUSH2(WGL_AUX_BUFFERS_ARB, 2); } if(!getColorBits(fmt, &redBits, &greenBits, &blueBits, &alphaBits, &colorBits)) {

1 0

Alexandre Julliard : qmgr: Ignore errors when registering the service.
by Alexandre Julliard 25 Feb '08

25 Feb '08

Module: wine Branch: master Commit: 84cf9caa7578c821a2e65518f2e6b4033e55e9bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=84cf9caa7578c821a2e65518f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 25 12:17:40 2008 +0100 qmgr: Ignore errors when registering the service. --- dlls/qmgr/qmgr_main.c | 15 ++++++--------- 1 files changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/qmgr/qmgr_main.c b/dlls/qmgr/qmgr_main.c index 0af2007..2a21a28 100644 --- a/dlls/qmgr/qmgr_main.c +++ b/dlls/qmgr/qmgr_main.c @@ -113,7 +113,6 @@ static HRESULT register_service(BOOL do_register) static const WCHAR path[] = { 's','v','c','h','o','s','t','.','e','x','e', ' ','-','k',' ','n','e','t','s','v','c','s', 0 }; SC_HANDLE scm, service; - HRESULT hr = S_OK; scm = OpenSCManagerW(NULL, NULL, SC_MANAGER_ALL_ACCESS); if (!scm) @@ -129,14 +128,12 @@ static HRESULT register_service(BOOL do_register) CloseServiceHandle(scm); - if (!service) - return SELFREG_E_CLASS; - - if (!do_register) - hr = DeleteService(service) ? S_OK : SELFREG_E_CLASS; - - CloseServiceHandle(service); - return hr; + if (service) + { + if (!do_register) DeleteService(service); + CloseServiceHandle(service); + } + return S_OK; } /* Use an INF file to register or unregister the DLL */

1 0

Roderick Colenbrander : wgl: Remove the pixel format limitation.
by Alexandre Julliard 25 Feb '08

25 Feb '08

Module: wine Branch: master Commit: 8293a9ead0ddbc40be62815f0f0823356665b3dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=8293a9ead0ddbc40be62815f0… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Fri Feb 22 20:40:00 2008 +0000 wgl: Remove the pixel format limitation. --- dlls/winex11.drv/opengl.c | 91 +++++++++++++++++++++----------------------- 1 files changed, 43 insertions(+), 48 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 3531918..d685b94 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -829,17 +829,10 @@ static int get_render_type_from_fbconfig(Display *display, GLXFBConfig fbconfig) static BOOL init_formats(Display *display, int screen, Visual *visual) { - int fmt_id, tmp_fmt_id, nCfgs, i; + int fmt_id, nCfgs, i, run; GLXFBConfig* cfgs; - GLXFBConfig fbconfig = NULL; XVisualInfo *visinfo; - VisualID visualid = XVisualIDFromVisual(visual); - int nOffscreenFormats = 0; - /* As mentioned in various parts of the code only the format of the main visual can be used for onscreen rendering. - * Next to this format there are also so called offscreen rendering formats (used for pbuffers) which can be supported - * because they don't need a visual. Below we use glXGetFBConfigs instead of glXChooseFBConfig to enumerate the fb configurations - * because this call lists both types of formats instead of only onscreen ones. */ cfgs = pglXGetFBConfigs(display, DefaultScreen(display), &nCfgs); if (NULL == cfgs || 0 == nCfgs) { ERR("glXChooseFBConfig returns NULL\n"); @@ -847,48 +840,50 @@ static BOOL init_formats(Display *display, int screen, Visual *visual) return FALSE; } - /* Count the number of offscreen formats to determine the size for our pixelformat list */ - for(i=0; i<nCfgs; i++) { - pglXGetFBConfigAttrib(display, cfgs[i], GLX_FBCONFIG_ID, &tmp_fmt_id); + WineGLPixelFormatList = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, nCfgs*sizeof(WineGLPixelFormat)); - visinfo = pglXGetVisualFromFBConfig(display, cfgs[i]); - /* Onscreen formats have a corresponding XVisual, offscreen ones don't */ - if(!visinfo) { - nOffscreenFormats++; - } else if(visinfo && visinfo->visualid == visualid) { + /* Fill the pixel format list. Put onscreen formats at the top and offscreen ones at the bottom. + * Do this as GLX doesn't guarantee that the list is sorted */ + for(run=0; run < 2; run++) + { + for(i=0; i<nCfgs; i++) { pglXGetFBConfigAttrib(display, cfgs[i], GLX_FBCONFIG_ID, &fmt_id); - fbconfig = cfgs[i]; - XFree(visinfo); - } - } - TRACE("Number of offscreen formats: %d\n", nOffscreenFormats); - - /* Allocate memory for all the offscreen pixelformats and the format of Wine's main visual */ - WineGLPixelFormatList = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (1+nOffscreenFormats)*sizeof(WineGLPixelFormat)); - WineGLPixelFormatList[0].iPixelFormat = 1; - WineGLPixelFormatList[0].fbconfig = fbconfig; - WineGLPixelFormatList[0].fmt_id = fmt_id; - WineGLPixelFormatList[0].render_type = get_render_type_from_fbconfig(display, fbconfig); - WineGLPixelFormatList[0].offscreenOnly = FALSE; - WineGLPixelFormatListSize = 1; - WineGLPixelFormatOnScreenSize = 1; - - /* Fill the list with offscreen formats */ - for(i=0; i<nCfgs; i++) { - pglXGetFBConfigAttrib(display, cfgs[i], GLX_FBCONFIG_ID, &tmp_fmt_id); - - visinfo = pglXGetVisualFromFBConfig(display, cfgs[i]); - /* We have found an offscreen rendering format when there is no visualinfo :) */ - if(!visinfo) { - TRACE("Found offscreen format FBCONFIG_ID 0x%x corresponding to iPixelFormat %d at GLX index %d\n", tmp_fmt_id, WineGLPixelFormatListSize+1, i); - WineGLPixelFormatList[WineGLPixelFormatListSize].iPixelFormat = WineGLPixelFormatListSize+1; /* The index starts at 1 */ - WineGLPixelFormatList[WineGLPixelFormatListSize].fbconfig = cfgs[i]; - WineGLPixelFormatList[WineGLPixelFormatListSize].fmt_id = tmp_fmt_id; - WineGLPixelFormatList[WineGLPixelFormatListSize].render_type = get_render_type_from_fbconfig(display, cfgs[i]); - WineGLPixelFormatList[WineGLPixelFormatListSize].offscreenOnly = TRUE; - WineGLPixelFormatListSize++; - } else { - XFree(visinfo); + visinfo = pglXGetVisualFromFBConfig(display, cfgs[i]); + + /* The first run we only add onscreen formats (ones which have an associated X Visual). + * The second run we only set offscreen formats. */ + if(!run && visinfo) + { + /* We implement child window rendering using offscreen buffers (using composite or an XPixmap). + * The contents is copied to the destination using XCopyArea. For the copying to work + * the depth of the source and destination window should be the same. In general this should + * not be a problem for OpenGL as drivers only advertise formats with a similar depth (or no depth). + * As of the introduction of composition managers at least Nvidia now also offers ARGB visuals + * with a depth of 32 in addition to the default 24 bit. In order to prevent BadMatch errors we only + * list formats with the same depth. */ + if(visinfo->depth != screen_depth) + continue; + + TRACE("Found onscreen format FBCONFIG_ID 0x%x corresponding to iPixelFormat %d at GLX index %d\n", fmt_id, WineGLPixelFormatListSize+1, i); + WineGLPixelFormatList[WineGLPixelFormatListSize].iPixelFormat = WineGLPixelFormatListSize+1; /* The index starts at 1 */ + WineGLPixelFormatList[WineGLPixelFormatListSize].fbconfig = cfgs[i]; + WineGLPixelFormatList[WineGLPixelFormatListSize].fmt_id = fmt_id; + WineGLPixelFormatList[WineGLPixelFormatListSize].render_type = get_render_type_from_fbconfig(display, cfgs[i]); + + WineGLPixelFormatList[WineGLPixelFormatListSize].offscreenOnly = FALSE; + WineGLPixelFormatListSize++; + WineGLPixelFormatOnScreenSize++; + XFree(visinfo); + } else if(run && !visinfo) { + TRACE("Found offscreen format FBCONFIG_ID 0x%x corresponding to iPixelFormat %d at GLX index %d\n", fmt_id, WineGLPixelFormatListSize+1, i); + WineGLPixelFormatList[WineGLPixelFormatListSize].iPixelFormat = WineGLPixelFormatListSize+1; /* The index starts at 1 */ + WineGLPixelFormatList[WineGLPixelFormatListSize].fbconfig = cfgs[i]; + WineGLPixelFormatList[WineGLPixelFormatListSize].fmt_id = fmt_id; + WineGLPixelFormatList[WineGLPixelFormatListSize].render_type = get_render_type_from_fbconfig(display, cfgs[i]); + + WineGLPixelFormatList[WineGLPixelFormatListSize].offscreenOnly = TRUE; + WineGLPixelFormatListSize++; + } } }

1 0