Ros-diffs

ros-diffs@reactos.org

81390 discussions

[spetreolle] 60649: [SETUPAPI] Remove too zealous check for OEMSourceMediaLocation. OEMSourceMediaLocation can be NULL and means that the current path or a default URL is beeing used. Fixes install...
by spetreolle＠svn.reactos.org 13 Oct '13

13 Oct '13

Author: spetreolle Date: Sun Oct 13 22:08:24 2013 New Revision: 60649 URL: http://svn.reactos.org/svn/reactos?rev=60649&view=rev Log: [SETUPAPI] Remove too zealous check for OEMSourceMediaLocation. OEMSourceMediaLocation can be NULL and means that the current path or a default URL is beeing used. Fixes installation of VMWare Tools drivers. The installation still aborts due to issue in configuring the vmware tools service. Modified: trunk/reactos/dll/win32/setupapi/install.c Modified: trunk/reactos/dll/win32/setupapi/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/install… ============================================================================== --- trunk/reactos/dll/win32/setupapi/install.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/install.c [iso-8859-1] Sun Oct 13 22:08:24 2013 @@ -2283,8 +2283,6 @@ SetLastError(ERROR_INVALID_PARAMETER); else if (OEMSourceMediaType != SPOST_NONE && OEMSourceMediaType != SPOST_PATH && OEMSourceMediaType != SPOST_URL) SetLastError(ERROR_INVALID_PARAMETER); - else if (OEMSourceMediaType != SPOST_NONE && !OEMSourceMediaLocation) - SetLastError(ERROR_INVALID_PARAMETER); else if (CopyStyle & ~(SP_COPY_DELETESOURCE | SP_COPY_REPLACEONLY | SP_COPY_NOOVERWRITE | SP_COPY_OEMINF_CATALOG_ONLY)) { TRACE("Unknown flags: 0x%08lx\n", CopyStyle & ~(SP_COPY_DELETESOURCE | SP_COPY_REPLACEONLY | SP_COPY_NOOVERWRITE | SP_COPY_OEMINF_CATALOG_ONLY));

1 0

[akhaldi] 60648: [BRANCHES] * reactx: The main author is inactive, no interest in picking up so far for.
by akhaldi＠svn.reactos.org 13 Oct '13

13 Oct '13

Author: akhaldi Date: Sun Oct 13 21:51:34 2013 New Revision: 60648 URL: http://svn.reactos.org/svn/reactos?rev=60648&view=rev Log: [BRANCHES] * reactx: The main author is inactive, no interest in picking up so far for. Removed: branches/reactx/

1 0

[akhaldi] 60647: [BRANCHES] * icu4ros-bringup: empty branch. * jcatena-branch: the ongoing work was superseded by MSVC support in trunk. * lean-explorer: old and inactive. * nyadav-audio-branch: Fa...
by akhaldi＠svn.reactos.org 13 Oct '13

13 Oct '13

Author: akhaldi Date: Sun Oct 13 21:40:14 2013 New Revision: 60647 URL: http://svn.reactos.org/svn/reactos?rev=60647&view=rev Log: [BRANCHES] * icu4ros-bringup: empty branch. * jcatena-branch: the ongoing work was superseded by MSVC support in trunk. * lean-explorer: old and inactive. * nyadav-audio-branch: Failed GSoC 2011 project. * arwinss: who cares about Aleksey anyway.. * dib_rewrite: who cares about Timo anyway.. Removed: branches/icu4ros-bringup/ branches/jcatena-branch/ branches/lean-explorer/ branches/nyadav-audio-branch/

1 0

[akhaldi] 60646: [BRANCHES] * Remove the shell32_new-bringup branch (merged).
by akhaldi＠svn.reactos.org 13 Oct '13

13 Oct '13

Author: akhaldi Date: Sun Oct 13 21:28:33 2013 New Revision: 60646 URL: http://svn.reactos.org/svn/reactos?rev=60646&view=rev Log: [BRANCHES] * Remove the shell32_new-bringup branch (merged). Removed: branches/shell32_new-bringup/

1 0

[aandrejevic] 60645: [SOFT386] Implement the REP prefix for MOVS. Fix the REP prefix in INS, OUTS and STOS to simulate the DI wrap-around even if DF is set.
by aandrejevic＠svn.reactos.org 13 Oct '13

13 Oct '13

Author: aandrejevic Date: Sun Oct 13 21:15:01 2013 New Revision: 60645 URL: http://svn.reactos.org/svn/reactos?rev=60645&view=rev Log: [SOFT386] Implement the REP prefix for MOVS. Fix the REP prefix in INS, OUTS and STOS to simulate the DI wrap-around even if DF is set. Modified: branches/ntvdm/lib/soft386/opcodes.c Modified: branches/ntvdm/lib/soft386/opcodes.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opcodes.c?rev… ============================================================================== --- branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] Sun Oct 13 21:15:01 2013 @@ -5929,68 +5929,163 @@ AddressSize = !AddressSize; } - if ((State->PrefixFlags & SOFT386_PREFIX_REP) - || (State->PrefixFlags & SOFT386_PREFIX_REPNZ)) - { - // TODO: The REP/REPZ/REPNZ prefixes need to be implemented! - Soft386Exception(State, SOFT386_EXCEPTION_UD); - return FALSE; - } - /* Calculate the size */ if (Opcode == 0xA4) DataSize = sizeof(UCHAR); else DataSize = OperandSize ? sizeof(ULONG) : sizeof(USHORT); - /* Read from the source operand */ - if (!Soft386ReadMemory(State, - SOFT386_REG_DS, - AddressSize ? State->GeneralRegs[SOFT386_REG_ESI].Long - : State->GeneralRegs[SOFT386_REG_ESI].LowWord, - FALSE, - &Data, - DataSize)) - { - /* Exception occurred */ - return FALSE; - } - - /* Write to the destination operand */ - if (!Soft386WriteMemory(State, - SOFT386_REG_ES, - AddressSize ? State->GeneralRegs[SOFT386_REG_EDI].Long - : State->GeneralRegs[SOFT386_REG_EDI].LowWord, - &Data, - DataSize)) - { - /* Exception occurred */ - return FALSE; - } - - /* Increment/decrement ESI and EDI */ - if (OperandSize) - { - if (!State->Flags.Df) - { - State->GeneralRegs[SOFT386_REG_ESI].Long += DataSize; - State->GeneralRegs[SOFT386_REG_EDI].Long += DataSize; + if (State->PrefixFlags & SOFT386_PREFIX_REP) + { + UCHAR Block[STRING_BLOCK_SIZE]; + ULONG Count = OperandSize ? State->GeneralRegs[SOFT386_REG_ECX].Long + : State->GeneralRegs[SOFT386_REG_ECX].LowWord; + + /* Clear the memory block */ + RtlZeroMemory(Block, sizeof(Block)); + + /* Transfer until finished */ + while (Count) + { + ULONG Processed = min(Count, STRING_BLOCK_SIZE / DataSize); + + /* Simulate the 16-bit wrap-around of SI and DI in 16-bit address mode */ + if (!AddressSize) + { + ULONG MaxBytesSrc = State->Flags.Df + ? (ULONG)State->GeneralRegs[SOFT386_REG_ESI].LowWord + : (0x10000 - (ULONG)State->GeneralRegs[SOFT386_REG_ESI].LowWord); + ULONG MaxBytesDest = State->Flags.Df + ? (ULONG)State->GeneralRegs[SOFT386_REG_EDI].LowWord + : (0x10000 - (ULONG)State->GeneralRegs[SOFT386_REG_EDI].LowWord); + + + Processed = min(Processed, min(MaxBytesSrc, MaxBytesDest) / DataSize); + if (Processed == 0) Processed = 1; + } + + if (State->Flags.Df) + { + /* Reduce ESI and EDI by the number of bytes to transfer */ + if (AddressSize) + { + State->GeneralRegs[SOFT386_REG_ESI].Long -= Processed * DataSize; + State->GeneralRegs[SOFT386_REG_EDI].Long -= Processed * DataSize; + } + else + { + State->GeneralRegs[SOFT386_REG_ESI].LowWord -= Processed * DataSize; + State->GeneralRegs[SOFT386_REG_EDI].LowWord -= Processed * DataSize; + } + } + + /* Read from memory */ + if (!Soft386ReadMemory(State, + SOFT386_REG_DS, + AddressSize ? State->GeneralRegs[SOFT386_REG_ESI].Long + : State->GeneralRegs[SOFT386_REG_ESI].LowWord, + FALSE, + Block, + Processed * DataSize)) + { + /* Set ECX */ + if (OperandSize) State->GeneralRegs[SOFT386_REG_ECX].Long = Count; + else State->GeneralRegs[SOFT386_REG_ECX].LowWord = LOWORD(Count); + + /* Exception occurred */ + return FALSE; + } + + /* Write to memory */ + if (!Soft386WriteMemory(State, + SOFT386_REG_ES, + AddressSize ? State->GeneralRegs[SOFT386_REG_EDI].Long + : State->GeneralRegs[SOFT386_REG_EDI].LowWord, + Block, + Processed * DataSize)) + { + /* Set ECX */ + if (OperandSize) State->GeneralRegs[SOFT386_REG_ECX].Long = Count; + else State->GeneralRegs[SOFT386_REG_ECX].LowWord = LOWORD(Count); + + /* Exception occurred */ + return FALSE; + } + + if (!State->Flags.Df) + { + /* Increase ESI and EDI by the number of bytes transfered */ + if (AddressSize) + { + State->GeneralRegs[SOFT386_REG_ESI].Long += Processed * DataSize; + State->GeneralRegs[SOFT386_REG_EDI].Long += Processed * DataSize; + } + else + { + State->GeneralRegs[SOFT386_REG_ESI].LowWord += Processed * DataSize; + State->GeneralRegs[SOFT386_REG_EDI].LowWord += Processed * DataSize; + } + } + + /* Reduce the total count by the number processed in this run */ + Count -= Processed; + } + + /* Clear ECX */ + if (OperandSize) State->GeneralRegs[SOFT386_REG_ECX].Long = 0; + else State->GeneralRegs[SOFT386_REG_ECX].LowWord = 0; + } + else + { + /* Read from the source operand */ + if (!Soft386ReadMemory(State, + SOFT386_REG_DS, + AddressSize ? State->GeneralRegs[SOFT386_REG_ESI].Long + : State->GeneralRegs[SOFT386_REG_ESI].LowWord, + FALSE, + &Data, + DataSize)) + { + /* Exception occurred */ + return FALSE; + } + + /* Write to the destination operand */ + if (!Soft386WriteMemory(State, + SOFT386_REG_ES, + AddressSize ? State->GeneralRegs[SOFT386_REG_EDI].Long + : State->GeneralRegs[SOFT386_REG_EDI].LowWord, + &Data, + DataSize)) + { + /* Exception occurred */ + return FALSE; + } + + /* Increment/decrement ESI and EDI */ + if (OperandSize) + { + if (!State->Flags.Df) + { + State->GeneralRegs[SOFT386_REG_ESI].Long += DataSize; + State->GeneralRegs[SOFT386_REG_EDI].Long += DataSize; + } + else + { + State->GeneralRegs[SOFT386_REG_ESI].Long -= DataSize; + State->GeneralRegs[SOFT386_REG_EDI].Long -= DataSize; + } } else { - State->GeneralRegs[SOFT386_REG_ESI].Long -= DataSize; - State->GeneralRegs[SOFT386_REG_EDI].Long -= DataSize; - } - } - else - { - if (!State->Flags.Df) - { - State->GeneralRegs[SOFT386_REG_ESI].LowWord += DataSize; - State->GeneralRegs[SOFT386_REG_EDI].LowWord += DataSize; - } - else - { - State->GeneralRegs[SOFT386_REG_ESI].LowWord -= DataSize; - State->GeneralRegs[SOFT386_REG_EDI].LowWord -= DataSize; + if (!State->Flags.Df) + { + State->GeneralRegs[SOFT386_REG_ESI].LowWord += DataSize; + State->GeneralRegs[SOFT386_REG_EDI].LowWord += DataSize; + } + else + { + State->GeneralRegs[SOFT386_REG_ESI].LowWord -= DataSize; + State->GeneralRegs[SOFT386_REG_EDI].LowWord -= DataSize; + } } } @@ -6171,7 +6266,9 @@ /* Simulate the 16-bit wrap-around of DI in 16-bit address mode */ if (!AddressSize) { - ULONG MaxBytes = 0x10000 - (ULONG)State->GeneralRegs[SOFT386_REG_EDI].LowWord; + ULONG MaxBytes = State->Flags.Df + ? (ULONG)State->GeneralRegs[SOFT386_REG_EDI].LowWord + : (0x10000 - (ULONG)State->GeneralRegs[SOFT386_REG_EDI].LowWord); Processed = min(Processed, MaxBytes / DataSize); if (Processed == 0) Processed = 1; @@ -6449,7 +6546,9 @@ /* Simulate the 16-bit wrap-around of DI in 16-bit address mode */ if (!AddressSize) { - ULONG MaxBytes = 0x10000 - (ULONG)State->GeneralRegs[SOFT386_REG_EDI].LowWord; + ULONG MaxBytes = State->Flags.Df + ? (ULONG)State->GeneralRegs[SOFT386_REG_EDI].LowWord + : (0x10000 - (ULONG)State->GeneralRegs[SOFT386_REG_EDI].LowWord); Processed = min(Processed, MaxBytes / DataSize); if (Processed == 0) Processed = 1; @@ -6595,7 +6694,9 @@ /* Simulate the 16-bit wrap-around of DI in 16-bit address mode */ if (!AddressSize) { - ULONG MaxBytes = 0x10000 - (ULONG)State->GeneralRegs[SOFT386_REG_EDI].LowWord; + ULONG MaxBytes = State->Flags.Df + ? (ULONG)State->GeneralRegs[SOFT386_REG_EDI].LowWord + : (0x10000 - (ULONG)State->GeneralRegs[SOFT386_REG_EDI].LowWord); Processed = min(Processed, MaxBytes / DataSize); if (Processed == 0) Processed = 1;

1 0

[fireball] 60644: - Branches cleanup: * cmake-bringup is merged. * GSoC 2011 KMTestSuite is merged. * GSoC 2011 TcpIpDriver is merged. * ros-csrss is merged. * the-real-msvc is obsolete because tru...
by fireball＠svn.reactos.org 13 Oct '13

13 Oct '13

Author: fireball Date: Sun Oct 13 20:52:47 2013 New Revision: 60644 URL: http://svn.reactos.org/svn/reactos?rev=60644&view=rev Log: - Branches cleanup: * cmake-bringup is merged. * GSoC 2011 KMTestSuite is merged. * GSoC 2011 TcpIpDriver is merged. * ros-csrss is merged. * the-real-msvc is obsolete because trunk supports MSVC compiling now in a much better way. Removed: branches/GSoC_2011/KMTestSuite/ branches/GSoC_2011/TcpIpDriver/ branches/cmake-bringup/ branches/ros-csrss/ branches/the-real-msvc/

1 0

[ekohl] 60643: [MSV1_0] - MsvpChangePassword: Fix-up string pointers properly. - MsvpCheckPassword: Modify password checks.
by ekohl＠svn.reactos.org 13 Oct '13

13 Oct '13

Author: ekohl Date: Sun Oct 13 20:15:01 2013 New Revision: 60643 URL: http://svn.reactos.org/svn/reactos?rev=60643&view=rev Log: [MSV1_0] - MsvpChangePassword: Fix-up string pointers properly. - MsvpCheckPassword: Modify password checks. Modified: trunk/reactos/dll/win32/msv1_0/msv1_0.c Modified: trunk/reactos/dll/win32/msv1_0/msv1_0.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msv1_0/msv1_0.c?… ============================================================================== --- trunk/reactos/dll/win32/msv1_0/msv1_0.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msv1_0/msv1_0.c [iso-8859-1] Sun Oct 13 20:15:01 2013 @@ -731,13 +731,13 @@ static NTSTATUS -ChangePassword(IN PLSA_CLIENT_REQUEST ClientRequest, - IN PVOID ProtocolSubmitBuffer, - IN PVOID ClientBufferBase, - IN ULONG SubmitBufferLength, - OUT PVOID *ProtocolReturnBuffer, - OUT PULONG ReturnBufferLength, - OUT PNTSTATUS ProtocolStatus) +MsvpChangePassword(IN PLSA_CLIENT_REQUEST ClientRequest, + IN PVOID ProtocolSubmitBuffer, + IN PVOID ClientBufferBase, + IN ULONG SubmitBufferLength, + OUT PVOID *ProtocolReturnBuffer, + OUT PULONG ReturnBufferLength, + OUT PNTSTATUS ProtocolStatus) { PMSV1_0_CHANGEPASSWORD_REQUEST RequestBuffer; ULONG_PTR PtrOffset; @@ -749,10 +749,10 @@ /* Fix-up pointers in the request buffer info */ PtrOffset = (ULONG_PTR)ProtocolSubmitBuffer - (ULONG_PTR)ClientBufferBase; - RequestBuffer->DomainName.Buffer = (PWSTR)((ULONG_PTR)RequestBuffer->DomainName.Buffer + PtrOffset); - RequestBuffer->AccountName.Buffer = (PWSTR)((ULONG_PTR)RequestBuffer->AccountName.Buffer + PtrOffset); - RequestBuffer->OldPassword.Buffer = (PWSTR)((ULONG_PTR)RequestBuffer->OldPassword.Buffer + PtrOffset); - RequestBuffer->NewPassword.Buffer = (PWSTR)((ULONG_PTR)RequestBuffer->NewPassword.Buffer + PtrOffset); + RequestBuffer->DomainName.Buffer = FIXUP_POINTER(RequestBuffer->DomainName.Buffer, PtrOffset); + RequestBuffer->AccountName.Buffer = FIXUP_POINTER(RequestBuffer->AccountName.Buffer, PtrOffset); + RequestBuffer->OldPassword.Buffer = FIXUP_POINTER(RequestBuffer->OldPassword.Buffer, PtrOffset); + RequestBuffer->NewPassword.Buffer = FIXUP_POINTER(RequestBuffer->NewPassword.Buffer, PtrOffset); TRACE("Domain: %S\n", RequestBuffer->DomainName.Buffer); TRACE("Account: %S\n", RequestBuffer->AccountName.Buffer); @@ -807,36 +807,49 @@ UserNtPasswordPresent = TRUE; } - Status = STATUS_SUCCESS; - + Status = STATUS_WRONG_PASSWORD; + + /* Succeed, if no password has been set */ + if (UserInfo->All.NtPasswordPresent == FALSE && + UserInfo->All.LmPasswordPresent == FALSE) + { + TRACE("No password check!\n"); + Status = STATUS_SUCCESS; + goto done; + } + + /* Succeed, if NT password matches */ if (UserNtPasswordPresent && UserInfo->All.NtPasswordPresent) { TRACE("Check NT password hashes:\n"); - if (!RtlEqualMemory(&UserNtPassword, - UserInfo->All.NtOwfPassword.Buffer, - sizeof(ENCRYPTED_NT_OWF_PASSWORD))) + if (RtlEqualMemory(&UserNtPassword, + UserInfo->All.NtOwfPassword.Buffer, + sizeof(ENCRYPTED_NT_OWF_PASSWORD))) { - TRACE(" failed!\n"); - Status = STATUS_WRONG_PASSWORD; + TRACE(" success!\n"); + Status = STATUS_SUCCESS; + goto done; } - } - else if (UserLmPasswordPresent && UserInfo->All.LmPasswordPresent) + + TRACE(" failed!\n"); + } + + /* Succeed, if LM password matches */ + if (UserLmPasswordPresent && UserInfo->All.LmPasswordPresent) { TRACE("Check LM password hashes:\n"); - if (!RtlEqualMemory(&UserLmPassword, - UserInfo->All.LmOwfPassword.Buffer, - sizeof(ENCRYPTED_LM_OWF_PASSWORD))) + if (RtlEqualMemory(&UserLmPassword, + UserInfo->All.LmOwfPassword.Buffer, + sizeof(ENCRYPTED_LM_OWF_PASSWORD))) { - TRACE(" failed!\n"); - Status = STATUS_WRONG_PASSWORD; + TRACE(" success!\n"); + Status = STATUS_SUCCESS; + goto done; } - } - else - { - TRACE("No matching hashes available!\n"); - Status = STATUS_WRONG_PASSWORD; - } - + TRACE(" failed!\n"); + } + +done: return Status; } @@ -878,13 +891,13 @@ break; case MsV1_0ChangePassword: - Status = ChangePassword(ClientRequest, - ProtocolSubmitBuffer, - ClientBufferBase, - SubmitBufferLength, - ProtocolReturnBuffer, - ReturnBufferLength, - ProtocolStatus); + Status = MsvpChangePassword(ClientRequest, + ProtocolSubmitBuffer, + ClientBufferBase, + SubmitBufferLength, + ProtocolReturnBuffer, + ReturnBufferLength, + ProtocolStatus); break; case MsV1_0ChangeCachedPassword:

1 0

[hbelusca] 60642: [SACDRV]: - Tabs vs. spaces fix; - Less hardcoded values; - Consistency in members names. No functional changes.
by hbelusca＠svn.reactos.org 13 Oct '13

13 Oct '13

