Ros-diffs January 2006

ros-diffs@reactos.org

23 participants
586 discussions

[ion] 20933: * Add more documented flags from ks386.inc to asm.h

by ion＠svn.reactos.org

* Add more documented flags from ks386.inc to asm.h * Isolate and clean-up the VMWare hack; the shared trap exit macro can now be implemented. Modified: trunk/reactos/include/ndk/asm.h Modified: trunk/reactos/ntoskrnl/ke/i386/syscall.S Modified: trunk/reactos/ntoskrnl/ke/i386/usercall_asm.S _____ Modified: trunk/reactos/include/ndk/asm.h --- trunk/reactos/include/ndk/asm.h 2006-01-17 03:28:33 UTC (rev 20932) +++ trunk/reactos/include/ndk/asm.h 2006-01-17 05:05:35 UTC (rev 20933) @@ -354,10 +354,13 @@ #define CBSTACK_RESULT_LENGTH 0x24 // -// NTSTATUS Codes +// NTSTATUS and Bugcheck Codes // #ifdef __ASM__ #define STATUS_INVALID_SYSTEM_SERVICE 0xC000001C +#define STATUS_NO_CALLBACK_ACTIVE 0xC0000258 +#define APC_INDEX_MISMATCH 1 +#define IRQL_GT_ZERO_AT_SYSTEM_SERVICE 0x4A #endif // _____ Modified: trunk/reactos/ntoskrnl/ke/i386/syscall.S --- trunk/reactos/ntoskrnl/ke/i386/syscall.S 2006-01-17 03:28:33 UTC (rev 20932) +++ trunk/reactos/ntoskrnl/ke/i386/syscall.S 2006-01-17 05:05:35 UTC (rev 20933) @@ -7,8 +7,6 @@ #include <asm.h> #include <internal/i386/asmmacro.S> -#define APC_INDEX_MISMATCH 1 -#define IRQL_GT_ZERO_AT_SYSTEM_SERVICE 0x4A .globl _KiServiceExit .globl _KiServiceExit2 @@ -18,7 +16,7 @@ .intel_syntax noprefix /* - * There are 3 main types of Trap Entries: + * There are 3 main types of Trap Entries: <= Move this to asmmacro.S * * - System Calls * - TODO @@ -31,7 +29,7 @@ */ /* - * There are 3 main types of Trap Exits: + * There are 3 main types of Trap Exits: <= Correct some things and move to asmmacro.S * * - KiServiceExit * - Clear interrupt flag @@ -66,17 +64,10 @@ * All these are exemplified by the 3 trap exits shown above */ -/* - * There is also common Debug Code present in the common exit code, which - * in turn calls common code to save the debug registers - */ - /* * FIXMEs: - * - Dig in trap code and see why we need to push/pop the segments, - * which -shouldn't- be needed on syscalls; one of the things - * missing for this to work is lazy loading in the GPF handler, - * but there are other things to consider. + * - Figure out why ES/DS gets messed up in VMWare, when doing KiServiceExit only, + * and only when called from user-mode, and returning to user-mode. * - Use macros and merge with trap.s nicely */ @@ -159,15 +150,13 @@ /* Push previous mode */ push UserMode -.att_syntax - /* Save other registers */ - sub $0xC, %esp // + 0x70 - pushl $KGDT_R3_DATA + RPL_MASK // + 0x40 - pushl $KGDT_R3_DATA + RPL_MASK // + 0x44 - pushl $0 // + 0x48 - sub $0x30, %esp // + 0x70 -.intel_syntax noprefix + /* Skip the other registers */ + sub esp, 0x48 + /* Hack: it seems that on VMWare someone damages ES/DS on exit. Investigate! */ + mov dword ptr [esp+KTRAP_FRAME_DS], KGDT_R3_DATA + RPL_MASK + mov dword ptr [esp+KTRAP_FRAME_ES], KGDT_R3_DATA + RPL_MASK + /* Make space for us on the stack */ sub ebp, 0x29C @@ -216,16 +205,14 @@ /* Save the old previous mode */ push ss:[esi+KTHREAD_PREVIOUS_MODE] - -.att_syntax - /* Save other registers */ - sub $0xC, %esp // + 0x70 - pushl %ds // + 0x40 - pushl %es // + 0x44 - pushl %gs // + 0x48 - sub $0x30, %esp // + 0x70 -.intel_syntax noprefix + /* Skip the other registers */ + sub esp, 0x48 + + /* Hack: it seems that on VMWare someone damages ES/DS on exit. Investigate! */ + mov [esp+KTRAP_FRAME_DS], ds + mov [esp+KTRAP_FRAME_ES], es + /* Set the new previous mode based on the saved CS selector */ mov ebx, [esp+0x6C] and ebx, 1 @@ -424,6 +411,10 @@ /* Check for, and deliver, User-Mode APCs if needed */ CHECK_FOR_APC_DELIVER 1 + /* Hack for VMWare: Sometimes ES/DS seem to be invalid when returning to user-mode. Investigate! */ + mov es, [ebp+KTRAP_FRAME_ES] + mov ds, [ebp+KTRAP_FRAME_DS] + // ========================= COMMON TRAP EXIT CODE ===================// #ifdef DBG /* Assert the flags */ @@ -515,14 +506,6 @@ jz CommonStackClean // ==================== END IF FULL RESTORE NEEDED ====================// -//badbadbad - add esp, 0x30 - pop gs - pop es - pop ds - add esp, 0x14 -//badbadbad - /* Restore FS */ RestoreFs: lea esp, [ebp+KTRAP_FRAME_FS] _____ Modified: trunk/reactos/ntoskrnl/ke/i386/usercall_asm.S --- trunk/reactos/ntoskrnl/ke/i386/usercall_asm.S 2006-01-17 03:28:33 UTC (rev 20932) +++ trunk/reactos/ntoskrnl/ke/i386/usercall_asm.S 2006-01-17 05:05:35 UTC (rev 20933) @@ -9,17 +9,9 @@ /* INCLUDES ******************************************************************/ #include <asm.h> -//#include <bugcodes.h> -#define APC_INDEX_MISMATCH 1 -#define IRQL_GT_ZERO_AT_SYSTEM_SERVICE 0x4A -#define STATUS_NO_CALLBACK_ACTIVE 0xC0000258 +#include <internal/i386/asmmacro.S> .intel_syntax noprefix -// This file is a work in progress. Most of the code is currently disabled. - -/* GLOBALS ****************************************************************/ -.extern PVOID _KeUserCallbackDispatcher - /* FUNCTIONS ****************************************************************/ .globl _KiGetUserModeStackAddress@0 @@ -186,8 +178,7 @@ lea esi, [edx+KTRAP_FRAME_FS] rep movsd - /* TODO: Ugly hack because of some missing logic in syscall.s */ - mov dword ptr [esp+KTRAP_FRAME_GS], 0 + /* VMWARE Hack because ES/DS sometimes gets smashed when returning to User-Mode. Investigate! */ mov dword ptr [esp+KTRAP_FRAME_DS], KGDT_R3_DATA + RPL_MASK mov dword ptr [esp+KTRAP_FRAME_ES], KGDT_R3_DATA + RPL_MASK @@ -209,12 +200,7 @@ sti /* Write the debug data */ - mov edi, [ebp+KTRAP_FRAME_EBP] - mov edx, [ebp+KTRAP_FRAME_EIP] - mov [ebp+KTRAP_FRAME_DEBUGPOINTER], edx - mov dword ptr [ebp+KTRAP_FRAME_DEBUGARGMARK], 0xBADB0D00 - mov [ebp+KTRAP_FRAME_DEBUGEBP], ebx - mov [ebp+KTRAP_FRAME_DEBUGEIP], edi + SET_TF_DEBUG_HEADER /* Exit to user-mode */ jmp _KiServiceExit

18 years, 8 months

[weiden] 20932: don't release the pipe list lock twice in case of a canceled read operation

by weiden＠svn.reactos.org

don't release the pipe list lock twice in case of a canceled read operation Modified: trunk/reactos/drivers/fs/np/rw.c _____ Modified: trunk/reactos/drivers/fs/np/rw.c --- trunk/reactos/drivers/fs/np/rw.c 2006-01-17 03:25:55 UTC (rev 20931) +++ trunk/reactos/drivers/fs/np/rw.c 2006-01-17 03:28:33 UTC (rev 20932) @@ -182,7 +182,6 @@ ThreadContext->Count++; ThreadContext->DeviceExt->EmptyWaiterCount--; } - KeUnlockMutex(&ThreadContext->DeviceExt->PipeListLock); break; default: KEBUGCHECK(0);

18 years, 8 months

[weiden] 20931: some fixes in NtReadFile and NtWrite file for (a)synchronous pipe handling and parameter checks

by weiden＠svn.reactos.org

some fixes in NtReadFile and NtWrite file for (a)synchronous pipe handling and parameter checks Modified: trunk/reactos/ntoskrnl/io/file.c _____ Modified: trunk/reactos/ntoskrnl/io/file.c --- trunk/reactos/ntoskrnl/io/file.c 2006-01-17 03:00:21 UTC (rev 20930) +++ trunk/reactos/ntoskrnl/io/file.c 2006-01-17 03:25:55 UTC (rev 20931) @@ -531,6 +531,8 @@ PIO_STACK_LOCATION StackPtr; PKEVENT EventObject = NULL; BOOLEAN LocalEvent = FALSE; + ULONG AccessType; + OBJECT_HANDLE_INFORMATION HandleInformation; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); DPRINT("IopDeviceFsIoControl(DeviceHandle 0x%p Event 0x%p UserApcRoutine 0x%p " @@ -541,17 +543,84 @@ IoControlCode,InputBuffer,InputBufferLength,OutputBuffer, OutputBufferLength); - if (IoStatusBlock == NULL) return STATUS_ACCESS_VIOLATION; + AccessType = IO_METHOD_FROM_CTL_CODE(IoControlCode); - /* Check granted access against the access rights from IoContolCode */ + if (PreviousMode != KernelMode) + { + _SEH_TRY + { + ProbeForWrite(IoStatusBlock, + sizeof(IO_STATUS_BLOCK), + sizeof(ULONG)); + + /* probe the input and output buffers if needed */ + if (AccessType == METHOD_BUFFERED) + { + if (OutputBuffer != NULL) + { + ProbeForWrite(OutputBuffer, + OutputBufferLength, + 1); + } + else + { + /* make sure the caller can't fake this as we depend on this */ + OutputBufferLength = 0; + } + } + + if (AccessType != METHOD_NEITHER) + { + if (InputBuffer != NULL) + { + ProbeForRead(InputBuffer, + InputBufferLength, + 1); + } + else + { + /* make sure the caller can't fake this as we depend on this */ + InputBufferLength = 0; + } + } + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if (!NT_SUCCESS(Status)) + { + DPRINT("Probing the buffers failed!\n"); + return Status; + } + } + + /* Don't check for access rights right now, KernelMode can do anything */ Status = ObReferenceObjectByHandle(DeviceHandle, - (IoControlCode >> 14) & 0x3, + 0, IoFileObjectType, PreviousMode, (PVOID *) &FileObject, - NULL); + &HandleInformation); if (!NT_SUCCESS(Status)) return Status; + /* Check for sufficient access rights */ + if (PreviousMode != KernelMode) + { + ACCESS_MASK DesiredAccess = (ACCESS_MASK)((IoControlCode >> 14) & 3); + if (DesiredAccess != FILE_ANY_ACCESS && + !RtlAreAllAccessesGranted(HandleInformation.GrantedAccess, + (ACCESS_MASK)((IoControlCode >> 14) & 3))) + { + DPRINT1("Insufficient access rights! Granted: 0x%x Desired: 0x%x\n", + HandleInformation.GrantedAccess, (ACCESS_MASK)((IoControlCode >> 14) & 3)); + ObDereferenceObject (FileObject); + return STATUS_ACCESS_DENIED; + } + } + /* Check for an event */ if (Event) { @@ -605,6 +674,19 @@ EventObject, IoStatusBlock); + if (Irp == NULL) + { + DPRINT1("IoBuildDeviceIoControlRequest failed!\n"); + + if (EventObject != NULL) + { + ObDereferenceObject (EventObject); + } + + ObDereferenceObject (FileObject); + return STATUS_INSUFFICIENT_RESOURCES; + } + /* Set some extra settings */ Irp->Tail.Overlay.OriginalFileObject = FileObject; Irp->RequestorMode = PreviousMode; @@ -2917,9 +2999,10 @@ PDEVICE_OBJECT DeviceObject; PIO_STACK_LOCATION StackPtr; KPROCESSOR_MODE PreviousMode; - BOOLEAN LocalEvent = FALSE; PKEVENT EventObject = NULL; LARGE_INTEGER CapturedByteOffset; + ULONG CapturedKey = 0; + BOOLEAN Synchronous = FALSE; DPRINT("NtReadFile(FileHandle 0x%p Buffer 0x%p Length %x ByteOffset 0x%p, " "IoStatusBlock 0x%p)\n", FileHandle, Buffer, Length, ByteOffset, @@ -2945,6 +3028,10 @@ { CapturedByteOffset = ProbeForReadLargeInteger(ByteOffset); } + if (Key != NULL) + { + CapturedKey = ProbeForReadUlong(Key); + } /* FIXME - probe other pointers and capture information */ } _SEH_HANDLE @@ -2961,6 +3048,10 @@ { CapturedByteOffset = *ByteOffset; } + if (Key != NULL) + { + CapturedKey = *Key; + } } /* Get File Object */ @@ -2972,23 +3063,29 @@ NULL); if (!NT_SUCCESS(Status)) return Status; - /* Check the Byte Offset */ - if (ByteOffset == NULL || - (CapturedByteOffset.u.LowPart == FILE_USE_FILE_POINTER_POSITION && - CapturedByteOffset.u.HighPart == -1)) + /* Check if we should use Sync IO or not */ + if (FileObject->Flags & FO_SYNCHRONOUS_IO) { - /* a valid ByteOffset is required if asynch. op. */ - if (!(FileObject->Flags & FO_SYNCHRONOUS_IO)) + if (ByteOffset == NULL || + (CapturedByteOffset.u.LowPart == FILE_USE_FILE_POINTER_POSITION && + CapturedByteOffset.u.HighPart == -1)) { - DPRINT1("NtReadFile: missing ByteOffset for asynch. op\n"); - ObDereferenceObject(FileObject); - return STATUS_INVALID_PARAMETER; + /* Use the Current Byte OFfset */ + CapturedByteOffset = FileObject->CurrentByteOffset; } - /* Use the Current Byte OFfset */ - CapturedByteOffset = FileObject->CurrentByteOffset; + Synchronous = TRUE; } + else if (ByteOffset == NULL && !(FileObject->Flags & FO_NAMED_PIPE)) + { + /* a valid ByteOffset is required if asynch. op. */ + DPRINT1("NtReadFile: missing ByteOffset for asynch. op (0x%p)\n", + ByteOffset); + ObDereferenceObject(FileObject); + return STATUS_INVALID_PARAMETER; + } + /* Check for event */ if (Event) { @@ -3017,16 +3114,7 @@ DeviceObject = IoGetRelatedDeviceObject(FileObject); } - /* Check if we should use Sync IO or not */ - if (FileObject->Flags & FO_SYNCHRONOUS_IO) - { - /* Use File Object event */ - KeClearEvent(&FileObject->Event); - } - else - { - LocalEvent = TRUE; - } + KeClearEvent(&FileObject->Event); /* Create the IRP */ _SEH_TRY @@ -3038,6 +3126,7 @@ &CapturedByteOffset, EventObject, IoStatusBlock); + if (Irp == NULL) { Status = STATUS_INSUFFICIENT_RESOURCES; @@ -3073,13 +3162,13 @@ /* Setup Stack Data */ StackPtr = IoGetNextIrpStackLocation(Irp); StackPtr->FileObject = FileObject; - StackPtr->Parameters.Read.Key = Key ? *Key : 0; + StackPtr->Parameters.Read.Key = CapturedKey; /* Call the Driver */ Status = IoCallDriver(DeviceObject, Irp); if (Status == STATUS_PENDING) { - if (!LocalEvent) + if (Synchronous) { KeWaitForSingleObject(&FileObject->Event, Executive, @@ -3679,7 +3768,7 @@ PDEVICE_OBJECT DeviceObject; PIO_STACK_LOCATION StackPtr; KPROCESSOR_MODE PreviousMode; - BOOLEAN LocalEvent = FALSE; + BOOLEAN Synchronous = FALSE; PKEVENT EventObject = NULL; LARGE_INTEGER CapturedByteOffset; ULONG CapturedKey = 0; @@ -3694,9 +3783,32 @@ PreviousMode = KeGetPreviousMode(); CapturedByteOffset.QuadPart = 0; + /* Get File Object */ + Status = ObReferenceObjectByHandle(FileHandle, + 0, + IoFileObjectType, + PreviousMode, + (PVOID*)&FileObject, + &ObjectHandleInfo); + if (!NT_SUCCESS(Status)) return Status; + + /* If this is a named pipe, make sure we don't ask for FILE_APPEND_DATA as it + overlaps with the FILE_CREATE_PIPE_INSTANCE access right! */ + if (!(FileObject->Flags & FO_NAMED_PIPE)) + DesiredAccess |= FILE_APPEND_DATA; + /* Validate User-Mode Buffers */ if(PreviousMode != KernelMode) { + /* check if the handle has either FILE_WRITE_DATA or FILE_APPEND_DATA was + granted. */ + if (!RtlAreAnyAccessesGranted(ObjectHandleInfo.GrantedAccess, + DesiredAccess)) + { + ObDereferenceObject(FileObject); + return STATUS_ACCESS_DENIED; + } + _SEH_TRY { ProbeForWrite(IoStatusBlock, @@ -3736,62 +3848,35 @@ } } - /* Get File Object */ - Status = ObReferenceObjectByHandle(FileHandle, - 0, - IoFileObjectType, - PreviousMode, - (PVOID*)&FileObject, - &ObjectHandleInfo); - if (!NT_SUCCESS(Status)) return Status; - - /* check if the handle has either FILE_WRITE_DATA or FILE_APPEND_DATA was - granted. However, if this is a named pipe, make sure we don't ask for - FILE_APPEND_DATA as it interferes with the FILE_CREATE_PIPE_INSTANCE - access right! */ - if (!(FileObject->Flags & FO_NAMED_PIPE)) - DesiredAccess |= FILE_APPEND_DATA; - if (!RtlAreAnyAccessesGranted(ObjectHandleInfo.GrantedAccess, - DesiredAccess)) + /* check if this is an append operation */ + if ((ObjectHandleInfo.GrantedAccess & DesiredAccess) == FILE_APPEND_DATA) { - ObDereferenceObject(FileObject); - return STATUS_ACCESS_DENIED; + /* Give the drivers something to understand */ + CapturedByteOffset.u.LowPart = FILE_WRITE_TO_END_OF_FILE; + CapturedByteOffset.u.HighPart = -1; } - /* Check if we got write Access */ - if (ObjectHandleInfo.GrantedAccess & FILE_WRITE_DATA) + /* Check if we should use Sync IO or not */ + if (FileObject->Flags & FO_SYNCHRONOUS_IO) { - /* Check the Byte Offset */ if (ByteOffset == NULL || (CapturedByteOffset.u.LowPart == FILE_USE_FILE_POINTER_POSITION && CapturedByteOffset.u.HighPart == -1)) { - /* a valid ByteOffset is required if asynch. op. */ - if (!(FileObject->Flags & FO_SYNCHRONOUS_IO)) - { - DPRINT1("NtReadFile: missing ByteOffset for asynch. op\n"); - ObDereferenceObject(FileObject); - return STATUS_INVALID_PARAMETER; - } - /* Use the Current Byte OFfset */ CapturedByteOffset = FileObject->CurrentByteOffset; } + + Synchronous = TRUE; } - else if ((ObjectHandleInfo.GrantedAccess & FILE_APPEND_DATA) && - !(FileObject->Flags & FO_NAMED_PIPE)) + else if (ByteOffset == NULL && !(FileObject->Flags & FO_NAMED_PIPE)) { /* a valid ByteOffset is required if asynch. op. */ - if (!(FileObject->Flags & FO_SYNCHRONOUS_IO)) - { - DPRINT1("NtWriteFile: missing ByteOffset for asynch. op\n"); - ObDereferenceObject(FileObject); - return STATUS_INVALID_PARAMETER; - } + DPRINT1("NtReadFile: missing ByteOffset for asynch. op (0x%p)\n", + ByteOffset); - /* Give the drivers somethign to understand */ - CapturedByteOffset.u.LowPart = FILE_WRITE_TO_END_OF_FILE; - CapturedByteOffset.u.HighPart = 0xffffffff; + ObDereferenceObject(FileObject); + return STATUS_INVALID_PARAMETER; } /* Check if we got an event */ @@ -3822,16 +3907,7 @@ DeviceObject = IoGetRelatedDeviceObject(FileObject); } - /* Check if we should use Sync IO or not */ - if (FileObject->Flags & FO_SYNCHRONOUS_IO) - { - /* Use File Object event */ - KeClearEvent(&FileObject->Event); - } - else - { - LocalEvent = TRUE; - } + KeClearEvent(&FileObject->Event); /* Build the IRP */ _SEH_TRY @@ -3888,7 +3964,7 @@ Status = IoCallDriver(DeviceObject, Irp); if (Status == STATUS_PENDING) { - if (!LocalEvent) + if (Synchronous) { KeWaitForSingleObject(&FileObject->Event, Executive,

18 years, 8 months

[ion] 20930: * Add more PSDK defintions to asm.h

by ion＠svn.reactos.org

* Add more PSDK defintions to asm.h * Use these new definitions instead of constants in syscall.S * Document the macros using doxygen-compatible format, and convert SET_TF_DEBUG_HEADER to as macro instead of CPP macro. * Use SET_TF_DEBUG_HEADER in system call handlers instead of duplicating the code. Modified: trunk/reactos/include/ndk/asm.h Modified: trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S Modified: trunk/reactos/ntoskrnl/ke/i386/syscall.S _____ Modified: trunk/reactos/include/ndk/asm.h --- trunk/reactos/include/ndk/asm.h 2006-01-17 01:22:21 UTC (rev 20929) +++ trunk/reactos/include/ndk/asm.h 2006-01-17 03:00:21 UTC (rev 20930) @@ -361,6 +361,20 @@ #endif // +// System Call Table definitions +// +#define NUMBER_SERVICE_TABLES 0x0002 +#define SERVICE_NUMBER_MASK 0x0FFF +#define SERVICE_TABLE_SHIFT 0x0008 +#define SERVICE_TABLE_MASK 0x0010 +#define SERVICE_TABLE_TEST 0x0010 +#define SERVICE_DESCRIPTOR_BASE 0x0000 +#define SERVICE_DESCRIPTOR_COUNT 0x0004 +#define SERVICE_DESCRIPTOR_LIMIT 0x0008 +#define SERVICE_DESCRIPTOR_NUMBER 0x000C +#define SERVICE_DESCRIPTOR_LENGTH 0x0010 + +// // Generic Definitions // #define MAXIMUM_IDTVECTOR 0xFF _____ Modified: trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S --- trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S 2006-01-17 01:22:21 UTC (rev 20929) +++ trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S 2006-01-17 03:00:21 UTC (rev 20930) @@ -46,30 +46,40 @@ #endif // -// SET_TF_DEBUG_HEADER +// @name SET_TF_DEBUG_HEADER +// // This macro sets up the debug header in the trap frame. -// Assumptions: -// ebp = PKTRAP_FRAME -// edi/ebx = Have been saved and can be used // -#define SET_TF_DEBUG_HEADER \ - /* Get the Debug Trap Frame EBP/EIP */ \ - mov ebx, [ebp+KTRAP_FRAME_EBP]; \ - mov edi, [ebp+KTRAP_FRAME_EIP]; \ -\ - /* Write the debug data */ \ - mov [ebp+KTRAP_FRAME_DEBUGPOINTER], edx; \ - mov dword ptr [ebp+KTRAP_FRAME_DEBUGARGMARK], 0xBADB0D00; \ - mov [ebp+KTRAP_FRAME_DEBUGEBP], ebx; \ - mov [ebp+KTRAP_FRAME_DEBUGEIP], edi; +// @param None. +// +// @remark ebp = PKTRAP_FRAME. +// edi/ebx = Have been saved and can be used. +// +.macro SET_TF_DEBUG_HEADER + /* Get the Debug Trap Frame EBP/EIP */ + mov ebx, [ebp+KTRAP_FRAME_EBP] + mov edi, [ebp+KTRAP_FRAME_EIP] + /* Write the debug data */ + mov [ebp+KTRAP_FRAME_DEBUGPOINTER], edx + mov dword ptr [ebp+KTRAP_FRAME_DEBUGARGMARK], 0xBADB0D00 + mov [ebp+KTRAP_FRAME_DEBUGEBP], ebx + mov [ebp+KTRAP_FRAME_DEBUGEIP], edi +.endm + // -// These macros help with USer-Mode APC delivery after exiting a trap. -// -// CHECK_FOR_APC_DELIVER +// @name CHECK_FOR_APC_DELIVER +// // This macro checks if the trapframe indicates a return to user-mode, // and, if so, checks if user-mode APCs should be delivered. // +// @param PreserveEax +// Determines if EAX should be preserved. Implies that the segment +// registers will also be saved. +// +// @remark ebp = PKTRAP_FRAME. +// ebx = Saved and will be used. +// .macro CHECK_FOR_APC_DELIVER PreserveEax /* Check for V86 mode */ test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK @@ -129,26 +139,28 @@ 2: .endm - // -// These macros control common execution paths for Traps and System Call Code -// -// TRAP_PROLOG +// @name TRAP_PROLOG +// // This macro creates a standard trap entry prologue. // It should be used for entry into any kernel trap (KiTrapXx), but not for // system calls, which require special handling. // -// Use as follows: -// _KiTrap00: -// /* Push fake error code */ -// push 0 +// @param Label +// Identifying name of the caller function; will be used to append +// to the name V86 and DR helper functions, which must already exist. // -// /* Enter common prologue */ -// TRAP_PROLOG(0) +// @remark Use as follows: +// _KiTrap00: +// /* Push fake error code */ +// push 0 // -// /* Handle trap */ -// <Your Trap Code Here> +// /* Enter common prologue */ +// TRAP_PROLOG(0) // +// /* Handle trap */ +// <Your Trap Code Here> +// #define TRAP_PROLOG(Label) \ /* Just to be safe, clear out the HIWORD, since it's reserved */ \ mov word ptr [esp+2], 0; \ _____ Modified: trunk/reactos/ntoskrnl/ke/i386/syscall.S --- trunk/reactos/ntoskrnl/ke/i386/syscall.S 2006-01-17 01:22:21 UTC (rev 20929) +++ trunk/reactos/ntoskrnl/ke/i386/syscall.S 2006-01-17 03:00:21 UTC (rev 20930) @@ -238,24 +238,20 @@ mov ebx, [esi+KTHREAD_TRAP_FRAME] mov [ebp+KTRAP_FRAME_EDX], ebx -// ==================== COMMON DR SAVE CHECK.AND DEBUG FRAME SETUP ============// /* Flush DR7 */ and dword ptr [ebp+KTRAP_FRAME_DR7], 0 /* Check if the thread was being debugged */ test byte ptr [esi+KTHREAD_DEBUG_ACTIVE], 0xFF - cld //jnz Dr_kss_a - /* Save a pointer to the trap frame in the TCB */ SharedCode: mov [esi+KTHREAD_TRAP_FRAME], ebp - /* Get the Debug Trap Frame EBP/EIP */ - mov ebx, [ebp+KTRAP_FRAME_EBP] - mov edi, [ebp+KTRAP_FRAME_EIP] + /* Set the trap frame debug header */ + SET_TF_DEBUG_HEADER -#ifdef DBG +#ifdef DBG // FIXME: Is this for GDB? Can it be moved in the stub? /* * We want to know the address from where the syscall stub was called. * If PrevMode is KernelMode, that address is stored in our own (kernel) @@ -269,15 +265,9 @@ jz PrevWasKernelMode mov edi, [edi+4] PrevWasKernelMode: + mov [ebp+KTRAP_FRAME_DEBUGEIP], edi #endif - /* Write the debug data */ - mov [ebp+KTRAP_FRAME_DEBUGPOINTER], edx - mov dword ptr [ebp+KTRAP_FRAME_DEBUGARGMARK], 0xBADB0D00 - mov [ebp+KTRAP_FRAME_DEBUGEBP], ebx - mov [ebp+KTRAP_FRAME_DEBUGEIP], edi - -// ============= END OF COMMON DR SAVE CHECK.AND DEBUG FRAME SETUP ============// /* Enable interrupts */ sti @@ -288,8 +278,8 @@ * The offset is related to the Table Index as such: Offset = TableIndex x 10 */ mov edi, eax - shr edi, 8 - and edi, 0x10 + shr edi, SERVICE_TABLE_SHIFT + and edi, SERVICE_TABLE_MASK mov ecx, edi /* Now add the thread's base system table to the offset */ @@ -297,8 +287,8 @@ /* Get the true syscall ID and check it */ mov ebx, eax - and eax, 0xFFF - cmp eax, [edi+8] + and eax, SERVICE_NUMBER_MASK + cmp eax, [edi+SERVICE_DESCRIPTOR_LIMIT] /* Invalid ID, try to load Win32K Table */ jnb KiBBTUnexpectedRange @@ -307,7 +297,7 @@ // <== We don't have a KeGdiFlushUserBatch callback yet (needs to be // sent through the PsInitializeWin32Callouts structure) /* Check if this was Win32K */ - cmp ecx, 0x10 + cmp ecx, SERVICE_TABLE_TEST jnz NotWin32K /* Get the TEB */ @@ -332,7 +322,7 @@ #ifdef DBG /* Increase per-syscall count */ - mov ecx, [edi+4] + mov ecx, [edi+SERVICE_DESCRIPTOR_COUNT] jecxz NoCountTable inc dword ptr [ecx+eax*4] #endif @@ -342,12 +332,12 @@ mov esi, edx /* Allocate room for argument list from kernel stack */ - mov ebx, [edi+12] + mov ebx, [edi+SERVICE_DESCRIPTOR_NUMBER] xor ecx, ecx mov cl, [eax+ebx] /* Get pointer to function */ - mov edi, [edi] + mov edi, [edi+SERVICE_DESCRIPTOR_BASE] mov ebx, [edi+eax*4] /* Allocate space on our stack */

18 years, 8 months

[ion] 20929: * Use macro for APC-delivery.

by ion＠svn.reactos.org

* Use macro for APC-delivery. * Mark function start/endings for the compiler. Modified: trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S Modified: trunk/reactos/ntoskrnl/ke/i386/syscall.S Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s _____ Modified: trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S --- trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S 2006-01-17 00:13:11 UTC (rev 20928) +++ trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S 2006-01-17 01:22:21 UTC (rev 20929) @@ -64,6 +64,73 @@ mov [ebp+KTRAP_FRAME_DEBUGEIP], edi; // +// These macros help with USer-Mode APC delivery after exiting a trap. +// +// CHECK_FOR_APC_DELIVER +// This macro checks if the trapframe indicates a return to user-mode, +// and, if so, checks if user-mode APCs should be delivered. +// +.macro CHECK_FOR_APC_DELIVER PreserveEax + /* Check for V86 mode */ + test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK + jnz 1f + + /* Deliver APCs only if we were called from user mode */ + test byte ptr [ebp+KTRAP_FRAME_CS], 1 + je 2f + + /* Get the current thread */ +1: + mov ebx, [fs:KPCR_CURRENT_THREAD] + + /* Make it non-alerted */ + mov byte ptr [ebx+KTHREAD_ALERTED], 0 + + /* And only if any are actually pending */ + cmp byte ptr [ebx+KTHREAD_PENDING_USER_APC], 0 + je 2f + + /* Save pointer to Trap Frame */ + mov ebx, ebp + +.if \PreserveEax + /* Save some stuff that raising IRQL will kill */ + mov [ebx+KTRAP_FRAME_EAX], eax + mov dword ptr [ebx+KTRAP_FRAME_FS], KGDT_R3_TEB + RPL_MASK + mov dword ptr [ebx+KTRAP_FRAME_DS], KGDT_R3_DATA + RPL_MASK + mov dword ptr [ebx+KTRAP_FRAME_ES], KGDT_R3_DATA + RPL_MASK + mov dword ptr [ebx+KTRAP_FRAME_GS], 0 +.endif + + /* Raise IRQL to APC_LEVEL */ + mov ecx, 1 + call @KfRaiseIrql@4 + + /* Save old IRQL */ + push eax + + /* Deliver APCs */ + sti + push ebx + push 0 + push UserMode + call _KiDeliverApc@12 + + /* Return to old IRQL */ + pop ecx + call @KfLowerIrql@4 + + /* Restore EAX (only in volatile case) */ +.if \PreserveEax + mov eax, [ebx+KTRAP_FRAME_EAX] +.endif + cli + jmp 1b +2: +.endm + + +// // These macros control common execution paths for Traps and System Call Code // // TRAP_PROLOG _____ Modified: trunk/reactos/ntoskrnl/ke/i386/syscall.S --- trunk/reactos/ntoskrnl/ke/i386/syscall.S 2006-01-17 00:13:11 UTC (rev 20928) +++ trunk/reactos/ntoskrnl/ke/i386/syscall.S 2006-01-17 01:22:21 UTC (rev 20929) @@ -107,6 +107,7 @@ push 0 jmp _KiTrap6 +.func KiFastCallEntry _KiFastCallEntry: // ==================== UNIQUE SYSENTER STUB. DO NOT DUPLICATE ============// @@ -186,7 +187,9 @@ /* Jump to shared code or DR Save */ //jnz Dr_FastCallDrSave jmp SharedCode +.endfunc +.func KiSystemService _KiSystemService: // ==================== UNIQUE SYSCALL TRAP ENTRY DO NOT DUPLICATE ============// @@ -421,68 +424,16 @@ /* Restore the old trap frame pointer */ mov edx, [ebp+KTRAP_FRAME_EDX] mov [ecx+KTHREAD_TRAP_FRAME], edx +.endfunc +.func KiServiceExit _KiServiceExit: /* Disable interrupts */ cli -// ================= COMMON USER-MODE APC DELIVERY CHECK ============// - /* Check for V86 mode */ - test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK - jnz ApcLoop + /* Check for, and deliver, User-Mode APCs if needed */ + CHECK_FOR_APC_DELIVER 1 - /* Deliver APCs only if we were called from user mode */ - test byte ptr [ebp+KTRAP_FRAME_CS], 1 - je KiRosTrapReturn - - /* Get the current thread */ -ApcLoop: - mov ebx, [fs:KPCR_CURRENT_THREAD] - - /* Make it non-alerted */ - mov byte ptr [ebx+KTHREAD_ALERTED], 0 - - /* And only if any are actually pending */ - cmp byte ptr [ebx+KTHREAD_PENDING_USER_APC], 0 - je KiRosTrapReturn - - /* Save pointer to Trap Frame */ - mov ebx, ebp - -// ================= PRESENT ONLY IF VOLATILES NEEDED ============// - /* Save some stuff that raising IRQL will kill */ - mov [ebx+KTRAP_FRAME_EAX], eax - mov dword ptr [ebx+KTRAP_FRAME_FS], KGDT_R3_TEB + RPL_MASK - mov dword ptr [ebx+KTRAP_FRAME_DS], KGDT_R3_DATA + RPL_MASK - mov dword ptr [ebx+KTRAP_FRAME_ES], KGDT_R3_DATA + RPL_MASK - mov dword ptr [ebx+KTRAP_FRAME_GS], 0 -// ============= END PRESENT ONLY IF VOLATILES NEEDED ============// - - /* Raise IRQL to APC_LEVEL */ - mov ecx, 1 - call @KfRaiseIrql@4 - - /* Save old IRQL */ - push eax - - /* Deliver APCs */ - sti - push ebx - push 0 - push UserMode - call _KiDeliverApc@12 - - /* Return to old IRQL */ - pop ecx - call @KfLowerIrql@4 - - /* Restore EAX (only in volatile case) */ - mov eax, [ebx+KTRAP_FRAME_EAX] - cli - jmp ApcLoop -// ============== END COMMON USER-MODE APC DELIVERY CHECK ============// - -KiRosTrapReturn: // ========================= COMMON TRAP EXIT CODE ===================// #ifdef DBG /* Assert the flags */ @@ -778,55 +729,17 @@ /* Invalid System Call */ mov eax, STATUS_INVALID_SYSTEM_SERVICE jmp KeReturnFromSystemCall +.endfunc +.func KiServiceExit2 _KiServiceExit2: /* Disable interrupts */ cli - /* Check for V86 mode */ - test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK - jnz ApcLoop2 + /* Check for, and deliver, User-Mode APCs if needed */ + CHECK_FOR_APC_DELIVER 0 - /* Deliver APCs only if we were called from user mode */ - test byte ptr [ebp+KTRAP_FRAME_CS], 1 - je KiRosTrapReturn2 - - /* Get the current thread */ -ApcLoop2: - mov ebx, [fs:KPCR_CURRENT_THREAD] - - /* Make it non-alerted */ - mov byte ptr [ebx+KTHREAD_ALERTED], 0 - - /* And only if any are actually pending */ - cmp byte ptr [ebx+KTHREAD_PENDING_USER_APC], 0 - je KiRosTrapReturn2 - - /* Save pointer to Trap Frame */ - mov ebx, ebp - - /* Raise IRQL to APC_LEVEL */ - mov ecx, 1 - call @KfRaiseIrql@4 - - /* Save old IRQL */ - push eax - - /* Deliver APCs */ - sti - push ebx - push 0 - push UserMode - call _KiDeliverApc@12 - - /* Return to old IRQL */ - pop ecx - call @KfLowerIrql@4 - cli - jmp ApcLoop2 - -KiRosTrapReturn2: #ifdef DBG /* Assert the flags */ pushfd @@ -1028,57 +941,19 @@ //jz VdmProc /* Exit through common routine */ - jmp Kei386EoiHelper@0 + jmp _Kei386EoiHelper@0 +.endfunc -.globl Kei386EoiHelper@0 -Kei386EoiHelper@0: +.globl _Kei386EoiHelper@0 +.func Kei386EoiHelper@0 +_Kei386EoiHelper@0: /* Disable interrupts */ cli - /* Check for V86 mode */ - test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK - jnz ApcLoop3 + /* Check for, and deliver, User-Mode APCs if needed */ + CHECK_FOR_APC_DELIVER 0 - /* Deliver APCs only if we were called from user mode */ - test byte ptr [ebp+KTRAP_FRAME_CS], 1 - je KiRosTrapReturn3 - - /* Get the current thread */ -ApcLoop3: - mov ebx, [fs:KPCR_CURRENT_THREAD] - - /* Make it non-alerted */ - mov byte ptr [ebx+KTHREAD_ALERTED], 0 - - /* And only if any are actually pending */ - cmp byte ptr [ebx+KTHREAD_PENDING_USER_APC], 0 - je KiRosTrapReturn3 - - /* Save pointer to Trap Frame */ - mov ebx, ebp - - /* Raise IRQL to APC_LEVEL */ - mov ecx, 1 - call @KfRaiseIrql@4 - - /* Save old IRQL */ - push eax - - /* Deliver APCs */ - sti - push ebx - push 0 - push UserMode - call _KiDeliverApc@12 - - /* Return to old IRQL */ - pop ecx - call @KfLowerIrql@4 - cli - jmp ApcLoop3 - -KiRosTrapReturn3: #ifdef DBG /* Assert the flags */ pushfd @@ -1210,6 +1085,7 @@ pop ebp mov esp, [esp] iret +.endfunc .globl _NtRaiseException@12 _NtRaiseException@12: _____ Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s --- trunk/reactos/ntoskrnl/ke/i386/trap.s 2006-01-17 00:13:11 UTC (rev 20928) +++ trunk/reactos/ntoskrnl/ke/i386/trap.s 2006-01-17 01:22:21 UTC (rev 20929) @@ -43,7 +43,7 @@ cmp eax, 1 /* Return to caller */ - jne Kei386EoiHelper@0 + jne _Kei386EoiHelper@0 jmp _KiV86Complete .globl _KiTrap1 @@ -64,7 +64,7 @@ cmp eax, 1 /* Return to caller */ - jne Kei386EoiHelper@0 + jne _Kei386EoiHelper@0 jmp _KiV86Complete .globl _KiTrap2 @@ -85,7 +85,7 @@ cmp eax, 1 /* Return to caller */ - jne Kei386EoiHelper@0 + jne _Kei386EoiHelper@0 jmp _KiV86Complete .globl _KiTrap3 @@ -106,7 +106,7 @@ cmp eax, 1 /* Return to caller */ - jne Kei386EoiHelper@0 + jne _Kei386EoiHelper@0 jmp _KiV86Complete .globl _KiTrap4 @@ -127,7 +127,7 @@ cmp eax, 1 /* Return to caller */ - jne Kei386EoiHelper@0 + jne _Kei386EoiHelper@0 jmp _KiV86Complete .globl _KiTrap5 @@ -148,7 +148,7 @@ cmp eax, 1 /* Return to caller */ - jne Kei386EoiHelper@0 + jne _Kei386EoiHelper@0 jmp _KiV86Complete .globl _KiTrap6 @@ -169,7 +169,7 @@ cmp eax, 1 /* Return to caller */ - jne Kei386EoiHelper@0 + jne _Kei386EoiHelper@0 jmp _KiV86Complete .globl _KiTrap7 @@ -190,7 +190,7 @@ cmp eax, 1 /* Return to caller */ - jne Kei386EoiHelper@0 + jne _Kei386EoiHelper@0 jmp _KiV86Complete .globl _KiTrap8 @@ -216,7 +216,7 @@ cmp eax, 1 /* Return to caller */ - jne Kei386EoiHelper@0 + jne _Kei386EoiHelper@0 jmp _KiV86Complete .globl _KiTrap10 @@ -234,7 +234,7 @@ cmp eax, 1 /* Return to caller */ - jne Kei386EoiHelper@0 + jne _Kei386EoiHelper@0 jmp _KiV86Complete .globl _KiTrap11 @@ -252,7 +252,7 @@ cmp eax, 1 /* Return to caller */ - jne Kei386EoiHelper@0 + jne _Kei386EoiHelper@0 jmp _KiV86Complete .globl _KiTrap12 @@ -270,7 +270,7 @@ cmp eax, 1 /* Return to caller */ - jne Kei386EoiHelper@0 + jne _Kei386EoiHelper@0 jmp _KiV86Complete .globl _KiTrap13 @@ -288,7 +288,7 @@ cmp eax, 1 /* Return to caller */ - jne Kei386EoiHelper@0 + jne _Kei386EoiHelper@0 jmp _KiV86Complete .globl _KiTrap14 @@ -306,7 +306,7 @@ cmp eax, 1 /* Return to caller */ - jne Kei386EoiHelper@0 + jne _Kei386EoiHelper@0 jmp _KiV86Complete .globl _KiTrap15 @@ -327,7 +327,7 @@ cmp eax, 1 /* Return to caller */ - jne Kei386EoiHelper@0 + jne _Kei386EoiHelper@0 jmp _KiV86Complete .globl _KiTrap16 @@ -348,7 +348,7 @@ cmp eax, 1 /* Return to caller */ - jne Kei386EoiHelper@0 + jne _Kei386EoiHelper@0 jmp _KiV86Complete .globl _KiTrap17 @@ -369,7 +369,7 @@ cmp eax, 1 /* Return to caller */ - jne Kei386EoiHelper@0 + jne _Kei386EoiHelper@0 jmp _KiV86Complete .globl _KiTrap18 @@ -390,7 +390,7 @@ cmp eax, 1 /* Return to caller */ - jne Kei386EoiHelper@0 + jne _Kei386EoiHelper@0 jmp _KiV86Complete .globl _KiTrap19 @@ -411,7 +411,7 @@ cmp eax, 1 /* Return to caller */ - jne Kei386EoiHelper@0 + jne _Kei386EoiHelper@0 jmp _KiV86Complete .globl _KiTrapUnknown @@ -426,7 +426,7 @@ cmp eax, 1 /* Return to caller */ - jne Kei386EoiHelper@0 + jne _Kei386EoiHelper@0 jmp _KiV86Complete .globl _KiCoprocessorError@0

18 years, 8 months

[gedmurphy] 20928: make arrow available in 24x24

by gedmurphy＠svn.reactos.org

make arrow available in 24x24 Modified: trunk/reactos/subsys/system/explorer/res/arrow.ico _____ Modified: trunk/reactos/subsys/system/explorer/res/arrow.ico (Binary files differ)

18 years, 8 months

[cwittich] 20927: fixed a bug in IntSetMenuItemInfo

by cwittich＠svn.reactos.org

fixed a bug in IntSetMenuItemInfo Modified: trunk/reactos/subsys/win32k/ntuser/menu.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/menu.c --- trunk/reactos/subsys/win32k/ntuser/menu.c 2006-01-16 23:26:26 UTC (rev 20926) +++ trunk/reactos/subsys/win32k/ntuser/menu.c 2006-01-16 23:26:41 UTC (rev 20927) @@ -750,7 +750,8 @@ return FALSE; } - MenuItem->fType = lpmii->fType; + MenuItem->fType &= ~MENU_ITEM_TYPE(MenuItem->fType); + MenuItem->fType |= MENU_ITEM_TYPE(lpmii->fType); if(lpmii->fMask & MIIM_BITMAP) { @@ -777,7 +778,8 @@ FreeMenuText(MenuItem); RtlInitUnicodeString(&MenuItem->Text, NULL); } - MenuItem->fType = lpmii->fType; + MenuItem->fType &= ~MENU_ITEM_TYPE(MenuItem->fType); + MenuItem->fType |= MENU_ITEM_TYPE(lpmii->fType); } if(lpmii->fMask & MIIM_ID) {

18 years, 8 months

[gedmurphy] 20926: new recent docs icon

by gedmurphy＠svn.reactos.org

new recent docs icon Modified: trunk/reactos/subsys/system/explorer/res/recent-documents.ico _____ Modified: trunk/reactos/subsys/system/explorer/res/recent-documents.ico (Binary files differ)

18 years, 8 months

[cwittich] 20925: fix text align when using HBMMENU_CALLBACK (patch by Brezenbak)

by cwittich＠svn.reactos.org

fix text align when using HBMMENU_CALLBACK (patch by Brezenbak) Modified: trunk/reactos/lib/user32/windows/menu.c Modified: trunk/reactos/subsys/win32k/ntuser/menu.c _____ Modified: trunk/reactos/lib/user32/windows/menu.c --- trunk/reactos/lib/user32/windows/menu.c 2006-01-16 23:00:38 UTC (rev 20924) +++ trunk/reactos/lib/user32/windows/menu.c 2006-01-16 23:20:11 UTC (rev 20925) @@ -63,6 +63,7 @@ #define IS_MAGIC_ITEM(Bmp) ((int) Bmp <12) +#define MENU_ITEM_HBMP_SPACE (5) #define MENU_BAR_ITEMS_SPACE (12) #define SEPARATOR_HEIGHT (5) #define MENU_TAB_SPACE (8) @@ -763,6 +764,11 @@ Rect.left += MENU_BAR_ITEMS_SPACE / 2; Rect.right -= MENU_BAR_ITEMS_SPACE / 2; } + if (Item->hbmpItem == HBMMENU_CALLBACK || MenuInfo->maxBmpSize.cx != 0 ) + { + Rect.left += MenuInfo->maxBmpSize.cx; + Rect.right -= MenuInfo->maxBmpSize.cx; + } Text = (PWCHAR) Item->dwTypeData; for (i = 0; L'\0' != Text[i]; i++) @@ -784,7 +790,6 @@ } SetTextColor(Dc, RGB(0x80, 0x80, 0x80)); } - DrawTextW(Dc, Text, i, &Rect, uFormat); /* paint the shortcut text */ @@ -1130,7 +1135,7 @@ * Calculate the size of the menu item and store it in ItemInfo->rect. */ static void FASTCALL -MenuCalcItemSize(HDC Dc, PROSMENUITEMINFO ItemInfo, HWND WndOwner, +MenuCalcItemSize(HDC Dc, PROSMENUITEMINFO ItemInfo, PROSMENUINFO MenuInfo, HWND WndOwner, INT OrgX, INT OrgY, BOOL MenuBar) { PWCHAR p; @@ -1203,7 +1208,14 @@ measItem.itemData = ItemInfo->dwItemData; SendMessageW( WndOwner, WM_MEASUREITEM, ItemInfo->wID, (LPARAM)&measItem); ItemInfo->Rect.right = ItemInfo->Rect.left + measItem.itemWidth; - } + if (MenuInfo->maxBmpSize.cx < abs(measItem.itemWidth) + MENU_ITEM_HBMP_SPACE || + MenuInfo->maxBmpSize.cy < abs(measItem.itemHeight)) + { + MenuInfo->maxBmpSize.cx = abs(measItem.itemWidth) + MENU_ITEM_HBMP_SPACE; + MenuInfo->maxBmpSize.cy = abs(measItem.itemHeight); + MenuSetRosMenuInfo(MenuInfo); + } + } else { SIZE Size; @@ -1320,7 +1332,7 @@ break; } - MenuCalcItemSize(Dc, &ItemInfo, WndOwner, OrgX, OrgY, FALSE); + MenuCalcItemSize(Dc, &ItemInfo, MenuInfo, WndOwner, OrgX, OrgY, FALSE); if (! MenuSetRosMenuItemInfo(MenuInfo->Self, i, &ItemInfo)) { MenuCleanupRosMenuItemInfo(&ItemInfo); @@ -1426,7 +1438,7 @@ } DPRINT("calling MENU_CalcItemSize org=(%d, %d)\n", OrgX, OrgY); - MenuCalcItemSize(Dc, &ItemInfo, WndOwner, OrgX, OrgY, TRUE); + MenuCalcItemSize(Dc, &ItemInfo, MenuInfo, WndOwner, OrgX, OrgY, TRUE); if (! MenuSetRosMenuItemInfo(MenuInfo->Self, i, &ItemInfo)) { MenuCleanupRosMenuItemInfo(&ItemInfo); _____ Modified: trunk/reactos/subsys/win32k/ntuser/menu.c --- trunk/reactos/subsys/win32k/ntuser/menu.c 2006-01-16 23:00:38 UTC (rev 20924) +++ trunk/reactos/subsys/win32k/ntuser/menu.c 2006-01-16 23:20:11 UTC (rev 20925) @@ -486,7 +486,11 @@ (char *) &Menu->MenuInfo + sizeof(MENUINFO), lpmi->cbSize - sizeof(MENUINFO)); } - + if (sizeof(ROSMENUINFO) == lpmi->cbSize) + { + lpmi->maxBmpSize.cx = Menu->MenuInfo.maxBmpSize.cx; + lpmi->maxBmpSize.cy = Menu->MenuInfo.maxBmpSize.cy; + } return TRUE; } @@ -530,7 +534,11 @@ Menu->MenuInfo.WndOwner = lpmi->WndOwner; Menu->MenuInfo.TimeToHide = lpmi->TimeToHide; } - + if (sizeof(ROSMENUINFO) == lpmi->cbSize) + { + Menu->MenuInfo.maxBmpSize.cx = lpmi->maxBmpSize.cx; + Menu->MenuInfo.maxBmpSize.cy = lpmi->maxBmpSize.cy; + } return TRUE; }

18 years, 8 months

[mf] 20924: display icons of size 24x24 per default in the start menu root

by mf＠svn.reactos.org

display icons of size 24x24 per default in the start menu root Modified: trunk/reactos/subsys/system/explorer/explorer.cpp Modified: trunk/reactos/subsys/system/explorer/explorer_intres.rc Modified: trunk/reactos/subsys/system/explorer/globals.h Modified: trunk/reactos/subsys/system/explorer/resource.h Modified: trunk/reactos/subsys/system/explorer/shell/entries.cpp Modified: trunk/reactos/subsys/system/explorer/shell/entries.h Modified: trunk/reactos/subsys/system/explorer/taskbar/desktopbar.cpp Modified: trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp Modified: trunk/reactos/subsys/system/explorer/taskbar/startmenu.h Modified: trunk/reactos/subsys/system/explorer/utility/window.h _____ Modified: trunk/reactos/subsys/system/explorer/explorer.cpp --- trunk/reactos/subsys/system/explorer/explorer.cpp 2006-01-16 22:07:38 UTC (rev 20923) +++ trunk/reactos/subsys/system/explorer/explorer.cpp 2006-01-16 23:00:38 UTC (rev 20924) @@ -253,6 +253,13 @@ { } +Icon::Icon(ICON_ID id, UINT nid, int icon_size) + : _id(id), + _itype(IT_STATIC), + _hicon(ResIconEx(nid, icon_size, icon_size)) +{ +} + Icon::Icon(ICON_TYPE itype, int id, HICON hIcon) : _id((ICON_ID)id), _itype(itype), @@ -322,10 +329,10 @@ return ret; } -HBITMAP create_bitmap_from_icon(HICON hIcon, HBRUSH hbrush_bkgnd, HDC hdc_wnd/*, bool large_icons*/) +HBITMAP create_bitmap_from_icon(HICON hIcon, HBRUSH hbrush_bkgnd, HDC hdc_wnd/*, int icon_size*/) { - int cx = GetSystemMetrics(SM_CXSMICON); //ICON_SIZE_X; - int cy = GetSystemMetrics(SM_CYSMICON); //ICON_SIZE_Y; + int cx = ICON_SIZE_SMALL; + int cy = ICON_SIZE_SMALL; HBITMAP hbmp = CreateCompatibleBitmap(hdc_wnd, cx, cy); MemCanvas canvas; @@ -373,33 +380,35 @@ void IconCache::init() { + int icon_size = STARTMENUROOT_ICON_SIZE; + _icons[ICID_NONE] = Icon(IT_STATIC, ICID_NONE, (HICON)0); _icons[ICID_FOLDER] = Icon(ICID_FOLDER, IDI_FOLDER); //_icons[ICID_DOCUMENT] = Icon(ICID_DOCUMENT, IDI_DOCUMENT); _icons[ICID_EXPLORER] = Icon(ICID_EXPLORER, IDI_EXPLORER); - _icons[ICID_APP] = Icon(ICID_APP, IDI_APPICON); +// _icons[ICID_APP] = Icon(ICID_APP, IDI_APPICON); - _icons[ICID_CONFIG] = Icon(ICID_CONFIG, IDI_CONFIG); - _icons[ICID_DOCUMENTS] = Icon(ICID_DOCUMENTS, IDI_DOCUMENTS); - _icons[ICID_FAVORITES] = Icon(ICID_FAVORITES, IDI_FAVORITES); - _icons[ICID_INFO] = Icon(ICID_INFO, IDI_INFO); - _icons[ICID_APPS] = Icon(ICID_APPS, IDI_APPS); - _icons[ICID_SEARCH] = Icon(ICID_SEARCH, IDI_SEARCH); - _icons[ICID_ACTION] = Icon(ICID_ACTION, IDI_ACTION); - _icons[ICID_SEARCH_DOC] = Icon(ICID_SEARCH_DOC, IDI_SEARCH_DOC); - _icons[ICID_PRINTER] = Icon(ICID_PRINTER, IDI_PRINTER); - _icons[ICID_NETWORK] = Icon(ICID_NETWORK, IDI_NETWORK); - _icons[ICID_COMPUTER] = Icon(ICID_COMPUTER, IDI_COMPUTER); - _icons[ICID_LOGOFF] = Icon(ICID_LOGOFF, IDI_LOGOFF); - _icons[ICID_SHUTDOWN] = Icon(ICID_SHUTDOWN, IDI_SHUTDOWN); - _icons[ICID_BOOKMARK] = Icon(ICID_BOOKMARK, IDI_DOT_TRANS); - _icons[ICID_MINIMIZE] = Icon(ICID_MINIMIZE, IDI_MINIMIZE); - _icons[ICID_CONTROLPAN] = Icon(ICID_CONTROLPAN, IDI_CONTROLPAN); - _icons[ICID_DESKSETTING] = Icon(ICID_DESKSETTING, IDI_DESKSETTING); - _icons[ICID_NETCONNS] = Icon(ICID_NETCONNS, IDI_NETCONNS); - _icons[ICID_ADMINISTRATION] = Icon(ICID_ADMINISTRATION, IDI_ADMINISTRATION); - _icons[ICID_RECENT] = Icon(ICID_RECENT, IDI_RECENT); + _icons[ICID_CONFIG] = Icon(ICID_CONFIG, IDI_CONFIG, icon_size); + _icons[ICID_DOCUMENTS] = Icon(ICID_DOCUMENTS, IDI_DOCUMENTS, icon_size); + _icons[ICID_FAVORITES] = Icon(ICID_FAVORITES, IDI_FAVORITES, icon_size); + _icons[ICID_INFO] = Icon(ICID_INFO, IDI_INFO, icon_size); + _icons[ICID_APPS] = Icon(ICID_APPS, IDI_APPS, icon_size); + _icons[ICID_SEARCH] = Icon(ICID_SEARCH, IDI_SEARCH, icon_size); + _icons[ICID_ACTION] = Icon(ICID_ACTION, IDI_ACTION, icon_size); + _icons[ICID_SEARCH_DOC] = Icon(ICID_SEARCH_DOC, IDI_SEARCH_DOC, icon_size); + _icons[ICID_PRINTER] = Icon(ICID_PRINTER, IDI_PRINTER, icon_size); + _icons[ICID_NETWORK] = Icon(ICID_NETWORK, IDI_NETWORK, icon_size); + _icons[ICID_COMPUTER] = Icon(ICID_COMPUTER, IDI_COMPUTER, icon_size); + _icons[ICID_LOGOFF] = Icon(ICID_LOGOFF, IDI_LOGOFF, icon_size); + _icons[ICID_SHUTDOWN] = Icon(ICID_SHUTDOWN, IDI_SHUTDOWN, icon_size); + _icons[ICID_BOOKMARK] = Icon(ICID_BOOKMARK, IDI_DOT_TRANS, icon_size); + _icons[ICID_MINIMIZE] = Icon(ICID_MINIMIZE, IDI_MINIMIZE, icon_size); + _icons[ICID_CONTROLPAN] = Icon(ICID_CONTROLPAN, IDI_CONTROLPAN, icon_size); + _icons[ICID_DESKSETTING]= Icon(ICID_DESKSETTING,IDI_DESKSETTING,icon_size); + _icons[ICID_NETCONNS] = Icon(ICID_NETCONNS, IDI_NETCONNS, icon_size); + _icons[ICID_ADMIN] = Icon(ICID_ADMIN, IDI_ADMIN, icon_size); + _icons[ICID_RECENT] = Icon(ICID_RECENT, IDI_RECENT, icon_size); } @@ -437,10 +446,10 @@ if (flags & ICF_OPEN) shgfi_flags |= SHGFI_OPENICON; - if ((flags&(ICF_LARGE|ICF_OVERLAYS|ICF_HICON)) && !(flags&ICF_SYSCACHE)) { + if ((flags&(ICF_LARGE|ICF_MIDDLE|ICF_OVERLAYS|ICF_HICON)) && !(flags&ICF_SYSCACHE)) { shgfi_flags |= SHGFI_ICON; - if (!(flags & ICF_LARGE)) + if (!(flags & (ICF_LARGE|ICF_MIDDLE))) shgfi_flags |= SHGFI_SMALLICON; if (flags & ICF_OVERLAYS) @@ -510,11 +519,11 @@ HICON hIconLarge = 0; HICON hIcon; - bool large_icons = flags & ICF_LARGE; - HRESULT hr = pExtract->Extract(path, icon_idx, &hIconLarge, &hIcon, MAKELONG(GetSystemMetrics(SM_CXICON), ICON_SIZE_X)); + int icon_size = ICON_SIZE_FROM_ICF(flags); + HRESULT hr = pExtract->Extract(path, icon_idx, &hIconLarge, &hIcon, MAKELONG(GetSystemMetrics(SM_CXICON), icon_size)); if (hr == NOERROR) { //@@ oder SUCCEEDED(hr) ? - if (large_icons) { //@@ OK? + if (icon_size > ICON_SIZE_SMALL) { //@@ OK? if (hIcon) DestroyIcon(hIcon); _____ Modified: trunk/reactos/subsys/system/explorer/explorer_intres.rc --- trunk/reactos/subsys/system/explorer/explorer_intres.rc 2006-01-16 22:07:38 UTC (rev 20923) +++ trunk/reactos/subsys/system/explorer/explorer_intres.rc 2006-01-16 23:00:38 UTC (rev 20924) @@ -169,7 +169,7 @@ IDI_CONTROLPAN ICON DISCARDABLE "res/control-panel.ico" IDI_DESKSETTING ICON DISCARDABLE "res/desktop-settings.ico" IDI_NETCONNS ICON DISCARDABLE "res/network-conns.ico" -IDI_ADMINISTRATION ICON DISCARDABLE "res/administration.ico" +IDI_ADMIN ICON DISCARDABLE "res/administration.ico" IDI_RECENT ICON DISCARDABLE "res/recent-documents.ico" #endif // Neutral resources //////////////////////////////////////////////////////////////////////// ///// _____ Modified: trunk/reactos/subsys/system/explorer/globals.h --- trunk/reactos/subsys/system/explorer/globals.h 2006-01-16 22:07:38 UTC (rev 20923) +++ trunk/reactos/subsys/system/explorer/globals.h 2006-01-16 23:00:38 UTC (rev 20924) @@ -86,7 +86,7 @@ ICID_CONTROLPAN, ICID_DESKSETTING, ICID_NETCONNS, - ICID_ADMINISTRATION, + ICID_ADMIN, ICID_RECENT, ICID_DYNAMIC @@ -95,6 +95,7 @@ struct Icon { Icon(); Icon(ICON_ID id, UINT nid); + Icon(ICON_ID id, UINT nid, int icon_size); Icon(ICON_TYPE itype, int id, HICON hIcon); Icon(ICON_TYPE itype, int id, int sys_idx); @@ -157,12 +158,18 @@ }; -#define ICON_SIZE_X GetSystemMetrics(large_icons? SM_CXICON: SM_CXSMICON) -#define ICON_SIZE_Y GetSystemMetrics(large_icons? SM_CYICON: SM_CYSMICON) +#define ICON_SIZE_SMALL 16 // GetSystemMetrics(SM_CXSMICON) +#define ICON_SIZE_MIDDLE 24 // special size for start menu root icons +#define ICON_SIZE_LARGE 32 // GetSystemMetrics(SM_CXICON) +#define STARTMENUROOT_ICON_SIZE ICON_SIZE_MIDDLE // ICON_SIZE_LARGE +#define ICON_SIZE_FROM_ICF(flags) (flags&ICF_LARGE? ICON_SIZE_LARGE: flags&ICF_MIDDLE? ICON_SIZE_MIDDLE: ICON_SIZE_SMALL) +#define ICF_FROM_ICON_SIZE(size) (size>=ICON_SIZE_LARGE? ICF_LARGE: size>=ICON_SIZE_MIDDLE? ICF_MIDDLE: ICF_NORMAL) + + /// create a bitmap from an icon -extern HBITMAP create_bitmap_from_icon(HICON hIcon, HBRUSH hbrush_bkgnd, HDC hdc_wnd/*, bool large_icons*/); +extern HBITMAP create_bitmap_from_icon(HICON hIcon, HBRUSH hbrush_bkgnd, HDC hdc_wnd/*, int icon_size*/); /// add icon with alpha channel to imagelist using the specified background color extern int ImageList_AddAlphaIcon(HIMAGELIST himl, HICON hIcon, HBRUSH hbrush_bkgnd, HDC hdc_wnd); _____ Modified: trunk/reactos/subsys/system/explorer/resource.h --- trunk/reactos/subsys/system/explorer/resource.h 2006-01-16 22:07:38 UTC (rev 20923) +++ trunk/reactos/subsys/system/explorer/resource.h 2006-01-16 23:00:38 UTC (rev 20924) @@ -121,7 +121,7 @@ #define IDI_CONTROLPAN 173 #define IDI_DESKSETTING 174 #define IDI_NETCONNS 175 -#define IDI_ADMINISTRATION 176 +#define IDI_ADMIN 176 #define IDI_RECENT 178 #define ID_VIEW_NAME 401 #define ID_VIEW_ALL_ATTRIBUTES 402 _____ Modified: trunk/reactos/subsys/system/explorer/shell/entries.cpp --- trunk/reactos/subsys/system/explorer/shell/entries.cpp 2006-01-16 22:07:38 UTC (rev 20923) +++ trunk/reactos/subsys/system/explorer/shell/entries.cpp 2006-01-16 23:00:38 UTC (rev 20924) @@ -361,9 +361,9 @@ ICON_ID icon_id = ICID_NONE; - // not for ET_SHELL to display the correct desktop icon - if (_etype!=ET_SHELL && get_path(path, COUNTOF(path))) - icon_id = g_Globals._icon_cache.extract(path, flags); + if (_etype!=ET_SHELL && get_path(path, COUNTOF(path))) // not for ET_SHELL to display the correct desktop icon + if (!(flags & ICF_MIDDLE)) // not for ICF_MIDDLE to extract 24x24 icons because SHGetFileInfo() doesn't support this icon size + icon_id = g_Globals._icon_cache.extract(path, flags); if (icon_id == ICID_NONE) { if (!(flags & ICF_OVERLAYS)) { @@ -418,7 +418,7 @@ int shgfi_flags = SHGFI_PIDL; - if (!(flags & ICF_LARGE)) + if (!(flags & (ICF_LARGE|ICF_MIDDLE))) shgfi_flags |= SHGFI_SMALLICON; if (flags & ICF_OPEN) _____ Modified: trunk/reactos/subsys/system/explorer/shell/entries.h --- trunk/reactos/subsys/system/explorer/shell/entries.h 2006-01-16 22:07:38 UTC (rev 20923) +++ trunk/reactos/subsys/system/explorer/shell/entries.h 2006-01-16 23:00:38 UTC (rev 20924) @@ -65,11 +65,12 @@ enum ICONCACHE_FLAGS { ICF_NORMAL = 0, - ICF_LARGE = 1, - ICF_OPEN = 2, - ICF_OVERLAYS = 4, - ICF_HICON = 8, - ICF_SYSCACHE = 16 + ICF_MIDDLE = 1, + ICF_LARGE = 2, + ICF_OPEN = 4, + ICF_OVERLAYS = 8, + ICF_HICON = 16, + ICF_SYSCACHE = 32 }; #ifndef SHGFI_ADDOVERLAYS // missing in MinGW (as of 28.12.2005) _____ Modified: trunk/reactos/subsys/system/explorer/taskbar/desktopbar.cpp --- trunk/reactos/subsys/system/explorer/taskbar/desktopbar.cpp 2006-01-16 22:07:38 UTC (rev 20923) +++ trunk/reactos/subsys/system/explorer/taskbar/desktopbar.cpp 2006-01-16 23:00:38 UTC (rev 20924) @@ -161,7 +161,7 @@ RegisterHotkeys(); // prepare Startmenu, but hide it for now - _startMenuRoot = GET_WINDOW(StartMenuRoot, StartMenuRoot::Create(_hwnd, true)); //@@ _large_icons + _startMenuRoot = GET_WINDOW(StartMenuRoot, StartMenuRoot::Create(_hwnd, STARTMENUROOT_ICON_SIZE)); return 0; } _____ Modified: trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp --- trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp 2006-01-16 22:07:38 UTC (rev 20923) +++ trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp 2006-01-16 23:00:38 UTC (rev 20924) @@ -46,9 +46,9 @@ #define SHELLPATH_NET_CONNECTIONS TEXT("::{20D04FE0-3AEA-1069-A2D8-08002B30309D}\\::{21EC2020-3AEA-1069-A2 DD-08002B30309D}\\::{7007ACC7-3202-11D1-AAD2-00805FC1270E}") -StartMenu::StartMenu(HWND hwnd, bool large_icons) +StartMenu::StartMenu(HWND hwnd, int icon_size) : super(hwnd), - _large_icons(large_icons) + _icon_size(icon_size) { _next_id = IDC_FIRST_MENU; _submenu_id = 0; @@ -70,10 +70,10 @@ #endif } -StartMenu::StartMenu(HWND hwnd, const StartMenuCreateInfo& create_info, bool large_icons) +StartMenu::StartMenu(HWND hwnd, const StartMenuCreateInfo& create_info, int icon_size) : super(hwnd), _create_info(create_info), - _large_icons(large_icons) + _icon_size(icon_size) { for(StartMenuFolders::const_iterator it=create_info._folders.begin(); it!=create_info._folders.end(); ++it) if (*it) @@ -133,11 +133,11 @@ top_height = 0; } - bool large_icons = false; - RECT rect = {x, y-STARTMENU_LINE_HEIGHT-top_height, x+STARTMENU_WIDTH_MIN, y}; + int icon_size = ICON_SIZE_SMALL; + RECT rect = {x, y-STARTMENU_LINE_HEIGHT(icon_size)-top_height, x+STARTMENU_WIDTH_MIN, y}; #ifndef _LIGHT_STARTMENU - rect.top += STARTMENU_LINE_HEIGHT; + rect.top += STARTMENU_LINE_HEIGHT(icon_size); #endif AdjustWindowRectEx(&rect, style, FALSE, ex_style); @@ -391,7 +391,7 @@ if (_arrow_btns) { RECT rect_up, rect_down; - GetArrowButtonRects(&rect_up, &rect_down, _large_icons); + GetArrowButtonRects(&rect_up, &rect_down, _icon_size); SCROLL_MODE scroll_mode = SCROLL_NOT; @@ -515,8 +515,8 @@ int StartMenu::ButtonHitTest(POINT pt) { ClientRect clnt(_hwnd); - const bool large_icons = _large_icons; - RECT rect = {_border_left, _border_top, clnt.right, STARTMENU_LINE_HEIGHT}; + const int icon_size = _icon_size; + RECT rect = {_border_left, _border_top, clnt.right, STARTMENU_LINE_HEIGHT(icon_size)}; if (pt.x<rect.left || pt.x>rect.right) return 0; @@ -527,7 +527,7 @@ if (rect.top > pt.y) break; - rect.bottom = rect.top + (info._id==-1? STARTMENU_SEP_HEIGHT: STARTMENU_LINE_HEIGHT); + rect.bottom = rect.top + (info._id==-1? STARTMENU_SEP_HEIGHT(icon_size): STARTMENU_LINE_HEIGHT(icon_size)); if (rect.bottom > _bottom_max) break; @@ -547,13 +547,13 @@ return; ClientRect clnt(_hwnd); - const bool large_icons = _large_icons; - RECT rect = {_border_left, _border_top, clnt.right, STARTMENU_LINE_HEIGHT}; + const int icon_size = _icon_size; + RECT rect = {_border_left, _border_top, clnt.right, STARTMENU_LINE_HEIGHT(icon_size)}; for(SMBtnVector::const_iterator it=_buttons.begin()+_scroll_pos; it!=_buttons.end(); ++it) { const SMBtnInfo& info = *it; - rect.bottom = rect.top + (info._id==-1? STARTMENU_SEP_HEIGHT: STARTMENU_LINE_HEIGHT); + rect.bottom = rect.top + (info._id==-1? STARTMENU_SEP_HEIGHT(icon_size): STARTMENU_LINE_HEIGHT(icon_size)); if (info._id == _selected_id) { InvalidateRect(_hwnd, &rect, TRUE); @@ -773,13 +773,13 @@ { #ifdef _LIGHT_STARTMENU ClientRect clnt(_hwnd); - const bool large_icons = _large_icons; - RECT rect = {_border_left, _border_top, clnt.right, STARTMENU_LINE_HEIGHT}; + const int icon_size = _icon_size; + RECT rect = {_border_left, _border_top, clnt.right, STARTMENU_LINE_HEIGHT(icon_size)}; for(SMBtnVector::const_iterator it=_buttons.begin()+_scroll_pos; it!=_buttons.end(); ++it) { const SMBtnInfo& info = *it; - rect.bottom = rect.top + (info._id==-1? STARTMENU_SEP_HEIGHT: STARTMENU_LINE_HEIGHT); + rect.bottom = rect.top + (info._id==-1? STARTMENU_SEP_HEIGHT(icon_size): STARTMENU_LINE_HEIGHT(icon_size)); if (info._id == id) { *prect = rect; @@ -823,10 +823,10 @@ } -void StartMenu::DrawArrows(HDC hdc, bool large_icons) +void StartMenu::DrawArrows(HDC hdc, int icon_size) { - int cx = large_icons? 16: 8; - int cy = large_icons? 8: 4; + int cx = icon_size / 2; + int cy = icon_size / 4; ResIconEx arrowUpIcon(IDI_ARROW_UP, cx, cy); ResIconEx arrowDownIcon(IDI_ARROW_DOWN, cx, cy); @@ -837,10 +837,10 @@ DrawIconEx(hdc, clnt.right/2-cx/2, clnt.bottom-cy-1, arrowDownIcon, cx, cy, 0, 0, DI_NORMAL); } -void StartMenu::GetArrowButtonRects(LPRECT prect_up, LPRECT prect_down, bool large_icons) +void StartMenu::GetArrowButtonRects(LPRECT prect_up, LPRECT prect_down, int icon_size) { - int cx = large_icons? 16: 8; - int cy = large_icons? 8: 4; + int cx = icon_size / 2; + int cy = icon_size / 4; GetClientRect(_hwnd, prect_up); *prect_down = *prect_up; @@ -865,11 +865,11 @@ #ifdef _LIGHT_STARTMENU if (_arrow_btns) - DrawArrows(canvas, _large_icons); + DrawArrows(canvas, _icon_size); ClientRect clnt(_hwnd); - const bool large_icons = _large_icons; - RECT rect = {_border_left, _border_top, clnt.right, STARTMENU_LINE_HEIGHT}; + const int icon_size = _icon_size; + RECT rect = {_border_left, _border_top, clnt.right, STARTMENU_LINE_HEIGHT(icon_size)}; int sep_width = rect.right-rect.left - 4; @@ -883,24 +883,24 @@ break; if (btn._id == -1) { // a separator? - rect.bottom = rect.top + STARTMENU_SEP_HEIGHT; + rect.bottom = rect.top + STARTMENU_SEP_HEIGHT(icon_size); if (rect.bottom > _bottom_max) break; BrushSelection brush_sel(canvas, GetSysColorBrush(COLOR_BTNSHADOW)); - PatBlt(canvas, rect.left+2, rect.top+STARTMENU_SEP_HEIGHT/2-1, sep_width, 1, PATCOPY); + PatBlt(canvas, rect.left+2, rect.top+STARTMENU_SEP_HEIGHT(icon_size)/2-1, sep_width, 1, PATCOPY); SelectBrush(canvas, GetSysColorBrush(COLOR_BTNHIGHLIGHT)); - PatBlt(canvas, rect.left+2, rect.top+STARTMENU_SEP_HEIGHT/2, sep_width, 1, PATCOPY); + PatBlt(canvas, rect.left+2, rect.top+STARTMENU_SEP_HEIGHT(icon_size)/2, sep_width, 1, PATCOPY); } else { - rect.bottom = rect.top + STARTMENU_LINE_HEIGHT; + rect.bottom = rect.top + STARTMENU_LINE_HEIGHT(icon_size); if (rect.bottom > _bottom_max) break; if (rect.top >= canvas.rcPaint.top) - DrawStartMenuButton(canvas, rect, btn._title, btn, btn._id==_selected_id, false, _large_icons); + DrawStartMenuButton(canvas, rect, btn._title, btn, btn._id==_selected_id, false, _icon_size); } rect.top = rect.bottom; @@ -930,7 +930,7 @@ Entry* entry = *it; if (entry->_icon_id == ICID_UNKNOWN) - entry->_icon_id = entry->safe_extract_icon(_large_icons? ICF_LARGE: ICF_NORMAL); + entry->_icon_id = entry->safe_extract_icon(ICF_FROM_ICON_SIZE(_icon_size)); if (entry->_icon_id > ICID_NONE) { btn._icon_id = (ICON_ID)/*@@*/ entry->_icon_id; @@ -943,7 +943,7 @@ break; WindowCanvas canvas(_hwnd); - DrawStartMenuButton(canvas, rect, NULL, btn, btn._id==_selected_id, false, _large_icons); + DrawStartMenuButton(canvas, rect, NULL, btn, btn._id==_selected_id, false, _icon_size); //InvalidateRect(_hwnd, &rect, FALSE); //UpdateWindow(_hwnd); @@ -966,7 +966,7 @@ for(StartMenuShellDirs::iterator it=_dirs.begin(); it!=_dirs.end(); ++it) { ShellDirectory& dir = it->_dir; - icons_extracted += dir.extract_icons(); + icons_extracted += dir.extract_icons(icon_size); } if (icons_extracted) { @@ -1132,19 +1132,19 @@ ClientRect clnt(_hwnd); // increase window height to make room for the new button - rect.top -= STARTMENU_LINE_HEIGHT; + rect.top -= STARTMENU_LINE_HEIGHT(icon_size); // move down if we are too high now if (rect.top < 0) { - rect.top += STARTMENU_LINE_HEIGHT; - rect.bottom += STARTMENU_LINE_HEIGHT; + rect.top += STARTMENU_LINE_HEIGHT(icon_size); + rect.bottom += STARTMENU_LINE_HEIGHT(icon_size); } WindowCanvas canvas(_hwnd); FontSelection font(canvas, GetStockFont(DEFAULT_GUI_FONT)); // widen window, if it is too small - int text_width = GetStartMenuBtnTextWidth(canvas, title, _hwnd) + ICON_SIZE_X + 10/*placeholder*/ + 16/*arrow*/; + int text_width = GetStartMenuBtnTextWidth(canvas, title, _hwnd) + icon_size + 10/*placeholder*/ + 16/*arrow*/; int cx = clnt.right - _border_left; if (text_width > cx) @@ -1166,12 +1166,12 @@ ClientRect clnt(_hwnd); // increase window height to make room for the new separator - rect.top -= STARTMENU_SEP_HEIGHT; + rect.top -= STARTMENU_SEP_HEIGHT(icon_size); // move down if we are too high now if (rect.top < 0) { - rect.top += STARTMENU_LINE_HEIGHT; - rect.bottom += STARTMENU_LINE_HEIGHT; + rect.top += STARTMENU_LINE_HEIGHT(icon_size); + rect.bottom += STARTMENU_LINE_HEIGHT(icon_size); } MoveWindow(_hwnd, rect.left, rect.top, rect.right-rect.left, rect.bottom-rect.top, TRUE); @@ -1262,8 +1262,8 @@ ClientToScreen(_hwnd, &rect); x = rect.right; // Submenus should overlap their parent a bit. - const bool large_icons = _large_icons; - y = rect.top+STARTMENU_LINE_HEIGHT +_border_top/*own border*/ -STARTMENU_TOP_BTN_SPACE/*border of new submenu*/; + const int icon_size = _icon_size; + y = rect.top+STARTMENU_LINE_HEIGHT(icon_size) +_border_top/*own border*/ -STARTMENU_TOP_BTN_SPACE/*border of new submenu*/; } else { WindowRect pos(_hwnd); @@ -1364,10 +1364,10 @@ } #ifdef _LIGHT_STARTMENU -void DrawStartMenuButton(HDC hdc, const RECT& rect, LPCTSTR title, const SMBtnInfo& btn, bool has_focus, bool pushed, bool large_icons) +void DrawStartMenuButton(HDC hdc, const RECT& rect, LPCTSTR title, const SMBtnInfo& btn, bool has_focus, bool pushed, int icon_size) #else void DrawStartMenuButton(HDC hdc, const RECT& rect, LPCTSTR title, HICON hIcon, - bool hasSubmenu, bool enabled, bool has_focus, bool pushed, bool large_icons); + bool hasSubmenu, bool enabled, bool has_focus, bool pushed, int icon_size); #endif { UINT style = DFCS_BUTTONPUSH; @@ -1375,8 +1375,8 @@ if (!btn._enabled) style |= DFCS_INACTIVE; - POINT iconPos = {rect.left+2, (rect.top+rect.bottom-ICON_SIZE_Y)/2}; - RECT textRect = {rect.left+ICON_SIZE_X+4, rect.top+2, rect.right-4, rect.bottom-4}; + POINT iconPos = {rect.left+2, (rect.top+rect.bottom-icon_size)/2}; + RECT textRect = {rect.left+icon_size+4, rect.top+2, rect.right-4, rect.bottom-4}; if (pushed) { style |= DFCS_PUSHED; @@ -1400,16 +1400,16 @@ FillRect(hdc, &rect, bk_brush); if (btn._icon_id > ICID_NONE) - g_Globals._icon_cache.get_icon(btn._icon_id).draw(hdc, iconPos.x, iconPos.y, ICON_SIZE_X, ICON_SIZE_Y, bk_color, bk_brush/*, large_icons*/); + g_Globals._icon_cache.get_icon(btn._icon_id).draw(hdc, iconPos.x, iconPos.y, icon_size, icon_size, bk_color, bk_brush/*, icon_size*/); // draw submenu arrow at the right if (btn._hasSubmenu) { - ResIconEx arrowIcon(IDI_ARROW, ICON_SIZE_X, ICON_SIZE_Y); - ResIconEx selArrowIcon(IDI_ARROW_SELECTED, ICON_SIZE_X, ICON_SIZE_Y); + ResIconEx arrowIcon(IDI_ARROW, icon_size, icon_size); + ResIconEx selArrowIcon(IDI_ARROW_SELECTED, icon_size, icon_size); - DrawIconEx(hdc, rect.right-ICON_SIZE_X, iconPos.y, + DrawIconEx(hdc, rect.right-icon_size, iconPos.y, has_focus? selArrowIcon: arrowIcon, - ICON_SIZE_X, ICON_SIZE_Y, 0, bk_brush, DI_NORMAL); + icon_size, icon_size, 0, bk_brush, DI_NORMAL); } if (title) { @@ -1434,7 +1434,7 @@ WindowCanvas canvas(_hwnd); FontSelection font(canvas, GetStockFont(DEFAULT_GUI_FONT)); - const bool large_icons = _large_icons; + const int icon_size = _icon_size; int max_width = STARTMENU_WIDTH_MIN; int height = 0; @@ -1446,13 +1446,13 @@ max_width = w; if (it->_id == -1) - height += STARTMENU_SEP_HEIGHT; + height += STARTMENU_SEP_HEIGHT(icon_size); else - height += STARTMENU_LINE_HEIGHT; + height += STARTMENU_LINE_HEIGHT(icon_size); } // calculate new window size - int text_width = max_width + ICON_SIZE_X + 10/*placeholder*/ + 16/*arrow*/; + int text_width = max_width + icon_size + 10/*placeholder*/ + 16/*arrow*/; RECT rt_hgt = {rect.left, rect.bottom-_border_top-height, rect.left+_border_left+text_width, rect.bottom}; AdjustWindowRectEx(&rt_hgt, GetWindowStyle(_hwnd), FALSE, GetWindowExStyle(_hwnd)); @@ -1475,8 +1475,8 @@ if (rect.bottom > cyscreen) { _arrow_btns = true; - _invisible_lines = (rect.bottom-cyscreen+(STARTMENU_LINE_HEIGHT-1))/STARTMENU_LINE_HEIGHT + 1; - rect.bottom -= _invisible_lines * STARTMENU_LINE_HEIGHT; + _invisible_lines = (rect.bottom-cyscreen+(STARTMENU_LINE_HEIGHT(icon_size)-1))/STARTMENU_SE P_HEIGHT(icon_size) + 1; + rect.bottom -= _invisible_lines * STARTMENU_LINE_HEIGHT(icon_size); bottom_max = rect.bottom; @@ -1541,8 +1541,8 @@ #endif -StartMenuRoot::StartMenuRoot(HWND hwnd) - : super(hwnd, false) ///@todo big icons in start menu root +StartMenuRoot::StartMenuRoot(HWND hwnd, const StartMenuRootCreateInfo& info) + : super(hwnd, info._icon_size) { #ifndef __MINGW32__ // SHRestricted() missing in MinGW (as of 29.10.2003) if (!g_Globals._SHRestricted || !SHRestricted(REST_NOCOMMONGROUPS)) @@ -1579,29 +1579,33 @@ } -static void CalculateStartPos(HWND hwndOwner, RECT& rect, bool large_icons) +static void CalculateStartPos(HWND hwndOwner, RECT& rect, int icon_size) { WindowRect pos(hwndOwner); rect.left = pos.left; - rect.top = pos.top-STARTMENU_LINE_HEIGHT-4; + rect.top = pos.top-STARTMENU_LINE_HEIGHT(icon_size)-4; rect.right = pos.left+STARTMENU_WIDTH_MIN; rect.bottom = pos.top; #ifndef _LIGHT_STARTMENU - rect.top += STARTMENU_LINE_HEIGHT; + rect.top += STARTMENU_LINE_HEIGHT(icon_size); #endif AdjustWindowRectEx(&rect, WS_POPUP|WS_THICKFRAME|WS_CLIPCHILDREN|WS_VISIBLE, FALSE, 0); } -HWND StartMenuRoot::Create(HWND hwndOwner, bool large_icons) +HWND StartMenuRoot::Create(HWND hwndOwner, int icon_size) { RECT rect; - CalculateStartPos(hwndOwner, rect, large_icons); + CalculateStartPos(hwndOwner, rect, icon_size); - return Window::Create(WINDOW_CREATOR(StartMenuRoot), 0, GetWndClasss(), TITLE_STARTMENU, + StartMenuRootCreateInfo create_info; + + create_info._icon_size = icon_size; + + return Window::Create(WINDOW_CREATOR_INFO(StartMenuRoot,StartMenuRootCreateInfo ), &create_info, 0, GetWndClasss(), TITLE_STARTMENU, WS_POPUP|WS_THICKFRAME|WS_CLIPCHILDREN, rect.left, rect.top, rect.right-rect.left, rect.bottom-rect.top, hwndOwner); } @@ -1620,7 +1624,7 @@ // recalculate start menu root position RECT rect; - CalculateStartPos(GetParent(hwnd), rect, _large_icons); + CalculateStartPos(GetParent(hwnd), rect, _icon_size); SetWindowPos(hwnd, 0, rect.left, rect.top, rect.right-rect.left, rect.bottom-rect.top, 0); @@ -2150,7 +2154,7 @@ //TODO AddButton(ResString(IDS_PRINTERS), ICID_PRINTER, true, IDC_PRINTERS_MENU); AddButton(ResString(IDS_CONNECTIONS), ICID_NETCONNS, false, IDC_CONNECTIONS); #endif - AddButton(ResString(IDS_ADMIN), ICID_ADMINISTRATION, true, IDC_ADMIN); + AddButton(ResString(IDS_ADMIN), ICID_ADMIN, true, IDC_ADMIN); #ifndef __MINGW32__ // SHRestricted() missing in MinGW (as of 29.10.2003) if (!g_Globals._SHRestricted || !SHRestricted(REST_NOCONTROLPANEL)) _____ Modified: trunk/reactos/subsys/system/explorer/taskbar/startmenu.h --- trunk/reactos/subsys/system/explorer/taskbar/startmenu.h 2006-01-16 22:07:38 UTC (rev 20923) +++ trunk/reactos/subsys/system/explorer/taskbar/startmenu.h 2006-01-16 23:00:38 UTC (rev 20924) @@ -30,10 +30,10 @@ #define TITLE_STARTMENU TEXT("Start Menu") -#define STARTMENU_WIDTH_MIN 120 -#define STARTMENU_LINE_HEIGHT (ICON_SIZE_X+4) -#define STARTMENU_SEP_HEIGHT (STARTMENU_LINE_HEIGHT/2) -#define STARTMENU_TOP_BTN_SPACE 8 +#define STARTMENU_WIDTH_MIN 120 +#define STARTMENU_LINE_HEIGHT(icon_size) (icon_size+4) +#define STARTMENU_SEP_HEIGHT(icon_size) (STARTMENU_LINE_HEIGHT(icon_size)/2) +#define STARTMENU_TOP_BTN_SPACE 8 // private message constants @@ -110,7 +110,7 @@ { StartMenuCtrl(HWND parent, int x, int y, int w, LPCTSTR title, UINT id, HICON hIcon=0, bool hasSubmenu=false, DWORD style=WS_VISIBLE|WS_CHILD|BS_OWNERDRAW, DWORD exStyle=0) - : Button(parent, title, x, y, w, STARTMENU_LINE_HEIGHT, id, style, exStyle) + : Button(parent, title, x, y, w, STARTMENU_LINE_HEIGHT(icon_size), id, style, exStyle) { *new StartMenuButton(_hwnd, hIcon, hasSubmenu); @@ -123,7 +123,7 @@ struct StartMenuSeparator : public Static { StartMenuSeparator(HWND parent, int x, int y, int w, DWORD style=WS_VISIBLE|WS_CHILD|WS_DISABLED|SS_ETCHEDHORZ, DWORD exStyle=0) - : Static(parent, NULL, x, y+STARTMENU_SEP_HEIGHT/2-1, w, 2, -1, style, exStyle) + : Static(parent, NULL, x, y+STARTMENU_SEP_HEIGHT(icon_size)/2-1, w, 2, -1, style, exStyle) { } }; @@ -182,12 +182,12 @@ typedef vector<SMBtnInfo> SMBtnVector; -extern void DrawStartMenuButton(HDC hdc, const RECT& rect, LPCTSTR title, const SMBtnInfo& btn, bool has_focus, bool pushed, bool large_icons); +extern void DrawStartMenuButton(HDC hdc, const RECT& rect, LPCTSTR title, const SMBtnInfo& btn, bool has_focus, bool pushed, int icon_size); #else extern void DrawStartMenuButton(HDC hdc, const RECT& rect, LPCTSTR title, HICON hIcon, - bool hasSubmenu, bool enabled, bool has_focus, bool pushed, bool large_icons); + bool hasSubmenu, bool enabled, bool has_focus, bool pushed, int icon_size); #endif @@ -209,8 +209,8 @@ typedef ExtContextMenuHandlerT<OwnerDrawParent<DialogWindow> > super; #endif - StartMenu(HWND hwnd, bool large_icons=false); - StartMenu(HWND hwnd, const StartMenuCreateInfo& create_info, bool large_icons=false); + StartMenu(HWND hwnd, int icon_size=ICON_SIZE_SMALL); + StartMenu(HWND hwnd, const StartMenuCreateInfo& create_info, int icon_size=ICON_SIZE_SMALL); ~StartMenu(); static HWND Create(int x, int y, const StartMenuFolders&, HWND hwndParent, LPCTSTR title, @@ -248,7 +248,7 @@ StartMenuCreateInfo _create_info; // copy of the original create info - bool _large_icons; + int _icon_size; #ifdef _LIGHT_STARTMENU SMBtnVector _buttons; @@ -296,9 +296,9 @@ void DrawFloatingButton(HDC hdc); void GetFloatingButtonRect(LPRECT prect); - void GetArrowButtonRects(LPRECT prect_up, LPRECT prect_down, bool large_icons); + void GetArrowButtonRects(LPRECT prect_up, LPRECT prect_down, int icon_size); - void DrawArrows(HDC hdc, bool large_icons); + void DrawArrows(HDC hdc, int icon_size); void Paint(PaintCanvas& canvas); void UpdateIcons(/*int idx*/); @@ -333,13 +333,13 @@ { typedef StartMenu super; - StartMenuHandler(HWND hwnd, bool large_icons=false) - : super(hwnd, large_icons) + StartMenuHandler(HWND hwnd, int icon_size=ICON_SIZE_SMALL) + : super(hwnd, icon_size) { } - StartMenuHandler(HWND hwnd, const StartMenuCreateInfo& create_info, bool large_icons=false) - : super(hwnd, create_info, large_icons) + StartMenuHandler(HWND hwnd, const StartMenuCreateInfo& create_info, int icon_size=ICON_SIZE_SMALL) + : super(hwnd, create_info, icon_size) { } @@ -353,14 +353,20 @@ }; +struct StartMenuRootCreateInfo +{ + int _icon_size; +}; + + /// Startmenu root window struct StartMenuRoot : public StartMenuHandler { typedef StartMenuHandler super; - StartMenuRoot(HWND hwnd); + StartMenuRoot(HWND hwnd, const StartMenuRootCreateInfo& info); - static HWND Create(HWND hwndDesktopBar, bool large_icons); + static HWND Create(HWND hwndDesktopBar, int icon_size); void TrackStartmenu(); protected: _____ Modified: trunk/reactos/subsys/system/explorer/utility/window.h --- trunk/reactos/subsys/system/explorer/utility/window.h 2006-01-16 22:07:38 UTC (rev 20923) +++ trunk/reactos/subsys/system/explorer/utility/window.h 2006-01-16 23:00:38 UTC (rev 20924) @@ -66,8 +66,8 @@ typedef Window* (*CREATORFUNC)(HWND); typedef Window* (*CREATORFUNC_INFO)(HWND, const void*); - static HWND Create(CREATORFUNC creator, DWORD dwExStyle, - LPCTSTR lpClassName, LPCTSTR lpWindowName, + static HWND Create(CREATORFUNC creator, + DWORD dwExStyle, LPCTSTR lpClassName, LPCTSTR lpWindowName, DWORD dwStyle, int x, int y, int w, int h, HWND hwndParent=0, HMENU hMenu=0/*, LPVOID lpParam=0*/);

18 years, 8 months

← Newer
1
...
13
14
15
16
17
18
19
...
59
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2006