Author: cgutman
Date: Sun Oct 24 09:05:17 2010
New Revision: 49252
URL:
http://svn.reactos.org/svn/reactos?rev=49252&view=rev
Log:
[NTOSKRNL]
- Fix a critical bug in the conflict detection code
- Don't unconditionally skip conflict detection for shared resources, instead it
should be done on a descriptor-by-descriptor basis (if both descriptors are shared)
- This check wasn't removed when I initially wrote this code and added the proper
check below
Modified:
trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.c
Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.…
==============================================================================
--- trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.c [iso-8859-1] Sun Oct 24 09:05:17 2010
@@ -329,9 +329,6 @@
{
ULONG i, ii;
BOOLEAN Result = FALSE;
-
- if (ResDesc->ShareDisposition == CmResourceShareShared)
- return FALSE;
for (i = 0; i < ResourceList->Count; i++)
{