diff --git a/pcsx2/DEV9/Win32/DEV9ghzdrk.rc b/pcsx2/DEV9/Win32/DEV9ghzdrk.rc index 9a2b35a974..e1b8b9a580 100644 --- a/pcsx2/DEV9/Win32/DEV9ghzdrk.rc +++ b/pcsx2/DEV9/Win32/DEV9ghzdrk.rc @@ -10,17 +10,16 @@ #define APSTUDIO_HIDDEN_SYMBOLS #include "windows.h" #undef APSTUDIO_HIDDEN_SYMBOLS + ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// -// Spanish (Argentina) resources +// Espagnol (Argentine) resources #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ESS) -#ifdef _WIN32 LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_ARGENTINA #pragma code_page(1252) -#endif //_WIN32 #ifdef APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// @@ -81,7 +80,7 @@ END // #ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO +GUIDELINES DESIGNINFO BEGIN IDD_CONFIG, DIALOG BEGIN @@ -93,7 +92,7 @@ BEGIN END #endif // APSTUDIO_INVOKED -#endif // Spanish (Argentina) resources +#endif // Espagnol (Argentine) resources ///////////////////////////////////////////////////////////////////////////// diff --git a/pcsx2/DEV9/Win32/resource.h b/pcsx2/DEV9/Win32/resource.h index a2a2cf9bb6..dbf5dbcb23 100644 --- a/pcsx2/DEV9/Win32/resource.h +++ b/pcsx2/DEV9/Win32/resource.h @@ -1,27 +1,25 @@ //{{NO_DEPENDENCIES}} -// Microsoft Developer Studio generated include file. -// Used by DEV9linuz.rc +// fichier Include Microsoft Visual C++. +// Utilisé par DEV9ghzdrk.rc // - -#ifndef IDC_STATIC -#define IDC_STATIC -1 -#endif - -#define IDD_CONFIG 101 -#define IDC_NAME 1000 -#define IDC_ETHDEV 1007 -#define IDC_BAYTYPE 1008 -#define IDC_ETHENABLED 1009 -#define IDC_HDDFILE 1010 -#define IDC_HDDENABLED 1011 +#define IDD_CONFDLG 801 +#define IDD_CONFIG 801 +#define IDC_NAME 8000 +#define IDC_COMBO1 8007 +#define IDC_ETHDEV 8007 +#define IDC_BAYTYPE 8008 +#define IDC_ETHENABLED 8009 +#define IDC_HDDFILE 8010 +#define IDC_HDDENABLED 8011 +#define IDC_STATIC -1 // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 105 -#define _APS_NEXT_COMMAND_VALUE 40001 -#define _APS_NEXT_CONTROL_VALUE 1011 -#define _APS_NEXT_SYMED_VALUE 101 +#define _APS_NEXT_RESOURCE_VALUE 805 +#define _APS_NEXT_COMMAND_VALUE 40002 +#define _APS_NEXT_CONTROL_VALUE 8011 +#define _APS_NEXT_SYMED_VALUE 801 #endif #endif diff --git a/pcsx2/USB/Win32/USBDialog.rc b/pcsx2/USB/Win32/USBDialog.rc index fd8fe91c50..0591a80921 100644 --- a/pcsx2/USB/Win32/USBDialog.rc +++ b/pcsx2/USB/Win32/USBDialog.rc @@ -7,13 +7,13 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#include "winresrc.h" +#include "WinResrc.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// -// English (United States) resources +// Anglais (États-Unis) resources #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US @@ -65,16 +65,6 @@ BEGIN LTEXT "Port 2:",IDC_STATIC_USB,18,84,23,8 END -IDD_ABOUT_USB DIALOGEX 0, 0, 177, 106 -STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "USBabout" -FONT 8, "MS Sans Serif", 0, 0, 0x0 -BEGIN - DEFPUSHBUTTON "OK",IDOK,65,85,50,14 - LTEXT "USB Driver",IDC_NAME_USB,70,10,54,8 - GROUPBOX "",IDC_STATIC_USB,5,35,170,43 -END - IDD_DLGWASAPI_USB DIALOGEX 0, 0, 287, 230 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "WASAPI settings" @@ -147,18 +137,30 @@ END #ifdef APSTUDIO_INVOKED GUIDELINES DESIGNINFO BEGIN + IDD_DLGMSD_USB, DIALOG + BEGIN + END + + IDD_CONFIG_USB, DIALOG + BEGIN + END + IDD_DLGWASAPI_USB, DIALOG BEGIN END + + IDD_DLG_EYETOY_USB, DIALOG + BEGIN + END END #endif // APSTUDIO_INVOKED -#endif // English (United States) resources +#endif // Anglais (États-Unis) resources ///////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////// -// Spanish (Argentina) resources +// Espagnol (Argentine) resources #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ESS) LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_ARGENTINA @@ -172,7 +174,7 @@ LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_ARGENTINA 1 TEXTINCLUDE BEGIN - "resource.h\0" + "resource_usb.h\0" END 2 TEXTINCLUDE @@ -189,7 +191,7 @@ END #endif // APSTUDIO_INVOKED -#endif // Spanish (Argentina) resources +#endif // Espagnol (Argentine) resources ///////////////////////////////////////////////////////////////////////////// diff --git a/pcsx2/USB/Win32/resource_usb.h b/pcsx2/USB/Win32/resource_usb.h index 3cd8c5abdc..6cdd6f72b4 100644 --- a/pcsx2/USB/Win32/resource_usb.h +++ b/pcsx2/USB/Win32/resource_usb.h @@ -1,44 +1,42 @@ //{{NO_DEPENDENCIES}} -// Microsoft Visual C++ generated include file. -// Used by USBlinuz.rc +// fichier Include Microsoft Visual C++. +// Utilisé par USBDialog.rc // -#define IDC_STATIC_USB -1 -#define IDC_CONFIGURE1_USB 3 -#define IDC_CONFIGURE2_USB 4 -#define IDD_CONFDLG_USB 101 -#define IDD_CONFIG_USB 101 -#define IDD_ABOUT_USB 103 -#define IDD_DLGMSD_USB 106 -#define IDD_DLGWASAPI_USB 107 -#define IDD_DLG_EYETOY_USB 108 -#define IDC_NAME_USB 1000 -#define IDC_LOGGING_USB 1007 -#define IDC_COMBO1_USB 1008 -#define IDC_COMBO2_USB 1009 -#define IDC_LIST1_USB 1010 -#define IDC_COMBO_API1_USB 1010 -#define IDC_COMBO3_USB 1010 -#define IDC_COMBO_FFB_USB 1011 -#define IDC_COMBO_API2_USB 1011 -#define IDC_BUTTON1_USB 1012 -#define IDC_DFP_PASS_USB 1013 -#define IDC_BUILD_DATE_USB 1014 -#define IDC_EDIT1_USB 1015 -#define IDC_COMBO_WHEEL_TYPE1_USB 1037 -#define IDC_COMBO_WHEEL_TYPE2_USB 1038 -#define IDC_SLIDER1_USB 1039 -#define IDC_BUFFER1_USB 1040 -#define IDC_COMBOMICAPI_USB 1041 -#define IDC_SLIDER2_USB 1041 -#define IDC_BUFFER2_USB 1042 +#define IDC_CONFIGURE1_USB 3 +#define IDC_CONFIGURE2_USB 4 +#define IDD_CONFDLG_USB 101 +#define IDD_CONFIG_USB 101 +#define IDD_DLGMSD_USB 106 +#define IDD_DLGWASAPI_USB 107 +#define IDD_DLG_EYETOY_USB 108 +#define IDC_LOGGING_USB 1007 +#define IDC_COMBO1_USB 1008 +#define IDC_COMBO2_USB 1009 +#define IDC_LIST1_USB 1010 +#define IDC_COMBO_API1_USB 1010 +#define IDC_COMBO3_USB 1010 +#define IDC_COMBO_FFB_USB 1011 +#define IDC_COMBO_API2_USB 1011 +#define IDC_BUTTON1_USB 1012 +#define IDC_DFP_PASS_USB 1013 +#define IDC_BUILD_DATE_USB 1014 +#define IDC_EDIT1_USB 1015 +#define IDC_COMBO_WHEEL_TYPE1_USB 1037 +#define IDC_COMBO_WHEEL_TYPE2_USB 1038 +#define IDC_SLIDER1_USB 1039 +#define IDC_BUFFER1_USB 1040 +#define IDC_COMBOMICAPI_USB 1041 +#define IDC_SLIDER2_USB 1041 +#define IDC_BUFFER2_USB 1042 +#define IDC_STATIC_USB -1 // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 109 -#define _APS_NEXT_COMMAND_VALUE 40001 -#define _APS_NEXT_CONTROL_VALUE 1042 -#define _APS_NEXT_SYMED_VALUE 101 +#define _APS_NEXT_RESOURCE_VALUE 109 +#define _APS_NEXT_COMMAND_VALUE 40001 +#define _APS_NEXT_CONTROL_VALUE 1042 +#define _APS_NEXT_SYMED_VALUE 101 #endif #endif diff --git a/pcsx2/USB/configuration.cpp b/pcsx2/USB/configuration.cpp index fe82df7ed9..95abd150a7 100644 --- a/pcsx2/USB/configuration.cpp +++ b/pcsx2/USB/configuration.cpp @@ -186,8 +186,11 @@ void LoadConfig() #endif #ifdef _WIN32 - LoadSetting(nullptr, 0, N_DEVICE_PORT, N_DEVICE, str_to_wstr(conf.Port[0])); - LoadSetting(nullptr, 1, N_DEVICE_PORT, N_DEVICE, str_to_wstr(conf.Port[1])); + std::wstring tmp; + LoadSetting(nullptr, 0, N_DEVICE_PORT, N_DEVICE, tmp); + conf.Port[0] = wstr_to_str(tmp); + LoadSetting(nullptr, 1, N_DEVICE_PORT, N_DEVICE, tmp); + conf.Port[1] = wstr_to_str(tmp); #else LoadSetting(nullptr, 0, N_DEVICE_PORT, N_DEVICE, conf.Port[0]); LoadSetting(nullptr, 1, N_DEVICE_PORT, N_DEVICE, conf.Port[1]);