Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ion] 23654: - Add the code necessary in the C version of KeLowerIRql to properly mask the PIC, and enable #ifed code in ASM KeRaiseIrql to mask the PIC, since it now works.
by ion＠svn.reactos.org 22 Aug '06

22 Aug '06

Author: ion Date: Wed Aug 23 02:45:45 2006 New Revision: 23654 URL: http://svn.reactos.org/svn/reactos?rev=23654&view=rev Log: - Add the code necessary in the C version of KeLowerIRql to properly mask the PIC, and enable #ifed code in ASM KeRaiseIrql to mask the PIC, since it now works. Modified: trunk/reactos/hal/halx86/generic/irq.S trunk/reactos/hal/halx86/generic/irql.c Modified: trunk/reactos/hal/halx86/generic/irq.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/irq.S?r… ============================================================================== --- trunk/reactos/hal/halx86/generic/irq.S (original) +++ trunk/reactos/hal/halx86/generic/irq.S Wed Aug 23 02:45:45 2006 @@ -464,14 +464,12 @@ /* Set the new IRQL */ mov [fs:KPCR_IRQL], cl -#if 0 /* Mask the interrupts in the PIC */ mov eax, _KiI8259MaskTable[ecx*4] or eax, [fs:KPCR_IDR] out 0x21, al shr eax, 8 out 0xA1, al -#endif /* Restore interrupts and return old IRQL */ popf Modified: trunk/reactos/hal/halx86/generic/irql.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/irql.c?… ============================================================================== --- trunk/reactos/hal/halx86/generic/irql.c (original) +++ trunk/reactos/hal/halx86/generic/irql.c Wed Aug 23 02:45:45 2006 @@ -51,6 +51,15 @@ VOID STATIC HalpLowerIrql(KIRQL NewIrql) { + ULONG Mask; + + if (KeGetPcr()->Irql > DISPATCH_LEVEL) + { + Mask = KeGetPcr()->IDR | KiI8259MaskTable[NewIrql]; + WRITE_PORT_UCHAR((PUCHAR)0x21, (UCHAR)Mask); + Mask >>= 8; + WRITE_PORT_UCHAR((PUCHAR)0xa1, (UCHAR)Mask); + } if (NewIrql >= PROFILE_LEVEL) { KeGetPcr()->Irql = NewIrql; @@ -112,6 +121,7 @@ HalpLowerIrql(NewIrql); } + VOID STDCALL HalEndSystemInterrupt (KIRQL Irql, ULONG Unknown2) /* * FUNCTION: Finish a system interrupt and restore the specified irq level.

1 0

[ion] 23653: - Get rid of the peculiar idea that the HAL should manually hack into ntoskrnl through a hack export and hackishly call the registered device interrupt handlers. This is why computers have a PIC in the first place...
by ion＠svn.reactos.org 22 Aug '06

22 Aug '06

Author: ion Date: Wed Aug 23 02:20:02 2006 New Revision: 23653 URL: http://svn.reactos.org/svn/reactos?rev=23653&view=rev Log: - Get rid of the peculiar idea that the HAL should manually hack into ntoskrnl through a hack export and hackishly call the registered device interrupt handlers. This is why computers have a PIC in the first place... Modified: trunk/reactos/hal/halx86/generic/irql.c trunk/reactos/ntoskrnl/ntoskrnl.def Modified: trunk/reactos/hal/halx86/generic/irql.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/irql.c?… ============================================================================== --- trunk/reactos/hal/halx86/generic/irql.c (original) +++ trunk/reactos/hal/halx86/generic/irql.c Wed Aug 23 02:20:02 2006 @@ -16,24 +16,12 @@ /* GLOBALS ******************************************************************/ -/* - * FIXME: Use EISA_CONTROL STRUCTURE INSTEAD OF HARD-CODED OFFSETS -*/ - UCHAR Table[8] = { 0, 0, 1, 1, 2, 2, 2, 2 }; - -static ULONG HalpPendingInterruptCount[NR_IRQS] = {0}; - -#define DIRQL_TO_IRQ(x) (PROFILE_LEVEL - x) -#define IRQ_TO_DIRQL(x) (PROFILE_LEVEL - x) - -VOID STDCALL -KiInterruptDispatch2 (ULONG Irq, KIRQL old_level); /* FUNCTIONS ****************************************************************/ @@ -61,38 +49,6 @@ } VOID STATIC -HalpExecuteIrqs(KIRQL NewIrql) -{ - ULONG IrqLimit, i; - - IrqLimit = min(PROFILE_LEVEL - NewIrql, NR_IRQS); - - /* - * For each irq if there have been any deferred interrupts then now - * dispatch them. - */ - for (i = 0; i < IrqLimit; i++) - { - if (HalpPendingInterruptCount[i] > 0) - { - KeGetPcr()->Irql = (KIRQL)IRQ_TO_DIRQL(i); - - while (HalpPendingInterruptCount[i] > 0) - { - /* - * For each deferred interrupt execute all the handlers at DIRQL. - */ - HalpPendingInterruptCount[i]--; - KiInterruptDispatch2(i + IRQ_BASE, NewIrql); - } - KeGetPcr()->Irql--; - HalpEndSystemInterrupt(KeGetPcr()->Irql); - } - } - -} - -VOID STATIC HalpLowerIrql(KIRQL NewIrql) { if (NewIrql >= PROFILE_LEVEL) @@ -100,7 +56,6 @@ KeGetPcr()->Irql = NewIrql; return; } - HalpExecuteIrqs(NewIrql); if (NewIrql >= DISPATCH_LEVEL) { KeGetPcr()->Irql = NewIrql; Modified: trunk/reactos/ntoskrnl/ntoskrnl.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.def?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.def (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.def Wed Aug 23 02:20:02 2006 @@ -664,7 +664,6 @@ KiDeliverApc@12 KiDispatchInterrupt@0 KiEnableTimerWatchdog -KiInterruptDispatch2@8 KiIpiServiceRoutine@8 @KiReleaseSpinLock@4 KiUnexpectedInterrupt

1 0

[ion] 23652: - Switch to ASM version of HalEnableSystemInterrupt
by ion＠svn.reactos.org 22 Aug '06

22 Aug '06

Author: ion Date: Wed Aug 23 02:13:01 2006 New Revision: 23652 URL: http://svn.reactos.org/svn/reactos?rev=23652&view=rev Log: - Switch to ASM version of HalEnableSystemInterrupt Modified: trunk/reactos/hal/halx86/generic/irq.S trunk/reactos/hal/halx86/generic/irql.c Modified: trunk/reactos/hal/halx86/generic/irq.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/irq.S?r… ============================================================================== --- trunk/reactos/hal/halx86/generic/irq.S (original) +++ trunk/reactos/hal/halx86/generic/irq.S Wed Aug 23 02:13:01 2006 @@ -220,13 +220,11 @@ ret 8 .endfunc -#if 0 .globl _HalEnableSystemInterrupt@12 .func HalEnableSystemInterrupt@12 _HalEnableSystemInterrupt@12: /* Get the vector and validate it */ - jmp $ movzx ecx, byte ptr [esp+4] sub ecx, PRIMARY_VECTOR_BASE jb Invalid @@ -290,7 +288,6 @@ xor eax, eax ret 12 .endfunc -#endif .globl _HalBeginSystemInterrupt@12 .func HalBeginSystemInterrupt@12 Modified: trunk/reactos/hal/halx86/generic/irql.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/irql.c?… ============================================================================== --- trunk/reactos/hal/halx86/generic/irql.c (original) +++ trunk/reactos/hal/halx86/generic/irql.c Wed Aug 23 02:13:01 2006 @@ -167,30 +167,4 @@ HalpEndSystemInterrupt(Irql); } -BOOLEAN -STDCALL -HalEnableSystemInterrupt( - ULONG Vector, - KIRQL Irql, - KINTERRUPT_MODE InterruptMode) -{ - ULONG irq; - ULONG Mask; - - if (Vector < IRQ_BASE || Vector >= IRQ_BASE + NR_IRQS) - return FALSE; - - irq = Vector - IRQ_BASE; - KeGetPcr()->IDR &= ~(1 << irq); - - Mask = KeGetPcr()->IDR | KiI8259MaskTable[KeGetPcr()->Irql]; - WRITE_PORT_UCHAR((PUCHAR)0x21, (UCHAR)Mask); - Mask >>= 8; - WRITE_PORT_UCHAR((PUCHAR)0xa1, (UCHAR)Mask); - - return TRUE; -} - - - /* EOF */

1 0

[ion] 23651: - Use the IDR in the PCR intead of a local picmask. - Use ASM version of HalBeginSystemInterrupt.
by ion＠svn.reactos.org 22 Aug '06

22 Aug '06

Author: ion Date: Wed Aug 23 02:10:52 2006 New Revision: 23651 URL: http://svn.reactos.org/svn/reactos?rev=23651&view=rev Log: - Use the IDR in the PCR intead of a local picmask. - Use ASM version of HalBeginSystemInterrupt. Modified: trunk/reactos/hal/halx86/generic/irq.S trunk/reactos/hal/halx86/generic/irql.c trunk/reactos/hal/halx86/up/halinit_up.c trunk/reactos/include/ndk/asm.h Modified: trunk/reactos/hal/halx86/generic/irq.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/irq.S?r… ============================================================================== --- trunk/reactos/hal/halx86/generic/irq.S (original) +++ trunk/reactos/hal/halx86/generic/irq.S Wed Aug 23 02:10:52 2006 @@ -70,7 +70,6 @@ .long 0xFFFFFFFB /* IRQL 30 */ .long 0xFFFFFFFB /* IRQL 31 */ -#if 0 HalpSysIntHandler: .rept 8 .long GenericIRQ /* IRQ 0-7 */ @@ -83,7 +82,6 @@ .rept 20 .long GenericIRQ /* IRQ 16-35 */ .endr -#endif SoftIntByteTable: .byte PASSIVE_LEVEL /* IRR 0 */ @@ -202,7 +200,7 @@ mov edx, 1 shl edx, cl cli - or [fs+KPCR_IDR], edx + or [fs:KPCR_IDR], edx /* Get the current mask */ xor eax, eax @@ -292,18 +290,18 @@ xor eax, eax ret 12 .endfunc +#endif .globl _HalBeginSystemInterrupt@12 .func HalBeginSystemInterrupt@12 _HalBeginSystemInterrupt@12: /* Convert to vector and call the handler */ - movzx ebx, byte ptr [esp+8] - sub ebx, PRIMARY_VECTOR_BASE - jmp HalpSysIntHandler[ebx*4] + mov edx, [esp+8] + sub edx, PRIMARY_VECTOR_BASE + jmp HalpSysIntHandler[edx*4] IRQ15: - /* This is IRQ 15, check if it's spurious */ mov al, 0xB out 0xA0, al @@ -318,7 +316,6 @@ ret 12 IRQ7: - /* This is IRQ 7, check if it's spurious */ mov al, 0xB out 0x20, al @@ -331,10 +328,9 @@ ret 12 GenericIRQ: - /* Return the current IRQL */ mov eax, [esp+12] - movzx ecx, word ptr [fs:KPCR_IRQL] + movzx ecx, byte ptr [fs:KPCR_IRQL] mov [eax], cl /* Set the new IRQL */ @@ -349,7 +345,7 @@ out 0xA1, al /* Check to which PIC the EOI was sent */ - mov eax, ebx + mov eax, edx cmp eax, 8 jnb Pic1 @@ -366,7 +362,6 @@ out 0x20, al DoneBegin: - /* Enable interrupts and return TRUE */ in al, 0x21 sti @@ -374,6 +369,7 @@ ret 12 .endfunc +#if 0 .globl _HalEndSystemInterrupt@8 .func HalEndSystemInterrupt@8 _HalEndSystemInterrupt@8: Modified: trunk/reactos/hal/halx86/generic/irql.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/irql.c?… ============================================================================== --- trunk/reactos/hal/halx86/generic/irql.c (original) +++ trunk/reactos/hal/halx86/generic/irql.c Wed Aug 23 02:10:52 2006 @@ -12,6 +12,7 @@ #include <hal.h> #define NDEBUG #include <debug.h> +#include <ndk/asm.h> /* GLOBALS ******************************************************************/ @@ -25,8 +26,6 @@ 1, 1, 2, 2, 2, 2 }; - -ULONG pic_mask = {0xFFFFFFFA}; static ULONG HalpPendingInterruptCount[NR_IRQS] = {0}; @@ -52,7 +51,7 @@ Ki386SaveFlags(flags); Ki386DisableInterrupts(); - Mask = pic_mask | KiI8259MaskTable[Irql]; + Mask = KeGetPcr()->IDR | KiI8259MaskTable[Irql]; WRITE_PORT_UCHAR((PUCHAR)0x21, (UCHAR)Mask); Mask >>= 8; WRITE_PORT_UCHAR((PUCHAR)0xa1, (UCHAR)Mask); @@ -158,44 +157,6 @@ HalpLowerIrql(NewIrql); } - -BOOLEAN STDCALL -HalBeginSystemInterrupt (KIRQL Irql, - ULONG Vector, - PKIRQL OldIrql) -{ - ULONG irq; - ULONG Mask; - - if (Vector < IRQ_BASE || Vector >= IRQ_BASE + NR_IRQS) - { - return(FALSE); - } - irq = Vector - IRQ_BASE; - - Mask = pic_mask | KiI8259MaskTable[Irql]; - WRITE_PORT_UCHAR((PUCHAR)0x21, (UCHAR)Mask); - Mask >>= 8; - WRITE_PORT_UCHAR((PUCHAR)0xa1, (UCHAR)Mask); - - if (irq < 8) - { - WRITE_PORT_UCHAR((PUCHAR)0x20, 0x60 | irq); - } - else - { - /* Send EOI to the PICs */ - WRITE_PORT_UCHAR((PUCHAR)0x20,0x62); - WRITE_PORT_UCHAR((PUCHAR)0xa0,0x20); - } - - *OldIrql = KeGetPcr()->Irql; - KeGetPcr()->Irql = Irql; - - return(TRUE); -} - - VOID STDCALL HalEndSystemInterrupt (KIRQL Irql, ULONG Unknown2) /* * FUNCTION: Finish a system interrupt and restore the specified irq level. @@ -220,9 +181,9 @@ return FALSE; irq = Vector - IRQ_BASE; - pic_mask &= ~(1 << irq); + KeGetPcr()->IDR &= ~(1 << irq); - Mask = pic_mask | KiI8259MaskTable[KeGetPcr()->Irql]; + Mask = KeGetPcr()->IDR | KiI8259MaskTable[KeGetPcr()->Irql]; WRITE_PORT_UCHAR((PUCHAR)0x21, (UCHAR)Mask); Mask >>= 8; WRITE_PORT_UCHAR((PUCHAR)0xa1, (UCHAR)Mask); Modified: trunk/reactos/hal/halx86/up/halinit_up.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/up/halinit_up.c… ============================================================================== --- trunk/reactos/hal/halx86/up/halinit_up.c (original) +++ trunk/reactos/hal/halx86/up/halinit_up.c Wed Aug 23 02:10:52 2006 @@ -21,6 +21,8 @@ HalpInitPhase0(PROS_LOADER_PARAMETER_BLOCK LoaderBlock) { HalpInitPICs(); + /* FIXME: Big-ass hack. First, should be 0xFFFFFFFF, second, shouldnt' be done here */ + KeGetPcr()->IDR = 0xFFFFFFFA; /* Setup busy waiting */ HalpCalibrateStallExecution(); Modified: trunk/reactos/include/ndk/asm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/asm.h?rev=2365… ============================================================================== --- trunk/reactos/include/ndk/asm.h (original) +++ trunk/reactos/include/ndk/asm.h Wed Aug 23 02:10:52 2006 @@ -432,19 +432,15 @@ #define MACHINE_TYPE_MCA 0x0002 // -// Vector base -// ROS HACK HACK HACK -// -#define PRIMARY_VECTOR_BASE 0x40 - -// // Kernel Feature Bits // #define KF_RDTSC 0x00000002 #endif + // // Generic Definitions // +#define PRIMARY_VECTOR_BASE 0x40 // FIXME: HACK #define MAXIMUM_IDTVECTOR 0xFF #endif // !_ASM_H

1 0

[fireball] 23650: Dmitry Philippov: - Add a test case for a multisz value which has zero-sized strings - Add a test case for query registry delete All tests are known to be passed on Windows XP SP2
by fireball＠svn.reactos.org 22 Aug '06

22 Aug '06

Author: fireball Date: Wed Aug 23 01:45:57 2006 New Revision: 23650 URL: http://svn.reactos.org/svn/reactos?rev=23650&view=rev Log: Dmitry Philippov: - Add a test case for a multisz value which has zero-sized strings - Add a test case for query registry delete All tests are known to be passed on Windows XP SP2 Modified: trunk/reactos/regtests/winetests/ntdll/reg.c Modified: trunk/reactos/regtests/winetests/ntdll/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/regtests/winetests/ntdll/r… ============================================================================== --- trunk/reactos/regtests/winetests/ntdll/reg.c (original) +++ trunk/reactos/regtests/winetests/ntdll/reg.c Wed Aug 23 01:45:57 2006 @@ -2,6 +2,7 @@ * * Copyright 2003 Thomas Mertes * Copyright 2005 Brad DeMorrow + * Copyright 2006 Dmitry Philippov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -84,16 +85,18 @@ static NTSTATUS (WINAPI * pNtDeleteValueKey)(IN HANDLE, IN PUNICODE_STRING); static NTSTATUS (WINAPI * pRtlQueryRegistryValues)(IN ULONG, IN PCWSTR,IN PRTL_QUERY_REGISTRY_TABLE, IN PVOID,IN PVOID); static NTSTATUS (WINAPI * pRtlCheckRegistryKey)(IN ULONG,IN PWSTR); -static NTSTATUS (WINAPI * pRtlOpenCurrentUser)(IN ACCESS_MASK, OUT PHKEY); +static NTSTATUS (WINAPI * pRtlOpenCurrentUser)(IN ACCESS_MASK, OUT PHANDLE); static NTSTATUS (WINAPI * pNtOpenKey)(PHANDLE, IN ACCESS_MASK, IN POBJECT_ATTRIBUTES); static NTSTATUS (WINAPI * pNtClose)(IN HANDLE); static NTSTATUS (WINAPI * pNtDeleteValueKey)(IN HANDLE, IN PUNICODE_STRING); -static NTSTATUS (WINAPI * pNtDeleteKey)(HKEY); -static NTSTATUS (WINAPI * pNtCreateKey)( PHKEY retkey, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr, +static NTSTATUS (WINAPI * pNtDeleteKey)(HANDLE); +static NTSTATUS (WINAPI * pNtCreateKey)( PHANDLE retkey, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr, ULONG TitleIndex, const UNICODE_STRING *class, ULONG options, PULONG dispos ); -static NTSTATUS (WINAPI * pNtSetValueKey)( PHKEY, const PUNICODE_STRING, ULONG, +static NTSTATUS (WINAPI * pNtSetValueKey)( HANDLE, const PUNICODE_STRING, ULONG, ULONG, const PVOID, ULONG ); +static NTSTATUS (WINAPI * pNtQueryValueKey)( HANDLE,const UNICODE_STRING *,KEY_VALUE_INFORMATION_CLASS, + void *,DWORD,DWORD * ); static NTSTATUS (WINAPI * pRtlFormatCurrentUserKeyPath)(PUNICODE_STRING); static NTSTATUS (WINAPI * pRtlCreateUnicodeString)( PUNICODE_STRING, LPCWSTR); static NTSTATUS (WINAPI * pRtlReAllocateHeap)(IN PVOID, IN ULONG, IN PVOID, IN ULONG); @@ -136,6 +139,7 @@ NTDLL_GET_PROC(NtCreateKey) NTDLL_GET_PROC(NtDeleteKey) NTDLL_GET_PROC(NtSetValueKey) + NTDLL_GET_PROC(NtQueryValueKey) NTDLL_GET_PROC(NtOpenKey) NTDLL_GET_PROC(RtlFormatCurrentUserKeyPath) NTDLL_GET_PROC(RtlReAllocateHeap) @@ -153,8 +157,9 @@ IN ULONG ValueLength, IN PVOID Context, IN PVOID EntryContext) { NTSTATUS ret = STATUS_SUCCESS; + LPSTR ValName = 0; + LPSTR ValData = 0; int ValueNameLength = 0; - LPSTR ValName = 0; trace("**Test %d**\n", CurrentTest); if(ValueName) @@ -163,12 +168,19 @@ ValName = (LPSTR)pRtlAllocateHeap(GetProcessHeap(), 0, ValueNameLength); - WideCharToMultiByte(0, 0, ValueName, ValueNameLength+1,ValName, ValueNameLength, 0, 0); trace("ValueName: %s\n", ValName); } else trace("ValueName: (null)\n"); + + if( ValueType == REG_SZ || + ValueType == REG_MULTI_SZ || + ValueType == REG_EXPAND_SZ ) + { + ValData = (LPSTR)pRtlAllocateHeap(GetProcessHeap(), 0, ValueLength); + WideCharToMultiByte(0, 0, ValueData, ValueLength, ValData, ValueLength, 0, 0); + } switch(ValueType) { @@ -184,17 +196,17 @@ case REG_SZ: trace("ValueType: REG_SZ\n"); - trace("ValueData: %s\n", (char*)ValueData); + trace("ValueData: %s\n", ValData); break; case REG_MULTI_SZ: trace("ValueType: REG_MULTI_SZ\n"); - trace("ValueData: %s\n", (char*)ValueData); + trace("ValueData: %s", (char*)ValData); break; case REG_EXPAND_SZ: trace("ValueType: REG_EXPAND_SZ\n"); - trace("ValueData: %s\n", (char*)ValueData); + trace("ValueData: %s\n", (char*)ValData); break; case REG_DWORD: @@ -213,6 +225,9 @@ if(ValName) pRtlFreeHeap(GetProcessHeap(), 0, ValName); + + if(ValData) + pRtlFreeHeap(GetProcessHeap(), 0, ValData); return ret; } @@ -269,14 +284,14 @@ QueryTable[0].DefaultLength = 100; QueryTable[1].QueryRoutine = QueryRoutine; - QueryTable[1].Flags = 0; - QueryTable[1].Name = NULL; + QueryTable[1].Flags = RTL_QUERY_REGISTRY_DELETE; + QueryTable[1].Name = L"multisztest"; QueryTable[1].EntryContext = 0; QueryTable[1].DefaultType = REG_NONE; QueryTable[1].DefaultData = NULL; QueryTable[1].DefaultLength = 0; - QueryTable[2].QueryRoutine = NULL; + QueryTable[2].QueryRoutine = QueryRoutine; QueryTable[2].Flags = 0; QueryTable[2].Name = NULL; QueryTable[2].EntryContext = 0; @@ -294,7 +309,7 @@ { /*Create WineTest*/ OBJECT_ATTRIBUTES attr; - HKEY key; + HANDLE key; ACCESS_MASK am = GENERIC_ALL; NTSTATUS status; @@ -302,7 +317,7 @@ status = pNtCreateKey(&key, am, &attr, 0, 0, 0, 0); ok(status == STATUS_SUCCESS, "NtCreateKey Failed: 0x%08lx\n", status); - pNtClose(&key); + pNtClose(key); } static void test_NtSetValueKey(void) @@ -312,10 +327,14 @@ OBJECT_ATTRIBUTES attr; ACCESS_MASK am = KEY_WRITE; UNICODE_STRING ValName; + UNICODE_STRING ValNameMultiSz; DWORD data = 711; + static const WCHAR DataMultiSz[] = {'T','e','s','t','V','a','l','u','e','1',0, + 'T','e','s','t','V','a','l','u','e','2',0, + 'T','e','s','t','V','a','l','u','e','3',0,0, + 'T','e','s','t','V','a','l','u','e','5',0,0,0}; pRtlCreateUnicodeStringFromAsciiz(&ValName, "deletetest"); - InitializeObjectAttributes(&attr, &winetestpath, 0, 0, 0); status = pNtOpenKey(&key, am, &attr); ok(status == STATUS_SUCCESS, "NtOpenKey Failed: 0x%08lx\n", status); @@ -324,16 +343,24 @@ ok(status == STATUS_SUCCESS, "NtSetValueKey Failed: 0x%08lx\n", status); pRtlFreeUnicodeString(&ValName); - pNtClose(&key); + + pRtlCreateUnicodeStringFromAsciiz(&ValNameMultiSz, "multisztest"); + + status = pNtSetValueKey(key, &ValNameMultiSz, 0, REG_MULTI_SZ, (PVOID)DataMultiSz, sizeof(DataMultiSz)); + ok(status == STATUS_SUCCESS, "NtSetValueKey Failed: 0x%08lx\n", status); + + pRtlFreeUnicodeString(&ValNameMultiSz); + + pNtClose(key); } static void test_RtlOpenCurrentUser(void) { NTSTATUS status; - HKEY handle; + HANDLE handle; status=pRtlOpenCurrentUser(KEY_READ, &handle); ok(status == STATUS_SUCCESS, "RtlOpenCurrentUser Failed: 0x%08lx\n", status); - pNtClose(&handle); + pNtClose(handle); } static void test_RtlCheckRegistryKey(void) @@ -345,6 +372,29 @@ status = pRtlCheckRegistryKey((RTL_REGISTRY_ABSOLUTE | RTL_REGISTRY_OPTIONAL), winetestpath.Buffer); ok(status == STATUS_SUCCESS, "RtlCheckRegistryKey with RTL_REGISTRY_ABSOLUTE and RTL_REGISTRY_OPTIONAL: 0x%08lx\n", status); +} + +static void test_RtlQueryRegistryDelete(void) +{ + HANDLE key; + NTSTATUS status; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING ValNameMultiSz; + WCHAR sBuf[255]; + DWORD ValueSize; + + InitializeObjectAttributes(&attr, &winetestpath, 0, 0, 0); + status = pNtOpenKey(&key, KEY_READ, &attr); + ok(status == STATUS_SUCCESS, "NtOpenKey Failed: 0x%08lx\n", status); + + pRtlCreateUnicodeStringFromAsciiz(&ValNameMultiSz, "multisztest"); + + status = pNtQueryValueKey(key, &ValNameMultiSz, 0, (void*)sBuf, sizeof(sBuf), &ValueSize); + ok(status == STATUS_OBJECT_NAME_NOT_FOUND, "NtOpenKey returns: 0x%08lx instead of STATUS_OBJECT_NAME_NOT_FOUND\n", status); + + pRtlFreeUnicodeString(&ValNameMultiSz); + + pNtClose(key); } static void test_NtDeleteKey(void) @@ -359,6 +409,8 @@ status = pNtDeleteKey(hkey); ok(status == STATUS_SUCCESS, "NtDeleteKey Failed: 0x%08lx\n", status); + + pNtClose(hkey); } START_TEST(reg) @@ -378,6 +430,7 @@ test_RtlCheckRegistryKey(); test_RtlOpenCurrentUser(); test_RtlQueryRegistryValues(); + test_RtlQueryRegistryDelete(); test_NtDeleteKey(); pRtlFreeUnicodeString(&winetestpath);

1 0

[ion] 23649: - Commit current work on IRQ rewrite. Currently in a very ugly/dirty state of flux between the new ASM code (with tiny hacks) and the old C code (with giant hacks). I feel that this is a good/stable middle ground before continuing further with the changes.
by ion＠svn.reactos.org 22 Aug '06

22 Aug '06

Author: ion Date: Wed Aug 23 00:50:52 2006 New Revision: 23649 URL: http://svn.reactos.org/svn/reactos?rev=23649&view=rev Log: - Commit current work on IRQ rewrite. Currently in a very ugly/dirty state of flux between the new ASM code (with tiny hacks) and the old C code (with giant hacks). I feel that this is a good/stable middle ground before continuing further with the changes. Added: trunk/reactos/hal/halx86/generic/irq.S Modified: trunk/reactos/hal/halx86/generic/generic.rbuild trunk/reactos/hal/halx86/generic/irql.c trunk/reactos/hal/halx86/generic/spinlock.c trunk/reactos/hal/halx86/include/halp.h trunk/reactos/include/ndk/asm.h trunk/reactos/ntoskrnl/ex/init.c Modified: trunk/reactos/hal/halx86/generic/generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/generic… ============================================================================== --- trunk/reactos/hal/halx86/generic/generic.rbuild (original) +++ trunk/reactos/hal/halx86/generic/generic.rbuild Wed Aug 23 00:50:52 2006 @@ -32,6 +32,7 @@ <define name="__USE_W32API" /> <file>ipi.c</file> <file>irql.c</file> + <file>irq.S</file> <file>processor.c</file> <file>resource.c</file> <file>spinlock.c</file> Added: trunk/reactos/hal/halx86/generic/irq.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/irq.S?r… ============================================================================== --- trunk/reactos/hal/halx86/generic/irq.S (added) +++ trunk/reactos/hal/halx86/generic/irq.S Wed Aug 23 00:50:52 2006 @@ -1,0 +1,649 @@ +/* + * FILE: hal/halx86/generic/irql.S + * COPYRIGHT: See COPYING in the top level directory + * PURPOSE: Software, System and Hardware IRQ Management + * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) + */ + +/* INCLUDES ******************************************************************/ + +#include <asm.h> +#include <internal/i386/asmmacro.S> +.intel_syntax noprefix + +.extern _Kei386EoiHelper@0 +.extern _KiUnexpectedInterrupt + +/* GLOBALS *******************************************************************/ + +PICInitTable: + + /* Master PIC */ + .short 0x20 /* Port */ + .byte 0x11 /* Edge,, cascade, CAI 8, ICW4 */ + .byte 0x40 /* Base */ + .byte 4 /* IRQ 4 connected to slave */ + .byte 1 /* Non buffered, not nested, 8086 */ + + /* Slave PIC */ + .short 0xA0 /* Port */ + .byte 0x11 /* Edge, cascade, CAI 8, ICW4 */ + .byte 0x48 /* Base */ + .byte 2 /* Slave ID: Slave 2 */ + .byte 1 /* Non buffered, not nested, 8086 */ + + /* End of initialization table */ + .short 0 + +.globl _KiI8259MaskTable +_KiI8259MaskTable: + .long 0 /* IRQL 0 */ + .long 0 /* IRQL 1 */ + .long 0 /* IRQL 2 */ + .long 0 /* IRQL 3 */ + .long 0xFF800000 /* IRQL 4 */ + .long 0xFFC00000 /* IRQL 5 */ + .long 0xFFE00000 /* IRQL 6 */ + .long 0xFFF00000 /* IRQL 7 */ + .long 0xFFF80000 /* IRQL 8 */ + .long 0xFFFC0000 /* IRQL 9 */ + .long 0xFFFE0000 /* IRQL 10 */ + .long 0xFFFF0000 /* IRQL 11 */ + .long 0xFFFF8000 /* IRQL 12 */ + .long 0xFFFFC000 /* IRQL 13 */ + .long 0xFFFFE000 /* IRQL 14 */ + .long 0xFFFFF000 /* IRQL 15 */ + .long 0xFFFFF800 /* IRQL 16 */ + .long 0xFFFFFC00 /* IRQL 17 */ + .long 0xFFFFFE00 /* IRQL 18 */ + .long 0xFFFFFE00 /* IRQL 19 */ + .long 0xFFFFFE80 /* IRQL 20 */ + .long 0xFFFFFEC0 /* IRQL 21 */ + .long 0xFFFFFEE0 /* IRQL 22 */ + .long 0xFFFFFEF0 /* IRQL 23 */ + .long 0xFFFFFEF8 /* IRQL 24 */ + .long 0xFFFFFEF8 /* IRQL 25 */ + .long 0xFFFFFEFA /* IRQL 26 */ + .long 0xFFFFFFFA /* IRQL 27 */ + .long 0xFFFFFFFB /* IRQL 28 */ + .long 0xFFFFFFFB /* IRQL 29 */ + .long 0xFFFFFFFB /* IRQL 30 */ + .long 0xFFFFFFFB /* IRQL 31 */ + +#if 0 +HalpSysIntHandler: +.rept 8 + .long GenericIRQ /* IRQ 0-7 */ +.endr + .long IRQ7 /* IRQ 7 */ +.rept 8 + .long GenericIRQ /* IRQ 8-15 */ +.endr + .long IRQ15 /* IRQ 15 */ +.rept 20 + .long GenericIRQ /* IRQ 16-35 */ +.endr +#endif + +SoftIntByteTable: + .byte PASSIVE_LEVEL /* IRR 0 */ + .byte PASSIVE_LEVEL /* IRR 1 */ + .byte APC_LEVEL /* IRR 2 */ + .byte APC_LEVEL /* IRR 3 */ + .byte DISPATCH_LEVEL /* IRR 4 */ + .byte DISPATCH_LEVEL /* IRR 5 */ + .byte DISPATCH_LEVEL /* IRR 6 */ + .byte DISPATCH_LEVEL /* IRR 7 */ + +SoftIntHandlerTable: + .long _KiUnexpectedInterrupt /* PASSIVE_LEVEL */ + .long _HalpApcInterrupt /* APC_LEVEL */ + .long _HalpDispatchInterrupt /* DISPATCH_LEVEL */ + +SoftIntHandlerTable2: + .long _KiUnexpectedInterrupt /* PASSIVE_LEVEL */ + .long _HalpApcInterrupt2ndEntry /* APC_LEVEL */ + .long _HalpDispatchInterrupt2ndEntry /* DISPATCH_LEVEL */ + +/* FUNCTIONS *****************************************************************/ + +.globl _HalpInitPICs@0 +.func HalpInitPICs@0 +_HalpInitPICs@0: + + /* Save ESI and disable interrupts */ + push esi + pushf + cli + + /* Read the init table */ + lea esi, PICInitTable + lodsw + +InitLoop: + + /* Put the port in EDX */ + movzx edx, ax + + /* Initialize the PIC, using a delay for each command */ + outsb + jmp $+2 + inc edx + outsb + jmp $+2 + outsb + jmp $+2 + outsb + jmp $+2 + + /* Mask all interrupts */ + mov al, 0xFA // FIXME: Should be 0xFF + out dx, al + + /* Check if we're done, otherwise initialize next PIC */ + lodsw + cmp ax, 0 + jnz InitLoop + + /* Restore interrupts and return */ + or dword ptr [esp], EFLAGS_INTERRUPT_MASK + popf + pop esi + ret +.endfunc + +.globl @HalRequestSoftwareInterrupt@4 +.func @HalRequestSoftwareInterrupt@4 +_@HalRequestSoftwareInterrupt@4: +@HalRequestSoftwareInterrupt@4: + + /* Get IRR mask */ + mov eax, 1 + shl eax, cl + + /* Disable interrupts */ + pushf + cli + + /* Set IRR and get IRQL */ + or [fs:KPCR_IRR], eax + mov cl, [fs:KPCR_IRQL] + + /* Get software IRR mask */ + mov eax, [fs:KPCR_IRR] + and eax, 3 + + /* Get highest pending software interrupt and check if it's higher */ + xor edx, edx + mov dl, SoftIntByteTable[eax] + cmp dl, cl + jbe AfterCall + + /* Call the pending interrupt */ + jmp $ + call SoftIntHandlerTable[edx*4] + +AfterCall: + + /* Retore interrupts and return */ + popf + ret +.endfunc + +.globl _HalDisableSystemInterrupt@8 +.func HalDisableSystemInterrupt@8 +_HalDisableSystemInterrupt@8: + + /* Convert to vector */ + movzx ecx, byte ptr [esp+4] + sub ecx, PRIMARY_VECTOR_BASE + + /* Disable interrupts and set the new IDR */ + mov edx, 1 + shl edx, cl + cli + or [fs+KPCR_IDR], edx + + /* Get the current mask */ + xor eax, eax + in al, 0xA1 + shl eax, 8 + in al, 0x21 + + /* Mask off the interrupt and write the new mask */ + or eax, edx + out 0x21, al + shr eax, 8 + out 0xA1, al + + /* Return with interrupts enabled */ + in al, 0xA1 + sti + ret 8 +.endfunc + +#if 0 +.globl _HalEnableSystemInterrupt@12 +.func HalEnableSystemInterrupt@12 +_HalEnableSystemInterrupt@12: + + /* Get the vector and validate it */ + jmp $ + movzx ecx, byte ptr [esp+4] + sub ecx, PRIMARY_VECTOR_BASE + jb Invalid + cmp ecx, CLOCK2_LEVEL + jnb Invalid + + /* Get the current PCI Edge/Level control registers */ + mov edx, 0x4D1 + in al, dx + shl ax, 8 + mov eax, 0x4D0 + in al, dx + mov dx, 1 + shl dx, cl + + /* Check if this is a latched interrupt */ + cmp dword ptr [esp+12], 0 + jnz Latched + + /* Use OR for edge interrupt */ + or ax, dx + jmp AfterMask +Latched: + + /* Mask it out for level interrupt */ + not dx + and ax, dx + +AfterMask: + + /* Set the PCI Edge/Level control registers */ + mov edx, 0x4D0 + out dx, al + shr ax, 8 + mov edx, 0x4D1 + out dx, al + + /* Calculate the new IDR */ + mov eax, 1 + shl eax, cl + not eax + cli + and [fs:KPCR_IDR], eax + + /* Get the current IRQL and mask the IRQs in the PIC */ + movzx eax, byte ptr [fs:KPCR_IRQL] + mov eax, _KiI8259MaskTable[eax*4] + or eax, [fs:KPCR_IDR] + out 0x21, al + shr eax, 8 + out 0xA1, al + + /* Enable interrupts and return TRUE */ + sti + mov eax, 1 + ret 12 + +Invalid: + + /* Fail, invalid IRQ */ + xor eax, eax + ret 12 +.endfunc + +.globl _HalBeginSystemInterrupt@12 +.func HalBeginSystemInterrupt@12 +_HalBeginSystemInterrupt@12: + + /* Convert to vector and call the handler */ + movzx ebx, byte ptr [esp+8] + sub ebx, PRIMARY_VECTOR_BASE + jmp HalpSysIntHandler[ebx*4] + +IRQ15: + + /* This is IRQ 15, check if it's spurious */ + mov al, 0xB + out 0xA0, al + in al, 0xA0 + test al, 0x80 + jnz GenericIRQ + + /* Cascaded interrupt... dismiss it and return FALSE */ + mov al, 0x62 + out 0x20, al + mov eax, 0 + ret 12 + +IRQ7: + + /* This is IRQ 7, check if it's spurious */ + mov al, 0xB + out 0x20, al + in al, 0x20 + test al, 0x80 + jnz GenericIRQ + + /* It is, return FALSE */ + mov eax, 0 + ret 12 + +GenericIRQ: + + /* Return the current IRQL */ + mov eax, [esp+12] + movzx ecx, word ptr [fs:KPCR_IRQL] + mov [eax], cl + + /* Set the new IRQL */ + movzx eax, byte ptr [esp+4] + mov [fs:KPCR_IRQL], al + + /* Set IRQ mask in the PIC */ + mov eax, _KiI8259MaskTable[eax*4] + or eax, [fs:KPCR_IDR] + out 0x21, al + shr eax, 8 + out 0xA1, al + + /* Check to which PIC the EOI was sent */ + mov eax, ebx + cmp eax, 8 + jnb Pic1 + + /* Write mask to master PIC */ + or al, 0x60 + out 0x20, al + jmp DoneBegin + +Pic1: + /* Write mask to slave PIC */ + mov al, 0x20 + out 0xA0, al + mov al, 0x62 + out 0x20, al + +DoneBegin: + + /* Enable interrupts and return TRUE */ + in al, 0x21 + sti + mov eax, 1 + ret 12 +.endfunc + +.globl _HalEndSystemInterrupt@8 +.func HalEndSystemInterrupt@8 +_HalEndSystemInterrupt@8: + + /* Get the IRQL and check if it's a software interrupt */ + movzx ecx, byte ptr [esp+4] + cmp byte ptr [fs:KPCR_IRQL], DISPATCH_LEVEL + jbe SkipMask2 + + /* Hardware interrupt, mask the appropriate IRQs in the PIC */ + mov eax, _KiI8259MaskTable[ecx*4] + or eax, [fs:KPCR_IDR] + out 0x21, al + shr eax, 8 + out 0xA1, al + +SkipMask2: + + /* Set IRQL and check if there are pending software interrupts */ + mov [fs:KPCR_IRQL], cl + mov eax, [fs:KPCR_IDR] + mov al, SoftIntByteTable[eax] + cmp al, cl + ja DoCall + ret 8 + +DoCall: + + /* There are pending softwate interrupts, call their handlers */ + add esp, 8 + jmp SoftIntHandlerTable2[eax*4] +.endfunc + +.globl @KfLowerIrql@4 +.func @KfLowerIrql@4 +_@KfLowerIrql@4: +@KfLowerIrql@4: + + /* Save flags since we'll disable interrupts */ + pushf + + /* Disable interrupts and check if IRQL is below DISPATCH_LEVEL */ + movzx ecx, cl + cmp byte ptr [fs:KPCR_IRQL], DISPATCH_LEVEL + cli + jbe SkipMask + + /* Clear interrupt masks since there's a pending hardware interrupt */ + mov eax, _KiI8259MaskTable[ecx*4] + or eax, [fs:KPCR_IDR] + out 0x21, al + shr eax, 8 + out 0xA1, al + +SkipMask: + + /* Set the new IRQL and check if there's a pending software interrupt */ + mov [fs:KPCR_IRQL], cl + mov eax, [fs:KPCR_IDR] + mov al, SoftIntByteTable[eax] + cmp al, cl + jbe AfterCall2 + + /* There is, call it */ + call SoftIntHandlerTable[eax*4] + +AfterCall2: + + /* Restore interrupts and return */ + popf + ret +.endfunc +#endif + +.globl @KfRaiseIrql@4 +.func @KfRaiseIrql@4 +_@KfRaiseIrql@4: +@KfRaiseIrql@4: + + /* Get the IRQL and check if it's Software level only */ + xor eax, eax + mov al, [fs:KPCR_IRQL] + + movzx ecx, cl + cmp cl, DISPATCH_LEVEL + jbe SetIrql + + /* Save the current IRQL */ + mov edx, eax + + /* It's a hardware IRQL, so disable interrupts */ + pushf + cli + + /* Set the new IRQL */ + mov [fs:KPCR_IRQL], cl + +#if 0 + /* Mask the interrupts in the PIC */ + mov eax, _KiI8259MaskTable[ecx*4] + or eax, [fs:KPCR_IDR] + out 0x21, al + shr eax, 8 + out 0xA1, al +#endif + + /* Restore interrupts and return old IRQL */ + popf + mov eax, edx + ret + +SetIrql: + + /* Set the IRQL and return */ + mov [fs:KPCR_IRQL], cl + ret +.endfunc + +.globl _KeGetCurrentIrql@0 +.func KeGetCurrentIrql@0 +_KeGetCurrentIrql@0: + + /* Return the IRQL */ + movzx eax, word ptr [fs:KPCR_IRQL] + ret +.endfunc + +.globl _KeRaiseIrqlToDpcLevel@0 +.func KeRaiseIrqlToDpcLevel@0 +_KeRaiseIrqlToDpcLevel@0: + + /* Get the current IRQL */ + xor eax, eax + mov al, [fs:KPCR_IRQL] + + /* Set DISPATCH_LEVEL */ + mov byte ptr [fs:KPCR_IRQL], DISPATCH_LEVEL + ret +.endfunc + +.globl _KeRaiseIrqlToSynchLevel@0 +.func KeRaiseIrqlToSynchLevel@0 +_KeRaiseIrqlToSynchLevel@0: + + /* Disable interrupts */ + pushf + cli + + /* Mask out interrupts */ + mov eax, _KiI8259MaskTable + DISPATCH_LEVEL * 2 + or eax, [fs:KPCR_IDR] + out 0x21, al + shr eax, 8 + out 0xA1, al + + /* Return the old IRQL, enable interrupts and set to DISPATCH */ + mov al, [fs:KPCR_IRQL] + mov byte ptr [fs:KPCR_IRQL], DISPATCH_LEVEL + popf + ret +.endfunc + +.globl _HalpApcInterrupt +.func HalpApcInterrupt +_HalpApcInterrupt: + + /* Create fake interrupt stack */ + pop eax + pushf + push cs + push eax + + /* Enter interrupt */ + INT_PROLOG(hapc) +.endfunc + +.globl _HalpApcInterrupt2ndEntry +.func HalpApcInterrupt2ndEntry +_HalpApcInterrupt2ndEntry: + + /* Save current IRQL and set to APC level */ + push [fs:KPCR_IRQL] + mov byte ptr [fs:KPCR_IRQL], APC_LEVEL + and dword ptr [fs:KPCR_IRR], ~(1 << APC_LEVEL) + + /* Enable interrupts and check if we came from User/V86 mode */ + sti + mov eax, [ebp+KTRAP_FRAME_CS] + and eax, MODE_MASK + test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK + jz DeliverApc + + /* Set user mode delivery */ + or eax, UserMode + +DeliverApc: + + /* Deliver the APCs */ + push ebp + push 0 + push eax + call _KiDeliverApc@12 + + /* Disable interrupts and end it */ + cli + call _HalpEndSoftwareInterrupt@4 + jmp _Kei386EoiHelper@0 +.endfunc + +.globl _HalpDispatchInterrupt +.func HalpDispatchInterrupt +_HalpDispatchInterrupt: + + /* Create fake interrupt stack */ + pop eax + pushf + push cs + push eax + + /* Enter interrupt */ + INT_PROLOG(hapc) +.endfunc + +.globl _HalpDispatchInterrupt2ndEntry +.func HalpDispatchInterrupt2ndEntry +_HalpDispatchInterrupt2ndEntry: + + /* Save current IRQL and set to DPC level */ + push [fs:KPCR_IRQL] + mov byte ptr [fs:KPCR_IRQL], DISPATCH_LEVEL + and dword ptr [fs:KPCR_IRR], ~(1 << DISPATCH_LEVEL) + + /* Enable interrupts and let the kernel handle this */ + sti + call _KiDispatchInterrupt@0 + + /* Disable interrupts and end it */ + cli + call _HalpEndSoftwareInterrupt@4 + jmp _Kei386EoiHelper@0 +.endfunc + +.globl _HalpEndSoftwareInterrupt@4 +.func HalpEndSoftwareInterrupt@4 +_HalpEndSoftwareInterrupt@4: + + /* Get the IRQL and check if we're in the software region */ + movzx ecx, byte ptr [esp+4] + cmp byte ptr [fs:KPCR_IRQL], DISPATCH_LEVEL + jbe SoftwareInt + + /* Set the right mask in the PIC for the hardware IRQ */ + mov eax, _KiI8259MaskTable[ecx*4] + or eax, [fs:KPCR_IDR] + out 0x21, al + shr eax, 8 + out 0xA1, al + +SoftwareInt: + /* Check if there are pending software interrupts */ + mov [fs:KPCR_IRQL], cl + mov eax, [fs:KPCR_IDR] + mov al, SoftIntByteTable[eax] + cmp al, cl + ja DoCall2 + ret 4 + +DoCall2: + + /* There are pending softwate interrupts, call their handlers */ + add esp, 8 + jmp SoftIntHandlerTable2[eax*4] +.endfunc Modified: trunk/reactos/hal/halx86/generic/irql.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/irql.c?… ============================================================================== --- trunk/reactos/hal/halx86/generic/irql.c (original) +++ trunk/reactos/hal/halx86/generic/irql.c Wed Aug 23 00:50:52 2006 @@ -19,38 +19,16 @@ * FIXME: Use EISA_CONTROL STRUCTURE INSTEAD OF HARD-CODED OFFSETS */ -typedef union -{ - USHORT both; - struct - { - BYTE master; - BYTE slave; - }; -} -PIC_MASK; - -/* - * PURPOSE: - Mask for HalEnableSystemInterrupt and HalDisableSystemInterrupt - * - At startup enable timer and cascade - */ -#if defined(__GNUC__) -static PIC_MASK pic_mask = {.both = 0xFFFA}; -#else -static PIC_MASK pic_mask = { 0xFFFA }; -#endif - - -/* - * PURPOSE: Mask for disabling of acknowledged interrupts - */ -#if defined(__GNUC__) -static PIC_MASK pic_mask_intr = {.both = 0x0000}; -#else -static PIC_MASK pic_mask_intr = { 0 }; -#endif - -static ULONG HalpPendingInterruptCount[NR_IRQS]; +UCHAR Table[8] = +{ + 0, 0, + 1, 1, + 2, 2, 2, 2 +}; + +ULONG pic_mask = {0xFFFFFFFA}; + +static ULONG HalpPendingInterruptCount[NR_IRQS] = {0}; #define DIRQL_TO_IRQ(x) (PROFILE_LEVEL - x) #define IRQ_TO_DIRQL(x) (PROFILE_LEVEL - x) @@ -60,40 +38,7 @@ /* FUNCTIONS ****************************************************************/ -#undef KeGetCurrentIrql -KIRQL STDCALL KeGetCurrentIrql (VOID) -/* - * PURPOSE: Returns the current irq level - * RETURNS: The current irq level - */ -{ - return(KeGetPcr()->Irql); -} - -VOID HalpInitPICs(VOID) -{ - memset(HalpPendingInterruptCount, 0, sizeof(HalpPendingInterruptCount)); - - /* Initialization sequence */ - WRITE_PORT_UCHAR((PUCHAR)0x20, 0x11); - WRITE_PORT_UCHAR((PUCHAR)0xa0, 0x11); - /* Start of hardware irqs (0x24) */ - WRITE_PORT_UCHAR((PUCHAR)0x21, IRQ_BASE); - WRITE_PORT_UCHAR((PUCHAR)0xa1, IRQ_BASE + 8); - /* 8259-1 is master */ - WRITE_PORT_UCHAR((PUCHAR)0x21, 0x4); - /* 8259-2 is slave */ - WRITE_PORT_UCHAR((PUCHAR)0xa1, 0x2); - /* 8086 mode */ - WRITE_PORT_UCHAR((PUCHAR)0x21, 0x1); - WRITE_PORT_UCHAR((PUCHAR)0xa1, 0x1); - /* Enable interrupts */ - WRITE_PORT_UCHAR((PUCHAR)0x21, pic_mask.master); - WRITE_PORT_UCHAR((PUCHAR)0xa1, pic_mask.slave); - - /* We can now enable interrupts */ - Ki386EnableInterrupts(); -} +extern ULONG KiI8259MaskTable[]; VOID HalpEndSystemInterrupt(KIRQL Irql) /* @@ -101,21 +46,16 @@ */ { ULONG flags; - const USHORT mask[] = - { - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x8000, 0xc000, 0xe000, 0xf000, - 0xf800, 0xfc00, 0xfe00, 0xff00, 0xff80, 0xffc0, 0xffe0, 0xfff0, - 0xfff8, 0xfffc, 0xfffe, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, - }; + ULONG Mask; /* Interrupts should be disable while enabling irqs of both pics */ Ki386SaveFlags(flags); Ki386DisableInterrupts(); - pic_mask_intr.both &= mask[Irql]; - WRITE_PORT_UCHAR((PUCHAR)0x21, (UCHAR)(pic_mask.master|pic_mask_intr.master)); - WRITE_PORT_UCHAR((PUCHAR)0xa1, (UCHAR)(pic_mask.slave|pic_mask_intr.slave)); + Mask = pic_mask | KiI8259MaskTable[Irql]; + WRITE_PORT_UCHAR((PUCHAR)0x21, (UCHAR)Mask); + Mask >>= 8; + WRITE_PORT_UCHAR((PUCHAR)0xa1, (UCHAR)Mask); /* restore flags */ Ki386RestoreFlags(flags); @@ -168,9 +108,9 @@ return; } KeGetPcr()->Irql = DISPATCH_LEVEL; - if (((PKIPCR)KeGetPcr())->HalReserved[HAL_DPC_REQUEST]) - { - ((PKIPCR)KeGetPcr())->HalReserved[HAL_DPC_REQUEST] = FALSE; + if (Table[KeGetPcr()->IRR] >= NewIrql) + { + KeGetPcr()->IRR &= ~4; KiDispatchInterrupt(); } KeGetPcr()->Irql = APC_LEVEL; @@ -219,172 +159,36 @@ } -/********************************************************************** - * NAME EXPORTED - * KeLowerIrql - * - * DESCRIPTION - * Restores the irq level on the current processor - * - * ARGUMENTS - * NewIrql = Irql to lower to - * - * RETURN VALUE - * None - * - * NOTES - */ -#undef KeLowerIrql -VOID STDCALL -KeLowerIrql (KIRQL NewIrql) -{ - KfLowerIrql (NewIrql); -} - - -/********************************************************************** - * NAME EXPORTED - * KfRaiseIrql - * - * DESCRIPTION - * Raises the hardware priority (irql) - * - * ARGUMENTS - * NewIrql = Irql to raise to - * - * RETURN VALUE - * previous irq level - * - * NOTES - * Uses fastcall convention - */ - -KIRQL FASTCALL -KfRaiseIrql (KIRQL NewIrql) -{ - KIRQL OldIrql; - - DPRINT("KfRaiseIrql(NewIrql %d)\n", NewIrql); - - if (NewIrql < KeGetPcr()->Irql) - { - DbgPrint ("%s:%d CurrentIrql %x NewIrql %x\n", - __FILE__,__LINE__,KeGetPcr()->Irql,NewIrql); - KEBUGCHECK (0); - for(;;); - } - - OldIrql = KeGetPcr()->Irql; - KeGetPcr()->Irql = NewIrql; - return OldIrql; -} - - -/********************************************************************** - * NAME EXPORTED - * KeRaiseIrql - * - * DESCRIPTION - * Raises the hardware priority (irql) - * - * ARGUMENTS - * NewIrql = Irql to raise to - * OldIrql (OUT) = Caller supplied storage for the previous irql - * - * RETURN VALUE - * None - * - * NOTES - * Calls KfRaiseIrql - */ -#undef KeRaiseIrql -VOID STDCALL -KeRaiseIrql (KIRQL NewIrql, - PKIRQL OldIrql) -{ - *OldIrql = KfRaiseIrql (NewIrql); -} - - -/********************************************************************** - * NAME EXPORTED - * KeRaiseIrqlToDpcLevel - * - * DESCRIPTION - * Raises the hardware priority (irql) to DISPATCH level - * - * ARGUMENTS - * None - * - * RETURN VALUE - * Previous irq level - * - * NOTES - * Calls KfRaiseIrql - */ - -KIRQL STDCALL -KeRaiseIrqlToDpcLevel (VOID) -{ - return KfRaiseIrql (DISPATCH_LEVEL); -} - - -/********************************************************************** - * NAME EXPORTED - * KeRaiseIrqlToSynchLevel - * - * DESCRIPTION - * Raises the hardware priority (irql) to CLOCK2 level - * - * ARGUMENTS - * None - * - * RETURN VALUE - * Previous irq level - * - * NOTES - * Calls KfRaiseIrql - */ - -KIRQL STDCALL -KeRaiseIrqlToSynchLevel (VOID) -{ - return KfRaiseIrql (CLOCK2_LEVEL); -} - - BOOLEAN STDCALL HalBeginSystemInterrupt (KIRQL Irql, ULONG Vector, PKIRQL OldIrql) { ULONG irq; + ULONG Mask; + if (Vector < IRQ_BASE || Vector >= IRQ_BASE + NR_IRQS) { return(FALSE); } irq = Vector - IRQ_BASE; - pic_mask_intr.both |= ((1 << irq) & 0xfffe); // do not disable the timer interrupt + + Mask = pic_mask | KiI8259MaskTable[Irql]; + WRITE_PORT_UCHAR((PUCHAR)0x21, (UCHAR)Mask); + Mask >>= 8; + WRITE_PORT_UCHAR((PUCHAR)0xa1, (UCHAR)Mask); if (irq < 8) { - WRITE_PORT_UCHAR((PUCHAR)0x21, (UCHAR)(pic_mask.master|pic_mask_intr.master)); - WRITE_PORT_UCHAR((PUCHAR)0x20, 0x20); + WRITE_PORT_UCHAR((PUCHAR)0x20, 0x60 | irq); } else { - WRITE_PORT_UCHAR((PUCHAR)0xa1, (UCHAR)(pic_mask.slave|pic_mask_intr.slave)); /* Send EOI to the PICs */ - WRITE_PORT_UCHAR((PUCHAR)0x20,0x20); + WRITE_PORT_UCHAR((PUCHAR)0x20,0x62); WRITE_PORT_UCHAR((PUCHAR)0xa0,0x20); } - - if (KeGetPcr()->Irql >= Irql) - { - HalpPendingInterruptCount[irq]++; - return(FALSE); - } + *OldIrql = KeGetPcr()->Irql; KeGetPcr()->Irql = Irql; @@ -397,35 +201,10 @@ * FUNCTION: Finish a system interrupt and restore the specified irq level. */ { + //DPRINT1("ENDING: %lx %lx\n", Irql, Unknown2); HalpLowerIrql(Irql); HalpEndSystemInterrupt(Irql); } - -BOOLEAN -STDCALL -HalDisableSystemInterrupt( - ULONG Vector, - KIRQL Irql) -{ - ULONG irq; - - if (Vector < IRQ_BASE || Vector >= IRQ_BASE + NR_IRQS) - return FALSE; - - irq = Vector - IRQ_BASE; - pic_mask.both |= (1 << irq); - if (irq < 8) - { - WRITE_PORT_UCHAR((PUCHAR)0x21, (UCHAR)(pic_mask.master|pic_mask_intr.slave)); - } - else - { - WRITE_PORT_UCHAR((PUCHAR)0xa1, (UCHAR)(pic_mask.slave|pic_mask_intr.slave)); - } - - return TRUE; -} - BOOLEAN STDCALL @@ -435,42 +214,22 @@ KINTERRUPT_MODE InterruptMode) { ULONG irq; + ULONG Mask; if (Vector < IRQ_BASE || Vector >= IRQ_BASE + NR_IRQS) return FALSE; irq = Vector - IRQ_BASE; - pic_mask.both &= ~(1 << irq); - if (irq < 8) - { - WRITE_PORT_UCHAR((PUCHAR)0x21, (UCHAR)(pic_mask.master|pic_mask_intr.master)); - } - else - { - WRITE_PORT_UCHAR((PUCHAR)0xa1, (UCHAR)(pic_mask.slave|pic_mask_intr.slave)); - } + pic_mask &= ~(1 << irq); + + Mask = pic_mask | KiI8259MaskTable[KeGetPcr()->Irql]; + WRITE_PORT_UCHAR((PUCHAR)0x21, (UCHAR)Mask); + Mask >>= 8; + WRITE_PORT_UCHAR((PUCHAR)0xa1, (UCHAR)Mask); return TRUE; } -VOID FASTCALL -HalRequestSoftwareInterrupt( - IN KIRQL Request) -{ - switch (Request) - { - case APC_LEVEL: - ((PKIPCR)KeGetPcr())->HalReserved[HAL_APC_REQUEST] = TRUE; - break; - - case DISPATCH_LEVEL: - ((PKIPCR)KeGetPcr())->HalReserved[HAL_DPC_REQUEST] = TRUE; - break; - - default: - KEBUGCHECK(0); - } -} /* EOF */ Modified: trunk/reactos/hal/halx86/generic/spinlock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/spinloc… ============================================================================== --- trunk/reactos/hal/halx86/generic/spinlock.c (original) +++ trunk/reactos/hal/halx86/generic/spinlock.c Wed Aug 23 00:50:52 2006 @@ -14,8 +14,33 @@ #undef KeAcquireSpinLock #undef KeReleaseSpinLock +#undef KeLowerIrql +#undef KeRaiseIrql /* FUNCTIONS ***************************************************************/ + +/* + * @implemented + */ +VOID +NTAPI +KeLowerIrql(KIRQL NewIrql) +{ + /* Call the fastcall function */ + KfLowerIrql(NewIrql); +} + +/* + * @implemented + */ +VOID +NTAPI +KeRaiseIrql(KIRQL NewIrql, + PKIRQL OldIrql) +{ + /* Call the fastcall function */ + *OldIrql = KfRaiseIrql(NewIrql); +} /* * @implemented Modified: trunk/reactos/hal/halx86/include/halp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/halp.h?… ============================================================================== --- trunk/reactos/hal/halx86/include/halp.h (original) +++ trunk/reactos/hal/halx86/include/halp.h Wed Aug 23 00:50:52 2006 @@ -29,7 +29,7 @@ VOID HalpInitBusHandlers (VOID); /* irql.c */ -VOID HalpInitPICs(VOID); +VOID NTAPI HalpInitPICs(VOID); /* udelay.c */ VOID HalpCalibrateStallExecution(VOID); Modified: trunk/reactos/include/ndk/asm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/asm.h?rev=2364… ============================================================================== --- trunk/reactos/include/ndk/asm.h (original) +++ trunk/reactos/include/ndk/asm.h Wed Aug 23 00:50:52 2006 @@ -433,8 +433,9 @@ // // Vector base -// -#define PRIMARY_VECTOR_BASE 0x30 +// ROS HACK HACK HACK +// +#define PRIMARY_VECTOR_BASE 0x40 // // Kernel Feature Bits Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=236… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c (original) +++ trunk/reactos/ntoskrnl/ex/init.c Wed Aug 23 00:50:52 2006 @@ -260,6 +260,10 @@ ASSERT(FIELD_OFFSET(KV86M_TRAP_FRAME, orig_ebp) == TF_ORIG_EBP); ASSERT(FIELD_OFFSET(KPCR, Tib.ExceptionList) == KPCR_EXCEPTION_LIST); ASSERT(FIELD_OFFSET(KPCR, Self) == KPCR_SELF); + ASSERT(FIELD_OFFSET(KPCR, IRR) == KPCR_IRR); + ASSERT(KeGetPcr()->IRR == 0); + ASSERT(FIELD_OFFSET(KPCR, IDR) == KPCR_IDR); + ASSERT(FIELD_OFFSET(KPCR, Irql) == KPCR_IRQL); ASSERT(FIELD_OFFSET(KIPCR, PrcbData) + FIELD_OFFSET(KPRCB, CurrentThread) == KPCR_CURRENT_THREAD); ASSERT(FIELD_OFFSET(KIPCR, PrcbData) + FIELD_OFFSET(KPRCB, NpxThread) == KPCR_NPX_THREAD); ASSERT(FIELD_OFFSET(KTSS, Esp0) == KTSS_ESP0);

1 0

[cwittich] 23648: * some msvc /W4 fixes
by cwittich＠svn.reactos.org 22 Aug '06

22 Aug '06

Author: cwittich Date: Wed Aug 23 00:06:30 2006 New Revision: 23648 URL: http://svn.reactos.org/svn/reactos?rev=23648&view=rev Log: * some msvc /W4 fixes Modified: trunk/reactos/base/applications/devmgr/devmgr.c trunk/reactos/base/applications/regedit/framewnd.c trunk/reactos/base/applications/regedit/hexedit.c trunk/reactos/base/applications/regedit/listview.c trunk/reactos/base/applications/regedit/regedit.c trunk/reactos/base/applications/regedit/regproc.c trunk/reactos/base/applications/regedit/treeview.c Modified: trunk/reactos/base/applications/devmgr/devmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/devmgr/d… ============================================================================== --- trunk/reactos/base/applications/devmgr/devmgr.c (original) +++ trunk/reactos/base/applications/devmgr/devmgr.c Wed Aug 23 00:06:30 2006 @@ -362,6 +362,9 @@ { MSG msg; +UNREFERENCED_PARAMETER(lpCmdLine); +UNREFERENCED_PARAMETER(hInstance); + g_hInst = hInstance; if(!hPrevInstance) @@ -525,6 +528,8 @@ { DWORD dwStyle; +UNREFERENCED_PARAMETER(hInstance); + dwStyle = WS_TABSTOP | WS_CHILD | WS_BORDER | @@ -675,6 +680,8 @@ void CreateButtons(HINSTANCE hInstance, HWND hwndParent) { + + UNREFERENCED_PARAMETER(hInstance); hwndButtonListByClass = CreateWindowEx ( 0, Modified: trunk/reactos/base/applications/regedit/framewnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/framewnd.c (original) +++ trunk/reactos/base/applications/regedit/framewnd.c Wed Aug 23 00:06:30 2006 @@ -735,7 +735,7 @@ { if (SelectionList->cItems == 1) { - UINT nlen = wcslen(SelectionList->aDsSelection[0].pwzName); + size_t nlen = wcslen(SelectionList->aDsSelection[0].pwzName); if (nlen >= uSize) { nlen = uSize - 1; Modified: trunk/reactos/base/applications/regedit/hexedit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/hexedit.c (original) +++ trunk/reactos/base/applications/regedit/hexedit.c Wed Aug 23 00:06:30 2006 @@ -128,7 +128,7 @@ GetClientRect(hed->hWndSelf, &rcClient); hed->style = GetWindowLong(hed->hWndSelf, GWL_STYLE); - bufsize = (hed->hBuffer ? LocalSize(hed->hBuffer) : 0); + bufsize = (hed->hBuffer ? (INT) LocalSize(hed->hBuffer) : 0); hed->nLines = max(bufsize / hed->ColumnsPerLine, 1); if(bufsize > hed->ColumnsPerLine && (bufsize % hed->ColumnsPerLine) > 0) { @@ -340,7 +340,7 @@ case HEHT_ADDRESS: case HEHT_ADDRESSSPACING: case HEHT_HEXDUMP: - pt.x -= hed->LeftMargin + ((4 + hed->AddressSpacing) * hed->CharWidth); + pt.x -= (SHORT) hed->LeftMargin + ((4 + hed->AddressSpacing) * hed->CharWidth); *EditField = TRUE; break; @@ -356,7 +356,7 @@ EditPos->x = min(hed->ColumnsPerLine, pt.x / BlockWidth); } - bufsize = (hed->hBuffer ? LocalSize(hed->hBuffer) : 0); + bufsize = (hed->hBuffer ? (DWORD) LocalSize(hed->hBuffer) : 0); Pos = (EditPos->y * hed->ColumnsPerLine) + EditPos->x; if(Pos > bufsize) { @@ -433,7 +433,7 @@ static LRESULT HEXEDIT_HEM_COPYBUFFER(PHEXEDIT_DATA hed, PVOID Buffer, DWORD Size) { - DWORD nCpy; + size_t nCpy; if(!hed->hBuffer) { @@ -767,7 +767,7 @@ static BOOL HEXEDIT_WM_KEYDOWN(PHEXEDIT_DATA hed, INT VkCode) { - DWORD bufsize; + size_t bufsize; BOOL shift, control; if(GetKeyState(VK_MENU) & 0x8000) @@ -836,15 +836,15 @@ hed->CaretLine++; if(hed->Position > (INT)bufsize) { - hed->Position = bufsize; + hed->Position = (INT) bufsize; hed->CaretLine = (hed->nLines > 0 ? hed->nLines - 1 : 0); - hed->CaretCol = bufsize % hed->ColumnsPerLine; + hed->CaretCol = (INT) bufsize % hed->ColumnsPerLine; } } else { - INT tmp = bufsize % hed->ColumnsPerLine; - hed->Position = bufsize; + INT tmp = (INT) bufsize % hed->ColumnsPerLine; + hed->Position = (INT) bufsize; hed->CaretCol = (tmp == 0 ? hed->ColumnsPerLine : tmp); } } Modified: trunk/reactos/base/applications/regedit/listview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/listview.c (original) +++ trunk/reactos/base/applications/regedit/listview.c Wed Aug 23 00:06:30 2006 @@ -50,7 +50,8 @@ LPCTSTR GetValueName(HWND hwndLV, int iStartAt) { - int item, len, maxLen; + int item; + size_t len, maxLen; LPTSTR newStr; LVITEM LVItem; PLINE_INFO lineinfo; Modified: trunk/reactos/base/applications/regedit/regedit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/regedit.c (original) +++ trunk/reactos/base/applications/regedit/regedit.c Wed Aug 23 00:06:30 2006 @@ -90,7 +90,7 @@ s++; ch = *s; ch2 = *(s+1); - chu = toupper(ch); + chu = (CHAR) toupper(ch); if (!ch2 || isspace(ch2)) { if (chu == 'S' || chu == 'V') { /* ignore these switches */ Modified: trunk/reactos/base/applications/regedit/regproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/regproc.c (original) +++ trunk/reactos/base/applications/regedit/regproc.c Wed Aug 23 00:06:30 2006 @@ -315,7 +315,7 @@ LPSTR getArg( LPSTR arg) { LPSTR tmp = NULL; - ULONG len; + size_t len; if (arg == NULL) return NULL; @@ -339,9 +339,9 @@ */ static void REGPROC_unescape_string(LPSTR str) { - int str_idx = 0; /* current character under analysis */ - int val_idx = 0; /* the last character of the unescaped string */ - int len = strlen(str); + size_t str_idx = 0; /* current character under analysis */ + size_t val_idx = 0; /* the last character of the unescaped string */ + size_t len = strlen(str); for (str_idx = 0; str_idx < len; str_idx++, val_idx++) { if (str[str_idx] == '\\') { str_idx++; @@ -391,7 +391,7 @@ if ( dwParseType == REG_SZ) /* no conversion for string */ { - dwLen = strlen(val_data); + dwLen = (DWORD) strlen(val_data); if (dwLen>0 && val_data[dwLen-1]=='"') { dwLen--; @@ -406,11 +406,11 @@ lpbData = convert; } else /* Convert the hexadecimal types */ { - int b_len = strlen (val_data)+2/3; + size_t b_len = strlen (val_data)+2/3; if (b_len > KEY_MAX_LEN) { bBigBuffer = HeapAlloc (GetProcessHeap(), 0, b_len); CHECK_ENOUGH_MEMORY(bBigBuffer); - dwLen = convertHexCSVToHex(val_data, bBigBuffer, b_len); + dwLen = convertHexCSVToHex(val_data, bBigBuffer, (ULONG) b_len); lpbData = bBigBuffer; } else { dwLen = convertHexCSVToHex(val_data, convert, KEY_MAX_LEN); @@ -873,7 +873,7 @@ void processRegLines(FILE *in, CommandAPI command) { LPSTR line = NULL; /* line read from input stream */ - ULONG lineSize = REG_VAL_BUF_SIZE; + size_t lineSize = REG_VAL_BUF_SIZE; line = HeapAlloc(GetProcessHeap(), 0, lineSize); CHECK_ENOUGH_MEMORY(line); @@ -907,7 +907,7 @@ /* Get as much as possible into the buffer, terminated either by * eof, error, eol or getting the maximum amount. Abort on error. */ - size_to_get = (size_remaining > INT_MAX ? INT_MAX : size_remaining); + size_to_get = (int) (size_remaining > INT_MAX ? INT_MAX : size_remaining); if (NULL == fgets (s, size_to_get, in)) { if (ferror(in)) { perror ("While reading input"); @@ -1146,7 +1146,7 @@ ) != ERROR_SUCCESS) { REGPROC_print_error(); } - curr_len = strlen(*reg_key_name_buf); + curr_len = (DWORD) strlen(*reg_key_name_buf); REGPROC_resize_char_buffer(reg_key_name_buf, reg_key_name_len, max_sub_key_len + curr_len + 1); REGPROC_resize_char_buffer(val_name_buf, val_name_len, @@ -1223,8 +1223,8 @@ /* position of where the next character will be printed */ /* NOTE: yes, strlen("hex:") is used even for hex(x): */ - cur_pos = strlen("\"\"=") + strlen("hex:") + - strlen(*val_name_buf); + cur_pos = (int) (strlen("\"\"=") + strlen("hex:") + + strlen(*val_name_buf)); fputs(hex_prefix, file); for (i1 = 0; i1 < val_size1; i1++) { @@ -1324,7 +1324,7 @@ HKEY key; REGPROC_resize_char_buffer(&reg_key_name_buf, &reg_key_name_len, - strlen(reg_key_name)); + (DWORD) strlen(reg_key_name)); strcpy(reg_key_name_buf, reg_key_name); /* open the specified key */ @@ -1421,7 +1421,7 @@ ) != ERROR_SUCCESS) { REGPROC_print_error(); } - curr_len = strlen(*reg_key_name_buf); + curr_len = (DWORD) strlen(*reg_key_name_buf); REGPROC_resize_char_buffer(reg_key_name_buf, reg_key_name_len, max_sub_key_len + curr_len + 1); @@ -1469,7 +1469,7 @@ } branch_name = getRegKeyName(reg_key_name); CHECK_ENOUGH_MEMORY(branch_name); - branch_name_len = strlen(branch_name); + branch_name_len = (DWORD) strlen(branch_name); if (!branch_name[0]) { fprintf(stderr,"%s: Can't delete registry class '%s'\n", getAppName(), reg_key_name); @@ -1698,7 +1698,7 @@ /* Try accessing a subkey */ if (RegOpenKeyEx(hKey, lpSubKey, 0, KEY_ALL_ACCESS, &hSubKey) == ERROR_SUCCESS) { - cbName = iSubKeyLength - _tcslen(lpSubKey) - 1; + cbName = (DWORD) iSubKeyLength - _tcslen(lpSubKey) - 1; lResult = RegEnumKeyEx(hSubKey, 0, lpSubKey + _tcslen(lpSubKey) + 1, &cbName, NULL, NULL, NULL, &ft); RegCloseKey(hSubKey); Modified: trunk/reactos/base/applications/regedit/treeview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/treeview.c (original) +++ trunk/reactos/base/applications/regedit/treeview.c Wed Aug 23 00:06:30 2006 @@ -37,7 +37,7 @@ static BOOL get_item_path(HWND hwndTV, HTREEITEM hItem, HKEY* phKey, LPTSTR* pKeyPath, int* pPathLen, int* pMaxLen) { TVITEM item; - int maxLen, len; + size_t maxLen, len; LPTSTR newStr; item.mask = TVIF_PARAM; @@ -60,11 +60,12 @@ item.mask = TVIF_TEXT; item.hItem = hItem; item.pszText = *pKeyPath + *pPathLen; - item.cchTextMax = maxLen = *pMaxLen - *pPathLen; + maxLen = *pMaxLen - *pPathLen; + item.cchTextMax = (int) maxLen; if (!TreeView_GetItem(hwndTV, &item)) return FALSE; len = _tcslen(item.pszText); if (len < maxLen - 1) { - *pPathLen += len; + *pPathLen += (int) len; break; } newStr = HeapReAlloc(GetProcessHeap(), 0, *pKeyPath, *pMaxLen * 2); @@ -84,7 +85,7 @@ if (!pathBuffer) pathBuffer = HeapAlloc(GetProcessHeap(), 0, 1024); if (!pathBuffer) return NULL; *pathBuffer = 0; - maxLen = HeapSize(GetProcessHeap(), 0, pathBuffer); + maxLen = (int) HeapSize(GetProcessHeap(), 0, pathBuffer); if (maxLen == -1) return NULL; if (!hItem) hItem = TreeView_GetSelection(hwndTV); if (!hItem) return NULL; @@ -210,7 +211,7 @@ if (!TreeView_GetItem(hwndTV, &tvItem)) goto done; - dwActualSize += _tcslen(&pszNodes[dwActualSize]) + 1; + dwActualSize += (DWORD) _tcslen(&pszNodes[dwActualSize]) + 1; } if (pszNodes)

1 0

[arty] 23646: Fix elrond bug. DNS timeouts now work properly even in the absence of ICMP destination unreachable or a proper response.
by arty＠svn.reactos.org 22 Aug '06

22 Aug '06

Author: arty Date: Tue Aug 22 10:23:00 2006 New Revision: 23646 URL: http://svn.reactos.org/svn/reactos?rev=23646&view=rev Log: Fix elrond bug. DNS timeouts now work properly even in the absence of ICMP destination unreachable or a proper response. Modified: trunk/reactos/lib/3rdparty/adns/adns_win32/adns_unix_calls.c Modified: trunk/reactos/lib/3rdparty/adns/adns_win32/adns_unix_calls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/adns/adns_win… ============================================================================== --- trunk/reactos/lib/3rdparty/adns/adns_win32/adns_unix_calls.c (original) +++ trunk/reactos/lib/3rdparty/adns/adns_win32/adns_unix_calls.c Tue Aug 22 10:23:00 2006 @@ -63,30 +63,35 @@ return GetCurrentProcessId(); } +/* ReactOS: Fixed gettimeofday implementation. Was wrong by a factor of + * 10 */ int gettimeofday(struct timeval *tv, struct timezone *tz) { - static __int64 Adjustment; - __int64 Now = 0; - + static __int64 Adjustment; + __int64 Now = 0; + + + if (!Adjustment) + { + SYSTEMTIME st = {1970,1,3,0,0,0,0}; - if (!Adjustment) - { - SYSTEMTIME st = {1970,1,3,0,0,0,0}; - SystemTimeToFileTime(&st, ((LPFILETIME)(VOID *)&Adjustment)); - } - - if (tz) - { - errno = EINVAL; - return -1; - } - - GetSystemTimeAsFileTime(((LPFILETIME)(VOID *)&Now)); - Now -= Adjustment; - - tv->tv_sec = (long)(Now / 100000000); - tv->tv_usec = (long)((Now / 100) - (((__int64)tv->tv_sec * 1000) * 100)); - return 0; + SystemTimeToFileTime(&st, ((LPFILETIME)(VOID *)&Adjustment)); + } + + if (tz) + { + return -1; + } + + GetSystemTimeAsFileTime(((LPFILETIME)(VOID *)&Now)); + Now -= Adjustment; + + /* 100 ns + .1 us + 10 * 1000000 */ + tv->tv_sec = (long)(Now / 10000000); + tv->tv_usec = (long)((Now / 10) % 1000000); + return 0; } /* Memory allocated in the DLL must be freed in the dll, so

1 0

[ion] 23645: - Implement GENERATE_IDT_STUBS/GENERATE_INT_HANDLERS - Generate actual Unexpected Interrupt entries in the IDT for INTs > 0x30 (basically IRQs). - Generated all 208 Unexpected Interrupt Handlers for all INTs (using a single macro line) and implement a "Tail" function to handle them instead of bugchecking like before (they're now sent to HAL properly). - Implement INT_PROLOG macro to create KTRAP_FRAME for interrupts (similar to traps). - Part 1 of major changes to come....
by ion＠svn.reactos.org 21 Aug '06

21 Aug '06

Author: ion Date: Tue Aug 22 02:40:23 2006 New Revision: 23645 URL: http://svn.reactos.org/svn/reactos?rev=23645&view=rev Log: - Implement GENERATE_IDT_STUBS/GENERATE_INT_HANDLERS - Generate actual Unexpected Interrupt entries in the IDT for INTs > 0x30 (basically IRQs). - Generated all 208 Unexpected Interrupt Handlers for all INTs (using a single macro line) and implement a "Tail" function to handle them instead of bugchecking like before (they're now sent to HAL properly). - Implement INT_PROLOG macro to create KTRAP_FRAME for interrupts (similar to traps). - Part 1 of major changes to come.... Modified: trunk/reactos/include/ndk/asm.h trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S trunk/reactos/ntoskrnl/ke/i386/trap.s trunk/reactos/ntoskrnl/ntoskrnl.def Modified: trunk/reactos/include/ndk/asm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/asm.h?rev=2364… ============================================================================== --- trunk/reactos/include/ndk/asm.h (original) +++ trunk/reactos/include/ndk/asm.h Tue Aug 22 02:40:23 2006 @@ -135,6 +135,9 @@ #define KPCR_SELF 0x1C #define KPCR_PRCB 0x20 #define KPCR_IRQL 0x24 +#define KPCR_IRR 0x28 +#define KPCR_IRR_ACTIVE 0x2C +#define KPCR_IDR 0x30 #define KPCR_KD_VERSION_BLOCK 0x34 #define KPCR_IDT 0x38 #define KPCR_GDT 0x3C @@ -148,6 +151,7 @@ #define KPCR_NPX_THREAD 0x640 #define KPCR_DR6 0x428 #define KPCR_DR7 0x42C +#define KPCR_PRCB_INTERRUPT_COUNT 0x644 #define KPCR_SYSTEM_CALLS 0x6B8 #define KPCR_PRCB_DPC_ROUTINE_ACTIVE 0x994 @@ -400,6 +404,9 @@ // #define PASSIVE_LEVEL 0x0 #define APC_LEVEL 0x1 +#define DISPATCH_LEVEL 0x2 +#define CLOCK2_LEVEL 0x1C +#define HIGH_LEVEL 0x1F #endif // @@ -425,6 +432,11 @@ #define MACHINE_TYPE_MCA 0x0002 // +// Vector base +// +#define PRIMARY_VECTOR_BASE 0x30 + +// // Kernel Feature Bits // #define KF_RDTSC 0x00000002 Modified: trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S Tue Aug 22 02:40:23 2006 @@ -64,19 +64,86 @@ #endif // -// @name SET_TF_DEBUG_HEADER -// -// This macro sets up the debug header in the trap frame. -// -// @param None. -// -// @remark ebp = PKTRAP_FRAME. -// edi/ebx = Have been saved and can be used. +// @name IDT +// +// This macro creates an IDT entry for the given handler +// +// @param Handler +// Pointer to the IDT handler +// +// @param Bits +// Descriptor Bits to associate +// +// @remark None. // .macro idt Handler, Bits .long \Handler .short \Bits .short KGDT_R0_CODE +.endm + +// +// @name GENERATE_IDT_STUB +// +// This macro creates an IDT entry for an unexpected interrupt handler. +// +// @param None. +// +// @remark None. +// +.macro GENERATE_IDT_STUB Number +idt _KiUnexpectedInterrupt&Number, INT_32_DPL0 +.endm + +// +// @name GENERATE_IDT_STUBS +// +// This macro creates unexpected interrupt IDT entries. +// +// @param None. +// +// @remark None. +// +.altmacro +.macro GENERATE_IDT_STUBS +.set i, 0 +.rept 208 + GENERATE_IDT_STUB %i + .set i, i + 1 +.endr +.endm + +// +// @name GENERATE_INT_HANDLER +// +// This macro creates an unexpected interrupt handler. +// +// @param None. +// +// @remark None. +// +.macro GENERATE_INT_HANDLER Number +_KiUnexpectedInterrupt&Number: + push PRIMARY_VECTOR_BASE + Number + jmp _KiEndUnexpected +.endm + +// +// @name GENERATE_INT_HANDLERS +// +// This macro creates the unexpected interrupt handlers. +// +// @param None. +// +// @remark None. +// +.altmacro +.macro GENERATE_INT_HANDLERS +.set i, 0 +.rept 208 + GENERATE_INT_HANDLER %i + .set i, i + 1 +.endr .endm // @@ -252,6 +319,93 @@ \ /* Set the Trap Frame Debug Header */ \ SET_TF_DEBUG_HEADER + +// +// @name INT_PROLOG +// +// This macro creates a standard interrupt entry prologue. +// It should be used for entry into any interrupt, including software. +// +// @param Label +// Identifying name of the caller function; will be used to append +// to the name V86, ABIOS and DR helper functions, which must exist. +// +// @remark For software interrupts, make sure that a fake INT stack is created. +// +.macro INT_PROLOG Label + /* Save fake error code */ + push esp + + /* Save the non-volatiles */ + push ebp + push ebx + push esi + push edi + + /* Skip debug registers and other stuff */ + sub esp, 0x54 + + /* Set up frame */ + mov ebp, esp + + /* Save volatiles */ + mov [esp+KTRAP_FRAME_EAX], eax + mov [esp+KTRAP_FRAME_ECX], ecx + mov [esp+KTRAP_FRAME_EDX], edx + mov dword ptr [esp+KTRAP_FRAME_EXCEPTION_LIST], -1 + + /* Check if this was from V86 Mode */ + /* test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK */ + /* jnz V86_&Label*/ + + /* Check if this was kernel mode */ + cmp dword ptr [esp+KTRAP_FRAME_CS], KGDT_R0_CODE + jz 1f + + /* Set segments */ + mov word ptr [esp+KTRAP_FRAME_FS], fs + mov word ptr [esp+KTRAP_FRAME_DS], ds + mov word ptr [esp+KTRAP_FRAME_ES], es + mov word ptr [esp+KTRAP_FRAME_GS], gs + + /* Load the segment registers */ + mov ebx, KGDT_R0_PCR + mov eax, KGDT_R3_DATA | RPL_MASK + mov fs, bx + mov ds, ax + mov es, ax + +1: + /* Save the previous exception list */ + mov ebx, [fs:KPCR_EXCEPTION_LIST] + mov [esp+KTRAP_FRAME_EXCEPTION_LIST], ebx + + /* Set the exception handler chain terminator */ + mov dword ptr [fs:KPCR_EXCEPTION_LIST], -1 + + /* Check if this is the ABIOS stack */ + /* cmp esp, 0x10000*/ + /* jb Abios_Label*/ + + /* Delete error code */ + and dword ptr [esp+KTRAP_FRAME_ERROR_CODE], 0 + + /* Get the current thread and clear direction flag */ + mov ecx, [fs:KPCR_CURRENT_THREAD] + cld + + /* Flush DR7 */ + and dword ptr [ebp+KTRAP_FRAME_DR7], 0 + + /* Check if the thread was being debugged */ + test byte ptr [ecx+KTHREAD_DEBUG_ACTIVE], 0xFF + + /* Save DR registers if needed */ + //jnz Dr_&Label + + /* Set the trap frame debug header */ + SET_TF_DEBUG_HEADER +.endm // // @name SYSCALL_PROLOG Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/trap.s?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/trap.s (original) +++ trunk/reactos/ntoskrnl/ke/i386/trap.s Tue Aug 22 02:40:23 2006 @@ -46,9 +46,7 @@ idt _KiDebugService, INT_32_DPL3 /* INT 2D: Debug Service Handler */ idt _KiSystemService, INT_32_DPL3 /* INT 2E: System Call Service Handler */ idt _KiTrap0F, INT_32_DPL0 /* INT 2F: RESERVED */ -.rept 220 -idt _KiTrap0F, INT_32_DPL0 /* INT 30-FF: UNDEFINED INTERRUPTS */ -.endr +GENERATE_IDT_STUBS /* INT 30-FF: UNEXPECTED INTERRUPTS */ /* System call entrypoints: */ .globl _KiFastCallEntry @@ -62,13 +60,14 @@ .globl _KiServiceExit /* Exit from syscall */ .globl _KiServiceExit2 /* Exit from syscall with complete frame*/ .globl _Kei386EoiHelper@0 /* Exit from interrupt or H/W trap */ +.globl _Kei386EoiHelper2ndEntry /* Exit from unexpected interrupt */ .globl _KiIdtDescriptor _KiIdtDescriptor: .short 0x800 .long _KiIdt -/* FUNCTIONS ****************************************************************/ +/* SOFTWARE INTERRUPT SERVICES ***********************************************/ _KiGetTickCount: _KiCallbackReturn: @@ -490,6 +489,7 @@ CHECK_FOR_APC_DELIVER 0 /* Exit and cleanup */ +_Kei386EoiHelper2ndEntry: TRAP_EPILOG NotFromSystemCall, DoNotRestorePreviousMode, DoRestoreSegments, DoRestoreVolatiles, DoNotRestoreEverything .endfunc @@ -670,6 +670,8 @@ jmp _KiServiceExit .endfunc +/* EXCEPTION DISPATCHERS *****************************************************/ + .func CommonDispatchException _CommonDispatchException: @@ -746,6 +748,8 @@ mov ecx, 2 call _CommonDispatchException .endfunc + +/* HARDWARE TRAP HANDLERS ****************************************************/ .func KiTrap0 _KiTrap0: @@ -1291,4 +1295,54 @@ ret .endfunc - +/* INTERRUPT HANDLERS ********************************************************/ + +.globl _KiStartUnexpected +_KiStartUnexpected: + +GENERATE_INT_HANDLERS + +_KiEndUnexpected: + jmp _KiUnexpectedInterruptTail + +.func KiUnexpectedInterruptTail +_KiUnexpectedInterruptTail: + + /* Enter interrupt trap */ + INT_PROLOG(kui) + + /* Increase interrupt count */ + inc dword ptr [fs:KPCR_PRCB_INTERRUPT_COUNT] + + /* Put vector in EBX and make space for KIRQL */ + mov ebx, [esp] + sub esp, 4 + + /* Begin interrupt */ + push esp + push ebx + push HIGH_LEVEL + call _HalBeginSystemInterrupt@12 + + /* Check if it was spurious or not */ + or eax, eax + jnz Handled + + /* Spurious, ignore it */ + add esp, 8 + jmp _Kei386EoiHelper2ndEntry + +Handled: + /* Unexpected, exit the interrupt */ + mov esi, $ + cli + call _HalEndSystemInterrupt@8 + jmp _Kei386EoiHelper@0 +.endfunc + +.globl _KiUnexpectedInterrupt +_KiUnexpectedInterrupt: + + /* Bugcheck with invalid interrupt code */ + push 0x12 + call _KeBugCheck@4 Modified: trunk/reactos/ntoskrnl/ntoskrnl.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.def?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.def (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.def Tue Aug 22 02:40:23 2006 @@ -656,7 +656,7 @@ KeWaitForSingleObject@20 @KefAcquireSpinLockAtDpcLevel@4 @KefReleaseSpinLockFromDpcLevel@4 -;Kei386EoiHelper +Kei386EoiHelper@0 @KiAcquireSpinLock@4 ;KiBugCheckData DATA KiCoprocessorError@0 @@ -667,7 +667,7 @@ KiInterruptDispatch2@8 KiIpiServiceRoutine@8 @KiReleaseSpinLock@4 -KiUnexpectedInterrupt@0 +KiUnexpectedInterrupt ;Kii386SpinOnSpinLock KiRawTicks DATA LdrAccessResource@16

1 0

[gedmurphy] 23644: - Cleanup / rewrite much of the ip config code - Move hardcoded strings into a resource file ready for translation - Query registry data for friendly names, etc. We can remove some of this when the XP/vista API, GetAdaptersAddresses is implemented. - tested in Windows, untested in ROS...
by gedmurphy＠svn.reactos.org 21 Aug '06

21 Aug '06

Author: gedmurphy Date: Mon Aug 21 23:28:18 2006 New Revision: 23644 URL: http://svn.reactos.org/svn/reactos?rev=23644&view=rev Log: - Cleanup / rewrite much of the ip config code - Move hardcoded strings into a resource file ready for translation - Query registry data for friendly names, etc. We can remove some of this when the XP/vista API, GetAdaptersAddresses is implemented. - tested in Windows, untested in ROS... Added: trunk/reactos/base/applications/network/ipconfig/En.rc trunk/reactos/base/applications/network/ipconfig/resource.h Modified: trunk/reactos/base/applications/network/ipconfig/ipconfig.c trunk/reactos/base/applications/network/ipconfig/ipconfig.rc Added: trunk/reactos/base/applications/network/ipconfig/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ipconfig/En.rc (added) +++ trunk/reactos/base/applications/network/ipconfig/En.rc Mon Aug 21 23:28:18 2006 @@ -1,0 +1,64 @@ + +STRINGTABLE DISCARDABLE +BEGIN + IDS_BCAST "Broadcast" + IDS_P2P "Peer To Peer" + IDS_MIXED "Mixed" + IDS_HYBRID "Hybrid" + IDS_UNKNOWN "unknown" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_OTHER "Other Type Of Adapter" + IDS_ETH "Ethernet Adapter" + IDS_TOKEN "Token Ring Adapter" + IDS_FDDI "FDDI Adapter" + IDS_PPP "PPP Adapter" + IDS_LOOP "Loopback Adapter" + IDS_SLIP "SLIP Adapter" +END + +STRINGTABLE DISCARDABLE +BEGIN +/* Please keep the spacing/formatting as per En.rc when translating */ + IDS_USAGE + "\nUSAGE:\n \ + ipconfig [/? | /all | /renew [adapter] | /release [adapter] |\n \ + /flushdns | /displaydns | /registerdns |\n \ + /showclassid adapter |\n \ + /setclassid adapter [classid] ]\n \ + \n \ + where\n \ + adapter Connection name\n \ + (wildcard characters * and ? allowed, see examples)\n \ + \n \ + Options:\n \ + /? Display this help message\n \ + /all Display full configuration information.\n \ + /release Release the IP address for the specified adapter.\n \ + /renew Renew the IP address for the specified adapter.\n \ + /flushdns Purges the DNS Resolver cache.\n \ + /registerdns Refreshes all DHCP leases and re-registers DNS names.\n \ + /displaydns Display the contents of the DNS Resolver Cache.\n \ + /showclassid Displays all the dhcp class IDs allowed for adapter.\n \ + /setclassid Modifies the dhcp class id.\n \ + \n \ + The default is to display only the IP address, subnet mask and\n \ + default gateway for each adapter bound to TCP/IP.\n \ + \n \ + For Release and Renew, if no adapter name is specified, then the IP address\n \ + leases for all adapters bound to TCP/IP will be released or renewed.\n \ + \n \ + For Setclassid, if no ClassId is specified, then the ClassId is removed.\n \ + \n \ + Examples:\n \ + > ipconfig ... Show information.\n \ + > ipconfig /all ... Show detailed information\n \ + > ipconfig /renew ... renew all adapters\n \ + > ipconfig /renew EL* ... renew any connection that has its\n \ + name starting with EL\n \ + > ipconfig /release *Con* ... release all matching connections,\n \ + eg. ""Local Area Connection 1"" or\n \ + ""Local Area Connection 2""\n" +END Modified: trunk/reactos/base/applications/network/ipconfig/ipconfig.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ipconfig/ipconfig.c (original) +++ trunk/reactos/base/applications/network/ipconfig/ipconfig.c Mon Aug 21 23:28:18 2006 @@ -18,35 +18,100 @@ #include <tchar.h> #include <time.h> #include <iphlpapi.h> - +#include "resource.h" + +#define GUID_LEN 40 + +HINSTANCE hInstance; HANDLE ProcessHeap; -LPCTSTR GetNodeTypeName(UINT NodeType) -{ - switch (NodeType) - { - case 1: return _T("Broadcast"); - case 2: return _T("Peer To Peer"); - case 4: return _T("Mixed"); - case 8: return _T("Hybrid"); - default : return _T("unknown"); - } -} - -LPCTSTR GetInterfaceTypeName(UINT InterfaceType) -{ - switch (InterfaceType) - { - case MIB_IF_TYPE_OTHER: return _T("Other Type Of Adapter"); - case MIB_IF_TYPE_ETHERNET: return _T("Ethernet Adapter"); - case MIB_IF_TYPE_TOKENRING: return _T("Token Ring Adapter"); - case MIB_IF_TYPE_FDDI: return _T("FDDI Adapter"); - case MIB_IF_TYPE_PPP: return _T("PPP Adapter"); - case MIB_IF_TYPE_LOOPBACK: return _T("Loopback Adapter"); - case MIB_IF_TYPE_SLIP: return _T("SLIP Adapter"); - default: return _T("unknown"); - } -} + +LPTSTR GetNodeTypeName(UINT NodeType) +{ + static TCHAR szNode[14]; + + switch (NodeType) + { + case 1: + if (!LoadString(hInstance, IDS_BCAST, szNode, sizeof(szNode))) + return NULL; + break; + + case 2: + if (!LoadString(hInstance, IDS_P2P, szNode, sizeof(szNode))) + return NULL; + break; + + case 4: + if (!LoadString(hInstance, IDS_MIXED, szNode, sizeof(szNode))) + return NULL; + break; + + case 8: + if (!LoadString(hInstance, IDS_HYBRID, szNode, sizeof(szNode))) + return NULL; + break; + + default : + if (!LoadString(hInstance, IDS_UNKNOWN, szNode, sizeof(szNode))) + return NULL; + break; + } + + return szNode; +} + + +LPTSTR GetInterfaceTypeName(UINT InterfaceType) +{ + static TCHAR szIntType[25]; + + switch (InterfaceType) + { + case MIB_IF_TYPE_OTHER: + if (!LoadString(hInstance, IDS_OTHER, szIntType, sizeof(szIntType))) + return NULL; + break; + + case MIB_IF_TYPE_ETHERNET: + if (!LoadString(hInstance, IDS_ETH, szIntType, sizeof(szIntType))) + return NULL; + break; + + case MIB_IF_TYPE_TOKENRING: + if (!LoadString(hInstance, IDS_TOKEN, szIntType, sizeof(szIntType))) + return NULL; + break; + + case MIB_IF_TYPE_FDDI: + if (!LoadString(hInstance, IDS_FDDI, szIntType, sizeof(szIntType))) + return NULL; + break; + + case MIB_IF_TYPE_PPP: + if (!LoadString(hInstance, IDS_PPP, szIntType, sizeof(szIntType))) + return NULL; + break; + + case MIB_IF_TYPE_LOOPBACK: + if (!LoadString(hInstance, IDS_LOOP, szIntType, sizeof(szIntType))) + return NULL; + break; + + case MIB_IF_TYPE_SLIP: + if (!LoadString(hInstance, IDS_SLIP, szIntType, sizeof(szIntType))) + return NULL; + break; + + default: + if (!LoadString(hInstance, IDS_UNKNOWN, szIntType, sizeof(szIntType))) + return NULL; + break; + } + + return szIntType; +} + /* print MAC address */ PTCHAR PrintMacAddr(PBYTE Mac) @@ -59,105 +124,286 @@ return MacAddr; } -DWORD DoFormatMessage(DWORD ErrorCode) + +VOID DoFormatMessage(LONG ErrorCode) { LPVOID lpMsgBuf; - DWORD RetVal; - - if ((RetVal = FormatMessage( - FORMAT_MESSAGE_ALLOCATE_BUFFER | - FORMAT_MESSAGE_FROM_SYSTEM | - FORMAT_MESSAGE_IGNORE_INSERTS, - NULL, - ErrorCode, - MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), /* Default language */ - (LPTSTR) &lpMsgBuf, - 0, - NULL ))) { + //DWORD ErrorCode; + + if (ErrorCode == 0) + ErrorCode = GetLastError(); + + if (FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | + FORMAT_MESSAGE_FROM_SYSTEM | + FORMAT_MESSAGE_IGNORE_INSERTS, + NULL, + ErrorCode, + MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), /* Default language */ + (LPTSTR) &lpMsgBuf, + 0, + NULL)) + { _tprintf(_T("%s"), (LPTSTR)lpMsgBuf); - LocalFree(lpMsgBuf); - return RetVal; - } - else - return 0; -} + } +} + + +LPTSTR GetConnectionType(LPTSTR lpClass) +{ + HKEY hKey = NULL; + LPTSTR ConType = NULL; + TCHAR Path[256]; + LPTSTR PrePath = _T("SYSTEM\\CurrentControlSet\\Control\\Network\\{4D36E972-E325-11CE-BFC1-08002BE10318}\\"); + LPTSTR PostPath = _T("\\Connection"); + DWORD PathSize; + DWORD dwType; + DWORD dwDataSize; + + /* don't overflow the buffer */ + PathSize = lstrlen(PrePath) + lstrlen(lpClass) + lstrlen(PostPath) + 1; + if (PathSize >= 255) + return NULL; + + wsprintf(Path, _T("%s%s%s"), PrePath, lpClass, PostPath); + + if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, + Path, + 0, + KEY_READ, + &hKey) == ERROR_SUCCESS) + { + if(RegQueryValueEx(hKey, + _T("Name"), + NULL, + &dwType, + NULL, + &dwDataSize) == ERROR_SUCCESS) + { + ConType = (LPTSTR)HeapAlloc(ProcessHeap, + 0, + dwDataSize); + if (ConType == NULL) + return NULL; + + if(RegQueryValueEx(hKey, + _T("Name"), + NULL, + &dwType, + (PBYTE)ConType, + &dwDataSize) != ERROR_SUCCESS) + { + ConType = NULL; + } + } + } + + if (hKey != NULL) + RegCloseKey(hKey); + + return ConType; +} + + +LPTSTR GetConnectionDescription(LPTSTR lpClass) +{ + HKEY hBaseKey = NULL; + HKEY hClassKey = NULL; + LPTSTR lpKeyClass = NULL; + LPTSTR lpConDesc = NULL; + LPTSTR lpPath = NULL; + TCHAR szPrePath[] = _T("SYSTEM\\CurrentControlSet\\Control\\Class\\{4D36E972-E325-11CE-BFC1-08002bE10318}\\"); + DWORD dwType; + DWORD dwDataSize; + INT i; + + if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, + szPrePath, + 0, + KEY_READ, + &hBaseKey) != ERROR_SUCCESS) + { + return NULL; + } + + for (i=0; ; i++) + { + DWORD PathSize; + LONG Status; + TCHAR szName[10]; + DWORD NameLen = 9; + + if ((Status = RegEnumKeyEx(hBaseKey, + i, + szName, + &NameLen, + NULL, + NULL, + NULL, + NULL)) != ERROR_SUCCESS) + { + if (Status == ERROR_NO_MORE_ITEMS) + { + DoFormatMessage(Status); + lpConDesc = NULL; + goto CLEANUP; + } + else + continue; + } + + PathSize = lstrlen(szPrePath) + lstrlen(szName) + 1; + lpPath = (LPTSTR)HeapAlloc(ProcessHeap, + 0, + PathSize * sizeof(TCHAR)); + if (lpPath == NULL) + goto CLEANUP; + + wsprintf(lpPath, _T("%s%s"), szPrePath, szName); + + //MessageBox(NULL, lpPath, NULL, 0); + + if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, + lpPath, + 0, + KEY_READ, + &hClassKey) != ERROR_SUCCESS) + { + goto CLEANUP; + } + + HeapFree(ProcessHeap, 0, lpPath); + lpPath = NULL; + + if(RegQueryValueEx(hClassKey, + _T("NetCfgInstanceId"), + NULL, + &dwType, + NULL, + &dwDataSize) == ERROR_SUCCESS) + { + lpKeyClass = (LPTSTR)HeapAlloc(ProcessHeap, + 0, + dwDataSize); + if (lpKeyClass == NULL) + goto CLEANUP; + + if(RegQueryValueEx(hClassKey, + _T("NetCfgInstanceId"), + NULL, + &dwType, + (PBYTE)lpKeyClass, + &dwDataSize) != ERROR_SUCCESS) + { + lpKeyClass = NULL; + HeapFree(ProcessHeap, 0, lpKeyClass); + continue; + } + } + else + continue; + + if (!lstrcmp(lpClass, lpKeyClass)) + { + HeapFree(ProcessHeap, 0, lpKeyClass); + lpKeyClass = NULL; + + if(RegQueryValueEx(hClassKey, + _T("DriverDesc"), + NULL, + &dwType, + NULL, + &dwDataSize) == ERROR_SUCCESS) + { + lpConDesc = (LPTSTR)HeapAlloc(ProcessHeap, + 0, + dwDataSize); + if (lpConDesc == NULL) + goto CLEANUP; + + if(RegQueryValueEx(hClassKey, + _T("DriverDesc"), + NULL, + &dwType, + (PBYTE)lpConDesc, + &dwDataSize) != ERROR_SUCCESS) + { + lpConDesc = NULL; + goto CLEANUP; + } + } + else + lpConDesc = NULL; + + break; + } + } + +CLEANUP: + if (hBaseKey != NULL) + RegCloseKey(hBaseKey); + if (hClassKey != NULL) + RegCloseKey(hClassKey); + if (lpConDesc != NULL) + HeapFree(ProcessHeap, 0, lpPath); + if (lpConDesc != NULL) + HeapFree(ProcessHeap, 0, lpKeyClass); + + return lpConDesc; +} + VOID ShowInfo(BOOL bAll) { PIP_ADAPTER_INFO pAdapterInfo = NULL; PIP_ADAPTER_INFO pAdapter = NULL; ULONG adaptOutBufLen = 0; - PFIXED_INFO pFixedInfo = NULL; - PIP_ADDR_STRING pIPAddr = NULL; ULONG netOutBufLen = 0; - DWORD ErrRet = 0; - - /* assign memory for call to GetNetworkParams */ - pFixedInfo = (FIXED_INFO *)HeapAlloc(ProcessHeap, 0, sizeof(FIXED_INFO)); - if (pFixedInfo == NULL) - { - _tprintf(_T("memory allocation error")); + /* call GetAdaptersInfo to obtain the adapter info */ + if (GetAdaptersInfo(pAdapterInfo, &adaptOutBufLen) == ERROR_BUFFER_OVERFLOW) + { + pAdapterInfo = (IP_ADAPTER_INFO *)HeapAlloc(ProcessHeap, 0, adaptOutBufLen); + if (pAdapterInfo == NULL) + return; + + if (GetAdaptersInfo(pAdapterInfo, &adaptOutBufLen) != NO_ERROR) + { + DoFormatMessage(0); + HeapFree(ProcessHeap, 0, pAdapterInfo); + return; + } + } + else + { + DoFormatMessage(0); return; } - /* set required buffer size */ + /* call GetNetworkParams to obtain the network info */ if(GetNetworkParams(pFixedInfo, &netOutBufLen) == ERROR_BUFFER_OVERFLOW) { - HeapFree(ProcessHeap, 0, pFixedInfo); pFixedInfo = (FIXED_INFO *)HeapAlloc(ProcessHeap, 0, netOutBufLen); if (pFixedInfo == NULL) - { - _tprintf(_T("memory allocation error")); return; - } - } - - if ((ErrRet = GetNetworkParams(pFixedInfo, &netOutBufLen)) != NO_ERROR) - { - _tprintf(_T("GetNetworkParams failed : ")); - DoFormatMessage(ErrRet); - HeapFree(ProcessHeap, 0, pFixedInfo); + + if (GetNetworkParams(pFixedInfo, &netOutBufLen) != NO_ERROR) + { + DoFormatMessage(0); + HeapFree(ProcessHeap, 0, pFixedInfo); + return; + } + } + else + { + DoFormatMessage(0); return; } - - - /* assign memory for call to GetAdapterInfo */ - pAdapterInfo = (IP_ADAPTER_INFO *)HeapAlloc(ProcessHeap, 0, sizeof(IP_ADAPTER_INFO)); - if (pAdapterInfo == NULL) - { - _tprintf(_T("memory allocation error")); - return; - } - - /* set required buffer size */ - if (GetAdaptersInfo( pAdapterInfo, &adaptOutBufLen) == ERROR_BUFFER_OVERFLOW) - { - HeapFree(ProcessHeap, 0, pAdapterInfo); - pAdapterInfo = (IP_ADAPTER_INFO *)HeapAlloc(ProcessHeap, 0, adaptOutBufLen); - if (pAdapterInfo == NULL) - { - _tprintf(_T("memory allocation error")); - return; - } - } - - if ((ErrRet = GetAdaptersInfo(pAdapterInfo, &adaptOutBufLen)) != NO_ERROR) - { - _tprintf(_T("GetAdaptersInfo failed : ")); - DoFormatMessage(ErrRet); - HeapFree(ProcessHeap, 0, pAdapterInfo); - return ; - } - - pAdapter = pAdapterInfo; _tprintf(_T("\nReactOS IP Configuration\n\n")); - if (bAll) { _tprintf(_T("\tHost Name . . . . . . . . . . . . : %s\n"), pFixedInfo->HostName); @@ -176,7 +422,14 @@ while (pAdapter) { - _tprintf(_T("\n%s ...... : \n\n"), GetInterfaceTypeName(pAdapter->Type)); + LPTSTR IntType, myConType; + + IntType = GetInterfaceTypeName(pAdapter->Type); + myConType = GetConnectionType(pAdapter->AdapterName); + + _tprintf(_T("\n%s %s: \n\n"), IntType , myConType); + + if (myConType != NULL) HeapFree(ProcessHeap, 0, myConType); /* check if the adapter is connected to the media */ if (_tcscmp(pAdapter->IpAddressList.IpAddress.String, "0.0.0.0") == 0) @@ -190,7 +443,7 @@ if (bAll) { - _tprintf(_T("\tDescription . . . . . . . . . . . : %s\n"), pAdapter->Description); + _tprintf(_T("\tDescription . . . . . . . . . . . : %s\n"), GetConnectionDescription(pAdapter->AdapterName)); /// here !! _tprintf(_T("\tPhysical Address. . . . . . . . . : %s\n"), PrintMacAddr(pAdapter->Address)); if (pAdapter->DhcpEnabled) _tprintf(_T("\tDHCP Enabled. . . . . . . . . . . : Yes\n")); @@ -205,22 +458,26 @@ if (bAll) { + PIP_ADDR_STRING pIPAddr; + if (pAdapter->DhcpEnabled) _tprintf(_T("\tDHCP Server . . . . . . . . . . . : %s\n"), pAdapter->DhcpServer.IpAddress.String); _tprintf(_T("\tDNS Servers . . . . . . . . . . . : ")); _tprintf(_T("%s\n"), pFixedInfo->DnsServerList.IpAddress.String); - pIPAddr = pFixedInfo -> DnsServerList.Next; + pIPAddr = pFixedInfo->DnsServerList.Next; while (pIPAddr) { _tprintf(_T("\t\t\t\t\t %s\n"), pIPAddr ->IpAddress.String ); - pIPAddr = pIPAddr ->Next; - } + pIPAddr = pIPAddr->Next; + } + if (pAdapter->HaveWins) { _tprintf(_T("\tPrimary WINS Server . . . . . . . : %s\n"), pAdapter->PrimaryWinsServer.IpAddress.String); _tprintf(_T("\tSecondard WINS Server . . . . . . : %s\n"), pAdapter->SecondaryWinsServer.IpAddress.String); } + if (pAdapter->DhcpEnabled) { _tprintf(_T("\tLease Obtained. . . . . . . . . . : %s"), _tasctime(localtime(&pAdapter->LeaseObtained))); @@ -240,7 +497,6 @@ VOID Release(LPTSTR Index) { IP_ADAPTER_INDEX_MAP AdapterInfo; - DWORD dwRetVal = 0; /* if interface is not given, query GetInterfaceInfo */ if (Index == NULL) @@ -248,39 +504,30 @@ PIP_INTERFACE_INFO pInfo = NULL; ULONG ulOutBufLen = 0; - pInfo = (IP_INTERFACE_INFO *)HeapAlloc(ProcessHeap, 0, sizeof(IP_INTERFACE_INFO)); - if (pInfo == NULL) - { - _tprintf(_T("memory allocation error")); - return; - } - - /* Make an initial call to GetInterfaceInfo to get - * the necessary size into the ulOutBufLen variable */ - if ( GetInterfaceInfo(pInfo, &ulOutBufLen) == ERROR_INSUFFICIENT_BUFFER) - { - HeapFree(ProcessHeap, 0, pInfo); + if (GetInterfaceInfo(pInfo, &ulOutBufLen) == ERROR_INSUFFICIENT_BUFFER) + { pInfo = (IP_INTERFACE_INFO *)HeapAlloc(ProcessHeap, 0, ulOutBufLen); if (pInfo == NULL) - { - _tprintf(_T("memory allocation error")); return; - } - } - - /* Make a second call to GetInterfaceInfo to get the actual data we want */ - if ((dwRetVal = GetInterfaceInfo(pInfo, &ulOutBufLen)) == NO_ERROR ) - { - CopyMemory(&AdapterInfo, &pInfo->Adapter[0], sizeof(IP_ADAPTER_INDEX_MAP)); - _tprintf(_T("name - %S\n"), pInfo->Adapter[0].Name); + + if (GetInterfaceInfo(pInfo, &ulOutBufLen) == NO_ERROR ) + { + CopyMemory(&AdapterInfo, &pInfo->Adapter[0], sizeof(IP_ADAPTER_INDEX_MAP)); + _tprintf(_T("name - %S\n"), pInfo->Adapter[0].Name); + HeapFree(ProcessHeap, 0, pInfo); + } + else + { + DoFormatMessage(0); + HeapFree(ProcessHeap, 0, pInfo); + return; + } } else { - _tprintf(_T("\nGetInterfaceInfo failed : ")); - DoFormatMessage(dwRetVal); - } - - HeapFree(ProcessHeap, 0, pInfo); + DoFormatMessage(0); + return; + } } else { @@ -294,10 +541,10 @@ /* Call IpReleaseAddress to release the IP address on the specified adapter. */ - if ((dwRetVal = IpReleaseAddress(&AdapterInfo)) != NO_ERROR) - { - _tprintf(_T("\nAn error occured while releasing interface %s : "), _T("*name*")); - DoFormatMessage(dwRetVal); + if (IpReleaseAddress(&AdapterInfo) != NO_ERROR) + { + _tprintf(_T("\nAn error occured while releasing interface %S : \n"), AdapterInfo.Name); + DoFormatMessage(0); } } @@ -308,7 +555,6 @@ VOID Renew(LPTSTR Index) { IP_ADAPTER_INDEX_MAP AdapterInfo; - DWORD dwRetVal = 0; /* if interface is not given, query GetInterfaceInfo */ if (Index == NULL) @@ -337,7 +583,7 @@ } /* Make a second call to GetInterfaceInfo to get the actual data we want */ - if ((dwRetVal = GetInterfaceInfo(pInfo, &ulOutBufLen)) == NO_ERROR ) + if (GetInterfaceInfo(pInfo, &ulOutBufLen) == NO_ERROR ) { CopyMemory(&AdapterInfo, &pInfo->Adapter[0], sizeof(IP_ADAPTER_INDEX_MAP)); _tprintf(_T("name - %S\n"), pInfo->Adapter[0].Name); @@ -345,7 +591,7 @@ else { _tprintf(_T("\nGetInterfaceInfo failed : ")); - DoFormatMessage(dwRetVal); + DoFormatMessage(0); } HeapFree(ProcessHeap, 0, pInfo); @@ -362,10 +608,10 @@ /* Call IpRenewAddress to renew the IP address on the specified adapter. */ - if ((dwRetVal = IpRenewAddress(&AdapterInfo)) != NO_ERROR) + if (IpRenewAddress(&AdapterInfo) != NO_ERROR) { _tprintf(_T("\nAn error occured while renew interface %s : "), _T("*name*")); - DoFormatMessage(dwRetVal); + DoFormatMessage(0); } } @@ -373,44 +619,37 @@ VOID Usage(VOID) { - _tprintf(_T("\nUSAGE:\n" - " ipconfig [/? | /all | /renew [adapter] | /release [adapter] |\n" - " /flushdns | /displaydns | /registerdns |\n" - " /showclassid adapter |\n" - " /setclassid adapter [classid] ]\n" - "\n" - "where\n" - " adapter Connection name\n" - " (wildcard characters * and ? allowed, see examples)\n" - "\n" - " Options:\n" - " /? Display this help message\n" - " /all Display full configuration information.\n" - " /release Release the IP address for the specified adapter.\n" - " /renew Renew the IP address for the specified adapter.\n" - " /flushdns Purges the DNS Resolver cache.\n" - " /registerdns Refreshes all DHCP leases and re-registers DNS names.\n" - " /displaydns Display the contents of the DNS Resolver Cache.\n" - " /showclassid Displays all the dhcp class IDs allowed for adapter.\n" - " /setclassid Modifies the dhcp class id.\n" - "\n" - "The default is to display only the IP address, subnet mask and\n" - "default gateway for each adapter bound to TCP/IP.\n" - "\n" - "For Release and Renew, if no adapter name is specified, then the IP address\n" - "leases for all adapters bound to TCP/IP will be released or renewed.\n" - "\n" - "For Setclassid, if no ClassId is specified, then the ClassId is removed.\n" - "\n" - "Examples:\n" - " > ipconfig ... Show information.\n" - " > ipconfig /all ... Show detailed information\n" - " > ipconfig /renew ... renew all adapters\n" - " > ipconfig /renew EL* ... renew any connection that has its\n" - " name starting with EL\n" - " > ipconfig /release *Con* ... release all matching connections,\n" - " eg. \"Local Area Connection 1\" or\n" - " \"Local Area Connection 2\"\n")); + HRSRC hRes; + LPTSTR lpUsage; + DWORD Size; + + LPTSTR lpName = (LPTSTR)MAKEINTRESOURCE((IDS_USAGE >> 4) + 1); + + hRes = FindResource(hInstance, + lpName, + RT_STRING); + if (hRes != NULL) + { + if ((Size = SizeofResource(hInstance, + hRes))) + { + lpUsage = (LPTSTR)HeapAlloc(ProcessHeap, + 0, + Size); + if (lpUsage == NULL) + return; + + if (LoadString(hInstance, + IDS_USAGE, + lpUsage, + Size)) + { + _tprintf(_T("%s"), lpUsage); + } + } + } + + } int main(int argc, char *argv[]) @@ -425,6 +664,7 @@ BOOL DoShowclassid=FALSE; BOOL DoSetclassid=FALSE; + hInstance = GetModuleHandle(NULL); ProcessHeap = GetProcessHeap(); /* Parse command line for options we have been given. */ Modified: trunk/reactos/base/applications/network/ipconfig/ipconfig.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ipconfig/ipconfig.rc (original) +++ trunk/reactos/base/applications/network/ipconfig/ipconfig.rc Mon Aug 21 23:28:18 2006 @@ -1,5 +1,13 @@ -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS TCP/IPv4 Win32 ipconfig\0" -#define REACTOS_STR_INTERNAL_NAME "ipconfig\0" -#define REACTOS_STR_ORIGINAL_FILENAME "ipconfig.exe\0" -#define REACTOS_STR_ORIGINAL_COPYRIGHT "Ged Murphy (gedmurphy(a)gmail.com)\0" +#include <windows.h> +#include <commctrl.h> +#include "resource.h" + +#define REACTOS_STR_FILE_DESCRIPTION "IP Configuration utility\0" +#define REACTOS_STR_INTERNAL_NAME "ipconfig\0" +#define REACTOS_STR_ORIGINAL_FILENAME "ipconfig.exe\0" +#define REACTOS_STR_ORIGINAL_COPYRIGHT "Ged Murphy <gedmurphy(a)gmail.com\0" #include <reactos/version.rc> + +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +#include "En.rc" Added: trunk/reactos/base/applications/network/ipconfig/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ipconfig/resource.h (added) +++ trunk/reactos/base/applications/network/ipconfig/resource.h Mon Aug 21 23:28:18 2006 @@ -1,0 +1,18 @@ + +#define IDS_USAGE 100 + +#define IDS_UNKNOWN 101 + +#define IDS_BCAST 102 +#define IDS_P2P 103 +#define IDS_MIXED 104 +#define IDS_HYBRID 105 + +/* adapter types */ +#define IDS_OTHER 106 +#define IDS_ETH 107 +#define IDS_TOKEN 108 +#define IDS_FDDI 109 +#define IDS_PPP 110 +#define IDS_LOOP 111 +#define IDS_SLIP 112

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