commit 9ad96367259d86b81a869cb19645859451485bc4
author Dimitrie O. Paun <dimi@cs.toronto.edu> Sun Mar 19 14:29:50 2000 +0000
committer Alexandre Julliard <julliard@winehq.org> Sun Mar 19 14:29:50 2000 +0000
tree 2d759b95d11b4fff2592297f05c537ce8e30f6b7
parent abdb034ffa703f679cdb6b192a0d87e5e594e819

Removed most calls to xmalloc/xrealloc.

windows/clipboard.c

diff --git a/windows/clipboard.c b/windows/clipboard.c
index 91540af..c1a77ad 100644
--- a/windows/clipboard.c
+++ b/windows/clipboard.c
@@ -33,7 +33,6 @@
 #include "task.h"
 #include "queue.h"
 #include "clipboard.h"
-#include "xmalloc.h"
 #include "debugtools.h"
 
 DEFAULT_DEBUG_CHANNEL(clipboard)
@@ -1042,13 +1041,21 @@
 
     /* allocate storage for new format entry */
 
-    lpNewFormat = (LPWINE_CLIPFORMAT)xmalloc(sizeof(WINE_CLIPFORMAT));
+    lpNewFormat = (LPWINE_CLIPFORMAT)HeapAlloc(GetProcessHeap(), 0, sizeof(WINE_CLIPFORMAT));
+    if(lpNewFormat == NULL) {
+        WARN("No more memory for a new format!");
+        return 0;
+    }
     lpFormat->NextFormat = lpNewFormat;
     lpNewFormat->wFormatID = LastRegFormat;
     lpNewFormat->wRefCount = 1;
 
-    lpNewFormat->Name = (LPSTR)xmalloc(strlen(FormatName) + 1);
-    strcpy(lpNewFormat->Name, FormatName);
+    lpNewFormat->Name = (LPSTR)HEAP_strdupA(GetProcessHeap(), 0, FormatName);
+    if(lpNewFormat->Name == NULL) {
+        WARN("No more memory for the new format name!");
+        HeapFree(GetProcessHeap(), 0, lpNewFormat);
+        return 0;
+    }
 
     lpNewFormat->wDataPresent = 0;
     lpNewFormat->hData16 = 0;