wine-commits October 2017

wine-commits@winehq.org

2 participants
478 discussions

Jacek Caban : ntdll: Remove no longer needed handling of FD_TYPE_PIPE.
by Alexandre Julliard 09 Oct '17

09 Oct '17

Module: wine Branch: master Commit: f449146ae3154d14150159f7f21cf9dbaf2ba6df URL: http://source.winehq.org/git/wine.git/?a=commit;h=f449146ae3154d14150159f7f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 9 14:28:56 2017 +0200 ntdll: Remove no longer needed handling of FD_TYPE_PIPE. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 35fd2c1..ca2afa0 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -711,7 +711,6 @@ static NTSTATUS get_io_timeouts( HANDLE handle, enum server_fd_type type, ULONG } break; case FD_TYPE_SOCKET: - case FD_TYPE_PIPE: case FD_TYPE_CHAR: if (is_read) timeouts->interval = 0; /* return as soon as we got something */ break; @@ -764,7 +763,6 @@ static NTSTATUS get_io_avail_mode( HANDLE handle, enum server_fd_type type, BOOL break; case FD_TYPE_MAILSLOT: case FD_TYPE_SOCKET: - case FD_TYPE_PIPE: case FD_TYPE_CHAR: *avail_mode = TRUE; break; @@ -1128,7 +1126,7 @@ static NTSTATUS FILE_AsyncWriteService( void *user, IO_STATUS_BLOCK *iosb, NTSTA &needs_close, &type, NULL ))) break; - if (!fileio->count && (type == FD_TYPE_MAILSLOT || type == FD_TYPE_PIPE || type == FD_TYPE_SOCKET)) + if (!fileio->count && (type == FD_TYPE_MAILSLOT || type == FD_TYPE_SOCKET)) result = send( fd, fileio->buffer, 0, 0 ); else result = write( fd, &fileio->buffer[fileio->already], fileio->count - fileio->already ); @@ -1308,7 +1306,7 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent, for (;;) { /* zero-length writes on sockets may not work with plain write(2) */ - if (!length && (type == FD_TYPE_MAILSLOT || type == FD_TYPE_PIPE || type == FD_TYPE_SOCKET)) + if (!length && (type == FD_TYPE_MAILSLOT || type == FD_TYPE_SOCKET)) result = send( unix_handle, buffer, 0, 0 ); else result = write( unix_handle, (const char *)buffer + total, length - total );

1 0

Jacek Caban : server: Store named pipe fd in pipe_end throughout its whole life time.
by Alexandre Julliard 09 Oct '17

09 Oct '17

