October 2017 - Wine-Commits

Huw Davies : ole32: In the non-aggregated case a request for IUnknown actually returns IOleCache2.
by Alexandre Julliard Oct. 5, 2017

Oct. 5, 2017

Module: wine Branch: master Commit: 87ccecbfa24e88d80c292d165b3223683b409bfa URL: http://source.winehq.org/git/wine.git/?a=commit;h=87ccecbfa24e88d80c292d165… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Oct 5 13:11:06 2017 +0100 ole32: In the non-aggregated case a request for IUnknown actually returns IOleCache2. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/datacache.c | 5 ++++- dlls/ole32/tests/ole2.c | 8 +++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index a95d0fb..808c2dc 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -1123,7 +1123,10 @@ static HRESULT WINAPI DataCache_NDIUnknown_QueryInterface( if (IsEqualIID(&IID_IUnknown, riid)) { - *ppvObject = iface; + if (this->outer_unk == iface) /* non-aggregated, return IUnknown from IOleCache2 */ + *ppvObject = &this->IOleCache2_iface; + else + *ppvObject = iface; } else if (IsEqualIID(&IID_IDataObject, riid)) { diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index b30f63b..1e5ca65 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -1560,7 +1560,7 @@ static void test_data_cache(void) IOleCache2 *pOleCache; IOleCache *olecache; IStorage *pStorage; - IUnknown *unk; + IUnknown *unk, *unk2; IPersistStorage *pPS; IViewObject *pViewObject; IOleCacheControl *pOleCacheControl; @@ -1651,10 +1651,12 @@ static void test_data_cache(void) ok(hr == S_OK, "got 0x%08x\n", hr); hr = IUnknown_QueryInterface(unk, &IID_IOleCache2, (void**)&pOleCache); ok(hr == S_OK, "got 0x%08x\n", hr); -todo_wine { + hr = IUnknown_QueryInterface(unk, &IID_IUnknown, (void**)&unk2); + ok(hr == S_OK, "got 0x%08x\n", hr); ok(unk == (IUnknown*)olecache, "got %p, expected %p\n", olecache, unk); ok(unk == (IUnknown*)pOleCache, "got %p, expected %p\n", pOleCache, unk); -} + ok(unk == unk2, "got %p, expected %p\n", unk2, unk); + IUnknown_Release(unk2); IOleCache2_Release(pOleCache); IOleCache_Release(olecache); IUnknown_Release(unk);

1 0

Nikolay Sivov : dwrite/tests: Some more tests for in-memory loader.
by Alexandre Julliard Oct. 5, 2017

Oct. 5, 2017

