[0.4.11][JOY] Add IDCANCEL action to MainPageProc (#6346) CORE-19424 + RC tweaks

This ports back:
0.4.15-dev-7456-g cbc3ee2287 CORE-19424 "Game Controller" control panel applet : ESC does not close
and a few trivial rc improvements.

Tendency for binary size is to shrink slightly, but manages to only reach the next lower quantum in releases/0.4.14:

master          RosBEWin2.2.2 GCC8.4.0 dbg x86                144.384 (0.4.15-dev-7557-gc858429)
releases/0.4.14 RosBEWin2.1.6 GCC4.7.2 dbg x86     133.632 -> 133.120
releases/0.4.13 RosBEWin2.1.6 GCC4.7.2 dbg x86     125.440 -> 125.440 (interesting: 0.4.12 & 0.4.13 do have the exact same code *within* this module)
releases/0.4.12 RosBEWin2.1.6 GCC4.7.2 dbg x86     127.488 -> 127.488 (interesting: 0.4.12 & 0.4.13 do have the exact same code *within* this module)
releases/0.4.11 RosBEWin2.1.6 GCC4.7.2 dbg x86     125.952 -> 125.952
releases/0.4.10 RosBEWin2.1.6 GCC4.7.2 dbg x86     125.952 -> 125.952
releases/0.4. 9 RosBEWin2.1.6 GCC4.7.2 dbg x86     125.952 -> 125.952
releases/0.4. 8 RosBEWin2.1.6 GCC4.7.2 dbg x86     125.952 -> 125.952
releases/0.4. 7 RosBEWin2.1.6 GCC4.7.2 dbg x86     125.952 -> 125.952

I am not aware yet which exact commit in the toolchain or dependent libs made it shrink from releases/0.4.12 to releases/0.4.13
This commit is contained in:
Joachim Henze 2024-02-07 22:47:57 +01:00
parent bc52a8b433
commit 36cd2ef75b
9 changed files with 35 additions and 36 deletions

View file

@ -203,7 +203,7 @@ MainPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
switch (uMsg)
{
case WM_INITDIALOG:
AddColumns(GetDlgItem(hwndDlg,IDC_CONTROLLER_LIST));
AddColumns(GetDlgItem(hwndDlg, IDC_CONTROLLER_LIST));
break;
case WM_COMMAND:
@ -224,6 +224,7 @@ MainPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
break;
case IDOK:
case IDCANCEL:
EndDialog(hwndDlg,LOWORD(wParam));
break;
}
@ -287,10 +288,8 @@ CPlApplet(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2)
break;
case CPL_DBLCLK:
{
MainDlg = hwndCPl;
Applets[i].AppletProc();
}
MainDlg = hwndCPl;
Applets[i].AppletProc();
break;
}

View file

@ -7,7 +7,7 @@ CAPTION "Игрови управления"
FONT 8, "MS Shell Dlg"
BEGIN
ICON IDI_CPLSYSTEM, -1, 7, 7, 20, 20
LTEXT "Това са настройките за игровите управления на компютъра ви.", -1, 33, 7, 214, 20, NOT WS_GROUP
LTEXT "Това са настройките за джойстиците на компютъра ви.", -1, 33, 7, 214, 20, NOT WS_GROUP
GROUPBOX "Сложени игрови управления", -1, 7, 34, 238, 117
CONTROL "List1", IDC_CONTROLLER_LIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | 0x0000808D, 14, 44, 224, 80
PUSHBUTTON "&Добавяне...", IDC_ADD_BUTTON, 35, 129, 65, 14

View file

@ -28,10 +28,10 @@ BEGIN
LTEXT "Sélectionnez un contrôleur de jeu dans la liste suivante, puis cliquez sur OK. Si votre contrôleur de jeu n'apparaît pas dans la liste, cliquez sur Personnaliser.", -1, 35, 7, 210, 33
LTEXT "Contrôleurs de jeu :", -1, 8, 45, 126, 8
LISTBOX IDC_GAME_CONTROLLERS_LIST, 7, 55, 251, 57, LBS_STANDARD | LBS_NOINTEGRALHEIGHT | LBS_WANTKEYBOARDINPUT | WS_HSCROLL | WS_TABSTOP
AUTOCHECKBOX "Activ&er les palonniers et les pédales", IDC_ENABLE_RUDDERS_CHECKBOX, 7, 114, 100, 10, WS_GROUP
AUTOCHECKBOX "Activ&er les palonniers et les pédales", IDC_ENABLE_RUDDERS_CHECKBOX, 7, 114, 250, 10, WS_GROUP
LTEXT "Port de jeu:", -1, 7, 134, 38, 8, NOT WS_VISIBLE
COMBOBOX IDC_GAME_PORT_COMBO, 7, 147, 140, 50, CBS_DROPDOWNLIST | CBS_SORT | NOT WS_VISIBLE | WS_VSCROLL
PUSHBUTTON "Personnaliser...", IDC_CUSTOM_BUTTON, 208, 147, 50, 14
PUSHBUTTON "Personnaliser...", IDC_CUSTOM_BUTTON, 200, 147, 58, 14
CONTROL "", -25525, "STATIC", SS_ETCHEDHORZ, 7, 170, 251, 1
DEFPUSHBUTTON "OK", IDOK, 155, 179, 50, 14
PUSHBUTTON "Annuler", IDCANCEL, 208, 179, 50, 14
@ -54,7 +54,7 @@ BEGIN
AUTORADIOBUTTON "Axe Z", IDC_Z_AXIS_RADIO, 81, 97, 35, 10, NOT WS_VISIBLE
GROUPBOX "&Boutons", -1, 137, 67, 116, 44
COMBOBOX IDC_BUTTONS_COMBO, 178, 79, 48, 50, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL, WS_EX_CLIENTEDGE
AUTOCHECKBOX "Inclue un contrôle de &point de vue", IDC_INC_POINT_CHECKBOX, 7, 123, 115, 10
AUTOCHECKBOX "Inclut un contrôle de &point de vue", IDC_INC_POINT_CHECKBOX, 7, 123, 120, 10
LTEXT "N&om du contrôleur :", -1, 7, 139, 200, 9
EDITTEXT IDC_CONTROLLER_NAME_EDIT, 7, 150, 116, 15, ES_AUTOHSCROLL, WS_EX_CLIENTEDGE | WS_EX_STATICEDGE
DEFPUSHBUTTON "OK", IDOK, 137, 150, 50, 14
@ -70,7 +70,7 @@ BEGIN
ICON IDI_CPLSYSTEM, -1, 7, 24, 20, 20
DEFPUSHBUTTON "OK", IDOK, 106, 65, 50, 14
PUSHBUTTON "Annuler", IDCANCEL, 163, 65, 50, 14
LTEXT "Sélectionnez le périphérique que vous désirez utiliser avec d'anciens programmes.", -1, 7, 7, 208, 10
LTEXT "Sélectionnez le périphérique que vous désirez utiliser avec d'anciens programmes.", -1, 7, 7, 208, 16
LTEXT "&Périphérique préféré:", -1, 34, 24, 70, 10
COMBOBOX IDC_PREFERRED_DEV_COMBO, 34, 38, 179, 75, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL
END

View file

@ -70,7 +70,7 @@ BEGIN
ICON IDI_CPLSYSTEM, -1, 7, 24, 20, 20
DEFPUSHBUTTON "אישור", IDOK, 106, 65, 50, 14
PUSHBUTTON "ביטול", IDCANCEL, 163, 65, 50, 14
LTEXT "Select the device you want to use with older programs.", -1, 7, 7, 208, 10
LTEXT "בחר את ההתקן בו ברצונך להשתמש עם תכניות ישנות.", -1, 7, 7, 208, 10
LTEXT "התקן מועדף:", -1, 34, 24, 70, 10
COMBOBOX IDC_PREFERRED_DEV_COMBO, 34, 38, 179, 75, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL
END
@ -78,7 +78,7 @@ END
STRINGTABLE
BEGIN
IDS_CPLSYSTEMNAME "בקרי משחק"
IDS_CPLSYSTEMDESCRIPTION "Add, remove, and configure game controller hardware such as joysticks and gamepads."
IDS_CPLSYSTEMDESCRIPTION "הוסף, הסר, והגדר חומרת בקרי משחק כמו ג׳ויסטיקים ומשטחי משחק."
IDS_CONTROLLER "בקר"
IDS_STATUS "מצב"
END

View file

@ -62,7 +62,7 @@ BEGIN
AUTORADIOBUTTON "Oś Z", IDC_Z_AXIS_RADIO, 81, 97, 35, 10, NOT WS_VISIBLE
GROUPBOX "&Przyciski", -1, 137, 67, 116, 44
COMBOBOX IDC_BUTTONS_COMBO, 178, 79, 48, 50, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL, WS_EX_CLIENTEDGE
AUTOCHECKBOX "&Zawiera kontrolę obszaru widoku", IDC_INC_POINT_CHECKBOX, 7, 123, 115, 10
AUTOCHECKBOX "&Zawiera kontrolę obszaru widoku", IDC_INC_POINT_CHECKBOX, 7, 123, 117, 10
LTEXT "&Nazwa kontrolera:", -1, 7, 139, 200, 9
EDITTEXT IDC_CONTROLLER_NAME_EDIT, 7, 150, 116, 15, ES_AUTOHSCROLL, WS_EX_CLIENTEDGE | WS_EX_STATICEDGE
DEFPUSHBUTTON "OK", IDOK, 137, 150, 50, 14

