Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 54752: [USB-BRINGUP] - Implement HidP_UsageListDifference, HidP_GetUsagesEx, HidP_UsageAndPageListDifference - Fix api prototypes - Fix HidP_GetUsages linking
by janderwald＠svn.reactos.org 25 Dec '11

25 Dec '11

Author: janderwald Date: Sun Dec 25 17:09:09 2011 New Revision: 54752 URL: http://svn.reactos.org/svn/reactos?rev=54752&view=rev Log: [USB-BRINGUP] - Implement HidP_UsageListDifference, HidP_GetUsagesEx, HidP_UsageAndPageListDifference - Fix api prototypes - Fix HidP_GetUsages linking Modified: branches/usb-bringup/drivers/usb/hidparse/hidparse.c branches/usb-bringup/drivers/usb/hidparse/hidparse.spec branches/usb-bringup/include/ddk/hidpddi.h Modified: branches/usb-bringup/drivers/usb/hidparse/hidparse.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/hidpars… ============================================================================== --- branches/usb-bringup/drivers/usb/hidparse/hidparse.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/hidparse/hidparse.c [iso-8859-1] Sun Dec 25 17:09:09 2011 @@ -12,6 +12,7 @@ VOID +NTAPI HidP_FreeCollectionDescription ( IN PHIDP_DEVICE_DESC DeviceDescription) { @@ -26,13 +27,9 @@ // free report ids // ExFreePool(DeviceDescription->ReportIDs); - - // - // free description itself - // - ExFreePool(DeviceDescription); - -} +} + +#undef HidP_GetButtonCaps HIDAPI NTSTATUS @@ -43,7 +40,7 @@ PUSHORT ButtonCapsLength, PHIDP_PREPARSED_DATA PreparsedData) { - return HidP_GetSpecificButtonCaps(ReportType, 0, 0, 0, ButtonCaps, (PULONG)ButtonCapsLength, PreparsedData); + return HidP_GetSpecificButtonCaps(ReportType, HID_USAGE_PAGE_UNDEFINED, 0, 0, ButtonCaps, (PULONG)ButtonCapsLength, PreparsedData); } HIDAPI @@ -77,6 +74,7 @@ } NTSTATUS +NTAPI HidP_GetCollectionDescription( IN PHIDP_REPORT_DESCRIPTOR ReportDesc, IN ULONG DescLength, @@ -180,9 +178,123 @@ OUT PUSAGE MakeUsageList, IN ULONG UsageListLength) { - UNIMPLEMENTED - ASSERT(FALSE); - return STATUS_NOT_IMPLEMENTED; + ULONG Index, SubIndex, bFound, BreakUsageIndex = 0, MakeUsageIndex = 0; + USAGE CurrentUsage, Usage; + + if (UsageListLength) + { + Index = 0; + do + { + /* get current usage */ + CurrentUsage = PreviousUsageList[Index]; + + /* is the end of list reached? */ + if (!CurrentUsage) + break; + + /* start searching in current usage list */ + SubIndex = 0; + bFound = FALSE; + do + { + /* get usage of current list */ + Usage = CurrentUsageList[SubIndex]; + + /* end of list reached? */ + if (!Usage) + break; + + /* check if it matches the current one */ + if (CurrentUsage == Usage) + { + /* it does */ + bFound = TRUE; + break; + } + + /* move to next usage */ + SubIndex++; + }while(SubIndex < UsageListLength); + + /* was the usage found ?*/ + if (!bFound) + { + /* store it in the break usage list */ + BreakUsageList[BreakUsageIndex] = CurrentUsage; + BreakUsageIndex++; + } + + /* move to next usage */ + Index++; + + }while(Index < UsageListLength); + + /* now process the new items */ + Index = 0; + do + { + /* get current usage */ + CurrentUsage = CurrentUsageList[Index]; + + /* is the end of list reached? */ + if (!CurrentUsage) + break; + + /* start searching in current usage list */ + SubIndex = 0; + bFound = FALSE; + do + { + /* get usage of previous list */ + Usage = PreviousUsageList[SubIndex]; + + /* end of list reached? */ + if (!Usage) + break; + + /* check if it matches the current one */ + if (CurrentUsage == Usage) + { + /* it does */ + bFound = TRUE; + break; + } + + /* move to next usage */ + SubIndex++; + }while(SubIndex < UsageListLength); + + /* was the usage found ?*/ + if (!bFound) + { + /* store it in the make usage list */ + MakeUsageList[MakeUsageIndex] = CurrentUsage; + MakeUsageIndex++; + } + + /* move to next usage */ + Index++; + + }while(Index < UsageListLength); + } + + /* does the break list contain empty entries */ + if (BreakUsageIndex < UsageListLength) + { + /* zeroize entries */ + RtlZeroMemory(&BreakUsageList[BreakUsageIndex], sizeof(USAGE) * (UsageListLength - BreakUsageIndex)); + } + + /* does the make usage list contain empty entries */ + if (MakeUsageIndex < UsageListLength) + { + /* zeroize entries */ + RtlZeroMemory(&MakeUsageList[MakeUsageIndex], sizeof(USAGE) * (UsageListLength - MakeUsageIndex)); + } + + /* done */ + return HIDP_STATUS_SUCCESS; } HIDAPI @@ -234,6 +346,7 @@ } NTSTATUS +NTAPI HidP_SysPowerEvent ( IN PCHAR HidPacket, IN USHORT HidPacketLength, @@ -246,6 +359,7 @@ } NTSTATUS +NTAPI HidP_SysPowerCaps ( IN PHIDP_PREPARSED_DATA Ppd, OUT PULONG OutputBuffer) @@ -286,9 +400,7 @@ IN PCHAR Report, IN ULONG ReportLength) { - UNIMPLEMENTED - ASSERT(FALSE); - return STATUS_NOT_IMPLEMENTED; + return HidP_GetUsages(ReportType, HID_USAGE_PAGE_UNDEFINED, LinkCollection, (PUSAGE)ButtonList, UsageLength, PreparsedData, Report, ReportLength); } @@ -302,9 +414,123 @@ OUT PUSAGE_AND_PAGE MakeUsageList, IN ULONG UsageListLength) { - UNIMPLEMENTED - ASSERT(FALSE); - return STATUS_NOT_IMPLEMENTED; + ULONG Index, SubIndex, BreakUsageListIndex = 0, MakeUsageListIndex = 0, bFound; + PUSAGE_AND_PAGE CurrentUsage, Usage; + + if (UsageListLength) + { + /* process removed usages */ + Index = 0; + do + { + /* get usage from current index */ + CurrentUsage = &PreviousUsageList[Index]; + + /* end of list reached? */ + if (CurrentUsage->Usage == 0 && CurrentUsage->UsagePage == 0) + break; + + /* search in current list */ + SubIndex = 0; + bFound = FALSE; + do + { + /* get usage */ + Usage = &CurrentUsageList[SubIndex]; + + /* end of list reached? */ + if (Usage->Usage == 0 && Usage->UsagePage == 0) + break; + + /* does it match */ + if (Usage->Usage == CurrentUsage->Usage && Usage->UsagePage == CurrentUsage->UsagePage) + { + /* found match */ + bFound = TRUE; + } + + /* move to next index */ + SubIndex++; + + }while(SubIndex < UsageListLength); + + if (!bFound) + { + /* store it in break usage list */ + BreakUsageList[BreakUsageListIndex].Usage = CurrentUsage->Usage; + BreakUsageList[BreakUsageListIndex].UsagePage = CurrentUsage->UsagePage; + BreakUsageListIndex++; + } + + /* move to next index */ + Index++; + + }while(Index < UsageListLength); + + /* process new usages */ + Index = 0; + do + { + /* get usage from current index */ + CurrentUsage = &CurrentUsageList[Index]; + + /* end of list reached? */ + if (CurrentUsage->Usage == 0 && CurrentUsage->UsagePage == 0) + break; + + /* search in current list */ + SubIndex = 0; + bFound = FALSE; + do + { + /* get usage */ + Usage = &PreviousUsageList[SubIndex]; + + /* end of list reached? */ + if (Usage->Usage == 0 && Usage->UsagePage == 0) + break; + + /* does it match */ + if (Usage->Usage == CurrentUsage->Usage && Usage->UsagePage == CurrentUsage->UsagePage) + { + /* found match */ + bFound = TRUE; + } + + /* move to next index */ + SubIndex++; + + }while(SubIndex < UsageListLength); + + if (!bFound) + { + /* store it in break usage list */ + MakeUsageList[MakeUsageListIndex].Usage = CurrentUsage->Usage; + MakeUsageList[MakeUsageListIndex].UsagePage = CurrentUsage->UsagePage; + MakeUsageListIndex++; + } + + /* move to next index */ + Index++; + }while(Index < UsageListLength); + } + + /* are there remaining free list entries */ + if (BreakUsageListIndex < UsageListLength) + { + /* zero them */ + RtlZeroMemory(&BreakUsageList[BreakUsageListIndex], (UsageListLength - BreakUsageListIndex) * sizeof(USAGE_AND_PAGE)); + } + + /* are there remaining free list entries */ + if (MakeUsageListIndex < UsageListLength) + { + /* zero them */ + RtlZeroMemory(&MakeUsageList[MakeUsageListIndex], (UsageListLength - MakeUsageListIndex) * sizeof(USAGE_AND_PAGE)); + } + + /* done */ + return HIDP_STATUS_SUCCESS; } HIDAPI @@ -473,6 +699,8 @@ return STATUS_NOT_IMPLEMENTED; } +#undef HidP_GetValueCaps + HIDAPI NTSTATUS NTAPI Modified: branches/usb-bringup/drivers/usb/hidparse/hidparse.spec URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/hidpars… ============================================================================== --- branches/usb-bringup/drivers/usb/hidparse/hidparse.spec [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/hidparse/hidparse.spec [iso-8859-1] Sun Dec 25 17:09:09 2011 @@ -10,7 +10,7 @@ @ stdcall HidP_GetSpecificValueCaps(long long long long ptr ptr ptr) @ stdcall HidP_GetUsageValue(long long long long ptr ptr ptr long) @ stdcall HidP_GetUsageValueArray(long long long long ptr long ptr ptr long) -@ stdcall HidP_GetUsages(long long ptr ptr ptr ptr long) +@ stdcall HidP_GetUsages(long long long ptr ptr ptr ptr long) @ stdcall HidP_GetUsagesEx(long long ptr ptr ptr ptr long) @ stdcall HidP_GetValueCaps(long ptr ptr ptr) @ stdcall HidP_InitializeReportForID(long long ptr ptr long) Modified: branches/usb-bringup/include/ddk/hidpddi.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/include/ddk/hidpddi… ============================================================================== --- branches/usb-bringup/include/ddk/hidpddi.h [iso-8859-1] (original) +++ branches/usb-bringup/include/ddk/hidpddi.h [iso-8859-1] Sun Dec 25 17:09:09 2011 @@ -52,11 +52,13 @@ ); VOID +NTAPI HidP_FreeCollectionDescription ( IN PHIDP_DEVICE_DESC DeviceDescription ); NTSTATUS +NTAPI HidP_SysPowerEvent ( IN PCHAR HidPacket, IN USHORT HidPacketLength, @@ -65,6 +67,7 @@ ); NTSTATUS +NTAPI HidP_SysPowerCaps ( IN PHIDP_PREPARSED_DATA Ppd, OUT PULONG OutputBuffer

