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
|
|
From: Spacy <sp...@us...> - 2006-08-18 13:49:12
|
Update of /cvsroot/vba/VisualBoyAdvance/win32/dependencies/libpng In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv2675/win32/dependencies/libpng Modified Files: libpng.vcproj Log Message: SSE2->SSE1 Index: libpng.vcproj =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/win32/dependencies/libpng/libpng.vcproj,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** libpng.vcproj 11 Aug 2006 10:56:32 -0000 1.3 --- libpng.vcproj 18 Aug 2006 13:48:50 -0000 1.4 *************** *** 108,112 **** PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" RuntimeLibrary="0" ! EnableEnhancedInstructionSet="0" DisableLanguageExtensions="true" UsePrecompiledHeader="0" --- 108,112 ---- PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" RuntimeLibrary="0" ! EnableEnhancedInstructionSet="1" DisableLanguageExtensions="true" UsePrecompiledHeader="0" |
|
From: Spacy <sp...@us...> - 2006-08-11 10:58:42
|
Update of /cvsroot/vba/VisualBoyAdvance/src/win32 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv26812/src/win32 Modified Files: Direct3D.cpp MainWndOptions.cpp OpenGL.cpp Log Message: No more border corruption in OpenGL. OpenGL supports aspect ratio correct scaling, OpenGL & Direct3D instantly respond to MaxScale / StretchToFit commands. Index: MainWndOptions.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/MainWndOptions.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** MainWndOptions.cpp 6 Aug 2006 12:40:35 -0000 1.14 --- MainWndOptions.cpp 11 Aug 2006 10:58:39 -0000 1.15 *************** *** 1762,1765 **** --- 1762,1769 ---- dlg.DoModal(); + + if( theApp.display ) { + theApp.display->setOption( _T("maxScale"), theApp.fsMaxScale ); + } } Index: OpenGL.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/OpenGL.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** OpenGL.cpp 5 Aug 2006 17:30:22 -0000 1.9 --- OpenGL.cpp 11 Aug 2006 10:58:39 -0000 1.10 *************** *** 60,63 **** --- 60,64 ---- float size; u8 *filterData; + RECT destRect; bool failed; *************** *** 66,69 **** --- 67,71 ---- void updateFiltering( int value ); void setVSync( int interval = 1 ); + void calculateDestRect( int w, int h ); public: *************** *** 368,371 **** --- 370,375 ---- void OpenGLDisplay::render() { + clear(); + int pitch = theApp.filterWidth * 4 + 4; u8 *data = pix + ( theApp.sizeX + 1 ) * 4; *************** *** 386,395 **** // Texturemap complete texture to surface // so we have free scaling and antialiasing ! int mult = 1; ! if( theApp.filterFunction) { ! glPixelStorei( GL_UNPACK_ROW_LENGTH, 2 * theApp.sizeX ); mult = 2; } else { glPixelStorei( GL_UNPACK_ROW_LENGTH, theApp.sizeX + 1 ); } --- 390,400 ---- // Texturemap complete texture to surface // so we have free scaling and antialiasing ! int mult; ! if( theApp.filterFunction ) { ! glPixelStorei( GL_UNPACK_ROW_LENGTH, theApp.sizeX << 1 ); mult = 2; } else { glPixelStorei( GL_UNPACK_ROW_LENGTH, theApp.sizeX + 1 ); + mult = 1; } *************** *** 404,429 **** GL_UNSIGNED_BYTE, data ); ! if( theApp.glType == 0 ) { glBegin( GL_TRIANGLE_STRIP ); glTexCoord2f( 0.0f, 0.0f ); glVertex3i( 0, 0, 0 ); ! glTexCoord2f( (float)mult * (float)theApp.sizeX / size, 0.0f ); glVertex3i( theApp.surfaceSizeX, 0, 0 ); ! glTexCoord2f( 0.0f, (float)mult * (float)theApp.sizeY / size ); glVertex3i( 0, theApp.surfaceSizeY, 0 ); ! glTexCoord2f( (float)mult * (float)theApp.sizeX / size, (float)mult * (float)theApp.sizeY / size ); glVertex3i( theApp.surfaceSizeX, theApp.surfaceSizeY, 0 ); glEnd(); } else { glBegin( GL_QUADS ); glTexCoord2f( 0.0f, 0.0f ); glVertex3i( 0, 0, 0 ); ! glTexCoord2f( (float)mult * (float)theApp.sizeX / size, 0.0f ); glVertex3i( theApp.surfaceSizeX, 0, 0 ); ! glTexCoord2f( (float)mult * (float)theApp.sizeX / size, (float)mult * (float)theApp.sizeY / size ); glVertex3i( theApp.surfaceSizeX, theApp.surfaceSizeY, 0 ); ! glTexCoord2f( 0.0f, (float)mult * (float)theApp.sizeY / size ); glVertex3i( 0, theApp.surfaceSizeY, 0 ); glEnd(); } --- 409,444 ---- GL_UNSIGNED_BYTE, data ); ! if( theApp.glType == 0 ) { glBegin( GL_TRIANGLE_STRIP ); + glTexCoord2f( 0.0f, 0.0f ); glVertex3i( 0, 0, 0 ); ! ! glTexCoord2f( (float)(mult * theApp.sizeX) / size, 0.0f ); glVertex3i( theApp.surfaceSizeX, 0, 0 ); ! ! glTexCoord2f( 0.0f, (float)(mult * theApp.sizeY) / size ); glVertex3i( 0, theApp.surfaceSizeY, 0 ); ! ! glTexCoord2f( (float)(mult * theApp.sizeX) / size, (float)(mult * theApp.sizeY) / size ); glVertex3i( theApp.surfaceSizeX, theApp.surfaceSizeY, 0 ); + glEnd(); } else { glBegin( GL_QUADS ); + glTexCoord2f( 0.0f, 0.0f ); glVertex3i( 0, 0, 0 ); ! ! glTexCoord2f( (float)(mult * theApp.sizeX) / size, 0.0f ); glVertex3i( theApp.surfaceSizeX, 0, 0 ); ! ! glTexCoord2f( (float)(mult * theApp.sizeX) / size, (float)(mult * theApp.sizeY) / size ); glVertex3i( theApp.surfaceSizeX, theApp.surfaceSizeY, 0 ); ! ! glTexCoord2f( 0.0f, (float)(mult * theApp.sizeY) / size ); glVertex3i( 0, theApp.surfaceSizeY, 0 ); + glEnd(); } *************** *** 479,482 **** --- 494,500 ---- break; } + + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP ); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP ); } *************** *** 484,499 **** void OpenGLDisplay::initializeMatrices( int w, int h ) { ! glViewport( 0, 0, w, h ); glMatrixMode( GL_PROJECTION ); glLoadIdentity(); glOrtho( ! 0.0f, ! (GLdouble)(w), ! (GLdouble)(h), ! 0.0f, 0.0f, 1.0f ); ! glMatrixMode(GL_MODELVIEW); glLoadIdentity(); --- 502,526 ---- void OpenGLDisplay::initializeMatrices( int w, int h ) { ! if( theApp.fullScreenStretch ) { ! glViewport( 0, 0, w, h ); ! } else { ! calculateDestRect( w, h ); ! glViewport( ! destRect.left, ! destRect.top, ! destRect.right - destRect.left, ! destRect.bottom - destRect.top ); ! } glMatrixMode( GL_PROJECTION ); glLoadIdentity(); glOrtho( ! /* left */ 1.0f, ! /* right */ (GLdouble)(w - 1), ! /* bottom */ (GLdouble)(h - 1), ! /* top */ 1.0f, 0.0f, 1.0f ); ! glMatrixMode(GL_MODELVIEW); glLoadIdentity(); *************** *** 578,581 **** --- 605,633 ---- + void OpenGLDisplay::calculateDestRect( int w, int h ) + { + float scaleX = (float)w / (float)width; + float scaleY = (float)h / (float)height; + float min = (scaleX < scaleY) ? scaleX : scaleY; + if( theApp.fsMaxScale && (min > theApp.fsMaxScale) ) { + min = (float)theApp.fsMaxScale; + } + destRect.left = 0; + destRect.top = 0; + destRect.right = (LONG)(width * min); + destRect.bottom = (LONG)(height * min); + if( destRect.right != w ) { + LONG diff = (w - destRect.right) / 2; + destRect.left += diff; + destRect.right += diff; + } + if( destRect.bottom != h ) { + LONG diff = (h - destRect.bottom) / 2; + destRect.top += diff; + destRect.bottom += diff; + } + } + + void OpenGLDisplay::setOption( const char *option, int value ) { *************** *** 587,590 **** --- 639,650 ---- updateFiltering( value ); } + + if( !_tcscmp( option, _T("maxScale") ) ) { + initializeMatrices( theApp.dest.right, theApp.dest.bottom ); + } + + if( !_tcscmp( option, _T("fullScreenStretch") ) ) { + initializeMatrices( theApp.dest.right, theApp.dest.bottom ); + } } Index: Direct3D.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/Direct3D.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** Direct3D.cpp 5 Aug 2006 17:30:07 -0000 1.13 --- Direct3D.cpp 11 Aug 2006 10:58:39 -0000 1.14 *************** *** 386,391 **** copyImage( pix, lr.pBits, theApp.sizeX, theApp.sizeY, lr.Pitch, systemColorDepth ); } else { ! theApp.filterFunction( pix + (theApp.filterWidth * (systemColorDepth>>3)) + 4, ! theApp.filterWidth * (systemColorDepth>>3) + 4, (u8*)theApp.delta, (u8*)lr.pBits, --- 386,392 ---- copyImage( pix, lr.pBits, theApp.sizeX, theApp.sizeY, lr.Pitch, systemColorDepth ); } else { ! u32 pitch = theApp.filterWidth * (systemColorDepth>>3) + 4; ! theApp.filterFunction( pix + pitch, ! pitch, (u8*)theApp.delta, (u8*)lr.pBits, *************** *** 602,605 **** --- 603,610 ---- } } + + if( !_tcscmp( option, _T("maxScale") ) ) { + calculateDestRect(); + } } |
|
From: Spacy <sp...@us...> - 2006-08-11 10:56:38
|
Update of /cvsroot/vba/VisualBoyAdvance/win32/dependencies/zlib In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv25255/win32/dependencies/zlib Modified Files: zlib.vcproj Log Message: More optimized release build. Index: zlib.vcproj =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/win32/dependencies/zlib/zlib.vcproj,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** zlib.vcproj 12 Jun 2006 22:03:24 -0000 1.2 --- zlib.vcproj 11 Aug 2006 10:56:33 -0000 1.3 *************** *** 46,50 **** DisableLanguageExtensions="true" UsePrecompiledHeader="0" ! WarningLevel="0" Detect64BitPortabilityProblems="false" DebugInformationFormat="4" --- 46,50 ---- DisableLanguageExtensions="true" UsePrecompiledHeader="0" ! WarningLevel="1" Detect64BitPortabilityProblems="false" DebugInformationFormat="4" *************** *** 105,113 **** PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" RuntimeLibrary="0" ! EnableEnhancedInstructionSet="1" DisableLanguageExtensions="true" UsePrecompiledHeader="0" PrecompiledHeaderThrough="" ! WarningLevel="0" Detect64BitPortabilityProblems="false" DebugInformationFormat="3" --- 105,113 ---- PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" RuntimeLibrary="0" ! EnableEnhancedInstructionSet="0" DisableLanguageExtensions="true" UsePrecompiledHeader="0" PrecompiledHeaderThrough="" ! WarningLevel="1" Detect64BitPortabilityProblems="false" DebugInformationFormat="3" |
|
From: Spacy <sp...@us...> - 2006-08-11 10:56:37
|
Update of /cvsroot/vba/VisualBoyAdvance/win32 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv25255/win32 Modified Files: vba_vs2005.suo vba_vs2005.vcproj Log Message: More optimized release build. Index: vba_vs2005.vcproj =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/win32/vba_vs2005.vcproj,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** vba_vs2005.vcproj 6 Aug 2006 12:40:40 -0000 1.11 --- vba_vs2005.vcproj 11 Aug 2006 10:56:34 -0000 1.12 *************** *** 82,86 **** <Tool Name="VCManifestTool" ! EmbedManifest="false" /> <Tool --- 82,86 ---- <Tool Name="VCManifestTool" ! EmbedManifest="true" /> <Tool *************** *** 110,114 **** ConfigurationType="1" UseOfMFC="1" ! WholeProgramOptimization="0" > <Tool --- 110,114 ---- ConfigurationType="1" UseOfMFC="1" ! WholeProgramOptimization="2" > <Tool *************** *** 130,139 **** <Tool Name="VCCLCompilerTool" ! InlineFunctionExpansion="1" FavorSizeOrSpeed="1" AdditionalIncludeDirectories=".\dependencies\zlib;.\dependencies\libpng;.\dependencies\sdl" PreprocessorDefinitions="WIN32;WINVER=0x0500;NDEBUG;_WINDOWS;OEMRESOURCE;MMX;ASM;FINAL_VERSION;BKPT_SUPPORT;_CRT_SECURE_NO_DEPRECATE;NOSKINS" RuntimeLibrary="0" ! EnableEnhancedInstructionSet="1" UsePrecompiledHeader="0" WarningLevel="3" --- 130,144 ---- <Tool Name="VCCLCompilerTool" ! AdditionalOptions="/D_ST_MODEL
/D_SECURE_SCL=0" ! Optimization="2" ! InlineFunctionExpansion="2" FavorSizeOrSpeed="1" + WholeProgramOptimization="true" AdditionalIncludeDirectories=".\dependencies\zlib;.\dependencies\libpng;.\dependencies\sdl" PreprocessorDefinitions="WIN32;WINVER=0x0500;NDEBUG;_WINDOWS;OEMRESOURCE;MMX;ASM;FINAL_VERSION;BKPT_SUPPORT;_CRT_SECURE_NO_DEPRECATE;NOSKINS" RuntimeLibrary="0" ! BufferSecurityCheck="false" ! EnableEnhancedInstructionSet="2" ! FloatingPointModel="2" UsePrecompiledHeader="0" WarningLevel="3" *************** *** 165,168 **** --- 170,174 ---- OptimizeReferences="2" EnableCOMDATFolding="2" + LinkTimeCodeGeneration="4" TargetMachine="1" /> *************** *** 172,176 **** <Tool Name="VCManifestTool" ! EmbedManifest="false" /> <Tool --- 178,182 ---- <Tool Name="VCManifestTool" ! EmbedManifest="true" /> <Tool Index: vba_vs2005.suo =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/win32/vba_vs2005.suo,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 Binary files /tmp/cvsZfpp4g and /tmp/cvsCgJV1s differ |
|
From: Spacy <sp...@us...> - 2006-08-11 10:56:37
|
Update of /cvsroot/vba/VisualBoyAdvance/win32/dependencies/libpng In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv25255/win32/dependencies/libpng Modified Files: libpng.vcproj Log Message: More optimized release build. Index: libpng.vcproj =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/win32/dependencies/libpng/libpng.vcproj,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** libpng.vcproj 12 Jun 2006 22:03:24 -0000 1.2 --- libpng.vcproj 11 Aug 2006 10:56:32 -0000 1.3 *************** *** 47,51 **** DisableLanguageExtensions="true" UsePrecompiledHeader="0" ! WarningLevel="0" Detect64BitPortabilityProblems="false" DebugInformationFormat="4" --- 47,51 ---- DisableLanguageExtensions="true" UsePrecompiledHeader="0" ! WarningLevel="1" Detect64BitPortabilityProblems="false" DebugInformationFormat="4" *************** *** 108,115 **** PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" RuntimeLibrary="0" ! EnableEnhancedInstructionSet="1" DisableLanguageExtensions="true" UsePrecompiledHeader="0" ! WarningLevel="0" Detect64BitPortabilityProblems="false" DebugInformationFormat="3" --- 108,115 ---- PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" RuntimeLibrary="0" ! EnableEnhancedInstructionSet="0" DisableLanguageExtensions="true" UsePrecompiledHeader="0" ! WarningLevel="1" Detect64BitPortabilityProblems="false" DebugInformationFormat="3" |
Update of /cvsroot/vba/VisualBoyAdvance/src/win32 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv26844/src/win32 Modified Files: DirectSound.cpp MainWnd.cpp MainWnd.h MainWndOptions.cpp VBA.cpp VBA.h resource.h vba.rc Log Message: Added option to enable/disable hardware acceleration for DirectSound buffers. This fixes buggy hardware drivers. Index: VBA.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/VBA.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** VBA.cpp 5 Aug 2006 17:28:04 -0000 1.22 --- VBA.cpp 6 Aug 2006 12:40:35 -0000 1.23 *************** *** 267,270 **** --- 267,271 ---- soundRecording = false; soundRecorder = NULL; + dsoundDisableHardwareAcceleration = true; sound = NULL; aviRecording = false; Index: DirectSound.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/DirectSound.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** DirectSound.cpp 4 Jun 2006 17:13:56 -0000 1.4 --- DirectSound.cpp 6 Aug 2006 12:40:35 -0000 1.5 *************** *** 18,21 **** --- 18,22 ---- // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + // MFC #include "stdafx.h" *************** *** 30,37 **** #include "../Sound.h" ! // DirectSound includes ! #include <mmsystem.h> ! #include <mmreg.h> ! #include <dsound.h> --- 31,38 ---- #include "../Sound.h" ! // DirectSound8 ! #include <Dsound.h> ! #pragma comment( lib, "Dsound" ) ! #pragma comment( lib, "Dxguid" ) *************** *** 141,144 **** --- 142,148 ---- dsbdesc.dwSize = sizeof(DSBUFFERDESC); dsbdesc.dwFlags = DSBCAPS_PRIMARYBUFFER; + if( theApp.dsoundDisableHardwareAcceleration ) { + dsbdesc.dwFlags |= DSBCAPS_LOCSOFTWARE; + } if( FAILED( hr = pDirectSound->CreateSoundBuffer( &dsbdesc, &dsbPrimary, NULL ) ) ) { *************** *** 182,185 **** --- 186,192 ---- dsbdesc.dwSize = sizeof(DSBUFFERDESC); dsbdesc.dwFlags = DSBCAPS_GETCURRENTPOSITION2 | DSBCAPS_CTRLPOSITIONNOTIFY; + if( theApp.dsoundDisableHardwareAcceleration ) { + dsbdesc.dwFlags |= DSBCAPS_LOCSOFTWARE; + } dsbdesc.dwBufferBytes = soundBufferTotalLen; dsbdesc.lpwfxFormat = &wfx; Index: VBA.h =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/VBA.h,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** VBA.h 31 Jul 2006 15:51:01 -0000 1.11 --- VBA.h 6 Aug 2006 12:40:35 -0000 1.12 *************** *** 167,170 **** --- 167,171 ---- WavWriter *soundRecorder; CString soundRecordName; + bool dsoundDisableHardwareAcceleration; ISound *sound; bool aviRecording; Index: MainWnd.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/MainWnd.cpp,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** MainWnd.cpp 4 Aug 2006 11:24:24 -0000 1.26 --- MainWnd.cpp 6 Aug 2006 12:40:35 -0000 1.27 *************** *** 420,423 **** --- 420,425 ---- ON_MESSAGE(VBA_CONFIRM_MODE, OnConfirmMode) ON_MESSAGE(WM_SYSCOMMAND, OnMySysCommand) + ON_COMMAND(ID_OPTIONS_SOUND_HARDWAREACCELERATION, &MainWnd::OnOptionsSoundHardwareacceleration) + ON_UPDATE_COMMAND_UI(ID_OPTIONS_SOUND_HARDWAREACCELERATION, &MainWnd::OnUpdateOptionsSoundHardwareacceleration) END_MESSAGE_MAP() *************** *** 1280,1281 **** --- 1282,1284 ---- return Default(); } + Index: MainWnd.h =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/MainWnd.h,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** MainWnd.h 1 Aug 2006 19:21:16 -0000 1.11 --- MainWnd.h 6 Aug 2006 12:40:35 -0000 1.12 *************** *** 419,422 **** --- 419,426 ---- afx_msg BOOL OnFileLoadSlot(UINT nID); afx_msg BOOL OnFileSaveSlot(UINT nID); + public: + afx_msg void OnOptionsSoundHardwareacceleration(); + public: + afx_msg void OnUpdateOptionsSoundHardwareacceleration(CCmdUI *pCmdUI); }; Index: vba.rc =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/vba.rc,v retrieving revision 1.62 retrieving revision 1.63 diff -C2 -d -r1.62 -r1.63 *** vba.rc 4 Aug 2006 11:24:24 -0000 1.62 --- vba.rc 6 Aug 2006 12:40:35 -0000 1.63 *************** *** 1400,1409 **** POPUP "&File" BEGIN ! MENUITEM "&Open...", ID_FILE_OPEN MENUITEM "Open Gameboy...", ID_FILE_OPENGAMEBOY MENUITEM SEPARATOR ! MENUITEM "&Load...", ID_FILE_LOAD ! MENUITEM "&Save...", ID_FILE_SAVE ! POPUP "Loa&d Game" BEGIN MENUITEM "Most recent", ID_FILE_LOADGAME_MOSTRECENT --- 1400,1409 ---- POPUP "&File" BEGIN ! MENUITEM "Open...", ID_FILE_OPEN MENUITEM "Open Gameboy...", ID_FILE_OPENGAMEBOY MENUITEM SEPARATOR ! MENUITEM "Load...", ID_FILE_LOAD ! MENUITEM "Save...", ID_FILE_SAVE ! POPUP "Load Game" BEGIN MENUITEM "Most recent", ID_FILE_LOADGAME_MOSTRECENT *************** *** 1421,1425 **** MENUITEM "Slot #10", ID_FILE_LOADGAME_SLOT10 END ! POPUP "S&ave Game" BEGIN MENUITEM "Oldest slot", ID_FILE_SAVEGAME_OLDESTSLOT --- 1421,1425 ---- MENUITEM "Slot #10", ID_FILE_LOADGAME_SLOT10 END ! POPUP "Save Game" BEGIN MENUITEM "Oldest slot", ID_FILE_SAVEGAME_OLDESTSLOT *************** *** 1437,1444 **** END MENUITEM SEPARATOR ! MENUITEM "&Pause", ID_FILE_PAUSE ! MENUITEM "&Reset", ID_FILE_RESET MENUITEM SEPARATOR ! POPUP "Re¢" BEGIN MENUITEM "&Reset", ID_FILE_RECENT_RESET --- 1437,1444 ---- END MENUITEM SEPARATOR ! MENUITEM "Pause", ID_FILE_PAUSE ! MENUITEM "Reset", ID_FILE_RESET MENUITEM SEPARATOR ! POPUP "Recent" BEGIN MENUITEM "&Reset", ID_FILE_RECENT_RESET *************** *** 1447,1451 **** END MENUITEM SEPARATOR ! POPUP "&Import" BEGIN MENUITEM "&Battery file...", ID_FILE_IMPORT_BATTERYFILE --- 1447,1451 ---- END MENUITEM SEPARATOR ! POPUP "Import" BEGIN MENUITEM "&Battery file...", ID_FILE_IMPORT_BATTERYFILE *************** *** 1453,1457 **** MENUITEM "&Gameshark Snapshot...", ID_FILE_IMPORT_GAMESHARKSNAPSHOT END ! POPUP "E&xport" BEGIN MENUITEM "&Battery file...", ID_FILE_EXPORT_BATTERYFILE --- 1453,1457 ---- MENUITEM "&Gameshark Snapshot...", ID_FILE_IMPORT_GAMESHARKSNAPSHOT END ! POPUP "Export" BEGIN MENUITEM "&Battery file...", ID_FILE_EXPORT_BATTERYFILE *************** *** 1459,1469 **** END MENUITEM SEPARATOR ! MENUITEM "S&creen capture...", ID_FILE_SCREENCAPTURE ! MENUITEM "Ro&m information...", ID_FILE_ROMINFORMATION ! MENUITEM "&Toggle menu", ID_FILE_TOGGLEMENU MENUITEM SEPARATOR ! MENUITEM "&Close", ID_FILE_CLOSE MENUITEM SEPARATOR ! MENUITEM "&Exit", ID_FILE_EXIT END POPUP "&Options" --- 1459,1469 ---- END MENUITEM SEPARATOR ! MENUITEM "Screen capture...", ID_FILE_SCREENCAPTURE ! MENUITEM "Rom information...", ID_FILE_ROMINFORMATION ! MENUITEM "Toggle menu", ID_FILE_TOGGLEMENU MENUITEM SEPARATOR ! MENUITEM "Close", ID_FILE_CLOSE MENUITEM SEPARATOR ! MENUITEM "Exit", ID_FILE_EXIT END POPUP "&Options" *************** *** 1620,1623 **** --- 1620,1624 ---- MENUITEM "&4x", ID_OPTIONS_SOUND_VOLUME_4X END + MENUITEM "Hardware Acceleration", ID_OPTIONS_SOUND_HARDWAREACCELERATION END POPUP "&Gameboy" Index: resource.h =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/resource.h,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** resource.h 4 Aug 2006 11:24:24 -0000 1.49 --- resource.h 6 Aug 2006 12:40:35 -0000 1.50 *************** *** 750,753 **** --- 750,754 ---- #define ID_HELP_GNUPUBLICLICENSE 40277 #define ID_OPTIONS_EMULATOR_GENERICFLASHCARD 40279 + #define ID_OPTIONS_SOUND_HARDWAREACCELERATION 40281 // Next default values for new objects *************** *** 756,760 **** #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 158 ! #define _APS_NEXT_COMMAND_VALUE 40278 #define _APS_NEXT_CONTROL_VALUE 1256 #define _APS_NEXT_SYMED_VALUE 108 --- 757,761 ---- #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 158 ! #define _APS_NEXT_COMMAND_VALUE 40282 #define _APS_NEXT_CONTROL_VALUE 1256 #define _APS_NEXT_SYMED_VALUE 108 Index: MainWndOptions.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/MainWndOptions.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** MainWndOptions.cpp 1 Aug 2006 19:21:16 -0000 1.13 --- MainWndOptions.cpp 6 Aug 2006 12:40:35 -0000 1.14 *************** *** 752,756 **** void MainWnd::OnOptionsEmulatorGenericflashcard() { ! if(emulating && theApp.cartridgeType == 1) theApp.winGenericflashcardEnable = !theApp.winGenericflashcardEnable; } --- 752,756 ---- void MainWnd::OnOptionsEmulatorGenericflashcard() { ! if(emulating && theApp.cartridgeType == IMAGE_GB) theApp.winGenericflashcardEnable = !theApp.winGenericflashcardEnable; } *************** *** 758,767 **** void MainWnd::OnUpdateOptionsEmulatorGenericflashcard(CCmdUI* pCmdUI) { ! if(emulating && theApp.cartridgeType == 1) pCmdUI->SetCheck(theApp.winGenericflashcardEnable); else pCmdUI->SetCheck(false); ! pCmdUI->Enable(emulating && theApp.cartridgeType == 1); } --- 758,767 ---- void MainWnd::OnUpdateOptionsEmulatorGenericflashcard(CCmdUI* pCmdUI) { ! if(emulating && theApp.cartridgeType == IMAGE_GB) pCmdUI->SetCheck(theApp.winGenericflashcardEnable); else pCmdUI->SetCheck(false); ! pCmdUI->Enable(emulating && theApp.cartridgeType == IMAGE_GB); } *************** *** 1775,1778 **** void MainWnd::OnUpdateOptionsEmulatorGameoverrides(CCmdUI* pCmdUI) { ! pCmdUI->Enable(emulating && theApp.cartridgeType == 0); } --- 1775,1790 ---- void MainWnd::OnUpdateOptionsEmulatorGameoverrides(CCmdUI* pCmdUI) { ! pCmdUI->Enable(emulating && (theApp.cartridgeType == 0)); ! } ! ! void MainWnd::OnOptionsSoundHardwareacceleration() ! { ! theApp.dsoundDisableHardwareAcceleration = !theApp.dsoundDisableHardwareAcceleration; ! systemSoundShutdown(); ! systemSoundInit(); ! } ! ! void MainWnd::OnUpdateOptionsSoundHardwareacceleration(CCmdUI *pCmdUI) ! { ! pCmdUI->SetCheck(!theApp.dsoundDisableHardwareAcceleration); } |
|
From: Spacy <sp...@us...> - 2006-08-06 12:40:45
|
Update of /cvsroot/vba/VisualBoyAdvance/win32 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv26844/win32 Modified Files: vba_vs2005.suo vba_vs2005.vcproj Log Message: Added option to enable/disable hardware acceleration for DirectSound buffers. This fixes buggy hardware drivers. Index: vba_vs2005.vcproj =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/win32/vba_vs2005.vcproj,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** vba_vs2005.vcproj 4 Aug 2006 11:24:24 -0000 1.10 --- vba_vs2005.vcproj 6 Aug 2006 12:40:40 -0000 1.11 *************** *** 67,71 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="nafxcwd.lib LIBCMTD.lib WSock32.Lib Vfw32.Lib dsound.lib dinput.lib dxguid.lib winmm.lib d3d9.lib d3dx9d.lib DxErr.lib OpenGL32.Lib" OutputFile="$(OutDir)\VisualBoyAdvance_debug.exe" LinkIncremental="2" --- 67,71 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="nafxcwd.lib LIBCMTD.lib WSock32.Lib Vfw32.Lib dinput.lib winmm.lib d3d9.lib d3dx9d.lib DxErr.lib OpenGL32.Lib" OutputFile="$(OutDir)\VisualBoyAdvance_debug.exe" LinkIncremental="2" *************** *** 155,159 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="nafxcw.lib LIBCMT.lib WSock32.Lib Vfw32.Lib dsound.lib dinput.lib dxguid.lib winmm.lib d3d9.lib d3dx9.lib DxErr.lib OpenGL32.Lib" OutputFile="$(OutDir)\VisualBoyAdvance.exe" LinkIncremental="1" --- 155,159 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="nafxcw.lib LIBCMT.lib WSock32.Lib Vfw32.Lib dinput.lib winmm.lib d3d9.lib d3dx9.lib DxErr.lib OpenGL32.Lib" OutputFile="$(OutDir)\VisualBoyAdvance.exe" LinkIncremental="1" Index: vba_vs2005.suo =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/win32/vba_vs2005.suo,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 Binary files /tmp/cvsap2UjR and /tmp/cvsBqe7HB differ |
|
From: Spacy <sp...@us...> - 2006-08-05 17:30:25
|
Update of /cvsroot/vba/VisualBoyAdvance/src/win32 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16015/src/win32 Modified Files: OpenGL.cpp Log Message: code cleanup, added comments, little fixes and changes, VSync support, fixed display corruption in full screen Index: OpenGL.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/OpenGL.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** OpenGL.cpp 15 Sep 2004 22:11:20 -0000 1.8 --- OpenGL.cpp 5 Aug 2006 17:30:22 -0000 1.9 *************** *** 2,5 **** --- 2,6 ---- // Copyright (C) 1999-2003 Forgotten // Copyright (C) 2004 Forgotten and the VBA development team + // Copyright (C) 2005-2006 VBA development team // This program is free software; you can redistribute it and/or modify *************** *** 18,23 **** #include "stdafx.h" [...1091 lines suppressed...] ! ! int OpenGLDisplay::selectFullScreenMode( GUID ** ) { ! HWND wnd = GetDesktopWindow(); ! RECT r; ! GetWindowRect( wnd, &r ); ! int w = ( r.right - r.left ) & 0xFFF; ! int h = ( r.bottom - r.top ) & 0xFFF; ! HDC dc = GetDC( wnd ); ! int c = GetDeviceCaps( dc, BITSPIXEL ); ! ReleaseDC( wnd, dc ); ! return (c << 24) | (w << 12) | h; } + + IDisplay *newOpenGLDisplay() + { + return new OpenGLDisplay(); + } |
|
From: Spacy <sp...@us...> - 2006-08-05 17:30:11
|
Update of /cvsroot/vba/VisualBoyAdvance/src/win32 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv15693/src/win32 Modified Files: Direct3D.cpp Log Message: code cleanup, little changes Index: Direct3D.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/Direct3D.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** Direct3D.cpp 31 Jul 2006 15:51:01 -0000 1.12 --- Direct3D.cpp 5 Aug 2006 17:30:07 -0000 1.13 *************** *** 31,39 **** #include "../gb/gbGlobals.h" - extern int Init_2xSaI(u32); // initializes all pixel filters - extern int systemSpeed; - - #include <tchar.h> - // Direct3D #define DIRECT3D_VERSION 0x0900 --- 31,34 ---- *************** *** 42,45 **** --- 37,42 ---- #include <Dxerr.h> // contains debug functions + extern int Init_2xSaI(u32); // initializes all pixel filters + extern int systemSpeed; #ifdef _DEBUG *************** *** 49,53 **** #endif - #ifdef MMX extern "C" bool cpu_mmx; --- 46,49 ---- *************** *** 68,73 **** RECT destRect; bool failed; - ID3DXFont *pFont; void createFont(); void destroyFont(); --- 64,69 ---- RECT destRect; bool failed; + ID3DXFont *pFont; void createFont(); void destroyFont(); *************** *** 80,84 **** Direct3DDisplay(); virtual ~Direct3DDisplay(); - virtual DISPLAY_TYPE getType() { return DIRECT_3D; }; --- 76,79 ---- *************** *** 92,96 **** virtual void resize( int w, int h ); virtual void setOption( const char *option, int value ); ! virtual int selectFullScreenMode( GUID ** ); }; --- 87,91 ---- virtual void resize( int w, int h ); virtual void setOption( const char *option, int value ); ! virtual int selectFullScreenMode( GUID ** ); }; *************** *** 180,184 **** float scaleX = ((float)theApp.fsWidth / theApp.sizeX); float scaleY = ((float)theApp.fsHeight / theApp.sizeY); ! float min = scaleX < scaleY ? scaleX : scaleY; if(theApp.fullScreenStretch) { theApp.surfaceSizeX = theApp.fsWidth; --- 175,179 ---- float scaleX = ((float)theApp.fsWidth / theApp.sizeX); float scaleY = ((float)theApp.fsHeight / theApp.sizeY); ! float min = (scaleX < scaleY) ? scaleX : scaleY; if(theApp.fullScreenStretch) { theApp.surfaceSizeX = theApp.fsWidth; *************** *** 413,417 **** pBackBuffer = NULL; ! D3DCOLOR color = theApp.showSpeedTransparent ? D3DCOLOR_ARGB(0x7f, 0x00, 0x00, 0xff) : D3DCOLOR_ARGB(0xff, 0x00, 0x00, 0xff); RECT r; r.left = 4; --- 408,412 ---- pBackBuffer = NULL; ! D3DCOLOR color; RECT r; r.left = 4; *************** *** 419,426 **** if( theApp.screenMessage ) { ! if(((GetTickCount() - theApp.screenMessageTime) < 3000) && !theApp.disableStatusMessage && pFont) { r.top = dpp.BackBufferHeight - 20; r.bottom = dpp.BackBufferHeight - 4; ! pFont->DrawText(NULL, theApp.screenMessageBuffer, -1, &r, 0, color); } else { theApp.screenMessage = false; --- 414,422 ---- if( theApp.screenMessage ) { ! color = theApp.showSpeedTransparent ? D3DCOLOR_ARGB(0x7F, 0xFF, 0x00, 0x00) : D3DCOLOR_ARGB(0xFF, 0xFF, 0x00, 0x00); ! if( ( ( GetTickCount() - theApp.screenMessageTime ) < 3000 ) && !theApp.disableStatusMessage && pFont ) { r.top = dpp.BackBufferHeight - 20; r.bottom = dpp.BackBufferHeight - 4; ! pFont->DrawText( NULL, theApp.screenMessageBuffer, -1, &r, 0, color ); } else { theApp.screenMessage = false; *************** *** 428,442 **** } ! if( theApp.showSpeed && (theApp.videoOption > VIDEO_4X) ) { char buffer[30]; ! if(theApp.showSpeed == 1) { ! sprintf(buffer, "%3d%%", systemSpeed); } else { ! sprintf(buffer, "%3d%%(%d, %d fps)", systemSpeed, systemFrameSkip, theApp.showRenderedFrames); } r.top = 4; r.bottom = 20; ! pFont->DrawText(NULL, buffer, -1, &r, 0, color); } --- 424,439 ---- } ! if( theApp.showSpeed && ( theApp.videoOption > VIDEO_4X ) ) { ! color = theApp.showSpeedTransparent ? D3DCOLOR_ARGB(0x7F, 0x00, 0x00, 0xFF) : D3DCOLOR_ARGB(0xFF, 0x00, 0x00, 0xFF); char buffer[30]; ! if( theApp.showSpeed == 1 ) { ! sprintf( buffer, "%3d%%", systemSpeed ); } else { ! sprintf( buffer, "%3d%%(%d, %d fps)", systemSpeed, systemFrameSkip, theApp.showRenderedFrames ); } r.top = 4; r.bottom = 20; ! pFont->DrawText( NULL, buffer, -1, &r, 0, color ); } *************** *** 505,509 **** HRESULT hr = D3DXCreateFont( pDevice, ! 12, 0, FW_BOLD, --- 502,506 ---- HRESULT hr = D3DXCreateFont( pDevice, ! 14, 0, FW_BOLD, |
|
From: Spacy <sp...@us...> - 2006-08-05 17:29:34
|
Update of /cvsroot/vba/VisualBoyAdvance/src/win32 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv15585/src/win32 Modified Files: Display.h Log Message: added two spaces xD Index: Display.h =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/Display.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Display.h 12 Jun 2006 22:01:51 -0000 1.4 --- Display.h 5 Aug 2006 17:29:31 -0000 1.5 *************** *** 37,41 **** virtual void checkFullScreen() {}; virtual void renderMenu() {}; ! virtual void clear()=0; virtual bool changeRenderSize(int w, int h) { return true; }; virtual void resize(int w, int h) {}; --- 37,41 ---- virtual void checkFullScreen() {}; virtual void renderMenu() {}; ! virtual void clear() = 0; virtual bool changeRenderSize(int w, int h) { return true; }; virtual void resize(int w, int h) {}; |
|
From: Spacy <sp...@us...> - 2006-08-05 17:29:11
|
Update of /cvsroot/vba/VisualBoyAdvance/src/win32 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv15209/src/win32 Modified Files: MainWndFile.cpp Log Message: display->resize will now be called when toggling the menu on/off Index: MainWndFile.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/MainWndFile.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** MainWndFile.cpp 4 Aug 2006 11:24:24 -0000 1.19 --- MainWndFile.cpp 5 Aug 2006 17:29:02 -0000 1.20 *************** *** 713,716 **** --- 713,718 ---- theApp.adjustDestRect(); + if(theApp.display) + theApp.display->resize(theApp.dest.right-theApp.dest.left, theApp.dest.bottom-theApp.dest.top); } |
|
From: Spacy <sp...@us...> - 2006-08-05 17:28:09
|
Update of /cvsroot/vba/VisualBoyAdvance/src/win32 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv14810/src/win32 Modified Files: VBA.cpp Log Message: changed standard full screen modes to 32bit display->resize will now be called when entering full screen (fixes OpenGL display corruption) Index: VBA.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/VBA.cpp,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** VBA.cpp 4 Aug 2006 11:24:24 -0000 1.21 --- VBA.cpp 5 Aug 2006 17:28:04 -0000 1.22 *************** *** 1464,1468 **** fsWidth = 320; fsHeight = 240; ! fsColorDepth = 16; break; case ID_OPTIONS_VIDEO_FULLSCREEN640X480: --- 1464,1468 ---- fsWidth = 320; fsHeight = 240; ! fsColorDepth = 32; break; case ID_OPTIONS_VIDEO_FULLSCREEN640X480: *************** *** 1470,1474 **** fsWidth = 640; fsHeight = 480; ! fsColorDepth = 16; break; case ID_OPTIONS_VIDEO_FULLSCREEN800X600: --- 1470,1474 ---- fsWidth = 640; fsHeight = 480; ! fsColorDepth = 32; break; case ID_OPTIONS_VIDEO_FULLSCREEN800X600: *************** *** 1476,1480 **** fsWidth = 800; fsHeight = 600; ! fsColorDepth = 16; break; case ID_OPTIONS_VIDEO_FULLSCREEN: --- 1476,1480 ---- fsWidth = 800; fsHeight = 600; ! fsColorDepth = 32; break; case ID_OPTIONS_VIDEO_FULLSCREEN: *************** *** 1483,1489 **** } - //if(videoOption == value && value != VIDEO_OTHER) - // return; - updateWindowSize(value); } --- 1483,1486 ---- *************** *** 1689,1692 **** --- 1686,1692 ---- updateFilter(); + if(display) + display->resize(theApp.dest.right-theApp.dest.left, theApp.dest.bottom-theApp.dest.top); + m_pMainWnd->RedrawWindow(NULL,NULL,RDW_INVALIDATE|RDW_ERASE|RDW_ALLCHILDREN); } |
|
From: Spacy <sp...@us...> - 2006-08-05 17:26:42
|
Update of /cvsroot/vba/VisualBoyAdvance/win32 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv13990/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.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 Binary files /tmp/cvs5khZVe and /tmp/cvsF5FWjo differ |
|
From: Spacy <sp...@us...> - 2006-08-05 13:53:01
|
Update of /cvsroot/vba/VisualBoyAdvance In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27918 Modified Files: INSTALL Log Message: DXSDK link fixed Index: INSTALL =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/INSTALL,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** INSTALL 31 Jul 2006 15:43:30 -0000 1.10 --- INSTALL 5 Aug 2006 13:52:55 -0000 1.11 *************** *** 86,90 **** > http://www.microsoft.com/downloads/details.aspx?FamilyId=E15438AC-60BE-41BD-AA14-7F1E0F19CA0D&displaylang=en - Microsoft DirectX 9.0 SDK (free, essential) ! > http://msdn.microsoft.com/directx/sdk/ - Yasm (free, essential) > http://www.tortall.net/projects/yasm/ --- 86,91 ---- > http://www.microsoft.com/downloads/details.aspx?FamilyId=E15438AC-60BE-41BD-AA14-7F1E0F19CA0D&displaylang=en - Microsoft DirectX 9.0 SDK (free, essential) ! > http://msdn.com/directx/sdk ! (August 2006 version as I write these lines) - Yasm (free, essential) > http://www.tortall.net/projects/yasm/ |
|
From: Spacy <sp...@us...> - 2006-08-04 11:24:35
|
Update of /cvsroot/vba/VisualBoyAdvance/win32 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv26575/win32 Modified Files: vba_vs2005.suo vba_vs2005.vcproj Log Message: Added relative paths support Index: vba_vs2005.vcproj =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/win32/vba_vs2005.vcproj,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** vba_vs2005.vcproj 1 Aug 2006 19:21:16 -0000 1.9 --- vba_vs2005.vcproj 4 Aug 2006 11:24:24 -0000 1.10 *************** *** 2435,2442 **** > <File - RelativePath="..\src\win32\icon.ico" - > - </File> - <File RelativePath="..\src\win32\resource.h" > --- 2435,2438 ---- *************** *** 2459,2462 **** --- 2455,2462 ---- </File> <File + RelativePath="..\src\win32\resource2.h" + > + </File> + <File RelativePath="..\src\win32\vba.rc" > *************** *** 2498,2505 **** </FileConfiguration> </File> - <File - RelativePath="..\src\win32\vbavista.ico" - > - </File> </Filter> <Filter --- 2498,2501 ---- Index: vba_vs2005.suo =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/win32/vba_vs2005.suo,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 Binary files /tmp/cvsm5QGLw and /tmp/cvswCIHrM differ |
Update of /cvsroot/vba/VisualBoyAdvance/src/win32 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv26575/src/win32 Modified Files: Directories.cpp Directories.h MainWnd.cpp MainWndFile.cpp VBA.cpp resource.h vba.rc Log Message: Added relative paths support Index: Directories.h =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/Directories.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Directories.h 26 May 2006 14:38:47 -0000 1.3 --- Directories.h 4 Aug 2006 11:24:24 -0000 1.4 *************** *** 76,81 **** //}}AFX_MSG DECLARE_MESSAGE_MAP() ! public: ! // afx_msg void OnBnClickedOk(); }; --- 76,96 ---- //}}AFX_MSG DECLARE_MESSAGE_MAP() ! private: ! ! bool directoryDoesExist(const char *directory) ! { // returns true if the directory does exist ! HANDLE hDir; ! hDir = CreateFile( ! directory, ! GENERIC_READ, ! FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, ! NULL, ! OPEN_EXISTING, ! FILE_FLAG_BACKUP_SEMANTICS, ! NULL ); ! bool retval = (hDir == INVALID_HANDLE_VALUE) ? false : true; ! CloseHandle( hDir ); ! return retval; ! } }; Index: VBA.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/VBA.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** VBA.cpp 31 Jul 2006 15:51:01 -0000 1.20 --- VBA.cpp 4 Aug 2006 11:24:24 -0000 1.21 *************** *** 26,29 **** --- 26,30 ---- #include "Reg.h" #include "resource.h" + #include "resource2.h" #include "skin.h" #include "WavWriter.h" *************** *** 1328,1334 **** ifbType = 0; ! winFlashSize = regQueryDwordValue("flashSize", 0x20000); if(winFlashSize != 0x10000 && winFlashSize != 0x20000) ! winFlashSize = 0x20000; flashSize = winFlashSize; --- 1329,1335 ---- ifbType = 0; ! winFlashSize = regQueryDwordValue("flashSize", 0x10000); if(winFlashSize != 0x10000 && winFlashSize != 0x20000) ! winFlashSize = 0x10000; flashSize = winFlashSize; Index: MainWndFile.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/MainWndFile.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** MainWndFile.cpp 21 Jun 2006 16:58:15 -0000 1.18 --- MainWndFile.cpp 4 Aug 2006 11:24:24 -0000 1.19 *************** *** 20,23 **** --- 20,25 ---- #include "MainWnd.h" + #include <shlwapi.h> + #include "ExportGSASnapshot.h" #include "FileDlg.h" *************** *** 186,189 **** --- 188,201 ---- CString saveDir = regQueryStringValue("saveDir", NULL); + if( saveDir[0] == '.' ) { + // handle as relative path + char baseDir[MAX_PATH+1]; + GetModuleFileName( NULL, baseDir, MAX_PATH ); + baseDir[MAX_PATH] = '\0'; // for security reasons + PathRemoveFileSpec( baseDir ); // removes the trailing file name and backslash + strcat( baseDir, "\\" ); + strcat( baseDir, saveDir ); + saveDir = baseDir; + } if(saveDir.IsEmpty()) *************** *** 233,236 **** --- 245,258 ---- CString saveDir = regQueryStringValue("saveDir", NULL); + if( saveDir[0] == '.' ) { + // handle as relative path + char baseDir[MAX_PATH+1]; + GetModuleFileName( NULL, baseDir, MAX_PATH ); + baseDir[MAX_PATH] = '\0'; // for security reasons + PathRemoveFileSpec( baseDir ); // removes the trailing file name and backslash + strcat( baseDir, "\\" ); + strcat( baseDir, saveDir ); + saveDir = baseDir; + } if(saveDir.IsEmpty()) *************** *** 275,278 **** --- 297,310 ---- CString saveDir = regQueryStringValue("saveDir", NULL); + if( saveDir[0] == '.' ) { + // handle as relative path + char baseDir[MAX_PATH+1]; + GetModuleFileName( NULL, baseDir, MAX_PATH ); + baseDir[MAX_PATH] = '\0'; // for security reasons + PathRemoveFileSpec( baseDir ); // removes the trailing file name and backslash + strcat( baseDir, "\\" ); + strcat( baseDir, saveDir ); + saveDir = baseDir; + } if(saveDir.IsEmpty()) *************** *** 317,320 **** --- 349,362 ---- CString saveDir = regQueryStringValue("saveDir", NULL); + if( saveDir[0] == '.' ) { + // handle as relative path + char baseDir[MAX_PATH+1]; + GetModuleFileName( NULL, baseDir, MAX_PATH ); + baseDir[MAX_PATH] = '\0'; // for security reasons + PathRemoveFileSpec( baseDir ); // removes the trailing file name and backslash + strcat( baseDir, "\\" ); + strcat( baseDir, saveDir ); + saveDir = baseDir; + } if(saveDir.IsEmpty()) *************** *** 346,349 **** --- 388,401 ---- CString saveDir = regQueryStringValue("batteryDir", NULL); + if( saveDir[0] == '.' ) { + // handle as relative path + char baseDir[MAX_PATH+1]; + GetModuleFileName( NULL, baseDir, MAX_PATH ); + baseDir[MAX_PATH] = '\0'; // for security reasons + PathRemoveFileSpec( baseDir ); // removes the trailing file name and backslash + strcat( baseDir, "\\" ); + strcat( baseDir, saveDir ); + saveDir = baseDir; + } if(saveDir.IsEmpty()) *************** *** 463,466 **** --- 515,528 ---- CString saveDir = regQueryStringValue("batteryDir", NULL); + if( saveDir[0] == '.' ) { + // handle as relative path + char baseDir[MAX_PATH+1]; + GetModuleFileName( NULL, baseDir, MAX_PATH ); + baseDir[MAX_PATH] = '\0'; // for security reasons + PathRemoveFileSpec( baseDir ); // removes the trailing file name and backslash + strcat( baseDir, "\\" ); + strcat( baseDir, saveDir ); + saveDir = baseDir; + } if(saveDir.IsEmpty()) *************** *** 560,563 **** --- 622,635 ---- CString capdir = regQueryStringValue("captureDir", ""); + if( capdir[0] == '.' ) { + // handle as relative path + char baseDir[MAX_PATH+1]; + GetModuleFileName( NULL, baseDir, MAX_PATH ); + baseDir[MAX_PATH] = '\0'; // for security reasons + PathRemoveFileSpec( baseDir ); // removes the trailing file name and backslash + strcat( baseDir, "\\" ); + strcat( baseDir, capdir ); + capdir = baseDir; + } if(capdir.IsEmpty()) capdir = getDirFromFile(theApp.filename); *************** *** 714,717 **** --- 786,799 ---- CString saveDir = regQueryStringValue("saveDir", NULL); + if( saveDir[0] == '.' ) { + // handle as relative path + char baseDir[MAX_PATH+1]; + GetModuleFileName( NULL, baseDir, MAX_PATH ); + baseDir[MAX_PATH] = '\0'; // for security reasons + PathRemoveFileSpec( baseDir ); // removes the trailing file name and backslash + strcat( baseDir, "\\" ); + strcat( baseDir, saveDir ); + saveDir = baseDir; + } if(saveDir.IsEmpty()) *************** *** 758,761 **** --- 840,853 ---- CString saveDir = regQueryStringValue("saveDir", NULL); + if( saveDir[0] == '.' ) { + // handle as relative path + char baseDir[MAX_PATH+1]; + GetModuleFileName( NULL, baseDir, MAX_PATH ); + baseDir[MAX_PATH] = '\0'; // for security reasons + PathRemoveFileSpec( baseDir ); // removes the trailing file name and backslash + strcat( baseDir, "\\" ); + strcat( baseDir, saveDir ); + saveDir = baseDir; + } if(saveDir.IsEmpty()) *************** *** 800,803 **** --- 892,905 ---- CString saveDir = regQueryStringValue("saveDir", NULL); + if( saveDir[0] == '.' ) { + // handle as relative path + char baseDir[MAX_PATH+1]; + GetModuleFileName( NULL, baseDir, MAX_PATH ); + baseDir[MAX_PATH] = '\0'; // for security reasons + PathRemoveFileSpec( baseDir ); // removes the trailing file name and backslash + strcat( baseDir, "\\" ); + strcat( baseDir, saveDir ); + saveDir = baseDir; + } if(saveDir.IsEmpty()) *************** *** 844,847 **** --- 946,959 ---- CString saveDir = regQueryStringValue("saveDir", NULL); + if( saveDir[0] == '.' ) { + // handle as relative path + char baseDir[MAX_PATH+1]; + GetModuleFileName( NULL, baseDir, MAX_PATH ); + baseDir[MAX_PATH] = '\0'; // for security reasons + PathRemoveFileSpec( baseDir ); // removes the trailing file name and backslash + strcat( baseDir, "\\" ); + strcat( baseDir, saveDir ); + saveDir = baseDir; + } if(saveDir.IsEmpty()) Index: Directories.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/Directories.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Directories.cpp 27 May 2006 14:47:33 -0000 1.4 --- Directories.cpp 4 Aug 2006 11:24:24 -0000 1.5 *************** *** 27,30 **** --- 27,31 ---- #include <shlobj.h> + #include <shlwapi.h> #ifdef _DEBUG *************** *** 200,220 **** void Directories::OnOK() { ! CString buffer; ! m_romPath.GetWindowText(buffer); ! if(!buffer.IsEmpty()) ! regSetStringValue("romdir", buffer); ! m_gbromPath.GetWindowText(buffer); ! if(!buffer.IsEmpty()) ! regSetStringValue("gbromdir", buffer); ! m_batteryPath.GetWindowText(buffer); ! if(!buffer.IsEmpty()) ! regSetStringValue("batteryDir", buffer); ! m_savePath.GetWindowText(buffer); ! if(!buffer.IsEmpty()) ! regSetStringValue("saveDir", buffer); ! m_capturePath.GetWindowText(buffer); ! if(!buffer.IsEmpty()) ! regSetStringValue("captureDir", buffer); ! EndDialog(TRUE); } --- 201,274 ---- void Directories::OnOK() { ! char baseDir[MAX_PATH+1]; ! char temp[MAX_PATH+1]; ! GetModuleFileName( NULL, baseDir, MAX_PATH ); ! baseDir[MAX_PATH] = '\0'; // for security reasons ! PathRemoveFileSpec( baseDir ); // removes the trailing file name and backslash ! ! ! CString buffer; ! ! m_romPath.GetWindowText(buffer); ! if( !buffer.IsEmpty() ) ! regSetStringValue( "romdir", buffer ); ! if( buffer[0] == '.' ) { ! strcpy( temp, baseDir ); ! strcat( temp, "\\" ); ! strcat( temp, buffer ); ! buffer = temp; ! } ! if( !directoryDoesExist( buffer ) ) ! SHCreateDirectoryEx( NULL, buffer, NULL ); ! ! m_gbromPath.GetWindowText(buffer); ! if( !buffer.IsEmpty() ) ! regSetStringValue( "gbromdir", buffer ); ! if( buffer[0] == '.' ) { ! strcpy( temp, baseDir ); ! strcat( temp, "\\" ); ! strcat( temp, buffer ); ! buffer = temp; ! } ! if( !directoryDoesExist( buffer ) ) ! SHCreateDirectoryEx( NULL, buffer, NULL ); ! ! m_batteryPath.GetWindowText(buffer); ! if( !buffer.IsEmpty() ) ! regSetStringValue( "batteryDir", buffer ); ! if( buffer[0] == '.' ) { ! strcpy( temp, baseDir ); ! strcat( temp, "\\" ); ! strcat( temp, buffer ); ! buffer = temp; ! } ! if( !directoryDoesExist( buffer ) ) ! SHCreateDirectoryEx( NULL, buffer, NULL ); ! ! m_savePath.GetWindowText(buffer); ! if( !buffer.IsEmpty() ) ! regSetStringValue( "saveDir", buffer ); ! if( buffer[0] == '.' ) { ! strcpy( temp, baseDir ); ! strcat( temp, "\\" ); ! strcat( temp, buffer ); ! buffer = temp; ! } ! if( !directoryDoesExist( buffer ) ) ! SHCreateDirectoryEx( NULL, buffer, NULL ); ! ! m_capturePath.GetWindowText(buffer); ! if( !buffer.IsEmpty() ) ! regSetStringValue( "captureDir", buffer ); ! if( buffer[0] == '.' ) { ! strcpy( temp, baseDir ); ! strcat( temp, "\\" ); ! strcat( temp, buffer ); ! buffer = temp; ! } ! if( !directoryDoesExist( buffer ) ) ! SHCreateDirectoryEx( NULL, buffer, NULL ); ! ! EndDialog(TRUE); } Index: MainWnd.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/MainWnd.cpp,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** MainWnd.cpp 1 Aug 2006 19:21:16 -0000 1.25 --- MainWnd.cpp 4 Aug 2006 11:24:24 -0000 1.26 *************** *** 25,28 **** --- 25,29 ---- #include <winsock.h> + #include <shlwapi.h> #include "FileDlg.h" *************** *** 766,769 **** --- 767,780 ---- name = theApp.filename; CString dir = regQueryStringValue("saveDir", NULL); + if( dir[0] == '.' ) { + // handle as relative path + char baseDir[MAX_PATH+1]; + GetModuleFileName( NULL, baseDir, MAX_PATH ); + baseDir[MAX_PATH] = '\0'; // for security reasons + PathRemoveFileSpec( baseDir ); // removes the trailing file name and backslash + strcat( baseDir, "\\" ); + strcat( baseDir, dir ); + dir = baseDir; + } if(!dir.GetLength()) *************** *** 798,801 **** --- 809,822 ---- name = theApp.filename; CString dir = regQueryStringValue("saveDir", NULL); + if( dir[0] == '.' ) { + // handle as relative path + char baseDir[MAX_PATH+1]; + GetModuleFileName( NULL, baseDir, MAX_PATH ); + baseDir[MAX_PATH] = '\0'; // for security reasons + PathRemoveFileSpec( baseDir ); // removes the trailing file name and backslash + strcat( baseDir, "\\" ); + strcat( baseDir, dir ); + dir = baseDir; + } if(!dir.GetLength()) *************** *** 860,863 **** --- 881,894 ---- CString saveDir = regQueryStringValue("batteryDir", NULL); + if( saveDir[0] == '.' ) { + // handle as relative path + char baseDir[MAX_PATH+1]; + GetModuleFileName( NULL, baseDir, MAX_PATH ); + baseDir[MAX_PATH] = '\0'; // for security reasons + PathRemoveFileSpec( baseDir ); // removes the trailing file name and backslash + strcat( baseDir, "\\" ); + strcat( baseDir, saveDir ); + saveDir = baseDir; + } if(saveDir.IsEmpty()) *************** *** 887,890 **** --- 918,931 ---- CString saveDir = regQueryStringValue("batteryDir", NULL); + if( saveDir[0] == '.' ) { + // handle as relative path + char baseDir[MAX_PATH+1]; + GetModuleFileName( NULL, baseDir, MAX_PATH ); + baseDir[MAX_PATH] = '\0'; // for security reasons + PathRemoveFileSpec( baseDir ); // removes the trailing file name and backslash + strcat( baseDir, "\\" ); + strcat( baseDir, saveDir ); + saveDir = baseDir; + } if(saveDir.IsEmpty()) *************** *** 998,1001 **** --- 1039,1053 ---- } + if( initialDir[0] == '.' ) { + // handle as relative path + char baseDir[MAX_PATH+1]; + GetModuleFileName( NULL, baseDir, MAX_PATH ); + baseDir[MAX_PATH] = '\0'; // for security reasons + PathRemoveFileSpec( baseDir ); // removes the trailing file name and backslash + strcat( baseDir, "\\" ); + strcat( baseDir, initialDir ); + initialDir = baseDir; + } + if( !initialDir.IsEmpty() ) { theApp.dir = initialDir; *************** *** 1034,1042 **** theApp.dir = theApp.dir.Left( theApp.dir.GetLength() - 1 ); } ! if( gb ) { ! regSetStringValue( _T("gbromdir"), theApp.dir ); ! } else { ! regSetStringValue( _T("romdir"), theApp.dir ); ! } return true; } --- 1086,1090 ---- theApp.dir = theApp.dir.Left( theApp.dir.GetLength() - 1 ); } ! SetCurrentDirectory( theApp.dir ); return true; } *************** *** 1074,1077 **** --- 1122,1135 ---- CString captureDir = regQueryStringValue("captureDir", ""); + if( captureDir[0] == '.' ) { + // handle as relative path + char baseDir[MAX_PATH+1]; + GetModuleFileName( NULL, baseDir, MAX_PATH ); + baseDir[MAX_PATH] = '\0'; // for security reasons + PathRemoveFileSpec( baseDir ); // removes the trailing file name and backslash + strcat( baseDir, "\\" ); + strcat( baseDir, captureDir ); + captureDir = baseDir; + } int index = theApp.filename.ReverseFind('\\'); Index: vba.rc =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/vba.rc,v retrieving revision 1.61 retrieving revision 1.62 diff -C2 -d -r1.61 -r1.62 *** vba.rc 3 Aug 2006 16:52:11 -0000 1.61 --- vba.rc 4 Aug 2006 11:24:24 -0000 1.62 *************** *** 9,13 **** // #include "afxres.h" ! #include "vba.rc2" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS --- 9,13 ---- // #include "afxres.h" ! #include "resource2.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS *************** *** 36,46 **** BEGIN "#include ""afxres.h""\r\n" ! "#include ""vba.rc2""\0" END 3 TEXTINCLUDE BEGIN ! "\r\n" ! "\0" END --- 36,45 ---- BEGIN "#include ""afxres.h""\r\n" ! "#include ""resource2.h""\0" END 3 TEXTINCLUDE BEGIN ! "#include ""vba.rc2""\0" END *************** *** 72,81 **** 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 107,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 --- 71,81 ---- END ! IDD_ABOUT DIALOGEX 0, 0, 157, 78 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU + EXSTYLE WS_EX_TOOLWINDOW CAPTION "About" 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 *************** *** 86,116 **** 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 ! PUSHBUTTON "Browse...",IDC_GBROM_DIR,174,26,50,14 ! PUSHBUTTON "Browse...",IDC_BATTERY_DIR,174,45,50,14 ! PUSHBUTTON "Browse...",IDC_SAVE_DIR,174,64,50,14 ! PUSHBUTTON "Browse...",IDC_CAPTURE_DIR,174,83,50,14 ! DEFPUSHBUTTON "OK",IDOK,88,108,50,14 ! PUSHBUTTON "Cancel",IDCANCEL,145,108,50,14 ! LTEXT "ROM:",IDC_STATIC,7,9,20,8 ! LTEXT "Battery:",IDC_STATIC,7,47,25,8 ! 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 ! PUSHBUTTON "Reset",IDC_BATTERY_DIR_RESET,228,45,50,14 ! PUSHBUTTON "Reset",IDC_SAVE_DIR_RESET,228,64,50,14 ! PUSHBUTTON "Reset",IDC_CAPTURE_DIR_RESET,228,83,50,14 END --- 86,119 ---- END ! IDD_DIRECTORIES DIALOGEX 0, 0, 220, 301 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU + EXSTYLE WS_EX_TOOLWINDOW CAPTION "Directories" FONT 8, "MS Sans Serif", 0, 0, 0x0 BEGIN ! PUSHBUTTON "Browse...",IDC_ROM_DIR,12,66,90,12 ! PUSHBUTTON "Browse...",IDC_GBROM_DIR,12,114,90,12 ! PUSHBUTTON "Browse...",IDC_BATTERY_DIR,12,162,90,12 ! PUSHBUTTON "Browse...",IDC_SAVE_DIR,12,210,90,12 ! PUSHBUTTON "Browse...",IDC_CAPTURE_DIR,12,258,90,12 ! DEFPUSHBUTTON "OK",IDOK,120,282,42,12 ! PUSHBUTTON "Cancel",IDCANCEL,168,282,42,12 ! EDITTEXT IDC_ROM_PATH,12,54,198,12,ES_AUTOHSCROLL ! EDITTEXT IDC_BATTERY_PATH,12,150,198,12,ES_AUTOHSCROLL ! EDITTEXT IDC_SAVE_PATH,12,198,198,12,ES_AUTOHSCROLL ! EDITTEXT IDC_CAPTURE_PATH,12,246,198,12,ES_AUTOHSCROLL ! EDITTEXT IDC_GBROM_PATH,12,102,198,12,ES_AUTOHSCROLL ! PUSHBUTTON "Reset",IDC_ROM_DIR_RESET,120,66,90,12 ! PUSHBUTTON "Reset",IDC_GBROM_DIR_RESET,120,114,84,12 ! PUSHBUTTON "Reset",IDC_BATTERY_DIR_RESET,120,162,90,12 ! PUSHBUTTON "Reset",IDC_SAVE_DIR_RESET,120,210,90,12 ! PUSHBUTTON "Reset",IDC_CAPTURE_DIR_RESET,120,258,90,12 ! CONTROL "You can either select or enter absolute paths to directories,\nor you can use relative paths by beginning with a . (point).\nExamples: c:\\emulation\\roms | .\\battery | ..\\snapshots\\gba",IDC_STATIC, ! "Static",SS_LEFTNOWORDWRAP | WS_GROUP,6,6,210,30,WS_EX_STATICEDGE ! GROUPBOX "Game Boy Advance ROM Images",IDC_STATIC,6,42,210,42 ! GROUPBOX "Game Boy / Game Boy Color ROM Images",IDC_STATIC,6,90,210,42 ! GROUPBOX "Game Boy Internal Battery Saves",IDC_STATIC,6,138,210,42 ! GROUPBOX "Visual Boy Advance Save Games",IDC_STATIC,6,186,210,42 ! GROUPBOX "Screenshots",IDC_STATIC,6,234,210,42 END *************** *** 1052,1056 **** BEGIN LEFTMARGIN, 7 ! RIGHTMARGIN, 147 TOPMARGIN, 7 BOTTOMMARGIN, 71 --- 1055,1059 ---- BEGIN LEFTMARGIN, 7 ! RIGHTMARGIN, 150 TOPMARGIN, 7 BOTTOMMARGIN, 71 *************** *** 1060,1066 **** BEGIN LEFTMARGIN, 7 ! RIGHTMARGIN, 277 TOPMARGIN, 7 ! BOTTOMMARGIN, 122 END --- 1063,1069 ---- BEGIN LEFTMARGIN, 7 ! RIGHTMARGIN, 213 TOPMARGIN, 7 ! BOTTOMMARGIN, 294 END *************** *** 2044,2049 **** // Generated from the TEXTINCLUDE 3 resource. // ! ! ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED --- 2047,2051 ---- // Generated from the TEXTINCLUDE 3 resource. // ! #include "vba.rc2" ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED Index: resource.h =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/resource.h,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** resource.h 3 Aug 2006 16:52:11 -0000 1.48 --- resource.h 4 Aug 2006 11:24:24 -0000 1.49 *************** *** 53,57 **** #define IDR_ACCELERATOR 106 #define IDD_CHEATS 107 - #define IDI_ICON 107 #define IDD_ADD_CHEAT 108 #define IDD_DIRECTORIES 109 --- 53,56 ---- |
|
From: Spacy <sp...@us...> - 2006-08-04 11:21:13
|
Update of /cvsroot/vba/VisualBoyAdvance/src/win32 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv25754/src/win32 Added Files: resource2.h Log Message: fixed missing IDI_ICON --- NEW FILE: resource2.h --- #define IDI_ICON 101 |
|
From: Spacy <sp...@us...> - 2006-08-03 16:52:15
|
Update of /cvsroot/vba/VisualBoyAdvance/win32 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8936/win32 Modified Files: vba_vs2005.suo Log Message: Icon was not showed in about box. Index: vba_vs2005.suo =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/win32/vba_vs2005.suo,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 Binary files /tmp/cvspO7U5H and /tmp/cvs9RsdY7 differ |
|
From: Spacy <sp...@us...> - 2006-08-03 16:52:15
|
Update of /cvsroot/vba/VisualBoyAdvance/src/win32 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8936/src/win32 Modified Files: resource.h vba.rc Log Message: Icon was not showed in about box. Index: vba.rc =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/vba.rc,v retrieving revision 1.60 retrieving revision 1.61 diff -C2 -d -r1.60 -r1.61 *** vba.rc 3 Aug 2006 15:20:17 -0000 1.60 --- vba.rc 3 Aug 2006 16:52:11 -0000 1.61 *************** *** 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 --- 77,81 ---- FONT 8, "MS Sans Serif", 0, 0, 0x0 BEGIN ! ICON 107,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.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** resource.h 3 Aug 2006 15:20:17 -0000 1.47 --- resource.h 3 Aug 2006 16:52:11 -0000 1.48 *************** *** 53,56 **** --- 53,57 ---- #define IDR_ACCELERATOR 106 #define IDD_CHEATS 107 + #define IDI_ICON 107 #define IDD_ADD_CHEAT 108 #define IDD_DIRECTORIES 109 *************** *** 758,762 **** #define _APS_NEXT_COMMAND_VALUE 40278 #define _APS_NEXT_CONTROL_VALUE 1256 ! #define _APS_NEXT_SYMED_VALUE 106 #endif #endif --- 759,763 ---- #define _APS_NEXT_COMMAND_VALUE 40278 #define _APS_NEXT_CONTROL_VALUE 1256 ! #define _APS_NEXT_SYMED_VALUE 108 #endif #endif |
|
From: Spacy <sp...@us...> - 2006-08-03 16:41:41
|
Update of /cvsroot/vba/VisualBoyAdvance In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv4921 Modified Files: README-win.txt Log Message: Added info about the new comment option in vba-over.ini Index: README-win.txt =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/README-win.txt,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** README-win.txt 20 Dec 2004 15:02:43 -0000 1.17 --- README-win.txt 3 Aug 2006 16:41:37 -0000 1.18 *************** *** 148,151 **** --- 148,152 ---- called vba-over.ini in the same directory as the emulator: + comment=You can add any text you like here, for example the full name of the game, but not exceeding 255 characters rtcEnabled=<0 for false, anything else for true> flashSize=<65536 or 131072> *************** *** 165,168 **** --- 166,172 ---- saveType=0 + An easier way to change the per game settings is to use the Game overrides dialog in the MFC version of VBA. + Select Menu>Options>Emulator>Game Overrides... to open the dialog. Just make your changes and click OK. + FAQ --- |
|
From: Spacy <sp...@us...> - 2006-08-03 15:20:32
|
Update of /cvsroot/vba/VisualBoyAdvance/src/win32 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv4289/src/win32 Modified Files: Commands.cpp resource.h vba.rc Log Message: fixed little compile error Index: vba.rc =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/vba.rc,v retrieving revision 1.59 retrieving revision 1.60 diff -C2 -d -r1.59 -r1.60 *** vba.rc 1 Aug 2006 19:21:16 -0000 1.59 --- vba.rc 3 Aug 2006 15:20:17 -0000 1.60 *************** *** 14,80 **** ///////////////////////////////////////////////////////////////////////////// - // 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 - - ///////////////////////////////////////////////////////////////////////////// - // - // Icon - // - - // Icon with lowest ID value placed first to ensure application icon - // remains consistent on all systems. - IDI_ICON ICON "vbavista.ico" - - ///////////////////////////////////////////////////////////////////////////// - // - // 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 ---- Index: resource.h =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/resource.h,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** resource.h 1 Aug 2006 19:21:16 -0000 1.46 --- resource.h 3 Aug 2006 15:20:17 -0000 1.47 *************** *** 51,55 **** #define IDR_MENU 104 #define IDD_ABOUT 105 - #define IDI_ICON 105 #define IDR_ACCELERATOR 106 #define IDD_CHEATS 107 --- 51,54 ---- Index: Commands.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/Commands.cpp,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** Commands.cpp 4 Jan 2006 15:10:33 -0000 1.24 --- Commands.cpp 3 Aug 2006 15:20:17 -0000 1.25 *************** *** 137,141 **** { "OptionsEmulatorShowSpeedTransparent", ID_OPTIONS_EMULATOR_SHOWSPEED_TRANSPARENT }, { "OptionsEmulatorSpeedupToggle", ID_OPTIONS_EMULATOR_SPEEDUPTOGGLE }, - { "OptionsEmulatorRemoveIntros", ID_OPTIONS_EMULATOR_REMOVEINTROSGBA }, { "OptionsEmulatorAutoHideMenu", ID_OPTIONS_EMULATOR_AUTOHIDEMENU }, { "OptionsEmulatorSaveAuto", ID_OPTIONS_EMULATOR_SAVETYPE_AUTOMATIC }, --- 137,140 ---- |
|
From: Spacy <sp...@us...> - 2006-08-03 15:20:28
|
Update of /cvsroot/vba/VisualBoyAdvance/win32 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv4289/win32 Modified Files: vba_vs2005.suo Log Message: fixed little compile error Index: vba_vs2005.suo =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/win32/vba_vs2005.suo,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 Binary files /tmp/cvsWYUZks and /tmp/cvslob9fK differ |
|
From: Spacy <sp...@us...> - 2006-08-01 19:21:20
|
Update of /cvsroot/vba/VisualBoyAdvance/win32 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv20933/win32 Modified Files: vba_vs2005.suo vba_vs2005.vcproj Log Message: Removed source code for deactivated "remove intros" feature. Added comment field to vba-over Index: vba_vs2005.vcproj =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/win32/vba_vs2005.vcproj,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** vba_vs2005.vcproj 31 Jul 2006 15:51:02 -0000 1.8 --- vba_vs2005.vcproj 1 Aug 2006 19:21:16 -0000 1.9 *************** *** 4737,4741 **** <Global Name="RESOURCE_FILE" ! Value="\Dokumente und Einstellungen\Spacy\Eigene Dateien\dev\VisualBoyAdvance\src\win32\vba.rc" /> </Globals> --- 4737,4741 ---- <Global Name="RESOURCE_FILE" ! Value="\Dev\VisualBoyAdvance\src\win32\vba.rc" /> </Globals> Index: vba_vs2005.suo =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/win32/vba_vs2005.suo,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 Binary files /tmp/cvsqD51By and /tmp/cvs9h8jpY differ |
Update of /cvsroot/vba/VisualBoyAdvance/src/win32 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv20933/src/win32 Modified Files: BugReport.cpp GameOverrides.cpp GameOverrides.h MainWnd.cpp MainWnd.h MainWndOptions.cpp resource.h vba.rc Log Message: Removed source code for deactivated "remove intros" feature. Added comment field to vba-over Index: BugReport.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/BugReport.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** BugReport.cpp 25 Jun 2005 06:18:35 -0000 1.4 --- BugReport.cpp 1 Aug 2006 19:21:16 -0000 1.5 *************** *** 217,221 **** AppendFormat(report, "Skip BIOS : %d\r\n", theApp.skipBiosFile); AppendFormat(report, "Disable SFX : %d\r\n", cpuDisableSfx); - AppendFormat(report, "Skip intro : %d\r\n", theApp.removeIntros); AppendFormat(report, "Throttle : %d\r\n", theApp.throttle); AppendFormat(report, "Rewind : %d\r\n", theApp.rewindTimer); --- 217,220 ---- Index: GameOverrides.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/GameOverrides.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** GameOverrides.cpp 30 Apr 2006 14:31:34 -0000 1.3 --- GameOverrides.cpp 1 Aug 2006 19:21:16 -0000 1.4 *************** *** 46,57 **** void GameOverrides::DoDataExchange(CDataExchange* pDX) { ! CDialog::DoDataExchange(pDX); ! //{{AFX_DATA_MAP(GameOverrides) ! DDX_Control(pDX, IDC_NAME, m_name); ! DDX_Control(pDX, IDC_MIRRORING, m_mirroring); ! DDX_Control(pDX, IDC_FLASH_SIZE, m_flashSize); ! DDX_Control(pDX, IDC_SAVE_TYPE, m_saveType); ! DDX_Control(pDX, IDC_RTC, m_rtc); ! //}}AFX_DATA_MAP } --- 46,58 ---- void GameOverrides::DoDataExchange(CDataExchange* pDX) { ! CDialog::DoDataExchange(pDX); ! //{{AFX_DATA_MAP(GameOverrides) ! DDX_Control(pDX, IDC_NAME, m_name); ! DDX_Control(pDX, IDC_MIRRORING, m_mirroring); ! DDX_Control(pDX, IDC_FLASH_SIZE, m_flashSize); ! DDX_Control(pDX, IDC_SAVE_TYPE, m_saveType); ! DDX_Control(pDX, IDC_RTC, m_rtc); ! DDX_Control(pDX, IDC_COMMENT, m_comment); ! //}}AFX_DATA_MAP } *************** *** 82,85 **** --- 83,90 ---- strcat(tempName, "\\vba-over.ini"); + char comment[0xFF]; + m_comment.GetWindowText(comment, 0xFF); + WritePrivateProfileString(buffer, "comment", !strncmp(comment, "", 0xFF) ? NULL : comment, tempName); + int rtc = m_rtc.GetCurSel(); int flash = m_flashSize.GetCurSel(); *************** *** 217,221 **** m_name.SetWindowText(buffer); ! UINT v = GetPrivateProfileInt(buffer, "rtcEnabled", --- 222,235 ---- m_name.SetWindowText(buffer); ! ! char comment[0xFF]; ! GetPrivateProfileString(buffer, ! "comment", ! "", ! comment, ! 0xFF, ! tempName); ! m_comment.SetWindowText(comment); ! UINT v = GetPrivateProfileInt(buffer, "rtcEnabled", Index: MainWnd.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/MainWnd.cpp,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** MainWnd.cpp 31 Jul 2006 15:51:01 -0000 1.24 --- MainWnd.cpp 1 Aug 2006 19:21:16 -0000 1.25 *************** *** 194,199 **** ON_COMMAND(ID_OPTIONS_EMULATOR_SPEEDUPTOGGLE, OnOptionsEmulatorSpeeduptoggle) ON_UPDATE_COMMAND_UI(ID_OPTIONS_EMULATOR_SPEEDUPTOGGLE, OnUpdateOptionsEmulatorSpeeduptoggle) - ON_COMMAND(ID_OPTIONS_EMULATOR_REMOVEINTROSGBA, OnOptionsEmulatorRemoveintrosgba) - ON_UPDATE_COMMAND_UI(ID_OPTIONS_EMULATOR_REMOVEINTROSGBA, OnUpdateOptionsEmulatorRemoveintrosgba) ON_COMMAND(ID_OPTIONS_EMULATOR_AUTOMATICALLYIPSPATCH, OnOptionsEmulatorAutomaticallyipspatch) ON_UPDATE_COMMAND_UI(ID_OPTIONS_EMULATOR_AUTOMATICALLYIPSPATCH, OnUpdateOptionsEmulatorAutomaticallyipspatch) --- 194,197 ---- Index: MainWnd.h =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/MainWnd.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** MainWnd.h 12 Jun 2006 11:09:04 -0000 1.10 --- MainWnd.h 1 Aug 2006 19:21:16 -0000 1.11 *************** *** 222,227 **** afx_msg void OnOptionsEmulatorSpeeduptoggle(); afx_msg void OnUpdateOptionsEmulatorSpeeduptoggle(CCmdUI* pCmdUI); - afx_msg void OnOptionsEmulatorRemoveintrosgba(); - afx_msg void OnUpdateOptionsEmulatorRemoveintrosgba(CCmdUI* pCmdUI); afx_msg void OnOptionsEmulatorAutomaticallyipspatch(); afx_msg void OnUpdateOptionsEmulatorAutomaticallyipspatch(CCmdUI* pCmdUI); --- 222,225 ---- Index: GameOverrides.h =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/GameOverrides.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** GameOverrides.h 25 Jun 2005 06:19:04 -0000 1.2 --- GameOverrides.h 1 Aug 2006 19:21:16 -0000 1.3 *************** *** 17,20 **** --- 17,21 ---- // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + #include "afxwin.h" #if !defined(AFX_GAMEOVERRIDES_H__EEEFE37F_F477_455D_8682_705FB2DBCC0C__INCLUDED_) #define AFX_GAMEOVERRIDES_H__EEEFE37F_F477_455D_8682_705FB2DBCC0C__INCLUDED_ *************** *** 64,67 **** --- 65,70 ---- //}}AFX_MSG DECLARE_MESSAGE_MAP() + public: + CEdit m_comment; }; Index: vba.rc =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/vba.rc,v retrieving revision 1.58 retrieving revision 1.59 diff -C2 -d -r1.58 -r1.59 *** vba.rc 31 Jul 2006 15:51:01 -0000 1.58 --- vba.rc 1 Aug 2006 19:21:16 -0000 1.59 *************** *** 29,34 **** // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. ! IDI_ICON ICON "ico00002.ico" ! ///////////////////////////////////////////////////////////////////////////// --- 29,33 ---- // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. ! IDI_ICON ICON "vbavista.ico" ///////////////////////////////////////////////////////////////////////////// *************** *** 141,145 **** FONT 8, "MS Sans Serif", 0, 0, 0x0 BEGIN ! ICON IDI_ICON,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 --- 140,144 ---- 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 *************** *** 1077,1098 **** END ! IDD_GAME_OVERRIDES DIALOG 0, 0, 271, 138 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Game overrides" ! FONT 8, "MS Sans Serif" BEGIN ! COMBOBOX IDC_RTC,152,35,112,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP ! COMBOBOX IDC_SAVE_TYPE,152,55,112,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP ! COMBOBOX IDC_FLASH_SIZE,152,76,112,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP ! COMBOBOX IDC_MIRRORING,152,97,112,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP ! DEFPUSHBUTTON "OK",IDOK,7,117,50,14 ! PUSHBUTTON "Defaults",IDC_DEFAULTS,110,117,50,14 ! PUSHBUTTON "Cancel",IDCANCEL,213,117,50,14 ! LTEXT "Overrides for game:",IDC_STATIC,7,17,140,8 ! EDITTEXT IDC_NAME,152,15,112,14,ES_AUTOHSCROLL | WS_DISABLED ! LTEXT "Real Time Clock:",IDC_STATIC,7,37,140,8 ! LTEXT "Save Type:",IDC_STATIC,7,57,140,8 ! LTEXT "Flash Size:",IDC_STATIC,7,77,140,8 ! LTEXT "Mirroring:",IDC_STATIC,7,97,140,8 END --- 1076,1099 ---- END ! IDD_GAME_OVERRIDES DIALOGEX 0, 0, 268, 132 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Game overrides" ! FONT 8, "MS Sans Serif", 0, 0, 0x0 BEGIN ! COMBOBOX IDC_RTC,84,42,180,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP ! COMBOBOX IDC_SAVE_TYPE,84,60,180,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP ! COMBOBOX IDC_FLASH_SIZE,84,78,180,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP ! COMBOBOX IDC_MIRRORING,84,96,180,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP ! DEFPUSHBUTTON "OK",IDOK,6,114,72,12 ! PUSHBUTTON "Defaults",IDC_DEFAULTS,108,114,54,12 ! PUSHBUTTON "Cancel",IDCANCEL,192,114,72,12 ! LTEXT "Game Code",IDC_STATIC,6,6,72,12 ! EDITTEXT IDC_NAME,84,6,180,12,ES_AUTOHSCROLL | WS_DISABLED ! LTEXT "Real Time Clock:",IDC_STATIC,6,42,72,12 ! LTEXT "Save Type:",IDC_STATIC,6,60,72,12 ! LTEXT "Flash Size:",IDC_STATIC,6,78,72,12 ! LTEXT "Mirroring:",IDC_STATIC,6,96,72,12 ! LTEXT "Comment",IDC_STATIC,6,24,72,12 ! EDITTEXT IDC_COMMENT,84,24,180,12,ES_AUTOHSCROLL END *************** *** 1442,1448 **** BEGIN LEFTMARGIN, 7 ! RIGHTMARGIN, 264 TOPMARGIN, 7 ! BOTTOMMARGIN, 111 END END --- 1443,1449 ---- BEGIN LEFTMARGIN, 7 ! RIGHTMARGIN, 261 TOPMARGIN, 7 ! BOTTOMMARGIN, 105 END END *************** *** 1612,1616 **** MENUITEM "Pause when inactive window", ID_OPTIONS_EMULATOR_PAUSEWHENINACTIVE MENUITEM "Speed up toggle", ID_OPTIONS_EMULATOR_SPEEDUPTOGGLE - MENUITEM "Remove intros (GBA)", ID_OPTIONS_EMULATOR_REMOVEINTROSGBA MENUITEM "Automatic IPS patching", ID_OPTIONS_EMULATOR_AUTOMATICALLYIPSPATCH MENUITEM "AGB Print", ID_OPTIONS_EMULATOR_AGBPRINT --- 1613,1616 ---- Index: resource.h =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/resource.h,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** resource.h 31 Jul 2006 15:51:01 -0000 1.45 --- resource.h 1 Aug 2006 19:21:16 -0000 1.46 *************** *** 47,55 **** #define IDS_WRONG_GAMESHARK_CODE 42 #define IDS_UNSUPPORTED_GAMESHARK_CODE 43 - #define IDI_ICON 101 #define IDD_REGISTERS 102 #define IDD_DEBUG 103 #define IDR_MENU 104 #define IDD_ABOUT 105 #define IDR_ACCELERATOR 106 #define IDD_CHEATS 107 --- 47,55 ---- #define IDS_WRONG_GAMESHARK_CODE 42 #define IDS_UNSUPPORTED_GAMESHARK_CODE 43 #define IDD_REGISTERS 102 #define IDD_DEBUG 103 #define IDR_MENU 104 #define IDD_ABOUT 105 + #define IDI_ICON 105 #define IDR_ACCELERATOR 106 #define IDD_CHEATS 107 *************** *** 500,503 **** --- 500,504 ---- #define IDC_FLASH_SIZE 1257 #define IDC_BIT_8 1258 + #define IDC_COMMENT 1258 #define IDC_BIT_9 1259 #define IDC_BIT_10 1260 *************** *** 652,656 **** #define ID_OPTIONS_EMULATOR_SPEEDHACK 40157 #define ID_OPTIONS_EMULATOR_SPEEDUPTOGGLE 40158 - #define ID_OPTIONS_EMULATOR_REMOVEINTROSGBA 40159 #define ID_OPTIONS_FILTER16BIT_ADVANCEMAMESCALE2X 40160 #define ID_OPTIONS_FILTER16BIT_SIMPLE2X 40161 --- 653,656 ---- *************** *** 759,763 **** #define _APS_NEXT_COMMAND_VALUE 40278 #define _APS_NEXT_CONTROL_VALUE 1256 ! #define _APS_NEXT_SYMED_VALUE 105 #endif #endif --- 759,763 ---- #define _APS_NEXT_COMMAND_VALUE 40278 #define _APS_NEXT_CONTROL_VALUE 1256 ! #define _APS_NEXT_SYMED_VALUE 106 #endif #endif Index: MainWndOptions.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/MainWndOptions.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** MainWndOptions.cpp 31 Jul 2006 15:51:01 -0000 1.12 --- MainWndOptions.cpp 1 Aug 2006 19:21:16 -0000 1.13 *************** *** 715,729 **** } - void MainWnd::OnOptionsEmulatorRemoveintrosgba() - { - // theApp.removeIntros = !theApp.removeIntros; - } - - void MainWnd::OnUpdateOptionsEmulatorRemoveintrosgba(CCmdUI* pCmdUI) - { - pCmdUI->Enable(false); - // pCmdUI->SetCheck(theApp.removeIntros); - } - void MainWnd::OnOptionsEmulatorAutomaticallyipspatch() { --- 715,718 ---- |
Update of /cvsroot/vba/VisualBoyAdvance/src/win32 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28465/src/win32 Modified Files: Direct3D.cpp MainWnd.cpp MainWndOptions.cpp VBA.cpp VBA.h display.cpp resource.h vba.rc Log Message: Added aspect ratio correct scaling to Direct3D (triggered by !theApp.fullScreenStretch) ReAdded texture filtering support to Direct3D. Removed remaining code pieces of flash size enhancedDetection. Changed some default settings Index: VBA.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/VBA.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** VBA.cpp 22 Jul 2006 10:30:09 -0000 1.19 --- VBA.cpp 31 Jul 2006 15:51:01 -0000 1.20 *************** *** 242,246 **** ddrawUseVideoMemory = false; d3dFilter = 0; - d3dKeepAspectRatio = true; glFilter = 0; glType = 0; --- 242,245 ---- *************** *** 1183,1189 **** winSetLanguageOption(languageOption, true); ! frameSkip = regQueryDwordValue("frameSkip", 1); if(frameSkip < 0 || frameSkip > 9) ! frameSkip = 2; gbFrameSkip = regQueryDwordValue("gbFrameSkip", 0); --- 1182,1188 ---- winSetLanguageOption(languageOption, true); ! frameSkip = regQueryDwordValue("frameSkip", 0); if(frameSkip < 0 || frameSkip > 9) ! frameSkip = 0; gbFrameSkip = regQueryDwordValue("gbFrameSkip", 0); *************** *** 1197,1202 **** fullScreenStretch = regQueryDwordValue("stretch", 0) ? true : false; ! videoOption = regQueryDwordValue("video", 0); ! if(videoOption < 0 || videoOption > VIDEO_OTHER) videoOption = 0; --- 1196,1200 ---- fullScreenStretch = regQueryDwordValue("stretch", 0) ? true : false; ! videoOption = regQueryDwordValue("video", 1); if(videoOption < 0 || videoOption > VIDEO_OTHER) videoOption = 0; *************** *** 1229,1233 **** renderMethod = (DISPLAY_TYPE)regQueryDwordValue("renderMethod", DIRECT_DRAW); - if(renderMethod < GDI || renderMethod > OPENGL) renderMethod = DIRECT_DRAW; --- 1227,1230 ---- *************** *** 1257,1261 **** soundOffFlag = (regQueryDwordValue("soundOff", 0)) ? true : false; ! soundQuality = regQueryDwordValue("soundQuality", 2); soundEcho = regQueryDwordValue("soundEcho", 0) ? true : false; --- 1254,1258 ---- soundOffFlag = (regQueryDwordValue("soundOff", 0)) ? true : false; ! soundQuality = regQueryDwordValue("soundQuality", 1); soundEcho = regQueryDwordValue("soundEcho", 0) ? true : false; *************** *** 1270,1283 **** ddrawEmulationOnly = regQueryDwordValue("ddrawEmulationOnly", false) ? true : false; ! ddrawUseVideoMemory = regQueryDwordValue("ddrawUseVideoMemory", false) ? true : false; ! tripleBuffering = regQueryDwordValue("tripleBuffering", true) ? true : false; ! d3dFilter = regQueryDwordValue("d3dFilter", 0); if(d3dFilter < 0 || d3dFilter > 1) ! d3dFilter = 0; ! d3dKeepAspectRatio = regQueryDwordValue("d3dKeepAspectRatio", true) ? true : false; ! glFilter = regQueryDwordValue("glFilter", 0); if(glFilter < 0 || glFilter > 1) ! glFilter = 0; glType = regQueryDwordValue("glType", 0); if(glType < 0 || glType > 1) --- 1267,1281 ---- ddrawEmulationOnly = regQueryDwordValue("ddrawEmulationOnly", false) ? true : false; ! ddrawUseVideoMemory = regQueryDwordValue("ddrawUseVideoMemory", true) ? true : false; ! tripleBuffering = regQueryDwordValue("tripleBuffering", false) ? true : false; ! d3dFilter = regQueryDwordValue("d3dFilter", 1); if(d3dFilter < 0 || d3dFilter > 1) ! d3dFilter = 1; ! ! glFilter = regQueryDwordValue("glFilter", 1); if(glFilter < 0 || glFilter > 1) ! glFilter = 1; ! glType = regQueryDwordValue("glType", 0); if(glType < 0 || glType > 1) *************** *** 1288,1292 **** filterType = 0; ! disableMMX = regQueryDwordValue("disableMMX", 0) ? true: false; disableStatusMessage = regQueryDwordValue("disableStatus", 0) ? true : false; --- 1286,1290 ---- filterType = 0; ! disableMMX = regQueryDwordValue("disableMMX", false) ? true: false; disableStatusMessage = regQueryDwordValue("disableStatus", 0) ? true : false; *************** *** 1326,1332 **** winSaveType = 0; - cpuEnhancedDetection = regQueryDwordValue("enhancedDetection", 1) ? true : - false; - ifbType = regQueryDwordValue("ifbType", 0); if(ifbType < 0 || ifbType > 2) --- 1324,1327 ---- *************** *** 2175,2179 **** regSetDwordValue("d3dFilter", d3dFilter); - regSetDwordValue("d3dKeepAspectRatio", d3dKeepAspectRatio); regSetDwordValue("glFilter", glFilter); regSetDwordValue("glType", glType); --- 2170,2173 ---- *************** *** 2207,2212 **** regSetDwordValue("saveType", winSaveType); - regSetDwordValue("enhancedDetection", cpuEnhancedDetection); - regSetDwordValue("ifbType", ifbType); --- 2201,2204 ---- Index: VBA.h =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/VBA.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** VBA.h 21 Jun 2006 16:58:15 -0000 1.10 --- VBA.h 31 Jul 2006 15:51:01 -0000 1.11 *************** *** 143,147 **** bool ddrawUseVideoMemory; int d3dFilter; - bool d3dKeepAspectRatio; int glFilter; int glType; --- 143,146 ---- Index: Direct3D.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/Direct3D.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** Direct3D.cpp 20 Jun 2006 10:35:17 -0000 1.11 --- Direct3D.cpp 31 Jul 2006 15:51:01 -0000 1.12 *************** *** 62,67 **** --- 62,70 ---- D3DPRESENT_PARAMETERS dpp; D3DFORMAT screenFormat; + LPDIRECT3DSURFACE9 emulatedImage; + D3DTEXTUREFILTERTYPE filter; int width; int height; + RECT destRect; bool failed; *************** *** 69,72 **** --- 72,78 ---- void createFont(); void destroyFont(); + void createSurface(); + void destroySurface(); + void calculateDestRect(); bool resetDevice(); *************** *** 83,89 **** virtual void renderMenu(); ! virtual bool changeRenderSize(int w, int h); ! virtual void setOption(const char *option, int value); ! virtual int selectFullScreenMode(GUID **); }; --- 89,96 ---- virtual void renderMenu(); ! virtual bool changeRenderSize( int w, int h ); ! virtual void resize( int w, int h ); ! virtual void setOption( const char *option, int value ); ! virtual int selectFullScreenMode( GUID ** ); }; *************** *** 98,101 **** --- 105,110 ---- failed = false; pFont = NULL; + emulatedImage = NULL; + filter = D3DTEXF_POINT; } *************** *** 110,113 **** --- 119,123 ---- { destroyFont(); + destroySurface(); if( pDevice ) { *************** *** 315,320 **** dpp.BackBufferCount = theApp.tripleBuffering ? 2 : 1; dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; ! dpp.BackBufferWidth = theApp.rect.right; ! dpp.BackBufferHeight = theApp.rect.bottom; dpp.Flags = D3DPRESENTFLAG_LOCKABLE_BACKBUFFER; dpp.PresentationInterval = theApp.vsync ? D3DPRESENT_INTERVAL_ONE : D3DPRESENT_INTERVAL_IMMEDIATE; --- 325,330 ---- dpp.BackBufferCount = theApp.tripleBuffering ? 2 : 1; dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; ! dpp.BackBufferWidth = 0; // use width of hDeviceWindow ! dpp.BackBufferHeight = 0; // use height of hDeviceWindow dpp.Flags = D3DPRESENTFLAG_LOCKABLE_BACKBUFFER; dpp.PresentationInterval = theApp.vsync ? D3DPRESENT_INTERVAL_ONE : D3DPRESENT_INTERVAL_IMMEDIATE; *************** *** 333,336 **** --- 343,350 ---- createFont(); + createSurface(); + calculateDestRect(); + + setOption( _T("d3dFilter"), theApp.d3dFilter ); if(failed) return false; *************** *** 359,362 **** --- 373,377 ---- void Direct3DDisplay::render() { + if( failed ) return; if(!pDevice) return; if( FAILED( pDevice->TestCooperativeLevel() ) ) return; *************** *** 366,374 **** pDevice->BeginScene(); HRESULT hr; D3DLOCKED_RECT lr; ! LPDIRECT3DSURFACE9 pBackBuffer; ! pDevice->GetBackBuffer( 0, 0, D3DBACKBUFFER_TYPE_MONO, &pBackBuffer ); ! if( FAILED( hr = pBackBuffer->LockRect( &lr, NULL, D3DLOCK_DISCARD ) ) ) { DXTRACE_ERR_MSGBOX( _T("Can not lock back buffer"), hr ); return; --- 381,388 ---- pDevice->BeginScene(); + // copy pix to emulatedImage and apply pixel filter if selected HRESULT hr; D3DLOCKED_RECT lr; ! if( FAILED( hr = emulatedImage->LockRect( &lr, NULL, D3DLOCK_DISCARD ) ) ) { DXTRACE_ERR_MSGBOX( _T("Can not lock back buffer"), hr ); return; *************** *** 385,395 **** theApp.filterHeight); } ! pBackBuffer->UnlockRect(); } pBackBuffer->Release(); pBackBuffer = NULL; - - D3DCOLOR color = theApp.showSpeedTransparent ? D3DCOLOR_ARGB(0x7f, 0x00, 0x00, 0xff) : D3DCOLOR_ARGB(0xff, 0x00, 0x00, 0xff); RECT r; --- 399,416 ---- theApp.filterHeight); } ! emulatedImage->UnlockRect(); ! } ! ! // copy emulatedImage to pBackBuffer and scale with or without aspect ratio ! LPDIRECT3DSURFACE9 pBackBuffer; ! pDevice->GetBackBuffer( 0, 0, D3DBACKBUFFER_TYPE_MONO, &pBackBuffer ); ! if( theApp.fullScreenStretch ) { ! pDevice->StretchRect( emulatedImage, NULL, pBackBuffer, NULL, filter ); ! } else { ! pDevice->StretchRect( emulatedImage, NULL, pBackBuffer, &destRect, filter ); } pBackBuffer->Release(); pBackBuffer = NULL; D3DCOLOR color = theApp.showSpeedTransparent ? D3DCOLOR_ARGB(0x7f, 0x00, 0x00, 0xff) : D3DCOLOR_ARGB(0xff, 0x00, 0x00, 0xff); RECT r; *************** *** 428,444 **** ! bool Direct3DDisplay::changeRenderSize(int w, int h) { if( (w != width) || (h != height) ) { width = w; height = h; dpp.BackBufferWidth = (UINT)w; dpp.BackBufferHeight = (UINT)h; ! return resetDevice(); } - return true; } ! int Direct3DDisplay::selectFullScreenMode(GUID **) { HRESULT hr; --- 449,478 ---- ! bool Direct3DDisplay::changeRenderSize( int w, int h ) { if( (w != width) || (h != height) ) { width = w; height = h; + if( pDevice ) { + destroySurface(); + createSurface(); + calculateDestRect(); + } + } + return true; + } + + + void Direct3DDisplay::resize( int w, int h ) + { + if( (w != dpp.BackBufferWidth) || (h != dpp.BackBufferHeight) ) { dpp.BackBufferWidth = (UINT)w; dpp.BackBufferHeight = (UINT)h; ! resetDevice(); ! calculateDestRect(); } } ! int Direct3DDisplay::selectFullScreenMode( GUID ** ) { HRESULT hr; *************** *** 469,474 **** { if( !pFont ) { ! D3DXCreateFont ! ( pDevice, 12, --- 503,507 ---- { if( !pFont ) { ! HRESULT hr = D3DXCreateFont( pDevice, 12, *************** *** 482,487 **** DEFAULT_PITCH || FF_DONTCARE, _T("Arial"), ! &pFont ! ); } } --- 515,522 ---- DEFAULT_PITCH || FF_DONTCARE, _T("Arial"), ! &pFont ); ! if( FAILED( hr ) ) { ! DXTRACE_ERR_MSGBOX( _T("createFont failed"), hr ); ! } } } *************** *** 497,501 **** ! void Direct3DDisplay::setOption(const char *option, int value) { if( !_tcscmp( option, _T("vsync") ) ) { --- 532,586 ---- ! void Direct3DDisplay::createSurface() ! { ! if( !emulatedImage ) { ! HRESULT hr = pDevice->CreateOffscreenPlainSurface( ! width, height, ! dpp.BackBufferFormat, ! D3DPOOL_DEFAULT, ! &emulatedImage, ! NULL ); ! if( FAILED( hr ) ) { ! DXTRACE_ERR_MSGBOX( _T("createSurface failed"), hr ); ! } ! } ! } ! ! ! void Direct3DDisplay::destroySurface() ! { ! if( emulatedImage ) { ! emulatedImage->Release(); ! emulatedImage = NULL; ! } ! } ! ! ! void Direct3DDisplay::calculateDestRect() ! { ! float scaleX = (float)dpp.BackBufferWidth / (float)width; ! float scaleY = (float)dpp.BackBufferHeight / (float)height; ! float min = (scaleX < scaleY) ? scaleX : scaleY; ! if( theApp.fsMaxScale && (min > theApp.fsMaxScale) ) { ! min = (float)theApp.fsMaxScale; ! } ! destRect.left = 0; ! destRect.top = 0; ! destRect.right = (LONG)(width * min); ! destRect.bottom = (LONG)(height * min); ! if( destRect.right != dpp.BackBufferWidth ) { ! LONG diff = (dpp.BackBufferWidth - destRect.right) / 2; ! destRect.left += diff; ! destRect.right += diff; ! } ! if( destRect.bottom != dpp.BackBufferHeight ) { ! LONG diff = (dpp.BackBufferHeight - destRect.bottom) / 2; ! destRect.top += diff; ! destRect.bottom += diff; ! } ! } ! ! ! void Direct3DDisplay::setOption( const char *option, int value ) { if( !_tcscmp( option, _T("vsync") ) ) { *************** *** 508,511 **** --- 593,608 ---- resetDevice(); } + + if( !_tcscmp( option, _T("d3dFilter") ) ) { + switch( value ) + { + case 0: //point + filter = D3DTEXF_POINT; + break; + case 1: //linear + filter = D3DTEXF_LINEAR; + break; + } + } } *************** *** 517,526 **** HRESULT hr; destroyFont(); if( FAILED( hr = pDevice->Reset( &dpp ) ) ) { ! DXTRACE_ERR_MSGBOX( _T("pDevice->Reset failed"), hr ); failed = true; return false; } createFont(); failed = false; return true; --- 614,625 ---- HRESULT hr; destroyFont(); + destroySurface(); if( FAILED( hr = pDevice->Reset( &dpp ) ) ) { ! //DXTRACE_ERR_MSGBOX( _T("pDevice->Reset failed"), hr ); failed = true; return false; } createFont(); + createSurface(); failed = false; return true; Index: display.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/display.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** display.cpp 12 Jun 2006 22:01:51 -0000 1.4 --- display.cpp 31 Jul 2006 15:51:01 -0000 1.5 *************** *** 119,123 **** //*(dst+i+(x*nBytesPerPixel)+(y*destinationPitch)) = *(src+i+(x*nBytesPerPixel)+(y*srcPitch)); ! #endif // #ifdef ASM } --- 119,123 ---- //*(dst+i+(x*nBytesPerPixel)+(y*destinationPitch)) = *(src+i+(x*nBytesPerPixel)+(y*srcPitch)); ! #endif } Index: MainWnd.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/MainWnd.cpp,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** MainWnd.cpp 18 Jul 2006 14:15:16 -0000 1.23 --- MainWnd.cpp 31 Jul 2006 15:51:01 -0000 1.24 *************** *** 532,538 **** cpuSaveType = theApp.winSaveType; - // if(cpuEnhancedDetection && winSaveType == 0) { - // utilGBAFindSave(rom, size); - // } GetModuleFileName(NULL, tempName, 2048); --- 532,535 ---- Index: vba.rc =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/vba.rc,v retrieving revision 1.57 retrieving revision 1.58 diff -C2 -d -r1.57 -r1.58 *** vba.rc 12 Jun 2006 22:03:24 -0000 1.57 --- vba.rc 31 Jul 2006 15:51:01 -0000 1.58 *************** *** 29,33 **** // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. ! IDI_ICON ICON "vbavista.ico" ///////////////////////////////////////////////////////////////////////////// --- 29,34 ---- // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. ! IDI_ICON ICON "ico00002.ico" ! ///////////////////////////////////////////////////////////////////////////// *************** *** 1636,1643 **** MENUITEM "None", ID_OPTIONS_EMULATOR_SAVETYPE_NONE MENUITEM SEPARATOR ! MENUITEM "Flash 64K", ID_OPTIONS_EMULATOR_SAVETYPE_FLASH512K ! MENUITEM "Flash 128K", ID_OPTIONS_EMULATOR_SAVETYPE_FLASH1M ! MENUITEM SEPARATOR ! MENUITEM "Enhanced detection", ID_OPTIONS_EMULATOR_SAVETYPE_ENHANCEDDETECTION END MENUITEM SEPARATOR --- 1637,1642 ---- MENUITEM "None", ID_OPTIONS_EMULATOR_SAVETYPE_NONE MENUITEM SEPARATOR ! MENUITEM "Flash 64 KB", ID_OPTIONS_EMULATOR_SAVETYPE_FLASH512K ! MENUITEM "Flash 128 KB", ID_OPTIONS_EMULATOR_SAVETYPE_FLASH1M END MENUITEM SEPARATOR Index: resource.h =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/resource.h,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** resource.h 6 Jun 2006 14:33:43 -0000 1.44 --- resource.h 31 Jul 2006 15:51:01 -0000 1.45 *************** *** 738,742 **** #define ID_FILE_TOGGLEMENU 40263 #define ID_OPTIONS_EMULATOR_SAVETYPE_NONE 40264 - #define ID_OPTIONS_EMULATOR_SAVETYPE_ENHANCEDDETECTION 40265 #define ID_TOOLS_IOVIEWER 40266 #define ID_FILE_LOADGAME_MOSTRECENT 40267 --- 738,741 ---- Index: MainWndOptions.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/MainWndOptions.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** MainWndOptions.cpp 21 Jun 2006 16:58:15 -0000 1.11 --- MainWndOptions.cpp 31 Jul 2006 15:51:01 -0000 1.12 *************** *** 377,381 **** { theApp.fullScreenStretch = !theApp.fullScreenStretch; - theApp.d3dKeepAspectRatio = !theApp.fullScreenStretch; theApp.updateWindowSize( theApp.videoOption ); if( theApp.display ) { --- 377,380 ---- *************** *** 383,387 **** theApp.display->clear( ); } ! theApp.display->setOption( _T("d3dKeepAspectRatio"), theApp.d3dKeepAspectRatio ); } } --- 382,386 ---- theApp.display->clear( ); } ! theApp.display->setOption( _T("fullScreenStretch"), theApp.fullScreenStretch ); } } |