November 2022 - Wine-Commits

Santino Mazza : kernel32/tests: Test for GetGeoInfoEx.
by Alexandre Julliard Nov. 22, 2022

Nov. 22, 2022

Module: wine Branch: master Commit: 52ffd338fa46fab12face2ffaeb7e21c25786697 URL: https://gitlab.winehq.org/wine/wine/-/commit/52ffd338fa46fab12face2ffaeb7e2… Author: Santino Mazza <smazza(a)codeweavers.com> Date: Mon Nov 21 11:05:49 2022 -0300 kernel32/tests: Test for GetGeoInfoEx. --- dlls/kernel32/tests/locale.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index a1e8ba44974..8dd9e12c91b 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -78,6 +78,7 @@ static INT (WINAPI *pCompareStringEx)(LPCWSTR, DWORD, LPCWSTR, INT, LPCWSTR, INT LPNLSVERSIONINFO, LPVOID, LPARAM); static INT (WINAPI *pGetGeoInfoA)(GEOID, GEOTYPE, LPSTR, INT, LANGID); static INT (WINAPI *pGetGeoInfoW)(GEOID, GEOTYPE, LPWSTR, INT, LANGID); +static INT (WINAPI *pGetGeoInfoEx)(const WCHAR *, GEOTYPE, PWSTR, INT); static INT (WINAPI *pGetUserDefaultGeoName)(LPWSTR, int); static BOOL (WINAPI *pSetUserGeoName)(PWSTR); static BOOL (WINAPI *pEnumSystemGeoID)(GEOCLASS, GEOID, GEO_ENUMPROC); @@ -132,6 +133,7 @@ static void InitFunctionPointers(void) X(CompareStringEx); X(GetGeoInfoA); X(GetGeoInfoW); + X(GetGeoInfoEx); X(GetUserDefaultGeoName); X(SetUserGeoName); X(EnumSystemGeoID); @@ -5856,6 +5858,7 @@ static void test_CompareStringOrdinal(void) static void test_GetGeoInfo(void) { char buffA[20]; + WCHAR buffW[20]; INT ret; if (!pGetGeoInfoA) @@ -5964,6 +5967,37 @@ static void test_GetGeoInfo(void) ret = pGetGeoInfoA(203, GEO_ID + 1, NULL, 0, 0); ok(ret == 0, "got %d\n", ret); ok(GetLastError() == ERROR_INVALID_FLAGS, "got %ld\n", GetLastError()); + + /* Test for GetGeoInfoEx */ + if (!pGetGeoInfoEx) + { + win_skip("GetGeoInfoEx is not available\n"); + return; + } + + /* Test with ISO 3166-1 */ + ret = pGetGeoInfoEx(L"AR", GEO_ISO3, buffW, ARRAYSIZE(buffW)); + todo_wine ok(ret != 0, "GetGeoInfoEx failed %ld.\n", GetLastError()); + todo_wine ok(!wcscmp(buffW, L"ARG"), "expected string to be ARG, got %ls\n", buffW); + + /* Test with UN M.49 */ + SetLastError(0xdeadbeef); + ret = pGetGeoInfoEx(L"032", GEO_ISO3, buffW, ARRAYSIZE(buffW)); + ok(ret == 0, "expected GetGeoInfoEx to fail.\n"); + todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, + "expected ERROR_INVALID_PARAMETER got %ld.\n", GetLastError()); + + /* Test GEO_ID */ + ret = pGetGeoInfoEx(L"AR", GEO_ID, buffW, ARRAYSIZE(buffW)); + todo_wine ok(ret != 0, "GetGeoInfoEx failed %ld.\n", GetLastError()); + todo_wine ok(!wcscmp(buffW, L"11"), "expected string to be 11, got %ls\n", buffW); + + /* Test with invalid geo type */ + SetLastError(0xdeadbeef); + ret = pGetGeoInfoEx(L"AR", GEO_LCID, buffW, ARRAYSIZE(buffW)); + ok(ret == 0, "expected GetGeoInfoEx to fail.\n"); + todo_wine ok(GetLastError() == ERROR_INVALID_FLAGS, + "expected ERROR_INVALID_PARAMETER got %ld.\n", GetLastError()); } static int geoidenum_count;

1 0

Alex Henrie : ucrtbase/tests: Put the calling convention inside the function pointer parentheses.
by Alexandre Julliard Nov. 22, 2022

Nov. 22, 2022

Module: wine Branch: master Commit: a62400a8df1b1790af1ccaa19fc0df098f31c699 URL: https://gitlab.winehq.org/wine/wine/-/commit/a62400a8df1b1790af1ccaa19fc0df… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Nov 21 20:59:09 2022 -0700 ucrtbase/tests: Put the calling convention inside the function pointer parentheses. As required by MSVC. --- dlls/ucrtbase/tests/thread.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ucrtbase/tests/thread.c b/dlls/ucrtbase/tests/thread.c index cca95644c05..a9255b5081f 100644 --- a/dlls/ucrtbase/tests/thread.c +++ b/dlls/ucrtbase/tests/thread.c @@ -60,7 +60,7 @@ static char *get_thread_dll_path(void) static void set_thead_dll_detach_event(HANDLE dll, HANDLE event) { - void WINAPI (*_set_detach_event)(HANDLE event); + void (WINAPI *_set_detach_event)(HANDLE event); _set_detach_event = (void*) GetProcAddress(dll, "set_detach_event"); ok(_set_detach_event != NULL, "Failed to get set_detach_event: %lu\n", GetLastError()); _set_detach_event(event);

1 0

Alex Henrie : oledlg: Use standard C functions for memory allocation in pastespl.c.
by Alexandre Julliard Nov. 22, 2022

Nov. 22, 2022

Module: wine Branch: master Commit: d7ef00e66e3a54f9e75c327665a5c8c4bd7bb5d5 URL: https://gitlab.winehq.org/wine/wine/-/commit/d7ef00e66e3a54f9e75c327665a5c8… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Nov 20 19:30:39 2022 -0700 oledlg: Use standard C functions for memory allocation in pastespl.c. --- dlls/oledlg/pastespl.c | 53 ++++++++++++++++++++------------------------------ 1 file changed, 21 insertions(+), 32 deletions(-) diff --git a/dlls/oledlg/pastespl.c b/dlls/oledlg/pastespl.c index b716036f15f..a502ae6c4a9 100644 --- a/dlls/oledlg/pastespl.c +++ b/dlls/oledlg/pastespl.c @@ -121,22 +121,11 @@ static inline WCHAR *strdupAtoW(const char *str) WCHAR *ret; if(!str) return NULL; len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); - ret = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + ret = malloc(len * sizeof(WCHAR)); MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); return ret; } -static inline WCHAR *strdupW(const WCHAR *str) -{ - DWORD len; - WCHAR *ret; - if(!str) return NULL; - len = lstrlenW(str) + 1; - ret = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - memcpy(ret, str, len * sizeof(WCHAR)); - return ret; -} - static void get_descriptors(HWND hdlg, ps_struct_t *ps_struct) { FORMATETC fmtetc; @@ -152,9 +141,9 @@ static void get_descriptors(HWND hdlg, ps_struct_t *ps_struct) { OBJECTDESCRIPTOR *obj_desc = GlobalLock(stg.u.hGlobal); if(obj_desc->dwSrcOfCopy) - ps_struct->source_name = strdupW((WCHAR*)((char*)obj_desc + obj_desc->dwSrcOfCopy)); + ps_struct->source_name = wcsdup((WCHAR*)((char*)obj_desc + obj_desc->dwSrcOfCopy)); if(obj_desc->dwFullUserTypeName) - ps_struct->type_name = strdupW((WCHAR*)((char*)obj_desc + obj_desc->dwFullUserTypeName)); + ps_struct->type_name = wcsdup((WCHAR*)((char*)obj_desc + obj_desc->dwFullUserTypeName)); OleRegGetUserType(&obj_desc->clsid, USERCLASSTYPE_APPNAME, &ps_struct->app_name); /* Get the icon here. If dwDrawAspect & DVASCPECT_ICON call GetData(CF_METAFILEPICT), otherwise native calls OleGetIconFromClass(obj_desc->clsid) */ @@ -171,9 +160,9 @@ static void get_descriptors(HWND hdlg, ps_struct_t *ps_struct) { OBJECTDESCRIPTOR *obj_desc = GlobalLock(stg.u.hGlobal); if(obj_desc->dwSrcOfCopy) - ps_struct->link_source_name = strdupW((WCHAR*)((char*)obj_desc + obj_desc->dwSrcOfCopy)); + ps_struct->link_source_name = wcsdup((WCHAR*)((char*)obj_desc + obj_desc->dwSrcOfCopy)); if(obj_desc->dwFullUserTypeName) - ps_struct->link_type_name = strdupW((WCHAR*)((char*)obj_desc + obj_desc->dwFullUserTypeName)); + ps_struct->link_type_name = wcsdup((WCHAR*)((char*)obj_desc + obj_desc->dwFullUserTypeName)); GlobalUnlock(stg.u.hGlobal); GlobalFree(stg.u.hGlobal); } @@ -182,14 +171,14 @@ static void get_descriptors(HWND hdlg, ps_struct_t *ps_struct) { WCHAR buf[200]; LoadStringW(OLEDLG_hInstance, IDS_PS_UNKNOWN_SRC, buf, ARRAY_SIZE(buf)); - ps_struct->source_name = strdupW(buf); + ps_struct->source_name = wcsdup(buf); } if(ps_struct->type_name == NULL && ps_struct->link_type_name == NULL) { WCHAR buf[200]; LoadStringW(OLEDLG_hInstance, IDS_PS_UNKNOWN_TYPE, buf, ARRAY_SIZE(buf)); - ps_struct->type_name = strdupW(buf); + ps_struct->type_name = wcsdup(buf); } } @@ -436,7 +425,7 @@ static void update_result_text(HWND hdlg, const ps_struct_t *ps_struct) /* FIXME handle %s in ResultText. Sub appname if IDS_PS_PASTE_OBJECT{_AS_ICON}. Else sub appropriate type name */ size_t result_txt_len = lstrlenW(pent->lpstrResultText); ptrdiff_t offs = (char*)ptr - (char*)resource_txt; - result_txt = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(resource_txt) + result_txt_len - 1) * sizeof(WCHAR)); + result_txt = malloc((wcslen(resource_txt) + result_txt_len - 1) * sizeof(WCHAR)); memcpy(result_txt, resource_txt, offs); memcpy((char*)result_txt + offs, pent->lpstrResultText, result_txt_len * sizeof(WCHAR)); memcpy((char*)result_txt + offs + result_txt_len * sizeof(WCHAR), ptr + 2, (lstrlenW(ptr + 2) + 1) * sizeof(WCHAR)); @@ -447,7 +436,7 @@ static void update_result_text(HWND hdlg, const ps_struct_t *ps_struct) SetDlgItemTextW(hdlg, IDC_PS_RESULTTEXT, result_txt); if(result_txt != resource_txt) - HeapFree(GetProcessHeap(), 0, result_txt); + free(result_txt); } @@ -500,12 +489,12 @@ static void update_structure(HWND hdlg, ps_struct_t *ps_struct) static void free_structure(ps_struct_t *ps_struct) { - HeapFree(GetProcessHeap(), 0, ps_struct->type_name); - HeapFree(GetProcessHeap(), 0, ps_struct->source_name); - HeapFree(GetProcessHeap(), 0, ps_struct->link_type_name); - HeapFree(GetProcessHeap(), 0, ps_struct->link_source_name); + free(ps_struct->type_name); + free(ps_struct->source_name); + free(ps_struct->link_type_name); + free(ps_struct->link_source_name); CoTaskMemFree(ps_struct->app_name); - HeapFree(GetProcessHeap(), 0, ps_struct); + free(ps_struct); } static INT_PTR CALLBACK ps_dlg_proc(HWND hdlg, UINT msg, WPARAM wp, LPARAM lp) @@ -535,7 +524,7 @@ static INT_PTR CALLBACK ps_dlg_proc(HWND hdlg, UINT msg, WPARAM wp, LPARAM lp) { case WM_INITDIALOG: { - ps_struct = HeapAlloc(GetProcessHeap(), 0, sizeof(*ps_struct)); + ps_struct = malloc(sizeof(*ps_struct)); ps_struct->ps = (OLEUIPASTESPECIALW*)lp; ps_struct->type_name = NULL; ps_struct->source_name = NULL; @@ -649,7 +638,7 @@ UINT WINAPI OleUIPasteSpecialA(LPOLEUIPASTESPECIALA psA) DWORD size = psA->cPasteEntries * sizeof(ps.arrPasteEntries[0]); INT i; - ps.arrPasteEntries = HeapAlloc(GetProcessHeap(), 0, size); + ps.arrPasteEntries = malloc(size); memcpy(ps.arrPasteEntries, psA->arrPasteEntries, size); for(i = 0; i < psA->cPasteEntries; i++) { @@ -667,14 +656,14 @@ UINT WINAPI OleUIPasteSpecialA(LPOLEUIPASTESPECIALA psA) INT i; for(i = 0; i < psA->cPasteEntries; i++) { - HeapFree(GetProcessHeap(), 0, (WCHAR*)ps.arrPasteEntries[i].lpstrFormatName); - HeapFree(GetProcessHeap(), 0, (WCHAR*)ps.arrPasteEntries[i].lpstrResultText); + free((WCHAR*)ps.arrPasteEntries[i].lpstrFormatName); + free((WCHAR*)ps.arrPasteEntries[i].lpstrResultText); } - HeapFree(GetProcessHeap(), 0, ps.arrPasteEntries); + free(ps.arrPasteEntries); } if(!IS_INTRESOURCE(ps.lpszTemplate)) - HeapFree(GetProcessHeap(), 0, (WCHAR*)ps.lpszTemplate); - HeapFree(GetProcessHeap(), 0, (WCHAR*)ps.lpszCaption); + free((WCHAR*)ps.lpszTemplate); + free((WCHAR*)ps.lpszCaption); /* Copy back the output fields */ psA->dwFlags = ps.dwFlags;

