[vba-commit] VisualBoyAdvance/src Cheats.cpp,1.27,1.28 Globals.h,1.8,1.9 Util.cpp,1.26,1.27 elf.cpp,1.19,1.20 memgzio.c,1.3,1.4 thumb.h,1.16,1.17 unzip.cpp,1.2,1.3

[Spacy <sp...@us...>]

Update of /cvsroot/vba/VisualBoyAdvance/src
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6380/src

Modified Files:
	Cheats.cpp Globals.h Util.cpp elf.cpp memgzio.c thumb.h 
	unzip.cpp 
Log Message:
vs2005 compatibility, minor changes/fixes

Index: memgzio.c
===================================================================
RCS file: /cvsroot/vba/VisualBoyAdvance/src/memgzio.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** memgzio.c	17 Jan 2004 23:07:32 -0000	1.3
--- memgzio.c	27 May 2006 14:47:32 -0000	1.4
***************
*** 126,130 ****
    }
    memcpy(file->next, buffer, total);
!   file->available -= total;
    file->next += total;
    return total;
--- 126,130 ----
    }
    memcpy(file->next, buffer, total);
!   file->available -= (int)total;
    file->next += total;
    return total;
***************
*** 148,152 ****
    }
    memcpy(buffer, file->next, total);
!   file->available -= total;
    file->next += total;
    return total;
--- 148,152 ----
    }
    memcpy(buffer, file->next, total);
!   file->available -= (int)total;
    file->next += total;
    return total;
***************
*** 171,175 ****
  local long memTell(MEMFILE *f)
  {
!   return (f->next - f->memory) - 8;
  }
  
--- 171,175 ----
  local long memTell(MEMFILE *f)
  {
!   return (long)(f->next - f->memory) - 8;
  }
  
***************
*** 198,202 ****
    va_end(list);
  
!   return memWrite(buffer, 1, len, f);
  }
  
--- 198,202 ----
    va_end(list);
  
!   return (int)memWrite(buffer, 1, len, f);
  }
  

Index: thumb.h
===================================================================
RCS file: /cvsroot/vba/VisualBoyAdvance/src/thumb.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** thumb.h	30 Apr 2006 14:37:15 -0000	1.16
--- thumb.h	27 May 2006 14:47:32 -0000	1.17
***************
*** 775,779 ****
  #ifndef FINAL_VERSION
  if(armNextPC == stop) {
!   armNextPC = armNextPC++;
  }
  #endif
--- 775,779 ----
  #ifndef FINAL_VERSION
  if(armNextPC == stop) {
!   armNextPC++;
  }
  #endif

Index: unzip.cpp
===================================================================
RCS file: /cvsroot/vba/VisualBoyAdvance/src/unzip.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** unzip.cpp	13 May 2004 15:06:45 -0000	1.2
--- unzip.cpp	27 May 2006 14:47:32 -0000	1.3
***************
*** 155,159 ****
  {
      unsigned char c;
!         int err = fread(&c, 1, 1, fin);
      if (err==1)
      {
--- 155,159 ----
  {
      unsigned char c;
!         size_t err = fread(&c, 1, 1, fin);
      if (err==1)
      {

Index: Cheats.cpp
===================================================================
RCS file: /cvsroot/vba/VisualBoyAdvance/src/Cheats.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** Cheats.cpp	30 Apr 2006 14:35:35 -0000	1.27
--- Cheats.cpp	27 May 2006 14:47:32 -0000	1.28
***************
*** 1468,1472 ****
  bool cheatsVerifyCheatCode(const char *code, const char *desc)
  {
!   int len = strlen(code);
    if(len != 11 && len != 13 && len != 17) {
      systemMessage(MSG_INVALID_CHEAT_CODE, N_("Invalid cheat code '%s'"), code);
--- 1468,1472 ----
  bool cheatsVerifyCheatCode(const char *code, const char *desc)
  {
!   size_t len = strlen(code);
    if(len != 11 && len != 13 && len != 17) {
      systemMessage(MSG_INVALID_CHEAT_CODE, N_("Invalid cheat code '%s'"), code);
***************
*** 1479,1483 ****
    }
  
!   int i;
    for(i = 0; i < 8; i++) {
      if(!CHEAT_IS_HEX(code[i])) {
--- 1479,1483 ----
    }
  
!   size_t i;
    for(i = 0; i < 8; i++) {
      if(!CHEAT_IS_HEX(code[i])) {

Index: Util.cpp
===================================================================
RCS file: /cvsroot/vba/VisualBoyAdvance/src/Util.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** Util.cpp	13 May 2006 16:32:15 -0000	1.26
--- Util.cpp	27 May 2006 14:47:32 -0000	1.27
***************
*** 946,954 ****
      size = fileSize;
    }
!   int read = fileSize <= size ? fileSize : size;
!   int r = fread(image, 1, read, f);
    fclose(f);
  
!   if(r != (int)read) {
      systemMessage(MSG_ERROR_READING_IMAGE,
                    N_("Error reading image %s"), file);
--- 946,954 ----
      size = fileSize;
    }
!   size_t read = fileSize <= size ? fileSize : size;
!   size_t r = fread(image, 1, read, f);
    fclose(f);
  
!   if(r != read) {
      systemMessage(MSG_ERROR_READING_IMAGE,
                    N_("Error reading image %s"), file);

Index: Globals.h
===================================================================
RCS file: /cvsroot/vba/VisualBoyAdvance/src/Globals.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Globals.h	25 Jun 2005 06:26:33 -0000	1.8
--- Globals.h	27 May 2006 14:47:32 -0000	1.9
***************
*** 21,24 ****
--- 21,26 ----
  #define VBA_GLOBALS_H
  
+ #include "GBA.h"
+ 
  #define VERBOSE_SWI                  1
  #define VERBOSE_UNALIGNED_MEMORY     2

Index: elf.cpp
===================================================================
RCS file: /cvsroot/vba/VisualBoyAdvance/src/elf.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** elf.cpp	13 Oct 2004 21:07:03 -0000	1.19
--- elf.cpp	27 May 2006 14:47:32 -0000	1.20
***************
*** 821,825 ****
      return NULL;
    }
!   *bytesRead = strlen((char *)data) + 1;
    return (char *)data;
  }
--- 821,825 ----
      return NULL;
    }
!   *bytesRead = (int)strlen((char *)data) + 1;
    return (char *)data;
  }
***************
*** 1071,1075 ****
    
    while(data < end) {
!     u32 offset = data - topOffset;
      u32 len = elfRead4Bytes(data);
      data += 4;
--- 1071,1075 ----
    
    while(data < end) {
!     u32 offset = (u32)(data - topOffset);
      u32 len = elfRead4Bytes(data);
      data += 4;
***************
*** 1111,1115 ****
  
        cie->data = data;
!       cie->dataLen = dataEnd - data;
      } else {
        ELFfde *fde = (ELFfde *)calloc(1, sizeof(ELFfde));
--- 1111,1115 ----
  
        cie->data = data;
!       cie->dataLen = (u32)(dataEnd - data);
      } else {
        ELFfde *fde = (ELFfde *)calloc(1, sizeof(ELFfde));
***************
*** 1137,1141 ****
  
        fde->data = data;
!       fde->dataLen = dataEnd - data;
  
        if((elfFdeCount %10) == 0) {
--- 1137,1141 ----
  
        fde->data = data;
!       fde->dataLen = (u32)(dataEnd - data);
  
        if((elfFdeCount %10) == 0) {
***************
*** 2763,2767 ****
      while(ddata < end) {
        unit = elfParseCompUnit(ddata, abbrevdata);
!       unit->offset = ddata-debugdata;
        elfParseLineInfo(unit, data);
        if(last == NULL)
--- 2763,2767 ----
      while(ddata < end) {
        unit = elfParseCompUnit(ddata, abbrevdata);
!       unit->offset = (u32)(ddata-debugdata);
        elfParseLineInfo(unit, data);
        if(last == NULL)