Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ion] 55655: [CSRSRV2]: formatting fix.
by ion＠svn.reactos.org 17 Feb '12

17 Feb '12

Author: ion Date: Fri Feb 17 01:21:35 2012 New Revision: 55655 URL: http://svn.reactos.org/svn/reactos?rev=55655&view=rev Log: [CSRSRV2]: formatting fix. Modified: trunk/reactos/subsystems/csr/csrsrv/process.c Modified: trunk/reactos/subsystems/csr/csrsrv/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/csr/csrsrv/proc… ============================================================================== --- trunk/reactos/subsystems/csr/csrsrv/process.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/csr/csrsrv/process.c [iso-8859-1] Fri Feb 17 01:21:35 2012 @@ -1253,9 +1253,9 @@ { /* Release the lock, make the callback, and acquire it back */ CsrReleaseProcessLock(); - Result = (*ServerDll->ShutdownProcessCallback)(CsrProcess, - Flags, - FirstTry); + Result = ServerDll->ShutdownProcessCallback(CsrProcess, + Flags, + FirstTry); CsrAcquireProcessLock(); /* Check the result */

1 0

[cgutman] 55654: [NTOSKRNL] - Don't enumerate the root bus via the firmware mapper because HAL no longer sucks and it will do it properly for us
by cgutman＠svn.reactos.org 17 Feb '12

17 Feb '12

Author: cgutman Date: Fri Feb 17 00:21:50 2012 New Revision: 55654 URL: http://svn.reactos.org/svn/reactos?rev=55654&view=rev Log: [NTOSKRNL] - Don't enumerate the root bus via the firmware mapper because HAL no longer sucks and it will do it properly for us Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Fri Feb 17 00:21:50 2012 @@ -2691,9 +2691,6 @@ ULONG BootResourcesLength; NTSTATUS Status; - const UNICODE_STRING IdentifierPci = RTL_CONSTANT_STRING(L"PCI"); - UNICODE_STRING HardwareIdPci = RTL_CONSTANT_STRING(L"*PNP0A03\0"); - static ULONG DeviceIndexPci = 0; const UNICODE_STRING IdentifierSerial = RTL_CONSTANT_STRING(L"SerialController"); UNICODE_STRING HardwareIdSerial = RTL_CONSTANT_STRING(L"*PNP0501\0"); static ULONG DeviceIndexSerial = 0; @@ -2709,9 +2706,6 @@ const UNICODE_STRING IdentifierFloppy = RTL_CONSTANT_STRING(L"FloppyDiskPeripheral"); UNICODE_STRING HardwareIdFloppy = RTL_CONSTANT_STRING(L"*PNP0700\0"); static ULONG DeviceIndexFloppy = 0; - const UNICODE_STRING IdentifierIsa = RTL_CONSTANT_STRING(L"ISA"); - UNICODE_STRING HardwareIdIsa = RTL_CONSTANT_STRING(L"*PNP0A00\0"); - static ULONG DeviceIndexIsa = 0; UNICODE_STRING HardwareIdKey; PUNICODE_STRING pHardwareId; ULONG DeviceIndex = 0; @@ -2963,25 +2957,6 @@ { pHardwareId = &HardwareIdFloppy; DeviceIndex = DeviceIndexFloppy++; - } - else if (NT_SUCCESS(Status)) - { - /* Try to also match the device identifier */ - if (RtlCompareUnicodeString(&ValueName, &IdentifierPci, FALSE) == 0) - { - pHardwareId = &HardwareIdPci; - DeviceIndex = DeviceIndexPci++; - } - else if (RtlCompareUnicodeString(&ValueName, &IdentifierIsa, FALSE) == 0) - { - pHardwareId = &HardwareIdIsa; - DeviceIndex = DeviceIndexIsa++; - } - else - { - DPRINT("Unknown device '%wZ'\n", &ValueName); - goto nextdevice; - } } else {

1 0

[janderwald] 55653: [USBEHCI] - Fix a few 64-bit issues
by janderwald＠svn.reactos.org 16 Feb '12

16 Feb '12

Author: janderwald Date: Thu Feb 16 23:19:27 2012 New Revision: 55653 URL: http://svn.reactos.org/svn/reactos?rev=55653&view=rev Log: [USBEHCI] - Fix a few 64-bit issues Modified: trunk/reactos/drivers/usb/usbehci/usb_request.cpp Modified: trunk/reactos/drivers/usb/usbehci/usb_request.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/usb_re… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/usb_request.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/usb_request.cpp [iso-8859-1] Thu Feb 16 23:19:27 2012 @@ -634,6 +634,7 @@ OUT PULONG OutDescriptorLength) { ULONG Index, Length = 0, PageOffset, BufferLength; + PHYSICAL_ADDRESS Address; // // init transfer descriptor @@ -654,9 +655,15 @@ do { // + // get address + // + Address = MmGetPhysicalAddress(TransferBuffer); + + // // use physical address // - CurrentDescriptor->BufferPointer[Index] = MmGetPhysicalAddress(TransferBuffer).LowPart; + CurrentDescriptor->BufferPointer[Index] = Address.LowPart; + CurrentDescriptor->ExtendedBufferPointer[Index] = Address.HighPart; // // Get the offset from page size @@ -755,7 +762,6 @@ MaxPacketSize = m_EndpointDescriptor->EndPointDescriptor.wMaxPacketSize; } - do { // @@ -962,7 +968,8 @@ SetupDescriptor->Token.Bits.PIDCode = PID_CODE_SETUP_TOKEN; SetupDescriptor->Token.Bits.TotalBytesToTransfer = sizeof(USB_DEFAULT_PIPE_SETUP_PACKET); SetupDescriptor->Token.Bits.DataToggle = FALSE; - SetupDescriptor->BufferPointer[0] = (ULONG)PtrToUlong(m_DescriptorSetupPacket.LowPart); + SetupDescriptor->BufferPointer[0] = m_DescriptorSetupPacket.LowPart; + SetupDescriptor->ExtendedBufferPointer[0] = m_DescriptorSetupPacket.HighPart; InsertTailList(&QueueHead->TransferDescriptorListHead, &SetupDescriptor->DescriptorEntry); @@ -1331,7 +1338,7 @@ QueueHead->Token.Bits.InterruptOnComplete = FALSE; // - // FIXME check if that is really needed + // store address // QueueHead->PhysicalAddr = QueueHeadPhysicalAddress.LowPart;

1 0

[cgutman] 55652: [HAL] - Don't send a bogus bus number (-1) to the PCI driver because then it tries to scan that bus and obviously doesn't find anything - Legacy HAL can now enumerate boot critical...
by cgutman＠svn.reactos.org 16 Feb '12

16 Feb '12

Author: cgutman Date: Thu Feb 16 23:08:05 2012 New Revision: 55652 URL: http://svn.reactos.org/svn/reactos?rev=55652&view=rev Log: [HAL] - Don't send a bogus bus number (-1) to the PCI driver because then it tries to scan that bus and obviously doesn't find anything - Legacy HAL can now enumerate boot critical PCI devices (like the USB controller) and build the device stack for USB boot [HIVESYS] - Missed this spot where usbhub is installed for an external hub causing a crash Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf trunk/reactos/hal/halx86/legacy/halpnpdd.c Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] Thu Feb 16 23:08:05 2012 @@ -34,8 +34,8 @@ HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#COMPOSITE","Service",0x00000000,"usbccgp" HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#COMPOSITE","ClassGUID",0x00000000,"{36FC9E60-C465-11CF-8056-444553540000}" -HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#CLASS_09","Service",0x00000000,"usbhub" -HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#CLASS_09","ClassGUID",0x00000000,"{36FC9E60-C465-11CF-8056-444553540000}" +;HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#CLASS_09","Service",0x00000000,"usbhub" +;HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#CLASS_09","ClassGUID",0x00000000,"{36FC9E60-C465-11CF-8056-444553540000}" HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#ROOT_HUB","Service",0x00000000,"usbhub" HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#ROOT_HUB","ClassGUID",0x00000000,"{36FC9E60-C465-11CF-8056-444553540000}" Modified: trunk/reactos/hal/halx86/legacy/halpnpdd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/legacy/halpnpdd… ============================================================================== --- trunk/reactos/hal/halx86/legacy/halpnpdd.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/legacy/halpnpdd.c [iso-8859-1] Thu Feb 16 23:08:05 2012 @@ -384,8 +384,8 @@ ResourceList->Count = 1; /* Setup the list fields */ - ResourceList->List[0].BusNumber = -1; - ResourceList->List[0].InterfaceType = PNPBus; + ResourceList->List[0].BusNumber = 0; + ResourceList->List[0].InterfaceType = PCIBus; ResourceList->List[0].PartialResourceList.Version = 1; ResourceList->List[0].PartialResourceList.Revision = 1; ResourceList->List[0].PartialResourceList.Count = 0;

1 0

[tkreuzer] 55651: {MOUNTMGR] - Use portable KeXxxSpinLock, instead of fastcall variants - Fix usage of uninitialized variable - Fix typos in assignments - Fix several integer size bugs - Fix uninit...
by tkreuzer＠svn.reactos.org 16 Feb '12

16 Feb '12

Author: tkreuzer Date: Thu Feb 16 22:03:33 2012 New Revision: 55651 URL: http://svn.reactos.org/svn/reactos?rev=55651&view=rev Log: {MOUNTMGR] - Use portable KeXxxSpinLock, instead of fastcall variants - Fix usage of uninitialized variable - Fix typos in assignments - Fix several integer size bugs - Fix uninitialied variables (and those gcc couldn't identify as initialized) - Fix MSVC warnings Modified: trunk/reactos/drivers/filters/mountmgr/database.c trunk/reactos/drivers/filters/mountmgr/device.c trunk/reactos/drivers/filters/mountmgr/mountmgr.c trunk/reactos/drivers/filters/mountmgr/notify.c trunk/reactos/drivers/filters/mountmgr/symlink.c Modified: trunk/reactos/drivers/filters/mountmgr/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filters/mountmgr/d… ============================================================================== --- trunk/reactos/drivers/filters/mountmgr/database.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filters/mountmgr/database.c [iso-8859-1] Thu Feb 16 22:03:33 2012 @@ -175,7 +175,9 @@ &ByteOffset, NULL); /* If it fails or returns inconsistent data, drop it (= truncate) */ - if (!NT_SUCCESS(Status) || IoStatusBlock.Information != EntrySize || EntrySize < sizeof(DATABASE_ENTRY)) + if (!NT_SUCCESS(Status) || + (IoStatusBlock.Information != EntrySize) || + (EntrySize < sizeof(DATABASE_ENTRY)) ) { TruncateRemoteDatabase(Database, StartingOffset); FreePool(Entry); @@ -184,7 +186,7 @@ /* Validate entry */ if (MAX(Entry->SymbolicNameOffset + Entry->SymbolicNameLength, - Entry->UniqueIdOffset + Entry->UniqueIdLength) > EntrySize) + Entry->UniqueIdOffset + Entry->UniqueIdLength) > (LONG)EntrySize) { TruncateRemoteDatabase(Database, StartingOffset); FreePool(Entry); @@ -201,10 +203,10 @@ DeleteRemoteDatabaseEntry(IN HANDLE Database, IN LONG StartingOffset) { - LONG EndSize; + ULONG EndSize; PVOID TmpBuffer; NTSTATUS Status; - LONG DatabaseSize; + ULONG DatabaseSize; PDATABASE_ENTRY Entry; IO_STATUS_BLOCK IoStatusBlock; LARGE_INTEGER EndEntriesOffset; @@ -423,7 +425,8 @@ /* Acquire workers lock */ KeWaitForSingleObject(&(DeviceExtension->WorkerSemaphore), Executive, KernelMode, FALSE, NULL); - OldIrql = KfAcquireSpinLock(&(DeviceExtension->WorkerLock)); + KeAcquireSpinLock(&(DeviceExtension->WorkerLock), &OldIrql); + /* Ensure there are workers */ while (!IsListEmpty(&(DeviceExtension->WorkerQueueListHead))) { @@ -433,7 +436,7 @@ RECONCILE_WORK_ITEM, WorkerQueueListEntry); - KfReleaseSpinLock(&(DeviceExtension->WorkerLock), OldIrql); + KeReleaseSpinLock(&(DeviceExtension->WorkerLock), OldIrql); /* Call it */ WorkItem->WorkerRoutine(WorkItem->Context); @@ -447,9 +450,9 @@ } KeWaitForSingleObject(&(DeviceExtension->WorkerSemaphore), Executive, KernelMode, FALSE, NULL); - OldIrql = KfAcquireSpinLock(&(DeviceExtension->WorkerLock)); - } - KfReleaseSpinLock(&(DeviceExtension->WorkerLock), OldIrql); + KeAcquireSpinLock(&(DeviceExtension->WorkerLock), &OldIrql); + } + KeReleaseSpinLock(&(DeviceExtension->WorkerLock), OldIrql); InterlockedDecrement(&(DeviceExtension->WorkerReferences)); @@ -478,10 +481,10 @@ } /* Otherwise queue worker for delayed execution */ - OldIrql = KfAcquireSpinLock(&(DeviceExtension->WorkerLock)); + KeAcquireSpinLock(&(DeviceExtension->WorkerLock), &OldIrql); InsertTailList(&(DeviceExtension->WorkerQueueListHead), &(WorkItem->WorkerQueueListEntry)); - KfReleaseSpinLock(&(DeviceExtension->WorkerLock), OldIrql); + KeReleaseSpinLock(&(DeviceExtension->WorkerLock), OldIrql); KeReleaseSemaphore(&(DeviceExtension->WorkerSemaphore), IO_NO_INCREMENT, 1, FALSE); @@ -638,8 +641,8 @@ } /* Return the volume name */ - VolumeName->Length = FileNameInfo->FileNameLength; - VolumeName->MaximumLength = FileNameInfo->FileNameLength + sizeof(WCHAR); + VolumeName->Length = (USHORT)FileNameInfo->FileNameLength; + VolumeName->MaximumLength = (USHORT)FileNameInfo->FileNameLength + sizeof(WCHAR); VolumeName->Buffer = AllocatePool(VolumeName->MaximumLength); if (!VolumeName->Buffer) { @@ -993,7 +996,7 @@ } if (Status == STATUS_OBJECT_NAME_NOT_FOUND) { - Status == STATUS_SUCCESS; + Status = STATUS_SUCCESS; Complete = TRUE; } if (!NT_SUCCESS(Status) || Complete) @@ -1022,7 +1025,7 @@ } /* And write them into new database */ - Length = IoStatusBlock.Information; + Length = (ULONG)IoStatusBlock.Information; Status = ZwWriteFile(Database, NULL, NULL, @@ -1228,7 +1231,7 @@ if (IntUniqueId) { /* Copy data & return */ - IntUniqueId->UniqueIdLength = ValueLength; + IntUniqueId->UniqueIdLength = (USHORT)ValueLength; RtlCopyMemory(&(IntUniqueId->UniqueId), ValueData, ValueLength); UniqueId = Context; Modified: trunk/reactos/drivers/filters/mountmgr/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filters/mountmgr/d… ============================================================================== --- trunk/reactos/drivers/filters/mountmgr/device.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filters/mountmgr/device.c [iso-8859-1] Thu Feb 16 22:03:33 2012 @@ -94,7 +94,7 @@ REG_DWORD, &Value, sizeof(Value)); - + } /* @@ -221,10 +221,10 @@ MountMgrScrubRegistry(IN PDEVICE_EXTENSION DeviceExtension) { NTSTATUS Status; - BOOLEAN Continue = TRUE; + BOOLEAN Continue; RTL_QUERY_REGISTRY_TABLE QueryTable[2]; - while (Continue) + do { RtlZeroMemory(QueryTable, sizeof(QueryTable)); QueryTable[0].QueryRoutine = ScrubRegistryRoutine; @@ -237,6 +237,7 @@ DeviceExtension, NULL); } + while (Continue); return Status; } @@ -513,7 +514,7 @@ if (IsDriveLetter(&(SymlinkInformation->Name)) && SymlinkInformation->Online) { DriveLetterInfo->DriveLetterWasAssigned = FALSE; - DriveLetterInfo->CurrentDriveLetter = SymlinkInformation->Name.Buffer[LETTER_POSITION]; + DriveLetterInfo->CurrentDriveLetter = (CHAR)SymlinkInformation->Name.Buffer[LETTER_POSITION]; break; } @@ -972,8 +973,8 @@ } /* We can't go beyond */ - if (MountPoint->SymbolicLinkNameLength + MountPoint->UniqueIdLength + - MountPoint->DeviceNameLength < Stack->Parameters.DeviceIoControl.InputBufferLength) + if (((ULONG)MountPoint->SymbolicLinkNameLength + MountPoint->UniqueIdLength + + MountPoint->DeviceNameLength) < Stack->Parameters.DeviceIoControl.InputBufferLength) { return STATUS_INVALID_PARAMETER; } @@ -1234,7 +1235,7 @@ NTSTATUS MountMgrVolumeMountPointChanged(IN PDEVICE_EXTENSION DeviceExtension, IN PIRP Irp, - IN NTSTATUS LockStatus, + IN NTSTATUS LockStatus, OUT PUNICODE_STRING SourceDeviceName, OUT PUNICODE_STRING SourceSymbolicName, OUT PUNICODE_STRING TargetVolumeName) @@ -1265,7 +1266,7 @@ VolumeMountPoint = (PMOUNTMGR_VOLUME_MOUNT_POINT)Irp->AssociatedIrp.SystemBuffer; - if (VolumeMountPoint->SourceVolumeNameLength + VolumeMountPoint->TargetVolumeNameLength < + if (((ULONG)VolumeMountPoint->SourceVolumeNameLength + VolumeMountPoint->TargetVolumeNameLength) < Stack->Parameters.DeviceIoControl.InputBufferLength) { return STATUS_INVALID_PARAMETER; @@ -1406,7 +1407,7 @@ /* Return symbolic name */ SourceSymbolicName->Length = - SourceSymbolicName->MaximumLength = FileNameInfo->FileNameLength; + SourceSymbolicName->MaximumLength = (USHORT)FileNameInfo->FileNameLength; SourceSymbolicName->Buffer = (PWSTR)FileNameInfo; /* memmove allows memory overlap */ RtlMoveMemory(SourceSymbolicName->Buffer, FileNameInfo->FileName, SourceSymbolicName->Length); Modified: trunk/reactos/drivers/filters/mountmgr/mountmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filters/mountmgr/m… ============================================================================== --- trunk/reactos/drivers/filters/mountmgr/mountmgr.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filters/mountmgr/mountmgr.c [iso-8859-1] Thu Feb 16 22:03:33 2012 @@ -131,7 +131,7 @@ IN UCHAR Letter, IN PMOUNTDEV_UNIQUE_ID UniqueId OPTIONAL) { - NTSTATUS Status; + NTSTATUS Status = STATUS_UNSUCCESSFUL; /* Allocate a big enough buffer to contain the symbolic link */ DriveLetter->MaximumLength = sizeof(DosDevices.Buffer) + 3 * sizeof(WCHAR); @@ -907,7 +907,7 @@ /* * @implemented */ -ULONG +BOOLEAN MountmgrReadNoAutoMount(IN PUNICODE_STRING RegistryPath) { NTSTATUS Status; @@ -931,10 +931,10 @@ NULL); if (!NT_SUCCESS(Status)) { - return Default; - } - - return Result; + return (Default != 0); + } + + return (Result != 0); } /* @@ -1009,7 +1009,7 @@ if (RtlEqualUnicodeString(&(DeviceInformation->SymbolicName), &(CurrentDevice->SymbolicName), TRUE)) { - break; + break; } } @@ -1054,7 +1054,7 @@ /* If it's OK, set it and save its letter (if any) */ if (SuggestedLinkName.Buffer && IsDriveLetter(&SuggestedLinkName)) { - DeviceInformation->SuggestedDriveLetter = SuggestedLinkName.Buffer[LETTER_POSITION]; + DeviceInformation->SuggestedDriveLetter = (UCHAR)SuggestedLinkName.Buffer[LETTER_POSITION]; } /* Acquire driver exclusively */ @@ -1069,7 +1069,7 @@ if (RtlEqualUnicodeString(&(DeviceInformation->DeviceName), &TargetDeviceName, TRUE)) { - break; + break; } } Modified: trunk/reactos/drivers/filters/mountmgr/notify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filters/mountmgr/n… ============================================================================== --- trunk/reactos/drivers/filters/mountmgr/notify.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filters/mountmgr/notify.c [iso-8859-1] Thu Feb 16 22:03:33 2012 @@ -107,7 +107,7 @@ /* First, send the notification */ SendOnlineNotification(&(WorkItem->SymbolicName)); - OldIrql = KfAcquireSpinLock(&(DeviceExtension->WorkerLock)); + KeAcquireSpinLock(&(DeviceExtension->WorkerLock), &OldIrql); /* If there are no notifications running any longer, reset event */ if (--DeviceExtension->OnlineNotificationCount == 0) { @@ -120,7 +120,7 @@ /* Queue a new one for execution */ Head = RemoveHeadList(&(DeviceExtension->OnlineNotificationListHead)); NewWorkItem = CONTAINING_RECORD(Head, ONLINE_NOTIFICATION_WORK_ITEM, List); - KfReleaseSpinLock(&(DeviceExtension->WorkerLock), OldIrql); + KeReleaseSpinLock(&(DeviceExtension->WorkerLock), OldIrql); NewWorkItem->List.Blink = NULL; NewWorkItem->List.Flink = NULL; ExQueueWorkItem((PWORK_QUEUE_ITEM)NewWorkItem, DelayedWorkQueue); @@ -129,7 +129,7 @@ { /* Mark it's over */ DeviceExtension->OnlineNotificationWorkerActive = 0; - KfReleaseSpinLock(&(DeviceExtension->WorkerLock), OldIrql); + KeReleaseSpinLock(&(DeviceExtension->WorkerLock), OldIrql); } FreePool(WorkItem->SymbolicName.Buffer); @@ -171,14 +171,14 @@ RtlCopyMemory(WorkItem->SymbolicName.Buffer, SymbolicName->Buffer, SymbolicName->Length); WorkItem->SymbolicName.Buffer[SymbolicName->Length / sizeof(WCHAR)] = UNICODE_NULL; - OldIrql = KfAcquireSpinLock(&(DeviceExtension->WorkerLock)); + KeAcquireSpinLock(&(DeviceExtension->WorkerLock), &OldIrql); DeviceExtension->OnlineNotificationCount++; /* If no worker are active */ if (DeviceExtension->OnlineNotificationWorkerActive == 0) { /* Queue that one for execution */ - DeviceExtension->OnlineNotificationWorkerActive == 1; + DeviceExtension->OnlineNotificationWorkerActive = 1; ExQueueWorkItem((PWORK_QUEUE_ITEM)WorkItem, DelayedWorkQueue); } else @@ -187,7 +187,7 @@ InsertTailList(&(DeviceExtension->OnlineNotificationListHead), &(WorkItem->List)); } - KfReleaseSpinLock(&(DeviceExtension->WorkerLock), OldIrql); + KeReleaseSpinLock(&(DeviceExtension->WorkerLock), OldIrql); return; } @@ -202,13 +202,13 @@ KeInitializeEvent(&(DeviceExtension->OnlineNotificationEvent), NotificationEvent, FALSE); - OldIrql = KfAcquireSpinLock(&(DeviceExtension->WorkerLock)); + KeAcquireSpinLock(&(DeviceExtension->WorkerLock), &OldIrql); /* Just wait all the worker are done */ if (DeviceExtension->OnlineNotificationCount != 1) { DeviceExtension->OnlineNotificationCount--; - KfReleaseSpinLock(&(DeviceExtension->WorkerLock), OldIrql); + KeReleaseSpinLock(&(DeviceExtension->WorkerLock), OldIrql); KeWaitForSingleObject(&(DeviceExtension->OnlineNotificationEvent), Executive, @@ -216,11 +216,11 @@ FALSE, NULL); - OldIrql = KfAcquireSpinLock(&(DeviceExtension->WorkerLock)); + KeAcquireSpinLock(&(DeviceExtension->WorkerLock), &OldIrql); DeviceExtension->OnlineNotificationCount++; } - KfReleaseSpinLock(&(DeviceExtension->WorkerLock), OldIrql); + KeReleaseSpinLock(&(DeviceExtension->WorkerLock), OldIrql); } /* @@ -477,7 +477,7 @@ VOID RemoveWorkItem(IN PUNIQUE_ID_WORK_ITEM WorkItem) { - PDEVICE_EXTENSION DeviceExtension; + PDEVICE_EXTENSION DeviceExtension = WorkItem->DeviceExtension; KeWaitForSingleObject(&(DeviceExtension->DeviceLock), Executive, KernelMode, FALSE, NULL); @@ -605,7 +605,7 @@ /* Initialize the IRP */ Irp = WorkItem->Irp; - IoInitializeIrp(Irp, IoSizeOfIrp(WorkItem->StackSize), WorkItem->StackSize); + IoInitializeIrp(Irp, IoSizeOfIrp(WorkItem->StackSize), (CCHAR)WorkItem->StackSize); if (InterlockedExchange((PLONG)&(WorkItem->Event), 0) != 0) { Modified: trunk/reactos/drivers/filters/mountmgr/symlink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filters/mountmgr/s… ============================================================================== --- trunk/reactos/drivers/filters/mountmgr/symlink.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filters/mountmgr/symlink.c [iso-8859-1] Thu Feb 16 22:03:33 2012 @@ -852,7 +852,7 @@ RemoveEntryList(&(SymlinkInformation->SymbolicLinksListEntry)); FreePool(SymlinkInformation->Name.Buffer); FreePool(SymlinkInformation); - + return TRUE; } }

1 0

[ion] 55650: [CSRSRV]: Call the fake BaseSrv Init function during Server DLL load, not during SharedSection load, to be closer to where it should be. [CSRSRV]: Enable some disabled code-paths and f...
by ion＠svn.reactos.org 16 Feb '12

16 Feb '12

Author: ion Date: Thu Feb 16 21:46:59 2012 New Revision: 55650 URL: http://svn.reactos.org/svn/reactos?rev=55650&view=rev Log: [CSRSRV]: Call the fake BaseSrv Init function during Server DLL load, not during SharedSection load, to be closer to where it should be. [CSRSRV]: Enable some disabled code-paths and fix some locking patterns to be closer to what the code should look/be like. Correct ref count management is one of the things where regressions could show up later, so trying to nail these down now. Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/api/process.c trunk/reactos/subsystems/win32/csrss/csrsrv/init.c trunk/reactos/subsystems/win32/csrss/csrsrv/procsup.c trunk/reactos/subsystems/win32/csrss/csrsrv/thredsup.c trunk/reactos/subsystems/win32/csrss/include/api.h Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/api/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/api/process.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/api/process.c [iso-8859-1] Thu Feb 16 21:46:59 2012 @@ -106,7 +106,9 @@ Thread = CONTAINING_RECORD(NextEntry, CSR_THREAD, Link); NextEntry = NextEntry->Flink; + ASSERT(ProcessStructureListLocked()); CsrThreadRefcountZero(Thread); + LOCK; } if (pProcessData->ClientViewBase) @@ -233,17 +235,21 @@ Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); + LOCK; + NextEntry = ProcessData->ThreadList.Flink; while (NextEntry != &ProcessData->ThreadList) { Thread = CONTAINING_RECORD(NextEntry, CSR_THREAD, Link); NextEntry = NextEntry->Flink; + ASSERT(ProcessStructureListLocked()); CsrThreadRefcountZero(Thread); + LOCK; } - + UNLOCK; ProcessData->Flags |= CsrProcessTerminated; return STATUS_SUCCESS; } Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/init.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/init.c [iso-8859-1] Thu Feb 16 21:46:59 2012 @@ -783,9 +783,6 @@ return Status; } - /* Hackito ergo sum */ - BasepFakeStaticServerData(); - /* Load us */ Status = CsrLoadServerDll("CSRSS", NULL, CSR_SRV_SERVER); } @@ -825,6 +822,10 @@ /* Load it */ if (CsrDebug & 1) DPRINT1("CSRSS: Should be loading ServerDll=%s:%s\n", ParameterValue, EntryPoint); + + /* Hackito ergo sum */ + BasepFakeStaticServerData(); + Status = STATUS_SUCCESS; if (!NT_SUCCESS(Status)) { @@ -1061,7 +1062,7 @@ __FUNCTION__, Status); return Status; } - + /* Set up Session Support */ Status = CsrInitializeNtSessionList(); if (!NT_SUCCESS(Status)) Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/procsup.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/procsup.c [iso-8859-1] Thu Feb 16 21:46:59 2012 @@ -382,12 +382,141 @@ return Status; } +/*++ + * @name CsrProcessRefcountZero + * + * The CsrProcessRefcountZero routine is executed when a CSR Process has lost + * all its active references. It removes and de-allocates the CSR Process. + * + * @param CsrProcess + * Pointer to the CSR Process that is to be deleted. + * + * @return None. + * + * @remarks Do not call this routine. It is reserved for the internal + * thread management routines when a CSR Process has lost all + * its references. + * + * This routine is called with the Process Lock held. + * + *--*/ +VOID +NTAPI +CsrProcessRefcountZero(IN PCSR_PROCESS CsrProcess) +{ + ASSERT(ProcessStructureListLocked()); + + /* Remove the Process from the list */ + CsrRemoveProcess(CsrProcess); + + /* Check if there's a session */ + if (CsrProcess->NtSession) + { + /* Dereference the Session */ + //CsrDereferenceNtSession(CsrProcess->NtSession, 0); + } + + /* Close the Client Port if there is one */ + if (CsrProcess->ClientPort) NtClose(CsrProcess->ClientPort); + + /* Close the process handle */ + NtClose(CsrProcess->ProcessHandle); + + /* Free the Proces Object */ + CsrDeallocateProcess(CsrProcess); +} + +/*++ + * @name CsrLockedDereferenceProcess + * + * The CsrLockedDereferenceProcess dereferences a CSR Process while the + * Process Lock is already being held. + * + * @param CsrProcess + * Pointer to the CSR Process to be dereferenced. + * + * @return None. + * + * @remarks This routine will return with the Process Lock held. + * + *--*/ +VOID +NTAPI +CsrLockedDereferenceProcess(PCSR_PROCESS CsrProcess) +{ + LONG LockCount; + + /* Decrease reference count */ + LockCount = --CsrProcess->ReferenceCount; + ASSERT(LockCount >= 0); + if (!LockCount) + { + /* Call the generic cleanup code */ + DPRINT1("Should kill process: %p\n", CsrProcess); + //CsrProcessRefcountZero(CsrProcess); + CsrAcquireProcessLock(); + } +} + +/*++ + * @name CsrDereferenceProcess + * @implemented NT4 + * + * The CsrDereferenceProcess routine removes a reference from a CSR Process. + * + * @param CsrThread + * Pointer to the CSR Process to dereference. + * + * @return None. + * + * @remarks If the reference count has reached zero (ie: the CSR Process has + * no more active references), it will be deleted. + * + *--*/ +VOID +NTAPI +CsrDereferenceProcess(IN PCSR_PROCESS CsrProcess) +{ + LONG LockCount; + + /* Acquire process lock */ + CsrAcquireProcessLock(); + + /* Decrease reference count */ + LockCount = --CsrProcess->ReferenceCount; + ASSERT(LockCount >= 0); + if (!LockCount) + { + /* Call the generic cleanup code */ + CsrProcessRefcountZero(CsrProcess); + } + else + { + /* Just release the lock */ + CsrReleaseProcessLock(); + } +} + +/*++ + * @name CsrUnlockProcess + * @implemented NT4 + * + * The CsrUnlockProcess undoes a previous CsrLockProcessByClientId operation. + * + * @param CsrProcess + * Pointer to a previously locked CSR Process. + * + * @return STATUS_SUCCESS. + * + * @remarks This routine must be called with the Process Lock held. + * + *--*/ NTSTATUS NTAPI CsrUnlockProcess(IN PCSR_PROCESS CsrProcess) { /* Dereference the process */ - //CsrLockedDereferenceProcess(CsrProcess); + CsrLockedDereferenceProcess(CsrProcess); /* Release the lock and return */ CsrReleaseProcessLock(); Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/thredsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/thredsup.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/thredsup.c [iso-8859-1] Thu Feb 16 21:46:59 2012 @@ -113,7 +113,7 @@ /* Reference the Thread and Process */ CsrThread->ReferenceCount++; - // CsrProcess->ReferenceCount++; + CsrProcess->ReferenceCount++; /* Set the Parent Process */ CsrThread->Process = CsrProcess; @@ -230,6 +230,8 @@ NTAPI CsrRemoveThread(IN PCSR_THREAD CsrThread) { + ASSERT(ProcessStructureListLocked()); + /* Remove it from the List */ RemoveEntryList(&CsrThread->Link); @@ -246,10 +248,10 @@ if (!(CsrThread->Process->Flags & CsrProcessLastThreadTerminated)) { /* Let everyone know this process is about to lose the thread */ - //CsrThread->Process->Flags |= CsrProcessLastThreadTerminated; + CsrThread->Process->Flags |= CsrProcessLastThreadTerminated; /* Reference the Process */ - //CsrLockedDereferenceProcess(CsrThread->Process); + CsrLockedDereferenceProcess(CsrThread->Process); } } @@ -261,13 +263,15 @@ NTAPI CsrThreadRefcountZero(IN PCSR_THREAD CsrThread) { + PCSR_PROCESS CsrProcess = CsrThread->Process; NTSTATUS Status; + ASSERT(ProcessStructureListLocked()); /* Remove this thread */ CsrRemoveThread(CsrThread); /* Release the Process Lock */ - //CsrReleaseProcessLock(); + CsrReleaseProcessLock(); /* Close the NT Thread Handle */ if (CsrThread->ThreadHandle) @@ -281,7 +285,7 @@ CsrDeallocateThread(CsrThread); /* Remove a reference from the process */ - //CsrDereferenceProcess(CsrProcess); + CsrDereferenceProcess(CsrProcess); } NTSTATUS Modified: trunk/reactos/subsystems/win32/csrss/include/api.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/inc… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/include/api.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/include/api.h [iso-8859-1] Thu Feb 16 21:46:59 2012 @@ -385,12 +385,20 @@ IN OUT PULONG Reply ); +VOID +NTAPI +CsrLockedDereferenceProcess(PCSR_PROCESS CsrProcess); + +VOID +NTAPI +CsrDereferenceProcess(IN PCSR_PROCESS CsrProcess); + NTSTATUS NTAPI CsrLoadServerDll(IN PCHAR DllString, IN PCHAR EntryPoint OPTIONAL, IN ULONG ServerId); - + /* api/user.c */ CSR_API(CsrRegisterServicesProcess);

