Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [REGEDIT] Add back import prompt message lost during Wine sync. CORE-18770
by Thomas Faber 08 Mar '23

08 Mar '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=910822b8f5ffae49f2548… commit 910822b8f5ffae49f25486786dc248e287948366 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Mar 4 16:51:57 2023 -0500 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Tue Mar 7 19:41:51 2023 -0500 [REGEDIT] Add back import prompt message lost during Wine sync. CORE-18770 --- base/applications/regedit/regedit.c | 50 +++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/base/applications/regedit/regedit.c b/base/applications/regedit/regedit.c index 573a6341433..35fa13f037d 100644 --- a/base/applications/regedit/regedit.c +++ b/base/applications/regedit/regedit.c @@ -123,7 +123,11 @@ typedef enum { ACTION_ADD, ACTION_EXPORT, ACTION_DELETE } REGEDIT_ACTION; +#ifdef __REACTOS__ +static void PerformRegAction(REGEDIT_ACTION action, WCHAR **argv, int *i, BOOL silent) +#else static void PerformRegAction(REGEDIT_ACTION action, WCHAR **argv, int *i) +#endif { switch (action) { case ACTION_ADD: { @@ -131,6 +135,41 @@ static void PerformRegAction(REGEDIT_ACTION action, WCHAR **argv, int *i) WCHAR *realname = NULL; FILE *reg_file; +#ifdef __REACTOS__ + /* Request import confirmation */ + if (!silent) + { + WCHAR szText[512]; + int choice; + UINT mbType = MB_YESNO; + + LoadStringW(hInst, IDS_IMPORT_PROMPT, szText, ARRAY_SIZE(szText)); + + if (argv[*i + 1] != NULL) + { + /* Enable three buttons if there's another file coming */ + mbType = MB_YESNOCANCEL; + } + + choice = InfoMessageBox(NULL, mbType | MB_ICONQUESTION, szTitle, szText, filename); + switch (choice) + { + case IDNO: + return; + case IDCANCEL: + /* The cancel case is useful if the user is importing more than one registry file + * at a time, and wants to back out anytime during the import process. This way, the + * user doesn't have to resort to ending the regedit process abruptly just to cancel + * the operation. + * To achieve this, we skip all further command line arguments. + */ + *i = INT_MAX - 1; + return; + default: + break; + } + } +#endif if (!lstrcmpW(filename, L"-")) reg_file = stdin; else @@ -190,6 +229,9 @@ BOOL ProcessCmdLine(WCHAR *cmdline) WCHAR **argv; int argc, i; REGEDIT_ACTION action = ACTION_ADD; +#ifdef __REACTOS__ + BOOL silent = FALSE; +#endif argv = CommandLineToArgvW(cmdline, &argc); @@ -231,6 +273,10 @@ BOOL ProcessCmdLine(WCHAR *cmdline) /* unhandled */; break; case 'S': +#ifdef __REACTOS__ + silent = TRUE; + break; +#endif case 'V': /* ignored */; break; @@ -256,7 +302,11 @@ BOOL ProcessCmdLine(WCHAR *cmdline) } for (; i < argc; i++) +#ifdef __REACTOS__ + PerformRegAction(action, argv, &i, silent); +#else PerformRegAction(action, argv, &i); +#endif LocalFree(argv);

1 0

[reactos] 01/01: [NTOS:SE][FORMATTING] Fix the file header
by George Bișoc 07 Mar '23

07 Mar '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8b75dce45a6aad442b62f… commit 8b75dce45a6aad442b62faaf136132985b788ae2 Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Tue Mar 7 18:39:46 2023 +0100 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Tue Mar 7 18:39:46 2023 +0100 [NTOS:SE][FORMATTING] Fix the file header This fixes the copyright file header at the top of the file, reflecting the Coding Style rules. No code changes! --- ntoskrnl/se/access.c | 8 ++++---- ntoskrnl/se/acl.c | 8 ++++---- ntoskrnl/se/audit.c | 10 +++++----- ntoskrnl/se/client.c | 8 ++++---- ntoskrnl/se/objtype.c | 8 ++++---- ntoskrnl/se/priv.c | 12 ++++++------ ntoskrnl/se/sd.c | 8 ++++---- ntoskrnl/se/semgr.c | 14 +++++++------- ntoskrnl/se/sid.c | 8 ++++---- ntoskrnl/se/sqos.c | 8 ++++---- ntoskrnl/se/srm.c | 12 ++++++------ ntoskrnl/se/subject.c | 8 ++++---- ntoskrnl/se/token.c | 10 +++++----- ntoskrnl/se/tokenadj.c | 10 +++++----- ntoskrnl/se/tokencls.c | 10 +++++----- ntoskrnl/se/tokenlif.c | 10 +++++----- 16 files changed, 76 insertions(+), 76 deletions(-) diff --git a/ntoskrnl/se/access.c b/ntoskrnl/se/access.c index 77100336509..d9eacc550c7 100644 --- a/ntoskrnl/se/access.c +++ b/ntoskrnl/se/access.c @@ -1,8 +1,8 @@ /* - * PROJECT: ReactOS Kernel - * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) - * PURPOSE: Security access state functions support - * COPYRIGHT: Copyright Alex Ionescu <alex(a)relsoft.net> + * PROJECT: ReactOS Kernel + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Security access state functions support + * COPYRIGHT: Copyright Alex Ionescu <alex(a)relsoft.net> */ /* INCLUDES *******************************************************************/ diff --git a/ntoskrnl/se/acl.c b/ntoskrnl/se/acl.c index d7c53d4ac17..957c0981cd9 100644 --- a/ntoskrnl/se/acl.c +++ b/ntoskrnl/se/acl.c @@ -1,8 +1,8 @@ /* - * PROJECT: ReactOS Kernel - * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) - * PURPOSE: Access control lists (ACLs) implementation - * COPYRIGHT: Copyright David Welch <welch(a)cwcom.net> + * PROJECT: ReactOS Kernel + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Access control lists (ACLs) implementation + * COPYRIGHT: Copyright David Welch <welch(a)cwcom.net> */ /* INCLUDES *******************************************************************/ diff --git a/ntoskrnl/se/audit.c b/ntoskrnl/se/audit.c index a201e214907..e2a5cc49c23 100644 --- a/ntoskrnl/se/audit.c +++ b/ntoskrnl/se/audit.c @@ -1,9 +1,9 @@ /* - * PROJECT: ReactOS Kernel - * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) - * PURPOSE: Security auditing functions - * COPYRIGHT: Copyright Eric Kohl - * Copyright Timo Kreuzer <timo.kreuzer(a)reactos.org> + * PROJECT: ReactOS Kernel + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Security auditing functions + * COPYRIGHT: Copyright Eric Kohl + * Copyright Timo Kreuzer <timo.kreuzer(a)reactos.org> */ /* INCLUDES *******************************************************************/ diff --git a/ntoskrnl/se/client.c b/ntoskrnl/se/client.c index 773428009a9..44fc7084ba6 100644 --- a/ntoskrnl/se/client.c +++ b/ntoskrnl/se/client.c @@ -1,8 +1,8 @@ /* - * PROJECT: ReactOS Kernel - * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) - * PURPOSE: Security client support routines - * COPYRIGHT: Copyright Alex Ionescu <alex(a)relsoft.net> + * PROJECT: ReactOS Kernel + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Security client support routines + * COPYRIGHT: Copyright Alex Ionescu <alex(a)relsoft.net> */ /* INCLUDES *******************************************************************/ diff --git a/ntoskrnl/se/objtype.c b/ntoskrnl/se/objtype.c index f4648d1a8ec..24af8fff4f0 100644 --- a/ntoskrnl/se/objtype.c +++ b/ntoskrnl/se/objtype.c @@ -1,8 +1,8 @@ /* - * PROJECT: ReactOS Kernel - * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) - * PURPOSE: Security object type list support routines - * COPYRIGHT: Copyright Timo Kreuzer <timo.kreuzer(a)reactos.org> + * PROJECT: ReactOS Kernel + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Security object type list support routines + * COPYRIGHT: Copyright Timo Kreuzer <timo.kreuzer(a)reactos.org> */ /* INCLUDES *******************************************************************/ diff --git a/ntoskrnl/se/priv.c b/ntoskrnl/se/priv.c index a1013b1844b..a147d2bd2b7 100644 --- a/ntoskrnl/se/priv.c +++ b/ntoskrnl/se/priv.c @@ -1,10 +1,10 @@ /* - * PROJECT: ReactOS Kernel - * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) - * PURPOSE: Security privileges support - * COPYRIGHT: Copyright Alex Ionescu <alex(a)relsoft.net> - * Copyright Timo Kreuzer <timo.kreuzer(a)reactos.org> - * Copyright Eric Kohl + * PROJECT: ReactOS Kernel + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Security privileges support + * COPYRIGHT: Copyright Alex Ionescu <alex(a)relsoft.net> + * Copyright Timo Kreuzer <timo.kreuzer(a)reactos.org> + * Copyright Eric Kohl */ /* INCLUDES ******************************************************************/ diff --git a/ntoskrnl/se/sd.c b/ntoskrnl/se/sd.c index db3f5a5c440..26f61510482 100644 --- a/ntoskrnl/se/sd.c +++ b/ntoskrnl/se/sd.c @@ -1,8 +1,8 @@ /* - * PROJECT: ReactOS Kernel - * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) - * PURPOSE: Security descriptors (SDs) implementation support - * COPYRIGHT: Copyright David Welch <welch(a)cwcom.net> + * PROJECT: ReactOS Kernel + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Security descriptors (SDs) implementation support + * COPYRIGHT: Copyright David Welch <welch(a)cwcom.net> */ /* INCLUDES *******************************************************************/ diff --git a/ntoskrnl/se/semgr.c b/ntoskrnl/se/semgr.c index 6d55ae51835..a88da9c806c 100644 --- a/ntoskrnl/se/semgr.c +++ b/ntoskrnl/se/semgr.c @@ -1,11 +1,11 @@ /* - * PROJECT: ReactOS Kernel - * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) - * PURPOSE: Security manager infrastructure - * COPYRIGHT: Copyright Timo Kreuzer <timo.kreuzer(a)reactos.org> - * Copyright Eric Kohl - * Copyright Aleksey Bragin - * Copyright Alex Ionescu <alex(a)relsoft.net> + * PROJECT: ReactOS Kernel + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Security manager infrastructure + * COPYRIGHT: Copyright Timo Kreuzer <timo.kreuzer(a)reactos.org> + * Copyright Eric Kohl + * Copyright Aleksey Bragin + * Copyright Alex Ionescu <alex(a)relsoft.net> */ /* INCLUDES *******************************************************************/ diff --git a/ntoskrnl/se/sid.c b/ntoskrnl/se/sid.c index 3d0dff1a8ab..557447f539f 100644 --- a/ntoskrnl/se/sid.c +++ b/ntoskrnl/se/sid.c @@ -1,8 +1,8 @@ /* - * PROJECT: ReactOS Kernel - * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) - * PURPOSE: Security Identifier (SID) implementation support and handling - * COPYRIGHT: Copyright David Welch <welch(a)cwcom.net> + * PROJECT: ReactOS Kernel + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Security Identifier (SID) implementation support and handling + * COPYRIGHT: Copyright David Welch <welch(a)cwcom.net> */ /* INCLUDES *******************************************************************/ diff --git a/ntoskrnl/se/sqos.c b/ntoskrnl/se/sqos.c index 11ac0ba0efb..a71d31e7069 100644 --- a/ntoskrnl/se/sqos.c +++ b/ntoskrnl/se/sqos.c @@ -1,8 +1,8 @@ /* - * PROJECT: ReactOS Kernel - * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) - * PURPOSE: Security Quality of Service (SQoS) implementation support - * COPYRIGHT: Copyright David Welch <welch(a)cwcom.net> + * PROJECT: ReactOS Kernel + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Security Quality of Service (SQoS) implementation support + * COPYRIGHT: Copyright David Welch <welch(a)cwcom.net> */ /* INCLUDES *******************************************************************/ diff --git a/ntoskrnl/se/srm.c b/ntoskrnl/se/srm.c index e68124d8fa9..3e9f90c2e05 100644 --- a/ntoskrnl/se/srm.c +++ b/ntoskrnl/se/srm.c @@ -1,10 +1,10 @@ /* - * PROJECT: ReactOS Kernel - * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) - * PURPOSE: Security Reference Monitor Server - * COPYRIGHT: Copyright Timo Kreuzer <timo.kreuzer(a)reactos.org> - * Copyright Pierre Schweitzer <pierre(a)reactos.org> - * Copyright 2021 George Bișoc <george.bisoc(a)reactos.org> + * PROJECT: ReactOS Kernel + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Security Reference Monitor Server + * COPYRIGHT: Copyright Timo Kreuzer <timo.kreuzer(a)reactos.org> + * Copyright Pierre Schweitzer <pierre(a)reactos.org> + * Copyright 2021 George Bișoc <george.bisoc(a)reactos.org> */ /* INCLUDES *******************************************************************/ diff --git a/ntoskrnl/se/subject.c b/ntoskrnl/se/subject.c index 51a9e132028..22f503a51b3 100644 --- a/ntoskrnl/se/subject.c +++ b/ntoskrnl/se/subject.c @@ -1,8 +1,8 @@ /* - * PROJECT: ReactOS Kernel - * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) - * PURPOSE: Security subject context support routines - * COPYRIGHT: Copyright Alex Ionescu <alex(a)relsoft.net> + * PROJECT: ReactOS Kernel + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Security subject context support routines + * COPYRIGHT: Copyright Alex Ionescu <alex(a)relsoft.net> */ /* INCLUDES *******************************************************************/ diff --git a/ntoskrnl/se/token.c b/ntoskrnl/se/token.c index 33354f2ea8b..d5b7555ac07 100644 --- a/ntoskrnl/se/token.c +++ b/ntoskrnl/se/token.c @@ -1,9 +1,9 @@ /* - * PROJECT: ReactOS Kernel - * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) - * PURPOSE: Security access token implementation base support routines - * COPYRIGHT: Copyright David Welch <welch(a)cwcom.net> - * Copyright 2021-2022 George Bișoc <george.bisoc(a)reactos.org> + * PROJECT: ReactOS Kernel + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Security access token implementation base support routines + * COPYRIGHT: Copyright David Welch <welch(a)cwcom.net> + * Copyright 2021-2022 George Bișoc <george.bisoc(a)reactos.org> */ /* INCLUDES *******************************************************************/ diff --git a/ntoskrnl/se/tokenadj.c b/ntoskrnl/se/tokenadj.c index eb036a32d32..8b3bf9f1d10 100644 --- a/ntoskrnl/se/tokenadj.c +++ b/ntoskrnl/se/tokenadj.c @@ -1,9 +1,9 @@ /* - * PROJECT: ReactOS Kernel - * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) - * PURPOSE: Access token ajusting Groups/Privileges support routines - * COPYRIGHT: Copyright David Welch <welch(a)cwcom.net> - * Copyright 2021-2022 George Bișoc <george.bisoc(a)reactos.org> + * PROJECT: ReactOS Kernel + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Access token ajusting Groups/Privileges support routines + * COPYRIGHT: Copyright David Welch <welch(a)cwcom.net> + * Copyright 2021-2022 George Bișoc <george.bisoc(a)reactos.org> */ /* INCLUDES *******************************************************************/ diff --git a/ntoskrnl/se/tokencls.c b/ntoskrnl/se/tokencls.c index 6c40a72ccd1..278db460bfd 100644 --- a/ntoskrnl/se/tokencls.c +++ b/ntoskrnl/se/tokencls.c @@ -1,9 +1,9 @@ /* - * PROJECT: ReactOS Kernel - * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) - * PURPOSE: Access token Query/Set information classes implementation - * COPYRIGHT: Copyright David Welch <welch(a)cwcom.net> - * Copyright 2021-2022 George Bișoc <george.bisoc(a)reactos.org> + * PROJECT: ReactOS Kernel + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Access token Query/Set information classes implementation + * COPYRIGHT: Copyright David Welch <welch(a)cwcom.net> + * Copyright 2021-2022 George Bișoc <george.bisoc(a)reactos.org> */ /* INCLUDES *******************************************************************/ diff --git a/ntoskrnl/se/tokenlif.c b/ntoskrnl/se/tokenlif.c index 9f6e9aef9c8..44f269ed40b 100644 --- a/ntoskrnl/se/tokenlif.c +++ b/ntoskrnl/se/tokenlif.c @@ -1,9 +1,9 @@ /* - * PROJECT: ReactOS Kernel - * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) - * PURPOSE: Access token lifetime management implementation (Creation/Duplication/Filtering) - * COPYRIGHT: Copyright David Welch <welch(a)cwcom.net> - * Copyright 2021-2022 George Bișoc <george.bisoc(a)reactos.org> + * PROJECT: ReactOS Kernel + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Access token lifetime management implementation (Creation/Duplication/Filtering) + * COPYRIGHT: Copyright David Welch <welch(a)cwcom.net> + * Copyright 2021-2022 George Bișoc <george.bisoc(a)reactos.org> */ /* INCLUDES *******************************************************************/

1 0

[reactos] 01/01: [NTOS:SE] Do not allocate memory pool just for the access rights
by George Bișoc 07 Mar '23

07 Mar '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b284e82f478f40dd8a5b0… commit b284e82f478f40dd8a5b046ea211c4938cf06cc8 Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Tue Mar 7 11:42:22 2023 +0100 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Tue Mar 7 17:50:39 2023 +0100 [NTOS:SE] Do not allocate memory pool just for the access rights Access check is an expensive operation, that is, whenever an access to an object is performed an access check has to be done to ensure the access can be allowed to the calling thread who attempts to access such object. Currently SepAnalyzeAcesFromDacl allocates a block of pool memory for access check rights, nagging the Memory Manager like a desperate naughty creep. So instead initialize the access rights as a simple variable in SepAccessCheck and pass it out as an address to SepAnalyzeAcesFromDacl so that the function will fill it up with access rights. This helps with performance, avoiding wasting a few bits of memory just to hold these access rights. In addition to that, add a few asserts and fix the copyright header on both se.h and accesschk.c, to reflect the Coding Style rules. --- ntoskrnl/include/internal/se.h | 12 +- ntoskrnl/include/internal/tag.h | 1 - ntoskrnl/se/accesschk.c | 302 ++++++++++++---------------------------- ntoskrnl/se/debug.c | 11 +- 4 files changed, 103 insertions(+), 223 deletions(-) diff --git a/ntoskrnl/include/internal/se.h b/ntoskrnl/include/internal/se.h index 59cb4dbe631..d261b03c54a 100644 --- a/ntoskrnl/include/internal/se.h +++ b/ntoskrnl/include/internal/se.h @@ -1,9 +1,9 @@ /* - * PROJECT: ReactOS Kernel - * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) - * PURPOSE: Internal header for the Security Manager - * COPYRIGHT: Copyright Eric Kohl - * Copyright 2022 George Bișoc <george.bisoc(a)reactos.org> + * PROJECT: ReactOS Kernel + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Internal header for the Security Manager + * COPYRIGHT: Copyright Eric Kohl + * Copyright 2022 George Bișoc <george.bisoc(a)reactos.org> */ #pragma once @@ -303,7 +303,7 @@ SepDumpTokenDebugInfo( VOID SepDumpAccessRightsStats( - _In_opt_ PACCESS_CHECK_RIGHTS AccessRights); + _In_ PACCESS_CHECK_RIGHTS AccessRights); #endif // DBG // diff --git a/ntoskrnl/include/internal/tag.h b/ntoskrnl/include/internal/tag.h index f7a021152ce..35cf14d6ae6 100644 --- a/ntoskrnl/include/internal/tag.h +++ b/ntoskrnl/include/internal/tag.h @@ -164,7 +164,6 @@ #define TAG_LOGON_NOTIFICATION 'nLeS' #define TAG_SID_AND_ATTRIBUTES 'aSeS' #define TAG_SID_VALIDATE 'vSeS' -#define TAG_ACCESS_CHECK_RIGHT 'rCeS' #define TAG_DACL 'lcaD' /* LPC Tags */ diff --git a/ntoskrnl/se/accesschk.c b/ntoskrnl/se/accesschk.c index 0796dc8db78..690f7c029e7 100644 --- a/ntoskrnl/se/accesschk.c +++ b/ntoskrnl/se/accesschk.c @@ -1,10 +1,10 @@ /* - * PROJECT: ReactOS Kernel - * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) - * PURPOSE: Security access check control implementation - * COPYRIGHT: Copyright 2014 Timo Kreuzer <timo.kreuzer(a)reactos.org> - * Copyright 2014 Eric Kohl - * Copyright 2022 George Bișoc <george.bisoc(a)reactos.org> + * PROJECT: ReactOS Kernel + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Security access check control implementation + * COPYRIGHT: Copyright 2014 Timo Kreuzer <timo.kreuzer(a)reactos.org> + * Copyright 2014 Eric Kohl + * Copyright 2022-2023 George Bișoc <george.bisoc(a)reactos.org> */ /* INCLUDES *******************************************************************/ @@ -15,69 +15,6 @@ /* PRIVATE FUNCTIONS **********************************************************/ -/** - * @brief - * Allocates memory for the internal access check rights - * data structure and initializes it for use for the kernel. - * The purpose of this piece of data is to track down the - * remaining, granted and denied access rights whilst we - * are doing an access check procedure. - * - * @return - * Returns a pointer to allocated and initialized access - * check rights, otherwise NULL is returned. - */ -PACCESS_CHECK_RIGHTS -SepInitAccessCheckRights(VOID) -{ - PACCESS_CHECK_RIGHTS AccessRights; - - PAGED_CODE(); - - /* Allocate some pool for access check rights */ - AccessRights = ExAllocatePoolWithTag(PagedPool, - sizeof(ACCESS_CHECK_RIGHTS), - TAG_ACCESS_CHECK_RIGHT); - - /* Bail out if we failed */ - if (!AccessRights) - { - return NULL; - } - - /* Initialize the structure */ - AccessRights->RemainingAccessRights = 0; - AccessRights->GrantedAccessRights = 0; - AccessRights->DeniedAccessRights = 0; - - return AccessRights; -} - -/** - * @brief - * Frees an allocated access check rights from - * memory space after access check procedures - * have finished. - * - * @param[in] AccessRights - * A pointer to access check rights of which is - * to be freed from memory. - * - * @return - * Nothing. - */ -VOID -SepFreeAccessCheckRights( - _In_ PACCESS_CHECK_RIGHTS AccessRights) -{ - PAGED_CODE(); - - if (AccessRights) - { - ExFreePoolWithTag(AccessRights, TAG_ACCESS_CHECK_RIGHT); - } -} - /** * @brief * Analyzes an access control entry that is present in a discretionary @@ -92,6 +29,13 @@ SepFreeAccessCheckRights( * requestor that gave us the acknowledgement that he desires MAXIMUM_ALLOWED access * right or AccessCheckRegular if the requestor wants a subset of access rights. * + * @param[in] RemainingAccess + * The remaining access rights that have yet to be granted to the calling thread + * whomst requests access to a certain object. This parameter mustn't be 0 as + * the remaining rights are left to be addressed. This is the case if we have + * to address the remaining rights on a regular subset basis (the requestor + * didn't ask for MAXIMUM_ALLOWED). Otherwise this parameter can be 0. + * * @param[in] Dacl * The discretionary access control list to be given to this function. This DACL * must have at least one ACE currently present in the list. @@ -113,12 +57,6 @@ SepFreeAccessCheckRights( * for restricted SIDs only when doing an equaility comparison check between the * two identifiers. * - * @param[in] AccessRightsAllocated - * If this parameter is set to TRUE, the function will not allocate the access - * check rights again. This is typical when we have to do additional analysis - * of ACEs because a token has restricted SIDs (see IsTokenRestricted parameter) - * of which we already initialized the access check rights pointer before. - * * @param[in] PrincipalSelfSid * A pointer to a security identifier that represents a principal. A principal * identifies a user object which is associated with its own security descriptor. @@ -140,43 +78,30 @@ SepFreeAccessCheckRights( * question represents the number of elements in such array. This parameter must be 0 * if no array list is provided. * - * @param[in] RemainingAccess - * The remaining access rights that have yet to be granted to the calling thread - * whomst requests access to a certain object. This parameter mustn't be 0 as - * the remaining rights are left to be addressed. This is the case if we have - * to address the remaining rights on a regular subset basis (the requestor - * didn't ask for MAXIMUM_ALLOWED). Otherwise this parameter can be 0. - * - * @return - * Returns a pointer to initialized access check rights after ACE analysis - * has finished. This pointer contains the rights that have been acquired - * in order to determine if access can be granted to the calling thread. - * Typically this pointer contains the remaining, denied and granted rights. - * - * Otherwise NULL is returned and thus access check procedure can't any longer - * continue further. We have prematurely failed this access check operation - * at this point. + * @param[in,out] AccessCheckRights + * A pointer to a structure that contains the access check rights. This function fills + * up this structure with remaining, granted and denied rights to the caller for + * access check. Henceforth, this parameter must not be NULL! */ -PACCESS_CHECK_RIGHTS +VOID SepAnalyzeAcesFromDacl( _In_ ACCESS_CHECK_RIGHT_TYPE ActionType, + _In_ ACCESS_MASK RemainingAccess, _In_ PACL Dacl, _In_ PACCESS_TOKEN AccessToken, _In_ PACCESS_TOKEN PrimaryAccessToken, _In_ BOOLEAN IsTokenRestricted, - _In_ BOOLEAN AccessRightsAllocated, _In_opt_ PSID PrincipalSelfSid, _In_ PGENERIC_MAPPING GenericMapping, _In_opt_ POBJECT_TYPE_LIST ObjectTypeList, _In_ ULONG ObjectTypeListLength, - _In_ ACCESS_MASK RemainingAccess) + _Inout_ PACCESS_CHECK_RIGHTS AccessCheckRights) { NTSTATUS Status; PACE CurrentAce; ULONG AceIndex; PSID Sid; ACCESS_MASK Access; - PACCESS_CHECK_RIGHTS AccessRights; PAGED_CODE(); @@ -191,25 +116,6 @@ SepAnalyzeAcesFromDacl( /* TODO: To be removed once we support compound ACEs handling in Se */ DBG_UNREFERENCED_PARAMETER(PrimaryAccessToken); - /* - * Allocate memory for access check rights if - * we have not done it so. Otherwise just use - * the already allocated pointer. This is - * typically when we have to do additional - * ACEs analysis because the token has - * restricted SIDs so we have allocated this - * pointer before. - */ - if (!AccessRightsAllocated) - { - AccessRights = SepInitAccessCheckRights(); - if (!AccessRights) - { - DPRINT1("SepAnalyzeAcesFromDacl(): Failed to initialize the access check rights!\n"); - return NULL; - } - } - /* Determine how we should analyze the ACEs */ switch (ActionType) { @@ -239,6 +145,7 @@ SepAnalyzeAcesFromDacl( { /* Get the SID from this ACE */ Sid = SepGetSidFromAce(ACCESS_DENIED_ACE_TYPE, CurrentAce); + ASSERT(Sid); if (SepSidInTokenEx(AccessToken, PrincipalSelfSid, Sid, TRUE, IsTokenRestricted)) { @@ -252,14 +159,15 @@ SepAnalyzeAcesFromDacl( } /* Deny access rights that have not been granted yet */ - AccessRights->DeniedAccessRights |= (Access & ~AccessRights->GrantedAccessRights); - DPRINT("SepAnalyzeAcesFromDacl(): DeniedAccessRights 0x%08lx\n", AccessRights->DeniedAccessRights); + AccessCheckRights->DeniedAccessRights |= (Access & ~AccessCheckRights->GrantedAccessRights); + DPRINT("SepAnalyzeAcesFromDacl(): DeniedAccessRights 0x%08lx\n", AccessCheckRights->DeniedAccessRights); } } else if (CurrentAce->Header.AceType == ACCESS_ALLOWED_ACE_TYPE) { /* Get the SID from this ACE */ Sid = SepGetSidFromAce(ACCESS_ALLOWED_ACE_TYPE, CurrentAce); + ASSERT(Sid); if (SepSidInTokenEx(AccessToken, PrincipalSelfSid, Sid, FALSE, IsTokenRestricted)) { @@ -273,8 +181,8 @@ SepAnalyzeAcesFromDacl( } /* Grant access rights that have not been denied yet */ - AccessRights->GrantedAccessRights |= (Access & ~AccessRights->DeniedAccessRights); - DPRINT("SepAnalyzeAcesFromDacl(): GrantedAccessRights 0x%08lx\n", AccessRights->GrantedAccessRights); + AccessCheckRights->GrantedAccessRights |= (Access & ~AccessCheckRights->DeniedAccessRights); + DPRINT("SepAnalyzeAcesFromDacl(): GrantedAccessRights 0x%08lx\n", AccessCheckRights->GrantedAccessRights); } } else @@ -296,7 +204,8 @@ SepAnalyzeAcesFromDacl( case AccessCheckRegular: { /* Cache the remaining access rights to be addressed */ - AccessRights->RemainingAccessRights = RemainingAccess; + ASSERT(RemainingAccess != 0); + AccessCheckRights->RemainingAccessRights = RemainingAccess; /* Loop over the DACL to retrieve ACEs */ for (AceIndex = 0; AceIndex < Dacl->AceCount; AceIndex++) @@ -317,6 +226,7 @@ SepAnalyzeAcesFromDacl( { /* Get the SID from this ACE */ Sid = SepGetSidFromAce(ACCESS_DENIED_ACE_TYPE, CurrentAce); + ASSERT(Sid); if (SepSidInTokenEx(AccessToken, PrincipalSelfSid, Sid, TRUE, IsTokenRestricted)) { @@ -334,10 +244,10 @@ SepAnalyzeAcesFromDacl( * granted. Access is implicitly denied for * the calling thread. Track this access right. */ - if (AccessRights->RemainingAccessRights & Access) + if (AccessCheckRights->RemainingAccessRights & Access) { DPRINT("SepAnalyzeAcesFromDacl(): Refuted access 0x%08lx\n", Access); - AccessRights->DeniedAccessRights |= Access; + AccessCheckRights->DeniedAccessRights |= Access; break; } } @@ -346,6 +256,7 @@ SepAnalyzeAcesFromDacl( { /* Get the SID from this ACE */ Sid = SepGetSidFromAce(ACCESS_ALLOWED_ACE_TYPE, CurrentAce); + ASSERT(Sid); if (SepSidInTokenEx(AccessToken, PrincipalSelfSid, Sid, FALSE, IsTokenRestricted)) { @@ -358,13 +269,13 @@ SepAnalyzeAcesFromDacl( RtlMapGenericMask(&Access, GenericMapping); } - /* Remove granted rights */ - DPRINT("SepAnalyzeAcesFromDacl(): RemainingAccessRights 0x%08lx Access 0x%08lx\n", AccessRights->RemainingAccessRights, Access); - AccessRights->RemainingAccessRights &= ~Access; - DPRINT("SepAnalyzeAcesFromDacl(): RemainingAccessRights 0x%08lx\n", AccessRights->RemainingAccessRights); + /* Remove the remaining rights */ + DPRINT("SepAnalyzeAcesFromDacl(): RemainingAccessRights 0x%08lx Access 0x%08lx\n", AccessCheckRights->RemainingAccessRights, Access); + AccessCheckRights->RemainingAccessRights &= ~Access; + DPRINT("SepAnalyzeAcesFromDacl(): RemainingAccessRights 0x%08lx\n", AccessCheckRights->RemainingAccessRights); /* Track the granted access right */ - AccessRights->GrantedAccessRights |= Access; + AccessCheckRights->GrantedAccessRights |= Access; } } else @@ -381,9 +292,6 @@ SepAnalyzeAcesFromDacl( /* We shouldn't reach here */ DEFAULT_UNREACHABLE; } - - /* Return the access rights that we've got */ - return AccessRights; } /** @@ -486,7 +394,7 @@ SepAccessCheck( BOOLEAN Defaulted; NTSTATUS Status; PACCESS_TOKEN Token = NULL; - PACCESS_CHECK_RIGHTS AccessCheckRights = NULL; + ACCESS_CHECK_RIGHTS AccessCheckRights = {0}; PAGED_CODE(); @@ -604,31 +512,17 @@ SepAccessCheck( if (DesiredAccess & MAXIMUM_ALLOWED) { /* Perform access checks against ACEs from this DACL */ - AccessCheckRights = SepAnalyzeAcesFromDacl(AccessCheckMaximum, - Dacl, - Token, - PrimaryAccessToken, - FALSE, - FALSE, - PrincipalSelfSid, - GenericMapping, - ObjectTypeList, - ObjectTypeListLength, - 0); - - /* - * Getting the access check rights is very - * important as we have to do access checks - * depending on the kind of rights we get. - * Fail prematurely if we can't... - */ - if (!AccessCheckRights) - { - DPRINT1("SepAccessCheck(): Failed to obtain access check rights!\n"); - Status = STATUS_INSUFFICIENT_RESOURCES; - PreviouslyGrantedAccess = 0; - goto ReturnCommonStatus; - } + SepAnalyzeAcesFromDacl(AccessCheckMaximum, + 0, + Dacl, + Token, + PrimaryAccessToken, + FALSE, + PrincipalSelfSid, + GenericMapping, + ObjectTypeList, + ObjectTypeListLength, + &AccessCheckRights); /* * Perform further access checks if this token @@ -636,21 +530,21 @@ SepAccessCheck( */ if (SeTokenIsRestricted(Token)) { - AccessCheckRights = SepAnalyzeAcesFromDacl(AccessCheckMaximum, - Dacl, - Token, - PrimaryAccessToken, - TRUE, - TRUE, - PrincipalSelfSid, - GenericMapping, - ObjectTypeList, - ObjectTypeListLength, - 0); + SepAnalyzeAcesFromDacl(AccessCheckMaximum, + 0, + Dacl, + Token, + PrimaryAccessToken, + TRUE, + PrincipalSelfSid, + GenericMapping, + ObjectTypeList, + ObjectTypeListLength, + &AccessCheckRights); } /* Fail if some rights have not been granted */ - RemainingAccess &= ~(MAXIMUM_ALLOWED | AccessCheckRights->GrantedAccessRights); + RemainingAccess &= ~(MAXIMUM_ALLOWED | AccessCheckRights.GrantedAccessRights); if (RemainingAccess != 0) { DPRINT1("SepAccessCheck(): Failed to grant access rights. RemainingAccess = 0x%08lx DesiredAccess = 0x%08lx\n", RemainingAccess, DesiredAccess); @@ -660,7 +554,7 @@ SepAccessCheck( } /* Set granted access right and access status */ - PreviouslyGrantedAccess |= AccessCheckRights->GrantedAccessRights; + PreviouslyGrantedAccess |= AccessCheckRights.GrantedAccessRights; if (PreviouslyGrantedAccess != 0) { Status = STATUS_SUCCESS; @@ -676,36 +570,22 @@ SepAccessCheck( } /* Grant rights according to the DACL */ - AccessCheckRights = SepAnalyzeAcesFromDacl(AccessCheckRegular, - Dacl, - Token, - PrimaryAccessToken, - FALSE, - FALSE, - PrincipalSelfSid, - GenericMapping, - ObjectTypeList, - ObjectTypeListLength, - RemainingAccess); - - /* - * Getting the access check rights is very - * important as we have to do access checks - * depending on the kind of rights we get. - * Fail prematurely if we can't... - */ - if (!AccessCheckRights) - { - DPRINT1("SepAccessCheck(): Failed to obtain access check rights!\n"); - Status = STATUS_INSUFFICIENT_RESOURCES; - PreviouslyGrantedAccess = 0; - goto ReturnCommonStatus; - } + SepAnalyzeAcesFromDacl(AccessCheckRegular, + RemainingAccess, + Dacl, + Token, + PrimaryAccessToken, + FALSE, + PrincipalSelfSid, + GenericMapping, + ObjectTypeList, + ObjectTypeListLength, + &AccessCheckRights); /* Fail if some rights have not been granted */ - if (AccessCheckRights->RemainingAccessRights != 0) + if (AccessCheckRights.RemainingAccessRights != 0) { - DPRINT1("SepAccessCheck(): Failed to grant access rights. RemainingAccess = 0x%08lx DesiredAccess = 0x%08lx\n", AccessCheckRights->RemainingAccessRights, DesiredAccess); + DPRINT1("SepAccessCheck(): Failed to grant access rights. RemainingAccess = 0x%08lx DesiredAccess = 0x%08lx\n", AccessCheckRights.RemainingAccessRights, DesiredAccess); PreviouslyGrantedAccess = 0; Status = STATUS_ACCESS_DENIED; goto ReturnCommonStatus; @@ -717,22 +597,22 @@ SepAccessCheck( */ if (SeTokenIsRestricted(Token)) { - AccessCheckRights = SepAnalyzeAcesFromDacl(AccessCheckRegular, - Dacl, - Token, - PrimaryAccessToken, - TRUE, - TRUE, - PrincipalSelfSid, - GenericMapping, - ObjectTypeList, - ObjectTypeListLength, - RemainingAccess); + SepAnalyzeAcesFromDacl(AccessCheckRegular, + RemainingAccess, + Dacl, + Token, + PrimaryAccessToken, + TRUE, + PrincipalSelfSid, + GenericMapping, + ObjectTypeList, + ObjectTypeListLength, + &AccessCheckRights); /* Fail if some rights have not been granted */ - if (AccessCheckRights->RemainingAccessRights != 0) + if (AccessCheckRights.RemainingAccessRights != 0) { - DPRINT1("SepAccessCheck(): Failed to grant access rights. RemainingAccess = 0x%08lx DesiredAccess = 0x%08lx\n", AccessCheckRights->RemainingAccessRights, DesiredAccess); + DPRINT1("SepAccessCheck(): Failed to grant access rights. RemainingAccess = 0x%08lx DesiredAccess = 0x%08lx\n", AccessCheckRights.RemainingAccessRights, DesiredAccess); PreviouslyGrantedAccess = 0; Status = STATUS_ACCESS_DENIED; goto ReturnCommonStatus; @@ -770,14 +650,10 @@ ReturnCommonStatus: { SepDumpSdDebugInfo(SecurityDescriptor); SepDumpTokenDebugInfo(Token); - SepDumpAccessRightsStats(AccessCheckRights); + SepDumpAccessRightsStats(&AccessCheckRights); } #endif - /* Free the allocated access check rights */ - SepFreeAccessCheckRights(AccessCheckRights); - AccessCheckRights = NULL; - return NT_SUCCESS(Status); } diff --git a/ntoskrnl/se/debug.c b/ntoskrnl/se/debug.c index f21d5400938..87e4f1e57e1 100644 --- a/ntoskrnl/se/debug.c +++ b/ntoskrnl/se/debug.c @@ -323,10 +323,15 @@ SepDumpTokenDebugInfo( */ VOID SepDumpAccessRightsStats( - _In_opt_ PACCESS_CHECK_RIGHTS AccessRights) + _In_ PACCESS_CHECK_RIGHTS AccessRights) { - /* Don't dump anything if no access check rights list was provided */ - if (!AccessRights) + /* + * Dump the access rights only if we have remaining rights + * to dump in the first place. RemainingAccessRights can be 0 + * if access check procedure has failed prematurely and this + * member hasn't been filled yet. + */ + if (!AccessRights->RemainingAccessRights) { return; }

1 0

[reactos] 01/01: [NOTEPAD] Improve printing (header/footer/tabs/performance) (#5111)
by Katayama Hirofumi MZ 07 Mar '23

07 Mar '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=064ac123d136d4b2a7022… commit 064ac123d136d4b2a7022b76a04208718aaa6bd0 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Mar 7 14:42:27 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Mar 7 14:42:27 2023 +0900 [NOTEPAD] Improve printing (header/footer/tabs/performance) (#5111) - Fix GetPrintingRect function. - Add DrawHeaderOrFooter, DoPrintBody, DoPrintPage, DoCreatePrintFonts, and DoPrintDocument helper functions. - Implement page header/footer and tabs printing in DIALOG_FilePrint function. - Improve printing performance. - Modify the header/footer resource strings. - Delete the needless resource strings. CORE-18837 --- base/applications/notepad/dialog.c | 575 +++++++++++++++++++++----------- base/applications/notepad/lang/bg-BG.rc | 8 +- base/applications/notepad/lang/cs-CZ.rc | 8 +- base/applications/notepad/lang/da-DK.rc | 8 +- base/applications/notepad/lang/de-DE.rc | 8 +- base/applications/notepad/lang/el-GR.rc | 8 +- base/applications/notepad/lang/en-US.rc | 8 +- base/applications/notepad/lang/es-ES.rc | 8 +- base/applications/notepad/lang/et-EE.rc | 8 +- base/applications/notepad/lang/eu-ES.rc | 8 +- base/applications/notepad/lang/fi-FI.rc | 8 +- base/applications/notepad/lang/fr-FR.rc | 8 +- base/applications/notepad/lang/he-IL.rc | 8 +- base/applications/notepad/lang/hi-IN.rc | 8 +- base/applications/notepad/lang/hr-HR.rc | 8 +- base/applications/notepad/lang/hu-HU.rc | 8 +- base/applications/notepad/lang/hy-AM.rc | 8 +- base/applications/notepad/lang/id-ID.rc | 8 +- base/applications/notepad/lang/it-IT.rc | 8 +- base/applications/notepad/lang/ja-JP.rc | 8 +- base/applications/notepad/lang/lt-LT.rc | 8 +- base/applications/notepad/lang/ms-MY.rc | 8 +- base/applications/notepad/lang/nl-NL.rc | 8 +- base/applications/notepad/lang/no-NO.rc | 8 +- base/applications/notepad/lang/pl-PL.rc | 8 +- base/applications/notepad/lang/pt-BR.rc | 8 +- base/applications/notepad/lang/pt-PT.rc | 8 +- base/applications/notepad/lang/ro-RO.rc | 8 +- base/applications/notepad/lang/ru-RU.rc | 8 +- base/applications/notepad/lang/sk-SK.rc | 8 +- base/applications/notepad/lang/sl-SI.rc | 8 +- base/applications/notepad/lang/sq-AL.rc | 8 +- base/applications/notepad/lang/sv-SE.rc | 8 +- base/applications/notepad/lang/th-TH.rc | 8 +- base/applications/notepad/lang/tr-TR.rc | 8 +- base/applications/notepad/lang/uk-UA.rc | 8 +- base/applications/notepad/lang/uz-UZ.rc | 8 +- base/applications/notepad/lang/zh-CN.rc | 8 +- base/applications/notepad/lang/zh-HK.rc | 8 +- base/applications/notepad/lang/zh-TW.rc | 8 +- base/applications/notepad/notepad_res.h | 4 - 41 files changed, 466 insertions(+), 425 deletions(-) diff --git a/base/applications/notepad/dialog.c b/base/applications/notepad/dialog.c index 0d4272b1bb5..d9c71447264 100644 --- a/base/applications/notepad/dialog.c +++ b/base/applications/notepad/dialog.c @@ -281,26 +281,31 @@ int GetSelectionText(HWND hWnd, LPTSTR lpString, int nMaxCount) } static RECT -GetPrintingRect(HDC hdc, RECT margins) +GetPrintingRect(IN HDC hdc, IN LPCRECT pMargins) { - int iLogPixelsX, iLogPixelsY; - int iHorzRes, iVertRes; - int iPhysPageX, iPhysPageY, iPhysPageW, iPhysPageH; - RECT rcPrintRect; - - iPhysPageX = GetDeviceCaps(hdc, PHYSICALOFFSETX); - iPhysPageY = GetDeviceCaps(hdc, PHYSICALOFFSETY); - iPhysPageW = GetDeviceCaps(hdc, PHYSICALWIDTH); - iPhysPageH = GetDeviceCaps(hdc, PHYSICALHEIGHT); - iLogPixelsX = GetDeviceCaps(hdc, LOGPIXELSX); - iLogPixelsY = GetDeviceCaps(hdc, LOGPIXELSY); - iHorzRes = GetDeviceCaps(hdc, HORZRES); - iVertRes = GetDeviceCaps(hdc, VERTRES); - - rcPrintRect.left = (margins.left * iLogPixelsX / 2540) - iPhysPageX; - rcPrintRect.top = (margins.top * iLogPixelsY / 2540) - iPhysPageY; - rcPrintRect.right = iHorzRes - (((margins.left * iLogPixelsX / 2540) - iPhysPageX) + ((margins.right * iLogPixelsX / 2540) - (iPhysPageW - iPhysPageX - iHorzRes))); - rcPrintRect.bottom = iVertRes - (((margins.top * iLogPixelsY / 2540) - iPhysPageY) + ((margins.bottom * iLogPixelsY / 2540) - (iPhysPageH - iPhysPageY - iVertRes))); + INT iLogPixelsX = GetDeviceCaps(hdc, LOGPIXELSX); + INT iLogPixelsY = GetDeviceCaps(hdc, LOGPIXELSY); + INT iHorzRes = GetDeviceCaps(hdc, HORZRES); /* in pixels */ + INT iVertRes = GetDeviceCaps(hdc, VERTRES); /* in pixels */ + RECT rcPrintRect, rcPhysical; + +#define CONVERT_X(x) MulDiv((x), iLogPixelsX, 2540) /* 100th millimeters to pixels */ +#define CONVERT_Y(y) MulDiv((y), iLogPixelsY, 2540) /* 100th millimeters to pixels */ + SetRect(&rcPrintRect, + CONVERT_X(pMargins->left), CONVERT_Y(pMargins->top), + iHorzRes - CONVERT_X(pMargins->right), + iVertRes - CONVERT_Y(pMargins->bottom)); + + rcPhysical.left = GetDeviceCaps(hdc, PHYSICALOFFSETX); + rcPhysical.right = rcPhysical.left + GetDeviceCaps(hdc, PHYSICALWIDTH); + rcPhysical.top = GetDeviceCaps(hdc, PHYSICALOFFSETY); + rcPhysical.bottom = rcPhysical.top + GetDeviceCaps(hdc, PHYSICALHEIGHT); + + /* Adjust the margin */ + rcPrintRect.left = max(rcPrintRect.left, rcPhysical.left); + rcPrintRect.top = max(rcPrintRect.top, rcPhysical.top); + rcPrintRect.right = min(rcPrintRect.right, rcPhysical.right); + rcPrintRect.bottom = min(rcPrintRect.bottom, rcPhysical.bottom); return rcPrintRect; } @@ -614,219 +619,415 @@ BOOL DIALOG_FileSaveAs(VOID) } } -VOID DIALOG_FilePrint(VOID) +/* Convert the points into pixels */ +#define X_POINTS_TO_PIXELS(hDC, points) MulDiv((points), GetDeviceCaps((hDC), LOGPIXELSX), 72) +#define Y_POINTS_TO_PIXELS(hDC, points) MulDiv((points), GetDeviceCaps((hDC), LOGPIXELSY), 72) + +/* + * See also: + * https://support.microsoft.com/en-us/windows/changing-header-and-footer-comm… + */ +static VOID +DrawHeaderOrFooter(HDC hDC, LPRECT pRect, LPCTSTR pszFormat, INT nPageNo, const SYSTEMTIME *pstNow) { - DOCINFO di; - TEXTMETRIC tm; - PRINTDLG printer; - SIZE szMetric; - int border; - int xLeft, yTop, pagecount, dopage, copycount; - unsigned int i; - LOGFONT hdrFont; - HFONT font, old_font=0; - DWORD size; - LPTSTR pTemp; - static const TCHAR times_new_roman[] = _T("Times New Roman"); - RECT rcPrintRect; - - /* Get a small font and print some header info on each page */ - ZeroMemory(&hdrFont, sizeof(hdrFont)); - hdrFont.lfHeight = 100; - hdrFont.lfWeight = FW_BOLD; - hdrFont.lfCharSet = ANSI_CHARSET; - hdrFont.lfOutPrecision = OUT_DEFAULT_PRECIS; - hdrFont.lfClipPrecision = CLIP_DEFAULT_PRECIS; - hdrFont.lfQuality = PROOF_QUALITY; - hdrFont.lfPitchAndFamily = VARIABLE_PITCH | FF_ROMAN; - _tcscpy(hdrFont.lfFaceName, times_new_roman); - - font = CreateFontIndirect(&hdrFont); + TCHAR szText[256], szField[128]; + const TCHAR *pchFormat; + UINT uAlign = DT_CENTER, uFlags = DT_SINGLELINE | DT_VCENTER | DT_NOPREFIX; + HGDIOBJ hOldPen, hOldBrush; - /* Get Current Settings */ - ZeroMemory(&printer, sizeof(printer)); - printer.lStructSize = sizeof(printer); - printer.hwndOwner = Globals.hMainWnd; - printer.hInstance = Globals.hInstance; + /* Draw a rectangle */ + hOldPen = SelectObject(hDC, GetStockObject(BLACK_PEN)); + hOldBrush = SelectObject(hDC, GetStockObject(NULL_BRUSH)); + Rectangle(hDC, pRect->left, pRect->top, pRect->right, pRect->bottom); + SelectObject(hDC, hOldBrush); + SelectObject(hDC, hOldPen); - /* Set some default flags */ - printer.Flags = PD_RETURNDC | PD_SELECTION; + InflateRect(pRect, -X_POINTS_TO_PIXELS(hDC, 3), 0); /* Shrink 3pt */ - /* Disable the selection radio button if there is no text selected */ - if (!GetSelectionTextLength(Globals.hEdit)) + szText[0] = 0; + + for (pchFormat = pszFormat; *pchFormat; ++pchFormat) { - printer.Flags = printer.Flags | PD_NOSELECTION; - } + if (*pchFormat != _T('&')) + { + StringCchCatN(szText, ARRAY_SIZE(szText), pchFormat, 1); + continue; + } - printer.nFromPage = 0; - printer.nMinPage = 1; - /* we really need to calculate number of pages to set nMaxPage and nToPage */ - printer.nToPage = (WORD)-1; - printer.nMaxPage = (WORD)-1; + ++pchFormat; + if (*pchFormat == 0) + break; - /* Let commdlg manage copy settings */ - printer.nCopies = (WORD)PD_USEDEVMODECOPIES; + switch (_totupper(*pchFormat)) /* Make it uppercase */ + { + case _T('&'): /* Found double ampersand */ + StringCchCat(szText, ARRAY_SIZE(szText), TEXT("&")); + break; - printer.hDevMode = Globals.hDevMode; - printer.hDevNames = Globals.hDevNames; + case _T('L'): /* Left */ + DrawText(hDC, szText, -1, pRect, uAlign | uFlags); + szText[0] = 0; + uAlign = DT_LEFT; + break; - if (!PrintDlg(&printer)) - { - DeleteObject(font); - return; - } + case _T('C'): /* Center */ + DrawText(hDC, szText, -1, pRect, uAlign | uFlags); + szText[0] = 0; + uAlign = DT_CENTER; + break; - Globals.hDevMode = printer.hDevMode; - Globals.hDevNames = printer.hDevNames; + case _T('R'): /* Right */ + DrawText(hDC, szText, -1, pRect, uAlign | uFlags); + szText[0] = 0; + uAlign = DT_RIGHT; + break; + + case _T('D'): /* Date */ + GetDateFormat(LOCALE_USER_DEFAULT, 0, pstNow, NULL, + szField, (INT)ARRAY_SIZE(szField)); + StringCchCat(szText, ARRAY_SIZE(szText), szField); + break; + + case _T('T'): /* Time */ + GetTimeFormat(LOCALE_USER_DEFAULT, 0, pstNow, NULL, + szField, (INT)ARRAY_SIZE(szField)); + StringCchCat(szText, ARRAY_SIZE(szText), szField); + break; - assert(printer.hDC != 0); + case _T('F'): /* Filename */ + StringCchCat(szText, ARRAY_SIZE(szText), Globals.szFileTitle); + break; - /* initialize DOCINFO */ - di.cbSize = sizeof(DOCINFO); - di.lpszDocName = Globals.szFileTitle; - di.lpszOutput = NULL; - di.lpszDatatype = NULL; - di.fwType = 0; + case _T('P'): /* Page number */ + StringCchPrintf(szField, ARRAY_SIZE(szField), TEXT("%u"), nPageNo); + StringCchCat(szText, ARRAY_SIZE(szText), szField); + break; - if (StartDoc(printer.hDC, &di) <= 0) + default: /* Otherwise */ + szField[0] = _T('&'); + szField[1] = *pchFormat; + szField[2] = 0; + StringCchCat(szText, ARRAY_SIZE(szText), szField); + break; + } + } + + DrawText(hDC, szText, -1, pRect, uAlign | uFlags); +} + +typedef struct +{ + LPPRINTDLG pPrinter; + RECT printRect; + SYSTEMTIME stNow; + HFONT hHeaderFont; + HFONT hBodyFont; + LPTSTR pszText; + DWORD ich; + DWORD cchText; + INT cyHeader; + INT cySpacing; + INT cyFooter; +} PRINT_DATA, *PPRINT_DATA; + +static BOOL DoPrintBody(PPRINT_DATA pData, DWORD PageCount, BOOL bSkipPage) +{ + LPPRINTDLG pPrinter = pData->pPrinter; + RECT printRect = pData->printRect; + INT xLeft = printRect.left, yTop = printRect.top + pData->cyHeader + pData->cySpacing; + INT xStart, tabWidth; + DWORD ichStart; + SIZE charMetrics; + TEXTMETRIC tmText; + + /* Calculate a tab width */ +#define TAB_STOP 8 + GetTextMetrics(pPrinter->hDC, &tmText); + tabWidth = TAB_STOP * tmText.tmAveCharWidth; + +#define DO_FLUSH() do { \ + if (ichStart < pData->ich && !bSkipPage) { \ + TextOut(pPrinter->hDC, xStart, yTop, &pData->pszText[ichStart], pData->ich - ichStart); \ + } \ + ichStart = pData->ich; \ + xStart = xLeft; \ +} while (0) + + /* The drawing-body loop */ + for (ichStart = pData->ich, xStart = xLeft; pData->ich < pData->cchText; ) { - DeleteObject(font); - return; + TCHAR ch = pData->pszText[pData->ich]; + + if (ch == _T('\r')) + { + DO_FLUSH(); + + pData->ich++; /* Next char */ + ichStart = pData->ich; + continue; + } + + if (ch == _T('\n')) + { + DO_FLUSH(); + + /* Next line */ + yTop += tmText.tmHeight; + xLeft = xStart = printRect.left; + } + else + { + if (ch == _T('\t')) + { + INT nStepWidth = tabWidth - ((xLeft - printRect.left) % tabWidth); + + DO_FLUSH(); + + /* Go to the next tab stop */ + xLeft += nStepWidth; + xStart = xLeft; + } + else /* Normal char */ + { + GetTextExtentPoint32(pPrinter->hDC, &ch, 1, &charMetrics); + xLeft += charMetrics.cx; + } + + /* Insert a line break if the next position reached the right edge */ + if (xLeft + charMetrics.cx >= printRect.right) + { + if (ch != _T('\t')) + DO_FLUSH(); + + /* Next line */ + yTop += tmText.tmHeight; + xLeft = xStart = printRect.left; + } + } + + pData->ich++; /* Next char */ + if (ch == _T('\t') || ch == _T('\n')) + ichStart = pData->ich; + + if (yTop + tmText.tmHeight >= printRect.bottom - pData->cyFooter) + break; /* The next line reached the body bottom */ } + DO_FLUSH(); + return TRUE; +} + +static BOOL DoPrintPage(PPRINT_DATA pData, DWORD PageCount) +{ + LPPRINTDLG pPrinter = pData->pPrinter; + BOOL bSkipPage; + HFONT hOldFont; + + /* Should we skip this page? */ + bSkipPage = !(pPrinter->Flags & PD_SELECTION) && + (pPrinter->Flags & PD_PAGENUMS) && + !(pPrinter->nFromPage <= PageCount && PageCount <= pPrinter->nToPage); - /* Get the file text */ - if (printer.Flags & PD_SELECTION) + /* The prologue of a page */ + if (!bSkipPage) { - size = GetSelectionTextLength(Globals.hEdit) + 1; + if (StartPage(pPrinter->hDC) <= 0) + { + AlertPrintError(); + return FALSE; + } + + if (pData->cyHeader > 0) + { + /* Draw the page header */ + RECT rc = pData->printRect; + rc.bottom = rc.top + pData->cyHeader; + + hOldFont = SelectObject(pPrinter->hDC, pData->hHeaderFont); + DrawHeaderOrFooter(pPrinter->hDC, &rc, Globals.szHeader, PageCount, &pData->stNow); + SelectObject(pPrinter->hDC, hOldFont); /* De-select the font */ + } } - else + + hOldFont = SelectObject(pPrinter->hDC, pData->hBodyFont); + DoPrintBody(pData, PageCount, bSkipPage); + SelectObject(pPrinter->hDC, hOldFont); + + /* The epilogue of a page */ + if (!bSkipPage) { - size = GetWindowTextLength(Globals.hEdit) + 1; + if (pData->cyFooter > 0) + { + /* Draw the page footer */ + RECT rc = pData->printRect; + rc.top = rc.bottom - pData->cyFooter; + + hOldFont = SelectObject(pPrinter->hDC, pData->hHeaderFont); + DrawHeaderOrFooter(pPrinter->hDC, &rc, Globals.szFooter, PageCount, &pData->stNow); + SelectObject(pPrinter->hDC, hOldFont); + } + + if (EndPage(pPrinter->hDC) <= 0) + { + AlertPrintError(); + return FALSE; + } } - pTemp = HeapAlloc(GetProcessHeap(), 0, size * sizeof(TCHAR)); - if (!pTemp) + return TRUE; +} + +#define HEADER_FONT_SIZE 11 /* 11pt */ +#define BODY_FONT_SIZE 9 /* 9pt */ +#define SPACING_HEIGHT 4 /* 4pt */ + +static BOOL DoCreatePrintFonts(LPPRINTDLG pPrinter, PPRINT_DATA pPrintData) +{ + LOGFONT lfBody, lfHeader; + + /* Create the main text font for printing */ + lfBody = Globals.lfFont; + lfBody.lfHeight = -Y_POINTS_TO_PIXELS(pPrinter->hDC, HEADER_FONT_SIZE); + pPrintData->hBodyFont = CreateFontIndirect(&lfBody); + if (pPrintData->hBodyFont == NULL) + return FALSE; + + /* Create the header/footer font */ + ZeroMemory(&lfHeader, sizeof(lfHeader)); + lfHeader.lfHeight = -Y_POINTS_TO_PIXELS(pPrinter->hDC, BODY_FONT_SIZE); + lfHeader.lfWeight = FW_BOLD; + lfHeader.lfCharSet = DEFAULT_CHARSET; + StringCchCopy(lfHeader.lfFaceName, ARRAY_SIZE(lfHeader.lfFaceName), lfBody.lfFaceName); + pPrintData->hHeaderFont = CreateFontIndirect(&lfHeader); + if (pPrintData->hHeaderFont == NULL) + return FALSE; + + return TRUE; +} + +static BOOL DoPrintDocument(LPPRINTDLG pPrinter) +{ + DOCINFO docInfo; + PRINT_DATA printData = { pPrinter }; + DWORD CopyCount, PageCount; + TEXTMETRIC tmHeader; + BOOL ret = FALSE; + HFONT hOldFont; + + GetLocalTime(&printData.stNow); + + printData.printRect = GetPrintingRect(pPrinter->hDC, &Globals.lMargins); + + if (!DoCreatePrintFonts(pPrinter, &printData)) { - EndDoc(printer.hDC); - DeleteObject(font); ShowLastError(); - return; + goto Quit; } - if (printer.Flags & PD_SELECTION) + if (pPrinter->Flags & PD_SELECTION) + printData.cchText = GetSelectionTextLength(Globals.hEdit); + else + printData.cchText = GetWindowTextLength(Globals.hEdit); + + /* Allocate a buffer for the text */ + printData.pszText = HeapAlloc(GetProcessHeap(), 0, (printData.cchText + 1) * sizeof(TCHAR)); + if (!printData.pszText) { - size = GetSelectionText(Globals.hEdit, pTemp, size); + ShowLastError(); + goto Quit; } + + if (pPrinter->Flags & PD_SELECTION) + GetSelectionText(Globals.hEdit, printData.pszText, printData.cchText + 1); else + GetWindowText(Globals.hEdit, printData.pszText, printData.cchText + 1); + + /* Start a document */ + ZeroMemory(&docInfo, sizeof(docInfo)); + docInfo.cbSize = sizeof(DOCINFO); + docInfo.lpszDocName = Globals.szFileTitle; + if (StartDoc(pPrinter->hDC, &docInfo) <= 0) { - size = GetWindowText(Globals.hEdit, pTemp, size); + AlertPrintError(); + goto Quit; } - /* Get the current printing area */ - rcPrintRect = GetPrintingRect(printer.hDC, Globals.lMargins); - - /* Ensure that each logical unit maps to one pixel */ - SetMapMode(printer.hDC, MM_TEXT); + /* Calculate the header and footer heights */ + hOldFont = SelectObject(pPrinter->hDC, printData.hHeaderFont); + GetTextMetrics(pPrinter->hDC, &tmHeader); + printData.cyHeader = printData.cyFooter = 2 * tmHeader.tmHeight; + printData.cySpacing = Y_POINTS_TO_PIXELS(pPrinter->hDC, SPACING_HEIGHT); + SelectObject(pPrinter->hDC, hOldFont); /* De-select the font */ + if (!Globals.szHeader[0]) + printData.cyHeader = printData.cySpacing = 0; + if (!Globals.szFooter[0]) + printData.cyFooter = 0; + + /* The printing-copies loop */ + for (CopyCount = 1; CopyCount <= pPrinter->nCopies; ++CopyCount) + { + /* The printing-pages loop */ + for (PageCount = 1, printData.ich = 0; printData.ich < printData.cchText; ++PageCount) + { + if (!DoPrintPage(&printData, PageCount)) + { + AbortDoc(pPrinter->hDC); /* Cancel printing */ + goto Quit; + } + } + } - /* Needed to get the correct height of a text line */ - GetTextMetrics(printer.hDC, &tm); + if (EndDoc(pPrinter->hDC) <= 0) + AlertPrintError(); + else + ret = TRUE; + +Quit: /* Clean up */ + DeleteObject(printData.hHeaderFont); + DeleteObject(printData.hBodyFont); + if (printData.pszText) + HeapFree(GetProcessHeap(), 0, printData.pszText); + return ret; +} - border = 15; - for (copycount=1; copycount <= printer.nCopies; copycount++) { - i = 0; - pagecount = 1; - do { - /* Don't start a page if none of the conditions below are true */ - dopage = 0; +VOID DIALOG_FilePrint(VOID) +{ + PRINTDLG printer; - /* The user wants to print the current selection */ - if (printer.Flags & PD_SELECTION) - { - dopage = 1; - } + /* Get Current Settings */ + ZeroMemory(&printer, sizeof(printer)); + printer.lStructSize = sizeof(printer); + printer.hwndOwner = Globals.hMainWnd; + printer.hInstance = Globals.hInstance; - /* The user wants to print the entire document */ - if (!(printer.Flags & PD_PAGENUMS) && !(printer.Flags & PD_SELECTION)) - { - dopage = 1; - } + /* Set some default flags */ + printer.Flags = PD_RETURNDC | PD_SELECTION; - /* The user wants to print a specified range of pages */ - if ((pagecount >= printer.nFromPage && pagecount <= printer.nToPage)) - { - dopage = 1; - } + /* Disable the selection radio button if there is no text selected */ + if (!GetSelectionTextLength(Globals.hEdit)) + printer.Flags |= PD_NOSELECTION; - old_font = SelectObject(printer.hDC, font); - - if (dopage) { - if (StartPage(printer.hDC) <= 0) { - SelectObject(printer.hDC, old_font); - EndDoc(printer.hDC); - DeleteDC(printer.hDC); - HeapFree(GetProcessHeap(), 0, pTemp); - DeleteObject(font); - AlertPrintError(); - return; - } + printer.nFromPage = 1; + printer.nToPage = MAXWORD; + printer.nMinPage = 1; + printer.nMaxPage = MAXWORD; - SetViewportOrgEx(printer.hDC, rcPrintRect.left, rcPrintRect.top, NULL); - - /* Write a rectangle and header at the top of each page */ - Rectangle(printer.hDC, border, border, rcPrintRect.right - border, border + tm.tmHeight * 2); - /* I don't know what's up with this TextOut command. This comes out - kind of mangled. - */ - TextOut(printer.hDC, - border * 2, - border + tm.tmHeight / 2, - Globals.szFileTitle, - lstrlen(Globals.szFileTitle)); - } + printer.hDevMode = Globals.hDevMode; + printer.hDevNames = Globals.hDevNames; - /* The starting point for the main text */ - xLeft = 0; - yTop = border + tm.tmHeight * 4; + if (!PrintDlg(&printer)) + return; /* The user canceled printing */ - SelectObject(printer.hDC, old_font); + assert(printer.hDC != NULL); + Globals.hDevMode = printer.hDevMode; + Globals.hDevNames = printer.hDevNames; - /* Since outputting strings is giving me problems, output the main - * text one character at a time. */ - do { - if (pTemp[i] == '\n') { - xLeft = 0; - yTop += tm.tmHeight; - } - else if (pTemp[i] != '\r') { - if (dopage) - TextOut(printer.hDC, xLeft, yTop, &pTemp[i], 1); - - /* We need to get the width for each individual char, since a proportional font may be used */ - GetTextExtentPoint32(printer.hDC, &pTemp[i], 1, &szMetric); - xLeft += szMetric.cx; - - /* Insert a line break if the current line does not fit into the printing area */ - if (xLeft > rcPrintRect.right) - { - xLeft = 0; - yTop = yTop + tm.tmHeight; - } - } - } while (i++ < size && yTop < rcPrintRect.bottom); + /* Ensure that each logical unit maps to one pixel */ + SetMapMode(printer.hDC, MM_TEXT); - if (dopage) - EndPage(printer.hDC); - pagecount++; - } while (i < size); - } + DoPrintDocument(&printer); - if (old_font != 0) - SelectObject(printer.hDC, old_font); - EndDoc(printer.hDC); DeleteDC(printer.hDC); - HeapFree(GetProcessHeap(), 0, pTemp); - DeleteObject(font); } VOID DIALOG_FileExit(VOID) diff --git a/base/applications/notepad/lang/bg-BG.rc b/base/applications/notepad/lang/bg-BG.rc index 6f638b9ead2..ffc30a206db 100644 --- a/base/applications/notepad/lang/bg-BG.rc +++ b/base/applications/notepad/lang/bg-BG.rc @@ -132,12 +132,8 @@ END STRINGTABLE BEGIN - STRING_PAGESETUP_HEADERVALUE "&n" /* FIXME */ - STRING_PAGESETUP_FOOTERVALUE "Страница &s" /* FIXME */ - STRING_PAGESETUP_LEFTVALUE "20 мм" /* FIXME */ - STRING_PAGESETUP_RIGHTVALUE "20 мм" /* FIXME */ - STRING_PAGESETUP_TOPVALUE "25 мм" /* FIXME */ - STRING_PAGESETUP_BOTTOMVALUE "25 мм" /* FIXME */ + STRING_PAGESETUP_HEADERVALUE "&f" + STRING_PAGESETUP_FOOTERVALUE "Страница &p" STRING_NOTEPAD "Бележник" STRING_ERROR "ГРЕШКА" STRING_WARNING "ПРЕДУПРЕЖДЕНИЕ" diff --git a/base/applications/notepad/lang/cs-CZ.rc b/base/applications/notepad/lang/cs-CZ.rc index 6b3a41a8673..71c65359bdb 100644 --- a/base/applications/notepad/lang/cs-CZ.rc +++ b/base/applications/notepad/lang/cs-CZ.rc @@ -132,12 +132,8 @@ END STRINGTABLE BEGIN - STRING_PAGESETUP_HEADERVALUE "&n" /* FIXME */ - STRING_PAGESETUP_FOOTERVALUE "Strana &s" /* FIXME */ - STRING_PAGESETUP_LEFTVALUE "20 mm" /* FIXME */ - STRING_PAGESETUP_RIGHTVALUE "20 mm" /* FIXME */ - STRING_PAGESETUP_TOPVALUE "25 mm" /* FIXME */ - STRING_PAGESETUP_BOTTOMVALUE "25 mm" /* FIXME */ + STRING_PAGESETUP_HEADERVALUE "&f" + STRING_PAGESETUP_FOOTERVALUE "Strana &p" STRING_NOTEPAD "Notepad" STRING_ERROR "CHYBA" STRING_WARNING "VAROVÁNÍ" diff --git a/base/applications/notepad/lang/da-DK.rc b/base/applications/notepad/lang/da-DK.rc index 50e250611cf..e44e6089e75 100644 --- a/base/applications/notepad/lang/da-DK.rc +++ b/base/applications/notepad/lang/da-DK.rc @@ -132,12 +132,8 @@ END STRINGTABLE BEGIN - STRING_PAGESETUP_HEADERVALUE "&n" /* FIXME */ - STRING_PAGESETUP_FOOTERVALUE "Side &s" - STRING_PAGESETUP_LEFTVALUE "20 mm" /* FIXME */ - STRING_PAGESETUP_RIGHTVALUE "20 mm" /* FIXME */ - STRING_PAGESETUP_TOPVALUE "25 mm" /* FIXME */ - STRING_PAGESETUP_BOTTOMVALUE "25 mm" /* FIXME */ + STRING_PAGESETUP_HEADERVALUE "&f" + STRING_PAGESETUP_FOOTERVALUE "Side &p" STRING_NOTEPAD "Notesblok" STRING_ERROR "Fejl" STRING_WARNING "Advarsel" diff --git a/base/applications/notepad/lang/de-DE.rc b/base/applications/notepad/lang/de-DE.rc index 367c4bf1c29..86219a879f4 100644 --- a/base/applications/notepad/lang/de-DE.rc +++ b/base/applications/notepad/lang/de-DE.rc @@ -132,12 +132,8 @@ END STRINGTABLE BEGIN - STRING_PAGESETUP_HEADERVALUE "&n" /* FIXME */ - STRING_PAGESETUP_FOOTERVALUE "Seite &s" /* FIXME */ - STRING_PAGESETUP_LEFTVALUE "20 mm" /* FIXME */ - STRING_PAGESETUP_RIGHTVALUE "20 mm" /* FIXME */ - STRING_PAGESETUP_TOPVALUE "25 mm" /* FIXME */ - STRING_PAGESETUP_BOTTOMVALUE "25 mm" /* FIXME */ + STRING_PAGESETUP_HEADERVALUE "&f" + STRING_PAGESETUP_FOOTERVALUE "Seite &p" STRING_NOTEPAD "Editor" STRING_ERROR "Fehler" STRING_WARNING "Achtung" diff --git a/base/applications/notepad/lang/el-GR.rc b/base/applications/notepad/lang/el-GR.rc index 5aab21d86ea..3cef55cd8db 100644 --- a/base/applications/notepad/lang/el-GR.rc +++ b/base/applications/notepad/lang/el-GR.rc @@ -132,12 +132,8 @@ END STRINGTABLE BEGIN - STRING_PAGESETUP_HEADERVALUE "&n" /* FIXME */ - STRING_PAGESETUP_FOOTERVALUE "Σελίδα &s" /* FIXME */ - STRING_PAGESETUP_LEFTVALUE "20 mm" /* FIXME */ - STRING_PAGESETUP_RIGHTVALUE "20 mm" /* FIXME */ - STRING_PAGESETUP_TOPVALUE "25 mm" /* FIXME */ - STRING_PAGESETUP_BOTTOMVALUE "25 mm" /* FIXME */ + STRING_PAGESETUP_HEADERVALUE "&f" + STRING_PAGESETUP_FOOTERVALUE "Σελίδα &p" STRING_NOTEPAD "Notepad" STRING_ERROR "ERROR" STRING_WARNING "WARNING" diff --git a/base/applications/notepad/lang/en-US.rc b/base/applications/notepad/lang/en-US.rc index 50f5578e83d..1aaf9c43a33 100644 --- a/base/applications/notepad/lang/en-US.rc +++ b/base/applications/notepad/lang/en-US.rc @@ -132,12 +132,8 @@ END STRINGTABLE BEGIN - STRING_PAGESETUP_HEADERVALUE "&n" /* FIXME */ - STRING_PAGESETUP_FOOTERVALUE "Page &s" /* FIXME */ - STRING_PAGESETUP_LEFTVALUE "20 mm" /* FIXME */ - STRING_PAGESETUP_RIGHTVALUE "20 mm" /* FIXME */ - STRING_PAGESETUP_TOPVALUE "25 mm" /* FIXME */ - STRING_PAGESETUP_BOTTOMVALUE "25 mm" /* FIXME */ + STRING_PAGESETUP_HEADERVALUE "&f" + STRING_PAGESETUP_FOOTERVALUE "Page &p" STRING_NOTEPAD "Notepad" STRING_ERROR "ERROR" STRING_WARNING "WARNING" diff --git a/base/applications/notepad/lang/es-ES.rc b/base/applications/notepad/lang/es-ES.rc index 5e84bf21445..46abc699626 100644 --- a/base/applications/notepad/lang/es-ES.rc +++ b/base/applications/notepad/lang/es-ES.rc @@ -134,12 +134,8 @@ END STRINGTABLE BEGIN - STRING_PAGESETUP_HEADERVALUE "&n" /* FIXME */ - STRING_PAGESETUP_FOOTERVALUE "Página &s" /* FIXME */ - STRING_PAGESETUP_LEFTVALUE "20 mm" /* FIXME */ - STRING_PAGESETUP_RIGHTVALUE "20 mm" /* FIXME */ - STRING_PAGESETUP_TOPVALUE "25 mm" /* FIXME */ - STRING_PAGESETUP_BOTTOMVALUE "25 mm" /* FIXME */ + STRING_PAGESETUP_HEADERVALUE "&f" + STRING_PAGESETUP_FOOTERVALUE "Página &p" STRING_NOTEPAD "Bloc de notas" STRING_ERROR "ERROR" STRING_WARNING "ADVERTENCIA" diff --git a/base/applications/notepad/lang/et-EE.rc b/base/applications/notepad/lang/et-EE.rc index a0bcf0bf1c6..55583c79f11 100644 --- a/base/applications/notepad/lang/et-EE.rc +++ b/base/applications/notepad/lang/et-EE.rc @@ -140,12 +140,8 @@ END STRINGTABLE BEGIN - STRING_PAGESETUP_HEADERVALUE "&n" /* FIXME */ - STRING_PAGESETUP_FOOTERVALUE "Lk &s" /* FIXME */ - STRING_PAGESETUP_LEFTVALUE "20 mm" /* FIXME */ - STRING_PAGESETUP_RIGHTVALUE "20 mm" /* FIXME */ - STRING_PAGESETUP_TOPVALUE "25 mm" /* FIXME */ - STRING_PAGESETUP_BOTTOMVALUE "25 mm" /* FIXME */ + STRING_PAGESETUP_HEADERVALUE "&f" + STRING_PAGESETUP_FOOTERVALUE "Lk &p" STRING_NOTEPAD "Notepad" STRING_ERROR "TÕRGE" STRING_WARNING "HOIATUS" diff --git a/base/applications/notepad/lang/eu-ES.rc b/base/applications/notepad/lang/eu-ES.rc index 7378bd87a34..074f3e280a0 100644 --- a/base/applications/notepad/lang/eu-ES.rc +++ b/base/applications/notepad/lang/eu-ES.rc @@ -132,12 +132,8 @@ END STRINGTABLE BEGIN - STRING_PAGESETUP_HEADERVALUE "&n" /* FIXME */ - STRING_PAGESETUP_FOOTERVALUE "Orriak" /* FIXME */ - STRING_PAGESETUP_LEFTVALUE "20 mm" /* FIXME */ - STRING_PAGESETUP_RIGHTVALUE "20 mm" /* FIXME */ - STRING_PAGESETUP_TOPVALUE "25 mm" /* FIXME */ - STRING_PAGESETUP_BOTTOMVALUE "25 mm" /* FIXME */ + STRING_PAGESETUP_HEADERVALUE "&f" + STRING_PAGESETUP_FOOTERVALUE "Orriak &p" STRING_NOTEPAD "Ohar-bloka" STRING_ERROR "ERROREA" STRING_WARNING "OHARRA" diff --git a/base/applications/notepad/lang/fi-FI.rc b/base/applications/notepad/lang/fi-FI.rc index af260b19698..112b1a909aa 100644 --- a/base/applications/notepad/lang/fi-FI.rc +++ b/base/applications/notepad/lang/fi-FI.rc @@ -132,12 +132,8 @@ END STRINGTABLE BEGIN - STRING_PAGESETUP_HEADERVALUE "&n" /* FIXME */ - STRING_PAGESETUP_FOOTERVALUE "Sivu &s" /* FIXME */ - STRING_PAGESETUP_LEFTVALUE "20 mm" /* FIXME */ - STRING_PAGESETUP_RIGHTVALUE "20 mm" /* FIXME */ - STRING_PAGESETUP_TOPVALUE "25 mm" /* FIXME */ - STRING_PAGESETUP_BOTTOMVALUE "25 mm" /* FIXME */ + STRING_PAGESETUP_HEADERVALUE "&f" + STRING_PAGESETUP_FOOTERVALUE "Sivu &p" STRING_NOTEPAD "Notepad" STRING_ERROR "VIRHE" STRING_WARNING "VAROITUS" diff --git a/base/applications/notepad/lang/fr-FR.rc b/base/applications/notepad/lang/fr-FR.rc index dc4f17032bb..407deb3feab 100644 --- a/base/applications/notepad/lang/fr-FR.rc +++ b/base/applications/notepad/lang/fr-FR.rc @@ -132,12 +132,8 @@ END STRINGTABLE BEGIN - STRING_PAGESETUP_HEADERVALUE "&n" /* FIXME */ - STRING_PAGESETUP_FOOTERVALUE "Page &s" /* FIXME */ - STRING_PAGESETUP_LEFTVALUE "20 mm" /* FIXME */ - STRING_PAGESETUP_RIGHTVALUE "20 mm" /* FIXME */ - STRING_PAGESETUP_TOPVALUE "25 mm" /* FIXME */ - STRING_PAGESETUP_BOTTOMVALUE "25 mm" /* FIXME */ + STRING_PAGESETUP_HEADERVALUE "&f" + STRING_PAGESETUP_FOOTERVALUE "Page &p" STRING_NOTEPAD "Bloc-notes" STRING_ERROR "ERREUR" STRING_WARNING "ATTENTION" diff --git a/base/applications/notepad/lang/he-IL.rc b/base/applications/notepad/lang/he-IL.rc index c611b674a89..0ccac31217c 100644 --- a/base/applications/notepad/lang/he-IL.rc +++ b/base/applications/notepad/lang/he-IL.rc @@ -135,12 +135,8 @@ END STRINGTABLE BEGIN - STRING_PAGESETUP_HEADERVALUE "&n" /* FIXME */ - STRING_PAGESETUP_FOOTERVALUE "עמוד &s" /* FIXME */ - STRING_PAGESETUP_LEFTVALUE "20 מ""מ" /* FIXME */ - STRING_PAGESETUP_RIGHTVALUE "20 מ""מ" /* FIXME */ - STRING_PAGESETUP_TOPVALUE "25 מ""מ" /* FIXME */ - STRING_PAGESETUP_BOTTOMVALUE "25 מ""מ" /* FIXME */ + STRING_PAGESETUP_HEADERVALUE "&f" + STRING_PAGESETUP_FOOTERVALUE "עמוד &p" STRING_NOTEPAD "פנקס רשימות" STRING_ERROR "שגיאה" STRING_WARNING "אזהרה" diff --git a/base/applications/notepad/lang/hi-IN.rc b/base/applications/notepad/lang/hi-IN.rc index 67d9c87684d..f66e29898fd 100644 --- a/base/applications/notepad/lang/hi-IN.rc +++ b/base/applications/notepad/lang/hi-IN.rc @@ -139,12 +139,8 @@ END STRINGTABLE BEGIN - STRING_PAGESETUP_HEADERVALUE "&n" /* FIXME */ - STRING_PAGESETUP_FOOTERVALUE "Page &s" /* FIXME */ - STRING_PAGESETUP_LEFTVALUE "20 mm" /* FIXME */ - STRING_PAGESETUP_RIGHTVALUE "20 mm" /* FIXME */ - STRING_PAGESETUP_TOPVALUE "25 mm" /* FIXME */ - STRING_PAGESETUP_BOTTOMVALUE "25 mm" /* FIXME */ + STRING_PAGESETUP_HEADERVALUE "&f" + STRING_PAGESETUP_FOOTERVALUE "Page &p" STRING_NOTEPAD "नोटपैड" STRING_ERROR "त्रुटि" STRING_WARNING "वॉर्निंग" diff --git a/base/applications/notepad/lang/hr-HR.rc b/base/applications/notepad/lang/hr-HR.rc index 6e201827d4d..8d69778a17d 100644 --- a/base/applications/notepad/lang/hr-HR.rc +++ b/base/applications/notepad/lang/hr-HR.rc @@ -139,12 +139,8 @@ END STRINGTABLE BEGIN - STRING_PAGESETUP_HEADERVALUE "&n" /* FIXME */ - STRING_PAGESETUP_FOOTERVALUE "Stranica &s" /* FIXME */ - STRING_PAGESETUP_LEFTVALUE "20 mm" /* FIXME */ - STRING_PAGESETUP_RIGHTVALUE "20 mm" /* FIXME */ - STRING_PAGESETUP_TOPVALUE "25 mm" /* FIXME */ - STRING_PAGESETUP_BOTTOMVALUE "25 mm" /* FIXME */ + STRING_PAGESETUP_HEADERVALUE "&f" + STRING_PAGESETUP_FOOTERVALUE "Stranica &p" STRING_NOTEPAD "Blok za pisanje" STRING_ERROR "Greška" STRING_WARNING "Upozorenje" diff --git a/base/applications/notepad/lang/hu-HU.rc b/base/applications/notepad/lang/hu-HU.rc index 6ee0bdaee9a..4fb13be84ee 100644 --- a/base/applications/notepad/lang/hu-HU.rc +++ b/base/applications/notepad/lang/hu-HU.rc @@ -132,12 +132,8 @@ END STRINGTABLE BEGIN - STRING_PAGESETUP_HEADERVALUE "&n" /* FIXME */ - STRING_PAGESETUP_FOOTERVALUE "Oldalszám: &s." /* FIXME */ - STRING_PAGESETUP_LEFTVALUE "20 mm" /* FIXME */ - STRING_PAGESETUP_RIGHTVALUE "20 mm" /* FIXME */ - STRING_PAGESETUP_TOPVALUE "25 mm" /* FIXME */ - STRING_PAGESETUP_BOTTOMVALUE "25 mm" /* FIXME */ + STRING_PAGESETUP_HEADERVALUE "&f" + STRING_PAGESETUP_FOOTERVALUE "Oldalszám: &p." STRING_NOTEPAD "Jegyzettömb" STRING_ERROR "HIBA" STRING_WARNING "FIGYELMEZTETÉS" diff --git a/base/applications/notepad/lang/hy-AM.rc b/base/applications/notepad/lang/hy-AM.rc index 66574a6c560..b570d30e510 100644 --- a/base/applications/notepad/lang/hy-AM.rc +++ b/base/applications/notepad/lang/hy-AM.rc @@ -132,12 +132,8 @@ END STRINGTABLE BEGIN - STRING_PAGESETUP_HEADERVALUE "&n" /* FIXME */ - STRING_PAGESETUP_FOOTERVALUE "Էջ &s" /* FIXME */ - STRING_PAGESETUP_LEFTVALUE "20 mm" /* FIXME */ - STRING_PAGESETUP_RIGHTVALUE "20 mm" /* FIXME */ - STRING_PAGESETUP_TOPVALUE "25 mm" /* FIXME */ - STRING_PAGESETUP_BOTTOMVALUE "25 mm" /* FIXME */ + STRING_PAGESETUP_HEADERVALUE "&f" + STRING_PAGESETUP_FOOTERVALUE "Էջ &p" STRING_NOTEPAD "Բլոկնոտ" STRING_ERROR "ՍԽԱԼ" STRING_WARNING "ՈԻՇԱԴՐՈՒԹՅՈՒՆ" diff --git a/base/applications/notepad/lang/id-ID.rc b/base/applications/notepad/lang/id-ID.rc index 3c00fb80c68..1bf3230f469 100644 --- a/base/applications/notepad/lang/id-ID.rc +++ b/base/applications/notepad/lang/id-ID.rc @@ -132,12 +132,8 @@ END STRINGTABLE BEGIN - STRING_PAGESETUP_HEADERVALUE "&n" /* FIXME */ - STRING_PAGESETUP_FOOTERVALUE "Halaman &s" /* FIXME */ - STRING_PAGESETUP_LEFTVALUE "20 mm" /* FIXME */ - STRING_PAGESETUP_RIGHTVALUE "20 mm" /* FIXME */ - STRING_PAGESETUP_TOPVALUE "25 mm" /* FIXME */ - STRING_PAGESETUP_BOTTOMVALUE "25 mm" /* FIXME */ + STRING_PAGESETUP_HEADERVALUE "&f" + STRING_PAGESETUP_FOOTERVALUE "Halaman &p" STRING_NOTEPAD "Notepad" STRING_ERROR "Kesalahan" STRING_WARNING "Peringatan" diff --git a/base/applications/notepad/lang/it-IT.rc b/base/applications/notepad/lang/it-IT.rc index 1c5c0766b95..4cba0c5eb0a 100644 --- a/base/applications/notepad/lang/it-IT.rc +++ b/base/applications/notepad/lang/it-IT.rc @@ -132,12 +132,8 @@ END STRINGTABLE BEGIN - STRING_PAGESETUP_HEADERVALUE "&n" /* FIXME */ - STRING_PAGESETUP_FOOTERVALUE "Pagina &s" /* FIXME */ - STRING_PAGESETUP_LEFTVALUE "20 mm" /* FIXME */ - STRING_PAGESETUP_RIGHTVALUE "20 mm" /* FIXME */ - STRING_PAGESETUP_TOPVALUE "25 mm" /* FIXME */ - STRING_PAGESETUP_BOTTOMVALUE "25 mm" /* FIXME */ + STRING_PAGESETUP_HEADERVALUE "&f" + STRING_PAGESETUP_FOOTERVALUE "Pagina &p" STRING_NOTEPAD "Blocco note" STRING_ERROR "ERRORE" STRING_WARNING "ATTENZIONE" diff --git a/base/applications/notepad/lang/ja-JP.rc b/base/applications/notepad/lang/ja-JP.rc index cb5f34450aa..bc50047fac0 100644 --- a/base/applications/notepad/lang/ja-JP.rc +++ b/base/applications/notepad/lang/ja-JP.rc @@ -132,12 +132,8 @@ END STRINGTABLE BEGIN - STRING_PAGESETUP_HEADERVALUE "&n" /* FIXME */ - STRING_PAGESETUP_FOOTERVALUE "&s ページ" /* FIXME */ - STRING_PAGESETUP_LEFTVALUE "20 mm" /* FIXME */ - STRING_PAGESETUP_RIGHTVALUE "20 mm" /* FIXME */ - STRING_PAGESETUP_TOPVALUE "25 mm" /* FIXME */ - STRING_PAGESETUP_BOTTOMVALUE "25 mm" /* FIXME */ + STRING_PAGESETUP_HEADERVALUE "&f" + STRING_PAGESETUP_FOOTERVALUE "ページ &p" STRING_NOTEPAD "メモ帳" STRING_ERROR "エラー" STRING_WARNING "警告" diff --git a/base/applications/notepad/lang/lt-LT.rc b/base/applications/notepad/lang/lt-LT.rc index f3f30f389c3..1cd4f99306c 100644 --- a/base/applications/notepad/lang/lt-LT.rc +++ b/base/applications/notepad/lang/lt-LT.rc @@ -132,12 +132,8 @@ END STRINGTABLE BEGIN - STRING_PAGESETUP_HEADERVALUE "&n" /* FIXME */ - STRING_PAGESETUP_FOOTERVALUE "Puslapis &s" /* FIXME */ - STRING_PAGESETUP_LEFTVALUE "20 mm" /* FIXME */ - STRING_PAGESETUP_RIGHTVALUE "20 mm" /* FIXME */ - STRING_PAGESETUP_TOPVALUE "25 mm" /* FIXME */ - STRING_PAGESETUP_BOTTOMVALUE "25 mm" /* FIXME */ + STRING_PAGESETUP_HEADERVALUE "&f" + STRING_PAGESETUP_FOOTERVALUE "Puslapis &p" STRING_NOTEPAD "Notepad" STRING_ERROR "KLAIDA" STRING_WARNING "ĮSPĖJIMAS" diff --git a/base/applications/notepad/lang/ms-MY.rc b/base/applications/notepad/lang/ms-MY.rc index c218b23f6ca..2c08f7fc548 100644 --- a/base/applications/notepad/lang/ms-MY.rc +++ b/base/applications/notepad/lang/ms-MY.rc @@ -134,12 +134,8 @@ END STRINGTABLE BEGIN - STRING_PAGESETUP_HEADERVALUE "&n" /* FIXME */ - STRING_PAGESETUP_FOOTERVALUE "Page &s" /* FIXME */ - STRING_PAGESETUP_LEFTVALUE "20 mm" /* FIXME */ - STRING_PAGESETUP_RIGHTVALUE "20 mm" /* FIXME */ - STRING_PAGESETUP_TOPVALUE "25 mm" /* FIXME */ - STRING_PAGESETUP_BOTTOMVALUE "25 mm" /* FIXME */ + STRING_PAGESETUP_HEADERVALUE "&f" + STRING_PAGESETUP_FOOTERVALUE "Page &p" STRING_NOTEPAD "Notepad" STRING_ERROR "RALAT" STRING_WARNING "AMARAN" diff --git a/base/applications/notepad/lang/nl-NL.rc b/base/applications/notepad/lang/nl-NL.rc index a5767cb7e0d..dce7657c783 100644 --- a/base/applications/notepad/lang/nl-NL.rc +++ b/base/applications/notepad/lang/nl-NL.rc @@ -132,12 +132,8 @@ END STRINGTABLE BEGIN - STRING_PAGESETUP_HEADERVALUE "&n" /* FIXME */ - STRING_PAGESETUP_FOOTERVALUE "Pagina &s" /* FIXME */ - STRING_PAGESETUP_LEFTVALUE "20 mm" /* FIXME */ - STRING_PAGESETUP_RIGHTVALUE "20 mm" /* FIXME */ - STRING_PAGESETUP_TOPVALUE "25 mm" /* FIXME */ - STRING_PAGESETUP_BOTTOMVALUE "25 mm" /* FIXME */ + STRING_PAGESETUP_HEADERVALUE "&f" + STRING_PAGESETUP_FOOTERVALUE "Pagina &p" STRING_NOTEPAD "Kladblok" STRING_ERROR "FOUT" STRING_WARNING "WAARSCHUWING" diff --git a/base/applications/notepad/lang/no-NO.rc b/base/applications/notepad/lang/no-NO.rc index 1612b9913c0..4cb8c26aed4 100644 --- a/base/applications/notepad/lang/no-NO.rc +++ b/base/applications/notepad/lang/no-NO.rc @@ -132,12 +132,8 @@ END STRINGTABLE BEGIN - STRING_PAGESETUP_HEADERVALUE "&n" /* FIXME */ - STRING_PAGESETUP_FOOTERVALUE "Side &r" /* FIXME */ - STRING_PAGESETUP_LEFTVALUE "20 mm" /* FIXME */ - STRING_PAGESETUP_RIGHTVALUE "20 mm" /* FIXME */ - STRING_PAGESETUP_TOPVALUE "25 mm" /* FIXME */ - STRING_PAGESETUP_BOTTOMVALUE "25 mm" /* FIXME */ + STRING_PAGESETUP_HEADERVALUE "&f" + STRING_PAGESETUP_FOOTERVALUE "Side &p" STRING_NOTEPAD "Notisblokk" STRING_ERROR "FEIL" STRING_WARNING "ADVARSEL" diff --git a/base/applications/notepad/lang/pl-PL.rc b/base/applications/notepad/lang/pl-PL.rc index fb9af935eb7..ba60d5ec329 100644 --- a/base/applications/notepad/lang/pl-PL.rc +++ b/base/applications/notepad/lang/pl-PL.rc @@ -132,12 +132,8 @@ END STRINGTABLE BEGIN - STRING_PAGESETUP_HEADERVALUE "&n" /* FIXME */ - STRING_PAGESETUP_FOOTERVALUE "Strona &s" /* FIXME */ - STRING_PAGESETUP_LEFTVALUE "20 mm" /* FIXME */ - STRING_PAGESETUP_RIGHTVALUE "20 mm" /* FIXME */ - STRING_PAGESETUP_TOPVALUE "25 mm" /* FIXME */ - STRING_PAGESETUP_BOTTOMVALUE "25 mm" /* FIXME */ + STRING_PAGESETUP_HEADERVALUE "&f" + STRING_PAGESETUP_FOOTERVALUE "Strona &p" STRING_NOTEPAD "Notatnik" STRING_ERROR "Błąd" STRING_WARNING "OSTRZEŻENIE" diff --git a/base/applications/notepad/lang/pt-BR.rc b/base/applications/notepad/lang/pt-BR.rc index ffc6ef44cce..912a37a4f68 100644 --- a/base/applications/notepad/lang/pt-BR.rc +++ b/base/applications/notepad/lang/pt-BR.rc @@ -132,12 +132,8 @@ END STRINGTABLE BEGIN - STRING_PAGESETUP_HEADERVALUE "&n" /* FIXME */ - STRING_PAGESETUP_FOOTERVALUE "Página &s" /* FIXME */ - STRING_PAGESETUP_LEFTVALUE "20 mm" /* FIXME */ - STRING_PAGESETUP_RIGHTVALUE "20 mm" /* FIXME */ - STRING_PAGESETUP_TOPVALUE "25 mm" /* FIXME */ - STRING_PAGESETUP_BOTTOMVALUE "25 mm" /* FIXME */ + STRING_PAGESETUP_HEADERVALUE "&f" + STRING_PAGESETUP_FOOTERVALUE "Página &p" STRING_NOTEPAD "Notepad" STRING_ERROR "ERRO" STRING_WARNING "AVISO" diff --git a/base/applications/notepad/lang/pt-PT.rc b/base/applications/notepad/lang/pt-PT.rc index d9a5b8576e0..3b5e2de940b 100644 --- a/base/applications/notepad/lang/pt-PT.rc +++ b/base/applications/notepad/lang/pt-PT.rc @@ -132,12 +132,8 @@ END STRINGTABLE BEGIN - STRING_PAGESETUP_HEADERVALUE "&n" /* FIXME */ - STRING_PAGESETUP_FOOTERVALUE "Página &s" /* FIXME */ - STRING_PAGESETUP_LEFTVALUE "20 mm" /* FIXME */ - STRING_PAGESETUP_RIGHTVALUE "20 mm" /* FIXME */ - STRING_PAGESETUP_TOPVALUE "25 mm" /* FIXME */ - STRING_PAGESETUP_BOTTOMVALUE "25 mm" /* FIXME */ + STRING_PAGESETUP_HEADERVALUE "&f" + STRING_PAGESETUP_FOOTERVALUE "Página &p" STRING_NOTEPAD "Notepad" STRING_ERROR "ERRO" STRING_WARNING "AVISO" diff --git a/base/applications/notepad/lang/ro-RO.rc b/base/applications/notepad/lang/ro-RO.rc index cd10206770f..d1354a2db43 100644 --- a/base/applications/notepad/lang/ro-RO.rc +++ b/base/applications/notepad/lang/ro-RO.rc @@ -137,12 +137,8 @@ END STRINGTABLE BEGIN - STRING_PAGESETUP_HEADERVALUE "&n" /* FIXME */ - STRING_PAGESETUP_FOOTERVALUE "Pagină &s" /* FIXME */ - STRING_PAGESETUP_LEFTVALUE "20 mm" /* FIXME */ - STRING_PAGESETUP_RIGHTVALUE "20 mm" /* FIXME */ - STRING_PAGESETUP_TOPVALUE "25 mm" /* FIXME */ - STRING_PAGESETUP_BOTTOMVALUE "25 mm" /* FIXME */ + STRING_PAGESETUP_HEADERVALUE "&f" + STRING_PAGESETUP_FOOTERVALUE "Pagină &p" STRING_NOTEPAD "Carnețel" STRING_ERROR "EROARE" STRING_WARNING "ATENțIONARE" diff --git a/base/applications/notepad/lang/ru-RU.rc b/base/applications/notepad/lang/ru-RU.rc index 1d27885d2f4..71b0c70e06a 100644 --- a/base/applications/notepad/lang/ru-RU.rc +++ b/base/applications/notepad/lang/ru-RU.rc @@ -132,12 +132,8 @@ END STRINGTABLE BEGIN - STRING_PAGESETUP_HEADERVALUE "&n" /* FIXME */ - STRING_PAGESETUP_FOOTERVALUE "Страница &s" /* FIXME */ - STRING_PAGESETUP_LEFTVALUE "20 мм" /* FIXME */ - STRING_PAGESETUP_RIGHTVALUE "20 мм" /* FIXME */ - STRING_PAGESETUP_TOPVALUE "25 мм" /* FIXME */ - STRING_PAGESETUP_BOTTOMVALUE "25 мм" /* FIXME */ + STRING_PAGESETUP_HEADERVALUE "&f" + STRING_PAGESETUP_FOOTERVALUE "Страница &p" STRING_NOTEPAD "Блокнот" STRING_ERROR "ОШИБКА" STRING_WARNING "ВНИМАНИЕ" diff --git a/base/applications/notepad/lang/sk-SK.rc b/base/applications/notepad/lang/sk-SK.rc index a27501ed73f..87334cd527a 100644 --- a/base/applications/notepad/lang/sk-SK.rc +++ b/base/applications/notepad/lang/sk-SK.rc @@ -140,12 +140,8 @@ END STRINGTABLE BEGIN - STRING_PAGESETUP_HEADERVALUE "&n" /* FIXME */ - STRING_PAGESETUP_FOOTERVALUE "Strana &s" /* FIXME */ - STRING_PAGESETUP_LEFTVALUE "20 mm" /* FIXME */ - STRING_PAGESETUP_RIGHTVALUE "20 mm" /* FIXME */ - STRING_PAGESETUP_TOPVALUE "25 mm" /* FIXME */ - STRING_PAGESETUP_BOTTOMVALUE "25 mm" /* FIXME */ + STRING_PAGESETUP_HEADERVALUE "&f" + STRING_PAGESETUP_FOOTERVALUE "Strana &p" STRING_NOTEPAD "Poznámkový blok" STRING_ERROR "CHYBA" STRING_WARNING "UPOZORNENIE" diff --git a/base/applications/notepad/lang/sl-SI.rc b/base/applications/notepad/lang/sl-SI.rc index 6a87df05d1c..55af9a7dd65 100644 --- a/base/applications/notepad/lang/sl-SI.rc +++ b/base/applications/notepad/lang/sl-SI.rc @@ -132,12 +132,8 @@ END STRINGTABLE BEGIN - STRING_PAGESETUP_HEADERVALUE "&n" /* FIXME */ - STRING_PAGESETUP_FOOTERVALUE "Stran &s" /* FIXME */ - STRING_PAGESETUP_LEFTVALUE "20 mm" /* FIXME */ - STRING_PAGESETUP_RIGHTVALUE "20 mm" /* FIXME */ - STRING_PAGESETUP_TOPVALUE "25 mm" /* FIXME */ - STRING_PAGESETUP_BOTTOMVALUE "25 mm" /* FIXME */ + STRING_PAGESETUP_HEADERVALUE "&f" + STRING_PAGESETUP_FOOTERVALUE "Stran &p" STRING_NOTEPAD "Beležnica" STRING_ERROR "NAPAKA" STRING_WARNING "OPOZORILO" diff --git a/base/applications/notepad/lang/sq-AL.rc b/base/applications/notepad/lang/sq-AL.rc index adc546e0411..cdf0a08b135 100644 --- a/base/applications/notepad/lang/sq-AL.rc +++ b/base/applications/notepad/lang/sq-AL.rc @@ -136,12 +136,8 @@ END STRINGTABLE BEGIN - STRING_PAGESETUP_HEADERVALUE "&n" /* FIXME */ - STRING_PAGESETUP_FOOTERVALUE "Faqe &s" /* FIXME */ - STRING_PAGESETUP_LEFTVALUE "20 mm" /* FIXME */ - STRING_PAGESETUP_RIGHTVALUE "20 mm" /* FIXME */ - STRING_PAGESETUP_TOPVALUE "25 mm" /* FIXME */ - STRING_PAGESETUP_BOTTOMVALUE "25 mm" /* FIXME */ + STRING_PAGESETUP_HEADERVALUE "&f" + STRING_PAGESETUP_FOOTERVALUE "Faqe &p" STRING_NOTEPAD "Notepad" STRING_ERROR "ERROR" STRING_WARNING "KUJDES" diff --git a/base/applications/notepad/lang/sv-SE.rc b/base/applications/notepad/lang/sv-SE.rc index 55c6ff59785..a256eff432b 100644 --- a/base/applications/notepad/lang/sv-SE.rc +++ b/base/applications/notepad/lang/sv-SE.rc @@ -132,12 +132,8 @@ END STRINGTABLE BEGIN - STRING_PAGESETUP_HEADERVALUE "&n" - STRING_PAGESETUP_FOOTERVALUE "Sida &s" - STRING_PAGESETUP_LEFTVALUE "20 mm" - STRING_PAGESETUP_RIGHTVALUE "20 mm" - STRING_PAGESETUP_TOPVALUE "25 mm" - STRING_PAGESETUP_BOTTOMVALUE "25 mm" + STRING_PAGESETUP_HEADERVALUE "&f" + STRING_PAGESETUP_FOOTERVALUE "Sida &p" STRING_NOTEPAD "Anteckningar" STRING_ERROR "FEL" STRING_WARNING "VARNING" diff --git a/base/applications/notepad/lang/th-TH.rc b/base/applications/notepad/lang/th-TH.rc index aacedd7305b..471d0d73a8f 100644 --- a/base/applications/notepad/lang/th-TH.rc +++ b/base/applications/notepad/lang/th-TH.rc @@ -132,12 +132,8 @@ END STRINGTABLE BEGIN - STRING_PAGESETUP_HEADERVALUE "&n" /* FIXME */ - STRING_PAGESETUP_FOOTERVALUE "หน้า &s" /* FIXME */ - STRING_PAGESETUP_LEFTVALUE "20 มม." /* FIXME */ - STRING_PAGESETUP_RIGHTVALUE "20 มม." /* FIXME */ - STRING_PAGESETUP_TOPVALUE "25 มม." /* FIXME */ - STRING_PAGESETUP_BOTTOMVALUE "25 มม." /* FIXME */ + STRING_PAGESETUP_HEADERVALUE "&f" + STRING_PAGESETUP_FOOTERVALUE "หน้า &p" STRING_NOTEPAD "Notepad" STRING_ERROR "ความปิด" STRING_WARNING "คําตือน" diff --git a/base/applications/notepad/lang/tr-TR.rc b/base/applications/notepad/lang/tr-TR.rc index 0401ea4a169..26a7ef1f87e 100644 --- a/base/applications/notepad/lang/tr-TR.rc +++ b/base/applications/notepad/lang/tr-TR.rc @@ -135,12 +135,8 @@ END STRINGTABLE BEGIN - STRING_PAGESETUP_HEADERVALUE "&n" /* FIXME */ - STRING_PAGESETUP_FOOTERVALUE "Sayfa &s" /* FIXME */ - STRING_PAGESETUP_LEFTVALUE "20 mm" /* FIXME */ - STRING_PAGESETUP_RIGHTVALUE "20 mm" /* FIXME */ - STRING_PAGESETUP_TOPVALUE "25 mm" /* FIXME */ - STRING_PAGESETUP_BOTTOMVALUE "25 mm" /* FIXME */ + STRING_PAGESETUP_HEADERVALUE "&f" + STRING_PAGESETUP_FOOTERVALUE "Sayfa &p" STRING_NOTEPAD "Not Defteri" STRING_ERROR "HATA" STRING_WARNING "UYARI" diff --git a/base/applications/notepad/lang/uk-UA.rc b/base/applications/notepad/lang/uk-UA.rc index a64d6e92276..23f6b27ba74 100644 --- a/base/applications/notepad/lang/uk-UA.rc +++ b/base/applications/notepad/lang/uk-UA.rc @@ -132,12 +132,8 @@ END STRINGTABLE BEGIN - STRING_PAGESETUP_HEADERVALUE "&n" /* FIXME */ - STRING_PAGESETUP_FOOTERVALUE "Сторінка &s" /* FIXME */ - STRING_PAGESETUP_LEFTVALUE "20 мм" /* FIXME */ - STRING_PAGESETUP_RIGHTVALUE "20 мм" /* FIXME */ - STRING_PAGESETUP_TOPVALUE "25 мм" /* FIXME */ - STRING_PAGESETUP_BOTTOMVALUE "25 мм" /* FIXME */ + STRING_PAGESETUP_HEADERVALUE "&f" + STRING_PAGESETUP_FOOTERVALUE "Сторінка &p" STRING_NOTEPAD "Блокнот" STRING_ERROR "ПОМИЛКА" STRING_WARNING "УВАГА" diff --git a/base/applications/notepad/lang/uz-UZ.rc b/base/applications/notepad/lang/uz-UZ.rc index 3eaea09f591..586905aeeab 100644 --- a/base/applications/notepad/lang/uz-UZ.rc +++ b/base/applications/notepad/lang/uz-UZ.rc @@ -132,12 +132,8 @@ END STRINGTABLE BEGIN - STRING_PAGESETUP_HEADERVALUE "&n" /* FIXME */ - STRING_PAGESETUP_FOOTERVALUE "Sahifa &s" /* FIXME */ - STRING_PAGESETUP_LEFTVALUE "20 mm" /* FIXME */ - STRING_PAGESETUP_RIGHTVALUE "20 mm" /* FIXME */ - STRING_PAGESETUP_TOPVALUE "25 mm" /* FIXME */ - STRING_PAGESETUP_BOTTOMVALUE "25 mm" /* FIXME */ + STRING_PAGESETUP_HEADERVALUE "&f" + STRING_PAGESETUP_FOOTERVALUE "Sahifa &p" STRING_NOTEPAD "Bloknot" STRING_ERROR "XATO" STRING_WARNING "DIQQAT" diff --git a/base/applications/notepad/lang/zh-CN.rc b/base/applications/notepad/lang/zh-CN.rc index 28fad41e6e6..bacc7722019 100644 --- a/base/applications/notepad/lang/zh-CN.rc +++ b/base/applications/notepad/lang/zh-CN.rc @@ -140,12 +140,8 @@ END STRINGTABLE BEGIN - STRING_PAGESETUP_HEADERVALUE "&n" /* FIXME */ - STRING_PAGESETUP_FOOTERVALUE "页面 &s" /* FIXME */ - STRING_PAGESETUP_LEFTVALUE "20 mm" /* FIXME */ - STRING_PAGESETUP_RIGHTVALUE "20 mm" /* FIXME */ - STRING_PAGESETUP_TOPVALUE "25 mm" /* FIXME */ - STRING_PAGESETUP_BOTTOMVALUE "25 mm" /* FIXME */ + STRING_PAGESETUP_HEADERVALUE "&f" + STRING_PAGESETUP_FOOTERVALUE "页面 &p" STRING_NOTEPAD "记事本" STRING_ERROR "错误" STRING_WARNING "警告" diff --git a/base/applications/notepad/lang/zh-HK.rc b/base/applications/notepad/lang/zh-HK.rc index 2ed9942d2b5..24fa27a6e36 100644 --- a/base/applications/notepad/lang/zh-HK.rc +++ b/base/applications/notepad/lang/zh-HK.rc @@ -140,12 +140,8 @@ END STRINGTABLE BEGIN - STRING_PAGESETUP_HEADERVALUE "&n" /* FIXME */ - STRING_PAGESETUP_FOOTERVALUE "第 &s 頁" /* FIXME */ - STRING_PAGESETUP_LEFTVALUE "20 mm" /* FIXME */ - STRING_PAGESETUP_RIGHTVALUE "20 mm" /* FIXME */ - STRING_PAGESETUP_TOPVALUE "25 mm" /* FIXME */ - STRING_PAGESETUP_BOTTOMVALUE "25 mm" /* FIXME */ + STRING_PAGESETUP_HEADERVALUE "&f" + STRING_PAGESETUP_FOOTERVALUE "第 &p 頁" STRING_NOTEPAD "記事本" STRING_ERROR "錯誤" STRING_WARNING "警告" diff --git a/base/applications/notepad/lang/zh-TW.rc b/base/applications/notepad/lang/zh-TW.rc index b4974b34d83..871a000a7bc 100644 --- a/base/applications/notepad/lang/zh-TW.rc +++ b/base/applications/notepad/lang/zh-TW.rc @@ -140,12 +140,8 @@ END STRINGTABLE BEGIN - STRING_PAGESETUP_HEADERVALUE "&n" /* FIXME */ - STRING_PAGESETUP_FOOTERVALUE "第 &s 頁" /* FIXME */ - STRING_PAGESETUP_LEFTVALUE "20 mm" /* FIXME */ - STRING_PAGESETUP_RIGHTVALUE "20 mm" /* FIXME */ - STRING_PAGESETUP_TOPVALUE "25 mm" /* FIXME */ - STRING_PAGESETUP_BOTTOMVALUE "25 mm" /* FIXME */ + STRING_PAGESETUP_HEADERVALUE "&f" + STRING_PAGESETUP_FOOTERVALUE "第 &p 頁" STRING_NOTEPAD "記事本" STRING_ERROR "錯誤" STRING_WARNING "警告" diff --git a/base/applications/notepad/notepad_res.h b/base/applications/notepad/notepad_res.h index 179a1c73573..870db3f7687 100644 --- a/base/applications/notepad/notepad_res.h +++ b/base/applications/notepad/notepad_res.h @@ -68,10 +68,6 @@ /* Strings */ #define STRING_PAGESETUP_HEADERVALUE 0x160 #define STRING_PAGESETUP_FOOTERVALUE 0x161 -#define STRING_PAGESETUP_LEFTVALUE 0x162 -#define STRING_PAGESETUP_RIGHTVALUE 0x163 -#define STRING_PAGESETUP_TOPVALUE 0x164 -#define STRING_PAGESETUP_BOTTOMVALUE 0x165 #define STRING_NOTEPAD 0x170 #define STRING_ERROR 0x171

1 0

[reactos] 01/01: [NTOS:SE] Print debug output only if NDEBUG is not defined
by George Bișoc 06 Mar '23

06 Mar '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a804ba3200190c1405d4a… commit a804ba3200190c1405d4af93ef53d9623797ddbb Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Mon Mar 6 20:03:44 2023 +0100 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Mon Mar 6 20:03:44 2023 +0100 [NTOS:SE] Print debug output only if NDEBUG is not defined This mutes a lot of debug spam that fills up the debugger when an access check fails because a requestor doesn't have enough privileges to access an object. --- ntoskrnl/se/debug.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/ntoskrnl/se/debug.c b/ntoskrnl/se/debug.c index da5e35a160e..f21d5400938 100644 --- a/ntoskrnl/se/debug.c +++ b/ntoskrnl/se/debug.c @@ -13,6 +13,7 @@ /* PRIVATE FUNCTIONS **********************************************************/ +#ifndef NDEBUG /** * @brief * Converts an Access Control Entry (ACE) type to a string. @@ -204,6 +205,7 @@ SepDumpSidsOfToken( RtlFreeUnicodeString(&SidString); } } +#endif /* PUBLIC FUNCTIONS ***********************************************************/ @@ -215,9 +217,11 @@ VOID SepDumpSdDebugInfo( _In_opt_ PISECURITY_DESCRIPTOR SecurityDescriptor) { +#ifndef NDEBUG UNICODE_STRING SidString; PSID OwnerSid, GroupSid; PACL Dacl, Sacl; +#endif /* Don't dump anything if no SD was provided */ if (!SecurityDescriptor) @@ -225,6 +229,7 @@ SepDumpSdDebugInfo( return; } +#ifndef NDEBUG /* Cache the necessary security buffers to dump info from */ OwnerSid = SepGetOwnerFromDescriptor(SecurityDescriptor); GroupSid = SepGetGroupFromDescriptor(SecurityDescriptor); @@ -264,6 +269,7 @@ SepDumpSdDebugInfo( { SepDumpAclInfo(Dacl, FALSE); } +#endif } /** @@ -274,7 +280,9 @@ VOID SepDumpTokenDebugInfo( _In_opt_ PTOKEN Token) { +#ifndef NDEBUG UNICODE_STRING SidString; +#endif /* Don't dump anything if no token was provided */ if (!Token) @@ -282,6 +290,7 @@ SepDumpTokenDebugInfo( return; } +#ifndef NDEBUG /* Dump relevant token info */ DbgPrint("================== ACCESS TOKEN DUMP INFO ==================\n"); DbgPrint("Token -> 0x%p\n", Token); @@ -305,6 +314,7 @@ SepDumpTokenDebugInfo( DbgPrint("Token restricted SIDs:\n"); SepDumpSidsOfToken(Token->RestrictedSids, Token->RestrictedSidCount); } +#endif } /** @@ -321,10 +331,12 @@ SepDumpAccessRightsStats( return; } +#ifndef NDEBUG DbgPrint("================== ACCESS CHECK RIGHTS STATISTICS ==================\n"); DbgPrint("Remaining access rights -> 0x%08lx\n", AccessRights->RemainingAccessRights); DbgPrint("Granted access rights -> 0x%08lx\n", AccessRights->GrantedAccessRights); DbgPrint("Denied access rights -> 0x%08lx\n", AccessRights->DeniedAccessRights); +#endif } /* EOF */

1 0

[reactos] 01/01: [WS2_32] Fix Two DPRINT typo errors (#5113)
by Doug Lyons 06 Mar '23

06 Mar '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b0a03a7caa3c5a30de109… commit b0a03a7caa3c5a30de109f053cb40df7dbc33f0f Author: Doug Lyons <douglyons(a)douglyons.com> AuthorDate: Mon Mar 6 05:22:28 2023 -0600 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Mar 6 12:22:28 2023 +0100 [WS2_32] Fix Two DPRINT typo errors (#5113) --- dll/win32/ws2_32/src/send.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/win32/ws2_32/src/send.c b/dll/win32/ws2_32/src/send.c index 189cb5ef222..7614df92039 100644 --- a/dll/win32/ws2_32/src/send.c +++ b/dll/win32/ws2_32/src/send.c @@ -31,7 +31,7 @@ send(IN SOCKET s, LPWSATHREADID ThreadId; WSABUF Buffers; DWORD BytesSent; - DPRINT("sendto: %lx, %lx, %lx, %p\n", s, flags, len, buf); + DPRINT("send: %lx, %lx, %lx, %p\n", s, flags, len, buf); /* Check for WSAStartup */ if ((ErrorCode = WsQuickPrologTid(&ThreadId)) == ERROR_SUCCESS) @@ -154,7 +154,7 @@ WSASend(IN SOCKET s, INT Status; INT ErrorCode; LPWSATHREADID ThreadId; - DPRINT("WSARecvFrom: %lx, %lx, %lx, %p\n", s, dwFlags, dwBufferCount, lpBuffers); + DPRINT("WSASend: %lx, %lx, %lx, %p\n", s, dwFlags, dwBufferCount, lpBuffers); /* Check for WSAStartup */ if ((ErrorCode = WsQuickPrologTid(&ThreadId)) == ERROR_SUCCESS)

1 0

[reactos] 01/01: [MSVCRT] Follow-up of Follow-up of #5032 (f172503)
by Katayama Hirofumi MZ 05 Mar '23

05 Mar '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fdedc549d016316819915… commit fdedc549d0163168199156df10cc7f4fd816de7d Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Mar 5 23:28:00 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sun Mar 5 23:28:00 2023 +0900 [MSVCRT] Follow-up of Follow-up of #5032 (f172503) Fix for system/_wsystem. Use _set_errno(ENOMEM) for malloc failure. Rename status variable as exit_code. --- sdk/lib/crt/process/_system.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/sdk/lib/crt/process/_system.c b/sdk/lib/crt/process/_system.c index 2b2696e6d45..a7e3b174e56 100644 --- a/sdk/lib/crt/process/_system.c +++ b/sdk/lib/crt/process/_system.c @@ -21,11 +21,10 @@ int system(const char *command) { char *szCmdLine = NULL; char *szComSpec = NULL; - PROCESS_INFORMATION ProcessInformation; STARTUPINFOA StartupInfo; BOOL result; - int status; + int exit_code; char cmd_exe[MAX_PATH]; szComSpec = getenv("COMSPEC"); @@ -46,8 +45,8 @@ int system(const char *command) szCmdLine = malloc(1 + strlen(szComSpec) + 5 + strlen(command) + 1); if (szCmdLine == NULL) { - _dosmaperr(GetLastError()); - return -1; + _set_errno(ENOMEM); + return -1; } strcpy(szCmdLine, "\""); @@ -88,12 +87,12 @@ int system(const char *command) CloseHandle(ProcessInformation.hThread); /* Wait for the process to exit */ - _cwait(&status, (intptr_t)ProcessInformation.hProcess, 0); + _cwait(&exit_code, (intptr_t)ProcessInformation.hProcess, 0); CloseHandle(ProcessInformation.hProcess); _set_errno(0); - return status; + return exit_code; } int CDECL _wsystem(const wchar_t *cmd) @@ -103,7 +102,7 @@ int CDECL _wsystem(const wchar_t *cmd) PROCESS_INFORMATION process_info; STARTUPINFOW startup_info; BOOL result; - int status; + int exit_code; wchar_t cmd_exe[MAX_PATH]; comspec = _wgetenv(L"COMSPEC"); @@ -124,7 +123,7 @@ int CDECL _wsystem(const wchar_t *cmd) cmdline = malloc((1 + wcslen(comspec) + 5 + wcslen(cmd) + 1) * sizeof(wchar_t)); if (cmdline == NULL) { - _dosmaperr(GetLastError()); + _set_errno(ENOMEM); return -1; } @@ -167,10 +166,10 @@ int CDECL _wsystem(const wchar_t *cmd) CloseHandle(process_info.hThread); /* Wait for the process to exit */ - _cwait(&status, (intptr_t)process_info.hProcess, 0); + _cwait(&exit_code, (intptr_t)process_info.hProcess, 0); CloseHandle(process_info.hProcess); _set_errno(0); - return status; + return exit_code; }

1 0

[reactos] 01/01: [MSVCRT] Follow-up of #5032 (f172503)
by Katayama Hirofumi MZ 05 Mar '23

05 Mar '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5a7dbd6064e74e1ed2b88… commit 5a7dbd6064e74e1ed2b886dcd973d444d2a8dc4d Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Mar 5 23:20:12 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sun Mar 5 23:20:12 2023 +0900 [MSVCRT] Follow-up of #5032 (f172503) Use _cwait() instead of WaitForSingleObject and GetExitCodeProcess. Use malloc/free instead of LocalAlloc/LocalFree. --- sdk/lib/crt/process/_system.c | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/sdk/lib/crt/process/_system.c b/sdk/lib/crt/process/_system.c index 6ce5b117808..2b2696e6d45 100644 --- a/sdk/lib/crt/process/_system.c +++ b/sdk/lib/crt/process/_system.c @@ -14,7 +14,6 @@ #include <string.h> #include <process.h> - /* * @implemented */ @@ -26,7 +25,7 @@ int system(const char *command) PROCESS_INFORMATION ProcessInformation; STARTUPINFOA StartupInfo; BOOL result; - DWORD exit_code; + int status; char cmd_exe[MAX_PATH]; szComSpec = getenv("COMSPEC"); @@ -44,7 +43,7 @@ int system(const char *command) szComSpec = cmd_exe; } - szCmdLine = LocalAlloc(LPTR, 1 + strlen(szComSpec) + 5 + strlen(command) + 1); + szCmdLine = malloc(1 + strlen(szComSpec) + 5 + strlen(command) + 1); if (szCmdLine == NULL) { _dosmaperr(GetLastError()); @@ -78,7 +77,7 @@ int system(const char *command) NULL, &StartupInfo, &ProcessInformation); - LocalFree(szCmdLine); + free(szCmdLine); if (result == FALSE) { @@ -89,23 +88,22 @@ int system(const char *command) CloseHandle(ProcessInformation.hThread); /* Wait for the process to exit */ - WaitForSingleObject(ProcessInformation.hProcess, INFINITE); - GetExitCodeProcess(ProcessInformation.hProcess, &exit_code); + _cwait(&status, (intptr_t)ProcessInformation.hProcess, 0); CloseHandle(ProcessInformation.hProcess); _set_errno(0); - return (int)exit_code; + return status; } -int CDECL _wsystem(const wchar_t* cmd) +int CDECL _wsystem(const wchar_t *cmd) { wchar_t *cmdline = NULL; wchar_t *comspec = NULL; PROCESS_INFORMATION process_info; STARTUPINFOW startup_info; BOOL result; - DWORD exit_code; + int status; wchar_t cmd_exe[MAX_PATH]; comspec = _wgetenv(L"COMSPEC"); @@ -123,7 +121,7 @@ int CDECL _wsystem(const wchar_t* cmd) comspec = cmd_exe; } - cmdline = LocalAlloc(LPTR, (1 + wcslen(comspec) + 5 + wcslen(cmd) + 1) * sizeof(wchar_t)); + cmdline = malloc((1 + wcslen(comspec) + 5 + wcslen(cmd) + 1) * sizeof(wchar_t)); if (cmdline == NULL) { _dosmaperr(GetLastError()); @@ -158,7 +156,7 @@ int CDECL _wsystem(const wchar_t* cmd) NULL, &startup_info, &process_info); - LocalFree(cmdline); + free(cmdline); if (!result) { @@ -169,11 +167,10 @@ int CDECL _wsystem(const wchar_t* cmd) CloseHandle(process_info.hThread); /* Wait for the process to exit */ - WaitForSingleObject(process_info.hProcess, INFINITE); - GetExitCodeProcess(process_info.hProcess, &exit_code); + _cwait(&status, (intptr_t)process_info.hProcess, 0); CloseHandle(process_info.hProcess); _set_errno(0); - return (int)exit_code; + return status; }

1 0

[reactos] 01/01: [MSVCRT][CRT_APITEST] Implement _wsystem (#5032)
by Katayama Hirofumi MZ 05 Mar '23

05 Mar '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f172503d57236c8388b33… commit f172503d57236c8388b334bc5ecef02ea34d4561 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Mar 5 21:01:14 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Mar 5 21:01:14 2023 +0900 [MSVCRT][CRT_APITEST] Implement _wsystem (#5032) Implement _wsystem(), by referring system(). Improve system(). Use WaitForSingleObject in system() and _wsystem(). Check existence of COMSPEC. Thanks ChatGPT. --- modules/rostests/apitests/crt/_wsystem.c | 72 +++++++++++ .../rostests/apitests/crt/crtdll_crt_apitest.cmake | 2 +- .../rostests/apitests/crt/msvcrt_crt_apitest.cmake | 4 +- modules/rostests/apitests/crt/system.c | 72 +++++++++++ modules/rostests/apitests/crt/testlist.c | 8 ++ sdk/lib/crt/process/_system.c | 144 ++++++++++++++------- 6 files changed, 255 insertions(+), 47 deletions(-) diff --git a/modules/rostests/apitests/crt/_wsystem.c b/modules/rostests/apitests/crt/_wsystem.c new file mode 100644 index 00000000000..1659b3ee609 --- /dev/null +++ b/modules/rostests/apitests/crt/_wsystem.c @@ -0,0 +1,72 @@ +/* + * PROJECT: ReactOS CRT + * LICENSE: MIT (https://spdx.org/licenses/MIT) + * PURPOSE: Tests for _wsystem() + * COPYRIGHT: Copyright 2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +#include <apitest.h> +#include <apitest_guard.h> + +START_TEST(_wsystem) +{ + int ret; + WCHAR szCmdExe[MAX_PATH]; + + GetSystemDirectoryW(szCmdExe, _countof(szCmdExe)); + lstrcatW(szCmdExe, L"\\cmd.exe"); + + SetEnvironmentVariableW(L"COMSPEC", NULL); + errno = 0xDEADBEEF; + ret = _wsystem(NULL); + ok_int(errno, 0xDEADBEEF); + ok_int(ret, 1); + + SetEnvironmentVariableW(L"COMSPEC", L"InvalidComSpec"); + errno = 0xDEADBEEF; + ret = _wsystem(NULL); + ok_int(errno, 0xDEADBEEF); + ok_int(ret, 1); + + SetEnvironmentVariableW(L"COMSPEC", szCmdExe); + errno = 0xDEADBEEF; + ret = _wsystem(NULL); + ok_int(errno, 0xDEADBEEF); + ok_int(ret, 1); + + SetEnvironmentVariableW(L"COMSPEC", NULL); + errno = 0xDEADBEEF; + ret = _wsystem(L"echo This is a test"); + ok_int(errno, 0); + ok_int(ret, 0); + + SetEnvironmentVariableW(L"COMSPEC", L"InvalidComSpec"); + errno = 0xDEADBEEF; + ret = _wsystem(L"echo This is a test"); + ok_int(errno, 0); + ok_int(ret, 0); + + SetEnvironmentVariableW(L"COMSPEC", szCmdExe); + errno = 0xDEADBEEF; + ret = _wsystem(L"echo This is a test"); + ok_int(errno, 0); + ok_int(ret, 0); + + SetEnvironmentVariableW(L"COMSPEC", NULL); + errno = 0xDEADBEEF; + ret = _wsystem(L"InvalidCommandLine"); + ok_int(errno, 0); + ok_int(ret, 1); + + SetEnvironmentVariableW(L"COMSPEC", L"InvalidComSpec"); + errno = 0xDEADBEEF; + ret = _wsystem(L"InvalidCommandLine"); + ok_int(errno, 0); + ok_int(ret, 1); + + SetEnvironmentVariableW(L"COMSPEC", szCmdExe); + errno = 0xDEADBEEF; + ret = _wsystem(L"InvalidCommandLine"); + ok_int(errno, 0); + ok_int(ret, 1); +} diff --git a/modules/rostests/apitests/crt/crtdll_crt_apitest.cmake b/modules/rostests/apitests/crt/crtdll_crt_apitest.cmake index f40c603c480..c6f60ea1d56 100644 --- a/modules/rostests/apitests/crt/crtdll_crt_apitest.cmake +++ b/modules/rostests/apitests/crt/crtdll_crt_apitest.cmake @@ -480,7 +480,7 @@ list(APPEND SOURCE_CRTDLL # strxfrm.c # swprintf.c # swscanf.c -# system.c + system.c # tan.c # tanh.c # time.c diff --git a/modules/rostests/apitests/crt/msvcrt_crt_apitest.cmake b/modules/rostests/apitests/crt/msvcrt_crt_apitest.cmake index 4677f90fbfa..919a7b01b64 100644 --- a/modules/rostests/apitests/crt/msvcrt_crt_apitest.cmake +++ b/modules/rostests/apitests/crt/msvcrt_crt_apitest.cmake @@ -981,7 +981,7 @@ list(APPEND SOURCE_MSVCRT # _wstrdate_s # _wstrtime.c # _wstrtime_s -# _wsystem.c + _wsystem.c # _wtempnam.c # _wtempnam_dbg # _wtmpnam.c @@ -1189,7 +1189,7 @@ list(APPEND SOURCE_MSVCRT # swprintf_s.c # swscanf.c # swscanf_s.c -# system.c + system.c # tan.c # tanh.c # time.c diff --git a/modules/rostests/apitests/crt/system.c b/modules/rostests/apitests/crt/system.c new file mode 100644 index 00000000000..5d49a0babf1 --- /dev/null +++ b/modules/rostests/apitests/crt/system.c @@ -0,0 +1,72 @@ +/* + * PROJECT: ReactOS CRT + * LICENSE: MIT (https://spdx.org/licenses/MIT) + * PURPOSE: Tests for system() + * COPYRIGHT: Copyright 2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +#include <apitest.h> +#include <apitest_guard.h> + +START_TEST(system) +{ + int ret; + CHAR szCmdExe[MAX_PATH]; + + GetSystemDirectoryA(szCmdExe, _countof(szCmdExe)); + lstrcatA(szCmdExe, "\\cmd.exe"); + + SetEnvironmentVariableA("COMSPEC", NULL); + errno = 0xDEADBEEF; + ret = system(NULL); + ok_int(errno, 0xDEADBEEF); + ok_int(ret, 1); + + SetEnvironmentVariableA("COMSPEC", "InvalidComSpec"); + errno = 0xDEADBEEF; + ret = system(NULL); + ok_int(errno, 0xDEADBEEF); + ok_int(ret, 1); + + SetEnvironmentVariableA("COMSPEC", szCmdExe); + errno = 0xDEADBEEF; + ret = system(NULL); + ok_int(errno, 0xDEADBEEF); + ok_int(ret, 1); + + SetEnvironmentVariableA("COMSPEC", NULL); + errno = 0xDEADBEEF; + ret = system("echo This is a test"); + ok_int(errno, 0); + ok_int(ret, 0); + + SetEnvironmentVariableA("COMSPEC", "InvalidComSpec"); + errno = 0xDEADBEEF; + ret = system("echo This is a test"); + ok_int(errno, 0); + ok_int(ret, 0); + + SetEnvironmentVariableA("COMSPEC", szCmdExe); + errno = 0xDEADBEEF; + ret = system("echo This is a test"); + ok_int(errno, 0); + ok_int(ret, 0); + + SetEnvironmentVariableA("COMSPEC", NULL); + errno = 0xDEADBEEF; + ret = system("InvalidCommandLine"); + ok_int(errno, 0); + ok_int(ret, 1); + + SetEnvironmentVariableA("COMSPEC", "InvalidComSpec"); + errno = 0xDEADBEEF; + ret = system("InvalidCommandLine"); + ok_int(errno, 0); + ok_int(ret, 1); + + SetEnvironmentVariableA("COMSPEC", szCmdExe); + errno = 0xDEADBEEF; + ret = system("InvalidCommandLine"); + ok_int(errno, 0); + ok_int(ret, 1); +} diff --git a/modules/rostests/apitests/crt/testlist.c b/modules/rostests/apitests/crt/testlist.c index fd746d39011..14f0bb97ad3 100644 --- a/modules/rostests/apitests/crt/testlist.c +++ b/modules/rostests/apitests/crt/testlist.c @@ -35,10 +35,12 @@ extern void func_strcpy(void); extern void func_strlen(void); extern void func_strnlen(void); extern void func_strtoul(void); +extern void func_system(void); extern void func_wcsnlen(void); extern void func_wcstombs(void); extern void func_wcstoul(void); extern void func_wctomb(void); +extern void func__wsystem(void); extern void func___getmainargs(void); extern void func_static_construct(void); @@ -57,6 +59,12 @@ const struct test winetest_testlist[] = { "strcpy", func_strcpy }, { "strlen", func_strlen }, { "strtoul", func_strtoul }, +#if defined(TEST_CRTDLL) || defined(TEST_MSVCRT) + { "system", func_system }, +#endif +#if defined(TEST_MSVCRT) + { "_wsystem", func__wsystem }, +#endif { "wcstoul", func_wcstoul }, { "wctomb", func_wctomb }, { "wcstombs", func_wcstombs }, diff --git a/sdk/lib/crt/process/_system.c b/sdk/lib/crt/process/_system.c index 6d879fce591..6ce5b117808 100644 --- a/sdk/lib/crt/process/_system.c +++ b/sdk/lib/crt/process/_system.c @@ -4,6 +4,7 @@ * FILE: lib/sdk/crt/process/_system.c * PURPOSE: Excutes a shell command * PROGRAMER: Ariadne + * Katayama Hirofumi MZ * UPDATE HISTORY: * 04/03/99: Created */ @@ -24,70 +25,48 @@ int system(const char *command) PROCESS_INFORMATION ProcessInformation; STARTUPINFOA StartupInfo; - char *s; BOOL result; - - int nStatus; + DWORD exit_code; + char cmd_exe[MAX_PATH]; szComSpec = getenv("COMSPEC"); // system should return 0 if command is null and the shell is found if (command == NULL) { - if (szComSpec == NULL) - return 0; - else - return 1; + return (szComSpec == NULL) ? 0 : 1; } - if (szComSpec == NULL) - return -1; - -// should return 127 or 0 ( MS ) if the shell is not found -// _set_errno(ENOENT); - - if (szComSpec == NULL) + if (!szComSpec || GetFileAttributesA(szComSpec) == INVALID_FILE_ATTRIBUTES) { - szComSpec = "cmd.exe"; + GetSystemDirectoryA(cmd_exe, _countof(cmd_exe)); + strcat(cmd_exe, "\\cmd.exe"); + szComSpec = cmd_exe; } - /* split the path from shell command */ - s = max(strrchr(szComSpec, '\\'), strrchr(szComSpec, '/')); - if (s == NULL) - s = szComSpec; - else - s++; - - szCmdLine = malloc(strlen(s) + 4 + strlen(command) + 1); + szCmdLine = LocalAlloc(LPTR, 1 + strlen(szComSpec) + 5 + strlen(command) + 1); if (szCmdLine == NULL) { - _set_errno(ENOMEM); + _dosmaperr(GetLastError()); return -1; } - strcpy(szCmdLine, s); - s = strrchr(szCmdLine, '.'); - if (s) - *s = 0; - strcat(szCmdLine, " /C "); + strcpy(szCmdLine, "\""); + strcat(szCmdLine, szComSpec); + strcat(szCmdLine, "\" /C "); strcat(szCmdLine, command); //command file has invalid format ENOEXEC - memset (&StartupInfo, 0, sizeof(StartupInfo)); + memset(&StartupInfo, 0, sizeof(StartupInfo)); StartupInfo.cb = sizeof(StartupInfo); - StartupInfo.lpReserved= NULL; StartupInfo.dwFlags = STARTF_USESHOWWINDOW; StartupInfo.wShowWindow = SW_SHOWDEFAULT; - StartupInfo.lpReserved2 = NULL; - StartupInfo.cbReserved2 = 0; - -// According to ansi standards the new process should ignore SIGINT and SIGQUIT -// In order to disable ctr-c the process is created with CREATE_NEW_PROCESS_GROUP, -// thus SetConsoleCtrlHandler(NULL,TRUE) is made on behalf of the new process. +// In order to disable Ctrl+C, the process is created with CREATE_NEW_PROCESS_GROUP. +// Thus, SetConsoleCtrlHandler(NULL, TRUE) is made on behalf of the new process. -//SIGCHILD should be blocked aswell +//SIGCHILD should be blocked as well result = CreateProcessA(szComSpec, szCmdLine, @@ -99,7 +78,7 @@ int system(const char *command) NULL, &StartupInfo, &ProcessInformation); - free(szCmdLine); + LocalFree(szCmdLine); if (result == FALSE) { @@ -109,15 +88,92 @@ int system(const char *command) CloseHandle(ProcessInformation.hThread); -// system should wait untill the calling process is finished - _cwait(&nStatus,(intptr_t)ProcessInformation.hProcess,0); + /* Wait for the process to exit */ + WaitForSingleObject(ProcessInformation.hProcess, INFINITE); + GetExitCodeProcess(ProcessInformation.hProcess, &exit_code); + CloseHandle(ProcessInformation.hProcess); - return nStatus; + _set_errno(0); + return (int)exit_code; } int CDECL _wsystem(const wchar_t* cmd) { - FIXME("_wsystem stub\n"); - return -1; + wchar_t *cmdline = NULL; + wchar_t *comspec = NULL; + PROCESS_INFORMATION process_info; + STARTUPINFOW startup_info; + BOOL result; + DWORD exit_code; + wchar_t cmd_exe[MAX_PATH]; + + comspec = _wgetenv(L"COMSPEC"); + + /* _wsystem should return 0 if cmd is null and the shell is found */ + if (cmd == NULL) + { + return (comspec == NULL) ? 0 : 1; + } + + if (comspec == NULL || GetFileAttributesW(comspec) == INVALID_FILE_ATTRIBUTES) + { + GetSystemDirectoryW(cmd_exe, _countof(cmd_exe)); + wcscat(cmd_exe, L"\\cmd.exe"); + comspec = cmd_exe; + } + + cmdline = LocalAlloc(LPTR, (1 + wcslen(comspec) + 5 + wcslen(cmd) + 1) * sizeof(wchar_t)); + if (cmdline == NULL) + { + _dosmaperr(GetLastError()); + return -1; + } + + wcscpy(cmdline, L"\""); + wcscat(cmdline, comspec); + wcscat(cmdline, L"\" /C "); + wcscat(cmdline, cmd); + + /* command file has invalid format ENOEXEC */ + + memset(&startup_info, 0, sizeof(startup_info)); + startup_info.cb = sizeof(startup_info); + startup_info.dwFlags = STARTF_USESHOWWINDOW; + startup_info.wShowWindow = SW_SHOWDEFAULT; + + /* In order to disable Ctrl+C, the process is created with CREATE_NEW_PROCESS_GROUP. + Thus, SetConsoleCtrlHandler(NULL, TRUE) is made on behalf of the new process. */ + + /* SIGCHILD should be blocked as well */ + + /* Create the process to execute the command */ + result = CreateProcessW(comspec, + cmdline, + NULL, + NULL, + TRUE, + CREATE_NEW_PROCESS_GROUP, + NULL, + NULL, + &startup_info, + &process_info); + LocalFree(cmdline); + + if (!result) + { + _dosmaperr(GetLastError()); + return -1; + } + + CloseHandle(process_info.hThread); + + /* Wait for the process to exit */ + WaitForSingleObject(process_info.hProcess, INFINITE); + GetExitCodeProcess(process_info.hProcess, &exit_code); + + CloseHandle(process_info.hProcess); + + _set_errno(0); + return (int)exit_code; }

1 0

[reactos] 01/01: [MSPAINT] Treat as a file even if the bitmap file is empty
by Atharva Kulkarni 05 Mar '23

05 Mar '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=72974d2bac6f2802d7f23… commit 72974d2bac6f2802d7f232c848573996cd99c9f0 Author: Atharva Kulkarni <atharvak1910(a)gmail.com> AuthorDate: Sun Mar 5 17:23:38 2023 +0530 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Mar 5 20:53:38 2023 +0900 [MSPAINT] Treat as a file even if the bitmap file is empty CORE-18508 --- base/applications/mspaint/dib.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/base/applications/mspaint/dib.cpp b/base/applications/mspaint/dib.cpp index 01c23fa84bf..529d7c91ee4 100644 --- a/base/applications/mspaint/dib.cpp +++ b/base/applications/mspaint/dib.cpp @@ -118,7 +118,6 @@ HBITMAP SetBitmapAndInfo(HBITMAP hBitmap, LPCTSTR name, DWORD dwFileSize, BOOL i fileHPPM = fileVPPM = 2834; ZeroMemory(&fileTime, sizeof(fileTime)); - isFile = FALSE; } else {

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