Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ion] 23323: - Fix some last STDCALL->NTAPI problems. - Generate KUSER_SHARED_DATA cookie if it doesn't already exist when a user-mode thread runs. - Remove the last Ps entry from kernel fun.
by ion＠svn.reactos.org 27 Jul '06

27 Jul '06

Author: ion Date: Thu Jul 27 22:28:26 2006 New Revision: 23323 URL: http://svn.reactos.org/svn/reactos?rev=23323&view=rev Log: - Fix some last STDCALL->NTAPI problems. - Generate KUSER_SHARED_DATA cookie if it doesn't already exist when a user-mode thread runs. - Remove the last Ps entry from kernel fun. Modified: trunk/reactos/ntoskrnl/KrnlFun.c trunk/reactos/ntoskrnl/ps/debug.c trunk/reactos/ntoskrnl/ps/process.c trunk/reactos/ntoskrnl/ps/query.c trunk/reactos/ntoskrnl/ps/thread.c trunk/reactos/ntoskrnl/ps/win32.c Modified: trunk/reactos/ntoskrnl/KrnlFun.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/KrnlFun.c?rev=233… ============================================================================== --- trunk/reactos/ntoskrnl/KrnlFun.c (original) +++ trunk/reactos/ntoskrnl/KrnlFun.c Thu Jul 27 22:28:26 2006 @@ -23,9 +23,6 @@ // - Verify ShareAccess APIs, XP added some new semantics. // - Add support for Fast Dispatch I/O. // -// Ps: -// - Generate process cookie for user-more thread. -// // Ob: // - Fix bug related to Deferred Loading (don't requeue active work item). // - Add Directory Lock. Modified: trunk/reactos/ntoskrnl/ps/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/debug.c?rev=23… ============================================================================== --- trunk/reactos/ntoskrnl/ps/debug.c (original) +++ trunk/reactos/ntoskrnl/ps/debug.c Thu Jul 27 22:28:26 2006 @@ -28,7 +28,7 @@ #ifdef DBG VOID -STDCALL +NTAPI PspDumpThreads(BOOLEAN IncludeSystem) { PLIST_ENTRY CurrentThread, CurrentProcess; Modified: trunk/reactos/ntoskrnl/ps/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/process.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ps/process.c (original) +++ trunk/reactos/ntoskrnl/ps/process.c Thu Jul 27 22:28:26 2006 @@ -994,10 +994,11 @@ /* * @implemented */ -HANDLE STDCALL +HANDLE +NTAPI PsGetCurrentProcessId(VOID) { - return((HANDLE)PsGetCurrentProcess()->UniqueProcessId); + return (HANDLE)PsGetCurrentProcess()->UniqueProcessId; } /* @@ -1074,7 +1075,7 @@ * @implemented */ BOOLEAN -STDCALL +NTAPI PsIsProcessBeingDebugged(PEPROCESS Process) { return Process->DebugPort != NULL; Modified: trunk/reactos/ntoskrnl/ps/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/query.c?rev=23… ============================================================================== --- trunk/reactos/ntoskrnl/ps/query.c (original) +++ trunk/reactos/ntoskrnl/ps/query.c Thu Jul 27 22:28:26 2006 @@ -400,7 +400,7 @@ /* Get the current process and cookie */ Process = PsGetCurrentProcess(); Cookie = Process->Cookie; - if(!Cookie) + if (!Cookie) { LARGE_INTEGER SystemTime; ULONG NewCookie; @@ -416,7 +416,7 @@ Cookie = InterlockedCompareExchange((LONG*)&Process->Cookie, NewCookie, Cookie); - if(!Cookie) Cookie = NewCookie; + if (!Cookie) Cookie = NewCookie; /* Set return length */ Length = sizeof(ULONG); Modified: trunk/reactos/ntoskrnl/ps/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/thread.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ps/thread.c (original) +++ trunk/reactos/ntoskrnl/ps/thread.c Thu Jul 27 22:28:26 2006 @@ -95,13 +95,21 @@ /* Do we have a cookie set yet? */ if (!SharedUserData->Cookie) { - /* - * FIXME: Generate cookie - * Formula (roughly): Per-CPU Page Fault ^ Per-CPU Interrupt Time ^ - * Global System Time ^ Stack Address of where - * the LARGE_INTEGER containing the Global System - * Time is. - */ + LARGE_INTEGER SystemTime; + ULONG NewCookie; + PKPRCB Prcb; + + /* Generate a new cookie */ + KeQuerySystemTime(&SystemTime); + Prcb = KeGetCurrentPrcb(); + NewCookie = Prcb->MmPageFaultCount ^ Prcb->InterruptTime ^ + SystemTime.u.LowPart ^ SystemTime.u.HighPart ^ + (ULONG)&SystemTime; + + /* Set the new cookie*/ + InterlockedCompareExchange((LONG*)&SharedUserData->Cookie, + NewCookie, + 0); } } Modified: trunk/reactos/ntoskrnl/ps/win32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/win32.c?rev=23… ============================================================================== --- trunk/reactos/ntoskrnl/ps/win32.c (original) +++ trunk/reactos/ntoskrnl/ps/win32.c Thu Jul 27 22:28:26 2006 @@ -114,7 +114,7 @@ } NTSTATUS -STDCALL +NTAPI NtW32Call(IN ULONG RoutineIndex, IN PVOID Argument, IN ULONG ArgumentLength,

1 0

[ion] 23322: - Reimplement and activate NtQueryInformationThread. - Remove kernel fun entry.
by ion＠svn.reactos.org 27 Jul '06

27 Jul '06

Author: ion Date: Thu Jul 27 21:09:42 2006 New Revision: 23322 URL: http://svn.reactos.org/svn/reactos?rev=23322&view=rev Log: - Reimplement and activate NtQueryInformationThread. - Remove kernel fun entry. Modified: trunk/reactos/ntoskrnl/KrnlFun.c trunk/reactos/ntoskrnl/ps/query.c Modified: trunk/reactos/ntoskrnl/KrnlFun.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/KrnlFun.c?rev=233… ============================================================================== --- trunk/reactos/ntoskrnl/KrnlFun.c (original) +++ trunk/reactos/ntoskrnl/KrnlFun.c Thu Jul 27 21:09:42 2006 @@ -24,7 +24,6 @@ // - Add support for Fast Dispatch I/O. // // Ps: -// - Re-enable NtQuery/SetInformation Thread. // - Generate process cookie for user-more thread. // // Ob: Modified: trunk/reactos/ntoskrnl/ps/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/query.c?rev=23… ============================================================================== --- trunk/reactos/ntoskrnl/ps/query.c (original) +++ trunk/reactos/ntoskrnl/ps/query.c Thu Jul 27 21:09:42 2006 @@ -63,7 +63,7 @@ { PEPROCESS Process; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); - NTSTATUS Status = STATUS_SUCCESS; + NTSTATUS Status; ULONG Length = 0; PPROCESS_BASIC_INFORMATION ProcessBasicInfo = (PPROCESS_BASIC_INFORMATION)ProcessInformation; @@ -881,80 +881,200 @@ PETHREAD Thread; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); NTSTATUS Status = STATUS_SUCCESS; + ULONG Access; + ULONG Length = 0; + PTHREAD_BASIC_INFORMATION ThreadBasicInfo = + (PTHREAD_BASIC_INFORMATION)ThreadInformation; + PKERNEL_USER_TIMES ThreadTime = (PKERNEL_USER_TIMES)ThreadInformation; + KIRQL OldIrql; PAGED_CODE(); - DPRINT1("%s called for: %d\n", __FUNCTION__, ThreadInformationClass); + /* Verify Information Class validity */ + Status = DefaultSetInfoBufferCheck(ThreadInformationClass, + PsThreadInfoClass, + RTL_NUMBER_OF(PsThreadInfoClass), + ThreadInformation, + ThreadInformationLength, + PreviousMode); + if (!NT_SUCCESS(Status)) return Status; + + /* Check what class this is */ + Access = THREAD_QUERY_INFORMATION; + + /* Reference the process */ Status = ObReferenceObjectByHandle(ThreadHandle, - THREAD_QUERY_INFORMATION, + Access, PsThreadType, PreviousMode, (PVOID*)&Thread, NULL); if (!NT_SUCCESS(Status)) return Status; -#if 0 + /* Check what kind of information class this is */ switch (ThreadInformationClass) { + /* Basic thread information */ case ThreadBasicInformation: - /* A test on W2K agains ntdll shows NtQueryInformationThread return STATUS_PENDING - * as ExitStatus for current/running thread, while KETHREAD's ExitStatus is - * 0. So do the conversion here: - * -Gunnar */ - u.TBI.ExitStatus = (Thread->ExitStatus == 0) ? STATUS_PENDING : Thread->ExitStatus; - u.TBI.TebBaseAddress = (PVOID)Thread->Tcb.Teb; - u.TBI.ClientId = Thread->Cid; - u.TBI.AffinityMask = Thread->Tcb.Affinity; - u.TBI.Priority = Thread->Tcb.Priority; - u.TBI.BasePriority = KeQueryBasePriorityThread(&Thread->Tcb); - break; - + + /* Protect writes with SEH */ + _SEH_TRY + { + /* Write all the information from the ETHREAD/KTHREAD */ + ThreadBasicInfo->ExitStatus = (Thread->ExitStatus == 0) ? + STATUS_PENDING : + Thread->ExitStatus; + ThreadBasicInfo->TebBaseAddress = (PVOID)Thread->Tcb.Teb; + ThreadBasicInfo->ClientId = Thread->Cid; + ThreadBasicInfo->AffinityMask = Thread->Tcb.Affinity; + ThreadBasicInfo->Priority = Thread->Tcb.Priority; + ThreadBasicInfo->BasePriority = KeQueryBasePriorityThread(&Thread->Tcb); + + /* Set return length */ + Length = sizeof(THREAD_BASIC_INFORMATION); + } + _SEH_HANDLE + { + /* Get exception code */ + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + break; + + /* Thread time information */ case ThreadTimes: - u.TTI.KernelTime.QuadPart = Thread->Tcb.KernelTime * 100000LL; - u.TTI.UserTime.QuadPart = Thread->Tcb.UserTime * 100000LL; - u.TTI.CreateTime = Thread->CreateTime; - /*This works*/ - u.TTI.ExitTime = Thread->ExitTime; + + /* Protect writes with SEH */ + _SEH_TRY + { + /* Copy time information from ETHREAD/KTHREAD */ + ThreadTime->KernelTime.QuadPart = Thread->Tcb.KernelTime * + 100000LL; + ThreadTime->UserTime.QuadPart = Thread->Tcb.UserTime * + 100000LL; + ThreadTime->CreateTime = Thread->CreateTime; + ThreadTime->ExitTime = Thread->ExitTime; + + /* Set the return length */ + Length = sizeof(KERNEL_USER_TIMES); + } + _SEH_HANDLE + { + /* Get exception code */ + Status = _SEH_GetExceptionCode(); + } + _SEH_END; break; case ThreadQuerySetWin32StartAddress: - u.Address = Thread->Win32StartAddress; + + /* Protect write with SEH */ + _SEH_TRY + { + /* Return the Win32 Start Address */ + *(PVOID*)ThreadInformation = Thread->Win32StartAddress; + + /* Set the return length*/ + Length = sizeof(PVOID); + } + _SEH_HANDLE + { + /* Get exception code */ + Status = _SEH_GetExceptionCode(); + } + _SEH_END; break; case ThreadPerformanceCount: - /* Nebbett says this class is always zero */ - u.Count.QuadPart = 0; + + /* Protect write with SEH */ + _SEH_TRY + { + /* FIXME */ + (*(PLARGE_INTEGER)ThreadInformation).QuadPart = 0; + + /* Set the return length*/ + Length = sizeof(LARGE_INTEGER); + } + _SEH_HANDLE + { + /* Get exception code */ + Status = _SEH_GetExceptionCode(); + } + _SEH_END; break; case ThreadAmILastThread: - if (Thread->ThreadsProcess->ThreadListHead.Flink->Flink == - &Thread->ThreadsProcess->ThreadListHead) - { - u.Last = TRUE; - } - else - { - u.Last = FALSE; - } + + /* Protect write with SEH */ + _SEH_TRY + { + /* Return whether or not we are the last thread */ + *(PULONG)ThreadInformation = ((Thread->ThreadsProcess-> + ThreadListHead.Flink->Flink == + &Thread->ThreadsProcess-> + ThreadListHead) ? + TRUE : FALSE); + + /* Set the return length*/ + Length = sizeof(ULONG); + } + _SEH_HANDLE + { + /* Get exception code */ + Status = _SEH_GetExceptionCode(); + } + _SEH_END; break; case ThreadIsIoPending: - { - KIRQL OldIrql; - - /* Raise the IRQL to protect the IRP list */ - KeRaiseIrql(APC_LEVEL, &OldIrql); - u.IsIoPending = !IsListEmpty(&Thread->IrpList); - KeLowerIrql(OldIrql); - break; - } - + + /* Raise the IRQL to protect the IRP list */ + KeRaiseIrql(APC_LEVEL, &OldIrql); + + /* Protect write with SEH */ + _SEH_TRY + { + /* Check if the IRP list is empty or not */ + *(PULONG)ThreadInformation = !IsListEmpty(&Thread->IrpList); + + /* Set the return length*/ + Length = sizeof(ULONG); + } + _SEH_HANDLE + { + /* Get exception code */ + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + /* Lower IRQL back */ + KeLowerIrql(OldIrql); + break; + + /* Anything else */ default: - /* Shoult never occure if the data table is correct */ - KEBUGCHECK(0); - } -#endif + + /* Not yet implemented */ + DPRINT1("Not implemented: %lx\n", ThreadInformationClass); + Status = STATUS_NOT_IMPLEMENTED; + } + + /* Protect write with SEH */ + _SEH_TRY + { + /* Check if caller wanted return length */ + if (ReturnLength) *ReturnLength = Length; + } + _SEH_HANDLE + { + /* Get exception code */ + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + /* Dereference the thread, and return */ ObDereferenceObject(Thread); - return(Status); + return Status; } /* EOF */

