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

Windows Port: Fix compiling for Windows port. (Regression from commit bb38022.)

This commit is contained in:
rogerman 2018-10-25 02:34:26 -07:00
parent bb38022873
commit e2d60f62fd
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
desmume/src/frontend/windows/ginfo.cpp
View File

@ -90,7 +90,7 @@ LRESULT GInfo_Paint(HWND hDlg, WPARAM wParam, LPARAM lParam)
const RomBanner& banner = gameInfo.getRomBanner(); const RomBanner& banner = gameInfo.getRomBanner();
sprintf(text, "%ws", banner.titles[CommonSettings.fw_config.language]); // TODO: langID from real/fake fw sprintf(text, "%ws", banner.titles[CommonSettings.fwConfig.language]); // TODO: langID from real/fake fw
SetWindowText(GetDlgItem(hDlg, IDC_GI_TITLE), text); SetWindowText(GetDlgItem(hDlg, IDC_GI_TITLE), text);
sprintf(text, "%ws", banner.titles[0]); sprintf(text, "%ws", banner.titles[0]);

2
desmume/src/frontend/windows/main.cpp
View File

@ -2269,7 +2269,7 @@ int _main()
} }
hash >>= 1; hash >>= 1;
hash += ipAddr >> 8; hash += ipaddr >> 8;
hash &= 0x00FFFFFF; hash &= 0x00FFFFFF;
wifiHandler->SetUserMACValues(hash >> 16, (hash >> 8) & 0xFF, hash & 0xFF); wifiHandler->SetUserMACValues(hash >> 16, (hash >> 8) & 0xFF, hash & 0xFF);

8
desmume/src/frontend/windows/memView.cpp
View File

@ -79,7 +79,7 @@ u8 memRead8 (MemRegionType regionType, HWAddressType address)
MMU_DumpMemBlock(ARMCPU_ARM7, address, 1, &value); MMU_DumpMemBlock(ARMCPU_ARM7, address, 1, &value);
return value; return value;
case MEMVIEW_FIRMWARE: case MEMVIEW_FIRMWARE:
value = MMU.fw.data[address]; value = MMU.fw.data._raw[address];
return value; return value;
case MEMVIEW_FULL: case MEMVIEW_FULL:
MMU_DumpMemBlock(0, address, 1, &value); MMU_DumpMemBlock(0, address, 1, &value);
@ -133,7 +133,7 @@ void memWrite8(MemRegionType regionType, HWAddressType address, u8 value)
MMU_write8(ARMCPU_ARM7, address, value); MMU_write8(ARMCPU_ARM7, address, value);
break; break;
case MEMVIEW_FIRMWARE: case MEMVIEW_FIRMWARE:
MMU.fw.data[address] = value; MMU.fw.data._raw[address] = value;
break; break;
case MEMVIEW_ROM: case MEMVIEW_ROM:
gameInfo.reader->Seek(gameInfo.fROM, address, SEEK_SET); gameInfo.reader->Seek(gameInfo.fROM, address, SEEK_SET);
@ -157,7 +157,7 @@ void memWrite16(MemRegionType regionType, HWAddressType address, u16 value)
MMU_write16(ARMCPU_ARM7, address, value); MMU_write16(ARMCPU_ARM7, address, value);
break; break;
case MEMVIEW_FIRMWARE: case MEMVIEW_FIRMWARE:
*((u16*)&MMU.fw.data[address]) = value; *((u16*)&MMU.fw.data._raw[address]) = value;
break; break;
case MEMVIEW_ROM: case MEMVIEW_ROM:
gameInfo.reader->Seek(gameInfo.fROM, address, SEEK_SET); gameInfo.reader->Seek(gameInfo.fROM, address, SEEK_SET);
@ -181,7 +181,7 @@ void memWrite32(MemRegionType regionType, HWAddressType address, u32 value)
MMU_write32(ARMCPU_ARM7, address, value); MMU_write32(ARMCPU_ARM7, address, value);
break; break;
case MEMVIEW_FIRMWARE: case MEMVIEW_FIRMWARE:
*((u32*)&MMU.fw.data[address]) = value; *((u32*)&MMU.fw.data._raw[address]) = value;
break; break;
case MEMVIEW_ROM: case MEMVIEW_ROM:
gameInfo.reader->Seek(gameInfo.fROM, address, SEEK_SET); gameInfo.reader->Seek(gameInfo.fROM, address, SEEK_SET);