Module: wine Branch: master Commit: c295dd6bda731553f835447c4049d79d11c43b5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c295dd6bda731553f835447c4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 9 14:28:46 2017 +0200 server: Store named pipe fd in pipe_end throughout its whole life time. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/named_pipe.c | 63 ++++++++++++----------------------------------------- 1 file changed, 14 insertions(+), 49 deletions(-) diff --git a/server/named_pipe.c b/server/named_pipe.c index b5738ad..5796089 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -75,7 +75,6 @@ struct pipe_end struct pipe_server { struct pipe_end pipe_end; /* common header for pipe_client and pipe_server */ - struct fd *ioctl_fd; /* file descriptor for ioctls when not connected */ struct list entry; /* entry in named pipe servers list */ enum pipe_state state; /* server state */ struct pipe_client *client; /* client that this server is connected to */ @@ -142,6 +141,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 struct fd *pipe_end_get_fd( struct object *obj ); static int pipe_end_read( struct fd *fd, struct async *async, file_pos_t pos ); static int pipe_end_write( struct fd *fd, struct async *async_data, file_pos_t pos ); static int pipe_end_flush( struct fd *fd, struct async *async ); @@ -150,7 +150,6 @@ static void pipe_end_reselect_async( struct fd *fd, struct async_queue *queue ); /* server end functions */ static void pipe_server_dump( struct object *obj, int verbose ); -static struct fd *pipe_server_get_fd( struct object *obj ); static void pipe_server_destroy( struct object *obj); static int pipe_server_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); @@ -164,7 +163,7 @@ static const struct object_ops pipe_server_ops = default_fd_signaled, /* signaled */ no_satisfied, /* satisfied */ no_signal, /* signal */ - pipe_server_get_fd, /* get_fd */ + pipe_end_get_fd, /* get_fd */ default_fd_map_access, /* map_access */ default_get_sd, /* get_sd */ default_set_sd, /* set_sd */ @@ -193,7 +192,6 @@ static const struct fd_ops pipe_server_fd_ops = /* client end functions */ static void pipe_client_dump( struct object *obj, int verbose ); static int pipe_client_signaled( struct object *obj, struct wait_queue_entry *entry ); -static struct fd *pipe_client_get_fd( struct object *obj ); static void pipe_client_destroy( struct object *obj ); static int pipe_client_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); @@ -207,7 +205,7 @@ static const struct object_ops pipe_client_ops = pipe_client_signaled, /* signaled */ no_satisfied, /* satisfied */ no_signal, /* signal */ - pipe_client_get_fd, /* get_fd */ + pipe_end_get_fd, /* get_fd */ default_fd_map_access, /* map_access */ default_get_sd, /* get_sd */ default_set_sd, /* set_sd */ @@ -324,13 +322,10 @@ static void named_pipe_destroy( struct object *obj) free_async_queue( &pipe->waiters ); } -static struct fd *pipe_client_get_fd( struct object *obj ) +static struct fd *pipe_end_get_fd( struct object *obj ) { - struct pipe_client *client = (struct pipe_client *) obj; - if (client->pipe_end.fd) - return (struct fd *) grab_object( client->pipe_end.fd ); - set_error( STATUS_PIPE_DISCONNECTED ); - return NULL; + struct pipe_end *pipe_end = (struct pipe_end *) obj; + return (struct fd *) grab_object( pipe_end->fd ); } static void set_server_state( struct pipe_server *server, enum pipe_state state ) @@ -341,27 +336,17 @@ static void set_server_state( struct pipe_server *server, enum pipe_state state { case ps_connected_server: case ps_wait_disconnect: - assert( server->pipe_end.fd ); break; case ps_wait_open: case ps_idle_server: - assert( !server->pipe_end.fd ); - set_no_fd_status( server->ioctl_fd, STATUS_PIPE_LISTENING ); + set_no_fd_status( server->pipe_end.fd, STATUS_PIPE_LISTENING ); break; case ps_wait_connect: - assert( !server->pipe_end.fd ); - set_no_fd_status( server->ioctl_fd, STATUS_PIPE_DISCONNECTED ); + set_no_fd_status( server->pipe_end.fd, STATUS_PIPE_DISCONNECTED ); break; } } -static struct fd *pipe_server_get_fd( struct object *obj ) -{ - struct pipe_server *server = (struct pipe_server *) obj; - - return (struct fd *)grab_object( server->pipe_end.fd ? server->pipe_end.fd : server->ioctl_fd ); -} - static void wake_message( struct pipe_message *message ) { @@ -411,19 +396,6 @@ static void pipe_end_disconnect( struct pipe_end *pipe_end, unsigned int status } } -static void do_disconnect( struct pipe_server *server ) -{ - /* we may only have a server fd, if the client disconnected */ - if (server->client) - { - assert( server->client->server == server ); - assert( server->client->pipe_end.fd ); - } - assert( server->pipe_end.fd ); - release_object( server->pipe_end.fd ); - server->pipe_end.fd = NULL; -} - static void pipe_end_destroy( struct pipe_end *pipe_end ) { struct pipe_message *message; @@ -437,6 +409,7 @@ static void pipe_end_destroy( struct pipe_end *pipe_end ) free_async_queue( &pipe_end->read_q ); free_async_queue( &pipe_end->write_q ); + if (pipe_end->fd) release_object( pipe_end->fd ); } static void pipe_server_destroy( struct object *obj) @@ -447,8 +420,6 @@ static void pipe_server_destroy( struct object *obj) pipe_end_disconnect( &server->pipe_end, STATUS_PIPE_BROKEN ); - if (server->pipe_end.fd) do_disconnect( server ); - pipe_end_destroy( &server->pipe_end ); if (server->client) { @@ -459,7 +430,6 @@ static void pipe_server_destroy( struct object *obj) assert( server->pipe->instances ); server->pipe->instances--; - if (server->ioctl_fd) release_object( server->ioctl_fd ); list_remove( &server->entry ); release_object( server->pipe ); } @@ -494,7 +464,6 @@ static void pipe_client_destroy( struct object *obj) } pipe_end_destroy( &client->pipe_end ); - if (client->pipe_end.fd) release_object( client->pipe_end.fd ); } static void named_pipe_device_dump( struct object *obj, int verbose ) @@ -849,7 +818,7 @@ static int pipe_server_ioctl( struct fd *fd, ioctl_code_t code, struct async *as { case ps_idle_server: case ps_wait_connect: - fd_queue_async( server->ioctl_fd, async, ASYNC_TYPE_WAIT ); + fd_queue_async( server->pipe_end.fd, async, ASYNC_TYPE_WAIT ); set_server_state( server, ps_wait_open ); async_wake_up( &server->pipe->waiters, STATUS_SUCCESS ); set_error( STATUS_PENDING ); @@ -871,11 +840,9 @@ static int pipe_server_ioctl( struct fd *fd, ioctl_code_t code, struct async *as { case ps_connected_server: assert( server->client ); - assert( server->client->pipe_end.fd ); /* dump the client and server fds - client loses all waiting data */ pipe_end_disconnect( &server->pipe_end, STATUS_PIPE_DISCONNECTED ); - do_disconnect( server ); server->client->server = NULL; server->client = NULL; set_server_state( server, ps_wait_connect ); @@ -883,7 +850,6 @@ static int pipe_server_ioctl( struct fd *fd, ioctl_code_t code, struct async *as case ps_wait_disconnect: assert( !server->client ); pipe_end_disconnect( &server->pipe_end, STATUS_PIPE_DISCONNECTED ); - do_disconnect( server ); set_server_state( server, ps_wait_connect ); break; case ps_idle_server: @@ -953,12 +919,12 @@ static struct pipe_server *create_pipe_server( struct named_pipe *pipe, unsigned list_add_head( &pipe->servers, &server->entry ); grab_object( pipe ); - if (!(server->ioctl_fd = alloc_pseudo_fd( &pipe_server_fd_ops, &server->pipe_end.obj, options ))) + if (!(server->pipe_end.fd = alloc_pseudo_fd( &pipe_server_fd_ops, &server->pipe_end.obj, options ))) { release_object( server ); return NULL; } - set_fd_signaled( server->ioctl_fd, 1 ); + set_fd_signaled( server->pipe_end.fd, 1 ); set_server_state( server, ps_idle_server ); return server; } @@ -1048,11 +1014,10 @@ static struct object *named_pipe_open_file( struct object *obj, unsigned int acc if ((client = create_pipe_client( options, pipe->flags, pipe->outsize, options ))) { - server->pipe_end.fd = (struct fd *)grab_object( server->ioctl_fd ); - set_no_fd_status( server->ioctl_fd, STATUS_BAD_DEVICE_TYPE ); + set_no_fd_status( server->pipe_end.fd, STATUS_BAD_DEVICE_TYPE ); allow_fd_caching( server->pipe_end.fd ); if (server->state == ps_wait_open) - fd_async_wake_up( server->ioctl_fd, ASYNC_TYPE_WAIT, STATUS_SUCCESS ); + fd_async_wake_up( server->pipe_end.fd, ASYNC_TYPE_WAIT, STATUS_SUCCESS ); set_server_state( server, ps_connected_server ); server->client = client; client->server = server;

1 0

Jacek Caban : ntdll/tests: Remove no longer needed Sleep calls.
by Alexandre Julliard 09 Oct '17

09 Oct '17

Module: wine Branch: master Commit: 4e17ff7c98a654e11c06c4ac742065ae3e6ed9d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e17ff7c98a654e11c06c4ac7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 9 14:28:21 2017 +0200 ntdll/tests: Remove no longer needed Sleep calls. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/pipe.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index 9628cc2..a619fee 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -811,7 +811,6 @@ static void read_pipe_test(ULONG pipe_flags, ULONG pipe_type) ret = WriteFile( write, buffer, 1, &written, NULL ); ok(ret && written == 1, "WriteFile error %d\n", GetLastError()); /* iosb updated here by async i/o */ - Sleep(1); /* FIXME: needed for wine to run the i/o apc */ ok( U(iosb).Status == 0, "wrong status %x\n", U(iosb).Status ); ok( iosb.Information == 1, "wrong info %lu\n", iosb.Information ); ok( !is_signaled( read ), "read handle is signaled\n" ); @@ -837,7 +836,6 @@ static void read_pipe_test(ULONG pipe_flags, ULONG pipe_type) ret = WriteFile( write, buffer, 1, &written, NULL ); ok(ret && written == 1, "WriteFile error %d\n", GetLastError()); /* iosb updated here by async i/o */ - Sleep(1); /* FIXME: needed for wine to run the i/o apc */ ok( U(iosb).Status == 0, "wrong status %x\n", U(iosb).Status ); ok( iosb.Information == 1, "wrong info %lu\n", iosb.Information ); ok( is_signaled( read ), "read handle is not signaled\n" );

1 0

Huw Davies : ntdll: Add free list buckets for every arena size up to 0x100.
by Alexandre Julliard 09 Oct '17

09 Oct '17

Module: wine Branch: master Commit: 2175852f5a45eebef5dcbbad9906509e736d596a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2175852f5a45eebef5dcbbad9… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 9 13:15:52 2017 +0100 ntdll: Add free list buckets for every arena size up to 0x100. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/heap.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index f928ebf..ca08f9d 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -105,6 +105,7 @@ C_ASSERT( sizeof(ARENA_LARGE) % LARGE_ALIGNMENT == 0 ); /* minimum data size (without arenas) of an allocated block */ /* make sure that it's larger than a free list entry */ #define HEAP_MIN_DATA_SIZE ROUND_SIZE(2 * sizeof(struct list)) +#define HEAP_MIN_ARENA_SIZE (HEAP_MIN_DATA_SIZE + sizeof(ARENA_INUSE)) /* minimum size that must remain to shrink an allocated block */ #define HEAP_MIN_SHRINK_SIZE (HEAP_MIN_DATA_SIZE+sizeof(ARENA_FREE)) /* minimum size to start allocating large blocks */ @@ -113,12 +114,17 @@ C_ASSERT( sizeof(ARENA_LARGE) % LARGE_ALIGNMENT == 0 ); #define HEAP_TAIL_EXTRA_SIZE(flags) \ ((flags & HEAP_TAIL_CHECKING_ENABLED) || RUNNING_ON_VALGRIND ? ALIGNMENT : 0) -/* Max size of the blocks on the free lists */ +/* There will be a free list bucket for every arena size up to and including this value */ +#define HEAP_MAX_SMALL_FREE_LIST 0x100 +C_ASSERT( HEAP_MAX_SMALL_FREE_LIST % ALIGNMENT == 0 ); +#define HEAP_NB_SMALL_FREE_LISTS (((HEAP_MAX_SMALL_FREE_LIST - HEAP_MIN_ARENA_SIZE) / ALIGNMENT) + 1) + +/* Max size of the blocks on the free lists above HEAP_MAX_SMALL_FREE_LIST */ static const SIZE_T HEAP_freeListSizes[] = { - 0x10, 0x20, 0x30, 0x40, 0x60, 0x80, 0x100, 0x200, 0x400, 0x1000, ~0UL + 0x200, 0x400, 0x1000, ~0UL }; -#define HEAP_NB_FREE_LISTS (sizeof(HEAP_freeListSizes)/sizeof(HEAP_freeListSizes[0])) +#define HEAP_NB_FREE_LISTS (sizeof(HEAP_freeListSizes) / sizeof(HEAP_freeListSizes[0]) + HEAP_NB_SMALL_FREE_LISTS) typedef union { @@ -303,8 +309,11 @@ static inline unsigned int get_freelist_index( SIZE_T size ) { unsigned int i; - size -= sizeof(ARENA_FREE); - for (i = 0; i < HEAP_NB_FREE_LISTS - 1; i++) if (size <= HEAP_freeListSizes[i]) break; + if (size <= HEAP_MAX_SMALL_FREE_LIST) + return (size - HEAP_MIN_ARENA_SIZE) / ALIGNMENT; + + for (i = HEAP_NB_SMALL_FREE_LISTS; i < HEAP_NB_FREE_LISTS - 1; i++) + if (size <= HEAP_freeListSizes[i - HEAP_NB_SMALL_FREE_LISTS]) break; return i; } @@ -338,7 +347,8 @@ static void HEAP_Dump( HEAP *heap ) DPRINTF( "\nFree lists:\n Block Stat Size Id\n" ); for (i = 0; i < HEAP_NB_FREE_LISTS; i++) DPRINTF( "%p free %08lx prev=%p next=%p\n", - &heap->freeList[i].arena, HEAP_freeListSizes[i], + &heap->freeList[i].arena, i < HEAP_NB_SMALL_FREE_LISTS ? + HEAP_MIN_ARENA_SIZE + i * ALIGNMENT : HEAP_freeListSizes[i - HEAP_NB_SMALL_FREE_LISTS], LIST_ENTRY( heap->freeList[i].arena.entry.prev, ARENA_FREE, entry ), LIST_ENTRY( heap->freeList[i].arena.entry.next, ARENA_FREE, entry ));

1 0

Andrey Gusev : quartz: Remove redundant comparison.
by Alexandre Julliard 09 Oct '17

09 Oct '17

Module: wine Branch: master Commit: 8273fc88c9a31728d910b6e6b281a30b0fc7c1f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8273fc88c9a31728d910b6e6b… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Oct 9 14:45:13 2017 +0300 quartz: Remove redundant comparison. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/avisplit.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c index b6fd9f1..f3ecced 100644 --- a/dlls/quartz/avisplit.c +++ b/dlls/quartz/avisplit.c @@ -1115,8 +1115,7 @@ static HRESULT AVISplitter_InputPin_PreConnect(IPin * iface, IPin * pConnectPin, pos += sizeof(RIFFCHUNK) + list.cb; hr = IAsyncReader_SyncRead(This->pReader, pos, sizeof(list), (BYTE *)&list); } - while (hr == S_OK && (list.fcc != FOURCC_LIST || - (list.fcc == FOURCC_LIST && list.fccListType != listtypeAVIMOVIE))); + while (hr == S_OK && (list.fcc != FOURCC_LIST || list.fccListType != listtypeAVIMOVIE)); if (hr != S_OK) {

1 0

Andrey Gusev : winspool.drv: Avoid bitwise operation.
by Alexandre Julliard 09 Oct '17

09 Oct '17

Module: wine Branch: master Commit: b7987c6b32bcad1e8f282adee5e2cbd4b5ccacda URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7987c6b32bcad1e8f282adee… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Oct 9 16:03:05 2017 +0300 winspool.drv: Avoid bitwise operation. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winspool.drv/info.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index f09745d..9c24256 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -606,7 +606,7 @@ static BOOL add_printer_driver(const WCHAR *name, WCHAR *ppd) res = AddPrinterDriverExW( NULL, 3, (LPBYTE)&di3, APD_COPY_NEW_FILES | APD_COPY_FROM_DIRECTORY ); TRACE("got %d and %d for %s (%s)\n", res, GetLastError(), debugstr_w(name), debugstr_w(di3.pEnvironment)); - if (!res & (GetLastError() != ERROR_PRINTER_DRIVER_ALREADY_INSTALLED)) + if (!res && (GetLastError() != ERROR_PRINTER_DRIVER_ALREADY_INSTALLED)) { ERR("failed with %u for %s (%s) %s\n", GetLastError(), debugstr_w(name), debugstr_w(di3.pEnvironment), debugstr_w(di3.pDriverPath));

1 0

Andrey Gusev : hid/tests: Remove redundant comparison.
by Alexandre Julliard 09 Oct '17

09 Oct '17

Module: wine Branch: master Commit: d4ea289dc189520735f226cf8282dd1c1e0d3d0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4ea289dc189520735f226cf8… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Oct 9 15:10:22 2017 +0300 hid/tests: Remove redundant comparison. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/tests/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hid/tests/device.c b/dlls/hid/tests/device.c index ef2f729..ce9b3a5 100644 --- a/dlls/hid/tests/device.c +++ b/dlls/hid/tests/device.c @@ -167,7 +167,7 @@ static void process_data(HIDP_CAPS Caps, PHIDP_PREPARSED_DATA ppd, CHAR *data, D { ULONG usage_length = 100; status = HidP_GetUsages(HidP_Input, i, 0, button_pages, &usage_length, ppd, data, data_length); - ok (status == HIDP_STATUS_SUCCESS || (status != HIDP_STATUS_SUCCESS && usage_length == 0), + ok (status == HIDP_STATUS_SUCCESS || usage_length == 0, "HidP_GetUsages failed (%x) but usage length still %i\n", status, usage_length); if (usage_length) {

1 0

Hugh McMaster : regedit/tests: Add REG_BINARY to the empty hex data import tests.
by Alexandre Julliard 09 Oct '17

09 Oct '17

Module: wine Branch: master Commit: 1e6bf7d996c6013e0a0fa3baa104811605720527 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e6bf7d996c6013e0a0fa3baa… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Oct 9 11:46:58 2017 +0000 regedit/tests: Add REG_BINARY to the empty hex data 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 | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 79640a5..3e949a5 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -652,7 +652,8 @@ static void test_basic_import(void) "\"Wine22d\"=hex(4):\n" "\"Wine22e\"=hex(7):\n" "\"Wine22f\"=hex(100):\n" - "\"Wine22g\"=hex(abcd):\n\n"); + "\"Wine22g\"=hex(abcd):\n" + "\"Wine22h\"=hex:\n\n"); verify_reg(hkey, "Wine22a", REG_SZ, NULL, 0, 0); verify_reg(hkey, "Wine22b", REG_EXPAND_SZ, NULL, 0, TODO_REG_SIZE); verify_reg(hkey, "Wine22c", REG_BINARY, NULL, 0, 0); @@ -660,6 +661,7 @@ static void test_basic_import(void) verify_reg(hkey, "Wine22e", REG_MULTI_SZ, NULL, 0, TODO_REG_SIZE); verify_reg(hkey, "Wine22f", 0x100, NULL, 0, 0); verify_reg(hkey, "Wine22g", 0xabcd, NULL, 0, 0); + verify_reg(hkey, "Wine22h", REG_BINARY, NULL, 0, 0); RegCloseKey(hkey); @@ -1066,7 +1068,8 @@ static void test_basic_import_unicode(void) "\"Wine22d\"=hex(4):\n" "\"Wine22e\"=hex(7):\n" "\"Wine22f\"=hex(100):\n" - "\"Wine22g\"=hex(abcd):\n\n"); + "\"Wine22g\"=hex(abcd):\n" + "\"Wine22h\"=hex:\n\n"); verify_reg(hkey, "Wine22a", REG_SZ, NULL, 0, 0); verify_reg(hkey, "Wine22b", REG_EXPAND_SZ, NULL, 0, TODO_REG_SIZE); verify_reg(hkey, "Wine22c", REG_BINARY, NULL, 0, 0); @@ -1074,6 +1077,7 @@ static void test_basic_import_unicode(void) verify_reg(hkey, "Wine22e", REG_MULTI_SZ, NULL, 0, TODO_REG_SIZE); verify_reg(hkey, "Wine22f", 0x100, NULL, 0, 0); verify_reg(hkey, "Wine22g", 0xabcd, NULL, 0, 0); + verify_reg(hkey, "Wine22h", REG_BINARY, NULL, 0, 0); RegCloseKey(hkey);

1 0

Hugh McMaster : reg/tests: Add REG_BINARY to the empty hex data import tests.
by Alexandre Julliard 09 Oct '17

09 Oct '17

Module: wine Branch: master Commit: 6607065356381941e4ffbb7d07b5a8b78b7e93a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6607065356381941e4ffbb7d0… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Oct 9 11:46:58 2017 +0000 reg/tests: Add REG_BINARY to the empty hex data 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 | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index e93062b..3a3ff8d 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -2354,7 +2354,8 @@ static void test_import(void) "\"Wine68d\"=hex(4):\n" "\"Wine68e\"=hex(7):\n" "\"Wine68f\"=hex(100):\n" - "\"Wine68g\"=hex(abcd):\n\n", &r); + "\"Wine68g\"=hex(abcd):\n" + "\"Wine68h\"=hex:\n\n", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); verify_reg(hkey, "Wine68a", REG_SZ, NULL, 0, 0); verify_reg(hkey, "Wine68b", REG_EXPAND_SZ, NULL, 0, TODO_REG_SIZE); @@ -2363,6 +2364,7 @@ static void test_import(void) verify_reg(hkey, "Wine68e", REG_MULTI_SZ, NULL, 0, TODO_REG_SIZE); verify_reg(hkey, "Wine68f", 0x100, NULL, 0, 0); verify_reg(hkey, "Wine68g", 0xabcd, NULL, 0, 0); + verify_reg(hkey, "Wine68h", REG_BINARY, NULL, 0, 0); err = RegCloseKey(hkey); ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); @@ -3852,7 +3854,8 @@ static void test_unicode_import(void) "\"Wine68d\"=hex(4):\n" "\"Wine68e\"=hex(7):\n" "\"Wine68f\"=hex(100):\n" - "\"Wine68g\"=hex(abcd):\n\n", &r); + "\"Wine68g\"=hex(abcd):\n" + "\"Wine68h\"=hex:\n\n", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); verify_reg(hkey, "Wine68a", REG_SZ, NULL, 0, 0); verify_reg(hkey, "Wine68b", REG_EXPAND_SZ, NULL, 0, TODO_REG_SIZE); @@ -3861,6 +3864,7 @@ static void test_unicode_import(void) verify_reg(hkey, "Wine68e", REG_MULTI_SZ, NULL, 0, TODO_REG_SIZE); verify_reg(hkey, "Wine68f", 0x100, NULL, 0, 0); verify_reg(hkey, "Wine68g", 0xabcd, NULL, 0, 0); + verify_reg(hkey, "Wine68h", REG_BINARY, NULL, 0, 0); err = RegCloseKey(hkey); ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err);

1 0

Dmitry Kislyuk : vbscript: Improve parsing of separators in loops and switches.
by Alexandre Julliard 09 Oct '17

09 Oct '17

Module: wine Branch: master Commit: 56b31ba2e11ccc46584b0a1d96c27dd310d18eeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=56b31ba2e11ccc46584b0a1d9… Author: Dmitry Kislyuk <dimaki(a)rocketmail.com> Date: Fri Oct 6 16:27:44 2017 -0500 vbscript: Improve parsing of separators in loops and switches. Signed-off-by: Dmitry Kislyuk <dimaki(a)rocketmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/parser.y | 6 ++++-- dlls/vbscript/tests/lang.vbs | 50 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 6b303ee..beb4e4c 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -164,7 +164,7 @@ StatementsNl | StatementNl StatementsNl { $$ = link_statements($1, $2); } StatementNl - : Statement tNL { $$ = $1; } + : Statement tNL { $$ = $1; } Statement : ':' { $$ = NULL; } @@ -448,10 +448,12 @@ Identifier : tIdentifier { $$ = $1; } | tPROPERTY { $$ = propertyW; } -/* Some statements accept both new line and ':' as a separator */ +/* Most statements accept both new line and ':' as separators */ StSep : tNL | ':' + | tNL StSep + | ':' StSep %% diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 23402cd..7f7c835 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -330,6 +330,13 @@ WHILE x < 3 : x = x + 1 Wend Call ok(x = 3, "x not equal to 3") +z = 2 +while z > -4 : + + +z = z -2 +wend + x = false y = false do while not (x and y) @@ -353,6 +360,12 @@ Do While x < 2 : x = x + 1 Loop Call ok(x = 2, "x not equal to 2") +x = 0 +Do While x >= -2 : +x = x - 1 +Loop +Call ok(x = -3, "x not equal to -3") + x = false y = false do until x and y @@ -376,6 +389,14 @@ Do: :: x = x + 2 Loop Until x = 4 Call ok(x = 4, "x not equal to 4") +x = 5 +Do: : + +: x = x * 2 +Loop Until x = 40 +Call ok(x = 40, "x not equal to 40") + + x = false do if x then exit do @@ -495,6 +516,12 @@ for x = 1 to 100 Call ok(false, "exit for not escaped the loop?") next +for x = 1 to 5 : +: +: :exit for + Call ok(false, "exit for not escaped the loop?") +next + do while true for x = 1 to 100 exit do @@ -509,6 +536,14 @@ wend Call collectionObj.reset() y = 0 +for each x in collectionObj : + + :y = y + 3 +next +Call ok(y = 9, "y = " & y) + +Call collectionObj.reset() +y = 0 x = 10 z = 0 for each x in collectionObj : z = z + 2 @@ -611,6 +646,21 @@ select case 2: case 5,6,7: Call ok(false, "unexpected case") end select Call ok(x, "wrong case") +x = False +select case 1 : + + :case 3, 4 : + + + case 5 +: + Call ok(false, "unexpected case") : + Case Else: + + x = True +end select +Call ok(x, "wrong case") + if false then Sub testsub x = true

1 0

← Newer
1
...
33
34
35
36
37
38
39
...
48
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 October 2017