Skip to content

W
wine-winehq
Commit 81f919fd authored by Michael Stefaniuc's avatar Michael Stefaniuc Committed by Alexandre Julliard
Browse files
Options

wnaspi32: Replace malloc with HeapAlloc.

parent 1a18b797
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 8 deletions
dlls/wnaspi32/winaspi16.c
View file @ 81f919fd
...@@ -252,7 +252,7 @@ ASPI_ExecScsiCmd(DWORD ptrPRB, UINT16 mode) ...@@ -252,7 +252,7 @@ ASPI_ExecScsiCmd(DWORD ptrPRB, UINT16 mode)
if (HOST_TO_TARGET(lpPRB)) { if (HOST_TO_TARGET(lpPRB)) {
/* send header, command, and then data */ /* send header, command, and then data */
in_len = SCSI_OFF + lpPRB->SRB_CDBLen + lpPRB->SRB_BufLen; 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); memset(sg_hd, 0, SCSI_OFF);
memcpy(sg_hd + 1, &lpPRB->CDBByte[0], lpPRB->SRB_CDBLen); memcpy(sg_hd + 1, &lpPRB->CDBByte[0], lpPRB->SRB_CDBLen);
if (lpPRB->SRB_BufLen) { if (lpPRB->SRB_BufLen) {
...@@ -262,20 +262,20 @@ ASPI_ExecScsiCmd(DWORD ptrPRB, UINT16 mode) ...@@ -262,20 +262,20 @@ ASPI_ExecScsiCmd(DWORD ptrPRB, UINT16 mode)
else { else {
/* send header and command - no data */ /* send header and command - no data */
in_len = SCSI_OFF + lpPRB->SRB_CDBLen; 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); memset(sg_hd, 0, SCSI_OFF);
memcpy(sg_hd + 1, &lpPRB->CDBByte[0], lpPRB->SRB_CDBLen); memcpy(sg_hd + 1, &lpPRB->CDBByte[0], lpPRB->SRB_CDBLen);
} }
if (TARGET_TO_HOST(lpPRB)) { if (TARGET_TO_HOST(lpPRB)) {
out_len = SCSI_OFF + lpPRB->SRB_BufLen; 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); memset(sg_reply_hdr, 0, SCSI_OFF);
sg_hd->reply_len = out_len; sg_hd->reply_len = out_len;
} }
else { else {
out_len = SCSI_OFF; 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); memset(sg_reply_hdr, 0, SCSI_OFF);
sg_hd->reply_len = out_len; sg_hd->reply_len = out_len;
} }
...@@ -343,8 +343,8 @@ ASPI_ExecScsiCmd(DWORD ptrPRB, UINT16 mode) ...@@ -343,8 +343,8 @@ ASPI_ExecScsiCmd(DWORD ptrPRB, UINT16 mode)
} }
} }
free(sg_reply_hdr); HeapFree(GetProcessHeap(), 0, sg_reply_hdr);
free(sg_hd); HeapFree(GetProcessHeap(), 0, sg_hd);
ASPI_DebugPrintResult(lpPRB, mode); ASPI_DebugPrintResult(lpPRB, mode);
return SS_COMP; return SS_COMP;
...@@ -362,8 +362,8 @@ error_exit: ...@@ -362,8 +362,8 @@ error_exit:
* We probably should set lpPRB->SRB_TargStat, SRB_HaStat ? * We probably should set lpPRB->SRB_TargStat, SRB_HaStat ?
*/ */
WARN("error_exit\n"); WARN("error_exit\n");
free(sg_reply_hdr); HeapFree(GetProcessHeap(), 0, sg_reply_hdr);
free(sg_hd); HeapFree(GetProcessHeap(), 0, sg_hd);
return lpPRB->SRB_Status; return lpPRB->SRB_Status;
} }
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment