November 2023 - Wine-Commits

Fabian Maurer : msvcrt: Fsetpos resets EOF flag.
by Alexandre Julliard Nov. 6, 2023

Nov. 6, 2023

Module: wine Branch: master Commit: 8e56d0feb5f08fef1df8810a79d4da0a63373974 URL: https://gitlab.winehq.org/wine/wine/-/commit/8e56d0feb5f08fef1df8810a79d4da… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Thu Nov 2 02:43:31 2023 +0100 msvcrt: Fsetpos resets EOF flag. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55856 --- dlls/msvcrt/file.c | 14 +------------- dlls/msvcrt/tests/file.c | 45 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 45 insertions(+), 14 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 7cccf96b1c7..3c1d9572585 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -4682,19 +4682,7 @@ errno_t CDECL freopen_s(FILE** pFile, */ int CDECL fsetpos(FILE* file, fpos_t *pos) { - int ret; - - _lock_file(file); - msvcrt_flush_buffer(file); - - /* Reset direction of i/o */ - if(file->_flag & _IORW) { - file->_flag &= ~(_IOREAD|_IOWRT); - } - - ret = (_lseeki64(file->_file,*pos,SEEK_SET) == -1) ? -1 : 0; - _unlock_file(file); - return ret; + return _fseeki64(file,*pos,SEEK_SET); } /********************************************************************* diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 71b3e1399f8..75d30648230 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -226,7 +226,50 @@ static void test_fileops( void ) ok(fread(buffer, sizeof(buffer), 1, file) == 0, "fread test failed\n"); /* feof should be set now */ ok(feof(file), "feof after fread failed\n"); - fclose (file); + clearerr(file); + ok(!feof(file), "feof after clearerr failed\n"); + fclose(file); + + file = fopen("fdopen.tst", "rb"); + ok( file != NULL, "fopen failed\n"); + /* sizeof(buffer) > content of file */ + ok(fread(buffer, sizeof(buffer), 1, file) == 0, "fread test failed\n"); + /* feof should be set now */ + ok(feof(file), "feof after fread failed\n"); + rewind(file); + ok(!feof(file), "feof after rewind failed\n"); + fclose(file); + + file = fopen("fdopen.tst", "rb"); + ok( file != NULL, "fopen failed\n"); + /* sizeof(buffer) > content of file */ + ok(fread(buffer, sizeof(buffer), 1, file) == 0, "fread test failed\n"); + /* feof should be set now */ + ok(feof(file), "feof after fread failed\n"); + fseek(file, 0, SEEK_SET); + ok(!feof(file), "feof after fseek failed\n"); + fclose(file); + + file = fopen("fdopen.tst", "rb"); + ok( file != NULL, "fopen failed\n"); + /* sizeof(buffer) > content of file */ + ok(fread(buffer, sizeof(buffer), 1, file) == 0, "fread test failed\n"); + /* feof should be set now */ + ok(feof(file), "feof after fread failed\n"); + fgetpos(file, &pos); + fsetpos(file, &pos); + ok(!feof(file), "feof after fsetpos failed\n"); + fclose(file); + + file = fopen("fdopen.tst", "rb"); + ok( file != NULL, "fopen failed\n"); + /* sizeof(buffer) > content of file */ + ok(fread(buffer, sizeof(buffer), 1, file) == 0, "fread test failed\n"); + /* feof should be set now */ + ok(feof(file), "feof after fread failed\n"); + fsetpos(file, &pos); + ok(!feof(file), "feof after fsetpos failed\n"); + fclose(file); unlink ("fdopen.tst"); }

1 0

Alex Henrie : vulkan-1/tests: Use CRT allocation functions.
by Alexandre Julliard Nov. 6, 2023

Nov. 6, 2023

