Ros-diffs

ros-diffs@reactos.org

81390 discussions

[spetreolle] 42120: - Update Module List - Fix arguments check
by spetreolle＠svn.reactos.org 21 Jul '09

21 Jul '09

Author: spetreolle Date: Tue Jul 21 16:58:11 2009 New Revision: 42120 URL: http://svn.reactos.org/svn/reactos?rev=42120&view=rev Log: - Update Module List - Fix arguments check Modified: trunk/reactos/tools/rgenstat/module_list.txt trunk/reactos/tools/rgenstat/rgenstat.c Modified: trunk/reactos/tools/rgenstat/module_list.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rgenstat/module_list… ============================================================================== --- trunk/reactos/tools/rgenstat/module_list.txt [iso-8859-1] (original) +++ trunk/reactos/tools/rgenstat/module_list.txt [iso-8859-1] Tue Jul 21 16:58:11 2009 @@ -1,6 +1,5 @@ clb base\applications\regedit\clb notifyhook base\shell\explorer\notifyhook -freetype dll\3rdparty\freetype mesa32 dll\3rdparty\mesa32 access dll\cpl\access appwiz dll\cpl\appwiz @@ -49,6 +48,7 @@ cards dll\win32\cards cfgmgr32 dll\win32\cfgmgr32 console dll\cpl\console +slayer dll\shellext\slayer comctl32 dll\win32\comctl32 comdlg32 dll\win32\comdlg32 crtdll dll\win32\crtdll @@ -106,7 +106,6 @@ setupapi dll\win32\setupapi shdocvw dll\win32\shdocvw shell32 dll\win32\shell32 -slayer dll\win32\shellext\slayer shfolder dll\win32\shfolder shlwapi dll\win32\shlwapi smdll dll\win32\smdll @@ -121,12 +120,14 @@ version dll\win32\version wininet dll\win32\wininet midimap dll\win32\winmm\midimap -wavemap dll\win32\winmm\wavemap +wavemap dll\win32\msacm32\msacm32.drv winmm dll\win32\winmm winspool dll\win32\winspool wintrust dll\win32\wintrust ws2_32 dll\win32\ws2_32 +ws2_32_new dll\win32\ws2_32_new ws2help dll\win32\ws2help +ws2help_new dll\win32\ws2help_new wshirda dll\win32\wshirda wsock32 dll\win32\wsock32 wshtcpip dll\win32\wshtcpip Modified: trunk/reactos/tools/rgenstat/rgenstat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rgenstat/rgenstat.c?… ============================================================================== --- trunk/reactos/tools/rgenstat/rgenstat.c [iso-8859-1] (original) +++ trunk/reactos/tools/rgenstat/rgenstat.c [iso-8859-1] Tue Jul 21 16:58:11 2009 @@ -879,7 +879,7 @@ char *input_file; char *output_file; - if (argc < 2) + if (argc != 3) { puts(HELP); return 1;

1 0

[janderwald] 42119: - Update Module List
by janderwald＠svn.reactos.org 21 Jul '09

21 Jul '09

Author: janderwald Date: Tue Jul 21 15:53:20 2009 New Revision: 42119 URL: http://svn.reactos.org/svn/reactos?rev=42119&view=rev Log: - Update Module List Modified: trunk/reactos/tools/rgenstat/module_list.txt Modified: trunk/reactos/tools/rgenstat/module_list.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rgenstat/module_list… ============================================================================== --- trunk/reactos/tools/rgenstat/module_list.txt [iso-8859-1] (original) +++ trunk/reactos/tools/rgenstat/module_list.txt [iso-8859-1] Tue Jul 21 15:53:20 2009 @@ -7,7 +7,6 @@ desk dll\cpl\desk hdwwiz dll\cpl\hdwwiz intl dll\cpl\intl -intl_new dll\cpl\intl_new main dll\cpl\main mmsys dll\cpl\mmsys ncpa dll\cpl\ncpa @@ -32,7 +31,6 @@ kbdheb dll\keyboard\kbdheb kbdhu dll\keyboard\kbdhu kbdru dll\keyboard\kbdru -kbdse dll\keyboard\kbdse kbdsg dll\keyboard\kbdsg kbdsk dll\keyboard\kbdsk kbduk dll\keyboard\kbduk @@ -50,7 +48,7 @@ cabinet dll\win32\cabinet cards dll\win32\cards cfgmgr32 dll\win32\cfgmgr32 -console dll\win32\console +console dll\cpl\console comctl32 dll\win32\comctl32 comdlg32 dll\win32\comdlg32 crtdll dll\win32\crtdll @@ -75,7 +73,7 @@ mapi32 dll\win32\mapi32 mmdrv dll\win32\mmdrv mpr dll\win32\mpr -msacm32 dll\win32\msacm +msacm32 dll\win32\msacm32 msafd dll\win32\msafd msgina dll\win32\msgina msi dll\win32\msi @@ -131,6 +129,6 @@ ws2help dll\win32\ws2help wshirda dll\win32\wshirda wsock32 dll\win32\wsock32 -wshtcpip drivers\network\wshtcpip +wshtcpip dll\win32\wshtcpip framebuf drivers\video\displays\framebuf vgaddi drivers\video\displays\vga

1 0

[spetreolle] 42118: fix includes case
by spetreolle＠svn.reactos.org 21 Jul '09

21 Jul '09

Author: spetreolle Date: Tue Jul 21 15:44:45 2009 New Revision: 42118 URL: http://svn.reactos.org/svn/reactos?rev=42118&view=rev Log: fix includes case Modified: trunk/reactos/dll/win32/ws2_32_new/inc/ws2_32.h Modified: trunk/reactos/dll/win32/ws2_32_new/inc/ws2_32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/inc/w… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/inc/ws2_32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/inc/ws2_32.h [iso-8859-1] Tue Jul 21 15:44:45 2009 @@ -21,8 +21,8 @@ /* PSDK and NDK Headers */ #include <winsock2.h> -#include <Ws2tcpip.h> -#include <Ws2spi.h> +#include <ws2tcpip.h> +#include <ws2spi.h> #include <ndk/umtypes.h> #include <ndk/rtlfuncs.h>

1 0

[janderwald] 42117: - Rewrite KsDefaultDispatchPnp to make it actually work - Implement KsDefaultDispatchPower, KsDefaultForwardIrp - Return the correct device object in KsQueryDevicePnpObject - Implement KsReadFile, KsSetInformationFile and partly KsQueryInformationFile - Remove KspClose, KspRead, KspWrite, KspFlushBuffers, KspQuerySecurity, KspSetSecurity and all these IOCTL in KspDispatchIrp - Rewrite KsDispatchIrp to handle IRP_MJ_CREATE & IRP_MJ_POWER, IRP_MJ_PNP for AV Stream minidrivers a
by janderwald＠svn.reactos.org 21 Jul '09

21 Jul '09

Author: janderwald Date: Tue Jul 21 15:32:28 2009 New Revision: 42117 URL: http://svn.reactos.org/svn/reactos?rev=42117&view=rev Log: - Rewrite KsDefaultDispatchPnp to make it actually work - Implement KsDefaultDispatchPower, KsDefaultForwardIrp - Return the correct device object in KsQueryDevicePnpObject - Implement KsReadFile, KsSetInformationFile and partly KsQueryInformationFile - Remove KspClose, KspRead, KspWrite, KspFlushBuffers, KspQuerySecurity, KspSetSecurity and all these IOCTL in KspDispatchIrp - Rewrite KsDispatchIrp to handle IRP_MJ_CREATE & IRP_MJ_POWER, IRP_MJ_PNP for AV Stream minidrivers and forward IRP_MJ_SYSTEM_CONTROL requests to the registered pnp base object - Unsupported IOCTLs are now completed with KsDispatchInvalidDeviceRequest (previously leaked) Modified: trunk/reactos/drivers/ksfilter/ks/api.c trunk/reactos/drivers/ksfilter/ks/device.c trunk/reactos/drivers/ksfilter/ks/irp.c trunk/reactos/drivers/ksfilter/ks/kstypes.h trunk/reactos/drivers/ksfilter/ks/misc.c Modified: trunk/reactos/drivers/ksfilter/ks/api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/api.c?… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/api.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/api.c [iso-8859-1] Tue Jul 21 15:32:28 2009 @@ -65,9 +65,8 @@ } /* - @unimplemented -*/ - + @implemented +*/ KSDDKAPI NTSTATUS NTAPI @@ -75,46 +74,54 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { + PDEVICE_EXTENSION DeviceExtension; + PKSIDEVICE_HEADER DeviceHeader; PIO_STACK_LOCATION IoStack; - NTSTATUS Status = STATUS_SUCCESS; - + PDEVICE_OBJECT PnpDeviceObject; + NTSTATUS Status; + ULONG MinorFunction; + + /* get current irp stack */ IoStack = IoGetCurrentIrpStackLocation(Irp); - //FIXME - //REWRITE - - DPRINT1("KsDefaultDispatchPnp entered with func %x\n", IoStack->MinorFunction); - - switch(IoStack->MinorFunction) - { - case IRP_MN_QUERY_DEVICE_RELATIONS: - Irp->IoStatus.Information = 0; - Irp->IoStatus.Status = STATUS_INSUFFICIENT_RESOURCES; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_INSUFFICIENT_RESOURCES; - case IRP_MN_REMOVE_DEVICE: - // FIXME - // destroy device header, detach device and delete device - case IRP_MN_START_DEVICE: - case IRP_MN_QUERY_REMOVE_DEVICE: - case IRP_MN_CANCEL_STOP_DEVICE: - case IRP_MN_SURPRISE_REMOVAL: - Irp->IoStatus.Information = 0; - Irp->IoStatus.Status = STATUS_SUCCESS; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_SUCCESS; - default: - Irp->IoStatus.Information = 0; - Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - //Status = IoCallDriver(NULL /* PnpBaseObject */, Irp); - } - + /* caller wants to add the target device */ + DeviceExtension = (PDEVICE_EXTENSION)DeviceObject->DeviceExtension; + + /* get device header */ + DeviceHeader = (PKSIDEVICE_HEADER)DeviceExtension->DeviceHeader; + + /* backup PnpBaseObject */ + PnpDeviceObject = DeviceHeader->PnpDeviceObject; + + + /* backup minor function code */ + MinorFunction = IoStack->MinorFunction; + + if(MinorFunction == IRP_MN_REMOVE_DEVICE) + { + /* remove the device */ + KsFreeDeviceHeader((KSDEVICE_HEADER)DeviceHeader); + } + + /* skip current irp stack */ + IoSkipCurrentIrpStackLocation(Irp); + + /* call attached pnp device object */ + Status = IoCallDriver(PnpDeviceObject, Irp); + + if (MinorFunction == IRP_MN_REMOVE_DEVICE) + { + /* time is over */ + IoDetachDevice(PnpDeviceObject); + /* delete device */ + IoDeleteDevice(DeviceObject); + } + /* done */ return Status; } /* - @unimplemented + @implemented */ KSDDKAPI NTSTATUS @@ -123,16 +130,59 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - UNIMPLEMENTED; - - Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; - Irp->IoStatus.Information = 0; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_UNSUCCESSFUL; -} - -/* - @unimplemented + PDEVICE_EXTENSION DeviceExtension; + PKSIDEVICE_HEADER DeviceHeader; + PKSIOBJECT_HEADER ObjectHeader; + PIO_STACK_LOCATION IoStack; + PLIST_ENTRY ListEntry; + NTSTATUS Status; + + /* get current irp stack */ + IoStack = IoGetCurrentIrpStackLocation(Irp); + + /* caller wants to add the target device */ + DeviceExtension = (PDEVICE_EXTENSION)DeviceObject->DeviceExtension; + + /* get device header */ + DeviceHeader = (PKSIDEVICE_HEADER)DeviceExtension->DeviceHeader; + + /* FIXME locks */ + + /* loop our power dispatch list and call registered notification functions */ + ListEntry = DeviceHeader->PowerDispatchList.Flink; + /* let's go */ + while(ListEntry != &DeviceHeader->PowerDispatchList) + { + /* get object header */ + ObjectHeader = (PKSIOBJECT_HEADER)CONTAINING_RECORD(ListEntry, KSIOBJECT_HEADER, PowerDispatchEntry); + + /* does it have still a cb */ + if (ObjectHeader->PowerDispatch) + { + /* call the power cb */ + Status = ObjectHeader->PowerDispatch(ObjectHeader->PowerContext, Irp); + ASSERT(NT_SUCCESS(Status)); + } + + /* iterate to next entry */ + ListEntry = ListEntry->Flink; + } + + /* start next power irp */ + PoStartNextPowerIrp(Irp); + + /* skip current irp stack location */ + IoSkipCurrentIrpStackLocation(Irp); + + /* let's roll */ + Status = PoCallDriver(DeviceHeader->PnpDeviceObject, Irp); + + /* done */ + return Status; +} + +/* + @implemented */ KSDDKAPI NTSTATUS @@ -141,11 +191,24 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - UNIMPLEMENTED; - Irp->IoStatus.Information = 0; - Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_UNSUCCESSFUL; + PDEVICE_EXTENSION DeviceExtension; + PKSIDEVICE_HEADER DeviceHeader; + PIO_STACK_LOCATION IoStack; + NTSTATUS Status; + + /* get current irp stack */ + IoStack = IoGetCurrentIrpStackLocation(Irp); + + /* caller wants to add the target device */ + DeviceExtension = (PDEVICE_EXTENSION)DeviceObject->DeviceExtension; + + /* get device header */ + DeviceHeader = (PKSIDEVICE_HEADER)DeviceExtension->DeviceHeader; + + /* forward the request to the PDO */ + Status = IoCallDriver(DeviceHeader->PnpDeviceObject, Irp); + + return Status; } /* @@ -161,8 +224,8 @@ { PKSIDEVICE_HEADER DeviceHeader = (PKSIDEVICE_HEADER)Header; - DeviceHeader->PhysicalDeviceObject = PnpDeviceObject; - DeviceHeader->NextDeviceObject = BaseDevice; + DeviceHeader->PnpDeviceObject = PnpDeviceObject; + DeviceHeader->BaseDevice = BaseDevice; } /* @@ -176,8 +239,8 @@ { PKSIDEVICE_HEADER DeviceHeader = (PKSIDEVICE_HEADER)Header; - /* return next device header */ - return DeviceHeader->NextDeviceObject; + /* return PnpDeviceObject */ + return DeviceHeader->PnpDeviceObject; } Modified: trunk/reactos/drivers/ksfilter/ks/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/device… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/device.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/device.c [iso-8859-1] Tue Jul 21 15:32:28 2009 @@ -607,11 +607,6 @@ return STATUS_UNSUCCESSFUL; } - - - - - /* @unimplemented */ Modified: trunk/reactos/drivers/ksfilter/ks/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/irp.c?… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/irp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/irp.c [iso-8859-1] Tue Jul 21 15:32:28 2009 @@ -169,7 +169,7 @@ /* - @unimplemented + @implemented */ KSDDKAPI NTSTATUS @@ -184,8 +184,88 @@ IN ULONG Key OPTIONAL, IN KPROCESSOR_MODE RequestorMode) { - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; + PDEVICE_OBJECT DeviceObject; + PIRP Irp; + NTSTATUS Status; + BOOLEAN Result; + KEVENT LocalEvent; + + if (Event) + { + /* make sure event is reset */ + KeClearEvent(Event); + } + + if (RequestorMode == UserMode) + { + /* probe the user buffer */ + _SEH2_TRY + { + ProbeForWrite(Buffer, Length, sizeof(UCHAR)); + Status = STATUS_SUCCESS; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Exception, get the error code */ + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + if (!NT_SUCCESS(Status)) + { + DPRINT1("Invalid user buffer provided\n"); + return Status; + } + } + + /* get corresponding device object */ + DeviceObject = IoGetRelatedDeviceObject(FileObject); + + /* fast-io read is only available for kernel mode clients */ + if (RequestorMode == KernelMode && ExGetPreviousMode() == KernelMode && + DeviceObject->DriverObject->FastIoDispatch->FastIoRead) + { + /* call fast io write */ + Result = DeviceObject->DriverObject->FastIoDispatch->FastIoRead(FileObject, &FileObject->CurrentByteOffset, Length, TRUE, Key, Buffer, IoStatusBlock, DeviceObject); + + if (Result && NT_SUCCESS(IoStatusBlock->Status)) + { + /* request was handeled and succeeded */ + return STATUS_SUCCESS; + } + } + + /* do the slow way */ + if (!Event) + { + /* initialize temp event */ + KeInitializeEvent(&LocalEvent, NotificationEvent, FALSE); + Event = &LocalEvent; + } + + /* build the irp packet */ + Irp = IoBuildSynchronousFsdRequest(IRP_MJ_READ, DeviceObject, Buffer, Length, &FileObject->CurrentByteOffset, Event, IoStatusBlock); + if (!Irp) + { + /* not enough resources */ + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* send the packet */ + Status = IoCallDriver(DeviceObject, Irp); + + if (Status == STATUS_PENDING) + { + /* operation is pending, is sync file object */ + if (FileObject->Flags & FO_SYNCHRONOUS_IO) + { + /* it is so wait */ + KeWaitForSingleObject(Event, Executive, RequestorMode, FALSE, NULL); + Status = IoStatusBlock->Status; + } + } + /* return result */ + return Status; } /* @@ -256,7 +336,6 @@ } /* do the slow way */ - if (!Event) { /* initialize temp event */ @@ -301,12 +380,45 @@ IN ULONG Length, IN FILE_INFORMATION_CLASS FileInformationClass) { - UNIMPLEMENTED; + PDEVICE_OBJECT DeviceObject; + PFAST_IO_DISPATCH FastIoDispatch; + IO_STATUS_BLOCK IoStatus; + + /* get related file object */ + DeviceObject = IoGetRelatedDeviceObject(FileObject); + + /* get fast i/o table */ + FastIoDispatch = DeviceObject->DriverObject->FastIoDispatch; + + /* is there a fast table */ + if (FastIoDispatch) + { + /* check the class */ + if (FileInformationClass == FileBasicInformation) + { + /* use FastIoQueryBasicInfo routine */ + if (FastIoDispatch->FastIoQueryBasicInfo) + { + return FastIoDispatch->FastIoQueryBasicInfo(FileObject, TRUE, (PFILE_BASIC_INFORMATION)FileInformation, &IoStatus, DeviceObject); + } + } + else if (FileInformationClass == FileStandardInformation) + { + /* use FastIoQueryBasicInfo routine */ + if (FastIoDispatch->FastIoQueryBasicInfo) + { + return FastIoDispatch->FastIoQueryStandardInfo(FileObject, TRUE, (PFILE_STANDARD_INFORMATION)FileInformation, &IoStatus, DeviceObject); + } + } + } + + /* Implement Me */ + return STATUS_UNSUCCESSFUL; } /* - @unimplemented + @implemented */ KSDDKAPI NTSTATUS @@ -317,8 +429,84 @@ IN ULONG Length, IN FILE_INFORMATION_CLASS FileInformationClass) { - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; + PIO_STACK_LOCATION IoStack; + PDEVICE_OBJECT DeviceObject; + PIRP Irp; + PVOID Buffer; + KEVENT Event; + LARGE_INTEGER Offset; + IO_STATUS_BLOCK IoStatus; + NTSTATUS Status; + + /* get related device object */ + DeviceObject = IoGetRelatedDeviceObject(FileObject); + + /* copy file information */ + Buffer = AllocateItem(NonPagedPool, Length); + if (!Buffer) + return STATUS_INSUFFICIENT_RESOURCES; + + _SEH2_TRY + { + ProbeForRead(Buffer, Length, sizeof(UCHAR)); + RtlMoveMemory(Buffer, FileInformation, Length); + Status = STATUS_SUCCESS; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Exception, get the error code */ + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + if (!NT_SUCCESS(Status)) + { + /* invalid user buffer */ + FreeItem(Buffer); + return Status; + } + + /* initialize the event */ + KeInitializeEvent(&Event, SynchronizationEvent, FALSE); + + /* zero offset */ + Offset.QuadPart = 0LL; + + /* build the irp */ + Irp = IoBuildSynchronousFsdRequest(IRP_MJ_SET_INFORMATION, DeviceObject, NULL, 0, &Offset, &Event, &IoStatus); + + if (!Irp) + { + /* failed to allocate irp */ + FreeItem(Buffer); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* get next stack location */ + IoStack = IoGetNextIrpStackLocation(Irp); + + /* set irp parameters */ + IoStack->Parameters.SetFile.FileInformationClass = FileInformationClass; + IoStack->Parameters.SetFile.Length = Length; + IoStack->Parameters.SetFile.FileObject = FileObject; + Irp->AssociatedIrp.SystemBuffer = Buffer; + Irp->UserBuffer = FileInformation; + + /* dispatch the irp */ + Status = IoCallDriver(DeviceObject, Irp); + + if (Status == STATUS_PENDING) + { + /* wait untill the operation has completed */ + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + /* is a sync file object */ + if (FileObject->Flags & FO_SYNCHRONOUS_IO) + Status = FileObject->FinalStatus; + else + Status = IoStatus.Status; + } + /* done */ + return Status; } /* @@ -845,57 +1033,6 @@ NTAPI NTSTATUS -KspClose( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - PIO_STACK_LOCATION IoStack; - PKSIOBJECT_HEADER ObjectHeader; - PDEVICE_EXTENSION DeviceExtension; - PKSIDEVICE_HEADER DeviceHeader; - NTSTATUS Status; - - /* get current stack location */ - IoStack = IoGetCurrentIrpStackLocation(Irp); - /* get device extension */ - DeviceExtension = (PDEVICE_EXTENSION)IoStack->DeviceObject->DeviceExtension; - /* get device header */ - DeviceHeader = DeviceExtension->DeviceHeader; - - - DPRINT("KS / CLOSE\n"); - - if (IoStack->FileObject && IoStack->FileObject->FsContext) - { - /* get object header */ - ObjectHeader = (PKSIOBJECT_HEADER) IoStack->FileObject->FsContext; - /* store create item */ - KSCREATE_ITEM_IRP_STORAGE(Irp) = ObjectHeader->CreateItem; - /* call object close method */ - Status = ObjectHeader->DispatchTable.Close(DeviceObject, Irp); - /* FIXME decrease reference count on original create item */ - - /* return result */ - return Status; - } - else - { -#if 0 - DPRINT1("Expected Object Header FileObject %p FsContext %p\n", IoStack->FileObject, IoStack->FileObject->FsContext); - KeBugCheckEx(0, 0, 0, 0, 0); -#else - DPRINT("Using reference string hack\n"); - Irp->IoStatus.Status = STATUS_SUCCESS; - Irp->IoStatus.Information = 0; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_SUCCESS; -#endif - return STATUS_SUCCESS; - } -} - -NTAPI -NTSTATUS KspDeviceControl( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) @@ -910,14 +1047,14 @@ /* get current stack location */ IoStack = IoGetCurrentIrpStackLocation(Irp); + /* get device extension */ + DeviceExtension = (PDEVICE_EXTENSION)IoStack->DeviceObject->DeviceExtension; + /* get device header */ + DeviceHeader = DeviceExtension->DeviceHeader; + /* hack for bug 4566 */ if (IoStack->MajorFunction == IRP_MJ_DEVICE_CONTROL && IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_KS_OBJECT_CLASS) { - /* get device extension */ - DeviceExtension = (PDEVICE_EXTENSION)IoStack->DeviceObject->DeviceExtension; - /* get device header */ - DeviceHeader = DeviceExtension->DeviceHeader; - /* retrieve all available reference strings registered */ Length = 0; @@ -978,142 +1115,87 @@ NTAPI NTSTATUS -KspRead( +KspDispatchIrp( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { PIO_STACK_LOCATION IoStack; + PDEVICE_EXTENSION DeviceExtension; PKSIOBJECT_HEADER ObjectHeader; + PKSIDEVICE_HEADER DeviceHeader; + PDRIVER_DISPATCH Dispatch; + NTSTATUS Status; /* get current stack location */ IoStack = IoGetCurrentIrpStackLocation(Irp); - DPRINT("KS / Read\n"); - if (IoStack->FileObject && IoStack->FileObject->FsContext) - { - ObjectHeader = (PKSIOBJECT_HEADER) IoStack->FileObject->FsContext; - - KSCREATE_ITEM_IRP_STORAGE(Irp) = ObjectHeader->CreateItem; - return ObjectHeader->DispatchTable.Read(DeviceObject, Irp); + /* get device extension */ + DeviceExtension = (PDEVICE_EXTENSION)DeviceObject->DeviceExtension; + /* get device header */ + DeviceHeader = DeviceExtension->DeviceHeader; + + /* get object header */ + ObjectHeader = (PKSIOBJECT_HEADER) IoStack->FileObject->FsContext; + + if (!ObjectHeader) + { + /* hack for bug 4566 */ + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = 0; + /* complete and forget */ + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; + } + + /* sanity check */ + ASSERT(ObjectHeader); + /* store create item */ + KSCREATE_ITEM_IRP_STORAGE(Irp) = ObjectHeader->CreateItem; + + /* retrieve matching dispatch function */ + switch(IoStack->MajorFunction) + { + case IRP_MJ_CLOSE: + Dispatch = ObjectHeader->DispatchTable.Close; + break; + case IRP_MJ_DEVICE_CONTROL: + Dispatch = ObjectHeader->DispatchTable.DeviceIoControl; + break; + case IRP_MJ_READ: + Dispatch = ObjectHeader->DispatchTable.Read; + break; + case IRP_MJ_WRITE: + Dispatch = ObjectHeader->DispatchTable.Write; + break; + case IRP_MJ_FLUSH_BUFFERS : + Dispatch = ObjectHeader->DispatchTable.Flush; + break; + case IRP_MJ_QUERY_SECURITY: + Dispatch = ObjectHeader->DispatchTable.QuerySecurity; + break; + case IRP_MJ_SET_SECURITY: + Dispatch = ObjectHeader->DispatchTable.SetSecurity; + break; + case IRP_MJ_PNP: + Dispatch = KsDefaultDispatchPnp; + default: + Dispatch = NULL; + } + + /* is the request supported */ + if (Dispatch) + { + /* now call the dispatch function */ + Status = Dispatch(DeviceObject, Irp); } else { - DPRINT1("Expected Object Header\n"); - KeBugCheckEx(0, 0, 0, 0, 0); - return STATUS_SUCCESS; - } -} - -NTAPI -NTSTATUS -KspWrite( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - PIO_STACK_LOCATION IoStack; - PKSIOBJECT_HEADER ObjectHeader; - - /* get current stack location */ - IoStack = IoGetCurrentIrpStackLocation(Irp); - - DPRINT("KS / Write\n"); - if (IoStack->FileObject && IoStack->FileObject->FsContext) - { - ObjectHeader = (PKSIOBJECT_HEADER) IoStack->FileObject->FsContext; - - KSCREATE_ITEM_IRP_STORAGE(Irp) = ObjectHeader->CreateItem; - return ObjectHeader->DispatchTable.Write(DeviceObject, Irp); - } - else - { - DPRINT1("Expected Object Header %p\n", IoStack->FileObject); - KeBugCheckEx(0, 0, 0, 0, 0); - return STATUS_SUCCESS; - } -} - -NTAPI -NTSTATUS -KspFlushBuffers( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - PIO_STACK_LOCATION IoStack; - PKSIOBJECT_HEADER ObjectHeader; - - /* get current stack location */ - IoStack = IoGetCurrentIrpStackLocation(Irp); - - DPRINT("KS / FlushBuffers\n"); - if (IoStack->FileObject && IoStack->FileObject->FsContext) - { - ObjectHeader = (PKSIOBJECT_HEADER) IoStack->FileObject->FsContext; - - KSCREATE_ITEM_IRP_STORAGE(Irp) = ObjectHeader->CreateItem; - return ObjectHeader->DispatchTable.Flush(DeviceObject, Irp); - } - else - { - DPRINT1("Expected Object Header\n"); - KeBugCheckEx(0, 0, 0, 0, 0); - return STATUS_SUCCESS; - } -} - -NTAPI -NTSTATUS -KspQuerySecurity( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - PIO_STACK_LOCATION IoStack; - PKSIOBJECT_HEADER ObjectHeader; - - /* get current stack location */ - IoStack = IoGetCurrentIrpStackLocation(Irp); - - DPRINT("KS / QuerySecurity\n"); - if (IoStack->FileObject && IoStack->FileObject->FsContext) - { - ObjectHeader = (PKSIOBJECT_HEADER) IoStack->FileObject->FsContext; - - KSCREATE_ITEM_IRP_STORAGE(Irp) = ObjectHeader->CreateItem; - return ObjectHeader->DispatchTable.QuerySecurity(DeviceObject, Irp); - } - else - { - DPRINT1("Expected Object Header\n"); - KeBugCheckEx(0, 0, 0, 0, 0); - return STATUS_SUCCESS; - } -} - -NTAPI -NTSTATUS -KspSetSecurity( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - PIO_STACK_LOCATION IoStack; - PKSIOBJECT_HEADER ObjectHeader; - - /* get current stack location */ - IoStack = IoGetCurrentIrpStackLocation(Irp); - - DPRINT("KS / SetSecurity\n"); - if (IoStack->FileObject && IoStack->FileObject->FsContext) - { - ObjectHeader = (PKSIOBJECT_HEADER) IoStack->FileObject->FsContext; - - KSCREATE_ITEM_IRP_STORAGE(Irp) = ObjectHeader->CreateItem; - return ObjectHeader->DispatchTable.SetSecurity(DeviceObject, Irp); - } - else - { - DPRINT1("Expected Object Header\n"); - KeBugCheckEx(0, 0, 0, 0, 0); - return STATUS_SUCCESS; - } + /* not supported request */ + Status = KsDispatchInvalidDeviceRequest(DeviceObject, Irp); + } + + /* done */ + return Status; } /* @@ -1131,28 +1213,18 @@ case IRP_MJ_CREATE: DriverObject->MajorFunction[MajorFunction] = KspCreate; break; - case IRP_MJ_CLOSE: - DriverObject->MajorFunction[MajorFunction] = KspClose; break; case IRP_MJ_DEVICE_CONTROL: DriverObject->MajorFunction[MajorFunction] = KspDeviceControl; break; + case IRP_MJ_CLOSE: case IRP_MJ_READ: - DriverObject->MajorFunction[MajorFunction] = KspRead; + case IRP_MJ_WRITE: + case IRP_MJ_FLUSH_BUFFERS : + case IRP_MJ_QUERY_SECURITY: + case IRP_MJ_SET_SECURITY: + DriverObject->MajorFunction[MajorFunction] = KspDispatchIrp; break; - case IRP_MJ_WRITE: - DriverObject->MajorFunction[MajorFunction] = KspWrite; - break; - case IRP_MJ_FLUSH_BUFFERS : - DriverObject->MajorFunction[MajorFunction] = KspFlushBuffers; - break; - case IRP_MJ_QUERY_SECURITY: - DriverObject->MajorFunction[MajorFunction] = KspQuerySecurity; - break; - case IRP_MJ_SET_SECURITY: - DriverObject->MajorFunction[MajorFunction] = KspSetSecurity; - break; - default: return STATUS_INVALID_PARAMETER; }; @@ -1171,37 +1243,93 @@ IN PIRP Irp) { PIO_STACK_LOCATION IoStack; + PKSIDEVICE_HEADER DeviceHeader; + PDEVICE_EXTENSION DeviceExtension; + + /* get device extension */ + DeviceExtension = (PDEVICE_EXTENSION)DeviceObject->DeviceExtension; + /* get device header */ + DeviceHeader = DeviceExtension->DeviceHeader; + + /* get current irp stack */ IoStack = IoGetCurrentIrpStackLocation(Irp); - //FIXME REWRITE - - switch (IoStack->MajorFunction) - { - case IRP_MJ_CREATE: - return KspCreate(DeviceObject, Irp); - case IRP_MJ_CLOSE: - return KspClose(DeviceObject, Irp); - break; - case IRP_MJ_DEVICE_CONTROL: + if (IoStack->MajorFunction <= IRP_MJ_DEVICE_CONTROL) + { + if (IoStack->MajorFunction == IRP_MJ_CREATE) + { + /* check internal type */ + if (DeviceHeader->lpVtblIKsDevice) /* FIXME improve check */ + { + /* AVStream client */ + return IKsDevice_Create(DeviceObject, Irp); + } + else + { + /* external client (portcls) */ + return KspCreate(DeviceObject, Irp); + } + } + + if (IoStack->MajorFunction == IRP_MJ_DEVICE_CONTROL) + { + /* handle device requests */ return KspDeviceControl(DeviceObject, Irp); - break; - case IRP_MJ_READ: - return KspRead(DeviceObject, Irp); - break; - case IRP_MJ_WRITE: - return KspWrite(DeviceObject, Irp); - break; - case IRP_MJ_FLUSH_BUFFERS: - return KspFlushBuffers(DeviceObject, Irp); - break; - case IRP_MJ_QUERY_SECURITY: - return KspQuerySecurity(DeviceObject, Irp); - break; - case IRP_MJ_SET_SECURITY: - return KspSetSecurity(DeviceObject, Irp); - break; - default: - return STATUS_INVALID_PARAMETER; /* is this right? */ - }; -} + } + + switch (IoStack->MajorFunction) + { + case IRP_MJ_CLOSE: + case IRP_MJ_READ: + case IRP_MJ_WRITE: + case IRP_MJ_FLUSH_BUFFERS: + case IRP_MJ_QUERY_SECURITY: + case IRP_MJ_SET_SECURITY: + case IRP_MJ_PNP: + return KspDispatchIrp(DeviceObject, Irp); + default: + return KsDispatchInvalidDeviceRequest(DeviceObject, Irp); + } + } + + /* dispatch power */ + if (IoStack->MajorFunction == IRP_MJ_POWER) + { + /* check internal type */ + if (DeviceHeader->lpVtblIKsDevice) /* FIXME improve check */ + { + /* AVStream client */ + return IKsDevice_Power(DeviceObject, Irp); + } + else + { + /* external client (portcls) */ + return KsDefaultDispatchPower(DeviceObject, Irp); + } + } + else if (IoStack->MajorFunction == IRP_MJ_PNP) /* dispatch pnp */ + { + /* check internal type */ + if (DeviceHeader->lpVtblIKsDevice) /* FIXME improve check */ + { + /* AVStream client */ + return IKsDevice_Pnp(DeviceObject, Irp); + } + else + { + /* external client (portcls) */ + return KsDefaultDispatchPnp(DeviceObject, Irp); + } + } + else if (IoStack->MajorFunction == IRP_MJ_SYSTEM_CONTROL) + { + /* forward irp */ + return KsDefaultForwardIrp(DeviceObject, Irp); + } + else + { + /* not supported */ + return KsDispatchInvalidDeviceRequest(DeviceObject, Irp); + } +} Modified: trunk/reactos/drivers/ksfilter/ks/kstypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/kstype… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/kstypes.h [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/kstypes.h [iso-8859-1] Tue Jul 21 15:32:28 2009 @@ -43,8 +43,8 @@ ULONG DeviceIndex; KSPIN_LOCK ItemListLock; - PDEVICE_OBJECT PhysicalDeviceObject; - PDEVICE_OBJECT NextDeviceObject; + PDEVICE_OBJECT PnpDeviceObject; + PDEVICE_OBJECT BaseDevice; KSTARGET_STATE TargetState; LIST_ENTRY TargetDeviceList; Modified: trunk/reactos/drivers/ksfilter/ks/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/misc.c… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/misc.c [iso-8859-1] Tue Jul 21 15:32:28 2009 @@ -70,7 +70,7 @@ IoSetCompletionRoutine(Irp, KspForwardIrpSynchronousCompletion, (PVOID)&Event, TRUE, TRUE, TRUE); /* now call the driver */ - Status = IoCallDriver(DeviceHeader->NextDeviceObject, Irp); + Status = IoCallDriver(DeviceHeader->BaseDevice, Irp); /* did the request complete yet */ if (Status == STATUS_PENDING) {

