Ros-diffs November 2005

ros-diffs@reactos.org

27 participants
875 discussions

[gvg] 19062: Add Language entries for all Locale entries. Fixes bug 955.
by gvg＠svn.reactos.com 08 Nov '05

08 Nov '05

Add Language entries for all Locale entries. Fixes bug 955. Modified: trunk/reactos/bootdata/hivesys.inf _____ Modified: trunk/reactos/bootdata/hivesys.inf --- trunk/reactos/bootdata/hivesys.inf 2005-11-08 18:54:18 UTC (rev 19061) +++ trunk/reactos/bootdata/hivesys.inf 2005-11-08 19:43:54 UTC (rev 19062) @@ -142,31 +142,111 @@ HKLM,"SYSTEM\CurrentControlSet\Control\NLS\CodePage","MACCP",0x00000000, "10000" ; NLS Language settings -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0401",0x00000000, "l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0402",0x00000000," l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0403",0x00000000," l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0404",0x00000000," l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0405",0x00000000," l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0406",0x00000000," l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0407",0x00000000," l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0807",0x00000000, "l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0c07",0x00000000, "l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","1407",0x00000000, "l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0408",0x00000000," l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0409",0x00000000," l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0809",0x00000000, "l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0c09",0x00000000, "l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","1009",0x00000000, "l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","1409",0x00000000, "l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","1809",0x00000000, "l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","1c09",0x00000000, "l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","2009",0x00000000, "l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","3009",0x00000000, "l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","3409",0x00000000, "l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","040a",0x00000000," l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","080a",0x00000000, "l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0c0a",0x00000000, "l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","100a",0x00000000, "l_intl.nls" +;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","140a",0x00000000 ,"l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","180a",0x00000000, "l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","1c0a",0x00000000, "l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","200a",0x00000000, "l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","240a",0x00000000, "l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","280a",0x00000000, "l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","2c0a",0x00000000, "l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","300a",0x00000000, "l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","340a",0x00000000, "l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","380a",0x00000000, "l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","3c0a",0x00000000, "l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","400a",0x00000000, "l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","440a",0x00000000, "l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","480a",0x00000000, "l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","4c0a",0x00000000, "l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","500a",0x00000000, "l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","040b",0x00000000," l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","040c",0x00000000," l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","080c",0x00000000, "l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0c0c",0x00000000, "l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","100c",0x00000000, "l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","140c",0x00000000, "l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","180c",0x00000000, "l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","040d",0x00000000," l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","040e",0x00000000," l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","040f",0x00000000," l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0410",0x00000000," l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0810",0x00000000, "l_intl.nls" +;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0411",0x00000000 ,"l_intl.nls" +;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0412",0x00000000 ,"l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0413",0x00000000, "l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0813",0x00000000, "l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0414",0x00000000, "l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0814",0x00000000, "l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0415",0x00000000, "l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0416",0x00000000, "l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0816",0x00000000, "l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0418",0x00000000, "l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0419",0x00000000," l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","041a",0x00000000, "l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","081a",0x00000000, "l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0c1a",0x00000000, "l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","041b",0x00000000, "l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","041c",0x00000000, "l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","041d",0x00000000," l_intl.nls" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0809",0x00000000, "l_intl.nls" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0807",0x00000000, "l_intl.nls" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0813",0x00000000, "l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","081d",0x00000000, "l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","041e",0x00000000, "l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","041f",0x00000000, "l_intl.nls" +;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0420",0x00000000 ,"l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0421",0x00000000, "l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0422",0x00000000, "l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0423",0x00000000, "l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0424",0x00000000, "l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0425",0x00000000, "l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0426",0x00000000, "l_intl.nls" +;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0427",0x00000000 ,"l_intl.nls" +;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0429",0x00000000 ,"l_intl.nls" +;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","042a",0x00000000 ,"l_intl.nls" +;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","042b",0x00000000 ,"l_intl.nls" +;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","042c",0x00000000 ,"l_intl.nls" +;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","082c",0x00000000 ,"l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","042d",0x00000000, "l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","042f",0x00000000, "l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0436",0x00000000, "l_intl.nls" +;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0437",0x00000000 ,"l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0438",0x00000000, "l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0439",0x00000000, "l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","043e",0x00000000, "l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","083e",0x00000000, "l_intl.nls" +;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","043f",0x00000000 ,"l_intl.nls" +;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0440",0x00000000 ,"l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0441",0x00000000, "l_intl.nls" +;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0443",0x00000000 ,"l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0843",0x00000000, "l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0456",0x00000000, "l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","Default",0x0000000 0,"0409" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","InstallLanguage",0 x00000000,"0409" ; Supported and installed locales +; If you add/uncomment an entry here, please also add the appropriate Language +; in the previous section. HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale",,0x00000012 HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000402",0x00010001 ,"5" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000403",0x00010001 ,"1"

1 0

[ion] 19061: - Fix hackplementation of ObLogSecurityDescriptor. Callers are supposed to free their input, so we can't re-use it; instead, allocate a new copy like we should.
by ion＠svn.reactos.com 08 Nov '05

08 Nov '05

- Fix hackplementation of ObLogSecurityDescriptor. Callers are supposed to free their input, so we can't re-use it; instead, allocate a new copy like we should. Modified: trunk/reactos/lib/rtl/unicodeprefix.c Modified: trunk/reactos/ntoskrnl/ob/security.c _____ Modified: trunk/reactos/lib/rtl/unicodeprefix.c --- trunk/reactos/lib/rtl/unicodeprefix.c 2005-11-08 17:22:26 UTC (rev 19060) +++ trunk/reactos/lib/rtl/unicodeprefix.c 2005-11-08 18:54:18 UTC (rev 19061) @@ -10,7 +10,7 @@ #include <rtl.h> -//#define NDEBUG +#define NDEBUG #include <debug.h> /* _____ Modified: trunk/reactos/ntoskrnl/ob/security.c --- trunk/reactos/ntoskrnl/ob/security.c 2005-11-08 17:22:26 UTC (rev 19060) +++ trunk/reactos/ntoskrnl/ob/security.c 2005-11-08 18:54:18 UTC (rev 19061) @@ -263,8 +263,12 @@ IN ULONG RefBias) { /* HACK: Return the same descriptor back */ - DPRINT1("ObLogSecurityDescriptor is not implemented!\n"); - *OutputSecurityDescriptor = InputSecurityDescriptor; + PSECURITY_DESCRIPTOR SdCopy; + DPRINT1("ObLogSecurityDescriptor is not implemented! %lx\n", InputSecurityDescriptor->Revision); + + SdCopy = ExAllocatePool(PagedPool, sizeof(*SdCopy)); + RtlMoveMemory(SdCopy, InputSecurityDescriptor, sizeof(*SdCopy)); + *OutputSecurityDescriptor = SdCopy; return STATUS_SUCCESS; }

1 0

[ion] 19060: - Remove unimplemented macro in SeOpenObjectAuditAlarm and replace it with a DPRINT1; that way callers won't freeze while calling it.
by ion＠svn.reactos.com 08 Nov '05

08 Nov '05

- Remove unimplemented macro in SeOpenObjectAuditAlarm and replace it with a DPRINT1; that way callers won't freeze while calling it. Modified: trunk/reactos/ntoskrnl/ob/security.c Modified: trunk/reactos/ntoskrnl/se/audit.c _____ Modified: trunk/reactos/ntoskrnl/ob/security.c --- trunk/reactos/ntoskrnl/ob/security.c 2005-11-08 17:20:58 UTC (rev 19059) +++ trunk/reactos/ntoskrnl/ob/security.c 2005-11-08 17:22:26 UTC (rev 19060) @@ -262,9 +262,8 @@ OUT PSECURITY_DESCRIPTOR *OutputSecurityDescriptor, IN ULONG RefBias) { - DPRINT1("ObLogSecurityDescriptor is not implemented!\n"); - /* HACK: Return the same descriptor back */ + DPRINT1("ObLogSecurityDescriptor is not implemented!\n"); *OutputSecurityDescriptor = InputSecurityDescriptor; return STATUS_SUCCESS; } _____ Modified: trunk/reactos/ntoskrnl/se/audit.c --- trunk/reactos/ntoskrnl/se/audit.c 2005-11-08 17:20:58 UTC (rev 19059) +++ trunk/reactos/ntoskrnl/se/audit.c 2005-11-08 17:22:26 UTC (rev 19060) @@ -225,7 +225,7 @@ IN KPROCESSOR_MODE AccessMode, OUT PBOOLEAN GenerateOnClose) { - UNIMPLEMENTED; + DPRINT1("SeOpenObjectAuditAlarm is UNIMPLEMENTED!\n"); }

1 0

[hpoussin] 19059: When a driver is a legacy driver, call its AddDevice function with a NULL Pdo
by hpoussin＠svn.reactos.com 08 Nov '05

08 Nov '05

When a driver is a legacy driver, call its AddDevice function with a NULL Pdo Modified: trunk/reactos/drivers/bus/acpi/ospm/acpisys.c Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.c Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.c Modified: trunk/reactos/drivers/input/mouclass/mouclass.c Modified: trunk/reactos/ntoskrnl/io/device.c _____ Modified: trunk/reactos/drivers/bus/acpi/ospm/acpisys.c --- trunk/reactos/drivers/bus/acpi/ospm/acpisys.c 2005-11-08 17:14:19 UTC (rev 19058) +++ trunk/reactos/drivers/bus/acpi/ospm/acpisys.c 2005-11-08 17:20:58 UTC (rev 19059) @@ -143,8 +143,8 @@ DeviceExtension->Pdo = PhysicalDeviceObject; DeviceExtension->Common.IsFDO = TRUE; - DeviceExtension->Common.Ldo = - IoAttachDeviceToDeviceStack(Fdo, PhysicalDeviceObject); + //DeviceExtension->Common.Ldo = + // IoAttachDeviceToDeviceStack(Fdo, PhysicalDeviceObject); DeviceExtension->State = dsStopped; _____ Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.c --- trunk/reactos/drivers/input/i8042prt/i8042prt.c 2005-11-08 17:14:19 UTC (rev 19058) +++ trunk/reactos/drivers/input/i8042prt/i8042prt.c 2005-11-08 17:20:58 UTC (rev 19059) @@ -696,14 +696,15 @@ PDEVICE_EXTENSION DevExt; PFDO_DEVICE_EXTENSION FdoDevExt; PDEVICE_OBJECT Fdo; - static BOOLEAN AlreadyAdded = FALSE; DPRINT("I8042AddDevice\n"); - /* HACK! */ - if (AlreadyAdded) + if (Pdo != NULL) + { + /* Device detected by pnpmgr. Ignore it, as we already have + * detected the keyboard and mouse at first call */ return STATUS_UNSUCCESSFUL; - AlreadyAdded = TRUE; + } Status = IoCreateDevice(DriverObject, sizeof(DEVICE_EXTENSION), @@ -716,8 +717,6 @@ if (!NT_SUCCESS(Status)) return Status; - IoAttachDeviceToDeviceStack(Fdo, Pdo); - DevExt = Fdo->DeviceExtension; RtlZeroMemory(DevExt, sizeof(DEVICE_EXTENSION)); _____ Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.c --- trunk/reactos/drivers/input/kbdclass/kbdclass.c 2005-11-08 17:14:19 UTC (rev 19058) +++ trunk/reactos/drivers/input/kbdclass/kbdclass.c 2005-11-08 17:20:58 UTC (rev 19059) @@ -482,6 +482,9 @@ DPRINT("ClassAddDevice called. Pdo = 0x%p\n", Pdo); + if (Pdo == NULL) + return STATUS_SUCCESS; + DriverExtension = IoGetDriverObjectExtension(DriverObject, DriverObject); /* Create new device object */ _____ Modified: trunk/reactos/drivers/input/mouclass/mouclass.c --- trunk/reactos/drivers/input/mouclass/mouclass.c 2005-11-08 17:14:19 UTC (rev 19058) +++ trunk/reactos/drivers/input/mouclass/mouclass.c 2005-11-08 17:20:58 UTC (rev 19059) @@ -472,6 +472,9 @@ DPRINT("ClassAddDevice called. Pdo = 0x%p\n", Pdo); + if (Pdo == NULL) + return STATUS_SUCCESS; + DriverExtension = IoGetDriverObjectExtension(DriverObject, DriverObject); /* Create new device object */ _____ Modified: trunk/reactos/ntoskrnl/io/device.c --- trunk/reactos/ntoskrnl/io/device.c 2005-11-08 17:14:19 UTC (rev 19058) +++ trunk/reactos/ntoskrnl/io/device.c 2005-11-08 17:20:58 UTC (rev 19059) @@ -72,6 +72,7 @@ { PDEVICE_OBJECT Fdo; NTSTATUS Status; + BOOLEAN IsPnpDriver = FALSE; if (DriverObject->DriverExtension->AddDevice) { @@ -83,39 +84,43 @@ DPRINT("Calling driver AddDevice entrypoint at %08lx\n", DriverObject->DriverExtension->AddDevice); + IsPnpDriver = !IopDeviceNodeHasFlag(DeviceNode, DNF_LEGACY_DRIVER); Status = DriverObject->DriverExtension->AddDevice( - DriverObject, DeviceNode->PhysicalDeviceObject); + DriverObject, IsPnpDriver ? DeviceNode->PhysicalDeviceObject : NULL); if (!NT_SUCCESS(Status)) { return Status; } - Fdo = IoGetAttachedDeviceReference(DeviceNode->PhysicalDeviceObject); - - if (Fdo == DeviceNode->PhysicalDeviceObject) + if (IsPnpDriver) { - /* FIXME: What do we do? Unload the driver or just disable the device? */ - DbgPrint("An FDO was not attached\n"); - IopDeviceNodeSetFlag(DeviceNode, DNF_DISABLED); - return STATUS_UNSUCCESSFUL; - } + Fdo = IoGetAttachedDeviceReference(DeviceNode->PhysicalDeviceObject); - IopDeviceNodeSetFlag(DeviceNode, DNF_ADDED); + if (Fdo == DeviceNode->PhysicalDeviceObject) + { + /* FIXME: What do we do? Unload the driver or just disable the device? */ + DbgPrint("An FDO was not attached\n"); + IopDeviceNodeSetFlag(DeviceNode, DNF_DISABLED); + return STATUS_UNSUCCESSFUL; + } - if (Fdo->DeviceType == FILE_DEVICE_ACPI) - { - static BOOLEAN SystemPowerDeviceNodeCreated = FALSE; + if (Fdo->DeviceType == FILE_DEVICE_ACPI) + { + static BOOLEAN SystemPowerDeviceNodeCreated = FALSE; - /* There can be only one system power device */ - if (!SystemPowerDeviceNodeCreated) - { - PopSystemPowerDeviceNode = DeviceNode; - SystemPowerDeviceNodeCreated = TRUE; + /* There can be only one system power device */ + if (!SystemPowerDeviceNodeCreated) + { + PopSystemPowerDeviceNode = DeviceNode; + SystemPowerDeviceNodeCreated = TRUE; + } } + + ObDereferenceObject(Fdo); } - ObDereferenceObject(Fdo); + IopDeviceNodeSetFlag(DeviceNode, DNF_ADDED); } return STATUS_SUCCESS; @@ -564,7 +569,7 @@ if (!NT_SUCCESS(Status)) { - DPRINT1("Cannot insert Device Object into Handle Table\n"); + DPRINT1("Cannot insert Device Object into Handle Table (status 0x%08lx)\n", Status); *DeviceObject = NULL; return Status; }

1 0

[ion] 19058: - Don't loop indefintely in RtlFindUnicodePrefix if the splaylinks have changed inside the loop.
by ion＠svn.reactos.com 08 Nov '05

08 Nov '05

- Don't loop indefintely in RtlFindUnicodePrefix if the splaylinks have changed inside the loop. Modified: trunk/reactos/lib/rtl/unicodeprefix.c _____ Modified: trunk/reactos/lib/rtl/unicodeprefix.c --- trunk/reactos/lib/rtl/unicodeprefix.c 2005-11-08 17:07:57 UTC (rev 19057) +++ trunk/reactos/lib/rtl/unicodeprefix.c 2005-11-08 17:14:19 UTC (rev 19058) @@ -10,7 +10,7 @@ #include <rtl.h> -#define NDEBUG +//#define NDEBUG #include <debug.h> /* @@ -179,7 +179,8 @@ DPRINT("CurrentEntry->NameLength %lx\n", CurrentEntry->NameLength); /* Get the splay links and loop */ - while ((SplayLinks = &CurrentEntry->Links)) + SplayLinks = &CurrentEntry->Links; + while (SplayLinks) { /* Get the entry */ DPRINT("SplayLinks %p\n", SplayLinks);

1 0

[ion] 19057: - Hackplement ObLogSecurityDescriptor for W2K3 drivers to be happy.
by ion＠svn.reactos.com 08 Nov '05

08 Nov '05

- Hackplement ObLogSecurityDescriptor for W2K3 drivers to be happy. Modified: trunk/reactos/ntoskrnl/ob/security.c _____ Modified: trunk/reactos/ntoskrnl/ob/security.c --- trunk/reactos/ntoskrnl/ob/security.c 2005-11-08 16:59:41 UTC (rev 19056) +++ trunk/reactos/ntoskrnl/ob/security.c 2005-11-08 17:07:57 UTC (rev 19057) @@ -263,7 +263,10 @@ IN ULONG RefBias) { DPRINT1("ObLogSecurityDescriptor is not implemented!\n"); - return STATUS_NOT_IMPLEMENTED; + + /* HACK: Return the same descriptor back */ + *OutputSecurityDescriptor = InputSecurityDescriptor; + return STATUS_SUCCESS; }

1 0

[ros-diffs] [ion] 19056: - Send a hacked access state to FS Drivers, they can depend on one. For now use one with full FILE_ALL_ACCESS privileges.
by ion＠svn.reactos.com 08 Nov '05

08 Nov '05

- Send a hacked access state to FS Drivers, they can depend on one. For now use one with full FILE_ALL_ACCESS privileges. Modified: trunk/reactos/ntoskrnl/io/file.c _____ Modified: trunk/reactos/ntoskrnl/io/file.c --- trunk/reactos/ntoskrnl/io/file.c 2005-11-08 16:41:58 UTC (rev 19055) +++ trunk/reactos/ntoskrnl/io/file.c 2005-11-08 16:59:41 UTC (rev 19056) @@ -758,6 +758,8 @@ LARGE_INTEGER SafeAllocationSize; PVOID SystemEaBuffer = NULL; NTSTATUS Status = STATUS_SUCCESS; + AUX_DATA AuxData; + ACCESS_STATE AccessState; DPRINT("IoCreateFile(FileHandle 0x%p, DesiredAccess %x, " "ObjectAttributes 0x%p ObjectAttributes->ObjectName->Buffer %S)\n", @@ -962,8 +964,14 @@ if (CreateOptions & FILE_NO_INTERMEDIATE_BUFFERING) FileObject->Flags |= FO_NO_INTERMEDIATE_BUFFERING; + /* + * FIXME: We should get the access state from Ob once this function becomes + * a parse routine once the Ob is refactored. + */ + SeCreateAccessState(&AccessState, &AuxData, FILE_ALL_ACCESS, NULL); + SecurityContext.SecurityQos = NULL; /* ?? */ - SecurityContext.AccessState = NULL; /* ?? */ + SecurityContext.AccessState = &AccessState; SecurityContext.DesiredAccess = DesiredAccess; SecurityContext.FullCreateOptions = 0; /* ?? */

1 0

[ion] 19055: - Fix function signature of CompareUnicodeStrings
by ion＠svn.reactos.com 08 Nov '05

08 Nov '05

- Fix function signature of CompareUnicodeStrings - Add special case where we get a prefix itself and a name starting with a prefix character. - Implement RtlInitializeGenericTable This fixes the windows npfs.sys hang. Modified: trunk/reactos/lib/rtl/generictable.c Modified: trunk/reactos/lib/rtl/unicodeprefix.c _____ Modified: trunk/reactos/lib/rtl/generictable.c --- trunk/reactos/lib/rtl/generictable.c 2005-11-08 16:24:58 UTC (rev 19054) +++ trunk/reactos/lib/rtl/generictable.c 2005-11-08 16:41:58 UTC (rev 19055) @@ -146,19 +146,26 @@ } /* -* @unimplemented +* @implemented */ VOID NTAPI -RtlInitializeGenericTable ( - PRTL_GENERIC_TABLE Table, - PRTL_GENERIC_COMPARE_ROUTINE CompareRoutine, - PRTL_GENERIC_ALLOCATE_ROUTINE AllocateRoutine, - PRTL_GENERIC_FREE_ROUTINE FreeRoutine, - PVOID TableContext - ) +RtlInitializeGenericTable(PRTL_GENERIC_TABLE Table, + PRTL_GENERIC_COMPARE_ROUTINE CompareRoutine, + PRTL_GENERIC_ALLOCATE_ROUTINE AllocateRoutine, + PRTL_GENERIC_FREE_ROUTINE FreeRoutine, + PVOID TableContext) { - UNIMPLEMENTED; + /* Initialize the table to default and passed values */ + InitializeListHead(&Table->InsertOrderList); + Table->TableRoot = NULL; + Table->NumberGenericTableElements = 0; + Table->WhichOrderedElement = 0; + Table->OrderedPointer = &Table->InsertOrderList; + Table->CompareRoutine = CompareRoutine; + Table->AllocateRoutine = AllocateRoutine; + Table->FreeRoutine = FreeRoutine; + Table->TableContext = TableContext; } _____ Modified: trunk/reactos/lib/rtl/unicodeprefix.c --- trunk/reactos/lib/rtl/unicodeprefix.c 2005-11-08 16:24:58 UTC (rev 19054) +++ trunk/reactos/lib/rtl/unicodeprefix.c 2005-11-08 16:41:58 UTC (rev 19055) @@ -48,8 +48,8 @@ STATIC RTL_GENERIC_COMPARE_RESULTS NTAPI -CompareUnicodeStrings(IN PUNICODE_STRING String, - IN PUNICODE_STRING Prefix, +CompareUnicodeStrings(IN PUNICODE_STRING Prefix, + IN PUNICODE_STRING String, IN ULONG CaseCheckChar) { ULONG StringLength = String->Length / sizeof(WCHAR); @@ -58,7 +58,18 @@ ULONG i; WCHAR FoundPrefix, FoundString; PWCHAR p, p1; + DPRINT("CompareUnicodeStrings: %wZ %wZ\n", String, Prefix); + /* Handle case noticed in npfs when Prefix = '\' and name starts with '\' */ + if ((PrefixLength == 1) && + (Prefix->Buffer[0] == '\\') && + (StringLength > 1) && + (String->Buffer[0] == '\\')) + { + /* The string is actually a prefix */ + return -1; + } + /* Validate the Case Check Character Position */ if (CaseCheckChar > ScanLength) CaseCheckChar = ScanLength; @@ -147,6 +158,7 @@ PUNICODE_PREFIX_TABLE_ENTRY CurrentEntry, PreviousEntry, Entry, NextEntry; PRTL_SPLAY_LINKS SplayLinks; RTL_GENERIC_COMPARE_RESULTS Result; + DPRINT("RtlFindUnicodePrefix\n"); /* Find out how many names there are */ NameCount = ComputeUnicodeNameLength(FullName); @@ -164,16 +176,20 @@ /* Loop every entry which has valid entries */ while (CurrentEntry->NameLength) { + DPRINT("CurrentEntry->NameLength %lx\n", CurrentEntry->NameLength); + /* Get the splay links and loop */ while ((SplayLinks = &CurrentEntry->Links)) { /* Get the entry */ + DPRINT("SplayLinks %p\n", SplayLinks); Entry = CONTAINING_RECORD(SplayLinks, UNICODE_PREFIX_TABLE_ENTRY, Links); /* Do the comparison */ Result = CompareUnicodeStrings(Entry->Prefix, FullName, 0); + DPRINT("Result %lx\n", Result); if (Result == GenericGreaterThan) { /* Prefix is greater, so restart on the left child */ @@ -192,6 +208,7 @@ * NOTE: An index of 0 means case-insensitive(ie, we'll be case * insensitive since index 0, ie, all the time) */ + DPRINT("CaseInsensitiveIndex %lx\n", CaseInsensitiveIndex); if (!CaseInsensitiveIndex) { /* @@ -225,6 +242,7 @@ } /* Return the entry */ + DPRINT("RtlFindUnicodePrefix: %p\n", Entry); return Entry; } @@ -240,11 +258,13 @@ (Result != GenericGreaterThan)) { /* This is a positive match, return it */ + DPRINT("RtlFindUnicodePrefix: %p\n", NextEntry); return NextEntry; } /* No match yet, continue looping the circular list */ NextEntry = NextEntry->CaseMatch; + DPRINT("NextEntry %p\n", NextEntry); } while (NextEntry != Entry); /* @@ -258,9 +278,11 @@ /* Splay links exausted, move to next entry */ PreviousEntry = CurrentEntry; CurrentEntry = CurrentEntry->NextPrefixTree; + DPRINT("CurrentEntry %p\n", CurrentEntry); } /* If we got here, nothing was found */ + DPRINT("RtlFindUnicodePrefix: %p\n", NULL); return NULL; } @@ -291,6 +313,7 @@ ULONG NameCount; RTL_GENERIC_COMPARE_RESULTS Result; PRTL_SPLAY_LINKS SplayLinks; + DPRINT("RtlInsertUnicodePrefix\n"); /* Find out how many names there are */ NameCount = ComputeUnicodeNameLength(Prefix); @@ -322,6 +345,7 @@ PrefixTableEntry->CaseMatch = PrefixTableEntry; /* Quick return */ + DPRINT("RtlInsertUnicodePrefix TRUE\n"); return TRUE; } @@ -344,6 +368,7 @@ (GenericEqual)) { /* We must fail the insert: it already exists */ + DPRINT("RtlInsertUnicodePrefix FALSE\n"); return FALSE; } @@ -436,6 +461,7 @@ Entry->NextPrefixTree = NextEntry; /* Return success */ + DPRINT("RtlInsertUnicodePrefix TRUE\n"); return TRUE; } @@ -449,6 +475,7 @@ { PRTL_SPLAY_LINKS SplayLinks; PUNICODE_PREFIX_TABLE_ENTRY Entry, CaseMatchEntry; + DPRINT("RtlNextUnicodePrefix\n"); /* We might need this entry 2/3rd of the time, so cache it now */ CaseMatchEntry = PrefixTable->LastNextEntry->CaseMatch; @@ -507,6 +534,7 @@ /* Save this entry as the last one returned, and return it */ PrefixTable->LastNextEntry = Entry; + DPRINT("RtlNextUnicodePrefix: %p\n", Entry); return Entry; } @@ -520,6 +548,7 @@ { PUNICODE_PREFIX_TABLE_ENTRY Entry, RefEntry, NewEntry; PRTL_SPLAY_LINKS SplayLinks; + DPRINT("RtlRemoveUnicodePrefix\n"); /* Erase the last entry */ PrefixTable->LastNextEntry = NULL;

1 0

[hpoussin] 19054: Patch by Filip Navara/Hervé Poussineau:
by hpoussin＠svn.reactos.com 08 Nov '05

08 Nov '05

Patch by Filip Navara/Hervé Poussineau: - Simplify device number allocation - Check the case of a NULL Pdo if we're called by a legacy driver Modified: trunk/reactos/drivers/video/videoprt/dispatch.c Modified: trunk/reactos/drivers/video/videoprt/videoprt.c _____ Modified: trunk/reactos/drivers/video/videoprt/dispatch.c --- trunk/reactos/drivers/video/videoprt/dispatch.c 2005-11-08 08:56:41 UTC (rev 19053) +++ trunk/reactos/drivers/video/videoprt/dispatch.c 2005-11-08 16:24:58 UTC (rev 19054) @@ -68,6 +68,8 @@ IN PDEVICE_OBJECT PhysicalDeviceObject) { PVIDEO_PORT_DRIVER_EXTENSION DriverExtension; + PDEVICE_OBJECT DeviceObject; + NTSTATUS Status; /* * Get the initialization data we saved in VideoPortInitialize. @@ -79,11 +81,20 @@ * Create adapter device object. */ - return IntVideoPortCreateAdapterDeviceObject( + Status = IntVideoPortCreateAdapterDeviceObject( DriverObject, DriverExtension, PhysicalDeviceObject, - NULL); + &DeviceObject); + if (!NT_SUCCESS(Status)) + return Status; + + if (PhysicalDeviceObject == NULL) + { + /* We will never have a IRP_MJ_PNP/IRP_MN_START_DEVICE Irp */ + Status = IntVideoPortFindAdapter(DriverObject, DriverExtension, DeviceObject); + } + return Status; } /* _____ Modified: trunk/reactos/drivers/video/videoprt/videoprt.c --- trunk/reactos/drivers/video/videoprt/videoprt.c 2005-11-08 08:56:41 UTC (rev 19053) +++ trunk/reactos/drivers/video/videoprt/videoprt.c 2005-11-08 16:24:58 UTC (rev 19054) @@ -27,6 +27,7 @@ ULONG CsrssInitialized = FALSE; PKPROCESS Csrss = NULL; +ULONG VideoPortDeviceNumber = 0; /* PRIVATE FUNCTIONS **********************************************************/ @@ -128,41 +129,6 @@ ((PMINIPORT_DPC_ROUTINE)SystemArgument1)(HwDeviceExtension, SystemArgument2); } -ULONG NTAPI -IntVideoPortAllocateDeviceNumber(VOID) -{ - NTSTATUS Status; - ULONG DeviceNumber; - WCHAR SymlinkBuffer[20]; - UNICODE_STRING SymlinkName; - - for (DeviceNumber = 0;;) - { - OBJECT_ATTRIBUTES Obj; - HANDLE ObjHandle; - - swprintf(SymlinkBuffer, L"\\??\\DISPLAY%lu", DeviceNumber + 1); - RtlInitUnicodeString(&SymlinkName, SymlinkBuffer); - InitializeObjectAttributes(&Obj, &SymlinkName, 0, NULL, NULL); - Status = ZwOpenSymbolicLinkObject(&ObjHandle, GENERIC_READ, &Obj); - if (NT_SUCCESS(Status)) - { - ZwClose(ObjHandle); - DeviceNumber++; - continue; - } - else if (Status == STATUS_OBJECT_NAME_NOT_FOUND) - break; - else - { - DPRINT1("ZwOpenSymbolicLinkObject() returned unexpected status: 0x%08lx\n", Status); - return 0xFFFFFFFF; - } - } - - return DeviceNumber; -} - NTSTATUS NTAPI IntVideoPortCreateAdapterDeviceObject( IN PDRIVER_OBJECT DriverObject, @@ -186,7 +152,7 @@ * object names and symlinks. */ - DeviceNumber = IntVideoPortAllocateDeviceNumber(); + DeviceNumber = VideoPortDeviceNumber++; if (DeviceNumber == 0xFFFFFFFF) { DPRINT("Can't find free device number\n");

1 0

[ion] 19053: - Update KTHREAD and KUSER_SHARED_DATA to latest versions. This should make 2K3 drivers (eg: npfs.sys) work with their inlined KeEnterCriticalRegion/KeLeaveCriticalRegion and ASSERTS.
by ion＠svn.reactos.com 08 Nov '05

08 Nov '05

- Update KTHREAD and KUSER_SHARED_DATA to latest versions. This should make 2K3 drivers (eg: npfs.sys) work with their inlined KeEnterCriticalRegion/KeLeaveCriticalRegion and ASSERTS. - Update KAPC and DISPATCHER_HEADER to latest DDK definitions. Modified: trunk/reactos/include/ndk/arch/ketypes.h Modified: trunk/reactos/include/ndk/asm.h Modified: trunk/reactos/include/ndk/ketypes.h Modified: trunk/reactos/ntoskrnl/ex/init.c Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c Modified: trunk/reactos/ntoskrnl/ke/i386/fpu.c Modified: trunk/reactos/ntoskrnl/ke/kthread.c Modified: trunk/reactos/subsys/win32k/ntuser/desktop.c Modified: trunk/reactos/subsys/win32k/ntuser/hook.c Modified: trunk/reactos/subsys/win32k/ntuser/input.c Modified: trunk/reactos/subsys/win32k/ntuser/message.c Modified: trunk/reactos/subsys/win32k/ntuser/misc.c Modified: trunk/reactos/subsys/win32k/ntuser/painting.c Modified: trunk/reactos/subsys/win32k/ntuser/window.c Modified: trunk/reactos/w32api/include/ddk/winddk.h _____ Modified: trunk/reactos/include/ndk/arch/ketypes.h --- trunk/reactos/include/ndk/arch/ketypes.h 2005-11-08 00:21:29 UTC (rev 19052) +++ trunk/reactos/include/ndk/arch/ketypes.h 2005-11-08 08:56:41 UTC (rev 19053) @@ -12,10 +12,10 @@ /* Shared structures needed by Arch-specific headers */ typedef struct _KDPC_DATA { - LIST_ENTRY DpcListHead; - ULONG DpcLock; - ULONG DpcQueueDepth; - ULONG DpcCount; + LIST_ENTRY DpcListHead; + ULONG DpcLock; + ULONG DpcQueueDepth; + ULONG DpcCount; } KDPC_DATA, *PKDPC_DATA; typedef struct _PP_LOOKASIDE_LIST _____ Modified: trunk/reactos/include/ndk/asm.h --- trunk/reactos/include/ndk/asm.h 2005-11-08 00:21:29 UTC (rev 19052) +++ trunk/reactos/include/ndk/asm.h 2005-11-08 08:56:41 UTC (rev 19053) @@ -51,20 +51,20 @@ #define KTHREAD_DEBUG_ACTIVE 0x03 #define KTHREAD_INITIAL_STACK 0x18 #define KTHREAD_STACK_LIMIT 0x1C -#define KTHREAD_TEB 0x20 -#define KTHREAD_KERNEL_STACK 0x28 -#define KTHREAD_NPX_STATE 0x31 -#define KTHREAD_STATE 0x2D -#define KTHREAD_ALERTED 0x2E -#define KTHREAD_APCSTATE_PROCESS 0x34 + 0x10 -#define KTHREAD_PENDING_USER_APC 0x34 + 0x16 -#define KTHREAD_PENDING_KERNEL_APC 0x34 + 0x15 -#define KTHREAD_CONTEXT_SWITCHES 0x4C -#define KTHREAD_WAIT_IRQL 0x54 -#define KTHREAD_SERVICE_TABLE 0xDC -#define KTHREAD_PREVIOUS_MODE 0x137 -#define KTHREAD_TRAP_FRAME 0x128 -#define KTHREAD_CALLBACK_STACK 0x120 +#define KTHREAD_TEB 0x74 +#define KTHREAD_KERNEL_STACK 0x20 +#define KTHREAD_NPX_STATE 0x4D +#define KTHREAD_STATE 0x4C +#define KTHREAD_ALERTED 0x5E +#define KTHREAD_APCSTATE_PROCESS 0x28 + 0x10 +#define KTHREAD_PENDING_USER_APC 0x28 + 0x16 +#define KTHREAD_PENDING_KERNEL_APC 0x28 + 0x15 +#define KTHREAD_CONTEXT_SWITCHES 0x48 +#define KTHREAD_WAIT_IRQL 0x4E +#define KTHREAD_SERVICE_TABLE 0x118 +#define KTHREAD_PREVIOUS_MODE 0xD7 +#define KTHREAD_TRAP_FRAME 0x110 +#define KTHREAD_CALLBACK_STACK 0x114 #define KPROCESS_DIRECTORY_TABLE_BASE 0x18 #define KPROCESS_LDT_DESCRIPTOR0 0x20 _____ Modified: trunk/reactos/include/ndk/ketypes.h --- trunk/reactos/include/ndk/ketypes.h 2005-11-08 00:21:29 UTC (rev 19052) +++ trunk/reactos/include/ndk/ketypes.h 2005-11-08 08:56:41 UTC (rev 19053) @@ -17,11 +17,12 @@ /* CONSTANTS *****************************************************************/ #define SSDT_MAX_ENTRIES 4 -#define PROCESSOR_FEATURE_MAX 64 #define CONTEXT_DEBUGGER (CONTEXT_FULL | CONTEXT_FLOATING_POINT) #ifdef NTOS_MODE_USER #define SharedUserData ((KUSER_SHARED_DATA * CONST) USER_SHARED_DATA) +#define MAX_WOW64_SHARED_ENTRIES 16 +#define PROCESSOR_FEATURE_MAX 64 #endif /* ENUMERATIONS **************************************************************/ @@ -216,12 +217,19 @@ ULONG NumberOfPhysicalPages; BOOLEAN SafeBootMode; ULONG TraceLogging; - ULONGLONG Fill0; - ULONGLONG SystemCall[4]; + ULONG Fill0; + ULONGLONG TestRetInstruction; + ULONG SystemCall; + ULONG SystemCallReturn; + ULONGLONG SystemCallPad[3]; union { volatile KSYSTEM_TIME TickCount; volatile ULONG64 TickCountQuad; }; + ULONG Cookie; + LONGLONG ConsoleSessionForegroundProcessId; + ULONG Wow64SharedInformation[MAX_WOW64_SHARED_ENTRIES]; + ULONG UserModeGlobalLogging; } KUSER_SHARED_DATA, *PKUSER_SHARED_DATA; #endif @@ -347,89 +355,179 @@ typedef struct _KTHREAD { - DISPATCHER_HEADER DispatcherHeader; /* 00 */ - LIST_ENTRY MutantListHead; /* 10 */ - PVOID InitialStack; /* 18 */ - ULONG_PTR StackLimit; /* 1C */ - struct _TEB *Teb; /* 20 */ - PVOID TlsArray; /* 24 */ - PVOID KernelStack; /* 28 */ - UCHAR DebugActive; /* 2C */ - UCHAR State; /* 2D */ - BOOLEAN Alerted[2]; /* 2E */ - UCHAR Iopl; /* 30 */ - UCHAR NpxState; /* 31 */ - CHAR Saturation; /* 32 */ - CHAR Priority; /* 33 */ - KAPC_STATE ApcState; /* 34 */ - ULONG ContextSwitches; /* 4C */ - LONG WaitStatus; /* 50 */ - KIRQL WaitIrql; /* 54 */ - CHAR WaitMode; /* 55 */ - UCHAR WaitNext; /* 56 */ - UCHAR WaitReason; /* 57 */ - union /* 58 */ - { - PKWAIT_BLOCK WaitBlockList; /* 58 */ - PKGATE GateObject; /* 58 */ - }; /* 58 */ - LIST_ENTRY WaitListEntry; /* 5C */ - ULONG WaitTime; /* 64 */ - CHAR BasePriority; /* 68 */ - UCHAR DecrementCount; /* 69 */ - UCHAR PriorityDecrement; /* 6A */ - CHAR Quantum; /* 6B */ - KWAIT_BLOCK WaitBlock[4]; /* 6C */ - PVOID LegoData; /* CC */ - union - { - struct - { - USHORT KernelApcDisable; - USHORT SpecialApcDisable; - }; - ULONG CombinedApcDisable; /* D0 */ - }; - KAFFINITY UserAffinity; /* D4 */ - UCHAR SystemAffinityActive;/* D8 */ - UCHAR PowerState; /* D9 */ - UCHAR NpxIrql; /* DA */ - UCHAR Pad[1]; /* DB */ - PVOID ServiceTable; /* DC */ - struct _KQUEUE *Queue; /* E0 */ - KSPIN_LOCK ApcQueueLock; /* E4 */ - KTIMER Timer; /* E8 */ - LIST_ENTRY QueueListEntry; /* 110 */ - KAFFINITY Affinity; /* 118 */ - UCHAR Preempted; /* 11C */ - UCHAR ProcessReadyQueue; /* 11D */ - UCHAR KernelStackResident; /* 11E */ - UCHAR NextProcessor; /* 11F */ - PVOID CallbackStack; /* 120 */ - struct _W32THREAD *Win32Thread; /* 124 */ - struct _KTRAP_FRAME *TrapFrame; /* 128 */ - PKAPC_STATE ApcStatePointer[2]; /* 12C */ - UCHAR EnableStackSwap; /* 134 */ - UCHAR LargeStack; /* 135 */ - UCHAR ResourceIndex; /* 136 */ - UCHAR PreviousMode; /* 137 */ - ULONG KernelTime; /* 138 */ - ULONG UserTime; /* 13C */ - KAPC_STATE SavedApcState; /* 140 */ - UCHAR Alertable; /* 158 */ - UCHAR ApcStateIndex; /* 159 */ - UCHAR ApcQueueable; /* 15A */ - UCHAR AutoAlignment; /* 15B */ - PVOID StackBase; /* 15C */ - KAPC SuspendApc; /* 160 */ - KSEMAPHORE SuspendSemaphore; /* 190 */ - LIST_ENTRY ThreadListEntry; /* 1A4 */ - CHAR FreezeCount; /* 1AC */ - UCHAR SuspendCount; /* 1AD */ - UCHAR IdealProcessor; /* 1AE */ - UCHAR DisableBoost; /* 1AF */ - UCHAR QuantumReset; /* 1B0 */ -} KTHREAD; + DISPATCHER_HEADER DispatcherHeader; /* 00 */ + LIST_ENTRY MutantListHead; /* 10 */ + PVOID InitialStack; /* 18 */ + ULONG_PTR StackLimit; /* 1C */ + PVOID KernelStack; /* 20 */ + KSPIN_LOCK ThreadLock; /* 24 */ + union /* 28 */ + { /* 28 */ + KAPC_STATE ApcState; /* 34 */ + struct /* 28 */ + { /* 28 */ + UCHAR ApcStateFill[23]; /* 34 */ + UCHAR ApcQueueable; /* 3F */ + }; /* 3F */ + }; /* 3F */ + UCHAR NextProcessor; /* 40 */ + UCHAR DeferredProcessor; /* 41 */ + UCHAR AdjustReason; /* 42 */ + UCHAR AdjustIncrement; /* 43 */ + KSPIN_LOCK ApcQueueLock; /* 44 */ + ULONG ContextSwitches; /* 48 */ + UCHAR State; /* 4C */ + UCHAR NpxState; /* 4D */ + UCHAR WaitIrql; /* 4E */ + UCHAR WaitMode; /* 4F */ + LONG WaitStatus; /* 50 */ + union /* 54 */ + { /* 54 */ + PKWAIT_BLOCK WaitBlockList; /* 54 */ + PKGATE GateObject; /* 54 */ + }; /* 54 */ + UCHAR Alertable; /* 58 */ + UCHAR WaitNext; /* 59 */ + UCHAR WaitReason; /* 5A */ + UCHAR Priority; /* 5B */ + UCHAR EnableStackSwap; /* 5C */ + UCHAR SwapBusy; /* 5D */ + UCHAR Alerted[2]; /* 5E */ + union /* 60 */ + { /* 60 */ + LIST_ENTRY WaitListEntry; /* 60 */ + SINGLE_LIST_ENTRY SwapListEntry; /* 60 */ + }; /* 68 */ + PKQUEUE Queue; /* 68 */ + ULONG WaitTime; /* 6C */ + union /* 70 */ + { /* 70 */ + struct /* 70 */ + { /* 70 */ + USHORT KernelApcDisable; /* 70 */ + USHORT SpecialApcDisable; /* 72 */ + }; /* 70 */ + ULONG CombinedApcDisable; /* 70 */ + }; /* 74 */ + struct _TEB *Teb; /* 74 */ + union /* 78 */ + { /* 78 */ + KTIMER Timer; /* 78 */ + UCHAR TimerFill[40]; /* 78 */ + }; /* 78 */ + union /* A0 */ + { /* A0 */ + struct /* A0 */ + { /* A0 */ + LONG AutoAlignment:1; /* A0 */ + LONG DisableBoost:1; /* A0 */ + LONG ReservedFlags:30; /* A0 */ + }; /* A0 */ + LONG ThreadFlags; /* A0 */ + }; /* A0 */ + PVOID Padding; /* A4 */ + union /* A8 */ + { /* A8 */ + KWAIT_BLOCK WaitBlock[4]; /* A8 */ + union /* A8 */ + { /* A8 */ + struct /* A8 */ + { /* A8 */ + UCHAR WaitBlockFill0[23]; /* A8 */ + UCHAR SystemAffinityActive; /* BF */ + }; /* A8 */ + struct /* A8 */ + { /* A8 */ + UCHAR WaitBlockFill1[47]; /* A8 */ + UCHAR PreviousMode; /* D7 */ + }; /* A8 */ + struct /* A8 */ + { /* A8 */ + UCHAR WaitBlockFill2[71]; /* A8 */ + UCHAR ResourceIndex; /* EF */ + }; /* A8 */ + struct /* A8 */ + { /* A8 */ + UCHAR WaitBlockFill3[95]; /* A8 */ + UCHAR LargeStack; /* 107 */ + }; /* A8 */ + }; /* A8 */ + }; /* A8 */ + LIST_ENTRY QueueListEntry; /* 108 */ + PKTRAP_FRAME TrapFrame; /* 110 */ + PVOID CallbackStack; /* 114 */ + PVOID ServiceTable; /* 118 */ + UCHAR ApcStateIndex; /* 11C */ + UCHAR IdealProcessor; /* 11D */ + UCHAR Preempted; /* 11E */ + UCHAR ProcessReadyQueue; /* 11F */ + UCHAR KernelStackResident; /* 120 */ + CHAR BasePriority; /* 121 */ + CHAR PriorityDecrement; /* 122 */ + CHAR Saturation; /* 123 */ + KAFFINITY UserAffinity; /* 124 */ + struct _KPROCESS *Process; /* 128 */ + KAFFINITY Affinity; /* 12C */ + PKAPC_STATE ApcStatePointer[2]; /* 130 */ + union /* 138 */ + { /* 138 */ + KAPC_STATE SavedApcState; /* 138 */ + union /* 138 */ + { /* 138 */ + UCHAR SavedApcStateFill[23]; /* 138 */ + CHAR FreezeCount; /* 14F */ + }; /* 138 */ + }; /* 138 */ + CHAR SuspendCount; /* 150 */ + UCHAR UserIdealProcessor; /* 151 */ + UCHAR CalloutActive; /* 152 */ + UCHAR Iopl; /* 153 */ + PVOID Win32Thread; /* 154 */ + PVOID StackBase; /* 158 */ + union /* 15C */ + { /* 15C */ + KAPC SuspendApc; /* 15C */ + union /* 15C */ + { /* 15C */ + UCHAR SuspendApcFill0[1]; /* 15C */ + CHAR Quantum; /* 15D */ + }; /* 15C */ + union /* 15C */ + { /* 15C */ + UCHAR SuspendApcFill1[3]; /* 15C */ + UCHAR QuantumReset; /* 15F */ + }; /* 15C */ + union /* 15C */ + { /* 15C */ + UCHAR SuspendApcFill2[4]; /* 15C */ + ULONG KernelTime; /* 160 */ + }; /* 15C */ + union /* 15C */ + { /* 15C */ + UCHAR SuspendApcFill3[36]; /* 15C */ + PVOID TlsArray; /* 180 */ + }; /* 15C */ + union /* 15C */ + { /* 15C */ + UCHAR SuspendApcFill4[40]; /* 15C */ + PVOID LegoData; /* 184 */ + }; /* 15C */ + union /* 15C */ + { /* 15C */ + UCHAR SuspendApcFill5[47]; /* 15C */ + UCHAR PowerState; /* 18B */ + }; /* 15C */ + }; /* 15C */ + ULONG UserTime; /* 18C */ + union /* 190 */ + { /* 190 */ + KSEMAPHORE SuspendSemaphore; /* 190 */ + UCHAR SuspendSemaphorefill[20]; /* 190 */ + }; /* 190 */ + ULONG SListFaultCount; /* 1A4 */ + LIST_ENTRY ThreadListEntry; /* 1A8 */ + PVOID SListFaultAddress; /* 1B0 */ +} KTHREAD; /* sizeof: 1B4 */ #include <poppack.h> _____ Modified: trunk/reactos/ntoskrnl/ex/init.c --- trunk/reactos/ntoskrnl/ex/init.c 2005-11-08 00:21:29 UTC (rev 19052) +++ trunk/reactos/ntoskrnl/ex/init.c 2005-11-08 08:56:41 UTC (rev 19053) @@ -229,6 +229,7 @@ * Fail at runtime if someone has changed various structures without * updating the offsets used for the assembler code. */ + ASSERT(FIELD_OFFSET(KUSER_SHARED_DATA, SystemCall) == 0x300); ASSERT(FIELD_OFFSET(KTHREAD, InitialStack) == KTHREAD_INITIAL_STACK); ASSERT(FIELD_OFFSET(KTHREAD, Teb) == KTHREAD_TEB); ASSERT(FIELD_OFFSET(KTHREAD, KernelStack) == KTHREAD_KERNEL_STACK); _____ Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c --- trunk/reactos/ntoskrnl/ke/i386/exp.c 2005-11-08 00:21:29 UTC (rev 19052) +++ trunk/reactos/ntoskrnl/ke/i386/exp.c 2005-11-08 08:56:41 UTC (rev 19053) @@ -806,7 +806,7 @@ if (PreviousMode != KernelMode) { /* Set the Debug Flag */ - KeGetCurrentThread()->DebugActive = (Context->Dr7 & DR7_ACTIVE); + KeGetCurrentThread()->DispatcherHeader.DebugActive = (Context->Dr7 & DR7_ACTIVE); } } _____ Modified: trunk/reactos/ntoskrnl/ke/i386/fpu.c --- trunk/reactos/ntoskrnl/ke/i386/fpu.c 2005-11-08 00:21:29 UTC (rev 19052) +++ trunk/reactos/ntoskrnl/ke/i386/fpu.c 2005-11-08 08:56:41 UTC (rev 19053) @@ -571,7 +571,7 @@ #error Unknown compiler for inline assembler #endif - KeGetCurrentThread()->NpxIrql = KeGetCurrentIrql(); + KeGetCurrentThread()->DispatcherHeader.NpxIrql = KeGetCurrentIrql(); return STATUS_SUCCESS; } @@ -582,7 +582,7 @@ { PFNSAVE_FORMAT FpState = *((PVOID *) Save); - if (KeGetCurrentThread()->NpxIrql != KeGetCurrentIrql()) + if (KeGetCurrentThread()->DispatcherHeader.NpxIrql != KeGetCurrentIrql()) { KEBUGCHECK(UNDEFINED_BUG_CODE); } _____ Modified: trunk/reactos/ntoskrnl/ke/kthread.c --- trunk/reactos/ntoskrnl/ke/kthread.c 2005-11-08 00:21:29 UTC (rev 19052) +++ trunk/reactos/ntoskrnl/ke/kthread.c 2005-11-08 08:56:41 UTC (rev 19053) @@ -1259,7 +1259,6 @@ Thread->BasePriority = BasePriority; /* Reset the decrements */ - Thread->DecrementCount = 0; Thread->PriorityDecrement = 0; /* If the priority will change, reset quantum and change it for real */ @@ -1303,7 +1302,6 @@ /* Reset the Quantum and Decrements */ Thread->Quantum = Thread->QuantumReset; - Thread->DecrementCount = 0; Thread->PriorityDecrement = 0; /* Set the new Priority */ _____ Modified: trunk/reactos/subsys/win32k/ntuser/desktop.c --- trunk/reactos/subsys/win32k/ntuser/desktop.c 2005-11-08 00:21:29 UTC (rev 19052) +++ trunk/reactos/subsys/win32k/ntuser/desktop.c 2005-11-08 08:56:41 UTC (rev 19053) @@ -1432,14 +1432,14 @@ { /* just return the handle, we queried the desktop handle of a thread running in the same context */ - Ret = Thread->Tcb.Win32Thread->hDesktop; + Ret = ((PW32THREAD)Thread->Tcb.Win32Thread)->hDesktop; ObDereferenceObject(Thread); RETURN(Ret); } /* get the desktop handle and the desktop of the thread */ - if(!(hThreadDesktop = Thread->Tcb.Win32Thread->hDesktop) || - !(DesktopObject = Thread->Tcb.Win32Thread->Desktop)) + if(!(hThreadDesktop = ((PW32THREAD)Thread->Tcb.Win32Thread)->hDesktop) || + !(DesktopObject = ((PW32THREAD)Thread->Tcb.Win32Thread)->Desktop)) { ObDereferenceObject(Thread); DPRINT1("Desktop information of thread 0x%x broken!?\n", dwThreadId); _____ Modified: trunk/reactos/subsys/win32k/ntuser/hook.c --- trunk/reactos/subsys/win32k/ntuser/hook.c 2005-11-08 00:21:29 UTC (rev 19052) +++ trunk/reactos/subsys/win32k/ntuser/hook.c 2005-11-08 08:56:41 UTC (rev 19053) @@ -90,7 +90,7 @@ IntAddHook(PETHREAD Thread, int HookId, BOOLEAN Global, PWINSTATION_OBJECT WinStaObj) { PHOOK Hook; - PHOOKTABLE Table = Global ? GlobalHooks : MsqGetHooks(Thread->Tcb.Win32Thread->MessageQueue); + PHOOKTABLE Table = Global ? GlobalHooks : MsqGetHooks(((PW32THREAD)Thread->Tcb.Win32Thread)->MessageQueue); HANDLE Handle; if (NULL == Table) @@ -106,7 +106,7 @@ } else { - MsqSetHooks(Thread->Tcb.Win32Thread->MessageQueue, Table); + MsqSetHooks(((PW32THREAD)Thread->Tcb.Win32Thread)->MessageQueue, Table); } } @@ -136,7 +136,7 @@ return GlobalHooks; } - return MsqGetHooks(Hook->Thread->Tcb.Win32Thread->MessageQueue); + return MsqGetHooks(((PW32THREAD)Hook->Thread->Tcb.Win32Thread)->MessageQueue); } /* get the first hook in the chain */ @@ -272,7 +272,7 @@ /* FIXME should get timeout from * HKEY_CURRENT_USER\Control Panel\Desktop\LowLevelHooksTimeout */ - Status = co_MsqSendMessage(Hook->Thread->Tcb.Win32Thread->MessageQueue, (HWND) Code, HookId, + Status = co_MsqSendMessage(((PW32THREAD)Hook->Thread->Tcb.Win32Thread)->MessageQu eue, (HWND) Code, HookId, wParam, lParam, 5000, TRUE, TRUE, &uResult); return NT_SUCCESS(Status) ? uResult : 0; _____ Modified: trunk/reactos/subsys/win32k/ntuser/input.c --- trunk/reactos/subsys/win32k/ntuser/input.c 2005-11-08 00:21:29 UTC (rev 19052) +++ trunk/reactos/subsys/win32k/ntuser/input.c 2005-11-08 08:56:41 UTC (rev 19053) @@ -670,14 +670,14 @@ FocusThread = FocusQueue->Thread; if (!(FocusThread && FocusThread->Tcb.Win32Thread && - FocusThread->Tcb.Win32Thread->KeyboardLayout)) + ((PW32THREAD)FocusThread->Tcb.Win32Thread)->KeyboardLayout)) continue; /* This function uses lParam to fill wParam according to the * keyboard layout in use. */ W32kKeyProcessMessage(&msg, - FocusThread->Tcb.Win32Thread->KeyboardLayout, + ((PW32THREAD)FocusThread->Tcb.Win32Thread)->KeyboardLayout, KeyInput.Flags & KEY_E0 ? 0xE0 : (KeyInput.Flags & KEY_E1 ? 0xE1 : 0)); _____ Modified: trunk/reactos/subsys/win32k/ntuser/message.c --- trunk/reactos/subsys/win32k/ntuser/message.c 2005-11-08 00:21:29 UTC (rev 19052) +++ trunk/reactos/subsys/win32k/ntuser/message.c 2005-11-08 08:56:41 UTC (rev 19053) @@ -1283,7 +1283,7 @@ if( Status == STATUS_SUCCESS ) { - pThread = peThread->Tcb.Win32Thread; + pThread = (PW32THREAD)peThread->Tcb.Win32Thread; if( !pThread || !pThread->MessageQueue ) { ObDereferenceObject( peThread ); @@ -1780,18 +1780,18 @@ BOOL STDCALL IntInitMessagePumpHook() { - PsGetCurrentThread()->Tcb.Win32Thread->MessagePumpHookValue++; + ((PW32THREAD)PsGetCurrentThread()->Tcb.Win32Thread)->MessagePumpHookValu e++; return TRUE; } BOOL STDCALL IntUninitMessagePumpHook() { - if (PsGetCurrentThread()->Tcb.Win32Thread->MessagePumpHookValue <= 0) + if (((PW32THREAD)PsGetCurrentThread()->Tcb.Win32Thread)->MessagePumpHookVal ue <= 0) { return FALSE; } - PsGetCurrentThread()->Tcb.Win32Thread->MessagePumpHookValue--; + ((PW32THREAD)PsGetCurrentThread()->Tcb.Win32Thread)->MessagePumpHookValu e--; return TRUE; } _____ Modified: trunk/reactos/subsys/win32k/ntuser/misc.c --- trunk/reactos/subsys/win32k/ntuser/misc.c 2005-11-08 00:21:29 UTC (rev 19052) +++ trunk/reactos/subsys/win32k/ntuser/misc.c 2005-11-08 08:56:41 UTC (rev 19053) @@ -459,7 +459,7 @@ case TWOPARAM_ROUTINE_SETGUITHRDHANDLE: { - PUSER_MESSAGE_QUEUE MsgQueue = PsGetCurrentThread()->Tcb.Win32Thread->MessageQueue; + PUSER_MESSAGE_QUEUE MsgQueue = ((PW32THREAD)PsGetCurrentThread()->Tcb.Win32Thread)->MessageQueue; ASSERT(MsgQueue); RETURN( (DWORD)MsqSetStateWindow(MsgQueue, (ULONG)Param1, (HWND)Param2)); @@ -1333,12 +1333,12 @@ SetLastWin32Error(ERROR_ACCESS_DENIED); RETURN( FALSE); } - Desktop = Thread->Tcb.Win32Thread->Desktop; + Desktop = ((PW32THREAD)Thread->Tcb.Win32Thread)->Desktop; } else { /* get the foreground thread */ - PW32THREAD W32Thread = PsGetCurrentThread()->Tcb.Win32Thread; + PW32THREAD W32Thread = (PW32THREAD)PsGetCurrentThread()->Tcb.Win32Thread; Desktop = W32Thread->Desktop; if(Desktop) { _____ Modified: trunk/reactos/subsys/win32k/ntuser/painting.c --- trunk/reactos/subsys/win32k/ntuser/painting.c 2005-11-08 00:21:29 UTC (rev 19052) +++ trunk/reactos/subsys/win32k/ntuser/painting.c 2005-11-08 08:56:41 UTC (rev 19053) @@ -671,7 +671,7 @@ ASSERT_REFS_CO(Window); - Desktop = PsGetCurrentThread()->Tcb.Win32Thread->Desktop; + Desktop = ((PW32THREAD)PsGetCurrentThread()->Tcb.Win32Thread)->Desktop; CaretInfo = ((PUSER_MESSAGE_QUEUE)Desktop->ActiveMessageQueue)->CaretInfo; hWndCaret = CaretInfo->hWnd; _____ Modified: trunk/reactos/subsys/win32k/ntuser/window.c --- trunk/reactos/subsys/win32k/ntuser/window.c 2005-11-08 00:21:29 UTC (rev 19052) +++ trunk/reactos/subsys/win32k/ntuser/window.c 2005-11-08 08:56:41 UTC (rev 19053) @@ -571,7 +571,7 @@ PLIST_ENTRY Current; PWINDOW_OBJECT Wnd; USER_REFERENCE_ENTRY Ref; - WThread = Thread->Tcb.Win32Thread; + WThread = (PW32THREAD)Thread->Tcb.Win32Thread; while (!IsListEmpty(&WThread->WindowListHead)) { @@ -1121,7 +1121,7 @@ SetLastWin32Error(ERROR_INVALID_PARAMETER); return 0; } - if(!(W32Thread = Thread->Tcb.Win32Thread)) + if(!(W32Thread = (PW32THREAD)Thread->Tcb.Win32Thread)) { ObDereferenceObject(Thread); DPRINT("Thread is not a GUI Thread!\n"); @@ -1622,7 +1622,7 @@ PRTL_USER_PROCESS_PARAMETERS ProcessParams; BOOL CalculatedDefPosSize = FALSE; - IntGetDesktopWorkArea(Window->OwnerThread->Tcb.Win32Thread->Desktop, &WorkArea); + IntGetDesktopWorkArea(((PW32THREAD)Window->OwnerThread->Tcb.Win32Thread) ->Desktop, &WorkArea); rc = WorkArea; ProcessParams = PsGetCurrentProcess()->Peb->ProcessParameters; @@ -3363,7 +3363,7 @@ /* * Remove extended window style bit WS_EX_TOPMOST for shell windows. */ - WindowStation = Window->OwnerThread->Tcb.Win32Thread->Desktop->WindowStation; + WindowStation = ((PW32THREAD)Window->OwnerThread->Tcb.Win32Thread)->Desktop->WindowStati on; if(WindowStation) { if (hWnd == WindowStation->ShellWindow || hWnd == WindowStation->ShellListView) _____ Modified: trunk/reactos/w32api/include/ddk/winddk.h --- trunk/reactos/w32api/include/ddk/winddk.h 2005-11-08 00:21:29 UTC (rev 19052) +++ trunk/reactos/w32api/include/ddk/winddk.h 2005-11-08 08:56:41 UTC (rev 19053) @@ -394,6 +394,7 @@ extern NTOSAPI CCHAR KeNumberProcessors; #define PROCESSOR_FEATURE_MAX 64 +#define MAX_WOW64_SHARED_ENTRIES 16 typedef enum _ALTERNATIVE_ARCHITECTURE_TYPE { @@ -418,12 +419,12 @@ volatile KSYSTEM_TIME TimeZoneBias; USHORT ImageNumberLow; USHORT ImageNumberHigh; - WCHAR NtSystemRoot[ 260 ]; + WCHAR NtSystemRoot[260]; ULONG MaxStackTraceDepth; ULONG CryptoExponent; ULONG TimeZoneId; ULONG LargePageMinimum; - ULONG Reserved2[ 7 ]; + ULONG Reserved2[7]; NT_PRODUCT_TYPE NtProductType; BOOLEAN ProductTypeIsValid; ULONG NtMajorVersion; @@ -443,12 +444,19 @@ ULONG NumberOfPhysicalPages; BOOLEAN SafeBootMode; ULONG TraceLogging; - ULONGLONG Fill0; - ULONGLONG SystemCall[4]; + ULONG Fill0; + ULONGLONG TestRetInstruction; + ULONG SystemCall; + ULONG SystemCallReturn; + ULONGLONG SystemCallPad[3]; union { volatile KSYSTEM_TIME TickCount; volatile ULONG64 TickCountQuad; }; + ULONG Cookie; + LONGLONG ConsoleSessionForegroundProcessId; + ULONG Wow64SharedInformation[MAX_WOW64_SHARED_ENTRIES]; + ULONG UserModeGlobalLogging; } KUSER_SHARED_DATA, *PKUSER_SHARED_DATA; /* @@ -929,21 +937,24 @@ (DDKAPI *PKTRANSFER_ROUTINE)( VOID); -typedef struct _KAPC { - CSHORT Type; - CSHORT Size; - ULONG Spare0; - struct _KTHREAD *Thread; - LIST_ENTRY ApcListEntry; - PKKERNEL_ROUTINE KernelRoutine; - PKRUNDOWN_ROUTINE RundownRoutine; - PKNORMAL_ROUTINE NormalRoutine; - PVOID NormalContext; - PVOID SystemArgument1; - PVOID SystemArgument2; - CCHAR ApcStateIndex; - KPROCESSOR_MODE ApcMode; - BOOLEAN Inserted; +typedef struct _KAPC +{ + UCHAR Type; + UCHAR SpareByte0; + UCHAR Size; + UCHAR SpareByte1; + ULONG SpareLong0; + struct _KTHREAD *Thread; + LIST_ENTRY ApcListEntry; + PKKERNEL_ROUTINE KernelRoutine; + PKRUNDOWN_ROUTINE RundownRoutine; + PKNORMAL_ROUTINE NormalRoutine; + PVOID NormalContext; + PVOID SystemArgument1; + PVOID SystemArgument2; + CCHAR ApcStateIndex; + KPROCESSOR_MODE ApcMode; + BOOLEAN Inserted; } KAPC, *PKAPC, *RESTRICTED_POINTER PRKAPC; typedef struct _KDEVICE_QUEUE { @@ -1015,13 +1026,33 @@ PKDPC BufferChainingDpc; } WAIT_CONTEXT_BLOCK, *PWAIT_CONTEXT_BLOCK; -typedef struct _DISPATCHER_HEADER { - UCHAR Type; - UCHAR Absolute; - UCHAR Size; - UCHAR Inserted; - LONG SignalState; - LIST_ENTRY WaitListHead; +typedef struct _DISPATCHER_HEADER +{ + union + { + struct + { + UCHAR Type; + union + { + UCHAR Absolute; + UCHAR NpxIrql; + }; + union + { + UCHAR Size; + UCHAR Hand; + }; + union + { + UCHAR Inserted; + BOOLEAN DebugActive; + }; + }; + volatile LONG Lock; + }; + LONG SignalState; + LIST_ENTRY WaitListHead; } DISPATCHER_HEADER, *PDISPATCHER_HEADER; typedef struct _KEVENT {

1 0

← Newer
1
...
71
72
73
74
75
76
77
...
88
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 November 2005