diff --git a/Source/Project64-core/3rdParty/7zip.cpp b/Source/Project64-core/3rdParty/7zip.cpp index 2a9fec66a..d69ecb492 100644 --- a/Source/Project64-core/3rdParty/7zip.cpp +++ b/Source/Project64-core/3rdParty/7zip.cpp @@ -5,6 +5,7 @@ typedef const char * LPCSTR; #include #include #include "7zip.h" +#include C7zip::C7zip(LPCSTR FileName) : m_FileSize(0), @@ -126,9 +127,9 @@ bool C7zip::GetFile(int index, Byte * Data, size_t DataLen) size_t offset; size_t outSizeProcessed; - wchar_t Msg[200]; + char Msg[200]; std::wstring FileName = FileNameIndex(index); - _snwprintf(Msg, sizeof(Msg) / sizeof(Msg[0]), L"extracting %s", FileName.c_str()); + _snprintf(Msg, sizeof(Msg) / sizeof(Msg[0]), "extracting %s", stdstr().FromUTF16(FileName.c_str())); m_NotfyCallback(Msg, m_NotfyCallbackInfo); SRes res = SzArEx_Extract(m_db, &m_archiveLookStream.s, index, @@ -146,7 +147,7 @@ bool C7zip::GetFile(int index, Byte * Data, size_t DataLen) outSizeProcessed = DataLen; } memcpy(Data, m_outBuffer + offset, outSizeProcessed); - m_NotfyCallback(L"", m_NotfyCallbackInfo); + m_NotfyCallback("", m_NotfyCallbackInfo); m_CurrentFile = -1; return true; } diff --git a/Source/Project64-core/3rdParty/7zip.h b/Source/Project64-core/3rdParty/7zip.h index cdefffbeb..fcc28f464 100644 --- a/Source/Project64-core/3rdParty/7zip.h +++ b/Source/Project64-core/3rdParty/7zip.h @@ -21,7 +21,7 @@ public: C7zip(LPCSTR FileName); ~C7zip(); - typedef void(__stdcall *LP7ZNOTIFICATION)(LPCWSTR Status, void * CBInfo); + typedef void (*LP7ZNOTIFICATION)(const char * Status, void * CBInfo); inline int NumFiles(void) const { return m_db ? m_db->db.NumFiles : 0; } inline CSzFileItem * FileItem(int index) const { return m_db ? &m_db->db.Files[index] : NULL; } @@ -68,7 +68,7 @@ private: //static void __stdcall StatusUpdate(_7Z_STATUS status, int Value1, int Value2, C7zip * _this); - static void __stdcall NotfyCallbackDefault(LPCWSTR /*Status*/, void * /*CBInfo*/) { } + static void NotfyCallbackDefault(const char * /*Status*/, void * /*CBInfo*/) { } LP7ZNOTIFICATION m_NotfyCallback; void * m_NotfyCallbackInfo; diff --git a/Source/Project64-core/AppInit.cpp b/Source/Project64-core/AppInit.cpp index b602c67b7..0655f4b67 100644 --- a/Source/Project64-core/AppInit.cpp +++ b/Source/Project64-core/AppInit.cpp @@ -179,7 +179,7 @@ void AppInit(CNotification * Notify) } catch (...) { - g_Notify->DisplayError(stdstr_f("Exception caught\nFile: %s\nLine: %d", __FILE__, __LINE__).ToUTF16().c_str()); + g_Notify->DisplayError(stdstr_f("Exception caught\nFile: %s\nLine: %d", __FILE__, __LINE__).c_str()); } } diff --git a/Source/Project64-core/Multilanguage/LanguageClass.cpp b/Source/Project64-core/Multilanguage/LanguageClass.cpp index a5db5556e..b27efca0f 100644 --- a/Source/Project64-core/Multilanguage/LanguageClass.cpp +++ b/Source/Project64-core/Multilanguage/LanguageClass.cpp @@ -19,492 +19,492 @@ void CLanguage::LoadDefaultStrings(void) { #define DEF_STR(ID,str) m_DefaultStrings.insert(LANG_STRINGS::value_type(ID,str)) - DEF_STR(EMPTY_STRING, L""); + DEF_STR(EMPTY_STRING, ""); /********************************************************************************* * Meta Information * *********************************************************************************/ //About DLL - DEF_STR(LANGUAGE_NAME, L""); - DEF_STR(LANGUAGE_AUTHOR, L""); - DEF_STR(LANGUAGE_VERSION, L""); - DEF_STR(LANGUAGE_DATE, L""); + DEF_STR(LANGUAGE_NAME, ""); + DEF_STR(LANGUAGE_AUTHOR, ""); + DEF_STR(LANGUAGE_VERSION, ""); + DEF_STR(LANGUAGE_DATE, ""); //About DLL Dialog - DEF_STR(INI_CURRENT_LANG, L"Current Language"); - DEF_STR(INI_AUTHOR, L"Author"); - DEF_STR(INI_VERSION, L"Version"); - DEF_STR(INI_DATE, L"Date"); - DEF_STR(INI_HOMEPAGE, L"Visit Home Page"); - DEF_STR(INI_CURRENT_RDB, L"ROM Database (.RDB)"); - DEF_STR(INI_CURRENT_CHT, L"Cheat Code File (.CHT)"); - DEF_STR(INI_CURRENT_RDX, L"Extended ROM Info (.RDX)"); + DEF_STR(INI_CURRENT_LANG, "Current Language"); + DEF_STR(INI_AUTHOR, "Author"); + DEF_STR(INI_VERSION, "Version"); + DEF_STR(INI_DATE, "Date"); + DEF_STR(INI_HOMEPAGE, "Visit Home Page"); + DEF_STR(INI_CURRENT_RDB, "ROM Database (.RDB)"); + DEF_STR(INI_CURRENT_CHT, "Cheat Code File (.CHT)"); + DEF_STR(INI_CURRENT_RDX, "Extended ROM Info (.RDX)"); //About INI title - DEF_STR(INI_TITLE, L"About Config Files"); + DEF_STR(INI_TITLE, "About Config Files"); /********************************************************************************* * Numbers * *********************************************************************************/ - DEF_STR(NUMBER_0, L"0"); - DEF_STR(NUMBER_1, L"1"); - DEF_STR(NUMBER_2, L"2"); - DEF_STR(NUMBER_3, L"3"); - DEF_STR(NUMBER_4, L"4"), - DEF_STR(NUMBER_5, L"5"); - DEF_STR(NUMBER_6, L"6"); - DEF_STR(NUMBER_7, L"7"); - DEF_STR(NUMBER_8, L"8"); - DEF_STR(NUMBER_9, L"9"); + DEF_STR(NUMBER_0, "0"); + DEF_STR(NUMBER_1, "1"); + DEF_STR(NUMBER_2, "2"); + DEF_STR(NUMBER_3, "3"); + DEF_STR(NUMBER_4, "4"); + DEF_STR(NUMBER_5, "5"); + DEF_STR(NUMBER_6, "6"); + DEF_STR(NUMBER_7, "7"); + DEF_STR(NUMBER_8, "8"); + DEF_STR(NUMBER_9, "9"); /********************************************************************************* * Menu * *********************************************************************************/ //File Menu - DEF_STR(MENU_FILE, L"&File"); - DEF_STR(MENU_OPEN, L"&Open ROM"); - DEF_STR(MENU_ROM_INFO, L"ROM &Info...."); - DEF_STR(MENU_START, L"Start Emulation"); - DEF_STR(MENU_END, L"&End Emulation"); - DEF_STR(MENU_CHOOSE_ROM, L"Choose ROM Directory..."); - DEF_STR(MENU_REFRESH, L"Refresh ROM List"); - DEF_STR(MENU_RECENT_ROM, L"Recent ROM"); - DEF_STR(MENU_RECENT_DIR, L"Recent ROM Directories"); - DEF_STR(MENU_EXIT, L"E&xit"); + DEF_STR(MENU_FILE, "&File"); + DEF_STR(MENU_OPEN, "&Open ROM"); + DEF_STR(MENU_ROM_INFO, "ROM &Info...."); + DEF_STR(MENU_START, "Start Emulation"); + DEF_STR(MENU_END, "&End Emulation"); + DEF_STR(MENU_CHOOSE_ROM, "Choose ROM Directory..."); + DEF_STR(MENU_REFRESH, "Refresh ROM List"); + DEF_STR(MENU_RECENT_ROM, "Recent ROM"); + DEF_STR(MENU_RECENT_DIR, "Recent ROM Directories"); + DEF_STR(MENU_EXIT, "E&xit"); //System Menu - DEF_STR(MENU_SYSTEM, L"&System"); - DEF_STR(MENU_RESET, L"&Reset"); - DEF_STR(MENU_PAUSE, L"&Pause"); - DEF_STR(MENU_BITMAP, L"Generate Bitmap"); - DEF_STR(MENU_LIMIT_FPS, L"Limit FPS"); - DEF_STR(MENU_SAVE, L"&Save State"); - DEF_STR(MENU_SAVE_AS, L"Save As..."); - DEF_STR(MENU_RESTORE, L"&Load State"); - DEF_STR(MENU_LOAD, L"Load..."); - DEF_STR(MENU_CURRENT_SAVE, L"Current Save S&tate"); - DEF_STR(MENU_CHEAT, L"Cheats..."); - DEF_STR(MENU_GS_BUTTON, L"GS Button"); - DEF_STR(MENU_RESUME, L"R&esume"); - DEF_STR(MENU_RESET_SOFT, L"&Soft Reset"); - DEF_STR(MENU_RESET_HARD, L"&Hard Reset"); + DEF_STR(MENU_SYSTEM, "&System"); + DEF_STR(MENU_RESET, "&Reset"); + DEF_STR(MENU_PAUSE, "&Pause"); + DEF_STR(MENU_BITMAP, "Generate Bitmap"); + DEF_STR(MENU_LIMIT_FPS, "Limit FPS"); + DEF_STR(MENU_SAVE, "&Save State"); + DEF_STR(MENU_SAVE_AS, "Save As..."); + DEF_STR(MENU_RESTORE, "&Load State"); + DEF_STR(MENU_LOAD, "Load..."); + DEF_STR(MENU_CURRENT_SAVE, "Current Save S&tate"); + DEF_STR(MENU_CHEAT, "Cheats..."); + DEF_STR(MENU_GS_BUTTON, "GS Button"); + DEF_STR(MENU_RESUME, "R&esume"); + DEF_STR(MENU_RESET_SOFT, "&Soft Reset"); + DEF_STR(MENU_RESET_HARD, "&Hard Reset"); //Options Menu - DEF_STR(MENU_OPTIONS, L"&Options"); - DEF_STR(MENU_FULL_SCREEN, L"&Full Screen"); - DEF_STR(MENU_ON_TOP, L"&Always on &Top"); - DEF_STR(MENU_CONFG_GFX, L"Configure Graphics Plugin..."); - DEF_STR(MENU_CONFG_AUDIO, L"Configure Audio Plugin..."); - DEF_STR(MENU_CONFG_CTRL, L"Configure Controller Plugin..."); - DEF_STR(MENU_CONFG_RSP, L"Configure RSP Plugin..."); - DEF_STR(MENU_SHOW_CPU, L"Show CPU Usage"); - DEF_STR(MENU_SETTINGS, L"&Settings..."); + DEF_STR(MENU_OPTIONS, "&Options"); + DEF_STR(MENU_FULL_SCREEN, "&Full Screen"); + DEF_STR(MENU_ON_TOP, "&Always on &Top"); + DEF_STR(MENU_CONFG_GFX, "Configure Graphics Plugin..."); + DEF_STR(MENU_CONFG_AUDIO, "Configure Audio Plugin..."); + DEF_STR(MENU_CONFG_CTRL, "Configure Controller Plugin..."); + DEF_STR(MENU_CONFG_RSP, "Configure RSP Plugin..."); + DEF_STR(MENU_SHOW_CPU, "Show CPU Usage"); + DEF_STR(MENU_SETTINGS, "&Settings..."); //Debugger Menu - DEF_STR(MENU_DEBUGGER, L"&Debugger"); + DEF_STR(MENU_DEBUGGER, "&Debugger"); //Language Menu - DEF_STR(MENU_LANGUAGE, L"&Language"); + DEF_STR(MENU_LANGUAGE, "&Language"); //Help Menu - DEF_STR(MENU_HELP, L"&Help"); - DEF_STR(MENU_ABOUT_INI, L"About Conf&ig Files"); - DEF_STR(MENU_ABOUT_PJ64, L"&About Project64"); - DEF_STR(MENU_FORUM, L"Support &Forum"); - DEF_STR(MENU_HOMEPAGE, L"&Homepage"); + DEF_STR(MENU_HELP, "&Help"); + DEF_STR(MENU_ABOUT_INI, "About Conf&ig Files"); + DEF_STR(MENU_ABOUT_PJ64, "&About Project64"); + DEF_STR(MENU_FORUM, "Support &Forum"); + DEF_STR(MENU_HOMEPAGE, "&Homepage"); //Current Save Slot menu - DEF_STR(MENU_SLOT_DEFAULT, L"Default"); - DEF_STR(MENU_SLOT_1, L"Slot 1"); - DEF_STR(MENU_SLOT_2, L"Slot 2"); - DEF_STR(MENU_SLOT_3, L"Slot 3"); - DEF_STR(MENU_SLOT_4, L"Slot 4"); - DEF_STR(MENU_SLOT_5, L"Slot 5"); - DEF_STR(MENU_SLOT_6, L"Slot 6"); - DEF_STR(MENU_SLOT_7, L"Slot 7"); - DEF_STR(MENU_SLOT_8, L"Slot 8"); - DEF_STR(MENU_SLOT_9, L"Slot 9"); - DEF_STR(MENU_SLOT_10, L"Slot 10"); - DEF_STR(MENU_SLOT_SAVE, L"Save slot (%ws) selected"); + DEF_STR(MENU_SLOT_DEFAULT, "Default"); + DEF_STR(MENU_SLOT_1, "Slot 1"); + DEF_STR(MENU_SLOT_2, "Slot 2"); + DEF_STR(MENU_SLOT_3, "Slot 3"); + DEF_STR(MENU_SLOT_4, "Slot 4"); + DEF_STR(MENU_SLOT_5, "Slot 5"); + DEF_STR(MENU_SLOT_6, "Slot 6"); + DEF_STR(MENU_SLOT_7, "Slot 7"); + DEF_STR(MENU_SLOT_8, "Slot 8"); + DEF_STR(MENU_SLOT_9, "Slot 9"); + DEF_STR(MENU_SLOT_10, "Slot 10"); + DEF_STR(MENU_SLOT_SAVE, "Save slot (%s) selected"); //Pop up Menu - DEF_STR(POPUP_PLAY, L"Play Game"); - DEF_STR(POPUP_INFO, L"ROM Information"); - DEF_STR(POPUP_SETTINGS, L"Edit Game Settings"); - DEF_STR(POPUP_CHEATS, L"Edit Cheats"); - DEF_STR(POPUP_GFX_PLUGIN, L"Graphics Plugin"); + DEF_STR(POPUP_PLAY, "Play Game"); + DEF_STR(POPUP_INFO, "ROM Information"); + DEF_STR(POPUP_SETTINGS, "Edit Game Settings"); + DEF_STR(POPUP_CHEATS, "Edit Cheats"); + DEF_STR(POPUP_GFX_PLUGIN, "Graphics Plugin"); //Alternate Name to save Slot - DEF_STR(SAVE_SLOT_DEFAULT, L"Save Slot - Default"); - DEF_STR(SAVE_SLOT_1, L"Save Slot - 1"); - DEF_STR(SAVE_SLOT_2, L"Save Slot - 2"); - DEF_STR(SAVE_SLOT_3, L"Save Slot - 3"); - DEF_STR(SAVE_SLOT_4, L"Save Slot - 4"); - DEF_STR(SAVE_SLOT_5, L"Save Slot - 5"); - DEF_STR(SAVE_SLOT_6, L"Save Slot - 6"); - DEF_STR(SAVE_SLOT_7, L"Save Slot - 7"); - DEF_STR(SAVE_SLOT_8, L"Save Slot - 8"); - DEF_STR(SAVE_SLOT_9, L"Save Slot - 9"); - DEF_STR(SAVE_SLOT_10, L"Save Slot - 10"); + DEF_STR(SAVE_SLOT_DEFAULT, "Save Slot - Default"); + DEF_STR(SAVE_SLOT_1, "Save Slot - 1"); + DEF_STR(SAVE_SLOT_2, "Save Slot - 2"); + DEF_STR(SAVE_SLOT_3, "Save Slot - 3"); + DEF_STR(SAVE_SLOT_4, "Save Slot - 4"); + DEF_STR(SAVE_SLOT_5, "Save Slot - 5"); + DEF_STR(SAVE_SLOT_6, "Save Slot - 6"); + DEF_STR(SAVE_SLOT_7, "Save Slot - 7"); + DEF_STR(SAVE_SLOT_8, "Save Slot - 8"); + DEF_STR(SAVE_SLOT_9, "Save Slot - 9"); + DEF_STR(SAVE_SLOT_10, "Save Slot - 10"); /********************************************************************************* * ROM Browser * *********************************************************************************/ //ROM Browser Fields - DEF_STR(RB_FILENAME, L"File Name"); - DEF_STR(RB_INTERNALNAME, L"Internal Name"); - DEF_STR(RB_GOODNAME, L"Good Name"); - DEF_STR(RB_STATUS, L"Status"); - DEF_STR(RB_ROMSIZE, L"ROM Size"); - DEF_STR(RB_NOTES_CORE, L"Notes (core)"); - DEF_STR(RB_NOTES_PLUGIN, L"Notes (default plugins)"); - DEF_STR(RB_NOTES_USER, L"Notes (user)"); - DEF_STR(RB_CART_ID, L"Cartridge ID"); - DEF_STR(RB_MANUFACTUER, L"Manufacturer"); - DEF_STR(RB_COUNTRY, L"Country"); - DEF_STR(RB_DEVELOPER, L"Developer"); - DEF_STR(RB_CRC1, L"CRC1"); - DEF_STR(RB_CRC2, L"CRC2"); - DEF_STR(RB_CICCHIP, L"CIC Chip"); - DEF_STR(RB_RELEASE_DATE, L"Release Date"); - DEF_STR(RB_GENRE, L"Genre"); - DEF_STR(RB_PLAYERS, L"Players"); - DEF_STR(RB_FORCE_FEEDBACK, L"Force Feedback"); - DEF_STR(RB_FILE_FORMAT, L"File Format"); + DEF_STR(RB_FILENAME, "File Name"); + DEF_STR(RB_INTERNALNAME, "Internal Name"); + DEF_STR(RB_GOODNAME, "Good Name"); + DEF_STR(RB_STATUS, "Status"); + DEF_STR(RB_ROMSIZE, "ROM Size"); + DEF_STR(RB_NOTES_CORE, "Notes (core)"); + DEF_STR(RB_NOTES_PLUGIN, "Notes (default plugins)"); + DEF_STR(RB_NOTES_USER, "Notes (user)"); + DEF_STR(RB_CART_ID, "Cartridge ID"); + DEF_STR(RB_MANUFACTUER, "Manufacturer"); + DEF_STR(RB_COUNTRY, "Country"); + DEF_STR(RB_DEVELOPER, "Developer"); + DEF_STR(RB_CRC1, "CRC1"); + DEF_STR(RB_CRC2, "CRC2"); + DEF_STR(RB_CICCHIP, "CIC Chip"); + DEF_STR(RB_RELEASE_DATE, "Release Date"); + DEF_STR(RB_GENRE, "Genre"); + DEF_STR(RB_PLAYERS, "Players"); + DEF_STR(RB_FORCE_FEEDBACK, "Force Feedback"); + DEF_STR(RB_FILE_FORMAT, "File Format"); //Select ROM - DEF_STR(SELECT_ROM_DIR, L"Select current ROM directory"); + DEF_STR(SELECT_ROM_DIR, "Select current ROM directory"); //Messages - DEF_STR(RB_NOT_GOOD_FILE, L"Bad ROM? Use GoodN64 & check that the RDB is up-to-date."); + DEF_STR(RB_NOT_GOOD_FILE, "Bad ROM? Use GoodN64 & check that the RDB is up-to-date."); /********************************************************************************* * Options * *********************************************************************************/ //Options Title - DEF_STR(OPTIONS_TITLE, L"Settings"); + DEF_STR(OPTIONS_TITLE, "Settings"); //Tabs - DEF_STR(TAB_PLUGIN, L"Plugins"); - DEF_STR(TAB_DIRECTORY, L"Directories"); - DEF_STR(TAB_OPTIONS, L"Options"); - DEF_STR(TAB_ROMSELECTION, L"ROM Selection"); - DEF_STR(TAB_ADVANCED, L"Advanced"); - DEF_STR(TAB_ROMSETTINGS, L"General Settings"); - DEF_STR(TAB_SHELLINTERGATION, L"Shell Integration"); - DEF_STR(TAB_ROMNOTES, L"Notes"); - DEF_STR(TAB_SHORTCUTS, L"Keyboard Shortcuts"); - DEF_STR(TAB_ROMSTATUS, L"Status"); - DEF_STR(TAB_RECOMPILER, L"Recompiler"); + DEF_STR(TAB_PLUGIN, "Plugins"); + DEF_STR(TAB_DIRECTORY, "Directories"); + DEF_STR(TAB_OPTIONS, "Options"); + DEF_STR(TAB_ROMSELECTION, "ROM Selection"); + DEF_STR(TAB_ADVANCED, "Advanced"); + DEF_STR(TAB_ROMSETTINGS, "General Settings"); + DEF_STR(TAB_SHELLINTERGATION, "Shell Integration"); + DEF_STR(TAB_ROMNOTES, "Notes"); + DEF_STR(TAB_SHORTCUTS, "Keyboard Shortcuts"); + DEF_STR(TAB_ROMSTATUS, "Status"); + DEF_STR(TAB_RECOMPILER, "Recompiler"); //Plugin Dialog - DEF_STR(PLUG_ABOUT, L"About"); - DEF_STR(PLUG_RSP, L" RSP (Reality Signal Processor) plugin: "); - DEF_STR(PLUG_GFX, L" Video (graphics) plugin: "); - DEF_STR(PLUG_AUDIO, L" Audio (sound) plugin: "); - DEF_STR(PLUG_CTRL, L" Input (controller) plugin: "); - DEF_STR(PLUG_HLE_GFX, L"Graphics HLE"); - DEF_STR(PLUG_HLE_AUDIO, L"Audio HLE"); - DEF_STR(PLUG_DEFAULT, L"** Use System Plugin **"); + DEF_STR(PLUG_ABOUT, "About"); + DEF_STR(PLUG_RSP, " RSP (Reality Signal Processor) plugin: "); + DEF_STR(PLUG_GFX, " Video (graphics) plugin: "); + DEF_STR(PLUG_AUDIO, " Audio (sound) plugin: "); + DEF_STR(PLUG_CTRL, " Input (controller) plugin: "); + DEF_STR(PLUG_HLE_GFX, "Graphics HLE"); + DEF_STR(PLUG_HLE_AUDIO, "Audio HLE"); + DEF_STR(PLUG_DEFAULT, "** Use System Plugin **"); //Directory Dialog - DEF_STR(DIR_PLUGIN, L" Plugin directory: "); - DEF_STR(DIR_ROM, L" ROM directory: "); - DEF_STR(DIR_AUTO_SAVE, L" N64 native saves directory: "); - DEF_STR(DIR_INSTANT_SAVE, L" Saved states directory: "); - DEF_STR(DIR_SCREEN_SHOT, L" Screenshot directory: "); - DEF_STR(DIR_ROM_DEFAULT, L"Last folder that a ROM was open from"); - DEF_STR(DIR_SELECT_PLUGIN, L"Select plugin directory"); - DEF_STR(DIR_SELECT_ROM, L"Select ROM directory"); - DEF_STR(DIR_SELECT_AUTO, L"Select N64 native saves directory"); - DEF_STR(DIR_SELECT_INSTANT, L"Select saved states directory"); - DEF_STR(DIR_SELECT_SCREEN, L"Select screenshot directory"); - DEF_STR(DIR_TEXTURE, L" Texture pack directory: "); - DEF_STR(DIR_SELECT_TEXTURE, L"Select texture pack directory"); + DEF_STR(DIR_PLUGIN, " Plugin directory: "); + DEF_STR(DIR_ROM, " ROM directory: "); + DEF_STR(DIR_AUTO_SAVE, " N64 native saves directory: "); + DEF_STR(DIR_INSTANT_SAVE, " Saved states directory: "); + DEF_STR(DIR_SCREEN_SHOT, " Screenshot directory: "); + DEF_STR(DIR_ROM_DEFAULT, "Last folder that a ROM was open from"); + DEF_STR(DIR_SELECT_PLUGIN, "Select plugin directory"); + DEF_STR(DIR_SELECT_ROM, "Select ROM directory"); + DEF_STR(DIR_SELECT_AUTO, "Select N64 native saves directory"); + DEF_STR(DIR_SELECT_INSTANT, "Select saved states directory"); + DEF_STR(DIR_SELECT_SCREEN, "Select screenshot directory"); + DEF_STR(DIR_TEXTURE, " Texture pack directory: "); + DEF_STR(DIR_SELECT_TEXTURE, "Select texture pack directory"); //Options (general) Tab - DEF_STR(OPTION_AUTO_SLEEP, L"Pause emulation when window is not active"); - DEF_STR(OPTION_AUTO_FULLSCREEN, L"Enter full-screen mode when loading a ROM"); - DEF_STR(OPTION_BASIC_MODE, L"Hide advanced settings"); - DEF_STR(OPTION_REMEMBER_CHEAT, L"Remember selected cheats"); - DEF_STR(OPTION_DISABLE_SS, L"Disable screen saver when running a ROM"); - DEF_STR(OPTION_DISPLAY_FR, L"Display speed"); - DEF_STR(OPTION_CHECK_RUNNING, L"Check if Project64 is already running"); - DEF_STR(OPTION_CHANGE_FR, L"Speed display:"); + DEF_STR(OPTION_AUTO_SLEEP, "Pause emulation when window is not active"); + DEF_STR(OPTION_AUTO_FULLSCREEN, "Enter full-screen mode when loading a ROM"); + DEF_STR(OPTION_BASIC_MODE, "Hide advanced settings"); + DEF_STR(OPTION_REMEMBER_CHEAT, "Remember selected cheats"); + DEF_STR(OPTION_DISABLE_SS, "Disable screen saver when running a ROM"); + DEF_STR(OPTION_DISPLAY_FR, "Display speed"); + DEF_STR(OPTION_CHECK_RUNNING, "Check if Project64 is already running"); + DEF_STR(OPTION_CHANGE_FR, "Speed display:"); //ROM Browser Tab - DEF_STR(RB_MAX_ROMS, L"Max # of ROMs remembered (0-10):"); - DEF_STR(RB_ROMS, L"ROMs"); - DEF_STR(RB_MAX_DIRS, L"Max # of ROM dirs remembered (0-10):"); - DEF_STR(RB_DIRS, L"dirs"); - DEF_STR(RB_USE, L"Use ROM browser"); - DEF_STR(RB_DIR_RECURSION, L"Use directory recursion"); - DEF_STR(RB_AVALIABLE_FIELDS, L"Available fields:"); - DEF_STR(RB_SHOW_FIELDS, L"Order of fields:"); - DEF_STR(RB_ADD, L"Add ->"); - DEF_STR(RB_REMOVE, L"<- Remove"); - DEF_STR(RB_UP, L"Up"); - DEF_STR(RB_DOWN, L"Down"); - DEF_STR(RB_REFRESH, L"Automatically refresh browser"); + DEF_STR(RB_MAX_ROMS, "Max # of ROMs remembered (0-10):"); + DEF_STR(RB_ROMS, "ROMs"); + DEF_STR(RB_MAX_DIRS, "Max # of ROM dirs remembered (0-10):"); + DEF_STR(RB_DIRS, "dirs"); + DEF_STR(RB_USE, "Use ROM browser"); + DEF_STR(RB_DIR_RECURSION, "Use directory recursion"); + DEF_STR(RB_AVALIABLE_FIELDS, "Available fields:"); + DEF_STR(RB_SHOW_FIELDS, "Order of fields:"); + DEF_STR(RB_ADD, "Add ->"); + DEF_STR(RB_REMOVE, "<- Remove"); + DEF_STR(RB_UP, "Up"); + DEF_STR(RB_DOWN, "Down"); + DEF_STR(RB_REFRESH, "Automatically refresh browser"); //Advanced Options - DEF_STR(ADVANCE_INFO, L"Most of these changes will not take effect until a new ROM is opened or current ROM is reset."); - DEF_STR(ADVANCE_DEFAULTS, L"Core Defaults"); - DEF_STR(ADVANCE_CPU_STYLE, L"CPU core style:"); - DEF_STR(ADVANCE_SMCM, L"Self-mod methods:"); - DEF_STR(ADVANCE_MEM_SIZE, L"Default memory size:"); - DEF_STR(ADVANCE_ABL, L"Advanced block linking"); - DEF_STR(ADVANCE_AUTO_START, L"Start emulation when ROM is opened"); - DEF_STR(ADVANCE_OVERWRITE, L"Always override default settings with ones from RDB"); - DEF_STR(ADVANCE_COMPRESS, L"Automatically compress saved states"); - DEF_STR(ADVANCE_DEBUGGER, L"Enable debugger"); - DEF_STR(ADVANCE_SMM_CACHE, L"Cache"); - DEF_STR(ADVANCE_SMM_PIDMA, L"PI DMA"); - DEF_STR(ADVANCE_SMM_VALIDATE, L"Start changed"); - DEF_STR(ADVANCE_SMM_PROTECT, L"Protect memory"); - DEF_STR(ADVANCE_SMM_TLB, L"TLB unmapping"); + DEF_STR(ADVANCE_INFO, "Most of these changes will not take effect until a new ROM is opened or current ROM is reset."); + DEF_STR(ADVANCE_DEFAULTS, "Core Defaults"); + DEF_STR(ADVANCE_CPU_STYLE, "CPU core style:"); + DEF_STR(ADVANCE_SMCM, "Self-mod methods:"); + DEF_STR(ADVANCE_MEM_SIZE, "Default memory size:"); + DEF_STR(ADVANCE_ABL, "Advanced block linking"); + DEF_STR(ADVANCE_AUTO_START, "Start emulation when ROM is opened"); + DEF_STR(ADVANCE_OVERWRITE, "Always override default settings with ones from RDB"); + DEF_STR(ADVANCE_COMPRESS, "Automatically compress saved states"); + DEF_STR(ADVANCE_DEBUGGER, "Enable debugger"); + DEF_STR(ADVANCE_SMM_CACHE, "Cache"); + DEF_STR(ADVANCE_SMM_PIDMA, "PI DMA"); + DEF_STR(ADVANCE_SMM_VALIDATE, "Start changed"); + DEF_STR(ADVANCE_SMM_PROTECT, "Protect memory"); + DEF_STR(ADVANCE_SMM_TLB, "TLB unmapping"); //ROM Options - DEF_STR(ROM_CPU_STYLE, L"CPU core style:"); - DEF_STR(ROM_VIREFRESH, L"VI refresh rate:"); - DEF_STR(ROM_MEM_SIZE, L"Memory size:"); - DEF_STR(ROM_ABL, L"Advanced block linking"); - DEF_STR(ROM_SAVE_TYPE, L"Default save type:"); - DEF_STR(ROM_COUNTER_FACTOR, L"Counter factor:"); - DEF_STR(ROM_LARGE_BUFFER, L"Larger compile buffer"); - DEF_STR(ROM_USE_TLB, L"Use TLB"); - DEF_STR(ROM_REG_CACHE, L"Register caching"); - DEF_STR(ROM_DELAY_SI, L"Delay SI interrupt"); - DEF_STR(ROM_FAST_SP, L"Fast SP"); - DEF_STR(ROM_DEFAULT, L"Default"); - DEF_STR(ROM_AUDIO_SIGNAL, L"RSP audio signal"); - DEF_STR(ROM_FIXED_AUDIO, L"Fixed audio timing"); - DEF_STR(ROM_FUNC_FIND, L"Function lookup method:"); - DEF_STR(ROM_CUSTOM_SMM, L"Custom self mod Method"); - DEF_STR(ROM_SYNC_AUDIO, L"Sync using audio"); - DEF_STR(ROM_COUNTPERBYTE, L"AI count per byte:"); - DEF_STR(ROM_32BIT, L"32-bit engine:"); - DEF_STR(ROM_DELAY_DP, L"Delay DP interrupt:"); + DEF_STR(ROM_CPU_STYLE, "CPU core style:"); + DEF_STR(ROM_VIREFRESH, "VI refresh rate:"); + DEF_STR(ROM_MEM_SIZE, "Memory size:"); + DEF_STR(ROM_ABL, "Advanced block linking"); + DEF_STR(ROM_SAVE_TYPE, "Default save type:"); + DEF_STR(ROM_COUNTER_FACTOR, "Counter factor:"); + DEF_STR(ROM_LARGE_BUFFER, "Larger compile buffer"); + DEF_STR(ROM_USE_TLB, "Use TLB"); + DEF_STR(ROM_REG_CACHE, "Register caching"); + DEF_STR(ROM_DELAY_SI, "Delay SI interrupt"); + DEF_STR(ROM_FAST_SP, "Fast SP"); + DEF_STR(ROM_DEFAULT, "Default"); + DEF_STR(ROM_AUDIO_SIGNAL, "RSP audio signal"); + DEF_STR(ROM_FIXED_AUDIO, "Fixed audio timing"); + DEF_STR(ROM_FUNC_FIND, "Function lookup method:"); + DEF_STR(ROM_CUSTOM_SMM, "Custom self mod Method"); + DEF_STR(ROM_SYNC_AUDIO, "Sync using audio"); + DEF_STR(ROM_COUNTPERBYTE, "AI count per byte:"); + DEF_STR(ROM_32BIT, "32-bit engine:"); + DEF_STR(ROM_DELAY_DP, "Delay DP interrupt:"); //Core Styles - DEF_STR(CORE_INTERPTER, L"Interpreter"); - DEF_STR(CORE_RECOMPILER, L"Recompiler"); - DEF_STR(CORE_SYNC, L"Synchronize cores"); + DEF_STR(CORE_INTERPTER, "Interpreter"); + DEF_STR(CORE_RECOMPILER, "Recompiler"); + DEF_STR(CORE_SYNC, "Synchronize cores"); //Self Mod Methods - DEF_STR(SMCM_NONE, L"None"); - DEF_STR(SMCM_CACHE, L"Cache"); - DEF_STR(SMCM_PROECTED, L"Protect memory"); - DEF_STR(SMCM_CHECK_MEM, L"Check memory & cache"); - DEF_STR(SMCM_CHANGE_MEM, L"Change memory & cache"); - DEF_STR(SMCM_CHECK_ADV, L"Check memory advance"); - DEF_STR(SMCM_CACHE2, L"Clear code on cache"); + DEF_STR(SMCM_NONE, "None"); + DEF_STR(SMCM_CACHE, "Cache"); + DEF_STR(SMCM_PROECTED, "Protect memory"); + DEF_STR(SMCM_CHECK_MEM, "Check memory & cache"); + DEF_STR(SMCM_CHANGE_MEM, "Change memory & cache"); + DEF_STR(SMCM_CHECK_ADV, "Check memory advance"); + DEF_STR(SMCM_CACHE2, "Clear code on cache"); //Function Lookup method - DEF_STR(FLM_PLOOKUP, L"Physical lookup table"); - DEF_STR(FLM_VLOOKUP, L"Virtual lookup table"); - DEF_STR(FLM_CHANGEMEM, L"Change memory"); + DEF_STR(FLM_PLOOKUP, "Physical lookup table"); + DEF_STR(FLM_VLOOKUP, "Virtual lookup table"); + DEF_STR(FLM_CHANGEMEM, "Change memory"); //RDRAM Size - DEF_STR(RDRAM_4MB, L"4 MB"); - DEF_STR(RDRAM_8MB, L"8 MB"); + DEF_STR(RDRAM_4MB, "4 MB"); + DEF_STR(RDRAM_8MB, "8 MB"); //Advanced Block Linking - DEF_STR(ABL_ON, L"On"); - DEF_STR(ABL_OFF, L"Off"); + DEF_STR(ABL_ON, "On"); + DEF_STR(ABL_OFF, "Off"); //Save Type - DEF_STR(SAVE_FIRST_USED, L"Use first-used save type"); - DEF_STR(SAVE_4K_EEPROM, L"4-kbit EEPROM"); - DEF_STR(SAVE_16K_EEPROM, L"16-kbit EEPROM"); - DEF_STR(SAVE_SRAM, L"SRAM"); - DEF_STR(SAVE_FLASHRAM, L"Flash RAM"); + DEF_STR(SAVE_FIRST_USED, "Use first-used save type"); + DEF_STR(SAVE_4K_EEPROM, "4-kbit EEPROM"); + DEF_STR(SAVE_16K_EEPROM, "16-kbit EEPROM"); + DEF_STR(SAVE_SRAM, "SRAM"); + DEF_STR(SAVE_FLASHRAM, "Flash RAM"); //Shell Integration Tab - DEF_STR(SHELL_TEXT, L"File extension association:"); + DEF_STR(SHELL_TEXT, "File extension association:"); //ROM Notes - DEF_STR(NOTE_STATUS, L"ROM status:"); - DEF_STR(NOTE_CORE, L"Core note:"); - DEF_STR(NOTE_PLUGIN, L"Plugin note:"); + DEF_STR(NOTE_STATUS, "ROM status:"); + DEF_STR(NOTE_CORE, "Core note:"); + DEF_STR(NOTE_PLUGIN, "Plugin note:"); // Accelerator Selector - DEF_STR(ACCEL_CPUSTATE_TITLE, L"CPU state:"); - DEF_STR(ACCEL_MENUITEM_TITLE, L"Menu item:"); - DEF_STR(ACCEL_CURRENTKEYS_TITLE, L"Current keys:"); - DEF_STR(ACCEL_SELKEY_TITLE, L"Select new shortcut key:"); - DEF_STR(ACCEL_ASSIGNEDTO_TITLE, L"Currently assigned to:"); - DEF_STR(ACCEL_ASSIGN_BTN, L"Assign"); - DEF_STR(ACCEL_REMOVE_BTN, L"Remove"); - DEF_STR(ACCEL_RESETALL_BTN, L"Reset all"); - DEF_STR(ACCEL_CPUSTATE_1, L"Game not playing"); - DEF_STR(ACCEL_CPUSTATE_2, L"Game playing"); - DEF_STR(ACCEL_CPUSTATE_3, L"Game playing (windowed)"); - DEF_STR(ACCEL_CPUSTATE_4, L"Game playing (full-screen)"); - DEF_STR(ACCEL_DETECTKEY, L"Detect Key"); + DEF_STR(ACCEL_CPUSTATE_TITLE, "CPU state:"); + DEF_STR(ACCEL_MENUITEM_TITLE, "Menu item:"); + DEF_STR(ACCEL_CURRENTKEYS_TITLE, "Current keys:"); + DEF_STR(ACCEL_SELKEY_TITLE, "Select new shortcut key:"); + DEF_STR(ACCEL_ASSIGNEDTO_TITLE, "Currently assigned to:"); + DEF_STR(ACCEL_ASSIGN_BTN, "Assign"); + DEF_STR(ACCEL_REMOVE_BTN, "Remove"); + DEF_STR(ACCEL_RESETALL_BTN, "Reset all"); + DEF_STR(ACCEL_CPUSTATE_1, "Game not playing"); + DEF_STR(ACCEL_CPUSTATE_2, "Game playing"); + DEF_STR(ACCEL_CPUSTATE_3, "Game playing (windowed)"); + DEF_STR(ACCEL_CPUSTATE_4, "Game playing (full-screen)"); + DEF_STR(ACCEL_DETECTKEY, "Detect Key"); // Frame Rate Option - DEF_STR(STR_FR_VIS, L"Vertical interrupts per second"); - DEF_STR(STR_FR_DLS, L"Display lists per second"); - DEF_STR(STR_FR_PERCENT, L"Percentage of full speed"); + DEF_STR(STR_FR_VIS, "Vertical interrupts per second"); + DEF_STR(STR_FR_DLS, "Display lists per second"); + DEF_STR(STR_FR_PERCENT, "Percentage of full speed"); // Increase speed - DEF_STR(STR_INSREASE_SPEED, L"Increase Game Speed"); - DEF_STR(STR_DECREASE_SPEED, L"Decrease Game Speed"); + DEF_STR(STR_INSREASE_SPEED, "Increase Game Speed"); + DEF_STR(STR_DECREASE_SPEED, "Decrease Game Speed"); //Bottom page buttons - DEF_STR(BOTTOM_RESET_PAGE, L"Reset Page"); - DEF_STR(BOTTOM_RESET_ALL, L"Reset All"); - DEF_STR(BOTTOM_APPLY, L"Apply"); - DEF_STR(BOTTOM_CLOSE, L"Close"); + DEF_STR(BOTTOM_RESET_PAGE, "Reset Page"); + DEF_STR(BOTTOM_RESET_ALL, "Reset All"); + DEF_STR(BOTTOM_APPLY, "Apply"); + DEF_STR(BOTTOM_CLOSE, "Close"); /********************************************************************************* * ROM Information * *********************************************************************************/ //ROM Info Title - DEF_STR(INFO_TITLE, L"ROM Information"); + DEF_STR(INFO_TITLE, "ROM Information"); //ROM Info Text - DEF_STR(INFO_ROM_NAME_TEXT, L"ROM name:"); - DEF_STR(INFO_FILE_NAME_TEXT, L"File name:"); - DEF_STR(INFO_LOCATION_TEXT, L"Location:"); - DEF_STR(INFO_SIZE_TEXT, L"ROM size:"); - DEF_STR(INFO_CART_ID_TEXT, L"Cartridge ID:"); - DEF_STR(INFO_MANUFACTURER_TEXT, L"Manufacturer:"); - DEF_STR(INFO_COUNTRY_TEXT, L"Country:"); - DEF_STR(INFO_CRC1_TEXT, L"CRC1:"); - DEF_STR(INFO_CRC2_TEXT, L"CRC2:"); - DEF_STR(INFO_CIC_CHIP_TEXT, L"CIC chip:"); - DEF_STR(INFO_MD5_TEXT, L"MD5:"); + DEF_STR(INFO_ROM_NAME_TEXT, "ROM name:"); + DEF_STR(INFO_FILE_NAME_TEXT, "File name:"); + DEF_STR(INFO_LOCATION_TEXT, "Location:"); + DEF_STR(INFO_SIZE_TEXT, "ROM size:"); + DEF_STR(INFO_CART_ID_TEXT, "Cartridge ID:"); + DEF_STR(INFO_MANUFACTURER_TEXT, "Manufacturer:"); + DEF_STR(INFO_COUNTRY_TEXT, "Country:"); + DEF_STR(INFO_CRC1_TEXT, "CRC1:"); + DEF_STR(INFO_CRC2_TEXT, "CRC2:"); + DEF_STR(INFO_CIC_CHIP_TEXT, "CIC chip:"); + DEF_STR(INFO_MD5_TEXT, "MD5:"); /********************************************************************************* * Cheats * *********************************************************************************/ //Cheat List - DEF_STR(CHEAT_TITLE, L"Cheats"); - DEF_STR(CHEAT_LIST_FRAME, L"Cheats:"); - DEF_STR(CHEAT_NOTES_FRAME, L" Notes: "); - DEF_STR(CHEAT_MARK_ALL, L"Mark All"); - DEF_STR(CHEAT_MARK_NONE, L"Unmark All"); + DEF_STR(CHEAT_TITLE, "Cheats"); + DEF_STR(CHEAT_LIST_FRAME, "Cheats:"); + DEF_STR(CHEAT_NOTES_FRAME, " Notes: "); + DEF_STR(CHEAT_MARK_ALL, "Mark All"); + DEF_STR(CHEAT_MARK_NONE, "Unmark All"); //Add Cheat - DEF_STR(CHEAT_ADDCHEAT_FRAME, L"Add Cheat"); - DEF_STR(CHEAT_ADDCHEAT_NAME, L"Name:"); - DEF_STR(CHEAT_ADDCHEAT_CODE, L"Code:"); - DEF_STR(CHEAT_ADDCHEAT_INSERT, L"Insert"); - DEF_STR(CHEAT_ADDCHEAT_CLEAR, L"Clear"); - DEF_STR(CHEAT_ADDCHEAT_NOTES, L" Cheat Notes: "); - DEF_STR(CHEAT_ADD_TO_DB, L"Add to DB"); + DEF_STR(CHEAT_ADDCHEAT_FRAME, "Add Cheat"); + DEF_STR(CHEAT_ADDCHEAT_NAME, "Name:"); + DEF_STR(CHEAT_ADDCHEAT_CODE, "Code:"); + DEF_STR(CHEAT_ADDCHEAT_INSERT, "Insert"); + DEF_STR(CHEAT_ADDCHEAT_CLEAR, "Clear"); + DEF_STR(CHEAT_ADDCHEAT_NOTES, " Cheat Notes: "); + DEF_STR(CHEAT_ADD_TO_DB, "Add to DB"); //Code extension - DEF_STR(CHEAT_CODE_EXT_TITLE, L"Code Extensions"); - DEF_STR(CHEAT_CODE_EXT_TXT, L"Please choose a value to be used for:"); - DEF_STR(CHEAT_OK, L"OK"); - DEF_STR(CHEAT_CANCEL, L"Cancel"); + DEF_STR(CHEAT_CODE_EXT_TITLE, "Code Extensions"); + DEF_STR(CHEAT_CODE_EXT_TXT, "Please choose a value to be used for:"); + DEF_STR(CHEAT_OK, "OK"); + DEF_STR(CHEAT_CANCEL, "Cancel"); //Digital Value - DEF_STR(CHEAT_QUANTITY_TITLE, L"Quantity Digit"); - DEF_STR(CHEAT_CHOOSE_VALUE, L"Please choose a value for:"); - DEF_STR(CHEAT_VALUE, L"&Value"); - DEF_STR(CHEAT_FROM, L"from"); - DEF_STR(CHEAT_TO, L"to"); - DEF_STR(CHEAT_NOTES, L"&Notes:"); - DEF_STR(CHEAT_ADDCHEAT_ADD, L"Add Cheat"); - DEF_STR(CHEAT_ADDCHEAT_NEW, L"New Cheat"); - DEF_STR(CHEAT_ADDCHEAT_CODEDES, L"
"); - DEF_STR(CHEAT_ADDCHEAT_OPT, L"Options:"); - DEF_STR(CHEAT_ADDCHEAT_OPTDES, L"