commit 8df71a6cfad9d2ad494e11008061648d07b7ddd0
author Dimitrie O. Paun <dpaun@rogers.com> Fri Mar 25 20:49:00 2005 +0000
committer Alexandre Julliard <julliard@winehq.org> Fri Mar 25 20:49:00 2005 +0000
tree 8f6a3a83a28ba64470f15c059ef3715c4dda5e2a
parent 0b3b35116add22c7eceee7b811d72d4d72abb468

Use {Alloc,ReAlloc,Free}() instead of Heap{Alloc,ReAlloc,Free}().

dlls/comctl32/commctrl.c

diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c
index 696231d..1f35a26 100644
--- a/dlls/comctl32/commctrl.c
+++ b/dlls/comctl32/commctrl.c
@@ -514,12 +514,12 @@
 
     if ( text ) {
 	if ( (len = MultiByteToWideChar( CP_ACP, 0, text, -1, NULL, 0 )) ) {
-	    if ( (textW = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) )) )
+	    if ( (textW = Alloc( len * sizeof(WCHAR) )) )
 		MultiByteToWideChar( CP_ACP, 0, text, -1, textW, len );
 	}
     }
     DrawStatusTextW( hdc, lprc, textW, style );
-    HeapFree( GetProcessHeap(), 0, textW );
+    Free( textW );
 }
 
 
@@ -1107,7 +1107,7 @@
    stack = (LPSUBCLASS_INFO)GetPropW (hWnd, COMCTL32_wSubclass);
    if (!stack) {
       /* allocate stack */
-      stack = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(SUBCLASS_INFO));
+      stack = Alloc (sizeof(SUBCLASS_INFO));
       if (!stack) {
          ERR ("Failed to allocate our Subclassing stack\n");
          return FALSE;
@@ -1136,14 +1136,14 @@
       }
    }
    
-   proc = HeapAlloc(GetProcessHeap(), 0, sizeof(SUBCLASSPROCS));
+   proc = Alloc(sizeof(SUBCLASSPROCS));
    if (!proc) {
       ERR ("Failed to allocate subclass entry in stack\n");
       if (IsWindowUnicode (hWnd))
          SetWindowLongPtrW (hWnd, GWLP_WNDPROC, (DWORD_PTR)stack->origproc);
       else
          SetWindowLongPtrA (hWnd, GWLP_WNDPROC, (DWORD_PTR)stack->origproc);
-      HeapFree (GetProcessHeap (), 0, stack);
+      Free (stack);
       RemovePropW( hWnd, COMCTL32_wSubclass );
       return FALSE;
    }
@@ -1243,7 +1243,7 @@
          if (stack->stackpos == proc)
             stack->stackpos = stack->stackpos->next;
             
-         HeapFree (GetProcessHeap (), 0, proc);
+         Free (proc);
          ret = TRUE;
          break;
       }
@@ -1258,7 +1258,7 @@
          SetWindowLongPtrW (hWnd, GWLP_WNDPROC, (DWORD_PTR)stack->origproc);
       else
          SetWindowLongPtrA (hWnd, GWLP_WNDPROC, (DWORD_PTR)stack->origproc);
-      HeapFree (GetProcessHeap (), 0, stack);
+      Free (stack);
       RemovePropW( hWnd, COMCTL32_wSubclass );
    }
    
@@ -1300,7 +1300,7 @@
          SetWindowLongPtrW (hWnd, GWLP_WNDPROC, (DWORD_PTR)stack->origproc);
       else
          SetWindowLongPtrA (hWnd, GWLP_WNDPROC, (DWORD_PTR)stack->origproc);
-      HeapFree (GetProcessHeap (), 0, stack);
+      Free (stack);
       RemovePropW( hWnd, COMCTL32_wSubclass );
    }
    return ret;