November 2023 - Wine-commits

Daniel Lehman : msxml4/tests: Use wide string literals.
by Alexandre Julliard 03 Nov '23

03 Nov '23

Module: wine Branch: master Commit: e1b2b4e0e65b533ae8b97c78de82c9867953223b URL: https://gitlab.winehq.org/wine/wine/-/commit/e1b2b4e0e65b533ae8b97c78de82c9… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Mon Oct 30 23:27:57 2023 -0700 msxml4/tests: Use wide string literals. --- dlls/msxml4/tests/domdoc.c | 76 +++++++++++++++++++++------------------------- 1 file changed, 34 insertions(+), 42 deletions(-) diff --git a/dlls/msxml4/tests/domdoc.c b/dlls/msxml4/tests/domdoc.c index 39fe8c5a995..2eaf133f3ee 100644 --- a/dlls/msxml4/tests/domdoc.c +++ b/dlls/msxml4/tests/domdoc.c @@ -39,18 +39,10 @@ static BSTR alloced_bstrs[256]; static int alloced_bstrs_count; -static BSTR alloc_str_from_narrow(const char *str) -{ - int len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); - BSTR ret = SysAllocStringLen(NULL, len - 1); /* NUL character added automatically */ - MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); - return ret; -} - -static BSTR _bstr_(const char *str) +static BSTR _bstr_(const WCHAR *str) { assert(alloced_bstrs_count < ARRAY_SIZE(alloced_bstrs)); - alloced_bstrs[alloced_bstrs_count] = alloc_str_from_narrow(str); + alloced_bstrs[alloced_bstrs_count] = SysAllocString(str); return alloced_bstrs[alloced_bstrs_count++]; } @@ -67,45 +59,45 @@ static void test_namespaces_as_attributes(void) { struct test { - const char *xml; + const WCHAR *xml; int explen; - const char *names[3]; - const char *prefixes[3]; - const char *basenames[3]; - const char *uris[3]; - const char *texts[3]; + const WCHAR *names[3]; + const WCHAR *prefixes[3]; + const WCHAR *basenames[3]; + const WCHAR *uris[3]; + const WCHAR *texts[3]; }; static const struct test tests[] = { { - "<a ns:b=\"b attr\" d=\"d attr\" xmlns:ns=\"nshref\" />", 3, - { "ns:b", "d", "xmlns:ns" }, /* nodeName */ - { "ns", NULL, "xmlns" }, /* prefix */ - { "b", "d", "ns" }, /* baseName */ - { "nshref", NULL, "" }, /* namespaceURI */ - { "b attr", "d attr", "nshref" }, /* text */ + L"<a ns:b=\"b attr\" d=\"d attr\" xmlns:ns=\"nshref\" />", 3, + { L"ns:b", L"d", L"xmlns:ns" }, /* nodeName */ + { L"ns", NULL, L"xmlns" }, /* prefix */ + { L"b", L"d", L"ns" }, /* baseName */ + { L"nshref", NULL, L"" }, /* namespaceURI */ + { L"b attr", L"d attr", L"nshref" }, /* text */ }, /* property only */ { - "<a d=\"d attr\" />", 1, - { "d" }, /* nodeName */ - { NULL }, /* prefix */ - { "d" }, /* baseName */ - { NULL }, /* namespaceURI */ - { "d attr" }, /* text */ + L"<a d=\"d attr\" />", 1, + { L"d" }, /* nodeName */ + { NULL }, /* prefix */ + { L"d" }, /* baseName */ + { NULL }, /* namespaceURI */ + { L"d attr" }, /* text */ }, /* namespace only */ { - "<a xmlns:ns=\"nshref\" />", 1, - { "xmlns:ns" }, /* nodeName */ - { "xmlns" }, /* prefix */ - { "ns" }, /* baseName */ - { "" }, /* namespaceURI */ - { "nshref" }, /* text */ + L"<a xmlns:ns=\"nshref\" />", 1, + { L"xmlns:ns" }, /* nodeName */ + { L"xmlns" }, /* prefix */ + { L"ns" }, /* baseName */ + { L"" }, /* namespaceURI */ + { L"nshref" }, /* text */ }, /* no properties or namespaces */ { - "<a />", 0, + L"<a />", 0, }, { NULL } @@ -129,7 +121,7 @@ static void test_namespaces_as_attributes(void) ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); node = NULL; - hr = IXMLDOMDocument2_selectSingleNode(doc, _bstr_("a"), &node); + hr = IXMLDOMDocument2_selectSingleNode(doc, _bstr_(L"a"), &node); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXMLDOMNode_get_attributes(node, &map); @@ -154,7 +146,7 @@ static void test_namespaces_as_attributes(void) str = NULL; hr = IXMLDOMNode_get_nodeName(item, &str); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - ok(!lstrcmpW(str, _bstr_(test->names[i])), "got %s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(str, test->names[i]), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); str = NULL; @@ -162,7 +154,7 @@ static void test_namespaces_as_attributes(void) if (test->prefixes[i]) { ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - ok(!lstrcmpW(str, _bstr_(test->prefixes[i])), "got %s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(str, test->prefixes[i]), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); } else @@ -171,7 +163,7 @@ static void test_namespaces_as_attributes(void) str = NULL; hr = IXMLDOMNode_get_baseName(item, &str); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - ok(!lstrcmpW(str, _bstr_(test->basenames[i])), "got %s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(str, test->basenames[i]), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); str = NULL; @@ -179,10 +171,10 @@ static void test_namespaces_as_attributes(void) if (test->uris[i]) { ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - if (test->prefixes[i] && !strcmp(test->prefixes[i], "xmlns")) + if (test->prefixes[i] && !lstrcmpW(test->prefixes[i], L"xmlns")) ok(!lstrcmpW(str, L""), "got %s\n", wine_dbgstr_w(str)); else - ok(!lstrcmpW(str, _bstr_(test->uris[i])), "got %s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(str, test->uris[i]), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); } else @@ -191,7 +183,7 @@ static void test_namespaces_as_attributes(void) str = NULL; hr = IXMLDOMNode_get_text(item, &str); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - ok(!lstrcmpW(str, _bstr_(test->texts[i])), "got %s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(str, test->texts[i]), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); IXMLDOMNode_Release(item);

