[fireball] 42377: - Merge 42376 (along with committing a merge history leftover from a previous merge).

Author: fireball
Date: Mon Aug  3 23:06:49 2009
New Revision: 42377

URL: http://svn.reactos.org/svn/reactos?rev=42377&view=rev
Log:
- Merge 42376 (along with committing a merge history leftover from a previous merge).

Modified:
    branches/arwinss/reactos/   (props changed)
    branches/arwinss/reactos/include/ndk/psfuncs.h

Propchange: branches/arwinss/reactos/
------------------------------------------------------------------------------
    svn:mergeinfo = /trunk/reactos:42202,42376

Modified: branches/arwinss/reactos/include/ndk/psfuncs.h
URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/ndk/psfu...
==============================================================================
--- branches/arwinss/reactos/include/ndk/psfuncs.h [iso-8859-1] (original)
+++ branches/arwinss/reactos/include/ndk/psfuncs.h [iso-8859-1] Mon Aug  3 23:06:49 2009
@@ -155,6 +155,12 @@
 PsSetProcessPriorityByClass(
     IN PEPROCESS Process,
     IN PSPROCESSPRIORITYMODE Type
+);
+
+HANDLE
+NTAPI
+PsGetProcessInheritedFromUniqueProcessId(
+    IN PEPROCESS Process
 );

//