November 2022 - Wine-Commits

Alexandre Julliard : ntdll: Use UINT instead of ULONG in ioctl helpers.
by Alexandre Julliard Nov. 21, 2022

Nov. 21, 2022

Module: wine Branch: master Commit: 7afd11232eeb9fd019f7ea3cc5a65d7811a028fb URL: https://gitlab.winehq.org/wine/wine/-/commit/7afd11232eeb9fd019f7ea3cc5a65d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 21 16:19:31 2022 +0100 ntdll: Use UINT instead of ULONG in ioctl helpers. To avoid typecasts in debug traces. --- dlls/ntdll/unix/cdrom.c | 4 ++-- dlls/ntdll/unix/file.c | 6 +++--- dlls/ntdll/unix/serial.c | 10 +++++----- dlls/ntdll/unix/socket.c | 2 +- dlls/ntdll/unix/tape.c | 6 +++--- dlls/ntdll/unix/unix_private.h | 14 +++++++------- 6 files changed, 21 insertions(+), 21 deletions(-) diff --git a/dlls/ntdll/unix/cdrom.c b/dlls/ntdll/unix/cdrom.c index a4a9400a518..a9acdf7a645 100644 --- a/dlls/ntdll/unix/cdrom.c +++ b/dlls/ntdll/unix/cdrom.c @@ -2814,8 +2814,8 @@ static NTSTATUS GetInquiryData(int fd, PSCSI_ADAPTER_BUS_INFO BufferOut, DWORD O * cdrom_DeviceIoControl */ NTSTATUS cdrom_DeviceIoControl( HANDLE device, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, - IO_STATUS_BLOCK *io, ULONG code, void *in_buffer, - ULONG in_size, void *out_buffer, ULONG out_size ) + IO_STATUS_BLOCK *io, UINT code, void *in_buffer, + UINT in_size, void *out_buffer, UINT out_size ) { DWORD sz = 0; NTSTATUS status = STATUS_SUCCESS; diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index e80eb368e8a..95ca5fa9b51 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -5095,9 +5095,9 @@ static NTSTATUS server_write_file( HANDLE handle, HANDLE event, PIO_APC_ROUTINE /* do an ioctl call through the server */ static NTSTATUS server_ioctl_file( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, PVOID apc_context, - IO_STATUS_BLOCK *io, ULONG code, - const void *in_buffer, ULONG in_size, - PVOID out_buffer, ULONG out_size ) + IO_STATUS_BLOCK *io, UINT code, + const void *in_buffer, UINT in_size, + PVOID out_buffer, UINT out_size ) { struct async_irp *async; NTSTATUS status; diff --git a/dlls/ntdll/unix/serial.c b/dlls/ntdll/unix/serial.c index 16c5964b77b..fce09500c91 100644 --- a/dlls/ntdll/unix/serial.c +++ b/dlls/ntdll/unix/serial.c @@ -71,7 +71,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(comm); -static const char* iocode2str(DWORD ioc) +static const char* iocode2str(UINT ioc) { switch (ioc) { @@ -1096,8 +1096,8 @@ static NTSTATUS xmit_immediate(HANDLE hDevice, int fd, const char* ptr) } static NTSTATUS io_control( HANDLE device, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, - IO_STATUS_BLOCK *io, ULONG code, void *in_buffer, - ULONG in_size, void *out_buffer, ULONG out_size ) + IO_STATUS_BLOCK *io, UINT code, void *in_buffer, + UINT in_size, void *out_buffer, UINT out_size ) { DWORD sz = 0, access = FILE_READ_DATA; NTSTATUS status = STATUS_SUCCESS; @@ -1320,8 +1320,8 @@ static NTSTATUS io_control( HANDLE device, HANDLE event, PIO_APC_ROUTINE apc, vo * serial_DeviceIoControl */ NTSTATUS serial_DeviceIoControl( HANDLE device, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, - IO_STATUS_BLOCK *io, ULONG code, void *in_buffer, - ULONG in_size, void *out_buffer, ULONG out_size ) + IO_STATUS_BLOCK *io, UINT code, void *in_buffer, + UINT in_size, void *out_buffer, UINT out_size ) { NTSTATUS status; diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index beb8382687a..779cc46fe32 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1487,7 +1487,7 @@ static int get_sock_type( HANDLE handle ) NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, IO_STATUS_BLOCK *io, - ULONG code, void *in_buffer, ULONG in_size, void *out_buffer, ULONG out_size ) + UINT code, void *in_buffer, UINT in_size, void *out_buffer, UINT out_size ) { int fd, needs_close = FALSE; NTSTATUS status; diff --git a/dlls/ntdll/unix/tape.c b/dlls/ntdll/unix/tape.c index 40ac307a632..a7ca04badb0 100644 --- a/dlls/ntdll/unix/tape.c +++ b/dlls/ntdll/unix/tape.c @@ -66,7 +66,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(tape); -static const char *io2str( DWORD io ) +static const char *io2str( unsigned int io ) { switch (io) { @@ -519,8 +519,8 @@ static NTSTATUS TAPE_WriteMarks( int fd, const TAPE_WRITE_MARKS *data ) * tape_DeviceIoControl */ NTSTATUS tape_DeviceIoControl( HANDLE device, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, - IO_STATUS_BLOCK *io, ULONG code, - void *in_buffer, ULONG in_size, void *out_buffer, ULONG out_size ) + IO_STATUS_BLOCK *io, UINT code, + void *in_buffer, UINT in_size, void *out_buffer, UINT out_size ) { DWORD sz = 0; NTSTATUS status = STATUS_INVALID_PARAMETER; diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 9cf8989fb0d..afdb8397415 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -252,21 +252,21 @@ extern void fill_vm_counters( VM_COUNTERS_EX *pvmi, int unix_pid ) DECLSPEC_HIDD extern NTSTATUS open_hkcu_key( const char *path, HANDLE *key ) DECLSPEC_HIDDEN; extern NTSTATUS cdrom_DeviceIoControl( HANDLE device, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, - IO_STATUS_BLOCK *io, ULONG code, void *in_buffer, - ULONG in_size, void *out_buffer, ULONG out_size ) DECLSPEC_HIDDEN; + IO_STATUS_BLOCK *io, UINT code, void *in_buffer, + UINT in_size, void *out_buffer, UINT out_size ) DECLSPEC_HIDDEN; extern NTSTATUS serial_DeviceIoControl( HANDLE device, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, - IO_STATUS_BLOCK *io, ULONG code, void *in_buffer, - ULONG in_size, void *out_buffer, ULONG out_size ) DECLSPEC_HIDDEN; + IO_STATUS_BLOCK *io, UINT code, void *in_buffer, + UINT in_size, void *out_buffer, UINT out_size ) DECLSPEC_HIDDEN; extern NTSTATUS serial_FlushBuffersFile( int fd ) DECLSPEC_HIDDEN; extern NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, IO_STATUS_BLOCK *io, - ULONG code, void *in_buffer, ULONG in_size, void *out_buffer, ULONG out_size ) DECLSPEC_HIDDEN; + UINT code, void *in_buffer, UINT in_size, void *out_buffer, UINT out_size ) DECLSPEC_HIDDEN; extern NTSTATUS sock_read( HANDLE handle, int fd, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, IO_STATUS_BLOCK *io, void *buffer, ULONG length ) DECLSPEC_HIDDEN; extern NTSTATUS sock_write( HANDLE handle, int fd, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, IO_STATUS_BLOCK *io, const void *buffer, ULONG length ) DECLSPEC_HIDDEN; extern NTSTATUS tape_DeviceIoControl( HANDLE device, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, - IO_STATUS_BLOCK *io, ULONG code, void *in_buffer, - ULONG in_size, void *out_buffer, ULONG out_size ) DECLSPEC_HIDDEN; + IO_STATUS_BLOCK *io, UINT code, void *in_buffer, + UINT in_size, void *out_buffer, UINT out_size ) DECLSPEC_HIDDEN; extern struct async_fileio *alloc_fileio( DWORD size, async_callback_t callback, HANDLE handle ) DECLSPEC_HIDDEN; extern void release_fileio( struct async_fileio *io ) DECLSPEC_HIDDEN;

1 0

Alex Henrie : dinput/tests: Avoid using GCC's typeof extension.
by Alexandre Julliard Nov. 21, 2022

Nov. 21, 2022

Module: wine Branch: master Commit: f0605758e0b6762d5c2ad173a2026fe8a256a702 URL: https://gitlab.winehq.org/wine/wine/-/commit/f0605758e0b6762d5c2ad173a2026f… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Nov 21 08:07:22 2022 -0700 dinput/tests: Avoid using GCC's typeof extension. typeof is not available in MSVC. --- dlls/dinput/tests/force_feedback.c | 12 +++++------- dlls/dinput/tests/hotplug.c | 10 ++++------ dlls/dinput/tests/joystick8.c | 12 +++++------- 3 files changed, 14 insertions(+), 20 deletions(-) diff --git a/dlls/dinput/tests/force_feedback.c b/dlls/dinput/tests/force_feedback.c index 8fb15e38f13..ba37320e9f0 100644 --- a/dlls/dinput/tests/force_feedback.c +++ b/dlls/dinput/tests/force_feedback.c @@ -48,13 +48,11 @@ #include "windows.gaming.input.forcefeedback.h" #undef Size -#define MAKE_FUNC(f) static typeof(f) *p ## f -MAKE_FUNC( RoGetActivationFactory ); -MAKE_FUNC( RoInitialize ); -MAKE_FUNC( WindowsCreateString ); -MAKE_FUNC( WindowsDeleteString ); -MAKE_FUNC( WindowsGetStringRawBuffer ); -#undef MAKE_FUNC +static HRESULT WINAPI (*pRoGetActivationFactory)( HSTRING, REFIID, void** ); +static HRESULT WINAPI (*pRoInitialize)( RO_INIT_TYPE ); +static HRESULT WINAPI (*pWindowsCreateString)( const WCHAR*, UINT32, HSTRING* ); +static HRESULT WINAPI (*pWindowsDeleteString)( HSTRING str ); +static const WCHAR* WINAPI (*pWindowsGetStringRawBuffer)( HSTRING, UINT32* ); static BOOL load_combase_functions(void) { diff --git a/dlls/dinput/tests/hotplug.c b/dlls/dinput/tests/hotplug.c index 9896e7b480e..e915d04745a 100644 --- a/dlls/dinput/tests/hotplug.c +++ b/dlls/dinput/tests/hotplug.c @@ -50,12 +50,10 @@ #include "windows.gaming.input.custom.h" #undef Size -#define MAKE_FUNC(f) static typeof(f) *p ## f -MAKE_FUNC( RoGetActivationFactory ); -MAKE_FUNC( RoInitialize ); -MAKE_FUNC( WindowsCreateString ); -MAKE_FUNC( WindowsDeleteString ); -#undef MAKE_FUNC +static HRESULT WINAPI (*pRoGetActivationFactory)( HSTRING, REFIID, void** ); +static HRESULT WINAPI (*pRoInitialize)( RO_INIT_TYPE ); +static HRESULT WINAPI (*pWindowsCreateString)( const WCHAR*, UINT32, HSTRING* ); +static HRESULT WINAPI (*pWindowsDeleteString)( HSTRING str ); static BOOL load_combase_functions(void) { diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c index 0981d917b2a..f568c9298c6 100644 --- a/dlls/dinput/tests/joystick8.c +++ b/dlls/dinput/tests/joystick8.c @@ -47,13 +47,11 @@ #include "windows.gaming.input.h" #undef Size -#define MAKE_FUNC(f) static typeof(f) *p ## f -MAKE_FUNC( RoGetActivationFactory ); -MAKE_FUNC( RoInitialize ); -MAKE_FUNC( WindowsCreateString ); -MAKE_FUNC( WindowsDeleteString ); -MAKE_FUNC( WindowsGetStringRawBuffer ); -#undef MAKE_FUNC +static HRESULT WINAPI (*pRoGetActivationFactory)( HSTRING, REFIID, void** ); +static HRESULT WINAPI (*pRoInitialize)( RO_INIT_TYPE ); +static HRESULT WINAPI (*pWindowsCreateString)( const WCHAR*, UINT32, HSTRING* ); +static HRESULT WINAPI (*pWindowsDeleteString)( HSTRING str ); +static const WCHAR* WINAPI (*pWindowsGetStringRawBuffer)( HSTRING, UINT32* ); static BOOL load_combase_functions(void) {

1 0

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

Nov. 21, 2022

Module: wine Branch: master Commit: c366fa43407dcb2fdf1cad9a6c22aee90d62568d URL: https://gitlab.winehq.org/wine/wine/-/commit/c366fa43407dcb2fdf1cad9a6c22ae… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Nov 20 18:44:24 2022 -0700 msxml3: Use standard C functions for memory allocation in saxreader.c. --- dlls/msxml3/msxml_private.h | 7 ------- dlls/msxml3/saxreader.c | 48 +++++++++++++++++++++++---------------------- 2 files changed, 25 insertions(+), 30 deletions(-) diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index e41b7c9979d..cd8ae547c73 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -78,13 +78,6 @@ typedef enum _XDR_DT { extern HINSTANCE MSXML_hInstance DECLSPEC_HIDDEN; -/* memory allocation functions */ - -static inline void* __WINE_ALLOC_SIZE(2) heap_realloc_zero(void *mem, size_t size) -{ - return HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, size); -} - /* XSLProcessor parameter list */ struct xslprocessor_par { diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 8d58ed1d94b..0e886a2d051 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -466,13 +466,13 @@ static element_entry* alloc_element_entry(const xmlChar *local, const xmlChar *p element_entry *ret; int i; - ret = heap_alloc(sizeof(*ret)); + ret = malloc(sizeof(*ret)); if (!ret) return ret; ret->local = bstr_from_xmlChar(local); ret->prefix = bstr_from_xmlChar(prefix); ret->qname = build_qname(ret->prefix, ret->local); - ret->ns = nb_ns ? heap_alloc(nb_ns*sizeof(ns)) : NULL; + ret->ns = nb_ns ? malloc(nb_ns * sizeof(ns)) : NULL; ret->ns_count = nb_ns; for (i=0; i < nb_ns; i++) @@ -498,8 +498,8 @@ static void free_element_entry(element_entry *element) SysFreeString(element->local); SysFreeString(element->qname); - heap_free(element->ns); - heap_free(element); + free(element->ns); + free(element); } static void push_element_ns(saxlocator *locator, element_entry *element) @@ -567,7 +567,7 @@ static BOOL bstr_pool_insert(struct bstrpool *pool, BSTR pool_entry) { if (!pool->pool) { - pool->pool = heap_alloc(16 * sizeof(*pool->pool)); + pool->pool = malloc(16 * sizeof(*pool->pool)); if (!pool->pool) return FALSE; @@ -576,12 +576,12 @@ static BOOL bstr_pool_insert(struct bstrpool *pool, BSTR pool_entry) } else if (pool->index == pool->len) { - BSTR *realloc = heap_realloc(pool->pool, pool->len * 2 * sizeof(*realloc)); + BSTR *new_pool = realloc(pool->pool, pool->len * 2 * sizeof(*new_pool)); - if (!realloc) + if (!new_pool) return FALSE; - pool->pool = realloc; + pool->pool = new_pool; pool->len *= 2; } @@ -596,7 +596,7 @@ static void free_bstr_pool(struct bstrpool *pool) for (i = 0; i < pool->index; i++) SysFreeString(pool->pool[i]); - heap_free(pool->pool); + free(pool->pool); pool->pool = NULL; pool->index = pool->len = 0; @@ -1399,7 +1399,7 @@ static BSTR saxreader_get_unescaped_value(const xmlChar *buf, int len) str_len = MultiByteToWideChar(CP_UTF8, 0, (LPCSTR)buf, len, NULL, 0); if (len != -1) str_len++; - str = heap_alloc(str_len*sizeof(WCHAR)); + str = malloc(str_len * sizeof(WCHAR)); if (!str) return NULL; MultiByteToWideChar(CP_UTF8, 0, (LPCSTR)buf, len, str, str_len); @@ -1421,7 +1421,7 @@ static BSTR saxreader_get_unescaped_value(const xmlChar *buf, int len) } bstr = SysAllocString(str); - heap_free(str); + free(str); return bstr; } @@ -1461,13 +1461,15 @@ static HRESULT SAXAttributes_populate(saxlocator *locator, if(locator->attr_count > locator->attr_alloc_count) { int new_size = locator->attr_count * 2; - attrs = heap_realloc_zero(locator->attributes, new_size * sizeof(struct _attributes)); + attrs = realloc(locator->attributes, new_size * sizeof(*locator->attributes)); if(!attrs) { free_attribute_values(locator); locator->attr_count = 0; return E_OUTOFMEMORY; } + memset(attrs + locator->attr_alloc_count, 0, + (new_size - locator->attr_alloc_count) * sizeof(*locator->attributes)); locator->attributes = attrs; locator->attr_alloc_count = new_size; } @@ -1930,7 +1932,7 @@ static void WINAPIV libxmlFatalError(void *ctx, const char *msg, ...) va_end(args); len = MultiByteToWideChar(CP_UNIXCP, 0, message, -1, NULL, 0); - error = heap_alloc(sizeof(WCHAR)*len); + error = malloc(sizeof(WCHAR) * len); if(error) { MultiByteToWideChar(CP_UNIXCP, 0, message, -1, error, len); @@ -1941,7 +1943,7 @@ static void WINAPIV libxmlFatalError(void *ctx, const char *msg, ...) { xmlStopParser(This->pParserCtxt); This->ret = E_FAIL; - heap_free(error); + free(error); return; } @@ -1957,7 +1959,7 @@ static void WINAPIV libxmlFatalError(void *ctx, const char *msg, ...) else ISAXErrorHandler_fatalError(handler->handler, &This->ISAXLocator_iface, error, E_FAIL); - heap_free(error); + free(error); xmlStopParser(This->pParserCtxt); This->ret = E_FAIL; @@ -2335,7 +2337,7 @@ static ULONG WINAPI isaxlocator_Release( SysFreeString(This->attributes[index].szValue); SysFreeString(This->attributes[index].szQName); } - heap_free(This->attributes); + free(This->attributes); /* element stack */ LIST_FOR_EACH_ENTRY_SAFE(element, element2, &This->elements, element_entry, entry) @@ -2345,7 +2347,7 @@ static ULONG WINAPI isaxlocator_Release( } ISAXXMLReader_Release(&This->saxreader->ISAXXMLReader_iface); - heap_free( This ); + free(This); } return ref; @@ -2434,7 +2436,7 @@ static HRESULT SAXLocator_create(saxreader *reader, saxlocator **ppsaxlocator, B saxlocator *locator; - locator = heap_alloc( sizeof (*locator) ); + locator = malloc(sizeof(*locator)); if( !locator ) return E_OUTOFMEMORY; @@ -2461,18 +2463,18 @@ static HRESULT SAXLocator_create(saxreader *reader, saxlocator **ppsaxlocator, B if(!locator->namespaceUri) { ISAXXMLReader_Release(&reader->ISAXXMLReader_iface); - heap_free(locator); + free(locator); return E_OUTOFMEMORY; } locator->attr_alloc_count = 8; locator->attr_count = 0; - locator->attributes = heap_alloc_zero(sizeof(struct _attributes)*locator->attr_alloc_count); + locator->attributes = calloc(locator->attr_alloc_count, sizeof(*locator->attributes)); if(!locator->attributes) { ISAXXMLReader_Release(&reader->ISAXXMLReader_iface); SysFreeString(locator->namespaceUri); - heap_free(locator); + free(locator); return E_OUTOFMEMORY; } @@ -2948,7 +2950,7 @@ static ULONG WINAPI saxxmlreader_Release( SysFreeString(This->xmldecl_version); free_bstr_pool(&This->pool); - heap_free( This ); + free(This); } return ref; @@ -3437,7 +3439,7 @@ HRESULT SAXXMLReader_create(MSXML_VERSION version, LPVOID *ppObj) TRACE("(%p)\n", ppObj); - reader = heap_alloc( sizeof (*reader) ); + reader = malloc(sizeof(*reader)); if( !reader ) return E_OUTOFMEMORY;

1 0

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