Ros-diffs July 2020

ros-diffs@reactos.org

14 participants
55 discussions

[reactos] 01/01: [OSK] Meta key modifier behaviour added (#2973)
by Arjav Garg 18 Jul '20

18 Jul '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3b983e57b02982f7f21ec… commit 3b983e57b02982f7f21eca35d3ca3745624df948 Author: Arjav Garg <arjavgarg(a)gmail.com> AuthorDate: Sat Jul 18 19:03:43 2020 +0530 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Jul 18 15:33:43 2020 +0200 [OSK] Meta key modifier behaviour added (#2973) Make the meta key in the OSK have modifier key behaviour. Changed all the .rc files in the OSK so that the meta key doesn't release on it's own and needs a second click to release. CORE-17161 --- base/applications/osk/lang/ar-DZ.rc | 8 ++++---- base/applications/osk/lang/cs-CZ.rc | 8 ++++---- base/applications/osk/lang/de-DE.rc | 8 ++++---- base/applications/osk/lang/en-GB.rc | 8 ++++---- base/applications/osk/lang/en-US.rc | 8 ++++---- base/applications/osk/lang/es-ES.rc | 8 ++++---- base/applications/osk/lang/et-EE.rc | 8 ++++---- base/applications/osk/lang/fr-CA.rc | 8 ++++---- base/applications/osk/lang/fr-FR.rc | 8 ++++---- base/applications/osk/lang/he-IL.rc | 8 ++++---- base/applications/osk/lang/id-ID.rc | 8 ++++---- base/applications/osk/lang/it-IT.rc | 8 ++++---- base/applications/osk/lang/pl-PL.rc | 8 ++++---- base/applications/osk/lang/ro-RO.rc | 8 ++++---- base/applications/osk/lang/ru-RU.rc | 8 ++++---- base/applications/osk/lang/tr-TR.rc | 8 ++++---- base/applications/osk/lang/zh-CN.rc | 8 ++++---- base/applications/osk/lang/zh-TW.rc | 8 ++++---- 18 files changed, 72 insertions(+), 72 deletions(-) diff --git a/base/applications/osk/lang/ar-DZ.rc b/base/applications/osk/lang/ar-DZ.rc index f9cda704bcf..dfbf6f60cb9 100644 --- a/base/applications/osk/lang/ar-DZ.rc +++ b/base/applications/osk/lang/ar-DZ.rc @@ -85,11 +85,11 @@ BEGIN PUSHBUTTON "ظ",SCAN_CODE_55,307,113,23,22 PUSHBUTTON "shift",SCAN_CODE_57,334,113,67,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ctrl",SCAN_CODE_58,3,139,41,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_127,48,139,30,22,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_127,48,139,30,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "alt",SCAN_CODE_60,82,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "",SCAN_CODE_61,116,139,143,22 PUSHBUTTON "alt gr",SCAN_CODE_62,264,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,298,139,30,22,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_128,298,139,30,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "menu",SCAN_CODE_129,332,139,30,22,BS_ICON PUSHBUTTON "ctrl",SCAN_CODE_64,366,139,35,22,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ins",SCAN_CODE_75,411,35,23,22 @@ -205,11 +205,11 @@ BEGIN PUSHBUTTON "shift",SCAN_CODE_57,254,79,45,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "v",SCAN_CODE_84,324,98,15,15,BS_ICON - PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "",SCAN_CODE_61,84,98,106,15 //space PUSHBUTTON "alt",SCAN_CODE_62,194,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "menu",SCAN_CODE_129,248,98,24,15,BS_ICON PUSHBUTTON "ctrl",SCAN_CODE_64,275,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ins",SCAN_CODE_75,304,22,15,15 diff --git a/base/applications/osk/lang/cs-CZ.rc b/base/applications/osk/lang/cs-CZ.rc index 2802a978f97..a873fce0264 100644 --- a/base/applications/osk/lang/cs-CZ.rc +++ b/base/applications/osk/lang/cs-CZ.rc @@ -85,11 +85,11 @@ BEGIN PUSHBUTTON "/",SCAN_CODE_55,307,113,23,22 PUSHBUTTON "shift",SCAN_CODE_57,334,113,67,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ctrl",SCAN_CODE_58,3,139,41,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_127,48,139,30,22,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_127,48,139,30,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "alt",SCAN_CODE_60,82,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "",SCAN_CODE_61,116,139,143,22 PUSHBUTTON "alt gr",SCAN_CODE_62,264,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,298,139,30,22,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_128,298,139,30,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "menu",SCAN_CODE_129,332,139,30,22,BS_ICON PUSHBUTTON "ctrl",SCAN_CODE_64,366,139,35,22,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ins",SCAN_CODE_75,411,35,23,22 @@ -205,11 +205,11 @@ BEGIN PUSHBUTTON "shift",SCAN_CODE_57,254,79,45,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "v",SCAN_CODE_84,324,98,15,15,BS_ICON - PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "",SCAN_CODE_61,84,98,106,15 //space PUSHBUTTON "alt",SCAN_CODE_62,194,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "menu",SCAN_CODE_129,248,98,24,15,BS_ICON PUSHBUTTON "ctrl",SCAN_CODE_64,275,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ins",SCAN_CODE_75,304,22,15,15 diff --git a/base/applications/osk/lang/de-DE.rc b/base/applications/osk/lang/de-DE.rc index de49bb98453..83c7b760e09 100644 --- a/base/applications/osk/lang/de-DE.rc +++ b/base/applications/osk/lang/de-DE.rc @@ -86,11 +86,11 @@ BEGIN PUSHBUTTON "-",SCAN_CODE_55,307,113,23,22 PUSHBUTTON "Umsch",SCAN_CODE_57,334,113,67,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "Strg",SCAN_CODE_58,3,139,41,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_127,48,139,30,22,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_127,48,139,30,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "Alt",SCAN_CODE_60,82,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "",SCAN_CODE_61,116,139,143,22 PUSHBUTTON "Alt Gr",SCAN_CODE_62,264,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,298,139,30,22,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_128,298,139,30,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "Menü",SCAN_CODE_129,332,139,30,22,BS_ICON PUSHBUTTON "Strg",SCAN_CODE_64,366,139,35,22,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "Einfg",SCAN_CODE_75,411,35,23,22 @@ -206,11 +206,11 @@ BEGIN PUSHBUTTON "umsch",SCAN_CODE_57,254,79,45,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "strg",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "v",SCAN_CODE_84,324,98,15,15,BS_ICON - PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "",SCAN_CODE_61,84,98,106,15 //space PUSHBUTTON "alt gr",SCAN_CODE_62,194,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "menü",SCAN_CODE_129,248,98,24,15,BS_ICON PUSHBUTTON "strg",SCAN_CODE_64,275,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "einfg",SCAN_CODE_75,304,22,15,15 diff --git a/base/applications/osk/lang/en-GB.rc b/base/applications/osk/lang/en-GB.rc index 8665669447e..dc0fc5b81c4 100644 --- a/base/applications/osk/lang/en-GB.rc +++ b/base/applications/osk/lang/en-GB.rc @@ -86,11 +86,11 @@ BEGIN PUSHBUTTON "/",SCAN_CODE_55,307,113,23,22 PUSHBUTTON "Shift",SCAN_CODE_57,334,113,67,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ctrl",SCAN_CODE_58,3,139,41,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_127,48,139,30,22,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_127,48,139,30,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "alt",SCAN_CODE_60,82,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "",SCAN_CODE_61,116,139,143,22 PUSHBUTTON "alt gr",SCAN_CODE_62,264,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,298,139,30,22,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_128,298,139,30,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "menu",SCAN_CODE_129,332,139,30,22,BS_ICON PUSHBUTTON "ctrl",SCAN_CODE_64,366,139,35,22,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ins",SCAN_CODE_75,411,35,23,22 @@ -206,11 +206,11 @@ BEGIN PUSHBUTTON "shift",SCAN_CODE_57,254,79,45,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "v",SCAN_CODE_84,324,98,15,15,BS_ICON - PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "",SCAN_CODE_61,84,98,106,15 //space PUSHBUTTON "alt",SCAN_CODE_62,194,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "menu",SCAN_CODE_129,248,98,24,15,BS_ICON PUSHBUTTON "ctrl",SCAN_CODE_64,275,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ins",SCAN_CODE_75,304,22,15,15 diff --git a/base/applications/osk/lang/en-US.rc b/base/applications/osk/lang/en-US.rc index f852a7e6293..412ead788fb 100644 --- a/base/applications/osk/lang/en-US.rc +++ b/base/applications/osk/lang/en-US.rc @@ -86,11 +86,11 @@ BEGIN PUSHBUTTON "shift",SCAN_CODE_57,254,79,64,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "v",SCAN_CODE_84,343,98,15,15,BS_ICON - PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "",SCAN_CODE_61,84,98,125,15 //space PUSHBUTTON "alt",SCAN_CODE_62,213,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,240,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_128,240,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "menu",SCAN_CODE_129,267,98,24,15,BS_ICON PUSHBUTTON "ctrl",SCAN_CODE_64,294,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ins",SCAN_CODE_75,323,22,15,15 @@ -205,11 +205,11 @@ BEGIN PUSHBUTTON "shift",SCAN_CODE_57,254,79,45,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "v",SCAN_CODE_84,324,98,15,15,BS_ICON - PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "",SCAN_CODE_61,84,98,106,15 //space PUSHBUTTON "alt",SCAN_CODE_62,194,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "menu",SCAN_CODE_129,248,98,24,15,BS_ICON PUSHBUTTON "ctrl",SCAN_CODE_64,275,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ins",SCAN_CODE_75,304,22,15,15 diff --git a/base/applications/osk/lang/es-ES.rc b/base/applications/osk/lang/es-ES.rc index e09e8f88dbc..24e1e57c01b 100644 --- a/base/applications/osk/lang/es-ES.rc +++ b/base/applications/osk/lang/es-ES.rc @@ -87,11 +87,11 @@ BEGIN PUSHBUTTON "-",SCAN_CODE_55,307,113,23,22 PUSHBUTTON "maj",SCAN_CODE_57,334,113,67,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ctrl",SCAN_CODE_58,3,139,41,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_127,48,139,30,22,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_127,48,139,30,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "alt",SCAN_CODE_60,82,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "",SCAN_CODE_61,116,139,143,22 PUSHBUTTON "alt gr",SCAN_CODE_62,264,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,298,139,30,22,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_128,298,139,30,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "menú",SCAN_CODE_129,332,139,30,22,BS_ICON PUSHBUTTON "ctrl",SCAN_CODE_64,366,139,35,22,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ins",SCAN_CODE_75,411,35,23,22 @@ -207,11 +207,11 @@ BEGIN PUSHBUTTON "shift",SCAN_CODE_57,254,79,45,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "v",SCAN_CODE_84,324,98,15,15,BS_ICON - PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "",SCAN_CODE_61,84,98,106,15 //space PUSHBUTTON "alt",SCAN_CODE_62,194,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "menu",SCAN_CODE_129,248,98,24,15,BS_ICON PUSHBUTTON "ctrl",SCAN_CODE_64,275,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ins",SCAN_CODE_75,304,22,15,15 diff --git a/base/applications/osk/lang/et-EE.rc b/base/applications/osk/lang/et-EE.rc index c449c8ed4fc..d2dddd6599a 100644 --- a/base/applications/osk/lang/et-EE.rc +++ b/base/applications/osk/lang/et-EE.rc @@ -86,11 +86,11 @@ BEGIN PUSHBUTTON "shift",SCAN_CODE_57,254,79,64,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "v",SCAN_CODE_84,343,98,15,15,BS_ICON - PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "",SCAN_CODE_61,84,98,125,15 //space PUSHBUTTON "alt",SCAN_CODE_62,213,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,240,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_128,240,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "menu",SCAN_CODE_129,267,98,24,15,BS_ICON PUSHBUTTON "ctrl",SCAN_CODE_64,294,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ins",SCAN_CODE_75,323,22,15,15 @@ -205,11 +205,11 @@ BEGIN PUSHBUTTON "shift",SCAN_CODE_57,254,79,45,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "v",SCAN_CODE_84,324,98,15,15,BS_ICON - PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "",SCAN_CODE_61,84,98,106,15 //space PUSHBUTTON "alt",SCAN_CODE_62,194,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "menu",SCAN_CODE_129,248,98,24,15,BS_ICON PUSHBUTTON "ctrl",SCAN_CODE_64,275,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ins",SCAN_CODE_75,304,22,15,15 diff --git a/base/applications/osk/lang/fr-CA.rc b/base/applications/osk/lang/fr-CA.rc index c7857d406be..423868f2d85 100644 --- a/base/applications/osk/lang/fr-CA.rc +++ b/base/applications/osk/lang/fr-CA.rc @@ -86,11 +86,11 @@ BEGIN PUSHBUTTON "/",SCAN_CODE_55,307,113,23,22 PUSHBUTTON "maj",SCAN_CODE_57,334,113,67,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ctrl",SCAN_CODE_58,3,139,41,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_127,48,139,30,22,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_127,48,139,30,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "alt",SCAN_CODE_60,82,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "",SCAN_CODE_61,116,139,143,22 PUSHBUTTON "alt gr",SCAN_CODE_62,264,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,298,139,30,22,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_128,298,139,30,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "menu",SCAN_CODE_129,332,139,30,22,BS_ICON PUSHBUTTON "ctrl",SCAN_CODE_64,366,139,35,22,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ins",SCAN_CODE_75,411,35,23,22 @@ -206,11 +206,11 @@ BEGIN PUSHBUTTON "shift",SCAN_CODE_57,254,79,45,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "v",SCAN_CODE_84,324,98,15,15,BS_ICON - PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "",SCAN_CODE_61,84,98,106,15 //space PUSHBUTTON "alt",SCAN_CODE_62,194,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "menu",SCAN_CODE_129,248,98,24,15,BS_ICON PUSHBUTTON "ctrl",SCAN_CODE_64,275,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ins",SCAN_CODE_75,304,22,15,15 diff --git a/base/applications/osk/lang/fr-FR.rc b/base/applications/osk/lang/fr-FR.rc index 2764cf9b57e..91cc7af35e4 100644 --- a/base/applications/osk/lang/fr-FR.rc +++ b/base/applications/osk/lang/fr-FR.rc @@ -86,11 +86,11 @@ BEGIN PUSHBUTTON "!",SCAN_CODE_55,307,113,23,22 PUSHBUTTON "maj",SCAN_CODE_57,334,113,67,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ctrl",SCAN_CODE_58,3,139,41,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_127,48,139,30,22,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_127,48,139,30,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "alt",SCAN_CODE_60,82,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "",SCAN_CODE_61,116,139,143,22 PUSHBUTTON "alt gr",SCAN_CODE_62,264,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,298,139,30,22,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_128,298,139,30,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "menu",SCAN_CODE_129,332,139,30,22,BS_ICON PUSHBUTTON "ctrl",SCAN_CODE_64,366,139,35,22,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ins",SCAN_CODE_75,411,35,23,22 @@ -206,11 +206,11 @@ BEGIN PUSHBUTTON "shift",SCAN_CODE_57,254,79,45,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "v",SCAN_CODE_84,324,98,15,15,BS_ICON - PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "",SCAN_CODE_61,84,98,106,15 //space PUSHBUTTON "alt",SCAN_CODE_62,194,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "menu",SCAN_CODE_129,248,98,24,15,BS_ICON PUSHBUTTON "ctrl",SCAN_CODE_64,275,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ins",SCAN_CODE_75,304,22,15,15 diff --git a/base/applications/osk/lang/he-IL.rc b/base/applications/osk/lang/he-IL.rc index cadeb7037dd..0fe7d60e9a9 100644 --- a/base/applications/osk/lang/he-IL.rc +++ b/base/applications/osk/lang/he-IL.rc @@ -85,11 +85,11 @@ BEGIN PUSHBUTTON ".",SCAN_CODE_55,307,113,23,22 PUSHBUTTON "shift",SCAN_CODE_57,334,113,67,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ctrl",SCAN_CODE_58,3,139,41,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_127,48,139,30,22,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_127,48,139,30,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "alt",SCAN_CODE_60,82,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "",SCAN_CODE_61,116,139,143,22 PUSHBUTTON "alt gr",SCAN_CODE_62,264,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,298,139,30,22,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_128,298,139,30,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "menu",SCAN_CODE_129,332,139,30,22,BS_ICON PUSHBUTTON "ctrl",SCAN_CODE_64,366,139,35,22,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ins",SCAN_CODE_75,411,35,23,22 @@ -205,11 +205,11 @@ BEGIN PUSHBUTTON "shift",SCAN_CODE_57,254,79,45,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "v",SCAN_CODE_84,324,98,15,15,BS_ICON - PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "",SCAN_CODE_61,84,98,106,15 //space PUSHBUTTON "alt",SCAN_CODE_62,194,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "menu",SCAN_CODE_129,248,98,24,15,BS_ICON PUSHBUTTON "ctrl",SCAN_CODE_64,275,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ins",SCAN_CODE_75,304,22,15,15 diff --git a/base/applications/osk/lang/id-ID.rc b/base/applications/osk/lang/id-ID.rc index f916f2932ef..4de8d491cfa 100644 --- a/base/applications/osk/lang/id-ID.rc +++ b/base/applications/osk/lang/id-ID.rc @@ -86,11 +86,11 @@ BEGIN PUSHBUTTON "shift",SCAN_CODE_57,254,79,64,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "v",SCAN_CODE_84,343,98,15,15,BS_ICON - PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "",SCAN_CODE_61,84,98,125,15 //space PUSHBUTTON "alt",SCAN_CODE_62,213,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,240,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_128,240,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "menu",SCAN_CODE_129,267,98,24,15,BS_ICON PUSHBUTTON "ctrl",SCAN_CODE_64,294,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ins",SCAN_CODE_75,323,22,15,15 @@ -205,11 +205,11 @@ BEGIN PUSHBUTTON "shift",SCAN_CODE_57,254,79,45,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "v",SCAN_CODE_84,324,98,15,15,BS_ICON - PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "",SCAN_CODE_61,84,98,106,15 //space PUSHBUTTON "alt",SCAN_CODE_62,194,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "menu",SCAN_CODE_129,248,98,24,15,BS_ICON PUSHBUTTON "ctrl",SCAN_CODE_64,275,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ins",SCAN_CODE_75,304,22,15,15 diff --git a/base/applications/osk/lang/it-IT.rc b/base/applications/osk/lang/it-IT.rc index f2b3649fbf5..956d274c59a 100644 --- a/base/applications/osk/lang/it-IT.rc +++ b/base/applications/osk/lang/it-IT.rc @@ -86,11 +86,11 @@ BEGIN PUSHBUTTON "-",SCAN_CODE_55,235,79,15,15 PUSHBUTTON "Shift",SCAN_CODE_57,254,79,64,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "",SCAN_CODE_61,84,98,125,15 PUSHBUTTON "alt gr",SCAN_CODE_62,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,240,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_128,240,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "menu",SCAN_CODE_129,267,98,24,15,BS_ICON PUSHBUTTON "ctrl",SCAN_CODE_64,294,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ins",SCAN_CODE_75,323,22,15,15 @@ -206,11 +206,11 @@ BEGIN PUSHBUTTON "-",SCAN_CODE_55,235,79,15,15 PUSHBUTTON "Shift",SCAN_CODE_57,254,79,64,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "",SCAN_CODE_61,84,98,125,15 PUSHBUTTON "alt gr",SCAN_CODE_62,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,240,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_128,240,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "menu",SCAN_CODE_129,267,98,24,15,BS_ICON PUSHBUTTON "ctrl",SCAN_CODE_64,294,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ins",SCAN_CODE_75,323,22,15,15 diff --git a/base/applications/osk/lang/pl-PL.rc b/base/applications/osk/lang/pl-PL.rc index 1844ff89514..c128976e309 100644 --- a/base/applications/osk/lang/pl-PL.rc +++ b/base/applications/osk/lang/pl-PL.rc @@ -85,11 +85,11 @@ BEGIN PUSHBUTTON "/",SCAN_CODE_55,307,113,23,22 PUSHBUTTON "shift",SCAN_CODE_57,334,113,67,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ctrl",SCAN_CODE_58,3,139,41,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_127,48,139,30,22,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_127,48,139,30,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "alt",SCAN_CODE_60,82,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "",SCAN_CODE_61,116,139,143,22 PUSHBUTTON "alt gr",SCAN_CODE_62,264,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,298,139,30,22,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_128,298,139,30,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "menu",SCAN_CODE_129,332,139,30,22,BS_ICON PUSHBUTTON "ctrl",SCAN_CODE_64,366,139,35,22,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ins",SCAN_CODE_75,411,35,23,22 @@ -205,11 +205,11 @@ BEGIN PUSHBUTTON "shift",SCAN_CODE_57,254,79,45,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "v",SCAN_CODE_84,324,98,15,15,BS_ICON - PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "",SCAN_CODE_61,84,98,106,15 //space PUSHBUTTON "alt",SCAN_CODE_62,194,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "menu",SCAN_CODE_129,248,98,24,15,BS_ICON PUSHBUTTON "ctrl",SCAN_CODE_64,275,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ins",SCAN_CODE_75,304,22,15,15 diff --git a/base/applications/osk/lang/ro-RO.rc b/base/applications/osk/lang/ro-RO.rc index 21cae9a49d5..c45f0725ae3 100644 --- a/base/applications/osk/lang/ro-RO.rc +++ b/base/applications/osk/lang/ro-RO.rc @@ -86,11 +86,11 @@ BEGIN PUSHBUTTON "/",SCAN_CODE_55,235,79,15,15 PUSHBUTTON "schimb",SCAN_CODE_57,254,79,64,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "",SCAN_CODE_61,84,98,125,15 PUSHBUTTON "alt gr",SCAN_CODE_62,213,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,240,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_128,240,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "meniu",SCAN_CODE_129,267,98,24,15,BS_ICON PUSHBUTTON "ctrl",SCAN_CODE_64,294,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ins",SCAN_CODE_75,323,22,15,15 @@ -205,11 +205,11 @@ BEGIN PUSHBUTTON "/",SCAN_CODE_55,235,79,15,15 PUSHBUTTON "schimb",SCAN_CODE_57,254,79,64,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "",SCAN_CODE_61,84,98,125,15 PUSHBUTTON "alt gr",SCAN_CODE_62,213,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,240,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_128,240,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "meniu",SCAN_CODE_129,267,98,24,15,BS_ICON PUSHBUTTON "ctrl",SCAN_CODE_64,294,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ins",SCAN_CODE_75,323,22,15,15 diff --git a/base/applications/osk/lang/ru-RU.rc b/base/applications/osk/lang/ru-RU.rc index c2878b717ee..e4f6a4fa125 100644 --- a/base/applications/osk/lang/ru-RU.rc +++ b/base/applications/osk/lang/ru-RU.rc @@ -86,11 +86,11 @@ BEGIN PUSHBUTTON "shift",SCAN_CODE_57,254,79,64,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "v",SCAN_CODE_84,343,98,15,15,BS_ICON - PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "",SCAN_CODE_61,84,98,125,15 //space PUSHBUTTON "alt",SCAN_CODE_62,213,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,240,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_128,240,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "menu",SCAN_CODE_129,267,98,24,15,BS_ICON PUSHBUTTON "ctrl",SCAN_CODE_64,294,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ins",SCAN_CODE_75,323,22,15,15 @@ -205,11 +205,11 @@ BEGIN PUSHBUTTON "shift",SCAN_CODE_57,254,79,45,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "v",SCAN_CODE_84,324,98,15,15,BS_ICON - PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "",SCAN_CODE_61,84,98,106,15 //space PUSHBUTTON "alt",SCAN_CODE_62,194,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "menu",SCAN_CODE_129,248,98,24,15,BS_ICON PUSHBUTTON "ctrl",SCAN_CODE_64,275,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ins",SCAN_CODE_75,304,22,15,15 diff --git a/base/applications/osk/lang/tr-TR.rc b/base/applications/osk/lang/tr-TR.rc index 179545d9bb5..720e7137852 100644 --- a/base/applications/osk/lang/tr-TR.rc +++ b/base/applications/osk/lang/tr-TR.rc @@ -85,11 +85,11 @@ BEGIN PUSHBUTTON ".",SCAN_CODE_55,307,113,23,22 PUSHBUTTON "Shift",SCAN_CODE_57,334,113,67,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "Ctrl",SCAN_CODE_58,3,139,41,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_127,48,139,30,22,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_127,48,139,30,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "Alt",SCAN_CODE_60,82,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "",SCAN_CODE_61,116,139,143,22 PUSHBUTTON "Alt",SCAN_CODE_62,264,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,298,139,30,22,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_128,298,139,30,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "Menü",SCAN_CODE_129,332,139,30,22,BS_ICON PUSHBUTTON "Ctrl",SCAN_CODE_64,366,139,35,22,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "Ins",SCAN_CODE_75,411,35,23,22 @@ -205,11 +205,11 @@ BEGIN PUSHBUTTON "shift",SCAN_CODE_57,254,79,45,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "v",SCAN_CODE_84,324,98,15,15,BS_ICON - PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "",SCAN_CODE_61,84,98,106,15 //space PUSHBUTTON "alt",SCAN_CODE_62,194,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "menu",SCAN_CODE_129,248,98,24,15,BS_ICON PUSHBUTTON "ctrl",SCAN_CODE_64,275,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ins",SCAN_CODE_75,304,22,15,15 diff --git a/base/applications/osk/lang/zh-CN.rc b/base/applications/osk/lang/zh-CN.rc index 2ccaa37269b..69b88370bb7 100644 --- a/base/applications/osk/lang/zh-CN.rc +++ b/base/applications/osk/lang/zh-CN.rc @@ -88,11 +88,11 @@ BEGIN PUSHBUTTON "/",SCAN_CODE_55,307,113,23,22 PUSHBUTTON "shift",SCAN_CODE_57,334,113,67,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ctrl",SCAN_CODE_58,3,139,41,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_127,48,139,30,22,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_127,48,139,30,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "alt",SCAN_CODE_60,82,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "",SCAN_CODE_61,116,139,143,22 PUSHBUTTON "alt gr",SCAN_CODE_62,264,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,298,139,30,22,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_128,298,139,30,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "menu",SCAN_CODE_129,332,139,30,22,BS_ICON PUSHBUTTON "ctrl",SCAN_CODE_64,366,139,35,22,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ins",SCAN_CODE_75,411,35,23,22 @@ -208,11 +208,11 @@ BEGIN PUSHBUTTON "shift",SCAN_CODE_57,254,79,45,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "v",SCAN_CODE_84,324,98,15,15,BS_ICON - PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "",SCAN_CODE_61,84,98,106,15 //space PUSHBUTTON "alt",SCAN_CODE_62,194,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "menu",SCAN_CODE_129,248,98,24,15,BS_ICON PUSHBUTTON "ctrl",SCAN_CODE_64,275,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ins",SCAN_CODE_75,304,22,15,15 diff --git a/base/applications/osk/lang/zh-TW.rc b/base/applications/osk/lang/zh-TW.rc index 02d980a6cfc..19da7d034fc 100644 --- a/base/applications/osk/lang/zh-TW.rc +++ b/base/applications/osk/lang/zh-TW.rc @@ -87,11 +87,11 @@ BEGIN PUSHBUTTON "/",SCAN_CODE_55,307,113,23,22 PUSHBUTTON "shift",SCAN_CODE_57,334,113,67,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ctrl",SCAN_CODE_58,3,139,41,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_127,48,139,30,22,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_127,48,139,30,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "alt",SCAN_CODE_60,82,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "",SCAN_CODE_61,116,139,143,22 PUSHBUTTON "alt gr",SCAN_CODE_62,264,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,298,139,30,22,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_128,298,139,30,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "menu",SCAN_CODE_129,332,139,30,22,BS_ICON PUSHBUTTON "ctrl",SCAN_CODE_64,366,139,35,22,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ins",SCAN_CODE_75,411,35,23,22 @@ -207,11 +207,11 @@ BEGIN PUSHBUTTON "shift",SCAN_CODE_57,254,79,45,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "v",SCAN_CODE_84,324,98,15,15,BS_ICON - PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "",SCAN_CODE_61,84,98,106,15 //space PUSHBUTTON "alt",SCAN_CODE_62,194,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON + PUSHBUTTON "ROS",SCAN_CODE_128,221,98,24,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "menu",SCAN_CODE_129,248,98,24,15,BS_ICON PUSHBUTTON "ctrl",SCAN_CODE_64,275,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ins",SCAN_CODE_75,304,22,15,15

1 0

[reactos] 01/01: [CDFS][FLOPPY_NEW] Simplify unsupported NT6.2+ workarounds (#2956)
by Serge Gautherie 18 Jul '20

18 Jul '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=89971a37577590899e044… commit 89971a37577590899e044cff39e4f857d5c54007 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Sat Jul 18 15:31:48 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Jul 18 15:31:48 2020 +0200 [CDFS][FLOPPY_NEW] Simplify unsupported NT6.2+ workarounds (#2956) --- drivers/filesystems/cdfs/cdprocs.h | 26 ++++--------- drivers/storage/floppy_new/floppy.c | 73 +++---------------------------------- 2 files changed, 14 insertions(+), 85 deletions(-) diff --git a/drivers/filesystems/cdfs/cdprocs.h b/drivers/filesystems/cdfs/cdprocs.h index d90591772d2..442b8902c65 100644 --- a/drivers/filesystems/cdfs/cdprocs.h +++ b/drivers/filesystems/cdfs/cdprocs.h @@ -55,6 +55,14 @@ Abstract: #pragma warning( pop ) #endif +#ifdef __REACTOS__ +// Downgrade unsupported NT6.2+ features. +#undef MdlMappingNoExecute +#define MdlMappingNoExecute 0 +#define NonPagedPoolNx NonPagedPool +#define NonPagedPoolNxCacheAligned NonPagedPoolCacheAligned +#endif + //**** x86 compiler bug **** #if defined(_M_IX86) @@ -372,7 +380,6 @@ CdHijackIrpAndFlushDevice ( // ); // -#ifndef __REACTOS__ #define CdMapUserBuffer(IC, UB) { \ *(UB) = (PVOID) ( ((IC)->Irp->MdlAddress == NULL) ? \ (IC)->Irp->UserBuffer : \ @@ -382,18 +389,6 @@ CdHijackIrpAndFlushDevice ( } \ } -#else -#define CdMapUserBuffer(IC, UB) { \ - *(UB) = (PVOID) ( ((IC)->Irp->MdlAddress == NULL) ? \ - (IC)->Irp->UserBuffer : \ - (MmGetSystemAddressForMdlSafe( (IC)->Irp->MdlAddress, NormalPagePriority))); \ - if (NULL == *(UB)) { \ - CdRaiseStatus( (IC), STATUS_INSUFFICIENT_RESOURCES); \ - } \ - } - -#endif - #define CdLockUserBuffer(IC,BL,OP) { \ if ((IC)->Irp->MdlAddress == NULL) { \ @@ -1383,13 +1378,8 @@ CdProcessToc ( // #define CdPagedPool PagedPool -#ifndef __REACTOS__ #define CdNonPagedPool NonPagedPoolNx #define CdNonPagedPoolCacheAligned NonPagedPoolNxCacheAligned -#else -#define CdNonPagedPool NonPagedPool -#define CdNonPagedPoolCacheAligned NonPagedPoolCacheAligned -#endif // diff --git a/drivers/storage/floppy_new/floppy.c b/drivers/storage/floppy_new/floppy.c index 90f0615adfd..16c30dcb9ec 100644 --- a/drivers/storage/floppy_new/floppy.c +++ b/drivers/storage/floppy_new/floppy.c @@ -46,6 +46,12 @@ Revision History: #include <ntstrsafe.h> #include <intsafe.h> +#ifdef __REACTOS__ +// Downgrade unsupported NT6.2+ features. +#define NonPagedPoolNx NonPagedPool +#define NonPagedPoolNxCacheAligned NonPagedPoolCacheAligned +#endif + #define MODE_DATA_SIZE 192 #define SCSI_FLOPPY_TIMEOUT 20 #define SFLOPPY_SRB_LIST_SIZE 4 @@ -834,11 +840,7 @@ ScsiFlopInitDevice( // Allocate request sense buffer. // -#ifndef __REACTOS__ senseData = ExAllocatePool(NonPagedPoolNxCacheAligned, SENSE_BUFFER_SIZE); -#else - senseData = ExAllocatePool(NonPagedPoolCacheAligned, SENSE_BUFFER_SIZE); -#endif if (senseData == NULL) { @@ -1160,11 +1162,7 @@ Return Value: // Irp->IoStatus.Information = 0; -#ifndef __REACTOS__ srb = ExAllocatePool(NonPagedPoolNx, SCSI_REQUEST_BLOCK_SIZE); -#else - srb = ExAllocatePool(NonPagedPool, SCSI_REQUEST_BLOCK_SIZE); -#endif if (srb == NULL) { @@ -1530,11 +1528,7 @@ Return Value: // Determine if the device is writable. // -#ifndef __REACTOS__ modeData = ExAllocatePool(NonPagedPoolNxCacheAligned, MODE_DATA_SIZE); -#else - modeData = ExAllocatePool(NonPagedPoolCacheAligned, MODE_DATA_SIZE); -#endif if (modeData == NULL) { status = STATUS_INSUFFICIENT_RESOURCES; @@ -1845,20 +1839,12 @@ Return Value: // Allocate a Srb for the read command. // -#ifndef __REACTOS__ readData = ExAllocatePool(NonPagedPoolNx, geometry->BytesPerSector); -#else - readData = ExAllocatePool(NonPagedPool, geometry->BytesPerSector); -#endif if (readData == NULL) { return STATUS_NO_MEMORY; } -#ifndef __REACTOS__ srb = ExAllocatePool(NonPagedPoolNx, SCSI_REQUEST_BLOCK_SIZE); -#else - srb = ExAllocatePool(NonPagedPool, SCSI_REQUEST_BLOCK_SIZE); -#endif if (srb == NULL) { @@ -1948,11 +1934,7 @@ Return Value: return(diskData->DriveType); } -#ifndef __REACTOS__ modeData = ExAllocatePool(NonPagedPoolNxCacheAligned, MODE_DATA_SIZE); -#else - modeData = ExAllocatePool(NonPagedPoolCacheAligned, MODE_DATA_SIZE); -#endif if (modeData == NULL) { return(DRIVE_TYPE_NONE); @@ -2217,11 +2199,7 @@ Return Value: PAGED_CODE(); -#ifndef __REACTOS__ modeData = ExAllocatePool(NonPagedPoolNxCacheAligned, MODE_DATA_SIZE); -#else - modeData = ExAllocatePool(NonPagedPoolCacheAligned, MODE_DATA_SIZE); -#endif if (modeData == NULL) { return(STATUS_INSUFFICIENT_RESOURCES); @@ -2320,11 +2298,7 @@ Return Value: // Allocate a Srb for the format command. // -#ifndef __REACTOS__ srb = ExAllocatePool(NonPagedPoolNx, SCSI_REQUEST_BLOCK_SIZE); -#else - srb = ExAllocatePool(NonPagedPool, SCSI_REQUEST_BLOCK_SIZE); -#endif if (srb == NULL) { @@ -2384,11 +2358,7 @@ Return Value: // Allocate a Srb for the format command. // -#ifndef __REACTOS__ srb = ExAllocatePool(NonPagedPoolNx, SCSI_REQUEST_BLOCK_SIZE); -#else - srb = ExAllocatePool(NonPagedPool, SCSI_REQUEST_BLOCK_SIZE); -#endif if (srb == NULL) { return(STATUS_INSUFFICIENT_RESOURCES); @@ -2514,13 +2484,8 @@ Return Value: DebugPrint((2,"Sending SCSIOP_START_STOP_UNIT\n")); -#ifndef __REACTOS__ context = ExAllocatePool(NonPagedPoolNx, sizeof(COMPLETION_CONTEXT)); -#else - context = ExAllocatePool(NonPagedPool, - sizeof(COMPLETION_CONTEXT)); -#endif if (context == NULL) { @@ -2599,11 +2564,7 @@ Return Value: context = NULL; if (!overFlow) { -#ifndef __REACTOS__ context = ExAllocatePool(NonPagedPoolNx, sizeNeeded); -#else - context = ExAllocatePool(NonPagedPool, sizeNeeded); -#endif } if (context == NULL) { @@ -2765,11 +2726,7 @@ Return Value: driveMediaConstants->SectorsPerTrack * driveMediaConstants->BytesPerSector; -#ifndef __REACTOS__ buffer = ExAllocatePool(NonPagedPoolNxCacheAligned, length); -#else - buffer = ExAllocatePool(NonPagedPoolCacheAligned, length); -#endif if (buffer == NULL) { return(STATUS_INSUFFICIENT_RESOURCES); @@ -3051,11 +3008,7 @@ Return Value: // Allocate an SRB for the SCSIOP_READ_FORMATTED_CAPACITY request // -#ifndef __REACTOS__ srb = ExAllocatePool(NonPagedPoolNx, SCSI_REQUEST_BLOCK_SIZE); -#else - srb = ExAllocatePool(NonPagedPool, SCSI_REQUEST_BLOCK_SIZE); -#endif if (srb == NULL) { @@ -3071,11 +3024,7 @@ Return Value: ASSERT(dataTransferLength < 0x100); -#ifndef __REACTOS__ dataBuffer = ExAllocatePool(NonPagedPoolNx, dataTransferLength); -#else - dataBuffer = ExAllocatePool(NonPagedPool, dataTransferLength); -#endif if (dataBuffer == NULL) { @@ -3425,11 +3374,7 @@ Return Value: // Allocate an SRB for the SCSIOP_FORMAT_UNIT request // -#ifndef __REACTOS__ srb = ExAllocatePool(NonPagedPoolNx, SCSI_REQUEST_BLOCK_SIZE); -#else - srb = ExAllocatePool(NonPagedPool, SCSI_REQUEST_BLOCK_SIZE); -#endif if (srb == NULL) { @@ -3438,13 +3383,8 @@ Return Value: // Allocate a transfer buffer for the SCSIOP_FORMAT_UNIT parameter list // -#ifndef __REACTOS__ parameterList = ExAllocatePool(NonPagedPoolNx, sizeof(FORMAT_UNIT_PARAMETER_LIST)); -#else - parameterList = ExAllocatePool(NonPagedPool, - sizeof(FORMAT_UNIT_PARAMETER_LIST)); -#endif if (parameterList == NULL) { @@ -3573,4 +3513,3 @@ Return Value: return status; } -

1 0

[reactos] 01/01: [NTOS:FSTUB] Simplify xHalIoReadPartitionTable function Use single IOCTL (IOCTL_DISK_GET_DRIVE_GEOMETRY_EX) for retrieving disk basic geometry information along with disk size. Previous implementation used to issue two requests for that.
by Victor Perevertkin 15 Jul '20

15 Jul '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5201472be77f8149786b8… commit 5201472be77f8149786b8d12fba8f2846b4a601e Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Wed Jul 15 03:20:13 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Wed Jul 15 03:20:13 2020 +0300 [NTOS:FSTUB] Simplify xHalIoReadPartitionTable function Use single IOCTL (IOCTL_DISK_GET_DRIVE_GEOMETRY_EX) for retrieving disk basic geometry information along with disk size. Previous implementation used to issue two requests for that. --- ntoskrnl/fstub/disksup.c | 77 ++++++++++-------------------------------------- 1 file changed, 15 insertions(+), 62 deletions(-) diff --git a/ntoskrnl/fstub/disksup.c b/ntoskrnl/fstub/disksup.c index 3198481fb5d..3c6119a2f85 100644 --- a/ntoskrnl/fstub/disksup.c +++ b/ntoskrnl/fstub/disksup.c @@ -1387,14 +1387,12 @@ xHalIoAssignDriveLetters(IN PLOADER_PARAMETER_BLOCK LoaderBlock, NTSTATUS NTAPI HalpGetFullGeometry(IN PDEVICE_OBJECT DeviceObject, - IN PDISK_GEOMETRY Geometry, - OUT PULONGLONG RealSectorCount) + OUT PDISK_GEOMETRY_EX Geometry) { PIRP Irp; IO_STATUS_BLOCK IoStatusBlock; PKEVENT Event; NTSTATUS Status; - PARTITION_INFORMATION PartitionInfo; PAGED_CODE(); /* Allocate a non-paged event */ @@ -1407,12 +1405,12 @@ HalpGetFullGeometry(IN PDEVICE_OBJECT DeviceObject, KeInitializeEvent(Event, NotificationEvent, FALSE); /* Build the IRP */ - Irp = IoBuildDeviceIoControlRequest(IOCTL_DISK_GET_DRIVE_GEOMETRY, + Irp = IoBuildDeviceIoControlRequest(IOCTL_DISK_GET_DRIVE_GEOMETRY_EX, DeviceObject, NULL, 0UL, Geometry, - sizeof(DISK_GEOMETRY), + sizeof(DISK_GEOMETRY_EX), FALSE, Event, &IoStatusBlock); @@ -1432,47 +1430,6 @@ HalpGetFullGeometry(IN PDEVICE_OBJECT DeviceObject, Status = IoStatusBlock.Status; } - /* Check if the driver returned success */ - if(NT_SUCCESS(Status)) - { - /* Build another IRP */ - Irp = IoBuildDeviceIoControlRequest(IOCTL_DISK_GET_PARTITION_INFO, - DeviceObject, - NULL, - 0UL, - &PartitionInfo, - sizeof(PARTITION_INFORMATION), - FALSE, - Event, - &IoStatusBlock); - if (!Irp) - { - /* Fail, free the event */ - ExFreePoolWithTag(Event, TAG_FILE_SYSTEM); - return STATUS_INSUFFICIENT_RESOURCES; - } - - /* Reset event */ - KeClearEvent(Event); - - /* Call the driver and check if it's pending */ - Status = IoCallDriver(DeviceObject, Irp); - if (Status == STATUS_PENDING) - { - /* Wait on the driver */ - KeWaitForSingleObject(Event, Executive, KernelMode, FALSE, NULL); - Status = IoStatusBlock.Status; - } - - /* Check if the driver returned success */ - if(NT_SUCCESS(Status)) - { - /* Get the number of sectors */ - *RealSectorCount = (PartitionInfo.PartitionLength.QuadPart / - Geometry->BytesPerSector); - } - } - /* Free the event and return the Status */ ExFreePoolWithTag(Event, TAG_FILE_SYSTEM); return Status; @@ -1823,9 +1780,8 @@ xHalIoReadPartitionTable(IN PDEVICE_OBJECT DeviceObject, ULONG BufferSize = 2048, InputSize; PDRIVE_LAYOUT_INFORMATION DriveLayoutInfo = NULL; LONG j = -1, i = -1, k; - DISK_GEOMETRY DiskGeometry; + DISK_GEOMETRY_EX DiskGeometryEx; LONGLONG EndSector, MaxSector, StartOffset; - ULONGLONG MaxOffset; LARGE_INTEGER Offset, VolumeOffset; BOOLEAN IsPrimary = TRUE, IsEzDrive = FALSE, MbrFound = FALSE; BOOLEAN IsValid, IsEmpty = TRUE; @@ -1856,7 +1812,7 @@ xHalIoReadPartitionTable(IN PDEVICE_OBJECT DeviceObject, } /* Get drive geometry */ - Status = HalpGetFullGeometry(DeviceObject, &DiskGeometry, &MaxOffset); + Status = HalpGetFullGeometry(DeviceObject, &DiskGeometryEx); if (!NT_SUCCESS(Status)) { ExFreePoolWithTag(*PartitionBuffer, TAG_FILE_SYSTEM); @@ -1865,10 +1821,10 @@ xHalIoReadPartitionTable(IN PDEVICE_OBJECT DeviceObject, } /* Get the end and maximum sector */ - EndSector = MaxOffset; - MaxSector = MaxOffset << 1; - DPRINT("FSTUB: MaxOffset = %#I64x, MaxSector = %#I64x\n", - MaxOffset, MaxSector); + EndSector = DiskGeometryEx.DiskSize.QuadPart / DiskGeometryEx.Geometry.BytesPerSector; + MaxSector = EndSector << 1; + DPRINT("FSTUB: DiskSize = %#I64x, MaxSector = %#I64x\n", + DiskGeometryEx.DiskSize, MaxSector); /* Allocate our buffer */ Buffer = ExAllocatePoolWithTag(NonPagedPool, InputSize, TAG_FILE_SYSTEM); @@ -1970,13 +1926,12 @@ xHalIoReadPartitionTable(IN PDEVICE_OBJECT DeviceObject, if (PartitionType == EFI_PMBR_OSTYPE_EFI) { /* Partition length might be bigger than disk size */ - FstubFixupEfiPartition(PartitionDescriptor, - MaxOffset); + FstubFixupEfiPartition(PartitionDescriptor, DiskGeometryEx.DiskSize.QuadPart); } /* Make sure that the partition is valid, unless it's the first */ if (!(HalpIsValidPartitionEntry(PartitionDescriptor, - MaxOffset, + DiskGeometryEx.DiskSize.QuadPart, MaxSector)) && (j == 0)) { /* It's invalid, so fail */ @@ -2158,7 +2113,7 @@ xHalIoReadPartitionTable(IN PDEVICE_OBJECT DeviceObject, } while (Offset.HighPart | Offset.LowPart); /* Check if this is a removable device that's probably a super-floppy */ - if ((DiskGeometry.MediaType == RemovableMedia) && + if ((DiskGeometryEx.Geometry.MediaType == RemovableMedia) && (j == 0) && (MbrFound) && (IsEmpty)) { PBOOT_SECTOR_INFO BootSectorInfo = (PBOOT_SECTOR_INFO)Buffer; @@ -2179,7 +2134,7 @@ xHalIoReadPartitionTable(IN PDEVICE_OBJECT DeviceObject, if (j == -1) { /* The likely cause is the super floppy detection above */ - if ((MbrFound) || (DiskGeometry.MediaType == RemovableMedia)) + if ((MbrFound) || (DiskGeometryEx.Geometry.MediaType == RemovableMedia)) { /* Print out debugging information */ DPRINT1("FSTUB: Drive %#p has no valid MBR. Make it into a " @@ -2187,7 +2142,7 @@ xHalIoReadPartitionTable(IN PDEVICE_OBJECT DeviceObject, DeviceObject); DPRINT1("FSTUB: Drive has %I64d sectors and is %#016I64x " "bytes large\n", - EndSector, EndSector * DiskGeometry.BytesPerSector); + EndSector, DiskGeometryEx.DiskSize); /* We should at least have some sectors */ if (EndSector > 0) @@ -2202,9 +2157,7 @@ xHalIoReadPartitionTable(IN PDEVICE_OBJECT DeviceObject, PartitionInfo->BootIndicator = FALSE; PartitionInfo->HiddenSectors = 0; PartitionInfo->StartingOffset.QuadPart = 0; - PartitionInfo->PartitionLength.QuadPart = (EndSector * - DiskGeometry. - BytesPerSector); + PartitionInfo->PartitionLength = DiskGeometryEx.DiskSize; /* FIXME: REACTOS HACK */ PartitionInfo->PartitionNumber = 0;

1 0

[reactos] 01/01: [LIBMPG123] Update to version 1.26.2. CORE-17158
by Thomas Faber 12 Jul '20

12 Jul '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=64abd9fca8b6ebaba8769… commit 64abd9fca8b6ebaba8769ca249b7fba2dde716a2 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sun Jul 12 12:26:47 2020 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Jul 12 12:28:05 2020 +0200 [LIBMPG123] Update to version 1.26.2. CORE-17158 --- sdk/include/reactos/libs/libmpg123/config.h | 12 +++++++++--- sdk/include/reactos/libs/libmpg123/mpg123.h | 2 +- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/sdk/include/reactos/libs/libmpg123/config.h b/sdk/include/reactos/libs/libmpg123/config.h index 54697efe40f..9320b5f39e4 100644 --- a/sdk/include/reactos/libs/libmpg123/config.h +++ b/sdk/include/reactos/libs/libmpg123/config.h @@ -395,7 +395,7 @@ #define PACKAGE_NAME "mpg123" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "mpg123 1.26.1" +#define PACKAGE_STRING "mpg123 1.26.2" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "mpg123" @@ -404,7 +404,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.26.1" +#define PACKAGE_VERSION "1.26.2" /* Define if portaudio v18 API is wanted. */ /* #undef PORTAUDIO18 */ @@ -415,6 +415,9 @@ /* The size of `long', as computed by sizeof. */ #define SIZEOF_LONG 4 +/* The size of `off64_t', as computed by sizeof. */ +#define SIZEOF_OFF64_T 8 + /* The size of `off_t', as computed by sizeof. */ #define SIZEOF_OFF_T 4 @@ -440,7 +443,7 @@ /* #undef USE_YASM_FOR_AVX */ /* Version number of package */ -#define VERSION "1.26.1" +#define VERSION "1.26.2" /* Define to use Win32 named pipes */ #define WANT_WIN32_FIFO 1 @@ -448,6 +451,9 @@ /* Define to use Win32 sockets */ #define WANT_WIN32_SOCKETS 1 +/* Windows UWP build */ +/* #undef WINDOWS_UWP */ + /* Define to use Unicode for Windows */ #define WANT_WIN32_UNICODE 1 diff --git a/sdk/include/reactos/libs/libmpg123/mpg123.h b/sdk/include/reactos/libs/libmpg123/mpg123.h index 9cab00424d9..34b8a2f0db7 100644 --- a/sdk/include/reactos/libs/libmpg123/mpg123.h +++ b/sdk/include/reactos/libs/libmpg123/mpg123.h @@ -1,5 +1,5 @@ /* - libmpg123: MPEG Audio Decoder library (version 1.26.1) + libmpg123: MPEG Audio Decoder library (version 1.26.2) copyright 1995-2015 by the mpg123 project free software under the terms of the LGPL 2.1

1 0

[reactos] 01/01: [MSGINA] gui: Improve 'DlgData_Destroy()'
by Serge Gautherie 10 Jul '20

10 Jul '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d6c44112073a23525501c… commit d6c44112073a23525501cf4435a94a0c39a7996d Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Tue Mar 31 09:39:16 2020 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Jul 11 01:44:26 2020 +0200 [MSGINA] gui: Improve 'DlgData_Destroy()' Addendum to 623dd26ccea5e79001aee769c230fb4f8e304fc8. --- dll/win32/msgina/gui.c | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/dll/win32/msgina/gui.c b/dll/win32/msgina/gui.c index 3cb30bb638f..106a4ebcb96 100644 --- a/dll/win32/msgina/gui.c +++ b/dll/win32/msgina/gui.c @@ -86,14 +86,29 @@ DlgData_LoadBitmaps(_Inout_ PDLG_DATA pDlgData) } } -static void -DlgData_Destroy(PDLG_DATA pDlgData) +static VOID +DlgData_Destroy(_Inout_ HWND hwndDlg) { + PDLG_DATA pDlgData; + + pDlgData = (PDLG_DATA)GetWindowLongPtrW(hwndDlg, GWLP_USERDATA); if (!pDlgData) + { return; + } + + SetWindowLongPtrW(hwndDlg, GWLP_USERDATA, (LONG_PTR)NULL); + + if (pDlgData->hBarBitmap) + { + DeleteObject(pDlgData->hBarBitmap); + } + + if (pDlgData->hLogoBitmap) + { + DeleteObject(pDlgData->hLogoBitmap); + } - DeleteObject(pDlgData->hLogoBitmap); - DeleteObject(pDlgData->hBarBitmap); HeapFree(GetProcessHeap(), 0, pDlgData); } @@ -264,7 +279,7 @@ StatusDialogProc( { KillTimer(hwndDlg, IDT_BAR); } - DlgData_Destroy(pDlgData); + DlgData_Destroy(hwndDlg); return TRUE; } } @@ -434,7 +449,7 @@ WelcomeDialogProc( } case WM_DESTROY: { - DlgData_Destroy(pDlgData); + DlgData_Destroy(hwndDlg); return TRUE; } } @@ -1230,7 +1245,7 @@ LogonDialogProc( } case WM_DESTROY: - DlgData_Destroy(pDlgData); + DlgData_Destroy(hwndDlg); return TRUE; case WM_COMMAND: @@ -1489,7 +1504,7 @@ UnlockDialogProc( return TRUE; } case WM_DESTROY: - DlgData_Destroy(pDlgData); + DlgData_Destroy(hwndDlg); return TRUE; case WM_COMMAND: @@ -1577,7 +1592,7 @@ LockedDialogProc( } case WM_DESTROY: { - DlgData_Destroy(pDlgData); + DlgData_Destroy(hwndDlg); return TRUE; } }

1 0

[reactos] 01/01: Merge pull request #2900 from SergeGautherie/SergeGautherie/PRonly_3rdPartyFiles-txt_chmc-lzxcomp
by Serge Gautherie 10 Jul '20

10 Jul '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bd593ed36631b78929847… commit bd593ed36631b78929847528805ac9defcaa4eab Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Sat Jul 11 01:38:15 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Jul 11 01:38:15 2020 +0200 Merge pull request #2900 from SergeGautherie/SergeGautherie/PRonly_3rdPartyFiles-txt_chmc-lzxcomp [3rd Party Files.txt] Add 'chmc and lzxcomp' entry --- media/doc/3rd Party Files.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/media/doc/3rd Party Files.txt b/media/doc/3rd Party Files.txt index 40c7a2067e6..dbca0168fb5 100644 --- a/media/doc/3rd Party Files.txt +++ b/media/doc/3rd Party Files.txt @@ -98,3 +98,7 @@ Website: https://acpica.org/ Title: Schily Tools, mkisofs Used Version: schily-2017-09-07 Website: https://sourceforge.net/projects/schilytools/ + +Title: chmc and lzxcomp +Used Version: ??? (Imported on 2015.08.11.) +Website: https://sourceforge.net/projects/chmc/

1 0

[reactos] 01/01: [TASKMGR] CachedGetUserFromSid(): Fix user name length on cache hit
by Serge Gautherie 10 Jul '20

10 Jul '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f91144364b87a7e707935… commit f91144364b87a7e7079355778075cb937dcefcb3 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Wed Jun 10 10:09:14 2020 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Jul 11 01:37:53 2020 +0200 [TASKMGR] CachedGetUserFromSid(): Fix user name length on cache hit --- base/applications/taskmgr/perfdata.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/base/applications/taskmgr/perfdata.c b/base/applications/taskmgr/perfdata.c index 353ee823cab..a19c0cb0d97 100644 --- a/base/applications/taskmgr/perfdata.c +++ b/base/applications/taskmgr/perfdata.c @@ -144,16 +144,16 @@ CachedGetUserFromSid( if (EqualSid((PSID)&pEntry->Data, pSid)) { wcsncpy(pUserName, pEntry->pszName, cwcUserName); - *pcwcUserName = cwcUserName; + *pcwcUserName = wcslen(pUserName); return; } } /* We didn't find the SID in the list, get the name conventional */ SidToUserName(pSid, pUserName, cwcUserName); + *pcwcUserName = wcslen(pUserName); /* Allocate a new entry */ - *pcwcUserName = wcslen(pUserName); cwcUserName = *pcwcUserName + 1; cbSid = GetLengthSid(pSid); pEntry = HeapAlloc(GetProcessHeap(), 0, sizeof(SIDTOUSERNAME) + cbSid + cwcUserName * sizeof(WCHAR));

1 0

[reactos] 01/01: [AUDIOSRV] logmsg(): Disable its file part
by Serge Gautherie 10 Jul '20

10 Jul '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=353b5440474f3bf2c9dd1… commit 353b5440474f3bf2c9dd16eee11bd42f11ea5d6d Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Sat Apr 18 16:40:42 2020 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Jul 11 01:22:56 2020 +0200 [AUDIOSRV] logmsg(): Disable its file part Mininal workaround for CORE-16814 --- base/services/audiosrv/debug.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/base/services/audiosrv/debug.c b/base/services/audiosrv/debug.c index df821afb51e..c19aada3538 100644 --- a/base/services/audiosrv/debug.c +++ b/base/services/audiosrv/debug.c @@ -4,10 +4,14 @@ #include <stdio.h> +// FIXME: Disabled to work around CORE-16814 (and CORE-16912). +// #define ENABLE_LOGMSG_FILE + void logmsg(char* string, ...) { va_list args; +#ifdef ENABLE_LOGMSG_FILE FILE* debug_file = fopen("c:\\audiosrv-debug.txt", "a"); if (debug_file) @@ -18,6 +22,7 @@ void logmsg(char* string, ...) fclose(debug_file); } else +#endif { char buf[256]; va_start(args, string);

1 0

[reactos] 03/03: [APISETS] api-ms-win-core-localization-l1-2-1: Is NT6.3+ actually
by Serge Gautherie 10 Jul '20

10 Jul '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=db2aa4c8ca1e3485e6fa3… commit db2aa4c8ca1e3485e6fa3c42de93cf9e83a1dbbe Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Wed May 20 23:42:59 2020 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Jul 11 01:16:38 2020 +0200 [APISETS] api-ms-win-core-localization-l1-2-1: Is NT6.3+ actually CORE-17095 --- .../api-ms-win-core-localization-l1-2-1.spec | 120 ++++++++++----------- 1 file changed, 60 insertions(+), 60 deletions(-) diff --git a/dll/apisets/api-ms-win-core-localization-l1-2-1.spec b/dll/apisets/api-ms-win-core-localization-l1-2-1.spec index d1e096d9979..87e682a1e1e 100644 --- a/dll/apisets/api-ms-win-core-localization-l1-2-1.spec +++ b/dll/apisets/api-ms-win-core-localization-l1-2-1.spec @@ -1,63 +1,63 @@ # This file is autogenerated by update.py -@ stdcall ConvertDefaultLocale() kernel32.ConvertDefaultLocale -@ stdcall EnumSystemGeoID() kernel32.EnumSystemGeoID -@ stdcall EnumSystemLocalesA() kernel32.EnumSystemLocalesA -@ stdcall -version=0x600+ EnumSystemLocalesEx() kernel32.EnumSystemLocalesEx -@ stdcall EnumSystemLocalesW() kernel32.EnumSystemLocalesW -@ stdcall -version=0x600+ FindNLSString() kernel32.FindNLSString -@ stdcall -version=0x600+ FindNLSStringEx() kernel32.FindNLSStringEx -@ stdcall FormatMessageA() kernel32.FormatMessageA -@ stdcall FormatMessageW() kernel32.FormatMessageW -@ stdcall GetACP() kernel32.GetACP -@ stdcall GetCPInfo() kernel32.GetCPInfo -@ stdcall GetCPInfoExW() kernel32.GetCPInfoExW -@ stdcall -version=0x600+ GetCalendarInfoEx() kernel32.GetCalendarInfoEx -@ stdcall GetCalendarInfoW() kernel32.GetCalendarInfoW -@ stdcall -version=0x600+ GetFileMUIInfo() kernel32.GetFileMUIInfo -@ stdcall -version=0x600+ GetFileMUIPath() kernel32.GetFileMUIPath -@ stdcall GetGeoInfoW() kernel32.GetGeoInfoW -@ stdcall GetLocaleInfoA() kernel32.GetLocaleInfoA -@ stdcall -version=0x600+ GetLocaleInfoEx() kernel32.GetLocaleInfoEx -@ stdcall GetLocaleInfoW() kernel32.GetLocaleInfoW -@ stdcall GetNLSVersion() kernel32.GetNLSVersion -@ stdcall -version=0x600+ GetNLSVersionEx() kernel32.GetNLSVersionEx -@ stdcall GetOEMCP() kernel32.GetOEMCP -@ stub GetProcessPreferredUILanguages -@ stdcall GetSystemDefaultLCID() kernel32.GetSystemDefaultLCID -@ stdcall GetSystemDefaultLangID() kernel32.GetSystemDefaultLangID -@ stdcall -version=0x600+ GetSystemPreferredUILanguages() kernel32.GetSystemPreferredUILanguages -@ stdcall GetThreadLocale() kernel32.GetThreadLocale -@ stdcall -version=0x600+ GetThreadPreferredUILanguages() kernel32.GetThreadPreferredUILanguages -@ stdcall -version=0x600+ GetThreadUILanguage() kernel32.GetThreadUILanguage -@ stdcall -version=0x600+ GetUILanguageInfo() kernel32.GetUILanguageInfo -@ stdcall GetUserDefaultLCID() kernel32.GetUserDefaultLCID -@ stdcall GetUserDefaultLangID() kernel32.GetUserDefaultLangID -@ stdcall -version=0x600+ GetUserDefaultLocaleName() kernel32.GetUserDefaultLocaleName -@ stdcall GetUserGeoID() kernel32.GetUserGeoID -@ stdcall -version=0x600+ GetUserPreferredUILanguages() kernel32.GetUserPreferredUILanguages -@ stdcall -version=0x600+ IdnToAscii() kernel32.IdnToAscii -@ stdcall -version=0x600+ IdnToUnicode() kernel32.IdnToUnicode -@ stdcall IsDBCSLeadByte() kernel32.IsDBCSLeadByte -@ stdcall IsDBCSLeadByteEx() kernel32.IsDBCSLeadByteEx -@ stdcall IsNLSDefinedString() kernel32.IsNLSDefinedString -@ stdcall IsValidCodePage() kernel32.IsValidCodePage -@ stdcall IsValidLanguageGroup() kernel32.IsValidLanguageGroup -@ stdcall IsValidLocale() kernel32.IsValidLocale -@ stub IsValidLocaleName -@ stub IsValidNLSVersion -@ stdcall LCMapStringA() kernel32.LCMapStringA -@ stdcall -version=0x600+ LCMapStringEx() kernel32.LCMapStringEx -@ stdcall LCMapStringW() kernel32.LCMapStringW -@ stdcall -version=0x600+ LocaleNameToLCID() kernel32.LocaleNameToLCID -@ stub ResolveLocaleName -@ stdcall SetCalendarInfoW() kernel32.SetCalendarInfoW -@ stdcall SetLocaleInfoW() kernel32.SetLocaleInfoW -@ stub SetProcessPreferredUILanguages -@ stdcall SetThreadLocale() kernel32.SetThreadLocale -@ stdcall -version=0x600+ SetThreadPreferredUILanguages() kernel32.SetThreadPreferredUILanguages -@ stdcall SetThreadUILanguage() kernel32.SetThreadUILanguage -@ stdcall SetUserGeoID() kernel32.SetUserGeoID -@ stdcall VerLanguageNameA() kernel32.VerLanguageNameA -@ stdcall VerLanguageNameW() kernel32.VerLanguageNameW +@ stdcall -version=0x603+ ConvertDefaultLocale() kernel32.ConvertDefaultLocale +@ stdcall -version=0x603+ EnumSystemGeoID() kernel32.EnumSystemGeoID +@ stdcall -version=0x603+ EnumSystemLocalesA() kernel32.EnumSystemLocalesA +@ stdcall -version=0x603+ EnumSystemLocalesEx() kernel32.EnumSystemLocalesEx +@ stdcall -version=0x603+ EnumSystemLocalesW() kernel32.EnumSystemLocalesW +@ stdcall -version=0x603+ FindNLSString() kernel32.FindNLSString +@ stdcall -version=0x603+ FindNLSStringEx() kernel32.FindNLSStringEx +@ stdcall -version=0x603+ FormatMessageA() kernel32.FormatMessageA +@ stdcall -version=0x603+ FormatMessageW() kernel32.FormatMessageW +@ stdcall -version=0x603+ GetACP() kernel32.GetACP +@ stdcall -version=0x603+ GetCPInfo() kernel32.GetCPInfo +@ stdcall -version=0x603+ GetCPInfoExW() kernel32.GetCPInfoExW +@ stdcall -version=0x603+ GetCalendarInfoEx() kernel32.GetCalendarInfoEx +@ stdcall -version=0x603+ GetCalendarInfoW() kernel32.GetCalendarInfoW +@ stdcall -version=0x603+ GetFileMUIInfo() kernel32.GetFileMUIInfo +@ stdcall -version=0x603+ GetFileMUIPath() kernel32.GetFileMUIPath +@ stdcall -version=0x603+ GetGeoInfoW() kernel32.GetGeoInfoW +@ stdcall -version=0x603+ GetLocaleInfoA() kernel32.GetLocaleInfoA +@ stdcall -version=0x603+ GetLocaleInfoEx() kernel32.GetLocaleInfoEx +@ stdcall -version=0x603+ GetLocaleInfoW() kernel32.GetLocaleInfoW +@ stdcall -version=0x603+ GetNLSVersion() kernel32.GetNLSVersion +@ stdcall -version=0x603+ GetNLSVersionEx() kernel32.GetNLSVersionEx +@ stdcall -version=0x603+ GetOEMCP() kernel32.GetOEMCP +@ stub -version=0x603+ GetProcessPreferredUILanguages +@ stdcall -version=0x603+ GetSystemDefaultLCID() kernel32.GetSystemDefaultLCID +@ stdcall -version=0x603+ GetSystemDefaultLangID() kernel32.GetSystemDefaultLangID +@ stdcall -version=0x603+ GetSystemPreferredUILanguages() kernel32.GetSystemPreferredUILanguages +@ stdcall -version=0x603+ GetThreadLocale() kernel32.GetThreadLocale +@ stdcall -version=0x603+ GetThreadPreferredUILanguages() kernel32.GetThreadPreferredUILanguages +@ stdcall -version=0x603+ GetThreadUILanguage() kernel32.GetThreadUILanguage +@ stdcall -version=0x603+ GetUILanguageInfo() kernel32.GetUILanguageInfo +@ stdcall -version=0x603+ GetUserDefaultLCID() kernel32.GetUserDefaultLCID +@ stdcall -version=0x603+ GetUserDefaultLangID() kernel32.GetUserDefaultLangID +@ stdcall -version=0x603+ GetUserDefaultLocaleName() kernel32.GetUserDefaultLocaleName +@ stdcall -version=0x603+ GetUserGeoID() kernel32.GetUserGeoID +@ stdcall -version=0x603+ GetUserPreferredUILanguages() kernel32.GetUserPreferredUILanguages +@ stdcall -version=0x603+ IdnToAscii() kernel32.IdnToAscii +@ stdcall -version=0x603+ IdnToUnicode() kernel32.IdnToUnicode +@ stdcall -version=0x603+ IsDBCSLeadByte() kernel32.IsDBCSLeadByte +@ stdcall -version=0x603+ IsDBCSLeadByteEx() kernel32.IsDBCSLeadByteEx +@ stdcall -version=0x603+ IsNLSDefinedString() kernel32.IsNLSDefinedString +@ stdcall -version=0x603+ IsValidCodePage() kernel32.IsValidCodePage +@ stdcall -version=0x603+ IsValidLanguageGroup() kernel32.IsValidLanguageGroup +@ stdcall -version=0x603+ IsValidLocale() kernel32.IsValidLocale +@ stub -version=0x603+ IsValidLocaleName +@ stub -version=0x603+ IsValidNLSVersion +@ stdcall -version=0x603+ LCMapStringA() kernel32.LCMapStringA +@ stdcall -version=0x603+ LCMapStringEx() kernel32.LCMapStringEx +@ stdcall -version=0x603+ LCMapStringW() kernel32.LCMapStringW +@ stdcall -version=0x603+ LocaleNameToLCID() kernel32.LocaleNameToLCID +@ stub -version=0x603+ ResolveLocaleName +@ stdcall -version=0x603+ SetCalendarInfoW() kernel32.SetCalendarInfoW +@ stdcall -version=0x603+ SetLocaleInfoW() kernel32.SetLocaleInfoW +@ stub -version=0x603+ SetProcessPreferredUILanguages +@ stdcall -version=0x603+ SetThreadLocale() kernel32.SetThreadLocale +@ stdcall -version=0x603+ SetThreadPreferredUILanguages() kernel32.SetThreadPreferredUILanguages +@ stdcall -version=0x603+ SetThreadUILanguage() kernel32.SetThreadUILanguage +@ stdcall -version=0x603+ SetUserGeoID() kernel32.SetUserGeoID +@ stdcall -version=0x603+ VerLanguageNameA() kernel32.VerLanguageNameA +@ stdcall -version=0x603+ VerLanguageNameW() kernel32.VerLanguageNameW

1 0

[reactos] 02/03: [APISETS] api-ms-win-core-localization-l1-2-0: Is NT6.2+ actually
by Serge Gautherie 10 Jul '20

10 Jul '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0de16bc3ba9e28cf5448e… commit 0de16bc3ba9e28cf5448e07c4dcd5e02acd7e0ad Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Wed May 20 23:42:59 2020 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Jul 11 01:16:38 2020 +0200 [APISETS] api-ms-win-core-localization-l1-2-0: Is NT6.2+ actually CORE-17095 --- .../api-ms-win-core-localization-l1-2-0.spec | 118 ++++++++++----------- 1 file changed, 59 insertions(+), 59 deletions(-) diff --git a/dll/apisets/api-ms-win-core-localization-l1-2-0.spec b/dll/apisets/api-ms-win-core-localization-l1-2-0.spec index 805efb4127c..6d9428b6483 100644 --- a/dll/apisets/api-ms-win-core-localization-l1-2-0.spec +++ b/dll/apisets/api-ms-win-core-localization-l1-2-0.spec @@ -1,62 +1,62 @@ # This file is autogenerated by update.py -@ stdcall ConvertDefaultLocale() kernel32.ConvertDefaultLocale -@ stdcall EnumSystemGeoID() kernel32.EnumSystemGeoID -@ stdcall EnumSystemLocalesA() kernel32.EnumSystemLocalesA -@ stdcall EnumSystemLocalesW() kernel32.EnumSystemLocalesW -@ stdcall -version=0x600+ FindNLSString() kernel32.FindNLSString -@ stdcall -version=0x600+ FindNLSStringEx() kernel32.FindNLSStringEx -@ stdcall FormatMessageA() kernel32.FormatMessageA -@ stdcall FormatMessageW() kernel32.FormatMessageW -@ stdcall GetACP() kernel32.GetACP -@ stdcall GetCPInfo() kernel32.GetCPInfo -@ stdcall GetCPInfoExW() kernel32.GetCPInfoExW -@ stdcall -version=0x600+ GetCalendarInfoEx() kernel32.GetCalendarInfoEx -@ stdcall GetCalendarInfoW() kernel32.GetCalendarInfoW -@ stdcall -version=0x600+ GetFileMUIInfo() kernel32.GetFileMUIInfo -@ stdcall -version=0x600+ GetFileMUIPath() kernel32.GetFileMUIPath -@ stdcall GetGeoInfoW() kernel32.GetGeoInfoW -@ stdcall GetLocaleInfoA() kernel32.GetLocaleInfoA -@ stdcall -version=0x600+ GetLocaleInfoEx() kernel32.GetLocaleInfoEx -@ stdcall GetLocaleInfoW() kernel32.GetLocaleInfoW -@ stdcall GetNLSVersion() kernel32.GetNLSVersion -@ stdcall -version=0x600+ GetNLSVersionEx() kernel32.GetNLSVersionEx -@ stdcall GetOEMCP() kernel32.GetOEMCP -@ stub GetProcessPreferredUILanguages -@ stdcall GetSystemDefaultLCID() kernel32.GetSystemDefaultLCID -@ stdcall GetSystemDefaultLangID() kernel32.GetSystemDefaultLangID -@ stdcall -version=0x600+ GetSystemPreferredUILanguages() kernel32.GetSystemPreferredUILanguages -@ stdcall GetThreadLocale() kernel32.GetThreadLocale -@ stdcall -version=0x600+ GetThreadPreferredUILanguages() kernel32.GetThreadPreferredUILanguages -@ stdcall -version=0x600+ GetThreadUILanguage() kernel32.GetThreadUILanguage -@ stdcall -version=0x600+ GetUILanguageInfo() kernel32.GetUILanguageInfo -@ stdcall GetUserDefaultLCID() kernel32.GetUserDefaultLCID -@ stdcall GetUserDefaultLangID() kernel32.GetUserDefaultLangID -@ stdcall -version=0x600+ GetUserDefaultLocaleName() kernel32.GetUserDefaultLocaleName -@ stdcall GetUserGeoID() kernel32.GetUserGeoID -@ stdcall -version=0x600+ GetUserPreferredUILanguages() kernel32.GetUserPreferredUILanguages -@ stdcall -version=0x600+ IdnToAscii() kernel32.IdnToAscii -@ stdcall -version=0x600+ IdnToUnicode() kernel32.IdnToUnicode -@ stdcall IsDBCSLeadByte() kernel32.IsDBCSLeadByte -@ stdcall IsDBCSLeadByteEx() kernel32.IsDBCSLeadByteEx -@ stdcall IsNLSDefinedString() kernel32.IsNLSDefinedString -@ stdcall IsValidCodePage() kernel32.IsValidCodePage -@ stdcall IsValidLanguageGroup() kernel32.IsValidLanguageGroup -@ stdcall IsValidLocale() kernel32.IsValidLocale -@ stub IsValidLocaleName -@ stub IsValidNLSVersion -@ stdcall LCMapStringA() kernel32.LCMapStringA -@ stdcall -version=0x600+ LCMapStringEx() kernel32.LCMapStringEx -@ stdcall LCMapStringW() kernel32.LCMapStringW -@ stdcall -version=0x600+ LocaleNameToLCID() kernel32.LocaleNameToLCID -@ stub ResolveLocaleName -@ stdcall SetCalendarInfoW() kernel32.SetCalendarInfoW -@ stdcall SetLocaleInfoW() kernel32.SetLocaleInfoW -@ stub SetProcessPreferredUILanguages -@ stdcall SetThreadLocale() kernel32.SetThreadLocale -@ stdcall -version=0x600+ SetThreadPreferredUILanguages() kernel32.SetThreadPreferredUILanguages -@ stdcall SetThreadUILanguage() kernel32.SetThreadUILanguage -@ stdcall SetUserGeoID() kernel32.SetUserGeoID -@ stdcall VerLanguageNameA() kernel32.VerLanguageNameA -@ stdcall VerLanguageNameW() kernel32.VerLanguageNameW +@ stdcall -version=0x602+ ConvertDefaultLocale() kernel32.ConvertDefaultLocale +@ stdcall -version=0x602+ EnumSystemGeoID() kernel32.EnumSystemGeoID +@ stdcall -version=0x602+ EnumSystemLocalesA() kernel32.EnumSystemLocalesA +@ stdcall -version=0x602+ EnumSystemLocalesW() kernel32.EnumSystemLocalesW +@ stdcall -version=0x602+ FindNLSString() kernel32.FindNLSString +@ stdcall -version=0x602+ FindNLSStringEx() kernel32.FindNLSStringEx +@ stdcall -version=0x602+ FormatMessageA() kernel32.FormatMessageA +@ stdcall -version=0x602+ FormatMessageW() kernel32.FormatMessageW +@ stdcall -version=0x602+ GetACP() kernel32.GetACP +@ stdcall -version=0x602+ GetCPInfo() kernel32.GetCPInfo +@ stdcall -version=0x602+ GetCPInfoExW() kernel32.GetCPInfoExW +@ stdcall -version=0x602+ GetCalendarInfoEx() kernel32.GetCalendarInfoEx +@ stdcall -version=0x602+ GetCalendarInfoW() kernel32.GetCalendarInfoW +@ stdcall -version=0x602+ GetFileMUIInfo() kernel32.GetFileMUIInfo +@ stdcall -version=0x602+ GetFileMUIPath() kernel32.GetFileMUIPath +@ stdcall -version=0x602+ GetGeoInfoW() kernel32.GetGeoInfoW +@ stdcall -version=0x602+ GetLocaleInfoA() kernel32.GetLocaleInfoA +@ stdcall -version=0x602+ GetLocaleInfoEx() kernel32.GetLocaleInfoEx +@ stdcall -version=0x602+ GetLocaleInfoW() kernel32.GetLocaleInfoW +@ stdcall -version=0x602+ GetNLSVersion() kernel32.GetNLSVersion +@ stdcall -version=0x602+ GetNLSVersionEx() kernel32.GetNLSVersionEx +@ stdcall -version=0x602+ GetOEMCP() kernel32.GetOEMCP +@ stub -version=0x602+ GetProcessPreferredUILanguages +@ stdcall -version=0x602+ GetSystemDefaultLCID() kernel32.GetSystemDefaultLCID +@ stdcall -version=0x602+ GetSystemDefaultLangID() kernel32.GetSystemDefaultLangID +@ stdcall -version=0x602+ GetSystemPreferredUILanguages() kernel32.GetSystemPreferredUILanguages +@ stdcall -version=0x602+ GetThreadLocale() kernel32.GetThreadLocale +@ stdcall -version=0x602+ GetThreadPreferredUILanguages() kernel32.GetThreadPreferredUILanguages +@ stdcall -version=0x602+ GetThreadUILanguage() kernel32.GetThreadUILanguage +@ stdcall -version=0x602+ GetUILanguageInfo() kernel32.GetUILanguageInfo +@ stdcall -version=0x602+ GetUserDefaultLCID() kernel32.GetUserDefaultLCID +@ stdcall -version=0x602+ GetUserDefaultLangID() kernel32.GetUserDefaultLangID +@ stdcall -version=0x602+ GetUserDefaultLocaleName() kernel32.GetUserDefaultLocaleName +@ stdcall -version=0x602+ GetUserGeoID() kernel32.GetUserGeoID +@ stdcall -version=0x602+ GetUserPreferredUILanguages() kernel32.GetUserPreferredUILanguages +@ stdcall -version=0x602+ IdnToAscii() kernel32.IdnToAscii +@ stdcall -version=0x602+ IdnToUnicode() kernel32.IdnToUnicode +@ stdcall -version=0x602+ IsDBCSLeadByte() kernel32.IsDBCSLeadByte +@ stdcall -version=0x602+ IsDBCSLeadByteEx() kernel32.IsDBCSLeadByteEx +@ stdcall -version=0x602+ IsNLSDefinedString() kernel32.IsNLSDefinedString +@ stdcall -version=0x602+ IsValidCodePage() kernel32.IsValidCodePage +@ stdcall -version=0x602+ IsValidLanguageGroup() kernel32.IsValidLanguageGroup +@ stdcall -version=0x602+ IsValidLocale() kernel32.IsValidLocale +@ stub -version=0x602+ IsValidLocaleName +@ stub -version=0x602+ IsValidNLSVersion +@ stdcall -version=0x602+ LCMapStringA() kernel32.LCMapStringA +@ stdcall -version=0x602+ LCMapStringEx() kernel32.LCMapStringEx +@ stdcall -version=0x602+ LCMapStringW() kernel32.LCMapStringW +@ stdcall -version=0x602+ LocaleNameToLCID() kernel32.LocaleNameToLCID +@ stub -version=0x602+ ResolveLocaleName +@ stdcall -version=0x602+ SetCalendarInfoW() kernel32.SetCalendarInfoW +@ stdcall -version=0x602+ SetLocaleInfoW() kernel32.SetLocaleInfoW +@ stub -version=0x602+ SetProcessPreferredUILanguages +@ stdcall -version=0x602+ SetThreadLocale() kernel32.SetThreadLocale +@ stdcall -version=0x602+ SetThreadPreferredUILanguages() kernel32.SetThreadPreferredUILanguages +@ stdcall -version=0x602+ SetThreadUILanguage() kernel32.SetThreadUILanguage +@ stdcall -version=0x602+ SetUserGeoID() kernel32.SetUserGeoID +@ stdcall -version=0x602+ VerLanguageNameA() kernel32.VerLanguageNameA +@ stdcall -version=0x602+ VerLanguageNameW() kernel32.VerLanguageNameW

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2020