riched20: The wParam parameter to WM_GETTEXT contains the number of characters,…

riched20: The wParam parameter to WM_GETTEXT contains the number of characters, not the number of bytes. Fix up some places in the WM_GETTEXT handler where it was assumed that it was a byte count.

riched20: The wParam parameter to WM_GETTEXT contains the number of characters,…
374f6ec6 · Rob Shearman · Alexandre Julliard · 39f67279 · 374f6ec6
Commit 374f6ec6 authored Jan 18, 2008 by Rob Shearman Committed by Alexandre Julliard Jan 21, 2008
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

editor.c dlls/riched20/editor.c +3 -3

No files found.
--- a/dlls/riched20/editor.c
+++ b/dlls/riched20/editor.c
@@ -2077,7 +2077,7 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam,
    else
        bufferA = heap_alloc(wParam + 2);

-    ex.cb = wParam + (unicode ? 2*sizeof(WCHAR) : 2);
+    ex.cb = (wParam + 2) * (unicode ? sizeof(WCHAR) : sizeof(CHAR));
    ex.flags = GT_USECRLF;
    ex.codepage = unicode ? 1200 : CP_ACP;
    ex.lpDefaultChar = NULL;
@@ -2086,8 +2086,8 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam,

    if (unicode)
    {
-        memcpy((LPWSTR)lParam, bufferW, wParam);
-        if (lstrlenW(bufferW) >= wParam / sizeof(WCHAR)) rc = 0;
+        memcpy((LPWSTR)lParam, bufferW, wParam * sizeof(WCHAR));
+        if (lstrlenW(bufferW) >= wParam) rc = 0;
    }
    else
    {