January 2012 - Wine-Commits

Francois Gouget : po: Fix an accelerator key specification in the Portuguese translation.
by Alexandre Julliard Jan. 24, 2012

Jan. 24, 2012

Module: wine Branch: master Commit: aafd9bd1ba4def7e128c03da43ead80602f41235 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aafd9bd1ba4def7e128c03da4… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jan 24 00:34:36 2012 +0100 po: Fix an accelerator key specification in the Portuguese translation. --- po/pt_PT.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/pt_PT.po b/po/pt_PT.po index 55180d3..0aa44ad 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -10595,7 +10595,7 @@ msgstr "" #: notepad.rc:46 msgid "Select &all\tCtrl+A" -msgstr "Seleccionar &tudo" +msgstr "Seleccionar &tudo\tCtrl+A" #: notepad.rc:47 msgid "&Time/Date\tF5"

1 0

Francois Gouget : po: Fix the accelerator key specifications in the Finnish translation.
by Alexandre Julliard Jan. 24, 2012

Jan. 24, 2012

Module: wine Branch: master Commit: 79d9af9faecaa663eea3a80a7c53d0c0d03388cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=79d9af9faecaa663eea3a80a7… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jan 24 00:32:46 2012 +0100 po: Fix the accelerator key specifications in the Finnish translation. --- po/fi.po | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/po/fi.po b/po/fi.po index abf0ec6..c2d1dcf 100644 --- a/po/fi.po +++ b/po/fi.po @@ -8441,7 +8441,6 @@ msgid "Ma&ximize" msgstr "S&uurenna" #: user32.rc:33 -#, fuzzy msgid "&Close\tAlt+F4" msgstr "&Sulje\tAlt+F4" @@ -8450,9 +8449,8 @@ msgid "&About Wine" msgstr "" #: user32.rc:46 -#, fuzzy msgid "&Close\tCtrl+F4" -msgstr "&Sulje\tAlt+F4" +msgstr "&Sulje\tCtrl+F4" #: user32.rc:48 #, fuzzy @@ -10143,7 +10141,7 @@ msgstr "P&oista\tDel" #: notepad.rc:46 msgid "Select &all\tCtrl+A" -msgstr "&Valitse kaikki" +msgstr "&Valitse kaikki\tCtrl+A" #: notepad.rc:47 msgid "&Time/Date\tF5" @@ -10155,7 +10153,7 @@ msgstr "Ka&tkaise pitkä rivi" #: notepad.rc:53 msgid "&Search...\tCtrl+F" -msgstr "Etsi..." +msgstr "Etsi...\tCtrl+F" #: notepad.rc:54 msgid "&Search next\tF3"

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard Jan. 24, 2012

Jan. 24, 2012

Module: wine Branch: master Commit: 3ec65ca8c70a0e54d1a57ee3d2800f28d1a11e22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ec65ca8c70a0e54d1a57ee3d… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Jan 24 00:53:27 2012 +0100 po: Update French translation. --- po/fr.po | 125 +++++++++++++++++++------------------------------------------ 1 files changed, 39 insertions(+), 86 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3ec65ca8c70a0e54d1a57…

1 0

Rico Schüller : d3dx9/tests: Add effect parameter value SetIntArray() test.
by Alexandre Julliard Jan. 24, 2012

Jan. 24, 2012

