March 2021 - Wine-commits - list.winehq.org

Jacek Caban : mshtml: Report user agent matching current compat mode.
by Alexandre Julliard 26 Mar '21

26 Mar '21

Module: wine Branch: master Commit: bbb46e819d16ab18586e1d8745d61ce190c0c026 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bbb46e819d16ab18586e1d87… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 26 16:33:52 2021 +0100 mshtml: Report user agent matching current compat mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/omnavigator.c | 25 +++++++++++++++++++++++-- dlls/mshtml/tests/documentmode.js | 12 ++++++++++++ dlls/mshtml/tests/dom.c | 12 ++---------- 3 files changed, 37 insertions(+), 12 deletions(-) diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index e6ce680f08b..30333347e64 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -1157,6 +1157,27 @@ static HRESULT WINAPI OmNavigator_get_appName(IOmNavigator *iface, BSTR *p) return S_OK; } +static unsigned int get_ua_version(OmNavigator *navigator) +{ + switch(dispex_compat_mode(&navigator->dispex)) { + case COMPAT_MODE_QUIRKS: + return UAS_EXACTLEGACY | 7; + case COMPAT_MODE_IE5: + case COMPAT_MODE_IE7: + return 7; + case COMPAT_MODE_IE8: + return 8; + case COMPAT_MODE_IE9: + return 9; + case COMPAT_MODE_IE10: + return 10; + case COMPAT_MODE_IE11: + return 11; + } + assert(0); + return 0; +} + static HRESULT WINAPI OmNavigator_get_appVersion(IOmNavigator *iface, BSTR *p) { OmNavigator *This = impl_from_IOmNavigator(iface); @@ -1169,7 +1190,7 @@ static HRESULT WINAPI OmNavigator_get_appVersion(IOmNavigator *iface, BSTR *p) TRACE("(%p)->(%p)\n", This, p); size = sizeof(user_agent); - hres = ObtainUserAgentString(0, user_agent, &size); + hres = ObtainUserAgentString(get_ua_version(This), user_agent, &size); if(FAILED(hres)) return hres; @@ -1197,7 +1218,7 @@ static HRESULT WINAPI OmNavigator_get_userAgent(IOmNavigator *iface, BSTR *p) TRACE("(%p)->(%p)\n", This, p); size = sizeof(user_agent); - hres = ObtainUserAgentString(0, user_agent, &size); + hres = ObtainUserAgentString(get_ua_version(This), user_agent, &size); if(FAILED(hres)) return hres; diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index b079042afff..76c9b828805 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -360,3 +360,15 @@ async_test("script_load", function() { elem.src = "jsstream.php?simple"; external.writeStream("simple", "ready_states += 'exec,';"); }); + +sync_test("navigator", function() { + var v = document.documentMode, re; + var app = navigator.appVersion; + ok(navigator.userAgent === "Mozilla/" + app, + "userAgent = " + navigator.userAgent + " appVersion = " + app); + + re = v < 11 + ? "^" + (v < 9 ? "4" : "5") + "\\.0 \$compatible; MSIE " + (v < 7 ? 7 : v) + "\\.0; Windows NT [^\$]*\\)$" + : "^5.0 \$Windows NT [0-9].[0-9]; .*Trident/[678]\\.0.*rv:11.0\$ like Gecko$"; + ok(new RegExp(re).test(app), "appVersion = " + app); +}); diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 3c9deec7d0b..de33e6c73a5 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -6383,25 +6383,17 @@ static void test_navigator(IHTMLDocument2 *doc) bstr = NULL; hres = IOmNavigator_get_userAgent(navigator, &bstr); ok(hres == S_OK, "get_userAgent failed: %08x\n", hres); + todo_wine ok(!lstrcmpW(bstr, buf), "userAgent returned %s, expected \"%s\"\n", wine_dbgstr_w(bstr), wine_dbgstr_w(buf)); SysFreeString(bstr); - if(!wcsncmp(buf, L"Mozilla/", 8)) { - bstr = NULL; - hres = IOmNavigator_get_appVersion(navigator, &bstr); - ok(hres == S_OK, "get_appVersion failed: %08x\n", hres); - ok(!lstrcmpW(bstr, buf+8), "appVersion returned %s, expected \"%s\"\n", wine_dbgstr_w(bstr), wine_dbgstr_w(buf+8)); - SysFreeString(bstr); - }else { - skip("nonstandard user agent\n"); - } - hres = UrlMkSetSessionOption(URLMON_OPTION_USERAGENT, ua, sizeof(ua), 0); ok(hres == S_OK, "UrlMkSetSessionOption failed: %08x\n", hres); MultiByteToWideChar(CP_ACP, 0, ua, -1, buf, ARRAY_SIZE(buf)); hres = IOmNavigator_get_appVersion(navigator, &bstr); ok(hres == S_OK, "get_appVersion failed: %08x\n", hres); + todo_wine ok(!lstrcmpW(bstr, buf+8), "appVersion returned %s, expected \"%s\"\n", wine_dbgstr_w(bstr), wine_dbgstr_w(buf+8)); SysFreeString(bstr);

1 0

Jacek Caban : mshtml: Use "Netscape" as appName in IE11 compat mode.
by Alexandre Julliard 26 Mar '21

26 Mar '21

Module: wine Branch: master Commit: 53cc70caa494fe3dea1d650865411432153a0aa8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=53cc70caa494fe3dea1d6508… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 26 16:34:01 2021 +0100 mshtml: Use "Netscape" as appName in IE11 compat mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/omnavigator.c | 3 ++- dlls/mshtml/tests/documentmode.js | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index 30333347e64..a98f6293d29 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -1150,7 +1150,8 @@ static HRESULT WINAPI OmNavigator_get_appName(IOmNavigator *iface, BSTR *p) TRACE("(%p)->(%p)\n", This, p); - *p = SysAllocString(L"Microsoft Internet Explorer"); + *p = SysAllocString(dispex_compat_mode(&This->dispex) == COMPAT_MODE_IE11 + ? L"Netscape" : L"Microsoft Internet Explorer"); if(!*p) return E_OUTOFMEMORY; diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 76c9b828805..c97e1b4f276 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -371,4 +371,8 @@ sync_test("navigator", function() { ? "^" + (v < 9 ? "4" : "5") + "\\.0 \$compatible; MSIE " + (v < 7 ? 7 : v) + "\\.0; Windows NT [^\$]*\\)$" : "^5.0 \$Windows NT [0-9].[0-9]; .*Trident/[678]\\.0.*rv:11.0\$ like Gecko$"; ok(new RegExp(re).test(app), "appVersion = " + app); + + ok(navigator.appCodeName === "Mozilla", "appCodeName = " + navigator.appCodeName); + ok(navigator.appName === (v < 11 ? "Microsoft Internet Explorer" : "Netscape"), + "appName = " + navigator.appName); });

1 0

Jacek Caban : mshtml: Fix navigator.toString() in IE9+ compat modes.
by Alexandre Julliard 26 Mar '21

26 Mar '21

Module: wine Branch: master Commit: 4238faa0a01548c22451c32c0fa892ce36277d76 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4238faa0a01548c22451c32c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 26 16:34:06 2021 +0100 mshtml: Fix navigator.toString() in IE9+ compat modes. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/omnavigator.c | 3 ++- dlls/mshtml/tests/documentmode.js | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index a98f6293d29..94616a7db78 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -1315,7 +1315,8 @@ static HRESULT WINAPI OmNavigator_toString(IOmNavigator *iface, BSTR *String) if(!String) return E_INVALIDARG; - *String = SysAllocString(L"[object]"); + *String = SysAllocString(dispex_compat_mode(&This->dispex) < COMPAT_MODE_IE9 + ? L"[object]" : L"[object Navigator]"); return *String ? S_OK : E_OUTOFMEMORY; } diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index c97e1b4f276..ec23ab8d494 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -375,4 +375,6 @@ sync_test("navigator", function() { ok(navigator.appCodeName === "Mozilla", "appCodeName = " + navigator.appCodeName); ok(navigator.appName === (v < 11 ? "Microsoft Internet Explorer" : "Netscape"), "appName = " + navigator.appName); + ok(navigator.toString() === (v < 9 ? "[object]" : "[object Navigator]"), + "navigator.toString() = " + navigator.toString()); });

1 0

Francois Gouget : atl80/tests: Request an older version of atl80 for compatibility.
by Alexandre Julliard 26 Mar '21

26 Mar '21

Module: wine Branch: master Commit: ac0c8e805df689e9498e5171f25823dddb7be967 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac0c8e805df689e9498e5171… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Mar 26 15:05:49 2021 +0100 atl80/tests: Request an older version of atl80 for compatibility. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/atl80/tests/atl80.manifest | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/atl80/tests/atl80.manifest b/dlls/atl80/tests/atl80.manifest index 712793fcb1b..fa833e28927 100644 --- a/dlls/atl80/tests/atl80.manifest +++ b/dlls/atl80/tests/atl80.manifest @@ -12,7 +12,7 @@ <assemblyIdentity type="win32" name="microsoft.vc80.atl" - version="8.0.50727.4053" + version="8.0.50727.42" processorArchitecture="*" publicKeyToken="1fc8b3b9a1e18e3b" language="*"

1 0

Jacek Caban : ieframe/tests: Allow non-zero initial session counter value.
by Alexandre Julliard 26 Mar '21

26 Mar '21

Module: wine Branch: master Commit: 5fac8fb5fd97919840bcdc2671d4be532007bf4d URL: https://source.winehq.org/git/wine.git/?a=commit;h=5fac8fb5fd97919840bcdc26… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 26 16:53:42 2021 +0100 ieframe/tests: Allow non-zero initial session counter value. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/tests/webbrowser.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 903c1062b6c..ab0345b79b5 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -4419,25 +4419,22 @@ static void test_SetAdvise(void) static void test_SetQueryNetSessionCount(void) { - LONG count; + LONG count, init_count; - count = pSetQueryNetSessionCount(SESSION_QUERY); - ok(count == 0, "count = %d\n", count); + init_count = pSetQueryNetSessionCount(SESSION_QUERY); + trace("init_count %d\n", init_count); count = pSetQueryNetSessionCount(SESSION_INCREMENT); - ok(count == 1, "count = %d\n", count); + ok(count == init_count + 1, "count = %d\n", count); count = pSetQueryNetSessionCount(SESSION_QUERY); - ok(count == 1, "count = %d\n", count); - - count = pSetQueryNetSessionCount(0xdeadbeef); - ok(count == 0, "count = %d\n", count); + ok(count == init_count + 1, "count = %d\n", count); count = pSetQueryNetSessionCount(SESSION_DECREMENT); - ok(count == 0, "count = %d\n", count); + ok(count == init_count, "count = %d\n", count); count = pSetQueryNetSessionCount(SESSION_QUERY); - ok(count == 0, "count = %d\n", count); + ok(count == init_count, "count = %d\n", count); } static HRESULT WINAPI outer_QueryInterface(IUnknown *iface, REFIID riid, void **ppv)

1 0

Zebediah Figura : wined3d: Introduce wined3d_device_context_set_stream_output().
by Alexandre Julliard 26 Mar '21

26 Mar '21

Module: wine Branch: master Commit: 5df6103ce0e6aaf50db67ea4b7d27fc18d4e6bf0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5df6103ce0e6aaf50db67ea4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 25 22:09:50 2021 -0500 wined3d: Introduce wined3d_device_context_set_stream_output(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 46 +++++++++++++++++++++++++++------------------- dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 3 files changed, 30 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 9766dfada2d..4041a7c0d7f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1224,27 +1224,9 @@ UINT CDECL wined3d_device_get_available_texture_mem(const struct wined3d_device void CDECL wined3d_device_set_stream_output(struct wined3d_device *device, UINT idx, struct wined3d_buffer *buffer, UINT offset) { - struct wined3d_stream_output *stream; - struct wined3d_buffer *prev_buffer; - TRACE("device %p, idx %u, buffer %p, offset %u.\n", device, idx, buffer, offset); - if (idx >= WINED3D_MAX_STREAM_OUTPUT_BUFFERS) - { - WARN("Invalid stream output %u.\n", idx); - return; - } - - stream = &device->cs->c.state->stream_output[idx]; - prev_buffer = stream->buffer; - - if (buffer) - wined3d_buffer_incref(buffer); - stream->buffer = buffer; - stream->offset = offset; - wined3d_device_context_emit_set_stream_output(&device->cs->c, idx, buffer, offset); - if (prev_buffer) - wined3d_buffer_decref(prev_buffer); + wined3d_device_context_set_stream_output(&device->cs->c, idx, buffer, offset); } struct wined3d_buffer * CDECL wined3d_device_get_stream_output(struct wined3d_device *device, @@ -2389,6 +2371,32 @@ void CDECL wined3d_device_context_set_vertex_declaration(struct wined3d_device_c wined3d_vertex_declaration_decref(prev); } +void CDECL wined3d_device_context_set_stream_output(struct wined3d_device_context *context, unsigned int idx, + struct wined3d_buffer *buffer, unsigned int offset) +{ + struct wined3d_stream_output *stream; + struct wined3d_buffer *prev_buffer; + + TRACE("context %p, idx %u, buffer %p, offset %u.\n", context, idx, buffer, offset); + + if (idx >= WINED3D_MAX_STREAM_OUTPUT_BUFFERS) + { + WARN("Invalid stream output %u.\n", idx); + return; + } + + stream = &context->state->stream_output[idx]; + prev_buffer = stream->buffer; + + if (buffer) + wined3d_buffer_incref(buffer); + stream->buffer = buffer; + stream->offset = offset; + wined3d_device_context_emit_set_stream_output(context, idx, buffer, offset); + if (prev_buffer) + wined3d_buffer_decref(prev_buffer); +} + void CDECL wined3d_device_set_vertex_shader(struct wined3d_device *device, struct wined3d_shader *shader) { TRACE("device %p, shader %p.\n", device, shader); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index fb9973354a0..289716d1ae2 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -178,6 +178,7 @@ @ cdecl wined3d_device_context_set_scissor_rects(ptr long ptr) @ cdecl wined3d_device_context_set_shader(ptr long ptr) @ cdecl wined3d_device_context_set_shader_resource_view(ptr long long ptr) +@ cdecl wined3d_device_context_set_stream_output(ptr long ptr long) @ cdecl wined3d_device_context_set_stream_source(ptr long ptr long long) @ cdecl wined3d_device_context_set_unordered_access_view(ptr long long ptr long) @ cdecl wined3d_device_context_set_vertex_declaration(ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 1f8b4a89648..385ac7a8a07 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2579,6 +2579,8 @@ void __cdecl wined3d_device_context_set_shader(struct wined3d_device_context *co enum wined3d_shader_type type, struct wined3d_shader *shader); void __cdecl wined3d_device_context_set_shader_resource_view(struct wined3d_device_context *context, enum wined3d_shader_type type, unsigned int idx, struct wined3d_shader_resource_view *view); +void __cdecl wined3d_device_context_set_stream_output(struct wined3d_device_context *context, unsigned int idx, + struct wined3d_buffer *buffer, unsigned int offset); HRESULT __cdecl wined3d_device_context_set_stream_source(struct wined3d_device_context *context, unsigned int stream_idx, struct wined3d_buffer *buffer, unsigned int offset, unsigned int stride); void __cdecl wined3d_device_context_set_unordered_access_view(struct wined3d_device_context *context,

1 0

Zebediah Figura : d3d11: Use wined3d_device_context_set_stream_output().
by Alexandre Julliard 26 Mar '21

26 Mar '21

Module: wine Branch: master Commit: f2d4714c8b513da41ca87ef96aa010321f80dc9f URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2d4714c8b513da41ca87ef9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 25 22:09:51 2021 -0500 d3d11: Use wined3d_device_context_set_stream_output(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 67781c57ef5..5b52eba859a 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1053,7 +1053,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetDepthStencilState(ID3 static void STDMETHODCALLTYPE d3d11_immediate_context_SOSetTargets(ID3D11DeviceContext1 *iface, UINT buffer_count, ID3D11Buffer *const *buffers, const UINT *offsets) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); unsigned int count, i; TRACE("iface %p, buffer_count %u, buffers %p, offsets %p.\n", iface, buffer_count, buffers, offsets); @@ -1064,12 +1064,12 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_SOSetTargets(ID3D11DeviceC { struct d3d_buffer *buffer = unsafe_impl_from_ID3D11Buffer(buffers[i]); - wined3d_device_set_stream_output(device->wined3d_device, i, + wined3d_device_context_set_stream_output(context->wined3d_context, i, buffer ? buffer->wined3d_buffer : NULL, offsets ? offsets[i] : 0); } for (; i < D3D11_SO_BUFFER_SLOT_COUNT; ++i) { - wined3d_device_set_stream_output(device->wined3d_device, i, NULL, 0); + wined3d_device_context_set_stream_output(context->wined3d_context, i, NULL, 0); } wined3d_mutex_unlock(); } @@ -2635,7 +2635,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_ClearState(ID3D11DeviceCon ID3D11DeviceContext1_RSSetState(iface, NULL); for (i = 0; i < D3D11_SO_BUFFER_SLOT_COUNT; ++i) { - wined3d_device_set_stream_output(device->wined3d_device, i, NULL, 0); + wined3d_device_context_set_stream_output(context->wined3d_context, i, NULL, 0); } wined3d_device_context_set_predication(context->wined3d_context, NULL, FALSE); wined3d_mutex_unlock();

1 0

Zebediah Figura : wined3d: Introduce wined3d_device_context_dispatch().
by Alexandre Julliard 26 Mar '21

26 Mar '21

Module: wine Branch: master Commit: 324aa0a9f6f86e5bc27ac79d404780710c8b22ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=324aa0a9f6f86e5bc27ac79d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 25 22:09:52 2021 -0500 wined3d: Introduce wined3d_device_context_dispatch(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 9 ++++----- dlls/wined3d/device.c | 2 +- dlls/wined3d/wined3d.spec | 1 + dlls/wined3d/wined3d_private.h | 2 -- include/wine/wined3d.h | 2 ++ 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 6bf9827d3e1..12db34d1d0f 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -891,22 +891,21 @@ static void acquire_compute_pipeline_resources(const struct wined3d_state *state state->unordered_access_view[WINED3D_PIPELINE_COMPUTE]); } -void wined3d_cs_emit_dispatch(struct wined3d_cs *cs, +void CDECL wined3d_device_context_dispatch(struct wined3d_device_context *context, unsigned int group_count_x, unsigned int group_count_y, unsigned int group_count_z) { - const struct wined3d_state *state = cs->c.state; struct wined3d_cs_dispatch *op; - op = wined3d_device_context_require_space(&cs->c, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_DISPATCH; op->parameters.indirect = FALSE; op->parameters.u.direct.group_count_x = group_count_x; op->parameters.u.direct.group_count_y = group_count_y; op->parameters.u.direct.group_count_z = group_count_z; - acquire_compute_pipeline_resources(state); + acquire_compute_pipeline_resources(context->state); - wined3d_device_context_submit(&cs->c, WINED3D_CS_QUEUE_DEFAULT); + wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } void wined3d_cs_emit_dispatch_indirect(struct wined3d_cs *cs, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4041a7c0d7f..b96a0382c6a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4401,7 +4401,7 @@ void CDECL wined3d_device_dispatch_compute(struct wined3d_device *device, TRACE("device %p, group_count_x %u, group_count_y %u, group_count_z %u.\n", device, group_count_x, group_count_y, group_count_z); - wined3d_cs_emit_dispatch(device->cs, group_count_x, group_count_y, group_count_z); + wined3d_device_context_dispatch(&device->cs->c, group_count_x, group_count_y, group_count_z); } void CDECL wined3d_device_dispatch_compute_indirect(struct wined3d_device *device, diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 289716d1ae2..c735587abc6 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -166,6 +166,7 @@ @ cdecl wined3d_device_update_texture(ptr ptr ptr) @ cdecl wined3d_device_validate_device(ptr ptr) +@ cdecl wined3d_device_context_dispatch(ptr long long long) @ cdecl wined3d_device_context_set_blend_state(ptr ptr ptr long) @ cdecl wined3d_device_context_set_constant_buffer(ptr long long ptr) @ cdecl wined3d_device_context_set_depth_stencil_state(ptr ptr long) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4c15f6ab178..dd6d2cbab5c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4735,8 +4735,6 @@ void wined3d_cs_emit_clear_unordered_access_view_uint(struct wined3d_cs *cs, struct wined3d_unordered_access_view *view, const struct wined3d_uvec4 *clear_value) DECLSPEC_HIDDEN; void wined3d_cs_emit_copy_uav_counter(struct wined3d_cs *cs, struct wined3d_buffer *dst_buffer, unsigned int offset, struct wined3d_unordered_access_view *uav) DECLSPEC_HIDDEN; -void wined3d_cs_emit_dispatch(struct wined3d_cs *cs, - unsigned int group_count_x, unsigned int group_count_y, unsigned int group_count_z) DECLSPEC_HIDDEN; void wined3d_cs_emit_dispatch_indirect(struct wined3d_cs *cs, struct wined3d_buffer *buffer, unsigned int offset) DECLSPEC_HIDDEN; void wined3d_cs_emit_draw(struct wined3d_cs *cs, enum wined3d_primitive_type primitive_type, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 385ac7a8a07..f4fafafa80a 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2555,6 +2555,8 @@ HRESULT __cdecl wined3d_device_update_texture(struct wined3d_device *device, struct wined3d_texture *src_texture, struct wined3d_texture *dst_texture); HRESULT __cdecl wined3d_device_validate_device(const struct wined3d_device *device, DWORD *num_passes); +void __cdecl wined3d_device_context_dispatch(struct wined3d_device_context *context, + unsigned int group_count_x, unsigned int group_count_y, unsigned int group_count_z); void __cdecl wined3d_device_context_set_blend_state(struct wined3d_device_context *context, struct wined3d_blend_state *state, const struct wined3d_color *blend_factor, unsigned int sample_mask); void __cdecl wined3d_device_context_set_constant_buffer(struct wined3d_device_context *context,

1 0

Zebediah Figura : d3d11: Use wined3d_device_context_dispatch().
by Alexandre Julliard 26 Mar '21

26 Mar '21

Module: wine Branch: master Commit: 3ffef8fc958b09fa00e6f483ca43860006a66528 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ffef8fc958b09fa00e6f483… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 25 22:09:53 2021 -0500 d3d11: Use wined3d_device_context_dispatch(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 5b52eba859a..a94ccc7340e 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1114,13 +1114,13 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_DrawInstancedIndirect(ID3D static void STDMETHODCALLTYPE d3d11_immediate_context_Dispatch(ID3D11DeviceContext1 *iface, UINT thread_group_count_x, UINT thread_group_count_y, UINT thread_group_count_z) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); TRACE("iface %p, thread_group_count_x %u, thread_group_count_y %u, thread_group_count_z %u.\n", iface, thread_group_count_x, thread_group_count_y, thread_group_count_z); wined3d_mutex_lock(); - wined3d_device_dispatch_compute(device->wined3d_device, + wined3d_device_context_dispatch(context->wined3d_context, thread_group_count_x, thread_group_count_y, thread_group_count_z); wined3d_mutex_unlock(); }

1 0

Zebediah Figura : wined3d: Introduce wined3d_device_context_dispatch_indirect().
by Alexandre Julliard 26 Mar '21

26 Mar '21

Module: wine Branch: master Commit: 794dd70ee03e42cd3fb165d10ddefdbadcf9e495 URL: https://source.winehq.org/git/wine.git/?a=commit;h=794dd70ee03e42cd3fb165d1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 25 22:09:54 2021 -0500 wined3d: Introduce wined3d_device_context_dispatch_indirect(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 9 ++++----- dlls/wined3d/device.c | 2 +- dlls/wined3d/wined3d.spec | 1 + dlls/wined3d/wined3d_private.h | 2 -- include/wine/wined3d.h | 2 ++ 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 12db34d1d0f..390a97a64d3 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -908,22 +908,21 @@ void CDECL wined3d_device_context_dispatch(struct wined3d_device_context *contex wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } -void wined3d_cs_emit_dispatch_indirect(struct wined3d_cs *cs, +void CDECL wined3d_device_context_dispatch_indirect(struct wined3d_device_context *context, struct wined3d_buffer *buffer, unsigned int offset) { - const struct wined3d_state *state = cs->c.state; struct wined3d_cs_dispatch *op; - op = wined3d_device_context_require_space(&cs->c, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_DISPATCH; op->parameters.indirect = TRUE; op->parameters.u.indirect.buffer = buffer; op->parameters.u.indirect.offset = offset; - acquire_compute_pipeline_resources(state); + acquire_compute_pipeline_resources(context->state); wined3d_resource_acquire(&buffer->resource); - wined3d_device_context_submit(&cs->c, WINED3D_CS_QUEUE_DEFAULT); + wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_draw(struct wined3d_cs *cs, const void *data) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b96a0382c6a..7e123661cdb 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4409,7 +4409,7 @@ void CDECL wined3d_device_dispatch_compute_indirect(struct wined3d_device *devic { TRACE("device %p, buffer %p, offset %u.\n", device, buffer, offset); - wined3d_cs_emit_dispatch_indirect(device->cs, buffer, offset); + wined3d_device_context_dispatch_indirect(&device->cs->c, buffer, offset); } void CDECL wined3d_device_set_primitive_type(struct wined3d_device *device, diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index c735587abc6..3b5945076d6 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -167,6 +167,7 @@ @ cdecl wined3d_device_validate_device(ptr ptr) @ cdecl wined3d_device_context_dispatch(ptr long long long) +@ cdecl wined3d_device_context_dispatch_indirect(ptr ptr long) @ cdecl wined3d_device_context_set_blend_state(ptr ptr ptr long) @ cdecl wined3d_device_context_set_constant_buffer(ptr long long ptr) @ cdecl wined3d_device_context_set_depth_stencil_state(ptr ptr long) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index dd6d2cbab5c..f0205a41c7e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4735,8 +4735,6 @@ void wined3d_cs_emit_clear_unordered_access_view_uint(struct wined3d_cs *cs, struct wined3d_unordered_access_view *view, const struct wined3d_uvec4 *clear_value) DECLSPEC_HIDDEN; void wined3d_cs_emit_copy_uav_counter(struct wined3d_cs *cs, struct wined3d_buffer *dst_buffer, unsigned int offset, struct wined3d_unordered_access_view *uav) DECLSPEC_HIDDEN; -void wined3d_cs_emit_dispatch_indirect(struct wined3d_cs *cs, - struct wined3d_buffer *buffer, unsigned int offset) DECLSPEC_HIDDEN; void wined3d_cs_emit_draw(struct wined3d_cs *cs, enum wined3d_primitive_type primitive_type, unsigned int patch_vertex_count, int base_vertex_idx, unsigned int start_idx, unsigned int index_count, unsigned int start_instance, unsigned int instance_count, bool indexed) DECLSPEC_HIDDEN; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index f4fafafa80a..a78590413ac 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2557,6 +2557,8 @@ HRESULT __cdecl wined3d_device_validate_device(const struct wined3d_device *devi void __cdecl wined3d_device_context_dispatch(struct wined3d_device_context *context, unsigned int group_count_x, unsigned int group_count_y, unsigned int group_count_z); +void __cdecl wined3d_device_context_dispatch_indirect(struct wined3d_device_context *context, + struct wined3d_buffer *buffer, unsigned int offset); void __cdecl wined3d_device_context_set_blend_state(struct wined3d_device_context *context, struct wined3d_blend_state *state, const struct wined3d_color *blend_factor, unsigned int sample_mask); void __cdecl wined3d_device_context_set_constant_buffer(struct wined3d_device_context *context,

1 0