Ros-diffs

ros-diffs@reactos.org

81390 discussions

[pschweitzer] 68811: [NTFS] Support full data stream name on open (i.e., stream name finished with :$DATA)
by pschweitzer＠svn.reactos.org 24 Aug '15

24 Aug '15

Author: pschweitzer Date: Mon Aug 24 09:52:30 2015 New Revision: 68811 URL: http://svn.reactos.org/svn/reactos?rev=68811&view=rev Log: [NTFS] Support full data stream name on open (i.e., stream name finished with :$DATA) Modified: trunk/reactos/drivers/filesystems/ntfs/fcb.c Modified: trunk/reactos/drivers/filesystems/ntfs/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/fcb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/fcb.c [iso-8859-1] Mon Aug 24 09:52:30 2015 @@ -545,7 +545,7 @@ UNICODE_STRING File; PFILE_RECORD_HEADER FileRecord; ULONGLONG MFTIndex; - PWSTR Colon; + PWSTR Colon, OldColon; PNTFS_ATTR_CONTEXT DataContext; USHORT Length = 0; @@ -560,6 +560,23 @@ { Length = File.Length; File.Length = (Colon - FileToFind) * sizeof(WCHAR); + + if (_wcsicmp(Colon + 1, L"$DATA") == 0) + { + OldColon = Colon; + Colon[0] = UNICODE_NULL; + Colon = wcsrchr(FileToFind, L':'); + if (Colon != NULL) + { + Length = File.Length; + File.Length = (Colon - FileToFind) * sizeof(WCHAR); + } + else + { + Colon = OldColon; + Colon[0] = L':'; + } + } /* Skip colon */ ++Colon;

1 0

[pschweitzer] 68810: [NTFS] Fix returned status code, spotted by Thomas
by pschweitzer＠svn.reactos.org 24 Aug '15

24 Aug '15

Author: pschweitzer Date: Mon Aug 24 08:45:28 2015 New Revision: 68810 URL: http://svn.reactos.org/svn/reactos?rev=68810&view=rev Log: [NTFS] Fix returned status code, spotted by Thomas Modified: trunk/reactos/drivers/filesystems/ntfs/finfo.c Modified: trunk/reactos/drivers/filesystems/ntfs/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/finfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/finfo.c [iso-8859-1] Mon Aug 24 08:45:28 2015 @@ -48,7 +48,7 @@ DPRINT1("NtfsGetStandardInformation(%p, %p, %p, %p)\n", Fcb, DeviceObject, StandardInfo, BufferLength); if (*BufferLength < sizeof(FILE_STANDARD_INFORMATION)) - return STATUS_BUFFER_OVERFLOW; + return STATUS_BUFFER_TOO_SMALL; /* PRECONDITION */ ASSERT(StandardInfo != NULL); @@ -78,7 +78,7 @@ DPRINT1("NtfsGetPositionInformation(%p, %p, %p)\n", FileObject, PositionInfo, BufferLength); if (*BufferLength < sizeof(FILE_POSITION_INFORMATION)) - return STATUS_BUFFER_OVERFLOW; + return STATUS_BUFFER_TOO_SMALL; PositionInfo->CurrentByteOffset.QuadPart = FileObject->CurrentByteOffset.QuadPart; @@ -104,7 +104,7 @@ DPRINT1("NtfsGetBasicInformation(%p, %p, %p, %p, %p)\n", FileObject, Fcb, DeviceObject, BasicInfo, BufferLength); if (*BufferLength < sizeof(FILE_BASIC_INFORMATION)) - return STATUS_BUFFER_OVERFLOW; + return STATUS_BUFFER_TOO_SMALL; BasicInfo->CreationTime.QuadPart = FileName->CreationTime; BasicInfo->LastAccessTime.QuadPart = FileName->LastAccessTime; @@ -142,7 +142,7 @@ /* If buffer can't hold at least the file name length, bail out */ if (*BufferLength < (ULONG)FIELD_OFFSET(FILE_NAME_INFORMATION, FileName[0])) - return STATUS_BUFFER_OVERFLOW; + return STATUS_BUFFER_TOO_SMALL; /* Save file name length, and as much file len, as buffer length allows */ NameInfo->FileNameLength = wcslen(Fcb->PathName) * sizeof(WCHAR); @@ -181,7 +181,7 @@ ASSERT(Fcb); if (*BufferLength < sizeof(FILE_INTERNAL_INFORMATION)) - return STATUS_BUFFER_OVERFLOW; + return STATUS_BUFFER_TOO_SMALL; InternalInfo->IndexNumber.QuadPart = Fcb->MFTIndex; @@ -202,7 +202,7 @@ DPRINT1("NtfsGetNetworkOpenInformation(%p, %p, %p, %p)\n", Fcb, DeviceExt, NetworkInfo, BufferLength); if (*BufferLength < sizeof(FILE_NETWORK_OPEN_INFORMATION)) - return(STATUS_BUFFER_OVERFLOW); + return STATUS_BUFFER_TOO_SMALL; NetworkInfo->CreationTime.QuadPart = FileName->CreationTime; NetworkInfo->LastAccessTime.QuadPart = FileName->LastAccessTime; @@ -232,7 +232,7 @@ PFILE_STREAM_INFORMATION CurrentInfo = StreamInfo, Previous = NULL; if (*BufferLength < sizeof(FILE_STREAM_INFORMATION)) - return STATUS_BUFFER_OVERFLOW; + return STATUS_BUFFER_TOO_SMALL; FileRecord = ExAllocatePoolWithTag(NonPagedPool, DeviceExt->NtfsInfo.BytesPerFileRecord, TAG_NTFS); if (FileRecord == NULL)

1 0

[pschweitzer] 68809: [NTFS] Return properly formatted stream names, according to: https://msdn.microsoft.com/en-us/library/cc232090.aspx
by pschweitzer＠svn.reactos.org 24 Aug '15

24 Aug '15

Author: pschweitzer Date: Mon Aug 24 08:43:26 2015 New Revision: 68809 URL: http://svn.reactos.org/svn/reactos?rev=68809&view=rev Log: [NTFS] Return properly formatted stream names, according to: https://msdn.microsoft.com/en-us/library/cc232090.aspx Modified: trunk/reactos/drivers/filesystems/ntfs/finfo.c Modified: trunk/reactos/drivers/filesystems/ntfs/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/finfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/finfo.c [iso-8859-1] Mon Aug 24 08:43:26 2015 @@ -256,7 +256,7 @@ { if (Attribute->Type == AttributeData) { - CurrentSize = FIELD_OFFSET(FILE_STREAM_INFORMATION, StreamName) + Attribute->NameLength * sizeof(WCHAR); + CurrentSize = FIELD_OFFSET(FILE_STREAM_INFORMATION, StreamName) + Attribute->NameLength * sizeof(WCHAR) + wcslen(L"::$DATA") * sizeof(WCHAR); if (CurrentSize > *BufferLength) { @@ -268,7 +268,9 @@ CurrentInfo->StreamNameLength = Attribute->NameLength * sizeof(WCHAR); CurrentInfo->StreamSize.QuadPart = AttributeDataLength(Attribute); CurrentInfo->StreamAllocationSize.QuadPart = AttributeAllocatedLength(Attribute); - RtlMoveMemory(CurrentInfo->StreamName, (PWCHAR)((ULONG_PTR)Attribute + Attribute->NameOffset), CurrentInfo->StreamNameLength); + CurrentInfo->StreamName[0] = L':'; + RtlMoveMemory(&CurrentInfo->StreamName[1], (PWCHAR)((ULONG_PTR)Attribute + Attribute->NameOffset), CurrentInfo->StreamNameLength); + RtlMoveMemory(&CurrentInfo->StreamName[Attribute->NameLength + 1], L":$DATA", sizeof(L":$DATA") - sizeof(UNICODE_NULL)); if (Previous != NULL) {

1 0

[pschweitzer] 68808: [NTFS] Implement FileStreamInformation class for IRP_MJ_QUERY_INFORMATION. It allows enumerating streams for a given file
by pschweitzer＠svn.reactos.org 24 Aug '15

24 Aug '15

Author: pschweitzer Date: Mon Aug 24 08:36:58 2015 New Revision: 68808 URL: http://svn.reactos.org/svn/reactos?rev=68808&view=rev Log: [NTFS] Implement FileStreamInformation class for IRP_MJ_QUERY_INFORMATION. It allows enumerating streams for a given file Modified: trunk/reactos/drivers/filesystems/ntfs/finfo.c Modified: trunk/reactos/drivers/filesystems/ntfs/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/finfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/finfo.c [iso-8859-1] Mon Aug 24 08:36:58 2015 @@ -218,6 +218,74 @@ return STATUS_SUCCESS; } +static +NTSTATUS +NtfsGetSteamInformation(PNTFS_FCB Fcb, + PDEVICE_EXTENSION DeviceExt, + PFILE_STREAM_INFORMATION StreamInfo, + PULONG BufferLength) +{ + NTSTATUS Status; + ULONG CurrentSize; + PNTFS_ATTR_RECORD Attribute; + PFILE_RECORD_HEADER FileRecord; + PFILE_STREAM_INFORMATION CurrentInfo = StreamInfo, Previous = NULL; + + if (*BufferLength < sizeof(FILE_STREAM_INFORMATION)) + return STATUS_BUFFER_OVERFLOW; + + FileRecord = ExAllocatePoolWithTag(NonPagedPool, DeviceExt->NtfsInfo.BytesPerFileRecord, TAG_NTFS); + if (FileRecord == NULL) + { + DPRINT1("Not enough memory!\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + Status = ReadFileRecord(DeviceExt, Fcb->MFTIndex, FileRecord); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Can't find record!\n"); + ExFreePoolWithTag(FileRecord, TAG_NTFS); + return Status; + } + + Status = STATUS_SUCCESS; + Attribute = (PNTFS_ATTR_RECORD)((ULONG_PTR)FileRecord + FileRecord->AttributeOffset); + while (Attribute < (PNTFS_ATTR_RECORD)((ULONG_PTR)FileRecord + FileRecord->BytesInUse) && + Attribute->Type != AttributeEnd) + { + if (Attribute->Type == AttributeData) + { + CurrentSize = FIELD_OFFSET(FILE_STREAM_INFORMATION, StreamName) + Attribute->NameLength * sizeof(WCHAR); + + if (CurrentSize > *BufferLength) + { + Status = STATUS_BUFFER_OVERFLOW; + break; + } + + CurrentInfo->NextEntryOffset = 0; + CurrentInfo->StreamNameLength = Attribute->NameLength * sizeof(WCHAR); + CurrentInfo->StreamSize.QuadPart = AttributeDataLength(Attribute); + CurrentInfo->StreamAllocationSize.QuadPart = AttributeAllocatedLength(Attribute); + RtlMoveMemory(CurrentInfo->StreamName, (PWCHAR)((ULONG_PTR)Attribute + Attribute->NameOffset), CurrentInfo->StreamNameLength); + + if (Previous != NULL) + { + Previous->NextEntryOffset = (ULONG_PTR)CurrentInfo - (ULONG_PTR)Previous; + } + Previous = CurrentInfo; + CurrentInfo = (PFILE_STREAM_INFORMATION)((ULONG_PTR)CurrentInfo + CurrentSize); + *BufferLength -= CurrentSize; + } + + Attribute = (PNTFS_ATTR_RECORD)((ULONG_PTR)Attribute + Attribute->Length); + } + + ExFreePoolWithTag(FileRecord, TAG_NTFS); + return Status; +} + /* * FUNCTION: Retrieve the specified file information */ @@ -296,6 +364,13 @@ &BufferLength); break; + case FileStreamInformation: + Status = NtfsGetSteamInformation(Fcb, + DeviceObject->DeviceExtension, + SystemBuffer, + &BufferLength); + break; + case FileAlternateNameInformation: case FileAllInformation: DPRINT1("Unimplemented information class %u\n", FileInformationClass);

1 0

[hbelusca] 68807: Fix few comments, no code changes.
by hbelusca＠svn.reactos.org 24 Aug '15

24 Aug '15

Author: hbelusca Date: Mon Aug 24 01:42:52 2015 New Revision: 68807 URL: http://svn.reactos.org/svn/reactos?rev=68807&view=rev Log: Fix few comments, no code changes. Modified: trunk/reactos/dll/win32/kernel32/client/vdm.c 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 24 01:42:52 2015 @@ -781,7 +781,7 @@ /* * Count how much space the whole environment takes. The environment block is - * doubly NULL-terminated (NULL from last string and final terminating NULL). + * doubly NULL-terminated (NULL from last string and final NULL terminator). */ SourcePtr = Environment; while (!(*SourcePtr++ == UNICODE_NULL && *SourcePtr == UNICODE_NULL)) @@ -871,7 +871,7 @@ else { /* - * Invalid stuff starting with '=', ie: + * Invalid stuff starting with '=', i.e.: * =? (with '?' not being a letter) * =X??? (with '?' not being ":=" and not followed by something longer than 3 characters) * =X:=??? (with '?' not being "X:\\") @@ -888,7 +888,7 @@ if (NameType == EnvNameNotAPath) { - /* Copy everything (up to the NULL terminator included) */ + /* Copy everything, including the NULL terminator */ do { *DestPtr++ = *SourcePtr; @@ -911,14 +911,14 @@ SourcePtr += NameLength; - /* Copy the terminating NULL character */ + /* Copy the NULL terminator */ *DestPtr++ = *SourcePtr++; } else // if (NameType == EnvNameMultiplePath) { WCHAR Delimiter; - /* Loop through the list of paths (separated by ';') and convert each path to its short form */ + /* Loop through the list of paths (delimited by ';') and convert each path to its short form */ do { /* Copy any trailing ';' before going to the next path */ @@ -929,7 +929,7 @@ StartPtr = SourcePtr; - /* Find the next path list separator, or terminating NULL */ + /* Find the next path list delimiter or the NULL terminator */ while (*SourcePtr != UNICODE_NULL && *SourcePtr != L';') { ++SourcePtr; @@ -940,8 +940,8 @@ if (NameLength) { /* - * Temporarily replace the possible path list separator by NULL. - * 'lpEnvironment' must point to a read+write memory buffer. + * Temporarily replace the possible path list delimiter by NULL. + * 'lpEnvironment' must point to a read+write memory buffer! */ *SourcePtr = UNICODE_NULL; @@ -958,7 +958,7 @@ if (NumChars > NameLength) Remaining -= (NumChars - NameLength); - /* If removed, restore the path list separator in the source environment value and copy it */ + /* If removed, restore the path list delimiter in the source environment value and copy it */ if (Delimiter != UNICODE_NULL) { *SourcePtr = Delimiter; @@ -967,7 +967,7 @@ } } while (*SourcePtr != UNICODE_NULL); - /* Copy the terminating NULL character */ + /* Copy the NULL terminator */ *DestPtr++ = *SourcePtr++; } } @@ -980,7 +980,7 @@ (DestPtr - NewEnvironment) * sizeof(WCHAR)); UnicodeEnv->Length = UnicodeEnv->MaximumLength; - /* Create its ASCII version */ + /* Create its ANSI version */ Status = RtlUnicodeStringToAnsiString(AnsiEnv, UnicodeEnv, TRUE); if (!NT_SUCCESS(Status)) { @@ -1025,7 +1025,7 @@ { ULONG Dummy = 0; - /* Clear the ASCII buffer since Rtl creates this for us */ + /* Clear the ANSI buffer since Rtl creates this for us */ if (AnsiEnv->Buffer) RtlFreeAnsiString(AnsiEnv); /* The Unicode buffer is build by hand, though */

1 0

[hbelusca] 68806: [KERNEL32] - Move some #defines where they belong; use ARRAYSIZE(...) macro where appropriate. - Use enumeration for the environment name types. - Fix BaseCreateVDMEnvironment so ...
by hbelusca＠svn.reactos.org 24 Aug '15

24 Aug '15

Author: hbelusca Date: Mon Aug 24 01:32:00 2015 New Revision: 68806 URL: http://svn.reactos.org/svn/reactos?rev=68806&view=rev Log: [KERNEL32] - Move some #defines where they belong; use ARRAYSIZE(...) macro where appropriate. - Use enumeration for the environment name types. - Fix BaseCreateVDMEnvironment so that we only convert the paths of TEMP/TMP, PATH, WINDIR and SYSTEMROOT env values to their short form, as done on Windows. To that purpose use the BaseGetEnvNameType_U helper. - Fix the loop that computed the needed new environment size. Needed for CORE-9773. Modified: trunk/reactos/dll/win32/kernel32/client/vdm.c trunk/reactos/dll/win32/kernel32/include/kernel32.h trunk/reactos/dll/win32/kernel32/include/vdm.h 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 24 01:32:00 2015 @@ -15,27 +15,50 @@ /* TYPES **********************************************************************/ +#define BINARY_UNKNOWN (0) +#define BINARY_PE_EXE32 (1) +#define BINARY_PE_DLL32 (2) +#define BINARY_PE_EXE64 (3) +#define BINARY_PE_DLL64 (4) +#define BINARY_WIN16 (5) +#define BINARY_OS216 (6) +#define BINARY_DOS (7) +#define BINARY_UNIX_EXE (8) +#define BINARY_UNIX_LIB (9) + + +typedef enum _ENV_NAME_TYPE +{ + EnvNameNotAPath = 1, + EnvNameSinglePath , + EnvNameMultiplePath +} ENV_NAME_TYPE; + typedef struct _ENV_INFO { - ULONG NameType; - ULONG NameLength; + ENV_NAME_TYPE NameType; + ULONG NameLength; PWCHAR Name; } ENV_INFO, *PENV_INFO; /* GLOBALS ********************************************************************/ -ENV_INFO BasepEnvNameType[] = -{ - {3, sizeof(L"PATH") , L"PATH" }, - {2, sizeof(L"WINDIR") , L"WINDIR" }, - {2, sizeof(L"SYSTEMROOT"), L"SYSTEMROOT"}, - {3, sizeof(L"TEMP") , L"TEMP" }, - {3, sizeof(L"TMP") , L"TMP" }, +// NOTE: We cannot use ARRAYSIZE in this macro. GCC would complain otherwise. +#define ENV_NAME_ENTRY(type, name) \ + {(type), (sizeof(name)/sizeof(*((ENV_INFO*)0)->Name)) - 1, (name)} + +static ENV_INFO BasepEnvNameType[] = +{ + ENV_NAME_ENTRY(EnvNameMultiplePath, L"PATH"), + ENV_NAME_ENTRY(EnvNameSinglePath , L"WINDIR"), + ENV_NAME_ENTRY(EnvNameSinglePath , L"SYSTEMROOT"), + ENV_NAME_ENTRY(EnvNameMultiplePath, L"TEMP"), + ENV_NAME_ENTRY(EnvNameMultiplePath, L"TMP"), }; -UNICODE_STRING BaseDotComSuffixName = RTL_CONSTANT_STRING(L".com"); -UNICODE_STRING BaseDotPifSuffixName = RTL_CONSTANT_STRING(L".pif"); -UNICODE_STRING BaseDotExeSuffixName = RTL_CONSTANT_STRING(L".exe"); +static UNICODE_STRING BaseDotComSuffixName = RTL_CONSTANT_STRING(L".com"); +static UNICODE_STRING BaseDotPifSuffixName = RTL_CONSTANT_STRING(L".pif"); +static UNICODE_STRING BaseDotExeSuffixName = RTL_CONSTANT_STRING(L".exe"); /* FUNCTIONS ******************************************************************/ @@ -476,7 +499,7 @@ Status = CsrClientCallServer((PCSR_API_MESSAGE)ApiMessage, CaptureBuffer, CSR_CREATE_API_NUMBER(BASESRV_SERVERDLL_INDEX, BasepCheckVDM), - sizeof(BASE_CHECK_VDM)); + sizeof(*CheckVdm)); /* Write back the task ID */ *iTask = CheckVdm->iTask; @@ -511,7 +534,6 @@ IN ULONG IndexInfo, IN ULONG BinaryType) { - NTSTATUS Status; BASE_API_MESSAGE ApiMessage; PBASE_UPDATE_VDM_ENTRY UpdateVdmEntry = &ApiMessage.Data.UpdateVDMEntryRequest; @@ -559,14 +581,14 @@ UpdateVdmEntry->BinaryType = BinaryType; /* Send the message to CSRSS */ - Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, - NULL, - CSR_CREATE_API_NUMBER(BASESRV_SERVERDLL_INDEX, BasepUpdateVDMEntry), - sizeof(BASE_UPDATE_VDM_ENTRY)); - if (!NT_SUCCESS(Status)) + CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, + NULL, + CSR_CREATE_API_NUMBER(BASESRV_SERVERDLL_INDEX, BasepUpdateVDMEntry), + sizeof(*UpdateVdmEntry)); + if (!NT_SUCCESS(ApiMessage.Status)) { /* Handle failure */ - BaseSetLastNTError(Status); + BaseSetLastNTError(ApiMessage.Status); return FALSE; } @@ -607,7 +629,7 @@ Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, NULL, CSR_CREATE_API_NUMBER(BASESRV_SERVERDLL_INDEX, BasepGetVDMExitCode), - sizeof(BASE_GET_VDM_EXIT_CODE)); + sizeof(*GetVdmExitCode)); if (!NT_SUCCESS(Status)) return FALSE; /* Get the exit code from the reply */ @@ -651,7 +673,7 @@ * %s%c : Nothing if DOS VDM, -w if WoW VDM, -ws if separate WoW VDM. */ _snwprintf(CommandLine, - sizeof(CommandLine) / sizeof(CommandLine[0]), + ARRAYSIZE(CommandLine), L"\"%s\\ntvdm.exe\" -i%lx %s%c", Buffer, DosSeqId, @@ -665,7 +687,7 @@ * %s%c : Nothing if DOS VDM, -w if WoW VDM, -ws if separate WoW VDM. */ _snwprintf(CommandLine, - sizeof(CommandLine) / sizeof(CommandLine[0]), + ARRAYSIZE(CommandLine), L"\"%s\\ntvdm.exe\" %s%c", Buffer, (BinaryType == BINARY_TYPE_DOS) ? L" " : L"-w", @@ -676,26 +698,27 @@ return RtlCreateUnicodeString(CmdLineString, CommandLine); } -UINT +ENV_NAME_TYPE WINAPI BaseGetEnvNameType_U(IN PWCHAR Name, IN ULONG NameLength) { PENV_INFO EnvInfo; - ULONG NameType, i; - - /* Start by assuming unknown type */ - NameType = 1; + ENV_NAME_TYPE NameType; + ULONG i; + + /* Start by assuming the environment variable doesn't describe paths */ + NameType = EnvNameNotAPath; /* Loop all the environment names */ - for (i = 0; i < (sizeof(BasepEnvNameType) / sizeof(ENV_INFO)); i++) + for (i = 0; i < ARRAYSIZE(BasepEnvNameType); i++) { /* Get this entry */ EnvInfo = &BasepEnvNameType[i]; /* Check if it matches the name */ if ((EnvInfo->NameLength == NameLength) && - !(_wcsnicmp(EnvInfo->Name, Name, NameLength))) + (_wcsnicmp(EnvInfo->Name, Name, NameLength) == 0)) { /* It does, return the type */ NameType = EnvInfo->NameType; @@ -703,48 +726,32 @@ } } - /* Return what we found, or unknown if nothing */ return NameType; -} - -BOOL -NTAPI -BaseDestroyVDMEnvironment(IN PANSI_STRING AnsiEnv, - IN PUNICODE_STRING UnicodeEnv) -{ - ULONG Dummy = 0; - - /* Clear the ASCII buffer since Rtl creates this for us */ - if (AnsiEnv->Buffer) RtlFreeAnsiString(AnsiEnv); - - /* The Unicode buffer is build by hand, though */ - if (UnicodeEnv->Buffer) - { - /* So clear it through the API */ - NtFreeVirtualMemory(NtCurrentProcess(), - (PVOID*)&UnicodeEnv->Buffer, - &Dummy, - MEM_RELEASE); - } - - /* All done */ - return TRUE; } BOOL NTAPI BaseCreateVDMEnvironment(IN PWCHAR lpEnvironment, - IN PANSI_STRING AnsiEnv, - IN PUNICODE_STRING UnicodeEnv) -{ + OUT PANSI_STRING AnsiEnv, + OUT PUNICODE_STRING UnicodeEnv) +{ +#define IS_ALPHA(x) \ + ( ((x) >= L'A' && (x) <= L'Z') || ((x) >= L'a' && (x) <= L'z') ) + +// From lib/rtl/path.c : +// Can be put in some .h ?? +#define IS_PATH_SEPARATOR(x) ((x) == L'\\' || (x) == L'/') + BOOL Result; + NTSTATUS Status; ULONG RegionSize, EnvironmentSize = 0; - PWCHAR SourcePtr, DestPtr, Environment, NewEnvironment = NULL; - WCHAR PathBuffer[MAX_PATH]; - NTSTATUS Status; + PWCHAR Environment, NewEnvironment = NULL; + ENV_NAME_TYPE NameType; + ULONG NameLength, NumChars, Remaining; + PWCHAR SourcePtr, DestPtr, StartPtr; /* Make sure we have both strings */ - if (!(AnsiEnv) || !(UnicodeEnv)) + if (!AnsiEnv || !UnicodeEnv) { /* Fail */ SetLastError(ERROR_INVALID_PARAMETER); @@ -756,7 +763,7 @@ { /* Nope, create one */ Status = RtlCreateEnvironment(TRUE, &Environment); - if (!NT_SUCCESS(Status)) goto Quickie; + if (!NT_SUCCESS(Status)) goto Cleanup; } else { @@ -767,103 +774,213 @@ /* Do we have something now ? */ if (!Environment) { - /* Still not, fail out */ + /* Still not, bail out */ SetLastError(ERROR_BAD_ENVIRONMENT); - goto Quickie; - } - - /* Count how much space the whole environment takes */ + goto Cleanup; + } + + /* + * Count how much space the whole environment takes. The environment block is + * doubly NULL-terminated (NULL from last string and final terminating NULL). + */ SourcePtr = Environment; - while ((*SourcePtr++ != UNICODE_NULL) && (*SourcePtr != UNICODE_NULL)) EnvironmentSize++; - EnvironmentSize += sizeof(UNICODE_NULL); - - /* Allocate a new copy */ + while (!(*SourcePtr++ == UNICODE_NULL && *SourcePtr == UNICODE_NULL)) + ++EnvironmentSize; + EnvironmentSize += 2; // Add the two terminating NULLs + + /* + * Allocate a new copy large enough to hold all the environment with paths + * in their short form. Since the short form of a path can be a bit longer + * than its long form, for example in the case where characters that are + * invalid in the 8.3 representation are present in the long path name: + * 'C:\\a+b' --> 'C:\\A_B~1', or: + * 'C:\\a b' --> 'C:\\AB2761~1' (with checksum inserted), + * we suppose that the possible total number of extra characters needed to + * convert the long paths into their short form is at most equal to MAX_PATH. + */ RegionSize = (EnvironmentSize + MAX_PATH) * sizeof(WCHAR); - if (!NT_SUCCESS(NtAllocateVirtualMemory(NtCurrentProcess(), - (PVOID*)&NewEnvironment, - 0, - &RegionSize, - MEM_COMMIT, - PAGE_READWRITE))) + Status = NtAllocateVirtualMemory(NtCurrentProcess(), + (PVOID*)&NewEnvironment, + 0, + &RegionSize, + MEM_COMMIT, + PAGE_READWRITE); + if (!NT_SUCCESS(Status)) { /* We failed, bail out */ SetLastError(ERROR_NOT_ENOUGH_MEMORY); NewEnvironment = NULL; - goto Quickie; - } - - /* Begin parsing the new environment */ + goto Cleanup; + } + + /* Parse the environment block */ + Remaining = MAX_PATH - 2; // '-2': remove the last two NULLs. FIXME: is it really needed?? SourcePtr = Environment; DestPtr = NewEnvironment; + /* Loop through all the environment strings */ while (*SourcePtr != UNICODE_NULL) { - while (*SourcePtr != UNICODE_NULL) + /* + * 1. Check the type of the environment variable and copy its name. + */ + + /* Regular environment variable */ + if (*SourcePtr != L'=') { - if (*SourcePtr == L'=') - { - /* Store the '=' sign */ - *DestPtr++ = *SourcePtr++; - - /* Check if this is likely a full path */ - if (isalphaW(SourcePtr[0]) - && (SourcePtr[1] == L':') - && ((SourcePtr[2] == '\\') || (SourcePtr[2] == '/'))) + StartPtr = SourcePtr; + + /* Copy the environment variable name, including the '=' */ + while (*SourcePtr != UNICODE_NULL) + { + *DestPtr++ = *SourcePtr; + if (*SourcePtr++ == L'=') break; + } + + /* Guess the type of the environment variable */ + NameType = BaseGetEnvNameType_U(StartPtr, SourcePtr - StartPtr - 1); + } + /* 'Current directory' environment variable (i.e. of '=X:=' form) */ + else // if (*SourcePtr == L'=') + { + /* First assume we have a possibly malformed environment variable */ + NameType = EnvNameNotAPath; + + /* Check for a valid 'Current directory' environment variable */ + if (IS_ALPHA(SourcePtr[1]) && SourcePtr[2] == L':' && SourcePtr[3] == L'=') + { + /* + * Small optimization: convert the path to short form only if + * the current directory is not the root directory (i.e. not + * of the '=X:=Y:\' form), otherwise just do a simple copy. + */ + if ( wcslen(SourcePtr) >= ARRAYSIZE("=X:=Y:\\")-1 && + !( IS_ALPHA(SourcePtr[4]) && SourcePtr[5] == L':' && + IS_PATH_SEPARATOR(SourcePtr[6]) && SourcePtr[7] == UNICODE_NULL ) ) { - PWCHAR Delimiter = wcschr(SourcePtr, L';'); - ULONG NumChars; - - if (Delimiter != NULL) + NameType = EnvNameSinglePath; + + /* Copy the '=X:=' prefix */ + *DestPtr++ = SourcePtr[0]; + *DestPtr++ = SourcePtr[1]; + *DestPtr++ = SourcePtr[2]; + *DestPtr++ = SourcePtr[3]; + SourcePtr += 4; + } + } + else + { + /* + * Invalid stuff starting with '=', ie: + * =? (with '?' not being a letter) + * =X??? (with '?' not being ":=" and not followed by something longer than 3 characters) + * =X:=??? (with '?' not being "X:\\") + * + * 'NameType' is already set to 'EnvNameNotAPath'. + */ + } + } + + + /* + * 2. Copy the environment value and perform conversions accordingly. + */ + + if (NameType == EnvNameNotAPath) + { + /* Copy everything (up to the NULL terminator included) */ + do + { + *DestPtr++ = *SourcePtr; + } while (*SourcePtr++ != UNICODE_NULL); + } + else if (NameType == EnvNameSinglePath) + { + /* Convert the path to its short form */ + NameLength = wcslen(SourcePtr); + NumChars = GetShortPathNameW(SourcePtr, DestPtr, NameLength + 1 + Remaining); + if (NumChars == 0 || NumChars > NameLength + Remaining) + { + /* If the conversion failed, just copy the original value */ + RtlCopyMemory(DestPtr, SourcePtr, NameLength * sizeof(WCHAR)); + NumChars = NameLength; + } + DestPtr += NumChars; + if (NumChars > NameLength) + Remaining -= (NumChars - NameLength); + + SourcePtr += NameLength; + + /* Copy the terminating NULL character */ + *DestPtr++ = *SourcePtr++; + } + else // if (NameType == EnvNameMultiplePath) + { + WCHAR Delimiter; + + /* Loop through the list of paths (separated by ';') and convert each path to its short form */ + do + { + /* Copy any trailing ';' before going to the next path */ + while (*SourcePtr == L';') + { + *DestPtr++ = *SourcePtr++; + } + + StartPtr = SourcePtr; + + /* Find the next path list separator, or terminating NULL */ + while (*SourcePtr != UNICODE_NULL && *SourcePtr != L';') + { + ++SourcePtr; + } + Delimiter = *SourcePtr; + + NameLength = SourcePtr - StartPtr; + if (NameLength) + { + /* + * Temporarily replace the possible path list separator by NULL. + * 'lpEnvironment' must point to a read+write memory buffer. + */ + *SourcePtr = UNICODE_NULL; + + NumChars = GetShortPathNameW(StartPtr, DestPtr, NameLength + 1 + Remaining); + if ( NumChars == 0 || + (Delimiter == L';' ? NumChars > NameLength + Remaining + : NumChars > NameLength /* + Remaining ?? */) ) { - wcsncpy(PathBuffer, - SourcePtr, - min(Delimiter - SourcePtr, MAX_PATH)); - - /* Seek to the part after the delimiter */ - SourcePtr = Delimiter + 1; + /* If the conversion failed, just copy the original value */ + RtlCopyMemory(DestPtr, StartPtr, NameLength * sizeof(WCHAR)); + NumChars = NameLength; } - else + DestPtr += NumChars; + if (NumChars > NameLength) + Remaining -= (NumChars - NameLength); + + /* If removed, restore the path list separator in the source environment value and copy it */ + if (Delimiter != UNICODE_NULL) { - wcsncpy(PathBuffer, SourcePtr, MAX_PATH); - - /* Seek to the end of the string */ - SourcePtr = wcschr(SourcePtr, UNICODE_NULL); - } - - /* Convert the path into a short path */ - NumChars = GetShortPathNameW(PathBuffer, - DestPtr, - EnvironmentSize - (DestPtr - NewEnvironment)); - if (NumChars) - { - /* - * If it failed, this block won't be executed, so it - * will continue from the character after the '=' sign. - */ - DestPtr += NumChars; - - /* Append the delimiter */ - if (Delimiter != NULL) *DestPtr++ = L';'; + *SourcePtr = Delimiter; + *DestPtr++ = *SourcePtr++; } } - } - else if (islowerW(*SourcePtr)) *DestPtr++ = toupperW(*SourcePtr++); - else *DestPtr++ = *SourcePtr++; + } while (*SourcePtr != UNICODE_NULL); + + /* Copy the terminating NULL character */ + *DestPtr++ = *SourcePtr++; } - - /* Copy the terminating NULL character */ - *DestPtr++ = *SourcePtr++; - } - - /* Terminate it */ + } + + /* NULL-terminate the environment block */ *DestPtr++ = UNICODE_NULL; - /* Initialize the unicode string to hold it */ - EnvironmentSize = (DestPtr - NewEnvironment) * sizeof(WCHAR); - RtlInitEmptyUnicodeString(UnicodeEnv, NewEnvironment, (USHORT)EnvironmentSize); - UnicodeEnv->Length = (USHORT)EnvironmentSize; - - /* Create the ASCII version of it */ + /* Initialize the Unicode string to hold it */ + RtlInitEmptyUnicodeString(UnicodeEnv, NewEnvironment, + (DestPtr - NewEnvironment) * sizeof(WCHAR)); + UnicodeEnv->Length = UnicodeEnv->MaximumLength; + + /* Create its ASCII version */ Status = RtlUnicodeStringToAnsiString(AnsiEnv, UnicodeEnv, TRUE); if (!NT_SUCCESS(Status)) { @@ -877,9 +994,9 @@ NewEnvironment = NULL; } -Quickie: - /* Cleanup path starts here, start by destroying the envrionment copy */ - if (!(lpEnvironment) && (Environment)) RtlDestroyEnvironment(Environment); +Cleanup: + /* Cleanup path starts here, start by destroying the environment copy */ + if (!lpEnvironment && Environment) RtlDestroyEnvironment(Environment); /* See if we are here due to failure */ if (NewEnvironment) @@ -899,6 +1016,30 @@ /* Return the result */ return Result; +} + +BOOL +NTAPI +BaseDestroyVDMEnvironment(IN PANSI_STRING AnsiEnv, + IN PUNICODE_STRING UnicodeEnv) +{ + ULONG Dummy = 0; + + /* Clear the ASCII buffer since Rtl creates this for us */ + if (AnsiEnv->Buffer) RtlFreeAnsiString(AnsiEnv); + + /* The Unicode buffer is build by hand, though */ + if (UnicodeEnv->Buffer) + { + /* So clear it through the API */ + NtFreeVirtualMemory(NtCurrentProcess(), + (PVOID*)&UnicodeEnv->Buffer, + &Dummy, + MEM_RELEASE); + } + + /* All done */ + return TRUE; } @@ -1003,7 +1144,7 @@ return BINARY_UNKNOWN; } - /* Mach-o File with Endian set to Big Endian or Little Endian*/ + /* Mach-o File with Endian set to Big Endian or Little Endian*/ if(Header.macho.magic == 0xFEEDFACE || Header.macho.magic == 0xCEFAEDFE) { @@ -1251,7 +1392,7 @@ CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, NULL, CSR_CREATE_API_NUMBER(BASESRV_SERVERDLL_INDEX, BasepExitVDM), - sizeof(BASE_EXIT_VDM)); + sizeof(*ExitVdm)); /* Close the returned wait object handle, if any */ if (NT_SUCCESS(ApiMessage.Status) && (ExitVdm->WaitObjectForVDM != NULL)) @@ -1289,7 +1430,7 @@ Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, NULL, CSR_CREATE_API_NUMBER(BASESRV_SERVERDLL_INDEX, BasepSetReenterCount), - sizeof(BASE_SET_REENTER_COUNT)); + sizeof(*SetReenterCount)); BaseSetLastNTError(Status); Result = NT_SUCCESS(Status); } @@ -1413,8 +1554,7 @@ Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, CaptureBuffer, CSR_CREATE_API_NUMBER(BASESRV_SERVERDLL_INDEX, BasepGetNextVDMCommand), - sizeof(BASE_GET_NEXT_VDM_COMMAND)); - + sizeof(*GetNextVdmCommand)); if (!NT_SUCCESS(Status)) { /* Store the correct lengths */ @@ -1568,7 +1708,7 @@ Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, NULL, CSR_CREATE_API_NUMBER(BASESRV_SERVERDLL_INDEX, BasepIsFirstVDM), - sizeof(BASE_IS_FIRST_VDM)); + sizeof(*IsFirstVdm)); if (!NT_SUCCESS(Status)) { BaseSetLastNTError(Status); @@ -1614,7 +1754,7 @@ CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, CaptureBuffer, CSR_CREATE_API_NUMBER(BASESRV_SERVERDLL_INDEX, BasepGetVDMCurDirs), - sizeof(BASE_GETSET_VDM_CURDIRS)); + sizeof(*VDMCurrentDirsRequest)); /* Set the last error */ BaseSetLastNTError(ApiMessage.Status); @@ -1791,7 +1931,7 @@ CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, CaptureBuffer, CSR_CREATE_API_NUMBER(BASESRV_SERVERDLL_INDEX, BasepSetVDMCurDirs), - sizeof(BASE_GETSET_VDM_CURDIRS)); + sizeof(*VDMCurrentDirsRequest)); /* Free the capture buffer */ CsrFreeCaptureBuffer(CaptureBuffer); Modified: trunk/reactos/dll/win32/kernel32/include/kernel32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/include… ============================================================================== --- trunk/reactos/dll/win32/kernel32/include/kernel32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/include/kernel32.h [iso-8859-1] Mon Aug 24 01:32:00 2015 @@ -37,17 +37,6 @@ #include "wine/unicode.h" #include "baseheap.h" -#define BINARY_UNKNOWN (0) -#define BINARY_PE_EXE32 (1) -#define BINARY_PE_DLL32 (2) -#define BINARY_PE_EXE64 (3) -#define BINARY_PE_DLL64 (4) -#define BINARY_WIN16 (5) -#define BINARY_OS216 (6) -#define BINARY_DOS (7) -#define BINARY_UNIX_EXE (8) -#define BINARY_UNIX_LIB (9) - #define MAGIC(c1,c2,c3,c4) ((c1) + ((c2)<<8) + ((c3)<<16) + ((c4)<<24)) #define MAGIC_HEAP MAGIC( 'H','E','A','P' ) Modified: trunk/reactos/dll/win32/kernel32/include/vdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/include… ============================================================================== --- trunk/reactos/dll/win32/kernel32/include/vdm.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/include/vdm.h [iso-8859-1] Mon Aug 24 01:32:00 2015 @@ -9,6 +9,14 @@ #pragma once /* FUNCTION PROTOTYPES ********************************************************/ + +BOOL +NTAPI +BaseCreateVDMEnvironment( + IN PWCHAR lpEnvironment, + OUT PANSI_STRING AnsiEnv, + OUT PUNICODE_STRING UnicodeEnv +); BOOL NTAPI @@ -25,14 +33,6 @@ IN ULONG BinaryType, IN PUNICODE_STRING CmdLineString, OUT PULONG VdmSize -); - -BOOL -NTAPI -BaseCreateVDMEnvironment( - IN PWCHAR lpEnvironment, - IN PANSI_STRING AnsiEnv, - IN PUNICODE_STRING UnicodeEnv ); BOOL

1 0

[pschweitzer] 68805: [HACKSSIGN] Fix typo, spotted by "Michele MZ Ji" CORE-10033
by pschweitzer＠svn.reactos.org 23 Aug '15

23 Aug '15

Author: pschweitzer Date: Sun Aug 23 17:33:15 2015 New Revision: 68805 URL: http://svn.reactos.org/svn/reactos?rev=68805&view=rev Log: [HACKSSIGN] Fix typo, spotted by "Michele MZ Ji" CORE-10033 Modified: trunk/rosapps/applications/cmdutils/hackssign/client.c Modified: trunk/rosapps/applications/cmdutils/hackssign/client.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/hack… ============================================================================== --- trunk/rosapps/applications/cmdutils/hackssign/client.c [iso-8859-1] (original) +++ trunk/rosapps/applications/cmdutils/hackssign/client.c [iso-8859-1] Sun Aug 23 17:33:15 2015 @@ -278,7 +278,7 @@ void printUsage(void) { wprintf(L"ReactOS Hackssign application\n"); - wprintf(L"\assign <letter> <share name>: Assign a drive letter to the share\n"); + wprintf(L"\tassign <letter> <share name>: Assign a drive letter to the share\n"); wprintf(L"\tdelete <letter>: delete driver letter assignation\n"); wprintf(L"\tdetect: detect VM type\n"); }

