Mike McCormack : avifil32: Use HeapAlloc instead of Local Alloc.

Alexandre Julliard julliard at wine.codeweavers.com
Mon Mar 13 08:46:38 CST 2006


Module: wine
Branch: refs/heads/master
Commit: 15c5dc12e8ff838a7391b9268c6e091593ac0163
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=15c5dc12e8ff838a7391b9268c6e091593ac0163

Author: Mike McCormack <mike at codeweavers.com>
Date:   Sat Mar 11 14:42:01 2006 +0900

avifil32: Use HeapAlloc instead of Local Alloc.

---

 dlls/avifil32/extrachunk.c |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/dlls/avifil32/extrachunk.c b/dlls/avifil32/extrachunk.c
index d66fd30..35197ae 100644
--- a/dlls/avifil32/extrachunk.c
+++ b/dlls/avifil32/extrachunk.c
@@ -23,7 +23,6 @@
 #include "winbase.h"
 #include "wingdi.h"
 #include "winuser.h"
-#include "windowsx.h"
 #include "vfw.h"
 
 #include "wine/debug.h"
@@ -81,9 +80,9 @@ HRESULT WriteExtraChunk(LPEXTRACHUNKS ex
   assert(size > 0);
 
   if (extra->lp)
-    lp = (LPDWORD)GlobalReAllocPtr(extra->lp, extra->cb + size + 2 * sizeof(DWORD), GHND);
+    lp = HeapReAlloc(GetProcessHeap(), 0, extra->lp, extra->cb + size + 2 * sizeof(DWORD));
   else
-    lp = (LPDWORD)GlobalAllocPtr(GHND, size + 2 * sizeof(DWORD));
+    lp = HeapAlloc(GetProcessHeap(), 0, size + 2 * sizeof(DWORD));
 
   if (lp == NULL)
     return AVIERR_MEMORY;
@@ -116,10 +115,10 @@ HRESULT ReadChunkIntoExtra(LPEXTRACHUNKS
   cb  = lpck->cksize + 2 * sizeof(DWORD);
   cb += (cb & 1);
 
-  if (extra->lp != NULL) {
-    lp = (LPDWORD)GlobalReAllocPtr(extra->lp, extra->cb + cb, GHND);
-  } else
-    lp = (LPDWORD)GlobalAllocPtr(GHND, cb);
+  if (extra->lp != NULL)
+    lp = HeapReAlloc(GetProcessHeap(), 0, extra->lp, extra->cb + cb);
+  else
+    lp = HeapAlloc(GetProcessHeap(), 0, cb);
 
   if (lp == NULL)
     return AVIERR_MEMORY;




More information about the wine-cvs mailing list