February 2011 - Wine-commits

Austin English : cryptnet/tests: Remove win9x hacks.
by Alexandre Julliard 28 Feb '11

28 Feb '11

Module: wine Branch: master Commit: de6e33f306a3b1b424ad1a9c41e85d3692ef9e4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=de6e33f306a3b1b424ad1a9c4… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Feb 25 14:30:25 2011 -0800 cryptnet/tests: Remove win9x hacks. --- dlls/cryptnet/tests/cryptnet.c | 19 +++++++------------ 1 files changed, 7 insertions(+), 12 deletions(-) diff --git a/dlls/cryptnet/tests/cryptnet.c b/dlls/cryptnet/tests/cryptnet.c index 113406c..a7fc9ec 100644 --- a/dlls/cryptnet/tests/cryptnet.c +++ b/dlls/cryptnet/tests/cryptnet.c @@ -365,12 +365,9 @@ static void test_retrieveObjectByUrl(void) SetLastError(0xdeadbeef); ret = CryptRetrieveObjectByUrlA(url, CONTEXT_OID_CRL, 0, 0, (void **)&crl, NULL, NULL, NULL, NULL); - /* w2k3,XP, newer w2k: CRYPT_E_NO_MATCH, 95: OSS_DATA_ERROR */ - ok(!ret && (GetLastError() == CRYPT_E_NO_MATCH || - GetLastError() == CRYPT_E_ASN1_BADTAG || - GetLastError() == OSS_DATA_ERROR), - "got 0x%x/%u (expected CRYPT_E_NO_MATCH or CRYPT_E_ASN1_BADTAG or " - "OSS_DATA_ERROR)\n", GetLastError(), GetLastError()); + /* w2k3,XP, newer w2k: CRYPT_E_NO_MATCH */ + ok(!ret && (GetLastError() == CRYPT_E_NO_MATCH), + "got 0x%x/%u (expected CRYPT_E_NO_MATCH)\n", GetLastError(), GetLastError()); /* only newer versions of cryptnet do the cleanup */ if(!ret && GetLastError() != CRYPT_E_ASN1_BADTAG && @@ -408,9 +405,8 @@ static void test_retrieveObjectByUrl(void) cert = (PCCERT_CONTEXT)0xdeadbeef; ret = CryptRetrieveObjectByUrlA(url, CONTEXT_OID_CERTIFICATE, 0, 0, (void **)&cert, NULL, NULL, NULL, &aux); - /* w2k: success, 9x: fail with E_INVALIDARG */ - ok(ret || (GetLastError() == E_INVALIDARG), - "got %u with 0x%x/%u (expected '!=0' or '0' with E_INVALIDARG)\n", + /* w2k: success */ + ok(ret, "got %u with 0x%x/%u (expected '!=0' or '0' with E_INVALIDARG)\n", ret, GetLastError(), GetLastError()); if (cert && cert != (PCCERT_CONTEXT)0xdeadbeef) CertFreeCertificateContext(cert); @@ -419,9 +415,8 @@ static void test_retrieveObjectByUrl(void) aux.cbSize = sizeof(aux); ret = CryptRetrieveObjectByUrlA(url, CONTEXT_OID_CERTIFICATE, 0, 0, (void **)&cert, NULL, NULL, NULL, &aux); - /* w2k: success, 9x: fail with E_INVALIDARG */ - ok(ret || (GetLastError() == E_INVALIDARG), - "got %u with 0x%x/%u (expected '!=0' or '0' with E_INVALIDARG)\n", + /* w2k: success */ + ok(ret, "got %u with 0x%x/%u (expected '!=0' or '0' with E_INVALIDARG)\n", ret, GetLastError(), GetLastError()); if (!ret) { /* no more tests useful */

1 0

Austin English : comctl32/tests: Remove win9x hack.
by Alexandre Julliard 28 Feb '11

28 Feb '11

Module: wine Branch: master Commit: 7c25705e3cd4c76f9f850fc94acb407125f84bd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c25705e3cd4c76f9f850fc94… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Feb 25 14:29:08 2011 -0800 comctl32/tests: Remove win9x hack. --- dlls/comctl32/tests/header.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/tests/header.c b/dlls/comctl32/tests/header.c index d9b4a73..0670743 100644 --- a/dlls/comctl32/tests/header.c +++ b/dlls/comctl32/tests/header.c @@ -1024,10 +1024,6 @@ static void test_hdm_filterMessages(HWND hParent) else ok_sequence(sequences, HEADER_SEQ_INDEX, filterMessages_seq_noninteractive, "filterMessages sequence testing", FALSE); - /* Some Win9x versions don't send a WM_KILLFOCUS. - * Set the focus explicitly to the parent to avoid a crash. - */ - SetFocus(hParent); DestroyWindow(hChild); }

1 0

Austin English : d3d8/tests: Remove win9x hack.
by Alexandre Julliard 28 Feb '11

28 Feb '11

Module: wine Branch: master Commit: 98678879af2b3324736795f89ed60bda0cf708af URL: http://source.winehq.org/git/wine.git/?a=commit;h=98678879af2b3324736795f89… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Feb 25 14:30:46 2011 -0800 d3d8/tests: Remove win9x hack. --- dlls/d3d8/tests/device.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 4ff9803..6885dd4 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -1306,13 +1306,9 @@ static void test_lights(void) /* TODO: Test the rendering results in this situation */ hr = IDirect3DDevice8_LightEnable(device, i + 1, TRUE); - ok(hr == D3D_OK || - broken(hr == D3DERR_INVALIDCALL), /* Some Win9x and WinME */ - "Enabling one light more than supported returned %08x\n", hr); + ok(hr == D3D_OK, "Enabling one light more than supported returned %08x\n", hr); hr = IDirect3DDevice8_GetLightEnable(device, i + 1, &enabled); - ok(hr == D3D_OK || - broken(hr == D3DERR_INVALIDCALL), /* Some Win9x and WinME */ - "GetLightEnable on light %u failed with %08x\n", i + 1, hr); + ok(hr == D3D_OK, "GetLightEnable on light %u failed with %08x\n", i + 1, hr); ok(enabled, "Light %d is %s\n", i + 1, enabled ? "enabled" : "disabled"); hr = IDirect3DDevice8_LightEnable(device, i + 1, FALSE); ok(hr == D3D_OK, "Disabling the additional returned %08x\n", hr);

1 0

Austin English : dsound/tests: Remove win9x hack.
by Alexandre Julliard 28 Feb '11

28 Feb '11

Module: wine Branch: master Commit: 62b83bf036dcd7ca491ef685934d3dd4509d35ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=62b83bf036dcd7ca491ef6859… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Feb 25 14:32:26 2011 -0800 dsound/tests: Remove win9x hack. --- dlls/dsound/tests/dsound.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index 0bf04b7..f8b7aeb 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -750,7 +750,7 @@ static HRESULT test_secondary(LPGUID lpGuid) if (!gotdx8) { - skip("Not doing the WAVE_FORMAT_EXTENSIBLE tests\n"); + win_skip("Not doing the WAVE_FORMAT_EXTENSIBLE tests\n"); /* Apparently they succeed with bogus values, * which means that older dsound doesn't look at them */ @@ -1095,8 +1095,7 @@ START_TEST(dsound) SetLastError(0xdeadbeef); ret = FreeLibrary(hDsound); ok( ret || - broken(!ret && GetLastError() == ERROR_MOD_NOT_FOUND) || /* NT4 */ - broken(!ret && GetLastError() == ERROR_INVALID_HANDLE), /* Win9x */ + broken(!ret && GetLastError() == ERROR_MOD_NOT_FOUND), /* NT4 */ "FreeLibrary(2) returned %d\n", GetLastError()); ok(!FreeLibrary(hDsound), "DirectSound DLL still loaded\n"); } @@ -1118,7 +1117,7 @@ START_TEST(dsound) FreeLibrary(hDsound); } else - skip("dsound.dll not found!\n"); + win_skip("dsound.dll not found!\n"); CoUninitialize(); }

1 0

Marcus Meissner : kernel32: Avoid shadowing "status" variable.
by Alexandre Julliard 28 Feb '11

28 Feb '11

Module: wine Branch: master Commit: a91b65960f4b65273cf14fd355c3cf424762814c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a91b65960f4b65273cf14fd35… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri Feb 25 17:20:51 2011 +0100 kernel32: Avoid shadowing "status" variable. --- dlls/kernel32/volume.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index 106b4fb..912f215 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -1103,7 +1103,6 @@ DWORD WINAPI QueryDosDeviceW( LPCWSTR devname, LPWSTR target, DWORD bufsize ) } else { - NTSTATUS status; WCHAR *buffer; if (!(buffer = HeapAlloc( GetProcessHeap(), 0, sizeof(dosdevW) + strlenW(devname)*sizeof(WCHAR) )))

1 0

Nikolay Sivov : msxml3/tests: Remove broken test and parameter check.
by Alexandre Julliard 28 Feb '11

28 Feb '11

Module: wine Branch: master Commit: 4e5075bcc46e5a1081fd2c9128f46672cc517f58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e5075bcc46e5a1081fd2c912… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 27 23:38:30 2011 +0300 msxml3/tests: Remove broken test and parameter check. --- dlls/msxml3/nodelist.c | 3 --- dlls/msxml3/tests/domdoc.c | 6 ------ 2 files changed, 0 insertions(+), 9 deletions(-) diff --git a/dlls/msxml3/nodelist.c b/dlls/msxml3/nodelist.c index 53cf5f5..749b179 100644 --- a/dlls/msxml3/nodelist.c +++ b/dlls/msxml3/nodelist.c @@ -71,9 +71,6 @@ static HRESULT WINAPI xmlnodelist_QueryInterface( { TRACE("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppvObject); - if(!ppvObject) - return E_INVALIDARG; - if ( IsEqualGUID( riid, &IID_IUnknown ) || IsEqualGUID( riid, &IID_IDispatch ) || IsEqualGUID( riid, &IID_IXMLDOMNodeList ) ) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 6aad135..abd1f4b 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -1942,9 +1942,6 @@ todo_wine if (list) { - r = IXMLDOMNodeList_QueryInterface(list, &IID_IDispatch, NULL); - ok( r == E_INVALIDARG || r == E_POINTER, "ret %08x\n", r ); - r = IXMLDOMNodeList_get_item(list, 0, NULL); ok(r == E_INVALIDARG, "Exected E_INVALIDARG got %08x\n", r); @@ -2738,9 +2735,6 @@ static void test_get_text(void) IXMLDOMNode_Release(nodeRoot); } - r = IXMLDOMNodeList_QueryInterface(node_list, &IID_IDispatch, NULL); - ok( r == E_INVALIDARG, "ret %08x\n", r ); - r = IXMLDOMNodeList_get_length( node_list, NULL ); ok( r == E_INVALIDARG, "ret %08x\n", r );

1 0

Nikolay Sivov : msxml3: Reject xmlns attribute to be added to element.
by Alexandre Julliard 28 Feb '11

28 Feb '11

Module: wine Branch: master Commit: 0c16c79c711129d077f05c8ca8af6387a21d7745 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c16c79c711129d077f05c8ca… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 28 02:27:30 2011 +0300 msxml3: Reject xmlns attribute to be added to element. --- dlls/msxml3/element.c | 12 +++- dlls/msxml3/tests/domdoc.c | 138 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 148 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index b7b623c..9573de9 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -1178,6 +1178,7 @@ static HRESULT WINAPI domelem_setAttributeNode( IXMLDOMAttribute** old) { domelem *This = impl_from_IXMLDOMElement( iface ); + static const WCHAR xmlnsW[] = {'x','m','l','n','s',0}; xmlChar *name, *value; BSTR nameW, prefix; xmlAttrPtr attr; @@ -1188,11 +1189,16 @@ static HRESULT WINAPI domelem_setAttributeNode( if (!attribute) return E_INVALIDARG; - if (old) *old = NULL; - hr = IXMLDOMAttribute_get_nodeName(attribute, &nameW); if (hr != S_OK) return hr; + /* adding xmlns attribute doesn't change a tree or existing namespace definition */ + if (!strcmpW(nameW, xmlnsW)) + { + SysFreeString(nameW); + return DISP_E_UNKNOWNNAME; + } + hr = IXMLDOMAttribute_get_nodeValue(attribute, &valueW); if (hr != S_OK) { @@ -1200,6 +1206,8 @@ static HRESULT WINAPI domelem_setAttributeNode( return hr; } + if (old) *old = NULL; + TRACE("attribute: %s=%s\n", debugstr_w(nameW), debugstr_w(V_BSTR(&valueW))); hr = IXMLDOMAttribute_get_prefix(attribute, &prefix); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index abd1f4b..552e52b 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -7213,6 +7213,7 @@ static void test_setAttributeNode(void) IXMLDOMAttribute *attr, *attr2, *ret_attr; VARIANT_BOOL b; HRESULT hr; + VARIANT v; BSTR str; doc = create_document(&IID_IXMLDOMDocument); @@ -7240,6 +7241,11 @@ static void test_setAttributeNode(void) ok( hr == S_OK, "got 0x%08x\n", hr); ok( ret_attr == NULL, "got %p\n", ret_attr); + b = VARIANT_FALSE; + hr = IXMLDOMElement_hasChildNodes(elem, &b); + ok( hr == S_OK, "got 0x%08x\n", hr); + ok(b == VARIANT_TRUE, "got %d\n", b); + attr2 = NULL; hr = IXMLDOMElement_getAttributeNode(elem, _bstr_("attr"), &attr2); ok( hr == S_OK, "got 0x%08x\n", hr); @@ -7278,8 +7284,134 @@ static void test_setAttributeNode(void) IXMLDOMElement_Release(elem); IXMLDOMDocument_Release(doc2); + IXMLDOMAttribute_Release(attr); + IXMLDOMDocument_Release(doc); + + hr = CoCreateInstance( &CLSID_DOMDocument40, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument, (void**)&doc ); + if (hr != S_OK) + { + win_skip("DOMDocument40 is not available (0x%08x)\n", hr); + return; + } + + /* try attribute with xmlns name */ + V_VT(&v) = VT_I4; + V_I4(&v) = NODE_ELEMENT; + + hr = IXMLDOMDocument_createNode(doc, v, _bstr_("test"), _bstr_("http://winehq.org/default"), (IXMLDOMNode**)&elem); + ok( hr == S_OK, "got 0x%08x\n", hr); + V_VT(&v) = VT_I4; + V_I4(&v) = NODE_ATTRIBUTE; + + attr = NULL; + hr = IXMLDOMDocument_createNode(doc, v, _bstr_("xmlns"), NULL, (IXMLDOMNode**)&attr); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(attr != NULL, "got %p\n", attr); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = _bstr_("http://winehq.org/default"); + hr = IXMLDOMAttribute_put_nodeValue(attr, v); + ok( hr == S_OK, "got 0x%08x\n", hr); + + ret_attr = (void*)0xdeadbeef; + hr = IXMLDOMElement_setAttributeNode(elem, attr, &ret_attr); + ok(hr == DISP_E_UNKNOWNNAME, "got 0x%08x\n", hr); + ok(ret_attr == (void*)0xdeadbeef, "got %p\n", ret_attr); + + /* no child node added actually */ + b = VARIANT_TRUE; + hr = IXMLDOMElement_hasChildNodes(elem, &b); + ok( hr == S_FALSE, "got 0x%08x\n", hr); + ok(b == VARIANT_FALSE, "got %d\n", b); + + /* a single namespace definition as output */ + hr = IXMLDOMElement_get_xml(elem, &str); + ok( hr == S_OK, "got 0x%08x\n", hr); + ok( lstrcmpW(str, _bstr_("<test xmlns=\"http://winehq.org/default\"/>")) == 0, + "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + /* alter value isn't possible after creation? */ + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = _bstr_("http://winehq.org/default1"); + hr = IXMLDOMAttribute_put_nodeValue(attr, v); + ok( hr == S_OK, "got 0x%08x\n", hr); + + IXMLDOMElement_Release(elem); IXMLDOMAttribute_Release(attr); + + /* try to alter it with different attribute value */ + V_VT(&v) = VT_I4; + V_I4(&v) = NODE_ELEMENT; + + hr = IXMLDOMDocument_createNode(doc, v, _bstr_("test"), _bstr_("http://winehq.org/default"), (IXMLDOMNode**)&elem); + ok( hr == S_OK, "got 0x%08x\n", hr); + + V_VT(&v) = VT_I4; + V_I4(&v) = NODE_ATTRIBUTE; + + hr = IXMLDOMDocument_createNode(doc, v, _bstr_("xmlns"), NULL, (IXMLDOMNode**)&attr); + ok( hr == S_OK, "got 0x%08x\n", hr); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = _bstr_("http://winehq.org/default1"); + hr = IXMLDOMAttribute_put_nodeValue(attr, v); + ok( hr == S_OK, "got 0x%08x\n", hr); + + ret_attr = (void*)0xdeadbeef; + hr = IXMLDOMElement_setAttributeNode(elem, attr, &ret_attr); + ok( hr == DISP_E_UNKNOWNNAME, "got 0x%08x\n", hr); + ok(ret_attr == (void*)0xdeadbeef, "got %p\n", ret_attr); + + /* no child node added actually */ + b = VARIANT_TRUE; + hr = IXMLDOMElement_hasChildNodes(elem, &b); + ok( hr == S_FALSE, "got 0x%08x\n", hr); + ok(b == VARIANT_FALSE, "got %d\n", b); + + /* initial value preserved */ + hr = IXMLDOMElement_get_xml(elem, &str); + ok( hr == S_OK, "got 0x%08x\n", hr); + ok( lstrcmpW(str, _bstr_("<test xmlns=\"http://winehq.org/default\"/>")) == 0, + "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + IXMLDOMElement_Release(elem); + IXMLDOMAttribute_Release(attr); + + /* now create without default namespace and add it as attribute */ + V_VT(&v) = VT_I4; + V_I4(&v) = NODE_ELEMENT; + + hr = IXMLDOMDocument_createNode(doc, v, _bstr_("test"), NULL, (IXMLDOMNode**)&elem); + ok( hr == S_OK, "got 0x%08x\n", hr); + + V_VT(&v) = VT_I4; + V_I4(&v) = NODE_ATTRIBUTE; + + hr = IXMLDOMDocument_createNode(doc, v, _bstr_("xmlns"), NULL, (IXMLDOMNode**)&attr); + ok( hr == S_OK, "got 0x%08x\n", hr); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = _bstr_("http://winehq.org/default"); + hr = IXMLDOMAttribute_put_nodeValue(attr, v); + ok( hr == S_OK, "got 0x%08x\n", hr); + + ret_attr = (void*)0xdeadbeef; + hr = IXMLDOMElement_setAttributeNode(elem, attr, &ret_attr); + ok(hr == DISP_E_UNKNOWNNAME, "got 0x%08x\n", hr); + ok(ret_attr == (void*)0xdeadbeef, "got %p\n", ret_attr); + + /* no child node added */ + b = VARIANT_TRUE; + hr = IXMLDOMElement_hasChildNodes(elem, &b); + ok( hr == S_FALSE, "got 0x%08x\n", hr); + ok(b == VARIANT_FALSE, "got %d\n", b); + + IXMLDOMElement_Release(elem); + IXMLDOMAttribute_Release(attr); + IXMLDOMDocument_Release(doc); free_bstrs(); } @@ -7346,6 +7478,12 @@ static void test_createNode(void) hr = IXMLDOMNode_get_prefix(node, &prefix); ok( hr == S_FALSE, "got 0x%08x\n", hr); ok(prefix == 0, "expected empty prefix, got %p\n", prefix); + /* check dump */ + hr = IXMLDOMNode_get_xml(node, &str); + ok( hr == S_OK, "got 0x%08x\n", hr); + ok( lstrcmpW(str, _bstr_("<test xmlns=\"http://winehq.org/default\"/>")) == 0, + "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); hr = IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMElement, (void**)&elem); ok( hr == S_OK, "got 0x%08x\n", hr);

1 0

Thomas Mullaly : mshtml/tests: Make IDispatch Vtbl const.
by Alexandre Julliard 28 Feb '11

28 Feb '11

Module: wine Branch: master Commit: 6f18cc59dd80ce80e4375338c700147ab6449449 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f18cc59dd80ce80e4375338c… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Mon Feb 21 21:06:52 2011 -0500 mshtml/tests: Make IDispatch Vtbl const. --- dlls/mshtml/tests/htmldoc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 17d23c5..b58bb10 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -2755,7 +2755,7 @@ static HRESULT WINAPI Dispatch_Invoke(IDispatch *iface, DISPID dispIdMember, REF return E_FAIL; } -static IDispatchVtbl DispatchVtbl = { +static const IDispatchVtbl DispatchVtbl = { Dispatch_QueryInterface, Dispatch_AddRef, Dispatch_Release,

1 0

Henri Verbeet : wined3d: Filter sRGB capabilities during format initialization.
by Alexandre Julliard 28 Feb '11

28 Feb '11

Module: wine Branch: master Commit: d9d2fe31e324dc25ea5b442aeba661715fae9a18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9d2fe31e324dc25ea5b442ae… Author: Henri Verbeet <hverbeet(a)gmail.com> Date: Mon Feb 28 08:05:36 2011 +0100 wined3d: Filter sRGB capabilities during format initialization. --- dlls/wined3d/directx.c | 2 +- dlls/wined3d/utils.c | 8 ++++++++ dlls/wined3d/volumetexture.c | 3 +-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 899011e..d80df10 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3159,7 +3159,7 @@ static BOOL CheckRenderTargetCapability(const struct wined3d_adapter *adapter, static BOOL CheckSrgbReadCapability(const struct wined3d_adapter *adapter, const struct wined3d_format *format) { - return adapter->gl_info.supported[EXT_TEXTURE_SRGB] && (format->flags & WINED3DFMT_FLAG_SRGB_READ); + return format->flags & WINED3DFMT_FLAG_SRGB_READ; } static BOOL CheckSrgbWriteCapability(const struct wined3d_adapter *adapter, const struct wined3d_format *format) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 220e5fe..4c91644 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1197,6 +1197,14 @@ static BOOL init_format_texture_info(struct wined3d_gl_info *gl_info) format->flags |= format_texture_info[i].flags; format->heightscale = 1.0f; + /* Filter sRGB capabilities if EXT_texture_sRGB is not supported. */ + if (!gl_info->supported[EXT_TEXTURE_SRGB] + && format->glGammaInternal != format->glInternal) + { + format->glGammaInternal = format->glInternal; + format->flags &= ~(WINED3DFMT_FLAG_SRGB_READ | WINED3DFMT_FLAG_SRGB_WRITE); + } + /* Texture conversion stuff */ format->convert = format_texture_info[i].convert; format->conv_byte_count = format_texture_info[i].conv_byte_count; diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c index 7da1cf1..37c51bb 100644 --- a/dlls/wined3d/volumetexture.c +++ b/dlls/wined3d/volumetexture.c @@ -40,7 +40,6 @@ static HRESULT volumetexture_bind(IWineD3DBaseTextureImpl *texture, BOOL srgb) static void volumetexture_preload(IWineD3DBaseTextureImpl *texture, enum WINED3DSRGB srgb) { IWineD3DDeviceImpl *device = texture->resource.device; - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; struct wined3d_context *context = NULL; BOOL srgb_mode = texture->baseTexture.is_srgb; BOOL srgb_was_toggled = FALSE; @@ -49,7 +48,7 @@ static void volumetexture_preload(IWineD3DBaseTextureImpl *texture, enum WINED3D TRACE("texture %p, srgb %#x.\n", texture, srgb); if (!device->isInDraw) context = context_acquire(device, NULL); - else if (gl_info->supported[EXT_TEXTURE_SRGB] && texture->baseTexture.bindCount > 0) + else if (texture->baseTexture.bindCount > 0) { srgb_mode = device->stateBlock->state.sampler_states[texture->baseTexture.sampler][WINED3DSAMP_SRGBTEXTURE]; srgb_was_toggled = texture->baseTexture.is_srgb != srgb_mode;

1 0

Henri Verbeet : wined3d: Recognize some Northern Islands cards in select_card_ati_mesa().
by Alexandre Julliard 28 Feb '11

28 Feb '11

Module: wine Branch: master Commit: 14050e125de3895dd9a0afba0af96d5bae143e74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14050e125de3895dd9a0afba0… Author: Henri Verbeet <hverbeet(a)gmail.com> Date: Mon Feb 28 08:05:37 2011 +0100 wined3d: Recognize some Northern Islands cards in select_card_ati_mesa(). --- dlls/wined3d/directx.c | 7 +++++++ dlls/wined3d/wined3d_private.h | 3 +++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index d80df10..3288989 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1090,6 +1090,9 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_ATI, CARD_ATI_RADEON_HD5700, "ATI Radeon HD 5700 Series", DRIVER_ATI_R600, 512 }, {HW_VENDOR_ATI, CARD_ATI_RADEON_HD5800, "ATI Radeon HD 5800 Series", DRIVER_ATI_R600, 1024}, {HW_VENDOR_ATI, CARD_ATI_RADEON_HD5900, "ATI Radeon HD 5900 Series", DRIVER_ATI_R600, 1024}, + {HW_VENDOR_ATI, CARD_ATI_RADEON_HD6310, "AMD Radeon HD 6310 Graphics", DRIVER_ATI_R600, 1024}, + {HW_VENDOR_ATI, CARD_ATI_RADEON_HD6800, "AMD Radeon HD 6800 Series", DRIVER_ATI_R600, 1024}, + {HW_VENDOR_ATI, CARD_ATI_RADEON_HD6900, "AMD Radeon HD 6900 Series", DRIVER_ATI_R600, 2048}, /* Intel cards */ {HW_VENDOR_INTEL, CARD_INTEL_I830G, "Intel(R) 82830M Graphics Controller", DRIVER_INTEL_GMA800, 32 }, {HW_VENDOR_INTEL, CARD_INTEL_I855G, "Intel(R) 82852/82855 GM/GME Graphics Controller", DRIVER_INTEL_GMA800, 32 }, @@ -1727,6 +1730,10 @@ static enum wined3d_pci_device select_card_ati_mesa(const struct wined3d_gl_info } cards[] = { + /* Northern Islands */ + {"CAYMAN", CARD_ATI_RADEON_HD6900}, + {"BARTS", CARD_ATI_RADEON_HD6800}, + {"PALM", CARD_ATI_RADEON_HD6310}, /* Evergreen */ {"HEMLOCK", CARD_ATI_RADEON_HD5900}, {"CYPRESS", CARD_ATI_RADEON_HD5800}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a262cca..455fb1c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1359,6 +1359,9 @@ enum wined3d_pci_device CARD_ATI_RADEON_HD5850 = 0x6898, CARD_ATI_RADEON_HD5870 = 0x6899, CARD_ATI_RADEON_HD5900 = 0x689c, + CARD_ATI_RADEON_HD6310 = 0x9803, + CARD_ATI_RADEON_HD6800 = 0x6739, + CARD_ATI_RADEON_HD6900 = 0x6719, CARD_NVIDIA_RIVA_128 = 0x0018, CARD_NVIDIA_RIVA_TNT = 0x0020,

1 0