From 05a13d5cf7bfb2422a85e7b8350192d201e2f89a Mon Sep 17 00:00:00 2001 From: Simon Tatham Date: Sat, 25 Jan 2025 11:09:15 +0000 Subject: [PATCH] GetDlgItemText_alloc: avoid realloc loop. This rewrite, due to SATO Kentaro, uses GetWindowTextLength (which I hadn't known about) to find the correct size to allocate the buffer the first time, avoiding the need to keep growing it until a call to GetDlgItemText doesn't have to truncate the result. --- windows/utils/getdlgitemtext_alloc.c | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/windows/utils/getdlgitemtext_alloc.c b/windows/utils/getdlgitemtext_alloc.c index 8de62a3b..0fa24736 100644 --- a/windows/utils/getdlgitemtext_alloc.c +++ b/windows/utils/getdlgitemtext_alloc.c @@ -10,26 +10,18 @@ char *GetDlgItemText_alloc(HWND hwnd, int id) { - char *ret = NULL; - size_t size = 0; - - do { - sgrowarray_nm(ret, size, size); - GetDlgItemText(hwnd, id, ret, size); - } while (!memchr(ret, '\0', size-1)); - - return ret; + HWND item = GetDlgItem(hwnd, id); + size_t size = GetWindowTextLengthA(item) + 1; + char *text = snewn(size, char); + GetWindowTextA(item, text, size); + return text; } wchar_t *GetDlgItemTextW_alloc(HWND hwnd, int id) { - wchar_t *ret = NULL; - size_t size = 0; - - do { - sgrowarray_nm(ret, size, size); - GetDlgItemTextW(hwnd, id, ret, size); - } while (!wmemchr(ret, L'\0', size-1)); - - return ret; + HWND item = GetDlgItem(hwnd, id); + size_t size = GetWindowTextLengthW(item) + 1; + wchar_t *text = snewn(size, wchar_t); + GetWindowTextW(item, text, size); + return text; }