ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleaned up more warnings (on warning level 4)

This commit is contained in:
zilmar 2012-10-05 19:20:53 +10:00
parent b809b57faa
commit ad10525303
12 changed files with 53 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Project64/N64 System/N64 Rom Class.cpp
View File

@ -250,7 +250,7 @@ bool CN64Rom::IsValidRomImage ( BYTE Test[4] ) {
return false;
}
void CN64Rom::NotificationCB ( LPCSTR Status, CN64Rom * _this )
void CN64Rom::NotificationCB ( LPCSTR Status, CN64Rom * /*_this*/ )
{
_Notify->DisplayMessage(5,"%s",Status);
}
@ -269,7 +269,6 @@ bool CN64Rom::LoadN64Image ( const char * FileLoc, bool LoadBootCodeOnly ) {
//this should be a 7zip file
char * SubFile = strstr(FullPath,"?");
bool bFreeSubFile = false;
if (SubFile == NULL)
{
//Pop up a dialog and select file

2
Source/Project64/Plugins/GFX plugin.h
View File

@ -89,7 +89,7 @@ private:
void (__cdecl *SetSettingInfo2) ( PLUGIN_SETTINGS2 * info );
static void __cdecl DummyDrawScreen ( void ) {}
static void __cdecl DummyMoveScreen ( int xpos, int ypos ) {}
static void __cdecl DummyMoveScreen ( int /*xpos*/, int /*ypos*/ ) {}
static void __cdecl DummyViStatusChanged ( void ) {}
static void __cdecl DummyViWidthChanged ( void ) {}
static void __cdecl DummySoftReset ( void ) {}

2
Source/Project64/Plugins/RSP Plugin.cpp
View File

@ -1,7 +1,7 @@
#include "stdafx.h"
void FixUPXIssue ( BYTE * ProgramLocation );
void DummyFunc1 ( BOOL a) {}
void DummyFunc1 ( BOOL /*a*/) {}
CRSP_Plugin::CRSP_Plugin ( const char * FileName) {
//Make sure all parts of the class are initialized

20
Source/Project64/Settings/Settings Class.cpp
View File

@ -631,7 +631,7 @@ bool CSettings::LoadStringIndex ( SettingID Type, int index, stdstr & Value )
return false;
}
bool CSettings::LoadStringIndex ( SettingID Type, int index, char * Buffer, int BufferSize )
bool CSettings::LoadStringIndex ( SettingID /*Type*/, int /*index*/, char * /*Buffer*/, int /*BufferSize*/ )
{
_Notify->BreakPoint(__FILE__,__LINE__);
return false;
@ -662,13 +662,13 @@ void CSettings::LoadDefaultBool ( SettingID Type, bool & Value )
}
}
bool CSettings::LoadDefaultBoolIndex ( SettingID Type, int index )
bool CSettings::LoadDefaultBoolIndex ( SettingID /*Type*/, int /*index*/ )
{
_Notify->BreakPoint(__FILE__,__LINE__);
return false;
}
void CSettings::LoadDefaultBoolIndex ( SettingID Type, int index , bool & Value )
void CSettings::LoadDefaultBoolIndex ( SettingID /*Type*/, int /*index*/, bool & /*Value*/ )
{
_Notify->BreakPoint(__FILE__,__LINE__);
}
@ -697,13 +697,13 @@ void CSettings::LoadDefaultDword ( SettingID Type, DWORD & Value)
}
}
DWORD CSettings::LoadDefaultDwordIndex ( SettingID Type, int index )
DWORD CSettings::LoadDefaultDwordIndex ( SettingID /*Type*/, int /*index*/ )
{
_Notify->BreakPoint(__FILE__,__LINE__);
return false;
}
void CSettings::LoadDefaultDwordIndex ( SettingID Type, int index, DWORD & Value)
void CSettings::LoadDefaultDwordIndex ( SettingID /*Type*/, int /*index*/, DWORD & /*Value*/)
{
_Notify->BreakPoint(__FILE__,__LINE__);
}
@ -732,23 +732,23 @@ void CSettings::LoadDefaultString ( SettingID Type, stdstr & Value )
}
}
void CSettings::LoadDefaultString ( SettingID Type, char * Buffer, int BufferSize )
void CSettings::LoadDefaultString ( SettingID /*Type*/, char * /*Buffer*/, int /*BufferSize*/ )
{
_Notify->BreakPoint(__FILE__,__LINE__);
}
stdstr CSettings::LoadDefaultStringIndex ( SettingID Type, int index )
stdstr CSettings::LoadDefaultStringIndex ( SettingID /*Type*/, int /*index*/ )
{
_Notify->BreakPoint(__FILE__,__LINE__);
return false;
}
void CSettings::LoadDefaultStringIndex ( SettingID Type, int index, stdstr & Value )
void CSettings::LoadDefaultStringIndex ( SettingID /*Type*/, int /*index*/, stdstr & /*Value*/ )
{
_Notify->BreakPoint(__FILE__,__LINE__);
}
void CSettings::LoadDefaultStringIndex ( SettingID Type, int index, char * Buffer, int BufferSize )
void CSettings::LoadDefaultStringIndex ( SettingID /*Type*/, int /*index*/, char * /*Buffer*/, int /*BufferSize*/ )
{
_Notify->BreakPoint(__FILE__,__LINE__);
}
@ -953,7 +953,7 @@ void CSettings::SettingTypeChanged( SettingType Type )
}
}
}
void CSettings::UnknownSetting (SettingID Type)
void CSettings::UnknownSetting (SettingID /*Type*/)
{
#ifdef _DEBUG
_Notify->BreakPoint(__FILE__,__LINE__);

6
Source/Project64/User Interface/Gui Class.cpp
View File

@ -141,7 +141,7 @@ void CMainGui::AboutIniBox (void) {
DialogBoxParam(GetModuleHandle(NULL), MAKEINTRESOURCE(IDD_About_Ini), (HWND)m_hMainWindow, (DLGPROC)AboutIniBoxProc,(LPARAM)this);
}
DWORD CALLBACK AboutIniBoxProc (WND_HANDLE WndHandle, DWORD uMsg, DWORD wParam, DWORD lParam) {
DWORD CALLBACK AboutIniBoxProc (WND_HANDLE WndHandle, DWORD uMsg, DWORD wParam, DWORD /*lParam*/) {
static char RDBHomePage[300], CHTHomePage[300], RDXHomePage[300];
switch (uMsg) {
@ -326,7 +326,7 @@ bool CMainGui::ProcessGuiMessages (void) {
return false;
}
void CMainGui::Resize (DWORD fwSizeType, WORD nWidth, WORD nHeight) {
void CMainGui::Resize (DWORD /*fwSizeType*/, WORD nWidth, WORD nHeight) {
RECT clrect, swrect;
GetClientRect( (HWND)m_hMainWindow, &clrect );
GetClientRect( (HWND)m_hStatusWnd, &swrect );
@ -900,7 +900,7 @@ LPSTR ValidateDecryptString2 (LPSTR String, int Len)
}
DWORD CALLBACK AboutUserProc (HWND hWnd, DWORD uMsg, DWORD wParam, DWORD lParam)
DWORD CALLBACK AboutUserProc (HWND hWnd, DWORD uMsg, DWORD wParam, DWORD /*lParam*/)
{
static char UserInfo[] = "hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh";

2
Source/Project64/User Interface/Gui Class.h
View File

@ -28,7 +28,7 @@ class CMainGui :
WND_HANDLE m_hMainWindow, m_hStatusWnd;
bool m_hacked;
const bool m_bMainWindow;
int m_InvalidExeMsg;
DWORD m_InvalidExeMsg;
CriticalSection m_CS;
bool m_SaveMainWindowPos;

12
Source/Project64/User Interface/Main Menu Class.cpp
View File

@ -60,7 +60,7 @@ int CMainMenu::ProcessAccelerator ( WND_HANDLE hWnd, void * lpMsg ) {
return TranslateAccelerator((HWND)hWnd,(HACCEL)m_AccelTable,(LPMSG)lpMsg);
}
bool CMainMenu::ProcessMessage(WND_HANDLE hWnd, DWORD FromAccelerator, DWORD MenuID) {
bool CMainMenu::ProcessMessage(WND_HANDLE hWnd, DWORD /*FromAccelerator*/, DWORD MenuID) {
switch (MenuID) {
case ID_FILE_OPEN_ROM:
{
@ -621,8 +621,8 @@ stdstr CMainMenu::GetSaveSlotString (int Slot)
stdstr LastSaveTime;
//check first save name
stdstr & _GoodName = _Settings->LoadString(Game_GoodName);
stdstr & _InstantSaveDirectory = _Settings->LoadString(Directory_InstantSave);
stdstr _GoodName = _Settings->LoadString(Game_GoodName);
stdstr _InstantSaveDirectory = _Settings->LoadString(Directory_InstantSave);
stdstr CurrentSaveName;
if (Slot != 0) {
CurrentSaveName.Format("%s.pj%d",_GoodName.c_str(), Slot);
@ -645,7 +645,7 @@ stdstr CMainMenu::GetSaveSlotString (int Slot)
// Check old file name
if (LastSaveTime.empty())
{
stdstr & _RomName = _Settings->LoadString(Game_GameName);
stdstr _RomName = _Settings->LoadString(Game_GameName);
if (Slot > 0) {
FileName.Format("%s%s.pj%d", _InstantSaveDirectory.c_str(), _RomName.c_str(),Slot);
} else {
@ -778,8 +778,8 @@ void CMainMenu::FillOutMenu ( MENU_HANDLE hMenu ) {
} else {
if (RecentRomMenu.size() != 0) {
FileMenu.push_back(MENU_ITEM(SPLITER ));
for (MenuItemList::iterator MenuItem = RecentRomMenu.begin(); MenuItem != RecentRomMenu.end(); MenuItem++) {
MENU_ITEM * RomItem = &(*MenuItem);
for (MenuItemList::iterator MenuItem = RecentRomMenu.begin(); MenuItem != RecentRomMenu.end(); MenuItem++)
{
FileMenu.push_back(*MenuItem);
}
}

4
Source/Project64/User Interface/MenuShortCuts.cpp
View File

@ -402,7 +402,7 @@ void CShortCuts::Load (bool InitialValues )
MSC_MAP::iterator item = m_ShortCuts.find(ID);
if (item == m_ShortCuts.end()) { continue; }
item->second.AddShortCut(key,bCtrl == 1,bAlt == 1,bShift == 1,AccessMode,bUserAdded == 1,bInactive == 1);
item->second.AddShortCut((WORD)(key&0xFFFF),bCtrl == 1,bAlt == 1,bShift == 1,AccessMode,bUserAdded == 1,bInactive == 1);
}
} while (feof(file) == 0);
@ -477,7 +477,7 @@ HACCEL CShortCuts::GetAcceleratorTable ( void )
continue;
}
if (size >= MaxSize) { break; }
AccelList[size].cmd = Item->first;
AccelList[size].cmd = (WORD)Item->first;
AccelList[size].key = Key.Key();
AccelList[size].fVirt = FVIRTKEY;
if (Key.Alt()) { AccelList[size].fVirt |= FALT; }

38
Source/Project64/User Interface/Rom Browser Class.cpp
View File

@ -504,7 +504,7 @@ bool CRomBrowser::FillRomInfo(ROM_INFO * pRomInfo) {
}
}
bool CRomBrowser::GetRomFileNames( strlist & FileList, CPath & BaseDirectory, stdstr & Directory, bool InWatchThread )
bool CRomBrowser::GetRomFileNames( strlist & FileList, const CPath & BaseDirectory, const stdstr & Directory, bool InWatchThread )
{
CPath SearchPath((const stdstr&)BaseDirectory,"*.*");
SearchPath.AppendDirectory(Directory.c_str());
@ -534,13 +534,13 @@ bool CRomBrowser::GetRomFileNames( strlist & FileList, CPath & BaseDirectory, st
return true;
}
void CRomBrowser::NotificationCB ( LPCSTR Status, CRomBrowser * _this )
void CRomBrowser::NotificationCB ( LPCSTR Status, CRomBrowser * /*_this*/ )
{
_Notify->DisplayMessage(5,"%s",Status);
}
void CRomBrowser::AddFileNameToList( strlist & FileList, stdstr & Directory, CPath & File )
void CRomBrowser::AddFileNameToList( strlist & FileList, const stdstr & Directory, CPath & File )
{
if (FileList.size() > 3000)
{
@ -560,9 +560,9 @@ void CRomBrowser::AddFileNameToList( strlist & FileList, stdstr & Directory, CPa
}
}
void CRomBrowser::FillRomList ( strlist & FileList, CPath & BaseDirectory, stdstr & Directory, const char * lpLastRom )
void CRomBrowser::FillRomList ( strlist & FileList, const CPath & BaseDirectory, const stdstr & Directory, const char * lpLastRom )
{
CPath SearchPath((const stdstr&)BaseDirectory,"*.*");
CPath SearchPath(BaseDirectory,"*.*");
SearchPath.AppendDirectory(Directory.c_str());
WriteTraceF(TraceDebug,"CRomBrowser::FillRomList 1 %s",(LPCSTR)SearchPath);
@ -690,7 +690,7 @@ void CRomBrowser::FillRomList ( strlist & FileList, CPath & BaseDirectory, stdst
RomInfo.Country = *(RomData + 0x3D);
RomInfo.CRC1 = *(DWORD *)(RomData + 0x10);
RomInfo.CRC2 = *(DWORD *)(RomData + 0x14);
m_ZipIniFile->GetNumber(SectionName.c_str(),stdstr_f("%s-Cic",f->Name).c_str(), -1,(DWORD &)RomInfo.CicChip);
m_ZipIniFile->GetNumber(SectionName.c_str(),stdstr_f("%s-Cic",f->Name).c_str(), (ULONG)-1,(DWORD &)RomInfo.CicChip);
WriteTrace(TraceDebug,"CRomBrowser::FillRomList 16");
FillRomExtensionInfo(&RomInfo);
@ -919,7 +919,7 @@ void CRomBrowser::LoadRomList (void) {
lvItem.lParam = (LPARAM)m_RomInfo.size();
lvItem.pszText = LPSTR_TEXTCALLBACK;
int index = ListView_InsertItem((HWND)m_hRomList, &lvItem);
ListView_InsertItem((HWND)m_hRomList, &lvItem);
m_RomInfo.push_back(RomInfo);
}
CloseHandle(hFile);
@ -1177,7 +1177,7 @@ void CRomBrowser::RomList_ColoumnSortList(DWORD pnmh) {
size_t index;
for (index = 0; index < m_Fields.size(); index++) {
if (m_Fields[index].Pos() == pnmv->iSubItem) { break; }
if (m_Fields[index].Pos() == (size_t)pnmv->iSubItem) { break; }
}
if (m_Fields.size() == index) { return; }
if (_stricmp(_Settings->LoadStringIndex(RomBrowser_SortFieldIndex,0).c_str(),m_Fields[index].Name()) == 0) {
@ -1313,7 +1313,7 @@ void CRomBrowser::RomList_GetDispInfo(DWORD pnmh) {
if (strlen(lpdi->item.pszText) == 0) { strcpy(lpdi->item.pszText," "); }
}
void CRomBrowser::RomList_OpenRom(DWORD pnmh) {
void CRomBrowser::RomList_OpenRom(DWORD /*pnmh*/) {
ROM_INFO * pRomInfo;
LV_ITEM lvItem;
LONG iItem;
@ -1336,9 +1336,8 @@ void CRomBrowser::RomList_OpenRom(DWORD pnmh) {
_BaseSystem->RunFileImage(pRomInfo->szFullFileName);
}
void CRomBrowser::RomList_PopupMenu(DWORD pnmh) {
LV_DISPINFO * lpdi = (LV_DISPINFO *)pnmh;
void CRomBrowser::RomList_PopupMenu(DWORD /*pnmh*/)
{
LONG iItem = ListView_GetNextItem((HWND)m_hRomList, -1, LVNI_SELECTED);
m_SelectedRom = "";
if (iItem != -1) {
@ -1471,7 +1470,7 @@ void CRomBrowser::SaveRomListColoumnInfo(void) {
memset(&lvColumn,0,sizeof(lvColumn));
lvColumn.mask = LVCF_WIDTH;
for (int Coloumn = 0;ListView_GetColumn((HWND)m_hRomList,Coloumn,&lvColumn); Coloumn++) {
for (size_t Coloumn = 0;ListView_GetColumn((HWND)m_hRomList,Coloumn,&lvColumn); Coloumn++) {
size_t index;
bool bFound = false;
for (index = 0; index < m_Fields.size(); index++)
@ -1493,7 +1492,8 @@ void CRomBrowser::SaveRomListColoumnInfo(void) {
WriteTrace(TraceDebug,"SaveRomListColoumnInfo - Done");
}
int CALLBACK CRomBrowser::SelectRomDirCallBack(WND_HANDLE hwnd,DWORD uMsg,DWORD lp, DWORD lpData) {
int CALLBACK CRomBrowser::SelectRomDirCallBack(WND_HANDLE hwnd,DWORD uMsg,DWORD /*lp*/, DWORD lpData)
{
switch(uMsg)
{
case BFFM_INITIALIZED:
@ -1755,11 +1755,13 @@ void CRomBrowser::WatchThreadStop( void )
}
WriteTrace(TraceDebug,"CRomBrowser::WatchThreadStop 1");
SetEvent(m_WatchStopEvent);
DWORD ExitCode;
for (int count = 0; count < 20; count ++ ) {
WriteTrace(TraceDebug,"CRomBrowser::WatchThreadStop 2");
DWORD ExitCode = 0;
for (int count = 0; count < 20; count ++ )
{
WriteTrace(TraceDebug,"CRomBrowser::WatchThreadStop 2");
GetExitCodeThread(m_WatchThread,&ExitCode);
if (ExitCode != STILL_ACTIVE) {
if (ExitCode != STILL_ACTIVE)
{
break;
}
Sleep(200);

10
Source/Project64/User Interface/Rom Browser.h
View File

@ -6,7 +6,7 @@ class CPlugins;
class ROMBROWSER_FIELDS {
stdstr m_Name;
int m_Pos, m_DefaultPos;
size_t m_Pos, m_DefaultPos;
int m_ID;
ULONG m_ColWidth;
LanguageStringID m_LangID;
@ -30,7 +30,7 @@ public:
}
}
inline LPCSTR Name ( void ) const { return m_Name.c_str(); }
inline int Pos ( void ) const { return m_Pos; }
inline size_t Pos ( void ) const { return m_Pos; }
inline bool PosChanged ( void ) const { return m_PosChanged; }
inline int ID ( void ) const { return m_ID; }
inline int ColWidth ( void ) const { return m_ColWidth; }
@ -135,7 +135,7 @@ class CRomBrowser
CIniFile * m_ZipIniFile;
bool m_AllowSelectionLastRom;
void AddFileNameToList ( strlist & FileList, stdstr & Directory, CPath & File );
void AddFileNameToList ( strlist & FileList, const stdstr & Directory, CPath & File );
void AddRomToList ( const char * RomLocation, const char * lpLastRom );
void AddRomInfoToList ( ROM_INFO &RomInfo, const char * lpLastRom );
void AllocateBrushs ( void );
@ -146,7 +146,7 @@ class CRomBrowser
void DeallocateBrushs ( void );
void FillRomExtensionInfo ( ROM_INFO * pRomInfo );
bool FillRomInfo ( ROM_INFO * pRomInfo );
void FillRomList ( strlist & FileList, CPath & BaseDirectory, stdstr & Directory, const char * lpLastRom );
void FillRomList ( strlist & FileList, const CPath & BaseDirectory, const stdstr & Directory, const char * lpLastRom );
void FixRomListWindow ( void );
static int GetCicChipID ( BYTE * RomData );
bool LoadDataFromRomFile ( char * FileName, BYTE * Data,int DataLen, int * RomSize, FILE_FORMAT & FileFormat );
@ -158,7 +158,7 @@ class CRomBrowser
void RomList_OpenRom ( DWORD pnmh );
void RomList_PopupMenu ( DWORD pnmh );
void RomList_SortList ( void );
bool GetRomFileNames ( strlist & FileList, CPath & BaseDirectory, stdstr & Directory, bool InWatchThread );
bool GetRomFileNames ( strlist & FileList, const CPath & BaseDirectory, const stdstr & Directory, bool InWatchThread );
MD5 RomListHash ( strlist & FileList );
static void __stdcall NotificationCB ( LPCSTR Status, CRomBrowser * _this );

4
Source/Project64/ValidateBinary.cpp
View File

@ -69,7 +69,7 @@ void TestValidBinaryThread ( )
if (bRes && Length > 0)
{
DWORD Type;
RunData = AUTO_PTR<BYTE>(new BYTE[Length]);
RunData.reset(new BYTE[Length]);
bRes = Registry.GetValue("data",RunData.get(),Length,&Type);
if (!bRes && Type != REG_BINARY)
{
@ -94,7 +94,7 @@ void TestValidBinaryThread ( )
if (bRes)
{
DWORD Type;
RunData = AUTO_PTR<BYTE>(new BYTE[Length]);
RunData.reset(new BYTE[Length]);
bRes = Registry.GetValue("data",RunData.get(),Length,&Type);
if (!bRes && Type != REG_BINARY)
{

2
Source/Project64/main.cpp
View File

@ -244,7 +244,7 @@ void FixDirectories ( void )
Directory.CreateDirectory();
}
int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpszArgs, int nWinMode)
int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE /*hPrevInstance*/, LPSTR /*lpszArgs*/, int /*nWinMode*/)
{
FixDirectories();