December 2014 - Wine-commits

Mark Harmstone : dsound: Remove unused struct entries.
by Alexandre Julliard 29 Dec '14

29 Dec '14

Module: wine Branch: master Commit: b7a2f0879c6982eff9e8923b3c3bdd437205bb36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7a2f0879c6982eff9e8923b3… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Sat Dec 27 21:31:00 2014 +0000 dsound: Remove unused struct entries. --- dlls/dsound/dsound_private.h | 3 --- dlls/dsound/mixer.c | 8 -------- 2 files changed, 11 deletions(-) diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index a8f5f42..493df91 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -53,10 +53,7 @@ typedef struct _DSVOLUMEPAN DWORD dwTotalLeftAmpFactor; DWORD dwTotalRightAmpFactor; LONG lVolume; - DWORD dwVolAmpFactor; LONG lPan; - DWORD dwPanLeftAmpFactor; - DWORD dwPanRightAmpFactor; } DSVOLUMEPAN,*PDSVOLUMEPAN; /***************************************************************************** diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 0fae20e..5e24382 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -51,8 +51,6 @@ void DSOUND_RecalcVolPan(PDSVOLUMEPAN volpan) TRACE("Vol=%d Pan=%d\n", volpan->lVolume, volpan->lPan); /* the AmpFactors are expressed in 16.16 fixed point */ - volpan->dwVolAmpFactor = (ULONG) (pow(2.0, volpan->lVolume / 600.0) * 0xffff); - /* FIXME: dwPan{Left|Right}AmpFactor */ /* FIXME: use calculated vol and pan ampfactors */ temp = (double) (volpan->lVolume - (volpan->lPan > 0 ? volpan->lPan : 0)); @@ -78,15 +76,9 @@ void DSOUND_AmpFactorToVolPan(PDSVOLUMEPAN volpan) else right=600 * log(((double)volpan->dwTotalRightAmpFactor) / 0xffff) / log(2); if (left<right) - { volpan->lVolume=right; - volpan->dwVolAmpFactor=volpan->dwTotalRightAmpFactor; - } else - { volpan->lVolume=left; - volpan->dwVolAmpFactor=volpan->dwTotalLeftAmpFactor; - } if (volpan->lVolume < -10000) volpan->lVolume=-10000; volpan->lPan=right-left;

1 0

Mark Harmstone : dsound: Use array for channel volumes.
by Alexandre Julliard 29 Dec '14

29 Dec '14

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

Jacek Caban : mshtml: Introduced new representation of range point and use that in range_to_string instead of trying to iterate by nodes.
by Alexandre Julliard 29 Dec '14

29 Dec '14

Module: wine Branch: master Commit: 3944fada4b20ed1473bdf231ddb8ab88461932c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3944fada4b20ed1473bdf231d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 29 15:49:31 2014 +0100 mshtml: Introduced new representation of range point and use that in range_to_string instead of trying to iterate by nodes. --- dlls/mshtml/txtrange.c | 220 ++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 173 insertions(+), 47 deletions(-) diff --git a/dlls/mshtml/txtrange.c b/dlls/mshtml/txtrange.c index 0dd3aae..c6fba3e 100644 --- a/dlls/mshtml/txtrange.c +++ b/dlls/mshtml/txtrange.c @@ -59,6 +59,12 @@ typedef struct { UINT16 type; nsIDOMNode *node; UINT32 off; +} rangepoint_t; + +typedef struct { + UINT16 type; + nsIDOMNode *node; + UINT32 off; nsAString str; const PRUnichar *p; } dompos_t; @@ -128,6 +134,136 @@ static UINT16 get_node_type(nsIDOMNode *node) return type; } +static void get_text_node_data(nsIDOMNode *node, nsAString *nsstr, const PRUnichar **str) +{ + nsIDOMText *nstext; + nsresult nsres; + + nsres = nsIDOMNode_QueryInterface(node, &IID_nsIDOMText, (void**)&nstext); + assert(nsres == NS_OK); + + nsAString_Init(nsstr, NULL); + nsres = nsIDOMText_GetData(nstext, nsstr); + nsIDOMText_Release(nstext); + if(NS_FAILED(nsres)) + ERR("GetData failed: %08x\n", nsres); + + nsAString_GetData(nsstr, str); +} + +static nsIDOMNode *get_child_node(nsIDOMNode *node, UINT32 off) +{ + nsIDOMNodeList *node_list; + nsIDOMNode *ret = NULL; + + nsIDOMNode_GetChildNodes(node, &node_list); + nsIDOMNodeList_Item(node_list, off, &ret); + nsIDOMNodeList_Release(node_list); + + return ret; +} + +/* This is very inefficient, but there is no faster way to compute index in + * child node list using public API. Gecko has internal nsINode::IndexOf + * function that we could consider exporting and use instead. */ +static int get_child_index(nsIDOMNode *parent, nsIDOMNode *child) +{ + nsIDOMNodeList *node_list; + nsIDOMNode *node; + int ret = 0; + nsresult nsres; + + nsres = nsIDOMNode_GetChildNodes(parent, &node_list); + assert(nsres == NS_OK); + + while(1) { + nsres = nsIDOMNodeList_Item(node_list, ret, &node); + assert(nsres == NS_OK && node); + if(node == child) { + nsIDOMNode_Release(node); + break; + } + nsIDOMNode_Release(node); + ret++; + } + + nsIDOMNodeList_Release(node_list); + return ret; +} + +static void init_rangepoint(rangepoint_t *rangepoint, nsIDOMNode *node, UINT32 off) +{ + nsIDOMNode_AddRef(node); + + rangepoint->type = get_node_type(node); + rangepoint->node = node; + rangepoint->off = off; +} + +static inline void free_rangepoint(rangepoint_t *rangepoint) +{ + nsIDOMNode_Release(rangepoint->node); +} + +static inline BOOL rangepoint_cmp(const rangepoint_t *point1, const rangepoint_t *point2) +{ + return point1->node == point2->node && point1->off == point2->off; +} + +static BOOL rangepoint_next_node(rangepoint_t *iter) +{ + nsIDOMNode *node; + UINT32 off; + nsresult nsres; + + /* Try to move to the child node. */ + node = get_child_node(iter->node, iter->off); + if(node) { + free_rangepoint(iter); + init_rangepoint(iter, node, 0); + nsIDOMNode_Release(node); + return TRUE; + } + + /* There are no more children in the node. Move to parent. */ + nsres = nsIDOMNode_GetParentNode(iter->node, &node); + assert(nsres == NS_OK); + if(!node) + return FALSE; + + off = get_child_index(node, iter->node)+1; + free_rangepoint(iter); + init_rangepoint(iter, node, off); + nsIDOMNode_Release(node); + return TRUE; +} + +static void get_start_point(HTMLTxtRange *This, rangepoint_t *ret) +{ + nsIDOMNode *node; + LONG off; + + nsIDOMRange_GetStartContainer(This->nsrange, &node); + nsIDOMRange_GetStartOffset(This->nsrange, &off); + + init_rangepoint(ret, node, off); + + nsIDOMNode_Release(node); +} + +static void get_end_point(HTMLTxtRange *This, rangepoint_t *ret) +{ + nsIDOMNode *node; + LONG off; + + nsIDOMRange_GetEndContainer(This->nsrange, &node); + nsIDOMRange_GetEndOffset(This->nsrange, &off); + + init_rangepoint(ret, node, off); + + nsIDOMNode_Release(node); +} + static BOOL is_elem_tag(nsIDOMNode *node, LPCWSTR istag) { nsIDOMElement *elem; @@ -236,7 +372,7 @@ static void wstrbuf_append_nodetxt(wstrbuf_t *buf, LPCWSTR str, int len) *d = 0; } -static void wstrbuf_append_node(wstrbuf_t *buf, nsIDOMNode *node) +static void wstrbuf_append_node(wstrbuf_t *buf, nsIDOMNode *node, BOOL ignore_text) { switch(get_node_type(node)) { @@ -245,6 +381,9 @@ static void wstrbuf_append_node(wstrbuf_t *buf, nsIDOMNode *node) nsAString data_str; const PRUnichar *data; + if(ignore_text) + break; + nsIDOMNode_QueryInterface(node, &IID_nsIDOMText, (void**)&nstext); nsAString_Init(&data_str, NULL); @@ -272,7 +411,7 @@ static void wstrbuf_append_node_rec(wstrbuf_t *buf, nsIDOMNode *node) { nsIDOMNode *iter, *tmp; - wstrbuf_append_node(buf, node); + wstrbuf_append_node(buf, node, FALSE); nsIDOMNode_GetFirstChild(node, &iter); while(iter) { @@ -379,18 +518,6 @@ static nsIDOMNode *prev_node(HTMLTxtRange *This, nsIDOMNode *iter) return NULL; } -static nsIDOMNode *get_child_node(nsIDOMNode *node, UINT32 off) -{ - nsIDOMNodeList *node_list; - nsIDOMNode *ret = NULL; - - nsIDOMNode_GetChildNodes(node, &node_list); - nsIDOMNodeList_Item(node_list, off, &ret); - nsIDOMNodeList_Release(node_list); - - return ret; -} - static void get_cur_pos(HTMLTxtRange *This, BOOL start, dompos_t *pos) { nsIDOMNode *node; @@ -485,8 +612,7 @@ static inline BOOL dompos_cmp(const dompos_t *pos1, const dompos_t *pos2) static void range_to_string(HTMLTxtRange *This, wstrbuf_t *buf) { - nsIDOMNode *iter, *tmp; - dompos_t start_pos, end_pos; + rangepoint_t end_pos, iter; cpp_bool collapsed; nsIDOMRange_GetCollapsed(This->nsrange, &collapsed); @@ -497,42 +623,42 @@ static void range_to_string(HTMLTxtRange *This, wstrbuf_t *buf) return; } - get_cur_pos(This, FALSE, &end_pos); - get_cur_pos(This, TRUE, &start_pos); + get_end_point(This, &end_pos); + get_start_point(This, &iter); - if(start_pos.type == TEXT_NODE) { - if(start_pos.node == end_pos.node) { - wstrbuf_append_nodetxt(buf, start_pos.p+start_pos.off, end_pos.off-start_pos.off+1); - iter = start_pos.node; - nsIDOMNode_AddRef(iter); - }else { - wstrbuf_append_nodetxt(buf, start_pos.p+start_pos.off, strlenW(start_pos.p+start_pos.off)); - iter = next_node(start_pos.node); - } - }else { - iter = start_pos.node; - nsIDOMNode_AddRef(iter); - } + do { + if(iter.type == TEXT_NODE) { + const PRUnichar *str; + nsAString nsstr; - while(iter != end_pos.node) { - wstrbuf_append_node(buf, iter); - tmp = next_node(iter); - nsIDOMNode_Release(iter); - iter = tmp; - } + get_text_node_data(iter.node, &nsstr, &str); - nsIDOMNode_AddRef(end_pos.node); + if(iter.node == end_pos.node) { + wstrbuf_append_nodetxt(buf, str+iter.off, end_pos.off-iter.off); + nsAString_Finish(&nsstr); + break; + } - if(start_pos.node != end_pos.node) { - if(end_pos.type == TEXT_NODE) - wstrbuf_append_nodetxt(buf, end_pos.p, end_pos.off+1); - else - wstrbuf_append_node(buf, end_pos.node); - } + wstrbuf_append_nodetxt(buf, str+iter.off, strlenW(str+iter.off)); + nsAString_Finish(&nsstr); + }else { + nsIDOMNode *node; + + node = get_child_node(iter.node, iter.off); + if(node) { + wstrbuf_append_node(buf, node, TRUE); + nsIDOMNode_Release(node); + } + } + + if(!rangepoint_next_node(&iter)) { + ERR("End of document?\n"); + break; + } + }while(!rangepoint_cmp(&iter, &end_pos)); - nsIDOMNode_Release(iter); - dompos_release(&start_pos); - dompos_release(&end_pos); + free_rangepoint(&iter); + free_rangepoint(&end_pos); if(buf->len) { WCHAR *p;

1 0

Jacek Caban : mshtml: Added nsIEmbeddingSiteWindow:: GetDimensions implementation.
by Alexandre Julliard 24 Dec '14

24 Dec '14

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

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

24 Dec '14

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

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

24 Dec '14

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 24 Dec '14

24 Dec '14

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 24 Dec '14

24 Dec '14

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 24 Dec '14

24 Dec '14

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: Delay onreadystateevent notification if script elemenet is not added by parser.
by Alexandre Julliard 24 Dec '14

24 Dec '14

Module: wine Branch: master Commit: f4b68522783a5cacb1e99d5e6a8d3015382e5dc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4b68522783a5cacb1e99d5e6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 24 13:10:21 2014 +0100 mshtml: Delay onreadystateevent notification if script elemenet is not added by parser. --- dlls/mshtml/htmlscript.h | 1 + dlls/mshtml/script.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 49 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlscript.h b/dlls/mshtml/htmlscript.h index 8698be8..ad493c9 100644 --- a/dlls/mshtml/htmlscript.h +++ b/dlls/mshtml/htmlscript.h @@ -24,6 +24,7 @@ typedef struct { nsIDOMHTMLScriptElement *nsscript; BOOL parsed; BOOL parse_on_bind; + BOOL pending_readystatechange_event; READYSTATE readystate; } HTMLScriptElement; diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index de4fc20..54e84e1 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -702,12 +702,58 @@ static ScriptHost *create_script_host(HTMLInnerWindow *window, const GUID *guid) return ret; } +typedef struct { + task_t header; + HTMLScriptElement *elem; +} fire_readystatechange_task_t; + +static void fire_readystatechange_proc(task_t *_task) +{ + fire_readystatechange_task_t *task = (fire_readystatechange_task_t*)_task; + + if(!task->elem->pending_readystatechange_event) + return; + + task->elem->pending_readystatechange_event = FALSE; + fire_event(task->elem->element.node.doc, EVENTID_READYSTATECHANGE, FALSE, task->elem->element.node.nsnode, NULL, NULL); +} + +static void fire_readystatechange_task_destr(task_t *_task) +{ + fire_readystatechange_task_t *task = (fire_readystatechange_task_t*)_task; + + IHTMLScriptElement_Release(&task->elem->IHTMLScriptElement_iface); +} + static void set_script_elem_readystate(HTMLScriptElement *script_elem, READYSTATE readystate) { script_elem->readystate = readystate; - if(readystate != READYSTATE_INTERACTIVE) - fire_event(script_elem->element.node.doc, EVENTID_READYSTATECHANGE, FALSE, script_elem->element.node.nsnode, NULL, NULL); + if(readystate != READYSTATE_INTERACTIVE) { + if(!script_elem->element.node.doc->window->parser_callback_cnt) { + fire_readystatechange_task_t *task; + HRESULT hres; + + if(script_elem->pending_readystatechange_event) + return; + + task = heap_alloc(sizeof(*task)); + if(!task) + return; + + IHTMLScriptElement_AddRef(&script_elem->IHTMLScriptElement_iface); + task->elem = script_elem; + + hres = push_task(&task->header, fire_readystatechange_proc, fire_readystatechange_task_destr, + script_elem->element.node.doc->window->task_magic); + if(SUCCEEDED(hres)) + script_elem->pending_readystatechange_event = TRUE; + }else { + script_elem->pending_readystatechange_event = FALSE; + fire_event(script_elem->element.node.doc, EVENTID_READYSTATECHANGE, FALSE, + script_elem->element.node.nsnode, NULL, NULL); + } + } } static void parse_elem_text(ScriptHost *script_host, HTMLScriptElement *script_elem, LPCWSTR text)

1 0