Ros-diffs November 2008

ros-diffs@reactos.org

28 participants
657 discussions

[cgutman] 37713: - Merge aicom-network-fixes up to r37712

by cgutman＠svn.reactos.org

Author: cgutman Date: Fri Nov 28 19:51:19 2008 New Revision: 37713 URL: http://svn.reactos.org/svn/reactos?rev=37713&view=rev Log: - Merge aicom-network-fixes up to r37712 Modified: trunk/reactos/drivers/network/ndis/include/miniport.h trunk/reactos/drivers/network/ndis/ndis/miniport.c trunk/reactos/drivers/network/ndis/ndis/protocol.c trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c Modified: trunk/reactos/drivers/network/ndis/include/miniport.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/inclu… ============================================================================== --- trunk/reactos/drivers/network/ndis/include/miniport.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/include/miniport.h [iso-8859-1] Fri Nov 28 19:51:19 2008 @@ -173,6 +173,11 @@ IN PNDIS_PACKET Packet, IN NDIS_STATUS Status); +BOOLEAN +MiniIsBusy( + PLOGICAL_ADAPTER Adapter, + NDIS_WORK_ITEM_TYPE Type); + #endif /* __MINIPORT_H */ /* EOF */ 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] Fri Nov 28 19:51:19 2008 @@ -134,6 +134,55 @@ #endif /* DBG */ } +PNDIS_MINIPORT_WORK_ITEM +MiniGetFirstWorkItem( + PLOGICAL_ADAPTER Adapter, + NDIS_WORK_ITEM_TYPE Type) +{ + PNDIS_MINIPORT_WORK_ITEM CurrentEntry = Adapter->WorkQueueHead; + + while (CurrentEntry) + { + if (CurrentEntry->WorkItemType == Type) + return CurrentEntry; + + CurrentEntry = (PNDIS_MINIPORT_WORK_ITEM)CurrentEntry->Link.Next; + } + + return NULL; +} + +BOOLEAN +MiniIsBusy( + PLOGICAL_ADAPTER Adapter, + NDIS_WORK_ITEM_TYPE Type) +{ + BOOLEAN Busy = FALSE; + KIRQL OldIrql; + + KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); + + if (Type == NdisWorkItemRequest && + (Adapter->NdisMiniportBlock.PendingRequest || MiniGetFirstWorkItem(Adapter, NdisWorkItemRequest))) + { + Busy = TRUE; + } + else if (Type == NdisWorkItemSend && + (Adapter->NdisMiniportBlock.FirstPendingPacket || MiniGetFirstWorkItem(Adapter, NdisWorkItemSend))) + { + Busy = TRUE; + } + else if (Type == NdisWorkItemResetRequested && + (Adapter->NdisMiniportBlock.ResetStatus == NDIS_STATUS_PENDING || MiniGetFirstWorkItem(Adapter, NdisWorkItemResetRequested))) + { + Busy = TRUE; + } + + KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); + + return Busy; +} + VOID MiniIndicateData( @@ -274,6 +323,8 @@ KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); + Adapter->NdisMiniportBlock.ResetStatus = Status; + CurrentEntry = Adapter->ProtocolListHead.Flink; while (CurrentEntry != &Adapter->ProtocolListHead) @@ -298,12 +349,18 @@ IN PNDIS_REQUEST Request, IN NDIS_STATUS Status) { + PLOGICAL_ADAPTER Adapter = (PLOGICAL_ADAPTER)MiniportAdapterHandle; PNDIS_REQUEST_MAC_BLOCK MacBlock = (PNDIS_REQUEST_MAC_BLOCK)Request->MacReserved; KIRQL OldIrql; NDIS_DbgPrint(DEBUG_MINIPORT, ("Called.\n")); KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); + + KeAcquireSpinLockAtDpcLevel(&Adapter->NdisMiniportBlock.Lock); + Adapter->NdisMiniportBlock.PendingRequest = NULL; + KeReleaseSpinLockFromDpcLevel(&Adapter->NdisMiniportBlock.Lock); + if( MacBlock->Binding->RequestCompleteHandler ) { (*MacBlock->Binding->RequestCompleteHandler)( MacBlock->Binding->ProtocolBindingContext, @@ -601,6 +658,11 @@ NDIS_STATUS Status; KIRQL OldIrql; + if (MiniIsBusy(Adapter, NdisWorkItemResetRequested)) { + MiniQueueWorkItem(Adapter, NdisWorkItemResetRequested, NULL, FALSE); + return NDIS_STATUS_PENDING; + } + NdisMIndicateStatus(Adapter, NDIS_STATUS_RESET_START, NULL, 0); NdisMIndicateStatusComplete(Adapter); @@ -608,6 +670,11 @@ Status = (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.ResetHandler)( Adapter->NdisMiniportBlock.MiniportAdapterContext, AddressingReset); + + KeAcquireSpinLockAtDpcLevel(&Adapter->NdisMiniportBlock.Lock); + Adapter->NdisMiniportBlock.ResetStatus = Status; + KeReleaseSpinLockFromDpcLevel(&Adapter->NdisMiniportBlock.Lock); + KeLowerIrql(OldIrql); if (Status != NDIS_STATUS_PENDING) { @@ -668,6 +735,7 @@ { if (WorkItemType == NdisWorkItemSend) { + NDIS_DbgPrint(MIN_TRACE, ("Requeuing failed packet (%x).\n", WorkItemContext)); Adapter->NdisMiniportBlock.FirstPendingPacket = WorkItemContext; } else @@ -786,6 +854,11 @@ NDIS_DbgPrint(DEBUG_MINIPORT, ("Called.\n")); KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); + + KeAcquireSpinLockAtDpcLevel(&Adapter->NdisMiniportBlock.Lock); + Adapter->NdisMiniportBlock.PendingRequest = NdisRequest; + KeReleaseSpinLockFromDpcLevel(&Adapter->NdisMiniportBlock.Lock); + switch (NdisRequest->RequestType) { case NdisRequestQueryInformation: @@ -810,6 +883,12 @@ default: Status = NDIS_STATUS_FAILURE; + } + + if (Status != NDIS_STATUS_PENDING) { + KeAcquireSpinLockAtDpcLevel(&Adapter->NdisMiniportBlock.Lock); + Adapter->NdisMiniportBlock.PendingRequest = NULL; + KeReleaseSpinLockFromDpcLevel(&Adapter->NdisMiniportBlock.Lock); } KeLowerIrql(OldIrql); @@ -968,12 +1047,18 @@ NdisStatus = (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.ResetHandler)( Adapter->NdisMiniportBlock.MiniportAdapterContext, &AddressingReset); + + if (NdisStatus == NDIS_STATUS_PENDING) + { + KeAcquireSpinLockAtDpcLevel(&Adapter->NdisMiniportBlock.Lock); + Adapter->NdisMiniportBlock.ResetStatus = NDIS_STATUS_PENDING; + KeReleaseSpinLockFromDpcLevel(&Adapter->NdisMiniportBlock.Lock); + } + KeLowerIrql(OldIrql); - if (NdisStatus == NDIS_STATUS_PENDING) - break; - - MiniResetComplete(Adapter, NdisStatus, AddressingReset); + if (NdisStatus != NDIS_STATUS_PENDING) + MiniResetComplete(Adapter, NdisStatus, AddressingReset); break; case NdisWorkItemResetInProgress: @@ -1002,6 +1087,7 @@ default: NDIS_DbgPrint(MIN_TRACE, ("Unknown NDIS request type.\n")); + MiniRequestComplete( (NDIS_HANDLE)Adapter, (PNDIS_REQUEST)WorkItemContext, NdisStatus ); break; } break; 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] Fri Nov 28 19:51:19 2008 @@ -140,6 +140,11 @@ MiniQueueWorkItem(Adapter, NdisWorkItemRequest, NdisRequest, FALSE); return NDIS_STATUS_PENDING; #else + if (MiniIsBusy(Adapter, NdisWorkItemRequest)) { + MiniQueueWorkItem(Adapter, NdisWorkItemRequest, NdisRequest, FALSE); + return NDIS_STATUS_PENDING; + } + return MiniDoRequest(Adapter, NdisRequest); #endif } @@ -164,7 +169,7 @@ KIRQL RaiseOldIrql; NDIS_STATUS NdisStatus; - if(Adapter->NdisMiniportBlock.FirstPendingPacket) { + if(MiniIsBusy(Adapter, NdisWorkItemSend)) { MiniQueueWorkItem(Adapter, NdisWorkItemSend, Packet, FALSE); return NDIS_STATUS_PENDING; } Modified: trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] Fri Nov 28 19:51:19 2008 @@ -27,12 +27,17 @@ */ { KIRQL OldIrql; + PIO_STACK_LOCATION IrpSp; + PTRANSPORT_CONTEXT TransContext; TI_DbgPrint(DEBUG_IRP, ("Called.\n")); + IrpSp = IoGetCurrentIrpStackLocation(Irp); + TransContext = (PTRANSPORT_CONTEXT)IrpSp->FileObject->FsContext; + IoAcquireCancelSpinLock(&OldIrql); - if (!Irp->Cancel) { + if (!Irp->Cancel && !TransContext->CancelIrps) { (void)IoSetCancelRoutine(Irp, CancelRoutine); IoReleaseCancelSpinLock(OldIrql);

