#pull request 42

This commit is contained in:
zilmar 2015-02-01 06:27:27 +11:00
parent 0f58c6ccaa
commit 9eceed0fef
75 changed files with 75 additions and 75 deletions

View File

@ -439,4 +439,4 @@ Tip: versuchen Sie in Einstellungen passende Plugins auszuwaehlen."
//Thanks to DarkThunder for active participation. //Thanks to DarkThunder for active participation.
//Official support site: http://vdx2004.narod.ru //Official support site: http://vdx2004.narod.ru
//Made in Ukraine. //Made in Ukraine.
//Fin. //Fin.

View File

@ -16,4 +16,4 @@ void (__stdcall *LP7ZSTATUS_UPDATE)(
); );
#endif #endif

View File

@ -87,4 +87,4 @@ public:
virtual bool SetEndOfFile(); virtual bool SetEndOfFile();
}; };
#endif #endif

View File

@ -125,4 +125,4 @@ protected:
CFileStorage m_FileObject; CFileStorage m_FileObject;
}; };
typedef CIniFileT<CFile> CIniFile; typedef CIniFileT<CFile> CIniFile;

View File

@ -208,4 +208,4 @@ bool CLog::Empty(void)
return true; return true;
} }
return false; return false;
} }

View File

@ -305,4 +305,4 @@ BOOL MemTest_VirtualFree( LPVOID lpAddress, SIZE_T dwSize, DWORD dwFreeType )
} }
#endif #endif
#endif #endif

View File

@ -96,4 +96,4 @@ BOOL MemTest_VirtualFree( LPVOID lpAddress, SIZE_T dwSize, DWORD dwFreeType );
#endif #endif
#endif #endif

View File

@ -2615,4 +2615,4 @@ void CPath::GetAsInternetPath(stdstr& Directory) const
} }
else else
Directory = _T("/"); Directory = _T("/");
} }

View File

@ -1,3 +1,3 @@
#pragma warning(disable:4786) #pragma warning(disable:4786)
#include "stdafx.h" #include "stdafx.h"

View File

@ -524,4 +524,4 @@ extern "C" void __declspec(naked) NormalizeVector3DNOW(float *v)
leave leave
ret ret
} }
} }

View File

@ -113,4 +113,4 @@ FX_ENTRY void FX_CALL
GrAspectRatio_t aspectRatio, GrAspectRatio_t aspectRatio,
GrTextureFormat_t format, GrTextureFormat_t format,
FxU32 odd_even_mask ); FxU32 odd_even_mask );
FX_ENTRY void FX_CALL grAuxBufferExt( GrBuffer_t buffer ); FX_ENTRY void FX_CALL grAuxBufferExt( GrBuffer_t buffer );

View File

@ -133,4 +133,4 @@ wxUint32 Load16bYUV (wxUIntPtr dst, wxUIntPtr /*src*/, int /*wid_64*/, int /*hei
*(tex++) = c; *(tex++) = c;
} }
return (1 << 16) | GR_TEXFMT_RGB_565; return (1 << 16) | GR_TEXFMT_RGB_565;
} }

View File

@ -1,3 +1,3 @@
nasm.exe -o lib\Texture.obj -O6 -fwin32 -D__WIN32__ --prefix _ Texture.asm nasm.exe -o lib\Texture.obj -O6 -fwin32 -D__WIN32__ --prefix _ Texture.asm
nasm.exe -o lib\FixedPoint.obj -O6 -fwin32 -D__WIN32__ --prefix _ FixedPoint.asm nasm.exe -o lib\FixedPoint.obj -O6 -fwin32 -D__WIN32__ --prefix _ FixedPoint.asm
nasm.exe -o lib\3dmathSIMD.obj -O6 -fwin32 -D__WIN32__ --prefix _ 3dmathSIMD.asm nasm.exe -o lib\3dmathSIMD.obj -O6 -fwin32 -D__WIN32__ --prefix _ 3dmathSIMD.asm

View File

@ -127,4 +127,4 @@ begin
if ((WizardSilent() <> true) and (HaveCommandlineParam('noads') <> true)) then begin if ((WizardSilent() <> true) and (HaveCommandlineParam('noads') <> true)) then begin
CreateBINNOPage(wpSelectTasks,'pj64emu','pj64emu'); CreateBINNOPage(wpSelectTasks,'pj64emu','pj64emu');
end; end;
end; end;

View File

@ -1,4 +1,4 @@
#pragma comment(lib, "3rd Party\\zlib\\zdll.lib") #pragma comment(lib, "3rd Party\\zlib\\zdll.lib")
#include "Zlib\\unzip.h" #include "Zlib\\unzip.h"
#include "Zlib\\zip.h" #include "Zlib\\zip.h"

View File

@ -944,4 +944,4 @@ bool CLanguage::IsCurrentLang( LanguageFile & File )
return true; return true;
} }
return false; return false;
} }

View File

@ -711,4 +711,4 @@ char * R4300iOpcodeName ( DWORD OpCode, DWORD PC ) {
} }
return CommandName; return CommandName;
} }

View File

@ -87,4 +87,4 @@ public:
void LoadCheats ( bool DisableSelected ); void LoadCheats ( bool DisableSelected );
void SelectCheats ( HWND hParent, bool BlockExecution ); void SelectCheats ( HWND hParent, bool BlockExecution );
inline bool CheatsSlectionChanged ( void ) const { return m_CheatSelectionChanged; } inline bool CheatsSlectionChanged ( void ) const { return m_CheatSelectionChanged; }
}; };

View File

@ -71,4 +71,4 @@ public:
} }
} }
} }
}; };

View File

@ -40,4 +40,4 @@ private:
bool DumpMemory ( LPCSTR FileName,DumpFormat Format, DWORD StartPC, DWORD EndPC, DWORD DumpPC ); bool DumpMemory ( LPCSTR FileName,DumpFormat Format, DWORD StartPC, DWORD EndPC, DWORD DumpPC );
CEditNumber m_StartAddress, m_EndAddress, m_PC; CEditNumber m_StartAddress, m_EndAddress, m_PC;
}; };

View File

@ -29,4 +29,4 @@ public:
virtual ~CDebugTlb(void); virtual ~CDebugTlb(void);
void RefreshTLBWindow ( void ); void RefreshTLBWindow ( void );
}; };

View File

@ -129,4 +129,4 @@ void CDebugger::Debug_ShowMemorySearch()
{ {
m_MemorySearch->ShowWindow(); m_MemorySearch->ShowWindow();
} }
} }

View File

@ -34,4 +34,4 @@ public:
void Debug_ShowMemorySearch ( void ); void Debug_ShowMemorySearch ( void );
void Debug_ShowTLBWindow ( void ); void Debug_ShowTLBWindow ( void );
void Debug_RefreshTLBWindow ( void ); void Debug_RefreshTLBWindow ( void );
}; };

View File

@ -1 +1 @@
#include "../stdafx.h" #include "../stdafx.h"

View File

@ -1 +1 @@
#include "../stdafx.h" #include "../stdafx.h"

View File

@ -29,4 +29,4 @@ public:
void LoadLabelList ( char * file ); void LoadLabelList ( char * file );
int NewLabels ( void ); // How many new labels been added since loading/saveing label file int NewLabels ( void ); // How many new labels been added since loading/saveing label file
void SaveLabelList ( void ); void SaveLabelList ( void );
}; };

View File

@ -138,4 +138,4 @@ void Mempak::WriteTo(int Control, int Address, BYTE * Buffer) {
/* Rumble pack area */ /* Rumble pack area */
} }
Buffer[0x20] = CalculateCrc(Buffer); Buffer[0x20] = CalculateCrc(Buffer);
} }

View File

@ -561,4 +561,4 @@ void CPifRam::LogControllerPakData (char * Description)
} }
} }
LogMessage(""); LogMessage("");
} }

View File

@ -54,4 +54,4 @@ private:
void ReadControllerCommand ( int Control, BYTE * Command ); void ReadControllerCommand ( int Control, BYTE * Command );
void LogControllerPakData ( char * Description ); void LogControllerPakData ( char * Description );
void n64_cic_nus_6105 (char challenge[], char response[], int length); void n64_cic_nus_6105 (char challenge[], char response[], int length);
}; };

View File

@ -24,4 +24,4 @@ private:
bool m_ReadOnly; bool m_ReadOnly;
HANDLE m_hFile; HANDLE m_hFile;
}; };

