From c9ddadf715defaa691e85384f8ed15db8c70a068 Mon Sep 17 00:00:00 2001 From: darkstar Date: Wed, 21 Feb 2018 19:14:03 +0100 Subject: [PATCH] WINDOWS: Fix resource file One string resource was longer than 256 characters, one duplicate string ID was fixed, and one key definition was spitting out errors. The about text will at some point have to be replaced with two separate string labels, for now I fixed just enough to get it to open in MSVC --- src/win/VARCem.rc | 6 +++--- src/win/resource.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/win/VARCem.rc b/src/win/VARCem.rc index 37879e5..8218570 100644 --- a/src/win/VARCem.rc +++ b/src/win/VARCem.rc @@ -228,7 +228,7 @@ BEGIN VK_PRIOR,IDM_VID_FULLSCREEN, VIRTKEY, CONTROL , ALT VK_F11, IDM_ACTION_SCREENSHOT, VIRTKEY, CONTROL VK_F12, IDM_ACTION_RESET_CAD, VIRTKEY, CONTROL - VK_PAUSE,IDM_ACTION_PAUSE + VK_PAUSE,IDM_ACTION_PAUSE, VIRTKEY, CONTROL END @@ -243,7 +243,7 @@ FONT 9, "Segoe UI" BEGIN DEFPUSHBUTTON "OK",IDOK,129,94,71,12 ICON 100,IDC_ABOUT_ICON,7,7,20,20 - LTEXT "Virtual Archaelogical Computer EMulator\n\nBased on earlier works like PCem and 86Box.\n\nAuthors: Sarah Walker, Miran Grca, Fred N. van Kempen, TheCollector1995, reenigne, JohnElliott, greatpsycho, and others.\n\nReleased under the BSD 3-Clause License, and the GNU General Public License (version 2 or up) for existing, imported code from other projects. See LICENSE.txt for more information.", + LTEXT "Virtual Archaelogical Computer EMulator\n\nBased on earlier works like PCem and 86Box.\n\nAuthors: Sarah Walker, Miran Grca, Fred N. van Kempen, TheCollector1995, reenigne, JohnElliott, greatpsycho, and others.\n\nSee LICENSE.txt for more information.", IDC_ABOUT_ICON,54,7,146,73 CONTROL "",IDC_ABOUT_ICON,"Static",SS_BLACKFRAME | SS_SUNKEN,0, 86,208,1 @@ -586,7 +586,7 @@ BEGIN CONTROL "List1",IDC_LIST_ZIP_DRIVES,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP,7,117,253,60 - LTEXT "ZIP drives:",IDT_1739,7,107,50,8 + LTEXT "ZIP drives:",IDT_1758,7,107,50,8 COMBOBOX IDC_COMBO_ZIP_BUS,33,184,90,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "Bus:",IDT_1753,7,185,24,8 diff --git a/src/win/resource.h b/src/win/resource.h index f2a5f6a..0dc04d1 100644 --- a/src/win/resource.h +++ b/src/win/resource.h @@ -109,7 +109,7 @@ #define IDT_1755 1755 /* LUN: */ #define IDT_1756 1756 /* Channel: */ #define IDT_1757 1757 /* Progress: */ - +#define IDT_1758 1758 /* ZIP drives: */ /* * To try to keep these organized, we now group the