Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cgutman] 54822: [NDISUIO] - Fix missing spin lock release - Return the correct status for an invalid index
by cgutman＠svn.reactos.org 03 Jan '12

03 Jan '12

Author: cgutman Date: Tue Jan 3 19:22:30 2012 New Revision: 54822 URL: http://svn.reactos.org/svn/reactos?rev=54822&view=rev Log: [NDISUIO] - Fix missing spin lock release - Return the correct status for an invalid index Modified: branches/wlan-bringup/drivers/network/ndisuio/ioctl.c Modified: branches/wlan-bringup/drivers/network/ndisuio/ioctl.c URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/drivers/network/nd… ============================================================================== --- branches/wlan-bringup/drivers/network/ndisuio/ioctl.c [iso-8859-1] (original) +++ branches/wlan-bringup/drivers/network/ndisuio/ioctl.c [iso-8859-1] Tue Jan 3 19:22:30 2012 @@ -52,6 +52,7 @@ i++; CurrentEntry = CurrentEntry->Flink; } + KeReleaseSpinLock(&GlobalAdapterListLock, OldIrql); if (i == QueryBinding->BindingIndex) { AdapterContext = CONTAINING_RECORD(CurrentEntry, NDISUIO_ADAPTER_CONTEXT, ListEntry); @@ -78,7 +79,7 @@ else { /* Invalid index */ - Status = STATUS_INVALID_PARAMETER; + Status = STATUS_NO_MORE_ENTRIES; } } else

1 0

[cgutman] 54821: [NDISUIO] - Handle IOCTL_NDISUIO_BIND_WAIT and IOCTL_NDISUIO_QUERY_BINDING
by cgutman＠svn.reactos.org 03 Jan '12

03 Jan '12

Author: cgutman Date: Tue Jan 3 19:11:57 2012 New Revision: 54821 URL: http://svn.reactos.org/svn/reactos?rev=54821&view=rev Log: [NDISUIO] - Handle IOCTL_NDISUIO_BIND_WAIT and IOCTL_NDISUIO_QUERY_BINDING Modified: branches/wlan-bringup/drivers/network/ndisuio/ioctl.c Modified: branches/wlan-bringup/drivers/network/ndisuio/ioctl.c URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/drivers/network/nd… ============================================================================== --- branches/wlan-bringup/drivers/network/ndisuio/ioctl.c [iso-8859-1] (original) +++ branches/wlan-bringup/drivers/network/ndisuio/ioctl.c [iso-8859-1] Tue Jan 3 19:11:57 2012 @@ -11,6 +11,90 @@ #define NDEBUG #include <debug.h> + +NTSTATUS +WaitForBind(PIRP Irp, PIO_STACK_LOCATION IrpSp) +{ + /* I've seen several code samples that use this IOCTL but there's + * no official documentation on it. I'm just implementing it as a no-op + * right now because I don't see any reason we need it. We handle an open + * and bind just fine with IRP_MJ_CREATE and IOCTL_NDISUIO_OPEN_DEVICE */ + + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = 0; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return STATUS_SUCCESS; +} + +NTSTATUS +QueryBinding(PIRP Irp, PIO_STACK_LOCATION IrpSp) +{ + PNDISUIO_ADAPTER_CONTEXT AdapterContext; + PNDISUIO_QUERY_BINDING QueryBinding = IrpSp->Parameters.DeviceIoControl.Type3InputBuffer; + ULONG BindingLength = IrpSp->Parameters.DeviceIoControl.InputBufferLength; + NTSTATUS Status; + PLIST_ENTRY CurrentEntry; + KIRQL OldIrql; + ULONG i; + ULONG BytesCopied = 0; + + if (QueryBinding && BindingLength >= sizeof(NDISUIO_QUERY_BINDING)) + { + KeAcquireSpinLock(&GlobalAdapterListLock, &OldIrql); + i = 0; + CurrentEntry = GlobalAdapterList.Flink; + while (CurrentEntry != &GlobalAdapterList) + { + if (i == QueryBinding->BindingIndex) + break; + i++; + CurrentEntry = CurrentEntry->Flink; + } + if (i == QueryBinding->BindingIndex) + { + AdapterContext = CONTAINING_RECORD(CurrentEntry, NDISUIO_ADAPTER_CONTEXT, ListEntry); + if (AdapterContext->DeviceName.Length <= QueryBinding->DeviceNameLength) + { + BytesCopied += AdapterContext->DeviceName.Length; + RtlCopyMemory((PUCHAR)QueryBinding + QueryBinding->DeviceNameOffset, + AdapterContext->DeviceName.Buffer, + BytesCopied); + QueryBinding->DeviceNameLength = AdapterContext->DeviceName.Length; + + /* FIXME: Copy description too */ + QueryBinding->DeviceDescrLength = 0; + + /* Successful */ + Status = STATUS_SUCCESS; + } + else + { + /* Not enough buffer space */ + Status = STATUS_BUFFER_TOO_SMALL; + } + } + else + { + /* Invalid index */ + Status = STATUS_INVALID_PARAMETER; + } + } + else + { + /* Invalid parameters */ + Status = STATUS_INVALID_PARAMETER; + } + + Irp->IoStatus.Status = Status; + Irp->IoStatus.Information = BytesCopied; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return Status; +} + NTSTATUS CancelPacketRead(PIRP Irp, PIO_STACK_LOCATION IrpSp) { @@ -338,6 +422,12 @@ case IOCTL_NDISUIO_OPEN_WRITE_DEVICE: return OpenDeviceWrite(Irp, IrpSp); + + case IOCTL_NDISUIO_BIND_WAIT: + return WaitForBind(Irp, IrpSp); + + case IOCTL_NDISUIO_QUERY_BINDING: + return QueryBinding(Irp, IrpSp); default: /* Fail if this file object has no adapter associated */

1 0

[pschweitzer] 54820: [RTL] Complete RtlpDosPathNameToRelativeNtPathName_Ustr() rewrite by properly handling relative names. This fixes several regressions brought by r54804 (see winetests). This al...
by pschweitzer＠svn.reactos.org 03 Jan '12

03 Jan '12

Author: pschweitzer Date: Tue Jan 3 19:08:46 2012 New Revision: 54820 URL: http://svn.reactos.org/svn/reactos?rev=54820&view=rev Log: [RTL] Complete RtlpDosPathNameToRelativeNtPathName_Ustr() rewrite by properly handling relative names. This fixes several regressions brought by r54804 (see winetests). This also fixes file system corruption when using directory functions. This may also fix general file system corruption, so, please retest bug #6720. Modified: trunk/reactos/lib/rtl/path.c Modified: trunk/reactos/lib/rtl/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/path.c?rev=54820&r… ============================================================================== --- trunk/reactos/lib/rtl/path.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/path.c [iso-8859-1] Tue Jan 3 19:08:46 2012 @@ -39,6 +39,8 @@ const UNICODE_STRING RtlpDosCONDevice = RTL_CONSTANT_STRING(L"CON"); const UNICODE_STRING RtlpDosNULDevice = RTL_CONSTANT_STRING(L"NUL"); +PRTLP_CURDIR_REF RtlpCurDirRef; + /* PRIVATE FUNCTIONS **********************************************************/ ULONG @@ -455,11 +457,12 @@ WCHAR BigBuffer[MAX_PATH + 1]; PWCHAR PrefixBuffer, NewBuffer, Buffer; ULONG MaxLength, PathLength, PrefixLength, PrefixCut, LengthChars, Length; - UNICODE_STRING CapturedDosName, PartNameString; + UNICODE_STRING CapturedDosName, PartNameString, FullPath; BOOLEAN QuickPath; RTL_PATH_TYPE InputPathType, BufferPathType; NTSTATUS Status; BOOLEAN NameInvalid; + PCURDIR CurrentDirectory; /* Assume MAX_PATH for now */ DPRINT("Relative: %lx DosName: %wZ NtName: %wZ, PartName: %p, RelativeName: %p\n", @@ -608,26 +611,59 @@ /* Setup the structure */ RtlInitEmptyUnicodeString(&RelativeName->RelativeName, NULL, 0); RelativeName->ContainingDirectory = NULL; - RelativeName->CurDirRef = 0; + RelativeName->CurDirRef = NULL; /* Check if the input path itself was relative */ if (InputPathType == RtlPathTypeRelative) { - /* FIXME: HACK: Old code */ - PCURDIR cd; - UNICODE_STRING us; - cd = (PCURDIR)&(NtCurrentPeb ()->ProcessParameters->CurrentDirectory.DosPath); - if (cd->Handle) - { - RtlInitUnicodeString(&us, Buffer); - us.Length = (cd->DosPath.Length < us.Length) ? cd->DosPath.Length : us.Length; - if (RtlEqualUnicodeString(&us, &cd->DosPath, TRUE)) + /* Get current directory */ + CurrentDirectory = (PCURDIR)&(NtCurrentPeb ()->ProcessParameters->CurrentDirectory.DosPath); + if (CurrentDirectory->Handle) + { + Status = RtlInitUnicodeStringEx(&FullPath, Buffer); + if (!NT_SUCCESS(Status)) { - Length = ((cd->DosPath.Length / sizeof(WCHAR)) - PrefixCut) + ((InputPathType == 1) ? 8 : 4); - RelativeName->RelativeName.Buffer = NewBuffer + Length; - RelativeName->RelativeName.Length = NtName->Length - (USHORT)(Length * sizeof(WCHAR)); + RtlFreeHeap(RtlGetProcessHeap(), 0, NewBuffer); + RtlReleasePebLock(); + return Status; + } + + /* If current directory is bigger than full path, there's no way */ + if (CurrentDirectory->DosPath.Length > FullPath.Length) + { + RtlReleasePebLock(); + return Status; + } + + /* File is in current directory */ + if (RtlEqualUnicodeString(&FullPath, &CurrentDirectory->DosPath, TRUE)) + { + /* Make relative name string */ + RelativeName->RelativeName.Buffer = (PWSTR)((ULONG_PTR)NewBuffer + FullPath.Length - PrefixCut); + RelativeName->RelativeName.Length = PathLength - FullPath.Length; + /* If relative name starts with \, skip it */ + if (RelativeName->RelativeName.Buffer[0] == L'\\') + { + RelativeName->RelativeName.Buffer = (PWSTR)((ULONG_PTR)RelativeName->RelativeName.Buffer + sizeof(WCHAR)); + RelativeName->RelativeName.Length -= sizeof(WCHAR); + } RelativeName->RelativeName.MaximumLength = RelativeName->RelativeName.Length; - RelativeName->ContainingDirectory = cd->Handle; + DPRINT("RelativeName: %wZ\n", &(RelativeName->RelativeName)); + + if (!HaveRelative) + { + RelativeName->ContainingDirectory = CurrentDirectory->Handle; + return Status; + } + + /* Give back current directory data & reference counter */ + RelativeName->CurDirRef = RtlpCurDirRef; + if (RelativeName->CurDirRef) + { + /* FIXME: Increment reference count */ + } + + RelativeName->ContainingDirectory = CurrentDirectory->Handle; } } }

1 0

[cgutman] 54819: [NDISUIO] - Handle IOCTL_NDISUIO_OPEN_WRITE_DEVICE and IOCTL_NDISUIO_OPEN_DEVICE properly with regard to current open handles - Check that we have read permissions (opened by IOCTL...
by cgutman＠svn.reactos.org 03 Jan '12

03 Jan '12

Author: cgutman Date: Tue Jan 3 18:12:29 2012 New Revision: 54819 URL: http://svn.reactos.org/svn/reactos?rev=54819&view=rev Log: [NDISUIO] - Handle IOCTL_NDISUIO_OPEN_WRITE_DEVICE and IOCTL_NDISUIO_OPEN_DEVICE properly with regard to current open handles - Check that we have read permissions (opened by IOCTL_NDISUIO_OPEN_DEVICE) before allowing queries or reads Modified: branches/wlan-bringup/drivers/network/ndisuio/ioctl.c branches/wlan-bringup/drivers/network/ndisuio/ndisuio.h branches/wlan-bringup/drivers/network/ndisuio/readwrite.c Modified: branches/wlan-bringup/drivers/network/ndisuio/ioctl.c URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/drivers/network/nd… ============================================================================== --- branches/wlan-bringup/drivers/network/ndisuio/ioctl.c [iso-8859-1] (original) +++ branches/wlan-bringup/drivers/network/ndisuio/ioctl.c [iso-8859-1] Tue Jan 3 18:12:29 2012 @@ -174,8 +174,19 @@ { /* Reference the adapter context */ KeAcquireSpinLock(&AdapterContext->Spinlock, &OldIrql); - ReferenceAdapterContext(AdapterContext); - Status = STATUS_SUCCESS; + if (AdapterContext->OpenCount != 0) + { + /* An open for read-write is exclusive, + * so we can't have any other open handles */ + KeReleaseSpinLock(&AdapterContext->Spinlock, OldIrql); + Status = STATUS_INVALID_PARAMETER; + } + else + { + /* Add a reference */ + ReferenceAdapterContext(AdapterContext); + Status = STATUS_SUCCESS; + } } else { @@ -191,6 +202,9 @@ { /* Set the file object pointer */ OpenEntry->FileObject = FileObject; + + /* Set the permissions */ + OpenEntry->WriteOnly = FALSE; /* Associate this FO with the adapter */ FileObject->FsContext = AdapterContext; @@ -230,8 +244,80 @@ NTSTATUS OpenDeviceWrite(PIRP Irp, PIO_STACK_LOCATION IrpSp) { - /* FIXME: Handle this correctly */ - return OpenDeviceReadWrite(Irp, IrpSp); + PFILE_OBJECT FileObject = IrpSp->FileObject; + UNICODE_STRING DeviceName; + ULONG NameLength; + NTSTATUS Status; + PNDISUIO_ADAPTER_CONTEXT AdapterContext; + PNDISUIO_OPEN_ENTRY OpenEntry; + KIRQL OldIrql; + + NameLength = IrpSp->Parameters.DeviceIoControl.InputBufferLength; + if (NameLength != 0) + { + DeviceName.MaximumLength = DeviceName.Length = NameLength; + DeviceName.Buffer = IrpSp->Parameters.DeviceIoControl.Type3InputBuffer; + + /* Check if this already has a context */ + AdapterContext = FindAdapterContextByName(&DeviceName); + if (AdapterContext != NULL) + { + /* Reference the adapter context */ + KeAcquireSpinLock(&AdapterContext->Spinlock, &OldIrql); + ReferenceAdapterContext(AdapterContext); + Status = STATUS_SUCCESS; + } + else + { + /* Invalid device name */ + Status = STATUS_INVALID_PARAMETER; + } + + /* Check that the bind succeeded */ + if (NT_SUCCESS(Status)) + { + OpenEntry = ExAllocatePool(NonPagedPool, sizeof(*OpenEntry)); + if (OpenEntry) + { + /* Set the file object pointer */ + OpenEntry->FileObject = FileObject; + + /* Associate this FO with the adapter */ + FileObject->FsContext = AdapterContext; + FileObject->FsContext2 = OpenEntry; + + /* Set permissions */ + OpenEntry->WriteOnly = TRUE; + + /* Add it to the adapter's list */ + InsertTailList(&AdapterContext->OpenEntryList, + &OpenEntry->ListEntry); + + /* Success */ + KeReleaseSpinLock(&AdapterContext->Spinlock, OldIrql); + Status = STATUS_SUCCESS; + } + else + { + /* Remove the reference we added */ + KeReleaseSpinLock(&AdapterContext->Spinlock, OldIrql); + DereferenceAdapterContext(AdapterContext, NULL); + Status = STATUS_NO_MEMORY; + } + } + } + else + { + /* Invalid device name */ + Status = STATUS_INVALID_PARAMETER; + } + + Irp->IoStatus.Status = Status; + Irp->IoStatus.Information = 0; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return Status; } NTSTATUS @@ -240,6 +326,7 @@ PIRP Irp) { PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp); + PNDISUIO_OPEN_ENTRY OpenEntry; ASSERT(DeviceObject == GlobalDeviceObject); @@ -263,24 +350,39 @@ return STATUS_INVALID_PARAMETER; } - /* Now handle other IOCTLs */ + /* Now handle write IOCTLs */ switch (IrpSp->Parameters.DeviceIoControl.IoControlCode) { - case IOCTL_CANCEL_READ: - return CancelPacketRead(Irp, IrpSp); - - case IOCTL_NDISUIO_QUERY_OID_VALUE: - return QueryAdapterOid(Irp, IrpSp); - case IOCTL_NDISUIO_SET_OID_VALUE: return SetAdapterOid(Irp, IrpSp); default: - DPRINT1("Unimplemented\n"); - Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; - Irp->IoStatus.Information = 0; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - break; + /* Check that we have read permissions */ + OpenEntry = IrpSp->FileObject->FsContext2; + if (OpenEntry->WriteOnly) + { + Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return STATUS_INVALID_PARAMETER; + } + + switch (IrpSp->Parameters.DeviceIoControl.IoControlCode) + { + case IOCTL_CANCEL_READ: + return CancelPacketRead(Irp, IrpSp); + + case IOCTL_NDISUIO_QUERY_OID_VALUE: + return QueryAdapterOid(Irp, IrpSp); + + default: + DPRINT1("Unimplemented\n"); + Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + break; + } } break; } Modified: branches/wlan-bringup/drivers/network/ndisuio/ndisuio.h URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/drivers/network/nd… ============================================================================== --- branches/wlan-bringup/drivers/network/ndisuio/ndisuio.h [iso-8859-1] (original) +++ branches/wlan-bringup/drivers/network/ndisuio/ndisuio.h [iso-8859-1] Tue Jan 3 18:12:29 2012 @@ -42,9 +42,24 @@ /* File object */ PFILE_OBJECT FileObject; + /* Tracks how this adapter was opened (write-only or read-write) */ + BOOLEAN WriteOnly; + /* List entry */ LIST_ENTRY ListEntry; } NDISUIO_OPEN_ENTRY, *PNDISUIO_OPEN_ENTRY; + +struct _NDISUIO_PACKET_ENTRY +{ + /* Length of data at the end of the struct */ + ULONG PacketLength; + + /* Entry on the packet list */ + LIST_ENTRY ListEntry; + + /* Packet data */ + UCHAR PacketData[1]; +} NDISUIO_PACKET_ENTRY, *PNDISUIO_PACKET_ENTRY; /* NDIS version info */ #define NDIS_MAJOR_VERISON 5 Modified: branches/wlan-bringup/drivers/network/ndisuio/readwrite.c URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/drivers/network/nd… ============================================================================== --- branches/wlan-bringup/drivers/network/ndisuio/readwrite.c [iso-8859-1] (original) +++ branches/wlan-bringup/drivers/network/ndisuio/readwrite.c [iso-8859-1] Tue Jan 3 18:12:29 2012 @@ -18,6 +18,7 @@ { PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp); PNDISUIO_ADAPTER_CONTEXT AdapterContext = IrpSp->FileObject->FsContext; + PNDISUIO_OPEN_ENTRY OpenEntry = IrpSp->FileObject->FsContext2; KIRQL OldIrql; NTSTATUS Status; PLIST_ENTRY ListEntry; @@ -25,6 +26,15 @@ ULONG BytesCopied = 0; ASSERT(DeviceObject == GlobalDeviceObject); + + if (OpenEntry->WriteOnly) + { + Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return STATUS_INVALID_PARAMETER; + } while (TRUE) {

1 0

[cgutman] 54818: [NDISUIO] - Implement IOCTL_CANCEL_READ - Implement IRP_MJ_READ and IRP_MJ_WRITE handling - Misc fixes
by cgutman＠svn.reactos.org 03 Jan '12

03 Jan '12

Author: cgutman Date: Tue Jan 3 17:54:01 2012 New Revision: 54818 URL: http://svn.reactos.org/svn/reactos?rev=54818&view=rev Log: [NDISUIO] - Implement IOCTL_CANCEL_READ - Implement IRP_MJ_READ and IRP_MJ_WRITE handling - Misc fixes Modified: branches/wlan-bringup/drivers/network/ndisuio/ioctl.c branches/wlan-bringup/drivers/network/ndisuio/misc.c branches/wlan-bringup/drivers/network/ndisuio/ndisuio.h branches/wlan-bringup/drivers/network/ndisuio/protocol.c branches/wlan-bringup/drivers/network/ndisuio/readwrite.c Modified: branches/wlan-bringup/drivers/network/ndisuio/ioctl.c URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/drivers/network/nd… ============================================================================== --- branches/wlan-bringup/drivers/network/ndisuio/ioctl.c [iso-8859-1] (original) +++ branches/wlan-bringup/drivers/network/ndisuio/ioctl.c [iso-8859-1] Tue Jan 3 17:54:01 2012 @@ -12,6 +12,40 @@ #include <debug.h> NTSTATUS +CancelPacketRead(PIRP Irp, PIO_STACK_LOCATION IrpSp) +{ + PNDISUIO_ADAPTER_CONTEXT AdapterContext = IrpSp->FileObject->FsContext; + PNDISUIO_PACKET_ENTRY PacketEntry; + NTSTATUS Status; + + /* Indicate a 0-byte packet on the queue so one read returns 0 */ + PacketEntry = ExAllocatePool(PagedPool, sizeof(NDISUIO_PACKET_ENTRY)); + if (PacketEntry) + { + PacketEntry->PacketLength = 0; + + ExInterlockedInsertTailList(&AdapterContext->PacketList, + &PacketEntry->ListEntry, + &AdapterContext->Spinlock); + + KeSetEvent(&AdapterContext->PacketReadEvent, IO_NO_INCREMENT, FALSE); + + Status = STATUS_SUCCESS; + } + else + { + Status = STATUS_NO_MEMORY; + } + + Irp->IoStatus.Status = Status; + Irp->IoStatus.Information = 0; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return Status; +} + +NTSTATUS SetAdapterOid(PIRP Irp, PIO_STACK_LOCATION IrpSp) { PNDISUIO_ADAPTER_CONTEXT AdapterContext = IrpSp->FileObject->FsContext; @@ -232,6 +266,9 @@ /* Now handle other IOCTLs */ switch (IrpSp->Parameters.DeviceIoControl.IoControlCode) { + case IOCTL_CANCEL_READ: + return CancelPacketRead(Irp, IrpSp); + case IOCTL_NDISUIO_QUERY_OID_VALUE: return QueryAdapterOid(Irp, IrpSp); Modified: branches/wlan-bringup/drivers/network/ndisuio/misc.c URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/drivers/network/nd… ============================================================================== --- branches/wlan-bringup/drivers/network/ndisuio/misc.c [iso-8859-1] (original) +++ branches/wlan-bringup/drivers/network/ndisuio/misc.c [iso-8859-1] Tue Jan 3 17:54:01 2012 @@ -10,6 +10,98 @@ #define NDEBUG #include <debug.h> + +NDIS_STATUS +AllocateAndChainBuffer(PNDIS_PACKET Packet, PVOID Buffer, ULONG BufferSize, BOOLEAN Front) +{ + NDIS_STATUS Status; + + /* Allocate the NDIS buffer mapping the pool */ + NdisAllocateBuffer(&Status, + &Buffer, + GlobalBufferPoolHandle, + Buffer, + Length); + if (Status != NDIS_STATUS_SUCCESS) + { + DPRINT1("No free buffer descriptors\n"); + return Status; + } + + if (Front) + { + /* Chain the buffer to front */ + NdisChainBufferAtFront(Packet, Buffer); + } + else + { + /* Chain the buffer to back */ + NdisChainBufferAtBack(Packet, Buffer); + } + + /* Return success */ + return NDIS_STATUS_SUCCESS; +} + +PNDIS_PACKET +CreatePacketFromPoolBuffer(PVOID Buffer, ULONG BufferSize) +{ + PNDIS_PACKET Packet; + NDIS_STATUS Status; + + /* Allocate a packet descriptor */ + NdisAllocatePacket(&Status, + &Packet, + GlobalPacketPoolHandle); + if (Status != NDIS_STATUS_SUCCESS) + { + DPRINT1("No free packet descriptors\n"); + return NULL; + } + + /* Use the helper to chain the buffer */ + Status = AllocateAndChainBuffer(Packet, Buffer, BufferSize, TRUE); + if (Status != NDIS_STATUS_SUCCESS) + { + NdisFreePacket(Packet); + return NULL; + } + + /* Return the packet */ + return Packet; +} + +VOID +CleanupAndFreePacket(PNDIS_PACKET Packet, BOOLEAN FreePool) +{ + PNDIS_BUFFER Buffer; + PVOID Data; + ULONG Length; + + /* Free each buffer and its backing pool memory */ + while (TRUE) + { + /* Unchain each buffer */ + NdisUnchainBufferAtFront(Packet, &Buffer); + if (!Buffer) + break; + + /* Get the backing memory */ + NdisQueryBuffer(Buffer, &Data, &Length); + + /* Free the buffer */ + NdisFreeBuffer(Buffer); + + if (FreePool) + { + /* Free the backing memory */ + ExFreePool(Data); + } + } + + /* Free the packet descriptor */ + NdisFreePacket(Packet); +} PNDISUIO_ADAPTER_CONTEXT FindAdapterContextByName(PNDIS_STRING DeviceName) @@ -70,19 +162,7 @@ /* Free the open entry */ ExFreePool(OpenEntry); } - - /* See if this binding can be destroyed */ - if (AdapterContext->OpenCount == 0) - { - /* Unlock the context */ - KeReleaseSpinLock(&AdapterContext->Spinlock, OldIrql); - /* Destroy the adapter context */ - UnbindAdapterByContext(AdapterContext); - } - else - { - /* Still more references on it */ - KeReleaseSpinLock(&AdapterContext->Spinlock, OldIrql); - } + /* Release the adapter context lock */ + KeReleaseSpinLock(&AdapterContext->Spinlock, OldIrql); } Modified: branches/wlan-bringup/drivers/network/ndisuio/ndisuio.h URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/drivers/network/nd… ============================================================================== --- branches/wlan-bringup/drivers/network/ndisuio/ndisuio.h [iso-8859-1] (original) +++ branches/wlan-bringup/drivers/network/ndisuio/ndisuio.h [iso-8859-1] Tue Jan 3 17:54:01 2012 @@ -28,9 +28,7 @@ /* Receive packet list */ LIST_ENTRY PacketList; - - /* Cancel read */ - BOOLEAN CancelRead; + KEVENT PacketReadEvent; /* Global list entry */ LIST_ENTRY ListEntry; Modified: branches/wlan-bringup/drivers/network/ndisuio/protocol.c URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/drivers/network/nd… ============================================================================== --- branches/wlan-bringup/drivers/network/ndisuio/protocol.c [iso-8859-1] (original) +++ branches/wlan-bringup/drivers/network/ndisuio/protocol.c [iso-8859-1] Tue Jan 3 17:54:01 2012 @@ -48,7 +48,13 @@ PNDIS_PACKET Packet, NDIS_STATUS Status) { - /* FIXME: Implement send/receive */ + PNDISUIO_ADAPTER_CONTEXT AdapterContext = ProtocolBindingContext; + + DPRINT("Asynchronous adapter send completed\n"); + + /* Store the final status and signal the event */ + AdapterContext->AsyncStatus = Status; + KeSetEvent(&AdapterContext->AsyncEvent, IO_NO_INCREMENT, FALSE); } VOID @@ -58,7 +64,13 @@ NDIS_STATUS Status, UINT BytesTransferred) { - /* FIXME: Implement send/receive */ + PNDISUIO_ADAPTER_CONTEXT AdapterContext = ProtocolBindingContext; + + DPRINT("Asynchronous adapter transfer completed\n"); + + /* Store the final status and signal the event */ + AdapterContext->AsyncStatus = Status; + KeSetEvent(&AdapterContext->AsyncEvent, IO_NO_INCREMENT, FALSE); } VOID @@ -100,8 +112,82 @@ UINT LookaheadBufferSize, UINT PacketSize) { - /* FIXME: Implement send/receive */ - return NDIS_STATUS_NOT_ACCEPTED; + PNDISUIO_ADAPTER_CONTEXT AdapterContext = ProtocolBindingContext; + PVOID PacketBuffer; + PNDIS_PACKET Packet; + NDIS_STATUS Status; + ULONG BytesTransferred; + + /* Allocate a buffer to hold the packet data and header */ + PacketBuffer = ExAllocatePool(NonPagedPool, PacketSize); + if (!PacketBuffer) + return NDIS_STATUS_NOT_ACCEPTED; + + /* Allocate the packet descriptor and buffer */ + Packet = CreatePacketFromPoolBuffer((PUCHAR)PacketBuffer + HeaderBufferSize, + PacketSize); + if (!Packet) + { + ExFreePool(PacketBuffer); + return NDIS_STATUS_NOT_ACCEPTED; + } + + /* Transfer the packet data into our data buffer */ + NdisTransferData(&Status, + AdapterContext->BindingHandle, + MacReceiveContext, + 0, + PacketSize, + &BytesTransferred); + if (Status == NDIS_STATUS_PENDING) + { + KeWaitForSingleObject(&AdapterContext->AsyncEvent, + Executive, + KernelMode, + FALSE, + NULL); + Status = AdapterContext->AsyncStatus; + } + if (Status != NDIS_STATUS_SUCCESS) + { + DPRINT1("Failed to transfer data with status 0x%x\n", Status); + CleanupAndFreePacket(Packet, TRUE); + return NDIS_STATUS_NOT_ACCEPTED; + } + + /* Copy the header data */ + RtlCopyMemory(PacketBuffer, HeaderBuffer, HeaderBufferSize); + + /* Free the packet descriptor and buffers + but not the pool because we still need it */ + CleanupAndFreePacket(Packet, FALSE); + + /* Allocate a packet entry from paged pool */ + PacketEntry = ExAllocatePool(PagedPool, sizeof(NDISUIO_PACKET_ENTRY) + BytesTransferred + HeaderBufferSize - 1); + if (!PacketEntry) + { + ExFreePool(PacketBuffer); + return NDIS_STATUS_RESOURCES; + } + + /* Initialize the packet entry and copy in packet data */ + PacketEntry->PacketLength = BytesTransferred + HeaderBufferSize; + RtlCopyMemory(&PacketEntry->PacketData[0], PacketBuffer, PacketEntry->PacketLength); + + /* Free the old non-paged buffer */ + ExFreePool(PacketBuffer); + + /* Insert the packet on the adapter's packet list */ + ExInterlockedInsertTailList(&AdapterContext->PacketList, + &PacketEntry->ListEntry, + &AdapterContext->Spinlock); + + /* Signal the read event */ + KeSetEvent(&AdapterContext->PacketReadEvent, + IO_NETWORK_INCREMENT, + FALSE); + + return NDIS_STATUS_SUCCESS; } VOID @@ -134,7 +220,7 @@ KIRQL OldIrql; PLIST_ENTRY CurrentOpenEntry; PNDISUIO_OPEN_ENTRY OpenEntry; - + /* Remove the adapter context from the global list */ KeAcquireSpinLock(&GlobalAdapterListLock, &OldIrql); RemoveEntryList(&AdapterContext->ListEntry); @@ -167,7 +253,7 @@ /* If this fails, we have a refcount mismatch somewhere */ ASSERT(AdapterContext->OpenCount == 0); - + /* Send the close request */ NdisCloseAdapter(Status, AdapterContext->BindingHandle); @@ -206,6 +292,7 @@ /* Set up the adapter context */ RtlZeroMemory(AdapterContext, sizeof(*AdapterContext)); KeInitializeEvent(&AdapterContext->AsyncEvent, SynchronizationEvent, FALSE); + KeInitializeEvent(&AdapterContext->PacketReadEvent, SynchronizationEvent, FALSE); KeInitializeSpinLock(&AdapterContext->Spinlock); InitializeListHead(&AdapterContext->PacketList); InitializeListHead(&AdapterContext->OpenEntryList); Modified: branches/wlan-bringup/drivers/network/ndisuio/readwrite.c URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/drivers/network/nd… ============================================================================== --- branches/wlan-bringup/drivers/network/ndisuio/readwrite.c [iso-8859-1] (original) +++ branches/wlan-bringup/drivers/network/ndisuio/readwrite.c [iso-8859-1] Tue Jan 3 17:54:01 2012 @@ -11,34 +11,134 @@ #define NDEBUG #include <debug.h> -VOID +NTSTATUS NTAPI NduDispatchRead(PDEVICE_OBJECT DeviceObject, PIRP Irp) { + PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp); + PNDISUIO_ADAPTER_CONTEXT AdapterContext = IrpSp->FileObject->FsContext; + KIRQL OldIrql; + NTSTATUS Status; + PLIST_ENTRY ListEntry; + PNDISUIO_PACKET_ENTRY PacketEntry = NULL; + ULONG BytesCopied = 0; + ASSERT(DeviceObject == GlobalDeviceObject); - /* FIXME: Not implemented */ - Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; - Irp->IoStatus.Information = 0; + while (TRUE) + { + KeAcquireSpinLock(&AdapterContext->Spinlock, &OldIrql); - IoCompleteRequest(Irp, IO_NO_INCREMENT); + /* Check if we have a packet */ + if (IsListEmpty(&AdapterContext->PacketList)) + { + KeReleaseSpinLock(&AdapterContext->Spinlock, OldIrql); - return STATUS_NOT_IMPLEMENTED; + /* Wait for a packet (in the context of the calling user thread) */ + Status = KeWaitForSingleObject(&AdapterContext->PacketReadEvent, + UserRequest, + UserMode, + TRUE, + NULL); + if (Status != STATUS_SUCCESS) + break; + } + else + { + /* Remove the first packet in the list */ + ListEntry = RemoveHeadList(&AdapterContext->PacketList); + PacketEntry = CONTAINING_RECORD(ListEntry, NDISUIO_PACKET_ENTRY, ListEntry); + + /* Release the adapter lock */ + KeReleaseSpinLock(&AdapterContext->Spinlock, OldIrql); + + /* And we're done with this loop */ + Status = STATUS_SUCCESS; + break; + } + } + + /* Check if we got a packet */ + if (PacketEntry != NULL) + { + /* Find the right amount of bytes to copy */ + BytesCopied = PacketEntry->PacketLength; + if (BytesCopied > IrpSp->Parameters.Read.Length) + BytesCopied = IrpSp->Parameters.Read.Length; + + /* Copy the packet */ + RtlCopyMemory(Irp->AssociatedIrp.SystemBuffer, + &PacketEntry->PacketBuffer[0], + BytesCopied); + + /* Free the packet entry */ + ExFreePool(PacketEntry); + } + else + { + /* Something failed */ + BytesCopied = 0; + } + + /* Complete the IRP */ + Irp->IoStatus.Status = Status; + Irp->IoStatus.Information = BytesCopied; + IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); + + return Status; } -VOID +NTSTATUS NTAPI NduDispatchWrite(PDEVICE_OBJECT DeviceObject, PIRP Irp) { + PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp); + PNDISUIO_ADAPTER_CONTEXT AdapterContext = IrpSp->FileObject->FsContext; + PNDIS_PACKET Packet; + NDIS_STATUS Status; + ULONG BytesCopied = 0; + ASSERT(DeviceObject == GlobalDeviceObject); + + /* Create a packet and buffer descriptor for this user buffer */ + Packet = CreatePacketFromPoolBuffer(Irp->AssociatedIrp.SystemBuffer, + IrpSp->Parameters.Write.Length); + if (Packet) + { + /* Send it via NDIS */ + NdisSend(&Status, + AdapterContext->BindingHandle, + Packet); - /* FIXME: Not implemented */ - Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; - Irp->IoStatus.Information = 0; + /* Wait for the send */ + if (Status == NDIS_STATUS_PENDING) + { + KeWaitForSingleObject(&AdapterContext->AsyncEvent, + Executive, + KernelMode, + FALSE, + NULL); + Status = AdapterContext->AsyncStatus; + } - IoCompleteRequest(Irp, IO_NO_INCREMENT); + /* Check if it succeeded */ + if (Status == NDIS_STATUS_SUCCESS) + BytesCopied = IrpSp->Parameters.Write.Length; - return STATUS_NOT_IMPLEMENTED; + CleanupAndFreePacket(Packet); + } + else + { + /* No memory */ + Status = STATUS_NO_MEMORY; + } + + /* Complete the IRP */ + Irp->IoStatus.Status = Status; + Irp->IoStatus.Information = BytesCopied; + IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); + + return Status; }

1 0

[cgutman] 54817: [NDISUIO] - Forgot a file
by cgutman＠svn.reactos.org 03 Jan '12

03 Jan '12

Author: cgutman Date: Tue Jan 3 16:13:06 2012 New Revision: 54817 URL: http://svn.reactos.org/svn/reactos?rev=54817&view=rev Log: [NDISUIO] - Forgot a file Modified: branches/wlan-bringup/drivers/network/ndisuio/misc.c Modified: branches/wlan-bringup/drivers/network/ndisuio/misc.c URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/drivers/network/nd… ============================================================================== --- branches/wlan-bringup/drivers/network/ndisuio/misc.c [iso-8859-1] (original) +++ branches/wlan-bringup/drivers/network/ndisuio/misc.c [iso-8859-1] Tue Jan 3 16:13:06 2012 @@ -27,19 +27,8 @@ /* Check if the device name matches */ if (RtlEqualUnicodeString(&AdapterContext->DeviceName, DeviceName, TRUE)) { - KeAcquireSpinLockAtDpcLevel(&AdapterContext->Spinlock); - - /* Check that it's not being destroyed */ - if (AdapterContext->OpenCount > 0) - { - KeReleaseSpinLockFromDpcLevel(&AdapterContext->Spinlock); - KeReleaseSpinLock(&GlobalAdapterListLock, OldIrql); - return AdapterContext; - } - else - { - KeReleaseSpinLockFromDpcLevel(&Adaptercontext->Spinlock); - } + KeReleaseSpinLock(&GlobalAdapterListLock, OldIrql); + return AdapterContext; } CurrentEntry = CurrentEntry->Flink; @@ -50,24 +39,10 @@ } VOID -ReferenceAdapterContext(PNDISUIO_ADAPTER_CONTEXT AdapterContext, BOOLEAN Locked) +ReferenceAdapterContext(PNDISUIO_ADAPTER_CONTEXT AdapterContext) { - KIRQL OldIrql; - - /* Lock if needed */ - if (!Locked) - { - KeAcquireSpinLock(&AdapterContext->Spinlock, &OldIrql); - } - /* Increment the open count */ AdapterContext->OpenCount++; - - /* Unlock if needed */ - if (!Locked) - { - KeReleaseSpinLock(&AdapterContext->Spinlock, OldIrql); - } } VOID

1 0

[cgutman] 54816: [NDISUIO] - Fix a race condition during adapter context destruction - Add missing IRP completion in IRP_MJ_READ and IRP_MJ_WRITE handlers - Create an adapter context in response to...
by cgutman＠svn.reactos.org 03 Jan '12

03 Jan '12

Author: cgutman Date: Tue Jan 3 16:08:24 2012 New Revision: 54816 URL: http://svn.reactos.org/svn/reactos?rev=54816&view=rev Log: [NDISUIO] - Fix a race condition during adapter context destruction - Add missing IRP completion in IRP_MJ_READ and IRP_MJ_WRITE handlers - Create an adapter context in response to PnP events Modified: branches/wlan-bringup/drivers/network/ndisuio/ioctl.c branches/wlan-bringup/drivers/network/ndisuio/protocol.c branches/wlan-bringup/drivers/network/ndisuio/readwrite.c Modified: branches/wlan-bringup/drivers/network/ndisuio/ioctl.c URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/drivers/network/nd… ============================================================================== --- branches/wlan-bringup/drivers/network/ndisuio/ioctl.c [iso-8859-1] (original) +++ branches/wlan-bringup/drivers/network/ndisuio/ioctl.c [iso-8859-1] Tue Jan 3 16:08:24 2012 @@ -126,6 +126,7 @@ NTSTATUS Status; PNDISUIO_ADAPTER_CONTEXT AdapterContext; PNDISUIO_OPEN_ENTRY OpenEntry; + KIRQL OldIrql; NameLength = IrpSp->Parameters.DeviceIoControl.InputBufferLength; if (NameLength != 0) @@ -135,16 +136,17 @@ /* Check if this already has a context */ AdapterContext = FindAdapterContextByName(&DeviceName); - if (AdapterContext == NULL) - { - /* Create a new context */ - Status = BindAdapterByName(&DeviceName, &AdapterContext); + if (AdapterContext != NULL) + { + /* Reference the adapter context */ + KeAcquireSpinLock(&AdapterContext->Spinlock, &OldIrql); + ReferenceAdapterContext(AdapterContext); + Status = STATUS_SUCCESS; } else { - /* Reference the existing context */ - ReferenceAdapterContext(AdapterContext, FALSE); - Status = STATUS_SUCCESS; + /* Invalid device name */ + Status = STATUS_INVALID_PARAMETER; } /* Check that the bind succeeded */ @@ -161,24 +163,25 @@ FileObject->FsContext2 = OpenEntry; /* Add it to the adapter's list */ - ExInterlockedInsertTailList(&AdapterContext->OpenEntryList, - &OpenEntry->ListEntry, - &AdapterContext->Spinlock); + InsertTailList(&AdapterContext->OpenEntryList, + &OpenEntry->ListEntry); /* Success */ + KeReleaseSpinLock(&AdapterContext->Spinlock, OldIrql); Status = STATUS_SUCCESS; } else { /* Remove the reference we added */ + KeReleaseSpinLock(&AdapterContext->Spinlock, OldIrql); DereferenceAdapterContext(AdapterContext, NULL); - Status = STATUS_NO_MEMORY; } } } else { + /* Invalid device name */ Status = STATUS_INVALID_PARAMETER; } Modified: branches/wlan-bringup/drivers/network/ndisuio/protocol.c URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/drivers/network/nd… ============================================================================== --- branches/wlan-bringup/drivers/network/ndisuio/protocol.c [iso-8859-1] (original) +++ branches/wlan-bringup/drivers/network/ndisuio/protocol.c [iso-8859-1] Tue Jan 3 16:08:24 2012 @@ -135,6 +135,11 @@ PLIST_ENTRY CurrentOpenEntry; PNDISUIO_OPEN_ENTRY OpenEntry; + /* Remove the adapter context from the global list */ + KeAcquireSpinLock(&GlobalAdapterListLock, &OldIrql); + RemoveEntryList(&AdapterContext->ListEntry); + KeReleaseSpinLock(&GlobalAdapterListLock, OldIrql); + /* Invalidate all handles to this adapter */ CurrentOpenEntry = AdapterContext->OpenEntryList.Flink; while (CurrentOpenEntry != &AdapterContext->OpenEntryList) @@ -163,11 +168,6 @@ /* If this fails, we have a refcount mismatch somewhere */ ASSERT(AdapterContext->OpenCount == 0); - /* Remove the adapter context from the global list */ - KeAcquireSpinLock(&GlobalAdapterListLock, &OldIrql); - RemoveEntryList(&AdapterContext->ListEntry); - KeReleaseSpinLock(&GlobalAdapterListLock, OldIrql); - /* Send the close request */ NdisCloseAdapter(Status, AdapterContext->BindingHandle); @@ -209,7 +209,7 @@ KeInitializeSpinLock(&AdapterContext->Spinlock); InitializeListHead(&AdapterContext->PacketList); InitializeListHead(&AdapterContext->OpenEntryList); - AdapterContext->OpenCount = 1; + AdapterContext->OpenCount = 0; /* Send the open request */ NdisOpenAdapter(&Status, @@ -261,8 +261,8 @@ PVOID SystemSpecific1, PVOID SystemSpecific2) { - /* We don't bind like this */ - *Status = NDIS_STATUS_SUCCESS; + /* Use our helper function to create a context for this adapter */ + *Status = BindAdapterByName(DeviceName); } VOID Modified: branches/wlan-bringup/drivers/network/ndisuio/readwrite.c URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/drivers/network/nd… ============================================================================== --- branches/wlan-bringup/drivers/network/ndisuio/readwrite.c [iso-8859-1] (original) +++ branches/wlan-bringup/drivers/network/ndisuio/readwrite.c [iso-8859-1] Tue Jan 3 16:08:24 2012 @@ -17,11 +17,13 @@ PIRP Irp) { ASSERT(DeviceObject == GlobalDeviceObject); - + /* FIXME: Not implemented */ Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; Irp->IoStatus.Information = 0; - + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_NOT_IMPLEMENTED; } @@ -35,6 +37,8 @@ /* FIXME: Not implemented */ Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; Irp->IoStatus.Information = 0; - + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_NOT_IMPLEMENTED; }

1 0

[spetreolle] 54815: [ROSTESTS] Fix oleaut32_winetest cmake build.
by spetreolle＠svn.reactos.org 03 Jan '12

03 Jan '12

Author: spetreolle Date: Tue Jan 3 11:38:21 2012 New Revision: 54815 URL: http://svn.reactos.org/svn/reactos?rev=54815&view=rev Log: [ROSTESTS] Fix oleaut32_winetest cmake build. Modified: trunk/rostests/winetests/oleaut32/CMakeLists.txt Modified: trunk/rostests/winetests/oleaut32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/CMakeL… ============================================================================== --- trunk/rostests/winetests/oleaut32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/oleaut32/CMakeLists.txt [iso-8859-1] Tue Jan 3 11:38:21 2012 @@ -5,8 +5,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -add_typelib(oleaut32_typelibs test_reg.idl test_tlb.idl tmarshal.idl) -add_dependencies(oleaut32_typelibs stdole2) +add_typelib(test_reg.idl test_tlb.idl tmarshal.idl) add_idl_Headers(oleaut32_idlheaders test_reg.idl tmarshal.idl) generate_idl_iids(tmarshal.idl) @@ -30,5 +29,13 @@ target_link_libraries(oleaut32_winetest uuid wine) set_module_type(oleaut32_winetest win32cui) add_importlibs(oleaut32_winetest oleaut32 ole32 rpcrt4 user32 gdi32 advapi32 msvcrt kernel32 ntdll) -add_dependencies(oleaut32_winetest oleaut32_typelibs oleaut32_idlheaders) +SET(tmarshal.rc_DEPS +${CMAKE_CURRENT_BINARY_DIR}/test_reg.tlb +${CMAKE_CURRENT_BINARY_DIR}/test_tlb.tlb +${CMAKE_CURRENT_BINARY_DIR}/tmarshal.tlb) +#doesn't work, only includes test_reg.tlb +#set_source_files_properties(tmarshal.rc PROPERTIES OBJECT_DEPENDS ${tmarshal.rc_DEPS}) +add_custom_target(oleaut32_typelibs ALL DEPENDS ${tmarshal.rc_DEPS}) + +add_dependencies(oleaut32_winetest oleaut32_typelibs oleaut32_idlheaders stdole2) add_cd_file(TARGET oleaut32_winetest DESTINATION reactos/bin FOR all)

1 0

[pschweitzer] 54814: [SHELL32_WINETEST] Comment out yet another test. Let's hope it will take testbot back and allow debugging.
by pschweitzer＠svn.reactos.org 03 Jan '12

03 Jan '12

Author: pschweitzer Date: Tue Jan 3 06:33:06 2012 New Revision: 54814 URL: http://svn.reactos.org/svn/reactos?rev=54814&view=rev Log: [SHELL32_WINETEST] Comment out yet another test. Let's hope it will take testbot back and allow debugging. Modified: trunk/rostests/winetests/shell32/shlfolder.c Modified: trunk/rostests/winetests/shell32/shlfolder.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shlfold… ============================================================================== --- trunk/rostests/winetests/shell32/shlfolder.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shell32/shlfolder.c [iso-8859-1] Tue Jan 3 06:33:06 2012 @@ -348,7 +348,7 @@ RemoveDirectoryA(".\\testdir"); } - +#if 0 /* perform test */ static void test_EnumObjects(IShellFolder *iFolder) { @@ -434,6 +434,7 @@ for (i=0;i<5;i++) IMalloc_Free(ppM, idlArr[i]); } +#endif static void test_BindToObject(void) { @@ -1335,6 +1336,7 @@ ok(result, "SHGetPathFromIDListW failed\n"); } +#if 0 static void test_EnumObjects_and_CompareIDs(void) { ITEMIDLIST *newPIDL; @@ -1379,6 +1381,7 @@ IShellFolder_Release(IDesktopFolder); } +#endif /* A simple implementation of an IPropertyBag, which returns fixed values for * 'Target' and 'Attributes' properties. @@ -4588,7 +4591,9 @@ test_ParseDisplayName(); test_SHParseDisplayName(); test_BindToObject(); +#if 0 test_EnumObjects_and_CompareIDs(); +#endif test_GetDisplayName(); test_GetAttributesOf(); test_SHGetPathFromIDList();

1 0

[jgardou] 54813: [CMAKE] - add module module type, which is basically a DLL without entry point and use it for typelibs - get rid of custom targets for generating .tlb files and use source file dep...
by jgardou＠svn.reactos.org 03 Jan '12

03 Jan '12

Author: jgardou Date: Tue Jan 3 00:17:18 2012 New Revision: 54813 URL: http://svn.reactos.org/svn/reactos?rev=54813&view=rev Log: [CMAKE] - add module module type, which is basically a DLL without entry point and use it for typelibs - get rid of custom targets for generating .tlb files and use source file dependencies instead Modified: trunk/reactos/cmake/CMakeMacros.cmake trunk/reactos/cmake/idl-support.cmake trunk/reactos/dll/win32/jscript/CMakeLists.txt trunk/reactos/dll/win32/mshtml.tlb/CMakeLists.txt trunk/reactos/dll/win32/msi/CMakeLists.txt trunk/reactos/dll/win32/msxml3/CMakeLists.txt trunk/reactos/dll/win32/pstorec/CMakeLists.txt trunk/reactos/dll/win32/shdocvw/CMakeLists.txt trunk/reactos/dll/win32/stdole2.tlb/CMakeLists.txt trunk/reactos/dll/win32/stdole32.tlb/CMakeLists.txt trunk/reactos/include/psdk/CMakeLists.txt Modified: trunk/reactos/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/CMakeMacros.cmake?re… ============================================================================== --- trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] Tue Jan 3 00:17:18 2012 @@ -294,7 +294,8 @@ set(__subsystem console) elseif(${TYPE} STREQUAL win32gui) set(__subsystem windows) - elseif(NOT ((${TYPE} STREQUAL win32dll) OR (${TYPE} STREQUAL win32ocx) OR (${TYPE} STREQUAL cpl))) + elseif(NOT ((${TYPE} STREQUAL win32dll) OR (${TYPE} STREQUAL win32ocx) + OR (${TYPE} STREQUAL cpl) OR (${TYPE} STREQUAL module))) message(FATAL_ERROR "Unknown type ${TYPE} for module ${MODULE}") endif() @@ -336,6 +337,8 @@ elseif(${TYPE} STREQUAL nativedll) set(__entrypoint DllMain) set(__entrystack 12) + elseif(${TYPE} STREQUAL module) + set(__entrypoint 0) endif() if(DEFINED __entrypoint) Modified: trunk/reactos/cmake/idl-support.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/idl-support.cmake?re… ============================================================================== --- trunk/reactos/cmake/idl-support.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/idl-support.cmake [iso-8859-1] Tue Jan 3 00:17:18 2012 @@ -53,7 +53,7 @@ set(${OUTPUT_VAR} ${__tmp_var} PARENT_SCOPE) endfunction() -function(add_typelib TARGET) +function(add_typelib) get_includes(INCLUDES) get_defines(DEFINES) foreach(FILE ${ARGN}) @@ -64,7 +64,6 @@ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} ${IDL_DEPENDS}) list(APPEND OBJECTS ${CMAKE_CURRENT_BINARY_DIR}/${NAME}.tlb) endforeach() - add_custom_target(${TARGET} ALL DEPENDS ${OBJECTS}) endfunction() function(add_idl_headers TARGET) Modified: trunk/reactos/dll/win32/jscript/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/jscript/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/CMakeLists.txt [iso-8859-1] Tue Jan 3 00:17:18 2012 @@ -1,7 +1,5 @@ -add_typelib(jsglobal jsglobal.idl) - -add_dependencies(jsglobal stdole2) +add_typelib(jsglobal.idl) remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) @@ -60,9 +58,12 @@ ntdll) add_pch(jscript jscript.h) -add_dependencies(jscript jsglobal) +# jsglobal.tlb needs stdole2.tlb +add_dependencies(jscript stdole2) add_cd_file(TARGET jscript DESTINATION reactos/system32 FOR all) if(NOT MSVC) allow_warnings(jscript) endif() + +set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/jsglobal.tlb) Modified: trunk/reactos/dll/win32/mshtml.tlb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml.tlb/CMake… ============================================================================== --- trunk/reactos/dll/win32/mshtml.tlb/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml.tlb/CMakeLists.txt [iso-8859-1] Tue Jan 3 00:17:18 2012 @@ -1,6 +1,5 @@ -add_typelib(mshtml__tlb mshtml_tlb.idl) -add_dependencies(mshtml__tlb stdole2) +add_typelib(mshtml_tlb.idl) add_definitions(-D__WINESRC__) @@ -8,7 +7,9 @@ add_library(mshtml.tlb SHARED rsrc.rc) -set_module_type(mshtml.tlb win32dll ENTRYPOINT 0 ) +set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/mshtml_tlb.tlb) + +set_module_type(mshtml.tlb module) set_target_properties(mshtml.tlb PROPERTIES SUFFIX "") -add_dependencies(mshtml.tlb mshtml__tlb) +add_dependencies(mshtml.tlb stdole2) add_cd_file(TARGET mshtml.tlb DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/msi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/CMakeLists.t… ============================================================================== --- trunk/reactos/dll/win32/msi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/CMakeLists.txt [iso-8859-1] Tue Jan 3 00:17:18 2012 @@ -70,10 +70,13 @@ add_library(msi SHARED ${SOURCE}) add_idl_headers(msi_idlheader msiserver.idl) -add_typelib(msi_tlb msiserver.idl) +add_typelib(msiserver.idl) + +set_source_files_properties(msi.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/msiserver.tlb) + set_module_type(msi win32dll) target_link_libraries(msi uuid ${PSEH_LIB} wine) -add_dependencies(msi msi_idlheader msi_tlb) +add_dependencies(msi msi_idlheader) add_delay_importlibs(msi odbccp32) add_importlibs(msi Modified: trunk/reactos/dll/win32/msxml3/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/msxml3/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/CMakeLists.txt [iso-8859-1] Tue Jan 3 00:17:18 2012 @@ -1,6 +1,3 @@ - -add_typelib(msxml3_v1 msxml3_v1.idl) -add_dependencies(msxml3_v1 stdole2) remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x601) @@ -19,6 +16,8 @@ set_rc_compiler() spec2def(msxml3.dll msxml3.spec) + +add_typelib(msxml3_v1.idl) list(APPEND SOURCE attribute.c @@ -59,6 +58,8 @@ set_module_type(msxml3 win32dll) +set_source_files_properties(version.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/msxml3_v1.tlb) + target_link_libraries(msxml3 libxml2 uuid @@ -87,5 +88,7 @@ kernel32 ntdll) -add_dependencies(msxml3 msxml3_v1) +# msxml3_v1.tlb needs stdole2.tlb +add_dependencies(msxml3 stdole2) + add_cd_file(TARGET msxml3 DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/pstorec/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/pstorec/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/pstorec/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/pstorec/CMakeLists.txt [iso-8859-1] Tue Jan 3 00:17:18 2012 @@ -1,6 +1,5 @@ -add_typelib(pstorec_tlb pstorec_tlb.idl) -add_dependencies(pstorec_tlb stdole2) +add_typelib(pstorec_tlb.idl) add_definitions(-D__WINESRC__) @@ -13,10 +12,13 @@ ${CMAKE_CURRENT_BINARY_DIR}/pstorec_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/pstorec.def) +set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/pstorec_tlb.tlb) + add_library(pstorec SHARED ${SOURCE}) set_module_type(pstorec win32dll) target_link_libraries(pstorec uuid wine) add_importlibs(pstorec msvcrt kernel32 ntdll) -add_dependencies(pstorec pstorec_tlb) +# pstorec_tlb.tlb needs stdole2.tlb +add_dependencies(pstorec stdole2) add_cd_file(TARGET pstorec DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/shdocvw/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shdocvw/CMakeLists.txt [iso-8859-1] Tue Jan 3 00:17:18 2012 @@ -1,6 +1,5 @@ -add_typelib(shdocvw_v1 shdocvw_v1.idl) -add_dependencies(shdocvw_v1 stdole2) +add_typelib(shdocvw_v1.idl) add_definitions(-D_SHDOCVW_) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) @@ -32,6 +31,8 @@ ${CMAKE_CURRENT_BINARY_DIR}/shdocvw_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/shdocvw.def) +set_source_files_properties(shdocvw.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/shdocvw_v1.tlb) + add_library(shdocvw SHARED ${SOURCE}) set_module_type(shdocvw win32dll) target_link_libraries(shdocvw uuid wine) @@ -49,7 +50,9 @@ kernel32 ntdll) -add_dependencies(shdocvw shdocvw_v1) +# shdocvw_v1.tlb needs stdole2.tlb +add_dependencies(shdocvw stdole2) + add_pch(shdocvw shdocvw.h) add_cd_file(TARGET shdocvw DESTINATION reactos/system32 FOR all) add_importlib_target(shdocvw.spec) Modified: trunk/reactos/dll/win32/stdole2.tlb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/stdole2.tlb/CMak… ============================================================================== --- trunk/reactos/dll/win32/stdole2.tlb/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/stdole2.tlb/CMakeLists.txt [iso-8859-1] Tue Jan 3 00:17:18 2012 @@ -2,17 +2,19 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -add_typelib(std_ole_v2 std_ole_v2.idl) +add_typelib(std_ole_v2.idl) spec2def(stdole2.tlb stdole2.tlb.spec) list(APPEND SOURCE rsrc.rc ${CMAKE_CURRENT_BINARY_DIR}/stdole2.def) + +set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/std_ole_v2.tlb) add_library(stdole2.tlb SHARED ${SOURCE}) -set_module_type(stdole2.tlb win32dll ENTRYPOINT 0 ) +set_module_type(stdole2.tlb module) set_target_properties(stdole2.tlb PROPERTIES SUFFIX "") -add_dependencies(stdole2.tlb std_ole_v2) + add_cd_file(TARGET stdole2.tlb DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/stdole32.tlb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/stdole32.tlb/CMa… ============================================================================== --- trunk/reactos/dll/win32/stdole32.tlb/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/stdole32.tlb/CMakeLists.txt [iso-8859-1] Tue Jan 3 00:17:18 2012 @@ -2,18 +2,19 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -add_typelib(std_ole_v1 std_ole_v1.idl) +add_typelib(std_ole_v1.idl) spec2def(stdole32.tlb stdole32.tlb.spec) list(APPEND SOURCE rsrc.rc ${CMAKE_CURRENT_BINARY_DIR}/stdole32.def) + +set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/std_ole_v1.tlb) add_library(stdole32.tlb SHARED ${SOURCE}) -set_module_type(stdole32.tlb win32dll ENTRYPOINT 0 ) +set_module_type(stdole32.tlb module) set_target_properties(stdole32.tlb PROPERTIES SUFFIX "") -add_dependencies(stdole32.tlb std_ole_v1) add_cd_file(TARGET stdole32.tlb DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/include/psdk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/CMakeLists.tx… ============================================================================== --- trunk/reactos/include/psdk/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/include/psdk/CMakeLists.txt [iso-8859-1] Tue Jan 3 00:17:18 2012 @@ -116,7 +116,8 @@ add_idl_headers(psdk ${SOURCE}) -add_typelib(stdole2 stdole2.idl) +add_typelib(stdole2.idl) +add_custom_target(stdole2 DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/stdole2.tlb) add_iid_library(wuguid wuapi.idl) add_iid_library(xml_uuids msxml2.idl)

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