- Wine-Commits - list.winehq.org

Alex Henrie : urlmon: Remove unused function heap_strdupWtoA.
by Alexandre Julliard Nov. 21, 2022

Nov. 21, 2022

Module: wine Branch: master Commit: dc3189a7103091b4a14de2a4c6ae12440ea1d0cd URL: https://gitlab.winehq.org/wine/wine/-/commit/dc3189a7103091b4a14de2a4c6ae12… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Nov 20 19:37:23 2022 -0700 urlmon: Remove unused function heap_strdupWtoA. This function was introduced in commit 59055c4d45c674c2a9dc2efcb8d0a973f870f3ac but never used. --- dlls/urlmon/urlmon_main.h | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/dlls/urlmon/urlmon_main.h b/dlls/urlmon/urlmon_main.h index 691c63e3b42..6687fbd0516 100644 --- a/dlls/urlmon/urlmon_main.h +++ b/dlls/urlmon/urlmon_main.h @@ -281,18 +281,4 @@ static inline LPWSTR heap_strdupAtoW(const char *str) return ret; } -static inline char *heap_strdupWtoA(const WCHAR *str) -{ - char *ret = NULL; - - if(str) { - size_t size = WideCharToMultiByte(CP_ACP, 0, str, -1, NULL, 0, NULL, NULL); - ret = heap_alloc(size); - if(ret) - WideCharToMultiByte(CP_ACP, 0, str, -1, ret, size, NULL, NULL); - } - - return ret; -} - #endif /* __WINE_URLMON_MAIN_H */

1 0

Alex Henrie : mshtml: Handle realloc failure in add_func_info.
by Alexandre Julliard Nov. 21, 2022

Nov. 21, 2022

Module: wine Branch: master Commit: 6e79aff665767c2e4380a75109ce56af9be8dbaf URL: https://gitlab.winehq.org/wine/wine/-/commit/6e79aff665767c2e4380a75109ce56… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Nov 20 19:28:13 2022 -0700 mshtml: Handle realloc failure in add_func_info. --- dlls/mshtml/dispex.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index c70deb67209..61acef7e28b 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -300,8 +300,12 @@ static void add_func_info(dispex_data_t *data, tid_t tid, const FUNCDESC *desc, TRACE("adding %s...\n", debugstr_w(name)); if(info == data->funcs+data->func_cnt) { - if(data->func_cnt == data->func_size) - data->funcs = heap_realloc_zero(data->funcs, (data->func_size <<= 1)*sizeof(func_info_t)); + if(data->func_cnt == data->func_size) { + info = heap_realloc_zero(data->funcs, (data->func_size <<= 1) * sizeof(func_info_t)); + if(!info) + return; + data->funcs = info; + } info = data->funcs+data->func_cnt; data->func_cnt++;

1 0

Nikolay Sivov : kernelbase: Add SetProcessInformation().
by Alexandre Julliard Nov. 21, 2022

Nov. 21, 2022

