Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 01:55:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

Added otMenu type

Browse source 
svn path=/trunk/; revision=5351
This commit is contained in:
Thomas Bluemel 2003-07-31 23:11:38 +00:00
parent b8fa0ee48c
commit 536f4271e0
2 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
reactos/subsys/win32k/include/object.h
View file

@ -9,7 +9,8 @@
typedef enum { typedef enum {
otUnknown = 0, otUnknown = 0,
otClass, otClass,
otWindow otWindow,
otMenu
} USER_OBJECT_TYPE; } USER_OBJECT_TYPE;
typedef struct _USER_OBJECT_HEADER typedef struct _USER_OBJECT_HEADER

13
reactos/subsys/win32k/main/dllmain.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: dllmain.c,v 1.40 2003/06/25 22:37:07 gvg Exp $ /* $Id: dllmain.c,v 1.41 2003/07/31 23:11:38 weiden Exp $
* *
* Entry Point for win32k.sys * Entry Point for win32k.sys
*/ */
@ -33,6 +33,7 @@
#include <include/winsta.h> #include <include/winsta.h>
#include <include/class.h> #include <include/class.h>
#include <include/window.h> #include <include/window.h>
#include <include/menu.h>
#include <include/object.h> #include <include/object.h>
#include <include/input.h> #include <include/input.h>
#include <include/timer.h> #include <include/timer.h>
@ -68,6 +69,9 @@ W32kProcessCallback (struct _EPROCESS *Process,
InitializeListHead(&Win32Process->ClassListHead); InitializeListHead(&Win32Process->ClassListHead);
ExInitializeFastMutex(&Win32Process->ClassListLock); ExInitializeFastMutex(&Win32Process->ClassListLock);
InitializeListHead(&Win32Process->MenuListHead);
ExInitializeFastMutex(&Win32Process->MenuListLock);
Win32Process->WindowStation = NULL; Win32Process->WindowStation = NULL;
if (Process->Win32WindowStation != NULL) if (Process->Win32WindowStation != NULL)
@ -212,6 +216,13 @@ DllMain (
DbgPrint("Failed to initialize window implementation!\n"); DbgPrint("Failed to initialize window implementation!\n");
return STATUS_UNSUCCESSFUL; return STATUS_UNSUCCESSFUL;
} }
Status = InitMenuImpl();
if (!NT_SUCCESS(Status))
{
DbgPrint("Failed to initialize menu implementation!\n");
return STATUS_UNSUCCESSFUL;
}
Status = InitInputImpl(); Status = InitInputImpl();
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))