winex11: Make sure GetKeyNameText gets the correct length to return.

349337d7 · Austin English · Alexandre Julliard · 7363b6e2 · 349337d7
Commit 349337d7 authored Jun 26, 2009 by Austin English Committed by Alexandre Julliard Jun 26, 2009
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 5 deletions

keyboard.c dlls/winex11.drv/keyboard.c +1 -5

No files found.
--- a/dlls/winex11.drv/keyboard.c
+++ b/dlls/winex11.drv/keyboard.c
@@ -2349,11 +2349,7 @@ INT CDECL X11DRV_GetKeyNameText(LONG lParam, LPWSTR lpBuffer, INT nSize)
      TRACE("found scan=%04x keyc=%04x keysym=%04x string=%s\n",
            scanCode, keyc, (int)keys, name);
      if (lpBuffer && nSize && name)
-      {
-          MultiByteToWideChar(CP_UNIXCP, 0, name, -1, lpBuffer, nSize);
-          lpBuffer[nSize - 1] = 0;
-          return nSize;
-      }
+          return MultiByteToWideChar(CP_UNIXCP, 0, name, -1, lpBuffer, nSize);
  }

  /* Finally issue WARN for unknown keys   */