1 0

[amunger] 23321: Merge 23320 from trunk.
by amunger＠svn.reactos.org 27 Jul '06

27 Jul '06

Author: amunger Date: Thu Jul 27 20:55:45 2006 New Revision: 23321 URL: http://svn.reactos.org/svn/reactos?rev=23321&view=rev Log: Merge 23320 from trunk. Modified: branches/ros-branch-0_3_0/reactos/drivers/network/dd/ne2000/include/ne2000.h branches/ros-branch-0_3_0/reactos/drivers/network/dd/ne2000/ne2000/main.c Modified: branches/ros-branch-0_3_0/reactos/drivers/network/dd/ne2000/include/ne2000.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/driver… ============================================================================== --- branches/ros-branch-0_3_0/reactos/drivers/network/dd/ne2000/include/ne2000.h (original) +++ branches/ros-branch-0_3_0/reactos/drivers/network/dd/ne2000/include/ne2000.h Thu Jul 27 20:55:45 2006 @@ -78,7 +78,8 @@ /* I/O base address and interrupt number of adapter */ ULONG IoBaseAddress; - ULONG InterruptNumber; + ULONG InterruptLevel; + ULONG InterruptVector; /* Mapped address of the I/O base port */ PUCHAR IOBase; Modified: branches/ros-branch-0_3_0/reactos/drivers/network/dd/ne2000/ne2000/main.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/driver… ============================================================================== --- branches/ros-branch-0_3_0/reactos/drivers/network/dd/ne2000/ne2000/main.c (original) +++ branches/ros-branch-0_3_0/reactos/drivers/network/dd/ne2000/ne2000/main.c Thu Jul 27 20:55:45 2006 @@ -151,6 +151,54 @@ } +static VOID STDCALL MiQueryResources( + OUT PNDIS_STATUS Status, + IN PNIC_ADAPTER Adapter, + IN NDIS_HANDLE WrapperConfigurationContext) +{ + PNDIS_RESOURCE_LIST AssignedResources; + UINT BufferSize = 0; + PCM_PARTIAL_RESOURCE_DESCRIPTOR Descriptor; + int i; + + NdisMQueryAdapterResources(Status, + WrapperConfigurationContext, + NULL, + &BufferSize); + if (*Status != NDIS_STATUS_RESOURCES) + return; + + *Status = NdisAllocateMemory((PVOID)&AssignedResources, + BufferSize, + 0, + HighestAcceptableMax); + if (*Status != NDIS_STATUS_SUCCESS) + return; + + NdisMQueryAdapterResources(Status, + WrapperConfigurationContext, + AssignedResources, + &BufferSize); + if (*Status != NDIS_STATUS_SUCCESS) + return; + + for (i = 0; i < AssignedResources->Count; i++) + { + Descriptor = AssignedResources->PartialDescriptors + i; + switch (Descriptor->Type) + { + case CmResourceTypeInterrupt: + Adapter->InterruptLevel = Descriptor->u.Interrupt.Level; + Adapter->InterruptVector = Descriptor->u.Interrupt.Vector; + break; + case CmResourceTypePort: + Adapter->IoBaseAddress = Descriptor->u.Port.Start.LowPart; + break; + } + } +} + + static NDIS_STATUS STDCALL MiniportInitialize( OUT PNDIS_STATUS OpenErrorStatus, OUT PUINT SelectedMediumIndex, @@ -202,13 +250,18 @@ NdisZeroMemory(Adapter, sizeof(NIC_ADAPTER)); Adapter->MiniportAdapterHandle = MiniportAdapterHandle; Adapter->IoBaseAddress = DRIVER_DEFAULT_IO_BASE_ADDRESS; - Adapter->InterruptNumber = DRIVER_DEFAULT_INTERRUPT_NUMBER; + Adapter->InterruptLevel = DRIVER_DEFAULT_INTERRUPT_NUMBER; + Adapter->InterruptVector = DRIVER_DEFAULT_INTERRUPT_NUMBER; Adapter->MaxMulticastListSize = DRIVER_MAX_MULTICAST_LIST_SIZE; Adapter->InterruptMask = DRIVER_INTERRUPT_MASK; Adapter->LookaheadSize = DRIVER_MAXIMUM_LOOKAHEAD; - /* get the port, irq, and MAC address from registry */ - do + /* Query the resources from PnP. */ + MiQueryResources(&Status, Adapter, WrapperConfigurationContext); + + /* Get the port, irq, and MAC address from registry if the PnP + failed. */ + if (Status != NDIS_STATUS_SUCCESS) { PNDIS_CONFIGURATION_PARAMETER ConfigurationParameter; NDIS_HANDLE ConfigurationHandle; @@ -217,52 +270,54 @@ UINT RegNetworkAddressLength = 0; NdisOpenConfiguration(&Status, &ConfigurationHandle, WrapperConfigurationContext); - if(Status != NDIS_STATUS_SUCCESS) + if (Status == NDIS_STATUS_SUCCESS) + { + NdisInitUnicodeString(&Keyword, L"Irq"); + NdisReadConfiguration(&Status, &ConfigurationParameter, ConfigurationHandle, &Keyword, NdisParameterHexInteger); + if(Status == NDIS_STATUS_SUCCESS) + { + NDIS_DbgPrint(MID_TRACE,("NdisReadConfiguration for Irq returned successfully, irq 0x%x\n", + ConfigurationParameter->ParameterData.IntegerData)); + Adapter->InterruptLevel = + Adapter->InterruptVector = ConfigurationParameter->ParameterData.IntegerData; + } + + NdisInitUnicodeString(&Keyword, L"Port"); + NdisReadConfiguration(&Status, &ConfigurationParameter, ConfigurationHandle, &Keyword, NdisParameterHexInteger); + if(Status == NDIS_STATUS_SUCCESS) + { + NDIS_DbgPrint(MID_TRACE,("NdisReadConfiguration for Port returned successfully, port 0x%x\n", + ConfigurationParameter->ParameterData.IntegerData)); + Adapter->IoBaseAddress = ConfigurationParameter->ParameterData.IntegerData; + } + + /* the returned copy of the data is owned by NDIS and will be released on NdisCloseConfiguration */ + NdisReadNetworkAddress(&Status, (PVOID *)&RegNetworkAddress, &RegNetworkAddressLength, ConfigurationHandle); + if(Status == NDIS_STATUS_SUCCESS && RegNetworkAddressLength == DRIVER_LENGTH_OF_ADDRESS) + { + int i; + NDIS_DbgPrint(MID_TRACE,("NdisReadNetworkAddress returned successfully, address %x:%x:%x:%x:%x:%x\n", + RegNetworkAddress[0], RegNetworkAddress[1], RegNetworkAddress[2], RegNetworkAddress[3], + RegNetworkAddress[4], RegNetworkAddress[5])); + for(i = 0; i < DRIVER_LENGTH_OF_ADDRESS; i++) + Adapter->StationAddress[i] = RegNetworkAddress[i]; + } + + NdisCloseConfiguration(ConfigurationHandle); + } + else { NDIS_DbgPrint(MIN_TRACE,("NdisOpenConfiguration returned error 0x%x\n", Status)); - break; } - - NdisInitUnicodeString(&Keyword, L"Irq"); - NdisReadConfiguration(&Status, &ConfigurationParameter, ConfigurationHandle, &Keyword, NdisParameterHexInteger); - if(Status == NDIS_STATUS_SUCCESS) - { - NDIS_DbgPrint(MID_TRACE,("NdisReadConfiguration for Irq returned successfully, irq 0x%x\n", - ConfigurationParameter->ParameterData.IntegerData)); - Adapter->InterruptNumber = ConfigurationParameter->ParameterData.IntegerData; - } - - NdisInitUnicodeString(&Keyword, L"Port"); - NdisReadConfiguration(&Status, &ConfigurationParameter, ConfigurationHandle, &Keyword, NdisParameterHexInteger); - if(Status == NDIS_STATUS_SUCCESS) - { - NDIS_DbgPrint(MID_TRACE,("NdisReadConfiguration for Port returned successfully, port 0x%x\n", - ConfigurationParameter->ParameterData.IntegerData)); - Adapter->IoBaseAddress = ConfigurationParameter->ParameterData.IntegerData; - } - - /* the returned copy of the data is owned by NDIS and will be released on NdisCloseConfiguration */ - NdisReadNetworkAddress(&Status, (PVOID *)&RegNetworkAddress, &RegNetworkAddressLength, ConfigurationHandle); - if(Status == NDIS_STATUS_SUCCESS && RegNetworkAddressLength == DRIVER_LENGTH_OF_ADDRESS) - { - int i; - NDIS_DbgPrint(MID_TRACE,("NdisReadNetworkAddress returned successfully, address %x:%x:%x:%x:%x:%x\n", - RegNetworkAddress[0], RegNetworkAddress[1], RegNetworkAddress[2], RegNetworkAddress[3], - RegNetworkAddress[4], RegNetworkAddress[5])); - for(i = 0; i < DRIVER_LENGTH_OF_ADDRESS; i++) - Adapter->StationAddress[i] = RegNetworkAddress[i]; - } - - NdisCloseConfiguration(ConfigurationHandle); - } while(0); + } /* find the nic */ if (!NICCheck(Adapter)) { NDIS_DbgPrint(MID_TRACE, ("No adapter found at (0x%X).\n", Adapter->IoBaseAddress)); + NdisFreeMemory(Adapter, sizeof(NIC_ADAPTER), 0); return NDIS_STATUS_ADAPTER_NOT_FOUND; } else NDIS_DbgPrint(MID_TRACE, ("Adapter found at (0x%X).\n", Adapter->IoBaseAddress)); - NdisMSetAttributes( MiniportAdapterHandle, @@ -334,8 +389,8 @@ Status = NdisMRegisterInterrupt( &Adapter->Interrupt, MiniportAdapterHandle, - Adapter->InterruptNumber, - Adapter->InterruptNumber, + Adapter->InterruptVector, + Adapter->InterruptLevel, FALSE, FALSE, NdisInterruptLatched);

1 0

[amunger] 23320: "PnPify" ne2000, patch from Filip. This allows the ne2000 driver to work with (and without) the new qemu acpi settings.
by amunger＠svn.reactos.org 27 Jul '06

27 Jul '06

Author: amunger Date: Thu Jul 27 20:52:03 2006 New Revision: 23320 URL: http://svn.reactos.org/svn/reactos?rev=23320&view=rev Log: "PnPify" ne2000, patch from Filip. This allows the ne2000 driver to work with (and without) the new qemu acpi settings. Modified: trunk/reactos/drivers/network/dd/ne2000/include/ne2000.h trunk/reactos/drivers/network/dd/ne2000/ne2000/main.c Modified: trunk/reactos/drivers/network/dd/ne2000/include/ne2000.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/dd/ne2000/… ============================================================================== --- trunk/reactos/drivers/network/dd/ne2000/include/ne2000.h (original) +++ trunk/reactos/drivers/network/dd/ne2000/include/ne2000.h Thu Jul 27 20:52:03 2006 @@ -78,7 +78,8 @@ /* I/O base address and interrupt number of adapter */ ULONG IoBaseAddress; - ULONG InterruptNumber; + ULONG InterruptLevel; + ULONG InterruptVector; /* Mapped address of the I/O base port */ PUCHAR IOBase; Modified: trunk/reactos/drivers/network/dd/ne2000/ne2000/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/dd/ne2000/… ============================================================================== --- trunk/reactos/drivers/network/dd/ne2000/ne2000/main.c (original) +++ trunk/reactos/drivers/network/dd/ne2000/ne2000/main.c Thu Jul 27 20:52:03 2006 @@ -151,6 +151,54 @@ } +static VOID STDCALL MiQueryResources( + OUT PNDIS_STATUS Status, + IN PNIC_ADAPTER Adapter, + IN NDIS_HANDLE WrapperConfigurationContext) +{ + PNDIS_RESOURCE_LIST AssignedResources; + UINT BufferSize = 0; + PCM_PARTIAL_RESOURCE_DESCRIPTOR Descriptor; + int i; + + NdisMQueryAdapterResources(Status, + WrapperConfigurationContext, + NULL, + &BufferSize); + if (*Status != NDIS_STATUS_RESOURCES) + return; + + *Status = NdisAllocateMemory((PVOID)&AssignedResources, + BufferSize, + 0, + HighestAcceptableMax); + if (*Status != NDIS_STATUS_SUCCESS) + return; + + NdisMQueryAdapterResources(Status, + WrapperConfigurationContext, + AssignedResources, + &BufferSize); + if (*Status != NDIS_STATUS_SUCCESS) + return; + + for (i = 0; i < AssignedResources->Count; i++) + { + Descriptor = AssignedResources->PartialDescriptors + i; + switch (Descriptor->Type) + { + case CmResourceTypeInterrupt: + Adapter->InterruptLevel = Descriptor->u.Interrupt.Level; + Adapter->InterruptVector = Descriptor->u.Interrupt.Vector; + break; + case CmResourceTypePort: + Adapter->IoBaseAddress = Descriptor->u.Port.Start.LowPart; + break; + } + } +} + + static NDIS_STATUS STDCALL MiniportInitialize( OUT PNDIS_STATUS OpenErrorStatus, OUT PUINT SelectedMediumIndex, @@ -202,13 +250,18 @@ NdisZeroMemory(Adapter, sizeof(NIC_ADAPTER)); Adapter->MiniportAdapterHandle = MiniportAdapterHandle; Adapter->IoBaseAddress = DRIVER_DEFAULT_IO_BASE_ADDRESS; - Adapter->InterruptNumber = DRIVER_DEFAULT_INTERRUPT_NUMBER; + Adapter->InterruptLevel = DRIVER_DEFAULT_INTERRUPT_NUMBER; + Adapter->InterruptVector = DRIVER_DEFAULT_INTERRUPT_NUMBER; Adapter->MaxMulticastListSize = DRIVER_MAX_MULTICAST_LIST_SIZE; Adapter->InterruptMask = DRIVER_INTERRUPT_MASK; Adapter->LookaheadSize = DRIVER_MAXIMUM_LOOKAHEAD; - /* get the port, irq, and MAC address from registry */ - do + /* Query the resources from PnP. */ + MiQueryResources(&Status, Adapter, WrapperConfigurationContext); + + /* Get the port, irq, and MAC address from registry if the PnP + failed. */ + if (Status != NDIS_STATUS_SUCCESS) { PNDIS_CONFIGURATION_PARAMETER ConfigurationParameter; NDIS_HANDLE ConfigurationHandle; @@ -217,52 +270,54 @@ UINT RegNetworkAddressLength = 0; NdisOpenConfiguration(&Status, &ConfigurationHandle, WrapperConfigurationContext); - if(Status != NDIS_STATUS_SUCCESS) + if (Status == NDIS_STATUS_SUCCESS) + { + NdisInitUnicodeString(&Keyword, L"Irq"); + NdisReadConfiguration(&Status, &ConfigurationParameter, ConfigurationHandle, &Keyword, NdisParameterHexInteger); + if(Status == NDIS_STATUS_SUCCESS) + { + NDIS_DbgPrint(MID_TRACE,("NdisReadConfiguration for Irq returned successfully, irq 0x%x\n", + ConfigurationParameter->ParameterData.IntegerData)); + Adapter->InterruptLevel = + Adapter->InterruptVector = ConfigurationParameter->ParameterData.IntegerData; + } + + NdisInitUnicodeString(&Keyword, L"Port"); + NdisReadConfiguration(&Status, &ConfigurationParameter, ConfigurationHandle, &Keyword, NdisParameterHexInteger); + if(Status == NDIS_STATUS_SUCCESS) + { + NDIS_DbgPrint(MID_TRACE,("NdisReadConfiguration for Port returned successfully, port 0x%x\n", + ConfigurationParameter->ParameterData.IntegerData)); + Adapter->IoBaseAddress = ConfigurationParameter->ParameterData.IntegerData; + } + + /* the returned copy of the data is owned by NDIS and will be released on NdisCloseConfiguration */ + NdisReadNetworkAddress(&Status, (PVOID *)&RegNetworkAddress, &RegNetworkAddressLength, ConfigurationHandle); + if(Status == NDIS_STATUS_SUCCESS && RegNetworkAddressLength == DRIVER_LENGTH_OF_ADDRESS) + { + int i; + NDIS_DbgPrint(MID_TRACE,("NdisReadNetworkAddress returned successfully, address %x:%x:%x:%x:%x:%x\n", + RegNetworkAddress[0], RegNetworkAddress[1], RegNetworkAddress[2], RegNetworkAddress[3], + RegNetworkAddress[4], RegNetworkAddress[5])); + for(i = 0; i < DRIVER_LENGTH_OF_ADDRESS; i++) + Adapter->StationAddress[i] = RegNetworkAddress[i]; + } + + NdisCloseConfiguration(ConfigurationHandle); + } + else { NDIS_DbgPrint(MIN_TRACE,("NdisOpenConfiguration returned error 0x%x\n", Status)); - break; } - - NdisInitUnicodeString(&Keyword, L"Irq"); - NdisReadConfiguration(&Status, &ConfigurationParameter, ConfigurationHandle, &Keyword, NdisParameterHexInteger); - if(Status == NDIS_STATUS_SUCCESS) - { - NDIS_DbgPrint(MID_TRACE,("NdisReadConfiguration for Irq returned successfully, irq 0x%x\n", - ConfigurationParameter->ParameterData.IntegerData)); - Adapter->InterruptNumber = ConfigurationParameter->ParameterData.IntegerData; - } - - NdisInitUnicodeString(&Keyword, L"Port"); - NdisReadConfiguration(&Status, &ConfigurationParameter, ConfigurationHandle, &Keyword, NdisParameterHexInteger); - if(Status == NDIS_STATUS_SUCCESS) - { - NDIS_DbgPrint(MID_TRACE,("NdisReadConfiguration for Port returned successfully, port 0x%x\n", - ConfigurationParameter->ParameterData.IntegerData)); - Adapter->IoBaseAddress = ConfigurationParameter->ParameterData.IntegerData; - } - - /* the returned copy of the data is owned by NDIS and will be released on NdisCloseConfiguration */ - NdisReadNetworkAddress(&Status, (PVOID *)&RegNetworkAddress, &RegNetworkAddressLength, ConfigurationHandle); - if(Status == NDIS_STATUS_SUCCESS && RegNetworkAddressLength == DRIVER_LENGTH_OF_ADDRESS) - { - int i; - NDIS_DbgPrint(MID_TRACE,("NdisReadNetworkAddress returned successfully, address %x:%x:%x:%x:%x:%x\n", - RegNetworkAddress[0], RegNetworkAddress[1], RegNetworkAddress[2], RegNetworkAddress[3], - RegNetworkAddress[4], RegNetworkAddress[5])); - for(i = 0; i < DRIVER_LENGTH_OF_ADDRESS; i++) - Adapter->StationAddress[i] = RegNetworkAddress[i]; - } - - NdisCloseConfiguration(ConfigurationHandle); - } while(0); + } /* find the nic */ if (!NICCheck(Adapter)) { NDIS_DbgPrint(MID_TRACE, ("No adapter found at (0x%X).\n", Adapter->IoBaseAddress)); + NdisFreeMemory(Adapter, sizeof(NIC_ADAPTER), 0); return NDIS_STATUS_ADAPTER_NOT_FOUND; } else NDIS_DbgPrint(MID_TRACE, ("Adapter found at (0x%X).\n", Adapter->IoBaseAddress)); - NdisMSetAttributes( MiniportAdapterHandle, @@ -334,8 +389,8 @@ Status = NdisMRegisterInterrupt( &Adapter->Interrupt, MiniportAdapterHandle, - Adapter->InterruptNumber, - Adapter->InterruptNumber, + Adapter->InterruptVector, + Adapter->InterruptLevel, FALSE, FALSE, NdisInterruptLatched);

1 0

[ion] 23319: - Reimplement and activate NtSetInformationThread.
by ion＠svn.reactos.org 27 Jul '06

27 Jul '06

Author: ion Date: Thu Jul 27 20:43:03 2006 New Revision: 23319 URL: http://svn.reactos.org/svn/reactos?rev=23319&view=rev Log: - Reimplement and activate NtSetInformationThread. Modified: trunk/reactos/ntoskrnl/ps/query.c Modified: trunk/reactos/ntoskrnl/ps/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/query.c?rev=23… ============================================================================== --- trunk/reactos/ntoskrnl/ps/query.c (original) +++ trunk/reactos/ntoskrnl/ps/query.c Thu Jul 27 20:43:03 2006 @@ -17,7 +17,7 @@ #include "internal/ps_i.h" /* Debugging Level */ -ULONG PspTraceLevel = PS_KILL_DEBUG | PS_REF_DEBUG; +ULONG PspTraceLevel = 0;//PS_KILL_DEBUG | PS_REF_DEBUG; /* PRIVATE FUNCTIONS *********************************************************/ @@ -703,7 +703,7 @@ } /* - * @unimplemented + * @implemented */ NTSTATUS NTAPI @@ -713,70 +713,157 @@ IN ULONG ThreadInformationLength) { PETHREAD Thread; + ULONG Access; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); - NTSTATUS Status = STATUS_SUCCESS; + NTSTATUS Status; + HANDLE TokenHandle = NULL; + KPRIORITY Priority = 0; + KAFFINITY Affinity = 0; + PVOID Address = NULL; + PEPROCESS Process; PAGED_CODE(); - DPRINT1("%s called for: %d\n", __FUNCTION__, ThreadInformationClass); - /* FIXME: This is REALLY wrong. Some types don't need THREAD_SET_INFORMATION */ - /* FIXME: We should also check for certain things before doing the reference */ + /* Verify Information Class validity */ + Status = DefaultSetInfoBufferCheck(ThreadInformationClass, + PsThreadInfoClass, + RTL_NUMBER_OF(PsThreadInfoClass), + ThreadInformation, + ThreadInformationLength, + PreviousMode); + if (!NT_SUCCESS(Status)) return Status; + + /* Check what class this is */ + Access = THREAD_SET_INFORMATION; + if (ThreadInformationClass == ThreadImpersonationToken) + { + /* Setting the impersonation token needs a special mask */ + Access = THREAD_SET_THREAD_TOKEN; + } + + /* Reference the process */ Status = ObReferenceObjectByHandle(ThreadHandle, - THREAD_SET_INFORMATION, + Access, PsThreadType, PreviousMode, (PVOID*)&Thread, NULL); - if (NT_SUCCESS(Status)) - { -#if 0 - switch (ThreadInformationClass) - { - case ThreadPriority: - - if (u.Priority < LOW_PRIORITY || u.Priority >= MAXIMUM_PRIORITY) - { - Status = STATUS_INVALID_PARAMETER; - break; - } - KeSetPriorityThread(&Thread->Tcb, u.Priority); - break; - - case ThreadBasePriority: - KeSetBasePriorityThread (&Thread->Tcb, u.Increment); - break; - - case ThreadAffinityMask: - - /* Check if this is valid */ - DPRINT1("%lx, %lx\n", Thread->ThreadsProcess->Pcb.Affinity, u.Affinity); - if ((Thread->ThreadsProcess->Pcb.Affinity & u.Affinity) != - u.Affinity) - { - DPRINT1("Wrong affinity given\n"); - Status = STATUS_INVALID_PARAMETER; - } - else - { - Status = KeSetAffinityThread(&Thread->Tcb, u.Affinity); - } - break; - - case ThreadImpersonationToken: - Status = PsAssignImpersonationToken (Thread, u.Handle); - break; - - case ThreadQuerySetWin32StartAddress: - Thread->Win32StartAddress = u.Address; - break; - - default: - /* Shoult never occure if the data table is correct */ - KEBUGCHECK(0); - } -#endif - ObDereferenceObject (Thread); - } - + if (!NT_SUCCESS(Status)) return Status; + + /* Check what kind of information class this is */ + switch (ThreadInformationClass) + { + /* Thread priority */ + case ThreadPriority: + + /* Use SEH for capture */ + _SEH_TRY + { + /* Get the priority */ + Priority = *(PLONG)ThreadInformation; + } + _SEH_HANDLE + { + /* Get the exception code */ + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if (!NT_SUCCESS(Status)) break; + + /* Set the priority */ + KeSetPriorityThread(&Thread->Tcb, Priority); + break; + + case ThreadBasePriority: + + /* Use SEH for capture */ + _SEH_TRY + { + /* Get the priority */ + Priority = *(PLONG)ThreadInformation; + } + _SEH_HANDLE + { + /* Get the exception code */ + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if (!NT_SUCCESS(Status)) break; + + /* Set the base priority */ + KeSetBasePriorityThread(&Thread->Tcb, Priority); + break; + + case ThreadAffinityMask: + + /* Use SEH for capture */ + _SEH_TRY + { + /* Get the priority */ + Affinity = *(PULONG_PTR)ThreadInformation; + } + _SEH_HANDLE + { + /* Get the exception code */ + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if (!NT_SUCCESS(Status)) break; + + /* Get the process */ + Process = Thread->ThreadsProcess; + + /* Set the affinity */ + KeSetAffinityThread(&Thread->Tcb, Affinity & Process->Pcb.Affinity); + break; + + case ThreadImpersonationToken: + + /* Use SEH for capture */ + _SEH_TRY + { + /* Save the token handle */ + TokenHandle = *(PHANDLE)ThreadInformation; + } + _SEH_HANDLE + { + /* Get the exception code */ + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if (!NT_SUCCESS(Status)) break; + + /* Assign the actual token */ + Status = PsAssignImpersonationToken(Thread, TokenHandle); + break; + + case ThreadQuerySetWin32StartAddress: + + /* Use SEH for capture */ + _SEH_TRY + { + /* Get the priority */ + Address = *(PVOID*)ThreadInformation; + } + _SEH_HANDLE + { + /* Get the exception code */ + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if (!NT_SUCCESS(Status)) break; + + /* Set the address */ + Thread->Win32StartAddress = Address; + break; + + default: + /* We don't implement it yet */ + DPRINT1("Not implemented: %lx\n", ThreadInformationClass); + Status = STATUS_NOT_IMPLEMENTED; + } + + /* Dereference and return status */ + ObDereferenceObject(Thread); return Status; }

1 0

[fireball] 23318: Add sm.exe to bootcd
by fireball＠svn.reactos.org 27 Jul '06

27 Jul '06

Author: fireball Date: Thu Jul 27 15:37:23 2006 New Revision: 23318 URL: http://svn.reactos.org/svn/reactos?rev=23318&view=rev Log: Add sm.exe to bootcd Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff Thu Jul 27 15:37:23 2006 @@ -60,7 +60,7 @@ base\applications\screensavers\matrix\matrix.scr 1 base\applications\servman\servman.exe 1 base\applications\shutdown\shutdown.exe 1 -;base\applications\sm\sm.exe 1 +base\applications\sm\sm.exe 1 base\applications\taskmgr\taskmgr.exe 1 ;base\applications\utils\rosperf\rosperf.exe 1 ;base\applications\utils\ps\ps.exe 1

1 0

[mbosma] 23317: Merge 23303
by mbosma＠svn.reactos.org 27 Jul '06

27 Jul '06

Author: mbosma Date: Thu Jul 27 15:32:03 2006 New Revision: 23317 URL: http://svn.reactos.org/svn/reactos?rev=23317&view=rev Log: Merge 23303 Modified: branches/cache_manager_rewrite/mm/process.c branches/cache_manager_rewrite/mm/section.c Modified: branches/cache_manager_rewrite/mm/process.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/proces… ============================================================================== --- branches/cache_manager_rewrite/mm/process.c (original) +++ branches/cache_manager_rewrite/mm/process.c Thu Jul 27 15:32:03 2006 @@ -472,7 +472,8 @@ NTSTATUS STDCALL MmCreateProcessAddressSpace(IN PEPROCESS Process, - IN PROS_SECTION_OBJECT Section OPTIONAL) + IN PROS_SECTION_OBJECT Section OPTIONAL, + IN POBJECT_NAME_INFORMATION *AuditName OPTIONAL) { NTSTATUS Status; PMADDRESS_SPACE ProcessAddressSpace = (PMADDRESS_SPACE)&Process->VadRoot; @@ -579,27 +580,37 @@ /* Determine the image file name and save it to EPROCESS */ DPRINT("Getting Image name\n"); FileName = Section->FileObject->FileName; - szSrc = (PWCHAR)(FileName.Buffer + (FileName.Length / sizeof(WCHAR)) - 1); - - while(szSrc >= FileName.Buffer) - { - if(*szSrc == L'\\') + szSrc = (PWCHAR)(FileName.Buffer + FileName.Length); + while (szSrc >= FileName.Buffer) + { + /* Make sure this isn't a backslash */ + if (*--szSrc == OBJ_NAME_PATH_SEPARATOR) { + /* If so, stop it here */ szSrc++; break; } else { - szSrc--; + /* Otherwise, keep going */ lnFName++; } } /* Copy the to the process and truncate it to 15 characters if necessary */ - DPRINT("Copying and truncating\n"); szDest = Process->ImageFileName; lnFName = min(lnFName, sizeof(Process->ImageFileName) - 1); - while(lnFName-- > 0) *(szDest++) = (UCHAR)*(szSrc++); + while (lnFName--) *szDest++ = (UCHAR)*szSrc++; + *szDest = UNICODE_NULL; + + /* Check if caller wants an audit name */ + if (AuditName) + { + /* Setup the audit name */ + SeInitializeProcessAuditName(Section->FileObject, + FALSE, + AuditName); + } /* Return status to caller */ return Status; Modified: branches/cache_manager_rewrite/mm/section.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/sectio… ============================================================================== --- branches/cache_manager_rewrite/mm/section.c (original) +++ branches/cache_manager_rewrite/mm/section.c Thu Jul 27 15:32:03 2006 @@ -132,6 +132,17 @@ NTAPI MmGetPageEntrySectionSegment(PMM_SECTION_SEGMENT Segment, ULONG Offset); + +PFILE_OBJECT +NTAPI +MmGetFileObjectForSection(IN PROS_SECTION_OBJECT Section) +{ + PAGED_CODE(); + ASSERT(Section); + + /* Return the file object */ + return Section->FileObject; // Section->ControlArea->FileObject on NT +} /* Note: Mmsp prefix denotes "Memory Manager Section Private". */

1 0

[mbosma] 23316: Merge 23302
by mbosma＠svn.reactos.org 27 Jul '06

27 Jul '06

Author: mbosma Date: Thu Jul 27 15:24:36 2006 New Revision: 23316 URL: http://svn.reactos.org/svn/reactos?rev=23316&view=rev Log: Merge 23302 Modified: branches/cache_manager_rewrite/vfat/finfo.c Modified: branches/cache_manager_rewrite/vfat/finfo.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/vfat/finf… ============================================================================== --- branches/cache_manager_rewrite/vfat/finfo.c (original) +++ branches/cache_manager_rewrite/vfat/finfo.c Thu Jul 27 15:24:36 2006 @@ -341,14 +341,13 @@ ASSERT(NameInfo != NULL); ASSERT(FCB != NULL); - if (*BufferLength < sizeof(FILE_NAME_INFORMATION) + FCB->PathNameU.Length + sizeof(WCHAR)) + NameInfo->FileNameLength = FCB->PathNameU.Length; + if (*BufferLength < FIELD_OFFSET(FILE_NAME_INFORMATION, FileName[0]) + FCB->PathNameU.Length) return STATUS_BUFFER_OVERFLOW; - NameInfo->FileNameLength = FCB->PathNameU.Length; RtlCopyMemory(NameInfo->FileName, FCB->PathNameU.Buffer, FCB->PathNameU.Length); - NameInfo->FileName[FCB->PathNameU.Length / sizeof(WCHAR)] = 0; - - *BufferLength -= (sizeof(FILE_NAME_INFORMATION) + FCB->PathNameU.Length + sizeof(WCHAR)); + + *BufferLength -= (FIELD_OFFSET(FILE_NAME_INFORMATION, FileName[0]) + FCB->PathNameU.Length); return STATUS_SUCCESS; }

1 0

[fireball] 23315: Fix sm.exe's compilation
by fireball＠svn.reactos.org 27 Jul '06

27 Jul '06

Author: fireball Date: Thu Jul 27 15:03:36 2006 New Revision: 23315 URL: http://svn.reactos.org/svn/reactos?rev=23315&view=rev Log: Fix sm.exe's compilation Modified: trunk/reactos/base/applications/applications.rbuild trunk/reactos/base/applications/sm/sm.rbuild Modified: trunk/reactos/base/applications/applications.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/applicat… ============================================================================== --- trunk/reactos/base/applications/applications.rbuild (original) +++ trunk/reactos/base/applications/applications.rbuild Thu Jul 27 15:03:36 2006 @@ -43,6 +43,9 @@ <directory name="sc"> <xi:include href="sc/sc.rbuild" /> </directory> +<directory name="sm"> + <xi:include href="sm/sm.rbuild" /> +</directory> <directory name="screensavers"> <xi:include href="screensavers/screensavers.rbuild" /> </directory> Modified: trunk/reactos/base/applications/sm/sm.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sm/sm.rb… ============================================================================== --- trunk/reactos/base/applications/sm/sm.rbuild (original) +++ trunk/reactos/base/applications/sm/sm.rbuild Thu Jul 27 15:03:36 2006 @@ -1,5 +1,6 @@ <module name="sm" type="win32cui" installbase="system32" installname="sm.exe"> <include base="sm">.</include> + <include base="ReactOS">include/reactos/subsys</include> <define name="__USE_W32API" /> <define name="ANONYMOUSUNIONS" /> <library>smdll</library>

1 0

[greatlrd] 23314: forgot the file. patch from LMH1 : Bug#: 1682 : Norwegian translation note : sm are not include in building process, the source code have got begin to be rotten, it can not longer be build. shall we delete it ? or shall some look into and make it work again, I am not voluntary todo either of it. some else for todo that.
by greatlrd＠svn.reactos.org 27 Jul '06

27 Jul '06

Author: greatlrd Date: Thu Jul 27 12:36:37 2006 New Revision: 23314 URL: http://svn.reactos.org/svn/reactos?rev=23314&view=rev Log: forgot the file. patch from LMH1 : Bug#: 1682 : Norwegian translation note : sm are not include in building process, the source code have got begin to be rotten, it can not longer be build. shall we delete it ? or shall some look into and make it work again, I am not voluntary todo either of it. some else for todo that. Added: trunk/reactos/base/applications/sm/No.rc Added: trunk/reactos/base/applications/sm/No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sm/No.rc… ============================================================================== --- trunk/reactos/base/applications/sm/No.rc (added) +++ trunk/reactos/base/applications/sm/No.rc Thu Jul 27 12:36:37 2006 @@ -1,0 +1,55 @@ +#include "resource.h" +/* + * Moved all hardcoded strings to En.rc. + * By Magnus Olsen 2005 magnus(a)itkonsult-olsen.com + */ + +LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL +STRINGTABLE DISCARDABLE +{ +IDS_boot, "oppstart subsystem_name" + +IDS_help, "hjelp [kommando]" + +IDS_info, "informasjon [undersystem_id]" + +IDS_reboot, "restarter undersystem_id" + +IDS_shutdown,"avslutter undersystem_id" + + + +IDS_boot_msg, "bootstrap en valgfri miljø under-system;" + +IDS_help_msg, "skrive ut hjelp for kommando;" + +IDS_info_msg, "skrive ut informasjon om en oppstart under-system\n\ +hvis subsystem_id er omitted, en liste av oppstart\n\ +miljø under-system er skrivet ut." + +IDS_reboot_msg, "restart en valgfri miljø under-system;" +IDS_shutdown_msg, "avslutt en valgfri miljø under-system;" + +IDS_Unknown, "Ukjent kommando '%s'.\n" + +IDS_SM1, "SM SubSystem Directory\n\n\ +SSID PID Flags\n\ +---- -------- ------------\n" + +IDS_SM2, "%04x %08lx %04x\n" + +IDS_ID, "under-System ID: %d\n\ + flagg: %04x\n\ + Prosess ID: %ld\n" + +IDS_Not_Imp, "ikke implementert\n" + +IDS_Mangers, "ReactOS/Win32 - Session Manager Control Tool\n\n" + +IDS_USING, "anvendelse:\n\ +\tsm\n\ +\tsm help [command]\n\ +\tsm command [arguments]\n\n'sm hjelp' vil trykke listen av gyldig kommando.\n" + +IDS_FAILS_MNG, "Mislykket å koble til Session Manager! (Status=0x%08lx)\n" +}

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