From f8e4696f4acbda75e76c3b4383410dc2b245fd55 Mon Sep 17 00:00:00 2001 From: owomomo Date: Mon, 31 Aug 2020 21:57:50 +0800 Subject: [PATCH] Sync code to the newest. --- src/drivers/win/res.rc | 29 +++++++++++++++-------------- src/drivers/win/resource.h | 5 +++-- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/src/drivers/win/res.rc b/src/drivers/win/res.rc index 3daca457..6289ce4e 100644 --- a/src/drivers/win/res.rc +++ b/src/drivers/win/res.rc @@ -133,6 +133,7 @@ BEGIN MENUITEM "&Eject/Insert Disk", MENU_EJECT_DISK MENUITEM "&Switch Disk Side", MENU_SWITCH_DISK MENUITEM "&Insert Coin", MENU_INSERT_COIN + MENUITEM "Input &Barcode", MENU_INPUT_BARCODE MENUITEM SEPARATOR POPUP "E&mulation Speed" BEGIN @@ -1086,20 +1087,20 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN DEFPUSHBUTTON "Close",BTN_CLOSE,177,97,56,14 GROUPBOX "",GRP_GAMEPAD1,4,8,232,82,WS_GROUP - PUSHBUTTON "Up", 304, 40,36,30,12 - PUSHBUTTON "Left", 306, 10,50,30,12 - PUSHBUTTON "Right", 307, 70,50,30,12 - PUSHBUTTON "Down", 305, 40,64,30,12 - PUSHBUTTON "Select",302, 46,19,32,12 - PUSHBUTTON "Start", 303, 82,19,32,12 - PUSHBUTTON "Left", 301,140,50,30,12 - PUSHBUTTON "Down", 300,170,64,30,12 - PUSHBUTTON "Right", 308,200,50,30,12 - PUSHBUTTON "Up", 309,170,36,30,12 - PUSHBUTTON "L", 310, 10,19,32,12 - PUSHBUTTON "R", 311,198,19,32,12 - PUSHBUTTON "B", 312,126,19,32,12 - PUSHBUTTON "A", 313,162,19,32,12 + PUSHBUTTON "Up",304,40,36,30,12 + PUSHBUTTON "Left",306,10,50,30,12 + PUSHBUTTON "Right",307,70,50,30,12 + PUSHBUTTON "Down",305,40,64,30,12 + PUSHBUTTON "Select",302,46,19,32,12 + PUSHBUTTON "Start",303,82,19,32,12 + PUSHBUTTON "Left",301,140,50,30,12 + PUSHBUTTON "Down",300,170,64,30,12 + PUSHBUTTON "Right",308,200,50,30,12 + PUSHBUTTON "Up",309,170,36,30,12 + PUSHBUTTON "L",310,10,19,32,12 + PUSHBUTTON "R",311,198,19,32,12 + PUSHBUTTON "B",312,126,19,32,12 + PUSHBUTTON "A",313,162,19,32,12 END QUIZKINGDIALOG DIALOG 30, 123, 160, 74 diff --git a/src/drivers/win/resource.h b/src/drivers/win/resource.h index a6696e94..57fbea09 100644 --- a/src/drivers/win/resource.h +++ b/src/drivers/win/resource.h @@ -1,6 +1,6 @@ //{{NO_DEPENDENCIES}} // Microsoft Visual C++ generated include file. -// Used for res.rc +// Used by res.rc // #define CLOSE_BUTTON 1 #define BUTTON_CLOSE 1 @@ -867,6 +867,7 @@ #define IDC_BINARY 1317 #define IDC_GAME_GENIE_ADDR 1501 #define MENU_INESHEADEREDITOR 40001 +#define MENU_INPUT_BARCODE 40004 #define MENU_NETWORK 40040 #define MENU_PALETTE 40041 #define MENU_SOUND 40042 @@ -1163,7 +1164,7 @@ #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 306 -#define _APS_NEXT_COMMAND_VALUE 40002 +#define _APS_NEXT_COMMAND_VALUE 40005 #define _APS_NEXT_CONTROL_VALUE 1101 #define _APS_NEXT_SYMED_VALUE 101 #endif