Jacek Caban jacek@codeweavers.com writes:
dlls/mshtml/htmltable.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
It doesn't work:
../../../tools/runtest -q -P wine -T ../../.. -M mshtml.dll -p mshtml_test.exe.so dom && touch dom.ok wine: Unhandled page fault on read access to 0x00000004 at address 0x558bae66 (thread 0069), starting debugger... Unhandled exception: page fault on read access to 0x00000004 in 32-bit code (0x558bae66). Register dump: CS:0023 SS:002b DS:002b ES:002b FS:0063 GS:006b EIP:558bae66 ESP:0032f7d0 EBP:0032f808 EFLAGS:00210202( R- -- I - - - ) EAX:028c05c4 EBX:55977e38 ECX:0bcebd00 EDX:00000000 ESI:0032f8cc EDI:686b0350 Stack dump: 0x0032f7d0: 028c05c4 686b0350 00000010 55923438 0x0032f7e0: 028c0558 0032f8cc 00000010 028c0558 0x0032f7f0: 028c0574 683e2b20 558bae0b 686c8a40 0x0032f800: 686b0350 0032f8cc 0032f828 5589c3b5 0x0032f810: 028c0558 686b0350 0032f8cc 686c8a40 0x0032f820: 686b0360 00000000 0032f848 5587658d Backtrace: =>0 0x558bae66 HTMLTable_QI+0x66(iface=0x28c0558, riid=0x686b0350, ppv=0x32f8cc) [/home/julliard/wine/wine/dlls/mshtml/htmltable.c:924] in mshtml (0x0032f808) 1 0x5589c3b5 HTMLDOMNode_QueryInterface+0x24(iface=0x28c0568, riid=0x686b0350, ppv=0x32f8cc) [/home/julliard/wine/wine/dlls/mshtml/htmlnode.c:474] in mshtml (0x0032f828) 2 0x5587658d HTMLElement_QueryInterface+0x2c(iface=<couldn't compute location>, riid=<couldn't compute location>, ppv=<couldn't compute location>) [/home/julliard/wine/wine/dlls/mshtml/../../include/mshtml.h:15891] in mshtml (0x0032f848) 3 0x55854e3c DispatchEx_QueryInterface+0x2b(iface=<couldn't compute location>, riid=<couldn't compute location>, ppv=<couldn't compute location>) [/home/julliard/wine/wine/dlls/mshtml/dispex.c:1316] in mshtml (0x0032f878) 4 0x6863f0e5 _test_ifaces+0x54(line=<is not available>, iface=<is not available>, iids=0x686c85e0) [/home/julliard/wine/wine/dlls/mshtml/tests/dom.c:552] in mshtml_test (0x0032f8e8) 5 0x6863f604 _test_elem_type+0x43(line=0x198f, unk=0x28c0558, type=ET_TABLE) [/home/julliard/wine/wine/dlls/mshtml/tests/dom.c:1034] in mshtml_test (0x0032f918) 6 0x68641178 _test_elem_collection+0x4f7(line=0x198f, unk=<is not available>, elem_types=0x686a76a0, exlen=0x1e) [/home/julliard/wine/wine/dlls/mshtml/tests/dom.c:2153] in mshtml_test (0x0032fa98) 7 0x68650746 test_elems+0x95(doc=0x28b2b38) [/home/julliard/wine/wine/dlls/mshtml/tests/dom.c:6543] in mshtml_test (0x0032fc88) 8 0x686470e7 run_domtest+0x2f6(str=<is not available>, test=<is not available>) [/home/julliard/wine/wine/dlls/mshtml/tests/dom.c:8099] in mshtml_test (0x0032fd08) 9 0x686556e6 func_dom+0x115() [/home/julliard/wine/wine/dlls/mshtml/tests/dom.c:8126] in mshtml_test (0x0032fd48) 10 0x6862d96f main+0x37e(argc=<is not available>, argv=<is not available>) [/home/julliard/wine/wine/dlls/mshtml/tests/../../../include/wine/test.h:584] in mshtml_test (0x0032fe18) 11 0x686a0850 __wine_spec_exe_entry+0x7f(peb=<couldn't compute location>) [/home/julliard/wine/wine/dlls/winecrt0/exe_entry.c:36] in mshtml_test (0x0032fe58) 12 0x7b85f65c call_process_entry+0xb() in kernel32 (0x0032fe78) 13 0x7b8606a3 start_process+0x62(peb=<couldn't compute location>) [/home/julliard/wine/wine/dlls/kernel32/process.c:1097] in kernel32 (0x0032feb8) 14 0x7bc7fac0 call_thread_func_wrapper+0xb() in ntdll (0x0032fed8) 15 0x7bc82a6d call_thread_func+0x7c(entry=0x7b860640, arg=0x7ffdf000, frame=0x32ffc8) [/home/julliard/wine/wine/dlls/ntdll/signal_i386.c:2630] in ntdll (0x0032ffa8) 16 0x7bc7fa9e call_thread_entry_point+0x11() in ntdll (0x0032ffc8) 17 0x7bc53f0e start_process+0x1d(kernel_start=0x7b860640) [/home/julliard/wine/wine/dlls/ntdll/loader.c:2856] in ntdll (0x0032ffe8) 18 0x680316dd wine_call_on_stack+0x1c() in libwine.so.1 (0x00000000) 19 0x6803179b wine_switch_to_stack+0x2a(func=0x7bc53ef0, arg=0x7b860640, stack=0x330000) [/home/julliard/wine/wine/libs/wine/port.c:59] in libwine.so.1 (0xff808918) 20 0x7bc59a09 LdrInitializeThunk+0x238(kernel_start=<couldn't compute location>, unknown2=<couldn't compute location>, unknown3=<couldn't compute location>, unknown4=<couldn't compute location>) [/home/julliard/wine/wine/dlls/ntdll/loader.c:2910] in ntdll (0xff808958) 21 0x7b866ea3 __wine_kernel_init+0xa02() [/home/julliard/wine/wine/dlls/kernel32/process.c:1269] in kernel32 (0xff809858) 22 0x7bc5a903 __wine_process_init+0x192() [/home/julliard/wine/wine/dlls/ntdll/loader.c:3119] in ntdll (0xff8098e8) 23 0x6802ede8 wine_init+0x2c7(argc=0x3, argv=0xff809e24, error="", error_size=0x400) [/home/julliard/wine/wine/libs/wine/loader.c:952] in libwine.so.1 (0xff809948) 24 0x7bf00d6c main+0x7b(argc=<is not available>, argv=<is not available>) [/home/julliard/wine/wine/loader/main.c:237] in <wine-loader> (0xff809d88) 25 0x682518c5 __libc_start_main+0xf4() in libc.so.6 (0x00000000) 0x558bae66 HTMLTable_QI+0x66 [/home/julliard/wine/wine/dlls/mshtml/htmltable.c:924] in mshtml: call *0x4(%edx) 924 IUnknown_AddRef((IUnknown*)*ppv);
On 07/15/2014 02:21 AM, Alexandre Julliard wrote:
Jacek Caban jacek@codeweavers.com writes:
dlls/mshtml/htmltable.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
It doesn't work:
I think another patch is needed:
diff --git a/dlls/mshtml/htmltable.c b/dlls/mshtml/htmltable.c index de12537..484032f 100644 --- a/dlls/mshtml/htmltable.c +++ b/dlls/mshtml/htmltable.c @@ -969,6 +969,8 @@ HRESULT HTMLTable_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem, HTMLE
ret->element.node.vtbl = &HTMLTableImplVtbl; ret->IHTMLTable_iface.lpVtbl = &HTMLTableVtbl; + ret->IHTMLTable2_iface.lpVtbl = &HTMLTable2Vtbl; + ret->IHTMLTable3_iface.lpVtbl = &HTMLTable3Vtbl;
HTMLElement_Init(&ret->element, doc, nselem, &HTMLTable_dispex);
Should I squash them?
Thanks.
../../../tools/runtest -q -P wine -T ../../.. -M mshtml.dll -p mshtml_test.exe.so dom && touch dom.ok wine: Unhandled page fault on read access to 0x00000004 at address 0x558bae66 (thread 0069), starting debugger... Unhandled exception: page fault on read access to 0x00000004 in 32-bit code (0x558bae66). Register dump: CS:0023 SS:002b DS:002b ES:002b FS:0063 GS:006b EIP:558bae66 ESP:0032f7d0 EBP:0032f808 EFLAGS:00210202( R- -- I - - - ) EAX:028c05c4 EBX:55977e38 ECX:0bcebd00 EDX:00000000 ESI:0032f8cc EDI:686b0350 Stack dump: 0x0032f7d0: 028c05c4 686b0350 00000010 55923438 0x0032f7e0: 028c0558 0032f8cc 00000010 028c0558 0x0032f7f0: 028c0574 683e2b20 558bae0b 686c8a40 0x0032f800: 686b0350 0032f8cc 0032f828 5589c3b5 0x0032f810: 028c0558 686b0350 0032f8cc 686c8a40 0x0032f820: 686b0360 00000000 0032f848 5587658d Backtrace: =>0 0x558bae66 HTMLTable_QI+0x66(iface=0x28c0558, riid=0x686b0350, ppv=0x32f8cc) [/home/julliard/wine/wine/dlls/mshtml/htmltable.c:924] in mshtml (0x0032f808) 1 0x5589c3b5 HTMLDOMNode_QueryInterface+0x24(iface=0x28c0568, riid=0x686b0350, ppv=0x32f8cc) [/home/julliard/wine/wine/dlls/mshtml/htmlnode.c:474] in mshtml (0x0032f828) 2 0x5587658d HTMLElement_QueryInterface+0x2c(iface=<couldn't compute location>, riid=<couldn't compute location>, ppv=<couldn't compute location>) [/home/julliard/wine/wine/dlls/mshtml/../../include/mshtml.h:15891] in mshtml (0x0032f848) 3 0x55854e3c DispatchEx_QueryInterface+0x2b(iface=<couldn't compute location>, riid=<couldn't compute location>, ppv=<couldn't compute location>) [/home/julliard/wine/wine/dlls/mshtml/dispex.c:1316] in mshtml (0x0032f878) 4 0x6863f0e5 _test_ifaces+0x54(line=<is not available>, iface=<is not available>, iids=0x686c85e0) [/home/julliard/wine/wine/dlls/mshtml/tests/dom.c:552] in mshtml_test (0x0032f8e8) 5 0x6863f604 _test_elem_type+0x43(line=0x198f, unk=0x28c0558, type=ET_TABLE) [/home/julliard/wine/wine/dlls/mshtml/tests/dom.c:1034] in mshtml_test (0x0032f918) 6 0x68641178 _test_elem_collection+0x4f7(line=0x198f, unk=<is not available>, elem_types=0x686a76a0, exlen=0x1e) [/home/julliard/wine/wine/dlls/mshtml/tests/dom.c:2153] in mshtml_test (0x0032fa98) 7 0x68650746 test_elems+0x95(doc=0x28b2b38) [/home/julliard/wine/wine/dlls/mshtml/tests/dom.c:6543] in mshtml_test (0x0032fc88) 8 0x686470e7 run_domtest+0x2f6(str=<is not available>, test=<is not available>) [/home/julliard/wine/wine/dlls/mshtml/tests/dom.c:8099] in mshtml_test (0x0032fd08) 9 0x686556e6 func_dom+0x115() [/home/julliard/wine/wine/dlls/mshtml/tests/dom.c:8126] in mshtml_test (0x0032fd48) 10 0x6862d96f main+0x37e(argc=<is not available>, argv=<is not available>) [/home/julliard/wine/wine/dlls/mshtml/tests/../../../include/wine/test.h:584] in mshtml_test (0x0032fe18) 11 0x686a0850 __wine_spec_exe_entry+0x7f(peb=<couldn't compute location>) [/home/julliard/wine/wine/dlls/winecrt0/exe_entry.c:36] in mshtml_test (0x0032fe58) 12 0x7b85f65c call_process_entry+0xb() in kernel32 (0x0032fe78) 13 0x7b8606a3 start_process+0x62(peb=<couldn't compute location>) [/home/julliard/wine/wine/dlls/kernel32/process.c:1097] in kernel32 (0x0032feb8) 14 0x7bc7fac0 call_thread_func_wrapper+0xb() in ntdll (0x0032fed8) 15 0x7bc82a6d call_thread_func+0x7c(entry=0x7b860640, arg=0x7ffdf000, frame=0x32ffc8) [/home/julliard/wine/wine/dlls/ntdll/signal_i386.c:2630] in ntdll (0x0032ffa8) 16 0x7bc7fa9e call_thread_entry_point+0x11() in ntdll (0x0032ffc8) 17 0x7bc53f0e start_process+0x1d(kernel_start=0x7b860640) [/home/julliard/wine/wine/dlls/ntdll/loader.c:2856] in ntdll (0x0032ffe8) 18 0x680316dd wine_call_on_stack+0x1c() in libwine.so.1 (0x00000000) 19 0x6803179b wine_switch_to_stack+0x2a(func=0x7bc53ef0, arg=0x7b860640, stack=0x330000) [/home/julliard/wine/wine/libs/wine/port.c:59] in libwine.so.1 (0xff808918) 20 0x7bc59a09 LdrInitializeThunk+0x238(kernel_start=<couldn't compute location>, unknown2=<couldn't compute location>, unknown3=<couldn't compute location>, unknown4=<couldn't compute location>) [/home/julliard/wine/wine/dlls/ntdll/loader.c:2910] in ntdll (0xff808958) 21 0x7b866ea3 __wine_kernel_init+0xa02() [/home/julliard/wine/wine/dlls/kernel32/process.c:1269] in kernel32 (0xff809858) 22 0x7bc5a903 __wine_process_init+0x192() [/home/julliard/wine/wine/dlls/ntdll/loader.c:3119] in ntdll (0xff8098e8) 23 0x6802ede8 wine_init+0x2c7(argc=0x3, argv=0xff809e24, error="", error_size=0x400) [/home/julliard/wine/wine/libs/wine/loader.c:952] in libwine.so.1 (0xff809948) 24 0x7bf00d6c main+0x7b(argc=<is not available>, argv=<is not available>) [/home/julliard/wine/wine/loader/main.c:237] in <wine-loader> (0xff809d88) 25 0x682518c5 __libc_start_main+0xf4() in libc.so.6 (0x00000000) 0x558bae66 HTMLTable_QI+0x66 [/home/julliard/wine/wine/dlls/mshtml/htmltable.c:924] in mshtml: call *0x4(%edx) 924 IUnknown_AddRef((IUnknown*)*ppv);
On 07/15/14 06:51, Zhenbo Li wrote:
On 07/15/2014 02:21 AM, Alexandre Julliard wrote:
Jacek Caban jacek@codeweavers.com writes:
dlls/mshtml/htmltable.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
It doesn't work:
I think another patch is needed:
diff --git a/dlls/mshtml/htmltable.c b/dlls/mshtml/htmltable.c index de12537..484032f 100644 --- a/dlls/mshtml/htmltable.c +++ b/dlls/mshtml/htmltable.c @@ -969,6 +969,8 @@ HRESULT HTMLTable_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem, HTMLE
ret->element.node.vtbl = &HTMLTableImplVtbl; ret->IHTMLTable_iface.lpVtbl = &HTMLTableVtbl;
ret->IHTMLTable2_iface.lpVtbl = &HTMLTable2Vtbl;
ret->IHTMLTable3_iface.lpVtbl = &HTMLTable3Vtbl;
HTMLElement_Init(&ret->element, doc, nselem, &HTMLTable_dispex);
Should I squash them?
Yes, please send a patch that includes both fixes.
Thanks, Jacek
-
Alexandre Julliard -
Jacek Caban -
Zhenbo Li