From 6919451ae4c8f8078871acd257b188affd2ad4d0 Mon Sep 17 00:00:00 2001 From: Jasmine Iwanek Date: Wed, 9 Nov 2022 18:13:33 -0500 Subject: [PATCH] Fix string offsetting --- src/86box.c | 6 +- src/config.c | 8 +-- src/disk/hdd.c | 2 +- src/include/86box/language.h | 2 + src/printer/prt_escp.c | 4 +- src/printer/prt_ps.c | 2 +- src/qt/qt_main.cpp | 2 +- src/qt/qt_platform.cpp | 28 ++++---- src/sound/midi_fluidsynth.c | 2 +- src/video/vid_svga.c | 2 +- src/win/win.c | 2 +- src/win/win_about.c | 6 +- src/win/win_devconf.c | 2 +- src/win/win_dialog.c | 4 +- src/win/win_media_menu.c | 28 ++++---- src/win/win_new_floppy.c | 2 +- src/win/win_opengl.c | 4 +- src/win/win_settings.c | 127 +++++++++++++++++++++++------------ src/win/win_stbar.c | 18 ++--- src/win/win_toolbar.c | 16 ++--- src/win/win_ui.c | 26 +++---- 21 files changed, 169 insertions(+), 124 deletions(-) diff --git a/src/86box.c b/src/86box.c index 322f674f1..6188351e1 100644 --- a/src/86box.c +++ b/src/86box.c @@ -854,7 +854,7 @@ pc_init_modules(void) machine = -1; while (machine_get_internal_name_ex(c) != NULL) { if (machine_available(c)) { - ui_msgbox_header(MBX_INFO, (wchar_t *) IDS_2128, temp); + ui_msgbox_header(MBX_INFO, (wchar_t *) IDS_2129, temp); machine = c; config_save(); break; @@ -877,7 +877,7 @@ pc_init_modules(void) while (video_get_internal_name(c) != NULL) { gfxcard = -1; if (video_card_available(c)) { - ui_msgbox_header(MBX_INFO, (wchar_t *) IDS_2128, temp); + ui_msgbox_header(MBX_INFO, (wchar_t *) IDS_2129, temp); gfxcard = c; config_save(); break; @@ -895,7 +895,7 @@ pc_init_modules(void) char tempc[512] = { 0 }; device_get_name(video_card_getdevice(gfxcard_2), 0, tempc); swprintf(temp, sizeof(temp), (wchar_t *) "Video card #2 \"%hs\" is not available due to missing ROMs in the roms/video directory. Disabling the second video card.", tempc); - ui_msgbox_header(MBX_INFO, (wchar_t *) IDS_2128, temp); + ui_msgbox_header(MBX_INFO, (wchar_t *) IDS_2129, temp); gfxcard_2 = 0; } diff --git a/src/config.c b/src/config.c index 63b1c6805..09add169a 100644 --- a/src/config.c +++ b/src/config.c @@ -736,9 +736,9 @@ load_network(void) if (p != NULL) { if ((network_dev_to_id(p) == -1) || (network_ndev == 1)) { if (network_ndev == 1) { - ui_msgbox_header(MBX_ERROR, (wchar_t *) IDS_2094, (wchar_t *) IDS_2129); + ui_msgbox_header(MBX_ERROR, (wchar_t *) IDS_2095, (wchar_t *) IDS_2130); } else if (network_dev_to_id(p) == -1) { - ui_msgbox_header(MBX_ERROR, (wchar_t *) IDS_2095, (wchar_t *) IDS_2129); + ui_msgbox_header(MBX_ERROR, (wchar_t *) IDS_2096, (wchar_t *) IDS_2130); } strcpy(net_cards_conf[c].host_dev_name, "none"); } else { @@ -783,9 +783,9 @@ load_network(void) if (p != NULL) { if ((network_dev_to_id(p) == -1) || (network_ndev == 1)) { if (network_ndev == 1) { - ui_msgbox_header(MBX_ERROR, (wchar_t *) IDS_2094, (wchar_t *) IDS_2129); + ui_msgbox_header(MBX_ERROR, (wchar_t *) IDS_2095, (wchar_t *) IDS_2130); } else if (network_dev_to_id(p) == -1) { - ui_msgbox_header(MBX_ERROR, (wchar_t *) IDS_2095, (wchar_t *) IDS_2129); + ui_msgbox_header(MBX_ERROR, (wchar_t *) IDS_2096, (wchar_t *) IDS_2130); } strcpy(net_cards_conf[c].host_dev_name, "none"); } else { diff --git a/src/disk/hdd.c b/src/disk/hdd.c index ee731b046..f006ce9c8 100644 --- a/src/disk/hdd.c +++ b/src/disk/hdd.c @@ -53,7 +53,7 @@ hdd_string_to_bus(char *str, int cdrom) if (!strcmp(str, "mfm") || !strcmp(str, "rll")) { if (cdrom) { no_cdrom: - ui_msgbox_header(MBX_ERROR, (wchar_t *) IDS_2130, (wchar_t *) IDS_4099); + ui_msgbox_header(MBX_ERROR, (wchar_t *) IDS_2131, (wchar_t *) IDS_4099); return (0); } diff --git a/src/include/86box/language.h b/src/include/86box/language.h index a3a014752..4a983a1c8 100644 --- a/src/include/86box/language.h +++ b/src/include/86box/language.h @@ -56,11 +56,13 @@ #define IDS_2079 2079 // "Press F12-F8 or middle button.." #define IDS_2080 2080 // "Unable to initialize Flui.." #define IDS_2081 2081 // "Bus" +#define IDS_BUS IDS_2081 // "Bus" #define IDS_2082 2082 // "File" #define IDS_2083 2083 // "C" #define IDS_2084 2084 // "H" #define IDS_2085 2085 // "S" #define IDS_2086 2086 // "MB" +#define IDS_MB IDS_2086 // "MB" #define IDS_2087 2087 // "Speed" #define IDS_2088 2088 // "Check BPB" diff --git a/src/printer/prt_escp.c b/src/printer/prt_escp.c index 96d9bf86b..e0a83da31 100644 --- a/src/printer/prt_escp.c +++ b/src/printer/prt_escp.c @@ -1997,7 +1997,7 @@ escp_init(void *lpt) if (ft_handle == NULL) { ft_handle = dynld_module(fn, ft_imports); if (ft_handle == NULL) { - ui_msgbox_header(MBX_ERROR, (wchar_t *) IDS_2110, (wchar_t *) IDS_2131); + ui_msgbox_header(MBX_ERROR, (wchar_t *) IDS_2111, (wchar_t *) IDS_2132); return (NULL); } } @@ -2005,7 +2005,7 @@ escp_init(void *lpt) /* Initialize FreeType. */ if (ft_lib == NULL) { if (ft_Init_FreeType(&ft_lib)) { - ui_msgbox_header(MBX_ERROR, (wchar_t *) IDS_2110, (wchar_t *) IDS_2131); + ui_msgbox_header(MBX_ERROR, (wchar_t *) IDS_2111, (wchar_t *) IDS_2132); dynld_close(ft_lib); ft_lib = NULL; return (NULL); diff --git a/src/printer/prt_ps.c b/src/printer/prt_ps.c index 760bc5e17..2a5c3ba67 100644 --- a/src/printer/prt_ps.c +++ b/src/printer/prt_ps.c @@ -340,7 +340,7 @@ ps_init(void *lpt) /* Try loading the DLL. */ ghostscript_handle = dynld_module(PATH_GHOSTSCRIPT_DLL, ghostscript_imports); if (ghostscript_handle == NULL) - ui_msgbox_header(MBX_ERROR, (wchar_t *) IDS_2114, (wchar_t *) IDS_2132); + ui_msgbox_header(MBX_ERROR, (wchar_t *) IDS_2115, (wchar_t *) IDS_2133); else { if (gsapi_revision(&rev, sizeof(rev)) == 0) pclog("Loaded %s, rev %ld (%ld)\n", rev.product, rev.revision, rev.revisiondate); diff --git a/src/qt/qt_main.cpp b/src/qt/qt_main.cpp index 6f471dc53..5be64050a 100644 --- a/src/qt/qt_main.cpp +++ b/src/qt/qt_main.cpp @@ -183,7 +183,7 @@ int main(int argc, char* argv[]) { SetCurrentProcessExplicitAppUserModelID(L"86Box.86Box"); #endif if (! pc_init_modules()) { - ui_msgbox_header(MBX_FATAL, (void*)IDS_2120, (void*)IDS_2056); + ui_msgbox_header(MBX_FATAL, (void*)IDS_2121, (void*)IDS_2056); return 6; } diff --git a/src/qt/qt_platform.cpp b/src/qt/qt_platform.cpp index bfc8bdc29..df80b8912 100644 --- a/src/qt/qt_platform.cpp +++ b/src/qt/qt_platform.cpp @@ -559,20 +559,20 @@ void ProgSettings::reloadStrings() translatedstrings[IDS_2078] = QCoreApplication::translate("", "Press F8+F12 to release mouse").replace("F8+F12", MOUSE_CAPTURE_KEYSEQ).replace("CTRL-END", QLocale::system().name() == "de_DE" ? "Strg+Ende" : "CTRL-END").toStdWString(); translatedstrings[IDS_2079] = QCoreApplication::translate("", "Press F8+F12 or middle button to release mouse").replace("F8+F12", MOUSE_CAPTURE_KEYSEQ).replace("CTRL-END", QLocale::system().name() == "de_DE" ? "Strg+Ende" : "CTRL-END").toStdWString(); translatedstrings[IDS_2080] = QCoreApplication::translate("", "Failed to initialize FluidSynth").toStdWString(); - translatedstrings[IDS_2130] = QCoreApplication::translate("", "Invalid configuration").toStdWString(); + translatedstrings[IDS_2131] = QCoreApplication::translate("", "Invalid configuration").toStdWString(); translatedstrings[IDS_4099] = QCoreApplication::translate("", "MFM/RLL or ESDI CD-ROM drives never existed").toStdWString(); - translatedstrings[IDS_2093] = QCoreApplication::translate("", "Failed to set up PCap").toStdWString(); - translatedstrings[IDS_2094] = QCoreApplication::translate("", "No PCap devices found").toStdWString(); - translatedstrings[IDS_2095] = QCoreApplication::translate("", "Invalid PCap device").toStdWString(); - translatedstrings[IDS_2110] = QCoreApplication::translate("", "Unable to initialize FreeType").toStdWString(); - translatedstrings[IDS_2111] = QCoreApplication::translate("", "Unable to initialize SDL, libsdl2 is required").toStdWString(); - translatedstrings[IDS_2129] = QCoreApplication::translate("", "Make sure libpcap is installed and that you are on a libpcap-compatible network connection.").toStdWString(); - translatedstrings[IDS_2114] = QCoreApplication::translate("", "Unable to initialize Ghostscript").toStdWString(); + translatedstrings[IDS_2094] = QCoreApplication::translate("", "Failed to set up PCap").toStdWString(); + translatedstrings[IDS_2095] = QCoreApplication::translate("", "No PCap devices found").toStdWString(); + translatedstrings[IDS_2096] = QCoreApplication::translate("", "Invalid PCap device").toStdWString(); + translatedstrings[IDS_2111] = QCoreApplication::translate("", "Unable to initialize FreeType").toStdWString(); + translatedstrings[IDS_2112] = QCoreApplication::translate("", "Unable to initialize SDL, libsdl2 is required").toStdWString(); + translatedstrings[IDS_2130] = QCoreApplication::translate("", "Make sure libpcap is installed and that you are on a libpcap-compatible network connection.").toStdWString(); + translatedstrings[IDS_2115] = QCoreApplication::translate("", "Unable to initialize Ghostscript").toStdWString(); translatedstrings[IDS_2063] = QCoreApplication::translate("", "Machine \"%hs\" is not available due to missing ROMs in the roms/machines directory. Switching to an available machine.").toStdWString(); translatedstrings[IDS_2064] = QCoreApplication::translate("", "Video card \"%hs\" is not available due to missing ROMs in the roms/video directory. Switching to an available video card.").toStdWString(); - translatedstrings[IDS_2128] = QCoreApplication::translate("", "Hardware not available").toStdWString(); - translatedstrings[IDS_2142] = QCoreApplication::translate("", "Monitor in sleep mode").toStdWString(); - translatedstrings[IDS_2120] = QCoreApplication::translate("", "No ROMs found").toStdWString(); + translatedstrings[IDS_2129] = QCoreApplication::translate("", "Hardware not available").toStdWString(); + translatedstrings[IDS_2143] = QCoreApplication::translate("", "Monitor in sleep mode").toStdWString(); + translatedstrings[IDS_2121] = QCoreApplication::translate("", "No ROMs found").toStdWString(); translatedstrings[IDS_2056] = QCoreApplication::translate("", "86Box could not find any usable ROM images.\n\nPlease download a ROM set and extract it into the \"roms\" directory.").toStdWString(); auto flsynthstr = QCoreApplication::translate("", " is required for FluidSynth MIDI output."); @@ -581,21 +581,21 @@ void ProgSettings::reloadStrings() flsynthstr.replace("libfluidsynth", LIB_NAME_FLUIDSYNTH); } else flsynthstr.prepend(LIB_NAME_FLUIDSYNTH); - translatedstrings[IDS_2133] = flsynthstr.toStdWString(); + translatedstrings[IDS_2134] = flsynthstr.toStdWString(); auto gssynthstr = QCoreApplication::translate("", " is required for automatic conversion of PostScript files to PDF.\n\nAny documents sent to the generic PostScript printer will be saved as PostScript (.ps) files."); if (gssynthstr.contains("libgs")) { gssynthstr.replace("libgs", LIB_NAME_GS); } else gssynthstr.prepend(LIB_NAME_GS); - translatedstrings[IDS_2132] = gssynthstr.toStdWString(); + translatedstrings[IDS_2133] = gssynthstr.toStdWString(); auto ftsynthstr = QCoreApplication::translate("", " is required for ESC/P printer emulation."); if (ftsynthstr.contains("libfreetype")) { ftsynthstr.replace("libfreetype", LIB_NAME_FREETYPE); } else ftsynthstr.prepend(LIB_NAME_FREETYPE); - translatedstrings[IDS_2131] = ftsynthstr.toStdWString(); + translatedstrings[IDS_2132] = ftsynthstr.toStdWString(); } wchar_t* plat_get_string(int i) diff --git a/src/sound/midi_fluidsynth.c b/src/sound/midi_fluidsynth.c index ca0d3e866..1a66340e8 100644 --- a/src/sound/midi_fluidsynth.c +++ b/src/sound/midi_fluidsynth.c @@ -244,7 +244,7 @@ fluidsynth_init(const device_t *info) fluidsynth_handle = dynld_module("libfluidsynth.so.2", fluidsynth_imports); # endif if (fluidsynth_handle == NULL) { - ui_msgbox_header(MBX_ERROR, (wchar_t *) IDS_2080, (wchar_t *) IDS_2133); + ui_msgbox_header(MBX_ERROR, (wchar_t *) IDS_2080, (wchar_t *) IDS_2134); return NULL; } diff --git a/src/video/vid_svga.c b/src/video/vid_svga.c index 6d00125f5..905d4f83d 100644 --- a/src/video/vid_svga.c +++ b/src/video/vid_svga.c @@ -612,7 +612,7 @@ svga_recalctimings(svga_t *svga) if (svga->dpms) { if (!svga->dpms_ui) { svga->dpms_ui = 1; - ui_sb_set_text_w(plat_get_string(IDS_2142)); + ui_sb_set_text_w(plat_get_string(IDS_2143)); } } else if (svga->dpms_ui) { svga->dpms_ui = 0; diff --git a/src/win/win.c b/src/win/win.c index 5515d8e78..56d662a68 100644 --- a/src/win/win.c +++ b/src/win/win.c @@ -1097,7 +1097,7 @@ plat_setfullscreen(int on) if (on && video_fullscreen_first) { video_fullscreen |= 2; - if (ui_msgbox_header(MBX_INFO | MBX_DONTASK, (wchar_t *) IDS_2134, (wchar_t *) IDS_2052) == 10) { + if (ui_msgbox_header(MBX_INFO | MBX_DONTASK, (wchar_t *) IDS_2135, (wchar_t *) IDS_2052) == 10) { video_fullscreen_first = 0; config_save(); } diff --git a/src/win/win_about.c b/src/win/win_about.c index 46009e686..eae38dff6 100644 --- a/src/win/win_about.c +++ b/src/win/win_about.c @@ -39,7 +39,7 @@ AboutDialogCreate(HWND hwnd) TASKDIALOGCONFIG tdconfig = { 0 }; TASKDIALOG_BUTTON tdbuttons[] = { {IDOK, EMU_SITE_W }, - { IDCANCEL, MAKEINTRESOURCE(IDS_2127)} + { IDCANCEL, MAKEINTRESOURCE(IDS_2128)} }; wchar_t emu_version[256]; @@ -52,10 +52,10 @@ AboutDialogCreate(HWND hwnd) tdconfig.hwndParent = hwnd; tdconfig.hInstance = hinstance; tdconfig.dwCommonButtons = 0; - tdconfig.pszWindowTitle = MAKEINTRESOURCE(IDS_2124); + tdconfig.pszWindowTitle = MAKEINTRESOURCE(IDS_2125); tdconfig.pszMainIcon = (PCWSTR) 10; tdconfig.pszMainInstruction = emu_version; - tdconfig.pszContent = MAKEINTRESOURCE(IDS_2126); + tdconfig.pszContent = MAKEINTRESOURCE(IDS_2127); tdconfig.cButtons = ARRAYSIZE(tdbuttons); tdconfig.pButtons = tdbuttons; tdconfig.nDefaultButton = IDCANCEL; diff --git a/src/win/win_devconf.c b/src/win/win_devconf.c index 602aaa174..f2ec37cfa 100644 --- a/src/win/win_devconf.c +++ b/src/win/win_devconf.c @@ -515,7 +515,7 @@ deviceconfig_inst_open(HWND hwnd, const device_t *device, int inst) *data++ = 0; /*no menu*/ *data++ = 0; /*predefined dialog box class*/ - data += wsprintf(data, plat_get_string(IDS_2141), device->name) + 1; + data += wsprintf(data, plat_get_string(IDS_2142), device->name) + 1; *data++ = 9; /*Point*/ data += MultiByteToWideChar(CP_ACP, 0, "Segoe UI", -1, data, 120); diff --git a/src/win/win_dialog.c b/src/win/win_dialog.c index fa48e067a..41ae229e2 100644 --- a/src/win/win_dialog.c +++ b/src/win/win_dialog.c @@ -60,7 +60,7 @@ ui_msgbox_ex(int flags, void *header, void *message, void *btn1, void *btn2, voi tdb_yes = { IDYES, STRING_OR_RESOURCE(btn1) }, tdb_no = { IDNO, STRING_OR_RESOURCE(btn2) }, tdb_cancel = { IDCANCEL, STRING_OR_RESOURCE(btn3) }, - tdb_exit = { IDCLOSE, MAKEINTRESOURCE(IDS_2119) }; + tdb_exit = { IDCLOSE, MAKEINTRESOURCE(IDS_2120) }; int ret = 0, checked = 0; /* Configure the default OK button. */ @@ -133,7 +133,7 @@ ui_msgbox_ex(int flags, void *header, void *message, void *btn1, void *btn2, voi tdconfig.pszMainInstruction = STRING_OR_RESOURCE(header); tdconfig.pButtons = tdbuttons; if (flags & MBX_DONTASK) - tdconfig.pszVerificationText = MAKEINTRESOURCE(IDS_2135); + tdconfig.pszVerificationText = MAKEINTRESOURCE(IDS_2136); /* Run the TaskDialog. */ TaskDialogIndirect(&tdconfig, &ret, NULL, &checked); diff --git a/src/win/win_media_menu.c b/src/win/win_media_menu.c index 7695f28b2..2703b6d82 100644 --- a/src/win/win_media_menu.c +++ b/src/win/win_media_menu.c @@ -79,10 +79,10 @@ media_menu_set_name_cassette(void) MENUITEMINFO mii = { 0 }; if (strlen(cassette_fname) == 0) - _swprintf(name, plat_get_string(IDS_2148), plat_get_string(IDS_2057)); + _swprintf(name, plat_get_string(IDS_2149), plat_get_string(IDS_2057)); else { mbstoc16s(fn, cassette_fname, sizeof_w(fn)); - _swprintf(name, plat_get_string(IDS_2148), fn); + _swprintf(name, plat_get_string(IDS_2149), fn); } mii.cbSize = sizeof(mii); @@ -99,11 +99,11 @@ media_menu_set_name_cartridge(int drive) MENUITEMINFO mii = { 0 }; if (strlen(cart_fns[drive]) == 0) { - _swprintf(name, plat_get_string(IDS_2150), + _swprintf(name, plat_get_string(IDS_2151), drive + 1, plat_get_string(IDS_2057)); } else { mbstoc16s(fn, cart_fns[drive], sizeof_w(fn)); - _swprintf(name, plat_get_string(IDS_2150), + _swprintf(name, plat_get_string(IDS_2151), drive + 1, fn); } @@ -123,11 +123,11 @@ media_menu_set_name_floppy(int drive) mbstoc16s(temp, fdd_getname(fdd_get_type(drive)), strlen(fdd_getname(fdd_get_type(drive))) + 1); if (strlen(floppyfns[drive]) == 0) { - _swprintf(name, plat_get_string(IDS_2108), + _swprintf(name, plat_get_string(IDS_2109), drive + 1, temp, plat_get_string(IDS_2057)); } else { mbstoc16s(fn, floppyfns[drive], sizeof_w(fn)); - _swprintf(name, plat_get_string(IDS_2108), + _swprintf(name, plat_get_string(IDS_2109), drive + 1, temp, fn); } @@ -209,11 +209,11 @@ media_menu_set_name_mo(int drive) temp = plat_get_string(id); if (strlen(mo_drives[drive].image_path) == 0) { - _swprintf(name, plat_get_string(IDS_2115), + _swprintf(name, plat_get_string(IDS_2116), drive + 1, temp, plat_get_string(IDS_2057)); } else { mbstoc16s(fn, mo_drives[drive].image_path, sizeof_w(fn)); - _swprintf(name, plat_get_string(IDS_2115), + _swprintf(name, plat_get_string(IDS_2116), drive + 1, temp, fn); } @@ -535,7 +535,7 @@ media_menu_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) switch (LOWORD(wParam) & 0xff00) { case IDM_CASSETTE_IMAGE_NEW: - ret = file_dlg_st(hwnd, IDS_2149, "", NULL, 1); + ret = file_dlg_st(hwnd, IDS_2150, "", NULL, 1); if (!ret) { if (strlen(openfilestring) == 0) cassette_mount(NULL, wp); @@ -565,7 +565,7 @@ media_menu_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) wp = 1; /* FALLTHROUGH */ case IDM_CASSETTE_IMAGE_EXISTING: - ret = file_dlg_st(hwnd, IDS_2149, cassette_fname, NULL, 0); + ret = file_dlg_st(hwnd, IDS_2150, cassette_fname, NULL, 0); if (!ret) { if (strlen(openfilestring) == 0) cassette_mount(NULL, wp); @@ -579,7 +579,7 @@ media_menu_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) break; case IDM_CARTRIDGE_IMAGE: - ret = file_dlg_st(hwnd, IDS_2151, cart_fns[id], NULL, 0); + ret = file_dlg_st(hwnd, IDS_2152, cart_fns[id], NULL, 0); if (!ret) cartridge_mount(id, openfilestring, wp); break; @@ -596,7 +596,7 @@ media_menu_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) wp = 1; /* FALLTHROUGH */ case IDM_FLOPPY_IMAGE_EXISTING: - ret = file_dlg_st(hwnd, IDS_2109, floppyfns[id], NULL, 0); + ret = file_dlg_st(hwnd, IDS_2110, floppyfns[id], NULL, 0); if (!ret) floppy_mount(id, openfilestring, wp); break; @@ -632,7 +632,7 @@ media_menu_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) break; case IDM_CDROM_IMAGE: - if (!file_dlg_st(hwnd, IDS_2140, cdrom[id].is_dir ? NULL : cdrom[id].image_path, NULL, 0)) { + if (!file_dlg_st(hwnd, IDS_2141, cdrom[id].is_dir ? NULL : cdrom[id].image_path, NULL, 0)) { cdrom_mount(id, openfilestring); } break; @@ -687,7 +687,7 @@ media_menu_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) wp = 1; /* FALLTHROUGH */ case IDM_MO_IMAGE_EXISTING: - ret = file_dlg_st(hwnd, IDS_2116, mo_drives[id].image_path, NULL, 0); + ret = file_dlg_st(hwnd, IDS_2117, mo_drives[id].image_path, NULL, 0); if (!ret) mo_mount(id, openfilestring, wp); break; diff --git a/src/win/win_new_floppy.c b/src/win/win_new_floppy.c index 95cde3176..3092840cd 100644 --- a/src/win/win_new_floppy.c +++ b/src/win/win_new_floppy.c @@ -773,7 +773,7 @@ NewFloppyDialogProcedure(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam) return TRUE; case IDC_CFILE: - if (!file_dlg_w(hdlg, plat_get_string(is_mo ? IDS_2139 : (is_zip ? IDS_2055 : IDS_2062)), L"", NULL, 1)) { + if (!file_dlg_w(hdlg, plat_get_string(is_mo ? IDS_2140 : (is_zip ? IDS_2055 : IDS_2062)), L"", NULL, 1)) { if (!wcschr(wopenfilestring, L'.')) { if (wcslen(wopenfilestring) && (wcslen(wopenfilestring) <= 256)) { twcs = &wopenfilestring[wcslen(wopenfilestring)]; diff --git a/src/win/win_opengl.c b/src/win/win_opengl.c index b473ce18f..b2a27d7c7 100644 --- a/src/win/win_opengl.c +++ b/src/win/win_opengl.c @@ -445,8 +445,8 @@ opengl_fail() window = NULL; } - wchar_t *message = plat_get_string(IDS_2152); - wchar_t *header = plat_get_string(IDS_2153); + wchar_t *message = plat_get_string(IDS_2153); + wchar_t *header = plat_get_string(IDS_2154); MessageBox(parent, header, message, MB_OK); WaitForSingleObject(sync_objects.closing, INFINITE); diff --git a/src/win/win_settings.c b/src/win/win_settings.c index 46d567839..4ea3ff4f9 100644 --- a/src/win/win_settings.c +++ b/src/win/win_settings.c @@ -75,7 +75,12 @@ #include "../disk/minivhd/minivhd_util.h" /* Icon, Bus, File, C, H, S, Size, Speed */ -#define C_COLUMNS_HARD_DISKS 7 +#define C_COLUMNS_HARD_DISKS 7 + +#define C_COLUMNS_FLOPPY_DRIVES 3 +#define C_COLUMNS_CDROM_DRIVES 3 +#define C_COLUMNS_MO_DRIVES 2 +#define C_COLUMNS_ZIP_DRIVES 2 static int first_cat = 0; @@ -319,11 +324,11 @@ win_settings_init(void) temp_sync = time_sync; /* Video category */ - temp_gfxcard = gfxcard; + temp_gfxcard = gfxcard; temp_gfxcard_2 = gfxcard_2; - temp_voodoo = voodoo_enabled; - temp_ibm8514 = ibm8514_enabled; - temp_xga = xga_enabled; + temp_voodoo = voodoo_enabled; + temp_ibm8514 = ibm8514_enabled; + temp_xga = xga_enabled; /* Input devices category */ temp_mouse = mouse_type; @@ -598,7 +603,7 @@ win_settings_save(void) /* Removable devices category */ memcpy(cdrom, temp_cdrom, CDROM_NUM * sizeof(cdrom_t)); for (i = 0; i < CDROM_NUM; i++) { - cdrom[i].is_dir = 0; + cdrom[i].is_dir = 0; cdrom[i].priv = NULL; cdrom[i].ops = NULL; cdrom[i].image = NULL; @@ -806,7 +811,7 @@ win_settings_machine_recalc_machine(HWND hdlg) SendMessage(h, UDM_SETPOS, 0, temp_mem_size >> 10); h = GetDlgItem(hdlg, IDC_TEXT_MB); - SendMessage(h, WM_SETTEXT, 0, win_get_string(IDS_2086)); + SendMessage(h, WM_SETTEXT, 0, win_get_string(IDS_MB)); } settings_enable_window(hdlg, IDC_MEMSPIN, machine_get_min_ram(temp_machine) != machine_get_max_ram(temp_machine)); @@ -1113,8 +1118,7 @@ win_settings_video_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam) if (!device_name[0]) break; - if (video_card_available(c) && - device_is_valid(video_card_getdevice(c), temp_machine)) { + if (video_card_available(c) && device_is_valid(video_card_getdevice(c), temp_machine)) { if (c == 0) // "None" settings_add_string(hdlg, IDC_COMBO_VIDEO_2, win_get_string(IDS_2104)); else if (c == 1) // "Internal" @@ -1194,7 +1198,7 @@ win_settings_video_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam) case IDC_CONFIGURE_VID_2: temp_gfxcard_2 = settings_list_to_device[1][settings_get_cur_sel(hdlg, IDC_COMBO_VIDEO_2)]; - temp_deviceconfig |= deviceconfig_open(hdlg, (void *)video_card_getdevice(temp_gfxcard_2)); + temp_deviceconfig |= deviceconfig_open(hdlg, (void *) video_card_getdevice(temp_gfxcard_2)); break; } return FALSE; @@ -2402,7 +2406,7 @@ win_settings_hard_disks_resize_columns(HWND hdlg) C_COLUMNS_HARD_DISKS_SIZE, C_COLUMNS_HARD_DISKS_SPEED }; - int total = 0; + int total = 0; HWND hwndList = GetDlgItem(hdlg, IDC_LIST_HARD_DISKS); RECT r; @@ -2427,7 +2431,7 @@ win_settings_hard_disks_init_columns(HWND hdlg) for (iCol = 0; iCol < C_COLUMNS_HARD_DISKS; iCol++) { lvc.iSubItem = iCol; - lvc.pszText = plat_get_string(IDS_2081 + iCol); + lvc.pszText = plat_get_string(IDS_BUS + iCol); switch (iCol) { case 0: /* Bus */ @@ -3856,22 +3860,30 @@ win_settings_zip_drives_recalc_list(HWND hdlg) return TRUE; } +#define C_COLUMNS_FLOPPY_DRIVES_TYPE 292 +#define C_COLUMNS_FLOPPY_DRIVES_TURBO 58 +#define C_COLUMNS_FLOPPY_DRIVES_BPB 89 + static void win_settings_floppy_drives_resize_columns(HWND hdlg) { - int iCol, width[3] = { 292, 58, 89 }; + int iCol, width[C_COLUMNS_FLOPPY_DRIVES] = { + C_COLUMNS_FLOPPY_DRIVES_TYPE, + C_COLUMNS_FLOPPY_DRIVES_TURBO, + C_COLUMNS_FLOPPY_DRIVES_BPB + }; int total = 0; HWND hwndList = GetDlgItem(hdlg, IDC_LIST_FLOPPY_DRIVES); RECT r; GetWindowRect(hwndList, &r); - for (iCol = 0; iCol < 2; iCol++) { + for (iCol = 0; iCol < C_COLUMNS_FLOPPY_DRIVES; iCol++) { width[iCol] = MulDiv(width[iCol], dpi, 96); total += width[iCol]; ListView_SetColumnWidth(hwndList, iCol, MulDiv(width[iCol], dpi, 96)); } - width[2] = (r.right - r.left) - 4 - total; - ListView_SetColumnWidth(hwndList, 2, width[2]); + width[C_COLUMNS_FLOPPY_DRIVES - 1] = (r.right - r.left) - 4 - total; + ListView_SetColumnWidth(hwndList, 2, width[C_COLUMNS_FLOPPY_DRIVES - 1]); } static BOOL @@ -3882,28 +3894,31 @@ win_settings_floppy_drives_init_columns(HWND hdlg) lvc.mask = LVCF_FMT | LVCF_WIDTH | LVCF_TEXT | LVCF_SUBITEM; + /* Type */ lvc.iSubItem = 0; lvc.pszText = plat_get_string(IDS_TYPE); - lvc.cx = 292; + lvc.cx = C_COLUMNS_FLOPPY_DRIVES_TYPE; lvc.fmt = LVCFMT_LEFT; if (ListView_InsertColumn(hwndList, 0, &lvc) == -1) return FALSE; + /* Turbo */ lvc.iSubItem = 1; lvc.pszText = plat_get_string(IDS_2059); - lvc.cx = 58; + lvc.cx = C_COLUMNS_FLOPPY_DRIVES_TURBO; lvc.fmt = LVCFMT_LEFT; if (ListView_InsertColumn(hwndList, 1, &lvc) == -1) return FALSE; + /* Check BPB */ lvc.iSubItem = 2; lvc.pszText = plat_get_string(IDS_BPB); - lvc.cx = 89; + lvc.cx = C_COLUMNS_FLOPPY_DRIVES_BPB; lvc.fmt = LVCFMT_LEFT; if (ListView_InsertColumn(hwndList, 2, &lvc) == -1) @@ -3913,22 +3928,30 @@ win_settings_floppy_drives_init_columns(HWND hdlg) return TRUE; } +#define C_COLUMNS_CDROM_DRIVES_BUS 292 +#define C_COLUMNS_CDROM_DRIVES_SPEED 58 +#define C_COLUMNS_CDROM_DRIVES_EARLIER 89 + static void win_settings_cdrom_drives_resize_columns(HWND hdlg) { - int iCol, width[3] = { 292, 58, 89 }; + int iCol, width[C_COLUMNS_CDROM_DRIVES] = { + C_COLUMNS_CDROM_DRIVES_BUS, + C_COLUMNS_CDROM_DRIVES_SPEED, + C_COLUMNS_CDROM_DRIVES_EARLIER + }; int total = 0; HWND hwndList = GetDlgItem(hdlg, IDC_LIST_CDROM_DRIVES); RECT r; GetWindowRect(hwndList, &r); - for (iCol = 0; iCol < 2; iCol++) { + for (iCol = 0; iCol < C_COLUMNS_CDROM_DRIVES; iCol++) { width[iCol] = MulDiv(width[iCol], dpi, 96); total += width[iCol]; ListView_SetColumnWidth(hwndList, iCol, MulDiv(width[iCol], dpi, 96)); } - width[2] = (r.right - r.left) - 4 - total; - ListView_SetColumnWidth(hwndList, 2, width[2]); + width[C_COLUMNS_CDROM_DRIVES - 1] = (r.right - r.left) - 4 - total; + ListView_SetColumnWidth(hwndList, 2, width[C_COLUMNS_CDROM_DRIVES - 1]); } static BOOL @@ -3939,28 +3962,31 @@ win_settings_cdrom_drives_init_columns(HWND hdlg) lvc.mask = LVCF_FMT | LVCF_WIDTH | LVCF_TEXT | LVCF_SUBITEM; + /* Bus */ lvc.iSubItem = 0; - lvc.pszText = plat_get_string(IDS_2081); + lvc.pszText = plat_get_string(IDS_BUS); - lvc.cx = 292; + lvc.cx = C_COLUMNS_CDROM_DRIVES_BUS; lvc.fmt = LVCFMT_LEFT; if (ListView_InsertColumn(hwndList, 0, &lvc) == -1) return FALSE; + /* Speed */ lvc.iSubItem = 1; lvc.pszText = plat_get_string(IDS_2053); - lvc.cx = 58; + lvc.cx = C_COLUMNS_CDROM_DRIVES_SPEED; lvc.fmt = LVCFMT_LEFT; if (ListView_InsertColumn(hwndList, 1, &lvc) == -1) return FALSE; + /* Earlier drive */ lvc.iSubItem = 2; lvc.pszText = plat_get_string(IDS_2162); - lvc.cx = 89; + lvc.cx = C_COLUMNS_CDROM_DRIVES_EARLIER; lvc.fmt = LVCFMT_LEFT; if (ListView_InsertColumn(hwndList, 2, &lvc) == -1) @@ -3970,18 +3996,24 @@ win_settings_cdrom_drives_init_columns(HWND hdlg) return TRUE; } +#define C_COLUMNS_MO_DRIVES_BUS 292 +#define C_COLUMNS_MO_DRIVES_TYPE 147 + static void win_settings_mo_drives_resize_columns(HWND hdlg) { - int width[2] = { 292, 147 }; - HWND hwndList = GetDlgItem(hdlg, IDC_LIST_MO_DRIVES); + int width[C_COLUMNS_MO_DRIVES] = { + C_COLUMNS_MO_DRIVES_BUS, + C_COLUMNS_MO_DRIVES_TYPE + }; + HWND hwndList = GetDlgItem(hdlg, IDC_LIST_MO_DRIVES); RECT r; GetWindowRect(hwndList, &r); width[0] = MulDiv(width[0], dpi, 96); ListView_SetColumnWidth(hwndList, 0, MulDiv(width[0], dpi, 96)); - width[1] = (r.right - r.left) - 4 - width[0]; - ListView_SetColumnWidth(hwndList, 1, width[1]); + width[C_COLUMNS_MO_DRIVES - 1] = (r.right - r.left) - 4 - width[0]; + ListView_SetColumnWidth(hwndList, 1, width[C_COLUMNS_MO_DRIVES - 1]); } static BOOL @@ -3992,19 +4024,21 @@ win_settings_mo_drives_init_columns(HWND hdlg) lvc.mask = LVCF_FMT | LVCF_WIDTH | LVCF_TEXT | LVCF_SUBITEM; + /* Bus */ lvc.iSubItem = 0; - lvc.pszText = plat_get_string(IDS_2081); + lvc.pszText = plat_get_string(IDS_BUS); - lvc.cx = 292; + lvc.cx = C_COLUMNS_MO_DRIVES_BUS; lvc.fmt = LVCFMT_LEFT; if (ListView_InsertColumn(hwndList, 0, &lvc) == -1) return FALSE; + /* Type */ lvc.iSubItem = 1; lvc.pszText = plat_get_string(IDS_TYPE); - lvc.cx = 147; + lvc.cx = C_COLUMNS_MO_DRIVES_TYPE; lvc.fmt = LVCFMT_LEFT; if (ListView_InsertColumn(hwndList, 1, &lvc) == -1) @@ -4014,18 +4048,24 @@ win_settings_mo_drives_init_columns(HWND hdlg) return TRUE; } +#define C_COLUMNS_ZIP_DRIVES_BUS 292 +#define C_COLUMNS_ZIP_DRIVES_TYPE 147 + static void win_settings_zip_drives_resize_columns(HWND hdlg) { - int width[2] = { 292, 147 }; - HWND hwndList = GetDlgItem(hdlg, IDC_LIST_ZIP_DRIVES); + int width[C_COLUMNS_MO_DRIVES] = { + C_COLUMNS_ZIP_DRIVES_BUS, + C_COLUMNS_ZIP_DRIVES_TYPE + }; + HWND hwndList = GetDlgItem(hdlg, IDC_LIST_ZIP_DRIVES); RECT r; GetWindowRect(hwndList, &r); width[0] = MulDiv(width[0], dpi, 96); ListView_SetColumnWidth(hwndList, 0, MulDiv(width[0], dpi, 96)); - width[1] = (r.right - r.left) - 4 - width[0]; - ListView_SetColumnWidth(hwndList, 1, width[1]); + width[C_COLUMNS_ZIP_DRIVES - 1] = (r.right - r.left) - 4 - width[0]; + ListView_SetColumnWidth(hwndList, 1, width[C_COLUMNS_ZIP_DRIVES - 1]); } static BOOL @@ -4036,19 +4076,21 @@ win_settings_zip_drives_init_columns(HWND hdlg) lvc.mask = LVCF_FMT | LVCF_WIDTH | LVCF_TEXT | LVCF_SUBITEM; + /* Bus */ lvc.iSubItem = 0; - lvc.pszText = plat_get_string(IDS_2081); + lvc.pszText = plat_get_string(IDS_BUS); - lvc.cx = 292; + lvc.cx = C_COLUMNS_ZIP_DRIVES_BUS; lvc.fmt = LVCFMT_LEFT; if (ListView_InsertColumn(hwndList, 0, &lvc) == -1) return FALSE; + /* Type */ lvc.iSubItem = 1; lvc.pszText = plat_get_string(IDS_TYPE); - lvc.cx = 147; + lvc.cx = C_COLUMNS_ZIP_DRIVES_TYPE; lvc.fmt = LVCFMT_LEFT; if (ListView_InsertColumn(hwndList, 1, &lvc) == -1) @@ -4189,6 +4231,7 @@ win_settings_mo_drives_update_item(HWND hdlg, int i) lvI.mask = LVIF_TEXT | LVIF_IMAGE | LVIF_STATE; lvI.stateMask = lvI.iSubItem = lvI.state = 0; + /* Bus */ lvI.iSubItem = 0; lvI.iItem = i; @@ -4215,6 +4258,7 @@ win_settings_mo_drives_update_item(HWND hdlg, int i) if (ListView_SetItem(hwndList, &lvI) == -1) return; + /* Type */ lvI.iSubItem = 1; if (temp_mo_drives[i].bus_type == MO_BUS_DISABLED) lvI.pszText = plat_get_string(IDS_2104); @@ -4723,7 +4767,6 @@ win_settings_floppy_and_cdrom_drives_proc(HWND hdlg, UINT message, WPARAM wParam temp_cdrom[lv2_current_sel].early = settings_get_check(hdlg, IDC_CHECKEARLY); win_settings_cdrom_drives_update_item(hdlg, lv2_current_sel); break; - } ignore_change = 0; diff --git a/src/win/win_stbar.c b/src/win/win_stbar.c index 6178b73ce..ff3f4e251 100644 --- a/src/win/win_stbar.c +++ b/src/win/win_stbar.c @@ -188,10 +188,10 @@ StatusBarCreateCassetteTip(int part) WCHAR fn[512]; if (strlen(cassette_fname) == 0) - _swprintf(tempTip, plat_get_string(IDS_2148), plat_get_string(IDS_2057)); + _swprintf(tempTip, plat_get_string(IDS_2149), plat_get_string(IDS_2057)); else { mbstoc16s(fn, cassette_fname, sizeof_w(fn)); - _swprintf(tempTip, plat_get_string(IDS_2148), fn); + _swprintf(tempTip, plat_get_string(IDS_2149), fn); } if (sbTips[part] != NULL) { @@ -210,11 +210,11 @@ StatusBarCreateCartridgeTip(int part) int drive = sb_part_meanings[part] & 0xf; if (strlen(cart_fns[drive]) == 0) { - _swprintf(tempTip, plat_get_string(IDS_2150), + _swprintf(tempTip, plat_get_string(IDS_2151), drive + 1, plat_get_string(IDS_2057)); } else { mbstoc16s(fn, cart_fns[drive], sizeof_w(fn)); - _swprintf(tempTip, plat_get_string(IDS_2150), + _swprintf(tempTip, plat_get_string(IDS_2151), drive + 1, fn); } @@ -238,11 +238,11 @@ StatusBarCreateFloppyTip(int part) mbstoc16s(wtext, fdd_getname(fdd_get_type(drive)), strlen(fdd_getname(fdd_get_type(drive))) + 1); if (strlen(floppyfns[drive]) == 0) { - _swprintf(tempTip, plat_get_string(IDS_2108), + _swprintf(tempTip, plat_get_string(IDS_2109), drive + 1, wtext, plat_get_string(IDS_2057)); } else { mbstoc16s(fn, floppyfns[drive], sizeof_w(fn)); - _swprintf(tempTip, plat_get_string(IDS_2108), + _swprintf(tempTip, plat_get_string(IDS_2109), drive + 1, wtext, fn); } @@ -333,11 +333,11 @@ StatusBarCreateMOTip(int part) szText = plat_get_string(id); if (strlen(mo_drives[drive].image_path) == 0) { - _swprintf(tempTip, plat_get_string(IDS_2115), + _swprintf(tempTip, plat_get_string(IDS_2116), drive + 1, szText, plat_get_string(IDS_2057)); } else { mbstoc16s(fn, mo_drives[drive].image_path, sizeof_w(fn)); - _swprintf(tempTip, plat_get_string(IDS_2115), + _swprintf(tempTip, plat_get_string(IDS_2116), drive + 1, szText, fn); } @@ -989,7 +989,7 @@ StatusBarCreate(HWND hwndParent, uintptr_t idStatus, HINSTANCE hInst) sb_parts++; SendMessage(hwndSBAR, SB_SETPARTS, (WPARAM) sb_parts, (LPARAM) iStatusWidths); SendMessage(hwndSBAR, SB_SETTEXT, 0 | SBT_NOBORDERS, - (LPARAM) plat_get_string(IDS_2117)); + (LPARAM) plat_get_string(IDS_2118)); sb_ready = 1; } diff --git a/src/win/win_toolbar.c b/src/win/win_toolbar.c index 008be5c9e..59c471f8a 100644 --- a/src/win/win_toolbar.c +++ b/src/win/win_toolbar.c @@ -72,25 +72,25 @@ ToolBarProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) switch (idButton) { case IDM_ACTION_PAUSE: if (dopause) - lpttt->lpszText = MAKEINTRESOURCE(IDS_2154); - else lpttt->lpszText = MAKEINTRESOURCE(IDS_2155); + else + lpttt->lpszText = MAKEINTRESOURCE(IDS_2156); break; case IDM_ACTION_RESET_CAD: - lpttt->lpszText = MAKEINTRESOURCE(IDS_2156); - break; - - case IDM_ACTION_CTRL_ALT_ESC: lpttt->lpszText = MAKEINTRESOURCE(IDS_2157); break; - case IDM_ACTION_HRESET: + case IDM_ACTION_CTRL_ALT_ESC: lpttt->lpszText = MAKEINTRESOURCE(IDS_2158); break; + case IDM_ACTION_HRESET: + lpttt->lpszText = MAKEINTRESOURCE(IDS_2159); + break; + case IDM_CONFIG: - lpttt->lpszText = MAKEINTRESOURCE(IDS_2160); + lpttt->lpszText = MAKEINTRESOURCE(IDS_2161); break; } diff --git a/src/win/win_ui.c b/src/win/win_ui.c index b93ae0d57..54b4c2e21 100644 --- a/src/win/win_ui.c +++ b/src/win/win_ui.c @@ -214,7 +214,7 @@ show_render_options_menu() switch (IDM_VID_SDL_SW + vid_api) { case IDM_VID_OPENGL_CORE: cur_menu = LoadMenu(hinstance, VID_GL_SUBMENU); - InsertMenu(GetSubMenu(menuMain, 1), 6, MF_BYPOSITION | MF_STRING | MF_POPUP, (UINT_PTR) cur_menu, plat_get_string(IDS_2144)); + InsertMenu(GetSubMenu(menuMain, 1), 6, MF_BYPOSITION | MF_STRING | MF_POPUP, (UINT_PTR) cur_menu, plat_get_string(IDS_2145)); CheckMenuItem(menuMain, IDM_VID_GL_FPS_BLITTER, video_framerate == -1 ? MF_CHECKED : MF_UNCHECKED); CheckMenuItem(menuMain, IDM_VID_GL_FPS_25, video_framerate == 25 ? MF_CHECKED : MF_UNCHECKED); CheckMenuItem(menuMain, IDM_VID_GL_FPS_30, video_framerate == 30 ? MF_CHECKED : MF_UNCHECKED); @@ -499,7 +499,7 @@ MainWindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) case IDM_ACTION_HRESET: win_notify_dlg_open(); if (confirm_reset) - i = ui_msgbox_ex(MBX_QUESTION_YN | MBX_DONTASK, (wchar_t *) IDS_2112, NULL, (wchar_t *) IDS_2137, (wchar_t *) IDS_2138, NULL); + i = ui_msgbox_ex(MBX_QUESTION_YN | MBX_DONTASK, (wchar_t *) IDS_2113, NULL, (wchar_t *) IDS_2138, (wchar_t *) IDS_2139, NULL); else i = 0; if ((i % 10) == 0) { @@ -520,7 +520,7 @@ MainWindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) case IDM_ACTION_EXIT: win_notify_dlg_open(); if (confirm_exit && confirm_exit_cmdl) - i = ui_msgbox_ex(MBX_QUESTION_YN | MBX_DONTASK, (wchar_t *) IDS_2113, NULL, (wchar_t *) IDS_2119, (wchar_t *) IDS_2136, NULL); + i = ui_msgbox_ex(MBX_QUESTION_YN | MBX_DONTASK, (wchar_t *) IDS_2114, NULL, (wchar_t *) IDS_2120, (wchar_t *) IDS_2137, NULL); else i = 0; if ((i % 10) == 0) { @@ -706,7 +706,7 @@ MainWindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) break; case IDM_VID_GL_SHADER: win_notify_dlg_open(); - if (file_dlg_st(hwnd, IDS_2143, video_shader, NULL, 0) == 0) { + if (file_dlg_st(hwnd, IDS_2144, video_shader, NULL, 0) == 0) { strcpy_s(video_shader, sizeof(video_shader), openfilestring); EnableMenuItem(menuMain, IDM_VID_GL_NOSHADER, strlen(video_shader) > 0 ? MF_ENABLED : MF_DISABLED); } @@ -953,7 +953,7 @@ MainWindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) case WM_CLOSE: win_notify_dlg_open(); if (confirm_exit && confirm_exit_cmdl) - i = ui_msgbox_ex(MBX_QUESTION_YN | MBX_DONTASK, (wchar_t *) IDS_2113, NULL, (wchar_t *) IDS_2119, (wchar_t *) IDS_2136, NULL); + i = ui_msgbox_ex(MBX_QUESTION_YN | MBX_DONTASK, (wchar_t *) IDS_2114, NULL, (wchar_t *) IDS_2120, (wchar_t *) IDS_2137, NULL); else i = 0; if ((i % 10) == 0) { @@ -996,7 +996,7 @@ MainWindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) break; win_notify_dlg_open(); if (confirm_reset) - i = ui_msgbox_ex(MBX_QUESTION_YN | MBX_DONTASK, (wchar_t *) IDS_2112, NULL, (wchar_t *) IDS_2137, (wchar_t *) IDS_2138, NULL); + i = ui_msgbox_ex(MBX_QUESTION_YN | MBX_DONTASK, (wchar_t *) IDS_2113, NULL, (wchar_t *) IDS_2138, (wchar_t *) IDS_2139, NULL); else i = 0; if ((i % 10) == 0) { @@ -1022,7 +1022,7 @@ MainWindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) } else { win_notify_dlg_open(); if (confirm_exit && confirm_exit_cmdl) - i = ui_msgbox_ex(MBX_QUESTION_YN | MBX_DONTASK, (wchar_t *) IDS_2113, NULL, (wchar_t *) IDS_2119, (wchar_t *) IDS_2136, NULL); + i = ui_msgbox_ex(MBX_QUESTION_YN | MBX_DONTASK, (wchar_t *) IDS_2114, NULL, (wchar_t *) IDS_2120, (wchar_t *) IDS_2137, NULL); else i = 0; if ((i % 10) == 0) { @@ -1167,7 +1167,7 @@ ui_init(int nCmdShow) int bRet; TASKDIALOGCONFIG tdconfig = { 0 }; TASKDIALOG_BUTTON tdbuttons[] = { - {IDCANCEL, MAKEINTRESOURCE(IDS_2119)} + {IDCANCEL, MAKEINTRESOURCE(IDS_2120)} }; uint32_t helper_lang; @@ -1197,7 +1197,7 @@ ui_init(int nCmdShow) if (settings_only) { if (!pc_init_modules()) { /* Dang, no ROMs found at all! */ - tdconfig.pszMainInstruction = MAKEINTRESOURCE(IDS_2120); + tdconfig.pszMainInstruction = MAKEINTRESOURCE(IDS_2121); tdconfig.pszContent = MAKEINTRESOURCE(IDS_2056); TaskDialogIndirect(&tdconfig, NULL, NULL, NULL); return (6); @@ -1332,7 +1332,7 @@ ui_init(int nCmdShow) ShowWindow(hwnd, nCmdShow); /* Warn the user about unsupported configs. */ - if (cpu_override && ui_msgbox_ex(MBX_WARNING | MBX_QUESTION_OK, (void *) IDS_2145, (void *) IDS_2146, (void *) IDS_2147, (void *) IDS_2119, NULL)) { + if (cpu_override && ui_msgbox_ex(MBX_WARNING | MBX_QUESTION_OK, (void *) IDS_2146, (void *) IDS_2147, (void *) IDS_2148, (void *) IDS_2120, NULL)) { DestroyWindow(hwnd); return (0); } @@ -1346,7 +1346,7 @@ ui_init(int nCmdShow) ridev.dwFlags = RIDEV_NOHOTKEYS; ridev.hwndTarget = NULL; /* current focus window */ if (!RegisterRawInputDevices(&ridev, 1, sizeof(ridev))) { - tdconfig.pszContent = MAKEINTRESOURCE(IDS_2105); + tdconfig.pszContent = MAKEINTRESOURCE(IDS_2106); TaskDialogIndirect(&tdconfig, NULL, NULL, NULL); return (4); } @@ -1355,7 +1355,7 @@ ui_init(int nCmdShow) /* Load the accelerator table */ haccel = LoadAccelerators(hinstance, ACCEL_NAME); if (haccel == NULL) { - tdconfig.pszContent = MAKEINTRESOURCE(IDS_2104); + tdconfig.pszContent = MAKEINTRESOURCE(IDS_2105); TaskDialogIndirect(&tdconfig, NULL, NULL, NULL); return (3); } @@ -1373,7 +1373,7 @@ ui_init(int nCmdShow) /* All done, fire up the actual emulated machine. */ if (!pc_init_modules()) { /* Dang, no ROMs found at all! */ - tdconfig.pszMainInstruction = MAKEINTRESOURCE(IDS_2120); + tdconfig.pszMainInstruction = MAKEINTRESOURCE(IDS_2121); tdconfig.pszContent = MAKEINTRESOURCE(IDS_2056); TaskDialogIndirect(&tdconfig, NULL, NULL, NULL); return (6);