View file

@ -1,4 +1,4 @@
/* Translator: Ștefan Fulea (stefan dot fulea at mail dot com) */
// COPYRIGHT: Ștefan Fulea <stefan.fulea@mail.com>
LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL

View file

@ -1,20 +1,20 @@
/* TRANSLATOR: 2013, 2014 Erdem Ersoy (eersoy93) (erdemersoy [at] erdemersoy [dot] net) */
// COPYRIGHT: 2013-2020 Erdem Ersoy
LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
IDD_PROPPAGEMAIN DIALOGEX 0, 0, 252, 205
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION
EXSTYLE WS_EX_CONTEXTHELP
CAPTION "Oyun Denetleyicileri"
CAPTION "Oyun Kontrolcüleri"
FONT 8, "MS Shell Dlg"
BEGIN
ICON IDI_CPLSYSTEM, -1, 7, 7, 20, 20
LTEXT "Bu ayarlar, bilgisayarınızda yüklü oyun denetleyicilerini yapılandırmanıza yardım eder.", -1, 33, 7, 214, 20, NOT WS_GROUP
GROUPBOX "&Yüklü Oyun Denetleyicileri", -1, 7, 34, 238, 117
LTEXT "Bu ayarlar, bilgisayarınızda yüklü oyun kontrolcülerini yapılandırmanıza yardım eder.", -1, 33, 7, 214, 20, NOT WS_GROUP
GROUPBOX "&Yüklü Oyun Kontrolcüleri", -1, 7, 34, 238, 117
CONTROL "List1", IDC_CONTROLLER_LIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | 0x0000808D, 14, 44, 224, 80
PUSHBUTTON "&Ekle...", IDC_ADD_BUTTON, 35, 129, 65, 14
PUSHBUTTON "&Sil", IDC_REMOVE_BUTTON, 104, 129, 65, 14, WS_DISABLED
PUSHBUTTON "&Husûsiyetler", IDC_PROPERTIES_BUTTON, 173, 129, 65, 14, WS_DISABLED
PUSHBUTTON "Ö&zellikler", IDC_PROPERTIES_BUTTON, 173, 129, 65, 14, WS_DISABLED
PUSHBUTTON "&Gelişmiş...", IDC_ADVANCED_BUTTON, 111, 157, 65, 14
PUSHBUTTON "S&orun Çözme...", IDC_TROUBLESHOOT_BUTTON, 180, 157, 65, 14
PUSHBUTTON "Tamam", IDOK, 195, 185, 50, 14
@ -27,13 +27,13 @@ CAPTION "Oyun Denetleyicisi Ekle"
FONT 8, "MS Shell Dlg"
BEGIN
ICON IDI_CPLSYSTEM, -1, 8, 7, 20, 20
LTEXT "Aşağıdaki dizelgeden bir oyun denetleyicisi seçiniz, ardından ""Tamam""a tıklayınız. Eğer oyun denetleyiciniz dizelgede gözükmüyorsa ""Husûsî...""ye tıklayınız.", -1, 35, 7, 210, 33
LTEXT "&Oyun Denetleyicileri:", -1, 8, 45, 126, 8
LTEXT "Aşağıdaki listeden bir oyun denetleyicisi seçiniz, ardından ""Tamam""a tıklayınız. Eğer oyun denetleyiciniz listede gözükmüyorsa ""Özel...""e tıklayınız.", -1, 35, 7, 210, 33
LTEXT "&Oyun Kontrolcüleri:", -1, 8, 45, 126, 8
LISTBOX IDC_GAME_CONTROLLERS_LIST, 7, 55, 251, 57, LBS_STANDARD | LBS_NOINTEGRALHEIGHT | LBS_WANTKEYBOARDINPUT | WS_HSCROLL | WS_TABSTOP
AUTOCHECKBOX "&Dümenleri ve Ayaklıkları Etkinleştir", IDC_ENABLE_RUDDERS_CHECKBOX, 7, 114, 100, 10, WS_GROUP
LTEXT "O&yun Girişi:", -1, 7, 134, 38, 8, NOT WS_VISIBLE
COMBOBOX IDC_GAME_PORT_COMBO, 7, 147, 140, 50, CBS_DROPDOWNLIST | CBS_SORT | NOT WS_VISIBLE | WS_VSCROLL
PUSHBUTTON "&Husûsî...", IDC_CUSTOM_BUTTON, 208, 147, 50, 14
PUSHBUTTON "Ö&zel...", IDC_CUSTOM_BUTTON, 208, 147, 50, 14
CONTROL "", -25525, "STATIC", SS_ETCHEDHORZ, 7, 170, 251, 1
DEFPUSHBUTTON "Tamam", IDOK, 155, 179, 50, 14
PUSHBUTTON "İptal", IDCANCEL, 208, 179, 50, 14
@ -42,21 +42,21 @@ END
IDD_CUSTOM DIALOGEX 0, 0, 265, 183, 0
STYLE DS_SHELLFONT | DS_MODALFRAME | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_CAPTION
EXSTYLE WS_EX_CONTEXTHELP
CAPTION "Husûsî Oyun Denetleyicisi"
CAPTION "Özel Oyun Denetleyicisi"
FONT 8, "MS Shell Dlg"
BEGIN
GROUPBOX "Değişik Husûsiyetler", -1, 7, 7, 245, 52
GROUPBOX "Değişik Özellikler", -1, 7, 7, 245, 52
AUTORADIOBUTTON "&Oyun Çubuğu", IDC_JOYSTICK_RADIO, 17, 23, 55, 10
AUTORADIOBUTTON "&Uçuş Dümeni veyâ Uçuş Çubuğu", IDC_FLIGHT_YOKE_RADIO, 147, 23, 89, 10
AUTORADIOBUTTON "O&yun Kolu", IDC_GAME_PAD_RADIO, 17, 40, 65, 10
AUTORADIOBUTTON "Y&arış Arabası Denetleyicisi", IDC_RACE_CAR_RADIO, 147, 40, 93, 10
AUTORADIOBUTTON "&Uçuş Dümeni veya Uçuş Çubuğu", IDC_FLIGHT_YOKE_RADIO, 147, 23, 89, 10
AUTORADIOBUTTON "Oyun &Kolu", IDC_GAME_PAD_RADIO, 17, 40, 65, 10
AUTORADIOBUTTON "&Yarış Arabası Denetleyicisi", IDC_RACE_CAR_RADIO, 147, 40, 93, 10
GROUPBOX "Eksenler", -1, 7, 67, 116, 44, WS_GROUP
COMBOBOX IDC_AXES_COMBO, 37, 79, 48, 50, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL
AUTORADIOBUTTON "&Dümen/Ayaklıklar", IDC_RUDDER_PEDALS_RADIO, 14, 97, 63, 10, NOT WS_VISIBLE
AUTORADIOBUTTON "&Z Ekseni", IDC_Z_AXIS_RADIO, 81, 97, 35, 10, NOT WS_VISIBLE
GROUPBOX "Düğmeler", -1, 137, 67, 116, 44
COMBOBOX IDC_BUTTONS_COMBO, 178, 79, 48, 50, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL, WS_EX_CLIENTEDGE
AUTOCHECKBOX "D&enetlemeyi Görüntüleyen Bir Nokta İçerir", IDC_INC_POINT_CHECKBOX, 7, 123, 115, 10
AUTOCHECKBOX "D&enetlemeyi görüntüleyen bir nokta içerir", IDC_INC_POINT_CHECKBOX, 7, 123, 115, 10
LTEXT "De&netleyici Adı:", -1, 7, 139, 200, 9
EDITTEXT IDC_CONTROLLER_NAME_EDIT, 7, 150, 116, 15, ES_AUTOHSCROLL, WS_EX_CLIENTEDGE | WS_EX_STATICEDGE
DEFPUSHBUTTON "Tamam", IDOK, 137, 150, 50, 14
@ -79,7 +79,7 @@ END
STRINGTABLE
BEGIN
IDS_CPLSYSTEMNAME "Oyun Denetleyicileri"
IDS_CPLSYSTEMNAME "Oyun Kontrolcüleri"
IDS_CPLSYSTEMDESCRIPTION "Oyun çubukları ve oyun kolları gibi oyun denetleyicisi donanımlarını ekler, çıkarır ve yapılandırır."
IDS_CONTROLLER "Denetleyici"
IDS_STATUS "Durum"

