November 2023 - Wine-commits

Piotr Caban : msvcp140: Add codecvt<char16> class stub.
by Alexandre Julliard 22 Nov '23

22 Nov '23

Module: wine Branch: master Commit: 70e240949c2a400caf16b24d7b68b9f58ee8ef38 URL: https://gitlab.winehq.org/wine/wine/-/commit/70e240949c2a400caf16b24d7b68b9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 22 14:24:28 2023 +0100 msvcp140: Add codecvt<char16> class stub. --- dlls/msvcp140/msvcp140.spec | 108 +++++++++--------- dlls/msvcp90/locale.c | 249 ++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.h | 5 + dlls/msvcp_win/msvcp_win.spec | 108 +++++++++--------- 4 files changed, 362 insertions(+), 108 deletions(-)

1 0

Francois Gouget : user32/tests: Add a trailing linefeed to ok() and skip() calls.
by Alexandre Julliard 22 Nov '23

22 Nov '23

Module: wine Branch: master Commit: 70f15b93f2e4db4469d0b25240e7962bf820a8c8 URL: https://gitlab.winehq.org/wine/wine/-/commit/70f15b93f2e4db4469d0b25240e796… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Nov 22 14:04:34 2023 +0100 user32/tests: Add a trailing linefeed to ok() and skip() calls. --- dlls/user32/tests/input.c | 2 +- dlls/user32/tests/monitor.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index c5ffeadea5b..6a28bd24301 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -2591,7 +2591,7 @@ static LRESULT CALLBACK rawinput_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPA ret = GetRawInputData((HRAWINPUT)lparam, RID_INPUT, NULL, &raw_size, sizeof(RAWINPUTHEADER)); ok(ret == 0, "GetRawInputData failed\n"); - ok(raw_size <= sizeof(raw), "Unexpected rawinput data size: %u", raw_size); + ok(raw_size <= sizeof(raw), "Unexpected rawinput data size: %u\n", raw_size); raw_size = sizeof(raw); ret = GetRawInputData((HRAWINPUT)lparam, RID_INPUT, &raw, &raw_size, sizeof(RAWINPUTHEADER)); diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 7131d1fe75f..d172eb900df 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -1791,7 +1791,7 @@ static void test_QueryDisplayConfig_result(UINT32 flags, /* Check corresponding modes */ if (pi[i].sourceInfo.modeInfoIdx == DISPLAYCONFIG_PATH_MODE_IDX_INVALID) { - skip("Path doesn't contain source modeInfoIdx"); + skip("Path doesn't contain source modeInfoIdx\n"); continue; } ok(pi[i].sourceInfo.modeInfoIdx < modes, "Expected index <%d, got %d\n", modes, pi[i].sourceInfo.modeInfoIdx); @@ -1814,7 +1814,7 @@ static void test_QueryDisplayConfig_result(UINT32 flags, if (pi[i].targetInfo.modeInfoIdx == DISPLAYCONFIG_PATH_MODE_IDX_INVALID) { - skip("Path doesn't contain target modeInfoIdx"); + skip("Path doesn't contain target modeInfoIdx\n"); continue; } ok(pi[i].targetInfo.modeInfoIdx < modes, "Expected index <%d, got %d\n", modes, pi[i].targetInfo.modeInfoIdx);

1 0

Davide Beatrici : wineoss: Fix sound not working.
by Alexandre Julliard 22 Nov '23

22 Nov '23

Module: wine Branch: master Commit: 029697598356028517be1ac10b6807cb877d3cf6 URL: https://gitlab.winehq.org/wine/wine/-/commit/029697598356028517be1ac10b6807… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Mon Nov 20 01:29:09 2023 +0100 wineoss: Fix sound not working. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55886 --- dlls/wineoss.drv/mmdevdrv.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 48a46473956..7b7d426d1df 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -144,18 +144,11 @@ exit: void WINAPI get_device_guid(EDataFlow flow, const char *device, GUID *guid) { + OSSDevice *oss_dev; HKEY key = NULL, dev_key; DWORD type, size = sizeof(*guid); WCHAR key_name[256]; const unsigned int dev_size = strlen(device) + 1; - OSSDevice *oss_dev = HeapAlloc(GetProcessHeap(), 0, offsetof(OSSDevice, devnode[dev_size])); - - if(oss_dev){ - oss_dev->flow = flow; - oss_dev->guid = *guid; - memcpy(oss_dev->devnode, device, dev_size); - device_add(oss_dev); - } if(flow == eCapture) key_name[0] = '1'; @@ -171,7 +164,7 @@ void WINAPI get_device_guid(EDataFlow flow, const char *device, GUID *guid) if(type == REG_BINARY){ RegCloseKey(dev_key); RegCloseKey(key); - return; + goto exit; } ERR("Invalid type for device %s GUID: %lu; ignoring and overwriting\n", wine_dbgstr_w(key_name), type); @@ -183,9 +176,17 @@ void WINAPI get_device_guid(EDataFlow flow, const char *device, GUID *guid) CoCreateGuid(guid); set_device_guid(flow, key, key_name, guid); - +exit: if(key) RegCloseKey(key); + + oss_dev = HeapAlloc(GetProcessHeap(), 0, offsetof(OSSDevice, devnode[dev_size])); + if(oss_dev){ + oss_dev->flow = flow; + oss_dev->guid = *guid; + memcpy(oss_dev->devnode, device, dev_size); + device_add(oss_dev); + } } BOOL WINAPI get_device_name_from_guid(GUID *guid, char **name, EDataFlow *flow)

1 0

Esme Povirk : user32/tests: Accept another variation in send_message_5.
by Alexandre Julliard 22 Nov '23

22 Nov '23

Module: wine Branch: master Commit: 8a25798e32cad630ad9105f98291fa91f7ea92a1 URL: https://gitlab.winehq.org/wine/wine/-/commit/8a25798e32cad630ad9105f98291fa… Author: Esme Povirk <esme(a)codeweavers.com> Date: Wed Nov 22 20:28:26 2023 +0000 user32/tests: Accept another variation in send_message_5. --- dlls/user32/tests/msg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index a9b9a009576..8517ede31dd 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -19699,9 +19699,9 @@ static const struct message send_message_3[] = { { 0 } }; static const struct message send_message_5[] = { - { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOACTIVATE|SWP_NOZORDER }, /* win7+ dual monitor */ + { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOACTIVATE, 0, SWP_NOZORDER }, /* win7+ dual monitor */ { WM_GETMINMAXINFO, sent|defwinproc|optional }, /* win7+ dual monitor */ - { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOACTIVATE|SWP_NOZORDER }, /* win7+ dual monitor */ + { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOACTIVATE, 0, SWP_NOZORDER }, /* win7+ dual monitor */ { WM_GETMINMAXINFO, sent|defwinproc|optional }, /* win7+ dual monitor */ { 0 } };

1 0

Hans Leidekker : wineusb.sys: Add support for URB_FUNCTION_VENDOR_DEVICE.
by Alexandre Julliard 22 Nov '23

22 Nov '23

Module: wine Branch: master Commit: b313c4095ff2262d8c3076562442cb95dc059e34 URL: https://gitlab.winehq.org/wine/wine/-/commit/b313c4095ff2262d8c3076562442cb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 8 12:30:49 2023 +0100 wineusb.sys: Add support for URB_FUNCTION_VENDOR_DEVICE. --- dlls/wineusb.sys/unixlib.c | 9 ++++++++- dlls/wineusb.sys/wineusb.c | 2 ++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/wineusb.sys/unixlib.c b/dlls/wineusb.sys/unixlib.c index 95220dd3828..401993dc543 100644 --- a/dlls/wineusb.sys/unixlib.c +++ b/dlls/wineusb.sys/unixlib.c @@ -362,6 +362,7 @@ static void LIBUSB_CALL transfer_cb(struct libusb_transfer *transfer) break; } + case URB_FUNCTION_VENDOR_DEVICE: case URB_FUNCTION_VENDOR_INTERFACE: { struct _URB_CONTROL_VENDOR_OR_CLASS_REQUEST *req = &urb->UrbControlVendorClassRequest; @@ -539,10 +540,11 @@ static NTSTATUS usb_submit_urb(void *args) return STATUS_SUCCESS; } + case URB_FUNCTION_VENDOR_DEVICE: case URB_FUNCTION_VENDOR_INTERFACE: { struct _URB_CONTROL_VENDOR_OR_CLASS_REQUEST *req = &urb->UrbControlVendorClassRequest; - uint8_t req_type = LIBUSB_REQUEST_TYPE_VENDOR | LIBUSB_RECIPIENT_INTERFACE; + uint8_t req_type = LIBUSB_REQUEST_TYPE_VENDOR; struct transfer_ctx *transfer_ctx; unsigned char *buffer; @@ -551,6 +553,11 @@ static NTSTATUS usb_submit_urb(void *args) transfer_ctx->irp = irp; transfer_ctx->transfer_buffer = params->transfer_buffer; + if (urb->UrbHeader.Function == URB_FUNCTION_VENDOR_DEVICE) + req_type |= LIBUSB_RECIPIENT_DEVICE; + else + req_type |= LIBUSB_RECIPIENT_INTERFACE; + if (req->TransferFlags & USBD_TRANSFER_DIRECTION_IN) req_type |= LIBUSB_ENDPOINT_IN; if (req->TransferFlags & ~USBD_TRANSFER_DIRECTION_IN) diff --git a/dlls/wineusb.sys/wineusb.c b/dlls/wineusb.sys/wineusb.c index 801393cacf6..29d28ee002d 100644 --- a/dlls/wineusb.sys/wineusb.c +++ b/dlls/wineusb.sys/wineusb.c @@ -556,6 +556,7 @@ static NTSTATUS usb_submit_urb(struct usb_device *device, IRP *irp) case URB_FUNCTION_BULK_OR_INTERRUPT_TRANSFER: case URB_FUNCTION_GET_DESCRIPTOR_FROM_DEVICE: case URB_FUNCTION_SELECT_CONFIGURATION: + case URB_FUNCTION_VENDOR_DEVICE: case URB_FUNCTION_VENDOR_INTERFACE: { struct usb_submit_urb_params params = @@ -586,6 +587,7 @@ static NTSTATUS usb_submit_urb(struct usb_device *device, IRP *irp) break; } + case URB_FUNCTION_VENDOR_DEVICE: case URB_FUNCTION_VENDOR_INTERFACE: { struct _URB_CONTROL_VENDOR_OR_CLASS_REQUEST *req = &urb->UrbControlVendorClassRequest;

1 0

Hans Leidekker : ntoskrnl: Stub EtwRegisterClassicProvider() and EtwUnregister().
by Alexandre Julliard 22 Nov '23

22 Nov '23

Module: wine Branch: master Commit: 860a6d762f1eb9a3b2977061f15e7c5ba5144349 URL: https://gitlab.winehq.org/wine/wine/-/commit/860a6d762f1eb9a3b2977061f15e7c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 9 11:35:01 2023 +0100 ntoskrnl: Stub EtwRegisterClassicProvider() and EtwUnregister(). --- dlls/ntoskrnl.exe/ntoskrnl.c | 20 ++++++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 ++ 2 files changed, 22 insertions(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index ebff0a3f3aa..45b8e1ab1c1 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -27,6 +27,7 @@ #include "excpt.h" #include "winreg.h" #include "ntsecapi.h" +#include "evntprov.h" #include "ddk/csq.h" #include "wine/server.h" #include "wine/heap.h" @@ -4599,6 +4600,25 @@ void WINAPI KeLowerIrql(KIRQL new) #endif +typedef void (WINAPI *PETW_CLASSIC_CALLBACK)( + const GUID *guid, UCHAR control_code, void *enable_context, void *callback_context); + +NTSTATUS WINAPI EtwRegisterClassicProvider(const GUID *provider, ULONG type, PETW_CLASSIC_CALLBACK callback, + void *context, REGHANDLE *handle) +{ + FIXME("provider %s, type %lu, enable_callback %p, context %p, handle %p\n", debugstr_guid(provider), type, + callback, context, handle); + + *handle = 0xdeadbeef; + return STATUS_SUCCESS; +} + +NTSTATUS WINAPI EtwUnregister(REGHANDLE handle) +{ + FIXME("handle %I64x\n", handle); + return STATUS_SUCCESS; +} + /***************************************************** * DllMain */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index f3559c89b2e..aa7831eac5f 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1,3 +1,5 @@ +@ stdcall EtwRegisterClassicProvider(ptr long ptr ptr ptr) +@ stdcall EtwUnregister(int64) @ stdcall -arch=!i386 ExAcquireFastMutex(ptr) @ stdcall -fastcall ExAcquireFastMutexUnsafe(ptr) @ stub ExAcquireRundownProtection

1 0

