itss: Replace malloc() with HeapAlloc() (Try 2)
Andrew Talbot
andrew.talbot at talbotville.com
Tue Feb 10 16:18:08 CST 2009
I have now replaced calls to free() with calls to HeapFree(). (Thanks to
Nikolay Sivov for pointing that out!). Please give feedback if still rejecting
this patch.
Thanks,
-- Andy.
---
Changelog:
itss: Replace malloc() with HeapAlloc().
diff --git a/dlls/itss/lzx.c b/dlls/itss/lzx.c
index b5fdfc7..01a9492 100644
--- a/dlls/itss/lzx.c
+++ b/dlls/itss/lzx.c
@@ -36,15 +36,17 @@
***************************************************************************/
#include "lzx.h"
+#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include "windef.h"
+#include "winbase.h"
+
/* sized types */
typedef unsigned char UBYTE; /* 8 bits exactly */
typedef unsigned short UWORD; /* 16 bits (or more) */
-typedef unsigned int ULONG; /* 32 bits (or more) */
-typedef signed int LONG; /* 32 bits (or more) */
/* some constants defined by the LZX specification */
#define LZX_MIN_MATCH (2)
@@ -178,10 +180,10 @@ struct LZXstate *LZXinit(int window)
if (window < 15 || window > 21) return NULL;
/* allocate state and associated window */
- pState = malloc(sizeof(struct LZXstate));
- if (!(pState->window = malloc(wndsize)))
+ pState = HeapAlloc(GetProcessHeap(), 0, sizeof(struct LZXstate));
+ if (!(pState->window = HeapAlloc(GetProcessHeap(), 0, wndsize)))
{
- free(pState);
+ HeapFree(GetProcessHeap(), 0, pState);
return NULL;
}
pState->actual_size = wndsize;
@@ -217,8 +219,8 @@ void LZXteardown(struct LZXstate *pState)
{
if (pState)
{
- free(pState->window);
- free(pState);
+ HeapFree(GetProcessHeap(), 0, pState->window);
+ HeapFree(GetProcessHeap(), 0, pState);
}
}
More information about the wine-patches
mailing list