April 2017 - Wine-Commits - list.winehq.org

Olivier F. R. Dierick : api-ms-win-core-processthreads-l1-1-0: Add some functions.
by Alexandre Julliard April 24, 2017

April 24, 2017

Module: wine Branch: master Commit: 61b573532b2c5b4b059a111e0aaade5b4b413016 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61b573532b2c5b4b059a111e0… Author: Olivier F. R. Dierick <o.dierick(a)piezo-forte.be> Date: Mon Apr 24 17:23:20 2017 +0200 api-ms-win-core-processthreads-l1-1-0: Add some functions. Signed-off-by: Olivier F. R. Dierick <o.dierick(a)piezo-forte.be> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-processthreads-l1-1-0.spec | 8 ++++---- tools/make_specfiles | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/api-ms-win-core-processthreads-l1-1-0/api-ms-win-core-processthreads-l1-1-0.spec b/dlls/api-ms-win-core-processthreads-l1-1-0/api-ms-win-core-processthreads-l1-1-0.spec index e555071..77414bc 100644 --- a/dlls/api-ms-win-core-processthreads-l1-1-0/api-ms-win-core-processthreads-l1-1-0.spec +++ b/dlls/api-ms-win-core-processthreads-l1-1-0/api-ms-win-core-processthreads-l1-1-0.spec @@ -1,5 +1,5 @@ @ stdcall CreateProcessA(str str ptr ptr long long ptr str ptr ptr) kernel32.CreateProcessA -@ stub CreateProcessAsUserW +@ stdcall CreateProcessAsUserW(long wstr wstr ptr ptr long long ptr wstr ptr ptr) advapi32.CreateProcessAsUserW @ stdcall CreateProcessW(wstr wstr ptr ptr long long ptr wstr ptr ptr) kernel32.CreateProcessW @ stdcall CreateRemoteThread(long ptr long ptr long long ptr) kernel32.CreateRemoteThread @ stub CreateRemoteThreadEx @@ -24,9 +24,9 @@ @ stdcall GetThreadPriority(long) kernel32.GetThreadPriority @ stdcall GetThreadPriorityBoost(long ptr) kernel32.GetThreadPriorityBoost @ stdcall InitializeProcThreadAttributeList(ptr long long ptr) kernel32.InitializeProcThreadAttributeList -@ stub OpenProcessToken +@ stdcall OpenProcessToken(long long ptr) advapi32.OpenProcessToken @ stdcall OpenThread(long long long) kernel32.OpenThread -@ stub OpenThreadToken +@ stdcall OpenThreadToken(long long long ptr) advapi32.OpenThreadToken @ stdcall ProcessIdToSessionId(long ptr) kernel32.ProcessIdToSessionId @ stub QueryProcessAffinityUpdateMode @ stdcall QueueUserAPC(ptr long long) kernel32.QueueUserAPC @@ -37,7 +37,7 @@ @ stdcall SetThreadPriority(long long) kernel32.SetThreadPriority @ stdcall SetThreadPriorityBoost(long long) kernel32.SetThreadPriorityBoost @ stdcall SetThreadStackGuarantee(ptr) kernel32.SetThreadStackGuarantee -@ stub SetThreadToken +@ stdcall SetThreadToken(ptr ptr) advapi32.SetThreadToken @ stdcall SuspendThread(long) kernel32.SuspendThread @ stdcall SwitchToThread() kernel32.SwitchToThread @ stdcall TerminateProcess(long long) kernel32.TerminateProcess diff --git a/tools/make_specfiles b/tools/make_specfiles index b36664d..a9b0c32 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -157,7 +157,6 @@ my @dll_groups = "api-ms-win-appmodel-identity-l1-1-0", "api-ms-win-appmodel-runtime-l1-1-1", "api-ms-win-downlevel-normaliz-l1-1-0", - "api-ms-win-core-processthreads-l1-1-0", "api-ms-win-core-appcompat-l1-1-1", "api-ms-win-core-atoms-l1-1-0", "api-ms-win-core-debug-l1-1-0", @@ -247,6 +246,7 @@ my @dll_groups = "advapi32", "api-ms-win-core-namedpipe-l1-1-0", "api-ms-win-core-namedpipe-l1-2-0", + "api-ms-win-core-processthreads-l1-1-0", "api-ms-win-core-processthreads-l1-1-1", ], [

1 0

Jacek Caban : server: Use common get_fd_type implementation for both pipe end implementations.
by Alexandre Julliard April 24, 2017

April 24, 2017

Module: wine Branch: master Commit: f6b2ccc54b7183ac3e29c0d8b84244cbf2ae3ad0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6b2ccc54b7183ac3e29c0d8b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 24 15:18:14 2017 +0200 server: Use common get_fd_type implementation for both pipe end implementations. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/named_pipe.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/server/named_pipe.c b/server/named_pipe.c index a10ba46..b8ea426 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -153,6 +153,7 @@ static const struct object_ops named_pipe_ops = }; /* common server and client pipe end functions */ +static enum server_fd_type pipe_end_get_fd_type( struct fd *fd ); static obj_handle_t pipe_end_read( struct fd *fd, struct async *async, file_pos_t pos ); static obj_handle_t pipe_end_write( struct fd *fd, struct async *async_data, file_pos_t pos ); static void pipe_end_queue_async( struct fd *fd, struct async *async, int type, int count ); @@ -163,7 +164,6 @@ static void pipe_server_dump( struct object *obj, int verbose ); static struct fd *pipe_server_get_fd( struct object *obj ); static void pipe_server_destroy( struct object *obj); static obj_handle_t pipe_server_flush( struct fd *fd, struct async *async ); -static enum server_fd_type pipe_server_get_fd_type( struct fd *fd ); static obj_handle_t pipe_server_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); static const struct object_ops pipe_server_ops = @@ -192,7 +192,7 @@ static const struct fd_ops pipe_server_fd_ops = { default_fd_get_poll_events, /* get_poll_events */ default_poll_event, /* poll_event */ - pipe_server_get_fd_type, /* get_fd_type */ + pipe_end_get_fd_type, /* get_fd_type */ pipe_end_read, /* read */ pipe_end_write, /* write */ pipe_server_flush, /* flush */ @@ -208,7 +208,6 @@ static struct fd *pipe_client_get_fd( struct object *obj ); static void pipe_client_destroy( struct object *obj ); static obj_handle_t pipe_client_flush( struct fd *fd, struct async *async ); static obj_handle_t pipe_client_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); -static enum server_fd_type pipe_client_get_fd_type( struct fd *fd ); static const struct object_ops pipe_client_ops = { @@ -236,7 +235,7 @@ static const struct fd_ops pipe_client_fd_ops = { default_fd_get_poll_events, /* get_poll_events */ default_poll_event, /* poll_event */ - pipe_client_get_fd_type, /* get_fd_type */ + pipe_end_get_fd_type, /* get_fd_type */ pipe_end_read, /* read */ pipe_end_write, /* write */ pipe_client_flush, /* flush */ @@ -917,12 +916,7 @@ static inline int is_overlapped( unsigned int options ) return !(options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT)); } -static enum server_fd_type pipe_server_get_fd_type( struct fd *fd ) -{ - return FD_TYPE_PIPE; -} - -static enum server_fd_type pipe_client_get_fd_type( struct fd *fd ) +static enum server_fd_type pipe_end_get_fd_type( struct fd *fd ) { return FD_TYPE_PIPE; }