Module: wine Branch: master Commit: ce91ef6426bf5065bd31bb82fa4f76011e7a9a36 URL: https://gitlab.winehq.org/wine/wine/-/commit/ce91ef6426bf5065bd31bb82fa4f76… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 20 14:44:32 2022 +0300 kernelbase: Add SetProcessInformation(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53954 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/kernel32/kernel32.spec | 1 + dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/process.c | 20 ++++++++++++++++++++ dlls/wow64/process.c | 3 +++ include/ddk/wdm.h | 2 +- include/winbase.h | 16 ++++++++++++++++ include/winternl.h | 6 ++++-- 7 files changed, 46 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 89c2511c3cf..ecfc40288f0 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1448,6 +1448,7 @@ @ stdcall -import SetProcessAffinityUpdateMode(long long) @ stdcall -import SetProcessDefaultCpuSets(ptr ptr long) @ stdcall SetProcessDEPPolicy(long) +@ stdcall -import SetProcessInformation(long long ptr long) @ stdcall -import SetProcessMitigationPolicy(long ptr long) @ stdcall -import SetProcessPreferredUILanguages(long ptr ptr) @ stdcall -import SetProcessPriorityBoost(long long) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index c51dbd6bc73..d679e190caa 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1494,7 +1494,7 @@ @ stdcall SetProcessAffinityUpdateMode(long long) @ stdcall SetProcessDefaultCpuSets(ptr ptr long) @ stdcall SetProcessGroupAffinity(long ptr ptr) -# @ stub SetProcessInformation +@ stdcall SetProcessInformation(long long ptr long) @ stdcall SetProcessMitigationPolicy(long ptr long) @ stdcall SetProcessPreferredUILanguages(long ptr ptr) @ stdcall SetProcessPriorityBoost(long long) diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c index 32f622bdf3e..39de15066d4 100644 --- a/dlls/kernelbase/process.c +++ b/dlls/kernelbase/process.c @@ -691,6 +691,26 @@ BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessW( const WCHAR *app_name, WCHAR *cmd_ } +/********************************************************************** + * SetProcessInformation (kernelbase.@) + */ +BOOL WINAPI SetProcessInformation( HANDLE process, PROCESS_INFORMATION_CLASS info_class, void *info, DWORD size ) +{ + switch (info_class) + { + case ProcessMemoryPriority: + return set_ntstatus( NtSetInformationProcess( process, ProcessPagePriority, info, size )); + case ProcessPowerThrottling: + return set_ntstatus( NtSetInformationProcess( process, ProcessPowerThrottlingState, info, size )); + case ProcessLeapSecondInfo: + return set_ntstatus( NtSetInformationProcess( process, ProcessLeapSecondInformation, info, size )); + default: + FIXME("Unrecognized information class %d.\n", info_class); + return FALSE; + } +} + + /********************************************************************* * DuplicateHandle (kernelbase.@) */ diff --git a/dlls/wow64/process.c b/dlls/wow64/process.c index 46bd6bfec36..ea7a1beb5e3 100644 --- a/dlls/wow64/process.c +++ b/dlls/wow64/process.c @@ -1078,6 +1078,9 @@ NTSTATUS WINAPI wow64_NtSetInformationProcess( UINT *args ) case ProcessDefaultHardErrorMode: /* ULONG */ case ProcessPriorityClass: /* PROCESS_PRIORITY_CLASS */ case ProcessExecuteFlags: /* ULONG */ + case ProcessPagePriority: /* MEMORY_PRIORITY_INFORMATION */ + case ProcessPowerThrottlingState: /* PROCESS_POWER_THROTTLING_STATE */ + case ProcessLeapSecondInformation: /* PROCESS_LEAP_SECOND_INFO */ return NtSetInformationProcess( handle, class, ptr, len ); case ProcessAffinityMask: /* ULONG_PTR */ diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index bd6ddbd67c5..321b07b84fa 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1943,7 +1943,7 @@ NTSTATUS WINAPI ZwSetEvent(HANDLE,PULONG); NTSTATUS WINAPI ZwSetInformationFile(HANDLE,PIO_STATUS_BLOCK,PVOID,ULONG,FILE_INFORMATION_CLASS); NTSTATUS WINAPI ZwSetInformationKey(HANDLE,const int,PVOID,ULONG); NTSTATUS WINAPI ZwSetInformationObject(HANDLE, OBJECT_INFORMATION_CLASS, PVOID, ULONG); -NTSTATUS WINAPI ZwSetInformationProcess(HANDLE,PROCESS_INFORMATION_CLASS,PVOID,ULONG); +NTSTATUS WINAPI ZwSetInformationProcess(HANDLE,PROCESSINFOCLASS,PVOID,ULONG); NTSTATUS WINAPI ZwSetInformationThread(HANDLE,THREADINFOCLASS,LPCVOID,ULONG); NTSTATUS WINAPI ZwSetIoCompletion(HANDLE,ULONG,ULONG,NTSTATUS,ULONG); NTSTATUS WINAPI ZwSetLdtEntries(ULONG,ULONG,ULONG,ULONG,ULONG,ULONG); diff --git a/include/winbase.h b/include/winbase.h index 7ad56502566..7d7be1ae2a8 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1771,6 +1771,21 @@ typedef struct _WIN32_MEMORY_RANGE_ENTRY SIZE_T NumberOfBytes; } WIN32_MEMORY_RANGE_ENTRY, *PWIN32_MEMORY_RANGE_ENTRY; +typedef enum _PROCESS_INFORMATION_CLASS +{ + ProcessMemoryPriority, + ProcessMemoryExhaustionInfo, + ProcessAppMemoryInfo, + ProcessInPrivateInfo, + ProcessPowerThrottling, + ProcessReservedValue1, + ProcessTelemetryCoverageInfo, + ProcessProtectionLevelInfo, + ProcessLeapSecondInfo, + ProcessMachineTypeInfo, + ProcessInformationClassMax +} PROCESS_INFORMATION_CLASS; + WINBASEAPI BOOL WINAPI ActivateActCtx(HANDLE,ULONG_PTR *); WINADVAPI BOOL WINAPI AddAccessAllowedAce(PACL,DWORD,DWORD,PSID); WINADVAPI BOOL WINAPI AddAccessAllowedAceEx(PACL,DWORD,DWORD,DWORD,PSID); @@ -2689,6 +2704,7 @@ WINBASEAPI BOOL WINAPI SetPriorityClass(HANDLE,DWORD); WINADVAPI BOOL WINAPI SetPrivateObjectSecurity(SECURITY_INFORMATION,PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR*,PGENERIC_MAPPING,HANDLE); WINADVAPI BOOL WINAPI SetPrivateObjectSecurityEx(SECURITY_INFORMATION,PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR*,ULONG,PGENERIC_MAPPING,HANDLE); WINBASEAPI BOOL WINAPI SetProcessAffinityMask(HANDLE,DWORD_PTR); +WINBASEAPI BOOL WINAPI SetProcessInformation(HANDLE,PROCESS_INFORMATION_CLASS,LPVOID,DWORD); WINBASEAPI BOOL WINAPI SetProcessPriorityBoost(HANDLE,BOOL); WINBASEAPI BOOL WINAPI SetProcessShutdownParameters(DWORD,DWORD); WINBASEAPI BOOL WINAPI SetProcessWorkingSetSize(HANDLE,SIZE_T,SIZE_T); diff --git a/include/winternl.h b/include/winternl.h index 3a62ff0b268..5a99827fe65 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1574,12 +1574,14 @@ typedef enum _PROCESSINFOCLASS { ProcessConsoleHostProcess = 49, ProcessWindowInformation = 50, ProcessHandleInformation = 51, + ProcessPowerThrottlingState = 77, + ProcessLeapSecondInformation = 97, MaxProcessInfoClass, #ifdef __WINESRC__ ProcessWineMakeProcessSystem = 1000, ProcessWineLdtCopy, #endif -} PROCESSINFOCLASS, PROCESS_INFORMATION_CLASS; +} PROCESSINFOCLASS; #define MEM_EXECUTE_OPTION_DISABLE 0x01 #define MEM_EXECUTE_OPTION_ENABLE 0x02 @@ -4174,7 +4176,7 @@ NTSYSAPI NTSTATUS WINAPI NtSetInformationFile(HANDLE,PIO_STATUS_BLOCK,PVOID,ULO NTSYSAPI NTSTATUS WINAPI NtSetInformationJobObject(HANDLE,JOBOBJECTINFOCLASS,PVOID,ULONG); NTSYSAPI NTSTATUS WINAPI NtSetInformationKey(HANDLE,const int,PVOID,ULONG); NTSYSAPI NTSTATUS WINAPI NtSetInformationObject(HANDLE, OBJECT_INFORMATION_CLASS, PVOID, ULONG); -NTSYSAPI NTSTATUS WINAPI NtSetInformationProcess(HANDLE,PROCESS_INFORMATION_CLASS,PVOID,ULONG); +NTSYSAPI NTSTATUS WINAPI NtSetInformationProcess(HANDLE,PROCESSINFOCLASS,PVOID,ULONG); NTSYSAPI NTSTATUS WINAPI NtSetInformationThread(HANDLE,THREADINFOCLASS,LPCVOID,ULONG); NTSYSAPI NTSTATUS WINAPI NtSetInformationToken(HANDLE,TOKEN_INFORMATION_CLASS,PVOID,ULONG); NTSYSAPI NTSTATUS WINAPI NtSetInformationVirtualMemory(HANDLE,VIRTUAL_MEMORY_INFORMATION_CLASS,ULONG_PTR,PMEMORY_RANGE_ENTRY,PVOID,ULONG);

1 0

Nikolay Sivov : xmllite/reader: Use consistent formatting for traces.
by Alexandre Julliard Nov. 21, 2022

Nov. 21, 2022

Module: wine Branch: master Commit: ec749f4e1f8b5fe9a5c67cfe013e583f39c2beb3 URL: https://gitlab.winehq.org/wine/wine/-/commit/ec749f4e1f8b5fe9a5c67cfe013e58… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 20 13:56:44 2022 +0300 xmllite/reader: Use consistent formatting for traces. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/xmllite/reader.c | 60 ++++++++++++++++++++++++++------------------------- 1 file changed, 31 insertions(+), 29 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index f238e2af79d..1e146493aa6 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -2641,9 +2641,7 @@ static HRESULT reader_parse_nextnode(xmlreader *reader) static HRESULT WINAPI xmlreader_QueryInterface(IXmlReader *iface, REFIID riid, void** ppvObject) { - xmlreader *This = impl_from_IXmlReader(iface); - - TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppvObject); + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), ppvObject); if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IXmlReader)) @@ -2732,7 +2730,7 @@ static HRESULT WINAPI xmlreader_SetInput(IXmlReader* iface, IUnknown *input) IXmlReaderInput *readerinput; HRESULT hr; - TRACE("(%p)->(%p)\n", This, input); + TRACE("%p, %p.\n", iface, input); if (This->input) { @@ -2789,7 +2787,7 @@ static HRESULT WINAPI xmlreader_GetProperty(IXmlReader* iface, UINT property, LO { xmlreader *This = impl_from_IXmlReader(iface); - TRACE("(%p)->(%s %p)\n", This, debugstr_reader_prop(property), value); + TRACE("%p, %s, %p.\n", iface, debugstr_reader_prop(property), value); if (!value) return E_INVALIDARG; @@ -2868,7 +2866,7 @@ static HRESULT WINAPI xmlreader_Read(IXmlReader* iface, XmlNodeType *nodetype) XmlNodeType type; HRESULT hr; - TRACE("(%p)->(%p)\n", This, nodetype); + TRACE("%p, %p.\n", iface, nodetype); if (!nodetype) nodetype = &type; @@ -2905,7 +2903,7 @@ static HRESULT WINAPI xmlreader_GetNodeType(IXmlReader* iface, XmlNodeType *node { xmlreader *This = impl_from_IXmlReader(iface); - TRACE("(%p)->(%p)\n", This, node_type); + TRACE("%p, %p.\n", iface, node_type); if (!node_type) return E_INVALIDARG; @@ -2939,7 +2937,7 @@ static HRESULT WINAPI xmlreader_MoveToFirstAttribute(IXmlReader* iface) { xmlreader *This = impl_from_IXmlReader(iface); - TRACE("(%p)\n", This); + TRACE("%p.\n", iface); return reader_move_to_first_attribute(This); } @@ -2949,7 +2947,7 @@ static HRESULT WINAPI xmlreader_MoveToNextAttribute(IXmlReader* iface) xmlreader *This = impl_from_IXmlReader(iface); const struct list *next; - TRACE("(%p)\n", This); + TRACE("%p.\n", iface); if (!This->attr_count) return S_FALSE; @@ -3030,7 +3028,7 @@ static HRESULT WINAPI xmlreader_MoveToAttributeByName(IXmlReader* iface, UINT target_name_len, target_uri_len; struct attribute *attr; - TRACE("(%p)->(%s %s)\n", This, debugstr_w(local_name), debugstr_w(namespace_uri)); + TRACE("%p, %s, %s.\n", iface, debugstr_w(local_name), debugstr_w(namespace_uri)); if (!local_name) return E_INVALIDARG; @@ -3067,7 +3065,7 @@ static HRESULT WINAPI xmlreader_MoveToElement(IXmlReader* iface) { xmlreader *This = impl_from_IXmlReader(iface); - TRACE("(%p)\n", This); + TRACE("%p.\n", iface); if (!This->attr_count) return S_FALSE; @@ -3101,7 +3099,7 @@ static HRESULT WINAPI xmlreader_GetQualifiedName(IXmlReader* iface, LPCWSTR *nam struct element *element; UINT length; - TRACE("(%p)->(%p %p)\n", This, name, len); + TRACE("%p, %p, %p.\n", iface, name, len); if (!len) len = &length; @@ -3170,7 +3168,7 @@ static HRESULT WINAPI xmlreader_GetNamespaceUri(IXmlReader* iface, const WCHAR * struct ns *ns; UINT length; - TRACE("(%p %p %p)\n", iface, uri, len); + TRACE("%p, %p, %p.\n", iface, uri, len); if (!len) len = &length; @@ -3224,7 +3222,7 @@ static HRESULT WINAPI xmlreader_GetLocalName(IXmlReader* iface, LPCWSTR *name, U struct element *element; UINT length; - TRACE("(%p)->(%p %p)\n", This, name, len); + TRACE("%p, %p, %p.\n", iface, name, len); if (!len) len = &length; @@ -3262,7 +3260,7 @@ static HRESULT WINAPI xmlreader_GetPrefix(IXmlReader* iface, const WCHAR **ret, XmlNodeType nodetype; UINT length; - TRACE("(%p)->(%p %p)\n", This, ret, len); + TRACE("%p, %p, %p.\n", iface, ret, len); if (!len) len = &length; @@ -3349,7 +3347,7 @@ static HRESULT WINAPI xmlreader_GetValue(IXmlReader* iface, const WCHAR **value, const strval *val = &reader->strvalues[StringValue_Value]; UINT off; - TRACE("(%p)->(%p %p)\n", reader, value, len); + TRACE("%p, %p, %p.\n", iface, value, len); *value = NULL; @@ -3383,7 +3381,7 @@ static HRESULT WINAPI xmlreader_ReadValueChunk(IXmlReader* iface, WCHAR *buffer, const strval *val; UINT len = 0; - TRACE("(%p)->(%p %u %p)\n", reader, buffer, chunk_size, read); + TRACE("%p, %p, %u, %p.\n", iface, buffer, chunk_size, read); val = reader_get_value(reader, FALSE); @@ -3408,20 +3406,22 @@ static HRESULT WINAPI xmlreader_GetBaseUri(IXmlReader* iface, LPCWSTR *baseUri, UINT *baseUri_length) { - FIXME("(%p %p %p): stub\n", iface, baseUri, baseUri_length); + FIXME("%p, %p, %p: stub\n", iface, baseUri, baseUri_length); return E_NOTIMPL; } static BOOL WINAPI xmlreader_IsDefault(IXmlReader* iface) { - FIXME("(%p): stub\n", iface); + FIXME("%p: stub\n", iface); return FALSE; } static BOOL WINAPI xmlreader_IsEmptyElement(IXmlReader* iface) { xmlreader *This = impl_from_IXmlReader(iface); - TRACE("(%p)\n", This); + + TRACE("%p.\n", iface); + /* Empty elements are not placed in stack, it's stored as a global reader flag that makes sense when current node is start tag of an element */ return (reader_get_nodetype(This) == XmlNodeType_Element) ? This->is_empty_element : FALSE; @@ -3432,7 +3432,7 @@ static HRESULT WINAPI xmlreader_GetLineNumber(IXmlReader* iface, UINT *line_numb xmlreader *This = impl_from_IXmlReader(iface); const struct element *element; - TRACE("(%p %p)\n", This, line_number); + TRACE("%p, %p.\n", iface, line_number); if (!line_number) return E_INVALIDARG; @@ -3464,7 +3464,7 @@ static HRESULT WINAPI xmlreader_GetLinePosition(IXmlReader* iface, UINT *line_po xmlreader *This = impl_from_IXmlReader(iface); const struct element *element; - TRACE("(%p %p)\n", This, line_position); + TRACE("%p, %p.\n", iface, line_position); if (!line_position) return E_INVALIDARG; @@ -3495,7 +3495,7 @@ static HRESULT WINAPI xmlreader_GetAttributeCount(IXmlReader* iface, UINT *count { xmlreader *This = impl_from_IXmlReader(iface); - TRACE("(%p)->(%p)\n", This, count); + TRACE("%p, %p.\n", iface, count); if (!count) return E_INVALIDARG; @@ -3506,7 +3506,9 @@ static HRESULT WINAPI xmlreader_GetAttributeCount(IXmlReader* iface, UINT *count static HRESULT WINAPI xmlreader_GetDepth(IXmlReader* iface, UINT *depth) { xmlreader *This = impl_from_IXmlReader(iface); - TRACE("(%p)->(%p)\n", This, depth); + + TRACE("%p, %p.\n", iface, depth); + *depth = This->depth; return S_OK; } @@ -3514,7 +3516,9 @@ static HRESULT WINAPI xmlreader_GetDepth(IXmlReader* iface, UINT *depth) static BOOL WINAPI xmlreader_IsEOF(IXmlReader* iface) { xmlreader *This = impl_from_IXmlReader(iface); - TRACE("(%p)\n", iface); + + TRACE("%p.\n", iface); + return This->state == XmlReadState_EndOfFile; } @@ -3551,9 +3555,7 @@ static const struct IXmlReaderVtbl xmlreader_vtbl = /** IXmlReaderInput **/ static HRESULT WINAPI xmlreaderinput_QueryInterface(IXmlReaderInput *iface, REFIID riid, void** ppvObject) { - xmlreaderinput *This = impl_from_IXmlReaderInput(iface); - - TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppvObject); + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), ppvObject); if (IsEqualGUID(riid, &IID_IXmlReaderInput) || IsEqualGUID(riid, &IID_IUnknown)) @@ -3614,7 +3616,7 @@ HRESULT WINAPI CreateXmlReader(REFIID riid, void **obj, IMalloc *imalloc) HRESULT hr; int i; - TRACE("(%s, %p, %p)\n", wine_dbgstr_guid(riid), obj, imalloc); + TRACE("%s, %p, %p.\n", wine_dbgstr_guid(riid), obj, imalloc); if (!(reader = m_alloc(imalloc, sizeof(*reader)))) return E_OUTOFMEMORY;

