July 2020 - Wine-commits - list.winehq.org

Alexandre Julliard : ntdll: Use malloc() to allocate the buffer in unix_to_nt_file_name().
by Alexandre Julliard 14 Jul '20

14 Jul '20

Module: wine Branch: master Commit: ef01f6ac1338dcb100bc2ff5cd1cf360d7d8520f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef01f6ac1338dcb100bc2ff5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 14 10:32:04 2020 +0200 ntdll: Use malloc() to allocate the buffer in unix_to_nt_file_name(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/env.c | 4 ++-- dlls/ntdll/unix/file.c | 9 ++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 039e5475fe..74cea11be5 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -1064,7 +1064,7 @@ static void add_path_var( WCHAR *env, SIZE_T *pos, const char *name, const char { if (unix_to_nt_file_name( path, &nt_name )) return; append_envW( env, pos, name, nt_name ); - RtlFreeHeap( GetProcessHeap(), 0, nt_name ); + free( nt_name ); } } @@ -1217,7 +1217,7 @@ void CDECL get_initial_directory( UNICODE_STRING *dir ) memcpy( dir->Buffer, nt_name, dir->Length ); dir->Buffer[1] = '\\'; } - RtlFreeHeap( GetProcessHeap(), 0, nt_name ); + free( nt_name ); } } diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 085052225d..79b87cf99b 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -1834,7 +1834,7 @@ static NTSTATUS fill_name_info( const char *unix_name, FILE_NAME_INFORMATION *in else *name_len = info->FileNameLength; memcpy( info->FileName, ptr, *name_len ); - RtlFreeHeap( GetProcessHeap(), 0, nt_name ); + free( nt_name ); } return status; @@ -3447,8 +3447,7 @@ NTSTATUS unix_to_nt_file_name( const char *name, WCHAR **nt ) else if (status != STATUS_OBJECT_PATH_NOT_FOUND) return status; lenW = wcslen( prefix ); - if (!(buffer = RtlAllocateHeap( GetProcessHeap(), 0, (lenA + lenW + 1) * sizeof(WCHAR) ))) - return STATUS_NO_MEMORY; + if (!(buffer = malloc( (lenA + lenW + 1) * sizeof(WCHAR) ))) return STATUS_NO_MEMORY; memcpy( buffer, prefix, lenW * sizeof(WCHAR) ); lenW += ntdll_umbstowcs( path, lenA, buffer + lenW, lenA ); buffer[lenW] = 0; @@ -3474,7 +3473,7 @@ NTSTATUS CDECL wine_unix_to_nt_file_name( const char *name, WCHAR *buffer, SIZE_ if (*size > wcslen(nt_name)) wcscpy( buffer, nt_name ); else status = STATUS_BUFFER_TOO_SMALL; *size = wcslen(nt_name) + 1; - RtlFreeHeap( GetProcessHeap(), 0, nt_name ); + free( nt_name ); } return status; } @@ -6411,7 +6410,7 @@ NTSTATUS WINAPI NtQueryObject( HANDLE handle, OBJECT_INFORMATION_CLASS info_clas wcscpy( p->Name.Buffer, nt_name ); } if (used_len) *used_len = sizeof(*p) + size; - RtlFreeHeap( GetProcessHeap(), 0, nt_name ); + free( nt_name ); } RtlFreeHeap( GetProcessHeap(), 0, unix_name ); break;

1 0

Alexandre Julliard : ntdll: Use malloc() to allocate the buffer in nt_to_unix_file_name() and related helpers.
by Alexandre Julliard 14 Jul '20

14 Jul '20

Module: wine Branch: master Commit: 1037bf54bf056090855c3e2dc8c70193f18a243e URL: https://source.winehq.org/git/wine.git/?a=commit;h=1037bf54bf056090855c3e2d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 14 10:32:31 2020 +0200 ntdll: Use malloc() to allocate the buffer in nt_to_unix_file_name() and related helpers. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 63 +++++++++++++++++------------------------------ dlls/ntdll/unix/loader.c | 2 +- dlls/ntdll/unix/process.c | 2 +- 3 files changed, 25 insertions(+), 42 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1037bf54bf056090855c…

1 0

Alexandre Julliard : ntdll: Use malloc() to allocate the buffer in server_get_unix_name().
by Alexandre Julliard 14 Jul '20

14 Jul '20

Module: wine Branch: master Commit: 9ec5be2cea3af2ca631ef0dce3208965058abb59 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ec5be2cea3af2ca631ef0dc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 14 10:32:55 2020 +0200 ntdll: Use malloc() to allocate the buffer in server_get_unix_name(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 51a7c9b5d1..0b9ad4bc22 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -1777,8 +1777,7 @@ static NTSTATUS server_get_unix_name( HANDLE handle, char **unix_name ) for (;;) { - name = RtlAllocateHeap( GetProcessHeap(), 0, size + 1 ); - if (!name) return STATUS_NO_MEMORY; + if (!(name = malloc( size + 1 ))) return STATUS_NO_MEMORY; SERVER_START_REQ( get_handle_unix_name ) { @@ -1795,7 +1794,7 @@ static NTSTATUS server_get_unix_name( HANDLE handle, char **unix_name ) *unix_name = name; break; } - RtlFreeHeap( GetProcessHeap(), 0, name ); + free( name ); if (ret != STATUS_BUFFER_OVERFLOW) break; } return ret; @@ -1962,7 +1961,7 @@ static NTSTATUS get_mountmgr_fs_info( HANDLE handle, int fd, struct mountmgr_uni if ((status = server_get_unix_name( handle, &unix_name ))) return status; letter = find_dos_device( unix_name ); - RtlFreeHeap( GetProcessHeap(), 0, unix_name ); + free( unix_name ); if (letter == -1) { @@ -3985,7 +3984,7 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, info->AlignmentInformation.AlignmentRequirement = 1; /* FIXME */ io->u.Status = fill_name_info( unix_name, &info->NameInformation, &name_len ); - RtlFreeHeap( GetProcessHeap(), 0, unix_name ); + free( unix_name ); io->Information = FIELD_OFFSET(FILE_ALL_INFORMATION, NameInformation.FileName) + name_len; } } @@ -4037,7 +4036,7 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, { LONG name_len = len - FIELD_OFFSET(FILE_NAME_INFORMATION, FileName); io->u.Status = fill_name_info( unix_name, info, &name_len ); - RtlFreeHeap( GetProcessHeap(), 0, unix_name ); + free( unix_name ); io->Information = FIELD_OFFSET(FILE_NAME_INFORMATION, FileName) + name_len; } } @@ -4072,7 +4071,7 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, info->EndOfFile = std.EndOfFile; info->FileAttributes = basic.FileAttributes; } - RtlFreeHeap( GetProcessHeap(), 0, unix_name ); + free( unix_name ); } } break; @@ -6395,7 +6394,7 @@ NTSTATUS WINAPI NtQueryObject( HANDLE handle, OBJECT_INFORMATION_CLASS info_clas if (used_len) *used_len = sizeof(*p) + size; free( nt_name ); } - RtlFreeHeap( GetProcessHeap(), 0, unix_name ); + free( unix_name ); break; } else if (status != STATUS_OBJECT_TYPE_MISMATCH) break;

1 0

Alexandre Julliard : ntdll: Use malloc() to allocate the buffer in get_device_mount_point().
by Alexandre Julliard 14 Jul '20

14 Jul '20

Module: wine Branch: master Commit: b2d38f15314e39eeb17ec5e02bc6fe78b26420e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2d38f15314e39eeb17ec5e0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 14 10:33:05 2020 +0200 ntdll: Use malloc() to allocate the buffer in get_device_mount_point(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 0b9ad4bc22..cee9800fc8 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -947,8 +947,7 @@ static char *get_device_mount_point( dev_t dev ) if (device && !stat( device, &st ) && S_ISBLK(st.st_mode) && st.st_rdev == dev) { - ret = RtlAllocateHeap( GetProcessHeap(), 0, strlen(entry->mnt_dir) + 1 ); - if (ret) strcpy( ret, entry->mnt_dir ); + ret = strdup( entry->mnt_dir ); break; } } @@ -968,8 +967,7 @@ static char *get_device_mount_point( dev_t dev ) if (stat( entry[i].f_mntfromname, &st ) == -1) continue; if (S_ISBLK(st.st_mode) && st.st_rdev == dev) { - ret = RtlAllocateHeap( GetProcessHeap(), 0, strlen(entry[i].f_mntonname) + 1 ); - if (ret) strcpy( ret, entry[i].f_mntonname ); + ret = strdup( entry[i].f_mntonname ); break; } } @@ -1089,11 +1087,11 @@ static int get_dir_case_sensitivity_attr( const char *dir ) attr.volattr = ATTR_VOL_INFO|ATTR_VOL_CAPABILITIES; if (getattrlist( mntpoint, &attr, &caps, sizeof(caps), 0 ) < 0) { - RtlFreeHeap( GetProcessHeap(), 0, mntpoint ); + free( mntpoint ); add_fs_cache( get_fsid.dev, get_fsid.fsid, TRUE ); return TRUE; } - RtlFreeHeap( GetProcessHeap(), 0, mntpoint ); + free( mntpoint ); if (caps.size == sizeof(caps) && (caps.caps.valid[VOL_CAPABILITIES_FORMAT] & (VOL_CAP_FMT_CASE_SENSITIVE | VOL_CAP_FMT_CASE_PRESERVING)) == @@ -3500,7 +3498,7 @@ static NTSTATUS unmount_device( HANDLE handle ) if (major(st.st_rdev) == LOOP_MAJOR) ioctl( unix_fd, 0x4c01 /*LOOP_CLR_FD*/, 0 ); #endif } - RtlFreeHeap( GetProcessHeap(), 0, mount_point ); + free( mount_point ); } } if (needs_close) close( unix_fd );

1 0

Alexandre Julliard : ntdll: Use malloc() to allocate the directory cache.
by Alexandre Julliard 14 Jul '20

14 Jul '20

Module: wine Branch: master Commit: e9abe3f7395a81dcb6d192b48bd54848dc4f2b5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9abe3f7395a81dcb6d192b4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 14 10:33:18 2020 +0200 ntdll: Use malloc() to allocate the directory cache. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 46 ++++++++++++++-------------------------------- 1 file changed, 14 insertions(+), 32 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index cee9800fc8..c003b08996 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -379,8 +379,7 @@ static void *get_dir_data_space( struct dir_data *data, unsigned int size ) { unsigned int new_size = buffer ? buffer->size * 2 : dir_data_buffer_initial_size; if (new_size < size) new_size = size; - if (!(buffer = RtlAllocateHeap( GetProcessHeap(), 0, - offsetof( struct dir_data_buffer, data[new_size] ) ))) return NULL; + if (!(buffer = malloc( offsetof( struct dir_data_buffer, data[new_size] ) ))) return NULL; buffer->pos = 0; buffer->size = new_size; buffer->next = data->buffer; @@ -419,9 +418,7 @@ static BOOL add_dir_data_names( struct dir_data *data, const WCHAR *long_name, { unsigned int new_size = max( data->size * 2, dir_data_names_initial_size ); - if (names) names = RtlReAllocateHeap( GetProcessHeap(), 0, names, new_size * sizeof(*names) ); - else names = RtlAllocateHeap( GetProcessHeap(), 0, new_size * sizeof(*names) ); - if (!names) return FALSE; + if (!(names = realloc( names, new_size * sizeof(*names) ))) return FALSE; data->size = new_size; data->names = names; } @@ -448,10 +445,10 @@ static void free_dir_data( struct dir_data *data ) for (buffer = data->buffer; buffer; buffer = next) { next = buffer->next; - RtlFreeHeap( GetProcessHeap(), 0, buffer ); + free( buffer ); } - RtlFreeHeap( GetProcessHeap(), 0, data->names ); - RtlFreeHeap( GetProcessHeap(), 0, data ); + free( data->names ); + free( data ); } @@ -468,8 +465,7 @@ static struct list dir_queue = LIST_INIT( dir_queue ); static NTSTATUS add_dir_to_queue( const char *name ) { int len = strlen( name ) + 1; - struct dir_name *dir = RtlAllocateHeap( GetProcessHeap(), 0, - FIELD_OFFSET( struct dir_name, name[len] )); + struct dir_name *dir = malloc( offsetof( struct dir_name, name[len] )); if (!dir) return STATUS_NO_MEMORY; strcpy( dir->name, name ); list_add_tail( &dir_queue, &dir->entry ); @@ -484,7 +480,7 @@ static NTSTATUS next_dir_in_queue( char *name ) struct dir_name *dir = LIST_ENTRY( head, struct dir_name, entry ); strcpy( name, dir->name ); list_remove( &dir->entry ); - RtlFreeHeap( GetProcessHeap(), 0, dir ); + free( dir ); return STATUS_SUCCESS; } return STATUS_OBJECT_NAME_NOT_FOUND; @@ -498,7 +494,7 @@ static void flush_dir_queue(void) { struct dir_name *dir = LIST_ENTRY( head, struct dir_name, entry ); list_remove( &dir->entry ); - RtlFreeHeap( GetProcessHeap(), 0, dir ); + free( dir ); } } @@ -2293,8 +2289,7 @@ static NTSTATUS init_cached_dir_data( struct dir_data **data_ret, int fd, const NTSTATUS status; unsigned int i; - if (!(data = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*data) ))) - return STATUS_NO_MEMORY; + if (!(data = calloc( 1, sizeof(*data) ))) return STATUS_NO_MEMORY; if ((status = read_directory_data( data, fd, mask ))) { @@ -2310,18 +2305,9 @@ static NTSTATUS init_cached_dir_data( struct dir_data **data_ret, int fd, const if (data->count) { - /* release unused space */ - if (data->buffer) - RtlReAllocateHeap( GetProcessHeap(), HEAP_REALLOC_IN_PLACE_ONLY, data->buffer, - offsetof( struct dir_data_buffer, data[data->buffer->pos] )); - if (data->count < data->size) - RtlReAllocateHeap( GetProcessHeap(), HEAP_REALLOC_IN_PLACE_ONLY, data->names, - data->count * sizeof(*data->names) ); - if (!fstat( fd, &st )) - { - data->id.dev = st.st_dev; - data->id.ino = st.st_ino; - } + fstat( fd, &st ); + data->id.dev = st.st_dev; + data->id.ino = st.st_ino; } TRACE( "mask %s found %u files\n", debugstr_us( mask ), data->count ); @@ -2372,14 +2358,10 @@ static NTSTATUS get_cached_dir_data( HANDLE handle, struct dir_data **data_ret, if (entry >= dir_data_cache_size) { unsigned int size = max( dir_data_cache_initial_size, max( dir_data_cache_size * 2, entry + 1 ) ); - struct dir_data **new_cache; + struct dir_data **new_cache = realloc( dir_data_cache, size * sizeof(*new_cache) ); - if (dir_data_cache) - new_cache = RtlReAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, dir_data_cache, - size * sizeof(*new_cache) ); - else - new_cache = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, size * sizeof(*new_cache) ); if (!new_cache) return STATUS_NO_MEMORY; + memset( new_cache + dir_data_cache_size, 0, (size - dir_data_cache_size) * sizeof(*new_cache) ); dir_data_cache = new_cache; dir_data_cache_size = size; }

1 0

Alexandre Julliard : ntdll: Use malloc() to allocate temporary filename buffers.
by Alexandre Julliard 14 Jul '20

14 Jul '20

Module: wine Branch: master Commit: 83f9e784e42c404e31172e55a406a8403c8a33de URL: https://source.winehq.org/git/wine.git/?a=commit;h=83f9e784e42c404e31172e55… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 14 10:33:23 2020 +0200 ntdll: Use malloc() to allocate temporary filename buffers. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index c003b08996..bf435f109f 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -1503,7 +1503,7 @@ static int get_file_info( const char *path, struct stat *st, ULONG *attr ) /* is a symbolic link and a directory, consider these "reparse points" */ if (S_ISDIR( st->st_mode )) *attr |= FILE_ATTRIBUTE_REPARSE_POINT; } - else if (S_ISDIR( st->st_mode ) && (parent_path = RtlAllocateHeap( GetProcessHeap(), 0, strlen(path) + 4 ))) + else if (S_ISDIR( st->st_mode ) && (parent_path = malloc( strlen(path) + 4 ))) { struct stat parent_st; @@ -1514,7 +1514,7 @@ static int get_file_info( const char *path, struct stat *st, ULONG *attr ) && (st->st_dev != parent_st.st_dev || st->st_ino == parent_st.st_ino)) *attr |= FILE_ATTRIBUTE_REPARSE_POINT; - RtlFreeHeap( GetProcessHeap(), 0, parent_path ); + free( parent_path ); } *attr |= get_file_attributes( st ); return ret; @@ -1858,8 +1858,7 @@ static unsigned int get_drives_info( struct file_identity info[MAX_DOS_DRIVES] ) struct stat st; unsigned int i; - if ((buffer = RtlAllocateHeap( GetProcessHeap(), 0, - strlen(config_dir) + sizeof("/dosdevices/a:") ))) + if ((buffer = malloc( strlen(config_dir) + sizeof("/dosdevices/a:") ))) { strcpy( buffer, config_dir ); strcat( buffer, "/dosdevices/a:" ); @@ -1880,7 +1879,7 @@ static unsigned int get_drives_info( struct file_identity info[MAX_DOS_DRIVES] ) cache[i].ino = 0; } } - RtlFreeHeap( GetProcessHeap(), 0, buffer ); + free( buffer ); } last_update = now; } @@ -1911,7 +1910,7 @@ static int find_dos_device( const char *path ) while (len > 1 && path[len - 1] == '/') len--; /* make a copy of the path */ - if (!(buffer = RtlAllocateHeap( GetProcessHeap(), 0, len + 1 ))) return -1; + if (!(buffer = malloc( len + 1 ))) return -1; memcpy( buffer, path, len ); buffer[len] = 0; @@ -1928,7 +1927,7 @@ static int find_dos_device( const char *path ) if (len == 1) len = 0; /* preserve root slash in returned path */ TRACE( "%s -> drive %c:, root=%s, name=%s\n", debugstr_a(path), 'A' + drive, debugstr_a(buffer), debugstr_a(path + len)); - RtlFreeHeap( GetProcessHeap(), 0, buffer ); + free( buffer ); return drive; } } @@ -1938,7 +1937,7 @@ static int find_dos_device( const char *path ) while (path[len - 1] == '/') len--; buffer[len] = 0; } - RtlFreeHeap( GetProcessHeap(), 0, buffer ); + free( buffer ); return -1; } @@ -3467,13 +3466,13 @@ static NTSTATUS unmount_device( HANDLE handle ) #else static const char umount[] = "umount >/dev/null 2>&1 "; #endif - char *cmd = RtlAllocateHeap( GetProcessHeap(), 0, strlen(mount_point)+sizeof(umount)); + char *cmd = malloc( strlen(mount_point)+sizeof(umount)); if (cmd) { strcpy( cmd, umount ); strcat( cmd, mount_point ); system( cmd ); - RtlFreeHeap( GetProcessHeap(), 0, cmd ); + free( cmd ); #ifdef linux /* umount will fail to release the loop device since we still have a handle to it, so we release it here */ @@ -3993,7 +3992,7 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, char *tmpbuf; ULONG size = info->MaximumMessageSize ? info->MaximumMessageSize : 0x10000; if (size > 0x10000) size = 0x10000; - if ((tmpbuf = RtlAllocateHeap( GetProcessHeap(), 0, size ))) + if ((tmpbuf = malloc( size ))) { if (!server_get_unix_fd( handle, FILE_READ_DATA, &fd, &needs_close, NULL, NULL )) { @@ -4002,7 +4001,7 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, info->NextMessageSize = (res >= 0) ? res : MAILSLOT_NO_MESSAGE; if (needs_close) close( fd ); } - RtlFreeHeap( GetProcessHeap(), 0, tmpbuf ); + free( tmpbuf ); } } }

1 0

Alexandre Julliard : ntdll: Use malloc() to allocate temporary process data.
by Alexandre Julliard 14 Jul '20

14 Jul '20

Module: wine Branch: master Commit: 42a2ad202e6a260dc9e3f04939c7dacf270f7434 URL: https://source.winehq.org/git/wine.git/?a=commit;h=42a2ad202e6a260dc9e3f049… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 14 10:33:57 2020 +0200 ntdll: Use malloc() to allocate temporary process data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/process.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index 8b03834df6..83c67737f8 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -233,7 +233,7 @@ static startup_info_t *create_startup_info( const RTL_USER_PROCESS_PARAMETERS *p size = (size + 1) & ~1; *info_size = size; - if (!(info = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, size ))) return NULL; + if (!(info = calloc( size, 1 ))) return NULL; info->debug_flags = params->DebugFlags; info->console_flags = params->ConsoleFlags; @@ -461,7 +461,7 @@ static ULONG get_env_size( const RTL_USER_PROCESS_PARAMETERS *params, char **win if (!*winedebug && !wcsncmp( ptr, WINEDEBUG, ARRAY_SIZE( WINEDEBUG ) - 1 )) { DWORD len = wcslen(ptr) * 3 + 1; - if ((*winedebug = RtlAllocateHeap( GetProcessHeap(), 0, len ))) + if ((*winedebug = malloc( len ))) ntdll_wcstoumbs( ptr, wcslen(ptr) + 1, *winedebug, len, FALSE ); } ptr += wcslen(ptr) + 1; @@ -991,8 +991,8 @@ done: if (thread_handle) NtClose( thread_handle ); if (socketfd[0] != -1) close( socketfd[0] ); if (unixdir != -1) close( unixdir ); - RtlFreeHeap( GetProcessHeap(), 0, startup_info ); - RtlFreeHeap( GetProcessHeap(), 0, winedebug ); + free( startup_info ); + free( winedebug ); return status; }

1 0

Alexandre Julliard : ntdll: Use malloc() to allocate the logical processor information.
by Alexandre Julliard 14 Jul '20

14 Jul '20

Module: wine Branch: master Commit: fe7b8d70d5229c693dc16b743ef0ec7f76a1569f URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe7b8d70d5229c693dc16b74… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 14 10:34:31 2020 +0200 ntdll: Use malloc() to allocate the logical processor information. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/system.c | 99 +++++++++++++++++++----------------------------- 1 file changed, 40 insertions(+), 59 deletions(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 3557df6108..eedd67fba1 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -496,32 +496,24 @@ void init_cpu_info(void) cpu_info.Architecture, cpu_info.Level, cpu_info.Revision, cpu_info.FeatureSet ); } -static BOOL grow_logical_proc_buf( SYSTEM_LOGICAL_PROCESSOR_INFORMATION **pdata, - SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX **pdataex, DWORD *max_len ) +static BOOL grow_logical_proc_buf( SYSTEM_LOGICAL_PROCESSOR_INFORMATION **pdata, DWORD *max_len ) { - if (pdata) - { - SYSTEM_LOGICAL_PROCESSOR_INFORMATION *new_data; - - *max_len *= 2; - new_data = RtlReAllocateHeap(GetProcessHeap(), 0, *pdata, *max_len*sizeof(*new_data)); - if (!new_data) - return FALSE; - - *pdata = new_data; - } - else - { - SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *new_dataex; - - *max_len *= 2; - new_dataex = RtlReAllocateHeap(GetProcessHeap(), HEAP_ZERO_MEMORY, *pdataex, *max_len*sizeof(*new_dataex)); - if (!new_dataex) - return FALSE; + SYSTEM_LOGICAL_PROCESSOR_INFORMATION *new_data; - *pdataex = new_dataex; - } + *max_len *= 2; + if (!(new_data = realloc( *pdata, *max_len*sizeof(*new_data) ))) return FALSE; + *pdata = new_data; + return TRUE; +} +static BOOL grow_logical_proc_ex_buf( SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX **pdataex, DWORD *max_len ) +{ + SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *new_dataex; + DWORD new_len = *max_len * 2; + if (!(new_dataex = realloc( *pdataex, new_len * sizeof(*new_dataex) ))) return FALSE; + memset( new_dataex + *max_len, 0, (new_len - *max_len) * sizeof(*new_dataex) ); + *pdataex = new_dataex; + *max_len = new_len; return TRUE; } @@ -570,7 +562,7 @@ static BOOL logical_proc_info_add_by_id( SYSTEM_LOGICAL_PROCESSOR_INFORMATION ** while (*len == *pmax_len) { - if (!grow_logical_proc_buf(pdata, NULL, pmax_len)) return FALSE; + if (!grow_logical_proc_buf(pdata, pmax_len)) return FALSE; } (*pdata)[i].Relationship = rel; @@ -606,7 +598,7 @@ static BOOL logical_proc_info_add_by_id( SYSTEM_LOGICAL_PROCESSOR_INFORMATION ** while (ofs + log_proc_ex_size_plus(sizeof(PROCESSOR_RELATIONSHIP)) > *pmax_len) { - if (!grow_logical_proc_buf(NULL, pdataex, pmax_len)) return FALSE; + if (!grow_logical_proc_ex_buf(pdataex, pmax_len)) return FALSE; } dataex = (SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *)(((char *)*pdataex) + ofs); @@ -647,7 +639,7 @@ static BOOL logical_proc_info_add_cache( SYSTEM_LOGICAL_PROCESSOR_INFORMATION ** } while (*len == *pmax_len) - if (!grow_logical_proc_buf(pdata, NULL, pmax_len)) return FALSE; + if (!grow_logical_proc_buf(pdata, pmax_len)) return FALSE; (*pdata)[i].Relationship = RelationCache; (*pdata)[i].ProcessorMask = mask; @@ -670,7 +662,7 @@ static BOOL logical_proc_info_add_cache( SYSTEM_LOGICAL_PROCESSOR_INFORMATION ** while (ofs + log_proc_ex_size_plus(sizeof(CACHE_RELATIONSHIP)) > *pmax_len) { - if (!grow_logical_proc_buf(NULL, pdataex, pmax_len)) return FALSE; + if (!grow_logical_proc_ex_buf(pdataex, pmax_len)) return FALSE; } dataex = (SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *)(((char *)*pdataex) + ofs); @@ -698,7 +690,7 @@ static BOOL logical_proc_info_add_numa_node( SYSTEM_LOGICAL_PROCESSOR_INFORMATIO if (pdata) { while (*len == *pmax_len) - if (!grow_logical_proc_buf(pdata, NULL, pmax_len)) return FALSE; + if (!grow_logical_proc_buf(pdata, pmax_len)) return FALSE; (*pdata)[*len].Relationship = RelationNumaNode; (*pdata)[*len].ProcessorMask = mask; @@ -711,7 +703,7 @@ static BOOL logical_proc_info_add_numa_node( SYSTEM_LOGICAL_PROCESSOR_INFORMATIO while (*len + log_proc_ex_size_plus(sizeof(NUMA_NODE_RELATIONSHIP)) > *pmax_len) { - if (!grow_logical_proc_buf(NULL, pdataex, pmax_len)) return FALSE; + if (!grow_logical_proc_ex_buf(pdataex, pmax_len)) return FALSE; } dataex = (SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *)(((char *)*pdataex) + *len); @@ -734,7 +726,7 @@ static BOOL logical_proc_info_add_group( SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *dataex; while (*len + log_proc_ex_size_plus(sizeof(GROUP_RELATIONSHIP)) > *pmax_len) - if (!grow_logical_proc_buf(NULL, pdataex, pmax_len)) return FALSE; + if (!grow_logical_proc_ex_buf(pdataex, pmax_len)) return FALSE; dataex = (SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *)(((char *)*pdataex) + *len); @@ -2479,27 +2471,23 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, /* Each logical processor may use up to 7 entries in returned table: * core, numa node, package, L1i, L1d, L2, L3 */ len = 7 * NtCurrentTeb()->Peb->NumberOfProcessors; - buf = RtlAllocateHeap(GetProcessHeap(), 0, len * sizeof(*buf)); + buf = malloc( len * sizeof(*buf) ); if (!buf) { ret = STATUS_NO_MEMORY; break; } - ret = create_logical_proc_info(&buf, NULL, &len, RelationAll); - if( ret != STATUS_SUCCESS ) + if (!ret) { - RtlFreeHeap(GetProcessHeap(), 0, buf); - break; - } - - if (size >= len) - { - if (!info) ret = STATUS_ACCESS_VIOLATION; - else memcpy( info, buf, len); + if (size >= len) + { + if (!info) ret = STATUS_ACCESS_VIOLATION; + else memcpy( info, buf, len); + } + else ret = STATUS_INFO_LENGTH_MISMATCH; } - else ret = STATUS_INFO_LENGTH_MISMATCH; - RtlFreeHeap(GetProcessHeap(), 0, buf); + free( buf ); break; } @@ -2600,29 +2588,22 @@ NTSTATUS WINAPI NtQuerySystemInformationEx( SYSTEM_INFORMATION_CLASS class, } len = 3 * sizeof(*buf); - buf = RtlAllocateHeap(GetProcessHeap(), 0, len); - if (!buf) + if (!(buf = malloc( len ))) { ret = STATUS_NO_MEMORY; break; } - ret = create_logical_proc_info(NULL, &buf, &len, *(DWORD *)query); - if (ret != STATUS_SUCCESS) - { - RtlFreeHeap(GetProcessHeap(), 0, buf); - break; - } - - if (size >= len) + if (!ret) { - if (!info) ret = STATUS_ACCESS_VIOLATION; - else memcpy(info, buf, len); + if (size >= len) + { + if (!info) ret = STATUS_ACCESS_VIOLATION; + else memcpy(info, buf, len); + } + else ret = STATUS_INFO_LENGTH_MISMATCH; } - else - ret = STATUS_INFO_LENGTH_MISMATCH; - - RtlFreeHeap(GetProcessHeap(), 0, buf); + free( buf ); break; }

1 0

Alexandre Julliard : ntdll: Use malloc() to allocate the system processor information.
by Alexandre Julliard 14 Jul '20

14 Jul '20

Module: wine Branch: master Commit: 242dc8989a993d1b3807f437fbac7b92707b6e28 URL: https://source.winehq.org/git/wine.git/?a=commit;h=242dc8989a993d1b3807f437… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 14 10:35:14 2020 +0200 ntdll: Use malloc() to allocate the system processor information. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/system.c | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index eedd67fba1..835cf8d134 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -2182,6 +2182,11 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, ret = STATUS_INFO_LENGTH_MISMATCH; break; } + if (!(sppi = calloc( out_cpus, sizeof(*sppi) ))) + { + ret = STATUS_NO_MEMORY; + break; + } else #ifdef __APPLE__ { @@ -2196,8 +2201,6 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, { int i; cpus = min(cpus,out_cpus); - len = sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION) * cpus; - sppi = RtlAllocateHeap(GetProcessHeap(), HEAP_ZERO_MEMORY, len); for (i = 0; i < cpus; i++) { sppi[i].IdleTime.QuadPart = pinfo[i].cpu_ticks[CPU_STATE_IDLE]; @@ -2214,7 +2217,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, { unsigned long clk_tck = sysconf(_SC_CLK_TCK); unsigned long usr,nice,sys,idle,remainder[8]; - int i, count; + int i, count, id; char name[32]; char line[255]; @@ -2230,17 +2233,12 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, for (i = 0; i + 5 < count; ++i) sys += remainder[i]; sys += idle; usr += nice; - cpus = atoi( name + 3 ) + 1; - if (cpus > out_cpus) break; - len = sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION) * cpus; - if (sppi) - sppi = RtlReAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, sppi, len ); - else - sppi = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, len ); - - sppi[cpus-1].IdleTime.QuadPart = (ULONGLONG)idle * 10000000 / clk_tck; - sppi[cpus-1].KernelTime.QuadPart = (ULONGLONG)sys * 10000000 / clk_tck; - sppi[cpus-1].UserTime.QuadPart = (ULONGLONG)usr * 10000000 / clk_tck; + id = atoi( name + 3 ) + 1; + if (id > out_cpus) break; + if (id > cpus) cpus = id; + sppi[id-1].IdleTime.QuadPart = (ULONGLONG)idle * 10000000 / clk_tck; + sppi[id-1].KernelTime.QuadPart = (ULONGLONG)sys * 10000000 / clk_tck; + sppi[id-1].UserTime.QuadPart = (ULONGLONG)usr * 10000000 / clk_tck; } fclose(cpuinfo); } @@ -2251,8 +2249,6 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, static int i = 1; unsigned int n; cpus = min(NtCurrentTeb()->Peb->NumberOfProcessors, out_cpus); - len = sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION) * cpus; - sppi = RtlAllocateHeap(GetProcessHeap(), HEAP_ZERO_MEMORY, len); FIXME("stub info_class SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION\n"); /* many programs expect these values to change so fake change */ for (n = 0; n < cpus; n++) @@ -2264,6 +2260,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, i++; } + len = sizeof(*sppi) * cpus; if (size >= len) { if (!info) ret = STATUS_ACCESS_VIOLATION; @@ -2271,7 +2268,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, } else ret = STATUS_INFO_LENGTH_MISMATCH; - RtlFreeHeap(GetProcessHeap(),0,sppi); + free( sppi ); break; }

1 0

Alexandre Julliard : ntdll: Use malloc() to allocate temporary system information.
by Alexandre Julliard 14 Jul '20

14 Jul '20

Module: wine Branch: master Commit: 20bc32cddc6ca8b1e2577cbc12050804972ca0ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=20bc32cddc6ca8b1e2577cbc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 14 10:35:27 2020 +0200 ntdll: Use malloc() to allocate temporary system information. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/system.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 835cf8d134..c705f5a8d1 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -2073,7 +2073,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, char *buffer = NULL; unsigned int pos = 0; - if (size && !(buffer = RtlAllocateHeap( GetProcessHeap(), 0, size ))) + if (size && !(buffer = malloc( size ))) { ret = STATUS_NO_MEMORY; break; @@ -2090,7 +2090,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, if (ret) { - RtlFreeHeap( GetProcessHeap(), 0, buffer ); + free( buffer ); break; } @@ -2166,7 +2166,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, } if (len > size) ret = STATUS_INFO_LENGTH_MISMATCH; - RtlFreeHeap( GetProcessHeap(), 0, buffer ); + free( buffer ); break; } @@ -2327,8 +2327,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, } num_handles = (size - FIELD_OFFSET( SYSTEM_HANDLE_INFORMATION, Handle )) / sizeof(SYSTEM_HANDLE_ENTRY); - if (!(handle_info = RtlAllocateHeap( GetProcessHeap(), 0, sizeof(*handle_info) * num_handles ))) - return STATUS_NO_MEMORY; + if (!(handle_info = malloc( sizeof(*handle_info) * num_handles ))) return STATUS_NO_MEMORY; SERVER_START_REQ( get_system_handles ) { @@ -2355,7 +2354,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, } SERVER_END_REQ; - RtlFreeHeap( GetProcessHeap(), 0, handle_info ); + free( handle_info ); break; }

1 0