View File

@ -72,4 +72,4 @@ private:
EventList m_Events; EventList m_Events;
BOOL m_bDoSomething; BOOL m_bDoSomething;
CriticalSection m_CS; CriticalSection m_CS;
}; };

View File

@ -288,4 +288,4 @@ bool CTLB::operator == (const CTLB& rTLB) const
bool CTLB::operator != (const CTLB& rTLB) const bool CTLB::operator != (const CTLB& rTLB) const
{ {
return !(*this == rTLB); return !(*this == rTLB);
} }

View File

@ -16,4 +16,4 @@ public:
virtual bool TranslateVaddr ( DWORD VAddr, DWORD &PAddr) const = 0; virtual bool TranslateVaddr ( DWORD VAddr, DWORD &PAddr) const = 0;
virtual bool ValidVaddr ( DWORD VAddr ) const = 0; virtual bool ValidVaddr ( DWORD VAddr ) const = 0;
virtual bool VAddrToRealAddr ( DWORD VAddr, void * &RealAddress ) const = 0; virtual bool VAddrToRealAddr ( DWORD VAddr, void * &RealAddress ) const = 0;
}; };

View File

@ -508,4 +508,4 @@ void CN64Rom::UnallocateRomImage ( void ) {
VirtualFree(m_ROMImage,0,MEM_RELEASE); VirtualFree(m_ROMImage,0,MEM_RELEASE);
m_ROMImage = NULL; m_ROMImage = NULL;
} }
} }

View File

@ -712,4 +712,4 @@ void CCodeBlock::CompileExitCode ( void )
DWORD CCodeBlock::NextTest ( void ) DWORD CCodeBlock::NextTest ( void )
{ {
return InterlockedIncrement(&m_Test); return InterlockedIncrement(&m_Test);
} }

View File

@ -49,4 +49,4 @@ private:
QWORD m_MemContents[2], * m_MemLocation[2]; QWORD m_MemContents[2], * m_MemLocation[2];
}; };
typedef std::map<DWORD, CCompiledFunc *> CCompiledFuncList; typedef std::map<DWORD, CCompiledFunc *> CCompiledFuncList;

View File

@ -75,4 +75,4 @@ void CFunctionMap::Reset ( bool bAllocate )
{ {
AllocateMemory(); AllocateMemory();
} }
} }

View File

@ -83,4 +83,4 @@ private:
STEP_TYPE m_NextInstruction; STEP_TYPE m_NextInstruction;
OPCODE m_Command; OPCODE m_Command;
DWORD m_Test; DWORD m_Test;
}; };

View File

@ -89,4 +89,4 @@ void CRecompMemory::ShowMemUsed()
DWORD TotalAvaliable = m_RecompSize / 0x100000; DWORD TotalAvaliable = m_RecompSize / 0x100000;
g_Notify->DisplayMessage(0,"Memory used: %d mb %-3d kb %-3d bytes Total Available: %d mb",MB,KB,Size, TotalAvaliable); g_Notify->DisplayMessage(0,"Memory used: %d mb %-3d kb %-3d bytes Total Available: %d mb",MB,KB,Size, TotalAvaliable);
} }

View File

@ -31,4 +31,4 @@ private:
enum { MaxCompileBufferSize = 0x03C00000 }; enum { MaxCompileBufferSize = 0x03C00000 };
enum { InitialCompileBufferSize = 0x00500000 }; enum { InitialCompileBufferSize = 0x00500000 };
enum { IncreaseCompileBufferSize = 0x00100000 }; enum { IncreaseCompileBufferSize = 0x00100000 };
}; };

View File

@ -5105,4 +5105,4 @@ void CRecompilerOps::OverflowDelaySlot (BOOL TestTimer)
} }
ExitCodeBlock(); ExitCodeBlock();
m_NextInstruction = END_BLOCK; m_NextInstruction = END_BLOCK;
} }

View File

@ -328,4 +328,4 @@ protected:
public: public:
static DWORD CompilePC ( void ) { return m_CompilePC; } static DWORD CompilePC ( void ) { return m_CompilePC; }
}; };

View File

@ -141,4 +141,4 @@ DWORD CALLBACK RomInfoProc (HWND hDlg, DWORD uMsg, DWORD wParam, DWORD lParam) {
return false; return false;
} }
return true; return true;
} }

View File

@ -24,4 +24,4 @@ public:
~RomInformation(void); ~RomInformation(void);
void DisplayInformation (HWND hParent) const; void DisplayInformation (HWND hParent) const;
}; };

View File

@ -107,4 +107,4 @@ void CSpeedLimitor::DecreaeSpeed ( void )
} }
SpeedChanged(m_Speed); SpeedChanged(m_Speed);
FixSpeedRatio(); FixSpeedRatio();
} }

View File

@ -1 +1 @@
#include "../stdafx.h" #include "../stdafx.h"

View File

@ -171,4 +171,4 @@ CCONTROL::CCONTROL(DWORD &Present, DWORD &RawData, int &PlugType) :
m_Present(Present), m_RawData(RawData), m_PlugType(PlugType) m_Present(Present), m_RawData(RawData), m_PlugType(PlugType)
{ {
m_Buttons.Value = 0; m_Buttons.Value = 0;
} }

View File

@ -39,4 +39,4 @@ private:
static int m_RefCount; static int m_RefCount;
static bool m_Registered; static bool m_Registered;
}; };

View File

@ -68,4 +68,4 @@ private:
static bool m_bSMM_PIDMA; static bool m_bSMM_PIDMA;
static bool m_bSMM_TLB; static bool m_bSMM_TLB;
static SYSTEM_TYPE m_SystemType; static SYSTEM_TYPE m_SystemType;
}; };

View File

@ -27,4 +27,4 @@ private:
static int m_RefCount; static int m_RefCount;
}; };

View File

@ -35,4 +35,4 @@ private:
static int m_RefCount; static int m_RefCount;
}; };

View File

@ -36,4 +36,4 @@ private:
static bool m_bProfiling; static bool m_bProfiling;
static int m_RefCount; static int m_RefCount;
}; };

View File

@ -34,4 +34,4 @@ public:
void DisplayDlCounter ( DWORD FrameRate ); void DisplayDlCounter ( DWORD FrameRate );
void DisplayViCounter ( DWORD FrameRate ); void DisplayViCounter ( DWORD FrameRate );
// void ClearDisplay ( void ); // void ClearDisplay ( void );
}; };

View File

@ -291,4 +291,4 @@ void CNotification::BreakPoint ( const char * File, const int LineNumber )
DisplayError("Fatal Error: Stopping emulation"); DisplayError("Fatal Error: Stopping emulation");
g_BaseSystem->CloseCpu(); g_BaseSystem->CloseCpu();
} }
} }

View File

@ -211,4 +211,4 @@ public:
void Store7ZipInfo ( C7zip & ZipFile, int FileNo ); void Store7ZipInfo ( C7zip & ZipFile, int FileNo );
static void GetFieldInfo ( ROMBROWSER_FIELDS_LIST & Fields, bool UseDefault = false ); static void GetFieldInfo ( ROMBROWSER_FIELDS_LIST & Fields, bool UseDefault = false );
}; };

View File

@ -40,4 +40,4 @@ private:
SETTING_SECTIONS m_Sections; SETTING_SECTIONS m_Sections;
CSettingsPage * m_CurrentPage, * m_GeneralOptionsPage, * m_AdvancedPage; CSettingsPage * m_CurrentPage, * m_GeneralOptionsPage, * m_AdvancedPage;
bool m_GameConfig; bool m_GameConfig;
}; };

View File

@ -95,4 +95,4 @@ bool CGameGeneralPage::EnableReset ( void )
void CGameGeneralPage::ResetPage() void CGameGeneralPage::ResetPage()
{ {
CSettingsPageImpl<CGameGeneralPage>::ResetPage(); CSettingsPageImpl<CGameGeneralPage>::ResetPage();
} }

View File

@ -239,4 +239,4 @@ public:
#ifdef pop_malloc #ifdef pop_malloc
#pragma pop_macro("malloc") #pragma pop_macro("malloc")
#endif #endif

View File

@ -425,4 +425,4 @@ void TestValidBinary ( )
#endif #endif
} }
#endif #endif

View File

@ -1 +1 @@
#include "stdafx.h" #include "stdafx.h"

View File