1 0

[ros-arm-bringup] 42116: - Do not set the non-x86 file system and disk read buffers to some random static variable that isn't even initialized on time. - As a temporary hack, hard-code them to 0x80000000, a valid RAM address on OMAP3. - This code path is only used on ARM anyway, so it's not such a big deal, but a better fix should be done later. - OmapLDR can now boot FreeLDR, which attempts to load NTOSKRNL.EXE and dies. - Need to revisit significant parts of the MMU code before attempting to g
by ros-arm-bringup＠svn.reactos.org 21 Jul '09

21 Jul '09

Author: ros-arm-bringup Date: Tue Jul 21 11:44:36 2009 New Revision: 42116 URL: http://svn.reactos.org/svn/reactos?rev=42116&view=rev Log: - Do not set the non-x86 file system and disk read buffers to some random static variable that isn't even initialized on time. - As a temporary hack, hard-code them to 0x80000000, a valid RAM address on OMAP3. - This code path is only used on ARM anyway, so it's not such a big deal, but a better fix should be done later. - OmapLDR can now boot FreeLDR, which attempts to load NTOSKRNL.EXE and dies. - Need to revisit significant parts of the MMU code before attempting to go further; this won't likely be done for a good couple of months. Modified: trunk/reactos/boot/freeldr/freeldr/include/arch.h Modified: trunk/reactos/boot/freeldr/freeldr/include/arch.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch.h [iso-8859-1] Tue Jul 21 11:44:36 2009 @@ -48,8 +48,8 @@ #define DISKREADBUFFER 0x90000 /* Buffer to store data read in from the disk via the BIOS */ #elif defined(_M_PPC) || defined(_M_MIPS) || defined(_M_ARM) extern PVOID FsStaticBufferDisk, FsStaticBufferData; -#define DISKREADBUFFER FsStaticBufferDisk -#define FILESYSBUFFER FsStaticBufferData +#define DISKREADBUFFER 0x80000000 +#define FILESYSBUFFER 0x80000000 #endif /* Makes "x" a global variable or label */

1 0

[dchapyshev] 42115: - Add ws2help from alex-network-branch
by dchapyshev＠svn.reactos.org 21 Jul '09

21 Jul '09

