Ros-diffs July 2006

ros-diffs@reactos.org

19 participants
662 discussions

[frik85] 23230: Add software patent setting to build config template. Implement the setting in freetype2 (rbuild file).
by frik85＠svn.reactos.org 22 Jul '06

22 Jul '06

Author: frik85 Date: Sat Jul 22 23:38:18 2006 New Revision: 23230 URL: http://svn.reactos.org/svn/reactos?rev=23230&view=rev Log: Add software patent setting to build config template. Implement the setting in freetype2 (rbuild file). Modified: trunk/reactos/config-ppc.template.rbuild trunk/reactos/config.template.rbuild trunk/reactos/dll/3rdparty/freetype/devel/ftoption.h trunk/reactos/dll/3rdparty/freetype/freetype.rbuild Modified: trunk/reactos/config-ppc.template.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/config-ppc.template.rbuild… ============================================================================== --- trunk/reactos/config-ppc.template.rbuild (original) +++ trunk/reactos/config-ppc.template.rbuild Sat Jul 22 23:38:18 2006 @@ -53,4 +53,13 @@ --> <property name="DBG" value="1" /> + + +<property name="NSWPAT" value="0" /> + </rbuild> Modified: trunk/reactos/config.template.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/config.template.rbuild?rev… ============================================================================== --- trunk/reactos/config.template.rbuild (original) +++ trunk/reactos/config.template.rbuild Sat Jul 22 23:38:18 2006 @@ -60,4 +60,13 @@ --> <property name="GDB" value="0" /> + + +<property name="NSWPAT" value="0" /> + </rbuild> Modified: trunk/reactos/dll/3rdparty/freetype/devel/ftoption.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/freetype/deve… ============================================================================== --- trunk/reactos/dll/3rdparty/freetype/devel/ftoption.h (original) +++ trunk/reactos/dll/3rdparty/freetype/devel/ftoption.h Sat Jul 22 23:38:18 2006 @@ -436,7 +436,7 @@ /* Do not #undef this macro here, since the build system might */ /* define it for certain configurations only. */ /* */ -#define TT_CONFIG_OPTION_BYTECODE_INTERPRETER +/* #define TT_CONFIG_OPTION_BYTECODE_INTERPRETER */ /*************************************************************************/ Modified: trunk/reactos/dll/3rdparty/freetype/freetype.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/freetype/free… ============================================================================== --- trunk/reactos/dll/3rdparty/freetype/freetype.rbuild (original) +++ trunk/reactos/dll/3rdparty/freetype/freetype.rbuild Sat Jul 22 23:38:18 2006 @@ -6,6 +6,9 @@ <define name="__NTDRIVER__" /> <define name="__NO_CTYPE_INLINES" /> <define name="__USE_W32API" /> + <if property="NSWPAT" value="1"> + <define name="TT_CONFIG_OPTION_BYTECODE_INTERPRETER" /> + </if> <library>ntoskrnl</library> <library>hal</library> <directory name="i386">

1 0

[ion] 23229: - Implement KiRecalculateDueTime to handle cases where a timeout wait has been interupted by an APC or alerted, and it needs to be recalculated in the relative case. (This fixes the "contact alex" bugcheck).
by ion＠svn.reactos.org 22 Jul '06

22 Jul '06

Author: ion Date: Sat Jul 22 21:19:09 2006 New Revision: 23229 URL: http://svn.reactos.org/svn/reactos?rev=23229&view=rev Log: - Implement KiRecalculateDueTime to handle cases where a timeout wait has been interupted by an APC or alerted, and it needs to be recalculated in the relative case. (This fixes the "contact alex" bugcheck). Modified: trunk/reactos/ntoskrnl/KrnlFun.c trunk/reactos/ntoskrnl/include/internal/ke_x.h trunk/reactos/ntoskrnl/ke/queue.c trunk/reactos/ntoskrnl/ke/wait.c Modified: trunk/reactos/ntoskrnl/KrnlFun.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/KrnlFun.c?rev=232… ============================================================================== --- trunk/reactos/ntoskrnl/KrnlFun.c (original) +++ trunk/reactos/ntoskrnl/KrnlFun.c Sat Jul 22 21:19:09 2006 @@ -45,8 +45,5 @@ // - Use pushlocks for handle implementation. // - Figure out why cmd.exe won't close anymore. // -// Ke: -// - Add code for interval recalulation when wait interrupted by an APC -// /////////////////////////////////////////////////////////////////////////////// Modified: trunk/reactos/ntoskrnl/include/internal/ke_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke_x.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ke_x.h Sat Jul 22 21:19:09 2006 @@ -156,6 +156,24 @@ } // +// Recalculates the due time +// +PLARGE_INTEGER +FORCEINLINE +KiRecalculateDueTime(IN PLARGE_INTEGER OriginalDueTime, + IN PLARGE_INTEGER DueTime, + IN OUT PLARGE_INTEGER NewDueTime) +{ + /* Don't do anything for absolute waits */ + if (OriginalDueTime->QuadPart >= 0) return OriginalDueTime; + + /* Otherwise, query the interrupt time and recalculate */ + NewDueTime->QuadPart = KeQueryInterruptTime(); + NewDueTime->QuadPart -= DueTime->QuadPart; + return NewDueTime; +} + +// // Determines wether a thread should be added to the wait list // #define KiCheckThreadStackSwap(WaitMode, Thread, Swappable) \ Modified: trunk/reactos/ntoskrnl/ke/queue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/queue.c?rev=23… ============================================================================== --- trunk/reactos/ntoskrnl/ke/queue.c (original) +++ trunk/reactos/ntoskrnl/ke/queue.c Sat Jul 22 21:19:09 2006 @@ -249,6 +249,8 @@ PKWAIT_BLOCK WaitBlock; PKTIMER Timer; BOOLEAN Swappable; + PLARGE_INTEGER OriginalDueTime = Timeout; + LARGE_INTEGER DueTime, NewDueTime; ASSERT_QUEUE(Queue); ASSERT_IRQL_LESS_OR_EQUAL(DISPATCH_LEVEL); @@ -396,7 +398,15 @@ &Timer->Header.WaitListHead; /* Create Timer */ - KiInsertTimer(Timer, *Timeout); + if (!KiInsertTimer(Timer, *Timeout)) + { + /* FIXME */ + DPRINT1("If you see thie message contact Alex ASAP\n"); + KEBUGCHECK(0); + } + + /* Set timer due time */ + DueTime.QuadPart = Timer->DueTime.QuadPart; } /* Close the loop */ @@ -431,8 +441,10 @@ /* Check if we had a timeout */ if (Timeout) { - DPRINT1("If you see this message, contact Alex ASAP\n"); - KEBUGCHECK(0); + /* Recalculate due times */ + Timeout = KiRecalculateDueTime(OriginalDueTime, + &DueTime, + &NewDueTime); } } Modified: trunk/reactos/ntoskrnl/ke/wait.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/wait.c?rev=232… ============================================================================== --- trunk/reactos/ntoskrnl/ke/wait.c (original) +++ trunk/reactos/ntoskrnl/ke/wait.c Sat Jul 22 21:19:09 2006 @@ -275,6 +275,8 @@ PKTHREAD CurrentThread = KeGetCurrentThread(); NTSTATUS WaitStatus = STATUS_SUCCESS; BOOLEAN Swappable; + PLARGE_INTEGER OriginalDueTime = Interval; + LARGE_INTEGER DueTime, NewDueTime; /* Check if the lock is already held */ if (CurrentThread->WaitNext) @@ -334,6 +336,9 @@ WaitStatus = STATUS_SUCCESS; break; } + + /* Save due time */ + DueTime.QuadPart = ThreadTimer->DueTime.QuadPart; /* Handle Kernel Queues */ if (CurrentThread->Queue) KiWakeQueue(CurrentThread->Queue); @@ -360,9 +365,10 @@ return WaitStatus; } - /* Check if we had a timeout */ - DPRINT1("If you see this message, contact Alex ASAP\n"); - KEBUGCHECK(0); + /* Recalculate due times */ + Interval = KiRecalculateDueTime(OriginalDueTime, + &DueTime, + &NewDueTime); } /* Acquire again the lock */ @@ -392,6 +398,8 @@ PKTHREAD CurrentThread = KeGetCurrentThread(); NTSTATUS WaitStatus = STATUS_SUCCESS; BOOLEAN Swappable; + LARGE_INTEGER DueTime, NewDueTime; + PLARGE_INTEGER OriginalDueTime = Timeout; /* Check if the lock is already held */ if (CurrentThread->WaitNext) @@ -506,6 +514,9 @@ WaitStatus = STATUS_TIMEOUT; goto DontWait; } + + /* Set the current due time */ + DueTime.QuadPart = ThreadTimer->DueTime.QuadPart; } else { @@ -538,8 +549,10 @@ /* Check if we had a timeout */ if (Timeout) { - DPRINT1("If you see this message, contact Alex ASAP\n"); - KEBUGCHECK(0); + /* Recalculate due times */ + Timeout = KiRecalculateDueTime(OriginalDueTime, + &DueTime, + &NewDueTime); } } @@ -583,6 +596,8 @@ ULONG WaitIndex; NTSTATUS WaitStatus = STATUS_SUCCESS; BOOLEAN Swappable; + PLARGE_INTEGER OriginalDueTime = Timeout; + LARGE_INTEGER DueTime, NewDueTime; /* Set the Current Thread */ CurrentThread = KeGetCurrentThread(); @@ -781,6 +796,9 @@ WaitStatus = STATUS_TIMEOUT; goto DontWait; } + + /* Set the current due time */ + DueTime.QuadPart = ThreadTimer->DueTime.QuadPart; } /* Insert into Object's Wait List*/ @@ -819,8 +837,10 @@ /* Check if we had a timeout */ if (Timeout) { - DPRINT1("If you see this message, contact Alex ASAP\n"); - KEBUGCHECK(0); + /* Recalculate due times */ + Timeout = KiRecalculateDueTime(OriginalDueTime, + &DueTime, + &NewDueTime); } /* Acquire again the lock */

1 0

[turner] 23228: Fix typo.
by turner＠svn.reactos.org 22 Jul '06

22 Jul '06

Author: turner Date: Sat Jul 22 21:03:00 2006 New Revision: 23228 URL: http://svn.reactos.org/svn/reactos?rev=23228&view=rev Log: Fix typo. Modified: trunk/reactos/dll/win32/user32/windows/window.c Modified: trunk/reactos/dll/win32/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/w… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/window.c (original) +++ trunk/reactos/dll/win32/user32/windows/window.c Sat Jul 22 21:03:00 2006 @@ -1592,7 +1592,7 @@ STDCALL GetProgmanWindow(VOID) { - return (HWND)NtUserGetThreadState(THREADSTATE_PROGRAMWINDOW); + return (HWND)NtUserGetThreadState(THREADSTATE_PROGMANWINDOW); } /*

1 0

[turner] 23227: Partially implement: NtUserCallHwndOpt NtUserGetThreadState Implement GetProgmanWindow GetTaskmanWindow This is (kinda)part of bug 1668
by turner＠svn.reactos.org 22 Jul '06

22 Jul '06

Author: turner Date: Sat Jul 22 20:50:23 2006 New Revision: 23227 URL: http://svn.reactos.org/svn/reactos?rev=23227&view=rev Log: Partially implement: NtUserCallHwndOpt NtUserGetThreadState Implement GetProgmanWindow GetTaskmanWindow This is (kinda)part of bug 1668 Modified: trunk/reactos/dll/win32/user32/windows/window.c trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/misc.c Modified: trunk/reactos/dll/win32/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/w… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/window.c (original) +++ trunk/reactos/dll/win32/user32/windows/window.c Sat Jul 22 20:50:23 2006 @@ -1586,25 +1586,23 @@ } /* - * @unimplemented + * @implemented */ HWND STDCALL GetProgmanWindow(VOID) { - UNIMPLEMENTED; - return FALSE; -} - -/* - * @unimplemented + return (HWND)NtUserGetThreadState(THREADSTATE_PROGRAMWINDOW); +} + +/* + * @implemented */ HWND STDCALL GetTaskmanWindow(VOID) { - UNIMPLEMENTED; - return FALSE; + return (HWND)NtUserGetThreadState(THREADSTATE_TASKMANWINDOW); } /* Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h Sat Jul 22 20:50:23 2006 @@ -8,6 +8,8 @@ { HANDLE hKernelHeap; WCHAR szDesktopName[1]; + HWND hTaskManWindow; + HWND hProgmanWindow; } DESKTOP, *PDESKTOP; typedef struct _CALLPROC @@ -1117,6 +1119,8 @@ #define THREADSTATE_GETTHREADINFO (0) #define THREADSTATE_FOCUSWINDOW (1) #define THREADSTATE_INSENDMESSAGE (2) +#define THREADSTATE_PROGMANWINDOW (3) +#define THREADSTATE_TASKMANWINDOW (4) DWORD NTAPI NtUserGetThreadState( Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/misc.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/misc.c Sat Jul 22 20:50:23 2006 @@ -856,19 +856,11 @@ switch (Routine) { case HWNDOPT_ROUTINE_SETPROGMANWINDOW: - /* - * FIXME - * Nothing too hard...validate the hWnd and save it in the Desktop Info - */ - DPRINT1("HWNDOPT_ROUTINE_SETPROGMANWINDOW UNIMPLEMENTED\n"); + GetW32ThreadInfo()->Desktop->hProgmanWindow = Param; break; case HWNDOPT_ROUTINE_SETTASKMANWINDOW: - /* - * FIXME - * Nothing too hard...validate the hWnd and save it in the Desktop Info - */ - DPRINT1("HWNDOPT_ROUTINE_SETTASKMANWINDOW UNIMPLEMENTED\n"); + GetW32ThreadInfo()->Desktop->hTaskManWindow = Param; break; } @@ -902,6 +894,10 @@ case THREADSTATE_FOCUSWINDOW: RETURN( (DWORD)IntGetThreadFocusWindow()); + case THREADSTATE_PROGMANWINDOW: + RETURN( (DWORD)GetW32ThreadInfo()->Desktop->hProgmanWindow); + case THREADSTATE_TASKMANWINDOW: + RETURN( (DWORD)GetW32ThreadInfo()->Desktop->hTaskManWindow); } RETURN( 0);

1 0

[ion] 23226: - Give winlogon SE_ASSIGNPRIMARYTOKEN_PRIVILEGE because it was lacking it and would fail under this kernel patch. - PspAssignPrimaryToken was good enough for actually *assigning* the token, but when NtSetInfoProcess is called with ProcessPrimaryToken, we want to do a lot more then just randomly assigning it. Added PspSetPrimaryToken which first verifies if the token being assigned is a child token and if not, checks for SeAssignPrimaryTokenPrivilege. Also added a fixme for more code
by ion＠svn.reactos.org 22 Jul '06

22 Jul '06

Author: ion Date: Sat Jul 22 20:03:12 2006 New Revision: 23226 URL: http://svn.reactos.org/svn/reactos?rev=23226&view=rev Log: - Give winlogon SE_ASSIGNPRIMARYTOKEN_PRIVILEGE because it was lacking it and would fail under this kernel patch. - PspAssignPrimaryToken was good enough for actually *assigning* the token, but when NtSetInfoProcess is called with ProcessPrimaryToken, we want to do a lot more then just randomly assigning it. Added PspSetPrimaryToken which first verifies if the token being assigned is a child token and if not, checks for SeAssignPrimaryTokenPrivilege. Also added a fixme for more code that's needed, to actually re-calculate the process's granted access towards itself. Also added thread-safety. Modified: trunk/reactos/base/system/winlogon/winlogon.c trunk/reactos/base/system/winlogon/winlogon.h trunk/reactos/ntoskrnl/include/internal/ps.h trunk/reactos/ntoskrnl/include/internal/se.h trunk/reactos/ntoskrnl/ps/query.c trunk/reactos/ntoskrnl/ps/security.c trunk/reactos/ntoskrnl/se/token.c Modified: trunk/reactos/base/system/winlogon/winlogon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo… ============================================================================== --- trunk/reactos/base/system/winlogon/winlogon.c (original) +++ trunk/reactos/base/system/winlogon/winlogon.c Sat Jul 22 20:03:12 2006 @@ -534,6 +534,7 @@ LPSTR lpCmdLine, int nShowCmd) { + BOOLEAN Old; #if SUPPORT_CONSOLESTART // WCHAR LoginName[255]; // WCHAR Password[255]; @@ -554,6 +555,9 @@ ExitProcess(0); return 0; } + + /* Get privilege */ + RtlAdjustPrivilege(SE_ASSIGNPRIMARYTOKEN_PRIVILEGE, TRUE, FALSE, &Old); #if START_LSASS if (StartProcess(L"StartLsass")) Modified: trunk/reactos/base/system/winlogon/winlogon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo… ============================================================================== --- trunk/reactos/base/system/winlogon/winlogon.h (original) +++ trunk/reactos/base/system/winlogon/winlogon.h Sat Jul 22 20:03:12 2006 @@ -33,6 +33,7 @@ #include <winwlx.h> #include <rtlfuncs.h> #include <exfuncs.h> +#include <setypes.h> #include <reactos/winlogon.h> Modified: trunk/reactos/ntoskrnl/include/internal/ps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ps.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ps.h Sat Jul 22 20:03:12 2006 @@ -59,10 +59,11 @@ ); NTSTATUS -STDCALL -PspAssignPrimaryToken( - PEPROCESS Process, - HANDLE TokenHandle +NTAPI +PspSetPrimaryToken( + IN PEPROCESS Process, + IN HANDLE TokenHandle OPTIONAL, + IN PTOKEN Token OPTIONAL ); PETHREAD Modified: trunk/reactos/ntoskrnl/include/internal/se.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/se.h (original) +++ trunk/reactos/ntoskrnl/include/internal/se.h Sat Jul 22 20:03:12 2006 @@ -130,6 +130,13 @@ ); NTSTATUS +NTAPI +SeIsTokenChild( + IN PTOKEN Token, + OUT PBOOLEAN IsChild +); + +NTSTATUS STDCALL SepCreateImpersonationTokenDacl( PTOKEN Token, Modified: trunk/reactos/ntoskrnl/ps/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/query.c?rev=23… ============================================================================== --- trunk/reactos/ntoskrnl/ps/query.c (original) +++ trunk/reactos/ntoskrnl/ps/query.c Sat Jul 22 20:03:12 2006 @@ -581,7 +581,7 @@ if (!NT_SUCCESS(Status)) break; /* Assign the actual token */ - Status = PspAssignPrimaryToken(Process, TokenHandle); + Status = PspSetPrimaryToken(Process, TokenHandle, NULL); break; /* Hard error processing */ Modified: trunk/reactos/ntoskrnl/ps/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/security.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ps/security.c (original) +++ trunk/reactos/ntoskrnl/ps/security.c Sat Jul 22 20:03:12 2006 @@ -25,7 +25,7 @@ KeEnterCriticalRegion(); /* Lock the Process */ - //ExAcquirePushLockShared(&Process->ProcessLock); + ExAcquirePushLockShared(&Process->ProcessLock); } /* FIXME: Turn into Macro */ @@ -34,7 +34,31 @@ PspUnlockProcessSecurityShared(IN PEPROCESS Process) { /* Unlock the Process */ - //ExReleasePushLockShared(&Process->ProcessLock); + ExReleasePushLockShared(&Process->ProcessLock); + + /* Leave Critical Region */ + KeLeaveCriticalRegion(); +} + +/* FIXME: Turn into Macro */ +VOID +NTAPI +PspLockProcessSecurityExclusive(IN PEPROCESS Process) +{ + /* Enter a Critical Region */ + KeEnterCriticalRegion(); + + /* Lock the Process */ + ExAcquirePushLockExclusive(&Process->ProcessLock); +} + +/* FIXME: Turn into Macro */ +VOID +NTAPI +PspUnlockProcessSecurityExclusive(IN PEPROCESS Process) +{ + /* Unlock the Process */ + ExReleasePushLockExclusive(&Process->ProcessLock); /* Leave Critical Region */ KeLeaveCriticalRegion(); @@ -119,25 +143,89 @@ NTSTATUS NTAPI PspAssignPrimaryToken(IN PEPROCESS Process, - IN HANDLE TokenHandle) -{ - PACCESS_TOKEN Token, OldToken; + IN PTOKEN Token) +{ + PACCESS_TOKEN OldToken; NTSTATUS Status; - - /* Reference the Token */ - Status = ObReferenceObjectByHandle(TokenHandle, - TOKEN_ASSIGN_PRIMARY, - SepTokenObjectType, - KeGetPreviousMode(), - (PVOID*)&Token, - NULL); - if (!NT_SUCCESS(Status)) return Status; + PAGED_CODE(); + + /* Lock the process */ + PspLockProcessSecurityExclusive(Process); /* Exchange them */ Status = SeExchangePrimaryToken(Process, Token, &OldToken); - /* Derefernece Tokens and Return */ + /* Release the lock */ + PspUnlockProcessSecurityExclusive(Process); + + /* Dereference Tokens and Return */ + if (NT_SUCCESS(Status)) ObDereferenceObject(OldToken); ObDereferenceObject(Token); + return Status; +} + +NTSTATUS +NTAPI +PspSetPrimaryToken(IN PEPROCESS Process, + IN HANDLE TokenHandle OPTIONAL, + IN PTOKEN Token OPTIONAL) +{ + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + BOOLEAN IsChild; + NTSTATUS Status; + + /* Make sure we got a handle */ + if (TokenHandle) + { + /* Reference it */ + Status = ObReferenceObjectByHandle(TokenHandle, + TOKEN_ASSIGN_PRIMARY, + SepTokenObjectType, + PreviousMode, + (PVOID*)&Token, + NULL); + if (!NT_SUCCESS(Status)) return Status; + } + + /* Check if this is a child */ + Status = SeIsTokenChild(Token, &IsChild); + if (!NT_SUCCESS(Status)) + { + /* Failed, dereference */ + if (TokenHandle) ObDereferenceObject(Token); + return Status; + } + + /* Check if this was an independent token */ + if (!IsChild) + { + /* Make sure we have the privilege to assign a new one */ + if (!SeSinglePrivilegeCheck(SeAssignPrimaryTokenPrivilege, + PreviousMode)) + { + /* Failed, dereference */ + if (TokenHandle) ObDereferenceObject(Token); + return STATUS_PRIVILEGE_NOT_HELD; + } + } + + /* Assign the token */ + Status = PspAssignPrimaryToken(Process, Token); + if (NT_SUCCESS(Status)) + { + /* + * The idea here is that we need to completely reverify + * if the process still has access to itself under this new + * token, by doing an SeAccessCheck with the Primary Token and + * the SD of the Process (ObGetObjectSecurity). + * In the really twisted case where we lose access to ourselves, + * we would set Process->GrantedAccess to 0. + */ + DPRINT1("Process security not complete\n"); + } + + /* Dereference the token */ + if (TokenHandle) ObDereferenceObject(Token); return Status; } Modified: trunk/reactos/ntoskrnl/se/token.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/token.c?rev=23… ============================================================================== --- trunk/reactos/ntoskrnl/se/token.c (original) +++ trunk/reactos/ntoskrnl/se/token.c Sat Jul 22 20:03:12 2006 @@ -366,6 +366,36 @@ /* Return status */ return Status; +} + +NTSTATUS +NTAPI +SeIsTokenChild(IN PTOKEN Token, + OUT PBOOLEAN IsChild) +{ + PTOKEN ProcessToken; + LUID ProcessLuid, CallerLuid; + + /* Assume failure */ + *IsChild = FALSE; + + /* Reference the process token */ + ProcessToken = PsReferencePrimaryToken(PsGetCurrentProcess()); + + /* Get the ID */ + ProcessLuid = ProcessToken->TokenId; + + /* Dereference the token */ + ObFastDereferenceObject(&PsGetCurrentProcess()->Token, ProcessToken); + + /* Get our LUID */ + CallerLuid = Token->TokenId; + + /* Compare the LUIDs */ + if (RtlEqualLuid(&CallerLuid, &ProcessLuid)) *IsChild = TRUE; + + /* Return success */ + return STATUS_SUCCESS; } /*

1 0

[ekohl] 23225: Implement CM_Get_Next_Log_Conf[_Ex] and add PNP_GetNextLogConf stub.
by ekohl＠svn.reactos.org 22 Jul '06

22 Jul '06

Author: ekohl Date: Sat Jul 22 18:45:14 2006 New Revision: 23225 URL: http://svn.reactos.org/svn/reactos?rev=23225&view=rev Log: Implement CM_Get_Next_Log_Conf[_Ex] and add PNP_GetNextLogConf stub. Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.def trunk/reactos/dll/win32/setupapi/cfgmgr.c trunk/reactos/dll/win32/setupapi/setupapi.spec trunk/reactos/include/reactos/idl/pnp.idl trunk/reactos/include/reactos/wine/cfgmgr32.h Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/umpnpmgr/ump… ============================================================================== --- trunk/reactos/base/services/umpnpmgr/umpnpmgr.c (original) +++ trunk/reactos/base/services/umpnpmgr/umpnpmgr.c Sat Jul 22 18:45:14 2006 @@ -1284,7 +1284,7 @@ } -/* Function 42 */ +/* Function 44 */ CONFIGRET PNP_GetFirstLogConf(handle_t BindingHandle, wchar_t *DeviceInstance, @@ -1299,6 +1299,27 @@ *pulLogConfTag = 0; /* FIXME */ DPRINT1("PNP_GetFirstLogConf() done (returns %lx)\n", ret); + + return ret; +} + + +/* Function 45 */ +CONFIGRET +PNP_GetNextLogConf(handle_t BindingHandle, + wchar_t *DeviceInstance, + ULONG ulLogConfType, + ULONG ulCurrentTag, + ULONG *pulNextTag, + ULONG ulFlags) +{ + CONFIGRET ret = CR_SUCCESS; + + DPRINT1("PNP_GetNextLogConf() called\n"); + + *pulNextTag = 0; /* FIXME */ + + DPRINT1("PNP_GetNextLogConf() done (returns %lx)\n", ret); return ret; } Modified: trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cfgmgr32/cfgmgr3… ============================================================================== --- trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.def (original) +++ trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.def Sat Jul 22 18:45:14 2006 @@ -25,14 +25,12 @@ ;CMP_UnregisterNotification ;CMP_WaitNoPendingInstallEvents ;CMP_WaitServices -;CM_Add_Empty_Log_Conf=SETUPAPI.CM_Add_Empty_Log_Conf -;CM_Add_Empty_Log_Conf_Ex=SETUPAPI.CM_Add_Empty_Log_Conf_Ex +CM_Add_Empty_Log_Conf=SETUPAPI.CM_Add_Empty_Log_Conf +CM_Add_Empty_Log_Conf_Ex=SETUPAPI.CM_Add_Empty_Log_Conf_Ex CM_Add_IDA=SETUPAPI.CM_Add_IDA CM_Add_IDW=SETUPAPI.CM_Add_IDW CM_Add_ID_ExA=SETUPAPI.CM_Add_ID_ExA CM_Add_ID_ExW=SETUPAPI.CM_Add_ID_ExW -CM_Add_Empty_Log_Conf=SETUPAPI.CM_Add_Empty_Log_Conf -CM_Add_Empty_Log_Conf_Ex=SETUPAPI.CM_Add_Empty_Log_Conf_Ex CM_Add_IDA=SETUPAPI.CM_Add_IDA CM_Add_IDW=SETUPAPI.CM_Add_IDW CM_Add_ID_ExA=SETUPAPI.CM_Add_ID_ExA @@ -133,8 +131,8 @@ ;CM_Get_Hardware_Profile_Info_ExW ;CM_Get_Log_Conf_Priority ;CM_Get_Log_Conf_Priority_Ex -;CM_Get_Next_Log_Conf -;CM_Get_Next_Log_Conf_Ex +CM_Get_Next_Log_Conf=SETUPAPI.CM_Get_Next_Log_Conf +CM_Get_Next_Log_Conf_Ex=SETUPAPI.CM_Get_Next_Log_Conf_Ex ;CM_Get_Next_Res_Des ;CM_Get_Next_Res_Des_Ex CM_Get_Parent=SETUPAPI.CM_Get_Parent Modified: trunk/reactos/dll/win32/setupapi/cfgmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/cfgmgr.… ============================================================================== --- trunk/reactos/dll/win32/setupapi/cfgmgr.c (original) +++ trunk/reactos/dll/win32/setupapi/cfgmgr.c Sat Jul 22 18:45:14 2006 @@ -2159,6 +2159,91 @@ return PNP_HwProfFlags(BindingHandle, PNP_GET_HW_PROFILE_FLAGS, szDevInstName, ulHardwareProfile, pulValue, 0); +} + + +/*********************************************************************** + * CM_Get_Next_Log_Conf [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Get_Next_Log_Conf( + PLOG_CONF plcLogConf, LOG_CONF lcLogConf, ULONG ulFlags) +{ + TRACE("%p %p %lx\n", plcLogConf, lcLogConf, ulFlags); + return CM_Get_Next_Log_Conf_Ex(plcLogConf, lcLogConf, ulFlags, NULL); +} + + +/*********************************************************************** + * CM_Get_Next_Log_Conf_Ex [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Get_Next_Log_Conf_Ex( + PLOG_CONF plcLogConf, LOG_CONF lcLogConf, ULONG ulFlags, + HMACHINE hMachine) +{ + RPC_BINDING_HANDLE BindingHandle = NULL; + HSTRING_TABLE StringTable = NULL; + PLOG_CONF_INFO pLogConfInfo; + PLOG_CONF_INFO pNewLogConfInfo; + ULONG ulNewTag; + LPWSTR lpDevInst; + CONFIGRET ret; + + FIXME("%p %p %lx %lx\n", plcLogConf, lcLogConf, ulFlags, hMachine); + + if (plcLogConf) + *plcLogConf = 0; + + pLogConfInfo = (PLOG_CONF_INFO)lcLogConf; + if (pLogConfInfo == NULL || pLogConfInfo->ulMagic != LOG_CONF_MAGIC) + return CR_INVALID_LOG_CONF; + + if (ulFlags != 0) + return CR_INVALID_FLAG; + + if (hMachine != NULL) + { + BindingHandle = ((PMACHINE_INFO)hMachine)->BindingHandle; + if (BindingHandle == NULL) + return CR_FAILURE; + + StringTable = ((PMACHINE_INFO)hMachine)->StringTable; + if (StringTable == 0) + return CR_FAILURE; + } + else + { + if (!PnpGetLocalHandles(&BindingHandle, &StringTable)) + return CR_FAILURE; + } + + lpDevInst = StringTableStringFromId(StringTable, pLogConfInfo->dnDevInst); + if (lpDevInst == NULL) + return CR_INVALID_DEVNODE; + + ret = PNP_GetNextLogConf(BindingHandle, + lpDevInst, + pLogConfInfo->ulFlags, + pLogConfInfo->ulTag, + &ulNewTag, + 0); + if (ret != CR_SUCCESS) + return ret; + + if (plcLogConf) + { + pNewLogConfInfo = HeapAlloc(GetProcessHeap(), 0, sizeof(LOG_CONF_INFO)); + if (pNewLogConfInfo == NULL) + return CR_OUT_OF_MEMORY; + + pNewLogConfInfo->ulMagic = LOG_CONF_MAGIC; + pNewLogConfInfo->dnDevInst = pLogConfInfo->dnDevInst; + pNewLogConfInfo->ulFlags = pLogConfInfo->ulFlags; + pNewLogConfInfo->ulTag = ulNewTag; + + *plcLogConf = (LOG_CONF)pNewLogConfInfo; + } + + return CR_SUCCESS; } Modified: trunk/reactos/dll/win32/setupapi/setupapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi.spec (original) +++ trunk/reactos/dll/win32/setupapi/setupapi.spec Sat Jul 22 18:45:14 2006 @@ -111,8 +111,8 @@ @ stub CM_Get_Hardware_Profile_Info_ExW @ stub CM_Get_Log_Conf_Priority @ stub CM_Get_Log_Conf_Priority_Ex -@ stub CM_Get_Next_Log_Conf -@ stub CM_Get_Next_Log_Conf_Ex +@ stdcall CM_Get_Next_Log_Conf(ptr ptr long) +@ stdcall CM_Get_Next_Log_Conf_Ex(ptr ptr long long) @ stub CM_Get_Next_Res_Des @ stub CM_Get_Next_Res_Des_Ex @ stdcall CM_Get_Parent(ptr long long) Modified: trunk/reactos/include/reactos/idl/pnp.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/pnp.id… ============================================================================== --- trunk/reactos/include/reactos/idl/pnp.idl (original) +++ trunk/reactos/include/reactos/idl/pnp.idl Sat Jul 22 18:45:14 2006 @@ -219,6 +219,14 @@ [out] ULONG *pulLogConfTag, [in] ULONG ulFlags); + /* Function 45 */ + CONFIGRET PNP_GetNextLogConf(handle_t BindingHandle, + [in, string] wchar_t *DeviceInstance, + [in] ULONG ulLogConfType, + [in] ULONG ulCurrentTag, + [out] ULONG *pulNextTag, + [in] ULONG ulFlags); + /* Function 58 */ CONFIGRET PNP_RunDetection(handle_t BindingHandle, [in] unsigned long Flags); Modified: trunk/reactos/include/reactos/wine/cfgmgr32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/cfgmg… ============================================================================== --- trunk/reactos/include/reactos/wine/cfgmgr32.h (original) +++ trunk/reactos/include/reactos/wine/cfgmgr32.h Sat Jul 22 18:45:14 2006 @@ -307,6 +307,8 @@ CONFIGRET WINAPI CM_Get_HW_Prof_Flags_ExA( DEVINSTID_A, ULONG, PULONG, ULONG, HMACHINE ); CONFIGRET WINAPI CM_Get_HW_Prof_Flags_ExW( DEVINSTID_W, ULONG, PULONG, ULONG, HMACHINE ); #define CM_Get_HW_Prof_Flags_Ex WINELIB_NAME_AW(CM_Get_HW_Prof_Flags_Ex) +CONFIGRET WINAPI CM_Get_Next_Log_Conf( PLOG_CONF, LOG_CONF, ULONG ); +CONFIGRET WINAPI CM_Get_Next_Log_Conf_Ex( PLOG_CONF, LOG_CONF, ULONG, HMACHINE ); CONFIGRET WINAPI CM_Get_Parent( PDEVINST, DEVINST, ULONG ); CONFIGRET WINAPI CM_Get_Parent_Ex( PDEVINST, DEVINST, ULONG, HMACHINE ); CONFIGRET WINAPI CM_Get_Sibling( PDEVINST, DEVINST, ULONG );

1 0

[jimtabor] 23224: Fix for TrackMouseEvent by Dmitry Timoshkov, wine port.
by jimtabor＠svn.reactos.org 22 Jul '06

22 Jul '06

Author: jimtabor Date: Sat Jul 22 11:04:44 2006 New Revision: 23224 URL: http://svn.reactos.org/svn/reactos?rev=23224&view=rev Log: Fix for TrackMouseEvent by Dmitry Timoshkov, wine port. Modified: trunk/reactos/dll/win32/user32/windows/input.c Modified: trunk/reactos/dll/win32/user32/windows/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/i… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/input.c (original) +++ trunk/reactos/dll/win32/user32/windows/input.c Sat Jul 22 11:04:44 2006 @@ -38,11 +38,10 @@ typedef struct __TRACKINGLIST { TRACKMOUSEEVENT tme; POINT pos; /* center of hover rectangle */ - INT iHoverTime; /* elapsed time the cursor has been inside of the hover rect */ } _TRACKINGLIST; -static _TRACKINGLIST TrackingList[10]; -static int iTrackMax = 0; +/* FIXME: move tracking stuff into a per thread data */ +static _TRACKINGLIST tracking_info; static UINT_PTR timer; static const INT iTimerInterval = 50; /* msec for timer interval */ @@ -715,113 +714,96 @@ return ret; } - static void CALLBACK TrackMouseEventProc(HWND hwndUnused, UINT uMsg, UINT_PTR idEvent, DWORD dwTime) { - int i = 0; POINT pos; POINT posClient; HWND hwnd; - INT nonclient; INT hoverwidth = 0, hoverheight = 0; RECT client; GetCursorPos(&pos); hwnd = WindowFromPoint(pos); - SystemParametersInfoA(SPI_GETMOUSEHOVERWIDTH, 0, &hoverwidth, 0); - SystemParametersInfoA(SPI_GETMOUSEHOVERHEIGHT, 0, &hoverheight, 0); - - /* loop through tracking events we are processing */ - while (i < iTrackMax) { - if (TrackingList[i].tme.dwFlags & TME_NONCLIENT) { - nonclient = 1; +// SystemParametersInfoW(SPI_GETMOUSEHOVERWIDTH, 0, &hoverwidth, 0); + hoverwidth = 4; +// SystemParametersInfoW(SPI_GETMOUSEHOVERHEIGHT, 0, &hoverheight, 0); + hoverheight = 4; + + /* see if this tracking event is looking for TME_LEAVE and that the */ + /* mouse has left the window */ + if (tracking_info.tme.dwFlags & TME_LEAVE) + { + if (tracking_info.tme.hwndTrack != hwnd) + { + if (tracking_info.tme.dwFlags & TME_NONCLIENT) + PostMessageW(tracking_info.tme.hwndTrack, WM_NCMOUSELEAVE, 0, 0); + else + PostMessageW(tracking_info.tme.hwndTrack, WM_MOUSELEAVE, 0, 0); + + /* remove the TME_LEAVE flag */ + tracking_info.tme.dwFlags &= ~TME_LEAVE; } - else { - nonclient = 0; - } - - /* see if this tracking event is looking for TME_LEAVE and that the */ - /* mouse has left the window */ - if (TrackingList[i].tme.dwFlags & TME_LEAVE) { - if (TrackingList[i].tme.hwndTrack != hwnd) { - if (nonclient) { - PostMessageA(TrackingList[i].tme.hwndTrack, WM_NCMOUSELEAVE, 0, 0); + else + { + GetClientRect(hwnd, &client); + MapWindowPoints(hwnd, NULL, (LPPOINT)&client, 2); + if (PtInRect(&client, pos)) + { + if (tracking_info.tme.dwFlags & TME_NONCLIENT) + { + PostMessageW(tracking_info.tme.hwndTrack, WM_NCMOUSELEAVE, 0, 0); + /* remove the TME_LEAVE flag */ + tracking_info.tme.dwFlags &= ~TME_LEAVE; } - else { - PostMessageA(TrackingList[i].tme.hwndTrack, WM_MOUSELEAVE, 0, 0); - } - - /* remove the TME_LEAVE flag */ - TrackingList[i].tme.dwFlags ^= TME_LEAVE; } - else { - GetClientRect(hwnd, &client); - MapWindowPoints(hwnd, NULL, (LPPOINT)&client, 2); - if(PtInRect(&client, pos)) { - if (nonclient) { - PostMessageA(TrackingList[i].tme.hwndTrack, WM_NCMOUSELEAVE, 0, 0); - /* remove the TME_LEAVE flag */ - TrackingList[i].tme.dwFlags ^= TME_LEAVE; - } - } - else { - if (!nonclient) { - PostMessageA(TrackingList[i].tme.hwndTrack, WM_MOUSELEAVE, 0, 0); - /* remove the TME_LEAVE flag */ - TrackingList[i].tme.dwFlags ^= TME_LEAVE; - } + else + { + if (!(tracking_info.tme.dwFlags & TME_NONCLIENT)) + { + PostMessageW(tracking_info.tme.hwndTrack, WM_MOUSELEAVE, 0, 0); + /* remove the TME_LEAVE flag */ + tracking_info.tme.dwFlags &= ~TME_LEAVE; } } } - - /* see if we are tracking hovering for this hwnd */ - if(TrackingList[i].tme.dwFlags & TME_HOVER) { - /* add the timer interval to the hovering time */ - TrackingList[i].iHoverTime+=iTimerInterval; - - /* has the cursor moved outside the rectangle centered around pos? */ - if((abs(pos.x - TrackingList[i].pos.x) > (hoverwidth / 2.0)) - || (abs(pos.y - TrackingList[i].pos.y) > (hoverheight / 2.0))) - { - /* record this new position as the current position and reset */ - /* the iHoverTime variable to 0 */ - TrackingList[i].pos = pos; - TrackingList[i].iHoverTime = 0; - } - - /* has the mouse hovered long enough? */ - if(TrackingList[i].iHoverTime <= TrackingList[i].tme.dwHoverTime) - { - posClient.x = pos.x; - posClient.y = pos.y; - ScreenToClient(hwnd, &posClient); - if (nonclient) { - PostMessageW(TrackingList[i].tme.hwndTrack, WM_NCMOUSEHOVER, - get_key_state(), MAKELPARAM( posClient.x, posClient.y )); - } - else { - PostMessageW(TrackingList[i].tme.hwndTrack, WM_MOUSEHOVER, - get_key_state(), MAKELPARAM( posClient.x, posClient.y )); - } - - /* stop tracking mouse hover */ - TrackingList[i].tme.dwFlags ^= TME_HOVER; - } + } + + /* see if we are tracking hovering for this hwnd */ + if (tracking_info.tme.dwFlags & TME_HOVER) + { + /* has the cursor moved outside the rectangle centered around pos? */ + if ((abs(pos.x - tracking_info.pos.x) > (hoverwidth / 2.0)) || + (abs(pos.y - tracking_info.pos.y) > (hoverheight / 2.0))) + { + /* record this new position as the current position and reset */ + /* the iHoverTime variable to 0 */ + tracking_info.pos = pos; } - - /* see if we are still tracking TME_HOVER or TME_LEAVE for this entry */ - if((TrackingList[i].tme.dwFlags & TME_HOVER) || - (TrackingList[i].tme.dwFlags & TME_LEAVE)) { - i++; - } else { /* remove this entry from the tracking list */ - TrackingList[i] = TrackingList[--iTrackMax]; + else + { + posClient.x = pos.x; + posClient.y = pos.y; + ScreenToClient(hwnd, &posClient); + + if (tracking_info.tme.dwFlags & TME_NONCLIENT) + PostMessageW(tracking_info.tme.hwndTrack, WM_NCMOUSEHOVER, + get_key_state(), MAKELPARAM( posClient.x, posClient.y )); + else + PostMessageW(tracking_info.tme.hwndTrack, WM_MOUSEHOVER, + get_key_state(), MAKELPARAM( posClient.x, posClient.y )); + + /* stop tracking mouse hover */ + tracking_info.tme.dwFlags &= ~TME_HOVER; } } /* stop the timer if the tracking list is empty */ - if(iTrackMax == 0) { + if (!(tracking_info.tme.dwFlags & (TME_HOVER | TME_LEAVE))) + { + memset(&tracking_info, 0, sizeof(tracking_info)); + KillTimer(0, timer); timer = 0; } @@ -857,171 +839,77 @@ TrackMouseEvent( LPTRACKMOUSEEVENT ptme) { - DWORD flags = 0; - int i = 0; - BOOL cancel = 0, hover = 0, leave = 0, query = 0, nonclient = 0, inclient = 0; HWND hwnd; POINT pos; - RECT client; - - - pos.x = 0; - pos.y = 0; - SetRectEmpty(&client); - - DPRINT("%lx, %lx, %p, %lx\n", ptme->cbSize, ptme->dwFlags, ptme->hwndTrack, ptme->dwHoverTime); + DWORD hover_time; + + TRACE("%lx, %lx, %p, %lx\n", ptme->cbSize, ptme->dwFlags, ptme->hwndTrack, ptme->dwHoverTime); if (ptme->cbSize != sizeof(TRACKMOUSEEVENT)) { - DPRINT("wrong TRACKMOUSEEVENT size from app\n"); - SetLastError(ERROR_INVALID_PARAMETER); /* FIXME not sure if this is correct */ + WARN("wrong TRACKMOUSEEVENT size from app\n"); + SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - flags = ptme->dwFlags; + /* fill the TRACKMOUSEEVENT struct with the current tracking for the given hwnd */ + if (ptme->dwFlags & TME_QUERY ) + { + *ptme = tracking_info.tme; + + return TRUE; /* return here, TME_QUERY is retrieving information */ + } + + if (!IsWindow(ptme->hwndTrack)) + { + SetLastError(ERROR_INVALID_WINDOW_HANDLE); + return FALSE; + } + + hover_time = ptme->dwHoverTime; /* if HOVER_DEFAULT was specified replace this with the systems current value */ - if(ptme->dwHoverTime == HOVER_DEFAULT) - SystemParametersInfoA(SPI_GETMOUSEHOVERTIME, 0, &(ptme->dwHoverTime), 0); + if (hover_time == HOVER_DEFAULT || hover_time == 0) +// SystemParametersInfoW(SPI_GETMOUSEHOVERTIME, 0, &hover_time, 0); + hover_time = 400; GetCursorPos(&pos); hwnd = WindowFromPoint(pos); - if ( flags & TME_CANCEL ) { - flags &= ~ TME_CANCEL; - cancel = 1; - } - - if ( flags & TME_HOVER ) { - flags &= ~ TME_HOVER; - hover = 1; - } - - if ( flags & TME_LEAVE ) { - flags &= ~ TME_LEAVE; - leave = 1; - } - - if ( flags & TME_NONCLIENT ) { - flags &= ~ TME_NONCLIENT; - nonclient = 1; - } - - /* fill the TRACKMOUSEEVENT struct with the current tracking for the given hwnd */ - if ( flags & TME_QUERY ) { - flags &= ~ TME_QUERY; - query = 1; - i = 0; - - /* Find the tracking list entry with the matching hwnd */ - while((i < iTrackMax) && (TrackingList[i].tme.hwndTrack != ptme->hwndTrack)) { - i++; - } - - /* hwnd found, fill in the ptme struct */ - if(i < iTrackMax) - *ptme = TrackingList[i].tme; - else - ptme->dwFlags = 0; - - return TRUE; /* return here, TME_QUERY is retrieving information */ - } - - if ( flags ) - DPRINT("Unknown flag(s) %08lx\n", flags ); - - if(cancel) { - /* find a matching hwnd if one exists */ - i = 0; - - while((i < iTrackMax) && (TrackingList[i].tme.hwndTrack != ptme->hwndTrack)) { - i++; - } - - if(i < iTrackMax) { - TrackingList[i].tme.dwFlags &= ~(ptme->dwFlags & ~TME_CANCEL); + if (ptme->dwFlags & ~(TME_CANCEL | TME_HOVER | TME_LEAVE | TME_NONCLIENT)) + FIXME("Unknown flag(s) %08lx\n", ptme->dwFlags & ~(TME_CANCEL | TME_HOVER | TME_LEAVE | TME_NONCLIENT)); + + if (ptme->dwFlags & TME_CANCEL) + { + if (tracking_info.tme.hwndTrack == ptme->hwndTrack) + { + tracking_info.tme.dwFlags &= ~(ptme->dwFlags & ~TME_CANCEL); /* if we aren't tracking on hover or leave remove this entry */ - if(!((TrackingList[i].tme.dwFlags & TME_HOVER) || - (TrackingList[i].tme.dwFlags & TME_LEAVE))) + if (!(tracking_info.tme.dwFlags & (TME_HOVER | TME_LEAVE))) { - TrackingList[i] = TrackingList[--iTrackMax]; - - if(iTrackMax == 0) { - KillTimer(0, timer); - timer = 0; - } + memset(&tracking_info, 0, sizeof(tracking_info)); + + KillTimer(0, timer); + timer = 0; } } } else { - /* see if hwndTrack isn't the current window */ - if(ptme->hwndTrack != hwnd) { - if(leave) { - if(nonclient) { - PostMessageA(ptme->hwndTrack, WM_NCMOUSELEAVE, 0, 0); - } - else { - PostMessageA(ptme->hwndTrack, WM_MOUSELEAVE, 0, 0); - } - } - } else { - GetClientRect(ptme->hwndTrack, &client); - MapWindowPoints(ptme->hwndTrack, NULL, (LPPOINT)&client, 2); - if(PtInRect(&client, pos)) { - inclient = 1; - } - if(nonclient && inclient) { - PostMessageA(ptme->hwndTrack, WM_NCMOUSELEAVE, 0, 0); - return TRUE; - } - else if(!nonclient && !inclient) { - PostMessageA(ptme->hwndTrack, WM_MOUSELEAVE, 0, 0); - return TRUE; - } - - /* See if this hwnd is already being tracked and update the tracking flags */ - for(i = 0; i < iTrackMax; i++) { - if(TrackingList[i].tme.hwndTrack == ptme->hwndTrack) { - TrackingList[i].tme.dwFlags = 0; - - if(hover) { - TrackingList[i].tme.dwFlags |= TME_HOVER; - TrackingList[i].tme.dwHoverTime = ptme->dwHoverTime; - } - - if(leave) - TrackingList[i].tme.dwFlags |= TME_LEAVE; - - if(nonclient) - TrackingList[i].tme.dwFlags |= TME_NONCLIENT; - - /* reset iHoverTime as per winapi specs */ - TrackingList[i].iHoverTime = 0; - - return TRUE; - } - } - - /* if the tracking list is full return FALSE */ - if (iTrackMax == sizeof (TrackingList) / sizeof(*TrackingList)) { - return FALSE; - } - + if (ptme->hwndTrack == hwnd) + { /* Adding new mouse event to the tracking list */ - TrackingList[iTrackMax].tme = *ptme; + tracking_info.tme = *ptme; + tracking_info.tme.dwHoverTime = hover_time; /* Initialize HoverInfo variables even if not hover tracking */ - TrackingList[iTrackMax].iHoverTime = 0; - TrackingList[iTrackMax].pos = pos; - - iTrackMax++; - - if (!timer) { - timer = SetTimer(0, 0, iTimerInterval, TrackMouseEventProc); - } + tracking_info.pos = pos; + + if (!timer) + timer = SetTimer(0, 0, hover_time, TrackMouseEventProc); } } return TRUE; + } /* EOF */

1 0

[turner] 23223: you can thank me later jim ;)
by turner＠svn.reactos.org 22 Jul '06

22 Jul '06

Author: turner Date: Sat Jul 22 09:50:06 2006 New Revision: 23223 URL: http://svn.reactos.org/svn/reactos?rev=23223&view=rev Log: you can thank me later jim ;) Modified: trunk/reactos/subsystems/win32/win32k/ntuser/menu.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/menu.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/menu.c Sat Jul 22 09:50:06 2006 @@ -351,7 +351,7 @@ Menu->MenuItemList = NULL; /* Insert menu item into process menu handle list */ - InsertTailList(&PsGetCurrentProcessWin32Process()->MenuListHead, &Menu->ListEntry) + InsertTailList(&PsGetCurrentProcessWin32Process()->MenuListHead, &Menu->ListEntry); return Menu; }

1 0

[jimtabor] 23222: Put back revision 23192
by jimtabor＠svn.reactos.org 22 Jul '06

22 Jul '06

Author: jimtabor Date: Sat Jul 22 09:37:33 2006 New Revision: 23222 URL: http://svn.reactos.org/svn/reactos?rev=23222&view=rev Log: Put back revision 23192 Modified: trunk/reactos/subsystems/win32/win32k/ntuser/menu.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/menu.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/menu.c Sat Jul 22 09:37:33 2006 @@ -351,7 +351,7 @@ Menu->MenuItemList = NULL; /* Insert menu item into process menu handle list */ - InsertTailList(&PsGetWin32Process()->MenuListHead, &Menu->ListEntry); + InsertTailList(&PsGetCurrentProcessWin32Process()->MenuListHead, &Menu->ListEntry) return Menu; } @@ -455,7 +455,7 @@ Menu->MenuItemList = NULL; /* Insert menu item into process menu handle list */ - InsertTailList(&PsGetWin32Process()->MenuListHead, &Menu->ListEntry); + InsertTailList(&PsGetCurrentProcessWin32Process()->MenuListHead, &Menu->ListEntry); IntCloneMenuItems(Menu, Source);

1 0

[jimtabor] 23221: -Part 1 -Win32k and User32 - Menu.c: Made set menu items selective masking. Setting masks fixed the garbage going into the item structure. Now right justify menu bar works. There are some more cosmetic issues left to do. I have those ready next week or so. Running wine menu test fail due to exception in kernel32 IsBadStringPtrA&W isbad.c. Funny? Does PSEH work in user mode? The string test is needed. Misc fixed, some restructuring and Wine ports. Please let me know if it breaks
by jimtabor＠svn.reactos.org 22 Jul '06

22 Jul '06

Author: jimtabor Date: Sat Jul 22 09:28:44 2006 New Revision: 23221 URL: http://svn.reactos.org/svn/reactos?rev=23221&view=rev Log: -Part 1 -Win32k and User32 - Menu.c: Made set menu items selective masking. Setting masks fixed the garbage going into the item structure. Now right justify menu bar works. There are some more cosmetic issues left to do. I have those ready next week or so. Running wine menu test fail due to exception in kernel32 IsBadStringPtrA&W isbad.c. Funny? Does PSEH work in user mode? The string test is needed. Misc fixed, some restructuring and Wine ports. Please let me know if it breaks something. Modified: trunk/reactos/dll/win32/user32/windows/menu.c trunk/reactos/subsystems/win32/win32k/ntuser/menu.c Modified: trunk/reactos/dll/win32/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/menu.c (original) +++ trunk/reactos/dll/win32/user32/windows/menu.c Sat Jul 22 09:28:44 2006 @@ -1,34 +1,12 @@ -/* - * ReactOS kernel - * Copyright (C) 1998, 1999, 2000, 2001 ReactOS Team - * - * Partly based on Wine code - * Copyright 1993 Martin Ayotte - * Copyright 1994 Alexandre Julliard - * Copyright 1997 Morten Welinder - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ /* $Id$ * + * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS user32.dll - * FILE: lib/user32/windows/menu.c + * FILE: user32/windows/menu.c * PURPOSE: Menus - * PROGRAMMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) - * UPDATE HISTORY: - * 09-05-2001 CSH Created + * + * PROGRAMMERS: Casper S. Hornstrup + * James Tabor */ /* INCLUDES ******************************************************************/ @@ -62,6 +40,7 @@ (0 != ((MenuInfo)->Flags & MF_POPUP) && 0 != ((MenuInfo)->Flags & MF_SYSMENU)) #define IS_MAGIC_ITEM(Bmp) ((int) Bmp <12) +#define IS_MAGIC_BITMAP(id) ((id) && ((INT_PTR)(id) < 12) && ((INT_PTR)(id) >= -1)) #define MENU_ITEM_HBMP_SPACE (5) #define MENU_BAR_ITEMS_SPACE (12) @@ -155,7 +134,7 @@ /*********************************************************************** * MenuSetRosMenuInfo * - * Set full information about menu + * Set full information about menu */ static BOOL FASTCALL MenuSetRosMenuInfo(PROSMENUINFO MenuInfo) @@ -186,13 +165,16 @@ static BOOL FASTCALL MenuGetRosMenuItemInfo(HMENU Menu, UINT Index, PROSMENUITEMINFO ItemInfo) { + UINT Save_Mask = ItemInfo->fMask; /* Save the org mask bits. */ + if (ItemInfo->dwTypeData != NULL) { HeapFree(GetProcessHeap(), 0, ItemInfo->dwTypeData); } + ItemInfo->fMask = MIIM_BITMAP | MIIM_CHECKMARKS | MIIM_DATA | MIIM_FTYPE - | MIIM_ID | MIIM_STATE | MIIM_STRING | MIIM_SUBMENU | MIIM_TYPE; + | MIIM_ID | MIIM_STATE | MIIM_STRING | MIIM_SUBMENU | MIIM_TYPE; ItemInfo->dwTypeData = NULL; if (! NtUserMenuItemInfo(Menu, Index, TRUE, ItemInfo, FALSE)) @@ -217,14 +199,14 @@ return FALSE; } } - + ItemInfo->fMask = Save_Mask; return TRUE; } /*********************************************************************** * MenuSetRosMenuItemInfo * - * Set full information about a menu item + * Set selected information about a menu item, need to set the mask bits. */ static BOOL FASTCALL MenuSetRosMenuItemInfo(HMENU Menu, UINT Index, PROSMENUITEMINFO ItemInfo) @@ -236,10 +218,6 @@ { ItemInfo->cch = strlenW(ItemInfo->dwTypeData); } - ItemInfo->fMask = MIIM_BITMAP | MIIM_CHECKMARKS | MIIM_DATA | MIIM_FTYPE - | MIIM_ID | MIIM_STATE | MIIM_STRING | MIIM_SUBMENU | MIIM_TYPE; - - Ret = NtUserMenuItemInfo(Menu, Index, TRUE, ItemInfo, TRUE); return Ret; @@ -368,10 +346,11 @@ /* fall through */ case (INT_PTR) HBMMENU_MBAR_RESTORE: case (INT_PTR) HBMMENU_MBAR_MINIMIZE: + case (INT_PTR) HBMMENU_MBAR_CLOSE: case (INT_PTR) HBMMENU_MBAR_MINIMIZE_D: - case (INT_PTR) HBMMENU_MBAR_CLOSE: case (INT_PTR) HBMMENU_MBAR_CLOSE_D: /* FIXME: Why we need to subtract these magic values? */ + /* to make them smaller than the menu bar? */ Size->cx = GetSystemMetrics(SM_CXSIZE) - 2; Size->cy = GetSystemMetrics(SM_CYSIZE) - 4; return; @@ -422,9 +401,9 @@ switch ((INT_PTR)hbmpToDraw) { case (INT_PTR) HBMMENU_SYSTEM: - if (NULL != Item->hbmpItem) + if (NULL != Item->dwTypeData) { - Bmp = Item->hbmpItem; + Bmp = (HBITMAP)Item->dwTypeData; if (! GetObjectW(Bmp, sizeof(BITMAP), &Bm)) { return; @@ -432,6 +411,7 @@ } else { + if (!BmpSysMenu) BmpSysMenu = LoadBitmapW(0, MAKEINTRESOURCEW(OBM_CLOSE)); Bmp = BmpSysMenu; if (! GetObjectW(Bmp, sizeof(BITMAP), &Bm)) { @@ -514,8 +494,8 @@ /* handle fontsize > bitmap_height */ Top = (Bm.bmHeight < h) ? Rect->top + (h - Bm.bmHeight) / 2 : Rect->top; Left = Rect->left; - Rop = (0 != (Item->fState & MF_HILITE) && ! IS_MAGIC_ITEM(Item->hbmpItem)) ? NOTSRCCOPY : SRCCOPY; - if (0 != (Item->fState & MF_HILITE) && IS_BITMAP_ITEM(Item->fType)) + Rop= ((Item->fState & MF_HILITE) && !IS_MAGIC_BITMAP(hbmpToDraw)) ? NOTSRCCOPY : SRCCOPY; + if ((Item->fState & MF_HILITE) && Item->hbmpItem) { SetBkColor(Dc, GetSysColor(COLOR_HIGHLIGHT)); } @@ -545,7 +525,6 @@ UserDrawSysMenuButton(Wnd, Dc, &Rect, Item->fState & (MF_HILITE | MF_MOUSESELECT)); } - return; } @@ -587,7 +566,9 @@ SetBkColor(Dc, GetSysColor(bkgnd)); } - if (0 != (Item->fType & MF_OWNERDRAW)) + Rect = Item->Rect; + + if (Item->fType & MF_OWNERDRAW) { /* ** Experimentation under Windows reveals that an owner-drawn @@ -620,7 +601,7 @@ dis.itemAction = Action; /* ODA_DRAWENTIRE | ODA_SELECT | ODA_FOCUS; */ dis.hwndItem = (HWND) MenuInfo->Self; dis.hDC = Dc; - dis.rcItem = Item->Rect; + dis.rcItem = Rect; DPRINT("Ownerdraw: owner=%p itemID=%d, itemState=%d, itemAction=%d, " "hwndItem=%p, hdc=%p, rcItem={%ld,%ld,%ld,%ld}\n", Wnd, dis.itemID, dis.itemState, dis.itemAction, dis.hwndItem, @@ -648,171 +629,157 @@ Item->Rect.right, Item->Rect.bottom); if (MenuBar && 0 != (Item->fType & MF_SEPARATOR)) - { - return; - } - - Rect = Item->Rect; - - if (0 == (Item->fType & MF_OWNERDRAW)) - { - if (Item->fState & MF_HILITE) - { - if (flat_menu) - { - InflateRect (&Rect, -1, -1); - FillRect(Dc, &Rect, GetSysColorBrush(COLOR_MENUHILIGHT)); - InflateRect (&Rect, 1, 1); - FrameRect(Dc, &Rect, GetSysColorBrush(COLOR_HIGHLIGHT)); - } - else - { - if (MenuBar) - { - DrawEdge(Dc, &Rect, BDR_SUNKENOUTER, BF_RECT); - } - else - { - FillRect(Dc, &Rect, GetSysColorBrush(COLOR_HIGHLIGHT)); - } - } - } - else - { - FillRect(Dc, &Rect, GetSysColorBrush(bkgnd)); - } - } + { + return; + } + + if (Item->fState & MF_HILITE) + { + if (flat_menu) + { + InflateRect (&Rect, -1, -1); + FillRect(Dc, &Rect, GetSysColorBrush(COLOR_MENUHILIGHT)); + InflateRect (&Rect, 1, 1); + FrameRect(Dc, &Rect, GetSysColorBrush(COLOR_HIGHLIGHT)); + } + else + { + if (MenuBar) + { + DrawEdge(Dc, &Rect, BDR_SUNKENOUTER, BF_RECT); + } + else + { + FillRect(Dc, &Rect, GetSysColorBrush(COLOR_HIGHLIGHT)); + } + } + } + else + { + FillRect(Dc, &Rect, GetSysColorBrush(bkgnd)); + } SetBkMode(Dc, TRANSPARENT); - if (0 == (Item->fType & MF_OWNERDRAW)) - { - /* vertical separator */ - if (! MenuBar && 0 != (Item->fType & MF_MENUBARBREAK)) - { - HPEN oldPen; - RECT rc = Rect; - rc.top = 3; - rc.bottom = Height - 3; - if (flat_menu) - { - oldPen = SelectObject( Dc, GetSysColorPen(COLOR_BTNSHADOW) ); - MoveToEx( Dc, rc.left, rc.top, NULL ); - LineTo( Dc, rc.left, rc.bottom ); - SelectObject( Dc, oldPen ); - } - else - DrawEdge(Dc, &rc, EDGE_ETCHED, BF_LEFT); - } - - /* horizontal separator */ - if (0 != (Item->fType & MF_SEPARATOR)) - { - HPEN oldPen; - RECT rc = Rect; - rc.left++; - rc.right--; - rc.top += SEPARATOR_HEIGHT / 2; - if (flat_menu) - { - oldPen = SelectObject( Dc, GetSysColorPen(COLOR_BTNSHADOW) ); - MoveToEx( Dc, rc.left, rc.top, NULL ); - LineTo( Dc, rc.right, rc.top ); - SelectObject( Dc, oldPen ); - } - else - DrawEdge(Dc, &rc, EDGE_ETCHED, BF_TOP); - return; - } - } + /* vertical separator */ + if (! MenuBar && 0 != (Item->fType & MF_MENUBARBREAK)) + { + HPEN oldPen; + RECT rc = Rect; + rc.top = 3; + rc.bottom = Height - 3; + if (flat_menu) + { + oldPen = SelectObject( Dc, GetSysColorPen(COLOR_BTNSHADOW) ); + MoveToEx( Dc, rc.left, rc.top, NULL ); + LineTo( Dc, rc.left, rc.bottom ); + SelectObject( Dc, oldPen ); + } + else + DrawEdge(Dc, &rc, EDGE_ETCHED, BF_LEFT); + } + + /* horizontal separator */ + if (0 != (Item->fType & MF_SEPARATOR)) + { + HPEN oldPen; + RECT rc = Rect; + rc.left++; + rc.right--; + rc.top += SEPARATOR_HEIGHT / 2; + if (flat_menu) + { + oldPen = SelectObject( Dc, GetSysColorPen(COLOR_BTNSHADOW) ); + MoveToEx( Dc, rc.left, rc.top, NULL ); + LineTo( Dc, rc.right, rc.top ); + SelectObject( Dc, oldPen ); + } + else + DrawEdge(Dc, &rc, EDGE_ETCHED, BF_TOP); + return; + } #if 0 /* helper lines for debugging */ + /* This is a very good test tool when hacking menus! (JT) 07/16/2006 */ FrameRect(Dc, &Rect, GetStockObject(BLACK_BRUSH)); - SelectObject(Dc, SYSCOLOR_GetPen(COLOR_WINDOWFRAME)); + SelectObject(Dc, GetSysColorPen(COLOR_WINDOWFRAME)); MoveToEx(Dc, Rect.left, (Rect.top + Rect.bottom) / 2, NULL); LineTo(Dc, Rect.right, (Rect.top + Rect.bottom) / 2); #endif if (! MenuBar) - { - INT y = Rect.top + Rect.bottom; - UINT CheckBitmapWidth = GetSystemMetrics(SM_CXMENUCHECK); - UINT CheckBitmapHeight = GetSystemMetrics(SM_CYMENUCHECK); - - if (0 == (Item->fType & MF_OWNERDRAW)) - { - /* Draw the check mark - * - * FIXME: - * Custom checkmark bitmaps are monochrome but not always 1bpp. - */ - HBITMAP bm = 0 != (Item->fState & MF_CHECKED) ? Item->hbmpChecked : Item->hbmpUnchecked; - if (NULL != bm) /* we have a custom bitmap */ - { - HDC DcMem = CreateCompatibleDC(Dc); - SelectObject(DcMem, bm); - BitBlt(Dc, Rect.left, (y - CheckBitmapHeight) / 2, - CheckBitmapWidth, CheckBitmapHeight, - DcMem, 0, 0, SRCCOPY); - DeleteDC(DcMem); - } - else if (0 != (Item->fState & MF_CHECKED)) /* standard bitmaps */ - { - RECT r; - HBITMAP bm = CreateBitmap(CheckBitmapWidth, CheckBitmapHeight, 1, 1, NULL); - HDC DcMem = CreateCompatibleDC(Dc); - SelectObject(DcMem, bm); - SetRect( &r, 0, 0, CheckBitmapWidth, CheckBitmapHeight); - DrawFrameControl(DcMem, &r, DFC_MENU, - 0 != (Item->fType & MFT_RADIOCHECK) ? - DFCS_MENUBULLET : DFCS_MENUCHECK); - BitBlt(Dc, Rect.left, (y - r.bottom) / 2, r.right, r.bottom, - DcMem, 0, 0, SRCCOPY ); - DeleteDC(DcMem); - DeleteObject(bm); - } - if (Item->hbmpItem) - { - MenuDrawBitmapItem(Dc, Item, &Rect, MenuInfo->Self, WndOwner, Action, MenuBar); - } - } - - /* Draw the popup-menu arrow */ - if (0 != (Item->fType & MF_POPUP)) - { - HDC DcMem = CreateCompatibleDC(Dc); - HBITMAP OrigBitmap; - - OrigBitmap = SelectObject(DcMem, StdMnArrow); - BitBlt(Dc, Rect.right - ArrowBitmapWidth - 1, - (y - ArrowBitmapHeight) / 2, - ArrowBitmapWidth, ArrowBitmapHeight, - DcMem, 0, 0, SRCCOPY); - SelectObject(DcMem, OrigBitmap); - DeleteDC(DcMem); - } - - Rect.left += CheckBitmapWidth; - Rect.right -= ArrowBitmapWidth; - } - else - /* Draw the item text or bitmap */ - if (Item->hbmpItem && !(Item->fType & MF_OWNERDRAW)) //IS_BITMAP_ITEM(Item->fType)) - { - MenuDrawBitmapItem(Dc, Item, &Rect, MenuInfo->Self, WndOwner, Action, MenuBar); - } - - /* Done for owner-drawn */ - if (0 != (Item->fType & MF_OWNERDRAW)) - { - return; - } + { + INT y = Rect.top + Rect.bottom; + RECT Rc = Rect; + UINT CheckBitmapWidth = GetSystemMetrics(SM_CXMENUCHECK); + UINT CheckBitmapHeight = GetSystemMetrics(SM_CYMENUCHECK); + int checked = FALSE; + /* Draw the check mark + * + * FIXME: + * Custom checkmark bitmaps are monochrome but not always 1bpp. + */ + if( !(MenuInfo->dwStyle & MNS_NOCHECK)) + { + HBITMAP bm = 0 != (Item->fState & MF_CHECKED) ? Item->hbmpChecked : Item->hbmpUnchecked; + if (NULL != bm) /* we have a custom bitmap */ + { + HDC DcMem = CreateCompatibleDC(Dc); + SelectObject(DcMem, bm); + BitBlt(Dc, Rc.left, (y - CheckBitmapHeight) / 2, + CheckBitmapWidth, CheckBitmapHeight, + DcMem, 0, 0, SRCCOPY); + DeleteDC(DcMem); + checked = TRUE; + } + else if (0 != (Item->fState & MF_CHECKED)) /* standard bitmaps */ + { + RECT r; + HBITMAP bm = CreateBitmap(CheckBitmapWidth, CheckBitmapHeight, 1, 1, NULL); + HDC DcMem = CreateCompatibleDC(Dc); + SelectObject(DcMem, bm); + SetRect( &r, 0, 0, CheckBitmapWidth, CheckBitmapHeight); + DrawFrameControl(DcMem, &r, DFC_MENU, + 0 != (Item->fType & MFT_RADIOCHECK) ? + DFCS_MENUBULLET : DFCS_MENUCHECK); + BitBlt(Dc, Rc.left, (y - r.bottom) / 2, r.right, r.bottom, + DcMem, 0, 0, SRCCOPY ); + DeleteDC(DcMem); + DeleteObject(bm); + checked = TRUE; + } + } + if ((Item->hbmpItem)&& !( checked && (MenuInfo->dwStyle & MNS_CHECKORBMP))) + { + MenuDrawBitmapItem(Dc, Item, &Rect, MenuInfo->Self, WndOwner, Action, MenuBar); + } + /* Draw the popup-menu arrow */ + if (0 != (Item->fType & MF_POPUP)) + { + HDC DcMem = CreateCompatibleDC(Dc); + HBITMAP OrigBitmap; + + OrigBitmap = SelectObject(DcMem, StdMnArrow); + BitBlt(Dc, Rect.right - ArrowBitmapWidth - 1, + (y - ArrowBitmapHeight) / 2, + ArrowBitmapWidth, ArrowBitmapHeight, + DcMem, 0, 0, SRCCOPY); + SelectObject(DcMem, OrigBitmap); + DeleteDC(DcMem); + } + Rect.left += CheckBitmapWidth; + Rect.right -= ArrowBitmapWidth; + } + else if (Item->hbmpItem) /* Draw the bitmap */ + { + MenuDrawBitmapItem(Dc, Item, &Rect, MenuInfo->Self, WndOwner, Action, MenuBar); + } /* No bitmap - process text if present */ - else if ( !(Item->fType & MF_SYSMENU) && IS_STRING_ITEM(Item->fType)) - { - register int i; + if (Item->Text) + { + register int i = 0; HFONT FontOld = NULL; UINT uFormat = MenuBar ? DT_CENTER | DT_VCENTER | DT_SINGLELINE @@ -833,14 +800,18 @@ Rect.left += MenuInfo->maxBmpSize.cx; Rect.right -= MenuInfo->maxBmpSize.cx; } + Text = (PWCHAR) Item->dwTypeData; - for (i = 0; L'\0' != Text[i]; i++) + if(Text) + { + for (i = 0; L'\0' != Text[i]; i++) { if (L'\t' == Text[i] || L'\b' == Text[i]) { break; } } + } if (0 != (Item->fState & MF_GRAYED)) { @@ -887,7 +858,7 @@ { SelectObject(Dc, FontOld); } - } + } } /*********************************************************************** @@ -1032,7 +1003,7 @@ MENUITEMINFOW mii; mii.cbSize = sizeof(mii); - mii.fMask = MIIM_STATE | MIIM_ID | MIIM_TYPE; + mii.fMask = MIIM_STATE | MIIM_ID | MIIM_FTYPE; mii.fType = GET_DWORD(res); res += sizeof(DWORD); mii.fState = GET_DWORD(res); @@ -1065,8 +1036,6 @@ } else if(!*mii.dwTypeData && !(mii.fType & MF_SEPARATOR)) { - DbgPrint("WARN: Converting NULL menu item %04x, type %04x to SEPARATOR\n", - mii.wID, mii.fType); mii.fType |= MF_SEPARATOR; } InsertMenuItemW(hMenu, -1, MF_BYPOSITION, &mii); @@ -1209,9 +1178,12 @@ INT OrgX, INT OrgY, BOOL MenuBar) { PWCHAR p; + SIZE MenuCharSize; UINT CheckBitmapWidth = GetSystemMetrics(SM_CXMENUCHECK); DPRINT("dc=%x owner=%x (%d,%d)\n", Dc, WndOwner, OrgX, OrgY); + + MenuCharSize.cx = GdiGetCharDimensions( Dc, NULL, &MenuCharSize.cy ); SetRect(&ItemInfo->Rect, OrgX, OrgY, OrgX, OrgY); @@ -1235,16 +1207,13 @@ /* Tests reveal that Windows ( Win95 thru WinXP) adds twice the average * width of a menufont character to the width of an owner-drawn menu. */ - ItemInfo->Rect.right += mis.itemWidth + 2 * - GdiGetCharDimensions( Dc, NULL, NULL ); + ItemInfo->Rect.right += mis.itemWidth + 2 * MenuCharSize.cx; + if (MenuBar) { - ItemInfo->Rect.right += MENU_BAR_ITEMS_SPACE; - /* under at least win95 you seem to be given a standard height for the menu and the height value is ignored */ - - ItemInfo->Rect.bottom += GetSystemMetrics(SM_CYMENU) - 1; + ItemInfo->Rect.bottom += GetSystemMetrics(SM_CYMENUSIZE); } else { @@ -1252,21 +1221,18 @@ } DPRINT("id=%04x size=%dx%d\n", ItemInfo->wID, mis.itemWidth, mis.itemHeight); - /* Fall through to get check/arrow width calculation. */ + return; } if (0 != (ItemInfo->fType & MF_SEPARATOR)) { ItemInfo->Rect.bottom += SEPARATOR_HEIGHT; + if( !MenuBar) + ItemInfo->Rect.right += ArrowBitmapWidth + MenuCharSize.cx; return; } - if (0 != (ItemInfo->fType & MF_OWNERDRAW)) - { - return; - } - - if (ItemInfo->hbmpItem) //IS_BITMAP_ITEM(ItemInfo->fType)) + if (ItemInfo->hbmpItem) { SIZE Size; @@ -1289,7 +1255,6 @@ { ItemInfo->Rect.right += ArrowBitmapWidth; } - } else { @@ -1309,7 +1274,7 @@ } /* it must be a text item - unless it's the system menu */ - if (0 == (ItemInfo->fType & MF_SYSMENU) && IS_STRING_ITEM(ItemInfo->fType)) + if (0 == (ItemInfo->fType & MF_SYSMENU) && ItemInfo->Text) { SIZE Size; @@ -1372,7 +1337,7 @@ Start = 0; MaxX = 2 + 1; - MenuInitRosMenuItemInfo(&ItemInfo); + MenuInitRosMenuItemInfo(&ItemInfo); while (Start < MenuInfo->MenuItemCount) { OrgX = MaxX; @@ -1394,7 +1359,6 @@ { break; } - MenuCalcItemSize(Dc, &ItemInfo, MenuInfo, WndOwner, OrgX, OrgY, FALSE); if (! MenuSetRosMenuItemInfo(MenuInfo->Self, i, &ItemInfo)) { @@ -1409,7 +1373,7 @@ } MaxX = max(MaxX, ItemInfo.Rect.right); OrgY = ItemInfo.Rect.bottom; - if (IS_STRING_ITEM(ItemInfo.fType) && 0 != ItemInfo.XTab) + if ((ItemInfo.Text) && 0 != ItemInfo.XTab) { MaxTab = max(MaxTab, ItemInfo.XTab); MaxTabWidth = max(MaxTabWidth, ItemInfo.Rect.right - ItemInfo.XTab); @@ -1423,7 +1387,7 @@ if (MenuGetRosMenuItemInfo(MenuInfo->Self, Start, &ItemInfo)) { ItemInfo.Rect.right = MaxX; - if (IS_STRING_ITEM(ItemInfo.fType) && 0 != ItemInfo.XTab) + if ((ItemInfo.Text) && 0 != ItemInfo.XTab) { ItemInfo.XTab = MaxTab; } @@ -1476,6 +1440,7 @@ MaxY = Rect->top + 1; Start = 0; HelpPos = -1; + MenuInitRosMenuItemInfo(&ItemInfo); while (Start < MenuInfo->MenuItemCount) { @@ -1502,6 +1467,7 @@ DPRINT("calling MENU_CalcItemSize org=(%d, %d)\n", OrgX, OrgY); MenuCalcItemSize(Dc, &ItemInfo, MenuInfo, WndOwner, OrgX, OrgY, TRUE); + if (! MenuSetRosMenuItemInfo(MenuInfo->Self, i, &ItemInfo)) { MenuCleanupRosMenuItemInfo(&ItemInfo); @@ -1531,7 +1497,8 @@ } } -/* FIXME: Is this really needed? */ +/* FIXME: Is this really needed? */ /*NO! it is not needed, why make the +HBMMENU_MBAR_CLOSE, MINIMIZE & RESTORE, look the same size as the menu bar! */ #if 0 /* Finish the line (set all items to the largest height found) */ while (Start < i) @@ -1544,7 +1511,7 @@ Start++; } #else - Start = i; + Start = i; /* This works! */ #endif } @@ -1731,7 +1698,9 @@ SendMessageW(Wnd, WM_INITMENU, (WPARAM)Menu, 0); - if (MenuGetRosMenuInfo(&MenuInfo, Menu) && 0 == MenuInfo.Height) + MenuGetRosMenuInfo(&MenuInfo, Menu); + + if (0 == MenuInfo.Height) { /* app changed/recreated menu bar entries in WM_INITMENU Recalculate menu sizes else clicks will not work */ @@ -1739,6 +1708,15 @@ SWP_NOACTIVATE | SWP_NOZORDER | SWP_FRAMECHANGED ); } + /* This makes the menus of applications built with Delphi work. + * It also enables menus to be displayed in more than one window, + * but there are some bugs left that need to be fixed in this case. + */ + if(MenuInfo.Self == Menu) + { + MenuInfo.Wnd = Wnd; + MenuSetRosMenuInfo(&MenuInfo); + } } return TRUE; @@ -1771,6 +1749,7 @@ MenuInitRosMenuItemInfo(&ItemInfo); if (MenuGetRosMenuItemInfo(MenuInfo.Self, MenuInfo.FocusedItem, &ItemInfo)) { + ItemInfo.fMask |= MIIM_STATE; ItemInfo.fState &= ~(MF_HILITE|MF_MOUSESELECT); MenuSetRosMenuItemInfo(MenuInfo.Self, MenuInfo.FocusedItem, &ItemInfo); } @@ -1936,12 +1915,12 @@ SelectObject(Dc, hMenuFont); MenuInitRosMenuItemInfo(&ItemInfo); - /* Clear previous highlighted item */ if (NO_SELECTED_ITEM != MenuInfo->FocusedItem) { if (MenuGetRosMenuItemInfo(MenuInfo->Self, MenuInfo->FocusedItem, &ItemInfo)) { + ItemInfo.fMask |= MIIM_STATE; ItemInfo.fState &= ~(MF_HILITE|MF_MOUSESELECT); MenuSetRosMenuItemInfo(MenuInfo->Self, MenuInfo->FocusedItem, &ItemInfo); } @@ -1959,6 +1938,7 @@ { if (0 == (ItemInfo.fType & MF_SEPARATOR)) { + ItemInfo.fMask |= MIIM_STATE; ItemInfo.fState |= MF_HILITE; MenuSetRosMenuItemInfo(MenuInfo->Self, MenuInfo->FocusedItem, &ItemInfo); MenuDrawMenuItem(MenuInfo->Wnd, MenuInfo, WndOwner, Dc, @@ -1993,7 +1973,6 @@ } } } - MenuCleanupRosMenuItemInfo(&ItemInfo); ReleaseDC(MenuInfo->Wnd, Dc); } @@ -2113,7 +2092,7 @@ } #if 0 mii.cbSize = sizeof(MENUITEMINFOW); - mii.fMask = MIIM_STATE; + mii.fMask |= MIIM_STATE; if((DefItem != SC_CLOSE) && GetMenuItemInfoW(Menu, DefItem, FALSE, &mii) && (mii.fState & (MFS_GRAYED | MFS_DISABLED))) { @@ -2188,7 +2167,7 @@ } SelectObject(Dc, hMenuFont); - + ItemInfo.fMask |= MIIM_STATE; ItemInfo.fState |= MF_HILITE; MenuSetRosMenuItemInfo(MenuInfo->Self, MenuInfo->FocusedItem, &ItemInfo); MenuDrawMenuItem(MenuInfo->Wnd, MenuInfo, WndOwner, Dc, &ItemInfo, MenuInfo->Height, @@ -2202,8 +2181,8 @@ ItemInfo.Rect = Rect; } + ItemInfo.fMask |= MIIM_STATE; ItemInfo.fState |= MF_MOUSESELECT; - MenuSetRosMenuItemInfo(MenuInfo->Self, MenuInfo->FocusedItem, &ItemInfo); if (IS_SYSTEM_MENU(MenuInfo)) @@ -2264,6 +2243,7 @@ if (NULL != MenuInfo && NULL != TopPopup && NO_SELECTED_ITEM != MenuInfo->FocusedItem) { MenuInitRosMenuItemInfo(&ItemInfo); + ItemInfo.fMask |= MIIM_FTYPE | MIIM_STATE; if (! MenuGetRosMenuItemInfo(MenuInfo->Self, MenuInfo->FocusedItem, &ItemInfo) || 0 == (ItemInfo.fType & MF_POPUP) || 0 == (ItemInfo.fState & MF_MOUSESELECT)) @@ -2272,6 +2252,7 @@ return; } ItemInfo.fState &= ~MF_MOUSESELECT; + ItemInfo.fMask |= MIIM_STATE; MenuSetRosMenuItemInfo(MenuInfo->Self, MenuInfo->FocusedItem, &ItemInfo); if (MenuGetRosMenuInfo(&SubMenuInfo, ItemInfo.hSubMenu)) { @@ -3123,7 +3104,7 @@ ItemInfo = Items; for (i = 0; i < MenuInfo->MenuItemCount; i++, ItemInfo++) { - if (IS_STRING_ITEM(ItemInfo->fType) && NULL != ItemInfo->dwTypeData) + if ((ItemInfo->Text) && NULL != ItemInfo->dwTypeData) { WCHAR *p = (WCHAR *) ItemInfo->dwTypeData - 2; do @@ -3412,6 +3393,7 @@ break; } break; /* WM_KEYDOWN */ + case WM_CHAR: case WM_SYSCHAR: { @@ -3457,7 +3439,9 @@ } else { + PeekMessageW( &Msg, 0, Msg.message, Msg.message, PM_REMOVE ); DispatchMessageW(&Msg); + continue; } if (! fEndMenu) @@ -3625,7 +3609,27 @@ } - +/* + * From MSDN: + * The MFT_BITMAP, MFT_SEPARATOR, and MFT_STRING values cannot be combined + * with one another. Also MFT_OWNERDRAW. Set fMask to MIIM_TYPE to use fType. + * + * Windows 2K/XP: fType is used only if fMask has a value of MIIM_FTYPE. + * + * MIIM_TYPE: Retrieves or sets the fType and dwTypeData members. Windows + * 2K/XP: MIIM_TYPE is replaced by MIIM_BITMAP, MIIM_FTYPE, and MIIM_STRING. + * MFT_STRING is replaced by MIIM_STRING. + * (So, I guess we should use MIIM_STRING only for strings?) + * + * MIIM_FTYPE: Windows 2K/Windows XP: Retrieves or sets the fType member. + * + * Based on wine, SetMenuItemInfo_common: + * 1) set MIIM_STRING | MIIM_FTYPE | MIIM_BITMAP any one with MIIM_TYPE, + * it will result in a error. + * 2) set menu mask to MIIM_FTYPE and MFT_BITMAP ftype it will result in a error. + * These conditions are addressed in Win32k IntSetMenuItemInfo. + * + */ static BOOL FASTCALL @@ -3636,11 +3640,14 @@ LPCWSTR NewItem, BOOL Unicode) { +/* + * Let us assume MIIM_FTYPE is set and building a new menu item structure. + */ if(Flags & MF_BITMAP) { - mii->fType |= MFT_BITMAP; - mii->fMask |= MIIM_BITMAP; + mii->fMask |= MIIM_BITMAP; /* Use the new way of seting hbmpItem.*/ mii->hbmpItem = (HBITMAP) NewItem; + mii->fType &= ~MFT_BITMAP; /* just incase, Kill the old way */ } else if(Flags & MF_OWNERDRAW) { @@ -3648,13 +3655,12 @@ mii->fMask |= MIIM_DATA; mii->dwItemData = (DWORD) NewItem; } + else if (Flags & MF_SEPARATOR) + { + mii->fType |= MFT_SEPARATOR; + } else /* Default action MF_STRING. */ { - /* - if(mii->dwTypeData != NULL) - { - HeapFree(GetProcessHeap(),0, mii.dwTypeData); - }*/ /* Item beginning with a backspace is a help item */ if (NewItem != NULL) { @@ -3677,11 +3683,8 @@ } } } - else - { - mii->fType |= MFT_SEPARATOR; - } - mii->fMask |= MIIM_TYPE; + mii->fMask |= MIIM_STRING; + mii->fType |= MFT_STRING; /* Zero */ mii->dwTypeData = (LPWSTR)NewItem; if (Unicode) mii->cch = (NULL == NewItem ? 0 : strlenW(NewItem)); @@ -3690,29 +3693,40 @@ mii->hbmpItem = NULL; } - if(Flags & MF_RIGHTJUSTIFY) + if(Flags & MF_RIGHTJUSTIFY) /* Same as MF_HELP */ { mii->fType |= MFT_RIGHTJUSTIFY; } + + if(Flags & MF_BYPOSITION) + { + mii->fType |= MF_BYPOSITION; + } + if(Flags & MF_MENUBREAK) { mii->fType |= MFT_MENUBREAK; } - if(Flags & MF_MENUBARBREAK) + else if(Flags & MF_MENUBARBREAK) { mii->fType |= MFT_MENUBARBREAK; } - if(Flags & MF_DISABLED) - { - mii->fState |= MFS_DISABLED; - } + if(Flags & MF_GRAYED) { mii->fState |= MFS_GRAYED; + mii->fMask |= MIIM_STATE; } - - if ((mii->fType & MF_POPUP) && (Flags & MF_POPUP) && (mii->hSubMenu != (HMENU)IDNewItem)) - NtUserDestroyMenu( mii->hSubMenu ); /* ModifyMenu() spec */ + else if(Flags & MF_DISABLED) + { + mii->fState |= MFS_DISABLED; + mii->fMask |= MIIM_STATE; + } + else /* default state */ + { + mii->fState |= MFS_ENABLED; + mii->fMask |= MIIM_STATE; + } if(Flags & MF_POPUP) { @@ -3808,6 +3822,7 @@ if (0 != (Items[i].fType & MF_MENUBARBREAK)) break; if ( i >= idFirst && i <= idLast ) { + Items[i].fMask = MIIM_STATE | MIIM_FTYPE; if ( i == idCheck) { Items[i].fType |= MFT_RADIOCHECK; @@ -4042,14 +4057,14 @@ return FALSE; } - if ((mii->fMask & (MIIM_STRING | MIIM_TYPE)) == 0) + if(!(mii->fMask & (MIIM_TYPE | MIIM_STRING))) { /* No text requested, just pass on */ return NtUserMenuItemInfo(Menu, Item, ByPosition, (PROSMENUITEMINFO) mii, FALSE); } AnsiBuffer = mii->dwTypeData; - Count = mii->cch; + Count = miiW.cch = mii->cch; RtlCopyMemory(&miiW, mii, mii->cbSize); miiW.dwTypeData = 0; @@ -4061,7 +4076,10 @@ } if (!NtUserMenuItemInfo(Menu, Item, ByPosition, (PROSMENUITEMINFO)&miiW, FALSE)) + { + if (miiW.dwTypeData) RtlFreeHeap(GetProcessHeap(), 0, miiW.dwTypeData); return FALSE; + } RtlCopyMemory(mii, &miiW, miiW.cbSize); @@ -4073,7 +4091,7 @@ return TRUE; } - if (IS_STRING_ITEM(miiW.fType)) + if ((miiW.fMask & MIIM_STRING) || (IS_STRING_ITEM(miiW.fType))) { WideCharToMultiByte(CP_ACP, 0, miiW.dwTypeData, miiW.cch, AnsiBuffer, mii->cch, NULL, NULL); @@ -4107,7 +4125,7 @@ return FALSE; } - if ((mii->fMask & (MIIM_STRING | MIIM_TYPE)) == 0) + if(!(mii->fMask & (MIIM_TYPE | MIIM_STRING))) { /* No text requested, just pass on */ return NtUserMenuItemInfo(Menu, Item, ByPosition, (PROSMENUITEMINFO) mii, FALSE); @@ -4115,7 +4133,7 @@ String = mii->dwTypeData; Count = mii->cch; - RtlCopyMemory(&miiW, mii, mii->cbSize); + RtlCopyMemory(&miiW, mii, mii->cbSize); miiW.dwTypeData = 0; if (String) @@ -4126,9 +4144,12 @@ } if (!NtUserMenuItemInfo(Menu, Item, ByPosition, (PROSMENUITEMINFO) &miiW, FALSE)) + { + if (miiW.dwTypeData) RtlFreeHeap(GetProcessHeap(), 0, miiW.dwTypeData); return FALSE; - - RtlCopyMemory(mii, &miiW, miiW.cbSize); // looks okay to over write user data. + } + + RtlCopyMemory(mii, &miiW, miiW.cbSize); // Okay to over write user data. if (!String || !Count) { @@ -4138,7 +4159,7 @@ return TRUE; } - if (IS_STRING_ITEM(miiW.fType)) + if ((miiW.fMask & MIIM_STRING) || (IS_STRING_ITEM(miiW.fType))) { lstrcpynW( String, miiW.dwTypeData, Count ); } @@ -4175,10 +4196,9 @@ { ROSMENUINFO MenuInfo; ROSMENUITEMINFO mii; - + memset( &mii, 0, sizeof(mii) ); mii.cbSize = sizeof(MENUITEMINFOW); - mii.fMask = MIIM_STATE | MIIM_TYPE | MIIM_SUBMENU; - mii.dwTypeData = NULL; + mii.fMask = MIIM_STATE | MIIM_FTYPE | MIIM_SUBMENU; SetLastError(0); if(NtUserMenuItemInfo(hMenu, uId, uFlags, &mii, FALSE)) @@ -4220,9 +4240,10 @@ UINT uFlag) { MENUITEMINFOA mii; + memset( &mii, 0, sizeof(mii) ); mii.dwTypeData = lpString; - mii.fMask = MIIM_STRING; - mii.fType = MF_STRING; + mii.fMask = MIIM_STRING | MIIM_FTYPE; + mii.fType = MFT_STRING; mii.cbSize = sizeof(MENUITEMINFOA); mii.cch = nMaxCount; @@ -4246,9 +4267,10 @@ UINT uFlag) { MENUITEMINFOW miiW; + memset( &miiW, 0, sizeof(miiW) ); miiW.dwTypeData = lpString; - miiW.fMask = MIIM_STRING; - miiW.fType = MF_STRING; + miiW.fMask = MIIM_STRING | MIIM_FTYPE; + miiW.fType = MFT_STRING; miiW.cbSize = sizeof(MENUITEMINFOW); miiW.cch = nMaxCount; @@ -4327,10 +4349,9 @@ LPCSTR lpNewItem) { MENUITEMINFOA mii; + memset( &mii, 0, sizeof(mii) ); mii.cbSize = sizeof(MENUITEMINFOA); - mii.fMask = MIIM_FTYPE | MIIM_STRING | MIIM_STATE; - mii.fType = 0; - mii.fState = MFS_ENABLED; + mii.fMask = MIIM_FTYPE; MenuSetItemData((LPMENUITEMINFOW) &mii, uFlags, @@ -4363,12 +4384,21 @@ if((lpmii->cbSize == sizeof(MENUITEMINFOA)) || (lpmii->cbSize == sizeof(MENUITEMINFOA) - sizeof(HBITMAP))) { - RtlMoveMemory ( &mi, lpmii, lpmii->cbSize ); - + RtlCopyMemory ( &mi, lpmii, lpmii->cbSize ); + + if( lpmii->cbSize != sizeof( MENUITEMINFOW)) + { + mi.cbSize = sizeof( MENUITEMINFOW); + mi.hbmpItem = NULL; + } /* copy the text string */ - if((mi.fMask & (MIIM_TYPE | MIIM_STRING)) && - (MENU_ITEM_TYPE(mi.fType) == MF_STRING) && mi.dwTypeData) - { + if (((mi.fMask & MIIM_STRING) || + ((mi.fMask & MIIM_TYPE) && (MENU_ITEM_TYPE(mi.fType) == MF_STRING))) + && mi.dwTypeData != NULL) + { + UINT Count = lpmii->cch; + if(!Count) Count++; + if (IsBadStringPtrA(lpmii->dwTypeData, Count)) return FALSE; Status = RtlCreateUnicodeStringFromAsciiz(&MenuText, (LPSTR)mi.dwTypeData); if (!NT_SUCCESS (Status)) { @@ -4379,7 +4409,6 @@ mi.cch = MenuText.Length / sizeof(WCHAR); CleanHeap = TRUE; } - res = NtUserInsertMenuItem(hMenu, uItem, fByPosition, &mi); if ( CleanHeap ) RtlFreeUnicodeString ( &MenuText ); @@ -4402,7 +4431,6 @@ MENUITEMINFOW mi; UNICODE_STRING MenuText; BOOL res = FALSE; - mi.hbmpItem = (HBITMAP)0; /* while we could just pass 'lpmii' to win32k, we make a copy so that if a bad user passes bad data, we crash his process instead of the @@ -4411,18 +4439,25 @@ if((lpmii->cbSize == sizeof(MENUITEMINFOW)) || (lpmii->cbSize == sizeof(MENUITEMINFOW) - sizeof(HBITMAP))) { - memcpy(&mi, lpmii, lpmii->cbSize); - + RtlCopyMemory(&mi, lpmii, lpmii->cbSize); + + if( lpmii->cbSize != sizeof( MENUITEMINFOW)) + { + mi.cbSize = sizeof( MENUITEMINFOW); + mi.hbmpItem = NULL; + } /* copy the text string */ - if((mi.fMask & (MIIM_TYPE | MIIM_STRING)) && - (MENU_ITEM_TYPE(mi.fType) == MF_STRING) && - mi.dwTypeData != NULL) - { + if (((mi.fMask & MIIM_STRING) || + ((mi.fMask & MIIM_TYPE) && (MENU_ITEM_TYPE(mi.fType) == MF_STRING))) + && mi.dwTypeData != NULL) + { + UINT Count = lpmii->cch; + if(!Count) Count++; + if (IsBadStringPtrW(lpmii->dwTypeData, Count)) return FALSE; RtlInitUnicodeString(&MenuText, (PWSTR)lpmii->dwTypeData); mi.dwTypeData = MenuText.Buffer; mi.cch = MenuText.Length / sizeof(WCHAR); - }; - + } res = NtUserInsertMenuItem(hMenu, uItem, fByPosition, &mi); } return res; @@ -4442,10 +4477,9 @@ LPCWSTR lpNewItem) { MENUITEMINFOW mii; + memset( &mii, 0, sizeof(mii) ); mii.cbSize = sizeof(MENUITEMINFOW); - mii.fMask = MIIM_FTYPE | MIIM_STRING | MIIM_STATE; - mii.fType = 0; - mii.fState = MFS_ENABLED; + mii.fMask = MIIM_FTYPE; MenuSetItemData( &mii, uFlags, @@ -4581,18 +4615,28 @@ UINT_PTR uIDNewItem, LPCSTR lpNewItem) { + ROSMENUINFO mi; + ROSMENUITEMINFO rmii; MENUITEMINFOA mii; memset( &mii, 0, sizeof(mii) ); mii.cbSize = sizeof(MENUITEMINFOA); - mii.fMask = MIIM_FTYPE | MIIM_STRING | MIIM_STATE; - mii.fType = 0; - mii.fState = MFS_ENABLED; - - if(!GetMenuItemInfoA( hMnu, - uPosition, - (BOOL)(MF_BYPOSITION & uFlags), - &mii)) return FALSE; - + mii.fMask = MIIM_FTYPE; + + if (!MenuGetRosMenuInfo( &mi, hMnu )) return FALSE; + + mi.Height = 0; + + if (!MenuSetRosMenuInfo( &mi )) return FALSE; + + MenuInitRosMenuItemInfo( &rmii ); + + if(!MenuGetRosMenuItemInfo( hMnu, uPosition, &rmii)) return FALSE; + + if ((rmii.fType & MF_POPUP) && (uFlags & MF_POPUP) && (rmii.hSubMenu != (HMENU)uIDNewItem)) + NtUserDestroyMenu( rmii.hSubMenu ); /* ModifyMenu() spec */ + + MenuCleanupRosMenuItemInfo( &rmii ); + MenuSetItemData((LPMENUITEMINFOW) &mii, uFlags, uIDNewItem, @@ -4618,24 +4662,36 @@ UINT_PTR uIDNewItem, LPCWSTR lpNewItem) { + ROSMENUINFO mi; + ROSMENUITEMINFO rmii; MENUITEMINFOW mii; memset ( &mii, 0, sizeof(mii) ); mii.cbSize = sizeof(MENUITEMINFOW); - mii.fMask = MIIM_FTYPE | MIIM_STRING | MIIM_STATE; - mii.fState = MFS_ENABLED; - - if(!NtUserMenuItemInfo( hMnu, - uPosition, - (BOOL)(MF_BYPOSITION & uFlags), - (PROSMENUITEMINFO) &mii, - FALSE)) return FALSE; - + mii.fMask = MIIM_FTYPE; + + if (!MenuGetRosMenuInfo( &mi, hMnu )) return FALSE; + + mi.Height = 0; // Force size recalculation. + + if (!MenuSetRosMenuInfo( &mi )) return FALSE; + + MenuInitRosMenuItemInfo( &rmii ); + + if(!MenuGetRosMenuItemInfo( hMnu, uPosition, &rmii)) return FALSE; + + if ((rmii.fType & MF_POPUP) && (uFlags & MF_POPUP) && (rmii.hSubMenu != (HMENU)uIDNewItem)) + NtUserDestroyMenu( rmii.hSubMenu ); /* ModifyMenu() spec */ + + MenuCleanupRosMenuItemInfo( &rmii ); + + /* Init new data for this menu item */ MenuSetItemData( &mii, uFlags, uIDNewItem, lpNewItem, TRUE); + /* Now, make Win32k IntSetMenuItemInfo handle the changes to this menu item. */ return SetMenuItemInfoW( hMnu, uPosition, (BOOL)(MF_BYPOSITION & uFlags), @@ -4714,7 +4770,9 @@ HBITMAP hBitmapChecked) { ROSMENUITEMINFO uItem; - + memset ( &uItem, 0, sizeof(uItem) ); + uItem.fMask = MIIM_STATE | MIIM_BITMAP; + if(!(NtUserMenuItemInfo(hMenu, uPosition, (BOOL)(MF_BYPOSITION & uFlags), &uItem, FALSE))) return FALSE; @@ -4746,16 +4804,38 @@ { MENUITEMINFOW MenuItemInfoW; UNICODE_STRING UnicodeString; - ULONG Result; + NTSTATUS Status; + ULONG Result = FALSE; RtlCopyMemory(&MenuItemInfoW, lpmii, min(lpmii->cbSize, sizeof(MENUITEMINFOW))); - if ((MenuItemInfoW.fMask & (MIIM_TYPE | MIIM_STRING)) && - (MENU_ITEM_TYPE(MenuItemInfoW.fType) == MF_STRING) && - MenuItemInfoW.dwTypeData != NULL) + if( lpmii->cbSize != sizeof( MENUITEMINFOW)) { - RtlCreateUnicodeStringFromAsciiz(&UnicodeString, + MenuItemInfoW.cbSize = sizeof( MENUITEMINFOW); + MenuItemInfoW.hbmpItem = NULL; + } +/* + * MIIM_STRING == good + * MIIM_TYPE & MFT_STRING == good + * MIIM_STRING & MFT_STRING == good + * MIIM_STRING & MFT_OWNERSRAW == good + */ + if (((MenuItemInfoW.fMask & MIIM_STRING) || + ((MenuItemInfoW.fMask & MIIM_TYPE) && + (MENU_ITEM_TYPE(MenuItemInfoW.fType) == MF_STRING))) + && MenuItemInfoW.dwTypeData != NULL) + { +/* cch is ignored when the content of a menu item is set by calling SetMenuItemInfo. */ + UINT Count = lpmii->cch; + if(!Count) Count++; + if (IsBadStringPtrA(lpmii->dwTypeData, Count )) return FALSE; + Status = RtlCreateUnicodeStringFromAsciiz(&UnicodeString, (LPSTR)MenuItemInfoW.dwTypeData); + if (!NT_SUCCESS (Status)) + { + SetLastError (RtlNtStatusToDosError(Status)); + return FALSE; + } MenuItemInfoW.dwTypeData = UnicodeString.Buffer; MenuItemInfoW.cch = UnicodeString.Length / sizeof(WCHAR); } @@ -4788,15 +4868,30 @@ LPCMENUITEMINFOW lpmii) { MENUITEMINFOW MenuItemInfoW; + ULONG Result; RtlCopyMemory(&MenuItemInfoW, lpmii, min(lpmii->cbSize, sizeof(MENUITEMINFOW))); - if (0 != (MenuItemInfoW.fMask & MIIM_STRING)) + + if( lpmii->cbSize != sizeof( MENUITEMINFOW)) { - MenuItemInfoW.cch = strlenW(MenuItemInfoW.dwTypeData); + MenuItemInfoW.cbSize = sizeof( MENUITEMINFOW); + MenuItemInfoW.hbmpItem = NULL; } - return NtUserMenuItemInfo(hMenu, uItem, fByPosition, + if (((MenuItemInfoW.fMask & MIIM_STRING) || + ((MenuItemInfoW.fMask & MIIM_TYPE) && + (MENU_ITEM_TYPE(MenuItemInfoW.fType) == MF_STRING))) + && MenuItemInfoW.dwTypeData != NULL) + { + UINT Count = lpmii->cch; + if (!Count) Count++; + if (IsBadStringPtrW(lpmii->dwTypeData, Count)) return FALSE; + MenuItemInfoW.cch = strlenW(MenuItemInfoW.dwTypeData); + } + Result = NtUserMenuItemInfo(hMenu, uItem, fByPosition, (PROSMENUITEMINFO)&MenuItemInfoW, TRUE); + + return Result; } /* Modified: trunk/reactos/subsystems/win32/win32k/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/menu.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/menu.c Sat Jul 22 09:28:44 2006 @@ -302,9 +302,8 @@ Window = UserGetWindowObject(Menu->MenuInfo.Wnd); if (Window) { - Window->IDMenu = 0;; + Window->IDMenu = 0; } - } ObmDeleteObject(Menu->MenuInfo.Self, otMenu); ObDereferenceObject(WindowStation); @@ -352,7 +351,7 @@ Menu->MenuItemList = NULL; /* Insert menu item into process menu handle list */ - InsertTailList(&PsGetCurrentProcessWin32Process()->MenuListHead, &Menu->ListEntry); + InsertTailList(&PsGetWin32Process()->MenuListHead, &Menu->ListEntry); return Menu; } @@ -456,7 +455,7 @@ Menu->MenuItemList = NULL; /* Insert menu item into process menu handle list */ - InsertTailList(&PsGetCurrentProcessWin32Process()->MenuListHead, &Menu->ListEntry); + InsertTailList(&PsGetWin32Process()->MenuListHead, &Menu->ListEntry); IntCloneMenuItems(Menu, Source); @@ -693,6 +692,10 @@ { NTSTATUS Status; + if(lpmii->fMask & (MIIM_FTYPE | MIIM_TYPE)) + { + lpmii->fType = MenuItem->fType; + } if(lpmii->fMask & MIIM_BITMAP) { lpmii->hbmpItem = MenuItem->hbmpItem; @@ -706,10 +709,6 @@ { lpmii->dwItemData = MenuItem->dwItemData; } - if(lpmii->fMask & (MIIM_FTYPE | MIIM_TYPE)) - { - lpmii->fType = MenuItem->fType; - } if(lpmii->fMask & MIIM_ID) { lpmii->wID = MenuItem->wID; @@ -722,7 +721,9 @@ { lpmii->hSubMenu = MenuItem->hSubMenu; } - if (lpmii->fMask & (MIIM_STRING | MIIM_TYPE)) + + if ((lpmii->fMask & MIIM_STRING) || + ((lpmii->fMask & MIIM_TYPE) && (MENU_ITEM_TYPE(lpmii->fType) == MF_STRING))) { if (lpmii->dwTypeData == NULL) { @@ -745,6 +746,7 @@ { lpmii->Rect = MenuItem->Rect; lpmii->XTab = MenuItem->XTab; + lpmii->Text = MenuItem->Text.Buffer; } return TRUE; @@ -754,7 +756,7 @@ IntSetMenuItemInfo(PMENU_OBJECT MenuObject, PMENU_ITEM MenuItem, PROSMENUITEMINFO lpmii) { PMENU_OBJECT SubMenuObject; - UINT fTypeMask = (MFT_BITMAP | MFT_MENUBARBREAK | MFT_MENUBREAK | MFT_OWNERDRAW | MFT_RADIOCHECK | MFT_RIGHTJUSTIFY | MFT_SEPARATOR | MF_POPUP); + UINT fTypeMask = (MFT_BITMAP | MFT_MENUBARBREAK | MFT_MENUBREAK | MF_BYPOSITION | MFT_OWNERDRAW | MFT_RADIOCHECK | MFT_RIGHTJUSTIFY | MFT_SEPARATOR | MF_POPUP); if(!MenuItem || !MenuObject || !lpmii) { @@ -762,36 +764,61 @@ } if( lpmii->fType & ~fTypeMask) { - DPRINT("IntSetMenuItemInfo invalid fType flags %x\n", lpmii->fType & ~fTypeMask); + DbgPrint("IntSetMenuItemInfo invalid fType flags %x\n", lpmii->fType & ~fTypeMask); lpmii->fMask &= ~(MIIM_TYPE | MIIM_FTYPE); } - if(lpmii->fMask & MIIM_BITMAP) - { - MenuItem->hbmpItem = lpmii->hbmpItem; - } - if(lpmii->fMask & MIIM_CHECKMARKS) - { - MenuItem->hbmpChecked = lpmii->hbmpChecked; - MenuItem->hbmpUnchecked = lpmii->hbmpUnchecked; - } - if(lpmii->fMask & MIIM_DATA) - { - MenuItem->dwItemData = lpmii->dwItemData; - } - if(lpmii->fMask & (MIIM_FTYPE | MIIM_TYPE)) - { + if(lpmii->fMask & MIIM_TYPE) + { + if(lpmii->fMask & ( MIIM_STRING | MIIM_FTYPE | MIIM_BITMAP)) + { + DbgPrint("IntSetMenuItemInfo: Invalid combination of fMask bits used\n"); + /* this does not happen on Win9x/ME */ + SetLastNtError( ERROR_INVALID_PARAMETER); + return FALSE; + } /* * Delete the menu item type when changing type from * MF_STRING. */ if (MenuItem->fType != lpmii->fType && - MENU_ITEM_TYPE(MenuItem->fType) == MF_STRING) + MENU_ITEM_TYPE(MenuItem->fType) == MFT_STRING) { FreeMenuText(MenuItem); RtlInitUnicodeString(&MenuItem->Text, NULL); } - MenuItem->fType &= ~MENU_ITEM_TYPE(MenuItem->fType); - MenuItem->fType |= MENU_ITEM_TYPE(lpmii->fType); + if(lpmii->fType & MFT_BITMAP) + { +// if(lpmii->hbmpItem) + MenuItem->hbmpItem = lpmii->hbmpItem; +// else +// { /* Win 9x/Me stuff */ +// MenuItem->hbmpItem = (HBITMAP)lpmii->dwTypeData; +// } + } + MenuItem->fType |= lpmii->fType; + } + if (lpmii->fMask & MIIM_FTYPE ) + { + if(( lpmii->fType & MFT_BITMAP)) + { + DbgPrint("IntSetMenuItemInfo: Can not use FTYPE and MFT_BITMAP.\n"); + SetLastNtError( ERROR_INVALID_PARAMETER); + return FALSE; + } + MenuItem->fType |= lpmii->fType; + } + if(lpmii->fMask & MIIM_BITMAP) + { + MenuItem->hbmpItem = lpmii->hbmpItem; + } + if(lpmii->fMask & MIIM_CHECKMARKS) + { + MenuItem->hbmpChecked = lpmii->hbmpChecked; + MenuItem->hbmpUnchecked = lpmii->hbmpUnchecked; + } + if(lpmii->fMask & MIIM_DATA) + { + MenuItem->dwItemData = lpmii->dwItemData; } if(lpmii->fMask & MIIM_ID) { @@ -829,8 +856,9 @@ MenuItem->fType &= ~MF_POPUP; } } - if ((lpmii->fMask & (MIIM_TYPE | MIIM_STRING)) && - (MENU_ITEM_TYPE(lpmii->fType) == MF_STRING)) + + if ((lpmii->fMask & MIIM_STRING) || + ((lpmii->fMask & MIIM_TYPE) && (MENU_ITEM_TYPE(lpmii->fType) == MF_STRING))) { FreeMenuText(MenuItem); @@ -870,6 +898,7 @@ { MenuItem->Rect = lpmii->Rect; MenuItem->XTab = lpmii->XTab; + lpmii->Text = MenuItem->Text.Buffer; /* Send back new allocated string or zero */ } return TRUE;

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
67
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2006