Module: wine Branch: master Commit: c9ff04c35c04c26c05586eb5968a3d1f338d5a11 URL: https://gitlab.winehq.org/wine/wine/-/commit/c9ff04c35c04c26c05586eb5968a3d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sat Nov 4 21:00:18 2023 -0700 vulkan-1/tests: Use CRT allocation functions. --- dlls/vulkan-1/tests/vulkan.c | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/dlls/vulkan-1/tests/vulkan.c b/dlls/vulkan-1/tests/vulkan.c index b9a36a55653..e68f4fa94c3 100644 --- a/dlls/vulkan-1/tests/vulkan.c +++ b/dlls/vulkan-1/tests/vulkan.c @@ -17,7 +17,6 @@ */ #include "windows.h" -#include "wine/heap.h" #include "wine/vulkan.h" #include "wine/test.h" @@ -72,7 +71,7 @@ static VkBool32 find_queue_family(VkPhysicalDevice vk_physical_device, uint32_t i, count; vkGetPhysicalDeviceQueueFamilyProperties(vk_physical_device, &count, NULL); - properties = heap_calloc(count, sizeof(*properties)); + properties = calloc(count, sizeof(*properties)); ok(!!properties, "Failed to allocate memory.\n"); vkGetPhysicalDeviceQueueFamilyProperties(vk_physical_device, &count, properties); @@ -86,7 +85,7 @@ static VkBool32 find_queue_family(VkPhysicalDevice vk_physical_device, } } - heap_free(properties); + free(properties); return ret; } @@ -184,7 +183,7 @@ static void test_enumerate_physical_device2(void) return; } - vk_physical_devices = heap_calloc(count, sizeof(*vk_physical_devices)); + vk_physical_devices = calloc(count, sizeof(*vk_physical_devices)); ok(!!vk_physical_devices, "Failed to allocate memory.\n"); vr = vkEnumeratePhysicalDevices(vk_instance, &count, vk_physical_devices); ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr); @@ -225,7 +224,7 @@ static void test_enumerate_physical_device2(void) } } - heap_free(vk_physical_devices); + free(vk_physical_devices); vkDestroyInstance(vk_instance, NULL); } @@ -238,7 +237,7 @@ static void enumerate_device_queues(VkPhysicalDevice vk_physical_device) vkGetPhysicalDeviceProperties(vk_physical_device, &device_properties); vkGetPhysicalDeviceQueueFamilyProperties(vk_physical_device, &count, NULL); - properties = heap_calloc(count, sizeof(*properties)); + properties = calloc(count, sizeof(*properties)); ok(!!properties, "Failed to allocate memory.\n"); vkGetPhysicalDeviceQueueFamilyProperties(vk_physical_device, &count, properties); @@ -248,7 +247,7 @@ static void enumerate_device_queues(VkPhysicalDevice vk_physical_device) device_properties.deviceName, i, properties[i].queueFlags, properties[i].queueCount); } - heap_free(properties); + free(properties); } static void test_physical_device_groups(void) @@ -278,7 +277,7 @@ static void test_physical_device_groups(void) ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr); ok(count > 0, "Unexpected device group count %u.\n", count); - properties = heap_calloc(count, sizeof(*properties)); + properties = calloc(count, sizeof(*properties)); ok(!!properties, "Failed to allocate memory.\n"); vr = vkEnumeratePhysicalDeviceGroupsKHR(vk_instance, &count, properties); ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr); @@ -307,7 +306,7 @@ static void test_physical_device_groups(void) ok(vr == VK_SUCCESS, "Failed to create device, VkResult %d.\n", vr); vkDestroyDevice(vk_device, NULL); - heap_free(properties); + free(properties); vkDestroyInstance(vk_instance, NULL); } @@ -488,10 +487,10 @@ static void test_null_hwnd(VkInstance vk_instance, VkPhysicalDevice vk_physical_ vr = vkGetPhysicalDeviceSurfaceFormatsKHR(vk_physical_device, surface, &count, NULL); ok(vr == VK_SUCCESS, "Got unexpected vr %d.\n", vr); ok(count, "Got zero count.\n"); - formats = heap_alloc(sizeof(*formats) * count); + formats = malloc(sizeof(*formats) * count); vr = vkGetPhysicalDeviceSurfaceFormatsKHR(vk_physical_device, surface, &count, formats); ok(vr == VK_SUCCESS, "Got unexpected vr %d.\n", vr); - heap_free(formats); + free(formats); vr = vkGetPhysicalDeviceSurfaceSupportKHR(vk_physical_device, queue_family_index, surface, &bval); ok(vr == VK_SUCCESS, "Got unexpected vr %d.\n", vr); @@ -503,10 +502,10 @@ static void test_null_hwnd(VkInstance vk_instance, VkPhysicalDevice vk_physical_ vr = pvkGetPhysicalDeviceSurfacePresentModesKHR(vk_physical_device, surface, &count, NULL); ok(vr == VK_SUCCESS, "Got unexpected vr %d.\n", vr); ok(count, "Got zero count.\n"); - modes = heap_alloc(sizeof(*modes) * count); + modes = malloc(sizeof(*modes) * count); vr = pvkGetPhysicalDeviceSurfacePresentModesKHR(vk_physical_device, surface, &count, modes); ok(vr == VK_SUCCESS, "Got unexpected vr %d.\n", vr); - heap_free(modes); + free(modes); if (pvkGetPhysicalDevicePresentRectanglesKHR) { @@ -902,7 +901,7 @@ static void for_each_device_instance(uint32_t extension_count, const char * cons return; } - vk_physical_devices = heap_calloc(count, sizeof(*vk_physical_devices)); + vk_physical_devices = calloc(count, sizeof(*vk_physical_devices)); ok(!!vk_physical_devices, "Failed to allocate memory.\n"); vr = vkEnumeratePhysicalDevices(vk_instance, &count, vk_physical_devices); ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr); @@ -915,7 +914,7 @@ static void for_each_device_instance(uint32_t extension_count, const char * cons test_func(vk_physical_devices[i]); } - heap_free(vk_physical_devices); + free(vk_physical_devices); vkDestroyInstance(vk_instance, NULL); }

