Clean up more 32-bit assumptions.

1 files changed, 4 insertions, 1 deletions

diff --git a/src/dutil/thmutil.cpp b/src/dutil/thmutil.cpp
index d87e997d..d200a0ea 100644
--- a/src/dutil/thmutil.cpp
+++ b/src/dutil/thmutil.cpp
@@ -1519,13 +1519,16 @@ DAPI_(HRESULT) ThemeGetTextControl(
 {
     HRESULT hr = S_OK;
     HWND hWnd = ::GetDlgItem(pTheme->hwndParent, dwControl);
+    SIZE_T cbSize = 0;
     DWORD cchText = 0;
     DWORD cchTextRead = 0;
 
     // Ensure the string has room for at least one character.
-    hr = StrMaxLength(*psczText, reinterpret_cast<DWORD_PTR*>(&cchText));
+    hr = StrMaxLength(*psczText, &cbSize);
     ThmExitOnFailure(hr, "Failed to get text buffer length.");
 
+    cchText = (DWORD)min(DWORD_MAX, cbSize);
+
     if (!cchText)
     {
         cchText = GROW_WINDOW_TEXT;