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

Jacek Caban : server: Use create_request_async for write requests.
by Alexandre Julliard June 28, 2017

June 28, 2017

Module: wine Branch: master Commit: 2bd828b13cf0307ca087d098e67f192dd236c1b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bd828b13cf0307ca087d098e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 26 12:18:23 2017 +0200 server: Use create_request_async for write requests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 6 +++++- server/async.c | 3 ++- server/device.c | 6 +++--- server/fd.c | 18 ++++++------------ server/file.h | 6 +++--- server/named_pipe.c | 26 ++++---------------------- 6 files changed, 23 insertions(+), 42 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 3d9840f..b73af7e 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -624,6 +624,11 @@ static NTSTATUS server_write_file( HANDLE handle, HANDLE event, PIO_APC_ROUTINE status = wine_server_call( req ); wait_handle = wine_server_ptr_handle( reply->wait ); options = reply->options; + if (wait_handle && status != STATUS_PENDING) + { + io->u.Status = status; + io->Information = reply->size; + } } SERVER_END_REQ; @@ -633,7 +638,6 @@ static NTSTATUS server_write_file( HANDLE handle, HANDLE event, PIO_APC_ROUTINE { NtWaitForSingleObject( wait_handle, (options & FILE_SYNCHRONOUS_IO_ALERT), NULL ); status = io->u.Status; - NtClose( wait_handle ); } return status; diff --git a/server/async.c b/server/async.c index 7f2bcf5..b693c28 100644 --- a/server/async.c +++ b/server/async.c @@ -324,7 +324,7 @@ struct async *create_request_async( struct thread *thread, const async_data_t *d } /* return async object status and wait handle to client */ -obj_handle_t async_handoff( struct async *async, int success ) +obj_handle_t async_handoff( struct async *async, int success, data_size_t *result ) { if (!success) { @@ -340,6 +340,7 @@ obj_handle_t async_handoff( struct async *async, int success ) set_reply_data_ptr( async->iosb->out_data, async->iosb->out_size ); async->iosb->out_data = NULL; } + if (result) *result = async->iosb->result; async->signaled = 1; } else diff --git a/server/device.c b/server/device.c index 4aa605b..4c7aa16 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 int 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, file_pos_t pos ); +static int 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 ); static obj_handle_t device_file_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); @@ -506,7 +506,7 @@ static int device_file_read( struct fd *fd, struct async *async, file_pos_t pos return handle; } -static obj_handle_t device_file_write( struct fd *fd, struct async *async, file_pos_t pos ) +static int 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; @@ -522,7 +522,7 @@ static obj_handle_t device_file_write( struct fd *fd, struct async *async, file_ irp = create_irp( file, &params, async ); if (!irp) return 0; - handle = queue_irp( file, irp, async, 1 ); + handle = queue_irp( file, irp, async, 0 ); release_object( irp ); return handle; } diff --git a/server/fd.c b/server/fd.c index f6eb57d..0f1a15e 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2165,7 +2165,7 @@ int 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, file_pos_t pos ) +int no_fd_write( struct fd *fd, struct async *async, file_pos_t pos ) { set_error( STATUS_OBJECT_TYPE_MISMATCH ); return 0; @@ -2451,7 +2451,7 @@ DECL_HANDLER(read) if ((async = create_request_async( current, &req->async ))) { - reply->wait = async_handoff( async, fd->fd_ops->read( fd, async, req->pos ) ); + reply->wait = async_handoff( async, fd->fd_ops->read( fd, async, req->pos ), NULL ); reply->options = fd->options; release_object( async ); } @@ -2463,20 +2463,14 @@ DECL_HANDLER(write) { struct fd *fd = get_handle_fd_obj( current->process, req->async.handle, FILE_WRITE_DATA ); struct async *async; - struct iosb *iosb; if (!fd) return; - if ((iosb = create_iosb( get_req_data(), get_req_data_size(), 0 ))) + if ((async = create_request_async( current, &req->async ))) { - async = create_async( current, &req->async, iosb ); - if (async) - { - reply->wait = fd->fd_ops->write( fd, async, req->pos ); - reply->options = fd->options; - release_object( async ); - } - release_object( iosb ); + reply->wait = async_handoff( async, fd->fd_ops->write( fd, async, req->pos ), &reply->size ); + reply->options = fd->options; + release_object( async ); } release_object( fd ); } diff --git a/server/file.h b/server/file.h index 8cc4d3b..96c1d23 100644 --- a/server/file.h +++ b/server/file.h @@ -54,7 +54,7 @@ struct fd_ops /* perform a read on the file */ int (*read)(struct fd *, struct async *, file_pos_t ); /* perform a write on the file */ - obj_handle_t (*write)(struct fd *, struct async *, file_pos_t ); + int (*write)(struct fd *, struct async *, file_pos_t ); /* flush the object buffers */ obj_handle_t (*flush)(struct fd *, struct async *); /* 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 int 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, file_pos_t pos ); +extern int 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 ); 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 ); @@ -177,7 +177,7 @@ extern struct async_queue *create_async_queue( struct fd *fd ); 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 struct async *create_request_async( struct thread *thread, const async_data_t *data ); -extern obj_handle_t async_handoff( struct async *async, int success ); +extern obj_handle_t async_handoff( struct async *async, int success, data_size_t *result ); 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 ); diff --git a/server/named_pipe.c b/server/named_pipe.c index 07ec006..f33daf8 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -155,7 +155,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 int 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 int 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 ); @@ -830,12 +830,11 @@ static int pipe_end_read( struct fd *fd, struct async *async, file_pos_t pos ) return 1; } -static obj_handle_t pipe_end_write( struct fd *fd, struct async *async, file_pos_t pos ) +static int 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, pos ); @@ -846,13 +845,8 @@ static obj_handle_t pipe_end_write( struct fd *fd, struct async *async, file_pos } if (!write_end->write_q && !(write_end->write_q = create_async_queue( fd ))) return 0; - if (!(handle = alloc_handle( current->process, async, SYNCHRONIZE, 0 ))) return 0; - if (!(message = mem_alloc( sizeof(*message) ))) - { - close_handle( current->process, handle ); - return 0; - } + if (!(message = mem_alloc( sizeof(*message) ))) return 0; message->async = (struct async *)grab_object( async ); message->iosb = async_get_iosb( async ); message->read_pos = 0; @@ -861,19 +855,7 @@ static obj_handle_t pipe_end_write( struct fd *fd, struct async *async, file_pos queue_async( write_end->write_q, async ); reselect_write_queue( write_end ); set_error( STATUS_PENDING ); - - if (!async_is_blocking( async )) - { - struct iosb *iosb; - iosb = async_get_iosb( async ); - if (iosb->status == STATUS_PENDING) - { - close_handle( current->process, handle ); - handle = 0; - } - release_object( iosb ); - } - return handle; + return 1; } static void pipe_end_queue_async( struct fd *fd, struct async *async, int type, int count )

1 0

Huw Davies : msvcrt: _difftime64() takes 64-bit args.
by Alexandre Julliard June 28, 2017

June 28, 2017

Module: wine Branch: master Commit: b7bb360be363cca4ca14dbf88dfdbe8cd6621df6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7bb360be363cca4ca14dbf88… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jun 28 13:49:58 2017 +0100 msvcrt: _difftime64() takes 64-bit args. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec b/dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec index 6cd46b4..db36c29 100644 --- a/dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec +++ b/dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec @@ -15,7 +15,7 @@ @ cdecl _ctime64(ptr) ucrtbase._ctime64 @ cdecl _ctime64_s(str long ptr) ucrtbase._ctime64_s @ cdecl _difftime32(long long) ucrtbase._difftime32 -@ cdecl _difftime64(long long) ucrtbase._difftime64 +@ cdecl _difftime64(int64 int64) ucrtbase._difftime64 @ cdecl _ftime32(ptr) ucrtbase._ftime32 @ cdecl _ftime32_s(ptr) ucrtbase._ftime32_s @ cdecl _ftime64(ptr) ucrtbase._ftime64 diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 964f600..fcf235a 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -768,7 +768,7 @@ @ varargs _cwscanf_s_l(wstr ptr) @ extern _daylight MSVCRT___daylight @ cdecl _difftime32(long long) MSVCRT__difftime32 -@ cdecl _difftime64(long long) MSVCRT__difftime64 +@ cdecl _difftime64(int64 int64) MSVCRT__difftime64 @ stub _dosmaperr @ extern _dstbias MSVCRT__dstbias @ cdecl _dup(long) MSVCRT__dup diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index b2c5745..e0b7761 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1116,7 +1116,7 @@ @ varargs _cwscanf_s_l(wstr ptr) @ extern _daylight MSVCRT___daylight @ cdecl _difftime32(long long) MSVCRT__difftime32 -@ cdecl _difftime64(long long) MSVCRT__difftime64 +@ cdecl _difftime64(int64 int64) MSVCRT__difftime64 @ stub _dosmaperr @ extern _dstbias MSVCRT__dstbias @ cdecl _dup(long) MSVCRT__dup diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index d6f2110..5a2f9c9 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1108,7 +1108,7 @@ @ extern _daylight MSVCRT___daylight @ cdecl _dclass(double) MSVCR120__dclass @ cdecl _difftime32(long long) MSVCRT__difftime32 -@ cdecl _difftime64(long long) MSVCRT__difftime64 +@ cdecl _difftime64(int64 int64) MSVCRT__difftime64 @ stub _dosmaperr @ cdecl _dpcomp(double double) MSVCR120__dpcomp @ cdecl _dsign(double) MSVCR120__dsign diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 4bb1afb..5c6093c 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1047,7 +1047,7 @@ @ extern _daylight msvcr120._daylight @ cdecl _dclass(double) msvcr120._dclass @ cdecl _difftime32(long long) msvcr120._difftime32 -@ cdecl _difftime64(long long) msvcr120._difftime64 +@ cdecl _difftime64(int64 int64) msvcr120._difftime64 @ stub _dosmaperr @ cdecl _dpcomp(double double) msvcr120._dpcomp @ cdecl _dsign(double) msvcr120._dsign diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index de945d5..6c3c33c 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -433,7 +433,7 @@ @ extern _daylight MSVCRT___daylight @ cdecl _decode_pointer(ptr) MSVCRT_decode_pointer @ cdecl _difftime32(long long) MSVCRT__difftime32 -@ cdecl _difftime64(long long) MSVCRT__difftime64 +@ cdecl _difftime64(int64 int64) MSVCRT__difftime64 @ stub _dosmaperr @ extern _dstbias MSVCRT__dstbias @ cdecl _dup(long) MSVCRT__dup diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 8b4a77c..d0ce271 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -416,7 +416,7 @@ @ extern _daylight MSVCRT___daylight @ cdecl _decode_pointer(ptr) MSVCRT_decode_pointer @ cdecl _difftime32(long long) MSVCRT__difftime32 -@ cdecl _difftime64(long long) MSVCRT__difftime64 +@ cdecl _difftime64(int64 int64) MSVCRT__difftime64 @ stub _dosmaperr @ extern _dstbias MSVCRT__dstbias @ cdecl _dup(long) MSVCRT__dup diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 1a887d3..e2b72e8 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -403,7 +403,7 @@ @ varargs _cwscanf_s_l(wstr ptr) @ extern _daylight MSVCRT___daylight @ cdecl _difftime32(long long) MSVCRT__difftime32 -@ cdecl _difftime64(long long) MSVCRT__difftime64 +@ cdecl _difftime64(int64 int64) MSVCRT__difftime64 @ extern _dstbias MSVCRT__dstbias @ cdecl _dup (long) MSVCRT__dup @ cdecl _dup2 (long long) MSVCRT__dup2 diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 78ae7d6..5d13712 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -252,7 +252,7 @@ @ cdecl _dclass(double) MSVCR120__dclass @ stub _dexp @ cdecl _difftime32(long long) MSVCRT__difftime32 -@ cdecl _difftime64(long long) MSVCRT__difftime64 +@ cdecl _difftime64(int64 int64) MSVCRT__difftime64 @ stub _dlog @ stub _dnorm @ cdecl _dpcomp(double double) MSVCR120__dpcomp

1 0

Francois Gouget : testbot/WineRunTask: Always take a screenshot.
by Alexandre Julliard June 28, 2017

June 28, 2017

Module: tools Branch: master Commit: 36e720d046620ec65da53adf8ee1593b7bb3906a URL: http://source.winehq.org/git/tools.git/?a=commit;h=36e720d046620ec65da53adf… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jun 28 09:49:04 2017 +0200 testbot/WineRunTask: Always take a screenshot. Even if we were not able to send the test file. Maybe the screenshot will show a helpful Windows error message like "network connection lost". Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunTask.pl | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 615d898..1663c10 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -64,7 +64,7 @@ sub TakeScreenshot($$) my ($VM, $FullScreenshotFileName) = @_; my ($ErrMessage, $ImageSize, $ImageBytes) = $VM->CaptureScreenImage(); - if (! defined($ErrMessage)) + if (!defined $ErrMessage) { my $OldUMask = umask(002); if (open(my $Screenshot, ">", $FullScreenshotFileName)) @@ -78,9 +78,9 @@ sub TakeScreenshot($$) } umask($OldUMask); } - else + elsif ($VM->IsPoweredOn()) { - Error "Can't capture screenshot: $ErrMessage\n"; + Error "Could not capture a screenshot: $ErrMessage\n"; } } @@ -222,6 +222,9 @@ sub WrapUpAndExit($;$$) my ($Status, $TestFailures, $Retry) = @_; my $NewVMStatus = $Status eq 'queued' ? 'offline' : 'dirty'; + Debug(Elapsed($Start), " Taking a screenshot\n"); + TakeScreenshot($VM, $FullScreenshotFileName); + my $Tries = $Task->TestFailures || 0; if ($Retry) { @@ -755,10 +758,6 @@ elsif (!defined $TAError) } $TA->Disconnect(); - -Debug(Elapsed($Start), " Taking a screenshot\n"); -TakeScreenshot($VM, $FullScreenshotFileName); - FatalTAError(undef, $TAError, $PossibleCrash) if (defined $TAError);

1 0

Paul Gofman : d3dx9: Get rid of constant' s length checking for matrix in set_constants().
by Alexandre Julliard June 27, 2017

June 27, 2017

Module: wine Branch: master Commit: 0029128464922a6d714fd33709b0a2e4a8c5eb71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0029128464922a6d714fd3370… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Jun 22 16:11:55 2017 +0300 d3dx9: Get rid of constant's length checking for matrix in set_constants(). When count in const_upload_info is calculated precisely (considering actual constant set length), boolean matrix setting fall in direct copy path, unless transpose is required. The case of incomplete last row for matrix should be handled in set_constants() for transposed boolean constant only. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/preshader.c | 46 ++++++++++++++++++++++++++++++++++++---------- 1 file changed, 36 insertions(+), 10 deletions(-) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index 3b06f66..25374a3 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -269,6 +269,7 @@ struct const_upload_info unsigned int major_stride; unsigned int major_count; unsigned int count; + unsigned int minor_remainder; }; static enum pres_value_type table_type_from_param_type(D3DXPARAMETER_TYPE type) @@ -1038,10 +1039,22 @@ static void get_const_upload_info(struct d3dx_const_param_eval_output *const_set info->major = param->rows; info->minor = param->columns; } - info->major_stride = max(info->minor, get_reg_components(table)); - info->major_count = min(info->major * info->major_stride, - get_offset_reg(table, const_set->register_count) + info->major_stride - 1) / info->major_stride; - info->count = info->major_count * info->minor; + + if (get_reg_components(table) == 1) + { + unsigned int const_length = get_offset_reg(table, const_set->register_count); + + info->major_stride = info->minor; + info->major_count = const_length / info->major_stride; + info->minor_remainder = const_length % info->major_stride; + } + else + { + info->major_stride = get_reg_components(table); + info->major_count = const_set->register_count; + info->minor_remainder = 0; + } + info->count = info->major_count * info->minor + info->minor_remainder; } static void pres_int_from_float(void *out, const void *in, unsigned int count) @@ -1172,16 +1185,19 @@ static void set_constants(struct d3dx_regstore *rs, struct d3dx_const_tab *const { for (j = 0; j < info.minor; ++j) { - unsigned int offset; - - offset = i * info.major_stride + j; - if (get_reg_offset(table, offset) >= const_set->register_count) - break; if (info.transpose) param_offset = i + j * info.major; else param_offset = i * info.minor + j; - out[offset] = data[param_offset]; + out[i * info.major_stride + j] = data[param_offset]; + } + } + if (info.transpose) + { + for (j = 0; j < info.minor_remainder; ++j) + { + param_offset = i + j * info.major; + out[i * info.major_stride + j] = data[param_offset]; } } start_offset += get_offset_reg(table, const_set->register_count); @@ -1417,6 +1433,16 @@ static HRESULT init_set_constants_param(struct d3dx_const_tab *const_tab, ID3DXC && !info.transpose && info.minor == info.major_stride && info.count == get_offset_reg(const_set.table, const_set.register_count) && info.count * sizeof(unsigned int) <= param->bytes; + if (info.minor_remainder && !const_set.direct_copy && !info.transpose) + FIXME("Incomplete last row for not transposed matrix which cannot be directly copied, parameter %s.\n", + debugstr_a(param->name)); + + if (info.major_count > info.major + || (info.major_count == info.major && info.minor_remainder)) + { + WARN("Constant dimensions exceed parameter size.\n"); + return D3DERR_INVALIDCALL; + } if (FAILED(hr = append_const_set(const_tab, &const_set))) return hr;

1 0

Paul Gofman : d3dx9: Move transpose 'if' outside of the inner loop in set_constants().
by Alexandre Julliard June 27, 2017

June 27, 2017

Module: wine Branch: master Commit: 08df007e802dfa2845a5b4f33bbf8a04202258bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=08df007e802dfa2845a5b4f33… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Jun 22 16:11:56 2017 +0300 d3dx9: Move transpose 'if' outside of the inner loop in set_constants(). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/preshader.c | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index 25374a3..911ca79 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -1141,7 +1141,6 @@ static void set_constants(struct d3dx_regstore *rs, struct d3dx_const_tab *const unsigned int table = const_set->table; struct d3dx_parameter *param = const_set->param; unsigned int element, i, j, start_offset; - unsigned int param_offset; struct const_upload_info info; unsigned int *data = param->data; enum pres_value_type param_type; @@ -1181,24 +1180,20 @@ static void set_constants(struct d3dx_regstore *rs, struct d3dx_const_tab *const /* Store reshaped but (possibly) not converted yet data temporarily in the same constants buffer. * All the supported types of parameters and table values have the same size. */ - for (i = 0; i < info.major_count; ++i) - { - for (j = 0; j < info.minor; ++j) - { - if (info.transpose) - param_offset = i + j * info.major; - else - param_offset = i * info.minor + j; - out[i * info.major_stride + j] = data[param_offset]; - } - } if (info.transpose) { + for (i = 0; i < info.major_count; ++i) + for (j = 0; j < info.minor; ++j) + out[i * info.major_stride + j] = data[i + j * info.major]; + for (j = 0; j < info.minor_remainder; ++j) - { - param_offset = i + j * info.major; - out[i * info.major_stride + j] = data[param_offset]; - } + out[i * info.major_stride + j] = data[i + j * info.major]; + } + else + { + for (i = 0; i < info.major_count; ++i) + for (j = 0; j < info.minor; ++j) + out[i * info.major_stride + j] = data[i * info.minor + j]; } start_offset += get_offset_reg(table, const_set->register_count); data += param->rows * param->columns;

1 0

Paul Gofman : d3dx9: Remove redundant parameter size check in set_constants().
by Alexandre Julliard June 27, 2017

June 27, 2017

Module: wine Branch: master Commit: ed7e27ad8db2c08afbf222d80ec0d6d093ad4498 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed7e27ad8db2c08afbf222d80… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Jun 22 16:11:54 2017 +0300 d3dx9: Remove redundant parameter size check in set_constants(). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/preshader.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index 7ca0c8f..3b06f66 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -1181,11 +1181,6 @@ static void set_constants(struct d3dx_regstore *rs, struct d3dx_const_tab *const param_offset = i + j * info.major; else param_offset = i * info.minor + j; - if (param_offset * sizeof(unsigned int) >= param->bytes) - { - WARN("Parameter data is too short, name %s, component %u.\n", debugstr_a(param->name), i); - break; - } out[offset] = data[param_offset]; } }

