February 2020 - Wine-Commits

Michael Stefaniuc : ieframe/tests: Get rid of a2bstr() in ie.c.
by Alexandre Julliard Feb. 11, 2020

Feb. 11, 2020

Module: wine Branch: master Commit: 5de16dcee595b1c3a8096f912c0be47c7b3c01b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5de16dcee595b1c3a8096f91… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Feb 9 16:51:44 2020 +0200 ieframe/tests: Get rid of a2bstr() in ie.c. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/tests/ie.c | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/dlls/ieframe/tests/ie.c b/dlls/ieframe/tests/ie.c index 4d51f70329..b2c39e7baa 100644 --- a/dlls/ieframe/tests/ie.c +++ b/dlls/ieframe/tests/ie.c @@ -59,18 +59,6 @@ DEFINE_EXPECT(Invoke_NAVIGATECOMPLETE2); static BOOL navigate_complete; -static BSTR a2bstr(const char *str) -{ - BSTR ret; - int len; - - len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); - ret = SysAllocStringLen(NULL, len); - MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); - - return ret; -} - static HRESULT WINAPI Dispatch_QueryInterface(IDispatch *iface, REFIID riid, void **ppv) { if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IDispatch, riid)) { @@ -223,7 +211,7 @@ static void test_window(IWebBrowser2 *wb) ok(!strcmp(buf, "IEFrame"), "Unexpected class name %s\n", buf); } -static void test_navigate(IWebBrowser2 *wb, const char *url) +static void test_navigate(IWebBrowser2 *wb, const WCHAR *url) { VARIANT urlv, emptyv; MSG msg; @@ -232,7 +220,7 @@ static void test_navigate(IWebBrowser2 *wb, const char *url) SET_EXPECT(Invoke_NAVIGATECOMPLETE2); V_VT(&urlv) = VT_BSTR; - V_BSTR(&urlv) = a2bstr(url); + V_BSTR(&urlv) = SysAllocString(url); V_VT(&emptyv) = VT_EMPTY; hres = IWebBrowser2_Navigate2(wb, &urlv, &emptyv, &emptyv, &emptyv, &emptyv); ok(hres == S_OK, "Navigate2 failed: %08x\n", hres); @@ -284,7 +272,7 @@ static void test_InternetExplorer(void) test_visible(wb); test_html_window(wb); test_window(wb); - test_navigate(wb, "http://test.winehq.org/tests/hello.html"); + test_navigate(wb, L"http://test.winehq.org/tests/hello.html"); advise_cp(unk, FALSE);

1 0

Zebediah Figura : d3d9: Stop setting the device state when setting pixel shader constants.
by Alexandre Julliard Feb. 11, 2020

Feb. 11, 2020

Module: wine Branch: master Commit: 54cd29bd385bc5e49e7b136c87ba760457022788 URL: https://source.winehq.org/git/wine.git/?a=commit;h=54cd29bd385bc5e49e7b136c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 10 20:56:00 2020 -0600 d3d9: Stop setting the device state when setting pixel shader constants. 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/d3d9/device.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index f6ff9466b1..1ff178881c 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3899,9 +3899,6 @@ static HRESULT WINAPI d3d9_device_SetPixelShaderConstantF(IDirect3DDevice9Ex *if wined3d_mutex_lock(); hr = wined3d_stateblock_set_ps_consts_f(device->update_state, reg_idx, count, (const struct wined3d_vec4 *)data); - if (SUCCEEDED(hr) && !device->recording) - hr = wined3d_device_set_ps_consts_f(device->wined3d_device, - reg_idx, count, (const struct wined3d_vec4 *)data); wined3d_mutex_unlock(); return hr; @@ -3937,9 +3934,6 @@ static HRESULT WINAPI d3d9_device_SetPixelShaderConstantI(IDirect3DDevice9Ex *if wined3d_mutex_lock(); hr = wined3d_stateblock_set_ps_consts_i(device->update_state, reg_idx, count, (const struct wined3d_ivec4 *)data); - if (SUCCEEDED(hr) && !device->recording) - hr = wined3d_device_set_ps_consts_i(device->wined3d_device, - reg_idx, count, (const struct wined3d_ivec4 *)data); wined3d_mutex_unlock(); return hr; @@ -3976,8 +3970,6 @@ static HRESULT WINAPI d3d9_device_SetPixelShaderConstantB(IDirect3DDevice9Ex *if wined3d_mutex_lock(); hr = wined3d_stateblock_set_ps_consts_b(device->update_state, reg_idx, count, data); - if (SUCCEEDED(hr) && !device->recording) - hr = wined3d_device_set_ps_consts_b(device->wined3d_device, reg_idx, count, data); wined3d_mutex_unlock(); return hr;

1 0

Dmitry Timoshkov : gdiplus: Print fixme in GdipGetNearestColor only once.
by Alexandre Julliard Feb. 11, 2020

Feb. 11, 2020

Module: wine Branch: master Commit: a99cad4ae735143321628e1a2d8e1b87a6d576a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a99cad4ae735143321628e1a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Feb 11 13:06:19 2020 +0800 gdiplus: Print fixme in GdipGetNearestColor only once. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 8f3272b281..e8606f6b60 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4785,8 +4785,9 @@ GpStatus WINGDIPAPI GdipGetNearestColor(GpGraphics *graphics, ARGB* argb) if (graphics->image->type == ImageTypeBitmap) { + static int once; GpBitmap *bitmap = (GpBitmap *)graphics->image; - if (IsIndexedPixelFormat(bitmap->format)) + if (IsIndexedPixelFormat(bitmap->format) && !once++) FIXME("(%p, %p): Passing color unmodified\n", graphics, argb); }

1 0

Nikolay Sivov : include: Add the rest of async callback flags.
by Alexandre Julliard Feb. 11, 2020

Feb. 11, 2020

Module: wine Branch: master Commit: 0e2ee84710a2b47c93a3b8a89af151a8dfa0e4bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e2ee84710a2b47c93a3b8a8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 11 12:19:03 2020 +0300 include: Add the rest of async callback flags. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mfobjects.idl | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/include/mfobjects.idl b/include/mfobjects.idl index 203acc770f..758fd82cb1 100644 --- a/include/mfobjects.idl +++ b/include/mfobjects.idl @@ -425,8 +425,11 @@ interface IMFRemoteAsyncCallback : IUnknown HRESULT Invoke([in] HRESULT hr, [in] IUnknown *pRemoteResult); } -cpp_quote("#define MFASYNC_FAST_IO_PROCESSING_CALLBACK 0x0001") -cpp_quote("#define MFASYNC_SIGNAL_CALLBACK 0x0002" ) +cpp_quote("#define MFASYNC_FAST_IO_PROCESSING_CALLBACK 0x00000001") +cpp_quote("#define MFASYNC_SIGNAL_CALLBACK 0x00000002") +cpp_quote("#define MFASYNC_BLOCKING_CALLBACK 0x00000004") +cpp_quote("#define MFASYNC_REPLY_CALLBACK 0x00000008") +cpp_quote("#define MFASYNC_LOCALIZE_REMOTE_CALLBACK 0x00000010") cpp_quote("#define MFASYNC_CALLBACK_QUEUE_UNDEFINED 0x00000000") cpp_quote("#define MFASYNC_CALLBACK_QUEUE_STANDARD 0x00000001")

1 0

Nikolay Sivov : rtworkq: Add support for serial work queues.
by Alexandre Julliard Feb. 11, 2020

Feb. 11, 2020

Module: wine Branch: master Commit: 5737cdc97d13e2a16e33fc283728d7b07db38cd5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5737cdc97d13e2a16e33fc28… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 11 12:19:08 2020 +0300 rtworkq: Add support for serial work queues. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rtworkq/queue.c | 327 +++++++++++++++++++++++++++++++++++++++------- dlls/rtworkq/rtworkq.spec | 2 +- include/rtworkq.idl | 1 + 3 files changed, 280 insertions(+), 50 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5737cdc97d13e2a16e33…

1 0

Michael Stefaniuc : mshtml/tests: Get rid of strcmp_wa() in script.c.
by Alexandre Julliard Feb. 11, 2020

Feb. 11, 2020

Module: wine Branch: master Commit: 884f31b5c1302e6ab5b91ca49cc0b0d44ddd8799 URL: https://source.winehq.org/git/wine.git/?a=commit;h=884f31b5c1302e6ab5b91ca4… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Feb 9 16:51:48 2020 +0200 mshtml/tests: Get rid of strcmp_wa() in script.c. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/script.c | 55 ++++++++++++++++++++-------------------------- 1 file changed, 24 insertions(+), 31 deletions(-) diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index 87ac62a6a7..27405a71b5 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -172,13 +172,6 @@ static BOOL skip_loadobject_tests; static IActiveScriptSite *site; static SCRIPTSTATE state; -static int strcmp_wa(LPCWSTR strw, const char *stra) -{ - CHAR buf[512]; - WideCharToMultiByte(CP_ACP, 0, strw, -1, buf, sizeof(buf), NULL, NULL); - return lstrcmpA(stra, buf); -} - static BSTR a2bstr(const char *str) { BSTR ret; @@ -509,21 +502,21 @@ static IDispatchEx funcDisp = { &testObjVtbl }; static HRESULT WINAPI scriptDisp_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD grfdex, DISPID *pid) { - if(!strcmp_wa(bstrName, "testProp")) { + if(!lstrcmpW(bstrName, L"testProp")) { CHECK_EXPECT(script_testprop_d); ok(grfdex == fdexNameCaseSensitive, "grfdex = %x\n", grfdex); *pid = DISPID_SCRIPT_TESTPROP; return S_OK; } - if(!strcmp_wa(bstrName, "testProp2")) { + if(!lstrcmpW(bstrName, L"testProp2")) { CHECK_EXPECT(script_testprop2_d); ok(grfdex == fdexNameCaseSensitive, "grfdex = %x\n", grfdex); *pid = DISPID_SCRIPT_TESTPROP2; return S_OK; } - if(!strcmp_wa(bstrName, "divid")) { + if(!lstrcmpW(bstrName, L"divid")) { CHECK_EXPECT(script_divid_d); ok(grfdex == fdexNameCaseSensitive, "grfdex = %x\n", grfdex); return E_FAIL; @@ -583,31 +576,31 @@ static IDispatchEx scriptDisp = { &scriptDispVtbl }; static HRESULT WINAPI externalDisp_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD grfdex, DISPID *pid) { - if(!strcmp_wa(bstrName, "ok")) { + if(!lstrcmpW(bstrName, L"ok")) { *pid = DISPID_EXTERNAL_OK; return S_OK; } - if(!strcmp_wa(bstrName, "trace")) { + if(!lstrcmpW(bstrName, L"trace")) { *pid = DISPID_EXTERNAL_TRACE; return S_OK; } - if(!strcmp_wa(bstrName, "reportSuccess")) { + if(!lstrcmpW(bstrName, L"reportSuccess")) { *pid = DISPID_EXTERNAL_REPORTSUCCESS; return S_OK; } - if(!strcmp_wa(bstrName, "todo_wine_ok")) { + if(!lstrcmpW(bstrName, L"todo_wine_ok")) { *pid = DISPID_EXTERNAL_TODO_WINE_OK; return S_OK; } - if(!strcmp_wa(bstrName, "broken")) { + if(!lstrcmpW(bstrName, L"broken")) { *pid = DISPID_EXTERNAL_BROKEN; return S_OK; } - if(!strcmp_wa(bstrName, "win_skip")) { + if(!lstrcmpW(bstrName, L"win_skip")) { *pid = DISPID_EXTERNAL_WIN_SKIP; return S_OK; } - if(!strcmp_wa(bstrName, "writeStream")) { + if(!lstrcmpW(bstrName, L"writeStream")) { *pid = DISPID_EXTERNAL_WRITESTREAM; return S_OK; } @@ -1981,7 +1974,7 @@ static void test_func(IDispatchEx *obj) VARIANT args[2]; ok(V_VT(&var) == VT_BSTR, "V_VT(var)=%d\n", V_VT(&var)); - ok(!strcmp_wa(V_BSTR(&var), "[object]"), "V_BSTR(var) = %s\n", wine_dbgstr_w(V_BSTR(&var))); + ok(!lstrcmpW(V_BSTR(&var), L"[object]"), "V_BSTR(var) = %s\n", wine_dbgstr_w(V_BSTR(&var))); VariantClear(&var); dp.rgdispidNamedArgs = named_args; @@ -1995,7 +1988,7 @@ static void test_func(IDispatchEx *obj) hres = IDispatchEx_Invoke(dispex, DISPID_VALUE, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dp, &var, &ei, NULL); ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); ok(V_VT(&var) == VT_BSTR, "V_VT(var)=%d\n", V_VT(&var)); - ok(!strcmp_wa(V_BSTR(&var), "[object]"), "V_BSTR(var) = %s\n", wine_dbgstr_w(V_BSTR(&var))); + ok(!lstrcmpW(V_BSTR(&var), L"[object]"), "V_BSTR(var) = %s\n", wine_dbgstr_w(V_BSTR(&var))); VariantClear(&var); } @@ -2014,7 +2007,7 @@ static void test_func(IDispatchEx *obj) hres = dispex_propget(dispex, DISPID_VALUE, &var, &caller_sp); ok(hres == S_OK, "InvokeEx returned: %08x, expected S_OK\n", hres); ok(V_VT(&var) == VT_BSTR, "V_VT(var) = %d\n", V_VT(&var)); - ok(!strcmp_wa(V_BSTR(&var), "\nfunction toString() {\n [native code]\n}\n"), + ok(!lstrcmpW(V_BSTR(&var), L"\nfunction toString() {\n [native code]\n}\n"), "V_BSTR(var) = %s\n", wine_dbgstr_w(V_BSTR(&var))); VariantClear(&var); todo_wine CHECK_CALLED(QS_IActiveScriptSite); @@ -2049,9 +2042,9 @@ static void test_nextdispid(IDispatchEx *dispex) ok(hres == S_OK, "GetMemberName failed: %08x\n", hres); if(id == dyn_id) - ok(!strcmp_wa(name, "dynVal"), "name = %s\n", wine_dbgstr_w(name)); + ok(!lstrcmpW(name, L"dynVal"), "name = %s\n", wine_dbgstr_w(name)); else if(id == DISPID_IOMNAVIGATOR_PLATFORM) - ok(!strcmp_wa(name, "platform"), "name = %s\n", wine_dbgstr_w(name)); + ok(!lstrcmpW(name, L"platform"), "name = %s\n", wine_dbgstr_w(name)); SysFreeString(name); last_id = id; @@ -2465,19 +2458,19 @@ static HRESULT WINAPI ActiveScriptParse_ParseScriptText(IActiveScriptParse *ifac ok(pvarResult != NULL, "pvarResult == NULL\n"); ok(pexcepinfo != NULL, "pexcepinfo == NULL\n"); - if(!strcmp_wa(pstrCode, "execScript call")) { + if(!lstrcmpW(pstrCode, L"execScript call")) { CHECK_EXPECT(ParseScriptText_execScript); ok(!pstrItemName, "pstrItemName = %s\n", wine_dbgstr_w(pstrItemName)); - ok(!strcmp_wa(pstrDelimiter, "\""), "pstrDelimiter = %s\n", wine_dbgstr_w(pstrDelimiter)); + ok(!lstrcmpW(pstrDelimiter, L"\""), "pstrDelimiter = %s\n", wine_dbgstr_w(pstrDelimiter)); ok(dwFlags == SCRIPTTEXT_ISVISIBLE, "dwFlags = %x\n", dwFlags); V_VT(pvarResult) = VT_I4; V_I4(pvarResult) = 10; return S_OK; - }else if(!strcmp_wa(pstrCode, "simple script")) { + }else if(!lstrcmpW(pstrCode, L"simple script")) { CHECK_EXPECT(ParseScriptText_script); - ok(!strcmp_wa(pstrItemName, "window"), "pstrItemName = %s\n", wine_dbgstr_w(pstrItemName)); - ok(!strcmp_wa(pstrDelimiter, "</SCRIPT>"), "pstrDelimiter = %s\n", wine_dbgstr_w(pstrDelimiter)); + ok(!lstrcmpW(pstrItemName, L"window"), "pstrItemName = %s\n", wine_dbgstr_w(pstrItemName)); + ok(!lstrcmpW(pstrDelimiter, L"</SCRIPT>"), "pstrDelimiter = %s\n", wine_dbgstr_w(pstrDelimiter)); ok(dwFlags == (SCRIPTTEXT_ISVISIBLE|SCRIPTTEXT_HOSTMANAGESSOURCE), "dwFlags = %x\n", dwFlags); test_script_run(); @@ -2682,7 +2675,7 @@ static HRESULT WINAPI ActiveScript_GetScriptDispatch(IActiveScript *iface, LPCOL { CHECK_EXPECT(GetScriptDispatch); - ok(!strcmp_wa(pstrItemName, "window"), "pstrItemName = %s\n", wine_dbgstr_w(pstrItemName)); + ok(!lstrcmpW(pstrItemName, L"window"), "pstrItemName = %s\n", wine_dbgstr_w(pstrItemName)); if(!script_disp) return E_NOTIMPL; @@ -3102,10 +3095,10 @@ static HRESULT WINAPI ProtocolEx_StartEx(IInternetProtocolEx *iface, IUri *uri, if(FAILED(hres)) return hres; - if(!strcmp_wa(path, "/index.html")) { + if(!lstrcmpW(path, L"/index.html")) { This->data = index_html_data; This->size = strlen(This->data); - }else if(!strcmp_wa(path, "/echo.php")) { + }else if(!lstrcmpW(path, L"/echo.php")) { ok(This->bind_info.dwBindVerb == BINDVERB_POST, "unexpected bind verb %d\n", This->bind_info.dwBindVerb == BINDVERB_POST); todo_wine ok(This->bind_info.stgmedData.tymed == TYMED_ISTREAM, "tymed = %x\n", This->bind_info.stgmedData.tymed); switch(This->bind_info.stgmedData.tymed) { @@ -3120,7 +3113,7 @@ static HRESULT WINAPI ProtocolEx_StartEx(IInternetProtocolEx *iface, IUri *uri, default: ok(0, "unexpected tymed %d\n", This->bind_info.stgmedData.tymed); } - }else if(!strcmp_wa(path, "/jsstream.php")) { + }else if(!lstrcmpW(path, L"/jsstream.php")) { BSTR query; hres = IUri_GetQuery(uri, &query);

1 0

Zebediah Figura : d3d9: Retrieve vertex shader constants from the primary stateblock.
by Alexandre Julliard Feb. 11, 2020

Feb. 11, 2020

Module: wine Branch: master Commit: 57684d55979d9d7270a5dc4748ba877b0f6fee0a URL: https://source.winehq.org/git/wine.git/?a=commit;h=57684d55979d9d7270a5dc47… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 10 20:55:56 2020 -0600 d3d9: Retrieve vertex shader constants from the primary stateblock. 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/d3d9/d3d9_private.h | 2 +- dlls/d3d9/device.c | 51 ++++++++++++++++++++++++++++++------------------ 2 files changed, 33 insertions(+), 20 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index a7072162d5..bc9a3b98b2 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -114,7 +114,7 @@ struct d3d9_device DWORD auto_mipmaps; /* D3D9_MAX_TEXTURE_UNITS */ - unsigned int max_user_clip_planes; + unsigned int max_user_clip_planes, vs_uniform_count; UINT implicit_swapchain_count; struct wined3d_swapchain **implicit_swapchains; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index fe23625a05..f0741045ad 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3567,26 +3567,29 @@ static HRESULT WINAPI d3d9_device_SetVertexShaderConstantF(IDirect3DDevice9Ex *i } static HRESULT WINAPI d3d9_device_GetVertexShaderConstantF(IDirect3DDevice9Ex *iface, - UINT reg_idx, float *data, UINT count) + UINT start_idx, float *constants, UINT count) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); - HRESULT hr; + const struct wined3d_vec4 *src; - TRACE("iface %p, reg_idx %u, data %p, count %u.\n", iface, reg_idx, data, count); + TRACE("iface %p, start_idx %u, constants %p, count %u.\n", iface, start_idx, constants, count); - if (reg_idx + count > D3D9_MAX_VERTEX_SHADER_CONSTANTF) + if (!constants) + return D3DERR_INVALIDCALL; + + if (start_idx >= device->vs_uniform_count || count > device->vs_uniform_count - start_idx) { WARN("Trying to access %u constants, but d3d9 only supports %u\n", - reg_idx + count, D3D9_MAX_VERTEX_SHADER_CONSTANTF); + start_idx + count, device->vs_uniform_count); return D3DERR_INVALIDCALL; } wined3d_mutex_lock(); - hr = wined3d_device_get_vs_consts_f(device->wined3d_device, - reg_idx, count, (struct wined3d_vec4 *)data); + src = wined3d_stateblock_get_state(device->state)->vs_consts_f; + memcpy(constants, &src[start_idx], count * sizeof(*src)); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d9_device_SetVertexShaderConstantI(IDirect3DDevice9Ex *iface, @@ -3609,19 +3612,24 @@ static HRESULT WINAPI d3d9_device_SetVertexShaderConstantI(IDirect3DDevice9Ex *i } static HRESULT WINAPI d3d9_device_GetVertexShaderConstantI(IDirect3DDevice9Ex *iface, - UINT reg_idx, int *data, UINT count) + UINT start_idx, int *constants, UINT count) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); - HRESULT hr; + const struct wined3d_ivec4 *src; - TRACE("iface %p, reg_idx %u, data %p, count %u.\n", iface, reg_idx, data, count); + TRACE("iface %p, start_idx %u, constants %p, count %u.\n", iface, start_idx, constants, count); + + if (!constants || start_idx >= WINED3D_MAX_CONSTS_I) + return WINED3DERR_INVALIDCALL; + if (count > WINED3D_MAX_CONSTS_I - start_idx) + count = WINED3D_MAX_CONSTS_I - start_idx; wined3d_mutex_lock(); - hr = wined3d_device_get_vs_consts_i(device->wined3d_device, - reg_idx, count, (struct wined3d_ivec4 *)data); + src = wined3d_stateblock_get_state(device->state)->vs_consts_i; + memcpy(constants, &src[start_idx], count * sizeof(*src)); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d9_device_SetVertexShaderConstantB(IDirect3DDevice9Ex *iface, @@ -3642,18 +3650,22 @@ static HRESULT WINAPI d3d9_device_SetVertexShaderConstantB(IDirect3DDevice9Ex *i } static HRESULT WINAPI d3d9_device_GetVertexShaderConstantB(IDirect3DDevice9Ex *iface, - UINT reg_idx, BOOL *data, UINT count) + UINT start_idx, BOOL *constants, UINT count) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); - HRESULT hr; - TRACE("iface %p, reg_idx %u, data %p, count %u.\n", iface, reg_idx, data, count); + TRACE("iface %p, start_idx %u, constants %p, count %u.\n", iface, start_idx, constants, count); + + if (!constants || start_idx >= WINED3D_MAX_CONSTS_B) + return WINED3DERR_INVALIDCALL; + if (count > WINED3D_MAX_CONSTS_B - start_idx) + count = WINED3D_MAX_CONSTS_B - start_idx; wined3d_mutex_lock(); - hr = wined3d_device_get_vs_consts_b(device->wined3d_device, reg_idx, count, data); + memcpy(constants, &wined3d_stateblock_get_state(device->state)->vs_consts_b[start_idx], count * sizeof(*constants)); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d9_device_SetStreamSource(IDirect3DDevice9Ex *iface, @@ -4609,6 +4621,7 @@ HRESULT device_init(struct d3d9_device *device, struct d3d9 *parent, struct wine wined3d_get_device_caps(wined3d, adapter, device_type, &caps); device->max_user_clip_planes = caps.MaxUserClipPlanes; + device->vs_uniform_count = caps.MaxVertexShaderConst; if (flags & D3DCREATE_ADAPTERGROUP_DEVICE) count = caps.NumberOfAdaptersInGroup;

1 0

Zebediah Figura : d3d9: Stop setting the device state when setting vertex shader constants.
by Alexandre Julliard Feb. 11, 2020

Feb. 11, 2020

Module: wine Branch: master Commit: 4b8d328885c7006707c910a08b1f4946f28229bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b8d328885c7006707c910a0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 10 20:55:57 2020 -0600 d3d9: Stop setting the device state when setting vertex shader constants. 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/d3d9/device.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index f0741045ad..63312b939b 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3556,11 +3556,6 @@ static HRESULT WINAPI d3d9_device_SetVertexShaderConstantF(IDirect3DDevice9Ex *i wined3d_mutex_lock(); hr = wined3d_stateblock_set_vs_consts_f(device->update_state, reg_idx, count, (const struct wined3d_vec4 *)data); - if (SUCCEEDED(hr) && !device->recording) - { - hr = wined3d_device_set_vs_consts_f(device->wined3d_device, - reg_idx, count, (const struct wined3d_vec4 *)data); - } wined3d_mutex_unlock(); return hr; @@ -3603,9 +3598,6 @@ static HRESULT WINAPI d3d9_device_SetVertexShaderConstantI(IDirect3DDevice9Ex *i wined3d_mutex_lock(); hr = wined3d_stateblock_set_vs_consts_i(device->update_state, reg_idx, count, (const struct wined3d_ivec4 *)data); - if (SUCCEEDED(hr) && !device->recording) - hr = wined3d_device_set_vs_consts_i(device->wined3d_device, - reg_idx, count, (const struct wined3d_ivec4 *)data); wined3d_mutex_unlock(); return hr; @@ -3642,8 +3634,6 @@ static HRESULT WINAPI d3d9_device_SetVertexShaderConstantB(IDirect3DDevice9Ex *i wined3d_mutex_lock(); hr = wined3d_stateblock_set_vs_consts_b(device->update_state, reg_idx, count, data); - if (SUCCEEDED(hr) && !device->recording) - hr = wined3d_device_set_vs_consts_b(device->wined3d_device, reg_idx, count, data); wined3d_mutex_unlock(); return hr;

1 0

Zebediah Figura : d3d9: Stop setting the device state in d3d9_device_SetPixelShader().
by Alexandre Julliard Feb. 11, 2020

Feb. 11, 2020

Module: wine Branch: master Commit: 37af1676d23fbcbf094538cf8dc41172dc0dac7f URL: https://source.winehq.org/git/wine.git/?a=commit;h=37af1676d23fbcbf094538cf… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 10 20:55:58 2020 -0600 d3d9: Stop setting the device state in d3d9_device_SetPixelShader(). 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/d3d9/device.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 63312b939b..04fb158bc6 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3855,9 +3855,6 @@ static HRESULT WINAPI d3d9_device_SetPixelShader(IDirect3DDevice9Ex *iface, IDir wined3d_mutex_lock(); wined3d_stateblock_set_pixel_shader(device->update_state, shader_obj ? shader_obj->wined3d_shader : NULL); - if (!device->recording) - wined3d_device_set_pixel_shader(device->wined3d_device, - shader_obj ? shader_obj->wined3d_shader : NULL); wined3d_mutex_unlock(); return D3D_OK;

1 0

Nikolay Sivov : rtworkq: Add a structure for queue initialization parameters.
by Alexandre Julliard Feb. 11, 2020

Feb. 11, 2020

Module: wine Branch: master Commit: b8805c1e7d23d5273c622a21283ab71ac66613e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8805c1e7d23d5273c622a21… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 11 12:19:06 2020 +0300 rtworkq: Add a structure for queue initialization parameters. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rtworkq/queue.c | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/dlls/rtworkq/queue.c b/dlls/rtworkq/queue.c index c6a0c68d54..38d376342d 100644 --- a/dlls/rtworkq/queue.c +++ b/dlls/rtworkq/queue.c @@ -136,6 +136,11 @@ static const TP_CALLBACK_PRIORITY priorities[] = TP_CALLBACK_PRIORITY_LOW, }; +struct queue_desc +{ + RTWQ_WORKQUEUE_TYPE queue_type; +}; + struct queue { TP_POOL *pool; @@ -228,7 +233,7 @@ static struct work_item * alloc_work_item(struct queue *queue, LONG priority, IR return item; } -static void init_work_queue(RTWQ_WORKQUEUE_TYPE queue_type, struct queue *queue) +static void init_work_queue(const struct queue_desc *desc, struct queue *queue) { TP_CALLBACK_ENVIRON_V3 env; unsigned int max_thread, i; @@ -250,12 +255,12 @@ static void init_work_queue(RTWQ_WORKQUEUE_TYPE queue_type, struct queue *queue) list_init(&queue->pending_items); InitializeCriticalSection(&queue->cs); - max_thread = (queue_type == RTWQ_STANDARD_WORKQUEUE || queue_type == RTWQ_WINDOW_WORKQUEUE) ? 1 : 4; + max_thread = (desc->queue_type == RTWQ_STANDARD_WORKQUEUE || desc->queue_type == RTWQ_WINDOW_WORKQUEUE) ? 1 : 4; SetThreadpoolThreadMinimum(queue->pool, 1); SetThreadpoolThreadMaximum(queue->pool, max_thread); - if (queue_type == RTWQ_WINDOW_WORKQUEUE) + if (desc->queue_type == RTWQ_WINDOW_WORKQUEUE) FIXME("RTWQ_WINDOW_WORKQUEUE is not supported.\n"); } @@ -277,6 +282,8 @@ static HRESULT grab_queue(DWORD queue_id, struct queue **ret) } else if (queue) { + struct queue_desc desc; + EnterCriticalSection(&queues_section); switch (queue_id) { @@ -288,7 +295,9 @@ static HRESULT grab_queue(DWORD queue_id, struct queue **ret) default: queue_type = RTWQ_STANDARD_WORKQUEUE; } - init_work_queue(queue_type, queue); + + desc.queue_type = queue_type; + init_work_queue(&desc, queue); LeaveCriticalSection(&queues_section); *ret = queue; return S_OK; @@ -604,7 +613,7 @@ static HRESULT queue_cancel_item(struct queue *queue, RTWQWORKITEM_KEY key) return hr; } -static HRESULT alloc_user_queue(RTWQ_WORKQUEUE_TYPE queue_type, DWORD *queue_id) +static HRESULT alloc_user_queue(const struct queue_desc *desc, DWORD *queue_id) { struct queue_handle *entry; struct queue *queue; @@ -618,7 +627,8 @@ static HRESULT alloc_user_queue(RTWQ_WORKQUEUE_TYPE queue_type, DWORD *queue_id) queue = heap_alloc_zero(sizeof(*queue)); if (!queue) return E_OUTOFMEMORY; - init_work_queue(queue_type, queue); + + init_work_queue(desc, queue); EnterCriticalSection(&queues_section); @@ -839,6 +849,8 @@ HRESULT WINAPI RtwqUnlockPlatform(void) static void init_system_queues(void) { + struct queue_desc desc; + /* Always initialize standard queue, keep the rest lazy. */ EnterCriticalSection(&queues_section); @@ -849,7 +861,8 @@ static void init_system_queues(void) return; } - init_work_queue(RTWQ_STANDARD_WORKQUEUE, &system_queues[SYS_QUEUE_STANDARD]); + desc.queue_type = RTWQ_STANDARD_WORKQUEUE; + init_work_queue(&desc, &system_queues[SYS_QUEUE_STANDARD]); LeaveCriticalSection(&queues_section); } @@ -1096,9 +1109,12 @@ HRESULT WINAPI RtwqPutWorkItem(DWORD queue, LONG priority, IRtwqAsyncResult *res HRESULT WINAPI RtwqAllocateWorkQueue(RTWQ_WORKQUEUE_TYPE queue_type, DWORD *queue) { + struct queue_desc desc; + TRACE("%d, %p.\n", queue_type, queue); - return alloc_user_queue(queue_type, queue); + desc.queue_type = queue_type; + return alloc_user_queue(&desc, queue); } HRESULT WINAPI RtwqLockWorkQueue(DWORD queue)

1 0