Attachment #75470 for bug #94477




        if (spTempBuffer == NULL) throw(ERROR_INSUFFICIENT_MEMORY);

        // get the header
        THROW_ON_ERROR(spAPEDecompress->GetInfo(APE_INFO_WAV_HEADER_DATA, (long) spTempBuffer.GetPtr(), spAPEDecompress->GetInfo(APE_INFO_WAV_HEADER_BYTES)));

        // initialize the output
        if (nOutputMode == UNMAC_DECODER_OUTPUT_WAV)

            {
                spTempBuffer.Assign(new unsigned char[spAPEDecompress->GetInfo(APE_INFO_WAV_TERMINATING_BYTES)], TRUE);
                if (spTempBuffer == NULL) throw(ERROR_INSUFFICIENT_MEMORY);
                THROW_ON_ERROR(spAPEDecompress->GetInfo(APE_INFO_WAV_TERMINATING_DATA, (long) spTempBuffer.GetPtr(), spAPEDecompress->GetInfo(APE_INFO_WAV_TERMINATING_BYTES)))
        
                unsigned int nBytesToWrite = spAPEDecompress->GetInfo(APE_INFO_WAV_TERMINATING_BYTES);
                unsigned int nBytesWritten = 0;

                spTempBuffer.Assign(new unsigned char[nTerminatingBytes], TRUE);
                if (spTempBuffer == NULL) throw(ERROR_INSUFFICIENT_MEMORY);
                
                THROW_ON_ERROR(spAPEDecompress->GetInfo(APE_INFO_WAV_TERMINATING_DATA, (long) spTempBuffer.GetPtr(), nTerminatingBytes))

                if (bHasTag)
                {




        break;
    }
    case APE_INFO_IO_SOURCE:
        nRetVal = (long) m_spIO.GetPtr();
        break;
    case APE_INFO_FRAME_BYTES:
    {

        break;
    }
    case APE_INFO_TAG:
        nRetVal = (long) m_spAPETag.GetPtr();
        break;
    case APE_INTERNAL_INFO:
        nRetVal = (long) &m_APEFileInfo;
        break;
    default:
	break;

Lines 452-458 Link Here

(-)mac-3.99-u4-b4/src/MACLib/APEDecompress.cpp.old (-1 / +1 lines)
452	}	452	}
453	else	453	else
454	{	454	{
455	WAVEFORMATEX wfeFormat; GetInfo(APE_INFO_WAVEFORMATEX, (int) &wfeFormat, 0);	455	WAVEFORMATEX wfeFormat; GetInfo(APE_INFO_WAVEFORMATEX, (long) &wfeFormat, 0);
456	WAVE_HEADER WAVHeader; FillWaveHeader(&WAVHeader,	456	WAVE_HEADER WAVHeader; FillWaveHeader(&WAVHeader,
457	(m_nFinishBlock - m_nStartBlock) * GetInfo(APE_INFO_BLOCK_ALIGN),	457	(m_nFinishBlock - m_nStartBlock) * GetInfo(APE_INFO_BLOCK_ALIGN),
458	&wfeFormat, 0);	458	&wfeFormat, 0);

Lines 100-106 Link Here

(-)mac-3.99-u4-b4/src/MACLib/MD5.cpp.old (-1 / +1 lines)
100	CopyToLittleEndian (tempBuffer, in, 16);	100	CopyToLittleEndian (tempBuffer, in, 16);
101	x = tempBuffer;	101	x = tempBuffer;
102	#else	102	#else
103	if ( (unsigned int)in & 3 ) {	103	if ( (unsigned long)in & 3 ) {
104	memcpy ( tempBuffer, in, 64 );	104	memcpy ( tempBuffer, in, 64 );
105	x = tempBuffer;	105	x = tempBuffer;
106	}	106	}

Lines 250-256 Link Here

(-)mac-3.99-u4-b4/src/MACLib/Old/APEDecompressOld.cpp.old (-1 / +1 lines)
250	}	250	}
251	else	251	else
252	{	252	{
253	WAVEFORMATEX wfeFormat; GetInfo(APE_INFO_WAVEFORMATEX, (int) &wfeFormat, 0);	253	WAVEFORMATEX wfeFormat; GetInfo(APE_INFO_WAVEFORMATEX, (long) &wfeFormat, 0);
254	WAVE_HEADER WAVHeader; FillWaveHeader(&WAVHeader,	254	WAVE_HEADER WAVHeader; FillWaveHeader(&WAVHeader,
255	(m_nFinishBlock - m_nStartBlock) * GetInfo(APE_INFO_BLOCK_ALIGN),	255	(m_nFinishBlock - m_nStartBlock) * GetInfo(APE_INFO_BLOCK_ALIGN),
256	&wfeFormat, 0);	256	&wfeFormat, 0);




    // set the initialized flag to TRUE
    m_bInitialized = TRUE;
    
    m_pAPEDecompress->GetInfo(APE_INFO_WAVEFORMATEX, (long) &m_wfeInput);

    // return a successful value
    return ERROR_SUCCESS;

    {
        m_pAPEDecompressCore->GenerateDecodedArrays(nBlocks, nSpecialCodes, FrameIndex, CPULoadBalancingFactor);

        WAVEFORMATEX WaveFormatEx; m_pAPEDecompress->GetInfo(APE_INFO_WAVEFORMATEX, (long) &WaveFormatEx);
        m_pPrepare->UnprepareOld(m_pAPEDecompressCore->GetDataX(), m_pAPEDecompressCore->GetDataY(), nBlocks, &WaveFormatEx, 
            pOutputData, (unsigned int *) &CRC, (int *) &nSpecialCodes, m_pAPEDecompress->GetInfo(APE_INFO_FILE_VERSION));
    }

    {
        m_pAPEDecompressCore->GenerateDecodedArrays(nBlocks, nSpecialCodes, FrameIndex, CPULoadBalancingFactor);
        
        WAVEFORMATEX WaveFormatEx; m_pAPEDecompress->GetInfo(APE_INFO_WAVEFORMATEX, (long) &WaveFormatEx);
        m_pPrepare->UnprepareOld(m_pAPEDecompressCore->GetDataX(), NULL, nBlocks, &WaveFormatEx, 
            pOutputData, (unsigned int *) &CRC, (int *) &nSpecialCodes, m_pAPEDecompress->GetInfo(APE_INFO_FILE_VERSION));
    }

Return to bug 94477

Lines 311-317 Link Here

(-)mac-3.99-u4-b4/src/MACLib/APEInfo.cpp.old (-3 / +3 lines)
311	break;	311	break;
312	}	312	}
313	case APE_INFO_IO_SOURCE:	313	case APE_INFO_IO_SOURCE:
314	nRetVal = (int) m_spIO.GetPtr();	314	nRetVal = (long) m_spIO.GetPtr();
315	break;	315	break;
316	case APE_INFO_FRAME_BYTES:	316	case APE_INFO_FRAME_BYTES:
317	{	317	{
Lines 350-359 Link Here
350	break;	350	break;
351	}	351	}
352	case APE_INFO_TAG:	352	case APE_INFO_TAG:
353	nRetVal = (int) m_spAPETag.GetPtr();	353	nRetVal = (long) m_spAPETag.GetPtr();
354	break;	354	break;
355	case APE_INTERNAL_INFO:	355	case APE_INTERNAL_INFO:
356	nRetVal = (int) &m_APEFileInfo;	356	nRetVal = (long) &m_APEFileInfo;
357	break;	357	break;
358	default:	358	default:
359	break;	359	break;

