wine-commits April 2019

wine-commits@winehq.org

1 participants
803 discussions

Alistair Leslie-Hughes : include: Wrap D3DX10 functions in extern "C".
by Alexandre Julliard 03 Apr '19

03 Apr '19

Module: wine Branch: master Commit: 0501ad920afd208d85cf807c9fcec1d4e8245164 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0501ad920afd208d85cf807c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Apr 1 03:35:12 2019 +0000 include: Wrap D3DX10 functions in extern "C". Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3dx10core.idl | 6 ++++++ … [View More]

1 0

Zebediah Figura : d3d9: Forbid creating a stateblock while recording.
by Alexandre Julliard 03 Apr '19

03 Apr '19

Module: wine Branch: master Commit: dd0bed46a56867ed5a03ee2a6ea06d35d925cecf URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd0bed46a56867ed5a03ee2a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Apr 2 12:42:48 2019 -0500 d3d9: Forbid creating a stateblock while recording. 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… [View More]

1 0

Zebediah Figura : d3d9: Forbid capturing a stateblock while recording.
by Alexandre Julliard 03 Apr '19

03 Apr '19

Module: wine Branch: master Commit: 3e87746eb7b56619298ad18e2c04c9efea24406b URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e87746eb7b56619298ad18e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Apr 2 12:42:47 2019 -0500 d3d9: Forbid capturing a stateblock while recording. 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&… [View More]

1 0

Zebediah Figura : d3d9: Forbid applying a stateblock while recording.
by Alexandre Julliard 03 Apr '19

03 Apr '19

Module: wine Branch: master Commit: 3fcec2b7566c2e58f5b430e9e596a610e39c90bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=3fcec2b7566c2e58f5b430e9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Apr 2 12:42:46 2019 -0500 d3d9: Forbid applying a stateblock while recording. 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… [View More]

1 0

Zebediah Figura : d3d9/tests: Add more tests for calling stateblock methods while recording.
by Alexandre Julliard 03 Apr '19

03 Apr '19

Module: wine Branch: master Commit: bfe911e86c202adf4e6df807948c0a51d55e555f URL: https://source.winehq.org/git/wine.git/?a=commit;h=bfe911e86c202adf4e6df807… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Apr 2 12:42:45 2019 -0500 d3d9/tests: Add more tests for calling stateblock methods while recording. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <… [View More]julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 63 +++++++++++++++++++++++++++++++++++------------- 1 file changed, 46 insertions(+), 17 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index f79f261..652b81a 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -10548,10 +10548,11 @@ cleanup: static void test_begin_end_state_block(void) { - IDirect3DStateBlock9 *stateblock; + IDirect3DStateBlock9 *stateblock, *stateblock2; IDirect3DDevice9 *device; IDirect3D9 *d3d; ULONG refcount; + DWORD value; HWND window; HRESULT hr; @@ -10566,33 +10567,61 @@ static void test_begin_end_state_block(void) return; } - /* Should succeed. */ hr = IDirect3DDevice9_BeginStateBlock(device); - ok(SUCCEEDED(hr), "Failed to begin stateblock, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - /* Calling BeginStateBlock() while recording should return - * D3DERR_INVALIDCALL. */ - hr = IDirect3DDevice9_BeginStateBlock(device); - ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - /* Should succeed. */ stateblock = (IDirect3DStateBlock9 *)0xdeadbeef; hr = IDirect3DDevice9_EndStateBlock(device, &stateblock); - ok(SUCCEEDED(hr), "Failed to end stateblock, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); ok(!!stateblock && stateblock != (IDirect3DStateBlock9 *)0xdeadbeef, "Got unexpected stateblock %p.\n", stateblock); - IDirect3DStateBlock9_Release(stateblock); - /* Calling EndStateBlock() while not recording should return - * D3DERR_INVALIDCALL. stateblock should not be touched. */ - stateblock = (IDirect3DStateBlock9 *)0xdeadbeef; - hr = IDirect3DDevice9_EndStateBlock(device, &stateblock); + stateblock2 = (IDirect3DStateBlock9 *)0xdeadbeef; + hr = IDirect3DDevice9_EndStateBlock(device, &stateblock2); ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); - ok(stateblock == (IDirect3DStateBlock9 *)0xdeadbeef, - "Got unexpected stateblock %p.\n", stateblock); + ok(stateblock2 == (IDirect3DStateBlock9 *)0xdeadbeef, + "Got unexpected stateblock %p.\n", stateblock2); + + hr = IDirect3DDevice9_GetRenderState(device, D3DRS_LIGHTING, &value); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(value == TRUE, "Got unexpected value %#x.\n", value); + + hr = IDirect3DDevice9_BeginStateBlock(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_BeginStateBlock(device); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DStateBlock9_Apply(stateblock); + todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DStateBlock9_Capture(stateblock); + todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_CreateStateBlock(device, D3DSBT_ALL, &stateblock2); + todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_GetRenderState(device, D3DRS_LIGHTING, &value); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(value == TRUE, "Got unexpected value %#x.\n", value); + + hr = IDirect3DDevice9_EndStateBlock(device, &stateblock2); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DStateBlock9_Apply(stateblock2); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_GetRenderState(device, D3DRS_LIGHTING, &value); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + todo_wine ok(value == TRUE, "Got unexpected value %#x.\n", value); + + IDirect3DStateBlock9_Release(stateblock); + IDirect3DStateBlock9_Release(stateblock2); refcount = IDirect3DDevice9_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); + todo_wine ok(!refcount, "Device has %u references left.\n", refcount); IDirect3D9_Release(d3d); DestroyWindow(window); } [View Less]

