Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ros-arm-bringup] 44841: NMI Support Patch 1: [HAL]: The I/O Permissions Map on a typical Privileged Mode x86 OS is all 0xFF's, so it's quite wasteful to copy-in/out the entire map each single BIOS Call. As an optimization, only save and restore non-0xFF entries. [NTOS]: Define and use constants for different IOPM values, instead of using hardcoded values.
by ros-arm-bringup＠svn.reactos.org 31 Dec '09

31 Dec '09

Author: ros-arm-bringup Date: Fri Jan 1 00:51:26 2010 New Revision: 44841 URL: http://svn.reactos.org/svn/reactos?rev=44841&view=rev Log: NMI Support Patch 1: [HAL]: The I/O Permissions Map on a typical Privileged Mode x86 OS is all 0xFF's, so it's quite wasteful to copy-in/out the entire map each single BIOS Call. As an optimization, only save and restore non-0xFF entries. [NTOS]: Define and use constants for different IOPM values, instead of using hardcoded values. Modified: trunk/reactos/hal/halx86/generic/bios.c trunk/reactos/include/ndk/i386/ketypes.h trunk/reactos/ntoskrnl/ke/i386/cpu.c Modified: trunk/reactos/hal/halx86/generic/bios.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/bios.c?… ============================================================================== --- trunk/reactos/hal/halx86/generic/bios.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/bios.c [iso-8859-1] Fri Jan 1 00:51:26 2010 @@ -1,9 +1,9 @@ /* - * PROJECT: ReactOS HAL - * LICENSE: GPL - See COPYING in the top level directory - * FILE: hal/halx86/generic/bios.c + * PROJECT: ReactOS Hardware Abstraction Layer (HAL) + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: halx86/generic/bios.c * PURPOSE: BIOS Access Routines - * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + * PROGRAMMERS: ReactOS Portable Systems Group */ /* INCLUDES *******************************************************************/ @@ -14,14 +14,15 @@ /* GLOBALS ********************************************************************/ -UCHAR HalpIopmSaveBuffer[0x2000]; ULONG HalpSavedPfn; HARDWARE_PTE HalpSavedPte; ULONG HalpGpfHandler; ULONG HalpBopHandler; +ULONG HalpSavedEsp0; USHORT HalpSavedIopmBase; -PUCHAR HalpSavedIoMap; -ULONG HalpSavedEsp0; +PUSHORT HalpSavedIoMap; +USHORT HalpSavedIoMapData[32][2]; +ULONG HalpSavedIoMapEntries; #define GetPdeAddress(x) (PHARDWARE_PTE)(((((ULONG_PTR)(x)) >> 22) << 2) + 0xC0300000) #define GetPteAddress(x) (PHARDWARE_PTE)(((((ULONG_PTR)(x)) >> 12) << 2) + 0xC0000000) @@ -30,27 +31,61 @@ VOID NTAPI -HalpStoreAndClearIopm(IN PUCHAR IoMap) -{ - ULONG i; - - /* Backup the old I/O Map */ - RtlCopyMemory(HalpIopmSaveBuffer, IoMap, 0x2000); - - /* Erase the current one */ - for (i = 0; i < 0x2000; i++) IoMap[i] = 0; - for (i = 0x2000; i < 0x2004; i++) IoMap[i] = 0xFF; -} - -VOID -NTAPI -HalpRestoreIopm(IN PUCHAR IoMap) -{ - ULONG i; - - /* Restore the backed up copy, and initialize it */ - RtlCopyMemory(IoMap, HalpIopmSaveBuffer, 0x2000); - for (i = 0x2000; i < 0x2004; i++) IoMap[i] = 0xFF; +HalpStoreAndClearIopm(VOID) +{ + ULONG i, j; + PUSHORT Entry = HalpSavedIoMap; + + // + // Loop the I/O Map + // + for (i = j = 0; i < (IOPM_SIZE) / 2; i++) + { + // + // Check for non-FFFF entry + // + if (*Entry != 0xFFFF) + { + // + // Save it + // + ASSERT(j < 32); + HalpSavedIoMapData[j][0] = i; + HalpSavedIoMapData[j][1] = *Entry; + } + + // + // Clear it + // + *Entry++ = 0; + } + + // + // Terminate it + // + while (i++ < (IOPM_FULL_SIZE / 2)) *Entry++ = 0xFFFF; + + // + // Return the entries we saved + // + HalpSavedIoMapEntries = j; +} + +VOID +NTAPI +HalpRestoreIopm(VOID) +{ + ULONG i = HalpSavedIoMapEntries; + + // + // Set default state + // + RtlFillMemory(HalpSavedIoMap, 0xFF, IOPM_FULL_SIZE); + + // + // Restore the backed up copy, and initialize it + // + while (i--) HalpSavedIoMap[HalpSavedIoMapData[i][0]] = HalpSavedIoMapData[i][1]; } VOID @@ -134,8 +169,8 @@ HalpSetupRealModeIoPermissionsAndTask(VOID) { /* Save a copy of the I/O Map and delete it */ - HalpSavedIoMap = (PUCHAR)&(KeGetPcr()->TSS->IoMaps[0]); - HalpStoreAndClearIopm(HalpSavedIoMap); + HalpSavedIoMap = (PUSHORT)&(KeGetPcr()->TSS->IoMaps[0]); + HalpStoreAndClearIopm(); /* Save the IOPM and switch to the real-mode one */ HalpSavedIopmBase = KeGetPcr()->TSS->IoMapBase; @@ -166,7 +201,7 @@ KeGetPcr()->TSS->Esp0 = HalpSavedEsp0; /* Restore the I/O Map */ - HalpRestoreIopm(HalpSavedIoMap); + HalpRestoreIopm(); /* Restore the IOPM */ KeGetPcr()->TSS->IoMapBase = HalpSavedIopmBase; Modified: trunk/reactos/include/ndk/i386/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/i386/ketypes.h… ============================================================================== --- trunk/reactos/include/ndk/i386/ketypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/i386/ketypes.h [iso-8859-1] Fri Jan 1 00:51:26 2010 @@ -129,7 +129,11 @@ // // IOPM Definitions // +#define IOPM_COUNT 1 +#define IOPM_SIZE 8192 +#define IOPM_FULL_SIZE 8196 #define IO_ACCESS_MAP_NONE 0 +#define IOPM_DIRECTION_MAP_SIZE 32 #define IOPM_OFFSET FIELD_OFFSET(KTSS, IoMaps[0].IoMap) #define KiComputeIopmOffset(MapNumber) \ (MapNumber == IO_ACCESS_MAP_NONE) ? \ @@ -708,8 +712,8 @@ // typedef struct _KiIoAccessMap { - UCHAR DirectionMap[32]; - UCHAR IoMap[8196]; + UCHAR DirectionMap[IOPM_DIRECTION_MAP_SIZE]; + UCHAR IoMap[IOPM_FULL_SIZE]; } KIIO_ACCESS_MAP; typedef struct _KTSS @@ -747,8 +751,8 @@ USHORT Reserved8; USHORT Flags; USHORT IoMapBase; - KIIO_ACCESS_MAP IoMaps[1]; - UCHAR IntDirectionMap[32]; + KIIO_ACCESS_MAP IoMaps[IOPM_COUNT]; + UCHAR IntDirectionMap[IOPM_DIRECTION_MAP_SIZE]; } KTSS, *PKTSS; // Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/cpu.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] Fri Jan 1 00:51:26 2010 @@ -582,11 +582,12 @@ } /* Now clear the I/O Map */ - RtlFillMemory(Tss->IoMaps[0].IoMap, 8096, -1); + ASSERT(IOPM_COUNT == 1); + RtlFillMemory(Tss->IoMaps[0].IoMap, IOPM_FULL_SIZE, 0xFF); /* Initialize Interrupt Direction Maps */ p = (PUCHAR)(Tss->IoMaps[0].DirectionMap); - RtlZeroMemory(p, 32); + RtlZeroMemory(p, IOPM_DIRECTION_MAP_SIZE); /* Add DPMI support for interrupts */ p[0] = 4; @@ -595,7 +596,7 @@ /* Initialize the default Interrupt Direction Map */ p = Tss->IntDirectionMap; - RtlZeroMemory(Tss->IntDirectionMap, 32); + RtlZeroMemory(Tss->IntDirectionMap, IOPM_DIRECTION_MAP_SIZE); /* Add DPMI support */ p[0] = 4;

1 0

[tkreuzer] 44840: [HAL] Replace the asm implementations of HalpAcquireSystemHardwareSpinLock and HalpReleaseCmosSpinLock with C implementations. The old ones didn't work on SMP, as they were only compiled once as UP.
by tkreuzer＠svn.reactos.org 31 Dec '09

31 Dec '09

Author: tkreuzer Date: Fri Jan 1 00:45:36 2010 New Revision: 44840 URL: http://svn.reactos.org/svn/reactos?rev=44840&view=rev Log: [HAL] Replace the asm implementations of HalpAcquireSystemHardwareSpinLock and HalpReleaseCmosSpinLock with C implementations. The old ones didn't work on SMP, as they were only compiled once as UP. Modified: branches/ros-amd64-bringup/reactos/hal/halx86/generic/amd64/systimer.S branches/ros-amd64-bringup/reactos/hal/halx86/generic/cmos.c branches/ros-amd64-bringup/reactos/hal/halx86/generic/i386/systimer.S Modified: branches/ros-amd64-bringup/reactos/hal/halx86/generic/amd64/systimer.S URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halx86/generic/amd64/systimer.S [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halx86/generic/amd64/systimer.S [iso-8859-1] Fri Jan 1 00:45:36 2010 @@ -14,9 +14,6 @@ .data -_UnhandledMsg: - .asciz "\n\x7\x7!!! Unhandled or Unexpected Code at line: %lx!!!\n" - .global _MsgUnimplemented _MsgUnimplemented: .asciz "WARNING: %s at %s:%d is UNIMPLEMENTED!\n" @@ -26,18 +23,6 @@ .text .code64 - -.global _HalpReleaseCmosSpinLock -.func HalpReleaseCmosSpinLock -_HalpReleaseCmosSpinLock: - -.endfunc - -.global _HalpAcquireSystemHardwareSpinLock -.func HalpAcquireSystemHardwareSpinLock -_HalpAcquireSystemHardwareSpinLock: - -.endfunc .global _HalpCalibrateStallExecution@0 .func HalpCalibrateStallExecution@0 Modified: branches/ros-amd64-bringup/reactos/hal/halx86/generic/cmos.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halx86/generic/cmos.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halx86/generic/cmos.c [iso-8859-1] Fri Jan 1 00:45:36 2010 @@ -5,6 +5,7 @@ * PURPOSE: CMOS Access Routines (Real Time Clock and LastKnownGood) * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) * Eric Kohl (ekohl(a)abo.rhein-zeitung.de) + * Timo Kreuzer (timo.kreuzer(a)reactos.org) */ /* INCLUDES ******************************************************************/ @@ -17,8 +18,50 @@ KSPIN_LOCK HalpSystemHardwareLock; UCHAR HalpCmosCenturyOffset; +ULONG HalpSystemHardwareFlags; /* PRIVATE FUNCTIONS *********************************************************/ + +VOID +NTAPI +HalpAcquireSystemHardwareSpinLock(VOID) +{ + ULONG Flags; + + /* Get flags and disable interrupts */ + Flags = __readeflags(); + _disable(); + + /* Try to acquire the lock */ + while (InterlockedBitTestAndSet((PLONG)&HalpSystemHardwareLock, 0)) + { + /* Lock is held, short wait and try again */ + YieldProcessor(); + } + + /* We have the lock, save the flags now */ + HalpSystemHardwareFlags = Flags; +} + +VOID +NTAPI +HalpReleaseCmosSpinLock(VOID) +{ + ULONG Flags; + + /* Get the flags */ + Flags = HalpSystemHardwareFlags; + + /* Release lock and check if we owned it */ + if (!InterlockedBitTestAndReset((PLONG)&HalpSystemHardwareLock, 0)) + { + /* The spin lock was not owned! */ + KeBugCheckEx(SPIN_LOCK_NOT_OWNED, 0, 0, 0, 0); + } + + /* Restore the flags */ + __writeeflags(Flags); +} FORCEINLINE UCHAR Modified: branches/ros-amd64-bringup/reactos/hal/halx86/generic/i386/systimer.S URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halx86/generic/i386/systimer.S [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halx86/generic/i386/systimer.S [iso-8859-1] Fri Jan 1 00:45:36 2010 @@ -17,82 +17,11 @@ _HalpLastPerfCounterHigh: .long 0 _HalpPerfCounterLow: .long 0 _HalpPerfCounterHigh: .long 0 -_HalpSystemHardwareFlags: .long 0 _UnhandledMsg: .asciz "\n\x7\x7!!! Unhandled or Unexpected Code at line: %lx!!!\n" /* FUNCTIONS *****************************************************************/ - -.global _HalpReleaseCmosSpinLock@0 -.func HalpReleaseCmosSpinLock@0 -_HalpReleaseCmosSpinLock@0: - -#ifdef CONFIG_SMP - /* Save clobbered register */ - push eax - - /* Push saved EFLAGS */ - push _HalpSystemHardwareFlags - - /* Release the lock */ - lea eax, _HalpSystemHardwareLock - RELEASE_SPINLOCK(eax) - - /* Restore EFLAGS */ - popf - - /* Return */ - pop eax - ret -#else - /* Restore EFLAGS and return */ - push _HalpSystemHardwareFlags - popf - ret -#endif - -.endfunc - -.global _HalpAcquireSystemHardwareSpinLock@0 -.func HalpAcquireSystemHardwareSpinLock@0 -_HalpAcquireSystemHardwareSpinLock@0: - -#ifdef CONFIG_SMP - /* Save clobbered register */ - push eax - -HardwareLock: - /* Save EFLAGS and disable interrupts */ - pushf - cli - - /* This is the CMOS lock, acquire it */ - lea eax, _HalpSystemHardwareLock - ACQUIRE_SPINLOCK(eax, CmosSpin) - - /* We have it, return the flags */ - pop _HalpSystemHardwareFlags - pop eax - ret - -CmosSpin: - - /* Restore EFLAGS */ - pushf _HalpSystemHardwareLock - popf - - /* Spin */ - SPIN_ON_LOCK(eax, HardwareLock) -#else - /* Save EFLAGS, disable interrupts and return */ - pushf - cli - pop _HalpSystemHardwareFlags - ret -#endif - -.endfunc .global _HalpCalibrateStallExecution@0 .func HalpCalibrateStallExecution@0

1 0

[cgutman] 44839: [TCPIP, IP] - Completely rewrite (again) the locking code and use references to ensure that the connection doesn't get freed while completing requests (the most frequent cause of crashes) - Remove DrainSignals and complete requests inside HandleSignalledConnection instead of doing them in a separate thread (increases speed a lot) [OSKITTCP] - Don't clear the socket context in OskitTCPClose because we would end up in HandleSignalledConnection without a connection (which we don't
by cgutman＠svn.reactos.org 31 Dec '09

31 Dec '09

Author: cgutman Date: Fri Jan 1 00:33:24 2010 New Revision: 44839 URL: http://svn.reactos.org/svn/reactos?rev=44839&view=rev Log: [TCPIP, IP] - Completely rewrite (again) the locking code and use references to ensure that the connection doesn't get freed while completing requests (the most frequent cause of crashes) - Remove DrainSignals and complete requests inside HandleSignalledConnection instead of doing them in a separate thread (increases speed a lot) [OSKITTCP] - Don't clear the socket context in OskitTCPClose because we would end up in HandleSignalledConnection without a connection (which we don't support anymore after eliminating DrainSignals) - Change the check performed to see if a socket is dying so we support connection dying after calling OskitTCPClose [AFD] - Remove leftover ASSERTs which fail after the changes to tcpip (they were wrong in the first place because we call into tcpip at DISPATCH_LEVEL sometimes) Modified: branches/aicom-network-branch/drivers/network/afd/afd/read.c branches/aicom-network-branch/drivers/network/afd/afd/write.c branches/aicom-network-branch/drivers/network/afd/include/debug.h branches/aicom-network-branch/drivers/network/tcpip/include/tcp.h branches/aicom-network-branch/drivers/network/tcpip/include/titypes.h branches/aicom-network-branch/drivers/network/tcpip/tcpip/dispatch.c branches/aicom-network-branch/drivers/network/tcpip/tcpip/fileobjs.c branches/aicom-network-branch/lib/drivers/ip/transport/datagram/datagram.c branches/aicom-network-branch/lib/drivers/ip/transport/rawip/rawip.c branches/aicom-network-branch/lib/drivers/ip/transport/tcp/accept.c branches/aicom-network-branch/lib/drivers/ip/transport/tcp/event.c branches/aicom-network-branch/lib/drivers/ip/transport/tcp/tcp.c branches/aicom-network-branch/lib/drivers/ip/transport/udp/udp.c branches/aicom-network-branch/lib/drivers/oskittcp/oskittcp/interface.c branches/aicom-network-branch/lib/drivers/oskittcp/oskittcp/sleep.c Modified: branches/aicom-network-branch/drivers/network/afd/afd/read.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/drivers/ne… ============================================================================== --- branches/aicom-network-branch/drivers/network/afd/afd/read.c [iso-8859-1] (original) +++ branches/aicom-network-branch/drivers/network/afd/afd/read.c [iso-8859-1] Fri Jan 1 00:33:24 2010 @@ -189,8 +189,6 @@ AFD_DbgPrint(MID_TRACE,("Called\n")); - ASSERT_IRQL(APC_LEVEL); - if( !SocketAcquireStateLock( FCB ) ) return STATUS_FILE_CLOSED; Modified: branches/aicom-network-branch/drivers/network/afd/afd/write.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/drivers/ne… ============================================================================== --- branches/aicom-network-branch/drivers/network/afd/afd/write.c [iso-8859-1] (original) +++ branches/aicom-network-branch/drivers/network/afd/afd/write.c [iso-8859-1] Fri Jan 1 00:33:24 2010 @@ -37,8 +37,6 @@ AFD_DbgPrint(MID_TRACE,("Called, status %x, %d bytes used\n", Irp->IoStatus.Status, Irp->IoStatus.Information)); - - ASSERT_IRQL(APC_LEVEL); if( !SocketAcquireStateLock( FCB ) ) return STATUS_FILE_CLOSED; Modified: branches/aicom-network-branch/drivers/network/afd/include/debug.h URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/drivers/ne… ============================================================================== --- branches/aicom-network-branch/drivers/network/afd/include/debug.h [iso-8859-1] (original) +++ branches/aicom-network-branch/drivers/network/afd/include/debug.h [iso-8859-1] Fri Jan 1 00:33:24 2010 @@ -53,13 +53,10 @@ #define ASSERT(x) if (!(x)) { AFD_DbgPrint(MIN_TRACE, ("Assertion "#x" failed at %s:%d\n", __FILE__, __LINE__)); DbgBreakPoint(); } #endif /* NASSERT */ -#define ASSERT_IRQL(x) ASSERT(KeGetCurrentIrql() <= (x)) - #else /* DBG */ #define AFD_DbgPrint(_t_, _x_) -#define ASSERT_IRQL(x) #define ASSERTKM(x) #ifndef ASSERT #define ASSERT(x) @@ -70,7 +67,6 @@ #undef assert #define assert(x) ASSERT(x) -#define assert_irql(x) ASSERT_IRQL(x) #ifdef _MSC_VER Modified: branches/aicom-network-branch/drivers/network/tcpip/include/tcp.h URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/drivers/ne… ============================================================================== --- branches/aicom-network-branch/drivers/network/tcpip/include/tcp.h [iso-8859-1] (original) +++ branches/aicom-network-branch/drivers/network/tcpip/include/tcp.h [iso-8859-1] Fri Jan 1 00:33:24 2010 @@ -62,6 +62,7 @@ typedef struct _CLIENT_DATA { BOOLEAN Unlocked; KSPIN_LOCK Lock; + KIRQL OldIrql; } CLIENT_DATA, *PCLIENT_DATA; /* Retransmission timeout constants */ Modified: branches/aicom-network-branch/drivers/network/tcpip/include/titypes.h URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/drivers/ne… ============================================================================== --- branches/aicom-network-branch/drivers/network/tcpip/include/titypes.h [iso-8859-1] (original) +++ branches/aicom-network-branch/drivers/network/tcpip/include/titypes.h [iso-8859-1] Fri Jan 1 00:33:24 2010 @@ -7,79 +7,63 @@ #ifndef __TITYPES_H #define __TITYPES_H - -#if DBG - -#define DEBUG_REFCHECK(Object) { \ - if ((Object)->RefCount <= 0) { \ - TI_DbgPrint(MIN_TRACE, ("Object at (0x%X) has invalid reference count (%d).\n", \ - (Object), (Object)->RefCount)); \ - } \ -} - /* * VOID ReferenceObject( * PVOID Object) */ -#define ReferenceObject(Object) \ -{ \ - CHAR c1, c2, c3, c4; \ - \ - c1 = ((Object)->Tag >> 24) & 0xFF; \ - c2 = ((Object)->Tag >> 16) & 0xFF; \ - c3 = ((Object)->Tag >> 8) & 0xFF; \ - c4 = ((Object)->Tag & 0xFF); \ - \ - DEBUG_REFCHECK(Object); \ - TI_DbgPrint(DEBUG_REFCOUNT, ("Referencing object of type (%c%c%c%c) at (0x%X). RefCount (%d).\n", \ - c4, c3, c2, c1, (Object), (Object)->RefCount)); \ - \ - InterlockedIncrement(&((Object)->RefCount)); \ -} - - /* +#define ReferenceObject(Object) \ +{ \ + InterlockedIncrement(&((Object)->RefCount)); \ +} + +/* * VOID DereferenceObject( * PVOID Object) */ -#define DereferenceObject(Object) \ -{ \ - CHAR c1, c2, c3, c4; \ - \ - c1 = ((Object)->Tag >> 24) & 0xFF; \ - c2 = ((Object)->Tag >> 16) & 0xFF; \ - c3 = ((Object)->Tag >> 8) & 0xFF; \ - c4 = ((Object)->Tag & 0xFF); \ - \ - DEBUG_REFCHECK(Object); \ - TI_DbgPrint(DEBUG_REFCOUNT, ("Dereferencing object of type (%c%c%c%c) at (0x%X). RefCount (%d).\n", \ - c4, c3, c2, c1, (Object), (Object)->RefCount)); \ - \ - if (InterlockedDecrement(&((Object)->RefCount)) == 0) \ - (((Object)->Free)(Object)); \ -} - -#else /* DBG */ - -/* - * VOID ReferenceObject( - * PVOID Object) - */ -#define ReferenceObject(Object) \ -{ \ - InterlockedIncrement(&((Object)->RefCount)); \ -} - -/* - * VOID DereferenceObject( - * PVOID Object) - */ -#define DereferenceObject(Object) \ -{ \ - if (InterlockedDecrement(&((Object)->RefCount)) == 0) \ - (((Object)->Free)(Object)); \ -} - -#endif /* DBG */ +#define DereferenceObject(Object) \ +{ \ + if (InterlockedDecrement(&((Object)->RefCount)) == 0) \ + (((Object)->Free)(Object)); \ +} + +/* + * VOID LockObject(PVOID Object, PKIRQL OldIrql) + */ +#define LockObject(Object, Irql) \ +{ \ + ReferenceObject(Object); \ + KeAcquireSpinLock(&((Object)->Lock), Irql); \ + memcpy(&(Object)->OldIrql, Irql, sizeof(KIRQL)); \ +} + +/* + * VOID LockObjectAtDpcLevel(PVOID Object) + */ +#define LockObjectAtDpcLevel(Object) \ +{ \ + ReferenceObject(Object); \ + KeAcquireSpinLockAtDpcLevel(&((Object)->Lock)); \ + (Object)->OldIrql = DISPATCH_LEVEL; \ +} + +/* + * VOID UnlockObject(PVOID Object, KIRQL OldIrql) + */ +#define UnlockObject(Object, OldIrql) \ +{ \ + KeReleaseSpinLock(&((Object)->Lock), OldIrql); \ + DereferenceObject(Object); \ +} + +/* + * VOID UnlockObjectFromDpcLevel(PVOID Object) + */ +#define UnlockObjectFromDpcLevel(Object) \ +{ \ + KeReleaseSpinLockFromDpcLevel(&((Object)->Lock)); \ + DereferenceObject(Object); \ +} + #include <ip.h> @@ -143,8 +127,10 @@ field holds a pointer to this structure */ typedef struct _ADDRESS_FILE { LIST_ENTRY ListEntry; /* Entry on list */ + LONG RefCount; /* Reference count */ + OBJECT_FREE_ROUTINE Free; /* Routine to use to free resources for the object */ KSPIN_LOCK Lock; /* Spin lock to manipulate this structure */ - OBJECT_FREE_ROUTINE Free; /* Routine to use to free resources for the object */ + KIRQL OldIrql; /* Currently not used */ IP_ADDRESS Address; /* Address of this address file */ USHORT Family; /* Address family */ USHORT Protocol; /* Protocol number */ @@ -264,7 +250,10 @@ to this structure */ typedef struct _CONNECTION_ENDPOINT { LIST_ENTRY ListEntry; /* Entry on list */ + LONG RefCount; /* Reference count */ + OBJECT_FREE_ROUTINE Free; /* Routine to use to free resources for the object */ KSPIN_LOCK Lock; /* Spin lock to protect this structure */ + KIRQL OldIrql; /* The old irql is stored here for use in HandleSignalledConnection */ PVOID ClientContext; /* Pointer to client context information */ PADDRESS_FILE AddressFile; /* Associated address file object (NULL if none) */ PVOID SocketContext; /* Context for lower layer */ @@ -290,6 +279,8 @@ field holds a pointer to this structure */ typedef struct _CONTROL_CHANNEL { LIST_ENTRY ListEntry; /* Entry on list */ + LONG RefCount; /* Reference count */ + OBJECT_FREE_ROUTINE Free; /* Routine to use to free resources for the object */ KSPIN_LOCK Lock; /* Spin lock to protect this structure */ } CONTROL_CHANNEL, *PCONTROL_CHANNEL; Modified: branches/aicom-network-branch/drivers/network/tcpip/tcpip/dispatch.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/drivers/ne… ============================================================================== --- branches/aicom-network-branch/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] (original) +++ branches/aicom-network-branch/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] Fri Jan 1 00:33:24 2010 @@ -89,21 +89,10 @@ * Count = Number of bytes sent or received */ { - PIRP Irp; - PIO_STACK_LOCATION IrpSp; - KIRQL OldIrql; + PIRP Irp = Context; TI_DbgPrint(DEBUG_IRP, ("Called for irp %x (%x, %d).\n", - Context, Status, Count)); - - Irp = Context; - IrpSp = IoGetCurrentIrpStackLocation(Irp); - - IoAcquireCancelSpinLock(&OldIrql); - - (void)IoSetCancelRoutine(Irp, NULL); - - IoReleaseCancelSpinLock(OldIrql); + Irp, Status, Count)); Irp->IoStatus.Status = Status; Irp->IoStatus.Information = Count; @@ -309,18 +298,18 @@ return STATUS_INVALID_PARAMETER; } - KeAcquireSpinLock(&Connection->Lock, &OldIrql); + LockObject(Connection, &OldIrql); if (Connection->AddressFile) { ObDereferenceObject(FileObject); - KeReleaseSpinLock(&Connection->Lock, OldIrql); + UnlockObject(Connection, OldIrql); TI_DbgPrint(MID_TRACE, ("An address file is already asscociated.\n")); return STATUS_INVALID_PARAMETER; } if (FileObject->FsContext2 != (PVOID)TDI_TRANSPORT_ADDRESS_FILE) { ObDereferenceObject(FileObject); - KeReleaseSpinLock(&Connection->Lock, OldIrql); + UnlockObject(Connection, OldIrql); TI_DbgPrint(MID_TRACE, ("Bad address file object. Magic (0x%X).\n", FileObject->FsContext2)); return STATUS_INVALID_PARAMETER; @@ -331,31 +320,33 @@ TranContext = FileObject->FsContext; if (!TranContext) { ObDereferenceObject(FileObject); - KeReleaseSpinLock(&Connection->Lock, OldIrql); + UnlockObject(Connection, OldIrql); TI_DbgPrint(MID_TRACE, ("Bad transport context.\n")); return STATUS_INVALID_PARAMETER; } AddrFile = (PADDRESS_FILE)TranContext->Handle.AddressHandle; if (!AddrFile) { - KeReleaseSpinLock(&Connection->Lock, OldIrql); + UnlockObject(Connection, OldIrql); ObDereferenceObject(FileObject); TI_DbgPrint(MID_TRACE, ("No address file object.\n")); return STATUS_INVALID_PARAMETER; } - KeAcquireSpinLockAtDpcLevel(&AddrFile->Lock); - + LockObjectAtDpcLevel(AddrFile); + + ReferenceObject(AddrFile); Connection->AddressFile = AddrFile; /* Add connection endpoint to the address file */ + ReferenceObject(Connection); AddrFile->Connection = Connection; /* FIXME: Maybe do this in DispTdiDisassociateAddress() instead? */ ObDereferenceObject(FileObject); - KeReleaseSpinLockFromDpcLevel(&AddrFile->Lock); - KeReleaseSpinLock(&Connection->Lock, OldIrql); + UnlockObjectFromDpcLevel(AddrFile); + UnlockObject(Connection, OldIrql); return Status; } @@ -457,25 +448,27 @@ return STATUS_INVALID_PARAMETER; } - KeAcquireSpinLock(&Connection->Lock, &OldIrql); + LockObject(Connection, &OldIrql); if (!Connection->AddressFile) { - KeReleaseSpinLock(&Connection->Lock, OldIrql); + UnlockObject(Connection, OldIrql); TI_DbgPrint(MID_TRACE, ("No address file is asscociated.\n")); return STATUS_INVALID_PARAMETER; } - KeAcquireSpinLockAtDpcLevel(&Connection->AddressFile->Lock); + LockObjectAtDpcLevel(Connection->AddressFile); /* Remove this connection from the address file */ + DereferenceObject(Connection->AddressFile->Connection); Connection->AddressFile->Connection = NULL; - KeReleaseSpinLockFromDpcLevel(&Connection->AddressFile->Lock); + UnlockObjectFromDpcLevel(Connection->AddressFile); /* Remove the address file from this connection */ + DereferenceObject(Connection->AddressFile); Connection->AddressFile = NULL; - KeReleaseSpinLock(&Connection->Lock, OldIrql); + UnlockObject(Connection, OldIrql); return STATUS_SUCCESS; } @@ -584,17 +577,17 @@ Irp, (PDRIVER_CANCEL)DispCancelListenRequest); - KeAcquireSpinLock(&Connection->Lock, &OldIrql); + LockObject(Connection, &OldIrql); if (Connection->AddressFile == NULL) { TI_DbgPrint(MID_TRACE, ("No associated address file\n")); - KeReleaseSpinLock(&Connection->Lock, OldIrql); + UnlockObject(Connection, OldIrql); Status = STATUS_INVALID_PARAMETER; goto done; } - KeAcquireSpinLockAtDpcLevel(&Connection->AddressFile->Lock); + LockObjectAtDpcLevel(Connection->AddressFile); /* Listening will require us to create a listening socket and store it in * the address file. It will be signalled, and attempt to complete an irp @@ -609,6 +602,7 @@ Status = STATUS_NO_MEMORY; if( NT_SUCCESS(Status) ) { + ReferenceObject(Connection->AddressFile); Connection->AddressFile->Listener->AddressFile = Connection->AddressFile; @@ -632,8 +626,8 @@ Irp ); } - KeReleaseSpinLockFromDpcLevel(&Connection->AddressFile->Lock); - KeReleaseSpinLock(&Connection->Lock, OldIrql); + UnlockObjectFromDpcLevel(Connection->AddressFile); + UnlockObject(Connection, OldIrql); done: if (Status != STATUS_PENDING) { @@ -1106,7 +1100,7 @@ Parameters = (PTDI_REQUEST_KERNEL_SET_EVENT)&IrpSp->Parameters; Status = STATUS_SUCCESS; - KeAcquireSpinLock(&AddrFile->Lock, &OldIrql); + LockObject(AddrFile, &OldIrql); /* Set the event handler. if an event handler is associated with a specific event, it's flag (RegisteredXxxHandler) is TRUE. @@ -1227,7 +1221,7 @@ Status = STATUS_INVALID_PARAMETER; } - KeReleaseSpinLock(&AddrFile->Lock, OldIrql); + UnlockObject(AddrFile, OldIrql); return Status; } Modified: branches/aicom-network-branch/drivers/network/tcpip/tcpip/fileobjs.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/drivers/ne… ============================================================================== --- branches/aicom-network-branch/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] (original) +++ branches/aicom-network-branch/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] Fri Jan 1 00:33:24 2010 @@ -153,7 +153,55 @@ * Object = Pointer to address file object to free */ { - ExFreePoolWithTag(Object, ADDR_FILE_TAG); + PADDRESS_FILE AddrFile = Object; + KIRQL OldIrql; + PDATAGRAM_RECEIVE_REQUEST ReceiveRequest; + PDATAGRAM_SEND_REQUEST SendRequest; + PLIST_ENTRY CurrentEntry; + + TI_DbgPrint(MID_TRACE, ("Called.\n")); + + /* Remove address file from the global list */ + TcpipAcquireSpinLock(&AddressFileListLock, &OldIrql); + RemoveEntryList(&AddrFile->ListEntry); + TcpipReleaseSpinLock(&AddressFileListLock, OldIrql); + + /* FIXME: Kill TCP connections on this address file object */ + + /* Return pending requests with error */ + + TI_DbgPrint(DEBUG_ADDRFILE, ("Aborting receive requests on AddrFile at (0x%X).\n", AddrFile)); + + /* Go through pending receive request list and cancel them all */ + while ((CurrentEntry = ExInterlockedRemoveHeadList(&AddrFile->ReceiveQueue, &AddrFile->Lock))) { + ReceiveRequest = CONTAINING_RECORD(CurrentEntry, DATAGRAM_RECEIVE_REQUEST, ListEntry); + (*ReceiveRequest->Complete)(ReceiveRequest->Context, STATUS_CANCELLED, 0); + /* ExFreePoolWithTag(ReceiveRequest, DATAGRAM_RECV_TAG); FIXME: WTF? */ + } + + TI_DbgPrint(DEBUG_ADDRFILE, ("Aborting send requests on address file at (0x%X).\n", AddrFile)); + + /* Go through pending send request list and cancel them all */ + while ((CurrentEntry = ExInterlockedRemoveHeadList(&AddrFile->ReceiveQueue, &AddrFile->Lock))) { + SendRequest = CONTAINING_RECORD(CurrentEntry, DATAGRAM_SEND_REQUEST, ListEntry); + (*SendRequest->Complete)(SendRequest->Context, STATUS_CANCELLED, 0); + ExFreePoolWithTag(SendRequest, DATAGRAM_SEND_TAG); + } + + /* Protocol specific handling */ + switch (AddrFile->Protocol) { + case IPPROTO_TCP: + TCPFreePort( AddrFile->Port ); + break; + + case IPPROTO_UDP: + UDPFreePort( AddrFile->Port ); + break; + } + + RemoveEntityByContext(AddrFile); + + ExFreePoolWithTag(Object, ADDR_FILE_TAG); } @@ -200,6 +248,7 @@ RtlZeroMemory(AddrFile, sizeof(ADDRESS_FILE)); + AddrFile->RefCount = 1; AddrFile->Free = AddrFileFree; /* Set our default TTL */ @@ -321,64 +370,24 @@ NTSTATUS FileCloseAddress( PTDI_REQUEST Request) { - PADDRESS_FILE AddrFile; - NTSTATUS Status = STATUS_SUCCESS; + PADDRESS_FILE AddrFile = Request->Handle.AddressHandle; KIRQL OldIrql; - PDATAGRAM_RECEIVE_REQUEST ReceiveRequest; - PDATAGRAM_SEND_REQUEST SendRequest; - PLIST_ENTRY CurrentEntry; - - AddrFile = Request->Handle.AddressHandle; - - TI_DbgPrint(MID_TRACE, ("Called.\n")); - - /* Remove address file from the global list */ - TcpipAcquireSpinLock(&AddressFileListLock, &OldIrql); - RemoveEntryList(&AddrFile->ListEntry); - TcpipReleaseSpinLock(&AddressFileListLock, OldIrql); - - /* FIXME: Kill TCP connections on this address file object */ - - /* Return pending requests with error */ - - TI_DbgPrint(DEBUG_ADDRFILE, ("Aborting receive requests on AddrFile at (0x%X).\n", AddrFile)); - - /* Go through pending receive request list and cancel them all */ - while ((CurrentEntry = ExInterlockedRemoveHeadList(&AddrFile->ReceiveQueue, &AddrFile->Lock))) { - ReceiveRequest = CONTAINING_RECORD(CurrentEntry, DATAGRAM_RECEIVE_REQUEST, ListEntry); - (*ReceiveRequest->Complete)(ReceiveRequest->Context, STATUS_CANCELLED, 0); - /* ExFreePoolWithTag(ReceiveRequest, DATAGRAM_RECV_TAG); FIXME: WTF? */ - } - - TI_DbgPrint(DEBUG_ADDRFILE, ("Aborting send requests on address file at (0x%X).\n", AddrFile)); - - /* Go through pending send request list and cancel them all */ - while ((CurrentEntry = ExInterlockedRemoveHeadList(&AddrFile->ReceiveQueue, &AddrFile->Lock))) { - SendRequest = CONTAINING_RECORD(CurrentEntry, DATAGRAM_SEND_REQUEST, ListEntry); - (*SendRequest->Complete)(SendRequest->Context, STATUS_CANCELLED, 0); - ExFreePoolWithTag(SendRequest, DATAGRAM_SEND_TAG); - } - - /* Protocol specific handling */ - switch (AddrFile->Protocol) { - case IPPROTO_TCP: - TCPFreePort( AddrFile->Port ); - if( AddrFile->Listener ) - TCPClose( AddrFile->Listener ); - break; - - case IPPROTO_UDP: - UDPFreePort( AddrFile->Port ); - break; - } - - RemoveEntityByContext(AddrFile); - - (*AddrFile->Free)(AddrFile); + + if (!Request->Handle.AddressHandle) return STATUS_INVALID_PARAMETER; + + LockObject(AddrFile, &OldIrql); + /* We have to close this connection because we started it */ + if( AddrFile->Listener ) + TCPClose( AddrFile->Listener ); + if( AddrFile->Connection ) + DereferenceObject( AddrFile->Connection ); + UnlockObject(AddrFile, OldIrql); + + DereferenceObject(AddrFile); TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); - return Status; + return STATUS_SUCCESS; } @@ -406,7 +415,7 @@ Status = TCPSocket( Connection, AF_INET, SOCK_STREAM, IPPROTO_TCP ); if( !NT_SUCCESS(Status) ) { - TCPFreeConnectionEndpoint( Connection ); + DereferenceObject( Connection ); return Status; } @@ -434,13 +443,16 @@ Connection = Request->Handle.ConnectionContext; + if (!Connection) return STATUS_INVALID_PARAMETER; + TCPClose( Connection ); + Request->Handle.ConnectionContext = NULL; + TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); return STATUS_SUCCESS; } - /* * FUNCTION: Opens a control channel file object @@ -475,6 +487,9 @@ /* Initialize spin lock that protects the address file object */ KeInitializeSpinLock(&ControlChannel->Lock); + ControlChannel->RefCount = 1; + ControlChannel->Free = ControlChannelFree; + /* Return address file object */ Request->Handle.ControlChannel = ControlChannel; @@ -493,13 +508,13 @@ NTSTATUS FileCloseControlChannel( PTDI_REQUEST Request) { - PCONTROL_CHANNEL ControlChannel = Request->Handle.ControlChannel; - NTSTATUS Status = STATUS_SUCCESS; - - ExFreePoolWithTag(ControlChannel, CONTROL_CHANNEL_TAG); + if (!Request->Handle.ControlChannel) return STATUS_INVALID_PARAMETER; + + DereferenceObject((PCONTROL_CHANNEL)Request->Handle.ControlChannel); + Request->Handle.ControlChannel = NULL; - return Status; + return STATUS_SUCCESS; } /* EOF */ Modified: branches/aicom-network-branch/lib/drivers/ip/transport/datagram/datagram.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/lib/driver… ============================================================================== --- branches/aicom-network-branch/lib/drivers/ip/transport/datagram/datagram.c [iso-8859-1] (original) +++ branches/aicom-network-branch/lib/drivers/ip/transport/datagram/datagram.c [iso-8859-1] Fri Jan 1 00:33:24 2010 @@ -22,7 +22,7 @@ TI_DbgPrint(MAX_TRACE, ("Called (Cancel IRP %08x for file %08x).\n", Irp, AddrFile)); - KeAcquireSpinLock(&AddrFile->Lock, &OldIrql); + LockObject(AddrFile, &OldIrql); for( ListEntry = AddrFile->ReceiveQueue.Flink; ListEntry != &AddrFile->ReceiveQueue; @@ -42,7 +42,7 @@ } } - KeReleaseSpinLock(&AddrFile->Lock, OldIrql); + UnlockObject(AddrFile, OldIrql); TI_DbgPrint(MAX_TRACE, ("Done.\n")); @@ -83,7 +83,7 @@ TI_DbgPrint(MAX_TRACE, ("Called.\n")); - KeAcquireSpinLock(&AddrFile->Lock, &OldIrql); + LockObject(AddrFile, &OldIrql); if (AddrFile->Protocol == IPPROTO_UDP) { @@ -140,7 +140,8 @@ &SrcAddress->Address.IPv4Address, sizeof(SrcAddress->Address.IPv4Address) ); - KeReleaseSpinLock(&AddrFile->Lock, OldIrql); + ReferenceObject(AddrFile); + UnlockObject(AddrFile, OldIrql); /* Complete the receive request */ if (Current->BufferSize < DataSize) @@ -148,11 +149,12 @@ else Current->Complete(Current->Context, STATUS_SUCCESS, DataSize); - KeAcquireSpinLock(&AddrFile->Lock, &OldIrql); + LockObject(AddrFile, &OldIrql); + DereferenceObject(AddrFile); } } - KeReleaseSpinLock(&AddrFile->Lock, OldIrql); + UnlockObject(AddrFile, OldIrql); } else if (AddrFile->RegisteredReceiveDatagramHandler) { @@ -172,7 +174,8 @@ SourceAddress = SrcAddress->Address.IPv6Address; } - KeReleaseSpinLock(&AddrFile->Lock, OldIrql); + ReferenceObject(AddrFile); + UnlockObject(AddrFile, OldIrql); Status = (*ReceiveHandler)(HandlerContext, AddressLength, @@ -185,10 +188,12 @@ &BytesTaken, DataBuffer, NULL); + + DereferenceObject(AddrFile); } else { - KeReleaseSpinLock(&AddrFile->Lock, OldIrql); + UnlockObject(AddrFile, OldIrql); TI_DbgPrint(MAX_TRACE, ("Discarding datagram.\n")); } @@ -238,7 +243,7 @@ TI_DbgPrint(MAX_TRACE, ("Called.\n")); - KeAcquireSpinLock(&AddrFile->Lock, &OldIrql); + LockObject(AddrFile, &OldIrql); ReceiveRequest = ExAllocatePoolWithTag(NonPagedPool, sizeof(DATAGRAM_RECEIVE_REQUEST), DATAGRAM_RECV_TAG); @@ -256,7 +261,7 @@ if (!NT_SUCCESS(Status)) { ExFreePoolWithTag(ReceiveRequest, DATAGRAM_RECV_TAG); - KeReleaseSpinLock(&AddrFile->Lock, OldIrql); + UnlockObject(AddrFile, OldIrql); return Status; } } @@ -284,13 +289,13 @@ TI_DbgPrint(MAX_TRACE, ("Leaving (pending %08x).\n", ReceiveRequest)); - KeReleaseSpinLock(&AddrFile->Lock, OldIrql); + UnlockObject(AddrFile, OldIrql); return STATUS_PENDING; } else { - KeReleaseSpinLock(&AddrFile->Lock, OldIrql); + UnlockObject(AddrFile, OldIrql); Status = STATUS_INSUFFICIENT_RESOURCES; } Modified: branches/aicom-network-branch/lib/drivers/ip/transport/rawip/rawip.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/lib/driver… ============================================================================== --- branches/aicom-network-branch/lib/drivers/ip/transport/rawip/rawip.c [iso-8859-1] (original) +++ branches/aicom-network-branch/lib/drivers/ip/transport/rawip/rawip.c [iso-8859-1] Fri Jan 1 00:33:24 2010 @@ -197,7 +197,7 @@ PNEIGHBOR_CACHE_ENTRY NCE; KIRQL OldIrql; - KeAcquireSpinLock(&AddrFile->Lock, &OldIrql); + LockObject(AddrFile, &OldIrql); TI_DbgPrint(MID_TRACE,("Sending Datagram(%x %x %x %d)\n", AddrFile, ConnInfo, BufferData, DataSize)); @@ -212,7 +212,7 @@ break; default: - KeReleaseSpinLock(&AddrFile->Lock, OldIrql); + UnlockObject(AddrFile, OldIrql); return STATUS_UNSUCCESSFUL; } @@ -226,7 +226,7 @@ * interface we're sending over */ if(!(NCE = RouteGetRouteToDestination( &RemoteAddress ))) { - KeReleaseSpinLock(&AddrFile->Lock, OldIrql); + UnlockObject(AddrFile, OldIrql); return STATUS_NETWORK_UNREACHABLE; } @@ -235,7 +235,7 @@ else { if(!(NCE = NBLocateNeighbor( &LocalAddress ))) { - KeReleaseSpinLock(&AddrFile->Lock, OldIrql); + UnlockObject(AddrFile, OldIrql); return STATUS_INVALID_PARAMETER; } } @@ -251,7 +251,7 @@ if( !NT_SUCCESS(Status) ) { - KeReleaseSpinLock(&AddrFile->Lock, OldIrql); + UnlockObject(AddrFile, OldIrql); return Status; } @@ -259,14 +259,14 @@ if (!NT_SUCCESS(Status = IPSendDatagram( &Packet, NCE, RawIpSendPacketComplete, NULL ))) { - KeReleaseSpinLock(&AddrFile->Lock, OldIrql); + UnlockObject(AddrFile, OldIrql); FreeNdisPacket(Packet.NdisPacket); return Status; } TI_DbgPrint(MID_TRACE,("Leaving\n")); - KeReleaseSpinLock(&AddrFile->Lock, OldIrql); + UnlockObject(AddrFile, OldIrql); return STATUS_SUCCESS; } Modified: branches/aicom-network-branch/lib/drivers/ip/transport/tcp/accept.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/lib/driver… ============================================================================== --- branches/aicom-network-branch/lib/drivers/ip/transport/tcp/accept.c [iso-8859-1] (original) +++ branches/aicom-network-branch/lib/drivers/ip/transport/tcp/accept.c [iso-8859-1] Fri Jan 1 00:33:24 2010 @@ -72,10 +72,9 @@ KIRQL OldIrql; ASSERT(Connection); - ASSERT_KM_POINTER(Connection->SocketContext); ASSERT_KM_POINTER(Connection->AddressFile); - KeAcquireSpinLock(&Connection->Lock, &OldIrql); + LockObject(Connection, &OldIrql); TI_DbgPrint(DEBUG_TCP,("TCPListen started\n")); @@ -97,7 +96,7 @@ if (NT_SUCCESS(Status)) Status = TCPTranslateError( OskitTCPListen( Connection->SocketContext, Backlog ) ); - KeReleaseSpinLock(&Connection->Lock, OldIrql); + UnlockObject(Connection, OldIrql); TI_DbgPrint(DEBUG_TCP,("TCPListen finished %x\n", Status)); @@ -111,7 +110,7 @@ KIRQL OldIrql; BOOLEAN Found = FALSE; - KeAcquireSpinLock(&Listener->Lock, &OldIrql); + LockObject(Listener, &OldIrql); ListEntry = Listener->ListenRequest.Flink; while ( ListEntry != &Listener->ListenRequest ) { @@ -127,7 +126,7 @@ ListEntry = ListEntry->Flink; } - KeReleaseSpinLock(&Listener->Lock, OldIrql); + UnlockObject(Listener, OldIrql); return Found; } @@ -144,27 +143,27 @@ TI_DbgPrint(DEBUG_TCP,("TCPAccept started\n")); - KeAcquireSpinLock(&Listener->Lock, &OldIrql); + LockObject(Listener, &OldIrql); Status = TCPServiceListeningSocket( Listener, Connection, (PTDI_REQUEST_KERNEL)Request ); - - KeReleaseSpinLock(&Listener->Lock, OldIrql); if( Status == STATUS_PENDING ) { Bucket = ExAllocatePoolWithTag( NonPagedPool, sizeof(*Bucket), TDI_BUCKET_TAG ); if( Bucket ) { + ReferenceObject(Connection); Bucket->AssociatedEndpoint = Connection; Bucket->Request.RequestNotifyObject = Complete; Bucket->Request.RequestContext = Context; - ExInterlockedInsertTailList( &Listener->ListenRequest, &Bucket->Entry, - &Listener->Lock ); + InsertTailList( &Listener->ListenRequest, &Bucket->Entry ); } else Status = STATUS_NO_MEMORY; } + UnlockObject(Listener, OldIrql); + TI_DbgPrint(DEBUG_TCP,("TCPAccept finished %x\n", Status)); return Status; } Modified: branches/aicom-network-branch/lib/drivers/ip/transport/tcp/event.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/lib/driver… ============================================================================== --- branches/aicom-network-branch/lib/drivers/ip/transport/tcp/event.c [iso-8859-1] (original) +++ branches/aicom-network-branch/lib/drivers/ip/transport/tcp/event.c [iso-8859-1] Fri Jan 1 00:33:24 2010 @@ -24,25 +24,16 @@ NewState & SEL_ACCEPT ? 'A' : 'a', NewState & SEL_WRITE ? 'W' : 'w')); - if (!Connection) - { - return 0; - } - - if (ClientInfo.Unlocked) - KeAcquireSpinLockAtDpcLevel(&Connection->Lock); + ASSERT(Connection); TI_DbgPrint(DEBUG_TCP,("Called: NewState %x (Conn %x) (Change %x)\n", NewState, Connection, Connection->SignalState ^ NewState, NewState)); - Connection->SignalState |= NewState; + Connection->SignalState = NewState; HandleSignalledConnection(Connection); - - if (ClientInfo.Unlocked) - KeReleaseSpinLockFromDpcLevel(&Connection->Lock); return 0; } @@ -76,8 +67,8 @@ return OSK_EINVAL; } - if(!(NCE = NBLocateNeighbor( &LocalAddress ))) { - TI_DbgPrint(MIN_TRACE,("Interface doesn't exist! %s\n", A2S(&LocalAddress))); + if(!(NCE = RouteGetRouteToDestination( &RemoteAddress ))) { + TI_DbgPrint(MIN_TRACE,("Unable to get route to %s\n", A2S(&RemoteAddress))); return OSK_EADDRNOTAVAIL; } Modified: branches/aicom-network-branch/lib/drivers/ip/transport/tcp/tcp.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/lib/driver… ============================================================================== --- branches/aicom-network-branch/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] (original) +++ branches/aicom-network-branch/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] Fri Jan 1 00:33:24 2010 @@ -18,28 +18,6 @@ PORT_SET TCPPorts; CLIENT_DATA ClientInfo; -static VOID -ProcessCompletions(PCONNECTION_ENDPOINT Connection) -{ - PLIST_ENTRY CurrentEntry; - PTDI_BUCKET Bucket; - PTCP_COMPLETION_ROUTINE Complete; - - while ((CurrentEntry = ExInterlockedRemoveHeadList(&Connection->CompletionQueue, - &Connection->Lock))) - { - Bucket = CONTAINING_RECORD(CurrentEntry, TDI_BUCKET, Entry); - Complete = Bucket->Request.RequestNotifyObject; - - Complete(Bucket->Request.RequestContext, Bucket->Status, Bucket->Information); - - ExFreePoolWithTag(Bucket, TDI_BUCKET_TAG); - } - - if (!Connection->SocketContext) - TCPFreeConnectionEndpoint(Connection); -} - VOID HandleSignalledConnection(PCONNECTION_ENDPOINT Connection) { PTDI_BUCKET Bucket; @@ -48,11 +26,16 @@ PIRP Irp; PMDL Mdl; ULONG SocketError = 0; + KIRQL OldIrql; + PTCP_COMPLETION_ROUTINE Complete; + + if (ClientInfo.Unlocked) + LockObjectAtDpcLevel(Connection); TI_DbgPrint(MID_TRACE,("Handling signalled state on %x (%x)\n", Connection, Connection->SocketContext)); - if( !Connection->SocketContext || Connection->SignalState & SEL_FIN ) { + if( Connection->SignalState & SEL_FIN ) { TI_DbgPrint(DEBUG_TCP, ("EOF From socket\n")); /* If OskitTCP initiated the disconnect, try to read the socket error that occurred */ @@ -95,6 +78,7 @@ Bucket->Status = SocketError; Bucket->Information = 0; + DereferenceObject(Bucket->AssociatedEndpoint); InsertTailList(&Connection->CompletionQueue, &Bucket->Entry); } @@ -111,7 +95,7 @@ InsertTailList(&Connection->CompletionQueue, &Bucket->Entry); } - Connection->SignalState = 0; + Connection->SignalState = SEL_FIN; } /* Things that can happen when we try the initial connection */ @@ -162,6 +146,7 @@ } else { Bucket->Status = Status; Bucket->Information = 0; + DereferenceObject(Bucket->AssociatedEndpoint); InsertTailList(&Connection->CompletionQueue, &Bucket->Entry); } @@ -278,39 +263,55 @@ } } } -} - -static -VOID DrainSignals(VOID) { - PCONNECTION_ENDPOINT Connection; - PLIST_ENTRY CurrentEntry; + + ReferenceObject(Connection); + if (ClientInfo.Unlocked) + { + UnlockObjectFromDpcLevel(Connection); + KeReleaseSpinLock(&ClientInfo.Lock, ClientInfo.OldIrql); + } + else + { + UnlockObject(Connection, Connection->OldIrql); + } + + while ((Entry = ExInterlockedRemoveHeadList(&Connection->CompletionQueue, + &Connection->Lock))) + { + Bucket = CONTAINING_RECORD(Entry, TDI_BUCKET, Entry); + Complete = Bucket->Request.RequestNotifyObject; + + Complete(Bucket->Request.RequestContext, Bucket->Status, Bucket->Information); + + ExFreePoolWithTag(Bucket, TDI_BUCKET_TAG); + } + + if (!ClientInfo.Unlocked) + { + LockObject(Connection, &OldIrql); + } + else + { + KeAcquireSpinLock(&ClientInfo.Lock, &ClientInfo.OldIrql); + } + DereferenceObject(Connection); + + /* If the socket is dead, remove the reference we added for oskit */ + if (Connection->SignalState & SEL_FIN) + DereferenceObject(Connection); +} + +VOID ConnectionFree(PVOID Object) { + PCONNECTION_ENDPOINT Connection = Object; KIRQL OldIrql; - KeAcquireSpinLock(&ConnectionEndpointListLock, &OldIrql); - CurrentEntry = ConnectionEndpointListHead.Flink; - while (CurrentEntry != &ConnectionEndpointListHead) - { - Connection = CONTAINING_RECORD( CurrentEntry, CONNECTION_ENDPOINT, - ListEntry ); - CurrentEntry = CurrentEntry->Flink; - KeReleaseSpinLock(&ConnectionEndpointListLock, OldIrql); - - KeAcquireSpinLock(&Connection->Lock, &OldIrql); - if (Connection->SocketContext) - { - HandleSignalledConnection(Connection); - KeReleaseSpinLock(&Connection->Lock, OldIrql); - - ProcessCompletions(Connection); - } - else - { - KeReleaseSpinLock(&Connection->Lock, OldIrql); - } - - KeAcquireSpinLock(&ConnectionEndpointListLock, &OldIrql); - } - KeReleaseSpinLock(&ConnectionEndpointListLock, OldIrql); + TI_DbgPrint(DEBUG_TCP, ("Freeing TCP Endpoint\n")); + + TcpipAcquireSpinLock(&ConnectionEndpointListLock, &OldIrql); + RemoveEntryList(&Connection->ListEntry); + TcpipReleaseSpinLock(&ConnectionEndpointListLock, OldIrql); + + ExFreePoolWithTag( Connection, CONN_ENDPT_TAG ); } PCONNECTION_ENDPOINT TCPAllocateConnectionEndpoint( PVOID ClientContext ) { @@ -335,6 +336,10 @@ /* Save client context pointer */ Connection->ClientContext = ClientContext; + /* Add an extra reference for oskit */ + Connection->RefCount = 2; + Connection->Free = ConnectionFree; + /* Add connection endpoint to global list */ ExInterlockedInsertTailList(&ConnectionEndpointListHead, &Connection->ListEntry, @@ -343,24 +348,12 @@ return Connection; } -VOID TCPFreeConnectionEndpoint( PCONNECTION_ENDPOINT Connection ) { - KIRQL OldIrql; - - TI_DbgPrint(DEBUG_TCP, ("Freeing TCP Endpoint\n")); - - TcpipAcquireSpinLock(&ConnectionEndpointListLock, &OldIrql); - RemoveEntryList(&Connection->ListEntry); - TcpipReleaseSpinLock(&ConnectionEndpointListLock, OldIrql); - - ExFreePoolWithTag( Connection, CONN_ENDPT_TAG ); -} - NTSTATUS TCPSocket( PCONNECTION_ENDPOINT Connection, UINT Family, UINT Type, UINT Proto ) { NTSTATUS Status; KIRQL OldIrql; - KeAcquireSpinLock(&Connection->Lock, &OldIrql); + LockObject(Connection, &OldIrql); TI_DbgPrint(DEBUG_TCP,("Called: Connection %x, Family %d, Type %d, " "Proto %d\n", @@ -377,7 +370,7 @@ TI_DbgPrint(DEBUG_TCP,("Connection->SocketContext %x\n", Connection->SocketContext)); - KeReleaseSpinLock(&Connection->Lock, OldIrql); + UnlockObject(Connection, OldIrql); return Status; } @@ -399,6 +392,7 @@ KeAcquireSpinLock(&ClientInfo.Lock, &OldIrql); ClientInfo.Unlocked = TRUE; + ClientInfo.OldIrql = OldIrql; OskitTCPReceiveDatagram( IPPacket->Header, IPPacket->TotalSize, @@ -477,7 +471,6 @@ } TimerOskitTCP( Next == NextFast, Next == NextSlow ); - DrainSignals(); Current = Next; if (10 <= Current) { @@ -640,11 +633,11 @@ AddressToConnect.sin_family = AF_INET; AddressToBind = AddressToConnect; - KeAcquireSpinLock(&Connection->Lock, &OldIrql); + LockObject(Connection, &OldIrql); if (!Connection->AddressFile) { - KeReleaseSpinLock(&Connection->Lock, OldIrql); + UnlockObject(Connection, OldIrql); return STATUS_INVALID_PARAMETER; } @@ -652,7 +645,7 @@ { if (!(NCE = RouteGetRouteToDestination(&RemoteAddress))) { - KeReleaseSpinLock(&Connection->Lock, OldIrql); + UnlockObject(Connection, OldIrql); return STATUS_NETWORK_UNREACHABLE; } @@ -679,25 +672,23 @@ &AddressToConnect, sizeof(AddressToConnect) ) ); - KeReleaseSpinLock(&Connection->Lock, OldIrql); - if (Status == STATUS_PENDING) { Bucket = ExAllocatePoolWithTag( NonPagedPool, sizeof(*Bucket), TDI_BUCKET_TAG ); if( !Bucket ) { + UnlockObject(Connection, OldIrql); return STATUS_NO_MEMORY; } Bucket->Request.RequestNotifyObject = (PVOID)Complete; Bucket->Request.RequestContext = Context; - ExInterlockedInsertTailList( &Connection->ConnectRequest, &Bucket->Entry, - &Connection->Lock ); + InsertTailList( &Connection->ConnectRequest, &Bucket->Entry ); } - } else { - KeReleaseSpinLock(&Connection->Lock, OldIrql); - } + } + + UnlockObject(Connection, OldIrql); return Status; } @@ -714,7 +705,7 @@ TI_DbgPrint(DEBUG_TCP,("started\n")); - KeAcquireSpinLock(&Connection->Lock, &OldIrql); + LockObject(Connection, &OldIrql); if (Flags & TDI_DISCONNECT_RELEASE) Status = TCPTranslateError(OskitTCPDisconnect(Connection->SocketContext)); @@ -722,7 +713,7 @@ if ((Flags & TDI_DISCONNECT_ABORT) || !Flags) Status = TCPTranslateError(OskitTCPShutdown(Connection->SocketContext, FWRITE | FREAD)); - KeReleaseSpinLock(&Connection->Lock, OldIrql); + UnlockObject(Connection, OldIrql); TI_DbgPrint(DEBUG_TCP,("finished %x\n", Status)); @@ -730,24 +721,36 @@ } NTSTATUS TCPClose -( PCONNECTION_ENDPOINT Connection ) { +( PCONNECTION_ENDPOINT Connection ) +{ + KIRQL OldIrql; NTSTATUS Status; - KIRQL OldIrql; PVOID Socket; - TI_DbgPrint(DEBUG_TCP,("TCPClose started\n")); - - KeAcquireSpinLock(&Connection->Lock, &OldIrql); + /* We don't rely on SocketContext == NULL for socket + * closure anymore but we still need it to determine + * if we caused the closure + */ Socket = Connection->SocketContext; Connection->SocketContext = NULL; + + /* We need to close here otherwise oskit will never indicate + * SEL_FIN and we will never fully close the connection + */ + LockObject(Connection, &OldIrql); Status = TCPTranslateError( OskitTCPClose( Socket ) ); + UnlockObject(Connection, OldIrql); + if (!NT_SUCCESS(Status)) { Connection->SocketContext = Socket; - } - KeReleaseSpinLock(&Connection->Lock, OldIrql); - - TI_DbgPrint(DEBUG_TCP,("TCPClose finished %x\n", Status)); + return Status; + } + + if (Connection->AddressFile) + DereferenceObject(Connection->AddressFile); + + DereferenceObject(Connection); return Status; } @@ -773,9 +776,7 @@ TI_DbgPrint(DEBUG_TCP,("TCP>|< Got an MDL %x (%x:%d)\n", Buffer, DataBuffer, DataLen)); - KeAcquireSpinLock(&Connection->Lock, &OldIrql); - - ASSERT_KM_POINTER(Connection->SocketContext); + LockObject(Connection, &OldIrql); Status = TCPTranslateError ( OskitTCPRecv @@ -785,8 +786,6 @@ &Received, ReceiveFlags ) ); - KeReleaseSpinLock(&Connection->Lock, OldIrql); - TI_DbgPrint(DEBUG_TCP,("OskitTCPReceive: %x, %d\n", Status, Received)); /* Keep this request around ... there was no data yet */ @@ -795,6 +794,7 @@ Bucket = ExAllocatePoolWithTag( NonPagedPool, sizeof(*Bucket), TDI_BUCKET_TAG ); if( !Bucket ) { TI_DbgPrint(DEBUG_TCP,("Failed to allocate bucket\n")); + UnlockObject(Connection, OldIrql); return STATUS_NO_MEMORY; } @@ -802,13 +802,14 @@ Bucket->Request.RequestContext = Context; *BytesReceived = 0; - ExInterlockedInsertTailList( &Connection->ReceiveRequest, &Bucket->Entry, - &Connection->Lock ); + InsertTailList( &Connection->ReceiveRequest, &Bucket->Entry ); TI_DbgPrint(DEBUG_TCP,("Queued read irp\n")); } else { TI_DbgPrint(DEBUG_TCP,("Got status %x, bytes %d\n", Status, Received)); *BytesReceived = Received; } + + UnlockObject(Connection, OldIrql); TI_DbgPrint(DEBUG_TCP,("Status %x\n", Status)); @@ -828,12 +829,10 @@ PTDI_BUCKET Bucket; KIRQL OldIrql; - KeAcquireSpinLock(&Connection->Lock, &OldIrql); + LockObject(Connection, &OldIrql); TI_DbgPrint(DEBUG_TCP,("Called for %d bytes (on socket %x)\n", SendLength, Connection->SocketContext)); - - ASSERT_KM_POINTER(Connection->SocketContext); TI_DbgPrint(DEBUG_TCP,("Connection = %x\n", Connection)); TI_DbgPrint(DEBUG_TCP,("Connection->SocketContext = %x\n", @@ -843,8 +842,6 @@ ( OskitTCPSend( Connection->SocketContext, (OSK_PCHAR)BufferData, SendLength, &Sent, 0 ) ); - - KeReleaseSpinLock(&Connection->Lock, OldIrql); TI_DbgPrint(DEBUG_TCP,("OskitTCPSend: %x, %d\n", Status, Sent)); @@ -853,6 +850,7 @@ /* Freed in TCPSocketState */ Bucket = ExAllocatePoolWithTag( NonPagedPool, sizeof(*Bucket), TDI_BUCKET_TAG ); if( !Bucket ) { + UnlockObject(Connection, OldIrql); TI_DbgPrint(DEBUG_TCP,("Failed to allocate bucket\n")); return STATUS_NO_MEMORY; } @@ -861,14 +859,15 @@ Bucket->Request.RequestContext = Context; *BytesSent = 0; - ExInterlockedInsertTailList( &Connection->SendRequest, &Bucket->Entry, - &Connection->Lock ); + InsertTailList( &Connection->SendRequest, &Bucket->Entry ); TI_DbgPrint(DEBUG_TCP,("Queued write irp\n")); } else { TI_DbgPrint(DEBUG_TCP,("Got status %x, bytes %d\n", Status, Sent)); *BytesSent = Sent; } - + + UnlockObject(Connection, OldIrql); + TI_DbgPrint(DEBUG_TCP,("Status %x\n", Status)); return Status; @@ -899,13 +898,13 @@ NTSTATUS Status; KIRQL OldIrql; - KeAcquireSpinLock(&Connection->Lock, &OldIrql); + LockObject(Connection, &OldIrql); Status = TCPTranslateError(OskitTCPGetAddress(Connection->SocketContext, &LocalAddress, &LocalPort, &RemoteAddress, &RemotePort)); - KeReleaseSpinLock(&Connection->Lock, OldIrql); + UnlockObject(Connection, OldIrql); if (!NT_SUCCESS(Status)) return Status; @@ -932,7 +931,7 @@ ListHead[2] = &Endpoint->ConnectRequest; ListHead[3] = &Endpoint->ListenRequest; - TcpipAcquireSpinLock( &Endpoint->Lock, &OldIrql ); + LockObject(Endpoint, &OldIrql); for( i = 0; i < 4; i++ ) { @@ -951,7 +950,7 @@ } } - TcpipReleaseSpinLock( &Endpoint->Lock, OldIrql ); + UnlockObject(Endpoint, OldIrql); return Found; } Modified: branches/aicom-network-branch/lib/drivers/ip/transport/udp/udp.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/lib/driver… ============================================================================== --- branches/aicom-network-branch/lib/drivers/ip/transport/udp/udp.c [iso-8859-1] (original) +++ branches/aicom-network-branch/lib/drivers/ip/transport/udp/udp.c [iso-8859-1] Fri Jan 1 00:33:24 2010 @@ -174,7 +174,7 @@ PNEIGHBOR_CACHE_ENTRY NCE; KIRQL OldIrql; - KeAcquireSpinLock(&AddrFile->Lock, &OldIrql); + LockObject(AddrFile, &OldIrql); TI_DbgPrint(MID_TRACE,("Sending Datagram(%x %x %x %d)\n", AddrFile, ConnInfo, BufferData, DataSize)); @@ -189,7 +189,7 @@ break; default: - KeReleaseSpinLock(&AddrFile->Lock, OldIrql); + UnlockObject(AddrFile, OldIrql); return STATUS_UNSUCCESSFUL; } @@ -201,7 +201,7 @@ * interface we're sending over */ if(!(NCE = RouteGetRouteToDestination( &RemoteAddress ))) { - KeReleaseSpinLock(&AddrFile->Lock, OldIrql); + UnlockObject(AddrFile, OldIrql); return STATUS_NETWORK_UNREACHABLE; } @@ -210,7 +210,7 @@ else { if(!(NCE = NBLocateNeighbor( &LocalAddress ))) { - KeReleaseSpinLock(&AddrFile->Lock, OldIrql); + UnlockObject(AddrFile, OldIrql); return STATUS_INVALID_PARAMETER; } } @@ -226,18 +226,18 @@ if( !NT_SUCCESS(Status) ) { - KeReleaseSpinLock(&AddrFile->Lock, OldIrql); + UnlockObject(AddrFile, OldIrql); return Status; } if (!NT_SUCCESS(Status = IPSendDatagram( &Packet, NCE, UDPSendPacketComplete, NULL ))) { - KeReleaseSpinLock(&AddrFile->Lock, OldIrql); + UnlockObject(AddrFile, OldIrql); FreeNdisPacket(Packet.NdisPacket); return Status; } - KeReleaseSpinLock(&AddrFile->Lock, OldIrql); + UnlockObject(AddrFile, OldIrql); return STATUS_SUCCESS; } Modified: branches/aicom-network-branch/lib/drivers/oskittcp/oskittcp/interface.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/lib/driver… ============================================================================== --- branches/aicom-network-branch/lib/drivers/oskittcp/oskittcp/interface.c [iso-8859-1] (original) +++ branches/aicom-network-branch/lib/drivers/oskittcp/oskittcp/interface.c [iso-8859-1] Fri Jan 1 00:33:24 2010 @@ -285,16 +285,11 @@ int OskitTCPClose( void *socket ) { int error; - struct socket *so = socket; - - if (!socket) - return OSK_ESHUTDOWN; - - OSKLock(); - /* We have to remove the socket context here otherwise we end up - * back in HandleSignalledConnection with a freed connection context - */ - so->so_connection = NULL; + + if (!socket) + return OSK_ESHUTDOWN; + + OSKLock(); error = soclose( socket ); OSKUnlock(); Modified: branches/aicom-network-branch/lib/drivers/oskittcp/oskittcp/sleep.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/lib/driver… ============================================================================== --- branches/aicom-network-branch/lib/drivers/oskittcp/oskittcp/sleep.c [iso-8859-1] (original) +++ branches/aicom-network-branch/lib/drivers/oskittcp/oskittcp/sleep.c [iso-8859-1] Fri Jan 1 00:33:24 2010 @@ -39,8 +39,8 @@ OS_DbgPrint(OSK_MID_TRACE,("Socket writeable\n")); flags |= SEL_WRITE; } - if( so->so_state & SS_CANTRCVMORE ) { - OS_DbgPrint(OSK_MID_TRACE,("Socket can't be read any longer\n")); + if (!so->so_pcb) { + OS_DbgPrint(OSK_MID_TRACE,("Socket dying\n")); flags |= SEL_FIN; }

1 0

[ekohl] 44838: [devmgr] Implement the details page and add dialogs for the resources and power pages. Some of the code is not final yet as I don't have a clean way of retrieving the required information. Some required stuff in setupapi or umpnpmgr is still incomplete too. I wish you a happy and successful 2010! Eric.
by ekohl＠svn.reactos.org 31 Dec '09

31 Dec '09

Author: ekohl Date: Thu Dec 31 23:10:41 2009 New Revision: 44838 URL: http://svn.reactos.org/svn/reactos?rev=44838&view=rev Log: [devmgr] Implement the details page and add dialogs for the resources and power pages. Some of the code is not final yet as I don't have a clean way of retrieving the required information. Some required stuff in setupapi or umpnpmgr is still incomplete too. I wish you a happy and successful 2010! Eric. Modified: trunk/reactos/dll/win32/devmgr/advprop.c trunk/reactos/dll/win32/devmgr/lang/bg-BG.rc trunk/reactos/dll/win32/devmgr/lang/cs-CZ.rc trunk/reactos/dll/win32/devmgr/lang/de-DE.rc trunk/reactos/dll/win32/devmgr/lang/el-GR.rc trunk/reactos/dll/win32/devmgr/lang/en-US.rc trunk/reactos/dll/win32/devmgr/lang/es-ES.rc trunk/reactos/dll/win32/devmgr/lang/fr-FR.rc trunk/reactos/dll/win32/devmgr/lang/hu-HU.rc trunk/reactos/dll/win32/devmgr/lang/id-ID.rc trunk/reactos/dll/win32/devmgr/lang/it-IT.rc trunk/reactos/dll/win32/devmgr/lang/no-NO.rc trunk/reactos/dll/win32/devmgr/lang/pl-PL.rc trunk/reactos/dll/win32/devmgr/lang/pt-BR.rc trunk/reactos/dll/win32/devmgr/lang/ro-RO.rc trunk/reactos/dll/win32/devmgr/lang/ru-RU.rc trunk/reactos/dll/win32/devmgr/lang/sk-SK.rc trunk/reactos/dll/win32/devmgr/lang/uk-UA.rc trunk/reactos/dll/win32/devmgr/resource.h Modified: trunk/reactos/dll/win32/devmgr/advprop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/advprop.c… ============================================================================== --- trunk/reactos/dll/win32/devmgr/advprop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/advprop.c [iso-8859-1] Thu Dec 31 23:10:41 2009 @@ -440,6 +440,338 @@ static VOID +SetListViewText(HWND hwnd, + INT iItem, + LPWSTR lpText) +{ + LVITEM li; + + li.mask = LVIF_TEXT | LVIF_STATE; + li.iItem = iItem; + li.iSubItem = 0; + li.state = 0; //(li.iItem == 0 ? LVIS_SELECTED : 0); + li.stateMask = LVIS_SELECTED; + li.pszText = lpText; + (void)ListView_InsertItem(hwnd, + &li); +} + + +static VOID +UpdateDetailsDlg(IN HWND hwndDlg, + IN PDEVADVPROP_INFO dap) +{ + HWND hwndComboBox; + HWND hwndListView; + LV_COLUMN lvc; + RECT rcClient; + + UINT i; + UINT Properties[] = + { + IDS_PROP_DEVICEID, + IDS_PROP_HARDWAREID, + IDS_PROP_COMPATIBLEIDS, + IDS_PROP_MATCHINGDEVICEID, + IDS_PROP_SERVICE, + IDS_PROP_ENUMERATOR, + IDS_PROP_DEVNODEFLAGS, + IDS_PROP_CONFIGFLAGS, + IDS_PROP_CSCONFIGFLAGS, + IDS_PROP_EJECTRELATIONS, + IDS_PROP_REMOVALRELATIONS, + IDS_PROP_BUSRELATIONS, + IDS_PROP_DEVUPPERFILTERS, + IDS_PROP_DEVLOWERFILTERS, + IDS_PROP_CLASSUPPERFILTERS, + IDS_PROP_CLASSLOWERFILTERS, + IDS_PROP_CLASSINSTALLER, + IDS_PROP_CLASSCOINSTALLER, + IDS_PROP_DEVICECOINSTALLER + }; + + + /* set the device image */ + SendDlgItemMessage(hwndDlg, + IDC_DEVICON, + STM_SETICON, + (WPARAM)dap->hDevIcon, + 0); + + /* set the device name edit control text */ + SetDlgItemText(hwndDlg, + IDC_DEVNAME, + dap->szDevName); + + + hwndComboBox = GetDlgItem(hwndDlg, + IDC_DETAILSPROPNAME); + + hwndListView = GetDlgItem(hwndDlg, + IDC_DETAILSPROPVALUE); + + for (i = 0; i != sizeof(Properties) / sizeof(Properties[0]); i++) + { + /* fill in the device usage combo box */ + if (LoadString(hDllInstance, + Properties[i], + dap->szTemp, + sizeof(dap->szTemp) / sizeof(dap->szTemp[0]))) + { + SendMessage(hwndComboBox, + CB_ADDSTRING, + 0, + (LPARAM)dap->szTemp); + } + } + + + GetClientRect(hwndListView, + &rcClient); + + /* add a column to the list view control */ + lvc.mask = LVCF_FMT | LVCF_WIDTH; + lvc.fmt = LVCFMT_LEFT; + lvc.cx = rcClient.right; + (void)ListView_InsertColumn(hwndListView, + 0, + &lvc); + + SendMessage(hwndComboBox, + CB_SETCURSEL, + 0, + 0); + + SetListViewText(hwndListView, 0, dap->szDeviceID); +} + + +static VOID +SetDevicePropertyText(IN PDEVADVPROP_INFO dap, + IN HWND hwndListView, + IN DWORD dwProperty) +{ + HDEVINFO DeviceInfoSet; + PSP_DEVINFO_DATA DeviceInfoData; + DWORD dwType; + DWORD dwSize; + LPBYTE lpBuffer; + LPWSTR lpStr; + INT len; + INT index; + + if (dap->CurrentDeviceInfoSet != INVALID_HANDLE_VALUE) + { + DeviceInfoSet = dap->CurrentDeviceInfoSet; + DeviceInfoData = &dap->CurrentDeviceInfoData; + } + else + { + DeviceInfoSet = dap->DeviceInfoSet; + DeviceInfoData = &dap->DeviceInfoData; + } + + dwSize = 0; + SetupDiGetDeviceRegistryProperty(DeviceInfoSet, + DeviceInfoData, + dwProperty, + &dwType, + NULL, + 0, + &dwSize); + if (dwSize == 0) + { + swprintf(dap->szTemp, L"Error: Getting the size failed! (Error: %ld)", GetLastError()); + SetListViewText(hwndListView, 0, dap->szTemp); + return; + } + + lpBuffer = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + dwSize); + if (lpBuffer == NULL) + { + SetListViewText(hwndListView, 0, L"Error: Allocating the buffer failed!"); + return; + } + + if (SetupDiGetDeviceRegistryProperty(DeviceInfoSet, + DeviceInfoData, + dwProperty, + &dwType, + lpBuffer, + dwSize, + &dwSize)) + { + if (dwType == REG_SZ) + { + SetListViewText(hwndListView, 0, (LPWSTR)lpBuffer); + } + else if (dwType == REG_MULTI_SZ) + { + lpStr = (LPWSTR)lpBuffer; + index = 0; + while (*lpStr != 0) + { + len = wcslen(lpStr) + 1; + + SetListViewText(hwndListView, index, lpStr); + + lpStr += len; + index++; + } + } + else + { + SetListViewText(hwndListView, 0, L"Error: Unsupported value type!"); + + } + } + else + { + SetListViewText(hwndListView, 0, L"Error: Retrieving the value failed!"); + } + + HeapFree(GetProcessHeap(), + 0, + lpBuffer); +} + + + +static VOID +DisplayDeviceProperties(IN PDEVADVPROP_INFO dap, + IN HWND hwndComboBox, + IN HWND hwndListView) +{ + INT Index; + + Index = (INT)SendMessage(hwndComboBox, + CB_GETCURSEL, + 0, + 0); + if (Index == CB_ERR) + return; + + (void)ListView_DeleteAllItems(hwndListView); + + switch (Index) + { + case 0: + SetListViewText(hwndListView, 0, dap->szDeviceID); + break; + + + case 1: /* Hardware ID */ + SetDevicePropertyText(dap, + hwndListView, + SPDRP_HARDWAREID); + break; + + case 2: /* Compatible IDs */ + SetDevicePropertyText(dap, + hwndListView, + SPDRP_COMPATIBLEIDS); + break; + + case 4: /* Service */ + SetDevicePropertyText(dap, + hwndListView, + SPDRP_SERVICE); + break; + + case 5: /* Enumerator */ + SetDevicePropertyText(dap, + hwndListView, + SPDRP_ENUMERATOR_NAME); + break; + + case 12: /* Upper Filters */ + SetDevicePropertyText(dap, + hwndListView, + SPDRP_UPPERFILTERS); + break; + + case 13: /* Lower Filters */ + SetDevicePropertyText(dap, + hwndListView, + SPDRP_LOWERFILTERS); + break; + + default: + SetListViewText(hwndListView, 0, L"<Not implemented yet>"); + break; + } +} + + +static INT_PTR +CALLBACK +AdvProcDetailsDlgProc(IN HWND hwndDlg, + IN UINT uMsg, + IN WPARAM wParam, + IN LPARAM lParam) +{ + PDEVADVPROP_INFO dap; + INT_PTR Ret = FALSE; + + dap = (PDEVADVPROP_INFO)GetWindowLongPtr(hwndDlg, + DWL_USER); + + if (dap != NULL || uMsg == WM_INITDIALOG) + { + switch (uMsg) + { + case WM_COMMAND: + { + switch (LOWORD(wParam)) + { + case IDC_DETAILSPROPNAME: + if (HIWORD(wParam) == CBN_SELCHANGE) + { + DisplayDeviceProperties(dap, + GetDlgItem(hwndDlg, IDC_DETAILSPROPNAME), + GetDlgItem(hwndDlg, IDC_DETAILSPROPVALUE)); + } + break; + } + break; + } + + case WM_NOTIFY: + { + NMHDR *hdr = (NMHDR*)lParam; + switch (hdr->code) + { + case PSN_APPLY: + break; + } + break; + } + + case WM_INITDIALOG: + { + dap = (PDEVADVPROP_INFO)((LPPROPSHEETPAGE)lParam)->lParam; + if (dap != NULL) + { + SetWindowLongPtr(hwndDlg, + DWL_USER, + (DWORD_PTR)dap); + + UpdateDetailsDlg(hwndDlg, + dap); + } + Ret = TRUE; + break; + } + } + } + + return Ret; +} + + +static VOID InitDevUsageActions(IN HWND hwndDlg, IN HWND hComboBox, IN PDEVADVPROP_INFO dap) @@ -1021,6 +1353,9 @@ if (dap->HasDriverPage) dap->nDevPropSheets++; + /* include the details page */ + dap->nDevPropSheets++; + /* add the device property sheets */ if (dap->nDevPropSheets != 0) { @@ -1092,6 +1427,36 @@ } } } + + if (1) + { + PROPSHEETPAGE pspDetails = {0}; + pspDetails.dwSize = sizeof(PROPSHEETPAGE); + pspDetails.dwFlags = PSP_DEFAULT; + pspDetails.hInstance = hDllInstance; + pspDetails.pszTemplate = (LPCWSTR)MAKEINTRESOURCE(IDD_DEVICEDETAILS); + pspDetails.pfnDlgProc = AdvProcDetailsDlgProc; + pspDetails.lParam = (LPARAM)dap; + dap->DevPropSheets[iPage] = dap->pCreatePropertySheetPageW(&pspDetails); + if (dap->DevPropSheets[iPage] != NULL) + { + if (PropSheet_AddPage(hPropSheetDlg, + dap->DevPropSheets[iPage])) + { + iPage++; + RecalcPages = TRUE; + } + else + { + dap->pDestroyPropertySheetPage(dap->DevPropSheets[iPage]); + dap->DevPropSheets[iPage] = NULL; + } + } + } + + /* FIXME: Add the resources page */ + + /* FIXME: Add the power page */ } else dap->nDevPropSheets = 0; Modified: trunk/reactos/dll/win32/devmgr/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/bg-B… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/bg-BG.rc [iso-8859-1] Thu Dec 31 23:10:41 2009 @@ -91,6 +91,29 @@ IDS_DEV_SETPROPERTIES_FAILED "ÐåàêòÎÑ íå óñïÿ äà ñìåíè íàñòðîéêèòå íà óñòðîéñòâîòî." END +STRINGTABLE +BEGIN + IDS_PROP_DEVICEID "Device instance ID" + IDS_PROP_HARDWAREID "Hardware ID" + IDS_PROP_COMPATIBLEIDS "Compatible IDs" + IDS_PROP_MATCHINGDEVICEID "Matching Device ID" + IDS_PROP_SERVICE "Service" + IDS_PROP_ENUMERATOR "Enumerator" + IDS_PROP_DEVNODEFLAGS "Devnode Flags" + IDS_PROP_CONFIGFLAGS "Config Flags" + IDS_PROP_CSCONFIGFLAGS "CSConfig Flags" + IDS_PROP_EJECTRELATIONS "Eject Relations" + IDS_PROP_REMOVALRELATIONS "Removal Relations" + IDS_PROP_BUSRELATIONS "Bus Relations" + IDS_PROP_DEVUPPERFILTERS "Upper Filters" + IDS_PROP_DEVLOWERFILTERS "Lower Filters" + IDS_PROP_CLASSUPPERFILTERS "Upper Class Filters" + IDS_PROP_CLASSLOWERFILTERS "Lower Class Filters" + IDS_PROP_CLASSINSTALLER "Class Installer" + IDS_PROP_CLASSCOINSTALLER "Class Co-Installer" + IDS_PROP_DEVICECOINSTALLER "Device Co-Installer" +END + IDD_HARDWARE DIALOGEX DISCARDABLE 0, 0, 300, 400 STYLE DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CAPTION | DS_SHELLFONT FONT 8, "MS Shell Dlg" @@ -169,3 +192,33 @@ PUSHBUTTON "Äîáðå", IDOK, 167, 228, 50, 14 END +IDD_DEVICEDETAILS DIALOGEX DISCARDABLE 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Details" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX + COMBOBOX IDC_DETAILSPROPNAME, 7, 36, 238, 165, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "",IDC_DETAILSPROPVALUE,"SysListView32",LVS_REPORT | LVS_NOCOLUMNHEADER | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | + LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 58, 238, 155 +END + +IDD_DEVICERESOURCES DIALOGEX DISCARDABLE 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Resources" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX +END + +IDD_DEVICEPOWER DIALOGEX DISCARDABLE 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Power" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX +END Modified: trunk/reactos/dll/win32/devmgr/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/cs-C… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/cs-CZ.rc [iso-8859-1] Thu Dec 31 23:10:41 2009 @@ -94,6 +94,29 @@ IDS_DEV_SETPROPERTIES_FAILED "ReactOS nedokázal zmìnit nastavení tohoto zaøízení." END +STRINGTABLE +BEGIN + IDS_PROP_DEVICEID "Device instance ID" + IDS_PROP_HARDWAREID "Hardware ID" + IDS_PROP_COMPATIBLEIDS "Compatible IDs" + IDS_PROP_MATCHINGDEVICEID "Matching Device ID" + IDS_PROP_SERVICE "Service" + IDS_PROP_ENUMERATOR "Enumerator" + IDS_PROP_DEVNODEFLAGS "Devnode Flags" + IDS_PROP_CONFIGFLAGS "Config Flags" + IDS_PROP_CSCONFIGFLAGS "CSConfig Flags" + IDS_PROP_EJECTRELATIONS "Eject Relations" + IDS_PROP_REMOVALRELATIONS "Removal Relations" + IDS_PROP_BUSRELATIONS "Bus Relations" + IDS_PROP_DEVUPPERFILTERS "Upper Filters" + IDS_PROP_DEVLOWERFILTERS "Lower Filters" + IDS_PROP_CLASSUPPERFILTERS "Upper Class Filters" + IDS_PROP_CLASSLOWERFILTERS "Lower Class Filters" + IDS_PROP_CLASSINSTALLER "Class Installer" + IDS_PROP_CLASSCOINSTALLER "Class Co-Installer" + IDS_PROP_DEVICECOINSTALLER "Device Co-Installer" +END + IDD_HARDWARE DIALOGEX DISCARDABLE 0, 0, 300, 400 STYLE DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CAPTION | DS_SHELLFONT FONT 8, "MS Shell Dlg" @@ -171,3 +194,34 @@ LTEXT "", IDC_DIGITALSIGNER, 66, 182, 155, 8 PUSHBUTTON "OK", IDOK, 167, 228, 50, 14 END + +IDD_DEVICEDETAILS DIALOGEX DISCARDABLE 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Details" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX + COMBOBOX IDC_DETAILSPROPNAME, 7, 36, 238, 165, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "",IDC_DETAILSPROPVALUE,"SysListView32",LVS_REPORT | LVS_NOCOLUMNHEADER | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | + LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 58, 238, 155 +END + +IDD_DEVICERESOURCES DIALOGEX DISCARDABLE 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Resources" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX +END + +IDD_DEVICEPOWER DIALOGEX DISCARDABLE 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Power" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX +END Modified: trunk/reactos/dll/win32/devmgr/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/de-D… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/de-DE.rc [iso-8859-1] Thu Dec 31 23:10:41 2009 @@ -92,6 +92,29 @@ IDS_DEV_SETPROPERTIES_FAILED "ReactOS konnte die Einstellungen für dieses Gerät nicht verändern." END +STRINGTABLE +BEGIN + IDS_PROP_DEVICEID "Device instance ID" + IDS_PROP_HARDWAREID "Hardware ID" + IDS_PROP_COMPATIBLEIDS "Compatible IDs" + IDS_PROP_MATCHINGDEVICEID "Matching Device ID" + IDS_PROP_SERVICE "Service" + IDS_PROP_ENUMERATOR "Enumerator" + IDS_PROP_DEVNODEFLAGS "Devnode Flags" + IDS_PROP_CONFIGFLAGS "Config Flags" + IDS_PROP_CSCONFIGFLAGS "CSConfig Flags" + IDS_PROP_EJECTRELATIONS "Eject Relations" + IDS_PROP_REMOVALRELATIONS "Removal Relations" + IDS_PROP_BUSRELATIONS "Bus Relations" + IDS_PROP_DEVUPPERFILTERS "Upper Filters" + IDS_PROP_DEVLOWERFILTERS "Lower Filters" + IDS_PROP_CLASSUPPERFILTERS "Upper Class Filters" + IDS_PROP_CLASSLOWERFILTERS "Lower Class Filters" + IDS_PROP_CLASSINSTALLER "Class Installer" + IDS_PROP_CLASSCOINSTALLER "Class Co-Installer" + IDS_PROP_DEVICECOINSTALLER "Device Co-Installer" +END + IDD_HARDWARE DIALOGEX DISCARDABLE 0, 0, 300, 400 STYLE DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CAPTION | DS_SHELLFONT FONT 8, "MS Shell Dlg" @@ -170,5 +193,36 @@ PUSHBUTTON "OK", IDOK, 167, 228, 50, 14 END - - +IDD_DEVICEDETAILS DIALOGEX DISCARDABLE 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Details" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX + COMBOBOX IDC_DETAILSPROPNAME, 7, 36, 238, 165, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "",IDC_DETAILSPROPVALUE,"SysListView32",LVS_REPORT | LVS_NOCOLUMNHEADER | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | + LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 58, 238, 155 +END + +IDD_DEVICERESOURCES DIALOGEX DISCARDABLE 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Resources" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX +END + +IDD_DEVICEPOWER DIALOGEX DISCARDABLE 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Power" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX +END + + + Modified: trunk/reactos/dll/win32/devmgr/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/el-G… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/el-GR.rc [iso-8859-1] Thu Dec 31 23:10:41 2009 @@ -91,6 +91,29 @@ IDS_DEV_SETPROPERTIES_FAILED "ReactOS wasn\'t able to change the settings of this device." END +STRINGTABLE +BEGIN + IDS_PROP_DEVICEID "Device instance ID" + IDS_PROP_HARDWAREID "Hardware ID" + IDS_PROP_COMPATIBLEIDS "Compatible IDs" + IDS_PROP_MATCHINGDEVICEID "Matching Device ID" + IDS_PROP_SERVICE "Service" + IDS_PROP_ENUMERATOR "Enumerator" + IDS_PROP_DEVNODEFLAGS "Devnode Flags" + IDS_PROP_CONFIGFLAGS "Config Flags" + IDS_PROP_CSCONFIGFLAGS "CSConfig Flags" + IDS_PROP_EJECTRELATIONS "Eject Relations" + IDS_PROP_REMOVALRELATIONS "Removal Relations" + IDS_PROP_BUSRELATIONS "Bus Relations" + IDS_PROP_DEVUPPERFILTERS "Upper Filters" + IDS_PROP_DEVLOWERFILTERS "Lower Filters" + IDS_PROP_CLASSUPPERFILTERS "Upper Class Filters" + IDS_PROP_CLASSLOWERFILTERS "Lower Class Filters" + IDS_PROP_CLASSINSTALLER "Class Installer" + IDS_PROP_CLASSCOINSTALLER "Class Co-Installer" + IDS_PROP_DEVICECOINSTALLER "Device Co-Installer" +END + IDD_HARDWARE DIALOGEX DISCARDABLE 0, 0, 300, 400 STYLE DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CAPTION | DS_SHELLFONT FONT 8, "MS Shell Dlg" @@ -169,3 +192,33 @@ PUSHBUTTON "OK", IDOK, 167, 228, 50, 14 END +IDD_DEVICEDETAILS DIALOGEX DISCARDABLE 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Details" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX + COMBOBOX IDC_DETAILSPROPNAME, 7, 36, 238, 165, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "",IDC_DETAILSPROPVALUE,"SysListView32",LVS_REPORT | LVS_NOCOLUMNHEADER | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | + LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 58, 238, 155 +END + +IDD_DEVICERESOURCES DIALOGEX DISCARDABLE 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Resources" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX +END + +IDD_DEVICEPOWER DIALOGEX DISCARDABLE 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Power" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX +END Modified: trunk/reactos/dll/win32/devmgr/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/en-U… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/en-US.rc [iso-8859-1] Thu Dec 31 23:10:41 2009 @@ -91,6 +91,30 @@ IDS_DEV_SETPROPERTIES_FAILED "ReactOS wasn\'t able to change the settings of this device." END +STRINGTABLE +BEGIN + IDS_PROP_DEVICEID "Device instance ID" + IDS_PROP_HARDWAREID "Hardware ID" + IDS_PROP_COMPATIBLEIDS "Compatible IDs" + IDS_PROP_MATCHINGDEVICEID "Matching Device ID" + IDS_PROP_SERVICE "Service" + IDS_PROP_ENUMERATOR "Enumerator" + IDS_PROP_DEVNODEFLAGS "Devnode Flags" + IDS_PROP_CONFIGFLAGS "Config Flags" + IDS_PROP_CSCONFIGFLAGS "CSConfig Flags" + IDS_PROP_EJECTRELATIONS "Eject Relations" + IDS_PROP_REMOVALRELATIONS "Removal Relations" + IDS_PROP_BUSRELATIONS "Bus Relations" + IDS_PROP_DEVUPPERFILTERS "Upper Filters" + IDS_PROP_DEVLOWERFILTERS "Lower Filters" + IDS_PROP_CLASSUPPERFILTERS "Upper Class Filters" + IDS_PROP_CLASSLOWERFILTERS "Lower Class Filters" + IDS_PROP_CLASSINSTALLER "Class Installer" + IDS_PROP_CLASSCOINSTALLER "Class Co-Installer" + IDS_PROP_DEVICECOINSTALLER "Device Co-Installer" +END + + IDD_HARDWARE DIALOGEX DISCARDABLE 0, 0, 300, 400 STYLE DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CAPTION | DS_SHELLFONT FONT 8, "MS Shell Dlg" @@ -169,3 +193,33 @@ PUSHBUTTON "OK", IDOK, 167, 228, 50, 14 END +IDD_DEVICEDETAILS DIALOGEX DISCARDABLE 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Details" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX + COMBOBOX IDC_DETAILSPROPNAME, 7, 36, 238, 165, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "",IDC_DETAILSPROPVALUE,"SysListView32",LVS_REPORT | LVS_NOCOLUMNHEADER | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | + LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 58, 238, 155 +END + +IDD_DEVICERESOURCES DIALOGEX DISCARDABLE 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Resources" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX +END + +IDD_DEVICEPOWER DIALOGEX DISCARDABLE 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Power" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX +END Modified: trunk/reactos/dll/win32/devmgr/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/es-E… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/es-ES.rc [iso-8859-1] Thu Dec 31 23:10:41 2009 @@ -92,6 +92,29 @@ IDS_DEV_SETPROPERTIES_FAILED "ReactOS no fue capaz de cambiar las propiedades de este dispositivo." END +STRINGTABLE +BEGIN + IDS_PROP_DEVICEID "Device instance ID" + IDS_PROP_HARDWAREID "Hardware ID" + IDS_PROP_COMPATIBLEIDS "Compatible IDs" + IDS_PROP_MATCHINGDEVICEID "Matching Device ID" + IDS_PROP_SERVICE "Service" + IDS_PROP_ENUMERATOR "Enumerator" + IDS_PROP_DEVNODEFLAGS "Devnode Flags" + IDS_PROP_CONFIGFLAGS "Config Flags" + IDS_PROP_CSCONFIGFLAGS "CSConfig Flags" + IDS_PROP_EJECTRELATIONS "Eject Relations" + IDS_PROP_REMOVALRELATIONS "Removal Relations" + IDS_PROP_BUSRELATIONS "Bus Relations" + IDS_PROP_DEVUPPERFILTERS "Upper Filters" + IDS_PROP_DEVLOWERFILTERS "Lower Filters" + IDS_PROP_CLASSUPPERFILTERS "Upper Class Filters" + IDS_PROP_CLASSLOWERFILTERS "Lower Class Filters" + IDS_PROP_CLASSINSTALLER "Class Installer" + IDS_PROP_CLASSCOINSTALLER "Class Co-Installer" + IDS_PROP_DEVICECOINSTALLER "Device Co-Installer" +END + IDD_HARDWARE DIALOGEX DISCARDABLE 0, 0, 300, 400 STYLE DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CAPTION | DS_SHELLFONT FONT 8, "MS Shell Dlg" @@ -170,6 +193,35 @@ PUSHBUTTON "Aceptar", IDOK, 167, 228, 50, 14 END - - - +IDD_DEVICEDETAILS DIALOGEX DISCARDABLE 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Details" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX + COMBOBOX IDC_DETAILSPROPNAME, 7, 36, 238, 165, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "",IDC_DETAILSPROPVALUE,"SysListView32",LVS_REPORT | LVS_NOCOLUMNHEADER | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | + LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 58, 238, 155 +END + +IDD_DEVICERESOURCES DIALOGEX DISCARDABLE 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Resources" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX +END + +IDD_DEVICEPOWER DIALOGEX DISCARDABLE 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Power" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX +END + + Modified: trunk/reactos/dll/win32/devmgr/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/fr-F… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/fr-FR.rc [iso-8859-1] Thu Dec 31 23:10:41 2009 @@ -90,6 +90,29 @@ IDS_DEV_SETPROPERTIES_FAILED "ReactOS n'a pas pu changer les réglages de ce périphérique." END +STRINGTABLE +BEGIN + IDS_PROP_DEVICEID "Device instance ID" + IDS_PROP_HARDWAREID "Hardware ID" + IDS_PROP_COMPATIBLEIDS "Compatible IDs" + IDS_PROP_MATCHINGDEVICEID "Matching Device ID" + IDS_PROP_SERVICE "Service" + IDS_PROP_ENUMERATOR "Enumerator" + IDS_PROP_DEVNODEFLAGS "Devnode Flags" + IDS_PROP_CONFIGFLAGS "Config Flags" + IDS_PROP_CSCONFIGFLAGS "CSConfig Flags" + IDS_PROP_EJECTRELATIONS "Eject Relations" + IDS_PROP_REMOVALRELATIONS "Removal Relations" + IDS_PROP_BUSRELATIONS "Bus Relations" + IDS_PROP_DEVUPPERFILTERS "Upper Filters" + IDS_PROP_DEVLOWERFILTERS "Lower Filters" + IDS_PROP_CLASSUPPERFILTERS "Upper Class Filters" + IDS_PROP_CLASSLOWERFILTERS "Lower Class Filters" + IDS_PROP_CLASSINSTALLER "Class Installer" + IDS_PROP_CLASSCOINSTALLER "Class Co-Installer" + IDS_PROP_DEVICECOINSTALLER "Device Co-Installer" +END + IDD_HARDWARE DIALOGEX DISCARDABLE 0, 0, 300, 400 STYLE DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CAPTION | DS_SHELLFONT FONT 8, "MS Shell Dlg" @@ -168,3 +191,33 @@ PUSHBUTTON "OK", IDOK, 167, 228, 50, 14 END +IDD_DEVICEDETAILS DIALOGEX DISCARDABLE 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Details" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX + COMBOBOX IDC_DETAILSPROPNAME, 7, 36, 238, 165, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "",IDC_DETAILSPROPVALUE,"SysListView32",LVS_REPORT | LVS_NOCOLUMNHEADER | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | + LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 58, 238, 155 +END + +IDD_DEVICERESOURCES DIALOGEX DISCARDABLE 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Resources" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX +END + +IDD_DEVICEPOWER DIALOGEX DISCARDABLE 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Power" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX +END Modified: trunk/reactos/dll/win32/devmgr/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/hu-H… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/hu-HU.rc [iso-8859-1] Thu Dec 31 23:10:41 2009 @@ -90,6 +90,29 @@ IDS_DEV_SETPROPERTIES_FAILED "A ReactOS nem tudta megváltoztatni az eszköz beállításait." END +STRINGTABLE +BEGIN + IDS_PROP_DEVICEID "Device instance ID" + IDS_PROP_HARDWAREID "Hardware ID" + IDS_PROP_COMPATIBLEIDS "Compatible IDs" + IDS_PROP_MATCHINGDEVICEID "Matching Device ID" + IDS_PROP_SERVICE "Service" + IDS_PROP_ENUMERATOR "Enumerator" + IDS_PROP_DEVNODEFLAGS "Devnode Flags" + IDS_PROP_CONFIGFLAGS "Config Flags" + IDS_PROP_CSCONFIGFLAGS "CSConfig Flags" + IDS_PROP_EJECTRELATIONS "Eject Relations" + IDS_PROP_REMOVALRELATIONS "Removal Relations" + IDS_PROP_BUSRELATIONS "Bus Relations" + IDS_PROP_DEVUPPERFILTERS "Upper Filters" + IDS_PROP_DEVLOWERFILTERS "Lower Filters" + IDS_PROP_CLASSUPPERFILTERS "Upper Class Filters" + IDS_PROP_CLASSLOWERFILTERS "Lower Class Filters" + IDS_PROP_CLASSINSTALLER "Class Installer" + IDS_PROP_CLASSCOINSTALLER "Class Co-Installer" + IDS_PROP_DEVICECOINSTALLER "Device Co-Installer" +END + IDD_HARDWARE DIALOGEX DISCARDABLE 0, 0, 300, 400 STYLE DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CAPTION | DS_SHELLFONT FONT 8, "MS Shell Dlg" @@ -146,3 +169,33 @@ LTEXT "To view details about the driver files.", -1, 91, 110, 154, 17, SS_NOPREFIX END +IDD_DEVICEDETAILS DIALOGEX DISCARDABLE 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Details" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX + COMBOBOX IDC_DETAILSPROPNAME, 7, 36, 238, 165, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "",IDC_DETAILSPROPVALUE,"SysListView32",LVS_REPORT | LVS_NOCOLUMNHEADER | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | + LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 58, 238, 155 +END + +IDD_DEVICERESOURCES DIALOGEX DISCARDABLE 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Resources" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX +END + +IDD_DEVICEPOWER DIALOGEX DISCARDABLE 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Power" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX +END Modified: trunk/reactos/dll/win32/devmgr/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/id-I… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/id-ID.rc [iso-8859-1] Thu Dec 31 23:10:41 2009 @@ -91,6 +91,29 @@ IDS_DEV_SETPROPERTIES_FAILED "ReactOS tidak bisa mengubah setelan device ini." END +STRINGTABLE +BEGIN + IDS_PROP_DEVICEID "Device instance ID" + IDS_PROP_HARDWAREID "Hardware ID" + IDS_PROP_COMPATIBLEIDS "Compatible IDs" + IDS_PROP_MATCHINGDEVICEID "Matching Device ID" + IDS_PROP_SERVICE "Service" + IDS_PROP_ENUMERATOR "Enumerator" + IDS_PROP_DEVNODEFLAGS "Devnode Flags" + IDS_PROP_CONFIGFLAGS "Config Flags" + IDS_PROP_CSCONFIGFLAGS "CSConfig Flags" + IDS_PROP_EJECTRELATIONS "Eject Relations" + IDS_PROP_REMOVALRELATIONS "Removal Relations" + IDS_PROP_BUSRELATIONS "Bus Relations" + IDS_PROP_DEVUPPERFILTERS "Upper Filters" + IDS_PROP_DEVLOWERFILTERS "Lower Filters" + IDS_PROP_CLASSUPPERFILTERS "Upper Class Filters" + IDS_PROP_CLASSLOWERFILTERS "Lower Class Filters" + IDS_PROP_CLASSINSTALLER "Class Installer" + IDS_PROP_CLASSCOINSTALLER "Class Co-Installer" + IDS_PROP_DEVICECOINSTALLER "Device Co-Installer" +END + IDD_HARDWARE DIALOGEX DISCARDABLE 0, 0, 300, 400 STYLE DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CAPTION | DS_SHELLFONT FONT 8, "MS Shell Dlg" @@ -169,3 +192,33 @@ PUSHBUTTON "OK", IDOK, 167, 228, 50, 14 END +IDD_DEVICEDETAILS DIALOGEX DISCARDABLE 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Details" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX + COMBOBOX IDC_DETAILSPROPNAME, 7, 36, 238, 165, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "",IDC_DETAILSPROPVALUE,"SysListView32",LVS_REPORT | LVS_NOCOLUMNHEADER | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | + LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 58, 238, 155 +END + +IDD_DEVICERESOURCES DIALOGEX DISCARDABLE 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Resources" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX +END + +IDD_DEVICEPOWER DIALOGEX DISCARDABLE 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Power" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX +END Modified: trunk/reactos/dll/win32/devmgr/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/it-I… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/it-IT.rc [iso-8859-1] Thu Dec 31 23:10:41 2009 @@ -91,6 +91,29 @@ IDS_DEV_SETPROPERTIES_FAILED "ReactOS non può modificare le impostazioni di questo dispositivo." END +STRINGTABLE +BEGIN + IDS_PROP_DEVICEID "Device instance ID" + IDS_PROP_HARDWAREID "Hardware ID" + IDS_PROP_COMPATIBLEIDS "Compatible IDs" + IDS_PROP_MATCHINGDEVICEID "Matching Device ID" + IDS_PROP_SERVICE "Service" + IDS_PROP_ENUMERATOR "Enumerator" + IDS_PROP_DEVNODEFLAGS "Devnode Flags" + IDS_PROP_CONFIGFLAGS "Config Flags" + IDS_PROP_CSCONFIGFLAGS "CSConfig Flags" + IDS_PROP_EJECTRELATIONS "Eject Relations" + IDS_PROP_REMOVALRELATIONS "Removal Relations" + IDS_PROP_BUSRELATIONS "Bus Relations" + IDS_PROP_DEVUPPERFILTERS "Upper Filters" + IDS_PROP_DEVLOWERFILTERS "Lower Filters" + IDS_PROP_CLASSUPPERFILTERS "Upper Class Filters" + IDS_PROP_CLASSLOWERFILTERS "Lower Class Filters" + IDS_PROP_CLASSINSTALLER "Class Installer" + IDS_PROP_CLASSCOINSTALLER "Class Co-Installer" + IDS_PROP_DEVICECOINSTALLER "Device Co-Installer" +END + IDD_HARDWARE DIALOGEX DISCARDABLE 0, 0, 300, 400 STYLE DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CAPTION | DS_SHELLFONT FONT 8, "MS Shell Dlg" @@ -169,3 +192,33 @@ PUSHBUTTON "OK", IDOK, 167, 228, 50, 14 END +IDD_DEVICEDETAILS DIALOGEX DISCARDABLE 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Details" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX + COMBOBOX IDC_DETAILSPROPNAME, 7, 36, 238, 165, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "",IDC_DETAILSPROPVALUE,"SysListView32",LVS_REPORT | LVS_NOCOLUMNHEADER | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | + LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 58, 238, 155 +END + +IDD_DEVICERESOURCES DIALOGEX DISCARDABLE 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Resources" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX +END + +IDD_DEVICEPOWER DIALOGEX DISCARDABLE 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Power" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX +END Modified: trunk/reactos/dll/win32/devmgr/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/no-N… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/no-NO.rc [iso-8859-1] Thu Dec 31 23:10:41 2009 @@ -91,6 +91,29 @@ IDS_DEV_SETPROPERTIES_FAILED "ReactOS var ikke tilgjengelig for å endre innstillinger for denne enheten." END +STRINGTABLE +BEGIN + IDS_PROP_DEVICEID "Device instance ID" + IDS_PROP_HARDWAREID "Hardware ID" + IDS_PROP_COMPATIBLEIDS "Compatible IDs" + IDS_PROP_MATCHINGDEVICEID "Matching Device ID" + IDS_PROP_SERVICE "Service" + IDS_PROP_ENUMERATOR "Enumerator" + IDS_PROP_DEVNODEFLAGS "Devnode Flags" + IDS_PROP_CONFIGFLAGS "Config Flags" + IDS_PROP_CSCONFIGFLAGS "CSConfig Flags" + IDS_PROP_EJECTRELATIONS "Eject Relations" + IDS_PROP_REMOVALRELATIONS "Removal Relations" + IDS_PROP_BUSRELATIONS "Bus Relations" + IDS_PROP_DEVUPPERFILTERS "Upper Filters" + IDS_PROP_DEVLOWERFILTERS "Lower Filters" + IDS_PROP_CLASSUPPERFILTERS "Upper Class Filters" + IDS_PROP_CLASSLOWERFILTERS "Lower Class Filters" + IDS_PROP_CLASSINSTALLER "Class Installer" + IDS_PROP_CLASSCOINSTALLER "Class Co-Installer" + IDS_PROP_DEVICECOINSTALLER "Device Co-Installer" +END + IDD_HARDWARE DIALOGEX DISCARDABLE 0, 0, 300, 400 STYLE DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CAPTION | DS_SHELLFONT FONT 8, "MS Shell Dlg" @@ -169,3 +192,33 @@ PUSHBUTTON "OK", IDOK, 167, 228, 50, 14 END +IDD_DEVICEDETAILS DIALOGEX DISCARDABLE 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Details" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX + COMBOBOX IDC_DETAILSPROPNAME, 7, 36, 238, 165, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "",IDC_DETAILSPROPVALUE,"SysListView32",LVS_REPORT | LVS_NOCOLUMNHEADER | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | + LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 58, 238, 155 +END + +IDD_DEVICERESOURCES DIALOGEX DISCARDABLE 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Resources" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX +END + +IDD_DEVICEPOWER DIALOGEX DISCARDABLE 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Power" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX +END Modified: trunk/reactos/dll/win32/devmgr/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/pl-P… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/pl-PL.rc [iso-8859-1] Thu Dec 31 23:10:41 2009 @@ -98,6 +98,29 @@ IDS_DEV_SETPROPERTIES_FAILED "ReactOS nie by³ w stanie zmieniæ parametrów instalacyjnych tego urz¹dzenia." END +STRINGTABLE +BEGIN + IDS_PROP_DEVICEID "Device instance ID" + IDS_PROP_HARDWAREID "Hardware ID" + IDS_PROP_COMPATIBLEIDS "Compatible IDs" + IDS_PROP_MATCHINGDEVICEID "Matching Device ID" + IDS_PROP_SERVICE "Service" + IDS_PROP_ENUMERATOR "Enumerator" + IDS_PROP_DEVNODEFLAGS "Devnode Flags" + IDS_PROP_CONFIGFLAGS "Config Flags" + IDS_PROP_CSCONFIGFLAGS "CSConfig Flags" + IDS_PROP_EJECTRELATIONS "Eject Relations" + IDS_PROP_REMOVALRELATIONS "Removal Relations" + IDS_PROP_BUSRELATIONS "Bus Relations" + IDS_PROP_DEVUPPERFILTERS "Upper Filters" + IDS_PROP_DEVLOWERFILTERS "Lower Filters" + IDS_PROP_CLASSUPPERFILTERS "Upper Class Filters" + IDS_PROP_CLASSLOWERFILTERS "Lower Class Filters" + IDS_PROP_CLASSINSTALLER "Class Installer" + IDS_PROP_CLASSCOINSTALLER "Class Co-Installer" + IDS_PROP_DEVICECOINSTALLER "Device Co-Installer" +END + IDD_HARDWARE DIALOGEX DISCARDABLE 0, 0, 300, 400 STYLE DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CAPTION | DS_SHELLFONT FONT 8, "MS Shell Dlg" @@ -154,5 +177,35 @@ LTEXT "Wywietla informacje szczegó³owe.", -1, 91, 110, 154, 17, SS_NOPREFIX END - - +IDD_DEVICEDETAILS DIALOGEX DISCARDABLE 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Details" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX + COMBOBOX IDC_DETAILSPROPNAME, 7, 36, 238, 165, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "",IDC_DETAILSPROPVALUE,"SysListView32",LVS_REPORT | LVS_NOCOLUMNHEADER | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | + LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 58, 238, 155 +END + +IDD_DEVICERESOURCES DIALOGEX DISCARDABLE 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Resources" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX +END + +IDD_DEVICEPOWER DIALOGEX DISCARDABLE 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Power" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX +END + + Modified: trunk/reactos/dll/win32/devmgr/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/pt-B… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/pt-BR.rc [iso-8859-1] Thu Dec 31 23:10:41 2009 @@ -91,6 +91,29 @@ IDS_DEV_SETPROPERTIES_FAILED "ReactOS não pôde alterar as configurações para este dispositivo." END +STRINGTABLE +BEGIN + IDS_PROP_DEVICEID "Device instance ID" + IDS_PROP_HARDWAREID "Hardware ID" + IDS_PROP_COMPATIBLEIDS "Compatible IDs" + IDS_PROP_MATCHINGDEVICEID "Matching Device ID" + IDS_PROP_SERVICE "Service" + IDS_PROP_ENUMERATOR "Enumerator" + IDS_PROP_DEVNODEFLAGS "Devnode Flags" + IDS_PROP_CONFIGFLAGS "Config Flags" + IDS_PROP_CSCONFIGFLAGS "CSConfig Flags" + IDS_PROP_EJECTRELATIONS "Eject Relations" + IDS_PROP_REMOVALRELATIONS "Removal Relations" + IDS_PROP_BUSRELATIONS "Bus Relations" + IDS_PROP_DEVUPPERFILTERS "Upper Filters" + IDS_PROP_DEVLOWERFILTERS "Lower Filters" + IDS_PROP_CLASSUPPERFILTERS "Upper Class Filters" + IDS_PROP_CLASSLOWERFILTERS "Lower Class Filters" + IDS_PROP_CLASSINSTALLER "Class Installer" + IDS_PROP_CLASSCOINSTALLER "Class Co-Installer" + IDS_PROP_DEVICECOINSTALLER "Device Co-Installer" +END + IDD_HARDWARE DIALOGEX DISCARDABLE 0, 0, 300, 400 STYLE DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CAPTION | DS_SHELLFONT FONT 8, "MS Shell Dlg" @@ -168,3 +191,34 @@ LTEXT "", IDC_DIGITALSIGNER, 66, 182, 155, 8 PUSHBUTTON "OK", IDOK, 167, 228, 50, 14 END + +IDD_DEVICEDETAILS DIALOGEX DISCARDABLE 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Details" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX + COMBOBOX IDC_DETAILSPROPNAME, 7, 36, 238, 165, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "",IDC_DETAILSPROPVALUE,"SysListView32",LVS_REPORT | LVS_NOCOLUMNHEADER | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | + LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 58, 238, 155 +END + +IDD_DEVICERESOURCES DIALOGEX DISCARDABLE 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Resources" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX +END + +IDD_DEVICEPOWER DIALOGEX DISCARDABLE 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Power" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX +END Modified: trunk/reactos/dll/win32/devmgr/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/ro-R… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/ro-RO.rc [iso-8859-1] Thu Dec 31 23:10:41 2009 @@ -8,89 +8,112 @@ BEGIN IDS_NAME "Nume" IDS_TYPE "Tip" - IDS_MANUFACTURER "ProducÄtor: %1" - IDS_LOCATION "LocaÈie: %1" + IDS_MANUFACTURER "Producator: %1" + IDS_LOCATION "Loca?ie: %1" IDS_STATUS "Stare dispozitiv: %1" IDS_UNKNOWN "Necunoscut" - IDS_LOCATIONSTR "LocaÈie %1!u! (%2)" + IDS_LOCATIONSTR "Loca?ie %1!u! (%2)" IDS_DEVCODE " (Cod %1!u!)" IDS_DEVCODE2 " (Cod %2!u!)" IDS_ENABLEDEVICE "Folosire dispozitiv (activare)" IDS_DISABLEDEVICE "Nu folosi dispozitivul (dezactivare)" IDS_UNKNOWNDEVICE "Dispozitiv necunoscut" - IDS_NODRIVERLOADED "Nu existÄ drivere instalate pentru acest dispozitiv." + IDS_NODRIVERLOADED "Nu exista drivere instalate pentru acest dispozitiv." IDS_DEVONPARENT "pe %1" IDS_TROUBLESHOOTDEV "&Depanare..." IDS_ENABLEDEV "A&ctivare" IDS_REINSTALLDRV "Re&instalare driver" - IDS_PROPERTIES "P&roprietÄÈi" + IDS_PROPERTIES "P&roprieta?i" IDS_UPDATEDRV "A&ctualizare driver..." IDS_REBOOT "Repornire &computer..." IDS_NOTAVAILABLE "Indisponibil" IDS_NOTDIGITALLYSIGNED "Nesemnat digital" - IDS_NODRIVERS "Nu sunt necesare fiÈiere driver pentru acest dispozitiv sau nu a fost Ã®ncÄrcat niciunul." + IDS_NODRIVERS "Nu sunt necesare fi?iere driver pentru acest dispozitiv sau nu a fost Ã®ncarcat niciunul." END /* error messages, source: http://www.z123.org/techsupport/medm.htm */ STRINGTABLE BEGIN - IDS_DEV_NO_PROBLEM "Acest dispozitiv funcÈioneazÄ bine." + IDS_DEV_NO_PROBLEM "Acest dispozitiv func?ioneaza bine." IDS_DEV_NOT_CONFIGURED "Acest dispozitiv nu e configurat corect." - IDS_DEV_DEVLOADER_FAILED "ReactOS nu a putut Ã®ncÄrca driverul deoarece computerul indicÄ douÄ tipuri de magistrale $1." - IDS_DEV_DEVLOADER_FAILED2 "ÃncÄrcÄtorul sau Ã®ncÄrcÄtoarele pentru dispozitivul $1 nu au putut Ã®ncÄrca driverul." - IDS_DEV_OUT_OF_MEMORY "Este posibil ca driverul sÄ fie stricat sau sistemul dumneavoastrÄ ruleazÄ pe puÈinÄ memorie." - IDS_DEV_ENTRY_IS_WRONG_TYPE "Acest dispozitiv nu funcÈioneazÄ bine deoarece cel puÈin unul din driverele lui este stricat sau este avariat sistemul de registri." - IDS_DEV_LACKED_ARBITRATOR "Driverul acestui dispozitiv solicitÄ un tip de resurse cu care ReactOS nu Ètie sÄ lucreze." - IDS_DEV_BOOT_CONFIG_CONFLICT "Alt dispozitiv foloseÈte deja resursele acestui dispozitiv." + IDS_DEV_DEVLOADER_FAILED "ReactOS nu a putut Ã®ncarca driverul deoarece computerul indica doua tipuri de magistrale $1." + IDS_DEV_DEVLOADER_FAILED2 "Ãncarcatorul sau Ã®ncarcatoarele pentru dispozitivul $1 nu au putut Ã®ncarca driverul." + IDS_DEV_OUT_OF_MEMORY "Este posibil ca driverul sa fie stricat sau sistemul dumneavoastra ruleaza pe pu?ina memorie." + IDS_DEV_ENTRY_IS_WRONG_TYPE "Acest dispozitiv nu func?ioneaza bine deoarece cel pu?in unul din driverele lui este stricat sau este avariat sistemul de registri." + IDS_DEV_LACKED_ARBITRATOR "Driverul acestui dispozitiv solicita un tip de resurse cu care ReactOS nu ?tie sa lucreze." + IDS_DEV_BOOT_CONFIG_CONFLICT "Alt dispozitiv folose?te deja resursele acestui dispozitiv." IDS_DEV_FAILED_FILTER "Driverele pentru acest dispozitiv trebuiesc reinstalate." - IDS_DEV_DEVLOADER_NOT_FOUND "Acest dispozitiv nu funcÈioneazÄ bine deoarece ReactOS nu poate deschide fiÈierul $1 care Ã®ncarcÄ driverul." - IDS_DEV_DEVLOADER_NOT_FOUND2 "Acest dispozitiv nu funcÈioneazÄ bine deoare fiÈierul $1 care Ã®ncarcÄ driverul este stricat." - IDS_DEV_DEVLOADER_NOT_FOUND3 "DefecÈiune dispozitiv: ÃncercaÈi sÄ schimbaÈi driverul. DacÄ asta nu rezolvÄ problema, vedeÈi documentaÈia driverului." - IDS_DEV_INVALID_DATA "Acest dispozitiv nu funcÈioneazÄ bine deoarece sistemul BIOS al computerului raporteazÄ resursele dispozitivului greÈit." - IDS_DEV_INVALID_DATA2 "Acest dispozitiv nu funcÈioneazÄ bine deoarece sistemul BIOS al dispozitivului raporteazÄ resursele dispozitivului greÈit. " - IDS_DEV_FAILED_START "Acest dispozitiv fie nu e prezent, fie nu funcÈioneazÄ bine, fie nu are toate driverele instalate." - IDS_DEV_LIAR "ReactOS s-a blocat cÃ¢nd a Ã®ncercat sÄ porneascÄ dispozitivul Èi astfel nu va mai Ã®ncerca sÄ Ã®l porneascÄ din nou." - IDS_DEV_NORMAL_CONFLICT "Acest dispozitiv nu are la dispoziÈie $1 resurse pentru folosiinÈÄ." - IDS_DEV_NOT_VERIFIED "Acest dispozitiv fie nu e prezent, fie nu funcÈioneazÄ bine, fie nu are toate driverele instalate." - IDS_DEV_NEED_RESTART "Acest dispozitiv nu poate funcÈiona ." + IDS_DEV_DEVLOADER_NOT_FOUND "Acest dispozitiv nu func?ioneaza bine deoarece ReactOS nu poate deschide fi?ierul $1 care Ã®ncarca driverul." + IDS_DEV_DEVLOADER_NOT_FOUND2 "Acest dispozitiv nu func?ioneaza bine deoare fi?ierul $1 care Ã®ncarca driverul este stricat." + IDS_DEV_DEVLOADER_NOT_FOUND3 "Defec?iune dispozitiv: Ãncerca?i sa schimba?i driverul. Daca asta nu rezolva problema, vede?i documenta?ia driverului." + IDS_DEV_INVALID_DATA "Acest dispozitiv nu func?ioneaza bine deoarece sistemul BIOS al computerului raporteaza resursele dispozitivului gre?it." + IDS_DEV_INVALID_DATA2 "Acest dispozitiv nu func?ioneaza bine deoarece sistemul BIOS al dispozitivului raporteaza resursele dispozitivului gre?it. " + IDS_DEV_FAILED_START "Acest dispozitiv fie nu e prezent, fie nu func?ioneaza bine, fie nu are toate driverele instalate." + IDS_DEV_LIAR "ReactOS s-a blocat cÃ¢nd a Ã®ncercat sa porneasca dispozitivul ?i astfel nu va mai Ã®ncerca sa Ã®l porneasca din nou." + IDS_DEV_NORMAL_CONFLICT "Acest dispozitiv nu are la dispozi?ie $1 resurse pentru folosiin?a." + IDS_DEV_NOT_VERIFIED "Acest dispozitiv fie nu e prezent, fie nu func?ioneaza bine, fie nu are toate driverele instalate." + IDS_DEV_NEED_RESTART "Acest dispozitiv nu poate func?iona ." IDS_DEV_REENUMERATION "Acest dispoztiv produce un conflict de resurse." - IDS_DEV_PARTIAL_LOG_CONF "ReactOS nu a putut identifica toate resursele pe care acest dispozitiv le foloseÈte." - IDS_DEV_UNKNOWN_RESOURCE "FiÈierul de informaÈii $1 spune acestui sub-dispozitiv sÄ foloseascÄ o resursÄ pe care dispozitivul-pÄrinte nu o are sau nu o recunoaÈte." + IDS_DEV_PARTIAL_LOG_CONF "ReactOS nu a putut identifica toate resursele pe care acest dispozitiv le folose?te." + IDS_DEV_UNKNOWN_RESOURCE "Fi?ierul de informa?ii $1 spune acestui sub-dispozitiv sa foloseasca o resursa pe care dispozitivul-parinte nu o are sau nu o recunoa?te." IDS_DEV_REINSTALL "Driverele pentru acest dispozitiv trebuiesc reinstalate." - IDS_DEV_REGISTRY "Se pare cÄ registrii sunt avariaÈi." - IDS_DEV_WILL_BE_REMOVED "ReactOS eliminÄ Ã®n acest moment dispozitivul." - IDS_DEV_DISABLED "Acest dispozitiv nu e pornit Ã®ncÄ." + IDS_DEV_REGISTRY "Se pare ca registrii sunt avaria?i." + IDS_DEV_WILL_BE_REMOVED "ReactOS elimina Ã®n acest moment dispozitivul." + IDS_DEV_DISABLED "Acest dispozitiv nu e pornit Ã®nca." IDS_DEV_DISABLED2 "Acest dispozitiv este dezactivat." - IDS_DEV_DEVLOADER_NOT_READY "ÃncÄrcÄtoarele pentru acest dispozitiv nu pot Ã®ncÄrca driverele necesare." - IDS_DEV_DEVLOADER_NOT_READY2 "Acest adaptor pentru monitor funcÈioneazÄ bine." - IDS_DEV_DEVLOADER_NOT_READY3 "ÃncÄrcÄtoarele pentru acest dispozitiv nu pot Ã®ncÄrca driverele necesare." - IDS_DEV_DEVICE_NOT_THERE "Acest dispozitiv fie nu e prezent, fie nu funcÈioneazÄ bine, fie nu are toate driverele instalate." - IDS_DEV_MOVED "ReactOS instaleazÄ Ã®n acest moment acest dispozitiv." - IDS_DEV_TOO_EARLY "ReactOS instaleazÄ Ã®n acest moment acest dispozitiv." + IDS_DEV_DEVLOADER_NOT_READY "Ãncarcatoarele pentru acest dispozitiv nu pot Ã®ncarca driverele necesare." + IDS_DEV_DEVLOADER_NOT_READY2 "Acest adaptor pentru monitor func?ioneaza bine." + IDS_DEV_DEVLOADER_NOT_READY3 "Ãncarcatoarele pentru acest dispozitiv nu pot Ã®ncarca driverele necesare." + IDS_DEV_DEVICE_NOT_THERE "Acest dispozitiv fie nu e prezent, fie nu func?ioneaza bine, fie nu are toate driverele instalate." + IDS_DEV_MOVED "ReactOS instaleaza Ã®n acest moment acest dispozitiv." + IDS_DEV_TOO_EARLY "ReactOS instaleaza Ã®n acest moment acest dispozitiv." IDS_DEV_NO_VALID_LOG_CONF "ReactOS nu poate specifica resoursele pentru acest dispozitiv." IDS_DEV_FAILED_INSTALL "Driverele pentru acest dispozitiv nu sunt instalate." - IDS_DEV_HARDWARE_DISABLED "Acest dispozitiv este dezactivat deoarece sistemul BIOS al acestuia nu Ã®i rezervÄ nicio resursÄ." - IDS_DEV_CANT_SHARE_IRQ "Acest dispozitiv foloseÈte o resursÄ Interrupt Request - Cerere de Ãntrerupere (IRQ) care este folositÄ deja de alt dispozitiv Èi nu poate fi folositÄ Ã®n comun.\nTrebuie sÄ schimbaÈi setÄrile care intrÄ Ã®n conflict sau sÄ eliminaÈi driverul Ã®n mod real care produce conflictul." - IDS_DEV_FAILED_ADD "Acest dispozitiv nu funcÈioneazÄ bine deoarcere $1 nu funcÈioneazÄ corect." - IDS_DEV_DISABLED_SERVICE "ReactOS nu poate instala driverele pentru acest dispozitiv deoarece nu poate accesa locaÈia unde sunt stocate fiÈierele de instalare." - IDS_DEV_TRANSLATION_FAILED "Acest dispozitiv nu rÄspunde la comenzile driverului." - IDS_DEV_NO_SOFTCONFIG "ReactOS nu poate determina setÄrile acestui dispozitiv. ConsultaÈi documentaÈia care a venit cu acesta Èi folosiÈi fila Resurse pentru a seta configuraÈia." - IDS_DEV_BIOS_TABLE "Computerul dumneavoastrÄ nu conÈine componentele (fizice sau virtuale) necesare pentru a configura Èi a lucra cu acest dispozitiv. \nPentru a folosi acest dispozitiv, contactaÈi producÄtorul computerului pentru o actualizare a sistemului BIOS Èi a firmware-ului." - IDS_DEV_IRQ_TRANSLATION_FAILED "Acest dispozitiv a solicitat o Ã®ntrerupere PCI pe cÃ¢nd el este configurat pentru Ã®ntreruperi ISA (sau viceversa). \nVÄ rugÄm folosiÈi programul de configurare sistem pentru a configura Ã®ntreruperile." - IDS_DEV_FAILED_DRIVER_ENTRY "ReactOS nu poate iniÈializa driverul pentru acest dispozitiv." - IDS_DEV_DRIVER_FAILED_PRIOR_UNLOAD "ReactOS nu poate Ã®ncÄrca driverul pentru acest dispozitiv deoarece acesta este deja Ã®ncÄrcat Ã®n memorie." - IDS_DEV_DRIVER_FAILED_LOAD "ReactOS nu poate Ã®ncÄrca driverul pentru acest dispozitiv. Este posibil ca acesta sÄ fie stricat sau sÄ lipseascÄ." + IDS_DEV_HARDWARE_DISABLED "Acest dispozitiv este dezactivat deoarece sistemul BIOS al acestuia nu Ã®i rezerva nicio resursa." + IDS_DEV_CANT_SHARE_IRQ "Acest dispozitiv folose?te o resursa Interrupt Request - Cerere de Ãntrerupere (IRQ) care este folosita deja de alt dispozitiv ?i nu poate fi folosita Ã®n comun.\nTrebuie sa schimba?i setarile care intra Ã®n conflict sau sa elimina?i driverul Ã®n mod real care produce conflictul." + IDS_DEV_FAILED_ADD "Acest dispozitiv nu func?ioneaza bine deoarcere $1 nu func?ioneaza corect." + IDS_DEV_DISABLED_SERVICE "ReactOS nu poate instala driverele pentru acest dispozitiv deoarece nu poate accesa loca?ia unde sunt stocate fi?ierele de instalare." + IDS_DEV_TRANSLATION_FAILED "Acest dispozitiv nu raspunde la comenzile driverului." + IDS_DEV_NO_SOFTCONFIG "ReactOS nu poate determina setarile acestui dispozitiv. Consulta?i documenta?ia care a venit cu acesta ?i folosi?i fila Resurse pentru a seta configura?ia." + IDS_DEV_BIOS_TABLE "Computerul dumneavoastra nu con?ine componentele (fizice sau virtuale) necesare pentru a configura ?i a lucra cu acest dispozitiv. \nPentru a folosi acest dispozitiv, contacta?i producatorul computerului pentru o actualizare a sistemului BIOS ?i a firmware-ului." + IDS_DEV_IRQ_TRANSLATION_FAILED "Acest dispozitiv a solicitat o Ã®ntrerupere PCI pe cÃ¢nd el este configurat pentru Ã®ntreruperi ISA (sau viceversa). \nVa rugam folosi?i programul de configurare sistem pentru a configura Ã®ntreruperile." + IDS_DEV_FAILED_DRIVER_ENTRY "ReactOS nu poate ini?ializa driverul pentru acest dispozitiv." + IDS_DEV_DRIVER_FAILED_PRIOR_UNLOAD "ReactOS nu poate Ã®ncarca driverul pentru acest dispozitiv deoarece acesta este deja Ã®ncarcat Ã®n memorie." + IDS_DEV_DRIVER_FAILED_LOAD "ReactOS nu poate Ã®ncarca driverul pentru acest dispozitiv. Este posibil ca acesta sa fie stricat sau sa lipseasca." IDS_DEV_DRIVER_SERVICE_KEY_INVALID "ReactOS nu poate accesa dispozitivul deoarece cheile din registri pentru acest dispozitiv deoarece acestea lipsesc sau nu sunt corect Ã®nregistrate." - IDS_DEV_LEGACY_SERVICE_NO_DEVICES "ReactOS a Ã®ncÄrcat cu succes driverul pentru acest dispozitiv dar nu gÄseÈte dispozitivul." - IDS_DEV_DUPLICATE_DEVICE "ReactOS nu poate Ã®ncÄrca driverul deoarece existÄ un dispozitiv dublurÄ care deja funcÈioneazÄ." + IDS_DEV_LEGACY_SERVICE_NO_DEVICES "ReactOS a Ã®ncarcat cu succes driverul pentru acest dispozitiv dar nu gase?te dispozitivul." + IDS_DEV_DUPLICATE_DEVICE "ReactOS nu poate Ã®ncarca driverul deoarece exista un dispozitiv dublura care deja func?ioneaza." IDS_DEV_FAILED_POST_START "ReactOS a oprit dispozitivul deoarece acesta a indicat probleme." - IDS_DEV_HALTED "O aplicaÈie sau un serviciu a oprit acest dispozitiv." + IDS_DEV_HALTED "O aplica?ie sau un serviciu a oprit acest dispozitiv." IDS_DEV_PHANTOM "Acest dispozitiv nu este conectat la computer." IDS_DEV_SYSTEM_SHUTDOWN "ReactOS nu poate accesa dispozitivul deoarece sistemul de operare este Ã®n curs de Ã®nchidere." - IDS_DEV_HELD_FOR_EJECT "ReactOS nu poate folosi acest dispozitiv deoarece acesta a fost pregÄtit pentru eliminarea Ã®n siguranÈÄ dar Ã®ncÄ nu a fost deconectat." - IDS_DEV_DRIVER_BLOCKED "Software-ul acestui dispozitiv a fost oprit deoarece se cunoaÈte cÄ acesta Ã®ntÃ¢mpinÄ probleme pe ReactOS. ContactaÈi vÃ¢nzÄtorul driverului pentru unul nou." + IDS_DEV_HELD_FOR_EJECT "ReactOS nu poate folosi acest dispozitiv deoarece acesta a fost pregatit pentru eliminarea Ã®n siguran?a dar Ã®nca nu a fost deconectat." + IDS_DEV_DRIVER_BLOCKED "Software-ul acestui dispozitiv a fost oprit deoarece se cunoa?te ca acesta Ã®ntÃ¢mpina probleme pe ReactOS. Contacta?i vÃ¢nzatorul driverului pentru unul nou." IDS_DEV_REGISTRY_TOO_LARGE "ReactOS nu poate porni acest dispozitiv deoarece hive-ul de sistem este prea mare." - IDS_DEV_SETPROPERTIES_FAILED "ReactOS nu a putut schimba setÄrile acestui dispozitiv." + IDS_DEV_SETPROPERTIES_FAILED "ReactOS nu a putut schimba setarile acestui dispozitiv." +END + +STRINGTABLE +BEGIN + IDS_PROP_DEVICEID "Device instance ID" + IDS_PROP_HARDWAREID "Hardware ID" + IDS_PROP_COMPATIBLEIDS "Compatible IDs" + IDS_PROP_MATCHINGDEVICEID "Matching Device ID" + IDS_PROP_SERVICE "Service" + IDS_PROP_ENUMERATOR "Enumerator" + IDS_PROP_DEVNODEFLAGS "Devnode Flags" + IDS_PROP_CONFIGFLAGS "Config Flags" + IDS_PROP_CSCONFIGFLAGS "CSConfig Flags" + IDS_PROP_EJECTRELATIONS "Eject Relations" + IDS_PROP_REMOVALRELATIONS "Removal Relations" + IDS_PROP_BUSRELATIONS "Bus Relations" + IDS_PROP_DEVUPPERFILTERS "Upper Filters" + IDS_PROP_DEVLOWERFILTERS "Lower Filters" + IDS_PROP_CLASSUPPERFILTERS "Upper Class Filters" + IDS_PROP_CLASSLOWERFILTERS "Lower Class Filters" + IDS_PROP_CLASSINSTALLER "Class Installer" + IDS_PROP_CLASSCOINSTALLER "Class Co-Installer" + IDS_PROP_DEVICECOINSTALLER "Device Co-Installer" END IDD_HARDWARE DIALOGEX DISCARDABLE 0, 0, 300, 400 @@ -101,13 +124,13 @@ CONTROL "",IDC_LV_DEVICES,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,16,196,50 - GROUPBOX "ProprietÄÈi dispozitiv",IDC_PROPERTIESGROUP,7,76,196,105 + GROUPBOX "Proprieta?i dispozitiv",IDC_PROPERTIESGROUP,7,76,196,105 LTEXT "",IDC_MANUFACTURER,14,88,183,10,SS_ENDELLIPSIS LTEXT "",IDC_LOCATION,14,100,183,10,SS_ENDELLIPSIS LTEXT "",IDC_STATUS,14,112,183,30 PUSHBUTTON "&Depanare...",IDC_TROUBLESHOOT,85,140,54,14, BS_PUSHBUTTON | WS_CHILD | WS_DISABLED | WS_TABSTOP - PUSHBUTTON "P&roprietÄÈi",IDC_PROPERTIES,146,140,50,14 + PUSHBUTTON "P&roprieta?i",IDC_PROPERTIES,146,140,50,14 END IDD_DEVICEGENERAL DIALOGEX DISCARDABLE 0, 0, 252, 218 @@ -119,9 +142,9 @@ LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX LTEXT "Tip dispozitiv:", -1, 37, 39, 60, 8, SS_NOPREFIX EDITTEXT IDC_DEVTYPE, 100, 39, 146, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY - LTEXT "ProducÄtor:", -1, 37, 53, 60, 8, SS_NOPREFIX + LTEXT "Producator:", -1, 37, 53, 60, 8, SS_NOPREFIX EDITTEXT IDC_DEVMANUFACTURER, 100, 53, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY - LTEXT "LocaÈie:", -1, 37, 67, 60, 8, SS_NOPREFIX + LTEXT "Loca?ie:", -1, 37, 67, 60, 8, SS_NOPREFIX EDITTEXT IDC_DEVLOCATION, 100, 67, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY GROUPBOX "Stare dispozitiv", IDC_DEVSTATUSGROUP, 7, 83, 238, 100 EDITTEXT IDC_DEVSTATUS, 14, 96, 224, 61, NOT WS_TABSTOP | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL @@ -139,30 +162,30 @@ LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX LTEXT "Furnizor driver:", -1, 37, 39, 60, 8, SS_NOPREFIX EDITTEXT IDC_DRVPROVIDER, 100, 39, 146, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY - LTEXT "DatÄ driver:", -1, 37, 53, 60, 8, SS_NOPREFIX + LTEXT "Data driver:", -1, 37, 53, 60, 8, SS_NOPREFIX EDITTEXT IDC_DRVDATE, 100, 53, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY LTEXT "Versiune driver:", -1, 37, 67, 60, 8, SS_NOPREFIX EDITTEXT IDC_DRVVERSION, 100, 67, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY LTEXT "Semnatar digital:", -1, 37, 81, 60, 8, SS_NOPREFIX EDITTEXT IDC_DIGITALSIGNER, 100, 81, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY PUSHBUTTON "&Detalii...", IDC_DRIVERDETAILS, 7, 106, 70, 15 - LTEXT "Pentru a vedea detalii despre fiÈierele driver.", -1, 91, 110, 154, 17, SS_NOPREFIX + LTEXT "Pentru a vedea detalii despre fi?ierele driver.", -1, 91, 110, 154, 17, SS_NOPREFIX END IDD_DRIVERDETAILS DIALOGEX DISCARDABLE 0, 0, 224, 250 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME -CAPTION "Detalii fiÈiere driver" -FONT 8, "MS Shell Dlg" -BEGIN - ICON "", IDC_DEVICON, 7, 7, 20, 20 - LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX - LTEXT "&FiÈiere driver:", -1, 7, 36, 204, 8 +CAPTION "Detalii fi?iere driver" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX + LTEXT "&Fi?iere driver:", -1, 7, 36, 204, 8 CONTROL "", IDC_DRIVERFILES, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_SORTASCENDING | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 46, 209, 80 LTEXT "Furnizor:", -1, 14, 134, 50, 8 LTEXT "", IDC_FILEPROVIDER, 66, 134, 155, 8 - LTEXT "Versiune fiÈier:", -1, 14, 150, 50, 8 + LTEXT "Versiune fi?ier:", -1, 14, 150, 50, 8 LTEXT "", IDC_FILEVERSION, 66, 150, 155, 8 LTEXT "Drept de autor:", -1, 14, 166, 50, 8 LTEXT "", IDC_FILECOPYRIGHT, 66, 166, 155, 8 @@ -171,4 +194,35 @@ PUSHBUTTON "OK", IDOK, 167, 228, 50, 14 END +IDD_DEVICEDETAILS DIALOGEX DISCARDABLE 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Details" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX + COMBOBOX IDC_DETAILSPROPNAME, 7, 36, 238, 165, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "",IDC_DETAILSPROPVALUE,"SysListView32",LVS_REPORT | LVS_NOCOLUMNHEADER | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | + LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 58, 238, 155 +END + +IDD_DEVICERESOURCES DIALOGEX DISCARDABLE 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Resources" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX +END + +IDD_DEVICEPOWER DIALOGEX DISCARDABLE 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Power" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX +END + #pragma code_page(default) Modified: trunk/reactos/dll/win32/devmgr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/ru-R… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/ru-RU.rc [iso-8859-1] Thu Dec 31 23:10:41 2009 @@ -89,6 +89,29 @@ IDS_DEV_SETPROPERTIES_FAILED "ReactOS wasn\'t able to change the settings of this device." END +STRINGTABLE +BEGIN + IDS_PROP_DEVICEID "Device instance ID" + IDS_PROP_HARDWAREID "Hardware ID" + IDS_PROP_COMPATIBLEIDS "Compatible IDs" + IDS_PROP_MATCHINGDEVICEID "Matching Device ID" + IDS_PROP_SERVICE "Service" + IDS_PROP_ENUMERATOR "Enumerator" + IDS_PROP_DEVNODEFLAGS "Devnode Flags" + IDS_PROP_CONFIGFLAGS "Config Flags" + IDS_PROP_CSCONFIGFLAGS "CSConfig Flags" + IDS_PROP_EJECTRELATIONS "Eject Relations" + IDS_PROP_REMOVALRELATIONS "Removal Relations" + IDS_PROP_BUSRELATIONS "Bus Relations" + IDS_PROP_DEVUPPERFILTERS "Upper Filters" + IDS_PROP_DEVLOWERFILTERS "Lower Filters" + IDS_PROP_CLASSUPPERFILTERS "Upper Class Filters" + IDS_PROP_CLASSLOWERFILTERS "Lower Class Filters" + IDS_PROP_CLASSINSTALLER "Class Installer" + IDS_PROP_CLASSCOINSTALLER "Class Co-Installer" + IDS_PROP_DEVICECOINSTALLER "Device Co-Installer" +END + IDD_HARDWARE DIALOGEX DISCARDABLE 0, 0, 300, 400 STYLE DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CAPTION | DS_SHELLFONT FONT 8, "MS Shell Dlg" @@ -167,4 +190,34 @@ PUSHBUTTON "OK", IDOK, 167, 228, 50, 14 END - +IDD_DEVICEDETAILS DIALOGEX DISCARDABLE 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Details" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX + COMBOBOX IDC_DETAILSPROPNAME, 7, 36, 238, 165, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "",IDC_DETAILSPROPVALUE,"SysListView32",LVS_REPORT | LVS_NOCOLUMNHEADER | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | + LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 58, 238, 155 +END + +IDD_DEVICERESOURCES DIALOGEX DISCARDABLE 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Resources" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX +END + +IDD_DEVICEPOWER DIALOGEX DISCARDABLE 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Power" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX +END + Modified: trunk/reactos/dll/win32/devmgr/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/sk-S… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/sk-SK.rc [iso-8859-1] Thu Dec 31 23:10:41 2009 @@ -94,6 +94,29 @@ IDS_DEV_SETPROPERTIES_FAILED "ReactOS wasn\'t able to change the settings of this device." END +STRINGTABLE +BEGIN + IDS_PROP_DEVICEID "Device instance ID" + IDS_PROP_HARDWAREID "Hardware ID" + IDS_PROP_COMPATIBLEIDS "Compatible IDs" + IDS_PROP_MATCHINGDEVICEID "Matching Device ID" + IDS_PROP_SERVICE "Service" + IDS_PROP_ENUMERATOR "Enumerator" + IDS_PROP_DEVNODEFLAGS "Devnode Flags" + IDS_PROP_CONFIGFLAGS "Config Flags" + IDS_PROP_CSCONFIGFLAGS "CSConfig Flags" + IDS_PROP_EJECTRELATIONS "Eject Relations" + IDS_PROP_REMOVALRELATIONS "Removal Relations" + IDS_PROP_BUSRELATIONS "Bus Relations" + IDS_PROP_DEVUPPERFILTERS "Upper Filters" + IDS_PROP_DEVLOWERFILTERS "Lower Filters" + IDS_PROP_CLASSUPPERFILTERS "Upper Class Filters" + IDS_PROP_CLASSLOWERFILTERS "Lower Class Filters" + IDS_PROP_CLASSINSTALLER "Class Installer" + IDS_PROP_CLASSCOINSTALLER "Class Co-Installer" + IDS_PROP_DEVICECOINSTALLER "Device Co-Installer" +END + IDD_HARDWARE DIALOGEX DISCARDABLE 0, 0, 300, 400 STYLE DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CAPTION | DS_SHELLFONT FONT 8, "MS Shell Dlg" @@ -172,4 +195,33 @@ PUSHBUTTON "OK", IDOK, 167, 228, 50, 14 END - +IDD_DEVICEDETAILS DIALOGEX DISCARDABLE 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Details" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX + COMBOBOX IDC_DETAILSPROPNAME, 7, 36, 238, 165, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "",IDC_DETAILSPROPVALUE,"SysListView32",LVS_REPORT | LVS_NOCOLUMNHEADER | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | + LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 58, 238, 155 +END + +IDD_DEVICERESOURCES DIALOGEX DISCARDABLE 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Resources" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX +END + +IDD_DEVICEPOWER DIALOGEX DISCARDABLE 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Power" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX +END Modified: trunk/reactos/dll/win32/devmgr/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/uk-U… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/uk-UA.rc [iso-8859-1] Thu Dec 31 23:10:41 2009 @@ -97,6 +97,29 @@ IDS_DEV_SETPROPERTIES_FAILED "ReactOS wasn\'t able to change the settings of this device." END +STRINGTABLE +BEGIN + IDS_PROP_DEVICEID "Device instance ID" + IDS_PROP_HARDWAREID "Hardware ID" + IDS_PROP_COMPATIBLEIDS "Compatible IDs" + IDS_PROP_MATCHINGDEVICEID "Matching Device ID" + IDS_PROP_SERVICE "Service" + IDS_PROP_ENUMERATOR "Enumerator" + IDS_PROP_DEVNODEFLAGS "Devnode Flags" + IDS_PROP_CONFIGFLAGS "Config Flags" + IDS_PROP_CSCONFIGFLAGS "CSConfig Flags" + IDS_PROP_EJECTRELATIONS "Eject Relations" + IDS_PROP_REMOVALRELATIONS "Removal Relations" + IDS_PROP_BUSRELATIONS "Bus Relations" + IDS_PROP_DEVUPPERFILTERS "Upper Filters" + IDS_PROP_DEVLOWERFILTERS "Lower Filters" + IDS_PROP_CLASSUPPERFILTERS "Upper Class Filters" + IDS_PROP_CLASSLOWERFILTERS "Lower Class Filters" + IDS_PROP_CLASSINSTALLER "Class Installer" + IDS_PROP_CLASSCOINSTALLER "Class Co-Installer" + IDS_PROP_DEVICECOINSTALLER "Device Co-Installer" +END + IDD_HARDWARE DIALOGEX DISCARDABLE 0, 0, 300, 400 STYLE DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CAPTION | DS_SHELLFONT FONT 8, "MS Shell Dlg" @@ -175,4 +198,33 @@ PUSHBUTTON "OK", IDOK, 167, 228, 50, 14 END - +IDD_DEVICEDETAILS DIALOGEX DISCARDABLE 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Details" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX + COMBOBOX IDC_DETAILSPROPNAME, 7, 36, 238, 165, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "",IDC_DETAILSPROPVALUE,"SysListView32",LVS_REPORT | LVS_NOCOLUMNHEADER | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | + LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 58, 238, 155 +END + +IDD_DEVICERESOURCES DIALOGEX DISCARDABLE 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Resources" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX +END + +IDD_DEVICEPOWER DIALOGEX DISCARDABLE 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Power" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX +END Modified: trunk/reactos/dll/win32/devmgr/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/resource.… ============================================================================== --- trunk/reactos/dll/win32/devmgr/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/resource.h [iso-8859-1] Thu Dec 31 23:10:41 2009 @@ -8,6 +8,8 @@ #define IDD_DEVICEDRIVER 102 #define IDD_DEVICERESOURCES 103 #define IDD_DRIVERDETAILS 104 +#define IDD_DEVICEDETAILS 105 +#define IDD_DEVICEPOWER 106 #define IDC_DEVICON 0x57B #define IDC_DEVNAME 0x57C @@ -36,6 +38,8 @@ #define IDC_FILEPROVIDER 0x593 #define IDC_FILEVERSION 0x594 #define IDC_FILECOPYRIGHT 0x595 +#define IDC_DETAILSPROPNAME 0x596 +#define IDC_DETAILSPROPVALUE 0x597 #define IDS_NAME 0x100 #define IDS_TYPE 0x101 @@ -119,6 +123,26 @@ #define IDS_DEV_REGISTRY_TOO_LARGE 0x237 #define IDS_DEV_SETPROPERTIES_FAILED 0x238 +#define IDS_PROP_DEVICEID 0x300 +#define IDS_PROP_HARDWAREID 0x301 +#define IDS_PROP_COMPATIBLEIDS 0x302 +#define IDS_PROP_MATCHINGDEVICEID 0x303 +#define IDS_PROP_SERVICE 0x304 +#define IDS_PROP_ENUMERATOR 0x305 +#define IDS_PROP_DEVNODEFLAGS 0x306 +#define IDS_PROP_CONFIGFLAGS 0x307 +#define IDS_PROP_CSCONFIGFLAGS 0x308 +#define IDS_PROP_EJECTRELATIONS 0x309 +#define IDS_PROP_REMOVALRELATIONS 0x30A +#define IDS_PROP_BUSRELATIONS 0x30B +#define IDS_PROP_DEVUPPERFILTERS 0x30C +#define IDS_PROP_DEVLOWERFILTERS 0x30D +#define IDS_PROP_CLASSUPPERFILTERS 0x30E +#define IDS_PROP_CLASSLOWERFILTERS 0x30F +#define IDS_PROP_CLASSINSTALLER 0x310 +#define IDS_PROP_CLASSCOINSTALLER 0x311 +#define IDS_PROP_DEVICECOINSTALLER 0x312 + #endif /* __DEVMGR_RESOURCE_H */ /* EOF */

1 0

[tkreuzer] 44837: fix build of halxbox
by tkreuzer＠svn.reactos.org 31 Dec '09

31 Dec '09

Author: tkreuzer Date: Thu Dec 31 22:43:20 2009 New Revision: 44837 URL: http://svn.reactos.org/svn/reactos?rev=44837&view=rev Log: fix build of halxbox Modified: branches/ros-amd64-bringup/reactos/hal/halx86/halxbox.rbuild Modified: branches/ros-amd64-bringup/reactos/hal/halx86/halxbox.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halx86/halxbox.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halx86/halxbox.rbuild [iso-8859-1] Thu Dec 31 22:43:20 2009 @@ -10,11 +10,6 @@ <library>hal_generic</library> <library>hal_generic_up</library> <library>ntoskrnl</library> - <directory name="generic"> - <directory name="bus"> - <file>pcibus.c</file> - </directory> - </directory> <directory name="xbox"> <file>halinit_xbox.c</file> <file>part_xbox.c</file>

1 0

[tkreuzer] 44836: fix spec file for x86
by tkreuzer＠svn.reactos.org 31 Dec '09

31 Dec '09

Author: tkreuzer Date: Thu Dec 31 22:31:14 2009 New Revision: 44836 URL: http://svn.reactos.org/svn/reactos?rev=44836&view=rev Log: fix spec file for x86 Modified: branches/ros-amd64-bringup/reactos/hal/hal.pspec Modified: branches/ros-amd64-bringup/reactos/hal/hal.pspec URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/hal.pspec [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/hal.pspec [iso-8859-1] Thu Dec 31 22:31:14 2009 @@ -1,4 +1,5 @@ #include "include/reactos/msvctarget.h" +#undef i386 #ifdef _M_ARM @ fastcall ExAcquireFastMutex(ptr)

1 0

[tkreuzer] 44835: [HAL] - Move the rest from halamd64 to halx86
by tkreuzer＠svn.reactos.org 31 Dec '09

31 Dec '09

Author: tkreuzer Date: Thu Dec 31 22:23:01 2009 New Revision: 44835 URL: http://svn.reactos.org/svn/reactos?rev=44835&view=rev Log: [HAL] - Move the rest from halamd64 to halx86 Added: branches/ros-amd64-bringup/reactos/hal/halx86/generic/amd64/halinit.c - copied unchanged from r44833, branches/ros-amd64-bringup/reactos/hal/halamd64/generic/halinit.c branches/ros-amd64-bringup/reactos/hal/halx86/generic/amd64/misc.c - copied unchanged from r44833, branches/ros-amd64-bringup/reactos/hal/halamd64/generic/misc.c branches/ros-amd64-bringup/reactos/hal/halx86/generic/amd64/pic.c - copied unchanged from r44833, branches/ros-amd64-bringup/reactos/hal/halamd64/generic/pic.c branches/ros-amd64-bringup/reactos/hal/halx86/generic/amd64/usage.c - copied unchanged from r44833, branches/ros-amd64-bringup/reactos/hal/halamd64/generic/usage.c branches/ros-amd64-bringup/reactos/hal/halx86/mp/amd64/ (with props) branches/ros-amd64-bringup/reactos/hal/halx86/mp/amd64/mps.S - copied unchanged from r44833, branches/ros-amd64-bringup/reactos/hal/halamd64/generic/mps.S branches/ros-amd64-bringup/reactos/hal/halx86/mp/i386/ (with props) branches/ros-amd64-bringup/reactos/hal/halx86/mp/i386/mps.S - copied unchanged from r44833, branches/ros-amd64-bringup/reactos/hal/halx86/mp/mps.S branches/ros-amd64-bringup/reactos/hal/halx86/mp/i386/mpsboot.asm - copied unchanged from r44833, branches/ros-amd64-bringup/reactos/hal/halx86/mp/mpsboot.asm branches/ros-amd64-bringup/reactos/hal/halx86/mp/i386/spinlock.c - copied unchanged from r44833, branches/ros-amd64-bringup/reactos/hal/halx86/mp/spinlock.c Removed: branches/ros-amd64-bringup/reactos/hal/halamd64/ branches/ros-amd64-bringup/reactos/hal/halx86/mp/mps.S branches/ros-amd64-bringup/reactos/hal/halx86/mp/mpsboot.asm branches/ros-amd64-bringup/reactos/hal/halx86/mp/spinlock.c Modified: branches/ros-amd64-bringup/reactos/hal/hal.rbuild branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic.rbuild branches/ros-amd64-bringup/reactos/hal/halx86/halamd64.rbuild branches/ros-amd64-bringup/reactos/hal/halx86/halmps.rbuild Modified: branches/ros-amd64-bringup/reactos/hal/hal.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/hal.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/hal.rbuild [iso-8859-1] Thu Dec 31 22:23:01 2009 @@ -15,9 +15,4 @@ <xi:include href="halarm/directory.rbuild" /> </directory> </if> - <if property="ARCH" value="amd64"> - <directory name="halamd64"> - <xi:include href="halamd64/directory.rbuild" /> - </directory> - </if> </group> Modified: branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic.rbuild [iso-8859-1] Thu Dec 31 22:23:01 2009 @@ -38,8 +38,12 @@ </if> <if property="ARCH" value="amd64"> <directory name="amd64"> + <file>halinit.c</file> <file>irq.s</file> + <file>misc.c</file> + <file>pic.c</file> <file>systimer.S</file> + <file>usage.c</file> </directory> </if> </directory> Modified: branches/ros-amd64-bringup/reactos/hal/halx86/halamd64.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halx86/halamd64.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halx86/halamd64.rbuild [iso-8859-1] Thu Dec 31 22:23:01 2009 @@ -7,7 +7,6 @@ <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> <define name="_NTHAL_" /> - <library>hal_generic_amd64</library> <library>hal_generic</library> <library>hal_generic_up</library> <library>ntoskrnl</library> @@ -17,7 +16,9 @@ <file>halup.rc</file> </directory> -  + <directory name="mp"> + <directory name="amd64"> + <file>mps.S</file> + </directory> + </directory> </module> Modified: branches/ros-amd64-bringup/reactos/hal/halx86/halmps.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halx86/halmps.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halx86/halmps.rbuild [iso-8859-1] Thu Dec 31 22:23:01 2009 @@ -16,12 +16,14 @@ <file>ioapic.c</file> <file>ipi_mp.c</file> <file>mpconfig.c</file> - <file>mps.S</file> - <file>mpsboot.asm</file> <file>mpsirql.c</file> <file>processor_mp.c</file> - <file>spinlock.c</file> <file>halmp.rc</file> + <directory name="i386"> + <file>mps.S</file> + <file>mpsboot.asm</file> + <file>spinlock.c</file> + </directory> </directory> </module> </group> Propchange: branches/ros-amd64-bringup/reactos/hal/halx86/mp/amd64/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Thu Dec 31 22:23:01 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/ros-amd64-bringup/reactos/hal/halx86/mp/amd64/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/ros-amd64-bringup/reactos/hal/halx86/mp/amd64/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/ros-amd64-bringup/reactos/hal/halx86/mp/amd64/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Propchange: branches/ros-amd64-bringup/reactos/hal/halx86/mp/i386/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Thu Dec 31 22:23:01 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/ros-amd64-bringup/reactos/hal/halx86/mp/i386/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/ros-amd64-bringup/reactos/hal/halx86/mp/i386/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/ros-amd64-bringup/reactos/hal/halx86/mp/i386/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Removed: branches/ros-amd64-bringup/reactos/hal/halx86/mp/mps.S URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halx86/mp/mps.S [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halx86/mp/mps.S (removed) @@ -1,109 +1,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/hal/x86/mps.S - * PURPOSE: Intel MultiProcessor specification support - * PROGRAMMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) - * UPDATE HISTORY: - * Created 12/04/2001 - */ - -/* INCLUDES ******************************************************************/ - -#include <ndk/asm.h> - -/* FUNCTIONS *****************************************************************/ - -#define BEFORE \ - cld; \ - pusha; \ - pushl %ds; \ - pushl %es; \ - pushl %fs; \ - pushl %gs; \ - movl $(KGDT_R0_DATA), %eax; \ - movl %eax, %ds; \ - movl %eax, %es; \ - movl %eax, %gs; \ - movl $(KGDT_R0_PCR), %eax; \ - movl %eax, %fs; - -#define AFTER \ - popl %gs; \ - popl %fs; \ - popl %es; \ - popl %ds; \ - popa; - -.global _MpsIpiInterrupt -_MpsIpiInterrupt: - /* Save registers */ - BEFORE - - /* Call the C handler */ - call _MpsIpiHandler - - /* Return to the caller */ - AFTER - iret - - -.globl _MpsErrorInterrupt -_MpsErrorInterrupt: - /* Save registers */ - BEFORE - - /* Call the C handler */ - call _MpsErrorHandler - - /* Return to the caller */ - AFTER - iret - - -.globl _MpsSpuriousInterrupt -_MpsSpuriousInterrupt: - /* Save registers */ - BEFORE - - /* Call the C handler */ - call _MpsSpuriousHandler - - /* Return to the caller */ - AFTER - iret - -.global _MpsTimerInterrupt -_MpsTimerInterrupt: - cld - pusha - movl $0xef,%ebx - pushl %ds - pushl %es - pushl %fs - pushl %gs - movl $0xceafbeef,%eax - pushl %eax - movl $(KGDT_R0_DATA),%eax - movl %eax,%ds - movl %eax,%es - movl %eax,%gs - movl $(KGDT_R0_PCR),%eax - movl %eax,%fs - pushl %esp - pushl %ebx - call _MpsTimerHandler - popl %eax - popl %eax - popl %eax - popl %gs - popl %fs - popl %es - popl %ds - popa - iret - - - -/* EOF */ Removed: branches/ros-amd64-bringup/reactos/hal/halx86/mp/mpsboot.asm URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halx86/mp/mpsboot.asm [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halx86/mp/mpsboot.asm (removed) @@ -1,118 +1,0 @@ -; -; COPYRIGHT: See COPYING in the top level directory -; PROJECT: ReactOS kernel -; FILE: ntoskrnl/hal/x86/mpsboot.c -; PURPOSE: Bootstrap code for application processors -; PROGRAMMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) -; UPDATE HISTORY: -; Created 12/04/2001 -; - -; -; Memory map at this stage is: -; 0x2000 Location of our stack -; 0x3000 Startup code for the APs (this code) -; - -; -; Magic value to be put in EAX when multiboot.S is called as part of the -; application processor initialization process -; -AP_MAGIC equ 12481020h - - -X86_CR4_PAE equ 00000020h - -; -; Segment selectors -; -%define KERNEL_CS (0x8) -%define KERNEL_DS (0x10) - -section .text - -global _APstart -global _APend - -; 16 bit code -BITS 16 - -_APstart: - cli ; Just in case - - xor ax, ax - mov ds, ax - mov ss, ax - - mov eax, 3000h + APgdt - _APstart - lgdt [eax] - - mov eax, [2004h] ; Set the page directory - mov cr3, eax - - mov eax, [200ch] - cmp eax,0 - je NoPae - - mov eax,cr4 - or eax,X86_CR4_PAE - mov cr4,eax - -NoPae: - - mov eax, cr0 - or eax, 80010001h ; Turn on protected mode, paging and write protection - mov cr0, eax - - db 0eah - dw 3000h + flush - _APstart, KERNEL_CS - -; 32 bit code -BITS 32 - -flush: - mov ax, KERNEL_DS - mov ds, ax - mov es, ax - mov fs, ax - mov gs, ax - mov ss, ax - - ; Setup a stack for the AP - mov eax, 2000h - mov eax, [eax] - mov esp, eax - - ; Jump to start of the kernel with AP magic in ecx - mov ecx, AP_MAGIC - mov eax,[2008h] - jmp eax - - ; Never get here - - -; Temporary GDT descriptor for the APs - -APgdt: -; Limit - dw (3*8)-1 -; Base - dd 3000h + gdt - _APstart - -gdt: - dw 0x0 ; Null descriptor - dw 0x0 - dw 0x0 - dw 0x0 - - dw 0xffff ; Kernel code descriptor - dw 0x0000 - dw 0x9a00 - dw 0x00cf - - dw 0xffff ; Kernel data descriptor - dw 0x0000 - dw 0x9200 - dw 0x00cf - -_APend: Removed: branches/ros-amd64-bringup/reactos/hal/halx86/mp/spinlock.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halx86/mp/spinlock.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halx86/mp/spinlock.c (removed) @@ -1,201 +1,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/hal/x86/spinlock.c - * PURPOSE: Implements spinlocks - * PROGRAMMER: David Welch (welch(a)cwcom.net) - * Eric Kohl (ekohl(a)rz-online.de) - * UPDATE HISTORY: - * 09/06/2000 Created - */ - -/* - * NOTE: On a uniprocessor machine spinlocks are implemented by raising - * the irq level - */ - -/* INCLUDES ****************************************************************/ - -#include <hal.h> -#define NDEBUG -#include <debug.h> - -/* Hmm, needed for KDBG := 1. Why? */ -#undef KeGetCurrentIrql - -/* FUNCTIONS ***************************************************************/ - -#undef KeAcquireSpinLock -VOID NTAPI -KeAcquireSpinLock ( - PKSPIN_LOCK SpinLock, - PKIRQL OldIrql - ) -/* - * FUNCTION: Acquires a spinlock - * ARGUMENTS: - * SpinLock = Spinlock to acquire - * OldIrql (OUT) = Caller supplied storage for the previous irql - */ -{ - *OldIrql = KfAcquireSpinLock(SpinLock); -} - -KIRQL FASTCALL -KeAcquireSpinLockRaiseToSynch ( - PKSPIN_LOCK SpinLock - ) -{ - KIRQL OldIrql; - - OldIrql = KfRaiseIrql(CLOCK2_LEVEL); - KiAcquireSpinLock(SpinLock); - - return OldIrql; -} - -#undef KeReleaseSpinLock -VOID NTAPI -KeReleaseSpinLock ( - PKSPIN_LOCK SpinLock, - KIRQL NewIrql - ) -/* - * FUNCTION: Releases a spinlock - * ARGUMENTS: - * SpinLock = Spinlock to release - * NewIrql = Irql level before acquiring the spinlock - */ -{ - KfReleaseSpinLock(SpinLock, NewIrql); -} - -LOGICAL -FASTCALL -KeTryToAcquireQueuedSpinLock( - KSPIN_LOCK_QUEUE_NUMBER LockNumber, - PKIRQL OldIrql) -{ - UNIMPLEMENTED; - - return FALSE; -} - - -BOOLEAN -FASTCALL -KeTryToAcquireQueuedSpinLockRaiseToSynch( - KSPIN_LOCK_QUEUE_NUMBER LockNumber, - PKIRQL OldIrql) -{ - UNIMPLEMENTED; - - return FALSE; -} - -KIRQL FASTCALL -KfAcquireSpinLock ( - PKSPIN_LOCK SpinLock - ) -{ - KIRQL OldIrql; - - ASSERT(KeGetCurrentIrql() <= DISPATCH_LEVEL); - - OldIrql = KfRaiseIrql(DISPATCH_LEVEL); - KiAcquireSpinLock(SpinLock); - - return OldIrql; -} - -VOID FASTCALL -KfReleaseSpinLock ( - PKSPIN_LOCK SpinLock, - KIRQL NewIrql - ) -/* - * FUNCTION: Releases a spinlock - * ARGUMENTS: - * SpinLock = Spinlock to release - * NewIrql = Irql level before acquiring the spinlock - */ -{ - ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL || KeGetCurrentIrql() == SYNCH_LEVEL); - KiReleaseSpinLock(SpinLock); - KfLowerIrql(NewIrql); -} - - -/* - * @unimplemented - */ -VOID -FASTCALL -KeAcquireInStackQueuedSpinLock( - IN PKSPIN_LOCK SpinLock, - IN PKLOCK_QUEUE_HANDLE LockHandle - ) -{ - UNIMPLEMENTED; -} - -/* - * @unimplemented - */ -VOID -FASTCALL -KeAcquireInStackQueuedSpinLockRaiseToSynch( - IN PKSPIN_LOCK SpinLock, - IN PKLOCK_QUEUE_HANDLE LockHandle - ) -{ - UNIMPLEMENTED; -} - - -/* - * @unimplemented - */ -VOID -FASTCALL -KeReleaseInStackQueuedSpinLock( - IN PKLOCK_QUEUE_HANDLE LockHandle - ) -{ - UNIMPLEMENTED; -} - -/* - * @unimplemented - */ -KIRQL -FASTCALL -KeAcquireQueuedSpinLock(IN KSPIN_LOCK_QUEUE_NUMBER Number) -{ - UNIMPLEMENTED; - return 0; -} - -/* - * @unimplemented - */ -KIRQL -FASTCALL -KeAcquireQueuedSpinLockRaiseToSynch(IN KSPIN_LOCK_QUEUE_NUMBER LockNumber) -{ - UNIMPLEMENTED; - return 0; -} - -/* - * @unimplemented - */ -VOID -FASTCALL -KeReleaseQueuedSpinLock(IN KSPIN_LOCK_QUEUE_NUMBER Number, - IN KIRQL OldIrql) -{ - UNIMPLEMENTED; -} - -/* EOF */

1 0

[tkreuzer] 44834: [HAL] - rename halmp to halmps - remove hal_generic_pc - remove some stuff from halamd64
by tkreuzer＠svn.reactos.org 31 Dec '09

31 Dec '09

Author: tkreuzer Date: Thu Dec 31 21:46:45 2009 New Revision: 44834 URL: http://svn.reactos.org/svn/reactos?rev=44834&view=rev Log: [HAL] - rename halmp to halmps - remove hal_generic_pc - remove some stuff from halamd64 Added: branches/ros-amd64-bringup/reactos/hal/halx86/hal.rbuild - copied, changed from r44833, branches/ros-amd64-bringup/reactos/hal/halx86/halup.rbuild branches/ros-amd64-bringup/reactos/hal/halx86/halamd64.rbuild (with props) branches/ros-amd64-bringup/reactos/hal/halx86/halmps.rbuild - copied, changed from r44833, branches/ros-amd64-bringup/reactos/hal/halx86/halmp.rbuild Removed: branches/ros-amd64-bringup/reactos/hal/halamd64/up/ branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic_pc.rbuild branches/ros-amd64-bringup/reactos/hal/halx86/halmp.rbuild branches/ros-amd64-bringup/reactos/hal/halx86/halup.rbuild Modified: branches/ros-amd64-bringup/reactos/hal/halamd64/directory.rbuild branches/ros-amd64-bringup/reactos/hal/halx86/directory.rbuild Modified: branches/ros-amd64-bringup/reactos/hal/halamd64/directory.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halamd64/directory.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halamd64/directory.rbuild [iso-8859-1] Thu Dec 31 21:46:45 2009 @@ -4,7 +4,4 @@ <directory name="generic"> <xi:include href="generic/generic.rbuild" /> </directory> - <directory name="up"> - <xi:include href="up/halup.rbuild" /> - </directory> </group> Modified: branches/ros-amd64-bringup/reactos/hal/halx86/directory.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halx86/directory.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halx86/directory.rbuild [iso-8859-1] Thu Dec 31 21:46:45 2009 @@ -3,19 +3,18 @@ <group xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:include href="hal_generic.rbuild" /> - <xi:include href="hal_generic_pc.rbuild" /> <xi:include href="hal_generic_up.rbuild" /> <if property="ARCH" value="i386"> - <xi:include href="halup.rbuild" /> + <xi:include href="hal.rbuild" /> <xi:include href="halxbox.rbuild" /> <if property="BUILD_MP" value="1"> - <xi:include href="halmp.rbuild" /> + <xi:include href="halmps.rbuild" /> </if> </if> -  + </if> </group> Copied: branches/ros-amd64-bringup/reactos/hal/halx86/hal.rbuild (from r44833, branches/ros-amd64-bringup/reactos/hal/halx86/halup.rbuild) URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halx86/halup.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halx86/hal.rbuild [iso-8859-1] Thu Dec 31 21:46:45 2009 @@ -9,7 +9,6 @@ <define name="_NTHAL_" /> <library>hal_generic</library> <library>hal_generic_up</library> - <library>hal_generic_pc</library> <library>ntoskrnl</library> <directory name="up"> <file>halinit_up.c</file> Removed: branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic_pc.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic_pc.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic_pc.rbuild (removed) @@ -1,14 +1,0 @@ -<?xml version="1.0"?> -<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> -<group> - <module name="hal_generic_pc" type="objectlibrary"> - <include>include</include> - <include base="ntoskrnl">include</include> - <define name="_NTHAL_" /> - <directory name="generic"> - <directory name="bus"> - <file>pcibus.c</file> - </directory> - </directory> - </module> -</group> Added: branches/ros-amd64-bringup/reactos/hal/halx86/halamd64.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halx86/halamd64.rbuild (added) +++ branches/ros-amd64-bringup/reactos/hal/halx86/halamd64.rbuild [iso-8859-1] Thu Dec 31 21:46:45 2009 @@ -1,0 +1,23 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="hal" type="kernelmodedll" entrypoint="HalInitSystem" installbase="system32" installname="hal.dll"> + <importlibrary base="hal" definition="../hal.pspec" /> + <bootstrap installbase="$(CDOUTPUT)" nameoncd="hal.dll" /> + <include base="hal">include</include> + <include base="ntoskrnl">include</include> + <define name="_DISABLE_TIDENTS" /> + <define name="_NTHAL_" /> + <library>hal_generic_amd64</library> + <library>hal_generic</library> + <library>hal_generic_up</library> + <library>ntoskrnl</library> + + <directory name="up"> + <file>halinit_up.c</file> + <file>halup.rc</file> + </directory> + +  +</module> Propchange: branches/ros-amd64-bringup/reactos/hal/halx86/halamd64.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Removed: branches/ros-amd64-bringup/reactos/hal/halx86/halmp.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halx86/halmp.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halx86/halmp.rbuild (removed) @@ -1,28 +1,0 @@ -<?xml version="1.0"?> -<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> -<group xmlns:xi="http://www.w3.org/2001/XInclude"> - <module name="halmp" type="kernelmodedll" entrypoint="HalInitSystem@8"> - <importlibrary base="hal" definition="../hal.pspec" /> - <bootstrap installbase="$(CDOUTPUT)" /> - <include>include</include> - <include base="ntoskrnl">include</include> - <define name="CONFIG_SMP" /> - <define name="_NTHAL_" /> - <library>hal_generic</library> - <library>hal_generic_pc</library> - <library>ntoskrnl</library> - <directory name="mp"> - <file>apic.c</file> - <file>halinit_mp.c</file> - <file>ioapic.c</file> - <file>ipi_mp.c</file> - <file>mpconfig.c</file> - <file>mps.S</file> - <file>mpsboot.asm</file> - <file>mpsirql.c</file> - <file>processor_mp.c</file> - <file>spinlock.c</file> - <file>halmp.rc</file> - </directory> - </module> -</group> Copied: branches/ros-amd64-bringup/reactos/hal/halx86/halmps.rbuild (from r44833, branches/ros-amd64-bringup/reactos/hal/halx86/halmp.rbuild) URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halx86/halmp.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halx86/halmps.rbuild [iso-8859-1] Thu Dec 31 21:46:45 2009 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> - <module name="halmp" type="kernelmodedll" entrypoint="HalInitSystem@8"> + <module name="halmps" type="kernelmodedll" entrypoint="HalInitSystem@8"> <importlibrary base="hal" definition="../hal.pspec" /> <bootstrap installbase="$(CDOUTPUT)" /> <include>include</include> @@ -9,7 +9,6 @@ <define name="CONFIG_SMP" /> <define name="_NTHAL_" /> <library>hal_generic</library> - <library>hal_generic_pc</library> <library>ntoskrnl</library> <directory name="mp"> <file>apic.c</file> Removed: branches/ros-amd64-bringup/reactos/hal/halx86/halup.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halx86/halup.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halx86/halup.rbuild (removed) @@ -1,19 +1,0 @@ -<?xml version="1.0"?> -<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> -<group xmlns:xi="http://www.w3.org/2001/XInclude"> - <module name="hal" type="kernelmodedll" entrypoint="HalInitSystem@8" installbase="system32" installname="hal.dll"> - <importlibrary base="hal" definition="../hal.pspec" /> - <bootstrap installbase="$(CDOUTPUT)" /> - <include>include</include> - <include base="ntoskrnl">include</include> - <define name="_NTHAL_" /> - <library>hal_generic</library> - <library>hal_generic_up</library> - <library>hal_generic_pc</library> - <library>ntoskrnl</library> - <directory name="up"> - <file>halinit_up.c</file> - <file>halup.rc</file> - </directory> - </module> -</group>

1 0

[tkreuzer] 44833: use a directory.rbuild for halx86
by tkreuzer＠svn.reactos.org 31 Dec '09

31 Dec '09

Author: tkreuzer Date: Thu Dec 31 20:46:47 2009 New Revision: 44833 URL: http://svn.reactos.org/svn/reactos?rev=44833&view=rev Log: use a directory.rbuild for halx86 Added: branches/ros-amd64-bringup/reactos/hal/halx86/directory.rbuild (with props) Modified: branches/ros-amd64-bringup/reactos/hal/hal.rbuild branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic_up.rbuild branches/ros-amd64-bringup/reactos/hal/halx86/up/processor.c Modified: branches/ros-amd64-bringup/reactos/hal/hal.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/hal.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/hal.rbuild [iso-8859-1] Thu Dec 31 20:46:47 2009 @@ -1,18 +1,10 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> - <if property="ARCH" value="i386"> - <directory name="halx86"> - <xi:include href="halx86/hal_generic.rbuild" /> - <xi:include href="halx86/hal_generic_up.rbuild" /> - <xi:include href="halx86/hal_generic_pc.rbuild" /> - <xi:include href="halx86/halup.rbuild" /> - <if property="BUILD_MP" value="1"> - <xi:include href="halx86/halmp.rbuild" /> - </if> - <xi:include href="halx86/halxbox.rbuild" /> - </directory> - </if> + <directory name="halx86"> + <xi:include href="halx86/directory.rbuild" /> + </directory> + <if property="ARCH" value="powerpc"> <directory name="halppc"> <xi:include href="halppc/directory.rbuild" /> @@ -24,9 +16,6 @@ </directory> </if> <if property="ARCH" value="amd64"> - <directory name="halx86"> - <xi:include href="halx86/hal_generic.rbuild" /> - </directory> <directory name="halamd64"> <xi:include href="halamd64/directory.rbuild" /> </directory> Added: branches/ros-amd64-bringup/reactos/hal/halx86/directory.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halx86/directory.rbuild (added) +++ branches/ros-amd64-bringup/reactos/hal/halx86/directory.rbuild [iso-8859-1] Thu Dec 31 20:46:47 2009 @@ -1,0 +1,21 @@ +<?xml version="1.0"?> +<!DOCTYPE group SYSTEM "../tools/rbuild/project.dtd"> +<group xmlns:xi="http://www.w3.org/2001/XInclude"> + + <xi:include href="hal_generic.rbuild" /> + <xi:include href="hal_generic_pc.rbuild" /> + <xi:include href="hal_generic_up.rbuild" /> + + <if property="ARCH" value="i386"> + <xi:include href="halup.rbuild" /> + <xi:include href="halxbox.rbuild" /> + <if property="BUILD_MP" value="1"> + <xi:include href="halmp.rbuild" /> + </if> + </if> + +  + +</group> Propchange: branches/ros-amd64-bringup/reactos/hal/halx86/directory.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic_up.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic_up.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic_up.rbuild [iso-8859-1] Thu Dec 31 20:46:47 2009 @@ -6,9 +6,11 @@ <include base="ntoskrnl">include</include> <define name="_NTHAL_" /> <directory name="up"> - <file>irq.S</file> <file>processor.c</file> - <file>spinlock.c</file> + <if property="ARCH" value="i386"> + <file>irq.S</file> + <file>spinlock.c</file> + </if> </directory> </module> </group> Modified: branches/ros-amd64-bringup/reactos/hal/halx86/up/processor.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halx86/up/processor.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halx86/up/processor.c [iso-8859-1] Thu Dec 31 20:46:47 2009 @@ -37,7 +37,9 @@ IN PLOADER_PARAMETER_BLOCK LoaderBlock) { /* Set default IDR and stall count */ +#ifdef _M_IX86 KeGetPcr()->IDR = 0xFFFFFFFB; +#endif KeGetPcr()->StallScaleFactor = INITIAL_STALL_COUNT; /* Update the interrupt affinity and processor mask */

1 0

[tkreuzer] 44832: [HAL] some improvements
by tkreuzer＠svn.reactos.org 31 Dec '09

31 Dec '09

Author: tkreuzer Date: Thu Dec 31 20:26:37 2009 New Revision: 44832 URL: http://svn.reactos.org/svn/reactos?rev=44832&view=rev Log: [HAL] some improvements Modified: branches/ros-amd64-bringup/reactos/hal/halamd64/generic/halinit.c branches/ros-amd64-bringup/reactos/hal/halamd64/include/halp.h branches/ros-amd64-bringup/reactos/hal/halamd64/up/processor.c Modified: branches/ros-amd64-bringup/reactos/hal/halamd64/generic/halinit.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halamd64/generic/halinit.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halamd64/generic/halinit.c [iso-8859-1] Thu Dec 31 20:26:37 2009 @@ -62,7 +62,7 @@ PKPRCB Prcb = KeGetCurrentPrcb(); /* Check the boot phase */ - if (!BootPhase) + if (BootPhase == 0) { /* Phase 0... save bus type */ HalpBusType = LoaderBlock->u.I386.MachineType & 0xFF; @@ -70,8 +70,8 @@ /* Get command-line parameters */ HalpGetParameters(LoaderBlock); +#if DBG /* Checked HAL requires checked kernel */ -#if DBG if (!(Prcb->BuildType & PRCB_BUILD_DEBUG)) { /* No match, bugcheck */ @@ -101,18 +101,21 @@ /* Validation failed, bugcheck */ KeBugCheckEx(MISMATCHED_HAL, 1, Prcb->MajorVersion, 1, 0); } -DPRINT1("HalInitSystem 2\n"); + + DPRINT1("HalInitSystem 1\n"); + /* Initialize the PICs */ HalpInitPICs(); -DPRINT1("HalInitSystem 3\n"); - /* Force initial PIC state */ - KfRaiseIrql(KeGetCurrentIrql()); -DPRINT1("HalInitSystem 4\n"); + + DPRINT1("HalInitSystem 2\n"); + /* Initialize the clock */ HalpInitializeClock(); -DPRINT1("HalInitSystem 5\n"); - /* Setup busy waiting */ - //HalpCalibrateStallExecution(); + + DPRINT1("HalInitSystem 3\n"); + + /* Calibrate counters */ +// HalpCalibrateCounters(); /* Fill out the dispatch tables */ HalQuerySystemInformation = HaliQuerySystemInformation; @@ -121,7 +124,9 @@ // HalGetDmaAdapter = HalpGetDmaAdapter; HalGetInterruptTranslator = NULL; // FIXME: TODO // HalResetDisplay = HalpBiosDisplayReset; -DPRINT1("HalInitSystem 6\n"); + + DPRINT1("HalInitSystem 4\n"); + /* Initialize the hardware lock (CMOS) */ KeInitializeSpinLock(&HalpSystemHardwareLock); @@ -134,11 +139,8 @@ //HalpInitBusHandler(); /* Enable the clock interrupt */ - PKIDTENTRY64 IdtEntry = &((PKIPCR)KeGetPcr())->IdtBase[0x30]; - IdtEntry->OffsetLow = (((ULONG_PTR)HalpClockInterrupt) & 0xFFFF); - IdtEntry->OffsetMiddle = (((ULONG_PTR)HalpClockInterrupt >> 16) & 0xFFFF); - IdtEntry->OffsetHigh = ((ULONG_PTR)HalpClockInterrupt >> 32); -// HalEnableSystemInterrupt(0x30, CLOCK_LEVEL, Latched); + HalpSetInterruptGate(0x30, HalpClockInterrupt); + HalEnableSystemInterrupt(0x30, CLOCK_LEVEL, Latched); /* Initialize DMA. NT does this in Phase 0 */ HalpInitDma(); Modified: branches/ros-amd64-bringup/reactos/hal/halamd64/include/halp.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halamd64/include/halp.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halamd64/include/halp.h [iso-8859-1] Thu Dec 31 20:26:37 2009 @@ -164,6 +164,10 @@ VOID HaliInitBSP(VOID); VOID HaliStartApplicationProcessor(ULONG Cpu, ULONG Stack); +VOID NTAPI HalpInitIdtEntry(PKIDTENTRY64 Idt, PVOID Address); +VOID NTAPI HalpSetInterruptGate(ULONG Index, PVOID Address); +VOID NTAPI HalpInitCpuInterruptHandling(ULONG Cpu); + extern PVOID HalpRealModeStart; extern PVOID HalpRealModeEnd; Modified: branches/ros-amd64-bringup/reactos/hal/halamd64/up/processor.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halamd64/up/processor.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halamd64/up/processor.c [iso-8859-1] Thu Dec 31 20:26:37 2009 @@ -25,8 +25,7 @@ HalInitializeProcessor(IN ULONG ProcessorNumber, IN PLOADER_PARAMETER_BLOCK LoaderBlock) { - /* Set default IDR and stall count */ -// KeGetPcr()->IDR = 0xFFFFFFFB; + /* Set default stall count */ KeGetPcr()->StallScaleFactor = INITIAL_STALL_COUNT; /* Update the interrupt affinity and processor mask */ @@ -36,6 +35,9 @@ /* Register routines for KDCOM */ HalpRegisterKdSupportFunctions(); + + /* Do per CPU interrupt handling initialization */ +// HalpInitCpuInterruptHandling(ProcessorNumber); } /*

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