1 0

Alexandre Julliard : include: Use proper dllimports for cryptdlg functions.
by Alexandre Julliard Nov. 6, 2023

Nov. 6, 2023

Module: wine Branch: master Commit: 175887749f52d1da3cb2f14289ae13314866698c URL: https://gitlab.winehq.org/wine/wine/-/commit/175887749f52d1da3cb2f14289ae13… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 3 17:03:34 2023 +0100 include: Use proper dllimports for cryptdlg functions. --- dlls/cryptdlg/Makefile.in | 1 + include/cryptdlg.h | 24 +++++++++++++++--------- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/dlls/cryptdlg/Makefile.in b/dlls/cryptdlg/Makefile.in index 1b71d6cf10e..7669e79e3f0 100644 --- a/dlls/cryptdlg/Makefile.in +++ b/dlls/cryptdlg/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -D_CRYPTDLG_ MODULE = cryptdlg.dll IMPORTS = cryptui crypt32 wintrust user32 advapi32 diff --git a/include/cryptdlg.h b/include/cryptdlg.h index 47bd9843d59..265f6e140bc 100644 --- a/include/cryptdlg.h +++ b/include/cryptdlg.h @@ -20,6 +20,14 @@ #include <prsht.h> +#ifndef CRYPTDLGAPI +#ifdef _CRYPTDLG_ +#define CRYPTDLGAPI +#else +#define CRYPTDLGAPI DECLSPEC_IMPORT +#endif +#endif + #ifdef __cplusplus extern "C" { #endif @@ -115,8 +123,8 @@ typedef struct tagCSSW #define CERT_SELECT_STRUCT WINELIB_NAME_AW(CERT_SELECT_STRUCT_) -BOOL WINAPI CertSelectCertificateA(PCERT_SELECT_STRUCT_A pCertSelectInfo); -BOOL WINAPI CertSelectCertificateW(PCERT_SELECT_STRUCT_W pCertSelectInfo); +CRYPTDLGAPI BOOL WINAPI CertSelectCertificateA(PCERT_SELECT_STRUCT_A pCertSelectInfo); +CRYPTDLGAPI BOOL WINAPI CertSelectCertificateW(PCERT_SELECT_STRUCT_W pCertSelectInfo); #define CertSelectCertificate WINELIB_NAME_AW(CertSelectCertificate) #define CM_VIEWFLAGS_MASK 0x00ffffff @@ -196,8 +204,8 @@ typedef struct tagCERT_VIEWPROPERTIES_STRUCT_W #define PCERT_VIEWPROPERTIES_STRUCT \ WINELIB_NAME_AW(PCERT_VIEWPROPERTIES_STRUCT_) -BOOL WINAPI CertViewPropertiesA(PCERT_VIEWPROPERTIES_STRUCT_A pCertViewInfo); -BOOL WINAPI CertViewPropertiesW(PCERT_VIEWPROPERTIES_STRUCT_W pCertViewInfo); +CRYPTDLGAPI BOOL WINAPI CertViewPropertiesA(PCERT_VIEWPROPERTIES_STRUCT_A pCertViewInfo); +CRYPTDLGAPI BOOL WINAPI CertViewPropertiesW(PCERT_VIEWPROPERTIES_STRUCT_W pCertViewInfo); #define CertViewProperties WINELIB_NAME_AW(CertViewProperties) #define CERT_FILTER_OP_EXISTS 1 @@ -227,10 +235,8 @@ typedef struct tagCMFLTR DWORD dwCheckingFlags; } CERT_FILTER_DATA; -DWORD WINAPI GetFriendlyNameOfCertA(PCCERT_CONTEXT pccert, LPSTR pchBuffer, - DWORD cchBuffer); -DWORD WINAPI GetFriendlyNameOfCertW(PCCERT_CONTEXT pccert, LPWSTR pchBuffer, - DWORD cchBuffer); +CRYPTDLGAPI DWORD WINAPI GetFriendlyNameOfCertA(PCCERT_CONTEXT pccert, LPSTR pchBuffer, DWORD cchBuffer); +CRYPTDLGAPI DWORD WINAPI GetFriendlyNameOfCertW(PCCERT_CONTEXT pccert, LPWSTR pchBuffer, DWORD cchBuffer); #define GetFriendlyNameOfCert WINELIB_NAME_AW(GetFriendlyNameOfCert) #define CERT_CERTIFICATE_ACTION_VERIFY \ @@ -302,7 +308,7 @@ typedef struct _CTL_MODIFY_REQUEST DWORD dwError; } CTL_MODIFY_REQUEST, *PCTL_MODIFY_REQUEST; -HRESULT WINAPI CertModifyCertificatesToTrust(int cCertStore, +CRYPTDLGAPI HRESULT WINAPI CertModifyCertificatesToTrust(int cCertStore, PCTL_MODIFY_REQUEST rgCerts, LPCSTR szPurpose, HWND hwnd, HCERTSTORE hcertstoreTrust);

1 0

Ziqing Hui : winegstreamer: Create parser for muxer stream.
by Alexandre Julliard Nov. 6, 2023

Nov. 6, 2023

Module: wine Branch: master Commit: 29a8faf19f9ddc3274150e1bf39a0b154eeebb1e URL: https://gitlab.winehq.org/wine/wine/-/commit/29a8faf19f9ddc3274150e1bf39a0b… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Mon Oct 30 09:37:10 2023 +0800 winegstreamer: Create parser for muxer stream. --- dlls/winegstreamer/wg_muxer.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/winegstreamer/wg_muxer.c b/dlls/winegstreamer/wg_muxer.c index 793444ad243..64a19a2ff44 100644 --- a/dlls/winegstreamer/wg_muxer.c +++ b/dlls/winegstreamer/wg_muxer.c @@ -46,7 +46,8 @@ struct wg_muxer_stream uint32_t id; GstPad *my_src; - GstCaps *my_src_caps; + GstCaps *my_src_caps, *parser_src_caps; + GstElement *parser; struct list entry; }; @@ -76,6 +77,8 @@ static gboolean muxer_sink_query_cb(GstPad *pad, GstObject *parent, GstQuery *qu static void stream_free(struct wg_muxer_stream *stream) { + if (stream->parser_src_caps) + gst_caps_unref(stream->parser_src_caps); gst_object_unref(stream->my_src); gst_caps_unref(stream->my_src_caps); free(stream); @@ -200,6 +203,22 @@ NTSTATUS wg_muxer_add_stream(void *args) goto out; gst_pad_set_element_private(stream->my_src, stream); + /* Create parser. */ + if ((stream->parser = find_element(GST_ELEMENT_FACTORY_TYPE_PARSER, stream->my_src_caps, NULL))) + { + GstPad *parser_src; + + if (!gst_bin_add(GST_BIN(muxer->container), stream->parser) + || !link_src_to_element(stream->my_src, stream->parser)) + goto out; + + parser_src = gst_element_get_static_pad(stream->parser, "src"); + stream->parser_src_caps = gst_pad_query_caps(parser_src, NULL); + GST_INFO("Created parser %"GST_PTR_FORMAT" for stream %u %p.", + stream->parser, stream->id, stream); + gst_object_unref(parser_src); + } + /* Add to muxer stream list. */ list_add_tail(&muxer->streams, &stream->entry); @@ -210,6 +229,8 @@ NTSTATUS wg_muxer_add_stream(void *args) return STATUS_SUCCESS; out: + if (stream->parser) + gst_object_unref(stream->parser); if (stream->my_src) gst_object_unref(stream->my_src); if (template)

1 0

Ziqing Hui : winegstreamer: Implement wg_muxer_start.
by Alexandre Julliard Nov. 6, 2023

Nov. 6, 2023

Module: wine Branch: master Commit: 7cee5e5580decd8071dc0dfeb7158d4f7ef74bcd URL: https://gitlab.winehq.org/wine/wine/-/commit/7cee5e5580decd8071dc0dfeb7158d… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Mon Sep 25 11:52:29 2023 +0800 winegstreamer: Implement wg_muxer_start. --- dlls/winegstreamer/gst_private.h | 1 + dlls/winegstreamer/main.c | 15 ++++ dlls/winegstreamer/media_sink.c | 9 ++- dlls/winegstreamer/unix_private.h | 1 + dlls/winegstreamer/unixlib.h | 1 + dlls/winegstreamer/wg_muxer.c | 160 +++++++++++++++++++++++++++++++------- dlls/winegstreamer/wg_parser.c | 2 + 7 files changed, 159 insertions(+), 30 deletions(-)

1 0

Alex Henrie : winmm/tests: Use CRT allocation functions.
by Alexandre Julliard Nov. 6, 2023

Nov. 6, 2023

Module: wine Branch: master Commit: bb6bcaf83e91882e0a523a4455ed7174b3ce3ad4 URL: https://gitlab.winehq.org/wine/wine/-/commit/bb6bcaf83e91882e0a523a4455ed71… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Nov 1 23:28:24 2023 -0600 winmm/tests: Use CRT allocation functions. --- dlls/winmm/tests/capture.c | 15 +++++++-------- dlls/winmm/tests/midi.c | 16 ++++++++-------- dlls/winmm/tests/mixer.c | 10 ++++------ dlls/winmm/tests/wave.c | 29 ++++++++++++++--------------- 4 files changed, 33 insertions(+), 37 deletions(-)

1 0

Alex Henrie : gdi32/tests: Use CRT allocation functions.
by Alexandre Julliard Nov. 6, 2023

Nov. 6, 2023

Module: wine Branch: master Commit: 0b7eed0310a2d1272a97d8a45ec37fa03a9c26c8 URL: https://gitlab.winehq.org/wine/wine/-/commit/0b7eed0310a2d1272a97d8a45ec37f… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 2 00:16:14 2023 -0600 gdi32/tests: Use CRT allocation functions. --- dlls/gdi32/tests/bitmap.c | 72 +++++++++++++++++------------------ dlls/gdi32/tests/dc.c | 18 ++++----- dlls/gdi32/tests/dib.c | 20 +++++----- dlls/gdi32/tests/font.c | 91 ++++++++++++++++++++++----------------------- dlls/gdi32/tests/metafile.c | 40 ++++++++++---------- dlls/gdi32/tests/path.c | 8 ++-- 6 files changed, 124 insertions(+), 125 deletions(-)

1 0

Alex Henrie : setupapi/tests: Use CRT allocation functions.
by Alexandre Julliard Nov. 6, 2023

Nov. 6, 2023

Module: wine Branch: master Commit: eea358e6cbe8e9ee5c0b211d42bd7fe2a13449d9 URL: https://gitlab.winehq.org/wine/wine/-/commit/eea358e6cbe8e9ee5c0b211d42bd7f… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sat Nov 4 20:54:49 2023 -0700 setupapi/tests: Use CRT allocation functions. --- dlls/setupapi/tests/devinst.c | 5 ++--- dlls/setupapi/tests/install.c | 6 +++--- dlls/setupapi/tests/misc.c | 8 ++++---- dlls/setupapi/tests/query.c | 18 +++++++++--------- 4 files changed, 18 insertions(+), 19 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index be0831f6882..2dc891d61f1 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -33,7 +33,6 @@ #include "cfgmgr32.h" #include "cguid.h" -#include "wine/heap.h" #include "wine/test.h" /* This is a unique guid for testing purposes */ @@ -1233,7 +1232,7 @@ static void test_device_iface_detail(void) expected_size = FIELD_OFFSET(SP_DEVICE_INTERFACE_DETAIL_DATA_A, DevicePath[strlen(path) + 1]); ok(size == expected_size, "Expected size %lu, got %lu.\n", expected_size, size); - detail = heap_alloc(size * 2); + detail = malloc(size * 2); detail->cbSize = 0; SetLastError(0xdeadbeef); @@ -1283,7 +1282,7 @@ static void test_device_iface_detail(void) ok(size == expected_size, "Expected size %lu, got %lu.\n", expected_size, size); ok(IsEqualGUID(&device.ClassGuid, &guid), "Got unexpected class %s.\n", wine_dbgstr_guid(&device.ClassGuid)); - heap_free(detail); + free(detail); SetupDiDestroyDeviceInfoList(set); } diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c index 318f1294210..d33925f128e 100644 --- a/dlls/setupapi/tests/install.c +++ b/dlls/setupapi/tests/install.c @@ -207,17 +207,17 @@ static BOOL CDECL get_temp_file(char *pszTempName, int cbTempName, void *pv) { LPSTR tempname; - tempname = HeapAlloc(GetProcessHeap(), 0, MAX_PATH); + tempname = malloc(MAX_PATH); GetTempFileNameA(".", "xx", 0, tempname); if (tempname && (strlen(tempname) < (unsigned)cbTempName)) { lstrcpyA(pszTempName, tempname); - HeapFree(GetProcessHeap(), 0, tempname); + free(tempname); return TRUE; } - HeapFree(GetProcessHeap(), 0, tempname); + free(tempname); return FALSE; } diff --git a/dlls/setupapi/tests/misc.c b/dlls/setupapi/tests/misc.c index b9eb3e6c75f..6fda69f9e39 100644 --- a/dlls/setupapi/tests/misc.c +++ b/dlls/setupapi/tests/misc.c @@ -109,7 +109,7 @@ static void test_original_file_name(LPCSTR original, LPCSTR dest) res = SetupGetInfInformationA(hinf, INFINFO_INF_SPEC_IS_HINF, NULL, 0, &size); ok(res, "SetupGetInfInformation failed with error %ld\n", GetLastError()); - pspii = HeapAlloc(GetProcessHeap(), 0, size); + pspii = malloc(size); res = SetupGetInfInformationA(hinf, INFINFO_INF_SPEC_IS_HINF, pspii, size, NULL); ok(res, "SetupGetInfInformation failed with error %ld\n", GetLastError()); @@ -125,7 +125,7 @@ static void test_original_file_name(LPCSTR original, LPCSTR dest) ok(!spofi.OriginalCatalogName[0], "spofi.OriginalCatalogName should have been \"\" instead of \"%s\"\n", spofi.OriginalCatalogName); ok(!strcmp(original, spofi.OriginalInfName), "spofi.OriginalInfName of %s didn't match real original name %s\n", spofi.OriginalInfName, original); - HeapFree(GetProcessHeap(), 0, pspii); + free(pspii); SetupCloseInfFile(hinf); } @@ -371,12 +371,12 @@ static BOOL compare_file_data(LPSTR file, const BYTE *data, DWORD size) LPBYTE buffer; handle = CreateFileA(file, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); - buffer = HeapAlloc(GetProcessHeap(), 0, size); + buffer = malloc(size); if (buffer) { ReadFile(handle, buffer, size, &read, NULL); if (read == size && !memcmp(data, buffer, size)) ret = TRUE; - HeapFree(GetProcessHeap(), 0, buffer); + free(buffer); } CloseHandle(handle); return ret; diff --git a/dlls/setupapi/tests/query.c b/dlls/setupapi/tests/query.c index 6258727c076..f7aeba41153 100644 --- a/dlls/setupapi/tests/query.c +++ b/dlls/setupapi/tests/query.c @@ -120,7 +120,7 @@ static BOOL check_info_filename(PSP_INF_INFORMATION info, LPSTR test) if (!SetupQueryInfFileInformationA(info, 0, NULL, 0, &size)) return FALSE; - filename = HeapAlloc(GetProcessHeap(), 0, size); + filename = malloc(size); if (!filename) return FALSE; @@ -129,7 +129,7 @@ static BOOL check_info_filename(PSP_INF_INFORMATION info, LPSTR test) if (!lstrcmpiA(test, filename)) ret = TRUE; - HeapFree(GetProcessHeap(), 0, filename); + free(filename); return ret; } @@ -142,7 +142,7 @@ static PSP_INF_INFORMATION alloc_inf_info(LPCSTR filename, DWORD search, PDWORD if (!ret) return NULL; - info = HeapAlloc(GetProcessHeap(), 0, *size); + info = malloc(*size); return info; } @@ -234,7 +234,7 @@ static void test_SetupGetInfInformation(void) ret = SetupGetInfInformationA(inf_filename, INFINFO_INF_NAME_IS_ABSOLUTE, NULL, size, NULL); ok(ret == FALSE, "Expected SetupGetInfInformation to fail\n"); - info = HeapAlloc(GetProcessHeap(), 0, size); + info = malloc(size); /* try valid ReturnBuffer but too small size */ SetLastError(0xbeefcafe); @@ -248,7 +248,7 @@ static void test_SetupGetInfInformation(void) ok(ret == TRUE, "Expected SetupGetInfInformation to succeed\n"); ok(check_info_filename(info, inf_filename), "Expected returned filename to be equal\n"); - HeapFree(GetProcessHeap(), 0, info); + free(info); /* try the INFINFO_INF_SPEC_IS_HINF search flag */ hinf = SetupOpenInfFileA(inf_filename, NULL, INF_STYLE_WIN4, NULL); @@ -269,7 +269,7 @@ static void test_SetupGetInfInformation(void) } ok(ret, "can't create inf file %lu\n", GetLastError()); - HeapFree(GetProcessHeap(), 0, info); + free(info); info = alloc_inf_info("test.inf", INFINFO_DEFAULT_SEARCH, &size); /* check if system32 is searched for inf */ @@ -284,7 +284,7 @@ static void test_SetupGetInfInformation(void) lstrcatA(inf_one, "test.inf"); create_inf_file(inf_one, inf_data1, sizeof(inf_data1) - 1); - HeapFree(GetProcessHeap(), 0, info); + free(info); info = alloc_inf_info("test.inf", INFINFO_DEFAULT_SEARCH, &size); /* test the INFINFO_DEFAULT_SEARCH search flag */ @@ -292,7 +292,7 @@ static void test_SetupGetInfInformation(void) ok(ret == TRUE, "Expected SetupGetInfInformation to succeed: %ld\n", GetLastError()); ok(check_info_filename(info, inf_one), "Expected returned filename to be equal\n"); - HeapFree(GetProcessHeap(), 0, info); + free(info); info = alloc_inf_info("test.inf", INFINFO_REVERSE_DEFAULT_SEARCH, &size); /* test the INFINFO_REVERSE_DEFAULT_SEARCH search flag */ @@ -301,7 +301,7 @@ static void test_SetupGetInfInformation(void) ok(check_info_filename(info, revfile), "Expected returned filename to be equal\n"); done: - HeapFree(GetProcessHeap(), 0, info); + free(info); DeleteFileA(inf_filename); DeleteFileA(inf_one); DeleteFileA(inf_two);

1 0

Alex Henrie : virtdisk/tests: Use CRT allocation functions.
by Alexandre Julliard Nov. 6, 2023

Nov. 6, 2023

Module: wine Branch: master Commit: 26ad81228644168f497925c2126d90d6f5c19994 URL: https://gitlab.winehq.org/wine/wine/-/commit/26ad81228644168f497925c2126d90… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sat Nov 4 20:59:20 2023 -0700 virtdisk/tests: Use CRT allocation functions. --- dlls/virtdisk/tests/virtdisk.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/virtdisk/tests/virtdisk.c b/dlls/virtdisk/tests/virtdisk.c index bbbaf4d45e4..13c7dd7e693 100644 --- a/dlls/virtdisk/tests/virtdisk.c +++ b/dlls/virtdisk/tests/virtdisk.c @@ -20,7 +20,6 @@ #include "windef.h" #include "initguid.h" #include "virtdisk.h" -#include "wine/heap.h" #include "wine/test.h" static DWORD (WINAPI *pGetStorageDependencyInformation)(HANDLE,GET_STORAGE_DEPENDENCY_FLAG,ULONG,STORAGE_DEPENDENCY_INFO*,ULONG*); @@ -37,7 +36,7 @@ static void test_GetStorageDependencyInformation(void) ok(handle != INVALID_HANDLE_VALUE, "Expected a handle\n"); size = sizeof(STORAGE_DEPENDENCY_INFO); - info = heap_alloc(size); + info = malloc(size); ret = pGetStorageDependencyInformation(handle, GET_STORAGE_DEPENDENCY_FLAG_DISK_HANDLE, 0, info, 0); ok(ret == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %ld\n", ret); @@ -45,7 +44,7 @@ static void test_GetStorageDependencyInformation(void) ret = pGetStorageDependencyInformation(handle, GET_STORAGE_DEPENDENCY_FLAG_DISK_HANDLE, size, NULL, 0); ok(ret == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %ld\n", ret); - heap_free(info); + free(info); CloseHandle(handle); }

