wine-commits April 2017

wine-commits@winehq.org

2 participants
757 discussions

Jacek Caban : server: Remove no longer needed blocking argument from write fd op.
by Alexandre Julliard 12 Apr '17

12 Apr '17

Module: wine Branch: master Commit: c9d9adaf65299b0c6984e69f1c83053354c947ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9d9adaf65299b0c6984e69f1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 12 13:54:45 2017 +0200 server: Remove no longer needed blocking argument from write fd op. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/device.c | 4 ++-- server/fd.c | 4 ++-- server/file.h | 4 ++-- server/named_pipe.c | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/server/device.c b/server/device.c index 16043f5..0b39cb3 100644 --- a/server/device.c +++ b/server/device.c @@ -175,7 +175,7 @@ static int device_file_close_handle( struct object *obj, struct process *process static void device_file_destroy( struct object *obj ); static enum server_fd_type device_file_get_fd_type( struct fd *fd ); static obj_handle_t device_file_read( struct fd *fd, struct async *async, file_pos_t pos ); -static obj_handle_t device_file_write( struct fd *fd, struct async *async, int blocking, file_pos_t pos ); +static obj_handle_t device_file_write( struct fd *fd, struct async *async, file_pos_t pos ); static obj_handle_t device_file_flush( struct fd *fd, struct async *async, int blocking ); static obj_handle_t device_file_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); @@ -505,7 +505,7 @@ static obj_handle_t device_file_read( struct fd *fd, struct async *async, file_p return handle; } -static obj_handle_t device_file_write( struct fd *fd, struct async *async, int blocking, file_pos_t pos ) +static obj_handle_t device_file_write( struct fd *fd, struct async *async, file_pos_t pos ) { struct device_file *file = get_fd_user( fd ); struct irp_call *irp; diff --git a/server/fd.c b/server/fd.c index 894e6b4..6297b83 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2165,7 +2165,7 @@ obj_handle_t no_fd_read( struct fd *fd, struct async *async, file_pos_t pos ) } /* default write() routine */ -obj_handle_t no_fd_write( struct fd *fd, struct async *async, int blocking, file_pos_t pos ) +obj_handle_t no_fd_write( struct fd *fd, struct async *async, file_pos_t pos ) { set_error( STATUS_OBJECT_TYPE_MISMATCH ); return 0; @@ -2478,7 +2478,7 @@ DECL_HANDLER(write) async = create_async( current, &req->async, iosb ); if (async) { - reply->wait = fd->fd_ops->write( fd, async, req->blocking, req->pos ); + reply->wait = fd->fd_ops->write( fd, async, req->pos ); reply->options = fd->options; release_object( async ); } diff --git a/server/file.h b/server/file.h index a08224e..7bcbc45 100644 --- a/server/file.h +++ b/server/file.h @@ -54,7 +54,7 @@ struct fd_ops /* perform a read on the file */ obj_handle_t (*read)(struct fd *, struct async *, file_pos_t ); /* perform a write on the file */ - obj_handle_t (*write)(struct fd *, struct async *, int, file_pos_t ); + obj_handle_t (*write)(struct fd *, struct async *, file_pos_t ); /* flush the object buffers */ obj_handle_t (*flush)(struct fd *, struct async *, int); /* perform an ioctl on the file */ @@ -101,7 +101,7 @@ extern int fd_queue_async( struct fd *fd, struct async *async, int type ); extern void fd_async_wake_up( struct fd *fd, int type, unsigned int status ); extern void fd_reselect_async( struct fd *fd, struct async_queue *queue ); extern obj_handle_t no_fd_read( struct fd *fd, struct async *async, file_pos_t pos ); -extern obj_handle_t no_fd_write( struct fd *fd, struct async *async, int blocking, file_pos_t pos ); +extern obj_handle_t no_fd_write( struct fd *fd, struct async *async, file_pos_t pos ); extern obj_handle_t no_fd_flush( struct fd *fd, struct async *async, int blocking ); extern obj_handle_t no_fd_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); extern obj_handle_t default_fd_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); diff --git a/server/named_pipe.c b/server/named_pipe.c index 3d96c96..9fc3f2d 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -154,7 +154,7 @@ static const struct object_ops named_pipe_ops = /* common server and client pipe end functions */ 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, int blocking, 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 ); static void pipe_end_reselect_async( struct fd *fd, struct async_queue *queue ); @@ -845,14 +845,14 @@ static obj_handle_t pipe_end_read( struct fd *fd, struct async *async, file_pos_ return handle; } -static obj_handle_t pipe_end_write( struct fd *fd, struct async *async, int blocking, file_pos_t pos ) +static obj_handle_t pipe_end_write( struct fd *fd, struct async *async, file_pos_t pos ) { struct pipe_end *write_end = get_fd_user( fd ); struct pipe_end *read_end = write_end->connection; struct pipe_message *message; obj_handle_t handle = 0; - if (!use_server_io( write_end )) return no_fd_write( fd, async, blocking, pos ); + if (!use_server_io( write_end )) return no_fd_write( fd, async, pos ); if (!read_end) { @@ -877,7 +877,7 @@ static obj_handle_t pipe_end_write( struct fd *fd, struct async *async, int bloc reselect_write_queue( write_end ); set_error( STATUS_PENDING ); - if (!blocking) + if (!async_is_blocking( async )) { struct iosb *iosb; iosb = async_get_iosb( async );

1 0

Jacek Caban : server: Remove no longer needed blocking argument from read fd op.
by Alexandre Julliard 12 Apr '17

12 Apr '17

Module: wine Branch: master Commit: 5e584e936b3ec2ccebd1f2c20e9621254834e866 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e584e936b3ec2ccebd1f2c20… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 12 13:54:35 2017 +0200 server: Remove no longer needed blocking argument from read fd op. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/device.c | 4 ++-- server/fd.c | 4 ++-- server/file.h | 4 ++-- server/named_pipe.c | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/server/device.c b/server/device.c index 6726f4b..16043f5 100644 --- a/server/device.c +++ b/server/device.c @@ -174,7 +174,7 @@ static struct fd *device_file_get_fd( struct object *obj ); static int device_file_close_handle( struct object *obj, struct process *process, obj_handle_t handle ); static void device_file_destroy( struct object *obj ); static enum server_fd_type device_file_get_fd_type( struct fd *fd ); -static obj_handle_t device_file_read( struct fd *fd, struct async *async, int blocking, file_pos_t pos ); +static obj_handle_t device_file_read( struct fd *fd, struct async *async, file_pos_t pos ); static obj_handle_t device_file_write( struct fd *fd, struct async *async, int blocking, file_pos_t pos ); static obj_handle_t device_file_flush( struct fd *fd, struct async *async, int blocking ); static obj_handle_t device_file_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); @@ -484,7 +484,7 @@ static enum server_fd_type device_file_get_fd_type( struct fd *fd ) return FD_TYPE_DEVICE; } -static obj_handle_t device_file_read( struct fd *fd, struct async *async, int blocking, file_pos_t pos ) +static obj_handle_t device_file_read( struct fd *fd, struct async *async, file_pos_t pos ) { struct device_file *file = get_fd_user( fd ); struct irp_call *irp; diff --git a/server/fd.c b/server/fd.c index 7e1baf5..894e6b4 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2158,7 +2158,7 @@ static void unmount_device( struct fd *device_fd ) } /* default read() routine */ -obj_handle_t no_fd_read( struct fd *fd, struct async *async, int blocking, file_pos_t pos ) +obj_handle_t no_fd_read( struct fd *fd, struct async *async, file_pos_t pos ) { set_error( STATUS_OBJECT_TYPE_MISMATCH ); return 0; @@ -2455,7 +2455,7 @@ DECL_HANDLER(read) async = create_async( current, &req->async, iosb ); if (async) { - reply->wait = fd->fd_ops->read( fd, async, req->blocking, req->pos ); + reply->wait = fd->fd_ops->read( fd, async, req->pos ); reply->options = fd->options; release_object( async ); } diff --git a/server/file.h b/server/file.h index 25b411b..a08224e 100644 --- a/server/file.h +++ b/server/file.h @@ -52,7 +52,7 @@ struct fd_ops /* get file information */ enum server_fd_type (*get_fd_type)(struct fd *fd); /* perform a read on the file */ - obj_handle_t (*read)(struct fd *, struct async *, int, file_pos_t ); + obj_handle_t (*read)(struct fd *, struct async *, file_pos_t ); /* perform a write on the file */ obj_handle_t (*write)(struct fd *, struct async *, int, file_pos_t ); /* flush the object buffers */ @@ -100,7 +100,7 @@ extern void default_poll_event( struct fd *fd, int event ); extern int fd_queue_async( struct fd *fd, struct async *async, int type ); extern void fd_async_wake_up( struct fd *fd, int type, unsigned int status ); extern void fd_reselect_async( struct fd *fd, struct async_queue *queue ); -extern obj_handle_t no_fd_read( struct fd *fd, struct async *async, int blocking, file_pos_t pos ); +extern obj_handle_t no_fd_read( struct fd *fd, struct async *async, file_pos_t pos ); extern obj_handle_t no_fd_write( struct fd *fd, struct async *async, int blocking, file_pos_t pos ); extern obj_handle_t no_fd_flush( struct fd *fd, struct async *async, int blocking ); extern obj_handle_t no_fd_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); diff --git a/server/named_pipe.c b/server/named_pipe.c index 44c71fc..3d96c96 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -153,7 +153,7 @@ static const struct object_ops named_pipe_ops = }; /* common server and client pipe end functions */ -static obj_handle_t pipe_end_read( struct fd *fd, struct async *async, int blocking, file_pos_t pos ); +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, int blocking, file_pos_t pos ); static void pipe_end_queue_async( struct fd *fd, struct async *async, int type, int count ); static void pipe_end_reselect_async( struct fd *fd, struct async_queue *queue ); @@ -811,12 +811,12 @@ static void reselect_write_queue( struct pipe_end *pipe_end ) reselect_read_queue( reader ); } -static obj_handle_t pipe_end_read( struct fd *fd, struct async *async, int blocking, file_pos_t pos ) +static obj_handle_t pipe_end_read( struct fd *fd, struct async *async, file_pos_t pos ) { struct pipe_end *pipe_end = get_fd_user( fd ); obj_handle_t handle = 0; - if (!use_server_io( pipe_end )) return no_fd_read( fd, async, blocking, pos ); + if (!use_server_io( pipe_end )) return no_fd_read( fd, async, pos ); if (!pipe_end->connection && list_empty( &pipe_end->message_queue )) { @@ -831,7 +831,7 @@ static obj_handle_t pipe_end_read( struct fd *fd, struct async *async, int block reselect_read_queue( pipe_end ); set_error( STATUS_PENDING ); - if (!blocking) + if (!async_is_blocking( async )) { struct iosb *iosb; iosb = async_get_iosb( async );

1 0

Jacek Caban : server: Remove no longer needed blocking argument from ioctl fd op.
by Alexandre Julliard 12 Apr '17

12 Apr '17

Module: wine Branch: master Commit: 047062b28b84b62a279b2e6104aed00791fe4557 URL: http://source.winehq.org/git/wine.git/?a=commit;h=047062b28b84b62a279b2e610… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 12 13:54:17 2017 +0200 server: Remove no longer needed blocking argument from ioctl fd op. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/device.c | 5 ++--- server/fd.c | 6 +++--- server/file.h | 6 +++--- server/named_pipe.c | 27 +++++++++++---------------- server/sock.c | 4 ++-- 5 files changed, 21 insertions(+), 27 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=047062b28b84b62a279b2…

1 0

Jacek Caban : server: Use async_is_blocking in queue_irp.
by Alexandre Julliard 12 Apr '17

12 Apr '17

Module: wine Branch: master Commit: 5126849f7f500d0602f9af9273e7ec47bf2238fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=5126849f7f500d0602f9af927… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 12 13:53:53 2017 +0200 server: Use async_is_blocking in queue_irp. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/device.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/server/device.c b/server/device.c index 8c46a69..82614ee 100644 --- a/server/device.c +++ b/server/device.c @@ -462,12 +462,11 @@ static void set_file_user_ptr( struct device_file *file, client_ptr_t ptr ) } /* queue an irp to the device */ -static obj_handle_t queue_irp( struct device_file *file, struct irp_call *irp, - struct async *async, int blocking ) +static obj_handle_t queue_irp( struct device_file *file, struct irp_call *irp, struct async *async ) { obj_handle_t handle = 0; - if (blocking && !(handle = alloc_handle( current->process, irp, SYNCHRONIZE, 0 ))) return 0; + if (async_is_blocking( async ) && !(handle = alloc_handle( current->process, irp, SYNCHRONIZE, 0 ))) return 0; if (!fd_queue_async( file->fd, async, ASYNC_TYPE_WAIT )) { @@ -501,7 +500,7 @@ static obj_handle_t device_file_read( struct fd *fd, struct async *async, int bl irp = create_irp( file, &params, async ); if (!irp) return 0; - handle = queue_irp( file, irp, async, blocking ); + handle = queue_irp( file, irp, async ); release_object( irp ); return handle; } @@ -522,7 +521,7 @@ static obj_handle_t device_file_write( struct fd *fd, struct async *async, int b irp = create_irp( file, &params, async ); if (!irp) return 0; - handle = queue_irp( file, irp, async, blocking ); + handle = queue_irp( file, irp, async ); release_object( irp ); return handle; } @@ -541,7 +540,7 @@ static obj_handle_t device_file_flush( struct fd *fd, struct async *async, int b irp = create_irp( file, &params, NULL ); if (!irp) return 0; - handle = queue_irp( file, irp, async, blocking ); + handle = queue_irp( file, irp, async ); release_object( irp ); return handle; } @@ -562,7 +561,7 @@ static obj_handle_t device_file_ioctl( struct fd *fd, ioctl_code_t code, struct irp = create_irp( file, &params, async ); if (!irp) return 0; - handle = queue_irp( file, irp, async, blocking ); + handle = queue_irp( file, irp, async ); release_object( irp ); return handle; }

1 0

Jacek Caban : server: Introduce async_is_blocking helper and use it in sock_ioctl.
by Alexandre Julliard 12 Apr '17

12 Apr '17

Module: wine Branch: master Commit: 5c8d11270d18eaa3bb11dc7cae3f0006df0d7171 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c8d11270d18eaa3bb11dc7ca… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 12 13:53:41 2017 +0200 server: Introduce async_is_blocking helper and use it in sock_ioctl. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/async.c | 5 +++++ server/file.h | 1 + server/sock.c | 4 ++-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/server/async.c b/server/async.c index 7323047..f9d8af3 100644 --- a/server/async.c +++ b/server/async.c @@ -472,6 +472,11 @@ struct iosb *async_get_iosb( struct async *async ) return async->iosb ? (struct iosb *)grab_object( async->iosb ) : NULL; } +int async_is_blocking( struct async *async ) +{ + return !async->event && !async->data.apc && !async->data.apc_context; +} + /* find the first pending async in queue */ struct async *find_pending_async( struct async_queue *queue ) { diff --git a/server/file.h b/server/file.h index 94cc37f..5bb935c 100644 --- a/server/file.h +++ b/server/file.h @@ -187,6 +187,7 @@ extern struct completion *fd_get_completion( struct fd *fd, apc_param_t *p_key ) extern void fd_copy_completion( struct fd *src, struct fd *dst ); extern struct iosb *create_iosb( const void *in_data, data_size_t in_size, data_size_t out_size ); extern struct iosb *async_get_iosb( struct async *async ); +extern int async_is_blocking( struct async *async ); extern struct async *find_pending_async( struct async_queue *queue ); extern void cancel_process_asyncs( struct process *process ); diff --git a/server/sock.c b/server/sock.c index 59ab427..fde38c8 100644 --- a/server/sock.c +++ b/server/sock.c @@ -545,14 +545,14 @@ obj_handle_t sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async, switch(code) { case WS_SIO_ADDRESS_LIST_CHANGE: - if ((sock->state & FD_WINE_NONBLOCKING) && blocking) + if ((sock->state & FD_WINE_NONBLOCKING) && async_is_blocking( async )) { set_error( STATUS_CANT_WAIT ); return 0; } if (!(ifchange_q = sock_get_ifchange_q( sock ))) return 0; queue_async( ifchange_q, async ); - if (blocking) wait_handle = alloc_handle( current->process, async, SYNCHRONIZE, 0 ); + if (async_is_blocking( async )) wait_handle = alloc_handle( current->process, async, SYNCHRONIZE, 0 ); set_error( STATUS_PENDING ); return wait_handle; default:

1 0

Hugh McMaster : regedit/tests: Add some REG_SZ import tests.
by Alexandre Julliard 12 Apr '17

12 Apr '17

Module: wine Branch: master Commit: 5af62255ef081c2cf8007c93f026b7bcc7ae0a30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5af62255ef081c2cf8007c93f… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Apr 12 13:45:11 2017 +0000 regedit/tests: Add some REG_SZ import tests. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 54d20ed..9ff760a 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -238,6 +238,11 @@ static void test_basic_import(void) exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Empty string\"=\"\"\n\n"); + verify_reg(hkey, "Empty string", REG_SZ, "", 1, 0); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Line1\"=\"Value1\"\n\n" "\"Line2\"=\"Value2\"\n\n\n" "\"Line3\"=\"Value3\"\n\n\n\n" @@ -541,6 +546,17 @@ static void test_invalid_import(void) todo_wine verify_reg_nonexist(hkey, "Test15a"); todo_wine verify_reg_nonexist(hkey, "Test15b"); + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test16a\"=\n" + "\"Test16b\"=\\\"\n" + "\"Test16c\"=\\\"Value\\\"\n" + "\"Test16d\"=\\\"Value\"\n\n"); + verify_reg_nonexist(hkey, "Test16a"); + verify_reg_nonexist(hkey, "Test16b"); + verify_reg_nonexist(hkey, "Test16c"); + verify_reg_nonexist(hkey, "Test16d"); + RegCloseKey(hkey); lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); @@ -653,6 +669,17 @@ static void test_comments(void) exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine26a\"=\"Value1\" ;comment\n" + "\"Wine26b\"=\"Value2\"\t\t;comment\n" + "\"Wine26c\"=\"Value3\" #comment\n" + "\"Wine26d\"=\"Value4\"\t\t#comment\n\n"); + todo_wine verify_reg(hkey, "Wine26a", REG_SZ, "Value1", 7, 0); + todo_wine verify_reg(hkey, "Wine26b", REG_SZ, "Value2", 7, 0); + verify_reg_nonexist(hkey, "Wine26c"); + verify_reg_nonexist(hkey, "Wine26d"); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Multi-Line1\"=hex(7):4c,69,6e,65,20,\\\n" " 63,6f,6e,\\;comment\n" " 63,61,74,\\;comment\n"

1 0

Hugh McMaster : reg/tests: Add some missing REG_SZ import tests from regedit.exe.
by Alexandre Julliard 12 Apr '17

12 Apr '17

Module: wine Branch: master Commit: 66fd7339900bdfbe1579eae7a61a8a5e5726664d URL: http://source.winehq.org/git/wine.git/?a=commit;h=66fd7339900bdfbe1579eae7a… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Apr 12 13:45:00 2017 +0000 reg/tests: Add some missing REG_SZ import tests from regedit.exe. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 86 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 86 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index f301c13..9d2426c 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -1313,6 +1313,49 @@ static void test_import(void) test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"TestNoBeginQuote\"=Asdffdsa\"\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "TestNoBeginQuote"); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"TestNoEndQuote\"=\"Asdffdsa\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "TestNoEndQuote"); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"TestNoQuotes\"=Asdffdsa\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "TestNoQuotes"); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "NameNoBeginQuote\"=\"Asdffdsa\"\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "NameNoBeginQuote"); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"NameNoEndQuote=\"Asdffdsa\"\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "NameNoEndQuote"); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "NameNoQuotes=\"Asdffdsa\"\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "NameNoQuotes"); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"MixedQuotes=Asdffdsa\"\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "MixedQuotes"); + todo_wine verify_reg_nonexist(hkey, "MixedQuotes=Asdffdsa"); + + 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); @@ -1775,6 +1818,49 @@ static void test_import(void) test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"TestNoBeginQuote\"=Asdffdsa\"\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "TestNoBeginQuote"); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"TestNoEndQuote\"=\"Asdffdsa\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "TestNoEndQuote"); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"TestNoQuotes\"=Asdffdsa\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "TestNoQuotes"); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "NameNoBeginQuote\"=\"Asdffdsa\"\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "NameNoBeginQuote"); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"NameNoEndQuote=\"Asdffdsa\"\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "NameNoEndQuote"); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "NameNoQuotes=\"Asdffdsa\"\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "NameNoQuotes"); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"MixedQuotes=Asdffdsa\"\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "MixedQuotes"); + todo_wine verify_reg_nonexist(hkey, "MixedQuotes=Asdffdsa"); + + 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

Hugh McMaster : reg/tests: Add more REG_SZ import tests.
by Alexandre Julliard 12 Apr '17

12 Apr '17

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

Piotr Caban : msvcrt: Don' t call unwind handlers when unwinding nested catch blocks.
by Alexandre Julliard 12 Apr '17

12 Apr '17

Module: wine Branch: master Commit: da8b706fdb1488344f91b2fcfba63d6ad8d8e673 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da8b706fdb1488344f91b2fcf… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 12 15:08:39 2017 +0200 msvcrt: Don't call unwind handlers when unwinding nested catch blocks. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/except_x86_64.c | 74 ++++++++++++++++++++++++--------------------- 1 file changed, 39 insertions(+), 35 deletions(-) diff --git a/dlls/msvcrt/except_x86_64.c b/dlls/msvcrt/except_x86_64.c index 80780ae..d299608 100644 --- a/dlls/msvcrt/except_x86_64.c +++ b/dlls/msvcrt/except_x86_64.c @@ -334,7 +334,7 @@ static inline void* WINAPI call_catch_block(EXCEPTION_RECORD *rec) static inline void find_catch_block(EXCEPTION_RECORD *rec, ULONG64 frame, DISPATCHER_CONTEXT *dispatch, const cxx_function_descr *descr, - cxx_exception_type *info) + cxx_exception_type *info, ULONG64 orig_frame) { ULONG64 exc_base = (rec->NumberParameters == 4 ? rec->ExceptionInformation[3] : 0); int trylevel = ip_to_state(rva_to_ptr(descr->ipmap, dispatch->ImageBase), @@ -343,38 +343,8 @@ static inline void find_catch_block(EXCEPTION_RECORD *rec, ULONG64 frame, EXCEPTION_RECORD catch_record; CONTEXT context; UINT i, j; - ULONG64 orig_frame = frame, throw_base; - DWORD throw_func_off; - void *throw_func; INT *unwind_help; - /* update orig_frame if it's a nested exception */ - throw_func_off = RtlLookupFunctionEntry(dispatch->ControlPc, &throw_base, NULL)->BeginAddress; - throw_func = rva_to_ptr(throw_func_off, throw_base); - TRACE("reconstructed handler pointer: %p\n", throw_func); - for (i=descr->tryblock_count; i>0; i--) - { - const tryblock_info *tryblock = rva_to_ptr(descr->tryblock, dispatch->ImageBase); - tryblock = &tryblock[i-1]; - - if (trylevel>tryblock->end_level && trylevel<=tryblock->catch_level) - { - for (j=0; j<tryblock->catchblock_count; j++) - { - /* TODO: is it possible to have the same handler for multiple catch blocks? */ - const catchblock_info *catchblock = rva_to_ptr(tryblock->catchblock, dispatch->ImageBase); - catchblock = &catchblock[j]; - - if (rva_to_ptr(catchblock->handler, dispatch->ImageBase) == throw_func) - { - TRACE("nested exception detected\n"); - orig_frame = *(ULONG64*)rva_to_ptr(catchblock->frame, frame); - TRACE("setting orig_frame to %lx\n", orig_frame); - } - } - } - } - for (i=descr->tryblock_count; i>0; i--) { in_catch = rva_to_ptr(descr->tryblock, dispatch->ImageBase); @@ -457,7 +427,14 @@ static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame, CONTEXT *context, DISPATCHER_CONTEXT *dispatch, const cxx_function_descr *descr) { + int trylevel = ip_to_state(rva_to_ptr(descr->ipmap, dispatch->ImageBase), + descr->ipmap_count, dispatch->ControlPc-dispatch->ImageBase); cxx_exception_type *exc_type; + ULONG64 orig_frame = frame; + ULONG64 throw_base; + DWORD throw_func_off; + void *throw_func; + UINT i, j; if (descr->magic<CXX_FRAME_MAGIC_VC6 || descr->magic>CXX_FRAME_MAGIC_VC8) { @@ -465,6 +442,32 @@ static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame, return ExceptionContinueSearch; } + /* update orig_frame if it's a nested exception */ + throw_func_off = RtlLookupFunctionEntry(dispatch->ControlPc, &throw_base, NULL)->BeginAddress; + throw_func = rva_to_ptr(throw_func_off, throw_base); + TRACE("reconstructed handler pointer: %p\n", throw_func); + for (i=descr->tryblock_count; i>0; i--) + { + const tryblock_info *tryblock = rva_to_ptr(descr->tryblock, dispatch->ImageBase); + tryblock = &tryblock[i-1]; + + if (trylevel>tryblock->end_level && trylevel<=tryblock->catch_level) + { + for (j=0; j<tryblock->catchblock_count; j++) + { + const catchblock_info *catchblock = rva_to_ptr(tryblock->catchblock, dispatch->ImageBase); + catchblock = &catchblock[j]; + + if (rva_to_ptr(catchblock->handler, dispatch->ImageBase) == throw_func) + { + TRACE("nested exception detected\n"); + orig_frame = *(ULONG64*)rva_to_ptr(catchblock->frame, frame); + TRACE("setting orig_frame to %lx\n", orig_frame); + } + } + } + } + if (rec->ExceptionFlags & (EH_UNWINDING|EH_EXIT_UNWIND)) { if (rec->ExceptionCode==STATUS_UNWIND_CONSOLIDATE && rec->NumberParameters==6 && @@ -476,13 +479,13 @@ static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame, if (rec->ExceptionFlags & EH_TARGET_UNWIND) { - ULONG64 orig_frame = rec->ExceptionInformation[1]; const cxx_function_descr *orig_descr = (void*)rec->ExceptionInformation[2]; int end_level = rec->ExceptionInformation[3]; + orig_frame = rec->ExceptionInformation[1]; cxx_local_unwind(orig_frame, dispatch, orig_descr, end_level); } - else + else if(frame == orig_frame) cxx_local_unwind(frame, dispatch, descr, -1); /* FIXME: we should only unregister frames registered by call_catch_block here */ @@ -499,7 +502,8 @@ static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame, return ExceptionContinueSearch; } - cxx_local_unwind(frame, dispatch, descr, -1); + if (frame == orig_frame) + cxx_local_unwind(frame, dispatch, descr, -1); return ExceptionContinueSearch; } if (!descr->tryblock_count) return ExceptionContinueSearch; @@ -545,7 +549,7 @@ static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame, } } - find_catch_block(rec, frame, dispatch, descr, exc_type); + find_catch_block(rec, frame, dispatch, descr, exc_type, orig_frame); return ExceptionContinueSearch; }

1 0

Hans Leidekker : winhttp: Always drain content before sending the next request.
by Alexandre Julliard 12 Apr '17

12 Apr '17

Module: wine Branch: master Commit: 2fa86fd6616e1671dd3ecfa3d2d6eaccf10be994 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fa86fd6616e1671dd3ecfa3d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 12 10:46:35 2017 +0200 winhttp: Always drain content before sending the next request. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 402 +++++++++++++++++++++---------------------- dlls/winhttp/tests/winhttp.c | 6 +- 2 files changed, 203 insertions(+), 205 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2fa86fd6616e1671dd3ec…

1 0

← Newer
1
...
47
48
49
50
51
52
53
...
76
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2017