Attachment #75469 for bug #94477

Lines 23-29 Link Here

(-)orig/work/mac-3.99-u4-b4/src/MACLib/APEDecompress.cpp (-2 / +2 lines)
23	}	23	}
24		24
25	// get format information	25	// get format information
26	GetInfo(APE_INFO_WAVEFORMATEX, (int) &m_wfeInput);	26	GetInfo(APE_INFO_WAVEFORMATEX, (long) &m_wfeInput);
27	m_nBlockAlign = GetInfo(APE_INFO_BLOCK_ALIGN);	27	m_nBlockAlign = GetInfo(APE_INFO_BLOCK_ALIGN);
28		28
29	// initialize other stuff	29	// initialize other stuff
Lines 367-373 Link Here
367	/*****************************************************************************************	367	/*****************************************************************************************
368	Get information from the decompressor	368	Get information from the decompressor
369	*****************************************************************************************/	369	*****************************************************************************************/
370	int CAPEDecompress::GetInfo(APE_DECOMPRESS_FIELDS Field, int nParam1, int nParam2)	370	int CAPEDecompress::GetInfo(APE_DECOMPRESS_FIELDS Field, long nParam1, int nParam2)
371	{	371	{
372	int nRetVal = 0;	372	int nRetVal = 0;
373	BOOL bHandled = TRUE;	373	BOOL bHandled = TRUE;

Lines 22-28 Link Here

(-)orig/work/mac-3.99-u4-b4/src/MACLib/APEDecompress.h (-1 / +1 lines)
22	int GetData(char * pBuffer, int nBlocks, int * pBlocksRetrieved);	22	int GetData(char * pBuffer, int nBlocks, int * pBlocksRetrieved);
23	int Seek(int nBlockOffset);	23	int Seek(int nBlockOffset);
24		24
25	int GetInfo(APE_DECOMPRESS_FIELDS Field, int nParam1 = 0, int nParam2 = 0);	25	int GetInfo(APE_DECOMPRESS_FIELDS Field, long nParam1 = 0, int nParam2 = 0);
26		26
27	protected:	27	protected:
28		28

Lines 129-135 Link Here

(-)orig/work/mac-3.99-u4-b4/src/MACLib/APEInfo.cpp (-2 / +2 lines)
129	/*****************************************************************************************	129	/*****************************************************************************************
130	Primary query function	130	Primary query function
131	*****************************************************************************************/	131	*****************************************************************************************/
132	int CAPEInfo::GetInfo(APE_DECOMPRESS_FIELDS Field, int nParam1, int nParam2)	132	int CAPEInfo::GetInfo(APE_DECOMPRESS_FIELDS Field, long nParam1, int nParam2)
133	{	133	{
134	int nRetVal = -1;	134	int nRetVal = -1;
135		135
Lines 254-260 Link Here
254	}	254	}
255	else	255	else
256	{	256	{
257	WAVEFORMATEX wfeFormat; GetInfo(APE_INFO_WAVEFORMATEX, (int) &wfeFormat, 0);	257	WAVEFORMATEX wfeFormat; GetInfo(APE_INFO_WAVEFORMATEX, (long) &wfeFormat, 0);
258	WAVE_HEADER WAVHeader; FillWaveHeader(&WAVHeader, m_APEFileInfo.nWAVDataBytes, &wfeFormat,	258	WAVE_HEADER WAVHeader; FillWaveHeader(&WAVHeader, m_APEFileInfo.nWAVDataBytes, &wfeFormat,
259	m_APEFileInfo.nWAVTerminatingBytes);	259	m_APEFileInfo.nWAVTerminatingBytes);
260	memcpy(pBuffer, &WAVHeader, sizeof(WAVE_HEADER));	260	memcpy(pBuffer, &WAVHeader, sizeof(WAVE_HEADER));

Lines 82-88 Link Here

(-)orig/work/mac-3.99-u4-b4/src/MACLib/APEInfo.h (-1 / +1 lines)
82	virtual ~CAPEInfo();	82	virtual ~CAPEInfo();
83		83
84	// query for information	84	// query for information
85	int GetInfo(APE_DECOMPRESS_FIELDS Field, int nParam1 = 0, int nParam2 = 0);	85	int GetInfo(APE_DECOMPRESS_FIELDS Field, long nParam1 = 0, int nParam2 = 0);
86		86
87	private:	87	private:
88		88

Lines 291-297 Link Here

(-)orig/work/mac-3.99-u4-b4/src/MACLib/APESimple.cpp (-1 / +1 lines)
291	if (spAPEDecompress == NULL \|\| nFunctionRetVal != ERROR_SUCCESS) throw(nFunctionRetVal);	291	if (spAPEDecompress == NULL \|\| nFunctionRetVal != ERROR_SUCCESS) throw(nFunctionRetVal);
292		292
293	// get the input format	293	// get the input format
294	THROW_ON_ERROR(spAPEDecompress->GetInfo(APE_INFO_WAVEFORMATEX, (int) &wfeInput))	294	THROW_ON_ERROR(spAPEDecompress->GetInfo(APE_INFO_WAVEFORMATEX, (long) &wfeInput))
295		295
296	// allocate space for the header	296	// allocate space for the header
297	spTempBuffer.Assign(new unsigned char [spAPEDecompress->GetInfo(APE_INFO_WAV_HEADER_BYTES)], TRUE);	297	spTempBuffer.Assign(new unsigned char [spAPEDecompress->GetInfo(APE_INFO_WAV_HEADER_BYTES)], TRUE);

Lines 259-265 Link Here

(-)orig/work/mac-3.99-u4-b4/src/MACLib/MACLib.h (-1 / +1 lines)
259	// int nParam2	259	// int nParam2
260	// generic parameter... usage is listed in APE_DECOMPRESS_FIELDS	260	// generic parameter... usage is listed in APE_DECOMPRESS_FIELDS
261	//////////////////////////////////////////////////////////////////////////////////////////////	261	//////////////////////////////////////////////////////////////////////////////////////////////
262	virtual int GetInfo(APE_DECOMPRESS_FIELDS Field, int nParam1 = 0, int nParam2 = 0) = 0;	262	virtual int GetInfo(APE_DECOMPRESS_FIELDS Field, long nParam1 = 0, int nParam2 = 0) = 0;
263	};	263	};
264		264
265	/*************************************************************************************************	265	/*************************************************************************************************

Lines 165-171 Link Here

(-)orig/work/mac-3.99-u4-b4/src/MACLib/Old/APEDecompressOld.cpp (-1 / +1 lines)
165	return ERROR_SUCCESS;	165	return ERROR_SUCCESS;
166	}	166	}
167		167
168	int CAPEDecompressOld::GetInfo(APE_DECOMPRESS_FIELDS Field, int nParam1, int nParam2)	168	int CAPEDecompressOld::GetInfo(APE_DECOMPRESS_FIELDS Field, long nParam1, int nParam2)
169	{	169	{
170	int nRetVal = 0;	170	int nRetVal = 0;
171	BOOL bHandled = TRUE;	171	BOOL bHandled = TRUE;

Lines 13-19 Link Here

(-)orig/work/mac-3.99-u4-b4/src/MACLib/Old/APEDecompressOld.h (-1 / +1 lines)
13	int GetData(char * pBuffer, int nBlocks, int * pBlocksRetrieved);	13	int GetData(char * pBuffer, int nBlocks, int * pBlocksRetrieved);
14	int Seek(int nBlockOffset);	14	int Seek(int nBlockOffset);
15		15
16	int GetInfo(APE_DECOMPRESS_FIELDS Field, int nParam1 = 0, int nParam2 = 0);	16	int GetInfo(APE_DECOMPRESS_FIELDS Field, long nParam1 = 0, int nParam2 = 0);
17		17
18	protected:	18	protected:
19		19

Return to bug 94477