diff --git a/resource/Cxbx.rc b/resource/Cxbx.rc index 614d33f54..8cc6d1518 100644 --- a/resource/Cxbx.rc +++ b/resource/Cxbx.rc @@ -13,11 +13,11 @@ #undef APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// -// Language neutral resources +// Neutral resources -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU) LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL -#pragma code_page(65001) +#pragma code_page(1252) ///////////////////////////////////////////////////////////////////////////// // @@ -88,90 +88,90 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMEN CAPTION "Cxbx-Reloaded : Input Configuration" FONT 8, "Verdana", 0, 0, 0x1 BEGIN - GROUPBOX "Xbox device configuration", IDC_XID_CONFIG, 13, 10, 217, 103, WS_GROUP, WS_EX_CLIENTEDGE - COMBOBOX IDC_DEVICE_PORT1, 50, 25, 110, 14, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_DEVICE_PORT2, 50, 46, 110, 14, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_DEVICE_PORT3, 50, 67, 110, 14, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_DEVICE_PORT4, 50, 88, 110, 14, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Configure", IDC_CONFIGURE_PORT1, 166, 25, 50, 14, BS_FLAT - PUSHBUTTON "Configure", IDC_CONFIGURE_PORT2, 166, 46, 50, 14, BS_FLAT - PUSHBUTTON "Configure", IDC_CONFIGURE_PORT3, 166, 67, 50, 14, BS_FLAT - PUSHBUTTON "Configure", IDC_CONFIGURE_PORT4, 166, 88, 50, 14, BS_FLAT - LTEXT "Port 1", IDC_STATIC, 23, 27, 20, 10 - LTEXT "Port 2", IDC_STATIC, 23, 48, 20, 10 - LTEXT "Port 3", IDC_STATIC, 23, 69, 20, 10 - LTEXT "Port 4", IDC_STATIC, 23, 90, 20, 10 + GROUPBOX "Xbox device configuration",IDC_XID_CONFIG,13,10,217,103,WS_GROUP,WS_EX_CLIENTEDGE + COMBOBOX IDC_DEVICE_PORT1,50,25,110,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_DEVICE_PORT2,50,46,110,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_DEVICE_PORT3,50,67,110,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_DEVICE_PORT4,50,88,110,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Configure",IDC_CONFIGURE_PORT1,166,25,50,14,BS_FLAT + PUSHBUTTON "Configure",IDC_CONFIGURE_PORT2,166,46,50,14,BS_FLAT + PUSHBUTTON "Configure",IDC_CONFIGURE_PORT3,166,67,50,14,BS_FLAT + PUSHBUTTON "Configure",IDC_CONFIGURE_PORT4,166,88,50,14,BS_FLAT + LTEXT "Port 1",IDC_STATIC,23,27,20,10 + LTEXT "Port 2",IDC_STATIC,23,48,20,10 + LTEXT "Port 3",IDC_STATIC,23,69,20,10 + LTEXT "Port 4",IDC_STATIC,23,90,20,10 END IDD_XID_DUKE_CFG DIALOGEX 0, 0, 528, 280 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU FONT 8, "Verdana", 0, 0, 0x1 BEGIN - GROUPBOX "Device", IDC_XID_CONFIG, 12, 10, 175, 35, WS_GROUP - COMBOBOX IDC_DEVICE_LIST, 21, 23, 101, 15, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Refresh", IDC_REFRESH_DEVICES, 128, 23, 50, 14, BS_FLAT - GROUPBOX "Profile", IDC_XID_PROFILE, 197, 10, 320, 35, WS_GROUP - COMBOBOX IDC_XID_PROFILE_NAME, 207, 24, 194, 10, CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Save", IDC_XID_PROFILE_SAVE, 405, 23, 50, 14, BS_FLAT - PUSHBUTTON "Delete", IDC_XID_PROFILE_DELETE, 459, 23, 50, 14, BS_FLAT - GROUPBOX "Buttons", IDC_XID_BUTTONS, 12, 65, 121, 181, WS_GROUP - PUSHBUTTON "", IDC_SET_A, 59, 75, 57, 14, BS_FLAT - PUSHBUTTON "", IDC_SET_B, 59, 93, 57, 14, BS_FLAT - PUSHBUTTON "", IDC_SET_X, 59, 111, 57, 14, BS_FLAT - PUSHBUTTON "", IDC_SET_Y, 59, 129, 57, 14, BS_FLAT - PUSHBUTTON "", IDC_SET_BLACK, 59, 147, 57, 14, BS_FLAT - PUSHBUTTON "", IDC_SET_WHITE, 59, 165, 57, 14, BS_FLAT - PUSHBUTTON "", IDC_SET_BACK, 59, 183, 57, 14, BS_FLAT - PUSHBUTTON "", IDC_SET_START, 59, 201, 57, 14, BS_FLAT - LTEXT "A", IDC_STATIC, 28, 75, 20, 14, SS_CENTERIMAGE - LTEXT "B", IDC_STATIC, 28, 93, 20, 14, SS_CENTERIMAGE - LTEXT "X", IDC_STATIC, 28, 111, 20, 14, SS_CENTERIMAGE - LTEXT "Y", IDC_STATIC, 28, 129, 20, 14, SS_CENTERIMAGE - LTEXT "Black", IDC_STATIC, 28, 147, 20, 14, SS_CENTERIMAGE - LTEXT "White", IDC_STATIC, 28, 165, 20, 14, SS_CENTERIMAGE - LTEXT "Back", IDC_STATIC, 28, 183, 20, 14, SS_CENTERIMAGE - LTEXT "Start", IDC_STATIC, 28, 201, 20, 14, SS_CENTERIMAGE - GROUPBOX "L Stick", IDC_XID_LSTICK, 140, 65, 121, 181, WS_GROUP - PUSHBUTTON "", IDC_SET_LEFT_POSY, 187, 75, 57, 14, BS_FLAT - PUSHBUTTON "", IDC_SET_LEFT_NEGY, 187, 93, 57, 14, BS_FLAT - PUSHBUTTON "", IDC_SET_LEFT_NEGX, 187, 111, 57, 14, BS_FLAT - PUSHBUTTON "", IDC_SET_LEFT_POSX, 187, 129, 57, 14, BS_FLAT - PUSHBUTTON "", IDC_SET_LTHUMB, 187, 147, 57, 14, BS_FLAT - LTEXT "Up", IDC_STATIC, 156, 75, 20, 14, SS_CENTERIMAGE - LTEXT "Down", IDC_STATIC, 156, 93, 20, 14, SS_CENTERIMAGE - LTEXT "Left", IDC_STATIC, 156, 111, 20, 14, SS_CENTERIMAGE - LTEXT "Right", IDC_STATIC, 156, 129, 20, 14, SS_CENTERIMAGE - LTEXT "L Click", IDC_STATIC, 156, 147, 27, 14, SS_CENTERIMAGE - GROUPBOX "R Stick", IDC_XID_RSTICK, 268, 65, 121, 181, WS_GROUP - PUSHBUTTON "", IDC_SET_RIGHT_POSY, 315, 75, 57, 14, BS_FLAT - PUSHBUTTON "", IDC_SET_RIGHT_NEGY, 315, 93, 57, 14, BS_FLAT - PUSHBUTTON "", IDC_SET_RIGHT_NEGX, 315, 111, 57, 14, BS_FLAT - PUSHBUTTON "", IDC_SET_RIGHT_POSX, 315, 129, 57, 14, BS_FLAT - PUSHBUTTON "", IDC_SET_RTHUMB, 315, 147, 57, 14, BS_FLAT - LTEXT "Up", IDC_STATIC, 284, 75, 20, 14, SS_CENTERIMAGE - LTEXT "Down", IDC_STATIC, 284, 93, 20, 14, SS_CENTERIMAGE - LTEXT "Left", IDC_STATIC, 284, 111, 20, 14, SS_CENTERIMAGE - LTEXT "Right", IDC_STATIC, 284, 129, 20, 14, SS_CENTERIMAGE - LTEXT "R Click", IDC_STATIC, 284, 147, 27, 14, SS_CENTERIMAGE - GROUPBOX "D Pad", IDC_XID_DPAD, 396, 65, 121, 88, WS_GROUP - PUSHBUTTON "", IDC_SET_DPAD_UP, 443, 75, 57, 14, BS_FLAT - PUSHBUTTON "", IDC_SET_DPAD_DOWN, 443, 93, 57, 14, BS_FLAT - PUSHBUTTON "", IDC_SET_DPAD_LEFT, 443, 111, 57, 14, BS_FLAT - PUSHBUTTON "", IDC_SET_DPAD_RIGHT, 443, 129, 57, 14, BS_FLAT - LTEXT "Up", IDC_STATIC, 412, 75, 20, 14, SS_CENTERIMAGE - LTEXT "Down", IDC_STATIC, 412, 93, 20, 14, SS_CENTERIMAGE - LTEXT "Left", IDC_STATIC, 412, 111, 20, 14, SS_CENTERIMAGE - LTEXT "Right", IDC_STATIC, 412, 129, 20, 14, SS_CENTERIMAGE - GROUPBOX "Triggers", IDC_XID_TRIGGERS, 396, 157, 121, 52, WS_GROUP - PUSHBUTTON "", IDC_SET_LTRIGGER, 443, 168, 57, 14, BS_FLAT - PUSHBUTTON "", IDC_SET_RTRIGGER, 443, 187, 57, 14, BS_FLAT - LTEXT "Left", IDC_STATIC, 412, 168, 20, 14, SS_CENTERIMAGE - LTEXT "Right", IDC_STATIC, 412, 187, 20, 14, SS_CENTERIMAGE - GROUPBOX "Rumble", IDC_XID_RUMBLE, 396, 212, 121, 34, WS_GROUP - PUSHBUTTON "", IDC_SET_MOTOR, 443, 224, 57, 14, BS_FLAT - LTEXT "Motor", IDC_STATIC, 412, 224, 26, 14, SS_CENTERIMAGE - PUSHBUTTON "Default Bindings", IDC_XID_DEFAULT, 362, 256, 69, 14, BS_FLAT - PUSHBUTTON "Clear", IDC_XID_CLEAR, 443, 256, 50, 14, BS_FLAT + GROUPBOX "Device",IDC_XID_CONFIG,12,10,175,35,WS_GROUP + COMBOBOX IDC_DEVICE_LIST,21,23,101,15,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Refresh",IDC_REFRESH_DEVICES,128,23,50,14,BS_FLAT + GROUPBOX "Profile",IDC_XID_PROFILE,197,10,320,35,WS_GROUP + COMBOBOX IDC_XID_PROFILE_NAME,207,24,194,10,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Save",IDC_XID_PROFILE_SAVE,405,23,50,14,BS_FLAT + PUSHBUTTON "Delete",IDC_XID_PROFILE_DELETE,459,23,50,14,BS_FLAT + GROUPBOX "Buttons",IDC_XID_BUTTONS,12,65,121,181,WS_GROUP + PUSHBUTTON "",IDC_SET_A,59,75,57,14,BS_FLAT + PUSHBUTTON "",IDC_SET_B,59,93,57,14,BS_FLAT + PUSHBUTTON "",IDC_SET_X,59,111,57,14,BS_FLAT + PUSHBUTTON "",IDC_SET_Y,59,129,57,14,BS_FLAT + PUSHBUTTON "",IDC_SET_BLACK,59,147,57,14,BS_FLAT + PUSHBUTTON "",IDC_SET_WHITE,59,165,57,14,BS_FLAT + PUSHBUTTON "",IDC_SET_BACK,59,183,57,14,BS_FLAT + PUSHBUTTON "",IDC_SET_START,59,201,57,14,BS_FLAT + LTEXT "A",IDC_STATIC,28,75,20,14,SS_CENTERIMAGE + LTEXT "B",IDC_STATIC,28,93,20,14,SS_CENTERIMAGE + LTEXT "X",IDC_STATIC,28,111,20,14,SS_CENTERIMAGE + LTEXT "Y",IDC_STATIC,28,129,20,14,SS_CENTERIMAGE + LTEXT "Black",IDC_STATIC,28,147,20,14,SS_CENTERIMAGE + LTEXT "White",IDC_STATIC,28,165,20,14,SS_CENTERIMAGE + LTEXT "Back",IDC_STATIC,28,183,20,14,SS_CENTERIMAGE + LTEXT "Start",IDC_STATIC,28,201,20,14,SS_CENTERIMAGE + GROUPBOX "L Stick",IDC_XID_LSTICK,140,65,121,181,WS_GROUP + PUSHBUTTON "",IDC_SET_LEFT_POSY,187,75,57,14,BS_FLAT + PUSHBUTTON "",IDC_SET_LEFT_NEGY,187,93,57,14,BS_FLAT + PUSHBUTTON "",IDC_SET_LEFT_NEGX,187,111,57,14,BS_FLAT + PUSHBUTTON "",IDC_SET_LEFT_POSX,187,129,57,14,BS_FLAT + PUSHBUTTON "",IDC_SET_LTHUMB,187,147,57,14,BS_FLAT + LTEXT "Up",IDC_STATIC,156,75,20,14,SS_CENTERIMAGE + LTEXT "Down",IDC_STATIC,156,93,20,14,SS_CENTERIMAGE + LTEXT "Left",IDC_STATIC,156,111,20,14,SS_CENTERIMAGE + LTEXT "Right",IDC_STATIC,156,129,20,14,SS_CENTERIMAGE + LTEXT "L Click",IDC_STATIC,156,147,27,14,SS_CENTERIMAGE + GROUPBOX "R Stick",IDC_XID_RSTICK,268,65,121,181,WS_GROUP + PUSHBUTTON "",IDC_SET_RIGHT_POSY,315,75,57,14,BS_FLAT + PUSHBUTTON "",IDC_SET_RIGHT_NEGY,315,93,57,14,BS_FLAT + PUSHBUTTON "",IDC_SET_RIGHT_NEGX,315,111,57,14,BS_FLAT + PUSHBUTTON "",IDC_SET_RIGHT_POSX,315,129,57,14,BS_FLAT + PUSHBUTTON "",IDC_SET_RTHUMB,315,147,57,14,BS_FLAT + LTEXT "Up",IDC_STATIC,284,75,20,14,SS_CENTERIMAGE + LTEXT "Down",IDC_STATIC,284,93,20,14,SS_CENTERIMAGE + LTEXT "Left",IDC_STATIC,284,111,20,14,SS_CENTERIMAGE + LTEXT "Right",IDC_STATIC,284,129,20,14,SS_CENTERIMAGE + LTEXT "R Click",IDC_STATIC,284,147,27,14,SS_CENTERIMAGE + GROUPBOX "D Pad",IDC_XID_DPAD,396,65,121,88,WS_GROUP + PUSHBUTTON "",IDC_SET_DPAD_UP,443,75,57,14,BS_FLAT + PUSHBUTTON "",IDC_SET_DPAD_DOWN,443,93,57,14,BS_FLAT + PUSHBUTTON "",IDC_SET_DPAD_LEFT,443,111,57,14,BS_FLAT + PUSHBUTTON "",IDC_SET_DPAD_RIGHT,443,129,57,14,BS_FLAT + LTEXT "Up",IDC_STATIC,412,75,20,14,SS_CENTERIMAGE + LTEXT "Down",IDC_STATIC,412,93,20,14,SS_CENTERIMAGE + LTEXT "Left",IDC_STATIC,412,111,20,14,SS_CENTERIMAGE + LTEXT "Right",IDC_STATIC,412,129,20,14,SS_CENTERIMAGE + GROUPBOX "Triggers",IDC_XID_TRIGGERS,396,157,121,52,WS_GROUP + PUSHBUTTON "",IDC_SET_LTRIGGER,443,168,57,14,BS_FLAT + PUSHBUTTON "",IDC_SET_RTRIGGER,443,187,57,14,BS_FLAT + LTEXT "Left",IDC_STATIC,412,168,20,14,SS_CENTERIMAGE + LTEXT "Right",IDC_STATIC,412,187,20,14,SS_CENTERIMAGE + GROUPBOX "Rumble",IDC_XID_RUMBLE,396,212,121,34,WS_GROUP + PUSHBUTTON "",IDC_SET_MOTOR,443,224,57,14,BS_FLAT + LTEXT "Motor",IDC_STATIC,412,224,26,14,SS_CENTERIMAGE + PUSHBUTTON "Default Bindings",IDC_XID_DEFAULT,362,256,69,14,BS_FLAT + PUSHBUTTON "Clear",IDC_XID_CLEAR,443,256,50,14,BS_FLAT END IDD_RUMBLE_CFG DIALOGEX 0, 0, 155, 35 @@ -179,8 +179,8 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMEN CAPTION "Rumble Configuration" FONT 8, "Verdana", 0, 0, 0x1 BEGIN - COMBOBOX IDC_RUMBLE_LIST, 15, 11, 70, 15, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Test", IDC_RUMBLE_TEST, 95, 11, 45, 14, BS_FLAT + COMBOBOX IDC_RUMBLE_LIST,15,11,70,15,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Test",IDC_RUMBLE_TEST,95,11,45,14,BS_FLAT END IDD_VIRTUAL_SBC_FEEDBACK DIALOGEX 0, 0, 1039, 214 @@ -431,23 +431,23 @@ BEGIN CONTROL "PSHB",IDC_LOG_PSHB,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,144,126,34,10 CONTROL "PXSH",IDC_LOG_PXSH,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,200,126,34,10 CONTROL "VTXSH",IDC_LOG_VTXSH,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,28,140,38,10 - CONTROL "VTXB",IDC_LOG_VTXB,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,87,140,34,10 - CONTROL "DINP",IDC_LOG_DINP,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,145,140,33,10 - CONTROL "XINP",IDC_LOG_XINP,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,202,140,32,10 - CONTROL "SDL",IDC_LOG_SDL,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,33,155,33,10 - CONTROL "FILE",IDC_LOG_FILE,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,91,155,30,10 - CONTROL "X86",IDC_LOG_X86,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,149,155,29,10 - CONTROL "HLE",IDC_LOG_HLE,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,206,155,28,10 - CONTROL "NET",IDC_LOG_NET,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,37,168,29,10 - CONTROL "MCPX",IDC_LOG_MCPX,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,86,168,35,10 - CONTROL "NV2A",IDC_LOG_NV2A,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,144,168,34,10 - CONTROL "SMC",IDC_LOG_SMC,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,203,168,31,10 - CONTROL "OHCI",IDC_LOG_OHCI,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,32,182,34,10 - CONTROL "USB",IDC_LOG_USB,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,91,182,30,10 - CONTROL "HUB",IDC_LOG_HUB,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,148,182,30,10 - CONTROL "XIDCTRL",IDC_LOG_XIDCTRL,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,188,182,46,10 - CONTROL "ADM",IDC_LOG_ADM,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,35,195,31,10 - CONTROL "INPSYS",IDC_LOG_INPSYS,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,80,195,41,10 + CONTROL "VTXB",IDC_LOG_VTXB,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,144,140,34,10 + CONTROL "DINP",IDC_LOG_DINP,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,201,140,33,10 + CONTROL "XINP",IDC_LOG_XINP,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,34,155,32,10 + CONTROL "SDL",IDC_LOG_SDL,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,88,155,33,10 + CONTROL "FILE",IDC_LOG_FILE,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,148,155,30,10 + CONTROL "X86",IDC_LOG_X86,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,205,155,29,10 + CONTROL "HLE",IDC_LOG_HLE,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,38,168,28,10 + CONTROL "NET",IDC_LOG_NET,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,92,168,29,10 + CONTROL "MCPX",IDC_LOG_MCPX,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,143,168,35,10 + CONTROL "NV2A",IDC_LOG_NV2A,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,200,168,34,10 + CONTROL "SMC",IDC_LOG_SMC,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,35,182,31,10 + CONTROL "OHCI",IDC_LOG_OHCI,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,87,182,34,10 + CONTROL "USB",IDC_LOG_USB,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,148,182,30,10 + CONTROL "HUB",IDC_LOG_HUB,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,204,182,30,10 + CONTROL "XIDCTRL",IDC_LOG_XIDCTRL,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,20,195,46,10 + CONTROL "ADM",IDC_LOG_ADM,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,90,195,31,10 + CONTROL "INPSYS",IDC_LOG_INPSYS,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,137,195,41,10 GROUPBOX "Kernel Event",IDC_KERNEL_EVENTS,12,218,234,110,WS_GROUP,WS_EX_CLIENTEDGE CONTROL "Enable all",IDC_LOG_ENABLE_KERNEL,"Button",BS_AUTORADIOBUTTON | BS_LEFTTEXT,19,232,47,10 CONTROL "Disable all",IDC_LOG_DISABLE_KERNEL,"Button",BS_AUTORADIOBUTTON | BS_LEFTTEXT,71,232,50,10 @@ -474,6 +474,15 @@ BEGIN CONTROL "XE",IDC_LOG_XE,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,209,308,25,10 PUSHBUTTON "Cancel",IDC_LOG_CANCEL,161,333,40,14,BS_FLAT PUSHBUTTON "Accept",IDC_LOG_ACCEPT,206,333,40,14,BS_FLAT + CONTROL "VSHCACHE",IDC_LOG_VSHCACHE,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,68,140,53,10 +END + +IDD_ABOUT DIALOGEX 0, 0, 310, 177 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "About Cxbx-Reloaded" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + CONTROL "",IDC_TAB1,"SysTabControl32",0x0,7,7,296,163 END @@ -517,6 +526,11 @@ BEGIN 0 END +IDD_ABOUT AFX_DIALOG_LAYOUT +BEGIN + 0 +END + ///////////////////////////////////////////////////////////////////////////// // @@ -629,7 +643,7 @@ BEGIN END POPUP "&Settings", 65535,MFT_STRING,MFS_ENABLED BEGIN - MENUITEM "Config I&nput...", ID_SETTINGS_CONFIG_INPUT, MFT_STRING, MFS_ENABLED + MENUITEM "Config I&nput...", ID_SETTINGS_CONFIG_INPUT,MFT_STRING,MFS_ENABLED MENUITEM "Config &Video...", ID_SETTINGS_CONFIG_VIDEO,MFT_STRING,MFS_ENABLED MENUITEM "Config &Audio...", ID_SETTINGS_CONFIG_AUDIO,MFT_STRING,MFS_ENABLED MENUITEM "Config &Network...", ID_SETTINGS_CONFIG_NETWORK,MFT_STRING,MFS_ENABLED @@ -649,7 +663,7 @@ BEGIN MENUITEM MFT_SEPARATOR POPUP "&LLE (Experimental)", 65535,MFT_STRING,MFS_ENABLED BEGIN - MENUITEM "LLE &GPU", ID_EMULATION_LLE_GPU,MFT_STRING,MFS_DISABLED + MENUITEM "LLE &GPU", ID_EMULATION_LLE_GPU,MFT_STRING,MFS_GRAYED END POPUP "Hacks", 65535,MFT_STRING,MFS_ENABLED BEGIN @@ -682,30 +696,6 @@ BEGIN MENUITEM " ", ID_LOG,MFT_STRING,MFS_ENABLED END -///////////////////////////////////////////////////////////////////////////// -// -// Dialog -// - -IDD_ABOUT DIALOGEX 0, 0, 310, 177 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "About Cxbx-Reloaded" -FONT 8, "MS Shell Dlg", 400, 0, 0x1 -BEGIN - CONTROL "",IDC_TAB1,"SysTabControl32",0x0,7,7,296,163 -END - - -///////////////////////////////////////////////////////////////////////////// -// -// AFX_DIALOG_LAYOUT -// - -IDD_ABOUT AFX_DIALOG_LAYOUT -BEGIN - 0 -END - ///////////////////////////////////////////////////////////////////////////// // @@ -716,8 +706,7 @@ IDR_CONTRIBUTORS TXT "..\\CONTRIBUTORS" IDR_COPYING TXT "..\\COPYING" -#endif // Language neutral resources - +#endif // Neutral resources ///////////////////////////////////////////////////////////////////////////// diff --git a/src/common/Logging.cpp b/src/common/Logging.cpp index fd5649a03..bffc652e2 100644 --- a/src/common/Logging.cpp +++ b/src/common/Logging.cpp @@ -58,6 +58,7 @@ const char* g_EnumModules2String[to_underlying(CXBXR_MODULE::MAX)] = { "PSHB ", "PXSH ", "VTXSH ", + "VSHCACHE", "VTXB ", "DINP ", "XINP ", diff --git a/src/common/Logging.h b/src/common/Logging.h index 2b4f5019d..122322e20 100644 --- a/src/common/Logging.h +++ b/src/common/Logging.h @@ -66,6 +66,7 @@ typedef enum class _CXBXR_MODULE: unsigned int { PSHB, PXSH, VTXSH, + VSHCACHE, VTXB, DINP, XINP, diff --git a/src/core/hle/D3D8/Direct3D9/VertexShaderSource.cpp b/src/core/hle/D3D8/Direct3D9/VertexShaderSource.cpp index b097a2d1d..c6aa69170 100644 --- a/src/core/hle/D3D8/Direct3D9/VertexShaderSource.cpp +++ b/src/core/hle/D3D8/Direct3D9/VertexShaderSource.cpp @@ -1,4 +1,4 @@ -#define LOG_PREFIX CXBXR_MODULE::VTXSH +#define LOG_PREFIX CXBXR_MODULE::VSHCACHE #include "VertexShaderSource.h" diff --git a/src/gui/DlgLoggingConfig.cpp b/src/gui/DlgLoggingConfig.cpp index c136c6433..679c31d54 100644 --- a/src/gui/DlgLoggingConfig.cpp +++ b/src/gui/DlgLoggingConfig.cpp @@ -57,6 +57,7 @@ static int g_DlgIndexes[] = { IDC_LOG_PSHB, IDC_LOG_PXSH, IDC_LOG_VTXSH, + IDC_LOG_VSHCACHE, IDC_LOG_VTXB, IDC_LOG_DINP, IDC_LOG_XINP, @@ -353,6 +354,7 @@ INT_PTR CALLBACK DlgLogConfigProc(HWND hWndDlg, UINT uMsg, WPARAM wParam, LPARAM case IDC_LOG_PSHB: case IDC_LOG_PXSH: case IDC_LOG_VTXSH: + case IDC_LOG_VSHCACHE: case IDC_LOG_VTXB: case IDC_LOG_DINP: case IDC_LOG_XINP: diff --git a/src/gui/ResCxbx.h b/src/gui/ResCxbx.h index 916a3c96d..9ee9ebc0c 100644 --- a/src/gui/ResCxbx.h +++ b/src/gui/ResCxbx.h @@ -91,6 +91,7 @@ #define IDC_LOG_DSSTREAM 959 #define IDC_LOG_DS3DCALC 960 #define IDC_LOG_XMO 961 +#define IDC_LOG_VSHCACHE 962 #define IDC_SET_MOTOR 999 #define IDC_SET_X 1000 #define IDC_SET_Y 1001 @@ -368,7 +369,7 @@ #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 136 #define _APS_NEXT_COMMAND_VALUE 40113 -#define _APS_NEXT_CONTROL_VALUE 1277 +#define _APS_NEXT_CONTROL_VALUE 1278 #define _APS_NEXT_SYMED_VALUE 109 #endif #endif