1 0

Hugh McMaster : regedit/tests: Test the effects of comments and new lines that appear between valid hex data lines.
by Alexandre Julliard June 27, 2017

June 27, 2017

Module: wine Branch: master Commit: 81fa51743605b34881047962f48651e06217fd94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81fa51743605b34881047962f… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jun 27 12:31:24 2017 +0000 regedit/tests: Test the effects of comments and new lines that appear between valid hex data lines. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 45 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index c293f4a..f7334e4 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -1266,6 +1266,42 @@ static void test_comments(void) todo_wine verify_reg(hkey, "Wine28e", REG_EXPAND_SZ, "%HOME%\\%PATH%", 14, 0); verify_reg_nonexist(hkey, "Wine28f"); + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine29a\"=hex(7):4c,69,6e,65,20,\\\n" + " 63,6f,6e,63,61,74,\\\n" + ";comment\n" + " 65,6e,\\;comment\n" + " 61,74,69,6f,6e,00,00\n\n"); + todo_wine verify_reg(hkey, "Wine29a", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine29b\"=hex(7):4c,69,6e,65,20,\\\n" + " 63,6f,6e,63,61,74,\\\n" + " ;comment\n" + " 65,6e,\\;comment\n" + " 61,74,69,6f,6e,00,00\n\n"); + todo_wine verify_reg(hkey, "Wine29b", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine29c\"=hex(7):4c,69,6e,65,20,\\\n" + " 63,6f,6e,63,61,74,\\\n" + "#comment\n" + " 65,6e,\\;comment\n" + " 61,74,69,6f,6e,00,00\n\n"); + verify_reg_nonexist(hkey, "Wine29c"); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine29d\"=hex(7):4c,69,6e,65,20,\\\n" + " 63,6f,6e,63,61,74,\\\n" + " #comment\n" + " 65,6e,\\;comment\n" + " 61,74,69,6f,6e,00,00\n\n"); + verify_reg_nonexist(hkey, "Wine29d"); + RegCloseKey(hkey); lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); @@ -1394,6 +1430,15 @@ static void test_import_with_whitespace(void) "\t@\t=\tdword:\t00000008\t\n\n"); verify_reg(hkey, "", REG_DWORD, &dword, sizeof(DWORD), 0); + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine10\"=hex(7):4c,69,6e,65,20,\\\n" + " 63,6f,6e,\\\n\n" + " 63,61,74,\\\n\n\n" + " 65,6e,\\\n\n\n\n" + " 61,74,69,6f,6e,00,00\n\n"); + verify_reg(hkey, "Wine10", REG_MULTI_SZ, "Line concatenation\0", 20, TODO_REG_SIZE); + lr = RegCloseKey(hkey); ok(lr == ERROR_SUCCESS, "RegCloseKey failed: got %d, expected 0\n", lr);