16 years

[cgutman] 37712: - Fix queuing request and reset work items - Fix a problem that could result in packets being sent in the wrong order

by cgutman＠svn.reactos.org

Author: cgutman Date: Fri Nov 28 18:06:25 2008 New Revision: 37712 URL: http://svn.reactos.org/svn/reactos?rev=37712&view=rev Log: - Fix queuing request and reset work items - Fix a problem that could result in packets being sent in the wrong order Modified: branches/aicom-network-fixes/drivers/network/ndis/include/miniport.h branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c branches/aicom-network-fixes/drivers/network/ndis/ndis/protocol.c Modified: branches/aicom-network-fixes/drivers/network/ndis/include/miniport.h URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/ndis/include/miniport.h [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/ndis/include/miniport.h [iso-8859-1] Fri Nov 28 18:06:25 2008 @@ -169,6 +169,11 @@ IN PNDIS_PACKET Packet, IN NDIS_STATUS Status); +BOOLEAN +MiniIsBusy( + PLOGICAL_ADAPTER Adapter, + NDIS_WORK_ITEM_TYPE Type); + #endif /* __MINIPORT_H */ /* EOF */ 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] Fri Nov 28 18:06:25 2008 @@ -134,6 +134,55 @@ #endif /* DBG */ } +PNDIS_MINIPORT_WORK_ITEM +MiniGetFirstWorkItem( + PLOGICAL_ADAPTER Adapter, + NDIS_WORK_ITEM_TYPE Type) +{ + PNDIS_MINIPORT_WORK_ITEM CurrentEntry = Adapter->WorkQueueHead; + + while (CurrentEntry) + { + if (CurrentEntry->WorkItemType == Type) + return CurrentEntry; + + CurrentEntry = (PNDIS_MINIPORT_WORK_ITEM)CurrentEntry->Link.Next; + } + + return NULL; +} + +BOOLEAN +MiniIsBusy( + PLOGICAL_ADAPTER Adapter, + NDIS_WORK_ITEM_TYPE Type) +{ + BOOLEAN Busy = FALSE; + KIRQL OldIrql; + + KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); + + if (Type == NdisWorkItemRequest && + (Adapter->NdisMiniportBlock.PendingRequest || MiniGetFirstWorkItem(Adapter, NdisWorkItemRequest))) + { + Busy = TRUE; + } + else if (Type == NdisWorkItemSend && + (Adapter->NdisMiniportBlock.FirstPendingPacket || MiniGetFirstWorkItem(Adapter, NdisWorkItemSend))) + { + Busy = TRUE; + } + else if (Type == NdisWorkItemResetRequested && + (Adapter->NdisMiniportBlock.ResetStatus == NDIS_STATUS_PENDING || MiniGetFirstWorkItem(Adapter, NdisWorkItemResetRequested))) + { + Busy = TRUE; + } + + KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); + + return Busy; +} + VOID MiniIndicateData( @@ -274,6 +323,8 @@ KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); + Adapter->NdisMiniportBlock.ResetStatus = Status; + CurrentEntry = Adapter->ProtocolListHead.Flink; while (CurrentEntry != &Adapter->ProtocolListHead) @@ -298,12 +349,18 @@ IN PNDIS_REQUEST Request, IN NDIS_STATUS Status) { + PLOGICAL_ADAPTER Adapter = (PLOGICAL_ADAPTER)MiniportAdapterHandle; PNDIS_REQUEST_MAC_BLOCK MacBlock = (PNDIS_REQUEST_MAC_BLOCK)Request->MacReserved; KIRQL OldIrql; NDIS_DbgPrint(DEBUG_MINIPORT, ("Called.\n")); KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); + + KeAcquireSpinLockAtDpcLevel(&Adapter->NdisMiniportBlock.Lock); + Adapter->NdisMiniportBlock.PendingRequest = NULL; + KeReleaseSpinLockFromDpcLevel(&Adapter->NdisMiniportBlock.Lock); + if( MacBlock->Binding->RequestCompleteHandler ) { (*MacBlock->Binding->RequestCompleteHandler)( MacBlock->Binding->ProtocolBindingContext, @@ -601,6 +658,11 @@ NDIS_STATUS Status; KIRQL OldIrql; + if (MiniIsBusy(Adapter, NdisWorkItemResetRequested)) { + MiniQueueWorkItem(Adapter, NdisWorkItemResetRequested, NULL, FALSE); + return NDIS_STATUS_PENDING; + } + NdisMIndicateStatus(Adapter, NDIS_STATUS_RESET_START, NULL, 0); NdisMIndicateStatusComplete(Adapter); @@ -608,6 +670,11 @@ Status = (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.ResetHandler)( Adapter->NdisMiniportBlock.MiniportAdapterContext, AddressingReset); + + KeAcquireSpinLockAtDpcLevel(&Adapter->NdisMiniportBlock.Lock); + Adapter->NdisMiniportBlock.ResetStatus = Status; + KeReleaseSpinLockFromDpcLevel(&Adapter->NdisMiniportBlock.Lock); + KeLowerIrql(OldIrql); if (Status != NDIS_STATUS_PENDING) { @@ -668,6 +735,7 @@ { if (WorkItemType == NdisWorkItemSend) { + NDIS_DbgPrint(MIN_TRACE, ("Requeuing failed packet (%x).\n", WorkItemContext)); Adapter->NdisMiniportBlock.FirstPendingPacket = WorkItemContext; } else @@ -786,6 +854,11 @@ NDIS_DbgPrint(DEBUG_MINIPORT, ("Called.\n")); KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); + + KeAcquireSpinLockAtDpcLevel(&Adapter->NdisMiniportBlock.Lock); + Adapter->NdisMiniportBlock.PendingRequest = NdisRequest; + KeReleaseSpinLockFromDpcLevel(&Adapter->NdisMiniportBlock.Lock); + switch (NdisRequest->RequestType) { case NdisRequestQueryInformation: @@ -810,6 +883,12 @@ default: Status = NDIS_STATUS_FAILURE; + } + + if (Status != NDIS_STATUS_PENDING) { + KeAcquireSpinLockAtDpcLevel(&Adapter->NdisMiniportBlock.Lock); + Adapter->NdisMiniportBlock.PendingRequest = NULL; + KeReleaseSpinLockFromDpcLevel(&Adapter->NdisMiniportBlock.Lock); } KeLowerIrql(OldIrql); @@ -968,12 +1047,18 @@ NdisStatus = (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.ResetHandler)( Adapter->NdisMiniportBlock.MiniportAdapterContext, &AddressingReset); + + if (NdisStatus == NDIS_STATUS_PENDING) + { + KeAcquireSpinLockAtDpcLevel(&Adapter->NdisMiniportBlock.Lock); + Adapter->NdisMiniportBlock.ResetStatus = NDIS_STATUS_PENDING; + KeReleaseSpinLockFromDpcLevel(&Adapter->NdisMiniportBlock.Lock); + } + KeLowerIrql(OldIrql); - if (NdisStatus == NDIS_STATUS_PENDING) - break; - - MiniResetComplete(Adapter, NdisStatus, AddressingReset); + if (NdisStatus != NDIS_STATUS_PENDING) + MiniResetComplete(Adapter, NdisStatus, AddressingReset); break; case NdisWorkItemResetInProgress: @@ -1002,6 +1087,7 @@ default: NDIS_DbgPrint(MIN_TRACE, ("Unknown NDIS request type.\n")); + MiniRequestComplete( (NDIS_HANDLE)Adapter, (PNDIS_REQUEST)WorkItemContext, NdisStatus ); break; } break; 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] Fri Nov 28 18:06:25 2008 @@ -140,6 +140,11 @@ MiniQueueWorkItem(Adapter, NdisWorkItemRequest, NdisRequest, FALSE); return NDIS_STATUS_PENDING; #else + if (MiniIsBusy(Adapter, NdisWorkItemRequest)) { + MiniQueueWorkItem(Adapter, NdisWorkItemRequest, NdisRequest, FALSE); + return NDIS_STATUS_PENDING; + } + return MiniDoRequest(Adapter, NdisRequest); #endif } @@ -164,7 +169,7 @@ KIRQL RaiseOldIrql; NDIS_STATUS NdisStatus; - if(Adapter->NdisMiniportBlock.FirstPendingPacket) { + if(MiniIsBusy(Adapter, NdisWorkItemSend)) { MiniQueueWorkItem(Adapter, NdisWorkItemSend, Packet, FALSE); return NDIS_STATUS_PENDING; }