1 0

Zhiyi Zhang : win32u: Fix a memory leak.
by Alexandre Julliard Nov. 21, 2022

Nov. 21, 2022

Module: wine Branch: master Commit: df012ba4eb939b3b3ed8a8a602338046a662c5c7 URL: https://gitlab.winehq.org/wine/wine/-/commit/df012ba4eb939b3b3ed8a8a6023380… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Sun Nov 20 15:33:55 2022 +0800 win32u: Fix a memory leak. --- dlls/win32u/message.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 346ae8bede7..5d983ef566c 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -2777,6 +2777,8 @@ static BOOL broadcast_message( struct send_message_info *info, DWORD_PTR *res_pt break; } } + + free( list ); } if (res_ptr) *res_ptr = 1;

1 0

Alex Henrie : appwiz: Use standard C functions for memory allocation.
by Alexandre Julliard Nov. 21, 2022

Nov. 21, 2022

Module: wine Branch: master Commit: d34d0c1001db5c3ccb22c05770be2d7457c21e45 URL: https://gitlab.winehq.org/wine/wine/-/commit/d34d0c1001db5c3ccb22c05770be2d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Nov 20 18:58:20 2022 -0700 appwiz: Use standard C functions for memory allocation. --- dlls/appwiz.cpl/addons.c | 56 ++++++++++++++++++++++++------------------------ dlls/appwiz.cpl/appwiz.h | 21 ++---------------- 2 files changed, 30 insertions(+), 47 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index b815ffbb5cb..f7e36b8b99b 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -193,7 +193,7 @@ static enum install_res install_from_dos_file(const WCHAR *dir, const WCHAR *sub HRESULT hr; size += lstrlenW( subdir ) + lstrlenW( file_name ) + 2; - if (!(path = heap_alloc( size * sizeof(WCHAR) ))) return INSTALL_FAILED; + if (!(path = malloc( size * sizeof(WCHAR) ))) return INSTALL_FAILED; lstrcpyW( path, dir ); if (!wcsncmp( path, L"\\??\\", 4 )) path[1] = '\\'; /* change \??\ into \\?\ */ @@ -207,10 +207,10 @@ static enum install_res install_from_dos_file(const WCHAR *dir, const WCHAR *sub if (FAILED( hr )) { ERR( "Failed to canonicalize %s, hr %#lx\n", debugstr_w(path), hr ); - heap_free( path ); + free( path ); return INSTALL_NEXT; } - heap_free( path ); + free( path ); if (GetFileAttributesW( canonical_path ) == INVALID_FILE_ATTRIBUTES) { @@ -233,7 +233,7 @@ static enum install_res install_from_unix_file(const char *dir, const WCHAR *sub if (p_wine_get_dos_file_name && (dos_dir = p_wine_get_dos_file_name( dir ))) { ret = install_from_dos_file( dos_dir, subdir, file_name ); - heap_free( dos_dir ); + free( dos_dir ); } return ret; } @@ -264,24 +264,24 @@ static enum install_res install_from_registered_dir(void) if(!hkey) return INSTALL_NEXT; - package_dir = heap_alloc(size); + package_dir = malloc(size); res = RegGetValueA(hkey, NULL, addon->dir_config_key, RRF_RT_ANY, &type, (PBYTE)package_dir, &size); if(res == ERROR_MORE_DATA) { - package_dir = heap_realloc(package_dir, size); + package_dir = realloc(package_dir, size); res = RegGetValueA(hkey, NULL, addon->dir_config_key, RRF_RT_ANY, &type, (PBYTE)package_dir, &size); } RegCloseKey(hkey); if(res == ERROR_FILE_NOT_FOUND) { - heap_free(package_dir); + free(package_dir); return INSTALL_NEXT; } else if(res != ERROR_SUCCESS || (type != REG_SZ && type != REG_EXPAND_SZ)) { - heap_free(package_dir); + free(package_dir); return INSTALL_FAILED; } ret = install_from_unix_file(package_dir, L"", addon->file_name); - heap_free(package_dir); + free(package_dir); return ret; } @@ -293,7 +293,7 @@ static enum install_res install_from_default_dir(void) if ((package_dir = _wgetenv( L"WINEBUILDDIR" ))) { - dir_buf = heap_alloc( lstrlenW(package_dir) * sizeof(WCHAR) + sizeof(L"\\..\\") ); + dir_buf = malloc( wcslen(package_dir) * sizeof(WCHAR) + sizeof(L"\\..\\") ); lstrcpyW( dir_buf, package_dir ); lstrcatW( dir_buf, L"\\..\\" ); package_dir = dir_buf; @@ -303,7 +303,7 @@ static enum install_res install_from_default_dir(void) if (package_dir) { ret = install_from_dos_file(package_dir, addon->subdir_name, addon->file_name); - heap_free(dir_buf); + free(dir_buf); } if (ret == INSTALL_NEXT) @@ -329,7 +329,7 @@ static WCHAR *get_cache_file_name(BOOL ensure_exists) } else if ((home_dir = _wgetenv( L"WINEHOMEDIR" ))) { - if (!(cache_dir = heap_alloc( lstrlenW(home_dir) * sizeof(WCHAR) + sizeof(L"\\.cache") ))) return NULL; + if (!(cache_dir = malloc( wcslen(home_dir) * sizeof(WCHAR) + sizeof(L"\\.cache") ))) return NULL; lstrcpyW( cache_dir, home_dir ); lstrcatW( cache_dir, L"\\.cache" ); cache_dir[1] = '\\'; /* change \??\ into \\?\ */ @@ -339,24 +339,24 @@ static WCHAR *get_cache_file_name(BOOL ensure_exists) if (ensure_exists && !CreateDirectoryW( cache_dir, NULL ) && GetLastError() != ERROR_ALREADY_EXISTS) { WARN( "%s does not exist and could not be created (%lu)\n", debugstr_w(cache_dir), GetLastError() ); - heap_free( cache_dir ); + free( cache_dir ); return NULL; } size = lstrlenW( cache_dir ) + ARRAY_SIZE(L"\\wine") + lstrlenW( addon->file_name ) + 1; - if (!(ret = heap_alloc( size * sizeof(WCHAR) ))) + if (!(ret = malloc( size * sizeof(WCHAR) ))) { - heap_free( cache_dir ); + free( cache_dir ); return NULL; } lstrcpyW( ret, cache_dir ); lstrcatW( ret, L"\\wine" ); - heap_free( cache_dir ); + free( cache_dir ); if (ensure_exists && !CreateDirectoryW( ret, NULL ) && GetLastError() != ERROR_ALREADY_EXISTS) { WARN( "%s does not exist and could not be created (%lu)\n", debugstr_w(ret), GetLastError() ); - heap_free( ret ); + free( ret ); return NULL; } len = lstrlenW( ret ); @@ -379,12 +379,12 @@ static enum install_res install_from_cache(void) if(!sha_check(cache_file_name)) { WARN("could not validate checksum\n"); DeleteFileW(cache_file_name); - heap_free(cache_file_name); + free(cache_file_name); return INSTALL_NEXT; } res = install_file(cache_file_name); - heap_free(cache_file_name); + free(cache_file_name); return res; } @@ -485,7 +485,7 @@ static HRESULT WINAPI InstallCallback_OnStopBinding(IBindStatusCallback *iface, cache_file_name = get_cache_file_name(TRUE); if(cache_file_name) { CopyFileW(msi_file, cache_file_name, FALSE); - heap_free(cache_file_name); + free(cache_file_name); } }else { WCHAR message[256]; @@ -495,7 +495,7 @@ static HRESULT WINAPI InstallCallback_OnStopBinding(IBindStatusCallback *iface, } DeleteFileW(msi_file); - heap_free(msi_file); + free(msi_file); msi_file = NULL; EndDialog(install_dialog, 0); @@ -515,7 +515,7 @@ static HRESULT WINAPI InstallCallback_OnDataAvailable(IBindStatusCallback *iface DWORD dwSize, FORMATETC* pformatetc, STGMEDIUM* pstgmed) { if(!msi_file) { - msi_file = heap_strdupW(pstgmed->u.lpszFileName); + msi_file = wcsdup(pstgmed->u.lpszFileName); TRACE("got file name %s\n", debugstr_w(msi_file)); } @@ -622,15 +622,15 @@ static LPWSTR get_url(void) static const WCHAR httpW[] = {'h','t','t','p'}; - url = heap_alloc(size); + url = malloc(size); returned_size = size; hkey = open_config_key(); if (hkey) { - config_key = heap_strdupAtoW(addon->url_config_key); + config_key = strdupAtoW(addon->url_config_key); res = RegQueryValueExW(hkey, config_key, NULL, &type, (LPBYTE)url, &returned_size); - heap_free(config_key); + free(config_key); RegCloseKey(hkey); if(res == ERROR_SUCCESS && type == REG_SZ) goto found; } @@ -684,7 +684,7 @@ static void run_winebrowser(const WCHAR *url) lstrcpyW(app+len, L"\\winebrowser.exe"); len += ARRAY_SIZE(L"\\winebrowser.exe") - 1; - args = heap_alloc((len+1+url_len)*sizeof(WCHAR)); + args = malloc((len + 1 + url_len) * sizeof(WCHAR)); if(!args) return; @@ -697,7 +697,7 @@ static void run_winebrowser(const WCHAR *url) memset(&si, 0, sizeof(si)); si.cb = sizeof(si); ret = CreateProcessW(app, args, NULL, NULL, FALSE, DETACHED_PROCESS, NULL, NULL, &si, &pi); - heap_free(args); + free(args); if (ret) { CloseHandle(pi.hThread); CloseHandle(pi.hProcess); @@ -766,7 +766,7 @@ BOOL install_addon(addon_t addon_type) && (url = get_url())) DialogBoxW(hInst, addon->dialog_template, 0, installer_proc); - heap_free(url); + free(url); url = NULL; return TRUE; } diff --git a/dlls/appwiz.cpl/appwiz.h b/dlls/appwiz.cpl/appwiz.h index ac8b5427d98..c6562e78cba 100644 --- a/dlls/appwiz.cpl/appwiz.h +++ b/dlls/appwiz.cpl/appwiz.h @@ -16,7 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "wine/heap.h" #include "winnls.h" typedef enum { @@ -28,23 +27,7 @@ BOOL install_addon(addon_t) DECLSPEC_HIDDEN; extern HINSTANCE hInst DECLSPEC_HIDDEN; -static inline WCHAR *heap_strdupW(const WCHAR *str) -{ - WCHAR *ret; - - if(str) { - size_t size = lstrlenW(str)+1; - ret = heap_alloc(size*sizeof(WCHAR)); - if(ret) - memcpy(ret, str, size*sizeof(WCHAR)); - }else { - ret = NULL; - } - - return ret; -} - -static inline WCHAR *heap_strdupAtoW(const char *str) +static inline WCHAR *strdupAtoW(const char *str) { WCHAR *ret = NULL; @@ -52,7 +35,7 @@ static inline WCHAR *heap_strdupAtoW(const char *str) size_t len; len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); - ret = heap_alloc(len*sizeof(WCHAR)); + ret = malloc(len * sizeof(WCHAR)); if(ret) MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); }

