Menu
▾
▴
vba-commit — CVS commits for VBA
You can subscribe to this list here.
| 2004 |
Jan
(17) |
Feb
(38) |
Mar
(24) |
Apr
(18) |
May
(75) |
Jun
(2) |
Jul
|
Aug
|
Sep
(21) |
Oct
(3) |
Nov
(19) |
Dec
(5) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(15) |
Jul
(2) |
Aug
|
Sep
(5) |
Oct
|
Nov
|
Dec
|
| 2006 |
Jan
(8) |
Feb
|
Mar
|
Apr
(6) |
May
(73) |
Jun
(57) |
Jul
(12) |
Aug
(68) |
Sep
(6) |
Oct
|
Nov
|
Dec
|
| S | M | T | W | T | F | S |
|---|---|---|---|---|---|---|
|
|
1
|
2
|
3
|
4
|
5
|
6
|
|
7
|
8
(1) |
9
(2) |
10
|
11
|
12
(41) |
13
(17) |
|
14
|
15
|
16
|
17
|
18
|
19
|
20
|
|
21
|
22
|
23
|
24
|
25
|
26
(4) |
27
(8) |
|
28
|
29
|
30
|
31
|
|
|
|
|
From: Spacy <sp...@us...> - 2006-05-27 15:01:02
|
Update of /cvsroot/vba/VisualBoyAdvance/win32 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv11589/win32 Modified Files: vba_vs2005.suo Log Message: Index: vba_vs2005.suo =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/win32/vba_vs2005.suo,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 Binary files /tmp/cvsSfIBF3 and /tmp/cvswk8gWL differ |
|
From: Spacy <sp...@us...> - 2006-05-27 14:56:12
|
Update of /cvsroot/vba/VisualBoyAdvance/win32 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10206/win32 Modified Files: .cvsignore Log Message: Index: .cvsignore =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/win32/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** .cvsignore 27 May 2006 14:10:22 -0000 1.3 --- .cvsignore 27 May 2006 14:56:06 -0000 1.4 *************** *** 7,9 **** MFC_Release MFC_Debug ! vba_vs2005.vcproj.A1.Spacy.user \ No newline at end of file --- 7,10 ---- MFC_Release MFC_Debug ! vba_vs2005.vcproj.A1.Spacy.user ! SDL_Release \ No newline at end of file |
Update of /cvsroot/vba/VisualBoyAdvance/src/win32 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6380/src/win32 Modified Files: AboutDialog.h AccelEditor.cpp BitmapControl.h ColorButton.h ColorControl.h DirectInput.cpp Directories.cpp FileDlg.cpp GBACheats.cpp GBACheats.h GBColorDlg.cpp GBColorDlg.h GBDisassemble.h GBMapView.cpp GBMapView.h GBTileView.cpp Joypad.cpp Joypad.h MainWnd.cpp MainWndFile.cpp MainWndOptions.cpp MapView.h MemoryViewer.cpp MemoryViewer.h MemoryViewerAddressSize.h ModeConfirm.h Reg.cpp RomInfo.cpp VBA.cpp VBA.h ZoomControl.h resource.h skin.cpp skin.h skinButton.cpp stdafx.cpp stdafx.h vba.rc Log Message: vs2005 compatibility, minor changes/fixes Index: GBACheats.h =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/GBACheats.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** GBACheats.h 13 May 2004 15:06:49 -0000 1.3 --- GBACheats.h 27 May 2006 14:47:33 -0000 1.4 *************** *** 21,25 **** #define AFX_GBACHEATS_H__FC31D47D_52C8_42B2_95C7_7C3FD09316A4__INCLUDED_ ! #include "..\System.h" // Added by ClassView #if _MSC_VER > 1000 #pragma once --- 21,25 ---- #define AFX_GBACHEATS_H__FC31D47D_52C8_42B2_95C7_7C3FD09316A4__INCLUDED_ ! #include "../System.h" // Added by ClassView #if _MSC_VER > 1000 #pragma once Index: ZoomControl.h =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/ZoomControl.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ZoomControl.h 13 May 2004 15:06:55 -0000 1.2 --- ZoomControl.h 27 May 2006 14:47:33 -0000 1.3 *************** *** 21,25 **** #define AFX_ZOOMCONTROL_H__BC193230_D2D6_4240_93AE_28C2EF2C641A__INCLUDED_ ! #include "..\System.h" // Added by ClassView #if _MSC_VER > 1000 #pragma once --- 21,25 ---- #define AFX_ZOOMCONTROL_H__BC193230_D2D6_4240_93AE_28C2EF2C641A__INCLUDED_ ! #include "../System.h" // Added by ClassView #if _MSC_VER > 1000 #pragma once Index: MapView.h =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/MapView.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** MapView.h 13 May 2004 15:06:54 -0000 1.2 --- MapView.h 27 May 2006 14:47:33 -0000 1.3 *************** *** 32,36 **** #include "ResizeDlg.h" #include "IUpdate.h" ! #include "..\System.h" // Added by ClassView ///////////////////////////////////////////////////////////////////////////// --- 32,36 ---- #include "ResizeDlg.h" #include "IUpdate.h" ! #include "../System.h" // Added by ClassView ///////////////////////////////////////////////////////////////////////////// Index: MemoryViewer.h =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/MemoryViewer.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** MemoryViewer.h 13 May 2004 15:06:55 -0000 1.3 --- MemoryViewer.h 27 May 2006 14:47:33 -0000 1.4 *************** *** 21,25 **** #define AFX_MEMORYVIEWER_H__52C50474_5399_4D0B_A3E4_4C52C4E0EAA0__INCLUDED_ ! #include "..\System.h" // Added by ClassView #if _MSC_VER > 1000 #pragma once --- 21,25 ---- #define AFX_MEMORYVIEWER_H__52C50474_5399_4D0B_A3E4_4C52C4E0EAA0__INCLUDED_ ! #include "../System.h" // Added by ClassView #if _MSC_VER > 1000 #pragma once Index: Reg.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/Reg.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Reg.cpp 13 May 2004 15:06:55 -0000 1.7 --- Reg.cpp 27 May 2006 14:47:33 -0000 1.8 *************** *** 21,25 **** static char buffer[2048]; static HKEY vbKey = NULL; ! static CString regVbaPath; #define VBA_PREF "preferences" --- 21,25 ---- static char buffer[2048]; static HKEY vbKey = NULL; ! static CString *regVbaPath = NULL; #define VBA_PREF "preferences" *************** *** 39,43 **** &vbKey, &disp); ! regVbaPath.Format("%s\\vba.ini", path); } --- 39,48 ---- &vbKey, &disp); ! if( regVbaPath != NULL ) { ! delete regVbaPath; ! regVbaPath = NULL; ! } ! regVbaPath = new CString(); ! regVbaPath->Format("%s\\vba.ini", path); } *************** *** 49,53 **** const char *regGetINIPath() { ! return regVbaPath; } --- 54,58 ---- const char *regGetINIPath() { ! return *regVbaPath; } *************** *** 76,80 **** (LPTSTR)buffer, 2048, ! regVbaPath); if(res) --- 81,85 ---- (LPTSTR)buffer, 2048, ! *regVbaPath); if(res) *************** *** 107,111 **** key, def, ! regVbaPath); } --- 112,116 ---- key, def, ! *regVbaPath); } *************** *** 135,139 **** k, -1, ! regVbaPath); if(size >= 0 && size < count) count = size; --- 140,144 ---- k, -1, ! *regVbaPath); if(size >= 0 && size < count) count = size; *************** *** 142,146 **** value, count, ! regVbaPath); } --- 147,151 ---- value, count, ! *regVbaPath); } *************** *** 153,162 **** REG_SZ, (const UCHAR *)value, ! strlen(value)+1); } else { WritePrivateProfileString(VBA_PREF, key, value, ! regVbaPath); } } --- 158,167 ---- REG_SZ, (const UCHAR *)value, ! lstrlen(value)+1); } else { WritePrivateProfileString(VBA_PREF, key, value, ! *regVbaPath); } } *************** *** 176,180 **** key, buffer, ! regVbaPath); } } --- 181,185 ---- key, buffer, ! *regVbaPath); } } *************** *** 197,201 **** k, buffer, ! regVbaPath); WritePrivateProfileStruct(VBA_PREF, --- 202,206 ---- k, buffer, ! *regVbaPath); WritePrivateProfileStruct(VBA_PREF, *************** *** 203,207 **** value, count, ! regVbaPath); } } --- 208,212 ---- value, count, ! *regVbaPath); } } *************** *** 216,220 **** key, NULL, ! regVbaPath); } } --- 221,225 ---- key, NULL, ! *regVbaPath); } } *************** *** 239,243 **** REG_SZ, (const UCHAR *)type, ! strlen(type)+1); RegCloseKey(key); return true; --- 244,248 ---- REG_SZ, (const UCHAR *)type, ! lstrlen(type)+1); RegCloseKey(key); return true; *************** *** 265,269 **** REG_SZ, (const UCHAR *)desc, ! strlen(desc)+1); HKEY key2; res = RegCreateKeyEx(key, --- 270,274 ---- REG_SZ, (const UCHAR *)desc, ! lstrlen(desc)+1); HKEY key2; res = RegCreateKeyEx(key, *************** *** 282,286 **** REG_SZ, (const UCHAR *)application, ! strlen(application)+1); RegCloseKey(key2); RegCloseKey(key); --- 287,291 ---- REG_SZ, (const UCHAR *)application, ! lstrlen(application)+1); RegCloseKey(key2); RegCloseKey(key); *************** *** 319,323 **** valueName, temp, ! regVbaPath); } break; --- 324,328 ---- valueName, temp, ! *regVbaPath); } break; *************** *** 326,330 **** valueName, buffer, ! regVbaPath); break; case REG_BINARY: --- 331,335 ---- valueName, buffer, ! *regVbaPath); break; case REG_BINARY: *************** *** 338,347 **** k, temp, ! regVbaPath); WritePrivateProfileStruct(section, valueName, buffer, size, ! regVbaPath); } break; --- 343,352 ---- k, temp, ! *regVbaPath); WritePrivateProfileStruct(section, valueName, buffer, size, ! *regVbaPath); } break; Index: stdafx.h =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/stdafx.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** stdafx.h 13 May 2004 15:06:55 -0000 1.3 --- stdafx.h 27 May 2006 14:47:33 -0000 1.4 *************** *** 34,37 **** --- 34,44 ---- //#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers + // Target for Windows 2000 + #define WINVER 0x0500 + #define _WIN32_WINNT 0x0500 + + #define STRICT + + #include <afxwin.h> #include <afxcmn.h> Index: stdafx.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/stdafx.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** stdafx.cpp 13 May 2004 15:06:55 -0000 1.2 --- stdafx.cpp 27 May 2006 14:47:33 -0000 1.3 *************** *** 17,26 **** // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ! // stdafx.cpp : source file that includes just the standard includes ! // DialogSizer.pch will be the pre-compiled header ! // stdafx.obj will contain the pre-compiled type information ! ! #include "stdafx.h" ! ! // TODO: reference any additional headers you need in STDAFX.H ! // and not in this file --- 17,19 ---- // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ! #include "stdafx.h" \ No newline at end of file Index: RomInfo.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/RomInfo.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** RomInfo.cpp 30 Apr 2006 14:33:25 -0000 1.5 --- RomInfo.cpp 27 May 2006 14:47:33 -0000 1.6 *************** *** 549,553 **** { CDialog::OnInitDialog(); ! char buffer[13]; --- 549,553 ---- { CDialog::OnInitDialog(); ! char buffer[13]; *************** *** 570,573 **** --- 570,576 ---- sprintf(buffer, "%02x", rom[0xb4]); + if( rom[0xb4] & 0x80 ) { + strcat(buffer, " (DACS)"); + } GetDlgItem(IDC_ROM_DEVICE_TYPE)->SetWindowText(buffer); Index: GBACheats.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/GBACheats.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** GBACheats.cpp 18 Dec 2004 23:11:08 -0000 1.11 --- GBACheats.cpp 27 May 2006 14:47:33 -0000 1.12 *************** *** 766,770 **** LVITEM item; for(int i = 0; i < count; i++) { ! memset(&item,0, sizeof(item)); item.mask = LVIF_PARAM|LVIF_STATE; item.stateMask = LVIS_SELECTED; --- 766,770 ---- LVITEM item; for(int i = 0; i < count; i++) { ! memset(&item, 0, sizeof(item)); item.mask = LVIF_PARAM|LVIF_STATE; item.stateMask = LVIS_SELECTED; *************** *** 773,779 **** if(item.state & LVIS_SELECTED) { if(cheatsList[item.lParam].enabled) ! cheatsDisable(item.lParam); else ! cheatsEnable(item.lParam); } } --- 773,779 ---- if(item.state & LVIS_SELECTED) { if(cheatsList[item.lParam].enabled) ! cheatsDisable((int)(item.lParam & 0xFFFFFFFF)); else ! cheatsEnable((int)(item.lParam & 0xFFFFFFFF)); } } *************** *** 797,801 **** if(m_list.GetItem(&item)) { if(item.state & LVIS_SELECTED) { ! cheatsDelete(item.lParam, restoreValues); } } --- 797,801 ---- if(m_list.GetItem(&item)) { if(item.state & LVIS_SELECTED) { ! cheatsDelete((int)(item.lParam & 0xFFFFFFFF), restoreValues); } } *************** *** 839,845 **** (((l->uNewState & LVIS_STATEIMAGEMASK)>>12))) { if(m_list.GetCheck(l->iItem)) ! cheatsEnable(l->lParam); else ! cheatsDisable(l->lParam); refresh(); } --- 839,845 ---- (((l->uNewState & LVIS_STATEIMAGEMASK)>>12))) { if(m_list.GetCheck(l->iItem)) ! cheatsEnable((int)(l->lParam & 0xFFFFFFFF)); else ! cheatsDisable((int)(l->lParam & 0xFFFFFFFF)); refresh(); } Index: skin.h =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/skin.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** skin.h 29 Feb 2004 13:04:54 -0000 1.4 --- skin.h 27 May 2006 14:47:33 -0000 1.5 *************** *** 68,72 **** RECT m_rect; ! DWORD m_dOldStyle; RECT m_oldRect; int m_nButtons; --- 68,72 ---- RECT m_rect; ! LONG_PTR m_dOldStyle; RECT m_oldRect; int m_nButtons; Index: GBColorDlg.h =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/GBColorDlg.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** GBColorDlg.h 13 May 2004 15:06:49 -0000 1.2 --- GBColorDlg.h 27 May 2006 14:47:33 -0000 1.3 *************** *** 22,26 **** #include "ColorButton.h" // Added by ClassView ! #include "..\System.h" // Added by ClassView #if _MSC_VER > 1000 #pragma once --- 22,26 ---- #include "ColorButton.h" // Added by ClassView ! #include "../System.h" // Added by ClassView #if _MSC_VER > 1000 #pragma once Index: ModeConfirm.h =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/ModeConfirm.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ModeConfirm.h 13 May 2004 15:06:55 -0000 1.2 --- ModeConfirm.h 27 May 2006 14:47:33 -0000 1.3 *************** *** 35,39 **** public: int count; ! UINT timer; ModeConfirm(CWnd* pParent); // standard constructor --- 35,39 ---- public: int count; ! UINT_PTR timer; ModeConfirm(CWnd* pParent); // standard constructor Index: Directories.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/Directories.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Directories.cpp 26 May 2006 14:38:47 -0000 1.3 --- Directories.cpp 27 May 2006 14:47:33 -0000 1.4 *************** *** 248,250 **** } return res; ! } \ No newline at end of file --- 248,250 ---- } return res; ! } Index: MainWnd.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/MainWnd.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** MainWnd.cpp 30 Apr 2006 14:32:39 -0000 1.18 --- MainWnd.cpp 27 May 2006 14:47:33 -0000 1.19 *************** *** 484,487 **** --- 484,490 ---- if(!gbLoadRom(theApp.szFile)) return false; + + gbGetHardwareType(); + // used for the handling of the gb Boot Rom if (gbHardware & 5) *************** *** 496,506 **** strcat(tempName, "\\DMG_ROM.bin"); - skipBios = theApp.skipBiosFile ? true : false; gbCPUInit(tempName, theApp.useBiosFile ? true : false); } ! gbReset(); theApp.emulator = GBSystem; gbBorderOn = theApp.winGbBorderOn; --- 499,509 ---- strcat(tempName, "\\DMG_ROM.bin"); skipBios = theApp.skipBiosFile ? true : false; gbCPUInit(tempName, theApp.useBiosFile ? true : false); } ! + gbReset(); theApp.emulator = GBSystem; gbBorderOn = theApp.winGbBorderOn; *************** *** 953,957 **** if(!GetMenuItemInfo(theApp.menu, i, MF_BYPOSITION, &info)) { } ! if(!AppendMenu(theApp.popup, MF_POPUP|MF_STRING, (UINT)info.hSubMenu, buffer)) { } } --- 956,960 ---- if(!GetMenuItemInfo(theApp.menu, i, MF_BYPOSITION, &info)) { } ! if(!AppendMenu(theApp.popup, MF_POPUP|MF_STRING, (UINT_PTR)info.hSubMenu, buffer)) { } } *************** *** 967,971 **** if(!GetMenuItemInfoW(theApp.menu, i, MF_BYPOSITION, &info)) { } ! if(!AppendMenuW(theApp.popup, MF_POPUP|MF_STRING, (UINT)info.hSubMenu, buffer)) { } } --- 970,974 ---- if(!GetMenuItemInfoW(theApp.menu, i, MF_BYPOSITION, &info)) { } ! if(!AppendMenuW(theApp.popup, MF_POPUP|MF_STRING, (UINT_PTR)info.hSubMenu, buffer)) { } } Index: GBMapView.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/GBMapView.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** GBMapView.cpp 13 May 2004 15:06:49 -0000 1.6 --- GBMapView.cpp 27 May 2006 14:47:33 -0000 1.7 *************** *** 500,505 **** mapViewZoom.setColors(colors); ! int x = wParam & 0xffff; ! int y = (wParam >> 16); CString buffer; --- 500,505 ---- mapViewZoom.setColors(colors); ! int x = (int)(wParam & 0xffff); ! int y = wParam >> 16; CString buffer; Index: AccelEditor.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/AccelEditor.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** AccelEditor.cpp 13 May 2006 16:32:16 -0000 1.4 --- AccelEditor.cpp 27 May 2006 14:47:33 -0000 1.5 *************** *** 157,161 **** index = m_currents.AddString(szBuffer); // and a pointer to the accel object. ! m_currents.SetItemData(index, (DWORD)pAccel); } } --- 157,161 ---- index = m_currents.AddString(szBuffer); // and a pointer to the accel object. ! m_currents.SetItemData(index, (DWORD_PTR)pAccel); } } *************** *** 236,240 **** index = m_currents.AddString(szBuffer); ! m_currents.SetItemData(index, (DWORD)pAccel); // Reset the key editor. --- 236,240 ---- index = m_currents.AddString(szBuffer); ! m_currents.SetItemData(index, (DWORD_PTR)pAccel); // Reset the key editor. Index: Joypad.h =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/Joypad.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Joypad.h 13 May 2004 15:06:50 -0000 1.2 --- Joypad.h 27 May 2006 14:47:33 -0000 1.3 *************** *** 42,50 **** public: - // Overrides - // ClassWizard generated virtual function overrides - //{{AFX_VIRTUAL(JoypadEditControl) - //}}AFX_VIRTUAL - // Implementation public: --- 42,45 ---- *************** *** 53,62 **** virtual ~JoypadEditControl(); - // Generated message map functions - protected: - //{{AFX_MSG(JoypadEditControl) - afx_msg void OnChar(UINT nChar, UINT nRepCnt, UINT nFlags); - //}}AFX_MSG - DECLARE_MESSAGE_MAP() }; --- 48,51 ---- *************** *** 103,107 **** // Implementation protected: ! UINT timerId; int which; --- 92,96 ---- // Implementation protected: ! UINT_PTR timerId; int which; *************** *** 110,114 **** afx_msg void OnCancel(); afx_msg void OnOk(); - afx_msg void OnChar(UINT nChar, UINT nRepCnt, UINT nFlags); afx_msg void OnDestroy(); afx_msg void OnTimer(UINT nIDEvent); --- 99,102 ---- *************** *** 150,165 **** // Generated message map functions - //{{AFX_MSG(MotionConfig) afx_msg void OnCancel(); afx_msg void OnOk(); - afx_msg void OnChar(UINT nChar, UINT nRepCnt, UINT nFlags); afx_msg void OnDestroy(); virtual BOOL OnInitDialog(); afx_msg void OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags); afx_msg void OnTimer(UINT nIDEvent); - //}}AFX_MSG DECLARE_MESSAGE_MAP() private: ! UINT timerId; }; //{{AFX_INSERT_LOCATION}} --- 138,150 ---- // Generated message map functions afx_msg void OnCancel(); afx_msg void OnOk(); afx_msg void OnDestroy(); virtual BOOL OnInitDialog(); afx_msg void OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags); afx_msg void OnTimer(UINT nIDEvent); DECLARE_MESSAGE_MAP() private: ! UINT_PTR timerId; }; //{{AFX_INSERT_LOCATION}} Index: GBMapView.h =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/GBMapView.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** GBMapView.h 13 May 2004 15:06:49 -0000 1.2 --- GBMapView.h 27 May 2006 14:47:33 -0000 1.3 *************** *** 32,36 **** #include "ResizeDlg.h" #include "IUpdate.h" ! #include "..\System.h" // Added by ClassView ///////////////////////////////////////////////////////////////////////////// --- 32,36 ---- #include "ResizeDlg.h" #include "IUpdate.h" ! #include "../System.h" // Added by ClassView ///////////////////////////////////////////////////////////////////////////// Index: AboutDialog.h =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/AboutDialog.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** AboutDialog.h 26 May 2006 14:37:41 -0000 1.3 --- AboutDialog.h 27 May 2006 14:47:33 -0000 1.4 *************** *** 61,65 **** //{{AFX_MSG(AboutDialog) virtual BOOL OnInitDialog(); - // virtual void OnOK(); //}}AFX_MSG --- 61,64 ---- Index: GBDisassemble.h =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/GBDisassemble.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** GBDisassemble.h 13 May 2004 15:06:49 -0000 1.2 --- GBDisassemble.h 27 May 2006 14:47:33 -0000 1.3 *************** *** 21,25 **** #define AFX_GBDISASSEMBLE_H__3EFD5B47_6DBF_4F63_8F91_A9511EC590EB__INCLUDED_ ! #include "..\System.h" // Added by ClassView #if _MSC_VER > 1000 #pragma once --- 21,25 ---- #define AFX_GBDISASSEMBLE_H__3EFD5B47_6DBF_4F63_8F91_A9511EC590EB__INCLUDED_ ! #include "../System.h" // Added by ClassView #if _MSC_VER > 1000 #pragma once Index: FileDlg.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/FileDlg.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** FileDlg.cpp 25 Jun 2005 06:23:31 -0000 1.6 --- FileDlg.cpp 27 May 2006 14:47:33 -0000 1.7 *************** *** 160,164 **** ASSERT(typeControl != NULL); ! int sel = ::SendMessage(typeControl, CB_GETCURSEL, 0, 0); ASSERT(sel != -1); --- 160,164 ---- ASSERT(typeControl != NULL); ! LRESULT sel = ::SendMessage(typeControl, CB_GETCURSEL, 0, 0); ASSERT(sel != -1); Index: MemoryViewerAddressSize.h =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/MemoryViewerAddressSize.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** MemoryViewerAddressSize.h 13 May 2004 15:06:55 -0000 1.2 --- MemoryViewerAddressSize.h 27 May 2006 14:47:33 -0000 1.3 *************** *** 21,25 **** #define AFX_MEMORYVIEWERADDRESSSIZE_H__04605262_2B1D_4EED_A467_B6C56AC2CACD__INCLUDED_ ! #include "..\System.h" // Added by ClassView #if _MSC_VER > 1000 #pragma once --- 21,25 ---- #define AFX_MEMORYVIEWERADDRESSSIZE_H__04605262_2B1D_4EED_A467_B6C56AC2CACD__INCLUDED_ ! #include "../System.h" // Added by ClassView #if _MSC_VER > 1000 #pragma once Index: vba.rc =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/vba.rc,v retrieving revision 1.54 retrieving revision 1.55 diff -C2 -d -r1.54 -r1.55 *** vba.rc 26 May 2006 14:37:41 -0000 1.54 --- vba.rc 27 May 2006 14:47:33 -0000 1.55 *************** *** 14,71 **** ///////////////////////////////////////////////////////////////////////////// - // German (Germany) resources - - #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEU) - #ifdef _WIN32 - LANGUAGE LANG_GERMAN, SUBLANG_GERMAN - #pragma code_page(1252) - #endif //_WIN32 - - ///////////////////////////////////////////////////////////////////////////// - // - // Version - // - - VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,8,0,600 - PRODUCTVERSION 1,8,0,600 - FILEFLAGSMASK 0x3fL - #ifdef _DEBUG - FILEFLAGS 0x29L - #else - FILEFLAGS 0x28L - #endif - FILEOS 0x40004L - FILETYPE 0x1L - FILESUBTYPE 0x0L - BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "Comments", "VisualBoyAdvance comes with NO WARRANTY. Use it at your own risk." - VALUE "CompanyName", "http://vba.ngemu.com/" - VALUE "FileDescription", "VisualBoyAdvance emulator" - VALUE "FileVersion", "1, 8, 0, 600" - VALUE "InternalName", "VisualBoyAdvance" - VALUE "LegalCopyright", "Copyright © 2006 VBA development team" - VALUE "OriginalFilename", "VisualBoyAdvance.exe" - VALUE "PrivateBuild", "0" - VALUE "ProductName", "VisualBoyAdvance emulator" - VALUE "ProductVersion", "1, 8, 0, 600" - VALUE "SpecialBuild", "0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END - END - - #endif // German (Germany) resources - ///////////////////////////////////////////////////////////////////////////// - - - ///////////////////////////////////////////////////////////////////////////// // English (U.S.) resources --- 14,17 ---- *************** *** 131,135 **** FONT 8, "MS Sans Serif", 0, 0, 0x0 BEGIN ! ICON "IDI_ICON",IDC_STATIC,6,6,21,20 CTEXT "VisualBoyAdvance Emulator",IDC_STATIC,30,6,120,8 CTEXT "Copyright © 2006 VBA development team",IDC_STATIC,6,36,144,8 --- 77,81 ---- FONT 8, "MS Sans Serif", 0, 0, 0x0 BEGIN ! ICON 101,IDC_STATIC,6,6,20,20 CTEXT "VisualBoyAdvance Emulator",IDC_STATIC,30,6,120,8 CTEXT "Copyright © 2006 VBA development team",IDC_STATIC,6,36,144,8 Index: resource.h =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/resource.h,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** resource.h 26 May 2006 14:37:41 -0000 1.42 --- resource.h 27 May 2006 14:47:33 -0000 1.43 *************** *** 45,48 **** --- 45,49 ---- #define IDS_CBA_CODE_WARNING 40 #define IDS_OUT_OF_MEMORY 41 + #define IDI_ICON 101 #define IDD_REGISTERS 102 #define IDD_DEBUG 103 *************** *** 757,761 **** #define _APS_NEXT_COMMAND_VALUE 40278 #define _APS_NEXT_CONTROL_VALUE 1256 ! #define _APS_NEXT_SYMED_VALUE 104 #endif #endif --- 758,762 ---- #define _APS_NEXT_COMMAND_VALUE 40278 #define _APS_NEXT_CONTROL_VALUE 1256 ! #define _APS_NEXT_SYMED_VALUE 105 #endif #endif Index: ColorButton.h =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/ColorButton.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ColorButton.h 13 May 2004 15:06:49 -0000 1.2 --- ColorButton.h 27 May 2006 14:47:33 -0000 1.3 *************** *** 21,25 **** #define AFX_COLORBUTTON_H__DF02109B_B91C_49FD_954F_74A48B83C314__INCLUDED_ ! #include "..\System.h" // Added by ClassView #if _MSC_VER > 1000 #pragma once --- 21,25 ---- #define AFX_COLORBUTTON_H__DF02109B_B91C_49FD_954F_74A48B83C314__INCLUDED_ ! #include "../System.h" // Added by ClassView #if _MSC_VER > 1000 #pragma once Index: BitmapControl.h =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/BitmapControl.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** BitmapControl.h 13 May 2004 15:06:49 -0000 1.2 --- BitmapControl.h 27 May 2006 14:47:33 -0000 1.3 *************** *** 21,25 **** #define AFX_BITMAPCONTROL_H__2434AADB_B6A5_4E43_AA16_7B65B6F7FA26__INCLUDED_ ! #include "..\System.h" // Added by ClassView #if _MSC_VER > 1000 #pragma once --- 21,25 ---- #define AFX_BITMAPCONTROL_H__2434AADB_B6A5_4E43_AA16_7B65B6F7FA26__INCLUDED_ ! #include "../System.h" // Added by ClassView #if _MSC_VER > 1000 #pragma once Index: VBA.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/VBA.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** VBA.cpp 13 May 2006 16:32:16 -0000 1.14 --- VBA.cpp 27 May 2006 14:47:33 -0000 1.15 *************** *** 21,25 **** #include "stdafx.h" #include <mmsystem.h> - #include <windows.h> #include "AVIWrite.h" --- 21,24 ---- *************** *** 165,171 **** --- 164,172 ---- filterWidth = 0; filterHeight = 0; + fsAdapter = 0; fsWidth = 0; fsHeight = 0; fsColorDepth = 0; + fsFrequency = 0; fsForceChange = false; surfaceSizeX = 0; *************** *** 225,228 **** --- 226,230 ---- ddrawUseVideoMemory = false; d3dFilter = 0; + d3dKeepAspectRatio = true; glFilter = 0; glType = 0; *************** *** 290,293 **** --- 292,304 ---- InterframeCleanup(); + char winBuffer[2048]; + + GetModuleFileName(NULL, winBuffer, 2048); + char *p = strrchr(winBuffer, '\\'); + if(p) + *p = 0; + + regInit(winBuffer); + saveSettings(); *************** *** 509,512 **** --- 520,524 ---- } + void VBA::adjustDestRect() { *************** *** 575,578 **** --- 587,591 ---- } + void VBA::updateIFB() { *************** *** 1207,1213 **** --- 1220,1228 ---- pVideoDriverGUID = &videoDriverGUID; + fsAdapter = regQueryDwordValue("fsAdapter", 0); fsWidth = regQueryDwordValue("fsWidth", 0); fsHeight = regQueryDwordValue("fsHeight", 0); fsColorDepth = regQueryDwordValue("fsColorDepth", 0); + fsFrequency = regQueryDwordValue("fsFrequency", 0); if(videoOption == VIDEO_OTHER) { *************** *** 1266,1269 **** --- 1281,1285 ---- if(d3dFilter < 0 || d3dFilter > 1) d3dFilter = 0; + d3dKeepAspectRatio = regQueryDwordValue("d3dKeepAspectRatio", true) ? true : false; glFilter = regQueryDwordValue("glFilter", 0); if(glFilter < 0 || glFilter > 1) *************** *** 1322,1326 **** ifbType = 0; ! winFlashSize = regQueryDwordValue("flashSize", 0x10000); if(winFlashSize != 0x10000 && winFlashSize != 0x20000) winFlashSize = 0x10000; --- 1338,1342 ---- ifbType = 0; ! flashSize = winFlashSize = regQueryDwordValue("flashSize", 0x10000); if(winFlashSize != 0x10000 && winFlashSize != 0x20000) winFlashSize = 0x10000; *************** *** 1682,1705 **** bool VBA::updateRenderMethod(bool force) { ! bool res = updateRenderMethod0(force); ! ! while(!res && renderMethod > 0) { ! if(renderMethod == OPENGL) ! renderMethod = DIRECT_3D; ! else if(renderMethod == DIRECT_3D) ! renderMethod = DIRECT_DRAW; ! else if(renderMethod == DIRECT_DRAW) { ! if(videoOption > VIDEO_4X) { ! videoOption = VIDEO_2X; ! force = true; ! } else ! renderMethod = GDI; ! } ! ! res = updateRenderMethod(force); ! } ! return res; } bool VBA::updateRenderMethod0(bool force) { --- 1698,1731 ---- bool VBA::updateRenderMethod(bool force) { ! bool res = updateRenderMethod0(force); ! ! while(!res && renderMethod > 0) { ! if( fsAdapter > 0 ) { ! fsAdapter = 0; ! } else { ! if( videoOption > VIDEO_4X ) { ! videoOption = VIDEO_1X; ! force = true; ! } else { ! if(renderMethod == OPENGL) { ! renderMethod = DIRECT_3D; ! } else { ! if(renderMethod == DIRECT_3D) { ! renderMethod = DIRECT_DRAW; ! } else { ! if(renderMethod == DIRECT_DRAW) { ! renderMethod = GDI; ! } ! } ! } ! } ! } ! res = updateRenderMethod(force); ! } ! ! return res; } + bool VBA::updateRenderMethod0(bool force) { *************** *** 1733,1747 **** switch(renderMethod) { case GDI: ! display = newGDIDisplay(); ! break; case DIRECT_DRAW: ! display = newDirectDrawDisplay(); ! break; case DIRECT_3D: ! display = newDirect3DDisplay(); ! break; ! case OPENGL: ! display = newOpenGLDisplay(); ! break; } --- 1759,1775 ---- switch(renderMethod) { case GDI: ! display = newGDIDisplay(); ! break; case DIRECT_DRAW: ! pVideoDriverGUID = NULL; ! ZeroMemory( &videoDriverGUID, sizeof( GUID ) ); ! display = newDirectDrawDisplay(); ! break; case DIRECT_3D: ! display = newDirect3DDisplay(); ! break; ! case OPENGL: ! display = newOpenGLDisplay(); ! break; } *************** *** 1774,1785 **** } void VBA::winCheckFullscreen() { ! if(videoOption > VIDEO_4X && tripleBuffering) { ! if(display) ! display->checkFullScreen(); ! } } void VBA::shutdownDisplay() { --- 1802,1816 ---- } + void VBA::winCheckFullscreen() { ! if(videoOption > VIDEO_4X && tripleBuffering) { ! if(display) { ! display->checkFullScreen(); ! } ! } } + void VBA::shutdownDisplay() { *************** *** 2099,2105 **** --- 2130,2138 ---- + regSetDwordValue("fsAdapter", fsAdapter); regSetDwordValue("fsWidth", fsWidth); regSetDwordValue("fsHeight", fsHeight); regSetDwordValue("fsColorDepth", fsColorDepth); + regSetDwordValue("fsFrequency", fsFrequency); regSetDwordValue("renderMethod", renderMethod); *************** *** 2134,2137 **** --- 2167,2171 ---- regSetDwordValue("d3dFilter", d3dFilter); + regSetDwordValue("d3dKeepAspectRatio", d3dKeepAspectRatio); regSetDwordValue("glFilter", glFilter); regSetDwordValue("glType", glType); Index: skinButton.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/skinButton.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** skinButton.cpp 13 May 2004 15:06:55 -0000 1.7 --- skinButton.cpp 27 May 2006 14:47:33 -0000 1.8 *************** *** 98,102 **** HDC hDC = ::BeginPaint(m_hWnd, &ps); HDC memDC = ::CreateCompatibleDC(hDC); ! UINT state = ::SendMessage(m_hWnd, BM_GETSTATE, 0, 0); HBITMAP oldBitmap; if(state & BST_PUSHED) --- 98,102 ---- HDC hDC = ::BeginPaint(m_hWnd, &ps); HDC memDC = ::CreateCompatibleDC(hDC); ! LRESULT state = ::SendMessage(m_hWnd, BM_GETSTATE, 0, 0); HBITMAP oldBitmap; if(state & BST_PUSHED) Index: DirectInput.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/DirectInput.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** DirectInput.cpp 13 May 2006 16:32:16 -0000 1.5 --- DirectInput.cpp 27 May 2006 14:47:33 -0000 1.6 *************** *** 40,44 **** class DirectInput : public Input { private: ! HINSTANCE dinputDLL; public: --- 40,44 ---- class DirectInput : public Input { private: ! HMODULE dinputDLL; public: *************** *** 723,731 **** if(dinputDLL) { ! #ifdef _AFXDLL ! AfxFreeLibrary( dinputDLL ); ! #else ! FreeLibrary( dinputDLL ); ! #endif dinputDLL = NULL; } --- 723,727 ---- if(dinputDLL) { ! FreeLibrary(dinputDLL); dinputDLL = NULL; } *************** *** 738,747 **** 0, "VBA.ini"); ! #ifdef _AFXDLL ! dinputDLL = AfxLoadLibrary("dinput.dll"); ! #else ! dinputDLL = LoadLibrary( _T("dinput.dll") ); ! #endif ! HRESULT (WINAPI *DInputCreate)(HINSTANCE,DWORD,LPDIRECTINPUT *,IUnknown *); if(dinputDLL != NULL) { --- 734,738 ---- 0, "VBA.ini"); ! dinputDLL = LoadLibrary("dinput.dll"); HRESULT (WINAPI *DInputCreate)(HINSTANCE,DWORD,LPDIRECTINPUT *,IUnknown *); if(dinputDLL != NULL) { *************** *** 754,758 **** } } else { ! directXMessage("DINPUT.DLL"); return false; } --- 745,749 ---- } } else { ! directXMessage("dinput.dll"); return false; } Index: MainWndFile.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/MainWndFile.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** MainWndFile.cpp 13 May 2006 16:32:16 -0000 1.13 --- MainWndFile.cpp 27 May 2006 14:47:33 -0000 1.14 *************** *** 690,694 **** fseek(f, 0x1e, SEEK_SET); fread(&len, 1, 4, f); ! int game = 0; if(len > 1) { GSACodeSelect dlg(f); --- 690,694 ---- fseek(f, 0x1e, SEEK_SET); fread(&len, 1, 4, f); ! INT_PTR game = 0; if(len > 1) { GSACodeSelect dlg(f); *************** *** 738,742 **** CFileStatus status; CString str; ! __time64_t time = -1; int found = 0; --- 738,742 ---- CFileStatus status; CString str; ! __time64_t time = (__time64_t)-1; int found = 0; *************** *** 745,749 **** if(emulating && CFile::GetStatus(name, status)) { ! if((unsigned long)status.m_mtime.GetTime() < time) { time = status.m_mtime.GetTime(); found = i; --- 745,749 ---- if(emulating && CFile::GetStatus(name, status)) { ! if(status.m_mtime.GetTime() < time) { time = status.m_mtime.GetTime(); found = i; Index: Joypad.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/Joypad.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Joypad.cpp 13 May 2006 16:32:16 -0000 1.5 --- Joypad.cpp 27 May 2006 14:47:33 -0000 1.6 *************** *** 47,53 **** BEGIN_MESSAGE_MAP(JoypadEditControl, CEdit) - //{{AFX_MSG_MAP(JoypadEditControl) - ON_WM_CHAR() - //}}AFX_MSG_MAP ON_MESSAGE(JOYCONFIG_MESSAGE, OnJoyConfig) END_MESSAGE_MAP() --- 47,50 ---- *************** *** 56,71 **** // JoypadEditControl message handlers - void JoypadEditControl::OnChar(UINT nChar, UINT nRepCnt, UINT nFlags) - { - } - LRESULT JoypadEditControl::OnJoyConfig(WPARAM wParam, LPARAM lParam) { ! SetWindowLong(GetSafeHwnd(), GWL_USERDATA,((wParam<<8)|lParam)); ! SetWindowText(theApp.input->getKeyName((wParam<<8)|lParam)); ! GetParent()->GetNextDlgTabItem(this, FALSE)->SetFocus(); ! return TRUE; } BOOL JoypadEditControl::PreTranslateMessage(MSG *pMsg) { --- 53,69 ---- // JoypadEditControl message handlers LRESULT JoypadEditControl::OnJoyConfig(WPARAM wParam, LPARAM lParam) { ! #ifdef _WIN64 ! SetWindowLongPtr( GetSafeHwnd(), GWL_USERDATA, ((wParam<<8)|lParam) ); ! #elif defined _WIN32 ! SetWindowLongPtr( GetSafeHwnd(), GWL_USERDATA, PtrToLong((wParam<<8)|lParam) ); ! #endif ! this->SetWindowText( theApp.input->getKeyName( (int)((wParam<<8)|lParam) ) ); ! GetParent()->GetNextDlgTabItem(this, FALSE)->SetFocus(); ! return TRUE; } + BOOL JoypadEditControl::PreTranslateMessage(MSG *pMsg) { *************** *** 113,124 **** BEGIN_MESSAGE_MAP(JoypadConfig, CDialog) - //{{AFX_MSG_MAP(JoypadConfig) ON_BN_CLICKED(ID_CANCEL, OnCancel) ON_BN_CLICKED(ID_OK, OnOk) - ON_WM_CHAR() ON_WM_DESTROY() ON_WM_TIMER() ON_WM_KEYDOWN() - //}}AFX_MSG_MAP END_MESSAGE_MAP() --- 111,119 ---- *************** *** 138,145 **** } - void JoypadConfig::OnChar(UINT nChar, UINT nRepCnt, UINT nFlags) - { - } - void JoypadConfig::OnDestroy() { --- 133,136 ---- *************** *** 166,206 **** timerId = SetTimer(0,50,NULL); ! SetWindowLong(up, GWL_USERDATA,joypad[which][KEY_UP]); up.SetWindowText(theApp.input->getKeyName(joypad[which][KEY_UP])); ! SetWindowLong(down, GWL_USERDATA,joypad[which][KEY_DOWN]); down.SetWindowText(theApp.input->getKeyName(joypad[which][KEY_DOWN])); ! SetWindowLong(left, GWL_USERDATA,joypad[which][KEY_LEFT]); left.SetWindowText(theApp.input->getKeyName(joypad[which][KEY_LEFT])); ! SetWindowLong(right, GWL_USERDATA,joypad[which][KEY_RIGHT]); right.SetWindowText(theApp.input->getKeyName(joypad[which][KEY_RIGHT])); ! SetWindowLong(buttonA, GWL_USERDATA,joypad[which][KEY_BUTTON_A]); buttonA.SetWindowText(theApp.input->getKeyName(joypad[which][KEY_BUTTON_A])); ! SetWindowLong(buttonB, GWL_USERDATA,joypad[which][KEY_BUTTON_B]); buttonB.SetWindowText(theApp.input->getKeyName(joypad[which][KEY_BUTTON_B])); ! SetWindowLong(buttonL, GWL_USERDATA,joypad[which][KEY_BUTTON_L]); buttonL.SetWindowText(theApp.input->getKeyName(joypad[which][KEY_BUTTON_L])); ! SetWindowLong(buttonR, GWL_USERDATA,joypad[which][KEY_BUTTON_R]); buttonR.SetWindowText(theApp.input->getKeyName(joypad[which][KEY_BUTTON_R])); ! SetWindowLong(buttonSelect, GWL_USERDATA,joypad[which][KEY_BUTTON_SELECT]); buttonSelect.SetWindowText(theApp.input->getKeyName(joypad[which][KEY_BUTTON_SELECT])); ! SetWindowLong(buttonStart, GWL_USERDATA,joypad[which][KEY_BUTTON_START]); buttonStart.SetWindowText(theApp.input->getKeyName(joypad[which][KEY_BUTTON_START])); ! SetWindowLong(speed, GWL_USERDATA,joypad[which][KEY_BUTTON_SPEED]); speed.SetWindowText(theApp.input->getKeyName(joypad[which][KEY_BUTTON_SPEED])); ! SetWindowLong(capture, GWL_USERDATA,joypad[which][KEY_BUTTON_CAPTURE]); capture.SetWindowText(theApp.input->getKeyName(joypad[which][KEY_BUTTON_CAPTURE])); ! SetWindowLong(buttonGS, GWL_USERDATA,joypad[which][KEY_BUTTON_GS]); buttonGS.SetWindowText(theApp.input->getKeyName(joypad[which][KEY_BUTTON_GS])); --- 157,197 ---- timerId = SetTimer(0,50,NULL); ! SetWindowLongPtr(up, GWL_USERDATA,joypad[which][KEY_UP]); up.SetWindowText(theApp.input->getKeyName(joypad[which][KEY_UP])); ! SetWindowLongPtr(down, GWL_USERDATA,joypad[which][KEY_DOWN]); down.SetWindowText(theApp.input->getKeyName(joypad[which][KEY_DOWN])); ! SetWindowLongPtr(left, GWL_USERDATA,joypad[which][KEY_LEFT]); left.SetWindowText(theApp.input->getKeyName(joypad[which][KEY_LEFT])); ! SetWindowLongPtr(right, GWL_USERDATA,joypad[which][KEY_RIGHT]); right.SetWindowText(theApp.input->getKeyName(joypad[which][KEY_RIGHT])); ! SetWindowLongPtr(buttonA, GWL_USERDATA,joypad[which][KEY_BUTTON_A]); buttonA.SetWindowText(theApp.input->getKeyName(joypad[which][KEY_BUTTON_A])); ! SetWindowLongPtr(buttonB, GWL_USERDATA,joypad[which][KEY_BUTTON_B]); buttonB.SetWindowText(theApp.input->getKeyName(joypad[which][KEY_BUTTON_B])); ! SetWindowLongPtr(buttonL, GWL_USERDATA,joypad[which][KEY_BUTTON_L]); buttonL.SetWindowText(theApp.input->getKeyName(joypad[which][KEY_BUTTON_L])); ! SetWindowLongPtr(buttonR, GWL_USERDATA,joypad[which][KEY_BUTTON_R]); buttonR.SetWindowText(theApp.input->getKeyName(joypad[which][KEY_BUTTON_R])); ! SetWindowLongPtr(buttonSelect, GWL_USERDATA,joypad[which][KEY_BUTTON_SELECT]); buttonSelect.SetWindowText(theApp.input->getKeyName(joypad[which][KEY_BUTTON_SELECT])); ! SetWindowLongPtr(buttonStart, GWL_USERDATA,joypad[which][KEY_BUTTON_START]); buttonStart.SetWindowText(theApp.input->getKeyName(joypad[which][KEY_BUTTON_START])); ! SetWindowLongPtr(speed, GWL_USERDATA,joypad[which][KEY_BUTTON_SPEED]); speed.SetWindowText(theApp.input->getKeyName(joypad[which][KEY_BUTTON_SPEED])); ! SetWindowLongPtr(capture, GWL_USERDATA,joypad[which][KEY_BUTTON_CAPTURE]); capture.SetWindowText(theApp.input->getKeyName(joypad[which][KEY_BUTTON_CAPTURE])); ! SetWindowLongPtr(buttonGS, GWL_USERDATA,joypad[which][KEY_BUTTON_GS]); buttonGS.SetWindowText(theApp.input->getKeyName(joypad[which][KEY_BUTTON_GS])); *************** *** 261,301 **** id = IDC_EDIT_UP; ! assignKey(id, GetWindowLong(up, GWL_USERDATA)); id = IDC_EDIT_DOWN; ! assignKey(id, GetWindowLong(down, GWL_USERDATA)); id = IDC_EDIT_LEFT; ! assignKey(id, GetWindowLong(left, GWL_USERDATA)); id = IDC_EDIT_RIGHT; ! assignKey(id, GetWindowLong(right, GWL_USERDATA)); id = IDC_EDIT_BUTTON_A; ! assignKey(id, GetWindowLong(buttonA, GWL_USERDATA)); id = IDC_EDIT_BUTTON_B; ! assignKey(id, GetWindowLong(buttonB, GWL_USERDATA)); id = IDC_EDIT_BUTTON_L; ! assignKey(id, GetWindowLong(buttonL, GWL_USERDATA)); id = IDC_EDIT_BUTTON_R; ! assignKey(id, GetWindowLong(buttonR, GWL_USERDATA)); id = IDC_EDIT_BUTTON_SELECT; ! assignKey(id, GetWindowLong(buttonSelect, GWL_USERDATA)); id = IDC_EDIT_BUTTON_START; ! assignKey(id, GetWindowLong(buttonStart, GWL_USERDATA)); id = IDC_EDIT_SPEED; ! assignKey(id, GetWindowLong(speed, GWL_USERDATA)); id = IDC_EDIT_CAPTURE; ! assignKey(id, GetWindowLong(capture, GWL_USERDATA)); id = IDC_EDIT_BUTTON_GS; ! assignKey(id, GetWindowLong(buttonGS, GWL_USERDATA)); // winSaveKeys(); --- 252,292 ---- id = IDC_EDIT_UP; ! assignKey(id, GetWindowLongPtr(up, GWL_USERDATA)); id = IDC_EDIT_DOWN; ! assignKey(id, GetWindowLongPtr(down, GWL_USERDATA)); id = IDC_EDIT_LEFT; ! assignKey(id, GetWindowLongPtr(left, GWL_USERDATA)); id = IDC_EDIT_RIGHT; ! assignKey(id, GetWindowLongPtr(right, GWL_USERDATA)); id = IDC_EDIT_BUTTON_A; ! assignKey(id, GetWindowLongPtr(buttonA, GWL_USERDATA)); id = IDC_EDIT_BUTTON_B; ! assignKey(id, GetWindowLongPtr(buttonB, GWL_USERDATA)); id = IDC_EDIT_BUTTON_L; ! assignKey(id, GetWindowLongPtr(buttonL, GWL_USERDATA)); id = IDC_EDIT_BUTTON_R; ! assignKey(id, GetWindowLongPtr(buttonR, GWL_USERDATA)); id = IDC_EDIT_BUTTON_SELECT; ! assignKey(id, GetWindowLongPtr(buttonSelect, GWL_USERDATA)); id = IDC_EDIT_BUTTON_START; ! assignKey(id, GetWindowLongPtr(buttonStart, GWL_USERDATA)); id = IDC_EDIT_SPEED; ! assignKey(id, GetWindowLongPtr(speed, GWL_USERDATA)); id = IDC_EDIT_CAPTURE; ! assignKey(id, GetWindowLongPtr(capture, GWL_USERDATA)); id = IDC_EDIT_BUTTON_GS; ! assignKey(id, GetWindowLongPtr(buttonGS, GWL_USERDATA)); // winSaveKeys(); *************** *** 329,340 **** BEGIN_MESSAGE_MAP(MotionConfig, CDialog) - //{{AFX_MSG_MAP(MotionConfig) ON_BN_CLICKED(ID_CANCEL, OnCancel) ON_BN_CLICKED(ID_OK, OnOk) - ON_WM_CHAR() ON_WM_DESTROY() ON_WM_KEYDOWN() ON_WM_TIMER() - //}}AFX_MSG_MAP END_MESSAGE_MAP() --- 320,328 ---- *************** *** 354,361 **** } - void MotionConfig::OnChar(UINT nChar, UINT nRepCnt, UINT nFlags) - { - } - void MotionConfig::OnDestroy() { --- 342,345 ---- *************** *** 371,384 **** timerId = SetTimer(0,200,NULL); ! SetWindowLong(up, GWL_USERDATA,motion[KEY_UP]); up.SetWindowText(theApp.input->getKeyName(motion[KEY_UP])); ! SetWindowLong(down, GWL_USERDATA,motion[KEY_DOWN]); down.SetWindowText(theApp.input->getKeyName(motion[KEY_DOWN])); ! SetWindowLong(left, GWL_USERDATA,motion[KEY_LEFT]); left.SetWindowText(theApp.input->getKeyName(motion[KEY_LEFT])); ! SetWindowLong(right, GWL_USERDATA,motion[KEY_RIGHT]); right.SetWindowText(theApp.input->getKeyName(motion[KEY_RIGHT])); --- 355,368 ---- timerId = SetTimer(0,200,NULL); ! SetWindowLongPtr(up, GWL_USERDATA,motion[KEY_UP]); up.SetWindowText(theApp.input->getKeyName(motion[KEY_UP])); ! SetWindowLongPtr(down, GWL_USERDATA,motion[KEY_DOWN]); down.SetWindowText(theApp.input->getKeyName(motion[KEY_DOWN])); ! SetWindowLongPtr(left, GWL_USERDATA,motion[KEY_LEFT]); left.SetWindowText(theApp.input->getKeyName(motion[KEY_LEFT])); ! SetWindowLongPtr(right, GWL_USERDATA,motion[KEY_RIGHT]); right.SetWindowText(theApp.input->getKeyName(motion[KEY_RIGHT])); *************** *** 423,435 **** id = IDC_EDIT_UP; ! assignKey(id, GetWindowLong(up, GWL_USERDATA)); id = IDC_EDIT_DOWN; ! assignKey(id, GetWindowLong(down, GWL_USERDATA)); id = IDC_EDIT_LEFT; ! assignKey(id, GetWindowLong(left, GWL_USERDATA)); id = IDC_EDIT_RIGHT; ! assignKey(id, GetWindowLong(right, GWL_USERDATA)); } --- 407,419 ---- id = IDC_EDIT_UP; ! assignKey(id, GetWindowLongPtr(up, GWL_USERDATA)); id = IDC_EDIT_DOWN; ! assignKey(id, GetWindowLongPtr(down, GWL_USERDATA)); id = IDC_EDIT_LEFT; ! assignKey(id, GetWindowLongPtr(left, GWL_USERDATA)); id = IDC_EDIT_RIGHT; ! assignKey(id, GetWindowLongPtr(right, GWL_USERDATA)); } Index: MemoryViewer.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/MemoryViewer.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** MemoryViewer.cpp 13 May 2004 15:06:54 -0000 1.7 --- MemoryViewer.cpp 27 May 2006 14:47:33 -0000 1.8 *************** *** 536,541 **** LRESULT MemoryViewer::OnWMChar(WPARAM wParam, LPARAM LPARAM) ! { ! if(OnEditInput(wParam)) return 0; return 1; --- 536,541 ---- LRESULT MemoryViewer::OnWMChar(WPARAM wParam, LPARAM LPARAM) ! { // The WM_CHAR message uses Unicode Transformation Format (UTF)-16. ! if(OnEditInput((UINT)(wParam & 0xFFFF))) return 0; return 1; Index: MainWndOptions.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/MainWndOptions.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** MainWndOptions.cpp 30 Apr 2006 14:33:12 -0000 1.7 --- MainWndOptions.cpp 27 May 2006 14:47:33 -0000 1.8 *************** *** 43,46 **** --- 43,48 ---- #include "../gb/gbPrinter.h" + #include <tchar.h> + extern int emulating; *************** *** 109,120 **** } void MainWnd::OnOptionsFrameskipThrottleOther() { ! Throttle dlg; ! int v = dlg.DoModal(); ! if(v) ! theApp.throttle = v; } void MainWnd::OnUpdateOptionsFrameskipThrottleOther(CCmdUI* pCmdUI) { --- 111,126 ---- } + void MainWnd::OnOptionsFrameskipThrottleOther() { ! Throttle dlg; ! int v = (int)dlg.DoModal(); ! ! if( v ) { ! theApp.throttle = v; ! } } + void MainWnd::OnUpdateOptionsFrameskipThrottleOther(CCmdUI* pCmdUI) { *************** *** 222,230 **** } void MainWnd::OnOptionsVideoVsync() { ! theApp.vsync = !theApp.vsync; } void MainWnd::OnUpdateOptionsVideoVsync(CCmdUI* pCmdUI) { --- 228,241 ---- } + void MainWnd::OnOptionsVideoVsync() { ! theApp.vsync = !theApp.vsync; ! if( theApp.display ) { ! theApp.display->setOption( _T("vsync"), theApp.vsync ); ! } } + void MainWnd::OnUpdateOptionsVideoVsync(CCmdUI* pCmdUI) { *************** *** 270,280 **** } BOOL MainWnd::OnOptionVideoSize(UINT nID) { ! theApp.updateVideoSize(nID); ! theApp.m_pMainWnd->PostMessage(VBA_CONFIRM_MODE); ! return TRUE; } void MainWnd::OnOptionsVideoFullscreen320x240() { --- 281,293 ---- } + BOOL MainWnd::OnOptionVideoSize(UINT nID) { ! theApp.updateVideoSize(nID); ! theApp.m_pMainWnd->PostMessage(VBA_CONFIRM_MODE); ! return TRUE; } + void MainWnd::OnOptionsVideoFullscreen320x240() { *************** *** 292,295 **** --- 305,309 ---- } + void MainWnd::OnOptionsVideoFullscreen() { *************** *** 326,329 **** --- 340,344 ---- } + void MainWnd::OnUpdateOptionsVideoFullscreen(CCmdUI* pCmdUI) { *************** *** 343,354 **** } void MainWnd::OnOptionsVideoFullscreenstretchtofit() { ! theApp.fullScreenStretch = !theApp.fullScreenStretch; ! theApp.updateWindowSize(theApp.videoOption); ! if(theApp.display) ! theApp.display->clear(); } void MainWnd::OnUpdateOptionsVideoFullscreenstretchtofit(CCmdUI* pCmdUI) { --- 358,376 ---- } + void MainWnd::OnOptionsVideoFullscreenstretchtofit() { ! theApp.fullScreenStretch = !theApp.fullScreenStretch; ! theApp.d3dKeepAspectRatio = !theApp.fullScreenStretch; ! theApp.updateWindowSize( theApp.videoOption ); ! if( theApp.display ) { ! if( emulating ) { ! theApp.display->clear( ); ! } ! theApp.display->setOption( _T("d3dKeepAspectRatio"), theApp.d3dKeepAspectRatio ); ! } } + void MainWnd::OnUpdateOptionsVideoFullscreenstretchtofit(CCmdUI* pCmdUI) { *************** *** 427,445 **** } void MainWnd::OnOptionsVideoTriplebuffering() { ! theApp.tripleBuffering = !theApp.tripleBuffering; } void MainWnd::OnUpdateOptionsVideoTriplebuffering(CCmdUI* pCmdUI) { ! pCmdUI->SetCheck(theApp.tripleBuffering); } void MainWnd::OnOptionsVideoDdrawemulationonly() { ! theApp.ddrawEmulationOnly = !theApp.ddrawEmulationOnly; } void MainWnd::OnUpdateOptionsVideoDdrawemulationonly(CCmdUI* pCmdUI) { --- 449,476 ---- } + void MainWnd::OnOptionsVideoTriplebuffering() { ! theApp.tripleBuffering = !theApp.tripleBuffering; ! if( theApp.display ) { ! theApp.display->setOption( _T("tripleBuffering"), theApp.tripleBuffering ); ! } } + void MainWnd::OnUpdateOptionsVideoTriplebuffering(CCmdUI* pCmdUI) { ! pCmdUI->SetCheck(theApp.tripleBuffering); } void MainWnd::OnOptionsVideoDdrawemulationonly() { ! theApp.ddrawEmulationOnly = !theApp.ddrawEmulationOnly; ! if( theApp.display ) { ! theApp.display->setOption( _T("ddrawEmulationOnly"), theApp.ddrawEmulationOnly ); ! } } + void MainWnd::OnUpdateOptionsVideoDdrawemulationonly(CCmdUI* pCmdUI) { *************** *** 447,455 **** } void MainWnd::OnOptionsVideoDdrawusevideomemory() { ! theApp.ddrawUseVideoMemory = !theApp.ddrawUseVideoMemory; } void MainWnd::OnUpdateOptionsVideoDdrawusevideomemory(CCmdUI* pCmdUI) { --- 478,491 ---- } + void MainWnd::OnOptionsVideoDdrawusevideomemory() { ! theApp.ddrawUseVideoMemory = !theApp.ddrawUseVideoMemory; ! if( theApp.display ) { ! theApp.display->setOption( _T("ddrawUseVideoMemory"), theApp.ddrawUseVideoMemory ); ! } } + void MainWnd::OnUpdateOptionsVideoDdrawusevideomemory(CCmdUI* pCmdUI) { *************** *** 459,465 **** void MainWnd::OnOptionsVideoRenderoptionsD3dnofilter() { ! theApp.d3dFilter = 0; ! if(theApp.display) ! theApp.display->setOption("d3dFilter", 0); } --- 495,502 ---- void MainWnd::OnOptionsVideoRenderoptionsD3dnofilter() { ! theApp.d3dFilter = 0; ! if( theApp.display ) { ! theApp.display->setOption( _T("d3dFilter"), theApp.d3dFilter ); ! } } *************** *** 469,479 **** } void MainWnd::OnOptionsVideoRenderoptionsD3dbilinear() { ! theApp.d3dFilter = 1; ! if(theApp.display) ! theApp.display->setOption("d3dFilter", 1); } void MainWnd::OnUpdateOptionsVideoRenderoptionsD3dbilinear(CCmdUI* pCmdUI) { --- 506,519 ---- } + void MainWnd::OnOptionsVideoRenderoptionsD3dbilinear() { ! theApp.d3dFilter = 1; ! if( theApp.display ) { ! theApp.display->setOption( _T("d3dFilter"), theApp.d3dFilter ); ! } } + void MainWnd::OnUpdateOptionsVideoRenderoptionsD3dbilinear(CCmdUI* pCmdUI) { *************** *** 481,491 **** } void MainWnd::OnOptionsVideoRenderoptionsGlnearest() { ! theApp.glFilter = 0; ! if(theApp.display) ! theApp.display->setOption("glFilter", 0); } void MainWnd::OnUpdateOptionsVideoRenderoptionsGlnearest(CCmdUI* pCmdUI) { --- 521,534 ---- } + void MainWnd::OnOptionsVideoRenderoptionsGlnearest() { ! theApp.glFilter = 0; ! if( theApp.display ) { ! theApp.display->setOption( _T("glFilter"), theApp.glFilter ); ! } } + void MainWnd::OnUpdateOptionsVideoRenderoptionsGlnearest(CCmdUI* pCmdUI) { *************** *** 493,503 **** } void MainWnd::OnOptionsVideoRenderoptionsGlbilinear() { ! theApp.glFilter = 1; ! if(theApp.display) ! theApp.display->setOption("glFilter", 1); } void MainWnd::OnUpdateOptionsVideoRenderoptionsGlbilinear(CCmdUI* pCmdUI) { --- 536,549 ---- } + void MainWnd::OnOptionsVideoRenderoptionsGlbilinear() { ! theApp.glFilter = 1; ! if( theApp.display ) { ! theApp.display->setOption( _T("glFilter"), theApp.glFilter ); ! } } + void MainWnd::OnUpdateOptionsVideoRenderoptionsGlbilinear(CCmdUI* pCmdUI) { *************** *** 505,515 **** } void MainWnd::OnOptionsVideoRenderoptionsGltriangle() { ! theApp.glType = 0; ! if(theApp.display) ! theApp.display->setOption("glType", 0); } void MainWnd::OnUpdateOptionsVideoRenderoptionsGltriangle(CCmdUI* pCmdUI) { --- 551,564 ---- } + void MainWnd::OnOptionsVideoRenderoptionsGltriangle() { ! theApp.glType = 0; ! if( theApp.display ) { ! theApp.display->setOption( _T("glType"), theApp.glType ); ! } } + void MainWnd::OnUpdateOptionsVideoRenderoptionsGltriangle(CCmdUI* pCmdUI) { ***************... [truncated message content] |
|
From: Spacy <sp...@us...> - 2006-05-27 14:47:38
|
Update of /cvsroot/vba/VisualBoyAdvance/src/gb In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6380/src/gb Modified Files: GB.cpp GB.h gbCheats.cpp Log Message: vs2005 compatibility, minor changes/fixes Index: GB.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/gb/GB.cpp,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** GB.cpp 13 May 2006 16:32:15 -0000 1.25 --- GB.cpp 27 May 2006 14:47:33 -0000 1.26 *************** *** 2092,2104 **** } ! void gbReset() { - - gbCgbMode = 0; gbSgbMode = 0; - oldRegister_WY = 146; - gbInterruptLaunched = 0; - if(gbRom[0x143] & 0x80) { if((gbEmulatorType == 0) || --- 2092,2099 ---- } ! void gbGetHardwareType() { gbCgbMode = 0; gbSgbMode = 0; if(gbRom[0x143] & 0x80) { if((gbEmulatorType == 0) || *************** *** 2106,2129 **** gbEmulatorType == 4) { gbCgbMode = 1; - if (gbVram == NULL) - gbVram = (u8 *)malloc(0x4000); - if (gbWram == NULL) - gbWram = (u8 *)malloc(0x8000); - memset(gbVram,0,0x4000); - memset(gbPalette,0, 2*128); } } ! else ! { ! if(gbVram != NULL) { ! free(gbVram); ! gbVram = NULL; ! } ! if(gbWram != NULL) { ! free(gbWram); ! gbWram = NULL; ! } ! } ! if((gbCgbMode == 0 ) && (gbRom[0x146] == 0x03)) { if(gbEmulatorType == 0 || --- 2101,2107 ---- gbEmulatorType == 4) { gbCgbMode = 1; } } ! if((gbCgbMode == 0 ) && (gbRom[0x146] == 0x03)) { if(gbEmulatorType == 0 || *************** *** 2144,2147 **** --- 2122,2153 ---- if (gbHardware & 8) // If GBA is selected, choose the GBA default settings. gbGBCColorType = 2; // (0 = GBC, 1 = GBA, 2 = GBASP) + } + + void gbReset() + { + gbGetHardwareType(); + + oldRegister_WY = 146; + gbInterruptLaunched = 0; + + if(gbCgbMode == 1) { + if (gbVram == NULL) + gbVram = (u8 *)malloc(0x4000); + if (gbWram == NULL) + gbWram = (u8 *)malloc(0x8000); + memset(gbVram,0,0x4000); + memset(gbPalette,0, 2*128); + } + else + { + if(gbVram != NULL) { + free(gbVram); + gbVram = NULL; + } + if(gbWram != NULL) { + free(gbWram); + gbWram = NULL; + } + } gbLYChangeHappened = false; Index: GB.h =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/gb/GB.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** GB.h 30 Apr 2006 14:41:06 -0000 1.7 --- GB.h 27 May 2006 14:47:33 -0000 1.8 *************** *** 43,46 **** --- 43,47 ---- extern void gbSoundReset(); extern void gbSoundSetQuality(int); + extern void gbGetHardwareType(); extern void gbReset(); extern void gbCleanUp(); Index: gbCheats.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/gb/gbCheats.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** gbCheats.cpp 4 Jan 2006 13:38:47 -0000 1.9 --- gbCheats.cpp 27 May 2006 14:47:33 -0000 1.10 *************** *** 164,168 **** bool gbVerifyGsCode(const char *code) { ! int len = strlen(code); if(len == 0) --- 164,168 ---- bool gbVerifyGsCode(const char *code) { ! size_t len = strlen(code); if(len == 0) *************** *** 229,233 **** bool gbVerifyGgCode(const char *code) { ! int len = strlen(code); if(len != 11 && --- 229,233 ---- bool gbVerifyGgCode(const char *code) { ! size_t len = strlen(code); if(len != 11 && *************** *** 314,318 **** int i = gbCheatNumber; ! int len = strlen(code); strcpy(gbCheatList[i].cheatCode, code); --- 314,318 ---- int i = gbCheatNumber; ! size_t len = strlen(code); strcpy(gbCheatList[i].cheatCode, code); |
|
From: Spacy <sp...@us...> - 2006-05-27 14:47:37
|
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) |
|
From: Spacy <sp...@us...> - 2006-05-27 14:47:37
|
Update of /cvsroot/vba/VisualBoyAdvance/src/sdl In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6380/src/sdl Modified Files: SDL.cpp TestEmu.cpp debugger.cpp Log Message: vs2005 compatibility, minor changes/fixes Index: TestEmu.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/sdl/TestEmu.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** TestEmu.cpp 20 Dec 2004 15:03:13 -0000 1.5 --- TestEmu.cpp 27 May 2006 14:47:33 -0000 1.6 *************** *** 24,36 **** #include <sys/stat.h> ! #include "AutoBuild.h" ! #include "GBA.h" #include "debugger.h" ! #include "Sound.h" ! #include "unzip.h" ! #include "Util.h" ! #include "gb/GB.h" ! #include "gb/gbGlobals.h" #ifndef WIN32 --- 24,37 ---- #include <sys/stat.h> ! #include "../AutoBuild.h" ! #include "../GBA.h" #include "debugger.h" ! #include "../Sound.h" ! #include "../unzip.h" ! #include "../Util.h" ! #include "../gb/GB.h" ! #include "../gb/gbGlobals.h" ! #include "../getopt.h" #ifndef WIN32 Index: debugger.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/sdl/debugger.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** debugger.cpp 13 May 2006 16:32:16 -0000 1.8 --- debugger.cpp 27 May 2006 14:47:33 -0000 1.9 *************** *** 1067,1071 **** address &= 0x3ffff; final &= 0x3ffff; ! for(u32 i = address; i < final; i++) if(freezeWorkRAM[i] == 1) freezeWorkRAM[i] = 0; --- 1067,1071 ---- address &= 0x3ffff; final &= 0x3ffff; ! for(int i = address; i < final; i++) if(freezeWorkRAM[i] == 1) freezeWorkRAM[i] = 0; *************** *** 1078,1082 **** address &= 0x7fff; final &= 0x7fff; ! for(u32 i = address; i < final; i++) if(freezeInternalRAM[i] == 1) freezeInternalRAM[i] = 0; --- 1078,1082 ---- address &= 0x7fff; final &= 0x7fff; ! for(int i = address; i < final; i++) if(freezeInternalRAM[i] == 1) freezeInternalRAM[i] = 0; *************** *** 1167,1171 **** address &= 0x3ffff; final &= 0x3ffff; ! for(u32 i = address; i < final; i++) if(freezeWorkRAM[i] == 2) freezeWorkRAM[i] = 0; --- 1167,1171 ---- address &= 0x3ffff; final &= 0x3ffff; ! for(int i = address; i < final; i++) if(freezeWorkRAM[i] == 2) freezeWorkRAM[i] = 0; *************** *** 1178,1182 **** address &= 0x7fff; final &= 0x7fff; ! for(u32 i = address; i < final; i++) if(freezeInternalRAM[i] == 2) freezeInternalRAM[i] = 0; --- 1178,1182 ---- address &= 0x7fff; final &= 0x7fff; ! for(int i = address; i < final; i++) if(freezeInternalRAM[i] == 2) freezeInternalRAM[i] = 0; *************** *** 1250,1254 **** char format[30]; for(i = 0; i < count; i++) { ! int l = strlen(elfGetAddressSymbol(pc+4*i)); if(l > len) len = l; --- 1250,1254 ---- char format[30]; for(i = 0; i < count; i++) { ! size_t l = strlen(elfGetAddressSymbol(pc+4*i)); if(l > len) len = l; *************** *** 1269,1273 **** char format[30]; for(i = 0; i < count; i++) { ! int l = strlen(elfGetAddressSymbol(pc+2*i)); if(l > len) len = l; --- 1269,1273 ---- char format[30]; for(i = 0; i < count; i++) { ! size_t l = strlen(elfGetAddressSymbol(pc+2*i)); if(l > len) len = l; Index: SDL.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/sdl/SDL.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** SDL.cpp 13 May 2006 16:32:16 -0000 1.11 --- SDL.cpp 27 May 2006 14:47:33 -0000 1.12 *************** *** 110,113 **** --- 110,114 ---- extern void CPUUpdateRenderBuffers(bool); + extern int gbHardware; struct EmulatedSystem emulator = { *************** *** 815,819 **** struct stat buf; ! int len = strlen(dir); char *p = dir + len - 1; --- 816,820 ---- struct stat buf; ! size_t len = strlen(dir); char *p = dir + len - 1; *************** *** 838,842 **** static char filebuffer[2048]; ! int len = strlen(name); char *p = name + len - 1; --- 839,843 ---- static char filebuffer[2048]; ! size_t len = strlen(name); char *p = name + len - 1; *************** *** 2217,2221 **** failed = !gbLoadRom(szFile); if(!failed) { ! cartridgeType = 1; emulator = GBSystem; if(sdlAutoIPS) { --- 2218,2238 ---- failed = !gbLoadRom(szFile); if(!failed) { ! gbGetHardwareType(); ! ! // used for the handling of the gb Boot Rom ! if (gbHardware & 5) ! { ! char tempName[0x800]; ! strcpy(tempName, arg0); ! char *p = strrchr(tempName, '\\'); ! if(p) { *p = 0x00; } ! strcat(tempName, "\\DMG_ROM.bin"); ! fprintf(stderr, "%s\n", tempName); ! gbCPUInit(tempName, useBios); ! } ! else useBios = false; ! ! gbReset(); ! cartridgeType = IMAGE_GB; emulator = GBSystem; if(sdlAutoIPS) { *************** *** 2267,2271 **** } } else { ! cartridgeType = 0; strcpy(filename, "gnu_stub"); rom = (u8 *)malloc(0x2000000); --- 2284,2288 ---- } } else { ! cartridgeType = IMAGE_GBA; strcpy(filename, "gnu_stub"); rom = (u8 *)malloc(0x2000000); |
|
From: Spacy <sp...@us...> - 2006-05-27 14:30:06
|
Update of /cvsroot/vba/VisualBoyAdvance/win32 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv32104/win32 Modified Files: vba_vs2005.suo Log Message: n/a Index: vba_vs2005.suo =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/win32/vba_vs2005.suo,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Binary files /tmp/cvsTrFpHY and /tmp/cvsHUh1jL differ |
|
From: Spacy <sp...@us...> - 2006-05-27 14:10:38
|
Update of /cvsroot/vba/VisualBoyAdvance/win32 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv26366/win32 Modified Files: .cvsignore Log Message: Index: .cvsignore =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/win32/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** .cvsignore 13 May 2006 16:38:00 -0000 1.2 --- .cvsignore 27 May 2006 14:10:22 -0000 1.3 *************** *** 4,6 **** gba_sdl.ncb gba_sdl.opt gba_sdl.plg vba_vs2005.ncb ! vba_vs2005.vcproj.A2.Spacy.user \ No newline at end of file --- 4,9 ---- gba_sdl.ncb gba_sdl.opt gba_sdl.plg vba_vs2005.ncb ! vba_vs2005.vcproj.A2.Spacy.user ! MFC_Release ! MFC_Debug ! vba_vs2005.vcproj.A1.Spacy.user \ No newline at end of file |
|
From: Spacy <sp...@us...> - 2006-05-26 14:38:53
|
Update of /cvsroot/vba/VisualBoyAdvance/src/win32 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv12503/src/win32 Modified Files: Directories.cpp Directories.h Log Message: made directories edit boxes editable by hand Index: Directories.h =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/Directories.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Directories.h 13 May 2004 15:06:49 -0000 1.2 --- Directories.h 26 May 2006 14:38:47 -0000 1.3 *************** *** 76,80 **** //}}AFX_MSG DECLARE_MESSAGE_MAP() ! }; //{{AFX_INSERT_LOCATION}} --- 76,82 ---- //}}AFX_MSG DECLARE_MESSAGE_MAP() ! public: ! // afx_msg void OnBnClickedOk(); ! }; //{{AFX_INSERT_LOCATION}} Index: Directories.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/Directories.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Directories.cpp 13 May 2004 15:06:49 -0000 1.2 --- Directories.cpp 26 May 2006 14:38:47 -0000 1.3 *************** *** 55,61 **** : CDialog(Directories::IDD, pParent) { - //{{AFX_DATA_INIT(Directories) - // NOTE: the ClassWizard will add member initialization here - //}}AFX_DATA_INIT } --- 55,58 ---- *************** *** 64,68 **** { CDialog::DoDataExchange(pDX); - //{{AFX_DATA_MAP(Directories) DDX_Control(pDX, IDC_SAVE_PATH, m_savePath); DDX_Control(pDX, IDC_ROM_PATH, m_romPath); --- 61,64 ---- *************** *** 70,79 **** DDX_Control(pDX, IDC_CAPTURE_PATH, m_capturePath); DDX_Control(pDX, IDC_BATTERY_PATH, m_batteryPath); - //}}AFX_DATA_MAP } BEGIN_MESSAGE_MAP(Directories, CDialog) - //{{AFX_MSG_MAP(Directories) ON_BN_CLICKED(IDC_BATTERY_DIR, OnBatteryDir) ON_BN_CLICKED(IDC_BATTERY_DIR_RESET, OnBatteryDirReset) --- 66,73 ---- *************** *** 86,91 **** ON_BN_CLICKED(IDC_SAVE_DIR, OnSaveDir) ON_BN_CLICKED(IDC_SAVE_DIR_RESET, OnSaveDirReset) ! //}}AFX_MSG_MAP ! END_MESSAGE_MAP() ///////////////////////////////////////////////////////////////////////////// --- 80,84 ---- ON_BN_CLICKED(IDC_SAVE_DIR, OnSaveDir) ON_BN_CLICKED(IDC_SAVE_DIR_RESET, OnSaveDirReset) ! END_MESSAGE_MAP() ///////////////////////////////////////////////////////////////////////////// *************** *** 255,257 **** } return res; ! } --- 248,250 ---- } return res; ! } \ No newline at end of file |
|
From: Spacy <sp...@us...> - 2006-05-26 14:37:49
|
Update of /cvsroot/vba/VisualBoyAdvance/src/win32 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10723/src/win32 Modified Files: AboutDialog.cpp AboutDialog.h resource.h vba.rc vba.rc2 Log Message: updated about dialog Index: AboutDialog.h =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/AboutDialog.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** AboutDialog.h 13 May 2004 15:06:49 -0000 1.2 --- AboutDialog.h 26 May 2006 14:37:41 -0000 1.3 *************** *** 61,65 **** //{{AFX_MSG(AboutDialog) virtual BOOL OnInitDialog(); ! virtual void OnOK(); //}}AFX_MSG --- 61,65 ---- //{{AFX_MSG(AboutDialog) virtual BOOL OnInitDialog(); ! // virtual void OnOK(); //}}AFX_MSG Index: vba.rc2 =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/vba.rc2,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** vba.rc2 13 May 2006 16:32:16 -0000 1.3 --- vba.rc2 26 May 2006 14:37:41 -0000 1.4 *************** *** 35,43 **** BEGIN VALUE "Comments", "VisualBoyAdvance comes with NO WARRANTY. Use it at your own risk.\0" ! VALUE "CompanyName", "None\0" VALUE "FileDescription", "VisualBoyAdvance emulator\0" VALUE "FileVersion", STRFILEVER VALUE "InternalName", "VisualBoyAdvance\0" ! VALUE "LegalCopyright", "Copyright © 2004 Forgotten and the VBA team\0" VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", "VisualBoyAdvance.exe\0" --- 35,43 ---- BEGIN VALUE "Comments", "VisualBoyAdvance comes with NO WARRANTY. Use it at your own risk.\0" ! VALUE "CompanyName", "http://vba.ngemu.com/\0" VALUE "FileDescription", "VisualBoyAdvance emulator\0" VALUE "FileVersion", STRFILEVER VALUE "InternalName", "VisualBoyAdvance\0" ! VALUE "LegalCopyright", "Copyright © 2006 VBA development team\0" VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", "VisualBoyAdvance.exe\0" Index: vba.rc =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/vba.rc,v retrieving revision 1.53 retrieving revision 1.54 diff -C2 -d -r1.53 -r1.54 *** vba.rc 13 May 2006 16:32:16 -0000 1.53 --- vba.rc 26 May 2006 14:37:41 -0000 1.54 *************** *** 45,53 **** BEGIN VALUE "Comments", "VisualBoyAdvance comes with NO WARRANTY. Use it at your own risk." ! VALUE "CompanyName", "None" VALUE "FileDescription", "VisualBoyAdvance emulator" VALUE "FileVersion", "1, 8, 0, 600" VALUE "InternalName", "VisualBoyAdvance" ! VALUE "LegalCopyright", "Copyright © 2004 Forgotten and the VBA team" VALUE "OriginalFilename", "VisualBoyAdvance.exe" VALUE "PrivateBuild", "0" --- 45,53 ---- BEGIN VALUE "Comments", "VisualBoyAdvance comes with NO WARRANTY. Use it at your own risk." ! VALUE "CompanyName", "http://vba.ngemu.com/" VALUE "FileDescription", "VisualBoyAdvance emulator" VALUE "FileVersion", "1, 8, 0, 600" VALUE "InternalName", "VisualBoyAdvance" ! VALUE "LegalCopyright", "Copyright © 2006 VBA development team" VALUE "OriginalFilename", "VisualBoyAdvance.exe" VALUE "PrivateBuild", "0" *************** *** 126,148 **** END ! IDD_ABOUT DIALOG 0, 0, 164, 93 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU ! CAPTION "About VisualBoyAdvance" ! FONT 8, "MS Sans Serif" BEGIN ! DEFPUSHBUTTON "OK",IDOK,56,72,50,14 ! ICON 101,IDC_STATIC,5,12,21,20 ! CTEXT "VisualBoyAdvance Emulator",IDC_STATIC,14,7,134,8 ! CTEXT "Copyright (c) 2004 Forgotten and the VBA team",IDC_STATIC,6,35,150,8 ! CTEXT "http://vba.ngemu.com",IDC_URL,43,55,76,8 ! CTEXT "Contribution by Costis",IDC_STATIC,30,45,102,8 ! CTEXT "Version",IDC_STATIC,46,16,70,8 ! CTEXT "",IDC_VERSION,60,25,43,8,SS_NOPREFIX END ! IDD_DIRECTORIES DIALOG 0, 0, 284, 129 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Directories" ! FONT 8, "MS Sans Serif" BEGIN PUSHBUTTON "Browse...",IDC_ROM_DIR,174,7,50,14 --- 126,147 ---- END ! IDD_ABOUT DIALOGEX 0, 0, 154, 78 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU ! CAPTION "About" ! FONT 8, "MS Sans Serif", 0, 0, 0x0 BEGIN ! ICON "IDI_ICON",IDC_STATIC,6,6,21,20 ! CTEXT "VisualBoyAdvance Emulator",IDC_STATIC,30,6,120,8 ! CTEXT "Copyright © 2006 VBA development team",IDC_STATIC,6,36,144,8 ! CTEXT "http://vba.ngemu.com",IDC_URL,6,66,144,8 ! CTEXT "Contribution by Costis",IDC_STATIC,6,48,144,8 ! CTEXT "Version",IDC_STATIC,30,18,60,8 ! CTEXT "",IDC_VERSION,90,18,60,8,SS_NOPREFIX END ! IDD_DIRECTORIES DIALOGEX 0, 0, 284, 129 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Directories" ! FONT 8, "MS Sans Serif", 0, 0, 0x0 BEGIN PUSHBUTTON "Browse...",IDC_ROM_DIR,174,7,50,14 *************** *** 157,166 **** LTEXT "Save Game:",IDC_STATIC,7,66,40,8 LTEXT "Capture:",IDC_STATIC,7,85,28,8 ! EDITTEXT IDC_ROM_PATH,49,7,121,14,ES_AUTOHSCROLL | WS_DISABLED ! EDITTEXT IDC_BATTERY_PATH,49,45,121,14,ES_AUTOHSCROLL | WS_DISABLED ! EDITTEXT IDC_SAVE_PATH,49,64,121,14,ES_AUTOHSCROLL | WS_DISABLED ! EDITTEXT IDC_CAPTURE_PATH,49,83,121,14,ES_AUTOHSCROLL | WS_DISABLED LTEXT "GB ROM:",IDC_STATIC,7,28,32,8 ! EDITTEXT IDC_GBROM_PATH,49,26,121,14,ES_AUTOHSCROLL | WS_DISABLED PUSHBUTTON "Reset",IDC_ROM_DIR_RESET,228,6,50,14 PUSHBUTTON "Reset",IDC_GBROM_DIR_RESET,228,25,50,14 --- 156,165 ---- LTEXT "Save Game:",IDC_STATIC,7,66,40,8 LTEXT "Capture:",IDC_STATIC,7,85,28,8 ! EDITTEXT IDC_ROM_PATH,49,7,121,14,ES_AUTOHSCROLL ! EDITTEXT IDC_BATTERY_PATH,49,45,121,14,ES_AUTOHSCROLL ! EDITTEXT IDC_SAVE_PATH,49,64,121,14,ES_AUTOHSCROLL ! EDITTEXT IDC_CAPTURE_PATH,49,83,121,14,ES_AUTOHSCROLL LTEXT "GB ROM:",IDC_STATIC,7,28,32,8 ! EDITTEXT IDC_GBROM_PATH,49,26,121,14,ES_AUTOHSCROLL PUSHBUTTON "Reset",IDC_ROM_DIR_RESET,228,6,50,14 PUSHBUTTON "Reset",IDC_GBROM_DIR_RESET,228,25,50,14 *************** *** 1105,1111 **** BEGIN LEFTMARGIN, 7 ! RIGHTMARGIN, 157 TOPMARGIN, 7 ! BOTTOMMARGIN, 86 END --- 1104,1110 ---- BEGIN LEFTMARGIN, 7 ! RIGHTMARGIN, 147 TOPMARGIN, 7 ! BOTTOMMARGIN, 71 END Index: resource.h =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/resource.h,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** resource.h 13 May 2006 16:32:16 -0000 1.41 --- resource.h 26 May 2006 14:37:41 -0000 1.42 *************** *** 45,49 **** #define IDS_CBA_CODE_WARNING 40 #define IDS_OUT_OF_MEMORY 41 - #define IDI_ICON 101 #define IDD_REGISTERS 102 #define IDD_DEBUG 103 --- 45,48 ---- Index: AboutDialog.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/AboutDialog.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** AboutDialog.cpp 13 May 2004 15:06:49 -0000 1.3 --- AboutDialog.cpp 26 May 2006 14:37:41 -0000 1.4 *************** *** 75,83 **** // EXCEPTION: OCX Property Pages should return FALSE } - - void AboutDialog::OnOK() - { - // TODO: Add extra validation here - - CDialog::OnOK(); - } --- 75,76 ---- |
|
From: Spacy <sp...@us...> - 2006-05-26 14:37:47
|
Update of /cvsroot/vba/VisualBoyAdvance/win32 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10723/win32 Modified Files: vba_vs2005.suo vba_vs2005.vcproj Log Message: updated about dialog Index: vba_vs2005.vcproj =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/win32/vba_vs2005.vcproj,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** vba_vs2005.vcproj 13 May 2006 16:25:15 -0000 1.1 --- vba_vs2005.vcproj 26 May 2006 14:37:41 -0000 1.2 *************** *** 2521,2524 **** --- 2521,2528 ---- </FileConfiguration> </File> + <File + RelativePath="..\src\win32\vbavista.ico" + > + </File> </Filter> <Filter *************** *** 4768,4776 **** </Filter> </Filter> </Files> <Globals> <Global Name="RESOURCE_FILE" ! Value="\Dev\VisualBoyAdvance\src\win32\vba.rc" /> </Globals> --- 4772,4784 ---- </Filter> </Filter> + <File + RelativePath="..\src\win32\VisualBoyAdvance.exe.manifest" + > + </File> </Files> <Globals> <Global Name="RESOURCE_FILE" ! Value="\Dokumente und Einstellungen\Spacy\Eigene Dateien\dev\VisualBoyAdvance\src\win32\vba.rc" /> </Globals> Index: vba_vs2005.suo =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/win32/vba_vs2005.suo,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsVt1NC5 and /tmp/cvsYFzSg2 differ |
|
From: Spacy <sp...@us...> - 2006-05-26 14:32:38
|
Update of /cvsroot/vba/VisualBoyAdvance In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10279 Modified Files: INSTALL Log Message: corrected informations Index: INSTALL =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/INSTALL,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** INSTALL 13 May 2006 16:23:15 -0000 1.5 --- INSTALL 26 May 2006 14:32:26 -0000 1.6 *************** *** 70,89 **** Needed software: ! - Microsoft Visual C++ 2005 > http://msdn.microsoft.com/visualc/ > You do not need the DLL runtimes and the .NET Framework ! - Microsoft Platform SDK > http://www.microsoft.com/downloads/details.aspx?FamilyId=E15438AC-60BE-41BD-AA14-7F1E0F19CA0D&displaylang=en ! - Microsoft DirectX 9.0 SDK > http://msdn.microsoft.com/directx/sdk/ ! - Yasm > http://www.tortall.net/projects/yasm/ > Unpack it anywhere on your pc, rename the exe to "yasm.exe" and add it to "Tools>Options>Projects and Solutions>VC++ Directories>Executable files" ! - AMD CodeAnalyst > http://developer.amd.com/cawin.aspx?session_id=FB$37649@DJEBIGID > Free and easy profiling for AMD CPUs (32bit and 64bit), Visual Studio 2005 plugin ! Those are all needed packages for now. The VBA source also includes the sources of various free libraries for zip, image and skin support. Those can be accessed through the "dependencies" folder in the main --- 70,89 ---- Needed software: ! - Microsoft Visual C++ 2005 (buy) > http://msdn.microsoft.com/visualc/ > You do not need the DLL runtimes and the .NET Framework ! - Microsoft Platform SDK (free, optional) > http://www.microsoft.com/downloads/details.aspx?FamilyId=E15438AC-60BE-41BD-AA14-7F1E0F19CA0D&displaylang=en ! - Microsoft DirectX 9.0 SDK (free) > http://msdn.microsoft.com/directx/sdk/ ! - Yasm (free) > http://www.tortall.net/projects/yasm/ > Unpack it anywhere on your pc, rename the exe to "yasm.exe" and add it to "Tools>Options>Projects and Solutions>VC++ Directories>Executable files" ! - AMD CodeAnalyst (optional) > http://developer.amd.com/cawin.aspx?session_id=FB$37649@DJEBIGID > Free and easy profiling for AMD CPUs (32bit and 64bit), Visual Studio 2005 plugin ! Those are all packages for now. The VBA source also includes the sources of various free libraries for zip, image and skin support. Those can be accessed through the "dependencies" folder in the main |
|
From: Spacy <sp...@us...> - 2006-05-13 16:42:52
|
Update of /cvsroot/vba/VisualBoyAdvance/win32/dependencies/zlib In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10293/win32/dependencies/zlib Added Files: .cvsignore Log Message: --- NEW FILE: .cvsignore --- zlib.vcproj.A2.Spacy.user debug release |
|
From: Spacy <sp...@us...> - 2006-05-13 16:42:19
|
Update of /cvsroot/vba/VisualBoyAdvance/win32/dependencies/libtiff In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10265/win32/dependencies/libtiff Added Files: .cvsignore Log Message: --- NEW FILE: .cvsignore --- libtiff.vcproj.A2.Spacy.user debug release |
|
From: Spacy <sp...@us...> - 2006-05-13 16:41:52
|
Update of /cvsroot/vba/VisualBoyAdvance/win32/dependencies/libpng In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv9939/win32/dependencies/libpng Added Files: .cvsignore Log Message: --- NEW FILE: .cvsignore --- release libpng.vcproj.A2.Spacy.user debug |
|
From: Spacy <sp...@us...> - 2006-05-13 16:41:20
|
Update of /cvsroot/vba/VisualBoyAdvance/win32/dependencies/libjpeg In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv9917/win32/dependencies/libjpeg Added Files: .cvsignore Log Message: --- NEW FILE: .cvsignore --- release debug libjpeg.vcproj.A2.Spacy.user |
|
From: Spacy <sp...@us...> - 2006-05-13 16:40:24
|
Update of /cvsroot/vba/VisualBoyAdvance/win32/dependencies/libjasper In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv9585/win32/dependencies/libjasper Added Files: .cvsignore Log Message: --- NEW FILE: .cvsignore --- libjasper.vcproj.A2.Spacy.user release debug |
|
From: Spacy <sp...@us...> - 2006-05-13 16:39:21
|
Update of /cvsroot/vba/VisualBoyAdvance/win32/dependencies/cximage In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv9239/win32/dependencies/cximage Added Files: .cvsignore Log Message: --- NEW FILE: .cvsignore --- debug release cximage.vcproj.A2.Spacy.user |
|
From: Spacy <sp...@us...> - 2006-05-13 16:38:06
|
Update of /cvsroot/vba/VisualBoyAdvance/win32 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8627/win32 Modified Files: .cvsignore Log Message: added vs2005 outputs to ignore list Index: .cvsignore =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/win32/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** .cvsignore 22 Oct 2002 20:27:46 -0000 1.1 --- .cvsignore 13 May 2006 16:38:00 -0000 1.2 *************** *** 1,3 **** --- 1,6 ---- Debug Release ReleaseNoDev SDLDebug SDLRelease + mfc_release mfc_debug sdl_release sdl_debug GBA.ncb GBA.opt GBA.plg gba_sdl.ncb gba_sdl.opt gba_sdl.plg + vba_vs2005.ncb + vba_vs2005.vcproj.A2.Spacy.user \ No newline at end of file |
|
From: Spacy <sp...@us...> - 2006-05-13 16:32:22
|
Update of /cvsroot/vba/VisualBoyAdvance/src/sdl In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6744/src/sdl Modified Files: SDL.cpp debugger.cpp Log Message: vs2005 compatibility Index: SDL.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/sdl/SDL.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** SDL.cpp 8 May 2006 10:12:44 -0000 1.10 --- SDL.cpp 13 May 2006 16:32:16 -0000 1.11 *************** *** 24,42 **** #include <sys/stat.h> ! #include "AutoBuild.h" #include "SDL.h" ! #include "GBA.h" ! #include "agbprint.h" ! #include "Flash.h" ! #include "Port.h" #include "debugger.h" ! #include "RTC.h" ! #include "Sound.h" ! #include "Text.h" ! #include "unzip.h" ! #include "Util.h" ! #include "gb/GB.h" ! #include "gb/gbGlobals.h" #ifndef WIN32 --- 24,42 ---- #include <sys/stat.h> ! #include "../AutoBuild.h" #include "SDL.h" ! #include "../GBA.h" ! #include "../agbprint.h" ! #include "../Flash.h" ! #include "../Port.h" #include "debugger.h" ! #include "../RTC.h" ! #include "../Sound.h" ! #include "../Text.h" ! #include "../unzip.h" ! #include "../Util.h" ! #include "../gb/GB.h" ! #include "../gb/gbGlobals.h" #ifndef WIN32 *************** *** 51,55 **** # define HAVE_DECL_GETOPT 0 # define __STDC__ 1 ! # include "getopt.h" #else // ! __GNUC__ # define HAVE_DECL_GETOPT 1 --- 51,55 ---- # define HAVE_DECL_GETOPT 0 # define __STDC__ 1 ! # include "../getopt.h" #else // ! __GNUC__ # define HAVE_DECL_GETOPT 1 Index: debugger.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/sdl/debugger.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** debugger.cpp 25 Jun 2005 06:17:52 -0000 1.7 --- debugger.cpp 13 May 2006 16:32:16 -0000 1.8 *************** *** 24,32 **** #include <ctype.h> ! #include "GBA.h" ! #include "Port.h" ! #include "armdis.h" ! #include "elf.h" ! #include "exprNode.h" extern bool debugger; --- 24,32 ---- #include <ctype.h> ! #include "../GBA.h" ! #include "../Port.h" ! #include "../armdis.h" ! #include "../elf.h" ! #include "../exprNode.h" extern bool debugger; *************** *** 1067,1071 **** address &= 0x3ffff; final &= 0x3ffff; ! for(int i = address; i < final; i++) if(freezeWorkRAM[i] == 1) freezeWorkRAM[i] = 0; --- 1067,1071 ---- address &= 0x3ffff; final &= 0x3ffff; ! for(u32 i = address; i < final; i++) if(freezeWorkRAM[i] == 1) freezeWorkRAM[i] = 0; *************** *** 1078,1082 **** address &= 0x7fff; final &= 0x7fff; ! for(int i = address; i < final; i++) if(freezeInternalRAM[i] == 1) freezeInternalRAM[i] = 0; --- 1078,1082 ---- address &= 0x7fff; final &= 0x7fff; ! for(u32 i = address; i < final; i++) if(freezeInternalRAM[i] == 1) freezeInternalRAM[i] = 0; *************** *** 1167,1171 **** address &= 0x3ffff; final &= 0x3ffff; ! for(int i = address; i < final; i++) if(freezeWorkRAM[i] == 2) freezeWorkRAM[i] = 0; --- 1167,1171 ---- address &= 0x3ffff; final &= 0x3ffff; ! for(u32 i = address; i < final; i++) if(freezeWorkRAM[i] == 2) freezeWorkRAM[i] = 0; *************** *** 1178,1182 **** address &= 0x7fff; final &= 0x7fff; ! for(int i = address; i < final; i++) if(freezeInternalRAM[i] == 2) freezeInternalRAM[i] = 0; --- 1178,1182 ---- address &= 0x7fff; final &= 0x7fff; ! for(u32 i = address; i < final; i++) if(freezeInternalRAM[i] == 2) freezeInternalRAM[i] = 0; *************** *** 1604,1608 **** u32 addr = 0; sscanf(args[1], "%x", &addr); ! for(int i = 0; i < 16; i++) { int a = debuggerReadByte(addr); int b = debuggerReadByte(addr+1); --- 1604,1608 ---- u32 addr = 0; sscanf(args[1], "%x", &addr); ! for(int _i = 0; _i < 16; _i++) { int a = debuggerReadByte(addr); int b = debuggerReadByte(addr+1); *************** *** 1640,1644 **** sscanf(args[1], "%x", &addr); addr = addr & 0xfffffffe; ! for(int i = 0; i < 16; i++) { int a = debuggerReadByte(addr); int b = debuggerReadByte(addr+1); --- 1640,1644 ---- sscanf(args[1], "%x", &addr); addr = addr & 0xfffffffe; ! for(int _i = 0; _i < 16; _i++) { int a = debuggerReadByte(addr); int b = debuggerReadByte(addr+1); *************** *** 1676,1680 **** sscanf(args[1], "%x", &addr); addr = addr & 0xfffffffc; ! for(int i = 0; i < 16; i++) { int a = debuggerReadByte(addr); int b = debuggerReadByte(addr+1); --- 1676,1680 ---- sscanf(args[1], "%x", &addr); addr = addr & 0xfffffffc; ! for(int _i = 0; _i < 16; _i++) { int a = debuggerReadByte(addr); int b = debuggerReadByte(addr+1); |
|
From: Spacy <sp...@us...> - 2006-05-13 16:32:19
|
Update of /cvsroot/vba/VisualBoyAdvance/src/win32 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6744/src/win32 Modified Files: AccelEditor.cpp CmdAccelOb.cpp Direct3D.cpp DirectDraw.cpp DirectInput.cpp Joypad.cpp MainWndFile.cpp VBA.cpp VideoMode.cpp resource.h vba.rc vba.rc2 Removed Files: UniVideoModeDlg.cpp UniVideoModeDlg.h Log Message: vs2005 compatibility Index: vba.rc2 =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/vba.rc2,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** vba.rc2 15 May 2004 14:07:51 -0000 1.2 --- vba.rc2 13 May 2006 16:32:16 -0000 1.3 *************** *** 1,4 **** --- 1,15 ---- #ifndef _MAC #include "../AutoBuild.h" + + #if _MSC_VER >= 1400 + // use modern icon + IDI_ICON ICON DISCARDABLE "vbavista.ico" + #else + // use traditional icon + IDI_ICON ICON DISCARDABLE "gbadvance.ico" + #endif + + + ///////////////////////////////////////////////////////////////////////////// // --- UniVideoModeDlg.cpp DELETED --- Index: CmdAccelOb.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/CmdAccelOb.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CmdAccelOb.cpp 4 Nov 2003 14:09:52 -0000 1.2 --- CmdAccelOb.cpp 13 May 2006 16:32:16 -0000 1.3 *************** *** 265,269 **** // modifiers part ! for (int i = 0; i < sizetable(mapVirtSysKeys); i++) { if (m_cVirt & mapVirtSysKeys[i].wKey) { szBuffer += mapVirtSysKeys[i].szKey; --- 265,270 ---- // modifiers part ! int i; ! for (i = 0; i < sizetable(mapVirtSysKeys); i++) { if (m_cVirt & mapVirtSysKeys[i].wKey) { szBuffer += mapVirtSysKeys[i].szKey; Index: DirectInput.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/DirectInput.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** DirectInput.cpp 30 Apr 2006 14:31:17 -0000 1.4 --- DirectInput.cpp 13 May 2006 16:32:16 -0000 1.5 *************** *** 723,727 **** if(dinputDLL) { ! AfxFreeLibrary(dinputDLL); dinputDLL = NULL; } --- 723,731 ---- if(dinputDLL) { ! #ifdef _AFXDLL ! AfxFreeLibrary( dinputDLL ); ! #else ! FreeLibrary( dinputDLL ); ! #endif dinputDLL = NULL; } *************** *** 734,738 **** 0, "VBA.ini"); ! dinputDLL = AfxLoadLibrary("DINPUT.DLL"); HRESULT (WINAPI *DInputCreate)(HINSTANCE,DWORD,LPDIRECTINPUT *,IUnknown *); if(dinputDLL != NULL) { --- 738,747 ---- 0, "VBA.ini"); ! #ifdef _AFXDLL ! dinputDLL = AfxLoadLibrary("dinput.dll"); ! #else ! dinputDLL = LoadLibrary( _T("dinput.dll") ); ! #endif ! HRESULT (WINAPI *DInputCreate)(HINSTANCE,DWORD,LPDIRECTINPUT *,IUnknown *); if(dinputDLL != NULL) { *************** *** 802,806 **** } ! for(int i = 1; i < numDevices; i++) { pDevices[i].device->SetDataFormat(&c_dfDIJoystick); pDevices[i].needed = false; --- 811,816 ---- } ! int i; ! for(i = 1; i < numDevices; i++) { pDevices[i].device->SetDataFormat(&c_dfDIJoystick); pDevices[i].needed = false; Index: MainWndFile.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/MainWndFile.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** MainWndFile.cpp 30 Apr 2006 14:32:53 -0000 1.12 --- MainWndFile.cpp 13 May 2006 16:32:16 -0000 1.13 *************** *** 738,742 **** CFileStatus status; CString str; ! unsigned long time = (unsigned long)-1; int found = 0; --- 738,742 ---- CFileStatus status; CString str; ! __time64_t time = -1; int found = 0; *************** *** 824,828 **** CFileStatus status; CString str; ! unsigned long time = 0; int found = -1; --- 824,828 ---- CFileStatus status; CString str; ! __time64_t time = 0; int found = -1; --- UniVideoModeDlg.h DELETED --- Index: AccelEditor.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/AccelEditor.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** AccelEditor.cpp 13 May 2004 15:06:49 -0000 1.3 --- AccelEditor.cpp 13 May 2006 16:32:16 -0000 1.4 *************** *** 186,190 **** int count = m_commands.GetCount(); ! for (int index = 0; index < count; index++) { wIDCommand = LOWORD(m_commands.GetItemData(index)); --- 186,191 ---- int count = m_commands.GetCount(); ! int index; ! for (index = 0; index < count; index++) { wIDCommand = LOWORD(m_commands.GetItemData(index)); Index: Direct3D.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/Direct3D.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Direct3D.cpp 15 Sep 2004 22:11:19 -0000 1.7 --- Direct3D.cpp 13 May 2006 16:32:16 -0000 1.8 *************** *** 20,26 **** #include "vba.h" ! #define DIRECT3D_VERSION 0x0800 ! #include <d3d8.h> ! #include <d3dx8.h> #include "MainWnd.h" --- 20,26 ---- #include "vba.h" ! #define DIRECT3D_VERSION 0x0900 ! #include <d3d9.h> ! #include <d3dx9.h> #include "MainWnd.h" *************** *** 74,81 **** class Direct3DDisplay : public IDisplay { private: ! HINSTANCE d3dDLL; ! LPDIRECT3D8 pD3D; ! LPDIRECT3DDEVICE8 pDevice; ! LPDIRECT3DTEXTURE8 pTexture; D3DSURFACE_DESC dsdBackBuffer; D3DPRESENT_PARAMETERS dpp; --- 74,80 ---- class Direct3DDisplay : public IDisplay { private: ! LPDIRECT3D9 pD3D; ! LPDIRECT3DDEVICE9 pDevice; ! LPDIRECT3DTEXTURE9 pTexture; D3DSURFACE_DESC dsdBackBuffer; D3DPRESENT_PARAMETERS dpp; *************** *** 110,114 **** Direct3DDisplay::Direct3DDisplay() { - d3dDLL = NULL; pD3D = NULL; pDevice = NULL; --- 109,112 ---- *************** *** 147,155 **** pD3D->Release(); pD3D = NULL; - - if(d3dDLL != NULL) { - FreeLibrary(d3dDLL); - d3dDLL = NULL; - } } } --- 145,148 ---- *************** *** 262,282 **** theApp.adjustDestRect(); - - d3dDLL = LoadLibrary("D3D8.DLL"); - LPDIRECT3D8 (WINAPI *D3DCreate)(UINT); - if(d3dDLL != NULL) { - D3DCreate = (LPDIRECT3D8 (WINAPI *)(UINT)) - GetProcAddress(d3dDLL, "Direct3DCreate8"); ! if(D3DCreate == NULL) { ! theApp.directXMessage("Direct3DCreate8"); ! return FALSE; ! } ! } else { ! theApp.directXMessage("D3D8.DLL"); ! return FALSE; ! } ! ! pD3D = D3DCreate(120); if(pD3D == NULL) { --- 255,261 ---- theApp.adjustDestRect(); ! // load Direct3D v9 ! pD3D = Direct3DCreate9( D3D_SDK_VERSION ); if(pD3D == NULL) { *************** *** 417,429 **** case 0: // point filtering ! pDevice->SetTextureStageState( 0, D3DTSS_MINFILTER, D3DTEXF_POINT ); ! pDevice->SetTextureStageState( 0, D3DTSS_MAGFILTER, D3DTEXF_POINT ); ! pDevice->SetTextureStageState( 0, D3DTSS_MIPFILTER, D3DTEXF_POINT ); break; case 1: ! // bilinear ! pDevice->SetTextureStageState( 0, D3DTSS_MINFILTER, D3DTEXF_LINEAR ); ! pDevice->SetTextureStageState( 0, D3DTSS_MAGFILTER, D3DTEXF_LINEAR ); ! pDevice->SetTextureStageState( 0, D3DTSS_MIPFILTER, D3DTEXF_POINT ); break; } --- 396,406 ---- case 0: // point filtering ! pDevice->SetSamplerState( 0, D3DSAMP_MINFILTER, D3DTEXF_POINT ); ! pDevice->SetSamplerState( 0, D3DSAMP_MAGFILTER, D3DTEXF_POINT ); break; case 1: ! // bilinear filtering ! pDevice->SetSamplerState( 0, D3DSAMP_MINFILTER, D3DTEXF_LINEAR ); ! pDevice->SetSamplerState( 0, D3DSAMP_MAGFILTER, D3DTEXF_LINEAR ); break; } *************** *** 433,439 **** { // Store render target surface desc ! LPDIRECT3DSURFACE8 pBackBuffer; HRESULT hr; ! if(SUCCEEDED(hr = pDevice->GetBackBuffer( 0, D3DBACKBUFFER_TYPE_MONO, &pBackBuffer ))) { pBackBuffer->GetDesc( &dsdBackBuffer ); pBackBuffer->Release(); --- 410,416 ---- { // Store render target surface desc ! LPDIRECT3DSURFACE9 pBackBuffer; HRESULT hr; ! if(SUCCEEDED(hr = pDevice->GetBackBuffer( 0, 0, D3DBACKBUFFER_TYPE_MONO, &pBackBuffer ))) { pBackBuffer->GetDesc( &dsdBackBuffer ); pBackBuffer->Release(); *************** *** 468,476 **** pFont = NULL; } // Create a D3D font using D3DX ! HFONT hFont = CreateFont( 14, 0, 0, 0, FW_BOLD, FALSE, FALSE, FALSE, ! ANSI_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, ! ANTIALIASED_QUALITY, FF_DONTCARE, "Arial" ); ! D3DXCreateFont( pDevice, hFont, &pFont ); } --- 445,451 ---- pFont = NULL; } + // Create a D3D font using D3DX ! D3DXCreateFont( pDevice, 24, 0, FW_BOLD, 1, FALSE, ANSI_CHARSET, OUT_DEFAULT_PRECIS, ANTIALIASED_QUALITY, FF_DONTCARE, "Arial", &pFont ); } *************** *** 492,497 **** } ! static void BlitRect(LPDIRECT3DDEVICE8 lpDevice, ! LPDIRECT3DTEXTURE8 lpSrc, float left, float top, float right, float bottom, --- 467,472 ---- } ! static void BlitRect(LPDIRECT3DDEVICE9 lpDevice, ! LPDIRECT3DTEXTURE9 lpSrc, float left, float top, float right, float bottom, *************** *** 516,520 **** // configure shader for vertex type ! lpDevice->SetVertexShader(D3DFVF_TLVERTEX); // draw the rectangle --- 491,495 ---- // configure shader for vertex type ! lpDevice->SetFVF(D3DFVF_TLVERTEX); // draw the rectangle *************** *** 657,661 **** !theApp.disableStatusMessage && pFont) { D3DCOLOR color = D3DCOLOR_ARGB(255, 255, 0, 0); - pFont->Begin(); RECT r; r.left = 10; --- 632,635 ---- *************** *** 664,669 **** r.bottom = r.top + 20; ! pFont->DrawText(theApp.screenMessageBuffer, -1, &r, 0, color); ! pFont->End(); } else { theApp.screenMessage = false; --- 638,642 ---- r.bottom = r.top + 20; ! pFont->DrawText(NULL, theApp.screenMessageBuffer, -1, &r, 0, color); } else { theApp.screenMessage = false; Index: VideoMode.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/VideoMode.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** VideoMode.cpp 13 May 2004 15:06:55 -0000 1.5 --- VideoMode.cpp 13 May 2006 16:32:16 -0000 1.6 *************** *** 124,128 **** --- 124,132 ---- int winVideoModeSelect(CWnd *pWnd, GUID **guid) { + #ifdef _AFXDLL HINSTANCE h = AfxLoadLibrary("ddraw.dll"); + #else + HMODULE h = LoadLibrary( _T("ddraw.dll") ); + #endif // If ddraw.dll doesn't exist in the search path, *************** *** 184,190 **** if(selected == -1) { ! // If the library was loaded by calling LoadLibrary(), ! // then you must use FreeLibrary() to let go of it. ! AfxFreeLibrary(h); return -1; --- 188,196 ---- if(selected == -1) { ! #ifdef _AFXDLL ! AfxFreeLibrary( h ); ! #else ! FreeLibrary( h ); ! #endif return -1; *************** *** 204,208 **** if(hret != DD_OK) { systemMessage(0, "Error during DirectDrawCreateEx: %08x", hret); ! AfxFreeLibrary(h); return -1; } --- 210,218 ---- if(hret != DD_OK) { systemMessage(0, "Error during DirectDrawCreateEx: %08x", hret); ! #ifdef _AFXDLL ! AfxFreeLibrary( h ); ! #else ! FreeLibrary( h ); ! #endif return -1; } *************** *** 210,214 **** // should not happen.... systemMessage(0, "Error getting DirectDrawCreateEx"); ! AfxFreeLibrary(h); return -1; } --- 220,228 ---- // should not happen.... systemMessage(0, "Error getting DirectDrawCreateEx"); ! #ifdef _AFXDLL ! AfxFreeLibrary( h ); ! #else ! FreeLibrary( h ); ! #endif return -1; } *************** *** 226,230 **** // If the library was loaded by calling LoadLibrary(), // then you must use FreeLibrary() to let go of it. ! AfxFreeLibrary(h); return res; --- 240,248 ---- // If the library was loaded by calling LoadLibrary(), // then you must use FreeLibrary() to let go of it. ! #ifdef _AFXDLL ! AfxFreeLibrary( h ); ! #else ! FreeLibrary( h ); ! #endif return res; Index: VBA.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/VBA.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** VBA.cpp 4 Jan 2006 15:10:33 -0000 1.13 --- VBA.cpp 13 May 2006 16:32:16 -0000 1.14 *************** *** 21,24 **** --- 21,25 ---- #include "stdafx.h" #include <mmsystem.h> + #include <windows.h> #include "AVIWrite.h" *************** *** 415,418 **** --- 416,420 ---- // the specific initialization routines you do not need. + #if _MSC_VER < 1400 #ifdef _AFXDLL Enable3dControls(); // Call this when using MFC in a shared DLL *************** *** 420,423 **** --- 422,426 ---- Enable3dControlsStatic(); // Call this when linking to MFC statically #endif + #endif SetRegistryKey(_T("VBA")); *************** *** 1476,1488 **** DWORD dwVersion = 0; ! hinstDll = AfxLoadLibrary("USER32.DLL"); if(hinstDll) { ! GETMENUBARINFO func = (GETMENUBARINFO)GetProcAddress(hinstDll, ! "GetMenuBarInfo"); if(func) { MENUBARINFO info; ! info.cbSize = sizeof(info); func(AfxGetMainWnd()->GetSafeHwnd(), OBJID_MENU, 0, &info); --- 1479,1494 ---- DWORD dwVersion = 0; ! #ifdef _AFXDLL ! hinstDll = AfxLoadLibrary("user32.dll"); ! #else ! hinstDll = LoadLibrary( _T("user32.dll") ); ! #endif if(hinstDll) { ! GETMENUBARINFO func = (GETMENUBARINFO)GetProcAddress(hinstDll, "GetMenuBarInfo"); if(func) { MENUBARINFO info; ! info.cbSize = sizeof(MENUBARINFO); func(AfxGetMainWnd()->GetSafeHwnd(), OBJID_MENU, 0, &info); *************** *** 1501,1505 **** } } ! AfxFreeLibrary(hinstDll); } } --- 1507,1515 ---- } } ! #ifdef _AFXDLL ! AfxFreeLibrary( hinstDll ); ! #else ! FreeLibrary( hinstDll ); ! #endif } } *************** *** 1898,1902 **** AfxSetResourceHandle(l); if(languageModule != NULL) ! AfxFreeLibrary(languageModule); languageModule = l; } else { --- 1908,1916 ---- AfxSetResourceHandle(l); if(languageModule != NULL) ! #ifdef _AFXDLL ! AfxFreeLibrary( languageModule ); ! #else ! FreeLibrary( languageModule ); ! #endif languageModule = l; } else { *************** *** 1909,1913 **** case 1: if(languageModule != NULL) ! AfxFreeLibrary(languageModule); languageModule = NULL; AfxSetResourceHandle(AfxGetInstanceHandle()); --- 1923,1931 ---- case 1: if(languageModule != NULL) ! #ifdef _AFXDLL ! AfxFreeLibrary( languageModule ); ! #else ! FreeLibrary( languageModule ); ! #endif languageModule = NULL; AfxSetResourceHandle(AfxGetInstanceHandle()); *************** *** 1927,1931 **** AfxSetResourceHandle(l); if(languageModule != NULL) ! AfxFreeLibrary(languageModule); languageModule = l; } --- 1945,1955 ---- AfxSetResourceHandle(l); if(languageModule != NULL) ! { ! #ifdef _AFXDLL ! AfxFreeLibrary( languageModule ); ! #else ! FreeLibrary( languageModule ); ! #endif ! } languageModule = l; } *************** *** 1956,1962 **** CString buffer; ! buffer.Format("vba_%s.dll", name); ! HINSTANCE l = AfxLoadLibrary(buffer); if(l == NULL) { --- 1980,1990 ---- CString buffer; ! buffer.Format( _T("vba_%s.dll"), name); ! #ifdef _AFXDLL ! HINSTANCE l = AfxLoadLibrary( buffer ); ! #else ! HMODULE l = LoadLibrary( buffer ); ! #endif if(l == NULL) { *************** *** 1968,1972 **** buffer.Format("vba_%s.dll", buffer2); ! return AfxLoadLibrary(buffer); } } --- 1996,2004 ---- buffer.Format("vba_%s.dll", buffer2); ! #ifdef _AFXDLL ! return AfxLoadLibrary( buffer ); ! #else ! return LoadLibrary( buffer ); ! #endif } } Index: vba.rc =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/vba.rc,v retrieving revision 1.52 retrieving revision 1.53 diff -C2 -d -r1.52 -r1.53 *** vba.rc 30 Apr 2006 14:34:24 -0000 1.52 --- vba.rc 13 May 2006 16:32:16 -0000 1.53 *************** *** 1,3 **** ! //Microsoft Developer Studio generated resource script. // #include "resource.h" --- 1,3 ---- ! // Microsoft Visual C++ generated resource script. // #include "resource.h" *************** *** 14,17 **** --- 14,71 ---- [...2431 lines suppressed...] IDS_ERROR_CREATING_SOCKET "Error creating socket." --- 2068,2072 ---- END ! STRINGTABLE BEGIN IDS_ERROR_CREATING_SOCKET "Error creating socket." *************** *** 2384,2388 **** END ! STRINGTABLE DISCARDABLE BEGIN IDS_INVALID_INTERVAL_VALUE --- 2089,2093 ---- END ! STRINGTABLE BEGIN IDS_INVALID_INTERVAL_VALUE Index: resource.h =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/resource.h,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** resource.h 4 Jan 2006 15:10:33 -0000 1.40 --- resource.h 13 May 2006 16:32:16 -0000 1.41 *************** *** 1,5 **** //{{NO_DEPENDENCIES}} ! // Microsoft Developer Studio generated include file. ! // Used by VBA.rc // #define IDS_UNSUPPORTED_VBA_SGM 1 --- 1,5 ---- //{{NO_DEPENDENCIES}} ! // Microsoft Visual C++ generated include file. ! // Used by vba.rc // #define IDS_UNSUPPORTED_VBA_SGM 1 *************** *** 758,762 **** #define _APS_NEXT_COMMAND_VALUE 40278 #define _APS_NEXT_CONTROL_VALUE 1256 ! #define _APS_NEXT_SYMED_VALUE 103 #endif #endif --- 758,762 ---- #define _APS_NEXT_COMMAND_VALUE 40278 #define _APS_NEXT_CONTROL_VALUE 1256 ! #define _APS_NEXT_SYMED_VALUE 104 #endif #endif Index: Joypad.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/Joypad.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Joypad.cpp 13 May 2004 15:06:50 -0000 1.4 --- Joypad.cpp 13 May 2006 16:32:16 -0000 1.5 *************** *** 164,168 **** CDialog::OnInitDialog(); ! timerId = SetTimer(0,200,NULL); SetWindowLong(up, GWL_USERDATA,joypad[which][KEY_UP]); --- 164,168 ---- CDialog::OnInitDialog(); ! timerId = SetTimer(0,50,NULL); SetWindowLong(up, GWL_USERDATA,joypad[which][KEY_UP]); Index: DirectDraw.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/DirectDraw.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** DirectDraw.cpp 15 Sep 2004 22:08:53 -0000 1.7 --- DirectDraw.cpp 13 May 2006 16:32:16 -0000 1.8 *************** *** 154,158 **** if(ddrawDLL != NULL) { ! AfxFreeLibrary(ddrawDLL); ddrawDLL = NULL; } --- 154,162 ---- if(ddrawDLL != NULL) { ! #ifdef _AFXDLL ! AfxFreeLibrary( ddrawDLL ); ! #else ! FreeLibrary( ddrawDLL ); ! #endif ddrawDLL = NULL; } *************** *** 266,270 **** guid = theApp.pVideoDriverGUID; ! ddrawDLL = AfxLoadLibrary("DDRAW.DLL"); HRESULT (WINAPI *DDrawCreateEx)(GUID *,LPVOID *,REFIID,IUnknown *); if(ddrawDLL != NULL) { --- 270,279 ---- guid = theApp.pVideoDriverGUID; ! #ifdef _AFXDLL ! ddrawDLL = AfxLoadLibrary("ddraw.dll"); ! #else ! ddrawDLL = LoadLibrary( _T("ddraw.dll") ); ! #endif ! HRESULT (WINAPI *DDrawCreateEx)(GUID *,LPVOID *,REFIID,IUnknown *); if(ddrawDLL != NULL) { |
|
From: Spacy <sp...@us...> - 2006-05-13 16:32:19
|
Update of /cvsroot/vba/VisualBoyAdvance/src/gb In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6744/src/gb Modified Files: GB.cpp gbMemory.cpp Log Message: vs2005 compatibility Index: GB.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/gb/GB.cpp,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** GB.cpp 30 Apr 2006 14:40:02 -0000 1.24 --- GB.cpp 13 May 2006 16:32:15 -0000 1.25 *************** *** 2059,2063 **** { if(strlen(file) > 4) { ! char * p = strrchr(file,'.'); if(p != NULL) { --- 2059,2063 ---- { if(strlen(file) > 4) { ! const char * p = strrchr(file,'.'); if(p != NULL) { *************** *** 2270,2274 **** gbMemory[0xff03] = 0xff; ! for (int i = 0x8; i<0xf; i++) gbMemory[0xff00+i] = 0xff; --- 2270,2275 ---- gbMemory[0xff03] = 0xff; ! int i; ! for (i = 0x8; i<0xf; i++) gbMemory[0xff00+i] = 0xff; Index: gbMemory.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/gb/gbMemory.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** gbMemory.cpp 30 Apr 2006 14:44:16 -0000 1.5 --- gbMemory.cpp 13 May 2006 16:32:15 -0000 1.6 *************** *** 345,349 **** if(diff > 0) { // update the clock according to the last update time ! gbDataMBC3.mapperSeconds += diff % 60; if(gbDataMBC3.mapperSeconds > 59) { gbDataMBC3.mapperSeconds -= 60; --- 345,349 ---- if(diff > 0) { // update the clock according to the last update time ! gbDataMBC3.mapperSeconds += (int)(diff % 60); if(gbDataMBC3.mapperSeconds > 59) { gbDataMBC3.mapperSeconds -= 60; *************** *** 353,357 **** diff /= 60; ! gbDataMBC3.mapperMinutes += diff % 60; if(gbDataMBC3.mapperMinutes > 59) { gbDataMBC3.mapperMinutes -= 60; --- 353,357 ---- diff /= 60; ! gbDataMBC3.mapperMinutes += (int)(diff % 60); if(gbDataMBC3.mapperMinutes > 59) { gbDataMBC3.mapperMinutes -= 60; *************** *** 361,365 **** diff /= 60; ! gbDataMBC3.mapperHours += diff % 24; if(gbDataMBC3.mapperHours > 23) { gbDataMBC3.mapperHours -= 24; --- 361,365 ---- diff /= 60; ! gbDataMBC3.mapperHours += (int)(diff % 24); if(gbDataMBC3.mapperHours > 23) { gbDataMBC3.mapperHours -= 24; *************** *** 368,372 **** diff /= 24; ! gbDataMBC3.mapperDays += diff; if(gbDataMBC3.mapperDays > 255) { if(gbDataMBC3.mapperDays > 511) { --- 368,372 ---- diff /= 24; ! gbDataMBC3.mapperDays += (int)(diff & 0xffffffff); if(gbDataMBC3.mapperDays > 255) { if(gbDataMBC3.mapperDays > 511) { *************** *** 1238,1242 **** if(diff > 0) { // update the clock according to the last update time ! gbDataTAMA5.mapperSeconds += diff % 60; if(gbDataTAMA5.mapperSeconds > 59) { gbDataTAMA5.mapperSeconds -= 60; --- 1238,1242 ---- if(diff > 0) { // update the clock according to the last update time ! gbDataTAMA5.mapperSeconds += (int)(diff % 60); if(gbDataTAMA5.mapperSeconds > 59) { gbDataTAMA5.mapperSeconds -= 60; *************** *** 1246,1250 **** diff /= 60; ! gbDataTAMA5.mapperMinutes += diff % 60; if(gbDataTAMA5.mapperMinutes > 59) { gbDataTAMA5.mapperMinutes -= 60; --- 1246,1250 ---- diff /= 60; ! gbDataTAMA5.mapperMinutes += (int)(diff % 60); if(gbDataTAMA5.mapperMinutes > 59) { gbDataTAMA5.mapperMinutes -= 60; *************** *** 1254,1258 **** diff /= 60; ! gbDataTAMA5.mapperHours += diff % 24; diff /= 24; if(gbDataTAMA5.mapperHours > 23) { --- 1254,1258 ---- diff /= 60; ! gbDataTAMA5.mapperHours += (int)(diff % 24); diff /= 24; if(gbDataTAMA5.mapperHours > 23) { *************** *** 1262,1266 **** } ! int days = diff; while (days) { --- 1262,1266 ---- } ! time_t days = diff; while (days) { |
|
From: Spacy <sp...@us...> - 2006-05-13 16:32:18
|
Update of /cvsroot/vba/VisualBoyAdvance/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6744/src Modified Files: GBA.cpp Util.cpp expr-lex.cpp exprNode.cpp Log Message: vs2005 compatibility Index: expr-lex.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/expr-lex.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** expr-lex.cpp 6 Jun 2003 14:17:21 -0000 1.2 --- expr-lex.cpp 13 May 2006 16:32:15 -0000 1.3 *************** *** 1286,1290 **** b->yy_is_interactive = 0; #else ! b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0; #endif #endif --- 1286,1290 ---- b->yy_is_interactive = 0; #else ! b->yy_is_interactive = file ? (isatty( _fileno(file) ) > 0) : 0; #endif #endif Index: GBA.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/GBA.cpp,v retrieving revision 1.65 retrieving revision 1.66 diff -C2 -d -r1.65 -r1.66 *** GBA.cpp 30 Apr 2006 14:36:59 -0000 1.65 --- GBA.cpp 13 May 2006 16:32:15 -0000 1.66 *************** *** 1364,1368 **** { if(strlen(file) > 4) { ! char * p = strrchr(file,'.'); if(p != NULL) { --- 1364,1368 ---- { if(strlen(file) > 4) { ! const char * p = strrchr(file,'.'); if(p != NULL) { *************** *** 1379,1383 **** cpuIsMultiBoot = false; if(strlen(file) > 4) { ! char * p = strrchr(file,'.'); if(p != NULL) { --- 1379,1383 ---- cpuIsMultiBoot = false; if(strlen(file) > 4) { ! const char * p = strrchr(file,'.'); if(p != NULL) { *************** *** 1403,1407 **** { if(strlen(file) > 4) { ! char * p = strrchr(file,'.'); if(p != NULL) { --- 1403,1407 ---- { if(strlen(file) > 4) { ! const char * p = strrchr(file,'.'); if(p != NULL) { *************** *** 1423,1427 **** { if(strlen(file) > 4) { ! char * p = strrchr(file,'.'); if(p != NULL) { --- 1423,1427 ---- { if(strlen(file) > 4) { ! const char * p = strrchr(file,'.'); if(p != NULL) { Index: exprNode.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/exprNode.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** exprNode.cpp 13 May 2004 15:06:45 -0000 1.3 --- exprNode.cpp 13 May 2006 16:32:15 -0000 1.4 *************** *** 51,55 **** { Node *n = (Node *)calloc(1, sizeof(Node)); ! n->name = strdup(yytext); exprNodeClean(n->name); --- 51,55 ---- { Node *n = (Node *)calloc(1, sizeof(Node)); ! n->name = _strdup(yytext); exprNodeClean(n->name); Index: Util.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/Util.cpp,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** Util.cpp 30 Apr 2006 14:37:27 -0000 1.25 --- Util.cpp 13 May 2006 16:32:15 -0000 1.26 *************** *** 487,491 **** cpuIsMultiBoot = false; if(strlen(file) > 4) { ! char * p = strrchr(file,'.'); if(p != NULL) { --- 487,491 ---- cpuIsMultiBoot = false; if(strlen(file) > 4) { ! const char * p = strrchr(file,'.'); if(p != NULL) { *************** *** 511,515 **** { if(strlen(file) > 4) { ! char * p = strrchr(file,'.'); if(p != NULL) { --- 511,515 ---- { if(strlen(file) > 4) { ! const char * p = strrchr(file,'.'); if(p != NULL) { *************** *** 531,535 **** { if(strlen(file) > 4) { ! char * p = strrchr(file,'.'); if(p != NULL) { --- 531,535 ---- { if(strlen(file) > 4) { ! const char * p = strrchr(file,'.'); if(p != NULL) { *************** *** 561,565 **** { if(strlen(file) > 3) { ! char * p = strrchr(file,'.'); if(p != NULL) { --- 561,565 ---- { if(strlen(file) > 3) { ! const char * p = strrchr(file,'.'); if(p != NULL) { |
|
From: Spacy <sp...@us...> - 2006-05-13 16:28:13
|
Update of /cvsroot/vba/VisualBoyAdvance/win32/sdl_release In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv5778/sdl_release Log Message: Directory /cvsroot/vba/VisualBoyAdvance/win32/sdl_release added to the repository |
|
From: Spacy <sp...@us...> - 2006-05-13 16:28:10
|
Update of /cvsroot/vba/VisualBoyAdvance/win32/sdl_debug In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv5778/sdl_debug Log Message: Directory /cvsroot/vba/VisualBoyAdvance/win32/sdl_debug added to the repository |