16 years

[sginsberg] 37711: - Don't add an include path for internal win32k headers as dxg doesn't include them anymore

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Fri Nov 28 14:26:25 2008 New Revision: 37711 URL: http://svn.reactos.org/svn/reactos?rev=37711&view=rev Log: - Don't add an include path for internal win32k headers as dxg doesn't include them anymore Modified: trunk/reactos/drivers/directx/dxg/dxg.rbuild Modified: trunk/reactos/drivers/directx/dxg/dxg.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/directx/dxg/dxg.rb… ============================================================================== --- trunk/reactos/drivers/directx/dxg/dxg.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/directx/dxg/dxg.rbuild [iso-8859-1] Fri Nov 28 14:26:25 2008 @@ -4,7 +4,6 @@ <importlibrary definition="dxg.spec" /> <include base="dxg">.</include> <include base="dxg">include</include> - <include base="ReactOS">subsystems/win32/win32k/include</include> <library>dxgthk</library> <library>ntoskrnl</library> <file>main.c</file>

16 years

[sginsberg] 37710: - Add a header guard for pnp.idl's RESOURCEID, and add an internal define for setupapi as it uses incompatible Wine headers

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Fri Nov 28 14:24:36 2008 New Revision: 37710 URL: http://svn.reactos.org/svn/reactos?rev=37710&view=rev Log: - Add a header guard for pnp.idl's RESOURCEID, and add an internal define for setupapi as it uses incompatible Wine headers Modified: trunk/reactos/dll/win32/setupapi/setupapi_private.h trunk/reactos/include/reactos/idl/pnp.idl Modified: trunk/reactos/dll/win32/setupapi/setupapi_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/setupapi_private.h [iso-8859-1] Fri Nov 28 14:24:36 2008 @@ -43,6 +43,11 @@ #include <ndk/ntndk.h> #include <pseh/pseh.h> + +/* This hack definition is necessary as long as setupapi + depends on Wine "compatibility" headers */ +typedef ULONG RESOURCEID; +typedef RESOURCEID *PRESOURCEID; #include <pnp_c.h> #include "rpc_private.h" Modified: trunk/reactos/include/reactos/idl/pnp.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/pnp.id… ============================================================================== --- trunk/reactos/include/reactos/idl/pnp.idl [iso-8859-1] (original) +++ trunk/reactos/include/reactos/idl/pnp.idl [iso-8859-1] Fri Nov 28 14:24:36 2008 @@ -14,7 +14,9 @@ const unsigned long PNP_MAX_PROP_COUNT = 32767; const unsigned long PNP_MAX_BUFFER_SIZE = 16000000; +cpp_quote("#ifndef _CFGMGR32_H_") typedef unsigned long RESOURCEID; +cpp_quote("#endif") typedef unsigned long DEVPROPTYPE; typedef [range(0, PNP_MAX_PROP_SIZE)] unsigned long PNP_PROP_SIZE, *PPNP_PROP_SIZE; typedef [range(0, PNP_MAX_PROP_COUNT)] unsigned long PNP_PROP_COUNT, *PPNP_PROP_COUNT;

16 years

[sginsberg] 37709: - Use stdarg.h from psdk so we don't get redefinition conflicts

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Fri Nov 28 14:18:13 2008 New Revision: 37709 URL: http://svn.reactos.org/svn/reactos?rev=37709&view=rev Log: - Use stdarg.h from psdk so we don't get redefinition conflicts Modified: trunk/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/machine/stdarg.h Modified: trunk/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/machine/stdarg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/inclu… ============================================================================== --- trunk/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/machine/stdarg.h [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/machine/stdarg.h [iso-8859-1] Fri Nov 28 14:18:13 2008 @@ -36,34 +36,7 @@ #ifndef _STDARG_H_ #define _STDARG_H_ -#ifdef _MSC_VER +/* Use psdk */ #include <stdarg.h> -#else - -typedef char *va_list; - -#ifdef __GNUC__ -#define va_start(AP, LASTARG) \ - (AP = ((va_list) __builtin_next_arg (LASTARG))) -#else -#define __va_promote(type) \ - (((sizeof(type) + sizeof(int) - 1) / sizeof(int)) * sizeof(int)) - -#define va_start(ap, last) \ - (ap = ((va_list)&(last) + __va_promote(last))) -#endif - -#ifdef KERNEL -#define va_arg(ap, type) \ - ((type *)(ap += sizeof(type)))[-1] -#else -#define va_arg(ap, type) \ - ((type *)(ap += sizeof(type) < sizeof(int) ? \ - (abort(), 0) : sizeof(type)))[-1] -#endif - -#define va_end(ap) - -#endif #endif /* !_STDARG_H_ */

16 years

[khornicek] 37708: - fix some checks - add stub traces - avoid being "Naughty Application!"

by khornicek＠svn.reactos.org

Author: khornicek Date: Fri Nov 28 12:56:24 2008 New Revision: 37708 URL: http://svn.reactos.org/svn/reactos?rev=37708&view=rev Log: - fix some checks - add stub traces - avoid being "Naughty Application!" Modified: branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c Modified: branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/win32/gdi32/… ============================================================================== --- branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c [iso-8859-1] (original) +++ branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c [iso-8859-1] Fri Nov 28 12:56:24 2008 @@ -16,6 +16,7 @@ #include <ddrawgdi.h> #include <ntgdi.h> #include <d3dhal.h> +#include <debug.h> /* For opengl support */ @@ -79,6 +80,8 @@ ULONG gcDirectDraw; #define GetDdHandle(Handle) ((HANDLE)Handle ? (HANDLE)Handle : ghDirectDraw) +#define HEL_OGL_STUB DPRINT1("HEL OGL STUB: %s\n", __FUNCTION__);\ + return 0 @@ -95,7 +98,7 @@ { /* Fixme for opengl hel emulations */ - return 0; + HEL_OGL_STUB; /* Call win32k */ #if 0 return NtGdiDdAddAttachedSurface((HANDLE)Attach->lpDDSurface->hDDSurface, @@ -116,7 +119,7 @@ /* Fixme for opengl hel emulations */ - return 0; + HEL_OGL_STUB; #if 0 HANDLE Surface = 0; @@ -142,7 +145,7 @@ DdDestroySurface(LPDDHAL_DESTROYSURFACEDATA pDestroySurface) { /* Fixme for opengl hel emulations */ - return 0; + HEL_OGL_STUB; #if 0 DWORD Return = DDHAL_DRIVER_NOTHANDLED; @@ -173,7 +176,7 @@ { /* Fixme for opengl hel emulations */ - return 0; + HEL_OGL_STUB; #if 0 /* Note : @@ -215,7 +218,7 @@ DdLock(LPDDHAL_LOCKDATA Lock) { /* Fixme for opengl hel emulations */ - return 0; + HEL_OGL_STUB; #if 0 /* Call win32k */ return NtGdiDdLock((HANDLE)Lock->lpDDSurface->hDDSurface, @@ -248,7 +251,7 @@ DdGetBltStatus(LPDDHAL_GETBLTSTATUSDATA GetBltStatus) { /* Fixme for opengl hel emulations */ - return 0; + HEL_OGL_STUB; #if 0 /* Call win32k */ @@ -267,7 +270,7 @@ DdGetFlipStatus(LPDDHAL_GETFLIPSTATUSDATA GetFlipStatus) { /* Fixme for opengl hel emulations */ - return 0; + HEL_OGL_STUB; #if 0 /* Call win32k */ @@ -287,7 +290,7 @@ DdUpdateOverlay(LPDDHAL_UPDATEOVERLAYDATA UpdateOverlay) { /* Fixme for opengl hel emulations */ - return 0; + HEL_OGL_STUB; #if 0 /* We have to handle this manually here */ @@ -329,7 +332,7 @@ DdSetOverlayPosition(LPDDHAL_SETOVERLAYPOSITIONDATA SetOverlayPosition) { /* Fixme for opengl hel emulations */ - return 0; + HEL_OGL_STUB; #if 0 /* Call win32k */ @@ -349,7 +352,7 @@ DdWaitForVerticalBlank(LPDDHAL_WAITFORVERTICALBLANKDATA WaitForVerticalBlank) { /* Fixme for opengl hel emulations */ - return 0; + HEL_OGL_STUB; #if 0 /* Call win32k */ @@ -370,7 +373,7 @@ DdCanCreateSurface(LPDDHAL_CANCREATESURFACEDATA CanCreateSurface) { /* Fixme for opengl hel emulations */ - return 0; + HEL_OGL_STUB; #if 0 /* @@ -396,7 +399,7 @@ DdCreateSurface(LPDDHAL_CREATESURFACEDATA pCreateSurface) { /* Fixme for opengl hel emulations */ - return 0; + HEL_OGL_STUB; #if 0 DWORD Return = DDHAL_DRIVER_NOTHANDLED; @@ -661,7 +664,7 @@ DdSetColorKey(LPDDHAL_SETCOLORKEYDATA pSetColorKey) { /* Fixme for opengl hel emulations */ - return 0; + HEL_OGL_STUB; #if 0 /* Call win32k */ @@ -680,7 +683,7 @@ DdGetScanLine(LPDDHAL_GETSCANLINEDATA pGetScanLine) { /* Fixme for opengl hel emulations */ - return 0; + HEL_OGL_STUB; #if 0 /* Call win32k */ return NtGdiDdGetScanLine(GetDdHandle(pGetScanLine->lpDD->hDD), @@ -699,7 +702,7 @@ DvpCreateVideoPort(LPDDHAL_CREATEVPORTDATA pDvdCreatePort) { /* Fixme for opengl hel emulations */ - return 0; + HEL_OGL_STUB; #if 0 pDvdCreatePort->lpVideoPort->hDDVideoPort = NtGdiDvpCreateVideoPort(GetDdHandle(pDvdCreatePort->lpDD->lpGbl->hDD), @@ -718,7 +721,7 @@ DvpDestroyVideoPort(LPDDHAL_DESTROYVPORTDATA pDvdDestoryPort) { /* Fixme for opengl hel emulations */ - return 0; + HEL_OGL_STUB; #if 0 return NtGdiDvpDestroyVideoPort(pDvdDestoryPort->lpVideoPort->hDDVideoPort, (PDD_DESTROYVPORTDATA)pDvdDestoryPort); #endif @@ -734,7 +737,7 @@ DvpFlipVideoPort(LPDDHAL_FLIPVPORTDATA pDvdPortFlip) { /* Fixme for opengl hel emulations */ - return 0; + HEL_OGL_STUB; #if 0 return NtGdiDvpFlipVideoPort(pDvdPortFlip->lpVideoPort->hDDVideoPort, @@ -754,7 +757,7 @@ DvpGetVideoPortBandwidth(LPDDHAL_GETVPORTBANDWIDTHDATA pDvdPortBandWidth) { /* Fixme for opengl hel emulations */ - return 0; + HEL_OGL_STUB; #if 0 return NtGdiDvpGetVideoPortBandwidth(pDvdPortBandWidth->lpVideoPort->hDDVideoPort, (PDD_GETVPORTBANDWIDTHDATA)pDvdPortBandWidth); #endif @@ -770,7 +773,7 @@ DvpColorControl(LPDDHAL_VPORTCOLORDATA pDvdPortColorControl) { /* Fixme for opengl hel emulations */ - return 0; + HEL_OGL_STUB; #if 0 return NtGdiDvpColorControl(pDvdPortColorControl->lpVideoPort->hDDVideoPort, (PDD_VPORTCOLORDATA) pDvdPortColorControl); #endif @@ -786,7 +789,7 @@ DvpGetVideoSignalStatus(LPDDHAL_GETVPORTSIGNALDATA pDvdPortVideoSignalStatus) { /* Fixme for opengl hel emulations */ - return 0; + HEL_OGL_STUB; #if 0 return NtGdiDvpGetVideoSignalStatus(pDvdPortVideoSignalStatus->lpVideoPort->hDDVideoPort, (PDD_GETVPORTSIGNALDATA) pDvdPortVideoSignalStatus); #endif @@ -802,7 +805,7 @@ DvpGetVideoPortFlipStatus(LPDDHAL_GETVPORTFLIPSTATUSDATA pDvdPortVideoPortFlipStatus) { /* Fixme for opengl hel emulations */ - return 0; + HEL_OGL_STUB; #if 0 return NtGdiDvpGetVideoPortFlipStatus(GetDdHandle(pDvdPortVideoPortFlipStatus->lpDD->lpGbl->hDD), (PDD_GETVPORTFLIPSTATUSDATA) pDvdPortVideoPortFlipStatus); #endif @@ -819,7 +822,7 @@ DvpCanCreateVideoPort(LPDDHAL_CANCREATEVPORTDATA pDvdCanCreateVideoPort) { /* Fixme for opengl hel emulations */ - return 0; + HEL_OGL_STUB; #if 0 return NtGdiDvpCanCreateVideoPort(GetDdHandle(pDvdCanCreateVideoPort->lpDD->lpGbl->hDD), (PDD_CANCREATEVPORTDATA) pDvdCanCreateVideoPort); #endif @@ -834,7 +837,7 @@ DvpWaitForVideoPortSync(LPDDHAL_WAITFORVPORTSYNCDATA pDvdWaitForVideoPortSync) { /* Fixme for opengl hel emulations */ - return 0; + HEL_OGL_STUB; #if 0 return NtGdiDvpWaitForVideoPortSync(pDvdWaitForVideoPortSync->lpVideoPort->hDDVideoPort, (PDD_WAITFORVPORTSYNCDATA) pDvdWaitForVideoPortSync); #endif @@ -850,7 +853,7 @@ DvpUpdateVideoPort(LPDDHAL_UPDATEVPORTDATA pDvdUpdateVideoPort) { /* Fixme for opengl hel emulations */ - return 0; + HEL_OGL_STUB; #if 0 /* * Windows XP limit to max 10 handles of videoport surface and Vbi @@ -918,7 +921,7 @@ DvpGetVideoPortField(LPDDHAL_FLIPVPORTDATA pDvdGetVideoPortField) { /* Fixme for opengl hel emulations */ - return 0; + HEL_OGL_STUB; #if 0 return NtGdiDvpGetVideoPortField(pDvdGetVideoPortField->lpVideoPort->hDDVideoPort, (PDD_GETVPORTFIELDDATA)pDvdGetVideoPortField); #endif @@ -934,7 +937,7 @@ DvpGetVideoPortInputFormats(LPDDHAL_GETVPORTINPUTFORMATDATA pDvdGetVideoPortInputFormat) { /* Fixme for opengl hel emulations */ - return 0; + HEL_OGL_STUB; #if 0 return NtGdiDvpGetVideoPortInputFormats(pDvdGetVideoPortInputFormat->lpVideoPort->hDDVideoPort, (PDD_GETVPORTINPUTFORMATDATA) pDvdGetVideoPortInputFormat); #endif @@ -950,7 +953,7 @@ DvpGetVideoPortLine(LPDDHAL_GETVPORTLINEDATA pDvdGetVideoPortLine) { /* Fixme for opengl hel emulations */ - return 0; + HEL_OGL_STUB; #if 0 return NtGdiDvpGetVideoPortLine(pDvdGetVideoPortLine->lpVideoPort->hDDVideoPort, (PDD_GETVPORTLINEDATA)pDvdGetVideoPortLine); #endif @@ -966,7 +969,7 @@ DvpGetVideoPortOutputFormats(LPDDHAL_GETVPORTLINEDATA pDvdGetVideoPortOutputFormat) { /* Fixme for opengl hel emulations */ - return 0; + HEL_OGL_STUB; #if 0 return NtGdiDvpGetVideoPortLine(pDvdGetVideoPortOutputFormat->lpVideoPort->hDDVideoPort, (PDD_GETVPORTLINEDATA)pDvdGetVideoPortOutputFormat); #endif @@ -982,7 +985,7 @@ DvpGetVideoPortConnectInfo(LPDDHAL_GETVPORTCONNECTDATA pDvdGetVideoPortInfo) { /* Fixme for opengl hel emulations */ - return 0; + HEL_OGL_STUB; #if 0 return NtGdiDvpGetVideoPortConnectInfo( GetDdHandle( pDvdGetVideoPortInfo->lpDD->lpGbl->hDD) , (PDD_GETVPORTCONNECTDATA) pDvdGetVideoPortInfo); #endif @@ -998,7 +1001,7 @@ DdGetAvailDriverMemory(LPDDHAL_GETAVAILDRIVERMEMORYDATA pDdGetAvailDriverMemory) { /* Fixme for opengl hel emulations */ - return 0; + HEL_OGL_STUB; #if 0 return NtGdiDdGetAvailDriverMemory(GetDdHandle( pDdGetAvailDriverMemory->lpDD->hDD), (PDD_GETAVAILDRIVERMEMORYDATA) pDdGetAvailDriverMemory); #endif @@ -1014,7 +1017,7 @@ DdAlphaBlt(LPDDHAL_BLTDATA pDdAlphaBlt) { /* Fixme for opengl hel emulations */ - return 0; + HEL_OGL_STUB; #if 0 HANDLE hDDSrcSurface = 0; @@ -1037,7 +1040,7 @@ DdCreateSurfaceEx(LPDDHAL_CREATESURFACEEXDATA pDdCreateSurfaceEx) { /* Fixme for opengl hel emulations */ - return 0; + HEL_OGL_STUB; #if 0 pDdCreateSurfaceEx->ddRVal = NtGdiDdCreateSurfaceEx( GetDdHandle(pDdCreateSurfaceEx->lpDDLcl->lpGbl->hDD), (HANDLE)pDdCreateSurfaceEx->lpDDSLcl->hDDSurface, @@ -1056,7 +1059,7 @@ DdColorControl(LPDDHAL_COLORCONTROLDATA pDdColorControl) { /* Fixme for opengl hel emulations */ - return 0; + HEL_OGL_STUB; #if 0 return NtGdiDdColorControl( (HANDLE) pDdColorControl->lpDDSurface->hDDSurface, (PDD_COLORCONTROLDATA) &pDdColorControl); @@ -1073,7 +1076,7 @@ DdSetExclusiveMode(LPDDHAL_SETEXCLUSIVEMODEDATA pDdSetExclusiveMode) { /* Fixme for opengl hel emulations */ - return 0; + HEL_OGL_STUB; #if 0 return NtGdiDdSetExclusiveMode( GetDdHandle(pDdSetExclusiveMode->lpDD->hDD), (PDD_SETEXCLUSIVEMODEDATA) &pDdSetExclusiveMode); #endif @@ -1089,7 +1092,7 @@ DdFlipToGDISurface(LPDDHAL_FLIPTOGDISURFACEDATA pDdFlipToGDISurface) { /* Fixme for opengl hel emulations */ - return 0; + HEL_OGL_STUB; #if 0 return NtGdiDdFlipToGDISurface( GetDdHandle(pDdFlipToGDISurface->lpDD->hDD), (PDD_FLIPTOGDISURFACEDATA) &pDdFlipToGDISurface); #endif @@ -1101,7 +1104,7 @@ DdGetDriverInfo(LPDDHAL_GETDRIVERINFODATA pData) { /* Fixme for opengl hel emulations */ - return 0; + HEL_OGL_STUB; #if 0 DDHAL_GETDRIVERINFODATA pDrvInfoData; DWORD retValue = DDHAL_DRIVER_NOTHANDLED; @@ -1441,7 +1444,7 @@ D3dContextCreate(LPD3DHAL_CONTEXTCREATEDATA pdcci) { /* Fixme for opengl hel emulations */ - return 0; + HEL_OGL_STUB; #if 0 HANDLE hSurfZ = NULL; @@ -1467,7 +1470,7 @@ DdCanCreateD3DBuffer(LPDDHAL_CANCREATESURFACEDATA CanCreateD3DBuffer) { /* Fixme for opengl hel emulations */ - return 0; + HEL_OGL_STUB; #if 0 /* * Note : This functions are basic same, in win32k @@ -1493,7 +1496,7 @@ DdCreateD3DBuffer(LPDDHAL_CREATESURFACEDATA pCreateSurface) { /* Fixme for opengl hel emulations */ - return 0; + HEL_OGL_STUB; #if 0 HANDLE puhSurface = 0; DDRAWI_DDRAWSURFACE_GBL *pSurfGBL; @@ -1566,7 +1569,7 @@ DdDestroyD3DBuffer(LPDDHAL_DESTROYSURFACEDATA pDestroySurface) { /* Fixme for opengl hel emulations */ - return 0; + HEL_OGL_STUB; #if 0 DWORD retValue = 0; @@ -1590,7 +1593,7 @@ DdLockD3D(LPDDHAL_LOCKDATA Lock) { /* Fixme for opengl hel emulations */ - return 0; + HEL_OGL_STUB; #if 0 /* Call win32k */ return NtGdiDdLockD3D((HANDLE)Lock->lpDDSurface->hDDSurface, (PDD_LOCKDATA)Lock); @@ -1607,7 +1610,7 @@ DdUnlockD3D(LPDDHAL_UNLOCKDATA Unlock) { /* Fixme for opengl hel emulations */ - return 0; + HEL_OGL_STUB; #if 0 /* Call win32k */ return NtGdiDdUnlock((HANDLE)Unlock->lpDDSurface->hDDSurface, @@ -1624,7 +1627,7 @@ BOOL bComplete) { /* Fixme for opengl hel emulations */ - return 0; + HEL_OGL_STUB; #if 0 DD_SURFACE_LOCAL SurfaceLocal; DD_SURFACE_GLOBAL SurfaceGlobal; @@ -1786,9 +1789,7 @@ } /* Do the query */ - if ( (pDirectDrawGlobal == NULL) || - (GetDdHandle(pDirectDrawGlobal->hDD) == 0) || - (pHalInfo == NULL) ) + if ( GetDdHandle(pDirectDrawGlobal->hDD) == NULL || pHalInfo == NULL) { /* We failed, free the memory and return */ retVal = FALSE; @@ -1804,7 +1805,7 @@ EnumDisplaySettingsW(NULL,ENUM_CURRENT_SETTINGS,&DevMode); /* Dectect RGB bit mask */ - hdc = GetDC(GetDesktopWindow()); + hdc = CreateDCW(L"DISPLAY", NULL, NULL, NULL); if (hdc == NULL) { retVal = FALSE; @@ -1842,8 +1843,6 @@ DeleteDC(hdc); /* End dectect RGB bit mask */ - if (pHalInfo) - { /* Clear the incoming pointer */ RtlZeroMemory(pHalInfo, sizeof(DDHALINFO)); @@ -2016,12 +2015,6 @@ pHalInfo->ddCaps.dwNumFourCCCodes = FourCCs; pHalInfo->lpdwFourCC = pdwFourCC; */ - } - else - { - retVal = FALSE; - goto cleanup; - } /* Now check if we got any DD callbacks */ if (pDDCallbacks) @@ -2244,7 +2237,7 @@ DdDeleteDirectDrawObject(LPDDRAWI_DIRECTDRAW_GBL pDirectDrawGlobal) { /* Fixme for opengl hel emulations */ - return 0; + HEL_OGL_STUB; #if 0 BOOL Return = FALSE; @@ -2291,7 +2284,7 @@ BOOL bPrimarySurface) { /* Fixme for opengl hel emulations */ - return 0; + HEL_OGL_STUB; #if 0 return bDDCreateSurface(pSurfaceLocal, TRUE); #endif @@ -2308,7 +2301,7 @@ DdDeleteSurfaceObject(LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal) { /* Fixme for opengl hel emulations */ - return 0; + HEL_OGL_STUB; #if 0 BOOL Return = FALSE; @@ -2335,7 +2328,7 @@ HWND hWnd) { /* Fixme for opengl hel emulations */ - return 0; + HEL_OGL_STUB; #if 0 /* Call win32k directly */ return NtGdiDdResetVisrgn((HANDLE) pSurfaceLocal->hDDSurface, hWnd); @@ -2353,7 +2346,7 @@ LPPALETTEENTRY pColorTable) { /* Fixme for opengl hel emulations */ - return 0; + HEL_OGL_STUB; #if 0 /* Call win32k directly */ return NtGdiDdGetDC(pColorTable, (HANDLE) pSurfaceLocal->hDDSurface); @@ -2370,7 +2363,7 @@ DdReleaseDC(LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal) { /* Fixme for opengl hel emulations */ - return 0; + HEL_OGL_STUB; #if 0 /* Call win32k directly */ return NtGdiDdReleaseDC((HANDLE) pSurfaceLocal->hDDSurface); @@ -2391,7 +2384,7 @@ DWORD dwOffset) { SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + HEL_OGL_STUB; } /* @@ -2405,7 +2398,7 @@ BOOL *pbNewMode) { /* Fixme for opengl hel emulations */ - return 0; + HEL_OGL_STUB; #if 0 /* Call win32k directly */ return NtGdiDdReenableDirectDrawObject(GetDdHandle(pDirectDrawGlobal->hDD), @@ -2425,7 +2418,7 @@ LPDDRAWI_DDRAWSURFACE_LCL pSurfaceTo) { /* Fixme for opengl hel emulations */ - return 0; + HEL_OGL_STUB; #if 0 /* Create Surface if it does not exits one */ if (!pSurfaceFrom->hDDSurface) @@ -2494,7 +2487,7 @@ BOOL bRelease) { /* Fixme for opengl hel emulations */ - return 0; + HEL_OGL_STUB; #if 0 HANDLE hDD = NULL; HANDLE hSurface = (HANDLE)pSurface->hDDSurface; @@ -2524,7 +2517,7 @@ LPVOID lpGammaRamp) { /* Fixme for opengl hel emulations */ - return 0; + HEL_OGL_STUB; #if 0 /* Call win32k directly */

