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

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

14 Aug '12

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/tests: Add tests for ID3DXConstantTable::SetDefaults.
by Alexandre Julliard 14 Aug '12

14 Aug '12

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

Alexandre Julliard : msvcp90: Fix the calling convention of the basic_string helpers.
by Alexandre Julliard 14 Aug '12

14 Aug '12

Module: wine Branch: master Commit: 8fdb55cf5c2b50df6cf580cadf7a6b3c623238c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fdb55cf5c2b50df6cf580cad… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 14 13:29:20 2012 +0200 msvcp90: Fix the calling convention of the basic_string helpers. --- dlls/msvcp90/string.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index 63ef466..fb2ba1a 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -1992,7 +1992,7 @@ basic_string_char* __thiscall basic_string_char_replace_cstr_len(basic_string_ch } /* Not exported from msvcp90 */ -basic_string_char* basic_string_char_replace_helper(basic_string_char *this, +basic_string_char* __stdcall basic_string_char_replace_helper(basic_string_char *this, MSVCP_size_t off, MSVCP_size_t len, const char *str, MSVCP_size_t str_len) { return basic_string_char_replace_cstr_len(this, off, len, str, str_len); @@ -3951,7 +3951,7 @@ basic_string_wchar* __thiscall basic_string_wchar_replace_cstr_len(basic_string_ } /* Not exported from msvcp90 */ -basic_string_wchar* basic_string_wchar_replace_helper(basic_string_wchar *this, +basic_string_wchar* __stdcall basic_string_wchar_replace_helper(basic_string_wchar *this, MSVCP_size_t off, MSVCP_size_t len, const wchar_t *str, MSVCP_size_t str_len) { return basic_string_wchar_replace_cstr_len(this, off, len ,str, str_len);

1 0

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

14 Aug '12

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

Piotr Caban : msvcp90: Added basic_istream<short> implementation.
by Alexandre Julliard 14 Aug '12

14 Aug '12

Module: wine Branch: master Commit: 7d21ee14f19f126dbd504a4b0d40cf9069e052a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d21ee14f19f126dbd504a4b0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Aug 14 10:52:22 2012 +0200 msvcp90: Added basic_istream<short> implementation. --- dlls/msvcp90/ios.c | 417 +++++++++++++++++++++++++++++++++++++++------ dlls/msvcp90/locale.c | 4 +- dlls/msvcp90/msvcp90.h | 2 + dlls/msvcp90/msvcp90.spec | 204 +++++++++++----------- 4 files changed, 470 insertions(+), 157 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7d21ee14f19f126dbd504…

1 0

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

14 Aug '12

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_ofstream<wchar> implementation.
by Alexandre Julliard 14 Aug '12

14 Aug '12

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_ifstream<wchar> implementation.
by Alexandre Julliard 14 Aug '12

14 Aug '12

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

Piotr Caban : msvcp90: Added basic_fstream<wchar> implementation.
by Alexandre Julliard 14 Aug '12

14 Aug '12

Module: wine Branch: master Commit: 570ffbb4eadb8252e8c3bbef685de1fbf9d49f18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=570ffbb4eadb8252e8c3bbef6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Aug 14 10:53:30 2012 +0200 msvcp90: Added basic_fstream<wchar> implementation. --- dlls/msvcp90/ios.c | 329 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 140 ++++++++++---------- 2 files changed, 399 insertions(+), 70 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=570ffbb4eadb8252e8c3b…

1 0

Jacek Caban : mshtml: Store moniker in HTMLInnerWindow.
by Alexandre Julliard 14 Aug '12

14 Aug '12

Module: wine Branch: master Commit: 1a25ed26376e1fd82ca5594d6a40638dae49d0e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a25ed26376e1fd82ca5594d6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 14 11:28:37 2012 +0200 mshtml: Store moniker in HTMLInnerWindow. --- dlls/mshtml/htmlwindow.c | 11 +++++++++-- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/navigate.c | 5 +++++ 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index b5117f1..3884bf8 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -264,6 +264,8 @@ static void release_inner_window(HTMLInnerWindow *This) IHTMLScreen_Release(This->screen); if(This->history) IOmHistory_Release(This->history); + if(This->mon) + IMoniker_Release(This->mon); heap_free(This); } @@ -2609,7 +2611,7 @@ static void *alloc_window(size_t size) return window; } -static HRESULT create_inner_window(HTMLOuterWindow *outer_window, HTMLInnerWindow **ret) +static HRESULT create_inner_window(HTMLOuterWindow *outer_window, IMoniker *mon, HTMLInnerWindow **ret) { HTMLInnerWindow *window; @@ -2628,6 +2630,11 @@ static HRESULT create_inner_window(HTMLOuterWindow *outer_window, HTMLInnerWindo window->task_magic = get_task_target_magic(); window->current_script_guid = CLSID_JScript; + if(mon) { + IMoniker_AddRef(mon); + window->mon = mon; + } + *ret = window; return S_OK; } @@ -2701,7 +2708,7 @@ HRESULT create_pending_window(HTMLOuterWindow *outer_window, nsChannelBSC *chann HTMLInnerWindow *pending_window; HRESULT hres; - hres = create_inner_window(outer_window, &pending_window); + hres = create_inner_window(outer_window, outer_window->mon /* FIXME */, &pending_window); if(FAILED(hres)) return hres; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index b0f00d3..f76ebaf 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -400,6 +400,7 @@ struct HTMLInnerWindow { LONG task_magic; + IMoniker *mon; nsChannelBSC *bscallback; struct list bindings; }; diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 8956dfd..91705dd 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1784,6 +1784,11 @@ void abort_window_bindings(HTMLInnerWindow *window) IBindStatusCallback_Release(&window->bscallback->bsc.IBindStatusCallback_iface); window->bscallback = NULL; } + + if(window->mon) { + IMoniker_Release(window->mon); + window->mon = NULL; + } } HRESULT channelbsc_load_stream(HTMLInnerWindow *pending_window, IStream *stream)

1 0