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

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

Revision: 3699
          http://sourceforge.net/p/modplug/code/3699
Author:   manxorist
Date:     2014-02-11 13:48:40 +0000 (Tue, 11 Feb 2014)
Log Message:
-----------
[Ref] Kill LPDWORD, LPLONG and LPVOID in soundlib/ .

Modified Paths:
--------------
    trunk/OpenMPT/common/typedefs.h
    trunk/OpenMPT/soundlib/Dlsbank.cpp
    trunk/OpenMPT/soundlib/Dlsbank.h
    trunk/OpenMPT/soundlib/Load_med.cpp

Modified: trunk/OpenMPT/common/typedefs.h
===================================================================
--- trunk/OpenMPT/common/typedefs.h	2014-02-11 13:25:10 UTC (rev 3698)
+++ trunk/OpenMPT/common/typedefs.h	2014-02-11 13:48:40 UTC (rev 3699)
@@ -415,10 +415,7 @@
 typedef std::int32_t  LONG;
 typedef std::uint32_t UINT;
 typedef std::uint32_t ULONG;
-typedef void *        LPVOID;
 typedef BYTE *        LPBYTE;
-typedef DWORD *       LPDWORD;
-typedef LONG *        LPLONG;
 
 // for BOOL
 #define TRUE (1)

Modified: trunk/OpenMPT/soundlib/Dlsbank.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Dlsbank.cpp	2014-02-11 13:25:10 UTC (rev 3698)
+++ trunk/OpenMPT/soundlib/Dlsbank.cpp	2014-02-11 13:48:40 UTC (rev 3699)
@@ -592,8 +592,8 @@
 ///////////////////////////////////////////////////////////////
 // Update DLS instrument definition from an IFF chunk
 
-BOOL CDLSBank::UpdateInstrumentDefinition(DLSINSTRUMENT *pDlsIns, LPVOID pvchunk, DWORD dwMaxLen)
-//--------------------------------------------------------------------------------------------
+BOOL CDLSBank::UpdateInstrumentDefinition(DLSINSTRUMENT *pDlsIns, void *pvchunk, DWORD dwMaxLen)
+//----------------------------------------------------------------------------------------------
 {
 	IFFCHUNK *pchunk = (IFFCHUNK *)pvchunk;
 	if ((!pchunk->len) || (pchunk->len+8 > dwMaxLen)) return FALSE;
@@ -805,8 +805,8 @@
 ///////////////////////////////////////////////////////////////
 // Converts SF2 chunks to DLS
 
-BOOL CDLSBank::UpdateSF2PresetData(LPVOID pvsf2, LPVOID pvchunk, DWORD dwMaxLen)
-//------------------------------------------------------------------------------
+BOOL CDLSBank::UpdateSF2PresetData(void *pvsf2, void *pvchunk, DWORD dwMaxLen)
+//----------------------------------------------------------------------------
 {
 	SF2LOADERINFO *psf2 = (SF2LOADERINFO *)pvsf2;
 	IFFCHUNK *pchunk = (IFFCHUNK *)pvchunk;
@@ -956,8 +956,8 @@
 
 
 // Convert all instruments to the DLS format
-BOOL CDLSBank::ConvertSF2ToDLS(LPVOID pvsf2info)
-//----------------------------------------------
+BOOL CDLSBank::ConvertSF2ToDLS(void *pvsf2info)
+//---------------------------------------------
 {
 	SF2LOADERINFO *psf2;
 	DLSINSTRUMENT *pDlsIns;

Modified: trunk/OpenMPT/soundlib/Dlsbank.h
===================================================================
--- trunk/OpenMPT/soundlib/Dlsbank.h	2014-02-11 13:25:10 UTC (rev 3698)
+++ trunk/OpenMPT/soundlib/Dlsbank.h	2014-02-11 13:48:40 UTC (rev 3699)
@@ -153,9 +153,9 @@
 
 // Internal Loader Functions
 protected:
-	BOOL UpdateInstrumentDefinition(DLSINSTRUMENT *pDlsIns, LPVOID pchunk, DWORD dwMaxLen);
-	BOOL UpdateSF2PresetData(LPVOID psf2info, LPVOID pchunk, DWORD dwMaxLen);
-	BOOL ConvertSF2ToDLS(LPVOID psf2info);
+	BOOL UpdateInstrumentDefinition(DLSINSTRUMENT *pDlsIns, void *pchunk, DWORD dwMaxLen);
+	BOOL UpdateSF2PresetData(void *psf2info, void *pchunk, DWORD dwMaxLen);
+	BOOL ConvertSF2ToDLS(void *psf2info);
 
 public:
 	// DLS Unit conversion

Modified: trunk/OpenMPT/soundlib/Load_med.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_med.cpp	2014-02-11 13:25:10 UTC (rev 3698)
+++ trunk/OpenMPT/soundlib/Load_med.cpp	2014-02-11 13:48:40 UTC (rev 3699)
@@ -508,7 +508,7 @@
 	const MMD2SONGHEADER *pmsh2;
 	const MMD0EXP *pmex;
 	DWORD dwBlockArr, dwSmplArr, dwExpData, wNumBlocks;
-	LPDWORD pdwTable;
+	DWORD *pdwTable;
 	CHAR version;
 	UINT deftempo;
 	int playtransp = 0;
@@ -700,7 +700,7 @@
 
 			if ((playseqtable) && (playseqtable < dwMemLength) && (nplayseq*4 < dwMemLength - playseqtable))
 			{
-				pseq = BigEndian(((LPDWORD)(lpStream+playseqtable))[nplayseq]);
+				pseq = BigEndian(((DWORD*)(lpStream+playseqtable))[nplayseq]);
 			}
 			if ((pseq) && (pseq < dwMemLength - sizeof(MMD2PLAYSEQ)))
 			{
@@ -799,7 +799,7 @@
 	}
 	// Reading samples
 	if (dwSmplArr > dwMemLength - 4*m_nSamples) return true;
-	pdwTable = (LPDWORD)(lpStream + dwSmplArr);
+	pdwTable = (DWORD*)(lpStream + dwSmplArr);
 	for (UINT iSmp=0; iSmp<m_nSamples; iSmp++) if (pdwTable[iSmp])
 	{
 		UINT dwPos = BigEndian(pdwTable[iSmp]);
@@ -849,7 +849,7 @@
 	}
 	if (wNumBlocks > MAX_PATTERNS) wNumBlocks = MAX_PATTERNS;
 	if ((!dwBlockArr) || (dwBlockArr > dwMemLength - 4*wNumBlocks)) return true;
-	pdwTable = (LPDWORD)(lpStream + dwBlockArr);
+	pdwTable = (DWORD*)(lpStream + dwBlockArr);
 	playtransp += (version == '3') ? 24 : 48;
 	for (PATTERNINDEX iBlk=0; iBlk<wNumBlocks; iBlk++)
 	{

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