16 years

[sginsberg] 37707: - Add a missing define -- fixes DECLARE_INTERFACE and everything related for kernel mode

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Fri Nov 28 12:24:30 2008 New Revision: 37707 URL: http://svn.reactos.org/svn/reactos?rev=37707&view=rev Log: - Add a missing define -- fixes DECLARE_INTERFACE and everything related for kernel mode Modified: trunk/reactos/include/psdk/basetyps.h Modified: trunk/reactos/include/psdk/basetyps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/basetyps.h?re… ============================================================================== --- trunk/reactos/include/psdk/basetyps.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/basetyps.h [iso-8859-1] Fri Nov 28 12:24:30 2008 @@ -52,6 +52,7 @@ # define DECLARE_INTERFACE(i) interface i # define DECLARE_INTERFACE_(i,b) interface i : public b #else +# define interface struct # define STDMETHOD(m) HRESULT (STDMETHODCALLTYPE *m) # define STDMETHOD_(t,m) t (STDMETHODCALLTYPE *m) # define PURE

16 years

[hyperion] 37706: GCC 4.3 correctly aligns stack-allocated objects Patch by "hto", from bugzilla See issue #3608 for more details.

by hyperion＠svn.reactos.org

Author: hyperion Date: Fri Nov 28 08:47:19 2008 New Revision: 37706 URL: http://svn.reactos.org/svn/reactos?rev=37706&view=rev Log: GCC 4.3 correctly aligns stack-allocated objects Patch by "hto", from bugzilla See issue #3608 for more details. Modified: trunk/reactos/lib/rtl/srw.c trunk/reactos/ntoskrnl/include/internal/ex.h Modified: trunk/reactos/lib/rtl/srw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/srw.c?rev=37706&r1… ============================================================================== --- trunk/reactos/lib/rtl/srw.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/srw.c [iso-8859-1] Fri Nov 28 08:47:19 2008 @@ -44,7 +44,7 @@ RTL_SRWLOCK_SHARED | RTL_SRWLOCK_CONTENTION_LOCK) #define RTL_SRWLOCK_BITS 4 -#if defined(__GNUC__) && !defined(_M_AMD64) +#if (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__ < 40300) && !defined(_M_AMD64) /* This macro will cause the code to assert if compiled with a buggy version of GCC that doesn't align the wait blocks properly on the stack! */ #define ASSERT_SRW_WAITBLOCK(ptr) \ Modified: trunk/reactos/ntoskrnl/include/internal/ex.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ex.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ex.h [iso-8859-1] Fri Nov 28 08:47:19 2008 @@ -92,9 +92,9 @@ #define MAX_HIGH_INDEX (MID_LEVEL_ENTRIES * MID_LEVEL_ENTRIES * LOW_LEVEL_ENTRIES) // -// Detect GCC +// Detect old GCC // -#ifdef __GNUC__ +#if (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__ < 40300) #define DEFINE_WAIT_BLOCK(x) \ struct _AlignHack \

