Changeset 21356 for trunk/src/user32/edit.c

Timestamp:

Feb 21, 2010, 5:33:53 PM (16 years ago)

Author:

rlwalsh

Message:

eliminate VACPP warning & info msgs - see Ticket #1

File:

• trunk/src/user32/edit.c (modified) (7 diffs)

trunk/src/user32/edit.c

@@ -720 +720 @@
             LPSTR textA = (LPSTR)lParam;
             INT countW = MultiByteToWideChar(CP_ACP, 0, textA, -1, NULL, 0);
-            if((textW = HeapAlloc(GetProcessHeap(), 0, countW * sizeof(WCHAR))))
+            if((textW = HeapAlloc(GetProcessHeap(), 0, countW * sizeof(WCHAR))) != NULL)
             MultiByteToWideChar(CP_ACP, 0, textA, -1, textW, countW);
         }
@@ -824 +824 @@
     case EM_SETTABSTOPS16:
         DPRINTF_EDIT_MSG16("EM_SETTABSTOPS");
-        result = (LRESULT)EDIT_EM_SetTabStops16(es, (INT)wParam, MapSL(lParam));
+        result = (LRESULT)EDIT_EM_SetTabStops16(es, (INT)wParam, (LPINT16)MapSL(lParam));
         break;
     case EM_SETTABSTOPS:
@@ -1059 +1059 @@
             {
             INT countW = MultiByteToWideChar(CP_ACP, 0, nameA, -1, NULL, 0);
-            if((nameW = HeapAlloc(GetProcessHeap(), 0, countW * sizeof(WCHAR))))
+            if((nameW = HeapAlloc(GetProcessHeap(), 0, countW * sizeof(WCHAR))) != NULL)
                 MultiByteToWideChar(CP_ACP, 0, nameA, -1, nameW, countW);
             }
@@ -2287 +2287 @@
     if (es->hloc32W) {
         UINT alloc_size = ROUND_TO_GROW((size + 1) * sizeof(WCHAR));
-        if ((hNew32W = LocalReAlloc(es->hloc32W, alloc_size, LMEM_MOVEABLE | LMEM_ZEROINIT))) {
+        if ((hNew32W = LocalReAlloc(es->hloc32W, alloc_size, LMEM_MOVEABLE | LMEM_ZEROINIT)) != 0) {
         TRACE("Old 32 bit handle %08x, new handle %08x\n", es->hloc32W, hNew32W);
         es->hloc32W = hNew32W;
@@ -2324 +2324 @@
 
     alloc_size = ROUND_TO_GROW((size + 1) * sizeof(WCHAR));
-    if ((es->undo_text = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, es->undo_text, alloc_size))) {
+    if ((es->undo_text = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, es->undo_text, alloc_size)) != 0) {
 #ifdef __WIN32OS2__
         es->undo_buffer_size = alloc_size/sizeof(WCHAR) - 1;
@@ -5190 +5190 @@
 
     OpenClipboard(hwnd);
-    if ((hsrc = GetClipboardData(CF_UNICODETEXT))) {
+    if ((hsrc = GetClipboardData(CF_UNICODETEXT)) != 0) {
         src = (LPWSTR)GlobalLock(hsrc);
         EDIT_EM_ReplaceSel(hwnd, es, TRUE, src, TRUE);
@@ -5293 +5293 @@
     LPCSTR textA = (LPCSTR)lParam;
     INT countW = MultiByteToWideChar(CP_ACP, 0, textA, -1, NULL, 0);
-    if((text = HeapAlloc(GetProcessHeap(), 0, countW * sizeof(WCHAR))))
+    if((text = HeapAlloc(GetProcessHeap(), 0, countW * sizeof(WCHAR))) != NULL)
         MultiByteToWideChar(CP_ACP, 0, textA, -1, text, countW);
     }