August 2015 - Wine-Commits - list.winehq.org

Hugh McMaster : uninstaller: Add WriteFile fallback.
by Alexandre Julliard Aug. 19, 2015

Aug. 19, 2015

Module: wine Branch: master Commit: 8432e7dd30b9598dab590f12ef57b2672fefbc35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8432e7dd30b9598dab590f12e… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Aug 19 15:00:56 2015 +1000 uninstaller: Add WriteFile fallback. --- programs/uninstaller/main.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/programs/uninstaller/main.c b/programs/uninstaller/main.c index 899337d..a9aae73 100644 --- a/programs/uninstaller/main.c +++ b/programs/uninstaller/main.c @@ -59,10 +59,31 @@ static const WCHAR UninstallCommandlineW[] = {'U','n','i','n','s','t','a','l','l static const WCHAR WindowsInstallerW[] = {'W','i','n','d','o','w','s','I','n','s','t','a','l','l','e','r',0}; static const WCHAR SystemComponentW[] = {'S','y','s','t','e','m','C','o','m','p','o','n','e','n','t',0}; +static void output_writeconsole(const WCHAR *str, DWORD len) +{ + DWORD written, ret, lenA; + char *strA; + + ret = WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), str, len, &written, NULL); + if (ret) return; + + /* WriteConsole fails if its output is redirected to a file. + * If this occurs, we should use an OEM codepage and call WriteFile. + */ + lenA = WideCharToMultiByte(GetConsoleOutputCP(), 0, str, len, NULL, 0, NULL, NULL); + strA = HeapAlloc(GetProcessHeap(), 0, lenA); + if (strA) + { + WideCharToMultiByte(GetConsoleOutputCP(), 0, str, len, strA, lenA, NULL, NULL); + WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), strA, lenA, &written, FALSE); + HeapFree(GetProcessHeap(), 0, strA); + } +} + static void output_formatstring(const WCHAR *fmt, __ms_va_list va_args) { WCHAR *str; - DWORD len, count; + DWORD len; SetLastError(NO_ERROR); len = FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ALLOCATE_BUFFER, @@ -72,7 +93,7 @@ static void output_formatstring(const WCHAR *fmt, __ms_va_list va_args) WINE_FIXME("Could not format string: le=%u, fmt=%s\n", GetLastError(), wine_dbgstr_w(fmt)); return; } - WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), str, len, &count, NULL); + output_writeconsole(str, len); LocalFree(str); }

1 0

Sebastian Lackner : oleaut32: Fix possible integer overflow in VarR4FromDec.
by Alexandre Julliard Aug. 19, 2015

Aug. 19, 2015

Module: wine Branch: master Commit: 728076223812e11441f1f185c30d836c1269712e URL: http://source.winehq.org/git/wine.git/?a=commit;h=728076223812e11441f1f185c… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Aug 19 06:51:49 2015 +0200 oleaut32: Fix possible integer overflow in VarR4FromDec. --- dlls/oleaut32/tests/vartype.c | 3 ++- dlls/oleaut32/vartype.c | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 4dd77a0..7cbb059 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -2890,7 +2890,8 @@ static void test_VarR4FromDec(void) CONVERT_DEC(VarR4FromDec,2,0x80,0,3276800); EXPECT(-32768.0f); CONVERT_DEC(VarR4FromDec,2,0,0,3276700); EXPECT(32767.0f); - + CONVERT_DEC(VarR4FromDec,10,0,0,3276700); EXPECT(0.00032767f); + CONVERT_DEC(VarR4FromDec,0,0,1,0); EXPECT(18446744073709551616.0f); } diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index 607d1a2..bf7ebc6 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -2948,28 +2948,28 @@ HRESULT WINAPI VarR4FromUI4(ULONG ulIn, float *pFltOut) HRESULT WINAPI VarR4FromDec(DECIMAL* pDecIn, float *pFltOut) { BYTE scale = DEC_SCALE(pDecIn); - int divisor = 1; + double divisor = 1.0; double highPart; if (scale > DEC_MAX_SCALE || DEC_SIGN(pDecIn) & ~DECIMAL_NEG) return E_INVALIDARG; while (scale--) - divisor *= 10; + divisor *= 10.0; if (DEC_SIGN(pDecIn)) divisor = -divisor; if (DEC_HI32(pDecIn)) { - highPart = (double)DEC_HI32(pDecIn) / (double)divisor; + highPart = (double)DEC_HI32(pDecIn) / divisor; highPart *= 4294967296.0F; highPart *= 4294967296.0F; } else highPart = 0.0; - *pFltOut = (double)DEC_LO64(pDecIn) / (double)divisor + highPart; + *pFltOut = (double)DEC_LO64(pDecIn) / divisor + highPart; return S_OK; }

1 0

Dmitry Timoshkov : server: Keep a pointer to parent' s fd unix_name in the closed_fd structure.
by Alexandre Julliard Aug. 19, 2015

Aug. 19, 2015

Module: wine Branch: master Commit: 9124cb28f969e3590374180881ad20da812aa09b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9124cb28f969e359037418088… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Aug 19 11:17:26 2015 +0200 server: Keep a pointer to parent's fd unix_name in the closed_fd structure. --- server/fd.c | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/server/fd.c b/server/fd.c index f0a52ad..6b95d6c 100644 --- a/server/fd.c +++ b/server/fd.c @@ -164,7 +164,8 @@ struct closed_fd { struct list entry; /* entry in inode closed list */ int unix_fd; /* the unix file descriptor */ - char unlink[1]; /* name to unlink on close (if any) */ + int unlink; /* whether to unlink on close */ + char *unix_name; /* name to unlink on close, points to parent fd unix_name */ }; struct fd @@ -1016,9 +1017,10 @@ static void inode_close_pending( struct inode *inode, int keep_unlinks ) close( fd->unix_fd ); fd->unix_fd = -1; } - if (!keep_unlinks || !fd->unlink[0]) /* get rid of it unless there's an unlink pending on that file */ + if (!keep_unlinks || !fd->unlink) /* get rid of it unless there's an unlink pending on that file */ { list_remove( ptr ); + free( fd->unix_name ); free( fd ); } ptr = next; @@ -1048,16 +1050,17 @@ static void inode_destroy( struct object *obj ) struct closed_fd *fd = LIST_ENTRY( ptr, struct closed_fd, entry ); list_remove( ptr ); if (fd->unix_fd != -1) close( fd->unix_fd ); - if (fd->unlink[0]) + if (fd->unlink) { /* make sure it is still the same file */ struct stat st; - if (!stat( fd->unlink, &st ) && st.st_dev == inode->device->dev && st.st_ino == inode->ino) + if (!stat( fd->unix_name, &st ) && st.st_dev == inode->device->dev && st.st_ino == inode->ino) { - if (S_ISDIR(st.st_mode)) rmdir( fd->unlink ); - else unlink( fd->unlink ); + if (S_ISDIR(st.st_mode)) rmdir( fd->unix_name ); + else unlink( fd->unix_name ); } } + free( fd->unix_name ); free( fd ); } release_object( inode->device ); @@ -1103,7 +1106,7 @@ static void inode_add_closed_fd( struct inode *inode, struct closed_fd *fd ) { list_add_head( &inode->closed, &fd->entry ); } - else if (fd->unlink[0]) /* close the fd but keep the structure around for unlink */ + else if (fd->unlink) /* close the fd but keep the structure around for unlink */ { if (fd->unix_fd != -1) close( fd->unix_fd ); fd->unix_fd = -1; @@ -1112,6 +1115,7 @@ static void inode_add_closed_fd( struct inode *inode, struct closed_fd *fd ) else /* no locks on this inode and no unlink, get rid of the fd */ { if (fd->unix_fd != -1) close( fd->unix_fd ); + free( fd->unix_name ); free( fd ); } } @@ -1451,7 +1455,7 @@ static void fd_dump( struct object *obj, int verbose ) { struct fd *fd = (struct fd *)obj; fprintf( stderr, "Fd unix_fd=%d user=%p options=%08x", fd->unix_fd, fd->user, fd->options ); - if (fd->inode) fprintf( stderr, " inode=%p unlink='%s'", fd->inode, fd->closed->unlink ); + if (fd->inode) fprintf( stderr, " inode=%p unlink=%d", fd->inode, fd->closed->unlink ); fprintf( stderr, "\n" ); } @@ -1465,7 +1469,6 @@ static void fd_destroy( struct object *obj ) if (fd->completion) release_object( fd->completion ); remove_fd_locks( fd ); - free( fd->unix_name ); list_remove( &fd->inode_entry ); if (fd->poll_index != -1) remove_poll_user( fd, fd->poll_index ); if (fd->inode) @@ -1476,6 +1479,7 @@ static void fd_destroy( struct object *obj ) else /* no inode, close it right away */ { if (fd->unix_fd != -1) close( fd->unix_fd ); + free( fd->unix_name ); } } @@ -1563,7 +1567,7 @@ static inline void unmount_fd( struct fd *fd ) fd->unix_fd = -1; fd->no_fd_status = STATUS_VOLUME_DISMOUNTED; fd->closed->unix_fd = -1; - fd->closed->unlink[0] = 0; + fd->closed->unlink = 0; /* stop using Unix locks on this fd (existing locks have been removed by close) */ fd->fs_locks = 0; @@ -1662,7 +1666,8 @@ struct fd *dup_fd_object( struct fd *orig, unsigned int access, unsigned int sha goto failed; } closed->unix_fd = fd->unix_fd; - closed->unlink[0] = 0; + closed->unlink = 0; + closed->unix_name = fd->unix_name; fd->closed = closed; fd->inode = (struct inode *)grab_object( orig->inode ); list_add_head( &fd->inode->open, &fd->inode_entry ); @@ -1738,7 +1743,6 @@ struct fd *open_fd( struct fd *root, const char *name, int flags, mode_t *mode, struct stat st; struct closed_fd *closed_fd; struct fd *fd; - const char *unlink_name = ""; int root_fd = -1; int rw_mode; @@ -1752,8 +1756,7 @@ struct fd *open_fd( struct fd *root, const char *name, int flags, mode_t *mode, if (!(fd = alloc_fd_object())) return NULL; fd->options = options; - if (options & FILE_DELETE_ON_CLOSE) unlink_name = name; - if (!(closed_fd = mem_alloc( sizeof(*closed_fd) + strlen(unlink_name) ))) + if (!(closed_fd = mem_alloc( sizeof(*closed_fd) ))) { release_object( fd ); return NULL; @@ -1810,7 +1813,8 @@ struct fd *open_fd( struct fd *root, const char *name, int flags, mode_t *mode, } closed_fd->unix_fd = fd->unix_fd; - closed_fd->unlink[0] = 0; + closed_fd->unlink = 0; + closed_fd->unix_name = fd->unix_name; fstat( fd->unix_fd, &st ); *mode = st.st_mode; @@ -1851,7 +1855,7 @@ struct fd *open_fd( struct fd *root, const char *name, int flags, mode_t *mode, set_error( err ); return NULL; } - strcpy( closed_fd->unlink, unlink_name ); + closed_fd->unlink = (options & FILE_DELETE_ON_CLOSE) != 0; if (flags & O_TRUNC) { if (S_ISDIR(st.st_mode)) @@ -1865,7 +1869,7 @@ struct fd *open_fd( struct fd *root, const char *name, int flags, mode_t *mode, } else /* special file */ { - if (unlink_name[0]) /* we can't unlink special files */ + if (options & FILE_DELETE_ON_CLOSE) /* we can't unlink special files */ { set_error( STATUS_INVALID_PARAMETER ); goto error;

1 0

Sebastian Lackner : server: Add support for setting file disposition information.
by Alexandre Julliard Aug. 19, 2015

Aug. 19, 2015

Module: wine Branch: master Commit: 0fabfe7d6b30cac1f15c1f70786da6ebe2bffe2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fabfe7d6b30cac1f15c1f707… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Aug 19 11:18:01 2015 +0200 server: Add support for setting file disposition information. Based on a patch by Dmitry Timoshkov. --- dlls/kernel32/tests/file.c | 1 - dlls/ntdll/file.c | 16 +++++++++++++++ dlls/ntdll/tests/file.c | 13 ++----------- include/wine/server_protocol.h | 19 +++++++++++++++++- server/fd.c | 44 ++++++++++++++++++++++++++++++++++++++++++ server/protocol.def | 7 +++++++ server/request.h | 5 +++++ server/trace.c | 9 +++++++++ 8 files changed, 101 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0fabfe7d6b30cac1f15c1…

1 0

Sebastian Lackner : server: Avoid invalid memory access when create_console_input fails.
by Alexandre Julliard Aug. 19, 2015

Aug. 19, 2015

Module: wine Branch: master Commit: 453d71b9f7c8f99822a58ecaab5b51dbd96c799e URL: http://source.winehq.org/git/wine.git/?a=commit;h=453d71b9f7c8f99822a58ecaa… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Aug 19 12:44:02 2015 +0200 server: Avoid invalid memory access when create_console_input fails. --- server/console.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/server/console.c b/server/console.c index 0bb1824..10b1350 100644 --- a/server/console.c +++ b/server/console.c @@ -330,6 +330,7 @@ static struct object *create_console_input( struct thread* renderer, int fd ) if (!console_input->history || (renderer && !console_input->evt) || !console_input->event) { if (fd != -1) close( fd ); + console_input->history_size = 0; release_object( console_input ); return NULL; } @@ -1111,7 +1112,8 @@ static void console_input_destroy( struct object *obj ) release_object( console_in->evt ); console_in->evt = NULL; } - release_object( console_in->event ); + if (console_in->event) + release_object( console_in->event ); if (console_in->fd) release_object( console_in->fd );

1 0

Alistair Leslie-Hughes : advapi32: Prevent buffer overrun.
by Alexandre Julliard Aug. 19, 2015

Aug. 19, 2015

Module: wine Branch: master Commit: 3b5107d06305972beaa9c5ff147ecbcd99949a75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b5107d06305972beaa9c5ff1… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Aug 19 12:18:11 2015 +1000 advapi32: Prevent buffer overrun. --- dlls/advapi32/security.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index d1e2bb4..a40e639 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -4512,13 +4512,15 @@ static BOOL ParseStringSecurityDescriptorToSecurityDescriptor( { BOOL bret = FALSE; WCHAR toktype; - WCHAR tok[MAX_PATH]; + WCHAR *tok; LPCWSTR lptoken; LPBYTE lpNext = NULL; DWORD len; *cBytes = sizeof(SECURITY_DESCRIPTOR); + tok = heap_alloc( (lstrlenW(StringSecurityDescriptor) + 1) * sizeof(WCHAR)); + if (SecurityDescriptor) lpNext = (LPBYTE)(SecurityDescriptor + 1); @@ -4640,6 +4642,7 @@ static BOOL ParseStringSecurityDescriptorToSecurityDescriptor( bret = TRUE; lend: + heap_free(tok); return bret; }

1 0

Sebastian Lackner : server: Initialize table-> handles immediately after creation of atom table.
by Alexandre Julliard Aug. 19, 2015

Aug. 19, 2015

Module: wine Branch: master Commit: 46cba58a987f1c41ceb3056c052fda408d825149 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46cba58a987f1c41ceb3056c0… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Aug 19 12:04:55 2015 +0200 server: Initialize table->handles immediately after creation of atom table. When the malloc afterwards fails, release_object() is called. atom_table_destroy() assumes that table->handles was properly initialized. --- server/atom.c | 1 + 1 file changed, 1 insertion(+) diff --git a/server/atom.c b/server/atom.c index a124426..0ed4ed5 100644 --- a/server/atom.c +++ b/server/atom.c @@ -103,6 +103,7 @@ static struct atom_table *create_table(int entries_count) { if ((entries_count < MIN_HASH_SIZE) || (entries_count > MAX_HASH_SIZE)) entries_count = HASH_SIZE; + table->handles = NULL; table->entries_count = entries_count; if (!(table->entries = malloc( sizeof(*table->entries) * table->entries_count ))) {

1 0

Erich E. Hoover : server: Do not permit FileDispositionInformation to delete a file without write access.
by Alexandre Julliard Aug. 19, 2015

Aug. 19, 2015

Module: wine Branch: master Commit: 6955a298f444332c87eb4154a7d02b6e13e3c6cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=6955a298f444332c87eb4154a… Author: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> Date: Wed Aug 19 11:18:27 2015 +0200 server: Do not permit FileDispositionInformation to delete a file without write access. --- dlls/ntdll/tests/file.c | 14 ++++++++++++++ server/fd.c | 7 +++++++ 2 files changed, 21 insertions(+) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 57ae15c..d215d09 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -1507,6 +1507,20 @@ static void test_file_disposition_information(void) /* cannot set disposition on readonly file */ GetTempFileNameA( tmp_path, "dis", 0, buffer ); + DeleteFileA( buffer ); + handle = CreateFileA(buffer, GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_READONLY, 0); + ok( handle != INVALID_HANDLE_VALUE, "failed to create temp file\n" ); + fdi.DoDeleteFile = TRUE; + res = pNtSetInformationFile( handle, &io, &fdi, sizeof fdi, FileDispositionInformation ); + ok( res == STATUS_CANNOT_DELETE, "unexpected FileDispositionInformation result (expected STATUS_CANNOT_DELETE, got %x)\n", res ); + CloseHandle( handle ); + fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; + ok( !fileDeleted, "File shouldn't have been deleted\n" ); + SetFileAttributesA( buffer, FILE_ATTRIBUTE_NORMAL ); + DeleteFileA( buffer ); + + /* cannot set disposition on readonly file */ + GetTempFileNameA( tmp_path, "dis", 0, buffer ); handle = CreateFileA(buffer, GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_READONLY, 0); ok( handle != INVALID_HANDLE_VALUE, "failed to create temp file\n" ); fdi.DoDeleteFile = TRUE; diff --git a/server/fd.c b/server/fd.c index f607261..0bac57d 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2244,6 +2244,13 @@ static void set_fd_disposition( struct fd *fd, int unlink ) return; } + /* can't unlink files we don't have permission to access */ + if (unlink && !(st.st_mode & (S_IWUSR | S_IWGRP | S_IWOTH))) + { + set_error( STATUS_CANNOT_DELETE ); + return; + } + fd->closed->unlink = unlink || (fd->options & FILE_DELETE_ON_CLOSE); }

1 0

Sebastian Lackner : server: Avoid invalid memory accesses when create_console_output fails.
by Alexandre Julliard Aug. 19, 2015

Aug. 19, 2015

Module: wine Branch: master Commit: 0f133aedd5f1d3a5e8dd84790954247f2bcebd8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f133aedd5f1d3a5e8dd84790… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Aug 19 12:15:01 2015 +0200 server: Avoid invalid memory accesses when create_console_output fails. --- server/console.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/server/console.c b/server/console.c index 218831b..0bb1824 100644 --- a/server/console.c +++ b/server/console.c @@ -409,6 +409,9 @@ static struct screen_buffer *create_console_output( struct console_input *consol screen_buffer->win.right = screen_buffer->max_width - 1; screen_buffer->win.top = 0; screen_buffer->win.bottom = screen_buffer->max_height - 1; + screen_buffer->data = NULL; + list_add_head( &screen_buffer_list, &screen_buffer->entry ); + if (fd == -1) screen_buffer->fd = NULL; else @@ -422,8 +425,6 @@ static struct screen_buffer *create_console_output( struct console_input *consol allow_fd_caching(screen_buffer->fd); } - list_add_head( &screen_buffer_list, &screen_buffer->entry ); - if (!(screen_buffer->data = malloc( screen_buffer->width * screen_buffer->height * sizeof(*screen_buffer->data) ))) {

1 0

Michael Müller : krnl386.exe16: Increase buffer size in GetTempDrive.
by Alexandre Julliard Aug. 19, 2015

Aug. 19, 2015

Module: wine Branch: master Commit: 33aa59abea2ec4dc0d2354a44ec9d0a5af43e48f URL: http://source.winehq.org/git/wine.git/?a=commit;h=33aa59abea2ec4dc0d2354a44… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Aug 19 06:35:21 2015 +0200 krnl386.exe16: Increase buffer size in GetTempDrive. --- dlls/krnl386.exe16/file.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/krnl386.exe16/file.c b/dlls/krnl386.exe16/file.c index 6c3cef3..77908c2 100644 --- a/dlls/krnl386.exe16/file.c +++ b/dlls/krnl386.exe16/file.c @@ -461,10 +461,10 @@ LONG WINAPI _hwrite16( HFILE16 hFile, LPCSTR buffer, LONG count ) */ UINT WINAPI GetTempDrive( BYTE ignored ) { - WCHAR buffer[8]; + WCHAR buffer[MAX_PATH]; BYTE ret; - if (GetTempPathW( 8, buffer )) ret = (BYTE)toupperW(buffer[0]); + if (GetTempPathW( MAX_PATH, buffer )) ret = (BYTE)toupperW(buffer[0]); else ret = 'C'; return MAKELONG( ret | (':' << 8), 1 ); }

1 0