1 0

[ekohl] 54751: [EVENTLOG] Partially revert r54678.
by ekohl＠svn.reactos.org 25 Dec '11

25 Dec '11

Author: ekohl Date: Sun Dec 25 00:57:16 2011 New Revision: 54751 URL: http://svn.reactos.org/svn/reactos?rev=54751&view=rev Log: [EVENTLOG] Partially revert r54678. Modified: trunk/reactos/base/services/eventlog/eventlog.c trunk/reactos/base/services/eventlog/eventlog.h trunk/reactos/base/services/eventlog/file.c trunk/reactos/base/services/eventlog/logport.c trunk/reactos/base/services/eventlog/rpc.c Modified: trunk/reactos/base/services/eventlog/eventlog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/eve… ============================================================================== --- trunk/reactos/base/services/eventlog/eventlog.c [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/eventlog.c [iso-8859-1] Sun Dec 25 00:57:16 2011 @@ -463,6 +463,20 @@ uUCT.ll = uUCT.ll * 10000000 + u1970.ll; FileTimeToLocalFileTime(&uUCT.ft, &ftLocal); FileTimeToSystemTime(&ftLocal, pSystemTime); +} + +VOID SystemTimeToEventTime(SYSTEMTIME * pSystemTime, DWORD * pEventTime) +{ + SYSTEMTIME st1970 = { 1970, 1, 0, 1, 0, 0, 0, 0 }; + union + { + FILETIME ft; + ULONGLONG ll; + } Time, u1970; + + SystemTimeToFileTime(pSystemTime, &Time.ft); + SystemTimeToFileTime(&st1970, &u1970.ft); + *pEventTime = (DWORD)((Time.ll - u1970.ll) / 10000000ull); } VOID PRINT_HEADER(PEVENTLOGHEADER header) Modified: trunk/reactos/base/services/eventlog/eventlog.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/eve… ============================================================================== --- trunk/reactos/base/services/eventlog/eventlog.h [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/eventlog.h [iso-8859-1] Sun Dec 25 00:57:16 2011 @@ -16,7 +16,6 @@ #include <windows.h> #include <netevent.h> #include <lpctypes.h> -#include <kefuncs.h> #include <lpcfuncs.h> #include <rtlfuncs.h> #include <obfuncs.h> @@ -169,7 +168,6 @@ PBYTE LogfAllocAndBuildNewRecord(LPDWORD lpRecSize, DWORD dwRecordNumber, - DWORD dwTime, WORD wType, WORD wCategory, DWORD dwEventId, @@ -201,6 +199,9 @@ VOID EventTimeToSystemTime(DWORD EventTime, SYSTEMTIME * SystemTime); +VOID SystemTimeToEventTime(SYSTEMTIME * pSystemTime, + DWORD * pEventTime); + /* eventsource.c */ VOID InitEventSourceList(VOID); Modified: trunk/reactos/base/services/eventlog/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/fil… ============================================================================== --- trunk/reactos/base/services/eventlog/file.c [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/file.c [iso-8859-1] Sun Dec 25 00:57:16 2011 @@ -870,18 +870,18 @@ { DWORD dwWritten; DWORD dwRead; + SYSTEMTIME st; EVENTLOGEOF EofRec; PEVENTLOGRECORD RecBuf; LARGE_INTEGER logFileSize; - LARGE_INTEGER SystemTime; ULONG RecOffSet; ULONG WriteOffSet; if (!Buffer) return FALSE; - NtQuerySystemTime(&SystemTime); - RtlTimeToSecondsSince1970(&SystemTime, &((PEVENTLOGRECORD) Buffer)->TimeWritten); + GetSystemTime(&st); + SystemTimeToEventTime(&st, &((PEVENTLOGRECORD) Buffer)->TimeWritten); EnterCriticalSection(&LogFile->cs); @@ -1125,7 +1125,6 @@ PBYTE LogfAllocAndBuildNewRecord(LPDWORD lpRecSize, DWORD dwRecordNumber, - DWORD dwTime, WORD wType, WORD wCategory, DWORD dwEventId, @@ -1140,6 +1139,7 @@ { DWORD dwRecSize; PEVENTLOGRECORD pRec; + SYSTEMTIME SysTime; WCHAR *str; UINT i, pos; PBYTE Buffer; @@ -1148,8 +1148,8 @@ sizeof(EVENTLOGRECORD) + (lstrlenW(ComputerName) + lstrlenW(SourceName) + 2) * sizeof(WCHAR); - if (dwRecSize % sizeof(DWORD) != 0) - dwRecSize += sizeof(DWORD) - (dwRecSize % sizeof(DWORD)); + if (dwRecSize % 4 != 0) + dwRecSize += 4 - (dwRecSize % 4); dwRecSize += dwSidLength; @@ -1160,10 +1160,10 @@ } dwRecSize += dwDataSize; - if (dwRecSize % sizeof(DWORD) != 0) - dwRecSize += sizeof(DWORD) - (dwRecSize % sizeof(DWORD)); - - dwRecSize += sizeof(DWORD); + if (dwRecSize % 4 != 0) + dwRecSize += 4 - (dwRecSize % 4); + + dwRecSize += 4; Buffer = HeapAlloc(MyHeap, HEAP_ZERO_MEMORY, dwRecSize); @@ -1178,8 +1178,9 @@ pRec->Reserved = LOGFILE_SIGNATURE; pRec->RecordNumber = dwRecordNumber; - pRec->TimeGenerated = dwTime; - pRec->TimeWritten = dwTime; + GetSystemTime(&SysTime); + SystemTimeToEventTime(&SysTime, &pRec->TimeGenerated); + SystemTimeToEventTime(&SysTime, &pRec->TimeWritten); pRec->EventID = dwEventId; pRec->EventType = wType; @@ -1194,8 +1195,8 @@ pRec->UserSidOffset = pos; - if (pos % sizeof(DWORD) != 0) - pos += sizeof(DWORD) - (pos % sizeof(DWORD)); + if (pos % 4 != 0) + pos += 4 - (pos % 4); if (dwSidLength) { @@ -1222,8 +1223,8 @@ pos += dwDataSize; } - if (pos % sizeof(DWORD) != 0) - pos += sizeof(DWORD) - (pos % sizeof(DWORD)); + if (pos % 4 != 0) + pos += 4 - (pos % 4); *((PDWORD) (Buffer + pos)) = dwRecSize; @@ -1248,8 +1249,6 @@ DWORD lastRec; DWORD recSize; DWORD dwError; - DWORD dwTime; - LARGE_INTEGER SystemTime; if (!GetComputerNameW(szComputerName, &dwComputerNameLength)) { @@ -1262,13 +1261,9 @@ return; } - NtQuerySystemTime(&SystemTime); - RtlTimeToSecondsSince1970(&SystemTime, &dwTime); - lastRec = LogfGetCurrentRecord(pEventSource->LogFile); logBuffer = LogfAllocAndBuildNewRecord(&recSize, - dwTime, lastRec, wType, wCategory, Modified: trunk/reactos/base/services/eventlog/logport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/log… ============================================================================== --- trunk/reactos/base/services/eventlog/logport.c [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/logport.c [iso-8859-1] Sun Dec 25 00:57:16 2011 @@ -109,8 +109,6 @@ DWORD dwRecSize; NTSTATUS Status; PLOGFILE SystemLog = NULL; - LARGE_INTEGER SystemTime; - ULONG Seconds; DPRINT("ProcessPortMessage() called\n"); @@ -147,10 +145,7 @@ Message = (PIO_ERROR_LOG_MESSAGE) & Request.Message; ulRecNum = SystemLog ? SystemLog->Header.CurrentRecordNumber : 0; - NtQuerySystemTime(&SystemTime); - RtlTimeToSecondsSince1970(&SystemTime, &Seconds); - - pRec = (PEVENTLOGRECORD) LogfAllocAndBuildNewRecord(&dwRecSize, Seconds, + pRec = (PEVENTLOGRECORD) LogfAllocAndBuildNewRecord(&dwRecSize, ulRecNum, Message->Type, Message->EntryData.EventCategory, Message->EntryData.ErrorCode, (WCHAR *) (((PBYTE) Message) + Message->DriverNameOffset), Modified: trunk/reactos/base/services/eventlog/rpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/rpc… ============================================================================== --- trunk/reactos/base/services/eventlog/rpc.c [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/rpc.c [iso-8859-1] Sun Dec 25 00:57:16 2011 @@ -496,7 +496,6 @@ if (UserSID) dwUserSidLength = FIELD_OFFSET(SID, SubAuthority[UserSID->SubAuthorityCount]); LogBuffer = LogfAllocAndBuildNewRecord(&recSize, - Time, lastRec, EventType, EventCategory,

1 0

[cgutman] 54750: [CDFS] - Fix infinite loop of verification and read attempts when a disc change occurs on VMware while ROS is running
by cgutman＠svn.reactos.org 25 Dec '11

25 Dec '11

Author: cgutman Date: Sun Dec 25 00:14:01 2011 New Revision: 54750 URL: http://svn.reactos.org/svn/reactos?rev=54750&view=rev Log: [CDFS] - Fix infinite loop of verification and read attempts when a disc change occurs on VMware while ROS is running Modified: trunk/reactos/drivers/filesystems/cdfs/common.c Modified: trunk/reactos/drivers/filesystems/cdfs/common.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/common.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/common.c [iso-8859-1] Sun Dec 25 00:14:01 2011 @@ -49,6 +49,7 @@ KEVENT Event; PIRP Irp; NTSTATUS Status; + BOOLEAN LastChance = FALSE; again: KeInitializeEvent(&Event, @@ -104,17 +105,25 @@ { PDEVICE_OBJECT DeviceToVerify; - DPRINT1("STATUS_VERIFY_REQUIRED\n"); DeviceToVerify = IoGetDeviceToVerify(PsGetCurrentThread()); IoSetDeviceToVerify(PsGetCurrentThread(), NULL); Status = IoVerifyVolume(DeviceToVerify, FALSE); - DPRINT1("IoVerifyVolume() returned (Status %lx)\n", Status); - - if (NT_SUCCESS(Status)) + + if (NT_SUCCESS(Status) && !LastChance) { - DPRINT1("Volume verify succeeded; trying request again\n"); + DPRINT("Volume verify succeeded; trying request again\n"); + LastChance = TRUE; goto again; + } + else if (NT_SUCCESS(Status)) + { + DPRINT1("Failed to read after successful verify, aborting\n"); + Status = STATUS_DEVICE_NOT_READY; + } + else + { + DPRINT1("IoVerifyVolume() failed (Status %lx)\n", Status); } }

1 0

[tfaber] 54749: [RTL] - ASSERT on damaged heap data structures instead of producing an infinite loop See issue #5857 for more details.
by tfaber＠svn.reactos.org 24 Dec '11

24 Dec '11

Author: tfaber Date: Sat Dec 24 22:45:26 2011 New Revision: 54749 URL: http://svn.reactos.org/svn/reactos?rev=54749&view=rev Log: [RTL] - ASSERT on damaged heap data structures instead of producing an infinite loop See issue #5857 for more details. Modified: trunk/reactos/lib/rtl/heap.c Modified: trunk/reactos/lib/rtl/heap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heap.c?rev=54749&r… ============================================================================== --- trunk/reactos/lib/rtl/heap.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heap.c [iso-8859-1] Sat Dec 24 22:45:26 2011 @@ -669,6 +669,7 @@ while (!(LastEntry->Flags & HEAP_ENTRY_LAST_ENTRY)) { + ASSERT(LastEntry->Size != 0); LastEntry += LastEntry->Size; } ASSERT((LastEntry + LastEntry->Size) == FirstEntry); @@ -683,7 +684,7 @@ DPRINT("Updating UcrDescriptor %p, new Address %p, size %d\n", UcrDescriptor, UcrDescriptor->Address, UcrDescriptor->Size); - /* Set various first entry fields*/ + /* Set various first entry fields */ FirstEntry->SegmentOffset = LastEntry->SegmentOffset; FirstEntry->Size = (USHORT)(*Size >> HEAP_ENTRY_SHIFT); FirstEntry->PreviousSize = LastEntry->Size;

1 0

[tfaber] 54748: [NTDLL_APITEST] - NtAllocateVirtualMemory: fix handling of an error condition; check that newly-committed memory is zeroed
by tfaber＠svn.reactos.org 24 Dec '11

24 Dec '11

Author: tfaber Date: Sat Dec 24 10:26:04 2011 New Revision: 54748 URL: http://svn.reactos.org/svn/reactos?rev=54748&view=rev Log: [NTDLL_APITEST] - NtAllocateVirtualMemory: fix handling of an error condition; check that newly-committed memory is zeroed Modified: trunk/rostests/apitests/ntdll/NtAllocateVirtualMemory.c Modified: trunk/rostests/apitests/ntdll/NtAllocateVirtualMemory.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/NtAllocate… ============================================================================== --- trunk/rostests/apitests/ntdll/NtAllocateVirtualMemory.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/NtAllocateVirtualMemory.c [iso-8859-1] Sat Dec 24 10:26:04 2011 @@ -60,11 +60,13 @@ Status = NtAllocateVirtualMemory(NtCurrentProcess(), &FirstPageStart, 0, &Size, MEM_COMMIT, PAGE_READWRITE); if (!NT_SUCCESS(Status)) { - Size = 0; + AllocationSize = 0; Status = NtFreeVirtualMemory(NtCurrentProcess(), &AllocationStart, &AllocationSize, MEM_RELEASE); ASSERT(Status == STATUS_SUCCESS); return NULL; } + ASSERT(Size % sizeof(ULONG) == 0); + ASSERT(RtlCompareMemoryUlong(FirstPageStart, Size, 0) == Size); UserBuffer = AllocationStart; UserBuffer += AllocationSize - PAGE_SIZE - DataSize;

