Ros-diffs July 2010

ros-diffs@reactos.org

17 participants
467 discussions

[tkreuzer] 48076: [NTOSKRNL] ULONG -> ULONG_PTR
by tkreuzer＠svn.reactos.org 16 Jul '10

16 Jul '10

Author: tkreuzer Date: Fri Jul 16 12:27:40 2010 New Revision: 48076 URL: http://svn.reactos.org/svn/reactos?rev=48076&view=rev Log: [NTOSKRNL] ULONG -> ULONG_PTR Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Fri Jul 16 12:27:40 2010 @@ -401,7 +401,7 @@ extern PMMPTE MmSystemPtesEnd[MaximumPtePoolTypes]; extern PMEMORY_ALLOCATION_DESCRIPTOR MxFreeDescriptor; extern MEMORY_ALLOCATION_DESCRIPTOR MxOldFreeDescriptor; -extern ULONG MxPfnAllocation; +extern ULONG_PTR MxPfnAllocation; extern MM_PAGED_POOL_INFO MmPagedPoolInfo; extern RTL_BITMAP MiPfnBitMap; extern KGUARDED_MUTEX MmPagedPoolMutex; @@ -432,7 +432,7 @@ extern ULONG MmMaxAdditionNonPagedPoolPerMb; extern ULONG MmSecondaryColors; extern ULONG MmSecondaryColorMask; -extern ULONG MmNumberOfSystemPtes; +extern ULONG_PTR MmNumberOfSystemPtes; extern ULONG MmMaximumNonPagedPoolPercent; extern ULONG MmLargeStackSize; extern PMMCOLOR_TABLES MmFreePagesByColor[FreePageList + 1];

1 0

[evb] 48075: IRP_MN_START_DEVICE implement for ROOT FDO (PciFdoStartDevice) PciInitializeArbiterRanges implement to scan arbiter not yet construct since Arb library missing Add PCI state machine (PciBeginStateTransition, PciCancelStateTransition, PciCommitStateTransition) andtransition array (PnpStateTransitionArray) to check if valid Now IRP_MN_QUERY_DEVICE_RELATIONS sent to ROOT FDO means time to enumerate bus!
by evb＠svn.reactos.org 16 Jul '10

16 Jul '10

Author: evb Date: Fri Jul 16 01:14:52 2010 New Revision: 48075 URL: http://svn.reactos.org/svn/reactos?rev=48075&view=rev Log: IRP_MN_START_DEVICE implement for ROOT FDO (PciFdoStartDevice) PciInitializeArbiterRanges implement to scan arbiter not yet construct since Arb library missing Add PCI state machine (PciBeginStateTransition, PciCancelStateTransition, PciCommitStateTransition) andtransition array (PnpStateTransitionArray) to check if valid Now IRP_MN_QUERY_DEVICE_RELATIONS sent to ROOT FDO means time to enumerate bus! Modified: trunk/reactos/drivers/bus/pcix/arb/arb_comn.c trunk/reactos/drivers/bus/pcix/fdo.c trunk/reactos/drivers/bus/pcix/pci.h trunk/reactos/drivers/bus/pcix/pci/state.c trunk/reactos/drivers/bus/pcix/utils.c Modified: trunk/reactos/drivers/bus/pcix/arb/arb_comn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/arb/arb_c… ============================================================================== --- trunk/reactos/drivers/bus/pcix/arb/arb_comn.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/arb/arb_comn.c [iso-8859-1] Fri Jul 16 01:14:52 2010 @@ -121,4 +121,83 @@ /* Return to caller */ return Status; } + +NTSTATUS +NTAPI +PciInitializeArbiterRanges(IN PPCI_FDO_EXTENSION DeviceExtension, + IN PCM_RESOURCE_LIST Resources) +{ + //PPCI_PDO_EXTENSION PdoExtension; + CM_RESOURCE_TYPE DesiredType; + PVOID Instance; + PCI_SIGNATURE ArbiterType; + + /* Arbiters should not already be initialized */ + if (DeviceExtension->ArbitersInitialized) + { + /* Duplicated start request, fail initialization */ + DPRINT1("PCI Warning hot start FDOx %08x, resource ranges not checked.\n", DeviceExtension); + return STATUS_INVALID_DEVICE_REQUEST; + } + + /* Check for non-root FDO */ + if (!PCI_IS_ROOT_FDO(DeviceExtension)) + { + /* Grab the PDO */ +#if 0 // when pdo support + PdoExtension = (PPCI_PDO_EXTENSION)DeviceExtension->PhysicalDeviceObject->DeviceExtension; + ASSERT(PdoExtension->ExtensionType == PciPdoExtensionType); +#endif + /* Multiple FDOs are not yet supported */ + UNIMPLEMENTED; + while (TRUE); + return STATUS_SUCCESS; + } + + /* Loop all arbiters */ + for (ArbiterType = PciArb_Io; ArbiterType <= PciArb_Memory; ArbiterType++) + { + /* Pick correct resource type for each arbiter */ + if (ArbiterType == PciArb_Io) + { + /* I/O Port */ + DesiredType = CmResourceTypePort; + } + else if (ArbiterType == PciArb_Memory) + { + /* Device RAM */ + DesiredType = CmResourceTypeMemory; + } + else + { + /* Ignore anything else */ + continue; + } + + /* Find an arbiter of this type */ + Instance = PciFindNextSecondaryExtension(&DeviceExtension->SecondaryExtension, + ArbiterType); + if (Instance) + { + /* + * Now we should initialize it, not yet implemented because Arb + * library isn't yet implemented, not even the headers. + */ + UNIMPLEMENTED; + //while (TRUE); + } + else + { + /* The arbiter was not found, this is an error! */ + DPRINT1("PCI - FDO ext 0x%08x %s arbiter (REQUIRED) is missing.\n", + DeviceExtension, + PciArbiterNames[ArbiterType - PciArb_Io]); + } + } + + /* Arbiters are now initialized */ + DeviceExtension->ArbitersInitialized = TRUE; + return STATUS_SUCCESS; +} + /* EOF */ Modified: trunk/reactos/drivers/bus/pcix/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/fdo.c?rev… ============================================================================== --- trunk/reactos/drivers/bus/pcix/fdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/fdo.c [iso-8859-1] Fri Jul 16 01:14:52 2010 @@ -76,9 +76,49 @@ IN PIO_STACK_LOCATION IoStackLocation, IN PPCI_FDO_EXTENSION DeviceExtension) { - UNIMPLEMENTED; - while (TRUE); - return STATUS_NOT_SUPPORTED; + NTSTATUS Status; + PCM_RESOURCE_LIST Resources; + PAGED_CODE(); + + /* The device stack must be starting the FDO in a success path */ + if (!NT_SUCCESS(Irp->IoStatus.Status)) return STATUS_NOT_SUPPORTED; + + /* Attempt to switch the state machine to the started state */ + Status = PciBeginStateTransition(DeviceExtension, PciStarted); + if (!NT_SUCCESS(Status)) return Status; + + /* Check for any boot-provided resources */ + Resources = IoStackLocation->Parameters.StartDevice.AllocatedResources; + DPRINT1("Resources: %p\n", Resources); + if ((Resources) && !(PCI_IS_ROOT_FDO(DeviceExtension))) + { + /* These resources would only be for non-root FDOs, unhandled for now */ + ASSERT(Resources->Count == 1); + UNIMPLEMENTED; + while (TRUE); + } + + /* Initialize the arbiter for this FDO */ + Status = PciInitializeArbiterRanges(DeviceExtension, Resources); + if (!NT_SUCCESS(Status)) + { + /* Cancel the transition if this failed */ + PciCancelStateTransition(DeviceExtension, PciStarted); + return Status; + } + + /* Again, check for boot-provided resources for non-root FDO */ + if ((Resources) && !(PCI_IS_ROOT_FDO(DeviceExtension))) + { + /* Unhandled for now */ + ASSERT(Resources->Count == 1); + UNIMPLEMENTED; + while (TRUE); + } + + /* Commit the transition to the started state */ + PciCommitStateTransition(DeviceExtension, PciStarted); + return STATUS_SUCCESS; } NTSTATUS Modified: trunk/reactos/drivers/bus/pcix/pci.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/pci.h?rev… ============================================================================== --- trunk/reactos/drivers/bus/pcix/pci.h [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/pci.h [iso-8859-1] Fri Jul 16 01:14:52 2010 @@ -309,7 +309,6 @@ IN PIRP Irp ); - // // Power Routines // @@ -564,6 +563,13 @@ IN PVOID Destructor ); +PPCI_SECONDARY_EXTENSION +NTAPI +PciFindNextSecondaryExtension( + IN PSINGLE_LIST_ENTRY ListHead, + IN PCI_SIGNATURE ExtensionType +); + // // Configuration Routines // @@ -582,6 +588,28 @@ IN PPCI_FDO_EXTENSION DeviceExtension ); +NTSTATUS +NTAPI +PciBeginStateTransition( + IN PPCI_FDO_EXTENSION DeviceExtension, + IN PCI_STATE NewState +); + +NTSTATUS +NTAPI +PciCancelStateTransition( + IN PPCI_FDO_EXTENSION DeviceExtension, + IN PCI_STATE NewState +); + +VOID +NTAPI +PciCommitStateTransition( + IN PPCI_FDO_EXTENSION DeviceExtension, + IN PCI_STATE NewState +); + + // // Arbiter Support // @@ -589,6 +617,13 @@ NTAPI PciInitializeArbiters( IN PPCI_FDO_EXTENSION FdoExtension +); + +NTSTATUS +NTAPI +PciInitializeArbiterRanges( + IN PPCI_FDO_EXTENSION DeviceExtension, + IN PCM_RESOURCE_LIST Resources ); // Modified: trunk/reactos/drivers/bus/pcix/pci/state.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/pci/state… ============================================================================== --- trunk/reactos/drivers/bus/pcix/pci/state.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/pci/state.c [iso-8859-1] Fri Jul 16 01:14:52 2010 @@ -14,6 +14,72 @@ /* GLOBALS ********************************************************************/ +PCHAR PciTransitionText[PciMaxObjectState + 1] = +{ + "PciNotStarted", + "PciStarted", + "PciDeleted", + "PciStopped", + "PciSurpriseRemoved", + "PciSynchronizedOperation", + "PciMaxObjectState" +}; + +NTSTATUS PnpStateCancelArray[PciMaxObjectState] = +{ + STATUS_INVALID_DEVICE_REQUEST, + STATUS_FAIL_CHECK, + STATUS_INVALID_DEVICE_STATE, + STATUS_INVALID_DEVICE_STATE, + STATUS_FAIL_CHECK, + STATUS_FAIL_CHECK +}; + +NTSTATUS PnpStateTransitionArray[PciMaxObjectState * PciMaxObjectState] = +{ + STATUS_SUCCESS, // Not Started -> Not Started + STATUS_SUCCESS, // Started -> Not Started + STATUS_FAIL_CHECK, // Deleted -> Not Started + STATUS_SUCCESS, // Stopped -> Not Started + STATUS_FAIL_CHECK, // Surprise Removed -> Not Started + STATUS_FAIL_CHECK, // Synchronized Operation -> Not Started + + STATUS_SUCCESS, // Not Started -> Started + STATUS_FAIL_CHECK, // Started -> Started + STATUS_FAIL_CHECK, // Deleted -> Started + STATUS_SUCCESS, // Stopped -> Started + STATUS_FAIL_CHECK, // Surprise Removed -> Started + STATUS_FAIL_CHECK, // Synchronized Operation -> Started + + STATUS_SUCCESS, // Not Started -> Deleted + STATUS_SUCCESS, // Started -> Deleted + STATUS_FAIL_CHECK, // Deleted -> Deleted + STATUS_FAIL_CHECK, // Stopped -> Deleted + STATUS_SUCCESS, // Surprise Removed -> Deleted + STATUS_FAIL_CHECK, // Synchronized Operation -> Deleted + + STATUS_INVALID_DEVICE_REQUEST, // Not Started -> Stopped + STATUS_SUCCESS, // Started -> Stopped + STATUS_FAIL_CHECK, // Deleted -> Stopped + STATUS_FAIL_CHECK, // Stopped -> Stopped + STATUS_FAIL_CHECK, // Surprise Removed -> Stopped + STATUS_FAIL_CHECK, // Synchronized Operation -> Stopped + + STATUS_SUCCESS, // Not Started -> Surprise Removed + STATUS_SUCCESS, // Started -> Surprise Removed + STATUS_FAIL_CHECK, // Deleted -> Surprise Removed + STATUS_SUCCESS, // Stopped -> Surprise Removed + STATUS_FAIL_CHECK, // Surprise Removed -> Surprise Removed + STATUS_FAIL_CHECK, // Synchronized Operation -> Surprise Removed + + STATUS_SUCCESS, // Not Started -> Synchronized Operation + STATUS_SUCCESS, // Started -> Synchronized Operation + STATUS_INVALID_DEVICE_STATE, // Deleted -> Synchronized Operation + STATUS_SUCCESS, // Stopped -> Synchronized Operation + STATUS_INVALID_DEVICE_STATE, // Surprise Removed -> Synchronized Operation + STATUS_FAIL_CHECK // Synchronized Operation -> Synchronized Operation +}; + /* FUNCTIONS ******************************************************************/ VOID @@ -25,4 +91,104 @@ DeviceExtension->TentativeNextState = PciNotStarted; } +NTSTATUS +NTAPI +PciBeginStateTransition(IN PPCI_FDO_EXTENSION DeviceExtension, + IN PCI_STATE NewState) +{ + PCI_STATE CurrentState; + NTSTATUS Status; + DPRINT1("PCI Request to begin transition of Extension %p to %s ->", + DeviceExtension, + PciTransitionText[NewState]); + + /* Assert the device isn't already in a pending transition */ + ASSERT(DeviceExtension->TentativeNextState == DeviceExtension->DeviceState); + + /* Assert this is a valid state */ + CurrentState = DeviceExtension->DeviceState; + ASSERT(CurrentState < PciMaxObjectState); + ASSERT(NewState < PciMaxObjectState); + + /* Lookup if this state transition is valid */ + Status = PnpStateTransitionArray[CurrentState + 6 * NewState]; + if (Status == STATUS_FAIL_CHECK) + { + /* Invalid transition (logical fault) */ + DPRINT1("ERROR\nPCI: Error trying to enter state \"%s\" " + "from state \"%s\"\n", + PciTransitionText[NewState], + PciTransitionText[CurrentState]); + DbgBreakPoint(); + } + else if (Status == STATUS_INVALID_DEVICE_REQUEST) + { + /* Invalid transition (illegal request) */ + DPRINT1("ERROR\nPCI: Illegal request to try to enter state \"%s\" " + "from state \"%s\", rejecting", + PciTransitionText[NewState], + PciTransitionText[CurrentState]); + } + + /* New state must be different from current, unless request is at fault */ + ASSERT((NewState != DeviceExtension->DeviceState) || (!NT_SUCCESS(Status))); + + /* Enter the new state if successful, and return state status */ + if (NT_SUCCESS(Status)) DeviceExtension->TentativeNextState = NewState; + DbgPrint("%x\n", Status); + return Status; +} + +NTSTATUS +NTAPI +PciCancelStateTransition(IN PPCI_FDO_EXTENSION DeviceExtension, + IN PCI_STATE StateNotEntered) +{ + NTSTATUS Status; + DPRINT1("PCI Request to cancel transition of Extension %p to %s ->", + DeviceExtension, + PciTransitionText[StateNotEntered]); + + /* The next state can't be the state the device is already in */ + if (DeviceExtension->TentativeNextState == DeviceExtension->DeviceState) + { + /* It's too late since the state was already committed */ + ASSERT(StateNotEntered < PciMaxObjectState); + ASSERT(PnpStateCancelArray[StateNotEntered] != STATUS_FAIL_CHECK); + + /* Return failure */ + Status = STATUS_INVALID_DEVICE_STATE; + DbgPrint("%x\n", Status); + } + else + { + /* The device hasn't yet entered the state, so it's still possible to cancel */ + ASSERT(DeviceExtension->TentativeNextState == StateNotEntered); + DeviceExtension->TentativeNextState = DeviceExtension->DeviceState; + + /* Return success */ + Status = STATUS_SUCCESS; + DbgPrint("%x\n", Status); + } + + /* Return the cancel state */ + return Status; +} + +VOID +NTAPI +PciCommitStateTransition(IN PPCI_FDO_EXTENSION DeviceExtension, + IN PCI_STATE NewState) +{ + DPRINT1("PCI Commit transition of Extension %p to %s\n", + DeviceExtension, PciTransitionText[NewState]); + + /* Make sure this is a valid commit */ + ASSERT(NewState != PciSynchronizedOperation); + ASSERT(DeviceExtension->TentativeNextState == NewState); + + /* Enter the new state */ + DeviceExtension->DeviceState = NewState; +} + /* EOF */ Modified: trunk/reactos/drivers/bus/pcix/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/utils.c?r… ============================================================================== --- trunk/reactos/drivers/bus/pcix/utils.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/utils.c [iso-8859-1] Fri Jul 16 01:14:52 2010 @@ -555,4 +555,24 @@ return Status; } +PPCI_SECONDARY_EXTENSION +NTAPI +PciFindNextSecondaryExtension(IN PSINGLE_LIST_ENTRY ListHead, + IN PCI_SIGNATURE ExtensionType) +{ + PSINGLE_LIST_ENTRY NextEntry; + PPCI_SECONDARY_EXTENSION Extension; + + /* Scan the list */ + for (NextEntry = ListHead; NextEntry; NextEntry = NextEntry->Next) + { + /* Grab each extension and check if it's the one requested */ + Extension = CONTAINING_RECORD(NextEntry, PCI_SECONDARY_EXTENSION, List); + if (Extension->ExtensionType == ExtensionType) return Extension; + } + + /* Nothing was found */ + return NULL; +} + /* EOF */

1 0

[evb] 48074: Fix for code to handle IRP dispatching when unrecognized IRP (Thanks you sir_richard) Add FDO IRP_MN_QUERY_INTERFACE support (it calls PciQueryInterface) Add all PCI interface descriptor: PciLocationInterface (GUID_PNP_LOCATION_INTERFACE), PciPmeInterface (GUID_PCI_PME_INTERFACE), PciCardbusPrivateInterface (GUID_PCI_CARDBUS_INTERFACE_PRIVATE), PciLegacyDeviceDetectionInterface (GUID_LEGACY_DEVICE_DETECTION_STANDARD), AgpTargetInterface (GUID_AGP_TARGET_BUS_INTERFACE_STANDARD), PciR
by evb＠svn.reactos.org 16 Jul '10

16 Jul '10

Author: evb Date: Fri Jul 16 00:39:54 2010 New Revision: 48074 URL: http://svn.reactos.org/svn/reactos?rev=48074&view=rev Log: Fix for code to handle IRP dispatching when unrecognized IRP (Thanks you sir_richard) Add FDO IRP_MN_QUERY_INTERFACE support (it calls PciQueryInterface) Add all PCI interface descriptor: PciLocationInterface (GUID_PNP_LOCATION_INTERFACE), PciPmeInterface (GUID_PCI_PME_INTERFACE), PciCardbusPrivateInterface (GUID_PCI_CARDBUS_INTERFACE_PRIVATE), PciLegacyDeviceDetectionInterface (GUID_LEGACY_DEVICE_DETECTION_STANDARD), AgpTargetInterface (GUID_AGP_TARGET_BUS_INTERFACE_STANDARD), PciRoutingInterface (GUID_INT_ROUTE_INTERFACE_STANDARD), BusHandlerInterface (GUID_BUS_INTERFACE_STANDARD) and stub initializer and constructor. Add missing devhere.c interface file Add all PCI arbiter descritptor: ArbiterInterfaceBusNumber, ArbiterInterfaceMemory, ArbiterInterfaceIo. Write constructor stub but not handled ArbitersInitialized == TRUE Also add last-resort PCI interface: TranslatorInterfaceInterrupt (GUID_TRANSLATOR_INTERFACE_STANDARD) and part implement tranirq_Constructor Add PciQueryInterface to find correct FDO/PDO/ROOT interface for a request and call interface constructor Fix interface signatures, fix interface constructor type and PCI_INTERFACE, add interface flags (Thanks sir_richard) Fix Aribtriter code (Thanks sir_richard) Now another 1200 codes added, soon time for enumeration code! Added: trunk/reactos/drivers/bus/pcix/intrface/devhere.c (with props) Modified: trunk/reactos/drivers/bus/pcix/arb/ar_busno.c trunk/reactos/drivers/bus/pcix/arb/ar_memio.c trunk/reactos/drivers/bus/pcix/arb/arb_comn.c trunk/reactos/drivers/bus/pcix/arb/tr_irq.c trunk/reactos/drivers/bus/pcix/dispatch.c trunk/reactos/drivers/bus/pcix/fdo.c trunk/reactos/drivers/bus/pcix/intrface/agpintrf.c trunk/reactos/drivers/bus/pcix/intrface/busintrf.c trunk/reactos/drivers/bus/pcix/intrface/cardbus.c trunk/reactos/drivers/bus/pcix/intrface/intrface.c trunk/reactos/drivers/bus/pcix/intrface/lddintrf.c trunk/reactos/drivers/bus/pcix/intrface/locintrf.c trunk/reactos/drivers/bus/pcix/intrface/pmeintf.c trunk/reactos/drivers/bus/pcix/intrface/routintf.c trunk/reactos/drivers/bus/pcix/pci.h trunk/reactos/drivers/bus/pcix/pcix.rbuild Modified: trunk/reactos/drivers/bus/pcix/arb/ar_busno.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/arb/ar_bu… ============================================================================== --- trunk/reactos/drivers/bus/pcix/arb/ar_busno.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/arb/ar_busno.c [iso-8859-1] Fri Jul 16 00:39:54 2010 @@ -14,6 +14,68 @@ /* GLOBALS ********************************************************************/ +PCI_INTERFACE ArbiterInterfaceBusNumber = +{ + &GUID_ARBITER_INTERFACE_STANDARD, + sizeof(ARBITER_INTERFACE), + 0, + 0, + PCI_INTERFACE_FDO, + 0, + PciArb_BusNumber, + arbusno_Constructor, + arbusno_Initializer +}; + /* FUNCTIONS ******************************************************************/ +NTSTATUS +NTAPI +arbusno_Initializer(IN PVOID Instance) +{ + /* Not yet implemented */ + UNIMPLEMENTED; + //while (TRUE); + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +arbusno_Constructor(IN PVOID DeviceExtension, + IN PVOID PciInterface, + IN PVOID InterfaceData, + IN USHORT Version, + IN USHORT Size, + IN PINTERFACE Interface) +{ + PPCI_FDO_EXTENSION FdoExtension = (PPCI_FDO_EXTENSION)DeviceExtension; + NTSTATUS Status; + PAGED_CODE(); + + /* Make sure it's the expected interface */ + if ((ULONG)InterfaceData != CmResourceTypeBusNumber) + { + /* Arbiter support must have been initialized first */ + if (FdoExtension->ArbitersInitialized) + { + /* Not yet implemented */ + UNIMPLEMENTED; + while (TRUE); + } + else + { + /* No arbiters for this FDO */ + Status = STATUS_NOT_SUPPORTED; + } + } + else + { + /* Not the right interface */ + Status = STATUS_INVALID_PARAMETER_5; + } + + /* Return the status */ + return Status; +} + /* EOF */ Modified: trunk/reactos/drivers/bus/pcix/arb/ar_memio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/arb/ar_me… ============================================================================== --- trunk/reactos/drivers/bus/pcix/arb/ar_memio.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/arb/ar_memio.c [iso-8859-1] Fri Jul 16 00:39:54 2010 @@ -14,6 +14,130 @@ /* GLOBALS ********************************************************************/ +PCI_INTERFACE ArbiterInterfaceMemory = +{ + &GUID_ARBITER_INTERFACE_STANDARD, + sizeof(ARBITER_INTERFACE), + 0, + 0, + PCI_INTERFACE_FDO, + 0, + PciArb_Memory, + armem_Constructor, + armem_Initializer +}; + +PCI_INTERFACE ArbiterInterfaceIo = +{ + &GUID_ARBITER_INTERFACE_STANDARD, + sizeof(ARBITER_INTERFACE), + 0, + 0, + PCI_INTERFACE_FDO, + 0, + PciArb_Io, + ario_Constructor, + ario_Initializer +}; + /* FUNCTIONS ******************************************************************/ +NTSTATUS +NTAPI +ario_Initializer(IN PVOID Instance) +{ + /* Not yet implemented */ + UNIMPLEMENTED; + //while (TRUE); + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +ario_Constructor(IN PVOID DeviceExtension, + IN PVOID PciInterface, + IN PVOID InterfaceData, + IN USHORT Version, + IN USHORT Size, + IN PINTERFACE Interface) +{ + PPCI_FDO_EXTENSION FdoExtension = (PPCI_FDO_EXTENSION)DeviceExtension; + NTSTATUS Status; + PAGED_CODE(); + + /* Make sure it's the expected interface */ + if ((ULONG)InterfaceData != CmResourceTypePort) + { + /* Arbiter support must have been initialized first */ + if (FdoExtension->ArbitersInitialized) + { + /* Not yet implemented */ + UNIMPLEMENTED; + while (TRUE); + } + else + { + /* No arbiters for this FDO */ + Status = STATUS_NOT_SUPPORTED; + } + } + else + { + /* Not the right interface */ + Status = STATUS_INVALID_PARAMETER_5; + } + + /* Return the status */ + return Status; +} + +NTSTATUS +NTAPI +armem_Initializer(IN PVOID Instance) +{ + /* Not yet implemented */ + UNIMPLEMENTED; + //while (TRUE); + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +armem_Constructor(IN PVOID DeviceExtension, + IN PVOID PciInterface, + IN PVOID InterfaceData, + IN USHORT Version, + IN USHORT Size, + IN PINTERFACE Interface) +{ + PPCI_FDO_EXTENSION FdoExtension = (PPCI_FDO_EXTENSION)DeviceExtension; + NTSTATUS Status; + PAGED_CODE(); + + /* Make sure it's the expected interface */ + if ((ULONG)InterfaceData != CmResourceTypeMemory) + { + /* Arbiter support must have been initialized first */ + if (FdoExtension->ArbitersInitialized) + { + /* Not yet implemented */ + UNIMPLEMENTED; + while (TRUE); + } + else + { + /* No arbiters for this FDO */ + Status = STATUS_NOT_SUPPORTED; + } + } + else + { + /* Not the right interface */ + Status = STATUS_INVALID_PARAMETER_5; + } + + /* Return the status */ + return Status; +} + /* EOF */ Modified: trunk/reactos/drivers/bus/pcix/arb/arb_comn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/arb/arb_c… ============================================================================== --- trunk/reactos/drivers/bus/pcix/arb/arb_comn.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/arb/arb_comn.c [iso-8859-1] Fri Jul 16 00:39:54 2010 @@ -44,7 +44,7 @@ ASSERT_FDO(FdoExtension); /* Loop all the arbiters */ - for (ArbiterType = PciArb_Io; ArbiterType <= PciArb_Memory; ArbiterType++) + for (ArbiterType = PciArb_Io; ArbiterType <= PciArb_BusNumber; ArbiterType++) { /* Check if this is the extension for the Root PCI Bus */ if (!PCI_IS_ROOT_FDO(FdoExtension)) @@ -113,7 +113,7 @@ /* This arbiter is now initialized, move to the next one */ DPRINT1("PCI - FDO ext 0x%08x %S arbiter initialized (context 0x%08x).\n", FdoExtension, - "ARBITER HEADER MISSING", //ArbiterInterface->CommonInstance.Name, + L"ARBITER HEADER MISSING", //ArbiterInterface->CommonInstance.Name, ArbiterInterface); Status = STATUS_SUCCESS; } Modified: trunk/reactos/drivers/bus/pcix/arb/tr_irq.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/arb/tr_ir… ============================================================================== --- trunk/reactos/drivers/bus/pcix/arb/tr_irq.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/arb/tr_irq.c [iso-8859-1] Fri Jul 16 00:39:54 2010 @@ -1,8 +1,8 @@ /* * PROJECT: ReactOS PCI Bus Driver * LICENSE: BSD - See COPYING.ARM in the top level directory - * FILE: drivers/bus/pci/arb/tr_irq.c - * PURPOSE: IRQ Resource Translation + * FILE: drivers/bus/pci/intrface/tr_irq.c + * PURPOSE: IRQ Translator Interface * PROGRAMMERS: ReactOS Portable Systems Group */ @@ -14,6 +14,84 @@ /* GLOBALS ********************************************************************/ +PCI_INTERFACE TranslatorInterfaceInterrupt = +{ + &GUID_TRANSLATOR_INTERFACE_STANDARD, + sizeof(TRANSLATOR_INTERFACE), + 0, + 0, + PCI_INTERFACE_FDO, + 0, + PciTrans_Interrupt, + tranirq_Constructor, + tranirq_Initializer +}; + /* FUNCTIONS ******************************************************************/ +NTSTATUS +NTAPI +tranirq_Initializer(IN PVOID Instance) +{ + /* PnP Interfaces don't get Initialized */ + ASSERTMSG(FALSE, "PCI tranirq_Initializer, unexpected call."); + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS +NTAPI +tranirq_Constructor(IN PVOID DeviceExtension, + IN PVOID Instance, + IN PVOID InterfaceData, + IN USHORT Version, + IN USHORT Size, + IN PINTERFACE Interface) +{ + PPCI_FDO_EXTENSION FdoExtension = (PPCI_FDO_EXTENSION)DeviceExtension; + ULONG BaseBus, ParentBus; + INTERFACE_TYPE ParentInterface; + ASSERT_FDO(FdoExtension); + + /* Make sure it's the right resource type */ + if ((ULONG)InterfaceData != CmResourceTypeInterrupt) + { + /* Fail this invalid request */ + DPRINT1("PCI - IRQ trans constructor doesn't like %x in InterfaceSpecificData\n", + InterfaceData); + return STATUS_INVALID_PARAMETER_3; + } + + /* Get the bus, and use this as the interface-specific data */ + BaseBus = FdoExtension->BaseBus; + InterfaceData = (PVOID)BaseBus; + + /* Check if this is the root bus */ + if (PCI_IS_ROOT_FDO(FdoExtension)) + { + /* It is, so there is no parent, and it's connected on the system bus */ + ParentBus = 0; + ParentInterface = Internal; + DPRINT1(" Is root FDO\n"); + } + else + { + /* It's not, so we have to get the root bus' bus number instead */ + #if 0 // when have PDO commit + ParentBus = FdoExtension->PhysicalDeviceObject->DeviceExtension->ParentFdoExtension->BaseBus; + ParentInterface = PCIBus; + DPRINT1(" Is bridge FDO, parent bus %x, secondary bus %x\n", + ParentBus, BaseBus); + #endif + } + + /* Now call the legacy HAL interface to get the correct translator */ + return HalGetInterruptTranslator(ParentInterface, + ParentBus, + PCIBus, + sizeof(TRANSLATOR_INTERFACE), + 0, + (PTRANSLATOR_INTERFACE)Interface, + (PULONG)&InterfaceData); +} + /* EOF */ Modified: trunk/reactos/drivers/bus/pcix/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/dispatch.… ============================================================================== --- trunk/reactos/drivers/bus/pcix/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/dispatch.c [iso-8859-1] Fri Jul 16 00:39:54 2010 @@ -102,8 +102,8 @@ NTSTATUS Status; PPCI_MN_DISPATCH_TABLE TableArray = NULL, Table; USHORT MaxMinor; - PCI_DISPATCH_STYLE DispatchStyle; - PCI_DISPATCH_FUNCTION DispatchFunction; + PCI_DISPATCH_STYLE DispatchStyle = 0; + PCI_DISPATCH_FUNCTION DispatchFunction = NULL; DPRINT1("PCI: Dispatch IRP\n"); /* Get the extension and I/O stack location for this IRP */ @@ -146,7 +146,7 @@ /* WMI IRPs */ DispatchFunction = IrpDispatchTable->SystemControlIrpDispatchFunction; DispatchStyle = IrpDispatchTable->SystemControlIrpDispatchStyle; - MaxMinor = -1; + MaxMinor = 0xFFFF; break; default: @@ -154,12 +154,12 @@ /* Unrecognized IRPs */ DispatchFunction = IrpDispatchTable->OtherIrpDispatchFunction; DispatchStyle = IrpDispatchTable->OtherIrpDispatchStyle; - MaxMinor = -1; + MaxMinor = 0xFFFF; break; } /* Only deal with recognized IRPs */ - if (MaxMinor != -1) + if (MaxMinor != 0xFFFF) { /* Make sure the function is recognized */ if (IoStackLocation->MinorFunction > MaxMinor) @@ -260,7 +260,7 @@ { /* Not supported */ DPRINT1("WARNING: PCI received unsupported IRP!\n"); - DbgBreakPoint(); + //DbgBreakPoint(); return STATUS_NOT_SUPPORTED; } Modified: trunk/reactos/drivers/bus/pcix/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/fdo.c?rev… ============================================================================== --- trunk/reactos/drivers/bus/pcix/fdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/fdo.c [iso-8859-1] Fri Jul 16 00:39:54 2010 @@ -164,9 +164,73 @@ IN PIO_STACK_LOCATION IoStackLocation, IN PPCI_FDO_EXTENSION DeviceExtension) { - UNIMPLEMENTED; - while (TRUE); - return STATUS_NOT_SUPPORTED; + NTSTATUS Status; + PAGED_CODE(); + ASSERT(DeviceExtension->ExtensionType == PciFdoExtensionType); + + /* Deleted extensions don't respond to IRPs */ + if (DeviceExtension->DeviceState == PciDeleted) + { + /* Hand it bacO try to deal with it */ + return PciPassIrpFromFdoToPdo(DeviceExtension, Irp); + } + + /* Query our driver for this interface */ + Status = PciQueryInterface(DeviceExtension, + IoStackLocation->Parameters.QueryInterface. + InterfaceType, + IoStackLocation->Parameters.QueryInterface. + Size, + IoStackLocation->Parameters.QueryInterface. + Version, + IoStackLocation->Parameters.QueryInterface. + InterfaceSpecificData, + IoStackLocation->Parameters.QueryInterface. + Interface, + FALSE); + if (NT_SUCCESS(Status)) + { + /* We found it, let the PDO handle it */ + Irp->IoStatus.Status = Status; + return PciPassIrpFromFdoToPdo(DeviceExtension, Irp); + } + else if (Status == STATUS_NOT_SUPPORTED) + { + /* Otherwise, we can't handle it, let someone else down the stack try */ + Status = PciCallDownIrpStack(DeviceExtension, Irp); + if (Status == STATUS_NOT_SUPPORTED) + { + /* They can't either, try a last-resort interface lookup */ + Status = PciQueryInterface(DeviceExtension, + IoStackLocation->Parameters.QueryInterface. + InterfaceType, + IoStackLocation->Parameters.QueryInterface. + Size, + IoStackLocation->Parameters.QueryInterface. + Version, + IoStackLocation->Parameters.QueryInterface. + InterfaceSpecificData, + IoStackLocation->Parameters.QueryInterface. + Interface, + TRUE); + } + } + + /* Has anyone claimed this interface yet? */ + if (Status == STATUS_NOT_SUPPORTED) + { + /* No, return the original IRP status */ + Status = Irp->IoStatus.Status; + } + else + { + /* Yes, set the new IRP status */ + Irp->IoStatus.Status = Status; + } + + /* Complete this IRP */ + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; } NTSTATUS Modified: trunk/reactos/drivers/bus/pcix/intrface/agpintrf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/intrface/… ============================================================================== --- trunk/reactos/drivers/bus/pcix/intrface/agpintrf.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/intrface/agpintrf.c [iso-8859-1] Fri Jul 16 00:39:54 2010 @@ -14,6 +14,54 @@ /* GLOBALS ********************************************************************/ +PCI_INTERFACE AgpTargetInterface = +{ + &GUID_AGP_TARGET_BUS_INTERFACE_STANDARD, + sizeof(AGP_BUS_INTERFACE_STANDARD), + AGP_BUS_INTERFACE_V1, + AGP_BUS_INTERFACE_V1, + PCI_INTERFACE_PDO, + 0, + PciInterface_AgpTarget, + agpintrf_Constructor, + agpintrf_Initializer +}; + /* FUNCTIONS ******************************************************************/ +NTSTATUS +NTAPI +agpintrf_Initializer(IN PVOID Instance) +{ + /* PnP Interfaces don't get Initialized */ + ASSERTMSG(FALSE, "PCI agpintrf_Initializer, unexpected call."); + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS +NTAPI +agpintrf_Constructor(IN PVOID DeviceExtension, + IN PVOID Instance, + IN PVOID InterfaceData, + IN USHORT Version, + IN USHORT Size, + IN PINTERFACE Interface) +{ +#if 0 // when have PDO commit + PPCI_PDO_EXTENSION PdoExtension = (PPCI_PDO_EXTENSION)DeviceExtension; + + /* Only AGP bridges are supported (which are PCI-to-PCI Bridge Devices) */ + if ((PdoExtension->BaseClass != PCI_CLASS_BRIDGE_DEV) || + (PdoExtension->SubClass != PCI_SUBCLASS_BR_PCI_TO_PCI)) + { + /* Fail any other PDO */ + return STATUS_NOT_SUPPORTED; + } +#endif + + /* Not yet implemented */ + UNIMPLEMENTED; + while (TRUE); +} + /* EOF */ Modified: trunk/reactos/drivers/bus/pcix/intrface/busintrf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/intrface/… ============================================================================== --- trunk/reactos/drivers/bus/pcix/intrface/busintrf.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/intrface/busintrf.c [iso-8859-1] Fri Jul 16 00:39:54 2010 @@ -14,6 +14,42 @@ /* GLOBALS ********************************************************************/ +PCI_INTERFACE BusHandlerInterface = +{ + &GUID_BUS_INTERFACE_STANDARD, + sizeof(BUS_INTERFACE_STANDARD), + 1, + 1, + PCI_INTERFACE_PDO, + 0, + PciInterface_BusHandler, + busintrf_Constructor, + busintrf_Initializer +}; + /* FUNCTIONS ******************************************************************/ +NTSTATUS +NTAPI +busintrf_Initializer(IN PVOID Instance) +{ + /* PnP Interfaces don't get Initialized */ + ASSERTMSG(FALSE, "PCI busintrf_Initializer, unexpected call."); + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS +NTAPI +busintrf_Constructor(IN PVOID DeviceExtension, + IN PVOID Instance, + IN PVOID InterfaceData, + IN USHORT Version, + IN USHORT Size, + IN PINTERFACE Interface) +{ + /* Not yet implemented */ + UNIMPLEMENTED; + while (TRUE); +} + /* EOF */ Modified: trunk/reactos/drivers/bus/pcix/intrface/cardbus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/intrface/… ============================================================================== --- trunk/reactos/drivers/bus/pcix/intrface/cardbus.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/intrface/cardbus.c [iso-8859-1] Fri Jul 16 00:39:54 2010 @@ -14,6 +14,42 @@ /* GLOBALS ********************************************************************/ +PCI_INTERFACE PciCardbusPrivateInterface = +{ + &GUID_PCI_CARDBUS_INTERFACE_PRIVATE, + sizeof(PCI_CARDBUS_INTERFACE_PRIVATE), + PCI_CB_INTRF_VERSION, + PCI_CB_INTRF_VERSION, + PCI_INTERFACE_PDO, + 0, + PciInterface_PciCb, + pcicbintrf_Constructor, + pcicbintrf_Initializer +}; + /* FUNCTIONS ******************************************************************/ +NTSTATUS +NTAPI +pcicbintrf_Initializer(IN PVOID Instance) +{ + /* PnP Interfaces don't get Initialized */ + ASSERTMSG(FALSE, "PCI pcicbintrf_Initializer, unexpected call."); + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS +NTAPI +pcicbintrf_Constructor(IN PVOID DeviceExtension, + IN PVOID Instance, + IN PVOID InterfaceData, + IN USHORT Version, + IN USHORT Size, + IN PINTERFACE Interface) +{ + /* Not yet implemented */ + UNIMPLEMENTED; + while (TRUE); +} + /* EOF */ Added: trunk/reactos/drivers/bus/pcix/intrface/devhere.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/intrface/… ============================================================================== --- trunk/reactos/drivers/bus/pcix/intrface/devhere.c (added) +++ trunk/reactos/drivers/bus/pcix/intrface/devhere.c [iso-8859-1] Fri Jul 16 00:39:54 2010 @@ -1,0 +1,57 @@ +/* + * PROJECT: ReactOS PCI Bus Driver + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: drivers/bus/pci/intrface/devhere.c + * PURPOSE: Device Presence Interface + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES *******************************************************************/ + +#include <pci.h> +#define NDEBUG +#include <debug.h> + +/* GLOBALS ********************************************************************/ + +PCI_INTERFACE PciDevicePresentInterface = +{ + &GUID_PCI_DEVICE_PRESENT_INTERFACE, + sizeof(PCI_DEVICE_PRESENT_INTERFACE), + PCI_DEVICE_PRESENT_INTERFACE_VERSION, + PCI_DEVICE_PRESENT_INTERFACE_VERSION, + PCI_INTERFACE_PDO, + 0, + PciInterface_DevicePresent, + devpresent_Constructor, + devpresent_Initializer +}; + +/* FUNCTIONS ******************************************************************/ + +NTSTATUS +NTAPI +devpresent_Initializer(IN PVOID Instance) +{ + /* PnP Interfaces don't get Initialized */ + ASSERTMSG(FALSE, "PCI devpresent_Initializer, unexpected call."); + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS +NTAPI +devpresent_Constructor(IN PVOID DeviceExtension, + IN PVOID Instance, + IN PVOID InterfaceData, + IN USHORT Version, + IN USHORT Size, + IN PINTERFACE Interface) +{ + PAGED_CODE(); + + /* Not yet implemented */ + UNIMPLEMENTED; + while (TRUE); +} + +/* EOF */ Propchange: trunk/reactos/drivers/bus/pcix/intrface/devhere.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/drivers/bus/pcix/intrface/devhere.c ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/reactos/drivers/bus/pcix/intrface/intrface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/intrface/… ============================================================================== --- trunk/reactos/drivers/bus/pcix/intrface/intrface.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/intrface/intrface.c [iso-8859-1] Fri Jul 16 00:39:54 2010 @@ -16,9 +16,135 @@ PPCI_INTERFACE PciInterfaces[] = { + &ArbiterInterfaceBusNumber, + &ArbiterInterfaceMemory, + &ArbiterInterfaceIo, + &BusHandlerInterface, + &PciRoutingInterface, + &PciCardbusPrivateInterface, + &PciLegacyDeviceDetectionInterface, + &PciPmeInterface, + &PciDevicePresentInterface, +// &PciNativeIdeInterface, + &PciLocationInterface, + &AgpTargetInterface, + NULL +}; + +PPCI_INTERFACE PciInterfacesLastResort[] = +{ + &TranslatorInterfaceInterrupt, NULL }; /* FUNCTIONS ******************************************************************/ +NTSTATUS +NTAPI +PciQueryInterface(IN PPCI_FDO_EXTENSION DeviceExtension, + IN CONST GUID* InterfaceType, + IN ULONG Size, + IN ULONG Version, + IN PVOID InterfaceData, + IN PINTERFACE Interface, + IN BOOLEAN LastChance) +{ + UNICODE_STRING GuidString; + NTSTATUS Status; + PPCI_INTERFACE *InterfaceList; + PPCI_INTERFACE PciInterface; + RtlStringFromGUID(InterfaceType, &GuidString); + DPRINT1("PCI - PciQueryInterface TYPE = %wZ\n", &GuidString); + RtlFreeUnicodeString(&GuidString); + DPRINT1(" Size = %d, Version = %d, InterfaceData = %x, LastChance = %s\n", + Size, + Version, + InterfaceData, + LastChance ? "TRUE" : "FALSE"); + + /* Loop all the available interfaces */ + for (InterfaceList = LastChance ? PciInterfacesLastResort : PciInterfaces; + *InterfaceList; + InterfaceList++) + { + /* Get the current interface */ + PciInterface = *InterfaceList; + + /* For debugging, construct the GUID string */ + RtlStringFromGUID(PciInterface->InterfaceType, &GuidString); + + /* Check if this is an FDO or PDO */ + if (DeviceExtension->ExtensionType == PciFdoExtensionType) + { + /* Check if the interface is for FDOs */ + if (!(PciInterface->Flags & PCI_INTERFACE_FDO)) + { + /* This interface is not for FDOs, skip it */ + DPRINT1("PCI - PciQueryInterface: guid = %wZ only for FDOs\n", + &GuidString); + RtlFreeUnicodeString(&GuidString); + continue; + } + + /* Check if the interface is for root FDO only */ + if ((PciInterface->Flags & PCI_INTERFACE_ROOT) && + (!PCI_IS_ROOT_FDO(DeviceExtension))) + { + /* This FDO isn't the root, skip the interface */ + DPRINT1("PCI - PciQueryInterface: guid = %wZ only for ROOT\n", + &GuidString); + RtlFreeUnicodeString(&GuidString); + continue; + } + } + else + { + /* This is a PDO, check if the interface is for PDOs too */ + if (!(PciInterface->Flags & PCI_INTERFACE_PDO)) + { + /* It isn't, skip it */ + DPRINT1("PCI - PciQueryInterface: guid = %wZ only for PDOs\n", + &GuidString); + RtlFreeUnicodeString(&GuidString); + continue; + } + } + + /* Print the GUID for debugging, and then free the string */ + DPRINT1("PCI - PciQueryInterface looking at guid = %wZ\n", &GuidString); + RtlFreeUnicodeString(&GuidString); + + /* Check if the GUID, version, and size all match */ + if ((IsEqualGUIDAligned(PciInterface->InterfaceType, InterfaceType)) && + (Version >= PciInterface->MinVersion) && + (Version <= PciInterface->MaxVersion) && + (Size >= PciInterface->MinSize)) + { + /* Call the interface's constructor */ + Status = PciInterface->Constructor(DeviceExtension, + PciInterface, + InterfaceData, + Version, + Size, + Interface); + if (!NT_SUCCESS(Status)) + { + /* This interface was not initialized correctly, skip it */ + DPRINT1("PCI - PciQueryInterface - Contructor %08lx = %08lx\n", + PciInterface->Constructor, Status); + continue; + } + + /* Reference the interface and return success, all is good */ + Interface->InterfaceReference(Interface->Context); + DPRINT1("PCI - PciQueryInterface returning SUCCESS\n"); + return Status; + } + } + + /* An interface of this type, and for this device, could not be found */ + DPRINT1("PCI - PciQueryInterface FAILED TO FIND INTERFACE\n"); + return STATUS_NOT_SUPPORTED; +} + /* EOF */ Modified: trunk/reactos/drivers/bus/pcix/intrface/lddintrf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/intrface/… ============================================================================== --- trunk/reactos/drivers/bus/pcix/intrface/lddintrf.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/intrface/lddintrf.c [iso-8859-1] Fri Jul 16 00:39:54 2010 @@ -14,6 +14,42 @@ /* GLOBALS ********************************************************************/ +PCI_INTERFACE PciLegacyDeviceDetectionInterface = +{ + &GUID_LEGACY_DEVICE_DETECTION_STANDARD, + sizeof(LEGACY_DEVICE_DETECTION_INTERFACE), + 0, + 0, + PCI_INTERFACE_FDO, + 0, + PciInterface_LegacyDeviceDetection, + lddintrf_Constructor, + lddintrf_Initializer +}; + /* FUNCTIONS ******************************************************************/ +NTSTATUS +NTAPI +lddintrf_Initializer(IN PVOID Instance) +{ + /* PnP Interfaces don't get Initialized */ + ASSERTMSG(FALSE, "PCI lddintrf_Initializer, unexpected call."); + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS +NTAPI +lddintrf_Constructor(IN PVOID DeviceExtension, + IN PVOID Instance, + IN PVOID InterfaceData, + IN USHORT Version, + IN USHORT Size, + IN PINTERFACE Interface) +{ + /* Not yet implemented */ + UNIMPLEMENTED; + while (TRUE); +} + /* EOF */ Modified: trunk/reactos/drivers/bus/pcix/intrface/locintrf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/intrface/… ============================================================================== --- trunk/reactos/drivers/bus/pcix/intrface/locintrf.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/intrface/locintrf.c [iso-8859-1] Fri Jul 16 00:39:54 2010 @@ -14,6 +14,42 @@ /* GLOBALS ********************************************************************/ +PCI_INTERFACE PciLocationInterface = +{ + &GUID_PNP_LOCATION_INTERFACE, + sizeof(PNP_LOCATION_INTERFACE), + PNP_LOCATION_INTERFACE_VERSION, + PNP_LOCATION_INTERFACE_VERSION, + PCI_INTERFACE_FDO | PCI_INTERFACE_ROOT | PCI_INTERFACE_PDO, + 0, + PciInterface_Location, + locintrf_Constructor, + locintrf_Initializer +}; + /* FUNCTIONS ******************************************************************/ +NTSTATUS +NTAPI +locintrf_Initializer(IN PVOID Instance) +{ + /* PnP Interfaces don't get Initialized */ + ASSERTMSG(FALSE, "PCI locintrf_Initializer, unexpected call."); + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS +NTAPI +locintrf_Constructor(IN PVOID DeviceExtension, + IN PVOID Instance, + IN PVOID InterfaceData, + IN USHORT Version, + IN USHORT Size, + IN PINTERFACE Interface) +{ + /* Not yet implemented */ + UNIMPLEMENTED; + while (TRUE); +} + /* EOF */ Modified: trunk/reactos/drivers/bus/pcix/intrface/pmeintf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/intrface/… ============================================================================== --- trunk/reactos/drivers/bus/pcix/intrface/pmeintf.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/intrface/pmeintf.c [iso-8859-1] Fri Jul 16 00:39:54 2010 @@ -14,6 +14,45 @@ /* GLOBALS ********************************************************************/ +PCI_INTERFACE PciPmeInterface = +{ + &GUID_PCI_PME_INTERFACE, + sizeof(PCI_PME_INTERFACE), + PCI_PME_INTRF_STANDARD_VER, + PCI_PME_INTRF_STANDARD_VER, + PCI_INTERFACE_FDO | PCI_INTERFACE_ROOT, + 0, + PciInterface_PmeHandler, + PciPmeInterfaceConstructor, + PciPmeInterfaceInitializer +}; + /* FUNCTIONS ******************************************************************/ +NTSTATUS +NTAPI +PciPmeInterfaceInitializer(IN PVOID Instance) +{ + /* PnP Interfaces don't get Initialized */ + ASSERTMSG(FALSE, "PCI PciPmeInterfaceInitializer, unexpected call."); + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS +NTAPI +PciPmeInterfaceConstructor(IN PVOID DeviceExtension, + IN PVOID Instance, + IN PVOID InterfaceData, + IN USHORT Version, + IN USHORT Size, + IN PINTERFACE Interface) +{ + /* Only version 1 is supported */ + if (Version != PCI_PME_INTRF_STANDARD_VER) return STATUS_NOINTERFACE; + + /* Not yet implemented */ + UNIMPLEMENTED; + while (TRUE); +} + /* EOF */ Modified: trunk/reactos/drivers/bus/pcix/intrface/routintf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/intrface/… ============================================================================== --- trunk/reactos/drivers/bus/pcix/intrface/routintf.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/intrface/routintf.c [iso-8859-1] Fri Jul 16 00:39:54 2010 @@ -14,6 +14,45 @@ /* GLOBALS ********************************************************************/ +PCI_INTERFACE PciRoutingInterface = +{ + &GUID_INT_ROUTE_INTERFACE_STANDARD, + sizeof(INT_ROUTE_INTERFACE_STANDARD), + PCI_INT_ROUTE_INTRF_STANDARD_VER, + PCI_INT_ROUTE_INTRF_STANDARD_VER, + PCI_INTERFACE_FDO, + 0, + PciInterface_IntRouteHandler, + routeintrf_Constructor, + routeintrf_Initializer +}; + /* FUNCTIONS ******************************************************************/ +NTSTATUS +NTAPI +routeintrf_Initializer(IN PVOID Instance) +{ + /* PnP Interfaces don't get Initialized */ + ASSERTMSG(FALSE, "PCI routeintrf_Initializer, unexpected call."); + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS +NTAPI +routeintrf_Constructor(IN PVOID DeviceExtension, + IN PVOID Instance, + IN PVOID InterfaceData, + IN USHORT Version, + IN USHORT Size, + IN PINTERFACE Interface) +{ + /* Only version 1 is supported */ + if (Version != PCI_INT_ROUTE_INTRF_STANDARD_VER) return STATUS_NOINTERFACE; + + /* Not yet implemented */ + UNIMPLEMENTED; + while (TRUE); +} + /* EOF */ Modified: trunk/reactos/drivers/bus/pcix/pci.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/pci.h?rev… ============================================================================== --- trunk/reactos/drivers/bus/pcix/pci.h [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/pci.h [iso-8859-1] Fri Jul 16 00:39:54 2010 @@ -50,26 +50,33 @@ #define PCI_HACK_HAS_SUBSYSTEM_INFO 0x02 // +// PCI Interface Flags +// +#define PCI_INTERFACE_PDO 0x01 +#define PCI_INTERFACE_FDO 0x02 +#define PCI_INTERFACE_ROOT 0x04 + +// // Device Extension, Interface, Translator and Arbiter Signatures // typedef enum _PCI_SIGNATURE { - PciPdoExtensionType = '0Pci', - PciFdoExtensionType = '1Pci', - PciArb_Io = '2Pci', - PciArb_Memory = '3Pci', - PciArb_Interrupt = '4Pci', - PciArb_BusNumber = '5Pci', - PciTrans_Interrupt = '6Pci', - PciInterface_BusHandler = '7Pci', - PciInterface_IntRouteHandler = '8Pci', - PciInterface_PciCb = '9Pci', - PciInterface_LegacyDeviceDetection = ':Pci', - PciInterface_PmeHandler = ';Pci', - PciInterface_DevicePresent = '<Pci', - PciInterface_NativeIde = '=Pci', - PciInterface_AgpTarget = '>Pci', - PciInterface_Location = '?Pci' + PciPdoExtensionType = 'icP0', + PciFdoExtensionType = 'icP1', + PciArb_Io = 'icP2', + PciArb_Memory = 'icP3', + PciArb_Interrupt = 'icP4', + PciArb_BusNumber = 'icP5', + PciTrans_Interrupt = 'icP6', + PciInterface_BusHandler = 'icP7', + PciInterface_IntRouteHandler = 'icP8', + PciInterface_PciCb = 'icP9', + PciInterface_LegacyDeviceDetection = 'icP:', + PciInterface_PmeHandler = 'icP;', + PciInterface_DevicePresent = 'icP<', + PciInterface_NativeIde = 'icP=', + PciInterface_AgpTarget = 'icP>', + PciInterface_Location = 'icP?' } PCI_SIGNATURE, *PPCI_SIGNATURE; // @@ -220,7 +227,7 @@ // struct _PCI_INTERFACE; typedef NTSTATUS (NTAPI *PCI_INTERFACE_CONSTRUCTOR)( - IN PPCI_FDO_EXTENSION DeviceExtension, + IN PVOID DeviceExtension, IN PVOID Instance, IN PVOID InterfaceData, IN USHORT Version, @@ -237,7 +244,7 @@ // typedef struct _PCI_INTERFACE { - LPGUID InterfaceType; + CONST GUID *InterfaceType; USHORT MinSize; USHORT MinVersion; USHORT MaxVersion; @@ -288,6 +295,21 @@ IN PPCI_FDO_EXTENSION DeviceExtension ); +NTSTATUS +NTAPI +PciPassIrpFromFdoToPdo( + IN PPCI_FDO_EXTENSION DeviceExtension, + IN PIRP Irp +); + +NTSTATUS +NTAPI +PciCallDownIrpStack( + IN PPCI_FDO_EXTENSION DeviceExtension, + IN PIRP Irp +); + + // // Power Routines // @@ -581,10 +603,242 @@ ); // +// Interface Support +// +NTSTATUS +NTAPI +PciQueryInterface( + IN PPCI_FDO_EXTENSION DeviceExtension, + IN CONST GUID* InterfaceType, + IN ULONG Size, + IN ULONG Version, + IN PVOID InterfaceData, + IN PINTERFACE Interface, + IN BOOLEAN LastChance +); + +NTSTATUS +NTAPI +PciPmeInterfaceInitializer( + IN PVOID Instance +); + +NTSTATUS +NTAPI +routeintrf_Initializer( + IN PVOID Instance +); + +NTSTATUS +NTAPI +arbusno_Initializer( + IN PVOID Instance +); + +NTSTATUS +NTAPI +agpintrf_Initializer( + IN PVOID Instance +); + +NTSTATUS +NTAPI +tranirq_Initializer( + IN PVOID Instance +); + +NTSTATUS +NTAPI +busintrf_Initializer( + IN PVOID Instance +); + +NTSTATUS +NTAPI +armem_Initializer( + IN PVOID Instance +); + +NTSTATUS +NTAPI +ario_Initializer( + IN PVOID Instance +); + +NTSTATUS +NTAPI +locintrf_Initializer( + IN PVOID Instance +); + +NTSTATUS +NTAPI +pcicbintrf_Initializer( + IN PVOID Instance +); + +NTSTATUS +NTAPI +lddintrf_Initializer( + IN PVOID Instance +); + +NTSTATUS +NTAPI +devpresent_Initializer( + IN PVOID Instance +); + +NTSTATUS +NTAPI +agpintrf_Constructor( + IN PVOID DeviceExtension, + IN PVOID Instance, + IN PVOID InterfaceData, + IN USHORT Version, + IN USHORT Size, + IN PINTERFACE Interface +); + +NTSTATUS +NTAPI +arbusno_Constructor( + IN PVOID DeviceExtension, + IN PVOID Instance, + IN PVOID InterfaceData, + IN USHORT Version, + IN USHORT Size, + IN PINTERFACE Interface +); + +NTSTATUS +NTAPI +tranirq_Constructor( + IN PVOID DeviceExtension, + IN PVOID Instance, + IN PVOID InterfaceData, + IN USHORT Version, + IN USHORT Size, + IN PINTERFACE Interface +); + +NTSTATUS +NTAPI +armem_Constructor( + IN PVOID DeviceExtension, + IN PVOID Instance, + IN PVOID InterfaceData, + IN USHORT Version, + IN USHORT Size, + IN PINTERFACE Interface +); + +NTSTATUS +NTAPI +busintrf_Constructor( + IN PVOID DeviceExtension, + IN PVOID Instance, + IN PVOID InterfaceData, + IN USHORT Version, + IN USHORT Size, + IN PINTERFACE Interface +); + +NTSTATUS +NTAPI +ario_Constructor( + IN PVOID DeviceExtension, + IN PVOID Instance, + IN PVOID InterfaceData, + IN USHORT Version, + IN USHORT Size, + IN PINTERFACE Interface +); + +NTSTATUS +NTAPI +pcicbintrf_Constructor( + IN PVOID DeviceExtension, + IN PVOID Instance, + IN PVOID InterfaceData, + IN USHORT Version, + IN USHORT Size, + IN PINTERFACE Interface +); + +NTSTATUS +NTAPI +lddintrf_Constructor( + IN PVOID DeviceExtension, + IN PVOID Instance, + IN PVOID InterfaceData, + IN USHORT Version, + IN USHORT Size, + IN PINTERFACE Interface +); + +NTSTATUS +NTAPI +locintrf_Constructor( + IN PVOID DeviceExtension, + IN PVOID Instance, + IN PVOID InterfaceData, + IN USHORT Version, + IN USHORT Size, + IN PINTERFACE Interface +); + +NTSTATUS +NTAPI +PciPmeInterfaceConstructor( + IN PVOID DeviceExtension, + IN PVOID Instance, + IN PVOID InterfaceData, + IN USHORT Version, + IN USHORT Size, + IN PINTERFACE Interface +); + +NTSTATUS +NTAPI +routeintrf_Constructor( + IN PVOID DeviceExtension, + IN PVOID Instance, + IN PVOID InterfaceData, + IN USHORT Version, + IN USHORT Size, + IN PINTERFACE Interface +); + +NTSTATUS +NTAPI +devpresent_Constructor( + IN PVOID DeviceExtension, + IN PVOID Instance, + IN PVOID InterfaceData, + IN USHORT Version, + IN USHORT Size, + IN PINTERFACE Interface +); + +// // External Resources // extern SINGLE_LIST_ENTRY PciFdoExtensionListHead; extern KEVENT PciGlobalLock; extern PPCI_INTERFACE PciInterfaces[]; +extern PCI_INTERFACE ArbiterInterfaceBusNumber; +extern PCI_INTERFACE ArbiterInterfaceMemory; +extern PCI_INTERFACE ArbiterInterfaceIo; +extern PCI_INTERFACE BusHandlerInterface; +extern PCI_INTERFACE PciRoutingInterface; +extern PCI_INTERFACE PciCardbusPrivateInterface; +extern PCI_INTERFACE PciLegacyDeviceDetectionInterface; +extern PCI_INTERFACE PciPmeInterface; +extern PCI_INTERFACE PciDevicePresentInterface; +//extern PCI_INTERFACE PciNativeIdeInterface; +extern PCI_INTERFACE PciLocationInterface; +extern PCI_INTERFACE AgpTargetInterface; +extern PCI_INTERFACE TranslatorInterfaceInterrupt; /* EOF */ Modified: trunk/reactos/drivers/bus/pcix/pcix.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/pcix.rbui… ============================================================================== --- trunk/reactos/drivers/bus/pcix/pcix.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/pcix.rbuild [iso-8859-1] Fri Jul 16 00:39:54 2010 @@ -16,6 +16,7 @@ <file>agpintrf.c</file> <file>busintrf.c</file> <file>cardbus.c</file> + <file>devhere.c</file> <file>ideintrf.c</file> <file>intrface.c</file> <file>lddintrf.c</file>

1 0

[tkreuzer] 48073: Merge 36852, 37322, 37333, 37334, 43428, 43451, 44259, 46404 from amd64 branch. - Multiple ULONG/ULONG_PTR/SIZE_T issues - Use SLIST_ENTRY instead of SINGLE_LIST_ENTRY with InterlockedPushEntrySList - Use %p to print pointer sized values
by tkreuzer＠svn.reactos.org 16 Jul '10

16 Jul '10

Author: tkreuzer Date: Fri Jul 16 00:34:26 2010 New Revision: 48073 URL: http://svn.reactos.org/svn/reactos?rev=48073&view=rev Log: Merge 36852, 37322, 37333, 37334, 43428, 43451, 44259, 46404 from amd64 branch. - Multiple ULONG/ULONG_PTR/SIZE_T issues - Use SLIST_ENTRY instead of SINGLE_LIST_ENTRY with InterlockedPushEntrySList - Use %p to print pointer sized values Modified: trunk/reactos/ (props changed) trunk/reactos/ntoskrnl/include/internal/ke.h trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/io/iomgr/iocomp.c trunk/reactos/ntoskrnl/io/iomgr/irp.c trunk/reactos/ntoskrnl/ke/bug.c trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/ntoskrnl/mm/ARM3/mminit.c trunk/reactos/ntoskrnl/mm/ARM3/ncache.c trunk/reactos/ntoskrnl/mm/ARM3/procsup.c trunk/reactos/ntoskrnl/mm/ARM3/virtual.c trunk/reactos/ntoskrnl/mm/anonmem.c trunk/reactos/ntoskrnl/mm/pagefile.c trunk/reactos/ntoskrnl/mm/ppool.c trunk/reactos/ntoskrnl/mm/section.c Propchange: trunk/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Jul 16 00:34:26 2010 @@ -1,4 +1,4 @@ /branches/header-work:45691-47721 /branches/reactos-yarotows:46372,46848,46966,47800,48026,48064 /branches/ros-amd64-bringup:36852 -/branches/ros-amd64-bringup/reactos:34711-34712,34741,34743,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36445,36502-36503,36505,36570,36614,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36992,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40927-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41484-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43857-43858,43860,43905-43907,43965,43969,43992,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44257,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,46394,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,47472,47846-47847,47878,47882 +/branches/ros-amd64-bringup/reactos:34711-34712,34741,34743,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36445,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36992,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40927-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41484-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43857-43858,43860,43905-43907,43965,43969,43992,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,47472,47846-47847,47878,47882 Modified: trunk/reactos/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] Fri Jul 16 00:34:26 2010 @@ -889,7 +889,7 @@ VOID NTAPI KeRosDumpStackFrames( - PULONG Frame, + PULONG_PTR Frame, ULONG FrameCount ); Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] Fri Jul 16 00:34:26 2010 @@ -6,21 +6,21 @@ struct _EPROCESS; -extern ULONG MiFreeSwapPages; -extern ULONG MiUsedSwapPages; -extern ULONG MmPagedPoolSize; -extern ULONG MmTotalPagedPoolQuota; -extern ULONG MmTotalNonPagedPoolQuota; +extern PFN_NUMBER MiFreeSwapPages; +extern PFN_NUMBER MiUsedSwapPages; +extern SIZE_T MmPagedPoolSize; +extern SIZE_T MmTotalPagedPoolQuota; +extern SIZE_T MmTotalNonPagedPoolQuota; extern PHYSICAL_ADDRESS MmSharedDataPagePhysicalAddress; -extern ULONG MmNumberOfPhysicalPages; +extern PFN_NUMBER MmNumberOfPhysicalPages; extern UCHAR MmDisablePagingExecutive; -extern ULONG MmLowestPhysicalPage; -extern ULONG MmHighestPhysicalPage; -extern ULONG MmAvailablePages; +extern PFN_NUMBER MmLowestPhysicalPage; +extern PFN_NUMBER MmHighestPhysicalPage; +extern PFN_NUMBER MmAvailablePages; extern PFN_NUMBER MmResidentAvailablePages; extern PVOID MmPagedPoolBase; -extern ULONG MmPagedPoolSize; +extern SIZE_T MmPagedPoolSize; extern PMEMORY_ALLOCATION_DESCRIPTOR MiFreeDescriptor; extern MEMORY_ALLOCATION_DESCRIPTOR MiFreeDescriptorOrg; @@ -874,7 +874,7 @@ PMEMORY_AREA MemoryArea, PVOID Address, PMEMORY_BASIC_INFORMATION Info, - PULONG ResultLength + PSIZE_T ResultLength ); VOID @@ -1548,7 +1548,7 @@ PMEMORY_AREA MemoryArea, PVOID Address, PMEMORY_BASIC_INFORMATION Info, - PULONG ResultLength + PSIZE_T ResultLength ); NTSTATUS @@ -1641,8 +1641,8 @@ IN PVOID Address, IN MEMORY_INFORMATION_CLASS VirtualMemoryInformationClass, OUT PVOID VirtualMemoryInformation, - IN ULONG Length, - OUT PULONG ResultLength + IN SIZE_T Length, + OUT PSIZE_T ResultLength ); /* sysldr.c ******************************************************************/ Modified: trunk/reactos/ntoskrnl/io/iomgr/iocomp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iocomp.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iocomp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iocomp.c [iso-8859-1] Fri Jul 16 00:34:26 2010 @@ -92,7 +92,7 @@ } /* The free was within dhe Depth */ - InterlockedPushEntrySList(&List->L.ListHead, (PSINGLE_LIST_ENTRY)Packet); + InterlockedPushEntrySList(&List->L.ListHead, (PSLIST_ENTRY)Packet); } VOID Modified: trunk/reactos/ntoskrnl/io/iomgr/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/irp.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/irp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/irp.c [iso-8859-1] Fri Jul 16 00:34:26 2010 @@ -1557,7 +1557,7 @@ if (Irp) { InterlockedPushEntrySList(&List->L.ListHead, - (PSINGLE_LIST_ENTRY)Irp); + (PSLIST_ENTRY)Irp); } } } Modified: trunk/reactos/ntoskrnl/ke/bug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/bug.c?rev=4807… ============================================================================== --- trunk/reactos/ntoskrnl/ke/bug.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/bug.c [iso-8859-1] Fri Jul 16 00:34:26 2010 @@ -232,7 +232,7 @@ VOID FASTCALL -KeRosDumpStackFrameArray(IN PULONG Frames, +KeRosDumpStackFrameArray(IN PULONG_PTR Frames, IN ULONG FrameCount) { ULONG i, Addr; @@ -271,13 +271,13 @@ { /* Print out the module name */ Addr -= (ULONG_PTR)LdrEntry->DllBase; - DbgPrint("<%wZ: %x>\n", &LdrEntry->FullDllName, Addr); + DbgPrint("<%wZ: %p>", &LdrEntry->FullDllName, (PVOID)Addr); } } else { /* Print only the address */ - DbgPrint("<%x>\n", Addr); + DbgPrint("<%p>", (PVOID)Addr); } /* Go to the next frame */ @@ -287,10 +287,10 @@ VOID NTAPI -KeRosDumpStackFrames(IN PULONG Frame OPTIONAL, +KeRosDumpStackFrames(IN PULONG_PTR Frame OPTIONAL, IN ULONG FrameCount OPTIONAL) { - ULONG Frames[32]; + ULONG_PTR Frames[32]; ULONG RealFrameCount; /* If the caller didn't ask, assume 32 frames */ @@ -1410,7 +1410,7 @@ // KiAcquireNmiListLock(&OldIrql); NmiData->Next = KiNmiCallbackListHead; - Next = InterlockedCompareExchangePointer(&KiNmiCallbackListHead, + Next = InterlockedCompareExchangePointer((PVOID*)&KiNmiCallbackListHead, NmiData, NmiData->Next); ASSERT(Next == NmiData->Next); Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Fri Jul 16 00:34:26 2010 @@ -379,24 +379,24 @@ extern BOOLEAN MiLargePageAllDrivers; extern ULONG MmVerifyDriverBufferLength; extern ULONG MmLargePageDriverBufferLength; -extern ULONG MmSizeOfNonPagedPoolInBytes; -extern ULONG MmMaximumNonPagedPoolInBytes; +extern SIZE_T MmSizeOfNonPagedPoolInBytes; +extern SIZE_T MmMaximumNonPagedPoolInBytes; extern PFN_NUMBER MmMaximumNonPagedPoolInPages; extern PFN_NUMBER MmSizeOfPagedPoolInPages; extern PVOID MmNonPagedSystemStart; extern PVOID MmNonPagedPoolStart; extern PVOID MmNonPagedPoolExpansionStart; extern PVOID MmNonPagedPoolEnd; -extern ULONG MmSizeOfPagedPoolInBytes; +extern SIZE_T MmSizeOfPagedPoolInBytes; extern PVOID MmPagedPoolStart; extern PVOID MmPagedPoolEnd; extern PVOID MmSessionBase; -extern ULONG MmSessionSize; +extern SIZE_T MmSessionSize; extern PMMPTE MmFirstReservedMappingPte, MmLastReservedMappingPte; extern PMMPTE MiFirstReservedZeroingPte; extern MI_PFN_CACHE_ATTRIBUTE MiPlatformCacheAttributes[2][MmMaximumCacheType]; extern PPHYSICAL_MEMORY_DESCRIPTOR MmPhysicalMemoryBlock; -extern ULONG MmBootImageSize; +extern SIZE_T MmBootImageSize; extern PMMPTE MmSystemPtesStart[MaximumPtePoolTypes]; extern PMMPTE MmSystemPtesEnd[MaximumPtePoolTypes]; extern PMEMORY_ALLOCATION_DESCRIPTOR MxFreeDescriptor; @@ -409,14 +409,14 @@ extern PVOID MmPagedPoolEnd; extern PVOID MmNonPagedSystemStart; extern PVOID MiSystemViewStart; -extern ULONG MmSystemViewSize; +extern SIZE_T MmSystemViewSize; extern PVOID MmSessionBase; extern PVOID MiSessionSpaceEnd; extern PMMPTE MiSessionImagePteStart; extern PMMPTE MiSessionImagePteEnd; extern PMMPTE MiSessionBasePte; extern PMMPTE MiSessionLastPte; -extern ULONG MmSizeOfPagedPoolInBytes; +extern SIZE_T MmSizeOfPagedPoolInBytes; extern PMMPTE MmSystemPagePtes; extern PVOID MmSystemCacheStart; extern PVOID MmSystemCacheEnd; @@ -426,9 +426,9 @@ extern ULONG MmSpecialPoolTag; extern PVOID MmHyperSpaceEnd; extern PMMWSL MmSystemCacheWorkingSetList; -extern ULONG MmMinimumNonPagedPoolSize; +extern SIZE_T MmMinimumNonPagedPoolSize; extern ULONG MmMinAdditionNonPagedPoolPerMb; -extern ULONG MmDefaultMaximumNonPagedPool; +extern SIZE_T MmDefaultMaximumNonPagedPool; extern ULONG MmMaxAdditionNonPagedPoolPerMb; extern ULONG MmSecondaryColors; extern ULONG MmSecondaryColorMask; Modified: trunk/reactos/ntoskrnl/mm/ARM3/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/mminit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] Fri Jul 16 00:34:26 2010 @@ -23,8 +23,8 @@ // figure out the most appropriate values. // ULONG MmMaximumNonPagedPoolPercent; -ULONG MmSizeOfNonPagedPoolInBytes; -ULONG MmMaximumNonPagedPoolInBytes; +SIZE_T MmSizeOfNonPagedPoolInBytes; +SIZE_T MmMaximumNonPagedPoolInBytes; /* Some of the same values, in pages */ PFN_NUMBER MmMaximumNonPagedPoolInPages; @@ -36,9 +36,9 @@ // They are described on http://support.microsoft.com/default.aspx/kb/126402/ja // along with the algorithm that uses them, which is implemented later below. // -ULONG MmMinimumNonPagedPoolSize = 256 * 1024; +SIZE_T MmMinimumNonPagedPoolSize = 256 * 1024; ULONG MmMinAdditionNonPagedPoolPerMb = 32 * 1024; -ULONG MmDefaultMaximumNonPagedPool = 1024 * 1024; +SIZE_T MmDefaultMaximumNonPagedPool = 1024 * 1024; ULONG MmMaxAdditionNonPagedPoolPerMb = 400 * 1024; // @@ -107,7 +107,7 @@ // // And this is its default size // -ULONG MmSizeOfPagedPoolInBytes = MI_MIN_INIT_PAGED_POOLSIZE; +SIZE_T MmSizeOfPagedPoolInBytes = MI_MIN_INIT_PAGED_POOLSIZE; PFN_NUMBER MmSizeOfPagedPoolInPages = MI_MIN_INIT_PAGED_POOLSIZE / PAGE_SIZE; // @@ -131,10 +131,10 @@ PVOID MiSessionPoolEnd; // 0xBE000000 PVOID MiSessionPoolStart; // 0xBD000000 PVOID MmSessionBase; // 0xBD000000 -ULONG MmSessionSize; -ULONG MmSessionViewSize; -ULONG MmSessionPoolSize; -ULONG MmSessionImageSize; +SIZE_T MmSessionSize; +SIZE_T MmSessionViewSize; +SIZE_T MmSessionPoolSize; +SIZE_T MmSessionImageSize; /* * These are the PTE addresses of the boundaries carved out above @@ -151,7 +151,7 @@ // By default, it is a 16MB region. // PVOID MiSystemViewStart; -ULONG MmSystemViewSize; +SIZE_T MmSystemViewSize; // // A copy of the system page directory (the page directory associated with the @@ -175,13 +175,13 @@ // On systems with more than 32MB, this number is then doubled, and further // aligned up to a PDE boundary (4MB). // -ULONG MmNumberOfSystemPtes; +ULONG_PTR MmNumberOfSystemPtes; // // This is how many pages the PFN database will take up // In Windows, this includes the Quark Color Table, but not in ARMÂ³ // -ULONG MxPfnAllocation; +PFN_NUMBER MxPfnAllocation; // // Unlike the old ReactOS Memory Manager, ARMÂ³ (and Windows) does not keep track @@ -205,7 +205,7 @@ // // This is where we keep track of the most basic physical layout markers // -ULONG MmNumberOfPhysicalPages, MmHighestPhysicalPage, MmLowestPhysicalPage = -1; +PFN_NUMBER MmNumberOfPhysicalPages, MmHighestPhysicalPage, MmLowestPhysicalPage = -1; // // The total number of pages mapped by the boot loader, which include the kernel @@ -215,13 +215,13 @@ // // This number is later aligned up to a PDE boundary. // -ULONG MmBootImageSize; +SIZE_T MmBootImageSize; // // These three variables keep track of the core separation of address space that // exists between kernel mode and user mode. // -ULONG MmUserProbeAddress; +ULONG_PTR MmUserProbeAddress; PVOID MmHighestUserAddress; PVOID MmSystemRangeStart; Modified: trunk/reactos/ntoskrnl/mm/ARM3/ncache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/ncache.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/ncache.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/ncache.c [iso-8859-1] Fri Jul 16 00:34:26 2010 @@ -23,7 +23,7 @@ */ PVOID NTAPI -MmAllocateNonCachedMemory(IN ULONG NumberOfBytes) +MmAllocateNonCachedMemory(IN SIZE_T NumberOfBytes) { PFN_NUMBER PageCount, MdlPageCount, PageFrameIndex; PHYSICAL_ADDRESS LowAddress, HighAddress, SkipBytes; Modified: trunk/reactos/ntoskrnl/mm/ARM3/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/procsup.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] Fri Jul 16 00:34:26 2010 @@ -513,7 +513,7 @@ ImageConfigData = RtlImageDirectoryEntryToData(Peb->ImageBaseAddress, TRUE, IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG, - &ViewSize); + (PULONG)&ViewSize); if (ImageConfigData) { // Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Fri Jul 16 00:34:26 2010 @@ -883,7 +883,7 @@ KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); PEPROCESS Process; NTSTATUS Status = STATUS_SUCCESS; - ULONG BytesWritten = 0; + SIZE_T BytesWritten = 0; PAGED_CODE(); // Modified: trunk/reactos/ntoskrnl/mm/anonmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/anonmem.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] Fri Jul 16 00:34:26 2010 @@ -718,10 +718,10 @@ MemoryAreaLength = (ULONG_PTR)MemoryArea->EndingAddress - (ULONG_PTR)MemoryArea->StartingAddress; - if (((ULONG)BaseAddress + RegionSize) > (ULONG)MemoryArea->EndingAddress) + if (((ULONG_PTR)BaseAddress + RegionSize) > (ULONG_PTR)MemoryArea->EndingAddress) { DPRINT("BaseAddress + RegionSize %x is larger than MemoryArea's EndingAddress %x\n", - (ULONG)BaseAddress + RegionSize, MemoryArea->EndingAddress); + (ULONG_PTR)BaseAddress + RegionSize, MemoryArea->EndingAddress); MmUnlockAddressSpace(AddressSpace); ObDereferenceObject(Process); @@ -1123,7 +1123,7 @@ MmQueryAnonMem(PMEMORY_AREA MemoryArea, PVOID Address, PMEMORY_BASIC_INFORMATION Info, - PULONG ResultLength) + PSIZE_T ResultLength) { PMM_REGION Region; PVOID RegionBase = NULL; Modified: trunk/reactos/ntoskrnl/mm/pagefile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pagefile.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/pagefile.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/pagefile.c [iso-8859-1] Fri Jul 16 00:34:26 2010 @@ -81,17 +81,17 @@ ULONG MmNumberOfPagingFiles; /* Number of pages that are available for swapping */ -ULONG MiFreeSwapPages; +PFN_NUMBER MiFreeSwapPages; /* Number of pages that have been allocated for swapping */ -ULONG MiUsedSwapPages; +PFN_NUMBER MiUsedSwapPages; BOOLEAN MmZeroPageFile; /* * Number of pages that have been reserved for swapping but not yet allocated */ -static ULONG MiReservedSwapPages; +static PFN_NUMBER MiReservedSwapPages; /* * Ratio between reserved and available swap pages, e.g. setting this to five Modified: trunk/reactos/ntoskrnl/mm/ppool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ppool.c?rev=48… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ppool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ppool.c [iso-8859-1] Fri Jul 16 00:34:26 2010 @@ -159,8 +159,8 @@ R_POOL, *PR_POOL; PVOID MmPagedPoolBase; -ULONG MmPagedPoolSize; -ULONG MmTotalPagedPoolQuota = 0; // TODO FIXME commented out until we use it +SIZE_T MmPagedPoolSize; +SIZE_T MmTotalPagedPoolQuota = 0; // TODO FIXME commented out until we use it static PR_POOL MmPagedPool = NULL; /* FUNCTIONS*******************************************************************/ Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Fri Jul 16 00:34:26 2010 @@ -2083,7 +2083,7 @@ MmQuerySectionView(PMEMORY_AREA MemoryArea, PVOID Address, PMEMORY_BASIC_INFORMATION Info, - PULONG ResultLength) + PSIZE_T ResultLength) { PMM_REGION Region; PVOID RegionBaseAddress;

1 0

[tkreuzer] 48072: Add MI_MIN_SECONDARY_COLORS, MI_SECONDARY_COLORS and MI_MAX_SECONDARY_COLORS for amd64
by tkreuzer＠svn.reactos.org 16 Jul '10

16 Jul '10

Author: tkreuzer Date: Fri Jul 16 00:03:03 2010 New Revision: 48072 URL: http://svn.reactos.org/svn/reactos?rev=48072&view=rev Log: Add MI_MIN_SECONDARY_COLORS, MI_SECONDARY_COLORS and MI_MAX_SECONDARY_COLORS for amd64 Modified: trunk/reactos/ntoskrnl/include/internal/amd64/mm.h Modified: trunk/reactos/ntoskrnl/include/internal/amd64/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/amd64/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/amd64/mm.h [iso-8859-1] Fri Jul 16 00:03:03 2010 @@ -41,6 +41,10 @@ MI_SESSION_WORKING_SET_SIZE) #define MI_SYSTEM_VIEW_SIZE (16 * 1024 * 1024) #define MI_NUMBER_SYSTEM_PTES 22000 + +#define MI_MIN_SECONDARY_COLORS 8 +#define MI_SECONDARY_COLORS 64 +#define MI_MAX_SECONDARY_COLORS 1024 PULONG64 FORCEINLINE

1 0

[tkreuzer] 48071: [NTOSKRNL] Some ULONG vs SIZE_T fixes
by tkreuzer＠svn.reactos.org 15 Jul '10

15 Jul '10

Author: tkreuzer Date: Thu Jul 15 23:56:53 2010 New Revision: 48071 URL: http://svn.reactos.org/svn/reactos?rev=48071&view=rev Log: [NTOSKRNL] Some ULONG vs SIZE_T fixes Modified: trunk/reactos/ntoskrnl/mm/ARM3/contmem.c trunk/reactos/ntoskrnl/mm/ARM3/iosup.c trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/contmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/contmem.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/contmem.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/contmem.c [iso-8859-1] Thu Jul 15 23:56:53 2010 @@ -606,7 +606,7 @@ */ PVOID NTAPI -MmAllocateContiguousMemory(IN ULONG NumberOfBytes, +MmAllocateContiguousMemory(IN SIZE_T NumberOfBytes, IN PHYSICAL_ADDRESS HighestAcceptableAddress) { PFN_NUMBER HighestPfn; @@ -647,7 +647,7 @@ VOID NTAPI MmFreeContiguousMemorySpecifyCache(IN PVOID BaseAddress, - IN ULONG NumberOfBytes, + IN SIZE_T NumberOfBytes, IN MEMORY_CACHING_TYPE CacheType) { // Modified: trunk/reactos/ntoskrnl/mm/ARM3/iosup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/iosup.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/iosup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/iosup.c [iso-8859-1] Thu Jul 15 23:56:53 2010 @@ -46,7 +46,7 @@ PVOID NTAPI MmMapIoSpace(IN PHYSICAL_ADDRESS PhysicalAddress, - IN ULONG NumberOfBytes, + IN SIZE_T NumberOfBytes, IN MEMORY_CACHING_TYPE CacheType) { @@ -190,7 +190,7 @@ VOID NTAPI MmUnmapIoSpace(IN PVOID BaseAddress, - IN ULONG NumberOfBytes) + IN SIZE_T NumberOfBytes) { PFN_NUMBER PageCount, Pfn; PMMPTE PointerPte; @@ -239,7 +239,7 @@ PVOID NTAPI MmMapVideoDisplay(IN PHYSICAL_ADDRESS PhysicalAddress, - IN ULONG NumberOfBytes, + IN SIZE_T NumberOfBytes, IN MEMORY_CACHING_TYPE CacheType) { PAGED_CODE(); @@ -256,7 +256,7 @@ VOID NTAPI MmUnmapVideoDisplay(IN PVOID BaseAddress, - IN ULONG NumberOfBytes) + IN SIZE_T NumberOfBytes) { // // Call the real function Modified: trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c [iso-8859-1] Thu Jul 15 23:56:53 2010 @@ -28,9 +28,9 @@ NTAPI MmCreateMdl(IN PMDL Mdl, IN PVOID Base, - IN ULONG Length) -{ - ULONG Size; + IN SIZE_T Length) +{ + SIZE_T Size; // // Check if we don't have an MDL built @@ -55,10 +55,10 @@ /* * @implemented */ -ULONG +SIZE_T NTAPI MmSizeOfMdl(IN PVOID Base, - IN ULONG Length) + IN SIZE_T Length) { // // Return the MDL size

1 0

[tkreuzer] 48070: Merge 44257 from amd64 branch: PFN_TYPE -> PFN_NUMBER
by tkreuzer＠svn.reactos.org 15 Jul '10

15 Jul '10

Author: tkreuzer Date: Thu Jul 15 22:50:12 2010 New Revision: 48070 URL: http://svn.reactos.org/svn/reactos?rev=48070&view=rev Log: Merge 44257 from amd64 branch: PFN_TYPE -> PFN_NUMBER Modified: trunk/reactos/ (props changed) trunk/reactos/ntoskrnl/cc/copy.c trunk/reactos/ntoskrnl/cc/view.c trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/mm/ARM3/iosup.c trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c trunk/reactos/ntoskrnl/mm/anonmem.c trunk/reactos/ntoskrnl/mm/arm/page.c trunk/reactos/ntoskrnl/mm/arm/stubs.c trunk/reactos/ntoskrnl/mm/balance.c trunk/reactos/ntoskrnl/mm/freelist.c trunk/reactos/ntoskrnl/mm/i386/page.c trunk/reactos/ntoskrnl/mm/i386/pagepae.c trunk/reactos/ntoskrnl/mm/marea.c trunk/reactos/ntoskrnl/mm/mmfault.c trunk/reactos/ntoskrnl/mm/pagefile.c trunk/reactos/ntoskrnl/mm/powerpc/page.c trunk/reactos/ntoskrnl/mm/rmap.c trunk/reactos/ntoskrnl/mm/section.c Propchange: trunk/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jul 15 22:50:12 2010 @@ -1,4 +1,4 @@ /branches/header-work:45691-47721 /branches/reactos-yarotows:46372,46848,46966,47800,48026,48064 /branches/ros-amd64-bringup:36852 -/branches/ros-amd64-bringup/reactos:34711-34712,34741,34743,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36445,36502-36503,36505,36570,36614,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36992,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40927-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41484-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43857-43858,43860,43905-43907,43965,43969,43992,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,46394,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,47472,47846-47847,47878,47882 +/branches/ros-amd64-bringup/reactos:34711-34712,34741,34743,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36445,36502-36503,36505,36570,36614,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36992,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40927-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41484-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43857-43858,43860,43905-43907,43965,43969,43992,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44257,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,46394,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,47472,47846-47847,47878,47882 Modified: trunk/reactos/ntoskrnl/cc/copy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/copy.c?rev=480… ============================================================================== --- trunk/reactos/ntoskrnl/cc/copy.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/copy.c [iso-8859-1] Thu Jul 15 22:50:12 2010 @@ -15,7 +15,7 @@ /* GLOBALS *******************************************************************/ -static PFN_TYPE CcZeroPage = 0; +static PFN_NUMBER CcZeroPage = 0; #define MAX_ZERO_LENGTH (256 * 1024) #define MAX_RW_LENGTH (256 * 1024) @@ -98,7 +98,7 @@ PCACHE_SEGMENT current2; ULONG current_size; ULONG i; - PPFN_TYPE MdlPages; + PPFN_NUMBER MdlPages; /* * Count the maximum number of bytes we could read starting @@ -119,7 +119,7 @@ Mdl->MdlFlags |= (MDL_PAGES_LOCKED | MDL_IO_PAGE_READ); current2 = current; current_size = 0; - MdlPages = (PPFN_TYPE)(Mdl + 1); + MdlPages = (PPFN_NUMBER)(Mdl + 1); while (current2 != NULL && !current2->Valid && current_size < MAX_RW_LENGTH) { PVOID address = current2->BaseAddress; @@ -619,7 +619,7 @@ Mdl->MdlFlags |= (MDL_PAGES_LOCKED | MDL_IO_PAGE_READ); for (i = 0; i < ((Mdl->Size - sizeof(MDL)) / sizeof(ULONG)); i++) { - ((PPFN_TYPE)(Mdl + 1))[i] = CcZeroPage; + ((PPFN_NUMBER)(Mdl + 1))[i] = CcZeroPage; } KeInitializeEvent(&Event, NotificationEvent, FALSE); Status = IoSynchronousPageWrite(FileObject, Mdl, &WriteOffset, &Event, &Iosb); Modified: trunk/reactos/ntoskrnl/cc/view.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/view.c?rev=480… ============================================================================== --- trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] Thu Jul 15 22:50:12 2010 @@ -330,8 +330,8 @@ KeReleaseGuardedMutex(&ViewLock); for (i = 0; i < current->Bcb->CacheSegmentSize / PAGE_SIZE; i++) { - PFN_TYPE Page; - Page = (PFN_TYPE)(MmGetPhysicalAddress((char*)current->BaseAddress + i * PAGE_SIZE).QuadPart >> PAGE_SHIFT); + PFN_NUMBER Page; + Page = (PFN_NUMBER)(MmGetPhysicalAddress((char*)current->BaseAddress + i * PAGE_SIZE).QuadPart >> PAGE_SHIFT); Status = MmPageOutPhysicalAddress(Page); } KeAcquireGuardedMutex(&ViewLock); @@ -842,7 +842,7 @@ #else static VOID CcFreeCachePage(PVOID Context, MEMORY_AREA* MemoryArea, PVOID Address, - PFN_TYPE Page, SWAPENTRY SwapEntry, BOOLEAN Dirty) + PFN_NUMBER Page, SWAPENTRY SwapEntry, BOOLEAN Dirty) { ASSERT(SwapEntry == 0); if (Page != 0) @@ -861,7 +861,7 @@ ULONG i; ULONG RegionSize; ULONG Base; - PFN_TYPE Page; + PFN_NUMBER Page; KIRQL oldIrql; #endif DPRINT("Freeing cache segment 0x%p\n", CacheSeg); Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] Thu Jul 15 22:50:12 2010 @@ -53,7 +53,6 @@ struct _MM_RMAP_ENTRY; struct _MM_PAGEOP; typedef ULONG SWAPENTRY; -typedef ULONG PFN_TYPE, *PPFN_TYPE; // // MmDbgCopyMemory Flags @@ -466,7 +465,7 @@ PVOID Context, PMEMORY_AREA MemoryArea, PVOID Address, - PFN_TYPE Page, + PFN_NUMBER Page, SWAPENTRY SwapEntry, BOOLEAN Dirty ); @@ -688,7 +687,7 @@ NTAPI MmBuildMdlFromPages( PMDL Mdl, - PULONG Pages + PPFN_NUMBER Pages ); /* mminit.c ******************************************************************/ @@ -738,7 +737,7 @@ NTAPI MmReadFromSwapPage( SWAPENTRY SwapEntry, - PFN_TYPE Page + PFN_NUMBER Page ); BOOLEAN @@ -749,7 +748,7 @@ NTAPI MmWriteToSwapPage( SWAPENTRY SwapEntry, - PFN_TYPE Page + PFN_NUMBER Page ); NTSTATUS @@ -917,18 +916,18 @@ PVOID NTAPI -ExAllocatePageWithPhysPage(PFN_TYPE Page); +ExAllocatePageWithPhysPage(PFN_NUMBER Page); NTSTATUS NTAPI MiCopyFromUserPage( - PFN_TYPE Page, + PFN_NUMBER Page, PVOID SourceAddress ); NTSTATUS NTAPI -MiZeroPage(PFN_TYPE Page); +MiZeroPage(PFN_NUMBER Page); /* memsafe.s *****************************************************************/ @@ -999,7 +998,7 @@ NTAPI MmReleasePageMemoryConsumer( ULONG Consumer, - PFN_TYPE Page + PFN_NUMBER Page ); NTSTATUS @@ -1007,7 +1006,7 @@ MmRequestPageMemoryConsumer( ULONG Consumer, BOOLEAN MyWait, - PPFN_TYPE AllocatedPage + PPFN_NUMBER AllocatedPage ); VOID @@ -1023,18 +1022,18 @@ VOID NTAPI MmSetRmapListHeadPage( - PFN_TYPE Page, + PFN_NUMBER Page, struct _MM_RMAP_ENTRY* ListHead ); struct _MM_RMAP_ENTRY* NTAPI -MmGetRmapListHeadPage(PFN_TYPE Page); +MmGetRmapListHeadPage(PFN_NUMBER Page); VOID NTAPI MmInsertRmap( - PFN_TYPE Page, + PFN_NUMBER Page, struct _EPROCESS *Process, PVOID Address ); @@ -1042,7 +1041,7 @@ VOID NTAPI MmDeleteAllRmaps( - PFN_TYPE Page, + PFN_NUMBER Page, PVOID Context, VOID (*DeleteMapping)(PVOID Context, struct _EPROCESS *Process, PVOID Address) ); @@ -1050,7 +1049,7 @@ VOID NTAPI MmDeleteRmap( - PFN_TYPE Page, + PFN_NUMBER Page, struct _EPROCESS *Process, PVOID Address ); @@ -1061,29 +1060,29 @@ VOID NTAPI -MmSetCleanAllRmaps(PFN_TYPE Page); - -VOID -NTAPI -MmSetDirtyAllRmaps(PFN_TYPE Page); +MmSetCleanAllRmaps(PFN_NUMBER Page); + +VOID +NTAPI +MmSetDirtyAllRmaps(PFN_NUMBER Page); BOOLEAN NTAPI -MmIsDirtyPageRmap(PFN_TYPE Page); - -NTSTATUS -NTAPI -MmWritePagePhysicalAddress(PFN_TYPE Page); - -NTSTATUS -NTAPI -MmPageOutPhysicalAddress(PFN_TYPE Page); +MmIsDirtyPageRmap(PFN_NUMBER Page); + +NTSTATUS +NTAPI +MmWritePagePhysicalAddress(PFN_NUMBER Page); + +NTSTATUS +NTAPI +MmPageOutPhysicalAddress(PFN_NUMBER Page); /* freelist.c **********************************************************/ FORCEINLINE PMMPFN -MiGetPfnEntry(IN PFN_TYPE Pfn) +MiGetPfnEntry(IN PFN_NUMBER Pfn) { PMMPFN Page; extern RTL_BITMAP MiPfnBitMap; @@ -1111,33 +1110,33 @@ return Pfn1 - MmPfnDatabase; } -PFN_TYPE -NTAPI -MmGetLRUNextUserPage(PFN_TYPE PreviousPage); - -PFN_TYPE +PFN_NUMBER +NTAPI +MmGetLRUNextUserPage(PFN_NUMBER PreviousPage); + +PFN_NUMBER NTAPI MmGetLRUFirstUserPage(VOID); VOID NTAPI -MmInsertLRULastUserPage(PFN_TYPE Page); - -VOID -NTAPI -MmRemoveLRUUserPage(PFN_TYPE Page); - -VOID -NTAPI -MmLockPage(PFN_TYPE Page); - -VOID -NTAPI -MmUnlockPage(PFN_TYPE Page); +MmInsertLRULastUserPage(PFN_NUMBER Page); + +VOID +NTAPI +MmRemoveLRUUserPage(PFN_NUMBER Page); + +VOID +NTAPI +MmLockPage(PFN_NUMBER Page); + +VOID +NTAPI +MmUnlockPage(PFN_NUMBER Page); ULONG NTAPI -MmGetLockCountPage(PFN_TYPE Page); +MmGetLockCountPage(PFN_NUMBER Page); VOID NTAPI @@ -1151,7 +1150,7 @@ VOID ); -PFN_TYPE +PFN_NUMBER NTAPI MmGetContinuousPages( ULONG NumberOfBytes, @@ -1222,7 +1221,7 @@ MmCreateVirtualMappingForKernel( PVOID Address, ULONG flProtect, - PPFN_TYPE Pages, + PPFN_NUMBER Pages, ULONG PageCount ); @@ -1239,7 +1238,7 @@ struct _EPROCESS* Process, PVOID Address, ULONG flProtect, - PPFN_TYPE Pages, + PPFN_NUMBER Pages, ULONG PageCount ); @@ -1249,7 +1248,7 @@ struct _EPROCESS* Process, PVOID Address, ULONG flProtect, - PPFN_TYPE Pages, + PPFN_NUMBER Pages, ULONG PageCount ); @@ -1284,7 +1283,7 @@ struct _EPROCESS *Process, PVOID Address, BOOLEAN* WasDirty, - PPFN_TYPE Page + PPFN_NUMBER Page ); VOID @@ -1324,7 +1323,7 @@ VOID NTAPI MmTransferOwnershipPage( - PFN_TYPE Page, + PFN_NUMBER Page, ULONG NewConsumer ); @@ -1335,7 +1334,7 @@ PVOID Address ); -PFN_TYPE +PFN_NUMBER NTAPI MmAllocPage( ULONG Consumer @@ -1348,34 +1347,34 @@ PHYSICAL_ADDRESS LowestAddress, PHYSICAL_ADDRESS HighestAddress, ULONG NumberOfPages, - PPFN_TYPE Pages -); - -VOID -NTAPI -MmDereferencePage(PFN_TYPE Page); - -VOID -NTAPI -MmReferencePage(PFN_TYPE Page); + PPFN_NUMBER Pages +); + +VOID +NTAPI +MmDereferencePage(PFN_NUMBER Page); + +VOID +NTAPI +MmReferencePage(PFN_NUMBER Page); ULONG NTAPI -MmGetReferenceCountPage(PFN_TYPE Page); +MmGetReferenceCountPage(PFN_NUMBER Page); BOOLEAN NTAPI -MmIsPageInUse(PFN_TYPE Page); +MmIsPageInUse(PFN_NUMBER Page); VOID NTAPI MmSetSavedSwapEntryPage( - PFN_TYPE Page, + PFN_NUMBER Page, SWAPENTRY SavedSwapEntry); SWAPENTRY NTAPI -MmGetSavedSwapEntryPage(PFN_TYPE Page); +MmGetSavedSwapEntryPage(PFN_NUMBER Page); VOID NTAPI @@ -1395,7 +1394,7 @@ PVOID Address ); -PFN_TYPE +PFN_NUMBER NTAPI MmGetPfnForProcess( struct _EPROCESS *Process, @@ -1439,7 +1438,7 @@ PVOID Address, BOOLEAN FreePage, BOOLEAN* WasDirty, - PPFN_TYPE Page + PPFN_NUMBER Page ); BOOLEAN @@ -1451,11 +1450,11 @@ VOID NTAPI -MmMarkPageMapped(PFN_TYPE Page); - -VOID -NTAPI -MmMarkPageUnmapped(PFN_TYPE Page); +MmMarkPageMapped(PFN_NUMBER Page); + +VOID +NTAPI +MmMarkPageUnmapped(PFN_NUMBER Page); VOID NTAPI Modified: trunk/reactos/ntoskrnl/mm/ARM3/iosup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/iosup.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/iosup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/iosup.c [iso-8859-1] Thu Jul 15 22:50:12 2010 @@ -50,7 +50,7 @@ IN MEMORY_CACHING_TYPE CacheType) { - PFN_TYPE Pfn, PageCount; + PFN_NUMBER Pfn, PageCount; PMMPTE PointerPte; PVOID BaseAddress; MMPTE TempPte; Modified: trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c [iso-8859-1] Thu Jul 15 22:50:12 2010 @@ -573,7 +573,7 @@ IN KPROCESSOR_MODE AccessMode, IN LOCK_OPERATION Operation) { - PPFN_TYPE MdlPages; + PPFN_NUMBER MdlPages; PVOID Base, Address, LastAddress, StartAddress; ULONG LockPages, TotalPages; NTSTATUS Status = STATUS_SUCCESS; Modified: trunk/reactos/ntoskrnl/mm/anonmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/anonmem.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] Thu Jul 15 22:50:12 2010 @@ -53,7 +53,7 @@ PMM_PAGEOP PageOp) { SWAPENTRY SwapEntry; - PFN_TYPE Page; + PFN_NUMBER Page; NTSTATUS Status; PEPROCESS Process = MmGetAddressSpaceOwner(AddressSpace); @@ -135,7 +135,7 @@ PVOID Address, PMM_PAGEOP PageOp) { - PFN_TYPE Page; + PFN_NUMBER Page; BOOLEAN WasDirty; SWAPENTRY SwapEntry; NTSTATUS Status; @@ -253,7 +253,7 @@ * NOTES: This function is called with the address space lock held. */ { - PFN_TYPE Page; + PFN_NUMBER Page; NTSTATUS Status; PMM_REGION Region; PMM_PAGEOP PageOp; @@ -457,7 +457,7 @@ for (i=0; i < PAGE_ROUND_UP(RegionSize)/PAGE_SIZE; i++) { - PFN_TYPE Page; + PFN_NUMBER Page; if (MmIsPageSwapEntry(Process, (char*)BaseAddress + (i * PAGE_SIZE))) @@ -853,7 +853,7 @@ MmFreeVirtualMemoryPage(PVOID Context, MEMORY_AREA* MemoryArea, PVOID Address, - PFN_TYPE Page, + PFN_NUMBER Page, SWAPENTRY SwapEntry, BOOLEAN Dirty) { Modified: trunk/reactos/ntoskrnl/mm/arm/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/arm/page.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/arm/page.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/arm/page.c [iso-8859-1] Thu Jul 15 22:50:12 2010 @@ -81,7 +81,7 @@ MmDisableVirtualMapping(IN PEPROCESS Process, IN PVOID Address, OUT PBOOLEAN WasDirty, - OUT PPFN_TYPE Page) + OUT PPFN_NUMBER Page) { UNIMPLEMENTED; while (TRUE); @@ -101,7 +101,7 @@ MmCreateVirtualMappingUnsafe(IN PEPROCESS Process, IN PVOID Address, IN ULONG Protection, - IN PPFN_TYPE Pages, + IN PPFN_NUMBER Pages, IN ULONG PageCount) { UNIMPLEMENTED; @@ -114,7 +114,7 @@ MmCreateVirtualMapping(IN PEPROCESS Process, IN PVOID Address, IN ULONG Protection, - IN PPFN_TYPE Pages, + IN PPFN_NUMBER Pages, IN ULONG PageCount) { UNIMPLEMENTED; @@ -136,7 +136,7 @@ IN PVOID Address, IN BOOLEAN FreePage, OUT PBOOLEAN WasDirty, - OUT PPFN_TYPE Page) + OUT PPFN_NUMBER Page) { UNIMPLEMENTED; while (TRUE); @@ -163,7 +163,7 @@ return 0; } -PFN_TYPE +PFN_NUMBER NTAPI MmGetPfnForProcess(IN PEPROCESS Process, IN PVOID Address) Modified: trunk/reactos/ntoskrnl/mm/arm/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/arm/stubs.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/arm/stubs.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/arm/stubs.c [iso-8859-1] Thu Jul 15 22:50:12 2010 @@ -430,7 +430,7 @@ MmDisableVirtualMapping(IN PEPROCESS Process, IN PVOID Address, OUT PBOOLEAN WasDirty, - OUT PPFN_TYPE Page) + OUT PPFN_NUMBER Page) { // // TODO @@ -557,7 +557,7 @@ MmCreateVirtualMappingUnsafe(IN PEPROCESS Process, IN PVOID Address, IN ULONG Protection, - IN PPFN_TYPE Pages, + IN PPFN_NUMBER Pages, IN ULONG PageCount) { // @@ -588,7 +588,7 @@ MmCreateVirtualMapping(IN PEPROCESS Process, IN PVOID Address, IN ULONG Protection, - IN PPFN_TYPE Pages, + IN PPFN_NUMBER Pages, IN ULONG PageCount) { ULONG i; @@ -644,7 +644,7 @@ IN PVOID Address, IN BOOLEAN FreePage, OUT PBOOLEAN WasDirty, - OUT PPFN_TYPE Page) + OUT PPFN_NUMBER Page) { PMMPTE PointerPte; MMPTE Pte; @@ -712,7 +712,7 @@ return 0; } -PFN_TYPE +PFN_NUMBER NTAPI MmGetPfnForProcess(IN PEPROCESS Process, IN PVOID Address) Modified: trunk/reactos/ntoskrnl/mm/balance.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/balance.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/balance.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/balance.c [iso-8859-1] Thu Jul 15 22:50:12 2010 @@ -23,7 +23,7 @@ /* TYPES ********************************************************************/ typedef struct _MM_ALLOCATION_REQUEST { - PFN_TYPE Page; + PFN_NUMBER Page; LIST_ENTRY ListEntry; KEVENT Event; } @@ -101,7 +101,7 @@ NTSTATUS NTAPI -MmReleasePageMemoryConsumer(ULONG Consumer, PFN_TYPE Page) +MmReleasePageMemoryConsumer(ULONG Consumer, PFN_NUMBER Page) { PMM_ALLOCATION_REQUEST Request; PLIST_ENTRY Entry; @@ -171,8 +171,8 @@ NTSTATUS MmTrimUserMemory(ULONG Target, ULONG Priority, PULONG NrFreedPages) { - PFN_TYPE CurrentPage; - PFN_TYPE NextPage; + PFN_NUMBER CurrentPage; + PFN_NUMBER NextPage; NTSTATUS Status; (*NrFreedPages) = 0; @@ -228,15 +228,15 @@ PsGetCurrentThread() == MiBalancerThreadId.UniqueThread; } -VOID NTAPI MiSetConsumer(IN PFN_TYPE Pfn, IN ULONG Consumer); +VOID NTAPI MiSetConsumer(IN PFN_NUMBER Pfn, IN ULONG Consumer); NTSTATUS NTAPI MmRequestPageMemoryConsumer(ULONG Consumer, BOOLEAN CanWait, - PPFN_TYPE AllocatedPage) + PPFN_NUMBER AllocatedPage) { ULONG OldUsed; - PFN_TYPE Page; + PFN_NUMBER Page; KIRQL OldIrql; /* Modified: trunk/reactos/ntoskrnl/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/freelist.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] Thu Jul 15 22:50:12 2010 @@ -73,7 +73,7 @@ RtlClearAllBits(&MiUserPfnBitMap); } -PFN_TYPE +PFN_NUMBER NTAPI MmGetLRUFirstUserPage(VOID) { @@ -92,7 +92,7 @@ VOID NTAPI -MmInsertLRULastUserPage(PFN_TYPE Pfn) +MmInsertLRULastUserPage(PFN_NUMBER Pfn) { KIRQL OldIrql; @@ -102,9 +102,9 @@ KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); } -PFN_TYPE -NTAPI -MmGetLRUNextUserPage(PFN_TYPE PreviousPfn) +PFN_NUMBER +NTAPI +MmGetLRUNextUserPage(PFN_NUMBER PreviousPfn) { ULONG Position; KIRQL OldIrql; @@ -121,7 +121,7 @@ VOID NTAPI -MmRemoveLRUUserPage(PFN_TYPE Page) +MmRemoveLRUUserPage(PFN_NUMBER Page) { /* Unset the page as a user page */ RtlClearBit(&MiUserPfnBitMap, Page); @@ -448,7 +448,7 @@ VOID NTAPI -MmSetRmapListHeadPage(PFN_TYPE Pfn, struct _MM_RMAP_ENTRY* ListHead) +MmSetRmapListHeadPage(PFN_NUMBER Pfn, struct _MM_RMAP_ENTRY* ListHead) { KIRQL oldIrql; @@ -459,7 +459,7 @@ struct _MM_RMAP_ENTRY* NTAPI -MmGetRmapListHeadPage(PFN_TYPE Pfn) +MmGetRmapListHeadPage(PFN_NUMBER Pfn) { KIRQL oldIrql; struct _MM_RMAP_ENTRY* ListHead; @@ -473,7 +473,7 @@ VOID NTAPI -MmSetSavedSwapEntryPage(PFN_TYPE Pfn, SWAPENTRY SwapEntry) +MmSetSavedSwapEntryPage(PFN_NUMBER Pfn, SWAPENTRY SwapEntry) { KIRQL oldIrql; @@ -484,7 +484,7 @@ SWAPENTRY NTAPI -MmGetSavedSwapEntryPage(PFN_TYPE Pfn) +MmGetSavedSwapEntryPage(PFN_NUMBER Pfn) { SWAPENTRY SwapEntry; KIRQL oldIrql; @@ -498,7 +498,7 @@ VOID NTAPI -MmReferencePage(PFN_TYPE Pfn) +MmReferencePage(PFN_NUMBER Pfn) { PPHYSICAL_PAGE Page; @@ -517,7 +517,7 @@ ULONG NTAPI -MmGetReferenceCountPage(PFN_TYPE Pfn) +MmGetReferenceCountPage(PFN_NUMBER Pfn) { KIRQL oldIrql; ULONG RCount; @@ -537,14 +537,14 @@ BOOLEAN NTAPI -MmIsPageInUse(PFN_TYPE Pfn) +MmIsPageInUse(PFN_NUMBER Pfn) { return MiIsPfnInUse(MiGetPfnEntry(Pfn)); } VOID NTAPI -MiSetConsumer(IN PFN_TYPE Pfn, +MiSetConsumer(IN PFN_NUMBER Pfn, IN ULONG Type) { MiGetPfnEntry(Pfn)->u3.e1.PageLocation = ActiveAndValid; @@ -552,7 +552,7 @@ VOID NTAPI -MmDereferencePage(PFN_TYPE Pfn) +MmDereferencePage(PFN_NUMBER Pfn) { PPHYSICAL_PAGE Page; @@ -574,11 +574,11 @@ } } -PFN_TYPE +PFN_NUMBER NTAPI MmAllocPage(ULONG Type) { - PFN_TYPE PfnOffset; + PFN_NUMBER PfnOffset; PPHYSICAL_PAGE PageDescriptor; BOOLEAN NeedClear = FALSE; @@ -622,7 +622,7 @@ NTSTATUS NTAPI -MiZeroPage(PFN_TYPE Page) +MiZeroPage(PFN_NUMBER Page) { KIRQL Irql; PVOID TempAddress; @@ -646,7 +646,7 @@ NTSTATUS Status; KIRQL oldIrql; PPHYSICAL_PAGE PageDescriptor; - PFN_TYPE Pfn; + PFN_NUMBER Pfn; ULONG Count; /* Free initial kernel memory */ Modified: trunk/reactos/ntoskrnl/mm/i386/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/page.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] Thu Jul 15 22:50:12 2010 @@ -183,7 +183,7 @@ { NTSTATUS Status; ULONG i, j; - PFN_TYPE Pfn[2]; + PFN_NUMBER Pfn[2]; PULONG PageDirectory; DPRINT("MmCopyMmInfo(Src %x, Dest %x)\n", MinWs, Process); @@ -225,7 +225,7 @@ { ULONG PdeOffset = ADDR_TO_PDE_OFFSET(Address); NTSTATUS Status; - PFN_TYPE Pfn; + PFN_NUMBER Pfn; ULONG Entry; PULONG Pt, PageDir; @@ -344,7 +344,7 @@ return 0; } -PFN_TYPE +PFN_NUMBER NTAPI MmGetPfnForProcess(PEPROCESS Process, PVOID Address) @@ -360,7 +360,7 @@ VOID NTAPI -MmDisableVirtualMapping(PEPROCESS Process, PVOID Address, BOOLEAN* WasDirty, PPFN_TYPE Page) +MmDisableVirtualMapping(PEPROCESS Process, PVOID Address, BOOLEAN* WasDirty, PPFN_NUMBER Page) /* * FUNCTION: Delete a virtual mapping */ @@ -422,13 +422,13 @@ VOID NTAPI MmDeleteVirtualMapping(PEPROCESS Process, PVOID Address, BOOLEAN FreePage, - BOOLEAN* WasDirty, PPFN_TYPE Page) + BOOLEAN* WasDirty, PPFN_NUMBER Page) /* * FUNCTION: Delete a virtual mapping */ { BOOLEAN WasValid = FALSE; - PFN_TYPE Pfn; + PFN_NUMBER Pfn; ULONG Pte; PULONG Pt; @@ -701,7 +701,7 @@ MmCreateVirtualMappingUnsafe(PEPROCESS Process, PVOID Address, ULONG flProtect, - PPFN_TYPE Pages, + PPFN_NUMBER Pages, ULONG PageCount) { ULONG Attributes; @@ -816,7 +816,7 @@ MmCreateVirtualMapping(PEPROCESS Process, PVOID Address, ULONG flProtect, - PPFN_TYPE Pages, + PPFN_NUMBER Pages, ULONG PageCount) { ULONG i; Modified: trunk/reactos/ntoskrnl/mm/i386/pagepae.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/pagepae.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/i386/pagepae.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/i386/pagepae.c [iso-8859-1] Thu Jul 15 22:50:12 2010 @@ -348,7 +348,7 @@ { NTSTATUS Status; ULONG i, j; - PFN_TYPE Pfn[7]; + PFN_NUMBER Pfn[7]; ULONG Count; DPRINT("MmCopyMmInfo(Src %x, Dest %x)\n", MinWs, Process); @@ -459,7 +459,7 @@ { PEPROCESS CurrentProcess = PsGetCurrentProcess(); ULONG i; - PFN_TYPE Pfn; + PFN_NUMBER Pfn; DPRINT("ProcessId %d, Address %x\n", Process->UniqueProcessId, Address); if (Process != NULL && Process != CurrentProcess) @@ -521,7 +521,7 @@ MmGetPageTableForProcessForPAE(PEPROCESS Process, PVOID Address, BOOLEAN Create) { NTSTATUS Status; - PFN_TYPE Pfn; + PFN_NUMBER Pfn; ULONGLONG Entry; ULONGLONG ZeroEntry = 0LL; PULONGLONG Pt; @@ -636,7 +636,7 @@ { ULONG PdeOffset = ADDR_TO_PDE_OFFSET(Address); NTSTATUS Status; - PFN_TYPE Pfn; + PFN_NUMBER Pfn; ULONG Entry; PULONG Pt, PageDir; @@ -780,7 +780,7 @@ return 0; } -PFN_TYPE +PFN_NUMBER NTAPI MmGetPfnForProcess(PEPROCESS Process, PVOID Address) @@ -810,7 +810,7 @@ VOID NTAPI -MmDisableVirtualMapping(PEPROCESS Process, PVOID Address, BOOLEAN* WasDirty, PPFN_TYPE Page) +MmDisableVirtualMapping(PEPROCESS Process, PVOID Address, BOOLEAN* WasDirty, PPFN_NUMBER Page) /* * FUNCTION: Delete a virtual mapping */ @@ -931,13 +931,13 @@ VOID NTAPI MmDeleteVirtualMapping(PEPROCESS Process, PVOID Address, BOOLEAN FreePage, - BOOLEAN* WasDirty, PPFN_TYPE Page) + BOOLEAN* WasDirty, PPFN_NUMBER Page) /* * FUNCTION: Delete a virtual mapping */ { BOOLEAN WasValid = FALSE; - PFN_TYPE Pfn; + PFN_NUMBER Pfn; DPRINT("MmDeleteVirtualMapping(%x, %x, %d, %x, %x)\n", Process, Address, FreePage, WasDirty, Page); @@ -1510,7 +1510,7 @@ NTAPI MmCreateVirtualMappingForKernel(PVOID Address, ULONG flProtect, - PPFN_TYPE Pages, + PPFN_NUMBER Pages, ULONG PageCount) { ULONG Attributes; @@ -1727,7 +1727,7 @@ MmCreateVirtualMappingUnsafe(PEPROCESS Process, PVOID Address, ULONG flProtect, - PPFN_TYPE Pages, + PPFN_NUMBER Pages, ULONG PageCount) { ULONG Attributes; @@ -1933,7 +1933,7 @@ MmCreateVirtualMapping(PEPROCESS Process, PVOID Address, ULONG flProtect, - PPFN_TYPE Pages, + PPFN_NUMBER Pages, ULONG PageCount) { ULONG i; @@ -2114,7 +2114,7 @@ PVOID NTAPI -MmCreateHyperspaceMapping(PFN_TYPE Page) +MmCreateHyperspaceMapping(PFN_NUMBER Page) { PVOID Address; ULONG i; @@ -2241,11 +2241,11 @@ return Address; } -PFN_TYPE -NTAPI -MmChangeHyperspaceMapping(PVOID Address, PFN_TYPE NewPage) -{ - PFN_TYPE Pfn; +PFN_NUMBER +NTAPI +MmChangeHyperspaceMapping(PVOID Address, PFN_NUMBER NewPage) +{ + PFN_NUMBER Pfn; ASSERT (IS_HYPERSPACE(Address)); if (Ke386Pae) { @@ -2263,11 +2263,11 @@ return Pfn; } -PFN_TYPE +PFN_NUMBER NTAPI MmDeleteHyperspaceMapping(PVOID Address) { - PFN_TYPE Pfn; + PFN_NUMBER Pfn; ASSERT (IS_HYPERSPACE(Address)); if (Ke386Pae) { Modified: trunk/reactos/ntoskrnl/mm/marea.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/marea.c?rev=48… ============================================================================== --- trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] Thu Jul 15 22:50:12 2010 @@ -754,7 +754,7 @@ { BOOLEAN Dirty = FALSE; SWAPENTRY SwapEntry = 0; - PFN_TYPE Page = 0; + PFN_NUMBER Page = 0; if (MmIsPageSwapEntry(Process, (PVOID)Address)) { @@ -1039,7 +1039,7 @@ for (i = 0; i < PAGE_ROUND_UP(Length) / PAGE_SIZE; i++) { - PFN_TYPE Page; + PFN_NUMBER Page; Status = MmRequestPageMemoryConsumer(Consumer, TRUE, &Page); if (!NT_SUCCESS(Status)) Modified: trunk/reactos/ntoskrnl/mm/mmfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mmfault.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mmfault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/mmfault.c [iso-8859-1] Thu Jul 15 22:50:12 2010 @@ -312,7 +312,7 @@ MmCommitPagedPoolAddress(PVOID Address, BOOLEAN Locked) { NTSTATUS Status; - PFN_TYPE AllocatedPage; + PFN_NUMBER AllocatedPage; Status = MmRequestPageMemoryConsumer(MC_PPOOL, FALSE, &AllocatedPage); if (!NT_SUCCESS(Status)) Modified: trunk/reactos/ntoskrnl/mm/pagefile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pagefile.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/pagefile.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/pagefile.c [iso-8859-1] Thu Jul 15 22:50:12 2010 @@ -121,9 +121,9 @@ VOID NTAPI -MmBuildMdlFromPages(PMDL Mdl, PPFN_TYPE Pages) -{ - memcpy(Mdl + 1, Pages, sizeof(PFN_TYPE) * (PAGE_ROUND_UP(Mdl->ByteOffset+Mdl->ByteCount)/PAGE_SIZE)); +MmBuildMdlFromPages(PMDL Mdl, PPFN_NUMBER Pages) +{ + memcpy(Mdl + 1, Pages, sizeof(PFN_NUMBER) * (PAGE_ROUND_UP(Mdl->ByteOffset+Mdl->ByteCount)/PAGE_SIZE)); /* FIXME: this flag should be set by the caller perhaps? */ Mdl->MdlFlags |= MDL_IO_PAGE_READ; @@ -217,7 +217,7 @@ NTSTATUS NTAPI -MmWriteToSwapPage(SWAPENTRY SwapEntry, PFN_TYPE Page) +MmWriteToSwapPage(SWAPENTRY SwapEntry, PFN_NUMBER Page) { ULONG i, offset; LARGE_INTEGER file_offset; @@ -278,7 +278,7 @@ NTSTATUS NTAPI -MmReadFromSwapPage(SWAPENTRY SwapEntry, PFN_TYPE Page) +MmReadFromSwapPage(SWAPENTRY SwapEntry, PFN_NUMBER Page) { ULONG i, offset; LARGE_INTEGER file_offset; Modified: trunk/reactos/ntoskrnl/mm/powerpc/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/powerpc/page.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/powerpc/page.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/powerpc/page.c [iso-8859-1] Thu Jul 15 22:50:12 2010 @@ -191,17 +191,17 @@ return Addr; } -PFN_TYPE +PFN_NUMBER NTAPI MmGetPfnForProcess(PEPROCESS Process, PVOID Address) { - return((PFN_TYPE)MmGetPhysicalAddressProcess(Process, Address) >> PAGE_SHIFT); -} - -VOID -NTAPI -MmDisableVirtualMapping(PEPROCESS Process, PVOID Address, BOOLEAN* WasDirty, PPFN_TYPE Page) + return((PFN_NUMBER)MmGetPhysicalAddressProcess(Process, Address) >> PAGE_SHIFT); +} + +VOID +NTAPI +MmDisableVirtualMapping(PEPROCESS Process, PVOID Address, BOOLEAN* WasDirty, PPFN_NUMBER Page) /* * FUNCTION: Delete a virtual mapping */ @@ -221,7 +221,7 @@ VOID NTAPI MmDeleteVirtualMapping(PEPROCESS Process, PVOID Address, BOOLEAN FreePage, - BOOLEAN* WasDirty, PPFN_TYPE Page) + BOOLEAN* WasDirty, PPFN_NUMBER Page) /* * FUNCTION: Delete a virtual mapping */ @@ -358,7 +358,7 @@ NTAPI MmCreateVirtualMappingForKernel(PVOID Address, ULONG flProtect, - PPFN_TYPE Pages, + PPFN_NUMBER Pages, ULONG PageCount) { ULONG i; @@ -424,7 +424,7 @@ MmCreateVirtualMappingUnsafe(PEPROCESS Process, PVOID Address, ULONG flProtect, - PPFN_TYPE Pages, + PPFN_NUMBER Pages, ULONG PageCount) { ULONG Attributes; @@ -498,7 +498,7 @@ MmCreateVirtualMapping(PEPROCESS Process, PVOID Address, ULONG flProtect, - PPFN_TYPE Pages, + PPFN_NUMBER Pages, ULONG PageCount) { ULONG i; @@ -573,7 +573,7 @@ PVOID NTAPI -MmCreateHyperspaceMapping(PFN_TYPE Page) +MmCreateHyperspaceMapping(PFN_NUMBER Page) { PVOID Address; ppc_map_info_t info = { 0 }; @@ -587,11 +587,11 @@ return Address; } -PFN_TYPE -NTAPI -MmChangeHyperspaceMapping(PVOID Address, PFN_TYPE NewPage) -{ - PFN_TYPE OldPage; +PFN_NUMBER +NTAPI +MmChangeHyperspaceMapping(PVOID Address, PFN_NUMBER NewPage) +{ + PFN_NUMBER OldPage; ppc_map_info_t info = { 0 }; info.proc = 0; @@ -604,7 +604,7 @@ return NewPage; } -PFN_TYPE +PFN_NUMBER NTAPI MmDeleteHyperspaceMapping(PVOID Address) { @@ -616,7 +616,7 @@ MmuUnmapPage(&info, 1); - return (PFN_TYPE)info.phys; + return (PFN_NUMBER)info.phys; } VOID @@ -658,7 +658,7 @@ } /* Use our primitive allocator */ -PFN_TYPE MmPPCPrimitiveAllocPage() +PFN_NUMBER MmPPCPrimitiveAllocPage() { paddr_t Result = MmuGetPage(); DbgPrint("Got Page %x\n", Result); Modified: trunk/reactos/ntoskrnl/mm/rmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/rmap.c?rev=480… ============================================================================== --- trunk/reactos/ntoskrnl/mm/rmap.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/rmap.c [iso-8859-1] Thu Jul 15 22:50:12 2010 @@ -54,7 +54,7 @@ NTSTATUS NTAPI -MmWritePagePhysicalAddress(PFN_TYPE Page) +MmWritePagePhysicalAddress(PFN_NUMBER Page) { PMM_RMAP_ENTRY entry; PMEMORY_AREA MemoryArea; @@ -188,7 +188,7 @@ NTSTATUS NTAPI -MmPageOutPhysicalAddress(PFN_TYPE Page) +MmPageOutPhysicalAddress(PFN_NUMBER Page) { PMM_RMAP_ENTRY entry; PMEMORY_AREA MemoryArea; @@ -312,7 +312,7 @@ VOID NTAPI -MmSetCleanAllRmaps(PFN_TYPE Page) +MmSetCleanAllRmaps(PFN_NUMBER Page) { PMM_RMAP_ENTRY current_entry; @@ -333,7 +333,7 @@ VOID NTAPI -MmSetDirtyAllRmaps(PFN_TYPE Page) +MmSetDirtyAllRmaps(PFN_NUMBER Page) { PMM_RMAP_ENTRY current_entry; @@ -354,7 +354,7 @@ BOOLEAN NTAPI -MmIsDirtyPageRmap(PFN_TYPE Page) +MmIsDirtyPageRmap(PFN_NUMBER Page) { PMM_RMAP_ENTRY current_entry; @@ -380,7 +380,7 @@ VOID NTAPI -MmInsertRmap(PFN_TYPE Page, PEPROCESS Process, +MmInsertRmap(PFN_NUMBER Page, PEPROCESS Process, PVOID Address) { PMM_RMAP_ENTRY current_entry; @@ -450,7 +450,7 @@ VOID NTAPI -MmDeleteAllRmaps(PFN_TYPE Page, PVOID Context, +MmDeleteAllRmaps(PFN_NUMBER Page, PVOID Context, VOID (*DeleteMapping)(PVOID Context, PEPROCESS Process, PVOID Address)) { @@ -491,7 +491,7 @@ VOID NTAPI -MmDeleteRmap(PFN_TYPE Page, PEPROCESS Process, +MmDeleteRmap(PFN_NUMBER Page, PEPROCESS Process, PVOID Address) { PMM_RMAP_ENTRY current_entry, previous_entry; Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Thu Jul 15 22:50:12 2010 @@ -465,7 +465,7 @@ PFILE_OBJECT FileObject; PBCB Bcb; SWAPENTRY SavedSwapEntry; - PFN_TYPE Page; + PFN_NUMBER Page; BOOLEAN IsImageSection; ULONG FileOffset; @@ -580,7 +580,7 @@ NTSTATUS NTAPI -MiCopyFromUserPage(PFN_TYPE DestPage, PVOID SourceAddress) +MiCopyFromUserPage(PFN_NUMBER DestPage, PVOID SourceAddress) { PEPROCESS Process; KIRQL Irql; @@ -601,7 +601,7 @@ NTAPI MiReadPage(PMEMORY_AREA MemoryArea, ULONG SegOffset, - PPFN_TYPE Page) + PPFN_NUMBER Page) /* * FUNCTION: Read a page for a section backed memory area. * PARAMETERS: @@ -782,7 +782,7 @@ BOOLEAN Locked) { ULONG Offset; - PFN_TYPE Page; + PFN_NUMBER Page; NTSTATUS Status; PVOID PAddress; PROS_SECTION_OBJECT Section; @@ -1267,8 +1267,8 @@ { PMM_SECTION_SEGMENT Segment; PROS_SECTION_OBJECT Section; - PFN_TYPE OldPage; - PFN_TYPE NewPage; + PFN_NUMBER OldPage; + PFN_NUMBER NewPage; NTSTATUS Status; PVOID PAddress; ULONG Offset; @@ -1435,7 +1435,7 @@ { MM_SECTION_PAGEOUT_CONTEXT* PageOutContext; BOOLEAN WasDirty; - PFN_TYPE Page; + PFN_NUMBER Page; PageOutContext = (MM_SECTION_PAGEOUT_CONTEXT*)Context; if (Process) @@ -1482,7 +1482,7 @@ PVOID Address, PMM_PAGEOP PageOp) { - PFN_TYPE Page; + PFN_NUMBER Page; MM_SECTION_PAGEOUT_CONTEXT Context; SWAPENTRY SwapEntry; ULONG Entry; @@ -1842,7 +1842,7 @@ ULONG Offset; PROS_SECTION_OBJECT Section; PMM_SECTION_SEGMENT Segment; - PFN_TYPE Page; + PFN_NUMBER Page; SWAPENTRY SwapEntry; ULONG Entry; BOOLEAN Private; @@ -2019,7 +2019,7 @@ { ULONG Offset; ULONG Entry; - PFN_TYPE Page; + PFN_NUMBER Page; Offset = (ULONG_PTR)Address - (ULONG_PTR)MemoryArea->StartingAddress + MemoryArea->Data.SectionData.ViewOffset; @@ -2128,7 +2128,7 @@ ULONG Offset; ULONG Entry; ULONG SavedSwapEntry; - PFN_TYPE Page; + PFN_NUMBER Page; Page = 0; @@ -3877,7 +3877,7 @@ static VOID MmFreeSectionPage(PVOID Context, MEMORY_AREA* MemoryArea, PVOID Address, - PFN_TYPE Page, SWAPENTRY SwapEntry, BOOLEAN Dirty) + PFN_NUMBER Page, SWAPENTRY SwapEntry, BOOLEAN Dirty) { ULONG Entry; PFILE_OBJECT FileObject;

1 0

[tkreuzer] 48069: Remove svn:mergeinfo property
by tkreuzer＠svn.reactos.org 15 Jul '10

15 Jul '10

Author: tkreuzer Date: Thu Jul 15 22:43:13 2010 New Revision: 48069 URL: http://svn.reactos.org/svn/reactos?rev=48069&view=rev Log: Remove svn:mergeinfo property Modified: trunk/reactos/include/reactos/winsock/msafd.h (props changed) trunk/reactos/include/reactos/winsock/msafdlib.h (props changed) trunk/reactos/include/reactos/winsock/mswinsock.h (props changed) trunk/reactos/include/reactos/winsock/rnr20lib.h (props changed) trunk/reactos/include/reactos/winsock/wsmobile.h (props changed) Propchange: trunk/reactos/include/reactos/winsock/msafd.h ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo (removed) @@ -1,2 +1,0 @@ -/branches/ros-amd64-bringup/reactos/include/reactos/winsock/msafd.h:34711-34712,34743,34780-34782,34812,34839,34842,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35683,35739,35746,35762,35771,35777,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36172,36360,36388-36389,36445,36502-36503,36505,36570,36614,36899,36930,36936,36992,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38148-38151,38264-38265,38268,38355,39151,39333,39345,39639,40122-40123,40125,40128,40155,40247,40324,40753,40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41082-41086,41097-41098,41101,41449,41479,41484-41485,41499,41531,41536,41540,41546-41547,41549,43080,43426,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601 -/trunk/reactos/include/reactos/winsock/msafd.h:44354-45543 Propchange: trunk/reactos/include/reactos/winsock/msafdlib.h ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo (removed) @@ -1,2 +1,0 @@ -/branches/ros-amd64-bringup/reactos/include/reactos/winsock/msafdlib.h:34711-34712,34743,34780-34782,34812,34839,34842,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35683,35739,35746,35762,35771,35777,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36172,36360,36388-36389,36445,36502-36503,36505,36570,36614,36899,36930,36936,36992,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38148-38151,38264-38265,38268,38355,39151,39333,39345,39639,40122-40123,40125,40128,40155,40247,40324,40753,40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41082-41086,41097-41098,41101,41449,41479,41484-41485,41499,41531,41536,41540,41546-41547,41549,43080,43426,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601 -/trunk/reactos/include/reactos/winsock/msafdlib.h:44354-45543 Propchange: trunk/reactos/include/reactos/winsock/mswinsock.h ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo (removed) @@ -1,2 +1,0 @@ -/branches/ros-amd64-bringup/reactos/include/reactos/winsock/mswinsock.h:34711-34712,34743,34780-34782,34812,34839,34842,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35683,35739,35746,35762,35771,35777,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36172,36360,36388-36389,36445,36502-36503,36505,36570,36614,36899,36930,36936,36992,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38148-38151,38264-38265,38268,38355,39151,39333,39345,39639,40122-40123,40125,40128,40155,40247,40324,40753,40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41082-41086,41097-41098,41101,41449,41479,41484-41485,41499,41531,41536,41540,41546-41547,41549,43080,43426,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601 -/trunk/reactos/include/reactos/winsock/mswinsock.h:44354-45543 Propchange: trunk/reactos/include/reactos/winsock/rnr20lib.h ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo (removed) @@ -1,2 +1,0 @@ -/branches/ros-amd64-bringup/reactos/include/reactos/winsock/rnr20lib.h:34711-34712,34743,34780-34782,34812,34839,34842,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35683,35739,35746,35762,35771,35777,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36172,36360,36388-36389,36445,36502-36503,36505,36570,36614,36899,36930,36936,36992,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38148-38151,38264-38265,38268,38355,39151,39333,39345,39639,40122-40123,40125,40128,40155,40247,40324,40753,40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41082-41086,41097-41098,41101,41449,41479,41484-41485,41499,41531,41536,41540,41546-41547,41549,43080,43426,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601 -/trunk/reactos/include/reactos/winsock/rnr20lib.h:44354-45543 Propchange: trunk/reactos/include/reactos/winsock/wsmobile.h ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo (removed) @@ -1,2 +1,0 @@ -/branches/ros-amd64-bringup/reactos/include/reactos/winsock/wsmobile.h:34711-34712,34743,34780-34782,34812,34839,34842,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35683,35739,35746,35762,35771,35777,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36172,36360,36388-36389,36445,36502-36503,36505,36570,36614,36899,36930,36936,36992,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38148-38151,38264-38265,38268,38355,39151,39333,39345,39639,40122-40123,40125,40128,40155,40247,40324,40753,40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41082-41086,41097-41098,41101,41449,41479,41484-41485,41499,41531,41536,41540,41546-41547,41549,43080,43426,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601 -/trunk/reactos/include/reactos/winsock/wsmobile.h:44354-45543

1 0

[jgardou] 48068: Sync with trunk 48067
by jgardou＠svn.reactos.org 15 Jul '10

15 Jul '10

Author: jgardou Date: Thu Jul 15 20:49:51 2010 New Revision: 48068 URL: http://svn.reactos.org/svn/reactos?rev=48068&view=rev Log: Sync with trunk 48067 Added: branches/reactos-yarotows/dll/3rdparty/libtiff/rosdiff.patch - copied unchanged from r48067, trunk/reactos/dll/3rdparty/libtiff/rosdiff.patch branches/reactos-yarotows/include/reactos/libs/libtiff/rosdiff.patch - copied unchanged from r48067, trunk/reactos/include/reactos/libs/libtiff/rosdiff.patch Modified: branches/reactos-yarotows/ (props changed) branches/reactos-yarotows/base/applications/network/ping/ping.c branches/reactos-yarotows/base/applications/regedit/childwnd.c branches/reactos-yarotows/base/applications/regedit/hexedit.c branches/reactos-yarotows/config.template.rbuild branches/reactos-yarotows/dll/3rdparty/libtiff/libtiff.rbuild branches/reactos-yarotows/dll/3rdparty/libtiff/tif_open.c branches/reactos-yarotows/dll/win32/setupapi/setupcab.c branches/reactos-yarotows/dll/win32/user32/windows/cursoricon.c branches/reactos-yarotows/include/psdk/shellapi.h branches/reactos-yarotows/include/psdk/wingdi.h branches/reactos-yarotows/include/psdk/ws2ipdef.h branches/reactos-yarotows/include/psdk/ws2tcpip.h branches/reactos-yarotows/include/reactos/libs/libtiff/tiffio.h branches/reactos-yarotows/include/reactos/winsock/msafd.h (props changed) branches/reactos-yarotows/include/reactos/winsock/msafdlib.h (props changed) branches/reactos-yarotows/include/reactos/winsock/mswinsock.h (props changed) branches/reactos-yarotows/include/reactos/winsock/rnr20lib.h (props changed) branches/reactos-yarotows/include/reactos/winsock/wsmobile.h (props changed) branches/reactos-yarotows/ntoskrnl/ex/rundown.c branches/reactos-yarotows/ntoskrnl/include/internal/amd64/ke.h branches/reactos-yarotows/ntoskrnl/include/internal/mm.h branches/reactos-yarotows/ntoskrnl/include/ntoskrnl.h branches/reactos-yarotows/ntoskrnl/io/iomgr/adapter.c branches/reactos-yarotows/ntoskrnl/kd64/kddata.c branches/reactos-yarotows/ntoskrnl/ke/clock.c branches/reactos-yarotows/ntoskrnl/mm/ARM3/miarm.h branches/reactos-yarotows/subsystems/win32/csrss/win32csr/ (props changed) branches/reactos-yarotows/subsystems/win32/win32k/objects/cliprgn.c Propchange: branches/reactos-yarotows/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jul 15 20:49:51 2010 @@ -1,4 +1,4 @@ /branches/header-work:45691-47721 /branches/ros-amd64-bringup:36852 /branches/ros-amd64-bringup/reactos:34711-34712,34741,34743,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36445,36502-36503,36505,36570,36614,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36992,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40927-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41484-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43857-43858,43860,43905-43907,43965,43969,43992,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,46394,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,47472,47846-47847,47878,47882 -/trunk/reactos:45219-48040 +/trunk/reactos:45219-48067 Modified: branches/reactos-yarotows/base/applications/network/ping/ping.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… ============================================================================== --- branches/reactos-yarotows/base/applications/network/ping/ping.c [iso-8859-1] (original) +++ branches/reactos-yarotows/base/applications/network/ping/ping.c [iso-8859-1] Thu Jul 15 20:49:51 2010 @@ -555,7 +555,6 @@ } if (Status == SOCKET_ERROR) { - LostCount++; if (WSAGetLastError() == WSAEHOSTUNREACH) printf("Destination host unreachable.\n"); else Modified: branches/reactos-yarotows/base/applications/regedit/childwnd.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… ============================================================================== --- branches/reactos-yarotows/base/applications/regedit/childwnd.c [iso-8859-1] (original) +++ branches/reactos-yarotows/base/applications/regedit/childwnd.c [iso-8859-1] Thu Jul 15 20:49:51 2010 @@ -297,17 +297,6 @@ break; } return CallWindowProc(oldwndproc, hwnd, uMsg, wParam, lParam); -} - -/* fix coords to top-left when SHIFT-F10 is pressed */ -void FixPointIfContext(POINTS *pt, HWND hWnd) -{ - if (pt->x == -1 && pt->y == -1) { - POINT p = { 0, 0 }; - ClientToScreen(hWnd, &p); - pt->x = (WORD)(p.x); - pt->y = (WORD)(p.y); - } } /******************************************************************************* @@ -577,16 +566,29 @@ case WM_CONTEXTMENU: { - POINTS pt; + POINT pt; if((HWND)wParam == pChildWnd->hListWnd) { int i, cnt; BOOL IsDefault; - pt.x = LOWORD(lParam); - pt.y = HIWORD(lParam); + pt.x = (short) LOWORD(lParam); + pt.y = (short) HIWORD(lParam); cnt = ListView_GetSelectedCount(pChildWnd->hListWnd); i = ListView_GetNextItem(pChildWnd->hListWnd, -1, LVNI_FOCUSED | LVNI_SELECTED); - FixPointIfContext(&pt, pChildWnd->hListWnd); + if (pt.x == -1 && pt.y == -1) + { + RECT rc; + if (i != -1) + { + rc.left = LVIR_BOUNDS; + SendMessage(pChildWnd->hListWnd, LVM_GETITEMRECT, i, (LPARAM) &rc); + pt.x = rc.left + 8; + pt.y = rc.top + 8; + } + else + pt.x = pt.y = 0; + } + ClientToScreen(pChildWnd->hListWnd, &pt); if(i == -1) { TrackPopupMenu(GetSubMenu(hPopupMenus, PM_NEW), TPM_RIGHTBUTTON, pt.x, pt.y, 0, hFrameWnd, NULL); @@ -620,14 +622,33 @@ int iLastPos; WORD wID; - pt.x = LOWORD(lParam); - pt.y = HIWORD(lParam); - hti.pt.x = pt.x; - hti.pt.y = pt.y; - ScreenToClient(pChildWnd->hTreeWnd, &hti.pt); - (void)TreeView_HitTest(pChildWnd->hTreeWnd, &hti); - - if ((hti.flags & TVHT_ONITEM) != 0 || (pt.x == -1 && pt.y == -1)) + pt.x = (short) LOWORD(lParam); + pt.y = (short) HIWORD(lParam); + + if (pt.x == -1 && pt.y == -1) + { + RECT rc; + hti.hItem = TreeView_GetSelection(pChildWnd->hTreeWnd); + if (hti.hItem != NULL) + { + TreeView_GetItemRect(pChildWnd->hTreeWnd, hti.hItem, &rc, TRUE); + pt.x = rc.left + 8; + pt.y = rc.top + 8; + ClientToScreen(pChildWnd->hTreeWnd, &pt); + hti.flags = TVHT_ONITEM; + } + else + hti.flags = 0; + } + else + { + hti.pt.x = pt.x; + hti.pt.y = pt.y; + ScreenToClient(pChildWnd->hTreeWnd, &hti.pt); + (void)TreeView_HitTest(pChildWnd->hTreeWnd, &hti); + } + + if (hti.flags & TVHT_ONITEM) { hContextMenu = GetSubMenu(hPopupMenus, PM_TREECONTEXT); (void)TreeView_SelectItem(pChildWnd->hTreeWnd, hti.hItem); @@ -688,7 +709,6 @@ s += _tcslen(s) + 1; } } - FixPointIfContext(&pt, pChildWnd->hTreeWnd); TrackPopupMenu(hContextMenu, TPM_RIGHTBUTTON, pt.x, pt.y, 0, pChildWnd->hWnd, NULL); } } Modified: branches/reactos-yarotows/base/applications/regedit/hexedit.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… ============================================================================== --- branches/reactos-yarotows/base/applications/regedit/hexedit.c [iso-8859-1] (original) +++ branches/reactos-yarotows/base/applications/regedit/hexedit.c [iso-8859-1] Thu Jul 15 20:49:51 2010 @@ -44,6 +44,10 @@ INT CaretCol; INT CaretLine; BOOL InMid; + + INT SelStart; + INT SelEnd; + BOOL SelOnField; } HEXEDIT_DATA, *PHEXEDIT_DATA; /* hit test codes */ @@ -181,13 +185,25 @@ HEXEDIT_PaintLines(PHEXEDIT_DATA hed, HDC hDC, DWORD ScrollPos, DWORD First, DWORD Last, RECT *rc) { DWORD dx, dy, linestart; - INT x; + INT i, isave, i0, i1, x; PBYTE buf, current, end, line; size_t bufsize; TCHAR hex[3], addr[17]; - RECT rct; + RECT rct, rct2; FillRect(hDC, rc, (HBRUSH)(COLOR_WINDOW + 1)); + SetTextColor(hDC, GetSysColor(COLOR_WINDOWTEXT)); + + if (hed->SelStart < hed->SelEnd) + { + i0 = hed->SelStart; + i1 = hed->SelEnd; + } + else + { + i0 = hed->SelEnd; + i1 = hed->SelStart; + } if(hed->hBuffer) { @@ -212,9 +228,11 @@ end = buf + bufsize; dy = First * hed->LineHeight; linestart = (ScrollPos + First) * hed->ColumnsPerLine; + i = linestart; current = buf + linestart; Last = min(hed->nLines - ScrollPos, Last); + SetBkMode(hDC, TRANSPARENT); while(First <= Last && current < end) { DWORD dh; @@ -236,25 +254,54 @@ /* draw hex map */ dx += (hed->CharWidth / 2); line = current; + isave = i; for(x = 0; x < hed->ColumnsPerLine && current < end; x++) { rct.left += dh; rct.right += dh; _stprintf(hex, _T("%02X"), *(current++)); - ExtTextOut(hDC, dx, dy, ETO_OPAQUE, &rct, hex, 2, NULL); + if (i0 <= i && i < i1) + { + rct2.left = dx; + rct2.top = dy; + rct2.right = dx + hed->CharWidth * 2 + 1; + rct2.bottom = dy + hed->LineHeight; + InflateRect(&rct2, hed->CharWidth / 2, 0); + FillRect(hDC, &rct2, (HBRUSH)(COLOR_HIGHLIGHT + 1)); + SetTextColor(hDC, GetSysColor(COLOR_HIGHLIGHTTEXT)); + ExtTextOut(hDC, dx, dy, 0, &rct, hex, 2, NULL); + SetTextColor(hDC, GetSysColor(COLOR_WINDOWTEXT)); + } + else + ExtTextOut(hDC, dx, dy, ETO_OPAQUE, &rct, hex, 2, NULL); dx += dh; + i++; } /* draw ascii map */ dx = ((4 + hed->AddressSpacing + hed->SplitSpacing + (hed->ColumnsPerLine * 3)) * hed->CharWidth); current = line; + i = isave; for(x = 0; x < hed->ColumnsPerLine && current < end; x++) { _stprintf(hex, _T("%C"), *(current++)); hex[0] = ((hex[0] & _T('\x007f')) >= _T(' ') ? hex[0] : _T('.')); - TextOut(hDC, dx, dy, hex, 1); + if (i0 <= i && i < i1) + { + rct2.left = dx; + rct2.top = dy; + rct2.right = dx + hed->CharWidth; + rct2.bottom = dy + hed->LineHeight; + FillRect(hDC, &rct2, (HBRUSH)(COLOR_HIGHLIGHT + 1)); + SetTextColor(hDC, GetSysColor(COLOR_HIGHLIGHTTEXT)); + TextOut(hDC, dx, dy, hex, 1); + SetTextColor(hDC, GetSysColor(COLOR_WINDOWTEXT)); + } + else + TextOut(hDC, dx, dy, hex, 1); dx += hed->CharWidth; + i++; } dy += hed->LineHeight; @@ -291,14 +338,14 @@ } pt.x -= d; - d = (3 * hed->ColumnsPerLine * hed->CharWidth); + d = ((3 * hed->ColumnsPerLine + 1) * hed->CharWidth); if(pt.x <= d) { return HEHT_HEXDUMP; } pt.x -= d; - d = (hed->SplitSpacing * hed->CharWidth); + d = ((hed->SplitSpacing - 1) * hed->CharWidth); if(pt.x <= d) { return HEHT_HEXDUMPSPACING; @@ -501,7 +548,6 @@ hed->AddressSpacing = 2; hed->SplitSpacing = 2; hed->EditingField = TRUE; /* in hexdump field */ - hed->InMid = FALSE; SetWindowLongPtr(hWnd, 0, (DWORD_PTR)hed); HEXEDIT_Update(hed); @@ -689,7 +735,7 @@ FillRect(ps.hdc, &rc, (HBRUSH)(COLOR_WINDOW + 1)); goto epaint; } - if(!(hbmp = CreateCompatibleBitmap(hTempDC, ps.rcPaint.right, ps.rcPaint.bottom))) + if(!(hbmp = CreateCompatibleBitmap(ps.hdc, ps.rcPaint.right, ps.rcPaint.bottom))) { FillRect(ps.hdc, &rc, (HBRUSH)(COLOR_WINDOW + 1)); DeleteDC(hTempDC); @@ -705,7 +751,7 @@ DeleteObject(hbmp); DeleteDC(hTempDC); - epaint: +epaint: EndPaint(hed->hWndSelf, &ps); } @@ -755,19 +801,75 @@ { BOOL NewField; POINT EditPos; - DWORD Hit = HEXEDIT_HitRegionTest(hed, Pt); + DWORD Hit; UNREFERENCED_PARAMETER(Buttons); SetFocus(hed->hWndSelf); - hed->Index = HEXEDIT_IndexFromPoint(hed, Pt, Hit, &EditPos, &NewField); - hed->EditingField = NewField; + if (GetAsyncKeyState(VK_SHIFT) < 0) + { + if (hed->SelOnField) + hed->Index = HEXEDIT_IndexFromPoint(hed, Pt, HEHT_HEXDUMP, &EditPos, &NewField); + else + hed->Index = HEXEDIT_IndexFromPoint(hed, Pt, HEHT_ASCIIDUMP, &EditPos, &NewField); + hed->SelEnd = hed->Index; + hed->EditingField = hed->SelOnField; + } + else + { + Hit = HEXEDIT_HitRegionTest(hed, Pt); + hed->Index = HEXEDIT_IndexFromPoint(hed, Pt, Hit, &EditPos, &NewField); + hed->SelStart = hed->SelEnd = hed->Index; + hed->SelOnField = hed->EditingField = NewField; + SetCapture(hed->hWndSelf); + } hed->CaretCol = EditPos.x; hed->CaretLine = EditPos.y; hed->InMid = FALSE; - + InvalidateRect(hed->hWndSelf, NULL, FALSE); HEXEDIT_MoveCaret(hed, TRUE); + return 0; +} + +static LRESULT +HEXEDIT_WM_LBUTTONUP(PHEXEDIT_DATA hed, INT Buttons, POINTS Pt) +{ + BOOL NewField; + POINT EditPos; + if (GetCapture() == hed->hWndSelf) + { + if (hed->SelOnField) + hed->Index = HEXEDIT_IndexFromPoint(hed, Pt, HEHT_HEXDUMP, &EditPos, &NewField); + else + hed->Index = HEXEDIT_IndexFromPoint(hed, Pt, HEHT_ASCIIDUMP, &EditPos, &NewField); + hed->CaretCol = EditPos.x; + hed->CaretLine = EditPos.y; + hed->SelEnd = hed->Index; + ReleaseCapture(); + InvalidateRect(hed->hWndSelf, NULL, FALSE); + HEXEDIT_MoveCaret(hed, TRUE); + } + return 0; +} + +static LRESULT +HEXEDIT_WM_MOUSEMOVE(PHEXEDIT_DATA hed, INT Buttons, POINTS Pt) +{ + BOOL NewField; + POINT EditPos; + if (GetCapture() == hed->hWndSelf) + { + if (hed->SelOnField) + hed->Index = HEXEDIT_IndexFromPoint(hed, Pt, HEHT_HEXDUMP, &EditPos, &NewField); + else + hed->Index = HEXEDIT_IndexFromPoint(hed, Pt, HEHT_ASCIIDUMP, &EditPos, &NewField); + hed->CaretCol = EditPos.x; + hed->CaretLine = EditPos.y; + hed->SelEnd = hed->Index; + InvalidateRect(hed->hWndSelf, NULL, FALSE); + HEXEDIT_MoveCaret(hed, TRUE); + } return 0; } @@ -776,6 +878,8 @@ { size_t bufsize; PBYTE buf; + INT i0, i1; + if(GetKeyState(VK_MENU) & 0x8000) { return FALSE; @@ -783,133 +887,215 @@ bufsize = (hed->hBuffer ? LocalSize(hed->hBuffer) : 0); + if (hed->SelStart < hed->SelEnd) + { + i0 = hed->SelStart; + i1 = hed->SelEnd; + } + else + { + i0 = hed->SelEnd; + i1 = hed->SelStart; + } + switch(VkCode) { case VK_DELETE: - if (hed->InMid && hed->EditingField) + if (hed->SelStart != hed->SelEnd) { buf = (PBYTE) LocalLock(hed->hBuffer); if (buf) { - MoveMemory(buf + hed->Index, buf + hed->Index + 1, - bufsize - hed->Index - 1); + MoveMemory(buf + i0, buf + i1, bufsize - i1); LocalUnlock(hed->hBuffer); + } + HexEdit_SetMaxBufferSize(hed->hWndSelf, bufsize - (i1 - i0)); + hed->InMid = FALSE; + hed->Index = hed->SelStart = hed->SelEnd = i0; + hed->CaretCol = hed->Index % hed->ColumnsPerLine; + hed->CaretLine = hed->Index / hed->ColumnsPerLine; + } + else + { + if (hed->InMid && hed->EditingField) + { + buf = (PBYTE) LocalLock(hed->hBuffer); + if (buf) + { + MoveMemory(buf + hed->Index, buf + hed->Index + 1, + bufsize - hed->Index - 1); + LocalUnlock(hed->hBuffer); + } + HexEdit_SetMaxBufferSize(hed->hWndSelf, bufsize - 1); + hed->InMid = FALSE; + } + else if (hed->Index < bufsize) + { + buf = (PBYTE) LocalLock(hed->hBuffer); + if (buf) + { + MoveMemory(buf + hed->Index, buf + hed->Index + 1, + bufsize - hed->Index - 1); + LocalUnlock(hed->hBuffer); + } + HexEdit_SetMaxBufferSize(hed->hWndSelf, bufsize - 1); + } + } + InvalidateRect(hed->hWndSelf, NULL, TRUE); + HEXEDIT_MoveCaret(hed, TRUE); + break; + + case VK_BACK: + if (hed->SelStart != hed->SelEnd) + { + buf = (PBYTE) LocalLock(hed->hBuffer); + if (buf) + { + MoveMemory(buf + i0, buf + i1, bufsize - i1); + LocalUnlock(hed->hBuffer); + } + HexEdit_SetMaxBufferSize(hed->hWndSelf, bufsize - (i1 - i0)); + hed->InMid = FALSE; + hed->Index = hed->SelStart = hed->SelEnd = i0; + hed->CaretCol = hed->Index % hed->ColumnsPerLine; + hed->CaretLine = hed->Index / hed->ColumnsPerLine; + } + else + { + if (hed->InMid && hed->EditingField) + { + buf = (PBYTE) LocalLock(hed->hBuffer); + if (buf) + { + MoveMemory(buf + hed->Index, buf + hed->Index + 1, + bufsize - hed->Index - 1); + LocalUnlock(hed->hBuffer); + } + } + else if (hed->Index > 0) + { + buf = (PBYTE) LocalLock(hed->hBuffer); + if (buf) + { + MoveMemory(buf + hed->Index - 1, buf + hed->Index, + bufsize - hed->Index); + LocalUnlock(hed->hBuffer); + } + hed->Index--; + hed->SelStart = hed->SelEnd = hed->Index; + hed->CaretCol = hed->Index % hed->ColumnsPerLine; + hed->CaretLine = hed->Index / hed->ColumnsPerLine; } HexEdit_SetMaxBufferSize(hed->hWndSelf, bufsize - 1); hed->InMid = FALSE; } - else if (hed->Index < bufsize) + InvalidateRect(hed->hWndSelf, NULL, TRUE); + HEXEDIT_MoveCaret(hed, TRUE); + break; + + case VK_LEFT: + if (hed->Index > 0) + { + hed->Index--; + if (GetAsyncKeyState(VK_SHIFT) < 0) + hed->SelEnd = hed->Index; + else + hed->SelStart = hed->SelEnd = hed->Index; + hed->CaretCol = hed->Index % hed->ColumnsPerLine; + hed->CaretLine = hed->Index / hed->ColumnsPerLine; + hed->InMid = FALSE; + InvalidateRect(hed->hWndSelf, NULL, TRUE); + HEXEDIT_MoveCaret(hed, TRUE); + } + break; + + case VK_RIGHT: + if (hed->Index < (INT)bufsize) + { + hed->Index++; + if (GetAsyncKeyState(VK_SHIFT) < 0) + hed->SelEnd = hed->Index; + else + hed->SelStart = hed->SelEnd = hed->Index; + hed->CaretCol = hed->Index % hed->ColumnsPerLine; + hed->CaretLine = hed->Index / hed->ColumnsPerLine; + hed->InMid = FALSE; + InvalidateRect(hed->hWndSelf, NULL, TRUE); + HEXEDIT_MoveCaret(hed, TRUE); + } + break; + + case VK_UP: + if (hed->Index >= hed->ColumnsPerLine) + { + hed->Index -= hed->ColumnsPerLine; + if (GetAsyncKeyState(VK_SHIFT) < 0) + hed->SelEnd = hed->Index; + else + hed->SelStart = hed->SelEnd = hed->Index; + hed->CaretCol = hed->Index % hed->ColumnsPerLine; + hed->CaretLine = hed->Index / hed->ColumnsPerLine; + hed->InMid = FALSE; + InvalidateRect(hed->hWndSelf, NULL, TRUE); + HEXEDIT_MoveCaret(hed, TRUE); + } + break; + + case VK_DOWN: + if (hed->Index + hed->ColumnsPerLine <= (INT) bufsize) + hed->Index += hed->ColumnsPerLine; + else + hed->Index = bufsize; + hed->CaretCol = hed->Index % hed->ColumnsPerLine; + hed->CaretLine = hed->Index / hed->ColumnsPerLine; + if (GetAsyncKeyState(VK_SHIFT) < 0) + hed->SelEnd = hed->Index; + else + hed->SelStart = hed->SelEnd = hed->Index; + hed->InMid = FALSE; + InvalidateRect(hed->hWndSelf, NULL, TRUE); + HEXEDIT_MoveCaret(hed, TRUE); + break; + } + + return FALSE; +} + +static BOOL +HEXEDIT_WM_CHAR(PHEXEDIT_DATA hed, WCHAR ch) +{ + size_t bufsize; + PBYTE buf; + INT i0, i1; + + bufsize = (hed->hBuffer ? LocalSize(hed->hBuffer) : 0); + if (hed->SelStart < hed->SelEnd) + { + i0 = hed->SelStart; + i1 = hed->SelEnd; + } + else + { + i0 = hed->SelEnd; + i1 = hed->SelStart; + } + if (!hed->EditingField) + { + if (0x20 <= ch && ch <= 0xFF) + { + if (hed->SelStart != hed->SelEnd) { buf = (PBYTE) LocalLock(hed->hBuffer); if (buf) { - MoveMemory(buf + hed->Index, buf + hed->Index + 1, - bufsize - hed->Index - 1); + MoveMemory(buf + i0, buf + i1, bufsize - i1); LocalUnlock(hed->hBuffer); } - HexEdit_SetMaxBufferSize(hed->hWndSelf, bufsize - 1); - } - InvalidateRect(hed->hWndSelf, NULL, TRUE); - HEXEDIT_MoveCaret(hed, TRUE); - break; - - case VK_BACK: - if (hed->InMid && hed->EditingField) - { - buf = (PBYTE) LocalLock(hed->hBuffer); - if (buf) - { - MoveMemory(buf + hed->Index, buf + hed->Index + 1, - bufsize - hed->Index - 1); - LocalUnlock(hed->hBuffer); - } - HexEdit_SetMaxBufferSize(hed->hWndSelf, bufsize - 1); + HexEdit_SetMaxBufferSize(hed->hWndSelf, bufsize - (i1 - i0)); hed->InMid = FALSE; - } - else if (hed->Index > 0) - { - buf = (PBYTE) LocalLock(hed->hBuffer); - if (buf) - { - MoveMemory(buf + hed->Index - 1, buf + hed->Index, - bufsize - hed->Index); - LocalUnlock(hed->hBuffer); - } - HexEdit_SetMaxBufferSize(hed->hWndSelf, bufsize - 1); - hed->Index--; - hed->CaretCol = hed->Index % hed->ColumnsPerLine; - hed->CaretLine = hed->Index / hed->ColumnsPerLine; - hed->InMid = FALSE; - } - InvalidateRect(hed->hWndSelf, NULL, TRUE); - HEXEDIT_MoveCaret(hed, TRUE); - break; - - case VK_LEFT: - if (hed->Index > 0) - { - hed->Index--; - hed->CaretCol = hed->Index % hed->ColumnsPerLine; - hed->CaretLine = hed->Index / hed->ColumnsPerLine; - hed->InMid = FALSE; - HEXEDIT_MoveCaret(hed, TRUE); - } - break; - - case VK_RIGHT: - if (hed->Index < (INT)bufsize) - { - hed->Index++; - hed->CaretCol = hed->Index % hed->ColumnsPerLine; - hed->CaretLine = hed->Index / hed->ColumnsPerLine; - hed->InMid = FALSE; - HEXEDIT_MoveCaret(hed, TRUE); - } - break; - - case VK_UP: - if (hed->Index >= hed->ColumnsPerLine) - { - hed->Index -= hed->ColumnsPerLine; - hed->CaretCol = hed->Index % hed->ColumnsPerLine; - hed->CaretLine = hed->Index / hed->ColumnsPerLine; - hed->InMid = FALSE; - HEXEDIT_MoveCaret(hed, TRUE); - } - break; - - case VK_DOWN: - if (hed->Index + hed->ColumnsPerLine <= (INT) bufsize) - { - hed->Index += hed->ColumnsPerLine; - hed->CaretCol = hed->Index % hed->ColumnsPerLine; - hed->CaretLine = hed->Index / hed->ColumnsPerLine; - } - else - { - hed->Index = bufsize; - hed->CaretCol = hed->Index % hed->ColumnsPerLine; - hed->CaretLine = hed->Index / hed->ColumnsPerLine; - } - hed->InMid = FALSE; - HEXEDIT_MoveCaret(hed, TRUE); - break; - } - - return FALSE; -} - -static BOOL -HEXEDIT_WM_CHAR(PHEXEDIT_DATA hed, WCHAR ch) -{ - size_t bufsize; - PBYTE buf; - - bufsize = (hed->hBuffer ? LocalSize(hed->hBuffer) : 0); - if (!hed->EditingField) - { - if (0x20 <= ch && ch < 0x7F) - { + bufsize = (hed->hBuffer ? LocalSize(hed->hBuffer) : 0); + hed->Index = hed->SelStart = hed->SelEnd = i0; + } HexEdit_SetMaxBufferSize(hed->hWndSelf, bufsize + 1); buf = (PBYTE) LocalLock(hed->hBuffer); if (buf) @@ -932,6 +1118,19 @@ if (('0' <= ch && ch <= '9') || ('A' <= ch && ch <= 'F') || ('a' <= ch && ch <= 'f')) { + if (hed->SelStart != hed->SelEnd) + { + buf = (PBYTE) LocalLock(hed->hBuffer); + if (buf) + { + MoveMemory(buf + i0, buf + i1, bufsize - i1); + LocalUnlock(hed->hBuffer); + } + HexEdit_SetMaxBufferSize(hed->hWndSelf, bufsize - (i1 - i0)); + hed->InMid = FALSE; + bufsize = (hed->hBuffer ? LocalSize(hed->hBuffer) : 0); + hed->Index = hed->SelStart = hed->SelEnd = i0; + } if (hed->InMid) { buf = (PBYTE) LocalLock(hed->hBuffer); @@ -947,10 +1146,6 @@ } hed->InMid = FALSE; hed->Index++; - hed->CaretCol = hed->Index % hed->ColumnsPerLine; - hed->CaretLine = hed->Index / hed->ColumnsPerLine; - InvalidateRect(hed->hWndSelf, NULL, TRUE); - HEXEDIT_MoveCaret(hed, TRUE); } else { @@ -969,11 +1164,11 @@ LocalUnlock(hed->hBuffer); } hed->InMid = TRUE; - hed->CaretCol = hed->Index % hed->ColumnsPerLine; - hed->CaretLine = hed->Index / hed->ColumnsPerLine; - InvalidateRect(hed->hWndSelf, NULL, TRUE); - HEXEDIT_MoveCaret(hed, TRUE); - } + } + hed->CaretCol = hed->Index % hed->ColumnsPerLine; + hed->CaretLine = hed->Index / hed->ColumnsPerLine; + InvalidateRect(hed->hWndSelf, NULL, TRUE); + HEXEDIT_MoveCaret(hed, TRUE); return FALSE; } } @@ -1024,6 +1219,20 @@ return HEXEDIT_WM_LBUTTONDOWN(hed, (INT)wParam, p); } + case WM_LBUTTONUP: + { + p.x = LOWORD(lParam); + p.y = HIWORD(lParam); + return HEXEDIT_WM_LBUTTONUP(hed, (INT)wParam, p); + } + + case WM_MOUSEMOVE: + { + p.x = LOWORD(lParam); + p.y = HIWORD(lParam); + return HEXEDIT_WM_MOUSEMOVE(hed, (INT)wParam, p); + } + case WM_MOUSEWHEEL: { UINT nScrollLines = 3; @@ -1080,8 +1289,16 @@ return HEXEDIT_WM_NCDESTROY(hed); } break; - } - - return CallWindowProc(DefWindowProc, hWnd, uMsg, wParam, lParam); -} - + + case WM_CONTEXTMENU: + /* FIXME: Implement Cut, Copy, Paste, Delete and Select All */ + break; + + case WM_COMMAND: + /* FIXME: Implement Cut, Copy, Paste, Delete and Select All */ + break; + } + + return DefWindowProc(hWnd, uMsg, wParam, lParam); +} + Modified: branches/reactos-yarotows/config.template.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/config.templat… ============================================================================== --- branches/reactos-yarotows/config.template.rbuild [iso-8859-1] (original) +++ branches/reactos-yarotows/config.template.rbuild [iso-8859-1] Thu Jul 15 20:49:51 2010 @@ -49,7 +49,7 @@ 4 = -O2 5 = -O3 --> -<property name="OPTIMIZE" value="1" /> +<property name="OPTIMIZE" value="0" /> <!-- Modified: branches/reactos-yarotows/dll/3rdparty/libtiff/libtiff.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/3rdparty/l… ============================================================================== --- branches/reactos-yarotows/dll/3rdparty/libtiff/libtiff.rbuild [iso-8859-1] (original) +++ branches/reactos-yarotows/dll/3rdparty/libtiff/libtiff.rbuild [iso-8859-1] Thu Jul 15 20:49:51 2010 @@ -3,8 +3,9 @@ <module name="libtiff" type="win32dll" entrypoint="0" installbase="system32" installname="libtiff.dll" allowwarnings="true" crt="msvcrt"> <define name="WIN32" /> <define name="NDEBUG" /> - <define name="_WINDOWS" /> - <define name="_USRDLL" /> + <define name="BUILD_LIBTIFF_DLL" /> + <define name="DLL_EXPORT" /> + <define name="USE_WIN32_FILEIO" /> <include base="libtiff">.</include> <include base="ReactOS">include/reactos/libs/zlib</include> <include base="ReactOS">include/reactos/libs/libtiff</include> Modified: branches/reactos-yarotows/dll/3rdparty/libtiff/tif_open.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/3rdparty/l… ============================================================================== --- branches/reactos-yarotows/dll/3rdparty/libtiff/tif_open.c [iso-8859-1] (original) +++ branches/reactos-yarotows/dll/3rdparty/libtiff/tif_open.c [iso-8859-1] Thu Jul 15 20:49:51 2010 @@ -516,6 +516,9 @@ TIFFSetClientdata(TIFF* tif, thandle_t newvalue) { thandle_t m = tif->tif_clientdata; +#ifdef USE_WIN32_FILEIO + newvalue = (thandle_t) _get_osfhandle(newvalue); +#endif /* USE_WIN32_FILEIO */ tif->tif_clientdata = newvalue; return m; } Modified: branches/reactos-yarotows/dll/win32/setupapi/setupcab.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/setu… ============================================================================== --- branches/reactos-yarotows/dll/win32/setupapi/setupcab.c [iso-8859-1] (original) +++ branches/reactos-yarotows/dll/win32/setupapi/setupcab.c [iso-8859-1] Thu Jul 15 20:49:51 2010 @@ -518,7 +518,7 @@ SC_HSC_A my_hsc; ERF erf; - CHAR pszCabinet[MAX_PATH], pszCabPath[MAX_PATH], *p; + CHAR pszCabinet[MAX_PATH], pszCabPath[MAX_PATH], *p = NULL; DWORD fpnsize; BOOL ret; @@ -528,6 +528,12 @@ if (! LoadCABINETDll()) return FALSE; + + if (!CabinetFile) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } memset(&my_hsc, 0, sizeof(SC_HSC_A)); pszCabinet[0] = '\0'; @@ -584,7 +590,7 @@ UINT len; SC_HSC_W my_hsc; ERF erf; - WCHAR pszCabPathW[MAX_PATH], *p; + WCHAR pszCabPathW[MAX_PATH], *p = NULL; DWORD fpnsize; BOOL ret; @@ -594,7 +600,11 @@ if (!LoadCABINETDll()) return FALSE; - if (!CabinetFile) return FALSE; + if (!CabinetFile) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } memset(&my_hsc, 0, sizeof(SC_HSC_W)); Modified: branches/reactos-yarotows/dll/win32/user32/windows/cursoricon.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/user… ============================================================================== --- branches/reactos-yarotows/dll/win32/user32/windows/cursoricon.c [iso-8859-1] (original) +++ branches/reactos-yarotows/dll/win32/user32/windows/cursoricon.c [iso-8859-1] Thu Jul 15 20:49:51 2010 @@ -485,8 +485,8 @@ else { if (!(*mask = CreateBitmap( width, height, 1, 1, NULL ))) goto done; - if (!(*color = CreateBitmap( width, height, GetDeviceCaps( screen_dc, PLANES ), - GetDeviceCaps( screen_dc, BITSPIXEL ), NULL ))) + if (!(*color = CreateBitmap( width, height, bmi->bmiHeader.biPlanes, + bmi->bmiHeader.biBitCount, NULL ))) { DeleteObject( *mask ); goto done; @@ -1475,10 +1475,29 @@ height = bmpXor.bmHeight; if (bmpXor.bmPlanes * bmpXor.bmBitsPixel != 1) { - color = CreateCompatibleBitmap( screen_dc, width, height ); + color = CreateBitmap( width, height, bmpXor.bmPlanes, bmpXor.bmBitsPixel, NULL ); + if(!color) + { + ERR("Unable to create color bitmap!\n"); + return NULL; + } mask = CreateBitmap( width, height, 1, 1, NULL ); - } - else mask = CreateBitmap( width, height * 2, 1, 1, NULL ); + if(!mask) + { + ERR("Unable to create mask bitmap!\n"); + DeleteObject(color); + return NULL; + } + } + else + { + mask = CreateBitmap( width, height * 2, 1, 1, NULL ); + if(!mask) + { + ERR("Unable to create mask bitmap!\n"); + return NULL; + } + } } else { Modified: branches/reactos-yarotows/include/psdk/shellapi.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/psdk/s… ============================================================================== --- branches/reactos-yarotows/include/psdk/shellapi.h [iso-8859-1] (original) +++ branches/reactos-yarotows/include/psdk/shellapi.h [iso-8859-1] Thu Jul 15 20:49:51 2010 @@ -8,6 +8,11 @@ #pragma warning(push) #pragma warning(disable:4201) #endif + +#if !defined(_WIN64) +#include <pshpack1.h> +#endif + #define WINSHELLAPI DECLSPEC_IMPORT #define ABE_LEFT 0 #define ABE_TOP 1 @@ -160,7 +165,7 @@ typedef WORD FILEOP_FLAGS; typedef WORD PRINTEROP_FLAGS; -#include <pshpack1.h> + typedef struct _AppBarData { DWORD cbSize; HWND hWnd; @@ -330,7 +335,6 @@ int cchOldPath; int cchNewPath; } SHNAMEMAPPINGW, *LPSHNAMEMAPPINGW; -#include <poppack.h> #define SHERB_NOCONFIRMATION 0x1 #define SHERB_NOPROGRESSUI 0x2 @@ -440,6 +444,11 @@ #define SHEmptyRecycleBin SHEmptyRecycleBinA #define SHGetNewLinkInfo SHGetNewLinkInfoA #endif + +#if !defined(_WIN64) +#include <poppack.h> +#endif + #ifdef _MSC_VER #pragma warning(pop) #endif Modified: branches/reactos-yarotows/include/psdk/wingdi.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/psdk/w… ============================================================================== --- branches/reactos-yarotows/include/psdk/wingdi.h [iso-8859-1] (original) +++ branches/reactos-yarotows/include/psdk/wingdi.h [iso-8859-1] Thu Jul 15 20:49:51 2010 @@ -1715,7 +1715,7 @@ typedef struct tagEMRCREATEBRUSHINDIRECT { EMR emr; DWORD ihBrush; - LOGBRUSH lb; + LOGBRUSH32 lb; } EMRCREATEBRUSHINDIRECT,*PEMRCREATEBRUSHINDIRECT; typedef LONG LCSCSTYPE; typedef LONG LCSGAMUTMATCH; @@ -1897,11 +1897,11 @@ EXTLOGFONTW elfw; } EMREXTCREATEFONTINDIRECTW,*PEMREXTCREATEFONTINDIRECTW; typedef struct tagEXTLOGPEN { - UINT elpPenStyle; - UINT elpWidth; + DWORD elpPenStyle; + DWORD elpWidth; UINT elpBrushStyle; COLORREF elpColor; - LONG elpHatch; + ULONG_PTR elpHatch; DWORD elpNumEntries; DWORD elpStyleEntry[1]; } EXTLOGPEN,*PEXTLOGPEN,*LPEXTLOGPEN,*NPEXTLOGPEN; Modified: branches/reactos-yarotows/include/psdk/ws2ipdef.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/psdk/w… ============================================================================== --- branches/reactos-yarotows/include/psdk/ws2ipdef.h [iso-8859-1] (original) +++ branches/reactos-yarotows/include/psdk/ws2ipdef.h [iso-8859-1] Thu Jul 15 20:49:51 2010 @@ -13,7 +13,7 @@ #ifdef _MSC_VER #define WS2TCPIP_INLINE __inline #else -#define WS2TCPIP_INLINE extern inline +#define WS2TCPIP_INLINE static inline #endif #include <in6addr.h> Modified: branches/reactos-yarotows/include/psdk/ws2tcpip.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/psdk/w… ============================================================================== --- branches/reactos-yarotows/include/psdk/ws2tcpip.h [iso-8859-1] (original) +++ branches/reactos-yarotows/include/psdk/ws2tcpip.h [iso-8859-1] Thu Jul 15 20:49:51 2010 @@ -24,7 +24,7 @@ #ifdef _MSC_VER #define WS2TCPIP_INLINE __inline #else -#define WS2TCPIP_INLINE extern inline +#define WS2TCPIP_INLINE static inline #endif /* getaddrinfo error codes */ Modified: branches/reactos-yarotows/include/reactos/libs/libtiff/tiffio.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/reacto… ============================================================================== --- branches/reactos-yarotows/include/reactos/libs/libtiff/tiffio.h [iso-8859-1] (original) +++ branches/reactos-yarotows/include/reactos/libs/libtiff/tiffio.h [iso-8859-1] Thu Jul 15 20:49:51 2010 @@ -27,6 +27,30 @@ #ifndef _TIFFIO_ #define _TIFFIO_ +#ifndef __GNUC__ +# define __DLL_IMPORT__ __declspec(dllimport) +# define __DLL_EXPORT__ __declspec(dllexport) +#else +# define __DLL_IMPORT__ __attribute__((dllimport)) extern +# define __DLL_EXPORT__ __attribute__((dllexport)) extern +#endif + +#if (defined __WIN32__) || (defined _WIN32) +# ifdef BUILD_LIBTIFF_DLL +# define LIBTIFF_DLL_IMPEXP __DLL_EXPORT__ +# elif defined(LIBTIFF_STATIC) +# define LIBTIFF_DLL_IMPEXP +# elif defined (USE_LIBTIFF_DLL) +# define LIBTIFF_DLL_IMPEXP __DLL_IMPORT__ +# elif defined (USE_LIBTIFF_STATIC) +# define LIBTIFF_DLL_IMPEXP +# else /* assume USE_LIBTIFF_DLL */ +# define LIBTIFF_DLL_IMPEXP __DLL_IMPORT__ +# endif +#else /* __WIN32__ */ +# define LIBTIFF_DLL_IMPEXP +#endif + /* * TIFF I/O Library Definitions. */ @@ -80,10 +104,20 @@ */ #if defined(_WINDOWS) || defined(__WIN32__) || defined(_Windows) +# define BINMODE "b" # if !defined(__CYGWIN) && !defined(AVOID_WIN32_FILEIO) && !defined(USE_WIN32_FILEIO) # define AVOID_WIN32_FILEIO # endif -#endif +# include <fcntl.h> +# include <io.h> +# ifdef SET_BINARY +# undef SET_BINARY +# endif /* SET_BINARY */ +# define SET_BINARY(f) do {if (!_isatty(f)) _setmode(f,_O_BINARY);} while (0) +#else /* Windows */ +# define BINMODE +# define SET_BINARY(f) (void)0 +#endif /* Windows */ #if defined(USE_WIN32_FILEIO) # define VC_EXTRALEAN @@ -268,30 +302,30 @@ typedef void (*TIFFUnmapFileProc)(thandle_t, tdata_t, toff_t); typedef void (*TIFFExtendProc)(TIFF*); -extern const char* TIFFGetVersion(void); - -extern const TIFFCodec* TIFFFindCODEC(uint16); -extern TIFFCodec* TIFFRegisterCODEC(uint16, const char*, TIFFInitMethod); -extern void TIFFUnRegisterCODEC(TIFFCodec*); -extern int TIFFIsCODECConfigured(uint16); -extern TIFFCodec* TIFFGetConfiguredCODECs(void); +LIBTIFF_DLL_IMPEXP const char* TIFFGetVersion(void); + +LIBTIFF_DLL_IMPEXP const TIFFCodec* TIFFFindCODEC(uint16); +LIBTIFF_DLL_IMPEXP TIFFCodec* TIFFRegisterCODEC(uint16, const char*, TIFFInitMethod); +LIBTIFF_DLL_IMPEXP void TIFFUnRegisterCODEC(TIFFCodec*); +LIBTIFF_DLL_IMPEXP int TIFFIsCODECConfigured(uint16); +LIBTIFF_DLL_IMPEXP TIFFCodec* TIFFGetConfiguredCODECs(void); /* * Auxiliary functions. */ -extern tdata_t _TIFFmalloc(tsize_t); -extern tdata_t _TIFFrealloc(tdata_t, tsize_t); -extern void _TIFFmemset(tdata_t, int, tsize_t); -extern void _TIFFmemcpy(tdata_t, const tdata_t, tsize_t); -extern int _TIFFmemcmp(const tdata_t, const tdata_t, tsize_t); -extern void _TIFFfree(tdata_t); +LIBTIFF_DLL_IMPEXP tdata_t _TIFFmalloc(tsize_t); +LIBTIFF_DLL_IMPEXP tdata_t _TIFFrealloc(tdata_t, tsize_t); +LIBTIFF_DLL_IMPEXP void _TIFFmemset(tdata_t, int, tsize_t); +LIBTIFF_DLL_IMPEXP void _TIFFmemcpy(tdata_t, const tdata_t, tsize_t); +LIBTIFF_DLL_IMPEXP int _TIFFmemcmp(const tdata_t, const tdata_t, tsize_t); +LIBTIFF_DLL_IMPEXP void _TIFFfree(tdata_t); /* ** Stuff, related to tag handling and creating custom tags. */ -extern int TIFFGetTagListCount( TIFF * ); -extern ttag_t TIFFGetTagListEntry( TIFF *, int tag_index ); +LIBTIFF_DLL_IMPEXP int TIFFGetTagListCount( TIFF * ); +LIBTIFF_DLL_IMPEXP ttag_t TIFFGetTagListEntry( TIFF *, int tag_index ); #define TIFF_ANY TIFF_NOTYPE /* for field descriptor searching */ #define TIFF_VARIABLE -1 /* marker for variable length tags */ @@ -317,12 +351,12 @@ void *value; } TIFFTagValue; -extern void TIFFMergeFieldInfo(TIFF*, const TIFFFieldInfo[], int); -extern const TIFFFieldInfo* TIFFFindFieldInfo(TIFF*, ttag_t, TIFFDataType); -extern const TIFFFieldInfo* TIFFFindFieldInfoByName(TIFF* , const char *, +LIBTIFF_DLL_IMPEXP void TIFFMergeFieldInfo(TIFF*, const TIFFFieldInfo[], int); +LIBTIFF_DLL_IMPEXP const TIFFFieldInfo* TIFFFindFieldInfo(TIFF*, ttag_t, TIFFDataType); +LIBTIFF_DLL_IMPEXP const TIFFFieldInfo* TIFFFindFieldInfoByName(TIFF* , const char *, TIFFDataType); -extern const TIFFFieldInfo* TIFFFieldWithTag(TIFF*, ttag_t); -extern const TIFFFieldInfo* TIFFFieldWithName(TIFF*, const char *); +LIBTIFF_DLL_IMPEXP const TIFFFieldInfo* TIFFFieldWithTag(TIFF*, ttag_t); +LIBTIFF_DLL_IMPEXP const TIFFFieldInfo* TIFFFieldWithName(TIFF*, const char *); typedef int (*TIFFVSetMethod)(TIFF*, ttag_t, va_list); typedef int (*TIFFVGetMethod)(TIFF*, ttag_t, va_list); @@ -334,180 +368,180 @@ TIFFPrintMethod printdir; /* directory print routine */ } TIFFTagMethods; -extern TIFFTagMethods *TIFFAccessTagMethods( TIFF * ); -extern void *TIFFGetClientInfo( TIFF *, const char * ); -extern void TIFFSetClientInfo( TIFF *, void *, const char * ); - -extern void TIFFCleanup(TIFF*); -extern void TIFFClose(TIFF*); -extern int TIFFFlush(TIFF*); -extern int TIFFFlushData(TIFF*); -extern int TIFFGetField(TIFF*, ttag_t, ...); -extern int TIFFVGetField(TIFF*, ttag_t, va_list); -extern int TIFFGetFieldDefaulted(TIFF*, ttag_t, ...); -extern int TIFFVGetFieldDefaulted(TIFF*, ttag_t, va_list); -extern int TIFFReadDirectory(TIFF*); -extern int TIFFReadCustomDirectory(TIFF*, toff_t, const TIFFFieldInfo[], +LIBTIFF_DLL_IMPEXP TIFFTagMethods *TIFFAccessTagMethods( TIFF * ); +LIBTIFF_DLL_IMPEXP void *TIFFGetClientInfo( TIFF *, const char * ); +LIBTIFF_DLL_IMPEXP void TIFFSetClientInfo( TIFF *, void *, const char * ); + +LIBTIFF_DLL_IMPEXP void TIFFCleanup(TIFF*); +LIBTIFF_DLL_IMPEXP void TIFFClose(TIFF*); +LIBTIFF_DLL_IMPEXP int TIFFFlush(TIFF*); +LIBTIFF_DLL_IMPEXP int TIFFFlushData(TIFF*); +LIBTIFF_DLL_IMPEXP int TIFFGetField(TIFF*, ttag_t, ...); +LIBTIFF_DLL_IMPEXP int TIFFVGetField(TIFF*, ttag_t, va_list); +LIBTIFF_DLL_IMPEXP int TIFFGetFieldDefaulted(TIFF*, ttag_t, ...); +LIBTIFF_DLL_IMPEXP int TIFFVGetFieldDefaulted(TIFF*, ttag_t, va_list); +LIBTIFF_DLL_IMPEXP int TIFFReadDirectory(TIFF*); +LIBTIFF_DLL_IMPEXP int TIFFReadCustomDirectory(TIFF*, toff_t, const TIFFFieldInfo[], size_t); -extern int TIFFReadEXIFDirectory(TIFF*, toff_t); -extern tsize_t TIFFScanlineSize(TIFF*); -extern tsize_t TIFFOldScanlineSize(TIFF*); -extern tsize_t TIFFNewScanlineSize(TIFF*); -extern tsize_t TIFFRasterScanlineSize(TIFF*); -extern tsize_t TIFFStripSize(TIFF*); -extern tsize_t TIFFRawStripSize(TIFF*, tstrip_t); -extern tsize_t TIFFVStripSize(TIFF*, uint32); -extern tsize_t TIFFTileRowSize(TIFF*); -extern tsize_t TIFFTileSize(TIFF*); -extern tsize_t TIFFVTileSize(TIFF*, uint32); -extern uint32 TIFFDefaultStripSize(TIFF*, uint32); -extern void TIFFDefaultTileSize(TIFF*, uint32*, uint32*); -extern int TIFFFileno(TIFF*); -extern int TIFFSetFileno(TIFF*, int); -extern thandle_t TIFFClientdata(TIFF*); -extern thandle_t TIFFSetClientdata(TIFF*, thandle_t); -extern int TIFFGetMode(TIFF*); -extern int TIFFSetMode(TIFF*, int); -extern int TIFFIsTiled(TIFF*); -extern int TIFFIsByteSwapped(TIFF*); -extern int TIFFIsUpSampled(TIFF*); -extern int TIFFIsMSB2LSB(TIFF*); -extern int TIFFIsBigEndian(TIFF*); -extern TIFFReadWriteProc TIFFGetReadProc(TIFF*); -extern TIFFReadWriteProc TIFFGetWriteProc(TIFF*); -extern TIFFSeekProc TIFFGetSeekProc(TIFF*); -extern TIFFCloseProc TIFFGetCloseProc(TIFF*); -extern TIFFSizeProc TIFFGetSizeProc(TIFF*); -extern TIFFMapFileProc TIFFGetMapFileProc(TIFF*); -extern TIFFUnmapFileProc TIFFGetUnmapFileProc(TIFF*); -extern uint32 TIFFCurrentRow(TIFF*); -extern tdir_t TIFFCurrentDirectory(TIFF*); -extern tdir_t TIFFNumberOfDirectories(TIFF*); -extern uint32 TIFFCurrentDirOffset(TIFF*); -extern tstrip_t TIFFCurrentStrip(TIFF*); -extern ttile_t TIFFCurrentTile(TIFF*); -extern int TIFFReadBufferSetup(TIFF*, tdata_t, tsize_t); -extern int TIFFWriteBufferSetup(TIFF*, tdata_t, tsize_t); -extern int TIFFSetupStrips(TIFF *); -extern int TIFFWriteCheck(TIFF*, int, const char *); -extern void TIFFFreeDirectory(TIFF*); -extern int TIFFCreateDirectory(TIFF*); -extern int TIFFLastDirectory(TIFF*); -extern int TIFFSetDirectory(TIFF*, tdir_t); -extern int TIFFSetSubDirectory(TIFF*, uint32); -extern int TIFFUnlinkDirectory(TIFF*, tdir_t); -extern int TIFFSetField(TIFF*, ttag_t, ...); -extern int TIFFVSetField(TIFF*, ttag_t, va_list); -extern int TIFFWriteDirectory(TIFF *); -extern int TIFFCheckpointDirectory(TIFF *); -extern int TIFFRewriteDirectory(TIFF *); -extern int TIFFReassignTagToIgnore(enum TIFFIgnoreSense, int); +LIBTIFF_DLL_IMPEXP int TIFFReadEXIFDirectory(TIFF*, toff_t); +LIBTIFF_DLL_IMPEXP tsize_t TIFFScanlineSize(TIFF*); +LIBTIFF_DLL_IMPEXP tsize_t TIFFOldScanlineSize(TIFF*); +LIBTIFF_DLL_IMPEXP tsize_t TIFFNewScanlineSize(TIFF*); +LIBTIFF_DLL_IMPEXP tsize_t TIFFRasterScanlineSize(TIFF*); +LIBTIFF_DLL_IMPEXP tsize_t TIFFStripSize(TIFF*); +LIBTIFF_DLL_IMPEXP tsize_t TIFFRawStripSize(TIFF*, tstrip_t); +LIBTIFF_DLL_IMPEXP tsize_t TIFFVStripSize(TIFF*, uint32); +LIBTIFF_DLL_IMPEXP tsize_t TIFFTileRowSize(TIFF*); +LIBTIFF_DLL_IMPEXP tsize_t TIFFTileSize(TIFF*); +LIBTIFF_DLL_IMPEXP tsize_t TIFFVTileSize(TIFF*, uint32); +LIBTIFF_DLL_IMPEXP uint32 TIFFDefaultStripSize(TIFF*, uint32); +LIBTIFF_DLL_IMPEXP void TIFFDefaultTileSize(TIFF*, uint32*, uint32*); +LIBTIFF_DLL_IMPEXP int TIFFFileno(TIFF*); +LIBTIFF_DLL_IMPEXP int TIFFSetFileno(TIFF*, int); +LIBTIFF_DLL_IMPEXP thandle_t TIFFClientdata(TIFF*); +LIBTIFF_DLL_IMPEXP thandle_t TIFFSetClientdata(TIFF*, thandle_t); +LIBTIFF_DLL_IMPEXP int TIFFGetMode(TIFF*); +LIBTIFF_DLL_IMPEXP int TIFFSetMode(TIFF*, int); +LIBTIFF_DLL_IMPEXP int TIFFIsTiled(TIFF*); +LIBTIFF_DLL_IMPEXP int TIFFIsByteSwapped(TIFF*); +LIBTIFF_DLL_IMPEXP int TIFFIsUpSampled(TIFF*); +LIBTIFF_DLL_IMPEXP int TIFFIsMSB2LSB(TIFF*); +LIBTIFF_DLL_IMPEXP int TIFFIsBigEndian(TIFF*); +LIBTIFF_DLL_IMPEXP TIFFReadWriteProc TIFFGetReadProc(TIFF*); +LIBTIFF_DLL_IMPEXP TIFFReadWriteProc TIFFGetWriteProc(TIFF*); +LIBTIFF_DLL_IMPEXP TIFFSeekProc TIFFGetSeekProc(TIFF*); +LIBTIFF_DLL_IMPEXP TIFFCloseProc TIFFGetCloseProc(TIFF*); +LIBTIFF_DLL_IMPEXP TIFFSizeProc TIFFGetSizeProc(TIFF*); +LIBTIFF_DLL_IMPEXP TIFFMapFileProc TIFFGetMapFileProc(TIFF*); +LIBTIFF_DLL_IMPEXP TIFFUnmapFileProc TIFFGetUnmapFileProc(TIFF*); +LIBTIFF_DLL_IMPEXP uint32 TIFFCurrentRow(TIFF*); +LIBTIFF_DLL_IMPEXP tdir_t TIFFCurrentDirectory(TIFF*); +LIBTIFF_DLL_IMPEXP tdir_t TIFFNumberOfDirectories(TIFF*); +LIBTIFF_DLL_IMPEXP uint32 TIFFCurrentDirOffset(TIFF*); +LIBTIFF_DLL_IMPEXP tstrip_t TIFFCurrentStrip(TIFF*); +LIBTIFF_DLL_IMPEXP ttile_t TIFFCurrentTile(TIFF*); +LIBTIFF_DLL_IMPEXP int TIFFReadBufferSetup(TIFF*, tdata_t, tsize_t); +LIBTIFF_DLL_IMPEXP int TIFFWriteBufferSetup(TIFF*, tdata_t, tsize_t); +LIBTIFF_DLL_IMPEXP int TIFFSetupStrips(TIFF *); +LIBTIFF_DLL_IMPEXP int TIFFWriteCheck(TIFF*, int, const char *); +LIBTIFF_DLL_IMPEXP void TIFFFreeDirectory(TIFF*); +LIBTIFF_DLL_IMPEXP int TIFFCreateDirectory(TIFF*); +LIBTIFF_DLL_IMPEXP int TIFFLastDirectory(TIFF*); +LIBTIFF_DLL_IMPEXP int TIFFSetDirectory(TIFF*, tdir_t); +LIBTIFF_DLL_IMPEXP int TIFFSetSubDirectory(TIFF*, uint32); +LIBTIFF_DLL_IMPEXP int TIFFUnlinkDirectory(TIFF*, tdir_t); +LIBTIFF_DLL_IMPEXP int TIFFSetField(TIFF*, ttag_t, ...); +LIBTIFF_DLL_IMPEXP int TIFFVSetField(TIFF*, ttag_t, va_list); +LIBTIFF_DLL_IMPEXP int TIFFWriteDirectory(TIFF *); +LIBTIFF_DLL_IMPEXP int TIFFCheckpointDirectory(TIFF *); +LIBTIFF_DLL_IMPEXP int TIFFRewriteDirectory(TIFF *); +LIBTIFF_DLL_IMPEXP int TIFFReassignTagToIgnore(enum TIFFIgnoreSense, int); #if defined(c_plusplus) || defined(__cplusplus) -extern void TIFFPrintDirectory(TIFF*, FILE*, long = 0); -extern int TIFFReadScanline(TIFF*, tdata_t, uint32, tsample_t = 0); -extern int TIFFWriteScanline(TIFF*, tdata_t, uint32, tsample_t = 0); -extern int TIFFReadRGBAImage(TIFF*, uint32, uint32, uint32*, int = 0); -extern int TIFFReadRGBAImageOriented(TIFF*, uint32, uint32, uint32*, +LIBTIFF_DLL_IMPEXP void TIFFPrintDirectory(TIFF*, FILE*, long = 0); +LIBTIFF_DLL_IMPEXP int TIFFReadScanline(TIFF*, tdata_t, uint32, tsample_t = 0); +LIBTIFF_DLL_IMPEXP int TIFFWriteScanline(TIFF*, tdata_t, uint32, tsample_t = 0); +LIBTIFF_DLL_IMPEXP int TIFFReadRGBAImage(TIFF*, uint32, uint32, uint32*, int = 0); +LIBTIFF_DLL_IMPEXP int TIFFReadRGBAImageOriented(TIFF*, uint32, uint32, uint32*, int = ORIENTATION_BOTLEFT, int = 0); #else -extern void TIFFPrintDirectory(TIFF*, FILE*, long); -extern int TIFFReadScanline(TIFF*, tdata_t, uint32, tsample_t); -extern int TIFFWriteScanline(TIFF*, tdata_t, uint32, tsample_t); -extern int TIFFReadRGBAImage(TIFF*, uint32, uint32, uint32*, int); -extern int TIFFReadRGBAImageOriented(TIFF*, uint32, uint32, uint32*, int, int); -#endif - -extern int TIFFReadRGBAStrip(TIFF*, tstrip_t, uint32 * ); -extern int TIFFReadRGBATile(TIFF*, uint32, uint32, uint32 * ); -extern int TIFFRGBAImageOK(TIFF*, char [1024]); -extern int TIFFRGBAImageBegin(TIFFRGBAImage*, TIFF*, int, char [1024]); -extern int TIFFRGBAImageGet(TIFFRGBAImage*, uint32*, uint32, uint32); -extern void TIFFRGBAImageEnd(TIFFRGBAImage*); -extern TIFF* TIFFOpen(const char*, const char*); +LIBTIFF_DLL_IMPEXP void TIFFPrintDirectory(TIFF*, FILE*, long); +LIBTIFF_DLL_IMPEXP int TIFFReadScanline(TIFF*, tdata_t, uint32, tsample_t); +LIBTIFF_DLL_IMPEXP int TIFFWriteScanline(TIFF*, tdata_t, uint32, tsample_t); +LIBTIFF_DLL_IMPEXP int TIFFReadRGBAImage(TIFF*, uint32, uint32, uint32*, int); +LIBTIFF_DLL_IMPEXP int TIFFReadRGBAImageOriented(TIFF*, uint32, uint32, uint32*, int, int); +#endif + +LIBTIFF_DLL_IMPEXP int TIFFReadRGBAStrip(TIFF*, tstrip_t, uint32 * ); +LIBTIFF_DLL_IMPEXP int TIFFReadRGBATile(TIFF*, uint32, uint32, uint32 * ); +LIBTIFF_DLL_IMPEXP int TIFFRGBAImageOK(TIFF*, char [1024]); +LIBTIFF_DLL_IMPEXP int TIFFRGBAImageBegin(TIFFRGBAImage*, TIFF*, int, char [1024]); +LIBTIFF_DLL_IMPEXP int TIFFRGBAImageGet(TIFFRGBAImage*, uint32*, uint32, uint32); +LIBTIFF_DLL_IMPEXP void TIFFRGBAImageEnd(TIFFRGBAImage*); +LIBTIFF_DLL_IMPEXP TIFF* TIFFOpen(const char*, const char*); # ifdef __WIN32__ -extern TIFF* TIFFOpenW(const wchar_t*, const char*); +LIBTIFF_DLL_IMPEXP TIFF* TIFFOpenW(const wchar_t*, const char*); # endif /* __WIN32__ */ -extern TIFF* TIFFFdOpen(int, const char*, const char*); -extern TIFF* TIFFClientOpen(const char*, const char*, +LIBTIFF_DLL_IMPEXP TIFF* TIFFFdOpen(int, const char*, const char*); +LIBTIFF_DLL_IMPEXP TIFF* TIFFClientOpen(const char*, const char*, thandle_t, TIFFReadWriteProc, TIFFReadWriteProc, TIFFSeekProc, TIFFCloseProc, TIFFSizeProc, TIFFMapFileProc, TIFFUnmapFileProc); -extern const char* TIFFFileName(TIFF*); -extern const char* TIFFSetFileName(TIFF*, const char *); -extern void TIFFError(const char*, const char*, ...) __attribute__((format (printf,2,3))); -extern void TIFFErrorExt(thandle_t, const char*, const char*, ...) __attribute__((format (printf,3,4))); -extern void TIFFWarning(const char*, const char*, ...) __attribute__((format (printf,2,3))); -extern void TIFFWarningExt(thandle_t, const char*, const char*, ...) __attribute__((format (printf,3,4))); -extern TIFFErrorHandler TIFFSetErrorHandler(TIFFErrorHandler); -extern TIFFErrorHandlerExt TIFFSetErrorHandlerExt(TIFFErrorHandlerExt); -extern TIFFErrorHandler TIFFSetWarningHandler(TIFFErrorHandler); -extern TIFFErrorHandlerExt TIFFSetWarningHandlerExt(TIFFErrorHandlerExt); -extern TIFFExtendProc TIFFSetTagExtender(TIFFExtendProc); -extern ttile_t TIFFComputeTile(TIFF*, uint32, uint32, uint32, tsample_t); -extern int TIFFCheckTile(TIFF*, uint32, uint32, uint32, tsample_t); -extern ttile_t TIFFNumberOfTiles(TIFF*); -extern tsize_t TIFFReadTile(TIFF*, +LIBTIFF_DLL_IMPEXP const char* TIFFFileName(TIFF*); +LIBTIFF_DLL_IMPEXP const char* TIFFSetFileName(TIFF*, const char *); +LIBTIFF_DLL_IMPEXP void TIFFError(const char*, const char*, ...) __attribute__((format (printf,2,3))); +LIBTIFF_DLL_IMPEXP void TIFFErrorExt(thandle_t, const char*, const char*, ...) __attribute__((format (printf,3,4))); +LIBTIFF_DLL_IMPEXP void TIFFWarning(const char*, const char*, ...) __attribute__((format (printf,2,3))); +LIBTIFF_DLL_IMPEXP void TIFFWarningExt(thandle_t, const char*, const char*, ...) __attribute__((format (printf,3,4))); +LIBTIFF_DLL_IMPEXP TIFFErrorHandler TIFFSetErrorHandler(TIFFErrorHandler); +LIBTIFF_DLL_IMPEXP TIFFErrorHandlerExt TIFFSetErrorHandlerExt(TIFFErrorHandlerExt); +LIBTIFF_DLL_IMPEXP TIFFErrorHandler TIFFSetWarningHandler(TIFFErrorHandler); +LIBTIFF_DLL_IMPEXP TIFFErrorHandlerExt TIFFSetWarningHandlerExt(TIFFErrorHandlerExt); +LIBTIFF_DLL_IMPEXP TIFFExtendProc TIFFSetTagExtender(TIFFExtendProc); +LIBTIFF_DLL_IMPEXP ttile_t TIFFComputeTile(TIFF*, uint32, uint32, uint32, tsample_t); +LIBTIFF_DLL_IMPEXP int TIFFCheckTile(TIFF*, uint32, uint32, uint32, tsample_t); +LIBTIFF_DLL_IMPEXP ttile_t TIFFNumberOfTiles(TIFF*); +LIBTIFF_DLL_IMPEXP tsize_t TIFFReadTile(TIFF*, tdata_t, uint32, uint32, uint32, tsample_t); -extern tsize_t TIFFWriteTile(TIFF*, +LIBTIFF_DLL_IMPEXP tsize_t TIFFWriteTile(TIFF*, tdata_t, uint32, uint32, uint32, tsample_t); -extern tstrip_t TIFFComputeStrip(TIFF*, uint32, tsample_t); -extern tstrip_t TIFFNumberOfStrips(TIFF*); -extern tsize_t TIFFReadEncodedStrip(TIFF*, tstrip_t, tdata_t, tsize_t); -extern tsize_t TIFFReadRawStrip(TIFF*, tstrip_t, tdata_t, tsize_t); -extern tsize_t TIFFReadEncodedTile(TIFF*, ttile_t, tdata_t, tsize_t); -extern tsize_t TIFFReadRawTile(TIFF*, ttile_t, tdata_t, tsize_t); -extern tsize_t TIFFWriteEncodedStrip(TIFF*, tstrip_t, tdata_t, tsize_t); -extern tsize_t TIFFWriteRawStrip(TIFF*, tstrip_t, tdata_t, tsize_t); -extern tsize_t TIFFWriteEncodedTile(TIFF*, ttile_t, tdata_t, tsize_t); -extern tsize_t TIFFWriteRawTile(TIFF*, ttile_t, tdata_t, tsize_t); -extern int TIFFDataWidth(TIFFDataType); /* table of tag datatype widths */ -extern void TIFFSetWriteOffset(TIFF*, toff_t); -extern void TIFFSwabShort(uint16*); -extern void TIFFSwabLong(uint32*); -extern void TIFFSwabDouble(double*); -extern void TIFFSwabArrayOfShort(uint16*, unsigned long); -extern void TIFFSwabArrayOfTriples(uint8*, unsigned long); -extern void TIFFSwabArrayOfLong(uint32*, unsigned long); -extern void TIFFSwabArrayOfDouble(double*, unsigned long); -extern void TIFFReverseBits(unsigned char *, unsigned long); -extern const unsigned char* TIFFGetBitRevTable(int); +LIBTIFF_DLL_IMPEXP tstrip_t TIFFComputeStrip(TIFF*, uint32, tsample_t); +LIBTIFF_DLL_IMPEXP tstrip_t TIFFNumberOfStrips(TIFF*); +LIBTIFF_DLL_IMPEXP tsize_t TIFFReadEncodedStrip(TIFF*, tstrip_t, tdata_t, tsize_t); +LIBTIFF_DLL_IMPEXP tsize_t TIFFReadRawStrip(TIFF*, tstrip_t, tdata_t, tsize_t); +LIBTIFF_DLL_IMPEXP tsize_t TIFFReadEncodedTile(TIFF*, ttile_t, tdata_t, tsize_t); +LIBTIFF_DLL_IMPEXP tsize_t TIFFReadRawTile(TIFF*, ttile_t, tdata_t, tsize_t); +LIBTIFF_DLL_IMPEXP tsize_t TIFFWriteEncodedStrip(TIFF*, tstrip_t, tdata_t, tsize_t); +LIBTIFF_DLL_IMPEXP tsize_t TIFFWriteRawStrip(TIFF*, tstrip_t, tdata_t, tsize_t); +LIBTIFF_DLL_IMPEXP tsize_t TIFFWriteEncodedTile(TIFF*, ttile_t, tdata_t, tsize_t); +LIBTIFF_DLL_IMPEXP tsize_t TIFFWriteRawTile(TIFF*, ttile_t, tdata_t, tsize_t); +LIBTIFF_DLL_IMPEXP int TIFFDataWidth(TIFFDataType); /* table of tag datatype widths */ +LIBTIFF_DLL_IMPEXP void TIFFSetWriteOffset(TIFF*, toff_t); +LIBTIFF_DLL_IMPEXP void TIFFSwabShort(uint16*); +LIBTIFF_DLL_IMPEXP void TIFFSwabLong(uint32*); +LIBTIFF_DLL_IMPEXP void TIFFSwabDouble(double*); +LIBTIFF_DLL_IMPEXP void TIFFSwabArrayOfShort(uint16*, unsigned long); +LIBTIFF_DLL_IMPEXP void TIFFSwabArrayOfTriples(uint8*, unsigned long); +LIBTIFF_DLL_IMPEXP void TIFFSwabArrayOfLong(uint32*, unsigned long); +LIBTIFF_DLL_IMPEXP void TIFFSwabArrayOfDouble(double*, unsigned long); +LIBTIFF_DLL_IMPEXP void TIFFReverseBits(unsigned char *, unsigned long); +LIBTIFF_DLL_IMPEXP const unsigned char* TIFFGetBitRevTable(int); #ifdef LOGLUV_PUBLIC #define U_NEU 0.210526316 #define V_NEU 0.473684211 #define UVSCALE 410. -extern double LogL16toY(int); -extern double LogL10toY(int); -extern void XYZtoRGB24(float*, uint8*); -extern int uv_decode(double*, double*, int); -extern void LogLuv24toXYZ(uint32, float*); -extern void LogLuv32toXYZ(uint32, float*); +LIBTIFF_DLL_IMPEXP double LogL16toY(int); +LIBTIFF_DLL_IMPEXP double LogL10toY(int); +LIBTIFF_DLL_IMPEXP void XYZtoRGB24(float*, uint8*); +LIBTIFF_DLL_IMPEXP int uv_decode(double*, double*, int); +LIBTIFF_DLL_IMPEXP void LogLuv24toXYZ(uint32, float*); +LIBTIFF_DLL_IMPEXP void LogLuv32toXYZ(uint32, float*); #if defined(c_plusplus) || defined(__cplusplus) -extern int LogL16fromY(double, int = SGILOGENCODE_NODITHER); -extern int LogL10fromY(double, int = SGILOGENCODE_NODITHER); -extern int uv_encode(double, double, int = SGILOGENCODE_NODITHER); -extern uint32 LogLuv24fromXYZ(float*, int = SGILOGENCODE_NODITHER); -extern uint32 LogLuv32fromXYZ(float*, int = SGILOGENCODE_NODITHER); +LIBTIFF_DLL_IMPEXP int LogL16fromY(double, int = SGILOGENCODE_NODITHER); +LIBTIFF_DLL_IMPEXP int LogL10fromY(double, int = SGILOGENCODE_NODITHER); +LIBTIFF_DLL_IMPEXP int uv_encode(double, double, int = SGILOGENCODE_NODITHER); +LIBTIFF_DLL_IMPEXP uint32 LogLuv24fromXYZ(float*, int = SGILOGENCODE_NODITHER); +LIBTIFF_DLL_IMPEXP uint32 LogLuv32fromXYZ(float*, int = SGILOGENCODE_NODITHER); #else -extern int LogL16fromY(double, int); -extern int LogL10fromY(double, int); -extern int uv_encode(double, double, int); -extern uint32 LogLuv24fromXYZ(float*, int); -extern uint32 LogLuv32fromXYZ(float*, int); +LIBTIFF_DLL_IMPEXP int LogL16fromY(double, int); +LIBTIFF_DLL_IMPEXP int LogL10fromY(double, int); +LIBTIFF_DLL_IMPEXP int uv_encode(double, double, int); +LIBTIFF_DLL_IMPEXP uint32 LogLuv24fromXYZ(float*, int); +LIBTIFF_DLL_IMPEXP uint32 LogLuv32fromXYZ(float*, int); #endif #endif /* LOGLUV_PUBLIC */ -extern int TIFFCIELabToRGBInit(TIFFCIELabToRGB*, TIFFDisplay *, float*); -extern void TIFFCIELabToXYZ(TIFFCIELabToRGB *, uint32, int32, int32, +LIBTIFF_DLL_IMPEXP int TIFFCIELabToRGBInit(TIFFCIELabToRGB*, TIFFDisplay *, float*); +LIBTIFF_DLL_IMPEXP void TIFFCIELabToXYZ(TIFFCIELabToRGB *, uint32, int32, int32, float *, float *, float *); -extern void TIFFXYZToRGB(TIFFCIELabToRGB *, float, float, float, +LIBTIFF_DLL_IMPEXP void TIFFXYZToRGB(TIFFCIELabToRGB *, float, float, float, uint32 *, uint32 *, uint32 *); -extern int TIFFYCbCrToRGBInit(TIFFYCbCrToRGB*, float*, float*); -extern void TIFFYCbCrtoRGB(TIFFYCbCrToRGB *, uint32, int32, int32, +LIBTIFF_DLL_IMPEXP int TIFFYCbCrToRGBInit(TIFFYCbCrToRGB*, float*, float*); +LIBTIFF_DLL_IMPEXP void TIFFYCbCrtoRGB(TIFFYCbCrToRGB *, uint32, int32, int32, uint32 *, uint32 *, uint32 *); #if defined(c_plusplus) || defined(__cplusplus) Propchange: branches/reactos-yarotows/include/reactos/winsock/msafd.h ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jul 15 20:49:51 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/include/reactos/winsock/msafd.h:34711-34712,34743,34780-34782,34812,34839,34842,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35683,35739,35746,35762,35771,35777,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36172,36360,36388-36389,36445,36502-36503,36505,36570,36614,36899,36930,36936,36992,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38148-38151,38264-38265,38268,38355,39151,39333,39345,39639,40122-40123,40125,40128,40155,40247,40324,40753,40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41082-41086,41097-41098,41101,41449,41479,41484-41485,41499,41531,41536,41540,41546-41547,41549,43080,43426,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601 -/trunk/reactos/include/reactos/winsock/msafd.h:44354-45543,48010-48040 +/trunk/reactos/include/reactos/winsock/msafd.h:44354-45543,48010-48067 Propchange: branches/reactos-yarotows/include/reactos/winsock/msafdlib.h ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jul 15 20:49:51 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/include/reactos/winsock/msafdlib.h:34711-34712,34743,34780-34782,34812,34839,34842,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35683,35739,35746,35762,35771,35777,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36172,36360,36388-36389,36445,36502-36503,36505,36570,36614,36899,36930,36936,36992,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38148-38151,38264-38265,38268,38355,39151,39333,39345,39639,40122-40123,40125,40128,40155,40247,40324,40753,40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41082-41086,41097-41098,41101,41449,41479,41484-41485,41499,41531,41536,41540,41546-41547,41549,43080,43426,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601 -/trunk/reactos/include/reactos/winsock/msafdlib.h:44354-45543,48010-48040 +/trunk/reactos/include/reactos/winsock/msafdlib.h:44354-45543,48010-48067 Propchange: branches/reactos-yarotows/include/reactos/winsock/mswinsock.h ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jul 15 20:49:51 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/include/reactos/winsock/mswinsock.h:34711-34712,34743,34780-34782,34812,34839,34842,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35683,35739,35746,35762,35771,35777,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36172,36360,36388-36389,36445,36502-36503,36505,36570,36614,36899,36930,36936,36992,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38148-38151,38264-38265,38268,38355,39151,39333,39345,39639,40122-40123,40125,40128,40155,40247,40324,40753,40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41082-41086,41097-41098,41101,41449,41479,41484-41485,41499,41531,41536,41540,41546-41547,41549,43080,43426,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601 -/trunk/reactos/include/reactos/winsock/mswinsock.h:44354-45543,48010-48040 +/trunk/reactos/include/reactos/winsock/mswinsock.h:44354-45543,48010-48067 Propchange: branches/reactos-yarotows/include/reactos/winsock/rnr20lib.h ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jul 15 20:49:51 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/include/reactos/winsock/rnr20lib.h:34711-34712,34743,34780-34782,34812,34839,34842,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35683,35739,35746,35762,35771,35777,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36172,36360,36388-36389,36445,36502-36503,36505,36570,36614,36899,36930,36936,36992,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38148-38151,38264-38265,38268,38355,39151,39333,39345,39639,40122-40123,40125,40128,40155,40247,40324,40753,40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41082-41086,41097-41098,41101,41449,41479,41484-41485,41499,41531,41536,41540,41546-41547,41549,43080,43426,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601 -/trunk/reactos/include/reactos/winsock/rnr20lib.h:44354-45543,48010-48040 +/trunk/reactos/include/reactos/winsock/rnr20lib.h:44354-45543,48010-48067 Propchange: branches/reactos-yarotows/include/reactos/winsock/wsmobile.h ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jul 15 20:49:51 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/include/reactos/winsock/wsmobile.h:34711-34712,34743,34780-34782,34812,34839,34842,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35683,35739,35746,35762,35771,35777,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36172,36360,36388-36389,36445,36502-36503,36505,36570,36614,36899,36930,36936,36992,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38148-38151,38264-38265,38268,38355,39151,39333,39345,39639,40122-40123,40125,40128,40155,40247,40324,40753,40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41082-41086,41097-41098,41101,41449,41479,41484-41485,41499,41531,41536,41540,41546-41547,41549,43080,43426,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601 -/trunk/reactos/include/reactos/winsock/wsmobile.h:44354-45543,48010-48040 +/trunk/reactos/include/reactos/winsock/wsmobile.h:44354-45543,48010-48067 Modified: branches/reactos-yarotows/ntoskrnl/ex/rundown.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/ntoskrnl/ex/ru… ============================================================================== --- branches/reactos-yarotows/ntoskrnl/ex/rundown.c [iso-8859-1] (original) +++ branches/reactos-yarotows/ntoskrnl/ex/rundown.c [iso-8859-1] Thu Jul 15 20:49:51 2010 @@ -491,7 +491,7 @@ VOID NTAPI ExInitializeRundownProtectionCacheAware(IN PEX_RUNDOWN_REF_CACHE_AWARE RunRefCacheAware, - IN ULONG Count) + IN SIZE_T Count) { DBG_UNREFERENCED_PARAMETER(RunRefCacheAware); DBG_UNREFERENCED_PARAMETER(Count); Modified: branches/reactos-yarotows/ntoskrnl/include/internal/amd64/ke.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/ntoskrnl/inclu… ============================================================================== --- branches/reactos-yarotows/ntoskrnl/include/internal/amd64/ke.h [iso-8859-1] (original) +++ branches/reactos-yarotows/ntoskrnl/include/internal/amd64/ke.h [iso-8859-1] Thu Jul 15 20:49:51 2010 @@ -316,9 +316,6 @@ #endif /* __ASM__ */ -#undef KeGetCurrentThread -#define _KeGetCurrentThread KeGetCurrentThread - // HACK extern NTKERNELAPI volatile KSYSTEM_TIME KeTickCount; Modified: branches/reactos-yarotows/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/ntoskrnl/inclu… ============================================================================== --- branches/reactos-yarotows/ntoskrnl/include/internal/mm.h [iso-8859-1] (original) +++ branches/reactos-yarotows/ntoskrnl/include/internal/mm.h [iso-8859-1] Thu Jul 15 20:49:51 2010 @@ -17,7 +17,7 @@ extern ULONG MmLowestPhysicalPage; extern ULONG MmHighestPhysicalPage; extern ULONG MmAvailablePages; -extern ULONG MmResidentAvailablePages; +extern PFN_NUMBER MmResidentAvailablePages; extern PVOID MmPagedPoolBase; extern ULONG MmPagedPoolSize; Modified: branches/reactos-yarotows/ntoskrnl/include/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/ntoskrnl/inclu… ============================================================================== --- branches/reactos-yarotows/ntoskrnl/include/ntoskrnl.h [iso-8859-1] (original) +++ branches/reactos-yarotows/ntoskrnl/include/ntoskrnl.h [iso-8859-1] Thu Jul 15 20:49:51 2010 @@ -11,6 +11,12 @@ /* ARM Bringup Hack */ #ifdef _M_ARM #define DbgPrint DbgPrintEarly +#endif + +/* WDK hacks */ +#ifdef _M_AMD64 +#define IoAllocateAdapterChannel _IoAllocateAdapterChannel +#define KeGetCurrentThread _KeGetCurrentThread #endif /* Version Data */ Modified: branches/reactos-yarotows/ntoskrnl/io/iomgr/adapter.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/ntoskrnl/io/io… ============================================================================== --- branches/reactos-yarotows/ntoskrnl/io/iomgr/adapter.c [iso-8859-1] (original) +++ branches/reactos-yarotows/ntoskrnl/io/iomgr/adapter.c [iso-8859-1] Thu Jul 15 20:49:51 2010 @@ -21,6 +21,7 @@ /* FUNCTIONS *****************************************************************/ +#undef IoAllocateAdapterChannel /* * @implemented */ Modified: branches/reactos-yarotows/ntoskrnl/kd64/kddata.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/ntoskrnl/kd64/… ============================================================================== --- branches/reactos-yarotows/ntoskrnl/kd64/kddata.c [iso-8859-1] (original) +++ branches/reactos-yarotows/ntoskrnl/kd64/kddata.c [iso-8859-1] Thu Jul 15 20:49:51 2010 @@ -526,14 +526,14 @@ // // AMD64 GDT/LDT/TSS constants // - KGDT_64_R0_CODE, - KGDT_64_DATA, - KGDT_64_DATA, - KGDT_64_R3_CODE, - KGDT_64_DATA, - KGDT_64_DATA, - 0, - KGDT_TSS, + KGDT64_R0_CODE, + KGDT64_R3_DATA, + KGDT64_R3_DATA, + KGDT64_R3_CODE, + KGDT64_R3_DATA, + KGDT64_R3_DATA, + 0, + KGDT64_SYS_TSS, 0, 0, #else Modified: branches/reactos-yarotows/ntoskrnl/ke/clock.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/ntoskrnl/ke/cl… ============================================================================== --- branches/reactos-yarotows/ntoskrnl/ke/clock.c [iso-8859-1] (original) +++ branches/reactos-yarotows/ntoskrnl/ke/clock.c [iso-8859-1] Thu Jul 15 20:49:51 2010 @@ -175,6 +175,7 @@ } } +#ifndef _M_AMD64 /* * @implemented */ @@ -217,6 +218,7 @@ /* Return the time value */ return CurrentTime.QuadPart; } +#endif /* * @implemented Modified: branches/reactos-yarotows/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/ntoskrnl/mm/AR… ============================================================================== --- branches/reactos-yarotows/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ branches/reactos-yarotows/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Thu Jul 15 20:49:51 2010 @@ -5,6 +5,8 @@ * PURPOSE: ARM Memory Manager Header * PROGRAMMERS: ReactOS Portable Systems Group */ + +#ifndef _M_AMD64 #define MI_MIN_PAGES_FOR_NONPAGED_POOL_TUNING ((255*1024*1024) >> PAGE_SHIFT) #define MI_MIN_PAGES_FOR_SYSPTE_TUNING ((19*1024*1024) >> PAGE_SHIFT) @@ -37,6 +39,8 @@ #define MM_HIGHEST_VAD_ADDRESS \ (PVOID)((ULONG_PTR)MM_HIGHEST_USER_ADDRESS - (16 * PAGE_SIZE)) + +#endif /* !_M_AMD64 */ /* Make the code cleaner with some definitions for size multiples */ #define _1KB (1024) @@ -58,7 +62,9 @@ #define PDE_COUNT 4096 #define PTE_COUNT 256 #else -#error Define these please! +#define PD_COUNT PPE_PER_PAGE +#define PDE_COUNT PDE_PER_PAGE +#define PTE_COUNT PTE_PER_PAGE #endif #ifdef _M_IX86 Propchange: branches/reactos-yarotows/subsystems/win32/csrss/win32csr/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jul 15 20:49:51 2010 @@ -1,4 +1,4 @@ /branches/header-work/subsystems/win32/csrss/win32csr:45691-46463 /branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/win32csr:34711-34712,34741,34743,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36397,36445,36502-36503,36505,36570,36614,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36992,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40122-40123,40125,40128,40155,40247,40324,40753,40927-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479,41484-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43857-43858,43860,43905-43907,43969,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338-44339,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44772,45124,45126-45127,46394,46478,46511,46524,46526,46534-46535,46537-46539,46589 /branches/ros-amd64-bringup/subsystems/win32/csrss/win32csr:36852 -/trunk/reactos/subsystems/win32/csrss/win32csr:45219-48040 +/trunk/reactos/subsystems/win32/csrss/win32csr:45219-48067 Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/cliprgn.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/cliprgn.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/cliprgn.c [iso-8859-1] Thu Jul 15 20:49:51 2010 @@ -26,7 +26,7 @@ CLIPPING_UpdateGCRegion(DC* Dc) { PROSRGNDATA CombinedRegion; - HRGN hRgnVis = NULL; + HRGN hRgnVis = Dc->prgnVis->BaseObject.hHmgr; // would prefer this, but the rest of the code sucks // ASSERT(Dc->rosdc.hGCClipRgn); @@ -45,7 +45,7 @@ Dc->rosdc.hGCClipRgn = IntSysCreateRectRgn(0, 0, 0, 0); if (Dc->rosdc.hClipRgn == NULL) - NtGdiCombineRgn(Dc->rosdc.hGCClipRgn, ((PROSRGNDATA)Dc->prgnVis)->BaseObject.hHmgr, 0, RGN_COPY); + NtGdiCombineRgn(Dc->rosdc.hGCClipRgn, hRgnVis, 0, RGN_COPY); else NtGdiCombineRgn(Dc->rosdc.hGCClipRgn, Dc->rosdc.hClipRgn, hRgnVis, RGN_AND);

1 0

[akhaldi] 48067: [PSDK] - Fix WS2TCPIP_INLINE : extern inline -> static inline
by akhaldi＠svn.reactos.org 15 Jul '10

15 Jul '10

Author: akhaldi Date: Thu Jul 15 19:34:21 2010 New Revision: 48067 URL: http://svn.reactos.org/svn/reactos?rev=48067&view=rev Log: [PSDK] - Fix WS2TCPIP_INLINE : extern inline -> static inline Modified: trunk/reactos/include/psdk/ws2ipdef.h trunk/reactos/include/psdk/ws2tcpip.h Modified: trunk/reactos/include/psdk/ws2ipdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ws2ipdef.h?re… ============================================================================== --- trunk/reactos/include/psdk/ws2ipdef.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ws2ipdef.h [iso-8859-1] Thu Jul 15 19:34:21 2010 @@ -13,7 +13,7 @@ #ifdef _MSC_VER #define WS2TCPIP_INLINE __inline #else -#define WS2TCPIP_INLINE extern inline +#define WS2TCPIP_INLINE static inline #endif #include <in6addr.h> Modified: trunk/reactos/include/psdk/ws2tcpip.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ws2tcpip.h?re… ============================================================================== --- trunk/reactos/include/psdk/ws2tcpip.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ws2tcpip.h [iso-8859-1] Thu Jul 15 19:34:21 2010 @@ -24,7 +24,7 @@ #ifdef _MSC_VER #define WS2TCPIP_INLINE __inline #else -#define WS2TCPIP_INLINE extern inline +#define WS2TCPIP_INLINE static inline #endif /* getaddrinfo error codes */

1 0

← Newer
1
...
29
30
31
32
33
34
35
...
47
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 July 2010