Ros-diffs April 2017

ros-diffs@reactos.org

14 participants
179 discussions

[ekohl] 74306: [AT] Improve the time parser to handle 12-hour and 24-hour formats correctly.

by ekohl＠svn.reactos.org

Author: ekohl Date: Fri Apr 14 15:54:08 2017 New Revision: 74306 URL: http://svn.reactos.org/svn/reactos?rev=74306&view=rev Log: [AT] Improve the time parser to handle 12-hour and 24-hour formats correctly. Modified: trunk/reactos/base/applications/cmdutils/at/at.c Modified: trunk/reactos/base/applications/cmdutils/at/at.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/at/at.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/at/at.c [iso-8859-1] Fri Apr 14 15:54:08 2017 @@ -77,31 +77,127 @@ PULONG pulJobHour, PULONG pulJobMinute) { + WCHAR szHour[3], szMinute[3], szAmPm[5]; PWSTR startPtr, endPtr; ULONG ulHour = 0, ulMinute = 0; - BOOL bResult = FALSE; + INT nLength; + + if (pszTime == NULL) + return FALSE; startPtr = pszTime; - endPtr = NULL; - ulHour = wcstoul(startPtr, &endPtr, 10); - if (ulHour < 24 && endPtr != NULL && *endPtr == L':') - { - startPtr = endPtr + 1; - endPtr = NULL; - ulMinute = wcstoul(startPtr, &endPtr, 10); - if (ulMinute < 60 && endPtr != NULL && *endPtr == UNICODE_NULL) - { - bResult = TRUE; - - if (pulJobHour != NULL) - *pulJobHour = ulHour; - - if (pulJobMinute != NULL) - *pulJobMinute = ulMinute; - } - } - - return bResult; + + /* Extract the hour string */ + nLength = 0; + while (*startPtr != L'\0' && iswdigit(*startPtr)) + { + if (nLength >= 2) + return FALSE; + + szHour[nLength] = *startPtr; + nLength++; + + startPtr++; + } + szHour[nLength] = L'\0'; + + /* Check for a valid time separator */ + if (*startPtr != L':') + return FALSE; + + /* Skip the time separator */ + startPtr++; + + /* Extract the minute string */ + nLength = 0; + while (*startPtr != L'\0' && iswdigit(*startPtr)) + { + if (nLength >= 2) + return FALSE; + + szMinute[nLength] = *startPtr; + nLength++; + + startPtr++; + } + szMinute[nLength] = L'\0'; + + /* Extract the optional AM/PM indicator string */ + nLength = 0; + while (*startPtr != L'\0') + { + if (nLength >= 4) + return FALSE; + + if (!iswspace(*startPtr)) + { + szAmPm[nLength] = *startPtr; + nLength++; + } + + startPtr++; + } + szAmPm[nLength] = L'\0'; + + /* Convert the hour string */ + ulHour = wcstoul(szHour, &endPtr, 10); + if (ulHour == 0 && *endPtr != UNICODE_NULL) + return FALSE; + + /* Convert the minute string */ + ulMinute = wcstoul(szMinute, &endPtr, 10); + if (ulMinute == 0 && *endPtr != UNICODE_NULL) + return FALSE; + + /* Check for valid AM/PM indicator */ + if (wcslen(szAmPm) > 0 && + _wcsicmp(szAmPm, L"a") != 0 && + _wcsicmp(szAmPm, L"am") != 0 && + _wcsicmp(szAmPm, L"p") != 0 && + _wcsicmp(szAmPm, L"pm") != 0) + return FALSE; + + /* Check for the valid minute range [0-59] */ + if (ulMinute > 59) + return FALSE; + + if (wcslen(szAmPm) > 0) + { + /* 12 hour time format */ + + /* Check for the valid hour range [1-12] */ + if (ulHour == 0 || ulHour > 12) + return FALSE; + + /* Convert 12 hour format to 24 hour format */ + if (_wcsicmp(szAmPm, L"a") == 0 || + _wcsicmp(szAmPm, L"am") == 0) + { + if (ulHour == 12) + ulHour = 0; + } + else + { + if (ulHour >= 1 && ulHour <= 11) + ulHour += 12; + } + } + else + { + /* 24 hour time format */ + + /* Check for the valid hour range [0-23] */ + if (ulHour > 23) + return FALSE; + } + + if (pulJobHour != NULL) + *pulJobHour = ulHour; + + if (pulJobMinute != NULL) + *pulJobMinute = ulMinute; + + return TRUE; }

7 years, 6 months

[tfaber] 74305: [NTOS:KE] - Gracefully handle page faults during V86 code execution. This is a bit of a hack because with our limited use of V86 code it is unclear how a page fault can even occur. ...

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Apr 14 11:18:22 2017 New Revision: 74305 URL: http://svn.reactos.org/svn/reactos?rev=74305&view=rev Log: [NTOS:KE] - Gracefully handle page faults during V86 code execution. This is a bit of a hack because with our limited use of V86 code it is unclear how a page fault can even occur. CORE-12993 #resolve Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h trunk/reactos/ntoskrnl/ke/i386/traphdlr.c trunk/reactos/ntoskrnl/vdm/vdmexec.c Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/ke.h [iso-8859-1] Fri Apr 14 11:18:22 2017 @@ -478,6 +478,12 @@ NTAPI VdmDispatchBop( IN PKTRAP_FRAME TrapFrame +); + +BOOLEAN +NTAPI +VdmDispatchPageFault( + _In_ PKTRAP_FRAME TrapFrame ); BOOLEAN Modified: trunk/reactos/ntoskrnl/ke/i386/traphdlr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/traphdlr.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] Fri Apr 14 11:18:22 2017 @@ -1304,8 +1304,20 @@ UNIMPLEMENTED_FATAL(); } #endif + /* Check for VDM trap */ - ASSERT((KiVdmTrap(TrapFrame)) == FALSE); + if (KiVdmTrap(TrapFrame)) + { + DPRINT1("VDM PAGE FAULT at %lx:%lx for address %lx\n", + TrapFrame->SegCs, TrapFrame->Eip, Cr2); + if (VdmDispatchPageFault(TrapFrame)) + { + /* Return and end VDM execution */ + DPRINT1("VDM page fault with status 0x%lx resolved\n", Status); + KiEoiHelper(TrapFrame); + } + DPRINT1("VDM page fault with status 0x%lx NOT resolved\n", Status); + } /* Either kernel or user trap (non VDM) so dispatch exception */ if (Status == STATUS_ACCESS_VIOLATION) Modified: trunk/reactos/ntoskrnl/vdm/vdmexec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/vdm/vdmexec.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/vdm/vdmexec.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/vdm/vdmexec.c [iso-8859-1] Fri Apr 14 11:18:22 2017 @@ -239,7 +239,7 @@ KeLowerIrql(OldIrql); return STATUS_INVALID_SYSTEM_SERVICE; } - + /* Now do the VDM Swap */ VdmSwapContext(VdmFrame, &VdmTib->MonitorContext, &VdmContext); @@ -269,7 +269,7 @@ /* Make a copy of the monitor context */ Context = VdmTib->MonitorContext; - + /* Check if V86 mode was enabled or the trap was edited */ if ((Context.EFlags & EFLAGS_V86_MASK) || (Context.SegCs & FRAME_EDITED)) { @@ -291,7 +291,7 @@ /* Remove real IF flag */ VdmTib->VdmContext.EFlags &= ~EFLAGS_INTERRUPT_MASK; } - + /* Turn off VIP and VIF */ TrapFrame->EFlags &= ~(EFLAGS_VIP | EFLAGS_VIF); VdmTib->VdmContext.EFlags &= ~(EFLAGS_VIP | EFLAGS_VIF); @@ -362,4 +362,45 @@ return TRUE; } - +BOOLEAN +NTAPI +VdmDispatchPageFault( + _In_ PKTRAP_FRAME TrapFrame) +{ + NTSTATUS Status; + PVDM_TIB VdmTib; + + PAGED_CODE(); + + /* Get the VDM TIB so we can terminate V86 execution */ + Status = VdmpGetVdmTib(&VdmTib); + if (!NT_SUCCESS(Status)) + { + /* Not a proper VDM fault, keep looking */ + DPRINT1("VdmDispatchPageFault: no VDM TIB, Vdm=%p\n", NtCurrentTeb()->Vdm); + return FALSE; + } + + /* Must be coming from V86 code */ + ASSERT(TrapFrame->EFlags & EFLAGS_V86_MASK); + + _SEH2_TRY + { + /* Fill out a VDM Event */ + VdmTib->EventInfo.Event = VdmMemAccess; + VdmTib->EventInfo.InstructionSize = 0; + + /* End VDM Execution */ + VdmEndExecution(TrapFrame, VdmTib); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + /* Consider the exception handled if we succeeded */ + DPRINT1("VdmDispatchPageFault EFlags %lx exit with 0x%lx\n", TrapFrame->EFlags, Status); + return NT_SUCCESS(Status); +} +

7 years, 6 months

[tfaber] 74304: [NTOS:KE] - Make decoding of the error code more obvious in KiTrap0EHandler - Avoid or make explicit some signed/unsigned conversions

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Apr 14 10:39:07 2017 New Revision: 74304 URL: http://svn.reactos.org/svn/reactos?rev=74304&view=rev Log: [NTOS:KE] - Make decoding of the error code more obvious in KiTrap0EHandler - Avoid or make explicit some signed/unsigned conversions Modified: trunk/reactos/ntoskrnl/include/internal/i386/trap_x.h trunk/reactos/ntoskrnl/ke/i386/traphdlr.c Modified: trunk/reactos/ntoskrnl/include/internal/i386/trap_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/trap_x.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/trap_x.h [iso-8859-1] Fri Apr 14 10:39:07 2017 @@ -83,7 +83,7 @@ TrapFrame->DbgArgMark = 0xBADB0D00; TrapFrame->DbgEip = TrapFrame->Eip; TrapFrame->DbgEbp = TrapFrame->Ebp; - TrapFrame->PreviousPreviousMode = -1; + TrapFrame->PreviousPreviousMode = (ULONG)-1; } #define DR7_RESERVED_READ_AS_1 0x400 Modified: trunk/reactos/ntoskrnl/ke/i386/traphdlr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/traphdlr.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] Fri Apr 14 10:39:07 2017 @@ -529,7 +529,7 @@ TrapFrame.Edi = Tss->Edi; TrapFrame.SegFs = Tss->Fs; TrapFrame.ExceptionList = PCR->NtTib.ExceptionList; - TrapFrame.PreviousPreviousMode = -1; + TrapFrame.PreviousPreviousMode = (ULONG)-1; TrapFrame.Eax = Tss->Eax; TrapFrame.Ecx = Tss->Ecx; TrapFrame.Edx = Tss->Edx; @@ -1197,6 +1197,8 @@ KiTrap0EHandler(IN PKTRAP_FRAME TrapFrame) { PKTHREAD Thread; + BOOLEAN Present; + BOOLEAN StoreInstruction; ULONG_PTR Cr2; NTSTATUS Status; @@ -1222,14 +1224,18 @@ /* Enable interrupts */ _enable(); + /* Interpret the error code */ + Present = (TrapFrame->ErrCode & 1) != 0; + StoreInstruction = (TrapFrame->ErrCode & 2) != 0; + /* Check if we came in with interrupts disabled */ if (!(TrapFrame->EFlags & EFLAGS_INTERRUPT_MASK)) { /* This is completely illegal, bugcheck the system */ KeBugCheckWithTf(IRQL_NOT_LESS_OR_EQUAL, Cr2, - -1, - TrapFrame->ErrCode & 2 ? TRUE : FALSE, + (ULONG_PTR)-1, + StoreInstruction, TrapFrame->Eip, TrapFrame); } @@ -1267,7 +1273,7 @@ /* Do what windows does and issue an invalid access violation */ KiDispatchException2Args(KI_EXCEPTION_ACCESS_VIOLATION, TrapFrame->Eip, - TrapFrame->ErrCode & 2 ? TRUE : FALSE, + StoreInstruction, Cr2, TrapFrame); #endif @@ -1275,7 +1281,7 @@ } /* Call the access fault handler */ - Status = MmAccessFault(TrapFrame->ErrCode & 1, + Status = MmAccessFault(Present, (PVOID)Cr2, KiUserTrap(TrapFrame), TrapFrame); @@ -1307,7 +1313,7 @@ /* This status code is repurposed so we can recognize it later */ KiDispatchException2Args(KI_EXCEPTION_ACCESS_VIOLATION, TrapFrame->Eip, - TrapFrame->ErrCode & 2 ? TRUE : FALSE, + StoreInstruction, Cr2, TrapFrame); } @@ -1317,7 +1323,7 @@ /* These faults only have two parameters */ KiDispatchException2Args(Status, TrapFrame->Eip, - TrapFrame->ErrCode & 2 ? TRUE : FALSE, + StoreInstruction, Cr2, TrapFrame); } @@ -1327,7 +1333,7 @@ 0, TrapFrame->Eip, 3, - TrapFrame->ErrCode & 2 ? TRUE : FALSE, + StoreInstruction, Cr2, Status, TrapFrame); @@ -1623,7 +1629,8 @@ { PKTHREAD Thread; PKSERVICE_TABLE_DESCRIPTOR DescriptorTable; - ULONG Id, Offset, StackBytes, Result; + ULONG Id, Offset, StackBytes; + NTSTATUS Status; PVOID Handler; ULONG SystemCallNumber = TrapFrame->Eax; @@ -1681,18 +1688,18 @@ if (!(Offset & SERVICE_TABLE_TEST)) { /* Fail the call */ - Result = STATUS_INVALID_SYSTEM_SERVICE; + Status = STATUS_INVALID_SYSTEM_SERVICE; goto ExitCall; } /* Convert us to a GUI thread -- must wrap in ASM to get new EBP */ - Result = KiConvertToGuiThread(); + Status = KiConvertToGuiThread(); /* Reload trap frame and descriptor table pointer from new stack */ TrapFrame = *(volatile PVOID*)&Thread->TrapFrame; DescriptorTable = (PVOID)(*(volatile ULONG_PTR*)&Thread->ServiceTable + Offset); - if (!NT_SUCCESS(Result)) + if (!NT_SUCCESS(Status)) { /* Set the last error and fail */ goto ExitCall; @@ -1702,7 +1709,7 @@ if (Id >= DescriptorTable->Limit) { /* Fail the call */ - Result = STATUS_INVALID_SYSTEM_SERVICE; + Status = STATUS_INVALID_SYSTEM_SERVICE; goto ExitCall; } } @@ -1735,10 +1742,10 @@ /* Get the handler and make the system call */ Handler = (PVOID)DescriptorTable->Base[Id]; - Result = KiSystemCallTrampoline(Handler, Arguments, StackBytes); + Status = KiSystemCallTrampoline(Handler, Arguments, StackBytes); /* Call post-service debug hook */ - Result = KiDbgPostServiceHook(SystemCallNumber, Result); + Status = KiDbgPostServiceHook(SystemCallNumber, Status); /* Make sure we're exiting correctly */ KiExitSystemCallDebugChecks(Id, TrapFrame); @@ -1748,14 +1755,14 @@ Thread->TrapFrame = (PKTRAP_FRAME)TrapFrame->Edx; /* Exit from system call */ - KiServiceExit(TrapFrame, Result); + KiServiceExit(TrapFrame, Status); } VOID FASTCALL KiCheckForSListAddress(IN PKTRAP_FRAME TrapFrame) { - UNIMPLEMENTED; + UNIMPLEMENTED; } /*

7 years, 6 months

[tfaber] 74303: [USBSTOR] - Avoid MDL leak in USBSTOR_SendIrp. Patch by Lesan Ilie. CORE-13061 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Apr 14 10:24:41 2017 New Revision: 74303 URL: http://svn.reactos.org/svn/reactos?rev=74303&view=rev Log: [USBSTOR] - Avoid MDL leak in USBSTOR_SendIrp. Patch by Lesan Ilie. CORE-13061 #resolve Modified: trunk/reactos/drivers/usb/usbstor/pdo.c Modified: trunk/reactos/drivers/usb/usbstor/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbstor/pdo.c?… ============================================================================== --- trunk/reactos/drivers/usb/usbstor/pdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbstor/pdo.c [iso-8859-1] Fri Apr 14 10:24:41 2017 @@ -1183,6 +1183,7 @@ // free resources // ExFreePoolWithTag(Request, USB_STOR_TAG); + IoFreeMdl(Irp->MdlAddress); IoFreeIrp(Irp); return Status; }

7 years, 6 months

[tfaber] 74302: [HIDCLASS] Patch by Lesan Ilie: - Avoid over-allocating the DEVICE_RELATIONS structure in HidClassPDO_CreatePDO - Allocate device relations from paged pool CORE-13052 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Apr 14 09:55:17 2017 New Revision: 74302 URL: http://svn.reactos.org/svn/reactos?rev=74302&view=rev Log: [HIDCLASS] Patch by Lesan Ilie: - Avoid over-allocating the DEVICE_RELATIONS structure in HidClassPDO_CreatePDO - Allocate device relations from paged pool CORE-13052 #resolve Modified: trunk/reactos/drivers/hid/hidclass/pdo.c Modified: trunk/reactos/drivers/hid/hidclass/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/hidclass/pdo.c… ============================================================================== --- trunk/reactos/drivers/hid/hidclass/pdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/hidclass/pdo.c [iso-8859-1] Fri Apr 14 09:55:17 2017 @@ -652,8 +652,8 @@ // // first allocate device relations // - Length = sizeof(DEVICE_RELATIONS) + sizeof(PDEVICE_OBJECT) * FDODeviceExtension->Common.DeviceDescription.CollectionDescLength; - DeviceRelations = ExAllocatePoolWithTag(NonPagedPool, Length, HIDCLASS_TAG); + Length = FIELD_OFFSET(DEVICE_RELATIONS, Objects) + sizeof(PDEVICE_OBJECT) * FDODeviceExtension->Common.DeviceDescription.CollectionDescLength; + DeviceRelations = ExAllocatePoolWithTag(PagedPool, Length, HIDCLASS_TAG); if (!DeviceRelations) { //

7 years, 6 months

[tfaber] 74301: [CABMAN] - Fix leaks in ExtractFile and avoid double frees from failure cases of AddFile. Patch by Serge Gautherie. CORE-7307 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Apr 14 09:50:37 2017 New Revision: 74301 URL: http://svn.reactos.org/svn/reactos?rev=74301&view=rev Log: [CABMAN] - Fix leaks in ExtractFile and avoid double frees from failure cases of AddFile. Patch by Serge Gautherie. CORE-7307 #resolve Modified: trunk/reactos/sdk/tools/cabman/cabinet.cxx Modified: trunk/reactos/sdk/tools/cabman/cabinet.cxx URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/cabman/cabinet.c… ============================================================================== --- trunk/reactos/sdk/tools/cabman/cabinet.cxx [iso-8859-1] (original) +++ trunk/reactos/sdk/tools/cabman/cabinet.cxx [iso-8859-1] Fri Apr 14 09:50:37 2017 @@ -1163,6 +1163,7 @@ { DPRINT(MIN_TRACE, ("SetFilePointer() failed, error code is %u.\n", (UINT)GetLastError())); CloseFile(DestFile); + FreeMemory(Buffer); return CAB_STATUS_INVALID_CAB; } #else @@ -1170,6 +1171,7 @@ { DPRINT(MIN_TRACE, ("fseek() failed.\n")); CloseFile(DestFile); + FreeMemory(Buffer); return CAB_STATUS_FAILURE; } Offset = ftell(FileHandle); @@ -1252,7 +1254,11 @@ if (CFData.UncompSize == 0) { if (strlen(DiskNext) == 0) + { + CloseFile(DestFile); + FreeMemory(Buffer); return CAB_STATUS_NOFILE; + } /* CloseCabinet() will destroy all file entries so in case FileName refers to the FileName field of a CFFOLDER_NODE @@ -1267,7 +1273,11 @@ Status = Open(); if (Status != CAB_STATUS_SUCCESS) + { + CloseFile(DestFile); + FreeMemory(Buffer); return Status; + } /* The first data block of the file will not be found as it is located in the previous file */ @@ -1275,6 +1285,8 @@ if (Status == CAB_STATUS_NOFILE) { DPRINT(MID_TRACE, ("Cannot locate file (%u).\n", (UINT)Status)); + CloseFile(DestFile); + FreeMemory(Buffer); return Status; } @@ -1289,12 +1301,16 @@ FILE_BEGIN) == INVALID_SET_FILE_POINTER ) { DPRINT(MIN_TRACE, ("SetFilePointer() failed, error code is %u.\n", (UINT)GetLastError())); + CloseFile(DestFile); + FreeMemory(Buffer); return CAB_STATUS_INVALID_CAB; } #else if (fseek(FileHandle, (off_t)File->DataBlock->AbsoluteOffset, SEEK_SET) != 0) { DPRINT(MIN_TRACE, ("fseek() failed.\n")); + CloseFile(DestFile); + FreeMemory(Buffer); return CAB_STATUS_INVALID_CAB; } #endif @@ -1329,6 +1345,8 @@ { DPRINT(MID_TRACE, ("BytesToWrite (%u) != CFData.UncompSize (%d)\n", (UINT)BytesToWrite, CFData.UncompSize)); + CloseFile(DestFile); + FreeMemory(Buffer); return CAB_STATUS_INVALID_CAB; } @@ -1364,6 +1382,8 @@ FILE_BEGIN) == INVALID_SET_FILE_POINTER ) { DPRINT(MIN_TRACE, ("SetFilePointer() failed, error code is %u.\n", (UINT)GetLastError())); + CloseFile(DestFile); + FreeMemory(Buffer); return CAB_STATUS_INVALID_CAB; } #else @@ -1371,6 +1391,8 @@ CurrentDataNode->Data.CompSize, SEEK_SET) != 0) { DPRINT(MIN_TRACE, ("fseek() failed.\n")); + CloseFile(DestFile); + FreeMemory(Buffer); return CAB_STATUS_INVALID_CAB; } #endif @@ -2060,7 +2082,6 @@ if (FileNode->File.FileSize == (ULONG)-1) { DPRINT(MIN_TRACE, ("Cannot read from file.\n")); - FreeMemory(NewFileName); CloseFile(SrcFile); return CAB_STATUS_CANNOT_READ; } @@ -2068,7 +2089,6 @@ if (GetFileTimes(SrcFile, FileNode) != CAB_STATUS_SUCCESS) { DPRINT(MIN_TRACE, ("Cannot read file times.\n")); - FreeMemory(NewFileName); CloseFile(SrcFile); return CAB_STATUS_CANNOT_READ; } @@ -2076,7 +2096,6 @@ if (GetAttributesOnFile(FileNode) != CAB_STATUS_SUCCESS) { DPRINT(MIN_TRACE, ("Cannot read file attributes.\n")); - FreeMemory(NewFileName); CloseFile(SrcFile); return CAB_STATUS_CANNOT_READ; }

7 years, 6 months

[tfaber] 74300: [ACPI] - Ensure null termination of the method name passed to AcpiEvaluateObject in Bus_PDO_EvalMethod. Spotted by ReactCoder. CORE-13068 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Apr 14 09:32:47 2017 New Revision: 74300 URL: http://svn.reactos.org/svn/reactos?rev=74300&view=rev Log: [ACPI] - Ensure null termination of the method name passed to AcpiEvaluateObject in Bus_PDO_EvalMethod. Spotted by ReactCoder. CORE-13068 #resolve Modified: trunk/reactos/drivers/bus/acpi/eval.c Modified: trunk/reactos/drivers/bus/acpi/eval.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/eval.c?re… ============================================================================== --- trunk/reactos/drivers/bus/acpi/eval.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/eval.c [iso-8859-1] Fri Apr 14 09:32:47 2017 @@ -17,6 +17,7 @@ PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp); ACPI_EVAL_INPUT_BUFFER_SIMPLE_INTEGER *SimpleInt; ACPI_EVAL_INPUT_BUFFER_SIMPLE_STRING *SimpleStr; + CHAR MethodName[5]; if (IrpSp->Parameters.DeviceIoControl.InputBufferLength < sizeof(ULONG)) return STATUS_INVALID_PARAMETER; @@ -67,8 +68,12 @@ return STATUS_NOT_IMPLEMENTED; } + RtlCopyMemory(MethodName, + EvalInputBuff->MethodName, + sizeof(EvalInputBuff->MethodName)); + MethodName[4] = ANSI_NULL; Status = AcpiEvaluateObject(DeviceData->AcpiHandle, - (CHAR*)EvalInputBuff->MethodName, + MethodName, &ParamList, &RetBuff);

7 years, 6 months

[rnaumann] 74299: [CRT] remove a self assignment. CORE-8215 #resolve

by rnaumann＠svn.reactos.org

Author: rnaumann Date: Thu Apr 13 19:09:31 2017 New Revision: 74299 URL: http://svn.reactos.org/svn/reactos?rev=74299&view=rev Log: [CRT] remove a self assignment. CORE-8215 #resolve Modified: trunk/reactos/sdk/lib/crt/stdlib/qsort.c Modified: trunk/reactos/sdk/lib/crt/stdlib/qsort.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/crt/stdlib/qsort.c… ============================================================================== --- trunk/reactos/sdk/lib/crt/stdlib/qsort.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/crt/stdlib/qsort.c [iso-8859-1] Thu Apr 13 19:09:31 2017 @@ -189,7 +189,6 @@ if (size == 0) return; - compar = compar; thresh = size * THRESH; max = base + n * size; if (n >= THRESH)

7 years, 6 months

[rnaumann] 74298: [UXTHEME] DrawNCPreview(): Fix copypasta

by rnaumann＠svn.reactos.org

Author: rnaumann Date: Thu Apr 13 17:41:27 2017 New Revision: 74298 URL: http://svn.reactos.org/svn/reactos?rev=74298&view=rev Log: [UXTHEME] DrawNCPreview(): Fix copypasta Modified: trunk/reactos/dll/win32/uxtheme/nonclient.c Modified: trunk/reactos/dll/win32/uxtheme/nonclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/nonclien… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/nonclient.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/nonclient.c [iso-8859-1] Thu Apr 13 17:41:27 2017 @@ -1105,7 +1105,7 @@ if (!context.theme) return E_FAIL; context.scrolltheme = OpenThemeDataFromFile(hThemeFile, hwndDummy, L"SCROLLBAR", 0); - if (!context.theme) + if (!context.scrolltheme) return E_FAIL; context.Active = TRUE; context.wi.cbSize = sizeof(context.wi);

7 years, 6 months

[cfinck] 74297: [SPOOLSS] Implement the undocumented AlignRpcPtr and UndoAlignRpcPtr functions used by many Rpc* functions in spoolsv according to traced callchains. I could reverse engineer them e...

by cfinck＠svn.reactos.org

Author: cfinck Date: Thu Apr 13 16:48:40 2017 New Revision: 74297 URL: http://svn.reactos.org/svn/reactos?rev=74297&view=rev Log: [SPOOLSS] Implement the undocumented AlignRpcPtr and UndoAlignRpcPtr functions used by many Rpc* functions in spoolsv according to traced callchains. I could reverse engineer them entirely using rohitab.com's API Monitor and black-box testing. I also add documented tests covering all cases I found out. We now pass 17/17 tests on Windows Server 2003 and ReactOS. Also const-ify a parameter in PackStrings. Added: trunk/rostests/apitests/spoolss/AlignRpcPtr.c (with props) Modified: trunk/reactos/win32ss/printing/base/spoolss/memory.c trunk/reactos/win32ss/printing/base/spoolss/spoolss.spec trunk/reactos/win32ss/printing/base/spoolss/tools.c trunk/reactos/win32ss/printing/include/spoolss.h trunk/rostests/apitests/spoolss/CMakeLists.txt trunk/rostests/apitests/spoolss/testlist.c Modified: trunk/reactos/win32ss/printing/base/spoolss/memory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/printing/base/spoo… ============================================================================== --- trunk/reactos/win32ss/printing/base/spoolss/memory.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/printing/base/spoolss/memory.c [iso-8859-1] Thu Apr 13 16:48:40 2017 @@ -2,11 +2,41 @@ * PROJECT: ReactOS Spooler Router * LICENSE: GNU LGPL v2.1 or any later version as published by the Free Software Foundation * PURPOSE: Functions for allocating and freeing memory - * COPYRIGHT: Copyright 2015 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2015-2017 Colin Finck <colin(a)reactos.org> */ #include "precomp.h" + +/** + * @name AlignRpcPtr + * + * Checks if the input buffer and buffer size are 4-byte aligned. + * If the buffer size is not 4-byte aligned, it is aligned down. + * If the input buffer is not 4-byte aligned, a 4-byte aligned buffer of the aligned down buffer size is allocated and returned. + * + * @param pBuffer + * The buffer to check. + * + * @param pcbBuffer + * Pointer to the buffer size to check. Its value is aligned down if needed. + * + * @return + * pBuffer if pBuffer is already 4-byte aligned, or a newly allocated 4-byte aligned buffer of the aligned down buffer size otherwise. + * If a buffer was allocated, you have to free it using UndoAlignRpcPtr. + */ +PVOID WINAPI +AlignRpcPtr(PVOID pBuffer, PDWORD pcbBuffer) +{ + // Align down the buffer size in pcbBuffer to a 4-byte boundary. + *pcbBuffer -= *pcbBuffer % sizeof(DWORD); + + // Check if pBuffer is 4-byte aligned. If not, allocate a 4-byte aligned buffer. + if ((ULONG_PTR)pBuffer % sizeof(DWORD)) + pBuffer = DllAllocSplMem(*pcbBuffer); + + return pBuffer; +} /** * @name AllocSplStr @@ -163,6 +193,59 @@ DllFreeSplStr(*ppwszString); *ppwszString = AllocSplStr(pwszInput); - + return TRUE; } + +/** + * @name UndoAlignRpcPtr + * + * Copies the data from the aligned buffer previously allocated by AlignRpcPtr back to the original unaligned buffer. + * The aligned buffer is freed. + * + * Also aligns up the returned required buffer size of a function to a 4-byte boundary. + * + * @param pDestinationBuffer + * The original unaligned buffer, which you input as pBuffer to AlignRpcPtr. + * The data from pSourceBuffer is copied into this buffer before pSourceBuffer is freed. + * If AlignRpcPtr did not allocate a buffer, pDestinationBuffer equals pSourceBuffer and no memory is copied or freed. + * This parameter may be NULL if pSourceBuffer is NULL. + * + * @param pSourceBuffer + * The aligned buffer, which is returned by AlignRpcPtr. + * Its data is copied into pDestinationBuffer and then pSourceBuffer is freed. + * If AlignRpcPtr did not allocate a buffer, pDestinationBuffer equals pSourceBuffer and no memory is copied or freed. + * This parameter may be NULL. + * + * @param cbBuffer + * Number of bytes to copy. + * Set this to the size returned by AlignRpcPtr's pcbBuffer or less. + * + * @param pcbNeeded + * Let this parameter point to your variable calculating the needed bytes for a buffer and returning this value to the user. + * It is then aligned up to a 4-byte boundary, so that the user supplies a large enough buffer in the next call. + * Otherwise, AlignRpcPtr would align down the buffer size in the next call and your buffer would be smaller than intended. + * This parameter may be NULL. + * + * @return + * pcbNeeded + */ +PDWORD WINAPI +UndoAlignRpcPtr(PVOID pDestinationBuffer, PVOID pSourceBuffer, DWORD cbBuffer, PDWORD pcbNeeded) +{ + // If pSourceBuffer is given, and source and destination pointers don't match, + // we assume that pSourceBuffer is the buffer allocated by AlignRpcPtr. + if (pSourceBuffer && pSourceBuffer != pDestinationBuffer) + { + // Copy back the buffer data to the (usually unaligned) destination buffer + // and free the buffer allocated by AlignRpcPtr. + CopyMemory(pDestinationBuffer, pSourceBuffer, cbBuffer); + DllFreeSplMem(pSourceBuffer); + } + + // If pcbNeeded is given, align it up to a 4-byte boundary. + if (pcbNeeded && *pcbNeeded % sizeof(DWORD)) + *pcbNeeded += sizeof(DWORD) - *pcbNeeded % sizeof(DWORD); + + return pcbNeeded; +} Modified: trunk/reactos/win32ss/printing/base/spoolss/spoolss.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/printing/base/spoo… ============================================================================== --- trunk/reactos/win32ss/printing/base/spoolss/spoolss.spec [iso-8859-1] (original) +++ trunk/reactos/win32ss/printing/base/spoolss/spoolss.spec [iso-8859-1] Thu Apr 13 16:48:40 2017 @@ -16,7 +16,7 @@ @ stub AdjustPointers @ stub AdjustPointersInStructuresArray @ stub AlignKMPtr -@ stub AlignRpcPtr +@ stdcall AlignRpcPtr(ptr ptr) @ stdcall AllocSplStr(ptr) @ stub AllowRemoteCalls @ stub AppendPrinterNotifyInfoData @@ -165,7 +165,7 @@ @ stdcall StartDocPrinterW(long long ptr) @ stdcall StartPagePrinter(long) @ stub UndoAlignKMPtr -@ stub UndoAlignRpcPtr +@ stdcall UndoAlignRpcPtr(ptr ptr long ptr) @ stub UnloadDriver @ stub UnloadDriverFile @ stub UpdateBufferSize Modified: trunk/reactos/win32ss/printing/base/spoolss/tools.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/printing/base/spoo… ============================================================================== --- trunk/reactos/win32ss/printing/base/spoolss/tools.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/printing/base/spoolss/tools.c [iso-8859-1] Thu Apr 13 16:48:40 2017 @@ -86,7 +86,7 @@ * The strings are copied in reverse order, so this pointer will point to the last copied string of pSource. */ PBYTE WINAPI -PackStrings(PCWSTR* pSource, PBYTE pDest, PDWORD DestOffsets, PBYTE pEnd) +PackStrings(PCWSTR* pSource, PBYTE pDest, const DWORD* DestOffsets, PBYTE pEnd) { DWORD cbString; ULONG_PTR StringAddress; Modified: trunk/reactos/win32ss/printing/include/spoolss.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/printing/include/s… ============================================================================== --- trunk/reactos/win32ss/printing/include/spoolss.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/printing/include/spoolss.h [iso-8859-1] Thu Apr 13 16:48:40 2017 @@ -2,7 +2,7 @@ * PROJECT: ReactOS Printing Include files * LICENSE: GNU LGPLv2 or any later version as published by the Free Software Foundation * PURPOSE: Undocumented APIs of the Spooler Router "spoolss.dll" - * COPYRIGHT: Copyright 2015 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2015-2017 Colin Finck <colin(a)reactos.org> */ #ifndef _REACTOS_SPOOLSS_H @@ -19,14 +19,16 @@ } MARSHALL_DOWN_INFO, *PMARSHALL_DOWN_INFO; +PVOID WINAPI AlignRpcPtr(PVOID pBuffer, PDWORD pcbBuffer); PWSTR WINAPI AllocSplStr(PCWSTR pwszInput); PVOID WINAPI DllAllocSplMem(DWORD dwBytes); BOOL WINAPI DllFreeSplMem(PVOID pMem); BOOL WINAPI DllFreeSplStr(PWSTR pwszString); BOOL WINAPI MarshallDownStructure(PVOID pStructure, PMARSHALL_DOWN_INFO pParameters, DWORD cbStructureSize, BOOL bSomeBoolean); -PBYTE WINAPI PackStrings(PCWSTR* pSource, PBYTE pDest, PDWORD DestOffsets, PBYTE pEnd); +PBYTE WINAPI PackStrings(PCWSTR* pSource, PBYTE pDest, const DWORD* DestOffsets, PBYTE pEnd); PVOID WINAPI ReallocSplMem(PVOID pOldMem, DWORD cbOld, DWORD cbNew); BOOL WINAPI ReallocSplStr(PWSTR* ppwszString, PCWSTR pwszInput); BOOL WINAPI SplInitializeWinSpoolDrv(PVOID* pTable); +PDWORD WINAPI UndoAlignRpcPtr(PVOID pDestinationBuffer, PVOID pSourceBuffer, DWORD cbBuffer, PDWORD pcbNeeded); #endif Added: trunk/rostests/apitests/spoolss/AlignRpcPtr.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/spoolss/AlignRpc… ============================================================================== --- trunk/rostests/apitests/spoolss/AlignRpcPtr.c (added) +++ trunk/rostests/apitests/spoolss/AlignRpcPtr.c [iso-8859-1] Thu Apr 13 16:48:40 2017 @@ -0,0 +1,84 @@ +/* + * PROJECT: ReactOS Spooler Router API Tests + * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + * PURPOSE: Tests for AlignRpcPtr/UndoAlignRpcPtr + * COPYRIGHT: Copyright 2017 Colin Finck <colin(a)reactos.org> + */ + +#include <apitest.h> + +#define WIN32_NO_STATUS +#include <windef.h> +#include <winbase.h> +#include <spoolss.h> + +START_TEST(AlignRpcPtr) +{ + char* pMemory; + char* pInputBuffer; + char* pOutputBuffer; + DWORD cbBuffer; + PDWORD pcbBuffer; + + // Allocate memory with GlobalAlloc. It is guaranteed to be aligned to a 8-byte boundary. + pMemory = (char*)GlobalAlloc(GMEM_FIXED, 16); + + // First try AlignRpcPtr with already aligned memory and buffer size. It should leave everything unchanged. + pInputBuffer = pMemory; + cbBuffer = 8; + pOutputBuffer = (char*)AlignRpcPtr(pInputBuffer, &cbBuffer); + ok(pOutputBuffer == pInputBuffer, "pOutputBuffer != pInputBuffer\n"); + ok(cbBuffer == 8, "cbBuffer is %lu\n", cbBuffer); + + // Now try it with unaligned buffer size. The size should be aligned down while the buffer stays the same. + pInputBuffer = pMemory; + cbBuffer = 7; + pOutputBuffer = (char*)AlignRpcPtr(pInputBuffer, &cbBuffer); + ok(pOutputBuffer == pInputBuffer, "pOutputBuffer != pInputBuffer\n"); + ok(cbBuffer == 4, "cbBuffer is %lu\n", cbBuffer); + + // Now try with unaligned memory, but aligned buffer size. A new buffer is allocated while the size stays the same. + // The allocated buffer is then freed with UndoAlignRpcPtr. It is important to specify 0 as the size here, otherwise + // the NULL pointer for pDestinationBuffer is accessed. + pInputBuffer = pMemory + 1; + cbBuffer = 8; + pOutputBuffer = (char*)AlignRpcPtr(pInputBuffer, &cbBuffer); + ok(pOutputBuffer != pInputBuffer, "pOutputBuffer == pInputBuffer\n"); + ok(cbBuffer == 8, "cbBuffer is %lu\n", cbBuffer); + ok(!UndoAlignRpcPtr(NULL, pOutputBuffer, 0, NULL), "UndoAlignRpcPtr returns something\n"); + + // Now try with memory and buffer size unaligned. A new buffer of the aligned down size is allocated. + pInputBuffer = pMemory + 1; + cbBuffer = 7; + pOutputBuffer = (char*)AlignRpcPtr(pInputBuffer, &cbBuffer); + ok(pOutputBuffer != pInputBuffer, "pOutputBuffer == pInputBuffer\n"); + ok(cbBuffer == 4, "cbBuffer is %lu\n", cbBuffer); + + // We can also test all parameters of UndoAlignRpcPtr here. + // Because pOutputBuffer != pInputBuffer, it copies the given 4 bytes from (aligned) pOutputBuffer to (unaligned) pInputBuffer + // while aligning up the given 7 bytes in our passed &cbBuffer. + // &cbBuffer is also returned. + strcpy(pOutputBuffer, "abc"); + strcpy(pInputBuffer, "XXXXXXXXX"); + cbBuffer = 7; + pcbBuffer = UndoAlignRpcPtr(pInputBuffer, pOutputBuffer, 4, &cbBuffer); + ok(strcmp(pInputBuffer, "abc") == 0, "pInputBuffer is %s\n", pInputBuffer); + ok(pcbBuffer == &cbBuffer, "pcbBuffer != &cbBuffer\n"); + ok(cbBuffer == 8, "cbBuffer is %lu\n", cbBuffer); + + // Prove that UndoAlignRpcPtr works without any parameters and doesn't try to copy data from NULL pointers. + ok(!UndoAlignRpcPtr(NULL, NULL, 0, NULL), "UndoAlignRpcPtr returns something\n"); + ok(!UndoAlignRpcPtr(NULL, NULL, 4, NULL), "UndoAlignRpcPtr returns something\n"); + + // Prove that UndoAlignRpcPtr doesn't access source and destination memory at all when they are equal. + // If it did, it should crash here, because I'm giving invalid memory addresses. + ok(!UndoAlignRpcPtr((PVOID)1, (PVOID)1, 4, NULL), "UndoAlignRpcPtr returns something\n"); + + // Prove that the pcbNeeded parameter of UndoAlignRpcPtr works independently and aligns up everything up to a DWORD. + cbBuffer = 0xFFFFFFFF; + pcbBuffer = UndoAlignRpcPtr(NULL, NULL, 0, &cbBuffer); + ok(pcbBuffer == &cbBuffer, "pcbBuffer != &cbBuffer\n"); + ok(cbBuffer == 0, "cbBuffer is %lu\n", cbBuffer); + + GlobalFree(pMemory); +} Propchange: trunk/rostests/apitests/spoolss/AlignRpcPtr.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/spoolss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/spoolss/CMakeLis… ============================================================================== --- trunk/rostests/apitests/spoolss/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/spoolss/CMakeLists.txt [iso-8859-1] Thu Apr 13 16:48:40 2017 @@ -2,6 +2,7 @@ include_directories(${REACTOS_SOURCE_DIR}/win32ss/printing/include) list(APPEND SOURCE + AlignRpcPtr.c PackStrings.c ReallocSplStr.c SplInitializeWinSpoolDrv.c Modified: trunk/rostests/apitests/spoolss/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/spoolss/testlist… ============================================================================== --- trunk/rostests/apitests/spoolss/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/spoolss/testlist.c [iso-8859-1] Thu Apr 13 16:48:40 2017 @@ -2,7 +2,7 @@ * PROJECT: ReactOS Print Spooler Router API Tests * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation * PURPOSE: Test list - * COPYRIGHT: Copyright 2015 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2015-2017 Colin Finck <colin(a)reactos.org> */ #define __ROS_LONG64__ @@ -10,12 +10,14 @@ #define STANDALONE #include <apitest.h> +extern void func_AlignRpcPtr(void); extern void func_PackStrings(void); extern void func_ReallocSplStr(void); extern void func_SplInitializeWinSpoolDrv(void); const struct test winetest_testlist[] = { + { "AlignRpcPtr", func_AlignRpcPtr }, { "PackStrings", func_PackStrings }, { "ReallocSplStr", func_ReallocSplStr }, { "SplInitializeWinSpoolDrv", func_SplInitializeWinSpoolDrv },

7 years, 7 months

← Newer
1
...
11
12
13
14
15
16
17
18
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 April 2017