Add hack for ROS's weird behavior. Will investigate but this lets you
boot for now
Modified: trunk/reactos/ntoskrnl/io/irp.c
_____
Modified: trunk/reactos/ntoskrnl/io/irp.c
--- trunk/reactos/ntoskrnl/io/irp.c 2005-04-30 17:37:11 UTC (rev
14883)
+++ trunk/reactos/ntoskrnl/io/irp.c 2005-04-30 17:43:18 UTC (rev
14884)
@@ -1288,7 +1288,10 @@
/* Dereference the Event if this is an ASYNC IRP */
if (!Irp->Flags & IRP_SYNCHRONOUS_API)
{
- ObDereferenceObject(Irp->UserEvent);
+ if (Irp->UserEvent != &FileObject->Event)
+ {
+ ObDereferenceObject(Irp->UserEvent);
+ }
}
/* If the File Object is SYNC, then we need to signal its
event too */
@@ -1382,7 +1385,10 @@
/* Dereference the Event if it's an ASYNC IRP on a File Object
*/
if (Irp->UserEvent && !(Irp->Flags & IRP_SYNCHRONOUS_API) &&
FileObject)
{
- ObDereferenceObject(Irp->UserEvent);
+ if (Irp->UserEvent != &FileObject->Event)
+ {
+ ObDereferenceObject(Irp->UserEvent);
+ }
}
/* Dereference the File Object */
Fixed another makefile with the wrong case in the xmlbuildsystem branch
Added: branches/xmlbuildsystem/reactos/ntoskrnl/Makefile
Deleted: branches/xmlbuildsystem/reactos/ntoskrnl/makefile
_____
Copied: branches/xmlbuildsystem/reactos/ntoskrnl/Makefile (from rev
14880, branches/xmlbuildsystem/reactos/ntoskrnl/makefile)
_____
Deleted: branches/xmlbuildsystem/reactos/ntoskrnl/makefile
--- branches/xmlbuildsystem/reactos/ntoskrnl/makefile 2005-04-30
17:15:58 UTC (rev 14880)
+++ branches/xmlbuildsystem/reactos/ntoskrnl/makefile 2005-04-30
17:22:34 UTC (rev 14881)
@@ -1,3 +0,0 @@
-TOP = ..
-DEFAULT = ntoskrnl
-include $(TOP)/proxy.mak
\ No newline at end of file
makefile was spelled with a lower case in the xmlbuild branch,
but with upper case M in the trunk. This was causing problems with
svn switch on win32 due to the name conflict.
Added: branches/xmlbuildsystem/reactos/tools/unicode/Makefile
Deleted: branches/xmlbuildsystem/reactos/tools/unicode/makefile
_____
Copied: branches/xmlbuildsystem/reactos/tools/unicode/Makefile (from rev
14879, branches/xmlbuildsystem/reactos/tools/unicode/makefile)
_____
Deleted: branches/xmlbuildsystem/reactos/tools/unicode/makefile
--- branches/xmlbuildsystem/reactos/tools/unicode/makefile
2005-04-30 16:37:06 UTC (rev 14879)
+++ branches/xmlbuildsystem/reactos/tools/unicode/makefile
2005-04-30 17:15:58 UTC (rev 14880)
@@ -1,3 +0,0 @@
-TOP = ../..
-DEFAULT = unicode
-include $(TOP)/proxy.mak
\ No newline at end of file