ReactOS.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
List overview
Download
Ros-diffs
January 2021
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
ros-diffs@reactos.org
15 participants
146 discussions
Start a n
N
ew thread
[reactos] 01/01: [KEYBOARD] Add Swiss French keyboard layout (#3408)
by David Abelenda
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a4a0626f83ce1179556f2…
commit a4a0626f83ce1179556f2ce09a67e4e171f8bce6 Author: David Abelenda <abelendadavid(a)msn.com> AuthorDate: Wed Dec 30 21:19:22 2020 +0100 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Tue Jan 5 17:48:53 2021 +0300 [KEYBOARD] Add Swiss French keyboard layout (#3408) --- boot/bootdata/hivesys.inf | 7 + dll/keyboard/CMakeLists.txt | 1 + dll/keyboard/kbdsf/kbdsf.c | 479 ++++++++++++++++++++++++++++++++++++++++++ dll/keyboard/kbdsf/kbdsf.rc | 5 + dll/keyboard/kbdsf/kbdsf.spec | 1 + 5 files changed, 493 insertions(+) diff --git a/boot/bootdata/hivesys.inf b/boot/bootdata/hivesys.inf index 1f9baa44404..586b4746633 100644 --- a/boot/bootdata/hivesys.inf +++ b/boot/bootdata/hivesys.inf @@ -585,6 +585,10 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000c0c","Layout File", HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000c0c","Layout Text",0x00000000,%CANADIAN_FRENCH% HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000c0c","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5005" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000100c","Layout File",0x00000000,"kbdsf.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000100c","Layout Text",0x00000000,%SWISS_FRENCH% +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000100c","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5023" + HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000040d","Layout File",0x00000000,"kbdheb.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000040d","Layout Text",0x00000000,%HEBREW% HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000040d","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5083" @@ -2392,6 +2396,7 @@ SLOVAK = "Slovak" SLOVAK_QWERTY = "Slovak (QWERTY)" SPANISH = "Spanish" SWEDISH = "Swedish" +SWISS_FRENCH = "Swiss (French)" SWISS_GERMAN = "Swiss (German)" TATAR = "Tatar" THAI_KEDMANEE = "Thai Kedmanee" @@ -2546,6 +2551,7 @@ SLOVAK = "Słowacki" SLOVAK_QWERTY = "Słowacki (QWERTY)" SPANISH = "Hiszpański" SWEDISH = "Szwedzki" +SWISS_FRENCH = "Szwajcarski Francuski" SWISS_GERMAN = "Szwajcarski Niemiecki" TATAR = "Tatarski" THAI_KEDMANEE = "Tajski Kedmanee" @@ -2694,6 +2700,7 @@ SLOVAK = "Slovacă" SLOVAK_QWERTY = "Slovacă (QWERTY)" SPANISH = "Spaniolă" SWEDISH = "Suedeză" +SWISS_FRENCH = "Elvețiană (Franceză)" SWISS_GERMAN = "Elvețiană (Germană)" TATAR = "Tatară" THAI_KEDMANEE = "Thai Kedmanee" diff --git a/dll/keyboard/CMakeLists.txt b/dll/keyboard/CMakeLists.txt index 76cb12e1ea7..16d222a49b7 100644 --- a/dll/keyboard/CMakeLists.txt +++ b/dll/keyboard/CMakeLists.txt @@ -59,6 +59,7 @@ list(APPEND _keyboard_layouts kbdrost kbdru kbdru1 + kbdsf kbdsg kbdsk kbdsk1 diff --git a/dll/keyboard/kbdsf/kbdsf.c b/dll/keyboard/kbdsf/kbdsf.c new file mode 100644 index 00000000000..f7b11f643c1 --- /dev/null +++ b/dll/keyboard/kbdsf/kbdsf.c @@ -0,0 +1,479 @@ +/* + * ReactOS French (Switzerland) ASCII Keyboard layout + * Copyright (C) 2020 ReactOS + * Author: David Abelenda <abelendadavid(a)msn.com> + * License: LGPL, see: LGPL.txt + * + * Thanks to:
http://www.win.tue.nl/~aeb/linux/kbd/scancodes-1.html
+ * and
http://www.unicode.org/charts/
+ */ + +#define WIN32_NO_STATUS +#include <stdarg.h> +#include <windef.h> +#include <winuser.h> +#include <ndk/kbd.h> + +#ifdef _M_IA64 +#define ROSDATA static __declspec(allocate(".data")) +#else +#ifdef _MSC_VER +#pragma data_seg(".data") +#define ROSDATA static +#else +#define ROSDATA static __attribute__((section(".data"))) +#endif +#endif + +#define VK_EMPTY 0xff /* The non-existent VK */ + +#define KNUMS KBDNUMPAD|KBDSPECIAL /* Special + number pad */ +#define KMEXT KBDEXT|KBDMULTIVK /* Multi + ext */ + +ROSDATA USHORT scancode_to_vk[] = { + /* Numbers Row */ + /* - 00 - */ + /* 1 ... 2 ... 3 ... 4 ... */ + VK_EMPTY, VK_ESCAPE, '1', '2', + '3', '4', '5', '6', + '7', '8', '9', '0', + VK_OEM_4, VK_OEM_6, VK_BACK, + /* - 0f - */ + /* First Letters Row */ + VK_TAB, 'Q', 'W', 'E', + 'R', 'T', 'Z', 'U', + 'I', 'O', 'P', + VK_OEM_1, VK_OEM_PLUS, VK_RETURN, + /* - 1d - */ + /* Second Letters Row */ + VK_LCONTROL, + 'A', 'S', 'D', 'F', + 'G', 'H', 'J', 'K', + 'L', VK_OEM_3, VK_OEM_7, VK_OEM_5, + /* - 2c - */ + /* Third letters row */ + VK_LSHIFT, VK_OEM_2, + 'Y', 'X', 'C', 'V', + 'B', 'N', 'M', VK_OEM_COMMA, + VK_OEM_PERIOD, VK_OEM_MINUS, VK_RSHIFT, + /* - 37 - */ + /* Bottom Row */ + VK_MULTIPLY, VK_LMENU, VK_SPACE, VK_CAPITAL, + + /* - 3b - */ + /* F-Keys */ + VK_F1, VK_F2, VK_F3, VK_F4, VK_F5, VK_F6, + VK_F7, VK_F8, VK_F9, VK_F10, + /* - 45 - */ + /* Locks */ + VK_NUMLOCK | KMEXT, + VK_SCROLL | KBDMULTIVK, + /* - 47 - */ + /* Number-Pad */ + VK_HOME | KNUMS, VK_UP | KNUMS, VK_PRIOR | KNUMS, VK_SUBTRACT, + VK_LEFT | KNUMS, VK_CLEAR | KNUMS, VK_RIGHT | KNUMS, VK_ADD, + VK_END | KNUMS, VK_DOWN | KNUMS, VK_NEXT | KNUMS, + VK_INSERT | KNUMS, VK_DELETE | KNUMS, + /* - 54 - */ + /* Presumably PrtSc */ + VK_SNAPSHOT, + /* - 55 - */ + /* Oddities, and the remaining standard F-Keys */ + VK_EMPTY, VK_OEM_102, VK_F11, VK_F12, + /* - 59 - */ + VK_CLEAR, VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* EREOF */ + VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* ZOOM */ + VK_HELP, + /* - 64 - */ + /* Even more F-Keys (for example, NCR keyboards from the early 90's) */ + VK_F13, VK_F14, VK_F15, VK_F16, VK_F17, VK_F18, VK_F19, VK_F20, + VK_F21, VK_F22, VK_F23, + /* - 6f - */ + /* Not sure who uses these codes */ + VK_EMPTY, VK_EMPTY, VK_EMPTY, + /* - 72 - */ + VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, + /* - 76 - */ + /* One more f-key */ + VK_F24, + /* - 77 - */ + VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, + VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* PA1 */ + VK_EMPTY, + /* - 80 - */ + 0 +}; + +ROSDATA VSC_VK extcode0_to_vk[] = { + { 0x10, VK_MEDIA_PREV_TRACK | KBDEXT }, + { 0x19, VK_MEDIA_NEXT_TRACK | KBDEXT }, + { 0x1D, VK_RCONTROL | KBDEXT }, + { 0x20, VK_VOLUME_MUTE | KBDEXT }, + { 0x21, VK_LAUNCH_APP2 | KBDEXT }, + { 0x22, VK_MEDIA_PLAY_PAUSE | KBDEXT }, + { 0x24, VK_MEDIA_STOP | KBDEXT }, + { 0x2E, VK_VOLUME_DOWN | KBDEXT }, + { 0x30, VK_VOLUME_UP | KBDEXT }, + { 0x32, VK_BROWSER_HOME | KBDEXT }, + { 0x35, VK_DIVIDE | KBDEXT }, + { 0x37, VK_SNAPSHOT | KBDEXT }, + { 0x38, VK_RMENU | KBDEXT }, + { 0x47, VK_HOME | KBDEXT }, + { 0x48, VK_UP | KBDEXT }, + { 0x49, VK_PRIOR | KBDEXT }, + { 0x4B, VK_LEFT | KBDEXT }, + { 0x4D, VK_RIGHT | KBDEXT }, + { 0x4F, VK_END | KBDEXT }, + { 0x50, VK_DOWN | KBDEXT }, + { 0x51, VK_NEXT | KBDEXT }, + { 0x52, VK_INSERT | KBDEXT }, + { 0x53, VK_DELETE | KBDEXT }, + { 0x5B, VK_LWIN | KBDEXT }, + { 0x5C, VK_RWIN | KBDEXT }, + { 0x5D, VK_APPS | KBDEXT }, + { 0x5F, VK_SLEEP | KBDEXT }, + { 0x65, VK_BROWSER_SEARCH | KBDEXT }, + { 0x66, VK_BROWSER_FAVORITES | KBDEXT }, + { 0x67, VK_BROWSER_REFRESH | KBDEXT }, + { 0x68, VK_BROWSER_STOP | KBDEXT }, + { 0x69, VK_BROWSER_FORWARD | KBDEXT }, + { 0x6A, VK_BROWSER_BACK | KBDEXT }, + { 0x6B, VK_LAUNCH_APP1 | KBDEXT }, + { 0x6C, VK_LAUNCH_MAIL | KBDEXT }, + { 0x6D, VK_LAUNCH_MEDIA_SELECT | KBDEXT }, + { 0x1C, VK_RETURN | KBDEXT }, + { 0x46, VK_CANCEL | KBDEXT }, + { 0, 0 }, +}; + +ROSDATA VSC_VK extcode1_to_vk[] = { + { 0x1d, VK_PAUSE}, + { 0, 0 }, +}; + +ROSDATA VK_TO_BIT modifier_keys[] = { + { VK_SHIFT, KBDSHIFT }, + { VK_CONTROL, KBDCTRL }, + { VK_MENU, KBDALT }, + { 0, 0 } +}; + +ROSDATA MODIFIERS modifier_bits = { + modifier_keys, + 6, + { 0, 1, 3, 4, SHFT_INVALID, SHFT_INVALID, 2 } /* Modifier bit order, NONE, SHIFT, CTRL, ALT, MENU, SHIFT + MENU, CTRL + MENU */ +}; + +/* ############################################ */ +/* ############################################ */ +/* ############################################ */ +/* ############################################ */ +/* ############################################ */ + +ROSDATA VK_TO_WCHARS2 key_to_chars_2mod[] = { + { VK_OEM_5, 0, {0xa7, 0xb0} }, /* � � */ + + /* Normal vs Shifted */ + /* The numbers */ + /* Ctrl-2 generates NUL */ + { 0xff, 0, {0xa7, 0x9B} }, /* what is this for? */ + { '4', 0, {'4', 0xE7} }, + { '5', 0, {'5', '%'} }, + { '9', 0, {'9', ')'} }, + { '0', 0, {'0', '='} }, + + /* First letter row */ + { 'W', CAPLOK, {'w', 'W'} }, + { 'R', CAPLOK, {'r', 'R'} }, + { 'T', CAPLOK, {'t', 'T'} }, + { 'Z', CAPLOK, {'z', 'Z'} }, + { 'U', CAPLOK, {'u', 'U'} }, + { 'I', CAPLOK, {'i', 'I'} }, + { 'O', CAPLOK, {'o', 'O'} }, + { 'P', CAPLOK, {'p', 'P'} }, + /* Second letter row */ + { 'A', CAPLOK, {'a', 'A'} }, + { 'S', CAPLOK, {'s', 'S'} }, + { 'D', CAPLOK, {'d', 'D'} }, + { 'F', CAPLOK, {'f', 'F'} }, + { 'G', CAPLOK, {'g', 'G'} }, + { 'H', CAPLOK, {'h', 'H'} }, + { 'J', CAPLOK, {'j', 'J'} }, + { 'K', CAPLOK, {'k', 'K'} }, + { 'L', CAPLOK, {'l', 'L'} }, + /* Third letter row */ + { 'Y', CAPLOK, {'y', 'Y'} }, + { 'X', CAPLOK, {'x', 'X'} }, + { 'V', CAPLOK, {'v', 'V'} }, + { 'B', CAPLOK, {'b', 'B'} }, + { 'N', CAPLOK, {'n', 'N'} }, + + /* Specials */ + { VK_OEM_COMMA, 0, {',', ';'} }, + { VK_OEM_PERIOD, 0, {'.', ':'} }, + { VK_OEM_MINUS, 0, {'-', '_'} }, + { VK_DECIMAL, 0, {'.', '.'} }, + { VK_TAB, 0, {'\t', '\t'} }, + { VK_ADD, 0, {'+', '+'} }, + { VK_DIVIDE, 0, {0x2f, 0x2f} }, /* '/' */ + { VK_MULTIPLY, 0, {'*', '*'} }, + { VK_SUBTRACT, 0, {'-', '-'} }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS3 key_to_chars_3mod[] = { + /* Normal, Shifted, Alt Gr */ + /* Legacy (telnet-style) ascii escapes */ + { VK_OEM_4, 0, {'\'' , '?' , WCH_DEAD} }, /* ' ? � */ + { 0xff, 0, {WCH_NONE, WCH_NONE, 0xb4} }, + { 'Q', CAPLOK, {'q', 'Q', '@'} }, + { 'C', CAPLOK, {'c', 'C', 0xa9} }, /* c C Copyright-Sign */ + { 'E', CAPLOK, {'e', 'E', 0x20ac} }, /* e E � */ + { 'M', CAPLOK, {'m', 'M', 0xb5} }, /* m M mu-Sign */ + { VK_OEM_102, 0, {'<', '>', '\\'} }, + { 0,0 } +}; + +ROSDATA VK_TO_WCHARS4 key_to_chars_4mod[] = { + /* Normal, Shifted, Alt Gr, C-S-x */ + /* Legacy Ascii generators */ + { VK_BACK, 0, {'\b', '\b', WCH_NONE, 0x7f} }, + { VK_ESCAPE, 0, {0x1b, 0x1b, WCH_NONE, 0x1b} }, + { VK_RETURN, 0, {'\r', '\r', WCH_NONE, '\n'} }, + { VK_SPACE, 0, {' ', ' ', WCH_NONE, ' '} }, + { VK_CANCEL, 0, {0x03, 0x03, WCH_NONE, 0x03} }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS5 key_to_chars_5mod[] = { + /* Normal, Shifted, Alt Gr, Ctrl */ + { '1', 0, {'1', '+', '|', WCH_NONE, 0x00} }, + { '2', 0, {'2', '\"', '@', WCH_NONE, 0x00} }, + { '3', 0, {'3', '*', '#', WCH_NONE, 0x00} }, + { '4', 0, {'4', 0xe7, 0xB0, WCH_NONE, 0x00} }, + { '5', 0, {'5', '%', 0xa7, WCH_NONE, 0x00} }, + { '6', 0, {'6', '&', 0xac, WCH_NONE, 0x00} }, + { '7', 0, {'7', '/', 0xa6, WCH_NONE, 0x00} }, + { '8', 0, {'8', '(', 0xa2, WCH_NONE, 0x00} }, + { '9', 0, {'9', ')', WCH_NONE, WCH_NONE, 0x00} }, + { VK_OEM_1, KBDCTRL, {0xe8, 0xfc, 0x5b, 0Xdc, 0xc8} }, /* � � [ � � */ + { VK_OEM_2, 0, {0x24, 0xa3, 0x7d, WCH_NONE, 0x00} }, /* $ � } */ + { VK_OEM_3, KBDCTRL, {0xe9, 0xf6, WCH_NONE, 0xd6, 0xc9} }, /* � � � �*/ + { VK_OEM_6, 0, {WCH_DEAD, WCH_DEAD, WCH_DEAD, WCH_NONE, 0x00} }, /* ^ ` ~ */ + { 0xff, 0, {0x5e , 0x27 , 0x7e , WCH_NONE, 0x00} }, + { VK_OEM_7, KBDCTRL, {0xe0, 0xe4, 0x7b, 0xc4, 0xc0} }, /* � � { � � */ + { VK_OEM_PLUS, 0, {WCH_DEAD, 0x21 , 0x5D , WCH_NONE, 0x00} }, /* � ! ] */ + { 0xff, 0, {0xa8 , WCH_NONE, WCH_NONE, WCH_NONE, 0x00} }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS1 keypad_numbers[] = { + { VK_NUMPAD0, 0, {'0'} }, + { VK_NUMPAD1, 0, {'1'} }, + { VK_NUMPAD2, 0, {'2'} }, + { VK_NUMPAD3, 0, {'3'} }, + { VK_NUMPAD4, 0, {'4'} }, + { VK_NUMPAD5, 0, {'5'} }, + { VK_NUMPAD6, 0, {'6'} }, + { VK_NUMPAD7, 0, {'7'} }, + { VK_NUMPAD8, 0, {'8'} }, + { VK_NUMPAD9, 0, {'9'} }, + { VK_DECIMAL, 0, {'.'} }, + { VK_BACK, 0, {'\010'} }, + { 0,0 } +}; + +#define vk_master(n,x) { (PVK_TO_WCHARS1)x, n, sizeof(x[0]) } + +ROSDATA VK_TO_WCHAR_TABLE vk_to_wchar_master_table[] = { + vk_master(3,key_to_chars_3mod), + vk_master(4,key_to_chars_4mod), + vk_master(5,key_to_chars_5mod), + vk_master(2,key_to_chars_2mod), + vk_master(1,keypad_numbers), + { 0,0,0 } +}; + +ROSDATA VSC_LPWSTR key_names[] = { + { 0x00, L"" }, + { 0x01, L"Esc" }, + { 0x0e, L"R\x00fc" L"ck" }, + { 0x0f, L"Tabulator" }, + { 0x1c, L"Entrée" }, + { 0x1d, L"Ctrl" }, + { 0x2a, L"Majuscule gauche" }, + { 0x36, L"Majuscule droite" }, + { 0x37, L" (Clavier numérique)" }, + { 0x38, L"Alt" }, + { 0x39, L"Vide" }, + { 0x3a, L"CAPSLOK" }, + { 0x3b, L"F1" }, + { 0x3c, L"F2" }, + { 0x3d, L"F3" }, + { 0x3e, L"F4" }, + { 0x3f, L"F5" }, + { 0x40, L"F6" }, + { 0x41, L"F7" }, + { 0x42, L"F8" }, + { 0x43, L"F9" }, + { 0x44, L"F10" }, + { 0x45, L"Pause" }, + { 0x46, L"Verrouillage du défilement" }, + { 0x47, L"7 (Clavier numérique)" }, + { 0x48, L"8 (Clavier numérique)" }, + { 0x49, L"9 (Clavier numérique)" }, + { 0x4a, L"- (Clavier numérique)" }, + { 0x4b, L"4 (Clavier numérique)" }, + { 0x4c, L"5 (Clavier numérique)" }, + { 0x4d, L"6 (Clavier numérique)" }, + { 0x4e, L"+ (Clavier numérique)" }, + { 0x4f, L"1 (Clavier numérique)" }, + { 0x50, L"2 (Clavier numérique)" }, + { 0x51, L"3 (Clavier numérique)" }, + { 0x52, L"0 (Clavier numérique)" }, + { 0x53, L"Point (Clavier numérique)" }, + { 0x54, L"Sys Req" }, + { 0x57, L"F11" }, + { 0x58, L"F12" }, + { 0x7c, L"F13" }, + { 0x7d, L"F14" }, + { 0x7e, L"F15" }, + { 0x7f, L"F16" }, + { 0x80, L"F17" }, + { 0x81, L"F18" }, + { 0x82, L"F19" }, + { 0x83, L"F20" }, + { 0x84, L"F21" }, + { 0x85, L"F22" }, + { 0x86, L"F23" }, + { 0x87, L"F24" }, + { 0, NULL }, +}; + +ROSDATA VSC_LPWSTR extended_key_names[] = { + { 0x1c, L"Num Enter" }, + { 0x1d, L"Right Ctrl" }, + { 0x35, L"Num /" }, + { 0x37, L"Prnt Scrn" }, + { 0x38, L"Right Alt" }, + { 0x45, L"Num Lock" }, + { 0x46, L"Break" }, + { 0x47, L"Home" }, + { 0x48, L"Up" }, + { 0x49, L"Page Up" }, + { 0x4a, L"Left" }, + { 0x4c, L"Center" }, + { 0x4d, L"Right" }, + { 0x4f, L"End" }, + { 0x50, L"Down" }, + { 0x51, L"Page Down" }, + { 0x52, L"Insert" }, + { 0x53, L"Delete" }, + { 0x54, L"<ReactOS>" }, + { 0x55, L"Help" }, + { 0x56, L"Left Windows" }, + { 0x5b, L"Right Windows" }, + { 0, NULL }, +}; + +ROSDATA DEADKEY_LPWSTR dead_key_names[] = { + L"\x00b4" L"Aigu", + L"`" L"Grave", + L"^" L"Circonflex", + NULL +}; + +#define DEADTRANS(ch, accent, comp, flags) MAKELONG(ch, accent), comp, flags + +ROSDATA DEADKEY dead_key[] = { + { DEADTRANS(L'a', L'^', 0xe2, 0x00) },/* ^ */ + { DEADTRANS(L'e', L'^', 0xea, 0x00) }, + { DEADTRANS(L'i', L'^', 0xee, 0x00) }, + { DEADTRANS(L'o', L'^', 0xf4, 0x00) }, + { DEADTRANS(L'u', L'^', 0xfb, 0x00) }, + { DEADTRANS(L'A', L'^', 0xc2, 0x00) }, + { DEADTRANS(L'E', L'^', 0xca, 0x00) }, + { DEADTRANS(L'I', L'^', 0xce, 0x00) }, + { DEADTRANS(L'O', L'^', 0xd4, 0x00) }, + { DEADTRANS(L'U', L'^', 0xdb, 0x00) }, + { DEADTRANS(L' ', L'^', L'^', 0x00) }, + { DEADTRANS(L'a', 0xb4, 0xe1, 0x00) }, /* � */ + { DEADTRANS(L'e', 0xb4, 0xe9, 0x00) }, + { DEADTRANS(L'i', 0xb4, 0xed, 0x00) }, + { DEADTRANS(L'o', 0xb4, 0xf3, 0x00) }, + { DEADTRANS(L'u', 0xb4, 0xfa, 0x00) }, + { DEADTRANS(L'y', 0xb4, 0xfd, 0x00) }, + { DEADTRANS(L'A', 0xb4, 0xc1, 0x00) }, + { DEADTRANS(L'E', 0xb4, 0xc9, 0x00) }, + { DEADTRANS(L'I', 0xb4, 0xcd, 0x00) }, + { DEADTRANS(L'O', 0xb4, 0xd3, 0x00) }, + { DEADTRANS(L'U', 0xb4, 0xda, 0x00) }, + { DEADTRANS(L'Y', 0xb4, 0xdd, 0x00) }, + { DEADTRANS(L' ', 0xb4, 0xb4, 0x00) }, + { DEADTRANS(L'a', L'`', 0xe0, 0x00) }, /* ` */ + { DEADTRANS(L'e', L'`', 0xe8, 0x00) }, + { DEADTRANS(L'i', L'`', 0xec, 0x00) }, + { DEADTRANS(L'o', L'`', 0xf2, 0x00) }, + { DEADTRANS(L'u', L'`', 0xf9, 0x00) }, + { DEADTRANS(L'A', L'`', 0xc0, 0x00) }, + { DEADTRANS(L'E', L'`', 0xc8, 0x00) }, + { DEADTRANS(L'I', L'`', 0xcc, 0x00) }, + { DEADTRANS(L'O', L'`', 0xd2, 0x00) }, + { DEADTRANS(L'U', L'`', 0xd9, 0x00) }, + { DEADTRANS(L' ', L'`', L'`', 0x00) }, + { DEADTRANS(L' ', 0xa8, 0xa8, 0x00) }, /* � */ + { DEADTRANS(L'a', 0xa8, 0xe4, 0x00) }, + { DEADTRANS(L'e', 0xa8, 0xeb, 0x00) }, + { DEADTRANS(L'i', 0xa8, 0xef, 0x00) }, + { DEADTRANS(L'o', 0xa8, 0xf6, 0x00) }, + { DEADTRANS(L'u', 0xa8, 0xfc, 0x00) }, + { DEADTRANS(L'y', 0xa8, 0xff, 0x00) }, + { DEADTRANS(L'A', 0xa8, 0xc4, 0x00) }, + { DEADTRANS(L'E', 0xa8, 0xcb, 0x00) }, + { DEADTRANS(L'I', 0xa8, 0xcf, 0x00) }, + { DEADTRANS(L'O', 0xa8, 0xd6, 0x00) }, + { DEADTRANS(L'U', 0xa8, 0xdc, 0x00) }, + { DEADTRANS(L' ', 0x7e, 0x7e, 0x00) }, /* ~ */ + { DEADTRANS(L'a', 0x7e, 0xe3, 0x00) }, + { DEADTRANS(L'o', 0x7e, 0xf5, 0x00) }, + { DEADTRANS(L'n', 0x7e, 0xf1, 0x00) }, + { DEADTRANS(L'A', 0x7e, 0xc3, 0x00) }, + { DEADTRANS(L'O', 0x7e, 0xd5, 0x00) }, + { DEADTRANS(L'N', 0x7e, 0xd1, 0x00) }, + { 0, 0 } +}; + +/* Finally, the master table */ +ROSDATA KBDTABLES keyboard_layout_table = { + /* modifier assignments */ + &modifier_bits, + + /* character from vk tables */ + vk_to_wchar_master_table, + + /* diacritical marks -- currently implemented by wine code */ + dead_key, + + /* Key names */ + (VSC_LPWSTR *)key_names, + (VSC_LPWSTR *)extended_key_names, + dead_key_names, /* Dead key names */ + + /* scan code to virtual key maps */ + scancode_to_vk, + sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]), + extcode0_to_vk, + extcode1_to_vk, + + MAKELONG(KLLF_ALTGR, 1), /* Version 1.0 */ + + /* Ligatures -- German doesn't have any */ + 0, + 0, + NULL +}; + +PKBDTABLES WINAPI KbdLayerDescriptor(VOID) { + return &keyboard_layout_table; +} + diff --git a/dll/keyboard/kbdsf/kbdsf.rc b/dll/keyboard/kbdsf/kbdsf.rc new file mode 100644 index 00000000000..90e18188535 --- /dev/null +++ b/dll/keyboard/kbdsf/kbdsf.rc @@ -0,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS French (Switzerland) Keyboard Layout" +#define REACTOS_STR_INTERNAL_NAME "kbdsf" +#define REACTOS_STR_ORIGINAL_FILENAME "kbdsf.dll" +#include <reactos/version.rc> diff --git a/dll/keyboard/kbdsf/kbdsf.spec b/dll/keyboard/kbdsf/kbdsf.spec new file mode 100644 index 00000000000..12e3bc9c766 --- /dev/null +++ b/dll/keyboard/kbdsf/kbdsf.spec @@ -0,0 +1 @@ +@ stdcall KbdLayerDescriptor()
3 years, 11 months
1
0
0
0
[reactos] 01/01: [INF] Add missing Polish (pl-PL) translation to machine.inf (#3413)
by Piotr Hetnarowicz
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=74082ec644caec85ee868…
commit 74082ec644caec85ee868f845bc5f86b4710151e Author: Piotr Hetnarowicz <40692062+pithwz(a)users.noreply.github.com> AuthorDate: Tue Jan 5 15:06:18 2021 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Jan 5 17:06:18 2021 +0300 [INF] Add missing Polish (pl-PL) translation to machine.inf (#3413) --- media/inf/machine.inf | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/media/inf/machine.inf b/media/inf/machine.inf index d107e6be95f..dddb1b32162 100644 --- a/media/inf/machine.inf +++ b/media/inf/machine.inf @@ -450,6 +450,8 @@ GenericMfg = "(Standardowe urządzenia systemowe)" *PNP0A00.DeviceDesc = "Magistrala ISA" *PNP0A03.DeviceDesc = "Magistrala PCI" *PNP0A05.DeviceDesc = "Generic ACPI bus" +*PNP0A06.DeviceDesc = "Rozszerzona magistrala we/wy / ogólne urządzenie kontenerowe" +*PNP0A08.DeviceDesc = "Magistrala PCI" *PNP0B00.DeviceDesc = "Zegar czasu rzeczywistego AT" *PNP0C01.DeviceDesc = "Płyta głowna" *PNP0C02.DeviceDesc = "Zasoby płyty głównej" @@ -459,9 +461,9 @@ GenericMfg = "(Standardowe urządzenia systemowe)" *PNP0C0D.DeviceDesc = "Pokrywa ACPI" *PNP0C0E.DeviceDesc = "Przycisk zasypiania ACPI" *PNP0C0F.DeviceDesc = "Urządzenie PCI interrupt link" -*PNP0C15.DeviceDesc = "Docking Station" +*PNP0C15.DeviceDesc = "Stacja dokująca" ACPI\FixedButton.DeviceDesc = "Przycisk ACPI Fixed Feature" -PCI\CC_0500.DeviceDesc = "Standard PCI RAM controller" +PCI\CC_0500.DeviceDesc = "Standardowy kontroler RAM PCI" PCI\CC_0600.DeviceDesc = "Standardowy mostek CPU do PCI" PCI\CC_0601.DeviceDesc = "Standardowy mostek PCI do ISA" PCI\CC_0604.DeviceDesc = "Standardowy mostek PCI do PCI"
3 years, 11 months
1
0
0
0
[reactos] 07/07: [ACPI] Fix compilation with GCC x64
by Hervé Poussineau
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=31fd1ba0c6e425789988b…
commit 31fd1ba0c6e425789988b2d2ce618a31b0feb062 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Tue Dec 29 18:12:30 2020 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Tue Jan 5 14:19:45 2021 +0100 [ACPI] Fix compilation with GCC x64 --- drivers/bus/acpi/acpica/include/platform/acenv.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/bus/acpi/acpica/include/platform/acenv.h b/drivers/bus/acpi/acpica/include/platform/acenv.h index 9ed06328e52..94fdf62b75c 100644 --- a/drivers/bus/acpi/acpica/include/platform/acenv.h +++ b/drivers/bus/acpi/acpica/include/platform/acenv.h @@ -186,7 +186,7 @@ * *****************************************************************************/ -#if (defined(__GNUC__) || defined(__clang__)) && !defined(__INTEL_COMPILER) +#if (defined(__GNUC__) || defined(__clang__)) && !defined(__INTEL_COMPILER) && !defined(WIN64) #include "acgcc.h" #elif defined(_MSC_VER)
3 years, 11 months
1
0
0
0
[reactos] 06/07: [CRT] Use correct prototypes for GCC x64
by Hervé Poussineau
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e3cbdcf2e94c576ce31b9…
commit e3cbdcf2e94c576ce31b9aec33a7b4666acecc97 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Tue Dec 29 19:08:38 2020 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Tue Jan 5 14:19:45 2021 +0100 [CRT] Use correct prototypes for GCC x64 --- sdk/include/crt/mingw32/intrin_x86.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/include/crt/mingw32/intrin_x86.h b/sdk/include/crt/mingw32/intrin_x86.h index 600402bce66..ee41ff971a2 100644 --- a/sdk/include/crt/mingw32/intrin_x86.h +++ b/sdk/include/crt/mingw32/intrin_x86.h @@ -834,7 +834,7 @@ __INTRIN_INLINE void __movsd(unsigned long * Destination, const unsigned long * } #ifdef __x86_64__ -__INTRIN_INLINE void __movsq(unsigned long * Destination, const unsigned long * Source, size_t Count) +__INTRIN_INLINE void __movsq(unsigned long long * Destination, const unsigned long long * Source, size_t Count) { __asm__ __volatile__ ( @@ -927,7 +927,7 @@ __INTRIN_INLINE void __addgsword(unsigned long Offset, unsigned short Data) __asm__ __volatile__("addw %w[Data], %%gs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "ir" (Data) : "memory"); } -__INTRIN_INLINE void __addgsdword(unsigned long Offset, unsigned int Data) +__INTRIN_INLINE void __addgsdword(unsigned long Offset, unsigned long Data) { __asm__ __volatile__("addl %k[Data], %%gs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "ir" (Data) : "memory"); }
3 years, 11 months
1
0
0
0
[reactos] 05/07: [CRT] Remove bad define of _int128 in GCC x64
by Hervé Poussineau
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=de647b4155c5af6c96f52…
commit de647b4155c5af6c96f52c0162d3d8545a4a25ce Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Tue Dec 29 18:11:24 2020 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Tue Jan 5 14:19:45 2021 +0100 [CRT] Remove bad define of _int128 in GCC x64 --- sdk/include/crt/_mingw.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/sdk/include/crt/_mingw.h b/sdk/include/crt/_mingw.h index a0da23de0f2..99030d543e4 100644 --- a/sdk/include/crt/_mingw.h +++ b/sdk/include/crt/_mingw.h @@ -185,9 +185,6 @@ allow GCC to optimize away some EH unwind code, at least in DW2 case. */ #define __int16 short #define __int32 int #define __int64 long long -#ifdef _WIN64 - typedef int __int128 __attribute__ ((mode (TI))); -# endif # define __ptr32 # define __ptr64 # ifdef __cplusplus
3 years, 11 months
1
0
0
0
[reactos] 04/07: [INCLUDE/WINE] Always define interlocked_* aliases
by Hervé Poussineau
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d0b46c6c43b5c4a919575…
commit d0b46c6c43b5c4a919575b1f5ca293e93187e68b Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Tue Dec 29 18:22:06 2020 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Tue Jan 5 14:19:45 2021 +0100 [INCLUDE/WINE] Always define interlocked_* aliases This was already true for MSVC and GCC x86, make it true for GCC x64. --- sdk/include/reactos/wine/port.h | 5 ----- 1 file changed, 5 deletions(-) diff --git a/sdk/include/reactos/wine/port.h b/sdk/include/reactos/wine/port.h index 26acee00d69..e7ce4ed2555 100644 --- a/sdk/include/reactos/wine/port.h +++ b/sdk/include/reactos/wine/port.h @@ -340,17 +340,12 @@ extern int spawnvp(int mode, const char *cmdname, const char * const argv[]); /* Interlocked functions */ -#if defined(_MSC_VER) || (defined(__i386__) && defined(__GNUC__) && !defined(WINE_PORT_NO_INTERLOCKED)) - #define interlocked_cmpxchg InterlockedCompareExchange #define interlocked_cmpxchg_ptr InterlockedCompareExchangePointer #define interlocked_xchg InterlockedExchange #define interlocked_xchg_ptr InterlockedExchangePointer #define interlocked_xchg_add InterlockedExchangeAdd - -#endif /* __i386___ && __GNUC__ */ - #if defined(_MSC_VER) && !defined(__clang__) __forceinline int
3 years, 11 months
1
0
0
0
[reactos] 03/07: [SDK] Fix hack for GCC, so that it works on GCC x86 and GCC x64
by Hervé Poussineau
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3468e27cfe4bb41af2829…
commit 3468e27cfe4bb41af2829b93f56ff7ee149d3bf5 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Tue Dec 29 19:15:21 2020 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Tue Jan 5 14:19:45 2021 +0100 [SDK] Fix hack for GCC, so that it works on GCC x86 and GCC x64 --- sdk/include/psdk/delayimp.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/include/psdk/delayimp.h b/sdk/include/psdk/delayimp.h index da87b53514b..266e920f082 100644 --- a/sdk/include/psdk/delayimp.h +++ b/sdk/include/psdk/delayimp.h @@ -3,7 +3,7 @@ #ifdef __GNUC__ /* Hack, for bug in ld. Will be removed soon. */ -#define __ImageBase _image_base__ +#define __ImageBase __MINGW_LSYMBOL(_image_base__) #endif #if defined(__cplusplus)
3 years, 11 months
1
0
0
0
[reactos] 02/07: [ASM:X64] Remove XSAVE_ALIGN variable (as already done on x86)
by Hervé Poussineau
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3187e2a00bd95186db8f6…
commit 3187e2a00bd95186db8f682637a703c226b3842b Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Tue Dec 29 19:10:30 2020 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Tue Jan 5 14:19:45 2021 +0100 [ASM:X64] Remove XSAVE_ALIGN variable (as already done on x86) --- sdk/include/asm/ksamd64.template.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/include/asm/ksamd64.template.h b/sdk/include/asm/ksamd64.template.h index 8b3b82ff850..41f7e7e4e16 100644 --- a/sdk/include/asm/ksamd64.template.h +++ b/sdk/include/asm/ksamd64.template.h @@ -854,7 +854,7 @@ OFFSET(XctxArea, XSTATE_CONTEXT, Area), HEADER("XSAVE_AREA offsets"), OFFSET(XsaHeader, XSAVE_AREA, Header), SIZE(XsaHeaderLength, XSAVE_AREA_HEADER), -CONSTANTX(XSAVE_ALIGN, _alignof(XSAVE_AREA)), +//CONSTANTX(XSAVE_ALIGN, _alignof(XSAVE_AREA)), //CONSTANT(CFlushSize),
3 years, 11 months
1
0
0
0
[reactos] 01/07: [CMAKE] Use -Wno-error when compiling with GCC x64
by Hervé Poussineau
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=39545c33857fdd8ed5857…
commit 39545c33857fdd8ed58574ac349443d0eefd3bb1 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Tue Dec 29 18:14:30 2020 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Tue Jan 5 14:19:45 2021 +0100 [CMAKE] Use -Wno-error when compiling with GCC x64 --- sdk/cmake/gcc.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/sdk/cmake/gcc.cmake b/sdk/cmake/gcc.cmake index 72c0f5d09e0..9e94d499ea8 100644 --- a/sdk/cmake/gcc.cmake +++ b/sdk/cmake/gcc.cmake @@ -148,6 +148,7 @@ if(ARCH STREQUAL "i386") endif() elseif(ARCH STREQUAL "amd64") add_compile_options(-mpreferred-stack-boundary=4) + add_compile_options(-Wno-error) endif() # Other
3 years, 11 months
1
0
0
0
[reactos] 01/01: [PSDK] Add more safe integer routines for LONGLONGs
by Jérôme Gardou
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5f3d3d7d48774fc9b997d…
commit 5f3d3d7d48774fc9b997d57e2f4694ff6655d3ad Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Tue Dec 29 16:40:03 2020 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Tue Jan 5 13:40:35 2021 +0100 [PSDK] Add more safe integer routines for LONGLONGs --- sdk/include/psdk/intsafe.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sdk/include/psdk/intsafe.h b/sdk/include/psdk/intsafe.h index 10fb173beb5..2dc0954b152 100644 --- a/sdk/include/psdk/intsafe.h +++ b/sdk/include/psdk/intsafe.h @@ -382,6 +382,8 @@ DEFINE_SAFE_CONVERT_STOU(LongPtrToULong, LONG_PTR, ULONG) DEFINE_SAFE_CONVERT_STOU(LongPtrToUIntPtr, LONG_PTR, UINT_PTR) DEFINE_SAFE_CONVERT_STOU(LongPtrToULongPtr, LONG_PTR, ULONG_PTR) DEFINE_SAFE_CONVERT_STOU(LongPtrToULongLong, LONG_PTR, ULONGLONG) +DEFINE_SAFE_CONVERT_STOU(LongLongToULong, LONGLONG, ULONG) +DEFINE_SAFE_CONVERT_STOU(LongLongToULongPtr, LONGLONG, ULONG_PTR) #ifdef _CHAR_UNSIGNED DEFINE_SAFE_CONVERT_STOU(ShortToChar, SHORT, UINT8) DEFINE_SAFE_CONVERT_STOU(LongPtrToChar, LONG_PTR, UINT8) @@ -460,6 +462,9 @@ DEFINE_SAFE_CONVERT_STOS(LongPtrToChar, LONG_PTR, _INTSAFE_CHAR) #define RtlSIZETToULong RtlULongPtrToULong #define RtlSSIZETToULongLong RtlLongPtrToULongLong #define RtlSSIZETToULong RtlLongPtrToULong +#define RtlLongLongToSizeT RtlLongLongToUIntPtr +#define RtlLongLongToSSIZET RtlLongLongToLongPtr +#define RtlLongLongToSIZET RtlLongLongToULongPtr #ifdef _WIN64 #define RtlIntToUIntPtr RtlIntToULongLong #define RtlULongLongToIntPtr RtlULongLongToLongLong @@ -497,6 +502,9 @@ DEFINE_SAFE_CONVERT_STOS(LongPtrToChar, LONG_PTR, _INTSAFE_CHAR) #define SIZETToULong ULongPtrToULong #define SSIZETToULongLong LongPtrToULongLong #define SSIZETToULong LongPtrToULong +#define LongLongToSizeT LongLongToUIntPtr +#define LongLongToSSIZET LongLongToLongPtr +#define LongLongToSIZET LongLongToULongPtr #ifdef _WIN64 #define IntToUIntPtr IntToULongLong #define ULongLongToIntPtr ULongLongToLongLong
3 years, 11 months
1
0
0
0
← Newer
1
...
5
6
7
8
9
10
11
...
15
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
Results per page:
10
25
50
100
200