Ros-diffs November 2014

ros-diffs@reactos.org

18 participants
373 discussions

[pschweitzer] 65175: [USETUP] Make commented out code build (if ever uncommented ; -))

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat Nov 1 21:13:16 2014 New Revision: 65175 URL: http://svn.reactos.org/svn/reactos?rev=65175&view=rev Log: [USETUP] Make commented out code build (if ever uncommented ;-)) Modified: trunk/reactos/base/setup/usetup/interface/usetup.c Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Sat Nov 1 21:13:16 2014 @@ -2757,7 +2757,7 @@ #if 0 else if (wcscmp(FileSystemList->Selected->FileSystem, L"EXT2") == 0) { - PartEntry->PartInfo[PartNum].PartitionType = PARTITION_EXT2; + PartEntry->PartitionType = PARTITION_EXT2; DiskEntry->LayoutBuffer->PartitionEntry[PartEntry->PartitionIndex].PartitionType = PartEntry->PartitionType; } #endif

9 years, 10 months

[pschweitzer] 65174: [EXT2LIB] Whatever happened during format, always unmount the volume. This allows switching FS in usetup after formating an ext2 volume. As a record, before (read, with the Iop...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat Nov 1 21:09:10 2014 New Revision: 65174 URL: http://svn.reactos.org/svn/reactos?rev=65174&view=rev Log: [EXT2LIB] Whatever happened during format, always unmount the volume. This allows switching FS in usetup after formating an ext2 volume. As a record, before (read, with the IopParseDevice) hack, this wasn't possible and if formating with ext2 was possible, kernel would have written with either RawFS or FastFAT driver. Which is not exactly what we want ;-). But no joy guys... The Ext2Fsd needs to work in ReactOS first before we can effectively install ReactOS on ext2 volumes. In any case, that's a clear step forward :-) Modified: trunk/reactos/lib/fslib/ext2lib/Mke2fs.c Modified: trunk/reactos/lib/fslib/ext2lib/Mke2fs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/ext2lib/Mke2fs.c… ============================================================================== --- trunk/reactos/lib/fslib/ext2lib/Mke2fs.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/ext2lib/Mke2fs.c [iso-8859-1] Sat Nov 1 21:09:10 2014 @@ -987,16 +987,10 @@ ext2_free_block_bitmap(&FileSys); ext2_free_inode_bitmap(&FileSys); - if (!bRet) + if(bLocked) { Ext2DisMountVolume(&FileSys); - } - else - { - if(bLocked) - { - Ext2UnLockVolume(&FileSys); - } + Ext2UnLockVolume(&FileSys); } Ext2CloseDevice(&FileSys);

9 years, 10 months

[pschweitzer] 65173: [FASTFAT] Implement some kind of volume dismount in FastFAT (ie, implement VfatDismountVolume()) This is not fully perfect situation, but it does most of the job (+ leaking a f...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat Nov 1 20:19:52 2014 New Revision: 65173 URL: http://svn.reactos.org/svn/reactos?rev=65173&view=rev Log: [FASTFAT] Implement some kind of volume dismount in FastFAT (ie, implement VfatDismountVolume()) This is not fully perfect situation, but it does most of the job (+ leaking a few things). So far, this is not dramatic as its main use is for 1st stage. This will have to be improved later on. CORE-8732 #comment Can you retest please? Modified: trunk/reactos/drivers/filesystems/fastfat/fsctl.c Modified: trunk/reactos/drivers/filesystems/fastfat/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] Sat Nov 1 20:19:52 2014 @@ -909,18 +909,77 @@ PVFAT_IRP_CONTEXT IrpContext) { PDEVICE_EXTENSION DeviceExt; + PLIST_ENTRY NextEntry; + PVFATFCB Fcb; DPRINT1("VfatDismountVolume(%p)\n", IrpContext); DeviceExt = IrpContext->DeviceExt; + /* We HAVE to be locked. Windows also allows dismount with no lock + * but we're here mainly for 1st stage, so KISS + */ if (!(DeviceExt->Flags & VCB_VOLUME_LOCKED)) { return STATUS_ACCESS_DENIED; } - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + /* Race condition? */ + if (DeviceExt->Flags & VCB_DISMOUNT_PENDING) + { + return STATUS_VOLUME_DISMOUNTED; + } + + /* Notify we'll dismount. Pass that point there's no reason we fail */ + FsRtlNotifyVolumeEvent(IrpContext->Stack->FileObject, FSRTL_VOLUME_DISMOUNT); + + ExAcquireResourceExclusiveLite(&DeviceExt->FatResource, TRUE); + + /* Browse all the available FCBs first, and force data writing to disk */ + for (NextEntry = DeviceExt->FcbListHead.Flink; + NextEntry != &DeviceExt->FcbListHead; + NextEntry = NextEntry->Flink) + { + Fcb = CONTAINING_RECORD(NextEntry, VFATFCB, FcbListEntry); + + ExAcquireResourceExclusiveLite(&Fcb->MainResource, TRUE); + ExAcquireResourceExclusiveLite(&Fcb->PagingIoResource, TRUE); + + if (Fcb->FileObject) + { + if (Fcb->Flags & FCB_IS_DIRTY) + { + VfatUpdateEntry(Fcb); + } + + CcPurgeCacheSection(Fcb->FileObject->SectionObjectPointer, NULL, 0, FALSE); + CcUninitializeCacheMap(Fcb->FileObject, &Fcb->RFCB.FileSize, NULL); + } + + ExReleaseResourceLite(&Fcb->PagingIoResource); + ExReleaseResourceLite(&Fcb->MainResource); + } + + /* Rebrowse the FCB in order to free them now */ + while (!IsListEmpty(&DeviceExt->FcbListHead)) + { + NextEntry = RemoveHeadList(&DeviceExt->FcbListHead); + Fcb = CONTAINING_RECORD(NextEntry, VFATFCB, FcbListEntry); + vfatDestroyFCB(Fcb); + } + + /* Mark we're being dismounted */ + DeviceExt->Flags |= VCB_DISMOUNT_PENDING; + IrpContext->DeviceObject->Vpb->Flags &= ~VPB_MOUNTED; + + ExReleaseResourceLite(&DeviceExt->FatResource); + + /* Release a few resources and quit, we're done */ + ExDeleteResourceLite(&DeviceExt->DirResource); + ExDeleteResourceLite(&DeviceExt->FatResource); + ObDereferenceObject(DeviceExt->FATFileObject); + + return STATUS_SUCCESS; } /*

9 years, 10 months

[ekohl] 65172: [NET] Display user group memberships.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Nov 1 19:24:44 2014 New Revision: 65172 URL: http://svn.reactos.org/svn/reactos?rev=65172&view=rev Log: [NET] Display user group memberships. Modified: trunk/reactos/base/applications/network/net/cmdUser.c Modified: trunk/reactos/base/applications/network/net/cmdUser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/cmdUser.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/cmdUser.c [iso-8859-1] Sat Nov 1 19:24:44 2014 @@ -130,7 +130,12 @@ { PUSER_MODALS_INFO_0 pUserModals = NULL; PUSER_INFO_4 pUserInfo = NULL; + PLOCALGROUP_USERS_INFO_0 pLocalGroupInfo = NULL; + PGROUP_USERS_INFO_0 pGroupInfo = NULL; + DWORD dwLocalGroupRead, dwLocalGroupTotal; + DWORD dwGroupRead, dwGroupTotal; DWORD dwLastSet; + DWORD i; NET_API_STATUS Status; /* Modify the user */ @@ -144,6 +149,27 @@ Status = NetUserModalsGet(NULL, 0, (LPBYTE*)&pUserModals); + if (Status != NERR_Success) + goto done; + + Status = NetUserGetLocalGroups(NULL, + lpUserName, + 0, + 0, + (LPBYTE*)&pLocalGroupInfo, + MAX_PREFERRED_LENGTH, + &dwLocalGroupRead, + &dwLocalGroupTotal); + if (Status != NERR_Success) + goto done; + + Status = NetUserGetGroups(NULL, + lpUserName, + 0, + (LPBYTE*)&pGroupInfo, + MAX_PREFERRED_LENGTH, + &dwGroupRead, + &dwGroupTotal); if (Status != NERR_Success) goto done; @@ -188,12 +214,49 @@ else PrintDateTime(pUserInfo->usri4_last_logon); PrintToConsole(L"\n"); - PrintToConsole(L"Logon hours allowed \n"); + PrintToConsole(L"Logon hours allowed "); + if (pUserInfo->usri4_logon_hours == NULL) + PrintToConsole(L"All\n"); PrintToConsole(L"\n"); - PrintToConsole(L"Local group memberships \n"); - PrintToConsole(L"Global group memberships \n"); + + PrintToConsole(L"\n"); + PrintToConsole(L"Local group memberships "); + if (dwLocalGroupTotal != 0 && pLocalGroupInfo != NULL) + { + for (i = 0; i < dwLocalGroupTotal; i++) + { + if (i != 0) + PrintToConsole(L" "); + PrintToConsole(L"*%s\n", pLocalGroupInfo[i].lgrui0_name); + } + } + else + { + PrintToConsole(L"\n"); + } + + PrintToConsole(L"Global group memberships "); + if (dwGroupTotal != 0 && pGroupInfo != NULL) + { + for (i = 0; i < dwGroupTotal; i++) + { + if (i != 0) + PrintToConsole(L" "); + PrintToConsole(L"*%s\n", pGroupInfo[i].grui0_name); + } + } + else + { + PrintToConsole(L"\n"); + } done: + if (pGroupInfo != NULL) + NetApiBufferFree(pGroupInfo); + + if (pLocalGroupInfo != NULL) + NetApiBufferFree(pLocalGroupInfo); + if (pUserModals != NULL) NetApiBufferFree(pUserModals);

9 years, 10 months

[tfaber] 65171: [FASTFAT] - The volume FCB is not reference counted, so don't dereference it on close.

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Nov 1 18:00:15 2014 New Revision: 65171 URL: http://svn.reactos.org/svn/reactos?rev=65171&view=rev Log: [FASTFAT] - The volume FCB is not reference counted, so don't dereference it on close. Modified: trunk/reactos/drivers/filesystems/fastfat/close.c trunk/reactos/drivers/filesystems/fastfat/fcb.c Modified: trunk/reactos/drivers/filesystems/fastfat/close.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/close.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/close.c [iso-8859-1] Sat Nov 1 18:00:15 2014 @@ -42,7 +42,6 @@ if (pFcb->Flags & FCB_IS_VOLUME) { DPRINT1("Volume\n"); - pFcb->RefCount--; FileObject->FsContext2 = NULL; } else Modified: trunk/reactos/drivers/filesystems/fastfat/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/fcb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/fcb.c [iso-8859-1] Sat Nov 1 18:00:15 2014 @@ -294,6 +294,7 @@ { ASSERT(ExIsResourceAcquiredExclusive(&pVCB->DirResource)); + ASSERT(pFCB != pVCB->VolumeFcb); ++pFCB->RefCount; } @@ -311,6 +312,7 @@ while (pFCB) { + ASSERT(pFCB != pVCB->VolumeFcb); pFCB->RefCount--; if (pFCB->RefCount == 0) {

9 years, 10 months

[hbelusca] 65170: [BASESRV] - Correctly set the VdmPower flag when the process being started is a NT VDM - Return a correct status code if VDM access is forbidden.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Nov 1 17:51:39 2014 New Revision: 65170 URL: http://svn.reactos.org/svn/reactos?rev=65170&view=rev Log: [BASESRV] - Correctly set the VdmPower flag when the process being started is a NT VDM - Return a correct status code if VDM access is forbidden. Modified: trunk/reactos/subsystems/win/basesrv/proc.c trunk/reactos/subsystems/win/basesrv/vdm.c Modified: trunk/reactos/subsystems/win/basesrv/proc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win/basesrv/pro… ============================================================================== --- trunk/reactos/subsystems/win/basesrv/proc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win/basesrv/proc.c [iso-8859-1] Sat Nov 1 17:51:39 2014 @@ -71,7 +71,7 @@ HANDLE ProcessHandle, ThreadHandle; PCSR_THREAD CsrThread; PCSR_PROCESS Process; - ULONG Flags = 0, VdmPower = 0, DebugFlags = 0; + ULONG Flags = 0, DebugFlags = 0, VdmPower = 0; /* Get the current client thread */ CsrThread = CsrGetClientThread(); @@ -82,6 +82,13 @@ /* Extract the flags out of the process handle */ Flags = (ULONG_PTR)CreateProcessRequest->ProcessHandle & 3; CreateProcessRequest->ProcessHandle = (HANDLE)((ULONG_PTR)CreateProcessRequest->ProcessHandle & ~3); + + /* Some things should be done if this is a VDM process */ + if (CreateProcessRequest->VdmBinaryType) + { + /* We need to set the VDM power later on */ + VdmPower = 1; + } /* Duplicate the process handle */ Status = NtDuplicateObject(Process->ProcessHandle, @@ -112,10 +119,9 @@ return Status; } - /* See if this is a VDM process */ + /* If this is a VDM process, request VDM power */ if (VdmPower) { - /* Request VDM powers */ Status = NtSetInformationProcess(ProcessHandle, ProcessWx86Information, &VdmPower, Modified: trunk/reactos/subsystems/win/basesrv/vdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win/basesrv/vdm… ============================================================================== --- trunk/reactos/subsystems/win/basesrv/vdm.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win/basesrv/vdm.c [iso-8859-1] Sat Nov 1 17:51:39 2014 @@ -576,7 +576,7 @@ BOOLEAN NewConsoleRecord = FALSE; /* Don't do anything if the VDM has been disabled in the registry */ - if (!BaseSrvIsVdmAllowed()) return STATUS_ACCESS_DENIED; + if (!BaseSrvIsVdmAllowed()) return STATUS_VDM_DISALLOWED; /* Validate the message buffers */ if (!CsrValidateMessageBuffer(ApiMessage,

9 years, 10 months

[hbelusca] 65169: [KERNEL32] - Mark almost all of the exported console APIs hotpatchable (normally on windows 2k3, all the exports of kernel32 are hotpatchable...) - Version check mismatch is not a...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Nov 1 15:35:45 2014 New Revision: 65169 URL: http://svn.reactos.org/svn/reactos?rev=65169&view=rev Log: [KERNEL32] - Mark almost all of the exported console APIs hotpatchable (normally on windows 2k3, all the exports of kernel32 are hotpatchable...) - Version check mismatch is not a ReactOS error by itself so adjust the DPRINT a bit. Modified: trunk/reactos/dll/win32/kernel32/client/console/alias.c trunk/reactos/dll/win32/kernel32/client/console/console.c trunk/reactos/dll/win32/kernel32/client/console/history.c trunk/reactos/dll/win32/kernel32/client/console/readwrite.c trunk/reactos/dll/win32/kernel32/client/console/vista.c trunk/reactos/dll/win32/kernel32/client/version.c Modified: trunk/reactos/dll/win32/kernel32/client/console/alias.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/console/alias.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/console/alias.c [iso-8859-1] Sat Nov 1 15:35:45 2014 @@ -116,6 +116,7 @@ */ BOOL WINAPI +DECLSPEC_HOTPATCH AddConsoleAliasW(LPCWSTR lpSource, LPCWSTR lpTarget, LPCWSTR lpExeName) @@ -140,6 +141,7 @@ */ BOOL WINAPI +DECLSPEC_HOTPATCH AddConsoleAliasA(LPCSTR lpSource, LPCSTR lpTarget, LPCSTR lpExeName) @@ -254,6 +256,7 @@ */ DWORD WINAPI +DECLSPEC_HOTPATCH GetConsoleAliasW(LPWSTR lpSource, LPWSTR lpTargetBuffer, DWORD TargetBufferLength, @@ -276,6 +279,7 @@ */ DWORD WINAPI +DECLSPEC_HOTPATCH GetConsoleAliasA(LPSTR lpSource, LPSTR lpTargetBuffer, DWORD TargetBufferLength, @@ -368,6 +372,7 @@ */ DWORD WINAPI +DECLSPEC_HOTPATCH GetConsoleAliasesW(LPWSTR AliasBuffer, DWORD AliasBufferLength, LPWSTR ExeName) @@ -387,6 +392,7 @@ */ DWORD WINAPI +DECLSPEC_HOTPATCH GetConsoleAliasesA(LPSTR AliasBuffer, DWORD AliasBufferLength, LPSTR ExeName) @@ -456,6 +462,7 @@ */ DWORD WINAPI +DECLSPEC_HOTPATCH GetConsoleAliasesLengthW(LPWSTR lpExeName) { return IntGetConsoleAliasesLength(lpExeName, TRUE); @@ -467,6 +474,7 @@ */ DWORD WINAPI +DECLSPEC_HOTPATCH GetConsoleAliasesLengthA(LPSTR lpExeName) { return IntGetConsoleAliasesLength(lpExeName, FALSE); @@ -523,6 +531,7 @@ */ DWORD WINAPI +DECLSPEC_HOTPATCH GetConsoleAliasExesW(LPWSTR lpExeNameBuffer, DWORD ExeNameBufferLength) { @@ -536,6 +545,7 @@ */ DWORD WINAPI +DECLSPEC_HOTPATCH GetConsoleAliasExesA(LPSTR lpExeNameBuffer, DWORD ExeNameBufferLength) { @@ -572,6 +582,7 @@ */ DWORD WINAPI +DECLSPEC_HOTPATCH GetConsoleAliasExesLengthW(VOID) { DPRINT1("GetConsoleAliasExesLengthW called\n"); @@ -584,6 +595,7 @@ */ DWORD WINAPI +DECLSPEC_HOTPATCH GetConsoleAliasExesLengthA(VOID) { DPRINT1("GetConsoleAliasExesLengthA called\n"); Modified: trunk/reactos/dll/win32/kernel32/client/console/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/console/console.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/console/console.c [iso-8859-1] Sat Nov 1 15:35:45 2014 @@ -392,6 +392,7 @@ */ HMENU WINAPI +DECLSPEC_HOTPATCH ConsoleMenuControl(HANDLE hConsoleOutput, DWORD dwCmdIdLow, DWORD dwCmdIdHigh) @@ -419,6 +420,7 @@ */ HANDLE WINAPI +DECLSPEC_HOTPATCH DuplicateConsoleHandle(HANDLE hConsole, DWORD dwDesiredAccess, BOOL bInheritHandle, @@ -571,6 +573,7 @@ */ COORD WINAPI +DECLSPEC_HOTPATCH GetConsoleFontSize(HANDLE hConsoleOutput, DWORD nFont) { @@ -652,6 +655,7 @@ */ ULONG WINAPI +DECLSPEC_HOTPATCH GetNumberOfConsoleFonts(VOID) { DPRINT1("GetNumberOfConsoleFonts() UNIMPLEMENTED!\n"); @@ -757,6 +761,7 @@ */ BOOL WINAPI +DECLSPEC_HOTPATCH SetConsoleCursor(HANDLE hConsoleOutput, HCURSOR hCursor) { @@ -822,6 +827,7 @@ */ BOOL WINAPI +DECLSPEC_HOTPATCH SetConsoleFont(HANDLE hConsoleOutput, DWORD nFont) { @@ -869,6 +875,7 @@ */ BOOL WINAPI +DECLSPEC_HOTPATCH SetConsoleKeyShortcuts(DWORD Unknown0, DWORD Unknown1, DWORD Unknown2, @@ -901,6 +908,7 @@ */ BOOL WINAPI +DECLSPEC_HOTPATCH SetConsoleMenuClose(BOOL bEnable) { CONSOLE_API_MESSAGE ApiMessage; @@ -930,6 +938,7 @@ */ BOOL WINAPI +DECLSPEC_HOTPATCH SetConsolePalette(HANDLE hConsoleOutput, HPALETTE hPalette, UINT dwUsage) @@ -961,6 +970,7 @@ */ INT WINAPI +DECLSPEC_HOTPATCH ShowConsoleCursor(HANDLE hConsoleOutput, BOOL bShow) { @@ -997,6 +1007,7 @@ */ BOOL WINAPI +DECLSPEC_HOTPATCH VerifyConsoleIoHandle(HANDLE hIoHandle) { CONSOLE_API_MESSAGE ApiMessage; @@ -1028,6 +1039,7 @@ */ BOOL WINAPI +DECLSPEC_HOTPATCH CloseConsoleHandle(HANDLE hHandle) { CONSOLE_API_MESSAGE ApiMessage; @@ -1055,6 +1067,7 @@ */ HANDLE WINAPI +DECLSPEC_HOTPATCH GetStdHandle(DWORD nStdHandle) /* * FUNCTION: Get a handle for the standard input, standard output @@ -1097,6 +1110,7 @@ */ BOOL WINAPI +DECLSPEC_HOTPATCH SetStdHandle(DWORD nStdHandle, HANDLE hHandle) /* @@ -1249,6 +1263,7 @@ BOOL WINAPI +DECLSPEC_HOTPATCH AllocConsole(VOID) { BOOL Success; @@ -1331,6 +1346,7 @@ */ BOOL WINAPI +DECLSPEC_HOTPATCH FreeConsole(VOID) { CONSOLE_API_MESSAGE ApiMessage; @@ -1419,6 +1435,7 @@ */ BOOL WINAPI +DECLSPEC_HOTPATCH SetConsoleCursorPosition(HANDLE hConsoleOutput, COORD dwCursorPosition) { @@ -1484,6 +1501,7 @@ */ BOOL WINAPI +DECLSPEC_HOTPATCH SetConsoleMode(HANDLE hConsoleHandle, DWORD dwMode) { @@ -1550,6 +1568,7 @@ */ COORD WINAPI +DECLSPEC_HOTPATCH GetLargestConsoleWindowSize(HANDLE hConsoleOutput) { CONSOLE_API_MESSAGE ApiMessage; @@ -1675,6 +1694,7 @@ */ BOOL WINAPI +DECLSPEC_HOTPATCH SetConsoleActiveScreenBuffer(HANDLE hConsoleOutput) { CONSOLE_API_MESSAGE ApiMessage; @@ -1702,6 +1722,7 @@ */ BOOL WINAPI +DECLSPEC_HOTPATCH FlushConsoleInputBuffer(HANDLE hConsoleInput) { CONSOLE_API_MESSAGE ApiMessage; @@ -1729,6 +1750,7 @@ */ BOOL WINAPI +DECLSPEC_HOTPATCH SetConsoleScreenBufferSize(HANDLE hConsoleOutput, COORD dwSize) { @@ -1802,6 +1824,7 @@ */ BOOL WINAPI +DECLSPEC_HOTPATCH ScrollConsoleScreenBufferA(HANDLE hConsoleOutput, CONST SMALL_RECT* lpScrollRectangle, CONST SMALL_RECT* lpClipRectangle, @@ -1822,6 +1845,7 @@ */ BOOL WINAPI +DECLSPEC_HOTPATCH ScrollConsoleScreenBufferW(HANDLE hConsoleOutput, CONST SMALL_RECT *lpScrollRectangle, CONST SMALL_RECT *lpClipRectangle, @@ -1879,6 +1903,7 @@ */ BOOL WINAPI +DECLSPEC_HOTPATCH SetConsoleTextAttribute(HANDLE hConsoleOutput, WORD wAttributes) { @@ -1979,6 +2004,7 @@ */ BOOL WINAPI +DECLSPEC_HOTPATCH SetConsoleCtrlHandler(PHANDLER_ROUTINE HandlerRoutine, BOOL Add) { @@ -2004,6 +2030,7 @@ */ BOOL WINAPI +DECLSPEC_HOTPATCH GenerateConsoleCtrlEvent(DWORD dwCtrlEvent, DWORD dwProcessGroupId) { @@ -2093,6 +2120,7 @@ */ DWORD WINAPI +DECLSPEC_HOTPATCH GetConsoleTitleW(LPWSTR lpConsoleTitle, DWORD nSize) { @@ -2105,6 +2133,7 @@ */ DWORD WINAPI +DECLSPEC_HOTPATCH GetConsoleTitleA(LPSTR lpConsoleTitle, DWORD nSize) { @@ -2159,6 +2188,7 @@ */ BOOL WINAPI +DECLSPEC_HOTPATCH SetConsoleTitleW(LPCWSTR lpConsoleTitle) { return IntSetConsoleTitle(lpConsoleTitle, TRUE); @@ -2170,6 +2200,7 @@ */ BOOL WINAPI +DECLSPEC_HOTPATCH SetConsoleTitleA(LPCSTR lpConsoleTitle) { return IntSetConsoleTitle(lpConsoleTitle, FALSE); @@ -2258,6 +2289,7 @@ */ UINT WINAPI +DECLSPEC_HOTPATCH GetConsoleCP(VOID) { CONSOLE_API_MESSAGE ApiMessage; @@ -2286,6 +2318,7 @@ */ BOOL WINAPI +DECLSPEC_HOTPATCH SetConsoleCP(UINT wCodePageID) { CONSOLE_API_MESSAGE ApiMessage; @@ -2316,6 +2349,7 @@ */ UINT WINAPI +DECLSPEC_HOTPATCH GetConsoleOutputCP(VOID) { CONSOLE_API_MESSAGE ApiMessage; @@ -2344,6 +2378,7 @@ */ BOOL WINAPI +DECLSPEC_HOTPATCH SetConsoleOutputCP(UINT wCodePageID) { CONSOLE_API_MESSAGE ApiMessage; @@ -2594,6 +2629,7 @@ */ HWND WINAPI +DECLSPEC_HOTPATCH GetConsoleWindow(VOID) { CONSOLE_API_MESSAGE ApiMessage; @@ -2620,6 +2656,7 @@ */ BOOL WINAPI +DECLSPEC_HOTPATCH SetConsoleIcon(HICON hIcon) { CONSOLE_API_MESSAGE ApiMessage; @@ -2652,6 +2689,7 @@ */ BOOL WINAPI +DECLSPEC_HOTPATCH SetConsoleInputExeNameW(IN LPWSTR lpExeName) { DWORD ExeLength; @@ -2691,6 +2729,7 @@ */ BOOL WINAPI +DECLSPEC_HOTPATCH SetConsoleInputExeNameA(IN LPSTR lpExeName) { NTSTATUS Status; @@ -2766,6 +2805,7 @@ */ DWORD WINAPI +DECLSPEC_HOTPATCH GetConsoleInputExeNameW(IN DWORD nBufferLength, OUT LPWSTR lpExeName) { @@ -2804,6 +2844,7 @@ */ DWORD WINAPI +DECLSPEC_HOTPATCH GetConsoleInputExeNameA(IN DWORD nBufferLength, OUT LPSTR lpExeName) { @@ -2850,6 +2891,7 @@ BOOL WINAPI +DECLSPEC_HOTPATCH GetConsoleCursorMode(HANDLE hConsole, PBOOL pUnknown1, PBOOL pUnknown2) { STUB; @@ -2858,6 +2900,7 @@ BOOL WINAPI +DECLSPEC_HOTPATCH SetConsoleCursorMode(HANDLE hConsole, BOOL Unknown1, BOOL Unknown2) { STUB; @@ -2866,6 +2909,7 @@ BOOL WINAPI +DECLSPEC_HOTPATCH GetConsoleNlsMode(HANDLE hConsole, LPDWORD lpMode) { STUB; @@ -2874,6 +2918,7 @@ BOOL WINAPI +DECLSPEC_HOTPATCH SetConsoleNlsMode(HANDLE hConsole, DWORD dwMode) { STUB; @@ -2882,6 +2927,7 @@ BOOL WINAPI +DECLSPEC_HOTPATCH SetConsoleLocalEUDC(DWORD Unknown1, DWORD Unknown2, DWORD Unknown3, DWORD Unknown4) { STUB; @@ -2890,6 +2936,7 @@ BOOL WINAPI +DECLSPEC_HOTPATCH RegisterConsoleIME(HWND hWnd, LPDWORD ThreadId) { STUB; @@ -2898,6 +2945,7 @@ BOOL WINAPI +DECLSPEC_HOTPATCH RegisterConsoleOS2(BOOL bUnknown) { STUB; @@ -2906,6 +2954,7 @@ BOOL WINAPI +DECLSPEC_HOTPATCH SetConsoleOS2OemFormat(BOOL bUnknown) { STUB; @@ -2914,6 +2963,7 @@ BOOL WINAPI +DECLSPEC_HOTPATCH UnregisterConsoleIME(VOID) { STUB; @@ -2921,6 +2971,7 @@ } +static BOOL IntGetConsoleKeyboardLayoutName(OUT PVOID pszLayoutName, IN BOOL bAnsi) @@ -2969,6 +3020,7 @@ */ BOOL WINAPI +DECLSPEC_HOTPATCH GetConsoleKeyboardLayoutNameA(OUT LPSTR pszLayoutName) { return IntGetConsoleKeyboardLayoutName(pszLayoutName, TRUE); @@ -2979,6 +3031,7 @@ */ BOOL WINAPI +DECLSPEC_HOTPATCH GetConsoleKeyboardLayoutNameW(OUT LPWSTR pszLayoutName) { return IntGetConsoleKeyboardLayoutName(pszLayoutName, FALSE); Modified: trunk/reactos/dll/win32/kernel32/client/console/history.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/console/history.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/console/history.c [iso-8859-1] Sat Nov 1 15:35:45 2014 @@ -246,6 +246,7 @@ */ VOID WINAPI +DECLSPEC_HOTPATCH ExpungeConsoleCommandHistoryW(LPCWSTR lpExeName) { IntExpungeConsoleCommandHistory(lpExeName, TRUE); @@ -257,6 +258,7 @@ */ VOID WINAPI +DECLSPEC_HOTPATCH ExpungeConsoleCommandHistoryA(LPCSTR lpExeName) { IntExpungeConsoleCommandHistory(lpExeName, FALSE); @@ -268,6 +270,7 @@ */ DWORD WINAPI +DECLSPEC_HOTPATCH GetConsoleCommandHistoryW(LPWSTR lpHistory, DWORD cbHistory, LPCWSTR lpExeName) @@ -281,6 +284,7 @@ */ DWORD WINAPI +DECLSPEC_HOTPATCH GetConsoleCommandHistoryA(LPSTR lpHistory, DWORD cbHistory, LPCSTR lpExeName) @@ -294,6 +298,7 @@ */ DWORD WINAPI +DECLSPEC_HOTPATCH GetConsoleCommandHistoryLengthW(LPCWSTR lpExeName) { return IntGetConsoleCommandHistoryLength(lpExeName, TRUE); @@ -305,6 +310,7 @@ */ DWORD WINAPI +DECLSPEC_HOTPATCH GetConsoleCommandHistoryLengthA(LPCSTR lpExeName) { return IntGetConsoleCommandHistoryLength(lpExeName, FALSE); @@ -316,6 +322,7 @@ */ BOOL WINAPI +DECLSPEC_HOTPATCH SetConsoleNumberOfCommandsW(DWORD dwNumCommands, LPCWSTR lpExeName) { @@ -328,6 +335,7 @@ */ BOOL WINAPI +DECLSPEC_HOTPATCH SetConsoleNumberOfCommandsA(DWORD dwNumCommands, LPCSTR lpExeName) { @@ -340,6 +348,7 @@ */ BOOL WINAPI +DECLSPEC_HOTPATCH SetConsoleCommandHistoryMode(IN DWORD dwMode) { CONSOLE_API_MESSAGE ApiMessage; Modified: trunk/reactos/dll/win32/kernel32/client/console/readwrite.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/console/readwrite.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/console/readwrite.c [iso-8859-1] Sat Nov 1 15:35:45 2014 @@ -1172,6 +1172,7 @@ */ BOOL WINAPI +DECLSPEC_HOTPATCH ReadConsoleW(IN HANDLE hConsoleInput, OUT LPVOID lpBuffer, IN DWORD nNumberOfCharsToRead, @@ -1192,6 +1193,7 @@ */ BOOL WINAPI +DECLSPEC_HOTPATCH ReadConsoleA(IN HANDLE hConsoleInput, OUT LPVOID lpBuffer, IN DWORD nNumberOfCharsToRead, @@ -1212,6 +1214,7 @@ */ BOOL WINAPI +DECLSPEC_HOTPATCH PeekConsoleInputW(IN HANDLE hConsoleInput, OUT PINPUT_RECORD lpBuffer, IN DWORD nLength, @@ -1231,6 +1234,7 @@ */ BOOL WINAPI +DECLSPEC_HOTPATCH PeekConsoleInputA(IN HANDLE hConsoleInput, OUT PINPUT_RECORD lpBuffer, IN DWORD nLength, @@ -1250,6 +1254,7 @@ */ BOOL WINAPI +DECLSPEC_HOTPATCH ReadConsoleInputW(IN HANDLE hConsoleInput, OUT PINPUT_RECORD lpBuffer, IN DWORD nLength, @@ -1269,6 +1274,7 @@ */ BOOL WINAPI +DECLSPEC_HOTPATCH ReadConsoleInputA(IN HANDLE hConsoleInput, OUT PINPUT_RECORD lpBuffer, IN DWORD nLength, @@ -1288,6 +1294,7 @@ */ BOOL WINAPI +DECLSPEC_HOTPATCH ReadConsoleInputExW(IN HANDLE hConsoleInput, OUT PINPUT_RECORD lpBuffer, IN DWORD nLength, @@ -1308,6 +1315,7 @@ */ BOOL WINAPI +DECLSPEC_HOTPATCH ReadConsoleInputExA(IN HANDLE hConsoleInput, OUT PINPUT_RECORD lpBuffer, IN DWORD nLength, @@ -1328,6 +1336,7 @@ */ BOOL WINAPI +DECLSPEC_HOTPATCH ReadConsoleOutputW(IN HANDLE hConsoleOutput, OUT PCHAR_INFO lpBuffer, IN COORD dwBufferSize, @@ -1348,6 +1357,7 @@ */ BOOL WINAPI +DECLSPEC_HOTPATCH ReadConsoleOutputA(IN HANDLE hConsoleOutput, OUT PCHAR_INFO lpBuffer, IN COORD dwBufferSize, @@ -1368,6 +1378,7 @@ */ BOOL WINAPI +DECLSPEC_HOTPATCH ReadConsoleOutputCharacterW(IN HANDLE hConsoleOutput, OUT LPWSTR lpCharacter, IN DWORD nLength, @@ -1388,6 +1399,7 @@ */ BOOL WINAPI +DECLSPEC_HOTPATCH ReadConsoleOutputCharacterA(IN HANDLE hConsoleOutput, OUT LPSTR lpCharacter, IN DWORD nLength, @@ -1408,6 +1420,7 @@ */ BOOL WINAPI +DECLSPEC_HOTPATCH ReadConsoleOutputAttribute(IN HANDLE hConsoleOutput, OUT LPWORD lpAttribute, IN DWORD nLength, @@ -1432,6 +1445,7 @@ */ BOOL WINAPI +DECLSPEC_HOTPATCH WriteConsoleW(IN HANDLE hConsoleOutput, IN CONST VOID *lpBuffer, IN DWORD nNumberOfCharsToWrite, @@ -1452,6 +1466,7 @@ */ BOOL WINAPI +DECLSPEC_HOTPATCH WriteConsoleA(IN HANDLE hConsoleOutput, IN CONST VOID *lpBuffer, IN DWORD nNumberOfCharsToWrite, @@ -1472,6 +1487,7 @@ */ BOOL WINAPI +DECLSPEC_HOTPATCH WriteConsoleInputW(IN HANDLE hConsoleInput, IN CONST INPUT_RECORD *lpBuffer, IN DWORD nLength, @@ -1491,6 +1507,7 @@ */ BOOL WINAPI +DECLSPEC_HOTPATCH WriteConsoleInputA(IN HANDLE hConsoleInput, IN CONST INPUT_RECORD *lpBuffer, IN DWORD nLength, @@ -1510,6 +1527,7 @@ */ BOOL WINAPI +DECLSPEC_HOTPATCH WriteConsoleInputVDMW(IN HANDLE hConsoleInput, IN CONST INPUT_RECORD *lpBuffer, IN DWORD nLength, @@ -1529,6 +1547,7 @@ */ BOOL WINAPI +DECLSPEC_HOTPATCH WriteConsoleInputVDMA(IN HANDLE hConsoleInput, IN CONST INPUT_RECORD *lpBuffer, IN DWORD nLength, @@ -1548,6 +1567,7 @@ */ BOOL WINAPI +DECLSPEC_HOTPATCH WriteConsoleOutputW(IN HANDLE hConsoleOutput, IN CONST CHAR_INFO *lpBuffer, IN COORD dwBufferSize, @@ -1568,6 +1588,7 @@ */ BOOL WINAPI +DECLSPEC_HOTPATCH WriteConsoleOutputA(IN HANDLE hConsoleOutput, IN CONST CHAR_INFO *lpBuffer, IN COORD dwBufferSize, @@ -1588,6 +1609,7 @@ */ BOOL WINAPI +DECLSPEC_HOTPATCH WriteConsoleOutputCharacterW(IN HANDLE hConsoleOutput, IN LPCWSTR lpCharacter, IN DWORD nLength, @@ -1608,6 +1630,7 @@ */ BOOL WINAPI +DECLSPEC_HOTPATCH WriteConsoleOutputCharacterA(IN HANDLE hConsoleOutput, IN LPCSTR lpCharacter, IN DWORD nLength, @@ -1628,6 +1651,7 @@ */ BOOL WINAPI +DECLSPEC_HOTPATCH WriteConsoleOutputAttribute(IN HANDLE hConsoleOutput, IN CONST WORD *lpAttribute, IN DWORD nLength, @@ -1648,6 +1672,7 @@ */ BOOL WINAPI +DECLSPEC_HOTPATCH FillConsoleOutputCharacterW(IN HANDLE hConsoleOutput, IN WCHAR cCharacter, IN DWORD nLength, @@ -1670,6 +1695,7 @@ */ BOOL WINAPI +DECLSPEC_HOTPATCH FillConsoleOutputCharacterA(IN HANDLE hConsoleOutput, IN CHAR cCharacter, IN DWORD nLength, @@ -1692,6 +1718,7 @@ */ BOOL WINAPI +DECLSPEC_HOTPATCH FillConsoleOutputAttribute(IN HANDLE hConsoleOutput, IN WORD wAttribute, IN DWORD nLength, Modified: trunk/reactos/dll/win32/kernel32/client/console/vista.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/console/vista.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/console/vista.c [iso-8859-1] Sat Nov 1 15:35:45 2014 @@ -23,6 +23,7 @@ */ BOOL WINAPI +DECLSPEC_HOTPATCH GetConsoleHistoryInfo(PCONSOLE_HISTORY_INFO lpConsoleHistoryInfo) { NTSTATUS Status; @@ -58,6 +59,7 @@ */ BOOL WINAPI +DECLSPEC_HOTPATCH SetConsoleHistoryInfo(IN PCONSOLE_HISTORY_INFO lpConsoleHistoryInfo) { NTSTATUS Status; @@ -93,6 +95,7 @@ */ DWORD WINAPI +DECLSPEC_HOTPATCH GetConsoleOriginalTitleW(OUT LPWSTR lpConsoleTitle, IN DWORD nSize) { @@ -107,6 +110,7 @@ */ DWORD WINAPI +DECLSPEC_HOTPATCH GetConsoleOriginalTitleA(OUT LPSTR lpConsoleTitle, IN DWORD nSize) { @@ -121,6 +125,7 @@ */ BOOL WINAPI +DECLSPEC_HOTPATCH GetConsoleScreenBufferInfoEx(IN HANDLE hConsoleOutput, OUT PCONSOLE_SCREEN_BUFFER_INFOEX lpConsoleScreenBufferInfoEx) { @@ -135,6 +140,7 @@ */ BOOL WINAPI +DECLSPEC_HOTPATCH SetConsoleScreenBufferInfoEx(IN HANDLE hConsoleOutput, IN PCONSOLE_SCREEN_BUFFER_INFOEX lpConsoleScreenBufferInfoEx) { @@ -149,6 +155,7 @@ */ BOOL WINAPI +DECLSPEC_HOTPATCH GetCurrentConsoleFontEx(IN HANDLE hConsoleOutput, IN BOOL bMaximumWindow, OUT PCONSOLE_FONT_INFOEX lpConsoleCurrentFontEx) Modified: trunk/reactos/dll/win32/kernel32/client/version.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/version.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/version.c [iso-8859-1] Sat Nov 1 15:35:45 2014 @@ -131,7 +131,7 @@ return FALSE; case STATUS_REVISION_MISMATCH: - DPRINT1("ReactOS returning version mismatch. Investigate!\n"); + DPRINT1("VerifyVersionInfo -- Version mismatch\n"); SetLastError(ERROR_OLD_WIN_VERSION); return FALSE;

9 years, 10 months

[khornicek] 65168: [RAPPS] - don't resize the richedit window on minimize CORE-6116

by khornicek＠svn.reactos.org

Author: khornicek Date: Sat Nov 1 12:43:45 2014 New Revision: 65168 URL: http://svn.reactos.org/svn/reactos?rev=65168&view=rev Log: [RAPPS] - don't resize the richedit window on minimize CORE-6116 Modified: trunk/reactos/base/applications/rapps/winmain.c Modified: trunk/reactos/base/applications/rapps/winmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/wi… ============================================================================== --- trunk/reactos/base/applications/rapps/winmain.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/winmain.c [iso-8859-1] Sat Nov 1 12:43:45 2014 @@ -545,11 +545,14 @@ HIWORD(lParam) - GetWindowHeight(hToolBar) - GetWindowHeight(hStatusBar), SWP_NOZORDER|SWP_NOACTIVATE); - while (NewPos < SPLIT_WIDTH + GetWindowHeight(hToolBar)) - { - RichPos--; - NewPos = HIWORD(lParam) - (RichPos + - SPLIT_WIDTH + GetWindowHeight(hStatusBar)); + if(wParam != SIZE_MINIMIZED) + { + while (NewPos < SPLIT_WIDTH + GetWindowHeight(hToolBar)) + { + RichPos--; + NewPos = HIWORD(lParam) - (RichPos + + SPLIT_WIDTH + GetWindowHeight(hStatusBar)); + } } SetHSplitterPos(NewPos);

9 years, 10 months

[ekohl] 65167: [NET] - Display workstations. - Implement the /ACTIVATE option to enable/disable user accounts.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Nov 1 12:32:01 2014 New Revision: 65167 URL: http://svn.reactos.org/svn/reactos?rev=65167&view=rev Log: [NET] - Display workstations. - Implement the /ACTIVATE option to enable/disable user accounts. Modified: trunk/reactos/base/applications/network/net/cmdUser.c Modified: trunk/reactos/base/applications/network/net/cmdUser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/cmdUser.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/cmdUser.c [iso-8859-1] Sat Nov 1 12:32:01 2014 @@ -161,7 +161,7 @@ PrintToConsole(L"\n"); - PrintToConsole(L"Password expires "); + PrintToConsole(L"Password last set "); dwLastSet = GetTimeInSeconds() - pUserInfo->usri4_password_age; PrintDateTime(dwLastSet); @@ -178,7 +178,7 @@ PrintToConsole(L"User may change password %s\n", (pUserInfo->usri4_flags & UF_PASSWD_CANT_CHANGE) ? L"No" : L"Yes"); PrintToConsole(L"\n"); - PrintToConsole(L"Workstation allowed %s\n", pUserInfo->usri4_workstations); + PrintToConsole(L"Workstations allowed %s\n", (pUserInfo->usri4_workstations == NULL || wcslen(pUserInfo->usri4_workstations) == 0) ? L"All" : pUserInfo->usri4_workstations); PrintToConsole(L"Logon script %s\n", pUserInfo->usri4_script_path); PrintToConsole(L"User profile %s\n", pUserInfo->usri4_profile); PrintToConsole(L"Home directory %s\n", pUserInfo->usri4_home_dir); @@ -288,7 +288,12 @@ lpUserName, 4, (LPBYTE*)&pUserInfo); - printf("Status: %lu\n", Status); + if (Status != NERR_Success) + { + printf("Status: %lu\n", Status); + result = 1; + goto done; + } } else if (bAdd && !bDelete) { @@ -309,11 +314,11 @@ p = &argv[i][8]; if (_wcsicmp(p, L"yes") == 0) { - + UserInfo.usri4_flags &= ~UF_ACCOUNTDISABLE; } else if (_wcsicmp(p, L"no") == 0) { - + UserInfo.usri4_flags |= UF_ACCOUNTDISABLE; } else {

9 years, 10 months

[pschweitzer] 65166: [NTFS] Simplify buffer size management in GetNtfsFileRecord(). As tests shown, Windows doesn't care about the real size of the file record and expects the caller to pass the co...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat Nov 1 10:02:08 2014 New Revision: 65166 URL: http://svn.reactos.org/svn/reactos?rev=65166&view=rev Log: [NTFS] Simplify buffer size management in GetNtfsFileRecord(). As tests shown, Windows doesn't care about the real size of the file record and expects the caller to pass the complete size of the record and returns it fully. CORE-8725 Modified: trunk/reactos/drivers/filesystems/ntfs/fsctl.c Modified: trunk/reactos/drivers/filesystems/ntfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/fsctl.c [iso-8859-1] Sat Nov 1 10:02:08 2014 @@ -608,7 +608,7 @@ return STATUS_INVALID_PARAMETER; } - if (Stack->Parameters.FileSystemControl.OutputBufferLength < sizeof(NTFS_FILE_RECORD_OUTPUT_BUFFER) || + if (Stack->Parameters.FileSystemControl.OutputBufferLength < (FIELD_OFFSET(NTFS_FILE_RECORD_OUTPUT_BUFFER, FileRecordBuffer) + DeviceExt->NtfsInfo.BytesPerFileRecord) || Irp->AssociatedIrp.SystemBuffer == NULL) { DPRINT1("Invalid output! %d %p\n", Stack->Parameters.FileSystemControl.OutputBufferLength, Irp->AssociatedIrp.SystemBuffer); @@ -634,17 +634,10 @@ return Status; } - if (Stack->Parameters.FileSystemControl.OutputBufferLength < (FIELD_OFFSET(NTFS_FILE_RECORD_OUTPUT_BUFFER, FileRecordBuffer) + FileRecord->BytesInUse)) - { - DPRINT1("Buffer too small: %lu vs %lu\n", Stack->Parameters.FileSystemControl.OutputBufferLength, FileRecord->BytesInUse); - ExFreePoolWithTag(FileRecord, TAG_NTFS); - return STATUS_BUFFER_TOO_SMALL; - } - OutputBuffer = (PNTFS_FILE_RECORD_OUTPUT_BUFFER)Irp->AssociatedIrp.SystemBuffer; OutputBuffer->FileReferenceNumber.QuadPart = MFTRecord; - OutputBuffer->FileRecordLength = FileRecord->BytesInUse; - RtlCopyMemory(OutputBuffer->FileRecordBuffer, FileRecord, FileRecord->BytesInUse); + OutputBuffer->FileRecordLength = DeviceExt->NtfsInfo.BytesPerFileRecord; + RtlCopyMemory(OutputBuffer->FileRecordBuffer, FileRecord, DeviceExt->NtfsInfo.BytesPerFileRecord); ExFreePoolWithTag(FileRecord, TAG_NTFS);

9 years, 10 months

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 November 2014