1 0

Alex Henrie : oledb32: Handle memory allocation failure in rowpos_cp_Advise.
by Alexandre Julliard Nov. 21, 2022

Nov. 21, 2022

Module: wine Branch: master Commit: 82c451596bae24b03ad036f7dfe0dcca9781e70c URL: https://gitlab.winehq.org/wine/wine/-/commit/82c451596bae24b03ad036f7dfe0dc… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Nov 20 19:29:16 2022 -0700 oledb32: Handle memory allocation failure in rowpos_cp_Advise. --- dlls/oledb32/rowpos.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/oledb32/rowpos.c b/dlls/oledb32/rowpos.c index bc42f33f851..128208a9da3 100644 --- a/dlls/oledb32/rowpos.c +++ b/dlls/oledb32/rowpos.c @@ -380,6 +380,7 @@ static HRESULT WINAPI rowpos_cp_Advise(IConnectionPoint *iface, IUnknown *unksin { rowpos_cp *This = impl_from_IConnectionPoint(iface); IRowPositionChange *sink; + IRowPositionChange **new_sinks; HRESULT hr; DWORD i; @@ -404,14 +405,19 @@ static HRESULT WINAPI rowpos_cp_Advise(IConnectionPoint *iface, IUnknown *unksin if (i == This->sinks_size) { + new_sinks = heap_realloc_zero(This->sinks, 2 * This->sinks_size * sizeof(*This->sinks)); + if (!new_sinks) + return E_OUTOFMEMORY; + This->sinks = new_sinks; This->sinks_size *= 2; - This->sinks = heap_realloc_zero(This->sinks, This->sinks_size*sizeof(*This->sinks)); } } else { + This->sinks = heap_alloc_zero(10 * sizeof(*This->sinks)); + if (!This->sinks) + return E_OUTOFMEMORY; This->sinks_size = 10; - This->sinks = heap_alloc_zero(This->sinks_size*sizeof(*This->sinks)); i = 0; }

