Ros-diffs December 2010

ros-diffs@reactos.org

20 participants
369 discussions

[tkreuzer] 50198: [ASM] KTIMER_TABLE are for win7 only
by tkreuzer＠svn.reactos.org 28 Dec '10

28 Dec '10

Author: tkreuzer Date: Tue Dec 28 19:12:01 2010 New Revision: 50198 URL: http://svn.reactos.org/svn/reactos?rev=50198&view=rev Log: [ASM] KTIMER_TABLE are for win7 only Modified: branches/cmake-bringup/include/asm/ksamd64.template.h Modified: branches/cmake-bringup/include/asm/ksamd64.template.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/asm/ksamd… ============================================================================== --- branches/cmake-bringup/include/asm/ksamd64.template.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/asm/ksamd64.template.h [iso-8859-1] Tue Dec 28 19:12:01 2010 @@ -551,12 +551,14 @@ OFFSET(TrCodePatchCycle, KTRAP_FRAME, CodePatchCycle), SIZE(KTRAP_FRAME_LENGTH, KTRAP_FRAME), +#if (NTDDI_VERSION >= NTDDI_WIN7) HEADER("KTIMER_TABLE"), OFFSET(TtEntry, KTIMER_TABLE, TimerEntries), OFFSET(TtTime, KTIMER_TABLE_ENTRY, Time), SIZE(TIMER_ENTRY_SIZE, KTIMER_TABLE_ENTRY), SIZE(TIMER_TABLE_SIZE, KTIMER_TABLE), SIZE(KTIMER_TABLE_SIZE, KTIMER_TABLE), +#endif HEADER("KTSS"), OFFSET(TssRsp0, KTSS64, Rsp0),

1 0

[tkreuzer] 50197: [DRIVERS] Add missing breaks. Patch by Samuel Serapion.
by tkreuzer＠svn.reactos.org 28 Dec '10

28 Dec '10

Author: tkreuzer Date: Tue Dec 28 18:20:28 2010 New Revision: 50197 URL: http://svn.reactos.org/svn/reactos?rev=50197&view=rev Log: [DRIVERS] Add missing breaks. Patch by Samuel Serapion. Modified: trunk/reactos/drivers/bus/acpi/compbatt/comppnp.c trunk/reactos/drivers/network/dd/ne2000/ne2000/8390.c trunk/reactos/drivers/network/tcpip/datalink/lan.c trunk/reactos/drivers/storage/class/disk/disk.c trunk/reactos/drivers/storage/classpnp/class.c trunk/reactos/drivers/storage/ide/uniata/id_init.cpp trunk/reactos/drivers/usb/nt4compat/usbdriver/ehci.c trunk/reactos/drivers/usb/nt4compat/usbdriver/umss.c Modified: trunk/reactos/drivers/bus/acpi/compbatt/comppnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/compbatt/… ============================================================================== --- trunk/reactos/drivers/bus/acpi/compbatt/comppnp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/compbatt/comppnp.c [iso-8859-1] Tue Dec 28 18:20:28 2010 @@ -436,7 +436,7 @@ DbgPrint("CompBatt: Couldn't register for PnP notification - %x\n", Status); } - + break; case IRP_MN_CANCEL_STOP_DEVICE: /* Explicitly say ok */ Modified: trunk/reactos/drivers/network/dd/ne2000/ne2000/8390.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/dd/ne2000/… ============================================================================== --- trunk/reactos/drivers/network/dd/ne2000/ne2000/8390.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/dd/ne2000/ne2000/8390.c [iso-8859-1] Tue Dec 28 18:20:28 2010 @@ -1361,7 +1361,7 @@ NICUpdateCounters(Adapter); Adapter->ReceiveError = TRUE; - + break; case ISR_PRX: NDIS_DbgPrint(MID_TRACE, ("Receive interrupt.\n")); @@ -1380,7 +1380,7 @@ NICUpdateCounters(Adapter); Adapter->TransmitError = TRUE; - + break; case ISR_PTX: NDIS_DbgPrint(MID_TRACE, ("Transmit interrupt.\n")); Modified: trunk/reactos/drivers/network/tcpip/datalink/lan.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/data… ============================================================================== --- trunk/reactos/drivers/network/tcpip/datalink/lan.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/datalink/lan.c [iso-8859-1] Tue Dec 28 18:20:28 2010 @@ -287,6 +287,7 @@ case ETYPE_ARP: TI_DbgPrint(MID_TRACE,("Received ARP Packet\n")); ARPReceive(Adapter->Context, &IPPacket); + break; default: IPPacket.Free(&IPPacket); break; Modified: trunk/reactos/drivers/storage/class/disk/disk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/disk… ============================================================================== --- trunk/reactos/drivers/storage/class/disk/disk.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/disk/disk.c [iso-8859-1] Tue Dec 28 18:20:28 2010 @@ -1908,8 +1908,9 @@ case EXECUTE_OFFLINE_DIAGS: controlCode = IOCTL_SCSI_MINIPORT_EXECUTE_OFFLINE_DIAGS; - - default: + break; + + default: status = STATUS_INVALID_PARAMETER; break; } Modified: trunk/reactos/drivers/storage/classpnp/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/c… ============================================================================== --- trunk/reactos/drivers/storage/classpnp/class.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/classpnp/class.c [iso-8859-1] Tue Dec 28 18:20:28 2010 @@ -3502,6 +3502,7 @@ } } + break; } default: { Modified: trunk/reactos/drivers/storage/ide/uniata/id_init.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_init.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_init.cpp [iso-8859-1] Tue Dec 28 18:20:28 2010 @@ -113,6 +113,7 @@ KdPrint2((PRINT_PREFIX "New ATI PATA 1 chan\n")); break; } + break; case ATA_SILICON_IMAGE_ID: if(ChipFlags & SIIBUG) { Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/ehci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/ehci.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/ehci.c [iso-8859-1] Tue Dec 28 18:20:28 2010 @@ -6006,6 +6006,7 @@ default: TRAP(); } + break; } case URB_FLAG_STATE_DOORBELL: { Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/umss.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/umss.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/umss.c [iso-8859-1] Tue Dec 28 18:20:28 2010 @@ -214,6 +214,7 @@ EXIT_DISPATCH(STATUS_SUCCESS, irp); } } + break; } case IRP_MJ_CREATE: case IRP_MJ_CLOSE:

1 0

[tkreuzer] 50196: [CMAKE/ROSSYM] Use _WIN32 instead of WIN32
by tkreuzer＠svn.reactos.org 28 Dec '10

28 Dec '10

Author: tkreuzer Date: Tue Dec 28 17:12:58 2010 New Revision: 50196 URL: http://svn.reactos.org/svn/reactos?rev=50196&view=rev Log: [CMAKE/ROSSYM] Use _WIN32 instead of WIN32 Modified: branches/cmake-bringup/lib/rossym/compat.h Modified: branches/cmake-bringup/lib/rossym/compat.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rossym/compat… ============================================================================== --- branches/cmake-bringup/lib/rossym/compat.h [iso-8859-1] (original) +++ branches/cmake-bringup/lib/rossym/compat.h [iso-8859-1] Tue Dec 28 17:12:58 2010 @@ -15,7 +15,7 @@ typedef unsigned long long u64int; typedef long long s64int; -#ifndef WIN32 +#ifndef _WIN32 typedef ulong size_t; #endif

1 0

[tkreuzer] 50195: [CMAKE/AMD64] - add missing definitions for amd64
by tkreuzer＠svn.reactos.org 28 Dec '10

28 Dec '10

Author: tkreuzer Date: Tue Dec 28 17:10:53 2010 New Revision: 50195 URL: http://svn.reactos.org/svn/reactos?rev=50195&view=rev Log: [CMAKE/AMD64] - add missing definitions for amd64 Modified: branches/cmake-bringup/ntoskrnl/include/internal/amd64/mm.h Modified: branches/cmake-bringup/ntoskrnl/include/internal/amd64/mm.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/include/… ============================================================================== --- branches/cmake-bringup/ntoskrnl/include/internal/amd64/mm.h [iso-8859-1] (original) +++ branches/cmake-bringup/ntoskrnl/include/internal/amd64/mm.h [iso-8859-1] Tue Dec 28 17:10:53 2010 @@ -195,6 +195,7 @@ // FIXME, only copied from x86 #define MI_MAKE_LOCAL_PAGE(x) ((x)->u.Hard.Global = 0) #define MI_MAKE_DIRTY_PAGE(x) ((x)->u.Hard.Dirty = 1) +#define MI_MAKE_ACCESSED_PAGE(x) ((x)->u.Hard.Accessed = 1) #define MI_PAGE_DISABLE_CACHE(x) ((x)->u.Hard.CacheDisable = 1) #define MI_PAGE_WRITE_THROUGH(x) ((x)->u.Hard.WriteThrough = 1) #define MI_PAGE_WRITE_COMBINED(x) ((x)->u.Hard.WriteThrough = 0) @@ -229,8 +230,13 @@ #define MI_MAPPING_RANGE_START (ULONG)HYPER_SPACE #define MI_MAPPING_RANGE_END (MI_MAPPING_RANGE_START + \ MI_HYPERSPACE_PTES * PAGE_SIZE) -#define MI_ZERO_PTE (PMMPTE)(MI_MAPPING_RANGE_END + \ - PAGE_SIZE) +#define MI_DUMMY_PTE (PMMPTE)(MI_MAPPING_RANGE_END + \ + PAGE_SIZE) +#define MI_VAD_BITMAP (PMMPTE)(MI_DUMMY_PTE + \ + PAGE_SIZE) +#define MI_WORKING_SET_LIST (PMMPTE)(MI_VAD_BITMAP + \ + PAGE_SIZE) + /* On x86, these two are the same */ #define MMPDE MMPTE