@ -261,4 +261,4 @@ __declspec(dllexport) DWORD DoRspCycles ( DWORD Cycles ) {
} }
return Cycles; return Cycles;
} }

View File

@ -39,4 +39,4 @@
extern DWORD RSP_NextInstruction, RSP_JumpTo, RSP_MfStatusCount; extern DWORD RSP_NextInstruction, RSP_JumpTo, RSP_MfStatusCount;
void BuildInterpreterCPU(void); void BuildInterpreterCPU(void);
DWORD RunInterpreterCPU(DWORD Cycles); DWORD RunInterpreterCPU(DWORD Cycles);

View File

@ -1783,4 +1783,4 @@ void rsp_UnknownOpcode (void) {
} }
} }
ExitThread(0); ExitThread(0);
} }

View File

@ -306,4 +306,4 @@ void GenerateTimerResults (void) {
ResetTimerList(); ResetTimerList();
} }
#endif #endif

View File

@ -34,4 +34,4 @@ enum SPECIAL_TIMERS {
void ResetTimerList ( void ); void ResetTimerList ( void );
DWORD StartTimer ( DWORD Address ); DWORD StartTimer ( DWORD Address );
void StopTimer ( void ); void StopTimer ( void );
void GenerateTimerResults ( void ); void GenerateTimerResults ( void );

View File

@ -951,4 +951,4 @@ DWORD RunRecompilerCPU ( DWORD Cycles ) {
_asm emms _asm emms
} }
return Cycles; return Cycles;
} }

View File

@ -104,4 +104,4 @@ extern RSP_COMPILER Compiler;
#define IsMmxEnabled (Compiler.mmx) #define IsMmxEnabled (Compiler.mmx)
#define IsMmx2Enabled (Compiler.mmx2) #define IsMmx2Enabled (Compiler.mmx2)
#define IsSseEnabled (Compiler.sse) #define IsSseEnabled (Compiler.sse)

View File

@ -1135,4 +1135,4 @@ BOOL RSP_DoSections(void) {
return TRUE; return TRUE;
} }
return FALSE; return FALSE;
} }

View File

@ -69,4 +69,4 @@ typedef union tagVect {
unsigned char UB[16]; unsigned char UB[16];
} VECTOR; } VECTOR;
#endif #endif

View File

@ -264,4 +264,4 @@ typedef union {
void SseShuffleReg ( int Dest, int Source, BYTE Immed ); void SseShuffleReg ( int Dest, int Source, BYTE Immed );
void x86_SetBranch32b(void * JumpByte, void * Destination); void x86_SetBranch32b(void * JumpByte, void * Destination);
void x86_SetBranch8b(void * JumpByte, void * Destination); void x86_SetBranch8b(void * JumpByte, void * Destination);

View File

@ -327,4 +327,4 @@ void Stop_x86_Log (void) {
} }
#endif #endif
#endif #endif

View File

@ -553,4 +553,4 @@ void RSP_SWV_DMEM ( DWORD Addr, int vect, int element ) {
*(RSPInfo.DMEM + ((Addr + (offset & 0xF)) ^ 3)) = RSP_Vect[vect].B[15 - (Count & 0xF)]; *(RSPInfo.DMEM + ((Addr + (offset & 0xF)) ^ 3)) = RSP_Vect[vect].B[15 - (Count & 0xF)];
offset += 1; offset += 1;
} }
} }

View File

@ -370,4 +370,4 @@ int main (int argc, char *argv[])
} }
fclose(fp); fclose(fp);
return 0; return 0;
} }

View File

@ -1277,4 +1277,4 @@ DWORD WINAPI DelayedShortcut(LPVOID lpParam)
} }
P_free(lpParam); P_free(lpParam);
return 0; return 0;
} }

View File

@ -160,4 +160,4 @@ inline void FillN64AnalogComboBox( HWND hDlg, int ComboBox )
void SaveXInputConfigToFile( FILE *file, LPXCONTROLLER gController ); void SaveXInputConfigToFile( FILE *file, LPXCONTROLLER gController );
void LoadXInputConfigFromFile( FILE *file, LPXCONTROLLER gController ); void LoadXInputConfigFromFile( FILE *file, LPXCONTROLLER gController );
#endif //_XINPUTCONTROLLER_H #endif //_XINPUTCONTROLLER_H