Module: wine Branch: master Commit: 4236c47023d335e6cf001eeb4789f84347ee6186 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4236c47023d335e6cf001eeb4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 5 13:00:00 2017 +0300 dwrite/tests: Some more tests for in-memory loader. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 99 ++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 84 insertions(+), 15 deletions(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 62d5884..a57806a 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -7591,12 +7591,60 @@ static void test_object_lifetime(void) ok(ref == 0, "factory not released, %u\n", ref); } +struct testowner_object +{ + IUnknown IUnknown_iface; + LONG ref; +}; + +static inline struct testowner_object *impl_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, struct testowner_object, IUnknown_iface); +} + +static HRESULT WINAPI testowner_QueryInterface(IUnknown *iface, REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IUnknown)) { + *obj = iface; + IUnknown_AddRef(iface); + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI testowner_AddRef(IUnknown *iface) +{ + struct testowner_object *object = impl_from_IUnknown(iface); + return InterlockedIncrement(&object->ref); +} + +static ULONG WINAPI testowner_Release(IUnknown *iface) +{ + struct testowner_object *object = impl_from_IUnknown(iface); + return InterlockedDecrement(&object->ref); +} + +static const IUnknownVtbl testownervtbl = { + testowner_QueryInterface, + testowner_AddRef, + testowner_Release, +}; + +static void testowner_init(struct testowner_object *object) +{ + object->IUnknown_iface.lpVtbl = &testownervtbl; + object->ref = 1; +} + static void test_inmemory_file_loader(void) { + IDWriteFontFileStream *stream, *stream2, *stream3; IDWriteFontFileLoader *loader, *loader2; IDWriteInMemoryFontFileLoader *inmemory; + struct testowner_object ownerobject; IDWriteFontFile *file, *file2; - IDWriteFontFileStream *stream; IDWriteFontFace *fontface; IDWriteFactory5 *factory5; IDWriteFactory *factory; @@ -7616,15 +7664,18 @@ static void test_inmemory_file_loader(void) return; } + EXPECT_REF(factory5, 1); hr = IDWriteFactory5_CreateInMemoryFontFileLoader(factory5, &loader); todo_wine ok(hr == S_OK, "got %#x\n", hr); + EXPECT_REF(factory5, 1); if (FAILED(hr)) { IDWriteFactory5_Release(factory5); return; } + testowner_init(&ownerobject); fontface = create_fontface((IDWriteFactory *)factory5); hr = IDWriteFactory5_CreateInMemoryFontFileLoader(factory5, &loader2); @@ -7635,6 +7686,7 @@ todo_wine hr = IDWriteFontFileLoader_QueryInterface(loader, &IID_IDWriteInMemoryFontFileLoader, (void **)&inmemory); ok(hr == S_OK, "got %#x\n", hr); IDWriteFontFileLoader_Release(loader); + EXPECT_REF(inmemory, 1); /* Use whole font blob to construct in-memory file. */ count = 1; @@ -7658,21 +7710,28 @@ todo_wine hr = IDWriteFontFileStream_ReadFileFragment(stream, &data, 0, file_size, &context); ok(hr == S_OK, "got %#x\n", hr); + /* Not registered yet. */ hr = IDWriteInMemoryFontFileLoader_CreateInMemoryFontFileReference(inmemory, (IDWriteFactory *)factory5, data, file_size, NULL, &file); ok(hr == E_INVALIDARG, "got %#x\n", hr); hr = IDWriteFactory5_RegisterFontFileLoader(factory5, (IDWriteFontFileLoader *)inmemory); ok(hr == S_OK, "got %#x\n", hr); + EXPECT_REF(inmemory, 2); + EXPECT_REF(&ownerobject.IUnknown_iface, 1); hr = IDWriteInMemoryFontFileLoader_CreateInMemoryFontFileReference(inmemory, (IDWriteFactory *)factory5, data, - file_size, NULL, &file); + file_size, &ownerobject.IUnknown_iface, &file); ok(hr == S_OK, "got %#x\n", hr); + EXPECT_REF(&ownerobject.IUnknown_iface, 2); + EXPECT_REF(inmemory, 3); hr = IDWriteInMemoryFontFileLoader_CreateInMemoryFontFileReference(inmemory, (IDWriteFactory *)factory5, data, - file_size, NULL, &file2); + file_size, &ownerobject.IUnknown_iface, &file2); ok(hr == S_OK, "got %#x\n", hr); ok(file2 != file, "got unexpected file\n"); + EXPECT_REF(&ownerobject.IUnknown_iface, 3); + EXPECT_REF(inmemory, 4); /* Check in-memory reference key format. */ hr = IDWriteFontFile_GetReferenceKey(file, &key, &key_size); @@ -7687,32 +7746,42 @@ todo_wine ok(key && *(DWORD*)key == 2, "got wrong ref key\n"); ok(key_size == 4, "ref key size %u\n", key_size); - /* Release file and index 1, create new one to see if index is reused. */ - IDWriteFontFile_Release(file); + EXPECT_REF(inmemory, 4); + hr = IDWriteInMemoryFontFileLoader_CreateStreamFromKey(inmemory, key, key_size, &stream2); + ok(hr == S_OK, "Failed to create a stream, hr %#x.\n", hr); + EXPECT_REF(stream2, 1); + EXPECT_REF(inmemory, 4); - hr = IDWriteInMemoryFontFileLoader_CreateInMemoryFontFileReference(inmemory, (IDWriteFactory *)factory5, data, - file_size, NULL, &file); - ok(hr == S_OK, "got %#x\n", hr); - ok(file2 != file, "got unexpected file\n"); + hr = IDWriteInMemoryFontFileLoader_CreateStreamFromKey(inmemory, key, key_size, &stream3); + ok(hr == S_OK, "Failed to create a stream, hr %#x.\n", hr); - hr = IDWriteFontFile_GetReferenceKey(file, &key, &key_size); - ok(hr == S_OK, "got %#x\n", hr); + ok(stream2 != stream3, "Unexpected stream.\n"); - ok(key && *(DWORD*)key == 3, "got wrong ref key\n"); - ok(key_size == 4, "ref key size %u\n", key_size); + IDWriteFontFileStream_Release(stream2); + IDWriteFontFileStream_Release(stream3); + /* Release file at index 1, create new one to see if index is reused. */ + EXPECT_REF(&ownerobject.IUnknown_iface, 3); IDWriteFontFile_Release(file); + EXPECT_REF(&ownerobject.IUnknown_iface, 3); + + EXPECT_REF(&ownerobject.IUnknown_iface, 3); IDWriteFontFile_Release(file2); + EXPECT_REF(&ownerobject.IUnknown_iface, 3); hr = IDWriteFactory5_UnregisterFontFileLoader(factory5, (IDWriteFontFileLoader *)inmemory); ok(hr == S_OK, "got %#x\n", hr); + EXPECT_REF(&ownerobject.IUnknown_iface, 3); IDWriteFontFileStream_ReleaseFileFragment(stream, context); IDWriteFontFileStream_Release(stream); + IDWriteFontFace_Release(fontface); - IDWriteInMemoryFontFileLoader_Release(inmemory); + EXPECT_REF(&ownerobject.IUnknown_iface, 3); + ref = IDWriteInMemoryFontFileLoader_Release(inmemory); + ok(ref == 0, "loader not released, %u.\n", ref); + EXPECT_REF(&ownerobject.IUnknown_iface, 1); - IDWriteFontFace_Release(fontface); ref = IDWriteFactory5_Release(factory5); ok(ref == 0, "factory not released, %u\n", ref); }

1 0

Jacek Caban : ntdll: Always use server ioctl for FSCTL_PIPE_PEEK.
by Alexandre Julliard Oct. 5, 2017

Oct. 5, 2017

Module: wine Branch: master Commit: 1e87417e7f4bd2d995e67113b5562c67329b5656 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e87417e7f4bd2d995e67113b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 5 14:30:36 2017 +0200 ntdll: Always use server ioctl for FSCTL_PIPE_PEEK. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 63 ------------------------------------------------- dlls/ntdll/tests/file.c | 8 +++++++ 2 files changed, 8 insertions(+), 63 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 217b678..35fd2c1 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1699,69 +1699,6 @@ NTSTATUS WINAPI NtFsControlFile(HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc if (!status) status = DIR_unmount_device( handle ); return status; - case FSCTL_PIPE_PEEK: - { - FILE_PIPE_PEEK_BUFFER *buffer = out_buffer; - int avail = 0, fd, needs_close; - - if (out_size < FIELD_OFFSET( FILE_PIPE_PEEK_BUFFER, Data )) - { - status = STATUS_INFO_LENGTH_MISMATCH; - break; - } - - if ((status = server_get_unix_fd( handle, FILE_READ_DATA, &fd, &needs_close, NULL, NULL ))) - { - if (status == STATUS_BAD_DEVICE_TYPE) - return server_ioctl_file( handle, event, apc, apc_context, io, code, - in_buffer, in_size, out_buffer, out_size ); - break; - } - -#ifdef FIONREAD - if (ioctl( fd, FIONREAD, &avail ) != 0) - { - TRACE("FIONREAD failed reason: %s\n",strerror(errno)); - if (needs_close) close( fd ); - status = FILE_GetNtStatus(); - break; - } -#endif - if (!avail) /* check for closed pipe */ - { - struct pollfd pollfd; - int ret; - - pollfd.fd = fd; - pollfd.events = POLLIN; - pollfd.revents = 0; - ret = poll( &pollfd, 1, 0 ); - if (ret == -1 || (ret == 1 && (pollfd.revents & (POLLHUP|POLLERR)))) - { - if (needs_close) close( fd ); - status = STATUS_PIPE_BROKEN; - break; - } - } - buffer->NamedPipeState = 0; /* FIXME */ - buffer->ReadDataAvailable = avail; - buffer->NumberOfMessages = 0; /* FIXME */ - buffer->MessageLength = 0; /* FIXME */ - io->Information = FIELD_OFFSET( FILE_PIPE_PEEK_BUFFER, Data ); - status = STATUS_SUCCESS; - if (avail) - { - ULONG data_size = out_size - FIELD_OFFSET( FILE_PIPE_PEEK_BUFFER, Data ); - if (data_size) - { - int res = recv( fd, buffer->Data, data_size, MSG_PEEK ); - if (res >= 0) io->Information += res; - } - } - if (needs_close) close( fd ); - } - break; - case FSCTL_PIPE_DISCONNECT: status = server_ioctl_file( handle, event, apc, apc_context, io, code, in_buffer, in_size, out_buffer, out_size ); diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index ff27d98..f88d16b 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -4179,6 +4179,7 @@ static void test_read_write(void) static void test_ioctl(void) { HANDLE event = CreateEventA(NULL, TRUE, FALSE, NULL); + FILE_PIPE_PEEK_BUFFER peek_buf; IO_STATUS_BLOCK iosb; HANDLE file; NTSTATUS status; @@ -4195,6 +4196,13 @@ static void test_ioctl(void) status = pNtFsControlFile(file, (HANDLE)0xdeadbeef, NULL, NULL, &iosb, 0xdeadbeef, 0, 0, 0, 0); ok(status == STATUS_INVALID_HANDLE, "NtFsControlFile returned %x\n", status); + memset(&iosb, 0x55, sizeof(iosb)); + status = NtFsControlFile(file, NULL, NULL, NULL, &iosb, FSCTL_PIPE_PEEK, NULL, 0, + &peek_buf, sizeof(peek_buf)); + todo_wine + ok(status == STATUS_INVALID_DEVICE_REQUEST, "NtFsControlFile failed: %x\n", status); + ok(iosb.Status == 0x55555555, "iosb.Status = %x\n", iosb.Status); + CloseHandle(event); CloseHandle(file); }

1 0

Jacek Caban : server: Get rid of no longer needed use_server_io.
by Alexandre Julliard Oct. 5, 2017

Oct. 5, 2017

Module: wine Branch: master Commit: d520f30b4deacf62ad5aac8563f550311c520f90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d520f30b4deacf62ad5aac856… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 5 14:30:12 2017 +0200 server: Get rid of no longer needed use_server_io. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/named_pipe.c | 52 +++++++++++++--------------------------------------- 1 file changed, 13 insertions(+), 39 deletions(-) diff --git a/server/named_pipe.c b/server/named_pipe.c index a6a0318..b5738ad 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -280,13 +280,6 @@ static const struct fd_ops named_pipe_device_fd_ops = default_fd_reselect_async /* reselect_async */ }; -/* Returns if we handle I/O via server calls. - * FIXME: no longer needed. */ -static int use_server_io( struct pipe_end *pipe_end ) -{ - return 1; -} - static void named_pipe_dump( struct object *obj, int verbose ) { fputs( "Named pipe\n", stderr ); @@ -394,25 +387,23 @@ static void free_message( struct pipe_message *message ) static void pipe_end_disconnect( struct pipe_end *pipe_end, unsigned int status ) { struct pipe_end *connection = pipe_end->connection; + struct pipe_message *message, *next; + struct async *async; pipe_end->connection = NULL; - if (use_server_io( pipe_end )) + if (pipe_end->fd) fd_async_wake_up( pipe_end->fd, ASYNC_TYPE_WAIT, status ); + async_wake_up( &pipe_end->read_q, status ); + LIST_FOR_EACH_ENTRY_SAFE( message, next, &pipe_end->message_queue, struct pipe_message, entry ) { - struct pipe_message *message, *next; - struct async *async; - if (pipe_end->fd) fd_async_wake_up( pipe_end->fd, ASYNC_TYPE_WAIT, status ); - async_wake_up( &pipe_end->read_q, status ); - LIST_FOR_EACH_ENTRY_SAFE( message, next, &pipe_end->message_queue, struct pipe_message, entry ) - { - async = message->async; - if (async || status == STATUS_PIPE_DISCONNECTED) free_message( message ); - if (!async) continue; - async_terminate( async, status ); - release_object( async ); - } - if (status == STATUS_PIPE_DISCONNECTED) set_fd_signaled( pipe_end->fd, 0 ); + async = message->async; + if (async || status == STATUS_PIPE_DISCONNECTED) free_message( message ); + if (!async) continue; + async_terminate( async, status ); + release_object( async ); } + if (status == STATUS_PIPE_DISCONNECTED) set_fd_signaled( pipe_end->fd, 0 ); + if (connection) { connection->connection = NULL; @@ -427,11 +418,6 @@ static void do_disconnect( struct pipe_server *server ) { assert( server->client->server == server ); assert( server->client->pipe_end.fd ); - if (!use_server_io( &server->pipe_end )) - { - release_object( server->client->pipe_end.fd ); - server->client->pipe_end.fd = NULL; - } } assert( server->pipe_end.fd ); release_object( server->pipe_end.fd ); @@ -744,8 +730,6 @@ static int pipe_end_read( struct fd *fd, struct async *async, file_pos_t pos ) { struct pipe_end *pipe_end = get_fd_user( fd ); - if (!use_server_io( pipe_end )) return no_fd_read( fd, async, pos ); - if (!pipe_end->connection && list_empty( &pipe_end->message_queue )) { set_error( STATUS_PIPE_BROKEN ); @@ -764,8 +748,6 @@ static int pipe_end_write( struct fd *fd, struct async *async, file_pos_t pos ) struct pipe_end *read_end = write_end->connection; struct pipe_message *message; - if (!use_server_io( write_end )) return no_fd_write( fd, async, pos ); - if (!read_end) { set_error( STATUS_PIPE_DISCONNECTED ); @@ -792,9 +774,7 @@ static void pipe_end_reselect_async( struct fd *fd, struct async_queue *queue ) if (ignore_reselect) return; - if (!use_server_io( pipe_end )) - default_fd_reselect_async( fd, queue ); - else if (&pipe_end->write_q == queue) + if (&pipe_end->write_q == queue) reselect_write_queue( pipe_end ); else if (&pipe_end->read_q == queue) reselect_read_queue( pipe_end ); @@ -813,12 +793,6 @@ static int pipe_end_peek( struct pipe_end *pipe_end ) data_size_t avail = 0; data_size_t message_length = 0; - if (!use_server_io( pipe_end )) - { - set_error( STATUS_NOT_SUPPORTED ); - return 0; - } - if (reply_size < offsetof( FILE_PIPE_PEEK_BUFFER, Data )) { set_error( STATUS_INFO_LENGTH_MISMATCH );

1 0

Jacek Caban : server: Get rid of no longer used support for queuing client side asyncs on named pipes.
by Alexandre Julliard Oct. 5, 2017

Oct. 5, 2017

Module: wine Branch: master Commit: 2659a796f77d17d8026bb60890c1b48c0120c16a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2659a796f77d17d8026bb6089… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 5 14:29:54 2017 +0200 server: Get rid of no longer used support for queuing client side asyncs on named pipes. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/named_pipe.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/server/named_pipe.c b/server/named_pipe.c index 6f5b3b0..a6a0318 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -146,7 +146,6 @@ 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 ); static void pipe_end_get_volume_info( struct fd *fd, unsigned int info_class ); -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 ); /* server end functions */ @@ -187,7 +186,7 @@ static const struct fd_ops pipe_server_fd_ops = pipe_end_flush, /* flush */ pipe_end_get_volume_info, /* get_volume_info */ pipe_server_ioctl, /* ioctl */ - pipe_end_queue_async, /* queue_async */ + no_fd_queue_async, /* queue_async */ pipe_end_reselect_async /* reselect_async */ }; @@ -230,7 +229,7 @@ static const struct fd_ops pipe_client_fd_ops = pipe_end_flush, /* flush */ pipe_end_get_volume_info, /* get_volume_info */ pipe_client_ioctl, /* ioctl */ - pipe_end_queue_async, /* queue_async */ + no_fd_queue_async, /* queue_async */ pipe_end_reselect_async /* reselect_async */ }; @@ -787,13 +786,6 @@ static int pipe_end_write( struct fd *fd, struct async *async, file_pos_t pos ) return 1; } -static void pipe_end_queue_async( struct fd *fd, struct async *async, int type, int count ) -{ - struct pipe_end *pipe_end = get_fd_user( fd ); - if (use_server_io( pipe_end )) no_fd_queue_async( fd, async, type, count ); - else default_fd_queue_async( fd, async, type, count ); -} - static void pipe_end_reselect_async( struct fd *fd, struct async_queue *queue ) { struct pipe_end *pipe_end = get_fd_user( fd );

1 0

Jacek Caban : kernel32/tests: Get rid of no longer needed hacks.
by Alexandre Julliard Oct. 5, 2017

Oct. 5, 2017

Module: wine Branch: master Commit: b9248446ffe3da1720e9b88565e5a04c3c090e6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9248446ffe3da1720e9b8856… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 5 14:30:56 2017 +0200 kernel32/tests: Get rid of no longer needed hacks. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/pipe.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 87e64ef..13afa10 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -356,9 +356,7 @@ static void test_CreateNamedPipe(int pipemode) ok(avail == sizeof(obuf) + sizeof(obuf2), "peek3 got %d bytes available\n", avail); ok(PeekNamedPipe(hFile, ibuf, sizeof(ibuf), &readden, &avail, &left), "Peek3\n"); if (pipemode == PIPE_TYPE_BYTE) { - /* currently the Wine behavior depends on the kernel version */ - /* ok(readden == sizeof(obuf) + sizeof(obuf2), "peek3 got %d bytes\n", readden); */ - if (readden != sizeof(obuf) + sizeof(obuf2)) todo_wine ok(0, "peek3 got %d bytes\n", readden); + ok(readden == sizeof(obuf) + sizeof(obuf2), "peek3 got %d bytes\n", readden); ok(left == (DWORD) -(sizeof(obuf) + sizeof(obuf2)), "peek3 got %d bytes left\n", left); } else @@ -395,9 +393,7 @@ static void test_CreateNamedPipe(int pipemode) ok(avail == sizeof(obuf) + sizeof(obuf2), "peek3 got %d bytes available\n", avail); ok(PeekNamedPipe(hnp, ibuf, sizeof(ibuf), &readden, &avail, &left), "Peek4\n"); if (pipemode == PIPE_TYPE_BYTE) { - /* currently the Wine behavior depends on the kernel version */ - /* ok(readden == sizeof(obuf) + sizeof(obuf2), "peek4 got %d bytes\n", readden); */ - if (readden != sizeof(obuf) + sizeof(obuf2)) todo_wine ok(0, "peek4 got %d bytes\n", readden); + ok(readden == sizeof(obuf) + sizeof(obuf2), "peek4 got %d bytes\n", readden); ok(left == (DWORD) -(sizeof(obuf) + sizeof(obuf2)), "peek4 got %d bytes left\n", left); } else

1 0

Hans Leidekker : secur32/tests: Don't free static buffers (Valgrind).
by Alexandre Julliard Oct. 5, 2017

Oct. 5, 2017

Module: wine Branch: master Commit: 132d111815f88b73db3beee954c335e5afb9e5c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=132d111815f88b73db3beee95… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 5 15:02:15 2017 +0200 secur32/tests: Don't free static buffers (Valgrind). Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/tests/ntlm.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/secur32/tests/ntlm.c b/dlls/secur32/tests/ntlm.c index 254b668..355af5a 100644 --- a/dlls/secur32/tests/ntlm.c +++ b/dlls/secur32/tests/ntlm.c @@ -1181,10 +1181,6 @@ end: pDeleteSecurityContext(&client.ctxt); pFreeCredentialsHandle(&client.cred); - HeapFree(GetProcessHeap(), 0, fake_data[0].pvBuffer); - HeapFree(GetProcessHeap(), 0, fake_data[1].pvBuffer); - HeapFree(GetProcessHeap(), 0, data[0].pvBuffer); - HeapFree(GetProcessHeap(), 0, data[1].pvBuffer); HeapFree(GetProcessHeap(), 0, complex_data[1].pvBuffer); HeapFree(GetProcessHeap(), 0, complex_data[3].pvBuffer); }

1 0

Hugh McMaster : reg/tests: Test the importing of hex values with no data.
by Alexandre Julliard Oct. 5, 2017

Oct. 5, 2017

Module: wine Branch: master Commit: 4a6fb941e5934e7f696b27962de7f446ac1df635 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a6fb941e5934e7f696b27962… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Oct 5 11:53:23 2017 +0000 reg/tests: Test the importing of hex values with no data. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 43 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 41 insertions(+), 2 deletions(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 7a70ebf..e93062b 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -78,8 +78,11 @@ static void verify_reg_(unsigned line, HKEY hkey, const char* value, lok(type == exp_type, "got wrong type %d, expected %d\n", type, exp_type); todo_wine_if (todo & TODO_REG_SIZE) lok(size == exp_size, "got wrong size %d, expected %d\n", size, exp_size); - todo_wine_if (todo & TODO_REG_DATA) - lok(memcmp(data, exp_data, size) == 0, "got wrong data\n"); + if (exp_data) + { + todo_wine_if (todo & TODO_REG_DATA) + lok(memcmp(data, exp_data, size) == 0, "got wrong data\n"); + } } #define verify_reg_nonexist(k,v) verify_reg_nonexist_(__LINE__,k,v) @@ -2343,6 +2346,24 @@ static void test_import(void) verify_reg(hkey, "Wine67c", REG_EXPAND_SZ, "%PATH%", 7, 0); verify_reg(hkey, "Wine67d", REG_EXPAND_SZ, "%PATH%", 7, 0); + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine68a\"=hex(1):\n" + "\"Wine68b\"=hex(2):\n" + "\"Wine68c\"=hex(3):\n" + "\"Wine68d\"=hex(4):\n" + "\"Wine68e\"=hex(7):\n" + "\"Wine68f\"=hex(100):\n" + "\"Wine68g\"=hex(abcd):\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); + verify_reg(hkey, "Wine68c", REG_BINARY, NULL, 0, 0); + verify_reg(hkey, "Wine68d", REG_DWORD, NULL, 0, 0); + 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); + err = RegCloseKey(hkey); ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); @@ -3823,6 +3844,24 @@ static void test_unicode_import(void) verify_reg(hkey, "Wine67c", REG_EXPAND_SZ, "%PATH%", 7, 0); verify_reg(hkey, "Wine67d", REG_EXPAND_SZ, "%PATH%", 7, 0); + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine68a\"=hex(1):\n" + "\"Wine68b\"=hex(2):\n" + "\"Wine68c\"=hex(3):\n" + "\"Wine68d\"=hex(4):\n" + "\"Wine68e\"=hex(7):\n" + "\"Wine68f\"=hex(100):\n" + "\"Wine68g\"=hex(abcd):\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); + verify_reg(hkey, "Wine68c", REG_BINARY, NULL, 0, 0); + verify_reg(hkey, "Wine68d", REG_DWORD, NULL, 0, 0); + 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); + err = RegCloseKey(hkey); ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err);

1 0

Alistair Leslie-Hughes : include: Add appmodel.h.
by Alexandre Julliard Oct. 5, 2017

Oct. 5, 2017

Module: wine Branch: master Commit: 85b3df00abc8f6d534ece0d072f187fa49e4c7b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85b3df00abc8f6d534ece0d07… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Oct 5 01:20:41 2017 +0000 include: Add appmodel.h. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/appmodel.h | 44 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 2e17067..025fe77 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -225,6 +225,7 @@ HEADER_SRCS = \ amaudio.h \ appcompatapi.h \ appmgmt.h \ + appmodel.h \ atlbase.h \ atlcom.h \ atlwin.h \ diff --git a/include/appmodel.h b/include/appmodel.h new file mode 100644 index 0000000..bc61a89 --- /dev/null +++ b/include/appmodel.h @@ -0,0 +1,44 @@ +/* + * Copyright (C) 2017 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#ifndef _APPMODEL_H_ +#define _APPMODEL_H_ + +#if defined(__cplusplus) +extern "C" { +#endif + +typedef enum AppPolicyProcessTerminationMethod +{ + AppPolicyProcessTerminationMethod_ExitProcess = 0, + AppPolicyProcessTerminationMethod_TerminateProcess = 1, +} AppPolicyProcessTerminationMethod; + +typedef enum AppPolicyThreadInitializationType +{ + AppPolicyThreadInitializationType_None = 0, + AppPolicyThreadInitializationType_InitializeWinRT = 1, +} AppPolicyThreadInitializationType; + +LONG WINAPI AppPolicyGetProcessTerminationMethod(HANDLE token, AppPolicyProcessTerminationMethod *policy); +LONG WINAPI AppPolicyGetThreadInitializationType(HANDLE token, AppPolicyThreadInitializationType *policy); + +#if defined(__cplusplus) +} +#endif + +#endif /* _APPMODEL_H_ */

1 0

Hans Leidekker : wbemprox: Avoid an invalid write when there are no forwards in the route table ( Valgrind).
by Alexandre Julliard Oct. 5, 2017

Oct. 5, 2017

Module: wine Branch: master Commit: 94892721ec0c917cf9700d4090f02ce4176a617d URL: http://source.winehq.org/git/wine.git/?a=commit;h=94892721ec0c917cf9700d409… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 5 11:04:37 2017 +0200 wbemprox: Avoid an invalid write when there are no forwards in the route table (Valgrind). Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 73d93a0..93bea52 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -2070,7 +2070,7 @@ static enum fill_status fill_ip4routetable( struct table *table, const struct ex heap_free( forwards ); return FILL_STATUS_FAILED; } - if (!resize_table( table, forwards->dwNumEntries, sizeof(*rec) )) + if (!resize_table( table, max(forwards->dwNumEntries, 1), sizeof(*rec) )) { heap_free( forwards ); return FILL_STATUS_FAILED;

1 0