1 0

[tkreuzer] 50194: [CMAKE] - Add _WINKD_ definition - fix DBG and KDBG
by tkreuzer＠svn.reactos.org 28 Dec '10

28 Dec '10

Author: tkreuzer Date: Tue Dec 28 17:08:11 2010 New Revision: 50194 URL: http://svn.reactos.org/svn/reactos?rev=50194&view=rev Log: [CMAKE] - Add _WINKD_ definition - fix DBG and KDBG Modified: branches/cmake-bringup/CMakeLists.txt Modified: branches/cmake-bringup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/CMakeLists.txt?re… ============================================================================== --- branches/cmake-bringup/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/CMakeLists.txt [iso-8859-1] Tue Dec 28 17:08:11 2010 @@ -98,14 +98,14 @@ if(DBG) add_definitions(-DDBG=1 -D_SEH_ENABLE_TRACE) - else() - add_definitions(-DDBG=0) endif() if(KDBG) add_definitions(-DKDBG=1) - else() - add_definitions(-DKDBG=0) + endif() + + if(_WINKD_) + add_definitions(-D_WINKD_=1) endif() # Version Options @@ -167,7 +167,7 @@ # nci generated intermediate files - list(APPEND nci_output + list(APPEND nci_output ${REACTOS_BINARY_DIR}/ntoskrnl/include/internal/napi.h ${REACTOS_BINARY_DIR}/subsystems/win32/win32k/include/napi.h ${REACTOS_BINARY_DIR}/lib/ntdllsys/ntdll.S @@ -218,7 +218,7 @@ add_custom_command( OUTPUT ${OUTPUT_FILES} COMMAND native-gendib ${REACTOS_BINARY_DIR}/subsystems/win32/win32k/dib - DEPENDS native-gendib) + DEPENDS native-gendib) add_custom_target(gendib_generated ALL DEPENDS ${OUTPUT_FILES})

1 0

[tkreuzer] 50193: [CMAKE/GENINC] Allow amd64 machine type
by tkreuzer＠svn.reactos.org 28 Dec '10

28 Dec '10

Author: tkreuzer Date: Tue Dec 28 16:39:27 2010 New Revision: 50193 URL: http://svn.reactos.org/svn/reactos?rev=50193&view=rev Log: [CMAKE/GENINC] Allow amd64 machine type Modified: branches/cmake-bringup/tools/geninc/geninc.c Modified: branches/cmake-bringup/tools/geninc/geninc.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/geninc/geni… ============================================================================== --- branches/cmake-bringup/tools/geninc/geninc.c [iso-8859-1] (original) +++ branches/cmake-bringup/tools/geninc/geninc.c [iso-8859-1] Tue Dec 28 16:39:27 2010 @@ -111,7 +111,7 @@ goto quit; } - if (Machine != 0x14c) + if (Machine != 0x14c && Machine != 0x8664) { fprintf(stderr, "Invalid Machine: 0x%x.\n", Machine); goto quit;

1 0

[tkreuzer] 50192: [CMAKE/NCI] Handle different versions of asm include files
by tkreuzer＠svn.reactos.org 28 Dec '10

28 Dec '10

Author: tkreuzer Date: Tue Dec 28 16:28:57 2010 New Revision: 50192 URL: http://svn.reactos.org/svn/reactos?rev=50192&view=rev Log: [CMAKE/NCI] Handle different versions of asm include files Modified: branches/cmake-bringup/tools/nci/ncitool.c Modified: branches/cmake-bringup/tools/nci/ncitool.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/nci/ncitool… ============================================================================== --- branches/cmake-bringup/tools/nci/ncitool.c [iso-8859-1] (original) +++ branches/cmake-bringup/tools/nci/ncitool.c [iso-8859-1] Tue Dec 28 16:28:57 2010 @@ -418,7 +418,7 @@ SyscallId++; } } - + #if defined(_MSC_VER) for (i= 0; i < UserFiles; i++) fprintf(UserModeFiles[i], "END\n"); fprintf(KernelModeFile, "END\n"); @@ -688,16 +688,27 @@ WriteFileHeader(Files[NtosUserStubs], "System Call Stubs for Native API", argv[NtosUserStubs + ArgOffset]); - fputs("#include <asm.inc>\n" - "#include <ks386.inc>\n" - ".code\n\n", Files[NtosUserStubs]); + fputs("#include <asm.inc>\n", Files[NtosUserStubs]); + if (strcmp(ncitool_data[arch_sel].arch, "i386") == 0) + fputs("#include <ks386.inc>\n", Files[NtosUserStubs]); + else if (strcmp(ncitool_data[arch_sel].arch, "amd64") == 0) + fputs("#include <ksamd64.inc>\n", Files[NtosUserStubs]); + else if (strcmp(ncitool_data[arch_sel].arch, "arm") == 0) + fputs("#include <ksarm.inc>\n", Files[NtosUserStubs]); + fputs(".code\n\n", Files[NtosUserStubs]); WriteFileHeader(Files[NtosKernelStubs], "System Call Stubs for Native API", argv[NtosKernelStubs + ArgOffset]); - fputs("#include <asm.inc>\n" - "#include <ks386.inc>\n" - ".code\n" + + fputs("#include <asm.inc>\n", Files[NtosKernelStubs]); + if (strcmp(ncitool_data[arch_sel].arch, "i386") == 0) + fputs("#include <ks386.inc>\n", Files[NtosKernelStubs]); + else if (strcmp(ncitool_data[arch_sel].arch, "amd64") == 0) + fputs("#include <ksamd64.inc>\n", Files[NtosKernelStubs]); + else if (strcmp(ncitool_data[arch_sel].arch, "arm") == 0) + fputs("#include <ksarm.inc>\n", Files[NtosKernelStubs]); + fputs(".code\n" "EXTERN _KiSystemService:PROC\n\n", Files[NtosKernelStubs]); WriteFileHeader(Files[Win32kStubs],

1 0

[tkreuzer] 50191: [NTOSKRNL] - Use SLIST_ENTRY instead of SINGLE_LIST_ENTRY for interlocked operations - Remove unused variable
by tkreuzer＠svn.reactos.org 28 Dec '10

28 Dec '10

Author: tkreuzer Date: Tue Dec 28 16:03:46 2010 New Revision: 50191 URL: http://svn.reactos.org/svn/reactos?rev=50191&view=rev Log: [NTOSKRNL] - Use SLIST_ENTRY instead of SINGLE_LIST_ENTRY for interlocked operations - Remove unused variable Modified: branches/cmake-bringup/ntoskrnl/include/internal/amd64/mm.h branches/cmake-bringup/ntoskrnl/include/internal/ob_x.h Modified: branches/cmake-bringup/ntoskrnl/include/internal/amd64/mm.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/include/… ============================================================================== --- branches/cmake-bringup/ntoskrnl/include/internal/amd64/mm.h [iso-8859-1] (original) +++ branches/cmake-bringup/ntoskrnl/include/internal/amd64/mm.h [iso-8859-1] Tue Dec 28 16:03:46 2010 @@ -157,8 +157,6 @@ MI_MAKE_PROTOTYPE_PTE(IN PMMPTE NewPte, IN PMMPTE PointerPte) { - ULONG_PTR Offset; - /* Store the Address */ NewPte->u.Long = (ULONG64)PointerPte; Modified: branches/cmake-bringup/ntoskrnl/include/internal/ob_x.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/include/… ============================================================================== --- branches/cmake-bringup/ntoskrnl/include/internal/ob_x.h [iso-8859-1] (original) +++ branches/cmake-bringup/ntoskrnl/include/internal/ob_x.h [iso-8859-1] Tue Dec 28 16:03:46 2010 @@ -358,14 +358,14 @@ { /* The free was within the Depth */ InterlockedPushEntrySList(&List->L.ListHead, - (PSINGLE_LIST_ENTRY)Buffer); + (PSLIST_ENTRY)Buffer); } } else { /* The free was within the Depth */ InterlockedPushEntrySList(&List->L.ListHead, - (PSINGLE_LIST_ENTRY)Buffer); + (PSLIST_ENTRY)Buffer); } }

1 0

[pschweitzer] 50190: [NTOSKRNL] Apply consistent formatting to CcMapData
by pschweitzer＠svn.reactos.org 28 Dec '10

28 Dec '10

Author: pschweitzer Date: Tue Dec 28 14:49:53 2010 New Revision: 50190 URL: http://svn.reactos.org/svn/reactos?rev=50190&view=rev Log: [NTOSKRNL] Apply consistent formatting to CcMapData Modified: trunk/reactos/ntoskrnl/cc/pin.c Modified: trunk/reactos/ntoskrnl/cc/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/pin.c?rev=5019… ============================================================================== --- trunk/reactos/ntoskrnl/cc/pin.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/pin.c [iso-8859-1] Tue Dec 28 14:49:53 2010 @@ -22,84 +22,84 @@ /* * @implemented */ -BOOLEAN NTAPI -CcMapData (IN PFILE_OBJECT FileObject, - IN PLARGE_INTEGER FileOffset, - IN ULONG Length, - IN ULONG Flags, - OUT PVOID *pBcb, - OUT PVOID *pBuffer) -{ - ULONG ReadOffset; - BOOLEAN Valid; - PBCB Bcb; - PCACHE_SEGMENT CacheSeg; - NTSTATUS Status; - PINTERNAL_BCB iBcb; - ULONG ROffset; - - DPRINT("CcMapData(FileObject 0x%p, FileOffset %I64x, Length %d, Flags %d," - " pBcb 0x%p, pBuffer 0x%p)\n", FileObject, FileOffset->QuadPart, - Length, Flags, pBcb, pBuffer); - - ReadOffset = (ULONG)FileOffset->QuadPart; - - ASSERT(FileObject); - ASSERT(FileObject->SectionObjectPointer); - ASSERT(FileObject->SectionObjectPointer->SharedCacheMap); - - Bcb = FileObject->SectionObjectPointer->SharedCacheMap; - ASSERT(Bcb); - - DPRINT("AllocationSize %I64x, FileSize %I64x\n", - Bcb->AllocationSize.QuadPart, - Bcb->FileSize.QuadPart); - - if (ReadOffset % Bcb->CacheSegmentSize + Length > Bcb->CacheSegmentSize) - { - return(FALSE); - } - ROffset = ROUND_DOWN (ReadOffset, Bcb->CacheSegmentSize); - Status = CcRosRequestCacheSegment(Bcb, - ROffset, - pBuffer, - &Valid, - &CacheSeg); - if (!NT_SUCCESS(Status)) - { - return(FALSE); - } - if (!Valid) - { - if (!(Flags & MAP_WAIT)) - { - CcRosReleaseCacheSegment(Bcb, CacheSeg, FALSE, FALSE, FALSE); - return(FALSE); - } - if (!NT_SUCCESS(ReadCacheSegment(CacheSeg))) - { - CcRosReleaseCacheSegment(Bcb, CacheSeg, FALSE, FALSE, FALSE); - return(FALSE); - } - } - - *pBuffer = (PVOID)((ULONG_PTR)(*pBuffer) + (ReadOffset % Bcb->CacheSegmentSize)); - iBcb = ExAllocateFromNPagedLookasideList(&iBcbLookasideList); - if (iBcb == NULL) - { - CcRosReleaseCacheSegment(Bcb, CacheSeg, TRUE, FALSE, FALSE); - return FALSE; - } - memset(iBcb, 0, sizeof(INTERNAL_BCB)); - iBcb->PFCB.NodeTypeCode = 0xDE45; /* Undocumented (CAPTIVE_PUBLIC_BCB_NODETYPECODE) */ - iBcb->PFCB.NodeByteSize = sizeof(PUBLIC_BCB); - iBcb->PFCB.MappedLength = Length; - iBcb->PFCB.MappedFileOffset = *FileOffset; - iBcb->CacheSegment = CacheSeg; - iBcb->Dirty = FALSE; - iBcb->RefCount = 1; - *pBcb = (PVOID)iBcb; - return(TRUE); +BOOLEAN +NTAPI +CcMapData( + IN PFILE_OBJECT FileObject, + IN PLARGE_INTEGER FileOffset, + IN ULONG Length, + IN ULONG Flags, + OUT PVOID *pBcb, + OUT PVOID *pBuffer) +{ + ULONG ReadOffset; + BOOLEAN Valid; + PBCB Bcb; + PCACHE_SEGMENT CacheSeg; + NTSTATUS Status; + PINTERNAL_BCB iBcb; + ULONG ROffset; + + DPRINT("CcMapData(FileObject 0x%p, FileOffset %I64x, Length %d, Flags %d," + " pBcb 0x%p, pBuffer 0x%p)\n", FileObject, FileOffset->QuadPart, + Length, Flags, pBcb, pBuffer); + + ReadOffset = (ULONG)FileOffset->QuadPart; + + ASSERT(FileObject); + ASSERT(FileObject->SectionObjectPointer); + ASSERT(FileObject->SectionObjectPointer->SharedCacheMap); + + Bcb = FileObject->SectionObjectPointer->SharedCacheMap; + ASSERT(Bcb); + + DPRINT("AllocationSize %I64x, FileSize %I64x\n", + Bcb->AllocationSize.QuadPart, + Bcb->FileSize.QuadPart); + + if (ReadOffset % Bcb->CacheSegmentSize + Length > Bcb->CacheSegmentSize) + { + return FALSE; + } + ROffset = ROUND_DOWN (ReadOffset, Bcb->CacheSegmentSize); + Status = CcRosRequestCacheSegment(Bcb, ROffset, + pBuffer, &Valid, + &CacheSeg); + if (!NT_SUCCESS(Status)) + { + return FALSE; + } + if (!Valid) + { + if (!(Flags & MAP_WAIT)) + { + CcRosReleaseCacheSegment(Bcb, CacheSeg, FALSE, FALSE, FALSE); + return FALSE; + } + if (!NT_SUCCESS(ReadCacheSegment(CacheSeg))) + { + CcRosReleaseCacheSegment(Bcb, CacheSeg, FALSE, FALSE, FALSE); + return FALSE; + } + } + + *pBuffer = (PVOID)((ULONG_PTR)(*pBuffer) + (ReadOffset % Bcb->CacheSegmentSize)); + iBcb = ExAllocateFromNPagedLookasideList(&iBcbLookasideList); + if (iBcb == NULL) + { + CcRosReleaseCacheSegment(Bcb, CacheSeg, TRUE, FALSE, FALSE); + return FALSE; + } + memset(iBcb, 0, sizeof(INTERNAL_BCB)); + iBcb->PFCB.NodeTypeCode = 0xDE45; /* Undocumented (CAPTIVE_PUBLIC_BCB_NODETYPECODE) */ + iBcb->PFCB.NodeByteSize = sizeof(PUBLIC_BCB); + iBcb->PFCB.MappedLength = Length; + iBcb->PFCB.MappedFileOffset = *FileOffset; + iBcb->CacheSegment = CacheSeg; + iBcb->Dirty = FALSE; + iBcb->RefCount = 1; + *pBcb = (PVOID)iBcb; + return TRUE; } /*

1 0

[tkreuzer] 50189: [CMAKE] Fix stdcall entry points for x86
by tkreuzer＠svn.reactos.org 28 Dec '10

28 Dec '10

Author: tkreuzer Date: Tue Dec 28 12:42:05 2010 New Revision: 50189 URL: http://svn.reactos.org/svn/reactos?rev=50189&view=rev Log: [CMAKE] Fix stdcall entry points for x86 Modified: branches/cmake-bringup/gcc.cmake Modified: branches/cmake-bringup/gcc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/gcc.cmake?rev=501… ============================================================================== --- branches/cmake-bringup/gcc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/gcc.cmake [iso-8859-1] Tue Dec 28 12:42:05 2010 @@ -105,10 +105,11 @@ if(${ENTRYPOINT} STREQUAL "0") add_linkerflag(${MODULE} "-Wl,-entry,0") elseif(ARCH MATCHES i386) + set(_entrysymbol _${ENTRYPOINT}) if (${ARGC} GREATER 2) - set(ENTRYPOINT ${ENTRYPOINT}@${ARGV2}) - endif() - add_linkerflag(${MODULE} "-Wl,-entry,_${ENTRYPOINT}") + set(_entrysymbol ${_entrysymbol}@${ARGV2}) + endif() + add_linkerflag(${MODULE} "-Wl,-entry,${_entrysymbol}") else() add_linkerflag(${MODULE} "-Wl,-entry,${ENTRYPOINT}") endif()

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
37
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2010