March 2023 - Wine-Commits - list.winehq.org

Paul Gofman : taskkill: Remove unneeded free() before process exit.
by Alexandre Julliard March 29, 2023

March 29, 2023

Module: wine Branch: master Commit: 20ab5f06d0972440a7df7fb1ba390ab1b32f3b1d URL: https://gitlab.winehq.org/wine/wine/-/commit/20ab5f06d0972440a7df7fb1ba390a… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Mar 28 10:12:29 2023 -0600 taskkill: Remove unneeded free() before process exit. --- programs/taskkill/taskkill.c | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/programs/taskkill/taskkill.c b/programs/taskkill/taskkill.c index 44ed4c79119..ad5f8e389f7 100644 --- a/programs/taskkill/taskkill.c +++ b/programs/taskkill/taskkill.c @@ -136,10 +136,7 @@ static DWORD *enumerate_processes(DWORD *list_count) DWORD *realloc_list; if (!EnumProcesses(pid_list, alloc_bytes, &needed_bytes)) - { - free(pid_list); return NULL; - } /* EnumProcesses can't signal an insufficient buffer condition, so the * only way to possibly determine whether a larger buffer is required @@ -152,10 +149,7 @@ static DWORD *enumerate_processes(DWORD *list_count) alloc_bytes *= 2; realloc_list = realloc(pid_list, alloc_bytes); if (!realloc_list) - { - free(pid_list); return NULL; - } pid_list = realloc_list; } @@ -288,7 +282,6 @@ static int send_close_messages(void) } } - free(pid_list); return status_code; } @@ -403,7 +396,6 @@ static int terminate_processes(void) } } - free(pid_list); return status_code; } @@ -515,19 +507,10 @@ static BOOL process_arguments(int argc, WCHAR *argv[]) int __cdecl wmain(int argc, WCHAR *argv[]) { - int status_code = 0; - if (!process_arguments(argc, argv)) - { - free(task_list); return 1; - } if (force_termination) - status_code = terminate_processes(); - else - status_code = send_close_messages(); - - free(task_list); - return status_code; + return terminate_processes(); + return send_close_messages(); }

1 0

Paul Gofman : taskkill: Use CRT allocation functions.
by Alexandre Julliard March 29, 2023

March 29, 2023

Module: wine Branch: master Commit: dd3f3f381f9e761325c7c06236de1241c9605ed6 URL: https://gitlab.winehq.org/wine/wine/-/commit/dd3f3f381f9e761325c7c06236de12… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Mar 28 09:34:12 2023 -0600 taskkill: Use CRT allocation functions. --- programs/taskkill/taskkill.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/programs/taskkill/taskkill.c b/programs/taskkill/taskkill.c index 424e87b9a44..44ed4c79119 100644 --- a/programs/taskkill/taskkill.c +++ b/programs/taskkill/taskkill.c @@ -58,13 +58,13 @@ static int taskkill_vprintfW(const WCHAR *msg, va_list va_args) */ len = WideCharToMultiByte(GetOEMCP(), 0, msg_buffer, wlen, NULL, 0, NULL, NULL); - msgA = HeapAlloc(GetProcessHeap(), 0, len); + msgA = malloc(len); if (!msgA) return 0; WideCharToMultiByte(GetOEMCP(), 0, msg_buffer, wlen, msgA, len, NULL, NULL); WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), msgA, len, &count, FALSE); - HeapFree(GetProcessHeap(), 0, msgA); + free(msgA); } return count; @@ -127,7 +127,7 @@ static DWORD *enumerate_processes(DWORD *list_count) { DWORD *pid_list, alloc_bytes = 1024 * sizeof(*pid_list), needed_bytes; - pid_list = HeapAlloc(GetProcessHeap(), 0, alloc_bytes); + pid_list = malloc(alloc_bytes); if (!pid_list) return NULL; @@ -137,7 +137,7 @@ static DWORD *enumerate_processes(DWORD *list_count) if (!EnumProcesses(pid_list, alloc_bytes, &needed_bytes)) { - HeapFree(GetProcessHeap(), 0, pid_list); + free(pid_list); return NULL; } @@ -150,10 +150,10 @@ static DWORD *enumerate_processes(DWORD *list_count) break; alloc_bytes *= 2; - realloc_list = HeapReAlloc(GetProcessHeap(), 0, pid_list, alloc_bytes); + realloc_list = realloc(pid_list, alloc_bytes); if (!realloc_list) { - HeapFree(GetProcessHeap(), 0, pid_list); + free(pid_list); return NULL; } pid_list = realloc_list; @@ -288,7 +288,7 @@ static int send_close_messages(void) } } - HeapFree(GetProcessHeap(), 0, pid_list); + free(pid_list); return status_code; } @@ -403,7 +403,7 @@ static int terminate_processes(void) } } - HeapFree(GetProcessHeap(), 0, pid_list); + free(pid_list); return status_code; } @@ -413,8 +413,7 @@ static BOOL add_to_task_list(WCHAR *name) if (!task_list) { - task_list = HeapAlloc(GetProcessHeap(), 0, - list_size * sizeof(*task_list)); + task_list = malloc(list_size * sizeof(*task_list)); if (!task_list) return FALSE; } @@ -423,8 +422,7 @@ static BOOL add_to_task_list(WCHAR *name) void *realloc_list; list_size *= 2; - realloc_list = HeapReAlloc(GetProcessHeap(), 0, task_list, - list_size * sizeof(*task_list)); + realloc_list = realloc(task_list, list_size * sizeof(*task_list)); if (!realloc_list) return FALSE; @@ -521,7 +519,7 @@ int __cdecl wmain(int argc, WCHAR *argv[]) if (!process_arguments(argc, argv)) { - HeapFree(GetProcessHeap(), 0, task_list); + free(task_list); return 1; } @@ -530,6 +528,6 @@ int __cdecl wmain(int argc, WCHAR *argv[]) else status_code = send_close_messages(); - HeapFree(GetProcessHeap(), 0, task_list); + free(task_list); return status_code; }

1 0

Michael Stefaniuc : windows.media.speech: Remove redundant NULL check before free().
by Alexandre Julliard March 29, 2023

March 29, 2023

Module: wine Branch: master Commit: 1210b98cd3d8c173d41393c5f46c3f822404065f URL: https://gitlab.winehq.org/wine/wine/-/commit/1210b98cd3d8c173d41393c5f46c3f… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Mar 28 19:28:28 2023 +0200 windows.media.speech: Remove redundant NULL check before free(). --- dlls/windows.media.speech/listconstraint.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windows.media.speech/listconstraint.c b/dlls/windows.media.speech/listconstraint.c index ef0dff0e4d5..555f3b214e1 100644 --- a/dlls/windows.media.speech/listconstraint.c +++ b/dlls/windows.media.speech/listconstraint.c @@ -372,7 +372,7 @@ static HRESULT WINAPI constraint_factory_CreateWithTag( ISpeechRecognitionListCo error: if (impl->commands) IVector_HSTRING_Release(impl->commands); - if (impl) free(impl); + free(impl); return hr; }

1 0

Michael Stefaniuc : msdasql: Remove redundant NULL check before heap_free().
by Alexandre Julliard March 29, 2023

March 29, 2023

Module: wine Branch: master Commit: b7fd8972db36325f00905c05245f57f0c6727ed4 URL: https://gitlab.winehq.org/wine/wine/-/commit/b7fd8972db36325f00905c05245f57… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Mar 28 19:28:05 2023 +0200 msdasql: Remove redundant NULL check before heap_free(). --- dlls/msdasql/session.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index 588be365b72..3e6e5f2a0b3 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -693,8 +693,7 @@ static ULONG WINAPI command_Release(ICommandText *iface) if (!refs) { TRACE( "destroying %p\n", command ); - if (command->properties) - heap_free(command->properties); + heap_free(command->properties); if (command->session) IUnknown_Release(command->session);

1 0

Sven Baars : kernelbase: Factor creating a subkey out of create_key().
by Alexandre Julliard March 28, 2023

March 28, 2023

Module: wine Branch: master Commit: 899b0b82af037191491cc46f8f6cfed7de7d8a6f URL: https://gitlab.winehq.org/wine/wine/-/commit/899b0b82af037191491cc46f8f6cfe… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Thu Mar 23 09:58:06 2023 +0100 kernelbase: Factor creating a subkey out of create_key(). --- dlls/kernelbase/registry.c | 121 ++++++++++++++++++++++++++------------------- 1 file changed, 71 insertions(+), 50 deletions(-) diff --git a/dlls/kernelbase/registry.c b/dlls/kernelbase/registry.c index 9fd1abceabb..f9e647a026a 100644 --- a/dlls/kernelbase/registry.c +++ b/dlls/kernelbase/registry.c @@ -227,25 +227,76 @@ static NTSTATUS open_key( HKEY *retkey, HKEY root, UNICODE_STRING *name, DWORD o return status; } -/* wrapper for NtCreateKey that creates the key recursively if necessary */ -static NTSTATUS create_key( HKEY *retkey, HKEY root, UNICODE_STRING name, ULONG options, ACCESS_MASK access, - const UNICODE_STRING *class, PULONG dispos ) +static NTSTATUS create_subkey( HKEY *subkey, HKEY root, UNICODE_STRING *name, DWORD options, ACCESS_MASK access, + const UNICODE_STRING *class, PULONG dispos ) { - BOOL force_wow32 = is_win64 && (access & KEY_WOW64_32KEY); - NTSTATUS status = STATUS_OBJECT_NAME_NOT_FOUND; + DWORD i = 0, len = name->Length / sizeof(WCHAR); + WCHAR *buffer = name->Buffer; OBJECT_ATTRIBUTES attr; - HKEY subkey; + UNICODE_STRING str; + NTSTATUS status; attr.Length = sizeof(attr); attr.RootDirectory = root; - attr.ObjectName = &name; + attr.ObjectName = &str; attr.Attributes = 0; attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - if (options & REG_OPTION_OPEN_LINK) attr.Attributes |= OBJ_OPENLINK; - if (!force_wow32) + if (i < len && buffer[i] == '\\') return STATUS_OBJECT_PATH_INVALID; + while (i < len && buffer[i] != '\\') i++; + + str.Buffer = name->Buffer; + str.Length = i * sizeof(WCHAR); + + if (i == len) + { + if (options & REG_OPTION_OPEN_LINK) attr.Attributes |= OBJ_OPENLINK; + } + else + { + options &= ~REG_OPTION_CREATE_LINK; + } + + status = NtCreateKey( (HANDLE *)subkey, access, &attr, 0, class, options, dispos ); + if (status == STATUS_PREDEFINED_HANDLE) + { + *subkey = get_perflib_key( *subkey ); + status = STATUS_SUCCESS; + } + + if (!status) + { + while (i < len && buffer[i] == '\\') i++; + + name->Buffer += i; + name->Length -= i * sizeof(WCHAR); + } + + return status; +} + +/* wrapper for NtCreateKey that creates the key recursively if necessary */ +static NTSTATUS create_key( HKEY *retkey, HKEY root, UNICODE_STRING name, ULONG options, ACCESS_MASK access, + const UNICODE_STRING *class, PULONG dispos ) +{ + NTSTATUS status = STATUS_OBJECT_NAME_NOT_FOUND; + HKEY subkey, subkey_root = root; + + *retkey = NULL; + + if (!(is_win64 && (access & KEY_WOW64_32KEY))) { + OBJECT_ATTRIBUTES attr; + + attr.Length = sizeof(attr); + attr.RootDirectory = root; + attr.ObjectName = &name; + attr.Attributes = 0; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + if (options & REG_OPTION_OPEN_LINK) attr.Attributes |= OBJ_OPENLINK; + status = NtCreateKey( (HANDLE *)retkey, access, &attr, 0, class, options, dispos ); if (status == STATUS_PREDEFINED_HANDLE) { @@ -257,60 +308,30 @@ static NTSTATUS create_key( HKEY *retkey, HKEY root, UNICODE_STRING name, ULONG return status; } - status = open_key( &subkey, root, &name, options & REG_OPTION_OPEN_LINK, access, TRUE ); + status = open_key( &subkey_root, root, &name, options & REG_OPTION_OPEN_LINK, access, TRUE ); if (!status && (options & REG_OPTION_CREATE_LINK)) { - NtClose( subkey ); + NtClose( subkey_root ); status = STATUS_OBJECT_NAME_COLLISION; } if (!status) if (dispos) *dispos = REG_OPENED_EXISTING_KEY; - attr.RootDirectory = subkey; if (status == STATUS_OBJECT_NAME_NOT_FOUND) { - DWORD attrs, i, len = name.Length / sizeof(WCHAR); - WCHAR *buffer = name.Buffer; - - attrs = attr.Attributes; - - while (len) + status = STATUS_SUCCESS; + while (!status && name.Length) { - i = 0; - - /* don't try to create registry root */ - if (!attr.RootDirectory && len > 10 && !wcsnicmp( buffer, L"\\Registry\\", 10 )) i += 10; - while (i < len && buffer[i] != '\\') i++; - - name.Buffer = buffer; - name.Length = i * sizeof(WCHAR); - - if (i == len) - { - attr.Attributes = attrs; - status = NtCreateKey( (HANDLE *)&subkey, access, &attr, 0, class, options, dispos ); - } - else - { - attr.Attributes = attrs & ~OBJ_OPENLINK; - status = NtCreateKey( (HANDLE *)&subkey, access, &attr, 0, class, - options & ~REG_OPTION_CREATE_LINK, dispos ); - } - if (attr.RootDirectory != root) NtClose( attr.RootDirectory ); - if (!NT_SUCCESS(status)) return status; - attr.RootDirectory = subkey; - while (i < len && buffer[i] == '\\') i++; - buffer += i; - len -= i; + status = create_subkey( &subkey, subkey_root, &name, options, access, class, dispos ); + if (subkey_root && subkey_root != root) NtClose( subkey_root ); + subkey_root = subkey; } } - if (status == STATUS_PREDEFINED_HANDLE) - { - attr.RootDirectory = get_perflib_key( attr.RootDirectory ); - status = STATUS_SUCCESS; - } - *retkey = attr.RootDirectory; + + if (!status) + *retkey = subkey_root; + return status; }

1 0

Sven Baars : kernelbase: Add support for shared registry keys.
by Alexandre Julliard March 28, 2023

March 28, 2023

Module: wine Branch: master Commit: 63c6b8931423472328a2a883276552a61fddf61d URL: https://gitlab.winehq.org/wine/wine/-/commit/63c6b8931423472328a2a883276552… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Tue Nov 8 15:28:45 2022 +0100 kernelbase: Add support for shared registry keys. --- dlls/advapi32/tests/registry.c | 132 ++++++++++++++++++++--------------------- dlls/kernelbase/registry.c | 111 ++++++++++++++++++++++++++++++++-- 2 files changed, 171 insertions(+), 72 deletions(-)

1 0

Sven Baars : kernelbase: Recursively obtain the Wow6432Node parent.
by Alexandre Julliard March 28, 2023

March 28, 2023

Module: wine Branch: master Commit: da0ec7fbbde45126320e15b2bfb00b357b45ffb6 URL: https://gitlab.winehq.org/wine/wine/-/commit/da0ec7fbbde45126320e15b2bfb00b… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Wed Nov 23 12:45:51 2022 +0100 kernelbase: Recursively obtain the Wow6432Node parent. --- dlls/advapi32/tests/registry.c | 60 ++++++++++++++++-------------------------- dlls/kernelbase/registry.c | 49 +++++++++++++++++++++++++++++++++- 2 files changed, 71 insertions(+), 38 deletions(-)

1 0

Sven Baars : kernelbase: Don't open Wow6432nodes from create_key().
by Alexandre Julliard March 28, 2023

March 28, 2023

Module: wine Branch: master Commit: 3609508c2fff93b2736dbb519fef37924d25f674 URL: https://gitlab.winehq.org/wine/wine/-/commit/3609508c2fff93b2736dbb519fef37… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Fri Mar 17 17:14:37 2023 +0100 kernelbase: Don't open Wow6432nodes from create_key(). These can never exist in a newly created key. --- dlls/kernelbase/registry.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/dlls/kernelbase/registry.c b/dlls/kernelbase/registry.c index 63855eeb555..9fd1abceabb 100644 --- a/dlls/kernelbase/registry.c +++ b/dlls/kernelbase/registry.c @@ -303,19 +303,6 @@ static NTSTATUS create_key( HKEY *retkey, HKEY root, UNICODE_STRING name, ULONG while (i < len && buffer[i] == '\\') i++; buffer += i; len -= i; - - if (force_wow32) - { - name.Buffer = buffer; - name.Length = len * sizeof(WCHAR); - if (is_wow6432node( &name )) force_wow32 = FALSE; - else if ((subkey = open_wow6432node( attr.RootDirectory ))) - { - NtClose( attr.RootDirectory ); - attr.RootDirectory = subkey; - force_wow32 = FALSE; - } - } } } if (status == STATUS_PREDEFINED_HANDLE)

1 0

Sven Baars : kernelbase: Call create_key() from create_subkey().
by Alexandre Julliard March 28, 2023

March 28, 2023

Module: wine Branch: master Commit: 3bbd37d0bbf047218e48b5e3b54b6e5df94caa90 URL: https://gitlab.winehq.org/wine/wine/-/commit/3bbd37d0bbf047218e48b5e3b54b6e… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Fri Mar 17 17:30:23 2023 +0100 kernelbase: Call create_key() from create_subkey(). --- dlls/kernelbase/registry.c | 28 ++++++---------------------- 1 file changed, 6 insertions(+), 22 deletions(-) diff --git a/dlls/kernelbase/registry.c b/dlls/kernelbase/registry.c index f9e647a026a..a69a87ebb3d 100644 --- a/dlls/kernelbase/registry.c +++ b/dlls/kernelbase/registry.c @@ -227,44 +227,28 @@ static NTSTATUS open_key( HKEY *retkey, HKEY root, UNICODE_STRING *name, DWORD o return status; } +static NTSTATUS create_key( HKEY *retkey, HKEY root, UNICODE_STRING name, ULONG options, ACCESS_MASK access, + const UNICODE_STRING *class, PULONG dispos ); + static NTSTATUS create_subkey( HKEY *subkey, HKEY root, UNICODE_STRING *name, DWORD options, ACCESS_MASK access, const UNICODE_STRING *class, PULONG dispos ) { + ACCESS_MASK access_64 = access & ~KEY_WOW64_32KEY; DWORD i = 0, len = name->Length / sizeof(WCHAR); WCHAR *buffer = name->Buffer; - OBJECT_ATTRIBUTES attr; UNICODE_STRING str; NTSTATUS status; - attr.Length = sizeof(attr); - attr.RootDirectory = root; - attr.ObjectName = &str; - attr.Attributes = 0; - attr.SecurityDescriptor = NULL; - attr.SecurityQualityOfService = NULL; - if (i < len && buffer[i] == '\\') return STATUS_OBJECT_PATH_INVALID; while (i < len && buffer[i] != '\\') i++; str.Buffer = name->Buffer; str.Length = i * sizeof(WCHAR); - if (i == len) - { - if (options & REG_OPTION_OPEN_LINK) attr.Attributes |= OBJ_OPENLINK; - } - else - { + if (i < len) options &= ~REG_OPTION_CREATE_LINK; - } - - status = NtCreateKey( (HANDLE *)subkey, access, &attr, 0, class, options, dispos ); - if (status == STATUS_PREDEFINED_HANDLE) - { - *subkey = get_perflib_key( *subkey ); - status = STATUS_SUCCESS; - } + status = create_key( subkey, root, str, options, access_64, class, dispos ); if (!status) { while (i < len && buffer[i] == '\\') i++;

1 0

Piotr Caban : wineps: Handle EMR_SETVIEWPORTEXTEX in spool files.
by Alexandre Julliard March 28, 2023

March 28, 2023

Module: wine Branch: master Commit: a18178dd293a3345632484ac6087c7f315d2038b URL: https://gitlab.winehq.org/wine/wine/-/commit/a18178dd293a3345632484ac6087c7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 28 11:56:45 2023 +0200 wineps: Handle EMR_SETVIEWPORTEXTEX in spool files. --- dlls/wineps.drv/printproc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 49d2a401e23..fd0d3cd2e90 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -515,6 +515,7 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, case EMR_SETWINDOWEXTEX: case EMR_SETWINDOWORGEX: + case EMR_SETVIEWPORTEXTEX: case EMR_MOVETOEX: case EMR_SETWORLDTRANSFORM: case EMR_MODIFYWORLDTRANSFORM:

1 0