1 0

[cgutman] 54747: [NTOSKRNL] - Fix a reference count check in the flush path (broken by r54745)
by cgutman＠svn.reactos.org 24 Dec '11

24 Dec '11

Author: cgutman Date: Sat Dec 24 05:43:36 2011 New Revision: 54747 URL: http://svn.reactos.org/svn/reactos?rev=54747&view=rev Log: [NTOSKRNL] - Fix a reference count check in the flush path (broken by r54745) Modified: trunk/reactos/ntoskrnl/cc/view.c Modified: trunk/reactos/ntoskrnl/cc/view.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/view.c?rev=547… ============================================================================== --- trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] Sat Dec 24 05:43:36 2011 @@ -228,7 +228,9 @@ } ASSERT(current->Dirty); - if (current->ReferenceCount > 1) + + /* One reference is added above */ + if (current->ReferenceCount > 2) { KeReleaseMutex(&current->Mutex, 0); current->Bcb->Callbacks->ReleaseFromLazyWrite(

1 0

[cgutman] 54746: [NTOSKRNL] - Fix inconsistent locking
by cgutman＠svn.reactos.org 24 Dec '11

24 Dec '11

Author: cgutman Date: Sat Dec 24 03:57:10 2011 New Revision: 54746 URL: http://svn.reactos.org/svn/reactos?rev=54746&view=rev Log: [NTOSKRNL] - Fix inconsistent locking Modified: trunk/reactos/ntoskrnl/cc/view.c Modified: trunk/reactos/ntoskrnl/cc/view.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/view.c?rev=547… ============================================================================== --- trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] Sat Dec 24 03:57:10 2011 @@ -398,7 +398,7 @@ BOOLEAN Dirty, BOOLEAN Mapped) { - BOOLEAN WasDirty = CacheSeg->Dirty; + BOOLEAN WasDirty; KIRQL oldIrql; ASSERT(Bcb); @@ -406,10 +406,14 @@ DPRINT("CcReleaseCacheSegment(Bcb 0x%p, CacheSeg 0x%p, Valid %d)\n", Bcb, CacheSeg, Valid); + KeAcquireGuardedMutex(&ViewLock); + KeAcquireSpinLock(&Bcb->BcbLock, &oldIrql); + CacheSeg->Valid = Valid; + + WasDirty = CacheSeg->Dirty; CacheSeg->Dirty = CacheSeg->Dirty || Dirty; - KeAcquireGuardedMutex(&ViewLock); if (!WasDirty && CacheSeg->Dirty) { InsertTailList(&DirtySegmentListHead, &CacheSeg->DirtySegmentListEntry); @@ -420,7 +424,6 @@ { CacheSeg->MappedCount++; } - KeAcquireSpinLock(&Bcb->BcbLock, &oldIrql); CcRosCacheSegmentDecRefCount(CacheSeg); if (Mapped && CacheSeg->MappedCount == 1) { @@ -430,6 +433,7 @@ { CcRosCacheSegmentIncRefCount(CacheSeg); } + KeReleaseSpinLock(&Bcb->BcbLock, oldIrql); KeReleaseGuardedMutex(&ViewLock); KeReleaseMutex(&CacheSeg->Mutex, 0); @@ -449,8 +453,10 @@ ASSERT(Bcb); DPRINT("CcRosLookupCacheSegment(Bcb -x%p, FileOffset %d)\n", Bcb, FileOffset); - + + KeAcquireGuardedMutex(&ViewLock); KeAcquireSpinLock(&Bcb->BcbLock, &oldIrql); + current_entry = Bcb->BcbSegmentListHead.Flink; while (current_entry != &Bcb->BcbSegmentListHead) { @@ -461,6 +467,7 @@ { CcRosCacheSegmentIncRefCount(current); KeReleaseSpinLock(&Bcb->BcbLock, oldIrql); + KeReleaseGuardedMutex(&ViewLock); KeWaitForSingleObject(&current->Mutex, Executive, KernelMode, @@ -470,7 +477,10 @@ } current_entry = current_entry->Flink; } + KeReleaseSpinLock(&Bcb->BcbLock, oldIrql); + KeReleaseGuardedMutex(&ViewLock); + return(NULL); } @@ -490,29 +500,28 @@ { KeBugCheck(CACHE_MANAGER); } + + KeAcquireGuardedMutex(&ViewLock); + KeAcquireSpinLock(&Bcb->BcbLock, &oldIrql); + if (!CacheSeg->Dirty) - { - KeAcquireGuardedMutex(&ViewLock); + { InsertTailList(&DirtySegmentListHead, &CacheSeg->DirtySegmentListEntry); DirtyPageCount += Bcb->CacheSegmentSize / PAGE_SIZE; - KeReleaseGuardedMutex(&ViewLock); - } + } else { - KeAcquireSpinLock(&Bcb->BcbLock, &oldIrql); - CcRosCacheSegmentDecRefCount(CacheSeg); - KeReleaseSpinLock(&Bcb->BcbLock, oldIrql); - } - - KeAcquireGuardedMutex(&ViewLock); + CcRosCacheSegmentDecRefCount(CacheSeg); + } /* Move to the tail of the LRU list */ RemoveEntryList(&CacheSeg->CacheSegmentLRUListEntry); InsertTailList(&CacheSegmentLRUListHead, &CacheSeg->CacheSegmentLRUListEntry); + CacheSeg->Dirty = TRUE; + + KeReleaseSpinLock(&Bcb->BcbLock, oldIrql); KeReleaseGuardedMutex(&ViewLock); - - CacheSeg->Dirty = TRUE; KeReleaseMutex(&CacheSeg->Mutex, 0); return(STATUS_SUCCESS); @@ -537,6 +546,9 @@ return(STATUS_UNSUCCESSFUL); } + KeAcquireGuardedMutex(&ViewLock); + KeAcquireSpinLock(&Bcb->BcbLock, &oldIrql); + WasDirty = CacheSeg->Dirty; CacheSeg->Dirty = CacheSeg->Dirty || NowDirty; @@ -544,13 +556,10 @@ if (!WasDirty && NowDirty) { - KeAcquireGuardedMutex(&ViewLock); InsertTailList(&DirtySegmentListHead, &CacheSeg->DirtySegmentListEntry); DirtyPageCount += Bcb->CacheSegmentSize / PAGE_SIZE; - KeReleaseGuardedMutex(&ViewLock); - } - - KeAcquireSpinLock(&Bcb->BcbLock, &oldIrql); + } + CcRosCacheSegmentDecRefCount(CacheSeg); if (!WasDirty && NowDirty) { @@ -560,8 +569,9 @@ { CcRosCacheSegmentDecRefCount(CacheSeg); } + KeReleaseSpinLock(&Bcb->BcbLock, oldIrql); - + KeReleaseGuardedMutex(&ViewLock); KeReleaseMutex(&CacheSeg->Mutex, 0); return(STATUS_SUCCESS); @@ -1039,9 +1049,12 @@ } } KeReleaseMutex(&current->Mutex, 0); + + KeAcquireGuardedMutex(&ViewLock); KeAcquireSpinLock(&Bcb->BcbLock, &oldIrql); CcRosCacheSegmentDecRefCount(current); KeReleaseSpinLock(&Bcb->BcbLock, oldIrql); + KeReleaseGuardedMutex(&ViewLock); } Offset.QuadPart += Bcb->CacheSegmentSize;

1 0

[cgutman] 54745: [NTOSKRNL] - Reference the cache segment when flushing to avoid a race between deleting the file cache and the balancer flushing pages to disk which causes random cache segments to...
by cgutman＠svn.reactos.org 23 Dec '11

23 Dec '11

Author: cgutman Date: Fri Dec 23 23:20:09 2011 New Revision: 54745 URL: http://svn.reactos.org/svn/reactos?rev=54745&view=rev Log: [NTOSKRNL] - Reference the cache segment when flushing to avoid a race between deleting the file cache and the balancer flushing pages to disk which causes random cache segments to be freed while we're holding a lock on it - Fixes a crash in KeReleaseMutex (used to be a crash in ExReleasePushLock) during periods of high memory load Modified: trunk/reactos/ntoskrnl/cc/view.c Modified: trunk/reactos/ntoskrnl/cc/view.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/view.c?rev=547… ============================================================================== --- trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] Fri Dec 23 23:20:09 2011 @@ -204,10 +204,13 @@ DirtySegmentListEntry); current_entry = current_entry->Flink; + CcRosCacheSegmentIncRefCount(current); + Locked = current->Bcb->Callbacks->AcquireForLazyWrite( current->Bcb->LazyWriteContext, Wait); if (!Locked) { + CcRosCacheSegmentDecRefCount(current); continue; } @@ -220,6 +223,7 @@ { current->Bcb->Callbacks->ReleaseFromLazyWrite( current->Bcb->LazyWriteContext); + CcRosCacheSegmentDecRefCount(current); continue; } @@ -229,6 +233,7 @@ KeReleaseMutex(&current->Mutex, 0); current->Bcb->Callbacks->ReleaseFromLazyWrite( current->Bcb->LazyWriteContext); + CcRosCacheSegmentDecRefCount(current); continue; } @@ -241,6 +246,9 @@ KeReleaseMutex(&current->Mutex, 0); current->Bcb->Callbacks->ReleaseFromLazyWrite( current->Bcb->LazyWriteContext); + + KeAcquireGuardedMutex(&ViewLock); + CcRosCacheSegmentDecRefCount(current); if (!NT_SUCCESS(Status) && (Status != STATUS_END_OF_FILE)) { @@ -251,8 +259,7 @@ (*Count) += PagesPerSegment; Target -= PagesPerSegment; } - - KeAcquireGuardedMutex(&ViewLock); + current_entry = DirtySegmentListHead.Flink; }

1 0

[fireball] 54744: [RAPPS] - Bump putty version to 0.62. See issue #6775 for more details.
by fireball＠svn.reactos.org 23 Dec '11

23 Dec '11

Author: fireball Date: Fri Dec 23 21:30:40 2011 New Revision: 54744 URL: http://svn.reactos.org/svn/reactos?rev=54744&view=rev Log: [RAPPS] - Bump putty version to 0.62. See issue #6775 for more details. Modified: trunk/reactos/base/applications/rapps/rapps/putty.txt Modified: trunk/reactos/base/applications/rapps/rapps/putty.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/putty.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/putty.txt [iso-8859-1] Fri Dec 23 21:30:40 2011 @@ -2,13 +2,13 @@ [Section] Name = PuTTY -Version = 0.61 +Version = 0.62 Licence = MIT Description = A free SSH, Telnet, rlogin, and raw TCP client. Size = 1.8MB Category = 5 URLSite = http://www.chiark.greenend.org.uk/~sgtatham/putty/ -URLDownload = http://the.earth.li/~sgtatham/putty/latest/x86/putty-0.61-installer.exe +URLDownload = http://the.earth.li/~sgtatham/putty/latest/x86/putty-0.62-installer.exe CDPath = none [Section.0407]

1 0

[fireball] 54743: [DNSAPI] - Change file description in the resources. See issue #6653 for more details.
by fireball＠svn.reactos.org 23 Dec '11

23 Dec '11

Author: fireball Date: Fri Dec 23 21:25:25 2011 New Revision: 54743 URL: http://svn.reactos.org/svn/reactos?rev=54743&view=rev Log: [DNSAPI] - Change file description in the resources. See issue #6653 for more details. Modified: trunk/reactos/dll/win32/dnsapi/dnsapi.rc Modified: trunk/reactos/dll/win32/dnsapi/dnsapi.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dnsapi/dnsapi.rc… ============================================================================== --- trunk/reactos/dll/win32/dnsapi/dnsapi.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dnsapi/dnsapi.rc [iso-8859-1] Fri Dec 23 21:25:25 2011 @@ -1,5 +1,5 @@ #define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "DNSAPI.DLL Library\0" +#define REACTOS_STR_FILE_DESCRIPTION "DNS Client API Library\0" #define REACTOS_STR_INTERNAL_NAME "dnsapi\0" #define REACTOS_STR_ORIGINAL_FILENAME "dnsapi.dll\0" #include <reactos/version.rc>

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs