wine-commits March 2021

wine-commits@winehq.org

2 participants
1163 discussions

Zebediah Figura : wined3d: Move the "device" member of struct wined3d_cs to struct wined3d_device_context.
by Alexandre Julliard 05 Mar '21

05 Mar '21

Module: wine Branch: master Commit: 55a0507ee88db101ebcae512d5c1309ebe9a3103 URL: https://source.winehq.org/git/wine.git/?a=commit;h=55a0507ee88db101ebcae512… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 4 21:29:47 2021 -0600 wined3d: Move the "device" member of struct wined3d_cs to struct wined3d_device_context. 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 | 149 ++++++++++++++++++++--------------------- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 75 insertions(+), 76 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=55a0507ee88db101ebca…

1 0

Zebediah Figura : wined3d: Pass a wined3d_device_context to wined3d_cs_require_space().
by Alexandre Julliard 05 Mar '21

05 Mar '21

Module: wine Branch: master Commit: d3aebfed9203285e876d6d121097d1fd73a68106 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d3aebfed9203285e876d6d12… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 4 21:29:46 2021 -0600 wined3d: Pass a wined3d_device_context to wined3d_cs_require_space(). 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 | 106 +++++++++++++++++++++++++++--------------------------- 1 file changed, 53 insertions(+), 53 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d3aebfed9203285e876d…

1 0

Zebediah Figura : wined3d: Pass a wined3d_device_context to wined3d_cs_submit().
by Alexandre Julliard 05 Mar '21

05 Mar '21

Module: wine Branch: master Commit: 864a9f3e322f652564852da1683dd85a6adcaa6e URL: https://source.winehq.org/git/wine.git/?a=commit;h=864a9f3e322f652564852da1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 4 21:29:45 2021 -0600 wined3d: Pass a wined3d_device_context to wined3d_cs_submit(). 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 | 107 +++++++++++++++++++++++++++--------------------------- 1 file changed, 54 insertions(+), 53 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=864a9f3e322f65256485…

1 0

Zebediah Figura : wined3d: Separate the "ops" member of struct wined3d_cs to a new wined3d_device_context structure.
by Alexandre Julliard 05 Mar '21

05 Mar '21

Module: wine Branch: master Commit: fc3919c4abd82a3ef8c877bfacddf6998b48ba50 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc3919c4abd82a3ef8c877bf… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 4 21:29:44 2021 -0600 wined3d: Separate the "ops" member of struct wined3d_cs to a new wined3d_device_context structure. 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/adapter_gl.c | 2 +- dlls/wined3d/adapter_vk.c | 2 +- dlls/wined3d/cs.c | 54 ++++++++++++++++++++++++++++-------------- dlls/wined3d/wined3d_private.h | 23 +++++++++++------- 4 files changed, 53 insertions(+), 28 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fc3919c4abd82a3ef8c8…

1 0

Zebediah Figura : d3d11/tests: Test ID3D11DeviceContext1::SwapDeviceContextState() on a deferred context.
by Alexandre Julliard 05 Mar '21

05 Mar '21

Module: wine Branch: master Commit: cc82a51a076d7c936cba70d426c95de50a28e750 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc82a51a076d7c936cba70d4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 4 21:19:09 2021 -0600 d3d11/tests: Test ID3D11DeviceContext1::SwapDeviceContextState() on a deferred context. 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/tests/d3d11.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index c40593d31d8..6cdac34c0cd 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -31969,6 +31969,64 @@ static void test_deferred_context_state(void) release_test_context(&test_context); } +static void test_deferred_context_swap_state(void) +{ + ID3D11DeviceContext1 *immediate, *deferred; + ID3DDeviceContextState *state, *prev_state; + ID3D11Buffer *green_buffer, *ret_buffer; + struct d3d11_test_context test_context; + D3D_FEATURE_LEVEL feature_level; + ID3D11Device1 *device; + HRESULT hr; + + static const float green[] = {0.0f, 1.0f, 0.0f, 1.0f}; + + if (!init_test_context(&test_context, NULL)) + return; + + if (FAILED(ID3D11Device_QueryInterface(test_context.device, &IID_ID3D11Device1, (void **)&device))) + { + skip("ID3D11Device1 is not available.\n"); + release_test_context(&test_context); + return; + } + + ID3D11Device1_GetImmediateContext1(device, &immediate); + + green_buffer = create_buffer(test_context.device, D3D11_BIND_CONSTANT_BUFFER, sizeof(green), &green); + ID3D11DeviceContext1_PSSetConstantBuffers(immediate, 0, 1, &green_buffer); + + hr = ID3D11Device1_CreateDeferredContext1(device, 0, &deferred); + todo_wine ok(hr == S_OK, "Failed to create deferred context, hr %#x.\n", hr); + if (hr != S_OK) + goto out; + + feature_level = ID3D11Device1_GetFeatureLevel(device); + hr = ID3D11Device1_CreateDeviceContextState(device, 0, &feature_level, 1, D3D11_SDK_VERSION, + &IID_ID3D11Device1, NULL, &state); + ok(hr == S_OK, "Failed to create device context state, hr %#x.\n", hr); + + prev_state = (void *)0xdeadbeef; + ID3D11DeviceContext1_SwapDeviceContextState(deferred, NULL, &prev_state); + ok(!prev_state, "Got state %p.\n", prev_state); + + prev_state = (void *)0xdeadbeef; + ID3D11DeviceContext1_SwapDeviceContextState(deferred, state, &prev_state); + ok(!prev_state, "Got state %p.\n", prev_state); + + ID3D11DeviceContext1_PSGetConstantBuffers(deferred, 0, 1, &ret_buffer); + ok(!ret_buffer, "Got unexpected buffer %p.\n", ret_buffer); + + ID3DDeviceContextState_Release(state); + ID3D11DeviceContext1_Release(deferred); + +out: + ID3D11Buffer_Release(green_buffer); + ID3D11DeviceContext1_Release(immediate); + ID3D11Device1_Release(device); + release_test_context(&test_context); +} + static void test_deferred_context_rendering(void) { ID3D11DeviceContext *immediate, *deferred; @@ -32238,6 +32296,7 @@ START_TEST(d3d11) queue_test(test_independent_blend); queue_test(test_dual_source_blend); queue_test(test_deferred_context_state); + queue_test(test_deferred_context_swap_state); queue_test(test_deferred_context_rendering); run_queued_tests();

1 0

Zebediah Figura : d3dx9/tests: Remove the fallback NAN definition.
by Alexandre Julliard 05 Mar '21

05 Mar '21

Module: wine Branch: master Commit: 0d075b904b28a03cec304480446fab7753c3094f URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d075b904b28a03cec304480… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 4 20:14:27 2021 -0600 d3dx9/tests: Remove the fallback NAN definition. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/mesh.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 42deb32b934..e981f3623ce 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -29,16 +29,6 @@ #include "rmxftmpl.h" #include "rmxfguid.h" -#ifndef NAN -/* From wine/port.h */ -static inline float __port_nan(void) -{ - static const unsigned __nan_bytes = 0x7fc00000; - return *(const float *)&__nan_bytes; -} -#define NAN __port_nan() -#endif - /* Set the WINETEST_DEBUG environment variable to be greater than 1 for verbose * function call traces of ID3DXAllocateHierarchy callbacks. */ #define TRACECALLBACK if(winetest_debug > 1) trace

1 0

Nikolay Sivov : wbemprox/tests: Use defined name for error code.
by Alexandre Julliard 05 Mar '21

05 Mar '21

Module: wine Branch: master Commit: 4b8fbc324c82da4dc1eb41455c0824520c9561d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b8fbc324c82da4dc1eb4145… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 4 18:40:00 2021 +0300 wbemprox/tests: Use defined name for error code. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/tests/services.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/tests/services.c b/dlls/wbemprox/tests/services.c index da985de01fa..5ad73e7a8ec 100644 --- a/dlls/wbemprox/tests/services.c +++ b/dlls/wbemprox/tests/services.c @@ -109,8 +109,8 @@ static void test_IWbemLocator(void) { L"\\\\.", WBEM_E_INVALID_NAMESPACE }, { L"\\\\.\\", WBEM_E_INVALID_NAMESPACE, FALSE, WBEM_E_INVALID_PARAMETER }, { L"\\ROOT", WBEM_E_INVALID_NAMESPACE }, - { L"\\\\ROOT", 0x800706ba, TRUE }, - { L"\\\\.ROOT", 0x800706ba, TRUE }, + { L"\\\\ROOT", __HRESULT_FROM_WIN32(RPC_S_SERVER_UNAVAILABLE), TRUE }, + { L"\\\\.ROOT", __HRESULT_FROM_WIN32(RPC_S_SERVER_UNAVAILABLE), TRUE }, { L"\\\\.\\NONE", WBEM_E_INVALID_NAMESPACE }, { L"\\\\.\\ROOT", S_OK }, { L"\\\\\\.\\ROOT", WBEM_E_INVALID_PARAMETER },

1 0

Giovanni Mascellani : dwrite/tests: Remove overzealous test.
by Alexandre Julliard 05 Mar '21

05 Mar '21

Module: wine Branch: master Commit: 23d6ac27dbbaacf3fc6caa3860df83e90c003692 URL: https://source.winehq.org/git/wine.git/?a=commit;h=23d6ac27dbbaacf3fc6caa38… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Mar 4 11:23:08 2021 +0100 dwrite/tests: Remove overzealous test. While this test happens to always be true on Windows, this is just a property of the fallback fonts installed on the system, not a property of the code. Since we cannot control the fonts installed on users' computers, it makes no sense to do this test. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/layout.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index cc4079faa14..43a00b7e22e 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -4699,12 +4699,6 @@ todo_wine { todo_wine ok(font != NULL, "got %p\n", font); if (font) { - /* font returned for Hiragana character, check if it supports Latin too */ - exists = FALSE; - hr = IDWriteFont_HasCharacter(font, 'b', &exists); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(exists, "got %d\n", exists); - IDWriteFont_Release(font); } /* Try with explicit collection, Tahoma will be forced. */

1 0

Alexandre Julliard : include: Always define 32- and 64-bit versions of the TEB and PEB structures.
by Alexandre Julliard 05 Mar '21

05 Mar '21

Module: wine Branch: master Commit: e2659819b8193b151980e80679af1fa4748eb640 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2659819b8193b151980e806… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 5 15:53:19 2021 +0100 include: Always define 32- and 64-bit versions of the TEB and PEB structures. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dbghelp_private.h | 21 ---- dlls/kernelbase/debug.c | 32 ------ include/winternl.h | 251 ++++++++++++++++++++++++++++++++++++++++- 3 files changed, 248 insertions(+), 56 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e2659819b8193b151980…

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 05 Mar '21

05 Mar '21

Module: wine Branch: master Commit: 784faaaea4bba9100da49f07bc895a665103a280 URL: https://source.winehq.org/git/wine.git/?a=commit;h=784faaaea4bba9100da49f07… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Fri Mar 5 09:06:34 2021 +0200 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/po/lt.po b/po/lt.po index 8f3cc4dc3b6..74b49da407e 100644 --- a/po/lt.po +++ b/po/lt.po @@ -1,18 +1,18 @@ # Lithuanian translations for Wine -# Aurimas Fišeras <aurimas(a)members.fsf.org>, 2011-2020. +# Aurimas Fišeras <aurimas(a)members.fsf.org>, 2011-2021. msgid "" msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2020-11-09 23:18+0200\n" +"PO-Revision-Date: 2021-03-05 09:05+0200\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.4.1\n" +"X-Generator: Poedit 2.4.2\n" "X-Project-Style: default\n" #: dlls/aclui/aclui.rc:29 dlls/inetcpl.cpl/inetcpl.rc:90 @@ -21,26 +21,20 @@ msgid "Security" msgstr "Saugumas" #: dlls/aclui/aclui.rc:32 -#, fuzzy -#| msgid "&User name:" msgid "&Group or user names:" -msgstr "&Naudotojo vardas:" +msgstr "&Grupių ar naudotojų vardai:" #: dlls/aclui/aclui.rc:38 -#, fuzzy -#| msgid "Yellow" msgid "Allow" -msgstr "Geltona" +msgstr "Leisti" #: dlls/aclui/aclui.rc:39 msgid "Deny" -msgstr "" +msgstr "Drausti" #: dlls/aclui/aclui.rc:47 -#, fuzzy -#| msgid "Permission denied" msgid "Permissions for %1" -msgstr "Prieiga nesuteikta" +msgstr "%1 teisės" #: dlls/appwiz.cpl/appwiz.rc:58 msgid "Install/Uninstall"

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