Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cgutman] 36372: - Merge aicom-network-fixes up to r36371
by cgutman＠svn.reactos.org 21 Sep '08

21 Sep '08

Author: cgutman Date: Sun Sep 21 07:41:26 2008 New Revision: 36372 URL: http://svn.reactos.org/svn/reactos?rev=36372&view=rev Log: - Merge aicom-network-fixes up to r36371 Modified: trunk/reactos/drivers/network/afd/include/afd.h trunk/reactos/drivers/network/ndis/ndis/io.c trunk/reactos/drivers/network/ndis/ndis/miniport.c trunk/reactos/drivers/network/ndis/ndis/protocol.c trunk/reactos/drivers/network/tcpip/tcpip/pool.c Modified: trunk/reactos/drivers/network/afd/include/afd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/includ… ============================================================================== --- trunk/reactos/drivers/network/afd/include/afd.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/include/afd.h [iso-8859-1] Sun Sep 21 07:41:26 2008 @@ -97,7 +97,7 @@ #define FUNCTION_CLOSE 5 #define MAX_FUNCTIONS 6 -#define IN_FLIGHT_REQUESTS 3 +#define IN_FLIGHT_REQUESTS 4 #define EXTRA_LOCK_BUFFERS 2 /* Number of extra buffers needed * for ancillary data on packet Modified: trunk/reactos/drivers/network/ndis/ndis/io.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/io.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/io.c [iso-8859-1] Sun Sep 21 07:41:26 2008 @@ -28,37 +28,15 @@ * SystemArgument2 = Unused */ { - BOOLEAN WasBusy; PLOGICAL_ADAPTER Adapter = GET_LOGICAL_ADAPTER(DeferredContext); NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); - - /* XXX try to grok WasBusy */ - KeAcquireSpinLockAtDpcLevel(&Adapter->NdisMiniportBlock.Lock); - { - WasBusy = Adapter->MiniportBusy; - Adapter->MiniportBusy = TRUE; - } - KeReleaseSpinLockFromDpcLevel(&Adapter->NdisMiniportBlock.Lock); /* Call the deferred interrupt service handler for this adapter */ (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.HandleInterruptHandler)( Adapter->NdisMiniportBlock.MiniportAdapterContext); - - KeAcquireSpinLockAtDpcLevel(&Adapter->NdisMiniportBlock.Lock); - { - if ((!WasBusy) && (Adapter->WorkQueueHead)) - { - KeInsertQueueDpc(&Adapter->NdisMiniportBlock.DeferredDpc, NULL, NULL); - } - else - { - Adapter->MiniportBusy = WasBusy; - } - } - KeReleaseSpinLockFromDpcLevel(&Adapter->NdisMiniportBlock.Lock); /* re-enable the interrupt */ NDIS_DbgPrint(MAX_TRACE, ("re-enabling the interrupt\n")); 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] Sun Sep 21 07:41:26 2008 @@ -309,10 +309,11 @@ VOID NTAPI MiniRequestComplete( - IN PNDIS_MINIPORT_BLOCK Adapter, + IN PNDIS_HANDLE MiniportAdapterHandle, 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; @@ -326,6 +327,7 @@ Status); } KeLowerIrql(OldIrql); + Adapter->MiniportBusy = FALSE; } VOID NTAPI @@ -342,6 +344,7 @@ * Status = Status of send operation */ { + PLOGICAL_ADAPTER Adapter = MiniportAdapterHandle; PADAPTER_BINDING AdapterBinding; KIRQL OldIrql; @@ -355,6 +358,7 @@ Packet, Status); KeLowerIrql(OldIrql); + Adapter->MiniportBusy = FALSE; } @@ -375,6 +379,7 @@ IN NDIS_STATUS Status, IN UINT BytesTransferred) { + PLOGICAL_ADAPTER Adapter = MiniportAdapterHandle; PADAPTER_BINDING AdapterBinding; KIRQL OldIrql; @@ -388,6 +393,7 @@ Packet, Status); KeLowerIrql(OldIrql); + Adapter->MiniportBusy = FALSE; } @@ -655,6 +661,12 @@ NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); + if (Adapter->MiniportBusy) { + NDIS_DbgPrint(MID_TRACE, ("Waiting for miniport to become free.\n")); + KeInsertQueueDpc(&Adapter->NdisMiniportBlock.DeferredDpc, NULL, NULL); + return NDIS_STATUS_FAILURE; + } + Item = Adapter->WorkQueueHead; if (Item) @@ -669,6 +681,8 @@ *WorkItemContext = Item->WorkItemContext; ExFreePool(Item); + + Adapter->MiniportBusy = TRUE; return NDIS_STATUS_SUCCESS; } @@ -738,14 +752,15 @@ IN NDIS_HANDLE MiniportAdapterHandle, IN NDIS_STATUS Status) { - PNDIS_MINIPORT_BLOCK MiniportBlock = - (PNDIS_MINIPORT_BLOCK)MiniportAdapterHandle; + PLOGICAL_ADAPTER Adapter = + (PLOGICAL_ADAPTER)MiniportAdapterHandle; KIRQL OldIrql; - ASSERT(MiniportBlock); + ASSERT(Adapter); KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); - if( MiniportBlock->QueryCompleteHandler ) - (MiniportBlock->QueryCompleteHandler)(MiniportAdapterHandle, Status); + if( Adapter->NdisMiniportBlock.QueryCompleteHandler ) + (Adapter->NdisMiniportBlock.QueryCompleteHandler)(MiniportAdapterHandle, Status); KeLowerIrql(OldIrql); + Adapter->MiniportBusy = FALSE; } VOID NTAPI MiniportWorker(IN PVOID WorkItem) @@ -783,6 +798,7 @@ NDIS_DbgPrint(MAX_TRACE, ("Calling miniport's SendPackets handler\n")); (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.SendPacketsHandler)( Adapter->NdisMiniportBlock.MiniportAdapterContext, (PPNDIS_PACKET)&WorkItemContext, 1); + NdisStatus = NDIS_GET_PACKET_STATUS((PNDIS_PACKET)WorkItemContext); } else { @@ -794,9 +810,15 @@ Adapter->NdisMiniportBlock.MiniportAdapterContext, (PPNDIS_PACKET)&WorkItemContext, 1); } KeLowerIrql(RaiseOldIrql); + + NdisStatus = NDIS_GET_PACKET_STATUS((PNDIS_PACKET)WorkItemContext); + if( NdisStatus == NDIS_STATUS_RESOURCES ) { + KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); + MiniQueueWorkItem(Adapter, WorkItemType, WorkItemContext); + KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); + break; + } } - - NdisStatus = NDIS_GET_PACKET_STATUS((PNDIS_PACKET)WorkItemContext); } else { @@ -816,15 +838,18 @@ Adapter->NdisMiniportBlock.MiniportAdapterContext, (PNDIS_PACKET)WorkItemContext, 0); NDIS_DbgPrint(MAX_TRACE, ("back from miniport's send handler\n")); KeLowerIrql(RaiseOldIrql); + if( NdisStatus == NDIS_STATUS_RESOURCES ) { + KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); + MiniQueueWorkItem(Adapter, WorkItemType, WorkItemContext); + KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); + break; + } } } - if( NdisStatus == NDIS_STATUS_RESOURCES ) - MiniQueueWorkItem(Adapter, WorkItemType, WorkItemContext); - else if( NdisStatus != NDIS_STATUS_PENDING ) { + if( NdisStatus != NDIS_STATUS_PENDING ) { NdisMSendComplete ( Adapter, (PNDIS_PACKET)WorkItemContext, NdisStatus ); - Adapter->MiniportBusy = FALSE; } break; @@ -834,7 +859,9 @@ */ /* XXX atm ProIndicatePacket sends a packet up via the loopback adapter only */ NdisStatus = ProIndicatePacket(Adapter, (PNDIS_PACKET)WorkItemContext); - MiniSendComplete((NDIS_HANDLE)Adapter, (PNDIS_PACKET)WorkItemContext, NdisStatus); + + if( NdisStatus != NDIS_STATUS_PENDING ) + MiniSendComplete((NDIS_HANDLE)Adapter, (PNDIS_PACKET)WorkItemContext, NdisStatus); break; case NdisWorkItemReturnPackets: @@ -859,12 +886,12 @@ { case NdisRequestQueryInformation: NdisMQueryInformationComplete((NDIS_HANDLE)Adapter, NdisStatus); - MiniRequestComplete( &Adapter->NdisMiniportBlock, (PNDIS_REQUEST)WorkItemContext, NdisStatus ); + MiniRequestComplete( (NDIS_HANDLE)Adapter, (PNDIS_REQUEST)WorkItemContext, NdisStatus ); break; case NdisRequestSetInformation: NdisMSetInformationComplete((NDIS_HANDLE)Adapter, NdisStatus); - MiniRequestComplete( &Adapter->NdisMiniportBlock, (PNDIS_REQUEST)WorkItemContext, NdisStatus ); + MiniRequestComplete( (NDIS_HANDLE)Adapter, (PNDIS_REQUEST)WorkItemContext, NdisStatus ); break; default: @@ -878,6 +905,9 @@ break; } } + + if( NdisStatus != NDIS_STATUS_PENDING ) + Adapter->MiniportBusy = FALSE; ExFreePool(WorkItem); } @@ -1988,10 +2018,14 @@ IN NDIS_HANDLE MiniportAdapterHandle, IN NDIS_STATUS Status) { + PLOGICAL_ADAPTER Adapter = + (PLOGICAL_ADAPTER)MiniportAdapterHandle; KIRQL OldIrql; + ASSERT(Adapter); KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); - (*((PNDIS_MINIPORT_BLOCK)(MiniportAdapterHandle))->SetCompleteHandler)(MiniportAdapterHandle, Status); + (Adapter->NdisMiniportBlock.SetCompleteHandler)(MiniportAdapterHandle, Status); KeLowerIrql(OldIrql); + Adapter->MiniportBusy = FALSE; } 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] Sun Sep 21 07:41:26 2008 @@ -143,11 +143,6 @@ { if(Adapter->MiniportBusy) QueueWorkItem = TRUE; - else - { - NDIS_DbgPrint(MAX_TRACE, ("Setting adapter 0x%x to busy\n")); - Adapter->MiniportBusy = TRUE; - } } /* MiniQueueWorkItem must be called at IRQL >= DISPATCH_LEVEL */ @@ -160,18 +155,10 @@ KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); - NdisStatus = MiniDoRequest(&Adapter->NdisMiniportBlock, NdisRequest); - - NDIS_DbgPrint(MAX_TRACE, ("acquiring miniport block lock\n")); - KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); - { - NDIS_DbgPrint(MAX_TRACE, ("Setting adapter 0x%x to free\n")); - Adapter->MiniportBusy = FALSE; - - if (Adapter->WorkQueueHead) - KeInsertQueueDpc(&Adapter->NdisMiniportBlock.DeferredDpc, NULL, NULL); - } - KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); + NdisStatus = MiniDoRequest(&Adapter->NdisMiniportBlock, NdisRequest); + + if( NdisStatus == NDIS_STATUS_PENDING ) + Adapter->MiniportBusy = TRUE; return NdisStatus; } Modified: trunk/reactos/drivers/network/tcpip/tcpip/pool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/pool.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/pool.c [iso-8859-1] Sun Sep 21 07:41:26 2008 @@ -25,8 +25,6 @@ /* FIXME: Get buffer from a free buffer pool with enough room */ Buffer = ExAllocatePool(NonPagedPool, Size); - - RtlZeroMemory(Buffer, Size); TI_DbgPrint(DEBUG_MEMORY, ("Allocated (%i) bytes at (0x%X).\n", Size, Buffer));

1 0

[cgutman] 36371: - There are 4 in flight requests not 3
by cgutman＠svn.reactos.org 21 Sep '08

21 Sep '08

Author: cgutman Date: Sun Sep 21 07:31:14 2008 New Revision: 36371 URL: http://svn.reactos.org/svn/reactos?rev=36371&view=rev Log: - There are 4 in flight requests not 3 Modified: branches/aicom-network-fixes/drivers/network/afd/include/afd.h Modified: branches/aicom-network-fixes/drivers/network/afd/include/afd.h URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/include/afd.h [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/include/afd.h [iso-8859-1] Sun Sep 21 07:31:14 2008 @@ -97,7 +97,7 @@ #define FUNCTION_CLOSE 5 #define MAX_FUNCTIONS 6 -#define IN_FLIGHT_REQUESTS 3 +#define IN_FLIGHT_REQUESTS 4 #define EXTRA_LOCK_BUFFERS 2 /* Number of extra buffers needed * for ancillary data on packet

1 0

[gbrunmar] 36370: D3D9: * Added stubs for IDirect3DTexture9 methods * Implemented IDirect3DTexture9::GetDevice() * Moved device locking to the D3D9BaseObject instead of in each child object
by gbrunmar＠svn.reactos.org 21 Sep '08

21 Sep '08

Author: gbrunmar Date: Sun Sep 21 07:25:38 2008 New Revision: 36370 URL: http://svn.reactos.org/svn/reactos?rev=36370&view=rev Log: D3D9: * Added stubs for IDirect3DTexture9 methods * Implemented IDirect3DTexture9::GetDevice() * Moved device locking to the D3D9BaseObject instead of in each child object Modified: trunk/reactos/dll/directx/d3d9/d3d9_baseobject.c trunk/reactos/dll/directx/d3d9/d3d9_baseobject.h trunk/reactos/dll/directx/d3d9/d3d9_device.c trunk/reactos/dll/directx/d3d9/d3d9_mipmap.c trunk/reactos/dll/directx/d3d9/d3d9_mipmap.h trunk/reactos/dll/directx/d3d9/d3d9_resource.h trunk/reactos/dll/directx/d3d9/d3d9_swapchain.c trunk/reactos/dll/directx/d3d9/d3d9_texture.h Modified: trunk/reactos/dll/directx/d3d9/d3d9_baseobject.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_base… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_baseobject.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_baseobject.c [iso-8859-1] Sun Sep 21 07:25:38 2008 @@ -66,7 +66,7 @@ { if (pBaseObject->pUnknown) { - return pBaseObject->pUnknown->lpVtbl->QueryInterface((IUnknown*) &pBaseObject->pUnknown->lpVtbl, &IID_IDirect3DDevice9, (void**)ppDevice); + return IUnknown_QueryInterface(pBaseObject->pUnknown, &IID_IDirect3DDevice9, (void**)ppDevice); } return E_NOINTERFACE; @@ -74,10 +74,15 @@ HRESULT D3D9BaseObject_GetDeviceInt(D3D9BaseObject* pBaseObject, DIRECT3DDEVICE9_INT** ppDevice) { + if (NULL == ppDevice) + return D3DERR_INVALIDCALL; + + *ppDevice = NULL; + if (pBaseObject->pUnknown) { LPDIRECT3DDEVICE9 pDevice; - if (FAILED(pBaseObject->pUnknown->lpVtbl->QueryInterface((IUnknown*) &pBaseObject->pUnknown->lpVtbl, &IID_IDirect3DDevice9, (void**)&pDevice))) + if (FAILED(IUnknown_QueryInterface(pBaseObject->pUnknown, &IID_IDirect3DDevice9, (void**)&pDevice))) return E_NOINTERFACE; *ppDevice = IDirect3DDevice9ToImpl(pDevice); @@ -86,3 +91,23 @@ return E_NOINTERFACE; } + +VOID D3D9BaseObject_LockDevice(D3D9BaseObject* pBaseObject) +{ + DIRECT3DDEVICE9_INT* pDevice; + if (FAILED(D3D9BaseObject_GetDeviceInt(pBaseObject, &pDevice))) + return; + + if (pDevice->bLockDevice) + EnterCriticalSection(&pDevice->CriticalSection); +} + +VOID D3D9BaseObject_UnlockDevice(D3D9BaseObject* pBaseObject) +{ + DIRECT3DDEVICE9_INT* pDevice; + if (FAILED(D3D9BaseObject_GetDeviceInt(pBaseObject, &pDevice))) + return; + + if (pDevice->bLockDevice) + LeaveCriticalSection(&pDevice->CriticalSection); +} Modified: trunk/reactos/dll/directx/d3d9/d3d9_baseobject.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_base… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_baseobject.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_baseobject.h [iso-8859-1] Sun Sep 21 07:25:38 2008 @@ -44,5 +44,7 @@ ULONG D3D9BaseObject_Release(D3D9BaseObject* pBaseObject); HRESULT D3D9BaseObject_GetDevice(D3D9BaseObject* pBaseObject, IDirect3DDevice9** ppDevice); HRESULT D3D9BaseObject_GetDeviceInt(D3D9BaseObject* pBaseObject, struct _Direct3DDevice9_INT** ppDevice); +VOID D3D9BaseObject_LockDevice(D3D9BaseObject* pBaseObject); +VOID D3D9BaseObject_UnlockDevice(D3D9BaseObject* pBaseObject); #endif // _D3D9_BASEOBJECT_H_ Modified: trunk/reactos/dll/directx/d3d9/d3d9_device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_devi… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_device.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_device.c [iso-8859-1] Sun Sep 21 07:25:38 2008 @@ -15,7 +15,7 @@ #define LOCK_D3DDEVICE9() if (This->bLockDevice) EnterCriticalSection(&This->CriticalSection); #define UNLOCK_D3DDEVICE9() if (This->bLockDevice) LeaveCriticalSection(&This->CriticalSection); -/* Convert a IDirect3D9 pointer safely to the internal implementation struct */ +/* Convert a IDirect3DDevice9 pointer safely to the internal implementation struct */ LPDIRECT3DDEVICE9_INT IDirect3DDevice9ToImpl(LPDIRECT3DDEVICE9 iface) { if (NULL == iface) Modified: trunk/reactos/dll/directx/d3d9/d3d9_mipmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_mipm… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_mipmap.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_mipmap.c [iso-8859-1] Sun Sep 21 07:25:38 2008 @@ -8,10 +8,252 @@ #include "d3d9_mipmap.h" #include "debug.h" #include "d3d9_device.h" +#include "d3d9_helpers.h" +#include <d3d9.h> + +#define LOCK_D3DDEVICE9() D3D9BaseObject_LockDevice(&This->BaseTexture.BaseResource.BaseObject) +#define UNLOCK_D3DDEVICE9() D3D9BaseObject_UnlockDevice(&This->BaseTexture.BaseResource.BaseObject) + +/* Convert a IDirect3DTexture9 pointer safely to the internal implementation struct */ +LPD3D9MIPMAP IDirect3DTexture9ToImpl(LPDIRECT3DTEXTURE9 iface) +{ + if (NULL == iface) + return NULL; + + return (LPD3D9MIPMAP)((ULONG_PTR)iface - FIELD_OFFSET(D3D9MipMap, lpVtbl)); +} + +/* IUnknown */ +static HRESULT WINAPI D3D9MipMap_QueryInterface(LPDIRECT3DTEXTURE9 iface, REFIID riid, void** ppvObject) +{ + LPD3D9MIPMAP This = IDirect3DTexture9ToImpl(iface); + + if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IDirect3DTexture9) || + IsEqualGUID(riid, &IID_IDirect3DBaseTexture9) || + IsEqualGUID(riid, &IID_IDirect3DResource9)) + { + IUnknown_AddRef(iface); + *ppvObject = &This->lpVtbl; + return D3D_OK; + } + + *ppvObject = NULL; + return E_NOINTERFACE; +} + +ULONG WINAPI D3D9MipMap_AddRef(LPDIRECT3DTEXTURE9 iface) +{ + LPD3D9MIPMAP This = IDirect3DTexture9ToImpl(iface); + return D3D9BaseObject_AddRef(&This->BaseTexture.BaseResource.BaseObject); +} + +ULONG WINAPI D3D9MipMap_Release(LPDIRECT3DTEXTURE9 iface) +{ + LPD3D9MIPMAP This = IDirect3DTexture9ToImpl(iface); + return D3D9BaseObject_Release(&This->BaseTexture.BaseResource.BaseObject); +} + +/* IDirect3DBaseTexture9 */ + +/*++ +* @name IDirect3DTexture9::GetDevice +* @implemented +* +* The function D3D9MipMap_GetDevice sets the ppDevice argument +* to the device connected to create the swap chain. +* +* @param LPDIRECT3DTEXTURE9 iface +* Pointer to a IDirect3DTexture9 object returned from IDirect3D9Device::CreateTexture() +* +* @param IDirect3DDevice9** ppDevice +* Pointer to a IDirect3DDevice9* structure to be set to the device object. +* +* @return HRESULT +* If the method successfully sets the ppDevice value, the return value is D3D_OK. +* If ppDevice is a bad pointer the return value will be D3DERR_INVALIDCALL. +* If the texture didn't contain any device, the return value will be D3DERR_INVALIDDEVICE. +* +*/HRESULT WINAPI D3D9MipMap_GetDevice(LPDIRECT3DTEXTURE9 iface, IDirect3DDevice9** ppDevice) +{ + LPD3D9MIPMAP This = IDirect3DTexture9ToImpl(iface); + LOCK_D3DDEVICE9(); + + if (NULL == ppDevice) + { + DPRINT1("Invalid ppDevice parameter specified"); + UNLOCK_D3DDEVICE9(); + return D3DERR_INVALIDCALL; + } + + if (FAILED(D3D9BaseObject_GetDevice(&This->BaseTexture.BaseResource.BaseObject, ppDevice))) + { + DPRINT1("Invalid This parameter speficied"); + UNLOCK_D3DDEVICE9(); + return D3DERR_INVALIDDEVICE; + } + + UNLOCK_D3DDEVICE9(); + return D3D_OK; +} + +HRESULT WINAPI D3D9MipMap_SetPrivateData(LPDIRECT3DTEXTURE9 iface, REFGUID refguid, CONST void* pData, DWORD SizeOfData, DWORD Flags) +{ + UNIMPLEMENTED + return D3D_OK; +} + +HRESULT WINAPI D3D9MipMap_GetPrivateData(LPDIRECT3DTEXTURE9 iface, REFGUID refguid, void* pData, DWORD* pSizeOfData) +{ + UNIMPLEMENTED + return D3D_OK; +} + +HRESULT WINAPI D3D9MipMap_FreePrivateData(LPDIRECT3DTEXTURE9 iface, REFGUID refguid) +{ + UNIMPLEMENTED + return D3D_OK; +} + +DWORD WINAPI D3D9MipMap_SetPriority(LPDIRECT3DTEXTURE9 iface, DWORD PriorityNew) +{ + UNIMPLEMENTED + return 0; +} + +DWORD WINAPI D3D9MipMap_GetPriority(LPDIRECT3DTEXTURE9 iface) +{ + UNIMPLEMENTED + return 0; +} + +void WINAPI D3D9MipMap_PreLoad(LPDIRECT3DTEXTURE9 iface) +{ + UNIMPLEMENTED +} + +D3DRESOURCETYPE WINAPI D3D9MipMap_GetType(LPDIRECT3DTEXTURE9 iface) +{ + UNIMPLEMENTED + return D3DRTYPE_TEXTURE; +} + +DWORD WINAPI D3D9MipMap_SetLOD(LPDIRECT3DTEXTURE9 iface, DWORD LODNew) +{ + UNIMPLEMENTED + return 0; +} + +DWORD WINAPI D3D9MipMap_GetLOD(LPDIRECT3DTEXTURE9 iface) +{ + UNIMPLEMENTED + return 0; +} + +DWORD WINAPI D3D9MipMap_GetLevelCount(LPDIRECT3DTEXTURE9 iface) +{ + UNIMPLEMENTED + return 0; +} + +HRESULT WINAPI D3D9MipMap_SetAutoGenFilterType(LPDIRECT3DTEXTURE9 iface, D3DTEXTUREFILTERTYPE FilterType) +{ + UNIMPLEMENTED + return D3D_OK; +} + +D3DTEXTUREFILTERTYPE WINAPI D3D9MipMap_GetAutoGenFilterType(LPDIRECT3DTEXTURE9 iface) +{ + UNIMPLEMENTED + return D3DRTYPE_TEXTURE; +} + +void WINAPI D3D9MipMap_GenerateMipSubLevels(LPDIRECT3DTEXTURE9 iface) +{ + UNIMPLEMENTED +} + +/* IDirect3DTexture9 */ +HRESULT WINAPI D3D9MipMap_GetLevelDesc(LPDIRECT3DTEXTURE9 iface, UINT Level, D3DSURFACE_DESC* pDesc) +{ + UNIMPLEMENTED + return D3D_OK; +} + +HRESULT WINAPI D3D9MipMap_GetSurfaceLevel(LPDIRECT3DTEXTURE9 iface, UINT Level, IDirect3DSurface9** ppSurfaceLevel) +{ + UNIMPLEMENTED + return D3D_OK; +} + +HRESULT WINAPI D3D9MipMap_LockRect(LPDIRECT3DTEXTURE9 iface, UINT Level, D3DLOCKED_RECT* pLockedRect, CONST RECT* pRect, DWORD Flags) +{ + UNIMPLEMENTED + return D3D_OK; +} + +HRESULT WINAPI D3D9MipMap_UnlockRect(LPDIRECT3DTEXTURE9 iface, UINT Level) +{ + UNIMPLEMENTED + return D3D_OK; +} + +HRESULT WINAPI D3D9MipMap_AddDirtyRect(LPDIRECT3DTEXTURE9 iface, CONST RECT* pDirtyRect) +{ + UNIMPLEMENTED + return D3D_OK; +} + +#if !defined(__cplusplus) || defined(CINTERFACE) +static IDirect3DTexture9Vtbl D3D9MipMap_Vtbl = +{ + /* IUnknown methods */ + D3D9MipMap_QueryInterface, + D3D9MipMap_AddRef, + D3D9MipMap_Release, + + /* IDirect3DBaseTexture9 methods */ + D3D9MipMap_GetDevice, + D3D9MipMap_SetPrivateData, + D3D9MipMap_GetPrivateData, + D3D9MipMap_FreePrivateData, + D3D9MipMap_SetPriority, + D3D9MipMap_GetPriority, + D3D9MipMap_PreLoad, + D3D9MipMap_GetType, + D3D9MipMap_SetLOD, + D3D9MipMap_GetLOD, + D3D9MipMap_GetLevelCount, + D3D9MipMap_SetAutoGenFilterType, + D3D9MipMap_GetAutoGenFilterType, + D3D9MipMap_GenerateMipSubLevels, + + /* IDirect3DTexture9 methods */ + D3D9MipMap_GetLevelDesc, + D3D9MipMap_GetSurfaceLevel, + D3D9MipMap_LockRect, + D3D9MipMap_UnlockRect, + D3D9MipMap_AddDirtyRect, +}; +#endif // !defined(__cplusplus) || defined(CINTERFACE) HRESULT CreateD3D9MipMap(DIRECT3DDEVICE9_INT* pDevice, UINT Width, UINT Height, UINT Levels, DWORD Usage, D3DFORMAT Format, D3DPOOL Pool, IDirect3DTexture9** ppTexture) { + LPD3D9MIPMAP pThisTexture; + if (FAILED(AlignedAlloc((LPVOID*)&pThisTexture, sizeof(D3D9MipMap)))) + { + DPRINT1("Could not create D3D9MipMap"); + return E_OUTOFMEMORY; + } + + pThisTexture->lpVtbl = &D3D9MipMap_Vtbl; + + pThisTexture->dwWidth = Width; + pThisTexture->dwHeight = Height; + pThisTexture->Format = Format; + + *ppTexture = (IDirect3DTexture9*)pThisTexture->lpVtbl; + UNIMPLEMENTED; return D3D_OK; } - Modified: trunk/reactos/dll/directx/d3d9/d3d9_mipmap.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_mipm… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_mipmap.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_mipmap.h [iso-8859-1] Sun Sep 21 07:25:38 2008 @@ -14,12 +14,46 @@ typedef struct _D3D9MipMap { -/* 0x0000 */ D3D9Texture BaseTexture; -/* 0x0068 */ DWORD dwUnknown68; +/* 0x0000 */ Direct3DBaseTexture9_INT BaseTexture; +/* 0x0060 */ struct IDirect3DTexture9Vtbl* lpVtbl; +/* 0x0064 */ LPDWORD dwUnknown64; +/* 0x0068 */ D3DFORMAT Format; /* 0x006c */ DWORD dwUnknown6c; /* 0x0070 */ DWORD dwUnknown70; /* 0x0074 */ DWORD dwUnknown74; -} D3D9MipMap; +/* 0x0078 */ DWORD dwUnknown78; +/* 0x007c */ DWORD dwUnknown7c; +/* 0x0080 */ DWORD dwWidth; +/* 0x0084 */ DWORD dwHeight; +/* 0x0088 */ DWORD dwUnknown88; +/* 0x008c */ DWORD dwUnknown8c; +/* 0x0090 */ DWORD dwUnknown90; +/* 0x0094 */ DWORD dwUnknown94; +/* 0x0098 */ DWORD dwUnknown98; +/* 0x009c */ DWORD dwUnknown9c; +/* 0x00a0 */ DWORD dwUnknowna0; +/* 0x00a4 */ DWORD dwUnknowna4; +/* 0x00a8 */ DWORD dwUnknowna8; +/* 0x00ac */ DWORD dwUnknownac; +/* 0x00b0 */ DWORD dwUnknownb0; +/* 0x00b4 */ DWORD dwUnknownb4; +/* 0x00b8 */ DWORD dwUnknownb8; +/* 0x00bc */ DWORD dwUnknownbc; +/* 0x00c0 */ DWORD dwUnknownc0; +/* 0x00c4 */ DWORD dwUnknownc4; +/* 0x00c8 */ DWORD dwUnknownc8; +/* 0x00cc */ DWORD dwUnknowncc; +/* 0x00d0 */ DWORD dwUnknownd0; +/* 0x00d4 */ DWORD dwUnknownd4; +/* 0x00d8 */ DWORD dwUnknownd8; +/* 0x00dc */ DWORD dwUnknowndc; +/* 0x00e0 */ DWORD dwUnknowne0; +/* 0x00e4 */ DWORD dwUnknowne4; +/* 0x00e8 */ DWORD dwUnknowne8; +/* 0x00ec */ DWORD dwUnknownec; +/* 0x00f0 */ DWORD dwUnknownf0; +/* 0x00f4 */ DWORD dwUnknownf4; +} D3D9MipMap, FAR* LPD3D9MIPMAP; HRESULT CreateD3D9MipMap(struct _Direct3DDevice9_INT* pDevice, UINT Width, UINT Height, UINT Levels, DWORD Usage, D3DFORMAT Format, D3DPOOL Pool, IDirect3DTexture9** ppTexture); Modified: trunk/reactos/dll/directx/d3d9/d3d9_resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_reso… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_resource.h [iso-8859-1] Sun Sep 21 07:25:38 2008 @@ -10,7 +10,7 @@ #include "d3d9_baseobject.h" -typedef struct _D3D9Resource +typedef struct _Direct3DResource9_INT { /* 0x0000 */ D3D9BaseObject BaseObject; /* 0x0020 */ DWORD dwUnknown20; @@ -19,9 +19,11 @@ /* 0x002c */ DWORD dwUnknown2c; /* 0x0030 */ DWORD dwUnknown30; /* 0x0034 */ DWORD dwUnknown34; -/* 0x0038 */ DWORD dwUnknown38; +/* 0x0038 */ D3DPOOL Pool; /* 0x003c */ DWORD dwUnknown3c; -/* 0x0040 */ DWORD dwUnknown40; -} D3D9Resource; +/* 0x0040 */ LPDWORD dwUnknown40; +} Direct3DResource9_INT; + + #endif // _D3D9_RESOURCE_H_ Modified: trunk/reactos/dll/directx/d3d9/d3d9_swapchain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_swap… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_swapchain.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_swapchain.c [iso-8859-1] Sun Sep 21 07:25:38 2008 @@ -14,10 +14,8 @@ #include "d3d9_device.h" #include "d3d9_cursor.h" -#define LOCK_D3DDEVICE9() if (This->BaseObject.pUnknown && ((LPDIRECT3DDEVICE9_INT)This->BaseObject.pUnknown)->bLockDevice) \ - EnterCriticalSection(&((LPDIRECT3DDEVICE9_INT)This->BaseObject.pUnknown)->CriticalSection); -#define UNLOCK_D3DDEVICE9() if (This->BaseObject.pUnknown && ((LPDIRECT3DDEVICE9_INT)This->BaseObject.pUnknown)->bLockDevice) \ - LeaveCriticalSection(&((LPDIRECT3DDEVICE9_INT)This->BaseObject.pUnknown)->CriticalSection); +#define LOCK_D3DDEVICE9() D3D9BaseObject_LockDevice(&This->BaseObject) +#define UNLOCK_D3DDEVICE9() D3D9BaseObject_UnlockDevice(&This->BaseObject) /* Convert a IDirect3DSwapChain9 pointer safely to the internal implementation struct */ static LPDIRECT3DSWAPCHAIN9_INT IDirect3DSwapChain9ToImpl(LPDIRECT3DSWAPCHAIN9 iface) Modified: trunk/reactos/dll/directx/d3d9/d3d9_texture.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_text… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_texture.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_texture.h [iso-8859-1] Sun Sep 21 07:25:38 2008 @@ -10,18 +10,18 @@ #include "d3d9_resource.h" -typedef struct _D3D9Texture +typedef struct _Direct3DBaseTexture9_INT { -/* 0x0000 */ D3D9Resource BaseResource; -/* 0x0044 */ DWORD dwUnknown44; -/* 0x0048 */ DWORD dwUnknown48; +/* 0x0000 */ struct IDirect3DBaseTexture9Vtbl* lpVtbl; +/* 0x0004 */ DWORD dwUnknown04; +/* 0x0008 */ Direct3DResource9_INT BaseResource; /* 0x004c */ DWORD dwUnknown4c; /* 0x0050 */ DWORD dwUnknown50; -/* 0x0054 */ DWORD dwUnknown54; -/* 0x0058 */ DWORD dwUnknown58; -/* 0x005c */ DWORD dwUnknown5c; -/* 0x0060 */ DWORD dwUnknown60; -/* 0x0064 */ DWORD dwUnknown64; -} D3D9Texture; +/* 0x0054 */ DWORD Usage; +/* 0x0058 */ WORD MipMapLevels; +/* 0x005a */ WORD dUnknown5a; +/* 0x005c */ WORD MipMapLevels2; +/* 0x005e */ WORD dUnknown5e; +} Direct3DBaseTexture9_INT; #endif // _D3D9_TEXTURE_H_

1 0

[cwittich] 36369: fix two nice typo's (array subscript was above array bounds)
by cwittich＠svn.reactos.org 21 Sep '08

21 Sep '08

Author: cwittich Date: Sun Sep 21 07:12:37 2008 New Revision: 36369 URL: http://svn.reactos.org/svn/reactos?rev=36369&view=rev Log: fix two nice typo's (array subscript was above array bounds) Modified: trunk/reactos/dll/win32/shell32/shfldr_fonts.c Modified: trunk/reactos/dll/win32/shell32/shfldr_fonts.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_f… ============================================================================== --- trunk/reactos/dll/win32/shell32/shfldr_fonts.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shfldr_fonts.c [iso-8859-1] Sun Sep 21 07:12:37 2008 @@ -912,14 +912,14 @@ if (LoadStringW(shell32_hInstance, IDS_OPEN, szBuffer, sizeof(szBuffer)/sizeof(WCHAR))) { - szBuffer[(sizeof(szBuffer)/sizeof(char))-1] = L'\0'; + szBuffer[(sizeof(szBuffer)/sizeof(WCHAR))-1] = L'\0'; _InsertMenuItemW(hMenu, indexMenu++, TRUE, idCmdFirst + Count, MFT_STRING, szBuffer, MFS_DEFAULT); Count++; } if (LoadStringW(shell32_hInstance, IDS_PRINT_VERB, szBuffer, sizeof(szBuffer)/sizeof(WCHAR))) { - szBuffer[(sizeof(szBuffer)/sizeof(char))-1] = L'\0'; + szBuffer[(sizeof(szBuffer)/sizeof(WCHAR))-1] = L'\0'; _InsertMenuItemW(hMenu, indexMenu++, TRUE, idCmdFirst + Count++, MFT_STRING, szBuffer, MFS_ENABLED); }

1 0

[cwittich] 36368: sync msiexec with wine 1.1.5
by cwittich＠svn.reactos.org 21 Sep '08

21 Sep '08

Author: cwittich Date: Sun Sep 21 07:00:07 2008 New Revision: 36368 URL: http://svn.reactos.org/svn/reactos?rev=36368&view=rev Log: sync msiexec with wine 1.1.5 Modified: trunk/reactos/base/system/msiexec/msiexec.c trunk/reactos/base/system/msiexec/service.c Modified: trunk/reactos/base/system/msiexec/msiexec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/msiexec/msiexe… ============================================================================== --- trunk/reactos/base/system/msiexec/msiexec.c [iso-8859-1] (original) +++ trunk/reactos/base/system/msiexec/msiexec.c [iso-8859-1] Sun Sep 21 07:00:07 2008 @@ -344,14 +344,14 @@ CHAR path[MAX_PATH+12]; DWORD ret = 0; - scm = OpenSCManager(NULL, SERVICES_ACTIVE_DATABASE, SC_MANAGER_CREATE_SERVICE); + scm = OpenSCManagerA(NULL, SERVICES_ACTIVE_DATABASEA, SC_MANAGER_CREATE_SERVICE); if (!scm) { fprintf(stderr, "Failed to open the service control manager.\n"); return 1; } - GetSystemDirectory(path, MAX_PATH); + GetSystemDirectoryA(path, MAX_PATH); lstrcatA(path, "\\msiexec.exe /V"); service = CreateServiceA(scm, "MSIServer", "MSIServer", GENERIC_ALL, Modified: trunk/reactos/base/system/msiexec/service.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/msiexec/servic… ============================================================================== --- trunk/reactos/base/system/msiexec/service.c [iso-8859-1] (original) +++ trunk/reactos/base/system/msiexec/service.c [iso-8859-1] Sun Sep 21 07:00:07 2008 @@ -132,7 +132,7 @@ UpdateSCMStatus(SERVICE_START_PENDING, NO_ERROR, 0); - kill_event = CreateEvent(0, TRUE, FALSE, 0); + kill_event = CreateEventW(0, TRUE, FALSE, 0); if (!kill_event) { fprintf(stderr, "Failed to create event\n"); @@ -156,7 +156,7 @@ { char service_name[] = "MSIServer"; - const SERVICE_TABLE_ENTRY service[] = + const SERVICE_TABLE_ENTRYA service[] = { {service_name, ServiceMain}, {NULL, NULL}, @@ -164,7 +164,7 @@ WINE_TRACE("Starting MSIServer service\n"); - if (!StartServiceCtrlDispatcher(service)) + if (!StartServiceCtrlDispatcherA(service)) { fprintf(stderr, "Failed to start MSIServer service\n"); return 1;

1 0

[fireball] 36367: - FileOffset is 32bit long, not 64bit, so no reason in additional casting. - Fix a ULONG -> BOOLEAN conversion warning.
by fireball＠svn.reactos.org 21 Sep '08

21 Sep '08

Author: fireball Date: Sun Sep 21 06:34:04 2008 New Revision: 36367 URL: http://svn.reactos.org/svn/reactos?rev=36367&view=rev Log: - FileOffset is 32bit long, not 64bit, so no reason in additional casting. - Fix a ULONG -> BOOLEAN conversion warning. Modified: trunk/reactos/lib/cmlib/hivecell.c trunk/reactos/lib/cmlib/hivewrt.c Modified: trunk/reactos/lib/cmlib/hivecell.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hivecell.c?rev=3… ============================================================================== --- trunk/reactos/lib/cmlib/hivecell.c [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/hivecell.c [iso-8859-1] Sun Sep 21 06:34:04 2008 @@ -124,6 +124,8 @@ HvIsCellDirty(IN PHHIVE Hive, IN HCELL_INDEX Cell) { + BOOLEAN IsDirty = FALSE; + /* Sanity checks */ ASSERT(Hive->ReadOnly == FALSE); @@ -132,7 +134,11 @@ return TRUE; /* Check if the dirty bit is set */ - return RtlCheckBit(&Hive->DirtyVector, Cell / HV_BLOCK_SIZE); + if (RtlCheckBit(&Hive->DirtyVector, Cell / HV_BLOCK_SIZE)) + IsDirty = TRUE; + + /* Return result as boolean*/ + return IsDirty; } static ULONG __inline CMAPI Modified: trunk/reactos/lib/cmlib/hivewrt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hivewrt.c?rev=36… ============================================================================== --- trunk/reactos/lib/cmlib/hivewrt.c [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/hivewrt.c [iso-8859-1] Sun Sep 21 06:34:04 2008 @@ -189,7 +189,7 @@ } BlockPtr = (PVOID)RegistryHive->Storage[Stable].BlockList[BlockIndex].BlockAddress; - FileOffset = (ULONGLONG)(BlockIndex + 1) * (ULONGLONG)HV_BLOCK_SIZE; + FileOffset = (BlockIndex + 1) * HV_BLOCK_SIZE; /* Write hive block */ Success = RegistryHive->FileWrite(RegistryHive, HFILE_TYPE_PRIMARY,

1 0

[cwittich] 36366: fix wrong casts
by cwittich＠svn.reactos.org 21 Sep '08

21 Sep '08

Author: cwittich Date: Sun Sep 21 01:52:54 2008 New Revision: 36366 URL: http://svn.reactos.org/svn/reactos?rev=36366&view=rev Log: fix wrong casts Modified: trunk/rosapps/applications/downloader/main.c Modified: trunk/rosapps/applications/downloader/main.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/downloader/ma… ============================================================================== --- trunk/rosapps/applications/downloader/main.c [iso-8859-1] (original) +++ trunk/rosapps/applications/downloader/main.c [iso-8859-1] Sun Sep 21 01:52:54 2008 @@ -81,7 +81,7 @@ { TV_INSERTSTRUCTW Insert; - Insert.item.lParam = (UINT)Category; + Insert.item.lParam = (LPARAM)Category; Insert.item.mask = TVIF_TEXT|TVIF_PARAM|TVIF_IMAGE|TVIF_SELECTEDIMAGE;; Insert.item.pszText = Category->Name; Insert.item.cchTextMax = lstrlenW(Category->Name); @@ -126,7 +126,7 @@ CurrentApplication = Category->Apps; while(CurrentApplication) { - Insert.item.lParam = (UINT)CurrentApplication; + Insert.item.lParam = (LPARAM)CurrentApplication; Insert.item.pszText = CurrentApplication->Name; Insert.item.cchTextMax = lstrlenW(CurrentApplication->Name); Insert.item.iImage = 10;

1 0

[cwittich] 36365: fix brackets
by cwittich＠svn.reactos.org 21 Sep '08

21 Sep '08

Author: cwittich Date: Sun Sep 21 01:42:21 2008 New Revision: 36365 URL: http://svn.reactos.org/svn/reactos?rev=36365&view=rev Log: fix brackets Modified: trunk/reactos/lib/3rdparty/mingw/getopt.c Modified: trunk/reactos/lib/3rdparty/mingw/getopt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/getopt.… ============================================================================== --- trunk/reactos/lib/3rdparty/mingw/getopt.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/mingw/getopt.c [iso-8859-1] Sun Sep 21 01:42:21 2008 @@ -82,7 +82,7 @@ ++ s_nArgChar; /* unrecognized option */ - if(_toptopt == _T(':') || (pcOptChar = _tcschr(optstring, _toptopt)) == NULL) + if((_toptopt == _T(':')) || ((pcOptChar = _tcschr(optstring, _toptopt)) == NULL)) { /* print an error message */ if(_topterr && optstring[0] != _T(':'))

1 0

[cgutman] 36364: - Remove more useless code
by cgutman＠svn.reactos.org 21 Sep '08

21 Sep '08

Author: cgutman Date: Sat Sep 20 22:21:34 2008 New Revision: 36364 URL: http://svn.reactos.org/svn/reactos?rev=36364&view=rev Log: - Remove more useless code Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/io.c Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/io.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/ndis/ndis/io.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/ndis/ndis/io.c [iso-8859-1] Sat Sep 20 22:21:34 2008 @@ -28,37 +28,15 @@ * SystemArgument2 = Unused */ { - BOOLEAN WasBusy; PLOGICAL_ADAPTER Adapter = GET_LOGICAL_ADAPTER(DeferredContext); NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); - - /* XXX try to grok WasBusy */ - KeAcquireSpinLockAtDpcLevel(&Adapter->NdisMiniportBlock.Lock); - { - WasBusy = Adapter->MiniportBusy; - Adapter->MiniportBusy = TRUE; - } - KeReleaseSpinLockFromDpcLevel(&Adapter->NdisMiniportBlock.Lock); /* Call the deferred interrupt service handler for this adapter */ (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.HandleInterruptHandler)( Adapter->NdisMiniportBlock.MiniportAdapterContext); - - KeAcquireSpinLockAtDpcLevel(&Adapter->NdisMiniportBlock.Lock); - { - if ((!WasBusy) && (Adapter->WorkQueueHead)) - { - KeInsertQueueDpc(&Adapter->NdisMiniportBlock.DeferredDpc, NULL, NULL); - } - else - { - Adapter->MiniportBusy = WasBusy; - } - } - KeReleaseSpinLockFromDpcLevel(&Adapter->NdisMiniportBlock.Lock); /* re-enable the interrupt */ NDIS_DbgPrint(MAX_TRACE, ("re-enabling the interrupt\n"));

1 0

[cgutman] 36363: - Set MiniportBusy to TRUE in MiniDequeueWorkItem instead of MiniQueueWorkItem - Fail if another miniport request is still in progress
by cgutman＠svn.reactos.org 21 Sep '08

21 Sep '08

Author: cgutman Date: Sat Sep 20 21:35:23 2008 New Revision: 36363 URL: http://svn.reactos.org/svn/reactos?rev=36363&view=rev Log: - Set MiniportBusy to TRUE in MiniDequeueWorkItem instead of MiniQueueWorkItem - Fail if another miniport request is still in progress 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] Sat Sep 20 21:35:23 2008 @@ -634,8 +634,6 @@ KeInsertQueueDpc(&Adapter->NdisMiniportBlock.DeferredDpc, NULL, NULL); - Adapter->MiniportBusy = TRUE; - return NDIS_STATUS_SUCCESS; } @@ -663,6 +661,12 @@ NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); + if (Adapter->MiniportBusy) { + NDIS_DbgPrint(MID_TRACE, ("Waiting for miniport to become free.\n")); + KeInsertQueueDpc(&Adapter->NdisMiniportBlock.DeferredDpc, NULL, NULL); + return NDIS_STATUS_FAILURE; + } + Item = Adapter->WorkQueueHead; if (Item) @@ -677,6 +681,8 @@ *WorkItemContext = Item->WorkItemContext; ExFreePool(Item); + + Adapter->MiniportBusy = TRUE; return NDIS_STATUS_SUCCESS; } @@ -900,6 +906,9 @@ } } + if( NdisStatus != NDIS_STATUS_PENDING ) + Adapter->MiniportBusy = FALSE; + ExFreePool(WorkItem); }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs