Ros-diffs September 2008

ros-diffs@reactos.org

27 participants
747 discussions

[cgutman] 36595: - Merge aicom-network-fixes up to r36594

by cgutman＠svn.reactos.org

Author: cgutman Date: Mon Sep 29 19:17:48 2008 New Revision: 36595 URL: http://svn.reactos.org/svn/reactos?rev=36595&view=rev Log: - Merge aicom-network-fixes up to r36594 Modified: trunk/reactos/drivers/network/dd/pcnet/requests.c trunk/reactos/drivers/network/ndis/ndis/config.c trunk/reactos/drivers/network/ndis/ndis/miniport.c trunk/reactos/drivers/network/ndis/ndis/protocol.c Modified: trunk/reactos/drivers/network/dd/pcnet/requests.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/dd/pcnet/r… ============================================================================== --- trunk/reactos/drivers/network/dd/pcnet/requests.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/dd/pcnet/requests.c [iso-8859-1] Mon Sep 29 19:17:48 2008 @@ -263,7 +263,8 @@ { GenericULONG = NDIS_MAC_OPTION_COPY_LOOKAHEAD_DATA | NDIS_MAC_OPTION_RECEIVE_SERIALIZED | - NDIS_MAC_OPTION_TRANSFERS_NOT_PEND; + NDIS_MAC_OPTION_TRANSFERS_NOT_PEND | + NDIS_MAC_OPTION_NO_LOOPBACK; break; } Modified: trunk/reactos/drivers/network/ndis/ndis/config.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/config.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/config.c [iso-8859-1] Mon Sep 29 19:17:48 2008 @@ -479,6 +479,15 @@ return; } + MiniportResource = ExAllocatePool(PagedPool, sizeof(MINIPORT_RESOURCE)); + if(!MiniportResource) + { + NDIS_DbgPrint(MIN_TRACE,("Insufficient resources.\n")); + ExFreePool(KeyInformation); + *Status = NDIS_STATUS_RESOURCES; + return; + } + switch(ParameterType) { case NdisParameterInteger: @@ -516,8 +525,15 @@ ExFreePool(*ParameterValue); *ParameterValue = NULL; *Status = NDIS_STATUS_FAILURE; - } else - *Status = NDIS_STATUS_SUCCESS; + return; + } + + MiniportResource->ResourceType = 0; + MiniportResource->Resource = *ParameterValue; + NDIS_DbgPrint(MID_TRACE,("inserting 0x%x into the resource list\n", MiniportResource->Resource)); + ExInterlockedInsertTailList(&ConfigurationContext->ResourceListHead, &MiniportResource->ListEntry, &ConfigurationContext->ResourceLock); + + *Status = NDIS_STATUS_SUCCESS; return; } @@ -556,18 +572,6 @@ return; } - MiniportResource = ExAllocatePool(PagedPool, sizeof(MINIPORT_RESOURCE)); - if(!MiniportResource) - { - NDIS_DbgPrint(MIN_TRACE,("Insufficient resources.\n")); - ExFreePool(RegData); - ExFreePool(KeyInformation); - ExFreePool(*ParameterValue); - *ParameterValue = NULL; - *Status = NDIS_STATUS_RESOURCES; - return; - } - MiniportResource->ResourceType = 0; MiniportResource->Resource = *ParameterValue; NDIS_DbgPrint(MID_TRACE,("inserting 0x%x into the resource list\n", MiniportResource->Resource)); @@ -601,17 +605,6 @@ { NDIS_DbgPrint(MIN_TRACE,("Insufficient resources.\n")); ExFreePool(KeyInformation); - *Status = NDIS_STATUS_RESOURCES; - return; - } - - MiniportResource = ExAllocatePool(PagedPool, sizeof(MINIPORT_RESOURCE)); - if(!MiniportResource) - { - NDIS_DbgPrint(MIN_TRACE,("Insufficient resources.\n")); - ExFreePool(KeyInformation); - ExFreePool(*ParameterValue); - *ParameterValue = NULL; *Status = NDIS_STATUS_RESOURCES; return; } Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Mon Sep 29 19:17:48 2008 @@ -1636,7 +1636,7 @@ NDIS_DbgPrint(MIN_TRACE, ("MiniportInitialize() failed for an adapter.\n")); ExInterlockedRemoveEntryList( &Adapter->ListEntry, &AdapterListLock ); if (NdisStatus == NDIS_STATUS_SUCCESS) NdisStatus = NDIS_STATUS_FAILURE; - return (NTSTATUS)NdisStatus; + return NdisStatus; } Adapter->NdisMiniportBlock.MediaType = MediaArray[SelectedMediumIndex]; @@ -1669,7 +1669,7 @@ return STATUS_UNSUCCESSFUL; } - if (!Success || NdisStatus != NDIS_STATUS_SUCCESS) + if (NdisStatus != NDIS_STATUS_SUCCESS) { NDIS_DbgPrint(MAX_TRACE, ("couldn't create filter (%x)\n", NdisStatus)); if (Adapter->LookaheadBuffer) @@ -1678,8 +1678,7 @@ Adapter->LookaheadBuffer = NULL; } ExInterlockedRemoveEntryList( &Adapter->ListEntry, &AdapterListLock ); - if (NdisStatus == NDIS_STATUS_SUCCESS) NdisStatus = NDIS_STATUS_FAILURE; - return (NTSTATUS)NdisStatus; + return NdisStatus; } /* Check for a hang every two seconds if it wasn't set in MiniportInitialize */ Modified: trunk/reactos/drivers/network/ndis/ndis/protocol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/protocol.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/protocol.c [iso-8859-1] Mon Sep 29 19:17:48 2008 @@ -77,15 +77,13 @@ NdisQueryPacket(Packet, NULL, NULL, NULL, &PacketLength); - KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); - NDIS_DbgPrint(MAX_TRACE, ("acquiring miniport block lock\n")); - KeAcquireSpinLockAtDpcLevel(&Adapter->NdisMiniportBlock.Lock); + KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); { Adapter->NdisMiniportBlock.IndicatedPacket[KeGetCurrentProcessorNumber()] = Packet; BufferedLength = CopyPacketToBuffer(Adapter->LookaheadBuffer, Packet, 0, Adapter->NdisMiniportBlock.CurrentLookahead); } - KeReleaseSpinLockFromDpcLevel(&Adapter->NdisMiniportBlock.Lock); + KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); if (BufferedLength > Adapter->MediumHeaderSize) { @@ -100,13 +98,11 @@ } NDIS_DbgPrint(MAX_TRACE, ("acquiring miniport block lock\n")); - KeAcquireSpinLockAtDpcLevel(&Adapter->NdisMiniportBlock.Lock); + KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); { Adapter->NdisMiniportBlock.IndicatedPacket[KeGetCurrentProcessorNumber()] = NULL; } - KeReleaseSpinLockFromDpcLevel(&Adapter->NdisMiniportBlock.Lock); - - KeLowerIrql(OldIrql); + KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); return STATUS_SUCCESS; } @@ -178,19 +174,17 @@ * MacBindingHandle = Adapter binding handle * Packet = Pointer to NDIS packet descriptor * RETURNS: - * NDIS_STATUS_SUCCESS always + * NDIS_STATUS_SUCCESS if the packet was successfully sent + * NDIS_STATUS_PENDING if the miniport was busy or a serialized miniport returned NDIS_STATUS_RESOURCES * NOTES: * TODO: - * - Fix return values - * - Should queue packet if miniport returns NDIS_STATUS_RESOURCES - * - Queue packets directly on the adapters when possible (i.e. - * when miniports not busy) * - Break this up */ { - KIRQL SpinOldIrql; + KIRQL SpinOldIrql, RaiseOldIrql; PADAPTER_BINDING AdapterBinding; PLOGICAL_ADAPTER Adapter; + NDIS_STATUS NdisStatus; NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); @@ -207,9 +201,6 @@ /* XXX what is this crazy black magic? */ Packet->Reserved[0] = (ULONG_PTR)MacBindingHandle; - - NDIS_DbgPrint(MAX_TRACE, ("acquiring miniport block lock\n")); - KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &SpinOldIrql); /* * Test the packet to see if it is a MAC loopback. @@ -218,23 +209,80 @@ * If dest MAC address of packet == MAC address of adapter, * this is a loopback frame. */ + + KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &SpinOldIrql); + if ((Adapter->NdisMiniportBlock.MacOptions & NDIS_MAC_OPTION_NO_LOOPBACK) && MiniAdapterHasAddress(Adapter, Packet)) { - NDIS_DbgPrint(MIN_TRACE, ("Queuing packet.\n")); + NDIS_DbgPrint(MID_TRACE, ("Queuing packet.\n")); MiniQueueWorkItem(Adapter, NdisWorkItemSendLoopback, (PVOID)Packet); KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, SpinOldIrql); return NDIS_STATUS_PENDING; - } - else - NDIS_DbgPrint(MID_TRACE,("Not a loopback packet\n")); - - /* This is a normal send packet, not a loopback packet. */ - MiniQueueWorkItem(Adapter, NdisWorkItemSend, (PVOID)Packet); - KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, SpinOldIrql); - NDIS_DbgPrint(MAX_TRACE, ("Queued a work item and returning\n")); - return NDIS_STATUS_PENDING; + } else { + if(Adapter->MiniportBusy) { + MiniQueueWorkItem(Adapter, NdisWorkItemSend, (PVOID)Packet); + KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, SpinOldIrql); + return NDIS_STATUS_PENDING; + } + + KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, SpinOldIrql); + + if(Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.SendPacketsHandler) + { + if(Adapter->NdisMiniportBlock.Flags & NDIS_ATTRIBUTE_DESERIALIZE) + { + NDIS_DbgPrint(MAX_TRACE, ("Calling miniport's SendPackets handler\n")); + (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.SendPacketsHandler)( + Adapter->NdisMiniportBlock.MiniportAdapterContext, &Packet, 1); + NdisStatus = NDIS_GET_PACKET_STATUS(Packet); + } else { + /* SendPackets is called at DISPATCH_LEVEL for all serialized miniports */ + KeRaiseIrql(DISPATCH_LEVEL, &RaiseOldIrql); + { + NDIS_DbgPrint(MAX_TRACE, ("Calling miniport's SendPackets handler\n")); + (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.SendPacketsHandler)( + Adapter->NdisMiniportBlock.MiniportAdapterContext, &Packet, 1); + } + KeLowerIrql(RaiseOldIrql); + + NdisStatus = NDIS_GET_PACKET_STATUS(Packet); + if( NdisStatus == NDIS_STATUS_RESOURCES ) { + KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &SpinOldIrql); + MiniQueueWorkItem(Adapter, NdisWorkItemSend, Packet); + KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, SpinOldIrql); + NdisStatus = NDIS_STATUS_PENDING; + } + } + + return NdisStatus; + } else { + if(Adapter->NdisMiniportBlock.Flags & NDIS_ATTRIBUTE_DESERIALIZE) + { + NDIS_DbgPrint(MAX_TRACE, ("Calling miniport's Send handler\n")); + NdisStatus = (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.SendHandler)( + Adapter->NdisMiniportBlock.MiniportAdapterContext, Packet, 0); + NDIS_DbgPrint(MAX_TRACE, ("back from miniport's send handler\n")); + } else { + /* Send is called at DISPATCH_LEVEL for all serialized miniports */ + KeRaiseIrql(DISPATCH_LEVEL, &RaiseOldIrql); + NDIS_DbgPrint(MAX_TRACE, ("Calling miniport's Send handler\n")); + NdisStatus = (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.SendHandler)( + Adapter->NdisMiniportBlock.MiniportAdapterContext, Packet, 0); + NDIS_DbgPrint(MAX_TRACE, ("back from miniport's send handler\n")); + KeLowerIrql(RaiseOldIrql); + if( NdisStatus == NDIS_STATUS_RESOURCES ) { + KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &SpinOldIrql); + MiniQueueWorkItem(Adapter, NdisWorkItemSend, Packet); + KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, SpinOldIrql); + NdisStatus = NDIS_STATUS_PENDING; + } + } + + return NdisStatus; + } + } }

16 years, 2 months

[cgutman] 36594: - Send the packet immediately if the miniport is not busy - Change KeAcquireSpinLockAtDpcLevel/KeReleaseSpinLockFromDpcLevel to KeAcquireSpinLock/KeReleaseSpinLock since we aren't at DISPATCH_LEVEL - Fix some comments

by cgutman＠svn.reactos.org

Author: cgutman Date: Mon Sep 29 19:09:23 2008 New Revision: 36594 URL: http://svn.reactos.org/svn/reactos?rev=36594&view=rev Log: - Send the packet immediately if the miniport is not busy - Change KeAcquireSpinLockAtDpcLevel/KeReleaseSpinLockFromDpcLevel to KeAcquireSpinLock/KeReleaseSpinLock since we aren't at DISPATCH_LEVEL - Fix some comments Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/protocol.c Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/protocol.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/ndis/ndis/protocol.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/ndis/ndis/protocol.c [iso-8859-1] Mon Sep 29 19:09:23 2008 @@ -77,15 +77,13 @@ NdisQueryPacket(Packet, NULL, NULL, NULL, &PacketLength); - KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); - NDIS_DbgPrint(MAX_TRACE, ("acquiring miniport block lock\n")); - KeAcquireSpinLockAtDpcLevel(&Adapter->NdisMiniportBlock.Lock); + KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); { Adapter->NdisMiniportBlock.IndicatedPacket[KeGetCurrentProcessorNumber()] = Packet; BufferedLength = CopyPacketToBuffer(Adapter->LookaheadBuffer, Packet, 0, Adapter->NdisMiniportBlock.CurrentLookahead); } - KeReleaseSpinLockFromDpcLevel(&Adapter->NdisMiniportBlock.Lock); + KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); if (BufferedLength > Adapter->MediumHeaderSize) { @@ -100,13 +98,11 @@ } NDIS_DbgPrint(MAX_TRACE, ("acquiring miniport block lock\n")); - KeAcquireSpinLockAtDpcLevel(&Adapter->NdisMiniportBlock.Lock); + KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); { Adapter->NdisMiniportBlock.IndicatedPacket[KeGetCurrentProcessorNumber()] = NULL; } - KeReleaseSpinLockFromDpcLevel(&Adapter->NdisMiniportBlock.Lock); - - KeLowerIrql(OldIrql); + KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); return STATUS_SUCCESS; } @@ -178,19 +174,17 @@ * MacBindingHandle = Adapter binding handle * Packet = Pointer to NDIS packet descriptor * RETURNS: - * NDIS_STATUS_SUCCESS always + * NDIS_STATUS_SUCCESS if the packet was successfully sent + * NDIS_STATUS_PENDING if the miniport was busy or a serialized miniport returned NDIS_STATUS_RESOURCES * NOTES: * TODO: - * - Fix return values - * - Should queue packet if miniport returns NDIS_STATUS_RESOURCES - * - Queue packets directly on the adapters when possible (i.e. - * when miniports not busy) * - Break this up */ { - KIRQL SpinOldIrql; + KIRQL SpinOldIrql, RaiseOldIrql; PADAPTER_BINDING AdapterBinding; PLOGICAL_ADAPTER Adapter; + NDIS_STATUS NdisStatus; NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); @@ -207,9 +201,6 @@ /* XXX what is this crazy black magic? */ Packet->Reserved[0] = (ULONG_PTR)MacBindingHandle; - - NDIS_DbgPrint(MAX_TRACE, ("acquiring miniport block lock\n")); - KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &SpinOldIrql); /* * Test the packet to see if it is a MAC loopback. @@ -218,23 +209,80 @@ * If dest MAC address of packet == MAC address of adapter, * this is a loopback frame. */ + + KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &SpinOldIrql); + if ((Adapter->NdisMiniportBlock.MacOptions & NDIS_MAC_OPTION_NO_LOOPBACK) && MiniAdapterHasAddress(Adapter, Packet)) { - NDIS_DbgPrint(MIN_TRACE, ("Queuing packet.\n")); + NDIS_DbgPrint(MID_TRACE, ("Queuing packet.\n")); MiniQueueWorkItem(Adapter, NdisWorkItemSendLoopback, (PVOID)Packet); KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, SpinOldIrql); return NDIS_STATUS_PENDING; - } - else - NDIS_DbgPrint(MID_TRACE,("Not a loopback packet\n")); - - /* This is a normal send packet, not a loopback packet. */ - MiniQueueWorkItem(Adapter, NdisWorkItemSend, (PVOID)Packet); - KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, SpinOldIrql); - NDIS_DbgPrint(MAX_TRACE, ("Queued a work item and returning\n")); - return NDIS_STATUS_PENDING; + } else { + if(Adapter->MiniportBusy) { + MiniQueueWorkItem(Adapter, NdisWorkItemSend, (PVOID)Packet); + KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, SpinOldIrql); + return NDIS_STATUS_PENDING; + } + + KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, SpinOldIrql); + + if(Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.SendPacketsHandler) + { + if(Adapter->NdisMiniportBlock.Flags & NDIS_ATTRIBUTE_DESERIALIZE) + { + NDIS_DbgPrint(MAX_TRACE, ("Calling miniport's SendPackets handler\n")); + (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.SendPacketsHandler)( + Adapter->NdisMiniportBlock.MiniportAdapterContext, &Packet, 1); + NdisStatus = NDIS_GET_PACKET_STATUS(Packet); + } else { + /* SendPackets is called at DISPATCH_LEVEL for all serialized miniports */ + KeRaiseIrql(DISPATCH_LEVEL, &RaiseOldIrql); + { + NDIS_DbgPrint(MAX_TRACE, ("Calling miniport's SendPackets handler\n")); + (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.SendPacketsHandler)( + Adapter->NdisMiniportBlock.MiniportAdapterContext, &Packet, 1); + } + KeLowerIrql(RaiseOldIrql); + + NdisStatus = NDIS_GET_PACKET_STATUS(Packet); + if( NdisStatus == NDIS_STATUS_RESOURCES ) { + KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &SpinOldIrql); + MiniQueueWorkItem(Adapter, NdisWorkItemSend, Packet); + KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, SpinOldIrql); + NdisStatus = NDIS_STATUS_PENDING; + } + } + + return NdisStatus; + } else { + if(Adapter->NdisMiniportBlock.Flags & NDIS_ATTRIBUTE_DESERIALIZE) + { + NDIS_DbgPrint(MAX_TRACE, ("Calling miniport's Send handler\n")); + NdisStatus = (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.SendHandler)( + Adapter->NdisMiniportBlock.MiniportAdapterContext, Packet, 0); + NDIS_DbgPrint(MAX_TRACE, ("back from miniport's send handler\n")); + } else { + /* Send is called at DISPATCH_LEVEL for all serialized miniports */ + KeRaiseIrql(DISPATCH_LEVEL, &RaiseOldIrql); + NDIS_DbgPrint(MAX_TRACE, ("Calling miniport's Send handler\n")); + NdisStatus = (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.SendHandler)( + Adapter->NdisMiniportBlock.MiniportAdapterContext, Packet, 0); + NDIS_DbgPrint(MAX_TRACE, ("back from miniport's send handler\n")); + KeLowerIrql(RaiseOldIrql); + if( NdisStatus == NDIS_STATUS_RESOURCES ) { + KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &SpinOldIrql); + MiniQueueWorkItem(Adapter, NdisWorkItemSend, Packet); + KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, SpinOldIrql); + NdisStatus = NDIS_STATUS_PENDING; + } + } + + return NdisStatus; + } + } }

16 years, 2 months

[cgutman] 36593: - Code cleanup

by cgutman＠svn.reactos.org

Author: cgutman Date: Mon Sep 29 19:04:52 2008 New Revision: 36593 URL: http://svn.reactos.org/svn/reactos?rev=36593&view=rev Log: - Code cleanup Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Mon Sep 29 19:04:52 2008 @@ -1636,7 +1636,7 @@ NDIS_DbgPrint(MIN_TRACE, ("MiniportInitialize() failed for an adapter.\n")); ExInterlockedRemoveEntryList( &Adapter->ListEntry, &AdapterListLock ); if (NdisStatus == NDIS_STATUS_SUCCESS) NdisStatus = NDIS_STATUS_FAILURE; - return (NTSTATUS)NdisStatus; + return NdisStatus; } Adapter->NdisMiniportBlock.MediaType = MediaArray[SelectedMediumIndex]; @@ -1669,7 +1669,7 @@ return STATUS_UNSUCCESSFUL; } - if (!Success || NdisStatus != NDIS_STATUS_SUCCESS) + if (NdisStatus != NDIS_STATUS_SUCCESS) { NDIS_DbgPrint(MAX_TRACE, ("couldn't create filter (%x)\n", NdisStatus)); if (Adapter->LookaheadBuffer) @@ -1678,8 +1678,7 @@ Adapter->LookaheadBuffer = NULL; } ExInterlockedRemoveEntryList( &Adapter->ListEntry, &AdapterListLock ); - if (NdisStatus == NDIS_STATUS_SUCCESS) NdisStatus = NDIS_STATUS_FAILURE; - return (NTSTATUS)NdisStatus; + return NdisStatus; } /* Check for a hang every two seconds if it wasn't set in MiniportInitialize */

16 years, 2 months

[cgutman] 36592: - Fix a memory leak

by cgutman＠svn.reactos.org

Author: cgutman Date: Mon Sep 29 19:02:53 2008 New Revision: 36592 URL: http://svn.reactos.org/svn/reactos?rev=36592&view=rev Log: - Fix a memory leak Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/config.c Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/config.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/ndis/ndis/config.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/ndis/ndis/config.c [iso-8859-1] Mon Sep 29 19:02:53 2008 @@ -479,6 +479,15 @@ return; } + MiniportResource = ExAllocatePool(PagedPool, sizeof(MINIPORT_RESOURCE)); + if(!MiniportResource) + { + NDIS_DbgPrint(MIN_TRACE,("Insufficient resources.\n")); + ExFreePool(KeyInformation); + *Status = NDIS_STATUS_RESOURCES; + return; + } + switch(ParameterType) { case NdisParameterInteger: @@ -516,8 +525,15 @@ ExFreePool(*ParameterValue); *ParameterValue = NULL; *Status = NDIS_STATUS_FAILURE; - } else - *Status = NDIS_STATUS_SUCCESS; + return; + } + + MiniportResource->ResourceType = 0; + MiniportResource->Resource = *ParameterValue; + NDIS_DbgPrint(MID_TRACE,("inserting 0x%x into the resource list\n", MiniportResource->Resource)); + ExInterlockedInsertTailList(&ConfigurationContext->ResourceListHead, &MiniportResource->ListEntry, &ConfigurationContext->ResourceLock); + + *Status = NDIS_STATUS_SUCCESS; return; } @@ -556,18 +572,6 @@ return; } - MiniportResource = ExAllocatePool(PagedPool, sizeof(MINIPORT_RESOURCE)); - if(!MiniportResource) - { - NDIS_DbgPrint(MIN_TRACE,("Insufficient resources.\n")); - ExFreePool(RegData); - ExFreePool(KeyInformation); - ExFreePool(*ParameterValue); - *ParameterValue = NULL; - *Status = NDIS_STATUS_RESOURCES; - return; - } - MiniportResource->ResourceType = 0; MiniportResource->Resource = *ParameterValue; NDIS_DbgPrint(MID_TRACE,("inserting 0x%x into the resource list\n", MiniportResource->Resource)); @@ -601,17 +605,6 @@ { NDIS_DbgPrint(MIN_TRACE,("Insufficient resources.\n")); ExFreePool(KeyInformation); - *Status = NDIS_STATUS_RESOURCES; - return; - } - - MiniportResource = ExAllocatePool(PagedPool, sizeof(MINIPORT_RESOURCE)); - if(!MiniportResource) - { - NDIS_DbgPrint(MIN_TRACE,("Insufficient resources.\n")); - ExFreePool(KeyInformation); - ExFreePool(*ParameterValue); - *ParameterValue = NULL; *Status = NDIS_STATUS_RESOURCES; return; }

16 years, 2 months

[cgutman] 36591: - Use the proper flags so NDIS knows that our NIC doesn't have hardware loopback support - Fixes the loopback adapter

by cgutman＠svn.reactos.org

Author: cgutman Date: Mon Sep 29 18:57:32 2008 New Revision: 36591 URL: http://svn.reactos.org/svn/reactos?rev=36591&view=rev Log: - Use the proper flags so NDIS knows that our NIC doesn't have hardware loopback support - Fixes the loopback adapter Modified: branches/aicom-network-fixes/drivers/network/dd/pcnet/requests.c Modified: branches/aicom-network-fixes/drivers/network/dd/pcnet/requests.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/dd/pcnet/requests.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/dd/pcnet/requests.c [iso-8859-1] Mon Sep 29 18:57:32 2008 @@ -263,7 +263,8 @@ { GenericULONG = NDIS_MAC_OPTION_COPY_LOOKAHEAD_DATA | NDIS_MAC_OPTION_RECEIVE_SERIALIZED | - NDIS_MAC_OPTION_TRANSFERS_NOT_PEND; + NDIS_MAC_OPTION_TRANSFERS_NOT_PEND | + NDIS_MAC_OPTION_NO_LOOPBACK; break; }

16 years, 2 months

[sginsberg] 36590: - Fix the last ntgdi.h issue -- MS' ntgdi.h defines 2 NtGdiDoPalette argument types slightly wrong, so we must do so too. Add a note about this in the function as it is just a matter of cast

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Mon Sep 29 08:16:17 2008 New Revision: 36590 URL: http://svn.reactos.org/svn/reactos?rev=36590&view=rev Log: - Fix the last ntgdi.h issue -- MS' ntgdi.h defines 2 NtGdiDoPalette argument types slightly wrong, so we must do so too. Add a note about this in the function as it is just a matter of cast Modified: branches/nwin32/include/psdk/ntgdi.h branches/nwin32/subsystems/win32/win32k/ntgdi/gdipal.c Modified: branches/nwin32/include/psdk/ntgdi.h URL: http://svn.reactos.org/svn/reactos/branches/nwin32/include/psdk/ntgdi.h?rev… ============================================================================== --- branches/nwin32/include/psdk/ntgdi.h [iso-8859-1] (original) +++ branches/nwin32/include/psdk/ntgdi.h [iso-8859-1] Mon Sep 29 08:16:17 2008 @@ -385,10 +385,10 @@ LONG APIENTRY NtGdiDoPalette( - IN HGDIOBJ hObj, + IN HPALETTE hObj, IN WORD iStart, IN WORD cEntries, - IN LPVOID pEntries, + IN PALETTEENTRY* pEntries, IN DWORD iFunc, IN BOOL bInbound ); Modified: branches/nwin32/subsystems/win32/win32k/ntgdi/gdipal.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… ============================================================================== --- branches/nwin32/subsystems/win32/win32k/ntgdi/gdipal.c [iso-8859-1] (original) +++ branches/nwin32/subsystems/win32/win32k/ntgdi/gdipal.c [iso-8859-1] Mon Sep 29 08:16:17 2008 @@ -46,13 +46,17 @@ LONG APIENTRY -NtGdiDoPalette(IN HGDIOBJ hObj, +NtGdiDoPalette(IN HPALETTE hObj, IN WORD iStart, IN WORD cEntries, - IN LPVOID pEntries, + IN PALETTEENTRY* pEntries, IN DWORD iFunc, IN BOOL bInbound) { + /* + * NOTE: hObj is a DC handle (HDC) for GdiPalGetSystemEntries and GdiPalGet/SetColorTable + * pEntries is RGBQUAD* for GdiPalGet/SetColorTable + * We do this to keep compatibility with MS ntgdi.h */ UNIMPLEMENTED; return 0; }

16 years, 2 months

[sginsberg] 36589: - Sync Timo's float changes in winddi.h, ntgdityp.h and ntgdihdl.h to trunk - Make ntgdi.h more compatible with MS' version -- Define POLYPATBLT and the spooler routines internally, and don't define NtGdiFlushUserBatch outside win32k (not a system call since 2K3)

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Mon Sep 29 07:45:22 2008 New Revision: 36589 URL: http://svn.reactos.org/svn/reactos?rev=36589&view=rev Log: - Sync Timo's float changes in winddi.h, ntgdityp.h and ntgdihdl.h to trunk - Make ntgdi.h more compatible with MS' version -- Define POLYPATBLT and the spooler routines internally, and don't define NtGdiFlushUserBatch outside win32k (not a system call since 2K3) Modified: branches/nwin32/include/ddk/winddi.h branches/nwin32/include/psdk/ntgdi.h branches/nwin32/include/reactos/win32k/ntgdihdl.h branches/nwin32/include/reactos/win32k/ntgdityp.h Modified: branches/nwin32/include/ddk/winddi.h URL: http://svn.reactos.org/svn/reactos/branches/nwin32/include/ddk/winddi.h?rev… ============================================================================== --- branches/nwin32/include/ddk/winddi.h [iso-8859-1] (original) +++ branches/nwin32/include/ddk/winddi.h [iso-8859-1] Mon Sep 29 07:45:22 2008 @@ -2472,9 +2472,9 @@ #define FLOATOBJ_Equal(pf, pf1) (*(pf) == *(pf1)) #define FLOATOBJ_GreaterThan(pf, pf1) (*(pf) > *(pf1)) #define FLOATOBJ_LessThan(pf, pf1) (*(pf) < *(pf1)) -#define FLOATOBJ_EqualLong(pf, 1) (*(pf) == (FLOAT)(1)) -#define FLOATOBJ_GreaterThanLong(pf, 1) (*(pf) > (FLOAT)(1)) -#define FLOATOBJ_LessThanLong(pf, 1) (*(pf) < (FLOAT)(1)) +#define FLOATOBJ_EqualLong(pf, l) (*(pf) == (FLOAT)(l)) +#define FLOATOBJ_GreaterThanLong(pf, l) (*(pf) > (FLOAT)(l)) +#define FLOATOBJ_LessThanLong(pf, l) (*(pf) < (FLOAT)(l)) #endif Modified: branches/nwin32/include/psdk/ntgdi.h URL: http://svn.reactos.org/svn/reactos/branches/nwin32/include/psdk/ntgdi.h?rev… ============================================================================== --- branches/nwin32/include/psdk/ntgdi.h [iso-8859-1] (original) +++ branches/nwin32/include/psdk/ntgdi.h [iso-8859-1] Mon Sep 29 07:45:22 2008 @@ -61,14 +61,7 @@ DWORD dwFlags; } LOGCOLORSPACEEXW, *PLOGCOLORSPACEEXW; -typedef struct _POLYPATBLT -{ - INT nXLeft; - INT nYLeft; - INT nWidth; - INT nHeight; - HBRUSH hBrush; -} POLYPATBLT, *PPOLYPATBLT; +typedef struct _POLYPATBLT POLYPATBLT, *PPOLYPATBLT; /* NtGdiAddRemoteMMInstanceToDC */ typedef struct tagDOWNLOADDESIGNVECTOR @@ -1703,11 +1696,6 @@ ); W32KAPI -NTSTATUS -APIENTRY -NtGdiFlushUserBatch(VOID); - -W32KAPI HRGN APIENTRY NtGdiPathToRegion( @@ -3656,17 +3644,4 @@ IN HANDLE h ); -W32KAPI -BOOL -APIENTRY -NtGdiInitSpool(); - -/* FIXME wrong prototypes fix the build */ -W32KAPI -INT -APIENTRY -NtGdiGetSpoolMessage( DWORD u1, - DWORD u2, - DWORD u3, - DWORD u4); #endif Modified: branches/nwin32/include/reactos/win32k/ntgdihdl.h URL: http://svn.reactos.org/svn/reactos/branches/nwin32/include/reactos/win32k/n… ============================================================================== --- branches/nwin32/include/reactos/win32k/ntgdihdl.h [iso-8859-1] (original) +++ branches/nwin32/include/reactos/win32k/ntgdihdl.h [iso-8859-1] Mon Sep 29 07:45:22 2008 @@ -290,13 +290,13 @@ LONG lBreakExtra; LONG cBreak; HANDLE hlfntNew; - MATRIX_S mxWorldToDevice; - MATRIX_S mxDeviceToWorld; - MATRIX_S mxWorldToPage; - EFLOAT_S efM11PtoD; - EFLOAT_S efM22PtoD; - EFLOAT_S efDxPtoD; - EFLOAT_S efDyPtoD; + MATRIX mxWorldToDevice; + MATRIX mxDeviceToWorld; + MATRIX mxWorldToPage; + FLOATOBJ efM11PtoD; + FLOATOBJ efM22PtoD; + FLOATOBJ efDxPtoD; + FLOATOBJ efDyPtoD; INT iMapMode; DWORD dwLayout; LONG lWindowOrgx; Modified: branches/nwin32/include/reactos/win32k/ntgdityp.h URL: http://svn.reactos.org/svn/reactos/branches/nwin32/include/reactos/win32k/n… ============================================================================== --- branches/nwin32/include/reactos/win32k/ntgdityp.h [iso-8859-1] (original) +++ branches/nwin32/include/reactos/win32k/ntgdityp.h [iso-8859-1] Mon Sep 29 07:45:22 2008 @@ -101,6 +101,9 @@ enum { MX_SCALE = 1, + MX_IDENTITYSCALE = 2, + MX_INTEGER = 4, + MX_NOTRANSLATE = 8, }; typedef enum GDIObjType @@ -174,6 +177,27 @@ /* DEFINES *******************************************************************/ +/* Routines missing in ntgdi.h */ +#ifndef W32KAPI +#define W32KAPI DECLSPEC_ADDRSAFE +#endif + +W32KAPI +BOOL +APIENTRY +NtGdiInitSpool( + VOID +); + +/* FIXME: prototypes */ +W32KAPI +INT +APIENTRY +NtGdiGetSpoolMessage(DWORD u1, + DWORD u2, + DWORD u3, + DWORD u4); + #define GDIBATCHBUFSIZE 0x136*4 #define GDI_BATCH_LIMIT 20 @@ -355,6 +379,19 @@ FIX fxDy; FLONG flAccel; } MATRIX_S; + +typedef struct _MATRIX +{ + FLOATOBJ efM11; + FLOATOBJ efM12; + FLOATOBJ efM21; + FLOATOBJ efM22; + FLOATOBJ efDx; + FLOATOBJ efDy; + FIX fxDx; + FIX fxDy; + FLONG flAccel; +} MATRIX, *PMATRIX; /* Gdi XForm storage union */ typedef union

16 years, 2 months

[sginsberg] 36588: - Add missing PsGetThreadTeb

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Mon Sep 29 07:05:59 2008 New Revision: 36588 URL: http://svn.reactos.org/svn/reactos?rev=36588&view=rev Log: - Add missing PsGetThreadTeb Modified: branches/nwin32/include/ndk/psfuncs.h Modified: branches/nwin32/include/ndk/psfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/nwin32/include/ndk/psfuncs.h?re… ============================================================================== --- branches/nwin32/include/ndk/psfuncs.h [iso-8859-1] (original) +++ branches/nwin32/include/ndk/psfuncs.h [iso-8859-1] Mon Sep 29 07:05:59 2008 @@ -76,6 +76,13 @@ NTAPI PsGetThreadWin32Thread( PETHREAD Thread +); + +NTKERNELAPI +PTEB +NTAPI +PsGetThreadTeb( + IN PETHREAD Thread ); NTKERNELAPI

16 years, 2 months

[fireball] 36587: - Commit the whole mapped BIOS/device registers block, not only the first 2 pages (why so, David?). - Use Zw instead of Nt.

by fireball＠svn.reactos.org

Author: fireball Date: Mon Sep 29 04:11:55 2008 New Revision: 36587 URL: http://svn.reactos.org/svn/reactos?rev=36587&view=rev Log: - Commit the whole mapped BIOS/device registers block, not only the first 2 pages (why so, David?). - Use Zw instead of Nt. Modified: trunk/reactos/subsystems/win32/csrss/video.c Modified: trunk/reactos/subsystems/win32/csrss/video.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/vid… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/video.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/video.c [iso-8859-1] Mon Sep 29 04:11:55 2008 @@ -46,11 +46,11 @@ Offset.QuadPart = 0xa0000; ViewSize = 0x100000 - 0xa0000; BaseAddress = (PVOID)0xa0000; - Status = NtMapViewOfSection(PhysMemHandle, + Status = ZwMapViewOfSection(PhysMemHandle, NtCurrentProcess(), &BaseAddress, 0, - 8192, + ViewSize, &Offset, &ViewSize, ViewUnmap, @@ -59,12 +59,12 @@ if (!NT_SUCCESS(Status)) { DPRINT1("Couldn't map physical memory (%x)\n", Status); - NtClose(PhysMemHandle); + ZwClose(PhysMemHandle); return 0; } /* Close physical memory section handle */ - NtClose(PhysMemHandle); + ZwClose(PhysMemHandle); if (BaseAddress != (PVOID)0xa0000) { @@ -73,8 +73,8 @@ return 0; } - /* Map some memory to use for the non-BIOS parts of - * the v86 mode address space + /* Allocate some low memory to use for the non-BIOS + * parts of the v86 mode address space */ BaseAddress = (PVOID)0x1; ViewSize = 0xa0000 - 0x1000;

16 years, 2 months

[hyperion] 36586: modified dll/win32/kernel32/kernel32.def modified dll/win32/kernel32/kernel32.rbuild added dll/win32/kernel32/misc/icustubs.cpp Export NormalizeString and IsStringNormalized from kernel32.dll. This (finally) makes normaliz.dll (50%) functional. Link kernel32.dll to ICU. Finally. Binary size increased by about 300 KB on a debug build (this is only the beginning). Umpteenth copy of C++ and Win32 stubs required to get ICU to link properly added to kernel32.dll. This commit dedicat

by hyperion＠svn.reactos.org

Author: hyperion Date: Sun Sep 28 17:39:45 2008 New Revision: 36586 URL: http://svn.reactos.org/svn/reactos?rev=36586&view=rev Log: modified dll/win32/kernel32/kernel32.def modified dll/win32/kernel32/kernel32.rbuild added dll/win32/kernel32/misc/icustubs.cpp Export NormalizeString and IsStringNormalized from kernel32.dll. This (finally) makes normaliz.dll (50%) functional. Link kernel32.dll to ICU. Finally. Binary size increased by about 300 KB on a debug build (this is only the beginning). Umpteenth copy of C++ and Win32 stubs required to get ICU to link properly added to kernel32.dll. This commit dedicated to Timo Kreuzer. <3. Added: trunk/reactos/dll/win32/kernel32/misc/icustubs.cpp (with props) Modified: trunk/reactos/dll/win32/kernel32/kernel32.def trunk/reactos/dll/win32/kernel32/kernel32.rbuild Modified: trunk/reactos/dll/win32/kernel32/kernel32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.def [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.def [iso-8859-1] Sun Sep 28 17:39:45 2008 @@ -1044,3 +1044,10 @@ lstrlen@4=lstrlenA@4 lstrlenA@4 lstrlenW@4 + +; TODO: these require the data file +;IdnToAscii@20 +;IdnToNameprepUnicode@20 +;IdnToUnicode@20 +IsNormalizedString@12 +NormalizeString@20 Modified: trunk/reactos/dll/win32/kernel32/kernel32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.rbuild [iso-8859-1] Sun Sep 28 17:39:45 2008 @@ -110,6 +110,7 @@ <file>lcformat.c</file> <file>profile.c</file> <file>utils.c</file> + <file>icustubs.cpp</file> </directory> <directory name="thread"> <if property="ARCH" value="i386"> @@ -130,7 +131,12 @@ <library>kernel32_base</library> <library>wine</library> <library>pseh</library> + + <file>kernel32.rc</file> + + <library>normalize</library> + <library>icu4ros</library> + <library>ntdll</library> - <file>kernel32.rc</file> </module> </group> Added: trunk/reactos/dll/win32/kernel32/misc/icustubs.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/ic… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/icustubs.cpp (added) +++ trunk/reactos/dll/win32/kernel32/misc/icustubs.cpp [iso-8859-1] Sun Sep 28 17:39:45 2008 @@ -1,0 +1,82 @@ +/* + * Copyright (c) 2008, KJK::Hyperion + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * - Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * - Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * - Neither the name of the ReactOS Foundation nor the names of its + * contributors may be used to endorse or promote products derived from this + * software without specific prior written permission. + + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + */ + +// FIXME: move stubs elsewhere + +#include <k32.h> +#include <stdlib.h> + +#include <ndk/rtlfuncs.h> + +extern "C" +{ +void WINAPI EnterCriticalSection(PCRITICAL_SECTION p) { RtlEnterCriticalSection((PRTL_CRITICAL_SECTION)p); } +void WINAPI LeaveCriticalSection(PCRITICAL_SECTION p) { RtlLeaveCriticalSection((PRTL_CRITICAL_SECTION)p); } +void WINAPI DeleteCriticalSection(PCRITICAL_SECTION p) { RtlDeleteCriticalSection((PRTL_CRITICAL_SECTION)p); } + +void free(void * memory) +{ + RtlFreeHeap(GetProcessHeap(), 0, memory); +} + +void * malloc(size_t size) +{ + return RtlAllocateHeap(GetProcessHeap(), 0, size); +} + +void * realloc(void * memory, size_t size) +{ + return RtlReAllocateHeap(GetProcessHeap(), 0, memory, size); +} + +int __cdecl _purecall() +{ + FatalAppExitW(0, L"pure virtual call"); + FatalExit(0); + return 0; +} + +__attribute__((alias("_purecall"))) void __cxa_pure_virtual(void); + +void _assert() +{ + FatalAppExitW(0, L"assertion failed"); + FatalExit(0); +} +} + +void operator delete(void * memory) +{ + free(memory); +} + +// EOF Propchange: trunk/reactos/dll/win32/kernel32/misc/icustubs.cpp ------------------------------------------------------------------------------ svn:eol-style = native

16 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2008