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

Hugh McMaster : reg/tests: Add more REG_SZ import tests.
by Alexandre Julliard April 12, 2017

April 12, 2017

Module: wine Branch: master Commit: ee4775a7a20f65c9b892aff56bc55a745a6d8f14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee4775a7a20f65c9b892aff56… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Apr 12 13:44:48 2017 +0000 reg/tests: Add more REG_SZ import tests. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 0771391..f301c13 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -1283,6 +1283,36 @@ static void test_import(void) test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Empty string\"=\"\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Empty string", REG_SZ, "", 1, 0); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test38a\"=\n" + "\"Test38b\"=\\\"\n" + "\"Test38c\"=\\\"Value\\\"\n" + "\"Test38d\"=\\\"Value\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Test38a"); + todo_wine verify_reg_nonexist(hkey, "Test38b"); + todo_wine verify_reg_nonexist(hkey, "Test38c"); + todo_wine verify_reg_nonexist(hkey, "Test38d"); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine39a\"=\"Value1\" ;comment\n" + "\"Wine39b\"=\"Value2\"\t\t;comment\n" + "\"Wine39c\"=\"Value3\" #comment\n" + "\"Wine39d\"=\"Value4\"\t\t#comment\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Wine39a", REG_SZ, "Value1", 7, 0); + todo_wine verify_reg(hkey, "Wine39b", REG_SZ, "Value2", 7, 0); + todo_wine verify_reg_nonexist(hkey, "Wine39c"); + todo_wine verify_reg_nonexist(hkey, "Wine39d"); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"double\\\"quote\"=\"valid \\\"or\\\" not\"\n" "\"single'quote\"=dword:00000008\n\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); @@ -1715,6 +1745,36 @@ static void test_import(void) test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Empty string\"=\"\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Empty string", REG_SZ, "", 1, 0); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test38a\"=\n" + "\"Test38b\"=\\\"\n" + "\"Test38c\"=\\\"Value\\\"\n" + "\"Test38d\"=\\\"Value\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Test38a"); + todo_wine verify_reg_nonexist(hkey, "Test38b"); + todo_wine verify_reg_nonexist(hkey, "Test38c"); + todo_wine verify_reg_nonexist(hkey, "Test38d"); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine39a\"=\"Value1\" ;comment\n" + "\"Wine39b\"=\"Value2\"\t\t;comment\n" + "\"Wine39c\"=\"Value3\" #comment\n" + "\"Wine39d\"=\"Value4\"\t\t#comment\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Wine39a", REG_SZ, "Value1", 7, 0); + todo_wine verify_reg(hkey, "Wine39b", REG_SZ, "Value2", 7, 0); + todo_wine verify_reg_nonexist(hkey, "Wine39c"); + todo_wine verify_reg_nonexist(hkey, "Wine39d"); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Multi-Line1\"=hex(7):4c,00,69,00,6e,00,65,00,20,00,\\\n" " 63,00,6f,00,6e,00,\\;comment\n" " 63,00,61,00,74,00,\\;comment\n"

1 0

Józef Kucia : wined3d: Use ARB_explicit_attrib_location for fragment shader outputs.
by Alexandre Julliard April 12, 2017

April 12, 2017

Module: wine Branch: master Commit: f9f75d251a5702557872069035381c3b188638dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9f75d251a570255787206903… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 12 12:42:26 2017 +0200 wined3d: Use ARB_explicit_attrib_location for fragment shader outputs. 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 | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index a4221e0..1631768 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2676,7 +2676,11 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont shader_addline(buffer, "uniform float alpha_test_ref;\n"); if (!needs_legacy_glsl_syntax(gl_info)) + { + if (shader_glsl_use_explicit_attrib_location(gl_info)) + shader_addline(buffer, "layout(location = 0) "); shader_addline(buffer, "out vec4 ps_out[%u];\n", gl_info->limits.buffers); + } if (shader->limits->constant_float + extra_constants_needed >= gl_info->limits.glsl_ps_float_constants) FIXME("Insufficient uniforms to run this shader.\n"); @@ -7141,6 +7145,8 @@ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context shader_glsl_enable_extensions(buffer, gl_info); if (gl_info->supported[ARB_DERIVATIVE_CONTROL]) shader_addline(buffer, "#extension GL_ARB_derivative_control : enable\n"); + if (shader_glsl_use_explicit_attrib_location(gl_info)) + shader_addline(buffer, "#extension GL_ARB_explicit_attrib_location : enable\n"); if (gl_info->supported[ARB_FRAGMENT_COORD_CONVENTIONS]) shader_addline(buffer, "#extension GL_ARB_fragment_coord_conventions : enable\n"); if (gl_info->supported[ARB_FRAGMENT_LAYER_VIEWPORT]) @@ -7297,7 +7303,7 @@ static GLuint shader_glsl_generate_vshader(const struct wined3d_context *context shader_glsl_enable_extensions(buffer, gl_info); if (gl_info->supported[ARB_DRAW_INSTANCED]) shader_addline(buffer, "#extension GL_ARB_draw_instanced : enable\n"); - if (gl_info->supported[ARB_EXPLICIT_ATTRIB_LOCATION]) + if (shader_glsl_use_explicit_attrib_location(gl_info)) shader_addline(buffer, "#extension GL_ARB_explicit_attrib_location : enable\n"); memset(&priv_ctx, 0, sizeof(priv_ctx)); @@ -8461,13 +8467,19 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv * shader_glsl_add_version_declaration(buffer, gl_info, NULL); + if (shader_glsl_use_explicit_attrib_location(gl_info)) + shader_addline(buffer, "#extension GL_ARB_explicit_attrib_location : enable\n"); if (gl_info->supported[ARB_SHADING_LANGUAGE_420PACK]) shader_addline(buffer, "#extension GL_ARB_shading_language_420pack : enable\n"); if (gl_info->supported[ARB_TEXTURE_RECTANGLE]) shader_addline(buffer, "#extension GL_ARB_texture_rectangle : enable\n"); if (!needs_legacy_glsl_syntax(gl_info)) + { + if (shader_glsl_use_explicit_attrib_location(gl_info)) + shader_addline(buffer, "layout(location = 0) "); shader_addline(buffer, "out vec4 ps_out[1];\n"); + } shader_addline(buffer, "vec4 tmp0, tmp1;\n"); shader_addline(buffer, "vec4 ret;\n");

1 0

Henri Verbeet : wined3d: Avoid modifying the device' s shader list outside the command stream.
by Alexandre Julliard April 12, 2017

April 12, 2017

Module: wine Branch: master Commit: 6302d5edf82b212d5d32838f40279d4304e60ba1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6302d5edf82b212d5d32838f4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 11 23:24:19 2017 +0200 wined3d: Avoid modifying the device's shader list outside the command stream. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/shader.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 208a09a..7927062 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -3073,6 +3073,13 @@ ULONG CDECL wined3d_shader_incref(struct wined3d_shader *shader) return refcount; } +static void wined3d_shader_init_object(void *object) +{ + struct wined3d_shader *shader = object; + + list_add_head(&shader->device->shaders, &shader->shader_list_entry); +} + static void wined3d_shader_destroy_object(void *object) { shader_cleanup(object); @@ -3327,7 +3334,7 @@ static HRESULT shader_init(struct wined3d_shader *shader, struct wined3d_device list_init(&shader->constantsI); shader->lconst_inf_or_nan = FALSE; list_init(&shader->reg_maps.indexable_temps); - list_add_head(&device->shaders, &shader->shader_list_entry); + list_init(&shader->shader_list_entry); byte_code_size = desc->byte_code_size; if (byte_code_size == ~(size_t)0) @@ -3366,10 +3373,13 @@ static HRESULT shader_init(struct wined3d_shader *shader, struct wined3d_device { WARN("Failed to set function, hr %#x.\n", hr); shader_cleanup(shader); + return hr; } shader->load_local_constsF = shader->lconst_inf_or_nan; + wined3d_cs_init_object(shader->device->cs, wined3d_shader_init_object, shader); + return hr; } @@ -3429,7 +3439,7 @@ static HRESULT geometry_shader_init(struct wined3d_shader *shader, struct wined3 *d = *so_desc; if (!(d->elements = wined3d_calloc(so_desc->element_count, sizeof(*d->elements)))) { - shader_cleanup(shader); + wined3d_cs_destroy_object(shader->device->cs, wined3d_shader_destroy_object, shader); return E_OUTOFMEMORY; } memcpy(d->elements, so_desc->elements, so_desc->element_count * sizeof(*d->elements));

1 0

Henri Verbeet : wined3d: The destination width and height are always valid in surface_cpu_blt().
by Alexandre Julliard April 12, 2017

April 12, 2017

Module: wine Branch: master Commit: 3e3685755783602de257ef89258a1ebad6d30959 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e3685755783602de257ef892… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 11 23:24:21 2017 +0200 wined3d: The destination width and height are always valid in surface_cpu_blt(). Since they have been validated by the caller. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index d809282..a811d6a 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2945,9 +2945,6 @@ static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int { int sx, xinc, sy, yinc; - if (!dst_width || !dst_height) /* Hmm... stupid program? */ - goto release; - if (filter != WINED3D_TEXF_NONE && filter != WINED3D_TEXF_POINT && (src_width != dst_width || src_height != dst_height)) {

1 0

Jacek Caban : services: Call RpcMgmtWaitServerListen in RPC_Stop.
by Alexandre Julliard April 11, 2017

April 11, 2017

Module: wine Branch: master Commit: 69608af0a960658fcb3b0958c395614f286bcaa1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69608af0a960658fcb3b0958c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 10 14:27:58 2017 +0200 services: Call RpcMgmtWaitServerListen in RPC_Stop. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/rpc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 08b5776a..8c95b7e 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -1958,6 +1958,7 @@ void RPC_Stop(void) { RpcMgmtStopServerListening(NULL); RpcServerUnregisterIf(svcctl_v2_0_s_ifspec, NULL, TRUE); + RpcMgmtWaitServerListen(); CloseThreadpoolCleanupGroupMembers(cleanup_group, TRUE, NULL); CloseThreadpoolCleanupGroup(cleanup_group);

1 0

Jacek Caban : ntdll: Remove no longer needed APC handling from APC_ASYNC_IO callbacks.
by Alexandre Julliard April 11, 2017

April 11, 2017

Module: wine Branch: master Commit: e2469b2c3d385b2c3e5fcfdafe301d1248a94655 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2469b2c3d385b2c3e5fcfdaf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 10 13:41:29 2017 +0200 ntdll: Remove no longer needed APC handling from APC_ASYNC_IO callbacks. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 21 +++++---------------- dlls/ntdll/server.c | 5 ++--- dlls/ws2_32/socket.c | 37 ++++++++++--------------------------- 3 files changed, 17 insertions(+), 46 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index cf4edb7..42979d5 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -346,7 +346,7 @@ NTSTATUS WINAPI NtCreateFile( PHANDLE handle, ACCESS_MASK access, POBJECT_ATTRIB * Asynchronous file I/O * */ -typedef NTSTATUS async_callback_t( void *user, IO_STATUS_BLOCK *io, NTSTATUS status, void **apc, void **arg ); +typedef NTSTATUS async_callback_t( void *user, IO_STATUS_BLOCK *io, NTSTATUS status ); struct async_fileio { @@ -432,7 +432,7 @@ static async_data_t server_async( HANDLE handle, struct async_fileio *user, HAND } /* callback for irp async I/O completion */ -static NTSTATUS irp_completion( void *user, IO_STATUS_BLOCK *io, NTSTATUS status, void **apc, void **arg ) +static NTSTATUS irp_completion( void *user, IO_STATUS_BLOCK *io, NTSTATUS status ) { struct async_irp *async = user; ULONG information = 0; @@ -452,8 +452,6 @@ static NTSTATUS irp_completion( void *user, IO_STATUS_BLOCK *io, NTSTATUS status { io->u.Status = status; io->Information = information; - *apc = async->io.apc; - *arg = async->io.apc_arg; release_fileio( &async->io ); } return status; @@ -511,8 +509,7 @@ NTSTATUS FILE_GetNtStatus(void) /*********************************************************************** * FILE_AsyncReadService (INTERNAL) */ -static NTSTATUS FILE_AsyncReadService( void *user, IO_STATUS_BLOCK *iosb, - NTSTATUS status, void **apc, void **arg ) +static NTSTATUS FILE_AsyncReadService( void *user, IO_STATUS_BLOCK *iosb, NTSTATUS status ) { struct async_fileio_read *fileio = user; int fd, needs_close, result; @@ -558,8 +555,6 @@ static NTSTATUS FILE_AsyncReadService( void *user, IO_STATUS_BLOCK *iosb, { iosb->u.Status = status; iosb->Information = fileio->already; - *apc = fileio->io.apc; - *arg = fileio->io.apc_arg; release_fileio( &fileio->io ); } return status; @@ -1118,8 +1113,7 @@ NTSTATUS WINAPI NtReadFileScatter( HANDLE file, HANDLE event, PIO_APC_ROUTINE ap /*********************************************************************** * FILE_AsyncWriteService (INTERNAL) */ -static NTSTATUS FILE_AsyncWriteService( void *user, IO_STATUS_BLOCK *iosb, - NTSTATUS status, void **apc, void **arg ) +static NTSTATUS FILE_AsyncWriteService( void *user, IO_STATUS_BLOCK *iosb, NTSTATUS status ) { struct async_fileio_write *fileio = user; int result, fd, needs_close; @@ -1161,8 +1155,6 @@ static NTSTATUS FILE_AsyncWriteService( void *user, IO_STATUS_BLOCK *iosb, { iosb->u.Status = status; iosb->Information = fileio->already; - *apc = fileio->io.apc; - *arg = fileio->io.apc_arg; release_fileio( &fileio->io ); } return status; @@ -1843,8 +1835,7 @@ struct read_changes_fileio char data[1]; }; -static NTSTATUS read_changes_apc( void *user, IO_STATUS_BLOCK *iosb, - NTSTATUS status, void **apc, void **arg ) +static NTSTATUS read_changes_apc( void *user, IO_STATUS_BLOCK *iosb, NTSTATUS status ) { struct read_changes_fileio *fileio = user; int size = 0; @@ -1914,8 +1905,6 @@ static NTSTATUS read_changes_apc( void *user, IO_STATUS_BLOCK *iosb, { iosb->u.Status = status; iosb->Information = size; - *apc = fileio->io.apc; - *arg = fileio->io.apc_arg; release_fileio( &fileio->io ); } return status; diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index e906898..c02a12a 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -404,11 +404,10 @@ static BOOL invoke_apc( const apc_call_t *call, apc_result_t *result ) } case APC_ASYNC_IO: { - void *apc = NULL, *arg = NULL; IO_STATUS_BLOCK *iosb = wine_server_get_ptr( call->async_io.sb ); - NTSTATUS (**user)(void *, IO_STATUS_BLOCK *, NTSTATUS, void **, void **) = wine_server_get_ptr( call->async_io.user ); + NTSTATUS (**user)(void *, IO_STATUS_BLOCK *, NTSTATUS) = wine_server_get_ptr( call->async_io.user ); result->type = call->type; - result->async_io.status = (*user)( user, iosb, call->async_io.status, &apc, &arg ); + result->async_io.status = (*user)( user, iosb, call->async_io.status ); if (result->async_io.status != STATUS_PENDING) result->async_io.total = iosb->Information; break; diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 5bf0482..9d27fab 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -470,7 +470,7 @@ static inline const char *debugstr_optval(const char *optval, int optlenval) * Async IO declarations ****************************************************************/ -typedef NTSTATUS async_callback_t( void *user, IO_STATUS_BLOCK *io, NTSTATUS status, void **apc, void **arg ); +typedef NTSTATUS async_callback_t( void *user, IO_STATUS_BLOCK *io, NTSTATUS status ); struct ws2_async_io { @@ -2399,8 +2399,7 @@ static int WS2_recv( int fd, struct ws2_async *wsa, int flags ) * * Handler for overlapped recv() operations. */ -static NTSTATUS WS2_async_recv( void *user, IO_STATUS_BLOCK *iosb, - NTSTATUS status, void **apc, void **arg ) +static NTSTATUS WS2_async_recv( void *user, IO_STATUS_BLOCK *iosb, NTSTATUS status ) { struct ws2_async *wsa = user; int result = 0, fd; @@ -2437,12 +2436,7 @@ static NTSTATUS WS2_async_recv( void *user, IO_STATUS_BLOCK *iosb, { iosb->u.Status = status; iosb->Information = result; - if (wsa->completion_func) - { - *apc = ws2_async_apc; - *arg = wsa; - } - else + if (!wsa->completion_func) release_async_io( &wsa->io ); } return status; @@ -2454,13 +2448,11 @@ static NTSTATUS WS2_async_recv( void *user, IO_STATUS_BLOCK *iosb, * This function is used to finish the read part of an accept request. It is * needed to place the completion on the correct socket (listener). */ -static NTSTATUS WS2_async_accept_recv( void *user, IO_STATUS_BLOCK *iosb, - NTSTATUS status, void **apc, void **arg ) +static NTSTATUS WS2_async_accept_recv( void *user, IO_STATUS_BLOCK *iosb, NTSTATUS status ) { - void *junk; struct ws2_accept_async *wsa = user; - status = WS2_async_recv( wsa->read, iosb, status, &junk, &junk ); + status = WS2_async_recv( wsa->read, iosb, status ); if (status == STATUS_PENDING) return status; @@ -2476,8 +2468,7 @@ static NTSTATUS WS2_async_accept_recv( void *user, IO_STATUS_BLOCK *iosb, * * This is the function called to satisfy the AcceptEx callback */ -static NTSTATUS WS2_async_accept( void *user, IO_STATUS_BLOCK *iosb, - NTSTATUS status, void **apc, void **arg ) +static NTSTATUS WS2_async_accept( void *user, IO_STATUS_BLOCK *iosb, NTSTATUS status ) { struct ws2_accept_async *wsa = user; int len; @@ -2621,8 +2612,7 @@ static int WS2_send( int fd, struct ws2_async *wsa, int flags ) * * Handler for overlapped send() operations. */ -static NTSTATUS WS2_async_send( void *user, IO_STATUS_BLOCK *iosb, - NTSTATUS status, void **apc, void **arg ) +static NTSTATUS WS2_async_send( void *user, IO_STATUS_BLOCK *iosb, NTSTATUS status ) { struct ws2_async *wsa = user; int result = 0, fd; @@ -2665,12 +2655,7 @@ static NTSTATUS WS2_async_send( void *user, IO_STATUS_BLOCK *iosb, if (status != STATUS_PENDING) { iosb->u.Status = status; - if (wsa->completion_func) - { - *apc = ws2_async_apc; - *arg = wsa; - } - else + if (!wsa->completion_func) release_async_io( &wsa->io ); } return status; @@ -2681,8 +2666,7 @@ static NTSTATUS WS2_async_send( void *user, IO_STATUS_BLOCK *iosb, * * Handler for shutdown() operations on overlapped sockets. */ -static NTSTATUS WS2_async_shutdown( void *user, IO_STATUS_BLOCK *iosb, - NTSTATUS status, void **apc, void **arg ) +static NTSTATUS WS2_async_shutdown( void *user, IO_STATUS_BLOCK *iosb, NTSTATUS status ) { struct ws2_async_shutdown *wsa = user; int fd, err = 1; @@ -3040,8 +3024,7 @@ static NTSTATUS WS2_transmitfile_base( int fd, struct ws2_transmitfile_async *ws * * Asynchronous callback for overlapped TransmitFile operations. */ -static NTSTATUS WS2_async_transmitfile( void *user, IO_STATUS_BLOCK *iosb, - NTSTATUS status, void **apc, void **arg ) +static NTSTATUS WS2_async_transmitfile( void *user, IO_STATUS_BLOCK *iosb, NTSTATUS status ) { struct ws2_transmitfile_async *wsa = user; int fd;

1 0

Jacek Caban : server: Removed no longed needed APC from APC_ASYNC_IO reply.
by Alexandre Julliard April 11, 2017

April 11, 2017

Module: wine Branch: master Commit: fbf241034c94b3dcf622522dc01d1b3d679d6bc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbf241034c94b3dcf622522dc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 10 13:21:49 2017 +0200 server: Removed no longed needed APC from APC_ASYNC_IO reply. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/server.c | 4 ---- include/wine/server_protocol.h | 4 +--- server/protocol.def | 2 -- server/trace.c | 2 -- 4 files changed, 1 insertion(+), 11 deletions(-) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index ed77aa5..e906898 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -410,11 +410,7 @@ static BOOL invoke_apc( const apc_call_t *call, apc_result_t *result ) result->type = call->type; result->async_io.status = (*user)( user, iosb, call->async_io.status, &apc, &arg ); if (result->async_io.status != STATUS_PENDING) - { result->async_io.total = iosb->Information; - result->async_io.apc = wine_server_client_ptr( apc ); - result->async_io.arg = wine_server_client_ptr( arg ); - } break; } case APC_VIRTUAL_ALLOC: diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index f1ae41cd..6c80dab 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -551,8 +551,6 @@ typedef union { enum apc_type type; unsigned int status; - client_ptr_t apc; - client_ptr_t arg; unsigned int total; } async_io; struct @@ -6411,6 +6409,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 525 +#define SERVER_PROTOCOL_VERSION 526 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index 204df9c..222ff95 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -567,8 +567,6 @@ typedef union { enum apc_type type; /* APC_ASYNC_IO */ unsigned int status; /* new status of async operation */ - client_ptr_t apc; /* user APC to call */ - client_ptr_t arg; /* user APC argument */ unsigned int total; /* bytes transferred */ } async_io; struct diff --git a/server/trace.c b/server/trace.c index febd2f7..5ebd909 100644 --- a/server/trace.c +++ b/server/trace.c @@ -229,8 +229,6 @@ static void dump_apc_result( const char *prefix, const apc_result_t *result ) case APC_ASYNC_IO: fprintf( stderr, "APC_ASYNC_IO,status=%s,total=%u", get_status_name( result->async_io.status ), result->async_io.total ); - dump_uint64( ",apc=", &result->async_io.apc ); - dump_uint64( ",arg=", &result->async_io.arg ); break; case APC_VIRTUAL_ALLOC: fprintf( stderr, "APC_VIRTUAL_ALLOC,status=%s",

1 0

Jacek Caban : server: Use stored APC in async_set_result.
by Alexandre Julliard April 11, 2017

April 11, 2017

Module: wine Branch: master Commit: 5c0e2965bca081f34b01c369b40a63da94697803 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c0e2965bca081f34b01c369b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 10 13:21:41 2017 +0200 server: Use stored APC in async_set_result. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/async.c | 11 +++++------ server/file.h | 3 +-- server/thread.c | 3 +-- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/server/async.c b/server/async.c index ba80721..7323047 100644 --- a/server/async.c +++ b/server/async.c @@ -191,7 +191,7 @@ void async_terminate( struct async *async, unsigned int status ) data.async_io.status = status; thread_queue_apc( async->thread, &async->obj, &data ); } - else async_set_result( &async->obj, STATUS_SUCCESS, 0, 0, 0 ); + else async_set_result( &async->obj, STATUS_SUCCESS, 0 ); async_reselect( async ); if (async->queue) release_object( async ); /* so that it gets destroyed when the async is done */ @@ -300,8 +300,7 @@ static void add_async_completion( struct async_queue *queue, apc_param_t cvalue, } /* store the result of the client-side async callback */ -void async_set_result( struct object *obj, unsigned int status, apc_param_t total, - client_ptr_t apc, client_ptr_t apc_arg ) +void async_set_result( struct object *obj, unsigned int status, apc_param_t total ) { struct async *async = (struct async *)obj; @@ -329,13 +328,13 @@ void async_set_result( struct object *obj, unsigned int status, apc_param_t tota if (async->queue && !async->data.apc && async->data.apc_context) add_async_completion( async->queue, async->data.apc_context, status, total ); - if (apc) + if (async->data.apc) { apc_call_t data; memset( &data, 0, sizeof(data) ); data.type = APC_USER; - data.user.func = apc; - data.user.args[0] = apc_arg; + data.user.func = async->data.apc; + data.user.args[0] = async->data.apc_context; data.user.args[1] = async->data.iosb; data.user.args[2] = 0; thread_queue_apc( async->thread, NULL, &data ); diff --git a/server/file.h b/server/file.h index 398733c..94cc37f 100644 --- a/server/file.h +++ b/server/file.h @@ -178,8 +178,7 @@ extern void free_async_queue( struct async_queue *queue ); extern struct async *create_async( struct thread *thread, const async_data_t *data, struct iosb *iosb ); extern void queue_async( struct async_queue *queue, struct async *async ); extern void async_set_timeout( struct async *async, timeout_t timeout, unsigned int status ); -extern void async_set_result( struct object *obj, unsigned int status, - apc_param_t total, client_ptr_t apc, client_ptr_t apc_arg ); +extern void async_set_result( struct object *obj, unsigned int status, apc_param_t total ); extern int async_queued( struct async_queue *queue ); extern int async_waiting( struct async_queue *queue ); extern void async_terminate( struct async *async, unsigned int status ); diff --git a/server/thread.c b/server/thread.c index 67f976d..10a5bf1 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1484,8 +1484,7 @@ DECL_HANDLER(select) else if (apc->result.type == APC_ASYNC_IO) { if (apc->owner) - async_set_result( apc->owner, apc->result.async_io.status, apc->result.async_io.total, - apc->result.async_io.apc, apc->result.async_io.arg ); + async_set_result( apc->owner, apc->result.async_io.status, apc->result.async_io.total ); } wake_up( &apc->obj, 0 ); close_handle( current->process, req->prev_apc );

1 0

Józef Kucia : d3d11/tests: Add test for gather4 instructions.
by Alexandre Julliard April 11, 2017

April 11, 2017

Module: wine Branch: master Commit: 4329552a64cbb7a0c17d552843ac8f518d794a8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4329552a64cbb7a0c17d55284… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 11 13:30:37 2017 +0200 d3d11/tests: Add test for gather4 instructions. 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/tests/d3d11.c | 318 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 318 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4329552a64cbb7a0c17d5…

1 0

Józef Kucia : wined3d: Implement SM5 gather4_c instruction.
by Alexandre Julliard April 11, 2017

April 11, 2017

Module: wine Branch: master Commit: 6fec723c9da859e2ad4f7fa2e7264633740fdf9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fec723c9da859e2ad4f7fa2e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 11 13:30:32 2017 +0200 wined3d: Implement SM5 gather4_c instruction. 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 | 11 ++++++++--- dlls/wined3d/shader.c | 1 + 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index c617393..7cd1698 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5898,8 +5898,8 @@ static void shader_glsl_sample_c(const struct wined3d_shader_instruction *ins) struct glsl_src_param coord_param, compare_param; struct glsl_sample_function sample_function; const char *lod_param = NULL; + unsigned int coord_size; DWORD flags = 0; - UINT coord_size; if (ins->handler_idx == WINED3DSIH_SAMPLE_C_LZ) { @@ -5932,8 +5932,8 @@ static void shader_glsl_gather4(const struct wined3d_shader_instruction *ins) const struct wined3d_shader_resource_info *resource_info; unsigned int resource_idx, sampler_idx, sampler_bind_idx; struct wined3d_string_buffer *buffer = ins->ctx->buffer; + struct glsl_src_param coord_param, compare_param; unsigned int coord_size, offset_size; - struct glsl_src_param coord_param; char dst_swizzle[6]; BOOL has_offset; @@ -5966,6 +5966,11 @@ static void shader_glsl_gather4(const struct wined3d_shader_instruction *ins) shader_addline(buffer, "textureGather%s(%s_sampler%u, %s", has_offset ? "Offset" : "", prefix, sampler_bind_idx, coord_param.param_str); + if (ins->handler_idx == WINED3DSIH_GATHER4_C) + { + shader_glsl_add_src_param(ins, &ins->src[3], WINED3DSP_WRITEMASK_0, &compare_param); + shader_addline(buffer, ", %s", compare_param.param_str); + } if (has_offset) { int offset_immdata[4] = {ins->texel_offset.u, ins->texel_offset.v, ins->texel_offset.w}; @@ -10040,7 +10045,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_FTOI */ shader_glsl_to_int, /* WINED3DSIH_FTOU */ shader_glsl_to_uint, /* WINED3DSIH_GATHER4 */ shader_glsl_gather4, - /* WINED3DSIH_GATHER4_C */ NULL, + /* WINED3DSIH_GATHER4_C */ shader_glsl_gather4, /* WINED3DSIH_GE */ shader_glsl_relop, /* WINED3DSIH_HS_CONTROL_POINT_PHASE */ NULL, /* WINED3DSIH_HS_DECLS */ shader_glsl_nop, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index f44ce28..acf914b 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1449,6 +1449,7 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st --cur_loop_depth; } else if (ins.handler_idx == WINED3DSIH_GATHER4 + || ins.handler_idx == WINED3DSIH_GATHER4_C || ins.handler_idx == WINED3DSIH_SAMPLE || ins.handler_idx == WINED3DSIH_SAMPLE_B || ins.handler_idx == WINED3DSIH_SAMPLE_C

1 0