1 0

Francois Gouget : Disable multithreaded DirectX tests if WINETEST_NO_MT_D3D is set.
by Alexandre Julliard 03 Apr '19

03 Apr '19

Module: wine Branch: master Commit: 1684b011189435d9bd3d6838be4cf1ce62edba4d URL: https://source.winehq.org/git/wine.git/?a=commit;h=1684b011189435d9bd3d6838… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Apr 2 19:26:10 2019 +0200 Disable multithreaded DirectX tests if WINETEST_NO_MT_D3D is set. The nouveau graphics driver's support for multithreaded OpenGL is buggy at least up to (18.2.8) so that any Wine test that performs multithreaded OpenGL accesses freezes, … [View More]crashes the Mesa stack and eventually freezes the whole computer. Typically the first such test is d2d1:d2d1. The relevant tests have a --single option but WineTest neither knows which tests accept this option, nor whether it is needed for the current host. The WINETEST_NO_MT_D3D environnement variable can be set on hosts that need it (such as the cw2-gtx560 box) and is automatically inherited by the relevant tests thus working around this issue. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 2 ++ dlls/d3d10core/tests/d3d10core.c | 2 ++ dlls/d3d11/tests/d3d11.c | 2 ++ dlls/dxgi/tests/dxgi.c | 2 ++ 4 files changed, 8 insertions(+) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 2214be6..f8fc1f5 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -8051,6 +8051,8 @@ START_TEST(d2d1) unsigned int argc, i; char **argv; + use_mt = !getenv("WINETEST_NO_MT_D3D"); + argc = winetest_get_mainargs(&argv); for (i = 2; i < argc; ++i) { diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index 00bd16b..f799922 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -17925,6 +17925,8 @@ START_TEST(d3d10core) unsigned int argc, i; char **argv; + use_mt = !getenv("WINETEST_NO_MT_D3D"); + argc = winetest_get_mainargs(&argv); for (i = 2; i < argc; ++i) { diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 90bcbae..d5445ef 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -29191,6 +29191,8 @@ START_TEST(d3d11) unsigned int argc, i; char **argv; + use_mt = !getenv("WINETEST_NO_MT_D3D"); + argc = winetest_get_mainargs(&argv); for (i = 2; i < argc; ++i) { diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 91d218f..79e4bc0 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -5041,6 +5041,8 @@ START_TEST(dxgi) registry_mode.dmSize = sizeof(registry_mode); ok(EnumDisplaySettingsW(NULL, ENUM_REGISTRY_SETTINGS, &registry_mode), "Failed to get display mode.\n"); + use_mt = !getenv("WINETEST_NO_MT_D3D"); + argc = winetest_get_mainargs(&argv); for (i = 2; i < argc; ++i) { [View Less]

1 0

