Changeset 1366

Timestamp:

Oct 19, 1999, 9:44:23 PM (26 years ago)

Author:

phaller

Message:

Fix: EDIT_WM_GetWindowText corrected according specs.

File:

• trunk/src/user32/edit.cpp (modified) (2 diffs)

trunk/src/user32/edit.cpp

@@ -1 @@
-/* $Id: edit.cpp,v 1.4 1999-10-12 20:16:22 sandervl Exp $ */
+/* $Id: edit.cpp,v 1.5 1999-10-19 19:44:23 phaller Exp $ */
 /*
  *      Edit control
@@ -2809 +2809 @@
 static INT EDIT_WM_GetText(HWND hwnd, EDITSTATE *es, INT count, LPSTR text)
 {
-        INT len = lstrlenA(es->text);
-
-        if (count > len) {
-                lstrcpyA(text, es->text);
-                return len;
-        } else
-                return -1;
+  INT len;
+
+  if (es->text == NULL)  // the only case of failure i can imagine
+    return 0;
+
+  len = min(count, lstrlenA(es->text)); // determine length
+  lstrcpynA(text, es->text, len);       // copy as much as possible
+  return len;
 }