1 0

Rémi Bernon : opengl32: Cast wow64 pointers in glGet(VertexAttrib)Pointerv.
by Alexandre Julliard Nov. 21, 2022

Nov. 21, 2022

Module: wine Branch: master Commit: 7443db1ce9ad4ec53ba72a404e8d8e4958b07af1 URL: https://gitlab.winehq.org/wine/wine/-/commit/7443db1ce9ad4ec53ba72a404e8d8e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Nov 21 09:07:11 2022 +0100 opengl32: Cast wow64 pointers in glGet(VertexAttrib)Pointerv. They are byte offsets in the buffers data. --- dlls/opengl32/make_opengl | 20 ++++++++++++++++++-- dlls/opengl32/unix_thunks.c | 24 ++++++++++++++++-------- 2 files changed, 34 insertions(+), 10 deletions(-) diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index 43199f56981..bc1a2422185 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -244,6 +244,13 @@ my %pointer_array_count = "glDrawCommandsStatesNV" => "count", "glListDrawCommandsStatesClientNV" => "count", ); +my %pointer_is_offset = + ( + "glGetPointerv" => "params", + "glGetPointervEXT" => "params", + "glGetVertexAttribPointerv" => "pointer", + "glGetVertexAttribPointervARB" => "pointer", + ); # # Used to convert some types @@ -429,7 +436,8 @@ sub generate_wow64_thunk($$$) my $ptype = get_wow64_arg_type( $arg ); my $pname = get_arg_name( $arg ); $ret .= " $ptype $pname;\n"; - $need_manual_thunk = 1 if ($arg->textContent() =~ /(\*.*\*|\[)/ || $arg->textContent() =~ /(sizei|int)ptr.*\*/) && !defined $pointer_array_count{$_}; + $need_manual_thunk = 1 if $arg->textContent() =~ /(\*.*\*|\[|(sizei|int)ptr.*\*)/ && + !defined $pointer_array_count{$_} && !defined $pointer_is_offset{$_}; } if (!is_void_func($func)) { @@ -441,7 +449,7 @@ sub generate_wow64_thunk($$$) $ret .= " {\n"; foreach my $arg (@{$func->[1]}) { - next if $arg->textContent() =~ /(\*.*\*|\[)/ || $arg->textContent() =~ /(sizei|int)ptr.*\*/; + next if $arg->textContent() =~ /(\*.*\*|\[|(sizei|int)ptr.*\*)/; my $ptype = get_arg_type( $arg ); my $pname = get_arg_name( $arg ); if ($arg->textContent() =~ /(sizei|int)ptr/) @@ -493,6 +501,14 @@ sub generate_wow64_thunk($$$) $ret .= " free( (void *)params.$pname );\n"; } + foreach my $arg (@{$func->[1]}) + { + next unless defined $pointer_is_offset{$_}; + my $pname = get_arg_name( $arg ); + next unless $pname =~ $pointer_is_offset{$_}; + $ret .= " params32->$pname = PtrToUlong( params.$pname );\n"; + } + $ret .= " return status;\n"; $ret .= "}\n\n"; diff --git a/dlls/opengl32/unix_thunks.c b/dlls/opengl32/unix_thunks.c index 1ba8fc3bf2f..820b6e3415d 100644 --- a/dlls/opengl32/unix_thunks.c +++ b/dlls/opengl32/unix_thunks.c @@ -28170,8 +28170,10 @@ static NTSTATUS wow64_gl_glGetPointerv( void *args ) { .pname = params32->pname, }; - FIXME( "params32 %p, params %p stub!\n", params32, &params ); - return STATUS_NOT_IMPLEMENTED; + NTSTATUS status; + status = gl_glGetPointerv( &params ); + params32->params = PtrToUlong( params.params ); + return status; } static NTSTATUS wow64_gl_glGetPolygonStipple( void *args ) @@ -39693,8 +39695,10 @@ static NTSTATUS wow64_ext_glGetPointervEXT( void *args ) { .pname = params32->pname, }; - FIXME( "params32 %p, params %p stub!\n", params32, &params ); - return STATUS_NOT_IMPLEMENTED; + NTSTATUS status; + status = ext_glGetPointervEXT( &params ); + params32->params = PtrToUlong( params.params ); + return status; } static NTSTATUS wow64_ext_glGetProgramBinary( void *args ) @@ -42563,8 +42567,10 @@ static NTSTATUS wow64_ext_glGetVertexAttribPointerv( void *args ) .index = params32->index, .pname = params32->pname, }; - FIXME( "params32 %p, params %p stub!\n", params32, &params ); - return STATUS_NOT_IMPLEMENTED; + NTSTATUS status; + status = ext_glGetVertexAttribPointerv( &params ); + params32->pointer = PtrToUlong( params.pointer ); + return status; } static NTSTATUS wow64_ext_glGetVertexAttribPointervARB( void *args ) @@ -42580,8 +42586,10 @@ static NTSTATUS wow64_ext_glGetVertexAttribPointervARB( void *args ) .index = params32->index, .pname = params32->pname, }; - FIXME( "params32 %p, params %p stub!\n", params32, &params ); - return STATUS_NOT_IMPLEMENTED; + NTSTATUS status; + status = ext_glGetVertexAttribPointervARB( &params ); + params32->pointer = PtrToUlong( params.pointer ); + return status; } static NTSTATUS wow64_ext_glGetVertexAttribPointervNV( void *args )

