Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 40375: - Check if allocation of work item succeeded - Thanks Ged, aicom - Fix leaking of a work item on close event / irp stream run out

by janderwald＠svn.reactos.org

Author: janderwald Date: Sun Apr 5 20:39:51 2009 New Revision: 40375 URL: http://svn.reactos.org/svn/reactos?rev=40375&view=rev Log: - Check if allocation of work item succeeded - Thanks Ged, aicom - Fix leaking of a work item on close event / irp stream run out Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c [iso-8859-1] Sun Apr 5 20:39:51 2009 @@ -135,6 +135,13 @@ /* allocate create item */ portcls_ext->CreateItems = AllocateItem(NonPagedPool, MaxObjects * sizeof(KSOBJECT_CREATE_ITEM), TAG_PORTCLASS); + if (!portcls_ext->CreateItems) + { + /* not enough resources */ + IoDeleteDevice(fdo); + return STATUS_INSUFFICIENT_RESOURCES; + } + /* store the physical device object */ portcls_ext->PhysicalDeviceObject = PhysicalDeviceObject; /* set up the start device function */ @@ -152,6 +159,17 @@ /* allocate work item */ portcls_ext->WorkItem = IoAllocateWorkItem(fdo); + if (!portcls_ext->WorkItem) + { + /* not enough resources */ + FreeItem(portcls_ext->CreateItems, TAG_PORTCLASS); + /* delete created fdo */ + IoDeleteDevice(fdo); + /* return error code */ + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* allocate the device header */ status = KsAllocateDeviceHeader(&portcls_ext->KsDeviceHeader, MaxObjects, portcls_ext->CreateItems); /* did we succeed */ @@ -159,6 +177,8 @@ { /* free previously allocated create items */ FreeItem(portcls_ext->CreateItems, TAG_PORTCLASS); + /* free allocated work item */ + IoFreeWorkItem(portcls_ext->WorkItem); /* delete created fdo */ IoDeleteDevice(fdo); /* return error code */ @@ -180,6 +200,8 @@ KsFreeDeviceHeader(portcls_ext->KsDeviceHeader); /* free previously allocated create items */ FreeItem(portcls_ext->CreateItems, TAG_PORTCLASS); + /* free allocated work item */ + IoFreeWorkItem(portcls_ext->WorkItem); /* delete created fdo */ IoDeleteDevice(fdo); /* return error code */ Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c [iso-8859-1] Sun Apr 5 20:39:51 2009 @@ -215,20 +215,20 @@ IN PVOID SystemArgument1, IN PVOID SystemArgument2) { + PDEVICE_OBJECT DeviceObject; + PPCLASS_DEVICE_EXTENSION DeviceExtension; IPortPinWaveCyclicImpl * This = (IPortPinWaveCyclicImpl*)DeferredContext; - PIO_WORKITEM WorkItem; if (This->IrpQueue->lpVtbl->NumMappings(This->IrpQueue)) return; - WorkItem = IoAllocateWorkItem(GetDeviceObject(This->Port)); - if (!WorkItem) - return; - - IoQueueWorkItem(WorkItem, StopStreamWorkerRoutine, DelayedWorkQueue, (PVOID)This); -} - - + /* Get device object */ + DeviceObject = GetDeviceObject(This->Port); + /* Get device extension */ + DeviceExtension = (PPCLASS_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + /* queue the work item */ + IoQueueWorkItem(DeviceExtension->WorkItem, StopStreamWorkerRoutine, DelayedWorkQueue, (PVOID)This); +} static VOID @@ -248,7 +248,6 @@ KeInsertQueueDpc(&This->Dpc, NULL, NULL); return; } - Status = This->Stream->lpVtbl->GetPosition(This->Stream, &Position); DPRINT("Position %u Buffer %p BufferSize %u ActiveIrpOffset %u\n", Position, Buffer, This->CommonBufferSize, BufferSize); @@ -692,23 +691,26 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - PIO_WORKITEM WorkItem; - + PPCLASS_DEVICE_EXTENSION DeviceExtension; IPortPinWaveCyclicImpl * This = (IPortPinWaveCyclicImpl*)iface; if (This->Stream) { - WorkItem = IoAllocateWorkItem(DeviceObject); - if (WorkItem) + if (Irp) { - if (Irp) - { - This->CloseIrp = Irp; - IoMarkIrpPending(Irp); - Irp->IoStatus.Information = 0; - Irp->IoStatus.Status = STATUS_PENDING; - } - IoQueueWorkItem(WorkItem, CloseStreamRoutine, DelayedWorkQueue, (PVOID)This); + This->CloseIrp = Irp; + IoMarkIrpPending(Irp); + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = STATUS_PENDING; + } + /* Get device extension */ + DeviceExtension = (PPCLASS_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + /* defer work item */ + IoQueueWorkItem(DeviceExtension->WorkItem, CloseStreamRoutine, DelayedWorkQueue, (PVOID)This); + + if (Irp) + { + /* The WaveCyclic filter passes close request with NULL / IRP */ return STATUS_PENDING; } }

16 years, 3 months

[khornicek] 40374: - add a stub for D3DParseUnknownCommand

by khornicek＠svn.reactos.org

Author: khornicek Date: Sun Apr 5 20:29:45 2009 New Revision: 40374 URL: http://svn.reactos.org/svn/reactos?rev=40374&view=rev Log: - add a stub for D3DParseUnknownCommand Added: trunk/reactos/dll/directx/wine/ddraw/stubs.c (with props) Modified: trunk/reactos/dll/directx/wine/ddraw/ddraw.rbuild trunk/reactos/dll/directx/wine/ddraw/ddraw.spec Modified: trunk/reactos/dll/directx/wine/ddraw/ddraw.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ddr… ============================================================================== --- trunk/reactos/dll/directx/wine/ddraw/ddraw.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/ddraw/ddraw.rbuild [iso-8859-1] Sun Apr 5 20:29:45 2009 @@ -30,6 +30,7 @@ <file>palette.c</file> <file>parent.c</file> <file>regsvr.c</file> + <file>stubs.c</file> <file>surface.c</file> <file>surface_thunks.c</file> <file>texture.c</file> Modified: trunk/reactos/dll/directx/wine/ddraw/ddraw.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ddr… ============================================================================== --- trunk/reactos/dll/directx/wine/ddraw/ddraw.spec [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/ddraw/ddraw.spec [iso-8859-1] Sun Apr 5 20:29:45 2009 @@ -26,3 +26,4 @@ @ stub VidMemFree @ stub VidMemInit @ stub VidMemLargestFree +@ stdcall D3DParseUnknownCommand(ptr ptr) Added: trunk/reactos/dll/directx/wine/ddraw/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/stu… ============================================================================== --- trunk/reactos/dll/directx/wine/ddraw/stubs.c (added) +++ trunk/reactos/dll/directx/wine/ddraw/stubs.c [iso-8859-1] Sun Apr 5 20:29:45 2009 @@ -1,0 +1,8 @@ +#include "ddraw_private.h" + +HRESULT WINAPI +D3DParseUnknownCommand( LPVOID lpCmd, + LPVOID *lpRetCmd) +{ + return DD_OK; +} Propchange: trunk/reactos/dll/directx/wine/ddraw/stubs.c ------------------------------------------------------------------------------ svn:eol-style = native

16 years, 3 months

[janderwald] 40373: - Fix leaking of work item for each detected audio device

by janderwald＠svn.reactos.org

Author: janderwald Date: Sun Apr 5 20:05:54 2009 New Revision: 40373 URL: http://svn.reactos.org/svn/reactos?rev=40373&view=rev Log: - Fix leaking of work item for each detected audio device Modified: trunk/reactos/drivers/wdm/audio/sysaudio/deviface.c trunk/reactos/drivers/wdm/audio/sysaudio/main.c Modified: trunk/reactos/drivers/wdm/audio/sysaudio/deviface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… ============================================================================== --- trunk/reactos/drivers/wdm/audio/sysaudio/deviface.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/sysaudio/deviface.c [iso-8859-1] Sun Apr 5 20:05:54 2009 @@ -17,7 +17,7 @@ NTAPI FilterPinWorkerRoutine( IN PDEVICE_OBJECT DeviceObject, - IN PVOID Context) + IN PVOID Context) { KSPROPERTY PropertyRequest; KSP_PIN PinRequest; @@ -27,6 +27,7 @@ ULONG Count, Index; NTSTATUS Status; ULONG BytesReturned; + PSYSAUDIODEVEXT DeviceExtension; PKSAUDIO_DEVICE_ENTRY DeviceEntry = (PKSAUDIO_DEVICE_ENTRY)Context; @@ -40,17 +41,22 @@ Status = KsSynchronousIoControlDevice(DeviceEntry->FileObject, KernelMode, IOCTL_KS_PROPERTY, (PVOID)&PropertyRequest, sizeof(KSPROPERTY), (PVOID)&Count, sizeof(ULONG), &BytesReturned); if (!NT_SUCCESS(Status)) { + ExFreePool(DeviceEntry); return; } if (!Count) + { + ExFreePool(DeviceEntry); return; + } /* allocate pin array */ DeviceEntry->Pins = ExAllocatePool(NonPagedPool, Count * sizeof(PIN_INFO)); if (!DeviceEntry->Pins) { /* no memory */ + ExFreePool(DeviceEntry); return; } /* clear array */ @@ -96,6 +102,12 @@ } DPRINT1("Num Pins %u Num WaveIn Pins %u Name WaveOut Pins %u\n", DeviceEntry->NumberOfPins, DeviceEntry->NumWaveInPin, DeviceEntry->NumWaveOutPin); + + DeviceExtension = (PSYSAUDIODEVEXT)DeviceObject->DeviceExtension; + + InsertTailList(&DeviceExtension->KsAudioDeviceList, &DeviceEntry->Entry); + DeviceExtension->NumberOfKsAudioDevices++; + } NTSTATUS @@ -153,6 +165,7 @@ DEVICE_INTERFACE_CHANGE_NOTIFICATION * Event; NTSTATUS Status = STATUS_SUCCESS; PSYSAUDIODEVEXT DeviceExtension; + PKSAUDIO_DEVICE_ENTRY DeviceEntry; PDEVICE_OBJECT DeviceObject = (PDEVICE_OBJECT)Context; DeviceExtension = (PSYSAUDIODEVEXT)DeviceObject->DeviceExtension; @@ -163,10 +176,6 @@ &GUID_DEVICE_INTERFACE_ARRIVAL)) { /* a new device has arrived */ - - PKSAUDIO_DEVICE_ENTRY DeviceEntry; - PIO_WORKITEM WorkItem; - DeviceEntry = ExAllocatePool(NonPagedPool, sizeof(KSAUDIO_DEVICE_ENTRY)); if (!DeviceEntry) { @@ -206,16 +215,11 @@ return Status; } - DPRINT1("Successfully opened audio device %u handle %p file object %p device object %p\n", DeviceExtension->KsAudioDeviceList, DeviceEntry->Handle, DeviceEntry->FileObject, DeviceEntry->FileObject->DeviceObject); - DeviceExtension->NumberOfKsAudioDevices++; - - WorkItem = IoAllocateWorkItem(DeviceObject); - if (WorkItem) - { - IoQueueWorkItem(WorkItem, FilterPinWorkerRoutine, DelayedWorkQueue, (PVOID)DeviceEntry); - } - InsertTailList(&DeviceExtension->KsAudioDeviceList, &DeviceEntry->Entry); - + DPRINT1("Successfully opened audio device %u handle %p file object %p device object %p\n", DeviceExtension->NumberOfKsAudioDevices, DeviceEntry->Handle, DeviceEntry->FileObject, DeviceEntry->FileObject->DeviceObject); + + //FIXME + // mutal exclusion + IoQueueWorkItem(DeviceExtension->WorkItem, FilterPinWorkerRoutine, DelayedWorkQueue, (PVOID)DeviceEntry); return Status; } else Modified: trunk/reactos/drivers/wdm/audio/sysaudio/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… ============================================================================== --- trunk/reactos/drivers/wdm/audio/sysaudio/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/sysaudio/main.c [iso-8859-1] Sun Apr 5 20:05:54 2009 @@ -131,6 +131,22 @@ goto cleanup; } + /* allocate work item */ + DeviceExtension->WorkItem = IoAllocateWorkItem(DeviceObject); + if (!DeviceExtension->WorkItem) + { + DPRINT1("Failed to allocate work item\n"); + goto cleanup; + } + + /* allocate work item context */ + DeviceExtension->WorkerContext = ExAllocatePool(NonPagedPool, sizeof(PIN_WORKER_CONTEXT)); + if (!DeviceExtension->WorkerContext) + { + DPRINT1("Failed to allocate work item context\n"); + goto cleanup; + } + /* Register device notification hooks */ Status = SysAudioRegisterNotifications(DriverObject, DeviceObject); @@ -139,23 +155,6 @@ DPRINT1("Failed to register device notifications\n"); goto cleanup; } - - /* allocate work item */ - DeviceExtension->WorkItem = IoAllocateWorkItem(DeviceObject); - if (!DeviceExtension->WorkItem) - { - DPRINT1("Failed to allocate work item\n"); - goto cleanup; - } - - /* allocate work item context */ - DeviceExtension->WorkerContext = ExAllocatePool(NonPagedPool, sizeof(PIN_WORKER_CONTEXT)); - if (!DeviceExtension->WorkerContext) - { - DPRINT1("Failed to allocate work item context\n"); - goto cleanup; - } - /* Load kmixer */ Status = SysAudioOpenKMixer(DeviceExtension);

16 years, 3 months

[khornicek] 40372: - IntEnumDisplaySettings returns NTSTATUS, fix the check accordingly

by khornicek＠svn.reactos.org

Author: khornicek Date: Sun Apr 5 19:15:16 2009 New Revision: 40372 URL: http://svn.reactos.org/svn/reactos?rev=40372&view=rev Log: - IntEnumDisplaySettings returns NTSTATUS, fix the check accordingly Modified: trunk/reactos/subsystems/win32/win32k/objects/device.c Modified: trunk/reactos/subsystems/win32/win32k/objects/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/device.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/device.c [iso-8859-1] Sun Apr 5 19:15:16 2009 @@ -1246,7 +1246,8 @@ RtlZeroMemory(&lpDevMode, sizeof(DEVMODEW)); lpDevMode.dmSize = sizeof(DEVMODEW); - if (!IntEnumDisplaySettings(pDeviceName, ENUM_CURRENT_SETTINGS, &lpDevMode, 0)) + Status = IntEnumDisplaySettings(pDeviceName, ENUM_CURRENT_SETTINGS, &lpDevMode, 0); + if (!NT_SUCCESS(Status)) return DISP_CHANGE_FAILED; DPRINT1("Req Mode : %d x %d x %d\n", DevMode->dmPelsWidth,DevMode->dmPelsHeight,DevMode->dmBitsPerPel);

16 years, 3 months

[fireball] 40368: - Compile UniATA with stdcall default calling convention instead of cdecl.

by fireball＠svn.reactos.org

Author: fireball Date: Sun Apr 5 15:46:53 2009 New Revision: 40368 URL: http://svn.reactos.org/svn/reactos?rev=40368&view=rev Log: - Compile UniATA with stdcall default calling convention instead of cdecl. Modified: trunk/reactos/drivers/storage/ide/uniata/uniata.rbuild Modified: trunk/reactos/drivers/storage/ide/uniata/uniata.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/uniata.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/uniata.rbuild [iso-8859-1] Sun Apr 5 15:46:53 2009 @@ -4,6 +4,7 @@ <bootstrap installbase="$(CDOUTPUT)" /> <include base="uniata">.</include> <include base="uniata">inc</include> + <compilerflag>-mrtd</compilerflag>  <library>ntoskrnl</library> <library>hal</library>

16 years, 3 months

[khornicek] 40371: - leftover from the previous commit

by khornicek＠svn.reactos.org

Author: khornicek Date: Sun Apr 5 18:41:53 2009 New Revision: 40371 URL: http://svn.reactos.org/svn/reactos?rev=40371&view=rev Log: - leftover from the previous commit Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Sun Apr 5 18:41:53 2009 @@ -142,7 +142,7 @@ dll\directx\dplayx\dplayx.dll 1 dll\directx\dsound\dsound.dll 1 dll\directx\dxdiagn\dxdiagn.dll 1 -dll\directx\ddraw\ddraw.dll 1 +dll\directx\wine\ddraw\ddraw.dll 1 dll\directx\d3d8thk\d3d8thk.dll 1 dll\directx\devenum\devenum.dll 1 dll\directx\ksproxy\ksproxy.ax 1

16 years, 3 months

[khornicek] 40370: - import ddraw from Wine and use it for now - sync wined3d, d3d8, d3d9 with Wine HEAD

by khornicek＠svn.reactos.org

Author: khornicek Date: Sun Apr 5 17:52:15 2009 New Revision: 40370 URL: http://svn.reactos.org/svn/reactos?rev=40370&view=rev Log: - import ddraw from Wine and use it for now - sync wined3d, d3d8, d3d9 with Wine HEAD Added: trunk/reactos/dll/directx/wine/ddraw/ (with props) trunk/reactos/dll/directx/wine/ddraw/clipper.c (with props) trunk/reactos/dll/directx/wine/ddraw/ddcomimpl.h (with props) trunk/reactos/dll/directx/wine/ddraw/ddraw.c (with props) trunk/reactos/dll/directx/wine/ddraw/ddraw.rbuild (with props) trunk/reactos/dll/directx/wine/ddraw/ddraw.spec (with props) trunk/reactos/dll/directx/wine/ddraw/ddraw_private.h (with props) trunk/reactos/dll/directx/wine/ddraw/ddraw_thunks.c (with props) trunk/reactos/dll/directx/wine/ddraw/device.c (with props) trunk/reactos/dll/directx/wine/ddraw/direct3d.c (with props) trunk/reactos/dll/directx/wine/ddraw/executebuffer.c (with props) trunk/reactos/dll/directx/wine/ddraw/gamma.c (with props) trunk/reactos/dll/directx/wine/ddraw/light.c (with props) trunk/reactos/dll/directx/wine/ddraw/main.c (with props) trunk/reactos/dll/directx/wine/ddraw/material.c (with props) trunk/reactos/dll/directx/wine/ddraw/palette.c (with props) trunk/reactos/dll/directx/wine/ddraw/parent.c (with props) trunk/reactos/dll/directx/wine/ddraw/regsvr.c (with props) trunk/reactos/dll/directx/wine/ddraw/surface.c (with props) trunk/reactos/dll/directx/wine/ddraw/surface_thunks.c (with props) trunk/reactos/dll/directx/wine/ddraw/texture.c (with props) trunk/reactos/dll/directx/wine/ddraw/utils.c (with props) trunk/reactos/dll/directx/wine/ddraw/version.rc (with props) trunk/reactos/dll/directx/wine/ddraw/vertexbuffer.c (with props) trunk/reactos/dll/directx/wine/ddraw/viewport.c (with props) trunk/reactos/dll/directx/wine/wined3d/buffer.c (with props) trunk/reactos/dll/directx/wine/wined3d/view.c (with props) Removed: trunk/reactos/dll/directx/wine/d3d8/Makefile.in trunk/reactos/dll/directx/wine/d3d8/basetexture.c trunk/reactos/dll/directx/wine/d3d8/resource.c trunk/reactos/dll/directx/wine/d3d9/basetexture.c trunk/reactos/dll/directx/wine/d3d9/resource.c trunk/reactos/dll/directx/wine/wined3d/Makefile.in trunk/reactos/dll/directx/wine/wined3d/indexbuffer.c trunk/reactos/dll/directx/wine/wined3d/vertexbuffer.c trunk/reactos/dll/directx/wine/wined3d/wined3d.def Modified: trunk/reactos/dll/directx/directx.rbuild trunk/reactos/dll/directx/wine/d3d8/cubetexture.c trunk/reactos/dll/directx/wine/d3d8/d3d8.rbuild trunk/reactos/dll/directx/wine/d3d8/d3d8_private.h trunk/reactos/dll/directx/wine/d3d8/device.c trunk/reactos/dll/directx/wine/d3d8/directx.c trunk/reactos/dll/directx/wine/d3d8/indexbuffer.c trunk/reactos/dll/directx/wine/d3d8/pixelshader.c trunk/reactos/dll/directx/wine/d3d8/stateblock.c trunk/reactos/dll/directx/wine/d3d8/surface.c trunk/reactos/dll/directx/wine/d3d8/texture.c trunk/reactos/dll/directx/wine/d3d8/vertexbuffer.c trunk/reactos/dll/directx/wine/d3d8/vertexdeclaration.c trunk/reactos/dll/directx/wine/d3d8/vertexshader.c trunk/reactos/dll/directx/wine/d3d8/volume.c trunk/reactos/dll/directx/wine/d3d8/volumetexture.c trunk/reactos/dll/directx/wine/d3d9/cubetexture.c trunk/reactos/dll/directx/wine/d3d9/d3d9.rbuild trunk/reactos/dll/directx/wine/d3d9/d3d9_private.h trunk/reactos/dll/directx/wine/d3d9/device.c trunk/reactos/dll/directx/wine/d3d9/directx.c trunk/reactos/dll/directx/wine/d3d9/indexbuffer.c trunk/reactos/dll/directx/wine/d3d9/pixelshader.c trunk/reactos/dll/directx/wine/d3d9/stateblock.c trunk/reactos/dll/directx/wine/d3d9/surface.c trunk/reactos/dll/directx/wine/d3d9/swapchain.c trunk/reactos/dll/directx/wine/d3d9/texture.c trunk/reactos/dll/directx/wine/d3d9/vertexbuffer.c trunk/reactos/dll/directx/wine/d3d9/vertexdeclaration.c trunk/reactos/dll/directx/wine/d3d9/volume.c trunk/reactos/dll/directx/wine/d3d9/volumetexture.c trunk/reactos/dll/directx/wine/wine.rbuild trunk/reactos/dll/directx/wine/wined3d/arb_program_shader.c trunk/reactos/dll/directx/wine/wined3d/ati_fragment_shader.c trunk/reactos/dll/directx/wine/wined3d/baseshader.c trunk/reactos/dll/directx/wine/wined3d/basetexture.c trunk/reactos/dll/directx/wine/wined3d/context.c trunk/reactos/dll/directx/wine/wined3d/cubetexture.c trunk/reactos/dll/directx/wine/wined3d/device.c trunk/reactos/dll/directx/wine/wined3d/directx.c trunk/reactos/dll/directx/wine/wined3d/drawprim.c trunk/reactos/dll/directx/wine/wined3d/glsl_shader.c trunk/reactos/dll/directx/wine/wined3d/nvidia_texture_shader.c trunk/reactos/dll/directx/wine/wined3d/pixelshader.c trunk/reactos/dll/directx/wine/wined3d/resource.c trunk/reactos/dll/directx/wine/wined3d/state.c trunk/reactos/dll/directx/wine/wined3d/stateblock.c trunk/reactos/dll/directx/wine/wined3d/surface.c trunk/reactos/dll/directx/wine/wined3d/surface_base.c trunk/reactos/dll/directx/wine/wined3d/surface_gdi.c trunk/reactos/dll/directx/wine/wined3d/swapchain.c trunk/reactos/dll/directx/wine/wined3d/texture.c trunk/reactos/dll/directx/wine/wined3d/utils.c trunk/reactos/dll/directx/wine/wined3d/vertexdeclaration.c trunk/reactos/dll/directx/wine/wined3d/vertexshader.c trunk/reactos/dll/directx/wine/wined3d/volume.c trunk/reactos/dll/directx/wine/wined3d/volumetexture.c trunk/reactos/dll/directx/wine/wined3d/wined3d.rbuild trunk/reactos/dll/directx/wine/wined3d/wined3d_gl.h trunk/reactos/dll/directx/wine/wined3d/wined3d_main.c trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h trunk/reactos/dll/directx/wine/wined3d/wined3d_private_types.h trunk/reactos/include/dxsdk/d3dcaps.h trunk/reactos/include/dxsdk/ddraw.h trunk/reactos/include/reactos/wine/wined3d.idl [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/directx/directx.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/directx.rbuild… Removed: trunk/reactos/dll/directx/wine/d3d8/Makefile.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/Make… Removed: trunk/reactos/dll/directx/wine/d3d8/basetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/base… Modified: trunk/reactos/dll/directx/wine/d3d8/cubetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/cube… Modified: trunk/reactos/dll/directx/wine/d3d8/d3d8.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/d3d8… Modified: trunk/reactos/dll/directx/wine/d3d8/d3d8_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/d3d8… Modified: trunk/reactos/dll/directx/wine/d3d8/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/devi… Modified: trunk/reactos/dll/directx/wine/d3d8/directx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/dire… Modified: trunk/reactos/dll/directx/wine/d3d8/indexbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/inde… Modified: trunk/reactos/dll/directx/wine/d3d8/pixelshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/pixe… Removed: trunk/reactos/dll/directx/wine/d3d8/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/reso… Modified: trunk/reactos/dll/directx/wine/d3d8/stateblock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/stat… Modified: trunk/reactos/dll/directx/wine/d3d8/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/surf… Modified: trunk/reactos/dll/directx/wine/d3d8/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/text… Modified: trunk/reactos/dll/directx/wine/d3d8/vertexbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/vert… Modified: trunk/reactos/dll/directx/wine/d3d8/vertexdeclaration.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/vert… Modified: trunk/reactos/dll/directx/wine/d3d8/vertexshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/vert… Modified: trunk/reactos/dll/directx/wine/d3d8/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/volu… Modified: trunk/reactos/dll/directx/wine/d3d8/volumetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/volu… Removed: trunk/reactos/dll/directx/wine/d3d9/basetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/base… Modified: trunk/reactos/dll/directx/wine/d3d9/cubetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/cube… Modified: trunk/reactos/dll/directx/wine/d3d9/d3d9.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/d3d9… Modified: trunk/reactos/dll/directx/wine/d3d9/d3d9_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/d3d9… Modified: trunk/reactos/dll/directx/wine/d3d9/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/devi… Modified: trunk/reactos/dll/directx/wine/d3d9/directx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/dire… Modified: trunk/reactos/dll/directx/wine/d3d9/indexbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/inde… Modified: trunk/reactos/dll/directx/wine/d3d9/pixelshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/pixe… Removed: trunk/reactos/dll/directx/wine/d3d9/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/reso… Modified: trunk/reactos/dll/directx/wine/d3d9/stateblock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/stat… Modified: trunk/reactos/dll/directx/wine/d3d9/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/surf… Modified: trunk/reactos/dll/directx/wine/d3d9/swapchain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/swap… Modified: trunk/reactos/dll/directx/wine/d3d9/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/text… Modified: trunk/reactos/dll/directx/wine/d3d9/vertexbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/vert… Modified: trunk/reactos/dll/directx/wine/d3d9/vertexdeclaration.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/vert… Modified: trunk/reactos/dll/directx/wine/d3d9/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/volu… Modified: trunk/reactos/dll/directx/wine/d3d9/volumetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/volu… Added: trunk/reactos/dll/directx/wine/ddraw/clipper.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/cli… Added: trunk/reactos/dll/directx/wine/ddraw/ddcomimpl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ddc… Added: trunk/reactos/dll/directx/wine/ddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ddr… Added: trunk/reactos/dll/directx/wine/ddraw/ddraw.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ddr… Added: trunk/reactos/dll/directx/wine/ddraw/ddraw.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ddr… Added: trunk/reactos/dll/directx/wine/ddraw/ddraw_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ddr… Added: trunk/reactos/dll/directx/wine/ddraw/ddraw_thunks.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ddr… Added: trunk/reactos/dll/directx/wine/ddraw/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/dev… Added: trunk/reactos/dll/directx/wine/ddraw/direct3d.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/dir… Added: trunk/reactos/dll/directx/wine/ddraw/executebuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/exe… Added: trunk/reactos/dll/directx/wine/ddraw/gamma.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/gam… Added: trunk/reactos/dll/directx/wine/ddraw/light.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/lig… Added: trunk/reactos/dll/directx/wine/ddraw/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/mai… Added: trunk/reactos/dll/directx/wine/ddraw/material.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/mat… Added: trunk/reactos/dll/directx/wine/ddraw/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/pal… Added: trunk/reactos/dll/directx/wine/ddraw/parent.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/par… Added: trunk/reactos/dll/directx/wine/ddraw/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/reg… Added: trunk/reactos/dll/directx/wine/ddraw/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/sur… Added: trunk/reactos/dll/directx/wine/ddraw/surface_thunks.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/sur… Added: trunk/reactos/dll/directx/wine/ddraw/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/tex… Added: trunk/reactos/dll/directx/wine/ddraw/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/uti… Added: trunk/reactos/dll/directx/wine/ddraw/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ver… Added: trunk/reactos/dll/directx/wine/ddraw/vertexbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ver… Added: trunk/reactos/dll/directx/wine/ddraw/viewport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/vie… Modified: trunk/reactos/dll/directx/wine/wine.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wine.rbui… Removed: trunk/reactos/dll/directx/wine/wined3d/Makefile.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/M… Modified: trunk/reactos/dll/directx/wine/wined3d/arb_program_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/a… Modified: trunk/reactos/dll/directx/wine/wined3d/ati_fragment_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/a… Modified: trunk/reactos/dll/directx/wine/wined3d/baseshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/b… Modified: trunk/reactos/dll/directx/wine/wined3d/basetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/b… Added: trunk/reactos/dll/directx/wine/wined3d/buffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/b… Modified: trunk/reactos/dll/directx/wine/wined3d/context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/c… Modified: trunk/reactos/dll/directx/wine/wined3d/cubetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/c… Modified: trunk/reactos/dll/directx/wine/wined3d/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… Modified: trunk/reactos/dll/directx/wine/wined3d/directx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… Modified: trunk/reactos/dll/directx/wine/wined3d/drawprim.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… Modified: trunk/reactos/dll/directx/wine/wined3d/glsl_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/g… Removed: trunk/reactos/dll/directx/wine/wined3d/indexbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/i… Modified: trunk/reactos/dll/directx/wine/wined3d/nvidia_texture_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/n… Modified: trunk/reactos/dll/directx/wine/wined3d/pixelshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/p… Modified: trunk/reactos/dll/directx/wine/wined3d/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/r… Modified: trunk/reactos/dll/directx/wine/wined3d/state.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/stateblock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/surface_base.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/surface_gdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/swapchain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/t… Modified: trunk/reactos/dll/directx/wine/wined3d/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/u… Removed: trunk/reactos/dll/directx/wine/wined3d/vertexbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… Modified: trunk/reactos/dll/directx/wine/wined3d/vertexdeclaration.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… Modified: trunk/reactos/dll/directx/wine/wined3d/vertexshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… Added: trunk/reactos/dll/directx/wine/wined3d/view.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… Modified: trunk/reactos/dll/directx/wine/wined3d/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… Modified: trunk/reactos/dll/directx/wine/wined3d/volumetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… Removed: trunk/reactos/dll/directx/wine/wined3d/wined3d.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_gl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_private_types.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/include/dxsdk/d3dcaps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/d3dcaps.h?re… Modified: trunk/reactos/include/dxsdk/ddraw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/ddraw.h?rev=… Modified: trunk/reactos/include/reactos/wine/wined3d.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/wined…

16 years, 3 months

[dgoette] 40369: * move language folder out of 'inc/' * remove that human readable stuff, it doesn't make much sense in the way it was used here * start cleaning up the mess with variables

by dgoette＠svn.reactos.org

16 years, 3 months

[cgutman] 40367: - Distinguish between cleanup and close properly - On cleanup, we cancel all requests - On close, we remove the address file from the list, free the port and listener (if present), then free the address file itself

by cgutman＠svn.reactos.org

Author: cgutman Date: Sun Apr 5 11:23:25 2009 New Revision: 40367 URL: http://svn.reactos.org/svn/reactos?rev=40367&view=rev Log: - Distinguish between cleanup and close properly - On cleanup, we cancel all requests - On close, we remove the address file from the list, free the port and listener (if present), then free the address file itself Modified: trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c Modified: trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] Sun Apr 5 11:23:25 2009 @@ -139,11 +139,11 @@ } -VOID DeleteAddress(PADDRESS_FILE AddrFile) -/* - * FUNCTION: Deletes an address file object - * ARGUMENTS: - * AddrFile = Pointer to address file object to delete +NTSTATUS FileCloseAddress(PTDI_REQUEST Request) +/* + * FUNCTION: Closes an address file object + * ARGUMENTS: + * AddrFile = Pointer to address file object to close */ { KIRQL OldIrql; @@ -151,15 +151,15 @@ PLIST_ENTRY NextEntry; PDATAGRAM_SEND_REQUEST SendRequest; PDATAGRAM_RECEIVE_REQUEST ReceiveRequest; + PADDRESS_FILE AddrFile = Request->Handle.AddressHandle; TI_DbgPrint(MID_TRACE, ("Called.\n")); - /* Remove address file from the global list */ - TcpipAcquireSpinLock(&AddressFileListLock, &OldIrql); - RemoveEntryList(&AddrFile->ListEntry); - TcpipReleaseSpinLock(&AddressFileListLock, OldIrql); - TcpipAcquireSpinLock(&AddrFile->Lock, &OldIrql); + + /* Set address file object exclusive to us */ + AF_SET_BUSY(AddrFile); + AF_CLR_VALID(AddrFile); /* FIXME: Kill TCP connections on this address file object */ @@ -197,9 +197,9 @@ TcpipReleaseSpinLock(&AddrFile->Lock, OldIrql); - (*AddrFile->Free)(AddrFile); - - TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); + TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); + + return STATUS_SUCCESS; } @@ -339,7 +339,7 @@ * RETURNS: * Status of operation */ -NTSTATUS FileCloseAddress( +NTSTATUS FileFreeAddress( PTDI_REQUEST Request) { KIRQL OldIrql; @@ -350,13 +350,10 @@ AddrFile = Request->Handle.AddressHandle; - TcpipAcquireSpinLock(&AddrFile->Lock, &OldIrql); - - /* Set address file object exclusive to us */ - AF_SET_BUSY(AddrFile); - AF_CLR_VALID(AddrFile); - - TcpipReleaseSpinLock(&AddrFile->Lock, OldIrql); + /* Remove address file from the global list */ + TcpipAcquireSpinLock(&AddressFileListLock, &OldIrql); + RemoveEntryList(&AddrFile->ListEntry); + TcpipReleaseSpinLock(&AddressFileListLock, OldIrql); /* Protocol specific handling */ switch (AddrFile->Protocol) { @@ -372,33 +369,9 @@ UDPFreePort( AddrFile->Port ); break; } - - TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); - - return Status; -} - - -/* - * FUNCTION: Closes an address file object - * ARGUMENTS: - * Request = Pointer to TDI request structure for this request - * RETURNS: - * Status of operation - */ -NTSTATUS FileFreeAddress( - PTDI_REQUEST Request) -{ - PADDRESS_FILE AddrFile; - NTSTATUS Status = STATUS_SUCCESS; - - AddrFile = Request->Handle.AddressHandle; - - TI_DbgPrint(MID_TRACE, ("Called.\n")); - - DeleteAddress(AddrFile); - - TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); + TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); + + (*AddrFile->Free)(AddrFile); return Status; }

16 years, 3 months

[cgutman] 40366: - Implement a DispatchCleanup routine and properly separate cleanup from close

by cgutman＠svn.reactos.org

Author: cgutman Date: Sun Apr 5 11:08:47 2009 New Revision: 40366 URL: http://svn.reactos.org/svn/reactos?rev=40366&view=rev Log: - Implement a DispatchCleanup routine and properly separate cleanup from close Modified: trunk/reactos/drivers/network/afd/afd/main.c Modified: trunk/reactos/drivers/network/afd/afd/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/ma… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] Sun Apr 5 11:08:47 2009 @@ -167,9 +167,8 @@ return Status; } -VOID DestroySocket( PAFD_FCB FCB ) { +VOID CleanupSocket( PAFD_FCB FCB ) { UINT i; - BOOLEAN ReturnEarly = FALSE; PAFD_IN_FLIGHT_REQUEST InFlightRequest[IN_FLIGHT_REQUESTS]; AFD_DbgPrint(MIN_TRACE,("Called (%x)\n", FCB)); @@ -188,46 +187,60 @@ if( InFlightRequest[i]->InFlightRequest ) { AFD_DbgPrint(MID_TRACE,("Cancelling in flight irp %d (%x)\n", i, InFlightRequest[i]->InFlightRequest)); - if (!IoCancelIrp(InFlightRequest[i]->InFlightRequest)) - ReturnEarly = TRUE; + IoCancelIrp(InFlightRequest[i]->InFlightRequest); } } + FCB->State = SOCKET_STATE_CREATED; + + if( FCB->EventSelect ) { + ObDereferenceObject( FCB->EventSelect ); + FCB->EventSelect = NULL; + } + if( FCB->Context ) { + ExFreePool( FCB->Context ); + FCB->Context = NULL; + } + if( FCB->Recv.Window ) { + ExFreePool( FCB->Recv.Window ); + FCB->Recv.Window = NULL; + } + if( FCB->Send.Window ) { + ExFreePool( FCB->Send.Window ); + FCB->Send.Window = NULL; + } + if( FCB->AddressFrom ) { + ExFreePool( FCB->AddressFrom ); + FCB->AddressFrom = NULL; + } + if( FCB->LocalAddress ) { + ExFreePool( FCB->LocalAddress ); + FCB->LocalAddress = NULL; + } + if( FCB->RemoteAddress ) { + ExFreePool( FCB->RemoteAddress ); + FCB->RemoteAddress = NULL; + } + if( FCB->Connection.Object ) { + NtClose(FCB->Connection.Handle); + ObDereferenceObject(FCB->Connection.Object); + FCB->Connection.Object = NULL; + } + if( FCB->AddressFile.Object ) { + NtClose(FCB->AddressFile.Handle); + ObDereferenceObject(FCB->AddressFile.Object); + FCB->AddressFile.Object = NULL; + } + SocketStateUnlock( FCB ); - - if( ReturnEarly ) - return; - - if( FCB->Context ) - ExFreePool(FCB->Context); - if( FCB->Recv.Window ) - ExFreePool( FCB->Recv.Window ); - if( FCB->Send.Window ) - ExFreePool( FCB->Send.Window ); - if( FCB->AddressFrom ) - ExFreePool( FCB->AddressFrom ); - if( FCB->LocalAddress ) - ExFreePool( FCB->LocalAddress ); - if( FCB->RemoteAddress ) - ExFreePool( FCB->RemoteAddress ); +} + +VOID DestroySocket( PAFD_FCB FCB ) { if( FCB->TdiDeviceName.Buffer ) ExFreePool(FCB->TdiDeviceName.Buffer); - if (FCB->Connection.Object) - { - NtClose(FCB->Connection.Handle); - ObDereferenceObject(FCB->Connection.Object); - } - if (FCB->AddressFile.Object) - { - NtClose(FCB->AddressFile.Handle); - ObDereferenceObject(FCB->AddressFile.Object); - } - ExFreePool(FCB); AFD_DbgPrint(MIN_TRACE,("Deleted (%x)\n", FCB)); - - AFD_DbgPrint(MIN_TRACE,("Leaving\n")); } static NTSTATUS NTAPI @@ -244,12 +257,6 @@ AFD_DbgPrint(MID_TRACE,("FCB %x\n", FCB)); - FCB->PollState |= AFD_EVENT_CLOSE; - PollReeval( FCB->DeviceExt, FileObject ); - KillSelectsForFCB( FCB->DeviceExt, FileObject, FALSE ); - - if( FCB->EventSelect ) ObDereferenceObject( FCB->EventSelect ); - FileObject->FsContext = NULL; SocketStateUnlock( FCB ); @@ -260,6 +267,28 @@ IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); AFD_DbgPrint(MID_TRACE, ("Returning success.\n")); + + return STATUS_SUCCESS; +} + +static NTSTATUS NTAPI +AfdCleanupSocket(PDEVICE_OBJECT DeviceObject, PIRP Irp, + PIO_STACK_LOCATION IrpSp) +{ + PFILE_OBJECT FileObject = IrpSp->FileObject; + PAFD_FCB FCB = FileObject->FsContext; + + if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp ); + + CleanupSocket( FCB ); + + KillSelectsForFCB( FCB->DeviceExt, FileObject, FALSE ); + + SocketStateUnlock( FCB ); + + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); return STATUS_SUCCESS; } @@ -344,6 +373,9 @@ /* Ditto the borrowing */ return AfdCloseSocket(DeviceObject, Irp, IrpSp); + case IRP_MJ_CLEANUP: + return AfdCleanupSocket(DeviceObject, Irp, IrpSp); + /* write data */ case IRP_MJ_WRITE: return AfdConnectedSocketWriteData( DeviceObject, Irp, IrpSp, TRUE ); @@ -519,6 +551,7 @@ /* register driver routines */ DriverObject->MajorFunction[IRP_MJ_CLOSE] = AfdDispatch; DriverObject->MajorFunction[IRP_MJ_CREATE] = AfdDispatch; + DriverObject->MajorFunction[IRP_MJ_CLEANUP] = AfdDispatch; DriverObject->MajorFunction[IRP_MJ_WRITE] = AfdDispatch; DriverObject->MajorFunction[IRP_MJ_READ] = AfdDispatch; DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = AfdDispatch;

16 years, 3 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs