- Wine-Commits - list.winehq.org

Mohamad Al-Jaf : dbghelp: Add SymAddrIncludeInlineTrace stub.
by Alexandre Julliard Nov. 18, 2022

Nov. 18, 2022

Module: wine Branch: master Commit: 51c81714f264ca657117fd115694b0e9f4893eb7 URL: https://gitlab.winehq.org/wine/wine/-/commit/51c81714f264ca657117fd115694b0… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Fri Nov 18 08:59:10 2022 +0100 dbghelp: Add SymAddrIncludeInlineTrace stub. Football Manager 2023 Editor calls this function. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- dlls/dbghelp/dbghelp.spec | 2 +- dlls/dbghelp/symbol.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/dbghelp/dbghelp.spec b/dlls/dbghelp/dbghelp.spec index 754fb456611..336a6f7aefd 100644 --- a/dlls/dbghelp/dbghelp.spec +++ b/dlls/dbghelp/dbghelp.spec @@ -38,7 +38,7 @@ @ stub SymAddSourceStreamW @ stdcall SymAddSymbol(ptr int64 str int64 long long) @ stdcall SymAddSymbolW(ptr int64 wstr int64 long long) -@ stub SymAddrIncludeInlineTrace +@ stdcall SymAddrIncludeInlineTrace(long int64) @ stdcall SymCleanup(long) @ stub SymCompareInlineTrace @ stub SymDeleteSymbol diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 18699e47984..514991af386 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -2794,6 +2794,16 @@ BOOL WINAPI SymGetLineFromInlineContextW(HANDLE hProcess, DWORD64 addr, ULONG in return internal_line_copy_toW64(&intl, line); } +/****************************************************************** + * SymAddrIncludeInlineTrace (DBGHELP.@) + * + */ +DWORD WINAPI SymAddrIncludeInlineTrace(HANDLE hProcess, DWORD64 addr) +{ + FIXME("(%p, %I64x): stub\n", hProcess, addr); + return 0; +} + /****************************************************************** * SymSrvGetFileIndexInfo (DBGHELP.@) *

1 0

Eric Pouech : dbghelp: Implement SymAddrIncludeInlineTrace().
by Alexandre Julliard Nov. 18, 2022

Nov. 18, 2022

Module: wine Branch: master Commit: c99bafb7750badb0013581f13bc5bd560d9b332e URL: https://gitlab.winehq.org/wine/wine/-/commit/c99bafb7750badb0013581f13bc5bd… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Nov 18 08:59:11 2022 +0100 dbghelp: Implement SymAddrIncludeInlineTrace(). Replacing symt_get_inlinesite_depth() with SymAddrIncludeInlineTrace() as they look very (very) similar. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/dbghelp_private.h | 1 - dlls/dbghelp/stack.c | 4 ++-- dlls/dbghelp/symbol.c | 45 +++++++++++++++++++++--------------------- 3 files changed, 24 insertions(+), 26 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 22e9eec8805..177032d0ff4 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -953,7 +953,6 @@ static inline struct symt_function* extern struct symt_function* symt_find_inlined_site(struct module* module, DWORD64 addr, DWORD inline_ctx) DECLSPEC_HIDDEN; -extern DWORD symt_get_inlinesite_depth(HANDLE hProcess, DWORD64 addr) DECLSPEC_HIDDEN; /* Inline context encoding (different from what native does): * bits 31:30: 3 ignore (includes INLINE_FRAME_CONTEXT_IGNORE=0xFFFFFFFF) diff --git a/dlls/dbghelp/stack.c b/dlls/dbghelp/stack.c index 97bd885dcc7..8b573feee77 100644 --- a/dlls/dbghelp/stack.c +++ b/dlls/dbghelp/stack.c @@ -312,7 +312,7 @@ BOOL WINAPI StackWalkEx(DWORD MachineType, HANDLE hProcess, HANDLE hThread, if (IFC_MODE(frame->InlineFrameContext) == IFC_MODE_INLINE) { - DWORD depth = symt_get_inlinesite_depth(hProcess, addr); + DWORD depth = SymAddrIncludeInlineTrace(hProcess, addr); if (IFC_DEPTH(frame->InlineFrameContext) + 1 < depth) /* move to next inlined function? */ { TRACE("found inline ctx: depth=%lu current=%lu++\n", @@ -330,7 +330,7 @@ BOOL WINAPI StackWalkEx(DWORD MachineType, HANDLE hProcess, HANDLE hThread, if (frame->InlineFrameContext != INLINE_FRAME_CONTEXT_IGNORE) { addr = sw_xlat_addr(&csw, &frame->AddrPC); - frame->InlineFrameContext = symt_get_inlinesite_depth(hProcess, addr) == 0 ? IFC_MODE_REGULAR : IFC_MODE_INLINE; + frame->InlineFrameContext = SymAddrIncludeInlineTrace(hProcess, addr) == 0 ? IFC_MODE_REGULAR : IFC_MODE_INLINE; TRACE("setting IFC mode to %lx\n", frame->InlineFrameContext); } } diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 514991af386..72634443cb7 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -1265,27 +1265,6 @@ struct symt_function* symt_find_inlined_site(struct module* module, DWORD64 addr return NULL; } -DWORD symt_get_inlinesite_depth(HANDLE hProcess, DWORD64 addr) -{ - struct module_pair pair; - DWORD depth = 0; - - if (module_init_pair(&pair, hProcess, addr)) - { - struct symt_ht* symt = symt_find_symbol_at(pair.effective, addr); - if (symt_check_tag(&symt->symt, SymTagFunction)) - { - struct symt_function* inlined = symt_find_lowest_inlined((struct symt_function*)symt, addr); - if (inlined) - { - for ( ; &inlined->symt != &symt->symt; inlined = (struct symt_function*)symt_get_upper_inlined(inlined)) - ++depth; - } - } - } - return depth; -} - /****************************************************************** * sym_enum * @@ -2797,11 +2776,31 @@ BOOL WINAPI SymGetLineFromInlineContextW(HANDLE hProcess, DWORD64 addr, ULONG in /****************************************************************** * SymAddrIncludeInlineTrace (DBGHELP.@) * + * MSDN doesn't state that the maximum depth (of embedded inline sites) at <addr> + * is actually returned. (It just says non zero means that there are some inline site(s)). + * But this is what native actually returns. */ DWORD WINAPI SymAddrIncludeInlineTrace(HANDLE hProcess, DWORD64 addr) { - FIXME("(%p, %I64x): stub\n", hProcess, addr); - return 0; + struct module_pair pair; + DWORD depth = 0; + + TRACE("(%p, %#I64x)\n", hProcess, addr); + + if (module_init_pair(&pair, hProcess, addr)) + { + struct symt_ht* symt = symt_find_symbol_at(pair.effective, addr); + if (symt_check_tag(&symt->symt, SymTagFunction)) + { + struct symt_function* inlined = symt_find_lowest_inlined((struct symt_function*)symt, addr); + if (inlined) + { + for ( ; &inlined->symt != &symt->symt; inlined = (struct symt_function*)symt_get_upper_inlined(inlined)) + ++depth; + } + } + } + return depth; } /******************************************************************

