[OMPT-svn-commit] SF.net SVN: modplug:[1939] trunk/OpenMPT/soundlib

[<man...@us...>]

Revision: 1939
          http://sourceforge.net/p/modplug/code/1939
Author:   manxorist
Date:     2013-04-22 21:19:29 +0000 (Mon, 22 Apr 2013)
Log Message:
-----------
[Ref] Replace all GlobalAlloc and GlobalFree in soundlib.

Modified Paths:
--------------
    trunk/OpenMPT/soundlib/Dlsbank.cpp
    trunk/OpenMPT/soundlib/Mmcmp.cpp
    trunk/OpenMPT/soundlib/Sndfile.cpp

Modified: trunk/OpenMPT/soundlib/Dlsbank.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Dlsbank.cpp	2013-04-22 21:08:08 UTC (rev 1938)
+++ trunk/OpenMPT/soundlib/Dlsbank.cpp	2013-04-22 21:19:29 UTC (rev 1939)
@@ -1410,7 +1410,7 @@
 BOOL CDLSBank::FreeWaveForm(LPBYTE p)
 //-----------------------------------
 {
-	if (p) GlobalFreePtr(p);
+	if (p) free(p);
 	return TRUE;
 }
 
@@ -1461,7 +1461,7 @@
 				if (fseek(f, 8, SEEK_CUR) == 0)
 				{
 					*pLen = m_pSamplesEx[nWaveLink].dwLen;
-					*ppWave = (LPBYTE)GlobalAllocPtr(GHND, *pLen + 8);
+					*ppWave = (LPBYTE)calloc(1, *pLen + 8);
 					fread((*ppWave), 1, *pLen, f);
 					bOk = TRUE;
 				}
@@ -1474,7 +1474,7 @@
 				if ((chunk.id == IFFID_LIST) && (chunk.listid == IFFID_wave) && (chunk.len > 4))
 				{
 					*pLen = chunk.len + 8;
-					*ppWave = (LPBYTE)GlobalAllocPtr(GHND, chunk.len + 8);
+					*ppWave = (LPBYTE)calloc(1, chunk.len + 8);
 					if (*ppWave)
 					{
 						memcpy((*ppWave), &chunk, 12);

Modified: trunk/OpenMPT/soundlib/Mmcmp.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Mmcmp.cpp	2013-04-22 21:08:08 UTC (rev 1938)
+++ trunk/OpenMPT/soundlib/Mmcmp.cpp	2013-04-22 21:19:29 UTC (rev 1939)
@@ -129,7 +129,7 @@
 	 || (!pmmh->nblocks) || (pmmh->filesize < 16) || (pmmh->filesize > 0x8000000)
 	 || (pmmh->blktable >= dwMemLength) || (pmmh->blktable + 4*pmmh->nblocks > dwMemLength)) return FALSE;
 	dwFileSize = pmmh->filesize;
-	if ((pBuffer = (LPBYTE)GlobalAllocPtr(GHND, (dwFileSize + 31) & ~15)) == NULL) return FALSE;
+	if ((pBuffer = (LPBYTE)calloc(1, (dwFileSize + 31) & ~15)) == NULL) return FALSE;
 	pblk_table = (LPDWORD)(lpMemFile+pmmh->blktable);
 	for (UINT nBlock=0; nBlock<pmmh->nblocks; nBlock++)
 	{
@@ -570,7 +570,7 @@
 #ifdef MMCMP_LOG
 	Log("XPK detected (SrcLen=%d DstLen=%d) filesize=%d\n", dwSrcLen, dwDstLen, dwMemLength);
 #endif
-	if ((pBuffer = (LPBYTE)GlobalAllocPtr(GHND, (dwDstLen + 31) & ~15)) == NULL) return FALSE;
+	if ((pBuffer = (LPBYTE)calloc(1, (dwDstLen + 31) & ~15)) == NULL) return FALSE;
 	XPK_DoUnpack(lpMemFile+sizeof(XPKFILEHEADER), dwSrcLen+8-sizeof(XPKFILEHEADER), pBuffer, dwDstLen);
 	*ppMemFile = pBuffer;
 	*pdwMemLength = dwDstLen;
@@ -680,7 +680,7 @@
 	dwDstLen = (lpMemFile[dwMemLength-4]<<16) | (lpMemFile[dwMemLength-3]<<8) | (lpMemFile[dwMemLength-2]);
 	//Log("PP20 detected: Packed length=%d, Unpacked length=%d\n", dwMemLength, dwDstLen);
 	if ((dwDstLen < 512) || (dwDstLen > 0x400000) || (dwDstLen > 16*dwMemLength)) return FALSE;
-	if ((pBuffer = (LPBYTE)GlobalAllocPtr(GHND, (dwDstLen + 31) & ~15)) == NULL) return FALSE;
+	if ((pBuffer = (LPBYTE)calloc(1, (dwDstLen + 31) & ~15)) == NULL) return FALSE;
 	PP20_DoUnpack(lpMemFile+4, dwMemLength-4, pBuffer, dwDstLen);
 	*ppMemFile = pBuffer;
 	*pdwMemLength = dwDstLen;

Modified: trunk/OpenMPT/soundlib/Sndfile.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Sndfile.cpp	2013-04-22 21:08:08 UTC (rev 1938)
+++ trunk/OpenMPT/soundlib/Sndfile.cpp	2013-04-22 21:19:29 UTC (rev 1939)
@@ -593,7 +593,7 @@
 
 		if(bMMCmp)
 		{
-			GlobalFreePtr(lpStream);
+			free((void*)lpStream);
 			lpStream = NULL;
 		}
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.