Ros-diffs August 2013

ros-diffs@reactos.org

10 participants
327 discussions

[aandrejevic] 59782: [SOFT386] Implement instruction fetch functions. Implement CPU exception system.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Mon Aug 19 18:23:39 2013 New Revision: 59782 URL: http://svn.reactos.org/svn/reactos?rev=59782&view=rev Log: [SOFT386] Implement instruction fetch functions. Implement CPU exception system. Modified: branches/ntvdm/include/reactos/libs/soft386/soft386.h branches/ntvdm/lib/soft386/common.c branches/ntvdm/lib/soft386/common.h Modified: branches/ntvdm/include/reactos/libs/soft386/soft386.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/reactos/libs/soft… ============================================================================== --- branches/ntvdm/include/reactos/libs/soft386/soft386.h [iso-8859-1] (original) +++ branches/ntvdm/include/reactos/libs/soft386/soft386.h [iso-8859-1] Mon Aug 19 18:23:39 2013 @@ -28,6 +28,12 @@ #define SOFT386_CR0_CD (1 << 30) #define SOFT386_CR0_PG (1 << 31) +#define SOFT386_IDT_TASK_GATE 0x5 +#define SOFT386_IDT_INT_GATE 0x6 +#define SOFT386_IDT_TRAP_GATE 0x7 +#define SOFT386_IDT_INT_GATE_32 0xE +#define SOFT386_IDT_TRAP_GATE_32 0xF + struct _SOFT386_STATE; typedef struct _SOFT386_STATE SOFT386_STATE, *PSOFT386_STATE; @@ -75,6 +81,26 @@ SOFT386_REG_DR5, SOFT386_REG_DR6, SOFT386_REG_DR7 +}; + +enum _SOFT386_EXCEPTIONS +{ + SOFT386_EXCEPTION_DE = 0x00, + SOFT386_EXCEPTION_DB = 0x01, + SOFT386_EXCEPTION_BP = 0x03, + SOFT386_EXCEPTION_OF = 0x04, + SOFT386_EXCEPTION_BR = 0x05, + SOFT386_EXCEPTION_UD = 0x06, + SOFT386_EXCEPTION_NM = 0x07, + SOFT386_EXCEPTION_DF = 0x08, + SOFT386_EXCEPTION_TS = 0x0A, + SOFT386_EXCEPTION_NP = 0x0B, + SOFT386_EXCEPTION_SS = 0x0C, + SOFT386_EXCEPTION_GP = 0x0D, + SOFT386_EXCEPTION_PF = 0x0E, + SOFT386_EXCEPTION_MF = 0x10, + SOFT386_EXCEPTION_AC = 0x11, + SOFT386_EXCEPTION_MC = 0x12 }; typedef @@ -162,7 +188,7 @@ ULONG Size : 1; ULONG Granularity : 1; ULONG BaseHigh : 8; -} SOFT386_GDT_ENTRY; +} SOFT386_GDT_ENTRY, *PSOFT386_GDT_ENTRY; typedef struct { @@ -174,12 +200,12 @@ ULONG Dpl : 2; ULONG Present : 1; ULONG OffsetHigh : 16; -} SOFT386_IDT_ENTRY; +} SOFT386_IDT_ENTRY, *PSOFT386_IDT_ENTRY; typedef struct _SOFT386_TABLE_REG { USHORT Size; - ULONG Address; + ULONG Address; } SOFT386_TABLE_REG, *PSOFT386_TABLE_REG; typedef union _SOFT386_FLAGS_REG @@ -255,6 +281,7 @@ ULONGLONG TimeStampCounter; ULONG ControlRegisters[SOFT386_NUM_CTRL_REGS]; ULONG DebugRegisters[SOFT386_NUM_DBG_REGS]; + ULONG ExceptionCount; }; /* FUNCTIONS ******************************************************************/ Modified: branches/ntvdm/lib/soft386/common.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/common.c?rev=… ============================================================================== --- branches/ntvdm/lib/soft386/common.c [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/common.c [iso-8859-1] Mon Aug 19 18:23:39 2013 @@ -50,7 +50,7 @@ if ((Offset + Size) >= CachedDescriptor->Limit) { /* Read beyond limit */ - // TODO: Generate exception #GP + Soft386Exception(State, SOFT386_EXCEPTION_GP); return FALSE; } @@ -62,13 +62,13 @@ if (!CachedDescriptor->Present) { - // TODO: Generate exception #NP + Soft386Exception(State, SOFT386_EXCEPTION_NP); return FALSE; } if (GET_SEGMENT_RPL(CachedDescriptor->Selector) > CachedDescriptor->Dpl) { - // TODO: Generate exception #GP + Soft386Exception(State, SOFT386_EXCEPTION_GP); return FALSE; } @@ -78,7 +78,7 @@ { /* Data segment not executable */ - // TODO: Generate exception #GP + Soft386Exception(State, SOFT386_EXCEPTION_GP); return FALSE; } } @@ -88,7 +88,7 @@ { /* Code segment not readable */ - // TODO: Generate exception #GP + Soft386Exception(State, SOFT386_EXCEPTION_GP); return FALSE; } } @@ -133,7 +133,7 @@ if ((Offset + Size) >= CachedDescriptor->Limit) { /* Write beyond limit */ - // TODO: Generate exception #GP + Soft386Exception(State, SOFT386_EXCEPTION_GP); return FALSE; } @@ -145,13 +145,13 @@ if (!CachedDescriptor->Present) { - // TODO: Generate exception #NP + Soft386Exception(State, SOFT386_EXCEPTION_NP); return FALSE; } if (GET_SEGMENT_RPL(CachedDescriptor->Selector) > CachedDescriptor->Dpl) { - // TODO: Generate exception #GP + Soft386Exception(State, SOFT386_EXCEPTION_GP); return FALSE; } @@ -159,14 +159,14 @@ { /* Code segment not writable */ - // TODO: Generate exception #GP + Soft386Exception(State, SOFT386_EXCEPTION_GP); return FALSE; } else if (!CachedDescriptor->ReadWrite) { /* Data segment not writeable */ - // TODO: Generate exception #GP + Soft386Exception(State, SOFT386_EXCEPTION_GP); return FALSE; } } @@ -207,7 +207,7 @@ if (State->GeneralRegs[SOFT386_REG_ESP].Long >= 1 && State->GeneralRegs[SOFT386_REG_ESP].Long <= 3) { - // TODO: Exception #SS + Soft386Exception(State, SOFT386_EXCEPTION_SS); return FALSE; } @@ -229,7 +229,7 @@ /* Check if SP is 1 */ if (State->GeneralRegs[SOFT386_REG_ESP].Long == 1) { - // TODO: Exception #SS + Soft386Exception(State, SOFT386_EXCEPTION_SS); return FALSE; } @@ -262,7 +262,7 @@ /* Check if ESP is 0xFFFFFFFF */ if (State->GeneralRegs[SOFT386_REG_ESP].Long == 0xFFFFFFFF) { - // TODO: Exception #SS + Soft386Exception(State, SOFT386_EXCEPTION_SS); return FALSE; } @@ -291,7 +291,7 @@ /* Check if SP is 0xFFFF */ if (State->GeneralRegs[SOFT386_REG_ESP].LowWord == 0xFFFF) { - // TODO: Exception #SS + Soft386Exception(State, SOFT386_EXCEPTION_SS); return FALSE; } @@ -319,7 +319,7 @@ inline BOOLEAN -Soft386LoadSegment(PSOFT386_STATE State, INT Segment, WORD Selector) +Soft386LoadSegment(PSOFT386_STATE State, INT Segment, USHORT Selector) { PSOFT386_SEG_REG CachedDescriptor; SOFT386_GDT_ENTRY GdtEntry; @@ -335,7 +335,7 @@ /* Make sure the GDT contains the entry */ if (GET_SEGMENT_INDEX(Selector) >= (State->Gdtr.Size + 1)) { - // TODO: Exception #GP + Soft386Exception(State, SOFT386_EXCEPTION_GP); return FALSE; } @@ -362,26 +362,26 @@ { if (GET_SEGMENT_INDEX(Selector) == 0) { - // TODO: Exception #GP + Soft386Exception(State, SOFT386_EXCEPTION_GP); return FALSE; } if (GdtEntry.Executable || !GdtEntry.ReadWrite) { - // TODO: Exception #GP + Soft386Exception(State, SOFT386_EXCEPTION_GP); return FALSE; } if ((GET_SEGMENT_RPL(Selector) != Soft386GetCurrentPrivLevel(State)) || (GET_SEGMENT_RPL(Selector) != GdtEntry.Dpl)) { - // TODO: Exception #GP + Soft386Exception(State, SOFT386_EXCEPTION_GP); return FALSE; } if (!GdtEntry.Present) { - // TODO: Exception #SS + Soft386Exception(State, SOFT386_EXCEPTION_SS); return FALSE; } } @@ -390,13 +390,13 @@ if ((GET_SEGMENT_RPL(Selector) > GdtEntry.Dpl) && (Soft386GetCurrentPrivLevel(State) > GdtEntry.Dpl)) { - // TODO: Exception #GP + Soft386Exception(State, SOFT386_EXCEPTION_GP); return FALSE; } if (!GdtEntry.Present) { - // TODO: Exception #NP + Soft386Exception(State, SOFT386_EXCEPTION_NP); return FALSE; } } @@ -427,4 +427,329 @@ return TRUE; } +inline +BOOLEAN +Soft386FetchByte(PSOFT386_STATE State, PUCHAR Data) +{ + PSOFT386_SEG_REG CachedDescriptor; + + /* Get the cached descriptor of CS */ + CachedDescriptor = &State->SegmentRegs[SOFT386_REG_CS]; + + /* Read from memory */ + if (!Soft386ReadMemory(State, + SOFT386_REG_CS, + (CachedDescriptor->Size) ? State->InstPtr.Long + : State->InstPtr.LowWord, + TRUE, + Data, + sizeof(UCHAR))) + { + /* Exception occurred during instruction fetch */ + return FALSE; + } + + /* Advance the instruction pointer */ + if (CachedDescriptor->Size) State->InstPtr.Long++; + else State->InstPtr.LowWord++; + + return TRUE; +} + +inline +BOOLEAN +Soft386FetchWord(PSOFT386_STATE State, PUSHORT Data) +{ + PSOFT386_SEG_REG CachedDescriptor; + + /* Get the cached descriptor of CS */ + CachedDescriptor = &State->SegmentRegs[SOFT386_REG_CS]; + + /* Read from memory */ + // FIXME: Fix byte order on big-endian machines + if (!Soft386ReadMemory(State, + SOFT386_REG_CS, + (CachedDescriptor->Size) ? State->InstPtr.Long + : State->InstPtr.LowWord, + TRUE, + Data, + sizeof(USHORT))) + { + /* Exception occurred during instruction fetch */ + return FALSE; + } + + /* Advance the instruction pointer */ + if (CachedDescriptor->Size) State->InstPtr.Long += sizeof(USHORT); + else State->InstPtr.LowWord += sizeof(USHORT); + + return TRUE; +} + +inline +BOOLEAN +Soft386FetchDword(PSOFT386_STATE State, PULONG Data) +{ + PSOFT386_SEG_REG CachedDescriptor; + + /* Get the cached descriptor of CS */ + CachedDescriptor = &State->SegmentRegs[SOFT386_REG_CS]; + + /* Read from memory */ + // FIXME: Fix byte order on big-endian machines + if (!Soft386ReadMemory(State, + SOFT386_REG_CS, + (CachedDescriptor->Size) ? State->InstPtr.Long + : State->InstPtr.LowWord, + TRUE, + Data, + sizeof(ULONG))) + { + /* Exception occurred during instruction fetch */ + return FALSE; + } + + /* Advance the instruction pointer */ + if (CachedDescriptor->Size) State->InstPtr.Long += sizeof(ULONG); + else State->InstPtr.LowWord += sizeof(ULONG); + + return TRUE; +} + +inline +BOOLEAN +Soft386InterruptInternal(PSOFT386_STATE State, + USHORT SegmentSelector, + ULONG Offset, + BOOLEAN InterruptGate) +{ + /* Check for protected mode */ + if (State->ControlRegisters[SOFT386_REG_CR0] & SOFT386_CR0_PE) + { + SOFT386_TSS Tss; + USHORT OldSs = State->SegmentRegs[SOFT386_REG_SS].Selector; + ULONG OldEsp = State->GeneralRegs[SOFT386_REG_ESP].Long; + + /* Check if the interrupt handler is more privileged */ + if (Soft386GetCurrentPrivLevel(State) > GET_SEGMENT_RPL(SegmentSelector)) + { + /* Read the TSS */ + // FIXME: This code is only correct when paging is disabled!!! + if (State->MemReadCallback) + { + State->MemReadCallback(State, + State->Tss.Address, + &Tss, + sizeof(Tss)); + } + else + { + RtlMoveMemory(&Tss, (PVOID)State->Tss.Address, sizeof(Tss)); + } + + /* Check the new (higher) privilege level */ + switch (GET_SEGMENT_RPL(SegmentSelector)) + { + case 0: + { + if (!Soft386LoadSegment(State, SOFT386_REG_SS, Tss.Ss0)) + { + /* Exception occurred */ + return FALSE; + } + State->GeneralRegs[SOFT386_REG_ESP].Long = Tss.Esp0; + + break; + } + + case 1: + { + if (!Soft386LoadSegment(State, SOFT386_REG_SS, Tss.Ss1)) + { + /* Exception occurred */ + return FALSE; + } + State->GeneralRegs[SOFT386_REG_ESP].Long = Tss.Esp1; + + break; + } + + case 2: + { + if (!Soft386LoadSegment(State, SOFT386_REG_SS, Tss.Ss2)) + { + /* Exception occurred */ + return FALSE; + } + State->GeneralRegs[SOFT386_REG_ESP].Long = Tss.Esp2; + + break; + } + + default: + { + /* Should never reach here! */ + ASSERT(FALSE); + } + } + + /* Push SS selector */ + if (!Soft386StackPush(State, OldSs)) return FALSE; + + /* Push stack pointer */ + if (Soft386StackPush(State, OldEsp)) return FALSE; + } + } + + /* Push EFLAGS */ + if (!Soft386StackPush(State, State->Flags.Long)) return FALSE; + + /* Push CS selector */ + if (!Soft386StackPush(State, State->SegmentRegs[SOFT386_REG_CS].Selector)) return FALSE; + + /* Push the instruction pointer */ + if (!Soft386StackPush(State, State->InstPtr.Long)) return FALSE; + + if (InterruptGate) + { + /* Disable interrupts after a jump to an interrupt gate handler */ + State->Flags.If = FALSE; + } + + /* Load new CS */ + if (!Soft386LoadSegment(State, SOFT386_REG_CS, SegmentSelector)) + { + /* An exception occurred during the jump */ + return FALSE; + } + + if (State->SegmentRegs[SOFT386_REG_CS].Size) + { + /* 32-bit code segment, use EIP */ + State->InstPtr.Long = Offset; + } + else + { + /* 16-bit code segment, use IP */ + State->InstPtr.LowWord = LOWORD(Offset); + } + + return TRUE; +} + +inline +BOOLEAN +Soft386GetIntVector(PSOFT386_STATE State, + UCHAR Number, + PSOFT386_IDT_ENTRY IdtEntry) +{ + ULONG FarPointer; + + /* Check for protected mode */ + if (State->ControlRegisters[SOFT386_REG_CR0] & SOFT386_CR0_PE) + { + /* Read from the IDT */ + // FIXME: This code is only correct when paging is disabled!!! + if (State->MemReadCallback) + { + State->MemReadCallback(State, + State->Idtr.Address + + Number * sizeof(*IdtEntry), + IdtEntry, + sizeof(*IdtEntry)); + } + else + { + RtlMoveMemory(IdtEntry, + (PVOID)(State->Idtr.Address + + Number * sizeof(*IdtEntry)), + sizeof(*IdtEntry)); + } + } + else + { + /* Read from the real-mode IVT */ + + /* Paging is always disabled in real mode */ + if (State->MemReadCallback) + { + State->MemReadCallback(State, + State->Idtr.Address + + Number * sizeof(FarPointer), + &FarPointer, + sizeof(FarPointer)); + } + else + { + RtlMoveMemory(IdtEntry, + (PVOID)(State->Idtr.Address + + Number * sizeof(FarPointer)), + sizeof(FarPointer)); + } + + /* Fill a fake IDT entry */ + IdtEntry->Offset = LOWORD(FarPointer); + IdtEntry->Selector = HIWORD(FarPointer); + IdtEntry->Zero = 0; + IdtEntry->Type = SOFT386_IDT_INT_GATE; + IdtEntry->Storage = FALSE; + IdtEntry->Dpl = 0; + IdtEntry->Present = TRUE; + IdtEntry->OffsetHigh = 0; + } + + /* + * Once paging support is implemented this function + * will not always return true + */ + return TRUE; +} + +VOID +__fastcall +Soft386Exception(PSOFT386_STATE State, INT ExceptionCode) +{ + SOFT386_IDT_ENTRY IdtEntry; + + /* Increment the exception count */ + State->ExceptionCount++; + + /* Check if the exception occurred more than once */ + if (State->ExceptionCount > 1) + { + /* Then this is a double fault */ + ExceptionCode = SOFT386_EXCEPTION_DF; + } + + /* Check if this is a triple fault */ + if (State->ExceptionCount == 3) + { + /* Reset the CPU */ + Soft386Reset(State); + return; + } + + if (!Soft386GetIntVector(State, ExceptionCode, &IdtEntry)) + { + /* + * If this function failed, that means Soft386Exception + * was called again, so just return in this case. + */ + return; + } + + /* Perform the interrupt */ + if (!Soft386InterruptInternal(State, + IdtEntry.Selector, + MAKELONG(IdtEntry.Offset, IdtEntry.OffsetHigh), + IdtEntry.Type)) + { + /* + * If this function failed, that means Soft386Exception + * was called again, so just return in this case. + */ + return; + } +} + /* EOF */ Modified: branches/ntvdm/lib/soft386/common.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/common.h?rev=… ============================================================================== --- branches/ntvdm/lib/soft386/common.h [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/common.h [iso-8859-1] Mon Aug 19 18:23:39 2013 @@ -61,7 +61,58 @@ ( PSOFT386_STATE State, INT Segment, - WORD Selector + USHORT Selector +); + +inline +BOOLEAN +Soft386FetchByte +( + PSOFT386_STATE State, + PUCHAR Data +); + +inline +BOOLEAN +Soft386FetchWord +( + PSOFT386_STATE State, + PUSHORT Data +); + +inline +BOOLEAN +Soft386FetchDword +( + PSOFT386_STATE State, + PULONG Data +); + +inline +BOOLEAN +Soft386InterruptInternal +( + PSOFT386_STATE State, + USHORT SegmentSelector, + ULONG Offset, + BOOLEAN InterruptGate +); + +inline +BOOLEAN +Soft386GetIntVector +( + PSOFT386_STATE State, + UCHAR Number, + PSOFT386_IDT_ENTRY IdtEntry +); + +VOID +__fastcall +Soft386Exception +( + PSOFT386_STATE State, + INT ExceptionCode ); #endif // _COMMON_H_

11 years, 1 month

[hbelusca] 59781: Rename CSR_CONNECTION_INFO and CONSOLE_CONNECTION_INFO to the same way as BASESRV_API_CONNECTINFO

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Aug 19 18:14:43 2013 New Revision: 59781 URL: http://svn.reactos.org/svn/reactos?rev=59781&view=rev Log: Rename CSR_CONNECTION_INFO and CONSOLE_CONNECTION_INFO to the same way as BASESRV_API_CONNECTINFO Modified: trunk/reactos/dll/ntdll/csr/connect.c trunk/reactos/dll/win32/kernel32/client/console/init.c trunk/reactos/include/reactos/subsys/csr/csrmsg.h trunk/reactos/include/reactos/subsys/win/basemsg.h trunk/reactos/include/reactos/subsys/win/conmsg.h trunk/reactos/subsystems/win32/csrsrv/api.c trunk/reactos/subsystems/win32/csrsrv/api.h trunk/reactos/subsystems/win32/csrsrv/server.c trunk/reactos/win32ss/user/winsrv/consrv/init.c Modified: trunk/reactos/dll/ntdll/csr/connect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/csr/connect.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/csr/connect.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/csr/connect.c [iso-8859-1] Mon Aug 19 18:14:43 2013 @@ -44,8 +44,8 @@ SECURITY_QUALITY_OF_SERVICE SecurityQos; SID_IDENTIFIER_AUTHORITY NtSidAuthority = {SECURITY_NT_AUTHORITY}; PSID SystemSid = NULL; - CSR_CONNECTION_INFO ConnectionInfo; - ULONG ConnectionInfoLength = sizeof(CSR_CONNECTION_INFO); + CSR_API_CONNECTINFO ConnectionInfo; + ULONG ConnectionInfoLength = sizeof(CSR_API_CONNECTINFO); DPRINT("%s(%S)\n", __FUNCTION__, ObjectDirectory); Modified: trunk/reactos/dll/win32/kernel32/client/console/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/console/init.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/console/init.c [iso-8859-1] Mon Aug 19 18:14:43 2013 @@ -175,7 +175,7 @@ ULONG SessionId = NtCurrentPeb()->SessionId; BOOLEAN InServer; - CONSOLE_CONNECTION_INFO ConnectInfo; + CONSRV_API_CONNECTINFO ConnectInfo; ULONG ConnectInfoSize = sizeof(ConnectInfo); DPRINT("BasepInitConsole for : %wZ\n", &Parameters->ImagePathName); Modified: trunk/reactos/include/reactos/subsys/csr/csrmsg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/csr… ============================================================================== --- trunk/reactos/include/reactos/subsys/csr/csrmsg.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/subsys/csr/csrmsg.h [iso-8859-1] Mon Aug 19 18:14:43 2013 @@ -44,7 +44,7 @@ (ULONG)((ULONG)(ApiNumber) & 0xFFFF) -typedef struct _CSR_CONNECTION_INFO +typedef struct _CSR_API_CONNECTINFO { ULONG Version; ULONG Unknown; @@ -55,12 +55,12 @@ ULONG DebugFlags; ULONG Unknown2[3]; HANDLE ProcessId; -} CSR_CONNECTION_INFO, *PCSR_CONNECTION_INFO; +} CSR_API_CONNECTINFO, *PCSR_API_CONNECTINFO; #define CSRSRV_VERSION 0x10000 // We must have a size at most equal to the maximum acceptable LPC data size. -C_ASSERT(sizeof(CSR_CONNECTION_INFO) <= LPC_MAX_DATA_LENGTH); +C_ASSERT(sizeof(CSR_API_CONNECTINFO) <= LPC_MAX_DATA_LENGTH); typedef struct _CSR_IDENTIFY_ALTERTABLE_THREAD @@ -102,7 +102,7 @@ PORT_MESSAGE Header; union { - CSR_CONNECTION_INFO ConnectionInfo; // Uniquely used in CSRSRV for internal signaling (opening a new connection). + CSR_API_CONNECTINFO ConnectionInfo; // Uniquely used in CSRSRV for internal signaling (opening a new connection). struct { PCSR_CAPTURE_BUFFER CsrCaptureData; Modified: trunk/reactos/include/reactos/subsys/win/basemsg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/win… ============================================================================== --- trunk/reactos/include/reactos/subsys/win/basemsg.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/subsys/win/basemsg.h [iso-8859-1] Mon Aug 19 18:14:43 2013 @@ -53,7 +53,7 @@ } BASESRV_API_NUMBER, *PBASESRV_API_NUMBER; -typedef struct +typedef struct _BASESRV_API_CONNECTINFO { ULONG ExpectedVersion; HANDLE DefaultObjectDirectory; Modified: trunk/reactos/include/reactos/subsys/win/conmsg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/win… ============================================================================== --- trunk/reactos/include/reactos/subsys/win/conmsg.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/subsys/win/conmsg.h [iso-8859-1] Mon Aug 19 18:14:43 2013 @@ -126,7 +126,7 @@ INT IconIndex; // Index of the icon } CONSOLE_START_INFO, *PCONSOLE_START_INFO; -typedef struct _CONSOLE_CONNECTION_INFO +typedef struct _CONSRV_API_CONNECTINFO { BOOL ConsoleNeeded; // Used for GUI apps only. @@ -140,7 +140,7 @@ HANDLE InputWaitHandle; LPTHREAD_START_ROUTINE CtrlDispatcher; LPTHREAD_START_ROUTINE PropDispatcher; -} CONSOLE_CONNECTION_INFO, *PCONSOLE_CONNECTION_INFO; +} CONSRV_API_CONNECTINFO, *PCONSRV_API_CONNECTINFO; typedef struct Modified: trunk/reactos/subsystems/win32/csrsrv/api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrsrv/ap… ============================================================================== --- trunk/reactos/subsystems/win32/csrsrv/api.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrsrv/api.c [iso-8859-1] Mon Aug 19 18:14:43 2013 @@ -134,7 +134,7 @@ PCSR_THREAD CsrThread = NULL; PCSR_PROCESS CsrProcess = NULL; NTSTATUS Status = STATUS_SUCCESS; - PCSR_CONNECTION_INFO ConnectInfo = &ApiMessage->ConnectionInfo; + PCSR_API_CONNECTINFO ConnectInfo = &ApiMessage->ConnectionInfo; BOOLEAN AllowConnection = FALSE; REMOTE_PORT_VIEW RemotePortView; HANDLE ServerPort; @@ -913,7 +913,7 @@ { DPRINT1("CSRSS: Creating %wZ port and associated threads\n", &CsrApiPortName); DPRINT1("CSRSS: sizeof( CONNECTINFO ) == %ld sizeof( API_MSG ) == %ld\n", - sizeof(CSR_CONNECTION_INFO), sizeof(CSR_API_MESSAGE)); + sizeof(CSR_API_CONNECTINFO), sizeof(CSR_API_MESSAGE)); } /* FIXME: Create a Security Descriptor */ @@ -928,7 +928,7 @@ /* Create the Port Object */ Status = NtCreatePort(&CsrApiPort, &ObjectAttributes, - sizeof(CSR_CONNECTION_INFO), + sizeof(CSR_API_CONNECTINFO), sizeof(CSR_API_MESSAGE), 16 * PAGE_SIZE); if (NT_SUCCESS(Status)) Modified: trunk/reactos/subsystems/win32/csrsrv/api.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrsrv/ap… ============================================================================== --- trunk/reactos/subsystems/win32/csrsrv/api.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrsrv/api.h [iso-8859-1] Mon Aug 19 18:14:43 2013 @@ -172,7 +172,7 @@ NTSTATUS NTAPI CsrSrvAttachSharedSection(IN PCSR_PROCESS CsrProcess OPTIONAL, - OUT PCSR_CONNECTION_INFO ConnectInfo); + OUT PCSR_API_CONNECTINFO ConnectInfo); NTSTATUS NTAPI Modified: trunk/reactos/subsystems/win32/csrsrv/server.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrsrv/se… ============================================================================== --- trunk/reactos/subsystems/win32/csrsrv/server.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrsrv/server.c [iso-8859-1] Mon Aug 19 18:14:43 2013 @@ -444,7 +444,7 @@ NTSTATUS NTAPI CsrSrvAttachSharedSection(IN PCSR_PROCESS CsrProcess OPTIONAL, - OUT PCSR_CONNECTION_INFO ConnectInfo) + OUT PCSR_API_CONNECTINFO ConnectInfo) { NTSTATUS Status; ULONG ViewSize = 0; Modified: trunk/reactos/win32ss/user/winsrv/consrv/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/init.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/init.c [iso-8859-1] Mon Aug 19 18:14:43 2013 @@ -397,12 +397,12 @@ **************************************************************************/ NTSTATUS Status = STATUS_SUCCESS; - PCONSOLE_CONNECTION_INFO ConnectInfo = (PCONSOLE_CONNECTION_INFO)ConnectionInfo; + PCONSRV_API_CONNECTINFO ConnectInfo = (PCONSRV_API_CONNECTINFO)ConnectionInfo; PCONSOLE_PROCESS_DATA ProcessData = ConsoleGetPerProcessData(CsrProcess); if ( ConnectionInfo == NULL || ConnectionInfoLength == NULL || - *ConnectionInfoLength != sizeof(CONSOLE_CONNECTION_INFO) ) + *ConnectionInfoLength != sizeof(CONSRV_API_CONNECTINFO) ) { DPRINT1("CONSRV: Connection failed\n"); return STATUS_UNSUCCESSFUL;

11 years, 1 month

[fireball] 59780: [GLU32] - Lee Schroeder: Add version information. CORE-7392 #resolve #comment Thanks.

by fireball＠svn.reactos.org

Author: fireball Date: Mon Aug 19 18:11:47 2013 New Revision: 59780 URL: http://svn.reactos.org/svn/reactos?rev=59780&view=rev Log: [GLU32] - Lee Schroeder: Add version information. CORE-7392 #resolve #comment Thanks. Added: trunk/reactos/dll/opengl/glu32/glu32.rc (with props) Modified: trunk/reactos/dll/opengl/glu32/CMakeLists.txt Modified: trunk/reactos/dll/opengl/glu32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/CMakeList… ============================================================================== --- trunk/reactos/dll/opengl/glu32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/glu32/CMakeLists.txt [iso-8859-1] Mon Aug 19 18:11:47 2013 @@ -18,6 +18,7 @@ spec2def(glu32.dll glu32.spec ADD_IMPORTLIB) list(APPEND SOURCE + glu32.rc src/libutil/error.c src/libutil/glue.c src/libutil/mipmap.c Added: trunk/reactos/dll/opengl/glu32/glu32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/glu32.rc?… ============================================================================== --- trunk/reactos/dll/opengl/glu32/glu32.rc (added) +++ trunk/reactos/dll/opengl/glu32/glu32.rc [iso-8859-1] Mon Aug 19 18:11:47 2013 @@ -0,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS OpenGL Utility Library\0" +#define REACTOS_STR_INTERNAL_NAME "glu32\0" +#define REACTOS_STR_ORIGINAL_FILENAME "glu32.dll\0" +#include <reactos/version.rc> Propchange: trunk/reactos/dll/opengl/glu32/glu32.rc ------------------------------------------------------------------------------ svn:eol-style = native

11 years, 1 month

[hbelusca] 59779: [KERNEL32] Use some existing #define'd constants. [CSRSRV-BASESRV] - Add CSR version define (based from BASESRV version define). - Add missing BASESRV structures, taken from https...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Aug 19 17:50:27 2013 New Revision: 59779 URL: http://svn.reactos.org/svn/reactos?rev=59779&view=rev Log: [KERNEL32] Use some existing #define'd constants. [CSRSRV-BASESRV] - Add CSR version define (based from BASESRV version define). - Add missing BASESRV structures, taken from https://code.google.com/p/ontl/source/browse/branches/devel/ntl/nt/csr.hxx (OpenNT Native Template Library). Modified: trunk/reactos/dll/ntdll/csr/connect.c trunk/reactos/dll/win32/kernel32/client/dosdev.c trunk/reactos/dll/win32/kernel32/client/file/filename.c trunk/reactos/dll/win32/kernel32/client/proc.c trunk/reactos/dll/win32/kernel32/client/vdm.c trunk/reactos/include/reactos/subsys/csr/csrmsg.h trunk/reactos/include/reactos/subsys/win/basemsg.h trunk/reactos/subsystems/win/basesrv/dosdev.c trunk/reactos/subsystems/win/basesrv/proc.c trunk/reactos/subsystems/win/basesrv/vdm.c Modified: trunk/reactos/dll/ntdll/csr/connect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/csr/connect.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/csr/connect.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/csr/connect.c [iso-8859-1] Mon Aug 19 17:50:27 2013 @@ -107,7 +107,7 @@ SecurityQos.EffectiveOnly = TRUE; /* Setup the connection info */ - ConnectionInfo.Version = 0x10000; + ConnectionInfo.Version = CSRSRV_VERSION; /* Create a SID for us */ Status = RtlAllocateAndInitializeSid(&NtSidAuthority, Modified: trunk/reactos/dll/win32/kernel32/client/dosdev.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/dosdev.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/dosdev.c [iso-8859-1] Mon Aug 19 17:50:27 2013 @@ -157,7 +157,7 @@ } else { - DefineDosDeviceRequest->dwFlags = dwFlags; + DefineDosDeviceRequest->Flags = dwFlags; CsrCaptureMessageBuffer(CaptureBuffer, (PVOID)DeviceUpcaseNameU.Buffer, @@ -174,11 +174,11 @@ CsrCaptureMessageBuffer(CaptureBuffer, (PVOID)NtTargetPathU.Buffer, NtTargetPathU.Length, - (PVOID*)&DefineDosDeviceRequest->TargetName.Buffer); - } - DefineDosDeviceRequest->TargetName.Length = + (PVOID*)&DefineDosDeviceRequest->TargetPath.Buffer); + } + DefineDosDeviceRequest->TargetPath.Length = NtTargetPathU.Length; - DefineDosDeviceRequest->TargetName.MaximumLength = + DefineDosDeviceRequest->TargetPath.MaximumLength = NtTargetPathU.Length; Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, Modified: trunk/reactos/dll/win32/kernel32/client/file/filename.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/filename.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/filename.c [iso-8859-1] Mon Aug 19 17:50:27 2013 @@ -92,7 +92,7 @@ CHAR IDString[5]; WCHAR * TempFileName; BASE_API_MESSAGE ApiMessage; - PBASE_GET_TEMP_FILE GetTempFile = &ApiMessage.Data.GetTempFile; + PBASE_GET_TEMP_FILE GetTempFile = &ApiMessage.Data.GetTempFileRequest; DWORD FileAttributes, LastError; UNICODE_STRING PathNameString, PrefixString; static const WCHAR Ext[] = { L'.', 't', 'm', 'p', UNICODE_NULL }; Modified: trunk/reactos/dll/win32/kernel32/client/proc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] Mon Aug 19 17:50:27 2013 @@ -963,13 +963,13 @@ { NTSTATUS Status; BASE_API_MESSAGE ApiMessage; - PBASE_GET_PROCESS_SHUTDOWN_PARAMS GetShutdownParametersRequest = &ApiMessage.Data.GetShutdownParametersRequest; + PBASE_GETSET_PROCESS_SHUTDOWN_PARAMS ShutdownParametersRequest = &ApiMessage.Data.ShutdownParametersRequest; /* Ask CSRSS for shutdown information */ Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, NULL, CSR_CREATE_API_NUMBER(BASESRV_SERVERDLL_INDEX, BasepGetProcessShutdownParam), - sizeof(BASE_GET_PROCESS_SHUTDOWN_PARAMS)); + sizeof(BASE_GETSET_PROCESS_SHUTDOWN_PARAMS)); if (!NT_SUCCESS(Status)) { /* Return the failure from CSRSS */ @@ -978,8 +978,8 @@ } /* Get the data back */ - *lpdwLevel = GetShutdownParametersRequest->Level; - *lpdwFlags = GetShutdownParametersRequest->Flags; + *lpdwLevel = ShutdownParametersRequest->ShutdownLevel; + *lpdwFlags = ShutdownParametersRequest->ShutdownFlags; return TRUE; } @@ -993,15 +993,15 @@ { NTSTATUS Status; BASE_API_MESSAGE ApiMessage; - PBASE_SET_PROCESS_SHUTDOWN_PARAMS SetShutdownParametersRequest = &ApiMessage.Data.SetShutdownParametersRequest; + PBASE_GETSET_PROCESS_SHUTDOWN_PARAMS ShutdownParametersRequest = &ApiMessage.Data.ShutdownParametersRequest; /* Write the data into the CSRSS request and send it */ - SetShutdownParametersRequest->Level = dwLevel; - SetShutdownParametersRequest->Flags = dwFlags; + ShutdownParametersRequest->ShutdownLevel = dwLevel; + ShutdownParametersRequest->ShutdownFlags = dwFlags; Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, NULL, CSR_CREATE_API_NUMBER(BASESRV_SERVERDLL_INDEX, BasepSetProcessShutdownParam), - sizeof(BASE_SET_PROCESS_SHUTDOWN_PARAMS)); + sizeof(BASE_GETSET_PROCESS_SHUTDOWN_PARAMS)); if (!NT_SUCCESS(Status)) { /* Return the failure from CSRSS */ @@ -2426,7 +2426,7 @@ /* Set message structures */ CreateProcessMsg = &CsrMsg.Data.CreateProcessRequest; - VdmMsg = &CsrMsg.Data.CheckVdm; + VdmMsg = &CsrMsg.Data.CheckVDMRequest; /* Clear the more complex structures by zeroing out their entire memory */ RtlZeroMemory(&Context, sizeof(Context)); Modified: trunk/reactos/dll/win32/kernel32/client/vdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/vdm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/vdm.c [iso-8859-1] Mon Aug 19 17:50:27 2013 @@ -2,7 +2,7 @@ * PROJECT: ReactOS Win32 Base API * LICENSE: GPL - See COPYING in the top level directory * FILE: dll/win32/kernel32/client/vdm.c - * PURPOSE: Virtual Dos Machine (VDM) Support + * PURPOSE: Virtual DOS Machines (VDM) Support * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) */ @@ -49,17 +49,18 @@ /* Is it a .com? */ String.Length = BaseDotComSuffixName.Length; String.Buffer = &PathName->Buffer[(PathName->Length - String.Length) / sizeof(WCHAR)]; - if (RtlEqualUnicodeString(&String, &BaseDotComSuffixName, TRUE)) return 2; + if (RtlEqualUnicodeString(&String, &BaseDotComSuffixName, TRUE)) return BINARY_TYPE_COM; /* Is it a .pif? */ String.Length = BaseDotPifSuffixName.Length; String.Buffer = &PathName->Buffer[(PathName->Length - String.Length) / sizeof(WCHAR)]; - if (RtlEqualUnicodeString(&String, &BaseDotPifSuffixName, TRUE)) return 3; + if (RtlEqualUnicodeString(&String, &BaseDotPifSuffixName, TRUE)) return BINARY_TYPE_PIF; /* Is it an exe? */ String.Length = BaseDotExeSuffixName.Length; String.Buffer = &PathName->Buffer[(PathName->Length - String.Length) / sizeof(WCHAR)]; - if (RtlEqualUnicodeString(&String, &BaseDotExeSuffixName, TRUE)) return 1; + if (RtlEqualUnicodeString(&String, &BaseDotExeSuffixName, TRUE)) return BINARY_TYPE_EXE; + return 0; } Modified: trunk/reactos/include/reactos/subsys/csr/csrmsg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/csr… ============================================================================== --- trunk/reactos/include/reactos/subsys/csr/csrmsg.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/subsys/csr/csrmsg.h [iso-8859-1] Mon Aug 19 17:50:27 2013 @@ -32,13 +32,6 @@ } CSRSRV_API_NUMBER, *PCSRSRV_API_NUMBER; -/* -typedef struct _CSR_API_NUMBER -{ - WORD Index; - WORD Subsystem; -} CSR_API_NUMBER, *PCSR_API_NUMBER; -*/ typedef ULONG CSR_API_NUMBER; #define CSR_CREATE_API_NUMBER(ServerId, ApiId) \ @@ -63,6 +56,8 @@ ULONG Unknown2[3]; HANDLE ProcessId; } CSR_CONNECTION_INFO, *PCSR_CONNECTION_INFO; + +#define CSRSRV_VERSION 0x10000 // We must have a size at most equal to the maximum acceptable LPC data size. C_ASSERT(sizeof(CSR_CONNECTION_INFO) <= LPC_MAX_DATA_LENGTH); Modified: trunk/reactos/include/reactos/subsys/win/basemsg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/win… ============================================================================== --- trunk/reactos/include/reactos/subsys/win/basemsg.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/subsys/win/basemsg.h [iso-8859-1] Mon Aug 19 17:50:27 2013 @@ -52,6 +52,21 @@ BasepMaxApiNumber } BASESRV_API_NUMBER, *PBASESRV_API_NUMBER; + +typedef struct +{ + ULONG ExpectedVersion; + HANDLE DefaultObjectDirectory; + ULONG WindowsVersion; + ULONG CurrentVersion; + ULONG DebugFlags; + WCHAR WindowsDirectory[MAX_PATH]; + WCHAR WindowsSystemDirectory[MAX_PATH]; +} BASESRV_API_CONNECTINFO, *PBASESRV_API_CONNECTINFO; + +#define BASESRV_VERSION 0x10000 + + typedef struct _BASE_SXS_CREATEPROCESS_MSG { ULONG Flags; @@ -96,38 +111,38 @@ typedef struct { + UINT UniqueID; +} BASE_GET_TEMP_FILE, *PBASE_GET_TEMP_FILE; + +typedef struct +{ UINT uExitCode; } BASE_EXIT_PROCESS, *PBASE_EXIT_PROCESS; typedef struct { - UINT UniqueID; -} BASE_GET_TEMP_FILE, *PBASE_GET_TEMP_FILE; - -typedef struct -{ - ULONG iTask; - HANDLE ConsoleHandle; - ULONG BinaryType; + ULONG iTask; + HANDLE ConsoleHandle; + ULONG BinaryType; HANDLE WaitObjectForParent; HANDLE StdIn; HANDLE StdOut; HANDLE StdErr; - ULONG CodePage; - ULONG dwCreationFlags; - PCHAR CmdLine; - PCHAR appName; - PCHAR PifFile; - PCHAR CurDirectory; - PCHAR Env; - ULONG EnvLen; - PVOID StartupInfo; - PCHAR Desktop; - ULONG DesktopLen; - PCHAR Title; - ULONG TitleLen; - PCHAR Reserved; - ULONG ReservedLen; + ULONG CodePage; + ULONG dwCreationFlags; + PCHAR CmdLine; + PCHAR appName; + PCHAR PifFile; + PCHAR CurDirectory; + PCHAR Env; + ULONG EnvLen; + LPSTARTUPINFOA StartupInfo; + PCHAR Desktop; + ULONG DesktopLen; + PCHAR Title; + ULONG TitleLen; + PCHAR Reserved; + ULONG ReservedLen; USHORT CmdLen; USHORT AppLen; USHORT PifLen; @@ -138,8 +153,8 @@ typedef struct { - ULONG iTask; - ULONG BinaryType; + ULONG iTask; + ULONG BinaryType; HANDLE ConsoleHandle; HANDLE VDMProcessHandle; HANDLE WaitObjectForParent; @@ -149,22 +164,85 @@ typedef struct { + ULONG iTask; + HANDLE ConsoleHandle; + HANDLE WaitObjectForVDM; + HANDLE StdIn; + HANDLE StdOut; + HANDLE StdErr; + ULONG CodePage; + ULONG dwCreationFlags; + ULONG ExitCode; + PCHAR CmdLine; + PCHAR AppName; + PCHAR PifFile; + PCHAR CurDirectory; + PCHAR Env; + ULONG EnvLen; + LPSTARTUPINFOA StartupInfo; + PCHAR Desktop; + ULONG DesktopLen; + PCHAR Title; + ULONG TitleLen; + PCHAR Reserved; + ULONG ReservedLen; + USHORT CurrentDrive; + USHORT CmdLen; + USHORT AppLen; + USHORT PifLen; + USHORT CurDirectoryLen; + USHORT VDMState; + ULONG fComingFromBat; +} BASE_GET_NEXT_VDM_COMMAND, *PBASE_GET_NEXT_VDM_COMMAND; + +typedef struct +{ + HANDLE ConsoleHandle; + ULONG iWowTask; + HANDLE WaitObjectForVDM; +} BASE_EXIT_VDM, *PBASE_EXIT_VDM; + +typedef struct +{ + ULONG FirstVDM; +} BASE_IS_FIRST_VDM, *PBASE_IS_FIRST_VDM; + +typedef struct +{ HANDLE ConsoleHandle; HANDLE hParent; - ULONG ExitCode; + ULONG ExitCode; } BASE_GET_VDM_EXIT_CODE, *PBASE_GET_VDM_EXIT_CODE; typedef struct { - DWORD Level; - DWORD Flags; -} BASE_SET_PROCESS_SHUTDOWN_PARAMS, *PBASE_SET_PROCESS_SHUTDOWN_PARAMS; - -typedef struct -{ - DWORD Level; - DWORD Flags; -} BASE_GET_PROCESS_SHUTDOWN_PARAMS, *PBASE_GET_PROCESS_SHUTDOWN_PARAMS; + HANDLE ConsoleHandle; + ULONG fIncDec; +} BASE_SET_REENTER_COUNT, *PBASE_SET_REENTER_COUNT; + +typedef struct +{ + ULONG ShutdownLevel; + ULONG ShutdownFlags; +} BASE_GETSET_PROCESS_SHUTDOWN_PARAMS, *PBASE_GETSET_PROCESS_SHUTDOWN_PARAMS; + +typedef struct +{ + HANDLE ConsoleHandle; + PCHAR lpszzCurDirs; + ULONG cchCurDirs; +} BASE_GETSET_VDM_CURDIRS, *PBASE_GETSET_VDM_CURDIRS; + +typedef struct +{ + HANDLE ConsoleHandle; + ULONG fBeginEnd; +} BASE_BAT_NOTIFICATION, *PBASE_BAT_NOTIFICATION; + +typedef struct +{ + HANDLE hwndWowExec; +} BASE_REGISTER_WOWEXEC, *PBASE_REGISTER_WOWEXEC; typedef struct { @@ -173,9 +251,14 @@ typedef struct { + UNICODE_STRING IniFileName; +} BASE_REFRESH_INIFILE_MAPPING, *PBASE_REFRESH_INIFILE_MAPPING; + +typedef struct +{ + ULONG Flags; UNICODE_STRING DeviceName; - UNICODE_STRING TargetName; - DWORD dwFlags; + UNICODE_STRING TargetPath; } BASE_DEFINE_DOS_DEVICE, *PBASE_DEFINE_DOS_DEVICE; typedef struct _BASE_API_MESSAGE @@ -190,14 +273,21 @@ { BASE_CREATE_PROCESS CreateProcessRequest; BASE_CREATE_THREAD CreateThreadRequest; + BASE_GET_TEMP_FILE GetTempFileRequest; BASE_EXIT_PROCESS ExitProcessRequest; - BASE_GET_TEMP_FILE GetTempFile; - BASE_CHECK_VDM CheckVdm; - BASE_UPDATE_VDM_ENTRY UpdateVdmEntry; - BASE_GET_VDM_EXIT_CODE GetVdmExitCode; - BASE_SET_PROCESS_SHUTDOWN_PARAMS SetShutdownParametersRequest; - BASE_GET_PROCESS_SHUTDOWN_PARAMS GetShutdownParametersRequest; + BASE_CHECK_VDM CheckVDMRequest; + BASE_UPDATE_VDM_ENTRY UpdateVDMEntryRequest; + BASE_GET_NEXT_VDM_COMMAND GetNextVDMCommandRequest; + BASE_EXIT_VDM ExitVDMRequest; + BASE_IS_FIRST_VDM IsFirstVDMRequest; + BASE_GET_VDM_EXIT_CODE GetVDMExitCodeRequest; + BASE_SET_REENTER_COUNT SetReenterCountRequest; + BASE_GETSET_PROCESS_SHUTDOWN_PARAMS ShutdownParametersRequest; + BASE_GETSET_VDM_CURDIRS VDMCurrentDirsRequest; + BASE_BAT_NOTIFICATION BatNotificationRequest; + BASE_REGISTER_WOWEXEC RegisterWowExecRequest; BASE_SOUND_SENTRY SoundSentryRequest; + BASE_REFRESH_INIFILE_MAPPING RefreshIniFileMappingRequest; BASE_DEFINE_DOS_DEVICE DefineDosDeviceRequest; } Data; } BASE_API_MESSAGE, *PBASE_API_MESSAGE; Modified: trunk/reactos/subsystems/win/basesrv/dosdev.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win/basesrv/dos… ============================================================================== --- trunk/reactos/subsystems/win/basesrv/dosdev.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win/basesrv/dosdev.c [iso-8859-1] Mon Aug 19 17:50:27 2013 @@ -99,17 +99,17 @@ DWORD dwFlags; PWSTR lpBuffer; - DPRINT("BaseSrvDefineDosDevice entered, Flags:%d, DeviceName:%wZ, TargetName:%wZ\n", - DefineDosDeviceRequest->dwFlags, + DPRINT("BaseSrvDefineDosDevice entered, Flags:%d, DeviceName:%wZ, TargetPath:%wZ\n", + DefineDosDeviceRequest->Flags, &DefineDosDeviceRequest->DeviceName, - &DefineDosDeviceRequest->TargetName); + &DefineDosDeviceRequest->TargetPath); Matched = AddHistory = FALSE; HistoryEntry = NULL; AdminSid = SystemSid = WorldSid = NULL; SecurityDescriptor = NULL; ListHead = &DosDeviceHistory; - dwFlags = DefineDosDeviceRequest->dwFlags; + dwFlags = DefineDosDeviceRequest->Flags; /* Validate the flags */ if ( (dwFlags & 0xFFFFFFF0) || @@ -136,7 +136,7 @@ if (!NT_SUCCESS(Status)) _SEH2_LEAVE; - RequestLinkTarget = &DefineDosDeviceRequest->TargetName; + RequestLinkTarget = &DefineDosDeviceRequest->TargetPath; lpBuffer = (PWSTR)RtlAllocateHeap(BaseSrvHeap, HEAP_ZERO_MEMORY, RequestDeviceName.MaximumLength + 5 * sizeof(WCHAR)); Modified: trunk/reactos/subsystems/win/basesrv/proc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win/basesrv/pro… ============================================================================== --- trunk/reactos/subsystems/win/basesrv/proc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win/basesrv/proc.c [iso-8859-1] Mon Aug 19 17:50:27 2013 @@ -18,7 +18,7 @@ CSR_API(BaseSrvGetTempFile) { static UINT BaseGetTempFileUnique = 0; - PBASE_GET_TEMP_FILE GetTempFile = &((PBASE_API_MESSAGE)ApiMessage)->Data.GetTempFile; + PBASE_GET_TEMP_FILE GetTempFile = &((PBASE_API_MESSAGE)ApiMessage)->Data.GetTempFileRequest; /* Return 16-bits ID */ GetTempFile->UniqueID = (++BaseGetTempFileUnique & 0xFFFF); @@ -211,24 +211,24 @@ CSR_API(BaseSrvGetProcessShutdownParam) { - PBASE_GET_PROCESS_SHUTDOWN_PARAMS GetShutdownParametersRequest = &((PBASE_API_MESSAGE)ApiMessage)->Data.GetShutdownParametersRequest; + PBASE_GETSET_PROCESS_SHUTDOWN_PARAMS ShutdownParametersRequest = &((PBASE_API_MESSAGE)ApiMessage)->Data.ShutdownParametersRequest; PCSR_THREAD CsrThread = CsrGetClientThread(); ASSERT(CsrThread); - GetShutdownParametersRequest->Level = CsrThread->Process->ShutdownLevel; - GetShutdownParametersRequest->Flags = CsrThread->Process->ShutdownFlags; + ShutdownParametersRequest->ShutdownLevel = CsrThread->Process->ShutdownLevel; + ShutdownParametersRequest->ShutdownFlags = CsrThread->Process->ShutdownFlags; return STATUS_SUCCESS; } CSR_API(BaseSrvSetProcessShutdownParam) { - PBASE_SET_PROCESS_SHUTDOWN_PARAMS SetShutdownParametersRequest = &((PBASE_API_MESSAGE)ApiMessage)->Data.SetShutdownParametersRequest; + PBASE_GETSET_PROCESS_SHUTDOWN_PARAMS ShutdownParametersRequest = &((PBASE_API_MESSAGE)ApiMessage)->Data.ShutdownParametersRequest; PCSR_THREAD CsrThread = CsrGetClientThread(); ASSERT(CsrThread); - CsrThread->Process->ShutdownLevel = SetShutdownParametersRequest->Level; - CsrThread->Process->ShutdownFlags = SetShutdownParametersRequest->Flags; + CsrThread->Process->ShutdownLevel = ShutdownParametersRequest->ShutdownLevel; + CsrThread->Process->ShutdownFlags = ShutdownParametersRequest->ShutdownFlags; return STATUS_SUCCESS; } Modified: trunk/reactos/subsystems/win/basesrv/vdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win/basesrv/vdm… ============================================================================== --- trunk/reactos/subsystems/win/basesrv/vdm.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win/basesrv/vdm.c [iso-8859-1] Mon Aug 19 17:50:27 2013 @@ -2,7 +2,7 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Base API Server DLL * FILE: subsystems/win/basesrv/vdm.c - * PURPOSE: Virtual DOS Machines Management + * PURPOSE: Virtual DOS Machines (VDM) Support * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */

11 years, 1 month

[ion] 59778: [SACDRV]: IReadLast returns WCHAR, not CHAR. [SACDRV]: Implement VtUtf8 case in ChannelInitializeVTable. [SACDRV]: Implement DoHelpCommand, reformat concmd.c to standards. [SACDRV]: Co...

by ion＠svn.reactos.org

Author: ion Date: Mon Aug 19 03:32:39 2013 New Revision: 59778 URL: http://svn.reactos.org/svn/reactos?rev=59778&view=rev Log: [SACDRV]: IReadLast returns WCHAR, not CHAR. [SACDRV]: Implement VtUtf8 case in ChannelInitializeVTable. [SACDRV]: Implement DoHelpCommand, reformat concmd.c to standards. [SACDRV]: ConMgrInitialize shoudl setup the SAC channel as VtUtf8, not Raw. I guess it was set to Raw since VtUtf8 wasn't yet implemented, however this breaks the command parsing since it expects WCHAR's. Make a note of this, and temporarily hack ConMgrSerialPortConsumer to work with CHAR's from a Raw channel. [SACDRV]: Implement ConMgrProcessInputLine, which calls out the appopriate helpers. [SACDRV]: Fixes to parsing in ConMgrSerialPortConsumer [SACDRV]: Document, reformat, and fix some of the bugs in the RawChannelI* commands. [SACDRV]: Implement simple (ANSI) case of SacTranslateUtf8ToUnicode. [SACDRV]: Implement SacFormatMessage and GetMessageLineCount. [SACDRV]: Start implementing VT-UTF8 support. Input routines are done, output routines are still WIP. [SACMSG]: Fix the messages in the .MC file. Stuff is now being output correctly. If using Putty, make sure to turn on "Implicit CR in every LF" in Settings->Terminal. Modified: trunk/reactos/drivers/sac/driver/chanmgr.c trunk/reactos/drivers/sac/driver/channel.c trunk/reactos/drivers/sac/driver/concmd.c trunk/reactos/drivers/sac/driver/conmgr.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 trunk/reactos/include/reactos/mc/sacmsg.mc 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] Mon Aug 19 03:32:39 2013 @@ -404,7 +404,6 @@ if (i == SAC_MAX_CHANNELS) { /* Bail out */ - SAC_DBG(SAC_DBG_INIT, "failing here: %d %lx\n", __LINE__, Status); goto ReturnStatus; } @@ -438,7 +437,6 @@ else { /* We couldn't create it, free the buffer */ - SAC_DBG(SAC_DBG_INIT, "failing here: %d %lx\n", __LINE__, Status); SacFreePool(NewChannel); } 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] Mon Aug 19 03:32:39 2013 @@ -147,11 +147,11 @@ return Status; } -UCHAR +WCHAR NTAPI ChannelIReadLast(IN PSAC_CHANNEL Channel) { - UCHAR LastChar; + WCHAR LastChar; /* Read the last character while holding the lock */ ChannelLockIBuffer(Channel); @@ -410,9 +410,19 @@ switch (Channel->ChannelType) { case VtUtf8: - /* FIXME: TODO */ - ASSERT(FALSE); - return STATUS_NOT_IMPLEMENTED; + /* Setup the calls for a VT-UTF8 channel */ + Channel->ChannelCreate = VTUTF8ChannelCreate; + Channel->ChannelDestroy = VTUTF8ChannelDestroy; + Channel->ChannelOutputFlush = VTUTF8ChannelOFlush; + Channel->ChannelOutputEcho = VTUTF8ChannelOEcho; + Channel->ChannelOutputWrite = VTUTF8ChannelOWrite; + Channel->ChannelOutputRead = VTUTF8ChannelORead; + Channel->ChannelInputWrite = VTUTF8ChannelIWrite; + Channel->ChannelInputRead = VTUTF8ChannelIRead; + Channel->ChannelInputReadLast = VTUTF8ChannelIReadLast; + Channel->ChannelInputBufferIsFull = VTUTF8ChannelIBufferIsFull; + Channel->ChannelInputBufferLength = VTUTF8ChannelIBufferLength; + break; case Cmd: /* FIXME: TODO */ 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] Mon Aug 19 03:32:39 2013 @@ -16,6 +16,98 @@ ULONG GlobalBufferSize; /* FUNCTIONS *****************************************************************/ + +NTSTATUS +DoChannelListCommand( + VOID + ) +{ + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +DoChannelCloseByNameCommand( + IN PCHAR Count + ) +{ + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +DoChannelCloseByIndexCommand( + IN ULONG ChannelIndex + ) +{ + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +DoChannelSwitchByNameCommand( + IN PCHAR Count + ) +{ + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +DoChannelSwitchByIndexCommand( + IN ULONG ChannelIndex + ) +{ + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +GetTListInfo( + IN PVOID TListData, + IN ULONG InputSize, + IN ULONG TotalSize + ) +{ + return STATUS_NOT_IMPLEMENTED; +} + +VOID +PrintTListInfo( + IN PVOID TListData + ) +{ + +} + +VOID +PutMore( + OUT PBOOLEAN ScreenFull + ) +{ + +} + +BOOLEAN +RetrieveIpAddressFromString( + 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; +} VOID NTAPI @@ -71,222 +163,148 @@ SAC_DBG(SAC_DBG_ENTRY_EXIT, "SAC DoRebootCommand: Exiting.\n"); } -NTSTATUS -GetTListInfo( - IN PVOID TListData, - IN ULONG InputSize, - IN ULONG TotalSize - ) -{ - return STATUS_NOT_IMPLEMENTED; -} - -VOID -PrintTListInfo( - IN PVOID TListData - ) -{ - -} - -VOID -PutMore( - OUT PBOOLEAN ScreenFull - ) -{ - -} - -BOOLEAN -RetrieveIpAddressFromString( - 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; -} - -VOID -DoFullInfoCommand( - VOID - ) -{ - -} - -VOID -DoPagingCommand( - VOID - ) -{ - -} - -VOID -DoSetTimeCommand( - IN PCHAR InputTime - ) -{ - -} - -VOID -DoKillCommand( - IN PCHAR KillString - ) -{ - -} - -VOID -DoLowerPriorityCommand( - IN PCHAR PrioString - ) -{ - -} - -VOID -DoRaisePriorityCommand( - IN PCHAR PrioString - ) -{ - -} - -VOID -DoLimitMemoryCommand( - IN PCHAR LimitString - ) -{ - -} - -VOID -DoCrashCommand( - VOID - ) -{ - -} - -VOID -DoMachineInformationCommand( - VOID - ) -{ - -} - -NTSTATUS -DoChannelListCommand( - VOID - ) -{ - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -DoChannelCloseByNameCommand( - IN PCHAR Count - ) -{ - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -DoChannelCloseByIndexCommand( - IN ULONG ChannelIndex - ) -{ - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -DoChannelSwitchByNameCommand( - IN PCHAR Count - ) -{ - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -DoChannelSwitchByIndexCommand( - IN ULONG ChannelIndex - ) -{ - return STATUS_NOT_IMPLEMENTED; -} - -VOID -DoChannelCommand( - IN PCHAR ChannelString - ) -{ - -} - -VOID -DoCmdCommand( - VOID - ) -{ - -} - -VOID -DoLockCommand( - VOID - ) -{ - -} - -VOID -DoHelpCommand( - VOID - ) -{ - -} - -VOID -DoGetNetInfo( - IN BOOLEAN DoPrint - ) -{ - -} - -VOID -DoSetIpAddressCommand( - IN PCHAR IpString - ) -{ - -} - -VOID -DoTlistCommand( - VOID - ) -{ - -} +VOID +NTAPI +DoFullInfoCommand(VOID) +{ + +} + +VOID +NTAPI +DoPagingCommand(VOID) +{ + +} + +VOID +NTAPI +DoSetTimeCommand(IN PCHAR InputTime) +{ + +} + +VOID +NTAPI +DoKillCommand(IN PCHAR KillString) +{ + +} + +VOID +NTAPI +DoLowerPriorityCommand(IN PCHAR PrioString) +{ + +} + +VOID +NTAPI +DoRaisePriorityCommand(IN PCHAR PrioString) +{ + +} + +VOID +NTAPI +DoLimitMemoryCommand(IN PCHAR LimitString) +{ + +} + +VOID +NTAPI +DoCrashCommand(VOID) +{ + +} + +VOID +NTAPI +DoMachineInformationCommand(VOID) +{ + +} + +VOID +NTAPI +DoChannelCommand(IN PCHAR ChannelString) +{ + +} + +VOID +NTAPI +DoCmdCommand(IN PCHAR InputString) +{ + +} + +VOID +NTAPI +DoLockCommand(VOID) +{ + +} + +#define PRINT_HELP_MESSAGE(x) \ +{ \ + Count += NewCount; \ + NewCount = GetMessageLineCount(x); \ + if ( (NewCount + Count) > SAC_VTUTF8_COL_HEIGHT) \ + { \ + PutMore(&ScreenFull); \ + if (ScreenFull) return; \ + Count = 0; \ + } \ + SacPutSimpleMessage(x); \ +} + +VOID +NTAPI +DoHelpCommand(VOID) +{ + ULONG NewCount = 0, Count = 0; + BOOLEAN ScreenFull = FALSE; + + PRINT_HELP_MESSAGE(112); + PRINT_HELP_MESSAGE(12); + PRINT_HELP_MESSAGE(13); + PRINT_HELP_MESSAGE(14); + PRINT_HELP_MESSAGE(15); + PRINT_HELP_MESSAGE(16); + PRINT_HELP_MESSAGE(31); + PRINT_HELP_MESSAGE(18); + PRINT_HELP_MESSAGE(19); + PRINT_HELP_MESSAGE(32); + PRINT_HELP_MESSAGE(20); + PRINT_HELP_MESSAGE(21); + PRINT_HELP_MESSAGE(22); + PRINT_HELP_MESSAGE(23); + PRINT_HELP_MESSAGE(24); + PRINT_HELP_MESSAGE(25); + PRINT_HELP_MESSAGE(27); + PRINT_HELP_MESSAGE(28); + PRINT_HELP_MESSAGE(29); +} + +VOID +NTAPI +DoGetNetInfo(IN BOOLEAN DoPrint) +{ + +} + +VOID +NTAPI +DoSetIpAddressCommand(IN PCHAR IpString) +{ + +} + +VOID +NTAPI +DoTlistCommand(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] Mon Aug 19 03:32:39 2013 @@ -169,7 +169,7 @@ /* Setup the attributes for the raw SAC channel */ RtlZeroMemory(&SacChannelAttributes, sizeof(SacChannelAttributes)); - SacChannelAttributes.ChannelType = Raw; + SacChannelAttributes.ChannelType = Raw; /* FIXME: Should be VtUtf8 */ /* Get the right name for it */ pcwch = GetMessage(SAC_CHANNEL_NAME); @@ -438,6 +438,7 @@ /* Do the write with the lock held */ SacAcquireMutexLock(); + ASSERT(FALSE); Status = STATUS_NOT_IMPLEMENTED;// ChannelOWrite(Channel, WriteBuffer + 24, *(WriteBuffer + 20)); SacReleaseMutexLock(); @@ -446,22 +447,137 @@ return Status; } +#define Shutdown 1 +#define Restart 3 +#define Nothing 0 +BOOLEAN GlobalPagingNeeded; + VOID NTAPI ConMgrProcessInputLine(VOID) { - ASSERT(FALSE); -} - -#define Nothing 0 + BOOLEAN EnablePaging; + NTSTATUS Status; + + SAC_DBG(4, "SAC Input Test: %s\n", InputBuffer); + + if (!strncmp(InputBuffer, "t", 1)) + { + DoTlistCommand(); + } + else if (!strncmp(InputBuffer, "?", 1)) + { + DoHelpCommand(); + } + else if (!strncmp(InputBuffer, "help", 4)) + { + DoHelpCommand(); + } + else if (!strncmp(InputBuffer, "f", 1)) + { + DoFullInfoCommand(); + } + else if (!strncmp(InputBuffer, "p", 1)) + { + DoPagingCommand(); + } + else if (!strncmp(InputBuffer, "id", 2)) + { + DoMachineInformationCommand(); + } + else if (!strncmp(InputBuffer, "crashdump", 9)) + { + DoCrashCommand(); + } + else if (!strncmp(InputBuffer, "lock", 4)) + { + DoLockCommand(); + } + else if (!strncmp(InputBuffer, "shutdown", 8)) + { + ExecutePostConsumerCommand = Shutdown; + } + else if (!strncmp(InputBuffer, "restart", 7)) + { + ExecutePostConsumerCommand = Restart; + } + else if (!strncmp(InputBuffer, "d", 1)) + { + EnablePaging = GlobalPagingNeeded; + Status = HeadlessDispatch(HeadlessCmdDisplayLog, + &EnablePaging, + sizeof(EnablePaging), + NULL, + 0); + if (!NT_SUCCESS(Status)) SAC_DBG(4, "SAC Display Log failed.\n"); + } + else if (!strncmp(InputBuffer, "cmd", 3)) + { + if (CommandConsoleLaunchingEnabled) + { + DoCmdCommand(InputBuffer); + } + else + { + SacPutSimpleMessage(148); + } + } + else if (!(strncmp(InputBuffer, "ch", 2)) && + (((strlen(InputBuffer) > 1) && (InputBuffer[2] == ' ')) || + (strlen(InputBuffer) == 2))) + { + DoChannelCommand(InputBuffer); + } + else if (!(strncmp(InputBuffer, "k", 1)) && + (((strlen(InputBuffer) > 1) && (InputBuffer[1] == ' ')) || + (strlen(InputBuffer) == 1))) + { + DoKillCommand(InputBuffer); + } + else if (!(strncmp(InputBuffer, "l", 1)) && + (((strlen(InputBuffer) > 1) && (InputBuffer[1] == ' ')) || + (strlen(InputBuffer) == 1))) + { + DoLowerPriorityCommand(InputBuffer); + } + else if (!(strncmp(InputBuffer, "r", 1)) && + (((strlen(InputBuffer) > 1) && (InputBuffer[1] == ' ')) || + (strlen(InputBuffer) == 1))) + { + DoRaisePriorityCommand(InputBuffer); + } + else if (!(strncmp(InputBuffer, "m", 1)) && + (((strlen(InputBuffer) > 1) && (InputBuffer[1] == ' ')) || + (strlen(InputBuffer) == 1))) + { + DoLimitMemoryCommand(InputBuffer); + } + else if (!(strncmp(InputBuffer, "s", 1)) && + (((strlen(InputBuffer) > 1) && (InputBuffer[1] == ' ')) || + (strlen(InputBuffer) == 1))) + { + DoSetTimeCommand(InputBuffer); + } + else if (!(strncmp(InputBuffer, "i", 1)) && + (((strlen(InputBuffer) > 1) && (InputBuffer[1] == ' ')) || + (strlen(InputBuffer) == 1))) + { + DoSetIpAddressCommand(InputBuffer); + } + else if ((InputBuffer[0] != '\n') && (InputBuffer[0] != ANSI_NULL)) + { + SacPutSimpleMessage(105); + } +} VOID NTAPI ConMgrSerialPortConsumer(VOID) { NTSTATUS Status; - CHAR Char, LastChar; - CHAR WriteBuffer[2], ReadBuffer[2]; + CHAR Char; + WCHAR LastChar; + CHAR ReadBuffer[2]; ULONG ReadBufferSize, i; WCHAR StringBuffer[2]; SAC_DBG(SAC_DBG_MACHINE, "SAC TimerDpcRoutine: Entering.\n"); //bug @@ -546,8 +662,8 @@ if ((InputInEscape) && (CurrentChannel != SacChannel)) { /* Store the ESC in the current channel buffer */ - WriteBuffer[0] = '\x1B'; - ChannelIWrite(CurrentChannel, WriteBuffer, sizeof(CHAR)); + ReadBuffer[0] = '\x1B'; + ChannelIWrite(CurrentChannel, ReadBuffer, sizeof(CHAR)); } /* Check if we are no longer pressing ESC and exit the mode if so */ @@ -582,26 +698,26 @@ ChannelIReadLast(CurrentChannel); /* NULL-terminate the channel's input buffer */ - WriteBuffer[0] = ANSI_NULL; - ChannelIWrite(CurrentChannel, WriteBuffer, sizeof(CHAR)); + ReadBuffer[0] = ANSI_NULL; + ChannelIWrite(CurrentChannel, ReadBuffer, sizeof(CHAR)); /* Loop over every last character */ do { /* Read every character in the channel, and strip whitespace */ LastChar = ChannelIReadLast(CurrentChannel); - WriteBuffer[0] = LastChar; + ReadBuffer[0] = (CHAR) LastChar; } while ((!(LastChar) || - (LastChar == ' ') || - (LastChar == '\t')) && + (LastChar == L' ') || + (LastChar == L'\t')) && (ChannelIBufferLength(CurrentChannel))); /* Write back into the channel the last character */ - ChannelIWrite(CurrentChannel, WriteBuffer, sizeof(CHAR)); + ChannelIWrite(CurrentChannel, ReadBuffer, sizeof(CHAR)); /* NULL-terminate the input buffer */ - WriteBuffer[0] = ANSI_NULL; - ChannelIWrite(CurrentChannel, WriteBuffer, sizeof(WCHAR)); + ReadBuffer[0] = ANSI_NULL; + ChannelIWrite(CurrentChannel, ReadBuffer, sizeof(CHAR)); /* Now loop over every first character */ do @@ -609,11 +725,10 @@ /* Read every character in the channel, and strip whitespace */ ChannelIRead(CurrentChannel, ReadBuffer, - sizeof(ReadBuffer), + sizeof(CHAR), /* FIXME: Should be sizeof(ReadBuffer) */ &ReadBufferSize); - WriteBuffer[0] = ReadBuffer[0]; } while ((ReadBufferSize) && - ((ReadBuffer[0] != ' ') || (ReadBuffer[0] != '\t'))); + ((ReadBuffer[0] == ' ') || (ReadBuffer[0] == '\t'))); /* We read one more than we should, so treat that as our first one */ InputBuffer[0] = ReadBuffer[0]; @@ -625,7 +740,7 @@ /* Read each character -- there should be max 80 */ ChannelIRead(CurrentChannel, ReadBuffer, - sizeof(ReadBuffer), + sizeof(CHAR), /* FIXME: Should be sizeof(ReadBuffer) */ &ReadBufferSize); ASSERT(i < SAC_VTUTF8_COL_WIDTH); InputBuffer[i++] = ReadBuffer[0]; @@ -637,7 +752,7 @@ /* Again it should be less than 80 characters */ ASSERT(i < SAC_VTUTF8_COL_WIDTH); - /* And upcase each character */ + /* And downbase each character */ Char = InputBuffer[i]; if ((Char >= 'A') && (Char <= 'Z')) InputBuffer[i] = Char + ' '; } @@ -700,9 +815,9 @@ ChannelIReadLast(CurrentChannel); ChannelIReadLast(CurrentChannel); - /* NULL-terminate it */ - WriteBuffer[0] = Char; - ChannelIWrite(CurrentChannel, WriteBuffer, sizeof(CHAR)); + /* Write the last character that was just typed in */ + ReadBuffer[0] = Char; + ChannelIWrite(CurrentChannel, ReadBuffer, sizeof(CHAR)); continue; } 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] Mon Aug 19 03:32:39 2013 @@ -23,17 +23,19 @@ { CHECK_PARAMETER(Channel); + /* Allocate the output buffer */ Channel->OBuffer = SacAllocatePool(SAC_RAW_OBUFFER_SIZE, GLOBAL_BLOCK_TAG); CHECK_ALLOCATION(Channel->OBuffer); + /* Allocate the input buffer */ Channel->IBuffer = SacAllocatePool(SAC_RAW_IBUFFER_SIZE, GLOBAL_BLOCK_TAG); CHECK_ALLOCATION(Channel->IBuffer); + /* Reset all flags and return success */ Channel->OBufferIndex = 0; Channel->OBufferFirstGoodIndex = 0; Channel->ChannelHasNewIBufferData = FALSE; Channel->ChannelHasNewOBufferData = FALSE; - return STATUS_SUCCESS; } @@ -43,16 +45,9 @@ { CHECK_PARAMETER(Channel); - if (Channel->OBuffer) - { - SacFreePool(Channel->OBuffer); - } - - if (Channel->IBuffer) - { - SacFreePool(Channel->IBuffer); - } - + /* Free the buffer and then destroy the channel */ + if (Channel->OBuffer) SacFreePool(Channel->OBuffer); + if (Channel->IBuffer) SacFreePool(Channel->IBuffer); return ChannelDestroy(Channel); } @@ -61,13 +56,6 @@ ChannelHasNewOBufferData(IN PSAC_CHANNEL Channel) { return Channel->ChannelHasNewOBufferData; -} - -FORCEINLINE -BOOLEAN -ChannelHasNewIBufferData(IN PSAC_CHANNEL Channel) -{ - return Channel->ChannelHasNewIBufferData; } NTSTATUS @@ -207,6 +195,23 @@ return ConMgrFlushData(Channel); } +NTSTATUS +NTAPI +RawChannelOWrite(IN PSAC_CHANNEL Channel, + IN PCHAR String, + IN ULONG Length) +{ + CHECK_PARAMETER1(Channel); + CHECK_PARAMETER2(String); + + if ((ConMgrIsWriteEnabled(Channel)) && (Channel->WriteEnabled)) + { + return RawChannelOEcho(Channel, String, Length); + } + + return RawChannelOWrite2(Channel, String, Length); +} + ULONG NTAPI RawChannelGetIBufferIndex(IN PSAC_CHANNEL Channel) @@ -214,6 +219,7 @@ ASSERT(Channel); ASSERT(Channel->IBufferIndex < SAC_RAW_IBUFFER_SIZE); + /* Return the current buffer index */ return Channel->IBufferIndex; } @@ -226,34 +232,18 @@ ASSERT(Channel); ASSERT(Channel->IBufferIndex < SAC_RAW_IBUFFER_SIZE); + /* Set the new index, and if it's not zero, it means we have data */ Channel->IBufferIndex = BufferIndex; - Channel->ChannelHasNewIBufferData = BufferIndex != 0; - - if (!Channel->IBufferIndex) - { - if (Channel->Flags & SAC_CHANNEL_FLAG_HAS_NEW_DATA_EVENT) - { - ChannelClearEvent(Channel, HasNewDataEvent); - UNREFERENCED_PARAMETER(Status); - } - } -} - -NTSTATUS -NTAPI -RawChannelOWrite(IN PSAC_CHANNEL Channel, - IN PCHAR String, - IN ULONG Length) -{ - CHECK_PARAMETER1(Channel); - CHECK_PARAMETER2(String); - - if ((ConMgrIsWriteEnabled(Channel)) && (Channel->WriteEnabled)) - { - return RawChannelOEcho(Channel, String, Length); - } - - return RawChannelOWrite2(Channel, String, Length); + _InterlockedExchange(&Channel->ChannelHasNewIBufferData, BufferIndex != 0); + + /* If we have new data, and an event has been registered... */ + if (!(Channel->IBufferIndex) && + (Channel->Flags & SAC_CHANNEL_FLAG_HAS_NEW_DATA_EVENT)) + { + /* Go ahead and signal it */ + ChannelClearEvent(Channel, HasNewDataEvent); + UNREFERENCED_PARAMETER(Status); + } } NTSTATUS @@ -264,38 +254,46 @@ IN PULONG ReturnBufferSize) { ULONG CopyChars; - CHECK_PARAMETER1(Channel); CHECK_PARAMETER2(Buffer); CHECK_PARAMETER_WITH_STATUS(BufferSize > 0, STATUS_INVALID_BUFFER_SIZE); + /* Assume failure */ *ReturnBufferSize = 0; + /* Check how many bytes are in the buffer */ if (Channel->ChannelInputBufferLength(Channel) == 0) { + /* Apparently nothing. Make sure the flag indicates so too */ ASSERT(ChannelHasNewIBufferData(Channel) == FALSE); } else { - CopyChars = Channel->ChannelInputBufferLength(Channel); - if (CopyChars > BufferSize) CopyChars = BufferSize; + /* Use the smallest number of bytes either in the buffer or requested */ + CopyChars = min(Channel->ChannelInputBufferLength(Channel), BufferSize); ASSERT(CopyChars <= Channel->ChannelInputBufferLength(Channel)); + /* Copy them into the caller's buffer */ RtlCopyMemory(Buffer, Channel->IBuffer, CopyChars); + /* Update the channel's index past the copied (read) bytes */ RawChannelSetIBufferIndex(Channel, RawChannelGetIBufferIndex(Channel) - CopyChars); + /* Are there still bytes that haven't been read yet? */ if (Channel->ChannelInputBufferLength(Channel)) { + /* Shift them up in the buffer */ RtlMoveMemory(Channel->IBuffer, &Channel->IBuffer[CopyChars], Channel->ChannelInputBufferLength(Channel)); } + /* Return the number of bytes we actually copied */ *ReturnBufferSize = CopyChars; } + /* Return success */ return STATUS_SUCCESS; } @@ -307,6 +305,7 @@ CHECK_PARAMETER1(Channel); CHECK_PARAMETER2(BufferStatus); + /* If the index is beyond the length, the buffer must be full */ *BufferStatus = RawChannelGetIBufferIndex(Channel) > SAC_RAW_IBUFFER_SIZE; return STATUS_SUCCESS; } @@ -316,25 +315,31 @@ RawChannelIBufferLength(IN PSAC_CHANNEL Channel) { ASSERT(Channel); + + /* The index is the current length (since we're 0-based) */ return RawChannelGetIBufferIndex(Channel); } -CHAR +WCHAR NTAPI RawChannelIReadLast(IN PSAC_CHANNEL Channel) { UCHAR LastChar = 0; - ASSERT(Channel); + /* Check if there's anything to read in the buffer */ if (Channel->ChannelInputBufferLength(Channel)) { - RawChannelSetIBufferIndex(Channel, RawChannelGetIBufferIndex(Channel) - 1); - + /* Go back one character */ + RawChannelSetIBufferIndex(Channel, + RawChannelGetIBufferIndex(Channel) - 1); + + /* Read it, and clear its current value */ LastChar = Channel->IBuffer[RawChannelGetIBufferIndex(Channel)]; - Channel->IBuffer[RawChannelGetIBufferIndex(Channel)] = 0; - } - + Channel->IBuffer[RawChannelGetIBufferIndex(Channel)] = ANSI_NULL; + } + + /* Return the last character */ return LastChar; } @@ -347,27 +352,34 @@ NTSTATUS Status; BOOLEAN IsFull; ULONG Index; - CHECK_PARAMETER1(Channel); CHECK_PARAMETER2(Buffer); CHECK_PARAMETER_WITH_STATUS(BufferSize > 0, STATUS_INVALID_BUFFER_SIZE); + /* First, check if the input buffer still has space */ Status = RawChannelIBufferIsFull(Channel, &IsFull); if (!NT_SUCCESS(Status)) return Status; - if (IsFull) return STATUS_UNSUCCESSFUL; + /* Get the current buffer index */ Index = RawChannelGetIBufferIndex(Channel); - if ((SAC_RAW_IBUFFER_SIZE - Index) >= BufferSize) return STATUS_INSUFFICIENT_RESOURCES; - + if ((SAC_RAW_IBUFFER_SIZE - Index) < BufferSize) + { + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Copy the new data */ RtlCopyMemory(&Channel->IBuffer[Index], Buffer, BufferSize); + /* Update the index */ RawChannelSetIBufferIndex(Channel, BufferSize + Index); + /* Signal the event, if one was set */ if (Channel->Flags & SAC_CHANNEL_FLAG_HAS_NEW_DATA_EVENT) { ChannelSetEvent(Channel, HasNewDataEvent); } - return STATUS_SUCCESS; -} + /* All done */ + return STATUS_SUCCESS; +} 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] Mon Aug 19 03:32:39 2013 @@ -157,6 +157,7 @@ #define SAC_SERIAL_PORT_BUFFER_SIZE 1024 // 1KB #define SAC_MAX_MESSAGES 200 #define SAC_VTUTF8_COL_WIDTH 80 +#define SAC_VTUTF8_COL_HEIGHT 25 // // Channel flags @@ -302,7 +303,7 @@ ); typedef -CHAR +WCHAR (NTAPI *PSAC_CHANNEL_IREAD_LAST)( IN struct _SAC_CHANNEL* Channel ); @@ -775,7 +776,7 @@ IN ULONG BufferSize ); -UCHAR +WCHAR NTAPI ChannelIReadLast( IN PSAC_CHANNEL Channel @@ -864,7 +865,7 @@ IN PSAC_CHANNEL Channel ); -CHAR +WCHAR NTAPI RawChannelIReadLast( IN PSAC_CHANNEL Channel @@ -879,8 +880,105 @@ ); // +// VT-UTF8 Channel Table +// +NTSTATUS +NTAPI +VTUTF8ChannelCreate( + IN PSAC_CHANNEL Channel +); + +NTSTATUS +NTAPI +VTUTF8ChannelDestroy( + IN PSAC_CHANNEL Channel +); + +NTSTATUS +NTAPI +VTUTF8ChannelORead( + IN PSAC_CHANNEL Channel, + IN PCHAR Buffer, + IN ULONG BufferSize, + OUT PULONG ByteCount +); + +NTSTATUS +NTAPI +VTUTF8ChannelOEcho( + IN PSAC_CHANNEL Channel, + IN PCHAR String, + IN ULONG Length +); + +NTSTATUS +NTAPI +VTUTF8ChannelOFlush( + IN PSAC_CHANNEL Channel +); + +NTSTATUS +NTAPI +VTUTF8ChannelOWrite( + IN PSAC_CHANNEL Channel, + IN PCHAR String, + IN ULONG Length +); + +NTSTATUS +NTAPI +VTUTF8ChannelIRead( + IN PSAC_CHANNEL Channel, + IN PCHAR Buffer, + IN ULONG BufferSize, + IN PULONG ReturnBufferSize +); + +NTSTATUS +NTAPI +VTUTF8ChannelIBufferIsFull( + IN PSAC_CHANNEL Channel, + OUT PBOOLEAN BufferStatus +); + +ULONG +NTAPI +VTUTF8ChannelIBufferLength( + IN PSAC_CHANNEL Channel +); + +WCHAR +NTAPI +VTUTF8ChannelIReadLast( + IN PSAC_CHANNEL Channel +); + +NTSTATUS +NTAPI +VTUTF8ChannelIWrite( + IN PSAC_CHANNEL Channel, + IN PCHAR Buffer, + IN ULONG BufferSize +); + + +// // Helper Routines // +BOOLEAN +NTAPI +SacTranslateUtf8ToUnicode( + IN CHAR Utf8Char, + IN PCHAR Utf8Buffer, + OUT PWCHAR Utf8Value +); + +ULONG +NTAPI +GetMessageLineCount( + IN ULONG MessageIndex +); + NTSTATUS NTAPI SerialBufferGetChar( @@ -921,6 +1019,102 @@ NTAPI DoRebootCommand( IN BOOLEAN Reboot +); + +VOID +NTAPI +DoFullInfoCommand( + VOID +); + +VOID +NTAPI +DoPagingCommand( + VOID +); + +VOID +NTAPI +DoSetTimeCommand( + IN PCHAR InputTime +); + +VOID +NTAPI +DoKillCommand( + IN PCHAR KillString +); + +VOID +NTAPI +DoLowerPriorityCommand( + IN PCHAR PrioString +); + +VOID +NTAPI +DoRaisePriorityCommand( + IN PCHAR PrioString +); + +VOID +NTAPI +DoLimitMemoryCommand( + IN PCHAR LimitString +); + +VOID +NTAPI +DoCrashCommand( + VOID +); + +VOID +NTAPI +DoMachineInformationCommand( + VOID +); + +VOID +NTAPI +DoChannelCommand( + IN PCHAR ChannelString +); + +VOID +NTAPI +DoCmdCommand( + IN PCHAR InputString +); + +VOID +NTAPI +DoLockCommand( + VOID +); + +VOID +NTAPI +DoHelpCommand( + VOID +); + +VOID +NTAPI +DoGetNetInfo( + IN BOOLEAN DoPrint +); + +VOID +NTAPI +DoSetIpAddressCommand( + IN PCHAR IpString +); + +VOID +NTAPI +DoTlistCommand( + VOID ); // @@ -933,7 +1127,9 @@ extern PCHAR SerialPortBuffer; extern LONG SerialPortConsumerIndex, SerialPortProducerIndex; extern PCHAR Utf8ConversionBuffer; +extern BOOLEAN GlobalPagingNeeded; extern ULONG Utf8ConversionBufferSize; +extern BOOLEAN CommandConsoleLaunchingEnabled; // // Function to initailize a SAC Semaphore Lock @@ -1046,3 +1242,11 @@ /* Return the index of the channel */ return Channel->Index; } + +FORCEINLINE +BOOLEAN +ChannelHasNewIBufferData(IN PSAC_CHANNEL Channel) +{ + /* Return if there's any new data in the input buffer */ + return Channel->ChannelHasNewIBufferData; +} 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] Mon Aug 19 03:32:39 2013 @@ -33,6 +33,56 @@ PCHAR SerialPortBuffer; /* FUNCTIONS *****************************************************************/ + +BOOLEAN +NTAPI +SacTranslateUtf8ToUnicode(IN CHAR Utf8Char, + IN PCHAR Utf8Buffer, + OUT PWCHAR Utf8Value) +{ + ULONG i; + + /* Find out how many valid characters we have in the buffer */ + i = 0; + while (Utf8Buffer[i++] && (i < 3)); + + /* If we have at least 3, shift everything by a byte */ + if (i >= 3) + { + /* The last input character goes at the end */ + Utf8Buffer[0] = Utf8Buffer[1]; + Utf8Buffer[1] = Utf8Buffer[2]; + Utf8Buffer[2] = Utf8Char; + } + else + { + /* We don't have more than 3 characters, place the input at the index */ + Utf8Buffer[i] = Utf8Char; + } + + /* Print to debugger */ + SAC_DBG(SAC_DBG_ENTRY_EXIT, "SacTranslateUtf8ToUnicode - About to decode the UTF8 buffer.\n"); + SAC_DBG(SAC_DBG_ENTRY_EXIT, " UTF8[0]: 0x%02lx UTF8[1]: 0x%02lx UTF8[2]: 0x%02lx\n", + Utf8Buffer[0], + Utf8Buffer[1], + Utf8Buffer[2]); + + /* Is this a simple ANSI character? */ + if (!(Utf8Char & 0x80)) + { + /* Return it as Unicode, nothing left to do */ + SAC_DBG(SAC_DBG_ENTRY_EXIT, "SACDRV: SacTranslateUTf8ToUnicode - Case1\n"); + *Utf8Value = (WCHAR)Utf8Char; + Utf8Buffer[0] = Utf8Buffer[1]; + Utf8Buffer[1] = Utf8Buffer[2]; + Utf8Buffer[2] = UNICODE_NULL; + return TRUE; + } + + /* Anything else is not yet supported */ + ASSERT(FALSE); + return FALSE; +} BOOLEAN NTAPI @@ -151,8 +201,76 @@ IN PWCHAR MessageString, IN ULONG MessageSize) { - /* FIXME: For now don't format anything */ - wcsncpy(FormattedString, MessageString, MessageSize / sizeof(WCHAR)); + SAC_DBG(SAC_DBG_ENTRY_EXIT, "SAC SacFormatMessage: Entering.\n"); + + /* Check if any of the parameters are NULL or zero */ + if (!(MessageString) || !(FormattedString) || !(MessageSize)) + { + SAC_DBG(SAC_DBG_ENTRY_EXIT, "SAC SacFormatMessage: Exiting with invalid parameters.\n"); + return; + } + + /* Keep going as long as there's still characters */ + while ((MessageString[0]) && (MessageSize)) + { + /* Is it a non-formatting character? */ + if (MessageString[0] != L'%') + { + /* Just write it back into the buffer and keep going */ + *FormattedString++ = MessageString[0]; + MessageString++; + } + else + { + /* Go over the format characters we recognize */ + switch (MessageString[1]) + { + case L'0': + *FormattedString = UNICODE_NULL; + return; + + case L'%': + *FormattedString++ = L'%'; + break; + + case L'\\': + *FormattedString++ = L'\r'; + *FormattedString++ = L'\n'; + break; + + case L'r': + *FormattedString++ = L'\r'; + break; + + case L'b': + *FormattedString++ = L' '; + break; + + case L'.': + *FormattedString++ = L'.'; + break; + + case L'!': + *FormattedString++ = L'!'; + break; + + default: + /* Only move forward one character */ + MessageString--; + break; + } + + /* Move forward two characters */ + MessageString += 2; + } + + /* Move to the next character*/ + MessageSize--; + } + + /* All done */ + *FormattedString = UNICODE_NULL; + SAC_DBG(SAC_DBG_ENTRY_EXIT, "SAC SacFormatMessage: Exiting.\n"); } NTSTATUS @@ -1106,6 +1224,25 @@ } ULONG +NTAPI +GetMessageLineCount(IN ULONG MessageIndex) +{ + ULONG LineCount = 0; + PWCHAR Buffer; + + /* Get the message buffer */ + Buffer = GetMessage(MessageIndex); + if (Buffer) + { + /* Scan it looking for new lines, and increment the conut each time */ + while (*Buffer) if (*Buffer++ == L'\n') ++LineCount; + } + + /* Return the line count */ + return LineCount; +} + +ULONG ConvertAnsiToUnicode( IN PWCHAR pwch, IN PCHAR pch, @@ -1129,16 +1266,6 @@ ) { return STATUS_NOT_IMPLEMENTED; -} - -BOOLEAN -SacTranslateUtf8ToUnicode( - IN CHAR Utf8Char, - IN PCHAR UnicodeBuffer, - OUT PCHAR Utf8Value - ) -{ - return FALSE; } NTSTATUS @@ -1159,14 +1286,6 @@ return STATUS_NOT_IMPLEMENTED; } -ULONG -GetMessageLineCount( - IN ULONG MessageIndex - ) -{ - return 0; -} - NTSTATUS RegisterSacCmdEvent( IN PVOID Object, 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] Mon Aug 19 03:32:39 2013 @@ -1,36 +1,109 @@ /* - * PROJECT: ReactOS Boot Loader - * LICENSE: BSD - See COPYING.ARM in the top level directory - * FILE: drivers/sac/driver/vtutf8chan.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/vtutf8chan.c + * PURPOSE: Driver for the Server Administration Console (SAC) for EMS + * PROGRAMMERS: ReactOS Portable Systems Group */ -/* INCLUDES *******************************************************************/ +/* INCLUDES ******************************************************************/ #include "sacdrv.h" -/* GLOBALS ********************************************************************/ - -/* FUNCTIONS ******************************************************************/ - -NTSTATUS -VTUTF8ChannelCreate( - IN PSAC_CHANNEL Channel - ) -{ - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -VTUTF8ChannelDestroy( - IN PSAC_CHANNEL Channel - ) -{ - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS +/* GLOBALS *******************************************************************/ + +CHAR IncomingUtf8ConversionBuffer[4]; +WCHAR IncomingUnicodeValue; + +/* FUNCTIONS *****************************************************************/ + +typedef struct _SAC_CURSOR_DATA +{ + UCHAR CursorX; + UCHAR CursorY; + UCHAR CursorVisible; + WCHAR CursorValue; +} SAC_CURSOR_DATA, *PSAC_CURSOR_DATA; + +C_ASSERT(sizeof(SAC_CURSOR_DATA) == 6); + +#define SAC_VTUTF8_OBUFFER_SIZE 0x2D00 +#define SAC_VTUTF8_IBUFFER_SIZE 0x2000 + +NTSTATUS +NTAPI +VTUTF8ChannelOInit(IN PSAC_CHANNEL Channel) +{ + PSAC_CURSOR_DATA Cursor; + ULONG x, y; + CHECK_PARAMETER(Channel); + + /* Set the current channel cursor parameters */ + Channel->CursorVisible = 0; + Channel->CursorX = 40; + Channel->CursorY = 37; + + /* Loop the output buffer height by width */ + Cursor = (PSAC_CURSOR_DATA)Channel->OBuffer; + y = SAC_VTUTF8_COL_HEIGHT - 1; + do + { + x = SAC_VTUTF8_COL_WIDTH; + do + { + /* For every character, set the defaults */ + Cursor->CursorValue = ' '; + Cursor->CursorX = 40; + Cursor->CursorY = 38; + + /* Move to the next character */ + Cursor++; + } while (--x); + } while (--y); + + /* All done */ + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +VTUTF8ChannelCreate(IN PSAC_CHANNEL Channel) +{ + NTSTATUS Status; + CHECK_PARAMETER(Channel); + + /* Allocate the output buffer */ + Channel->OBuffer = SacAllocatePool(SAC_VTUTF8_OBUFFER_SIZE, GLOBAL_BLOCK_TAG); + CHECK_ALLOCATION(Channel->OBuffer); + + /* Allocate the input buffer */ + Channel->IBuffer = SacAllocatePool(SAC_VTUTF8_IBUFFER_SIZE, GLOBAL_BLOCK_TAG); + CHECK_ALLOCATION(Channel->IBuffer); + + /* Initialize the output stream */ + Status = VTUTF8ChannelOInit(Channel); + if (NT_SUCCESS(Status)) return Status; + + /* Reset all flags and return success */ + _InterlockedExchange(&Channel->ChannelHasNewOBufferData, 0); + _InterlockedExchange(&Channel->ChannelHasNewIBufferData, 0); + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +VTUTF8ChannelDestroy(IN PSAC_CHANNEL Channel) +{ + CHECK_PARAMETER(Channel); + + /* Free the buffer and then destroy the channel */ + if (Channel->OBuffer) SacFreePool(Channel->OBuffer); + if (Channel->IBuffer) SacFreePool(Channel->IBuffer); + return ChannelDestroy(Channel); +} + +NTSTATUS +NTAPI VTUTF8ChannelORead( IN PSAC_CHANNEL Channel, IN PCHAR Buffer, @@ -41,17 +114,8 @@ return STATUS_NOT_IMPLEMENTED; } -NTSTATUS -VTUTF8ChannelOEcho( - IN PSAC_CHANNEL Channel, - IN PWCHAR String, - IN ULONG Size - ) -{ - return STATUS_NOT_IMPLEMENTED; -} - BOOLEAN +NTAPI VTUTF8ChannelScanForNumber( IN PWCHAR String, OUT PULONG Number @@ -61,6 +125,7 @@ } NTSTATUS +NTAPI VTUTF8ChannelAnsiDispatch( IN NTSTATUS Status, IN ULONG AnsiCode, @@ -72,6 +137,7 @@ } NTSTATUS +NTAPI VTUTF8ChannelProcessAttributes( IN PSAC_CHANNEL Channel, IN UCHAR Attribute @@ -80,24 +146,8 @@ return STATUS_NOT_IMPLEMENTED; } -ULONG -VTUTF8ChannelGetIBufferIndex( - IN PSAC_CHANNEL Channel - ) -{ - return 0; -} - -VOID -VTUTF8ChannelSetIBufferIndex( - IN PSAC_CHANNEL Channel, - IN ULONG BufferIndex - ) -{ - -} - -NTSTATUS +NTSTATUS +NTAPI VTUTF8ChannelConsumeEscapeSequence( IN PSAC_CHANNEL Channel, IN PWCHAR String @@ -107,6 +157,7 @@ } NTSTATUS +NTAPI VTUTF8ChannelOFlush( IN PSAC_CHANNEL Channel ) @@ -115,67 +166,240 @@ } NTSTATUS -VTUTF8ChannelIRead( - IN PSAC_CHANNEL Channel, - IN PCHAR Buffer, - IN ULONG BufferSize, - IN PULONG ReturnBufferSize - ) -{ - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -VTUTF8ChannelIBufferIsFull( - IN PSAC_CHANNEL Channel, - OUT PBOOLEAN BufferStatus - ) -{ - return STATUS_NOT_IMPLEMENTED; +NTAPI +VTUTF8ChannelOWrite2(IN PSAC_CHANNEL Channel, + IN PCHAR String, + IN ULONG Size) +{ + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +VTUTF8ChannelOEcho(IN PSAC_CHANNEL Channel, + IN PCHAR String, + IN ULONG Size) +{ + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +VTUTF8ChannelOWrite(IN PSAC_CHANNEL Channel, + IN PCHAR String, + IN ULONG Length) +{ + NTSTATUS Status; + CHECK_PARAMETER1(Channel); + CHECK_PARAMETER2(String); + + /* Call the lower level function */ + Status = VTUTF8ChannelOWrite2(Channel, String, Length / sizeof(WCHAR)); + if (NT_SUCCESS(Status)) + { + /* Is the channel enabled for output? */ + if ((ConMgrIsWriteEnabled(Channel)) && (Channel->WriteEnabled)) + { + /* Go ahead and output it */ + Status = VTUTF8ChannelOEcho(Channel, String, Length); + } + else + { + /* Otherwise, just remember that we have new data */ + _InterlockedExchange(&Channel->ChannelHasNewOBufferData, 1); + } + } + + /* We're done */ + return Status; +} + +ULONG +NTAPI +VTUTF8ChannelGetIBufferIndex(IN PSAC_CHANNEL Channel) +{ + ASSERT(Channel); + ASSERT((Channel->IBufferIndex % sizeof(WCHAR)) == 0); + ASSERT(Channel->IBufferIndex < SAC_VTUTF8_IBUFFER_SIZE); + + /* Return the current buffer index */ + return Channel->IBufferIndex; +} + +VOID +NTAPI +VTUTF8ChannelSetIBufferIndex(IN PSAC_CHANNEL Channel, + IN ULONG BufferIndex) +{ + NTSTATUS Status; + ASSERT(Channel); + ASSERT((Channel->IBufferIndex % sizeof(WCHAR)) == 0); + ASSERT(Channel->IBufferIndex < SAC_VTUTF8_IBUFFER_SIZE); + + /* Set the new index, and if it's not zero, it means we have data */ + Channel->IBufferIndex = BufferIndex; + _InterlockedExchange(&Channel->ChannelHasNewIBufferData, BufferIndex != 0); + + /* If we have new data, and an event has been registered... */ + if (!(Channel->IBufferIndex) && + (Channel->Flags & SAC_CHANNEL_FLAG_HAS_NEW_DATA_EVENT)) + { + /* Go ahead and signal it */ + ChannelClearEvent(Channel, HasNewDataEvent); + UNREFERENCED_PARAMETER(Status); + } +} + +NTSTATUS +NTAPI +VTUTF8ChannelIRead(IN PSAC_CHANNEL Channel, + IN PCHAR Buffer, + IN ULONG BufferSize, + IN PULONG ReturnBufferSize) +{ + ULONG CopyChars; + CHECK_PARAMETER1(Channel); + CHECK_PARAMETER2(Buffer); + CHECK_PARAMETER_WITH_STATUS(BufferSize > 0, STATUS_INVALID_BUFFER_SIZE); + + /* Assume failure */ + *ReturnBufferSize = 0; + + /* Check how many bytes are in the buffer */ + if (Channel->ChannelInputBufferLength(Channel) == 0) + { + /* Apparently nothing. Make sure the flag indicates so too */ + ASSERT(ChannelHasNewIBufferData(Channel) == FALSE); + } + else + { + /* Use the smallest number of bytes either in the buffer or requested */ + CopyChars = min(Channel->ChannelInputBufferLength(Channel) * sizeof(WCHAR), + BufferSize); + ASSERT(CopyChars <= Channel->ChannelInputBufferLength(Channel)); + + /* Copy them into the caller's buffer */ + RtlCopyMemory(Buffer, Channel->IBuffer, CopyChars); + + /* Update the channel's index past the copied (read) bytes */ + VTUTF8ChannelSetIBufferIndex(Channel, + VTUTF8ChannelGetIBufferIndex(Channel) - CopyChars); + + /* Are there still bytes that haven't been read yet? */ + if (Channel->ChannelInputBufferLength(Channel)) + { + /* Shift them up in the buffer */ + RtlMoveMemory(Channel->IBuffer, + &Channel->IBuffer[CopyChars], + Channel->ChannelInputBufferLength(Channel) * + sizeof(WCHAR)); + } + + /* Return the number of bytes we actually copied */ + *ReturnBufferSize = CopyChars; + } + + /* Return success */ + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +VTUTF8ChannelIBufferIsFull(IN PSAC_CHANNEL Channel, + OUT PBOOLEAN BufferStatus) +{ + CHECK_PARAMETER1(Channel); + + /* If the index is beyond the length, the buffer must be full */ + *BufferStatus = VTUTF8ChannelGetIBufferIndex(Channel) > SAC_VTUTF8_IBUFFER_SIZE; + return STATUS_SUCCESS; +} + +ULONG +NTAPI +VTUTF8ChannelIBufferLength(IN PSAC_CHANNEL Channel) +{ + ASSERT(Channel); + + /* The index is the length, so divide by two to get character count */ + return VTUTF8ChannelGetIBufferIndex(Channel) / sizeof(WCHAR); } WCHAR -VTUTF8ChannelIReadLast( - IN PSAC_CHANNEL Channel - ) -{ - return 0; -} - -ULONG -VTUTF8ChannelIBufferLength( - IN PSAC_CHANNEL Channel - ) -{ - return 0; -} - -NTSTATUS -VTUTF8ChannelOWrite2( - IN PSAC_CHANNEL Channel, - IN PWCHAR String, - IN ULONG Size - ) -{ - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -VTUTF8ChannelIWrite( - IN PSAC_CHANNEL Channel, - IN PCHAR Buffer, - IN ULONG BufferSize - ) -{ - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -VTUTF8ChannelOWrite( - IN PSAC_CHANNEL Channel, - IN PWCHAR String, - IN ULONG Length - ) -{ - return STATUS_NOT_IMPLEMENTED; -} +NTAPI +VTUTF8ChannelIReadLast(IN PSAC_CHANNEL Channel) +{ + PWCHAR LastCharLocation; + WCHAR LastChar = 0; + ASSERT(Channel); + + /* Check if there's anything to read in the buffer */ + if (Channel->ChannelInputBufferLength(Channel)) + { + /* Go back one character */ + VTUTF8ChannelSetIBufferIndex(Channel, + VTUTF8ChannelGetIBufferIndex(Channel) - + sizeof(WCHAR)); + + /* Read it, and clear its current value */ + LastCharLocation = (PWCHAR)&Channel->IBuffer[VTUTF8ChannelGetIBufferIndex(Channel)]; + LastChar = *LastCharLocation; + *LastCharLocation = UNICODE_NULL; + } + + /* Return the last character */ + return LastChar; +} + +NTSTATUS +NTAPI +VTUTF8ChannelIWrite(IN PSAC_CHANNEL Channel, + IN PCHAR Buffer, + IN ULONG BufferSize) +{ + NTSTATUS Status; + BOOLEAN IsFull; + ULONG Index, i; + CHECK_PARAMETER1(Channel); + CHECK_PARAMETER2(Buffer); + CHECK_PARAMETER_WITH_STATUS(BufferSize > 0, STATUS_INVALID_BUFFER_SIZE); + + /* First, check if the input buffer still has space */ + Status = VTUTF8ChannelIBufferIsFull(Channel, &IsFull); + if (!NT_SUCCESS(Status)) return Status; + if (IsFull) return STATUS_UNSUCCESSFUL; + + /* Get the current buffer index */ + Index = VTUTF8ChannelGetIBufferIndex(Channel); + if ((SAC_VTUTF8_IBUFFER_SIZE - Index) < BufferSize) + { + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Copy the new data */ + for (i = 0; i < BufferSize; i++) + { + /* Convert the character */ + if (SacTranslateUtf8ToUnicode(Buffer[i], + IncomingUtf8ConversionBuffer, + &IncomingUnicodeValue)) + { + /* Write it into the buffer */ + *(PWCHAR)&Channel->IBuffer[VTUTF8ChannelGetIBufferIndex(Channel)] = + IncomingUnicodeValue; + + /* Update the index */ + Index = VTUTF8ChannelGetIBufferIndex(Channel); + VTUTF8ChannelSetIBufferIndex(Channel, Index + sizeof(WCHAR)); + } + } + + /* Signal the event, if one was set */ + if (Channel->Flags & SAC_CHANNEL_FLAG_HAS_NEW_DATA_EVENT) + { + ChannelSetEvent(Channel, HasNewDataEvent); + } + + /* All done */ + return STATUS_SUCCESS; +} Modified: trunk/reactos/include/reactos/mc/sacmsg.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/mc/sacmsg.… ============================================================================== --- trunk/reactos/include/reactos/mc/sacmsg.mc [iso-8859-1] (original) +++ trunk/reactos/include/reactos/mc/sacmsg.mc [iso-8859-1] Mon Aug 19 03:32:39 2013 @@ -1,7 +1,12 @@ MessageId=1 SymbolicName=SAC_INIT_STATUS Language=English -Computer is booting, SAC started and initialized.\n\nUse the \"ch -?\" command for information about using channels.\nUse the \"?\" command for general help. + +Computer is booting, SAC started and initialized. + +Use the "ch -?" command for information about using channels. +Use the "?" command for general help. + . MessageId=2 @@ -25,7 +30,8 @@ MessageId=5 SymbolicName=SACDRV_5 Language=English -The SAC will become unavailable soon. The computer is shutting down.\n +The SAC will become unavailable soon. The computer is shutting down. + . MessageId=6 @@ -295,7 +301,9 @@ MessageId=69 SymbolicName=SACDRV_69 Language=English -memory: %%4ld kb uptime:%%3ld %%2ld:%%02ld:%%02ld.%%03ld\n\n +memory: %%4ld kb uptime:%%3ld %%2ld:%%02ld:%%02ld.%%03ld + + . MessageId=70 @@ -319,7 +327,8 @@ MessageId=73 SymbolicName=SACDRV_73 Language=English -\n Memory:%%7ldK Avail:%%7ldK TotalWs:%%7ldK InRam Kernel:%%5ldK P:%%5ldK + + Memory:%%7ldK Avail:%%7ldK TotalWs:%%7ldK InRam Kernel:%%5ldK P:%%5ldK . MessageId=74 @@ -421,7 +430,8 @@ MessageId=90 SymbolicName=SACDRV_90 Language=English -A duplicate process id is being cleaned up by the system. Try the \ncommand again in a few seconds. +A duplicate process id is being cleaned up by the system. Try the +command again in a few seconds. . MessageId=92 @@ -523,31 +533,46 @@ MessageId=108 SymbolicName=SACDRV_108 Language=English -Channel List\n \n(Use \"ch -?\" for information on using channels)\n\n# Status Channel Name +Channel List + +(Use "ch -?" for information on using channels) + +# Status Channel Name . MessageId=109 SymbolicName=SACDRV_109 Language=English -EVENT: A new channel has been created. Use \"ch -?\" for channel help.\nChannel: %%s +EVENT: A new channel has been created. Use "ch -?" for channel help. +Channel: %%s . MessageId=110 SymbolicName=SACDRV_110 Language=English -EVENT: A channel has been closed.\nChannel: %%s +EVENT: A channel has been closed. +Channel: %%s . MessageId=111 SymbolicName=SACDRV_111 Language=English -Name: %%s\nDescription: %%s\nType: %%s\nChannel GUID: %%08lx-%%04x-%%04x-%%02x%%02x-%%02x%%02x%%02x%%02x%%02x%%02x\nApplication Type GUID: %%08lx-%%04x-%%04x-%%02x%%02x-%%02x%%02x%%02x%%02x%%02x%%02x\n\nPress <esc><tab> for next channel.\nPress <esc><tab>0 to return to the SAC channel.\nUse any other key to view this channel.\n +Name: %%s +Description: %%s +Type: %%s +Channel GUID: %%08lx-%%04x-%%04x-%%02x%%02x-%%02x%%02x%%02x%%02x%%02x%%02x +Application Type GUID: %%08lx-%%04x-%%04x-%%02x%%02x-%%02x%%02x%%02x%%02x%%02x%%02x + +Press <esc><tab> for next channel. +Press <esc><tab>0 to return to the SAC channel. +Use any other key to view this channel. + . MessageId=112 SymbolicName=SACDRV_112 Language=English -ch Channel management commands. Use ch -? for more help. +ch Channel management commands. Use ch -? for more help. . MessageId=113 @@ -571,7 +596,10 @@ MessageId=116 SymbolicName=SACDRV_116 Language=English -Error! Failed to remove channel! \n\nPlease contact your system administrator.\n +Error! Failed to remove channel! + +Please contact your system administrator. + . MessageId=119 @@ -583,7 +611,9 @@ MessageId=120 SymbolicName=SACDRV_120 Language=English -Timeout: Unable to launch a Command Prompt. The service responsible for \n launching Command Prompt channels has timed out. This may be \n because the service is malfunctioning or is unresponsive. +Timeout: Unable to launch a Command Prompt. The service responsible for + launching Command Prompt channels has timed out. This may be + because the service is malfunctioning or is unresponsive. . MessageId=121 @@ -601,7 +631,10 @@ MessageId=131 SymbolicName=SACDRV_131 Language=English -Error: Unable to launch a Command Prompt. The service responsible for launching\n Command Prompt channels has not yet registered. This may be because the\n service is not yet started, is disabled by the administrator, is\n malfunctioning or is unresponsive. +Error: Unable to launch a Command Prompt. The service responsible for launching + Command Prompt channels has not yet registered. This may be because the + service is not yet started, is disabled by the administrator, is + malfunctioning or is unresponsive. . MessageId=132 @@ -619,19 +652,39 @@ MessageId=134 SymbolicName=SACDRV_134 Language=English -EVENT: An attempt was made to close a channel but failed.\nChannel: %%s +EVENT: An attempt was made to close a channel but failed. +Channel: %%s . MessageId=135 SymbolicName=SACDRV_135 Language=English -EVENT: An attempt to close a channel failed because it is already closed.\nChannel: %%s +EVENT: An attempt to close a channel failed because it is already closed. +Channel: %%s . MessageId=136 SymbolicName=SACDRV_136 Language=English -Channel management commands:\n\nch List all channels.\n\nStatus Legend: (AB)\nA: Channel operational status\n 'A' = Channel is active.\n 'I' = Channel is inactive.\nB: Channel Type\n 'V' = VT-UTF8 emulation.\n 'R' = Raw - no emulation.\n\nch -si <#> Switch to a channel by its number.\nch -sn <name> Switch to a channel by its name.\nch -ci <#> Close a channel by its number.\nch -cn <name> Close a channel by its name.\n\nPress <esc><tab> to select a channel.\nPress <esc><tab>0 to return to the SAC channel. +Channel management commands: + +ch List all channels. + +Status Legend: (AB) +A: Channel operational status + 'A' = Channel is active. + 'I' = Channel is inactive. +B: Channel Type + 'V' = VT-UTF8 emulation. + 'R' = Raw - no emulation. + +ch -si <#> Switch to a channel by its number. +ch -sn <name> Switch to a channel by its name. +ch -ci <#> Close a channel by its number. +ch -cn <name> Close a channel by its name. + +Press <esc><tab> to select a channel. +Press <esc><tab>0 to return to the SAC channel. . MessageId=137 @@ -703,5 +756,5 @@ MessageId=154 SymbolicName=SACDRV_154 Language=English -The maximum number of channels has been reached. -. +The maximum number of channels has been reached. +.

11 years, 1 month

[ekohl] 59777: [SAMSRV] Implement the last part of SamrSetInformationUser.UserAllInformation: USER_ALL_PASSWORDEXPIRED.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Aug 18 21:43:47 2013 New Revision: 59777 URL: http://svn.reactos.org/svn/reactos?rev=59777&view=rev Log: [SAMSRV] Implement the last part of SamrSetInformationUser.UserAllInformation: USER_ALL_PASSWORDEXPIRED. Modified: trunk/reactos/dll/win32/samsrv/samrpc.c Modified: trunk/reactos/dll/win32/samsrv/samrpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samrpc.c?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] Sun Aug 18 21:43:47 2013 @@ -7311,7 +7311,24 @@ WriteFixedData = TRUE; } - /* FIXME: USER_ALL_PASSWORDEXPIRED */ + if (WhichFields & USER_ALL_PASSWORDEXPIRED) + { + if (Buffer->All.PasswordExpired) + { + /* The pasword was last set ages ago */ + FixedData.PasswordLastSet.LowPart = 0; + FixedData.PasswordLastSet.HighPart = 0; + } + else + { + /* The pasword was last set right now */ + Status = NtQuerySystemTime(&FixedData.PasswordLastSet); + if (!NT_SUCCESS(Status)) + goto done; + } + + WriteFixedData = TRUE; + } if (WriteFixedData == TRUE) {

11 years, 1 month

[akhaldi] 59776: [NTOSKRNL] * Fix a comment typo. CORE-7393 #resolve #comment Thanks.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Aug 18 21:05:58 2013 New Revision: 59776 URL: http://svn.reactos.org/svn/reactos?rev=59776&view=rev Log: [NTOSKRNL] * Fix a comment typo. CORE-7393 #resolve #comment Thanks. Modified: trunk/reactos/ntoskrnl/ex/hdlsterm.c Modified: trunk/reactos/ntoskrnl/ex/hdlsterm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/hdlsterm.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ex/hdlsterm.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/hdlsterm.c [iso-8859-1] Sun Aug 18 21:05:58 2013 @@ -331,7 +331,7 @@ case HeadlessCmdClearDisplay: - /* Send the VT100 claer screen command if the terminal is enabled */ + /* Send the VT100 clear screen command if the terminal is enabled */ if (HeadlessGlobals->TerminalEnabled) { HdlspSendStringAtBaud((PUCHAR)"\033[2J");

11 years, 1 month

[akhaldi] 59775: [RSYM] * Add a flag (-s) to pass the source folder. This allows it to set the debug file paths relatively to that source folder. Brought to you by Arty. [CMAKE] * Leverage the new ...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Aug 18 20:05:32 2013 New Revision: 59775 URL: http://svn.reactos.org/svn/reactos?rev=59775&view=rev Log: [RSYM] * Add a flag (-s) to pass the source folder. This allows it to set the debug file paths relatively to that source folder. Brought to you by Arty. [CMAKE] * Leverage the new rsym flag. The rossym file paths are no longer absolute. Modified: trunk/reactos/cmake/gcc.cmake trunk/reactos/tools/rsym/rsym.c Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=59775&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Sun Aug 18 20:05:32 2013 @@ -143,16 +143,16 @@ get_target_property(RSYM native-rsym IMPORTED_LOCATION_NOCONFIG) set(CMAKE_C_LINK_EXECUTABLE "<CMAKE_C_COMPILER> ${CMAKE_C_FLAGS} <CMAKE_C_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>" - "${RSYM} <TARGET> <TARGET>") + "${RSYM} -s ${REACTOS_SOURCE_DIR} <TARGET> <TARGET>") set(CMAKE_CXX_LINK_EXECUTABLE "<CMAKE_CXX_COMPILER> ${CMAKE_CXX_FLAGS} <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>" - "${RSYM} <TARGET> <TARGET>") + "${RSYM} -s ${REACTOS_SOURCE_DIR} <TARGET> <TARGET>") set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> ${CMAKE_C_FLAGS} <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>" - "${RSYM} <TARGET> <TARGET>") + "${RSYM} -s ${REACTOS_SOURCE_DIR} <TARGET> <TARGET>") set(CMAKE_CXX_CREATE_SHARED_LIBRARY "<CMAKE_CXX_COMPILER> ${CMAKE_CXX_FLAGS} <CMAKE_SHARED_LIBRARY_CXX_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>" - "${RSYM} <TARGET> <TARGET>") + "${RSYM} -s ${REACTOS_SOURCE_DIR} <TARGET> <TARGET>") set(CMAKE_RC_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> ${CMAKE_C_FLAGS} <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") endif() Modified: trunk/reactos/tools/rsym/rsym.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rsym/rsym.c?rev=5977… ============================================================================== --- trunk/reactos/tools/rsym/rsym.c [iso-8859-1] (original) +++ trunk/reactos/tools/rsym/rsym.c [iso-8859-1] Sun Aug 18 20:05:32 2013 @@ -464,6 +464,8 @@ ULONG NumberOfSymbols; void *process; DWORD module_base; + char *PathChop; + char *SourcePath; struct DbgHelpLineEntry *lastLineEntry; }; @@ -530,6 +532,21 @@ int i = id >> 10; int bucket = id & 0x3ff; return tab->Table[bucket][i]; +} + +/* Remove a prefix of PathChop if it exists and return a copy of the tail. */ +static char * +StrDupShortenPath(char *PathChop, char *FilePath) +{ + int pclen = strlen(PathChop); + if (!strncmp(FilePath, PathChop, pclen)) + { + return strdup(FilePath+pclen); + } + else + { + return strdup(FilePath); + } } static BOOL @@ -542,7 +559,48 @@ if (!pSymbol) return FALSE; memset(pSymbol, 0, FIELD_OFFSET(SYMBOL_INFO, Name[MAX_SYM_NAME])); - fileId = DbgHelpAddStringToTable(tab, strdup(LineInfo->FileName)); + /* If any file can be opened by relative path up to a certain level, then + record that path. */ + if (!tab->PathChop) + { + int i, endLen; + char *end = strrchr(LineInfo->FileName, '/'); + + if (!end) + end = strrchr(LineInfo->FileName, '\\'); + + if (end) + { + for (i = (end - LineInfo->FileName) - 1; i >= 0; i--) + { + if (LineInfo->FileName[i] == '/' || LineInfo->FileName[i] == '\\') + { + char *synthname = malloc(strlen(tab->SourcePath) + + strlen(LineInfo->FileName + i + 1) + + 2); + strcpy(synthname, tab->SourcePath); + strcat(synthname, "/"); + strcat(synthname, LineInfo->FileName + i + 1); + FILE *f = fopen(synthname, "r"); + free(synthname); + if (f) + { + fclose(f); + break; + } + } + } + + i++; /* Be in the string or past the next slash */ + tab->PathChop = malloc(i + 1); + memcpy(tab->PathChop, LineInfo->FileName, i); + tab->PathChop[i] = 0; + } + } + + fileId = DbgHelpAddStringToTable(tab, + StrDupShortenPath(tab->PathChop, + LineInfo->FileName)); pSymbol->SizeOfStruct = sizeof(SYMBOL_INFO); pSymbol->MaxNameLen = MAX_SYM_NAME; @@ -570,7 +628,7 @@ } static int -ConvertDbgHelp(void *process, DWORD module_base, +ConvertDbgHelp(void *process, DWORD module_base, char *SourcePath, ULONG *SymbolsCount, PROSSYM_ENTRY *SymbolsBase, ULONG *StringsLength, void **StringsBase) { @@ -589,6 +647,8 @@ strtab.CurLineEntries = 0; strtab.LineEntries = 16384; strtab.LineEntryData = calloc(strtab.LineEntries, sizeof(struct DbgHelpLineEntry)); + strtab.PathChop = NULL; + strtab.SourcePath = SourcePath ? SourcePath : ""; SymEnumLines(process, module_base, NULL, NULL, DbgHelpAddLineNumber, &strtab); @@ -636,6 +696,7 @@ } free(strtab.LineEntryData); + free(strtab.PathChop); qsort(*SymbolsBase, *SymbolsCount, sizeof(ROSSYM_ENTRY), (int (*)(const void *, const void *))CompareSymEntry); @@ -1123,15 +1184,47 @@ void *file; char elfhdr[4] = { '\177', 'E', 'L', 'F' }; BOOLEAN UseDbgHelp = FALSE; - - if (argc != 3) - { - fprintf(stderr, "Usage: rsym <exefile> <symfile>\n"); + int arg, argstate = 0; + char *SourcePath = NULL; + + for (arg = 1; arg < argc; arg++) + { + switch (argstate) + { + default: + argstate = -1; + break; + + case 0: + if (!strcmp(argv[arg], "-s")) + { + argstate = 1; + } + else + { + argstate = 2; + path1 = convert_path(argv[arg]); + } + break; + + case 1: + free(SourcePath); + SourcePath = strdup(argv[arg]); + argstate = 0; + break; + + case 2: + path2 = convert_path(argv[arg]); + argstate = 3; + break; + } + } + + if (argstate != 3) + { + fprintf(stderr, "Usage: rsym [-s <sources>] <input> <output>\n"); exit(1); } - - path1 = convert_path(argv[1]); - path2 = convert_path(argv[2]); FileData = load_file(path1, &FileSize); if (!FileData) @@ -1192,6 +1285,7 @@ if (ConvertDbgHelp(FileData, module_base, + SourcePath, &StabSymbolsCount, &StabSymbols, &StringsLength,

11 years, 1 month

[hbelusca] 59774: [BASESRV] Add vdm.c for Virtual DOS Machines management.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Aug 18 19:46:22 2013 New Revision: 59774 URL: http://svn.reactos.org/svn/reactos?rev=59774&view=rev Log: [BASESRV] Add vdm.c for Virtual DOS Machines management. Added: trunk/reactos/subsystems/win/basesrv/vdm.c (with props) Added: trunk/reactos/subsystems/win/basesrv/vdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win/basesrv/vdm… ============================================================================== --- trunk/reactos/subsystems/win/basesrv/vdm.c (added) +++ trunk/reactos/subsystems/win/basesrv/vdm.c [iso-8859-1] Sun Aug 18 19:46:22 2013 @@ -0,0 +1,16 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Base API Server DLL + * FILE: subsystems/win/basesrv/vdm.c + * PURPOSE: Virtual DOS Machines Management + * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + */ + +/* INCLUDES *******************************************************************/ + +#include "basesrv.h" + +#define NDEBUG +#include <debug.h> + +/* EOF */ Propchange: trunk/reactos/subsystems/win/basesrv/vdm.c ------------------------------------------------------------------------------ svn:eol-style = native

11 years, 1 month

[ion] 59773: [KDCOM]: Also adhere to new standard.

by ion＠svn.reactos.org

Author: ion Date: Sun Aug 18 17:51:56 2013 New Revision: 59773 URL: http://svn.reactos.org/svn/reactos?rev=59773&view=rev Log: [KDCOM]: Also adhere to new standard. Modified: trunk/reactos/drivers/base/kdcom/kdcom.c Modified: trunk/reactos/drivers/base/kdcom/kdcom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdcom/kdcom.c… ============================================================================== --- trunk/reactos/drivers/base/kdcom/kdcom.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kdcom/kdcom.c [iso-8859-1] Sun Aug 18 17:51:56 2013 @@ -222,7 +222,7 @@ KdpPollByte(OUT PUCHAR OutByte) { /* Poll the byte */ - if (CpGetByte(&KdDebugComPort, OutByte, FALSE) == CP_GET_SUCCESS) + if (CpGetByte(&KdDebugComPort, OutByte, FALSE, TRUE) == CP_GET_SUCCESS) { return KDP_PACKET_RECEIVED; } @@ -237,7 +237,7 @@ KdpReceiveByte(OUT PUCHAR OutByte) { /* Get the byte */ - if (CpGetByte(&KdDebugComPort, OutByte, TRUE) == CP_GET_SUCCESS) + if (CpGetByte(&KdDebugComPort, OutByte, TRUE, FALSE) == CP_GET_SUCCESS) { return KDP_PACKET_RECEIVED; }

11 years, 1 month

← Newer
1
...
13
14
15
16
17
18
19
...
33
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2013