Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 02/02: [USETUP] Minor improvements when initializing the console.
by Hermès Bélusca-Maïto 02 Jan '21

02 Jan '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0abff65a5520d6e926d36… commit 0abff65a5520d6e926d364edc6df6e10f2b46155 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jan 3 00:10:03 2021 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jan 3 00:27:54 2021 +0100 [USETUP] Minor improvements when initializing the console. - Use NT values for uninitialized handle values. - Cache the STD_INPUT_HANDLE. - Free the console if GetConsoleScreenBufferInfo() fails in CONSOLE_Init(). --- base/setup/usetup/consup.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/base/setup/usetup/consup.c b/base/setup/usetup/consup.c index 2a5336cb5e5..e72c43106e6 100644 --- a/base/setup/usetup/consup.c +++ b/base/setup/usetup/consup.c @@ -33,8 +33,8 @@ /* GLOBALS ******************************************************************/ -HANDLE StdInput = INVALID_HANDLE_VALUE; -HANDLE StdOutput = INVALID_HANDLE_VALUE; +HANDLE StdInput = NULL; +HANDLE StdOutput = NULL; SHORT xScreen = 0; SHORT yScreen = 0; @@ -45,15 +45,24 @@ BOOLEAN CONSOLE_Init(VOID) { CONSOLE_SCREEN_BUFFER_INFO csbi; + + /* Allocate a new console */ if (!AllocConsole()) return FALSE; - StdInput = GetStdHandle(STD_INPUT_HANDLE); + /* Get the standard handles */ + StdInput = GetStdHandle(STD_INPUT_HANDLE); StdOutput = GetStdHandle(STD_OUTPUT_HANDLE); + + /* Retrieve the size of the console */ if (!GetConsoleScreenBufferInfo(StdOutput, &csbi)) + { + FreeConsole(); return FALSE; + } xScreen = csbi.dwSize.X; yScreen = csbi.dwSize.Y; + return TRUE; } @@ -175,7 +184,7 @@ CONSOLE_GetCursorXY( { CONSOLE_SCREEN_BUFFER_INFO csbi; - GetConsoleScreenBufferInfo(GetStdHandle(STD_OUTPUT_HANDLE), &csbi); + GetConsoleScreenBufferInfo(StdOutput, &csbi); *x = csbi.dwCursorPosition.X; *y = csbi.dwCursorPosition.Y;

1 0

[reactos] 01/02: [USETUP] Fix handling of the ESCAPE key.
by Hermès Bélusca-Maïto 02 Jan '21

02 Jan '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8b94515bd3378a39fdd57… commit 8b94515bd3378a39fdd57b67fdf5458309c4f5f4 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Jan 2 19:34:22 2021 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jan 3 00:27:50 2021 +0100 [USETUP] Fix handling of the ESCAPE key. Its AsciiChar is not zero in Console-compatible code. --- base/setup/usetup/usetup.c | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index e8de2666026..ea09d5dd9af 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -948,8 +948,7 @@ RepairIntroPage(PINPUT_RECORD Ir) { return RECOVERY_PAGE; } - else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && - (Ir->Event.KeyEvent.wVirtualKeyCode == VK_ESCAPE)) /* ESC */ + else if (Ir->Event.KeyEvent.wVirtualKeyCode == VK_ESCAPE) /* ESC */ { return WELCOME_PAGE; } @@ -1051,17 +1050,17 @@ UpgradeRepairPage(PINPUT_RECORD Ir) RedrawGenericList(&ListUi); break; } - case VK_ESCAPE: /* ESC */ - { - RestoreGenericListUiState(&ListUi); - // return nextPage; // prevPage; - - // return INSTALL_INTRO_PAGE; - return DEVICE_SETTINGS_PAGE; - // return SCSI_CONTROLLER_PAGE; - } } } + else if (Ir->Event.KeyEvent.wVirtualKeyCode == VK_ESCAPE) /* ESC */ + { + RestoreGenericListUiState(&ListUi); + // return nextPage; // prevPage; + + // return INSTALL_INTRO_PAGE; + return DEVICE_SETTINGS_PAGE; + // return SCSI_CONTROLLER_PAGE; + } else { // switch (toupper(Ir->Event.KeyEvent.uChar.AsciiChar)) @@ -1411,8 +1410,7 @@ HandleGenericList(PGENERIC_LIST_UI ListUi, else RedrawGenericList(ListUi); } - else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && - (Ir->Event.KeyEvent.wVirtualKeyCode == VK_ESCAPE)) /* ESC */ + else if (Ir->Event.KeyEvent.wVirtualKeyCode == VK_ESCAPE) /* ESC */ { RestoreGenericListUiState(ListUi); return nextPage; // Use some "prevPage;" instead? @@ -3279,8 +3277,7 @@ SelectFileSystemPage(PINPUT_RECORD Ir) break; } - else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && - (Ir->Event.KeyEvent.wVirtualKeyCode == VK_ESCAPE)) /* ESC */ + else if (Ir->Event.KeyEvent.wVirtualKeyCode == VK_ESCAPE) /* ESC */ { /* Reset the formatter machine state */ TempPartition = NULL;

1 0

[reactos] 01/01: [SYSSETUP][INF] Add event log settings to the default security settings and apply them on setup
by Eric Kohl 02 Jan '21

02 Jan '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=16532170de6d081fd4674… commit 16532170de6d081fd4674352aaab7bb40d30691d Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Jan 2 21:18:18 2021 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Jan 2 21:18:18 2021 +0100 [SYSSETUP][INF] Add event log settings to the default security settings and apply them on setup --- dll/win32/syssetup/security.c | 148 ++++++++++++++++++++++++++++++++++++++++++ media/inf/defltwk.inf | 18 +++++ 2 files changed, 166 insertions(+) diff --git a/dll/win32/syssetup/security.c b/dll/win32/syssetup/security.c index aeba7229bac..0bf4167ebc0 100644 --- a/dll/win32/syssetup/security.c +++ b/dll/win32/syssetup/security.c @@ -586,6 +586,150 @@ ApplyRegistryValues( } +static +VOID +ApplyEventlogSettings( + _In_ HINF hSecurityInf, + _In_ PWSTR pszSectionName, + _In_ PWSTR pszLogName) +{ + INFCONTEXT InfContext; + HKEY hServiceKey = NULL, hLogKey = NULL; + DWORD dwValue, dwError; + BOOL bValueSet; + + DPRINT("ApplyEventlogSettings(%p %S %S)\n", + hSecurityInf, pszSectionName, pszLogName); + + dwError = RegCreateKeyExW(HKEY_LOCAL_MACHINE, + L"System\\CurrentControlSet\\Services\\Eventlog", + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_WRITE, + NULL, + &hServiceKey, + NULL); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("Failed to create the Eventlog Service key (Error %lu)\n", dwError); + return; + } + + dwError = RegCreateKeyExW(hServiceKey, + pszLogName, + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_WRITE, + NULL, + &hLogKey, + NULL); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("Failed to create the key %S (Error %lu)\n", pszLogName, dwError); + RegCloseKey(hServiceKey); + return; + } + + if (SetupFindFirstLineW(hSecurityInf, + pszSectionName, + L"MaximumLogSize", + &InfContext)) + { + DPRINT("MaximumLogSize\n"); + dwValue = 0; + SetupGetIntField(&InfContext, + 1, + (PINT)&dwValue); + + DPRINT("MaximumLogSize: %lu (kByte)\n", dwValue); + if (dwValue >= 64 && dwValue <= 4194240) + { + dwValue *= 1024; + + DPRINT("MaxSize: %lu\n", dwValue); + RegSetValueEx(hLogKey, + L"MaxSize", + 0, + REG_DWORD, + (LPBYTE)&dwValue, + sizeof(dwValue)); + } + } + + if (SetupFindFirstLineW(hSecurityInf, + pszSectionName, + L"AuditLogRetentionPeriod", + &InfContext)) + { + bValueSet = FALSE; + dwValue = 0; + SetupGetIntField(&InfContext, + 1, + (PINT)&dwValue); + if (dwValue == 0) + { + bValueSet = TRUE; + } + else if (dwValue == 1) + { + if (SetupFindFirstLineW(hSecurityInf, + pszSectionName, + L"RetentionDays", + &InfContext)) + { + SetupGetIntField(&InfContext, + 1, + (PINT)&dwValue); + dwValue *= 86400; + bValueSet = TRUE; + } + } + else if (dwValue == 2) + { + dwValue = (DWORD)-1; + bValueSet = TRUE; + } + + if (bValueSet) + { + DPRINT("Retention: %lu\n", dwValue); + RegSetValueEx(hLogKey, + L"Retention", + 0, + REG_DWORD, + (LPBYTE)&dwValue, + sizeof(dwValue)); + } + } + + if (SetupFindFirstLineW(hSecurityInf, + pszSectionName, + L"RestrictGuestAccess", + &InfContext)) + { + dwValue = 0; + SetupGetIntField(&InfContext, + 1, + (PINT)&dwValue); + if (dwValue == 0 || dwValue == 1) + { + DPRINT("RestrictGuestAccess: %lu\n", dwValue); + RegSetValueEx(hLogKey, + L"RestrictGuestAccess", + 0, + REG_DWORD, + (LPBYTE)&dwValue, + sizeof(dwValue)); + } + } + + RegCloseKey(hLogKey); + RegCloseKey(hServiceKey); +} + + VOID InstallSecurity(VOID) { @@ -608,6 +752,10 @@ InstallSecurity(VOID) InstallPrivileges(hSecurityInf); ApplyRegistryValues(hSecurityInf); + ApplyEventlogSettings(hSecurityInf, L"Application Log", L"Application"); + ApplyEventlogSettings(hSecurityInf, L"Security Log", L"Security"); + ApplyEventlogSettings(hSecurityInf, L"System Log", L"System"); + SetupCloseInfFile(hSecurityInf); } diff --git a/media/inf/defltwk.inf b/media/inf/defltwk.inf index 29651c2f74c..d23b0d861ea 100644 --- a/media/inf/defltwk.inf +++ b/media/inf/defltwk.inf @@ -4,6 +4,24 @@ [Version] Signature = "$Windows NT$" +[Application Log] +MaximumLogSize = 512 +AuditLogRetentionPeriod = 1 +RetentionDays = 7 +RestrictGuestAccess = 1 + +[Security Log] +MaximumLogSize = 512 +AuditLogRetentionPeriod = 1 +RetentionDays = 7 +RestrictGuestAccess = 1 + +[System Log] +MaximumLogSize = 512 +AuditLogRetentionPeriod = 1 +RetentionDays = 7 +RestrictGuestAccess = 1 + [Privilege Rights] SeAssignPrimaryTokenPrivilege = *S-1-5-19, *S-1-5-20 SeAuditPrivilege = *S-1-5-19, *S-1-5-20

1 0

[reactos] 01/01: [ACPICA] Update to version 20201217. CORE-17410
by Thomas Faber 01 Jan '21

01 Jan '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9587fe1c36fbce0f963ed… commit 9587fe1c36fbce0f963edf47276c0caf3066cd4b Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sun Dec 27 16:01:03 2020 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Fri Jan 1 16:20:53 2021 +0100 [ACPICA] Update to version 20201217. CORE-17410 --- drivers/bus/acpi/acpica/dispatcher/dscontrol.c | 2 +- drivers/bus/acpi/acpica/dispatcher/dsdebug.c | 2 +- drivers/bus/acpi/acpica/dispatcher/dswexec.c | 3 +-- drivers/bus/acpi/acpica/dispatcher/dswload.c | 2 +- drivers/bus/acpi/acpica/dispatcher/dswload2.c | 2 +- drivers/bus/acpi/acpica/executer/exfldio.c | 2 +- drivers/bus/acpi/acpica/executer/exresop.c | 4 ++-- drivers/bus/acpi/acpica/executer/exstore.c | 4 ++-- drivers/bus/acpi/acpica/hardware/hwgpe.c | 2 +- drivers/bus/acpi/acpica/include/acexcep.h | 10 +++++----- drivers/bus/acpi/acpica/include/acpixf.h | 2 +- drivers/bus/acpi/acpica/include/actypes.h | 5 +++++ drivers/bus/acpi/acpica/include/platform/acgcc.h | 15 +++++++++++++++ drivers/bus/acpi/acpica/parser/psloop.c | 3 +-- drivers/bus/acpi/acpica/parser/psparse.c | 2 +- drivers/bus/acpi/acpica/utilities/utdelete.c | 2 +- drivers/bus/acpi/acpica/utilities/utstrsuppt.c | 4 ++-- media/doc/3rd Party Files.txt | 2 +- 18 files changed, 43 insertions(+), 25 deletions(-) diff --git a/drivers/bus/acpi/acpica/dispatcher/dscontrol.c b/drivers/bus/acpi/acpica/dispatcher/dscontrol.c index fda3db6f294..9c04f2b389e 100644 --- a/drivers/bus/acpi/acpica/dispatcher/dscontrol.c +++ b/drivers/bus/acpi/acpica/dispatcher/dscontrol.c @@ -102,7 +102,7 @@ AcpiDsExecBeginControlOp ( } } - /*lint -fallthrough */ + ACPI_FALLTHROUGH; case AML_IF_OP: /* diff --git a/drivers/bus/acpi/acpica/dispatcher/dsdebug.c b/drivers/bus/acpi/acpica/dispatcher/dsdebug.c index e7110e6017a..951346a12c4 100644 --- a/drivers/bus/acpi/acpica/dispatcher/dsdebug.c +++ b/drivers/bus/acpi/acpica/dispatcher/dsdebug.c @@ -146,7 +146,7 @@ AcpiDsDumpMethodStack ( /* Ignore control codes, they are not errors */ - if ((Status & AE_CODE_MASK) == AE_CODE_CONTROL) + if (ACPI_CNTL_EXCEPTION (Status)) { return_VOID; } diff --git a/drivers/bus/acpi/acpica/dispatcher/dswexec.c b/drivers/bus/acpi/acpica/dispatcher/dswexec.c index d9d79be2080..3057a9329d3 100644 --- a/drivers/bus/acpi/acpica/dispatcher/dswexec.c +++ b/drivers/bus/acpi/acpica/dispatcher/dswexec.c @@ -664,8 +664,7 @@ AcpiDsExecEndOp ( break; } - /* Fall through */ - /*lint -fallthrough */ + ACPI_FALLTHROUGH; case AML_INT_EVAL_SUBTREE_OP: diff --git a/drivers/bus/acpi/acpica/dispatcher/dswload.c b/drivers/bus/acpi/acpica/dispatcher/dswload.c index d3e11bc661e..62fd6e40481 100644 --- a/drivers/bus/acpi/acpica/dispatcher/dswload.c +++ b/drivers/bus/acpi/acpica/dispatcher/dswload.c @@ -267,7 +267,7 @@ AcpiDsLoad1BeginOp ( break; } - /*lint -fallthrough */ + ACPI_FALLTHROUGH; default: diff --git a/drivers/bus/acpi/acpica/dispatcher/dswload2.c b/drivers/bus/acpi/acpica/dispatcher/dswload2.c index a916eec7fd9..4e69244de27 100644 --- a/drivers/bus/acpi/acpica/dispatcher/dswload2.c +++ b/drivers/bus/acpi/acpica/dispatcher/dswload2.c @@ -258,7 +258,7 @@ AcpiDsLoad2BeginOp ( break; } - /*lint -fallthrough */ + ACPI_FALLTHROUGH; default: diff --git a/drivers/bus/acpi/acpica/executer/exfldio.c b/drivers/bus/acpi/acpica/executer/exfldio.c index c6fc6e0a496..ece5c19ba57 100644 --- a/drivers/bus/acpi/acpica/executer/exfldio.c +++ b/drivers/bus/acpi/acpica/executer/exfldio.c @@ -508,7 +508,7 @@ AcpiExFieldDatumIo ( * RegionField case and write the datum to the Operation Region */ - /*lint -fallthrough */ + ACPI_FALLTHROUGH; case ACPI_TYPE_LOCAL_REGION_FIELD: /* diff --git a/drivers/bus/acpi/acpica/executer/exresop.c b/drivers/bus/acpi/acpica/executer/exresop.c index e387a16de61..35f0f3a63f1 100644 --- a/drivers/bus/acpi/acpica/executer/exresop.c +++ b/drivers/bus/acpi/acpica/executer/exresop.c @@ -250,7 +250,7 @@ AcpiExResolveOperands ( TargetOp = AML_DEBUG_OP; - /*lint -fallthrough */ + ACPI_FALLTHROUGH; case ACPI_REFCLASS_ARG: case ACPI_REFCLASS_LOCAL: @@ -314,7 +314,7 @@ AcpiExResolveOperands ( * Else not a string - fall through to the normal Reference * case below */ - /*lint -fallthrough */ + ACPI_FALLTHROUGH; case ARGI_REFERENCE: /* References: */ case ARGI_INTEGER_REF: diff --git a/drivers/bus/acpi/acpica/executer/exstore.c b/drivers/bus/acpi/acpica/executer/exstore.c index 4e1cc8415a4..cb791ff2f68 100644 --- a/drivers/bus/acpi/acpica/executer/exstore.c +++ b/drivers/bus/acpi/acpica/executer/exstore.c @@ -140,7 +140,7 @@ AcpiExStore ( return_ACPI_STATUS (AE_OK); } - /*lint -fallthrough */ + ACPI_FALLTHROUGH; default: @@ -477,7 +477,7 @@ AcpiExStoreObjectToNode ( break; } - /* Fallthrough */ + ACPI_FALLTHROUGH; case ACPI_TYPE_DEVICE: case ACPI_TYPE_EVENT: diff --git a/drivers/bus/acpi/acpica/hardware/hwgpe.c b/drivers/bus/acpi/acpica/hardware/hwgpe.c index 69061928726..63f1335e225 100644 --- a/drivers/bus/acpi/acpica/hardware/hwgpe.c +++ b/drivers/bus/acpi/acpica/hardware/hwgpe.c @@ -146,7 +146,7 @@ AcpiHwLowSetGpe ( return (AE_BAD_PARAMETER); } - /*lint -fallthrough */ + ACPI_FALLTHROUGH; case ACPI_GPE_ENABLE: diff --git a/drivers/bus/acpi/acpica/include/acexcep.h b/drivers/bus/acpi/acpica/include/acexcep.h index 194f3a82732..e888ec9b2b4 100644 --- a/drivers/bus/acpi/acpica/include/acexcep.h +++ b/drivers/bus/acpi/acpica/include/acexcep.h @@ -96,11 +96,11 @@ typedef struct acpi_exception_info #define AE_OK (ACPI_STATUS) 0x0000 -#define ACPI_ENV_EXCEPTION(Status) (Status & AE_CODE_ENVIRONMENTAL) -#define ACPI_AML_EXCEPTION(Status) (Status & AE_CODE_AML) -#define ACPI_PROG_EXCEPTION(Status) (Status & AE_CODE_PROGRAMMER) -#define ACPI_TABLE_EXCEPTION(Status) (Status & AE_CODE_ACPI_TABLES) -#define ACPI_CNTL_EXCEPTION(Status) (Status & AE_CODE_CONTROL) +#define ACPI_ENV_EXCEPTION(Status) (((Status) & AE_CODE_MASK) == AE_CODE_ENVIRONMENTAL) +#define ACPI_AML_EXCEPTION(Status) (((Status) & AE_CODE_MASK) == AE_CODE_AML) +#define ACPI_PROG_EXCEPTION(Status) (((Status) & AE_CODE_MASK) == AE_CODE_PROGRAMMER) +#define ACPI_TABLE_EXCEPTION(Status) (((Status) & AE_CODE_MASK) == AE_CODE_ACPI_TABLES) +#define ACPI_CNTL_EXCEPTION(Status) (((Status) & AE_CODE_MASK) == AE_CODE_CONTROL) /* diff --git a/drivers/bus/acpi/acpica/include/acpixf.h b/drivers/bus/acpi/acpica/include/acpixf.h index 3c7ab0f7862..a3d25ab4d0d 100644 --- a/drivers/bus/acpi/acpica/include/acpixf.h +++ b/drivers/bus/acpi/acpica/include/acpixf.h @@ -46,7 +46,7 @@ /* Current ACPICA subsystem version in YYYYMMDD format */ -#define ACPI_CA_VERSION 0x20201113 +#define ACPI_CA_VERSION 0x20201217 #include "acconfig.h" #include "actypes.h" diff --git a/drivers/bus/acpi/acpica/include/actypes.h b/drivers/bus/acpi/acpica/include/actypes.h index 46d934635db..e4d7be2ba69 100644 --- a/drivers/bus/acpi/acpica/include/actypes.h +++ b/drivers/bus/acpi/acpica/include/actypes.h @@ -1429,5 +1429,10 @@ typedef enum #define ACPI_OPT_END -1 +/* Definitions for explicit fallthrough */ + +#ifndef ACPI_FALLTHROUGH +#define ACPI_FALLTHROUGH do {} while(0) +#endif #endif /* __ACTYPES_H__ */ diff --git a/drivers/bus/acpi/acpica/include/platform/acgcc.h b/drivers/bus/acpi/acpica/include/platform/acgcc.h index ca5e6c42842..9fa10fd6139 100644 --- a/drivers/bus/acpi/acpica/include/platform/acgcc.h +++ b/drivers/bus/acpi/acpica/include/platform/acgcc.h @@ -88,6 +88,21 @@ typedef __builtin_va_list va_list; #define ACPI_USE_NATIVE_MATH64 +/* GCC did not support __has_attribute until 5.1. */ + +#ifndef __has_attribute +#define __has_attribute(x) 0 +#endif + +/* + * Explictly mark intentional explicit fallthrough to silence + * -Wimplicit-fallthrough in GCC 7.1+. + */ + +#if __has_attribute(__fallthrough__) +#define ACPI_FALLTHROUGH __attribute__((__fallthrough__)) +#endif + #ifdef __REACTOS__ /* Flush CPU cache - used when going to sleep. Wbinvd or similar. */ diff --git a/drivers/bus/acpi/acpica/parser/psloop.c b/drivers/bus/acpi/acpica/parser/psloop.c index 22c11a318b5..305af2305e8 100644 --- a/drivers/bus/acpi/acpica/parser/psloop.c +++ b/drivers/bus/acpi/acpica/parser/psloop.c @@ -302,8 +302,7 @@ AcpiPsParseLoop ( */ WalkState->Op = NULL; Status = AcpiDsGetPredicateValue (WalkState, ACPI_TO_POINTER (TRUE)); - if (ACPI_FAILURE (Status) && - ((Status & AE_CODE_MASK) != AE_CODE_CONTROL)) + if (ACPI_FAILURE (Status) && !ACPI_CNTL_EXCEPTION (Status)) { if (Status == AE_AML_NO_RETURN_VALUE) { diff --git a/drivers/bus/acpi/acpica/parser/psparse.c b/drivers/bus/acpi/acpica/parser/psparse.c index 97c7be4d49f..9d934d35108 100644 --- a/drivers/bus/acpi/acpica/parser/psparse.c +++ b/drivers/bus/acpi/acpica/parser/psparse.c @@ -425,7 +425,7 @@ AcpiPsNextParseState ( default: Status = CallbackStatus; - if ((CallbackStatus & AE_CODE_MASK) == AE_CODE_CONTROL) + if (ACPI_CNTL_EXCEPTION (CallbackStatus)) { Status = AE_OK; } diff --git a/drivers/bus/acpi/acpica/utilities/utdelete.c b/drivers/bus/acpi/acpica/utilities/utdelete.c index a816dc7ea42..d7bcaff00eb 100644 --- a/drivers/bus/acpi/acpica/utilities/utdelete.c +++ b/drivers/bus/acpi/acpica/utilities/utdelete.c @@ -158,7 +158,7 @@ AcpiUtDeleteInternalObj ( (void) AcpiEvDeleteGpeBlock (Object->Device.GpeBlock); } - /*lint -fallthrough */ + ACPI_FALLTHROUGH; case ACPI_TYPE_PROCESSOR: case ACPI_TYPE_THERMAL: diff --git a/drivers/bus/acpi/acpica/utilities/utstrsuppt.c b/drivers/bus/acpi/acpica/utilities/utstrsuppt.c index 1a660c743b8..9f9ae123c0d 100644 --- a/drivers/bus/acpi/acpica/utilities/utstrsuppt.c +++ b/drivers/bus/acpi/acpica/utilities/utstrsuppt.c @@ -166,7 +166,7 @@ AcpiUtConvertDecimalString ( * 1) Runtime: terminate with no error, per the ACPI spec * 2) Compiler: return an error */ - if (!isdigit (*String)) + if (!isdigit ((int) *String)) { #ifdef ACPI_ASL_COMPILER Status = AE_BAD_DECIMAL_CONSTANT; @@ -228,7 +228,7 @@ AcpiUtConvertHexString ( * 1) Runtime: terminate with no error, per the ACPI spec * 2) Compiler: return an error */ - if (!isxdigit (*String)) + if (!isxdigit ((int) *String)) { #ifdef ACPI_ASL_COMPILER Status = AE_BAD_HEX_CONSTANT; diff --git a/media/doc/3rd Party Files.txt b/media/doc/3rd Party Files.txt index 4c5aa82804f..946ae6a5c6e 100644 --- a/media/doc/3rd Party Files.txt +++ b/media/doc/3rd Party Files.txt @@ -69,7 +69,7 @@ URL: https://gitlab.freedesktop.org/mesa/glu, ftp://ftp.freedesktop.org/pub/mesa Title: ACPICA Path: drivers/bus/acpi/acpica -Used Version: 20201113 +Used Version: 20201217 License: GPL-2.0 (https://spdx.org/licenses/GPL-2.0.html) URL: https://acpica.org/

1 0

[reactos] 01/01: [SYSSETUP] Rename defltws.inf to defltwk.inf
by Eric Kohl 01 Jan '21

01 Jan '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8de143e058c59b6e36d07… commit 8de143e058c59b6e36d07ec24922009898350592 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Fri Jan 1 11:14:28 2021 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Fri Jan 1 11:14:28 2021 +0100 [SYSSETUP] Rename defltws.inf to defltwk.inf --- dll/win32/syssetup/security.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/syssetup/security.c b/dll/win32/syssetup/security.c index 34bd9e4c987..aeba7229bac 100644 --- a/dll/win32/syssetup/security.c +++ b/dll/win32/syssetup/security.c @@ -595,7 +595,7 @@ InstallSecurity(VOID) // if (IsServer()) // pszSecurityInf = L"defltsv.inf"; // else - pszSecurityInf = L"defltws.inf"; + pszSecurityInf = L"defltwk.inf"; InstallBuiltinAccounts();

1 0

[reactos] 01/01: [INF] Rename defltws.inf to defltwk.inf
by Eric Kohl 01 Jan '21

01 Jan '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1627e446376e67ffeb314… commit 1627e446376e67ffeb314d57369c417f1c5fcf0a Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Fri Jan 1 11:12:36 2021 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Fri Jan 1 11:12:36 2021 +0100 [INF] Rename defltws.inf to defltwk.inf --- media/inf/CMakeLists.txt | 2 +- media/inf/{defltws.inf => defltwk.inf} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/media/inf/CMakeLists.txt b/media/inf/CMakeLists.txt index 92be65db3f6..3d67b82f841 100644 --- a/media/inf/CMakeLists.txt +++ b/media/inf/CMakeLists.txt @@ -31,7 +31,7 @@ list(APPEND INF_FILES wmiacpi.inf) list(APPEND UTF8_INF_FILES - defltws.inf + defltwk.inf font.inf intl.inf layout.inf) diff --git a/media/inf/defltws.inf b/media/inf/defltwk.inf similarity index 98% rename from media/inf/defltws.inf rename to media/inf/defltwk.inf index 512d347ecad..29651c2f74c 100644 --- a/media/inf/defltws.inf +++ b/media/inf/defltwk.inf @@ -1,4 +1,4 @@ -; defltws.inf +; defltwk.inf ; Default security settings for ReactOS Workstation [Version]

1 0

[reactos] 01/01: [SAMSRV][INF] Add missing aliases and privileges
by Eric Kohl 01 Jan '21

01 Jan '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f1e768c070297619e1323… commit f1e768c070297619e1323086c1f7aee4de5fba9d Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Fri Jan 1 10:24:36 2021 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Fri Jan 1 10:24:36 2021 +0100 [SAMSRV][INF] Add missing aliases and privileges - Add the 'Backup Operators', 'Replicator', 'RemoteDesktop Users' and 'Network Configuration Operators' aliases. - Add missing privileges for the aliases. Happy new year 2021! :-) --- dll/win32/samsrv/lang/de-DE.rc | 8 ++++++++ dll/win32/samsrv/lang/en-US.rc | 8 ++++++++ dll/win32/samsrv/lang/es-ES.rc | 8 ++++++++ dll/win32/samsrv/lang/hi-IN.rc | 8 ++++++++ dll/win32/samsrv/lang/hu-HU.rc | 8 ++++++++ dll/win32/samsrv/lang/it-IT.rc | 8 ++++++++ dll/win32/samsrv/lang/ja-JP.rc | 8 ++++++++ dll/win32/samsrv/lang/pl-PL.rc | 8 ++++++++ dll/win32/samsrv/lang/pt-PT.rc | 8 ++++++++ dll/win32/samsrv/lang/ro-RO.rc | 8 ++++++++ dll/win32/samsrv/lang/ru-RU.rc | 8 ++++++++ dll/win32/samsrv/lang/sq-AL.rc | 8 ++++++++ dll/win32/samsrv/lang/tr-TR.rc | 8 ++++++++ dll/win32/samsrv/lang/zh-CN.rc | 8 ++++++++ dll/win32/samsrv/lang/zh-TW.rc | 8 ++++++++ dll/win32/samsrv/resources.h | 33 +++++++++++++++++++++------------ dll/win32/samsrv/setup.c | 35 +++++++++++++++++++++++++++++++++++ media/inf/defltws.inf | 8 ++++---- 18 files changed, 180 insertions(+), 16 deletions(-) diff --git a/dll/win32/samsrv/lang/de-DE.rc b/dll/win32/samsrv/lang/de-DE.rc index f550e153aaf..a3ace8da4d2 100644 --- a/dll/win32/samsrv/lang/de-DE.rc +++ b/dll/win32/samsrv/lang/de-DE.rc @@ -13,6 +13,14 @@ BEGIN IDS_ALIAS_POWER_USERS_COMMENT "Hauptbenutzer besitzen die meisten Rechte mit einigen Einschränkungen." IDS_ALIAS_USERS_NAME "Benutzer" IDS_ALIAS_USERS_COMMENT "Benutzer können keine Änderungen am System vornehmen." + IDS_ALIAS_BACKUP_OPS_NAME "Sicherungs-Operator" + IDS_ALIAS_BACKUP_OPS_COMMENT "Sicherungs-Operatoren können Sicherheitseinschränkungen nur zum Sichern und Wiederherstellen von Dateien außer Kraft setzen." + IDS_ALIAS_REPLICATOR_NAME "Replikations-Operator" + IDS_ALIAS_REPLICATOR_COMMENT "Unterstützt Dateireplikation in Domänen." + IDS_ALIAS_REMOTE_DESKTOP_USERS_NAME "Remotedesktopbenutzer" + IDS_ALIAS_REMOTE_DESKTOP_USERS_COMMENT "Mitglieder dieser Gruppe haben die Berechtigung, sich remote anzumelden." + IDS_ALIAS_NETWORK_CONFIGURATION_OPS_NAME "Netzwerkkonfigurations-Operator" + IDS_ALIAS_NETWORK_CONFIGURATION_OPS_COMMENT "Mitglieder dieser Gruppe verfügen über einige Administratorrechte zum Verwalten der Konfiguration von Netzwerkfunktionen." /* * ATTENTION: * If you translate the administrator account name, keep IDS_USER_ADMINISTRATOR_NAME and diff --git a/dll/win32/samsrv/lang/en-US.rc b/dll/win32/samsrv/lang/en-US.rc index 214dc2bb3c0..c810e11229f 100644 --- a/dll/win32/samsrv/lang/en-US.rc +++ b/dll/win32/samsrv/lang/en-US.rc @@ -13,6 +13,14 @@ BEGIN IDS_ALIAS_POWER_USERS_COMMENT "Power Users have most administrative rights with some restrictions." IDS_ALIAS_USERS_NAME "Users" IDS_ALIAS_USERS_COMMENT "Users are prevented from making system-wide changes." + IDS_ALIAS_BACKUP_OPS_NAME "Backup Operators" + IDS_ALIAS_BACKUP_OPS_COMMENT "Backup Operators can override security restrictions for the sole purpose of backing up or resoring files" + IDS_ALIAS_REPLICATOR_NAME "Replicator" + IDS_ALIAS_REPLICATOR_COMMENT "Supports file replication in a domain" + IDS_ALIAS_REMOTE_DESKTOP_USERS_NAME "Remote Desktop Users" + IDS_ALIAS_REMOTE_DESKTOP_USERS_COMMENT "Members in this group are granted the right to logon remotely" + IDS_ALIAS_NETWORK_CONFIGURATION_OPS_NAME "Network Configuration Operators" + IDS_ALIAS_NETWORK_CONFIGURATION_OPS_COMMENT "Members in this group can have some administrative privileges to manage configuration of networking features" /* * ATTENTION: * If you translate the administrator account name, keep IDS_USER_ADMINISTRATOR_NAME and diff --git a/dll/win32/samsrv/lang/es-ES.rc b/dll/win32/samsrv/lang/es-ES.rc index 7abe9d7c438..3a30a78eaec 100644 --- a/dll/win32/samsrv/lang/es-ES.rc +++ b/dll/win32/samsrv/lang/es-ES.rc @@ -14,6 +14,14 @@ BEGIN IDS_ALIAS_POWER_USERS_COMMENT "Los usuarios avanzados obtienen la mayor parte de los derechos administrativos con algunas restricciones." IDS_ALIAS_USERS_NAME "Usuarios" IDS_ALIAS_USERS_COMMENT "Los usuarios no pueden hacer cambios que afecten al sistema." + IDS_ALIAS_BACKUP_OPS_NAME "Backup Operators" + IDS_ALIAS_BACKUP_OPS_COMMENT "Backup Operators can override security restrictions for the sole purpose of backing up or resoring files" + IDS_ALIAS_REPLICATOR_NAME "Replicator" + IDS_ALIAS_REPLICATOR_COMMENT "Supports file replication in a domain" + IDS_ALIAS_REMOTE_DESKTOP_USERS_NAME "Remote Desktop Users" + IDS_ALIAS_REMOTE_DESKTOP_USERS_COMMENT "Members in this group are granted the right to logon remotely" + IDS_ALIAS_NETWORK_CONFIGURATION_OPS_NAME "Network Configuration Operators" + IDS_ALIAS_NETWORK_CONFIGURATION_OPS_COMMENT "Members in this group can have some administrative privileges to manage configuration of networking features" /* * ATTENTION: * If you translate the administrator account name, keep IDS_USER_ADMINISTRATOR_NAME and diff --git a/dll/win32/samsrv/lang/hi-IN.rc b/dll/win32/samsrv/lang/hi-IN.rc index 01e71bc6074..0dd5934f3a0 100644 --- a/dll/win32/samsrv/lang/hi-IN.rc +++ b/dll/win32/samsrv/lang/hi-IN.rc @@ -20,6 +20,14 @@ BEGIN IDS_ALIAS_POWER_USERS_COMMENT "पावर उपयोगकर्ताओं के पास कुछ प्रतिबंधों के साथ अधिकांश प्रशासनिक अधिकार हैं।" IDS_ALIAS_USERS_NAME "उपयोगकर्ता" IDS_ALIAS_USERS_COMMENT "उपयोगकर्ताओं को सिस्टम-व्यापी परिवर्तन करने से रोका जाता है।" + IDS_ALIAS_BACKUP_OPS_NAME "Backup Operators" + IDS_ALIAS_BACKUP_OPS_COMMENT "Backup Operators can override security restrictions for the sole purpose of backing up or resoring files" + IDS_ALIAS_REPLICATOR_NAME "Replicator" + IDS_ALIAS_REPLICATOR_COMMENT "Supports file replication in a domain" + IDS_ALIAS_REMOTE_DESKTOP_USERS_NAME "Remote Desktop Users" + IDS_ALIAS_REMOTE_DESKTOP_USERS_COMMENT "Members in this group are granted the right to logon remotely" + IDS_ALIAS_NETWORK_CONFIGURATION_OPS_NAME "Network Configuration Operators" + IDS_ALIAS_NETWORK_CONFIGURATION_OPS_COMMENT "Members in this group can have some administrative privileges to manage configuration of networking features" /* * ATTENTION: * If you translate the administrator account name, keep IDS_USER_ADMINISTRATOR_NAME and diff --git a/dll/win32/samsrv/lang/hu-HU.rc b/dll/win32/samsrv/lang/hu-HU.rc index ffa6e19ced0..f478b4bcbd6 100644 --- a/dll/win32/samsrv/lang/hu-HU.rc +++ b/dll/win32/samsrv/lang/hu-HU.rc @@ -13,6 +13,14 @@ BEGIN IDS_ALIAS_POWER_USERS_COMMENT "A haladó felhasználók a legtöbb adminisztrációs joggal rendelkeznek, bizonyos korlátozásokkal." IDS_ALIAS_USERS_NAME "Felhasználók" IDS_ALIAS_USERS_COMMENT "A felhasználók nem tudnak rendszerszintű változtatásokat végrehajtani." + IDS_ALIAS_BACKUP_OPS_NAME "Backup Operators" + IDS_ALIAS_BACKUP_OPS_COMMENT "Backup Operators can override security restrictions for the sole purpose of backing up or resoring files" + IDS_ALIAS_REPLICATOR_NAME "Replicator" + IDS_ALIAS_REPLICATOR_COMMENT "Supports file replication in a domain" + IDS_ALIAS_REMOTE_DESKTOP_USERS_NAME "Remote Desktop Users" + IDS_ALIAS_REMOTE_DESKTOP_USERS_COMMENT "Members in this group are granted the right to logon remotely" + IDS_ALIAS_NETWORK_CONFIGURATION_OPS_NAME "Network Configuration Operators" + IDS_ALIAS_NETWORK_CONFIGURATION_OPS_COMMENT "Members in this group can have some administrative privileges to manage configuration of networking features" /* * ATTENTION: * If you translate the administrator account name, keep IDS_USER_ADMINISTRATOR_NAME and diff --git a/dll/win32/samsrv/lang/it-IT.rc b/dll/win32/samsrv/lang/it-IT.rc index 54682368b79..f31a8c6eba2 100644 --- a/dll/win32/samsrv/lang/it-IT.rc +++ b/dll/win32/samsrv/lang/it-IT.rc @@ -13,6 +13,14 @@ BEGIN IDS_ALIAS_POWER_USERS_COMMENT "Gli utenti avanzati hanno la maggior parte dei diritti amministrativi con alcune restrizioni." IDS_ALIAS_USERS_NAME "Utente" IDS_ALIAS_USERS_COMMENT "Gli utenti non possono apportare modifiche a livello di sistema." + IDS_ALIAS_BACKUP_OPS_NAME "Backup Operators" + IDS_ALIAS_BACKUP_OPS_COMMENT "Backup Operators can override security restrictions for the sole purpose of backing up or resoring files" + IDS_ALIAS_REPLICATOR_NAME "Replicator" + IDS_ALIAS_REPLICATOR_COMMENT "Supports file replication in a domain" + IDS_ALIAS_REMOTE_DESKTOP_USERS_NAME "Remote Desktop Users" + IDS_ALIAS_REMOTE_DESKTOP_USERS_COMMENT "Members in this group are granted the right to logon remotely" + IDS_ALIAS_NETWORK_CONFIGURATION_OPS_NAME "Network Configuration Operators" + IDS_ALIAS_NETWORK_CONFIGURATION_OPS_COMMENT "Members in this group can have some administrative privileges to manage configuration of networking features" /* * ATTENTION: * If you translate the administrator account name, keep IDS_USER_ADMINISTRATOR_NAME and diff --git a/dll/win32/samsrv/lang/ja-JP.rc b/dll/win32/samsrv/lang/ja-JP.rc index 6463a8784cb..a9ac1c943d8 100644 --- a/dll/win32/samsrv/lang/ja-JP.rc +++ b/dll/win32/samsrv/lang/ja-JP.rc @@ -13,6 +13,14 @@ BEGIN IDS_ALIAS_POWER_USERS_COMMENT "パワーユーザーは、いくつかの制限付きでほとんどの管理権限を持ちます。" IDS_ALIAS_USERS_NAME "ユーザー" IDS_ALIAS_USERS_COMMENT "ユーザーは、システム規模の変更をすることができません。" + IDS_ALIAS_BACKUP_OPS_NAME "Backup Operators" + IDS_ALIAS_BACKUP_OPS_COMMENT "Backup Operators can override security restrictions for the sole purpose of backing up or resoring files" + IDS_ALIAS_REPLICATOR_NAME "Replicator" + IDS_ALIAS_REPLICATOR_COMMENT "Supports file replication in a domain" + IDS_ALIAS_REMOTE_DESKTOP_USERS_NAME "Remote Desktop Users" + IDS_ALIAS_REMOTE_DESKTOP_USERS_COMMENT "Members in this group are granted the right to logon remotely" + IDS_ALIAS_NETWORK_CONFIGURATION_OPS_NAME "Network Configuration Operators" + IDS_ALIAS_NETWORK_CONFIGURATION_OPS_COMMENT "Members in this group can have some administrative privileges to manage configuration of networking features" /* * ATTENTION: * If you translate the administrator account name, keep IDS_USER_ADMINISTRATOR_NAME and diff --git a/dll/win32/samsrv/lang/pl-PL.rc b/dll/win32/samsrv/lang/pl-PL.rc index bb3a69dde88..5ba9f28f774 100644 --- a/dll/win32/samsrv/lang/pl-PL.rc +++ b/dll/win32/samsrv/lang/pl-PL.rc @@ -13,6 +13,14 @@ BEGIN IDS_ALIAS_POWER_USERS_COMMENT "Użytkownicy zaawansowani maja większość uprawnień administracyjnych, z kilkoma wyjątkami." IDS_ALIAS_USERS_NAME "Użytkownicy" IDS_ALIAS_USERS_COMMENT "Użytkownicy nie mogą dokonywać istotnych zmian w systemie." + IDS_ALIAS_BACKUP_OPS_NAME "Backup Operators" + IDS_ALIAS_BACKUP_OPS_COMMENT "Backup Operators can override security restrictions for the sole purpose of backing up or resoring files" + IDS_ALIAS_REPLICATOR_NAME "Replicator" + IDS_ALIAS_REPLICATOR_COMMENT "Supports file replication in a domain" + IDS_ALIAS_REMOTE_DESKTOP_USERS_NAME "Remote Desktop Users" + IDS_ALIAS_REMOTE_DESKTOP_USERS_COMMENT "Members in this group are granted the right to logon remotely" + IDS_ALIAS_NETWORK_CONFIGURATION_OPS_NAME "Network Configuration Operators" + IDS_ALIAS_NETWORK_CONFIGURATION_OPS_COMMENT "Members in this group can have some administrative privileges to manage configuration of networking features" /* * ATTENTION: * If you translate the administrator account name, keep IDS_USER_ADMINISTRATOR_NAME and diff --git a/dll/win32/samsrv/lang/pt-PT.rc b/dll/win32/samsrv/lang/pt-PT.rc index 76bb21c5f09..dff259f5dc9 100644 --- a/dll/win32/samsrv/lang/pt-PT.rc +++ b/dll/win32/samsrv/lang/pt-PT.rc @@ -13,6 +13,14 @@ BEGIN IDS_ALIAS_POWER_USERS_COMMENT "Utilizadores avançados têm a maioria dos direitos administrativos com algumas restrições." IDS_ALIAS_USERS_NAME "Utilizadores" IDS_ALIAS_USERS_COMMENT "Os utilizadores são impedidos de fazer alterações em todo o sistema." + IDS_ALIAS_BACKUP_OPS_NAME "Backup Operators" + IDS_ALIAS_BACKUP_OPS_COMMENT "Backup Operators can override security restrictions for the sole purpose of backing up or resoring files" + IDS_ALIAS_REPLICATOR_NAME "Replicator" + IDS_ALIAS_REPLICATOR_COMMENT "Supports file replication in a domain" + IDS_ALIAS_REMOTE_DESKTOP_USERS_NAME "Remote Desktop Users" + IDS_ALIAS_REMOTE_DESKTOP_USERS_COMMENT "Members in this group are granted the right to logon remotely" + IDS_ALIAS_NETWORK_CONFIGURATION_OPS_NAME "Network Configuration Operators" + IDS_ALIAS_NETWORK_CONFIGURATION_OPS_COMMENT "Members in this group can have some administrative privileges to manage configuration of networking features" /* * ATTENTION: * If you translate the administrator account name, keep IDS_USER_ADMINISTRATOR_NAME and diff --git a/dll/win32/samsrv/lang/ro-RO.rc b/dll/win32/samsrv/lang/ro-RO.rc index d6f2801210a..4282b8619f7 100644 --- a/dll/win32/samsrv/lang/ro-RO.rc +++ b/dll/win32/samsrv/lang/ro-RO.rc @@ -15,6 +15,14 @@ BEGIN IDS_ALIAS_POWER_USERS_COMMENT "Utilizatorii avansați posedă majoritatea drepturilor administrative cu unele restricții." IDS_ALIAS_USERS_NAME "Utilizatori" IDS_ALIAS_USERS_COMMENT "Utilizatorilor le este limitată capacitatea de a aduce modificări în sistem." + IDS_ALIAS_BACKUP_OPS_NAME "Backup Operators" + IDS_ALIAS_BACKUP_OPS_COMMENT "Backup Operators can override security restrictions for the sole purpose of backing up or resoring files" + IDS_ALIAS_REPLICATOR_NAME "Replicator" + IDS_ALIAS_REPLICATOR_COMMENT "Supports file replication in a domain" + IDS_ALIAS_REMOTE_DESKTOP_USERS_NAME "Remote Desktop Users" + IDS_ALIAS_REMOTE_DESKTOP_USERS_COMMENT "Members in this group are granted the right to logon remotely" + IDS_ALIAS_NETWORK_CONFIGURATION_OPS_NAME "Network Configuration Operators" + IDS_ALIAS_NETWORK_CONFIGURATION_OPS_COMMENT "Members in this group can have some administrative privileges to manage configuration of networking features" /* * ATTENTION: * If you translate the administrator account name, keep IDS_USER_ADMINISTRATOR_NAME and diff --git a/dll/win32/samsrv/lang/ru-RU.rc b/dll/win32/samsrv/lang/ru-RU.rc index ac3300b6158..f63ce09b2c5 100644 --- a/dll/win32/samsrv/lang/ru-RU.rc +++ b/dll/win32/samsrv/lang/ru-RU.rc @@ -15,6 +15,14 @@ BEGIN IDS_ALIAS_POWER_USERS_COMMENT "Категория опытных пользователей обладает ограниченными административными правами." IDS_ALIAS_USERS_NAME "Пользователи" IDS_ALIAS_USERS_COMMENT "Пользователи не имеют прав на изменение параметров системы и могут запускать большинство приложений." + IDS_ALIAS_BACKUP_OPS_NAME "Backup Operators" + IDS_ALIAS_BACKUP_OPS_COMMENT "Backup Operators can override security restrictions for the sole purpose of backing up or resoring files" + IDS_ALIAS_REPLICATOR_NAME "Replicator" + IDS_ALIAS_REPLICATOR_COMMENT "Supports file replication in a domain" + IDS_ALIAS_REMOTE_DESKTOP_USERS_NAME "Remote Desktop Users" + IDS_ALIAS_REMOTE_DESKTOP_USERS_COMMENT "Members in this group are granted the right to logon remotely" + IDS_ALIAS_NETWORK_CONFIGURATION_OPS_NAME "Network Configuration Operators" + IDS_ALIAS_NETWORK_CONFIGURATION_OPS_COMMENT "Members in this group can have some administrative privileges to manage configuration of networking features" /* * ATTENTION: * If you translate the administrator account name, keep IDS_USER_ADMINISTRATOR_NAME and diff --git a/dll/win32/samsrv/lang/sq-AL.rc b/dll/win32/samsrv/lang/sq-AL.rc index cf0f13c719d..4dd2d2465cc 100644 --- a/dll/win32/samsrv/lang/sq-AL.rc +++ b/dll/win32/samsrv/lang/sq-AL.rc @@ -17,6 +17,14 @@ BEGIN IDS_ALIAS_POWER_USERS_COMMENT "Përdorues të Fuqishëm katë të drejta administrative me disa kufizime." IDS_ALIAS_USERS_NAME "Përdoruesit" IDS_ALIAS_USERS_COMMENT "Përdoruesit janë të penguar për ndryshim bërje të gjërave të sistemit." + IDS_ALIAS_BACKUP_OPS_NAME "Backup Operators" + IDS_ALIAS_BACKUP_OPS_COMMENT "Backup Operators can override security restrictions for the sole purpose of backing up or resoring files" + IDS_ALIAS_REPLICATOR_NAME "Replicator" + IDS_ALIAS_REPLICATOR_COMMENT "Supports file replication in a domain" + IDS_ALIAS_REMOTE_DESKTOP_USERS_NAME "Remote Desktop Users" + IDS_ALIAS_REMOTE_DESKTOP_USERS_COMMENT "Members in this group are granted the right to logon remotely" + IDS_ALIAS_NETWORK_CONFIGURATION_OPS_NAME "Network Configuration Operators" + IDS_ALIAS_NETWORK_CONFIGURATION_OPS_COMMENT "Members in this group can have some administrative privileges to manage configuration of networking features" /* * ATTENTION: * If you translate the administrator account name, keep IDS_USER_ADMINISTRATOR_NAME and diff --git a/dll/win32/samsrv/lang/tr-TR.rc b/dll/win32/samsrv/lang/tr-TR.rc index 235d84a07be..d18c6d75472 100644 --- a/dll/win32/samsrv/lang/tr-TR.rc +++ b/dll/win32/samsrv/lang/tr-TR.rc @@ -15,6 +15,14 @@ BEGIN IDS_ALIAS_POWER_USERS_COMMENT "Güçlü Kullanıcılar, birtakım kısıtlamalarla çoğu yönetim yetkilerine iyedir." IDS_ALIAS_USERS_NAME "Kullanıcılar" IDS_ALIAS_USERS_COMMENT "Kullanıcılar, dizge değişiklikleri yapmaktan alıkonulmuştur." + IDS_ALIAS_BACKUP_OPS_NAME "Backup Operators" + IDS_ALIAS_BACKUP_OPS_COMMENT "Backup Operators can override security restrictions for the sole purpose of backing up or resoring files" + IDS_ALIAS_REPLICATOR_NAME "Replicator" + IDS_ALIAS_REPLICATOR_COMMENT "Supports file replication in a domain" + IDS_ALIAS_REMOTE_DESKTOP_USERS_NAME "Remote Desktop Users" + IDS_ALIAS_REMOTE_DESKTOP_USERS_COMMENT "Members in this group are granted the right to logon remotely" + IDS_ALIAS_NETWORK_CONFIGURATION_OPS_NAME "Network Configuration Operators" + IDS_ALIAS_NETWORK_CONFIGURATION_OPS_COMMENT "Members in this group can have some administrative privileges to manage configuration of networking features" /* * ATTENTION: * If you translate the administrator account name, keep IDS_USER_ADMINISTRATOR_NAME and diff --git a/dll/win32/samsrv/lang/zh-CN.rc b/dll/win32/samsrv/lang/zh-CN.rc index e5d863d33a7..5e65630bdd9 100644 --- a/dll/win32/samsrv/lang/zh-CN.rc +++ b/dll/win32/samsrv/lang/zh-CN.rc @@ -16,6 +16,14 @@ BEGIN IDS_ALIAS_POWER_USERS_COMMENT "高级用户拥有大多数管理权限，但存在一些限制。" IDS_ALIAS_USERS_NAME "用户" IDS_ALIAS_USERS_COMMENT "防止用户进行对系统进行全面更改。" + IDS_ALIAS_BACKUP_OPS_NAME "Backup Operators" + IDS_ALIAS_BACKUP_OPS_COMMENT "Backup Operators can override security restrictions for the sole purpose of backing up or resoring files" + IDS_ALIAS_REPLICATOR_NAME "Replicator" + IDS_ALIAS_REPLICATOR_COMMENT "Supports file replication in a domain" + IDS_ALIAS_REMOTE_DESKTOP_USERS_NAME "Remote Desktop Users" + IDS_ALIAS_REMOTE_DESKTOP_USERS_COMMENT "Members in this group are granted the right to logon remotely" + IDS_ALIAS_NETWORK_CONFIGURATION_OPS_NAME "Network Configuration Operators" + IDS_ALIAS_NETWORK_CONFIGURATION_OPS_COMMENT "Members in this group can have some administrative privileges to manage configuration of networking features" /* * ATTENTION: * If you translate the administrator account name, keep IDS_USER_ADMINISTRATOR_NAME and diff --git a/dll/win32/samsrv/lang/zh-TW.rc b/dll/win32/samsrv/lang/zh-TW.rc index 01d85d0935d..17a122af24f 100644 --- a/dll/win32/samsrv/lang/zh-TW.rc +++ b/dll/win32/samsrv/lang/zh-TW.rc @@ -16,6 +16,14 @@ BEGIN IDS_ALIAS_POWER_USERS_COMMENT "進階使用者擁有大多數管理權限，但存在一些限制。" IDS_ALIAS_USERS_NAME "使用者" IDS_ALIAS_USERS_COMMENT "防止使用者對系統進行全面變更。" + IDS_ALIAS_BACKUP_OPS_NAME "Backup Operators" + IDS_ALIAS_BACKUP_OPS_COMMENT "Backup Operators can override security restrictions for the sole purpose of backing up or resoring files" + IDS_ALIAS_REPLICATOR_NAME "Replicator" + IDS_ALIAS_REPLICATOR_COMMENT "Supports file replication in a domain" + IDS_ALIAS_REMOTE_DESKTOP_USERS_NAME "Remote Desktop Users" + IDS_ALIAS_REMOTE_DESKTOP_USERS_COMMENT "Members in this group are granted the right to logon remotely" + IDS_ALIAS_NETWORK_CONFIGURATION_OPS_NAME "Network Configuration Operators" + IDS_ALIAS_NETWORK_CONFIGURATION_OPS_COMMENT "Members in this group can have some administrative privileges to manage configuration of networking features" /* * ATTENTION: * If you translate the administrator account name, keep IDS_USER_ADMINISTRATOR_NAME and diff --git a/dll/win32/samsrv/resources.h b/dll/win32/samsrv/resources.h index bcf472cb7c7..d67d496bca5 100644 --- a/dll/win32/samsrv/resources.h +++ b/dll/win32/samsrv/resources.h @@ -13,16 +13,25 @@ #define IDS_GROUP_NONE_NAME 110 #define IDS_GROUP_NONE_COMMENT 111 -#define IDS_ALIAS_ADMINISTRATORS_NAME 120 -#define IDS_ALIAS_ADMINISTRATORS_COMMENT 121 -#define IDS_ALIAS_GUESTS_NAME 122 -#define IDS_ALIAS_GUESTS_COMMENT 123 -#define IDS_ALIAS_POWER_USERS_NAME 124 -#define IDS_ALIAS_POWER_USERS_COMMENT 125 -#define IDS_ALIAS_USERS_NAME 126 -#define IDS_ALIAS_USERS_COMMENT 127 +#define IDS_ALIAS_ADMINISTRATORS_NAME 120 +#define IDS_ALIAS_ADMINISTRATORS_COMMENT 121 +#define IDS_ALIAS_GUESTS_NAME 122 +#define IDS_ALIAS_GUESTS_COMMENT 123 +#define IDS_ALIAS_POWER_USERS_NAME 124 +#define IDS_ALIAS_POWER_USERS_COMMENT 125 +#define IDS_ALIAS_USERS_NAME 126 +#define IDS_ALIAS_USERS_COMMENT 127 +#define IDS_ALIAS_BACKUP_OPS_NAME 128 +#define IDS_ALIAS_BACKUP_OPS_COMMENT 129 +#define IDS_ALIAS_REPLICATOR_NAME 130 +#define IDS_ALIAS_REPLICATOR_COMMENT 131 +#define IDS_ALIAS_REMOTE_DESKTOP_USERS_NAME 132 +#define IDS_ALIAS_REMOTE_DESKTOP_USERS_COMMENT 133 +#define IDS_ALIAS_NETWORK_CONFIGURATION_OPS_NAME 134 +#define IDS_ALIAS_NETWORK_CONFIGURATION_OPS_COMMENT 135 -#define IDS_USER_ADMINISTRATOR_NAME 140 -#define IDS_USER_ADMINISTRATOR_COMMENT 141 -#define IDS_USER_GUEST_NAME 142 -#define IDS_USER_GUEST_COMMENT 143 + +#define IDS_USER_ADMINISTRATOR_NAME 160 +#define IDS_USER_ADMINISTRATOR_COMMENT 161 +#define IDS_USER_GUEST_NAME 162 +#define IDS_USER_GUEST_COMMENT 163 diff --git a/dll/win32/samsrv/setup.c b/dll/win32/samsrv/setup.c index e9a618c6728..210039f938a 100644 --- a/dll/win32/samsrv/setup.c +++ b/dll/win32/samsrv/setup.c @@ -1022,6 +1022,41 @@ SampInitializeSAM(VOID) szComment, DOMAIN_ALIAS_RID_POWER_USERS); + /* Create the Backup Operators alias */ + SampLoadString(hInstance, IDS_ALIAS_BACKUP_OPS_NAME, szName, 80); + SampLoadString(hInstance, IDS_ALIAS_BACKUP_OPS_COMMENT, szComment, 256); + + SampSetupCreateAliasAccount(hBuiltinDomainKey, + szName, + szComment, + DOMAIN_ALIAS_RID_BACKUP_OPS); + + /* Create the Replicator alias */ + SampLoadString(hInstance, IDS_ALIAS_REPLICATOR_NAME, szName, 80); + SampLoadString(hInstance, IDS_ALIAS_REPLICATOR_COMMENT, szComment, 256); + + SampSetupCreateAliasAccount(hBuiltinDomainKey, + szName, + szComment, + DOMAIN_ALIAS_RID_REPLICATOR); + + /* Create the Remote Desktop Users alias */ + SampLoadString(hInstance, IDS_ALIAS_REMOTE_DESKTOP_USERS_NAME, szName, 80); + SampLoadString(hInstance, IDS_ALIAS_REMOTE_DESKTOP_USERS_COMMENT, szComment, 256); + + SampSetupCreateAliasAccount(hBuiltinDomainKey, + szName, + szComment, + DOMAIN_ALIAS_RID_REMOTE_DESKTOP_USERS); + + /* Create the Network Configuration Operators alias */ + SampLoadString(hInstance, IDS_ALIAS_NETWORK_CONFIGURATION_OPS_NAME, szName, 80); + SampLoadString(hInstance, IDS_ALIAS_NETWORK_CONFIGURATION_OPS_COMMENT, szComment, 256); + + SampSetupCreateAliasAccount(hBuiltinDomainKey, + szName, + szComment, + DOMAIN_ALIAS_RID_NETWORK_CONFIGURATION_OPS); /* Add the Administrator user to the Administrators alias */ pSid = AppendRidToSid(AccountDomainInfo->DomainSid, diff --git a/media/inf/defltws.inf b/media/inf/defltws.inf index a2039441f3a..512d347ecad 100644 --- a/media/inf/defltws.inf +++ b/media/inf/defltws.inf @@ -7,9 +7,9 @@ Signature = "$Windows NT$" [Privilege Rights] SeAssignPrimaryTokenPrivilege = *S-1-5-19, *S-1-5-20 SeAuditPrivilege = *S-1-5-19, *S-1-5-20 -SeBackupPrivilege = *S-1-5-32-544 +SeBackupPrivilege = *S-1-5-32-544, *S-1-5-32-551 SeBatchLogonRight = -SeChangeNotifyPrivilege = *S-1-1-0, *S-1-5-32-544, *S-1-5-32-545 +SeChangeNotifyPrivilege = *S-1-1-0, *S-1-5-32-544, *S-1-5-32-545, *S-1-5-32-551 SeCreatePagefilePrivilege = *S-1-5-32-544 SeCreateGlobalPrivilege = *S-1-5-4, *S-1-5-6, *S-1-5-32-544 SeCreatePermanentPrivilege = @@ -33,10 +33,10 @@ SeNetworkLogonRight = *S-1-1-0, *S-1-5-32-544, *S-1-5-32-545, *S-1-5-32-547, *S SeProfileSingleProcessPrivilege = *S-1-5-32-544 SeRemoteInteractiveLogonRight = *S-1-5-32-544, *S-1-5-32-555 SeRemoteShutdownPrivilege = *S-1-5-32-544 -SeRestorePrivilege = *S-1-5-32-544 +SeRestorePrivilege = *S-1-5-32-544, *S-1-5-32-551 SeSecurityPrivilege = *S-1-5-32-544 SeServiceLogonRight = -SeShutdownPrivilege = *S-1-5-32-544, *S-1-5-32-545 +SeShutdownPrivilege = *S-1-5-32-544, *S-1-5-32-545, *S-1-5-32-551 SeSyncAgentPrivilege = SeSystemEnvironmentPrivilege = *S-1-5-32-544 SeSystemProfilePrivilege = *S-1-5-32-544

1 0

[reactos] 01/01: Happy New Year 2021 to the ReactOS Community!!
by Hermès Bélusca-Maïto 31 Dec '20

31 Dec '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b570fac18b82c4412a605… commit b570fac18b82c4412a6050b335162182152e4048 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Jan 1 00:00:00 2021 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Jan 1 00:00:00 2021 +0100 Happy New Year 2021 to the ReactOS Community!! ⚛️ 🍾 🥳 🎆 ☢️ --- dll/win32/msgina/resources/reactos.bmp | Bin 89334 -> 89334 bytes dll/win32/msgina/resources/reactos.svg | 2 +- dll/win32/shell32/res/bitmaps/reactos.bmp | Bin 89334 -> 89334 bytes ntoskrnl/inbv/resources/copyright.bmp | Bin 1852 -> 1830 bytes sdk/include/reactos/version.cmake | 2 +- 5 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/win32/msgina/resources/reactos.bmp b/dll/win32/msgina/resources/reactos.bmp index bfee4ff308f..4c722f5fc40 100644 Binary files a/dll/win32/msgina/resources/reactos.bmp and b/dll/win32/msgina/resources/reactos.bmp differ diff --git a/dll/win32/msgina/resources/reactos.svg b/dll/win32/msgina/resources/reactos.svg index 5edfb2604e4..b7b16388f2e 100644 --- a/dll/win32/msgina/resources/reactos.svg +++ b/dll/win32/msgina/resources/reactos.svg @@ -1930,7 +1930,7 @@ x="5.59375" y="1047.7255" style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#1e2122;fill-opacity:1;font-family:Lucida Sans Unicode;-inkscape-font-specification:Lucida Sans Unicode" - id="tspan3618">Copyright © 1996-2020 ReactOS Team & Contributors</tspan></text> + id="tspan3618">Copyright © 1996-2021 ReactOS Team & Contributors</tspan></text> <g transform="matrix(0.16958533,0,0,0.16958533,89.849943,981.79073)" id="g15501"> diff --git a/dll/win32/shell32/res/bitmaps/reactos.bmp b/dll/win32/shell32/res/bitmaps/reactos.bmp index bfee4ff308f..4c722f5fc40 100644 Binary files a/dll/win32/shell32/res/bitmaps/reactos.bmp and b/dll/win32/shell32/res/bitmaps/reactos.bmp differ diff --git a/ntoskrnl/inbv/resources/copyright.bmp b/ntoskrnl/inbv/resources/copyright.bmp index 1226788f7f7..53e0c83f4b5 100644 Binary files a/ntoskrnl/inbv/resources/copyright.bmp and b/ntoskrnl/inbv/resources/copyright.bmp differ diff --git a/sdk/include/reactos/version.cmake b/sdk/include/reactos/version.cmake index 4566a6a0ef7..8d326087e0b 100644 --- a/sdk/include/reactos/version.cmake +++ b/sdk/include/reactos/version.cmake @@ -9,7 +9,7 @@ endif() set(KERNEL_VERSION_MAJOR "0") set(KERNEL_VERSION_MINOR "4") set(KERNEL_VERSION_PATCH_LEVEL "15") -set(COPYRIGHT_YEAR "2020") +set(COPYRIGHT_YEAR "2021") # KERNEL_VERSION_BUILD_TYPE is "dev" for Git builds # or "RC1", "RC2", "" for releases.

1 0

[reactos] 01/01: [UNIATA] Properly mark ReactOS diff from upstream
by Stanislav Motylkov 31 Dec '20

31 Dec '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=88d36c93a27f5d764027e… commit 88d36c93a27f5d764027e2475c84bdde1a84c4a6 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Thu Dec 31 22:14:39 2020 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Thu Dec 31 22:14:39 2020 +0300 [UNIATA] Properly mark ReactOS diff from upstream Addendum to 4b9cf2e (r71252), d14a872 (r73324), 7d65f2a (r71262), and 6c0ff7b. CORE-11157 CORE-16078 --- drivers/storage/ide/uniata/bm_devs.h | 12 ++++++++++-- drivers/storage/ide/uniata/id_ata.cpp | 1 + 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/storage/ide/uniata/bm_devs.h b/drivers/storage/ide/uniata/bm_devs.h index 78893e42c90..dc1ddeddc91 100644 --- a/drivers/storage/ide/uniata/bm_devs.h +++ b/drivers/storage/ide/uniata/bm_devs.h @@ -352,7 +352,11 @@ BUSMASTER_CONTROLLER_INFORMATION_BASE const BusMasterAdapters[] = { PCI_DEV_HW_SPEC_BM( 9d05, 8086, 0x00, ATA_SA300, "Intel Sunrise Point-LP" , UNIATA_SATA | UNIATA_AHCI | UNIATA_RAID_CONTROLLER), PCI_DEV_HW_SPEC_BM( 9d07, 8086, 0x00, ATA_SA300, "Intel Sunrise Point-LP" , UNIATA_SATA | UNIATA_AHCI | UNIATA_RAID_CONTROLLER), -/* PCI_DEV_HW_SPEC_BM( a102, 8086, 0x00, ATA_SA300, "Intel Sunrise Point" , UNIATA_SATA | UNIATA_AHCI ),*/ /* workaround regression CORE-16078 */ +#ifndef __REACTOS__ + PCI_DEV_HW_SPEC_BM( a102, 8086, 0x00, ATA_SA300, "Intel Sunrise Point" , UNIATA_SATA | UNIATA_AHCI ), +#else + /* workaround regression CORE-16078 */ +#endif PCI_DEV_HW_SPEC_BM( a103, 8086, 0x00, ATA_SA300, "Intel Sunrise Point" , UNIATA_SATA | UNIATA_AHCI ), PCI_DEV_HW_SPEC_BM( a105, 8086, 0x00, ATA_SA300, "Intel Sunrise Point" , UNIATA_SATA | UNIATA_AHCI | UNIATA_RAID_CONTROLLER), PCI_DEV_HW_SPEC_BM( a106, 8086, 0x00, ATA_SA300, "Intel Sunrise Point" , UNIATA_SATA | UNIATA_AHCI | UNIATA_RAID_CONTROLLER), @@ -714,4 +718,8 @@ BUSMASTER_CONTROLLER_INFORMATION_BASE const BusMasterAdapters[] = { PCI_DEV_HW_SPEC_BM( ffff, ffff, 0xff, BMLIST_TERMINATOR, NULL , BMLIST_TERMINATOR ) }; -/* static */ const ULONG _NUM_BUSMASTER_ADAPTERS = (sizeof(BusMasterAdapters) / sizeof(BUSMASTER_CONTROLLER_INFORMATION_BASE)); +#ifndef __REACTOS__ +static const ULONG _NUM_BUSMASTER_ADAPTERS = (sizeof(BusMasterAdapters) / sizeof(BUSMASTER_CONTROLLER_INFORMATION_BASE)); +#else +const ULONG _NUM_BUSMASTER_ADAPTERS = (sizeof(BusMasterAdapters) / sizeof(BUSMASTER_CONTROLLER_INFORMATION_BASE)); +#endif diff --git a/drivers/storage/ide/uniata/id_ata.cpp b/drivers/storage/ide/uniata/id_ata.cpp index a49811ba90d..01f21741e96 100644 --- a/drivers/storage/ide/uniata/id_ata.cpp +++ b/drivers/storage/ide/uniata/id_ata.cpp @@ -6184,6 +6184,7 @@ CompleteRequest: #ifdef __REACTOS__ (void)senseData; #endif + KdPrint3((PRINT_PREFIX "AtapiInterrupt: ATAPI command status %#x\n", status)); if (status == SRB_STATUS_DATA_OVERRUN) { // Check to see if we at least get mininum number of bytes

