Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/04: [DLL:KEYBOARD] Add a dead keys transformations collection. (#861)
by Ștefan Fulea 08 Dec '18

08 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3c82e46ef1fc058ac8237… commit 3c82e46ef1fc058ac8237ef17706de7292df3319 Author: Ștefan Fulea <stefan.fulea(a)mail.com> AuthorDate: Sat Sep 15 20:59:55 2018 +0300 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Dec 8 18:50:47 2018 +0100 [DLL:KEYBOARD] Add a dead keys transformations collection. (#861) It contains all the Unicode characters that can be formed with a given dead key (i.e. combining character). Keyboard layouts with dead keys may find these useful. CORE-15056 --- dll/keyboard/kbdrost/deadkeys/acute_acc | 40 +++++++++++++++++++++++++ dll/keyboard/kbdrost/deadkeys/breve | 22 ++++++++++++++ dll/keyboard/kbdrost/deadkeys/caron | 40 +++++++++++++++++++++++++ dll/keyboard/kbdrost/deadkeys/circumflex | 32 ++++++++++++++++++++ dll/keyboard/kbdrost/deadkeys/comma_below | 10 +++++++ dll/keyboard/kbdrost/deadkeys/dbl_acute_acc | 10 +++++++ dll/keyboard/kbdrost/deadkeys/dot_above | 45 +++++++++++++++++++++++++++++ dll/keyboard/kbdrost/deadkeys/grave_acc | 22 ++++++++++++++ dll/keyboard/kbdrost/deadkeys/ogonek | 16 ++++++++++ dll/keyboard/kbdrost/deadkeys/ring_above | 14 +++++++++ dll/keyboard/kbdrost/deadkeys/tilde | 22 ++++++++++++++ 11 files changed, 273 insertions(+) diff --git a/dll/keyboard/kbdrost/deadkeys/acute_acc b/dll/keyboard/kbdrost/deadkeys/acute_acc new file mode 100644 index 0000000000..af7bc5b0ff --- /dev/null +++ b/dll/keyboard/kbdrost/deadkeys/acute_acc @@ -0,0 +1,40 @@ +/* + * COMBINING ACUTE ACCENT + * The dead key transformation set was defined by checking the availability of + * the resulting letters in Unicode character table: https://unicode-table.com + */ + + { DEADTRANS(L'a', 0x0301, 0x00E1, 0x00) }, + { DEADTRANS(L'A', 0x0301, 0x00C1, 0x00) }, + { DEADTRANS(L'c', 0x0301, 0x0107, 0x00) }, + { DEADTRANS(L'C', 0x0301, 0x0106, 0x00) }, + { DEADTRANS(L'e', 0x0301, 0x00E9, 0x00) }, + { DEADTRANS(L'E', 0x0301, 0x00C9, 0x00) }, + { DEADTRANS(L'g', 0x0301, 0x01F4, 0x00) }, + { DEADTRANS(L'G', 0x0301, 0x01F5, 0x00) }, + { DEADTRANS(L'i', 0x0301, 0x00ED, 0x00) }, + { DEADTRANS(L'I', 0x0301, 0x00CD, 0x00) }, + { DEADTRANS(L'k', 0x0301, 0x1E31, 0x00) }, + { DEADTRANS(L'K', 0x0301, 0x1E30, 0x00) }, + { DEADTRANS(L'l', 0x0301, 0x013A, 0x00) }, + { DEADTRANS(L'L', 0x0301, 0x0139, 0x00) }, + { DEADTRANS(L'm', 0x0301, 0x1E3F, 0x00) }, + { DEADTRANS(L'M', 0x0301, 0x1E3E, 0x00) }, + { DEADTRANS(L'n', 0x0301, 0x0144, 0x00) }, + { DEADTRANS(L'N', 0x0301, 0x0143, 0x00) }, + { DEADTRANS(L'o', 0x0301, 0x00F3, 0x00) }, + { DEADTRANS(L'O', 0x0301, 0x00D3, 0x00) }, + { DEADTRANS(L'p', 0x0301, 0x1E55, 0x00) }, + { DEADTRANS(L'P', 0x0301, 0x1E54, 0x00) }, + { DEADTRANS(L'r', 0x0301, 0x0155, 0x00) }, + { DEADTRANS(L'R', 0x0301, 0x0154, 0x00) }, + { DEADTRANS(L's', 0x0301, 0x015B, 0x00) }, + { DEADTRANS(L'S', 0x0301, 0x015A, 0x00) }, + { DEADTRANS(L'u', 0x0301, 0x00FA, 0x00) }, + { DEADTRANS(L'U', 0x0301, 0x00DA, 0x00) }, + { DEADTRANS(L'w', 0x0301, 0x1E83, 0x00) }, + { DEADTRANS(L'W', 0x0301, 0x1E82, 0x00) }, + { DEADTRANS(L'y', 0x0301, 0x00FD, 0x00) }, + { DEADTRANS(L'Y', 0x0301, 0x00DD, 0x00) }, + { DEADTRANS(L'z', 0x0301, 0x017A, 0x00) }, + { DEADTRANS(L'Z', 0x0301, 0x0179, 0x00) }, diff --git a/dll/keyboard/kbdrost/deadkeys/breve b/dll/keyboard/kbdrost/deadkeys/breve new file mode 100644 index 0000000000..f6ec412c16 --- /dev/null +++ b/dll/keyboard/kbdrost/deadkeys/breve @@ -0,0 +1,22 @@ +/* + * COMBINING BREVE + * The dead key transformation set was defined by checking the availability of + * the resulting letters in Unicode character table: https://unicode-table.com + */ + + { DEADTRANS(L'a', 0x0306, 0x0103, 0x00) }, + { DEADTRANS(L'A', 0x0306, 0x0102, 0x00) }, + { DEADTRANS(L'e', 0x0306, 0x0115, 0x00) }, + { DEADTRANS(L'E', 0x0306, 0x0114, 0x00) }, + { DEADTRANS(L'g', 0x0306, 0x011F, 0x00) }, + { DEADTRANS(L'G', 0x0306, 0x011E, 0x00) }, + { DEADTRANS(L'i', 0x0306, 0x012D, 0x00) }, + { DEADTRANS(L'I', 0x0306, 0x012C, 0x00) }, + { DEADTRANS(L'i', 0x0306, 0x012D, 0x00) }, + { DEADTRANS(L'I', 0x0306, 0x012C, 0x00) }, + { DEADTRANS(L'o', 0x0306, 0x014F, 0x00) }, + { DEADTRANS(L'O', 0x0306, 0x014E, 0x00) }, + { DEADTRANS(L'u', 0x0306, 0x016D, 0x00) }, + { DEADTRANS(L'U', 0x0306, 0x016C, 0x00) }, + { DEADTRANS(L'u', 0x0306, 0x016D, 0x00) }, + { DEADTRANS(L'U', 0x0306, 0x016C, 0x00) }, diff --git a/dll/keyboard/kbdrost/deadkeys/caron b/dll/keyboard/kbdrost/deadkeys/caron new file mode 100644 index 0000000000..2e73970dfb --- /dev/null +++ b/dll/keyboard/kbdrost/deadkeys/caron @@ -0,0 +1,40 @@ +/* + * COMBINING CARON + * The dead key transformation set was defined by checking the availability of + * the resulting letters in Unicode character table: https://unicode-table.com + */ + + { DEADTRANS(L'a', 0x030C, 0x01CE, 0x00) }, + { DEADTRANS(L'A', 0x030C, 0x01CD, 0x00) }, + { DEADTRANS(L'c', 0x030C, 0x010D, 0x00) }, + { DEADTRANS(L'C', 0x030C, 0x010C, 0x00) }, + { DEADTRANS(L'd', 0x030C, 0x010F, 0x00) }, + { DEADTRANS(L'D', 0x030C, 0x010E, 0x00) }, + { DEADTRANS(L'e', 0x030C, 0x011B, 0x00) }, + { DEADTRANS(L'E', 0x030C, 0x011A, 0x00) }, + { DEADTRANS(L'g', 0x030C, 0x01E7, 0x00) }, + { DEADTRANS(L'G', 0x030C, 0x01E6, 0x00) }, + { DEADTRANS(L'h', 0x030C, 0x021F, 0x00) }, + { DEADTRANS(L'H', 0x030C, 0x021E, 0x00) }, + { DEADTRANS(L'i', 0x030C, 0x01D0, 0x00) }, + { DEADTRANS(L'I', 0x030C, 0x01CF, 0x00) }, + { DEADTRANS(L'j', 0x030C, 0x01F0, 0x00) }, + /* no Unicode capital J with caron */ + { DEADTRANS(L'k', 0x030C, 0x01E9, 0x00) }, + { DEADTRANS(L'K', 0x030C, 0x01E8, 0x00) }, + { DEADTRANS(L'l', 0x030C, 0x013E, 0x00) }, + { DEADTRANS(L'L', 0x030C, 0x013D, 0x00) }, + { DEADTRANS(L'n', 0x030C, 0x0148, 0x00) }, + { DEADTRANS(L'N', 0x030C, 0x0147, 0x00) }, + { DEADTRANS(L'o', 0x030C, 0x01D2, 0x00) }, + { DEADTRANS(L'O', 0x030C, 0x01D1, 0x00) }, + { DEADTRANS(L'r', 0x030C, 0x0159, 0x00) }, + { DEADTRANS(L'R', 0x030C, 0x0158, 0x00) }, + { DEADTRANS(L's', 0x030C, 0x0161, 0x00) }, + { DEADTRANS(L'S', 0x030C, 0x0160, 0x00) }, + { DEADTRANS(L't', 0x030C, 0x0165, 0x00) }, + { DEADTRANS(L'T', 0x030C, 0x0164, 0x00) }, + { DEADTRANS(L'u', 0x030C, 0x01D4, 0x00) }, + { DEADTRANS(L'U', 0x030C, 0x01D3, 0x00) }, + { DEADTRANS(L'z', 0x030C, 0x017E, 0x00) }, + { DEADTRANS(L'Z', 0x030C, 0x017D, 0x00) }, diff --git a/dll/keyboard/kbdrost/deadkeys/circumflex b/dll/keyboard/kbdrost/deadkeys/circumflex new file mode 100644 index 0000000000..142a7faaed --- /dev/null +++ b/dll/keyboard/kbdrost/deadkeys/circumflex @@ -0,0 +1,32 @@ +/* + * COMBINING CIRCUMFLEX + * The dead key transformation set was defined by checking the availability of + * the resulting letters in Unicode character table: https://unicode-table.com + */ + + { DEADTRANS(L'a', 0x0302, 0x00E2, 0x00) }, + { DEADTRANS(L'A', 0x0302, 0x00C2, 0x00) }, + { DEADTRANS(L'c', 0x0302, 0x0109, 0x00) }, + { DEADTRANS(L'C', 0x0302, 0x0108, 0x00) }, + { DEADTRANS(L'e', 0x0302, 0x00EA, 0x00) }, + { DEADTRANS(L'E', 0x0302, 0x00CA, 0x00) }, + { DEADTRANS(L'g', 0x0302, 0x011D, 0x00) }, + { DEADTRANS(L'G', 0x0302, 0x011C, 0x00) }, + { DEADTRANS(L'h', 0x0302, 0x0125, 0x00) }, + { DEADTRANS(L'H', 0x0302, 0x0124, 0x00) }, + { DEADTRANS(L'i', 0x0302, 0x00EE, 0x00) }, + { DEADTRANS(L'I', 0x0302, 0x00CE, 0x00) }, + { DEADTRANS(L'j', 0x0302, 0x0135, 0x00) }, + { DEADTRANS(L'J', 0x0302, 0x0134, 0x00) }, + { DEADTRANS(L'o', 0x0302, 0x00F4, 0x00) }, + { DEADTRANS(L'O', 0x0302, 0x00D4, 0x00) }, + { DEADTRANS(L's', 0x0302, 0x015D, 0x00) }, + { DEADTRANS(L'S', 0x0302, 0x015C, 0x00) }, + { DEADTRANS(L'u', 0x0302, 0x00FB, 0x00) }, + { DEADTRANS(L'U', 0x0302, 0x00DB, 0x00) }, + { DEADTRANS(L'w', 0x0302, 0x0175, 0x00) }, + { DEADTRANS(L'W', 0x0302, 0x0174, 0x00) }, + { DEADTRANS(L'y', 0x0302, 0x0177, 0x00) }, + { DEADTRANS(L'Y', 0x0302, 0x0176, 0x00) }, + { DEADTRANS(L'z', 0x0302, 0x1E91, 0x00) }, + { DEADTRANS(L'Z', 0x0302, 0x1E90, 0x00) }, diff --git a/dll/keyboard/kbdrost/deadkeys/comma_below b/dll/keyboard/kbdrost/deadkeys/comma_below new file mode 100644 index 0000000000..d63625003c --- /dev/null +++ b/dll/keyboard/kbdrost/deadkeys/comma_below @@ -0,0 +1,10 @@ +/* + * COMBINING COMMA BELOW + * The dead key transformation set was defined by checking the availability of + * the resulting letters in Unicode character table: https://unicode-table.com + */ + + { DEADTRANS(L's', 0x0326, 0x0219, 0x00) }, + { DEADTRANS(L'S', 0x0326, 0x0218, 0x00) }, + { DEADTRANS(L't', 0x0326, 0x021B, 0x00) }, + { DEADTRANS(L'T', 0x0326, 0x021A, 0x00) }, diff --git a/dll/keyboard/kbdrost/deadkeys/dbl_acute_acc b/dll/keyboard/kbdrost/deadkeys/dbl_acute_acc new file mode 100644 index 0000000000..772d92e37e --- /dev/null +++ b/dll/keyboard/kbdrost/deadkeys/dbl_acute_acc @@ -0,0 +1,10 @@ +/* + * COMBINING DOUBLE ACUTE ACCENT + * The dead key transformation set was defined by checking the availability of + * the resulting letters in Unicode character table: https://unicode-table.com + */ + + { DEADTRANS(L'o', 0x030B, 0x0151, 0x00) }, + { DEADTRANS(L'O', 0x030B, 0x0150, 0x00) }, + { DEADTRANS(L'u', 0x030B, 0x0171, 0x00) }, + { DEADTRANS(L'U', 0x030B, 0x0170, 0x00) }, diff --git a/dll/keyboard/kbdrost/deadkeys/dot_above b/dll/keyboard/kbdrost/deadkeys/dot_above new file mode 100644 index 0000000000..ced75d45ca --- /dev/null +++ b/dll/keyboard/kbdrost/deadkeys/dot_above @@ -0,0 +1,45 @@ +/* + * COMBINING DOT ABOVE + * The dead key transformation set was defined by checking the availability of + * the resulting letters in Unicode character table: https://unicode-table.com + */ + + { DEADTRANS(L'a', 0x0307, 0x0227, 0x00) }, + { DEADTRANS(L'A', 0x0307, 0x0226, 0x00) }, + { DEADTRANS(L'b', 0x0307, 0x1E03, 0x00) }, + { DEADTRANS(L'B', 0x0307, 0x1E02, 0x00) }, + { DEADTRANS(L'c', 0x0307, 0x010B, 0x00) }, + { DEADTRANS(L'C', 0x0307, 0x010A, 0x00) }, + { DEADTRANS(L'd', 0x0307, 0x1E0B, 0x00) }, + { DEADTRANS(L'D', 0x0307, 0x1E0A, 0x00) }, + { DEADTRANS(L'e', 0x0307, 0x0117, 0x00) }, + { DEADTRANS(L'E', 0x0307, 0x0116, 0x00) }, + { DEADTRANS(L'f', 0x0307, 0x1E1F, 0x00) }, + { DEADTRANS(L'F', 0x0307, 0x1E1E, 0x00) }, + { DEADTRANS(L'g', 0x0307, 0x0121, 0x00) }, + { DEADTRANS(L'G', 0x0307, 0x0120, 0x00) }, + { DEADTRANS(L'h', 0x0307, 0x1E23, 0x00) }, + { DEADTRANS(L'H', 0x0307, 0x1E22, 0x00) }, + { DEADTRANS(L'I', 0x0307, 0x0130, 0x00) }, + { DEADTRANS(L'm', 0x0307, 0x1E41, 0x00) }, + { DEADTRANS(L'M', 0x0307, 0x1E40, 0x00) }, + { DEADTRANS(L'n', 0x0307, 0x1E45, 0x00) }, + { DEADTRANS(L'N', 0x0307, 0x1E44, 0x00) }, + { DEADTRANS(L'o', 0x0307, 0x022F, 0x00) }, + { DEADTRANS(L'O', 0x0307, 0x022E, 0x00) }, + { DEADTRANS(L'p', 0x0307, 0x1E57, 0x00) }, + { DEADTRANS(L'P', 0x0307, 0x1E56, 0x00) }, + { DEADTRANS(L'r', 0x0307, 0x1E59, 0x00) }, + { DEADTRANS(L'R', 0x0307, 0x1E58, 0x00) }, + { DEADTRANS(L's', 0x0307, 0x1E61, 0x00) }, + { DEADTRANS(L'S', 0x0307, 0x1E60, 0x00) }, + { DEADTRANS(L't', 0x0307, 0x1E6B, 0x00) }, + { DEADTRANS(L'T', 0x0307, 0x1E6A, 0x00) }, + { DEADTRANS(L'w', 0x0307, 0x1E87, 0x00) }, + { DEADTRANS(L'W', 0x0307, 0x1E86, 0x00) }, + { DEADTRANS(L'x', 0x0307, 0x1E8B, 0x00) }, + { DEADTRANS(L'X', 0x0307, 0x1E8A, 0x00) }, + { DEADTRANS(L'y', 0x0307, 0x1E8F, 0x00) }, + { DEADTRANS(L'Y', 0x0307, 0x1E8E, 0x00) }, + { DEADTRANS(L'z', 0x0307, 0x017C, 0x00) }, + { DEADTRANS(L'Z', 0x0307, 0x017B, 0x00) }, diff --git a/dll/keyboard/kbdrost/deadkeys/grave_acc b/dll/keyboard/kbdrost/deadkeys/grave_acc new file mode 100644 index 0000000000..467a482e3d --- /dev/null +++ b/dll/keyboard/kbdrost/deadkeys/grave_acc @@ -0,0 +1,22 @@ +/* + * COMBINING GRAVE ACCENT + * The dead key transformation set was defined by checking the availability of + * the resulting letters in Unicode character table: https://unicode-table.com + */ + + { DEADTRANS(L'a', 0x0300, 0x00E0, 0x00) }, + { DEADTRANS(L'A', 0x0300, 0x00C0, 0x00) }, + { DEADTRANS(L'e', 0x0300, 0x00E8, 0x00) }, + { DEADTRANS(L'E', 0x0300, 0x00C8, 0x00) }, + { DEADTRANS(L'i', 0x0300, 0x00EC, 0x00) }, + { DEADTRANS(L'I', 0x0300, 0x00CC, 0x00) }, + { DEADTRANS(L'n', 0x0300, 0x01F9, 0x00) }, + { DEADTRANS(L'N', 0x0300, 0x01F8, 0x00) }, + { DEADTRANS(L'o', 0x0300, 0x00F2, 0x00) }, + { DEADTRANS(L'O', 0x0300, 0x00D2, 0x00) }, + { DEADTRANS(L'u', 0x0300, 0x00F9, 0x00) }, + { DEADTRANS(L'U', 0x0300, 0x00D9, 0x00) }, + { DEADTRANS(L'w', 0x0300, 0x1E81, 0x00) }, + { DEADTRANS(L'W', 0x0300, 0x1E80, 0x00) }, + { DEADTRANS(L'y', 0x0300, 0x1EF3, 0x00) }, + { DEADTRANS(L'Y', 0x0300, 0x1EF2, 0x00) }, diff --git a/dll/keyboard/kbdrost/deadkeys/ogonek b/dll/keyboard/kbdrost/deadkeys/ogonek new file mode 100644 index 0000000000..f33dbecad2 --- /dev/null +++ b/dll/keyboard/kbdrost/deadkeys/ogonek @@ -0,0 +1,16 @@ +/* + * COMBINING OGONEK + * The dead key transformation set was defined by checking the availability of + * the resulting letters in Unicode character table: https://unicode-table.com + */ + + { DEADTRANS(L'a', 0x0328, 0x0105, 0x00) }, + { DEADTRANS(L'A', 0x0328, 0x0104, 0x00) }, + { DEADTRANS(L'e', 0x0328, 0x0119, 0x00) }, + { DEADTRANS(L'E', 0x0328, 0x0118, 0x00) }, + { DEADTRANS(L'i', 0x0328, 0x012F, 0x00) }, + { DEADTRANS(L'I', 0x0328, 0x012E, 0x00) }, + { DEADTRANS(L'o', 0x0328, 0x01EB, 0x00) }, + { DEADTRANS(L'O', 0x0328, 0x01EA, 0x00) }, + { DEADTRANS(L'u', 0x0328, 0x0173, 0x00) }, + { DEADTRANS(L'U', 0x0328, 0x0172, 0x00) }, diff --git a/dll/keyboard/kbdrost/deadkeys/ring_above b/dll/keyboard/kbdrost/deadkeys/ring_above new file mode 100644 index 0000000000..e4a451991c --- /dev/null +++ b/dll/keyboard/kbdrost/deadkeys/ring_above @@ -0,0 +1,14 @@ +/* + * COMBINING RING ABOVE + * The dead key transformation set was defined by checking the availability of + * the resulting letters in Unicode character table: https://unicode-table.com + */ + + { DEADTRANS(L'a', 0x030A, 0x00E5, 0x00) }, + { DEADTRANS(L'A', 0x030A, 0x00C5, 0x00) }, + { DEADTRANS(L'u', 0x030A, 0x016F, 0x00) }, + { DEADTRANS(L'U', 0x030A, 0x016E, 0x00) }, + { DEADTRANS(L'w', 0x030A, 0x1E98, 0x00) }, + /* no Unicode capital W with ring above */ + { DEADTRANS(L'y', 0x030A, 0x1E99, 0x00) }, + /* no Unicode capital Y with ring above */ diff --git a/dll/keyboard/kbdrost/deadkeys/tilde b/dll/keyboard/kbdrost/deadkeys/tilde new file mode 100644 index 0000000000..e7ee716ddc --- /dev/null +++ b/dll/keyboard/kbdrost/deadkeys/tilde @@ -0,0 +1,22 @@ +/* + * COMBINING TILDE + * The dead key transformation set was defined by checking the availability of + * the resulting letters in Unicode character table: https://unicode-table.com + */ + + { DEADTRANS(L'a', 0x0303, 0x00E3, 0x00) }, + { DEADTRANS(L'A', 0x0303, 0x00C3, 0x00) }, + { DEADTRANS(L'e', 0x0303, 0x1EBD, 0x00) }, + { DEADTRANS(L'E', 0x0303, 0x1EBC, 0x00) }, + { DEADTRANS(L'i', 0x0303, 0x0129, 0x00) }, + { DEADTRANS(L'I', 0x0303, 0x0128, 0x00) }, + { DEADTRANS(L'n', 0x0303, 0x00F1, 0x00) }, + { DEADTRANS(L'N', 0x0303, 0x00D1, 0x00) }, + { DEADTRANS(L'o', 0x0303, 0x00F5, 0x00) }, + { DEADTRANS(L'O', 0x0303, 0x00D5, 0x00) }, + { DEADTRANS(L'u', 0x0303, 0x0169, 0x00) }, + { DEADTRANS(L'U', 0x0303, 0x0168, 0x00) }, + { DEADTRANS(L'v', 0x0303, 0x1E7D, 0x00) }, + { DEADTRANS(L'V', 0x0303, 0x1E7C, 0x00) }, + { DEADTRANS(L'y', 0x0303, 0x1EF9, 0x00) }, + { DEADTRANS(L'Y', 0x0303, 0x1EF8, 0x00) },

1 0

[reactos] 04/04: [LOG2LINES] Free all memory on exit.
by Serge Gautherie 08 Dec '18

08 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b92f1f4cdf3143eaad6d5… commit b92f1f4cdf3143eaad6d5220c538c23658b759ec Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Sun Aug 26 03:05:46 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Dec 8 17:38:24 2018 +0100 [LOG2LINES] Free all memory on exit. --- sdk/tools/log2lines/log2lines.c | 41 +++++++++++++++++++++++++++++++++++------ 1 file changed, 35 insertions(+), 6 deletions(-) diff --git a/sdk/tools/log2lines/log2lines.c b/sdk/tools/log2lines/log2lines.c index 025ccaa49e..cbe9482f49 100644 --- a/sdk/tools/log2lines/log2lines.c +++ b/sdk/tools/log2lines/log2lines.c @@ -579,7 +579,8 @@ main(int argc, const char **argv) if (optCount < 0 || optInit < 0) { - return optCount; + res = optCount; + goto cleanup; } argc -= optCount; @@ -587,21 +588,30 @@ main(int argc, const char **argv) if (opt_Revision && (strcmp(opt_Revision, "update") == 0)) { res = updateSvnlog(); - return res; + goto cleanup; } if (check_directory(opt_force)) - return 3; + { + res = 3; + goto cleanup; + } create_cache(opt_force, 0); if (opt_exit) - return 0; + { + res = 0; + goto cleanup; + } read_cache(); l2l_dbg(4, "Cache read complete\n"); if (set_LogFile(&logFile)) - return 2; + { + res = 2; + goto cleanup; + } l2l_dbg(4, "opt_logFile processed\n"); if (opt_Pipe) @@ -612,7 +622,8 @@ main(int argc, const char **argv) { dbgIn = stdin; //restore l2l_dbg(0, "Could not popen '%s' (%s)\n", opt_Pipe, strerror(errno)); - free(opt_Pipe); opt_Pipe = NULL; + free(opt_Pipe); + opt_Pipe = NULL; } } l2l_dbg(4, "opt_Pipe processed\n"); @@ -662,6 +673,24 @@ main(int argc, const char **argv) if (opt_Pipe) PCLOSE(dbgIn); +cleanup: + // See optionParse(). + if (opt_Revision) + { + free(opt_Revision); + opt_Revision = NULL; + } + + // See optionInit(). + if (opt_Pipe) + { + free(opt_Pipe); + opt_Pipe = NULL; + } + + list_clear(&sources); + list_clear(&cache); + return res; }

1 0

[reactos] 03/04: [LOG2LINES] Optimize malloc() calls.
by Serge Gautherie 08 Dec '18

08 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ca2bb9ee2852313935a1a… commit ca2bb9ee2852313935a1a5e1399a06adc5a562dc Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Sun Aug 26 03:05:46 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Dec 8 17:38:16 2018 +0100 [LOG2LINES] Optimize malloc() calls. --- sdk/tools/log2lines/options.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sdk/tools/log2lines/options.c b/sdk/tools/log2lines/options.c index 0bcbf068dc..8fb9bb2b7c 100644 --- a/sdk/tools/log2lines/options.c +++ b/sdk/tools/log2lines/options.c @@ -96,8 +96,8 @@ int optionInit(int argc, const char **argv) strcpy(opt_logFile, argv[i+1]); break; case 'P': - free(opt_Pipe); - opt_Pipe = malloc(LINESIZE); + if (!opt_Pipe) + opt_Pipe = malloc(LINESIZE); strcpy(opt_Pipe, argv[i+1]); break; case 'z': @@ -166,8 +166,8 @@ int optionParse(int argc, const char **argv) break; case 'R': optCount++; - free(opt_Revision); - opt_Revision = malloc(LINESIZE); + if (!opt_Revision) + opt_Revision = malloc(LINESIZE); sscanf(optarg, "%s", opt_Revision); if (strcmp(opt_Revision, "check") == 0) opt_Revision_check ++;

1 0

[reactos] 02/04: [LOG2LINES] Fix indentation.
by Hermès Bélusca-Maïto 08 Dec '18

08 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dbaa875f05b174594add8… commit dbaa875f05b174594add8bba3287ca1e6145862f Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Dec 8 17:31:17 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Dec 8 17:38:03 2018 +0100 [LOG2LINES] Fix indentation. --- sdk/tools/log2lines/log2lines.c | 170 ++++++++++++++++++++-------------------- 1 file changed, 85 insertions(+), 85 deletions(-) diff --git a/sdk/tools/log2lines/log2lines.c b/sdk/tools/log2lines/log2lines.c index f55e5ee5a1..025ccaa49e 100644 --- a/sdk/tools/log2lines/log2lines.c +++ b/sdk/tools/log2lines/log2lines.c @@ -420,120 +420,120 @@ translate_files(FILE *inFile, FILE *outFile) const char *p = kdbg_prompt; const char *p_eos = p + sizeof(KDBG_PROMPT) - 1; //end of string pos - memset(Line, '\0', LINESIZE + 1); - if (opt_console) + memset(Line, '\0', LINESIZE + 1); + if (opt_console) + { + while ((c = fgetc(inFile)) != EOF) { - while ((c = fgetc(inFile)) != EOF) - { - if (opt_quit)break; + if (opt_quit)break; - ch = (unsigned char)c; - if (!opt_raw) + ch = (unsigned char)c; + if (!opt_raw) + { + switch (ch) { - switch (ch) + case '\n': + if ( strncmp(Line, KDBG_DISCARD, sizeof(KDBG_DISCARD)-1) == 0 ) { - case '\n': - if ( strncmp(Line, KDBG_DISCARD, sizeof(KDBG_DISCARD)-1) == 0 ) - { - memset(Line, '\0', LINESIZE); // flushed - } - else + memset(Line, '\0', LINESIZE); // flushed + } + else + { + Line[1] = handle_escape_cmd(outFile, Line, path, LineOut); + if (Line[1] != KDBG_ESC_CHAR) { - Line[1] = handle_escape_cmd(outFile, Line, path, LineOut); - if (Line[1] != KDBG_ESC_CHAR) + if (p == p_eos) { - if (p == p_eos) + // kdbg prompt, so already echoed char by char + memset(Line, '\0', LINESIZE); + translate_char(c, outFile); + } + else + { + if (match_line(outFile, Line)) { - // kdbg prompt, so already echoed char by char - memset(Line, '\0', LINESIZE); + translate_line(outFile, Line, path, LineOut); translate_char(c, outFile); - } - else - { - if (match_line(outFile, Line)) - { - translate_line(outFile, Line, path, LineOut); - translate_char(c, outFile); - report(outFile); - } + report(outFile); } } } - i = 0; - p = kdbg_prompt; - pc = kdbg_cont; - break; - case '<': - i = 0; - Line[i++] = ch; - break; - case '>': - if (ch == *p) - { - p = p_eos; - translate_line(outFile, Line, path, LineOut); - } + } + i = 0; + p = kdbg_prompt; + pc = kdbg_cont; + break; + case '<': + i = 0; + Line[i++] = ch; + break; + case '>': + if (ch == *p) + { + p = p_eos; + translate_line(outFile, Line, path, LineOut); + } - if (p != p_eos) - { - if (i < LINESIZE) - { - Line[i++] = ch; - translate_line(outFile, Line, path, LineOut); - } - else - { - translate_line(outFile, Line, path, LineOut); - translate_char(c, outFile); - } - } - else - translate_char(c, outFile); - i = 0; - break; - default: - if (ch == *p)p++; - if (ch == *pc)pc++; + if (p != p_eos) + { if (i < LINESIZE) { Line[i++] = ch; - if (p == p_eos) - { - translate_char(c, outFile); - } - else if (!*pc) - { - translate_line(outFile, Line, path, LineOut); - i = 0; - } + translate_line(outFile, Line, path, LineOut); } else { translate_line(outFile, Line, path, LineOut); translate_char(c, outFile); + } + } + else + translate_char(c, outFile); + i = 0; + break; + default: + if (ch == *p)p++; + if (ch == *pc)pc++; + if (i < LINESIZE) + { + Line[i++] = ch; + if (p == p_eos) + { + translate_char(c, outFile); + } + else if (!*pc) + { + translate_line(outFile, Line, path, LineOut); i = 0; } } + else + { + translate_line(outFile, Line, path, LineOut); + translate_char(c, outFile); + i = 0; + } } - else - translate_char(c, outFile); } + else + translate_char(c, outFile); } - else - { // Line by line, slightly faster but less interactive - while (fgets(Line, LINESIZE, inFile) != NULL) - { - if (opt_quit)break; + } + else + { // Line by line, slightly faster but less interactive + while (fgets(Line, LINESIZE, inFile) != NULL) + { + if (opt_quit)break; - if (!opt_raw) - { - translate_line(outFile, Line, path, LineOut); - report(outFile); - } - else - log(outFile, "%s", Line); + if (!opt_raw) + { + translate_line(outFile, Line, path, LineOut); + report(outFile); } + else + log(outFile, "%s", Line); } + } if (opt_Revision && (strstr(opt_Revision, "regscan") == opt_Revision)) {

1 0

[reactos] 01/04: [LOG2LINES] Replace overkill malloc() usage.
by Serge Gautherie 08 Dec '18

08 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f5f515c17cc3f53a304a1… commit f5f515c17cc3f53a304a129b2c6e4fbbc61b94ee Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Fri Aug 24 23:39:53 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Dec 8 17:34:18 2018 +0100 [LOG2LINES] Replace overkill malloc() usage. NOTE: Since the 'cache_name' and 'tmp_name' pointers move inside the corresponding cached strings, separate cache buffers are needed. --- sdk/tools/log2lines/cache.c | 25 ++++++------------------- sdk/tools/log2lines/log2lines.c | 12 +++--------- 2 files changed, 9 insertions(+), 28 deletions(-) diff --git a/sdk/tools/log2lines/cache.c b/sdk/tools/log2lines/cache.c index c46bc40c1f..cac0730eae 100644 --- a/sdk/tools/log2lines/cache.c +++ b/sdk/tools/log2lines/cache.c @@ -18,8 +18,10 @@ #include "log2lines.h" -static char *cache_name; -static char *tmp_name; +static char CacheName[PATH_MAX]; +static char *cache_name = CacheName; +static char TmpName[PATH_MAX]; +static char *tmp_name = TmpName; static int unpack_iso(char *dir, char *iso) @@ -141,8 +143,6 @@ check_directory(int force) return 1; } } - cache_name = malloc(PATH_MAX); - tmp_name = malloc(PATH_MAX); strcpy(cache_name, opt_dir); if (cleanable(opt_dir)) strcat(cache_name, ALT_PATH_STR CACHEFILE); @@ -158,22 +158,15 @@ read_cache(void) { FILE *fr; LIST_MEMBER *pentry; - char *Line = NULL; + char Line[LINESIZE + 1]; int result = 0; - Line = malloc(LINESIZE + 1); - if (!Line) - { - l2l_dbg(1, "Alloc Line failed\n"); - return 1; - } Line[LINESIZE] = '\0'; fr = fopen(cache_name, "r"); if (!fr) { l2l_dbg(1, "Open %s failed\n", cache_name); - free(Line); return 2; } cache.phead = cache.ptail = NULL; @@ -190,7 +183,6 @@ read_cache(void) } fclose(fr); - free(Line); return result; } @@ -198,7 +190,7 @@ int create_cache(int force, int skipImageBase) { FILE *fr, *fw; - char *Line = NULL, *Fname = NULL; + char Line[LINESIZE + 1], *Fname = NULL; int len, err; size_t ImageBase; @@ -229,9 +221,6 @@ create_cache(int force, int skipImageBase) } } - Line = malloc(LINESIZE + 1); - if (!Line) - return 1; Line[LINESIZE] = '\0'; remove(tmp_name); @@ -243,7 +232,6 @@ create_cache(int force, int skipImageBase) l2l_dbg(0, "Cannot list directory %s\n", opt_dir); l2l_dbg(1, "Failed to execute: '%s'\n", Line); remove(tmp_name); - free(Line); return 2; } l2l_dbg(0, "Creating cache ..."); @@ -280,7 +268,6 @@ create_cache(int force, int skipImageBase) fclose(fr); } remove(tmp_name); - free(Line); return 0; } diff --git a/sdk/tools/log2lines/log2lines.c b/sdk/tools/log2lines/log2lines.c index 606b57af14..f55e5ee5a1 100644 --- a/sdk/tools/log2lines/log2lines.c +++ b/sdk/tools/log2lines/log2lines.c @@ -410,9 +410,9 @@ translate_line(FILE *outFile, char *Line, char *path, char *LineOut) static int translate_files(FILE *inFile, FILE *outFile) { - char *Line = malloc(LINESIZE + 1); - char *path = malloc(LINESIZE + 1); - char *LineOut = malloc(LINESIZE + 1); + char Line[LINESIZE + 1]; + char path[LINESIZE + 1]; + char LineOut[LINESIZE + 1]; int c; unsigned char ch; int i = 0; @@ -420,8 +420,6 @@ translate_files(FILE *inFile, FILE *outFile) const char *p = kdbg_prompt; const char *p_eos = p + sizeof(KDBG_PROMPT) - 1; //end of string pos - if (Line && path && LineOut) - { memset(Line, '\0', LINESIZE + 1); if (opt_console) { @@ -536,7 +534,6 @@ translate_files(FILE *inFile, FILE *outFile) log(outFile, "%s", Line); } } - } if (opt_Revision && (strstr(opt_Revision, "regscan") == opt_Revision)) { @@ -555,9 +552,6 @@ translate_files(FILE *inFile, FILE *outFile) if (logFile) stat_print(logFile, &summ); } - free(LineOut); - free(Line); - free(path); return 0; }

1 0

[reactos] 02/02: [DDRAW] Remove useless 'else's.
by Serge Gautherie 08 Dec '18

08 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5e8e654dfdb4fc998757d… commit 5e8e654dfdb4fc998757d203c3c521fae2ebdf12 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Thu Oct 11 18:48:17 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Dec 8 17:10:36 2018 +0100 [DDRAW] Remove useless 'else's. --- dll/directx/ddraw/Ddraw/ddraw_displaymode.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dll/directx/ddraw/Ddraw/ddraw_displaymode.c b/dll/directx/ddraw/Ddraw/ddraw_displaymode.c index 5b5c910dc7..77677f85ff 100644 --- a/dll/directx/ddraw/Ddraw/ddraw_displaymode.c +++ b/dll/directx/ddraw/Ddraw/ddraw_displaymode.c @@ -78,19 +78,19 @@ Main_DirectDraw_EnumDisplayModes(LPDDRAWI_DIRECTDRAW_INT This, DWORD dwFlags, if(pDDSD) { - if(pDDSD->dwFlags & DDSD_HEIGHT && pDDSD->dwHeight != SurfaceDesc.dwHeight) + if (pDDSD->dwFlags & DDSD_HEIGHT && pDDSD->dwHeight != SurfaceDesc.dwHeight) continue; - else if(pDDSD->dwFlags & DDSD_WIDTH && pDDSD->dwWidth != SurfaceDesc.dwWidth) + if (pDDSD->dwFlags & DDSD_WIDTH && pDDSD->dwWidth != SurfaceDesc.dwWidth) continue; - else if(pDDSD->dwFlags & DDSD_PITCH && pDDSD->lPitch != SurfaceDesc.lPitch) + if (pDDSD->dwFlags & DDSD_PITCH && pDDSD->lPitch != SurfaceDesc.lPitch) continue; - else if(pDDSD->dwFlags & DDSD_REFRESHRATE && pDDSD->dwRefreshRate != SurfaceDesc.dwRefreshRate) + if (pDDSD->dwFlags & DDSD_REFRESHRATE && pDDSD->dwRefreshRate != SurfaceDesc.dwRefreshRate) continue; - else if(pDDSD->dwFlags & DDSD_PIXELFORMAT && pDDSD->ddpfPixelFormat.dwRGBBitCount != SurfaceDesc.ddpfPixelFormat.dwRGBBitCount) + if (pDDSD->dwFlags & DDSD_PIXELFORMAT && pDDSD->ddpfPixelFormat.dwRGBBitCount != SurfaceDesc.ddpfPixelFormat.dwRGBBitCount) continue; // FIXME: test for the other members of ddpfPixelFormat as well } @@ -176,19 +176,19 @@ Main_DirectDraw_EnumDisplayModes4(LPDDRAWI_DIRECTDRAW_INT This, DWORD dwFlags, if(pDDSD) { - if(pDDSD->dwFlags & DDSD_HEIGHT && pDDSD->dwHeight != SurfaceDesc.dwHeight) + if (pDDSD->dwFlags & DDSD_HEIGHT && pDDSD->dwHeight != SurfaceDesc.dwHeight) continue; - else if(pDDSD->dwFlags & DDSD_WIDTH && pDDSD->dwWidth != SurfaceDesc.dwWidth) + if (pDDSD->dwFlags & DDSD_WIDTH && pDDSD->dwWidth != SurfaceDesc.dwWidth) continue; - else if(pDDSD->dwFlags & DDSD_PITCH && pDDSD->lPitch != SurfaceDesc.lPitch) + if (pDDSD->dwFlags & DDSD_PITCH && pDDSD->lPitch != SurfaceDesc.lPitch) continue; - else if(pDDSD->dwFlags & DDSD_REFRESHRATE && pDDSD->dwRefreshRate != SurfaceDesc.dwRefreshRate) + if (pDDSD->dwFlags & DDSD_REFRESHRATE && pDDSD->dwRefreshRate != SurfaceDesc.dwRefreshRate) continue; - else if(pDDSD->dwFlags & DDSD_PIXELFORMAT && pDDSD->ddpfPixelFormat.dwRGBBitCount != SurfaceDesc.ddpfPixelFormat.dwRGBBitCount) + if (pDDSD->dwFlags & DDSD_PIXELFORMAT && pDDSD->ddpfPixelFormat.dwRGBBitCount != SurfaceDesc.ddpfPixelFormat.dwRGBBitCount) continue; // FIXME: test for the other members of ddpfPixelFormat as well }

1 0

[reactos] 01/02: [DDRAW] Fix two duplicate DDSD_WIDTH uses.
by Serge Gautherie 08 Dec '18

08 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=166c6e249818990e0546f… commit 166c6e249818990e0546f7bdfde1c6f02f2a68c3 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Thu Oct 11 01:46:44 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Dec 8 17:10:31 2018 +0100 [DDRAW] Fix two duplicate DDSD_WIDTH uses. Thanks to Kudratov Olimjon who reported this. CORE-8545 --- dll/directx/ddraw/Ddraw/ddraw_displaymode.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/directx/ddraw/Ddraw/ddraw_displaymode.c b/dll/directx/ddraw/Ddraw/ddraw_displaymode.c index 5c6385b85f..5b5c910dc7 100644 --- a/dll/directx/ddraw/Ddraw/ddraw_displaymode.c +++ b/dll/directx/ddraw/Ddraw/ddraw_displaymode.c @@ -51,7 +51,7 @@ Main_DirectDraw_EnumDisplayModes(LPDDRAWI_DIRECTDRAW_INT This, DWORD dwFlags, iMode++; SurfaceDesc.dwSize = sizeof (DDSURFACEDESC); - SurfaceDesc.dwFlags = DDSD_HEIGHT | DDSD_WIDTH | DDSD_REFRESHRATE | DDSD_WIDTH | DDSD_PIXELFORMAT; + SurfaceDesc.dwFlags = DDSD_HEIGHT | DDSD_WIDTH | DDSD_PIXELFORMAT | DDSD_PITCH | DDSD_REFRESHRATE; SurfaceDesc.dwHeight = DevMode.dmPelsHeight; SurfaceDesc.dwWidth = DevMode.dmPelsWidth; SurfaceDesc.lPitch = DevMode.dmPelsWidth * DevMode.dmBitsPerPel / 8; @@ -149,7 +149,7 @@ Main_DirectDraw_EnumDisplayModes4(LPDDRAWI_DIRECTDRAW_INT This, DWORD dwFlags, iMode++; SurfaceDesc.dwSize = sizeof (DDSURFACEDESC2); - SurfaceDesc.dwFlags = DDSD_HEIGHT | DDSD_WIDTH | DDSD_REFRESHRATE | DDSD_WIDTH | DDSD_PIXELFORMAT; + SurfaceDesc.dwFlags = DDSD_HEIGHT | DDSD_WIDTH | DDSD_PIXELFORMAT | DDSD_PITCH | DDSD_REFRESHRATE; SurfaceDesc.dwHeight = DevMode.dmPelsHeight; SurfaceDesc.dwWidth = DevMode.dmPelsWidth; SurfaceDesc.lPitch = DevMode.dmPelsWidth * DevMode.dmBitsPerPel / 8;

1 0

[reactos] 01/01: [USERENV] Move some functions around to make it look nicer. No code changes.
by Eric Kohl 08 Dec '18

08 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b9d4e2dae644e6380e8e5… commit b9d4e2dae644e6380e8e5d87a49f5430232665fb Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Dec 8 16:41:17 2018 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Dec 8 16:41:17 2018 +0100 [USERENV] Move some functions around to make it look nicer. No code changes. --- dll/win32/userenv/profile.c | 207 ++++++++++++++++++++++---------------------- 1 file changed, 105 insertions(+), 102 deletions(-) diff --git a/dll/win32/userenv/profile.c b/dll/win32/userenv/profile.c index 077619e5aa..40d4b323af 100644 --- a/dll/win32/userenv/profile.c +++ b/dll/win32/userenv/profile.c @@ -106,6 +106,45 @@ AcquireRemoveRestorePrivilege(IN BOOL bAcquire) } +static +BOOL +CheckForLoadedProfile(HANDLE hToken) +{ + UNICODE_STRING SidString; + HKEY hKey; + + DPRINT("CheckForLoadedProfile() called\n"); + + /* Get the user SID string */ + if (!GetUserSidStringFromToken(hToken, &SidString)) + { + DPRINT1("GetUserSidStringFromToken() failed\n"); + return FALSE; + } + + if (RegOpenKeyExW(HKEY_USERS, + SidString.Buffer, + 0, + MAXIMUM_ALLOWED, + &hKey)) + { + DPRINT("Profile not loaded\n"); + RtlFreeUnicodeString(&SidString); + return FALSE; + } + + RegCloseKey(hKey); + + RtlFreeUnicodeString(&SidString); + + DPRINT("Profile already loaded\n"); + + return TRUE; +} + + +/* PUBLIC FUNCTIONS ********************************************************/ + BOOL WINAPI CopySystemProfile( @@ -672,6 +711,62 @@ done: } +BOOL +WINAPI +DeleteProfileA( + _In_ LPCSTR lpSidString, + _In_opt_ LPCSTR lpProfilePath, + _In_opt_ LPCSTR lpComputerName) +{ + BOOL bResult; + UNICODE_STRING SidString, ProfilePath, ComputerName; + + DPRINT("DeleteProfileA() called\n"); + + /* Conversion to UNICODE */ + if (lpSidString) + RtlCreateUnicodeStringFromAsciiz(&SidString, + (LPSTR)lpSidString); + + if (lpProfilePath) + RtlCreateUnicodeStringFromAsciiz(&ProfilePath, + (LPSTR)lpProfilePath); + + if (lpComputerName) + RtlCreateUnicodeStringFromAsciiz(&ComputerName, + (LPSTR)lpComputerName); + + /* Call the UNICODE function */ + bResult = DeleteProfileW(SidString.Buffer, + ProfilePath.Buffer, + ComputerName.Buffer); + + /* Memory cleanup */ + if (lpSidString) + RtlFreeUnicodeString(&SidString); + + if (lpProfilePath) + RtlFreeUnicodeString(&ProfilePath); + + if (lpComputerName) + RtlFreeUnicodeString(&ComputerName); + + return bResult; +} + + +BOOL +WINAPI +DeleteProfileW( + _In_ LPCWSTR lpSidString, + _In_opt_ LPCWSTR lpProfilePath, + _In_opt_ LPCWSTR lpComputerName) +{ + DPRINT1("DeleteProfileW() not implemented!\n"); + return FALSE; +} + + BOOL WINAPI GetAllUsersProfileDirectoryA( @@ -1051,6 +1146,16 @@ GetProfilesDirectoryW( } +BOOL +WINAPI +GetProfileType( + _Out_ PDWORD pdwFlags) +{ + DPRINT1("GetProfileType() not implemented!\n"); + return FALSE; +} + + BOOL WINAPI GetUserProfileDirectoryA( @@ -1195,43 +1300,6 @@ GetUserProfileDirectoryW( } -static -BOOL -CheckForLoadedProfile(HANDLE hToken) -{ - UNICODE_STRING SidString; - HKEY hKey; - - DPRINT("CheckForLoadedProfile() called\n"); - - /* Get the user SID string */ - if (!GetUserSidStringFromToken(hToken, &SidString)) - { - DPRINT1("GetUserSidStringFromToken() failed\n"); - return FALSE; - } - - if (RegOpenKeyExW(HKEY_USERS, - SidString.Buffer, - 0, - MAXIMUM_ALLOWED, - &hKey)) - { - DPRINT("Profile not loaded\n"); - RtlFreeUnicodeString(&SidString); - return FALSE; - } - - RegCloseKey(hKey); - - RtlFreeUnicodeString(&SidString); - - DPRINT("Profile already loaded\n"); - - return TRUE; -} - - BOOL WINAPI LoadUserProfileA( @@ -1566,69 +1634,4 @@ UnloadUserProfile( return TRUE; } - -BOOL -WINAPI -DeleteProfileW( - _In_ LPCWSTR lpSidString, - _In_opt_ LPCWSTR lpProfilePath, - _In_opt_ LPCWSTR lpComputerName) -{ - DPRINT1("DeleteProfileW() not implemented!\n"); - return FALSE; -} - - -BOOL -WINAPI -DeleteProfileA( - _In_ LPCSTR lpSidString, - _In_opt_ LPCSTR lpProfilePath, - _In_opt_ LPCSTR lpComputerName) -{ - BOOL bResult; - UNICODE_STRING SidString, ProfilePath, ComputerName; - - DPRINT("DeleteProfileA() called\n"); - - /* Conversion to UNICODE */ - if (lpSidString) - RtlCreateUnicodeStringFromAsciiz(&SidString, - (LPSTR)lpSidString); - - if (lpProfilePath) - RtlCreateUnicodeStringFromAsciiz(&ProfilePath, - (LPSTR)lpProfilePath); - - if (lpComputerName) - RtlCreateUnicodeStringFromAsciiz(&ComputerName, - (LPSTR)lpComputerName); - - /* Call the UNICODE function */ - bResult = DeleteProfileW(SidString.Buffer, - ProfilePath.Buffer, - ComputerName.Buffer); - - /* Memory cleanup */ - if (lpSidString) - RtlFreeUnicodeString(&SidString); - - if (lpProfilePath) - RtlFreeUnicodeString(&ProfilePath); - - if (lpComputerName) - RtlFreeUnicodeString(&ComputerName); - - return bResult; -} - - -BOOL -WINAPI -GetProfileType(_Out_ PDWORD pdwFlags) -{ - DPRINT1("GetProfileType() not implemented!\n"); - return FALSE; -} - /* EOF */

1 0

[reactos] 01/01: [PSDK] Add DeleteProfileA/W prototypes to userenv.h.
by Eric Kohl 08 Dec '18

08 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d383d1c6b0bf7e4733692… commit d383d1c6b0bf7e47336921c45ce4e020b3573517 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Dec 8 15:22:23 2018 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Dec 8 15:23:04 2018 +0100 [PSDK] Add DeleteProfileA/W prototypes to userenv.h. --- sdk/include/psdk/userenv.h | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sdk/include/psdk/userenv.h b/sdk/include/psdk/userenv.h index 3b5054e0f1..81deda29de 100644 --- a/sdk/include/psdk/userenv.h +++ b/sdk/include/psdk/userenv.h @@ -108,6 +108,11 @@ BOOL WINAPI CopyProfileDirectoryW(LPCWSTR, LPCWSTR, DWORD); PSID WINAPI GetUserSid(HANDLE); BOOL WINAPI CopySystemProfile(ULONG); /* end private */ + +#if(WINVER >= 0x0500) +BOOL WINAPI DeleteProfileA(LPCSTR, LPCSTR, LPCSTR); +BOOL WINAPI DeleteProfileW(LPCWSTR, LPCWSTR, LPCWSTR); +#endif BOOL WINAPI LoadUserProfileA (HANDLE, LPPROFILEINFOA); BOOL WINAPI LoadUserProfileW (HANDLE, LPPROFILEINFOW); BOOL WINAPI UnloadUserProfile (HANDLE, HANDLE); @@ -175,6 +180,9 @@ typedef LPPROFILEINFOW LPPROFILEINFO; #define DeleteItem DeleteItemW #define CopyProfileDirectory CopyProfileDirectoryW /* end private */ +#if (WINVER >= 0x0500) +#define DeleteProfile DeleteProfileW +#endif #define LoadUserProfile LoadUserProfileW #define GetAllUsersProfileDirectory GetAllUsersProfileDirectoryW #define GetDefaultUserProfileDirectory GetDefaultUserProfileDirectoryW @@ -202,6 +210,9 @@ typedef LPPROFILEINFOA LPPROFILEINFO; #define DeleteItem DeleteItemA #define CopyProfileDirectory CopyProfileDirectoryA /* end private */ +#if (WINVER >= 0x0500) +#define DeleteProfile DeleteProfileA +#endif #define LoadUserProfile LoadUserProfileA #define GetAllUsersProfileDirectory GetAllUsersProfileDirectoryA #define GetDefaultUserProfileDirectory GetDefaultUserProfileDirectoryA

1 0

[reactos] 02/02: [MPR_WINETEST] Sync with Wine Staging 3.17. CORE-15127
by Pierre Schweitzer 08 Dec '18

08 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=01d56963f836db05029a9… commit 01d56963f836db05029a99a0553780a2d8770f73 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Dec 8 11:43:10 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Dec 8 11:43:10 2018 +0100 [MPR_WINETEST] Sync with Wine Staging 3.17. CORE-15127 --- modules/rostests/winetests/mpr/mpr.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/modules/rostests/winetests/mpr/mpr.c b/modules/rostests/winetests/mpr/mpr.c index 041afbf130..3e5ca099eb 100644 --- a/modules/rostests/winetests/mpr/mpr.c +++ b/modules/rostests/winetests/mpr/mpr.c @@ -51,16 +51,19 @@ static void test_WNetGetUniversalName(void) ok(info_size == sizeof(buffer), "Got wrong size: %u\n", info_size); - fail_size = 0; + fail_size = 1; ret = WNetGetUniversalNameA(driveA, UNIVERSAL_NAME_INFO_LEVEL, buffer, &fail_size); if(drive_type == DRIVE_REMOTE) + { todo_wine ok(ret == WN_BAD_VALUE || ret == WN_MORE_DATA, "WNetGetUniversalNameA failed: %08x\n", ret); + ok(fail_size > 1, "Got %d\n", fail_size); + } else ok(ret == WN_NOT_CONNECTED || ret == WN_NO_NET_OR_BAD_PATH, "(%s) WNetGetUniversalNameW gave wrong error: %u\n", driveA, ret); - fail_size = sizeof(driveA) / sizeof(char) - 1; + fail_size = ARRAY_SIZE(driveA) - 1; ret = WNetGetUniversalNameA(driveA, UNIVERSAL_NAME_INFO_LEVEL, buffer, &fail_size); if(drive_type == DRIVE_REMOTE) @@ -132,7 +135,7 @@ static void test_WNetGetRemoteName(void) ok(ret == WN_NOT_CONNECTED || ret == WN_BAD_VALUE, "(%s) WNetGetUniversalNameA gave wrong error: %u\n", driveA, ret); - fail_size = sizeof(driveA) / sizeof(char) - 1; + fail_size = ARRAY_SIZE(driveA) - 1; ret = WNetGetUniversalNameA(driveA, REMOTE_NAME_INFO_LEVEL, buffer, &fail_size); if(drive_type == DRIVE_REMOTE)

1 0

Jump to page:

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