Ros-diffs

ros-diffs@reactos.org

81390 discussions

[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 19 Aug '13

19 Aug '13

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) */

1 0

[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 19 Aug '13

19 Aug '13

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. +.

1 0

[ekohl] 59777: [SAMSRV] Implement the last part of SamrSetInformationUser.UserAllInformation: USER_ALL_PASSWORDEXPIRED.
by ekohl＠svn.reactos.org 18 Aug '13

18 Aug '13

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) {

1 0

[akhaldi] 59776: [NTOSKRNL] * Fix a comment typo. CORE-7393 #resolve #comment Thanks.
by akhaldi＠svn.reactos.org 18 Aug '13

18 Aug '13

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");

1 0

[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 18 Aug '13

18 Aug '13

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,

1 0

[hbelusca] 59774: [BASESRV] Add vdm.c for Virtual DOS Machines management.
by hbelusca＠svn.reactos.org 18 Aug '13

18 Aug '13

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

1 0

[ion] 59773: [KDCOM]: Also adhere to new standard.
by ion＠svn.reactos.org 18 Aug '13

18 Aug '13

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; }

1 0

[ion] 59772: [CPORTLIB/KDBG/FREELDR]: Fix CpGetByte and its callers -- it takes a 4th parameter for polling. [NTOSKRNL]: Implement InbvPortPollOnly and InbvPortGetByte. [NTOSKRNL]: Implement Headle...
by ion＠svn.reactos.org 18 Aug '13

18 Aug '13

Author: ion Date: Sun Aug 18 17:47:19 2013 New Revision: 59772 URL: http://svn.reactos.org/svn/reactos?rev=59772&view=rev Log: [CPORTLIB/KDBG/FREELDR]: Fix CpGetByte and its callers -- it takes a 4th parameter for polling. [NTOSKRNL]: Implement InbvPortPollOnly and InbvPortGetByte. [NTOSKRNL]: Implement HeadlessCmdClearDisplay and HeadlessCmdGetByte. [SACDRV]: Implement the TimerDpcRoutine which calls HeadlessCmdGetByte. We now consume characters in the EMS port. [SACDRV]: Implement ConMgrSerialPortConsumer. We now do full VT-100 input parsing. DEL, BS, TAB, SPACE all work. Pressing ENTER results in an ASSERT in ConMgrProcessLine as expected. Modified: trunk/reactos/boot/freeldr/freeldr/comm/rs232.c trunk/reactos/boot/freeldr/freeldr/windows/headless.c trunk/reactos/drivers/sac/driver/conmgr.c trunk/reactos/drivers/sac/driver/data.c trunk/reactos/drivers/sac/driver/dispatch.c trunk/reactos/drivers/sac/driver/sacdrv.h trunk/reactos/drivers/sac/driver/util.c trunk/reactos/include/reactos/libs/cportlib/cportlib.h trunk/reactos/lib/cportlib/cport.c trunk/reactos/ntoskrnl/ex/hdlsterm.c trunk/reactos/ntoskrnl/inbv/inbvport.c trunk/reactos/ntoskrnl/include/internal/hdl.h trunk/reactos/ntoskrnl/include/internal/inbv.h trunk/reactos/ntoskrnl/kd/i386/kdbg.c Modified: trunk/reactos/boot/freeldr/freeldr/comm/rs232.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/comm/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/comm/rs232.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/comm/rs232.c [iso-8859-1] Sun Aug 18 17:47:19 2013 @@ -100,7 +100,7 @@ if (PortInitialized == FALSE) return FALSE; - return (CpGetByte(&Rs232ComPort, ByteReceived, TRUE) == CP_GET_SUCCESS); + return (CpGetByte(&Rs232ComPort, ByteReceived, TRUE, FALSE) == CP_GET_SUCCESS); } /* Modified: trunk/reactos/boot/freeldr/freeldr/windows/headless.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/headless.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/headless.c [iso-8859-1] Sun Aug 18 17:47:19 2013 @@ -143,7 +143,7 @@ WinLdrPortGetByte(IN ULONG PortId, OUT PUCHAR Data) { - return CpGetByte(&Port[PortId], Data, TRUE) == CP_GET_SUCCESS; + return CpGetByte(&Port[PortId], Data, TRUE, FALSE) == CP_GET_SUCCESS; } BOOLEAN @@ -151,7 +151,7 @@ { UCHAR Dummy; - return CpGetByte(&Port[PortId], &Dummy, FALSE) == CP_GET_SUCCESS; + return CpGetByte(&Port[PortId], &Dummy, FALSE, TRUE) == CP_GET_SUCCESS; } VOID Modified: trunk/reactos/drivers/sac/driver/conmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/sac/driver/conmgr.… ============================================================================== --- trunk/reactos/drivers/sac/driver/conmgr.c [iso-8859-1] (original) +++ trunk/reactos/drivers/sac/driver/conmgr.c [iso-8859-1] Sun Aug 18 17:47:19 2013 @@ -27,76 +27,10 @@ ULONG ExecutePostConsumerCommand; PSAC_CHANNEL ExecutePostConsumerCommandData; +BOOLEAN InputInEscape, InputInEscTab, ConMgrLastCharWasCR; +CHAR InputBuffer[80]; + /* FUNCTIONS *****************************************************************/ - -VOID -NTAPI -ConMgrSerialPortConsumer(VOID) -{ - NTSTATUS Status; - CHAR Char; - SAC_DBG(0x2000, "SAC TimerDpcRoutine: Entering.\n"); //bug - - /* Acquire the manager lock and make sure a channel is selected */ - SacAcquireMutexLock(); - ASSERT(CurrentChannel); - - /* Read whatever came off the serial port */ - for (Status = SerialBufferGetChar(&Char); - NT_SUCCESS(Status); - Status = SerialBufferGetChar(&Char)) - { - /* If nothing came through, bail out */ - if (Status == STATUS_NO_DATA_DETECTED) break; - } - - /* We're done, release the lock */ - SacReleaseMutexLock(); - SAC_DBG(0x2000, "SAC TimerDpcRoutine: Exiting.\n"); //bug -} - -VOID -NTAPI -ConMgrWorkerProcessEvents(IN PSAC_DEVICE_EXTENSION DeviceExtension) -{ - SAC_DBG(SAC_DBG_ENTRY_EXIT, "SAC WorkerProcessEvents: Entering.\n"); - - /* Enter the main loop */ - while (TRUE) - { - /* Wait for something to do */ - KeWaitForSingleObject(&DeviceExtension->Event, - Executive, - KernelMode, - FALSE, - NULL); - - /* Consume data off the serial port */ - ConMgrSerialPortConsumer(); - switch (ExecutePostConsumerCommand) - { - case 1: - /* A reboot was sent, do it */ - DoRebootCommand(FALSE); - break; - - case 2: - /* A close was sent, do it */ - ChanMgrCloseChannel(ExecutePostConsumerCommandData); - ChanMgrReleaseChannel(ExecutePostConsumerCommandData); - break; - - case 3: - /* A shutdown was sent, do it */ - DoRebootCommand(TRUE); - break; - } - - /* Clear the serial port consumer state */ - ExecutePostConsumerCommand = 0; - ExecutePostConsumerCommandData = NULL; - } -} VOID NTAPI @@ -512,6 +446,319 @@ return Status; } +VOID +NTAPI +ConMgrProcessInputLine(VOID) +{ + ASSERT(FALSE); +} + +#define Nothing 0 + +VOID +NTAPI +ConMgrSerialPortConsumer(VOID) +{ + NTSTATUS Status; + CHAR Char, LastChar; + CHAR WriteBuffer[2], ReadBuffer[2]; + ULONG ReadBufferSize, i; + WCHAR StringBuffer[2]; + SAC_DBG(SAC_DBG_MACHINE, "SAC TimerDpcRoutine: Entering.\n"); //bug + + /* Acquire the manager lock and make sure a channel is selected */ + SacAcquireMutexLock(); + ASSERT(CurrentChannel); + + /* Read whatever came off the serial port */ + for (Status = SerialBufferGetChar(&Char); + NT_SUCCESS(Status); + Status = SerialBufferGetChar(&Char)) + { + /* If nothing came through, bail out */ + if (Status == STATUS_NO_DATA_DETECTED) break; + + /* Check if ESC was pressed */ + if (Char == '\x1B') + { + /* Was it already pressed? */ + if (!InputInEscape) + { + /* First time ESC is pressed! Remember and reset TAB state */ + InputInEscTab = FALSE; + InputInEscape = TRUE; + continue; + } + } + else if (Char == '\t') + { + /* TAB was pressed, is it following ESC (VT-100 sequence)? */ + if (InputInEscape) + { + /* Yes! This must be the only ESC-TAB we see in once moment */ + ASSERT(InputInEscTab == FALSE); + + /* No longer treat us as being in ESC */ + InputInEscape = FALSE; + + /* ESC-TAB is the sequence for changing channels */ + Status = ConMgrAdvanceCurrentChannel(); + if (!NT_SUCCESS(Status)) break; + + /* Remember ESC-TAB was pressed */ + InputInEscTab = TRUE; + continue; + } + } + else if ((Char == '0') && (InputInEscTab)) + { + /* It this ESC-TAB-0? */ + ASSERT(InputInEscape == FALSE); + InputInEscTab = FALSE; + + /* If writes are already enabled, don't do this */ + if (!CurrentChannel->WriteEnabled) + { + /* Reset the channel, this is our special sequence */ + Status = ConMgrResetCurrentChannel(FALSE); + if (!NT_SUCCESS(Status)) break; + } + + continue; + } + else + { + /* This is ESC-TAB-something else */ + InputInEscTab = FALSE; + + /* If writes are already enabled, don't do this */ + if (!CurrentChannel->WriteEnabled) + { + /* Display the current channel */ + InputInEscape = FALSE; + Status = ConMgrDisplayCurrentChannel(); + if (!NT_SUCCESS(Status)) break; + continue; + } + } + + /* Check if an ESC-sequence was being typed into a command channel */ + if ((InputInEscape) && (CurrentChannel != SacChannel)) + { + /* Store the ESC in the current channel buffer */ + WriteBuffer[0] = '\x1B'; + ChannelIWrite(CurrentChannel, WriteBuffer, sizeof(CHAR)); + } + + /* Check if we are no longer pressing ESC and exit the mode if so */ + if (Char != '\x1B') InputInEscape = FALSE; + + /* Whatever was typed in, save it int eh current channel */ + ChannelIWrite(CurrentChannel, &Char, sizeof(Char)); + + /* If this is a command channel, we're done, nothing to process */ + if (CurrentChannel != SacChannel) continue; + + /* Check for line feed right after a carriage return */ + if ((ConMgrLastCharWasCR) && (Char == '\n')) + { + /* Ignore the line feed, but clear the carriage return */ + ChannelIReadLast(CurrentChannel); + ConMgrLastCharWasCR = 0; + continue; + } + + /* Check if the user did a carriage return */ + ConMgrLastCharWasCR = (Char == '\n'); + + /* If the user did an "ENTER", we need to run the command */ + if ((Char == '\n') || (Char == '\r')) + { + /* Echo back to the terminal */ + SacPutString(L"\r\n"); + +DoLineParsing: + /* Inhibit the character (either CR or LF) */ + ChannelIReadLast(CurrentChannel); + + /* NULL-terminate the channel's input buffer */ + WriteBuffer[0] = ANSI_NULL; + ChannelIWrite(CurrentChannel, WriteBuffer, sizeof(CHAR)); + + /* Loop over every last character */ + do + { + /* Read every character in the channel, and strip whitespace */ + LastChar = ChannelIReadLast(CurrentChannel); + WriteBuffer[0] = LastChar; + } while ((!(LastChar) || + (LastChar == ' ') || + (LastChar == '\t')) && + (ChannelIBufferLength(CurrentChannel))); + + /* Write back into the channel the last character */ + ChannelIWrite(CurrentChannel, WriteBuffer, sizeof(CHAR)); + + /* NULL-terminate the input buffer */ + WriteBuffer[0] = ANSI_NULL; + ChannelIWrite(CurrentChannel, WriteBuffer, sizeof(WCHAR)); + + /* Now loop over every first character */ + do + { + /* Read every character in the channel, and strip whitespace */ + ChannelIRead(CurrentChannel, + ReadBuffer, + sizeof(ReadBuffer), + &ReadBufferSize); + WriteBuffer[0] = ReadBuffer[0]; + } while ((ReadBufferSize) && + ((ReadBuffer[0] != ' ') || (ReadBuffer[0] != '\t'))); + + /* We read one more than we should, so treat that as our first one */ + InputBuffer[0] = ReadBuffer[0]; + i = 1; + + /* And now loop reading all the others */ + do + { + /* Read each character -- there should be max 80 */ + ChannelIRead(CurrentChannel, + ReadBuffer, + sizeof(ReadBuffer), + &ReadBufferSize); + ASSERT(i < SAC_VTUTF8_COL_WIDTH); + InputBuffer[i++] = ReadBuffer[0]; + } while (ReadBufferSize); + + /* Now go over the entire input stream */ + for (i = 0; InputBuffer[i]; i++) + { + /* Again it should be less than 80 characters */ + ASSERT(i < SAC_VTUTF8_COL_WIDTH); + + /* And upcase each character */ + Char = InputBuffer[i]; + if ((Char >= 'A') && (Char <= 'Z')) InputBuffer[i] = Char + ' '; + } + + /* Ok, at this point, no pending command should exist */ + ASSERT(ExecutePostConsumerCommand == Nothing); + + /* Go and process the input, then show the prompt again */ + ConMgrProcessInputLine(); + SacPutSimpleMessage(SAC_PROMPT); + + /* If the user typed a valid command, get out of here */ + if (ExecutePostConsumerCommand != Nothing) break; + + /* Keep going */ + continue; + } + + /* Check if the user typed backspace or delete */ + if ((Char == '\b') || (Char == '\x7F')) + { + /* Omit the last character, which should be the DEL/BS itself */ + if (ChannelIBufferLength(CurrentChannel)) + { + ChannelIReadLast(CurrentChannel); + } + + /* Omit the before-last character, which is the one to delete */ + if (ChannelIBufferLength(CurrentChannel)) + { + /* Also send two backspaces back to the console */ + SacPutString(L"\b \b"); + ChannelIReadLast(CurrentChannel); + } + + /* Keep going */ + continue; + } + + /* If the user pressed CTRL-C at this point, treat it like ENTER */ + if (Char == '\x03') goto DoLineParsing; + + /* Check if the user pressed TAB */ + if (Char == '\t') + { + /* Omit it, send a BELL, and keep going. We ignore TABs */ + ChannelIReadLast(CurrentChannel); + SacPutString(L"\a"); + continue; + } + + /* Check if the user is getting close to the end of the screen */ + if (ChannelIBufferLength(CurrentChannel) == (SAC_VTUTF8_COL_WIDTH - 2)) + { + /* Delete the last character, replacing it with this one instead */ + swprintf(StringBuffer, L"\b%c", Char); + SacPutString(StringBuffer); + + /* Omit the last two characters from the buffer */ + ChannelIReadLast(CurrentChannel); + ChannelIReadLast(CurrentChannel); + + /* NULL-terminate it */ + WriteBuffer[0] = Char; + ChannelIWrite(CurrentChannel, WriteBuffer, sizeof(CHAR)); + continue; + } + + /* Nothing of interest happened, just write the character back */ + swprintf(StringBuffer, L"%c", Char); + SacPutString(StringBuffer); + } + + /* We're done, release the lock */ + SacReleaseMutexLock(); + SAC_DBG(SAC_DBG_MACHINE, "SAC TimerDpcRoutine: Exiting.\n"); //bug +} + +VOID +NTAPI +ConMgrWorkerProcessEvents(IN PSAC_DEVICE_EXTENSION DeviceExtension) +{ + SAC_DBG(SAC_DBG_ENTRY_EXIT, "SAC WorkerProcessEvents: Entering.\n"); + + /* Enter the main loop */ + while (TRUE) + { + /* Wait for something to do */ + KeWaitForSingleObject(&DeviceExtension->Event, + Executive, + KernelMode, + FALSE, + NULL); + + /* Consume data off the serial port */ + ConMgrSerialPortConsumer(); + switch (ExecutePostConsumerCommand) + { + case 1: + /* A reboot was sent, do it */ + DoRebootCommand(FALSE); + break; + + case 2: + /* A close was sent, do it */ + ChanMgrCloseChannel(ExecutePostConsumerCommandData); + ChanMgrReleaseChannel(ExecutePostConsumerCommandData); + break; + + case 3: + /* A shutdown was sent, do it */ + DoRebootCommand(TRUE); + break; + } + + /* Clear the serial port consumer state */ + ExecutePostConsumerCommand = 0; + ExecutePostConsumerCommandData = NULL; + } +} + NTSTATUS NTAPI ConMgrGetChannelCloseMessage(IN PSAC_CHANNEL Channel, @@ -522,13 +769,6 @@ return STATUS_NOT_IMPLEMENTED; } -VOID -NTAPI -ConMgrProcessInputLine(VOID) -{ - ASSERT(FALSE); -} - NTSTATUS NTAPI ConMgrHandleEvent(IN ULONG EventCode, Modified: trunk/reactos/drivers/sac/driver/data.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/sac/driver/data.c?… ============================================================================== --- trunk/reactos/drivers/sac/driver/data.c [iso-8859-1] (original) +++ trunk/reactos/drivers/sac/driver/data.c [iso-8859-1] Sun Aug 18 17:47:19 2013 @@ -238,7 +238,7 @@ KeInitializeTimer(&DeviceExtension->Timer); KeInitializeDpc(&DeviceExtension->Dpc, TimerDpcRoutine, DeviceExtension); KeInitializeSpinLock(&DeviceExtension->Lock); - KeInitializeEvent(&DeviceExtension->Event, SynchronizationEvent, 0); + KeInitializeEvent(&DeviceExtension->Event, SynchronizationEvent, FALSE); InitializeListHead(&DeviceExtension->List); /* Attempt to enable HDL support */ @@ -317,8 +317,8 @@ DeviceExtension->PriorityFail = TRUE; /* Initialize rundown and wait for the thread to do it */ - KeInitializeEvent(&DeviceExtension->RundownEvent, SynchronizationEvent, 0); - KeSetEvent(&DeviceExtension->Event, DeviceExtension->PriorityBoost, 0); + KeInitializeEvent(&DeviceExtension->RundownEvent, SynchronizationEvent, FALSE); + KeSetEvent(&DeviceExtension->Event, DeviceExtension->PriorityBoost, FALSE); Status = KeWaitForSingleObject(&DeviceExtension->RundownEvent, Executive, KernelMode, Modified: trunk/reactos/drivers/sac/driver/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/sac/driver/dispatc… ============================================================================== --- trunk/reactos/drivers/sac/driver/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/drivers/sac/driver/dispatch.c [iso-8859-1] Sun Aug 18 17:47:19 2013 @@ -11,6 +11,8 @@ #include "sacdrv.h" /* GLOBALS *******************************************************************/ + +LONG TimerDpcCount; /* FUNCTIONS *****************************************************************/ @@ -61,7 +63,48 @@ IN PVOID SystemArgument1, IN PVOID SystemArgument2) { + HEADLESS_RSP_GET_BYTE ByteValue; + ULONG ValueSize; + BOOLEAN GotChar; + NTSTATUS Status; + PSAC_DEVICE_EXTENSION SacExtension; + /* Update our counter */ + _InterlockedExchangeAdd(&TimerDpcCount, 1); + + /* Set defaults and loop for new characters */ + GotChar = FALSE; + ValueSize = sizeof(ByteValue); + do + { + /* Ask the kernel for a byte */ + Status = HeadlessDispatch(HeadlessCmdGetByte, + NULL, + 0, + &ByteValue, + &ValueSize); + + /* Break out if there's nothing interesting */ + if (!NT_SUCCESS(Status)) break; + if (!ByteValue.Value) break; + + /* Update the serial port buffer */ + SerialPortBuffer[SerialPortProducerIndex] = ByteValue.Value; + GotChar = TRUE; + + /* Update the index, let it roll-over if needed */ + _InterlockedExchange(&SerialPortProducerIndex, + (SerialPortProducerIndex + 1) & + (SAC_SERIAL_PORT_BUFFER_SIZE - 1)); + } while (ByteValue.Value); + + /* Did we get anything */ + if (GotChar) + { + /* Signal the worker thread that there is work to do */ + SacExtension = DeferredContext; + KeSetEvent(&SacExtension->Event, SacExtension->PriorityBoost, FALSE); + } } VOID Modified: trunk/reactos/drivers/sac/driver/sacdrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/sac/driver/sacdrv.… ============================================================================== --- trunk/reactos/drivers/sac/driver/sacdrv.h [iso-8859-1] (original) +++ trunk/reactos/drivers/sac/driver/sacdrv.h [iso-8859-1] Sun Aug 18 17:47:19 2013 @@ -156,6 +156,7 @@ #define SAC_MAX_CHANNELS 10 #define SAC_SERIAL_PORT_BUFFER_SIZE 1024 // 1KB #define SAC_MAX_MESSAGES 200 +#define SAC_VTUTF8_COL_WIDTH 80 // // Channel flags @@ -766,6 +767,35 @@ IN PSAC_CHANNEL Channel ); +NTSTATUS +NTAPI +ChannelIWrite( + IN PSAC_CHANNEL Channel, + IN PCHAR Buffer, + IN ULONG BufferSize +); + +UCHAR +NTAPI +ChannelIReadLast( + IN PSAC_CHANNEL Channel +); + +ULONG +NTAPI +ChannelIBufferLength( + IN PSAC_CHANNEL Channel +); + +NTSTATUS +NTAPI +ChannelIRead( + IN PSAC_CHANNEL Channel, + IN PCHAR Buffer, + IN ULONG BufferSize, + IN OUT PULONG ResultBufferSize +); + // // RAW Channel Table // @@ -901,6 +931,7 @@ extern KMUTEX CurrentChannelLock; extern LONG CurrentChannelRefCount; extern PCHAR SerialPortBuffer; +extern LONG SerialPortConsumerIndex, SerialPortProducerIndex; extern PCHAR Utf8ConversionBuffer; extern ULONG Utf8ConversionBufferSize; Modified: trunk/reactos/drivers/sac/driver/util.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/sac/driver/util.c?… ============================================================================== --- trunk/reactos/drivers/sac/driver/util.c [iso-8859-1] (original) +++ trunk/reactos/drivers/sac/driver/util.c [iso-8859-1] Sun Aug 18 17:47:19 2013 @@ -14,7 +14,9 @@ PCHAR Utf8ConversionBuffer; ULONG Utf8ConversionBufferSize = PAGE_SIZE; + PSAC_MACHINE_INFO MachineInformation; + PVOID RequestSacCmdEventObjectBody; PKEVENT RequestSacCmdEventWaitObjectBody; PVOID RequestSacCmdSuccessEventObjectBody; Modified: trunk/reactos/include/reactos/libs/cportlib/cportlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/cport… ============================================================================== --- trunk/reactos/include/reactos/libs/cportlib/cportlib.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/cportlib/cportlib.h [iso-8859-1] Sun Aug 18 17:47:19 2013 @@ -71,7 +71,8 @@ CpGetByte( IN PCPPORT Port, OUT PUCHAR Byte, - IN BOOLEAN Wait + IN BOOLEAN Wait, + IN BOOLEAN Poll ); VOID Modified: trunk/reactos/lib/cportlib/cport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cportlib/cport.c?rev=5… ============================================================================== --- trunk/reactos/lib/cportlib/cport.c [iso-8859-1] (original) +++ trunk/reactos/lib/cportlib/cport.c [iso-8859-1] Sun Aug 18 17:47:19 2013 @@ -255,7 +255,8 @@ NTAPI CpGetByte(IN PCPPORT Port, OUT PUCHAR Byte, - IN BOOLEAN Wait) + IN BOOLEAN Wait, + IN BOOLEAN Poll) { UCHAR Lsr; ULONG LimitCount = Wait ? TIMEOUT_COUNT : 1; @@ -277,6 +278,9 @@ return CP_GET_ERROR; } + /* If only polling was requested by caller, return now */ + if (Poll) return CP_GET_SUCCESS; + /* Otherwise read the byte and return it */ *Byte = READ_PORT_UCHAR(Port->Address + RECEIVE_BUFFER_REGISTER); 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 17:47:19 2013 @@ -262,6 +262,7 @@ PHEADLESS_RSP_QUERY_INFO HeadlessInfo; PHEADLESS_CMD_PUT_STRING PutString; PHEADLESS_CMD_ENABLE_TERMINAL EnableTerminal; + PHEADLESS_RSP_GET_BYTE GetByte; NTSTATUS Status = STATUS_NOT_IMPLEMENTED; ASSERT(HeadlessGlobals != NULL); // ASSERT(HeadlessGlobals->PageLockHandle != NULL); @@ -328,8 +329,18 @@ Status = STATUS_SUCCESS; break; - case HeadlessCmdClearDisplay: - break; + case HeadlessCmdClearDisplay: + + /* Send the VT100 claer screen command if the terminal is enabled */ + if (HeadlessGlobals->TerminalEnabled) + { + HdlspSendStringAtBaud((PUCHAR)"\033[2J"); + } + + /* Return success either way */ + Status = STATUS_SUCCESS; + break; + case HeadlessCmdClearToEndOfDisplay: break; case HeadlessCmdClearToEndOfLine: @@ -344,8 +355,46 @@ break; case HeadlessCmdTerminalPoll: break; - case HeadlessCmdGetByte: - break; + + case HeadlessCmdGetByte: + + /* Make sure the caller passed valid data */ + if (!(OutputBuffer) || + !(OutputBufferSize) || + (*OutputBufferSize < sizeof(*GetByte))) + { + DPRINT1("Invalid buffer\n"); + Status = STATUS_INVALID_PARAMETER; + break; + } + + /* Make sure the terminal is enabled */ + GetByte = OutputBuffer; + if (HeadlessGlobals->TerminalEnabled) + { + /* Poll if something is on the wire */ + if (InbvPortPollOnly(HeadlessGlobals->TerminalPort)) + { + /* If so, read it */ + InbvPortGetByte(HeadlessGlobals->TerminalPort, + &GetByte->Value); + } + else + { + /* Nothing is there, return 0 */ + GetByte->Value = 0; + } + } + else + { + /* Otherwise return nothing */ + GetByte->Value = 0; + } + + /* Return success either way */ + Status = STATUS_SUCCESS; + break; + case HeadlessCmdGetLine: break; case HeadlessCmdStartBugCheck: Modified: trunk/reactos/ntoskrnl/inbv/inbvport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/inbvport.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/inbv/inbvport.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/inbv/inbvport.c [iso-8859-1] Sun Aug 18 17:47:19 2013 @@ -22,6 +22,25 @@ }; /* FUNCTIONS *****************************************************************/ + +BOOLEAN +NTAPI +InbvPortPollOnly(IN ULONG PortId) +{ + UCHAR Dummy; + + /* Poll a byte from the port */ + return CpGetByte(&Port[PortId], &Dummy, FALSE, TRUE) == CP_GET_SUCCESS; +} + +BOOLEAN +NTAPI +InbvPortGetByte(IN ULONG PortId, + OUT PUCHAR Char) +{ + /* Read a byte from the port */ + return CpGetByte(&Port[PortId], Char, TRUE, FALSE) == CP_GET_SUCCESS; +} VOID NTAPI Modified: trunk/reactos/ntoskrnl/include/internal/hdl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/hdl.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/hdl.h [iso-8859-1] Sun Aug 18 17:47:19 2013 @@ -192,6 +192,11 @@ UCHAR String[1]; } HEADLESS_CMD_PUT_STRING, *PHEADLESS_CMD_PUT_STRING; +typedef struct _HEADLESS_RSP_GET_BYTE +{ + UCHAR Value; +} HEADLESS_RSP_GET_BYTE, *PHEADLESS_RSP_GET_BYTE; + NTSTATUS NTAPI HeadlessDispatch( Modified: trunk/reactos/ntoskrnl/include/internal/inbv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/inbv.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/inbv.h [iso-8859-1] Sun Aug 18 17:47:19 2013 @@ -107,4 +107,17 @@ IN BOOLEAN IsMMIODevice ); +BOOLEAN +NTAPI +InbvPortPollOnly( + IN ULONG PortId +); + +BOOLEAN +NTAPI +InbvPortGetByte( + IN ULONG PortId, + OUT PUCHAR Char +); + extern BOOLEAN InbvBootDriverInstalled; Modified: trunk/reactos/ntoskrnl/kd/i386/kdbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/i386/kdbg.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/kd/i386/kdbg.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd/i386/kdbg.c [iso-8859-1] Sun Aug 18 17:47:19 2013 @@ -136,7 +136,7 @@ IN PCPPORT PortInformation, OUT PUCHAR ByteReceived) { - return (CpGetByte(PortInformation, ByteReceived, FALSE) == CP_GET_SUCCESS); + return (CpGetByte(PortInformation, ByteReceived, FALSE, TRUE) == CP_GET_SUCCESS); } VOID

1 0

[akhaldi] 59771: [PSDK] * Annotate msi.h.
by akhaldi＠svn.reactos.org 18 Aug '13

18 Aug '13

Author: akhaldi Date: Sun Aug 18 14:47:51 2013 New Revision: 59771 URL: http://svn.reactos.org/svn/reactos?rev=59771&view=rev Log: [PSDK] * Annotate msi.h. Modified: trunk/reactos/include/psdk/msi.h Modified: trunk/reactos/include/psdk/msi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/msi.h?rev=597… ============================================================================== --- trunk/reactos/include/psdk/msi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/msi.h [iso-8859-1] Sun Aug 18 14:47:51 2013 @@ -22,6 +22,8 @@ #ifndef _MSI_NO_CRYPTO #include <wincrypt.h> #endif + +#define MAX_GUID_CHARS 38 #ifdef __cplusplus extern "C" { @@ -413,295 +415,1116 @@ typedef INT (CALLBACK *INSTALLUI_HANDLER_RECORD)(LPVOID, UINT, MSIHANDLE); typedef INSTALLUI_HANDLER_RECORD* PINSTALLUI_HANDLER_RECORD; -UINT WINAPI MsiAdvertiseProductA(LPCSTR, LPCSTR, LPCSTR, LANGID); -UINT WINAPI MsiAdvertiseProductW(LPCWSTR, LPCWSTR, LPCWSTR, LANGID); +UINT +WINAPI +MsiAdvertiseProductA( + _In_ LPCSTR, + _In_opt_ LPCSTR, + _In_opt_ LPCSTR, + _In_ LANGID); + +UINT +WINAPI +MsiAdvertiseProductW( + _In_ LPCWSTR, + _In_opt_ LPCWSTR, + _In_opt_ LPCWSTR, + _In_ LANGID); + #define MsiAdvertiseProduct WINELIB_NAME_AW(MsiAdvertiseProduct) -UINT WINAPI MsiAdvertiseProductExA(LPCSTR, LPCSTR, LPCSTR, LANGID, DWORD, DWORD); -UINT WINAPI MsiAdvertiseProductExW(LPCWSTR, LPCWSTR, LPCWSTR, LANGID, DWORD, DWORD); +UINT +WINAPI +MsiAdvertiseProductExA( + _In_ LPCSTR, + _In_opt_ LPCSTR, + _In_opt_ LPCSTR, + _In_ LANGID, + _In_ DWORD, + _In_ DWORD); + +UINT +WINAPI +MsiAdvertiseProductExW( + _In_ LPCWSTR, + _In_opt_ LPCWSTR, + _In_opt_ LPCWSTR, + _In_ LANGID, + _In_ DWORD, + _In_ DWORD); + #define MsiAdvertiseProductEx WINELIB_NAME_AW(MsiAdvertiseProductEx) -UINT WINAPI MsiInstallProductA(LPCSTR, LPCSTR); -UINT WINAPI MsiInstallProductW(LPCWSTR, LPCWSTR); +UINT WINAPI MsiInstallProductA(_In_ LPCSTR, _In_opt_ LPCSTR); +UINT WINAPI MsiInstallProductW(_In_ LPCWSTR, _In_opt_ LPCWSTR); #define MsiInstallProduct WINELIB_NAME_AW(MsiInstallProduct) -UINT WINAPI MsiReinstallProductA(LPCSTR, DWORD); -UINT WINAPI MsiReinstallProductW(LPCWSTR, DWORD); +UINT WINAPI MsiReinstallProductA(_In_ LPCSTR, _In_ DWORD); +UINT WINAPI MsiReinstallProductW(_In_ LPCWSTR, _In_ DWORD); #define MsiReinstallProduct WINELIB_NAME_AW(MsiReinstallProduct) -UINT WINAPI MsiApplyPatchA(LPCSTR, LPCSTR, INSTALLTYPE, LPCSTR); -UINT WINAPI MsiApplyPatchW(LPCWSTR, LPCWSTR, INSTALLTYPE, LPCWSTR); +UINT +WINAPI +MsiApplyPatchA( + _In_ LPCSTR, + _In_opt_ LPCSTR, + _In_ INSTALLTYPE, + _In_opt_ LPCSTR); + +UINT +WINAPI +MsiApplyPatchW( + _In_ LPCWSTR, + _In_opt_ LPCWSTR, + _In_ INSTALLTYPE, + _In_opt_ LPCWSTR); + #define MsiApplyPatch WINELIB_NAME_AW(MsiApplyPatch) UINT WINAPI MsiEnumComponentCostsA(MSIHANDLE, LPCSTR, DWORD, INSTALLSTATE, LPSTR, LPDWORD, LPINT, LPINT); UINT WINAPI MsiEnumComponentCostsW(MSIHANDLE, LPCWSTR, DWORD, INSTALLSTATE, LPWSTR, LPDWORD, LPINT, LPINT); #define MsiEnumComponentCosts WINELIB_NAME_AW(MsiEnumComponentCosts) -UINT WINAPI MsiEnumProductsA(DWORD, LPSTR); -UINT WINAPI MsiEnumProductsW(DWORD, LPWSTR); +UINT +WINAPI +MsiEnumProductsA( + _In_ DWORD, + _Out_writes_(MAX_GUID_CHARS + 1) LPSTR); + +UINT +WINAPI +MsiEnumProductsW( + _In_ DWORD, + _Out_writes_(MAX_GUID_CHARS + 1) LPWSTR); + #define MsiEnumProducts WINELIB_NAME_AW(MsiEnumProducts) -UINT WINAPI MsiEnumProductsExA(LPCSTR, LPCSTR, DWORD, DWORD, CHAR[39], MSIINSTALLCONTEXT*, LPSTR, LPDWORD); -UINT WINAPI MsiEnumProductsExW(LPCWSTR, LPCWSTR, DWORD, DWORD, WCHAR[39], MSIINSTALLCONTEXT*, LPWSTR, LPDWORD); +UINT +WINAPI +MsiEnumProductsExA( + _In_opt_ LPCSTR, + _In_opt_ LPCSTR, + _In_ DWORD, + _In_ DWORD, + _Out_writes_opt_(MAX_GUID_CHARS + 1) CHAR[39], + _Out_opt_ MSIINSTALLCONTEXT*, + _Out_writes_opt_(*pcchSid) LPSTR, + _Inout_opt_ LPDWORD pcchSid); + +UINT +WINAPI +MsiEnumProductsExW( + _In_opt_ LPCWSTR, + _In_opt_ LPCWSTR, + _In_ DWORD, + _In_ DWORD, + _Out_writes_opt_(MAX_GUID_CHARS + 1) WCHAR[39], + _Out_opt_ MSIINSTALLCONTEXT*, + _Out_writes_opt_(*pcchSid) LPWSTR, + _Inout_opt_ LPDWORD pcchSid); + #define MsiEnumProductsEx WINELIB_NAME_AW(MsiEnumProductsEx) -UINT WINAPI MsiEnumFeaturesA(LPCSTR, DWORD, LPSTR, LPSTR); -UINT WINAPI MsiEnumFeaturesW(LPCWSTR, DWORD, LPWSTR, LPWSTR); +UINT +WINAPI +MsiEnumFeaturesA( + _In_ LPCSTR, + _In_ DWORD, + _Out_writes_(MAX_FEATURE_CHARS + 1) LPSTR, + _Out_writes_opt_(MAX_FEATURE_CHARS + 1) LPSTR); + +UINT +WINAPI +MsiEnumFeaturesW( + _In_ LPCWSTR, + _In_ DWORD, + _Out_writes_(MAX_FEATURE_CHARS + 1) LPWSTR, + _Out_writes_opt_(MAX_FEATURE_CHARS + 1) LPWSTR); + #define MsiEnumFeatures WINELIB_NAME_AW(MsiEnumFeatures) -UINT WINAPI MsiEnumComponentsA(DWORD, LPSTR); -UINT WINAPI MsiEnumComponentsW(DWORD, LPWSTR); +UINT +WINAPI +MsiEnumComponentsA( + _In_ DWORD, + _Out_writes_(MAX_GUID_CHARS + 1) LPSTR); + +UINT +WINAPI +MsiEnumComponentsW( + _In_ DWORD, + _Out_writes_(MAX_GUID_CHARS + 1) LPWSTR); + #define MsiEnumComponents WINELIB_NAME_AW(MsiEnumComponents) -UINT WINAPI MsiEnumComponentsExA(LPCSTR, DWORD, DWORD, CHAR[39], - MSIINSTALLCONTEXT *, LPSTR, LPDWORD); -UINT WINAPI MsiEnumComponentsExW(LPCWSTR, DWORD, DWORD, WCHAR[39], - MSIINSTALLCONTEXT *, LPWSTR, LPDWORD); +UINT +WINAPI +MsiEnumComponentsExA( + _In_opt_ LPCSTR, + _In_ DWORD, + _In_ DWORD, + _Out_writes_opt_(MAX_GUID_CHARS + 1) CHAR[39], + _Out_opt_ MSIINSTALLCONTEXT *, + _Out_writes_opt_(*pcchSid) LPSTR, + _Inout_opt_ LPDWORD pcchSid); + +UINT +WINAPI +MsiEnumComponentsExW( + _In_opt_ LPCWSTR, + _In_ DWORD, + _In_ DWORD, + _Out_writes_opt_(MAX_GUID_CHARS + 1) WCHAR[39], + _Out_opt_ MSIINSTALLCONTEXT *, + _Out_writes_opt_(*pcchSid) LPWSTR, + _Inout_opt_ LPDWORD pcchSid); + #define MsiEnumComponentsEx WINELIB_NAME_AW(MsiEnumComponentsEx) -UINT WINAPI MsiEnumClientsA(LPCSTR, DWORD, LPSTR); -UINT WINAPI MsiEnumClientsW(LPCWSTR, DWORD, LPWSTR); +UINT +WINAPI +MsiEnumClientsA( + _In_ LPCSTR, + _In_ DWORD, + _Out_writes_(MAX_GUID_CHARS + 1) LPSTR); + +UINT +WINAPI +MsiEnumClientsW( + _In_ LPCWSTR, + _In_ DWORD, + _Out_writes_(MAX_GUID_CHARS + 1) LPWSTR); + #define MsiEnumClients WINELIB_NAME_AW(MsiEnumClients) -UINT WINAPI MsiOpenPackageA(LPCSTR, MSIHANDLE*); -UINT WINAPI MsiOpenPackageW(LPCWSTR, MSIHANDLE*); +UINT WINAPI MsiOpenPackageA(_In_ LPCSTR, _Out_ MSIHANDLE*); +UINT WINAPI MsiOpenPackageW(_In_ LPCWSTR, _Out_ MSIHANDLE*); #define MsiOpenPackage WINELIB_NAME_AW(MsiOpenPackage) -UINT WINAPI MsiOpenPackageExA(LPCSTR, DWORD, MSIHANDLE*); -UINT WINAPI MsiOpenPackageExW(LPCWSTR, DWORD, MSIHANDLE*); +UINT WINAPI MsiOpenPackageExA(_In_ LPCSTR, _In_ DWORD, _Out_ MSIHANDLE*); +UINT WINAPI MsiOpenPackageExW(_In_ LPCWSTR, _In_ DWORD, _Out_ MSIHANDLE*); #define MsiOpenPackageEx WINELIB_NAME_AW(MsiOpenPackageEx) -UINT WINAPI MsiOpenProductA(LPCSTR, MSIHANDLE*); -UINT WINAPI MsiOpenProductW(LPCWSTR, MSIHANDLE*); +UINT WINAPI MsiOpenProductA(_In_ LPCSTR, _Out_ MSIHANDLE*); +UINT WINAPI MsiOpenProductW(_In_ LPCWSTR, _Out_ MSIHANDLE*); #define MsiOpenProduct WINELIB_NAME_AW(MsiOpenProduct) -UINT WINAPI MsiGetProductPropertyA(MSIHANDLE,LPCSTR,LPSTR,LPDWORD); -UINT WINAPI MsiGetProductPropertyW(MSIHANDLE,LPCWSTR,LPWSTR,LPDWORD); +UINT +WINAPI +MsiGetProductPropertyA( + _In_ MSIHANDLE, + _In_ LPCSTR, + _Out_writes_opt_(*pcchValueBuf) LPSTR, + _Inout_opt_ LPDWORD pcchValueBuf); + +UINT +WINAPI +MsiGetProductPropertyW( + _In_ MSIHANDLE, + _In_ LPCWSTR, + _Out_writes_opt_(*pcchValueBuf) LPWSTR, + _Inout_opt_ LPDWORD pcchValueBuf); + #define MsiGetProductProperty WINELIB_NAME_AW(MsiGetProductProperty) -UINT WINAPI MsiVerifyPackageA(LPCSTR); -UINT WINAPI MsiVerifyPackageW(LPCWSTR); +UINT WINAPI MsiVerifyPackageA(_In_ LPCSTR); +UINT WINAPI MsiVerifyPackageW(_In_ LPCWSTR); #define MsiVerifyPackage WINELIB_NAME_AW(MsiVerifyPackage) -UINT WINAPI MsiQueryComponentStateA(LPCSTR,LPCSTR,MSIINSTALLCONTEXT,LPCSTR,INSTALLSTATE*); -UINT WINAPI MsiQueryComponentStateW(LPCWSTR,LPCWSTR,MSIINSTALLCONTEXT,LPCWSTR,INSTALLSTATE*); +UINT +WINAPI +MsiQueryComponentStateA( + _In_ LPCSTR, + _In_opt_ LPCSTR, + _In_ MSIINSTALLCONTEXT, + _In_ LPCSTR, + _Out_opt_ INSTALLSTATE*); + +UINT +WINAPI +MsiQueryComponentStateW( + _In_ LPCWSTR, + _In_opt_ LPCWSTR, + _In_ MSIINSTALLCONTEXT, + _In_ LPCWSTR, + _Out_opt_ INSTALLSTATE*); + #define MsiQueryComponentState WINELIB_NAME_AW(MsiQueryComponentState) -INSTALLSTATE WINAPI MsiQueryProductStateA(LPCSTR); -INSTALLSTATE WINAPI MsiQueryProductStateW(LPCWSTR); +INSTALLSTATE WINAPI MsiQueryProductStateA(_In_ LPCSTR); +INSTALLSTATE WINAPI MsiQueryProductStateW(_In_ LPCWSTR); #define MsiQueryProductState WINELIB_NAME_AW(MsiQueryProductState) -UINT WINAPI MsiConfigureProductA(LPCSTR, int, INSTALLSTATE); -UINT WINAPI MsiConfigureProductW(LPCWSTR, int, INSTALLSTATE); +UINT WINAPI MsiConfigureProductA(_In_ LPCSTR, _In_ int, _In_ INSTALLSTATE); +UINT WINAPI MsiConfigureProductW(_In_ LPCWSTR, _In_ int, _In_ INSTALLSTATE); #define MsiConfigureProduct WINELIB_NAME_AW(MsiConfigureProduct); -UINT WINAPI MsiConfigureProductExA(LPCSTR, int, INSTALLSTATE, LPCSTR); -UINT WINAPI MsiConfigureProductExW(LPCWSTR, int, INSTALLSTATE, LPCWSTR); +UINT +WINAPI +MsiConfigureProductExA( + _In_ LPCSTR, + _In_ int, + _In_ INSTALLSTATE, + _In_opt_ LPCSTR); + +UINT +WINAPI +MsiConfigureProductExW( + _In_ LPCWSTR, + _In_ int, + _In_ INSTALLSTATE, + _In_opt_ LPCWSTR); + #define MsiConfigureProductEx WINELIB_NAME_AW(MsiConfigureProductEx); -UINT WINAPI MsiConfigureFeatureA(LPCSTR, LPCSTR, INSTALLSTATE); -UINT WINAPI MsiConfigureFeatureW(LPCWSTR, LPCWSTR, INSTALLSTATE); +UINT +WINAPI +MsiConfigureFeatureA( + _In_ LPCSTR, + _In_ LPCSTR, + _In_ INSTALLSTATE); + +UINT +WINAPI +MsiConfigureFeatureW( + _In_ LPCWSTR, + _In_ LPCWSTR, + _In_ INSTALLSTATE); + #define MsiConfigureFeature WINELIB_NAME_AW(MsiConfigureFeature); -UINT WINAPI MsiGetProductCodeA(LPCSTR, LPSTR); -UINT WINAPI MsiGetProductCodeW(LPCWSTR, LPWSTR); +UINT +WINAPI +MsiGetProductCodeA( + _In_ LPCSTR, + _Out_writes_(MAX_GUID_CHARS + 1) LPSTR); + +UINT +WINAPI +MsiGetProductCodeW( + _In_ LPCWSTR, + _Out_writes_(MAX_GUID_CHARS + 1) LPWSTR); + #define MsiGetProductCode WINELIB_NAME_AW(MsiGetProductCode) -UINT WINAPI MsiGetProductInfoA(LPCSTR, LPCSTR, LPSTR, LPDWORD); -UINT WINAPI MsiGetProductInfoW(LPCWSTR, LPCWSTR, LPWSTR, LPDWORD); +UINT +WINAPI +MsiGetProductInfoA( + _In_ LPCSTR, + _In_ LPCSTR, + _Out_writes_opt_(*pcchValueBuf) LPSTR, + _Inout_opt_ LPDWORD pcchValueBuf); + +UINT +WINAPI +MsiGetProductInfoW( + _In_ LPCWSTR, + _In_ LPCWSTR, + _Out_writes_opt_(*pcchValueBuf) LPWSTR, + _Inout_opt_ LPDWORD pcchValueBuf); + #define MsiGetProductInfo WINELIB_NAME_AW(MsiGetProductInfo) -UINT WINAPI MsiGetProductInfoExA(LPCSTR, LPCSTR, MSIINSTALLCONTEXT, LPCSTR, LPSTR, LPDWORD); -UINT WINAPI MsiGetProductInfoExW(LPCWSTR, LPCWSTR, MSIINSTALLCONTEXT, LPCWSTR, LPWSTR, LPDWORD); +UINT +WINAPI +MsiGetProductInfoExA( + _In_ LPCSTR, + _In_opt_ LPCSTR, + _In_ MSIINSTALLCONTEXT, + _In_ LPCSTR, + _Out_writes_opt_(*pcchValue) LPSTR, + _Inout_opt_ LPDWORD pcchValue); + +UINT +WINAPI +MsiGetProductInfoExW( + _In_ LPCWSTR, + _In_opt_ LPCWSTR, + _In_ MSIINSTALLCONTEXT, + _In_ LPCWSTR, + _Out_writes_opt_(*pcchValue) LPWSTR, + _Inout_opt_ LPDWORD pcchValue); + #define MsiGetProductInfoEx WINELIB_NAME_AW(MsiGetProductInfoEx) -UINT WINAPI MsiGetPatchInfoExA(LPCSTR, LPCSTR, LPCSTR, MSIINSTALLCONTEXT, LPCSTR, LPSTR, LPDWORD); -UINT WINAPI MsiGetPatchInfoExW(LPCWSTR, LPCWSTR, LPCWSTR, MSIINSTALLCONTEXT, LPCWSTR, LPWSTR, LPDWORD); +UINT +WINAPI +MsiGetPatchInfoExA( + _In_ LPCSTR, + _In_ LPCSTR, + _In_opt_ LPCSTR, + _In_ MSIINSTALLCONTEXT, + _In_ LPCSTR, + _Out_writes_opt_(*pcchValue) LPSTR, + _Inout_opt_ LPDWORD pcchValue); + +UINT +WINAPI +MsiGetPatchInfoExW( + _In_ LPCWSTR, + _In_ LPCWSTR, + _In_opt_ LPCWSTR, + _In_ MSIINSTALLCONTEXT, + _In_ LPCWSTR, + _Out_writes_opt_(*pcchValue) LPWSTR, + _Inout_opt_ LPDWORD pcchValue); + #define MsiGetPatchInfoEx WINELIB_NAME_AW(MsiGetPatchInfoEx) -UINT WINAPI MsiGetPatchInfoA(LPCSTR, LPCSTR, LPSTR, LPDWORD); -UINT WINAPI MsiGetPatchInfoW(LPCWSTR, LPCWSTR, LPWSTR, LPDWORD); +UINT +WINAPI +MsiGetPatchInfoA( + _In_ LPCSTR, + _In_ LPCSTR, + _Out_writes_opt_(*pcchValueBuf) LPSTR, + _Inout_opt_ LPDWORD pcchValueBuf); + +UINT +WINAPI +MsiGetPatchInfoW( + _In_ LPCWSTR, + _In_ LPCWSTR, + _Out_writes_opt_(*pcchValueBuf) LPWSTR, + _Inout_opt_ LPDWORD pcchValueBuf); + #define MsiGetPatchInfo WINELIB_NAME_AW(MsiGetPatchInfo) -UINT WINAPI MsiEnableLogA(DWORD, LPCSTR, DWORD); -UINT WINAPI MsiEnableLogW(DWORD, LPCWSTR, DWORD); +UINT WINAPI MsiEnableLogA(_In_ DWORD, _In_opt_ LPCSTR, _In_ DWORD); +UINT WINAPI MsiEnableLogW(_In_ DWORD, _In_opt_ LPCWSTR, _In_ DWORD); #define MsiEnableLog WINELIB_NAME_AW(MsiEnableLog) -INSTALLUI_HANDLERA WINAPI MsiSetExternalUIA(INSTALLUI_HANDLERA, DWORD, LPVOID); -INSTALLUI_HANDLERW WINAPI MsiSetExternalUIW(INSTALLUI_HANDLERW, DWORD, LPVOID); +INSTALLUI_HANDLERA +WINAPI +MsiSetExternalUIA( + _In_opt_ INSTALLUI_HANDLERA, + _In_ DWORD, + _In_opt_ LPVOID); + +INSTALLUI_HANDLERW +WINAPI +MsiSetExternalUIW( + _In_opt_ INSTALLUI_HANDLERW, + _In_ DWORD, + _In_opt_ LPVOID); + #define MsiSetExternalUI WINELIB_NAME_AW(MsiSetExternalUI) -INSTALLSTATE WINAPI MsiGetComponentPathA(LPCSTR, LPCSTR, LPSTR, LPDWORD); -INSTALLSTATE WINAPI MsiGetComponentPathW(LPCWSTR, LPCWSTR, LPWSTR, LPDWORD); +INSTALLSTATE +WINAPI +MsiGetComponentPathA( + _In_ LPCSTR, + _In_ LPCSTR, + _Out_writes_opt_(*pcchBuf) LPSTR, + _Inout_opt_ LPDWORD pcchBuf); + +INSTALLSTATE +WINAPI +MsiGetComponentPathW( + _In_ LPCWSTR, + _In_ LPCWSTR, + _Out_writes_opt_(*pcchBuf) LPWSTR, + _Inout_opt_ LPDWORD pcchBuf); + #define MsiGetComponentPath WINELIB_NAME_AW(MsiGetComponentPath) -INSTALLSTATE WINAPI MsiQueryFeatureStateA(LPCSTR, LPCSTR); -INSTALLSTATE WINAPI MsiQueryFeatureStateW(LPCWSTR, LPCWSTR); +INSTALLSTATE WINAPI MsiQueryFeatureStateA(_In_ LPCSTR, _In_ LPCSTR); +INSTALLSTATE WINAPI MsiQueryFeatureStateW(_In_ LPCWSTR, _In_ LPCWSTR); #define MsiQueryFeatureState WINELIB_NAME_AW(MsiQueryFeatureState) -UINT WINAPI MsiQueryFeatureStateExA(LPCSTR, LPCSTR, MSIINSTALLCONTEXT, LPCSTR, INSTALLSTATE*); -UINT WINAPI MsiQueryFeatureStateExW(LPCWSTR, LPCWSTR, MSIINSTALLCONTEXT, LPCWSTR, INSTALLSTATE*); +UINT +WINAPI +MsiQueryFeatureStateExA( + _In_ LPCSTR, + _In_opt_ LPCSTR, + _In_ MSIINSTALLCONTEXT, + _In_ LPCSTR, + _Out_opt_ INSTALLSTATE*); + +UINT +WINAPI +MsiQueryFeatureStateExW( + _In_ LPCWSTR, + _In_opt_ LPCWSTR, + _In_ MSIINSTALLCONTEXT, + _In_ LPCWSTR, + _Out_opt_ INSTALLSTATE*); + #define MsiQueryFeatureStateEx WINELIB_NAME_AW(MsiQueryFeatureStateEx) -UINT WINAPI MsiGetFeatureInfoA(MSIHANDLE, LPCSTR, LPDWORD, LPSTR, LPDWORD, LPSTR, LPDWORD); -UINT WINAPI MsiGetFeatureInfoW(MSIHANDLE, LPCWSTR, LPDWORD, LPWSTR, LPDWORD, LPWSTR, LPDWORD); +UINT +WINAPI +MsiGetFeatureInfoA( + _In_ MSIHANDLE, + _In_ LPCSTR, + _Out_opt_ LPDWORD, + _Out_writes_opt_(*pcchTitleBuf) LPSTR, + _Inout_opt_ LPDWORD pcchTitleBuf, + _Out_writes_opt_(*pcchHelpBuf) LPSTR, + _Inout_opt_ LPDWORD pcchHelpBuf); + +UINT +WINAPI +MsiGetFeatureInfoW( + _In_ MSIHANDLE, + _In_ LPCWSTR, + _Out_opt_ LPDWORD, + _Out_writes_opt_(*pcchTitleBuf) LPWSTR, + _Inout_opt_ LPDWORD pcchTitleBuf, + _Out_writes_opt_(*pcchHelpBuf) LPWSTR, + _Inout_opt_ LPDWORD pcchHelpBuf); + #define MsiGetFeatureInfo WINELIB_NAME_AW(MsiGetFeatureInfo) -UINT WINAPI MsiGetFeatureUsageA(LPCSTR, LPCSTR, LPDWORD, LPWORD); -UINT WINAPI MsiGetFeatureUsageW(LPCWSTR, LPCWSTR, LPDWORD, LPWORD); +UINT +WINAPI +MsiGetFeatureUsageA( + _In_ LPCSTR, + _In_ LPCSTR, + _Out_opt_ LPDWORD, + _Out_opt_ LPWORD); + +UINT +WINAPI +MsiGetFeatureUsageW( + _In_ LPCWSTR, + _In_ LPCWSTR, + _Out_opt_ LPDWORD, + _Out_opt_ LPWORD); + #define MsiGetFeatureUsage WINELIB_NAME_AW(MsiGetFeatureUsage) -UINT WINAPI MsiEnumRelatedProductsA(LPCSTR, DWORD, DWORD, LPSTR); -UINT WINAPI MsiEnumRelatedProductsW(LPCWSTR, DWORD, DWORD, LPWSTR); +UINT +WINAPI +MsiEnumRelatedProductsA( + _In_ LPCSTR, + _Reserved_ DWORD, + _In_ DWORD, + _Out_writes_(MAX_GUID_CHARS + 1) LPSTR); + +UINT +WINAPI +MsiEnumRelatedProductsW( + _In_ LPCWSTR, + _Reserved_ DWORD, + _In_ DWORD, + _Out_writes_(MAX_GUID_CHARS + 1) LPWSTR); + #define MsiEnumRelatedProducts WINELIB_NAME_AW(MsiEnumRelatedProducts) -UINT WINAPI MsiProvideAssemblyA(LPCSTR, LPCSTR, DWORD, DWORD, LPSTR, LPDWORD); -UINT WINAPI MsiProvideAssemblyW(LPCWSTR, LPCWSTR, DWORD, DWORD, LPWSTR, LPDWORD); +UINT +WINAPI +MsiProvideAssemblyA( + _In_ LPCSTR, + _In_opt_ LPCSTR, + _In_ DWORD, + _In_ DWORD, + _Out_writes_opt_(*pcchPathBuf) LPSTR, + _Inout_opt_ LPDWORD pcchPathBuf); + +UINT +WINAPI +MsiProvideAssemblyW( + _In_ LPCWSTR, + _In_opt_ LPCWSTR, + _In_ DWORD, + _In_ DWORD, + _Out_writes_opt_(*pcchPathBuf) LPWSTR, + _Inout_opt_ LPDWORD pcchPathBuf); + #define MsiProvideAssembly WINELIB_NAME_AW(MsiProvideAssembly) -UINT WINAPI MsiEnumComponentQualifiersA(LPCSTR, DWORD, LPSTR, LPDWORD, LPSTR, LPDWORD); -UINT WINAPI MsiEnumComponentQualifiersW(LPCWSTR, DWORD, LPWSTR, LPDWORD, LPWSTR, LPDWORD); +UINT +WINAPI +MsiEnumComponentQualifiersA( + _In_ LPCSTR, + _In_ DWORD, + _Out_writes_(*pcchQualifierBuf) LPSTR, + _Inout_ LPDWORD pcchQualifierBuf, + _Out_writes_opt_(*pcchApplicationDataBuf) LPSTR, + _Inout_opt_ LPDWORD pcchApplicationDataBuf); + +UINT +WINAPI +MsiEnumComponentQualifiersW( + _In_ LPCWSTR, + _In_ DWORD, + _Out_writes_(*pcchQualifierBuf) LPWSTR, + _Inout_ LPDWORD pcchQualifierBuf, + _Out_writes_opt_(*pcchApplicationDataBuf) LPWSTR, + _Inout_opt_ LPDWORD pcchApplicationDataBuf); + #define MsiEnumComponentQualifiers WINELIB_NAME_AW(MsiEnumComponentQualifiers) -UINT WINAPI MsiGetFileVersionA(LPCSTR, LPSTR, LPDWORD, LPSTR, LPDWORD); -UINT WINAPI MsiGetFileVersionW(LPCWSTR, LPWSTR, LPDWORD, LPWSTR, LPDWORD); +UINT +WINAPI +MsiGetFileVersionA( + _In_ LPCSTR, + _Out_writes_opt_(*pcchVersionBuf) LPSTR, + _Inout_opt_ LPDWORD pcchVersionBuf, + _Out_writes_opt_(*pcchLangBuf) LPSTR, + _Inout_opt_ LPDWORD pcchLangBuf); + +UINT +WINAPI +MsiGetFileVersionW( + _In_ LPCWSTR, + _Out_writes_opt_(*pcchVersionBuf) LPWSTR, + _Inout_opt_ LPDWORD pcchVersionBuf, + _Out_writes_opt_(*pcchLangBuf) LPWSTR, + _Inout_opt_ LPDWORD pcchLangBuf); + #define MsiGetFileVersion WINELIB_NAME_AW(MsiGetFileVersion) UINT WINAPI MsiMessageBoxA(HWND, LPCSTR, LPCSTR, UINT, WORD, DWORD); UINT WINAPI MsiMessageBoxW(HWND, LPCWSTR, LPCWSTR, UINT, WORD, DWORD); #define MsiMessageBox WINELIB_NAME_AW(MsiMessageBox) -UINT WINAPI MsiProvideQualifiedComponentExA(LPCSTR, LPCSTR, DWORD, LPCSTR, DWORD, DWORD, LPSTR, LPDWORD); -UINT WINAPI MsiProvideQualifiedComponentExW(LPCWSTR, LPCWSTR, DWORD, LPCWSTR, DWORD, DWORD, LPWSTR, LPDWORD); +UINT +WINAPI +MsiProvideQualifiedComponentExA( + _In_ LPCSTR, + _In_ LPCSTR, + _In_ DWORD, + _In_opt_ LPCSTR, + _Reserved_ DWORD, + _Reserved_ DWORD, + _Out_writes_opt_(*pcchPathBuf) LPSTR, + _Inout_opt_ LPDWORD pcchPathBuf); + +UINT +WINAPI +MsiProvideQualifiedComponentExW( + _In_ LPCWSTR, + _In_ LPCWSTR, + _In_ DWORD, + _In_opt_ LPCWSTR, + _Reserved_ DWORD, + _Reserved_ DWORD, + _Out_writes_opt_(*pcchPathBuf) LPWSTR, + _Inout_opt_ LPDWORD pcchPathBuf); + #define MsiProvideQualifiedComponentEx WINELIB_NAME_AW(MsiProvideQualifiedComponentEx) -UINT WINAPI MsiProvideQualifiedComponentA(LPCSTR, LPCSTR, DWORD, LPSTR, LPDWORD); -UINT WINAPI MsiProvideQualifiedComponentW(LPCWSTR, LPCWSTR, DWORD, LPWSTR, LPDWORD); +UINT +WINAPI +MsiProvideQualifiedComponentA( + _In_ LPCSTR, + _In_ LPCSTR, + _In_ DWORD, + _Out_writes_opt_(*pcchPathBuf) LPSTR, + _Inout_opt_ LPDWORD pcchPathBuf); + +UINT +WINAPI +MsiProvideQualifiedComponentW( + _In_ LPCWSTR, + _In_ LPCWSTR, + _In_ DWORD, + _Out_writes_opt_(*pcchPathBuf) LPWSTR, + _Inout_opt_ LPDWORD pcchPathBuf); + #define MsiProvideQualifiedComponent WINELIB_NAME_AW(MsiProvideQualifiedComponent) -USERINFOSTATE WINAPI MsiGetUserInfoA(LPCSTR, LPSTR, LPDWORD, LPSTR, LPDWORD, LPSTR, LPDWORD); -USERINFOSTATE WINAPI MsiGetUserInfoW(LPCWSTR, LPWSTR, LPDWORD, LPWSTR, LPDWORD, LPWSTR, LPDWORD); +USERINFOSTATE +WINAPI +MsiGetUserInfoA( + _In_ LPCSTR, + _Out_writes_opt_(*pcchUserNameBuf) LPSTR, + _Inout_opt_ LPDWORD pcchUserNameBuf, + _Out_writes_opt_(*pcchOrgNameBuf) LPSTR, + _Inout_opt_ LPDWORD pcchOrgNameBuf, + _Out_writes_opt_(*pcchSerialBuf) LPSTR, + _Inout_opt_ LPDWORD pcchSerialBuf); + +USERINFOSTATE +WINAPI +MsiGetUserInfoW( + _In_ LPCWSTR, + _Out_writes_opt_(*pcchUserNameBuf) LPWSTR, + _Inout_opt_ LPDWORD pcchUserNameBuf, + _Out_writes_opt_(*pcchOrgNameBuf) LPWSTR, + _Inout_opt_ LPDWORD pcchOrgNameBuf, + _Out_writes_opt_(*pcchSerialBuf) LPWSTR, + _Inout_opt_ LPDWORD pcchSerialBuf); + #define MsiGetUserInfo WINELIB_NAME_AW(MsiGetUserInfo) -UINT WINAPI MsiCollectUserInfoA(LPCSTR); -UINT WINAPI MsiCollectUserInfoW(LPCWSTR); +UINT WINAPI MsiCollectUserInfoA(_In_ LPCSTR); +UINT WINAPI MsiCollectUserInfoW(_In_ LPCWSTR); #define MsiCollectUserInfo WINELIB_NAME_AW(MsiCollectUserInfo) -UINT WINAPI MsiReinstallFeatureA(LPCSTR, LPCSTR, DWORD); -UINT WINAPI MsiReinstallFeatureW(LPCWSTR, LPCWSTR, DWORD); +UINT WINAPI MsiReinstallFeatureA(_In_ LPCSTR, _In_ LPCSTR, _In_ DWORD); +UINT WINAPI MsiReinstallFeatureW(_In_ LPCWSTR, _In_ LPCWSTR, _In_ DWORD); #define MsiReinstallFeature WINELIB_NAME_AW(MsiReinstallFeature) -UINT WINAPI MsiGetShortcutTargetA(LPCSTR, LPSTR, LPSTR, LPSTR); -UINT WINAPI MsiGetShortcutTargetW(LPCWSTR, LPWSTR, LPWSTR, LPWSTR); +UINT +WINAPI +MsiGetShortcutTargetA( + _In_ LPCSTR, + _Out_writes_opt_(MAX_GUID_CHARS + 1) LPSTR, + _Out_writes_opt_(MAX_FEATURE_CHARS + 1) LPSTR, + _Out_writes_opt_(MAX_GUID_CHARS + 1) LPSTR); + +UINT +WINAPI +MsiGetShortcutTargetW( + _In_ LPCWSTR, + _Out_writes_opt_(MAX_GUID_CHARS + 1) LPWSTR, + _Out_writes_opt_(MAX_FEATURE_CHARS + 1) LPWSTR, + _Out_writes_opt_(MAX_GUID_CHARS + 1) LPWSTR); + #define MsiGetShortcutTarget WINELIB_NAME_AW(MsiGetShortcutTarget) -INSTALLSTATE WINAPI MsiUseFeatureW(LPCWSTR, LPCWSTR); -INSTALLSTATE WINAPI MsiUseFeatureA(LPCSTR, LPCSTR); +INSTALLSTATE WINAPI MsiUseFeatureW(_In_ LPCWSTR, _In_ LPCWSTR); +INSTALLSTATE WINAPI MsiUseFeatureA(_In_ LPCSTR, _In_ LPCSTR); #define MsiUseFeature WINELIB_NAME_AW(MsiUseFeature) -INSTALLSTATE WINAPI MsiUseFeatureExW(LPCWSTR, LPCWSTR, DWORD, DWORD); -INSTALLSTATE WINAPI MsiUseFeatureExA(LPCSTR, LPCSTR, DWORD, DWORD); +INSTALLSTATE +WINAPI +MsiUseFeatureExW( + _In_ LPCWSTR, + _In_ LPCWSTR, + _In_ DWORD, + _Reserved_ DWORD); + +INSTALLSTATE +WINAPI +MsiUseFeatureExA( + _In_ LPCSTR, + _In_ LPCSTR, + _In_ DWORD, + _Reserved_ DWORD); + #define MsiUseFeatureEx WINELIB_NAME_AW(MsiUseFeatureEx) -HRESULT WINAPI MsiGetFileSignatureInformationA(LPCSTR, DWORD, PCCERT_CONTEXT*, LPBYTE, LPDWORD); -HRESULT WINAPI MsiGetFileSignatureInformationW(LPCWSTR, DWORD, PCCERT_CONTEXT*, LPBYTE, LPDWORD); +HRESULT +WINAPI +MsiGetFileSignatureInformationA( + _In_ LPCSTR, + _In_ DWORD, + _Outptr_ PCCERT_CONTEXT*, + _Out_writes_bytes_opt_(*pcbHashData) LPBYTE, + _Inout_opt_ LPDWORD pcbHashData); + +HRESULT +WINAPI +MsiGetFileSignatureInformationW( + _In_ LPCWSTR, + _In_ DWORD, + _Outptr_ PCCERT_CONTEXT*, + _Out_writes_bytes_opt_(*pcbHashData) LPBYTE, + _Inout_opt_ LPDWORD pcbHashData); + #define MsiGetFileSignatureInformation WINELIB_NAME_AW(MsiGetFileSignatureInformation) -INSTALLSTATE WINAPI MsiLocateComponentA(LPCSTR, LPSTR, LPDWORD); -INSTALLSTATE WINAPI MsiLocateComponentW(LPCWSTR, LPWSTR, LPDWORD); +INSTALLSTATE +WINAPI +MsiLocateComponentA( + _In_ LPCSTR, + _Out_writes_opt_(*pcchBuf) LPSTR, + _Inout_opt_ LPDWORD pcchBuf); + +INSTALLSTATE +WINAPI +MsiLocateComponentW( + _In_ LPCWSTR, + _Out_writes_opt_(*pcchBuf) LPWSTR, + _Inout_opt_ LPDWORD pcchBuf); + #define MsiLocateComponent WINELIB_NAME_AW(MsiLocateComponent) -UINT WINAPI MsiSourceListAddSourceA(LPCSTR, LPCSTR, DWORD, LPCSTR); -UINT WINAPI MsiSourceListAddSourceW(LPCWSTR, LPCWSTR, DWORD, LPCWSTR); +UINT +WINAPI +MsiSourceListAddSourceA( + _In_ LPCSTR, + _In_opt_ LPCSTR, + _Reserved_ DWORD, + _In_ LPCSTR); + +UINT +WINAPI +MsiSourceListAddSourceW( + _In_ LPCWSTR, + _In_opt_ LPCWSTR, + _Reserved_ DWORD, + _In_ LPCWSTR); + #define MsiSourceListAddSource WINELIB_NAME_AW(MsiSourceListAddSource) -UINT WINAPI MsiSourceListEnumMediaDisksA(LPCSTR, LPCSTR, MSIINSTALLCONTEXT, DWORD, DWORD, LPDWORD, - LPSTR, LPDWORD, LPSTR, LPDWORD); -UINT WINAPI MsiSourceListEnumMediaDisksW(LPCWSTR, LPCWSTR, MSIINSTALLCONTEXT, DWORD, DWORD, LPDWORD, - LPWSTR, LPDWORD, LPWSTR, LPDWORD); +UINT +WINAPI +MsiSourceListEnumMediaDisksA( + _In_ LPCSTR, + _In_opt_ LPCSTR, + _In_ MSIINSTALLCONTEXT, + _In_ DWORD, + _In_ DWORD, + _Out_opt_ LPDWORD, + _Out_writes_opt_(*pcchVolumeLabel) LPSTR, + _Inout_opt_ LPDWORD pcchVolumeLabel, + _Out_writes_opt_(*pcchDiskPrompt) LPSTR, + _Inout_opt_ LPDWORD pcchDiskPrompt); + +UINT +WINAPI +MsiSourceListEnumMediaDisksW( + _In_ LPCWSTR, + _In_opt_ LPCWSTR, + _In_ MSIINSTALLCONTEXT, + _In_ DWORD, + _In_ DWORD, + _Out_opt_ LPDWORD, + _Out_writes_opt_(*pcchVolumeLabel) LPWSTR, + _Inout_opt_ LPDWORD pcchVolumeLabel, + _Out_writes_opt_(*pcchDiskPrompt) LPWSTR, + _Inout_opt_ LPDWORD pcchDiskPrompt); + #define MsiSourceListEnumMediaDisks WINELIB_NAME_AW(MsiSourceListEnumMediaDisks) -UINT WINAPI MsiSourceListEnumSourcesA(LPCSTR, LPCSTR, MSIINSTALLCONTEXT, DWORD, DWORD, LPSTR, LPDWORD); -UINT WINAPI MsiSourceListEnumSourcesW(LPCWSTR, LPCWSTR, MSIINSTALLCONTEXT, DWORD, DWORD, LPWSTR, LPDWORD); +UINT +WINAPI +MsiSourceListEnumSourcesA( + _In_ LPCSTR, + _In_opt_ LPCSTR, + _In_ MSIINSTALLCONTEXT, + _In_ DWORD, + _In_ DWORD, + _Out_writes_opt_(*pcchSource) LPSTR, + _Inout_opt_ LPDWORD pcchSource); + +UINT +WINAPI +MsiSourceListEnumSourcesW( + _In_ LPCWSTR, + _In_opt_ LPCWSTR, + _In_ MSIINSTALLCONTEXT, + _In_ DWORD, + _In_ DWORD, + _Out_writes_opt_(*pcchSource) LPWSTR, + _Inout_opt_ LPDWORD pcchSource); + #define MsiSourceListEnumSources WINELIB_NAME_AW(MsiSourceListEnumSources) -UINT WINAPI MsiSourceListClearSourceA(LPCSTR, LPCSTR, MSIINSTALLCONTEXT, DWORD, LPCSTR); -UINT WINAPI MsiSourceListClearSourceW(LPCWSTR, LPCWSTR, MSIINSTALLCONTEXT, DWORD, LPCWSTR); +UINT +WINAPI +MsiSourceListClearSourceA( + _In_ LPCSTR, + _In_opt_ LPCSTR, + _In_ MSIINSTALLCONTEXT, + _In_ DWORD, + _In_ LPCSTR); + +UINT +WINAPI +MsiSourceListClearSourceW( + _In_ LPCWSTR, + _In_opt_ LPCWSTR, + _In_ MSIINSTALLCONTEXT, + _In_ DWORD, + _In_ LPCWSTR); + #define MsiSourceListClearSource WINELIB_NAME_AW(MsiSourceListClearSource) -UINT WINAPI MsiSourceListClearAllA(LPCSTR, LPCSTR, DWORD); -UINT WINAPI MsiSourceListClearAllW(LPCWSTR, LPCWSTR, DWORD); +UINT +WINAPI +MsiSourceListClearAllA( + _In_ LPCSTR, + _In_opt_ LPCSTR, + _Reserved_ DWORD); + +UINT +WINAPI +MsiSourceListClearAllW( + _In_ LPCWSTR, + _In_opt_ LPCWSTR, + _Reserved_ DWORD); + #define MsiSourceListClearAll WINELIB_NAME_AW(MsiSourceListClearAll) -UINT WINAPI MsiSourceListGetInfoA(LPCSTR, LPCSTR, MSIINSTALLCONTEXT, DWORD, LPCSTR, LPSTR, LPDWORD); -UINT WINAPI MsiSourceListGetInfoW(LPCWSTR, LPCWSTR, MSIINSTALLCONTEXT, DWORD, LPCWSTR, LPWSTR, LPDWORD); +UINT +WINAPI +MsiSourceListGetInfoA( + _In_ LPCSTR, + _In_opt_ LPCSTR, + _In_ MSIINSTALLCONTEXT, + _In_ DWORD, + _In_ LPCSTR, + _Out_writes_opt_(*pcchValue) LPSTR, + _Inout_opt_ LPDWORD pcchValue); + +UINT +WINAPI +MsiSourceListGetInfoW( + _In_ LPCWSTR, + _In_opt_ LPCWSTR, + _In_ MSIINSTALLCONTEXT, + _In_ DWORD, + _In_ LPCWSTR, + _Out_writes_opt_(*pcchValue) LPWSTR, + _Inout_opt_ LPDWORD pcchValue); + #define MsiSourceListGetInfo WINELIB_NAME_AW(MsiSourceListGetInfo) -UINT WINAPI MsiSourceListSetInfoA(LPCSTR, LPCSTR, MSIINSTALLCONTEXT, DWORD, LPCSTR, LPCSTR); -UINT WINAPI MsiSourceListSetInfoW(LPCWSTR, LPCWSTR, MSIINSTALLCONTEXT, DWORD, LPCWSTR, LPCWSTR); +UINT +WINAPI +MsiSourceListSetInfoA( + _In_ LPCSTR, + _In_opt_ LPCSTR, + _In_ MSIINSTALLCONTEXT, + _In_ DWORD, + _In_ LPCSTR, + _In_ LPCSTR); + +UINT +WINAPI +MsiSourceListSetInfoW( + _In_ LPCWSTR, + _In_opt_ LPCWSTR, + _In_ MSIINSTALLCONTEXT, + _In_ DWORD, + _In_ LPCWSTR, + _In_ LPCWSTR); + #define MsiSourceListSetInfo WINELIB_NAME_AW(MsiSourceListSetInfo) -UINT WINAPI MsiSourceListAddSourceExA(LPCSTR, LPCSTR, MSIINSTALLCONTEXT, DWORD, LPCSTR, DWORD); -UINT WINAPI MsiSourceListAddSourceExW(LPCWSTR, LPCWSTR, MSIINSTALLCONTEXT, DWORD, LPCWSTR, DWORD); +UINT +WINAPI +MsiSourceListAddSourceExA( + _In_ LPCSTR, + _In_opt_ LPCSTR, + _In_ MSIINSTALLCONTEXT, + _In_ DWORD, + _In_ LPCSTR, + _In_ DWORD); + +UINT +WINAPI +MsiSourceListAddSourceExW( + _In_ LPCWSTR, + _In_opt_ LPCWSTR, + _In_ MSIINSTALLCONTEXT, + _In_ DWORD, + _In_ LPCWSTR, + _In_ DWORD); + #define MsiSourceListAddSourceEx WINELIB_NAME_AW(MsiSourceListAddSourceEx) -UINT WINAPI MsiSourceListAddMediaDiskA(LPCSTR, LPCSTR, MSIINSTALLCONTEXT, DWORD, DWORD, LPCSTR, LPCSTR); -UINT WINAPI MsiSourceListAddMediaDiskW(LPCWSTR, LPCWSTR, MSIINSTALLCONTEXT, DWORD, DWORD, LPCWSTR, LPCWSTR); +UINT +WINAPI +MsiSourceListAddMediaDiskA( + _In_ LPCSTR, + _In_opt_ LPCSTR, + _In_ MSIINSTALLCONTEXT, + _In_ DWORD, + _In_ DWORD, + _In_opt_ LPCSTR, + _In_opt_ LPCSTR); + +UINT +WINAPI +MsiSourceListAddMediaDiskW( + _In_ LPCWSTR, + _In_opt_ LPCWSTR, + _In_ MSIINSTALLCONTEXT, + _In_ DWORD, + _In_ DWORD, + _In_opt_ LPCWSTR, + _In_opt_ LPCWSTR); + #define MsiSourceListAddMediaDisk WINELIB_NAME_AW(MsiSourceListAddMediaDisk) -UINT WINAPI MsiEnumPatchesA(LPCSTR, DWORD, LPSTR, LPSTR, LPDWORD); -UINT WINAPI MsiEnumPatchesW(LPCWSTR, DWORD, LPWSTR, LPWSTR, LPDWORD); +UINT +WINAPI +MsiEnumPatchesA( + _In_ LPCSTR, + _In_ DWORD, + _Out_writes_(MAX_GUID_CHARS + 1) LPSTR, + _Out_writes_(*pcchTransformsBuf) LPSTR, + _Inout_ LPDWORD pcchTransformsBuf); + +UINT +WINAPI +MsiEnumPatchesW( + _In_ LPCWSTR, + _In_ DWORD, + _Out_writes_(MAX_GUID_CHARS + 1) LPWSTR, + _Out_writes_(*pcchTransformsBuf) LPWSTR, + _Inout_ LPDWORD pcchTransformsBuf); + #define MsiEnumPatches WINELIB_NAME_AW(MsiEnumPatches) -UINT WINAPI MsiEnumPatchesExA(LPCSTR, LPCSTR, DWORD, DWORD, DWORD, LPSTR, LPSTR, - MSIINSTALLCONTEXT*, LPSTR, LPDWORD); -UINT WINAPI MsiEnumPatchesExW(LPCWSTR, LPCWSTR, DWORD, DWORD, DWORD, LPWSTR, LPWSTR, - MSIINSTALLCONTEXT*, LPWSTR, LPDWORD); +UINT +WINAPI +MsiEnumPatchesExA( + _In_opt_ LPCSTR, + _In_opt_ LPCSTR, + _In_ DWORD, + _In_ DWORD, + _In_ DWORD, + _Out_writes_opt_(MAX_GUID_CHARS + 1) LPSTR, + _Out_writes_opt_(MAX_GUID_CHARS + 1) LPSTR, + _Out_opt_ MSIINSTALLCONTEXT*, + _Out_writes_opt_(*pcchTargetUserSid) LPSTR, + _Inout_opt_ LPDWORD pcchTargetUserSid); + +UINT +WINAPI +MsiEnumPatchesExW( + _In_opt_ LPCWSTR, + _In_opt_ LPCWSTR, + _In_ DWORD, + _In_ DWORD, + _In_ DWORD, + _Out_writes_opt_(MAX_GUID_CHARS + 1) LPWSTR, + _Out_writes_opt_(MAX_GUID_CHARS + 1) LPWSTR, + _Out_opt_ MSIINSTALLCONTEXT*, + _Out_writes_opt_(*pcchTargetUserSid) LPWSTR, + _Inout_opt_ LPDWORD pcchTargetUserSid); + #define MsiEnumPatchesEx WINELIB_NAME_AW(MsiEnumPatchesEx) -UINT WINAPI MsiGetFileHashA(LPCSTR, DWORD, PMSIFILEHASHINFO); -UINT WINAPI MsiGetFileHashW(LPCWSTR, DWORD, PMSIFILEHASHINFO); +UINT +WINAPI +MsiGetFileHashA( + _In_ LPCSTR, + _In_ DWORD, + _Inout_ PMSIFILEHASHINFO); + +UINT +WINAPI +MsiGetFileHashW( + _In_ LPCWSTR, + _In_ DWORD, + _Inout_ PMSIFILEHASHINFO); + #define MsiGetFileHash WINELIB_NAME_AW(MsiGetFileHash) -UINT WINAPI MsiAdvertiseScriptA(LPCSTR, DWORD, PHKEY, BOOL); -UINT WINAPI MsiAdvertiseScriptW(LPCWSTR, DWORD, PHKEY, BOOL); +UINT +WINAPI +MsiAdvertiseScriptA( + _In_ LPCSTR, + _In_ DWORD, + _In_opt_ PHKEY, + _In_ BOOL); + +UINT +WINAPI +MsiAdvertiseScriptW( + _In_ LPCWSTR, + _In_ DWORD, + _In_opt_ PHKEY, + _In_ BOOL); + #define MsiAdvertiseScript WINELIB_NAME_AW(MsiAdvertiseScript) -UINT WINAPI MsiIsProductElevatedA(LPCSTR, BOOL *); -UINT WINAPI MsiIsProductElevatedW(LPCWSTR, BOOL *); +UINT WINAPI MsiIsProductElevatedA(_In_ LPCSTR, _Out_ BOOL *); +UINT WINAPI MsiIsProductElevatedW(_In_ LPCWSTR, _Out_ BOOL *); #define MsiIsProductElevated WINELIB_NAME_AW(MsiIsProductElevated) UINT WINAPI MsiDatabaseMergeA(MSIHANDLE, MSIHANDLE, LPCSTR); UINT WINAPI MsiDatabaseMergeW(MSIHANDLE, MSIHANDLE, LPCWSTR); #define MsiDatabaseMerge WINELIB_NAME_AW(MsiDatabaseMerge) -UINT WINAPI MsiInstallMissingComponentA(LPCSTR, LPCSTR, INSTALLSTATE); -UINT WINAPI MsiInstallMissingComponentW(LPCWSTR, LPCWSTR, INSTALLSTATE); +UINT +WINAPI +MsiInstallMissingComponentA( + _In_ LPCSTR, + _In_ LPCSTR, + _In_ INSTALLSTATE); + +UINT +WINAPI +MsiInstallMissingComponentW( + _In_ LPCWSTR, + _In_ LPCWSTR, + _In_ INSTALLSTATE); + #define MsiInstallMissingComponent WINELIB_NAME_AW(MsiInstallMissingComponent) -UINT WINAPI MsiDetermineApplicablePatchesA(LPCSTR, DWORD, PMSIPATCHSEQUENCEINFOA); -UINT WINAPI MsiDetermineApplicablePatchesW(LPCWSTR, DWORD, PMSIPATCHSEQUENCEINFOW); +UINT +WINAPI +MsiDetermineApplicablePatchesA( + _In_ LPCSTR, + _In_ DWORD cPatchInfo, + _Inout_updates_(cPatchInfo) PMSIPATCHSEQUENCEINFOA); + +UINT +WINAPI +MsiDetermineApplicablePatchesW( + _In_ LPCWSTR, + _In_ DWORD cPatchInfo, + _Inout_updates_(cPatchInfo) PMSIPATCHSEQUENCEINFOW); + #define MsiDetermineApplicablePatches WINELIB_NAME_AW(MsiDetermineApplicablePatches) -UINT WINAPI MsiDeterminePatchSequenceA(LPCSTR, LPCSTR, MSIINSTALLCONTEXT, DWORD, PMSIPATCHSEQUENCEINFOA); -UINT WINAPI MsiDeterminePatchSequenceW(LPCWSTR, LPCWSTR, MSIINSTALLCONTEXT, DWORD, PMSIPATCHSEQUENCEINFOW); +UINT +WINAPI +MsiDeterminePatchSequenceA( + _In_ LPCSTR, + _In_opt_ LPCSTR, + _In_ MSIINSTALLCONTEXT, + _In_ DWORD cPatchInfo, + _Inout_updates_(cPatchInfo) PMSIPATCHSEQUENCEINFOA); + +UINT +WINAPI +MsiDeterminePatchSequenceW( + _In_ LPCWSTR, + _In_opt_ LPCWSTR, + _In_ MSIINSTALLCONTEXT, + _In_ DWORD cPatchInfo, + _Inout_updates_(cPatchInfo) PMSIPATCHSEQUENCEINFOW); + #define MsiDeterminePatchSequence WINELIB_NAME_AW(MsiDeterminePatchSequence) -UINT WINAPI MsiApplyMultiplePatchesA(LPCSTR, LPCSTR, LPCSTR); -UINT WINAPI MsiApplyMultiplePatchesW(LPCWSTR, LPCWSTR, LPCWSTR); +UINT +WINAPI +MsiApplyMultiplePatchesA( + _In_ LPCSTR, + _In_opt_ LPCSTR, + _In_opt_ LPCSTR); + +UINT +WINAPI +MsiApplyMultiplePatchesW( + _In_ LPCWSTR, + _In_opt_ LPCWSTR, + _In_opt_ LPCWSTR); + #define MsiApplyMultiplePatches WINELIB_NAME_AW(MsiApplyMultiplePatches) -UINT WINAPI MsiBeginTransactionA(LPCSTR, DWORD, MSIHANDLE *, HANDLE *); -UINT WINAPI MsiBeginTransactionW(LPCWSTR, DWORD, MSIHANDLE *, HANDLE *); +UINT +WINAPI +MsiBeginTransactionA( + _In_ LPCSTR, + _In_ DWORD, + _Out_ MSIHANDLE *, + _Out_ HANDLE *); + +UINT +WINAPI +MsiBeginTransactionW( + _In_ LPCWSTR, + _In_ DWORD, + _Out_ MSIHANDLE *, + _Out_ HANDLE *); + #define MsiBeginTransaction WINELIB_NAME_AW(MsiBeginTransaction) -UINT WINAPI MsiEndTransaction(DWORD); +UINT WINAPI MsiEndTransaction(_In_ DWORD); /* Non Unicode */ UINT WINAPI MsiCloseHandle(MSIHANDLE); UINT WINAPI MsiCloseAllHandles(void); -INSTALLUILEVEL WINAPI MsiSetInternalUI(INSTALLUILEVEL, HWND*); -UINT WINAPI MsiSetExternalUIRecord(INSTALLUI_HANDLER_RECORD, DWORD, LPVOID, PINSTALLUI_HANDLER_RECORD); +INSTALLUILEVEL WINAPI MsiSetInternalUI(_In_ INSTALLUILEVEL, _Inout_opt_ HWND*); + +UINT +WINAPI +MsiSetExternalUIRecord( + _In_opt_ INSTALLUI_HANDLER_RECORD, + _In_ DWORD, + _In_opt_ LPVOID, + _Out_opt_ PINSTALLUI_HANDLER_RECORD); #ifdef __cplusplus }

1 0

[ekohl] 59770: [SAMLIB] SamSetInformationUser.UserAllInformation: Pass hashed passwords to SamrSetInformationUser. [SAMSRV] SampSetUserAll: - Get fixed user data at the start of the function and se...
by ekohl＠svn.reactos.org 18 Aug '13

18 Aug '13

Author: ekohl Date: Sun Aug 18 13:26:33 2013 New Revision: 59770 URL: http://svn.reactos.org/svn/reactos?rev=59770&view=rev Log: [SAMLIB] SamSetInformationUser.UserAllInformation: Pass hashed passwords to SamrSetInformationUser. [SAMSRV] SampSetUserAll: - Get fixed user data at the start of the function and set it only if it has been modified. - Set user password hashes. Modified: trunk/reactos/dll/win32/samlib/samlib.c trunk/reactos/dll/win32/samsrv/samrpc.c Modified: trunk/reactos/dll/win32/samlib/samlib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samlib/samlib.c?… ============================================================================== --- trunk/reactos/dll/win32/samlib/samlib.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samlib/samlib.c [iso-8859-1] Sun Aug 18 13:26:33 2013 @@ -1847,7 +1847,7 @@ { PSAMPR_USER_SET_PASSWORD_INFORMATION PasswordBuffer; SAMPR_USER_INTERNAL1_INFORMATION Internal1Buffer; - PUSER_ALL_INFORMATION AllBuffer; + USER_ALL_INFORMATION InternalAllBuffer; OEM_STRING LmPwdString; CHAR LmPwdBuffer[15]; NTSTATUS Status; @@ -1914,23 +1914,118 @@ if (!NT_SUCCESS(Status)) { TRACE("SamrSetInformation() failed (Status 0x%08lx)\n", Status); - return Status; - } + } + + return Status; } else if (UserInformationClass == UserAllInformation) { - AllBuffer = (PUSER_ALL_INFORMATION)Buffer; - - if (AllBuffer->WhichFields & (USER_ALL_LMPASSWORDPRESENT | USER_ALL_NTPASSWORDPRESENT)) - { - Status = SampCheckPassword(UserHandle, - &AllBuffer->NtPassword); - if (!NT_SUCCESS(Status)) + RtlCopyMemory(&InternalAllBuffer, + Buffer, + sizeof(USER_ALL_INFORMATION)); + + if (InternalAllBuffer.WhichFields & (USER_ALL_LMPASSWORDPRESENT | USER_ALL_NTPASSWORDPRESENT)) + { + if (InternalAllBuffer.WhichFields & USER_ALL_OWFPASSWORD) { - TRACE("SampCheckPassword failed (Status 0x%08lx)\n", Status); - return Status; + /* Check NT password hash */ + if (InternalAllBuffer.WhichFields & USER_ALL_NTPASSWORDPRESENT) + { + if (InternalAllBuffer.NtPassword.Length != sizeof(ENCRYPTED_NT_OWF_PASSWORD)) + return STATUS_INVALID_PARAMETER; + } + + /* Check LM password hash */ + if (InternalAllBuffer.WhichFields & USER_ALL_LMPASSWORDPRESENT) + { + if (InternalAllBuffer.LmPassword.Length != sizeof(ENCRYPTED_LM_OWF_PASSWORD)) + return STATUS_INVALID_PARAMETER; + } } - } + else + { + /* + * Only allow the NT password to be set. + * The LM password will be created here. + */ + if (InternalAllBuffer.WhichFields & USER_ALL_LMPASSWORDPRESENT) + { + TRACE("Do not try to set a clear text LM password!\n"); + return STATUS_INVALID_PARAMETER; + } + + if (InternalAllBuffer.WhichFields & USER_ALL_NTPASSWORDPRESENT) + { + Status = SampCheckPassword(UserHandle, + &InternalAllBuffer.NtPassword); + if (!NT_SUCCESS(Status)) + { + TRACE("SampCheckPassword failed (Status 0x%08lx)\n", Status); + return Status; + } + + /* Calculate the NT password hash */ + Status = SystemFunction007((PUNICODE_STRING)&InternalAllBuffer.NtPassword, + (LPBYTE)&Internal1Buffer.EncryptedNtOwfPassword); + if (!NT_SUCCESS(Status)) + { + TRACE("SystemFunction007 failed (Status 0x%08lx)\n", Status); + return Status; + } + + InternalAllBuffer.NtPasswordPresent = TRUE; + InternalAllBuffer.LmPasswordPresent = FALSE; + + InternalAllBuffer.NtPassword.Length = sizeof(ENCRYPTED_NT_OWF_PASSWORD); + InternalAllBuffer.NtPassword.MaximumLength = sizeof(ENCRYPTED_NT_OWF_PASSWORD); + InternalAllBuffer.NtPassword.Buffer = (LPWSTR)&Internal1Buffer.EncryptedNtOwfPassword; + + /* Build the LM password */ + LmPwdString.Length = 15; + LmPwdString.MaximumLength = 15; + LmPwdString.Buffer = LmPwdBuffer; + ZeroMemory(LmPwdString.Buffer, LmPwdString.MaximumLength); + + Status = RtlUpcaseUnicodeStringToOemString(&LmPwdString, + (PUNICODE_STRING)&InternalAllBuffer.NtPassword, + FALSE); + if (NT_SUCCESS(Status)) + { + /* Calculate the LM password hash */ + Status = SystemFunction006(LmPwdString.Buffer, + (LPSTR)&Internal1Buffer.EncryptedLmOwfPassword); + if (NT_SUCCESS(Status)) + { + InternalAllBuffer.WhichFields |= USER_ALL_LMPASSWORDPRESENT; + InternalAllBuffer.LmPasswordPresent = TRUE; + + InternalAllBuffer.LmPassword.Length = sizeof(ENCRYPTED_LM_OWF_PASSWORD); + InternalAllBuffer.LmPassword.MaximumLength = sizeof(ENCRYPTED_LM_OWF_PASSWORD); + InternalAllBuffer.LmPassword.Buffer = (LPWSTR)&Internal1Buffer.EncryptedLmOwfPassword; + } + } + } + } + } + + RpcTryExcept + { + Status = SamrSetInformationUser((SAMPR_HANDLE)UserHandle, + UserAllInformation, + (PVOID)&InternalAllBuffer); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + if (!NT_SUCCESS(Status)) + { + TRACE("SamrSetInformation() failed (Status 0x%08lx)\n", Status); + } + + return Status; } RpcTryExcept 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 13:26:33 2013 @@ -7115,9 +7115,24 @@ SAM_USER_FIXED_DATA FixedData; ULONG Length = 0; ULONG WhichFields; + PENCRYPTED_NT_OWF_PASSWORD NtPassword = NULL; + PENCRYPTED_LM_OWF_PASSWORD LmPassword = NULL; + BOOLEAN NtPasswordPresent = FALSE; + BOOLEAN LmPasswordPresent = FALSE; + BOOLEAN WriteFixedData = FALSE; NTSTATUS Status = STATUS_SUCCESS; WhichFields = Buffer->All.WhichFields; + + /* Get the fixed size attributes */ + Length = sizeof(SAM_USER_FIXED_DATA); + Status = SampGetObjectAttribute(UserObject, + L"F", + NULL, + (PVOID)&FixedData, + &Length); + if (!NT_SUCCESS(Status)) + goto done; if (WhichFields & USER_ALL_USERNAME) { @@ -7234,39 +7249,72 @@ goto done; } - if (WhichFields & (USER_ALL_PRIMARYGROUPID | - USER_ALL_ACCOUNTEXPIRES | - USER_ALL_USERACCOUNTCONTROL | - USER_ALL_COUNTRYCODE | - USER_ALL_CODEPAGE)) - { - Length = sizeof(SAM_USER_FIXED_DATA); - Status = SampGetObjectAttribute(UserObject, - L"F", - NULL, - (PVOID)&FixedData, - &Length); + if (WhichFields & USER_ALL_PRIMARYGROUPID) + { + FixedData.PrimaryGroupId = Buffer->All.PrimaryGroupId; + WriteFixedData = TRUE; + } + + if (WhichFields & USER_ALL_ACCOUNTEXPIRES) + { + FixedData.AccountExpires.LowPart = Buffer->All.AccountExpires.LowPart; + FixedData.AccountExpires.HighPart = Buffer->All.AccountExpires.HighPart; + WriteFixedData = TRUE; + } + + if (WhichFields & USER_ALL_USERACCOUNTCONTROL) + { + FixedData.UserAccountControl = Buffer->All.UserAccountControl; + WriteFixedData = TRUE; + } + + if (WhichFields & USER_ALL_COUNTRYCODE) + { + FixedData.CountryCode = Buffer->All.CountryCode; + WriteFixedData = TRUE; + } + + if (WhichFields & USER_ALL_CODEPAGE) + { + FixedData.CodePage = Buffer->All.CodePage; + WriteFixedData = TRUE; + } + + if (WhichFields & (USER_ALL_NTPASSWORDPRESENT | + USER_ALL_LMPASSWORDPRESENT)) + { + if (WhichFields & USER_ALL_NTPASSWORDPRESENT) + { + NtPassword = (PENCRYPTED_NT_OWF_PASSWORD)Buffer->All.NtOwfPassword.Buffer; + NtPasswordPresent = Buffer->All.NtPasswordPresent; + } + + if (WhichFields & USER_ALL_LMPASSWORDPRESENT) + { + LmPassword = (PENCRYPTED_LM_OWF_PASSWORD)Buffer->All.LmOwfPassword.Buffer; + LmPasswordPresent = Buffer->All.LmPasswordPresent; + } + + Status = SampSetUserPassword(UserObject, + NtPassword, + NtPasswordPresent, + LmPassword, + LmPasswordPresent); if (!NT_SUCCESS(Status)) goto done; - if (WhichFields & USER_ALL_PRIMARYGROUPID) - FixedData.PrimaryGroupId = Buffer->All.PrimaryGroupId; - - if (WhichFields & USER_ALL_ACCOUNTEXPIRES) - { - FixedData.AccountExpires.LowPart = Buffer->All.AccountExpires.LowPart; - FixedData.AccountExpires.HighPart = Buffer->All.AccountExpires.HighPart; - } - - if (WhichFields & USER_ALL_USERACCOUNTCONTROL) - FixedData.UserAccountControl = Buffer->All.UserAccountControl; - - if (WhichFields & USER_ALL_COUNTRYCODE) - FixedData.CountryCode = Buffer->Preferences.CountryCode; - - if (WhichFields & USER_ALL_CODEPAGE) - FixedData.CodePage = Buffer->Preferences.CodePage; - + /* The password has just been set */ + Status = NtQuerySystemTime(&FixedData.PasswordLastSet); + if (!NT_SUCCESS(Status)) + goto done; + + WriteFixedData = TRUE; + } + + /* FIXME: USER_ALL_PASSWORDEXPIRED */ + + if (WriteFixedData == TRUE) + { Status = SampSetObjectAttribute(UserObject, L"F", REG_BINARY, @@ -7276,15 +7324,7 @@ goto done; } -/* -FIXME: - USER_ALL_NTPASSWORDPRESENT - USER_ALL_LMPASSWORDPRESENT - USER_ALL_PASSWORDEXPIRED -*/ - done: - return Status; }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs