December 2014 - Wine-Commits

Mark Harmstone : dsound: Use array for channel volumes.
by Alexandre Julliard Dec. 29, 2014

Dec. 29, 2014

Module: wine Branch: master Commit: 25b13178de3ebac0c498b246c74068c2e50477b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25b13178de3ebac0c498b246c… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Sat Dec 27 21:32:24 2014 +0000 dsound: Use array for channel volumes. --- dlls/dsound/dsound_private.h | 5 +- dlls/dsound/mixer.c | 34 ++++---- dlls/dsound/primary.c | 182 ++++++++++++++++++------------------------- 3 files changed, 96 insertions(+), 125 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=25b13178de3ebac0c498b…

1 0

Nikolay Sivov : ntdll: Accept asm.v2 as default namespace.
by Alexandre Julliard Dec. 29, 2014

Dec. 29, 2014

Module: wine Branch: master Commit: 37c179794e35bfe4283edfa425efc4e499cc652e URL: http://source.winehq.org/git/wine.git/?a=commit;h=37c179794e35bfe4283edfa42… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 26 18:49:03 2014 +0300 ntdll: Accept asm.v2 as default namespace. --- dlls/ntdll/actctx.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 15c9994..8fb6624 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -656,6 +656,7 @@ static const struct olemisc_entry olemisc_values[] = static const WCHAR xmlW[] = {'?','x','m','l',0}; static const WCHAR manifestv1W[] = {'u','r','n',':','s','c','h','e','m','a','s','-','m','i','c','r','o','s','o','f','t','-','c','o','m',':','a','s','m','.','v','1',0}; +static const WCHAR manifestv2W[] = {'u','r','n',':','s','c','h','e','m','a','s','-','m','i','c','r','o','s','o','f','t','-','c','o','m',':','a','s','m','.','v','2',0}; static const WCHAR manifestv3W[] = {'u','r','n',':','s','c','h','e','m','a','s','-','m','i','c','r','o','s','o','f','t','-','c','o','m',':','a','s','m','.','v','3',0}; static const WCHAR dotManifestW[] = {'.','m','a','n','i','f','e','s','t',0}; @@ -2213,7 +2214,9 @@ static BOOL parse_assembly_elem(xmlbuf_t* xmlbuf, struct actctx_loader* acl, } else if (xmlstr_cmp(&attr_name, xmlnsW)) { - if (!xmlstr_cmp(&attr_value, manifestv1W) && !xmlstr_cmp(&attr_value, manifestv3W)) + if (!xmlstr_cmp(&attr_value, manifestv1W) && + !xmlstr_cmp(&attr_value, manifestv2W) && + !xmlstr_cmp(&attr_value, manifestv3W)) { FIXME("wrong namespace %s\n", debugstr_xmlstr(&attr_value)); return FALSE;

1 0

Alex Henrie : kernel32/tests: Add tabular UTF-7 decoding tests.
by Alexandre Julliard Dec. 29, 2014

Dec. 29, 2014

Module: wine Branch: master Commit: ddc0c3203f1860f3a3a223f2215a40c5042ffa39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddc0c3203f1860f3a3a223f22… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Dec 26 00:15:32 2014 -0700 kernel32/tests: Add tabular UTF-7 decoding tests. --- dlls/kernel32/tests/codepage.c | 159 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 159 insertions(+) diff --git a/dlls/kernel32/tests/codepage.c b/dlls/kernel32/tests/codepage.c index aa7977d..cab9019 100644 --- a/dlls/kernel32/tests/codepage.c +++ b/dlls/kernel32/tests/codepage.c @@ -681,6 +681,137 @@ static void test_utf7_decoding(void) 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -1, -1, -1, -1, -1 /* 0x70-0x7F */ }; + struct + { + /* inputs */ + char src[32]; + int srclen; + WCHAR *dst; + int dstlen; + /* expected outputs */ + WCHAR expected_dst[32]; + int chars_written; + int len; + } + tests[] = + { + /* tests string conversion with srclen=-1 */ + { + "+T2BZfQ-", -1, output, sizeof(output) / sizeof(WCHAR) - 1, + {0x4F60,0x597D,0}, 3, 3 + }, + /* tests string conversion with srclen=-2 */ + { + "+T2BZfQ-", -2, output, sizeof(output) / sizeof(WCHAR) - 1, + {0x4F60,0x597D,0}, 3, 3 + }, + /* tests string conversion with dstlen=strlen(expected_dst) */ + { + "+T2BZfQ-", -1, output, 2, + {0x4F60,0x597D}, 2, 0 + }, + /* tests string conversion with dstlen=strlen(expected_dst)+1 */ + { + "+T2BZfQ-", -1, output, 3, + {0x4F60,0x597D,0}, 3, 3 + }, + /* tests string conversion with dstlen=strlen(expected_dst)+2 */ + { + "+T2BZfQ-", -1, output, 4, + {0x4F60,0x597D,0}, 3, 3 + }, + /* tests dry run with dst=NULL and dstlen=0 */ + { + "+T2BZfQ-", -1, NULL, 0, + {}, 0, 3 + }, + /* tests dry run with dst!=NULL and dstlen=0 */ + { + "+T2BZfQ-", -1, output, 0, + {}, 0, 3 + }, + /* tests ill-formed UTF-7: 6 bits, not enough for a byte pair */ + { + "+T-+T-+T-hello", -1, output, sizeof(output) / sizeof(WCHAR) - 1, + {'h','e','l','l','o',0}, 6, 6 + }, + /* tests ill-formed UTF-7: 12 bits, not enough for a byte pair */ + { + "+T2-+T2-+T2-hello", -1, output, sizeof(output) / sizeof(WCHAR) - 1, + {'h','e','l','l','o',0}, 6, 6 + }, + /* tests ill-formed UTF-7: 18 bits, not a multiple of 16 and the last bit is a 1 */ + { + "+T2B-+T2B-+T2B-hello", -1, output, sizeof(output) / sizeof(WCHAR) - 1, + {0x4F60,0x4F60,0x4F60,'h','e','l','l','o',0}, 9, 9 + }, + /* tests ill-formed UTF-7: 24 bits, a multiple of 8 but not a multiple of 16 */ + { + "+T2BZ-+T2BZ-+T2BZ-hello", -1, output, sizeof(output) / sizeof(WCHAR) - 1, + {0x4F60,0x4F60,0x4F60,'h','e','l','l','o',0}, 9, 9 + }, + /* tests UTF-7 followed by characters that should be encoded but aren't */ + { + "+T2BZ-\x82\xFE", -1, output, sizeof(output) / sizeof(WCHAR) - 1, + {0x4F60,0x0082,0x00FE,0}, 4, 4 + }, + /* tests srclen > strlen(src) */ + { + "a\0b", 4, output, sizeof(output) / sizeof(WCHAR) - 1, + {'a',0,'b',0}, 4, 4 + }, + /* tests srclen < strlen(src) outside of a UTF-7 sequence */ + { + "hello", 2, output, sizeof(output) / sizeof(WCHAR) - 1, + {'h','e'}, 2, 2 + }, + /* tests srclen < strlen(src) inside of a UTF-7 sequence */ + { + "+T2BZfQ-", 4, output, sizeof(output) / sizeof(WCHAR) - 1, + {0x4F60}, 1, 1 + }, + /* tests srclen < strlen(src) right at the beginning of a UTF-7 sequence */ + { + "hi+T2A-", 3, output, sizeof(output) / sizeof(WCHAR) - 1, + {'h','i'}, 2, 2 + }, + /* tests srclen < strlen(src) right at the end of a UTF-7 sequence */ + { + "+T2A-hi", 5, output, sizeof(output) / sizeof(WCHAR) - 1, + {0x4F60}, 1, 1 + }, + /* tests srclen < strlen(src) at the beginning of an escaped + sign */ + { + "hi+-", 3, output, sizeof(output) / sizeof(WCHAR) - 1, + {'h','i'}, 2, 2 + }, + /* tests srclen < strlen(src) at the end of an escaped + sign */ + { + "+-hi", 2, output, sizeof(output) / sizeof(WCHAR) - 1, + {'+'}, 1, 1 + }, + /* tests len=0 but no error */ + { + "+", 1, output, sizeof(output) / sizeof(WCHAR) - 1, + {}, 0, 0 + }, + /* tests a single null char */ + { + "", -1, output, sizeof(output) / sizeof(WCHAR) - 1, + {0}, 1, 1 + }, + /* tests a buffer that runs out while not decoding a UTF-7 sequence */ + { + "hello", -1, output, 2, + {'h','e'}, 2, 0 + }, + /* tests a buffer that runs out in the middle of decoding a UTF-7 sequence */ + { + "+T2BZfQ-", -1, output, 1, + {0x4F60}, 1, 0 + } + }; + if (MultiByteToWideChar(CP_UTF7, 0, "foobar", -1, NULL, 0) == 0 && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) { @@ -781,6 +912,34 @@ static void test_utf7_decoding(void) "i=0x%02x: expected output=%s, got output=%s\n", i, wine_dbgstr_wn(expected, expected_len + 1), wine_dbgstr_wn(output, expected_len + 1)); } + + for (i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) + { + memset(output, 0x23, sizeof(output) - sizeof(WCHAR)); + output[sizeof(output) / sizeof(WCHAR) - 1] = 0; + SetLastError(0xdeadbeef); + + len = MultiByteToWideChar(CP_UTF7, 0, tests[i].src, tests[i].srclen, + tests[i].dst, tests[i].dstlen); + + tests[i].expected_dst[tests[i].chars_written] = 0x2323; + + if (!tests[i].len && tests[i].chars_written) + { + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "tests[%i]: expected error=0x%x, got error=0x%x\n", + i, ERROR_INSUFFICIENT_BUFFER, GetLastError()); + } + ok(len == tests[i].len, "tests[%i]: expected len=%i, got len=%i\n", i, tests[i].len, len); + + if (tests[i].dst) + { + ok(memcmp(tests[i].dst, tests[i].expected_dst, (tests[i].chars_written + 1) * sizeof(WCHAR)) == 0, + "tests[%i]: expected dst=%s, got dst=%s\n", + i, wine_dbgstr_wn(tests[i].expected_dst, tests[i].chars_written + 1), + wine_dbgstr_wn(tests[i].dst, tests[i].chars_written + 1)); + } + } } static void test_undefined_byte_char(void)