1 0

Hugh McMaster : regedit/tests: Test line concatenation with comments, new lines and comma variations before a new default registry value.
by Alexandre Julliard June 27, 2017

June 27, 2017

Module: wine Branch: master Commit: a31f070adaf8e3ecd3c42e651054ac09a1d1fe58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a31f070adaf8e3ecd3c42e651… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jun 27 12:31:08 2017 +0000 regedit/tests: Test line concatenation with comments, new lines and comma variations before a new default registry value. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 42 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 706b987..ba372b4 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -559,7 +559,7 @@ static void test_invalid_import(void) exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"TestNoEndQuote\"=\"Asdffdsa\n"); - lr = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ, &hkey); + lr = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ|KEY_SET_VALUE, &hkey); ok(lr == ERROR_SUCCESS, "RegOpenKeyExA failed: %d\n", lr); verify_reg_nonexist(hkey, "TestNoEndQuote"); @@ -961,6 +961,46 @@ static void test_invalid_import(void) verify_reg_nonexist(hkey, "Wine27i"); todo_wine verify_reg(hkey, "Wine27j", REG_EXPAND_SZ, "%PATH%", 7, 0); + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine28a\"=hex(2):4c,69,6e,65,20,\\\n" + "@=\"Default value 1\"\n\n"); + verify_reg_nonexist(hkey, "Wine28a"); + verify_reg_nonexist(hkey, NULL); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine28b\"=hex(2):4c,69,6e,65,20,\\\n" + ";comment\n" + "@=\"Default value 2\"\n\n"); + verify_reg_nonexist(hkey, "Wine28b"); + todo_wine verify_reg_nonexist(hkey, NULL); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine28c\"=hex(2):4c,69,6e,65,20,\\\n" + "#comment\n" + "@=\"Default value 3\"\n\n"); + verify_reg_nonexist(hkey, "Wine28c"); + verify_reg(hkey, NULL, REG_SZ, "Default value 3", 16, 0); + + lr = RegDeleteValueW(hkey, NULL); + ok(lr == ERROR_SUCCESS, "RegDeleteValue failed: %u\n", lr); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine28d\"=hex(2):4c,69,6e,65,20,\\\n\n" + "@=\"Default value 4\"\n\n"); + todo_wine verify_reg_nonexist(hkey, "Wine28d"); + todo_wine verify_reg_nonexist(hkey, NULL); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine28e\"=hex(2):4c,69,6e,65,20\\\n" + "@=\"Default value 5\"\n\n"); + verify_reg_nonexist(hkey, "Wine28e"); + verify_reg(hkey, NULL, REG_SZ, "Default value 5", 16, TODO_REG_DATA); + RegCloseKey(hkey); lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE);

1 0

Hugh McMaster : regedit/tests: Test line concatenation with comments, new lines and comma variations before a new registry value.
by Alexandre Julliard June 27, 2017

June 27, 2017

Module: wine Branch: master Commit: db9e4199e0c4de248a927df0d0f3577d00d5ce2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=db9e4199e0c4de248a927df0d… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jun 27 12:30:59 2017 +0000 regedit/tests: Test line concatenation with comments, new lines and comma variations before a new registry value. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 88 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index e2aea48..706b987 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -551,6 +551,7 @@ static void test_invalid_import(void) { LONG lr; HKEY hkey; + DWORD dword = 0x8; lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); ok(lr == ERROR_SUCCESS || lr == ERROR_FILE_NOT_FOUND, "RegDeleteKeyA failed: %d\n", lr); @@ -873,6 +874,93 @@ static void test_invalid_import(void) lr = RegDeleteKeyA(hkey, "Subkey2"); todo_wine ok(lr == ERROR_SUCCESS, "RegDeleteKey failed: %u\n", lr); + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine25a\"=hex(2):4c,69,6e,65,20,\\\n" + "\"Wine25b\"=\"Test value\"\n" + + "\"Wine25c\"=hex(2):4c,69,6e,65,20,\\\n" + ";comment\n" + "\"Wine25d\"=\"Test value\"\n" + + "\"Wine25e\"=hex(2):4c,69,6e,65,20,\\\n" + "#comment\n" + "\"Wine25f\"=\"Test value\"\n" + + "\"Wine25g\"=hex(2):4c,69,6e,65,20,\\\n\n" + "\"Wine25h\"=\"Test value\"\n" + + "\"Wine25i\"=hex(2):4c,69,6e,65,20\\\n" + "\"Wine25j\"=\"Test value\"\n\n"); + verify_reg_nonexist(hkey, "Wine25a"); + verify_reg_nonexist(hkey, "Wine25b"); + verify_reg_nonexist(hkey, "Wine25c"); + todo_wine verify_reg_nonexist(hkey, "Wine25d"); + verify_reg_nonexist(hkey, "Wine25e"); + verify_reg(hkey, "Wine25f", REG_SZ, "Test value", 11, 0); + todo_wine verify_reg_nonexist(hkey, "Wine25g"); + todo_wine verify_reg_nonexist(hkey, "Wine25h"); + verify_reg_nonexist(hkey, "Wine25i"); + todo_wine verify_reg(hkey, "Wine25j", REG_SZ, "Test value", 11, 0); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine26a\"=hex(2):4c,69,6e,65,20,\\\n" + "\"Wine26b\"=dword:00000008\n" + + "\"Wine26c\"=hex(2):4c,69,6e,65,20,\\\n" + ";comment\n" + "\"Wine26d\"=dword:00000008\n" + + "\"Wine26e\"=hex(2):4c,69,6e,65,20,\\\n" + "#comment\n" + "\"Wine26f\"=dword:00000008\n" + + "\"Wine26g\"=hex(2):4c,69,6e,65,20,\\\n\n" + "\"Wine26h\"=dword:00000008\n" + + "\"Wine26i\"=hex(2):4c,69,6e,65,20\\\n" + "\"Wine26j\"=dword:00000008\n\n"); + verify_reg_nonexist(hkey, "Wine26a"); + verify_reg_nonexist(hkey, "Wine26b"); + verify_reg_nonexist(hkey, "Wine26c"); + todo_wine verify_reg_nonexist(hkey, "Wine26d"); + verify_reg_nonexist(hkey, "Wine26e"); + verify_reg(hkey, "Wine26f", REG_DWORD, &dword, sizeof(dword), 0); + todo_wine verify_reg_nonexist(hkey, "Wine26g"); + todo_wine verify_reg_nonexist(hkey, "Wine26h"); + verify_reg_nonexist(hkey, "Wine26i"); + todo_wine verify_reg(hkey, "Wine26j", REG_DWORD, &dword, sizeof(dword), 0); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine27a\"=hex(2):25,48,4f,4d,45,25,5c,\\\n" + "\"Wine27b\"=hex(2):25,50,41,54,48,25,00\n" + + "\"Wine27c\"=hex(2):25,48,4f,4d,45,25,5c,\\\n" + ";comment\n" + "\"Wine27d\"=hex(2):25,50,41,54,48,25,00\n" + + "\"Wine27e\"=hex(2):25,48,4f,4d,45,25,5c,\\\n" + "#comment\n" + "\"Wine27f\"=hex(2):25,50,41,54,48,25,00\n" + + "\"Wine27g\"=hex(2):25,48,4f,4d,45,25,5c,\\\n\n" + "\"Wine27h\"=hex(2):25,50,41,54,48,25,00\n" + + "\"Wine27i\"=hex(2):25,48,4f,4d,45,25,5c\\\n" + "\"Wine27j\"=hex(2):25,50,41,54,48,25,00\n\n"); + verify_reg_nonexist(hkey, "Wine27a"); + verify_reg_nonexist(hkey, "Wine27b"); + verify_reg_nonexist(hkey, "Wine27c"); + todo_wine verify_reg_nonexist(hkey, "Wine27d"); + verify_reg_nonexist(hkey, "Wine27e"); + verify_reg(hkey, "Wine27f", REG_EXPAND_SZ, "%PATH%", 7, 0); + todo_wine verify_reg_nonexist(hkey, "Wine27g"); + todo_wine verify_reg_nonexist(hkey, "Wine27h"); + verify_reg_nonexist(hkey, "Wine27i"); + todo_wine verify_reg(hkey, "Wine27j", REG_EXPAND_SZ, "%PATH%", 7, 0); + RegCloseKey(hkey); lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE);

1 0

Hugh McMaster : regedit/tests: Test line concatenation with a new registry key on the next line.
by Alexandre Julliard June 27, 2017

June 27, 2017

Module: wine Branch: master Commit: 82263293f6a9362b4110e7eb26da4f84dd000764 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82263293f6a9362b4110e7eb2… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jun 27 12:30:50 2017 +0000 regedit/tests: Test line concatenation with a new registry key on the next line. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 79740c4..e2aea48 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -856,6 +856,23 @@ static void test_invalid_import(void) verify_reg_nonexist(hkey, "Wine23j"); verify_reg_nonexist(hkey, "Wine23k"); + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine24a\"=hex(2):4c,69,6e,65,20,\\\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1]\n"); + verify_reg_nonexist(hkey, "Wine24a"); + verify_key_nonexist(hkey, "Subkey1"); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine24b\"=hex(2):4c,69,6e,65,20\\\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2]\n"); + verify_reg_nonexist(hkey, "Wine24b"); + todo_wine verify_key(hkey, "Subkey2"); + + lr = RegDeleteKeyA(hkey, "Subkey2"); + todo_wine ok(lr == ERROR_SUCCESS, "RegDeleteKey failed: %u\n", lr); + RegCloseKey(hkey); lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE);

1 0