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

Piotr Caban : msvcp90: Added basic_ostream<short> implementation.
by Alexandre Julliard Aug. 14, 2012

Aug. 14, 2012

Module: wine Branch: master Commit: e8cc341df93152543ff9d9419992d273e8a31a9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8cc341df93152543ff9d9419… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Aug 14 10:52:09 2012 +0200 msvcp90: Added basic_ostream<short> implementation. --- dlls/msvcp90/ios.c | 319 ++++++++++++++++++++++++++++++++++++++------- dlls/msvcp90/locale.c | 2 +- dlls/msvcp90/msvcp90.h | 1 + dlls/msvcp90/msvcp90.spec | 136 ++++++++++---------- 4 files changed, 339 insertions(+), 119 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e8cc341df93152543ff9d…

1 0

Józef Kucia : d3dx9/tests: Add tests for ID3DXConstantTable::SetDefaults.
by Alexandre Julliard Aug. 14, 2012

Aug. 14, 2012

Module: wine Branch: master Commit: 35dd7034cf4efc029cd2c3d781cafa8361121ae3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35dd7034cf4efc029cd2c3d78… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Tue Aug 14 11:42:35 2012 +0200 d3dx9/tests: Add tests for ID3DXConstantTable::SetDefaults. --- dlls/d3dx9_36/tests/shader.c | 84 ++++++++++++++++++++++++++++++++++++++++- 1 files changed, 81 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index e79b229..bdccb96 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -197,16 +197,16 @@ static const DWORD ctab_with_default_values[] = { static const float mat4_default_value[] = {1, 5, 9, 13, 2, 6, 10, 14, 3, 7, 11, 15, 4, 8, 12, 16}; static const float mat3_default_value[] = {11, 55, 99, 1313, 22, 66, 1010, 1414, 33, 77, 1111, 1515, 44, 88, 1212, 1616}; -static const float arr_default_value[] = {100, 0, 0}; +static const float arr_default_value[] = {100, 0, 0, 0, 200, 0, 0, 0, 300, 0, 0, 0}; static const float vec4_default_value[] = {10, 20, 30, 40}; -static const float flt_default_value = 9.99; +static const float flt_default_value[] = {9.99, 0, 0, 0}; static const D3DXCONSTANT_DESC ctab_with_default_values_expected[] = { {"mat4", D3DXRS_FLOAT4, 0, 4, D3DXPC_MATRIX_COLUMNS, D3DXPT_FLOAT, 4, 4, 1, 0, 64, mat4_default_value}, {"mat3", D3DXRS_FLOAT4, 4, 4, D3DXPC_MATRIX_COLUMNS, D3DXPT_FLOAT, 4, 4, 1, 0, 64, mat3_default_value}, {"arr", D3DXRS_FLOAT4, 8, 3, D3DXPC_SCALAR, D3DXPT_FLOAT, 1, 1, 3, 0, 12, arr_default_value}, {"vec4", D3DXRS_FLOAT4, 11, 1, D3DXPC_VECTOR, D3DXPT_FLOAT, 1, 4, 1, 0, 16, vec4_default_value}, - {"flt", D3DXRS_FLOAT4, 12, 1, D3DXPC_SCALAR, D3DXPT_FLOAT, 1, 1, 1, 0, 4, &flt_default_value}}; + {"flt", D3DXRS_FLOAT4, 12, 1, D3DXPC_SCALAR, D3DXPT_FLOAT, 1, 1, 1, 0, 4, flt_default_value}}; static const DWORD ctab_samplers[] = { 0xfffe0300, /* vs_3_0 */ @@ -699,6 +699,83 @@ static void test_setting_arrays_table(IDirect3DDevice9 *device) ok(refcnt == 0, "The constant table reference count was %u, should be 0\n", refcnt); } +static void test_SetDefaults(IDirect3DDevice9 *device) +{ + static const D3DXMATRIX mvp = {{{ + 0.51f, 0.62f, 0.80f, 0.78f, + 0.23f, 0.95f, 0.37f, 0.48f, + 0.10f, 0.58f, 0.90f, 0.25f, + 0.89f, 0.41f, 0.93f, 0.27f}}}; + static const D3DXVECTOR4 f4 = {0.2f, 0.4f, 0.8f, 1.2f}; + + float out[16]; + + HRESULT res; + ID3DXConstantTable *ctable; + + res = D3DXGetShaderConstantTable(ctab_basic, &ctable); + ok(res == D3D_OK, "D3DXGetShaderConstantTable failed: got %08x\n", res); + + res = ID3DXConstantTable_SetVector(ctable, device, "f4", &f4); + ok(res == D3D_OK, "ID3DXConstantTable_SetVector failed: got %08x\n", res); + + res = ID3DXConstantTable_SetMatrix(ctable, device, "mvp", &mvp); + ok(res == D3D_OK, "ID3DXConstantTable_SetMatrix failed: got %08x\n", res); + + res = ID3DXConstantTable_SetDefaults(ctable, device); + ok(res == D3D_OK, "ID3dXConstantTable_SetDefaults failed: got %08x\n", res); + + /* SetDefaults doesn't change constants without default values */ + IDirect3DDevice9_GetVertexShaderConstantF(device, 0, out, 4); + ok(out[0] == S(U(mvp))._11 && out[4] == S(U(mvp))._12 && out[8] == S(U(mvp))._13 && out[12] == S(U(mvp))._14, + "The first row of mvp was not set correctly, got {%f, %f, %f, %f}, should be {%f, %f, %f, %f}\n", + out[0], out[4], out[8], out[12], S(U(mvp))._11, S(U(mvp))._12, S(U(mvp))._13, S(U(mvp))._14); + ok(out[1] == S(U(mvp))._21 && out[5] == S(U(mvp))._22 && out[9] == S(U(mvp))._23 && out[13] == S(U(mvp))._24, + "The second row of mvp was not set correctly, got {%f, %f, %f, %f}, should be {%f, %f, %f, %f}\n", + out[1], out[5], out[9], out[13], S(U(mvp))._21, S(U(mvp))._22, S(U(mvp))._23, S(U(mvp))._24); + ok(out[2] == S(U(mvp))._31 && out[6] == S(U(mvp))._32 && out[10] == S(U(mvp))._33 && out[14] == S(U(mvp))._34, + "The third row of mvp was not set correctly, got {%f, %f, %f, %f}, should be {%f, %f, %f, %f}\n", + out[2], out[6], out[10], out[14], S(U(mvp))._31, S(U(mvp))._32, S(U(mvp))._33, S(U(mvp))._34); + ok(out[3] == S(U(mvp))._41 && out[7] == S(U(mvp))._42 && out[11] == S(U(mvp))._43 && out[15] == S(U(mvp))._44, + "The fourth row of mvp was not set correctly, got {%f, %f, %f, %f}, should be {%f, %f, %f, %f}\n", + out[3], out[7], out[11], out[15], S(U(mvp))._41, S(U(mvp))._42, S(U(mvp))._43, S(U(mvp))._44); + + IDirect3DDevice9_GetVertexShaderConstantF(device, 7, out, 1); + 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); + + ID3DXConstantTable_Release(ctable); + + res = D3DXGetShaderConstantTable(ctab_with_default_values, &ctable); + ok(res == D3D_OK, "D3DXGetShaderConstantTable failed: got %08x\n", res); + + res = ID3DXConstantTable_SetDefaults(ctable, device); + ok(res == D3D_OK, "ID3DXConstantTable_SetDefaults failed: got %08x\n", res); + + IDirect3DDevice9_GetVertexShaderConstantF(device, 0, out, 4); + ok(memcmp(out, mat4_default_value, sizeof(mat4_default_value)) == 0, + "The variable mat4 was not set correctly to default value\n"); + + IDirect3DDevice9_GetVertexShaderConstantF(device, 4, out, 4); + ok(memcmp(out, mat3_default_value, sizeof(mat3_default_value)) == 0, + "The variable mat3 was not set correctly to default value\n"); + + IDirect3DDevice9_GetVertexShaderConstantF(device, 8, out, 3); + ok(memcmp(out, arr_default_value, sizeof(arr_default_value)) == 0, + "The variable array was not set correctly to default value\n"); + + IDirect3DDevice9_GetVertexShaderConstantF(device, 11, out, 1); + ok(memcmp(out, vec4_default_value, sizeof(vec4_default_value)) == 0, + "The variable vec4 was not set correctly to default value\n"); + + IDirect3DDevice9_GetVertexShaderConstantF(device, 12, out, 1); + ok(memcmp(out, flt_default_value, sizeof(flt_default_value)) == 0, + "The variable flt was not set correctly to default value\n"); + + ID3DXConstantTable_Release(ctable); +} + static void test_setting_constants(void) { HWND wnd; @@ -737,6 +814,7 @@ static void test_setting_constants(void) test_setting_basic_table(device); test_setting_arrays_table(device); + test_SetDefaults(device); /* Release resources */ refcnt = IDirect3DDevice9_Release(device);

1 0

Józef Kucia : d3dx9/tests: Add tests for constant tables with default values.
by Alexandre Julliard Aug. 14, 2012

Aug. 14, 2012

Module: wine Branch: master Commit: 367ff5efc9d91c553a49046e3b7980c9cda3617f URL: http://source.winehq.org/git/wine.git/?a=commit;h=367ff5efc9d91c553a49046e3… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Tue Aug 14 11:42:34 2012 +0200 d3dx9/tests: Add tests for constant tables with default values. --- dlls/d3dx9_36/tests/shader.c | 71 ++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 68 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index 9a03467..e79b229 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -157,6 +157,57 @@ static const D3DXCONSTANT_DESC ctab_arrays_expected[] = { {"bvecarray", D3DXRS_FLOAT4, 16, 2, D3DXPC_VECTOR, D3DXPT_BOOL, 1, 3, 3, 0, 36, NULL}, {"ivecarray", D3DXRS_FLOAT4, 18, 1, D3DXPC_VECTOR, D3DXPT_INT, 1, 4, 1, 0, 16, NULL}}; +static const DWORD ctab_with_default_values[] = { + 0xfffe0200, /* vs_2_0 */ + 0x007bfffe, FCC_CTAB, /* CTAB comment */ + 0x0000001c, 0x000001b7, 0xfffe0200, 0x00000005, 0x0000001c, /* header */ + 0x00000100, 0x000001b0, + 0x00000080, 0x00080002, 0x00000003, 0x00000084, 0x00000094, /* constant 1 desc (arr) */ + 0x000000c4, 0x000c0002, 0x00000001, 0x000000c8, 0x000000d8, /* constant 2 desc (flt) */ + 0x000000e8, 0x00040002, 0x00000004, 0x000000f0, 0x00000100, /* constant 3 desc (mat3) */ + 0x00000140, 0x00000002, 0x00000004, 0x000000f0, 0x00000148, /* constant 4 desc (mat4) */ + 0x00000188, 0x000b0002, 0x00000001, 0x00000190, 0x000001a0, /* constant 5 desc (vec4) */ + 0x00727261, /* constant 1 name */ + 0x00030000, 0x00010001, 0x00000003, 0x00000000, /* constant 1 type desc */ + 0x42c80000, 0x00000000, 0x00000000, 0x00000000, /* constant 1 default value */ + 0x43480000, 0x00000000, 0x00000000, 0x00000000, + 0x43960000, 0x00000000, 0x00000000, 0x00000000, + 0x00746c66, /* constant 2 name */ + 0x00030000, 0x00010001, 0x00000001, 0x00000000, /* constant 2 type desc */ + 0x411fd70a, 0x00000000, 0x00000000, 0x00000000, /* constant 2 default value */ + 0x3374616d, /* constant 3 name */ + 0xababab00, + 0x00030003, 0x00040004, 0x00000001, 0x00000000, /* constant 3 & 4 type desc */ + 0x41300000, 0x425c0000, 0x42c60000, 0x44a42000, /* constat 3 default value */ + 0x41b00000, 0x42840000, 0x447c8000, 0x44b0c000, + 0x42040000, 0x429a0000, 0x448ae000, 0x44bd6000, + 0x42300000, 0x42b00000, 0x44978000, 0x44ca0000, + 0x3474616d, /* constant 4 name */ + 0xababab00, + 0x3f800000, 0x40a00000, 0x41100000, 0x41500000, /* constant 4 default value */ + 0x40000000, 0x40c00000, 0x41200000, 0x41600000, + 0x40400000, 0x40e00000, 0x41300000, 0x41700000, + 0x40800000, 0x41000000, 0x41400000, 0x41800000, + 0x34636576, /* constant 5 name */ + 0xababab00, + 0x00030001, 0x00040001, 0x00000001, 0x00000000, /* constant 5 type desc */ + 0x41200000, 0x41a00000, 0x41f00000, 0x42200000, /* constant 5 default value */ + 0x325f7376, 0x4d004141, 0x41414141, 0x00000000, /* target & creator string */ + 0x0000ffff}; /* END */ + +static const float mat4_default_value[] = {1, 5, 9, 13, 2, 6, 10, 14, 3, 7, 11, 15, 4, 8, 12, 16}; +static const float mat3_default_value[] = {11, 55, 99, 1313, 22, 66, 1010, 1414, 33, 77, 1111, 1515, 44, 88, 1212, 1616}; +static const float arr_default_value[] = {100, 0, 0}; +static const float vec4_default_value[] = {10, 20, 30, 40}; +static const float flt_default_value = 9.99; + +static const D3DXCONSTANT_DESC ctab_with_default_values_expected[] = { + {"mat4", D3DXRS_FLOAT4, 0, 4, D3DXPC_MATRIX_COLUMNS, D3DXPT_FLOAT, 4, 4, 1, 0, 64, mat4_default_value}, + {"mat3", D3DXRS_FLOAT4, 4, 4, D3DXPC_MATRIX_COLUMNS, D3DXPT_FLOAT, 4, 4, 1, 0, 64, mat3_default_value}, + {"arr", D3DXRS_FLOAT4, 8, 3, D3DXPC_SCALAR, D3DXPT_FLOAT, 1, 1, 3, 0, 12, arr_default_value}, + {"vec4", D3DXRS_FLOAT4, 11, 1, D3DXPC_VECTOR, D3DXPT_FLOAT, 1, 4, 1, 0, 16, vec4_default_value}, + {"flt", D3DXRS_FLOAT4, 12, 1, D3DXPC_SCALAR, D3DXPT_FLOAT, 1, 1, 1, 0, 4, &flt_default_value}}; + static const DWORD ctab_samplers[] = { 0xfffe0300, /* vs_3_0 */ 0x0032fffe, FCC_CTAB, /* CTAB comment */ @@ -437,9 +488,21 @@ static void test_constant_table(const char *test_name, const DWORD *ctable_fn, ok(actual.Bytes == expected->Bytes, "%s in %s: Got different byte count: Got %d, expected %d\n", expected->Name, test_name, actual.Bytes, expected->Bytes); - ok(actual.DefaultValue == expected->DefaultValue, - "%s in %s: Got different default value: Got %p, expected %p\n", - expected->Name, test_name, actual.DefaultValue, expected->DefaultValue); + + if (!expected->DefaultValue) + { + ok(actual.DefaultValue == NULL, + "%s in %s: Got different default value: expected NULL\n", + expected->Name, test_name); + } + else + { + ok(actual.DefaultValue != NULL, + "%s in %s: Got different default value: expected non-NULL\n", + expected->Name, test_name); + ok(memcmp(actual.DefaultValue, expected->DefaultValue, expected->Bytes) == 0, + "%s in %s: Got different default value\n", expected->Name, test_name); + } } /* Finally, release the constant table */ @@ -454,6 +517,8 @@ static void test_constant_tables(void) sizeof(ctab_matrices_expected)/sizeof(*ctab_matrices_expected)); test_constant_table("test_arrays", ctab_arrays, ctab_arrays_expected, sizeof(ctab_arrays_expected)/sizeof(*ctab_arrays_expected)); + test_constant_table("test_default_values", ctab_with_default_values, ctab_with_default_values_expected, + sizeof(ctab_with_default_values_expected)/sizeof(*ctab_with_default_values_expected)); test_constant_table("test_samplers", ctab_samplers, ctab_samplers_expected, sizeof(ctab_samplers_expected)/sizeof(*ctab_samplers_expected)); }

1 0

Józef Kucia : d3dx9: Correctly handle constants without default values in D3DXGetShaderConstantTableEx .
by Alexandre Julliard Aug. 14, 2012

Aug. 14, 2012

Module: wine Branch: master Commit: 711ee8a792930319c95f102bcbf0e3d71f65899d URL: http://source.winehq.org/git/wine.git/?a=commit;h=711ee8a792930319c95f102bc… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Tue Aug 14 11:42:32 2012 +0200 d3dx9: Correctly handle constants without default values in D3DXGetShaderConstantTableEx. --- dlls/d3dx9_36/shader.c | 3 ++- dlls/d3dx9_36/tests/shader.c | 37 ++++++++++++++++++++----------------- 2 files changed, 22 insertions(+), 18 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 6ae0b37..0dcb3a1 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -1261,7 +1261,8 @@ HRESULT WINAPI D3DXGetShaderConstantTableEx(CONST DWORD *byte_code, object->constants[i].desc.RegisterSet = constant_info[i].RegisterSet; object->constants[i].desc.RegisterIndex = constant_info[i].RegisterIndex; object->constants[i].desc.RegisterCount = constant_info[i].RegisterCount; - object->constants[i].desc.DefaultValue = object->ctab + constant_info[i].DefaultValue; + object->constants[i].desc.DefaultValue = constant_info[i].DefaultValue + ? object->ctab + constant_info[i].DefaultValue : NULL; hr = parse_ctab_constant_type((LPD3DXSHADER_TYPEINFO)(object->ctab + constant_info[i].TypeInfo), &object->constants[i]); diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index aa3ac12..9a03467 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -93,11 +93,11 @@ static const DWORD ctab_basic[] = { 0x0000ffff}; /* END */ static const D3DXCONSTANT_DESC ctab_basic_expected[] = { - {"mvp", D3DXRS_FLOAT4, 0, 4, D3DXPC_MATRIX_COLUMNS, D3DXPT_FLOAT, 4, 4, 1, 0, 64, 0}, - {"i", D3DXRS_FLOAT4, 4, 1, D3DXPC_SCALAR, D3DXPT_INT, 1, 1, 1, 0, 4, 0}, - {"i4", D3DXRS_FLOAT4, 5, 1, D3DXPC_VECTOR, D3DXPT_INT, 1, 4, 1, 0, 16, 0}, - {"f", D3DXRS_FLOAT4, 6, 1, D3DXPC_SCALAR, D3DXPT_FLOAT, 1, 1, 1, 0, 4, 0}, - {"f4", D3DXRS_FLOAT4, 7, 1, D3DXPC_VECTOR, D3DXPT_FLOAT, 1, 4, 1, 0, 16, 0}}; + {"mvp", D3DXRS_FLOAT4, 0, 4, D3DXPC_MATRIX_COLUMNS, D3DXPT_FLOAT, 4, 4, 1, 0, 64, NULL}, + {"i", D3DXRS_FLOAT4, 4, 1, D3DXPC_SCALAR, D3DXPT_INT, 1, 1, 1, 0, 4, NULL}, + {"i4", D3DXRS_FLOAT4, 5, 1, D3DXPC_VECTOR, D3DXPT_INT, 1, 4, 1, 0, 16, NULL}, + {"f", D3DXRS_FLOAT4, 6, 1, D3DXPC_SCALAR, D3DXPT_FLOAT, 1, 1, 1, 0, 4, NULL}, + {"f4", D3DXRS_FLOAT4, 7, 1, D3DXPC_VECTOR, D3DXPT_FLOAT, 1, 4, 1, 0, 16, NULL}}; static const DWORD ctab_matrices[] = { 0xfffe0300, /* vs_3_0 */ @@ -118,9 +118,9 @@ static const DWORD ctab_matrices[] = { 0x0000ffff}; /* END */ static const D3DXCONSTANT_DESC ctab_matrices_expected[] = { - {"fmatrix4x4", D3DXRS_FLOAT4, 0, 4, D3DXPC_MATRIX_COLUMNS, D3DXPT_FLOAT, 4, 4, 1, 0, 64, 0}, - {"imatrix2x3", D3DXRS_FLOAT4, 4, 3, D3DXPC_MATRIX_ROWS, D3DXPT_INT, 2, 3, 1, 0, 24, 0}, - {"fmatrix3x1", D3DXRS_FLOAT4, 7, 1, D3DXPC_MATRIX_COLUMNS, D3DXPT_FLOAT, 3, 1, 1, 0, 12, 0}}; + {"fmatrix4x4", D3DXRS_FLOAT4, 0, 4, D3DXPC_MATRIX_COLUMNS, D3DXPT_FLOAT, 4, 4, 1, 0, 64, NULL}, + {"imatrix2x3", D3DXRS_FLOAT4, 4, 3, D3DXPC_MATRIX_ROWS, D3DXPT_INT, 2, 3, 1, 0, 24, NULL}, + {"fmatrix3x1", D3DXRS_FLOAT4, 7, 1, D3DXPC_MATRIX_COLUMNS, D3DXPT_FLOAT, 3, 1, 1, 0, 12, NULL}}; static const DWORD ctab_arrays[] = { 0xfffe0300, /* vs_3_0 */ @@ -150,12 +150,12 @@ static const DWORD ctab_arrays[] = { 0x0000ffff}; /* END */ static const D3DXCONSTANT_DESC ctab_arrays_expected[] = { - {"fmtxarray", D3DXRS_FLOAT4, 0, 8, D3DXPC_MATRIX_ROWS, D3DXPT_FLOAT, 4, 4, 2, 0, 128, 0}, - {"farray", D3DXRS_FLOAT4, 8, 4, D3DXPC_SCALAR, D3DXPT_FLOAT, 1, 1, 4, 0, 16, 0}, - {"fvecarray", D3DXRS_FLOAT4, 12, 2, D3DXPC_VECTOR, D3DXPT_FLOAT, 1, 4, 2, 0, 32, 0}, - {"barray", D3DXRS_FLOAT4, 14, 2, D3DXPC_SCALAR, D3DXPT_BOOL, 1, 1, 2, 0, 8, 0}, - {"bvecarray", D3DXRS_FLOAT4, 16, 2, D3DXPC_VECTOR, D3DXPT_BOOL, 1, 3, 3, 0, 36, 0}, - {"ivecarray", D3DXRS_FLOAT4, 18, 1, D3DXPC_VECTOR, D3DXPT_INT, 1, 4, 1, 0, 16, 0}}; + {"fmtxarray", D3DXRS_FLOAT4, 0, 8, D3DXPC_MATRIX_ROWS, D3DXPT_FLOAT, 4, 4, 2, 0, 128, NULL}, + {"farray", D3DXRS_FLOAT4, 8, 4, D3DXPC_SCALAR, D3DXPT_FLOAT, 1, 1, 4, 0, 16, NULL}, + {"fvecarray", D3DXRS_FLOAT4, 12, 2, D3DXPC_VECTOR, D3DXPT_FLOAT, 1, 4, 2, 0, 32, NULL}, + {"barray", D3DXRS_FLOAT4, 14, 2, D3DXPC_SCALAR, D3DXPT_BOOL, 1, 1, 2, 0, 8, NULL}, + {"bvecarray", D3DXRS_FLOAT4, 16, 2, D3DXPC_VECTOR, D3DXPT_BOOL, 1, 3, 3, 0, 36, NULL}, + {"ivecarray", D3DXRS_FLOAT4, 18, 1, D3DXPC_VECTOR, D3DXPT_INT, 1, 4, 1, 0, 16, NULL}}; static const DWORD ctab_samplers[] = { 0xfffe0300, /* vs_3_0 */ @@ -176,9 +176,9 @@ static const DWORD ctab_samplers[] = { 0x0000ffff}; /* END */ static const D3DXCONSTANT_DESC ctab_samplers_expected[] = { - {"sampler1", D3DXRS_SAMPLER, 0, 1, D3DXPC_OBJECT, D3DXPT_SAMPLER2D, 1, 1, 1, 0, 4, 0}, - {"sampler2", D3DXRS_SAMPLER, 3, 1, D3DXPC_OBJECT, D3DXPT_SAMPLER3D, 1, 1, 1, 0, 4, 0}, - {"notsampler", D3DXRS_FLOAT4, 2, 1, D3DXPC_VECTOR, D3DXPT_FLOAT, 1, 4, 1, 0, 16, 0}}; + {"sampler1", D3DXRS_SAMPLER, 0, 1, D3DXPC_OBJECT, D3DXPT_SAMPLER2D, 1, 1, 1, 0, 4, NULL}, + {"sampler2", D3DXRS_SAMPLER, 3, 1, D3DXPC_OBJECT, D3DXPT_SAMPLER3D, 1, 1, 1, 0, 4, NULL}, + {"notsampler", D3DXRS_FLOAT4, 2, 1, D3DXPC_VECTOR, D3DXPT_FLOAT, 1, 4, 1, 0, 16, NULL}}; static void test_get_shader_size(void) { @@ -437,6 +437,9 @@ static void test_constant_table(const char *test_name, const DWORD *ctable_fn, ok(actual.Bytes == expected->Bytes, "%s in %s: Got different byte count: Got %d, expected %d\n", expected->Name, test_name, actual.Bytes, expected->Bytes); + ok(actual.DefaultValue == expected->DefaultValue, + "%s in %s: Got different default value: Got %p, expected %p\n", + expected->Name, test_name, actual.DefaultValue, expected->DefaultValue); } /* Finally, release the constant table */

1 0

Józef Kucia : d3dx9: Introduce helper functions to operate on constant handles.
by Alexandre Julliard Aug. 14, 2012

Aug. 14, 2012

Module: wine Branch: master Commit: c9f90256330c0deeea35eeae99e02267e2235352 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9f90256330c0deeea35eeae9… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Tue Aug 14 11:42:30 2012 +0200 d3dx9: Introduce helper functions to operate on constant handles. --- dlls/d3dx9_36/shader.c | 31 ++++++++++++++++++++++--------- 1 files changed, 22 insertions(+), 9 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index e0229f6..0e6b071 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -657,6 +657,21 @@ static DWORD calc_bytes(D3DXCONSTANT_DESC *desc) return 4 * desc->Elements * desc->Rows * desc->Columns; } +static inline int is_constant_handle(D3DXHANDLE handle) +{ + return !((UINT_PTR)handle >> 16); +} + +static inline ctab_constant *constant_from_handle(struct ID3DXConstantTableImpl *table, D3DXHANDLE handle) +{ + return &table->constants[(UINT_PTR)handle - 1]; +} + +static inline D3DXHANDLE handle_from_constant_index(UINT index) +{ + return (D3DXHANDLE)(DWORD_PTR)(index + 1); +} + /*** IUnknown methods ***/ static HRESULT WINAPI ID3DXConstantTableImpl_QueryInterface(ID3DXConstantTable *iface, REFIID riid, void **out) { @@ -747,17 +762,15 @@ static HRESULT WINAPI ID3DXConstantTableImpl_GetConstantDesc(ID3DXConstantTable return D3DERR_INVALIDCALL; /* Applications can pass the name of the constant in place of the handle */ - if (!((UINT_PTR)constant >> 16)) - constant_info = &This->constants[(UINT_PTR)constant - 1]; - else + if (!is_constant_handle(constant)) { - D3DXHANDLE c = ID3DXConstantTable_GetConstantByName(iface, NULL, constant); - if (!c) + constant = ID3DXConstantTable_GetConstantByName(iface, NULL, constant); + if (!constant) return D3DERR_INVALIDCALL; - - constant_info = &This->constants[(UINT_PTR)c - 1]; } + constant_info = constant_from_handle(This, constant); + if (desc) *desc = constant_info->desc; if (count) @@ -800,7 +813,7 @@ static D3DXHANDLE WINAPI ID3DXConstantTableImpl_GetConstant(ID3DXConstantTable * if (index >= This->desc.Constants) return NULL; - return (D3DXHANDLE)(DWORD_PTR)(index + 1); + return handle_from_constant_index(index); } static D3DXHANDLE WINAPI ID3DXConstantTableImpl_GetConstantByName(ID3DXConstantTable *iface, D3DXHANDLE constant, LPCSTR name) @@ -821,7 +834,7 @@ static D3DXHANDLE WINAPI ID3DXConstantTableImpl_GetConstantByName(ID3DXConstantT for (i = 0; i < This->desc.Constants; i++) if (!strcmp(This->constants[i].desc.Name, name)) - return (D3DXHANDLE)(DWORD_PTR)(i + 1); + return handle_from_constant_index(i); return NULL; }

1 0

Jacek Caban : mshtml: Moved HTMLLocation reference to inner window.
by Alexandre Julliard Aug. 14, 2012

Aug. 14, 2012

Module: wine Branch: master Commit: 93a2de1fba1cc78ec9fe9616f7d2215b90781ece URL: http://source.winehq.org/git/wine.git/?a=commit;h=93a2de1fba1cc78ec9fe9616f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 14 11:29:17 2012 +0200 mshtml: Moved HTMLLocation reference to inner window. --- dlls/mshtml/htmllocation.c | 18 +++++++++--------- dlls/mshtml/htmlwindow.c | 19 +++++++++---------- dlls/mshtml/mshtml_private.h | 8 ++++---- 3 files changed, 22 insertions(+), 23 deletions(-) diff --git a/dlls/mshtml/htmllocation.c b/dlls/mshtml/htmllocation.c index 1bcd048..cde1fee 100644 --- a/dlls/mshtml/htmllocation.c +++ b/dlls/mshtml/htmllocation.c @@ -37,20 +37,20 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); static HRESULT get_url(HTMLLocation *This, const WCHAR **ret) { - if(!This->window || !This->window->url) { + if(!This->window || !This->window->base.outer_window || !This->window->base.outer_window->url) { FIXME("No current URL\n"); return E_NOTIMPL; } - *ret = This->window->url; + *ret = This->window->base.outer_window->url; return S_OK; } static IUri *get_uri(HTMLLocation *This) { - if(!This->window) + if(!This->window || !This->window->base.outer_window) return NULL; - return This->window->uri; + return This->window->base.outer_window->uri; } static HRESULT get_url_components(HTMLLocation *This, URL_COMPONENTSW *url) @@ -165,12 +165,12 @@ static HRESULT WINAPI HTMLLocation_put_href(IHTMLLocation *iface, BSTR v) TRACE("(%p)->(%s)\n", This, debugstr_w(v)); - if(!This->window) { + if(!This->window || !This->window->base.outer_window) { FIXME("No window available\n"); return E_FAIL; } - return navigate_url(This->window, v, This->window->url); + return navigate_url(This->window->base.outer_window, v, This->window->base.outer_window->url); } static HRESULT WINAPI HTMLLocation_get_href(IHTMLLocation *iface, BSTR *p) @@ -565,12 +565,12 @@ static HRESULT WINAPI HTMLLocation_replace(IHTMLLocation *iface, BSTR bstr) TRACE("(%p)->(%s)\n", This, debugstr_w(bstr)); - if(!This->window) { + if(!This->window || !This->window->base.outer_window) { FIXME("No window available\n"); return E_FAIL; } - return navigate_url(This->window, bstr, This->window->url); + return navigate_url(This->window->base.outer_window, bstr, This->window->base.outer_window->url); } static HRESULT WINAPI HTMLLocation_assign(IHTMLLocation *iface, BSTR bstr) @@ -629,7 +629,7 @@ static dispex_static_data_t HTMLLocation_dispex = { }; -HRESULT HTMLLocation_Create(HTMLOuterWindow *window, HTMLLocation **ret) +HRESULT HTMLLocation_Create(HTMLInnerWindow *window, HTMLLocation **ret) { HTMLLocation *location; diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 3884bf8..e9a0625 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -61,7 +61,7 @@ static void release_children(HTMLOuterWindow *This) } } -static HRESULT get_location(HTMLOuterWindow *This, HTMLLocation **ret) +static HRESULT get_location(HTMLInnerWindow *This, HTMLLocation **ret) { if(This->location) { IHTMLLocation_AddRef(&This->location->IHTMLLocation_iface); @@ -214,11 +214,6 @@ static void release_outer_window(HTMLOuterWindow *This) if(This->frame_element) This->frame_element->content_window = NULL; - if(This->location) { - This->location->window = NULL; - IHTMLLocation_Release(&This->location->IHTMLLocation_iface); - } - This->window_ref->window = NULL; windowref_release(This->window_ref); @@ -250,6 +245,11 @@ static void release_inner_window(HTMLInnerWindow *This) heap_free(This->global_props[i].name); heap_free(This->global_props); + if(This->location) { + This->location->window = NULL; + IHTMLLocation_Release(&This->location->IHTMLLocation_iface); + } + if(This->image_factory) { This->image_factory->window = NULL; IHTMLImageElementFactory_Release(&This->image_factory->IHTMLImageElementFactory_iface); @@ -707,7 +707,7 @@ static HRESULT WINAPI HTMLWindow2_get_location(IHTMLWindow2 *iface, IHTMLLocatio TRACE("(%p)->(%p)\n", This, p); - hres = get_location(This->outer_window, &location); + hres = get_location(This->inner_window, &location); if(FAILED(hres)) return hres; @@ -2335,7 +2335,7 @@ static HRESULT WINAPI WindowDispEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) { HTMLWindow *This = impl_from_IDispatchEx(iface); - HTMLOuterWindow *window = This->outer_window; + HTMLInnerWindow *window = This->inner_window; TRACE("(%p)->(%x %x %x %p %p %p %p)\n", This, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller); @@ -2355,8 +2355,7 @@ static HRESULT WINAPI WindowDispEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID return hres; } - return IDispatchEx_InvokeEx(&window->base.inner_window->dispex.IDispatchEx_iface, id, lcid, wFlags, pdp, pvarRes, - pei, pspCaller); + return IDispatchEx_InvokeEx(&window->dispex.IDispatchEx_iface, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller); } static HRESULT WINAPI WindowDispEx_DeleteMemberByName(IDispatchEx *iface, BSTR bstrName, DWORD grfdex) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index f76ebaf..dee8f90 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -323,7 +323,7 @@ struct HTMLLocation { LONG ref; - HTMLOuterWindow *window; + HTMLInnerWindow *window; }; typedef struct { @@ -371,8 +371,6 @@ struct HTMLOuterWindow { IInternetSecurityManager *secmgr; - HTMLLocation *location; - struct list children; struct list sibling_entry; struct list entry; @@ -400,6 +398,8 @@ struct HTMLInnerWindow { LONG task_magic; + HTMLLocation *location; + IMoniker *mon; nsChannelBSC *bscallback; struct list bindings; @@ -713,7 +713,7 @@ HTMLOuterWindow *nswindow_to_window(const nsIDOMWindow*) DECLSPEC_HIDDEN; void get_top_window(HTMLOuterWindow*,HTMLOuterWindow**) DECLSPEC_HIDDEN; HRESULT HTMLOptionElementFactory_Create(HTMLInnerWindow*,HTMLOptionElementFactory**) DECLSPEC_HIDDEN; HRESULT HTMLImageElementFactory_Create(HTMLInnerWindow*,HTMLImageElementFactory**) DECLSPEC_HIDDEN; -HRESULT HTMLLocation_Create(HTMLOuterWindow*,HTMLLocation**) DECLSPEC_HIDDEN; +HRESULT HTMLLocation_Create(HTMLInnerWindow*,HTMLLocation**) DECLSPEC_HIDDEN; IOmNavigator *OmNavigator_Create(void) DECLSPEC_HIDDEN; HRESULT HTMLScreen_Create(IHTMLScreen**) DECLSPEC_HIDDEN; HRESULT create_history(IOmHistory**) DECLSPEC_HIDDEN;

1 0

Jacek Caban : mshtml: Use inner window' s moniker in PluginHost implementation.
by Alexandre Julliard Aug. 14, 2012

Aug. 14, 2012

Module: wine Branch: master Commit: 39182135861ba20d92d8ec0181f76aae4a8c9e66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39182135861ba20d92d8ec018… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 14 11:28:50 2012 +0200 mshtml: Use inner window's moniker in PluginHost implementation. --- dlls/mshtml/pluginhost.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/pluginhost.c b/dlls/mshtml/pluginhost.c index 07d6e3a..e24131b 100644 --- a/dlls/mshtml/pluginhost.c +++ b/dlls/mshtml/pluginhost.c @@ -534,12 +534,12 @@ static HRESULT WINAPI PHClientSite_GetMoniker(IOleClientSite *iface, DWORD dwAss switch(dwWhichMoniker) { case OLEWHICHMK_CONTAINER: - if(!This->doc || !This->doc->basedoc.window || !This->doc->basedoc.window->mon) { + if(!This->doc || !This->doc->window || !This->doc->window->mon) { FIXME("no moniker\n"); return E_UNEXPECTED; } - *ppmk = This->doc->basedoc.window->mon; + *ppmk = This->doc->window->mon; IMoniker_AddRef(*ppmk); break; default: @@ -1144,12 +1144,12 @@ static HRESULT WINAPI PHBindHost_CreateMoniker(IBindHost *iface, LPOLESTR szName TRACE("(%p)->(%s %p %p %x)\n", This, debugstr_w(szName), pBC, ppmk, dwReserved); - if(!This->doc || !This->doc->basedoc.window || !This->doc->basedoc.window->mon) { + if(!This->doc || !This->doc->window || !This->doc->window->mon) { FIXME("no moniker\n"); return E_UNEXPECTED; } - return CreateURLMoniker(This->doc->basedoc.window->mon, szName, ppmk); + return CreateURLMoniker(This->doc->window->mon, szName, ppmk); } static HRESULT WINAPI PHBindHost_MonikerBindToStorage(IBindHost *iface, IMoniker *pMk, IBindCtx *pBC,

1 0

Piotr Caban : msvcp90: Added basic_ofstream<wchar> implementation.
by Alexandre Julliard Aug. 14, 2012

Aug. 14, 2012

Module: wine Branch: master Commit: ada2f45a0adcce9ebbfa68ffa9fff81970506644 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ada2f45a0adcce9ebbfa68ffa… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Aug 14 10:52:48 2012 +0200 msvcp90: Added basic_ofstream<wchar> implementation. --- dlls/msvcp90/ios.c | 322 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 136 ++++++++++---------- 2 files changed, 390 insertions(+), 68 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ada2f45a0adcce9ebbfa6…

1 0

Piotr Caban : msvcp90: Added basic_iostream<short> implementation.
by Alexandre Julliard Aug. 14, 2012

Aug. 14, 2012

Module: wine Branch: master Commit: 3cb76c73a19da2d7f53ac3bbae39d788c2df92af URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cb76c73a19da2d7f53ac3bba… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Aug 14 10:52:36 2012 +0200 msvcp90: Added basic_iostream<short> implementation. --- dlls/msvcp90/ios.c | 39 ++++++++++++++++++++++++++++++++++++--- dlls/msvcp90/msvcp90.spec | 18 +++++++++--------- 2 files changed, 45 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3cb76c73a19da2d7f53ac…

1 0

Piotr Caban : msvcp90: Added basic_ifstream<wchar> implementation.
by Alexandre Julliard Aug. 14, 2012

Aug. 14, 2012

Module: wine Branch: master Commit: 555b31bdad98fb49814569b1bf7859b6a7d59c90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=555b31bdad98fb49814569b1b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Aug 14 10:53:09 2012 +0200 msvcp90: Added basic_ifstream<wchar> implementation. --- dlls/msvcp90/ios.c | 324 ++++++++++++++++++++++++++++++++++++++++++++- dlls/msvcp90/msvcp90.spec | 136 ++++++++++---------- 2 files changed, 391 insertions(+), 69 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=555b31bdad98fb4981456…

1 0