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

- fix warnings;

This commit is contained in:
mtabachenko 2013-09-16 17:10:51 +00:00
parent 4d95474f92
commit 1cde7d498d
16 changed files with 60 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
desmume/src/arm_jit.cpp
View File

@ -784,7 +784,6 @@ static void emit_MMU_aluMemCycles(int alu_cycles, GpVar mem_cycles, int populati
{ \
if(REG_POS(i,12)==15) \
{ \
GpVar tmp = c.newGpVar(kX86VarTypeGpd); \
c.mov(cpu_ptr(next_instruction), lhs); \
c.add(bb_total_cycles, 2); \
} \

2
desmume/src/cheatSystem.cpp
View File

@ -653,7 +653,7 @@ BOOL CHEATS::load()
continue;
}
trim(buf);
if ((strlen(buf) == 0) || (buf[0] == ';')) continue;
if ((buf[0] == 0) || (buf[0] == ';')) continue;
if(!strncasecmp(buf,"name=",5)) continue;
if(!strncasecmp(buf,"serial=",7)) continue;

2
desmume/src/firmware.cpp
View File

@ -249,7 +249,7 @@ bool CFIRMWARE::load()
if (CommonSettings.UseExtFirmware == false)
return false;
if (strlen(CommonSettings.Firmware) == 0)
if (CommonSettings.Firmware[0] == 0)
return false;
FILE *fp = fopen(CommonSettings.Firmware, "rb");

2
desmume/src/path.h
View File

@ -193,7 +193,7 @@ public:
void ReadPathSettings()
{
if( ( strcmp(pathToModule, "") == 0) || !pathToModule)
if (pathToModule[0] == 0)
LoadModulePath();
ReadKey(pathToRoms, ROMKEY);

2
desmume/src/rasterize.cpp
View File

@ -1371,7 +1371,7 @@ void SoftRasterizerEngine::framebufferProcess()
//zero 20-jun-2013 - this doesnt make any sense. at least, it should be related to the 0x8000 bit. if this is undocumented behaviour, lets write about which scenario proves it here, or which scenario is requiring this code.
//// this seems to be the only thing that selectively disables edge marking
//edgeMarkDisabled[i] = (col == 0x7FFF);
edgeMarkDisabled[i] = false;
edgeMarkDisabled[i] = 0;
}
for(int i=0,y=0;y<192;y++)

2
desmume/src/readwrite.cpp
View File

@ -76,7 +76,7 @@ int write64le(u64 b, EMUFILE* os)
int read32le(u32 *Bufo, EMUFILE *fp)
{
u32 buf;
u32 buf = 0;
if(fp->_fread(&buf,4)<4)
return 0;
#ifdef LOCAL_LE

2
desmume/src/texcache.cpp
View File

@ -645,7 +645,7 @@ public:
{
u16 c = map[x];
int alpha = ((c&0x8000)?opaqueColor:0);
*dwdst++ = CONVERT(c&0x7FFF,alpha);
*dwdst++ = CONVERT(c,alpha);
}
}
break;

18
desmume/src/utils/fsnitro.cpp
View File

@ -98,10 +98,10 @@ FS_NITRO::FS_NITRO(u8 *cart_rom)
printf("\t* ARM7 at Overlay 0x%08X, size 0x%08X\n", ARM7OverlayOff, ARM7OverlaySize);
printf("\t* ARM9 exe at %08X, size %08Xh\n", ARM9exeStart, ARM9exeSize);
printf("\t* ARM7 exe at %08X, size %08Xh\n", ARM7exeStart, ARM7exeSize);
printf("\t* Directories: %d\n", numDirs);
printf("\t* Files %d\n", numFiles);
printf("\t* ARM9 Overlays %d\n", numOverlay9);
printf("\t* ARM7 Overlays %d\n", numOverlay7);
printf("\t* Directories: %u\n", numDirs);
printf("\t* Files %u\n", numFiles);
printf("\t* ARM9 Overlays %u\n", numOverlay9);
printf("\t* ARM7 Overlays %u\n", numOverlay7);
fat = new FAT_NITRO[numFiles];
fnt = new FNT_NITRO[numDirs];
@ -171,9 +171,9 @@ bool FS_NITRO::loadFileTables()
for (u32 i = 0 ; i < numOverlay9; i++)
{
char buf[129] = {0};
memset(&buf[9], 0, sizeof(buf));
memset(&buf[0], 0, sizeof(buf));
fat[ovr9[i].fileID].isOverlay = true;
sprintf(buf, "overlay_%04d.bin", ovr9[i].id);
sprintf(buf, "overlay_%04u.bin", ovr9[i].id);
fat[ovr9[i].fileID].filename = buf;
}
}
@ -185,9 +185,9 @@ bool FS_NITRO::loadFileTables()
for (u32 i = 0 ; i < numOverlay7; i++)
{
char buf[129] = {0};
memset(&buf[9], 0, sizeof(buf));
memset(&buf[0], 0, sizeof(buf));
fat[ovr7[i].fileID].isOverlay = true;
sprintf(buf, "overlay_%04d.bin", ovr7[i].id);
sprintf(buf, "overlay_%04u.bin", ovr7[i].id);
fat[ovr7[i].fileID].filename = buf;
}
}
@ -533,7 +533,7 @@ bool FS_NITRO::extractAll(string to, void (*callback)(u32 current, u32 num))
{
if (fat[i].isOverlay) continue;
string fname = getFullPathByFileID(i, false);
extract(i, fname.c_str());
extract(i, fname);
if (callback)
callback(i, numFiles);
}

18
desmume/src/windows/cheatsWin.cpp
View File

@ -48,7 +48,7 @@ static u8 searchAddSize = 0;
static const char* searchAddDesc = 0;
static char editBuf[3][75] = { 0 };
static u32 cheatEditPos = 0;
static u8 cheatAddPasteCheck = 0;
static bool cheatAddPasteCheck = false;
static u8 cheatXXtype = 0;
static u8 cheatXXaction = 0;
@ -267,7 +267,7 @@ INT_PTR CALLBACK CheatsAddProc(HWND dialog, UINT msg,WPARAM wparam,LPARAM lparam
if(cheatAddPasteCheck)
{
cheatAddPasteCheck = 0;
cheatAddPasteCheck = false;
char temp [12];
sprintf(temp, "%06X", val);
if(strcmp(editBuf[0], temp))
@ -297,7 +297,7 @@ INT_PTR CALLBACK CheatsAddProc(HWND dialog, UINT msg,WPARAM wparam,LPARAM lparam
if(cheatAddPasteCheck || parseOffset)
{
cheatAddPasteCheck = 0;
cheatAddPasteCheck = false;
val &= searchRange[searchAddSize][1];
char temp [12];
sprintf(temp, "%u", val);
@ -374,8 +374,8 @@ INT_PTR CALLBACK CheatsEditProc(HWND dialog, UINT msg,WPARAM wparam,LPARAM lpara
cheats->get(&tempCheat, cheatEditPos);
memset(buf, 0, 100);
memset(buf2, 0, 100);
memset(&buf[0], 0, sizeof(buf));
memset(&buf2[0], 0, sizeof(buf2));
tempCheat.code[0][0] &= 0x00FFFFFF;
wsprintf(buf, "%06X", tempCheat.code[0][0]);
SetWindowText(GetDlgItem(dialog, IDC_EDIT1), buf);
@ -443,7 +443,7 @@ INT_PTR CALLBACK CheatsEditProc(HWND dialog, UINT msg,WPARAM wparam,LPARAM lpara
if(cheatAddPasteCheck || parseOffset)
{
cheatAddPasteCheck = 0;
cheatAddPasteCheck = false;
val &= searchRange[tempCheat.size][1];
char temp [12];
sprintf(temp, "%u", val);
@ -1150,9 +1150,9 @@ INT_PTR CALLBACK CheatsSearchViewWnd(HWND dialog, UINT msg,WPARAM wparam,LPARAM
SendMessage(searchListView, WM_SETREDRAW, (WPARAM)FALSE,0);
while (cheatSearch->getList(&address, &val))
{
char buf[256];
char buf[256] = {0};
wsprintf(buf, "0x02%06X", address);
lvi.pszText= buf;
lvi.pszText = buf;
u32 row = SendMessage(searchListView, LVM_INSERTITEM, 0, (LPARAM)&lvi);
_ltoa(val, buf, 10);
ListView_SetItemText(searchListView, row, 1, buf);
@ -1379,7 +1379,7 @@ INT_PTR CALLBACK CheatsExportProc(HWND dialog, UINT msg,WPARAM wparam,LPARAM lpa
case WM_INITDIALOG:
{
SetWindowText(GetDlgItem(dialog, IDC_CDATE), (LPCSTR)cheatsExport->date);
if ((char*)cheatsExport->gametitle != "")
if (cheatsExport->gametitle[0] != 0)
{
char buf[512] = {0};
GetWindowText(dialog, &buf[0], sizeof(buf));

2
desmume/src/windows/fsnitroView.cpp
View File

@ -351,7 +351,7 @@ BOOL CALLBACK ViewFSNitroProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam
u32 start = fs->getStartAddrById(currentFileID);
u32 end = fs->getEndAddrById(currentFileID);
u32 size = (end - start);
sprintf(buf, "[%08X-%08X] size %d", start, end, size);
sprintf(buf, "[%08X-%08X] size %u", start, end, size);
SetWindowText(GetDlgItem(hWnd, IDC_FILE_INFO), buf);
}
}

6
desmume/src/windows/gbaslot_config.cpp
View File

@ -248,7 +248,7 @@ INT_PTR CALLBACK GbaSlotGBAgame(HWND dialog, UINT msg,WPARAM wparam,LPARAM lpara
case WM_INITDIALOG:
{
SetWindowText(GetDlgItem(dialog, IDC_PATHGAME), tmp_gbagame_filename);
if (strlen(tmp_gbagame_filename) > 0) _OKbutton = true;
if (tmp_gbagame_filename[0] == 0) _OKbutton = true;
return TRUE;
}
case WM_COMMAND:
@ -349,7 +349,7 @@ INT_PTR CALLBACK GbaSlotGuitarGrip(HWND dialog, UINT msg,WPARAM wparam,LPARAM lp
SendDlgItemMessage(dialog,IDC_GYELLOW,WM_USER+44,tmp_Guitar.YELLOW,0);
SendDlgItemMessage(dialog,IDC_GBLUE,WM_USER+44,tmp_Guitar.BLUE,0);
PostMessage(dialog,WM_NEXTDLGCTL,0,0);
return true;
return TRUE;
}
return FALSE;
}
@ -435,7 +435,7 @@ INT_PTR CALLBACK GbaSlotPiano(HWND dialog, UINT msg,WPARAM wparam,LPARAM lparam)
SendDlgItemMessage(dialog,IDC_PIANO_B,WM_USER+44,tmp_Piano.B,0);
SendDlgItemMessage(dialog,IDC_PIANO_HIC,WM_USER+44,tmp_Piano.HIC,0);
PostMessage(dialog,WM_NEXTDLGCTL,0,0);
return true;
return TRUE;
}
return FALSE;
}

4
desmume/src/windows/hotkey.cpp
View File

@ -114,7 +114,7 @@ void HK_JitBlockSizeDec(int, bool justPressed)
CommonSettings.jit_max_block_size--;
char tmp[256];
sprintf(tmp,"JIT block size changed to: %d", CommonSettings.jit_max_block_size);
sprintf(tmp,"JIT block size changed to: %u", CommonSettings.jit_max_block_size);
osd->addLine(tmp);
arm_jit_reset(CommonSettings.use_jit, true);
}
@ -126,7 +126,7 @@ void HK_JitBlockSizeInc(int, bool justPressed)
CommonSettings.jit_max_block_size++;
char tmp[256];
sprintf(tmp,"JIT block size changed to: %d", CommonSettings.jit_max_block_size);
sprintf(tmp,"JIT block size changed to: %u", CommonSettings.jit_max_block_size);
osd->addLine(tmp);
arm_jit_reset(CommonSettings.use_jit, true);
}

2
desmume/src/windows/importSave.cpp
View File

@ -89,7 +89,7 @@ BOOL CALLBACK ImportSizeSelect_Proc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM l
else
{
char sizeS[30] = {0};
memset(&sizeS[0], 0, sizeof(size));
memset(&sizeS[0], 0, sizeof(sizeS));
u32 ss = save_types[fileSaveType+1].size * 8 / 1024;
if (ss >= 1024)
sprintf(sizeS, "%i Mbit", ss / 1024);

52
desmume/src/windows/inputdx.cpp
View File

@ -1928,30 +1928,30 @@ void EnableDisableKeyFields (int index, HWND hDlg)
if(index < 5)
{
// Support Unicode display
SetDlgItemTextW(hDlg,IDC_LABEL_RIGHT,(LPWSTR)INPUTCONFIG_LABEL_RIGHT);
SetDlgItemTextW(hDlg,IDC_LABEL_UPLEFT,(LPWSTR)INPUTCONFIG_LABEL_UPLEFT);
SetDlgItemTextW(hDlg,IDC_LABEL_UPRIGHT,(LPWSTR)INPUTCONFIG_LABEL_UPRIGHT);
SetDlgItemTextW(hDlg,IDC_LABEL_DOWNRIGHT,(LPWSTR)INPUTCONFIG_LABEL_DOWNRIGHT);
SetDlgItemTextW(hDlg,IDC_LABEL_UP,(LPWSTR)INPUTCONFIG_LABEL_UP);
SetDlgItemTextW(hDlg,IDC_LABEL_LEFT,(LPWSTR)INPUTCONFIG_LABEL_LEFT);
SetDlgItemTextW(hDlg,IDC_LABEL_DOWN,(LPWSTR)INPUTCONFIG_LABEL_DOWN);
SetDlgItemTextW(hDlg,IDC_LABEL_DOWNLEFT,(LPWSTR)INPUTCONFIG_LABEL_DOWNLEFT);
SetDlgItemText(hDlg,IDC_LABEL_RIGHT, (LPCSTR)INPUTCONFIG_LABEL_RIGHT);
SetDlgItemText(hDlg,IDC_LABEL_UPLEFT, (LPCSTR)INPUTCONFIG_LABEL_UPLEFT);
SetDlgItemText(hDlg,IDC_LABEL_UPRIGHT, (LPCSTR)INPUTCONFIG_LABEL_UPRIGHT);
SetDlgItemText(hDlg,IDC_LABEL_DOWNRIGHT, (LPCSTR)INPUTCONFIG_LABEL_DOWNRIGHT);
SetDlgItemText(hDlg,IDC_LABEL_UP, (LPCSTR)INPUTCONFIG_LABEL_UP);
SetDlgItemText(hDlg,IDC_LABEL_LEFT, (LPCSTR)INPUTCONFIG_LABEL_LEFT);
SetDlgItemText(hDlg,IDC_LABEL_DOWN, (LPCSTR)INPUTCONFIG_LABEL_DOWN);
SetDlgItemText(hDlg,IDC_LABEL_DOWNLEFT, (LPCSTR)INPUTCONFIG_LABEL_DOWNLEFT);
enableUnTurboable = true;
}
else
{
SetDlgItemTextW(hDlg,IDC_LABEL_UP,(LPWSTR)INPUTCONFIG_LABEL_MAKE_TURBO);
SetDlgItemTextW(hDlg,IDC_LABEL_LEFT,(LPWSTR)INPUTCONFIG_LABEL_MAKE_HELD);
SetDlgItemTextW(hDlg,IDC_LABEL_DOWN,(LPWSTR)INPUTCONFIG_LABEL_MAKE_TURBO_HELD);
SetDlgItemTextW(hDlg,IDC_LABEL_RIGHT,(LPWSTR)INPUTCONFIG_LABEL_CLEAR_TOGGLES_AND_TURBO);
SetDlgItemTextW(hDlg,IDC_LABEL_UPLEFT,(LPWSTR)INPUTCONFIG_LABEL_UNUSED);
SetDlgItemTextW(hDlg,IDC_LABEL_UPRIGHT,(LPWSTR)INPUTCONFIG_LABEL_UNUSED);
SetDlgItemTextW(hDlg,IDC_LABEL_DOWNLEFT,(LPWSTR)INPUTCONFIG_LABEL_UNUSED);
SetDlgItemTextW(hDlg,IDC_LABEL_DOWNRIGHT,(LPWSTR)INPUTCONFIG_LABEL_UNUSED);
SetDlgItemTextW(hDlg,IDC_UPLEFT,(LPWSTR)INPUTCONFIG_LABEL_UNUSED);
SetDlgItemTextW(hDlg,IDC_UPRIGHT,(LPWSTR)INPUTCONFIG_LABEL_UNUSED);
SetDlgItemTextW(hDlg,IDC_DWNLEFT,(LPWSTR)INPUTCONFIG_LABEL_UNUSED);
SetDlgItemTextW(hDlg,IDC_DWNRIGHT,(LPWSTR)INPUTCONFIG_LABEL_UNUSED);
SetDlgItemText(hDlg,IDC_LABEL_UP, (LPCSTR)INPUTCONFIG_LABEL_MAKE_TURBO);
SetDlgItemText(hDlg,IDC_LABEL_LEFT, (LPCSTR)INPUTCONFIG_LABEL_MAKE_HELD);
SetDlgItemText(hDlg,IDC_LABEL_DOWN, (LPCSTR)INPUTCONFIG_LABEL_MAKE_TURBO_HELD);
SetDlgItemText(hDlg,IDC_LABEL_RIGHT, (LPCSTR)INPUTCONFIG_LABEL_CLEAR_TOGGLES_AND_TURBO);
SetDlgItemText(hDlg,IDC_LABEL_UPLEFT, (LPCSTR)INPUTCONFIG_LABEL_UNUSED);
SetDlgItemText(hDlg,IDC_LABEL_UPRIGHT, (LPCSTR)INPUTCONFIG_LABEL_UNUSED);
SetDlgItemText(hDlg,IDC_LABEL_DOWNLEFT, (LPCSTR)INPUTCONFIG_LABEL_UNUSED);
SetDlgItemText(hDlg,IDC_LABEL_DOWNRIGHT, (LPCSTR)INPUTCONFIG_LABEL_UNUSED);
SetDlgItemText(hDlg,IDC_UPLEFT, (LPCSTR)INPUTCONFIG_LABEL_UNUSED);
SetDlgItemText(hDlg,IDC_UPRIGHT, (LPCSTR)INPUTCONFIG_LABEL_UNUSED);
SetDlgItemText(hDlg,IDC_DWNLEFT, (LPCSTR)INPUTCONFIG_LABEL_UNUSED);
SetDlgItemText(hDlg,IDC_DWNRIGHT, (LPCSTR)INPUTCONFIG_LABEL_UNUSED);
enableUnTurboable = false;
}
@ -2042,7 +2042,7 @@ switch(msg)
//SetFocus(GetDlgItem(hDlg,IDC_JPCOMBO));
return true;
return TRUE;
break;
case WM_CLOSE:
EndDialog(hDlg, 0);
@ -2136,7 +2136,7 @@ switch(msg)
set_buttoninfo(index,hDlg);
PostMessage(hDlg,WM_NEXTDLGCTL,0,0);
return true;
return TRUE;
case WM_COMMAND:
switch(LOWORD(wParam))
{
@ -2726,7 +2726,7 @@ switch(msg)
EndPaint (hDlg, &ps);
}
return true;
return TRUE;
case WM_INITDIALOG:
//if(DirectX.Clipped) S9xReRefresh();
// Support Unicode display
@ -2759,8 +2759,8 @@ switch(msg)
SetFocus(GetDlgItem(hDlg,IDC_HKCOMBO));
return true;
break;
return TRUE;
case WM_CLOSE:
EndDialog(hDlg, 0);
return TRUE;
@ -2800,7 +2800,7 @@ switch(msg)
PostMessage(hDlg,WM_NEXTDLGCTL,0,0);
// PostMessage(hDlg,WM_KILLFOCUS,0,0);
}
return true;
return TRUE;
case WM_COMMAND:
switch(LOWORD(wParam))
{

4
desmume/src/windows/main.cpp
View File

@ -556,7 +556,7 @@ static void InputTimer()
bool S9xGetState (WORD KeyIdent);
static DWORD lastTime = timeGetTime();
DWORD currentTime = timeGetTime();
DWORD currentTime = lastTime;
static struct JoyState {
bool wasPressed;
@ -4196,7 +4196,7 @@ void ScreenshotToClipboard(bool extraInfo)
else
TextOut(hMemDC, 0, 384 + 14, nameandver, strlen(nameandver));
char str[32];
char str[38];
memcpy(&str[0], &MMU.CART_ROM[0], 12); str[12] = '\0';
int titlelen = strlen(str);
str[titlelen] = ' ';

2
desmume/src/windows/slot1_config.cpp
View File

@ -105,7 +105,7 @@ INT_PTR CALLBACK Slot1R4(HWND dialog, UINT msg,WPARAM wparam,LPARAM lparam)
case WM_INITDIALOG:
{
SetWindowText(GetDlgItem(dialog, IDC_PATH), tmp_fat_path);
_OKbutton_slot1 = (tmp_fat_path!="");
_OKbutton_slot1 = (tmp_fat_path[0] != 0);
return TRUE;
}