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

Detail

This commit is contained in:
owomomo 2019-06-12 00:18:48 +08:00
parent 02df3d6993
commit 5b1805b3e4
6 changed files with 232 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

207
src/drivers/win/header_editor.cpp
View File

@ -131,7 +131,7 @@ int dropDownIdList[] = {
HWND hHeadEditor = NULL;
bool LoadHeader(HWND parent, char* name, iNES_HEADER* header)
bool LoadHeader(HWND parent, iNES_HEADER* header)
{
int error = 0;
enum errors {
@ -142,7 +142,10 @@ bool LoadHeader(HWND parent, char* name, iNES_HEADER* header)
UNIF_HEADER
};
FCEUFILE* fp = FCEU_fopen(name, NULL, "rb", NULL);
FCEUFILE* fp = FCEU_fopen(LoadedRomFName, NULL, "rb", NULL);
if (!GameInfo)
strcpy(LoadedRomFName, fp->fullFilename.c_str());
if (fp)
{
if (FCEU_fread(header, 1, sizeof(iNES_HEADER), fp) == sizeof(iNES_HEADER) && !memcmp(header, "NES\x1A", 4))
@ -165,7 +168,7 @@ bool LoadHeader(HWND parent, char* name, iNES_HEADER* header)
case errors::OPEN_FAILED:
{
char buf[1024];
sprintf(buf, "Error opening %s!", name);
sprintf(buf, "Error opening %s!", LoadedRomFName);
MessageBox(parent, buf, "iNES Header Editor", MB_ICONERROR | MB_OK);
break;
}
@ -262,7 +265,7 @@ HWND InitHeaderEditDialog(HWND hwnd, iNES_HEADER* header)
for (int i = 0; dropDownIdList[i]; ++i)
for (int j = 0; dropDownList[i][j]; ++j)
{
sprintf(buf, "$%X %s", j, dropDownList[i][j]);
sprintf(buf, dropDownList[i] == inputDevList ? "$%02X %s" : "$%X %s", j, dropDownList[i][j]);
SendDlgItemMessage(hwnd, IDC_MAPPER_COMBO, CB_SETITEMDATA, SendDlgItemMessage(hwnd, dropDownIdList[i], CB_ADDSTRING, 0, (LPARAM)buf), j);
}
@ -501,10 +504,9 @@ LRESULT CALLBACK HeaderEditorProc(HWND hDlg, UINT uMsg, WPARAM wP, LPARAM lP)
iNES_HEADER newHeader;
if (WriteHeaderData(hDlg, &newHeader))
{
char name[2048];
strcpy(name, LoadedRomFName);
if (ShowINESFileBox(hDlg, name, true))
SaveINESFile(hDlg, name, &newHeader);
char path[4096] = { 0 };
if (ShowINESFileBox(hDlg, true, path))
SaveINESFile(hDlg, path, &newHeader);
}
}
break;
@ -545,7 +547,7 @@ void DoHeadEdit()
iNES_HEADER* header = (iNES_HEADER*)calloc(1, sizeof(iNES_HEADER));
if (GameInfo)
{
if (LoadHeader(hAppWnd, LoadedRomFName, header))
if (LoadHeader(hAppWnd, header))
CreateDialogParam(fceu_hInstance, MAKEINTRESOURCE(IDD_EDIT_HEADER), hAppWnd, (DLGPROC)HeaderEditorProc, (LPARAM)header);
else
free(header);
@ -553,7 +555,7 @@ void DoHeadEdit()
else {
// temporarily borrow LoadedRomFName, when no game is loaded, it is unused.
LoadedRomFName[0] = 0;
if (ShowINESFileBox(hAppWnd, LoadedRomFName, false) && LoadHeader(hAppWnd, LoadedRomFName, header))
if (ShowINESFileBox(hAppWnd) && LoadHeader(hAppWnd, header))
DialogBoxParam(fceu_hInstance, MAKEINTRESOURCE(IDD_EDIT_HEADER), hAppWnd, (DLGPROC)HeaderEditorProc, (LPARAM)header);
else
free(header);
@ -830,14 +832,11 @@ bool WriteHeaderData(HWND hwnd, iNES_HEADER* header)
// Mapper
int mapper;
if (!GetComboBoxListItemData(hwnd, IDC_MAPPER_COMBO, &mapper, buf))
{
if (sscanf(buf, "%d", &mapper) < 1)
{
MessageBox(hwnd, "The mapper# you have entered is invalid. Please enter a decimal number or select an item from the dropdown list.", "Error", MB_OK | MB_ICONERROR);
SetFocus(GetDlgItem(hwnd, IDC_MAPPER_COMBO));
return false;
}
}
printf("mapper: %d\n", mapper);
if (mapper < 4096)
@ -1235,13 +1234,25 @@ bool WriteHeaderData(HWND hwnd, iNES_HEADER* header)
_header.ROM_type2 |= 1;
if (ines20) {
// VS System type
int system = SendDlgItemMessage(hwnd, IDC_VS_SYSTEM_COMBO, CB_GETCURSEL, 0, 0);
if (system != CB_ERR)
int system;
if (GetComboBoxListItemData(hwnd, IDC_VS_SYSTEM_COMBO, &system, buf) && system <= 0xF)
_header.VS_hardware |= (system & 0xF) << 4;
else
{
MessageBox(hwnd, "Invalid VS System hardware type.", "Error", MB_OK | MB_ICONERROR);
SetFocus(GetDlgItem(hwnd, IDC_VS_SYSTEM_COMBO));
return false;
}
// VS PPU type
int ppu = SendDlgItemMessage(hwnd, IDC_VS_PPU_COMBO, CB_GETCURSEL, 0, 0);
if (ppu != CB_ERR)
int ppu;
if (GetComboBoxListItemData(hwnd, IDC_VS_PPU_COMBO, &ppu, buf) && system <= 0xF)
_header.VS_hardware |= ppu & 0xF;
else
{
MessageBox(hwnd, "Invalid VS System PPU type.", "Error", MB_OK | MB_ICONERROR);
SetFocus(GetDlgItem(hwnd, IDC_VS_PPU_COMBO));
return false;
}
}
}
else if (IsDlgButtonChecked(hwnd, IDC_RADIO_SYSTEM_PLAYCHOICE10) == BST_CHECKED)
@ -1250,17 +1261,29 @@ bool WriteHeaderData(HWND hwnd, iNES_HEADER* header)
{
// Extend System
_header.ROM_type2 |= 3;
int extend = SendDlgItemMessage(hwnd, IDC_SYSTEM_EXTEND_COMBO, CB_GETCURSEL, 0, 0);
if (extend != CB_ERR)
int extend;
if (GetComboBoxListItemData(hwnd, IDC_SYSTEM_EXTEND_COMBO, &extend, buf) && extend <= 0x3F)
_header.VS_hardware |= extend & 0x3F;
else
{
MessageBox(hwnd, "Invalid extend system type", "Error", MB_OK | MB_ICONERROR);
SetFocus(GetDlgItem(hwnd, IDC_SYSTEM_EXTEND_COMBO));
return false;
}
}
// Input device
if (ines20)
{
int input = SendDlgItemMessage(hwnd, IDC_INPUT_DEVICE_COMBO, CB_GETCURSEL, 0, 0);
if (input != CB_ERR)
int input;
if (GetComboBoxListItemData(hwnd, IDC_INPUT_DEVICE_COMBO, &input, buf, true) && input <= 0x3F)
_header.reserved[1] |= input & 0x3F;
else
{
MessageBox(hwnd, "Invalid input device.", "Error", MB_OK | MB_ICONERROR);
SetFocus(GetDlgItem(hwnd, IDC_INPUT_DEVICE_COMBO));
return false;
}
}
// Miscellanous ROM(s)
@ -1413,22 +1436,56 @@ int GetComboBoxByteSize(HWND hwnd, UINT id, int* value)
bool GetComboBoxListItemData(HWND hwnd, UINT id, int* value, char* buf, bool exact)
{
bool success = true;
*value = SendDlgItemMessage(hwnd, id, CB_GETCURSEL, 0, 0);
if (*value != CB_ERR)
*value = SendDlgItemMessage(hwnd, id, CB_GETITEMDATA, *value, 0);
else {
GetDlgItemText(hwnd, id, buf, 256);
if (exact)
*value = SendDlgItemMessage(hwnd, id, CB_FINDSTRINGEXACT, 0, (LPARAM)buf);
else
*value = SendDlgItemMessage(hwnd, id, CB_SELECTSTRING, 0, (LPARAM)buf);
if (*value != CB_ERR)
*value = SendDlgItemMessage(hwnd, id, CB_GETITEMDATA, *value, 0);
else
{
SetDlgItemText(hwnd, id, buf);
switch (id)
{
default:
success = false;
break;
case IDC_MAPPER_COMBO:
if (!(success = sscanf(buf, "%d", value) > 0))
success = SearchByString(hwnd, id, value, buf);
else
SetDlgItemText(hwnd, id, buf);
break;
case IDC_VS_SYSTEM_COMBO:
case IDC_VS_PPU_COMBO:
case IDC_SYSTEM_EXTEND_COMBO:
if (!(success = sscanf(buf, "$%X", value) > 0))
success = SearchByString(hwnd, id, value, buf);
else
SetDlgItemText(hwnd, id, buf);
break;
case IDC_INPUT_DEVICE_COMBO:
if (success = sscanf(buf, "$%X", value) > 0)
{
char buf2[3];
sprintf(buf2, "$%02X", *value);
if (SendDlgItemMessage(hwnd, id, CB_SELECTSTRING, 0, (LPARAM)buf2) == CB_ERR)
SetDlgItemText(hwnd, id, buf);
} else
success = SearchByString(hwnd, id, value, buf);
break;
}
if (!success)
SetDlgItemText(hwnd, id, buf);
}
}
@ -1436,12 +1493,45 @@ bool GetComboBoxListItemData(HWND hwnd, UINT id, int* value, char* buf, bool exa
}
// Warning: when in save mode, the content of buf might be overwritten by the save filename which user changed.
bool ShowINESFileBox(HWND parent, char* buf, bool save)
bool ShowINESFileBox(HWND parent, bool save, char* buf)
{
char name[2048] = { 0 };
if (save)
strncpy(name, buf, strcspn(buf, "|"));
char *filename = NULL, *path = NULL;
bool success = true;
if (save)
{
// When open this dialog for saving prpose, the buf must be a separate buf.
if (buf && buf != LoadedRomFName)
{
extern char* GetRomName(bool force = false);
extern char* GetRomPath(bool force = false);
filename = GetRomName(true);
char* second = strchr(filename, '|');
if (second)
{
char* _filename = (char*)calloc(1, 2048);
strcpy(_filename, second + 1);
char* third = strrchr(filename, '\\');
if (third)
strcpy(_filename, third + 1);
free(filename);
filename = _filename;
}
strcat(filename, " [header modified].nes");
path = GetRomPath(true);
}
else
success = false;
}
else {
if (!buf)
buf = LoadedRomFName;
filename = (char*)calloc(1, 2048);
path = (char*)calloc(1, 2048);
}
if (success)
{
OPENFILENAME ofDlg;
memset(&ofDlg, 0, sizeof(OPENFILENAME));
ofDlg.lStructSize = sizeof(OPENFILENAME);
@ -1449,24 +1539,21 @@ bool ShowINESFileBox(HWND parent, char* buf, bool save)
ofDlg.lpstrFilter = "NES ROM file(*.nes)\0*.nes\0All files(*.*)\0*.*\0\0";
ofDlg.hInstance = fceu_hInstance;
ofDlg.hwndOwner = parent;
ofDlg.nMaxFile = sizeof(name);
ofDlg.lpstrFile = filename;
ofDlg.nMaxFile = 2048;
ofDlg.Flags = OFN_EXPLORER | OFN_FILEMUSTEXIST | OFN_OVERWRITEPROMPT | OFN_HIDEREADONLY;
ofDlg.lpstrInitialDir = save ? name : FCEU_GetPath(FCEUMKF_ROMS).c_str();
char* sub_name = strrchr(buf, '|');
if (sub_name)
ofDlg.lpstrFile = sub_name + 1;
else
ofDlg.lpstrFile = name;
ofDlg.lpstrInitialDir = path;
if (save ? GetSaveFileName(&ofDlg) : GetOpenFileName(&ofDlg))
{
strcpy(buf, name);
return true;
strcpy(buf, filename);
else
success = false;
}
return false;
if (filename) free(filename);
if (path) free(path);
return success;
}
bool SaveINESFile(HWND hwnd, char* path, iNES_HEADER* header)
@ -1508,3 +1595,45 @@ bool SaveINESFile(HWND hwnd, char* path, iNES_HEADER* header)
return true;
}
bool SearchByString(HWND hwnd, UINT id, int* value, char* buf)
{
if (buf[0] != ' ' && buf[0] != 0)
{
if (id == IDC_MAPPER_COMBO)
{
extern BMAPPINGLocal bmap[];
for (int i = 0; bmap[i].init; ++i)
{
if (!stricmp(buf, bmap[i].name))
{
SendDlgItemMessage(hwnd, id, CB_SETCURSEL, i, 0);
*value = SendDlgItemMessage(hwnd, id, CB_GETITEMDATA, i, 0);
return true;
}
}
}
else
{
for (int i = 0; dropDownIdList[i]; ++i)
{
if (dropDownIdList[i] == id)
{
char** checkList = dropDownList[i];
for (int j = 0; checkList[j]; ++j)
{
if (!stricmp(buf, checkList[j]))
{
SendDlgItemMessage(hwnd, id, CB_SETCURSEL, j, 0);
*value = SendDlgItemMessage(hwnd, id, CB_GETITEMDATA, j, 0);
return true;
}
}
break;
}
}
}
}
return false;
}

4
src/drivers/win/header_editor.h
View File

@ -5,7 +5,7 @@ extern HWND hHeadEditor;
struct iNES_HEADER;
HWND InitHeaderEditDialog(HWND hwnd, iNES_HEADER* header);
bool ShowINESFileBox(HWND parent, char* buf, bool save);
bool ShowINESFileBox(HWND parent, bool save = false, char* buf = NULL);
void ToggleINES20(HWND hwnd, bool ines20);
void ToggleExtendSystemList(HWND hwnd, bool enable);
void ToggleVSSystemGroup(HWND hwnd, bool enable);
@ -13,8 +13,10 @@ void ToggleUnofficialPropertiesEnabled(HWND hwnd, bool ines20, bool check);
void ToggleUnofficialExtraRegionCode(HWND hwnd, bool ines20, bool unofficial_check, bool check);
void ToggleUnofficialPrgRamPresent(HWND hwnd, bool ines20, bool unofficial_check, bool check);
void SetHeaderData(HWND hwnd, iNES_HEADER* header);
bool LoadHeader(HWND parent, iNES_HEADER* header);
bool WriteHeaderData(HWND hwnd, iNES_HEADER* header);
int GetComboBoxByteSize(HWND hwnd, UINT id, int* value);
bool SearchByString(HWND hwnd, UINT id, int* value, char* buf);
bool GetComboBoxListItemData(HWND hwnd, UINT id, int* value, char* buf, bool exact = false);
bool SaveINESFile(HWND hwnd, char* path, iNES_HEADER* header);
LRESULT CALLBACK HeaderEditorProc(HWND hDlg, UINT uMsg, WPARAM wP, LPARAM lP);

8
src/drivers/win/main.cpp
View File

@ -1127,14 +1127,14 @@ void FCEUD_ToggleStatusIcon(void)
UpdateCheckedMenuItems();
}
char *GetRomName()
char *GetRomName(bool force)
{
//The purpose of this function is to format the ROM name stored in LoadedRomFName
//And return a char array with just the name with path or extension
//The purpose of this function is to populate a save as dialog with the ROM name as a default filename
extern char LoadedRomFName[2048]; //Contains full path of ROM
std::string Rom; //Will contain the formatted path
if(GameInfo) //If ROM is loaded
if(GameInfo || force) //If ROM is loaded
{
char drv[PATH_MAX], dir[PATH_MAX], name[PATH_MAX], ext[PATH_MAX];
splitpath(LoadedRomFName,drv,dir,name,ext); //Extract components of the ROM path
@ -1148,14 +1148,14 @@ char *GetRomName()
return mystring;
}
char *GetRomPath()
char *GetRomPath(bool force)
{
//The purpose of this function is to format the ROM name stored in LoadedRomFName
//And return a char array with just the name with path or extension
//The purpose of this function is to populate a save as dialog with the ROM name as a default filename
extern char LoadedRomFName[2048]; //Contains full path of ROM
std::string Rom; //Will contain the formatted path
if(GameInfo) //If ROM is loaded
if(GameInfo || force) //If ROM is loaded
{
char drv[PATH_MAX], dir[PATH_MAX], name[PATH_MAX], ext[PATH_MAX];
splitpath(LoadedRomFName,drv,dir,name,ext); //Extract components of the ROM path

4
src/drivers/win/main.h
View File

@ -65,8 +65,8 @@ extern int vmod;
extern char* directory_names[14];
char *GetRomName(); //Checks if rom is loaded, if so, outputs the Rom name with no directory path or file extension
char *GetRomPath(); //Checks if rom is loaded, if so, outputs the Rom path only
char *GetRomName(bool force = false); //Checks if rom is loaded, if so, outputs the Rom name with no directory path or file extension
char *GetRomPath(bool force = false); //Checks if rom is loaded, if so, outputs the Rom path only
///Contains the names of the default directories.
static const char *default_directory_names[13] = {

8
src/drivers/win/res.rc
View File

@ -2316,12 +2316,12 @@ BEGIN
CONTROL "Extend",IDC_RADIO_SYSTEM_EXTEND,"Button",BS_AUTORADIOBUTTON | WS_DISABLED,251,114,35,10
GROUPBOX "Extend System",IDC_EXTEND_SYSTEM_GROUP,127,176,160,29,WS_DISABLED
LTEXT "Console:",IDC_EXTEND_SYSTEM_TEXT,133,189,29,8,WS_DISABLED
COMBOBOX IDC_SYSTEM_EXTEND_COMBO,165,186,115,30,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_DISABLED | WS_VSCROLL | WS_TABSTOP
COMBOBOX IDC_SYSTEM_EXTEND_COMBO,165,186,115,30,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_DISABLED | WS_VSCROLL | WS_TABSTOP
GROUPBOX "VS. System",IDC_VS_SYSTEM_GROUP,127,126,160,46,WS_DISABLED
LTEXT "Hardware:",IDC_VS_SYSTEM_TEXT,134,138,35,8,WS_DISABLED
COMBOBOX IDC_VS_SYSTEM_COMBO,172,136,108,30,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_DISABLED | WS_VSCROLL | WS_TABSTOP
COMBOBOX IDC_VS_SYSTEM_COMBO,172,136,108,30,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_DISABLED | WS_VSCROLL | WS_TABSTOP
LTEXT "PPU:",IDC_VS_PPU_TEXT,134,155,16,8,WS_DISABLED
COMBOBOX IDC_VS_PPU_COMBO,154,154,126,30,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_DISABLED | WS_VSCROLL | WS_TABSTOP
COMBOBOX IDC_VS_PPU_COMBO,154,154,126,30,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_DISABLED | WS_VSCROLL | WS_TABSTOP
CONTROL "iNES 1.0 Unofficial Properties",IDC_CHECK_UNOFFICIAL,
"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_DISABLED | WS_TABSTOP,14,164,103,10
GROUPBOX "iNES 1.0 Unofficial Properties",IDC_UNOFFICIAL_GROUP,13,176,104,35,WS_DISABLED
@ -2329,7 +2329,7 @@ BEGIN
CONTROL "PRG RAM exists",IDC_CHECK_UNOFFICIAL_PRGRAM,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_DISABLED | WS_TABSTOP,70,188,43,17
CONTROL "Bus conflict",IDC_CHECK_UNOFFICIAL_BUS_CONFLICT,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_DISABLED | WS_TABSTOP,19,198,49,10
LTEXT "Input device:",IDC_INPUT_DEVICE_TEXT,101,218,44,8,WS_DISABLED
COMBOBOX IDC_INPUT_DEVICE_COMBO,147,216,143,30,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_DISABLED | WS_VSCROLL | WS_TABSTOP
COMBOBOX IDC_INPUT_DEVICE_COMBO,147,216,143,30,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_DISABLED | WS_VSCROLL | WS_TABSTOP
LTEXT "Misc. ROM(s)",IDC_MISCELLANEOUS_ROMS_TEXT,29,218,48,8,WS_DISABLED
EDITTEXT IDC_MISCELLANEOUS_ROMS_EDIT,14,215,12,14,ES_AUTOHSCROLL | WS_DISABLED
PUSHBUTTON "Restore",IDC_RESTORE_BUTTON,7,236,44,14,WS_DISABLED

6
src/ines.h
View File

@ -79,12 +79,6 @@ struct iNES_HEADER {
}
};
typedef struct {
char *name;
int32 number;
void(*init)(CartInfo *);
} BMAPPINGLocal;
extern struct iNES_HEADER head; //for mappers usage
void NSFVRC6_Init(void);