1 0

[reactos] 01/01: [FASTFAT_NEW] Fix callback calling convention
by Jérôme Gardou 31 Dec '20

31 Dec '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c9f15013735d51731801d… commit c9f15013735d51731801d27432d6f58f2ef4c5aa Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Mon Dec 28 17:52:22 2020 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Thu Dec 31 17:14:04 2020 +0100 [FASTFAT_NEW] Fix callback calling convention --- drivers/filesystems/fastfat_new/fatprocs.h | 75 ++++++++++++++++-------------- drivers/filesystems/fastfat_new/workque.c | 11 +++-- 2 files changed, 46 insertions(+), 40 deletions(-) diff --git a/drivers/filesystems/fastfat_new/fatprocs.h b/drivers/filesystems/fastfat_new/fatprocs.h index 602f539cccb..f89f2325bee 100644 --- a/drivers/filesystems/fastfat_new/fatprocs.h +++ b/drivers/filesystems/fastfat_new/fatprocs.h @@ -104,7 +104,7 @@ typedef enum _TYPE_OF_OPEN { typedef BOOLEAN FINISHED; // -// Size (characters) of stack allocated name component buffers in +// Size (characters) of stack allocated name component buffers in // the create/rename paths. // @@ -125,7 +125,7 @@ FatExtendString( _Inout_ PVOID String, _In_ USHORT DesiredBufferSize, _In_ BOOLEAN FreeOldBuffer, - __out_opt PBOOLEAN NeedsFree + __out_opt PBOOLEAN NeedsFree ); VOID @@ -180,7 +180,7 @@ FatRemoveMcbEntry ( IN ULONG SectorCount ); - + // // File access check routine, implemented in AcChkSup.c // @@ -207,7 +207,7 @@ FatExplicitDeviceAccessGranted ( IN KPROCESSOR_MODE ProcessorMode ); - + // // Allocation support routines, implemented in AllocSup.c // @@ -389,7 +389,7 @@ FatLogOf( IN ULONG Value ); - + // // Buffer control routines for data caching, implemented in CacheSup.c // @@ -567,7 +567,7 @@ FatSyncUninitializeCacheMap ( IN PFILE_OBJECT FileObject ); - + // // Device I/O routines, implemented in DevIoSup.c // @@ -661,7 +661,7 @@ FatPerformDevIoCtrl ( IN ULONG IoControlCode, IN PDEVICE_OBJECT Device, IN PVOID InputBuffer OPTIONAL, - IN ULONG InputBufferLength, + IN ULONG InputBufferLength, OUT PVOID OutputBuffer OPTIONAL, IN ULONG OutputBufferLength, IN BOOLEAN InternalDeviceIoControl, @@ -675,7 +675,7 @@ FatBuildZeroMdl ( __in ULONG Length ); - + // // Dirent support routines, implemented in DirSup.c // @@ -731,7 +731,7 @@ FatLocateDirent ( OUT PVBO ByteOffset, OUT PBOOLEAN FileNameDos OPTIONAL, IN OUT PUNICODE_STRING Lfn OPTIONAL, - IN OUT PUNICODE_STRING OrigLfn OPTIONAL + IN OUT PUNICODE_STRING OrigLfn OPTIONAL ); _Requires_lock_held_(_Global_critical_region_) @@ -849,7 +849,7 @@ FatUpdateDirentFromFcb ( #define FatDirectoryKey(FcbOrDcb) ((ULONGLONG)((FcbOrDcb)->CreationTime.QuadPart ^ (FcbOrDcb)->FirstClusterOfFile)) - + // // The following routines are used to access and manipulate the // clusters containing EA data in the ea data file. They are @@ -1029,7 +1029,7 @@ FatUnpinEaRange ( #define SizeOfFullEa(EA) (4+1+1+2+(EA)->EaNameLength+1+(EA)->EaValueLength) - + // // The following routines are used to manipulate the fscontext fields // of the file object, implemented in FilObSup.c @@ -1049,7 +1049,7 @@ typedef enum _TYPE_OF_OPEN { #endif typedef enum _FAT_FLUSH_TYPE { - + NoFlush = 0, Flush, FlushAndInvalidate, @@ -1089,7 +1089,7 @@ FatForceCacheMiss ( IN FAT_FLUSH_TYPE FlushType ); - + // // File system control routines, implemented in FsCtrl.c // @@ -1123,7 +1123,7 @@ FatUnlockVolumeInternal ( IN PFILE_OBJECT FileObject OPTIONAL ); - + // // Name support routines, implemented in NameSup.c // @@ -1326,13 +1326,13 @@ FatSpaceInName ( ); VOID -FatUnicodeRestoreShortNameCase( +FatUnicodeRestoreShortNameCase( IN PUNICODE_STRING ShortNameWithCase, IN BOOLEAN LowerCase8, IN BOOLEAN LowerCase3 ); - + // // Resources support routines/macros, implemented in ResrcSup.c // @@ -1661,7 +1661,7 @@ FatFilterCallbackAcquireForCreateSection ( #endif - + // // In-memory structure support routine, implemented in StrucSup.c // @@ -1704,7 +1704,7 @@ FatCreateFcb ( IN ULONG DirentOffsetWithinDirectory, IN PDIRENT Dirent, IN PUNICODE_STRING Lfn OPTIONAL, - IN PUNICODE_STRING OrigLfn OPTIONAL, + IN PUNICODE_STRING OrigLfn OPTIONAL, IN BOOLEAN IsPagingFile, IN BOOLEAN SingleResource ); @@ -1730,12 +1730,12 @@ PCCB FatCreateCcb ( IN PIRP_CONTEXT IrpContext ); - + VOID FatDeallocateCcbStrings( IN PCCB Ccb ); - + VOID FatDeleteCcb ( IN PIRP_CONTEXT IrpContext, @@ -1830,7 +1830,7 @@ FatPreallocateCloseContext ( ); PCLOSE_CONTEXT -FatAllocateCloseContext( +FatAllocateCloseContext( IN PVCB Vcb ); @@ -1847,7 +1847,7 @@ FatAllocateCloseContext( ((S) == STATUS_NO_MEDIA_IN_DEVICE) \ ) - + // // Routines to support managing file names Fcbs and Dcbs. // Implemented in SplaySup.c @@ -1902,7 +1902,7 @@ FatCompareNames ( IsLessThan : IsGreaterThan : \ FatCompareNames((PSTRING)(NAMEA), (PSTRING)(NAMEB)) \ ) - + // // Time conversion support routines, implemented in TimeSup.c // @@ -1935,7 +1935,7 @@ FatGetCurrentFatTime ( _In_ PIRP_CONTEXT IrpContext ); - + // // Low level verification routines, implemented in VerfySup.c // @@ -2030,7 +2030,7 @@ FatPerformVerify ( _In_ PDEVICE_OBJECT Device ); - + // // Work queue routines for posting and retrieving an Irp, implemented in // workque.c @@ -2051,6 +2051,9 @@ FatPrePostIrp ( ); VOID +#ifdef __REACTOS__ +NTAPI +#endif FatAddToWorkque ( IN PIRP_CONTEXT IrpContext, IN PIRP Irp @@ -2061,7 +2064,7 @@ FatFsdPostRequest ( IN PIRP_CONTEXT IrpContext, IN PIRP Irp ); - + // // Miscellaneous support routines // @@ -2182,7 +2185,7 @@ typedef union _UCHAR4 { (PVOID)NULL ); \ } - + // // The FSD Level dispatch routines. These routines are called by the // I/O system via the dispatch table in the Driver Object. @@ -2221,7 +2224,7 @@ FatFsdCreate ( // implemented in Create.c _Inout_ PIRP Irp ); - + _Function_class_(IRP_MJ_DEVICE_CONTROL) _Function_class_(DRIVER_DISPATCH) NTSTATUS @@ -2366,7 +2369,7 @@ FatFsdWrite ( // implemented in Write.c #define CanFsdWait(IRP) IoIsOperationSynchronous(Irp) - + // // The FSP level dispatch/main routine. This is the routine that takes // IRP's off of the work queue and calls the appropriate FSP level @@ -2604,7 +2607,7 @@ FatFlushDirentForFile ( ); - + // // The following procedure is used by the FSP and FSD routines to complete // an IRP. @@ -2837,7 +2840,7 @@ FatScanForDataTrack( ((N) == FAT_NTC_DCB) \ ) -#else +#else #define FatIsNodeTypeOplockable(N) ( \ ((N) == FAT_NTC_FCB) \ @@ -2862,7 +2865,7 @@ FatScanForDataTrack( #define IsFileObjectReadOnly(FO) (!((FO)->WriteAccess | (FO)->DeleteAccess)) - + // // The following two macro are used by the Fsd/Fsp exception handlers to // process an exception. The first macro is the exception filter used in the @@ -2976,7 +2979,7 @@ __pragma(warning(pop)) DebugBreakOnStatus( (STATUS) ) \ ExRaiseStatus( (STATUS) ); \ } - + #define FatResetExceptionState( IRPCONTEXT ) { \ (IRPCONTEXT)->ExceptionStatus = STATUS_SUCCESS; \ } @@ -2994,7 +2997,7 @@ __pragma(warning(pop)) ExRaiseStatus(FsRtlNormalizeNtstatus((STATUS),STATUS_UNEXPECTED_IO_ERROR)); \ } - + // // The following macros are used to establish the semantics needed // to do a return from within a try-finally clause. As a rule every @@ -3026,14 +3029,14 @@ __pragma(warning(pop)) #define try_return(S) { S; goto try_exit; } #define try_leave(S) { S; _SEH2_LEAVE; } - + CLUSTER_TYPE FatInterpretClusterType ( IN PVCB Vcb, IN FAT_ENTRY Entry ); - + // // These routines define the FileId for FAT. Lacking a fixed/uniquifiable // notion, we simply come up with one which is unique in a given snapshot diff --git a/drivers/filesystems/fastfat_new/workque.c b/drivers/filesystems/fastfat_new/workque.c index 278a56432d3..8f9b35e360a 100644 --- a/drivers/filesystems/fastfat_new/workque.c +++ b/drivers/filesystems/fastfat_new/workque.c @@ -29,7 +29,7 @@ Abstract: #pragma alloc_text(PAGE, FatFsdPostRequest) #endif - + VOID NTAPI FatOplockComplete ( @@ -85,7 +85,7 @@ Return Value: return; } - + VOID NTAPI FatPrePostIrp ( @@ -224,7 +224,7 @@ Return Value: return; } - + NTSTATUS FatFsdPostRequest( IN PIRP_CONTEXT IrpContext, @@ -268,12 +268,15 @@ Return Value: return STATUS_PENDING; } - + // // Local support routine. // VOID +#ifdef __REACTOS__ +NTAPI +#endif FatAddToWorkque ( IN PIRP_CONTEXT IrpContext, IN PIRP Irp

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