Michael Müller : server: Correctly validate SID length in sd_is_valid.
by Alexandre Julliard 03 Apr '19

03 Apr '19

Module: wine Branch: master Commit: f926811e0df963319aa1b7903c368fbfe4a51986 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f926811e0df963319aa1b790… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Apr 3 17:44:31 2019 +0200 server: Correctly validate SID length in sd_is_valid. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/token.c | 6 ++---- 1 file changed, 2 … [View More]

1 0

Piotr Caban : winex11.drv: Don't use strcasecmp.
by Alexandre Julliard 03 Apr '19

03 Apr '19

Module: wine Branch: master Commit: b8f0a28e8cae5e268e44ae556de1fd583759ed7d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8f0a28e8cae5e268e44ae55… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 3 18:23:18 2019 +0200 winex11.drv: Don't use strcasecmp. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/keyboard.c | 2 +- dlls/winex11.drv/xim.c | 7 ++++--- … [View More]dlls/winex11.drv/xrender.c | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index b9b8293..3b8d916 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -2334,7 +2334,7 @@ INT CDECL X11DRV_GetKeyNameText(LONG lParam, LPWSTR lpBuffer, INT nSize) if (name && (vkey == VK_SHIFT || vkey == VK_CONTROL || vkey == VK_MENU)) { char* idx = strrchr(name, '_'); - if (idx && (strcasecmp(idx, "_r") == 0 || strcasecmp(idx, "_l") == 0)) + if (idx && (_strnicmp(idx, "_r", -1) == 0 || _strnicmp(idx, "_l", -1) == 0)) { LeaveCriticalSection( &kbd_section ); TRACE("found scan=%04x keyc=%u keysym=%lx modified_string=%s\n", diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c index f6af293..44fe62e 100644 --- a/dlls/winex11.drv/xim.c +++ b/dlls/winex11.drv/xim.c @@ -28,6 +28,7 @@ #include "winuser.h" #include "wingdi.h" #include "winnls.h" +#include "winternl.h" #include "x11drv.h" #include "imm.h" #include "wine/debug.h" @@ -293,11 +294,11 @@ void X11DRV_SetPreeditState(HWND hwnd, BOOL fOpen) */ BOOL X11DRV_InitXIM( const char *input_style ) { - if (!strcasecmp(input_style, "offthespot")) + if (!_strnicmp(input_style, "offthespot", -1)) ximStyleRequest = STYLE_OFFTHESPOT; - else if (!strcasecmp(input_style, "overthespot")) + else if (!_strnicmp(input_style, "overthespot", -1)) ximStyleRequest = STYLE_OVERTHESPOT; - else if (!strcasecmp(input_style, "root")) + else if (!_strnicmp(input_style, "root", -1)) ximStyleRequest = STYLE_ROOT; if (!XSupportsLocale()) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 4d04741..8350bad 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -800,7 +800,7 @@ static UINT get_xft_aa_flags( const LOGFONTW *lf ) if (!(value = XGetDefault( gdi_display, "Xft", "antialias" ))) break; TRACE( "got antialias '%s'\n", value ); if (tolower(value[0]) == 'f' || tolower(value[0]) == 'n' || - value[0] == '0' || !strcasecmp( value, "off" )) + value[0] == '0' || !_strnicmp( value, "off", -1 )) { ret = GGO_BITMAP; break; [View Less]

1 0

Piotr Caban : wininet: Don't use strcasecmp.
by Alexandre Julliard 03 Apr '19

03 Apr '19

Module: wine Branch: master Commit: 380d5dff85eefaca79ffece33c484aaf922730a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=380d5dff85eefaca79ffece3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 3 18:22:33 2019 +0200 wininet: Don't use strcasecmp. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/ftp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --… [View More]

1 0

Piotr Caban : ws2_32: Don't use strcasecmp.
by Alexandre Julliard 03 Apr '19

03 Apr '19

Module: wine Branch: master Commit: 17779b44d10c3eff0a4b3b8b239da8a5966d07df URL: https://source.winehq.org/git/wine.git/?a=commit;h=17779b44d10c3eff0a4b3b8b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 3 18:20:39 2019 +0200 ws2_32: Don't use strcasecmp. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --… [View More]

1 0

← Newer
1
...
63
64
65
66
67
68
69
...
81
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2019