1 0

[ion] 55649: [CSRSRV]: Hackfix "LPC Failed" errors.
by ion＠svn.reactos.org 16 Feb '12

16 Feb '12

Author: ion Date: Thu Feb 16 20:17:10 2012 New Revision: 55649 URL: http://svn.reactos.org/svn/reactos?rev=55649&view=rev Log: [CSRSRV]: Hackfix "LPC Failed" errors. Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c [iso-8859-1] Thu Feb 16 20:17:10 2012 @@ -172,8 +172,8 @@ /* Create the Port Object */ Status = NtCreatePort(&hApiPort, //&CsrApiPort, &ObjectAttributes, - sizeof(CSR_CONNECTION_INFO), - sizeof(CSR_API_MESSAGE), + LPC_MAX_DATA_LENGTH, // hack + LPC_MAX_MESSAGE_LENGTH, // hack 16 * PAGE_SIZE); if (NT_SUCCESS(Status)) {

1 0

[ion] 55648: [CSRSRV]: Make CSRSRV "load" its own DLL as it should. This lets it support CSRSRV native APIs from NTDLL (which we don't send yet).
by ion＠svn.reactos.org 16 Feb '12

16 Feb '12

Author: ion Date: Thu Feb 16 20:08:34 2012 New Revision: 55648 URL: http://svn.reactos.org/svn/reactos?rev=55648&view=rev Log: [CSRSRV]: Make CSRSRV "load" its own DLL as it should. This lets it support CSRSRV native APIs from NTDLL (which we don't send yet). Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/init.c trunk/reactos/subsystems/win32/csrss/csrsrv/server.c trunk/reactos/subsystems/win32/csrss/include/api.h Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/init.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/init.c [iso-8859-1] Thu Feb 16 20:08:34 2012 @@ -783,11 +783,11 @@ return Status; } + /* Hackito ergo sum */ + BasepFakeStaticServerData(); + /* Load us */ - BasepFakeStaticServerData(); - #if 0 Status = CsrLoadServerDll("CSRSS", NULL, CSR_SRV_SERVER); - #endif } else if (!_stricmp(ParameterName, "ServerDLL")) { Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/server.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/server.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/server.c [iso-8859-1] Thu Feb 16 20:08:34 2012 @@ -71,7 +71,7 @@ { /* Setup the DLL Object */ LoadedServerDll->ApiBase = 0; - LoadedServerDll->HighestApiSupported = 5; + LoadedServerDll->HighestApiSupported = CsrpMaxApiNumber; LoadedServerDll->DispatchTable = CsrServerApiDispatchTable; LoadedServerDll->ValidTable = CsrServerApiServerValidTable; LoadedServerDll->NameTable = CsrServerApiNameTable; Modified: trunk/reactos/subsystems/win32/csrss/include/api.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/inc… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/include/api.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/include/api.h [iso-8859-1] Thu Feb 16 20:08:34 2012 @@ -385,6 +385,12 @@ IN OUT PULONG Reply ); +NTSTATUS +NTAPI +CsrLoadServerDll(IN PCHAR DllString, + IN PCHAR EntryPoint OPTIONAL, + IN ULONG ServerId); + /* api/user.c */ CSR_API(CsrRegisterServicesProcess);

1 0

[ion] 55647: [NTDLL/INCLUDE]: Rename the CSRSRV API Numbers not to conflict with the actual functions. [CSRSRV]: Import server.c from CSRSRV2, and move the existing CsrSrv functions we had from wap...
by ion＠svn.reactos.org 16 Feb '12

16 Feb '12

Author: ion Date: Thu Feb 16 19:53:47 2012 New Revision: 55647 URL: http://svn.reactos.org/svn/reactos?rev=55647&view=rev Log: [NTDLL/INCLUDE]: Rename the CSRSRV API Numbers not to conflict with the actual functions. [CSRSRV]: Import server.c from CSRSRV2, and move the existing CsrSrv functions we had from wapi.c to server.c (with the reactOS-specific hacks we had). The other CsrSrv* functions are not yet used. Added: trunk/reactos/subsystems/win32/csrss/csrsrv/server.c - copied, changed from r55585, trunk/reactos/subsystems/csr/csrsrv/server.c Modified: trunk/reactos/dll/ntdll/csr/api.c trunk/reactos/dll/ntdll/csr/connect.c trunk/reactos/include/reactos/subsys/csrss/csrss.h trunk/reactos/subsystems/win32/csrss/csrsrv/CMakeLists.txt trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c trunk/reactos/subsystems/win32/csrss/csrsrv/csrsrv.rbuild trunk/reactos/subsystems/win32/csrss/csrsrv/init.c trunk/reactos/subsystems/win32/csrss/include/api.h Modified: trunk/reactos/dll/ntdll/csr/api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/csr/api.c?rev=55… ============================================================================== --- trunk/reactos/dll/ntdll/csr/api.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/csr/api.c [iso-8859-1] Thu Feb 16 19:53:47 2012 @@ -48,7 +48,7 @@ /* Call it */ Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, NULL, - CSR_MAKE_OPCODE(CsrSrvSetPriorityClass, + CSR_MAKE_OPCODE(CsrpSetPriorityClass, CSR_SRV_SERVER), sizeof(CSR_SET_PRIORITY_CLASS)); @@ -78,7 +78,7 @@ /* Call it */ Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, NULL, - CSR_MAKE_OPCODE(CsrSrvIdentifyAlertableThread, + CSR_MAKE_OPCODE(CsrpIdentifyAlertable, CSR_SRV_SERVER), sizeof(CSR_SET_PRIORITY_CLASS)); Modified: trunk/reactos/dll/ntdll/csr/connect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/csr/connect.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/csr/connect.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/csr/connect.c [iso-8859-1] Thu Feb 16 19:53:47 2012 @@ -438,7 +438,7 @@ #if 0 Status = CsrClientCallServer(&ApiMessage, CaptureBuffer, - CSR_MAKE_OPCODE(CsrSrvClientConnect, + CSR_MAKE_OPCODE(CsrpClientConnect, CSR_SRV_DLL), sizeof(CSR_CLIENT_CONNECT)); #endif Modified: trunk/reactos/include/reactos/subsys/csrss/csrss.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/csr… ============================================================================== --- trunk/reactos/include/reactos/subsys/csrss/csrss.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/subsys/csrss/csrss.h [iso-8859-1] Thu Feb 16 19:53:47 2012 @@ -864,9 +864,15 @@ /* Types used in the new CSR. Temporarly here for proper compile of NTDLL */ #define CSR_SRV_SERVER 0 -#define CsrSrvClientConnect 0 -#define CsrSrvIdentifyAlertableThread 3 -#define CsrSrvSetPriorityClass 4 +typedef enum _CSR_SRV_API_NUMBER +{ + CsrpClientConnect, + CsrpThreadConnect, + CsrpProfileControl, + CsrpIdentifyAlertable, + CsrpSetPriorityClass, + CsrpMaxApiNumber +} CSR_SRV_API_NUMBER, *PCSR_SRV_API_NUMBER; #define CSR_MAKE_OPCODE(s,m) ((s) << 16) | (m) Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/CMakeLists.txt [iso-8859-1] Thu Feb 16 19:53:47 2012 @@ -13,6 +13,7 @@ init.c wait.c session.c + server.c ${CMAKE_CURRENT_BINARY_DIR}/csrsrv.def) add_library(csrsrv SHARED ${SOURCE}) Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c [iso-8859-1] Thu Feb 16 19:53:47 2012 @@ -111,197 +111,6 @@ /* Call the hard error handler in win32csr */ (VOID)CallHardError(ProcessData, Message); -} - -PVOID CsrSrvSharedSectionHeap; -PVOID CsrSrvSharedSectionBase; -PVOID *CsrSrvSharedStaticServerData; -ULONG CsrSrvSharedSectionSize; -HANDLE CsrSrvSharedSection; - -/*++ - * @name CsrSrvCreateSharedSection - * - * The CsrSrvCreateSharedSection creates the Shared Section that all CSR Server - * DLLs and Clients can use to share data. - * - * @param ParameterValue - * Specially formatted string from our registry command-line which - * specifies various arguments for the shared section. - * - * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL - * othwerwise. - * - * @remarks None. - * - *--*/ -NTSTATUS -NTAPI -CsrSrvCreateSharedSection(IN PCHAR ParameterValue) -{ - PCHAR SizeValue = ParameterValue; - ULONG Size; - NTSTATUS Status; - LARGE_INTEGER SectionSize; - ULONG ViewSize = 0; - SYSTEM_BASIC_INFORMATION CsrNtSysInfo; - PPEB Peb = NtCurrentPeb(); - - /* ReactOS Hackssss */ - Status = NtQuerySystemInformation(SystemBasicInformation, - &CsrNtSysInfo, - sizeof(SYSTEM_BASIC_INFORMATION), - NULL); - ASSERT(NT_SUCCESS(Status)); - - /* Find the first comma, and null terminate */ - while (*SizeValue) - { - if (*SizeValue == ',') - { - *SizeValue++ = '\0'; - break; - } - else - { - SizeValue++; - } - } - - /* Make sure it's valid */ - if (!*SizeValue) return STATUS_INVALID_PARAMETER; - - /* Convert it to an integer */ - Status = RtlCharToInteger(SizeValue, 0, &Size); - if (!NT_SUCCESS(Status)) return Status; - - /* Multiply by 1024 entries and round to page size */ - CsrSrvSharedSectionSize = ROUND_UP(Size * 1024, CsrNtSysInfo.PageSize); - - /* Create the Secion */ - SectionSize.LowPart = CsrSrvSharedSectionSize; - SectionSize.HighPart = 0; - Status = NtCreateSection(&CsrSrvSharedSection, - SECTION_ALL_ACCESS, - NULL, - &SectionSize, - PAGE_EXECUTE_READWRITE, - SEC_BASED | SEC_RESERVE, - NULL); - if (!NT_SUCCESS(Status)) return Status; - - /* Map the section */ - Status = NtMapViewOfSection(CsrSrvSharedSection, - NtCurrentProcess(), - &CsrSrvSharedSectionBase, - 0, - 0, - NULL, - &ViewSize, - ViewUnmap, - MEM_TOP_DOWN, - PAGE_EXECUTE_READWRITE); - if(!NT_SUCCESS(Status)) - { - /* Fail */ - NtClose(CsrSrvSharedSection); - return(Status); - } - - /* FIXME: Write the value to registry */ - - /* The Heap is the same place as the Base */ - CsrSrvSharedSectionHeap = CsrSrvSharedSectionBase; - - /* Create the heap */ - if (!(RtlCreateHeap(HEAP_ZERO_MEMORY, - CsrSrvSharedSectionHeap, - CsrSrvSharedSectionSize, - PAGE_SIZE, - 0, - 0))) - { - /* Failure, unmap section and return */ - NtUnmapViewOfSection(NtCurrentProcess(), - CsrSrvSharedSectionBase); - NtClose(CsrSrvSharedSection); - return STATUS_NO_MEMORY; - } - - /* Now allocate space from the heap for the Shared Data */ - CsrSrvSharedStaticServerData = RtlAllocateHeap(CsrSrvSharedSectionHeap, - 0, - 4 * // HAX CSR_SERVER_DLL_MAX * - sizeof(PVOID)); - - /* Write the values to the PEB */ - Peb->ReadOnlySharedMemoryBase = CsrSrvSharedSectionBase; - Peb->ReadOnlySharedMemoryHeap = CsrSrvSharedSectionHeap; - Peb->ReadOnlyStaticServerData = CsrSrvSharedStaticServerData; - - /* Return */ - return STATUS_SUCCESS; -} - -/*++ - * @name CsrSrvAttachSharedSection - * - * The CsrSrvAttachSharedSection maps the CSR Shared Section into a new - * CSR Process' address space, and returns the pointers to the section - * through the Connection Info structure. - * - * @param CsrProcess - * Pointer to the CSR Process that is attempting a connection. - * - * @param ConnectInfo - * Pointer to the CSR Connection Info structure for the incoming - * connection. - * - * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL - * othwerwise. - * - * @remarks None. - * - *--*/ -NTSTATUS -NTAPI -CsrSrvAttachSharedSection(IN PCSR_PROCESS CsrProcess OPTIONAL, - OUT PCSR_CONNECTION_INFO ConnectInfo) -{ - NTSTATUS Status; - ULONG ViewSize = 0; - - /* Check if we have a process */ - if (CsrProcess) - { - /* Map the section into this process */ - DPRINT("CSR Process Handle: %p. CSR Process: %p\n", CsrProcess->ProcessHandle, CsrProcess); - Status = NtMapViewOfSection(CsrSrvSharedSection, - CsrProcess->ProcessHandle, - &CsrSrvSharedSectionBase, - 0, - 0, - NULL, - &ViewSize, - ViewUnmap, - SEC_NO_CHANGE, - PAGE_EXECUTE_READ); - if (Status == STATUS_CONFLICTING_ADDRESSES) - { - /* I Think our csrss tries to connect to itself... */ - DPRINT1("Multiple mapping hack\n"); - Status = STATUS_SUCCESS; - } - if (!NT_SUCCESS(Status)) return Status; - } - - /* Write the values in the Connection Info structure */ - ConnectInfo->SharedSectionBase = CsrSrvSharedSectionBase; - ConnectInfo->SharedSectionHeap = CsrSrvSharedSectionHeap; - ConnectInfo->SharedSectionData = CsrSrvSharedStaticServerData; - - /* Return success */ - return STATUS_SUCCESS; } /*++ Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/csrsrv.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/csrsrv.rbuild [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/csrsrv.rbuild [iso-8859-1] Thu Feb 16 19:53:47 2012 @@ -20,5 +20,6 @@ <file>init.c</file> <file>wait.c</file> <file>session.c</file> + <file>server.c</file> <pch>srv.h</pch> </module> Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/init.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/init.c [iso-8859-1] Thu Feb 16 19:53:47 2012 @@ -181,10 +181,6 @@ VOID WINAPI BasepFakeStaticServerData(VOID); - -NTSTATUS -NTAPI -CsrSrvCreateSharedSection(IN PCHAR ParameterValue); /*++ * @name CsrSetProcessSecurity Copied: trunk/reactos/subsystems/win32/csrss/csrsrv/server.c (from r55585, trunk/reactos/subsystems/csr/csrsrv/server.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/csr/csrsrv/server.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/server.c [iso-8859-1] Thu Feb 16 19:53:47 2012 @@ -49,6 +49,39 @@ HANDLE CsrSrvSharedSection; /* PRIVATE FUNCTIONS**********************************************************/ + +/*++ + * @name CsrServerDllInitialization + * @implemented NT4 + * + * The CsrServerDllInitialization is the initialization routine for + * the this Server DLL. + * + * @param LoadedServerDll + * Pointer to the CSR Server DLL structure representing this Server DLL. + * + * @return STATUS_SUCCESS. + * + * @remarks None. + * + *--*/ +NTSTATUS +NTAPI +CsrServerDllInitialization(IN PCSR_SERVER_DLL LoadedServerDll) +{ + /* Setup the DLL Object */ + LoadedServerDll->ApiBase = 0; + LoadedServerDll->HighestApiSupported = 5; + LoadedServerDll->DispatchTable = CsrServerApiDispatchTable; + LoadedServerDll->ValidTable = CsrServerApiServerValidTable; + LoadedServerDll->NameTable = CsrServerApiNameTable; + LoadedServerDll->SizeOfProcessData = 0; + LoadedServerDll->ConnectCallback = NULL; + LoadedServerDll->DisconnectCallback = NULL; + + /* All done */ + return STATUS_SUCCESS; +} /*++ * @name CsrLoadServerDll @@ -173,7 +206,7 @@ if (NT_SUCCESS(Status)) { /* Get the result from the Server DLL */ - Status = (*ServerDllInitProcedure)(ServerDll); + Status = ServerDllInitProcedure(ServerDll); /* Check for Success */ if (NT_SUCCESS(Status)) @@ -215,39 +248,6 @@ } /*++ - * @name CsrServerDllInitialization - * @implemented NT4 - * - * The CsrServerDllInitialization is the initialization routine for - * the this Server DLL. - * - * @param LoadedServerDll - * Pointer to the CSR Server DLL structure representing this Server DLL. - * - * @return STATUS_SUCCESS. - * - * @remarks None. - * - *--*/ -NTSTATUS -NTAPI -CsrServerDllInitialization(IN PCSR_SERVER_DLL LoadedServerDll) -{ - /* Setup the DLL Object */ - LoadedServerDll->ApiBase = 0; - LoadedServerDll->HighestApiSupported = 5; - LoadedServerDll->DispatchTable = CsrServerApiDispatchTable; - LoadedServerDll->ValidTable = CsrServerApiServerValidTable; - LoadedServerDll->NameTable = CsrServerApiNameTable; - LoadedServerDll->SizeOfProcessData = 0; - LoadedServerDll->ConnectCallback = NULL; - LoadedServerDll->DisconnectCallback = NULL; - - /* All done */ - return STATUS_SUCCESS; -} - -/*++ * @name CsrSrvClientConnect * * The CsrSrvClientConnect CSR API handles a new connection to a server DLL. @@ -269,6 +269,9 @@ CsrSrvClientConnect(IN OUT PCSR_API_MESSAGE ApiMessage, IN OUT PULONG Reply OPTIONAL) { + /* Hack */ + return STATUS_SUCCESS; +#if 0 NTSTATUS Status; PCSR_CLIENT_CONNECT ClientConnect; PCSR_SERVER_DLL ServerDll; @@ -283,7 +286,7 @@ { return STATUS_TOO_MANY_NAMES; } - else if (!(CsrLoadedServerDll[ClientConnect->ServerId])) + else if (!CsrLoadedServerDll[ClientConnect->ServerId]) { return STATUS_INVALID_PARAMETER; } @@ -305,9 +308,9 @@ if (ServerDll->ConnectCallback) { /* Call the callback */ - Status = (ServerDll->ConnectCallback)(CurrentProcess, - ClientConnect->ConnectionInfo, - &ClientConnect->ConnectionInfoSize); + Status = ServerDll->ConnectCallback(CurrentProcess, + ClientConnect->ConnectionInfo, + &ClientConnect->ConnectionInfoSize); } else { @@ -317,6 +320,7 @@ /* Return status */ return Status; +#endif } /*++ @@ -347,7 +351,7 @@ PPEB Peb = NtCurrentPeb(); /* If there's no parameter, fail */ - if (ParameterValue) return STATUS_INVALID_PARAMETER; + if (!ParameterValue) return STATUS_INVALID_PARAMETER; /* Find the first comma, and null terminate */ while (*SizeValue) @@ -400,7 +404,7 @@ { /* Fail */ NtClose(CsrSrvSharedSection); - return(Status); + return Status; } /* FIXME: Write the value to registry */ @@ -469,7 +473,8 @@ /* Check if we have a process */ if (CsrProcess) { - /* Map the sectio into this process */ + /* Map the section into this process */ + DPRINT("CSR Process Handle: %p. CSR Process: %p\n", CsrProcess->ProcessHandle, CsrProcess); Status = NtMapViewOfSection(CsrSrvSharedSection, CsrProcess->ProcessHandle, &CsrSrvSharedSectionBase, @@ -480,6 +485,12 @@ ViewUnmap, SEC_NO_CHANGE, PAGE_EXECUTE_READ); + if (Status == STATUS_CONFLICTING_ADDRESSES) + { + /* I Think our csrss tries to connect to itself... */ + DPRINT1("Multiple mapping hack\n"); + Status = STATUS_SUCCESS; + } if (!NT_SUCCESS(Status)) return Status; } Modified: trunk/reactos/subsystems/win32/csrss/include/api.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/inc… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/include/api.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/include/api.h [iso-8859-1] Thu Feb 16 19:53:47 2012 @@ -14,6 +14,7 @@ #include <csrss/csrss.h> +#define CSR_SRV_SERVER 0 #define CSR_SERVER_DLL_MAX 4 #define LOCK RtlEnterCriticalSection(&ProcessDataLock) #define UNLOCK RtlLeaveCriticalSection(&ProcessDataLock) @@ -151,6 +152,75 @@ CSR_API_MESSAGE WaitApiMessage; } CSR_WAIT_BLOCK, *PCSR_WAIT_BLOCK; +typedef +NTSTATUS +(NTAPI *PCSR_CONNECT_CALLBACK)( + IN PCSR_PROCESS CsrProcess, + IN OUT PVOID ConnectionInfo, + IN OUT PULONG ConnectionInfoLength +); + +typedef +VOID +(NTAPI *PCSR_DISCONNECT_CALLBACK)(IN PCSR_PROCESS CsrProcess); + +typedef +NTSTATUS +(NTAPI *PCSR_NEWPROCESS_CALLBACK)( + IN PCSR_PROCESS Parent, + IN PCSR_PROCESS CsrProcess +); + +typedef +VOID +(NTAPI *PCSR_HARDERROR_CALLBACK)( + IN PCSR_THREAD CsrThread, + IN PHARDERROR_MSG HardErrorMessage +); + +typedef +ULONG +(NTAPI *PCSR_SHUTDOWNPROCESS_CALLBACK)( + IN PCSR_PROCESS CsrProcess, + IN ULONG Flags, + IN BOOLEAN FirstPhase +); + +typedef +NTSTATUS +(NTAPI *PCSR_API_ROUTINE)( + IN OUT PCSR_API_MESSAGE ApiMessage, + IN OUT PULONG Reply +); + +typedef struct _CSR_SERVER_DLL +{ + ULONG Length; + HANDLE Event; + ANSI_STRING Name; + HANDLE ServerHandle; + ULONG ServerId; + ULONG Unknown; + ULONG ApiBase; + ULONG HighestApiSupported; + PCSR_API_ROUTINE *DispatchTable; + PBOOLEAN ValidTable; + PCHAR *NameTable; + ULONG SizeOfProcessData; + PCSR_CONNECT_CALLBACK ConnectCallback; + PCSR_DISCONNECT_CALLBACK DisconnectCallback; + PCSR_HARDERROR_CALLBACK HardErrorCallback; + PVOID SharedSection; + PCSR_NEWPROCESS_CALLBACK NewProcessCallback; + PCSR_SHUTDOWNPROCESS_CALLBACK ShutdownProcessCallback; + ULONG Unknown2[3]; +} CSR_SERVER_DLL, *PCSR_SERVER_DLL; + +typedef +NTSTATUS +(NTAPI *PCSR_SERVER_DLL_INIT_CALLBACK)(IN PCSR_SERVER_DLL ServerDll); + + typedef NTSTATUS (WINAPI *CSRSS_API_PROC)(PCSR_PROCESS ProcessData, PCSR_API_MESSAGE Request); @@ -237,6 +307,11 @@ extern RTL_CRITICAL_SECTION ProcessDataLock, CsrWaitListsLock; extern UNICODE_STRING CsrDirectoryName; extern ULONG CsrDebug; +extern ULONG CsrTotalPerProcessDataLength; +extern SYSTEM_BASIC_INFORMATION CsrNtSysInfo; +extern PVOID CsrSrvSharedSectionHeap; +extern PVOID *CsrSrvSharedStaticServerData; +extern HANDLE CsrInitializationEvent; NTSTATUS NTAPI @@ -273,6 +348,43 @@ NTAPI CsrInitializeNtSessionList(VOID); +NTSTATUS +NTAPI +CsrSrvAttachSharedSection(IN PCSR_PROCESS CsrProcess OPTIONAL, +OUT PCSR_CONNECTION_INFO ConnectInfo); + +NTSTATUS +NTAPI +CsrSrvCreateSharedSection(IN PCHAR ParameterValue); + +NTSTATUS +NTAPI +CsrSrvClientConnect( + IN OUT PCSR_API_MESSAGE ApiMessage, + IN OUT PULONG Reply +); + +NTSTATUS +NTAPI +CsrSrvUnusedFunction( + IN OUT PCSR_API_MESSAGE ApiMessage, + IN OUT PULONG Reply +); + +NTSTATUS +NTAPI +CsrSrvIdentifyAlertableThread( + IN OUT PCSR_API_MESSAGE ApiMessage, + IN OUT PULONG Reply +); + +NTSTATUS +NTAPI +CsrSrvSetPriorityClass( + IN OUT PCSR_API_MESSAGE ApiMessage, + IN OUT PULONG Reply +); + /* api/user.c */ CSR_API(CsrRegisterServicesProcess);

1 0

[ion] 55646: [CSRSRV2]: Bug fixes.
by ion＠svn.reactos.org 16 Feb '12

16 Feb '12

Author: ion Date: Thu Feb 16 19:15:00 2012 New Revision: 55646 URL: http://svn.reactos.org/svn/reactos?rev=55646&view=rev Log: [CSRSRV2]: Bug fixes. Modified: trunk/reactos/subsystems/csr/csrsrv/server.c Modified: trunk/reactos/subsystems/csr/csrsrv/server.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/csr/csrsrv/serv… ============================================================================== --- trunk/reactos/subsystems/csr/csrsrv/server.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/csr/csrsrv/server.c [iso-8859-1] Thu Feb 16 19:15:00 2012 @@ -173,7 +173,7 @@ if (NT_SUCCESS(Status)) { /* Get the result from the Server DLL */ - Status = (*ServerDllInitProcedure)(ServerDll); + Status = ServerDllInitProcedure(ServerDll); /* Check for Success */ if (NT_SUCCESS(Status)) @@ -283,7 +283,7 @@ { return STATUS_TOO_MANY_NAMES; } - else if (!(CsrLoadedServerDll[ClientConnect->ServerId])) + else if (!CsrLoadedServerDll[ClientConnect->ServerId]) { return STATUS_INVALID_PARAMETER; } @@ -305,9 +305,9 @@ if (ServerDll->ConnectCallback) { /* Call the callback */ - Status = (ServerDll->ConnectCallback)(CurrentProcess, - ClientConnect->ConnectionInfo, - &ClientConnect->ConnectionInfoSize); + Status = ServerDll->ConnectCallback(CurrentProcess, + ClientConnect->ConnectionInfo, + &ClientConnect->ConnectionInfoSize); } else { @@ -347,7 +347,7 @@ PPEB Peb = NtCurrentPeb(); /* If there's no parameter, fail */ - if (ParameterValue) return STATUS_INVALID_PARAMETER; + if (!ParameterValue) return STATUS_INVALID_PARAMETER; /* Find the first comma, and null terminate */ while (*SizeValue) @@ -400,7 +400,7 @@ { /* Fail */ NtClose(CsrSrvSharedSection); - return(Status); + return Status; } /* FIXME: Write the value to registry */

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