1 0

Jacek Caban : winevulkan: Introduce find_next_struct32.
by Alexandre Julliard Nov. 18, 2022

Nov. 18, 2022

Module: wine Branch: master Commit: 3a5155a9d1d351ca3ddbf13984485e69e218769d URL: https://gitlab.winehq.org/wine/wine/-/commit/3a5155a9d1d351ca3ddbf13984485e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Nov 12 01:33:24 2022 +0100 winevulkan: Introduce find_next_struct32. --- dlls/winevulkan/make_vulkan | 21 +- dlls/winevulkan/vulkan_private.h | 27 ++ dlls/winevulkan/vulkan_thunks.c | 778 +++++++++++++++++++-------------------- 3 files changed, 434 insertions(+), 392 deletions(-)

1 0

Eric Pouech : dbghelp: Add partial implementation of SymQueryInlineTrace.
by Alexandre Julliard Nov. 18, 2022

Nov. 18, 2022

Module: wine Branch: master Commit: b6205f57faf0d4c9a09e83c3ca031103dbe8ec62 URL: https://gitlab.winehq.org/wine/wine/-/commit/b6205f57faf0d4c9a09e83c3ca0311… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Nov 18 08:59:13 2022 +0100 dbghelp: Add partial implementation of SymQueryInlineTrace. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/dbghelp.spec | 2 +- dlls/dbghelp/symbol.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 1 deletion(-) diff --git a/dlls/dbghelp/dbghelp.spec b/dlls/dbghelp/dbghelp.spec index 336a6f7aefd..fc2218f636b 100644 --- a/dlls/dbghelp/dbghelp.spec +++ b/dlls/dbghelp/dbghelp.spec @@ -153,7 +153,7 @@ @ stub SymNextW @ stub SymPrev @ stub SymPrevW -@ stub SymQueryInlineTrace +@ stdcall SymQueryInlineTrace(long int64 long int64 int64 ptr ptr) @ stdcall SymRefreshModuleList(long) @ stdcall SymRegisterCallback(long ptr ptr) @ stdcall SymRegisterCallback64(long ptr int64) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 72634443cb7..e3352761c53 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -2803,6 +2803,55 @@ DWORD WINAPI SymAddrIncludeInlineTrace(HANDLE hProcess, DWORD64 addr) return depth; } +/****************************************************************** + * SymQueryInlineTrace (DBGHELP.@) + * + */ +BOOL WINAPI SymQueryInlineTrace(HANDLE hProcess, DWORD64 StartAddress, DWORD StartContext, + DWORD64 StartRetAddress, DWORD64 CurAddress, + LPDWORD CurContext, LPDWORD CurFrameIndex) +{ + struct module_pair pair; + struct symt_ht* sym_curr; + struct symt_ht* sym_start; + struct symt_ht* sym_startret; + DWORD depth; + + TRACE("(%p, %#I64x, 0x%lx, %#I64x, %I64x, %p, %p)\n", + hProcess, StartAddress, StartContext, StartRetAddress, CurAddress, CurContext, CurFrameIndex); + + if (!module_init_pair(&pair, hProcess, CurAddress)) return FALSE; + if (!(sym_curr = symt_find_symbol_at(pair.effective, CurAddress))) return FALSE; + if (!symt_check_tag(&sym_curr->symt, SymTagFunction)) return FALSE; + + sym_start = symt_find_symbol_at(pair.effective, StartAddress); + sym_startret = symt_find_symbol_at(pair.effective, StartRetAddress); + if (sym_start != sym_curr && sym_startret != sym_curr) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + if (sym_start != sym_curr || StartContext) + { + FIXME("(%p, %#I64x, 0x%lx, %#I64x, %I64x, %p, %p): semi-stub\n", + hProcess, StartAddress, StartContext, StartRetAddress, CurAddress, CurContext, CurFrameIndex); + return ERROR_CALL_NOT_IMPLEMENTED; + } + + depth = SymAddrIncludeInlineTrace(hProcess, CurAddress); + if (depth) + { + *CurContext = IFC_MODE_INLINE; /* deepest inline site */ + *CurFrameIndex = depth; + } + else + { + *CurContext = IFC_MODE_REGULAR; + *CurFrameIndex = 0; + } + return TRUE; +} + /****************************************************************** * SymSrvGetFileIndexInfo (DBGHELP.@) *

1 0

Alex Henrie : spoolss: Use standard C functions for memory allocation in router.c.
by Alexandre Julliard Nov. 18, 2022

Nov. 18, 2022

Module: wine Branch: master Commit: 01dae0013c647832aa23c8d5f22e037d97fb0265 URL: https://gitlab.winehq.org/wine/wine/-/commit/01dae0013c647832aa23c8d5f22e03… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 17 22:04:44 2022 -0700 spoolss: Use standard C functions for memory allocation in router.c. --- dlls/spoolss/router.c | 45 +++++++++++++-------------------------------- 1 file changed, 13 insertions(+), 32 deletions(-) diff --git a/dlls/spoolss/router.c b/dlls/spoolss/router.c index 4930a7eb18d..4d6d7c43559 100644 --- a/dlls/spoolss/router.c +++ b/dlls/spoolss/router.c @@ -19,6 +19,7 @@ */ #include <stdarg.h> +#include <stdlib.h> #include "windef.h" #include "winbase.h" @@ -31,7 +32,6 @@ #include "spoolss.h" #include "wine/debug.h" -#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(spoolss); @@ -153,25 +153,6 @@ static CRITICAL_SECTION backend_cs = { &backend_cs_debug, -1, 0, 0, 0, 0 }; static WCHAR localsplW[] = L"localspl.dll"; -/****************************************************************** - * strdupW [internal] - * - * create a copy of a unicode-string - * - */ - -static LPWSTR strdupW(LPCWSTR p) -{ - LPWSTR ret; - DWORD len; - - if(!p) return NULL; - len = (lstrlenW(p) + 1) * sizeof(WCHAR); - ret = heap_alloc(len); - memcpy(ret, p, len); - return ret; -} - /****************************************************************** * backend_unload_all [internal] * @@ -183,10 +164,10 @@ void backend_unload_all(void) while (used_backends > 0) { used_backends--; FreeLibrary(backend[used_backends]->dll); - heap_free(backend[used_backends]->dllname); - heap_free(backend[used_backends]->name); - heap_free(backend[used_backends]->regroot); - heap_free(backend[used_backends]); + free(backend[used_backends]->dllname); + free(backend[used_backends]->name); + free(backend[used_backends]->regroot); + free(backend[used_backends]); backend[used_backends] = NULL; } LeaveCriticalSection(&backend_cs); @@ -217,15 +198,15 @@ static backend_t * backend_load(LPWSTR dllname, LPWSTR name, LPWSTR regroot) EnterCriticalSection(&backend_cs); id = used_backends; - backend[id] = heap_alloc_zero(sizeof(backend_t)); + backend[id] = calloc(1, sizeof(backend_t)); if (!backend[id]) { LeaveCriticalSection(&backend_cs); return NULL; } - backend[id]->dllname = strdupW(dllname); - backend[id]->name = strdupW(name); - backend[id]->regroot = strdupW(regroot); + backend[id]->dllname = wcsdup(dllname); + backend[id]->name = wcsdup(name); + backend[id]->regroot = wcsdup(regroot); backend[id]->dll = LoadLibraryW(dllname); if (backend[id]->dll) { @@ -244,10 +225,10 @@ static backend_t * backend_load(LPWSTR dllname, LPWSTR name, LPWSTR regroot) } FreeLibrary(backend[id]->dll); } - heap_free(backend[id]->dllname); - heap_free(backend[id]->name); - heap_free(backend[id]->regroot); - heap_free(backend[id]); + free(backend[id]->dllname); + free(backend[id]->name); + free(backend[id]->regroot); + free(backend[id]); backend[id] = NULL; LeaveCriticalSection(&backend_cs); WARN("failed to init %s: %lu\n", debugstr_w(dllname), GetLastError());

1 0

Nikolay Sivov : ntdll: Do not set system locales that resolve to custom-unspecified.
by Alexandre Julliard Nov. 18, 2022

Nov. 18, 2022

Module: wine Branch: master Commit: 57f251d05099eab9e69ffc5af9e218e9d7d571f1 URL: https://gitlab.winehq.org/wine/wine/-/commit/57f251d05099eab9e69ffc5af9e218… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 17 18:35:08 2022 +0300 ntdll: Do not set system locales that resolve to custom-unspecified. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ntdll/locale.c | 14 ++++---------- dlls/ntdll/unix/env.c | 2 +- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index 105de1feec4..73c0c2c5520 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -94,6 +94,7 @@ invalid: void locale_init(void) { + const NLS_LOCALE_LCID_INDEX *entry; USHORT utf8[2] = { 0, CP_UTF8 }; WCHAR locale[LOCALE_NAME_MAX_LENGTH]; LARGE_INTEGER unused; @@ -112,16 +113,9 @@ void locale_init(void) locale_table = (const NLS_LOCALE_HEADER *)((char *)header + header->locales); locale_strings = (const WCHAR *)((char *)locale_table + locale_table->strings_offset); - if (system_lcid == LOCALE_CUSTOM_UNSPECIFIED) - { - ansi_cp = oem_cp = CP_UTF8; - } - else - { - const NLS_LOCALE_LCID_INDEX *entry = find_lcid_entry( locale_table, system_lcid ); - ansi_cp = get_locale_data( locale_table, entry->idx )->idefaultansicodepage; - oem_cp = get_locale_data( locale_table, entry->idx )->idefaultcodepage; - } + entry = find_lcid_entry( locale_table, system_lcid ); + ansi_cp = get_locale_data( locale_table, entry->idx )->idefaultansicodepage; + oem_cp = get_locale_data( locale_table, entry->idx )->idefaultcodepage; NtQueryDefaultLocale( TRUE, &user_resource_lcid ); user_resource_neutral_lcid = PRIMARYLANGID( user_resource_lcid ); diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 062da7600b1..ad5a7c412d6 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -859,7 +859,7 @@ static void init_locale(void) if ((header = read_nls_file( "locale.nls" ))) { locale_table = (const NLS_LOCALE_HEADER *)((char *)header + header->locales); - if ((locale = get_win_locale( locale_table, system_locale ))) + if ((locale = get_win_locale( locale_table, system_locale )) && locale->idefaultlanguage != LOCALE_CUSTOM_UNSPECIFIED) system_lcid = locale->idefaultlanguage; if ((locale = get_win_locale( locale_table, user_locale ))) user_lcid = locale->idefaultlanguage;

1 0

Alex Henrie : schedsvc: Use standard C functions for memory allocation in schedsvc.c.
by Alexandre Julliard Nov. 18, 2022

Nov. 18, 2022

Module: wine Branch: master Commit: baa8b11b4d563eb8e567ca9b5b8b4882aa96aeec URL: https://gitlab.winehq.org/wine/wine/-/commit/baa8b11b4d563eb8e567ca9b5b8b48… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 17 21:57:09 2022 -0700 schedsvc: Use standard C functions for memory allocation in schedsvc.c. --- dlls/schedsvc/schedsvc.c | 60 ++++++++++++++++++++++++------------------------ 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/dlls/schedsvc/schedsvc.c b/dlls/schedsvc/schedsvc.c index ba6da110fe5..c670c8b1cbb 100644 --- a/dlls/schedsvc/schedsvc.c +++ b/dlls/schedsvc/schedsvc.c @@ -58,7 +58,7 @@ static WCHAR *get_full_name(const WCHAR *path, WCHAR **relative_path) len = GetSystemDirectoryW(NULL, 0); len += lstrlenW(tasksW) + lstrlenW(path); - target = heap_alloc(len * sizeof(WCHAR)); + target = malloc(len * sizeof(WCHAR)); if (target) { GetSystemDirectoryW(target, len); @@ -80,7 +80,7 @@ static HRESULT create_directory(const WCHAR *path) WCHAR *new_path; int len; - new_path = heap_alloc((lstrlenW(path) + 1) * sizeof(WCHAR)); + new_path = malloc((lstrlenW(path) + 1) * sizeof(WCHAR)); if (!new_path) return E_OUTOFMEMORY; lstrcpyW(new_path, path); @@ -110,7 +110,7 @@ static HRESULT create_directory(const WCHAR *path) new_path[len] = '\\'; } - heap_free(new_path); + free(new_path); return hr; } @@ -132,7 +132,7 @@ static HRESULT write_xml_utf8(const WCHAR *name, DWORD disposition, const WCHAR } size = WideCharToMultiByte(CP_UTF8, 0, xmlW, -1, NULL, 0, NULL, NULL); - xml = heap_alloc(size); + xml = malloc(size); if (!xml) { CloseHandle(hfile); @@ -167,7 +167,7 @@ static HRESULT write_xml_utf8(const WCHAR *name, DWORD disposition, const WCHAR } failed: - heap_free(xml); + free(xml); CloseHandle(hfile); return hr; } @@ -202,7 +202,7 @@ HRESULT __cdecl SchRpcRegisterTask(const WCHAR *path, const WCHAR *xml, DWORD fl hr = create_directory(full_name); if (hr != S_OK && hr != HRESULT_FROM_WIN32(ERROR_ALREADY_EXISTS)) { - heap_free(full_name); + free(full_name); return hr; } *p = '\\'; @@ -241,11 +241,11 @@ HRESULT __cdecl SchRpcRegisterTask(const WCHAR *path, const WCHAR *xml, DWORD fl hr = write_xml_utf8(full_name, disposition, xml); if (hr == S_OK) { - *actual_path = heap_strdupW(relative_path); + *actual_path = wcsdup(relative_path); schedsvc_auto_start(); } - heap_free(full_name); + free(full_name); return hr; } @@ -286,7 +286,7 @@ static HRESULT read_xml(const WCHAR *name, WCHAR **xml) return HRESULT_FROM_WIN32(GetLastError()); size = GetFileSize(hfile, NULL); - buff = src = heap_alloc(size + 2); + buff = src = malloc(size + 2); if (!src) { CloseHandle(hfile); @@ -310,12 +310,12 @@ static HRESULT read_xml(const WCHAR *name, WCHAR **xml) src += sizeof(bom_utf8); size = MultiByteToWideChar(cp, 0, src, -1, NULL, 0); - *xml = heap_alloc(size * sizeof(WCHAR)); + *xml = malloc(size * sizeof(WCHAR)); if (*xml) MultiByteToWideChar(cp, 0, src, -1, *xml, size); else hr = E_OUTOFMEMORY; - heap_free(buff); + free(buff); return hr; } @@ -539,7 +539,7 @@ HRESULT __cdecl SchRpcRetrieveTask(const WCHAR *path, const WCHAR *languages, UL hr = read_xml(full_name, xml); if (hr != S_OK) *xml = NULL; - heap_free(full_name); + free(full_name); return hr; } @@ -557,7 +557,7 @@ HRESULT __cdecl SchRpcCreateFolder(const WCHAR *path, const WCHAR *sddl, DWORD f hr = create_directory(full_name); - heap_free(full_name); + free(full_name); return hr; } @@ -578,9 +578,9 @@ static void free_list(TASK_NAMES list, LONG count) LONG i; for (i = 0; i < count; i++) - heap_free(list[i]); + free(list[i]); - heap_free(list); + free(list); } static inline BOOL is_directory(const WIN32_FIND_DATAW *data) @@ -628,17 +628,17 @@ HRESULT __cdecl SchRpcEnumFolders(const WCHAR *path, DWORD flags, DWORD *start_i if (lstrlenW(full_name) + 2 > MAX_PATH) { - heap_free(full_name); + free(full_name); return HRESULT_FROM_WIN32(ERROR_FILENAME_EXCED_RANGE); } lstrcpyW(pathW, full_name); lstrcatW(pathW, allW); - heap_free(full_name); + free(full_name); allocated = 64; - list = heap_alloc(allocated * sizeof(list[0])); + list = malloc(allocated * sizeof(list[0])); if (!list) return E_OUTOFMEMORY; index = count = 0; @@ -646,7 +646,7 @@ HRESULT __cdecl SchRpcEnumFolders(const WCHAR *path, DWORD flags, DWORD *start_i handle = FindFirstFileW(pathW, &data); if (handle == INVALID_HANDLE_VALUE) { - heap_free(list); + free(list); if (GetLastError() == ERROR_PATH_NOT_FOUND) return HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); return HRESULT_FROM_WIN32(GetLastError()); @@ -671,7 +671,7 @@ HRESULT __cdecl SchRpcEnumFolders(const WCHAR *path, DWORD flags, DWORD *start_i TRACE("adding %s\n", debugstr_w(data.cFileName)); - list[count] = heap_strdupW(data.cFileName); + list[count] = wcsdup(data.cFileName); if (!list[count]) { hr = E_OUTOFMEMORY; @@ -705,7 +705,7 @@ HRESULT __cdecl SchRpcEnumFolders(const WCHAR *path, DWORD flags, DWORD *start_i return hr; } - heap_free(list); + free(list); *names = NULL; return *start_index ? S_FALSE : S_OK; } @@ -736,17 +736,17 @@ HRESULT __cdecl SchRpcEnumTasks(const WCHAR *path, DWORD flags, DWORD *start_ind if (lstrlenW(full_name) + 2 > MAX_PATH) { - heap_free(full_name); + free(full_name); return HRESULT_FROM_WIN32(ERROR_FILENAME_EXCED_RANGE); } lstrcpyW(pathW, full_name); lstrcatW(pathW, allW); - heap_free(full_name); + free(full_name); allocated = 64; - list = heap_alloc(allocated * sizeof(list[0])); + list = malloc(allocated * sizeof(list[0])); if (!list) return E_OUTOFMEMORY; index = count = 0; @@ -754,7 +754,7 @@ HRESULT __cdecl SchRpcEnumTasks(const WCHAR *path, DWORD flags, DWORD *start_ind handle = FindFirstFileW(pathW, &data); if (handle == INVALID_HANDLE_VALUE) { - heap_free(list); + free(list); if (GetLastError() == ERROR_PATH_NOT_FOUND) return HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); return HRESULT_FROM_WIN32(GetLastError()); @@ -779,7 +779,7 @@ HRESULT __cdecl SchRpcEnumTasks(const WCHAR *path, DWORD flags, DWORD *start_ind TRACE("adding %s\n", debugstr_w(data.cFileName)); - list[count] = heap_strdupW(data.cFileName); + list[count] = wcsdup(data.cFileName); if (!list[count]) { hr = E_OUTOFMEMORY; @@ -813,7 +813,7 @@ HRESULT __cdecl SchRpcEnumTasks(const WCHAR *path, DWORD flags, DWORD *start_ind return hr; } - heap_free(list); + free(list); *names = NULL; return *start_index ? S_FALSE : S_OK; } @@ -874,7 +874,7 @@ HRESULT __cdecl SchRpcDelete(const WCHAR *path, DWORD flags) hr = DeleteFileW(full_name) ? S_OK : HRESULT_FROM_WIN32(GetLastError()); } - heap_free(full_name); + free(full_name); return hr; } @@ -910,10 +910,10 @@ HRESULT __cdecl SchRpcGetTaskInfo(const WCHAR *path, DWORD flags, DWORD *enabled if (!full_name) return E_OUTOFMEMORY; hr = read_xml(full_name, &xml); - heap_free(full_name); + free(full_name); if (hr != S_OK) return hr; hr = read_task_info_from_xml(xml, &info); - heap_free(xml); + free(xml); if (FAILED(hr)) return hr; *enabled = info.enabled;

1 0

Alex Henrie : schedsvc: Remove unused function heap_strdupW.
by Alexandre Julliard Nov. 18, 2022

Nov. 18, 2022

Module: wine Branch: master Commit: 6a5dcc5273bc169c6c060de3dadf6c930847d10d URL: https://gitlab.winehq.org/wine/wine/-/commit/6a5dcc5273bc169c6c060de3dadf6c… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 17 21:57:42 2022 -0700 schedsvc: Remove unused function heap_strdupW. --- dlls/schedsvc/schedsvc_private.h | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/dlls/schedsvc/schedsvc_private.h b/dlls/schedsvc/schedsvc_private.h index 1eada2bca96..62b25f97794 100644 --- a/dlls/schedsvc/schedsvc_private.h +++ b/dlls/schedsvc/schedsvc_private.h @@ -32,14 +32,4 @@ void check_task_time(void) DECLSPEC_HIDDEN; void load_at_tasks(void) DECLSPEC_HIDDEN; void check_missed_task_time(void) DECLSPEC_HIDDEN; -static inline WCHAR *heap_strdupW(const WCHAR *src) -{ - WCHAR *dst; - unsigned len; - if (!src) return NULL; - len = (lstrlenW(src) + 1) * sizeof(WCHAR); - if ((dst = heap_alloc(len))) memcpy(dst, src, len); - return dst; -} - #endif /* __WINE_SCHEDSVC_PRIVATE_H__ */

1 0

Alex Henrie : schedsvc: Use standard C functions for memory allocation in atsvc.c.
by Alexandre Julliard Nov. 18, 2022

Nov. 18, 2022

Module: wine Branch: master Commit: 4ee48f26bdaa9e466ad96c5f923027a6b7aca7fe URL: https://gitlab.winehq.org/wine/wine/-/commit/4ee48f26bdaa9e466ad96c5f923027… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 17 21:56:01 2022 -0700 schedsvc: Use standard C functions for memory allocation in atsvc.c. --- dlls/schedsvc/atsvc.c | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/dlls/schedsvc/atsvc.c b/dlls/schedsvc/atsvc.c index e8ea1b25c6f..aa7881d39ba 100644 --- a/dlls/schedsvc/atsvc.c +++ b/dlls/schedsvc/atsvc.c @@ -354,15 +354,15 @@ static DWORD load_unicode_strings(const char *data, DWORD limit, struct job_t *j switch (i) { case 0: - job->info.Command = heap_strdupW((const WCHAR *)data); + job->info.Command = wcsdup((const WCHAR *)data); break; case 1: - job->params = heap_strdupW((const WCHAR *)data); + job->params = wcsdup((const WCHAR *)data); break; case 2: - job->curdir = heap_strdupW((const WCHAR *)data); + job->curdir = wcsdup((const WCHAR *)data); break; default: @@ -504,7 +504,7 @@ static BOOL load_job_data(const char *data, DWORD size, struct job_t *info) return FALSE; } - info->trigger = heap_alloc(info->trigger_count * sizeof(info->trigger[0])); + info->trigger = malloc(info->trigger_count * sizeof(info->trigger[0])); if (!info->trigger) { TRACE("not enough memory for trigger data\n"); @@ -596,24 +596,24 @@ static BOOL load_job(const WCHAR *name, struct job_t *info) static void free_job_info(AT_ENUM *info) { - heap_free(info->Command); + free(info->Command); } static void free_job(struct job_t *job) { free_job_info(&job->info); - heap_free(job->name); - heap_free(job->params); - heap_free(job->curdir); - heap_free(job->trigger); - heap_free(job); + free(job->name); + free(job->params); + free(job->curdir); + free(job->trigger); + free(job); } void add_job(const WCHAR *name) { struct job_t *job; - job = heap_alloc_zero(sizeof(*job)); + job = calloc(1, sizeof(*job)); if (!job) return; if (!load_job(name, job)) @@ -623,7 +623,7 @@ void add_job(const WCHAR *name) } EnterCriticalSection(&at_job_list_section); - job->name = heap_strdupW(name); + job->name = wcsdup(name); job->info.JobId = current_jobid++; list_add_tail(&at_job_list, &job->entry); LeaveCriticalSection(&at_job_list_section); @@ -920,7 +920,7 @@ void update_process_status(DWORD pid) { CloseHandle(runjob->process); list_remove(&runjob->entry); - heap_free(runjob); + free(runjob); job->data.exit_code = exit_code; job->data.status = SCHED_S_TASK_TERMINATED; @@ -969,7 +969,7 @@ void check_task_state(void) if (job->instance_count) FIXME("process %s is already running\n", debugstr_w(job->info.Command)); - runjob = heap_alloc(sizeof(*runjob)); + runjob = malloc(sizeof(*runjob)); if (runjob) { static WCHAR winsta0[] = { 'W','i','n','S','t','a','0',0 }; @@ -1179,9 +1179,9 @@ static void free_container(AT_ENUM_CONTAINER *container) DWORD i; for (i = 0; i < container->EntriesRead; i++) - heap_free(container->Buffer[i].Command); + free(container->Buffer[i].Command); - heap_free(container->Buffer); + free(container->Buffer); } DWORD __cdecl NetrJobEnum(ATSVC_HANDLE server_name, AT_ENUM_CONTAINER *container, @@ -1197,7 +1197,7 @@ DWORD __cdecl NetrJobEnum(ATSVC_HANDLE server_name, AT_ENUM_CONTAINER *container container->EntriesRead = 0; allocated = 64; - container->Buffer = heap_alloc(allocated * sizeof(AT_ENUM)); + container->Buffer = malloc(allocated * sizeof(AT_ENUM)); if (!container->Buffer) return ERROR_NOT_ENOUGH_MEMORY; EnterCriticalSection(&at_job_list_section); @@ -1215,7 +1215,7 @@ DWORD __cdecl NetrJobEnum(ATSVC_HANDLE server_name, AT_ENUM_CONTAINER *container AT_ENUM *new_buffer; allocated *= 2; - new_buffer = heap_realloc(container->Buffer, allocated * sizeof(AT_ENUM)); + new_buffer = realloc(container->Buffer, allocated * sizeof(AT_ENUM)); if (!new_buffer) { free_container(container); @@ -1226,7 +1226,7 @@ DWORD __cdecl NetrJobEnum(ATSVC_HANDLE server_name, AT_ENUM_CONTAINER *container } container->Buffer[container->EntriesRead] = job->info; - container->Buffer[container->EntriesRead].Command = heap_strdupW(job->info.Command); + container->Buffer[container->EntriesRead].Command = wcsdup(job->info.Command); container->EntriesRead++; } @@ -1249,7 +1249,7 @@ DWORD __cdecl NetrJobGetInfo(ATSVC_HANDLE server_name, DWORD jobid, AT_INFO **in job = find_job(jobid, NULL, NULL); if (job) { - AT_INFO *info_ret = heap_alloc(sizeof(*info_ret)); + AT_INFO *info_ret = malloc(sizeof(*info_ret)); if (!info_ret) ret = ERROR_NOT_ENOUGH_MEMORY; else @@ -1258,7 +1258,7 @@ DWORD __cdecl NetrJobGetInfo(ATSVC_HANDLE server_name, DWORD jobid, AT_INFO **in info_ret->DaysOfMonth = job->info.DaysOfMonth; info_ret->DaysOfWeek = job->info.DaysOfWeek; info_ret->Flags = job->info.Flags; - info_ret->Command = heap_strdupW(job->info.Command); + info_ret->Command = wcsdup(job->info.Command); *info = info_ret; ret = ERROR_SUCCESS; }

