Michael Stefaniuc : wnaspi32: Replace malloc with HeapAlloc.
Alexandre Julliard
julliard at winehq.org
Fri Dec 5 07:42:57 CST 2008
Module: wine
Branch: master
Commit: 81f919fd374b1bb2ba842b4b44f8aaa9b7190cbb
URL: http://source.winehq.org/git/wine.git/?a=commit;h=81f919fd374b1bb2ba842b4b44f8aaa9b7190cbb
Author: Michael Stefaniuc <mstefani at redhat.de>
Date: Fri Dec 5 07:48:19 2008 +0100
wnaspi32: Replace malloc with HeapAlloc.
---
dlls/wnaspi32/winaspi16.c | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/dlls/wnaspi32/winaspi16.c b/dlls/wnaspi32/winaspi16.c
index 4209082..17d6a6c 100644
--- a/dlls/wnaspi32/winaspi16.c
+++ b/dlls/wnaspi32/winaspi16.c
@@ -252,7 +252,7 @@ ASPI_ExecScsiCmd(DWORD ptrPRB, UINT16 mode)
if (HOST_TO_TARGET(lpPRB)) {
/* send header, command, and then data */
in_len = SCSI_OFF + lpPRB->SRB_CDBLen + lpPRB->SRB_BufLen;
- sg_hd = (struct sg_header *) malloc(in_len);
+ sg_hd = HeapAlloc(GetProcessHeap(), 0, in_len);
memset(sg_hd, 0, SCSI_OFF);
memcpy(sg_hd + 1, &lpPRB->CDBByte[0], lpPRB->SRB_CDBLen);
if (lpPRB->SRB_BufLen) {
@@ -262,20 +262,20 @@ ASPI_ExecScsiCmd(DWORD ptrPRB, UINT16 mode)
else {
/* send header and command - no data */
in_len = SCSI_OFF + lpPRB->SRB_CDBLen;
- sg_hd = (struct sg_header *) malloc(in_len);
+ sg_hd = HeapAlloc(GetProcessHeap(), 0, in_len);
memset(sg_hd, 0, SCSI_OFF);
memcpy(sg_hd + 1, &lpPRB->CDBByte[0], lpPRB->SRB_CDBLen);
}
if (TARGET_TO_HOST(lpPRB)) {
out_len = SCSI_OFF + lpPRB->SRB_BufLen;
- sg_reply_hdr = (struct sg_header *) malloc(out_len);
+ sg_reply_hdr = HeapAlloc(GetProcessHeap(), 0, out_len);
memset(sg_reply_hdr, 0, SCSI_OFF);
sg_hd->reply_len = out_len;
}
else {
out_len = SCSI_OFF;
- sg_reply_hdr = (struct sg_header *) malloc(out_len);
+ sg_reply_hdr = HeapAlloc(GetProcessHeap(), 0, out_len);
memset(sg_reply_hdr, 0, SCSI_OFF);
sg_hd->reply_len = out_len;
}
@@ -343,8 +343,8 @@ ASPI_ExecScsiCmd(DWORD ptrPRB, UINT16 mode)
}
}
- free(sg_reply_hdr);
- free(sg_hd);
+ HeapFree(GetProcessHeap(), 0, sg_reply_hdr);
+ HeapFree(GetProcessHeap(), 0, sg_hd);
ASPI_DebugPrintResult(lpPRB, mode);
return SS_COMP;
@@ -362,8 +362,8 @@ error_exit:
* We probably should set lpPRB->SRB_TargStat, SRB_HaStat ?
*/
WARN("error_exit\n");
- free(sg_reply_hdr);
- free(sg_hd);
+ HeapFree(GetProcessHeap(), 0, sg_reply_hdr);
+ HeapFree(GetProcessHeap(), 0, sg_hd);
return lpPRB->SRB_Status;
}
#endif
More information about the wine-cvs
mailing list