Lines 298-304 Link Here

(-)mac-3.99-u4-b4/src/MACLib/APESimple.cpp.old (-3 / +3 lines)
298	if (spTempBuffer == NULL) throw(ERROR_INSUFFICIENT_MEMORY);	298	if (spTempBuffer == NULL) throw(ERROR_INSUFFICIENT_MEMORY);
299		299
300	// get the header	300	// get the header
301	THROW_ON_ERROR(spAPEDecompress->GetInfo(APE_INFO_WAV_HEADER_DATA, (int) spTempBuffer.GetPtr(), spAPEDecompress->GetInfo(APE_INFO_WAV_HEADER_BYTES)));	301	THROW_ON_ERROR(spAPEDecompress->GetInfo(APE_INFO_WAV_HEADER_DATA, (long) spTempBuffer.GetPtr(), spAPEDecompress->GetInfo(APE_INFO_WAV_HEADER_BYTES)));
302		302
303	// initialize the output	303	// initialize the output
304	if (nOutputMode == UNMAC_DECODER_OUTPUT_WAV)	304	if (nOutputMode == UNMAC_DECODER_OUTPUT_WAV)
Lines 370-376 Link Here
370	{	370	{
371	spTempBuffer.Assign(new unsigned char[spAPEDecompress->GetInfo(APE_INFO_WAV_TERMINATING_BYTES)], TRUE);	371	spTempBuffer.Assign(new unsigned char[spAPEDecompress->GetInfo(APE_INFO_WAV_TERMINATING_BYTES)], TRUE);
372	if (spTempBuffer == NULL) throw(ERROR_INSUFFICIENT_MEMORY);	372	if (spTempBuffer == NULL) throw(ERROR_INSUFFICIENT_MEMORY);
373	THROW_ON_ERROR(spAPEDecompress->GetInfo(APE_INFO_WAV_TERMINATING_DATA, (int) spTempBuffer.GetPtr(), spAPEDecompress->GetInfo(APE_INFO_WAV_TERMINATING_BYTES)))	373	THROW_ON_ERROR(spAPEDecompress->GetInfo(APE_INFO_WAV_TERMINATING_DATA, (long) spTempBuffer.GetPtr(), spAPEDecompress->GetInfo(APE_INFO_WAV_TERMINATING_BYTES)))
374		374
375	unsigned int nBytesToWrite = spAPEDecompress->GetInfo(APE_INFO_WAV_TERMINATING_BYTES);	375	unsigned int nBytesToWrite = spAPEDecompress->GetInfo(APE_INFO_WAV_TERMINATING_BYTES);
376	unsigned int nBytesWritten = 0;	376	unsigned int nBytesWritten = 0;
Lines 392-398 Link Here
392	spTempBuffer.Assign(new unsigned char[nTerminatingBytes], TRUE);	392	spTempBuffer.Assign(new unsigned char[nTerminatingBytes], TRUE);
393	if (spTempBuffer == NULL) throw(ERROR_INSUFFICIENT_MEMORY);	393	if (spTempBuffer == NULL) throw(ERROR_INSUFFICIENT_MEMORY);
394		394
395	THROW_ON_ERROR(spAPEDecompress->GetInfo(APE_INFO_WAV_TERMINATING_DATA, (int) spTempBuffer.GetPtr(), nTerminatingBytes))	395	THROW_ON_ERROR(spAPEDecompress->GetInfo(APE_INFO_WAV_TERMINATING_DATA, (long) spTempBuffer.GetPtr(), nTerminatingBytes))
396		396
397	if (bHasTag)	397	if (bHasTag)
398	{	398	{

Lines 78-84 Link Here

(-)mac-3.99-u4-b4/src/MACLib/Old/UnMAC.cpp.old (-3 / +3 lines)
78	// set the initialized flag to TRUE	78	// set the initialized flag to TRUE
79	m_bInitialized = TRUE;	79	m_bInitialized = TRUE;
80		80
81	m_pAPEDecompress->GetInfo(APE_INFO_WAVEFORMATEX, (int) &m_wfeInput);	81	m_pAPEDecompress->GetInfo(APE_INFO_WAVEFORMATEX, (long) &m_wfeInput);
82		82
83	// return a successful value	83	// return a successful value
84	return ERROR_SUCCESS;	84	return ERROR_SUCCESS;
Lines 197-203 Link Here
197	{	197	{
198	m_pAPEDecompressCore->GenerateDecodedArrays(nBlocks, nSpecialCodes, FrameIndex, CPULoadBalancingFactor);	198	m_pAPEDecompressCore->GenerateDecodedArrays(nBlocks, nSpecialCodes, FrameIndex, CPULoadBalancingFactor);
199		199
200	WAVEFORMATEX WaveFormatEx; m_pAPEDecompress->GetInfo(APE_INFO_WAVEFORMATEX, (int) &WaveFormatEx);	200	WAVEFORMATEX WaveFormatEx; m_pAPEDecompress->GetInfo(APE_INFO_WAVEFORMATEX, (long) &WaveFormatEx);
201	m_pPrepare->UnprepareOld(m_pAPEDecompressCore->GetDataX(), m_pAPEDecompressCore->GetDataY(), nBlocks, &WaveFormatEx,	201	m_pPrepare->UnprepareOld(m_pAPEDecompressCore->GetDataX(), m_pAPEDecompressCore->GetDataY(), nBlocks, &WaveFormatEx,
202	pOutputData, (unsigned int ) &CRC, (int ) &nSpecialCodes, m_pAPEDecompress->GetInfo(APE_INFO_FILE_VERSION));	202	pOutputData, (unsigned int ) &CRC, (int ) &nSpecialCodes, m_pAPEDecompress->GetInfo(APE_INFO_FILE_VERSION));
203	}	203	}
Lines 205-211 Link Here
205	{	205	{
206	m_pAPEDecompressCore->GenerateDecodedArrays(nBlocks, nSpecialCodes, FrameIndex, CPULoadBalancingFactor);	206	m_pAPEDecompressCore->GenerateDecodedArrays(nBlocks, nSpecialCodes, FrameIndex, CPULoadBalancingFactor);
207		207
208	WAVEFORMATEX WaveFormatEx; m_pAPEDecompress->GetInfo(APE_INFO_WAVEFORMATEX, (int) &WaveFormatEx);	208	WAVEFORMATEX WaveFormatEx; m_pAPEDecompress->GetInfo(APE_INFO_WAVEFORMATEX, (long) &WaveFormatEx);
209	m_pPrepare->UnprepareOld(m_pAPEDecompressCore->GetDataX(), NULL, nBlocks, &WaveFormatEx,	209	m_pPrepare->UnprepareOld(m_pAPEDecompressCore->GetDataX(), NULL, nBlocks, &WaveFormatEx,
210	pOutputData, (unsigned int ) &CRC, (int ) &nSpecialCodes, m_pAPEDecompress->GetInfo(APE_INFO_FILE_VERSION));	210	pOutputData, (unsigned int ) &CRC, (int ) &nSpecialCodes, m_pAPEDecompress->GetInfo(APE_INFO_FILE_VERSION));
211	}	211	}