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

Józef Kucia : wined3d: Add support for seamless cube map filtering.
by Alexandre Julliard 08 Mar '17

08 Mar '17

Module: wine Branch: master Commit: c7f3308db7a6c5ff92a43095fdc260460f3b4d7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7f3308db7a6c5ff92a43095f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Mar 8 12:07:23 2017 +0100 wined3d: Add support for seamless cube map filtering. Seamless cube map filtering should always be enabled in D3D10+. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/directx.c | 3 ++- dlls/d3d9/directx.c | 2 +- dlls/ddraw/ddraw_private.h | 3 ++- dlls/wined3d/context.c | 8 +++++++- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_gl.h | 1 + include/wine/wined3d.h | 1 + 7 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index f91e4af..107e32d 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -411,7 +411,8 @@ BOOL d3d8_init(struct d3d8 *d3d8) { DWORD flags = WINED3D_LEGACY_DEPTH_BIAS | WINED3D_VIDMEM_ACCOUNTING | WINED3D_HANDLE_RESTORE | WINED3D_PIXEL_CENTER_INTEGER - | WINED3D_LEGACY_UNBOUND_RESOURCE_COLOR | WINED3D_NO_PRIMITIVE_RESTART; + | WINED3D_LEGACY_UNBOUND_RESOURCE_COLOR | WINED3D_NO_PRIMITIVE_RESTART + | WINED3D_LEGACY_CUBEMAP_FILTERING; d3d8->IDirect3D8_iface.lpVtbl = &d3d8_vtbl; d3d8->refcount = 1; diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index cdbe2fc..fe7163f 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -580,7 +580,7 @@ BOOL d3d9_init(struct d3d9 *d3d9, BOOL extended) { DWORD flags = WINED3D_PRESENT_CONVERSION | WINED3D_HANDLE_RESTORE | WINED3D_PIXEL_CENTER_INTEGER | WINED3D_SRGB_READ_WRITE_CONTROL | WINED3D_LEGACY_UNBOUND_RESOURCE_COLOR - | WINED3D_NO_PRIMITIVE_RESTART; + | WINED3D_NO_PRIMITIVE_RESTART | WINED3D_LEGACY_CUBEMAP_FILTERING; if (!extended) flags |= WINED3D_VIDMEM_ACCOUNTING; diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 1737ce6..48b6c70 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -61,7 +61,8 @@ struct FvfToDecl #define DDRAW_WINED3D_FLAGS (WINED3D_LEGACY_DEPTH_BIAS | WINED3D_VIDMEM_ACCOUNTING \ | WINED3D_RESTORE_MODE_ON_ACTIVATE | WINED3D_FOCUS_MESSAGES | WINED3D_PIXEL_CENTER_INTEGER \ - | WINED3D_LEGACY_UNBOUND_RESOURCE_COLOR | WINED3D_NO_PRIMITIVE_RESTART) + | WINED3D_LEGACY_UNBOUND_RESOURCE_COLOR | WINED3D_NO_PRIMITIVE_RESTART \ + | WINED3D_LEGACY_CUBEMAP_FILTERING) enum ddraw_device_state { diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 8fac19e..a423fac 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1969,13 +1969,19 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, if (gl_info->supported[ARB_ES3_COMPATIBILITY]) { gl_info->gl_ops.gl.p_glEnable(GL_PRIMITIVE_RESTART_FIXED_INDEX); - checkGLcall("Enable GL_PRIMITIVE_RESTART_FIXED_INDEX"); + checkGLcall("enable GL_PRIMITIVE_RESTART_FIXED_INDEX"); } else { FIXME("OpenGL implementation does not support GL_PRIMITIVE_RESTART_FIXED_INDEX.\n"); } } + if (!(d3d_info->wined3d_creation_flags & WINED3D_LEGACY_CUBEMAP_FILTERING) + && gl_info->supported[ARB_SEAMLESS_CUBE_MAP]) + { + gl_info->gl_ops.gl.p_glEnable(GL_TEXTURE_CUBE_MAP_SEAMLESS); + checkGLcall("enable seamless cube map filtering"); + } if (gl_info->supported[ARB_CLIP_CONTROL]) GL_EXTCALL(glPointParameteri(GL_POINT_SPRITE_COORD_ORIGIN, GL_LOWER_LEFT)); device->shader_backend->shader_init_context_state(ret); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 425d1fd..51c6ad2 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -147,6 +147,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_point_sprite", ARB_POINT_SPRITE }, {"GL_ARB_provoking_vertex", ARB_PROVOKING_VERTEX }, {"GL_ARB_sampler_objects", ARB_SAMPLER_OBJECTS }, + {"GL_ARB_seamless_cube_map", ARB_SEAMLESS_CUBE_MAP }, {"GL_ARB_shader_atomic_counters", ARB_SHADER_ATOMIC_COUNTERS }, {"GL_ARB_shader_bit_encoding", ARB_SHADER_BIT_ENCODING }, {"GL_ARB_shader_image_load_store", ARB_SHADER_IMAGE_LOAD_STORE }, @@ -3765,6 +3766,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, * extension for core-only support. */ {ARB_FRAGMENT_COORD_CONVENTIONS, MAKEDWORD_VERSION(3, 2)}, {ARB_PROVOKING_VERTEX, MAKEDWORD_VERSION(3, 2)}, + {ARB_SEAMLESS_CUBE_MAP, MAKEDWORD_VERSION(3, 2)}, {ARB_SYNC, MAKEDWORD_VERSION(3, 2)}, {ARB_VERTEX_ARRAY_BGRA, MAKEDWORD_VERSION(3, 2)}, diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 00fb7cb..99930c4 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -80,6 +80,7 @@ enum wined3d_gl_extension ARB_POINT_SPRITE, ARB_PROVOKING_VERTEX, ARB_SAMPLER_OBJECTS, + ARB_SEAMLESS_CUBE_MAP, ARB_SHADER_ATOMIC_COUNTERS, ARB_SHADER_BIT_ENCODING, ARB_SHADER_IMAGE_LOAD_STORE, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 0fcf07c..acdb4f3 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1279,6 +1279,7 @@ enum wined3d_shader_byte_code_format #define WINED3D_SRGB_READ_WRITE_CONTROL 0x00000200 #define WINED3D_LEGACY_UNBOUND_RESOURCE_COLOR 0x00000400 #define WINED3D_NO_PRIMITIVE_RESTART 0x00000800 +#define WINED3D_LEGACY_CUBEMAP_FILTERING 0x00001000 #define WINED3D_RESZ_CODE 0x7fa05000

1 0

Józef Kucia : d3d11: Fix typo in TRACE() message.
by Alexandre Julliard 08 Mar '17

08 Mar '17

Module: wine Branch: master Commit: 918521109b4a9ba3743503868179aae25d7bf4ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=918521109b4a9ba3743503868… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Mar 8 12:07:24 2017 +0100 d3d11: Fix typo in TRACE() message. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 336692e..c641ccf 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2078,7 +2078,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_CSGetConstantBuffers(ID3D1 struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); unsigned int i; - TRACE("iface %p, start_slot %u, buffer_count %u, buffer %p.\n", + TRACE("iface %p, start_slot %u, buffer_count %u, buffers %p.\n", iface, start_slot, buffer_count, buffers); wined3d_mutex_lock();

1 0

Julian Rüger : readme: Fix typo in German translation.
by Alexandre Julliard 08 Mar '17

08 Mar '17

Module: wine Branch: master Commit: a8082a634d9eaedda94e498fec3c971f30b5c31d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8082a634d9eaedda94e498fe… Author: Julian Rüger <jr98(a)gmx.net> Date: Wed Mar 8 15:58:41 2017 +0100 readme: Fix typo in German translation. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- documentation/README.de | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/documentation/README.de b/documentation/README.de index 4467e9f..9e65e97 100644 --- a/documentation/README.de +++ b/documentation/README.de @@ -97,8 +97,8 @@ Um Wine zu kompilieren, führen Sie aus: make Damit werden das Programm "wine" und diverse unterstützende Bibliotheken und -Binärdateienerschiedener erstellt. Das Programm "wine" lädt ausführbare -Windows-Dateien und führt diese aus. +Binärdateien erstellt. Das Programm "wine" lädt ausführbare Windows-Dateien +und führt diese aus. Die Bibliothek "libwine" ("Winelib") kann benutzt werden, um Windows-Quelltexte unter Unix zu kompilieren und zu verlinken.

1 0

Sebastian Lackner : rasapi32: Set *lpcDevices in RasEnumDevicesA.
by Alexandre Julliard 08 Mar '17

08 Mar '17

Module: wine Branch: master Commit: f3842e789b61964643e5000bb36366d1727ee122 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3842e789b61964643e5000bb… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Mar 8 11:59:31 2017 -0300 rasapi32: Set *lpcDevices in RasEnumDevicesA. Signed-off-by: Bruno Jesus <bjesus(a)codeweavers.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rasapi32/rasapi.c | 2 ++ dlls/rasapi32/tests/rasapi.c | 21 +++++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/dlls/rasapi32/rasapi.c b/dlls/rasapi32/rasapi.c index fcd0cb8..b1721c6 100644 --- a/dlls/rasapi32/rasapi.c +++ b/dlls/rasapi32/rasapi.c @@ -254,6 +254,8 @@ DWORD WINAPI RasEnumDevicesA(LPRASDEVINFOA lpRasDevinfo, LPDWORD lpcb, LPDWORD l if(lpRasDevinfo && lpRasDevinfo->dwSize != sizeof(RASDEVINFOA)) return ERROR_INVALID_SIZE; + *lpcDevices = 1; + if (!lpRasDevinfo || (*lpcb < sizeof(RASDEVINFOA))) { *lpcb = sizeof(RASDEVINFOA); return ERROR_BUFFER_TOO_SMALL; diff --git a/dlls/rasapi32/tests/rasapi.c b/dlls/rasapi32/tests/rasapi.c index e0ff25f..5171bb2 100644 --- a/dlls/rasapi32/tests/rasapi.c +++ b/dlls/rasapi32/tests/rasapi.c @@ -77,54 +77,71 @@ static void test_rasenum(void) /* test first parameter */ cb = bufsize; + cDevices = 0xdeadbeef; result = pRasEnumDevicesA(NULL, &cb, &cDevices); + ok(0 < cDevices && cDevices < 32, "expected 0 < cDevices < 32, got %u\n", cDevices); ok(result == ERROR_BUFFER_TOO_SMALL || result == ERROR_INVALID_USER_BUFFER, /* win98 */ "Expected ERROR_BUFFER_TOO_SMALL, got %08d\n", result); rasDevInfo[0].dwSize = 0; cb = bufsize; + cDevices = 0xdeadbeef; result = pRasEnumDevicesA(rasDevInfo, &cb, &cDevices); + ok(cDevices == 0xdeadbeef, "expected cDevices = 0xdeadbeef, got %u\n", cDevices); ok(result == ERROR_INVALID_SIZE || result == ERROR_INVALID_USER_BUFFER, /* win98 */ "Expected ERROR_INVALID_SIZE, got %08d\n", result); rasDevInfo[0].dwSize = sizeof(RASDEVINFOA) -1; cb = bufsize; + cDevices = 0xdeadbeef; result = pRasEnumDevicesA(rasDevInfo, &cb, &cDevices); + ok(cDevices == 0xdeadbeef, "expected cDevices = 0xdeadbeef, got %u\n", cDevices); ok(result == ERROR_INVALID_SIZE || result == ERROR_INVALID_USER_BUFFER, /* win98 */ "Expected ERROR_INVALID_SIZE, got %08d\n", result); rasDevInfo[0].dwSize = sizeof(RASDEVINFOA) +1; cb = bufsize; + cDevices = 0xdeadbeef; result = pRasEnumDevicesA(rasDevInfo, &cb, &cDevices); + ok(cDevices == 0xdeadbeef, "expected cDevices = 0xdeadbeef, got %u\n", cDevices); ok(result == ERROR_INVALID_SIZE || result == ERROR_INVALID_USER_BUFFER, /* win98 */ "Expected ERROR_INVALID_SIZE, got %08d\n", result); /* test second parameter */ rasDevInfo[0].dwSize = sizeof(RASDEVINFOA); + cDevices = 0xdeadbeef; result = pRasEnumDevicesA(rasDevInfo, NULL, &cDevices); + ok(cDevices == 0xdeadbeef, "expected cDevices = 0xdeadbeef, got %u\n", cDevices); ok(result == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %08d\n", result); rasDevInfo[0].dwSize = sizeof(RASDEVINFOA); cb = 0; + cDevices = 0xdeadbeef; result = pRasEnumDevicesA(rasDevInfo, &cb, &cDevices); + todo_wine + ok(cDevices == 0xdeadbeef, "expected cDevices = 0xdeadbeef, got %u\n", cDevices); ok(result == ERROR_BUFFER_TOO_SMALL || result == ERROR_INVALID_SIZE, /* vista, 2k8 */ "Expected ERROR_BUFFER_TOO_SMALL/ERROR_INVALID_SIZE, got %08d\n", result); rasDevInfo[0].dwSize = sizeof(RASDEVINFOA); cb = bufsize -1; + cDevices = 0xdeadbeef; result = pRasEnumDevicesA(rasDevInfo, &cb, &cDevices); + ok(0 < cDevices && cDevices < 32, "expected 0 < cDevices < 32, got %u\n", cDevices); ok(result == ERROR_BUFFER_TOO_SMALL, "Expected ERROR_BUFFER_TOO_SMALL, got %08d\n", result); rasDevInfo[0].dwSize = sizeof(RASDEVINFOA); cb = bufsize +1; + cDevices = 0xdeadbeef; result = pRasEnumDevicesA(rasDevInfo, &cb, &cDevices); + ok(0 < cDevices && cDevices < 32, "expected 0 < cDevices < 32, got %u\n", cDevices); ok(result == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %08d\n", result); @@ -136,7 +153,9 @@ static void test_rasenum(void) "Expected ERROR_INVALID_PARAMETER, got %08d\n", result); /* test combinations of invalid parameters */ + cDevices = 0xdeadbeef; result = pRasEnumDevicesA(NULL, NULL, &cDevices); + ok(cDevices == 0xdeadbeef, "expected cDevices = 0xdeadbeef, got %u\n", cDevices); ok(result == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %08d\n", result); @@ -147,7 +166,9 @@ static void test_rasenum(void) cb = 0; rasDevInfo[0].dwSize = 0; + cDevices = 0xdeadbeef; result = pRasEnumDevicesA(rasDevInfo, &cb, &cDevices); + ok(cDevices == 0xdeadbeef, "expected cDevices = 0xdeadbeef, got %u\n", cDevices); ok(result == ERROR_INVALID_SIZE || broken(result == ERROR_BUFFER_TOO_SMALL), /* win98 */ "Expected ERROR_INVALID_SIZE, got %08d\n", result);

1 0

Sebastian Lackner : include: Avoid typedef for tls_data.
by Alexandre Julliard 08 Mar '17

08 Mar '17

Module: wine Branch: master Commit: fc84f2462a212194af86bd8fcc2056c990a9c7bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc84f2462a212194af86bd8fc… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Mar 7 18:29:32 2017 +0100 include: Avoid typedef for tls_data. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/test.h | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/include/wine/test.h b/include/wine/test.h index bf353a5..af602c0 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -218,7 +218,7 @@ static LONG todo_successes; /* number of successful tests inside todo block */ static LONG todo_failures; /* number of failures inside todo block */ /* The following data must be kept track of on a per-thread basis */ -typedef struct +struct tls_data { const char* current_file; /* file of current check */ int current_line; /* line of current check */ @@ -226,19 +226,19 @@ typedef struct int todo_do_loop; char *str_pos; /* position in debug buffer */ char strings[2000]; /* buffer for debug strings */ -} tls_data; +}; static DWORD tls_index; -static tls_data* get_tls_data(void) +static struct tls_data *get_tls_data(void) { - tls_data* data; + struct tls_data *data; DWORD last_error; last_error=GetLastError(); data=TlsGetValue(tls_index); if (!data) { - data=HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(tls_data)); + data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*data)); data->str_pos = data->strings; TlsSetValue(tls_index,data); } @@ -249,7 +249,7 @@ static tls_data* get_tls_data(void) /* allocate some tmp space for a string */ static char *get_temp_buffer( size_t n ) { - tls_data *data = get_tls_data(); + struct tls_data *data = get_tls_data(); char *res = data->str_pos; if (res + n >= &data->strings[sizeof(data->strings)]) res = data->strings; @@ -260,7 +260,7 @@ static char *get_temp_buffer( size_t n ) /* release extra space that we requested in get_temp_buffer() */ static void release_temp_buffer( char *ptr, size_t size ) { - tls_data *data = get_tls_data(); + struct tls_data *data = get_tls_data(); data->str_pos = ptr + size; } @@ -273,7 +273,7 @@ static void exit_process( int code ) void winetest_set_location( const char* file, int line ) { - tls_data* data=get_tls_data(); + struct tls_data *data = get_tls_data(); data->current_file=strrchr(file,'/'); if (data->current_file==NULL) data->current_file=strrchr(file,'\\'); @@ -301,7 +301,7 @@ int broken( int condition ) */ int winetest_vok( int condition, const char *msg, __winetest_va_list args ) { - tls_data* data=get_tls_data(); + struct tls_data *data = get_tls_data(); if (data->todo_level) { @@ -358,7 +358,7 @@ void __winetest_cdecl winetest_ok( int condition, const char *msg, ... ) void __winetest_cdecl winetest_trace( const char *msg, ... ) { __winetest_va_list valist; - tls_data* data=get_tls_data(); + struct tls_data *data = get_tls_data(); if (winetest_debug > 0) { @@ -371,7 +371,7 @@ void __winetest_cdecl winetest_trace( const char *msg, ... ) void winetest_vskip( const char *msg, __winetest_va_list args ) { - tls_data* data=get_tls_data(); + struct tls_data *data = get_tls_data(); printf( "%s:%d: Tests skipped: ", data->current_file, data->current_line ); vprintf(msg, args); @@ -399,14 +399,14 @@ void __winetest_cdecl winetest_win_skip( const char *msg, ... ) void winetest_start_todo( int is_todo ) { - tls_data* data=get_tls_data(); + struct tls_data *data = get_tls_data(); data->todo_level = (data->todo_level << 1) | (is_todo != 0); data->todo_do_loop=1; } int winetest_loop_todo(void) { - tls_data* data=get_tls_data(); + struct tls_data *data = get_tls_data(); int do_loop=data->todo_do_loop; data->todo_do_loop=0; return do_loop; @@ -414,7 +414,7 @@ int winetest_loop_todo(void) void winetest_end_todo(void) { - tls_data* data=get_tls_data(); + struct tls_data *data = get_tls_data(); data->todo_level >>= 1; } @@ -613,7 +613,7 @@ static void usage( const char *argv0 ) /* trap unhandled exceptions */ static LONG CALLBACK exc_filter( EXCEPTION_POINTERS *ptrs ) { - tls_data *data = get_tls_data(); + struct tls_data *data = get_tls_data(); if (data->current_file) printf( "%s:%d: this is the last test seen before the exception\n",

1 0

Paul Gofman : d3dx9/tests: Add test for out of bounds array selector in effect.
by Alexandre Julliard 08 Mar '17

08 Mar '17

Module: wine Branch: master Commit: 8f86d5545b5ee1d7c0e4a379cc550142386365ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f86d5545b5ee1d7c0e4a379c… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed Mar 8 00:48:40 2017 +0300 d3dx9/tests: Add test for out of bounds array selector in effect. Signed-off-by: Paul Gofman <gofmanp(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/effect.c | 166 ++++++++++++++++++++++++++++++++++++++----- 1 file changed, 148 insertions(+), 18 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index b3845c5..56d9fe6 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -3813,6 +3813,40 @@ static const DWORD test_effect_preshader_effect_blob[] = #define TEST_EFFECT_PRESHADER_VSHADER_POS 2458 #define TEST_EFFECT_PRESHADER_VSHADER_LEN 13 +#define test_effect_preshader_compare_shader(a, b, c) \ + test_effect_preshader_compare_shader_(__LINE__, a, b, c) +static void test_effect_preshader_compare_shader_(unsigned int line, IDirect3DDevice9 *device, + int expected_shader_index, BOOL todo) +{ + IDirect3DVertexShader9 *vshader; + void *byte_code; + unsigned int byte_code_size; + HRESULT hr; + + hr = IDirect3DDevice9_GetVertexShader(device, &vshader); + ok_(__FILE__, line)(hr == D3D_OK, "IDirect3DDevice9_GetVertexShader result %#x.\n", hr); + + todo_wine_if(todo) + ok_(__FILE__, line)(!!vshader, "Got NULL vshader.\n"); + if (!vshader) + return; + + hr = IDirect3DVertexShader9_GetFunction(vshader, NULL, &byte_code_size); + ok_(__FILE__, line)(hr == D3D_OK, "IDirect3DVertexShader9_GetFunction %#x.\n", hr); + ok_(__FILE__, line)(byte_code_size > 1, "Got unexpected byte code size %u.\n", byte_code_size); + + byte_code = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, byte_code_size); + hr = IDirect3DVertexShader9_GetFunction(vshader, byte_code, &byte_code_size); + ok_(__FILE__, line)(hr == D3D_OK, "Got result %#x.\n", hr); + + todo_wine_if(todo) + ok_(__FILE__, line)(!memcmp(byte_code, &test_effect_preshader_effect_blob[TEST_EFFECT_PRESHADER_VSHADER_POS + + expected_shader_index * TEST_EFFECT_PRESHADER_VSHADER_LEN], byte_code_size), + "Incorrect shader selected.\n"); + HeapFree(GetProcessHeap(), 0, byte_code); + IDirect3DVertexShader9_Release(vshader); + } + static void test_effect_preshader(IDirect3DDevice9 *device) { static const D3DXVECTOR4 test_effect_preshader_fconstsv[] = @@ -3933,8 +3967,6 @@ static void test_effect_preshader(IDirect3DDevice9 *device) int idata[TEST_EFFECT_PRES_NINT][4]; BOOL bdata[TEST_EFFECT_PRES_NBOOL]; IDirect3DVertexShader9 *vshader; - void *byte_code; - unsigned int byte_code_size; unsigned int i, j; D3DCAPS9 caps; @@ -4071,22 +4103,7 @@ static void test_effect_preshader(IDirect3DDevice9 *device) hr = effect->lpVtbl->BeginPass(effect, 1); ok(hr == D3D_OK, "Got result %#x.\n", hr); - hr = IDirect3DDevice9_GetVertexShader(device, &vshader); - ok(hr == D3D_OK, "Got result %#x.\n", hr); - ok(!!vshader, "Got NULL vshader.\n"); - - hr = IDirect3DVertexShader9_GetFunction(vshader, NULL, &byte_code_size); - ok(hr == D3D_OK, "Got result %#x.\n", hr); - byte_code = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, byte_code_size); - hr = IDirect3DVertexShader9_GetFunction(vshader, byte_code, &byte_code_size); - ok(hr == D3D_OK, "Got result %#x.\n", hr); - ok(byte_code_size > 1, "Got unexpected byte code size %u.\n", byte_code_size); - ok(!memcmp(byte_code, - &test_effect_preshader_effect_blob[TEST_EFFECT_PRESHADER_VSHADER_POS + - TEST_EFFECT_PRESHADER_VSHADER_LEN], byte_code_size), - "Incorrect shader selected.\n"); - HeapFree(GetProcessHeap(), 0, byte_code); - IDirect3DVertexShader9_Release(vshader); + test_effect_preshader_compare_shader(device, 1, FALSE); hr = IDirect3DDevice9_SetVertexShader(device, NULL); ok(hr == D3D_OK, "Got result %#x.\n", hr); @@ -4284,6 +4301,118 @@ static void test_effect_isparameterused(IDirect3DDevice9 *device) effect->lpVtbl->Release(effect); } +static void test_effect_out_of_bounds_selector(IDirect3DDevice9 *device) +{ + ID3DXEffect *effect; + HRESULT hr; + D3DXHANDLE param; + int ivect[4]; + unsigned int passes_count; + IDirect3DVertexShader9 *vshader; + + hr = D3DXCreateEffect(device, test_effect_preshader_effect_blob, sizeof(test_effect_preshader_effect_blob), + NULL, NULL, 0, NULL, &effect, NULL); + + hr = effect->lpVtbl->Begin(effect, &passes_count, 0); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + ivect[0] = ivect[1] = ivect[3] = 1; + + param = effect->lpVtbl->GetParameterByName(effect, NULL, "g_iVect"); + ok(!!param, "GetParameterByName failed.\n"); + ivect[2] = 3; + hr = effect->lpVtbl->SetValue(effect, param, ivect, sizeof(ivect)); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + hr = IDirect3DDevice9_SetVertexShader(device, NULL); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + hr = effect->lpVtbl->BeginPass(effect, 1); + todo_wine ok(hr == E_FAIL, "Got result %#x.\n", hr); + if (SUCCEEDED(hr)) + effect->lpVtbl->EndPass(effect); + + hr = effect->lpVtbl->BeginPass(effect, 1); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + test_effect_preshader_compare_shader(device, 2, TRUE); + + hr = effect->lpVtbl->EndPass(effect); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + hr = IDirect3DDevice9_SetVertexShader(device, NULL); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + ivect[2] = -2; + hr = effect->lpVtbl->SetValue(effect, param, ivect, sizeof(ivect)); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + hr = effect->lpVtbl->BeginPass(effect, 1); + todo_wine ok(hr == E_FAIL, "Got result %#x.\n", hr); + if (SUCCEEDED(hr)) + hr = effect->lpVtbl->EndPass(effect); + + hr = IDirect3DDevice9_GetVertexShader(device, &vshader); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + ok(!vshader, "Got non NULL vshader.\n"); + + hr = effect->lpVtbl->BeginPass(effect, 1); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + test_effect_preshader_compare_shader(device, 2, TRUE); + + hr = effect->lpVtbl->EndPass(effect); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + ivect[2] = -1; + hr = effect->lpVtbl->SetValue(effect, param, ivect, sizeof(ivect)); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + hr = effect->lpVtbl->BeginPass(effect, 1); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + test_effect_preshader_compare_shader(device, 0, TRUE); + + hr = IDirect3DDevice9_SetVertexShader(device, NULL); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + ivect[2] = 3; + hr = effect->lpVtbl->SetValue(effect, param, ivect, sizeof(ivect)); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + hr = effect->lpVtbl->CommitChanges(effect); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + hr = IDirect3DDevice9_GetVertexShader(device, &vshader); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + ok(!vshader, "Got non NULL vshader.\n"); + + ivect[2] = -1; + hr = effect->lpVtbl->SetValue(effect, param, ivect, sizeof(ivect)); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + hr = effect->lpVtbl->CommitChanges(effect); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + hr = IDirect3DDevice9_GetVertexShader(device, &vshader); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + ok(!vshader, "Got non NULL vshader.\n"); + + ivect[2] = 1; + hr = effect->lpVtbl->SetValue(effect, param, ivect, sizeof(ivect)); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + hr = effect->lpVtbl->CommitChanges(effect); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + test_effect_preshader_compare_shader(device, 1, FALSE); + + hr = effect->lpVtbl->EndPass(effect); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + hr = effect->lpVtbl->End(effect); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + effect->lpVtbl->Release(effect); +} + START_TEST(effect) { HWND wnd; @@ -4327,6 +4456,7 @@ START_TEST(effect) test_effect_preshader(device); test_effect_preshader_ops(device); test_effect_isparameterused(device); + test_effect_out_of_bounds_selector(device); count = IDirect3DDevice9_Release(device); ok(count == 0, "The device was not properly freed: refcount %u\n", count);

1 0

Alexandre Julliard : gdi32: Add more helper functions for RGB to pixel conversions.
by Alexandre Julliard 08 Mar '17

08 Mar '17

Module: wine Branch: master Commit: 71d2d4ee966afb8732affb595c774c31c24ee53a URL: http://source.winehq.org/git/wine.git/?a=commit;h=71d2d4ee966afb8732affb595… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 8 20:57:41 2017 +0100 gdi32: Add more helper functions for RGB to pixel conversions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dibdrv/primitives.c | 301 ++++++++++++++++------------------------- 1 file changed, 115 insertions(+), 186 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=71d2d4ee966afb8732aff…

1 0

Alexandre Julliard : gdi32: Fix color conversion when blitting to 1-bpp by matching pixels instead of color values.
by Alexandre Julliard 08 Mar '17

08 Mar '17

Module: wine Branch: master Commit: 89d31e42fc64bf78d9390c55baa4fc8ec54539e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89d31e42fc64bf78d9390c55b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 8 21:03:59 2017 +0100 gdi32: Fix color conversion when blitting to 1-bpp by matching pixels instead of color values. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/bitblt.c | 12 ++----- dlls/gdi32/dib.c | 14 +++----- dlls/gdi32/dibdrv/primitives.c | 68 ++++++++++++++++++++------------------ dlls/gdi32/tests/dib.c | 74 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 118 insertions(+), 50 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=89d31e42fc64bf78d9390…

1 0

Alexandre Julliard : gdi32: Add support for DIBINDEX colors in 1-bpp blits.
by Alexandre Julliard 08 Mar '17

08 Mar '17

Module: wine Branch: master Commit: c54b667e25a8cff0919de9b22fa3265068ab4eb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c54b667e25a8cff0919de9b22… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 8 21:29:51 2017 +0100 gdi32: Add support for DIBINDEX colors in 1-bpp blits. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/bitblt.c | 19 +++++++++++-------- dlls/gdi32/dibdrv/bitblt.c | 2 +- dlls/gdi32/dibdrv/primitives.c | 27 +++++++++++++++------------ dlls/gdi32/gdi_private.h | 2 +- dlls/gdi32/tests/dib.c | 6 ++---- 5 files changed, 30 insertions(+), 26 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c54b667e25a8cff0919de…

1 0

Henri Verbeet : wined3d: Abort on invalid instructions in shader_generate_main().
by Alexandre Julliard 08 Mar '17

08 Mar '17

Module: wine Branch: master Commit: df6540edf0266225489fffcc5afec4752efcd9f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df6540edf0266225489fffcc5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 8 10:53:05 2017 +0100 wined3d: Abort on invalid instructions in shader_generate_main(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 6 ++++-- dlls/wined3d/glsl_shader.c | 25 ++++++++++++------------- dlls/wined3d/shader.c | 8 +++++--- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 22 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index ff868f9..150342b 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -3809,7 +3809,8 @@ static GLuint shader_arb_generate_pshader(const struct wined3d_shader *shader, } /* Base Shader Body */ - shader_generate_main(shader, buffer, reg_maps, &priv_ctx); + if (FAILED(shader_generate_main(shader, buffer, reg_maps, &priv_ctx))) + return 0; if(args->super.srgb_correction) { arbfp_add_sRGB_correction(buffer, fragcolor, srgbtmp[0], srgbtmp[1], srgbtmp[2], srgbtmp[3], @@ -4222,7 +4223,8 @@ static GLuint shader_arb_generate_vshader(const struct wined3d_shader *shader, /* The shader starts with the main function */ priv_ctx.in_main_func = TRUE; /* Base Shader Body */ - shader_generate_main(shader, buffer, reg_maps, &priv_ctx); + if (FAILED(shader_generate_main(shader, buffer, reg_maps, &priv_ctx))) + return -1; if (!priv_ctx.footer_written) vshader_add_footer(&priv_ctx, shader_data, args, reg_maps, gl_info, buffer); diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index d021f01..e43a78b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -6757,9 +6757,7 @@ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context const struct wined3d_gl_info *gl_info = context->gl_info; struct shader_glsl_ctx_priv priv_ctx; BOOL legacy_context = gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]; - - /* Create the hw GLSL shader object and assign it as the shader->prgId */ - GLuint shader_id = GL_EXTCALL(glCreateShader(GL_FRAGMENT_SHADER)); + GLuint shader_id; memset(&priv_ctx, 0, sizeof(priv_ctx)); priv_ctx.cur_ps_args = args; @@ -6850,7 +6848,8 @@ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context shader_glsl_input_pack(shader, buffer, &shader->input_signature, reg_maps, args, gl_info); /* Base Shader Body */ - shader_generate_main(shader, buffer, reg_maps, &priv_ctx); + if (FAILED(shader_generate_main(shader, buffer, reg_maps, &priv_ctx))) + return 0; /* In SM4+ the shader epilogue is generated by the "ret" instruction. */ if (reg_maps->shader_version.major < 4) @@ -6858,6 +6857,7 @@ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context shader_addline(buffer, "}\n"); + shader_id = GL_EXTCALL(glCreateShader(GL_FRAGMENT_SHADER)); TRACE("Compiling shader object %u.\n", shader_id); shader_glsl_compile(gl_info, shader_id, buffer->buffer); @@ -6916,9 +6916,7 @@ static GLuint shader_glsl_generate_vshader(const struct wined3d_context *context struct wined3d_string_buffer *buffer = &priv->shader_buffer; const struct wined3d_gl_info *gl_info = context->gl_info; struct shader_glsl_ctx_priv priv_ctx; - - /* Create the hw GLSL shader program and assign it as the shader->prgId */ - GLuint shader_id = GL_EXTCALL(glCreateShader(GL_VERTEX_SHADER)); + GLuint shader_id; shader_glsl_add_version_declaration(buffer, gl_info, &reg_maps->shader_version); @@ -6949,7 +6947,8 @@ static GLuint shader_glsl_generate_vshader(const struct wined3d_context *context shader_addline(buffer, "void main()\n{\n"); /* Base Shader Body */ - shader_generate_main(shader, buffer, reg_maps, &priv_ctx); + if (FAILED(shader_generate_main(shader, buffer, reg_maps, &priv_ctx))) + return 0; /* In SM4+ the shader epilogue is generated by the "ret" instruction. */ if (reg_maps->shader_version.major < 4) @@ -6957,6 +6956,7 @@ static GLuint shader_glsl_generate_vshader(const struct wined3d_context *context shader_addline(buffer, "}\n"); + shader_id = GL_EXTCALL(glCreateShader(GL_VERTEX_SHADER)); TRACE("Compiling shader object %u.\n", shader_id); shader_glsl_compile(gl_info, shader_id, buffer->buffer); @@ -6974,8 +6974,6 @@ static GLuint shader_glsl_generate_geometry_shader(const struct wined3d_context struct shader_glsl_ctx_priv priv_ctx; GLuint shader_id; - shader_id = GL_EXTCALL(glCreateShader(GL_GEOMETRY_SHADER)); - shader_glsl_add_version_declaration(buffer, gl_info, &reg_maps->shader_version); shader_glsl_enable_extensions(buffer, gl_info); @@ -6989,9 +6987,11 @@ static GLuint shader_glsl_generate_geometry_shader(const struct wined3d_context shader_addline(buffer, "uniform vec4 pos_fixup;\n"); shader_glsl_generate_sm4_rasterizer_input_setup(priv, shader, args->ps_input_count, gl_info); shader_addline(buffer, "void main()\n{\n"); - shader_generate_main(shader, buffer, reg_maps, &priv_ctx); + if (FAILED(shader_generate_main(shader, buffer, reg_maps, &priv_ctx))) + return 0; shader_addline(buffer, "}\n"); + shader_id = GL_EXTCALL(glCreateShader(GL_GEOMETRY_SHADER)); TRACE("Compiling shader object %u.\n", shader_id); shader_glsl_compile(gl_info, shader_id, buffer->buffer); @@ -7033,8 +7033,6 @@ static GLuint shader_glsl_generate_compute_shader(const struct wined3d_context * GLuint shader_id; unsigned int i; - shader_id = GL_EXTCALL(glCreateShader(GL_COMPUTE_SHADER)); - shader_glsl_add_version_declaration(buffer, gl_info, &reg_maps->shader_version); shader_glsl_enable_extensions(buffer, gl_info); @@ -7058,6 +7056,7 @@ static GLuint shader_glsl_generate_compute_shader(const struct wined3d_context * shader_generate_main(shader, buffer, reg_maps, &priv_ctx); shader_addline(buffer, "}\n"); + shader_id = GL_EXTCALL(glCreateShader(GL_COMPUTE_SHADER)); TRACE("Compiling shader object %u.\n", shader_id); shader_glsl_compile(gl_info, shader_id, buffer->buffer); diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 7186fdf..0c617c4 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -2282,7 +2282,7 @@ static void shader_dump_src_param(struct wined3d_string_buffer *buffer, /* Shared code in order to generate the bulk of the shader string. * NOTE: A description of how to parse tokens can be found on MSDN. */ -void shader_generate_main(const struct wined3d_shader *shader, struct wined3d_string_buffer *buffer, +HRESULT shader_generate_main(const struct wined3d_shader *shader, struct wined3d_string_buffer *buffer, const struct wined3d_shader_reg_maps *reg_maps, void *backend_ctx) { struct wined3d_device *device = shader->device; @@ -2320,8 +2320,8 @@ void shader_generate_main(const struct wined3d_shader *shader, struct wined3d_st /* Unknown opcode and its parameters. */ if (ins.handler_idx == WINED3DSIH_TABLE_SIZE) { - TRACE("Skipping unrecognized instruction.\n"); - continue; + WARN("Encountered unrecognised or invalid instruction.\n"); + return WINED3DERR_INVALIDCALL; } if (ins.predicate) @@ -2330,6 +2330,8 @@ void shader_generate_main(const struct wined3d_shader *shader, struct wined3d_st /* Call appropriate function for output target */ device->shader_backend->shader_handle_instruction(&ins); } + + return WINED3D_OK; } static void shader_dump_ins_modifiers(struct wined3d_string_buffer *buffer, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e8c858e..8d5eee5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3679,7 +3679,7 @@ BOOL string_buffer_init(struct wined3d_string_buffer *buffer) DECLSPEC_HIDDEN; void string_buffer_free(struct wined3d_string_buffer *buffer) DECLSPEC_HIDDEN; unsigned int shader_find_free_input_register(const struct wined3d_shader_reg_maps *reg_maps, unsigned int max) DECLSPEC_HIDDEN; -void shader_generate_main(const struct wined3d_shader *shader, struct wined3d_string_buffer *buffer, +HRESULT shader_generate_main(const struct wined3d_shader *shader, struct wined3d_string_buffer *buffer, const struct wined3d_shader_reg_maps *reg_maps, void *backend_ctx) DECLSPEC_HIDDEN; BOOL shader_match_semantic(const char *semantic_name, enum wined3d_decl_usage usage) DECLSPEC_HIDDEN;

1 0