1 0

Brendan Shanks : winemac.drv: Fix minimizing windows programmatically from Win32 when Stage Manager is enabled.
by Alexandre Julliard Nov. 6, 2023

Nov. 6, 2023

Module: wine Branch: master Commit: ffdbd8357f71c515b9643d400eb43547cf235905 URL: https://gitlab.winehq.org/wine/wine/-/commit/ffdbd8357f71c515b9643d400eb435… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Fri Nov 3 14:02:03 2023 -0700 winemac.drv: Fix minimizing windows programmatically from Win32 when Stage Manager is enabled. --- dlls/winemac.drv/cocoa_window.m | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 820bb606769..1655ea98ef7 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -1340,10 +1340,20 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi { if ([self wouldBeVisible]) { - if ([self styleMask] & NSWindowStyleMaskFullScreen) + if (([self styleMask] & NSWindowStyleMaskFullScreen) || stage_manager_enabled()) { [self postDidUnminimizeEvent]; discard &= ~event_mask_for_type(WINDOW_DID_UNMINIMIZE); + + /* When Stage Manager is enabled, it's not possible to minimize the window + * (miniaturize: just moves the window to the background). + * Post an unminimize event, then miniaturize:. + */ + if (stage_manager_enabled()) + { + [self setStyleMask:([self styleMask] | NSWindowStyleMaskMiniaturizable)]; + [super miniaturize:nil]; + } } else {

1 0