Author: hbelusca Date: Sun Oct 13 19:40:34 2013 New Revision: 60642 URL: http://svn.reactos.org/svn/reactos?rev=60642&view=rev Log: [SACDRV]: - Tabs vs. spaces fix; - Less hardcoded values; - Consistency in members names. No functional changes. Modified: trunk/reactos/drivers/sac/driver/chanmgr.c trunk/reactos/drivers/sac/driver/channel.c trunk/reactos/drivers/sac/driver/cmdchan.c trunk/reactos/drivers/sac/driver/concmd.c trunk/reactos/drivers/sac/driver/conmgr.c trunk/reactos/drivers/sac/driver/data.c trunk/reactos/drivers/sac/driver/dispatch.c trunk/reactos/drivers/sac/driver/init.c trunk/reactos/drivers/sac/driver/memory.c trunk/reactos/drivers/sac/driver/rawchan.c trunk/reactos/drivers/sac/driver/sacdrv.h trunk/reactos/drivers/sac/driver/util.c trunk/reactos/drivers/sac/driver/vtutf8chan.c Modified: trunk/reactos/drivers/sac/driver/chanmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/sac/driver/chanmgr… ============================================================================== --- trunk/reactos/drivers/sac/driver/chanmgr.c [iso-8859-1] (original) +++ trunk/reactos/drivers/sac/driver/chanmgr.c [iso-8859-1] Sun Oct 13 19:40:34 2013 @@ -6,11 +6,11 @@ * PROGRAMMERS: ReactOS Portable Systems Group */ -/* INCLUDES ******************************************************************/ +/* INCLUDES *******************************************************************/ #include "sacdrv.h" -/* GLOBALS *******************************************************************/ +/* GLOBALS ********************************************************************/ SAC_CHANNEL_LOCK ChannelCreateLock; BOOLEAN ChannelCreateEnabled; @@ -21,7 +21,7 @@ LONG CurrentChannelRefCount; KMUTEX CurrentChannelLock; -/* FUNCTIONS *****************************************************************/ +/* FUNCTIONS ******************************************************************/ #define MAX_REF_COUNT 100 Modified: trunk/reactos/drivers/sac/driver/channel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/sac/driver/channel… ============================================================================== --- trunk/reactos/drivers/sac/driver/channel.c [iso-8859-1] (original) +++ trunk/reactos/drivers/sac/driver/channel.c [iso-8859-1] Sun Oct 13 19:40:34 2013 @@ -6,13 +6,13 @@ * PROGRAMMERS: ReactOS Portable Systems Group */ -/* INCLUDES ******************************************************************/ +/* INCLUDES *******************************************************************/ #include "sacdrv.h" -/* GLOBALS *******************************************************************/ - -/* FUNCTIONS *****************************************************************/ +/* GLOBALS ********************************************************************/ + +/* FUNCTIONS ******************************************************************/ BOOLEAN NTAPI @@ -255,19 +255,19 @@ BOOLEAN IsActive; /* Get the status */ - if (!NT_SUCCESS(ChannelGetStatus(Channel, &ChannelStatus))) - { + if (!NT_SUCCESS(ChannelGetStatus(Channel, &ChannelStatus))) + { /* We couldn't even do that, assume it's inactive */ IsActive = FALSE; - } - else - { + } + else + { /* Check if the status shows activity */ IsActive = (ChannelStatus == Active); } /* Return the state */ - return IsActive; + return IsActive; } BOOLEAN @@ -278,13 +278,13 @@ BOOLEAN IsClosed; /* Get the status */ - if (!NT_SUCCESS(ChannelGetStatus(Channel, &ChannelStatus))) - { + if (!NT_SUCCESS(ChannelGetStatus(Channel, &ChannelStatus))) + { /* We couldn't even do that, assume it's inactive */ IsClosed = FALSE; - } - else - { + } + else + { /* Check if the status shows activity */ IsClosed = ((ChannelStatus == Inactive) && (Channel->ChannelHasNewOBufferData)); @@ -310,7 +310,7 @@ ChannelLockAttributes(Channel); /* Copy the name and null-terminate it */ - ASSERT(((wcslen(Channel->NameBuffer) + 1) * sizeof(WCHAR)) <= ((64 + 1) * sizeof(WCHAR))); + ASSERT(((wcslen(Channel->NameBuffer) + 1) * sizeof(WCHAR)) <= ((SAC_CHANNEL_NAME_SIZE + 1) * sizeof(WCHAR))); wcsncpy(*Name, Channel->NameBuffer, RTL_NUMBER_OF(Channel->NameBuffer)); // bug (*Name)[SAC_CHANNEL_NAME_SIZE] = UNICODE_NULL; @@ -331,7 +331,7 @@ ChannelLockAttributes(Channel); /* Copy the name and null-terminate it */ - ASSERT(((wcslen(Name) + 1) * sizeof(WCHAR)) <= ((64 + 1) * sizeof(WCHAR))); + ASSERT(((wcslen(Name) + 1) * sizeof(WCHAR)) <= ((SAC_CHANNEL_NAME_SIZE + 1) * sizeof(WCHAR))); wcsncpy(Channel->NameBuffer, Name, RTL_NUMBER_OF(Channel->NameBuffer)); // bug Channel->NameBuffer[SAC_CHANNEL_NAME_SIZE] = UNICODE_NULL; @@ -356,7 +356,7 @@ ChannelLockAttributes(Channel); /* Copy the name and null-terminate it */ - ASSERT(((wcslen(Channel->DescriptionBuffer) + 1) * sizeof(WCHAR)) <= ((256 + 1) * sizeof(WCHAR))); + ASSERT(((wcslen(Channel->DescriptionBuffer) + 1) * sizeof(WCHAR)) <= ((SAC_CHANNEL_DESCRIPTION_SIZE + 1) * sizeof(WCHAR))); wcsncpy(*Description, Channel->DescriptionBuffer, RTL_NUMBER_OF(Channel->DescriptionBuffer)); // bug (*Description)[SAC_CHANNEL_DESCRIPTION_SIZE] = UNICODE_NULL; @@ -377,7 +377,7 @@ ChannelLockAttributes(Channel); /* Copy the name and null-terminate it */ - ASSERT(((wcslen(Description) + 1) * sizeof(WCHAR)) <= ((64 + 1) * sizeof(WCHAR))); + ASSERT(((wcslen(Description) + 1) * sizeof(WCHAR)) <= ((SAC_CHANNEL_NAME_SIZE + 1) * sizeof(WCHAR))); wcsncpy(Channel->DescriptionBuffer, Description, RTL_NUMBER_OF(Channel->DescriptionBuffer)); // bug Channel->DescriptionBuffer[SAC_CHANNEL_DESCRIPTION_SIZE] = UNICODE_NULL; Modified: trunk/reactos/drivers/sac/driver/cmdchan.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/sac/driver/cmdchan… ============================================================================== --- trunk/reactos/drivers/sac/driver/cmdchan.c [iso-8859-1] (original) +++ trunk/reactos/drivers/sac/driver/cmdchan.c [iso-8859-1] Sun Oct 13 19:40:34 2013 @@ -1,9 +1,9 @@ /* - * PROJECT: ReactOS Boot Loader - * LICENSE: BSD - See COPYING.ARM in the top level directory - * FILE: drivers/sac/driver/cmdchan.c - * PURPOSE: Driver for the Server Administration Console (SAC) for EMS - * PROGRAMMERS: ReactOS Portable Systems Group + * PROJECT: ReactOS Drivers + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: drivers/sac/driver/cmdchan.c + * PURPOSE: Driver for the Server Administration Console (SAC) for EMS + * PROGRAMMERS: ReactOS Portable Systems Group */ /* INCLUDES *******************************************************************/ @@ -16,45 +16,45 @@ NTSTATUS CmdChannelCreate( - IN PSAC_CHANNEL Channel - ) + IN PSAC_CHANNEL Channel + ) { - return STATUS_NOT_IMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; } NTSTATUS CmdChannelDestroy( - IN PSAC_CHANNEL Channel - ) + IN PSAC_CHANNEL Channel + ) { - return STATUS_NOT_IMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; } NTSTATUS CmdChannelOWrite( - IN PSAC_CHANNEL Channel, - IN PWCHAR String, - IN ULONG Size - ) + IN PSAC_CHANNEL Channel, + IN PWCHAR String, + IN ULONG Size + ) { - return STATUS_NOT_IMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; } NTSTATUS CmdChannelOFlush( - IN PSAC_CHANNEL Channel - ) + IN PSAC_CHANNEL Channel + ) { - return STATUS_NOT_IMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; } NTSTATUS CmdChannelORead( - IN PSAC_CHANNEL Channel, - IN PCHAR Buffer, - IN ULONG BufferSize, - OUT PULONG ByteCount - ) + IN PSAC_CHANNEL Channel, + IN PCHAR Buffer, + IN ULONG BufferSize, + OUT PULONG ByteCount + ) { - return STATUS_NOT_IMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; } Modified: trunk/reactos/drivers/sac/driver/concmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/sac/driver/concmd.… ============================================================================== --- trunk/reactos/drivers/sac/driver/concmd.c [iso-8859-1] (original) +++ trunk/reactos/drivers/sac/driver/concmd.c [iso-8859-1] Sun Oct 13 19:40:34 2013 @@ -6,55 +6,55 @@ * PROGRAMMERS: ReactOS Portable Systems Group */ -/* INCLUDES ******************************************************************/ +/* INCLUDES *******************************************************************/ #include "sacdrv.h" -/* GLOBALS *******************************************************************/ +/* GLOBALS ********************************************************************/ PVOID GlobalBuffer; ULONG GlobalBufferSize; -/* FUNCTIONS *****************************************************************/ +/* FUNCTIONS ******************************************************************/ NTSTATUS DoChannelListCommand( - VOID - ) -{ - return STATUS_NOT_IMPLEMENTED; + VOID + ) +{ + return STATUS_NOT_IMPLEMENTED; } NTSTATUS DoChannelCloseByNameCommand( - IN PCHAR Count - ) -{ - return STATUS_NOT_IMPLEMENTED; + IN PCHAR Count + ) +{ + return STATUS_NOT_IMPLEMENTED; } NTSTATUS DoChannelCloseByIndexCommand( - IN ULONG ChannelIndex - ) -{ - return STATUS_NOT_IMPLEMENTED; + IN ULONG ChannelIndex + ) +{ + return STATUS_NOT_IMPLEMENTED; } NTSTATUS DoChannelSwitchByNameCommand( - IN PCHAR Count - ) -{ - return STATUS_NOT_IMPLEMENTED; + IN PCHAR Count + ) +{ + return STATUS_NOT_IMPLEMENTED; } NTSTATUS DoChannelSwitchByIndexCommand( - IN ULONG ChannelIndex - ) -{ - return STATUS_NOT_IMPLEMENTED; + IN ULONG ChannelIndex + ) +{ + return STATUS_NOT_IMPLEMENTED; } typedef struct _SAC_SYSTEM_INFORMATION @@ -324,28 +324,28 @@ BOOLEAN RetrieveIpAddressFromString( - IN PWCHAR IpString, - OUT PULONG IpAddress - ) -{ - return FALSE; + IN PWCHAR IpString, + OUT PULONG IpAddress + ) +{ + return FALSE; } NTSTATUS CallQueryIPIOCTL( - IN HANDLE DriverHandle, - IN PVOID DriverObject, - IN HANDLE WaitEvent, - IN PIO_STATUS_BLOCK IoStatusBlock, - IN PVOID InputBuffer, - IN ULONG InputBufferLength, - IN PVOID OutputBuffer, - IN ULONG OutputBufferLength, - IN BOOLEAN PrintMessage, - OUT PBOOLEAN MessagePrinted - ) -{ - return STATUS_NOT_IMPLEMENTED; + IN HANDLE DriverHandle, + IN PVOID DriverObject, + IN HANDLE WaitEvent, + IN PIO_STATUS_BLOCK IoStatusBlock, + IN PVOID InputBuffer, + IN ULONG InputBufferLength, + IN PVOID OutputBuffer, + IN ULONG OutputBufferLength, + IN BOOLEAN PrintMessage, + OUT PBOOLEAN MessagePrinted + ) +{ + return STATUS_NOT_IMPLEMENTED; } VOID Modified: trunk/reactos/drivers/sac/driver/conmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/sac/driver/conmgr.… ============================================================================== --- trunk/reactos/drivers/sac/driver/conmgr.c [iso-8859-1] (original) +++ trunk/reactos/drivers/sac/driver/conmgr.c [iso-8859-1] Sun Oct 13 19:40:34 2013 @@ -6,11 +6,11 @@ * PROGRAMMERS: ReactOS Portable Systems Group */ -/* INCLUDES ******************************************************************/ +/* INCLUDES *******************************************************************/ #include "sacdrv.h" -/* GLOBALS *******************************************************************/ +/* GLOBALS ********************************************************************/ DEFINE_GUID(PRIMARY_SAC_CHANNEL_APPLICATION_GUID, 0x63D02270, @@ -32,7 +32,7 @@ BOOLEAN GlobalPagingNeeded, GlobalDoThreads; -/* FUNCTIONS *****************************************************************/ +/* FUNCTIONS ******************************************************************/ VOID NTAPI Modified: trunk/reactos/drivers/sac/driver/data.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/sac/driver/data.c?… ============================================================================== --- trunk/reactos/drivers/sac/driver/data.c [iso-8859-1] (original) +++ trunk/reactos/drivers/sac/driver/data.c [iso-8859-1] Sun Oct 13 19:40:34 2013 @@ -6,11 +6,11 @@ * PROGRAMMERS: ReactOS Portable Systems Group */ -/* INCLUDES ******************************************************************/ +/* INCLUDES *******************************************************************/ #include "sacdrv.h" -/* GLOBALS *******************************************************************/ +/* GLOBALS ********************************************************************/ ULONG SACDebug = 0xFFFFFFFF; BOOLEAN CommandConsoleLaunchingEnabled; @@ -21,7 +21,7 @@ PKEVENT SACEvent; HANDLE SACEventHandle; -/* FUNCTIONS *****************************************************************/ +/* FUNCTIONS ******************************************************************/ VOID NTAPI Modified: trunk/reactos/drivers/sac/driver/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/sac/driver/dispatc… ============================================================================== --- trunk/reactos/drivers/sac/driver/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/drivers/sac/driver/dispatch.c [iso-8859-1] Sun Oct 13 19:40:34 2013 @@ -6,15 +6,15 @@ * PROGRAMMERS: ReactOS Portable Systems Group */ -/* INCLUDES ******************************************************************/ +/* INCLUDES *******************************************************************/ #include "sacdrv.h" -/* GLOBALS *******************************************************************/ +/* GLOBALS ********************************************************************/ LONG TimerDpcCount; -/* FUNCTIONS *****************************************************************/ +/* FUNCTIONS ******************************************************************/ NTSTATUS NTAPI Modified: trunk/reactos/drivers/sac/driver/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/sac/driver/init.c?… ============================================================================== --- trunk/reactos/drivers/sac/driver/init.c [iso-8859-1] (original) +++ trunk/reactos/drivers/sac/driver/init.c [iso-8859-1] Sun Oct 13 19:40:34 2013 @@ -6,13 +6,13 @@ * PROGRAMMERS: ReactOS Portable Systems Group */ -/* INCLUDES ******************************************************************/ +/* INCLUDES *******************************************************************/ #include "sacdrv.h" -/* GLOBALS *******************************************************************/ +/* GLOBALS ********************************************************************/ -/* FUNCTIONS *****************************************************************/ +/* FUNCTIONS ******************************************************************/ NTSTATUS NTAPI Modified: trunk/reactos/drivers/sac/driver/memory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/sac/driver/memory.… ============================================================================== --- trunk/reactos/drivers/sac/driver/memory.c [iso-8859-1] (original) +++ trunk/reactos/drivers/sac/driver/memory.c [iso-8859-1] Sun Oct 13 19:40:34 2013 @@ -6,17 +6,17 @@ * PROGRAMMERS: ReactOS Portable Systems Group */ -/* INCLUDES ******************************************************************/ +/* INCLUDES *******************************************************************/ #include "sacdrv.h" -/* GLOBALS *******************************************************************/ +/* GLOBALS ********************************************************************/ LONG TotalFrees, TotalBytesFreed, TotalAllocations, TotalBytesAllocated; KSPIN_LOCK MemoryLock; PSAC_MEMORY_LIST GlobalMemoryList; -/* FUNCTIONS *****************************************************************/ +/* FUNCTIONS ******************************************************************/ BOOLEAN NTAPI @@ -113,92 +113,91 @@ #if _USE_SAC_HEAP_ALLOCATOR_ GlobalDescriptor = GlobalMemoryList; - KeAcquireSpinLock(&MemoryLock, &OldIrql); - while (GlobalDescriptor) - { - ASSERT(GlobalMemoryList->Signature == GLOBAL_MEMORY_SIGNATURE); - - LocalDescriptor = GlobalDescriptor->LocalDescriptor; - - GlobalSize = GlobalDescriptor->Size; - while (GlobalSize) - { - ASSERT(LocalDescriptor->Signature == LOCAL_MEMORY_SIGNATURE); - - if ((LocalDescriptor->Tag == FREE_POOL_TAG) && - (LocalDescriptor->Size >= PoolSize)) - { - break; - } - - GlobalSize -= (LocalDescriptor->Size + sizeof(SAC_MEMORY_ENTRY)); - - LocalDescriptor = - (PSAC_MEMORY_ENTRY)((ULONG_PTR)LocalDescriptor + - LocalDescriptor->Size + - sizeof(SAC_MEMORY_ENTRY)); - } - - GlobalDescriptor = GlobalDescriptor->Next; - } - - if (!GlobalDescriptor) - { - KeReleaseSpinLock(&MemoryLock, OldIrql); - - ActualSize = min( - PAGE_SIZE, - PoolSize + sizeof(SAC_MEMORY_ENTRY) + sizeof(SAC_MEMORY_LIST)); - - SAC_DBG(SAC_DBG_MM, "Allocating new space.\n"); - - NewDescriptor = ExAllocatePoolWithTagPriority( - 0, - ActualSize, - ALLOC_BLOCK_TAG, - HighPoolPriority); - if (!NewDescriptor) - { - SAC_DBG(SAC_DBG_MM, "No more memory, returning NULL.\n"); - return NULL; - } - - KeAcquireSpinLock(&MemoryLock, &OldIrql); - - NewDescriptor->Signature = GLOBAL_MEMORY_SIGNATURE; - NewDescriptor->LocalDescriptor = (PSAC_MEMORY_ENTRY)(NewDescriptor + 1); - NewDescriptor->Size = ActualSize - 16; - NewDescriptor->Next = GlobalMemoryList; - - GlobalMemoryList = NewDescriptor; - - LocalDescriptor = NewDescriptor->LocalDescriptor; - LocalDescriptor->Signature = LOCAL_MEMORY_SIGNATURE; - LocalDescriptor->Tag = FREE_POOL_TAG; - LocalDescriptor->Size = - GlobalMemoryList->Size - sizeof(SAC_MEMORY_ENTRY); - } - - SAC_DBG(SAC_DBG_MM, "Found a good sized block.\n"); - ASSERT(LocalDescriptor->Tag == FREE_POOL_TAG); - ASSERT(LocalDescriptor->Signature == LOCAL_MEMORY_SIGNATURE); - - if (LocalDescriptor->Size > (PoolSize + sizeof(SAC_MEMORY_ENTRY))) - { - NextDescriptor = - (PSAC_MEMORY_ENTRY)((ULONG_PTR)LocalDescriptor + - PoolSize + - sizeof(SAC_MEMORY_ENTRY)); - if (NextDescriptor->Tag == FREE_POOL_TAG) - { - NextDescriptor->Tag = FREE_POOL_TAG; - NextDescriptor->Signature = LOCAL_MEMORY_SIGNATURE; - NextDescriptor->Size = - (LocalDescriptor->Size - PoolSize - sizeof(SAC_MEMORY_ENTRY)); - - LocalDescriptor->Size = PoolSize; - } - } + KeAcquireSpinLock(&MemoryLock, &OldIrql); + while (GlobalDescriptor) + { + ASSERT(GlobalMemoryList->Signature == GLOBAL_MEMORY_SIGNATURE); + + LocalDescriptor = GlobalDescriptor->LocalDescriptor; + + GlobalSize = GlobalDescriptor->Size; + while (GlobalSize) + { + ASSERT(LocalDescriptor->Signature == LOCAL_MEMORY_SIGNATURE); + + if ((LocalDescriptor->Tag == FREE_POOL_TAG) && + (LocalDescriptor->Size >= PoolSize)) + { + break; + } + + GlobalSize -= (LocalDescriptor->Size + sizeof(SAC_MEMORY_ENTRY)); + + LocalDescriptor = + (PSAC_MEMORY_ENTRY)((ULONG_PTR)LocalDescriptor + + LocalDescriptor->Size + + sizeof(SAC_MEMORY_ENTRY)); + } + + GlobalDescriptor = GlobalDescriptor->Next; + } + + if (!GlobalDescriptor) + { + KeReleaseSpinLock(&MemoryLock, OldIrql); + + ActualSize = min( + PAGE_SIZE, + PoolSize + sizeof(SAC_MEMORY_ENTRY) + sizeof(SAC_MEMORY_LIST)); + + SAC_DBG(SAC_DBG_MM, "Allocating new space.\n"); + + NewDescriptor = ExAllocatePoolWithTagPriority(NonPagedPool, + ActualSize, + ALLOC_BLOCK_TAG, + HighPoolPriority); + if (!NewDescriptor) + { + SAC_DBG(SAC_DBG_MM, "No more memory, returning NULL.\n"); + return NULL; + } + + KeAcquireSpinLock(&MemoryLock, &OldIrql); + + NewDescriptor->Signature = GLOBAL_MEMORY_SIGNATURE; + NewDescriptor->LocalDescriptor = (PSAC_MEMORY_ENTRY)(NewDescriptor + 1); + NewDescriptor->Size = ActualSize - 16; + NewDescriptor->Next = GlobalMemoryList; + + GlobalMemoryList = NewDescriptor; + + LocalDescriptor = NewDescriptor->LocalDescriptor; + LocalDescriptor->Signature = LOCAL_MEMORY_SIGNATURE; + LocalDescriptor->Tag = FREE_POOL_TAG; + LocalDescriptor->Size = + GlobalMemoryList->Size - sizeof(SAC_MEMORY_ENTRY); + } + + SAC_DBG(SAC_DBG_MM, "Found a good sized block.\n"); + ASSERT(LocalDescriptor->Tag == FREE_POOL_TAG); + ASSERT(LocalDescriptor->Signature == LOCAL_MEMORY_SIGNATURE); + + if (LocalDescriptor->Size > (PoolSize + sizeof(SAC_MEMORY_ENTRY))) + { + NextDescriptor = + (PSAC_MEMORY_ENTRY)((ULONG_PTR)LocalDescriptor + + PoolSize + + sizeof(SAC_MEMORY_ENTRY)); + if (NextDescriptor->Tag == FREE_POOL_TAG) + { + NextDescriptor->Tag = FREE_POOL_TAG; + NextDescriptor->Signature = LOCAL_MEMORY_SIGNATURE; + NextDescriptor->Size = + (LocalDescriptor->Size - PoolSize - sizeof(SAC_MEMORY_ENTRY)); + + LocalDescriptor->Size = PoolSize; + } + } #else /* Shut the compiler up */ NewDescriptor = GlobalDescriptor = NULL; @@ -255,77 +254,77 @@ KeAcquireSpinLock(&MemoryLock, &OldIrql); #if _USE_SAC_HEAP_ALLOCATOR_ - while (GlobalDescriptor) - { - ASSERT(GlobalMemoryList->Signature == GLOBAL_MEMORY_SIGNATURE); - - FoundDescriptor = NULL; - - ThisDescriptor = GlobalDescriptor->LocalDescriptor; - - GlobalSize = GlobalDescriptor->Size; - while (GlobalSize) - { - ASSERT(ThisDescriptor->Signature == LOCAL_MEMORY_SIGNATURE); - - if (ThisDescriptor == LocalDescriptor) break; - - GlobalSize -= (ThisDescriptor->Size + sizeof(SAC_MEMORY_ENTRY)); - - ThisDescriptor = - (PSAC_MEMORY_ENTRY)((ULONG_PTR)ThisDescriptor + - ThisDescriptor->Size + - sizeof(SAC_MEMORY_ENTRY)); - } - - if (ThisDescriptor == LocalDescriptor) break; - - GlobalDescriptor = GlobalDescriptor->Next; - } - - if (!GlobalDescriptor) - { - KeReleaseSpinLock(&MemoryLock, OldIrql); - SAC_DBG(SAC_DBG_MM, "Could not find block.\n"); - return; - } - - ASSERT(ThisDescriptor->Signature == LOCAL_MEMORY_SIGNATURE); - - if (LocalDescriptor->Tag == FREE_POOL_TAG) - { - KeReleaseSpinLock(&MemoryLock, OldIrql); - SAC_DBG(SAC_DBG_MM, "Attempted to free something twice.\n"); - return; - } - - LocalSize = LocalDescriptor->Size; - LocalDescriptor->Tag = FREE_POOL_TAG; - - if (GlobalSize > (LocalSize + sizeof(SAC_MEMORY_ENTRY))) - { - NextDescriptor = - (PSAC_MEMORY_ENTRY)((ULONG_PTR)LocalDescriptor + - LocalSize + - sizeof(SAC_MEMORY_ENTRY)); - if (NextDescriptor->Tag == FREE_POOL_TAG) - { - NextDescriptor->Tag = 0; - NextDescriptor->Signature = 0; - - LocalDescriptor->Size += - (NextDescriptor->Size + sizeof(SAC_MEMORY_ENTRY)); - } - } - - if ((FoundDescriptor) && (FoundDescriptor->Tag == FREE_POOL_TAG)) - { - LocalDescriptor->Signature = 0; - LocalDescriptor->Tag = 0; - - FoundDescriptor->Size += - (LocalDescriptor->Size + sizeof(SAC_MEMORY_ENTRY)); - } + while (GlobalDescriptor) + { + ASSERT(GlobalMemoryList->Signature == GLOBAL_MEMORY_SIGNATURE); + + FoundDescriptor = NULL; + + ThisDescriptor = GlobalDescriptor->LocalDescriptor; + + GlobalSize = GlobalDescriptor->Size; + while (GlobalSize) + { + ASSERT(ThisDescriptor->Signature == LOCAL_MEMORY_SIGNATURE); + + if (ThisDescriptor == LocalDescriptor) break; + + GlobalSize -= (ThisDescriptor->Size + sizeof(SAC_MEMORY_ENTRY)); + + ThisDescriptor = + (PSAC_MEMORY_ENTRY)((ULONG_PTR)ThisDescriptor + + ThisDescriptor->Size + + sizeof(SAC_MEMORY_ENTRY)); + } + + if (ThisDescriptor == LocalDescriptor) break; + + GlobalDescriptor = GlobalDescriptor->Next; + } + + if (!GlobalDescriptor) + { + KeReleaseSpinLock(&MemoryLock, OldIrql); + SAC_DBG(SAC_DBG_MM, "Could not find block.\n"); + return; + } + + ASSERT(ThisDescriptor->Signature == LOCAL_MEMORY_SIGNATURE); + + if (LocalDescriptor->Tag == FREE_POOL_TAG) + { + KeReleaseSpinLock(&MemoryLock, OldIrql); + SAC_DBG(SAC_DBG_MM, "Attempted to free something twice.\n"); + return; + } + + LocalSize = LocalDescriptor->Size; + LocalDescriptor->Tag = FREE_POOL_TAG; + + if (GlobalSize > (LocalSize + sizeof(SAC_MEMORY_ENTRY))) + { + NextDescriptor = + (PSAC_MEMORY_ENTRY)((ULONG_PTR)LocalDescriptor + + LocalSize + + sizeof(SAC_MEMORY_ENTRY)); + if (NextDescriptor->Tag == FREE_POOL_TAG) + { + NextDescriptor->Tag = 0; + NextDescriptor->Signature = 0; + + LocalDescriptor->Size += + (NextDescriptor->Size + sizeof(SAC_MEMORY_ENTRY)); + } + } + + if ((FoundDescriptor) && (FoundDescriptor->Tag == FREE_POOL_TAG)) + { + LocalDescriptor->Signature = 0; + LocalDescriptor->Tag = 0; + + FoundDescriptor->Size += + (LocalDescriptor->Size + sizeof(SAC_MEMORY_ENTRY)); + } #else /* Shut the compiler up */ LocalSize = GlobalSize = 0; Modified: trunk/reactos/drivers/sac/driver/rawchan.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/sac/driver/rawchan… ============================================================================== --- trunk/reactos/drivers/sac/driver/rawchan.c [iso-8859-1] (original) +++ trunk/reactos/drivers/sac/driver/rawchan.c [iso-8859-1] Sun Oct 13 19:40:34 2013 @@ -6,13 +6,13 @@ * PROGRAMMERS: ReactOS Portable Systems Group */ -/* INCLUDES ******************************************************************/ +/* INCLUDES *******************************************************************/ #include "sacdrv.h" -/* GLOBALS *******************************************************************/ - -/* FUNCTIONS *****************************************************************/ +/* GLOBALS ********************************************************************/ + +/* FUNCTIONS ******************************************************************/ NTSTATUS NTAPI Modified: trunk/reactos/drivers/sac/driver/sacdrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/sac/driver/sacdrv.… ============================================================================== --- trunk/reactos/drivers/sac/driver/sacdrv.h [iso-8859-1] (original) +++ trunk/reactos/drivers/sac/driver/sacdrv.h [iso-8859-1] Sun Oct 13 19:40:34 2013 @@ -6,7 +6,7 @@ * PROGRAMMERS: ReactOS Portable Systems Group */ -/* INCLUDES ******************************************************************/ +/* INCLUDES *******************************************************************/ #include <ntifs.h> #include <intrin.h> @@ -19,7 +19,7 @@ #include <initguid.h> #include <sacmsg.h> -/* DEFINES *******************************************************************/ +/* DEFINES ********************************************************************/ // // SAC Heap Allocator Macros @@ -48,12 +48,12 @@ // SAC Parameter Checking Macros // #define CHECK_PARAMETER_WITH_STATUS(Parameter, Status) \ -{ \ - ASSERT(((PVOID)(Parameter)) != NULL); \ - if (((PVOID)(Parameter)) == NULL) \ - { \ - return Status; \ - } \ +{ \ + ASSERT(((PVOID)(Parameter)) != NULL); \ + if (((PVOID)(Parameter)) == NULL) \ + { \ + return Status; \ + } \ } #define CHECK_PARAMETER(x) \ CHECK_PARAMETER_WITH_STATUS(x, STATUS_INVALID_PARAMETER) @@ -71,63 +71,63 @@ // // SAC Channel Event Macros // -#define ChannelInitializeEvent(Channel, Attributes, x) \ -{ \ - PVOID Object, WaitObject; \ - if (Attributes->x) \ - { \ +#define ChannelInitializeEvent(Channel, Attributes, x) \ +{ \ + PVOID Object, WaitObject; \ + if (Attributes->x) \ + { \ if (!VerifyEventWaitable(Attributes->x, &Object, &WaitObject)) \ - { \ - goto FailChannel; \ - } \ - Channel->x = Attributes->x; \ - Channel->x##ObjectBody = Object; \ - Channel->x##WaitObjectBody = WaitObject; \ - } \ + { \ + goto FailChannel; \ + } \ + Channel->x = Attributes->x; \ + Channel->x##ObjectBody = Object; \ + Channel->x##WaitObjectBody = WaitObject; \ + } \ } -#define ChannelUninitializeEvent(Channel, x, f) \ -{ \ - ASSERT(ChannelGetFlags(Channel) & (f)); \ - ASSERT(Channel->x##ObjectBody); \ - ASSERT(Channel->x##WaitObjectBody); \ - if (Channel->x##ObjectBody) \ - { \ - ObDereferenceObject(Channel->x##ObjectBody); \ - Channel->Flags &= ~(f); \ - Channel->x = NULL; \ - Channel->x##ObjectBody = NULL; \ - Channel->x##WaitObjectBody = NULL; \ - } \ +#define ChannelUninitializeEvent(Channel, x, f) \ +{ \ + ASSERT(ChannelGetFlags(Channel) & (f)); \ + ASSERT(Channel->x##ObjectBody); \ + ASSERT(Channel->x##WaitObjectBody); \ + if (Channel->x##ObjectBody) \ + { \ + ObDereferenceObject(Channel->x##ObjectBody); \ + Channel->Flags &= ~(f); \ + Channel->x = NULL; \ + Channel->x##ObjectBody = NULL; \ + Channel->x##WaitObjectBody = NULL; \ + } \ } -#define ChannelSetEvent(Channel, x) \ -{ \ - ASSERT(Channel->x); \ - ASSERT(Channel->x##ObjectBody); \ - ASSERT(Channel->x##WaitObjectBody); \ - if (Channel->x##WaitObjectBody) \ - { \ +#define ChannelSetEvent(Channel, x) \ +{ \ + ASSERT(Channel->x); \ + ASSERT(Channel->x##ObjectBody); \ + ASSERT(Channel->x##WaitObjectBody); \ + if (Channel->x##WaitObjectBody) \ + { \ KeSetEvent(Channel->x##WaitObjectBody, EVENT_INCREMENT, FALSE); \ - Status = STATUS_SUCCESS; \ - } \ - else \ - { \ - Status = STATUS_UNSUCCESSFUL; \ - } \ + Status = STATUS_SUCCESS; \ + } \ + else \ + { \ + Status = STATUS_UNSUCCESSFUL; \ + } \ } -#define ChannelClearEvent(Channel, x) \ -{ \ - ASSERT(Channel->x); \ - ASSERT(Channel->x##ObjectBody); \ - ASSERT(Channel->x##WaitObjectBody); \ - if (Channel->x##WaitObjectBody) \ - { \ - KeClearEvent(Channel->x##WaitObjectBody); \ - Status = STATUS_SUCCESS; \ - } \ - else \ - { \ - Status = STATUS_UNSUCCESSFUL; \ - } \ +#define ChannelClearEvent(Channel, x) \ +{ \ + ASSERT(Channel->x); \ + ASSERT(Channel->x##ObjectBody); \ + ASSERT(Channel->x##WaitObjectBody); \ + if (Channel->x##WaitObjectBody) \ + { \ + KeClearEvent(Channel->x##WaitObjectBody); \ + Status = STATUS_SUCCESS; \ + } \ + else \ + { \ + Status = STATUS_UNSUCCESSFUL; \ + } \ } // @@ -145,7 +145,7 @@ #define GLOBAL_BLOCK_TAG 'GpcR' #define CHANNEL_BLOCK_TAG 'CpcR' #define LOCAL_MEMORY_SIGNATURE 'SSEL' -#define GLOBAL_MEMORY_SIGNATURE 'DAEH' +#define GLOBAL_MEMORY_SIGNATURE 'DAEH' // // Size Definitions @@ -172,16 +172,16 @@ #define SAC_CHANNEL_FLAG_INTERNAL 0x1 #define SAC_CHANNEL_FLAG_CLOSE_EVENT 0x2 #define SAC_CHANNEL_FLAG_HAS_NEW_DATA_EVENT 0x4 -#define SAC_CHANNEL_FLAG_LOCK_EVENT 0x8 +#define SAC_CHANNEL_FLAG_LOCK_EVENT 0x8 #define SAC_CHANNEL_FLAG_REDRAW_EVENT 0x10 #define SAC_CHANNEL_FLAG_APPLICATION 0x20 // -// Cursor Flags -// -#define SAC_CURSOR_FLAG_BLINK 1 -#define SAC_CURSOR_FLAG_BOLD 2 -#define SAC_CURSOR_FLAG_INVERTED 4 +// Cell Flags +// +#define SAC_CELL_FLAG_BLINK 1 +#define SAC_CELL_FLAG_BOLD 2 +#define SAC_CELL_FLAG_INVERTED 4 // // Forward definitions @@ -312,21 +312,21 @@ // // Structure of the cell-buffer when in VT-UTF8 Mode // -typedef struct _SAC_CURSOR_DATA -{ - UCHAR CursorBackColor; - UCHAR CursorColor; - UCHAR CursorFlags; - WCHAR CursorValue; -} SAC_CURSOR_DATA, *PSAC_CURSOR_DATA; -C_ASSERT(sizeof(SAC_CURSOR_DATA) == 6); +typedef struct _SAC_CELL_DATA +{ + UCHAR CellBackColor; + UCHAR CellForeColor; + UCHAR CellFlags; + WCHAR Char; +} SAC_CELL_DATA, *PSAC_CELL_DATA; +C_ASSERT(sizeof(SAC_CELL_DATA) == 6); // // Screen buffer when in VT-UTF8 Mode // typedef struct _SAC_VTUTF8_SCREEN { - SAC_CURSOR_DATA Cell[SAC_VTUTF8_ROW_HEIGHT][SAC_VTUTF8_COL_WIDTH]; + SAC_CELL_DATA Cell[SAC_VTUTF8_ROW_HEIGHT][SAC_VTUTF8_COL_WIDTH]; } SAC_VTUTF8_SCREEN, *PSAC_VTUTF8_SCREEN; // @@ -453,9 +453,9 @@ LONG ChannelHasNewIBufferData; UCHAR CursorRow; UCHAR CursorCol; - UCHAR CursorColor; - UCHAR CursorBackColor; - UCHAR CursorFlags; + UCHAR CellForeColor; + UCHAR CellBackColor; + UCHAR CellFlags; PCHAR OBuffer; ULONG OBufferIndex; ULONG OBufferFirstGoodIndex; @@ -479,8 +479,8 @@ typedef struct _SAC_CHANNEL_ATTRIBUTES { SAC_CHANNEL_TYPE ChannelType; - WCHAR NameBuffer[64 + 1]; - WCHAR DescriptionBuffer[256 + 1]; + WCHAR NameBuffer[SAC_CHANNEL_NAME_SIZE + 1]; + WCHAR DescriptionBuffer[SAC_CHANNEL_DESCRIPTION_SIZE + 1]; ULONG Flag; HANDLE CloseEvent; HANDLE HasNewDataEvent; Modified: trunk/reactos/drivers/sac/driver/util.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/sac/driver/util.c?… ============================================================================== --- trunk/reactos/drivers/sac/driver/util.c [iso-8859-1] (original) +++ trunk/reactos/drivers/sac/driver/util.c [iso-8859-1] Sun Oct 13 19:40:34 2013 @@ -6,11 +6,11 @@ * PROGRAMMERS: ReactOS Portable Systems Group */ -/* INCLUDES ******************************************************************/ +/* INCLUDES *******************************************************************/ #include "sacdrv.h" -/* GLOBALS *******************************************************************/ +/* GLOBALS ********************************************************************/ PCHAR Utf8ConversionBuffer; ULONG Utf8ConversionBufferSize = PAGE_SIZE; @@ -32,7 +32,7 @@ LONG SerialPortConsumerIndex, SerialPortProducerIndex; PCHAR SerialPortBuffer; -/* FUNCTIONS *****************************************************************/ +/* FUNCTIONS ******************************************************************/ BOOLEAN NTAPI @@ -1244,61 +1244,61 @@ ULONG ConvertAnsiToUnicode( - IN PWCHAR pwch, - IN PCHAR pch, - IN ULONG length - ) -{ - return STATUS_NOT_IMPLEMENTED; + IN PWCHAR pwch, + IN PCHAR pch, + IN ULONG length + ) +{ + return STATUS_NOT_IMPLEMENTED; } BOOLEAN IsCmdEventRegistrationProcess( - IN PFILE_OBJECT FileObject - ) -{ - return FALSE; + IN PFILE_OBJECT FileObject + ) +{ + return FALSE; } NTSTATUS InvokeUserModeService( - VOID - ) -{ - return STATUS_NOT_IMPLEMENTED; + VOID + ) +{ + return STATUS_NOT_IMPLEMENTED; } NTSTATUS TranslateMachineInformationText( - IN PWCHAR Buffer) -{ - return STATUS_NOT_IMPLEMENTED; + IN PWCHAR Buffer) +{ + return STATUS_NOT_IMPLEMENTED; } NTSTATUS CopyAndInsertStringAtInterval( - IN PWCHAR SourceStr, - IN ULONG Interval, - IN PWCHAR InsertStr, - OUT PWCHAR pDestStr - ) -{ - return STATUS_NOT_IMPLEMENTED; + IN PWCHAR SourceStr, + IN ULONG Interval, + IN PWCHAR InsertStr, + OUT PWCHAR pDestStr + ) +{ + return STATUS_NOT_IMPLEMENTED; } NTSTATUS RegisterSacCmdEvent( - IN PVOID Object, - IN PKEVENT SetupCmdEvent[] - ) -{ - return STATUS_NOT_IMPLEMENTED; + IN PVOID Object, + IN PKEVENT SetupCmdEvent[] + ) +{ + return STATUS_NOT_IMPLEMENTED; } NTSTATUS UnregisterSacCmdEvent( - IN PFILE_OBJECT FileObject - ) -{ - return STATUS_NOT_IMPLEMENTED; -} + IN PFILE_OBJECT FileObject + ) +{ + return STATUS_NOT_IMPLEMENTED; +} Modified: trunk/reactos/drivers/sac/driver/vtutf8chan.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/sac/driver/vtutf8c… ============================================================================== --- trunk/reactos/drivers/sac/driver/vtutf8chan.c [iso-8859-1] (original) +++ trunk/reactos/drivers/sac/driver/vtutf8chan.c [iso-8859-1] Sun Oct 13 19:40:34 2013 @@ -6,11 +6,11 @@ * PROGRAMMERS: ReactOS Portable Systems Group */ -/* INCLUDES ******************************************************************/ +/* INCLUDES *******************************************************************/ #include "sacdrv.h" -/* GLOBALS *******************************************************************/ +/* GLOBALS ********************************************************************/ CHAR IncomingUtf8ConversionBuffer[4]; WCHAR IncomingUnicodeValue; @@ -30,7 +30,7 @@ { VT_ANSI_ERASE_ENTIRE_SCREEN, 3, SacEraseScreen }, }; -/* FUNCTIONS *****************************************************************/ +/* FUNCTIONS ******************************************************************/ FORCEINLINE VOID @@ -114,7 +114,7 @@ Tmp = LocalBuffer; break; - /* Send the [#;#H (Cursor Positio) sequence */ + /* Send the [#;#H (Cursor Position) sequence */ case SacAnsiSetPosition: /* Allocate a small local buffer for it */ @@ -203,7 +203,7 @@ /* Set bold if needed */ Status = VTUTF8ChannelAnsiDispatch(Channel, - Attribute & SAC_CURSOR_FLAG_BOLD ? + Attribute & SAC_CELL_FLAG_BOLD ? SacAnsiSetBoldAttribute : SacAnsiClearBoldAttribute, NULL, @@ -212,7 +212,7 @@ /* Set blink if needed */ Status = VTUTF8ChannelAnsiDispatch(Channel, - Attribute & SAC_CURSOR_FLAG_BLINK ? + Attribute & SAC_CELL_FLAG_BLINK ? SacAnsiSetBlinkAttribute : SacAnsiClearBlinkAttribute, NULL, @@ -221,7 +221,7 @@ /* Set inverse if needed */ return VTUTF8ChannelAnsiDispatch(Channel, - Attribute & SAC_CURSOR_FLAG_INVERTED ? + Attribute & SAC_CELL_FLAG_INVERTED ? SacAnsiSetInverseAttribute : SacAnsiClearInverseAttribute, NULL, @@ -244,7 +244,7 @@ { ULONG Number, Number2, Number3, i, Action, Result; PWCHAR Sequence; - PSAC_VTUTF8_SCREEN Cursor; + PSAC_VTUTF8_SCREEN Screen; ASSERT(String[0] == VT_ANSI_ESCAPE); /* Microsoft's driver does this after the O(n) check below. Be smarter. */ @@ -441,7 +441,7 @@ if (!Result) Result = Sequence - String + 1; /* Get the current cell buffer */ - Cursor = (PSAC_VTUTF8_SCREEN)Channel->OBuffer; + Screen = (PSAC_VTUTF8_SCREEN)Channel->OBuffer; VTUTF8ChannelAssertCursor(Channel); /* Handle all the supported SAC ANSI commands */ @@ -516,40 +516,40 @@ break; case SacFontNormal: - /* Reset the cursor attributes */ - Channel->CursorFlags = 0; - Channel->CursorBackColor = SetBackColorBlack; - Channel->CursorColor = SetColorWhite; + /* Reset the cell attributes */ + Channel->CellFlags = 0; + Channel->CellBackColor = SetBackColorBlack; + Channel->CellForeColor = SetColorWhite; break; case SacFontBlink: /* Set the appropriate flag */ - Channel->CursorFlags |= SAC_CURSOR_FLAG_BLINK; + Channel->CellFlags |= SAC_CELL_FLAG_BLINK; break; case SacFontBlinkOff: /* Clear the appropriate flag */ - Channel->CursorFlags &= ~SAC_CURSOR_FLAG_BLINK; + Channel->CellFlags &= ~SAC_CELL_FLAG_BLINK; break; case SacFontBold: /* Set the appropriate flag */ - Channel->CursorFlags |= SAC_CURSOR_FLAG_BOLD; + Channel->CellFlags |= SAC_CELL_FLAG_BOLD; break; case SacFontBoldOff: /* Clear the appropriate flag */ - Channel->CursorFlags &= ~SAC_CURSOR_FLAG_BOLD; + Channel->CellFlags &= ~SAC_CELL_FLAG_BOLD; break; case SacFontInverse: /* Set the appropriate flag */ - Channel->CursorFlags |= SAC_CURSOR_FLAG_INVERTED; + Channel->CellFlags |= SAC_CELL_FLAG_INVERTED; break; case SacFontInverseOff: /* Clear the appropriate flag */ - Channel->CursorFlags &= ~SAC_CURSOR_FLAG_INVERTED; + Channel->CellFlags &= ~SAC_CELL_FLAG_INVERTED; break; case SacEraseEndOfLine: @@ -557,10 +557,10 @@ for (i = Channel->CursorCol; i < SAC_VTUTF8_COL_WIDTH; i++) { /* Replace everything after the current position with blanks */ - Cursor->Cell[Channel->CursorRow][i].CursorFlags = Channel->CursorFlags; - Cursor->Cell[Channel->CursorRow][i].CursorBackColor = Channel->CursorColor; - Cursor->Cell[Channel->CursorRow][i].CursorColor = Channel->CursorBackColor; - Cursor->Cell[Channel->CursorRow][i].CursorValue = ' '; + Screen->Cell[Channel->CursorRow][i].CellFlags = Channel->CellFlags; + Screen->Cell[Channel->CursorRow][i].CellBackColor = Channel->CellForeColor; + Screen->Cell[Channel->CursorRow][i].CellForeColor = Channel->CellBackColor; + Screen->Cell[Channel->CursorRow][i].Char = L' '; } break; @@ -569,10 +569,10 @@ for (i = 0; i < (Channel->CursorCol + 1); i++) { /* Replace everything after the current position with blanks */ - Cursor->Cell[Channel->CursorRow][i].CursorFlags = Channel->CursorFlags; - Cursor->Cell[Channel->CursorRow][i].CursorBackColor = Channel->CursorColor; - Cursor->Cell[Channel->CursorRow][i].CursorColor = Channel->CursorBackColor; - Cursor->Cell[Channel->CursorRow][i].CursorValue = ' '; + Screen->Cell[Channel->CursorRow][i].CellFlags = Channel->CellFlags; + Screen->Cell[Channel->CursorRow][i].CellBackColor = Channel->CellForeColor; + Screen->Cell[Channel->CursorRow][i].CellForeColor = Channel->CellBackColor; + Screen->Cell[Channel->CursorRow][i].Char = L' '; } break; @@ -581,10 +581,10 @@ for (i = 0; i < SAC_VTUTF8_COL_WIDTH; i++) { /* Replace them all with blanks */ - Cursor->Cell[Channel->CursorRow][i].CursorFlags = Channel->CursorFlags; - Cursor->Cell[Channel->CursorRow][i].CursorBackColor = Channel->CursorColor; - Cursor->Cell[Channel->CursorRow][i].CursorColor = Channel->CursorBackColor; - Cursor->Cell[Channel->CursorRow][i].CursorValue = ' '; + Screen->Cell[Channel->CursorRow][i].CellFlags = Channel->CellFlags; + Screen->Cell[Channel->CursorRow][i].CellBackColor = Channel->CellForeColor; + Screen->Cell[Channel->CursorRow][i].CellForeColor = Channel->CellBackColor; + Screen->Cell[Channel->CursorRow][i].Char = L' '; } break; @@ -609,26 +609,26 @@ break; case SacSetColors: - /* Set the cursor colors */ - Channel->CursorColor = Number; - Channel->CursorBackColor = Number2; + /* Set the cell colors */ + Channel->CellForeColor = Number; + Channel->CellBackColor = Number2; break; case SacSetBackgroundColor: - /* Set the cursor back color */ - Channel->CursorBackColor = Number; + /* Set the cell back color */ + Channel->CellBackColor = Number; break; case SacSetFontColor: - /* Set the cursor text color */ - Channel->CursorColor = Number; + /* Set the cell text color */ + Channel->CellForeColor = Number; break; case SacSetColorsAndAttributes: - /* Set the cursor flag and colors */ - Channel->CursorFlags = Number; - Channel->CursorColor = Number2; - Channel->CursorBackColor = Number3; + /* Set the cell flag and colors */ + Channel->CellFlags = Number; + Channel->CellForeColor = Number2; + Channel->CellBackColor = Number3; break; default: @@ -644,32 +644,29 @@ NTAPI VTUTF8ChannelOInit(IN PSAC_CHANNEL Channel) { - PSAC_CURSOR_DATA Cursor; - ULONG x, y; + PSAC_VTUTF8_SCREEN Screen; + ULONG R, C; CHECK_PARAMETER(Channel); - /* Set the current channel cursor parameters */ - Channel->CursorFlags = 0; - Channel->CursorBackColor = SetBackColorBlack; - Channel->CursorColor = SetColorWhite; + /* Set the current channel cell parameters */ + Channel->CellFlags = 0; + Channel->CellBackColor = SetBackColorBlack; + Channel->CellForeColor = SetColorWhite; + + /* Set the cell buffer position */ + Screen = (PSAC_VTUTF8_SCREEN)Channel->OBuffer; /* Loop the output buffer height by width */ - Cursor = (PSAC_CURSOR_DATA)Channel->OBuffer; - y = SAC_VTUTF8_ROW_HEIGHT; - do - { - x = SAC_VTUTF8_COL_WIDTH; - do + for (R = 0; R < SAC_VTUTF8_ROW_HEIGHT; R++) + { + for (C = 0; C < SAC_VTUTF8_COL_WIDTH; C++) { /* For every character, set the defaults */ - Cursor->CursorValue = ' '; - Cursor->CursorBackColor = SetBackColorBlack; - Cursor->CursorColor = SetColorWhite; - - /* Move to the next character */ - Cursor++; - } while (--x); - } while (--y); + Screen->Cell[R][C].Char = L' '; + Screen->Cell[R][C].CellBackColor = SetBackColorBlack; + Screen->Cell[R][C].CellForeColor = SetColorWhite; + } + } /* All done */ return STATUS_SUCCESS; @@ -728,7 +725,7 @@ VTUTF8ChannelOFlush(IN PSAC_CHANNEL Channel) { NTSTATUS Status; - PSAC_VTUTF8_SCREEN Cursor; + PSAC_VTUTF8_SCREEN Screen; INT Color[2], Position[2]; ULONG Utf8ProcessedCount, Utf8Count, R, C, ForeColor, BackColor, Attribute; PWCHAR TmpBuffer; @@ -736,7 +733,7 @@ CHECK_PARAMETER(Channel); /* Set the cell buffer position */ - Cursor = (PSAC_VTUTF8_SCREEN)Channel->OBuffer; + Screen = (PSAC_VTUTF8_SCREEN)Channel->OBuffer; /* Allocate a temporary buffer */ TmpBuffer = SacAllocatePool(40, GLOBAL_BLOCK_TAG); @@ -769,14 +766,14 @@ 0); if (!NT_SUCCESS(Status)) goto Quickie; - /* Now set the current cursor attributes */ - Attribute = Channel->CursorFlags; + /* Now set the current cell attributes */ + Attribute = Channel->CellFlags; Status = VTUTF8ChannelProcessAttributes(Channel, Attribute); if (!NT_SUCCESS(Status)) goto Quickie; - /* And set the current cursor colors */ - ForeColor = Channel->CursorColor; - BackColor = Channel->CursorBackColor; + /* And set the current cell colors */ + ForeColor = Channel->CellForeColor; + BackColor = Channel->CellBackColor; Color[1] = BackColor; Color[0] = ForeColor; Status = VTUTF8ChannelAnsiDispatch(Channel, @@ -788,12 +785,12 @@ /* Now loop all the characters in the cell buffer */ for (R = 0; R < SAC_VTUTF8_ROW_HEIGHT; R++) { - /* Accross every row */ + /* Across every row */ for (C = 0; C < SAC_VTUTF8_COL_WIDTH; C++) { /* Check if there's been a change in colors */ - if ((Cursor->Cell[R][C].CursorBackColor != BackColor) || - (Cursor->Cell[R][C].CursorColor != ForeColor)) + if ((Screen->Cell[R][C].CellBackColor != BackColor) || + (Screen->Cell[R][C].CellForeColor != ForeColor)) { /* New colors are being drawn -- are we also on a new row now? */ if (Overflow) @@ -810,8 +807,8 @@ } /* Cache the new colors */ - ForeColor = Cursor->Cell[R][C].CursorColor; - BackColor = Cursor->Cell[R][C].CursorBackColor; + ForeColor = Screen->Cell[R][C].CellForeColor; + BackColor = Screen->Cell[R][C].CellBackColor; /* Set them on the screen */ Color[1] = BackColor; @@ -824,7 +821,7 @@ } /* Check if there's been a change in attributes */ - if (Cursor->Cell[R][C].CursorFlags != Attribute) + if (Screen->Cell[R][C].CellFlags != Attribute) { /* Yep! Are we also on a new row now? */ if (Overflow) @@ -841,7 +838,7 @@ } /* Set the new attributes on screen */ - Attribute = Cursor->Cell[R][C].CursorFlags; + Attribute = Screen->Cell[R][C].CellFlags; Status = VTUTF8ChannelProcessAttributes(Channel, Attribute); if (!NT_SUCCESS(Status)) goto Quickie; } @@ -861,7 +858,7 @@ } /* Write the character into our temporary buffer */ - *TmpBuffer = Cursor->Cell[R][C].CursorValue; + *TmpBuffer = Screen->Cell[R][C].Char; TmpBuffer[1] = UNICODE_NULL; /* Convert it to UTF-8 */ @@ -900,12 +897,12 @@ if (!NT_SUCCESS(Status)) goto Quickie; /* Set the current attribute one last time */ - Status = VTUTF8ChannelProcessAttributes(Channel, Channel->CursorFlags); + Status = VTUTF8ChannelProcessAttributes(Channel, Channel->CellFlags); if (!NT_SUCCESS(Status)) goto Quickie; /* Set the current colors one last time */ - Color[1] = Channel->CursorBackColor; - Color[0] = Channel->CursorColor; + Color[1] = Channel->CellBackColor; + Color[0] = Channel->CellForeColor; Status = VTUTF8ChannelAnsiDispatch(Channel, SacAnsiSetColors, Color, @@ -935,7 +932,7 @@ IN PWCHAR String, IN ULONG Size) { - PSAC_VTUTF8_SCREEN Cursor; + PSAC_VTUTF8_SCREEN Screen; ULONG i, EscapeSize, R, C; PWSTR pwch; CHECK_PARAMETER1(Channel); @@ -943,7 +940,7 @@ VTUTF8ChannelAssertCursor(Channel); /* Loop every character */ - Cursor = (PSAC_VTUTF8_SCREEN) Channel->OBuffer; + Screen = (PSAC_VTUTF8_SCREEN)Channel->OBuffer; for (i = 0; i < Size; i++) { /* Check what the character is */ @@ -995,13 +992,13 @@ for (C = 0; C < SAC_VTUTF8_COL_WIDTH; C++) { /* And replace it with one from the row below */ - Cursor->Cell[R][C] = Cursor->Cell[R + 1][C]; + Screen->Cell[R][C] = Screen->Cell[R + 1][C]; } } /* Now we're left with the before-last row, zero it out */ ASSERT(R == (SAC_VTUTF8_ROW_HEIGHT - 1)); - RtlZeroMemory(&Cursor->Cell[R], sizeof(Cursor->Cell[R])); + RtlZeroMemory(&Screen->Cell[R], sizeof(Screen->Cell[R])); /* Reset the row back by one */ Channel->CursorRow--; @@ -1018,10 +1015,10 @@ { /* Fill each remaining character with a space */ VTUTF8ChannelAssertCursor(Channel); - Cursor->Cell[Channel->CursorRow][Channel->CursorCol].CursorFlags = Channel->CursorFlags; - Cursor->Cell[Channel->CursorRow][Channel->CursorCol].CursorBackColor = Channel->CursorBackColor; - Cursor->Cell[Channel->CursorRow][Channel->CursorCol].CursorColor = Channel->CursorColor; - Cursor->Cell[Channel->CursorRow][Channel->CursorCol].CursorValue = ' '; + Screen->Cell[Channel->CursorRow][Channel->CursorCol].CellFlags = Channel->CellFlags; + Screen->Cell[Channel->CursorRow][Channel->CursorCol].CellBackColor = Channel->CellBackColor; + Screen->Cell[Channel->CursorRow][Channel->CursorCol].CellForeColor = Channel->CellForeColor; + Screen->Cell[Channel->CursorRow][Channel->CursorCol].Char = L' '; /* Move to the next character position, but don't overflow */ Channel->CursorCol++; @@ -1052,10 +1049,10 @@ /* Otherwise, print it out with the current attributes */ VTUTF8ChannelAssertCursor(Channel); - Cursor->Cell[Channel->CursorRow][Channel->CursorCol].CursorFlags = Channel->CursorFlags; - Cursor->Cell[Channel->CursorRow][Channel->CursorCol].CursorBackColor = Channel->CursorBackColor; - Cursor->Cell[Channel->CursorRow][Channel->CursorCol].CursorColor = Channel->CursorColor; - Cursor->Cell[Channel->CursorRow][Channel->CursorCol].CursorValue = *pwch; + Screen->Cell[Channel->CursorRow][Channel->CursorCol].CellFlags = Channel->CellFlags; + Screen->Cell[Channel->CursorRow][Channel->CursorCol].CellBackColor = Channel->CellBackColor; + Screen->Cell[Channel->CursorRow][Channel->CursorCol].CellForeColor = Channel->CellForeColor; + Screen->Cell[Channel->CursorRow][Channel->CursorCol].Char = *pwch; /* Move forward one character, but make sure not to overflow */ Channel->CursorCol++;

1 0

[hbelusca] 60641: [CONSRV]: Move the palette hack.
by hbelusca＠svn.reactos.org 13 Oct '13

13 Oct '13

Author: hbelusca Date: Sun Oct 13 16:21:55 2013 New Revision: 60641 URL: http://svn.reactos.org/svn/reactos?rev=60641&view=rev Log: [CONSRV]: Move the palette hack. Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/conoutput.c trunk/reactos/win32ss/user/winsrv/consrv/conoutput.c Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/conoutput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/condrv/conoutput.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/condrv/conoutput.c [iso-8859-1] Sun Oct 13 16:21:55 2013 @@ -237,45 +237,14 @@ { BOOL Success; -/******************************************************************************\ -|************** HACK! HACK! HACK! HACK! HACK! HACK! HACK! HACK! ***************| -\******************************************************************************/ - -#define PALETTESIZE 256 - - UINT i; - LPLOGPALETTE LogPalette; /* Pointer to logical palette */ - -PALETTEENTRY MyPalette[] = -{ {0, 0, 0x80,0} , // 1 - {0, 0x80,0, 0} , // 2 - {0, 0, 0, 0} , // 0 - {0, 0x80,0x80,0} , // 3 - {0x80,0, 0, 0} , // 4 - {0x80,0, 0x80,0} , // 5 - {0x80,0x80,0, 0} , // 6 - {0xC0,0xC0,0xC0,0} , // 7 - {0x80,0x80,0x80,0} , // 8 - {0, 0, 0xFF,0} , // 9 - {0, 0xFF,0, 0} , // 10 - {0, 0xFF,0xFF,0} , // 11 - {0xFF,0, 0, 0} , // 12 - {0xFF,0, 0xFF,0} , // 13 - {0xFF,0xFF,0, 0} , // 14 - {0xFF,0xFF,0xFF,0} }; // 15 - -/******************************************************************************\ -|************** HACK! HACK! HACK! HACK! HACK! HACK! HACK! HACK! ***************| -\******************************************************************************/ - - DPRINT1("ConDrvSetConsolePalette checkpt 0\n"); - + DPRINT1("ConDrvSetConsolePalette\n"); + + /* + * Parameters validation + */ if (Console == NULL || Buffer == NULL) return STATUS_INVALID_PARAMETER; - DPRINT1("ConDrvSetConsolePalette checkpt 1\n"); - - // FIXME: Is it useful ? if ( PaletteUsage != SYSPAL_STATIC && PaletteUsage != SYSPAL_NOSTATIC && PaletteUsage != SYSPAL_NOSTATIC256 ) @@ -283,48 +252,8 @@ return STATUS_INVALID_PARAMETER; } - DPRINT1("ConDrvSetConsolePalette checkpt 2\n"); - - /* Validity check */ - ASSERT(Console == Buffer->Header.Console); - - - -/******************************************************************************\ -|************** HACK! HACK! HACK! HACK! HACK! HACK! HACK! HACK! ***************| -\******************************************************************************/ - - DPRINT1("HACK: FIXME: ConDrvSetConsolePalette - Use hacked palette for testing purposes!!\n"); - - LogPalette = (LPLOGPALETTE)ConsoleAllocHeap(HEAP_ZERO_MEMORY, - (sizeof(LOGPALETTE) + - (sizeof(PALETTEENTRY) * PALETTESIZE))); - - if (LogPalette) - { - LogPalette->palVersion = 0x300; - LogPalette->palNumEntries = PALETTESIZE; - - for(i=0; i < PALETTESIZE;i++) - { - LogPalette->palPalEntry[i] = MyPalette[i % sizeof(MyPalette)/sizeof(MyPalette[0])]; - } - - PaletteHandle = CreatePalette(LogPalette); - PaletteUsage = SYSPAL_NOSTATIC256; - ConsoleFreeHeap(LogPalette); - } - else - { - DPRINT1("ConDrvSetConsolePalette - Hacked LogPalette is NULL\n"); - } - -/******************************************************************************\ -|************** HACK! HACK! HACK! HACK! HACK! HACK! HACK! HACK! ***************| -\******************************************************************************/ - - - + /* Validity check */ + ASSERT(Console == Buffer->Header.Console); /* Change the palette */ DPRINT1("ConDrvSetConsolePalette calling TermSetPalette\n"); Modified: trunk/reactos/win32ss/user/winsrv/consrv/conoutput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/conoutput.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/conoutput.c [iso-8859-1] Sun Oct 13 16:21:55 2013 @@ -62,6 +62,37 @@ PCONSOLE_SETPALETTE SetPaletteRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.SetPaletteRequest; // PGRAPHICS_SCREEN_BUFFER Buffer; PCONSOLE_SCREEN_BUFFER Buffer; + + +/******************************************************************************\ +|************** HACK! HACK! HACK! HACK! HACK! HACK! HACK! HACK! ***************| +\******************************************************************************/ + +#define PALETTESIZE 256 + + LPLOGPALETTE LogPalette; /* Pointer to logical palette */ + PALETTEENTRY MyPalette[] = + { {0, 0, 0x80,0} , // 1 + {0, 0x80,0, 0} , // 2 + {0, 0, 0, 0} , // 0 + {0, 0x80,0x80,0} , // 3 + {0x80,0, 0, 0} , // 4 + {0x80,0, 0x80,0} , // 5 + {0x80,0x80,0, 0} , // 6 + {0xC0,0xC0,0xC0,0} , // 7 + {0x80,0x80,0x80,0} , // 8 + {0, 0, 0xFF,0} , // 9 + {0, 0xFF,0, 0} , // 10 + {0, 0xFF,0xFF,0} , // 11 + {0xFF,0, 0, 0} , // 12 + {0xFF,0, 0xFF,0} , // 13 + {0xFF,0xFF,0, 0} , // 14 + {0xFF,0xFF,0xFF,0} }; // 15 + +/******************************************************************************\ +|************** HACK! HACK! HACK! HACK! HACK! HACK! HACK! HACK! ***************| +\******************************************************************************/ + DPRINT1("SrvSetConsolePalette\n"); @@ -80,6 +111,42 @@ &Buffer, GENERIC_WRITE, TRUE); if (!NT_SUCCESS(Status)) return Status; + +/******************************************************************************\ +|************** HACK! HACK! HACK! HACK! HACK! HACK! HACK! HACK! ***************| +\******************************************************************************/ + + DPRINT1("HACK: FIXME: SrvSetConsolePalette - Use hacked palette for testing purposes!!\n"); + + LogPalette = (LPLOGPALETTE)ConsoleAllocHeap(HEAP_ZERO_MEMORY, + (sizeof(LOGPALETTE) + + (sizeof(PALETTEENTRY) * PALETTESIZE))); + if (LogPalette) + { + UINT i; + + LogPalette->palVersion = 0x300; + LogPalette->palNumEntries = PALETTESIZE; + + for (i = 0 ; i < PALETTESIZE ; i++) + { + LogPalette->palPalEntry[i] = MyPalette[i % sizeof(MyPalette)/sizeof(MyPalette[0])]; + } + + SetPaletteRequest->PaletteHandle = CreatePalette(LogPalette); + SetPaletteRequest->Usage = SYSPAL_NOSTATIC256; + ConsoleFreeHeap(LogPalette); + } + else + { + DPRINT1("SrvSetConsolePalette - Hacked LogPalette is NULL\n"); + } + +/******************************************************************************\ +|************** HACK! HACK! HACK! HACK! HACK! HACK! HACK! HACK! ***************| +\******************************************************************************/ + + DPRINT1("ConDrvSetConsolePalette calling...\n"); Status = ConDrvSetConsolePalette(Buffer->Header.Console,

1 0

[hbelusca] 60640: Don't forget to add files to compilation, Arch!
by hbelusca＠svn.reactos.org 13 Oct '13

13 Oct '13

Author: hbelusca Date: Sun Oct 13 14:15:36 2013 New Revision: 60640 URL: http://svn.reactos.org/svn/reactos?rev=60640&view=rev Log: Don't forget to add files to compilation, Arch! Modified: trunk/reactos/win32ss/user/winsrv/consrv.cmake Modified: trunk/reactos/win32ss/user/winsrv/consrv.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv.cmake [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv.cmake [iso-8859-1] Sun Oct 13 14:15:36 2013 @@ -22,6 +22,7 @@ consrv/condrv/graphics.c consrv/condrv/text.c consrv/frontends/input.c + consrv/frontends/gui/fullscreen.c consrv/frontends/gui/guiterm.c consrv/frontends/gui/guisettings.c consrv/frontends/gui/graphics.c

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