Ros-diffs February 2012

ros-diffs@reactos.org

22 participants
577 discussions

[ion] 55657: [CSRSRV]: Add a future hack.

by ion＠svn.reactos.org

Author: ion Date: Fri Feb 17 01:23:25 2012 New Revision: 55657 URL: http://svn.reactos.org/svn/reactos?rev=55657&view=rev Log: [CSRSRV]: Add a future hack. Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/server.c 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] Fri Feb 17 01:23:25 2012 @@ -225,6 +225,15 @@ { /* No, save the pointer to its shared section in our list */ CsrSrvSharedStaticServerData[ServerDll->ServerId] = ServerDll->SharedSection; + } + + /* ReactOS Specific hax */ + if (ServerDll->HighestApiSupported == 0xDEADBABE) + { + DPRINT1("Registering: %p\n", (PVOID)ServerDll->DispatchTable); + Status = CsrApiRegisterDefinitions((PVOID)ServerDll->DispatchTable); + DPRINT1("Status: %lx\n", Status); + goto LoadFailed; } } else

12 years, 7 months

[ion] 55656: [WIN32CSR]: Link with CSRSRV.

by ion＠svn.reactos.org

Author: ion Date: Fri Feb 17 01:22:19 2012 New Revision: 55656 URL: http://svn.reactos.org/svn/reactos?rev=55656&view=rev Log: [WIN32CSR]: Link with CSRSRV. Modified: trunk/reactos/subsystems/win32/csrss/win32csr/CMakeLists.txt Modified: trunk/reactos/subsystems/win32/csrss/win32csr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/CMakeLists.txt [iso-8859-1] Fri Feb 17 01:22:19 2012 @@ -35,7 +35,7 @@ set_module_type(win32csr win32dll) -add_importlibs(win32csr user32 gdi32 advapi32 psapi msvcrt kernel32 ntdll) +add_importlibs(win32csr user32 gdi32 advapi32 psapi msvcrt kernel32 ntdll csrsrv) add_pch(win32csr w32csr.h)

12 years, 7 months

[ion] 55655: [CSRSRV2]: formatting fix.

by ion＠svn.reactos.org

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 */

12 years, 7 months

[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

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 {

12 years, 7 months

[janderwald] 55653: [USBEHCI] - Fix a few 64-bit issues

by janderwald＠svn.reactos.org

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;

12 years, 7 months

[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

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;

12 years, 7 months

[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

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; } }

12 years, 7 months

[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

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);

12 years, 7 months

[ion] 55649: [CSRSRV]: Hackfix "LPC Failed" errors.

by ion＠svn.reactos.org

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)) {

12 years, 7 months

[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

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);

12 years, 7 months

← Newer
1
...
26
27
28
29
30
31
32
...
58
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2012