Author: dchapyshev Date: Tue Jul 21 11:16:26 2009 New Revision: 42115 URL: http://svn.reactos.org/svn/reactos?rev=42115&view=rev Log: - Add ws2help from alex-network-branch Added: trunk/reactos/dll/win32/ws2help_new/ (with props) trunk/reactos/dll/win32/ws2help_new/apc.c (with props) trunk/reactos/dll/win32/ws2help_new/context.c (with props) trunk/reactos/dll/win32/ws2help_new/dllmain.c (with props) trunk/reactos/dll/win32/ws2help_new/handle.c (with props) trunk/reactos/dll/win32/ws2help_new/notify.c (with props) trunk/reactos/dll/win32/ws2help_new/precomp.h (with props) trunk/reactos/dll/win32/ws2help_new/ws2help.h (with props) trunk/reactos/dll/win32/ws2help_new/ws2help.rbuild (with props) trunk/reactos/dll/win32/ws2help_new/ws2help.rc (with props) trunk/reactos/dll/win32/ws2help_new/ws2help.spec (with props) trunk/reactos/dll/win32/ws2help_new/wshdrv.h (with props) Propchange: trunk/reactos/dll/win32/ws2help_new/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Tue Jul 21 11:16:26 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/win32/ws2help_new/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/win32/ws2help_new/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/win32/ws2help_new/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/dll/win32/ws2help_new/apc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2help_new/apc.… ============================================================================== --- trunk/reactos/dll/win32/ws2help_new/apc.c (added) +++ trunk/reactos/dll/win32/ws2help_new/apc.c [iso-8859-1] Tue Jul 21 11:16:26 2009 @@ -1,0 +1,152 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS WinSock 2 DLL + * FILE: include/ws2_32.h + * PURPOSE: WinSock 2 DLL header + */ + +/* INCLUDES ******************************************************************/ + +#include "precomp.h" + +/* DATA **********************************************************************/ + +#define APCH (HANDLE)'SOR ' + +/* FUNCTIONS *****************************************************************/ + +DWORD +WINAPI +WahOpenApcHelper(OUT PHANDLE ApcHelperHandle) +{ + DWORD ErrorCode; + + /* Enter the prolog, make sure we're initialized */ + ErrorCode = WS2HELP_PROLOG(); + if (ErrorCode != ERROR_SUCCESS) return ErrorCode; + + /* Validate handle */ + if (!ApcHelperHandle) return ERROR_INVALID_PARAMETER; + + /* + * Return a bogus handle ("ROS") + * Historical note:(MS sends "CKM", which probably stands for "Keith Moore" + * (KM), one of the core architects of Winsock 2.2 from Microsoft. + */ + *ApcHelperHandle = APCH; + return ERROR_SUCCESS; +} + +DWORD +WINAPI +WahCloseApcHelper(IN HANDLE ApcHelperHandle) +{ + DWORD ErrorCode; + + /* Enter the prolog, make sure we're initialized */ + ErrorCode = WS2HELP_PROLOG(); + if (ErrorCode != ERROR_SUCCESS) return ErrorCode; + + /* Validate handle */ + if (ApcHelperHandle != APCH) return ERROR_INVALID_PARAMETER; + + /* return */ + return ERROR_SUCCESS; +} + +DWORD +WINAPI +WahCloseThread(IN HANDLE ApcHelperHandle, + IN LPWSATHREADID ThreadId) +{ + DWORD ErrorCode; + + /* Enter the prolog, make sure we're initialized */ + ErrorCode = WS2HELP_PROLOG(); + if (ErrorCode != ERROR_SUCCESS) return ErrorCode; + + /* Validate handles */ + if ((ApcHelperHandle != APCH) || (!ThreadId) || (!ThreadId->ThreadHandle)) + { + /* Invalid helper/thread handles */ + return ERROR_INVALID_PARAMETER; + } + + /* Close the thread handle */ + if (CloseHandle(ThreadId->ThreadHandle)) + { + /* Clear the sturcture */ + ThreadId->ThreadHandle = NULL; + ThreadId->Reserved = 0; + return NO_ERROR; + } + + /* return */ + return GetLastError(); +} + +INT +WINAPI +WahQueueUserApc(IN HANDLE ApcHelperHandle, + IN LPWSATHREADID ThreadId, + IN LPWSAUSERAPC ApcRoutine, + IN PVOID ApcContext OPTIONAL) +{ + /* Validate params */ + if ((ApcHelperHandle != APCH) || + (!ThreadId) || + (!ThreadId->ThreadHandle) || + (!ApcRoutine)) + { + /* Invalid parameters */ + return ERROR_INVALID_PARAMETER; + } + + /* Queue the APC */ + if (QueueUserAPC(ApcRoutine, ThreadId->ThreadHandle, (ULONG_PTR)ApcContext)) + { + /* Return success */ + return ERROR_SUCCESS; + } + + /* Fail */ + return GetLastError(); +} + +DWORD +WINAPI +WahOpenCurrentThread(IN HANDLE ApcHelperHandle, + OUT LPWSATHREADID ThreadId) +{ + HANDLE ProcessHandle, ThreadHandle; + + /* Validate params */ + if ((ApcHelperHandle != APCH) || (!ThreadId)) + { + /* Invalid parameters */ + return ERROR_INVALID_PARAMETER; + } + + /* Get the process/thread handles */ + ProcessHandle = GetCurrentProcess(); + ThreadHandle = GetCurrentThread(); + + /* Duplicate the handle */ + if (DuplicateHandle(ProcessHandle, + ThreadHandle, + ProcessHandle, + &ThreadId->ThreadHandle, + 0, + FALSE, + DUPLICATE_SAME_ACCESS)) + { + /* Save the thread handle and return */ + ThreadId->Reserved = (DWORD_PTR)ThreadHandle; + return ERROR_SUCCESS; + } + + /* Fail */ + return GetLastError(); +} + +/* EOF */ Propchange: trunk/reactos/dll/win32/ws2help_new/apc.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/ws2help_new/context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2help_new/cont… ============================================================================== --- trunk/reactos/dll/win32/ws2help_new/context.c (added) +++ trunk/reactos/dll/win32/ws2help_new/context.c [iso-8859-1] Tue Jul 21 11:16:26 2009 @@ -1,0 +1,601 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS WinSock 2 DLL + * FILE: include/ws2_32.h + * PURPOSE: WinSock 2 DLL header + */ + +/* INCLUDES ******************************************************************/ + +#include "precomp.h" + +/* DATA **********************************************************************/ + +CRITICAL_SECTION WshHandleTableLock; +HANDLE ghWriterEvent; +DWORD gdwSpinCount = 0; +DWORD gHandleToIndexMask; + +CONST DWORD SockPrimes[] = +{ + 31, 61, 127, 257, 521, 1031, 2053, + 4099, 8191, 16381, 32749, 65537, 131071, 261983, + -1 +}; + +typedef volatile LONG VLONG; +typedef VLONG *PVLONG; + +/* DEFINES *******************************************************************/ + +/* Yes, we "abuse" the lower bits */ +#define WSH_SEARCH_TABLE_FROM_HANDLE(h, t) \ + (&t->SearchTables[(((ULONG_PTR)h >> 2) & t->Mask)]) + +#define WSH_HASH_FROM_HANDLE(h, hs) \ + (hs->Handles[((ULONG_PTR)h % hs->Size)]) + +#define AcquireWriteLock(t) \ + EnterCriticalSection(&t->Lock); + +#define ReleaseWriteLock(t) \ + LeaveCriticalSection(&t->Lock); + +/* FUNCTIONS *****************************************************************/ + +VOID +static __inline +AcquireReadLock(IN PWAH_SEARCH_TABLE Table, + IN PVLONG *Count) +{ + LONG OldCount; + + /* Start acquire loop */ + do + { + /* Write and save count value */ + *Count = Table->CurrentCount; + OldCount = **Count; + + /* Check if it's valid and try to increment it */ + if ((OldCount > 0) && (InterlockedCompareExchange(*Count, + OldCount + 1, + OldCount) == OldCount)) + { + /* Everything went OK */ + break; + } + } while (TRUE); +} + +VOID +static __inline +ReleaseReadLock(IN PWAH_SEARCH_TABLE Table, + IN PVLONG Count) +{ + /* Decrement the count. If we went below 0, someone is waiting... */ + if (InterlockedDecrement(Count) < 0) + { + /* We use pulse since this is a shared event */ + PulseEvent(ghWriterEvent); + } +} + +VOID +WINAPI +DoWaitForReaders(IN PWAH_SEARCH_TABLE Table, + IN PVLONG Counter) +{ + HANDLE EventHandle; + + /* Do a context switch */ + SwitchToThread(); + + /* Check if the counter is above one */ + if (*Counter > 0) + { + /* + * This shouldn't happen unless priorities are messed up. Do a wait so + * that the threads with lower priority will get their chance now. + */ + if (!ghWriterEvent) + { + /* We don't even have an event! Allocate one manually... */ + EventHandle = CreateEvent(NULL, TRUE, FALSE, NULL); + if (EventHandle) + { + /* Save the event handle atomically */ + if ((InterlockedCompareExchangePointer((PVOID*)&ghWriterEvent, + EventHandle, + NULL))) + { + /* Someone beat us to it, close ours */ + CloseHandle(EventHandle); + } + } + else + { + /* Things couldn't get worse for us. Do a last-resort hack */ + while (*Counter > 0) Sleep(10); + } + } + + /* + * Our event is ready. Tell the others to signal us by making sure + * that the last counter will be -1, notifying the last thread of our + * request. + */ + if (InterlockedDecrement(Counter) >= 0) + { + /* Keep looping */ + do + { + /* Wait in tiny bursts, so we can catch the PulseEvent */ + WaitForSingleObject(ghWriterEvent, 10); + } while (*Counter >= 0); + } + } +} + +VOID +static __inline +TryWaitForReaders(IN PWAH_SEARCH_TABLE Table) +{ + PVLONG OldCount = Table->CurrentCount; + LONG SpinCount; + + /* See which counter is being used */ + if (OldCount == &Table->Count1) + { + /* Use counter 2 now */ + Table->Count2 = 1; + Table->CurrentCount = &Table->Count2; + } + else + { + /* Use counter 1 now */ + Table->Count1 = 1; + Table->CurrentCount = &Table->Count1; + } + + /* Decrease the old count to block new readers */ + if (InterlockedDecrement(OldCount) > 0) + { + /* On an MP machine, spin a bit first */ + if (Table->SpinCount) + { + /* Get the spincount and loop it */ + SpinCount = Table->SpinCount; + while (*OldCount > 0) + { + /* Check if the spin failed */ + if (--SpinCount <= 0) break; + } + } + + /* Check one last time if someone is still active */ + if (*OldCount > 0) + { + /* Yep, we'll have to do a blocking (slow) wait */ + DoWaitForReaders(Table, OldCount); + } + } +} + +DWORD +WINAPI +WahCreateHandleContextTable(OUT PWAH_HANDLE_TABLE *Table) +{ + DWORD ErrorCode; + PWAH_HANDLE_TABLE LocalTable; + DWORD i; + + /* Enter the prolog, make sure we're initialized */ + ErrorCode = WS2HELP_PROLOG(); + if (ErrorCode != ERROR_SUCCESS) return ErrorCode; + + /* Assume NULL */ + *Table = NULL; + + /* Allocate enough tables */ + LocalTable = HeapAlloc(GlobalHeap, + 0, + FIELD_OFFSET(WSH_HANDLE_TABLE, + SearchTables[gHandleToIndexMask + 1])); + + /* Make sure it was allocated */ + if (!LocalTable) return WSA_NOT_ENOUGH_MEMORY; + + /* Set the mask for the table */ + LocalTable->Mask = gHandleToIndexMask; + + /* Now initialize every table */ + for (i = 0; i <= gHandleToIndexMask; i++) + { + /* No hash table yet */ + LocalTable->SearchTables[i].HashTable = NULL; + + /* Set the current count */ + LocalTable->SearchTables[i].CurrentCount = &LocalTable->SearchTables[i].Count1; + + /* Initialize the counts */ + LocalTable->SearchTables[i].Count1 = 1; + LocalTable->SearchTables[i].Count2 = 0; + + /* Set expanding state and spin count */ + LocalTable->SearchTables[i].Expanding = FALSE; + LocalTable->SearchTables[i].SpinCount = gdwSpinCount; + + /* Initialize the lock */ + (VOID)InitializeCriticalSectionAndSpinCount(&LocalTable-> + SearchTables[i].Lock, + gdwSpinCount); + } + + /* Return pointer */ + *Table = LocalTable; + + /* Return success */ + return ERROR_SUCCESS; +} + +DWORD +WINAPI +WahDestroyHandleContextTable(IN PWAH_HANDLE_TABLE Table) +{ + DWORD i; + + /* Make sure the table is valid */ + if (!Table) + { + /* No valid table */ + return ERROR_INVALID_PARAMETER; + } + + /* Loop each search table */ + for (i = 0; i <= Table->Mask; i++) + { + /* Check if there's a table here */ + if (Table->SearchTables[i].HashTable) + { + /* Free it */ + HeapFree(GlobalHeap, 0, Table->SearchTables[i].HashTable); + } + + /* Delete the lock */ + DeleteCriticalSection(&Table->SearchTables[i].Lock); + } + + /* Delete the table */ + HeapFree(GlobalHeap, 0, Table); + + /* Return success */ + return ERROR_SUCCESS; +} + +BOOL +WINAPI +WahEnumerateHandleContexts(IN PWAH_HANDLE_TABLE Table, + IN PWAH_HANDLE_ENUMERATE_PROC Callback, + IN PVOID Context) +{ + DWORD i, j; + PWAH_SEARCH_TABLE SearchTable; + PWAH_HASH_TABLE HashTable; + PWAH_HANDLE Handle; + BOOL GoOn = TRUE; + + /* Loop the table */ + for (i = 0; i <= Table->Mask; i++) + { + /* Get the Search table */ + SearchTable = &Table->SearchTables[i]; + + /* Lock it */ + AcquireWriteLock(SearchTable); + + /* Mark us as expanding and wait for everyone */ + SearchTable->Expanding = TRUE; + TryWaitForReaders(SearchTable); + + /* Get the hash table */ + HashTable = SearchTable->HashTable; + + /* Make sure it exists */ + if (HashTable) + { + /* Loop every handle in it */ + for (j = 0; j < HashTable->Size; j++) + { + /* Get this handle */ + Handle = HashTable->Handles[j]; + if (!Handle) continue; + + /* Call the callback proc */ + GoOn = Callback(Context, Handle); + if (!GoOn) break; + } + } + + /* Disable the expansion bit and release the lock */ + SearchTable->Expanding = FALSE; + ReleaseWriteLock(SearchTable); + + /* Check again if we should leave */ + if (!GoOn) break; + } + + /* return */ + return GoOn; +} + +PWAH_HANDLE +WINAPI +WahInsertHandleContext(IN PWAH_HANDLE_TABLE Table, + IN PWAH_HANDLE Handle) +{ + PWAH_HANDLE *HashHandle, OldHandle; + PVLONG Count; + PWAH_HASH_TABLE HashTable, NewHashTable; + DWORD HandleCount, i; + PWAH_SEARCH_TABLE SearchTable; + + /* Get the current Search Table */ + SearchTable = WSH_SEARCH_TABLE_FROM_HANDLE(Handle->Handle, Table); + + /* Start loop */ + do + { + /* Get reader lock */ + AcquireReadLock(SearchTable, &Count); + + /* Get the hash table */ + HashTable = SearchTable->HashTable; + + /* Make sure we are not expanding, and that the table is there */ + if (!(SearchTable->Expanding) && (HashTable)) + { + /* Get the hash handle */ + HashHandle = &WSH_HASH_FROM_HANDLE(Handle->Handle, HashTable); + + /* Do the insert */ + if (InterlockedCompareExchangePointer((PVOID*)HashHandle, + Handle, + NULL) == NULL) + { + /* Success, release the reader lock */ + ReleaseReadLock(SearchTable, Count); + + /* Save old handle */ + OldHandle = Handle; + break; + } + } + + /* Release the read lock since we're done with it now */ + ReleaseReadLock(SearchTable, Count); + + /* We need the writer lock to expand/create the table */ + AcquireWriteLock(SearchTable); + + /* Mark the table in use */ + SearchTable->Expanding = TRUE; + + /* Wait for all the readers to finish */ + TryWaitForReaders(SearchTable); + + /* Start loop */ + do + { + /* Get the hash table again */ + HashTable = SearchTable->HashTable; + + /* Check if exists now */ + if (HashTable) + { + /* It does! Do what we wanted to do earlier. Get the hash... */ + HashHandle = &WSH_HASH_FROM_HANDLE(Handle->Handle, HashTable); + + /* Check if it doesn't exist */ + if (!(*HashHandle)) + { + /* Write it (no need for interlock, we have the RW lock) */ + OldHandle = Handle; + *HashHandle = Handle; + break; + } + else if ((*HashHandle)->Handle == Handle->Handle) + { + /* Handle matches, write it (see comment above) */ + OldHandle = *HashHandle; + *HashHandle = Handle; + break; + } + + /* No go, we need to expand the table. Remember the size now */ + HandleCount = HashTable->Size; + } + else + { + /* Table is empty, we have to create it */ + HandleCount = 0; + } + +ExpandTable: + /* Find a free prime */ + for (i = 0; HandleCount >= SockPrimes[i]; i++); + + /* Check if we found one */ + if (SockPrimes[i] != 0xFFFFFFFF) + { + /* Use the prime */ + HandleCount = SockPrimes[i]; + } + else + { + /* No primes left. Table is quite large, so simply double it */ + HandleCount *= 2; + } + + /* Allocate the table */ + NewHashTable = HeapAlloc(GlobalHeap, + 0, + FIELD_OFFSET(WSH_HASH_TABLE, + Handles[HandleCount])); + + /* Hopefully we have one now */ + if (NewHashTable) + { + /* Set its size */ + NewHashTable->Size = HandleCount; + + /* Initialize it */ + RtlZeroMemory(NewHashTable->Handles, HandleCount * sizeof(PVOID)); + + /* Insert us first */ + WSH_HASH_FROM_HANDLE(Handle->Handle, NewHashTable) = Handle; + + /* Now check if our old table had entries in it */ + if (HashTable) + { + /* We need to move them */ + for (i = 0; i < HashTable->Size; i++) + { + /* Make sure the hash handle exists */ + if (HashTable->Handles[i]) + { + /* Get it */ + HashHandle = &WSH_HASH_FROM_HANDLE(HashTable-> + Handles[i]->Handle, + NewHashTable); + + /* Check if it has a value */ + if (!(*HashHandle)) + { + /* It's empty, so just write the handle */ + *HashHandle = HashTable->Handles[i]; + } + else + { + /* Not empty :/... that implies a collision */ + HeapFree(GlobalHeap, 0, NewHashTable); + goto ExpandTable; + } + } + } + + /* Write the new hash table */ + SearchTable->HashTable = NewHashTable; + + /* Wait for everyone to be done with it, then free it */ + TryWaitForReaders(SearchTable); + HeapFree(GlobalHeap, 0, HashTable); + } + else + { + /* It was empty, nothing to worry about */ + SearchTable->HashTable = NewHashTable; + } + + /* Save the old handle */ + OldHandle = Handle; + } + else + { + /* There was no old handle */ + OldHandle = Handle; + } + } while (0); + + /* Mark us as free, and release the write lock */ + SearchTable->Expanding = FALSE; + ReleaseWriteLock(SearchTable); + break; + } while (1); + + /* Return the old handle */ + return OldHandle; +} + +PWAH_HANDLE +WINAPI +WahReferenceContextByHandle(IN PWAH_HANDLE_TABLE Table, + IN HANDLE Handle) +{ + PWAH_HANDLE HashHandle; + PWAH_SEARCH_TABLE SearchTable; + PWAH_HASH_TABLE HashTable; + PVLONG Count; + + /* Get the current Search Table */ + SearchTable = WSH_SEARCH_TABLE_FROM_HANDLE(Handle, Table); + + /* Lock it */ + AcquireReadLock(SearchTable, &Count); + + /* Get the hash table and handle */ + HashTable = SearchTable->HashTable; + + /* Check if it's valid, and if it's the one we want */ + if ((HashTable) && + (HashHandle = WSH_HASH_FROM_HANDLE(Handle, HashTable)) && + (HashHandle->Handle == Handle)) + { + /* Reference the handle */ + InterlockedIncrement(&HashHandle->RefCount); + } + else + { + /* Invalid handle */ + HashHandle = NULL; + } + + /* Release the lock */ + ReleaseReadLock(SearchTable, Count); + + /* Return */ + return HashHandle; +} + +DWORD +WINAPI +WahRemoveHandleContext(IN PWAH_HANDLE_TABLE Table, + IN PWAH_HANDLE Handle) +{ + PWAH_HANDLE *HashHandle; + PWAH_SEARCH_TABLE SearchTable; + PWAH_HASH_TABLE HashTable; + DWORD ErrorCode = ERROR_SUCCESS; + + /* Get the current Search Table */ + SearchTable = WSH_SEARCH_TABLE_FROM_HANDLE(Handle->Handle, Table); + + /* Lock it */ + AcquireWriteLock(SearchTable); + + /* Get the hash table and handle */ + HashTable = SearchTable->HashTable; + HashHandle = &WSH_HASH_FROM_HANDLE(Handle->Handle, HashTable); + + /* Make sure we have a handle, and write the new pointer */ + if (HashHandle && (InterlockedCompareExchangePointer((PVOID*)HashHandle, + NULL, + Handle) == Handle)) + { + /* Wait for everyone to be done with it */ + TryWaitForReaders(SearchTable); + } + else + { + /* Invalid handle */ + ErrorCode = ERROR_INVALID_PARAMETER; + } + + /* Release the lock */ + ReleaseWriteLock(SearchTable); + + /* Return */ + return ErrorCode; +} + +/* EOF */ Propchange: trunk/reactos/dll/win32/ws2help_new/context.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/ws2help_new/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2help_new/dllm… ============================================================================== --- trunk/reactos/dll/win32/ws2help_new/dllmain.c (added) +++ trunk/reactos/dll/win32/ws2help_new/dllmain.c [iso-8859-1] Tue Jul 21 11:16:26 2009 @@ -1,0 +1,170 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS WinSock 2 DLL + * FILE: include/ws2_32.h + * PURPOSE: WinSock 2 DLL header + */ + +/* INCLUDES ******************************************************************/ + +#include "precomp.h" + +/* DATA **********************************************************************/ + +HANDLE GlobalHeap; +BOOL Ws2helpInitialized = FALSE; +CRITICAL_SECTION StartupSyncronization; +HINSTANCE LibraryHdl; + +/* FUNCTIONS *****************************************************************/ + +VOID +WINAPI +NewCtxInit(VOID) +{ + NT_PRODUCT_TYPE ProductType = NtProductWinNt; + SYSTEM_INFO SystemInfo; + DWORD NumHandleBuckets; + HKEY KeyHandle; + DWORD RegSize = sizeof(DWORD); + DWORD RegType; + DWORD Mask; + + /* Try to figure out if this is a workstation or server install */ + RtlGetNtProductType(&ProductType); + + /* Get the system info */ + GetSystemInfo(&SystemInfo); + + /* If this is an MP machine, set the default spinlock */ + if (SystemInfo.dwNumberOfProcessors > 1) gdwSpinCount = 2000; + + /* Figure how many "Handle Buckets" we'll use. Start with the default */ + NumHandleBuckets = ProductType == NtProductWinNt ? 8 : 32; + + /* Open the registry settings */ + if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, + "System\\CurrentControlSet\\Services\\Winsock2\\Parameters", + 0, + KEY_QUERY_VALUE, + &KeyHandle) == ERROR_SUCCESS) + { + /* Query the key */ + RegQueryValueEx(KeyHandle, + "Ws2_32NumHandleBuckets", + 0, + &RegType, + (LPBYTE)&NumHandleBuckets, + &RegSize); + + /* Are we on MP? */ + if (SystemInfo.dwNumberOfProcessors > 1) + { + /* Also check for a custom spinlock setting */ + RegQueryValueEx(KeyHandle, + "Ws2_32SpinCount", + 0, + &RegType, + (LPBYTE)&gdwSpinCount, + &RegSize); + } + + /* Close the key, we're done */ + RegCloseKey(KeyHandle); + } + + /* Now get the bucket count and normalize it to be log2 and within 256 */ + for (Mask = 256; !(Mask & NumHandleBuckets); Mask >>= 1); + NumHandleBuckets = Mask; + + /* Normalize it again, to be within OS parameters */ + if (ProductType == NtProductWinNt) + { + /* Is it within norms for non-server editions? */ + if (NumHandleBuckets > 32) NumHandleBuckets = 32; + else if (NumHandleBuckets < 8) NumHandleBuckets = 8; + } + else + { + /* Is it within norms for server editions? */ + if (NumHandleBuckets > 256) NumHandleBuckets = 256; + else if (NumHandleBuckets < 32) NumHandleBuckets = 32; + } + + /* Normalize the spincount */ + if (gdwSpinCount > 8000) gdwSpinCount = 8000; + + /* Set the final mask */ + gHandleToIndexMask = NumHandleBuckets -1; +} + +DWORD +WINAPI +Ws2helpInitialize(VOID) +{ + /* Enter the startup CS */ + EnterCriticalSection(&StartupSyncronization); + + /* Check again for init */ + if (!Ws2helpInitialized) + { + /* Initialize us */ + NewCtxInit(); + Ws2helpInitialized = TRUE; + } + + /* Leave the CS and return */ + LeaveCriticalSection(&StartupSyncronization); + return ERROR_SUCCESS; +} + +BOOL +APIENTRY +DllMain(HANDLE hModule, + DWORD dwReason, + LPVOID lpReserved) +{ + switch (dwReason) + { + case DLL_PROCESS_ATTACH: + + /* Save our handle */ + LibraryHdl = hModule; + + /* Improve Performance */ + DisableThreadLibraryCalls(hModule); + + /* Initialize startup CS */ + InitializeCriticalSection(&StartupSyncronization); + + /* Get Global Heap */ + GlobalHeap = GetProcessHeap(); + break; + + case DLL_THREAD_ATTACH: + case DLL_THREAD_DETACH: + break; + + case DLL_PROCESS_DETACH: + + /* Make sure we loaded */ + if (!LibraryHdl) break; + + /* Check if we are cleaning up */ + if (lpReserved) + { + /* Free the security descriptor */ + if (pSDPipe) HeapFree(GlobalHeap, 0, pSDPipe); + + /* Close the event */ + if (ghWriterEvent) CloseHandle(ghWriterEvent); + + /* Delete the startup CS */ + DeleteCriticalSection(&StartupSyncronization); + Ws2helpInitialized = FALSE; + } + break; + } + + return TRUE; +} Propchange: trunk/reactos/dll/win32/ws2help_new/dllmain.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/ws2help_new/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2help_new/hand… ============================================================================== --- trunk/reactos/dll/win32/ws2help_new/handle.c (added) +++ trunk/reactos/dll/win32/ws2help_new/handle.c [iso-8859-1] Tue Jul 21 11:16:26 2009 @@ -1,0 +1,447 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS WinSock 2 DLL + * FILE: include/ws2_32.h + * PURPOSE: WinSock 2 DLL header + */ + +/* INCLUDES ******************************************************************/ + +#include "precomp.h" + +/* DATA **********************************************************************/ + +typedef struct _WSH_HELPER_CONTEXT +{ + HANDLE FileHandle; + HANDLE ThreadHandle; + HANDLE DllHandle; +} WSH_HELPER_CONTEXT, *PWAH_HELPER_CONTEXT; + +LPFN_WSASEND pWSASend; +LPFN_WSARECV pWSARecv; +LPFN_WSASENDTO pWSASendTo; +LPFN_WSARECVFROM pWSARecvFrom; +LPFN_WSAGETLASTERROR pWSAGetLastError; +LPFN_WSACANCELBLOCKINGCALL pWSACancelBlockingCall; +LPFN_WSASETBLOCKINGHOOK pWSASetBlockingHook; +LPFN_SELECT pSelect; +LPFN_WSASTARTUP pWSAStartup; +LPFN_WSACLEANUP pWSACleanup; +LPFN_GETSOCKOPT pGetSockOpt; +LPFN_WSAIOCTL pWSAIoctl; + +#define APCH (HANDLE)'SOR ' + +/* FUNCTIONS *****************************************************************/ + +VOID +CALLBACK +ApcThread(ULONG_PTR Context) +{ + +} + +NTSTATUS +WINAPI +DoSocketCancel(PVOID Context1, + PVOID Context2, + PVOID Context3) +{ + return STATUS_SUCCESS; +} + +NTSTATUS +WINAPI +DoSocketRequest(PVOID Context1, + PVOID Context2, + PVOID Context3) +{ + return STATUS_SUCCESS; +} + +VOID +CALLBACK +ExitThreadApc(ULONG_PTR Context) +{ + PWAH_HELPER_CONTEXT HelperContext = (PWAH_HELPER_CONTEXT)Context; + + /* Close the file handle */ + CloseHandle(HelperContext->FileHandle); + + /* Free the context */ + HeapFree(GlobalHeap, 0, HelperContext); + + /* Exit the thread and library */ + FreeLibraryAndExitThread(HelperContext->DllHandle, ERROR_SUCCESS); +} + +DWORD +WINAPI +WahCloseHandleHelper(IN HANDLE HelperHandle) +{ + DWORD ErrorCode; + PWAH_HELPER_CONTEXT Context = HelperHandle; + + /* Enter the prolog, make sure we're initialized */ + ErrorCode = WS2HELP_PROLOG(); + if (ErrorCode != ERROR_SUCCESS) return ErrorCode; + + /* Validate the handle */ + if (!Context) return ERROR_INVALID_PARAMETER; + + /* Queue an APC to exit the thread */ + if (QueueUserAPC(ExitThreadApc, Context->ThreadHandle, (ULONG_PTR)Context)) + { + /* Done */ + return ERROR_SUCCESS; + } + else + { + /* We failed somewhere */ + return ERROR_GEN_FAILURE; + } +} + +DWORD +WINAPI +WahCloseSocketHandle(IN HANDLE HelperHandle, + IN SOCKET Socket) +{ + DWORD ErrorCode; + PWAH_HELPER_CONTEXT Context = HelperHandle; + + /* Enter the prolog, make sure we're initialized */ + ErrorCode = WS2HELP_PROLOG(); + if (ErrorCode != ERROR_SUCCESS) return ErrorCode; + + /* Validate the handle */ + if (!(Context) || (Socket == INVALID_SOCKET) || !(Socket)) + { + /* Invalid handle and/or socket */ + return ERROR_INVALID_PARAMETER; + } + + /* Just close the handle and return */ + CloseHandle((HANDLE)Socket); + return ERROR_SUCCESS; +} + +DWORD +WINAPI +WahCreateSocketHandle(IN HANDLE HelperHandle, + OUT SOCKET *Socket) +{ + DWORD ErrorCode; + INT OpenType; + DWORD Size = sizeof(OpenType); + DWORD CreateOptions = 0; + UNICODE_STRING Name; + OBJECT_ATTRIBUTES ObjectAttributes; + PFILE_FULL_EA_INFORMATION Ea; + PWAH_EA_DATA EaData; + CHAR EaBuffer[sizeof(*Ea) + sizeof(*EaData)]; + NTSTATUS Status; + IO_STATUS_BLOCK IoStatusBlock; + PWAH_HELPER_CONTEXT Context = (PWAH_HELPER_CONTEXT)HelperHandle; + + /* Enter the prolog, make sure we're initialized */ + ErrorCode = WS2HELP_PROLOG(); + if (ErrorCode != ERROR_SUCCESS) return ErrorCode; + + /* Validate the handle and pointer */ + if (!(Context) || !(Socket)) + { + /* Invalid handle and/or socket */ + return ERROR_INVALID_PARAMETER; + } + + /* Set pointer to EA */ + Ea = (PFILE_FULL_EA_INFORMATION)EaBuffer; + + /* Get the open type to determine the create options */ + if ((pGetSockOpt(INVALID_SOCKET, + SOL_SOCKET, + SO_OPENTYPE, + (PCHAR)&OpenType, + (INT FAR*)&Size) == ERROR_SUCCESS) && (OpenType)) + { + /* This is a sync open */ + CreateOptions = FILE_SYNCHRONOUS_IO_NONALERT; + } + + /* Initialize the attributes for the driver */ + RtlInitUnicodeString(&Name, L"\\Device\\WS2IFSL\\NifsSct"); + InitializeObjectAttributes(&ObjectAttributes, + &Name, + 0, + NULL, + NULL); + + /* Set up the EA */ + Ea->NextEntryOffset = 0; + Ea->Flags = 0; + Ea->EaNameLength = sizeof("NifsSct"); + Ea->EaValueLength = sizeof(*EaData); + RtlCopyMemory(Ea->EaName, "NifsSct", Ea->EaNameLength); + + /* Get our EA data */ + EaData = (PWAH_EA_DATA)(Ea + 1); + + /* Write the EA Data */ + EaData->FileHandle = Context->FileHandle; + EaData->Context = NULL; + + /* Call the driver */ + Status = NtCreateFile((PHANDLE)Socket, + FILE_ALL_ACCESS, + &ObjectAttributes, + &IoStatusBlock, + NULL, + FILE_ATTRIBUTE_NORMAL, + 0, + FILE_OPEN_IF, + CreateOptions, + Ea, + sizeof(*Ea) + sizeof(*EaData)); + + /* Check for success */ + if (NT_SUCCESS(Status)) + { + /* Write the socket handle */ + EaData->Context =(HANDLE)*Socket; + + /* Tell the driver about it */ + if (DeviceIoControl((HANDLE)*Socket, + IOCTL_WS2IFSL_SET_HANDLE, + &EaData, + sizeof(WSH_EA_DATA), + NULL, + 0, + &Size, + NULL)) + { + /* Set success */ + ErrorCode = NO_ERROR; + } + else + { + /* We failed. Get the error and close the socket */ + ErrorCode = GetLastError(); + CloseHandle((HANDLE)*Socket); + *Socket = 0; + } + } + else + { + /* Create file failed, conver error code */ + ErrorCode = RtlNtStatusToDosError(Status); + } + + /* Return to caller */ + return ErrorCode; +} + +INT +WINAPI +WahDisableNonIFSHandleSupport(VOID) +{ + DWORD ErrorCode; + SC_HANDLE ServiceMgrHandle, Ws2IfsHandle; + + /* Enter the prolog, make sure we're initialized */ + ErrorCode = WS2HELP_PROLOG(); + if (ErrorCode != ERROR_SUCCESS) return ErrorCode; + + /* Open the service DB */ + ServiceMgrHandle = OpenSCManager(NULL, + SERVICES_ACTIVE_DATABASE, + SC_MANAGER_CREATE_SERVICE); + if (!ServiceMgrHandle) return GetLastError(); + + /* Open the service */ + Ws2IfsHandle = OpenService(ServiceMgrHandle, "WS2IFSL", SERVICE_ALL_ACCESS); + + /* Disable the servce */ + ChangeServiceConfig(Ws2IfsHandle, + SERVICE_NO_CHANGE, + SERVICE_DISABLED, + SERVICE_NO_CHANGE, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL); + + /* Close the handles and return */ + CloseServiceHandle(ServiceMgrHandle); + CloseServiceHandle(Ws2IfsHandle); + return ERROR_SUCCESS; +} + +INT +WINAPI +WahEnableNonIFSHandleSupport(VOID) +{ + return 0; +} + +DWORD +WINAPI +WahOpenHandleHelper(OUT PHANDLE HelperHandle) +{ + DWORD ErrorCode; + HINSTANCE hWs2_32; + UNICODE_STRING Name; + OBJECT_ATTRIBUTES ObjectAttributes; + PFILE_FULL_EA_INFORMATION Ea; + PWAH_EA_DATA2 EaData; + CHAR EaBuffer[sizeof(*Ea) + sizeof(*EaData)]; + NTSTATUS Status; + IO_STATUS_BLOCK IoStatusBlock; + DWORD Tid; + PWAH_HELPER_CONTEXT Context; + + /* Enter the prolog, make sure we're initialized */ + ErrorCode = WS2HELP_PROLOG(); + if (ErrorCode != ERROR_SUCCESS) return ErrorCode; + + /* Validate the pointer */ + if (!HelperHandle) + { + /* Invalid handle and/or socket */ + return ERROR_INVALID_PARAMETER; + } + + /* Get ws2_32.dll's handle. We don't load it: it MUST be here */ + hWs2_32 = GetModuleHandle ("WS2_32.DLL"); + if (!hWs2_32) return WSASYSCALLFAILURE; + + /* Dynamically load all its APIs */ + if (!((pGetSockOpt = (LPFN_GETSOCKOPT)GetProcAddress(hWs2_32, "getsockopt"))) || + !((pSelect = (LPFN_SELECT)GetProcAddress(hWs2_32, "select"))) || + !((pWSACancelBlockingCall = (LPFN_WSACANCELBLOCKINGCALL)GetProcAddress(hWs2_32, "WSACancelBlockingCall"))) || + !((pWSACleanup = (LPFN_WSACLEANUP)GetProcAddress(hWs2_32, "WSACleanup"))) || + !((pWSAGetLastError = (LPFN_WSAGETLASTERROR)GetProcAddress(hWs2_32, "WSAGetLastError"))) || + !((pWSASetBlockingHook = (LPFN_WSASETBLOCKINGHOOK)GetProcAddress(hWs2_32, "WSASetBlockingHook"))) || + !((pWSARecv = (LPFN_WSARECV)GetProcAddress(hWs2_32, "WSARecv"))) || + !((pWSASend = (LPFN_WSASEND)GetProcAddress(hWs2_32, "WSASend"))) || + !((pWSASendTo = (LPFN_WSASENDTO)GetProcAddress(hWs2_32, "WSASendTo"))) || + !((pWSAStartup = (LPFN_WSASTARTUP)GetProcAddress(hWs2_32, "WSAStartup"))) || + !((pWSARecvFrom = (LPFN_WSARECVFROM)GetProcAddress(hWs2_32, "WSARecvFrom"))) || + !((pWSAIoctl = (LPFN_WSAIOCTL)GetProcAddress(hWs2_32, "WSAIoctl")))) + { + /* Uh, guess we failed somewhere */ + return WSASYSCALLFAILURE; + } + + /* Set pointer EA structure */ + Ea = (PFILE_FULL_EA_INFORMATION)EaBuffer; + + /* Create the helper context */ + Context = HeapAlloc(GlobalHeap, 0, sizeof(WSH_HELPER_CONTEXT)); + if (Context) + { + /* Create the special request thread */ + Context->ThreadHandle = CreateThread(NULL, + 0, + (PVOID)ApcThread, + Context, + CREATE_SUSPENDED, + &Tid); + if (Context->ThreadHandle) + { + /* Create the attributes for the driver open */ + RtlInitUnicodeString(&Name, L"\\Device\\WS2IFSL\\NifsPvd"); + InitializeObjectAttributes(&ObjectAttributes, + &Name, + 0, + NULL, + NULL); + + /* Setup the EA */ + Ea->NextEntryOffset = 0; + Ea->Flags = 0; + Ea->EaNameLength = sizeof("NifsPvd"); + Ea->EaValueLength = sizeof(*EaData); + RtlCopyMemory(Ea->EaName, "NifsPvd", Ea->EaNameLength); + + /* Get our EA data */ + EaData = (PWAH_EA_DATA2)(Ea + 1); + + /* Fill out the EA Data */ + EaData->ThreadHandle = Context->ThreadHandle; + EaData->RequestRoutine = DoSocketRequest; + EaData->CancelRoutine = DoSocketCancel; + EaData->ApcContext = Context; + EaData->Reserved = 0; + + /* Call the driver */ + Status = NtCreateFile(&Context->FileHandle, + FILE_ALL_ACCESS, + &ObjectAttributes, + &IoStatusBlock, + NULL, + FILE_ATTRIBUTE_NORMAL, + 0, + FILE_OPEN_IF, + 0, + Ea, + sizeof(*Ea) + sizeof(*EaData)); + + /* Check for success */ + if (NT_SUCCESS(Status)) + { + /* Resume the thread and return a handle to the context */ + ResumeThread(Context->ThreadHandle); + *HelperHandle = (HANDLE)Context; + return ERROR_SUCCESS; + } + else + { + /* Get the error code */ + ErrorCode = RtlNtStatusToDosError(Status); + } + + /* We failed, mark us as such */ + Context->FileHandle = NULL; + ResumeThread(Context->ThreadHandle); + } + else + { + /* Get the error code */ + ErrorCode = GetLastError(); + } + + /* If we got here, we failed, so free the context */ + HeapFree(GlobalHeap, 0, Context); + } + else + { + /* Get the errror code */ + ErrorCode = GetLastError(); + } + + /* Return to caller */ + return ErrorCode; +} + +DWORD +WINAPI +WahCompleteRequest(IN HANDLE HelperHandle, + IN SOCKET Socket, + IN LPWSAOVERLAPPED lpOverlapped, + IN DWORD ErrorCode, + IN DWORD BytesTransferred) +{ + UNREFERENCED_PARAMETER(HelperHandle); + UNREFERENCED_PARAMETER(Socket); + UNREFERENCED_PARAMETER(lpOverlapped); + UNREFERENCED_PARAMETER(ErrorCode); + UNREFERENCED_PARAMETER(BytesTransferred); + return ERROR_SUCCESS; +} + +/* EOF */ Propchange: trunk/reactos/dll/win32/ws2help_new/handle.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/ws2help_new/notify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2help_new/noti… ============================================================================== --- trunk/reactos/dll/win32/ws2help_new/notify.c (added) +++ trunk/reactos/dll/win32/ws2help_new/notify.c [iso-8859-1] Tue Jul 21 11:16:26 2009 @@ -1,0 +1,87 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS WinSock 2 DLL + * FILE: include/ws2_32.h + * PURPOSE: WinSock 2 DLL header + */ + +/* INCLUDES ******************************************************************/ + +#include "precomp.h" + +/* DATA **********************************************************************/ + +#define HANH (HANDLE)'2SOR' + +PSECURITY_DESCRIPTOR pSDPipe = NULL; + +/* FUNCTIONS *****************************************************************/ + +DWORD +WINAPI +WahCloseNotificationHandleHelper(IN HANDLE HelperHandle) +{ + DWORD ErrorCode; + + /* Enter the prolog, make sure we're initialized */ + ErrorCode = WS2HELP_PROLOG(); + if (ErrorCode != ERROR_SUCCESS) return ErrorCode; + + /* Validate handle */ + if (HelperHandle != HANH) return ERROR_INVALID_PARAMETER; + + /* return */ + return ERROR_SUCCESS; +} + +DWORD +WINAPI +WahCreateNotificationHandle(IN HANDLE HelperHandle, + OUT PHANDLE NotificationHelperHandle) +{ + UNREFERENCED_PARAMETER(HelperHandle); + UNREFERENCED_PARAMETER(NotificationHelperHandle); + return 0; +} + +DWORD +WINAPI +WahOpenNotificationHandleHelper(OUT PHANDLE HelperHandle) +{ + DWORD ErrorCode; + + /* Enter the prolog, make sure we're initialized */ + ErrorCode = WS2HELP_PROLOG(); + if (ErrorCode != ERROR_SUCCESS) return ErrorCode; + + /* Validate handle */ + if (!HelperHandle) return ERROR_INVALID_PARAMETER; + + /* Return a bogus handle ("ROS2") */ + *HelperHandle = HANH; + return ERROR_SUCCESS; +} + +INT +WINAPI +WahNotifyAllProcesses(IN HANDLE NotificationHelperHandle) +{ + UNREFERENCED_PARAMETER(NotificationHelperHandle); + return 0; +} + +INT +WINAPI +WahWaitForNotification(IN HANDLE NotificationHelperHandle, + IN HANDLE lpNotificationHandle, + IN LPWSAOVERLAPPED lpOverlapped, + IN LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine) +{ + UNREFERENCED_PARAMETER(NotificationHelperHandle); + UNREFERENCED_PARAMETER(lpNotificationHandle); + UNREFERENCED_PARAMETER(lpOverlapped); + UNREFERENCED_PARAMETER(lpCompletionRoutine); + return 0; +} + +/* EOF */ Propchange: trunk/reactos/dll/win32/ws2help_new/notify.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/ws2help_new/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2help_new/prec… ============================================================================== --- trunk/reactos/dll/win32/ws2help_new/precomp.h (added) +++ trunk/reactos/dll/win32/ws2help_new/precomp.h [iso-8859-1] Tue Jul 21 11:16:26 2009 @@ -1,0 +1,47 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS WinSock 2 Helper DLL + * FILE: lib/ws2help/precomp.h + * PURPOSE: WinSock 2 Helper DLL + */ +#ifndef __PRECOMP_H +#define __PRECOMP_H + +/* Winsock Provider Headers */ +#define WIN32_NO_STATUS +#define _WIN32_WINNT 0x502 +#define NTOS_MODE_USER +#define INCL_WINSOCK_API_TYPEDEFS 1 +#include <ws2spi.h> + +/* NDK Headers */ +#include <rtlfuncs.h> +#include <iofuncs.h> + +/* Shared Winsock Helper headers */ +#include <ws2help.h> +#include <wshdrv.h> + +/* Missing definition */ +#define SO_OPENTYPE 0x20 + +/* Global data */ +extern HANDLE GlobalHeap; +extern PSECURITY_DESCRIPTOR pSDPipe; +extern HANDLE ghWriterEvent; +extern BOOL Ws2helpInitialized; +extern DWORD gdwSpinCount; +extern DWORD gHandleToIndexMask; + +/* Functions */ +DWORD +WINAPI +Ws2helpInitialize(VOID); + +/* Initialization macro */ +#define WS2HELP_PROLOG() \ + (Ws2helpInitialized? ERROR_SUCCESS : Ws2helpInitialize()) + +#endif /* __WS2HELP_H */ + +/* EOF */ Propchange: trunk/reactos/dll/win32/ws2help_new/precomp.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/ws2help_new/ws2help.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2help_new/ws2h… ============================================================================== --- trunk/reactos/dll/win32/ws2help_new/ws2help.h (added) +++ trunk/reactos/dll/win32/ws2help_new/ws2help.h [iso-8859-1] Tue Jul 21 11:16:26 2009 @@ -1,0 +1,163 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS WinSock 2 Helper DLL + * FILE: include/libs/winsock/ws2help.h + * PURPOSE: WinSock 2 Helper DLL header + */ + +#ifndef __WS2HELP_H +#define __WS2HELP_H + +/* Types */ +typedef struct _WSH_HANDLE +{ + LONG RefCount; + HANDLE Handle; +} WSH_HANDLE, *PWAH_HANDLE; + +typedef struct _WSH_HASH_TABLE +{ + DWORD Size; + PWAH_HANDLE Handles[1]; +} WSH_HASH_TABLE, *PWAH_HASH_TABLE; + +typedef struct _WSH_SEARCH_TABLE +{ + volatile PWAH_HASH_TABLE HashTable; + volatile PLONG CurrentCount; + LONG Count1; + LONG Count2; + LONG SpinCount; + BOOL Expanding; + CRITICAL_SECTION Lock; +} WSH_SEARCH_TABLE, *PWAH_SEARCH_TABLE; + +typedef struct _WSH_HANDLE_TABLE +{ + DWORD Mask; + WSH_SEARCH_TABLE SearchTables[1]; +} WSH_HANDLE_TABLE, *PWAH_HANDLE_TABLE; + +//typedef struct _WSH_HANDLE_TABLE *PWAH_HANDLE_TABLE; + +typedef BOOL +(WINAPI *PWAH_HANDLE_ENUMERATE_PROC)( + IN PVOID Context, + IN PWAH_HANDLE Handle +); + +PWAH_HANDLE +WINAPI +WahReferenceContextByHandle( + IN PWAH_HANDLE_TABLE Table, + IN HANDLE Handle +); + +DWORD +WINAPI +WahRemoveHandleContext( + IN PWAH_HANDLE_TABLE Table, + IN PWAH_HANDLE Handle +); + +DWORD +WINAPI +WahCloseSocketHandle( + IN HANDLE HelperHandle, + IN SOCKET Socket +); + +DWORD +WINAPI +WahOpenCurrentThread( + IN HANDLE HelperHandle, + OUT LPWSATHREADID ThreadId +); + +DWORD +WINAPI +WahCloseApcHelper( + IN HANDLE HelperHandle +); + +DWORD +WINAPI +WahCloseThread( + IN HANDLE HelperHandle, + IN LPWSATHREADID ThreadId +); + +DWORD +WINAPI +WahCloseHandleHelper( + IN HANDLE HelperHandle +); + +DWORD +WINAPI +WahCloseNotificationHandleHelper( + IN HANDLE HelperHandle +); + +DWORD +WINAPI +WahOpenNotificationHandleHelper( + OUT PHANDLE HelperHandle +); + +DWORD +WINAPI +WahCreateNotificationHandle( + IN HANDLE HelperHandle, + OUT PHANDLE NotificationHelperHandle +); + +INT +WINAPI +WahWaitForNotification( + IN HANDLE NotificationHelperHandle, + IN HANDLE lpNotificationHandle, + IN LPWSAOVERLAPPED lpOverlapped, + IN LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine +); + +INT +WINAPI +WahNotifyAllProcesses( + IN HANDLE NotificationHelperHandle +); + +BOOL +WINAPI +WahEnumerateHandleContexts( + IN PWAH_HANDLE_TABLE Table, + IN PWAH_HANDLE_ENUMERATE_PROC Callback, + IN PVOID Context +); + +DWORD +WINAPI +WahCreateHandleContextTable( + OUT PWAH_HANDLE_TABLE *Table +); + +DWORD +WINAPI +WahDestroyHandleContextTable( + IN PWAH_HANDLE_TABLE Table +); + +PWAH_HANDLE +WINAPI +WahInsertHandleContext( + IN PWAH_HANDLE_TABLE Table, + IN PWAH_HANDLE Handle +); + +DWORD +WINAPI +WahOpenApcHelper( + OUT PHANDLE ApcHelperHandle +); + +#endif Propchange: trunk/reactos/dll/win32/ws2help_new/ws2help.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/ws2help_new/ws2help.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2help_new/ws2h… ============================================================================== --- trunk/reactos/dll/win32/ws2help_new/ws2help.rbuild (added) +++ trunk/reactos/dll/win32/ws2help_new/ws2help.rbuild [iso-8859-1] Tue Jul 21 11:16:26 2009 @@ -1,0 +1,14 @@ +<module name="ws2help" type="win32dll" baseaddress="${BASEADDRESS_WS2HELP}" installbase="system32" installname="ws2help.dll"> + <importlibrary definition="ws2help.spec" /> + <include base="ws2help">.</include> + <library>advapi32</library> + <library>ntdll</library> + <library>kernel32</library> + <library>ws2_32</library> + <file>apc.c</file> + <file>context.c</file> + <file>dllmain.c</file> + <file>handle.c</file> + <file>notify.c</file> + <file>ws2help.rc</file> +</module> Propchange: trunk/reactos/dll/win32/ws2help_new/ws2help.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/ws2help_new/ws2help.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2help_new/ws2h… ============================================================================== --- trunk/reactos/dll/win32/ws2help_new/ws2help.rc (added) +++ trunk/reactos/dll/win32/ws2help_new/ws2help.rc [iso-8859-1] Tue Jul 21 11:16:26 2009 @@ -1,0 +1,7 @@ +/* $Id: ws2help.rc 12852 2005-01-06 13:58:04Z mf $ */ + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "Windows Sockets 2 Helper API\0" +#define REACTOS_STR_INTERNAL_NAME "ws2help\0" +#define REACTOS_STR_ORIGINAL_FILENAME "ws2help.dll\0" +#include <reactos/version.rc> Propchange: trunk/reactos/dll/win32/ws2help_new/ws2help.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/ws2help_new/ws2help.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2help_new/ws2h… ============================================================================== --- trunk/reactos/dll/win32/ws2help_new/ws2help.spec (added) +++ trunk/reactos/dll/win32/ws2help_new/ws2help.spec [iso-8859-1] Tue Jul 21 11:16:26 2009 @@ -1,0 +1,23 @@ +@ stdcall WahCloseApcHelper(long) +@ stdcall WahCloseHandleHelper(long) +@ stdcall WahCloseNotificationHandleHelper(long) +@ stdcall WahCloseSocketHandle(long ptr) +@ stdcall WahCloseThread(long ptr) +@ stdcall WahCompleteRequest(long ptr ptr long long) +@ stdcall WahCreateHandleContextTable(ptr) +@ stdcall WahCreateNotificationHandle(long ptr) +@ stdcall WahCreateSocketHandle(long ptr) +@ stdcall WahDestroyHandleContextTable(ptr) +@ stdcall WahDisableNonIFSHandleSupport() +@ stdcall WahEnableNonIFSHandleSupport() +@ stdcall WahEnumerateHandleContexts(ptr ptr ptr) +@ stdcall WahInsertHandleContext(ptr ptr) +@ stdcall WahNotifyAllProcesses(long) +@ stdcall WahOpenApcHelper(ptr) +@ stdcall WahOpenCurrentThread(long ptr) +@ stdcall WahOpenHandleHelper(ptr) +@ stdcall WahOpenNotificationHandleHelper(ptr) +@ stdcall WahQueueUserApc(long ptr ptr ptr) +@ stdcall WahReferenceContextByHandle(ptr long) +@ stdcall WahRemoveHandleContext(ptr ptr) +@ stdcall WahWaitForNotification(long long ptr ptr) Propchange: trunk/reactos/dll/win32/ws2help_new/ws2help.spec ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/ws2help_new/wshdrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2help_new/wshd… ============================================================================== --- trunk/reactos/dll/win32/ws2help_new/wshdrv.h (added) +++ trunk/reactos/dll/win32/ws2help_new/wshdrv.h [iso-8859-1] Tue Jul 21 11:16:26 2009 @@ -1,0 +1,28 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS WinSock 2 DLL + * FILE: include/drivers/ws2ifsl/wshdrv.h + * PURPOSE: WinSock 2 Helper Driver header + */ + +#ifndef __WSHDRV_H +#define __WSHDRV_H + +typedef struct _WSH_EA_DATA +{ + HANDLE FileHandle; + PVOID Context; +} WSH_EA_DATA, *PWAH_EA_DATA; + +typedef struct _WAH_EA_DATA2 +{ + HANDLE ThreadHandle; + PVOID RequestRoutine; + PVOID CancelRoutine; + PVOID ApcContext; + ULONG Reserved; +} WAH_EA_DATA2, *PWAH_EA_DATA2; + +#define IOCTL_WS2IFSL_SET_HANDLE 0x12B00 + +#endif Propchange: trunk/reactos/dll/win32/ws2help_new/wshdrv.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[dchapyshev] 42114: - Fix some warnings
by dchapyshev＠svn.reactos.org 21 Jul '09

21 Jul '09

Author: dchapyshev Date: Tue Jul 21 11:10:28 2009 New Revision: 42114 URL: http://svn.reactos.org/svn/reactos?rev=42114&view=rev Log: - Fix some warnings Modified: trunk/reactos/dll/win32/ws2_32_new/src/dthread.c trunk/reactos/dll/win32/ws2_32_new/src/getproto.c trunk/reactos/dll/win32/ws2_32_new/src/nscatent.c trunk/reactos/dll/win32/ws2_32_new/src/select.c trunk/reactos/dll/win32/ws2_32_new/src/wsautil.c Modified: trunk/reactos/dll/win32/ws2_32_new/src/dthread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/d… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/dthread.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/dthread.c [iso-8859-1] Tue Jul 21 11:10:28 2009 @@ -66,7 +66,7 @@ FARPROC OldHook = Thread->BlockingHook; /* Check if we're resetting to our default hook */ - if (BlockingHook == WsThreadDefaultBlockingHook) + if (BlockingHook == (FARPROC)WsThreadDefaultBlockingHook) { /* Clear out the blocking callback */ Thread->BlockingCallback = NULL; @@ -87,7 +87,7 @@ WsThreadUnhookBlockingHook(IN PWSTHREAD Thread) { /* Reset the hook to the default, and remove the callback */ - Thread->BlockingHook = WsThreadDefaultBlockingHook; + Thread->BlockingHook = (FARPROC)WsThreadDefaultBlockingHook; Thread->BlockingCallback = NULL; /* Return success */ @@ -143,7 +143,7 @@ Thread = HeapAlloc(WsSockHeap, HEAP_ZERO_MEMORY, sizeof(*Thread)); /* Set non-zero data */ - Thread->BlockingHook = WsThreadDefaultBlockingHook; + Thread->BlockingHook = (FARPROC)WsThreadDefaultBlockingHook; /* Return it */ return Thread; Modified: trunk/reactos/dll/win32/ws2_32_new/src/getproto.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/g… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/getproto.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/getproto.c [iso-8859-1] Tue Jul 21 11:10:28 2009 @@ -40,7 +40,7 @@ "DatabasePath", NULL, &RegType, - DatabasePath, + (LPBYTE)DatabasePath, &RegSize); /* Close the key */ Modified: trunk/reactos/dll/win32/ws2_32_new/src/nscatent.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/n… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/nscatent.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/nscatent.c [iso-8859-1] Tue Jul 21 11:10:28 2009 @@ -72,7 +72,7 @@ ULONG RegSize = MAX_PATH; /* Convert to a 00000xxx string */ - sprintf(CatalogEntryName, "%0""12""i", UniqueId); + sprintf(CatalogEntryName, "%0""12""i", (int)UniqueId); /* Open the Entry */ Return = RegOpenKeyEx(ParentKey, Modified: trunk/reactos/dll/win32/ws2_32_new/src/select.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/s… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/select.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/select.c [iso-8859-1] Tue Jul 21 11:10:28 2009 @@ -83,7 +83,7 @@ readfds, writefds, exceptfds, - timeout, + (struct timeval *)timeout, &ErrorCode); /* Deference the Socket Context */ WsSockDereference(Socket); Modified: trunk/reactos/dll/win32/ws2_32_new/src/wsautil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/w… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/wsautil.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/wsautil.c [iso-8859-1] Tue Jul 21 11:10:28 2009 @@ -182,7 +182,7 @@ } /* Try to open it for writing */ - sprintf(KeyBuffer, "%08.8lX", NewUniqueId); + sprintf(KeyBuffer, "%8.8lX", NewUniqueId); ErrorCode = RegOpenKeyEx(CatalogKey, KeyBuffer, 0,

1 0

[dchapyshev] 42113: - .def -> .spec - Fix .rbuild
by dchapyshev＠svn.reactos.org 21 Jul '09

21 Jul '09

Author: dchapyshev Date: Tue Jul 21 11:06:25 2009 New Revision: 42113 URL: http://svn.reactos.org/svn/reactos?rev=42113&view=rev Log: - .def -> .spec - Fix .rbuild Added: trunk/reactos/dll/win32/ws2_32_new/ws2_32.spec (with props) Removed: trunk/reactos/dll/win32/ws2_32_new/ws2_32.def Modified: trunk/reactos/dll/win32/ws2_32_new/ws2_32.rbuild Removed: trunk/reactos/dll/win32/ws2_32_new/ws2_32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/ws2_3… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/ws2_32.def [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/ws2_32.def (removed) @@ -1,124 +1,0 @@ -; WS2_32.DLL - Windows Sockets 2 DLL - -LIBRARY ws2_32.dll - -EXPORTS -WEP@0 @500 -WPUCompleteOverlappedRequest@20 @28 -WSAAccept@20 @29 -WSAAddressToStringA@20 @30 -WSAAddressToStringW@20 @31 -WSAAsyncGetHostByAddr@28 @102 -WSAAsyncGetHostByName@20 @103 -WSAAsyncGetProtoByName@20 @105 -WSAAsyncGetProtoByNumber@20 @104 -WSAAsyncGetServByName@24 @107 -WSAAsyncGetServByPort@24 @106 -WSAAsyncSelect@16 @101 -WSACancelAsyncRequest@4 @108 -WSACancelBlockingCall@0 @113 -WSACleanup@0 @116 -WSACloseEvent@4 @32 -WSAConnect@28 @33 -WSACreateEvent@0 @34 -WSADuplicateSocketA@12 @35 -WSADuplicateSocketW@12 @36 -WSAEnumNameSpaceProvidersA@8 @37 -WSAEnumNameSpaceProvidersW@8 @38 -WSAEnumNetworkEvents@12 @39 -WSAEnumProtocolsA@12 @40 -WSAEnumProtocolsW@12 @41 -WSAEventSelect @42 -WSAGetLastError @111 -WSAGetOverlappedResult @43 -WSAGetQOSByName @44 -WSAGetServiceClassInfoA @45 -WSAGetServiceClassInfoW @46 -WSAGetServiceClassNameByClassIdA @47 -WSAGetServiceClassNameByClassIdW @48 -WSAHtonl @49 -WSAHtons @50 -WSAInstallServiceClassA @58 -WSAInstallServiceClassW @59 -WSAIoctl @60 -WSAIsBlocking @114 -WSAJoinLeaf @61 -WSALookupServiceBeginA @62 -WSALookupServiceBeginW @63 -WSALookupServiceEnd @64 -WSALookupServiceNextA @65 -WSALookupServiceNextW @66 -WSANSPIoctl @67 -WSANtohl @68 -WSANtohs @69 -WSAProviderConfigChange @70 -WSARecv @71 -WSARecvDisconnect @72 -WSARecvFrom @73 -WSARemoveServiceClass @74 -WSAResetEvent @75 -WSASend @76 -WSASendDisconnect @77 -WSASendTo @78 -WSASetBlockingHook @109 -WSASetEvent @79 -WSASetLastError @112 -WSASetServiceA @80 -WSASetServiceW @81 -WSASocketA @82 -WSASocketW @83 -WSAStartup @115 -WSAStringToAddressA @84 -WSAStringToAddressW @85 -WSAUnhookBlockingHook @110 -WSAWaitForMultipleEvents @86 -WSApSetPostRoutine @26 -FreeAddrInfoW=freeaddrinfo @27 -WSCDeinstallProvider @87 -WSCEnableNSProvider @88 -WSCEnumProtocols @89 -WSCGetProviderPath @90 -WSCInstallNameSpace @91 -WSCInstallProvider @92 -WSCUnInstallNameSpace @93 -WSCUpdateProvider @94 -WSCWriteNameSpaceOrder @95 -WSCWriteProviderOrder @96 -__WSAFDIsSet @151 -accept @1 -bind @2 -closesocket @3 -connect @4 -freeaddrinfo @97 -getaddrinfo @98 -gethostbyaddr @51 -gethostbyname @52 -gethostname @57 -getnameinfo @99 -getpeername @5 -getprotobyname @53 -getprotobynumber @54 -getservbyname @55 -getservbyport @56 -getsockname @6 -getsockopt @7 -htonl @8 -htons @9 -inet_addr @11 -inet_ntoa @12 -ioctlsocket @10 -listen @13 -ntohl @14 -ntohs @15 -recv @16 -recvfrom @17 -select @18 -send @19 -sendto @20 -setsockopt @21 -shutdown @22 -socket @23 -GetAddrInfoW @24 -GetNameInfoW @25 - -; EOF Modified: trunk/reactos/dll/win32/ws2_32_new/ws2_32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/ws2_3… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/ws2_32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/ws2_32.rbuild [iso-8859-1] Tue Jul 21 11:06:25 2009 @@ -1,7 +1,6 @@ -<module name="ws2_32_new" type="win32dll" baseaddress="${BASEADDRESS_WS2_32}" installbase="system32" installname="ws2_32.dll" unicode="yes"> +<module name="ws2_32_new" type="win32dll" baseaddress="${BASEADDRESS_WS2_32}" installbase="system32" installname="ws2_32_new.dll"> <importlibrary definition="ws2_32.spec" /> - <include base="ws2_32">include</include> - <include base="ReactOS">include/reactos/wine</include> + <include base="ws2_32_new">inc</include> <define name="LE" /> <library>wine</library> <library>ntdll</library> @@ -9,6 +8,7 @@ <library>user32</library> <library>advapi32</library> <library>dnsapi</library> + <library>ws2help</library> <directory name="src"> <file>addrconv.c</file> <file>addrinfo.c</file> Added: trunk/reactos/dll/win32/ws2_32_new/ws2_32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/ws2_3… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/ws2_32.spec (added) +++ trunk/reactos/dll/win32/ws2_32_new/ws2_32.spec [iso-8859-1] Tue Jul 21 11:06:25 2009 @@ -1,0 +1,117 @@ +500 stdcall WEP() +@ stdcall WPUCompleteOverlappedRequest(long ptr long long ptr) +@ stdcall WSAAccept(long ptr ptr ptr long) +@ stdcall WSAAddressToStringA(ptr long ptr ptr ptr) +@ stdcall WSAAddressToStringW(ptr long ptr ptr ptr) +102 stdcall WSAAsyncGetHostByAddr(long long ptr long long ptr long) +103 stdcall WSAAsyncGetHostByName(long long str ptr long) +105 stdcall WSAAsyncGetProtoByName(long long str ptr long) +104 stdcall WSAAsyncGetProtoByNumber(long long long ptr long) +107 stdcall WSAAsyncGetServByName(long long str str ptr long) +106 stdcall WSAAsyncGetServByPort(long long long str ptr long) +101 stdcall WSAAsyncSelect(long long long long) +108 stdcall WSACancelAsyncRequest(long) +113 stdcall WSACancelBlockingCall() +116 stdcall WSACleanup() +@ stdcall WSACloseEvent(long) +@ stdcall WSAConnect(long ptr long ptr ptr ptr ptr) +@ stdcall WSACreateEvent () +@ stdcall WSADuplicateSocketA(long long ptr) +@ stdcall WSADuplicateSocketW(long long ptr) +@ stdcall WSAEnumNameSpaceProvidersA(ptr ptr) +@ stdcall WSAEnumNameSpaceProvidersW(ptr ptr) +@ stdcall WSAEnumNetworkEvents(long long ptr) +@ stdcall WSAEnumProtocolsA(ptr ptr ptr) +@ stdcall WSAEnumProtocolsW(ptr ptr ptr) +@ stdcall WSAEventSelect(long long long) +111 stdcall WSAGetLastError() +@ stdcall WSAGetOverlappedResult(long ptr ptr long ptr) +@ stdcall WSAGetQOSByName(long ptr ptr) +@ stdcall WSAGetServiceClassInfoA(ptr ptr ptr ptr) +@ stdcall WSAGetServiceClassInfoW(ptr ptr ptr ptr) +@ stdcall WSAGetServiceClassNameByClassIdA(ptr ptr ptr) +@ stdcall WSAGetServiceClassNameByClassIdW(ptr ptr ptr) +@ stdcall WSAHtonl(long long ptr) +@ stdcall WSAHtons(long long ptr) +@ stdcall WSAInstallServiceClassA(ptr) +@ stdcall WSAInstallServiceClassW(ptr) +@ stdcall WSAIoctl(long long ptr long ptr long ptr ptr ptr) +114 stdcall WSAIsBlocking() +@ stdcall WSAJoinLeaf(long ptr long ptr ptr ptr ptr long) +@ stdcall WSALookupServiceBeginA(ptr long ptr) +@ stdcall WSALookupServiceBeginW(ptr long ptr) +@ stdcall WSALookupServiceEnd(long) +@ stdcall WSALookupServiceNextA(long long ptr ptr) +@ stdcall WSALookupServiceNextW(long long ptr ptr) +@ stdcall WSANSPIoctl(long long ptr long ptr long ptr ptr) +@ stdcall WSANtohl(long long ptr) +@ stdcall WSANtohs(long long ptr) +@ stdcall WSAProviderConfigChange(ptr ptr ptr) +@ stdcall WSARecv(long ptr long ptr ptr ptr ptr) +@ stdcall WSARecvDisconnect(long ptr) +@ stdcall WSARecvFrom(long ptr long ptr ptr ptr ptr ptr ptr) +@ stdcall WSARemoveServiceClass(ptr) +@ stdcall WSAResetEvent(long) +@ stdcall WSASend(long ptr long ptr long ptr ptr) +@ stdcall WSASendDisconnect(long ptr) +@ stdcall WSASendTo(long ptr long ptr long ptr long ptr ptr) +109 stdcall WSASetBlockingHook(ptr) +@ stdcall WSASetEvent(long) +112 stdcall WSASetLastError(long) +@ stdcall WSASetServiceA(ptr long long) +@ stdcall WSASetServiceW(ptr long long) +@ stdcall WSASocketA(long long long ptr long long) +@ stdcall WSASocketW(long long long ptr long long) +115 stdcall WSAStartup(long ptr) +@ stdcall WSAStringToAddressA(str long ptr ptr ptr) +@ stdcall WSAStringToAddressW(wstr long ptr ptr ptr) +110 stdcall WSAUnhookBlockingHook() +@ stdcall WSAWaitForMultipleEvents(long ptr long long long) +@ stdcall WSApSetPostRoutine(ptr) +@ stdcall FreeAddrInfoW(ptr) freeaddrinfo +@ stdcall WSCDeinstallProvider(ptr ptr) +@ stdcall WSCEnableNSProvider(ptr long) +@ stdcall WSCEnumProtocols(ptr ptr ptr ptr) +@ stdcall WSCGetProviderPath(ptr ptr ptr ptr) +@ stdcall WSCInstallNameSpace(wstr wstr long long ptr) +@ stdcall WSCInstallProvider(ptr wstr ptr long ptr) +@ stdcall WSCUnInstallNameSpace(ptr) +@ stdcall WSCUpdateProvider(ptr ptr ptr long ptr) +@ stdcall WSCWriteNameSpaceOrder(ptr long) +@ stdcall WSCWriteProviderOrder(ptr long) +151 stdcall __WSAFDIsSet(long ptr) +1 stdcall accept(long ptr ptr) +2 stdcall bind(long ptr long) +3 stdcall closesocket(long) +4 stdcall connect(long ptr long) +@ stdcall freeaddrinfo(ptr) +@ stdcall getaddrinfo(str str ptr ptr) +51 stdcall gethostbyaddr(ptr long long) +52 stdcall gethostbyname(str) +57 stdcall gethostname(ptr long) +@ stdcall getnameinfo(ptr long ptr long ptr long long) +5 stdcall getpeername(long ptr ptr) +53 stdcall getprotobyname(str) +54 stdcall getprotobynumber(long) +55 stdcall getservbyname(str str) +56 stdcall getservbyport(long str) +6 stdcall getsockname(long ptr ptr) +7 stdcall getsockopt(long long long ptr ptr) +8 stdcall htonl(long) +9 stdcall htons(long) +11 stdcall inet_addr(str) +12 stdcall inet_ntoa(ptr) +10 stdcall ioctlsocket(long long ptr) +13 stdcall listen(long long) +14 stdcall ntohl(long) +15 stdcall ntohs(long) +16 stdcall recv(long ptr long long) +17 stdcall recvfrom(long ptr long long ptr ptr) +18 stdcall select(long ptr ptr ptr ptr) +19 stdcall send(long ptr long long) +20 stdcall sendto(long ptr long long ptr long) +21 stdcall setsockopt(long long long ptr long) +22 stdcall shutdown(long long) +23 stdcall socket(long long long) +@ stdcall GetAddrInfoW(wstr wstr ptr ptr) +@ stdcall GetNameInfoW(ptr long wstr long wstr long long) Propchange: trunk/reactos/dll/win32/ws2_32_new/ws2_32.spec ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[dchapyshev] 42112: - Add some defines, prototypes. It fixes compilation ws2_32_new
by dchapyshev＠svn.reactos.org 21 Jul '09

21 Jul '09

Author: dchapyshev Date: Tue Jul 21 11:03:03 2009 New Revision: 42112 URL: http://svn.reactos.org/svn/reactos?rev=42112&view=rev Log: - Add some defines, prototypes. It fixes compilation ws2_32_new Modified: trunk/reactos/include/psdk/winsock2.h trunk/reactos/include/psdk/ws2spi.h trunk/reactos/include/psdk/ws2tcpip.h Modified: trunk/reactos/include/psdk/winsock2.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winsock2.h?re… ============================================================================== --- trunk/reactos/include/psdk/winsock2.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winsock2.h [iso-8859-1] Tue Jul 21 11:03:03 2009 @@ -48,6 +48,8 @@ #ifndef FD_SETSIZE #define FD_SETSIZE 64 #endif + +#define WSAAPI WINAPI /* shutdown() how types */ #define SD_RECEIVE 0x00 @@ -519,6 +521,47 @@ #endif /* !WSABASEERR */ +#if !defined(NS_ALL) +#define NS_ALL 0 +#define NS_SAP 1 +#define NS_NDS 2 +#define NS_PEER_BROWSE 3 +#define NS_SLP 5 +#define NS_DHCP 6 +#define NS_TCPIP_LOCAL 10 +#define NS_TCPIP_HOSTS 11 +#define NS_DNS 12 +#define NS_NETBT 13 +#define NS_WINS 14 +#define NS_NLA 15 +#define NS_NBP 20 +#define NS_MS 30 +#define NS_STDA 31 +#define NS_NTDS 32 +#define NS_X500 40 +#define NS_NIS 41 +#define NS_NISPLUS 42 +#define NS_WRQ 50 +#define NS_NETDES 60 +#endif /* !defined(NS_ALL) */ + +#define LUP_DEEP 0x0001 +#define LUP_CONTAINERS 0x0002 +#define LUP_NOCONTAINERS 0x0004 +#define LUP_NEAREST 0x0008 +#define LUP_RETURN_NAME 0x0010 +#define LUP_RETURN_TYPE 0x0020 +#define LUP_RETURN_VERSION 0x0040 +#define LUP_RETURN_COMMENT 0x0080 +#define LUP_RETURN_ADDR 0x0100 +#define LUP_RETURN_BLOB 0x0200 +#define LUP_RETURN_ALIASES 0x0400 +#define LUP_RETURN_QUERY_STRING 0x0800 +#define LUP_RETURN_ALL 0x0FF0 +#define LUP_RES_SERVICE 0x8000 +#define LUP_FLUSHCACHE 0x1000 +#define LUP_FLUSHPREVIOUS 0x2000 + #define WSANO_ADDRESS WSANO_DATA #if !(defined (__INSIDE_CYGWIN__) || defined (__INSIDE_MSYS__)) #define h_errno WSAGetLastError() @@ -556,6 +599,13 @@ int PASCAL WSACleanup(void); void PASCAL WSASetLastError(int); int PASCAL WSAGetLastError(void); +typedef int (WSAAPI *LPFN_WSAGETLASTERROR)(void); +typedef int (WSAAPI *LPFN_WSACANCELBLOCKINGCALL)(void); +typedef FARPROC (WSAAPI *LPFN_WSASETBLOCKINGHOOK)(FARPROC); +typedef int (WSAAPI *LPFN_SELECT)(int nfds,fd_set FAR*,fd_set FAR*,fd_set FAR*,const struct timeval FAR*); +typedef int (WSAAPI *LPFN_WSASTARTUP)(WORD,LPWSADATA); +typedef int (WSAAPI *LPFN_WSACLEANUP)(void); +typedef int (WSAAPI *LPFN_GETSOCKOPT)(SOCKET,int,int,char FAR*,int FAR*); /* * Pseudo-blocking functions are deprecated in WinSock2 * spec. Use threads instead. @@ -647,7 +697,6 @@ #define MSG_INTERRUPT 0x10 #define MSG_MAXIOVLEN 16 -#define WSAAPI WINAPI #define WSAEVENT HANDLE #define LPWSAEVENT LPHANDLE #define WSAOVERLAPPED OVERLAPPED Modified: trunk/reactos/include/psdk/ws2spi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ws2spi.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/ws2spi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ws2spi.h [iso-8859-1] Tue Jul 21 11:03:03 2009 @@ -113,13 +113,39 @@ LPWSPSTRINGTOADDRESS lpWSPStringToAddress; } WSPPROC_TABLE, FAR* LPWSPPROC_TABLE; +/* Prototypes for service provider namespace procedure table */ +typedef INT (WSAAPI *LPNSPCLEANUP)(LPGUID); +typedef INT (WSAAPI *LPNSPLOOKUPSERVICEBEGIN)(LPGUID,LPWSAQUERYSETW,LPWSASERVICECLASSINFOW,DWORD,LPHANDLE); +typedef INT (WSAAPI *LPNSPLOOKUPSERVICENEXT)(HANDLE,DWORD,LPDWORD,LPWSAQUERYSETW); +typedef INT (WSAAPI *LPNSPLOOKUPSERVICEEND)(HANDLE); +typedef INT (WSAAPI *LPNSPSETSERVICE)(LPGUID,LPWSASERVICECLASSINFOW,LPWSAQUERYSETW,WSAESETSERVICEOP,DWORD); +typedef INT (WSAAPI *LPNSPINSTALLSERVICECLASS)(LPGUID,LPWSASERVICECLASSINFOW); +typedef INT (WSAAPI *LPNSPREMOVESERVICECLASS)(LPGUID,LPGUID); +typedef INT (WSAAPI *LPNSPGETSERVICECLASSINFO)(LPGUID,LPDWORD,LPWSASERVICECLASSINFOW); +typedef INT (WSAAPI *LPNSPIOCTL)(HANDLE,DWORD,LPVOID,DWORD,LPVOID,DWORD,LPDWORD,LPWSACOMPLETION,LPWSATHREADID); + +typedef struct _NSP_ROUTINE { + DWORD cbSize; + DWORD dwMajorVersion; + DWORD dwMinorVersion; + LPNSPCLEANUP NSPCleanup; + LPNSPLOOKUPSERVICEBEGIN NSPLookupServiceBegin; + LPNSPLOOKUPSERVICENEXT NSPLookupServiceNext; + LPNSPLOOKUPSERVICEEND NSPLookupServiceEnd; + LPNSPSETSERVICE NSPSetService; + LPNSPINSTALLSERVICECLASS NSPInstallServiceClass; + LPNSPREMOVESERVICECLASS NSPRemoveServiceClass; + LPNSPGETSERVICECLASSINFO NSPGetServiceClassInfo; + LPNSPIOCTL NSPIoctl; +} NSP_ROUTINE, *PNSP_ROUTINE, FAR* LPNSP_ROUTINE; + /* Prototypes for service provider upcall procedure table */ typedef BOOL (WSPAPI *LPWPUCLOSEEVENT)(WSAEVENT,LPINT); typedef INT (WSPAPI *LPWPUCLOSESOCKETHANDLE)(SOCKET,LPINT); typedef INT (WSPAPI *LPWPUCLOSETHREAD)(LPWSATHREADID,LPINT); typedef WSAEVENT (WSPAPI *LPWPUCREATEEVENT)(LPINT); typedef SOCKET (WSPAPI *LPWPUCREATESOCKETHANDLE)(DWORD,DWORD,LPINT); -typedef SOCKET (WSPAPI *LPWPUFDISSET)(SOCKET,LPFD_SET); +typedef INT (WSPAPI *LPWPUFDISSET)(SOCKET,LPFD_SET); typedef INT (WSPAPI *LPWPUGETPROVIDERPATH)(LPGUID,LPWSTR,LPINT,LPINT); typedef SOCKET (WSPAPI *LPWPUMODIFYIFSHANDLE)(DWORD,SOCKET,LPINT); typedef INT (WSPAPI *LPWPUOPENCURRENTTHREAD)(LPWSATHREADID,LPINT); @@ -129,6 +155,7 @@ typedef INT (WSPAPI *LPWPUQUEUEAPC)(LPWSATHREADID,LPWSAUSERAPC,DWORD,LPINT); typedef BOOL (WSPAPI *LPWPURESETEVENT)(WSAEVENT,LPINT); typedef BOOL (WSPAPI *LPWPUSETEVENT)(WSAEVENT,LPINT); +typedef INT (WSAAPI *LPNSPSTARTUP)(LPGUID,LPNSP_ROUTINE); /* Available only directly from the DLL */ typedef INT (WSPAPI *LPWPUCOMPLETEOVERLAPPEDREQUEST)(SOCKET,LPWSAOVERLAPPED,DWORD,DWORD,LPINT); @@ -153,30 +180,6 @@ typedef INT (WSPAPI *LPWSPSTARTUP)(WORD,LPWSPDATA,LPWSAPROTOCOL_INFOW,WSPUPCALLTABLE,LPWSPPROC_TABLE); -/* Prototypes for service provider namespace procedure table */ -typedef INT (WSPAPI *LPNSPCLEANUP)(LPGUID); -typedef INT (WSPAPI *LPNSPGETSERVICECLASSINFO)(LPGUID,LPDWORD,LPWSASERVICECLASSINFOW); -typedef INT (WSPAPI *LPNSPINSTALLSERVICECLASS)(LPGUID,LPWSASERVICECLASSINFOW); -typedef INT (WSPAPI *LPNSPLOOKUPSERVICEBEGIN)(LPGUID,LPWSAQUERYSETW,LPWSASERVICECLASSINFOW,DWORD,LPHANDLE); -typedef INT (WSPAPI *LPNSPLOOKUPSERVICEEND)(HANDLE); -typedef INT (WSPAPI *LPNSPLOOKUPSERVICENEXT)(HANDLE,DWORD,LPDWORD,LPWSAQUERYSET); -typedef INT (WSPAPI *LPNSPREMOVESERVICECLASS)(LPGUID,LPGUID); -typedef INT (WSPAPI *LPNSPSETSERVICE)(LPGUID,LPWSASERVICECLASSINFOW,LPWSAQUERYSETW,WSAESETSERVICEOP,DWORD); - -typedef struct _NSP_ROUTINE { - DWORD cbSize; - DWORD dwMajorVersion; - DWORD dwMinorVersion; - LPNSPCLEANUP NSPCleanup; - LPNSPLOOKUPSERVICEBEGIN NSPLookupServiceBegin; - LPNSPLOOKUPSERVICENEXT NSPLookupServiceNext; - LPNSPLOOKUPSERVICEEND NSPLookupServiceEnd; - LPNSPSETSERVICE NSPSetService; - LPNSPINSTALLSERVICECLASS NSPInstallServiceClass; - LPNSPREMOVESERVICECLASS NSPRemoveServiceClass; - LPNSPGETSERVICECLASSINFO NSPGetServiceClassInfo; -} NSP_ROUTINE, *PNSP_ROUTINE, *LPNSP_ROUTINE; - INT WSPAPI NSPStartup(LPGUID,LPNSP_ROUTINE); /* WinSock 2 DLL function prototypes */ @@ -185,11 +188,26 @@ INT WSPAPI WSCDeinstallProvider(LPGUID,LPINT); INT WSPAPI WSCEnumProtocols(LPINT,LPWSAPROTOCOL_INFOW,LPDWORD,LPINT); INT WSPAPI WSCGetProviderPath(LPGUID,LPWSTR,LPINT,LPINT); -INT WSPAPI WSCInstallProvider(CONST LPGUID,CONST LPWSTR,CONST LPWSAPROTOCOL_INFOW,DWORD,LPINT); +INT WSPAPI WSCInstallProvider(LPGUID,CONST WCHAR*,CONST LPWSAPROTOCOL_INFOW,DWORD,LPINT); INT WSPAPI WSCEnableNSProvider(LPGUID,BOOL); INT WSPAPI WSCInstallNameSpace(LPWSTR,LPWSTR,DWORD,DWORD,LPGUID); INT WSPAPI WSCUnInstallNameSpace(LPGUID); INT WSPAPI WSCWriteProviderOrder(LPDWORD,DWORD); +BOOL WSPAPI WPUPostMessage(HWND,UINT,WPARAM,LPARAM); +BOOL WSPAPI WPUCloseEvent(WSAEVENT,LPINT); +int WSPAPI WPUCloseSocketHandle(SOCKET,LPINT); +WSAEVENT WSPAPI WPUCreateEvent(LPINT); +SOCKET WSPAPI WPUModifyIFSHandle(DWORD,SOCKET,LPINT); +SOCKET WSPAPI WPUCreateSocketHandle(DWORD,DWORD_PTR,LPINT); +int WSPAPI WPUFDIsSet(SOCKET,LPFD_SET); +int WSPAPI WPUGetProviderPath(LPGUID,WCHAR FAR*,LPINT,LPINT); +int WSPAPI WPUQueryBlockingCallback(DWORD,LPBLOCKINGCALLBACK FAR*,PDWORD_PTR,LPINT); +int WSPAPI WPUQuerySocketHandleContext(SOCKET,PDWORD_PTR,LPINT); +int WSPAPI WPUQueueApc(LPWSATHREADID,LPWSAUSERAPC,DWORD_PTR,LPINT); +BOOL WSPAPI WPUResetEvent(WSAEVENT,LPINT); +BOOL WSPAPI WPUSetEvent(WSAEVENT,LPINT); +int WSPAPI WPUOpenCurrentThread(LPWSATHREADID,LPINT); +int WSPAPI WPUCloseThread(LPWSATHREADID,LPINT); #endif /* RC_INVOKED */ Modified: trunk/reactos/include/psdk/ws2tcpip.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ws2tcpip.h?re… ============================================================================== --- trunk/reactos/include/psdk/ws2tcpip.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ws2tcpip.h [iso-8859-1] Tue Jul 21 11:03:03 2009 @@ -155,22 +155,23 @@ struct in6_addr { union { - u_char _S6_u8[16]; - u_short _S6_u16[8]; + u_char Byte[16]; + u_short Word[8]; u_long _S6_u32[4]; - } _S6_un; -}; + } u; +}; + /* s6_addr is the standard name */ -#define s6_addr _S6_un._S6_u8 +#define s6_addr u.Byte /* These are GLIBC names */ -#define s6_addr16 _S6_un._S6_u16 -#define s6_addr32 _S6_un._S6_u16 +#define s6_addr16 u.Word +#define s6_addr32 u.Word /* These are used in some MS code */ #define in_addr6 in6_addr -#define _s6_bytes _S6_un._S6_u8 -#define _s6_words _S6_un._S6_u16 +#define _s6_bytes u.Byte +#define _s6_words u.Word typedef struct in6_addr IN6_ADDR, *PIN6_ADDR, *LPIN6_ADDR; @@ -275,16 +276,37 @@ }; typedef struct in6_pktinfo IN6_PKTINFO; -struct addrinfo { - int ai_flags; - int ai_family; - int ai_socktype; - int ai_protocol; - size_t ai_addrlen; - char *ai_canonname; - struct sockaddr *ai_addr; - struct addrinfo *ai_next; -}; +typedef struct addrinfo +{ + int ai_flags; + int ai_family; + int ai_socktype; + int ai_protocol; + size_t ai_addrlen; + char *ai_canonname; + struct sockaddr *ai_addr; + struct addrinfo *ai_next; +} ADDRINFOA, *PADDRINFOA; + +typedef struct addrinfoW +{ + int ai_flags; + int ai_family; + int ai_socktype; + int ai_protocol; + size_t ai_addrlen; + PWSTR ai_canonname; + struct sockaddr *ai_addr; + struct addrinfoW *ai_next; +} ADDRINFOW, *PADDRINFOW; + +#ifdef UNICODE +typedef ADDRINFOW ADDRINFOT,*PADDRINFOT; +#else +typedef ADDRINFOA ADDRINFOT,*PADDRINFOT; +#endif + +typedef ADDRINFOA ADDRINFO, FAR *LPADDRINFO; void WSAAPI freeaddrinfo (struct addrinfo*); int WSAAPI getaddrinfo (const char*,const char*,const struct addrinfo*, @@ -335,6 +357,17 @@ int WSAAPI getnameinfo(const struct sockaddr*,socklen_t,char*,DWORD, char*,DWORD,int); +#if (_WIN32_WINNT >= 0x0502) +INT WSAAPI GetNameInfoW(const SOCKADDR*,socklen_t,PWCHAR,DWORD,PWCHAR,DWORD,INT); +#define GetNameInfoA getnameinfo + +#ifdef UNICODE +#define GetNameInfo GetNameInfoW +#else +#define GetNameInfo GetNameInfoA +#endif /* UNICODE */ + +#endif /* (_WIN32_WINNT >= 0x0502) */ /* Some older IPv4/IPv6 compatability stuff */

1 0

[dchapyshev] 42111: - Fix types of parameters for WPUFDIsSet, WSCInstallProvider
by dchapyshev＠svn.reactos.org 21 Jul '09

21 Jul '09

Author: dchapyshev Date: Tue Jul 21 10:59:30 2009 New Revision: 42111 URL: http://svn.reactos.org/svn/reactos?rev=42111&view=rev Log: - Fix types of parameters for WPUFDIsSet, WSCInstallProvider Modified: trunk/reactos/dll/win32/ws2_32/include/upcall.h trunk/reactos/dll/win32/ws2_32/misc/stubs.c trunk/reactos/dll/win32/ws2_32/misc/upcall.c Modified: trunk/reactos/dll/win32/ws2_32/include/upcall.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/include/u… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/include/upcall.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/include/upcall.h [iso-8859-1] Tue Jul 21 10:59:30 2009 @@ -37,7 +37,7 @@ IN DWORD dwContext, OUT LPINT lpErrno); -SOCKET +int WSPAPI WPUFDIsSet( IN SOCKET s, Modified: trunk/reactos/dll/win32/ws2_32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/misc/stub… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/misc/stubs.c [iso-8859-1] Tue Jul 21 10:59:30 2009 @@ -775,8 +775,8 @@ */ INT EXPORT -WSCInstallProvider(IN CONST LPGUID lpProviderId, - IN CONST LPWSTR lpszProviderDllPath, +WSCInstallProvider(IN LPGUID lpProviderId, + IN CONST WCHAR* lpszProviderDllPath, IN CONST LPWSAPROTOCOL_INFOW lpProtocolInfoList, IN DWORD dwNumberOfEntries, OUT LPINT lpErrno) Modified: trunk/reactos/dll/win32/ws2_32/misc/upcall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/misc/upca… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/misc/upcall.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/misc/upcall.c [iso-8859-1] Tue Jul 21 10:59:30 2009 @@ -84,7 +84,7 @@ /* * @unimplemented */ -SOCKET +int WSPAPI WPUFDIsSet(IN SOCKET s, IN LPFD_SET set)

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