1 0

Daniel Lehman : msmxl4/tests: Add tests for get_xml.
by Alexandre Julliard 03 Nov '23

03 Nov '23

Module: wine Branch: master Commit: aef7bf3e735af0eaf1b56846d4ab37cc340b09de URL: https://gitlab.winehq.org/wine/wine/-/commit/aef7bf3e735af0eaf1b56846d4ab37… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Mon Oct 30 23:27:57 2023 -0700 msmxl4/tests: Add tests for get_xml. --- dlls/msxml4/tests/domdoc.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/msxml4/tests/domdoc.c b/dlls/msxml4/tests/domdoc.c index 2eaf133f3ee..1784804c0c6 100644 --- a/dlls/msxml4/tests/domdoc.c +++ b/dlls/msxml4/tests/domdoc.c @@ -66,6 +66,7 @@ static void test_namespaces_as_attributes(void) const WCHAR *basenames[3]; const WCHAR *uris[3]; const WCHAR *texts[3]; + const WCHAR *xmls[3]; }; static const struct test tests[] = { @@ -76,6 +77,7 @@ static void test_namespaces_as_attributes(void) { L"b", L"d", L"ns" }, /* baseName */ { L"nshref", NULL, L"" }, /* namespaceURI */ { L"b attr", L"d attr", L"nshref" }, /* text */ + { L"ns:b=\"b attr\"", L"d=\"d attr\"", L"xmlns:ns=\"nshref\"" }, /* xml */ }, /* property only */ { @@ -85,6 +87,7 @@ static void test_namespaces_as_attributes(void) { L"d" }, /* baseName */ { NULL }, /* namespaceURI */ { L"d attr" }, /* text */ + { L"d=\"d attr\"" }, /* xml */ }, /* namespace only */ { @@ -94,6 +97,7 @@ static void test_namespaces_as_attributes(void) { L"ns" }, /* baseName */ { L"" }, /* namespaceURI */ { L"nshref" }, /* text */ + { L"xmlns:ns=\"nshref\"" }, /* xml */ }, /* no properties or namespaces */ { @@ -186,6 +190,12 @@ static void test_namespaces_as_attributes(void) ok(!lstrcmpW(str, test->texts[i]), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); + str = NULL; + hr = IXMLDOMNode_get_xml(item, &str); + ok(SUCCEEDED(hr), "Failed to get node xml, hr %#lx.\n", hr); + ok(!lstrcmpW(str, test->xmls[i]), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + IXMLDOMNode_Release(item); }

1 0

Owen Rudge : comdlg32: Perform case-insensitive comparison of extension in file dialog.
by Alexandre Julliard 03 Nov '23

03 Nov '23

Module: wine Branch: master Commit: 1ee2681394998e726603733c59225259db5c240e URL: https://gitlab.winehq.org/wine/wine/-/commit/1ee2681394998e726603733c592252… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Thu Nov 2 11:02:13 2023 +0000 comdlg32: Perform case-insensitive comparison of extension in file dialog. --- dlls/comdlg32/itemdlg.c | 2 +- dlls/comdlg32/tests/itemdlg.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index 1a598046dff..1cdebf8f738 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -641,7 +641,7 @@ static HRESULT on_default_action(FileDialogImpl *This) if(newext) { WCHAR *ext = PathFindExtensionW(canon_filename); - if(lstrcmpW(ext, newext)) + if(lstrcmpiW(ext, newext)) lstrcatW(canon_filename, newext); } } diff --git a/dlls/comdlg32/tests/itemdlg.c b/dlls/comdlg32/tests/itemdlg.c index ddb2dc30fe7..15c898adc50 100644 --- a/dlls/comdlg32/tests/itemdlg.c +++ b/dlls/comdlg32/tests/itemdlg.c @@ -1494,6 +1494,7 @@ static void test_filename(void) static const WCHAR filename_dotextW[] = {'w','i','n','e','t','e','s','t','.',0}; static const WCHAR filename_dotanddefW[] = {'w','i','n','e','t','e','s','t','.','.','w','t','e',0}; static const WCHAR filename_defextW[] = {'w','i','n','e','t','e','s','t','.','w','t','e',0}; + static const WCHAR filename_mixedcaseW[] = {'w','i','n','e','t','e','s','t','.','W','T','E',0}; static const WCHAR filename_ext1W[] = {'w','i','n','e','t','e','s','t','.','w','t','1',0}; static const WCHAR filename_ext2W[] = {'w','i','n','e','t','e','s','t','.','w','t','2',0}; static const WCHAR filename_ext1anddefW[] = @@ -1530,6 +1531,8 @@ static void test_filename(void) test_filename_savedlg(filename_noextW, defextW, filterspec, 3, filename_ext1W); /* Default extension, filterspec with "complex" extension */ test_filename_savedlg(filename_noextW, defextW, filterspec2, 1, filename_ext2W); + /* Default extension, filterspec with extension that differs in case from the specified filename */ + test_filename_savedlg(filename_mixedcaseW, defextW, filterspec, 0, filename_mixedcaseW); GetCurrentDirectoryW(MAX_PATH, buf); ok(!!pSHCreateItemFromParsingName, "SHCreateItemFromParsingName is missing.\n");

1 0

Jacek Caban : msctf: Avoid implicit enum casts.
by Alexandre Julliard 03 Nov '23

03 Nov '23

Module: wine Branch: master Commit: 0d554fee416a53080d00d411ce86b31ebb388c18 URL: https://gitlab.winehq.org/wine/wine/-/commit/0d554fee416a53080d00d411ce86b3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 24 19:43:39 2023 +0200 msctf: Avoid implicit enum casts. --- dlls/msctf/context.c | 2 +- dlls/msctf/range.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msctf/context.c b/dlls/msctf/context.c index 6280e8f521c..2a7feafae1e 100644 --- a/dlls/msctf/context.c +++ b/dlls/msctf/context.c @@ -305,7 +305,7 @@ static HRESULT WINAPI Context_GetSelection (ITfContext *iface, return TF_E_NOLOCK; else if (SUCCEEDED(hr)) { - pSelection[totalFetched].style.ase = acps.style.ase; + pSelection[totalFetched].style.ase = (TfActiveSelEnd)acps.style.ase; pSelection[totalFetched].style.fInterimChar = acps.style.fInterimChar; Range_Constructor(iface, acps.acpStart, acps.acpEnd, &pSelection[totalFetched].range); totalFetched ++; diff --git a/dlls/msctf/range.c b/dlls/msctf/range.c index c42d91d1682..413cf91c185 100644 --- a/dlls/msctf/range.c +++ b/dlls/msctf/range.c @@ -362,7 +362,7 @@ HRESULT TF_SELECTION_to_TS_SELECTION_ACP(const TF_SELECTION *tf, TS_SELECTION_AC tsAcp->acpStart = This->anchorStart; tsAcp->acpEnd = This->anchorEnd; - tsAcp->style.ase = tf->style.ase; + tsAcp->style.ase = (TsActiveSelEnd)tf->style.ase; tsAcp->style.fInterimChar = tf->style.fInterimChar; return S_OK; }

1 0

Jacek Caban : qmgr: Avoid implicit enum casts.
by Alexandre Julliard 03 Nov '23

03 Nov '23

Module: wine Branch: master Commit: c254ff8dccc4d9505f81d2a17f7a3f9a0283b2fc URL: https://gitlab.winehq.org/wine/wine/-/commit/c254ff8dccc4d9505f81d2a17f7a3f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 24 19:44:05 2023 +0200 qmgr: Avoid implicit enum casts. --- dlls/qmgr/job.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/qmgr/job.c b/dlls/qmgr/job.c index 233d894b3ea..aa164051691 100644 --- a/dlls/qmgr/job.c +++ b/dlls/qmgr/job.c @@ -831,7 +831,8 @@ static HRESULT WINAPI BackgroundCopyJob_RemoveCredentials( EnterCriticalSection(&job->cs); - new_cred->Target = new_cred->Scheme = 0; + new_cred->Target = 0; + new_cred->Scheme = 0; free(new_cred->Credentials.Basic.UserName); new_cred->Credentials.Basic.UserName = NULL; free(new_cred->Credentials.Basic.Password);

1 0

Alex Henrie : adsldp: Remove unused heap.h include.
by Alexandre Julliard 03 Nov '23

03 Nov '23

Module: wine Branch: master Commit: 4782d0e06196530ac4a9d90a60d4949d0e6da11e URL: https://gitlab.winehq.org/wine/wine/-/commit/4782d0e06196530ac4a9d90a60d494… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 2 21:13:52 2023 -0600 adsldp: Remove unused heap.h include. --- dlls/adsldp/schema.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/adsldp/schema.c b/dlls/adsldp/schema.c index d8d0d7e9cde..94b1000ec32 100644 --- a/dlls/adsldp/schema.c +++ b/dlls/adsldp/schema.c @@ -25,7 +25,6 @@ #include "adsldp_private.h" -#include "wine/heap.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(adsldp);

1 0

Alex Henrie : avrt: Use CRT allocation functions.
by Alexandre Julliard 03 Nov '23

03 Nov '23

Module: wine Branch: master Commit: 7c05d3902372fd965f17a3e139e5a51a8f5e6e33 URL: https://gitlab.winehq.org/wine/wine/-/commit/7c05d3902372fd965f17a3e139e5a5… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 2 21:15:20 2023 -0600 avrt: Use CRT allocation functions. --- dlls/avrt/main.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/avrt/main.c b/dlls/avrt/main.c index abcf0ab68ab..68af35c891a 100644 --- a/dlls/avrt/main.c +++ b/dlls/avrt/main.c @@ -23,18 +23,17 @@ #include "winbase.h" #include "winnls.h" #include "wine/debug.h" -#include "wine/heap.h" #include "avrt.h" WINE_DEFAULT_DEBUG_CHANNEL(avrt); -static inline WCHAR *heap_strdupAW(const char *src) +static inline WCHAR *strdupAW(const char *src) { int len; WCHAR *dst; if (!src) return NULL; len = MultiByteToWideChar(CP_ACP, 0, src, -1, NULL, 0); - if ((dst = heap_alloc(len * sizeof(*dst)))) MultiByteToWideChar(CP_ACP, 0, src, -1, dst, len); + if ((dst = malloc(len * sizeof(*dst)))) MultiByteToWideChar(CP_ACP, 0, src, -1, dst, len); return dst; } @@ -43,7 +42,7 @@ HANDLE WINAPI AvSetMmThreadCharacteristicsA(const char *name, DWORD *index) WCHAR *nameW = NULL; HANDLE ret; - if (name && !(nameW = heap_strdupAW(name))) + if (name && !(nameW = strdupAW(name))) { SetLastError(ERROR_OUTOFMEMORY); return NULL; @@ -51,7 +50,7 @@ HANDLE WINAPI AvSetMmThreadCharacteristicsA(const char *name, DWORD *index) ret = AvSetMmThreadCharacteristicsW(nameW, index); - heap_free(nameW); + free(nameW); return ret; } @@ -97,13 +96,13 @@ HANDLE WINAPI AvSetMmMaxThreadCharacteristicsA(const char *task1, const char *ta WCHAR *task1W = NULL, *task2W = NULL; HANDLE ret; - if (task1 && !(task1W = heap_strdupAW(task1))) + if (task1 && !(task1W = strdupAW(task1))) { SetLastError(ERROR_OUTOFMEMORY); return NULL; } - if (task2 && !(task2W = heap_strdupAW(task2))) + if (task2 && !(task2W = strdupAW(task2))) { SetLastError(ERROR_OUTOFMEMORY); return NULL; @@ -111,8 +110,8 @@ HANDLE WINAPI AvSetMmMaxThreadCharacteristicsA(const char *task1, const char *ta ret = AvSetMmMaxThreadCharacteristicsW(task1W, task2W, index); - heap_free(task2W); - heap_free(task1W); + free(task2W); + free(task1W); return ret; }

1 0

Alex Henrie : dhcpcsvc: Use CRT allocation functions.
by Alexandre Julliard 03 Nov '23

03 Nov '23

Module: wine Branch: master Commit: 2936bb4a2958d52fdb62a1b3996f0d8bea39ae80 URL: https://gitlab.winehq.org/wine/wine/-/commit/2936bb4a2958d52fdb62a1b3996f0d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 2 21:21:29 2023 -0600 dhcpcsvc: Use CRT allocation functions. --- dlls/dhcpcsvc/dhcpcsvc.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/dhcpcsvc/dhcpcsvc.c b/dlls/dhcpcsvc/dhcpcsvc.c index 57bb9a9b6ff..37098610760 100644 --- a/dlls/dhcpcsvc/dhcpcsvc.c +++ b/dlls/dhcpcsvc/dhcpcsvc.c @@ -32,7 +32,6 @@ #include "ddk/mountmgr.h" #include "wine/debug.h" -#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(dhcpcsvc); @@ -102,7 +101,7 @@ DWORD WINAPI DhcpRequestParams( DWORD flags, void *reserved, WCHAR *adapter, DHC if (mgr == INVALID_HANDLE_VALUE) return GetLastError(); size = FIELD_OFFSET(struct mountmgr_dhcp_request_params, params[recv_params.nParams]) + *buflen; - if (!(query = heap_alloc_zero( size ))) + if (!(query = calloc( 1, size ))) { err = ERROR_OUTOFMEMORY; goto done; @@ -146,7 +145,7 @@ DWORD WINAPI DhcpRequestParams( DWORD flags, void *reserved, WCHAR *adapter, DHC err = ERROR_SUCCESS; done: - heap_free( query ); + free( query ); CloseHandle( mgr ); return err; }

1 0

Alex Henrie : dhcpcsvc/tests: Use CRT allocation functions.
by Alexandre Julliard 03 Nov '23

03 Nov '23

Module: wine Branch: master Commit: 06294b0dbf31b364b79bcad3bd4e3ad68a9da104 URL: https://gitlab.winehq.org/wine/wine/-/commit/06294b0dbf31b364b79bcad3bd4e3a… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 2 21:24:20 2023 -0600 dhcpcsvc/tests: Use CRT allocation functions. --- dlls/dhcpcsvc/tests/dhcpcsvc.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/dlls/dhcpcsvc/tests/dhcpcsvc.c b/dlls/dhcpcsvc/tests/dhcpcsvc.c index 52b1b150ad8..8e5d0afa30c 100644 --- a/dlls/dhcpcsvc/tests/dhcpcsvc.c +++ b/dlls/dhcpcsvc/tests/dhcpcsvc.c @@ -27,18 +27,16 @@ static IP_ADAPTER_ADDRESSES *get_adapters(void) { ULONG err, size = 1024; - IP_ADAPTER_ADDRESSES *ret = HeapAlloc( GetProcessHeap(), 0, size ); for (;;) { + IP_ADAPTER_ADDRESSES *ret = malloc( size ); err = GetAdaptersAddresses( AF_UNSPEC, GAA_FLAG_SKIP_ANYCAST | GAA_FLAG_SKIP_MULTICAST | GAA_FLAG_SKIP_DNS_SERVER | GAA_FLAG_SKIP_FRIENDLY_NAME, NULL, ret, &size ); - if (err != ERROR_BUFFER_OVERFLOW) break; - ret = HeapReAlloc( GetProcessHeap(), 0, ret, size ); + if (err == ERROR_SUCCESS) return ret; + free( ret ); + if (err != ERROR_BUFFER_OVERFLOW) return NULL; } - if (err == ERROR_SUCCESS) return ret; - HeapFree( GetProcessHeap(), 0, ret ); - return NULL; } static void test_DhcpRequestParams(void) @@ -86,12 +84,12 @@ static void test_DhcpRequestParams(void) recv_params.Params = params; size = 0; - buf = HeapAlloc( GetProcessHeap(), 0, size ); + buf = NULL; err = DhcpRequestParams( DHCPCAPI_REQUEST_SYNCHRONOUS, NULL, name, NULL, send_params, recv_params, buf, &size, NULL ); while (err == ERROR_MORE_DATA) { - buf = HeapReAlloc( GetProcessHeap(), 0, buf, size ); + buf = realloc( buf, size ); err = DhcpRequestParams( DHCPCAPI_REQUEST_SYNCHRONOUS, NULL, name, NULL, send_params, recv_params, buf, &size, NULL ); } @@ -117,13 +115,13 @@ static void test_DhcpRequestParams(void) case OPTION_MSFT_IE_PROXY: if (params[i].Data) { - char *str = HeapAlloc( GetProcessHeap(), 0, params[i].nBytesData + 1 ); + char *str = malloc( params[i].nBytesData + 1 ); memcpy( str, params[i].Data, params[i].nBytesData ); str[params[i].nBytesData] = 0; trace( "%lu: Data %p (%s) nBytesData %lu OptionId %lu Flags %08lx IsVendor %d\n", i, params[i].Data, str, params[i].nBytesData, params[i].OptionId, params[i].Flags, params[i].IsVendor ); - HeapFree( GetProcessHeap(), 0, str ); + free( str ); } break; default: @@ -132,9 +130,9 @@ static void test_DhcpRequestParams(void) } } } - HeapFree( GetProcessHeap(), 0, buf ); + free( buf ); } - HeapFree( GetProcessHeap(), 0, adapters ); + free( adapters ); } START_TEST(dhcpcsvc)

1 0

Alex Henrie : diasymreader: Use CRT allocation functions.
by Alexandre Julliard 03 Nov '23

03 Nov '23

Module: wine Branch: master Commit: c9d4b515f5400f3f24cf1e89f2d7e55ba099732d URL: https://gitlab.winehq.org/wine/wine/-/commit/c9d4b515f5400f3f24cf1e89f2d7e5… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 2 21:25:39 2023 -0600 diasymreader: Use CRT allocation functions. --- dlls/diasymreader/main.c | 4 ++-- dlls/diasymreader/writer.c | 9 ++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/diasymreader/main.c b/dlls/diasymreader/main.c index da64a156714..28e0525d75c 100644 --- a/dlls/diasymreader/main.c +++ b/dlls/diasymreader/main.c @@ -95,7 +95,7 @@ static ULONG WINAPI ClassFactoryImpl_Release(IClassFactory *iface) TRACE("(%p) refcount=%lu\n", iface, ref); if (ref == 0) - HeapFree(GetProcessHeap(), 0, This); + free(This); return ref; } @@ -133,7 +133,7 @@ static HRESULT ClassFactoryImpl_Constructor(const classinfo *info, REFIID riid, *ppv = NULL; - This = HeapAlloc(GetProcessHeap(), 0, sizeof(ClassFactoryImpl)); + This = malloc(sizeof(ClassFactoryImpl)); if (!This) return E_OUTOFMEMORY; This->IClassFactory_iface.lpVtbl = &ClassFactoryImpl_Vtbl; diff --git a/dlls/diasymreader/writer.c b/dlls/diasymreader/writer.c index 3c07b77ab81..55e0615c58e 100644 --- a/dlls/diasymreader/writer.c +++ b/dlls/diasymreader/writer.c @@ -28,7 +28,6 @@ #include "wine/mscvpdb.h" #include "wine/debug.h" -#include "wine/heap.h" #include "diasymreader_private.h" @@ -107,7 +106,7 @@ static ULONG WINAPI SymDocumentWriter_Release(ISymUnmanagedDocumentWriter *iface if (ref == 0) { - heap_free(This); + free(This); } return ref; @@ -187,7 +186,7 @@ static ULONG WINAPI SymWriter_Release(ISymUnmanagedWriter5 *iface) { This->lock.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->lock); - heap_free(This); + free(This); } return ref; @@ -205,7 +204,7 @@ static HRESULT WINAPI SymWriter_DefineDocument(ISymUnmanagedWriter5 *iface, cons if (!pRetVal) return E_POINTER; - result = heap_alloc(sizeof(*result)); + result = malloc(sizeof(*result)); if (!result) return E_OUTOFMEMORY; @@ -596,7 +595,7 @@ HRESULT SymWriter_CreateInstance(REFIID iid, void **ppv) SymWriter *This; HRESULT hr; - This = heap_alloc(sizeof(*This)); + This = malloc(sizeof(*This)); if (!This) return E_OUTOFMEMORY;

1 0