diff --git a/Bin/Debug/zlib1.dll b/Bin/Debug/zlib1.dll deleted file mode 100644 index 1cf8a476e..000000000 Binary files a/Bin/Debug/zlib1.dll and /dev/null differ diff --git a/Project64.sln b/Project64.sln index 16ebc1a68..0f0514dff 100644 --- a/Project64.sln +++ b/Project64.sln @@ -33,8 +33,8 @@ Global GlobalSection(ProjectConfigurationPlatforms) = postSolution {B4A4B994-9111-42B1-93C2-6F1CA8BC4421}.Debug|Win32.ActiveCfg = Debug|Win32 {B4A4B994-9111-42B1-93C2-6F1CA8BC4421}.Debug|Win32.Build.0 = Debug|Win32 - {B4A4B994-9111-42B1-93C2-6F1CA8BC4421}.External Release|Win32.ActiveCfg = External Release|Win32 - {B4A4B994-9111-42B1-93C2-6F1CA8BC4421}.External Release|Win32.Build.0 = External Release|Win32 + {B4A4B994-9111-42B1-93C2-6F1CA8BC4421}.External Release|Win32.ActiveCfg = Release|Win32 + {B4A4B994-9111-42B1-93C2-6F1CA8BC4421}.External Release|Win32.Build.0 = Release|Win32 {B4A4B994-9111-42B1-93C2-6F1CA8BC4421}.Release|Win32.ActiveCfg = Release|Win32 {B4A4B994-9111-42B1-93C2-6F1CA8BC4421}.Release|Win32.Build.0 = Release|Win32 {7E534C8E-1ACE-4A88-8807-39A11ED4DA18}.Debug|Win32.ActiveCfg = Debug|Win32 @@ -57,8 +57,8 @@ Global {8B9961B1-88D9-4EA3-A752-507A00DD9F3D}.Release|Win32.Build.0 = Release|Win32 {3326E128-33AF-422C-BB7C-67CC6B915610}.Debug|Win32.ActiveCfg = Debug|Win32 {3326E128-33AF-422C-BB7C-67CC6B915610}.Debug|Win32.Build.0 = Debug|Win32 - {3326E128-33AF-422C-BB7C-67CC6B915610}.External Release|Win32.ActiveCfg = External Release|Win32 - {3326E128-33AF-422C-BB7C-67CC6B915610}.External Release|Win32.Build.0 = External Release|Win32 + {3326E128-33AF-422C-BB7C-67CC6B915610}.External Release|Win32.ActiveCfg = Release|Win32 + {3326E128-33AF-422C-BB7C-67CC6B915610}.External Release|Win32.Build.0 = Release|Win32 {3326E128-33AF-422C-BB7C-67CC6B915610}.Release|Win32.ActiveCfg = Release|Win32 {3326E128-33AF-422C-BB7C-67CC6B915610}.Release|Win32.Build.0 = Release|Win32 {4BC6906B-213E-40D7-9FC7-1A93E228393D}.Debug|Win32.ActiveCfg = Debug|Win32 diff --git a/PropertySheets/Debug.vsprops b/PropertySheets/Debug.vsprops new file mode 100644 index 000000000..12da0c6e3 --- /dev/null +++ b/PropertySheets/Debug.vsprops @@ -0,0 +1,34 @@ + + + + + + + diff --git a/PropertySheets/Default.vsprops b/PropertySheets/Default.vsprops new file mode 100644 index 000000000..3f1f50591 --- /dev/null +++ b/PropertySheets/Default.vsprops @@ -0,0 +1,184 @@ + + + + + + + + + + + diff --git a/PropertySheets/Release.vsprops b/PropertySheets/Release.vsprops new file mode 100644 index 000000000..61b6f3b2d --- /dev/null +++ b/PropertySheets/Release.vsprops @@ -0,0 +1,33 @@ + + + + + + + diff --git a/PropertySheets/Win32.Debug.vsprops b/PropertySheets/Win32.Debug.vsprops new file mode 100644 index 000000000..1d669a6e6 --- /dev/null +++ b/PropertySheets/Win32.Debug.vsprops @@ -0,0 +1,8 @@ + + + diff --git a/PropertySheets/Win32.Release.vsprops b/PropertySheets/Win32.Release.vsprops new file mode 100644 index 000000000..36310c7ed --- /dev/null +++ b/PropertySheets/Win32.Release.vsprops @@ -0,0 +1,8 @@ + + + diff --git a/PropertySheets/Win32.vsprops b/PropertySheets/Win32.vsprops new file mode 100644 index 000000000..8548eafc5 --- /dev/null +++ b/PropertySheets/Win32.vsprops @@ -0,0 +1,15 @@ + + + + + diff --git a/PropertySheets/root.vsprops b/PropertySheets/root.vsprops new file mode 100644 index 000000000..f5c7c59d4 --- /dev/null +++ b/PropertySheets/root.vsprops @@ -0,0 +1,15 @@ + + + + + diff --git a/Source/3rd Party/7zip/7zip.vcproj b/Source/3rd Party/7zip/7zip.vcproj index da5523ecd..d2a7c18e5 100644 --- a/Source/3rd Party/7zip/7zip.vcproj +++ b/Source/3rd Party/7zip/7zip.vcproj @@ -17,13 +17,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // CTabView +#include + namespace WTL { diff --git a/Source/3rd Party/zlib/zlib.vcproj b/Source/3rd Party/zlib/zlib.vcproj index 9dabcb130..9ca6947b5 100644 --- a/Source/3rd Party/zlib/zlib.vcproj +++ b/Source/3rd Party/zlib/zlib.vcproj @@ -18,12 +18,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - SB_VAddr(Address,Code.Value); } + if (Execute) { _MMU->SB_VAddr(Address,(BYTE)Code.Value); } break; case 0x31000000: case 0x83000000: @@ -397,7 +397,7 @@ int CCheats::ApplyCheatEntry (CMipsMemory * _MMU, const CODES & CodeEntry, int C break; case 0xC8000000: Address = 0xA0000000 | (ConvertXP64Address(Code.Command) & 0xFFFFFF); - if (Execute) { _MMU->SB_VAddr(Address,Code.Value); } + if (Execute) { _MMU->SB_VAddr(Address,(BYTE)Code.Value); } break; case 0xC9000000: Address = 0xA0000000 | (ConvertXP64Address(Code.Command) & 0xFFFFFF); diff --git a/Source/Project64/N64 System/Recompiler/Recompiler Ops.cpp b/Source/Project64/N64 System/Recompiler/Recompiler Ops.cpp index a4c10ca19..4a1b224c9 100644 --- a/Source/Project64/N64 System/Recompiler/Recompiler Ops.cpp +++ b/Source/Project64/N64 System/Recompiler/Recompiler Ops.cpp @@ -5084,6 +5084,7 @@ void CRecompilerOps::EnterCodeBlock ( void ) #ifdef _DEBUG Push(x86_ESI); #else + Push(x86_EDI); Push(x86_ESI); Push(x86_EBX); #endif @@ -5096,6 +5097,7 @@ void CRecompilerOps::ExitCodeBlock ( void ) #else Pop(x86_EBX); Pop(x86_ESI); + Pop(x86_EDI); #endif Ret(); } diff --git a/Source/Project64/Project64.vcproj b/Source/Project64/Project64.vcproj index ff1c02b4d..5238d3da5 100644 --- a/Source/Project64/Project64.vcproj +++ b/Source/Project64/Project64.vcproj @@ -15,112 +15,10 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - @@ -406,8 +220,14 @@ > + + + @@ -415,33 +235,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1112,250 +338,34 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1934,33 +458,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3388,188 +670,26 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3612,33 +710,11 @@ - - - - - - @@ -3649,16 +725,6 @@ - - - @@ -3679,20 +745,20 @@ UsePrecompiledHeader="0" /> + + + - - - @@ -3713,6 +779,16 @@ UsePrecompiledHeader="0" /> + + + @@ -3784,15 +860,6 @@ - - - @@ -3811,6 +878,15 @@ AdditionalIncludeDirectories="User Interface" /> + + + +#include #include "Validate Binary.h" #include diff --git a/Source/RSP/Main.cpp b/Source/RSP/Main.cpp index c16191f06..9621c0501 100644 --- a/Source/RSP/Main.cpp +++ b/Source/RSP/Main.cpp @@ -78,7 +78,7 @@ enum { Set_ReOrdering, Set_GPRConstants, Set_Flags, Set_AlignVector, }; -ULONG Set_AudioHle = 0, Set_GraphicsHle = 0; +short Set_AudioHle = 0, Set_GraphicsHle = 0; /************ DLL info **************/ const char * AppName ( void ) diff --git a/Source/RSP/Profiling.cpp b/Source/RSP/Profiling.cpp index 2531d3fe8..229c2f4ca 100644 --- a/Source/RSP/Profiling.cpp +++ b/Source/RSP/Profiling.cpp @@ -25,6 +25,7 @@ */ #include +#include extern "C" { #include "profiling.h" } @@ -129,8 +130,8 @@ public: //sort the list with a basic bubble sort if (ItemList.size() > 0) { - for (int OuterPass = 0; OuterPass < (ItemList.size() - 1); OuterPass++ ) { - for (int InnerPass = 0; InnerPass < (ItemList.size() - 1); InnerPass++ ) { + for (size_t OuterPass = 0; OuterPass < (ItemList.size() - 1); OuterPass++ ) { + for (size_t InnerPass = 0; InnerPass < (ItemList.size() - 1); InnerPass++ ) { if (ItemList[InnerPass]->second < ItemList[InnerPass + 1]->second) { PROFILE_VALUE * TempPtr = ItemList[InnerPass]; ItemList[InnerPass] = ItemList[InnerPass + 1]; @@ -147,9 +148,9 @@ public: {Timer_RDP_Running, "RDP: Running"}, }; - for (int count =0; count < ItemList.size(); count++ ) { + for (size_t count = 0; count < ItemList.size(); count++ ) { char Buffer[255]; - float CpuUsage = ((double)ItemList[count]->second / (double)TotalTime) * 100; + float CpuUsage = (float)(((double)ItemList[count]->second / (double)TotalTime) * 100); if (CpuUsage <= 0.2) { continue; } sprintf(Buffer,"Func 0x%08X",ItemList[count]->first); for (int NameID = 0; NameID < (sizeof(TimerNames) / sizeof(TIMER_NAME)); NameID++) { diff --git a/Source/RSP/RSP.vcproj b/Source/RSP/RSP.vcproj index 0403920a2..cb6d8de96 100644 --- a/Source/RSP/RSP.vcproj +++ b/Source/RSP/RSP.vcproj @@ -17,13 +17,8 @@ + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - diff --git a/Source/RSP/Recompiler Analysis.c b/Source/RSP/Recompiler Analysis.c index 3ba9a32ca..13013b433 100644 --- a/Source/RSP/Recompiler Analysis.c +++ b/Source/RSP/Recompiler Analysis.c @@ -189,7 +189,7 @@ DWORD WriteToAccum2 (int Location, int PC, BOOL RecursiveCall) { break; case RSP_J: /* there is no way a loopback is going to use accumulator */ - if (Compiler.bAudioUcode && (RspOp.target << 2) < PC) { + if (Compiler.bAudioUcode && ((int)(RspOp.target << 2) < PC)) { return FALSE; } /* rarely occurs let them have their way */ @@ -215,7 +215,7 @@ DWORD WriteToAccum2 (int Location, int PC, BOOL RecursiveCall) { /* if the opcode 8 bytes before the dest is a J backward than ignore this */ BranchImmed = (PC + ((short)RspOp.offset << 2) + 4) & 0xFFC; RSP_LW_IMEM(BranchImmed - 8, &NextOp.Hex); - if (RspOp.op == RSP_J && (RspOp.target << 2) < PC) { + if (RspOp.op == RSP_J && (int)(RspOp.target << 2) < PC) { break; } } @@ -486,7 +486,7 @@ BOOL WriteToVectorDest2 (DWORD DestReg, int PC, BOOL RecursiveCall) { break; case RSP_J: /* there is no way a loopback is going to use accumulator */ - if (Compiler.bAudioUcode && (RspOp.target << 2) < PC) { + if (Compiler.bAudioUcode && (int)(RspOp.target << 2) < PC) { return FALSE; } /* rarely occurs let them have their way */ @@ -511,7 +511,7 @@ BOOL WriteToVectorDest2 (DWORD DestReg, int PC, BOOL RecursiveCall) { /* if the opcode 8 bytes before the dest is a J backward than ignore this */ BranchImmed = (PC + ((short)RspOp.offset << 2) + 4) & 0xFFC; RSP_LW_IMEM(BranchImmed - 8, &NextOp.Hex); - if (RspOp.op == RSP_J && (RspOp.target << 2) < PC) { + if (RspOp.op == RSP_J && (int)(RspOp.target << 2) < PC) { break; } } diff --git a/Source/RSP/Recompiler CPU.c b/Source/RSP/Recompiler CPU.c index c96427882..1d0a798c7 100644 --- a/Source/RSP/Recompiler CPU.c +++ b/Source/RSP/Recompiler CPU.c @@ -27,6 +27,7 @@ #include #include #include +#include #include "RSP.h" #include "Cpu.h" #include "Recompiler CPU.h" @@ -752,7 +753,7 @@ void CompilerLinkBlocks(void) { void CompilerRSPBlock ( void ) { DWORD Count, Padding, X86BaseAddress = (DWORD)RecompPos; - BYTE * IMEM_SAVE = malloc(0x1000); + BYTE * IMEM_SAVE = (BYTE *)malloc(0x1000); NextInstruction = NORMAL; CompilePC = *PrgCount; diff --git a/Source/Settings/Settings.cpp b/Source/Settings/Settings.cpp index e67a19bcc..383277c14 100644 --- a/Source/Settings/Settings.cpp +++ b/Source/Settings/Settings.cpp @@ -123,7 +123,7 @@ void RegisterSetting ( short SettingID, SETTING_DATA_TYPE Type, const char * } } -ULONG FindSystemSettingId ( const char * Name ) +short FindSystemSettingId ( const char * Name ) { if (g_PluginSettings2.FindSystemSettingId && g_PluginSettings.handle) { diff --git a/Source/Settings/Settings.h b/Source/Settings/Settings.h index f7df44fd2..28a955430 100644 --- a/Source/Settings/Settings.h +++ b/Source/Settings/Settings.h @@ -30,7 +30,7 @@ BOOL SettingsInitilized ( void ); void SetModuleName ( const char * Name ); void RegisterSetting ( short SettingID, SETTING_DATA_TYPE Type, const char * Name, const char * Category, unsigned int DefaultDW, const char * DefaultStr ); -ULONG FindSystemSettingId ( const char * Name ); +short FindSystemSettingId ( const char * Name ); // this must be implemented to be notified when a setting is used but has not been set up void UseUnregisteredSetting (int SettingID); diff --git a/Source/Settings/Settings.vcproj b/Source/Settings/Settings.vcproj index 6481eefe2..75f999536 100644 --- a/Source/Settings/Settings.vcproj +++ b/Source/Settings/Settings.vcproj @@ -17,13 +17,8 @@ - - - - - -