diff --git a/src/burner/burner.h b/src/burner/burner.h index 18b0199aa..02b38569e 100644 --- a/src/burner/burner.h +++ b/src/burner/burner.h @@ -16,8 +16,8 @@ #define MAKE_STRING_2(s) #s #define MAKE_STRING(s) MAKE_STRING_2(s) -#define BZIP_MAX (8) // Maximum zip files to search through -#define DIRS_MAX (8) // Maximum number of directories to search +#define BZIP_MAX (20) // Maximum zip files to search through +#define DIRS_MAX (20) // Maximum number of directories to search #include "title.h" #include "burn.h" diff --git a/src/burner/win32/app.rc b/src/burner/win32/app.rc index b1e5d3f70..54a0b17e9 100644 --- a/src/burner/win32/app.rc +++ b/src/burner/win32/app.rc @@ -176,10 +176,30 @@ BEGIN PUSHBUTTON "Browse...",IDC_ROMSDIR_BR7,177,30,50,14 EDITTEXT IDC_ROMSDIR_EDIT8,14,31,154,12,ES_AUTOHSCROLL PUSHBUTTON "Browse...",IDC_ROMSDIR_BR8,177,30,50,14 - //EDITTEXT IDC_ROMSDIR_EDIT9,14,31,154,12,ES_AUTOHSCROLL - //PUSHBUTTON "Browse...",IDC_ROMSDIR_BR9,177,30,50,14 - //EDITTEXT IDC_ROMSDIR_EDIT10,14,31,154,12,ES_AUTOHSCROLL - //PUSHBUTTON "Browse...",IDC_ROMSDIR_BR10,177,30,50,14 + EDITTEXT IDC_ROMSDIR_EDIT9,14,31,154,12,ES_AUTOHSCROLL + PUSHBUTTON "Browse...",IDC_ROMSDIR_BR9,177,30,50,14 + EDITTEXT IDC_ROMSDIR_EDIT10,14,31,154,12,ES_AUTOHSCROLL + PUSHBUTTON "Browse...",IDC_ROMSDIR_BR10,177,30,50,14 + EDITTEXT IDC_ROMSDIR_EDIT11,14,31,154,12,ES_AUTOHSCROLL + PUSHBUTTON "Browse...",IDC_ROMSDIR_BR11,177,30,50,14 + EDITTEXT IDC_ROMSDIR_EDIT12,14,31,154,12,ES_AUTOHSCROLL + PUSHBUTTON "Browse...",IDC_ROMSDIR_BR12,177,30,50,14 + EDITTEXT IDC_ROMSDIR_EDIT13,14,31,154,12,ES_AUTOHSCROLL + PUSHBUTTON "Browse...",IDC_ROMSDIR_BR13,177,30,50,14 + EDITTEXT IDC_ROMSDIR_EDIT14,14,31,154,12,ES_AUTOHSCROLL + PUSHBUTTON "Browse...",IDC_ROMSDIR_BR14,177,30,50,14 + EDITTEXT IDC_ROMSDIR_EDIT15,14,31,154,12,ES_AUTOHSCROLL + PUSHBUTTON "Browse...",IDC_ROMSDIR_BR15,177,30,50,14 + EDITTEXT IDC_ROMSDIR_EDIT16,14,31,154,12,ES_AUTOHSCROLL + PUSHBUTTON "Browse...",IDC_ROMSDIR_BR16,177,30,50,14 + EDITTEXT IDC_ROMSDIR_EDIT17,14,31,154,12,ES_AUTOHSCROLL + PUSHBUTTON "Browse...",IDC_ROMSDIR_BR17,177,30,50,14 + EDITTEXT IDC_ROMSDIR_EDIT18,14,31,154,12,ES_AUTOHSCROLL + PUSHBUTTON "Browse...",IDC_ROMSDIR_BR18,177,30,50,14 + EDITTEXT IDC_ROMSDIR_EDIT19,14,31,154,12,ES_AUTOHSCROLL + PUSHBUTTON "Browse...",IDC_ROMSDIR_BR19,177,30,50,14 + EDITTEXT IDC_ROMSDIR_EDIT20,14,31,154,12,ES_AUTOHSCROLL + PUSHBUTTON "Browse...",IDC_ROMSDIR_BR20,177,30,50,14 END IDD_ABOUT DIALOGEX 0, 0, 349, 107 diff --git a/src/burner/win32/bzip.cpp b/src/burner/win32/bzip.cpp index 99e9df42f..4d3706369 100644 --- a/src/burner/win32/bzip.cpp +++ b/src/burner/win32/bzip.cpp @@ -414,10 +414,10 @@ int BzipOpen(bool bootApp) z++; - // Look further in the last two paths specified, so you can put files with ROMs + // Look further in the last ten paths specified, so you can put files with ROMs // used only by FB Alpha there without causing problems with dat files - if (d < DIRS_MAX - 3) { - d = DIRS_MAX - 3; + if (d < DIRS_MAX - 11) { + d = DIRS_MAX - 11; } else { if (d >= DIRS_MAX - 1) { break; diff --git a/src/burner/win32/cona.cpp b/src/burner/win32/cona.cpp index 0bd7174b7..06a20c6ad 100644 --- a/src/burner/win32/cona.cpp +++ b/src/burner/win32/cona.cpp @@ -194,6 +194,18 @@ int ConfigAppLoad() STR(szAppRomPaths[5]); STR(szAppRomPaths[6]); STR(szAppRomPaths[7]); + STR(szAppRomPaths[8]); + STR(szAppRomPaths[9]); + STR(szAppRomPaths[10]); + STR(szAppRomPaths[11]); + STR(szAppRomPaths[12]); + STR(szAppRomPaths[13]); + STR(szAppRomPaths[14]); + STR(szAppRomPaths[15]); + STR(szAppRomPaths[16]); + STR(szAppRomPaths[17]); + STR(szAppRomPaths[18]); + STR(szAppRomPaths[19]); STR(szNeoCDGamesDir); @@ -514,6 +526,18 @@ int ConfigAppSave() STR(szAppRomPaths[5]); STR(szAppRomPaths[6]); STR(szAppRomPaths[7]); + STR(szAppRomPaths[8]); + STR(szAppRomPaths[9]); + STR(szAppRomPaths[10]); + STR(szAppRomPaths[11]); + STR(szAppRomPaths[12]); + STR(szAppRomPaths[13]); + STR(szAppRomPaths[14]); + STR(szAppRomPaths[15]); + STR(szAppRomPaths[16]); + STR(szAppRomPaths[17]); + STR(szAppRomPaths[18]); + STR(szAppRomPaths[19]); _ftprintf(h, _T("\n// The path to search for Neo Geo CDZ isos\n")); STR(szNeoCDGamesDir); diff --git a/src/burner/win32/resource.h b/src/burner/win32/resource.h index 1cb5f3d88..1f663cb07 100644 --- a/src/burner/win32/resource.h +++ b/src/burner/win32/resource.h @@ -87,24 +87,6 @@ #define ID_VALUE_CLOSE 20019 #define IDC_VALUE_EDIT 20020 -#define IDC_ROMSDIR_EDIT1 20030 -#define IDC_ROMSDIR_EDIT2 20031 -#define IDC_ROMSDIR_EDIT3 20032 -#define IDC_ROMSDIR_EDIT4 20033 -#define IDC_ROMSDIR_EDIT5 20034 -#define IDC_ROMSDIR_EDIT6 20035 -#define IDC_ROMSDIR_EDIT7 20036 -#define IDC_ROMSDIR_EDIT8 20037 - -#define IDC_ROMSDIR_BR1 20040 -#define IDC_ROMSDIR_BR2 20041 -#define IDC_ROMSDIR_BR3 20042 -#define IDC_ROMSDIR_BR4 20043 -#define IDC_ROMSDIR_BR5 20044 -#define IDC_ROMSDIR_BR6 20045 -#define IDC_ROMSDIR_BR7 20046 -#define IDC_ROMSDIR_BR8 20047 - #define IDC_FBA_VER 20050 #define IDC_SPECIALSTRING 20051 #define IDC_SHOWLICENSE 20052 @@ -343,6 +325,48 @@ #define ID_LICENSE 21000 #define ID_DX9EFFECT 21001 +#define IDC_ROMSDIR_EDIT1 21100 +#define IDC_ROMSDIR_EDIT2 21101 +#define IDC_ROMSDIR_EDIT3 21102 +#define IDC_ROMSDIR_EDIT4 21103 +#define IDC_ROMSDIR_EDIT5 21104 +#define IDC_ROMSDIR_EDIT6 21105 +#define IDC_ROMSDIR_EDIT7 21106 +#define IDC_ROMSDIR_EDIT8 21107 +#define IDC_ROMSDIR_EDIT9 21108 +#define IDC_ROMSDIR_EDIT10 21109 +#define IDC_ROMSDIR_EDIT11 21110 +#define IDC_ROMSDIR_EDIT12 21111 +#define IDC_ROMSDIR_EDIT13 21112 +#define IDC_ROMSDIR_EDIT14 21113 +#define IDC_ROMSDIR_EDIT15 21114 +#define IDC_ROMSDIR_EDIT16 21115 +#define IDC_ROMSDIR_EDIT17 21116 +#define IDC_ROMSDIR_EDIT18 21117 +#define IDC_ROMSDIR_EDIT19 21118 +#define IDC_ROMSDIR_EDIT20 21119 + +#define IDC_ROMSDIR_BR1 21140 +#define IDC_ROMSDIR_BR2 21141 +#define IDC_ROMSDIR_BR3 21142 +#define IDC_ROMSDIR_BR4 21143 +#define IDC_ROMSDIR_BR5 21144 +#define IDC_ROMSDIR_BR6 21145 +#define IDC_ROMSDIR_BR7 21146 +#define IDC_ROMSDIR_BR8 21147 +#define IDC_ROMSDIR_BR9 21148 +#define IDC_ROMSDIR_BR10 21149 +#define IDC_ROMSDIR_BR11 21150 +#define IDC_ROMSDIR_BR12 21151 +#define IDC_ROMSDIR_BR13 21152 +#define IDC_ROMSDIR_BR14 21153 +#define IDC_ROMSDIR_BR15 21154 +#define IDC_ROMSDIR_BR16 21155 +#define IDC_ROMSDIR_BR17 21156 +#define IDC_ROMSDIR_BR18 21157 +#define IDC_ROMSDIR_BR19 21158 +#define IDC_ROMSDIR_BR20 21159 + #define MENU_LOAD 10001 #define MENU_STARTNET 10002 #define MENU_STARTREPLAY 10003 diff --git a/src/burner/win32/resource_string.h b/src/burner/win32/resource_string.h index 837fc92af..a6957da9e 100644 --- a/src/burner/win32/resource_string.h +++ b/src/burner/win32/resource_string.h @@ -120,6 +120,18 @@ #define IDS_ROMPATH_6 (IDS_STRING + 490) #define IDS_ROMPATH_7 (IDS_STRING + 492) #define IDS_ROMPATH_8 (IDS_STRING + 494) +#define IDS_ROMPATH_9 (IDS_STRING + 496) +#define IDS_ROMPATH_10 (IDS_STRING + 498) +#define IDS_ROMPATH_11 (IDS_STRING + 500) +#define IDS_ROMPATH_12 (IDS_STRING + 502) +#define IDS_ROMPATH_13 (IDS_STRING + 504) +#define IDS_ROMPATH_14 (IDS_STRING + 506) +#define IDS_ROMPATH_15 (IDS_STRING + 508) +#define IDS_ROMPATH_16 (IDS_STRING + 510) +#define IDS_ROMPATH_17 (IDS_STRING + 512) +#define IDS_ROMPATH_18 (IDS_STRING + 514) +#define IDS_ROMPATH_19 (IDS_STRING + 516) +#define IDS_ROMPATH_20 (IDS_STRING + 518) #define IDS_PRESET_SAVED (IDS_STRING + 520) diff --git a/src/burner/win32/roms.cpp b/src/burner/win32/roms.cpp index 11eedf543..9e9483ed9 100644 --- a/src/burner/win32/roms.cpp +++ b/src/burner/win32/roms.cpp @@ -35,7 +35,7 @@ static INT_PTR CALLBACK DefInpProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lP chOk = false; // Setup edit controls values (ROMs Paths) - for(int x = 0; x < 8; x++) { + for(int x = 0; x < 20; x++) { SetDlgItemText(hDlg, IDC_ROMSDIR_EDIT1 + x, szAppRomPaths[x]); } @@ -45,9 +45,9 @@ static INT_PTR CALLBACK DefInpProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lP TC_ITEM tcItem; tcItem.mask = TCIF_TEXT; - UINT idsString[8] = { IDS_ROMPATH_1,IDS_ROMPATH_2,IDS_ROMPATH_3,IDS_ROMPATH_4,IDS_ROMPATH_5,IDS_ROMPATH_6,IDS_ROMPATH_7,IDS_ROMPATH_8 }; + UINT idsString[20] = { IDS_ROMPATH_1,IDS_ROMPATH_2,IDS_ROMPATH_3,IDS_ROMPATH_4,IDS_ROMPATH_5,IDS_ROMPATH_6,IDS_ROMPATH_7,IDS_ROMPATH_8,IDS_ROMPATH_9,IDS_ROMPATH_10,IDS_ROMPATH_11,IDS_ROMPATH_12,IDS_ROMPATH_13,IDS_ROMPATH_14,IDS_ROMPATH_15,IDS_ROMPATH_16,IDS_ROMPATH_17,IDS_ROMPATH_18,IDS_ROMPATH_19,IDS_ROMPATH_20 }; - for(int nIndex = 0; nIndex < 8; nIndex++) { + for(int nIndex = 0; nIndex < 20; nIndex++) { tcItem.pszText = FBALoadStringEx(hAppInst, idsString[nIndex], true); TabCtrl_InsertItem(hTabControl, nIndex, &tcItem); } @@ -55,7 +55,7 @@ static INT_PTR CALLBACK DefInpProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lP int TabPage = TabCtrl_GetCurSel(hTabControl); // hide all controls excluding the selected controls - for(int x = 0; x < 8; x++) { + for(int x = 0; x < 20; x++) { if(x != TabPage) { ShowWindow(GetDlgItem(hDlg, IDC_ROMSDIR_BR1 + x), SW_HIDE); // browse buttons ShowWindow(GetDlgItem(hDlg, IDC_ROMSDIR_EDIT1 + x), SW_HIDE); // edit controls @@ -80,7 +80,7 @@ static INT_PTR CALLBACK DefInpProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lP int TabPage = TabCtrl_GetCurSel(hTabControl); // hide all controls excluding the selected controls - for(int x = 0; x < 8; x++) { + for(int x = 0; x < 20; x++) { if(x != TabPage) { ShowWindow(GetDlgItem(hDlg, IDC_ROMSDIR_BR1 + x), SW_HIDE); // browse buttons ShowWindow(GetDlgItem(hDlg, IDC_ROMSDIR_EDIT1 + x), SW_HIDE); // edit controls @@ -105,7 +105,7 @@ static INT_PTR CALLBACK DefInpProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lP if (LOWORD(wParam) == IDOK) { - for (int i = 0; i < 8; i++) { + for (int i = 0; i < 20; i++) { // if (GetDlgItemText(hDlg, IDC_ROMSDIR_EDIT1 + i, buffer, sizeof(buffer)) && lstrcmp(szAppRomPaths[i], buffer)) { GetDlgItemText(hDlg, IDC_ROMSDIR_EDIT1 + i, buffer, sizeof(buffer)); if (lstrcmp(szAppRomPaths[i], buffer)) chOk = true; @@ -116,7 +116,7 @@ static INT_PTR CALLBACK DefInpProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lP SendMessage(hDlg, WM_CLOSE, 0, 0); break; } else { - if (LOWORD(wParam) >= IDC_ROMSDIR_BR1 && LOWORD(wParam) <= IDC_ROMSDIR_BR8) { + if (LOWORD(wParam) >= IDC_ROMSDIR_BR1 && LOWORD(wParam) <= IDC_ROMSDIR_BR20) { var = IDC_ROMSDIR_EDIT1 + LOWORD(wParam) - IDC_ROMSDIR_BR1; } else { if (HIWORD(wParam) == BN_CLICKED && LOWORD(wParam) == IDCANCEL) { diff --git a/src/burner/win32/string.rc b/src/burner/win32/string.rc index 56216fba7..4528bf618 100644 --- a/src/burner/win32/string.rc +++ b/src/burner/win32/string.rc @@ -120,6 +120,18 @@ BEGIN IDS_ROMPATH_6 "Path #6" IDS_ROMPATH_7 "Path #7" IDS_ROMPATH_8 "Path #8" + IDS_ROMPATH_9 "Path #9" + IDS_ROMPATH_10 "Path #10" + IDS_ROMPATH_11 "Path #11" + IDS_ROMPATH_12 "Path #12" + IDS_ROMPATH_13 "Path #13" + IDS_ROMPATH_14 "Path #14" + IDS_ROMPATH_15 "Path #15" + IDS_ROMPATH_16 "Path #16" + IDS_ROMPATH_17 "Path #17" + IDS_ROMPATH_18 "Path #18" + IDS_ROMPATH_19 "Path #19" + IDS_ROMPATH_20 "Path #20" IDS_PRESET_SAVED "The preset file was saved to %s."