Ros-diffs August 2015

ros-diffs@reactos.org

15 participants
301 discussions

[aandrejevic] 68815: [FAST486] If FAST486_PREFIX_SEG is set, we're supposed to use the override segment instead of DS, and not the other way around.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Mon Aug 24 20:55:09 2015 New Revision: 68815 URL: http://svn.reactos.org/svn/reactos?rev=68815&view=rev Log: [FAST486] If FAST486_PREFIX_SEG is set, we're supposed to use the override segment instead of DS, and not the other way around. Modified: trunk/reactos/lib/fast486/fpu.c Modified: trunk/reactos/lib/fast486/fpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fpu.c?rev=6881… ============================================================================== --- trunk/reactos/lib/fast486/fpu.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fpu.c [iso-8859-1] Mon Aug 24 20:55:09 2015 @@ -1982,7 +1982,7 @@ { Fast486FpuLoadEnvironment(State, (State->PrefixFlags & FAST486_PREFIX_SEG) - ? FAST486_REG_DS : State->SegmentOverride, + ? State->SegmentOverride : FAST486_REG_DS, ModRegRm.MemoryAddress, OperandSize); break; @@ -2000,7 +2000,7 @@ { Fast486FpuSaveEnvironment(State, (State->PrefixFlags & FAST486_PREFIX_SEG) - ? FAST486_REG_DS : State->SegmentOverride, + ? State->SegmentOverride : FAST486_REG_DS, ModRegRm.MemoryAddress, OperandSize); break; @@ -3249,7 +3249,7 @@ /* Save the environment */ if (!Fast486FpuLoadEnvironment(State, (State->PrefixFlags & FAST486_PREFIX_SEG) - ? FAST486_REG_DS : State->SegmentOverride, + ? State->SegmentOverride : FAST486_REG_DS, ModRegRm.MemoryAddress, OperandSize)) { @@ -3260,7 +3260,7 @@ /* Load the registers */ if (!Fast486ReadMemory(State, (State->PrefixFlags & FAST486_PREFIX_SEG) - ? FAST486_REG_DS : State->SegmentOverride, + ? State->SegmentOverride : FAST486_REG_DS, ModRegRm.MemoryAddress + (OperandSize + 1) * 14, FALSE, AllRegs, @@ -3297,7 +3297,7 @@ /* Save the environment */ if (!Fast486FpuSaveEnvironment(State, (State->PrefixFlags & FAST486_PREFIX_SEG) - ? FAST486_REG_DS : State->SegmentOverride, + ? State->SegmentOverride : FAST486_REG_DS, ModRegRm.MemoryAddress, OperandSize)) { @@ -3319,7 +3319,7 @@ Fast486WriteMemory(State, (State->PrefixFlags & FAST486_PREFIX_SEG) - ? FAST486_REG_DS : State->SegmentOverride, + ? State->SegmentOverride : FAST486_REG_DS, ModRegRm.MemoryAddress + (OperandSize + 1) * 14, AllRegs, sizeof(AllRegs));

9 years, 4 months

[pschweitzer] 68814: [NTFS] Remove leftover code

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Mon Aug 24 20:40:54 2015 New Revision: 68814 URL: http://svn.reactos.org/svn/reactos?rev=68814&view=rev Log: [NTFS] Remove leftover code 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 20:40:54 2015 @@ -370,44 +370,6 @@ } -#if 0 -static VOID -NtfsGetDirEntryName(PDEVICE_EXTENSION DeviceExt, - PDIR_RECORD Record, - PWSTR Name) -/* - * FUNCTION: Retrieves the file name, be it in short or long file name format - */ -{ - if (Record->FileIdLength == 1 && Record->FileId[0] == 0) - { - wcscpy(Name, L"."); - } - else if (Record->FileIdLength == 1 && Record->FileId[0] == 1) - { - wcscpy(Name, L".."); - } - else - { - if (DeviceExt->CdInfo.JolietLevel == 0) - { - ULONG i; - - for (i = 0; i < Record->FileIdLength && Record->FileId[i] != ';'; i++) - Name[i] = (WCHAR)Record->FileId[i]; - Name[i] = 0; - } - else - { - NtfsSwapString(Name, Record->FileId, Record->FileIdLength); - } - } - - DPRINT("Name '%S'\n", Name); -} -#endif - - NTSTATUS NtfsMakeFCBFromDirEntry(PNTFS_VCB Vcb, PNTFS_FCB DirectoryFCB,

9 years, 4 months

[hbelusca] 68813: Replace LPVOID by PVOID everywhere!

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Aug 24 19:02:07 2015 New Revision: 68813 URL: http://svn.reactos.org/svn/reactos?rev=68813&view=rev Log: Replace LPVOID by PVOID everywhere! Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c [iso-8859-1] Mon Aug 24 19:02:07 2015 @@ -232,7 +232,7 @@ static HANDLE ScreenBufferHandle = NULL; -static LPVOID OldConsoleFramebuffer = NULL; +static PVOID OldConsoleFramebuffer = NULL; /*

9 years, 4 months

[hbelusca] 68812: [NTVDM] - Correctly sync ConsoleFramebuffer when we attach/detach VGA from the console (fix memory corruptions introduced by r68720). - Fix few comments in the process.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Aug 24 19:00:27 2015 New Revision: 68812 URL: http://svn.reactos.org/svn/reactos?rev=68812&view=rev Log: [NTVDM] - Correctly sync ConsoleFramebuffer when we attach/detach VGA from the console (fix memory corruptions introduced by r68720). - Fix few comments in the process. Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c [iso-8859-1] Mon Aug 24 19:00:27 2015 @@ -217,9 +217,9 @@ } CHAR_CELL, *PCHAR_CELL; C_ASSERT(sizeof(CHAR_CELL) == 2); -static LPVOID ConsoleFramebuffer = NULL; // Active framebuffer, points to - // either TextFramebuffer or a - // valid graphics framebuffer. +static PVOID ConsoleFramebuffer = NULL; // Active framebuffer, points to + // either TextFramebuffer or a + // valid graphics framebuffer. static HPALETTE TextPaletteHandle = NULL; static HPALETTE PaletteHandle = NULL; @@ -232,27 +232,31 @@ static HANDLE ScreenBufferHandle = NULL; +static LPVOID OldConsoleFramebuffer = NULL; /* * Text mode -- we always keep a valid text mode framebuffer * even if we are in graphics mode. This is needed in order - * to keep a consistent VGA state. + * to keep a consistent VGA state. However, each time the VGA + * detaches from the console (and reattaches to it later on), + * this text mode framebuffer is recreated. */ +static HANDLE TextConsoleBuffer = NULL; static CONSOLE_SCREEN_BUFFER_INFO ConsoleInfo; static COORD TextResolution = {0}; static PCHAR_CELL TextFramebuffer = NULL; -static HANDLE TextConsoleBuffer = NULL; - -/* Graphics mode */ + +/* + * Graphics mode + */ static HANDLE GraphicsConsoleBuffer = NULL; +static PVOID GraphicsFramebuffer = NULL; static HANDLE ConsoleMutex = NULL; /* DoubleVision support */ static BOOLEAN DoubleWidth = FALSE; static BOOLEAN DoubleHeight = FALSE; -static PHARDWARE_TIMER VSyncTimer; -static PHARDWARE_TIMER HSyncTimer; /* * VGA Hardware @@ -288,8 +292,10 @@ // static VGA_REGISTERS VgaRegisters; -static ULONGLONG VerticalRetraceCycle = 0ULL; +static ULONGLONG VerticalRetraceCycle = 0ULL; static ULONGLONG HorizontalRetraceCycle = 0ULL; +static PHARDWARE_TIMER VSyncTimer; +static PHARDWARE_TIMER HSyncTimer; static BOOLEAN NeedsUpdate = FALSE; static BOOLEAN ModeChanged = FALSE; @@ -950,6 +956,8 @@ static VOID VgaSetActiveScreenBuffer(HANDLE ScreenBuffer) { + ASSERT(ScreenBuffer); + /* Set the active buffer */ SetConsoleActiveScreenBuffer(ScreenBuffer); @@ -1002,7 +1010,7 @@ if (GraphicsConsoleBuffer == INVALID_HANDLE_VALUE) return FALSE; /* Save the framebuffer address and mutex */ - ConsoleFramebuffer = GraphicsBufferInfo.lpBitMap; + GraphicsFramebuffer = GraphicsBufferInfo.lpBitMap; ConsoleMutex = GraphicsBufferInfo.hMutex; /* Clear the framebuffer */ @@ -1010,6 +1018,9 @@ /* Set the active buffer */ VgaSetActiveScreenBuffer(GraphicsConsoleBuffer); + + /* The active framebuffer is now the graphics framebuffer */ + ConsoleFramebuffer = GraphicsFramebuffer; /* Set the graphics mode palette */ SetConsolePalette(GraphicsConsoleBuffer, @@ -1033,9 +1044,12 @@ /* Cleanup the video data */ CloseHandle(ConsoleMutex); ConsoleMutex = NULL; - ConsoleFramebuffer = NULL; + GraphicsFramebuffer = NULL; CloseHandle(GraphicsConsoleBuffer); GraphicsConsoleBuffer = NULL; + + /* Reset the active framebuffer */ + ConsoleFramebuffer = NULL; DoubleWidth = FALSE; DoubleHeight = FALSE; @@ -1171,8 +1185,8 @@ + ((VgaCrtcRegisters[VGA_CRTC_PRESET_ROW_SCAN_REG] >> 5) & 3); /* - * If console framebuffer is NULL, that means something went wrong - * earlier and this is the final display refresh. + * If the console framebuffer is NULL, that means something + * went wrong earlier and this is the final display refresh. */ if (ConsoleFramebuffer == NULL) return; @@ -2311,11 +2325,22 @@ return FALSE; } - /* Restore the screen state */ /* Restore the original screen buffer */ - ASSERT(ScreenBufferHandle); VgaSetActiveScreenBuffer(ScreenBufferHandle); ScreenBufferHandle = NULL; + + /* Restore the screen state */ + if (ScreenMode == TEXT_MODE) + { + /* The text mode framebuffer was recreated */ + ConsoleFramebuffer = TextFramebuffer; + } + else + { + /* The graphics mode framebuffer is unchanged */ + ConsoleFramebuffer = OldConsoleFramebuffer; + } + OldConsoleFramebuffer = NULL; return TRUE; } @@ -2331,6 +2356,10 @@ ScreenBufferHandle = TextConsoleBuffer; else ScreenBufferHandle = GraphicsConsoleBuffer; + + /* Reset the active framebuffer */ + OldConsoleFramebuffer = ConsoleFramebuffer; + ConsoleFramebuffer = NULL; /* Restore the old text-mode screen buffer */ VgaSetActiveScreenBuffer(TextConsoleBuffer);

9 years, 4 months

[pschweitzer] 68811: [NTFS] Support full data stream name on open (i.e., stream name finished with :$DATA)

by pschweitzer＠svn.reactos.org

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;

9 years, 4 months

[pschweitzer] 68810: [NTFS] Fix returned status code, spotted by Thomas

by pschweitzer＠svn.reactos.org

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)

9 years, 4 months

[pschweitzer] 68809: [NTFS] Return properly formatted stream names, according to: https://msdn.microsoft.com/en-us/library/cc232090.aspx

by pschweitzer＠svn.reactos.org

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

9 years, 4 months

[pschweitzer] 68808: [NTFS] Implement FileStreamInformation class for IRP_MJ_QUERY_INFORMATION. It allows enumerating streams for a given file

by pschweitzer＠svn.reactos.org

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

9 years, 4 months

[hbelusca] 68807: Fix few comments, no code changes.

by hbelusca＠svn.reactos.org

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

9 years, 4 months

[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

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

9 years, 4 months

← Newer
1
...
5
6
7
8
9
10
11
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2015