Module: wine Branch: master Commit: e892f061751d0178f840f4db787c3b689186c099 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e892f061751d0178f840f4db7… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Jan 24 09:48:45 2012 +0100 d3dx9/tests: Add effect parameter value SetIntArray() test. --- dlls/d3dx9_36/tests/effect.c | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 3af1d14..8035735 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -1756,6 +1756,32 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) } test_effect_parameter_value_GetTestGroup(&res[k], effect, expected_value, parameter, i); test_effect_parameter_value_ResetValue(&res[k], effect, &blob[res_value_offset], parameter, i); + + /* SetIntArray */ + *input_value = 123456; + for (l = 0; l < res_desc->Bytes / sizeof(*input_value); ++l) + { + *(input_value + l) = *(input_value + l - 1) + 23; + } + memcpy(expected_value, &blob[res_value_offset], res_desc->Bytes); + hr = effect->lpVtbl->SetIntArray(effect, parameter, (INT *)input_value, res_desc->Bytes / sizeof(*input_value)); + if (res_desc->Class == D3DXPC_SCALAR + || res_desc->Class == D3DXPC_VECTOR + || res_desc->Class == D3DXPC_MATRIX_ROWS) + { + for (l = 0; l < res_desc->Bytes / sizeof(*input_value); ++l) + { + set_number(expected_value + l, res_desc->Type, input_value + l, D3DXPT_INT); + } + ok(hr == D3D_OK, "%u - %s: SetIntArray failed, got %#x, expected %#x\n", i, res_full_name, hr, D3D_OK); + } + else + { + ok(hr == D3DERR_INVALIDCALL, "%u - %s: SetIntArray failed, got %#x, expected %#x\n", + i, res_full_name, hr, D3DERR_INVALIDCALL); + } + test_effect_parameter_value_GetTestGroup(&res[k], effect, expected_value, parameter, i); + test_effect_parameter_value_ResetValue(&res[k], effect, &blob[res_value_offset], parameter, i); } count = effect->lpVtbl->Release(effect);

1 0

Nikolay Sivov : msxml3: Internally call methods with interface macros.
by Alexandre Julliard Jan. 24, 2012

Jan. 24, 2012

Module: wine Branch: master Commit: e983db851888b900873153ce42921aee85b40b32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e983db851888b900873153ce4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 24 11:02:35 2012 +0300 msxml3: Internally call methods with interface macros. --- dlls/msxml3/domdoc.c | 40 ++++++++++++++++++++-------------------- dlls/msxml3/pi.c | 22 +++++++++++----------- dlls/msxml3/text.c | 8 ++++---- 3 files changed, 35 insertions(+), 35 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 8aa1a21..1ae0d56 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -672,28 +672,28 @@ static inline domdoc *impl_from_IConnectionPointContainer(IConnectionPointContai /************************************************************************ * domdoc implementation of IPersistStream. */ -static HRESULT WINAPI domdoc_IPersistStreamInit_QueryInterface( +static HRESULT WINAPI PersistStreamInit_QueryInterface( IPersistStreamInit *iface, REFIID riid, void **ppvObj) { domdoc* This = impl_from_IPersistStreamInit(iface); return IXMLDOMDocument3_QueryInterface(&This->IXMLDOMDocument3_iface, riid, ppvObj); } -static ULONG WINAPI domdoc_IPersistStreamInit_AddRef( +static ULONG WINAPI PersistStreamInit_AddRef( IPersistStreamInit *iface) { domdoc* This = impl_from_IPersistStreamInit(iface); return IXMLDOMDocument3_AddRef(&This->IXMLDOMDocument3_iface); } -static ULONG WINAPI domdoc_IPersistStreamInit_Release( +static ULONG WINAPI PersistStreamInit_Release( IPersistStreamInit *iface) { domdoc* This = impl_from_IPersistStreamInit(iface); return IXMLDOMDocument3_Release(&This->IXMLDOMDocument3_iface); } -static HRESULT WINAPI domdoc_IPersistStreamInit_GetClassID( +static HRESULT WINAPI PersistStreamInit_GetClassID( IPersistStreamInit *iface, CLSID *classid) { domdoc* This = impl_from_IPersistStreamInit(iface); @@ -707,7 +707,7 @@ static HRESULT WINAPI domdoc_IPersistStreamInit_GetClassID( return S_OK; } -static HRESULT WINAPI domdoc_IPersistStreamInit_IsDirty( +static HRESULT WINAPI PersistStreamInit_IsDirty( IPersistStreamInit *iface) { domdoc *This = impl_from_IPersistStreamInit(iface); @@ -715,7 +715,7 @@ static HRESULT WINAPI domdoc_IPersistStreamInit_IsDirty( return S_FALSE; } -static HRESULT WINAPI domdoc_IPersistStreamInit_Load( +static HRESULT WINAPI PersistStreamInit_Load( IPersistStreamInit *iface, LPSTREAM pStm) { domdoc *This = impl_from_IPersistStreamInit(iface); @@ -768,7 +768,7 @@ static HRESULT WINAPI domdoc_IPersistStreamInit_Load( return attach_xmldoc(This, xmldoc); } -static HRESULT WINAPI domdoc_IPersistStreamInit_Save( +static HRESULT WINAPI PersistStreamInit_Save( IPersistStreamInit *iface, IStream *stream, BOOL clr_dirty) { domdoc *This = impl_from_IPersistStreamInit(iface); @@ -791,7 +791,7 @@ static HRESULT WINAPI domdoc_IPersistStreamInit_Save( return hr; } -static HRESULT WINAPI domdoc_IPersistStreamInit_GetSizeMax( +static HRESULT WINAPI PersistStreamInit_GetSizeMax( IPersistStreamInit *iface, ULARGE_INTEGER *pcbSize) { domdoc *This = impl_from_IPersistStreamInit(iface); @@ -799,7 +799,7 @@ static HRESULT WINAPI domdoc_IPersistStreamInit_GetSizeMax( return E_NOTIMPL; } -static HRESULT WINAPI domdoc_IPersistStreamInit_InitNew( +static HRESULT WINAPI PersistStreamInit_InitNew( IPersistStreamInit *iface) { domdoc *This = impl_from_IPersistStreamInit(iface); @@ -809,15 +809,15 @@ static HRESULT WINAPI domdoc_IPersistStreamInit_InitNew( static const IPersistStreamInitVtbl xmldoc_IPersistStreamInit_VTable = { - domdoc_IPersistStreamInit_QueryInterface, - domdoc_IPersistStreamInit_AddRef, - domdoc_IPersistStreamInit_Release, - domdoc_IPersistStreamInit_GetClassID, - domdoc_IPersistStreamInit_IsDirty, - domdoc_IPersistStreamInit_Load, - domdoc_IPersistStreamInit_Save, - domdoc_IPersistStreamInit_GetSizeMax, - domdoc_IPersistStreamInit_InitNew + PersistStreamInit_QueryInterface, + PersistStreamInit_AddRef, + PersistStreamInit_Release, + PersistStreamInit_GetClassID, + PersistStreamInit_IsDirty, + PersistStreamInit_Load, + PersistStreamInit_Save, + PersistStreamInit_GetSizeMax, + PersistStreamInit_InitNew }; /* IXMLDOMDocument3 interface */ @@ -2665,7 +2665,7 @@ static HRESULT WINAPI domdoc_validateNode( int validated = 0; TRACE("(%p)->(%p, %p)\n", This, node, err); - domdoc_get_readyState(iface, &state); + IXMLDOMDocument3_get_readyState(iface, &state); if (state != READYSTATE_COMPLETE) { if (err) @@ -2760,7 +2760,7 @@ static HRESULT WINAPI domdoc_validate( { domdoc *This = impl_from_IXMLDOMDocument3( iface ); TRACE("(%p)->(%p)\n", This, err); - return domdoc_validateNode(iface, (IXMLDOMNode*)iface, err); + return IXMLDOMDocument3_validateNode(iface, (IXMLDOMNode*)iface, err); } static HRESULT WINAPI domdoc_setProperty( diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c index 332d97c..36ff563 100644 --- a/dlls/msxml3/pi.c +++ b/dlls/msxml3/pi.c @@ -222,23 +222,23 @@ static HRESULT WINAPI dom_pi_put_nodeValue( VARIANT value) { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - BSTR sTarget; + BSTR target; HRESULT hr; TRACE("(%p)->(%s)\n", This, debugstr_variant(&value)); /* Cannot set data to a PI node whose target is 'xml' */ - hr = dom_pi_get_nodeName(iface, &sTarget); + hr = IXMLDOMProcessingInstruction_get_nodeName(iface, &target); if(hr == S_OK) { static const WCHAR xmlW[] = {'x','m','l',0}; - if(lstrcmpW( sTarget, xmlW) == 0) + if(!strcmpW(target, xmlW)) { - SysFreeString(sTarget); + SysFreeString(target); return E_FAIL; } - SysFreeString(sTarget); + SysFreeString(target); } return node_put_value(&This->node, &value); @@ -637,24 +637,24 @@ static HRESULT WINAPI dom_pi_put_data( BSTR data) { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - HRESULT hr; VARIANT val; - BSTR sTarget; + BSTR target; + HRESULT hr; TRACE("(%p)->(%s)\n", This, debugstr_w(data) ); /* Cannot set data to a PI node whose target is 'xml' */ - hr = dom_pi_get_nodeName(iface, &sTarget); + hr = IXMLDOMProcessingInstruction_get_nodeName(iface, &target); if(hr == S_OK) { static const WCHAR xmlW[] = {'x','m','l',0}; - if(lstrcmpW( sTarget, xmlW) == 0) + if(!strcmpW(target, xmlW)) { - SysFreeString(sTarget); + SysFreeString(target); return E_FAIL; } - SysFreeString(sTarget); + SysFreeString(target); } V_VT(&val) = VT_BSTR; diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index abf11b3..74de8e5 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -406,7 +406,7 @@ static HRESULT WINAPI domtext_get_nodeTypedValue( if (!var1) return E_INVALIDARG; - hr = domtext_get_parentNode(iface, &parent); + hr = IXMLDOMText_get_parentNode(iface, &parent); if (hr == S_OK) { @@ -433,7 +433,7 @@ static HRESULT WINAPI domtext_put_nodeTypedValue( TRACE("(%p)->(%s)\n", This, debugstr_variant(&value)); - hr = domtext_get_parentNode(iface, &parent); + hr = IXMLDOMText_get_parentNode(iface, &parent); if (hr == S_OK) { @@ -461,7 +461,7 @@ static HRESULT WINAPI domtext_get_dataType( if (!dtName) return E_INVALIDARG; - hr = domtext_get_parentNode(iface, &parent); + hr = IXMLDOMText_get_parentNode(iface, &parent); if (hr == S_OK) { @@ -491,7 +491,7 @@ static HRESULT WINAPI domtext_put_dataType( if (!dtName) return E_INVALIDARG; - hr = domtext_get_parentNode(iface, &parent); + hr = IXMLDOMText_get_parentNode(iface, &parent); if (hr == S_OK) {

1 0

Francois Gouget : po: Fix an accelerator key specification in the Hungarian translation.
by Alexandre Julliard Jan. 24, 2012

Jan. 24, 2012

Module: wine Branch: master Commit: 2990f853d4501ce486ba990bcac1c39cce648f3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2990f853d4501ce486ba990bc… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jan 24 00:34:18 2012 +0100 po: Fix an accelerator key specification in the Hungarian translation. --- po/hu.po | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/po/hu.po b/po/hu.po index c134c3c..3368217 100644 --- a/po/hu.po +++ b/po/hu.po @@ -10361,7 +10361,7 @@ msgstr "" #: notepad.rc:46 msgid "Select &all\tCtrl+A" -msgstr "&Az összes kijelölése" +msgstr "&Az összes kijelölése\tCtrl+A" #: notepad.rc:47 msgid "&Time/Date\tF5" @@ -13839,7 +13839,6 @@ msgid "R&edo\tCtrl+Y" msgstr "&Előre\tCtrl+Y" #: wordpad.rc:47 -#, fuzzy msgid "&Clear\tDel" msgstr "Tör&lés\tDel"

1 0

Nikolay Sivov : msxml3: Block ::add() if collection is read-only.
by Alexandre Julliard Jan. 24, 2012

Jan. 24, 2012

Module: wine Branch: master Commit: 85cf92aed04a00db017330ff1ba7b7e38ab588a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85cf92aed04a00db017330ff1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 24 10:44:19 2012 +0300 msxml3: Block ::add() if collection is read-only. --- dlls/msxml3/schema.c | 8 +++++++- dlls/msxml3/tests/domdoc.c | 9 +-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c index c614d39..253f901 100644 --- a/dlls/msxml3/schema.c +++ b/dlls/msxml3/schema.c @@ -102,6 +102,7 @@ typedef struct xmlHashTablePtr cache; VARIANT_BOOL validateOnLoad; + int read_only; } schema_cache; typedef struct @@ -966,11 +967,13 @@ static void cache_free(void* data, xmlChar* name /* ignored */) queried at libxml2 level here. */ HRESULT cache_from_doc_ns(IXMLDOMSchemaCollection2 *iface, xmlnode *node) { - static const xmlChar query[] = "//*/namespace::*"; schema_cache* This = impl_from_IXMLDOMSchemaCollection2(iface); + static const xmlChar query[] = "//*/namespace::*"; xmlXPathObjectPtr nodeset; xmlXPathContextPtr ctxt; + This->read_only = 1; + ctxt = xmlXPathNewContext(node->node->doc); nodeset = xmlXPathEvalExpression(query, ctxt); @@ -1111,6 +1114,8 @@ static HRESULT WINAPI schema_cache_add(IXMLDOMSchemaCollection2* iface, BSTR uri xmlChar* name = uri ? xmlchar_from_wchar(uri) : xmlchar_from_wchar(emptyW); TRACE("(%p)->(%s %s)\n", This, debugstr_w(uri), debugstr_variant(&var)); + if (This->read_only) return E_FAIL; + switch (V_VT(&var)) { case VT_NULL: @@ -1498,6 +1503,7 @@ HRESULT SchemaCache_create(MSXML_VERSION version, IUnknown* outer, void** obj) This->ref = 1; This->version = version; This->validateOnLoad = VARIANT_TRUE; + This->read_only = 0; init_dispex(&This->dispex, (IUnknown*)&This->IXMLDOMSchemaCollection2_iface, &schemacache_dispex); *obj = &This->IXMLDOMSchemaCollection2_iface; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index df8e1cb..fb3eab4 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -11400,7 +11400,6 @@ static void test_get_namespaces(void) V_VT(&v) = VT_DISPATCH; V_DISPATCH(&v) = (IDispatch*)doc2; hr = IXMLDOMSchemaCollection_add(collection, _bstr_(xsd_schema1_uri), v); -todo_wine EXPECT_HR(hr, E_FAIL); hr = IXMLDOMSchemaCollection_get_namespaceURI(collection, 0, &s); @@ -11410,16 +11409,13 @@ todo_wine hr = IXMLDOMSchemaCollection_get_namespaceURI(collection, 1, &s); EXPECT_HR(hr, S_OK); -todo_wine ok(!lstrcmpW(s, _bstr_("http://blahblah.org")), "got %s\n", wine_dbgstr_w(s)); SysFreeString(s); s = (void*)0xdeadbeef; hr = IXMLDOMSchemaCollection_get_namespaceURI(collection, 2, &s); -todo_wine { EXPECT_HR(hr, E_FAIL); ok(s == (void*)0xdeadbeef, "got %p\n", s); -} /* enumerate */ enumv = (void*)0xdeadbeef; @@ -11513,7 +11509,6 @@ todo_wine V_VT(&v) = VT_DISPATCH; V_DISPATCH(&v) = (IDispatch*)doc2; hr = IXMLDOMSchemaCollection_add(collection, _bstr_(xsd_schema1_uri), v); -todo_wine EXPECT_HR(hr, E_FAIL); IXMLDOMSchemaCollection_Release(doc2); @@ -11524,16 +11519,14 @@ todo_wine hr = IXMLDOMSchemaCollection_get_namespaceURI(collection, 1, &s); EXPECT_HR(hr, S_OK); -todo_wine ok(!lstrcmpW(s, _bstr_("http://blahblah.org")), "got %s\n", wine_dbgstr_w(s)); SysFreeString(s); s = (void*)0xdeadbeef; hr = IXMLDOMSchemaCollection_get_namespaceURI(collection, 2, &s); -todo_wine { EXPECT_HR(hr, E_FAIL); ok(s == (void*)0xdeadbeef, "got %p\n", s); -} + /* enumerate */ enumv = (void*)0xdeadbeef; hr = IXMLDOMSchemaCollection_get__newEnum(collection, (IUnknown**)&enumv);

1 0

Matteo Bruni : wined3d: SM1 texture projection always divides by w when there is a vertex shader set .
by Alexandre Julliard Jan. 24, 2012

Jan. 24, 2012

Module: wine Branch: master Commit: f69f2aa3478b860096b846d7a57794d2a7cabe78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f69f2aa3478b860096b846d7a… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Jan 23 22:34:47 2012 +0100 wined3d: SM1 texture projection always divides by w when there is a vertex shader set. --- dlls/d3d9/tests/visual.c | 18 +++++++++--------- dlls/wined3d/shader.c | 35 ++++++++++++++++++++--------------- 2 files changed, 29 insertions(+), 24 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index c3c4ad6..4f0f204 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -4237,25 +4237,25 @@ static void texture_transform_flags_test(IDirect3DDevice9 *device) struct projected_textures_test_run projected_tests_3[4] = { { - "D3DTTFF_PROJECTED (like COUNT4 | PROJECTED) - bottom left", + "D3DTTFF_COUNT3 | D3DTTFF_PROJECTED (like COUNT4 | PROJECTED) - bottom left", D3DTTFF_PROJECTED, decl3, - TRUE, TRUE, + TRUE, FALSE, {120, 300, 240, 390}, }, { - "D3DTTFF_PROJECTED (like COUNT4 | PROJECTED, the w component has the default value 1.0) - bottom right", - D3DTTFF_PROJECTED, - decl, + "D3DTTFF_COUNT3 | D3DTTFF_PROJECTED (like COUNT4 | PROJECTED) - bottom right", + D3DTTFF_COUNT3 | D3DTTFF_PROJECTED, + decl3, TRUE, TRUE, - {340, 450, 360, 465}, + {440, 300, 560, 390}, }, { - "0xffffffff (like COUNT4 | PROJECTED, the w component has the default value 1.0) - top left", + "0xffffffff (like COUNT4 | PROJECTED) - top left", 0xffffffff, - decl, + decl3, TRUE, TRUE, - {20, 210, 40, 225}, + {120, 60, 240, 150}, }, { "D3DTTFF_PROJECTED (like COUNT4 | PROJECTED) - top right", diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 1ca4351..d047269 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1919,14 +1919,15 @@ void find_ps_compile_args(const struct wined3d_state *state, if (flags & WINED3D_TTFF_PROJECTED) { - enum wined3d_sampler_texture_type sampler_type = shader->reg_maps.sampler_type[i]; DWORD tex_transform = flags & ~WINED3D_TTFF_PROJECTED; - DWORD max_valid = WINED3D_TTFF_COUNT4; if (!state->vertex_shader) { unsigned int j; unsigned int index = state->texture_states[i][WINED3D_TSS_TEXCOORD_INDEX]; + DWORD max_valid = WINED3D_TTFF_COUNT4; + enum wined3d_sampler_texture_type sampler_type = shader->reg_maps.sampler_type[i]; + for (j = 0; j < state->vertex_declaration->element_count; ++j) { struct wined3d_vertex_declaration_element *element = @@ -1939,21 +1940,25 @@ void find_ps_compile_args(const struct wined3d_state *state, break; } } + if (!tex_transform || tex_transform > max_valid) + { + WARN("Fixing up projected texture transform flags from %#x to %#x.\n", + tex_transform, max_valid); + tex_transform = max_valid; + } + if ((sampler_type == WINED3DSTT_1D && tex_transform > WINED3D_TTFF_COUNT1) + || (sampler_type == WINED3DSTT_2D && tex_transform > WINED3D_TTFF_COUNT2) + || (sampler_type == WINED3DSTT_VOLUME && tex_transform > WINED3D_TTFF_COUNT3)) + tex_transform |= WINED3D_PSARGS_PROJECTED; + else + { + WARN("Application requested projected texture with unsuitable texture coordinates.\n"); + WARN("(texture unit %u, transform flags %#x, sampler type %u).\n", + i, tex_transform, sampler_type); + } } - - if (!tex_transform || tex_transform > max_valid) - { - WARN("Fixing up projected texture transform flags from %#x to %#x.\n", - tex_transform, max_valid); - tex_transform = max_valid; - } - - if ((sampler_type == WINED3DSTT_1D && tex_transform > WINED3D_TTFF_COUNT1) - || (sampler_type == WINED3DSTT_2D && tex_transform > WINED3D_TTFF_COUNT2) - || (sampler_type == WINED3DSTT_VOLUME && tex_transform > WINED3D_TTFF_COUNT3)) - tex_transform |= WINED3D_PSARGS_PROJECTED; else - WARN("Application requested projected texture with unsuitable texture coordinates.\n"); + tex_transform = WINED3D_TTFF_COUNT4 | WINED3D_PSARGS_PROJECTED; args->tex_transform |= tex_transform << i * WINED3D_PSARGS_TEXTRANSFORM_SHIFT; }

1 0

Matteo Bruni : ddraw: Accept pointers to wrong IDirectDrawSurface versions.
by Alexandre Julliard Jan. 24, 2012

Jan. 24, 2012

Module: wine Branch: master Commit: e51d3f6de60716391181f91fc73f3fbee45f4e9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e51d3f6de60716391181f91fc… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Jan 23 22:34:48 2012 +0100 ddraw: Accept pointers to wrong IDirectDrawSurface versions. --- dlls/ddraw/surface.c | 57 ++++++++++++++++-- dlls/ddraw/tests/ddraw1.c | 143 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 143 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 120 +++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 93 +++++++++++++++++++++++++++++ 5 files changed, 551 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e51d3f6de60716391181f…

1 0

Thomas Faber : crypt32: Fix build with MSVC.
by Alexandre Julliard Jan. 24, 2012

Jan. 24, 2012

Module: wine Branch: master Commit: a7144d916db882a3cb0d9f53e356726b00ba04bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7144d916db882a3cb0d9f53e… Author: Thomas Faber <thfabba(a)gmx.de> Date: Mon Jan 23 18:37:35 2012 +0100 crypt32: Fix build with MSVC. --- dlls/crypt32/msg.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 50c1bee..610f8c5 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -1809,7 +1809,12 @@ static BOOL CEnvelopedEncodeMsg_GetParam(HCRYPTMSG hCryptMsg, DWORD dwParamType, char oid_rsa_data[] = szOID_RSA_data; CRYPT_ENVELOPED_DATA envelopedData = { CMSG_ENVELOPED_DATA_PKCS_1_5_VERSION, msg->cRecipientInfo, - msg->recipientInfo, { oid_rsa_data, msg->algo, msg->data } + msg->recipientInfo, { oid_rsa_data, { + msg->algo.pszObjId, + { msg->algo.Parameters.cbData, msg->algo.Parameters.pbData } + }, + { msg->data.cbData, msg->data.pbData } + } }; ret = CRYPT_AsnEncodePKCSEnvelopedData(&envelopedData, pvData,

1 0