October 2017 - Wine-commits

Fabian Maurer : secur32: In LsaLookupAuthenticationPackage properly set out parameter (cppcheck).
by Alexandre Julliard 03 Oct '17

03 Oct '17

Module: wine Branch: master Commit: fe2d45094f8e9b05b9d1626f6639befc3fa7294d URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe2d45094f8e9b05b9d1626f6… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Tue Oct 3 17:19:23 2017 +0200 secur32: In LsaLookupAuthenticationPackage properly set out parameter (cppcheck). Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/lsa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index fa765ed..6fa9972 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -96,7 +96,7 @@ NTSTATUS WINAPI LsaLookupAuthenticationPackage(HANDLE LsaHandle, PLSA_STRING PackageName, PULONG AuthenticationPackage) { FIXME("%p %p %p stub\n", LsaHandle, PackageName, AuthenticationPackage); - AuthenticationPackage = NULL; + *AuthenticationPackage = 0; return STATUS_SUCCESS; }

1 0

Fabian Maurer : winedump: Fix potential null-pointer dereference (cppcheck ).
by Alexandre Julliard 03 Oct '17

03 Oct '17

Module: wine Branch: master Commit: b58094f74c2d773f110443ba52b873d1d6a8c829 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b58094f74c2d773f110443ba5… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Tue Oct 3 17:28:08 2017 +0200 winedump: Fix potential null-pointer dereference (cppcheck). Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/pdb.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/winedump/pdb.c b/tools/winedump/pdb.c index 6a6a9b4..6fd70ce 100644 --- a/tools/winedump/pdb.c +++ b/tools/winedump/pdb.c @@ -215,7 +215,8 @@ static void *read_string_table(struct pdb_reader* reader) stream_idx = get_stream_by_name(reader, "/names"); if (stream_idx == -1) return NULL; ret = reader->read_file(reader, stream_idx); - if (ret && *(const DWORD*)ret == 0xeffeeffe) return ret; + if (!ret) return NULL; + if(*(const DWORD*)ret == 0xeffeeffe) return ret; printf("wrong header %x expecting 0xeffeeffe\n", *(const DWORD*)ret); free( ret ); return NULL;

1 0

Fabian Maurer : inetcomm: In SMTPTransport_ParseResponse remove unneeded statement (cppcheck).
by Alexandre Julliard 03 Oct '17

03 Oct '17

Module: wine Branch: master Commit: 6641efad7d8de1f36f5235a343c8cf9a8609b34e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6641efad7d8de1f36f5235a34… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Tue Oct 3 17:37:26 2017 +0200 inetcomm: In SMTPTransport_ParseResponse remove unneeded statement (cppcheck). Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/smtptransport.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/dlls/inetcomm/smtptransport.c b/dlls/inetcomm/smtptransport.c index c88ac9c..af11308 100644 --- a/dlls/inetcomm/smtptransport.c +++ b/dlls/inetcomm/smtptransport.c @@ -59,13 +59,7 @@ static HRESULT SMTPTransport_ParseResponse(SMTPTransport *This, char *pszRespons pResponse->rIxpResult.pszResponse = pszResponse; pResponse->rIxpResult.dwSocketError = 0; pResponse->rIxpResult.uiServerError = strtol(pszResponse, &pszResponse, 10); - if (*pszResponse == '-') - { - pResponse->fDone = FALSE; - pszResponse++; - } - else - pResponse->fDone = TRUE; + pResponse->fDone = (*pszResponse != '-'); switch (pResponse->rIxpResult.uiServerError) {

1 0

Fabian Maurer : oleaut32: In userdefined_to_variantvt remove unneeded statement (cppcheck).
by Alexandre Julliard 03 Oct '17

03 Oct '17

Module: wine Branch: master Commit: c0da750e8a8423c62e024667df6387af2fbb5500 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0da750e8a8423c62e024667d… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Tue Oct 3 17:40:22 2017 +0200 oleaut32: In userdefined_to_variantvt remove unneeded statement (cppcheck). Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/typelib.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 311cca3..ebf6d85 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -6453,7 +6453,6 @@ static HRESULT userdefined_to_variantvt(ITypeInfo *tinfo, const TYPEDESC *tdesc, break; case TKIND_ALIAS: - tdesc = &tattr->tdescAlias; hr = typedescvt_to_variantvt(tinfo2, &tattr->tdescAlias, vt); break;

1 0

Fabian Maurer : wineandroid.drv: In AudioClient_IsFormatSupported remove unneeded statement (cppcheck).
by Alexandre Julliard 03 Oct '17

03 Oct '17

Module: wine Branch: master Commit: 67756774f5b8d37fee278959d4ba0400acb9d68f URL: http://source.winehq.org/git/wine.git/?a=commit;h=67756774f5b8d37fee278959d… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Tue Oct 3 17:43:23 2017 +0200 wineandroid.drv: In AudioClient_IsFormatSupported remove unneeded statement (cppcheck). Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/mmdevdrv.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/wineandroid.drv/mmdevdrv.c b/dlls/wineandroid.drv/mmdevdrv.c index 275b652..84aafb7 100644 --- a/dlls/wineandroid.drv/mmdevdrv.c +++ b/dlls/wineandroid.drv/mmdevdrv.c @@ -1079,11 +1079,8 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface, dump_fmt(pwfx); - if(outpwfx){ + if(outpwfx) *outpwfx = NULL; - if(mode != AUDCLNT_SHAREMODE_SHARED) - outpwfx = NULL; - } hr = waveformat_to_pcm(This, pwfx, &pcm); TRACE("returning: %08x\n", hr);

1 0

Fabian Maurer : crypt32: In CRYPT_CollectionAdvanceEnum remove unneeded statement (cppcheck).
by Alexandre Julliard 03 Oct '17

03 Oct '17

Module: wine Branch: master Commit: b34ea10112227a0d8554c81fc093c0cf6e1bc1b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b34ea10112227a0d8554c81fc… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Tue Oct 3 17:44:54 2017 +0200 crypt32: In CRYPT_CollectionAdvanceEnum remove unneeded statement (cppcheck). Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/collectionstore.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/crypt32/collectionstore.c b/dlls/crypt32/collectionstore.c index 8b90270..2c2398d 100644 --- a/dlls/crypt32/collectionstore.c +++ b/dlls/crypt32/collectionstore.c @@ -164,7 +164,6 @@ static context_t *CRYPT_CollectionAdvanceEnum(WINE_COLLECTIONSTORE *store, Context_AddRef(child); child = contextFuncs->enumContext(storeEntry->store, child); Context_Release(prev); - prev = NULL; } else {

1 0

Jacek Caban : server: Allow server side NtQueryVolumeInformationFile implementation.
by Alexandre Julliard 03 Oct '17

03 Oct '17

Module: wine Branch: master Commit: 2ab2f31f18fd2089c311a529f80a9d5ff6a52beb URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ab2f31f18fd2089c311a529f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 2 16:42:16 2017 +0200 server: Allow server side NtQueryVolumeInformationFile implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 15 ++++++++++++++- include/wine/server_protocol.h | 18 +++++++++++++++++- server/change.c | 1 + server/console.c | 1 + server/device.c | 1 + server/fd.c | 18 ++++++++++++++++++ server/file.c | 1 + server/file.h | 3 +++ server/mailslot.c | 3 +++ server/mapping.c | 1 + server/named_pipe.c | 3 +++ server/protocol.def | 7 +++++++ server/request.h | 6 ++++++ server/serial.c | 1 + server/sock.c | 2 ++ server/trace.c | 14 ++++++++++++++ 16 files changed, 93 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2ab2f31f18fd2089c311a…

1 0

Jacek Caban : server: Add FileFsDeviceInformation implementation for named pipes.
by Alexandre Julliard 03 Oct '17

03 Oct '17

Module: wine Branch: master Commit: 3f07c6e256d59f6564ffb6be09e0dffe7c09e061 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f07c6e256d59f6564ffb6be0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 2 16:42:24 2017 +0200 server: Add FileFsDeviceInformation implementation for named pipes. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/pipe.c | 4 ---- server/named_pipe.c | 27 +++++++++++++++++++++++++-- 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index c448526..897c44b 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -1115,25 +1115,21 @@ static void test_volume_info(void) memset( buffer, 0xaa, sizeof(buffer) ); status = pNtQueryVolumeInformationFile( read, &iosb, buffer, sizeof(buffer), FileFsDeviceInformation ); - todo_wine { ok( status == STATUS_SUCCESS, "NtQueryVolumeInformationFile failed: %x\n", status ); ok( iosb.Information == sizeof(*device_info), "Information = %lu\n", iosb.Information ); device_info = (FILE_FS_DEVICE_INFORMATION*)buffer; ok( device_info->DeviceType == FILE_DEVICE_NAMED_PIPE, "DeviceType = %u\n", device_info->DeviceType ); ok( !(device_info->Characteristics & ~FILE_DEVICE_ALLOW_APPCONTAINER_TRAVERSAL), "Characteristics = %x\n", device_info->Characteristics ); - } memset( buffer, 0xaa, sizeof(buffer) ); status = pNtQueryVolumeInformationFile( write, &iosb, buffer, sizeof(buffer), FileFsDeviceInformation ); - todo_wine { ok( status == STATUS_SUCCESS, "NtQueryVolumeInformationFile failed: %x\n", status ); ok( iosb.Information == sizeof(*device_info), "Information = %lu\n", iosb.Information ); device_info = (FILE_FS_DEVICE_INFORMATION*)buffer; ok( device_info->DeviceType == FILE_DEVICE_NAMED_PIPE, "DeviceType = %u\n", device_info->DeviceType ); ok( !(device_info->Characteristics & ~FILE_DEVICE_ALLOW_APPCONTAINER_TRAVERSAL), "Characteristics = %x\n", device_info->Characteristics ); - } CloseHandle( read ); CloseHandle( write ); diff --git a/server/named_pipe.c b/server/named_pipe.c index 6dd2fd6..d0ec38f 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -156,6 +156,7 @@ static const struct object_ops named_pipe_ops = 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 int pipe_end_write( struct fd *fd, struct async *async_data, file_pos_t pos ); +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 ); @@ -196,7 +197,7 @@ static const struct fd_ops pipe_server_fd_ops = pipe_end_read, /* read */ pipe_end_write, /* write */ pipe_server_flush, /* flush */ - no_fd_get_volume_info, /* get_volume_info */ + pipe_end_get_volume_info, /* get_volume_info */ pipe_server_ioctl, /* ioctl */ pipe_end_queue_async, /* queue_async */ pipe_end_reselect_async /* reselect_async */ @@ -240,7 +241,7 @@ static const struct fd_ops pipe_client_fd_ops = pipe_end_read, /* read */ pipe_end_write, /* write */ pipe_client_flush, /* flush */ - no_fd_get_volume_info, /* get_volume_info */ + pipe_end_get_volume_info, /* get_volume_info */ pipe_client_ioctl, /* ioctl */ pipe_end_queue_async, /* queue_async */ pipe_end_reselect_async /* reselect_async */ @@ -685,6 +686,28 @@ static int pipe_client_flush( struct fd *fd, struct async *async ) return use_server_io( pipe_end ) ? pipe_end_flush( pipe_end, async ) : 1; } +static void pipe_end_get_volume_info( struct fd *fd, unsigned int info_class ) +{ + switch (info_class) + { + case FileFsDeviceInformation: + { + static const FILE_FS_DEVICE_INFORMATION device_info = + { + FILE_DEVICE_NAMED_PIPE, + FILE_DEVICE_ALLOW_APPCONTAINER_TRAVERSAL + }; + if (get_reply_max_size() >= sizeof(device_info)) + set_reply_data( &device_info, sizeof(device_info) ); + else + set_error( STATUS_BUFFER_TOO_SMALL ); + break; + } + default: + set_error( STATUS_NOT_IMPLEMENTED ); + } +} + static void message_queue_read( struct pipe_end *pipe_end, struct iosb *iosb ) { struct pipe_message *message;

1 0

Austin English : readme: Document that wine can be run from the build directory.
by Alexandre Julliard 03 Oct '17

03 Oct '17

Module: wine Branch: master Commit: c6ac658019b00e366cee59bf4c7ac923d696b59d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6ac658019b00e366cee59bf4… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Oct 2 12:40:47 2017 -0500 readme: Document that wine can be run from the build directory. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- README | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/README b/README index 70cb004..3d2e4cf 100644 --- a/README +++ b/README @@ -19,6 +19,14 @@ run: ./configure make +Then either install wine: + +make install + +Or run from it the build directory: + +./wine notepad + Run programs as "wine program". For more information and problem resolution, read the rest of this file, the Wine man page, and especially the wealth of information found at http://www.winehq.org.

1 0

Alexandre Julliard : server: Fix allocation size (Coverity).
by Alexandre Julliard 03 Oct '17

03 Oct '17

Module: wine Branch: master Commit: 541e7ba79a0084d51dced4e14f2d4af0217f2abf URL: http://source.winehq.org/git/wine.git/?a=commit;h=541e7ba79a0084d51dced4e14… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 3 10:28:50 2017 +0200 server: Fix allocation size (Coverity). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/mapping.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/mapping.c b/server/mapping.c index 57641d1..0e4143f 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -600,7 +600,7 @@ static struct ranges *create_ranges(void) if (!ranges) return NULL; ranges->count = 0; ranges->max = 8; - if (!(ranges->ranges = mem_alloc( ranges->max * sizeof(ranges->ranges) ))) + if (!(ranges->ranges = mem_alloc( ranges->max * sizeof(*ranges->ranges) ))) { release_object( ranges ); return NULL;

1 0