1 0

Józef Kucia : wined3d: Introduce wined3d_device_get_unordered_access_view().
by Alexandre Julliard April 24, 2017

April 24, 2017

Module: wine Branch: master Commit: c9549b03f567887307a0e798502b6036a2c783fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9549b03f567887307a0e7985… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 24 12:02:32 2017 +0200 wined3d: Introduce wined3d_device_get_unordered_access_view(). 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/wined3d/device.c | 8 ++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 3 files changed, 11 insertions(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4cf0384..645272d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2898,6 +2898,14 @@ void CDECL wined3d_device_set_unordered_access_view(struct wined3d_device *devic wined3d_device_set_pipeline_unordered_access_view(device, WINED3D_PIPELINE_GRAPHICS, idx, uav); } +struct wined3d_unordered_access_view * CDECL wined3d_device_get_unordered_access_view( + const struct wined3d_device *device, unsigned int idx) +{ + TRACE("device %p, idx %u.\n", device, idx); + + return wined3d_device_get_pipeline_unordered_access_view(device, WINED3D_PIPELINE_GRAPHICS, idx); +} + /* Context activation is done by the caller. */ #define copy_and_next(dest, src, size) memcpy(dest, src, size); dest += (size) static HRESULT process_vertices_strided(const struct wined3d_device *device, DWORD dwDestIndex, DWORD dwCount, diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 92a61e7..074d02c 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -96,6 +96,7 @@ @ cdecl wined3d_device_get_texture(ptr long) @ cdecl wined3d_device_get_texture_stage_state(ptr long long) @ cdecl wined3d_device_get_transform(ptr long ptr) +@ cdecl wined3d_device_get_unordered_access_view(ptr long) @ cdecl wined3d_device_get_vertex_declaration(ptr) @ cdecl wined3d_device_get_vertex_shader(ptr) @ cdecl wined3d_device_get_viewport(ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 31aa143..05368bd 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2268,6 +2268,8 @@ DWORD __cdecl wined3d_device_get_texture_stage_state(const struct wined3d_device UINT stage, enum wined3d_texture_stage_state state); void __cdecl wined3d_device_get_transform(const struct wined3d_device *device, enum wined3d_transform_state state, struct wined3d_matrix *matrix); +struct wined3d_unordered_access_view * __cdecl wined3d_device_get_unordered_access_view( + const struct wined3d_device *device, unsigned int idx); struct wined3d_vertex_declaration * __cdecl wined3d_device_get_vertex_declaration(const struct wined3d_device *device); struct wined3d_shader * __cdecl wined3d_device_get_vertex_shader(const struct wined3d_device *device); void __cdecl wined3d_device_get_viewport(const struct wined3d_device *device, struct wined3d_viewport *viewport);

1 0

Józef Kucia : wined3d: Always use core profile GLSL versions.
by Alexandre Julliard April 24, 2017

April 24, 2017

Module: wine Branch: master Commit: 47b6e3d4e3f21b380620fadd3828ee9f4ece5b75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47b6e3d4e3f21b380620fadd3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 24 12:02:29 2017 +0200 wined3d: Always use core profile GLSL versions. We should not be using any legacy/deprecated syntax anymore. 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/wined3d/glsl_shader.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 0f4e66c..4d585aa 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -365,11 +365,7 @@ static unsigned int shader_glsl_get_version(const struct wined3d_gl_info *gl_inf static void shader_glsl_add_version_declaration(struct wined3d_string_buffer *buffer, const struct wined3d_gl_info *gl_info) { - unsigned int glsl_version = shader_glsl_get_version(gl_info); - if (glsl_version >= 150 && gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) - shader_addline(buffer, "#version %u compatibility\n", glsl_version); - else - shader_addline(buffer, "#version %u\n", glsl_version); + shader_addline(buffer, "#version %u\n", shader_glsl_get_version(gl_info)); } static void shader_glsl_append_imm_vec4(struct wined3d_string_buffer *buffer, const float *values)

1 0

Józef Kucia : d3d11: Implement d3d{10, 11}_input_layout_GetDevice().
by Alexandre Julliard April 24, 2017

April 24, 2017

Module: wine Branch: master Commit: 19f57326948eede76cfebd72ad1ab0d6c66c1cac URL: http://source.winehq.org/git/wine.git/?a=commit;h=19f57326948eede76cfebd72a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 24 12:02:28 2017 +0200 d3d11: Implement d3d{10, 11}_input_layout_GetDevice(). 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/d3d10core/tests/device.c | 2 +- dlls/d3d11/d3d11_private.h | 1 + dlls/d3d11/inputlayout.c | 18 ++++++++++++++++-- dlls/d3d11/tests/d3d11.c | 2 +- 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index f6621e8..e4ab7a4 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -9325,7 +9325,7 @@ static void test_create_input_layout(void) ok(SUCCEEDED(hr), "Failed to create input layout for format %#x, hr %#x.\n", vertex_formats[i], hr); refcount = get_refcount(device); - todo_wine ok(refcount >= expected_refcount, "Got refcount %u, expected >= %u.\n", + ok(refcount >= expected_refcount, "Got refcount %u, expected >= %u.\n", refcount, expected_refcount); ID3D10InputLayout_Release(input_layout); } diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 193a07f..3a9729b 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -254,6 +254,7 @@ struct d3d_input_layout struct wined3d_private_store private_store; struct wined3d_vertex_declaration *wined3d_decl; + ID3D11Device *device; }; HRESULT d3d_input_layout_create(struct d3d_device *device, diff --git a/dlls/d3d11/inputlayout.c b/dlls/d3d11/inputlayout.c index e9c3094..37b6993 100644 --- a/dlls/d3d11/inputlayout.c +++ b/dlls/d3d11/inputlayout.c @@ -151,9 +151,13 @@ static ULONG STDMETHODCALLTYPE d3d11_input_layout_Release(ID3D11InputLayout *ifa if (!refcount) { + ID3D11Device *device = layout->device; + wined3d_mutex_lock(); wined3d_vertex_declaration_decref(layout->wined3d_decl); wined3d_mutex_unlock(); + + ID3D11Device_Release(device); } return refcount; @@ -162,7 +166,11 @@ static ULONG STDMETHODCALLTYPE d3d11_input_layout_Release(ID3D11InputLayout *ifa static void STDMETHODCALLTYPE d3d11_input_layout_GetDevice(ID3D11InputLayout *iface, ID3D11Device **device) { - FIXME("iface %p, device %p stub!\n", iface, device); + struct d3d_input_layout *layout = impl_from_ID3D11InputLayout(iface); + + TRACE("iface %p, device %p.\n", iface, device); + + ID3D11Device_AddRef(*device = layout->device); } static HRESULT STDMETHODCALLTYPE d3d11_input_layout_GetPrivateData(ID3D11InputLayout *iface, @@ -249,7 +257,11 @@ static ULONG STDMETHODCALLTYPE d3d10_input_layout_Release(ID3D10InputLayout *ifa static void STDMETHODCALLTYPE d3d10_input_layout_GetDevice(ID3D10InputLayout *iface, ID3D10Device **device) { - FIXME("iface %p, device %p stub!\n", iface, device); + struct d3d_input_layout *layout = impl_from_ID3D10InputLayout(iface); + + TRACE("iface %p, device %p.\n", iface, device); + + ID3D11Device_QueryInterface(layout->device, &IID_ID3D10Device, (void **)device); } static HRESULT STDMETHODCALLTYPE d3d10_input_layout_GetPrivateData(ID3D10InputLayout *iface, @@ -344,6 +356,8 @@ static HRESULT d3d_input_layout_init(struct d3d_input_layout *layout, struct d3d } wined3d_mutex_unlock(); + ID3D11Device_AddRef(layout->device = &device->ID3D11Device_iface); + return S_OK; } diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index d4a34c6..dfe50c6 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -10321,7 +10321,7 @@ static void test_create_input_layout(void) ok(SUCCEEDED(hr), "Failed to create input layout for format %#x, hr %#x.\n", vertex_formats[i], hr); refcount = get_refcount(device); - todo_wine ok(refcount == expected_refcount, "Got refcount %u, expected %u.\n", + ok(refcount == expected_refcount, "Got refcount %u, expected %u.\n", refcount, expected_refcount); ID3D11InputLayout_Release(input_layout); }

1 0

Michael Müller : include: Fix an invalid UUID in dxva2api.idl.
by Alexandre Julliard April 24, 2017

April 24, 2017

Module: wine Branch: master Commit: 11a1ceebc3544dd7954f4ef140a913cd722aa286 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11a1ceebc3544dd7954f4ef14… Author: Michael Müller <michael(a)fds-team.de> Date: Mon Apr 24 16:27:25 2017 +0200 include: Fix an invalid UUID in dxva2api.idl. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dxva2api.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/dxva2api.idl b/include/dxva2api.idl index ebd508b..7a29157 100644 --- a/include/dxva2api.idl +++ b/include/dxva2api.idl @@ -434,7 +434,7 @@ interface IDirectXVideoDecoder : IUnknown */ [ object, - uuid(fc51a551-d5e7-11d9-af55-00054e43ff02), + uuid(fc51a552-d5e7-11d9-af55-00054e43ff02), local ] interface IDirectXVideoProcessorService : IDirectXVideoAccelerationService

1 0

Sebastian Lackner : vcomp: Handle begin == NULL in _vcomp_for_static_init.
by Alexandre Julliard April 24, 2017

April 24, 2017

Module: wine Branch: master Commit: b228f16c0d020a3d8219668a64204bc57b3aa78d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b228f16c0d020a3d8219668a6… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Apr 24 16:12:43 2017 +0200 vcomp: Handle begin == NULL in _vcomp_for_static_init. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcomp/main.c | 7 +++++++ dlls/vcomp/tests/vcomp.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index 34e327e..5206e47 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -1171,10 +1171,17 @@ void CDECL _vcomp_for_static_init(int first, int last, int step, int chunksize, struct vcomp_team_data *team_data = thread_data->team; int num_threads = team_data ? team_data->num_threads : 1; int thread_num = thread_data->thread_num; + int no_begin, no_lastchunk; TRACE("(%d, %d, %d, %d, %p, %p, %p, %p, %p)\n", first, last, step, chunksize, loops, begin, end, next, lastchunk); + if (!begin) + { + begin = &no_begin; + lastchunk = &no_lastchunk; + } + if (num_threads == 1 && chunksize != 1) { *loops = 1; diff --git a/dlls/vcomp/tests/vcomp.c b/dlls/vcomp/tests/vcomp.c index f0d8b3a..9aec5cc 100644 --- a/dlls/vcomp/tests/vcomp.c +++ b/dlls/vcomp/tests/vcomp.c @@ -1002,6 +1002,30 @@ static void CDECL for_static_cb(void) p_vcomp_for_static_end(); p_vcomp_barrier(); + loops = end = next = lastchunk = 0xdeadbeef; + p_vcomp_for_static_init(tests[i].first, tests[i].last, tests[i].step, tests[i].chunksize, + &loops, NULL, &end, &next, &lastchunk); + + if (broken_flags & VCOMP_FOR_STATIC_BROKEN_LOOP) + { + ok(loops == 0 || loops == 1, "test %d, thread %d/%d: expected loops == 0 or 1, got %u\n", + i, thread_num, num_threads, loops); + } + else + { + ok(loops == my_loops, "test %d, thread %d/%d: expected loops == %u, got %u\n", + i, thread_num, num_threads, my_loops, loops); + ok(end == my_end, "test %d, thread %d/%d: expected end == %d, got %d\n", + i, thread_num, num_threads, my_end, end); + ok(next == my_next || broken(broken_flags & VCOMP_FOR_STATIC_BROKEN_NEXT), + "test %d, thread %d/%d: expected next == %d, got %d\n", i, thread_num, num_threads, my_next, next); + ok(lastchunk == 0xdeadbeef, "test %d, thread %d/%d: expected lastchunk == 0xdeadbeef, got %d\n", + i, thread_num, num_threads, lastchunk); + } + + p_vcomp_for_static_end(); + p_vcomp_barrier(); + if (tests[i].first == tests[i].last) continue; my_loops = my_begin = my_end = my_next = my_lastchunk = 0xdeadbeef; @@ -1032,6 +1056,30 @@ static void CDECL for_static_cb(void) p_vcomp_for_static_end(); p_vcomp_barrier(); + + loops = end = next = lastchunk = 0xdeadbeef; + p_vcomp_for_static_init(tests[i].last, tests[i].first, tests[i].step, tests[i].chunksize, + &loops, NULL, &end, &next, &lastchunk); + + if (broken_flags & VCOMP_FOR_STATIC_BROKEN_LOOP) + { + ok(loops == 0 || loops == 1, "test %d, thread %d/%d: expected loops == 0 or 1, got %u\n", + i, thread_num, num_threads, loops); + } + else + { + ok(loops == my_loops, "test %d, thread %d/%d: expected loops == %u, got %u\n", + i, thread_num, num_threads, my_loops, loops); + ok(end == my_end, "test %d, thread %d/%d: expected end == %d, got %d\n", + i, thread_num, num_threads, my_end, end); + ok(next == my_next || broken(broken_flags & VCOMP_FOR_STATIC_BROKEN_NEXT), + "test %d, thread %d/%d: expected next == %d, got %d\n", i, thread_num, num_threads, my_next, next); + ok(lastchunk == 0xdeadbeef, "test %d, thread %d/%d: expected lastchunk == 0xdeadbeef, got %d\n", + i, thread_num, num_threads, lastchunk); + } + + p_vcomp_for_static_end(); + p_vcomp_barrier(); } }

1 0

Józef Kucia : wined3d: Introduce wined3d_device_get_cs_uav().
by Alexandre Julliard April 24, 2017

April 24, 2017

Module: wine Branch: master Commit: 85423a06af34410ed0a76f12975b81e8d47175e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85423a06af34410ed0a76f129… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 24 12:02:30 2017 +0200 wined3d: Introduce wined3d_device_get_cs_uav(). 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/wined3d/device.c | 20 ++++++++++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 3 files changed, 23 insertions(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b5f4bdd..4cf0384 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2862,6 +2862,18 @@ static void wined3d_device_set_pipeline_unordered_access_view(struct wined3d_dev wined3d_unordered_access_view_decref(prev); } +static struct wined3d_unordered_access_view *wined3d_device_get_pipeline_unordered_access_view( + const struct wined3d_device *device, enum wined3d_pipeline pipeline, unsigned int idx) +{ + if (idx >= MAX_UNORDERED_ACCESS_VIEWS) + { + WARN("Invalid UAV index %u.\n", idx); + return NULL; + } + + return device->state.unordered_access_view[pipeline][idx]; +} + void CDECL wined3d_device_set_cs_uav(struct wined3d_device *device, unsigned int idx, struct wined3d_unordered_access_view *uav) { @@ -2870,6 +2882,14 @@ void CDECL wined3d_device_set_cs_uav(struct wined3d_device *device, unsigned int wined3d_device_set_pipeline_unordered_access_view(device, WINED3D_PIPELINE_COMPUTE, idx, uav); } +struct wined3d_unordered_access_view * CDECL wined3d_device_get_cs_uav(const struct wined3d_device *device, + unsigned int idx) +{ + TRACE("device %p, idx %u.\n", device, idx); + + return wined3d_device_get_pipeline_unordered_access_view(device, WINED3D_PIPELINE_COMPUTE, idx); +} + void CDECL wined3d_device_set_unordered_access_view(struct wined3d_device *device, unsigned int idx, struct wined3d_unordered_access_view *uav) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 84ba5d4..92a61e7 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -56,6 +56,7 @@ @ cdecl wined3d_device_get_cs_cb(ptr long) @ cdecl wined3d_device_get_cs_resource_view(ptr long) @ cdecl wined3d_device_get_cs_sampler(ptr long) +@ cdecl wined3d_device_get_cs_uav(ptr long) @ cdecl wined3d_device_get_depth_stencil_view(ptr) @ cdecl wined3d_device_get_device_caps(ptr ptr) @ cdecl wined3d_device_get_display_mode(ptr long ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index e0929ae..31aa143 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2208,6 +2208,8 @@ struct wined3d_buffer * __cdecl wined3d_device_get_cs_cb(const struct wined3d_de struct wined3d_shader_resource_view * __cdecl wined3d_device_get_cs_resource_view(const struct wined3d_device *device, unsigned int idx); struct wined3d_sampler * __cdecl wined3d_device_get_cs_sampler(const struct wined3d_device *device, unsigned int idx); +struct wined3d_unordered_access_view * __cdecl wined3d_device_get_cs_uav(const struct wined3d_device *device, + unsigned int idx); struct wined3d_rendertarget_view * __cdecl wined3d_device_get_depth_stencil_view(const struct wined3d_device *device); HRESULT __cdecl wined3d_device_get_device_caps(const struct wined3d_device *device, WINED3DCAPS *caps); HRESULT __cdecl wined3d_device_get_display_mode(const struct wined3d_device *device, UINT swapchain_idx,

1 0

Stefan Dösinger : d3d9/tests: WARP returns a random color in uninitialized color attributes.
by Alexandre Julliard April 24, 2017

April 24, 2017

Module: wine Branch: master Commit: 9ce5b4096fd6ccab6ea9fac5f7033db09cd2167a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ce5b4096fd6ccab6ea9fac5f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Apr 21 22:47:55 2017 +0200 d3d9/tests: WARP returns a random color in uninitialized color attributes. ea8ba70a made the broken(warp) condition too strict. This patch reverts back to the old behavior of accepting any result from WARP. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index f9b147e..25aa35b 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -8087,14 +8087,13 @@ static void test_vshader_input(void) hr = IDirect3DDevice9_EndScene(device); ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); - /* WARP and r500 return a color from a previous draw. In case of WARP it is the last draw, which happens to - * be the one with quad4_color above. AMD's r500 uses the last D3DCOLOR attribute, which is the one from - * quad3_color. + /* WARP and r500 return a color from a previous draw. In case of WARP it is random, although most of the + * time it is the color of the last draw, which happens to be the one with quad4_color above. AMD's r500 + * uses the last D3DCOLOR attribute, which is the one from quad3_color. * * Newer AMD cards and Nvidia return zero. */ color = getPixelColor(device, 160, 360); - ok(color_match(color, 0x00000000, 1) || broken(color_match(color, 0x00ff8040, 1)) - || broken(color_match(color, 0x00ffff00, 1) && warp), + ok(color_match(color, 0x00000000, 1) || broken(color_match(color, 0x00ff8040, 1)) || broken(warp), "Got unexpected color 0x%08x for no color attribute test.\n", color); IDirect3DDevice9_SetVertexShader(device, NULL);

1 0

Stefan Dösinger : d3d9/tests: Accept alpha channel differences in shadow_test.
by Alexandre Julliard April 24, 2017

April 24, 2017

Module: wine Branch: master Commit: 2303b5a896312670e8c37c89abcfbb36c5465149 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2303b5a896312670e8c37c89a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Apr 21 17:01:51 2017 +0200 d3d9/tests: Accept alpha channel differences in shadow_test. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index db29c3f..f9b147e 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -14670,7 +14670,11 @@ static void shadow_test(void) for (j = 0; j < sizeof(expected_colors) / sizeof(*expected_colors); ++j) { D3DCOLOR color = get_readback_color(&rb, expected_colors[j].x, expected_colors[j].y); - ok(color_match(color, expected_colors[j].color, 0), + /* Geforce 7 on Windows returns 1.0 in alpha when the depth format is D24S8 or D24X8, + * whereas other GPUs (all AMD, newer Nvidia) return the same value they return in .rgb. + * Accept alpha mismatches as broken but make sure to check the color channels. */ + ok(color_match(color, expected_colors[j].color, 0) + || broken(color_match(color & 0x00ffffff, expected_colors[j].color & 0x00ffffff, 0)), "Expected color 0x%08x at (%u, %u) for format %s, got 0x%08x.\n", expected_colors[j].color, expected_colors[j].x, expected_colors[j].y, formats[i].name, color);

1 0