16 years

[hyperion] 37705: Don't let ASSERT_SRW_WAITBLOCK evaluate to nothing - make it evaluate to (void)0, like ASSERT would See issue #3608 for more details.

by hyperion＠svn.reactos.org

Author: hyperion Date: Fri Nov 28 08:38:41 2008 New Revision: 37705 URL: http://svn.reactos.org/svn/reactos?rev=37705&view=rev Log: Don't let ASSERT_SRW_WAITBLOCK evaluate to nothing - make it evaluate to (void)0, like ASSERT would See issue #3608 for more details. Modified: trunk/reactos/lib/rtl/srw.c Modified: trunk/reactos/lib/rtl/srw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/srw.c?rev=37705&r1… ============================================================================== --- trunk/reactos/lib/rtl/srw.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/srw.c [iso-8859-1] Fri Nov 28 08:38:41 2008 @@ -50,7 +50,7 @@ #define ASSERT_SRW_WAITBLOCK(ptr) \ ASSERT(((ULONG_PTR)ptr & ((1 << RTL_SRWLOCK_BITS) - 1)) == 0) #else -#define ASSERT_SRW_WAITBLOCK(ptr) +#define ASSERT_SRW_WAITBLOCK(ptr) ((void)0) #endif typedef struct _RTLP_SRWLOCK_SHARED_WAKE

16 years

[hyperion] 37704: ASSERT really needs to be void, despite what DDK headers might say. Fixes following warning: lib\rtl\srw.c: In function 'RtlAcquireSRWLockShared': lib\rtl\srw.c:498: error: statement with no effect lib\rtl\srw.c: In function 'RtlAcquireSRWLockExclusive': lib\rtl\srw.c:637: error: statement with no effect lib\rtl\srw.c:668: error: statement with no effect lib\rtl\srw.c:696: error: statement with no effect See issue #3922 for more details.

by hyperion＠svn.reactos.org

Author: hyperion Date: Fri Nov 28 08:33:21 2008 New Revision: 37704 URL: http://svn.reactos.org/svn/reactos?rev=37704&view=rev Log: ASSERT really needs to be void, despite what DDK headers might say. Fixes following warning: lib\rtl\srw.c: In function 'RtlAcquireSRWLockShared': lib\rtl\srw.c:498: error: statement with no effect lib\rtl\srw.c: In function 'RtlAcquireSRWLockExclusive': lib\rtl\srw.c:637: error: statement with no effect lib\rtl\srw.c:668: error: statement with no effect lib\rtl\srw.c:696: error: statement with no effect See issue #3922 for more details. Modified: trunk/reactos/include/ndk/rtlfuncs.h Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] Fri Nov 28 08:33:21 2008 @@ -195,14 +195,14 @@ #if DBG #define ASSERT( exp ) \ - ((!(exp)) ? \ + ((void)((!(exp)) ? \ (RtlAssert( #exp, __FILE__, __LINE__, NULL ),FALSE) : \ - TRUE) + TRUE)) #define ASSERTMSG( msg, exp ) \ - ((!(exp)) ? \ + ((void)((!(exp)) ? \ (RtlAssert( #exp, __FILE__, __LINE__, msg ),FALSE) : \ - TRUE) + TRUE)) #else @@ -670,7 +670,7 @@ IN HANDLE HeapHandle, IN PVOID HeapEntry ); - + #define RtlGetProcessHeap() (NtCurrentPeb()->ProcessHeap) //

16 years

← Newer
1
...
5
6
7
8
9
10
11
...
66
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2008