commit f09f03a723d221807becd68393e90854dbc82a66
author Marcus Meissner <marcus@jet.franken.de> Sun Feb 17 15:58:06 2008 +0100
committer Alexandre Julliard <julliard@winehq.org> Mon Feb 18 12:41:37 2008 +0100
tree 9207d4507654ebdaf25ff1bd945d56d3a8ec0c1a
parent 2ef077e95ec17ff2ea410210bfcfeb8ecde911fa

user32: Handle error returns from ImmGetCompositionString.

dlls/user32/edit.c

diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c
index a3eb1d8..b1a0007 100644
--- a/dlls/user32/edit.c
+++ b/dlls/user32/edit.c
@@ -5347,7 +5347,7 @@
 
 static void EDIT_GetCompositionStr(HWND hwnd, LPARAM CompFlag, EDITSTATE *es)
 {
-    DWORD dwBufLen;
+    LONG buflen;
     LPWSTR lpCompStr = NULL;
     HIMC hIMC;
     LPSTR lpCompStrAttr = NULL;
@@ -5356,15 +5356,15 @@
     if (!(hIMC = ImmGetContext(hwnd)))
         return;
 
-    dwBufLen = ImmGetCompositionStringW(hIMC, GCS_COMPSTR, NULL, 0);
+    buflen = ImmGetCompositionStringW(hIMC, GCS_COMPSTR, NULL, 0);
 
-    if (dwBufLen < 0)
+    if (buflen < 0)
     {
         ImmReleaseContext(hwnd, hIMC);
         return;
     }
 
-    lpCompStr = HeapAlloc(GetProcessHeap(),0,dwBufLen + sizeof(WCHAR));
+    lpCompStr = HeapAlloc(GetProcessHeap(),0,buflen + sizeof(WCHAR));
     if (!lpCompStr)
     {
         ERR("Unable to allocate IME CompositionString\n");
@@ -5372,9 +5372,9 @@
         return;
     }
 
-    if (dwBufLen)
-        ImmGetCompositionStringW(hIMC, GCS_COMPSTR, lpCompStr, dwBufLen);
-    lpCompStr[dwBufLen/sizeof(WCHAR)] = 0;
+    if (buflen)
+        ImmGetCompositionStringW(hIMC, GCS_COMPSTR, lpCompStr, buflen);
+    lpCompStr[buflen/sizeof(WCHAR)] = 0;
 
     if (CompFlag & GCS_COMPATTR)
     {
@@ -5427,21 +5427,21 @@
 
 static void EDIT_GetResultStr(HWND hwnd, EDITSTATE *es)
 {
-    DWORD dwBufLen;
+    LONG buflen;
     LPWSTR lpResultStr;
     HIMC    hIMC;
 
     if ( !(hIMC = ImmGetContext(hwnd)))
         return;
 
-    dwBufLen = ImmGetCompositionStringW(hIMC, GCS_RESULTSTR, NULL, 0);
-    if (dwBufLen <= 0)
+    buflen = ImmGetCompositionStringW(hIMC, GCS_RESULTSTR, NULL, 0);
+    if (buflen <= 0)
     {
         ImmReleaseContext(hwnd, hIMC);
         return;
     }
 
-    lpResultStr = HeapAlloc(GetProcessHeap(),0, dwBufLen+sizeof(WCHAR));
+    lpResultStr = HeapAlloc(GetProcessHeap(),0, buflen+sizeof(WCHAR));
     if (!lpResultStr)
     {
         ERR("Unable to alloc buffer for IME string\n");
@@ -5449,8 +5449,8 @@
         return;
     }
 
-    ImmGetCompositionStringW(hIMC, GCS_RESULTSTR, lpResultStr, dwBufLen);
-    lpResultStr[dwBufLen/sizeof(WCHAR)] = 0;
+    ImmGetCompositionStringW(hIMC, GCS_RESULTSTR, lpResultStr, buflen);
+    lpResultStr[buflen/sizeof(WCHAR)] = 0;
 
     /* check for change in composition start */
     if (es->selection_end < es->composition_start)