1 0

Alex Henrie : shlwapi/tests: Use standard C functions for memory allocation in path.c.
by Alexandre Julliard Nov. 22, 2022

Nov. 22, 2022

Module: wine Branch: master Commit: b59defb244c1a83a4dc3f5670e8b63a0e5c8b405 URL: https://gitlab.winehq.org/wine/wine/-/commit/b59defb244c1a83a4dc3f5670e8b63… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Nov 22 01:04:31 2022 -0700 shlwapi/tests: Use standard C functions for memory allocation in path.c. --- dlls/shlwapi/tests/path.c | 36 +++++++++++------------------------- 1 file changed, 11 insertions(+), 25 deletions(-) diff --git a/dlls/shlwapi/tests/path.c b/dlls/shlwapi/tests/path.c index 4614d3fea25..fb8d3f1b9c1 100644 --- a/dlls/shlwapi/tests/path.c +++ b/dlls/shlwapi/tests/path.c @@ -190,27 +190,13 @@ static LPWSTR GetWideString(const char *src) if (!src) return NULL; - ret = HeapAlloc(GetProcessHeap(), 0, (2*INTERNET_MAX_URL_LENGTH) * sizeof(WCHAR)); + ret = malloc(2 * INTERNET_MAX_URL_LENGTH * sizeof(WCHAR)); MultiByteToWideChar(CP_ACP, 0, src, -1, ret, INTERNET_MAX_URL_LENGTH); return ret; } -static void FreeWideString(LPWSTR wszString) -{ - HeapFree(GetProcessHeap(), 0, wszString); -} - -static LPSTR strdupA(LPCSTR p) -{ - LPSTR ret; - DWORD len = (strlen(p) + 1); - ret = HeapAlloc(GetProcessHeap(), 0, len); - memcpy(ret, p, len); - return ret; -} - /* ################ */ static void test_PathSearchAndQualify(void) @@ -326,8 +312,8 @@ static void test_PathCreateFromUrl(void) ok(len2 == len + 1, "got len = %ld expected %ld from url %s\n", len2, len + 1, TEST_PATHFROMURL[i].url); } - FreeWideString(urlW); - FreeWideString(pathW); + free(urlW); + free(pathW); } } @@ -340,7 +326,7 @@ static void test_PathCreateFromUrl(void) ret = pPathCreateFromUrlAlloc(fileW, &pathW, 0); ok(ret == S_OK, "got 0x%08lx expected S_OK\n", ret); ok(lstrcmpiW(pathW, fooW) == 0, "got %s expected %s\n", wine_dbgstr_w(pathW), wine_dbgstr_w(fooW)); - HeapFree(GetProcessHeap(), 0, pathW); + LocalFree(pathW); } } @@ -513,7 +499,7 @@ static void test_PathCombineW(void) return; } - wszString2 = HeapAlloc(GetProcessHeap(), 0, MAX_PATH * sizeof(WCHAR)); + wszString2 = malloc(MAX_PATH * sizeof(WCHAR)); /* NULL test */ wszString = pPathCombineW(NULL, NULL, NULL); @@ -529,7 +515,7 @@ static void test_PathCombineW(void) broken(wszString2[0] == 'a'), /* Win95 and some W2K */ "Destination string not empty\n"); - HeapFree(GetProcessHeap(), 0, wszString2); + free(wszString2); /* overflow test */ wstr2[0] = wstr2[1] = wstr2[2] = 'A'; @@ -1430,7 +1416,7 @@ static void test_PathUnquoteSpaces(void) int i; for (i = 0; i < ARRAY_SIZE(TEST_PATH_UNQUOTE_SPACES); i++) { - char *path = strdupA(TEST_PATH_UNQUOTE_SPACES[i].path); + char *path = strdup(TEST_PATH_UNQUOTE_SPACES[i].path); WCHAR *pathW = GetWideString(TEST_PATH_UNQUOTE_SPACES[i].path); WCHAR *resultW = GetWideString(TEST_PATH_UNQUOTE_SPACES[i].result); @@ -1442,9 +1428,9 @@ static void test_PathUnquoteSpaces(void) PathUnquoteSpacesW(pathW); ok(!lstrcmpW(pathW, resultW), "%s (W): strings differ\n", TEST_PATH_UNQUOTE_SPACES[i].path); - FreeWideString(pathW); - FreeWideString(resultW); - HeapFree(GetProcessHeap(), 0, path); + free(pathW); + free(resultW); + free(path); } } @@ -1680,7 +1666,7 @@ static void test_PathIsRelativeW(void) "PathIsRelativeW(\"%s\") expects %d, got %d.\n", test_path_is_relative[i].path, test_path_is_relative[i].expect, ret); - FreeWideString(path); + free(path); } }

1 0

Alex Henrie : oledb32: Use standard C functions for memory allocation in rowpos.c.
by Alexandre Julliard Nov. 22, 2022

Nov. 22, 2022

Module: wine Branch: master Commit: 777383b81d03c23ae43483bbee92d66001758afb URL: https://gitlab.winehq.org/wine/wine/-/commit/777383b81d03c23ae43483bbee92d6… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Nov 21 22:31:41 2022 -0700 oledb32: Use standard C functions for memory allocation in rowpos.c. --- dlls/oledb32/oledb_private.h | 5 ----- dlls/oledb32/rowpos.c | 12 ++++++------ 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/dlls/oledb32/oledb_private.h b/dlls/oledb32/oledb_private.h index fee0318de14..773b646f08e 100644 --- a/dlls/oledb32/oledb_private.h +++ b/dlls/oledb32/oledb_private.h @@ -27,8 +27,3 @@ HRESULT get_data_source(IUnknown *outer, DWORD clsctx, LPWSTR initstring, REFIID IUnknown **datasource) DECLSPEC_HIDDEN; extern HINSTANCE instance; - -static inline void* __WINE_ALLOC_SIZE(2) heap_realloc_zero(void *mem, size_t size) -{ - return HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, size); -} diff --git a/dlls/oledb32/rowpos.c b/dlls/oledb32/rowpos.c index 128208a9da3..142a2d7fdb1 100644 --- a/dlls/oledb32/rowpos.c +++ b/dlls/oledb32/rowpos.c @@ -28,7 +28,6 @@ #include "oledb_private.h" #include "wine/debug.h" -#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(oledb); @@ -152,7 +151,7 @@ static ULONG WINAPI rowpos_Release(IRowPosition* iface) if (This->rowset) IRowset_Release(This->rowset); if (This->chrst) IChapteredRowset_Release(This->chrst); rowposchange_cp_destroy(&This->cp); - heap_free(This); + free(This); } return ref; @@ -405,16 +404,17 @@ 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)); + new_sinks = realloc(This->sinks, 2 * This->sinks_size * sizeof(*This->sinks)); if (!new_sinks) return E_OUTOFMEMORY; + memset(new_sinks + This->sinks_size, 0, This->sinks_size * sizeof(*This->sinks)); This->sinks = new_sinks; This->sinks_size *= 2; } } else { - This->sinks = heap_alloc_zero(10 * sizeof(*This->sinks)); + This->sinks = calloc(10, sizeof(*This->sinks)); if (!This->sinks) return E_OUTOFMEMORY; This->sinks_size = 10; @@ -477,7 +477,7 @@ void rowposchange_cp_destroy(rowpos_cp *cp) if (cp->sinks[i]) IRowPositionChange_Release(cp->sinks[i]); } - heap_free(cp->sinks); + free(cp->sinks); } HRESULT create_oledb_rowpos(IUnknown *outer, void **obj) @@ -490,7 +490,7 @@ HRESULT create_oledb_rowpos(IUnknown *outer, void **obj) if(outer) return CLASS_E_NOAGGREGATION; - This = heap_alloc(sizeof(*This)); + This = malloc(sizeof(*This)); if(!This) return E_OUTOFMEMORY; This->IRowPosition_iface.lpVtbl = &rowpos_vtbl;

1 0

Alex Henrie : taskschd: Use standard C functions for memory allocation in task.c.
by Alexandre Julliard Nov. 22, 2022

Nov. 22, 2022

Module: wine Branch: master Commit: 5f1dd90c7634f2f14c70f21f2aa2eeda90bd5084 URL: https://gitlab.winehq.org/wine/wine/-/commit/5f1dd90c7634f2f14c70f21f2aa2ee… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Nov 21 07:59:18 2022 -0700 taskschd: Use standard C functions for memory allocation in task.c. --- dlls/taskschd/task.c | 110 +++++++++++++++++++++++++-------------------------- 1 file changed, 55 insertions(+), 55 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 28c0ff89945..b84d693dced 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -91,8 +91,8 @@ static ULONG WINAPI DailyTrigger_Release(IDailyTrigger *iface) if(!ref) { TRACE("destroying %p\n", iface); - heap_free(This->start_boundary); - heap_free(This); + free(This->start_boundary); + free(This); } return ref; @@ -199,8 +199,8 @@ static HRESULT WINAPI DailyTrigger_put_StartBoundary(IDailyTrigger *iface, BSTR TRACE("(%p)->(%s)\n", This, debugstr_w(start)); - if (start && !(str = heap_strdupW(start))) return E_OUTOFMEMORY; - heap_free(This->start_boundary); + if (start && !(str = wcsdup(start))) return E_OUTOFMEMORY; + free(This->start_boundary); This->start_boundary = str; return S_OK; @@ -373,7 +373,7 @@ static ULONG WINAPI TriggerCollection_Release(ITriggerCollection *iface) TRACE("(%p) ref=%ld\n", This, ref); if(!ref) - heap_free(This); + free(This); return ref; } @@ -503,14 +503,14 @@ static ULONG WINAPI RegistrationInfo_Release(IRegistrationInfo *iface) if (!ref) { TRACE("destroying %p\n", iface); - heap_free(reginfo->description); - heap_free(reginfo->author); - heap_free(reginfo->version); - heap_free(reginfo->date); - heap_free(reginfo->documentation); - heap_free(reginfo->uri); - heap_free(reginfo->source); - heap_free(reginfo); + free(reginfo->description); + free(reginfo->author); + free(reginfo->version); + free(reginfo->date); + free(reginfo->documentation); + free(reginfo->uri); + free(reginfo->source); + free(reginfo); } return ref; @@ -584,8 +584,8 @@ static HRESULT WINAPI RegistrationInfo_put_Description(IRegistrationInfo *iface, TRACE("%p,%s\n", iface, debugstr_w(description)); - if (description && !(str = heap_strdupW(description))) return E_OUTOFMEMORY; - heap_free(reginfo->description); + if (description && !(str = wcsdup(description))) return E_OUTOFMEMORY; + free(reginfo->description); reginfo->description = str; return S_OK; } @@ -611,8 +611,8 @@ static HRESULT WINAPI RegistrationInfo_put_Author(IRegistrationInfo *iface, BSTR TRACE("%p,%s\n", iface, debugstr_w(author)); - if (author && !(str = heap_strdupW(author))) return E_OUTOFMEMORY; - heap_free(reginfo->author); + if (author && !(str = wcsdup(author))) return E_OUTOFMEMORY; + free(reginfo->author); reginfo->author = str; return S_OK; } @@ -638,8 +638,8 @@ static HRESULT WINAPI RegistrationInfo_put_Version(IRegistrationInfo *iface, BST TRACE("%p,%s\n", iface, debugstr_w(version)); - if (version && !(str = heap_strdupW(version))) return E_OUTOFMEMORY; - heap_free(reginfo->version); + if (version && !(str = wcsdup(version))) return E_OUTOFMEMORY; + free(reginfo->version); reginfo->version = str; return S_OK; } @@ -665,8 +665,8 @@ static HRESULT WINAPI RegistrationInfo_put_Date(IRegistrationInfo *iface, BSTR d TRACE("%p,%s\n", iface, debugstr_w(date)); - if (date && !(str = heap_strdupW(date))) return E_OUTOFMEMORY; - heap_free(reginfo->date); + if (date && !(str = wcsdup(date))) return E_OUTOFMEMORY; + free(reginfo->date); reginfo->date = str; return S_OK; } @@ -692,8 +692,8 @@ static HRESULT WINAPI RegistrationInfo_put_Documentation(IRegistrationInfo *ifac TRACE("%p,%s\n", iface, debugstr_w(doc)); - if (doc && !(str = heap_strdupW(doc))) return E_OUTOFMEMORY; - heap_free(reginfo->documentation); + if (doc && !(str = wcsdup(doc))) return E_OUTOFMEMORY; + free(reginfo->documentation); reginfo->documentation = str; return S_OK; } @@ -731,8 +731,8 @@ static HRESULT WINAPI RegistrationInfo_put_URI(IRegistrationInfo *iface, BSTR ur TRACE("%p,%s\n", iface, debugstr_w(uri)); - if (uri && !(str = heap_strdupW(uri))) return E_OUTOFMEMORY; - heap_free(reginfo->uri); + if (uri && !(str = wcsdup(uri))) return E_OUTOFMEMORY; + free(reginfo->uri); reginfo->uri = str; return S_OK; } @@ -770,8 +770,8 @@ static HRESULT WINAPI RegistrationInfo_put_Source(IRegistrationInfo *iface, BSTR TRACE("%p,%s\n", iface, debugstr_w(source)); - if (source && !(str = heap_strdupW(source))) return E_OUTOFMEMORY; - heap_free(reginfo->source); + if (source && !(str = wcsdup(source))) return E_OUTOFMEMORY; + free(reginfo->source); reginfo->source = str; return S_OK; } @@ -863,10 +863,10 @@ static ULONG WINAPI TaskSettings_Release(ITaskSettings *iface) if (!ref) { TRACE("destroying %p\n", iface); - heap_free(taskset->restart_interval); - heap_free(taskset->execution_time_limit); - heap_free(taskset->delete_expired_task_after); - heap_free(taskset); + free(taskset->restart_interval); + free(taskset->execution_time_limit); + free(taskset->delete_expired_task_after); + free(taskset); } return ref; @@ -970,8 +970,8 @@ static HRESULT WINAPI TaskSettings_put_RestartInterval(ITaskSettings *iface, BST TRACE("%p,%s\n", iface, debugstr_w(interval)); - if (interval && !(str = heap_strdupW(interval))) return E_OUTOFMEMORY; - heap_free(taskset->restart_interval); + if (interval && !(str = wcsdup(interval))) return E_OUTOFMEMORY; + free(taskset->restart_interval); taskset->restart_interval = str; return S_OK; @@ -1184,8 +1184,8 @@ static HRESULT WINAPI TaskSettings_put_ExecutionTimeLimit(ITaskSettings *iface, TRACE("%p,%s\n", iface, debugstr_w(limit)); - if (limit && !(str = heap_strdupW(limit))) return E_OUTOFMEMORY; - heap_free(taskset->execution_time_limit); + if (limit && !(str = wcsdup(limit))) return E_OUTOFMEMORY; + free(taskset->execution_time_limit); taskset->execution_time_limit = str; return S_OK; @@ -1236,8 +1236,8 @@ static HRESULT WINAPI TaskSettings_put_DeleteExpiredTaskAfter(ITaskSettings *ifa TRACE("%p,%s\n", iface, debugstr_w(delay)); - if (delay && !(str = heap_strdupW(delay))) return E_OUTOFMEMORY; - heap_free(taskset->delete_expired_task_after); + if (delay && !(str = wcsdup(delay))) return E_OUTOFMEMORY; + free(taskset->delete_expired_task_after); taskset->delete_expired_task_after = str; return S_OK; @@ -1449,7 +1449,7 @@ static HRESULT TaskSettings_create(ITaskSettings **obj) taskset->ref = 1; /* set the defaults */ taskset->restart_interval = NULL; - taskset->execution_time_limit = heap_strdupW(L"PT72H"); + taskset->execution_time_limit = wcsdup(L"PT72H"); taskset->delete_expired_task_after = NULL; taskset->restart_count = 0; taskset->priority = 7; @@ -1498,7 +1498,7 @@ static ULONG WINAPI Principal_Release(IPrincipal *iface) if (!ref) { TRACE("destroying %p\n", iface); - heap_free(principal); + free(principal); } return ref; @@ -1692,11 +1692,11 @@ static ULONG WINAPI ExecAction_Release(IExecAction *iface) if (!ref) { TRACE("destroying %p\n", iface); - heap_free(action->path); - heap_free(action->directory); - heap_free(action->args); - heap_free(action->id); - heap_free(action); + free(action->path); + free(action->directory); + free(action->args); + free(action->id); + free(action); } return ref; @@ -1771,8 +1771,8 @@ static HRESULT WINAPI ExecAction_put_Id(IExecAction *iface, BSTR id) TRACE("%p,%s\n", iface, debugstr_w(id)); - if (id && !(str = heap_strdupW((id)))) return E_OUTOFMEMORY; - heap_free(action->id); + if (id && !(str = wcsdup((id)))) return E_OUTOFMEMORY; + free(action->id); action->id = str; return S_OK; @@ -1810,8 +1810,8 @@ static HRESULT WINAPI ExecAction_put_Path(IExecAction *iface, BSTR path) TRACE("%p,%s\n", iface, debugstr_w(path)); - if (path && !(str = heap_strdupW((path)))) return E_OUTOFMEMORY; - heap_free(action->path); + if (path && !(str = wcsdup((path)))) return E_OUTOFMEMORY; + free(action->path); action->path = str; return S_OK; @@ -1838,8 +1838,8 @@ static HRESULT WINAPI ExecAction_put_Arguments(IExecAction *iface, BSTR argument TRACE("%p,%s\n", iface, debugstr_w(arguments)); - if (arguments && !(str = heap_strdupW((arguments)))) return E_OUTOFMEMORY; - heap_free(action->args); + if (arguments && !(str = wcsdup((arguments)))) return E_OUTOFMEMORY; + free(action->args); action->args = str; return S_OK; @@ -1866,8 +1866,8 @@ static HRESULT WINAPI ExecAction_put_WorkingDirectory(IExecAction *iface, BSTR d TRACE("%p,%s\n", iface, debugstr_w(directory)); - if (directory && !(str = heap_strdupW((directory)))) return E_OUTOFMEMORY; - heap_free(action->directory); + if (directory && !(str = wcsdup((directory)))) return E_OUTOFMEMORY; + free(action->directory); action->directory = str; return S_OK; @@ -1939,7 +1939,7 @@ static ULONG WINAPI Actions_Release(IActionCollection *iface) if (!ref) { TRACE("destroying %p\n", iface); - heap_free(actions); + free(actions); } return ref; @@ -2141,7 +2141,7 @@ static ULONG WINAPI TaskDefinition_Release(ITaskDefinition *iface) if (taskdef->actions) IActionCollection_Release(taskdef->actions); - heap_free(taskdef); + free(taskdef); } return ref; @@ -3708,7 +3708,7 @@ static ULONG WINAPI TaskService_Release(ITaskService *iface) if (!ref) { TRACE("destroying %p\n", iface); - heap_free(task_svc); + free(task_svc); } return ref;

1 0

Alex Henrie : taskschd: Remove unused function heap_strdupW.
by Alexandre Julliard Nov. 22, 2022

Nov. 22, 2022

Module: wine Branch: master Commit: 73bbada78409b4aa2e1dc11bb657d51496061a5f URL: https://gitlab.winehq.org/wine/wine/-/commit/73bbada78409b4aa2e1dc11bb657d5… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Nov 21 07:59:18 2022 -0700 taskschd: Remove unused function heap_strdupW. --- dlls/taskschd/taskschd_private.h | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/dlls/taskschd/taskschd_private.h b/dlls/taskschd/taskschd_private.h index accbc76afe4..e8d834edc3d 100644 --- a/dlls/taskschd/taskschd_private.h +++ b/dlls/taskschd/taskschd_private.h @@ -31,14 +31,4 @@ HRESULT RegisteredTaskCollection_create(const WCHAR *path, IRegisteredTaskCollec WCHAR *get_full_path(const WCHAR *parent, const WCHAR *path) DECLSPEC_HIDDEN; -static inline WCHAR *heap_strdupW(const WCHAR *src) -{ - WCHAR *dst; - unsigned len; - if (!src) return NULL; - len = (lstrlenW(src) + 1) * sizeof(WCHAR); - if ((dst = heap_alloc(len))) memcpy(dst, src, len); - return dst; -} - #endif /* __WINE_TASKSCHD_PRIVATE_H__ */

1 0

Alex Henrie : hhctrl: Handle memory allocation failure in GetChmString.
by Alexandre Julliard Nov. 22, 2022

Nov. 22, 2022

Module: wine Branch: master Commit: f41214edaabc35a1b774c12345fac3a4136085e1 URL: https://gitlab.winehq.org/wine/wine/-/commit/f41214edaabc35a1b774c12345fac3… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Nov 21 19:17:52 2022 -0700 hhctrl: Handle memory allocation failure in GetChmString. --- dlls/hhctrl.ocx/chm.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/hhctrl.ocx/chm.c b/dlls/hhctrl.ocx/chm.c index 3a9a8fa9e7a..aa04a05fa33 100644 --- a/dlls/hhctrl.ocx/chm.c +++ b/dlls/hhctrl.ocx/chm.c @@ -32,18 +32,25 @@ WINE_DEFAULT_DEBUG_CHANNEL(htmlhelp); static LPCSTR GetChmString(CHMInfo *chm, DWORD offset) { LPCSTR str; + char **new_strings; if(!chm->strings_stream) return NULL; if(chm->strings_size <= (offset >> BLOCK_BITS)) { chm->strings_size = (offset >> BLOCK_BITS)+1; - if(chm->strings) - chm->strings = heap_realloc_zero(chm->strings, + if(chm->strings) { + new_strings = heap_realloc_zero(chm->strings, chm->strings_size*sizeof(char*)); - else + if(!new_strings) + return NULL; + chm->strings = new_strings; + }else { chm->strings = heap_alloc_zero( chm->strings_size*sizeof(char*)); + if(!chm->strings) + return NULL; + } }

1 0

Alex Henrie : taskschd: Use standard C functions for memory allocation in regtask.c.
by Alexandre Julliard Nov. 22, 2022

Nov. 22, 2022

Module: wine Branch: master Commit: fa77645e4c71b38d9f200fe657e965180c22d98a URL: https://gitlab.winehq.org/wine/wine/-/commit/fa77645e4c71b38d9f200fe657e965… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Nov 21 07:59:18 2022 -0700 taskschd: Use standard C functions for memory allocation in regtask.c. --- dlls/taskschd/regtask.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/taskschd/regtask.c b/dlls/taskschd/regtask.c index 69bec19027c..bae0d4cb0b2 100644 --- a/dlls/taskschd/regtask.c +++ b/dlls/taskschd/regtask.c @@ -60,8 +60,8 @@ static ULONG WINAPI regtask_Release(IRegisteredTask *iface) { TRACE("destroying %p\n", iface); ITaskDefinition_Release(regtask->taskdef); - heap_free(regtask->path); - heap_free(regtask); + free(regtask->path); + free(regtask); } return ref; @@ -328,10 +328,10 @@ HRESULT RegisteredTask_create(const WCHAR *path, const WCHAR *name, ITaskDefinit if (!full_name) return E_OUTOFMEMORY; } - regtask = heap_alloc(sizeof(*regtask)); + regtask = malloc(sizeof(*regtask)); if (!regtask) { - heap_free(full_name); + free(full_name); return E_OUTOFMEMORY; } @@ -344,15 +344,15 @@ HRESULT RegisteredTask_create(const WCHAR *path, const WCHAR *name, ITaskDefinit hr = ITaskDefinition_get_XmlText(definition, &xml); if (hr != S_OK || (hr = SchRpcRegisterTask(full_name, xml, flags, NULL, logon, 0, NULL, &actual_path, &error_info)) != S_OK) { - heap_free(full_name); - heap_free(regtask); + free(full_name); + free(regtask); SysFreeString(xml); return hr; } SysFreeString(xml); - heap_free(full_name); - full_name = heap_strdupW(actual_path); + free(full_name); + full_name = wcsdup(actual_path); MIDL_user_free(actual_path); } else @@ -363,8 +363,8 @@ HRESULT RegisteredTask_create(const WCHAR *path, const WCHAR *name, ITaskDefinit hr = SchRpcRetrieveTask(full_name, L"", &count, &xml); if (hr != S_OK || (hr = ITaskDefinition_put_XmlText(definition, xml)) != S_OK) { - heap_free(full_name); - heap_free(regtask); + free(full_name); + free(regtask); MIDL_user_free(xml); return hr; } @@ -408,8 +408,8 @@ static ULONG WINAPI regtasks_Release(IRegisteredTaskCollection *iface) if (!ref) { TRACE("destroying %p\n", iface); - heap_free(regtasks->path); - heap_free(regtasks); + free(regtasks->path); + free(regtasks); } return ref; @@ -499,12 +499,12 @@ HRESULT RegisteredTaskCollection_create(const WCHAR *path, IRegisteredTaskCollec { RegisteredTaskCollection *regtasks; - regtasks = heap_alloc(sizeof(*regtasks)); + regtasks = malloc(sizeof(*regtasks)); if (!regtasks) return E_OUTOFMEMORY; regtasks->IRegisteredTaskCollection_iface.lpVtbl = &RegisteredTaskCollection_vtbl; regtasks->ref = 1; - regtasks->path = heap_strdupW(path); + regtasks->path = wcsdup(path); *obj = &regtasks->IRegisteredTaskCollection_iface; TRACE("created %p\n", *obj);

1 0

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

Nov. 22, 2022

Module: wine Branch: master Commit: d2ad82c87e104f01f7c1d74a60ebae1a0ec1cd67 URL: https://gitlab.winehq.org/wine/wine/-/commit/d2ad82c87e104f01f7c1d74a60ebae… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Nov 21 19:42:45 2022 -0700 advapi32/tests: Avoid using GCC's typeof extension. --- dlls/advapi32/tests/perf.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/advapi32/tests/perf.c b/dlls/advapi32/tests/perf.c index 34b6e952842..7481020dd4e 100644 --- a/dlls/advapi32/tests/perf.c +++ b/dlls/advapi32/tests/perf.c @@ -31,12 +31,10 @@ #include "initguid.h" -#define DEFINE_FUNCTION(name) static typeof(name) *p##name; -DEFINE_FUNCTION(PerfCloseQueryHandle); -DEFINE_FUNCTION(PerfOpenQueryHandle); -DEFINE_FUNCTION(PerfAddCounters); -DEFINE_FUNCTION(PerfQueryCounterData); -#undef DEFINE_FUNCTION +ULONG (WINAPI *pPerfCloseQueryHandle)(HANDLE); +ULONG (WINAPI *pPerfOpenQueryHandle)(const WCHAR*, HANDLE*); +ULONG (WINAPI *pPerfAddCounters)(HANDLE, PERF_COUNTER_IDENTIFIER*, DWORD); +ULONG (WINAPI *pPerfQueryCounterData)(HANDLE, PERF_DATA_HEADER*, DWORD, DWORD*); static void init_functions(void) {

1 0