View file

@ -32,7 +32,7 @@ FONT 9, "宋体"
BEGIN
ICON IDI_CPLSYSTEM, -1, 8, 7, 20, 20
LTEXT "请在下面列表中选择游戏控制器并单击“确定”。如果您的游戏控制器不在列表中,单击“自定义”。", -1, 35, 7, 210, 33
LTEXT "游戏控制器(&G)::", -1, 8, 45, 126, 8
LTEXT "游戏控制器(&G):", -1, 8, 45, 126, 8
LISTBOX IDC_GAME_CONTROLLERS_LIST, 7, 55, 251, 57, LBS_STANDARD | LBS_NOINTEGRALHEIGHT | LBS_WANTKEYBOARDINPUT | WS_HSCROLL | WS_TABSTOP
AUTOCHECKBOX "启用方向舵和脚踏板(&E)", IDC_ENABLE_RUDDERS_CHECKBOX, 7, 114, 100, 10, WS_GROUP
LTEXT "游戏端口(&G):", -1, 7, 134, 38, 8, NOT WS_VISIBLE

View file

@ -1,4 +1,4 @@
/* Traditional Chinese translation by Henry Tang Ih 2016 (henrytang2@hotmail.com) */
// COPYRIGHT: 2016 Henry Tang Ih <henrytang2@hotmail.com>
LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL
@ -9,7 +9,7 @@ CAPTION "遊戲控制器"
FONT 9, "新細明體"
BEGIN
ICON IDI_CPLSYSTEM, -1, 7, 7, 20, 20
LTEXT "這些設定幫助您配置安裝在計算機上的遊戲控制器。", -1, 33, 7, 214, 20, NOT WS_GROUP
LTEXT "這些設定幫助您配置安裝在電腦上的遊戲控制器。", -1, 33, 7, 214, 20, NOT WS_GROUP
GROUPBOX "安裝遊戲控制器(&N)", -1, 7, 34, 238, 117
CONTROL "List1", IDC_CONTROLLER_LIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | 0x0000808D, 14, 44, 224, 80
PUSHBUTTON "添加(&A)...", IDC_ADD_BUTTON, 35, 129, 65, 14
@ -27,13 +27,13 @@ CAPTION "添加遊戲控制器"
FONT 9, "新細明體"
BEGIN
ICON IDI_CPLSYSTEM, -1, 8, 7, 20, 20
LTEXT "請在下面列表中選擇遊戲控制器並單擊“確定”。如果您的遊戲控制器不在列表中,單擊“自定義”。", -1, 35, 7, 210, 33
LTEXT "遊戲控制器(&G)::", -1, 8, 45, 126, 8
LTEXT "請在下面列表中選擇遊戲控制器並按[確定]。如果您的遊戲控制器不在列表中,請按[自訂]。", -1, 35, 7, 210, 33
LTEXT "遊戲控制器(&G):", -1, 8, 45, 126, 8
LISTBOX IDC_GAME_CONTROLLERS_LIST, 7, 55, 251, 57, LBS_STANDARD | LBS_NOINTEGRALHEIGHT | LBS_WANTKEYBOARDINPUT | WS_HSCROLL | WS_TABSTOP
AUTOCHECKBOX "啟用方向舵和腳踏板(&E)", IDC_ENABLE_RUDDERS_CHECKBOX, 7, 114, 100, 10, WS_GROUP
LTEXT "遊戲埠(&G):", -1, 7, 134, 38, 8, NOT WS_VISIBLE
COMBOBOX IDC_GAME_PORT_COMBO, 7, 147, 140, 50, CBS_DROPDOWNLIST | CBS_SORT | NOT WS_VISIBLE | WS_VSCROLL
PUSHBUTTON "自定義(&C)...", IDC_CUSTOM_BUTTON, 208, 147, 50, 14
PUSHBUTTON "自(&C)...", IDC_CUSTOM_BUTTON, 208, 147, 50, 14
CONTROL "", -25525, "STATIC", SS_ETCHEDHORZ, 7, 170, 251, 1
DEFPUSHBUTTON "確定", IDOK, 155, 179, 50, 14
PUSHBUTTON "取消", IDCANCEL, 208, 179, 50, 14
@ -42,7 +42,7 @@ END
IDD_CUSTOM DIALOGEX 0, 0, 265, 183, 0
STYLE DS_SHELLFONT | DS_MODALFRAME | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_CAPTION
EXSTYLE WS_EX_CONTEXTHELP
CAPTION "自定義遊戲控制器"
CAPTION "自遊戲控制器"
FONT 9, "新細明體"
BEGIN
GROUPBOX "特殊特性", -1, 7, 7, 245, 52