Ros-diffs January 2006

ros-diffs@reactos.org

23 participants
586 discussions

[hbirr] 20533: Implemented the 'red zone check' for the non paged pool.
by hbirr＠svn.reactos.org 02 Jan '06

02 Jan '06

Implemented the 'red zone check' for the non paged pool. Modified: trunk/reactos/ntoskrnl/mm/npool.c _____ Modified: trunk/reactos/ntoskrnl/mm/npool.c --- trunk/reactos/ntoskrnl/mm/npool.c 2006-01-02 18:34:31 UTC (rev 20532) +++ trunk/reactos/ntoskrnl/mm/npool.c 2006-01-02 18:45:52 UTC (rev 20533) @@ -37,6 +37,15 @@ #endif /* __GNUC__ */ #endif +VOID MmPrintMemoryStatistic(VOID); + +#define NPOOL_REDZONE_CHECK /* check the block at deallocation */ +// #define NPOOL_REDZONE_CHECK_FULL /* check all blocks at each allocation/deallocation */ +#define NPOOL_REDZONE_SIZE 8 /* number of red zone bytes */ +#define NPOOL_REDZONE_LOVALUE 0x87 +#define NPOOL_REDZONE_HIVALUE 0xA5 + + /* avl types ****************************************************************/ /* FIXME: @@ -73,6 +82,9 @@ ULONG Tag; PVOID Caller; LIST_ENTRY TagListEntry; +#if defined(NPOOL_REDZONE_CHECK) || defined(NPOOL_REDZONE_CHECK_FULL) + ULONG UserSize; +#endif BOOLEAN Dumped; } HDR_USED, *PHDR_USED; @@ -83,9 +95,13 @@ } HDR_FREE, *PHDR_FREE; #define HDR_FREE_SIZE ROUND_UP(sizeof(HDR_FREE), MM_POOL_ALIGNMENT) + +#if defined(NPOOL_REDZONE_CHECK) || #defined(NPOOL_REDZONE_CHECK_FULL) +#define HDR_USED_SIZE ROUND_UP(sizeof(HDR_USED) + NPOOL_REDZONE_SIZE, MM_POOL_ALIGNMENT) +#else #define HDR_USED_SIZE ROUND_UP(sizeof(HDR_USED), MM_POOL_ALIGNMENT) +#endif - /* GLOBALS *****************************************************************/ extern PVOID MiNonPagedPoolStart; @@ -131,15 +147,6 @@ /* Total quota for Non Paged Pool */ ULONG MmTotalNonPagedPoolQuota = 0; -/* - * Allocate a range of memory in the nonpaged pool - */ -PVOID -MiAllocNonPagedPoolRegion(unsigned int nr_pages); - -VOID -MiFreeNonPagedPoolRegion(PVOID Addr, ULONG Count, BOOLEAN Free); - #ifdef TAG_STATISTICS_TRACKING #define TAG_HASH_TABLE_SIZE (1024) static LIST_ENTRY tag_hash_table[TAG_HASH_TABLE_SIZE]; @@ -772,9 +779,11 @@ } else { - DbgPrint("Tag %x Blocks %d Total Size %d Average Size %d\n", + DbgPrint("Tag %x Blocks %d Total Size %d Average Size %d ", CurrentTag, CurrentNrBlocks, CurrentSize, CurrentSize / CurrentNrBlocks); + KeRosPrintAddress((PVOID)CurrentTag); + DbgPrint("\n"); } } #endif /* defined(TAG_STATISTICS_TRACKING) */ @@ -1458,6 +1467,71 @@ return blk->Tag; } +#if defined(NPOOL_REDZONE_CHECK) || defined(NPOOL_REDZONE_CHECK_FULL) +void check_redzone_header(HDR_USED* hdr) +{ + PBYTE LoZone = (PBYTE)((ULONG_PTR)hdr + HDR_USED_SIZE - NPOOL_REDZONE_SIZE); + PBYTE HiZone = (PBYTE)((ULONG_PTR)hdr + HDR_USED_SIZE + hdr->UserSize); + BOOL LoOK = TRUE; + BOOL HiOK = TRUE; + ULONG i; + CHAR c[5]; + + for (i = 0; i < NPOOL_REDZONE_SIZE; i++) + { + if (LoZone[i] != NPOOL_REDZONE_LOVALUE) + { + LoOK = FALSE; + } + if (HiZone[i] != NPOOL_REDZONE_HIVALUE) + { + HiOK = FALSE; + } + } + + if (!HiOK || !LoOK) + { + c[0] = (CHAR)((hdr->Tag >> 24) & 0xFF); + c[1] = (CHAR)((hdr->Tag >> 16) & 0xFF); + c[2] = (CHAR)((hdr->Tag >> 8) & 0xFF); + c[3] = (CHAR)(hdr->Tag & 0xFF); + c[4] = 0; + + if (!isprint(c[0]) || !isprint(c[1]) || !isprint(c[2]) || !isprint(c[3])) + { + c[0] = 0; + } + + if (!LoOK) + { + DbgPrint("NPOOL: Low-side redzone overwritten, Block %x, Size %d, Tag %x(%s), Caller %x\n", + (ULONG_PTR)hdr + HDR_USED_SIZE, hdr->UserSize, hdr->Tag, c, hdr->Caller); + } + if (!HiOK) + { + DbgPrint("NPPOL: High-side redzone overwritten, Block %x, Size %d, Tag %x(%s), Caller %x\n", + (ULONG_PTR)hdr + HDR_USED_SIZE, hdr->UserSize, hdr->Tag, c, hdr->Caller); + } + KEBUGCHECK(0); + } +} +#endif + +#ifdef NPOOL_REDZONE_CHECK_FULL +void check_redzone_list(void) +{ + PLIST_ENTRY current_entry; + + current_entry = UsedBlockListHead.Flink; + while (current_entry != &UsedBlockListHead) + { + check_redzone_header(CONTAINING_RECORD(current_entry, HDR_USED, ListEntry)); + current_entry = current_entry->Flink; + } +} +#endif + + VOID STDCALL ExFreeNonPagedPool (PVOID block) /* * FUNCTION: Releases previously allocated memory @@ -1494,9 +1568,18 @@ KEBUGCHECK(0); return; } + +#if defined(NPOOL_REDZONE_CHECK) || defined(NPOOL_REDZONE_CHECK_FULL) + check_redzone_header(blk); +#endif + +#ifdef NPOOL_REDZONE_CHECK_FULL + check_redzone_list(); +#endif + memset(block, 0xcc, blk->hdr.Size - HDR_USED_SIZE); + #ifdef TAG_STATISTICS_TRACKING - MiRemoveFromTagHashTable(blk); #endif @@ -1510,6 +1593,9 @@ PVOID STDCALL ExAllocateNonPagedPoolWithTag(POOL_TYPE Type, ULONG Size, ULONG Tag, PVOID Caller) { +#if defined(NPOOL_REDZONE_CHECK) || defined(NPOOL_REDZONE_CHECK_FULL) + ULONG UserSize; +#endif PVOID block; HDR_USED* best = NULL; KIRQL oldIrql; @@ -1520,9 +1606,13 @@ KeAcquireSpinLock(&MmNpoolLock, &oldIrql); +#ifdef NPOOL_REDZONE_CHECK_FULL + check_redzone_list(); +#endif + VALIDATE_POOL; -#if 0 +#if 1 /* after some allocations print the npaged pool stats */ #ifdef TAG_STATISTICS_TRACKING @@ -1531,6 +1621,7 @@ if (counter++ % 100000 == 0) { MiDebugDumpNonPagedPoolStats(FALSE); + MmPrintMemoryStatistic(); } } #endif @@ -1545,7 +1636,12 @@ return(NULL); } /* Make the size dword alligned, this makes the block dword alligned */ +#if defined(NPOOL_REDZONE_CHECK) || defined(NPOOL_REDZONE_CHECK_FULL) + UserSize = Size; + Size = ROUND_UP(Size + NPOOL_REDZONE_SIZE, MM_POOL_ALIGNMENT); +#else Size = ROUND_UP(Size, MM_POOL_ALIGNMENT); +#endif if (Size >= PAGE_SIZE) { @@ -1566,12 +1662,19 @@ KeReleaseSpinLock(&MmNpoolLock, oldIrql); DPRINT1("Trying to allocate %lu bytes from nonpaged pool - nothing suitable found, returning NULL\n", Size ); + KeRosDumpStackFrames(NULL, 10); return NULL; } best->Tag = Tag; best->Caller = Caller; best->Dumped = FALSE; best->TagListEntry.Flink = best->TagListEntry.Blink = NULL; +#if defined(NPOOL_REDZONE_CHECK) || defined(NPOOL_REDZONE_CHECK_FULL) + best->UserSize = UserSize; + memset((PVOID)((ULONG_PTR)best + HDR_USED_SIZE - NPOOL_REDZONE_SIZE), NPOOL_REDZONE_LOVALUE, NPOOL_REDZONE_SIZE); + memset((PVOID)((ULONG_PTR)best + HDR_USED_SIZE + UserSize), NPOOL_REDZONE_HIVALUE, NPOOL_REDZONE_SIZE); +#endif + #ifdef TAG_STATISTICS_TRACKING MiAddToTagHashTable(best); @@ -1607,7 +1710,13 @@ FreeBlockListRoot = NULL; MiNonPagedPoolAllocMap = (PVOID)((ULONG_PTR)MiNonPagedPoolStart + PAGE_SIZE); +#if defined(NPOOL_REDZONE_CHECK) || defined(NPOOL_REDZONE_CHECK_FULL) + MiNonPagedPoolNrOfPages = ROUND_UP(MiNonPagedPoolLength / PAGE_SIZE, 32) / 8; + MiNonPagedPoolNrOfPages = ROUND_UP(MiNonPagedPoolNrOfPages + NPOOL_REDZONE_SIZE, MM_POOL_ALIGNMENT); + MiNonPagedPoolNrOfPages = PAGE_ROUND_UP(MiNonPagedPoolNrOfPages + HDR_FREE_SIZE) + PAGE_SIZE; +#else MiNonPagedPoolNrOfPages = PAGE_ROUND_UP(ROUND_UP(MiNonPagedPoolLength / PAGE_SIZE, 32) / 8 + HDR_FREE_SIZE) + PAGE_SIZE; +#endif MiNonPagedPoolNrOfPages /= PAGE_SIZE; Address = MiNonPagedPoolStart; @@ -1649,10 +1758,17 @@ /* the second block contains the non paged pool bitmap */ used = (HDR_USED*)((ULONG_PTR)free + free->hdr.Size); used->hdr.Magic = BLOCK_HDR_USED_MAGIC; +#if defined(NPOOL_REDZONE_CHECK) || defined(NPOOL_REDZONE_CHECK_FULL) + used->UserSize = ROUND_UP(MiNonPagedPoolLength / PAGE_SIZE, 32) / 8; + used->hdr.Size = ROUND_UP(used->UserSize + NPOOL_REDZONE_SIZE, MM_POOL_ALIGNMENT) + HDR_USED_SIZE; + memset((PVOID)((ULONG_PTR)used + HDR_USED_SIZE - NPOOL_REDZONE_SIZE), NPOOL_REDZONE_LOVALUE, NPOOL_REDZONE_SIZE); + memset((PVOID)((ULONG_PTR)used + HDR_USED_SIZE + used->UserSize), NPOOL_REDZONE_HIVALUE, NPOOL_REDZONE_SIZE); +#else used->hdr.Size = ROUND_UP(MiNonPagedPoolLength / PAGE_SIZE, 32) / 8 + HDR_USED_SIZE; +#endif used->hdr.previous = &free->hdr; used->Tag = 0xffffffff; - used->Caller = 0; + used->Caller = (PVOID)MiInitializeNonPagedPool; used->Dumped = FALSE; add_to_used_list(used); #ifdef TAG_STATISTICS_TRACKING @@ -1664,7 +1780,7 @@ free->hdr.Magic = BLOCK_HDR_FREE_MAGIC; free->hdr.Size = MiNonPagedPoolLength - ((ULONG_PTR)free - (ULONG_PTR)MiNonPagedPoolStart); free->hdr.previous = &used->hdr; - memset((PVOID)((ULONG_PTR)free + HDR_FREE_SIZE), 0x0cc, (ULONG_PTR)Address - (ULONG_PTR)free - HDR_FREE_SIZE); + memset((PVOID)((ULONG_PTR)free + HDR_FREE_SIZE), 0xcc, (ULONG_PTR)Address - (ULONG_PTR)free - HDR_FREE_SIZE); add_to_free_list(free); }

1 0

[hbirr] 20532: Simplified the definition of the interrupt handlers for non smp machines.
by hbirr＠svn.reactos.org 02 Jan '06

02 Jan '06

Simplified the definition of the interrupt handlers for non smp machines. Modified: trunk/reactos/ntoskrnl/ke/i386/irqhand.s _____ Modified: trunk/reactos/ntoskrnl/ke/i386/irqhand.s --- trunk/reactos/ntoskrnl/ke/i386/irqhand.s 2006-01-02 18:03:19 UTC (rev 20531) +++ trunk/reactos/ntoskrnl/ke/i386/irqhand.s 2006-01-02 18:34:31 UTC (rev 20532) @@ -1,6 +1,31 @@ #include <ndk/asm.h> #include <../hal/halx86/include/halirq.h> +_KiCommonInterrupt: + cld + pushl %ds + pushl %es + pushl %fs + pushl %gs + pushl $0xceafbeef + movl $KGDT_R0_DATA,%eax + movl %eax,%ds + movl %eax,%es + movl %eax,%gs + movl $KGDT_R0_PCR,%eax + movl %eax,%fs + pushl %esp + pushl %ebx + call _KiInterruptDispatch + addl $0xC, %esp + popl %gs + popl %fs + popl %es + popl %ds + popa + iret + + #ifdef CONFIG_SMP #define BUILD_INTERRUPT_HANDLER(intnum) \ @@ -21,31 +46,6 @@ B(x,8) B(x,9) B(x,A) B(x,B) \ B(x,C) B(x,D) B(x,E) B(x,F) -_KiCommonInterrupt: - cld - pushl %ds - pushl %es - pushl %fs - pushl %gs - movl $0xceafbeef,%eax - pushl %eax - movl $KGDT_R0_DATA,%eax - movl %eax,%ds - movl %eax,%es - movl %eax,%gs - movl $KGDT_R0_PCR,%eax - movl %eax,%fs - pushl %esp - pushl %ebx - call _KiInterruptDispatch - addl $0xC, %esp - popl %gs - popl %fs - popl %es - popl %ds - popa - iret - B16(3) B16(4) B16(5) B16(6) B16(7) B16(8) B16(9) B16(A) B16(B) B16(C) B16(D) B16(E) @@ -53,441 +53,30 @@ #undef B #undef B16 +#undef BUILD_INTERRUPT_HANDLER #else /* CONFIG_SMP */ -.global _irq_handler_0 -_irq_handler_0: - cld - pusha - pushl %ds - pushl %es - pushl %fs - pushl %gs - movl $0xceafbeef,%eax - pushl %eax - movw $KGDT_R0_DATA,%ax - movw %ax,%ds - movw %ax,%es - movw %ax,%gs - movl $KGDT_R0_PCR, %eax - movl %eax, %fs - pushl %esp - pushl $(IRQ_BASE + 0) - call _KiInterruptDispatch - addl $0xC, %esp - popl %gs - popl %fs - popl %es - popl %ds - popa - iret +#define BUILD_INTERRUPT_HANDLER(intnum) \ + .global _irq_handler_##intnum; \ + _irq_handler_##intnum:; \ + pusha; \ + movl $(##intnum + IRQ_BASE), %ebx; \ + jmp _KiCommonInterrupt; -.global _irq_handler_1 -_irq_handler_1: - cld - pusha - pushl %ds - pushl %es - pushl %fs - pushl %gs - movl $0xceafbeef,%eax - pushl %eax - movw $KGDT_R0_DATA,%ax - movw %ax,%ds - movw %ax,%es - movw %ax,%gs - movl $KGDT_R0_PCR, %eax - movl %eax, %fs - pushl %esp - pushl $(IRQ_BASE + 1) - call _KiInterruptDispatch - addl $0xC, %esp - popl %gs - popl %fs - popl %es - popl %ds - popa - iret +/* Interrupt handlers and declarations */ -.global _irq_handler_2 -_irq_handler_2: - cld - pusha - pushl %ds - pushl %es - pushl %fs - pushl %gs - movl $0xceafbeef,%eax - pushl %eax - movw $KGDT_R0_DATA,%ax - movw %ax,%ds - movw %ax,%es - movw %ax,%gs - movl $KGDT_R0_PCR, %eax - movl %eax, %fs - pushl %esp - pushl $(IRQ_BASE + 2) - call _KiInterruptDispatch - addl $0xC, %esp - popl %gs - popl %fs - popl %es - popl %ds - popa - iret +#define B(x) \ + BUILD_INTERRUPT_HANDLER(x) -.global _irq_handler_3 -_irq_handler_3: - cld - pusha - pushl %ds - pushl %es - pushl %fs - pushl %gs - movl $0xceafbeef,%eax - pushl %eax - movw $KGDT_R0_DATA,%ax - movw %ax,%ds - movw %ax,%es - movw %ax,%gs - movl $KGDT_R0_PCR, %eax - movl %eax, %fs - pushl %esp - pushl $(IRQ_BASE + 3) - call _KiInterruptDispatch - addl $0xC, %esp - popl %gs - popl %fs - popl %es - popl %ds - popa - iret +B(0) B(1) B(2) B(3) +B(4) B(5) B(6) B(7) +B(8) B(9) B(10) B(11) +B(12) B(13) B(14) B(15) -.global _irq_handler_4 -_irq_handler_4: - cld - pusha - pushl %ds - pushl %es - pushl %fs - pushl %gs - movl $0xceafbeef,%eax - pushl %eax - movw $KGDT_R0_DATA,%ax - movw %ax,%ds - movw %ax,%es - movw %ax,%gs - movl $KGDT_R0_PCR, %eax - movl %eax, %fs - pushl %esp - pushl $(IRQ_BASE + 4) - call _KiInterruptDispatch - addl $0xC, %esp - popl %gs - popl %fs - popl %es - popl %ds - popa - iret +#undef B +#undef BUILD_INTERRUPT_HANDLER -.global _irq_handler_5 -_irq_handler_5: - cld - pusha - pushl %ds - pushl %es - pushl %fs - pushl %gs - movl $0xceafbeef,%eax - pushl %eax - movw $KGDT_R0_DATA,%ax - movw %ax,%ds - movw %ax,%es - movw %ax,%gs - movl $KGDT_R0_PCR, %eax - movl %eax, %fs - pushl %esp - pushl $(IRQ_BASE + 5) - call _KiInterruptDispatch - addl $0xC, %esp - popl %gs - popl %fs - popl %es - popl %ds - popa - iret - -.global _irq_handler_6 -_irq_handler_6: - cld - pusha - pushl %ds - pushl %es - pushl %fs - pushl %gs - movl $0xceafbeef,%eax - pushl %eax - movw $KGDT_R0_DATA,%ax - movw %ax,%ds - movw %ax,%es - movw %ax,%gs - movl $KGDT_R0_PCR, %eax - movl %eax, %fs - pushl %esp - pushl $(IRQ_BASE + 6) - call _KiInterruptDispatch - addl $0xC, %esp - popl %gs - popl %fs - popl %es - popl %ds - popa - iret - -.global _irq_handler_7 -_irq_handler_7: - cld - pusha - pushl %ds - pushl %es - pushl %fs - pushl %gs - movl $0xceafbeef,%eax - pushl %eax - movw $KGDT_R0_DATA,%ax - movw %ax,%ds - movw %ax,%es - movw %ax,%gs - movl $KGDT_R0_PCR, %eax - movl %eax, %fs - pushl %esp - pushl $(IRQ_BASE + 7) - call _KiInterruptDispatch - addl $0xC, %esp - popl %gs - popl %fs - popl %es - popl %ds - popa - iret - -.global _irq_handler_8 -_irq_handler_8: - cld - pusha - pushl %ds - pushl %es - pushl %fs - pushl %gs - movl $0xceafbeef,%eax - pushl %eax - movw $KGDT_R0_DATA,%ax - movw %ax,%ds - movw %ax,%es - movw %ax,%gs - movl $KGDT_R0_PCR, %eax - movl %eax, %fs - pushl %esp - pushl $(IRQ_BASE + 8) - call _KiInterruptDispatch - addl $0xC, %esp - popl %gs - popl %fs - popl %es - popl %ds - popa - iret - -.global _irq_handler_9 -_irq_handler_9: - cld - pusha - pushl %ds - pushl %es - pushl %fs - pushl %gs - movl $0xceafbeef,%eax - pushl %eax - movw $KGDT_R0_DATA,%ax - movw %ax,%ds - movw %ax,%es - movw %ax,%gs - movl $KGDT_R0_PCR, %eax - movl %eax, %fs - pushl %esp - pushl $(IRQ_BASE + 9) - call _KiInterruptDispatch - addl $0xC, %esp - popl %gs - popl %fs - popl %es - popl %ds - popa - iret - -.global _irq_handler_10 -_irq_handler_10: - cld - pusha - pushl %ds - pushl %es - pushl %fs - pushl %gs - movl $0xceafbeef,%eax - pushl %eax - movw $KGDT_R0_DATA,%ax - movw %ax,%ds - movw %ax,%es - movw %ax,%gs - movl $KGDT_R0_PCR, %eax - movl %eax, %fs - pushl %esp - pushl $(IRQ_BASE + 10) - call _KiInterruptDispatch - addl $0xC, %esp - popl %gs - popl %fs - popl %es - popl %ds - popa - iret - -.global _irq_handler_11 -_irq_handler_11: - cld - pusha - pushl %ds - pushl %es - pushl %fs - pushl %gs - movl $0xceafbeef,%eax - pushl %eax - movw $KGDT_R0_DATA,%ax - movw %ax,%ds - movw %ax,%es - movw %ax,%gs - movl $KGDT_R0_PCR, %eax - movl %eax, %fs - pushl %esp - pushl $(IRQ_BASE + 11) - call _KiInterruptDispatch - addl $0xC, %esp - popl %gs - popl %fs - popl %es - popl %ds - popa - iret - -.global _irq_handler_12 -_irq_handler_12: - cld - pusha - pushl %ds - pushl %es - pushl %fs - pushl %gs - movl $0xceafbeef,%eax - pushl %eax - movw $KGDT_R0_DATA,%ax - movw %ax,%ds - movw %ax,%es - movw %ax,%gs - movl $KGDT_R0_PCR, %eax - movl %eax, %fs - pushl %esp - pushl $(IRQ_BASE + 12) - call _KiInterruptDispatch - addl $0xC, %esp - popl %gs - popl %fs - popl %es - popl %ds - popa - iret - -.global _irq_handler_13 -_irq_handler_13: - cld - pusha - pushl %ds - pushl %es - pushl %fs - pushl %gs - movl $0xceafbeef,%eax - pushl %eax - movw $KGDT_R0_DATA,%ax - movw %ax,%ds - movw %ax,%es - movw %ax,%gs - movl $KGDT_R0_PCR, %eax - movl %eax, %fs - pushl %esp - pushl $(IRQ_BASE + 13) - call _KiInterruptDispatch - addl $0xC, %esp - popl %gs - popl %fs - popl %es - popl %ds - popa - iret - -.global _irq_handler_14 -_irq_handler_14: - cld - pusha - pushl %ds - pushl %es - pushl %fs - pushl %gs - movl $0xceafbeef,%eax - pushl %eax - movw $KGDT_R0_DATA,%ax - movw %ax,%ds - movw %ax,%es - movw %ax,%gs - movl $KGDT_R0_PCR, %eax - movl %eax, %fs - pushl %esp - pushl $(IRQ_BASE + 14) - call _KiInterruptDispatch - addl $0xC, %esp - popl %gs - popl %fs - popl %es - popl %ds - popa - iret - -.global _irq_handler_15 -_irq_handler_15: - cld - pusha - pushl %ds - pushl %es - pushl %fs - pushl %gs - movl $0xceafbeef,%eax - pushl %eax - movw $KGDT_R0_DATA,%ax - movw %ax,%ds - movw %ax,%es - movw %ax,%gs - movl $KGDT_R0_PCR, %eax - movl %eax, %fs - pushl %esp - pushl $(IRQ_BASE + 15) - call _KiInterruptDispatch - addl $0xC, %esp - popl %gs - popl %fs - popl %es - popl %ds - popa - iret - #endif /* CONFIG_SMP */ .intel_syntax noprefix

1 0

[ion] 20531: - Fix building with old binutils. Thanks to Ge for the fix.
by ion＠svn.reactos.org 02 Jan '06

02 Jan '06

- Fix building with old binutils. Thanks to Ge for the fix. Modified: trunk/reactos/include/ndk/asm.h Modified: trunk/reactos/include/ndk/extypes.h _____ Modified: trunk/reactos/include/ndk/asm.h --- trunk/reactos/include/ndk/asm.h 2006-01-02 17:46:35 UTC (rev 20530) +++ trunk/reactos/include/ndk/asm.h 2006-01-02 18:03:19 UTC (rev 20531) @@ -291,7 +291,9 @@ #define EFLAGS_VIP 0x100000 #define EFLAG_SIGN 0x8000 #define EFLAG_ZERO 0x4000 -#define EFLAG_SELECT (EFLAG_SIGN | EFLAG_ZERO) +#ifndef EFLAG_SELECT +#define EFLAG_SELECT (EFLAG_SIGN + EFLAG_ZERO) +#endif // // CR0 _____ Modified: trunk/reactos/include/ndk/extypes.h --- trunk/reactos/include/ndk/extypes.h 2006-01-02 17:46:35 UTC (rev 20530) +++ trunk/reactos/include/ndk/extypes.h 2006-01-02 18:03:19 UTC (rev 20531) @@ -354,7 +354,7 @@ LONG ShareCount; LONG Flags; #if DBG - BOOL Signaled; + BOOLEAN Signaled; EX_PUSH_LOCK NewValue; EX_PUSH_LOCK OldValue; PEX_PUSH_LOCK PushLock;

1 0

[hbirr] 20530: Fixed the size of the allocated port structure.
by hbirr＠svn.reactos.org 02 Jan '06

02 Jan '06

Fixed the size of the allocated port structure. Modified: trunk/reactos/ntoskrnl/ps/kill.c _____ Modified: trunk/reactos/ntoskrnl/ps/kill.c --- trunk/reactos/ntoskrnl/ps/kill.c 2006-01-02 16:43:54 UTC (rev 20529) +++ trunk/reactos/ntoskrnl/ps/kill.c 2006-01-02 17:46:35 UTC (rev 20530) @@ -754,7 +754,7 @@ /* Allocate the Port and make sure it suceeded */ if((TerminationPort = ExAllocatePoolWithTag(NonPagedPool, - sizeof(PTERMINATION_PORT), + sizeof(TERMINATION_PORT), TAG('P', 's', 'T', '=')))) { /* Associate the Port */

1 0

[gedmurphy] 20529: Allow files other than C to be included in the projects
by gedmurphy＠svn.reactos.org 02 Jan '06

02 Jan '06

Allow files other than C to be included in the projects Patch by Brezenbak (IRC) Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp _____ Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp 2006-01-02 11:39:15 UTC (rev 20528) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp 2006-01-02 16:43:54 UTC (rev 20529) @@ -116,10 +116,10 @@ // TODO FIXME - do we want the full path of the file here? string file = string(".") + &files[i]->name[vcproj_path.size()]; - if ( !stricmp ( Right(file,2).c_str(), ".c" ) ) - source_files.push_back ( file ); if ( !stricmp ( Right(file,3).c_str(), ".rc" ) ) resource_files.push_back ( file ); + else + source_files.push_back ( file ); } const vector<Include*>& incs = data.includes; for ( i = 0; i < incs.size(); i++ )

1 0

[hpoussin] 20528: Report current bus number during IRP_MN_QUERY_RESOURCES
by hpoussin＠svn.reactos.org 02 Jan '06

02 Jan '06

Report current bus number during IRP_MN_QUERY_RESOURCES Child bus number is in u.type1.SecondaryBus field, not u.type1.SubordinateBus Modified: trunk/reactos/drivers/bus/pci/pdo.c _____ Modified: trunk/reactos/drivers/bus/pci/pdo.c --- trunk/reactos/drivers/bus/pci/pdo.c 2006-01-02 11:37:00 UTC (rev 20527) +++ trunk/reactos/drivers/bus/pci/pdo.c 2006-01-02 11:39:15 UTC (rev 20528) @@ -373,6 +373,7 @@ } else if (PCI_CONFIGURATION_TYPE(&PciConfig) == PCI_CARDBUS_BRIDGE_TYPE) { + /* FIXME: Count Cardbus bridge resources */ } else { @@ -386,11 +387,8 @@ } /* Calculate the resource list size */ - ListSize = sizeof(IO_RESOURCE_REQUIREMENTS_LIST); - if (ResCount > 1) - { - ListSize += ((ResCount - 1) * sizeof(IO_RESOURCE_DESCRIPTOR)); - } + ListSize = FIELD_OFFSET(IO_RESOURCE_REQUIREMENTS_LIST, List->Descriptors) + + ResCount * sizeof(IO_RESOURCE_DESCRIPTOR); DPRINT("ListSize %lu (0x%lx)\n", ListSize, ListSize); @@ -403,6 +401,7 @@ return STATUS_INSUFFICIENT_RESOURCES; } + RtlZeroMemory(ResourceList, ListSize); ResourceList->ListSize = ListSize; ResourceList->InterfaceType = PCIBus; ResourceList->BusNumber = DeviceExtension->PciDevice->BusNumber; @@ -584,11 +583,10 @@ { Descriptor->Option = 0; /* Required */ Descriptor->Type = CmResourceTypeBusNumber; - Descriptor->ShareDisposition = CmResourceShareShared; - Descriptor->Flags = CM_RESOURCE_INTERRUPT_LEVEL_SENSITIVE; + Descriptor->ShareDisposition = CmResourceShareDeviceExclusive; Descriptor->u.BusNumber.MinBusNumber = - Descriptor->u.BusNumber.MaxBusNumber = DeviceExtension->PciDevice->PciConfig.u.type1.SubordinateBus; + Descriptor->u.BusNumber.MaxBusNumber = DeviceExtension->PciDevice->PciConfig.u.type1.SecondaryBus; Descriptor->u.BusNumber.Length = 1; Descriptor->u.BusNumber.Reserved = 0; } @@ -677,10 +675,12 @@ if (Length != 0) ResCount++; } + if (DeviceExtension->PciDevice->PciConfig.BaseClass == PCI_CLASS_BRIDGE_DEV) + ResCount++; } else if (PCI_CONFIGURATION_TYPE(&PciConfig) == PCI_CARDBUS_BRIDGE_TYPE) { - + /* FIXME: Count Cardbus bridge resources */ } else { @@ -694,11 +694,8 @@ } /* Calculate the resource list size */ - ListSize = sizeof(CM_RESOURCE_LIST); - if (ResCount > 1) - { - ListSize += ((ResCount - 1) * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR)); - } + ListSize = FIELD_OFFSET(CM_RESOURCE_LIST, List->PartialResourceList.PartialDescriptors) + + ResCount * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); /* Allocate the resource list */ ResourceList = ExAllocatePool(PagedPool, @@ -706,13 +703,14 @@ if (ResourceList == NULL) return STATUS_INSUFFICIENT_RESOURCES; + RtlZeroMemory(ResourceList, ListSize); ResourceList->Count = 1; ResourceList->List[0].InterfaceType = PCIConfiguration; ResourceList->List[0].BusNumber = DeviceExtension->PciDevice->BusNumber; PartialList = &ResourceList->List[0].PartialResourceList; - PartialList->Version = 0; - PartialList->Revision = 0; + PartialList->Version = 1; + PartialList->Revision = 1; PartialList->Count = ResCount; Descriptor = &PartialList->PartialDescriptors[0]; @@ -811,10 +809,19 @@ Descriptor++; } + if (DeviceExtension->PciDevice->PciConfig.BaseClass == PCI_CLASS_BRIDGE_DEV) + { + Descriptor->Type = CmResourceTypeBusNumber; + Descriptor->ShareDisposition = CmResourceShareDeviceExclusive; + + Descriptor->u.BusNumber.Start = DeviceExtension->PciDevice->PciConfig.u.type1.SecondaryBus; + Descriptor->u.BusNumber.Length = 1; + Descriptor->u.BusNumber.Reserved = 0; + } } else if (PCI_CONFIGURATION_TYPE(&PciConfig) == PCI_CARDBUS_BRIDGE_TYPE) { - /* FIXME: Cardbus */ + /* FIXME: Add Cardbus bridge resources */ } Irp->IoStatus.Information = (ULONG_PTR)ResourceList;

1 0

[hpoussin] 20527: Start \\Device\\USBFDOx names at index 0.
by hpoussin＠svn.reactos.org 02 Jan '06

02 Jan '06

Start \\Device\\USBFDOx names at index 0. Use the same index to create the symbolic link \\??\\HCDx This should fix the handling of multiple USB controllers Modified: trunk/reactos/drivers/usb/miniport/common/main.c _____ Modified: trunk/reactos/drivers/usb/miniport/common/main.c --- trunk/reactos/drivers/usb/miniport/common/main.c 2006-01-02 11:32:03 UTC (rev 20526) +++ trunk/reactos/drivers/usb/miniport/common/main.c 2006-01-02 11:37:00 UTC (rev 20527) @@ -17,7 +17,7 @@ #define INITGUID #include "usbcommon.h" -// data for embedded drivers +/* Data for embedded drivers */ CONNECT_DATA KbdClassInformation; CONNECT_DATA MouseClassInformation; PDEVICE_OBJECT KeyboardFdo = NULL; @@ -32,9 +32,9 @@ PDEVICE_OBJECT Pdo; PUSBMP_DEVICE_EXTENSION DeviceExtension; NTSTATUS Status; - + DPRINT("USBMP: CreateRootHubPdo()\n"); - + Status = IoCreateDevice( DriverObject, sizeof(USBMP_DEVICE_EXTENSION), @@ -48,19 +48,19 @@ DPRINT("USBMP: IoCreateDevice() call failed with status 0x%08x\n", Status); return Status; } - + Pdo->Flags |= DO_BUS_ENUMERATED_DEVICE; Pdo->Flags |= DO_POWER_PAGABLE; - - // zerofill device extension + + /* Zerofill device extension */ DeviceExtension = (PUSBMP_DEVICE_EXTENSION)Pdo->DeviceExtension; RtlZeroMemory(DeviceExtension, sizeof(USBMP_DEVICE_EXTENSION)); - + DeviceExtension->IsFDO = FALSE; DeviceExtension->FunctionalDeviceObject = Fdo; - + Pdo->Flags &= ~DO_DEVICE_INITIALIZING; - + *pPdo = Pdo; return STATUS_SUCCESS; } @@ -189,18 +189,18 @@ IN PDRIVER_OBJECT DriverObject, IN PDEVICE_OBJECT pdo) { - PDEVICE_OBJECT fdo; + PDEVICE_OBJECT fdo = NULL; NTSTATUS Status; WCHAR DeviceBuffer[20]; WCHAR LinkDeviceBuffer[20]; UNICODE_STRING DeviceName; UNICODE_STRING LinkDeviceName; PUSBMP_DRIVER_EXTENSION DriverExtension; - PUSBMP_DEVICE_EXTENSION DeviceExtension; + PUSBMP_DEVICE_EXTENSION DeviceExtension = NULL; static ULONG DeviceNumber = 0; - BOOL AlreadyRestarted = FALSE; + BOOLEAN AlreadyRestarted = FALSE; - // Allocate driver extension now + /* Allocate driver extension now */ DriverExtension = IoGetDriverObjectExtension(DriverObject, DriverObject); if (DriverExtension == NULL) { @@ -212,56 +212,59 @@ if (!NT_SUCCESS(Status)) { - DPRINT("USBMP: Allocating DriverObjectExtension failed.\n"); - return Status; + DPRINT1("USBMP: Allocating DriverObjectExtension failed.\n"); + goto cleanup; } } /* Create a unicode device name. Allocate a new device number every time */ - do + while (TRUE) { - DeviceNumber++; + swprintf(DeviceBuffer, L"\\Device\\USBFDO-%lu", DeviceNumber); + RtlInitUnicodeString(&DeviceName, DeviceBuffer); + + Status = IoCreateDevice(DriverObject, + sizeof(USBMP_DEVICE_EXTENSION), + &DeviceName, + FILE_DEVICE_BUS_EXTENDER, + 0, + FALSE, + &fdo); + if (Status != STATUS_OBJECT_NAME_COLLISION) + break; + if (DeviceNumber == 9999) { /* Hmm. We don't have a free number. */ if (AlreadyRestarted) { - Status = STATUS_UNSUCCESSFUL; + Status = STATUS_TOO_MANY_NAMES; break; } /* Start again at DeviceNumber = 0 to find a free number */ DeviceNumber = 0; AlreadyRestarted = TRUE; } - swprintf(DeviceBuffer, L"\\Device\\USBFDO-%lu", DeviceNumber); - RtlInitUnicodeString(&DeviceName, DeviceBuffer); + else + DeviceNumber++; + } - Status = IoCreateDevice(DriverObject, - sizeof(USBMP_DEVICE_EXTENSION), - &DeviceName, - FILE_DEVICE_BUS_EXTENDER, - 0, - FALSE, - &fdo); - } while (Status == STATUS_OBJECT_NAME_COLLISION); - if (!NT_SUCCESS(Status)) { - DPRINT("USBMP: IoCreateDevice call failed with status 0x%08lx\n", Status); - return Status; + DPRINT1("USBMP: IoCreateDevice call failed with status 0x%08lx\n", Status); + goto cleanup; } - // zerofill device extension + /* Zerofill device extension */ DeviceExtension = (PUSBMP_DEVICE_EXTENSION)fdo->DeviceExtension; RtlZeroMemory(DeviceExtension, sizeof(USBMP_DEVICE_EXTENSION)); - + /* Create root hub Pdo */ Status = CreateRootHubPdo(DriverObject, fdo, &DeviceExtension->RootHubPdo); if (!NT_SUCCESS(Status)) { - DPRINT("USBMP: CreateRootHubPdo() failed with status 0x%08lx\n", Status); - IoDeleteDevice(fdo); - return Status; + DPRINT1("USBMP: CreateRootHubPdo() failed with status 0x%08lx\n", Status); + goto cleanup; } /* Register device interface for controller */ @@ -272,15 +275,13 @@ &DeviceExtension->HcdInterfaceName); if (!NT_SUCCESS(Status)) { - DPRINT("USBMP: IoRegisterDeviceInterface() failed with status 0x%08lx\n", Status); - IoDeleteDevice(DeviceExtension->RootHubPdo); - IoDeleteDevice(fdo); - return Status; + DPRINT1("USBMP: IoRegisterDeviceInterface() failed with status 0x%08lx\n", Status); + goto cleanup; } DeviceExtension->NextDeviceObject = IoAttachDeviceToDeviceStack(fdo, pdo); - // Initialize device extension + /* Initialize device extension */ DeviceExtension->IsFDO = TRUE; DeviceExtension->DeviceNumber = DeviceNumber; DeviceExtension->PhysicalDeviceObject = pdo; @@ -288,24 +289,26 @@ DeviceExtension->DriverExtension = DriverExtension; fdo->Flags &= ~DO_DEVICE_INITIALIZING; - - /* FIXME: do a loop to find an available number */ - swprintf(LinkDeviceBuffer, L"\\??\\HCD%lu", 0); + /* Use the same number as the FDO */ + swprintf(LinkDeviceBuffer, L"\\??\\HCD%lu", DeviceNumber); + RtlInitUnicodeString(&LinkDeviceName, LinkDeviceBuffer); - Status = IoCreateSymbolicLink(&LinkDeviceName, &DeviceName); - if (!NT_SUCCESS(Status)) { - DPRINT("USBMP: IoCreateSymbolicLink() call failed with status 0x%08x\n", Status); - IoDeleteDevice(DeviceExtension->RootHubPdo); - IoDeleteDevice(fdo); - return Status; + DPRINT1("USBMP: IoCreateSymbolicLink() call failed with status 0x%08x\n", Status); + goto cleanup; } - return STATUS_SUCCESS; + +cleanup: + if (DeviceExtension && DeviceExtension->RootHubPdo) + IoDeleteDevice(DeviceExtension->RootHubPdo); + if (fdo) + IoDeleteDevice(fdo); + return Status; } NTSTATUS STDCALL @@ -428,15 +431,15 @@ DriverObject->MajorFunction[IRP_MJ_PNP] = DispatchPnp; DriverObject->MajorFunction[IRP_MJ_POWER] = DispatchPower; - // Register in usbcore.sys + /* Register in usbcore.sys */ UsbPortInterface.KbdConnectData = &KbdClassInformation; UsbPortInterface.MouseConnectData = &MouseClassInformation; - + KbdClassInformation.ClassService = NULL; KbdClassInformation.ClassDeviceObject = NULL; MouseClassInformation.ClassService = NULL; MouseClassInformation.ClassDeviceObject = NULL; - + RegisterPortDriver(DriverObject, &UsbPortInterface); AddDevice_Keyboard(DriverObject, NULL);

1 0

[hpoussin] 20526: Replace STATUS_UNSUCCESSFUL by STATUS_TOO_MANY_NAMES
by hpoussin＠svn.reactos.org 02 Jan '06

02 Jan '06

Replace STATUS_UNSUCCESSFUL by STATUS_TOO_MANY_NAMES Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.c Modified: trunk/reactos/drivers/input/mouclass/mouclass.c _____ Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.c --- trunk/reactos/drivers/input/kbdclass/kbdclass.c 2006-01-01 20:59:39 UTC (rev 20525) +++ trunk/reactos/drivers/input/kbdclass/kbdclass.c 2006-01-02 11:32:03 UTC (rev 20526) @@ -312,8 +312,8 @@ } DeviceId++; } - DPRINT("Too much devices starting with '\\Device\\%wZ'\n", &DriverExtension->DeviceBaseName); - Status = STATUS_UNSUCCESSFUL; + DPRINT("Too many devices starting with '\\Device\\%wZ'\n", &DriverExtension->DeviceBaseName); + Status = STATUS_TOO_MANY_NAMES; cleanup: if (!NT_SUCCESS(Status)) { _____ Modified: trunk/reactos/drivers/input/mouclass/mouclass.c --- trunk/reactos/drivers/input/mouclass/mouclass.c 2006-01-01 20:59:39 UTC (rev 20525) +++ trunk/reactos/drivers/input/mouclass/mouclass.c 2006-01-02 11:32:03 UTC (rev 20526) @@ -307,8 +307,8 @@ } DeviceId++; } - DPRINT("Too much devices starting with '\\Device\\%wZ'\n", &DriverExtension->DeviceBaseName); - Status = STATUS_UNSUCCESSFUL; + DPRINT("Too many devices starting with '\\Device\\%wZ'\n", &DriverExtension->DeviceBaseName); + Status = STATUS_TOO_MANY_NAMES; cleanup: if (!NT_SUCCESS(Status)) {

1 0

[ekohl] 20525: Generate static MIDL_PROC_FORMAT_STRING, MIDL_TYPE_FORMAT_STRING and MIDL_STUB_DESC.
by ekohl＠svn.reactos.org 01 Jan '06

01 Jan '06

Generate static MIDL_PROC_FORMAT_STRING, MIDL_TYPE_FORMAT_STRING and MIDL_STUB_DESC. Modified: trunk/reactos/tools/widl/ChangeLog Modified: trunk/reactos/tools/widl/client.c Modified: trunk/reactos/tools/widl/server.c _____ Modified: trunk/reactos/tools/widl/ChangeLog --- trunk/reactos/tools/widl/ChangeLog 2006-01-01 20:56:01 UTC (rev 20524) +++ trunk/reactos/tools/widl/ChangeLog 2006-01-01 20:59:39 UTC (rev 20525) @@ -1,5 +1,13 @@ ChangeLog +2006-01-01 ekohl + + tools/widl/client.c + tools/widl/server.c + +- Generate static MIDL_PROC_FORMAT_STRING, MIDL_TYPE_FORMAT_STRING and + MIDL_STUB_DESC variables. + 2005-12-05 ekohl tools/widl/widl.c _____ Modified: trunk/reactos/tools/widl/client.c --- trunk/reactos/tools/widl/client.c 2006-01-01 20:56:01 UTC (rev 20524) +++ trunk/reactos/tools/widl/client.c 2006-01-01 20:59:39 UTC (rev 20525) @@ -304,7 +304,7 @@ unsigned int type_offset = 2; int in_attr, out_attr; - print_client("const MIDL_PROC_FORMAT_STRING __MIDL_ProcFormatString =\n"); + print_client("static const MIDL_PROC_FORMAT_STRING __MIDL_ProcFormatString =\n"); print_client("{\n"); indent++; print_client("0,\n"); @@ -429,7 +429,7 @@ int ptr_attr, ref_attr, unique_attr; void *sizeis_attr; - print_client("const MIDL_TYPE_FORMAT_STRING __MIDL_TypeFormatString =\n"); + print_client("static const MIDL_TYPE_FORMAT_STRING __MIDL_TypeFormatString =\n"); print_client("{\n"); indent++; print_client("0,\n"); @@ -1782,7 +1782,7 @@ static void write_stubdescdecl(type_t *iface) { - print_client("extern const MIDL_STUB_DESC %s_StubDesc;\n", iface->name); + print_client("static const MIDL_STUB_DESC %s_StubDesc;\n", iface->name); fprintf(client, "\n"); } @@ -1791,7 +1791,7 @@ { char *implicit_handle = get_attrp(iface->attrs, ATTR_IMPLICIT_HANDLE); - print_client("const MIDL_STUB_DESC %s_StubDesc =\n", iface->name); + print_client("static const MIDL_STUB_DESC %s_StubDesc =\n", iface->name); print_client("{\n"); indent++; print_client("(void __RPC_FAR *)& %s___RpcClientInterface,\n", iface->name); @@ -1956,8 +1956,8 @@ write_formatdesc("TYPE"); write_formatdesc("PROC"); fprintf(client, "\n"); - print_client("extern const MIDL_TYPE_FORMAT_STRING __MIDL_TypeFormatString;\n"); - print_client("extern const MIDL_PROC_FORMAT_STRING __MIDL_ProcFormatString;\n"); + print_client("static const MIDL_TYPE_FORMAT_STRING __MIDL_TypeFormatString;\n"); + print_client("static const MIDL_PROC_FORMAT_STRING __MIDL_ProcFormatString;\n"); print_client("\n"); } _____ Modified: trunk/reactos/tools/widl/server.c --- trunk/reactos/tools/widl/server.c 2006-01-01 20:56:01 UTC (rev 20524) +++ trunk/reactos/tools/widl/server.c 2006-01-01 20:59:39 UTC (rev 20525) @@ -309,7 +309,7 @@ unsigned int type_offset = 2; int in_attr, out_attr; - print_server("const MIDL_PROC_FORMAT_STRING __MIDL_ProcFormatString =\n"); + print_server("static const MIDL_PROC_FORMAT_STRING __MIDL_ProcFormatString =\n"); print_server("{\n"); indent++; print_server("0,\n"); @@ -426,7 +426,7 @@ int ptr_attr, ref_attr, unique_attr; void *sizeis_attr; - print_server("const MIDL_TYPE_FORMAT_STRING __MIDL_TypeFormatString =\n"); + print_server("static const MIDL_TYPE_FORMAT_STRING __MIDL_TypeFormatString =\n"); print_server("{\n"); indent++; print_server("0,\n"); @@ -1922,14 +1922,14 @@ static void write_stubdescdecl(type_t *iface) { - print_server("extern const MIDL_STUB_DESC %s_StubDesc;\n", iface->name); + print_server("static const MIDL_STUB_DESC %s_StubDesc;\n", iface->name); fprintf(server, "\n"); } static void write_stubdescriptor(type_t *iface) { - print_server("const MIDL_STUB_DESC %s_StubDesc =\n", iface->name); + print_server("static const MIDL_STUB_DESC %s_StubDesc =\n", iface->name); print_server("{\n"); indent++; print_server("(void __RPC_FAR *)& %s___RpcServerInterface,\n", iface->name); @@ -2093,8 +2093,8 @@ write_formatdesc("TYPE"); write_formatdesc("PROC"); fprintf(server, "\n"); - print_server("extern const MIDL_TYPE_FORMAT_STRING __MIDL_TypeFormatString;\n"); - print_server("extern const MIDL_PROC_FORMAT_STRING __MIDL_ProcFormatString;\n"); + print_server("static const MIDL_TYPE_FORMAT_STRING __MIDL_TypeFormatString;\n"); + print_server("static const MIDL_PROC_FORMAT_STRING __MIDL_ProcFormatString;\n"); print_server("\n"); }

1 0

[gedmurphy] 20524: revert 20523.
by gedmurphy＠svn.reactos.org 01 Jan '06

01 Jan '06

revert 20523. explorer and my computer are different animals Modified: trunk/reactos/subsys/system/explorer/taskbar/quicklaunch.cpp _____ Modified: trunk/reactos/subsys/system/explorer/taskbar/quicklaunch.cpp --- trunk/reactos/subsys/system/explorer/taskbar/quicklaunch.cpp 2006-01-01 18:45:16 UTC (rev 20523) +++ trunk/reactos/subsys/system/explorer/taskbar/quicklaunch.cpp 2006-01-01 20:56:01 UTC (rev 20524) @@ -122,7 +122,7 @@ HBRUSH bk_brush = GetSysColorBrush(COLOR_BTNFACE); AddButton(ID_MINIMIZE_ALL, g_Globals._icon_cache.get_icon(ICID_MINIMIZE).create_bitmap(bk_color, bk_brush, canvas), ResString(IDS_MINIMIZE_ALL), NULL); - AddButton(ID_EXPLORE, g_Globals._icon_cache.get_icon(ICID_COMPUTER).create_bitmap(bk_color, bk_brush, canvas), ResString(IDS_TITLE), NULL); + AddButton(ID_EXPLORE, g_Globals._icon_cache.get_icon(ICID_EXPLORER).create_bitmap(bk_color, bk_brush, canvas), ResString(IDS_TITLE), NULL); TBBUTTON sep = {0, -1, TBSTATE_ENABLED, BTNS_SEP, {0, 0}, 0, 0}; SendMessage(_hwnd, TB_INSERTBUTTON, INT_MAX, (LPARAM)&sep);

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 January 2006