Cool_Tools/vgmstream
1
0
Fork 0
mirror of https://github.com/vgmstream/vgmstream.git synced 2025-02-26 06:48:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove C99-isms for MSVC 2010.

Browse Source
This commit is contained in:
Chris Moeller 2016-10-28 16:50:39 -07:00
parent 3f813fad09
commit 94309292d9
3 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
ext_libs/clHCA.c
View File

@ -769,7 +769,7 @@ int clHCA_isOurFile1(const void *data, unsigned int size){
int minsize; int minsize;
if (size<8)return -1; if (size<8)return -1;
minsize = clHCA_isOurFile0(data); minsize = clHCA_isOurFile0(data);
if (minsize < 0 || minsize > size)return -1; if (minsize < 0 || (unsigned int)minsize > size)return -1;
if (clHCA_CheckSum(data, minsize, 0))return -1; if (clHCA_CheckSum(data, minsize, 0))return -1;
return 0; return 0;
} }
@ -793,10 +793,12 @@ void clHCA_DecodeSamples16(clHCA *hca,signed short *samples){
const float scale = 32768.0f; const float scale = 32768.0f;
float f; float f;
signed int s; signed int s;
int i, j;
unsigned int k, l;
//const float _rva_volume=hca->_rva_volume; //const float _rva_volume=hca->_rva_volume;
for(int i=0;i<8;i++){ for(i=0;i<8;i++){
for(int j=0;j<0x80;j++){ for(j=0;j<0x80;j++){
for(unsigned int k=0,l=hca->_channelCount;k<l;k++){ for(k=0,l=hca->_channelCount;k<l;k++){
f=hca->_channel[k].wave[i][j]/**_rva_volume*/; f=hca->_channel[k].wave[i][j]/**_rva_volume*/;
if(f>1){f=1;}else if(f<-1){f=-1;} if(f>1){f=1;}else if(f<-1){f=-1;}
s=(signed int)(f*scale); s=(signed int)(f*scale);
@ -981,7 +983,7 @@ void clCipher_Init56(clCipher *cipher,unsigned int key1,unsigned int key2){
unsigned char t2[0x10]; unsigned char t2[0x10];
unsigned char t3[0x100],t31[0x10],t32[0x10],*t; unsigned char t3[0x100],t31[0x10],t32[0x10],*t;
int i, v; int i, j, v;
if(!key1)key2--; if(!key1)key2--;
key1--; key1--;
@ -1004,10 +1006,11 @@ void clCipher_Init56(clCipher *cipher,unsigned int key1,unsigned int key2){
// テーブル3 // テーブル3
t=t3; t=t3;
clCipher_Init56_CreateTable(t31,t1[0]); clCipher_Init56_CreateTable(t31,t1[0]);
for(int i=0;i<0x10;i++){ for(i=0;i<0x10;i++){
unsigned char v;
clCipher_Init56_CreateTable(t32,t2[i]); clCipher_Init56_CreateTable(t32,t2[i]);
unsigned char v=t31[i]<<4; v=t31[i]<<4;
for(int j=0;j<0x10;j++){ for(j=0;j<0x10;j++){
*(t++)=v|t32[j]; *(t++)=v|t32[j];
} }
} }
@ -1028,8 +1031,9 @@ void clCipher_Init56(clCipher *cipher,unsigned int key1,unsigned int key2){
void clCipher_Init56_CreateTable(unsigned char *r,unsigned char key){ void clCipher_Init56_CreateTable(unsigned char *r,unsigned char key){
int mul=((key&1)<<3)|5; int mul=((key&1)<<3)|5;
int add=(key&0xE)|1; int add=(key&0xE)|1;
int i;
key>>=4; key>>=4;
for(int i=0;i<0x10;i++){ for(i=0;i<0x10;i++){
key=(key*mul+add)&0xF; key=(key*mul+add)&0xF;
*(r++)=key; *(r++)=key;
} }
@ -1193,7 +1197,7 @@ int clHCA_Decode(clHCA *hca,void *data,unsigned int size,unsigned int address){
// comm // comm
if(size>=5 && (clData_CheckBit(&d,32)&0x7F7F7F7F)=='comm'){ if(size>=5 && (clData_CheckBit(&d,32)&0x7F7F7F7F)=='comm'){
void * newmem; void * newmem;
int i; unsigned int i;
clData_AddBit(&d,32); clData_AddBit(&d,32);
hca->_comm_len=clData_GetBit(&d,8); hca->_comm_len=clData_GetBit(&d,8);
if(hca->_comm_len>size)return -1; if(hca->_comm_len>size)return -1;
@ -1673,11 +1677,11 @@ void stChannel_Decode5(stChannel *ch,int index){
for(i=0,count1=0x40,count2=1;i<7;i++,count1>>=1,count2<<=1){ for(i=0,count1=0x40,count2=1;i<7;i++,count1>>=1,count2<<=1){
const float *list1Float=(const float *)stChannel_Decode5_list1Int[i]; const float *list1Float=(const float *)stChannel_Decode5_list1Int[i];
const float *list2Float=(const float *)stChannel_Decode5_list2Int[i]; const float *list2Float=(const float *)stChannel_Decode5_list2Int[i];
float *d1, *d2, *w;
s1=s; s1=s;
s2=&s1[count2]; s2=&s1[count2];
float *d1=d; d1=d;
float *d2=&d1[count2*2-1]; d2=&d1[count2*2-1];
float *w;
for(j=0;j<count1;j++){ for(j=0;j<count1;j++){
for(k=0;k<count2;k++){ for(k=0;k<count2;k++){
float a=*(s1++); float a=*(s1++);
@ -1698,10 +1702,9 @@ void stChannel_Decode5(stChannel *ch,int index){
for(i=0;i<0x80;i++)*(d++)=*(s++); for(i=0;i<0x80;i++)*(d++)=*(s++);
s=(const float *)stChannel_Decode5_list3Int;d=ch->wave[index]; s=(const float *)stChannel_Decode5_list3Int;d=ch->wave[index];
s1=&ch->wav2[0x40];s2=ch->wav3; s1=&ch->wav2[0x40];s2=ch->wav3;
for(int i=0;i<0x40;i++)*(d++)=*(s1++)**(s++)+*(s2++); for(i=0;i<0x40;i++)*(d++)=*(s1++)**(s++)+*(s2++);
for(int i=0;i<0x40;i++)*(d++)=*(s++)**(--s1)-*(s2++); for(i=0;i<0x40;i++)*(d++)=*(s++)**(--s1)-*(s2++);
s1=&ch->wav2[0x40-1];d=ch->wav3; s1=&ch->wav2[0x40-1];d=ch->wav3;
for(int i=0;i<0x40;i++)*(d++)=*(s1--)**(--s); for(i=0;i<0x40;i++)*(d++)=*(s1--)**(--s);
for(int i=0;i<0x40;i++)*(d++)=*(--s)**(++s1); for(i=0;i<0x40;i++)*(d++)=*(--s)**(++s1);
} }

3
src/meta/bcstm.c
View File

@ -15,6 +15,7 @@ VGMSTREAM * init_vgmstream_bcstm(STREAMFILE *streamFile) {
int loop_flag; int loop_flag;
int i, ima = 0; int i, ima = 0;
off_t start_offset; off_t start_offset;
int section_count;
/* check extension, case insensitive */ /* check extension, case insensitive */
streamFile->get_name(streamFile, filename, sizeof(filename)); streamFile->get_name(streamFile, filename, sizeof(filename));
@ -28,7 +29,7 @@ VGMSTREAM * init_vgmstream_bcstm(STREAMFILE *streamFile) {
if ((uint16_t)read_16bitLE(4, streamFile) != 0xFEFF) if ((uint16_t)read_16bitLE(4, streamFile) != 0xFEFF)
goto fail; goto fail;
int section_count = read_16bitLE(0x10, streamFile); section_count = read_16bitLE(0x10, streamFile);
for (i = 0; i < section_count; i++) { for (i = 0; i < section_count; i++) {
temp_id = read_16bitLE(0x14 + i * 0xc, streamFile); temp_id = read_16bitLE(0x14 + i * 0xc, streamFile);
switch(temp_id) { switch(temp_id) {

6
src/meta/bfstm.c
View File

@ -19,6 +19,7 @@ VGMSTREAM * init_vgmstream_bfstm(STREAMFILE *streamFile) {
off_t start_offset; off_t start_offset;
int founddata; int founddata;
off_t tempoffset1; off_t tempoffset1;
int section_count;
/* check extension, case insensitive */ /* check extension, case insensitive */
streamFile->get_name(streamFile, filename, sizeof(filename)); streamFile->get_name(streamFile, filename, sizeof(filename));
@ -32,7 +33,7 @@ VGMSTREAM * init_vgmstream_bfstm(STREAMFILE *streamFile) {
if ((uint16_t)read_16bitBE(4, streamFile) != 0xFEFF) if ((uint16_t)read_16bitBE(4, streamFile) != 0xFEFF)
goto fail; goto fail;
int section_count = read_16bitBE(0x10, streamFile); section_count = read_16bitBE(0x10, streamFile);
for (i = 0; i < section_count; i++) { for (i = 0; i < section_count; i++) {
temp_id = read_16bitBE(0x14 + i * 0xc, streamFile); temp_id = read_16bitBE(0x14 + i * 0xc, streamFile);
switch(temp_id) { switch(temp_id) {
@ -133,9 +134,10 @@ VGMSTREAM * init_vgmstream_bfstm(STREAMFILE *streamFile) {
} }
if (vgmstream->coding_type == coding_NGC_DSP) { if (vgmstream->coding_type == coding_NGC_DSP) {
off_t coeff_ptr_table;
VARDECL(off_t, coef_offset); VARDECL(off_t, coef_offset);
ALLOC(coef_offset, channel_count, off_t); ALLOC(coef_offset, channel_count, off_t);
off_t coeff_ptr_table = read_32bitBE(info_offset + 0x1c, streamFile) + info_offset + 8; // Getting pointer for coefficient pointer table coeff_ptr_table = read_32bitBE(info_offset + 0x1c, streamFile) + info_offset + 8; // Getting pointer for coefficient pointer table
for (i = 0; i < channel_count; i++) { for (i = 0; i < channel_count; i++) {
tempoffset1 = read_32bitBE(coeff_ptr_table + 8 + i * 8, streamFile); tempoffset1 = read_32bitBE(coeff_ptr_table + 8 + i * 8, streamFile);