1 0

Alex Henrie : sapi: Use standard C functions for memory allocation in token.c.
by Alexandre Julliard Nov. 18, 2022

Nov. 18, 2022

Module: wine Branch: master Commit: caf39cd12240ecd965027e7a29a5ed66d04a1a74 URL: https://gitlab.winehq.org/wine/wine/-/commit/caf39cd12240ecd965027e7a29a5ed… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 17 19:39:25 2022 -0700 sapi: Use standard C functions for memory allocation in token.c. --- dlls/sapi/sapi_private.h | 15 --------------- dlls/sapi/token.c | 44 ++++++++++++++++++++++---------------------- 2 files changed, 22 insertions(+), 37 deletions(-) diff --git a/dlls/sapi/sapi_private.h b/dlls/sapi/sapi_private.h index 8a375cdb6c2..fcecafb450e 100644 --- a/dlls/sapi/sapi_private.h +++ b/dlls/sapi/sapi_private.h @@ -28,18 +28,3 @@ HRESULT speech_voice_create( IUnknown *outer, REFIID iid, void **obj ) DECLSPEC_ HRESULT token_category_create( IUnknown *outer, REFIID iid, void **obj ) DECLSPEC_HIDDEN; HRESULT token_enum_create( IUnknown *outer, REFIID iid, void **obj ) DECLSPEC_HIDDEN; HRESULT token_create( IUnknown *outer, REFIID iid, void **obj ) DECLSPEC_HIDDEN; - -static inline LPWSTR heap_strdupW(LPCWSTR str) -{ - LPWSTR ret = NULL; - DWORD size; - - if (str) - { - size = (lstrlenW( str ) + 1) * sizeof(WCHAR); - ret = heap_alloc( size ); - if (ret) memcpy( ret, str, size ); - } - - return ret; -} diff --git a/dlls/sapi/token.c b/dlls/sapi/token.c index 478a400f920..385555a4cef 100644 --- a/dlls/sapi/token.c +++ b/dlls/sapi/token.c @@ -101,7 +101,7 @@ static ULONG WINAPI data_key_Release( ISpRegDataKey *iface ) if (!ref) { if (This->key) RegCloseKey( This->key ); - heap_free( This ); + free( This ); } return ref; @@ -270,7 +270,7 @@ const struct ISpRegDataKeyVtbl data_key_vtbl = HRESULT data_key_create( IUnknown *outer, REFIID iid, void **obj ) { - struct data_key *This = heap_alloc( sizeof(*This) ); + struct data_key *This = malloc( sizeof(*This) ); HRESULT hr; if (!This) return E_OUTOFMEMORY; @@ -338,7 +338,7 @@ static ULONG WINAPI token_category_Release( ISpObjectTokenCategory *iface ) if (!ref) { if (This->data_key) ISpRegDataKey_Release( This->data_key ); - heap_free( This ); + free( This ); } return ref; } @@ -637,7 +637,7 @@ const struct ISpObjectTokenCategoryVtbl token_category_vtbl = HRESULT token_category_create( IUnknown *outer, REFIID iid, void **obj ) { - struct token_category *This = heap_alloc( sizeof(*This) ); + struct token_category *This = malloc( sizeof(*This) ); HRESULT hr; if (!This) return E_OUTOFMEMORY; @@ -692,9 +692,9 @@ static ULONG WINAPI token_enum_Release( ISpObjectTokenEnumBuilder *iface ) { if (This->key) RegCloseKey(This->key); - heap_free( This->req ); - heap_free( This->opt ); - heap_free( This ); + free( This->req ); + free( This->opt ); + free( This ); } return ref; @@ -721,14 +721,14 @@ static HRESULT WINAPI token_enum_Next( ISpObjectTokenEnumBuilder *iface, RegQueryInfoKeyW( This->key, NULL, NULL, NULL, NULL, &size, NULL, NULL, NULL, NULL, NULL, NULL ); size = (size+1) * sizeof(WCHAR); - subkey_name = heap_alloc(size); + subkey_name = malloc( size ); if (!subkey_name) return E_OUTOFMEMORY; retCode = RegEnumKeyExW( This->key, This->index, subkey_name, &size, NULL, NULL, NULL, NULL ); if (retCode != ERROR_SUCCESS) { - heap_free(subkey_name); + free( subkey_name ); return S_FALSE; } @@ -736,14 +736,14 @@ static HRESULT WINAPI token_enum_Next( ISpObjectTokenEnumBuilder *iface, if (RegOpenKeyExW( This->key, subkey_name, 0, KEY_READ, &sub_key ) != ERROR_SUCCESS) { - heap_free(subkey_name); + free( subkey_name ); return E_FAIL; } hr = token_create( NULL, &IID_ISpObjectToken, (void**)tokens ); if (FAILED(hr)) { - heap_free(subkey_name); + free( subkey_name ); return hr; } @@ -794,28 +794,28 @@ static HRESULT WINAPI token_enum_Item( ISpObjectTokenEnumBuilder *iface, RegQueryInfoKeyW(This->key, NULL, NULL, NULL, NULL, &size, NULL, NULL, NULL, NULL, NULL, NULL); size = (size+1) * sizeof(WCHAR); - subkey = heap_alloc(size); + subkey = malloc( size ); if (!subkey) return E_OUTOFMEMORY; ret = RegEnumKeyExW(This->key, index, subkey, &size, NULL, NULL, NULL, NULL); if (ret != ERROR_SUCCESS) { - heap_free(subkey); + free( subkey ); return HRESULT_FROM_WIN32(ret); } ret = RegOpenKeyExW (This->key, subkey, 0, KEY_READ, &key); if (ret != ERROR_SUCCESS) { - heap_free(subkey); + free( subkey ); return HRESULT_FROM_WIN32(ret); } hr = token_create( NULL, &IID_ISpObjectToken, (void**)&subtoken ); if (FAILED(hr)) { - heap_free(subkey); + free( subkey ); return hr; } @@ -852,13 +852,13 @@ static HRESULT WINAPI token_enum_SetAttribs( ISpObjectTokenEnumBuilder *iface, if (req) { - This->req = heap_strdupW( req ); + This->req = wcsdup( req ); if (!This->req) goto out_of_mem; } if (opt) { - This->opt = heap_strdupW( opt ); + This->opt = wcsdup( opt ); if (!This->opt) goto out_of_mem; } @@ -866,7 +866,7 @@ static HRESULT WINAPI token_enum_SetAttribs( ISpObjectTokenEnumBuilder *iface, return S_OK; out_of_mem: - heap_free( This->req ); + free( This->req ); return E_OUTOFMEMORY; } @@ -919,7 +919,7 @@ const struct ISpObjectTokenEnumBuilderVtbl token_enum_vtbl = HRESULT token_enum_create( IUnknown *outer, REFIID iid, void **obj ) { - struct token_enum *This = heap_alloc( sizeof(*This) ); + struct token_enum *This = malloc( sizeof(*This) ); HRESULT hr; if (!This) return E_OUTOFMEMORY; @@ -978,8 +978,8 @@ static ULONG WINAPI token_Release( ISpObjectToken *iface ) if (!ref) { if (This->token_key) RegCloseKey( This->token_key ); - free(This->token_id); - heap_free( This ); + free( This->token_id ); + free( This ); } return ref; @@ -1265,7 +1265,7 @@ const struct ISpObjectTokenVtbl token_vtbl = HRESULT token_create( IUnknown *outer, REFIID iid, void **obj ) { - struct object_token *This = heap_alloc( sizeof(*This) ); + struct object_token *This = malloc( sizeof(*This) ); HRESULT hr; if (!This) return E_OUTOFMEMORY;

1 0