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

Francois Gouget : po: Remove an unwanted trailing full stop in the Lithuanian translation.
by Alexandre Julliard 21 Aug '12

21 Aug '12

Module: wine Branch: master Commit: 369892b8798fd1f47b9b02009227775a5eae2cd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=369892b8798fd1f47b9b02009… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Aug 21 13:38:32 2012 +0200 po: Remove an unwanted trailing full stop in the Lithuanian translation. --- po/lt.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/lt.po b/po/lt.po index 231525d..d171b76 100644 --- a/po/lt.po +++ b/po/lt.po @@ -13692,7 +13692,7 @@ msgstr "Klaida: Komandos eilutė nepalaikoma\n" #: wmic.rc:26 msgid "Error: Alias not found\n" -msgstr "Klaida: Alternatyvusis vardas nerastas.\n" +msgstr "Klaida: Alternatyvusis vardas nerastas\n" #: wmic.rc:27 msgid "Error: Invalid query\n"

1 0

Francois Gouget : d3dx9_36: Add a trailing '\n' to a couple of Wine traces.
by Alexandre Julliard 21 Aug '12

21 Aug '12

Module: wine Branch: master Commit: e282d418e398b3be7c380df89b1c6a545053303f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e282d418e398b3be7c380df89… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Aug 21 13:35:19 2012 +0200 d3dx9_36: Add a trailing '\n' to a couple of Wine traces. --- dlls/d3dx9_36/shader.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index b1a8c17..e44e618 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -984,7 +984,7 @@ static HRESULT set_float_matrix(FLOAT *matrix, const D3DXCONSTANT_DESC *desc, } break; default: - FIXME("Unhandled type %#x", type); + FIXME("Unhandled type %#x\n", type); return D3DERR_INVALIDCALL; } @@ -1238,7 +1238,7 @@ static HRESULT WINAPI ID3DXConstantTableImpl_SetValue(ID3DXConstantTable *iface, return set_matrix_array(iface, device, constant, data, elements, D3DXPC_MATRIX_ROWS, desc.Type, desc.Rows, desc.Columns); default: - FIXME("Unhandled parameter class %#x", desc.Class); + FIXME("Unhandled parameter class %#x\n", desc.Class); return D3DERR_INVALIDCALL; } }

1 0

Józef Kucia : d3dx9: ID3DXConstantTable:: SetFloat shouldn't change the value of matrix and vector constants.
by Alexandre Julliard 21 Aug '12

21 Aug '12

Module: wine Branch: master Commit: aaac25dc67a1b2dd47144102dd0c38d79df8a8dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=aaac25dc67a1b2dd47144102d… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Tue Aug 21 14:52:16 2012 +0200 d3dx9: ID3DXConstantTable::SetFloat shouldn't change the value of matrix and vector constants. --- dlls/d3dx9_36/shader.c | 3 +++ dlls/d3dx9_36/tests/shader.c | 28 +++++++++++++++++++++++++++- 2 files changed, 30 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index d5d5018..33e3aeb 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -873,6 +873,9 @@ static HRESULT set_scalar_array(ID3DXConstantTable *iface, IDirect3DDevice9 *dev return D3DERR_INVALIDCALL; } + if (desc.Class != D3DXPC_SCALAR) + return D3D_OK; + switch (desc.RegisterSet) { case D3DXRS_FLOAT4: diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index 12725f2..2ecb802 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -623,7 +623,7 @@ static void test_setting_basic_table(IDirect3DDevice9 *device) out[0], out[1], out[2], out[3], f); IDirect3DDevice9_GetVertexShaderConstantF(device, 7, out, 1); - ok(memcmp(out, (void*)&f4, sizeof(f4)) == 0, + ok(memcmp(out, &f4, sizeof(f4)) == 0, "The variable f4 was not set correctly, out={%f, %f, %f, %f}, should be {%f, %f, %f, %f}\n", out[0], out[1], out[2], out[3], f4.x, f4.y, f4.z, f4.w); @@ -649,6 +649,7 @@ static void test_setting_basic_table(IDirect3DDevice9 *device) /* Clear registers */ memset(out, 0, sizeof(out)); IDirect3DDevice9_SetVertexShaderConstantF(device, 0, out, 4); + IDirect3DDevice9_SetVertexShaderConstantF(device, 7, out, 1); /* SetVector shouldn't change the value of a matrix constant */ res = ID3DXConstantTable_SetVector(ctable, device, "mvp", &f4); @@ -667,6 +668,31 @@ static void test_setting_basic_table(IDirect3DDevice9 *device) out[8], out[9], out[10], out[11], out[12], out[13], out[14], out[15]); + res = ID3DXConstantTable_SetFloat(ctable, device, "mvp", f); + ok(res == D3D_OK, "ID3DXConstantTable_SetFloat failed on variable mvp: 0x%08x\n", res); + + IDirect3DDevice9_GetVertexShaderConstantF(device, 0, out, 4); + ok(out[0] == 0.0f && out[1] == 0.0f && out[2] == 0.0f && out[3] == 0.0f + && out[4] == 0.0f && out[5] == 0.0f && out[6] == 0.0f && out[7] == 0.0f + && out[8] == 0.0f && out[9] == 0.0f && out[10] == 0.0f && out[11] == 0.0f + && out[12] == 0.0f && out[13] == 0.0f && out[14] == 0.0f && out[15] == 0.0f, + "The variable mvp was not set correctly by ID3DXConstantTable_SetFloat, " + "got {%f, %f, %f, %f; %f, %f, %f, %f; %f, %f, %f %f; %f, %f, %f, %f}, " + "should be all 0.0f\n", + out[0], out[1], out[2], out[3], + out[4], out[5], out[6], out[7], + out[8], out[9], out[10], out[11], + out[12], out[13], out[14], out[15]); + + res = ID3DXConstantTable_SetFloat(ctable, device, "f4", f); + ok(res == D3D_OK, "ID3DXConstantTable_SetFloat failed on variable f4: 0x%08x\n", res); + + IDirect3DDevice9_GetVertexShaderConstantF(device, 7, out, 1); + ok(out[0] == 0.0f && out[1] == 0.0f && out[2] == 0.0f && out[3] == 0.0f, + "The variable f4 was not set correctly by ID3DXConstantTable_SetFloat, " + "got {%f, %f, %f, %f}, should be all 0.0f\n", + out[0], out[1], out[2], out[3]); + refcnt = ID3DXConstantTable_Release(ctable); ok(refcnt == 0, "The constant table reference count was %u, should be 0\n", refcnt); }

1 0

Józef Kucia : d3dx9: Implement ID3DXConstantTable:: SetMatrixTransposeArray.
by Alexandre Julliard 21 Aug '12

21 Aug '12

Module: wine Branch: master Commit: edbd09fb4521a98692bc29b3afd1e7f17d7568dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=edbd09fb4521a98692bc29b3a… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Tue Aug 21 14:52:17 2012 +0200 d3dx9: Implement ID3DXConstantTable::SetMatrixTransposeArray. --- dlls/d3dx9_36/shader.c | 108 +++++++++++++++++++++++++++++++---------------- 1 files changed, 71 insertions(+), 37 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 33e3aeb..11835eb 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -961,15 +961,47 @@ static HRESULT set_vector_array(ID3DXConstantTable *iface, IDirect3DDevice9 *dev return D3D_OK; } +static HRESULT set_float_matrix(FLOAT *matrix, const D3DXCONSTANT_DESC *desc, + UINT row_offset, UINT column_offset, UINT rows, UINT columns, + const void *data, D3DXPARAMETER_TYPE type, UINT src_columns) +{ + UINT i, j; + + switch (type) + { + case D3DXPT_FLOAT: + for (i = 0; i < rows; i++) + { + for (j = 0; j < columns; j++) + matrix[i * row_offset + j * column_offset] = ((FLOAT *)data)[i * src_columns + j]; + } + break; + case D3DXPT_INT: + for (i = 0; i < rows; i++) + { + for (j = 0; j < columns; j++) + matrix[i * row_offset + j * column_offset] = ((INT *)data)[i * src_columns + j]; + } + break; + default: + FIXME("Unhandled type %#x", type); + return D3DERR_INVALIDCALL; + } + + return D3D_OK; +} + static HRESULT set_matrix_array(ID3DXConstantTable *iface, IDirect3DDevice9 *device, D3DXHANDLE constant, const void *data, - UINT count, D3DXPARAMETER_TYPE type, UINT rows, UINT columns) + UINT count, D3DXPARAMETER_CLASS class, D3DXPARAMETER_TYPE type, UINT rows, UINT columns) { struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface); D3DXCONSTANT_DESC desc; HRESULT hr; UINT registers_per_matrix; - UINT i, j, k, desc_count = 1; + UINT i, desc_count = 1; + UINT num_rows, num_columns; UINT row_offset, column_offset; + const DWORD *data_ptr; FLOAT matrix[16] = {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, @@ -982,22 +1014,38 @@ static HRESULT set_matrix_array(ID3DXConstantTable *iface, IDirect3DDevice9 *dev return D3DERR_INVALIDCALL; } - if (desc.Class == D3DXPC_MATRIX_COLUMNS) - { - column_offset = 4; - row_offset = 1; - registers_per_matrix = desc.Columns; - } - else if (desc.Class == D3DXPC_MATRIX_ROWS) + if (desc.Class == D3DXPC_MATRIX_ROWS || desc.Class == D3DXPC_MATRIX_COLUMNS) { - column_offset = 1; - row_offset = 4; - registers_per_matrix = desc.Rows; + if (desc.Class == class) + { + column_offset = 1; + row_offset = 4; + } + else + { + column_offset = 4; + row_offset = 1; + } + + if (class == D3DXPC_MATRIX_ROWS) + { + num_rows = min(desc.Rows, rows); + num_columns = min(desc.Columns, columns); + } + else + { + num_rows = min(desc.Columns, columns); + num_columns = min(desc.Rows, rows); + } + + registers_per_matrix = (desc.Class == D3DXPC_MATRIX_ROWS) ? desc.Rows : desc.Columns; } else if (desc.Class == D3DXPC_SCALAR) { column_offset = 1; row_offset = 1; + num_rows = min(desc.Rows, rows); + num_columns = min(desc.Columns, columns); registers_per_matrix = 1; } else @@ -1009,33 +1057,18 @@ static HRESULT set_matrix_array(ID3DXConstantTable *iface, IDirect3DDevice9 *dev switch (desc.RegisterSet) { case D3DXRS_FLOAT4: + data_ptr = data; for (i = 0; i < count; i++) { if (registers_per_matrix * (i + 1) > desc.RegisterCount) break; - switch (type) - { - case D3DXPT_FLOAT: - for (j = 0; j < min(desc.Rows, rows); j++) - { - for (k = 0; k < min(desc.Columns, columns); k++) - matrix[j * row_offset + k * column_offset] = ((float *)data)[i * rows * columns + j * columns + k]; - } - break; - case D3DXPT_INT: - for (j = 0; j < min(desc.Rows, rows); j++) - { - for (k = 0; k < min(desc.Columns, columns); k++) - matrix[j * row_offset + k * column_offset] = (float)((int *)data)[i * rows * columns + j * columns + k]; - } - break; - default: - FIXME("Unhandled type %#x", type); - return D3DERR_INVALIDCALL; - } + hr = set_float_matrix(matrix, &desc, row_offset, column_offset, num_rows, num_columns, data_ptr, type, columns); + if (FAILED(hr)) return hr; set_float_shader_constant(This, device, desc.RegisterIndex + i * registers_per_matrix, matrix, registers_per_matrix); + + data_ptr += rows * columns; } break; default: @@ -1097,7 +1130,8 @@ static HRESULT WINAPI ID3DXConstantTableImpl_SetValue(ID3DXConstantTable *iface, return set_vector_array(iface, device, constant, data,elements, desc.Type); case D3DXPC_MATRIX_ROWS: case D3DXPC_MATRIX_COLUMNS: - return set_matrix_array(iface, device, constant, data, elements, desc.Type, desc.Rows, desc.Columns); + return set_matrix_array(iface, device, constant, data, elements, + D3DXPC_MATRIX_ROWS, desc.Type, desc.Rows, desc.Columns); default: FIXME("Unhandled parameter class %#x", desc.Class); return D3DERR_INVALIDCALL; @@ -1190,7 +1224,7 @@ static HRESULT WINAPI ID3DXConstantTableImpl_SetMatrix(ID3DXConstantTable *iface TRACE("(%p)->(%p, %p, %p)\n", This, device, constant, matrix); - return set_matrix_array(iface, device, constant, matrix, 1, D3DXPT_FLOAT, 4, 4); + return set_matrix_array(iface, device, constant, matrix, 1, D3DXPC_MATRIX_ROWS, D3DXPT_FLOAT, 4, 4); } static HRESULT WINAPI ID3DXConstantTableImpl_SetMatrixArray(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 device, @@ -1200,7 +1234,7 @@ static HRESULT WINAPI ID3DXConstantTableImpl_SetMatrixArray(ID3DXConstantTable * TRACE("(%p)->(%p, %p, %p, %d)\n", This, device, constant, matrix, count); - return set_matrix_array(iface, device, constant, matrix, count, D3DXPT_FLOAT, 4, 4); + return set_matrix_array(iface, device, constant, matrix, count, D3DXPC_MATRIX_ROWS, D3DXPT_FLOAT, 4, 4); } static HRESULT WINAPI ID3DXConstantTableImpl_SetMatrixPointerArray(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 device, @@ -1228,9 +1262,9 @@ static HRESULT WINAPI ID3DXConstantTableImpl_SetMatrixTransposeArray(ID3DXConsta { struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface); - FIXME("(%p)->(%p, %p, %p, %d): stub\n", This, device, constant, matrix, count); + TRACE("(%p)->(%p, %p, %p, %d)\n", This, device, constant, matrix, count); - return E_NOTIMPL; + return set_matrix_array(iface, device, constant, matrix, count, D3DXPC_MATRIX_COLUMNS, D3DXPT_FLOAT, 4, 4); } static HRESULT WINAPI ID3DXConstantTableImpl_SetMatrixTransposePointerArray(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 device,

1 0

Józef Kucia : d3dx9: Implement ID3DXConstantTable:: SetMatrixTranspose.
by Alexandre Julliard 21 Aug '12

21 Aug '12

Module: wine Branch: master Commit: 51f4f013089b4d1fa02eb445341475b38f5a049a URL: http://source.winehq.org/git/wine.git/?a=commit;h=51f4f013089b4d1fa02eb4453… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Tue Aug 21 14:52:18 2012 +0200 d3dx9: Implement ID3DXConstantTable::SetMatrixTranspose. --- dlls/d3dx9_36/shader.c | 4 +- dlls/d3dx9_36/tests/shader.c | 49 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 11835eb..01b2e7c 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -1252,9 +1252,9 @@ static HRESULT WINAPI ID3DXConstantTableImpl_SetMatrixTranspose(ID3DXConstantTab { struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface); - FIXME("(%p)->(%p, %p, %p): stub\n", This, device, constant, matrix); + TRACE("(%p)->(%p, %p, %p)\n", This, device, constant, matrix); - return E_NOTIMPL; + return set_matrix_array(iface, device, constant, matrix, 1, D3DXPC_MATRIX_COLUMNS, D3DXPT_FLOAT, 4, 4); } static HRESULT WINAPI ID3DXConstantTableImpl_SetMatrixTransposeArray(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 device, diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index 2ecb802..caa0f0b 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -649,6 +649,7 @@ static void test_setting_basic_table(IDirect3DDevice9 *device) /* Clear registers */ memset(out, 0, sizeof(out)); IDirect3DDevice9_SetVertexShaderConstantF(device, 0, out, 4); + IDirect3DDevice9_SetVertexShaderConstantF(device, 6, out, 1); IDirect3DDevice9_SetVertexShaderConstantF(device, 7, out, 1); /* SetVector shouldn't change the value of a matrix constant */ @@ -693,6 +694,24 @@ static void test_setting_basic_table(IDirect3DDevice9 *device) "got {%f, %f, %f, %f}, should be all 0.0f\n", out[0], out[1], out[2], out[3]); + res = ID3DXConstantTable_SetMatrixTranspose(ctable, device, "f", &mvp); + ok(res == D3D_OK, "ID3DXConstantTable_SetMatrixTranspose failed on variable f: 0x%08x\n", res); + + IDirect3DDevice9_GetVertexShaderConstantF(device, 6, out, 1); + ok(out[0] == U(S(mvp))._11 && out[1] == 0.0f && out[2] == 0.0f && out[3] == 0.0f, + "The variable f was not set correctly by ID3DXConstantTable_SetMatrixTranspose, got %f, should be %f\n", + out[0], U(S(mvp))._11); + + res = ID3DXConstantTable_SetMatrixTranspose(ctable, device, "f4", &mvp); + ok(res == D3D_OK, "ID3DXConstantTable_SetMatrixTranspose failed on variable f4: 0x%08x\n", res); + + IDirect3DDevice9_GetVertexShaderConstantF(device, 7, out, 1); + todo_wine ok(out[0] == S(U(mvp))._11 && out[1] == S(U(mvp))._21 && out[2] == S(U(mvp))._31 && out[3] == S(U(mvp))._41, + "The variable f4 was not set correctly by ID3DXConstantTable_SetMatrixTranspose, " + "got {%f, %f, %f, %f}, should be {%f, %f, %f, %f}\n", + out[0], out[1], out[2], out[3], + S(U(mvp))._11, S(U(mvp))._21, S(U(mvp))._31, S(U(mvp))._41); + refcnt = ID3DXConstantTable_Release(ctable); ok(refcnt == 0, "The constant table reference count was %u, should be 0\n", refcnt); } @@ -741,6 +760,7 @@ static void test_setting_matrices_table(IDirect3DDevice9 *device) res = D3DXGetShaderConstantTable(ctab_matrices2, &ctable); ok(res == D3D_OK, "D3DXGetShaderConstantTable failed: got %#x\n", res); + /* SetMatrix */ res = ID3DXConstantTable_SetMatrix(ctable, device, "c2x3", &fmatrix); ok(res == D3D_OK, "ID3DXConstantTable_SetMatrix failed on variable c2x3: got %#x\n", res); @@ -826,6 +846,35 @@ static void test_setting_matrices_table(IDirect3DDevice9 *device) S(U(fmatrix))._31, S(U(fmatrix))._32, S(U(fmatrix))._33, S(U(fmatrix))._34, S(U(fmatrix))._41, S(U(fmatrix))._42, S(U(fmatrix))._43, S(U(fmatrix))._44); + /* SetMatrixTranspose */ + res = ID3DXConstantTable_SetMatrixTranspose(ctable, device, "c2x3", &fmatrix); + ok(res == D3D_OK, "ID3DXConstantTable_SetMatrixTranspose failed on variable c2x3: got %#x\n", res); + + res = ID3DXConstantTable_SetMatrixTranspose(ctable, device, "r2x3", &fmatrix); + ok(res == D3D_OK, "ID3DXConstantTable_SetMatrixTranspose failed on variable r2x3: got %#x\n", res); + + IDirect3DDevice9_GetVertexShaderConstantF(device, 7, out, 3); + ok(out[0] == S(U(fmatrix))._11 && out[1] == S(U(fmatrix))._12 && out[2] == 0.0f && out[3] == 0.0f + && out[4] == S(U(fmatrix))._21 && out[5] == S(U(fmatrix))._22 && out[6] == 0.0f && out[7] == 0.0f + && out[8] == S(U(fmatrix))._31 && out[9] == S(U(fmatrix))._32 && out[10] == 0.0f && out[11] == 0.0f, + "The variable c2x3 was not set correctly, out={%f, %f, %f, %f; %f, %f, %f, %f; %f, %f, %f, %f}, " + "should be {%f, %f, %f, %f; %f, %f, %f, %f; %f, %f, %f, %f}\n", + out[0], out[1], out[2], out[3], + out[4], out[5], out[6], out[7], + out[8], out[9], out[10], out[11], + S(U(fmatrix))._11, S(U(fmatrix))._12, 0.0f, 0.0f, + S(U(fmatrix))._21, S(U(fmatrix))._22, 0.0f, 0.0f, + S(U(fmatrix))._31, S(U(fmatrix))._32, 0.0f, 0.0f); + + IDirect3DDevice9_GetVertexShaderConstantF(device, 15, out, 2); + ok(out[0] == S(U(fmatrix))._11 && out[1] == S(U(fmatrix))._21 && out[2] == S(U(fmatrix))._31 && out[3] == 0.0f + && out[4] == S(U(fmatrix))._12 && out[5] == S(U(fmatrix))._22 && out[6] == S(U(fmatrix))._32 && out[7] == 0.0f, + "The variable r2x3 was not set correctly, out={%f, %f, %f, %f; %f, %f, %f, %f}, " + "should be {%f, %f, %f, %f; %f, %f, %f, %f}\n", + out[0], out[1], out[2], out[3], out[4], out[5], out[6], out[7], + S(U(fmatrix))._11, S(U(fmatrix))._21, S(U(fmatrix))._31, 0.0f, + S(U(fmatrix))._12, S(U(fmatrix))._22, S(U(fmatrix))._32, 0.0f); + ID3DXConstantTable_Release(ctable); }

1 0

Józef Kucia : d3dx9: Implement ID3DXConstantTable:: SetMatrixPointerArray.
by Alexandre Julliard 21 Aug '12

21 Aug '12

Module: wine Branch: master Commit: 9fec159abc3f3011a9d473a31ea1bc1ebb62da66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fec159abc3f3011a9d473a31… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Tue Aug 21 14:52:19 2012 +0200 d3dx9: Implement ID3DXConstantTable::SetMatrixPointerArray. --- dlls/d3dx9_36/shader.c | 98 +++++++++++++++++++++++++++++++++++++++++- dlls/d3dx9_36/tests/shader.c | 52 ++++++++++++++++++++++ 2 files changed, 148 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 01b2e7c..621eb88 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -1079,6 +1079,100 @@ static HRESULT set_matrix_array(ID3DXConstantTable *iface, IDirect3DDevice9 *dev return D3D_OK; } +static HRESULT set_matrix_pointer_array(ID3DXConstantTable *iface, IDirect3DDevice9 *device, D3DXHANDLE constant, + const D3DXMATRIX **data, UINT count, D3DXPARAMETER_CLASS class) +{ + struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface); + D3DXCONSTANT_DESC desc; + HRESULT hr; + UINT registers_per_matrix; + UINT i, desc_count = 1; + UINT num_rows, num_columns; + UINT row_offset, column_offset; + FLOAT matrix[16] = {0.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 0.0f}; + + hr = ID3DXConstantTable_GetConstantDesc(iface, constant, &desc, &desc_count); + if (FAILED(hr)) + { + TRACE("ID3DXConstantTable_GetConstantDesc failed: %08x\n", hr); + return D3DERR_INVALIDCALL; + } + + if (desc.Class == D3DXPC_MATRIX_ROWS || desc.Class == D3DXPC_MATRIX_COLUMNS) + { + if (desc.Class == class) + { + column_offset = 1; + row_offset = 4; + } + else + { + column_offset = 4; + row_offset = 1; + } + + if (class == D3DXPC_MATRIX_ROWS) + { + num_rows = desc.Rows; + num_columns = desc.Columns; + } + else + { + num_rows = desc.Columns; + num_columns = desc.Rows; + } + + registers_per_matrix = (desc.Class == D3DXPC_MATRIX_ROWS) ? desc.Rows : desc.Columns; + } + else if (desc.Class == D3DXPC_SCALAR) + { + registers_per_matrix = 1; + column_offset = 1; + row_offset = 1; + num_rows = desc.Rows; + num_columns = desc.Columns; + } + else if (desc.Class == D3DXPC_VECTOR) + { + registers_per_matrix = 1; + column_offset = 1; + row_offset = 4; + num_rows = desc.Rows; + num_columns = desc.Columns; + } + else + { + FIXME("Unhandled variable class %#x\n", desc.Class); + return D3D_OK; + } + + switch (desc.RegisterSet) + { + case D3DXRS_FLOAT4: + for (i = 0; i < count; i++) + { + if (registers_per_matrix * (i + 1) > desc.RegisterCount) + break; + + hr = set_float_matrix(matrix, &desc, row_offset, column_offset, num_rows, num_columns, *data, D3DXPT_FLOAT, 4); + if (FAILED(hr)) return hr; + + set_float_shader_constant(This, device, desc.RegisterIndex + i * registers_per_matrix, matrix, registers_per_matrix); + + data++; + } + break; + default: + FIXME("Unhandled register set %#x\n", desc.RegisterSet); + return E_NOTIMPL; + } + + return D3D_OK; +} + static HRESULT WINAPI ID3DXConstantTableImpl_SetDefaults(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 device) { struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface); @@ -1242,9 +1336,9 @@ static HRESULT WINAPI ID3DXConstantTableImpl_SetMatrixPointerArray(ID3DXConstant { struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface); - FIXME("(%p)->(%p, %p, %p, %d): stub\n", This, device, constant, matrix, count); + TRACE("(%p)->(%p, %p, %p, %d)\n", This, device, constant, matrix, count); - return E_NOTIMPL; + return set_matrix_pointer_array(iface, device, constant, matrix, count, D3DXPC_MATRIX_ROWS); } static HRESULT WINAPI ID3DXConstantTableImpl_SetMatrixTranspose(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 device, diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index caa0f0b..5a58370 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -569,6 +569,7 @@ static void test_setting_basic_table(IDirect3DDevice9 *device) static const D3DXVECTOR4 f4 = {0.350f, 0.526f, 0.925f, 0.021f}; static const float f = 0.12543f; static const int i = 321; + static const D3DXMATRIX *matrix_pointer[] = {&mvp}; ID3DXConstantTable *ctable; @@ -712,6 +713,27 @@ static void test_setting_basic_table(IDirect3DDevice9 *device) out[0], out[1], out[2], out[3], S(U(mvp))._11, S(U(mvp))._21, S(U(mvp))._31, S(U(mvp))._41); + memset(out, 0, sizeof(out)); + IDirect3DDevice9_SetVertexShaderConstantF(device, 6, out, 1); + res = ID3DXConstantTable_SetMatrixPointerArray(ctable, device, "f", matrix_pointer, 1); + ok(res == D3D_OK, "ID3DXConstantTable_SetMatrixPointerArray failed on variable f: got %#x\n", res); + + IDirect3DDevice9_GetVertexShaderConstantF(device, 6, out, 1); + ok(out[0] == U(S(mvp))._11 && out[1] == 0.0f && out[2] == 0.0f && out[3] == 0.0f, + "The variable f was not set correctly by ID3DXConstantTable_SetMatrixPointerArray, " + "got %f, should be %f\n", + out[0], U(S(mvp))._11); + + res = ID3DXConstantTable_SetMatrixPointerArray(ctable, device, "f4", matrix_pointer, 1); + ok(res == D3D_OK, "ID3DXConstantTable_SetMatrixPointerArray failed on variable f4: got %#x\n", res); + + IDirect3DDevice9_GetVertexShaderConstantF(device, 7, out, 1); + ok(out[0] == U(S(mvp))._11 && out[1] == U(S(mvp))._12 && out[2] == U(S(mvp))._13 && out[3] == U(S(mvp))._14, + "The variable f4 was not set correctly by ID3DXConstantTable_SetMatrixPointerArray, " + "got {%f, %f, %f, %f}, should be {%f, %f, %f, %f}\n", + out[0], out[1], out[2], out[3], + U(S(mvp))._11, U(S(mvp))._12, U(S(mvp))._13, U(S(mvp))._14); + refcnt = ID3DXConstantTable_Release(ctable); ok(refcnt == 0, "The constant table reference count was %u, should be 0\n", refcnt); } @@ -723,6 +745,7 @@ static void test_setting_matrices_table(IDirect3DDevice9 *device) 5.005f, 3.006f, 3.007f, 6.008f, 9.009f, 5.010f, 7.011f, 1.012f, 5.013f, 5.014f, 5.015f, 9.016f}}}; + static const D3DXMATRIX *matrix_pointer[] = {&fmatrix}; ID3DXConstantTable *ctable; @@ -875,6 +898,35 @@ static void test_setting_matrices_table(IDirect3DDevice9 *device) S(U(fmatrix))._11, S(U(fmatrix))._21, S(U(fmatrix))._31, 0.0f, S(U(fmatrix))._12, S(U(fmatrix))._22, S(U(fmatrix))._32, 0.0f); + /* SetMatrixPointerArray */ + res = ID3DXConstantTable_SetMatrixPointerArray(ctable, device, "c2x3", matrix_pointer, 1); + ok(res == D3D_OK, "ID3DXConstantTable_SetMatrixPointerArray failed on variable c2x3: got %#x\n", res); + + res = ID3DXConstantTable_SetMatrixPointerArray(ctable, device, "r2x3", matrix_pointer, 1); + ok(res == D3D_OK, "ID3DXConstantTable_SetMatrixPointerArray failed on variable r2x3: got %#x\n", res); + + IDirect3DDevice9_GetVertexShaderConstantF(device, 7, out, 3); + ok(out[0] == S(U(fmatrix))._11 && out[1] == S(U(fmatrix))._21 && out[2] == 0.0f && out[3] == 0.0f + && out[4] == S(U(fmatrix))._12 && out[5] == S(U(fmatrix))._22 && out[6] == 0.0f && out[7] == 0.0f + && out[8] == S(U(fmatrix))._13 && out[9] == S(U(fmatrix))._23 && out[10] == 0.0f && out[11] == 0.0f, + "The variable c2x3 was not set correctly, out={%f, %f, %f, %f; %f, %f, %f, %f; %f, %f, %f, %f}, " + "should be {%f, %f, %f, %f; %f, %f, %f, %f; %f, %f, %f, %f}\n", + out[0], out[1], out[2], out[3], + out[4], out[5], out[6], out[7], + out[8], out[9], out[10], out[11], + S(U(fmatrix))._11, S(U(fmatrix))._21, 0.0f, 0.0f, + S(U(fmatrix))._12, S(U(fmatrix))._22, 0.0f, 0.0f, + S(U(fmatrix))._13, S(U(fmatrix))._23, 0.0f, 0.0f); + + IDirect3DDevice9_GetVertexShaderConstantF(device, 15, out, 2); + ok(out[0] == S(U(fmatrix))._11 && out[1] == S(U(fmatrix))._12 && out[2] == S(U(fmatrix))._13 && out[3] == 0.0f + && out[4] == S(U(fmatrix))._21 && out[5] == S(U(fmatrix))._22 && out[6] == S(U(fmatrix))._23 && out[7] == 0.0f, + "The variable r2x3 was not set correctly, out={%f, %f, %f, %f; %f, %f, %f, %f}, " + "should be {%f, %f, %f, %f; %f, %f, %f, %f}\n", + out[0], out[1], out[2], out[3], out[4], out[5], out[6], out[7], + S(U(fmatrix))._11, S(U(fmatrix))._12, S(U(fmatrix))._13, 0.0f, + S(U(fmatrix))._21, S(U(fmatrix))._22, S(U(fmatrix))._23, 0.0f); + ID3DXConstantTable_Release(ctable); }

1 0

Józef Kucia : d3dx9: Implement ID3DXConstantTable:: SetMatrixTransposePointerArray.
by Alexandre Julliard 21 Aug '12

21 Aug '12

Module: wine Branch: master Commit: cda7633775c19b1e088a517ff3a4b36ffb0cac79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cda7633775c19b1e088a517ff… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Tue Aug 21 14:52:20 2012 +0200 d3dx9: Implement ID3DXConstantTable::SetMatrixTransposePointerArray. --- dlls/d3dx9_36/shader.c | 23 ++++++++++++++----- dlls/d3dx9_36/tests/shader.c | 50 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 621eb88..b1a8c17 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -1138,10 +1138,21 @@ static HRESULT set_matrix_pointer_array(ID3DXConstantTable *iface, IDirect3DDevi else if (desc.Class == D3DXPC_VECTOR) { registers_per_matrix = 1; - column_offset = 1; - row_offset = 4; - num_rows = desc.Rows; - num_columns = desc.Columns; + + if (class == D3DXPC_MATRIX_ROWS) + { + column_offset = 1; + row_offset = 4; + num_rows = desc.Rows; + num_columns = desc.Columns; + } + else + { + column_offset = 4; + row_offset = 1; + num_rows = desc.Columns; + num_columns = desc.Rows; + } } else { @@ -1366,9 +1377,9 @@ static HRESULT WINAPI ID3DXConstantTableImpl_SetMatrixTransposePointerArray(ID3D { struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface); - FIXME("(%p)->(%p, %p, %p, %d): stub\n", This, device, constant, matrix, count); + TRACE("(%p)->(%p, %p, %p, %d)\n", This, device, constant, matrix, count); - return E_NOTIMPL; + return set_matrix_pointer_array(iface, device, constant, matrix, count, D3DXPC_MATRIX_COLUMNS); } static const struct ID3DXConstantTableVtbl ID3DXConstantTable_Vtbl = diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index 5a58370..e049daf 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -734,6 +734,27 @@ static void test_setting_basic_table(IDirect3DDevice9 *device) out[0], out[1], out[2], out[3], U(S(mvp))._11, U(S(mvp))._12, U(S(mvp))._13, U(S(mvp))._14); + memset(out, 0, sizeof(out)); + IDirect3DDevice9_SetVertexShaderConstantF(device, 6, out, 1); + res = ID3DXConstantTable_SetMatrixTransposePointerArray(ctable, device, "f", matrix_pointer, 1); + ok(res == D3D_OK, "ID3DXConstantTable_SetMatrixTransposePointerArray failed on variable f: got %#x\n", res); + + IDirect3DDevice9_GetVertexShaderConstantF(device, 6, out, 1); + ok(out[0] == U(S(mvp))._11 && out[1] == 0.0f && out[2] == 0.0f && out[3] == 0.0f, + "The variable f was not set correctly by ID3DXConstantTable_SetMatrixTransposePointerArray, " + "got %f, should be %f\n", + out[0], U(S(mvp))._11); + + res = ID3DXConstantTable_SetMatrixTransposePointerArray(ctable, device, "f4", matrix_pointer, 1); + ok(res == D3D_OK, "ID3DXConstantTable_SetMatrixTransposePointerArray failed on variable f4: got %#x\n", res); + + IDirect3DDevice9_GetVertexShaderConstantF(device, 7, out, 1); + ok(out[0] == U(S(mvp))._11 && out[1] == U(S(mvp))._21 && out[2] == U(S(mvp))._31 && out[3] == U(S(mvp))._41, + "The variable f4 was not set correctly by ID3DXConstantTable_SetMatrixTransposePointerArray, " + "got {%f, %f, %f, %f}, should be {%f, %f, %f, %f}\n", + out[0], out[1], out[2], out[3], + U(S(mvp))._11, U(S(mvp))._21, U(S(mvp))._31, U(S(mvp))._41); + refcnt = ID3DXConstantTable_Release(ctable); ok(refcnt == 0, "The constant table reference count was %u, should be 0\n", refcnt); } @@ -927,6 +948,35 @@ static void test_setting_matrices_table(IDirect3DDevice9 *device) S(U(fmatrix))._11, S(U(fmatrix))._12, S(U(fmatrix))._13, 0.0f, S(U(fmatrix))._21, S(U(fmatrix))._22, S(U(fmatrix))._23, 0.0f); + /* SetMatrixTransposePointerArray */ + res = ID3DXConstantTable_SetMatrixTransposePointerArray(ctable, device, "c2x3", matrix_pointer, 1); + ok(res == D3D_OK, "ID3DXConstantTable_SetMatrixTransposePointerArray failed on variable c2x3: got %#x\n", res); + + res = ID3DXConstantTable_SetMatrixTransposePointerArray(ctable, device, "r2x3", matrix_pointer, 1); + ok(res == D3D_OK, "ID3DXConstantTable_SetMatrixTransposePointerArray failed on variable r2x3: got %#x\n", res); + + IDirect3DDevice9_GetVertexShaderConstantF(device, 7, out, 3); + ok(out[0] == S(U(fmatrix))._11 && out[1] == S(U(fmatrix))._12 && out[2] == 0.0f && out[3] == 0.0f + && out[4] == S(U(fmatrix))._21 && out[5] == S(U(fmatrix))._22 && out[6] == 0.0f && out[7] == 0.0f + && out[8] == S(U(fmatrix))._31 && out[9] == S(U(fmatrix))._32 && out[10] == 0.0f && out[11] == 0.0f, + "The variable c2x3 was not set correctly, out={%f, %f, %f, %f; %f, %f, %f, %f; %f, %f, %f, %f}, " + "should be {%f, %f, %f, %f; %f, %f, %f, %f; %f, %f, %f, %f}\n", + out[0], out[1], out[2], out[3], + out[4], out[5], out[6], out[7], + out[8], out[9], out[10], out[11], + S(U(fmatrix))._11, S(U(fmatrix))._12, 0.0f, 0.0f, + S(U(fmatrix))._21, S(U(fmatrix))._22, 0.0f, 0.0f, + S(U(fmatrix))._31, S(U(fmatrix))._32, 0.0f, 0.0f); + + IDirect3DDevice9_GetVertexShaderConstantF(device, 15, out, 2); + ok(out[0] == S(U(fmatrix))._11 && out[1] == S(U(fmatrix))._21 && out[2] == S(U(fmatrix))._31 && out[3] == 0.0f + && out[4] == S(U(fmatrix))._12 && out[5] == S(U(fmatrix))._22 && out[6] == S(U(fmatrix))._32 && out[7] == 0.0f, + "The variable r2x3 was not set correctly, out={%f, %f, %f, %f; %f, %f, %f, %f}, " + "should be {%f, %f, %f, %f; %f, %f, %f, %f}\n", + out[0], out[1], out[2], out[3], out[4], out[5], out[6], out[7], + S(U(fmatrix))._11, S(U(fmatrix))._21, S(U(fmatrix))._31, 0.0f, + S(U(fmatrix))._12, S(U(fmatrix))._22, S(U(fmatrix))._32, 0.0f); + ID3DXConstantTable_Release(ctable); }

1 0

Lucas Zawacki : joy.cpl: Prevent crash on IDirectInputEffect_Release.
by Alexandre Julliard 21 Aug '12

21 Aug '12

Module: wine Branch: master Commit: e3af37eb1c7875456621b85a6bee6de7c0e271b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3af37eb1c7875456621b85a6… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Mon Aug 20 03:39:07 2012 -0300 joy.cpl: Prevent crash on IDirectInputEffect_Release. --- dlls/joy.cpl/main.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c index b84a0aa..0631466 100644 --- a/dlls/joy.cpl/main.c +++ b/dlls/joy.cpl/main.c @@ -90,6 +90,7 @@ static BOOL CALLBACK enum_callback(const DIDEVICEINSTANCEW *instance, void *cont joystick->num_buttons = caps.dwButtons; joystick->num_axes = caps.dwAxes; joystick->forcefeedback = caps.dwFlags & DIDC_FORCEFEEDBACK; + joystick->num_effects = 0; if (joystick->forcefeedback) data->num_ff++; @@ -130,10 +131,10 @@ static void destroy_joysticks(struct JoystickData *data) for (i = 0; i < data->num_joysticks; i++) { - if (data->joysticks[i].forcefeedback) + if (data->joysticks[i].forcefeedback && data->joysticks[i].num_effects > 0) { for (j = 0; j < data->joysticks[i].num_effects; j++) - IDirectInputEffect_Release(data->joysticks[i].effects[j].effect); + IDirectInputEffect_Release(data->joysticks[i].effects[j].effect); HeapFree(GetProcessHeap(), 0, data->joysticks[i].effects); }

1 0

Francois Gouget : dsound: Make dumpCooperativeLevel() static.
by Alexandre Julliard 21 Aug '12

21 Aug '12

Module: wine Branch: master Commit: e2c50d762c74593bdfe4ca1affd869340a64ef9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2c50d762c74593bdfe4ca1af… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Aug 21 13:31:39 2012 +0200 dsound: Make dumpCooperativeLevel() static. --- dlls/dsound/dsound.c | 2 +- dlls/dsound/dsound_private.h | 1 - 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index 3847a18..f704693 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -50,7 +50,7 @@ typedef struct IDirectSoundImpl { BOOL has_ds8; } IDirectSoundImpl; -const char * dumpCooperativeLevel(DWORD level) +static const char * dumpCooperativeLevel(DWORD level) { #define LE(x) case x: return #x switch (level) { diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index 8419a7f..f8e5ca6 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -320,7 +320,6 @@ extern GUID DSOUND_capture_guids[MAXWAVEDRIVERS] DECLSPEC_HIDDEN; extern WCHAR wine_vxd_drv[] DECLSPEC_HIDDEN; void setup_dsound_options(void) DECLSPEC_HIDDEN; -const char * dumpCooperativeLevel(DWORD level) DECLSPEC_HIDDEN; HRESULT get_mmdevice(EDataFlow flow, const GUID *tgt, IMMDevice **device) DECLSPEC_HIDDEN;

1 0

Francois Gouget : msvcrt/tests: Add a trailing '\n' to a win_skip().
by Alexandre Julliard 21 Aug '12

21 Aug '12

Module: wine Branch: master Commit: 88840fc849bc1981ccd98e364f13b6adc8f760fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=88840fc849bc1981ccd98e364… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Aug 21 13:31:49 2012 +0200 msvcrt/tests: Add a trailing '\n' to a win_skip(). --- dlls/msvcrt/tests/cpp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c index 93469c6..dbb948c 100644 --- a/dlls/msvcrt/tests/cpp.c +++ b/dlls/msvcrt/tests/cpp.c @@ -168,7 +168,7 @@ static BOOL InitFunctionPtrs(void) ok(hMsvcrt != 0, "GetModuleHandleA failed\n"); if (!hMsvcrt) { - win_skip("Could not load msvcrt.dll"); + win_skip("Could not load msvcrt.dll\n"); return FALSE; }

1 0