Ros-diffs

ros-diffs@reactos.org

81390 discussions

01/03: [KMTESTS:FSRTL] Add tests for FsRtlLegalAnsiCharacterArray
by Pierre Schweitzer 25 Aug '18

25 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fcbcdf7073e9a77aa5455… commit fcbcdf7073e9a77aa545540a0054a5c22b207cc8 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Aug 25 13:56:33 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Aug 25 14:26:49 2018 +0200 [KMTESTS:FSRTL] Add tests for FsRtlLegalAnsiCharacterArray These are failing in ReactOS due to the lack of the OLE flag support. --- modules/rostests/kmtests/ntos_fsrtl/FsRtlLegal.c | 180 ++++++++++++++++++++--- 1 file changed, 159 insertions(+), 21 deletions(-) diff --git a/modules/rostests/kmtests/ntos_fsrtl/FsRtlLegal.c b/modules/rostests/kmtests/ntos_fsrtl/FsRtlLegal.c index 41fbd59c34..4391db7518 100644 --- a/modules/rostests/kmtests/ntos_fsrtl/FsRtlLegal.c +++ b/modules/rostests/kmtests/ntos_fsrtl/FsRtlLegal.c @@ -3,6 +3,7 @@ * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory * PURPOSE: Test for FsRtlIsFatDbcsLegal/FsRtlIsHpfsDbcsLegal * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> + * Pierre Schweitzer <pierre(a)reactos.org> */ #include <kmt_test.h> @@ -15,7 +16,7 @@ static struct BOOLEAN HasWildCards; BOOLEAN IsPath; BOOLEAN LeadingBackslash; -} Tests[] = +} NamesTests[] = { { "", FALSE, FALSE }, { "a", TRUE, TRUE, FALSE, FALSE, FALSE }, @@ -100,6 +101,138 @@ static struct { "ABCDEFGHI1ABCDEFGHI2ABCDEFGHI3ABCDEFGHI4ABCDEFGHI5ABCDEFGHI6ABCDEFGHI7ABCDEFGHI8ABCDEFGHI9ABCDEFGHI0ABCDEFGHI1ABCDEFGHI2ABCDEFGHI3ABCDEFGHI4ABCDEFGHI5ABCDEFGHI6ABCDEFGHI7ABCDEFGHI8ABCDEFGHI9ABCDEFGHI0ABCDEFGHI1ABCDEFGHI2ABCDEFGHI3ABCDEFGHI4ABCDEFGHI5ABCDE\\ABC", FALSE, TRUE, FALSE, TRUE, FALSE }, }; +static const UCHAR LegalAnsiCharacterArray[] = +{ + 0, /* CTRL+@, 0x00 */ + FSRTL_OLE_LEGAL, /* CTRL+A, 0x01 */ + FSRTL_OLE_LEGAL, /* CTRL+B, 0x02 */ + FSRTL_OLE_LEGAL, /* CTRL+C, 0x03 */ + FSRTL_OLE_LEGAL, /* CTRL+D, 0x04 */ + FSRTL_OLE_LEGAL, /* CTRL+E, 0x05 */ + FSRTL_OLE_LEGAL, /* CTRL+F, 0x06 */ + FSRTL_OLE_LEGAL, /* CTRL+G, 0x07 */ + FSRTL_OLE_LEGAL, /* CTRL+H, 0x08 */ + FSRTL_OLE_LEGAL, /* CTRL+I, 0x09 */ + FSRTL_OLE_LEGAL, /* CTRL+J, 0x0a */ + FSRTL_OLE_LEGAL, /* CTRL+K, 0x0b */ + FSRTL_OLE_LEGAL, /* CTRL+L, 0x0c */ + FSRTL_OLE_LEGAL, /* CTRL+M, 0x0d */ + FSRTL_OLE_LEGAL, /* CTRL+N, 0x0e */ + FSRTL_OLE_LEGAL, /* CTRL+O, 0x0f */ + FSRTL_OLE_LEGAL, /* CTRL+P, 0x10 */ + FSRTL_OLE_LEGAL, /* CTRL+Q, 0x11 */ + FSRTL_OLE_LEGAL, /* CTRL+R, 0x12 */ + FSRTL_OLE_LEGAL, /* CTRL+S, 0x13 */ + FSRTL_OLE_LEGAL, /* CTRL+T, 0x14 */ + FSRTL_OLE_LEGAL, /* CTRL+U, 0x15 */ + FSRTL_OLE_LEGAL, /* CTRL+V, 0x16 */ + FSRTL_OLE_LEGAL, /* CTRL+W, 0x17 */ + FSRTL_OLE_LEGAL, /* CTRL+X, 0x18 */ + FSRTL_OLE_LEGAL, /* CTRL+Y, 0x19 */ + FSRTL_OLE_LEGAL, /* CTRL+Z, 0x1a */ + FSRTL_OLE_LEGAL, /* CTRL+[, 0x1b */ + FSRTL_OLE_LEGAL, /* CTRL+\, 0x1c */ + FSRTL_OLE_LEGAL, /* CTRL+], 0x1d */ + FSRTL_OLE_LEGAL, /* CTRL+^, 0x1e */ + FSRTL_OLE_LEGAL, /* CTRL+_, 0x1f */ + FSRTL_OLE_LEGAL | FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* ` ', 0x20 */ + FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `!', 0x21 */ + FSRTL_OLE_LEGAL | FSRTL_WILD_CHARACTER, /* `"', 0x22 */ + FSRTL_OLE_LEGAL | FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `#', 0x23 */ + FSRTL_OLE_LEGAL | FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `$', 0x24 */ + FSRTL_OLE_LEGAL | FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `%', 0x25 */ + FSRTL_OLE_LEGAL | FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `&', 0x26 */ + FSRTL_OLE_LEGAL | FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `'', 0x27 */ + FSRTL_OLE_LEGAL | FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `(', 0x28 */ + FSRTL_OLE_LEGAL | FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `)', 0x29 */ + FSRTL_OLE_LEGAL | FSRTL_WILD_CHARACTER, /* `*', 0x2a */ + FSRTL_OLE_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `+', 0x2b */ + FSRTL_OLE_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `,', 0x2c */ + FSRTL_OLE_LEGAL | FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `-', 0x2d */ + FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `.', 0x2e */ + 0, /* `/', 0x2f */ + FSRTL_OLE_LEGAL | FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `0', 0x30 */ + FSRTL_OLE_LEGAL | FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `1', 0x31 */ + FSRTL_OLE_LEGAL | FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `2', 0x32 */ + FSRTL_OLE_LEGAL | FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `3', 0x33 */ + FSRTL_OLE_LEGAL | FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `4', 0x34 */ + FSRTL_OLE_LEGAL | FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `5', 0x35 */ + FSRTL_OLE_LEGAL | FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `6', 0x36 */ + FSRTL_OLE_LEGAL | FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `7', 0x37 */ + FSRTL_OLE_LEGAL | FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `8', 0x38 */ + FSRTL_OLE_LEGAL | FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `9', 0x39 */ + FSRTL_NTFS_LEGAL, /* `:', 0x3a */ + FSRTL_OLE_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `;', 0x3b */ + FSRTL_OLE_LEGAL | FSRTL_WILD_CHARACTER, /* `<', 0x3c */ + FSRTL_OLE_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `=', 0x3d */ + FSRTL_OLE_LEGAL | FSRTL_WILD_CHARACTER, /* `>', 0x3e */ + FSRTL_OLE_LEGAL | FSRTL_WILD_CHARACTER, /* `?', 0x3f */ + FSRTL_OLE_LEGAL | FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `@', 0x40 */ + FSRTL_OLE_LEGAL | FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `A', 0x41 */ + FSRTL_OLE_LEGAL | FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `B', 0x42 */ + FSRTL_OLE_LEGAL | FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `C', 0x43 */ + FSRTL_OLE_LEGAL | FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `D', 0x44 */ + FSRTL_OLE_LEGAL | FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `E', 0x45 */ + FSRTL_OLE_LEGAL | FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `F', 0x46 */ + FSRTL_OLE_LEGAL | FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `G', 0x47 */ + FSRTL_OLE_LEGAL | FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `H', 0x48 */ + FSRTL_OLE_LEGAL | FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `I', 0x49 */ + FSRTL_OLE_LEGAL | FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `J', 0x4a */ + FSRTL_OLE_LEGAL | FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `K', 0x4b */ + FSRTL_OLE_LEGAL | FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `L', 0x4c */ + FSRTL_OLE_LEGAL | FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `M', 0x4d */ + FSRTL_OLE_LEGAL | FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `N', 0x4e */ + FSRTL_OLE_LEGAL | FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `O', 0x4f */ + FSRTL_OLE_LEGAL | FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `P', 0x50 */ + FSRTL_OLE_LEGAL | FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `Q', 0x51 */ + FSRTL_OLE_LEGAL | FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `R', 0x52 */ + FSRTL_OLE_LEGAL | FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `S', 0x53 */ + FSRTL_OLE_LEGAL | FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `T', 0x54 */ + FSRTL_OLE_LEGAL | FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `U', 0x55 */ + FSRTL_OLE_LEGAL | FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `V', 0x56 */ + FSRTL_OLE_LEGAL | FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `W', 0x57 */ + FSRTL_OLE_LEGAL | FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `X', 0x58 */ + FSRTL_OLE_LEGAL | FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `Y', 0x59 */ + FSRTL_OLE_LEGAL | FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `Z', 0x5a */ + FSRTL_OLE_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `[', 0x5b */ + 0, /* `\', 0x5c */ + FSRTL_OLE_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `]', 0x5d */ + FSRTL_OLE_LEGAL | FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `^', 0x5e */ + FSRTL_OLE_LEGAL | FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `_', 0x5f */ + FSRTL_OLE_LEGAL | FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* ``', 0x60 */ + FSRTL_OLE_LEGAL | FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `a', 0x61 */ + FSRTL_OLE_LEGAL | FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `b', 0x62 */ + FSRTL_OLE_LEGAL | FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `c', 0x63 */ + FSRTL_OLE_LEGAL | FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `d', 0x64 */ + FSRTL_OLE_LEGAL | FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `e', 0x65 */ + FSRTL_OLE_LEGAL | FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `f', 0x66 */ + FSRTL_OLE_LEGAL | FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `g', 0x67 */ + FSRTL_OLE_LEGAL | FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `h', 0x68 */ + FSRTL_OLE_LEGAL | FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `i', 0x69 */ + FSRTL_OLE_LEGAL | FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `j', 0x6a */ + FSRTL_OLE_LEGAL | FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `k', 0x6b */ + FSRTL_OLE_LEGAL | FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `l', 0x6c */ + FSRTL_OLE_LEGAL | FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `m', 0x6d */ + FSRTL_OLE_LEGAL | FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `n', 0x6e */ + FSRTL_OLE_LEGAL | FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `o', 0x6f */ + FSRTL_OLE_LEGAL | FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `p', 0x70 */ + FSRTL_OLE_LEGAL | FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `q', 0x71 */ + FSRTL_OLE_LEGAL | FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `r', 0x72 */ + FSRTL_OLE_LEGAL | FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `s', 0x73 */ + FSRTL_OLE_LEGAL | FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `t', 0x74 */ + FSRTL_OLE_LEGAL | FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `u', 0x75 */ + FSRTL_OLE_LEGAL | FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `v', 0x76 */ + FSRTL_OLE_LEGAL | FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `w', 0x77 */ + FSRTL_OLE_LEGAL | FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `x', 0x78 */ + FSRTL_OLE_LEGAL | FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `y', 0x79 */ + FSRTL_OLE_LEGAL | FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `z', 0x7a */ + FSRTL_OLE_LEGAL | FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `{', 0x7b */ + FSRTL_OLE_LEGAL, /* `|', 0x7c */ + FSRTL_OLE_LEGAL | FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `}', 0x7d */ + FSRTL_OLE_LEGAL | FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL, /* `~', 0x7e */ + FSRTL_OLE_LEGAL | FSRTL_FAT_LEGAL | FSRTL_HPFS_LEGAL | FSRTL_NTFS_LEGAL /* 0x7f */ +}; + START_TEST(FsRtlLegal) { ULONG i; @@ -107,40 +240,45 @@ START_TEST(FsRtlLegal) ANSI_STRING DbcsName; ULONG Flags; - for (i = 0; i < RTL_NUMBER_OF(Tests); i++) + for (i = 0; i < RTL_NUMBER_OF(NamesTests); i++) { - RtlInitAnsiString(&DbcsName, Tests[i].Dbcs); + RtlInitAnsiString(&DbcsName, NamesTests[i].Dbcs); for (Flags = 0; Flags < 8; Flags++) { Result = FsRtlIsFatDbcsLegal(DbcsName, BooleanFlagOn(Flags, 1), BooleanFlagOn(Flags, 2), BooleanFlagOn(Flags, 4)); - if (Tests[i].HasWildCards && !FlagOn(Flags, 1)) - ok(Result == FALSE, "[%s] Result = %u but has wildcards\n", Tests[i].Dbcs, Result); - else if (Tests[i].IsPath && !FlagOn(Flags, 2)) - ok(Result == FALSE, "[%s] Result = %u but is path\n", Tests[i].Dbcs, Result); - else if (Tests[i].LeadingBackslash && !FlagOn(Flags, 4)) - ok(Result == FALSE, "[%s] Result = %u but has leading backslash\n", Tests[i].Dbcs, Result); - else if (!Tests[i].LegalFat) - ok(Result == FALSE, "[%s] Result = %u but is NOT legal FAT\n", Tests[i].Dbcs, Result); + if (NamesTests[i].HasWildCards && !FlagOn(Flags, 1)) + ok(Result == FALSE, "[%s] Result = %u but has wildcards\n", NamesTests[i].Dbcs, Result); + else if (NamesTests[i].IsPath && !FlagOn(Flags, 2)) + ok(Result == FALSE, "[%s] Result = %u but is path\n", NamesTests[i].Dbcs, Result); + else if (NamesTests[i].LeadingBackslash && !FlagOn(Flags, 4)) + ok(Result == FALSE, "[%s] Result = %u but has leading backslash\n", NamesTests[i].Dbcs, Result); + else if (!NamesTests[i].LegalFat) + ok(Result == FALSE, "[%s] Result = %u but is NOT legal FAT\n", NamesTests[i].Dbcs, Result); else - ok(Result == TRUE, "[%s] Result = %u but IS legal FAT\n", Tests[i].Dbcs, Result); + ok(Result == TRUE, "[%s] Result = %u but IS legal FAT\n", NamesTests[i].Dbcs, Result); Result = FsRtlIsHpfsDbcsLegal(DbcsName, BooleanFlagOn(Flags, 1), BooleanFlagOn(Flags, 2), BooleanFlagOn(Flags, 4)); - if (Tests[i].HasWildCards && !FlagOn(Flags, 1)) - ok(Result == FALSE, "[%s] Result = %u but has wildcards\n", Tests[i].Dbcs, Result); - else if (Tests[i].IsPath && !FlagOn(Flags, 2)) - ok(Result == FALSE, "[%s] Result = %u but is path\n", Tests[i].Dbcs, Result); - else if (Tests[i].LeadingBackslash && !FlagOn(Flags, 4)) - ok(Result == FALSE, "[%s] Result = %u but has leading backslash\n", Tests[i].Dbcs, Result); - else if (!Tests[i].LegalHpfs) - ok(Result == FALSE, "[%s] Result = %u but is NOT legal HPFS\n", Tests[i].Dbcs, Result); + if (NamesTests[i].HasWildCards && !FlagOn(Flags, 1)) + ok(Result == FALSE, "[%s] Result = %u but has wildcards\n", NamesTests[i].Dbcs, Result); + else if (NamesTests[i].IsPath && !FlagOn(Flags, 2)) + ok(Result == FALSE, "[%s] Result = %u but is path\n", NamesTests[i].Dbcs, Result); + else if (NamesTests[i].LeadingBackslash && !FlagOn(Flags, 4)) + ok(Result == FALSE, "[%s] Result = %u but has leading backslash\n", NamesTests[i].Dbcs, Result); + else if (!NamesTests[i].LegalHpfs) + ok(Result == FALSE, "[%s] Result = %u but is NOT legal HPFS\n", NamesTests[i].Dbcs, Result); else - ok(Result == TRUE, "[%s] Result = %u but IS legal HPFS\n", Tests[i].Dbcs, Result); + ok(Result == TRUE, "[%s] Result = %u but IS legal HPFS\n", NamesTests[i].Dbcs, Result); } } + + for (i = 0; i <= 0x7f; ++i) + { + ok(LegalAnsiCharacterArray[i] == (*FsRtlLegalAnsiCharacterArray)[i], "Mismatching value for 0x%x: 0x%x (exp) - 0x%x (got)\n", i, LegalAnsiCharacterArray[i], (*FsRtlLegalAnsiCharacterArray)[i]); + } }

1 0

01/01: [WIN32SS][NTGDI] Extend PATH_FillPath as PATH_FillPathEx (#798)
by Katayama Hirofumi MZ 24 Aug '18

24 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bd9a4499a810a936fe661… commit bd9a4499a810a936fe66143d141e107d3012a39f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Aug 24 20:37:59 2018 +0900 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Aug 24 13:37:59 2018 +0200 [WIN32SS][NTGDI] Extend PATH_FillPath as PATH_FillPathEx (#798) The new PATH_FillPathEx function takes an additional PBRUSH parameter. CORE-2527 --- win32ss/gdi/ntgdi/bitblt.c | 1 - win32ss/gdi/ntgdi/path.c | 12 +++++++++++- win32ss/gdi/ntgdi/path.h | 2 ++ win32ss/gdi/ntgdi/region.h | 7 ------- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/win32ss/gdi/ntgdi/bitblt.c b/win32ss/gdi/ntgdi/bitblt.c index 38c92e3bb2..8e9fac9286 100644 --- a/win32ss/gdi/ntgdi/bitblt.c +++ b/win32ss/gdi/ntgdi/bitblt.c @@ -1122,7 +1122,6 @@ IntGdiBitBltRgn( return bResult; } -static BOOL IntGdiFillRgn( _In_ PDC pdc, diff --git a/win32ss/gdi/ntgdi/path.c b/win32ss/gdi/ntgdi/path.c index f4cc24951a..1bc5e2fb5f 100644 --- a/win32ss/gdi/ntgdi/path.c +++ b/win32ss/gdi/ntgdi/path.c @@ -1457,6 +1457,16 @@ FASTCALL PATH_FillPath( PDC dc, PPATH pPath) +{ + return PATH_FillPathEx(dc, pPath, NULL); +} + +BOOL +FASTCALL +PATH_FillPathEx( + PDC dc, + PPATH pPath, + PBRUSH pbrFill) { INT mapMode, graphicsMode; SIZE ptViewportExt, ptWindowExt; @@ -1517,7 +1527,7 @@ PATH_FillPath( pdcattr->iGraphicsMode = graphicsMode; /* Paint the region */ - IntGdiPaintRgn(dc, Rgn); + IntGdiFillRgn(dc, Rgn, pbrFill); REGION_Delete(Rgn); /* Restore the old mapping mode */ IntGdiSetMapMode(dc, mapMode); diff --git a/win32ss/gdi/ntgdi/path.h b/win32ss/gdi/ntgdi/path.h index f80113564e..9c5f63dabe 100644 --- a/win32ss/gdi/ntgdi/path.h +++ b/win32ss/gdi/ntgdi/path.h @@ -92,6 +92,7 @@ BOOL FASTCALL PATH_AddEntry (PPATH pPath, const POINT *pPoint, BYTE flags); BOOL FASTCALL PATH_AddFlatBezier (PPATH pPath, POINT *pt, BOOL closed); BOOL FASTCALL PATH_DoArcPart (PPATH pPath, FLOAT_POINT corners[], double angleStart, double angleEnd, BYTE startEntryType); BOOL FASTCALL PATH_FillPath( PDC dc, PPATH pPath ); +BOOL FASTCALL PATH_FillPathEx(PDC dc, PPATH pPath, PBRUSH pbrFill); PPATH FASTCALL PATH_FlattenPath (PPATH pPath); VOID FASTCALL PATH_NormalizePoint (FLOAT_POINT corners[], const FLOAT_POINT *pPoint, double *pX, double *pY); @@ -107,3 +108,4 @@ VOID FASTCALL IntGetCurrentPositionEx(PDC dc, LPPOINT pt); BOOL PATH_RestorePath( DC *, DC *); BOOL PATH_SavePath( DC *, DC *); +BOOL IntGdiFillRgn(PDC pdc, PREGION prgn, PBRUSH pbrFill); diff --git a/win32ss/gdi/ntgdi/region.h b/win32ss/gdi/ntgdi/region.h index abf053c462..0d4f454daa 100644 --- a/win32ss/gdi/ntgdi/region.h +++ b/win32ss/gdi/ntgdi/region.h @@ -96,10 +96,3 @@ GreCreateFrameRgn( PREGION FASTCALL IntSysCreateRectpRgn(INT LeftRect, INT TopRect, INT RightRect, INT BottomRect); - -// FIXME: move this -BOOL -FASTCALL -IntGdiPaintRgn( - _In_ PDC pdc, - _In_ PREGION prgn);

1 0

01/01: [FONTS] Improve Tahoma font (14px bitmap and ligatures) (#809)
by Katayama Hirofumi MZ 24 Aug '18

24 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0f308a007631999922a0e… commit 0f308a007631999922a0e7655f0d0f9822725a90 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Aug 24 19:38:35 2018 +0900 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Aug 24 12:38:35 2018 +0200 [FONTS] Improve Tahoma font (14px bitmap and ligatures) (#809) Add 14-pixel height bitmap, and improve some ligatures (fi and fl). CORE-12091 --- media/fonts/tahoma.ttf | Bin 150204 -> 168308 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/media/fonts/tahoma.ttf b/media/fonts/tahoma.ttf index 0645228943..8864e7cffa 100644 Binary files a/media/fonts/tahoma.ttf and b/media/fonts/tahoma.ttf differ

1 0

01/01: [WIN32SS][LPK] Add BiDi support to menus and window captions (#738)
by Baruch Rutman 23 Aug '18

23 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e7d2bbe726f605d0a0c69… commit e7d2bbe726f605d0a0c69f3e2add6ee84bba8124 Author: Baruch Rutman <peterooch(a)gmail.com> AuthorDate: Thu Aug 23 20:43:12 2018 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Aug 23 19:43:12 2018 +0200 [WIN32SS][LPK] Add BiDi support to menus and window captions (#738) Added callback function that redirects calls to GreExtTextOutW that didn't went through lpk BiDi processing, calls that are from the kernel. Completely solves JIRA issue CORE-6910. --- dll/win32/lpk/lpk.c | 7 +-- win32ss/include/callback.h | 17 +++++- win32ss/user/ntuser/painting.c | 9 +-- win32ss/user/rtl/text.c | 122 +++++++++++++++++++++++++++++++++++-- win32ss/user/user32/misc/dllmain.c | 22 +++++++ 5 files changed, 164 insertions(+), 13 deletions(-) diff --git a/dll/win32/lpk/lpk.c b/dll/win32/lpk/lpk.c index a31d9787a0..075778ba7c 100644 --- a/dll/win32/lpk/lpk.c +++ b/dll/win32/lpk/lpk.c @@ -78,10 +78,9 @@ LpkExtTextOut( if ((GetLayout(hdc) & LAYOUT_RTL) || (GetTextAlign(hdc) & TA_RTLREADING)) fuOptions |= ETO_RTLREADING; - /* If text direction is RTL change flag to account neutral characters - BUG: disables reordering of propsheet titles */ - /* if (fuOptions & ETO_RTLREADING) - dwSICFlags = SIC_NEUTRAL; */ + /* If text direction is RTL change flag to account neutral characters */ + if (fuOptions & ETO_RTLREADING) + dwSICFlags |= SIC_NEUTRAL; /* Check if the string requires complex script processing and not a "glyph indices" array */ if (ScriptIsComplex(lpString, uCount, dwSICFlags) == S_OK && !(fuOptions & ETO_GLYPH_INDEX)) diff --git a/win32ss/include/callback.h b/win32ss/include/callback.h index bc8caecb67..75eda686a2 100644 --- a/win32ss/include/callback.h +++ b/win32ss/include/callback.h @@ -17,7 +17,8 @@ #define USER32_CALLBACK_DDEPOST (13) #define USER32_CALLBACK_DDEGET (14) #define USER32_CALLBACK_SETOBM (15) -#define USER32_CALLBACK_MAXIMUM (15) +#define USER32_CALLBACK_LPK (16) +#define USER32_CALLBACK_MAXIMUM (16) typedef struct _WINDOWPROC_CALLBACK_ARGUMENTS { @@ -139,6 +140,18 @@ typedef struct _SETOBM_CALLBACK_ARGUMENTS struct tagOEMBITMAPINFO oembmi[93]; } SETOBM_CALLBACK_ARGUMENTS, *PSETOBM_CALLBACK_ARGUMENTS; +typedef struct _LPK_CALLBACK_ARGUMENTS +{ + LPWSTR lpString; + HDC hdc; + INT x; + INT y; + UINT flags; + RECT rect; + UINT count; + BOOL bRect; +} LPK_CALLBACK_ARGUMENTS, *PLPK_CALLBACK_ARGUMENTS; + NTSTATUS WINAPI User32CallCopyImageFromKernel(PVOID Arguments, ULONG ArgumentLength); NTSTATUS WINAPI @@ -171,4 +184,6 @@ NTSTATUS WINAPI User32CallDDEGetFromKernel(PVOID Arguments, ULONG ArgumentLength); NTSTATUS WINAPI User32CallOBMFromKernel(PVOID Arguments, ULONG ArgumentLength); +NTSTATUS WINAPI +User32CallLPKFromKernel(PVOID Arguments, ULONG ArgumentLength); #endif /* __INCLUDE_USER32_CALLBACK_H */ diff --git a/win32ss/user/ntuser/painting.c b/win32ss/user/ntuser/painting.c index 4ffcdab989..c1f7cad77a 100644 --- a/win32ss/user/ntuser/painting.c +++ b/win32ss/user/ntuser/painting.c @@ -9,6 +9,9 @@ #include <win32k.h> DBG_DEFAULT_CHANNEL(UserPainting); +BOOL UserExtTextOutW(HDC hdc, INT x, INT y, UINT flags, PRECTL lprc, + LPCWSTR lpString, UINT count); + /* PRIVATE FUNCTIONS **********************************************************/ /** @@ -2145,15 +2148,13 @@ UserDrawCaptionText( if (Ret) { // Faster while in setup. - GreExtTextOutW( hDc, + UserExtTextOutW( hDc, lpRc->left, lpRc->top + (lpRc->bottom - lpRc->top - Size.cy) / 2, // DT_SINGLELINE && DT_VCENTER ETO_CLIPPED, (RECTL *)lpRc, Text->Buffer, - Length, - NULL, - 0 ); + Length); } else { diff --git a/win32ss/user/rtl/text.c b/win32ss/user/rtl/text.c index d723c55f57..7670e2e595 100644 --- a/win32ss/user/rtl/text.c +++ b/win32ss/user/rtl/text.c @@ -939,6 +939,120 @@ static void TEXT_DrawUnderscore (HDC hdc, int x, int y, const WCHAR *str, int of #endif } +#ifdef _WIN32K_ +/*********************************************************************** + * UserExtTextOutW + * + * Callback to usermode to use ExtTextOut, which will apply complex + * script processing if needed and then draw it + * + * Parameters + * hdc [in] The handle of the DC for drawing + * x [in] The x location of the string + * y [in] The y location of the string + * flags [in] ExtTextOut flags + * lprc [in] Clipping rectangle (if not NULL) + * lpString [in] String to be drawn + * count [in] String length + */ +BOOL UserExtTextOutW(HDC hdc, + INT x, + INT y, + UINT flags, + PRECTL lprc, + LPCWSTR lpString, + UINT count) +{ + PVOID ResultPointer; + ULONG ResultLength; + ULONG ArgumentLength; + ULONG_PTR pStringBuffer; + NTSTATUS Status; + PLPK_CALLBACK_ARGUMENTS Argument; + BOOL bResult; + + ArgumentLength = sizeof(LPK_CALLBACK_ARGUMENTS); + + pStringBuffer = ArgumentLength; + ArgumentLength += sizeof(WCHAR) * (count + 2); + + Argument = IntCbAllocateMemory(ArgumentLength); + + if (!Argument) + { + goto fallback; + } + + /* Initialize struct members */ + Argument->hdc = hdc; + Argument->x = x; + Argument->y = y; + Argument->flags = flags; + Argument->count = count; + + if (lprc) + { + Argument->rect = *lprc; + Argument->bRect = TRUE; + } + else + { + RtlZeroMemory(&Argument->rect, sizeof(RECT)); + Argument->bRect = FALSE; + } + + /* Align lpString + mimicks code from co_IntClientLoadLibrary */ + Argument->lpString = (LPWSTR)pStringBuffer; + pStringBuffer += (ULONG_PTR)Argument; + + Status = RtlStringCchCopyNW((LPWSTR)pStringBuffer, count + 1, lpString, count); + + if (!NT_SUCCESS(Status)) + { + IntCbFreeMemory(Argument); + goto fallback; + } + + UserLeaveCo(); + + Status = KeUserModeCallback(USER32_CALLBACK_LPK, + Argument, + ArgumentLength, + &ResultPointer, + &ResultLength); + + UserEnterCo(); + + IntCbFreeMemory(Argument); + + if (NT_SUCCESS(Status)) + { + _SEH2_TRY + { + ProbeForRead(ResultPointer, sizeof(BOOL), 1); + bResult = *(LPBOOL)ResultPointer; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ERR("Failed to copy result from user mode!\n"); + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + } + + if (!NT_SUCCESS(Status)) + { + goto fallback; + } + + return bResult; + +fallback: + return GreExtTextOutW(hdc, x, y, flags, lprc, lpString, count, NULL, 0); +} +#endif + /*********************************************************************** * DrawTextExW (USER32.@) * @@ -1201,10 +1315,10 @@ INT WINAPI DrawTextExWorker( HDC hdc, else len_seg = len; #ifdef _WIN32K_ - if (!GreExtTextOutW( hdc, xseg, y, - ((flags & DT_NOCLIP) ? 0 : ETO_CLIPPED) | - ((flags & DT_RTLREADING) ? ETO_RTLREADING : 0), - rect, str, len_seg, NULL, 0 )) + if (!UserExtTextOutW( hdc, xseg, y, + ((flags & DT_NOCLIP) ? 0 : ETO_CLIPPED) | + ((flags & DT_RTLREADING) ? ETO_RTLREADING : 0), + rect, str, len_seg)) #else if (!ExtTextOutW( hdc, xseg, y, ((flags & DT_NOCLIP) ? 0 : ETO_CLIPPED) | diff --git a/win32ss/user/user32/misc/dllmain.c b/win32ss/user/user32/misc/dllmain.c index 704cb2c49a..e329b85229 100644 --- a/win32ss/user/user32/misc/dllmain.c +++ b/win32ss/user/user32/misc/dllmain.c @@ -205,6 +205,7 @@ PVOID apfnDispatch[USER32_CALLBACK_MAXIMUM + 1] = User32CallDDEPostFromKernel, User32CallDDEGetFromKernel, User32CallOBMFromKernel, + User32CallLPKFromKernel, }; @@ -641,3 +642,24 @@ User32CallOBMFromKernel(PVOID Arguments, ULONG ArgumentLength) return ZwCallbackReturn(Arguments, ArgumentLength, STATUS_SUCCESS); } + +NTSTATUS WINAPI User32CallLPKFromKernel(PVOID Arguments, ULONG ArgumentLength) +{ + BOOL bResult; + PLPK_CALLBACK_ARGUMENTS Argument; + + Argument = (PLPK_CALLBACK_ARGUMENTS)Arguments; + + Argument->lpString = (LPWSTR)((ULONG_PTR)Argument->lpString + (ULONG_PTR)Argument); + + bResult = ExtTextOutW(Argument->hdc, + Argument->x, + Argument->y, + Argument->flags, + (Argument->bRect) ? &Argument->rect : NULL, + Argument->lpString, + Argument->count, + NULL); + + return ZwCallbackReturn(&bResult, sizeof(BOOL), STATUS_SUCCESS); +}

1 0

01/01: [CONUTILS] In ConWrite(), emit an \r when a \n is encountered but not already preceded by \r.
by Hermès Bélusca-Maïto 23 Aug '18

23 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b277cbdf222a67f7bf4e7… commit b277cbdf222a67f7bf4e7acc246189be91474aa0 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Aug 23 17:04:53 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Aug 23 17:04:53 2018 +0200 [CONUTILS] In ConWrite(), emit an \r when a \n is encountered but not already preceded by \r. And, don't emit \r\n when an \r alone is encountered. This fixes the problem of extra newlines appearing when redirecting "more" output to a file. CORE-14592 --- sdk/lib/conutils/outstream.c | 70 ++++++++++++++++++++++++++------------------ 1 file changed, 42 insertions(+), 28 deletions(-) diff --git a/sdk/lib/conutils/outstream.c b/sdk/lib/conutils/outstream.c index d884c92334..eea90a0cd0 100644 --- a/sdk/lib/conutils/outstream.c +++ b/sdk/lib/conutils/outstream.c @@ -158,36 +158,43 @@ ConWrite( /* * Find any newline character in the buffer, - * write the part BEFORE the newline, then write - * a carriage-return + newline, and then write - * the remaining part of the buffer. + * write the part BEFORE the newline, then emit + * a carriage-return + newline sequence and finally + * write the remaining part of the buffer. * * This fixes output in files and serial console. */ while (len > 0) { - /* Loop until we find a \r or \n character */ - // FIXME: What about the pair \r\n ? + /* Loop until we find a newline character */ p = szStr; - while (len > 0 && *(PWCHAR)p != L'\r' && *(PWCHAR)p != L'\n') + while (len > 0 && *(PWCHAR)p != L'\n') { /* Advance one character */ p = (PVOID)((PWCHAR)p + 1); - len--; + --len; } - /* Write everything up to \r or \n */ + /* Write everything up to \n */ dwNumBytes = ((PWCHAR)p - (PWCHAR)szStr) * sizeof(WCHAR); WriteFile(Stream->hHandle, szStr, dwNumBytes, &dwNumBytes, NULL); - /* If we hit \r or \n ... */ - if (len > 0 && (*(PWCHAR)p == L'\r' || *(PWCHAR)p == L'\n')) + /* + * If we hit a newline and the previous character is not a carriage-return, + * emit a carriage-return + newline sequence, otherwise just emit the newline. + */ + if (len > 0 && *(PWCHAR)p == L'\n') { - /* ... send a carriage-return + newline sequence and skip \r or \n */ - WriteFile(Stream->hHandle, L"\r\n", 2 * sizeof(WCHAR), &dwNumBytes, NULL); - szStr = (PVOID)((PWCHAR)p + 1); - len--; + if (p == (PVOID)szStr || (p > (PVOID)szStr && *((PWCHAR)p - 1) != L'\r')) + WriteFile(Stream->hHandle, L"\r\n", 2 * sizeof(WCHAR), &dwNumBytes, NULL); + else + WriteFile(Stream->hHandle, L"\n", sizeof(WCHAR), &dwNumBytes, NULL); + + /* Skip \n */ + p = (PVOID)((PWCHAR)p + 1); + --len; } + szStr = p; } #ifndef _UNICODE @@ -235,36 +242,43 @@ ConWrite( /* * Find any newline character in the buffer, - * write the part BEFORE the newline, then write - * a carriage-return + newline, and then write - * the remaining part of the buffer. + * write the part BEFORE the newline, then emit + * a carriage-return + newline sequence and finally + * write the remaining part of the buffer. * * This fixes output in files and serial console. */ while (len > 0) { - /* Loop until we find a \r or \n character */ - // FIXME: What about the pair \r\n ? + /* Loop until we find a newline character */ p = szStr; - while (len > 0 && *(PCHAR)p != '\r' && *(PCHAR)p != '\n') + while (len > 0 && *(PCHAR)p != '\n') { /* Advance one character */ p = (PVOID)((PCHAR)p + 1); - len--; + --len; } - /* Write everything up to \r or \n */ + /* Write everything up to \n */ dwNumBytes = ((PCHAR)p - (PCHAR)szStr) * sizeof(CHAR); WriteFile(Stream->hHandle, szStr, dwNumBytes, &dwNumBytes, NULL); - /* If we hit \r or \n ... */ - if (len > 0 && (*(PCHAR)p == '\r' || *(PCHAR)p == '\n')) + /* + * If we hit a newline and the previous character is not a carriage-return, + * emit a carriage-return + newline sequence, otherwise just emit the newline. + */ + if (len > 0 && *(PCHAR)p == '\n') { - /* ... send a carriage-return + newline sequence and skip \r or \n */ - WriteFile(Stream->hHandle, "\r\n", 2, &dwNumBytes, NULL); - szStr = (PVOID)((PCHAR)p + 1); - len--; + if (p == (PVOID)szStr || (p > (PVOID)szStr && *((PCHAR)p - 1) != '\r')) + WriteFile(Stream->hHandle, "\r\n", 2, &dwNumBytes, NULL); + else + WriteFile(Stream->hHandle, "\n", 1, &dwNumBytes, NULL); + + /* Skip \n */ + p = (PVOID)((PCHAR)p + 1); + --len; } + szStr = p; } #ifdef _UNICODE

1 0

01/01: [SDK] "0.4.11-dev" Starts here.
by Joachim Henze 22 Aug '18

22 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=78b6e43d22331d29feb5b… commit 78b6e43d22331d29feb5bdd9afc754c1de15f1db Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Thu Aug 23 01:22:43 2018 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Thu Aug 23 01:22:43 2018 +0200 [SDK] "0.4.11-dev" Starts here. tag will be added in next commit. --- sdk/include/reactos/version.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/include/reactos/version.cmake b/sdk/include/reactos/version.cmake index 5bc2523818..9314a56cfc 100644 --- a/sdk/include/reactos/version.cmake +++ b/sdk/include/reactos/version.cmake @@ -2,7 +2,7 @@ string(TIMESTAMP KERNEL_VERSION_BUILD %Y%m%d UTC) set(KERNEL_VERSION_MAJOR "0") set(KERNEL_VERSION_MINOR "4") -set(KERNEL_VERSION_PATCH_LEVEL "10") +set(KERNEL_VERSION_PATCH_LEVEL "11") set(COPYRIGHT_YEAR "2018") # KERNEL_VERSION_BUILD_TYPE is "dev" for Git builds

1 0

01/01: [NFSD] [TELNET] Remove the hardcoded directory paths C:\ReactOS
by Katayama Hirofumi MZ 22 Aug '18

22 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b8e98c4e66ae8b73c06ba… commit b8e98c4e66ae8b73c06ba323b7536728a267441a Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Aug 23 02:40:11 2018 +0900 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Wed Aug 22 19:40:11 2018 +0200 [NFSD] [TELNET] Remove the hardcoded directory paths C:\ReactOS CORE-14747 --- base/services/nfsd/idmap.c | 24 ++++++++++++++++++++++++ base/services/nfsd/nfs41_daemon.c | 24 ++++++++++++++++++++++++ base/services/telnetd/telnetd.c | 22 +++++++++++++++------- base/services/telnetd/telnetd.h | 1 + 4 files changed, 64 insertions(+), 7 deletions(-) diff --git a/base/services/nfsd/idmap.c b/base/services/nfsd/idmap.c index 328f887028..18f44b9427 100644 --- a/base/services/nfsd/idmap.c +++ b/base/services/nfsd/idmap.c @@ -74,8 +74,10 @@ struct idmap_lookup { }; +#ifndef __REACTOS__ /* configuration */ static const char CONFIG_FILENAME[] = "C:\\ReactOS\\System32\\drivers\\etc\\ms-nfs41-idmap.conf"; +#endif struct idmap_config { /* ldap server information */ @@ -361,6 +363,9 @@ static int config_init( struct idmap_config *config) { int status; +#ifdef __REACTOS__ + char config_path[MAX_PATH]; +#endif /* load default values */ status = config_defaults(config); @@ -369,10 +374,29 @@ static int config_init( goto out; } +#ifdef __REACTOS__ + if (GetSystemDirectoryA(config_path, ARRAYSIZE(config_path))) + { + StringCchCatA(config_path, ARRAYSIZE(config_path), "\\drivers\\etc\\ms-nfs41-idmap.conf"); + } + else + { + StringCchCopyA(config_path, ARRAYSIZE(config_path), "C:\\ReactOS\\system32\\drivers\\etc\\ms-nfs41-idmap.conf"); + } +#endif + /* load configuration from file */ +#ifdef __REACTOS__ + status = config_load(config, config_path); +#else status = config_load(config, CONFIG_FILENAME); +#endif if (status) { +#ifdef __REACTOS__ + eprintf("config_load('%s') failed with %d\n", config_path, status); +#else eprintf("config_load('%s') failed with %d\n", CONFIG_FILENAME, status); +#endif goto out; } out: diff --git a/base/services/nfsd/nfs41_daemon.c b/base/services/nfsd/nfs41_daemon.c index 7ad4ad1b12..1a8f2dfbbe 100644 --- a/base/services/nfsd/nfs41_daemon.c +++ b/base/services/nfsd/nfs41_daemon.c @@ -23,6 +23,9 @@ #include <process.h> #include <tchar.h> #include <stdio.h> +#ifdef __REACTOS__ +#include <strsafe.h> +#endif #include <devioctl.h> #include <lmcons.h> /* UNLEN for GetUserName() */ @@ -38,7 +41,9 @@ #define MAX_NUM_THREADS 128 DWORD NFS41D_VERSION = 0; +#ifndef __REACTOS__ static const char FILE_NETCONFIG[] = "C:\\ReactOS\\System32\\drivers\\etc\\netconfig"; +#endif /* Globals */ char localdomain_name[NFS41_HOSTNAME_LEN]; @@ -163,10 +168,29 @@ typedef struct _nfsd_args { static bool_t check_for_files() { FILE *fd; +#ifdef __REACTOS__ + char config_path[MAX_PATH]; + + if (GetSystemDirectoryA(config_path, ARRAYSIZE(config_path))) + { + StringCchCatA(config_path, ARRAYSIZE(config_path), "\\drivers\\etc\\netconfig"); + } + else + { + StringCchCopyA(config_path, ARRAYSIZE(config_path), "C:\\ReactOS\\system32\\drivers\\etc\\netconfig"); + } + + fd = fopen(config_path, "r"); +#else fd = fopen(FILE_NETCONFIG, "r"); +#endif if (fd == NULL) { +#ifdef __REACTOS__ + fprintf(stderr,"nfsd() failed to open file '%s'\n", config_path); +#else fprintf(stderr,"nfsd() failed to open file '%s'\n", FILE_NETCONFIG); +#endif return FALSE; } fclose(fd); diff --git a/base/services/telnetd/telnetd.c b/base/services/telnetd/telnetd.c index 920ddea694..927d2862ad 100644 --- a/base/services/telnetd/telnetd.c +++ b/base/services/telnetd/telnetd.c @@ -367,12 +367,20 @@ static void RunShell(client_t *client) STARTUPINFO si; PROCESS_INFORMATION piProcInfo; SECURITY_ATTRIBUTES saAttr; + char cmd_path[MAX_PATH]; + + if (!GetEnvironmentVariableA("COMSPEC", cmd_path, ARRAYSIZE(cmd_path))) + { + if (GetSystemDirectoryA(cmd_path, ARRAYSIZE(cmd_path))) + { + StringCchCatA(cmd_path, ARRAYSIZE(cmd_path), "\\cmd.exe"); + } + else + { + StringCchCopyA(cmd_path, ARRAYSIZE(cmd_path), "C:\\ReactOS\\system32\\cmd.exe"); + } + } - const char *name = "c:\\reactos\\system32\\cmd.exe"; - const char *cmd = NULL; - //const char *name = "d:\\cygwin\\bin\\bash.exe"; - //const char *cmd = "d:\\cygwin\\bin\\bash.exe --login -i"; - saAttr.nLength = sizeof(SECURITY_ATTRIBUTES); saAttr.bInheritHandle = TRUE; saAttr.lpSecurityDescriptor = NULL; @@ -406,8 +414,8 @@ static void RunShell(client_t *client) //si.dwFlags |= STARTF_USESHOWWINDOW; //si.wShowWindow = SW_SHOW; - if (!CreateProcess((LPSTR) name, // executable module - (LPSTR) cmd, // command line + if (!CreateProcess(cmd_path, // executable module + NULL, // command line NULL, // process security attributes NULL, // primary thread security attributes TRUE, // handles are inherited diff --git a/base/services/telnetd/telnetd.h b/base/services/telnetd/telnetd.h index 05132a3c86..67927df41f 100644 --- a/base/services/telnetd/telnetd.h +++ b/base/services/telnetd/telnetd.h @@ -9,6 +9,7 @@ #include <wincon.h> #define _INC_WINDOWS #include <winsock2.h> +#include <strsafe.h> /* ** macro definitions

1 0

01/01: [TRANSLATION][ZIPFLDR] Add Japanese translation (#799)
by Katayama Hirofumi MZ 22 Aug '18

22 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=86b915ef849959cb9722c… commit 86b915ef849959cb9722c86d7e53ad4898621a34 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Aug 22 21:26:53 2018 +0900 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Aug 22 14:26:53 2018 +0200 [TRANSLATION][ZIPFLDR] Add Japanese translation (#799) CORE-14954 --- dll/shellext/zipfldr/lang/ja-JP.rc | 71 ++++++++++++++++++++++++++++++++++++++ dll/shellext/zipfldr/zipfldr.rc | 3 ++ 2 files changed, 74 insertions(+) diff --git a/dll/shellext/zipfldr/lang/ja-JP.rc b/dll/shellext/zipfldr/lang/ja-JP.rc new file mode 100644 index 0000000000..4b15dd20c0 --- /dev/null +++ b/dll/shellext/zipfldr/lang/ja-JP.rc @@ -0,0 +1,71 @@ +/* + * PROJECT: ReactOS Zip Shell Extension + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Japanese resource translation + * COPYRIGHT: Copyright 2018 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) + */ + +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +IDD_PROPPAGEDESTINATION DIALOGEX 0, 0, 235, 156 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "展開先を選んで下さい" +FONT 9, "MS UI Gothic", 400, 0, 0x0 +BEGIN + LTEXT "展開先のディレクトリを選んで下さい",IDC_STATIC,6,12,174,8 + EDITTEXT IDC_DIRECTORY,6,24,222,12,ES_AUTOHSCROLL + PUSHBUTTON "参照...",IDC_BROWSE,174,42,54,14 + PUSHBUTTON "パスワード",IDC_PASSWORD,174,66,54,14 + LTEXT "展開中...",IDC_STATIC,6,114,42,8 + CONTROL "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,6,126,222,6 +END + +IDD_PROPPAGECOMPLETE DIALOGEX 0, 0, 235, 156 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "展開完了" +FONT 9, "MS UI Gothic", 400, 0, 0x0 +BEGIN + LTEXT "ファイルは次のディレクトリに展開されました:",IDC_STATIC,6,12,222,18 + LTEXT "ターゲット",IDC_DESTDIR,6,36,222,8 + CONTROL "展開したファイルを表示",IDC_SHOW_EXTRACTED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,66,81,10 + LTEXT "完了をクリックして下さい。",IDC_STATIC,6,84,174,8 +END + +IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 273, 56 +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "ファイルの置換の確認" +FONT 9, "MS UI Gothic", 400, 0, 0x0 +BEGIN + DEFPUSHBUTTON "はい(&Y)",IDYES,6,36,62,14 + PUSHBUTTON "キャンセル",IDCANCEL,204,36,62,14 + PUSHBUTTON "すべてはい(&T)",IDYESALL,72,36,62,14 + PUSHBUTTON "いいえ(&N)",IDNO,138,36,62,14 + ICON "",IDC_EXCLAMATION_ICON,6,6,24,22 + LTEXT "",IDC_MESSAGE,36,6,228,24 +END + +STRINGTABLE +BEGIN + IDS_COL_NAME "名前" + IDS_COL_TYPE "種類" + IDS_COL_COMPRSIZE "圧縮サイズ" + IDS_COL_PASSWORD "パスワード" + IDS_COL_SIZE "サイズ" + IDS_COL_RATIO "圧縮率" + IDS_COL_DATE_MOD "変更日" + IDS_YES "はい" + IDS_NO "いいえ" + + IDS_WIZ_TITLE "展開ウィザード" + IDS_WIZ_DEST_TITLE "展開先を選んで下さい" + IDS_WIZ_DEST_SUBTITLE "ZIPアーカイブのファイルは指定された場所に展開されました。" + IDS_WIZ_COMPL_TITLE "展開完了" + IDS_WIZ_COMPL_SUBTITLE "ZIPアーカイブのファイルは展開されました。" + IDS_WIZ_BROWSE_TITLE "選択された項目を展開したい場所を選んで下さい。" + + IDS_OVERWRITEFILE_TEXT "'%1'という名前のファイルがフォルダ内に既に存在します。\n置き換えしますか?" + + IDS_MENUITEM "すべて展開(&A)..." + IDS_HELPTEXT "フォルダ内容の展開" + IDS_FRIENDLYNAME "圧縮 (zip) フォルダ" +END diff --git a/dll/shellext/zipfldr/zipfldr.rc b/dll/shellext/zipfldr/zipfldr.rc index 936c591d5f..d8e8f36b8e 100644 --- a/dll/shellext/zipfldr/zipfldr.rc +++ b/dll/shellext/zipfldr/zipfldr.rc @@ -34,6 +34,9 @@ IDR_ZIPFLDR REGISTRY "res/zipfldr.rgs" #ifdef LANGUAGE_IT_IT #include "lang/it-IT.rc" #endif +#ifdef LANGUAGE_JA_JP + #include "lang/ja-JP.rc" +#endif #ifdef LANGUAGE_PL_PL #include "lang/pl-PL.rc" #endif

1 0

02/02: [ADVAPI32_WINETEST] Restore service.c changes from 3c1b7834e1
by Serge Gautherie 21 Aug '18

21 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ab243b82b49ec8ed683f5… commit ab243b82b49ec8ed683f5674273f0bc866f1151a Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Sun Jul 22 01:08:55 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Tue Aug 21 17:36:47 2018 +0200 [ADVAPI32_WINETEST] Restore service.c changes from 3c1b7834e1 This reverts commit a67df65c4f5337f14043709ae758361f0b0a3b31. New failure was fixed by previous SERVICES commit. Thus new timeout is avoided. CORE-14521 --- modules/rostests/winetests/advapi32/service.c | 205 +++++++++++++++++++++----- 1 file changed, 172 insertions(+), 33 deletions(-) diff --git a/modules/rostests/winetests/advapi32/service.c b/modules/rostests/winetests/advapi32/service.c index a85bdf8863..8c13fbb2c6 100644 --- a/modules/rostests/winetests/advapi32/service.c +++ b/modules/rostests/winetests/advapi32/service.c @@ -36,6 +36,7 @@ static const CHAR spooler[] = "Spooler"; /* Should be available on all platforms static CHAR selfname[MAX_PATH]; static BOOL (WINAPI *pChangeServiceConfig2A)(SC_HANDLE,DWORD,LPVOID); +static BOOL (WINAPI *pChangeServiceConfig2W)(SC_HANDLE,DWORD,LPVOID); static BOOL (WINAPI *pEnumServicesStatusExA)(SC_HANDLE, SC_ENUM_TYPE, DWORD, DWORD, LPBYTE, DWORD, LPDWORD, LPDWORD, LPDWORD, LPCSTR); @@ -57,6 +58,7 @@ static void init_function_pointers(void) HMODULE hadvapi32 = GetModuleHandleA("advapi32.dll"); pChangeServiceConfig2A = (void*)GetProcAddress(hadvapi32, "ChangeServiceConfig2A"); + pChangeServiceConfig2W = (void*)GetProcAddress(hadvapi32, "ChangeServiceConfig2W"); pEnumServicesStatusExA= (void*)GetProcAddress(hadvapi32, "EnumServicesStatusExA"); pEnumServicesStatusExW= (void*)GetProcAddress(hadvapi32, "EnumServicesStatusExW"); pGetSecurityInfo = (void *)GetProcAddress(hadvapi32, "GetSecurityInfo"); @@ -1954,6 +1956,7 @@ static void test_queryconfig2(void) DWORD expected, needed; BYTE buffer[MAX_PATH]; LPSERVICE_DESCRIPTIONA pConfig = (LPSERVICE_DESCRIPTIONA)buffer; + LPSERVICE_DESCRIPTIONW pConfigW = (LPSERVICE_DESCRIPTIONW)buffer; SERVICE_PRESHUTDOWN_INFO preshutdown_info; static const CHAR servicename [] = "Winetest"; static const CHAR displayname [] = "Winetest dummy service"; @@ -1961,6 +1964,9 @@ static void test_queryconfig2(void) static const CHAR dependencies[] = "Master1\0Master2\0+MasterGroup1\0"; static const CHAR password [] = ""; static const CHAR description [] = "Description"; + static const CHAR description_empty[] = ""; + static const WCHAR descriptionW [] = {'D','e','s','c','r','i','p','t','i','o','n','W',0}; + static const WCHAR descriptionW_empty[] = {0}; if(!pQueryServiceConfig2A) { @@ -2121,6 +2127,66 @@ static void test_queryconfig2(void) ret = pQueryServiceConfig2W(svc_handle, SERVICE_CONFIG_DESCRIPTION,buffer, needed,&needed); ok(ret, "expected QueryServiceConfig2W to succeed\n"); + pConfig->lpDescription = (LPSTR)description; + ret = pChangeServiceConfig2A(svc_handle, SERVICE_CONFIG_DESCRIPTION, &buffer); + ok(ret, "expected ChangeServiceConfig2A to succeed\n"); + + pConfig->lpDescription = NULL; + ret = pQueryServiceConfig2A(svc_handle, SERVICE_CONFIG_DESCRIPTION, buffer, sizeof(buffer), &needed); + ok(ret, "expected QueryServiceConfig2A to succeed\n"); + ok(pConfig->lpDescription && !strcmp(description, pConfig->lpDescription), + "expected lpDescription to be %s, got %s\n", description, pConfig->lpDescription); + + pConfig->lpDescription = NULL; + ret = pChangeServiceConfig2A(svc_handle, SERVICE_CONFIG_DESCRIPTION, &buffer); + ok(ret, "expected ChangeServiceConfig2A to succeed\n"); + + pConfig->lpDescription = NULL; + ret = pQueryServiceConfig2A(svc_handle, SERVICE_CONFIG_DESCRIPTION, buffer, sizeof(buffer), &needed); + ok(ret, "expected QueryServiceConfig2A to succeed\n"); + ok(pConfig->lpDescription && !strcmp(description, pConfig->lpDescription), + "expected lpDescription to be %s, got %s\n", description, pConfig->lpDescription); + + pConfig->lpDescription = (LPSTR)description_empty; + ret = pChangeServiceConfig2A(svc_handle, SERVICE_CONFIG_DESCRIPTION, &buffer); + ok(ret, "expected ChangeServiceConfig2A to succeed\n"); + + pConfig->lpDescription = (void*)0xdeadbeef; + ret = pQueryServiceConfig2A(svc_handle, SERVICE_CONFIG_DESCRIPTION, buffer, sizeof(buffer), &needed); + ok(ret, "expected QueryServiceConfig2A to succeed\n"); + ok(!pConfig->lpDescription, + "expected lpDescription to be null, got %s\n", pConfig->lpDescription); + + pConfigW->lpDescription = (LPWSTR)descriptionW; + ret = pChangeServiceConfig2W(svc_handle, SERVICE_CONFIG_DESCRIPTION, &buffer); + ok(ret, "expected ChangeServiceConfig2W to succeed\n"); + + pConfigW->lpDescription = NULL; + ret = pQueryServiceConfig2W(svc_handle, SERVICE_CONFIG_DESCRIPTION, buffer, sizeof(buffer), &needed); + ok(ret, "expected QueryServiceConfig2A to succeed\n"); + ok(pConfigW->lpDescription && !lstrcmpW(descriptionW, pConfigW->lpDescription), + "expected lpDescription to be %s, got %s\n", wine_dbgstr_w(descriptionW), wine_dbgstr_w(pConfigW->lpDescription)); + + pConfigW->lpDescription = NULL; + ret = pChangeServiceConfig2W(svc_handle, SERVICE_CONFIG_DESCRIPTION, &buffer); + ok(ret, "expected ChangeServiceConfig2W to succeed\n"); + + pConfigW->lpDescription = NULL; + ret = pQueryServiceConfig2W(svc_handle, SERVICE_CONFIG_DESCRIPTION, buffer, sizeof(buffer), &needed); + ok(ret, "expected QueryServiceConfig2A to succeed\n"); + ok(pConfigW->lpDescription && !lstrcmpW(descriptionW, pConfigW->lpDescription), + "expected lpDescription to be %s, got %s\n", wine_dbgstr_w(descriptionW), wine_dbgstr_w(pConfigW->lpDescription)); + + pConfigW->lpDescription = (LPWSTR)descriptionW_empty; + ret = pChangeServiceConfig2W(svc_handle, SERVICE_CONFIG_DESCRIPTION, &buffer); + ok(ret, "expected ChangeServiceConfig2W to succeed\n"); + + pConfigW->lpDescription = (void*)0xdeadbeef; + ret = pQueryServiceConfig2W(svc_handle, SERVICE_CONFIG_DESCRIPTION, buffer, sizeof(buffer), &needed); + ok(ret, "expected QueryServiceConfig2A to succeed\n"); + ok(!pConfigW->lpDescription, + "expected lpDescription to be null, got %s\n", wine_dbgstr_w(pConfigW->lpDescription)); + SetLastError(0xdeadbeef); ret = pQueryServiceConfig2W(svc_handle, SERVICE_CONFIG_PRESHUTDOWN_INFO, (LPBYTE)&preshutdown_info, sizeof(preshutdown_info), &needed); @@ -2200,73 +2266,146 @@ static DWORD try_start_stop(SC_HANDLE svc_handle, const char* name, DWORD is_nt4 return le1; } +#define PHASE_STOPPED 1 +#define PHASE_RUNNING 2 + struct notify_data { SERVICE_NOTIFYW notify; SC_HANDLE svc; + BOOL was_called; + DWORD phase; }; -static void CALLBACK cb_stopped(void *user) +static void CALLBACK notify_cb(void *user) { struct notify_data *data = user; - BOOL br; + switch (data->phase) + { + case PHASE_STOPPED: + ok(data->notify.dwNotificationStatus == ERROR_SUCCESS, + "Got wrong notification status: %u\n", data->notify.dwNotificationStatus); + ok(data->notify.ServiceStatus.dwCurrentState == SERVICE_STOPPED, + "Got wrong service state: 0x%x\n", data->notify.ServiceStatus.dwCurrentState); + ok(data->notify.dwNotificationTriggered == SERVICE_NOTIFY_STOPPED, + "Got wrong notification triggered: 0x%x\n", data->notify.dwNotificationTriggered); + break; - ok(data->notify.dwNotificationStatus == ERROR_SUCCESS, - "Got wrong notification status: %u\n", data->notify.dwNotificationStatus); - ok(data->notify.ServiceStatus.dwCurrentState == SERVICE_STOPPED, - "Got wrong service state: 0x%x\n", data->notify.ServiceStatus.dwCurrentState); - ok(data->notify.dwNotificationTriggered == SERVICE_NOTIFY_STOPPED, - "Got wrong notification triggered: 0x%x\n", data->notify.dwNotificationTriggered); + case PHASE_RUNNING: + ok(data->notify.dwNotificationStatus == ERROR_SUCCESS, + "Got wrong notification status: %u\n", data->notify.dwNotificationStatus); + ok(data->notify.ServiceStatus.dwCurrentState == SERVICE_RUNNING, + "Got wrong service state: 0x%x\n", data->notify.ServiceStatus.dwCurrentState); + ok(data->notify.dwNotificationTriggered == SERVICE_NOTIFY_RUNNING, + "Got wrong notification triggered: 0x%x\n", data->notify.dwNotificationTriggered); + break; + } - br = StartServiceA(data->svc, 0, NULL); - ok(br, "StartService failed: %u\n", GetLastError()); + data->was_called = TRUE; } -static void CALLBACK cb_running(void *user) +static void test_servicenotify(SC_HANDLE scm_handle, const char *servicename) { - struct notify_data *data = user; + DWORD dr, dr2; + struct notify_data data; + struct notify_data data2; BOOL br; SERVICE_STATUS status; - - ok(data->notify.dwNotificationStatus == ERROR_SUCCESS, - "Got wrong notification status: %u\n", data->notify.dwNotificationStatus); - ok(data->notify.ServiceStatus.dwCurrentState == SERVICE_RUNNING, - "Got wrong service state: 0x%x\n", data->notify.ServiceStatus.dwCurrentState); - ok(data->notify.dwNotificationTriggered == SERVICE_NOTIFY_RUNNING, - "Got wrong notification triggered: 0x%x\n", data->notify.dwNotificationTriggered); - - br = ControlService(data->svc, SERVICE_CONTROL_STOP, &status); - ok(br, "ControlService failed: %u\n", GetLastError()); -} - -static void test_servicenotify(SC_HANDLE svc) -{ - DWORD dr; - struct notify_data data; + HANDLE svc, svc2; if(!pNotifyServiceStatusChangeW){ win_skip("No NotifyServiceStatusChangeW\n"); return; } + svc = OpenServiceA(scm_handle, servicename, GENERIC_ALL); + svc2 = OpenServiceA(scm_handle, servicename, GENERIC_ALL); + ok(svc != NULL && svc2 != NULL, "Failed to open service\n"); + if(!svc || !svc2) + return; + + /* receive stopped notification, then start service */ memset(&data.notify, 0, sizeof(data.notify)); data.notify.dwVersion = SERVICE_NOTIFY_STATUS_CHANGE; - data.notify.pfnNotifyCallback = &cb_stopped; + data.notify.pfnNotifyCallback = &notify_cb; data.notify.pContext = &data; data.svc = svc; + data.phase = PHASE_STOPPED; + data.was_called = FALSE; + + dr = pNotifyServiceStatusChangeW(svc, SERVICE_NOTIFY_STOPPED | SERVICE_NOTIFY_RUNNING, &data.notify); + ok(dr == ERROR_SUCCESS, "NotifyServiceStatusChangeW failed: %u\n", dr); + + dr = SleepEx(100, TRUE); + ok(dr == WAIT_IO_COMPLETION, "Got wrong SleepEx result: %u\n", dr); + ok(data.was_called == TRUE, "APC wasn't called\n"); + + br = StartServiceA(svc, 0, NULL); + ok(br, "StartService failed: %u\n", GetLastError()); + + /* receive running notification */ + data.phase = PHASE_RUNNING; + data.was_called = FALSE; + + dr = pNotifyServiceStatusChangeW(svc, SERVICE_NOTIFY_STOPPED | SERVICE_NOTIFY_RUNNING, &data.notify); + ok(dr == ERROR_SUCCESS, "NotifyServiceStatusChangeW failed: %u\n", dr); + + dr = SleepEx(100, TRUE); + ok(dr == WAIT_IO_COMPLETION, "Got wrong SleepEx result: %u\n", dr); + ok(data.was_called == TRUE, "APC wasn't called\n"); + + /* cannot register two notifications */ + data.phase = PHASE_STOPPED; + data.was_called = FALSE; dr = pNotifyServiceStatusChangeW(svc, SERVICE_NOTIFY_STOPPED | SERVICE_NOTIFY_RUNNING, &data.notify); ok(dr == ERROR_SUCCESS, "NotifyServiceStatusChangeW failed: %u\n", dr); + memset(&data2.notify, 0, sizeof(data2.notify)); + data2.notify.dwVersion = SERVICE_NOTIFY_STATUS_CHANGE; + data2.notify.pfnNotifyCallback = &notify_cb; + data2.notify.pContext = &data2; + + dr = pNotifyServiceStatusChangeW(svc, SERVICE_NOTIFY_STOPPED | SERVICE_NOTIFY_RUNNING, &data2.notify); + ok(dr == ERROR_SUCCESS || /* win8+ */ + dr == ERROR_ALREADY_REGISTERED, "NotifyServiceStatusChangeW gave wrong result: %u\n", dr); + + /* should receive no notification because status has not changed. + * on win8+, SleepEx quits early but the callback is still not invoked. */ + dr2 = SleepEx(100, TRUE); + ok((dr == ERROR_SUCCESS && dr2 == WAIT_IO_COMPLETION) || /* win8+ */ + (dr == ERROR_ALREADY_REGISTERED && dr2 == 0), "Got wrong SleepEx result: %u\n", dr); + ok(data.was_called == FALSE, "APC should not have been called\n"); + + /* stop service and receive notifiction */ + br = ControlService(svc, SERVICE_CONTROL_STOP, &status); + ok(br, "ControlService failed: %u\n", GetLastError()); + dr = SleepEx(100, TRUE); - ok(dr == WAIT_IO_COMPLETION, "APC wasn't called\n"); + ok(dr == WAIT_IO_COMPLETION, "Got wrong SleepEx result: %u\n", dr); + ok(data.was_called == TRUE, "APC wasn't called\n"); - data.notify.pfnNotifyCallback = &cb_running; + /* test cancelation: create notify on svc that will block until service + * start; close svc; start service on svc2; verify that notification does + * not happen */ + data.phase = PHASE_RUNNING; + data.was_called = FALSE; dr = pNotifyServiceStatusChangeW(svc, SERVICE_NOTIFY_STOPPED | SERVICE_NOTIFY_RUNNING, &data.notify); ok(dr == ERROR_SUCCESS, "NotifyServiceStatusChangeW failed: %u\n", dr); + CloseServiceHandle(svc); + + br = StartServiceA(svc2, 0, NULL); + ok(br, "StartService failed: %u\n", GetLastError()); + dr = SleepEx(100, TRUE); - ok(dr == WAIT_IO_COMPLETION, "APC wasn't called\n"); + ok(dr == 0, "Got wrong SleepEx result: %u\n", dr); + ok(data.was_called == FALSE, "APC should not have been called\n"); + + br = ControlService(svc2, SERVICE_CONTROL_STOP, &status); + ok(br, "ControlService failed: %u\n", GetLastError()); + + CloseServiceHandle(svc2); } static void test_start_stop(void) @@ -2352,7 +2491,7 @@ static void test_start_stop(void) displayname = "Winetest Service"; ret = ChangeServiceConfigA(svc_handle, SERVICE_NO_CHANGE, SERVICE_NO_CHANGE, SERVICE_NO_CHANGE, cmd, NULL, NULL, NULL, NULL, NULL, displayname); ok(ret, "ChangeServiceConfig() failed le=%u\n", GetLastError()); - test_servicenotify(svc_handle); + test_servicenotify(scm_handle, servicename); cleanup: if (svc_handle)

1 0

01/02: [SERVICES] RChangeServiceConfig2A(): Zero-Initialize InfoW variable
by Serge Gautherie 21 Aug '18

21 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e3a1c2c81b2e1167552cb… commit e3a1c2c81b2e1167552cbb8f8ca1d774e025ccd7 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Sat Jul 21 03:01:03 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Tue Aug 21 17:36:46 2018 +0200 [SERVICES] RChangeServiceConfig2A(): Zero-Initialize InfoW variable This lets forward NULL Info.psd/Info.psd->lpDescription/Info.psfa, instead of an uninitialized value. CORE-14521 --- base/system/services/rpcserver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/system/services/rpcserver.c b/base/system/services/rpcserver.c index fcfb1115a3..351793736d 100644 --- a/base/system/services/rpcserver.c +++ b/base/system/services/rpcserver.c @@ -5103,7 +5103,7 @@ RChangeServiceConfig2A( SC_RPC_HANDLE hService, SC_RPC_CONFIG_INFOA Info) { - SC_RPC_CONFIG_INFOW InfoW; + SC_RPC_CONFIG_INFOW InfoW = { 0 }; DWORD dwRet, dwLength; PVOID ptr = NULL;

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