wine-commits December 2014

wine-commits@winehq.org

2 participants
319 discussions

Nikolay Sivov : dwrite: Split runs according to BiDi levels.
by Alexandre Julliard 29 Dec '14

29 Dec '14

Module: wine Branch: master Commit: ac4c85ea87b97f7a498514a8b658238daa25c7c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac4c85ea87b97f7a498514a8b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 25 13:34:35 2014 +0300 dwrite: Split runs according to BiDi levels. --- dlls/dwrite/layout.c | 87 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 86 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 583f2eb..5b23a0c 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -26,6 +26,7 @@ #include "winbase.h" #include "wingdi.h" #include "dwrite_private.h" +#include "scripts.h" #include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(dwrite); @@ -101,6 +102,7 @@ struct layout_range { struct layout_run { struct list entry; DWRITE_GLYPH_RUN_DESCRIPTION descr; + DWRITE_GLYPH_RUN run; DWRITE_SCRIPT_ANALYSIS sa; }; @@ -198,6 +200,18 @@ static struct layout_run *alloc_layout_run(void) ret->descr.clusterMap = NULL; ret->descr.textPosition = 0; + ret->run.fontFace = NULL; + ret->run.fontEmSize = 0.0; + ret->run.glyphCount = 0; + ret->run.glyphIndices = NULL; + ret->run.glyphAdvances = NULL; + ret->run.glyphOffsets = NULL; + ret->run.isSideways = FALSE; + ret->run.bidiLevel = 0; + + ret->sa.script = Script_Unknown; + ret->sa.shapes = DWRITE_SCRIPT_SHAPES_DEFAULT; + return ret; } @@ -227,10 +241,17 @@ static HRESULT layout_compute_runs(struct dwrite_textlayout *layout) if (cur->object) continue; + /* initial splitting by script */ hr = IDWriteTextAnalyzer_AnalyzeScript(analyzer, &layout->IDWriteTextAnalysisSource_iface, cur->range.startPosition, cur->range.length, &layout->IDWriteTextAnalysisSink_iface); if (FAILED(hr)) break; + + /* this splits it further */ + hr = IDWriteTextAnalyzer_AnalyzeBidi(analyzer, &layout->IDWriteTextAnalysisSource_iface, + cur->range.startPosition, cur->range.length, &layout->IDWriteTextAnalysisSink_iface); + if (FAILED(hr)) + break; } IDWriteTextAnalyzer_Release(analyzer); @@ -245,6 +266,16 @@ static HRESULT layout_compute(struct dwrite_textlayout *layout) return S_OK; hr = layout_compute_runs(layout); + + if (TRACE_ON(dwrite)) { + struct layout_run *cur; + + LIST_FOR_EACH_ENTRY(cur, &layout->runs, struct layout_run, entry) { + TRACE("run [%u,%u], len %u, bidilevel %u\n", cur->descr.textPosition, cur->descr.textPosition+cur->descr.stringLength-1, + cur->descr.stringLength, cur->run.bidiLevel); + } + } + layout->recompute = FALSE; return hr; } @@ -1550,7 +1581,61 @@ static HRESULT WINAPI dwritetextlayout_sink_SetLineBreakpoints(IDWriteTextAnalys static HRESULT WINAPI dwritetextlayout_sink_SetBidiLevel(IDWriteTextAnalysisSink *iface, UINT32 position, UINT32 length, UINT8 explicitLevel, UINT8 resolvedLevel) { - return E_NOTIMPL; + struct dwrite_textlayout *layout = impl_from_IDWriteTextAnalysisSink(iface); + struct layout_run *cur; + + LIST_FOR_EACH_ENTRY(cur, &layout->runs, struct layout_run, entry) { + struct layout_run *run, *run2; + + /* FIXME: levels are reported in a natural forward direction, so start loop from a run we ended on */ + if (position < cur->descr.textPosition || position > cur->descr.textPosition + cur->descr.stringLength) + continue; + + /* full hit - just set run level */ + if (cur->descr.textPosition == position && cur->descr.stringLength == length) { + cur->run.bidiLevel = resolvedLevel; + break; + } + + /* current run is fully covered, move to next one */ + if (cur->descr.textPosition == position && cur->descr.stringLength < length) { + cur->run.bidiLevel = resolvedLevel; + position += cur->descr.stringLength; + length -= cur->descr.stringLength; + continue; + } + + /* now starting point is in a run, so it splits it */ + run = alloc_layout_run(); + if (!run) + return E_OUTOFMEMORY; + + *run = *cur; + run->descr.textPosition = position; + run->descr.stringLength = cur->descr.stringLength - position + cur->descr.textPosition; + run->run.bidiLevel = resolvedLevel; + cur->descr.stringLength -= position - cur->descr.textPosition; + + list_add_after(&cur->entry, &run->entry); + + if (position + length == run->descr.textPosition + run->descr.stringLength) + break; + + /* split second time */ + run2 = alloc_layout_run(); + if (!run2) + return E_OUTOFMEMORY; + + *run2 = *cur; + run2->descr.textPosition = run->descr.textPosition + run->descr.stringLength; + run2->descr.stringLength = cur->descr.textPosition + cur->descr.stringLength - position - length; + run->descr.stringLength -= run2->descr.stringLength; + + list_add_after(&run->entry, &run2->entry); + break; + } + + return S_OK; } static HRESULT WINAPI dwritetextlayout_sink_SetNumberSubstitution(IDWriteTextAnalysisSink *iface,

1 0

Piotr Caban : msvcp70: Fix ios_base definition.
by Alexandre Julliard 29 Dec '14

29 Dec '14

Module: wine Branch: master Commit: be6e7727d22f19ed6d005369d3b1699583c12674 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be6e7727d22f19ed6d005369d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 25 16:50:27 2014 +0100 msvcp70: Fix ios_base definition. --- dlls/msvcp90/msvcp90.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index d7c0a31..5e7b427 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -352,7 +352,7 @@ typedef struct _ios_base { const vtable_ptr *vtable; #if _MSVCP_VER >= 100 MSVCP_size_t DECLSPEC_ALIGN(8) stdstr; -#else +#elif _MSVCP_VER >= 71 MSVCP_size_t stdstr; #endif IOSB_iostate state; @@ -363,6 +363,9 @@ typedef struct _ios_base { IOS_BASE_iosarray *arr; IOS_BASE_fnarray *calls; locale *loc; +#if _MSVCP_VER == 70 + MSVCP_size_t stdstr; +#endif } ios_base; /* class basic_streambuf<char> */

1 0

Piotr Caban : msvcp70: Fix basic_filebuf definition.
by Alexandre Julliard 29 Dec '14

29 Dec '14

Module: wine Branch: master Commit: 799c771587348ff02790513bdd7bba6bc865891e URL: http://source.winehq.org/git/wine.git/?a=commit;h=799c771587348ff02790513bd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 25 16:50:22 2014 +0100 msvcp70: Fix basic_filebuf definition. --- dlls/msvcp90/ios.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 80aebec..7308729 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -74,6 +74,9 @@ typedef struct { MSVCP_bool wrotesome; int state; MSVCP_bool close; +#if _MSVCP_VER == 70 + locale loc; +#endif FILE *file; } basic_filebuf_char; @@ -90,6 +93,9 @@ typedef struct { MSVCP_bool wrotesome; int state; MSVCP_bool close; +#if _MSVCP_VER == 70 + locale loc; +#endif FILE *file; } basic_filebuf_wchar;

1 0

Jacek Caban : mshtml: Allow '#' to be the first char of resource name in res protocol.
by Alexandre Julliard 24 Dec '14

24 Dec '14

Module: wine Branch: master Commit: fecbc88daf04c9e9e298d64d7c6919e31bb513ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=fecbc88daf04c9e9e298d64d7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 24 16:31:50 2014 +0100 mshtml: Allow '#' to be the first char of resource name in res protocol. --- dlls/mshtml/protocol.c | 2 +- dlls/mshtml/tests/protocol.c | 3 +++ dlls/mshtml/tests/rsrc.rc | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/protocol.c b/dlls/mshtml/protocol.c index 2499db4..9988c90 100644 --- a/dlls/mshtml/protocol.c +++ b/dlls/mshtml/protocol.c @@ -649,7 +649,7 @@ static HRESULT WINAPI ResProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, /* Ignore query and hash parts. */ if((ptr = strchrW(url_file, '?'))) *ptr = 0; - if((ptr = strchrW(url_file, '#'))) + if(*url_file && (ptr = strchrW(url_file+1, '#'))) *ptr = 0; hdll = LoadLibraryExW(url_dll, NULL, LOAD_LIBRARY_AS_DATAFILE); diff --git a/dlls/mshtml/tests/protocol.c b/dlls/mshtml/tests/protocol.c index 00971be..f9803df 100644 --- a/dlls/mshtml/tests/protocol.c +++ b/dlls/mshtml/tests/protocol.c @@ -606,6 +606,9 @@ static void test_res_protocol(void) if(GetProcAddress(LoadLibraryA("urlmon.dll"), "CreateUri")) { test_res_url("/test/dir/dir2/res.html?query_part"); test_res_url("/test/dir/dir2/res.html#hash_part"); + test_res_url("/#123"); + test_res_url("/#23/#123"); + test_res_url("/#123#456"); }else { win_skip("IUri not supported\n"); } diff --git a/dlls/mshtml/tests/rsrc.rc b/dlls/mshtml/tests/rsrc.rc index d498b82..33ffef5 100644 --- a/dlls/mshtml/tests/rsrc.rc +++ b/dlls/mshtml/tests/rsrc.rc @@ -40,6 +40,9 @@ blank.html HTML "blank.html" /* @makedep: blank.html */ blank2.html HTML "blank.html" +/* @makedep: blank.html */ +123 HTML "blank.html" + /* @makedep: test_tlb.tlb */ 1 TYPELIB test_tlb.tlb

1 0

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

24 Dec '14

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

Jacek Caban : mshtml/tests: Added script element readyState and onreadystatechange tests.
by Alexandre Julliard 24 Dec '14

24 Dec '14

Module: wine Branch: master Commit: 0d0110970ec1a7fbc176d3bbe9e0e5dd1d870157 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d0110970ec1a7fbc176d3bbe… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 24 13:10:33 2014 +0100 mshtml/tests: Added script element readyState and onreadystatechange tests. --- dlls/mshtml/tests/events.html | 76 ++++++++++++++++++++++++++++++++++++++++-- dlls/mshtml/tests/externscr.js | 2 ++ 2 files changed, 76 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/events.html b/dlls/mshtml/tests/events.html index d4e2644..ae83ebe 100644 --- a/dlls/mshtml/tests/events.html +++ b/dlls/mshtml/tests/events.html @@ -7,6 +7,10 @@ function ok(b,m) { return external.ok(b, m); } +function broken(expr) { + return external.broken(expr); +} + function ondataavailable_test() { var evobj, div, b = false; @@ -114,8 +118,35 @@ function test_handler_this() { ok(calls == "div2,div2*,div1,div1*,body,body*", "calls = " + calls); } +function test_insert_script() { + var e = document.createElement("script"); + + extern_cnt = 0; + e.src = "externscr.js"; + + var readystatechange_log = ""; + e.onreadystatechange = function() { + readystatechange_log += "," + e.readyState; + ok(extern_cnt === 1, "extern_cnt = " + extern_cnt); + if(e.readyState === "complete") { + ok(readystatechange_log === "append,complete", "readystatechange_log = " + readystatechange_log); + external.reportSuccess(); + } + } + + document.body.appendChild(e); + ok(extern_cnt === 1, "extern_cnt = " + extern_cnt); + readystatechange_log = "append"; +} + window.onload = function() { try { + ok(inlscr_complete_called, "onreadystatechange not fired"); + ok(extern_res_script_rs === "eval,complete1,", + "extern_res_script_rs = " + extern_res_script_rs + " expected eval,complete1,"); + ok(extern_http_script_rs === "loading,loaded,complete,", + "extern_http_script_rs = " + extern_http_script_rs + " expected loading,loaded,complete,"); + ok(cnt == 1, "cnt=" + cnt + " exception during loading?"); ok(this === window, "this !== window"); @@ -127,11 +158,10 @@ window.onload = function() { test_scriptfor(); ondataavailable_test(); test_handler_this(); + test_insert_script(); }catch(e) { ok(false, "Got an exception: " + e.message); } - - external.reportSuccess(); } </script> <script> @@ -165,6 +195,48 @@ img.onload = function() { })(); </script> <script> +var inlscr_complete_called = false, extern_res_script_rs = "", extern_http_script_rs = ""; +var extern_cnt = 0; + +function expect_inlscr_complete() { + var elem = document.getElementById("inlscr"); + ok(elem.readyState === "complete" || broken(elem.readyState === "loading"), "expect_inlscr_complete: elem.readyState = " + elem.readyState); + if(elem.readyState === "complete") + inlscr_complete_called = true; +} + +function extern_res_script_readystatechange() { + var elem = document.getElementById("extscr"); + if(elem.readyState != "loading") + extern_res_script_rs += elem.readyState + extern_cnt + ","; + else + external.trace("Got loading readyState from external res script."); +} + +function http_script_readystatechange() { + var elem = document.getElementById("httpscr"); + extern_http_script_rs += elem.readyState + ","; +} + +function on_externscr() { + var elem = document.getElementById("extscr"); + ok(elem.readyState === "interactive" || broken(elem.readyState === "loading"), + "on_externscr: elem.readyState = " + elem.readyState); + extern_res_script_rs += "eval,"; +} + +</script> +<script id="inlscr" onreadystatechange="expect_inlscr_complete();"> +(function() { + ok(inlscr_complete_called === false || broken(inlscr_complete_called), "onreadystatechange fired too early"); + + var elem = document.getElementById("inlscr"); + ok(elem.readyState === "interactive", "inlscr: elem.readyState = " + elem.readyState); +})(); +</script> +<script id="extscr" onreadystatechange="extern_res_script_readystatechange()" src="externscr.js"></script> +<script id="httpscr" onreadystatechange="http_script_readystatechange()" src="https://test.winehq.org/tests/empty.js?123456"></script> +<script> document.body.appendChild(img); </script> </body> diff --git a/dlls/mshtml/tests/externscr.js b/dlls/mshtml/tests/externscr.js index 5861363..f6649ce 100644 --- a/dlls/mshtml/tests/externscr.js +++ b/dlls/mshtml/tests/externscr.js @@ -1 +1,3 @@ extern_cnt++; +if("on_externscr" in window) + on_externscr();

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

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: 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

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

← Newer
1
2
3
4
5
6
7
...
32
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2014