1 0

Jacek Caban : mshtml: Added screenLeft and screenTop properties implementation.
by Alexandre Julliard Dec. 24, 2014

Dec. 24, 2014

Module: wine Branch: master Commit: df63590706b0bcd4c114bd551491e25b65866f36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df63590706b0bcd4c114bd551… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 23 21:12:43 2014 +0100 mshtml: Added screenLeft and screenTop properties implementation. --- dlls/mshtml/htmlwindow.c | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 82bb374..a18fc6d 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -1594,15 +1594,33 @@ static HRESULT WINAPI HTMLWindow3_Invoke(IHTMLWindow3 *iface, DISPID dispIdMembe static HRESULT WINAPI HTMLWindow3_get_screenLeft(IHTMLWindow3 *iface, LONG *p) { HTMLWindow *This = impl_from_IHTMLWindow3(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMWindow_GetScreenX(This->outer_window->nswindow, p); + if(NS_FAILED(nsres)) { + ERR("GetScreenX failed: %08x\n", nsres); + return E_FAIL; + } + + return S_OK; } static HRESULT WINAPI HTMLWindow3_get_screenTop(IHTMLWindow3 *iface, LONG *p) { HTMLWindow *This = impl_from_IHTMLWindow3(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMWindow_GetScreenY(This->outer_window->nswindow, p); + if(NS_FAILED(nsres)) { + ERR("GetScreenY failed: %08x\n", nsres); + return E_FAIL; + } + + return S_OK; } static HRESULT WINAPI HTMLWindow3_attachEvent(IHTMLWindow3 *iface, BSTR event, IDispatch *pDisp, VARIANT_BOOL *pfResult)

1 0

Jacek Caban : mshtml: Added nsIEmbeddingSiteWindow:: GetDimensions implementation.
by Alexandre Julliard Dec. 24, 2014

Dec. 24, 2014

Module: wine Branch: master Commit: 807c716dd1956d4123fc5a6e34294a356525d57f URL: http://source.winehq.org/git/wine.git/?a=commit;h=807c716dd1956d4123fc5a6e3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 23 21:12:36 2014 +0100 mshtml: Added nsIEmbeddingSiteWindow::GetDimensions implementation. --- dlls/mshtml/nsembed.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index f18d528..2854ac3 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -1712,8 +1712,24 @@ static nsresult NSAPI nsEmbeddingSiteWindow_GetDimensions(nsIEmbeddingSiteWindow UINT32 flags, LONG *x, LONG *y, LONG *cx, LONG *cy) { NSContainer *This = impl_from_nsIEmbeddingSiteWindow(iface); - WARN("(%p)->(%08x %p %p %p %p)\n", This, flags, x, y, cx, cy); - return NS_ERROR_NOT_IMPLEMENTED; + RECT r; + + TRACE("(%p)->(%x %p %p %p %p)\n", This, flags, x, y, cx, cy); + + if(!GetWindowRect(This->hwnd, &r)) { + ERR("GetWindowRect failed\n"); + return NS_ERROR_FAILURE; + } + + if(x) + *x = r.left; + if(y) + *y = r.top; + if(cx) + *cx = r.right-r.left; + if(cy) + *cy = r.bottom-r.top; + return NS_OK; } static nsresult NSAPI nsEmbeddingSiteWindow_SetFocus(nsIEmbeddingSiteWindow *iface)

1 0

Austin English : ntoskrnl.exe: Add a stub for IoCsqInitialize.
by Alexandre Julliard Dec. 24, 2014

Dec. 24, 2014

Module: wine Branch: master Commit: cc54a298a0b6039ef95c84d9e2ca4a81fb59ac1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc54a298a0b6039ef95c84d9e… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Dec 23 15:29:30 2014 -0600 ntoskrnl.exe: Add a stub for IoCsqInitialize. --- dlls/ntoskrnl.exe/ntoskrnl.c | 13 +++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 78df9f1..2285ec6 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -33,6 +33,7 @@ #include "winternl.h" #include "excpt.h" #include "winioctl.h" +#include "ddk/csq.h" #include "ddk/ntddk.h" #include "ddk/ntifs.h" #include "wine/unicode.h" @@ -1996,3 +1997,15 @@ NTSTATUS WINAPI IoRegisterPlugPlayNotification(IO_NOTIFICATION_EVENT_CATEGORY ca FIXME("(%u %u %p %p %p %p %p) stub\n", category, flags, data, driver, callback, context, notification); return STATUS_SUCCESS; } + +/***************************************************** + * IoCsqInitialize (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI IoCsqInitialize(PIO_CSQ csq, PIO_CSQ_INSERT_IRP insert_irp, PIO_CSQ_REMOVE_IRP remove_irp, + PIO_CSQ_PEEK_NEXT_IRP peek_irp, PIO_CSQ_ACQUIRE_LOCK acquire_lock, + PIO_CSQ_RELEASE_LOCK release_lock, PIO_CSQ_COMPLETE_CANCELED_IRP complete_irp) +{ + FIXME("(%p %p %p %p %p %p %p) stub\n", + csq, insert_irp, remove_irp, peek_irp, acquire_lock, release_lock, complete_irp); + return STATUS_SUCCESS; +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 3bcf21c..228da29 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -348,7 +348,7 @@ @ stdcall IoCreateSymbolicLink(ptr ptr) @ stdcall IoCreateSynchronizationEvent(ptr ptr) @ stub IoCreateUnprotectedSymbolicLink -@ stub IoCsqInitialize +@ stdcall IoCsqInitialize(ptr ptr ptr ptr ptr ptr ptr) @ stub IoCsqInsertIrp @ stub IoCsqRemoveIrp @ stub IoCsqRemoveNextIrp

1 0

Alex Henrie : x3daudio1_7: Add stub DLL.
by Alexandre Julliard Dec. 24, 2014

Dec. 24, 2014

Module: wine Branch: master Commit: 0c2b684cbfe90301263eb8df2945a7b2e4da42cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c2b684cbfe90301263eb8df2… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Dec 21 19:29:25 2014 -0700 x3daudio1_7: Add stub DLL. --- configure | 2 ++ configure.ac | 1 + dlls/x3daudio1_7/Makefile.in | 4 ++++ dlls/x3daudio1_7/main.c | 36 ++++++++++++++++++++++++++++++++++++ dlls/x3daudio1_7/x3daudio1_7.spec | 2 ++ 5 files changed, 45 insertions(+) diff --git a/configure b/configure index b2d922a..119eaa8 100755 --- a/configure +++ b/configure @@ -1319,6 +1319,7 @@ enable_wsock32 enable_wtsapi32 enable_wuapi enable_wuaueng +enable_x3daudio1_7 enable_xapofx1_1 enable_xinput1_1 enable_xinput1_2 @@ -17538,6 +17539,7 @@ wine_fn_config_dll wtsapi32 enable_wtsapi32 implib wine_fn_config_test dlls/wtsapi32/tests wtsapi32_test wine_fn_config_dll wuapi enable_wuapi clean wine_fn_config_dll wuaueng enable_wuaueng +wine_fn_config_dll x3daudio1_7 enable_x3daudio1_7 wine_fn_config_dll xapofx1_1 enable_xapofx1_1 wine_fn_config_dll xinput1_1 enable_xinput1_1 wine_fn_config_dll xinput1_2 enable_xinput1_2 diff --git a/configure.ac b/configure.ac index 2fa4dcc..9f64cd3 100644 --- a/configure.ac +++ b/configure.ac @@ -3363,6 +3363,7 @@ WINE_CONFIG_DLL(wtsapi32,,[implib]) WINE_CONFIG_TEST(dlls/wtsapi32/tests) WINE_CONFIG_DLL(wuapi,,[clean]) WINE_CONFIG_DLL(wuaueng) +WINE_CONFIG_DLL(x3daudio1_7) WINE_CONFIG_DLL(xapofx1_1) WINE_CONFIG_DLL(xinput1_1) WINE_CONFIG_DLL(xinput1_2) diff --git a/dlls/x3daudio1_7/Makefile.in b/dlls/x3daudio1_7/Makefile.in new file mode 100644 index 0000000..7487ca8 --- /dev/null +++ b/dlls/x3daudio1_7/Makefile.in @@ -0,0 +1,4 @@ +MODULE = x3daudio1_7.dll + +C_SRCS = \ + main.c diff --git a/dlls/x3daudio1_7/main.c b/dlls/x3daudio1_7/main.c new file mode 100644 index 0000000..672cb1c --- /dev/null +++ b/dlls/x3daudio1_7/main.c @@ -0,0 +1,36 @@ +/* + * Copyright 2014 Alex Henrie + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#include "config.h" +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) +{ + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + break; + } + + return TRUE; +} diff --git a/dlls/x3daudio1_7/x3daudio1_7.spec b/dlls/x3daudio1_7/x3daudio1_7.spec new file mode 100644 index 0000000..9a51f1b --- /dev/null +++ b/dlls/x3daudio1_7/x3daudio1_7.spec @@ -0,0 +1,2 @@ +@ stub X3DAudioCalculate +@ stub X3DAudioInitialize

1 0

Jacek Caban : mshtml: Use standard list to store task queue.
by Alexandre Julliard Dec. 24, 2014

Dec. 24, 2014

Module: wine Branch: master Commit: 94fcaad7033163d76134f6b85be30a9e383350a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94fcaad7033163d76134f6b85… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 24 13:09:59 2014 +0100 mshtml: Use standard list to store task queue. --- dlls/mshtml/mshtml_private.h | 5 ++--- dlls/mshtml/task.c | 38 +++++++++++--------------------------- 2 files changed, 13 insertions(+), 30 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 8529231..5553bf2 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -1018,7 +1018,7 @@ struct task_t { LONG target_magic; task_proc_t proc; task_proc_t destr; - struct task_t *next; + struct list entry; }; typedef struct { @@ -1028,8 +1028,7 @@ typedef struct { typedef struct { HWND thread_hwnd; - task_t *task_queue_head; - task_t *task_queue_tail; + struct list task_list; struct list timer_list; } thread_data_t; diff --git a/dlls/mshtml/task.c b/dlls/mshtml/task.c index 6baac63..d0c888f 100644 --- a/dlls/mshtml/task.c +++ b/dlls/mshtml/task.c @@ -69,14 +69,8 @@ HRESULT push_task(task_t *task, task_proc_t proc, task_proc_t destr, LONG magic) task->target_magic = magic; task->proc = proc; task->destr = destr ? destr : default_task_destr; - task->next = NULL; - if(thread_data->task_queue_tail) - thread_data->task_queue_tail->next = task; - else - thread_data->task_queue_head = task; - - thread_data->task_queue_tail = task; + list_add_tail(&thread_data->task_list, &task->entry); PostMessageW(thread_data->thread_hwnd, WM_PROCESSTASK, 0, 0); return S_OK; @@ -91,14 +85,11 @@ static task_t *pop_task(void) if(!thread_data) return NULL; - task = thread_data->task_queue_head; - if(!task) + if(list_empty(&thread_data->task_list)) return NULL; - thread_data->task_queue_head = task->next; - if(!thread_data->task_queue_head) - thread_data->task_queue_tail = NULL; - + task = LIST_ENTRY(thread_data->task_list.next, task_t, entry); + list_remove(&task->entry); return task; } @@ -116,7 +107,7 @@ void remove_target_tasks(LONG target) thread_data_t *thread_data = get_thread_data(FALSE); struct list *liter, *ltmp; task_timer_t *timer; - task_t *iter, *tmp; + task_t *task; if(!thread_data) return; @@ -134,20 +125,12 @@ void remove_target_tasks(LONG target) SetTimer(thread_data->thread_hwnd, TIMER_ID, max( (int)(timer->time - tc), 0 ), NULL); } - while(thread_data->task_queue_head && thread_data->task_queue_head->target_magic == target) { - iter = pop_task(); - iter->destr(iter); - } - - for(iter = thread_data->task_queue_head; iter; iter = iter->next) { - while(iter->next && iter->next->target_magic == target) { - tmp = iter->next; - iter->next = tmp->next; - tmp->destr(tmp); + LIST_FOR_EACH_SAFE(liter, ltmp, &thread_data->task_list) { + task = LIST_ENTRY(liter, task_t, entry); + if(task->target_magic == target) { + list_remove(&task->entry); + task->destr(task); } - - if(!iter->next) - thread_data->task_queue_tail = iter; } } @@ -390,6 +373,7 @@ thread_data_t *get_thread_data(BOOL create) return NULL; TlsSetValue(mshtml_tls, thread_data); + list_init(&thread_data->task_list); list_init(&thread_data->timer_list); }

1 0

Jacek Caban : mshtml: Flush pending document node tasks before firing onload event.
by Alexandre Julliard Dec. 24, 2014

Dec. 24, 2014

Module: wine Branch: master Commit: 71ce8aaafe7c2989320d47424660056e0c523bf0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71ce8aaafe7c2989320d47424… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 24 13:10:10 2014 +0100 mshtml: Flush pending document node tasks before firing onload event. --- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/nsevents.c | 9 ++++++--- dlls/mshtml/task.c | 19 +++++++++++++++++++ 3 files changed, 26 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 5553bf2..4076f8d 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -1038,6 +1038,7 @@ HWND get_thread_hwnd(void) DECLSPEC_HIDDEN; LONG get_task_target_magic(void) DECLSPEC_HIDDEN; HRESULT push_task(task_t*,task_proc_t,task_proc_t,LONG) DECLSPEC_HIDDEN; void remove_target_tasks(LONG) DECLSPEC_HIDDEN; +void flush_pending_tasks(LONG) DECLSPEC_HIDDEN; HRESULT set_task_timer(HTMLInnerWindow*,DWORD,BOOL,IDispatch*,LONG*) DECLSPEC_HIDDEN; HRESULT clear_task_timer(HTMLInnerWindow*,BOOL,DWORD) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index fc6504b..1444b43 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -233,7 +233,6 @@ static nsresult NSAPI handle_load(nsIDOMEventListener *iface, nsIDOMEvent *event { nsEventListener *This = impl_from_nsIDOMEventListener(iface); HTMLDocumentNode *doc = This->This->doc; - nsIDOMHTMLElement *nsbody = NULL; HTMLDocumentObj *doc_obj = NULL; nsresult nsres = NS_OK; @@ -268,8 +267,12 @@ static nsresult NSAPI handle_load(nsIDOMEventListener *iface, nsIDOMEvent *event &doc->basedoc.window->base.IHTMLWindow2_iface, 0); if(doc->nsdoc) { - nsIDOMHTMLDocument_GetBody(doc->nsdoc, &nsbody); - if(nsbody) { + nsIDOMHTMLElement *nsbody; + + flush_pending_tasks(doc->basedoc.task_magic); + + nsres = nsIDOMHTMLDocument_GetBody(doc->nsdoc, &nsbody); + if(NS_SUCCEEDED(nsres) && nsbody) { fire_event(doc, EVENTID_LOAD, TRUE, (nsIDOMNode*)nsbody, event, (IDispatch*)&doc->window->base.IDispatchEx_iface); nsIDOMHTMLElement_Release(nsbody); } diff --git a/dlls/mshtml/task.c b/dlls/mshtml/task.c index d0c888f..a821031 100644 --- a/dlls/mshtml/task.c +++ b/dlls/mshtml/task.c @@ -102,6 +102,25 @@ static void release_task_timer(HWND thread_hwnd, task_timer_t *timer) heap_free(timer); } +void flush_pending_tasks(LONG target) +{ + thread_data_t *thread_data = get_thread_data(FALSE); + struct list *liter, *ltmp; + task_t *task; + + if(!thread_data) + return; + + LIST_FOR_EACH_SAFE(liter, ltmp, &thread_data->task_list) { + task = LIST_ENTRY(liter, task_t, entry); + if(task->target_magic == target) { + list_remove(&task->entry); + task->proc(task); + task->destr(task); + } + } +} + void remove_target_tasks(LONG target) { thread_data_t *thread_data = get_thread_data(FALSE);

1 0

Jacek Caban : mshtml: Correctly handle NULL active element in IHTMLDocument2:: get_activeElement.
by Alexandre Julliard Dec. 24, 2014

Dec. 24, 2014

Module: wine Branch: master Commit: 5135144d3a04a332299092fa83192022a83ab71c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5135144d3a04a332299092fa8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 24 14:13:23 2014 +0100 mshtml: Correctly handle NULL active element in IHTMLDocument2::get_activeElement. --- dlls/mshtml/htmldoc.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index e9b9dc9..ea56f5c 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -282,6 +282,11 @@ static HRESULT WINAPI HTMLDocument_get_activeElement(IHTMLDocument2 *iface, IHTM return E_FAIL; } + if(!nselem) { + *p = NULL; + return S_OK; + } + hres = get_elem(This->doc_node, nselem, &elem); nsIDOMElement_Release(nselem); if(FAILED(hres))

1 0