Hans Leidekker : winhttp: Use an unsigned integer for number values in query_headers().
by Alexandre Julliard 22 Nov '23

22 Nov '23

Module: wine Branch: master Commit: 75b41873e630c4c3ffd85976eceaf33ceaf7640a URL: https://gitlab.winehq.org/wine/wine/-/commit/75b41873e630c4c3ffd85976eceaf3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 22 15:09:40 2023 +0100 winhttp: Use an unsigned integer for number values in query_headers(). --- dlls/winhttp/request.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 6ea71734cff..aed26d98c07 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -734,15 +734,15 @@ static DWORD query_headers( struct request *request, DWORD level, const WCHAR *n if (!header || (request_only && !header->is_request)) return ERROR_WINHTTP_HEADER_NOT_FOUND; if (level & WINHTTP_QUERY_FLAG_NUMBER) { - if (!buffer || sizeof(int) > *buflen) ret = ERROR_INSUFFICIENT_BUFFER; + if (!buffer || sizeof(DWORD) > *buflen) ret = ERROR_INSUFFICIENT_BUFFER; else { - int *number = buffer; - *number = wcstol( header->value, NULL, 10 ); - TRACE("returning number: %d\n", *number); + DWORD *number = buffer; + *number = wcstoul( header->value, NULL, 10 ); + TRACE("returning number: %lu\n", *number); ret = ERROR_SUCCESS; } - *buflen = sizeof(int); + *buflen = sizeof(DWORD); } else if (level & WINHTTP_QUERY_FLAG_SYSTEMTIME) {

1 0

Piotr Caban : msvcrt: Hold _ENV_LOCK when accessing environment variables.
by Alexandre Julliard 22 Nov '23

22 Nov '23

Module: wine Branch: master Commit: 141aa0a2834b3e2d171607940a870460b5c033a5 URL: https://gitlab.winehq.org/wine/wine/-/commit/141aa0a2834b3e2d171607940a8704… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 21 20:03:28 2023 +0100 msvcrt: Hold _ENV_LOCK when accessing environment variables. --- dlls/msvcrt/environ.c | 77 +++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 59 insertions(+), 18 deletions(-) diff --git a/dlls/msvcrt/environ.c b/dlls/msvcrt/environ.c index 3c90ec4bf21..9e358d971f9 100644 --- a/dlls/msvcrt/environ.c +++ b/dlls/msvcrt/environ.c @@ -21,6 +21,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include "msvcrt.h" +#include "mtdll.h" #include <winnls.h> #include "wine/debug.h" @@ -220,9 +221,14 @@ static char * getenv_helper(const char *name) */ char * CDECL getenv(const char *name) { + char *ret; + if (!MSVCRT_CHECK_PMT(name != NULL)) return NULL; - return getenv_helper(name); + _lock(_ENV_LOCK); + ret = getenv_helper(name); + _unlock(_ENV_LOCK); + return ret; } static wchar_t * wgetenv_helper(const wchar_t *name) @@ -242,9 +248,14 @@ static wchar_t * wgetenv_helper(const wchar_t *name) */ wchar_t * CDECL _wgetenv(const wchar_t *name) { + wchar_t *ret; + if (!MSVCRT_CHECK_PMT(name != NULL)) return NULL; - return wgetenv_helper(name); + _lock(_ENV_LOCK); + ret = wgetenv_helper(name); + _unlock(_ENV_LOCK); + return ret; } static int putenv_helper(const char *name, const char *val, const char *eq) @@ -253,7 +264,10 @@ static int putenv_helper(const char *name, const char *val, const char *eq) char *env; int r; - if (env_init(FALSE, TRUE)) return -1; + _lock(_ENV_LOCK); + r = env_init(FALSE, TRUE); + _unlock(_ENV_LOCK); + if (r) return -1; if (eq) { @@ -279,7 +293,9 @@ static int putenv_helper(const char *name, const char *val, const char *eq) return -1; } + _lock(_ENV_LOCK); r = env_set(&env, &wenv); + _unlock(_ENV_LOCK); free(env); free(wenv); return r; @@ -303,7 +319,10 @@ static int wputenv_helper(const wchar_t *name, const wchar_t *val, const wchar_t char *env; int r; - if (env_init(TRUE, TRUE)) return -1; + _lock(_ENV_LOCK); + r = env_init(TRUE, TRUE); + _unlock(_ENV_LOCK); + if (r) return -1; if (eq) { @@ -329,7 +348,9 @@ static int wputenv_helper(const wchar_t *name, const wchar_t *val, const wchar_t return -1; } + _lock(_ENV_LOCK); r = env_set(&env, &wenv); + _unlock(_ENV_LOCK); free(env); free(wenv); return r; @@ -420,20 +441,25 @@ int CDECL _dupenv_s(char **buffer, size_t *numberOfElements, const char *varname if (!MSVCRT_CHECK_PMT(buffer != NULL)) return EINVAL; if (!MSVCRT_CHECK_PMT(varname != NULL)) return EINVAL; + _lock(_ENV_LOCK); if (!(e = getenv(varname))) { + _unlock(_ENV_LOCK); *buffer = NULL; if (numberOfElements) *numberOfElements = 0; return 0; } sz = strlen(e) + 1; - if (!(*buffer = malloc(sz))) + *buffer = malloc(sz); + if (*buffer) strcpy(*buffer, e); + _unlock(_ENV_LOCK); + + if (!*buffer) { if (numberOfElements) *numberOfElements = 0; return *_errno() = ENOMEM; } - strcpy(*buffer, e); if (numberOfElements) *numberOfElements = sz; return 0; } @@ -450,20 +476,25 @@ int CDECL _wdupenv_s(wchar_t **buffer, size_t *numberOfElements, if (!MSVCRT_CHECK_PMT(buffer != NULL)) return EINVAL; if (!MSVCRT_CHECK_PMT(varname != NULL)) return EINVAL; + _lock(_ENV_LOCK); if (!(e = _wgetenv(varname))) { + _unlock(_ENV_LOCK); *buffer = NULL; if (numberOfElements) *numberOfElements = 0; return 0; } sz = wcslen(e) + 1; - if (!(*buffer = malloc(sz * sizeof(wchar_t)))) + *buffer = malloc(sz * sizeof(wchar_t)); + if (*buffer) wcscpy(*buffer, e); + _unlock(_ENV_LOCK); + + if (!*buffer) { if (numberOfElements) *numberOfElements = 0; return *_errno() = ENOMEM; } - wcscpy(*buffer, e); if (numberOfElements) *numberOfElements = sz; return 0; } @@ -482,12 +513,17 @@ int CDECL getenv_s(size_t *ret_len, char* buffer, size_t len, const char *varnam if (!MSVCRT_CHECK_PMT((buffer && len > 0) || (!buffer && !len))) return EINVAL; if (buffer) buffer[0] = 0; - if (!(e = getenv_helper(varname))) return 0; - *ret_len = strlen(e) + 1; - if (!len) return 0; - if (len < *ret_len) return ERANGE; + _lock(_ENV_LOCK); + e = getenv_helper(varname); + if (e) + { + *ret_len = strlen(e) + 1; + if (len >= *ret_len) strcpy(buffer, e); + } + _unlock(_ENV_LOCK); - strcpy(buffer, e); + if (!e || !len) return 0; + if (len < *ret_len) return ERANGE; return 0; } @@ -504,12 +540,17 @@ int CDECL _wgetenv_s(size_t *ret_len, wchar_t *buffer, size_t len, if (!MSVCRT_CHECK_PMT((buffer && len > 0) || (!buffer && !len))) return EINVAL; if (buffer) buffer[0] = 0; - if (!(e = wgetenv_helper(varname))) return 0; - *ret_len = wcslen(e) + 1; - if (!len) return 0; - if (len < *ret_len) return ERANGE; + _lock(_ENV_LOCK); + e = wgetenv_helper(varname); + if (e) + { + *ret_len = wcslen(e) + 1; + if (len >= *ret_len) wcscpy(buffer, e); + } + _unlock(_ENV_LOCK); - wcscpy(buffer, e); + if (!e || !len) return 0; + if (len < *ret_len) return ERANGE; return 0; }

1 0

Alex Henrie : d3dcompiler_43: Use CRT allocation functions.
by Alexandre Julliard 22 Nov '23

22 Nov '23

Module: wine Branch: master Commit: 9ba4c10035e780cdef14f4359fa55bd1782cdd0a URL: https://gitlab.winehq.org/wine/wine/-/commit/9ba4c10035e780cdef14f4359fa55b… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Nov 21 17:50:21 2023 -0700 d3dcompiler_43: Use CRT allocation functions. --- dlls/d3dcompiler_43/asmparser.c | 26 +++---- dlls/d3dcompiler_43/asmshader.y | 8 +-- dlls/d3dcompiler_43/blob.c | 18 ++--- dlls/d3dcompiler_43/bytecodewriter.c | 77 +++++++++++---------- dlls/d3dcompiler_43/compiler.c | 24 +++---- dlls/d3dcompiler_43/d3dcompiler_private.h | 18 ----- dlls/d3dcompiler_43/reflection.c | 109 +++++++++++++----------------- dlls/d3dcompiler_43/utils.c | 4 +- 8 files changed, 125 insertions(+), 159 deletions(-)

1 0

Zhiyi Zhang : msdasql/tests: Fix memory leaks.
by Alexandre Julliard 22 Nov '23

22 Nov '23

Module: wine Branch: master Commit: b54e1ec604419326356a733c3884dbee1d4ee0c9 URL: https://gitlab.winehq.org/wine/wine/-/commit/b54e1ec604419326356a733c3884db… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Nov 21 10:50:42 2023 +0800 msdasql/tests: Fix memory leaks. --- dlls/msdasql/tests/provider.c | 42 ++++++++++++++++++++++++++++++++---------- 1 file changed, 32 insertions(+), 10 deletions(-) diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index bb549bb2262..b6936be31b5 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -43,6 +43,32 @@ static char mdbpath[MAX_PATH]; static const VARTYPE intptr_vartype = (sizeof(void *) == 8 ? VT_I8 : VT_I4); +static void free_dbpropset(ULONG count, DBPROPSET *propset) +{ + ULONG i, j; + + for (i = 0; i < count; i++) + { + for (j = 0; j < propset[i].cProperties; j++) + VariantClear(&propset[i].rgProperties[j].vValue); + CoTaskMemFree(propset[i].rgProperties); + } + CoTaskMemFree(propset); +} + +static void free_dbpropinfoset(ULONG count, DBPROPINFOSET *propinfoset) +{ + ULONG i, j; + + for (i = 0; i < count; i++) + { + for (j = 0; j < propinfoset[i].cPropertyInfos; j++) + VariantClear(&propinfoset[i].rgPropertyInfos[j].vValues); + CoTaskMemFree(propinfoset[i].rgPropertyInfos); + } + CoTaskMemFree(propinfoset); +} + static void test_msdasql(void) { HRESULT hr; @@ -125,11 +151,8 @@ static void test_Properties(void) propidlist.rgPropertyIDs[i] = propinfoset->rgPropertyInfos[i].dwPropertyID; } - for (i = 0; i < propinfoset->cPropertyInfos; i++) - VariantClear(&propinfoset->rgPropertyInfos[i].vValues); - - CoTaskMemFree(propinfoset->rgPropertyInfos); - CoTaskMemFree(propinfoset); + free_dbpropinfoset(infocount, propinfoset); + CoTaskMemFree(desc); hr = IDBProperties_GetProperties(props, 1, &propidlist, &propcnt, &propset); ok(hr == S_OK, "got 0x%08lx\n", hr); @@ -162,7 +185,7 @@ static void test_Properties(void) } CoTaskMemFree(propidlist.rgPropertyIDs); - CoTaskMemFree(propset); + free_dbpropset(propcnt, propset); } propid = DBPROP_MULTIPLERESULTS; @@ -179,7 +202,7 @@ static void test_Properties(void) ok(propset->rgProperties[0].dwPropertyID == DBPROP_MULTIPLERESULTS, "got %ld\n", propset->rgProperties[0].dwPropertyID); ok(propset->rgProperties[0].dwStatus == DBPROPSTATUS_NOTSUPPORTED, "got %ld\n", propset->rgProperties[0].dwStatus); - CoTaskMemFree(propset); + free_dbpropset(propcnt, propset); IDBProperties_Release(props); } @@ -324,7 +347,7 @@ static void test_command_properties(ICommandProperties *props) } } - CoTaskMemFree(propset); + free_dbpropset(count, propset); } static void test_command_interfaces(IUnknown *cmd) @@ -528,8 +551,7 @@ static void test_rowset_info(IRowset *rowset) propset->rgProperties[i].dwPropertyID, row_props[i]); } - CoTaskMemFree(propset); - + free_dbpropset(propcnt, propset); IRowsetInfo_Release(info); }

1 0