Ros-diffs October 2014

ros-diffs@reactos.org

19 participants
730 discussions

[cwittich] 64842: [cmd/help] do not call wcslen on uninitialized variable

by cwittich＠svn.reactos.org

Author: cwittich Date: Mon Oct 20 09:21:08 2014 New Revision: 64842 URL: http://svn.reactos.org/svn/reactos?rev=64842&view=rev Log: [cmd/help] do not call wcslen on uninitialized variable Modified: trunk/reactos/base/applications/cmdutils/help/help.c Modified: trunk/reactos/base/applications/cmdutils/help/help.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/help/help.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/help/help.c [iso-8859-1] Mon Oct 20 09:21:08 2014 @@ -16,6 +16,7 @@ #include <winbase.h> #include <winuser.h> #include <wincon.h> +#include <strsafe.h> #include "help.h" #include "resource.h" @@ -135,9 +136,8 @@ /* * Run "<command> /?" in the current command processor. */ - wcsncpy(CmdLine, argv[1], CMDLINE_LENGTH - wcslen(CmdLine)); - wcsncat(CmdLine, L" /?" , CMDLINE_LENGTH - wcslen(CmdLine)); - + StringCbPrintfW(CmdLine, sizeof(CmdLine), L"%ls /?", argv[1]); + _flushall(); return _wsystem(CmdLine); }

9 years, 11 months

[cwittich] 64841: [cmd] GetDateFormat expects size in characters

by cwittich＠svn.reactos.org

Author: cwittich Date: Mon Oct 20 08:47:57 2014 New Revision: 64841 URL: http://svn.reactos.org/svn/reactos?rev=64841&view=rev Log: [cmd] GetDateFormat expects size in characters Modified: trunk/reactos/base/shell/cmd/locale.c Modified: trunk/reactos/base/shell/cmd/locale.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/locale.c?re… ============================================================================== --- trunk/reactos/base/shell/cmd/locale.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/locale.c [iso-8859-1] Mon Oct 20 08:47:57 2014 @@ -62,7 +62,7 @@ INT len; GetLocalTime(&t); - len = GetDateFormat(LOCALE_USER_DEFAULT, 0, &t, _T("ddd"), szDate, sizeof szDate); + len = GetDateFormat(LOCALE_USER_DEFAULT, 0, &t, _T("ddd"), szDate, sizeof(szDate) / sizeof(szDate[0])); szDate[len - 1] = _T(' '); FormatDate(&szDate[len], &t, TRUE); return szDate;

9 years, 11 months

[tfaber] 64840: [KERNEL32] - Fix MSVC build

by tfaber＠svn.reactos.org

Author: tfaber Date: Mon Oct 20 08:30:55 2014 New Revision: 64840 URL: http://svn.reactos.org/svn/reactos?rev=64840&view=rev Log: [KERNEL32] - Fix MSVC build Modified: trunk/reactos/dll/win32/kernel32/client/file/move.c Modified: trunk/reactos/dll/win32/kernel32/client/file/move.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/move.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/move.c [iso-8859-1] Mon Oct 20 08:30:55 2014 @@ -268,13 +268,13 @@ NewPathU.Buffer = NULL; ExistingPathU.Buffer = NULL; - _SEH3_TRY + _SEH2_TRY { /* Don't allow renaming to a disk */ if (lpNewFileName && RtlIsDosDeviceName_U(lpNewFileName)) { BaseSetLastNTError(STATUS_OBJECT_NAME_COLLISION); - _SEH3_LEAVE; + _SEH2_LEAVE; } ReplaceIfExists = !!(dwFlags & MOVEFILE_REPLACE_EXISTING); @@ -283,7 +283,7 @@ if (!RtlDosPathNameToNtPathName_U(lpExistingFileName, &ExistingPathU, NULL, NULL)) { BaseSetLastNTError(STATUS_OBJECT_PATH_NOT_FOUND); - _SEH3_LEAVE; + _SEH2_LEAVE; } /* Sanitize input */ @@ -291,7 +291,7 @@ if (DelayUntilReboot && (dwFlags & MOVEFILE_CREATE_HARDLINK)) { BaseSetLastNTError(STATUS_INVALID_PARAMETER); - _SEH3_LEAVE; + _SEH2_LEAVE; } /* Unless we manage a proper opening, we'll attempt to reopen without reparse support */ @@ -324,7 +324,7 @@ else if (Status != STATUS_INVALID_PARAMETER) { BaseSetLastNTError(Status); - _SEH3_LEAVE; + _SEH2_LEAVE; } } else @@ -341,7 +341,7 @@ if (Status != STATUS_NOT_IMPLEMENTED && Status != STATUS_INVALID_PARAMETER) { BaseSetLastNTError(Status); - _SEH3_LEAVE; + _SEH2_LEAVE; } /* Not a reparse point, no need to reopen, it's fine */ @@ -368,7 +368,7 @@ if (!NT_SUCCESS(Status)) { BaseSetLastNTError(Status); - _SEH3_LEAVE; + _SEH2_LEAVE; } } @@ -381,7 +381,7 @@ else if (!RtlDosPathNameToNtPathName_U(lpNewFileName, &NewPathU, 0, 0)) { BaseSetLastNTError(STATUS_OBJECT_PATH_NOT_FOUND); - _SEH3_LEAVE; + _SEH2_LEAVE; } /* Handle postponed renaming */ @@ -394,7 +394,7 @@ if (NewBuffer == NULL) { BaseSetLastNTError(STATUS_NO_MEMORY); - _SEH3_LEAVE; + _SEH2_LEAVE; } NewBuffer[0] = L'!'; @@ -431,11 +431,11 @@ if (!NT_SUCCESS(Status)) { BaseSetLastNTError(Status); - _SEH3_LEAVE; + _SEH2_LEAVE; } Ret = TRUE; - _SEH3_LEAVE; + _SEH2_LEAVE; } /* At that point, we MUST have a source handle */ @@ -446,7 +446,7 @@ if (RenameInfo == NULL) { BaseSetLastNTError(STATUS_NO_MEMORY); - _SEH3_LEAVE; + _SEH2_LEAVE; } RtlCopyMemory(&RenameInfo->FileName, NewPathU.Buffer, NewPathU.Length); @@ -465,7 +465,7 @@ { /* If it succeed, all fine, quit */ Ret = TRUE; - _SEH3_LEAVE; + _SEH2_LEAVE; } /* If we failed for any other reason than not the same device, fail * If we failed because of different devices, only allow renaming if user allowed copy @@ -482,7 +482,7 @@ else { BaseSetLastNTError(Status); - _SEH3_LEAVE; + _SEH2_LEAVE; } } @@ -558,7 +558,7 @@ } } } - _SEH3_FINALLY + _SEH2_FINALLY { if (SourceHandle != INVALID_HANDLE_VALUE) NtClose(SourceHandle); @@ -566,7 +566,7 @@ RtlFreeHeap(RtlGetProcessHeap(), 0, ExistingPathU.Buffer); RtlFreeHeap(RtlGetProcessHeap(), 0, NewPathU.Buffer); } - _SEH3_END; + _SEH2_END; return Ret; }

9 years, 11 months

[tfaber] 64839: [NPFS] - Correctly interpret SeCreateClientSecurity return value in NpInitializeSecurity - Always charge quota when allocating client context - Specify explicit 0 tag when freeing a...

by tfaber＠svn.reactos.org

Author: tfaber Date: Mon Oct 20 08:08:50 2014 New Revision: 64839 URL: http://svn.reactos.org/svn/reactos?rev=64839&view=rev Log: [NPFS] - Correctly interpret SeCreateClientSecurity return value in NpInitializeSecurity - Always charge quota when allocating client context - Specify explicit 0 tag when freeing allocations with unknown pool tag - Misc readability fixes Modified: trunk/reactos/drivers/filesystems/npfs/create.c trunk/reactos/drivers/filesystems/npfs/secursup.c trunk/reactos/drivers/filesystems/npfs/seinfo.c Modified: trunk/reactos/drivers/filesystems/npfs/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/create.c [iso-8859-1] Mon Oct 20 08:08:50 2014 @@ -736,12 +736,12 @@ } SecurityContext = &AccessState->SubjectSecurityContext; - SeLockSubjectContext(&AccessState->SubjectSecurityContext); - - Status = SeAssignSecurity(0, + SeLockSubjectContext(SecurityContext); + + Status = SeAssignSecurity(NULL, AccessState->SecurityDescriptor, &SecurityDescriptor, - 0, + FALSE, SecurityContext, IoGetFileObjectGenericMapping(), PagedPool); @@ -756,7 +756,7 @@ Status = ObLogSecurityDescriptor(SecurityDescriptor, &CachedSecurityDescriptor, 1); - ExFreePool(SecurityDescriptor); + ExFreePoolWithTag(SecurityDescriptor, 0); if (!NT_SUCCESS(Status)) { Modified: trunk/reactos/drivers/filesystems/npfs/secursup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/s… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/secursup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/secursup.c [iso-8859-1] Mon Oct 20 08:08:50 2014 @@ -108,15 +108,19 @@ return Status; } - ClientContext = ExAllocatePoolWithTag(PagedPool, sizeof(*ClientContext), NPFS_CLIENT_SEC_CTX_TAG); + ClientContext = ExAllocatePoolWithQuotaTag(PagedPool | POOL_QUOTA_FAIL_INSTEAD_OF_RAISE, + sizeof(*ClientContext), + NPFS_CLIENT_SEC_CTX_TAG); Ccb->ClientContext = ClientContext; if (!ClientContext) return STATUS_INSUFFICIENT_RESOURCES; Status = SeCreateClientSecurity(Thread, &Ccb->ClientQos, 0, ClientContext); - if (!NT_SUCCESS(Status)) return Status; + if (!NT_SUCCESS(Status)) + { + ExFreePool(Ccb->ClientContext); + Ccb->ClientContext = NULL; + } - ExFreePool(Ccb->ClientContext); - Ccb->ClientContext = NULL; return Status; } Modified: trunk/reactos/drivers/filesystems/npfs/seinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/s… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/seinfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/seinfo.c [iso-8859-1] Mon Oct 20 08:08:50 2014 @@ -85,7 +85,8 @@ if (!NT_SUCCESS(Status)) return Status; Status = ObLogSecurityDescriptor(TempSecurityDescriptor, &NewSecurityDescriptor, 1); - ExFreePool(TempSecurityDescriptor); + ASSERT(TempSecurityDescriptor != OldSecurityDescriptor); + ExFreePoolWithTag(TempSecurityDescriptor, 0); if (!NT_SUCCESS(Status)) return Status;

9 years, 11 months

[tfaber] 64838: [AFD] - Do not pass IO_STATUS_BLOCKs when creating IRPs for asynchronous use. Fixes a use-after-free where AfdCloseSocket would cancel IRPs without actually waiting for their comple...

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Oct 19 22:12:06 2014 New Revision: 64838 URL: http://svn.reactos.org/svn/reactos?rev=64838&view=rev Log: [AFD] - Do not pass IO_STATUS_BLOCKs when creating IRPs for asynchronous use. Fixes a use-after-free where AfdCloseSocket would cancel IRPs without actually waiting for their completion, and proceed to free the FCB, which contained these IO_STATUS_BLOCKs. Note that using TdiBuildInternalDeviceControlIrp for these requests is broken in the first place, since it is intended for synchronous requests and requires a guarantee about the calling thread's lifetime. These functions (and their completion routines) should use IoAllocateIrp/IoReuseIrp/IoFreeIrp instead. However this can be fixed later; the incredibly annoying nonpaged pool corruption due to this that has been around for 10 years should be fixed with this commit. CORE-8640 #resolve Modified: trunk/reactos/drivers/network/afd/afd/bind.c trunk/reactos/drivers/network/afd/afd/connect.c trunk/reactos/drivers/network/afd/afd/listen.c trunk/reactos/drivers/network/afd/afd/main.c trunk/reactos/drivers/network/afd/afd/read.c trunk/reactos/drivers/network/afd/afd/tdi.c trunk/reactos/drivers/network/afd/afd/write.c trunk/reactos/drivers/network/afd/include/afd.h trunk/reactos/drivers/network/afd/include/tdi_proto.h Modified: trunk/reactos/drivers/network/afd/afd/bind.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/bi… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/bind.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/bind.c [iso-8859-1] Sun Oct 19 22:12:06 2014 @@ -56,7 +56,6 @@ FCB->Recv.Window, FCB->Recv.Size, FCB->AddressFrom, - &FCB->ReceiveIrp.Iosb, PacketSocketRecvComplete, FCB); Modified: trunk/reactos/drivers/network/afd/afd/connect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/co… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/connect.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/connect.c [iso-8859-1] Sun Oct 19 22:12:06 2014 @@ -286,7 +286,6 @@ TDI_RECEIVE_NORMAL, FCB->Recv.Window, FCB->Recv.Size, - &FCB->ReceiveIrp.Iosb, ReceiveComplete, FCB ); @@ -518,7 +517,6 @@ FCB->Connection.Object, FCB->ConnectCallInfo, FCB->ConnectReturnInfo, - &FCB->ConnectIrp.Iosb, StreamSocketConnectComplete, FCB ); } Modified: trunk/reactos/drivers/network/afd/afd/listen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/li… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/listen.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/listen.c [iso-8859-1] Sun Oct 19 22:12:06 2014 @@ -191,7 +191,6 @@ FCB->Connection.Object, &FCB->ListenIrp.ConnectionCallInfo, &FCB->ListenIrp.ConnectionReturnInfo, - &FCB->ListenIrp.Iosb, ListenComplete, FCB ); @@ -268,7 +267,6 @@ FCB->Connection.Object, &FCB->ListenIrp.ConnectionCallInfo, &FCB->ListenIrp.ConnectionReturnInfo, - &FCB->ListenIrp.Iosb, ListenComplete, FCB ); Modified: trunk/reactos/drivers/network/afd/afd/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/ma… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] Sun Oct 19 22:12:06 2014 @@ -662,7 +662,6 @@ FCB->Connection.Object, &FCB->DisconnectTimeout, FCB->DisconnectFlags, - &FCB->DisconnectIrp.Iosb, DisconnectComplete, FCB, FCB->ConnectCallInfo, Modified: trunk/reactos/drivers/network/afd/afd/read.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/re… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] Sun Oct 19 22:12:06 2014 @@ -46,7 +46,6 @@ TDI_RECEIVE_NORMAL, FCB->Recv.Window + FCB->Recv.Content, FCB->Recv.Size - FCB->Recv.Content, - &FCB->ReceiveIrp.Iosb, ReceiveComplete, FCB ); } @@ -691,7 +690,6 @@ FCB->Recv.Window, FCB->Recv.Size, FCB->AddressFrom, - &FCB->ReceiveIrp.Iosb, PacketSocketRecvComplete, FCB ); } Modified: trunk/reactos/drivers/network/afd/afd/tdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/td… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/tdi.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/tdi.c [iso-8859-1] Sun Oct 19 22:12:06 2014 @@ -329,7 +329,6 @@ PFILE_OBJECT ConnectionObject, PTDI_CONNECTION_INFORMATION ConnectionCallInfo, PTDI_CONNECTION_INFORMATION ConnectionReturnInfo, - PIO_STATUS_BLOCK Iosb, PIO_COMPLETION_ROUTINE CompletionRoutine, PVOID CompletionContext) /* @@ -362,7 +361,7 @@ DeviceObject, /* Device object */ ConnectionObject, /* File object */ NULL, /* Event */ - Iosb); /* Status */ + NULL); /* Status */ if (!*Irp) { return STATUS_INSUFFICIENT_RESOURCES; } @@ -376,7 +375,7 @@ ConnectionCallInfo, /* Request connection information */ ConnectionReturnInfo); /* Return connection information */ - TdiCall(*Irp, DeviceObject, NULL, Iosb); + TdiCall(*Irp, DeviceObject, NULL, NULL); return STATUS_PENDING; } @@ -485,7 +484,6 @@ PFILE_OBJECT ConnectionObject, PTDI_CONNECTION_INFORMATION *RequestConnectionInfo, PTDI_CONNECTION_INFORMATION *ReturnConnectionInfo, - PIO_STATUS_BLOCK Iosb, PIO_COMPLETION_ROUTINE CompletionRoutine, PVOID CompletionContext) /* @@ -519,7 +517,7 @@ DeviceObject, /* Device object */ ConnectionObject, /* File object */ NULL, /* Event */ - Iosb); /* Status */ + NULL); /* Status */ if (*Irp == NULL) return STATUS_INSUFFICIENT_RESOURCES; @@ -532,7 +530,7 @@ *RequestConnectionInfo, /* Request connection information */ *ReturnConnectionInfo); /* Return connection information */ - TdiCall(*Irp, DeviceObject, NULL /* Don't wait for completion */, Iosb); + TdiCall(*Irp, DeviceObject, NULL /* Don't wait for completion */, NULL); return STATUS_PENDING; } @@ -892,7 +890,6 @@ USHORT Flags, PCHAR Buffer, UINT BufferLength, - PIO_STATUS_BLOCK Iosb, PIO_COMPLETION_ROUTINE CompletionRoutine, PVOID CompletionContext) { @@ -916,7 +913,7 @@ DeviceObject, /* Device object */ TransportObject, /* File object */ NULL, /* Event */ - Iosb); /* Status */ + NULL); /* Status */ if (!*Irp) { AFD_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); @@ -958,7 +955,7 @@ Flags, /* Flags */ BufferLength); /* Length of data */ - TdiCall(*Irp, DeviceObject, NULL, Iosb); + TdiCall(*Irp, DeviceObject, NULL, NULL); /* Does not block... The MDL is deleted in the receive completion routine. */ @@ -971,7 +968,6 @@ USHORT Flags, PCHAR Buffer, UINT BufferLength, - PIO_STATUS_BLOCK Iosb, PIO_COMPLETION_ROUTINE CompletionRoutine, PVOID CompletionContext) { @@ -995,7 +991,7 @@ DeviceObject, /* Device object */ TransportObject, /* File object */ NULL, /* Event */ - Iosb); /* Status */ + NULL); /* Status */ if (!*Irp) { AFD_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); @@ -1040,7 +1036,7 @@ BufferLength); /* Length of data */ - TdiCall(*Irp, DeviceObject, NULL, Iosb); + TdiCall(*Irp, DeviceObject, NULL, NULL); /* Does not block... The MDL is deleted in the receive completion routine. */ @@ -1055,7 +1051,6 @@ PCHAR Buffer, UINT BufferLength, PTDI_CONNECTION_INFORMATION Addr, - PIO_STATUS_BLOCK Iosb, PIO_COMPLETION_ROUTINE CompletionRoutine, PVOID CompletionContext) /* @@ -1090,7 +1085,7 @@ DeviceObject, /* Device object */ TransportObject, /* File object */ NULL, /* Event */ - Iosb); /* Status */ + NULL); /* Status */ if (!*Irp) { AFD_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); @@ -1134,7 +1129,7 @@ Addr, Flags); /* Length of data */ - TdiCall(*Irp, DeviceObject, NULL, Iosb); + TdiCall(*Irp, DeviceObject, NULL, NULL); /* Does not block... The MDL is deleted in the receive completion routine. */ @@ -1148,7 +1143,6 @@ PCHAR Buffer, UINT BufferLength, PTDI_CONNECTION_INFORMATION Addr, - PIO_STATUS_BLOCK Iosb, PIO_COMPLETION_ROUTINE CompletionRoutine, PVOID CompletionContext) /* @@ -1185,7 +1179,7 @@ DeviceObject, /* Device object */ TransportObject, /* File object */ NULL, /* Event */ - Iosb); /* Status */ + NULL); /* Status */ if (!*Irp) { AFD_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); @@ -1228,7 +1222,7 @@ BufferLength, /* Bytes to send */ Addr); /* Address */ - TdiCall(*Irp, DeviceObject, NULL, Iosb); + TdiCall(*Irp, DeviceObject, NULL, NULL); /* Does not block... The MDL is deleted in the send completion routine. */ @@ -1240,7 +1234,6 @@ PFILE_OBJECT TransportObject, PLARGE_INTEGER Time, USHORT Flags, - PIO_STATUS_BLOCK Iosb, PIO_COMPLETION_ROUTINE CompletionRoutine, PVOID CompletionContext, PTDI_CONNECTION_INFORMATION RequestConnectionInfo, @@ -1264,7 +1257,7 @@ DeviceObject, /* Device object */ TransportObject, /* File object */ NULL, /* Event */ - Iosb); /* Status */ + NULL); /* Status */ if (!*Irp) { AFD_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); @@ -1281,7 +1274,7 @@ RequestConnectionInfo, /* Indication of who to disconnect */ ReturnConnectionInfo); /* Indication of who disconnected */ - TdiCall(*Irp, DeviceObject, NULL, Iosb); + TdiCall(*Irp, DeviceObject, NULL, NULL); return STATUS_PENDING; } Modified: trunk/reactos/drivers/network/afd/afd/write.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/wr… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/write.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/write.c [iso-8859-1] Sun Oct 19 22:12:06 2014 @@ -243,7 +243,6 @@ 0, FCB->Send.Window, FCB->Send.BytesUsed, - &FCB->SendIrp.Iosb, SendComplete, FCB ); } @@ -385,7 +384,6 @@ SendReq->BufferArray[0].buf, SendReq->BufferArray[0].len, TargetAddress, - &FCB->SendIrp.Iosb, PacketSocketSendComplete, FCB); } @@ -549,7 +547,6 @@ 0, FCB->Send.Window, FCB->Send.BytesUsed, - &FCB->SendIrp.Iosb, SendComplete, FCB); } @@ -645,7 +642,6 @@ SendReq->BufferArray[0].buf, SendReq->BufferArray[0].len, TargetAddress, - &FCB->SendIrp.Iosb, PacketSocketSendComplete, FCB); } Modified: trunk/reactos/drivers/network/afd/include/afd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/includ… ============================================================================== --- trunk/reactos/drivers/network/afd/include/afd.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/include/afd.h [iso-8859-1] Sun Oct 19 22:12:06 2014 @@ -152,7 +152,6 @@ typedef struct _AFD_IN_FLIGHT_REQUEST { PIRP InFlightRequest; - IO_STATUS_BLOCK Iosb; PTDI_CONNECTION_INFORMATION ConnectionCallInfo; PTDI_CONNECTION_INFORMATION ConnectionReturnInfo; } AFD_IN_FLIGHT_REQUEST, *PAFD_IN_FLIGHT_REQUEST; @@ -369,7 +368,6 @@ PFILE_OBJECT ConnectionObject, PTDI_CONNECTION_INFORMATION *RequestConnectionInfo, PTDI_CONNECTION_INFORMATION *ReturnConnectionInfo, - PIO_STATUS_BLOCK Iosb, PIO_COMPLETION_ROUTINE CompletionRoutine, PVOID CompletionContext); @@ -379,7 +377,6 @@ USHORT Flags, PCHAR Buffer, UINT BufferLength, - PIO_STATUS_BLOCK Iosb, PIO_COMPLETION_ROUTINE CompletionRoutine, PVOID CompletionContext); @@ -389,7 +386,6 @@ USHORT Flags, PCHAR Buffer, UINT BufferLength, - PIO_STATUS_BLOCK Iosb, PIO_COMPLETION_ROUTINE CompletionRoutine, PVOID CompletionContext); @@ -400,7 +396,6 @@ PCHAR Buffer, UINT BufferLength, PTDI_CONNECTION_INFORMATION From, - PIO_STATUS_BLOCK Iosb, PIO_COMPLETION_ROUTINE CompletionRoutine, PVOID CompletionContext); @@ -410,7 +405,6 @@ PCHAR Buffer, UINT BufferLength, PTDI_CONNECTION_INFORMATION To, - PIO_STATUS_BLOCK Iosb, PIO_COMPLETION_ROUTINE CompletionRoutine, PVOID CompletionContext); Modified: trunk/reactos/drivers/network/afd/include/tdi_proto.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/includ… ============================================================================== --- trunk/reactos/drivers/network/afd/include/tdi_proto.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/include/tdi_proto.h [iso-8859-1] Sun Oct 19 22:12:06 2014 @@ -4,7 +4,6 @@ PFILE_OBJECT ConnectionObject, PTDI_CONNECTION_INFORMATION ConnectionCallInfo, PTDI_CONNECTION_INFORMATION ConnectionReturnInfo, - PIO_STATUS_BLOCK Iosb, PIO_COMPLETION_ROUTINE CompletionRoutine, PVOID CompletionContext ); @@ -20,7 +19,6 @@ PFILE_OBJECT TransportObject, PLARGE_INTEGER Time, USHORT Flags, - PIO_STATUS_BLOCK Iosb, PIO_COMPLETION_ROUTINE CompletionRoutine, PVOID CompletionContext, PTDI_CONNECTION_INFORMATION RequestConnectionInfo,

9 years, 11 months

[cwittich] 64837: [videoprt] fix uninitialized variable usage in error case

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun Oct 19 21:57:29 2014 New Revision: 64837 URL: http://svn.reactos.org/svn/reactos?rev=64837&view=rev Log: [videoprt] fix uninitialized variable usage in error case Modified: trunk/reactos/win32ss/drivers/videoprt/registry.c Modified: trunk/reactos/win32ss/drivers/videoprt/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/videoprt/r… ============================================================================== --- trunk/reactos/win32ss/drivers/videoprt/registry.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/videoprt/registry.c [iso-8859-1] Sun Oct 19 21:57:29 2014 @@ -59,7 +59,7 @@ if (InfoBuffer == NULL) { ERR_(VIDEOPRT, "Could not allocate buffer for key info\n"); - return Status; + return STATUS_INSUFFICIENT_RESOURCES; } }

9 years, 11 months

[pschweitzer] 64836: [FASTFAT] - Implement vfatPrepareTargetForRename() that prepares for renaming. It tries to open target and deletes it if it exists and if allowed. And then, it opens the parent...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Oct 19 21:38:32 2014 New Revision: 64836 URL: http://svn.reactos.org/svn/reactos?rev=64836&view=rev Log: [FASTFAT] - Implement vfatPrepareTargetForRename() that prepares for renaming. It tries to open target and deletes it if it exists and if allowed. And then, it opens the parent directory. - Implement VfatSetRenameInformation() that actually does the renaming (call as SetInformationFile). It handles cases we we have (or we don't have) TargetDirectory provided. It sends notifications as appropriated on demands. - Implement vfatRenameEntry() that renames an entry in place. So far, it only supports FATX entries renaming. FAT entries are a bit more complex. It falls back to vfatMoveEntry() in later cases. - Implement VfatMoveEntry() that will move an entry accross directories (or in place for FAT). Its principles are simple: it deletes the entry in old parent, and recreate it in new parent, keeping file metadata & data. - Modify VfatDelEntry() and VfatAddEntry() so that they can handle deleting an entry without touching its data and adding an entry with an already provided FCB and thus use the given metadata. - Implement vfatDelFCBFromTable() which is just old code moved to new routine to allow reuse. It deletes a FCB entry from hash table. Doesn't deal with references! - Implement vfatMakeFullName() which is mostly old code moved to new routine to allow reuse. It allocates buffer and copy data for FCB full name. - Implement vfatUpdateFCB() that will update a FCB with new names and parent. It will remove anything related to old name and will recreate using new data. It will adjust references count. - Modify vfatMakeFCBFromDirEntry() so that it calls vfatMakeFullName(). - Modify vfatReleaseFCB() so that it calls vfatDelFCBFromTable(). - Revert VfatOpenFile() to its previous features. - Modify VfatCreateFile() to reimplement support for SL_OPEN_TARGET_DIRECTORY. It is way less hackish than previously. It also properly opens parent now, by incrementing its handle count and by setting appropriate access rights. [KERNEL32] - Rewritten MoveFileWithProgressW() to implement all the missing features that are used in Windows 2k3 including links and reparse points. - Implemented BasepMoveFileDelayed() to replace deprecated add_boot_rename_entry(). This functions is matching the features implemented in SMSS. - Implemented BasepMoveFileCopyProgress() which is used in MoveFileWithProgressW(). - Stubbed BasepNotifyTrackingService() which is not use at the moment (FastFAT, even in Windows doesn't provide such feature). - Reimplemented ReplaceFileA(), MoveFileWithProgressA() to quit Winisms and use our internal helpers. - Make MoveFileX() use MoveFileWithProgressX() directly. - Fixed a few prototypes. TL;DR: This (huge) commit implements file and directory renaming in FastFAT driver. This allows getting rid of old implementation in kernel32 where files were force copied. A feature is still missing, but Jérôme should implement it anytime soon (he prototyped it already): moving directories across volumes. This requires some work in BasepCopyFileExW(). Kudos to all the devs who helped me on this: Christoph, Hervé, Jérôme, Thomas. This finally allows killing CR-52... It was about time! Modified: trunk/reactos/dll/win32/kernel32/client/file/move.c trunk/reactos/drivers/filesystems/fastfat/close.c trunk/reactos/drivers/filesystems/fastfat/create.c trunk/reactos/drivers/filesystems/fastfat/dirwr.c trunk/reactos/drivers/filesystems/fastfat/fcb.c trunk/reactos/drivers/filesystems/fastfat/finfo.c trunk/reactos/drivers/filesystems/fastfat/vfat.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/kernel32/client/file/move.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… Modified: trunk/reactos/drivers/filesystems/fastfat/close.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… Modified: trunk/reactos/drivers/filesystems/fastfat/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… Modified: trunk/reactos/drivers/filesystems/fastfat/dirwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… Modified: trunk/reactos/drivers/filesystems/fastfat/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… Modified: trunk/reactos/drivers/filesystems/fastfat/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… Modified: trunk/reactos/drivers/filesystems/fastfat/vfat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa…

9 years, 11 months

[cwittich] 64835: [regsrv32] don't free hDll twice

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun Oct 19 21:30:26 2014 New Revision: 64835 URL: http://svn.reactos.org/svn/reactos?rev=64835&view=rev Log: [regsrv32] don't free hDll twice Modified: trunk/reactos/base/system/regsvr32/regsvr32.c Modified: trunk/reactos/base/system/regsvr32/regsvr32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/regsvr32/regsv… ============================================================================== --- trunk/reactos/base/system/regsvr32/regsvr32.c [iso-8859-1] (original) +++ trunk/reactos/base/system/regsvr32/regsvr32.c [iso-8859-1] Sun Oct 19 21:30:26 2014 @@ -448,7 +448,6 @@ nRetValue = EXITCODE_FAILURE; } else { - FreeLibrary(hDll); // DllInstall was not found, display an error message lptMsgBuffer = (LPTSTR)malloc((_tcslen(MissingEntry) - 8 + _tcslen(tszDllInstall) * 2 + _tcslen(lptDllName) * 2 + 1) * sizeof(TCHAR)); _stprintf(lptMsgBuffer,MissingEntry,lptDllName,tszDllInstall,tszDllInstall,lptDllName);

9 years, 11 months

[ekohl] 64834: [NET] - Add the localgroup command. It does not work properly on ReactOS yet. - Print a warning when the domain option of the accounts command is used.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Oct 19 20:12:19 2014 New Revision: 64834 URL: http://svn.reactos.org/svn/reactos?rev=64834&view=rev Log: [NET] - Add the localgroup command. It does not work properly on ReactOS yet. - Print a warning when the domain option of the accounts command is used. Added: trunk/reactos/base/applications/network/net/cmdLocalGroup.c (with props) Modified: trunk/reactos/base/applications/network/net/CMakeLists.txt trunk/reactos/base/applications/network/net/cmdAccounts.c trunk/reactos/base/applications/network/net/lang/en-US.rc trunk/reactos/base/applications/network/net/lang/ro-RO.rc trunk/reactos/base/applications/network/net/lang/ru-RU.rc trunk/reactos/base/applications/network/net/main.c trunk/reactos/base/applications/network/net/net.h Modified: trunk/reactos/base/applications/network/net/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/CMakeLists.txt [iso-8859-1] Sun Oct 19 20:12:19 2014 @@ -4,11 +4,12 @@ list(APPEND SOURCE main.c cmdAccounts.c + cmdContinue.c + cmdHelpMsg.c + cmdLocalGroup.c + cmdPause.c cmdStart.c cmdStop.c - cmdHelpMsg.c - cmdPause.c - cmdContinue.c help.c net.h) Modified: trunk/reactos/base/applications/network/net/cmdAccounts.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/cmdAccounts.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/cmdAccounts.c [iso-8859-1] Sun Oct 19 20:12:19 2014 @@ -24,7 +24,9 @@ ULONG value; INT i; BOOL Modified = FALSE; -// BOOL Domain = FALSE; +#if 0 + BOOL Domain = FALSE; +#endif NET_API_STATUS Status; INT result = 0; @@ -44,12 +46,13 @@ return 0; } -/* if (_wcsicmp(argv[i], L"/domain") == 0) { + printf("The /DOMAIN option is not supported yet!\n"); +#if 0 Domain = TRUE; - } -*/ +#endif + } } Status = NetUserModalsGet(NULL, 0, (LPBYTE*)&Info0); Added: trunk/reactos/base/applications/network/net/cmdLocalGroup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/cmdLocalGroup.c (added) +++ trunk/reactos/base/applications/network/net/cmdLocalGroup.c [iso-8859-1] Sun Oct 19 20:12:19 2014 @@ -0,0 +1,282 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS net command + * FILE: + * PURPOSE: + * + * PROGRAMMERS: Eric Kohl + */ + +#include "net.h" + + +static +int +CompareInfo(const void *a, + const void *b) +{ + return _wcsicmp(((PLOCALGROUP_INFO_0)a)->lgrpi0_name, + ((PLOCALGROUP_INFO_0)b)->lgrpi0_name); +} + + +static +NET_API_STATUS +EnumerateLocalGroups(VOID) +{ + PLOCALGROUP_INFO_0 pBuffer = NULL; + PSERVER_INFO_100 pServer = NULL; + DWORD dwRead = 0, dwTotal = 0; + DWORD i; + DWORD_PTR ResumeHandle = 0; + NET_API_STATUS Status; + + + Status = NetServerGetInfo(NULL, + 100, + (LPBYTE*)&pServer); + if (Status != NERR_Success) + return Status; + + printf("\nAliases for \\\\%S\n\n", pServer->sv100_name); + printf("------------------------------------------\n"); + + NetApiBufferFree(pServer); + + Status = NetLocalGroupEnum(NULL, + 0, + (LPBYTE*)&pBuffer, + MAX_PREFERRED_LENGTH, + &dwRead, + &dwTotal, + &ResumeHandle); + if (Status != NERR_Success) + return Status; + + qsort(pBuffer, + dwRead, + sizeof(PLOCALGROUP_INFO_0), + CompareInfo); + +// printf("dwRead: %lu dwTotal: %lu\n", dwRead, dwTotal); + for (i = 0; i < dwRead; i++) + { +// printf("%p\n", pBuffer[i].lgrpi0_name); + if (pBuffer[i].lgrpi0_name) + printf("*%S\n", pBuffer[i].lgrpi0_name); + } + + NetApiBufferFree(pBuffer); + + return NERR_Success; +} + + +INT +cmdLocalGroup( + INT argc, + WCHAR **argv) +{ + INT i, j; + INT result = 0; + ULONG dwMemberCount = 0; + BOOL bAdd = FALSE; + BOOL bDelete = FALSE; +#if 0 + BOOL bDomain = FALSE; +#endif + LPWSTR lpGroupName = NULL; + LPWSTR lpComment = NULL; + LPLOCALGROUP_MEMBERS_INFO_3 lpMembers = NULL; + LOCALGROUP_INFO_0 Info0; + LOCALGROUP_INFO_1 Info1; + LOCALGROUP_INFO_1002 Info1002; + NET_API_STATUS Status; + + if (argc == 2) + { + Status = EnumerateLocalGroups(); + printf("Status: %lu\n", Status); + return 0; + } + + i = 2; + if (argv[i][0] != L'/') + { + lpGroupName = argv[i]; + i++; + } + + for (j = i; j < argc; j++) + { + if (argv[j][0] == L'/') + break; + + dwMemberCount++; + } + + printf("Member count: %lu\n", dwMemberCount); + + if (dwMemberCount > 0) + { + lpMembers = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + dwMemberCount * sizeof(LPLOCALGROUP_MEMBERS_INFO_3)); + if (lpMembers == NULL) + return 0; + } + + j = 0; + for (; i < argc; i++) + { + if (argv[i][0] == L'/') + break; + + lpMembers[j].lgrmi3_domainandname = argv[i]; + j++; + } + + for (; i < argc; i++) + { + if (_wcsicmp(argv[i], L"/help") == 0) + { + PrintResourceString(IDS_LOCALGROUP_HELP); + return 0; + } + else if (_wcsicmp(argv[i], L"/add") == 0) + { + bAdd = TRUE; + } + else if (_wcsicmp(argv[i], L"/delete") == 0) + { + bDelete = TRUE; + } + else if (_wcsnicmp(argv[i], L"/comment:", 9) == 0) + { + lpComment = &argv[i][9]; + } + else if (_wcsicmp(argv[i], L"/domain") == 0) + { + printf("The /DOMAIN option is not supported yet!\n"); +#if 0 + bDomain = TRUE; +#endif + } + else + { + result = 1; + goto done; + } + } + + if (lpGroupName == NULL) + { + result = 1; + goto done; + } + + if (bAdd && bDelete) + { + result = 1; + goto done; + } + +#if 0 + printf("Group:\n %S\n", lpGroupName); + + if (lpMembers != NULL) + { + printf("\nMembers:\n"); + for (i = 0; i < dwMemberCount; i++) + printf(" %S\n", lpMembers[i].lgrmi3_domainandname); + } + + if (lpComment != NULL) + { + printf("\nComment:\n %S\n", lpComment); + } +#endif + + if (lpMembers == NULL) + { + if (!bAdd && !bDelete && lpComment != NULL) + { + /* Set group comment */ + Info1002.lgrpi1002_comment = lpComment; + Status = NetLocalGroupSetInfo(NULL, + lpGroupName, + 1002, + (LPBYTE)&Info1002, + NULL); + printf("Status: %lu\n", Status); + } + else if (bAdd && !bDelete) + { + /* Add the group */ + if (lpComment == NULL) + { + Info0.lgrpi0_name = lpGroupName; + } + else + { + Info1.lgrpi1_name = lpGroupName; + Info1.lgrpi1_comment = lpComment; + } + + Status = NetLocalGroupAdd(NULL, + (lpComment == NULL) ? 0 : 1, + (lpComment == NULL) ? (LPBYTE)&Info0 : (LPBYTE)&Info1, + NULL); + printf("Status: %lu\n", Status); + } + else if (!bAdd && bDelete && lpComment == NULL) + { + /* Delete the group */ + Status = NetLocalGroupDel(NULL, + lpGroupName); + printf("Status: %lu\n", Status); + } + else + { + result = 1; + } + } + else + { + if (bAdd && !bDelete && lpComment == NULL) + { + /* Add group members */ + Status = NetLocalGroupAddMembers(NULL, + lpGroupName, + 3, + (LPBYTE)lpMembers, + dwMemberCount); + printf("Status: %lu\n", Status); + } + else if (!bAdd && bDelete && lpComment == NULL) + { + /* Delete group members */ + Status = NetLocalGroupDelMembers(NULL, + lpGroupName, + 3, + (LPBYTE)lpMembers, + dwMemberCount); + printf("Status: %lu\n", Status); + } + else + { + result = 1; + } + } + +done: + if (lpMembers != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, lpMembers); + + if (result != 0) + PrintResourceString(IDS_LOCALGROUP_SYNTAX); + + return result; +} + +/* EOF */ Propchange: trunk/reactos/base/applications/network/net/cmdLocalGroup.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/network/net/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/lang/en-US.rc [iso-8859-1] Sun Oct 19 20:12:19 2014 @@ -18,7 +18,9 @@ IDS_GROUP_HELP "GROUP\n..." IDS_HELPMSG_SYNTAX "Usage:\nNET HELPMSG <Error Code>" IDS_HELPMSG_HELP "HELPMSG\n..." - IDS_LOCALGROUP_SYNTAX "Usage:\nNET LOCALGROUP ..." + IDS_LOCALGROUP_SYNTAX "Usage:\nNET LOCALGROUP [groupname [/COMMENT:""text""]] [/DOMAIN]\n\ + groupname {/ADD [/COMMENT:""text""] | /DELETE} [/DOMAIN]\n\ + groupname name [...] {/ADD | /DELETE} [/DOMAIN]" IDS_LOCALGROUP_HELP "LOCALGROUP\n..." IDS_NAME_SYNTAX "Usage:\nNET NAME ..." IDS_NAME_HELP "NAME\n..." Modified: trunk/reactos/base/applications/network/net/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/lang/ro-RO.rc [iso-8859-1] Sun Oct 19 20:12:19 2014 @@ -24,7 +24,9 @@ IDS_GROUP_HELP "GROUP\n..." IDS_HELPMSG_SYNTAX "Utilizare:\nNET HELPMSG <Error Code>" IDS_HELPMSG_HELP "HELPMSG\n..." - IDS_LOCALGROUP_SYNTAX "Utilizare:\nNET LOCALGROUP ..." + IDS_LOCALGROUP_SYNTAX "Utilizare:\nNET LOCALGROUP [groupname [/COMMENT:""text""]] [/DOMAIN]\n\ + groupname {/ADD [/COMMENT:""text""] | /DELETE} [/DOMAIN]\n\ + groupname name [...] {/ADD | /DELETE} [/DOMAIN]" IDS_LOCALGROUP_HELP "LOCALGROUP\n..." IDS_NAME_SYNTAX "Utilizare:\nNET NAME ..." IDS_NAME_HELP "NAME\n..." Modified: trunk/reactos/base/applications/network/net/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/lang/ru-RU.rc [iso-8859-1] Sun Oct 19 20:12:19 2014 @@ -19,7 +19,9 @@ IDS_GROUP_HELP "GROUP\n..." IDS_HELPMSG_SYNTAX "ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ:\nNET HELPMSG <ÐÐ¾Ð´ Ð¾ÑÐ¸Ð±ÐºÐ¸>" IDS_HELPMSG_HELP "HELPMSG\n..." - IDS_LOCALGROUP_SYNTAX "ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ:\nNET LOCALGROUP ..." + IDS_LOCALGROUP_SYNTAX "ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ:\nNET LOCALGROUP [groupname [/COMMENT:""text""]] [/DOMAIN]\n\ + groupname {/ADD [/COMMENT:""text""] | /DELETE} [/DOMAIN]\n\ + groupname name [...] {/ADD | /DELETE} [/DOMAIN]" IDS_LOCALGROUP_HELP "LOCALGROUP\n..." IDS_NAME_SYNTAX "ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ:\nNET NAME ..." IDS_NAME_HELP "NAME\n..." Modified: trunk/reactos/base/applications/network/net/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/main.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/main.c [iso-8859-1] Sun Oct 19 20:12:19 2014 @@ -28,7 +28,7 @@ {L"group", unimplemented}, {L"help", cmdHelp}, {L"helpmsg", cmdHelpMsg}, - {L"localgroup", unimplemented}, + {L"localgroup", cmdLocalGroup}, {L"name", unimplemented}, {L"pause", cmdPause}, {L"print", unimplemented}, Modified: trunk/reactos/base/applications/network/net/net.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/net.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/net.h [iso-8859-1] Sun Oct 19 20:12:19 2014 @@ -35,6 +35,7 @@ INT cmdContinue(INT argc, WCHAR **argv); INT cmdHelp(INT argc, WCHAR **argv); INT cmdHelpMsg(INT argc, WCHAR **argv); +INT cmdLocalGroup(INT argc, WCHAR **argv); INT cmdPause(INT argc, WCHAR **argv); INT cmdStart(INT argc, WCHAR **argv); INT cmdStop(INT argc, WCHAR **argv);

9 years, 11 months

[pschweitzer] 64833: [NTFS] Bugfixing... Part 9/X: - Return the appropriate size for file size. - Round the allocation to cluster size (as requested by the API). This fixes metadata display when en...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Oct 19 20:12:14 2014 New Revision: 64833 URL: http://svn.reactos.org/svn/reactos?rev=64833&view=rev Log: [NTFS] Bugfixing... Part 9/X: - Return the appropriate size for file size. - Round the allocation to cluster size (as requested by the API). This fixes metadata display when enumerating a directory in CMD. What you get now: http://www.heisspiter.net/~Pierre/rostests/NTFS_listing_fixed.png Time to fix all the rest! D'oh! Modified: trunk/reactos/drivers/filesystems/ntfs/dirctl.c Modified: trunk/reactos/drivers/filesystems/ntfs/dirctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/d… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/dirctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/dirctl.c [iso-8859-1] Sun Oct 19 20:12:14 2014 @@ -183,8 +183,8 @@ /* Convert file flags */ NtfsFileFlagsToAttributes(FileName->FileAttributes, &Info->FileAttributes); - Info->EndOfFile.QuadPart = FileName->DataSize; - Info->AllocationSize.QuadPart = FileName->AllocatedSize; + Info->EndOfFile.QuadPart = FileName->AllocatedSize; + Info->AllocationSize.QuadPart = ROUND_UP(FileName->AllocatedSize, DeviceExt->NtfsInfo.BytesPerCluster); // Info->FileIndex=; @@ -224,8 +224,8 @@ /* Convert file flags */ NtfsFileFlagsToAttributes(FileName->FileAttributes, &Info->FileAttributes); - Info->EndOfFile.QuadPart = FileName->DataSize; - Info->AllocationSize.QuadPart = FileName->AllocatedSize; + Info->EndOfFile.QuadPart = FileName->AllocatedSize; + Info->AllocationSize.QuadPart = ROUND_UP(FileName->AllocatedSize, DeviceExt->NtfsInfo.BytesPerCluster); // Info->FileIndex=; Info->EaSize = 0; @@ -266,8 +266,8 @@ /* Convert file flags */ NtfsFileFlagsToAttributes(FileName->FileAttributes, &Info->FileAttributes); - Info->EndOfFile.QuadPart = FileName->DataSize; - Info->AllocationSize.QuadPart = FileName->AllocatedSize; + Info->EndOfFile.QuadPart = FileName->AllocatedSize; + Info->AllocationSize.QuadPart = ROUND_UP(FileName->AllocatedSize, DeviceExt->NtfsInfo.BytesPerCluster); // Info->FileIndex=; Info->EaSize = 0;

9 years, 11 months

← Newer
1
...
30
31
32
33
34
35
36
...
73
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 October 2014