wine-commits March 2021

wine-commits@winehq.org

2 participants
1163 discussions

Jacek Caban : urlmon: Directly use otain_user_agent in ObtainUserAgentString.
by Alexandre Julliard 25 Mar '21

25 Mar '21

Module: wine Branch: master Commit: 8efbff575a8388fdee4d2b07cfe8620544ccb50e URL: https://source.winehq.org/git/wine.git/?a=commit;h=8efbff575a8388fdee4d2b07… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 25 19:34:08 2021 +0100 urlmon: Directly use otain_user_agent in ObtainUserAgentString. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/session.c | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/urlmon/session.c b/dlls/urlmon/session.c index 6084ae94b11..b74d56166d9 100644 --- a/dlls/urlmon/session.c +++ b/dlls/urlmon/session.c @@ -510,10 +510,18 @@ static size_t obtain_user_agent(WCHAR *ret, size_t size) OSVERSIONINFOW info = {sizeof(info)}; const WCHAR *os_type, *is_nt; DWORD res, idx=0; + size_t len = 0; BOOL is_wow; - size_t len; HKEY key; + EnterCriticalSection(&session_cs); + if(user_agent) { + len = wcslen(user_agent) + 1; + memcpy(ret, user_agent, min(size, len) * sizeof(WCHAR)); + } + LeaveCriticalSection(&session_cs); + if(len) return len; + GetVersionExW(&info); is_nt = info.dwPlatformId == VER_PLATFORM_WIN32_NT ? L"NT " : L""; @@ -685,33 +693,25 @@ HRESULT WINAPI UrlMkSetSessionOption(DWORD dwOption, LPVOID pBuffer, DWORD dwBuf /************************************************************************** * ObtainUserAgentString (URLMON.@) */ -HRESULT WINAPI ObtainUserAgentString(DWORD dwOption, LPSTR pcszUAOut, DWORD *cbSize) +HRESULT WINAPI ObtainUserAgentString(DWORD option, char *ret, DWORD *ret_size) { - DWORD size; - HRESULT hres = E_FAIL; + DWORD size, len; + WCHAR buf[1024]; + HRESULT hres = S_OK; - TRACE("(%d %p %p)\n", dwOption, pcszUAOut, cbSize); + TRACE("(%d %p %p)\n", option, ret, ret_size); - if(!pcszUAOut || !cbSize) + if(!ret || !ret_size) return E_INVALIDARG; - EnterCriticalSection(&session_cs); - - ensure_user_agent(); - if(user_agent) { - size = WideCharToMultiByte(CP_ACP, 0, user_agent, -1, NULL, 0, NULL, NULL); - - if(size <= *cbSize) { - WideCharToMultiByte(CP_ACP, 0, user_agent, -1, pcszUAOut, *cbSize, NULL, NULL); - hres = S_OK; - }else { - hres = E_OUTOFMEMORY; - } - - *cbSize = size; - } + len = obtain_user_agent(buf, ARRAY_SIZE(buf)); + size = WideCharToMultiByte(CP_ACP, 0, buf, len, NULL, 0, NULL, NULL); + if(size <= *ret_size) + WideCharToMultiByte(CP_ACP, 0, buf, len, ret, *ret_size+1, NULL, NULL); + else + hres = E_OUTOFMEMORY; - LeaveCriticalSection(&session_cs); + *ret_size = size; return hres; }

1 0

Jacek Caban : urlmon: Factor out obtain_user_agent.
by Alexandre Julliard 25 Mar '21

25 Mar '21

Module: wine Branch: master Commit: 16a7293f37a807cb8160053dbf2987964f2c8438 URL: https://source.winehq.org/git/wine.git/?a=commit;h=16a7293f37a807cb8160053d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 25 19:34:00 2021 +0100 urlmon: Factor out obtain_user_agent. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/session.c | 60 +++++++++++++++++++++++---------------------------- 1 file changed, 27 insertions(+), 33 deletions(-) diff --git a/dlls/urlmon/session.c b/dlls/urlmon/session.c index 764f52c5630..6084ae94b11 100644 --- a/dlls/urlmon/session.c +++ b/dlls/urlmon/session.c @@ -505,19 +505,15 @@ static BOOL get_url_encoding(HKEY root, DWORD *encoding) static LPWSTR user_agent; -static void ensure_useragent(void) +static size_t obtain_user_agent(WCHAR *ret, size_t size) { OSVERSIONINFOW info = {sizeof(info)}; const WCHAR *os_type, *is_nt; - WCHAR buf[512], *ret, *tmp; DWORD res, idx=0; - size_t len, size; BOOL is_wow; + size_t len; HKEY key; - if(user_agent) - return; - GetVersionExW(&info); is_nt = info.dwPlatformId == VER_PLATFORM_WIN32_NT ? L"NT " : L""; @@ -528,16 +524,9 @@ static void ensure_useragent(void) else os_type = L""; - swprintf(buf, ARRAY_SIZE(buf), L"Mozilla/4.0 (compatible; MSIE 7.0; Windows %s%d.%d; %sTrident/7.0", + swprintf(ret, size, L"Mozilla/4.0 (compatible; MSIE 7.0; Windows %s%d.%d; %sTrident/7.0", is_nt, info.dwMajorVersion, info.dwMinorVersion, os_type); - len = lstrlenW(buf); - - size = len+40; - ret = heap_alloc(size * sizeof(WCHAR)); - if(!ret) - return; - - memcpy(ret, buf, len*sizeof(WCHAR)); + len = lstrlenW(ret); res = RegOpenKeyW(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\" "Internet Settings\\5.0\\User Agent\\Post Platform", &key); @@ -545,23 +534,16 @@ static void ensure_useragent(void) DWORD value_len; while(1) { - value_len = ARRAY_SIZE(buf); - res = RegEnumValueW(key, idx, buf, &value_len, NULL, NULL, NULL, NULL); + if(idx) { + ret[len++] = ';'; + ret[len++] = ' '; + } + value_len = size - len - 2; + res = RegEnumValueW(key, idx, ret + len, &value_len, NULL, NULL, NULL, NULL); if(res != ERROR_SUCCESS) break; idx++; - if(len + value_len + 2 /* strlen("; ") */ + 1 /* trailing ')' */ >= size) { - tmp = heap_realloc(ret, (size*2+value_len)*sizeof(WCHAR)); - if(!tmp) - break; - ret = tmp; - size = size*2+value_len; - } - - ret[len++] = ';'; - ret[len++] = ' '; - memcpy(ret+len, buf, value_len*sizeof(WCHAR)); len += value_len; } @@ -570,16 +552,28 @@ static void ensure_useragent(void) ret[len++] = ')'; ret[len++] = 0; + TRACE("Using user agent %s\n", debugstr_w(ret)); + return len; +} + +static void ensure_user_agent(void) +{ + EnterCriticalSection(&session_cs); - user_agent = ret; - TRACE("Using user agent %s\n", debugstr_w(user_agent)); + if(!user_agent) { + WCHAR buf[1024]; + obtain_user_agent(buf, ARRAY_SIZE(buf)); + user_agent = heap_strdupW(buf); + } + + LeaveCriticalSection(&session_cs); } LPWSTR get_useragent(void) { LPWSTR ret; - ensure_useragent(); + ensure_user_agent(); EnterCriticalSection(&session_cs); ret = heap_strdupW(user_agent); @@ -606,7 +600,7 @@ HRESULT WINAPI UrlMkGetSessionOption(DWORD dwOption, LPVOID pBuffer, DWORD dwBuf EnterCriticalSection(&session_cs); - ensure_useragent(); + ensure_user_agent(); if(user_agent) { size = WideCharToMultiByte(CP_ACP, 0, user_agent, -1, NULL, 0, NULL, NULL); *pdwBufferLength = size; @@ -703,7 +697,7 @@ HRESULT WINAPI ObtainUserAgentString(DWORD dwOption, LPSTR pcszUAOut, DWORD *cbS EnterCriticalSection(&session_cs); - ensure_useragent(); + ensure_user_agent(); if(user_agent) { size = WideCharToMultiByte(CP_ACP, 0, user_agent, -1, NULL, 0, NULL, NULL);

1 0

Jacek Caban : urlmon: Make default user agent compatible with IE11.
by Alexandre Julliard 25 Mar '21

25 Mar '21

Module: wine Branch: master Commit: 266dc7e8e94f1602ec273b38351d6a32db468178 URL: https://source.winehq.org/git/wine.git/?a=commit;h=266dc7e8e94f1602ec273b38… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 25 19:33:51 2021 +0100 urlmon: Make default user agent compatible with IE11. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/session.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/urlmon/session.c b/dlls/urlmon/session.c index 5154bdb61f8..764f52c5630 100644 --- a/dlls/urlmon/session.c +++ b/dlls/urlmon/session.c @@ -528,7 +528,7 @@ static void ensure_useragent(void) else os_type = L""; - swprintf(buf, ARRAY_SIZE(buf), L"Mozilla/4.0 (compatible; MSIE 8.0; Windows %s%d.%d; %sTrident/5.0", + swprintf(buf, ARRAY_SIZE(buf), L"Mozilla/4.0 (compatible; MSIE 7.0; Windows %s%d.%d; %sTrident/7.0", is_nt, info.dwMajorVersion, info.dwMinorVersion, os_type); len = lstrlenW(buf);

1 0

Jacek Caban : mshtml: Block load event until dynamically created script elements that are part of the document are loaded.
by Alexandre Julliard 25 Mar '21

25 Mar '21

Module: wine Branch: master Commit: e5da8dbfb78c0f19b22af4f4406ad837b43b9f2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5da8dbfb78c0f19b22af4f4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 25 19:28:36 2021 +0100 mshtml: Block load event until dynamically created script elements that are part of the document are loaded. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/binding.h | 1 + dlls/mshtml/nsio.c | 18 ++++++++++++++++ dlls/mshtml/script.c | 42 ++++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/asyncscriptload.js | 16 ++++++++++++++ 4 files changed, 77 insertions(+) diff --git a/dlls/mshtml/binding.h b/dlls/mshtml/binding.h index 3d1ea6ecc8d..26a337fe470 100644 --- a/dlls/mshtml/binding.h +++ b/dlls/mshtml/binding.h @@ -154,6 +154,7 @@ HRESULT create_channelbsc(IMoniker*,const WCHAR*,BYTE*,DWORD,BOOL,nsChannelBSC** HRESULT channelbsc_load_stream(HTMLInnerWindow*,IMoniker*,IStream*) DECLSPEC_HIDDEN; void channelbsc_set_channel(nsChannelBSC*,nsChannel*,nsIStreamListener*,nsISupports*) DECLSPEC_HIDDEN; IUri *nsuri_get_uri(nsWineURI*) DECLSPEC_HIDDEN; +nsresult create_onload_blocker_request(nsIRequest**) DECLSPEC_HIDDEN; HRESULT read_stream(BSCallback*,IStream*,void*,DWORD,DWORD*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 1ffc6325725..ea8eae2007d 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -3980,3 +3980,21 @@ void release_nsio(void) nsio = NULL; } } + +nsresult create_onload_blocker_request(nsIRequest **ret) +{ + nsIChannel *channel; + nsACString spec; + nsresult nsres; + + nsACString_InitDepend(&spec, "about:wine-script-onload-blocker"); + nsres = nsIIOService_NewChannel(nsio, &spec, NULL, NULL, &channel); + nsACString_Finish(&spec); + if(NS_FAILED(nsres)) { + ERR("Failed to create channel: %08x\n", nsres); + return nsres; + } + + *ret = (nsIRequest *)channel; + return NS_OK; +} diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index c52c62f56d9..ec739c4777f 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -822,6 +822,8 @@ typedef struct { BSCallback bsc; HTMLScriptElement *script_elem; + nsILoadGroup *load_group; + nsIRequest *request; DWORD scheme; DWORD size; @@ -945,6 +947,13 @@ static void ScriptBSC_destroy(BSCallback *bsc) This->script_elem = NULL; } + if(This->request) { + ERR("Unfinished request\n"); + nsIRequest_Release(This->request); + } + if(This->load_group) + nsILoadGroup_Release(This->load_group); + heap_free(This->buf); heap_free(This); } @@ -957,9 +966,19 @@ static HRESULT ScriptBSC_init_bindinfo(BSCallback *bsc) static HRESULT ScriptBSC_start_binding(BSCallback *bsc) { ScriptBSC *This = impl_from_BSCallback(bsc); + nsresult nsres; This->script_elem->binding = &This->bsc; + if(This->load_group) { + nsres = create_onload_blocker_request(&This->request); + if(NS_SUCCEEDED(nsres)) { + nsres = nsILoadGroup_AddRequest(This->load_group, This->request, NULL); + if(NS_FAILED(nsres)) + ERR("AddRequest failed: %08x\n", nsres); + } + } + /* FIXME: We should find a better to decide if 'loading' state is supposed to be used by the protocol. */ if(This->scheme == URL_SCHEME_HTTPS || This->scheme == URL_SCHEME_HTTP) set_script_elem_readystate(This->script_elem, READYSTATE_LOADING); @@ -970,6 +989,7 @@ static HRESULT ScriptBSC_start_binding(BSCallback *bsc) static HRESULT ScriptBSC_stop_binding(BSCallback *bsc, HRESULT result) { ScriptBSC *This = impl_from_BSCallback(bsc); + nsresult nsres; if(SUCCEEDED(result) && !This->script_elem) result = E_UNEXPECTED; @@ -989,6 +1009,14 @@ static HRESULT ScriptBSC_stop_binding(BSCallback *bsc, HRESULT result) This->size = 0; } + if(This->request) { + nsres = nsILoadGroup_RemoveRequest(This->load_group, This->request, NULL, NS_OK); + if(NS_FAILED(nsres)) + ERR("RemoveRequest failed: %08x\n", nsres); + nsIRequest_Release(This->request); + This->request = NULL; + } + IHTMLScriptElement_Release(&This->script_elem->IHTMLScriptElement_iface); This->script_elem = NULL; return S_OK; @@ -1099,6 +1127,20 @@ HRESULT load_script(HTMLScriptElement *script_elem, const WCHAR *src, BOOL async IHTMLScriptElement_AddRef(&script_elem->IHTMLScriptElement_iface); bsc->script_elem = script_elem; + if(window->bscallback && window->bscallback->nschannel && + window->bscallback->nschannel->load_group) { + cpp_bool contains; + nsresult nsres; + + nsres = nsIDOMNode_Contains(script_elem->element.node.doc->node.nsnode, + script_elem->element.node.nsnode, &contains); + if(NS_SUCCEEDED(nsres) && contains) { + TRACE("script %p will block load event\n", script_elem); + bsc->load_group = window->bscallback->nschannel->load_group; + nsILoadGroup_AddRef(bsc->load_group); + } + } + hres = start_binding(window, &bsc->bsc, NULL); IBindStatusCallback_Release(&bsc->bsc.IBindStatusCallback_iface); diff --git a/dlls/mshtml/tests/asyncscriptload.js b/dlls/mshtml/tests/asyncscriptload.js index 6dc333afdf4..207df133e91 100644 --- a/dlls/mshtml/tests/asyncscriptload.js +++ b/dlls/mshtml/tests/asyncscriptload.js @@ -90,3 +90,19 @@ async_test("append_script", function() { elem.src = "jsstream.php?simple"; external.writeStream("simple", " "); }); + +function unexpected_load(e) { + ok(false, "onload event before executing script"); +} + +guard(function() { + var elem = document.createElement("script"); + document.head.appendChild(elem); + elem.src = "jsstream.php?blockload"; + + window.addEventListener("load", unexpected_load, true); + + setTimeout(guard(function() { + external.writeStream("blockload", "window.removeEventListener('load', unexpected_load, true);"); + }), 100); +})();

1 0

Jacek Caban : mshtml: Support onload handlers in script elements.
by Alexandre Julliard 25 Mar '21

25 Mar '21

Module: wine Branch: master Commit: 34dd3dd21762b69fed684f37c741768ec6b904ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=34dd3dd21762b69fed684f37… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 25 19:28:21 2021 +0100 mshtml: Support onload handlers in script elements. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/script.c | 24 +++++++++++++++++++----- dlls/mshtml/tests/documentmode.js | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 8f2c7f598ea..c52c62f56d9 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -723,12 +723,22 @@ static void dispatch_script_readystatechange_event(HTMLScriptElement *script) DOMEvent *event; HRESULT hres; - hres = create_document_event(script->element.node.doc, EVENTID_READYSTATECHANGE, &event); - if(FAILED(hres)) - return; + if(script->readystate != READYSTATE_LOADED || + dispex_compat_mode(&script->element.node.event_target.dispex) < COMPAT_MODE_IE10) { + hres = create_document_event(script->element.node.doc, EVENTID_READYSTATECHANGE, &event); + if(SUCCEEDED(hres)) { + dispatch_event(&script->element.node.event_target, event); + IDOMEvent_Release(&event->IDOMEvent_iface); + } + } - dispatch_event(&script->element.node.event_target, event); - IDOMEvent_Release(&event->IDOMEvent_iface); + if(script->readystate == READYSTATE_LOADED) { + hres = create_document_event(script->element.node.doc, EVENTID_LOAD, &event); + if(SUCCEEDED(hres)) { + dispatch_event(&script->element.node.event_target, event); + IDOMEvent_Release(&event->IDOMEvent_iface); + } + } } typedef struct { @@ -758,6 +768,10 @@ static void set_script_elem_readystate(HTMLScriptElement *script_elem, READYSTAT { script_elem->readystate = readystate; + if(readystate != READYSTATE_LOADED && + dispex_compat_mode(&script_elem->element.node.event_target.dispex) >= COMPAT_MODE_IE11) + return; + if(readystate != READYSTATE_INTERACTIVE) { if(!script_elem->element.node.doc->window->parser_callback_cnt) { fire_readystatechange_task_t *task; diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index d61d3658151..b079042afff 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -323,3 +323,40 @@ sync_test("conditional_comments", function() { test_version(7); test_version(8); }); + +var ready_states; + +async_test("script_load", function() { + var v = document.documentMode; + if(v < 9) { + next_test(); + return; + } + + var elem = document.createElement("script"); + ready_states = ""; + + elem.onreadystatechange = guard(function() { + ok(v < 11, "unexpected onreadystatechange call"); + ready_states += elem.readyState + ","; + }); + + elem.onload = guard(function() { + switch(v) { + case 9: + ok(ready_states === "loading,exec,loaded,", "ready_states = " + ready_states); + break; + case 10: + ok(ready_states === "loading,exec,", "ready_states = " + ready_states); + break; + case 11: + ok(ready_states === "exec,", "ready_states = " + ready_states); + break; + } + next_test(); + }); + + document.body.appendChild(elem); + elem.src = "jsstream.php?simple"; + external.writeStream("simple", "ready_states += 'exec,';"); +});

1 0

Jacek Caban : mshtml/tests: Use winetest.js helpers in asyncscriptload.js.
by Alexandre Julliard 25 Mar '21

25 Mar '21

Module: wine Branch: master Commit: da30fa03574816cbd69c636ab39452ee9fe2882f URL: https://source.winehq.org/git/wine.git/?a=commit;h=da30fa03574816cbd69c636a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 25 19:28:04 2021 +0100 mshtml/tests: Use winetest.js helpers in asyncscriptload.js. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/asyncscriptload.js | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/dlls/mshtml/tests/asyncscriptload.js b/dlls/mshtml/tests/asyncscriptload.js index a73e5e849e8..6dc333afdf4 100644 --- a/dlls/mshtml/tests/asyncscriptload.js +++ b/dlls/mshtml/tests/asyncscriptload.js @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +var tests = []; var head = document.getElementsByTagName("head")[0]; /* Dynamically created script element is downloaded as soon as src property is set, @@ -24,7 +25,7 @@ var detached_elem_executed = false; var detached_elem = document.createElement("script"); detached_elem.src = "jsstream.php?detached_script"; -function test_detached_script_elem() { +async_test("detached_script_elem", function() { var oncomplete_called = false; detached_elem.onreadystatechange = guard(function() { if(detached_elem.readyState == "complete") { @@ -44,7 +45,7 @@ function test_detached_script_elem() { }); external.writeStream("detached_script", 'detached_elem_executed = true;'); -} +}); /* Dynamically created script elements are evaluated as soon as they are loaded, no matter * how they are ordered in the tree. */ @@ -58,7 +59,7 @@ var attached_elem2 = document.createElement("script"); attached_elem2.src = "jsstream.php?attached_script2"; head.appendChild(attached_elem2); -function test_attached_script_elem() { +async_test("attached_script_elem", function() { attached_elem1.onreadystatechange = guard(function() { ok(attached_elem1.readyState == "loaded", "attached_elem1.readyState = " + attached_elem2.readyState); ok(attached_elem1_executed, "attached element 1 not executed before readyState complete"); @@ -73,9 +74,9 @@ function test_attached_script_elem() { }); external.writeStream("attached_script2", 'attached_elem2_executed = true;'); -} +}); -function test_dynamic_element() { +async_test("append_script", function() { var elem = document.createElement("script"); var ready_states = ""; @@ -88,10 +89,4 @@ function test_dynamic_element() { document.body.appendChild(elem); elem.src = "jsstream.php?simple"; external.writeStream("simple", " "); -} - -var tests = [ - test_detached_script_elem, - test_attached_script_elem, - test_dynamic_element -]; +});

1 0

Nikolay Sivov : rtworkq: Partially implement shared queues.
by Alexandre Julliard 25 Mar '21

25 Mar '21

Module: wine Branch: master Commit: d1d1e3f56ffa1beab271fcd5b2e4c7a18294a772 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1d1e3f56ffa1beab271fcd5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 25 19:06:19 2021 +0300 rtworkq: Partially implement shared queues. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mfplat.spec | 1 + dlls/mfplat/tests/mfplat.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/rtworkq/queue.c | 34 ++++++++++++++++++++++++++++++++-- include/mfapi.h | 1 + 4 files changed, 80 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index 7d014e334c8..cbda9404aa9 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -132,6 +132,7 @@ @ stub MFJoinIoPort @ stdcall MFJoinWorkQueue(long long ptr) rtworkq.RtwqJoinWorkQueue @ stdcall MFLockPlatform() rtworkq.RtwqLockPlatform +@ stdcall MFLockSharedWorkQueue(wstr long ptr ptr) rtworkq.RtwqLockSharedWorkQueue @ stdcall MFLockWorkQueue(long) rtworkq.RtwqLockWorkQueue @ stdcall MFMapDX9FormatToDXGIFormat(long) @ stdcall MFMapDXGIFormatToDX9Format(long) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 18361d4d721..1b24dce2fe0 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -240,6 +240,7 @@ static HRESULT (WINAPI *pMFCreateVideoSampleAllocatorEx)(REFIID riid, void **all static HRESULT (WINAPI *pMFCreateDXGISurfaceBuffer)(REFIID riid, IUnknown *surface, UINT subresource, BOOL bottomup, IMFMediaBuffer **buffer); static HRESULT (WINAPI *pMFCreateVideoMediaTypeFromSubtype)(const GUID *subtype, IMFVideoMediaType **media_type); +static HRESULT (WINAPI *pMFLockSharedWorkQueue)(const WCHAR *name, LONG base_priority, DWORD *taskid, DWORD *queue); static HWND create_window(void) { @@ -907,6 +908,7 @@ static void init_functions(void) X(MFCreateVideoSampleAllocatorEx); X(MFGetPlaneSize); X(MFGetStrideForBitmapInfoHeader); + X(MFLockSharedWorkQueue); X(MFMapDX9FormatToDXGIFormat); X(MFMapDXGIFormatToDX9Format); X(MFPutWaitingWorkItem); @@ -7016,6 +7018,49 @@ done: DestroyWindow(window); } +static void test_MFLockSharedWorkQueue(void) +{ + DWORD taskid, queue, queue2; + HRESULT hr; + + if (!pMFLockSharedWorkQueue) + { + win_skip("MFLockSharedWorkQueue() is not available.\n"); + return; + } + + hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); + ok(hr == S_OK, "Failed to start up, hr %#x.\n", hr); + + hr = pMFLockSharedWorkQueue(NULL, 0, &taskid, &queue); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = pMFLockSharedWorkQueue(NULL, 0, NULL, &queue); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + taskid = 0; + hr = pMFLockSharedWorkQueue(L"", 0, &taskid, &queue); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + queue = 0; + hr = pMFLockSharedWorkQueue(L"", 0, NULL, &queue); + ok(queue & MFASYNC_CALLBACK_QUEUE_PRIVATE_MASK, "Unexpected queue id.\n"); + + queue2 = 0; + hr = pMFLockSharedWorkQueue(L"", 0, NULL, &queue2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(queue == queue2, "Unexpected queue %#x.\n", queue2); + + hr = MFUnlockWorkQueue(queue2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = MFUnlockWorkQueue(queue); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = MFShutdown(); + ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); +} + START_TEST(mfplat) { char **argv; @@ -7044,6 +7089,7 @@ START_TEST(mfplat) test_source_resolver(); test_MFCreateAsyncResult(); test_allocate_queue(); + test_MFLockSharedWorkQueue(); test_MFCopyImage(); test_MFCreateCollection(); test_MFHeapAlloc(); diff --git a/dlls/rtworkq/queue.c b/dlls/rtworkq/queue.c index f4e9f10d3f0..6817b06f284 100644 --- a/dlls/rtworkq/queue.c +++ b/dlls/rtworkq/queue.c @@ -58,6 +58,7 @@ static struct queue_handle user_queues[MAX_USER_QUEUE_HANDLES]; static struct queue_handle *next_free_user_queue; static struct queue_handle *next_unused_user_queue = user_queues; static WORD queue_generation; +static DWORD shared_mt_queue; static CRITICAL_SECTION queues_section; static CRITICAL_SECTION_DEBUG queues_critsect_debug = @@ -217,6 +218,7 @@ static HRESULT unlock_user_queue(DWORD queue) { if (--entry->refcount == 0) { + if (shared_mt_queue == queue) shared_mt_queue = 0; shutdown_queue((struct queue *)entry->obj); heap_free(entry->obj); entry->obj = next_free_user_queue; @@ -1438,9 +1440,37 @@ HRESULT WINAPI RtwqSetLongRunning(DWORD queue_id, BOOL enable) HRESULT WINAPI RtwqLockSharedWorkQueue(const WCHAR *usageclass, LONG priority, DWORD *taskid, DWORD *queue) { - FIXME("%s, %d, %p, %p.\n", debugstr_w(usageclass), priority, taskid, queue); + struct queue_desc desc; + HRESULT hr; + + TRACE("%s, %d, %p, %p.\n", debugstr_w(usageclass), priority, taskid, queue); + + if (!usageclass) + return E_POINTER; + + if (!*usageclass && taskid) + return E_INVALIDARG; + + if (*usageclass) + FIXME("Class name is ignored.\n"); + + EnterCriticalSection(&queues_section); - return RtwqAllocateWorkQueue(RTWQ_STANDARD_WORKQUEUE, queue); + if (shared_mt_queue) + hr = lock_user_queue(shared_mt_queue); + else + { + desc.queue_type = RTWQ_MULTITHREADED_WORKQUEUE; + desc.ops = &pool_queue_ops; + desc.target_queue = 0; + hr = alloc_user_queue(&desc, &shared_mt_queue); + } + + *queue = shared_mt_queue; + + LeaveCriticalSection(&queues_section); + + return hr; } HRESULT WINAPI RtwqSetDeadline(DWORD queue_id, LONGLONG deadline, HANDLE *request) diff --git a/include/mfapi.h b/include/mfapi.h index d6969984da7..c1cf766c005 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -553,6 +553,7 @@ HRESULT WINAPI MFInitAttributesFromBlob(IMFAttributes *attributes, const UINT8 * HRESULT WINAPI MFInitMediaTypeFromWaveFormatEx(IMFMediaType *mediatype, const WAVEFORMATEX *format, UINT32 size); HRESULT WINAPI MFInvokeCallback(IMFAsyncResult *result); HRESULT WINAPI MFLockPlatform(void); +HRESULT WINAPI MFLockSharedWorkQueue(const WCHAR *name, LONG base_priority, DWORD *taskid, DWORD *queue); DXGI_FORMAT WINAPI MFMapDX9FormatToDXGIFormat(DWORD format); DWORD WINAPI MFMapDXGIFormatToDX9Format(DXGI_FORMAT dxgi_format); HRESULT WINAPI MFPutWaitingWorkItem(HANDLE event, LONG priority, IMFAsyncResult *result, MFWORKITEM_KEY *key);

1 0

Henri Verbeet : wined3d: Implement wined3d_swapchain_set_gamma_ramp() on top of wined3d_output_set_gamma_ramp().
by Alexandre Julliard 25 Mar '21

25 Mar '21

Module: wine Branch: master Commit: bd9aca2cc8066c4a2abeeda458ce43c044f4c5ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd9aca2cc8066c4a2abeeda4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 25 16:46:44 2021 +0100 wined3d: Implement wined3d_swapchain_set_gamma_ramp() on top of wined3d_output_set_gamma_ramp(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 13 +++++++++++++ dlls/wined3d/swapchain.c | 24 ++++++++++++++---------- dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 29 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 95fa744d64d..7287b333f97 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1509,6 +1509,19 @@ HRESULT CDECL wined3d_output_set_gamma_ramp(struct wined3d_output *output, const return WINED3D_OK; } +HRESULT wined3d_output_get_gamma_ramp(struct wined3d_output *output, struct wined3d_gamma_ramp *ramp) +{ + HDC dc; + + TRACE("output %p, ramp %p.\n", output, ramp); + + dc = CreateDCW(output->device_name, NULL, NULL, NULL); + GetDeviceGammaRamp(dc, ramp); + DeleteDC(dc); + + return WINED3D_OK; +} + HRESULT CDECL wined3d_adapter_get_identifier(const struct wined3d_adapter *adapter, DWORD flags, struct wined3d_adapter_identifier *identifier) { diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 95db586c697..b575baa19ef 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -363,18 +363,20 @@ void CDECL wined3d_swapchain_get_desc(const struct wined3d_swapchain *swapchain, HRESULT CDECL wined3d_swapchain_set_gamma_ramp(const struct wined3d_swapchain *swapchain, DWORD flags, const struct wined3d_gamma_ramp *ramp) { - HDC dc; + struct wined3d_output *output; TRACE("swapchain %p, flags %#x, ramp %p.\n", swapchain, flags, ramp); if (flags) FIXME("Ignoring flags %#x.\n", flags); - dc = GetDCEx(swapchain->state.device_window, 0, DCX_USESTYLE | DCX_CACHE); - SetDeviceGammaRamp(dc, (void *)ramp); - ReleaseDC(swapchain->state.device_window, dc); + if (!(output = wined3d_swapchain_get_output(swapchain))) + { + ERR("Failed to get output from swapchain %p.\n", swapchain); + return E_FAIL; + } - return WINED3D_OK; + return wined3d_output_set_gamma_ramp(output, ramp); } void CDECL wined3d_swapchain_set_palette(struct wined3d_swapchain *swapchain, struct wined3d_palette *palette) @@ -389,15 +391,17 @@ void CDECL wined3d_swapchain_set_palette(struct wined3d_swapchain *swapchain, st HRESULT CDECL wined3d_swapchain_get_gamma_ramp(const struct wined3d_swapchain *swapchain, struct wined3d_gamma_ramp *ramp) { - HDC dc; + struct wined3d_output *output; TRACE("swapchain %p, ramp %p.\n", swapchain, ramp); - dc = GetDCEx(swapchain->state.device_window, 0, DCX_USESTYLE | DCX_CACHE); - GetDeviceGammaRamp(dc, ramp); - ReleaseDC(swapchain->state.device_window, dc); + if (!(output = wined3d_swapchain_get_output(swapchain))) + { + ERR("Failed to get output from swapchain %p.\n", swapchain); + return E_FAIL; + } - return WINED3D_OK; + return wined3d_output_get_gamma_ramp(output, ramp); } /* The is a fallback for cases where we e.g. can't create a GL context or diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c15765af0e8..4c15f6ab178 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3367,6 +3367,8 @@ struct wined3d_output D3DDDI_VIDEO_PRESENT_SOURCE_ID vidpn_source_id; }; +HRESULT wined3d_output_get_gamma_ramp(struct wined3d_output *output, struct wined3d_gamma_ramp *ramp) DECLSPEC_HIDDEN; + /* The adapter structure */ struct wined3d_adapter {

1 0

Henri Verbeet : dxgi: Implement dxgi_output_SetGammaControl().
by Alexandre Julliard 25 Mar '21

25 Mar '21

Module: wine Branch: master Commit: e27ea1e03af5adcb63134c2bd7fc15ffe6a9d2af URL: https://source.winehq.org/git/wine.git/?a=commit;h=e27ea1e03af5adcb63134c2b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 25 16:46:43 2021 +0100 dxgi: Implement dxgi_output_SetGammaControl(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/output.c | 37 ++++++++++++++++++++++++++++++++++++- dlls/wined3d/directx.c | 13 +++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 1 + 4 files changed, 51 insertions(+), 1 deletion(-) diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index 3ffa5d16408..632b44526c1 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -420,10 +420,45 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_GetGammaControlCapabilities(IDXGIOu return S_OK; } +static WORD uint16_from_float(float f) +{ + f *= 65535.0f; + if (f < 0.0f) + f = 0.0f; + else if (f > 65535.0f) + f = 65535.0f; + + return f + 0.5f; +} + static HRESULT STDMETHODCALLTYPE dxgi_output_SetGammaControl(IDXGIOutput6 *iface, const DXGI_GAMMA_CONTROL *gamma_control) { - FIXME("iface %p, gamma_control %p stub!\n", iface, gamma_control); + struct dxgi_output *output = impl_from_IDXGIOutput6(iface); + struct wined3d_gamma_ramp ramp; + const DXGI_RGB *p; + unsigned int i; + + TRACE("iface %p, gamma_control %p.\n", iface, gamma_control); + + if (gamma_control->Scale.Red != 1.0f || gamma_control->Scale.Green != 1.0f || gamma_control->Scale.Blue != 1.0f) + FIXME("Ignoring unhandled scale {%.8e, %.8e, %.8e}.\n", gamma_control->Scale.Red, + gamma_control->Scale.Green, gamma_control->Scale.Blue); + if (gamma_control->Offset.Red != 0.0f || gamma_control->Offset.Green != 0.0f || gamma_control->Offset.Blue != 0.0f) + FIXME("Ignoring unhandled offset {%.8e, %.8e, %.8e}.\n", gamma_control->Offset.Red, + gamma_control->Offset.Green, gamma_control->Offset.Blue); + + for (i = 0; i < 256; ++i) + { + p = &gamma_control->GammaCurve[i]; + ramp.red[i] = uint16_from_float(p->Red); + ramp.green[i] = uint16_from_float(p->Green); + ramp.blue[i] = uint16_from_float(p->Blue); + } + + wined3d_mutex_lock(); + wined3d_output_set_gamma_ramp(output->wined3d_output, &ramp); + wined3d_mutex_unlock(); return S_OK; } diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c673f61e429..95fa744d64d 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1496,6 +1496,19 @@ HRESULT CDECL wined3d_output_set_display_mode(struct wined3d_output *output, return WINED3D_OK; } +HRESULT CDECL wined3d_output_set_gamma_ramp(struct wined3d_output *output, const struct wined3d_gamma_ramp *ramp) +{ + HDC dc; + + TRACE("output %p, ramp %p.\n", output, ramp); + + dc = CreateDCW(output->device_name, NULL, NULL, NULL); + SetDeviceGammaRamp(dc, (void *)ramp); + DeleteDC(dc); + + return WINED3D_OK; +} + HRESULT CDECL wined3d_adapter_get_identifier(const struct wined3d_adapter *adapter, DWORD flags, struct wined3d_adapter_identifier *identifier) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 4f0d1e8e0b3..fb9973354a0 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -192,6 +192,7 @@ @ cdecl wined3d_output_get_raster_status(ptr ptr) @ cdecl wined3d_output_release_ownership(ptr) @ cdecl wined3d_output_set_display_mode(ptr ptr) +@ cdecl wined3d_output_set_gamma_ramp(ptr ptr) @ cdecl wined3d_output_take_ownership(ptr long) @ cdecl wined3d_palette_create(ptr long long ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index e8f5e824bc3..1f8b4a89648 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2606,6 +2606,7 @@ HRESULT __cdecl wined3d_output_get_raster_status(const struct wined3d_output *ou void __cdecl wined3d_output_release_ownership(const struct wined3d_output *output); HRESULT __cdecl wined3d_output_set_display_mode(struct wined3d_output *output, const struct wined3d_display_mode *mode); +HRESULT __cdecl wined3d_output_set_gamma_ramp(struct wined3d_output *output, const struct wined3d_gamma_ramp *ramp); HRESULT __cdecl wined3d_output_take_ownership(const struct wined3d_output *output, BOOL exclusive); HRESULT __cdecl wined3d_palette_create(struct wined3d_device *device, DWORD flags,

1 0

Henri Verbeet : wined3d: Invalidate sRGB write state in wined3d_cs_exec_set_rendertarget_view() if needed.
by Alexandre Julliard 25 Mar '21

25 Mar '21

Module: wine Branch: master Commit: b1c84499544354e75505cc366352c72c010d735e URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1c84499544354e75505cc36… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 25 16:46:42 2021 +0100 wined3d: Invalidate sRGB write state in wined3d_cs_exec_set_rendertarget_view() if needed. Instead of in wined3d_context_gl_setup_target(). If the render-target view uses an sRGB format, but the underlying resource has a typeless format, we'd potentially miss an invalidation in wined3d_context_gl_setup_target() where we only have access to the underlying resource. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 2 +- dlls/wined3d/context_gl.c | 5 ----- dlls/wined3d/cs.c | 18 +++++++++++++++--- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 3e8cbfb18b4..38a0afc3fee 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -15184,7 +15184,7 @@ static void test_swapchain_views(void) ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); draw_color_quad(&test_context, &color); - todo_wine check_texture_color(test_context.backbuffer, 0xffbc957c, 1); + check_texture_color(test_context.backbuffer, 0xffbc957c, 1); srv_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM_SRGB; srv_desc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE2D; diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index fa61b70f525..123214afd5d 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -4122,11 +4122,6 @@ static void wined3d_context_gl_setup_target(struct wined3d_context_gl *context_g if ((old->alpha_size && !new->alpha_size) || (!old->alpha_size && new->alpha_size) || !(texture->resource.format_flags & WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING)) context_invalidate_state(&context_gl->c, STATE_BLEND); - - /* Update sRGB writing when switching between formats that do/do not support sRGB writing */ - if ((context_gl->c.current_rt.texture->resource.format_flags & WINED3DFMT_FLAG_SRGB_WRITE) - != (texture->resource.format_flags & WINED3DFMT_FLAG_SRGB_WRITE)) - context_invalidate_state(&context_gl->c, STATE_RENDER(WINED3D_RS_SRGBWRITEENABLE)); } /* When switching away from an offscreen render target, and we're not diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index c9bc9443e5d..6bf9827d3e1 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1191,17 +1191,29 @@ void wined3d_device_context_emit_set_scissor_rects(struct wined3d_device_context static void wined3d_cs_exec_set_rendertarget_view(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_set_rendertarget_view *op = data; - BOOL prev_alpha_swizzle, curr_alpha_swizzle; + bool prev_alpha_swizzle, curr_alpha_swizzle; struct wined3d_rendertarget_view *prev; + bool prev_srgb_write, curr_srgb_write; + struct wined3d_device *device; + device = cs->c.device; prev = cs->state.fb.render_targets[op->view_idx]; cs->state.fb.render_targets[op->view_idx] = op->view; - device_invalidate_state(cs->c.device, STATE_FRAMEBUFFER); + device_invalidate_state(device, STATE_FRAMEBUFFER); prev_alpha_swizzle = prev && prev->format->id == WINED3DFMT_A8_UNORM; curr_alpha_swizzle = op->view && op->view->format->id == WINED3DFMT_A8_UNORM; if (prev_alpha_swizzle != curr_alpha_swizzle) - device_invalidate_state(cs->c.device, STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL)); + device_invalidate_state(device, STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL)); + + if (!(device->adapter->d3d_info.wined3d_creation_flags & WINED3D_SRGB_READ_WRITE_CONTROL) + || cs->state.render_states[WINED3D_RS_SRGBWRITEENABLE]) + { + prev_srgb_write = prev && prev->format_flags & WINED3DFMT_FLAG_SRGB_WRITE; + curr_srgb_write = op->view && op->view->format_flags & WINED3DFMT_FLAG_SRGB_WRITE; + if (prev_srgb_write != curr_srgb_write) + device_invalidate_state(device, STATE_RENDER(WINED3D_RS_SRGBWRITEENABLE)); + } } void wined3d_device_context_emit_set_rendertarget_view(struct wined3d_device_context *context, unsigned int view_idx,

1 0

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 March 2021