1 0

Rémi Bernon : opengl32: Use the +opengl debug channel everywhere.
by Alexandre Julliard Nov. 21, 2022

Nov. 21, 2022

Module: wine Branch: master Commit: 93dcfef00b3d2941df16ecf41ebd9ed37c931479 URL: https://gitlab.winehq.org/wine/wine/-/commit/93dcfef00b3d2941df16ecf41ebd9e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Nov 18 09:29:01 2022 +0100 opengl32: Use the +opengl debug channel everywhere. --- dlls/opengl32/make_opengl | 2 +- dlls/opengl32/unix_thunks.c | 2 +- dlls/opengl32/unix_wgl.c | 2 +- dlls/opengl32/wgl.c | 15 ++++++++------- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index bc1a2422185..5654ddfa824 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -1142,7 +1142,7 @@ print OUT "#include \"unix_private.h\"\n\n"; print OUT "#include \"wine/debug.h\"\n\n"; print OUT "#ifdef _WIN64\n"; -print OUT "WINE_DEFAULT_DEBUG_CHANNEL(wgl);\n"; +print OUT "WINE_DEFAULT_DEBUG_CHANNEL(opengl);\n"; print OUT "#endif\n\n"; print OUT "extern NTSTATUS thread_attach( void *args ) DECLSPEC_HIDDEN;\n"; diff --git a/dlls/opengl32/unix_thunks.c b/dlls/opengl32/unix_thunks.c index 820b6e3415d..f07b0c2f775 100644 --- a/dlls/opengl32/unix_thunks.c +++ b/dlls/opengl32/unix_thunks.c @@ -19,7 +19,7 @@ #include "wine/debug.h" #ifdef _WIN64 -WINE_DEFAULT_DEBUG_CHANNEL(wgl); +WINE_DEFAULT_DEBUG_CHANNEL(opengl); #endif extern NTSTATUS thread_attach( void *args ) DECLSPEC_HIDDEN; diff --git a/dlls/opengl32/unix_wgl.c b/dlls/opengl32/unix_wgl.c index cc3c6a47e1d..b0874af546e 100644 --- a/dlls/opengl32/unix_wgl.c +++ b/dlls/opengl32/unix_wgl.c @@ -41,7 +41,7 @@ #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(wgl); +WINE_DEFAULT_DEBUG_CHANNEL(opengl); static pthread_mutex_t wgl_lock = PTHREAD_MUTEX_INITIALIZER; diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 2ffdc20c057..27efa6df745 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -36,7 +36,7 @@ #include "wine/glu.h" #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(wgl); +WINE_DEFAULT_DEBUG_CHANNEL(opengl); WINE_DECLARE_DEBUG_CHANNEL(fps); unixlib_handle_t unixlib_handle = 0; @@ -120,11 +120,11 @@ INT WINAPI wglChoosePixelFormat(HDC hdc, const PIXELFORMATDESCRIPTOR* ppfd) int i, count, best_format; int bestDBuffer = -1, bestStereo = -1; - TRACE_(wgl)( "%p %p: size %u version %u flags %lu type %u color %u %u,%u,%u,%u " - "accum %u depth %u stencil %u aux %u\n", - hdc, ppfd, ppfd->nSize, ppfd->nVersion, ppfd->dwFlags, ppfd->iPixelType, - ppfd->cColorBits, ppfd->cRedBits, ppfd->cGreenBits, ppfd->cBlueBits, ppfd->cAlphaBits, - ppfd->cAccumBits, ppfd->cDepthBits, ppfd->cStencilBits, ppfd->cAuxBuffers ); + TRACE( "%p %p: size %u version %u flags %lu type %u color %u %u,%u,%u,%u " + "accum %u depth %u stencil %u aux %u\n", + hdc, ppfd, ppfd->nSize, ppfd->nVersion, ppfd->dwFlags, ppfd->iPixelType, + ppfd->cColorBits, ppfd->cRedBits, ppfd->cGreenBits, ppfd->cBlueBits, ppfd->cAlphaBits, + ppfd->cAccumBits, ppfd->cDepthBits, ppfd->cStencilBits, ppfd->cAuxBuffers ); count = wglDescribePixelFormat( hdc, 0, 0, NULL ); if (!count) return 0; @@ -486,7 +486,8 @@ static BOOL wglUseFontBitmaps_common( HDC hdc, DWORD first, DWORD count, DWORD l if (!ret) break; } - if (TRACE_ON(wgl)) { + if (TRACE_ON(opengl)) + { unsigned int bitmask; unsigned char *bitmap_ = bitmap;

1 0

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

Nov. 21, 2022

Module: wine Branch: master Commit: 9d7e045c78d29d52a6a953186d6187112dd2ec8b URL: https://gitlab.winehq.org/wine/wine/-/commit/9d7e045c78d29d52a6a953186d6187… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Nov 20 18:45:45 2022 -0700 adsldp: Use standard C functions for memory allocation in adsldp.c. --- dlls/adsldp/adsldp.c | 66 ++++++++++++++++++++++---------------------- dlls/adsldp/adsldp_private.h | 8 ------ 2 files changed, 33 insertions(+), 41 deletions(-)

1 0