vba-commit

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

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

Modified Files:
	AboutDialog.cpp Joypad.cpp MainWndFile.cpp RomInfo.cpp VBA.cpp 
	resource.h skin.cpp 
Log Message:
Pokemonhacker:
Improved/corrected the GG and GS cheats handling.
Added support for the GS hardware rom bank switching.
Corrected a crash in loading GB savestates while in GBC mode.

Spacy:
minor

Index: VBA.cpp
===================================================================
RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/VBA.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** VBA.cpp	27 May 2006 14:47:33 -0000	1.15
--- VBA.cpp	6 Jun 2006 14:33:43 -0000	1.16
***************
*** 1338,1344 ****
      ifbType = 0;
  
!   flashSize = winFlashSize = regQueryDwordValue("flashSize", 0x10000);
    if(winFlashSize != 0x10000 && winFlashSize != 0x20000)
      winFlashSize = 0x10000;
  
    agbPrintEnable(regQueryDwordValue("agbPrint", 0) ? true : false);
--- 1338,1345 ----
      ifbType = 0;
  
!   winFlashSize = regQueryDwordValue("flashSize", 0x10000);
    if(winFlashSize != 0x10000 && winFlashSize != 0x20000)
      winFlashSize = 0x10000;
+   flashSize = winFlashSize;
  
    agbPrintEnable(regQueryDwordValue("agbPrint", 0) ? true : false);

Index: MainWndFile.cpp
===================================================================
RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/MainWndFile.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** MainWndFile.cpp	27 May 2006 14:47:33 -0000	1.14
--- MainWndFile.cpp	6 Jun 2006 14:33:43 -0000	1.15
***************
*** 738,742 ****
    CFileStatus status;
    CString str;
!   __time64_t time = (__time64_t)-1;
    int found = 0;
      
--- 738,742 ----
    CFileStatus status;
    CString str;
!   time_t time = (time_t)-1;
    int found = 0;
      
***************
*** 824,828 ****
    CFileStatus status;
    CString str;
!   __time64_t time = 0;
    int found = -1;
      
--- 824,828 ----
    CFileStatus status;
    CString str;
!   time_t time = 0;
    int found = -1;
      
***************
*** 831,835 ****
  
      if(emulating && CFile::GetStatus(name, status)) {
!       if((unsigned long)status.m_mtime.GetTime() > time) {
          time = status.m_mtime.GetTime();
          found = i;
--- 831,835 ----
  
      if(emulating && CFile::GetStatus(name, status)) {
! if(status.m_mtime.GetTime() < time) {
          time = status.m_mtime.GetTime();
          found = i;

Index: resource.h
===================================================================
RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/resource.h,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** resource.h	27 May 2006 14:47:33 -0000	1.43
--- resource.h	6 Jun 2006 14:33:43 -0000	1.44
***************
*** 45,48 ****
--- 45,50 ----
  #define IDS_CBA_CODE_WARNING            40
  #define IDS_OUT_OF_MEMORY               41
+ #define IDS_WRONG_GAMESHARK_CODE        42
+ #define IDS_UNSUPPORTED_GAMESHARK_CODE  43
  #define IDI_ICON                        101
  #define IDD_REGISTERS                   102

Index: Joypad.cpp
===================================================================
RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/Joypad.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Joypad.cpp	27 May 2006 14:47:33 -0000	1.6
--- Joypad.cpp	6 Jun 2006 14:33:43 -0000	1.7
***************
*** 57,61 ****
  #ifdef _WIN64
  	SetWindowLongPtr( GetSafeHwnd(), GWL_USERDATA, ((wParam<<8)|lParam) );
! #elif defined _WIN32
  	SetWindowLongPtr( GetSafeHwnd(), GWL_USERDATA, PtrToLong((wParam<<8)|lParam) );
  #endif
--- 57,61 ----
  #ifdef _WIN64
  	SetWindowLongPtr( GetSafeHwnd(), GWL_USERDATA, ((wParam<<8)|lParam) );
! #else
  	SetWindowLongPtr( GetSafeHwnd(), GWL_USERDATA, PtrToLong((wParam<<8)|lParam) );
  #endif

Index: AboutDialog.cpp
===================================================================
RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/AboutDialog.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** AboutDialog.cpp	26 May 2006 14:37:41 -0000	1.4
--- AboutDialog.cpp	6 Jun 2006 14:33:43 -0000	1.5
***************
*** 20,26 ****
  //
  
  #include "AboutDialog.h"
  #include "../AutoBuild.h"
- #include "resource.h"
  
  #ifdef _DEBUG
--- 20,26 ----
  //
  
+ #include "stdafx.h"
  #include "AboutDialog.h"
  #include "../AutoBuild.h"
  
  #ifdef _DEBUG

Index: RomInfo.cpp
===================================================================
RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/RomInfo.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** RomInfo.cpp	27 May 2006 14:47:33 -0000	1.6
--- RomInfo.cpp	6 Jun 2006 14:33:43 -0000	1.7
***************
*** 402,405 ****
--- 402,411 ----
      type = "ROM+MBC7+BATT";
      break;
+   case 0x55:
+     type = "GameGenie";
+     break;
+   case 0x56:
+     type = "GameShark V3.0";
+     break;
    case 0xfc:
      type = "ROM+POCKET CAMERA";

Index: skin.cpp
===================================================================
RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/skin.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** skin.cpp	27 May 2006 14:47:33 -0000	1.7
--- skin.cpp	6 Jun 2006 14:33:43 -0000	1.8
***************
*** 153,157 ****
  #ifdef _WIN64
    SetWindowLongPtr(m_hWnd, GWL_STYLE, dwStyle);
! #elif defined _WIN32
    SetWindowLongPtr(m_hWnd, GWL_STYLE, (LONG)dwStyle);
  #endif
--- 153,157 ----
  #ifdef _WIN64
    SetWindowLongPtr(m_hWnd, GWL_STYLE, dwStyle);
! #else
    SetWindowLongPtr(m_hWnd, GWL_STYLE, (LONG)dwStyle);
  #endif
***************
*** 175,179 ****
  #ifdef _WIN64
    m_OldWndProc = (WNDPROC)SetWindowLongPtr(m_hWnd, GWL_WNDPROC, (LONG_PTR)SkinWndProc);
! #elif defined _WIN32
    m_OldWndProc = (WNDPROC)LongToPtr(SetWindowLongPtr(m_hWnd, GWL_WNDPROC, PtrToLong(SkinWndProc)));
  #endif
--- 175,179 ----
  #ifdef _WIN64
    m_OldWndProc = (WNDPROC)SetWindowLongPtr(m_hWnd, GWL_WNDPROC, (LONG_PTR)SkinWndProc);
! #else
    m_OldWndProc = (WNDPROC)LongToPtr(SetWindowLongPtr(m_hWnd, GWL_WNDPROC, PtrToLong(SkinWndProc)));
  #endif
***************
*** 225,229 ****
  #ifdef _WIN64
    OurWnd = (WNDPROC)SetWindowLongPtr(m_hWnd, GWL_WNDPROC, (LONG_PTR)m_OldWndProc);
! #elif defined _WIN32
    OurWnd = (WNDPROC)LongToPtr(SetWindowLongPtr(m_hWnd, GWL_WNDPROC, PtrToLong(m_OldWndProc)));
  #endif
--- 225,229 ----
  #ifdef _WIN64
    OurWnd = (WNDPROC)SetWindowLongPtr(m_hWnd, GWL_WNDPROC, (LONG_PTR)m_OldWndProc);
! #else
    OurWnd = (WNDPROC)LongToPtr(SetWindowLongPtr(m_hWnd, GWL_WNDPROC, PtrToLong(m_OldWndProc)));
  #endif
***************
*** 238,242 ****
  #ifdef _WIN64
    SetWindowLongPtr(m_hWnd, GWL_STYLE, m_dOldStyle);
! #elif defined _WIN32
    SetWindowLongPtr(m_hWnd, GWL_STYLE, (LONG)m_dOldStyle);
  #endif
--- 238,242 ----
  #ifdef _WIN64
    SetWindowLongPtr(m_hWnd, GWL_STYLE, m_dOldStyle);
! #else
    SetWindowLongPtr(m_hWnd, GWL_STYLE, (LONG)m_dOldStyle);
  #endif