1 0

[ekohl] 68804: [WLNOTIFY] - Disable the debug output. - Add and register the missing notification functions.
by ekohl＠svn.reactos.org 23 Aug '15

23 Aug '15

Author: ekohl Date: Sun Aug 23 15:58:18 2015 New Revision: 68804 URL: http://svn.reactos.org/svn/reactos?rev=68804&view=rev Log: [WLNOTIFY] - Disable the debug output. - Add and register the missing notification functions. Modified: trunk/reactos/boot/bootdata/hivesft.inf trunk/reactos/dll/win32/wlnotify/test.c trunk/reactos/dll/win32/wlnotify/wlnotify.spec Modified: trunk/reactos/boot/bootdata/hivesft.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] Sun Aug 23 15:58:18 2015 @@ -1105,9 +1105,19 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","DefaultPassword",0x00000000,"" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify",,0x00000012 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\Test",,0x00000012 +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\Test","Disconnect",0x00000000,"TestDisconnectEvent" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\Test","DlLName",0x00020000,"wlnotify.dll" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\Test","Lock",0x00000000,"TestLockEvent" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\Test","Logoff",0x00000000,"TestLogoffEvent" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\Test","Logon",0x00000000,"TestLogonEvent" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\Test","PostShell",0x00000000,"TestPostShellEvent" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\Test","Reconnect",0x00000000,"TestReconnectEvent" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\Test","Shutdown",0x00000000,"TestShutdownEvent" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\Test","StartScreenSaver",0x00000000,"TestStartScreenSaverEvent" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\Test","StartShell",0x00000000,"TestStartShellEvent" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\Test","Startup",0x00000000,"TestStartupEvent" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\Test","StopScreenSaver",0x00000000,"TestStopScreenSaverEvent" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\Test","Unlock",0x00000000,"TestUnlockEvent" ; Time Zone Servers HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\DateTime\Servers","1",0x00000000,"pool.ntp.org" Modified: trunk/reactos/dll/win32/wlnotify/test.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wlnotify/test.c?… ============================================================================== --- trunk/reactos/dll/win32/wlnotify/test.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wlnotify/test.c [iso-8859-1] Sun Aug 23 15:58:18 2015 @@ -17,15 +17,15 @@ TestLogonEvent( PWLX_NOTIFICATION_INFO pInfo) { - DPRINT1("TestLogonEvent\n"); - DPRINT1("Size: %lu\n", pInfo->Size); - DPRINT1("Flags: %lx\n", pInfo->Flags); - DPRINT1("UserName: %S\n", pInfo->UserName); - DPRINT1("Domain: %S\n", pInfo->Domain); - DPRINT1("WindowStation: %S\n", pInfo->WindowStation); - DPRINT1("hToken: %p\n", pInfo->hToken); - DPRINT1("hDesktop: %p\n", pInfo->hDesktop); - DPRINT1("pStatusCallback: %p\n", pInfo->pStatusCallback); + DPRINT("TestLogonEvent\n"); + DPRINT("Size: %lu\n", pInfo->Size); + DPRINT("Flags: %lx\n", pInfo->Flags); + DPRINT("UserName: %S\n", pInfo->UserName); + DPRINT("Domain: %S\n", pInfo->Domain); + DPRINT("WindowStation: %S\n", pInfo->WindowStation); + DPRINT("hToken: %p\n", pInfo->hToken); + DPRINT("hDesktop: %p\n", pInfo->hDesktop); + DPRINT("pStatusCallback: %p\n", pInfo->pStatusCallback); } @@ -34,15 +34,184 @@ TestLogoffEvent( PWLX_NOTIFICATION_INFO pInfo) { - DPRINT1("TestLogoffEvent\n"); - DPRINT1("Size: %lu\n", pInfo->Size); - DPRINT1("Flags: %lx\n", pInfo->Flags); - DPRINT1("UserName: %S\n", pInfo->UserName); - DPRINT1("Domain: %S\n", pInfo->Domain); - DPRINT1("WindowStation: %S\n", pInfo->WindowStation); - DPRINT1("hToken: %p\n", pInfo->hToken); - DPRINT1("hDesktop: %p\n", pInfo->hDesktop); - DPRINT1("pStatusCallback: %p\n", pInfo->pStatusCallback); + DPRINT("TestLogoffEvent\n"); + DPRINT("Size: %lu\n", pInfo->Size); + DPRINT("Flags: %lx\n", pInfo->Flags); + DPRINT("UserName: %S\n", pInfo->UserName); + DPRINT("Domain: %S\n", pInfo->Domain); + DPRINT("WindowStation: %S\n", pInfo->WindowStation); + DPRINT("hToken: %p\n", pInfo->hToken); + DPRINT("hDesktop: %p\n", pInfo->hDesktop); + DPRINT("pStatusCallback: %p\n", pInfo->pStatusCallback); +} + + +VOID +WINAPI +TestLockEvent( + PWLX_NOTIFICATION_INFO pInfo) +{ + DPRINT("TestLockEvent\n"); + DPRINT("Size: %lu\n", pInfo->Size); + DPRINT("Flags: %lx\n", pInfo->Flags); + DPRINT("UserName: %S\n", pInfo->UserName); + DPRINT("Domain: %S\n", pInfo->Domain); + DPRINT("WindowStation: %S\n", pInfo->WindowStation); + DPRINT("hToken: %p\n", pInfo->hToken); + DPRINT("hDesktop: %p\n", pInfo->hDesktop); + DPRINT("pStatusCallback: %p\n", pInfo->pStatusCallback); +} + + +VOID +WINAPI +TestUnlockEvent( + PWLX_NOTIFICATION_INFO pInfo) +{ + DPRINT("TestUnlockEvent\n"); + DPRINT("Size: %lu\n", pInfo->Size); + DPRINT("Flags: %lx\n", pInfo->Flags); + DPRINT("UserName: %S\n", pInfo->UserName); + DPRINT("Domain: %S\n", pInfo->Domain); + DPRINT("WindowStation: %S\n", pInfo->WindowStation); + DPRINT("hToken: %p\n", pInfo->hToken); + DPRINT("hDesktop: %p\n", pInfo->hDesktop); + DPRINT("pStatusCallback: %p\n", pInfo->pStatusCallback); +} + + +VOID +WINAPI +TestStartupEvent( + PWLX_NOTIFICATION_INFO pInfo) +{ + DPRINT("TestStartupEvent\n"); + DPRINT("Size: %lu\n", pInfo->Size); + DPRINT("Flags: %lx\n", pInfo->Flags); + DPRINT("UserName: %S\n", pInfo->UserName); + DPRINT("Domain: %S\n", pInfo->Domain); + DPRINT("WindowStation: %S\n", pInfo->WindowStation); + DPRINT("hToken: %p\n", pInfo->hToken); + DPRINT("hDesktop: %p\n", pInfo->hDesktop); + DPRINT("pStatusCallback: %p\n", pInfo->pStatusCallback); +} + + +VOID +WINAPI +TestShutdownEvent( + PWLX_NOTIFICATION_INFO pInfo) +{ + DPRINT("TestShutdownEvent\n"); + DPRINT("Size: %lu\n", pInfo->Size); + DPRINT("Flags: %lx\n", pInfo->Flags); + DPRINT("UserName: %S\n", pInfo->UserName); + DPRINT("Domain: %S\n", pInfo->Domain); + DPRINT("WindowStation: %S\n", pInfo->WindowStation); + DPRINT("hToken: %p\n", pInfo->hToken); + DPRINT("hDesktop: %p\n", pInfo->hDesktop); + DPRINT("pStatusCallback: %p\n", pInfo->pStatusCallback); +} + + +VOID +WINAPI +TestStartScreenSaverEvent( + PWLX_NOTIFICATION_INFO pInfo) +{ + DPRINT("TestStartScreenSaverEvent\n"); + DPRINT("Size: %lu\n", pInfo->Size); + DPRINT("Flags: %lx\n", pInfo->Flags); + DPRINT("UserName: %S\n", pInfo->UserName); + DPRINT("Domain: %S\n", pInfo->Domain); + DPRINT("WindowStation: %S\n", pInfo->WindowStation); + DPRINT("hToken: %p\n", pInfo->hToken); + DPRINT("hDesktop: %p\n", pInfo->hDesktop); + DPRINT("pStatusCallback: %p\n", pInfo->pStatusCallback); +} + + +VOID +WINAPI +TestStopScreenSaverEvent( + PWLX_NOTIFICATION_INFO pInfo) +{ + DPRINT("TestStopScreenSaverEvent\n"); + DPRINT("Size: %lu\n", pInfo->Size); + DPRINT("Flags: %lx\n", pInfo->Flags); + DPRINT("UserName: %S\n", pInfo->UserName); + DPRINT("Domain: %S\n", pInfo->Domain); + DPRINT("WindowStation: %S\n", pInfo->WindowStation); + DPRINT("hToken: %p\n", pInfo->hToken); + DPRINT("hDesktop: %p\n", pInfo->hDesktop); + DPRINT("pStatusCallback: %p\n", pInfo->pStatusCallback); +} + + +VOID +WINAPI +TestStartShellEvent( + PWLX_NOTIFICATION_INFO pInfo) +{ + DPRINT("TestStartShellEvent\n"); + DPRINT("Size: %lu\n", pInfo->Size); + DPRINT("Flags: %lx\n", pInfo->Flags); + DPRINT("UserName: %S\n", pInfo->UserName); + DPRINT("Domain: %S\n", pInfo->Domain); + DPRINT("WindowStation: %S\n", pInfo->WindowStation); + DPRINT("hToken: %p\n", pInfo->hToken); + DPRINT("hDesktop: %p\n", pInfo->hDesktop); + DPRINT("pStatusCallback: %p\n", pInfo->pStatusCallback); +} + + +VOID +WINAPI +TestPostShellEvent( + PWLX_NOTIFICATION_INFO pInfo) +{ + DPRINT("TestStartShellEvent\n"); + DPRINT("Size: %lu\n", pInfo->Size); + DPRINT("Flags: %lx\n", pInfo->Flags); + DPRINT("UserName: %S\n", pInfo->UserName); + DPRINT("Domain: %S\n", pInfo->Domain); + DPRINT("WindowStation: %S\n", pInfo->WindowStation); + DPRINT("hToken: %p\n", pInfo->hToken); + DPRINT("hDesktop: %p\n", pInfo->hDesktop); + DPRINT("pStatusCallback: %p\n", pInfo->pStatusCallback); +} + +VOID +WINAPI +TestDisconnectEvent( + PWLX_NOTIFICATION_INFO pInfo) +{ + DPRINT("TestDisconnectEvent\n"); + DPRINT("Size: %lu\n", pInfo->Size); + DPRINT("Flags: %lx\n", pInfo->Flags); + DPRINT("UserName: %S\n", pInfo->UserName); + DPRINT("Domain: %S\n", pInfo->Domain); + DPRINT("WindowStation: %S\n", pInfo->WindowStation); + DPRINT("hToken: %p\n", pInfo->hToken); + DPRINT("hDesktop: %p\n", pInfo->hDesktop); + DPRINT("pStatusCallback: %p\n", pInfo->pStatusCallback); +} + + +VOID +WINAPI +TestReconnectEvent( + PWLX_NOTIFICATION_INFO pInfo) +{ + DPRINT("TestReconnectEvent\n"); + DPRINT("Size: %lu\n", pInfo->Size); + DPRINT("Flags: %lx\n", pInfo->Flags); + DPRINT("UserName: %S\n", pInfo->UserName); + DPRINT("Domain: %S\n", pInfo->Domain); + DPRINT("WindowStation: %S\n", pInfo->WindowStation); + DPRINT("hToken: %p\n", pInfo->hToken); + DPRINT("hDesktop: %p\n", pInfo->hDesktop); + DPRINT("pStatusCallback: %p\n", pInfo->pStatusCallback); } /* EOF */ Modified: trunk/reactos/dll/win32/wlnotify/wlnotify.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wlnotify/wlnotif… ============================================================================== --- trunk/reactos/dll/win32/wlnotify/wlnotify.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wlnotify/wlnotify.spec [iso-8859-1] Sun Aug 23 15:58:18 2015 @@ -1,2 +1,12 @@ +@ stdcall TestDisconnectEvent(ptr) +@ stdcall TestLockEvent(ptr) +@ stdcall TestLogoffEvent(ptr) @ stdcall TestLogonEvent(ptr) -@ stdcall TestLogoffEvent(ptr) +@ stdcall TestPostShellEvent(ptr) +@ stdcall TestReconnectEvent(ptr) +@ stdcall TestShutdownEvent(ptr) +@ stdcall TestStartScreenSaverEvent(ptr) +@ stdcall TestStartShellEvent(ptr) +@ stdcall TestStartupEvent(ptr) +@ stdcall TestStopScreenSaverEvent(ptr) +@ stdcall TestUnlockEvent(ptr)

1 0

[ekohl] 68803: [WINLOGON] Implement calls to the notification DLLs.
by ekohl＠svn.reactos.org 23 Aug '15

23 Aug '15

Author: ekohl Date: Sun Aug 23 15:48:52 2015 New Revision: 68803 URL: http://svn.reactos.org/svn/reactos?rev=68803&view=rev Log: [WINLOGON] Implement calls to the notification DLLs. Modified: trunk/reactos/base/system/winlogon/notify.c trunk/reactos/base/system/winlogon/sas.c trunk/reactos/base/system/winlogon/screensaver.c trunk/reactos/base/system/winlogon/winlogon.c trunk/reactos/base/system/winlogon/winlogon.h Modified: trunk/reactos/base/system/winlogon/notify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/notif… ============================================================================== --- trunk/reactos/base/system/winlogon/notify.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/notify.c [iso-8859-1] Sun Aug 23 15:48:52 2015 @@ -15,23 +15,6 @@ // void Event_Handler_Function_Name(PWLX_NOTIFICATION_INFO pInfo); typedef VOID (WINAPI *PWLX_NOTIFY_HANDLER)(PWLX_NOTIFICATION_INFO pInfo); - -typedef enum _NOTIFICATION_TYPE -{ - LogonHandler, - LogoffHandler, - LockHandler, - UnlockHandler, - StartupHandler, - ShutdownHandler, - StartScreenSaverHandler, - StopScreenSaverHandler, - DisconnectHandler, - ReconnectHandler, - StartShellHandler, - PostShellHandler, - LastHandler -} NOTIFICATION_TYPE, *PNOTIFICATION_TYPE; static PSTR FuncNames[LastHandler] = { @@ -204,6 +187,75 @@ VOID +CallNotificationDlls( + PWLSESSION pSession, + NOTIFICATION_TYPE Type) +{ + PLIST_ENTRY ListEntry; + PNOTIFICATION_ITEM NotificationDll; + WLX_NOTIFICATION_INFO Info; + + TRACE("CallNotificationDlls()\n"); + + Info.Size = sizeof(WLX_NOTIFICATION_INFO); + + switch (Type) + { + case LogoffHandler: + case ShutdownHandler: + Info.Flags = 3; + break; + + default: + Info.Flags = 0; + break; + } + + Info.UserName = NULL; //UserName; + Info.Domain = NULL; //Domain; + Info.WindowStation = pSession->InteractiveWindowStationName; + Info.hToken = pSession->UserToken; + + switch (Type) + { + case LogonHandler: + case StartShellHandler: + Info.hDesktop = pSession->ApplicationDesktop; + break; + + case StartScreenSaverHandler: + Info.hDesktop = pSession->ApplicationDesktop; + break; + + default: + Info.hDesktop = pSession->WinlogonDesktop; + break; + } + + Info.pStatusCallback = NULL; + + ListEntry = NotificationDllListHead.Flink; + while (ListEntry != &NotificationDllListHead) + { +TRACE("ListEntry %p\n", ListEntry); + + NotificationDll = CONTAINING_RECORD(ListEntry, + NOTIFICATION_ITEM, + ListEntry); +TRACE("NotificationDll: %p\n", NotificationDll); + if (NotificationDll != NULL) + { +TRACE("NotificationDll->Handler: %p\n", NotificationDll->Handler[Type]); + if (NotificationDll->Handler[Type] != NULL) + NotificationDll->Handler[Type](&Info); + } + + ListEntry = ListEntry->Flink; + } +} + + +VOID CleanupNotifications(VOID) { PLIST_ENTRY ListEntry; @@ -217,14 +269,14 @@ ListEntry); if (NotificationDll != NULL) { - - - + FreeLibrary(NotificationDll->hInstance); } ListEntry = ListEntry->Flink; RemoveEntryList(&NotificationDll->ListEntry); + + RtlFreeHeap(RtlGetProcessHeap(), 0, NotificationDll); } } Modified: trunk/reactos/base/system/winlogon/sas.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/sas.c… ============================================================================== --- trunk/reactos/base/system/winlogon/sas.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/sas.c [iso-8859-1] Sun Aug 23 15:48:52 2015 @@ -446,6 +446,8 @@ goto cleanup; } + CallNotificationDlls(Session, LogonHandler); + DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_APPLYINGYOURPERSONALSETTINGS); UpdatePerUserSystemParameters(0, TRUE); @@ -464,6 +466,8 @@ //MessageBoxW(0, StatusMsg, NULL, MB_ICONERROR); goto cleanup; } + + CallNotificationDlls(Session, StartShellHandler); if (!InitializeScreenSaver(Session)) WARN("WL: Failed to initialize screen saver\n"); @@ -783,10 +787,14 @@ DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_SAVEYOURSETTINGS); UnloadUserProfile(Session->UserToken, Session->hProfileInfo); + + CallNotificationDlls(Session, LogoffHandler); + CloseHandle(Session->UserToken); UpdatePerUserSystemParameters(0, FALSE); Session->LogonState = STATE_LOGGED_OFF; Session->UserToken = NULL; + return STATUS_SUCCESS; } @@ -894,6 +902,8 @@ return STATUS_UNSUCCESSFUL; } + CallNotificationDlls(Session, ShutdownHandler); + /* Destroy SAS window */ UninitializeSAS(Session); @@ -932,6 +942,7 @@ if (!HandleLogon(Session)) { Session->Gina.Functions.WlxDisplaySASNotice(Session->Gina.Context); + CallNotificationDlls(Session, LogonHandler); } } break; @@ -957,6 +968,7 @@ SwitchDesktop(Session->WinlogonDesktop); Session->LogonState = STATE_LOCKED; Session->Gina.Functions.WlxDisplayLockedNotice(Session->Gina.Context); + CallNotificationDlls(Session, LockHandler); } break; case WLX_SAS_ACTION_LOGOFF: /* 0x04 */ @@ -999,6 +1011,7 @@ case WLX_SAS_ACTION_UNLOCK_WKSTA: /* 0x08 */ SwitchDesktop(Session->ApplicationDesktop); Session->LogonState = STATE_LOGGED_ON; + CallNotificationDlls(Session, UnlockHandler); break; default: WARN("Unknown SAS action 0x%lx\n", wlxAction); Modified: trunk/reactos/base/system/winlogon/screensaver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/scree… ============================================================================== --- trunk/reactos/base/system/winlogon/screensaver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/screensaver.c [iso-8859-1] Sun Aug 23 15:48:52 2015 @@ -348,6 +348,8 @@ SystemParametersInfoW(SPI_SETSCREENSAVERRUNNING, TRUE, NULL, 0); + CallNotificationDlls(Session, StartScreenSaverHandler); + /* Wait the end of the process or some other activity */ ResetEvent(Session->hUserActivity); HandleArray[0] = ProcessInformation.hProcess; @@ -363,6 +365,8 @@ CloseHandle(ProcessInformation.hProcess); + CallNotificationDlls(Session, StopScreenSaverHandler); + cleanup: RevertToSelf(); if (hKey) Modified: trunk/reactos/base/system/winlogon/winlogon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo… ============================================================================== --- trunk/reactos/base/system/winlogon/winlogon.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/winlogon.c [iso-8859-1] Sun Aug 23 15:48:52 2015 @@ -434,6 +434,8 @@ } #endif + CallNotificationDlls(WLSession, StartupHandler); + /* Create a hidden window to get SAS notifications */ if (!InitializeSAS(WLSession)) { Modified: trunk/reactos/base/system/winlogon/winlogon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo… ============================================================================== --- trunk/reactos/base/system/winlogon/winlogon.h [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/winlogon.h [iso-8859-1] Sun Aug 23 15:48:52 2015 @@ -240,6 +240,23 @@ WLX_PROFILE_V2_0 *Profile; } WLSESSION, *PWLSESSION; +typedef enum _NOTIFICATION_TYPE +{ + LogonHandler, + LogoffHandler, + LockHandler, + UnlockHandler, + StartupHandler, + ShutdownHandler, + StartScreenSaverHandler, + StopScreenSaverHandler, + DisconnectHandler, + ReconnectHandler, + StartShellHandler, + PostShellHandler, + LastHandler +} NOTIFICATION_TYPE, *PNOTIFICATION_TYPE; + extern HINSTANCE hAppInstance; extern PWLSESSION WLSession; @@ -265,6 +282,11 @@ VOID CleanupNotifications(VOID); + +VOID +CallNotificationDlls( + PWLSESSION pSession, + NOTIFICATION_TYPE Type); /* rpcserver.c */ BOOL

1 0

[pschweitzer] 68802: [HACKSSIGN] Simplify the hackssign application usage. You don't need anymore to specify which VM type you use. The client will attempt to discover it by looking at available sh...
by pschweitzer＠svn.reactos.org 23 Aug '15

23 Aug '15

Author: pschweitzer Date: Sun Aug 23 10:35:52 2015 New Revision: 68802 URL: http://svn.reactos.org/svn/reactos?rev=68802&view=rev Log: [HACKSSIGN] Simplify the hackssign application usage. You don't need anymore to specify which VM type you use. The client will attempt to discover it by looking at available shared folders providers. If it recognizes one, it will perform the assignation. No Guest Additions/Tools installed will make the tool refuse to assign a drive letter (obviously). So basically, you just need to issue some: hackssign assign z ReactOS (for example) Modified: trunk/rosapps/applications/cmdutils/hackssign/client.c Modified: trunk/rosapps/applications/cmdutils/hackssign/client.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/hack… ============================================================================== --- trunk/rosapps/applications/cmdutils/hackssign/client.c [iso-8859-1] (original) +++ trunk/rosapps/applications/cmdutils/hackssign/client.c [iso-8859-1] Sun Aug 23 10:35:52 2015 @@ -19,9 +19,55 @@ vmVirtualBox, vmMax, } HV_TYPES; -PCWSTR hV[] = { L"vmware", L"virtualbox" }; +typedef BOOL (*HV_DET)(void); +BOOL isVMware(void) +{ + HANDLE dev = CreateFile(L"\\\\.\\hgfs", + GENERIC_READ | GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, 0, NULL); + if (dev != INVALID_HANDLE_VALUE) + { + wprintf(L"VMware detected\n"); + CloseHandle(dev); + return TRUE; + } + + return FALSE; +} +BOOL isVBox(void) +{ + HANDLE dev = CreateFile(L"\\\\.\\VBoxMiniRdrDN", + GENERIC_READ | GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, 0, NULL); + if (dev != INVALID_HANDLE_VALUE) + { + wprintf(L"VirtualBox detected\n"); + CloseHandle(dev); + return TRUE; + } + + return FALSE; +} PCWSTR dev[] = { L"\\Device\\hgfs\\;", L"\\Device\\VBoxMiniRdr\\;" }; PCWSTR unc[] = { L":\\vmware-host\\Shared Folders\\", L":\\vboxsvr\\" }; +HV_DET det[] = { isVMware, isVBox }; + +HV_TYPES detectVM(void) +{ + HV_TYPES vm; + + for (vm = vmVMware; vm < vmMax; ++vm) + { + if (det[vm]() == TRUE) + { + break; + } + } + + return vm; +} BOOL performDevIoCtl(DWORD dwIoControlCode, LPVOID lpInBuffer, DWORD nInBufferSize) { @@ -117,7 +163,7 @@ return TRUE; } -int assignLetter(WCHAR letter, PCWSTR path, PCWSTR device) +int assignLetter(WCHAR letter, PCWSTR path) { BOOL ret; DWORD len; @@ -127,13 +173,7 @@ DWORD inputBufferSize; PASSIGN_INPUT inputBuffer; - for (vm = vmVMware; vm < vmMax; ++vm) - { - if (_wcsicmp(device, hV[vm]) == 0) - { - break; - } - } + vm = detectVM(); if (vm == vmMax) { wprintf(L"Unsupported VM type\n"); @@ -221,19 +261,33 @@ return (performDevIoCtl(FSCTL_HACKSSIGN_DELETE, &capsLetter, sizeof(WCHAR)) == FALSE); } +int detect(void) +{ + HV_TYPES vm; + + vm = detectVM(); + if (vm == vmMax) + { + wprintf(L"Unsupported VM type\n"); + return 1; + } + + return 0; +} + void printUsage(void) { wprintf(L"ReactOS Hackssign application\n"); - wprintf(L"\assign <letter> <share name> <vmtype>: Assign a drive letter to the share given the VM type\n"); - wprintf(L"\t\tVM types are: vmware or virtual\n"); + wprintf(L"\assign <letter> <share name>: Assign a drive letter to the share\n"); wprintf(L"\tdelete <letter>: delete driver letter assignation\n"); + wprintf(L"\tdetect: detect VM type\n"); } int wmain(int argc, wchar_t *argv[]) { PCWSTR cmd; - if (argc < 3) + if (argc < 2) { printUsage(); return 0; @@ -243,17 +297,27 @@ if (_wcsicmp(cmd, L"assign") == 0) { - if (argc < 5) + if (argc < 4) { printUsage(); return 0; } - return assignLetter(argv[2][0], argv[3], argv[4]); + return assignLetter(argv[2][0], argv[3]); } else if (_wcsicmp(cmd, L"delete") == 0) { + if (argc < 3) + { + printUsage(); + return 0; + } + return deleteLetter(argv[2][0]); + } + else if (_wcsicmp(cmd, L"detect") == 0) + { + return detect(); } else {

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs