wine-commits October 2011

wine-commits@winehq.org

3 participants
783 discussions

Aric Stewart : user32: Handle PosFromChar if the string is empty and so we have no ssa.
by Alexandre Julliard 28 Oct '11

28 Oct '11

Module: wine Branch: master Commit: 820460fccecb3eb25e983a85088ed8c9ec2b785f URL: http://source.winehq.org/git/wine.git/?a=commit;h=820460fccecb3eb25e983a850… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Oct 27 13:38:00 2011 -0500 user32: Handle PosFromChar if the string is empty and so we have no ssa. --- dlls/user32/edit.c | 24 +++++++++++++++++------- 1 files changed, 17 insertions(+), 7 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index f8cf757..71df7e6 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -1069,11 +1069,16 @@ static LRESULT EDIT_EM_PosFromChar(EDITSTATE *es, INT index, BOOL after_wrap) EDIT_UpdateUniscribeData(es, NULL, 0); if (es->x_offset) { - if (es->x_offset>= get_text_length(es)) + if (es->x_offset >= get_text_length(es)) { - const SIZE *size; - size = ScriptString_pSize(es->ssa); - xoff = size->cx; + if (es->ssa) + { + const SIZE *size; + size = ScriptString_pSize(es->ssa); + xoff = size->cx; + } + else + xoff = 0; } ScriptStringCPtoX(es->ssa, es->x_offset, FALSE, &xoff); } @@ -1081,9 +1086,14 @@ static LRESULT EDIT_EM_PosFromChar(EDITSTATE *es, INT index, BOOL after_wrap) { if (index >= get_text_length(es)) { - const SIZE *size; - size = ScriptString_pSize(es->ssa); - xi = size->cx; + if (es->ssa) + { + const SIZE *size; + size = ScriptString_pSize(es->ssa); + xi = size->cx; + } + else + xi = 0; } else ScriptStringCPtoX(es->ssa, index, FALSE, &xi);

1 0

Austin English : winex11: Only declare X11DRV_DIB_QueryXShm if XShm is supported.
by Alexandre Julliard 28 Oct '11

28 Oct '11

Module: wine Branch: master Commit: 31f8a525c8ce42b815d0824ffd213e15f4776c6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=31f8a525c8ce42b815d0824ff… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Oct 27 13:25:26 2011 -0500 winex11: Only declare X11DRV_DIB_QueryXShm if XShm is supported. --- dlls/winex11.drv/dib.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/dib.c b/dlls/winex11.drv/dib.c index b70dcfa..7e30530 100644 --- a/dlls/winex11.drv/dib.c +++ b/dlls/winex11.drv/dib.c @@ -3849,7 +3849,6 @@ static XImage *X11DRV_XShmCreateImage( int width, int height, int bpp, } return image; } -#endif /* HAVE_LIBXXSHM */ static Bool X11DRV_DIB_QueryXShm( Bool *pixmaps ) { @@ -3858,17 +3857,16 @@ static Bool X11DRV_DIB_QueryXShm( Bool *pixmaps ) if (!initialized) { -#ifdef HAVE_LIBXXSHM int major, minor; have_xshm = XShmQueryVersion( gdi_display, &major, &minor, &have_xshm_pixmaps ); -#endif initialized = TRUE; } *pixmaps = have_xshm_pixmaps; return have_xshm; } +#endif /* HAVE_LIBXXSHM */ /*********************************************************************** * X11DRV_CreateDIBSection (X11DRV.@)

1 0

Austin English : winex11: Only declare the winediag debug channel if OpenGL is enabled.
by Alexandre Julliard 28 Oct '11

28 Oct '11

Module: wine Branch: master Commit: abfb9211c8ce3c2f770c4a4df9fa7cd49e0cd4b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abfb9211c8ce3c2f770c4a4df… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Oct 27 13:17:34 2011 -0500 winex11: Only declare the winediag debug channel if OpenGL is enabled. --- dlls/winex11.drv/opengl.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 78a717d..0d4d822 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -42,10 +42,11 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(wgl); -WINE_DECLARE_DEBUG_CHANNEL(winediag); #ifdef SONAME_LIBGL +WINE_DECLARE_DEBUG_CHANNEL(winediag); + #undef APIENTRY #undef CALLBACK #undef WINAPI

1 0

Frédéric Delanoy : cmd: Make 'if errorlevel' only recognize integer values.
by Alexandre Julliard 28 Oct '11

28 Oct '11

Module: wine Branch: master Commit: 45c1dff5521a71d09c368ed3216f21eea71ee10d URL: http://source.winehq.org/git/wine.git/?a=commit;h=45c1dff5521a71d09c368ed32… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Oct 26 16:57:52 2011 +0200 cmd: Make 'if errorlevel' only recognize integer values. --- programs/cmd/builtins.c | 9 ++++++++- programs/cmd/tests/test_builtins.cmd | 6 ++++++ programs/cmd/tests/test_builtins.cmd.exp | 2 ++ 3 files changed, 16 insertions(+), 1 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 721fb02..22e0342 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1513,7 +1513,14 @@ void WCMD_if (WCHAR *p, CMD_LIST **cmdList) { WINE_TRACE("Condition: %s\n", wine_dbgstr_w(condition)); if (!lstrcmpiW (condition, errlvlW)) { - test = (errorlevel >= atoiW(WCMD_parameter(p, 1+negate, NULL, NULL))); + WCHAR *param = WCMD_parameter(p, 1+negate, NULL, NULL); + WCHAR *endptr; + long int param_int = strtolW(param, &endptr, 10); + if (*endptr) { + WCMD_output_stderr(WCMD_LoadMessage(WCMD_SYNTAXERR)); + return; + } + test = ((long int)errorlevel >= param_int); WCMD_parameter(p, 2+negate, &command, NULL); } else if (!lstrcmpiW (condition, existW)) { diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 02e264d..a56d0a3 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1485,10 +1485,16 @@ call :setError 1 echo %ErrorLevel% if errorlevel 2 echo errorlevel too high, bad if errorlevel 1 echo errorlevel just right, good +if errorlevel 01 echo errorlevel with leading zero just right, good +if errorlevel -1 echo errorlevel with negative number OK +if errorlevel 0x1 echo hexa should not be recognized! +if errorlevel 1a echo invalid error level recognized! call :setError 0 echo abc%ErrorLevel%def if errorlevel 1 echo errorlevel nonzero, bad if not errorlevel 1 echo errorlevel zero, good +if not errorlevel 0x1 echo hexa should not be recognized! +if not errorlevel 1a echo invalid error level recognized! rem Now verify that setting a real variable hides its magic variable set errorlevel=7 echo %ErrorLevel% should be 7 diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 20e5d12..7a0eec3 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -792,6 +792,8 @@ localval 9009 1 errorlevel just right, good +errorlevel with leading zero just right, good +errorlevel with negative number OK abc0def@or_broken@abc1def errorlevel zero, good@or_broken@errorlevel nonzero, bad 7 should be 7

1 0

Alexandre Julliard : winex11: Mask FPU exceptions around fontconfig calls.
by Alexandre Julliard 28 Oct '11

28 Oct '11

Module: wine Branch: master Commit: 171183c77b2ac7c808d5090f7c46a71b7d033eb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=171183c77b2ac7c808d5090f7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 28 12:41:14 2011 +0200 winex11: Mask FPU exceptions around fontconfig calls. --- dlls/winex11.drv/xrender.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 8ee3f59..3157d8c 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -952,11 +952,18 @@ static int GetCacheEntry( HDC hdc, LFANDSIZE *plfsz ) #ifdef SONAME_LIBFONTCONFIG if (fontconfig_installed) { - FcPattern *match, *pattern = pFcPatternCreate(); + FcPattern *match, *pattern; FcResult result; char family[LF_FACESIZE * 4]; +#if defined(__i386__) && defined(__GNUC__) + /* fontconfig generates floating point exceptions, mask them */ + WORD cw, default_cw = 0x37f; + __asm__ __volatile__("fnstcw %0; fldcw %1" : "=m" (cw) : "m" (default_cw)); +#endif + WideCharToMultiByte( CP_UTF8, 0, plfsz->lf.lfFaceName, -1, family, sizeof(family), NULL, NULL ); + pattern = pFcPatternCreate(); pFcPatternAddString( pattern, FC_FAMILY, (FcChar8 *)family ); if (plfsz->lf.lfWeight != FW_DONTCARE) { @@ -1007,6 +1014,10 @@ static int GetCacheEntry( HDC hdc, LFANDSIZE *plfsz ) pFcPatternDestroy( match ); } pFcPatternDestroy( pattern ); + +#if defined(__i386__) && defined(__GNUC__) + __asm__ __volatile__("fnclex; fldcw %0" : : "m" (cw)); +#endif } #endif /* SONAME_LIBFONTCONFIG */

1 0

Alexandre Julliard : gdi32: Fix a misplaced release_dc_ptr call.
by Alexandre Julliard 28 Oct '11

28 Oct '11

Module: wine Branch: master Commit: 26aaaa1269b1055935b65164759375477113a148 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26aaaa1269b1055935b651647… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 28 11:29:34 2011 +0200 gdi32: Fix a misplaced release_dc_ptr call. --- dlls/gdi32/font.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 44f1af4..10a7f1d 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -653,8 +653,8 @@ static INT FONT_EnumFontFamiliesEx( HDC hDC, LPLOGFONTW plf, FONTENUMPROCW efpro fe.unicode = unicode; fe.hdc = hDC; ret = physdev->funcs->pEnumFonts( physdev, plf, FONT_EnumInstance, (LPARAM)&fe ); + release_dc_ptr( dc ); } - release_dc_ptr( dc ); return ret; }

1 0

Nikolay Sivov : msxml3: Block attempt to modify namespace definition with setAttribute().
by Alexandre Julliard 27 Oct '11

27 Oct '11

Module: wine Branch: master Commit: fe1f692d91498b221e32b55313a30d4fe7da316e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe1f692d91498b221e32b5531… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 27 20:30:45 2011 +0400 msxml3: Block attempt to modify namespace definition with setAttribute(). --- dlls/msxml3/element.c | 20 ++++++++- dlls/msxml3/tests/domdoc.c | 99 +++++++++++++++++++++++++++++++++++++++----- 2 files changed, 106 insertions(+), 13 deletions(-) diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 6cd3a6d..834f39b 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -1097,8 +1097,8 @@ static HRESULT WINAPI domelem_setAttribute( BSTR name, VARIANT value) { domelem *This = impl_from_IXMLDOMElement( iface ); + xmlChar *xml_name, *xml_value, *local, *prefix; xmlNodePtr element; - xmlChar *xml_name, *xml_value; HRESULT hr; VARIANT var; @@ -1119,7 +1119,23 @@ static HRESULT WINAPI domelem_setAttribute( xml_name = xmlchar_from_wchar( name ); xml_value = xmlchar_from_wchar( V_BSTR(&var) ); - if(!xmlSetNsProp(element, NULL, xml_name, xml_value)) + if ((local = xmlSplitQName2(xml_name, &prefix))) + { + static const xmlChar* xmlnsA = (const xmlChar*)"xmlns"; + xmlNsPtr ns = NULL; + + /* it's not allowed to modify existing namespace definition */ + if (xmlStrEqual(prefix, xmlnsA)) + ns = xmlSearchNs(element->doc, element, local); + + xmlFree(prefix); + xmlFree(local); + + if (ns) + return xmlStrEqual(ns->href, xml_value) ? S_OK : E_INVALIDARG; + } + + if (!xmlSetNsProp(element, NULL, xml_name, xml_value)) hr = E_FAIL; heap_free(xml_value); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 0acfa25..62ccb4e 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -6995,19 +6995,22 @@ static void test_testTransforms(void) static void test_Namespaces(void) { + static const CHAR szNamespacesXML[] = + "<?xml version=\"1.0\"?>\n" + "<XMI xmi.version=\"1.1\" xmlns:Model=\"http://omg.org/mof.Model/1.3\">" + " <XMI.content>" + " <Model:Package name=\"WinePackage\" />" + " </XMI.content>" + "</XMI>"; + IXMLDOMDocument *doc; - IXMLDOMNode *pNode; + IXMLDOMElement *elem; + IXMLDOMNode *node; IXMLDOMNode *pNode2 = NULL; VARIANT_BOOL bSucc; + VARIANT var; HRESULT hr; BSTR str; - static const CHAR szNamespacesXML[] = -"<?xml version=\"1.0\"?>\n" -"<XMI xmi.version=\"1.1\" xmlns:Model=\"http://omg.org/mof.Model/1.3\">" -" <XMI.content>" -" <Model:Package name=\"WinePackage\" />" -" </XMI.content>" -"</XMI>"; doc = create_document(&IID_IXMLDOMDocument); if (!doc) return; @@ -7016,11 +7019,11 @@ static void test_Namespaces(void) ok(hr == S_OK, "ret %08x\n", hr ); ok(bSucc == VARIANT_TRUE, "Expected VARIANT_TRUE got VARIANT_FALSE\n"); - hr = IXMLDOMDocument_selectSingleNode(doc, _bstr_("//XMI.content"), &pNode ); + hr = IXMLDOMDocument_selectSingleNode(doc, _bstr_("//XMI.content"), &node ); ok(hr == S_OK, "ret %08x\n", hr ); if(hr == S_OK) { - hr = IXMLDOMNode_get_firstChild( pNode, &pNode2 ); + hr = IXMLDOMNode_get_firstChild( node, &pNode2 ); ok( hr == S_OK, "ret %08x\n", hr ); ok( pNode2 != NULL, "pNode2 == NULL\n"); @@ -7050,11 +7053,85 @@ static void test_Namespaces(void) SysFreeString(str); IXMLDOMNode_Release(pNode2); - IXMLDOMNode_Release(pNode); + IXMLDOMNode_Release(node); } IXMLDOMDocument_Release(doc); + /* create on element and try to alter namespace after that */ + doc = create_document(&IID_IXMLDOMDocument); + if (!doc) return; + + V_VT(&var) = VT_I2; + V_I2(&var) = NODE_ELEMENT; + + hr = IXMLDOMDocument_createNode(doc, var, _bstr_("ns:elem"), _bstr_("ns/uri"), &node); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMDocument_appendChild(doc, node, NULL); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMDocument_get_documentElement(doc, &elem); + EXPECT_HR(hr, S_OK); + + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = _bstr_("ns/uri2"); + + hr = IXMLDOMElement_setAttribute(elem, _bstr_("xmlns:ns"), var); + EXPECT_HR(hr, E_INVALIDARG); + + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = _bstr_("ns/uri"); + + hr = IXMLDOMElement_setAttribute(elem, _bstr_("xmlns:ns"), var); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMElement_get_xml(elem, &str); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(str, _bstr_("<ns:elem xmlns:ns=\"ns/uri\"/>")), "got element %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + IXMLDOMElement_Release(elem); + IXMLDOMDocument_Release(doc); + + /* create on element and try to alter namespace after that */ + doc = create_document_version(60, &IID_IXMLDOMDocument); + if (!doc) return; + + V_VT(&var) = VT_I2; + V_I2(&var) = NODE_ELEMENT; + + hr = IXMLDOMDocument_createNode(doc, var, _bstr_("ns:elem"), _bstr_("ns/uri"), &node); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMDocument_appendChild(doc, node, NULL); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMDocument_get_documentElement(doc, &elem); + EXPECT_HR(hr, S_OK); + + /* try same prefix, different uri */ + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = _bstr_("ns/uri2"); + + hr = IXMLDOMElement_setAttribute(elem, _bstr_("xmlns:ns"), var); + EXPECT_HR(hr, E_INVALIDARG); + + /* try same prefix and uri */ + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = _bstr_("ns/uri"); + + hr = IXMLDOMElement_setAttribute(elem, _bstr_("xmlns:ns"), var); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMElement_get_xml(elem, &str); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(str, _bstr_("<ns:elem xmlns:ns=\"ns/uri\"/>")), "got element %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + IXMLDOMElement_Release(elem); + IXMLDOMDocument_Release(doc); + free_bstrs(); }

1 0

Henri Verbeet : wined3d: Make the device parameter to wined3d_event_query_test() const.
by Alexandre Julliard 27 Oct '11

27 Oct '11

Module: wine Branch: master Commit: eebad6a17aebebecea9dc09f9be4699f0a10e750 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eebad6a17aebebecea9dc09f9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 27 17:06:27 2011 +0200 wined3d: Make the device parameter to wined3d_event_query_test() const. --- dlls/wined3d/query.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index b26fc26..ae03479 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -36,7 +36,7 @@ void wined3d_event_query_destroy(struct wined3d_event_query *query) } static enum wined3d_event_query_result wined3d_event_query_test(const struct wined3d_event_query *query, - struct wined3d_device *device) + const struct wined3d_device *device) { struct wined3d_context *context; const struct wined3d_gl_info *gl_info;

1 0

Henri Verbeet : wined3d: Make the device parameter to surface_blt_to_drawable() const.
by Alexandre Julliard 27 Oct '11

27 Oct '11

Module: wine Branch: master Commit: bf5ab0a199080347ff20435bff0f470210643c33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf5ab0a199080347ff20435bf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 27 17:06:26 2011 +0200 wined3d: Make the device parameter to surface_blt_to_drawable() const. --- dlls/wined3d/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 91c0f60..c13fc26 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -5324,7 +5324,7 @@ void surface_translate_drawable_coords(const struct wined3d_surface *surface, HW rect->bottom = drawable_height - rect->bottom; } -static void surface_blt_to_drawable(struct wined3d_device *device, +static void surface_blt_to_drawable(const struct wined3d_device *device, WINED3DTEXTUREFILTERTYPE filter, BOOL color_key, struct wined3d_surface *src_surface, const RECT *src_rect_in, struct wined3d_surface *dst_surface, const RECT *dst_rect_in)

1 0

Henri Verbeet : wined3d: Rename nCfgs to cfg_count.
by Alexandre Julliard 27 Oct '11

27 Oct '11

Module: wine Branch: master Commit: dbfe83baff0838e68e6b8108a5be7f8f54ff4ea3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbfe83baff0838e68e6b8108a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 27 17:06:25 2011 +0200 wined3d: Rename nCfgs to cfg_count. --- dlls/wined3d/context.c | 6 +++--- dlls/wined3d/directx.c | 40 ++++++++++++++++++++++------------------ dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 26 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index e384fb3..29d0b3f 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1151,8 +1151,8 @@ static int context_choose_pixel_format(const struct wined3d_device *device, HDC { FALSE, FALSE, FALSE }, }; - int i = 0; - int nCfgs = device->adapter->nCfgs; + unsigned int cfg_count = device->adapter->cfg_count; + unsigned int i; TRACE("device %p, dc %p, color_format %s, ds_format %s, aux_buffers %#x, find_compatible %#x.\n", device, hdc, debug_d3dformat(color_format->id), debug_d3dformat(ds_format->id), @@ -1169,7 +1169,7 @@ static int context_choose_pixel_format(const struct wined3d_device *device, HDC for (matchtry = 0; matchtry < (sizeof(matches) / sizeof(*matches)) && !iPixelFormat; ++matchtry) { - for (i = 0; i < nCfgs; ++i) + for (i = 0; i < cfg_count; ++i) { const struct wined3d_pixel_format *cfg = &device->adapter->cfgs[i]; BOOL exactDepthMatch = TRUE; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 6d282d9..5422a74 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3164,7 +3164,7 @@ HRESULT CDECL wined3d_check_depth_stencil_match(const struct wined3d *wined3d, unsigned int i; cfgs = adapter->cfgs; - cfg_count = adapter->nCfgs; + cfg_count = adapter->cfg_count; for (i = 0; i < cfg_count; ++i) { if (wined3d_check_pixel_format_color(&adapter->gl_info, &cfgs[i], rt_format) @@ -3234,8 +3234,6 @@ static BOOL CheckBumpMapCapability(const struct wined3d_adapter *adapter, const static BOOL CheckDepthStencilCapability(const struct wined3d_adapter *adapter, const struct wined3d_format *display_format, const struct wined3d_format *ds_format) { - int it=0; - /* Only allow depth/stencil formats */ if (!(ds_format->depth_size || ds_format->stencil_size)) return FALSE; @@ -3258,10 +3256,12 @@ static BOOL CheckDepthStencilCapability(const struct wined3d_adapter *adapter, } else { + unsigned int i; + /* Walk through all WGL pixel formats to find a match */ - for (it = 0; it < adapter->nCfgs; ++it) + for (i = 0; i < adapter->cfg_count; ++i) { - const struct wined3d_pixel_format *cfg = &adapter->cfgs[it]; + const struct wined3d_pixel_format *cfg = &adapter->cfgs[i]; if (wined3d_check_pixel_format_color(&adapter->gl_info, cfg, display_format) && wined3d_check_pixel_format_depth(&adapter->gl_info, cfg, ds_format)) return TRUE; @@ -3290,7 +3290,7 @@ static BOOL CheckRenderTargetCapability(const struct wined3d_adapter *adapter, BYTE AdapterRed, AdapterGreen, AdapterBlue, AdapterAlpha, AdapterTotalSize; BYTE CheckRed, CheckGreen, CheckBlue, CheckAlpha, CheckTotalSize; const struct wined3d_pixel_format *cfgs = adapter->cfgs; - int it; + unsigned int i; getColorBits(adapter_format, &AdapterRed, &AdapterGreen, &AdapterBlue, &AdapterAlpha, &AdapterTotalSize); getColorBits(check_format, &CheckRed, &CheckGreen, &CheckBlue, &CheckAlpha, &CheckTotalSize); @@ -3304,13 +3304,13 @@ static BOOL CheckRenderTargetCapability(const struct wined3d_adapter *adapter, /* Check if there is a WGL pixel format matching the requirements, the format should also be window * drawable (not offscreen; e.g. Nvidia offers R5G6B5 for pbuffers even when X is running at 24bit) */ - for (it = 0; it < adapter->nCfgs; ++it) + for (i = 0; i < adapter->cfg_count; ++i) { - if (cfgs[it].windowDrawable - && wined3d_check_pixel_format_color(&adapter->gl_info, &cfgs[it], check_format)) + if (cfgs[i].windowDrawable + && wined3d_check_pixel_format_color(&adapter->gl_info, &cfgs[i], check_format)) { TRACE_(d3d_caps)("Pixel format %d is compatible with format %s.\n", - cfgs[it].iPixelFormat, debug_d3dformat(check_format->id)); + cfgs[i].iPixelFormat, debug_d3dformat(check_format->id)); return TRUE; } } @@ -5289,15 +5289,17 @@ static BOOL InitAdapters(struct wined3d *wined3d) if (gl_info->supported[WGL_ARB_PIXEL_FORMAT]) { + GLint cfg_count; int attribute; int attribs[11]; int values[11]; int nAttribs = 0; attribute = WGL_NUMBER_PIXEL_FORMATS_ARB; - GL_EXTCALL(wglGetPixelFormatAttribivARB(hdc, 0, 0, 1, &attribute, &adapter->nCfgs)); + GL_EXTCALL(wglGetPixelFormatAttribivARB(hdc, 0, 0, 1, &attribute, &cfg_count)); + adapter->cfg_count = cfg_count; - adapter->cfgs = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, adapter->nCfgs * sizeof(*adapter->cfgs)); + adapter->cfgs = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, adapter->cfg_count * sizeof(*adapter->cfgs)); cfgs = adapter->cfgs; attribs[nAttribs++] = WGL_RED_BITS_ARB; attribs[nAttribs++] = WGL_GREEN_BITS_ARB; @@ -5311,7 +5313,7 @@ static BOOL InitAdapters(struct wined3d *wined3d) attribs[nAttribs++] = WGL_DOUBLE_BUFFER_ARB; attribs[nAttribs++] = WGL_AUX_BUFFERS_ARB; - for (iPixelFormat=1; iPixelFormat <= adapter->nCfgs; ++iPixelFormat) + for (iPixelFormat=1; iPixelFormat <= adapter->cfg_count; ++iPixelFormat) { res = GL_EXTCALL(wglGetPixelFormatAttribivARB(hdc, iPixelFormat, 0, nAttribs, attribs, values)); @@ -5358,7 +5360,7 @@ static BOOL InitAdapters(struct wined3d *wined3d) { int nCfgs = DescribePixelFormat(hdc, 0, 0, 0); adapter->cfgs = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, nCfgs * sizeof(*adapter->cfgs)); - adapter->nCfgs = 0; /* We won't accept all formats e.g. software accelerated ones will be skipped */ + adapter->cfg_count = 0; /* We won't accept all formats e.g. software accelerated ones will be skipped */ cfgs = adapter->cfgs; for(iPixelFormat=1; iPixelFormat<=nCfgs; iPixelFormat++) @@ -5399,11 +5401,13 @@ static BOOL InitAdapters(struct wined3d *wined3d) cfgs->redSize, cfgs->greenSize, cfgs->blueSize, cfgs->alphaSize, cfgs->depthSize, cfgs->stencilSize, cfgs->windowDrawable); cfgs++; - adapter->nCfgs++; + adapter->cfg_count++; } - /* Yikes we haven't found any suitable formats. This should only happen in case of GDI software rendering which we can't use anyway as its 3D functionality is very, very limited */ - if(!adapter->nCfgs) + /* We haven't found any suitable formats. This should only happen + * in case of GDI software rendering, which is pretty useless + * anyway. */ + if (!adapter->cfg_count) { ERR("Disabling Direct3D because no hardware accelerated pixel formats have been found!\n"); @@ -5423,7 +5427,7 @@ static BOOL InitAdapters(struct wined3d *wined3d) * Mark an adapter with this broken stencil behavior. */ adapter->brokenStencil = TRUE; - for (i = 0, cfgs = adapter->cfgs; i < adapter->nCfgs; ++i) + for (i = 0, cfgs = adapter->cfgs; i < adapter->cfg_count; ++i) { /* Nearly all drivers offer depth formats without stencil, only on i915 this if-statement won't be entered. */ if(cfgs[i].depthSize && !cfgs[i].stencilSize) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a398e3b..25a24e5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1524,7 +1524,7 @@ struct wined3d_adapter struct wined3d_gl_info gl_info; struct wined3d_driver_info driver_info; WCHAR DeviceName[CCHDEVICENAME]; /* DeviceName for use with e.g. ChangeDisplaySettings */ - int nCfgs; + unsigned int cfg_count; struct wined3d_pixel_format *cfgs; BOOL brokenStencil; /* Set on cards which only offer mixed depth+stencil */ unsigned int TextureRam; /* Amount of texture memory both video ram + AGP/TurboCache/HyperMemory/.. */

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
79
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2011