Changeset 9802 for trunk/src/kernel32/wprocess.cpp

Timestamp:

Feb 13, 2003, 6:16:50 PM (23 years ago)

Author:

sandervl

Message:

Forward RtlZero/Move/FillMemory to ntdll

File:

• trunk/src/kernel32/wprocess.cpp (modified) (5 diffs)

trunk/src/kernel32/wprocess.cpp

@@ -1 @@
-/* $Id: wprocess.cpp,v 1.179 2003-02-13 15:30:53 sandervl Exp $ */
+/* $Id: wprocess.cpp,v 1.180 2003-02-13 17:16:50 sandervl Exp $ */
 
 /*
@@ -49 +49 @@
 #include "directory.h"
 
+#include <win\ntddk.h>
+
 #define DBG_LOCALLOG    DBG_wprocess
 #include "dbglocal.h"
@@ -87 +89 @@
 static VMutex    threadListMutex;
 
-//TODO: This should not be here: (need to rearrange NTDLL; kernel32 can't depend on ntdll)
-static BOOLEAN (* WINAPI NTDLL_RtlAllocateAndInitializeSid) ( PSID_IDENTIFIER_AUTHORITY pIdentifierAuthority,
-                                                              BYTE nSubAuthorityCount,
-                                                              DWORD nSubAuthority0,
-                                                              DWORD nSubAuthority1,
-                                                              DWORD nSubAuthority2,
-                                                              DWORD nSubAuthority3,
-                                                              DWORD nSubAuthority4,
-                                                              DWORD nSubAuthority5,
-                                                              DWORD nSubAuthority6,
-                                                              DWORD nSubAuthority7,
-                                                              PSID *pSid);
-static HINSTANCE hInstNTDll = 0;
 
 //******************************************************************************
@@ -310 +299 @@
 
     //Initialize thread security objects (TODO: Not complete)
-    if(hInstNTDll == 0) {
-        hInstNTDll = LoadLibraryA("NTDLL.DLL");
-        *(ULONG *)&NTDLL_RtlAllocateAndInitializeSid = (ULONG)GetProcAddress(hInstNTDll, "RtlAllocateAndInitializeSid");
-        if(NTDLL_RtlAllocateAndInitializeSid == NULL) {
-            DebugInt3();
-        }
-    }
     SID_IDENTIFIER_AUTHORITY sidIdAuth = {0};
     winteb->o.odin.threadinfo.dwType = SECTYPE_PROCESS | SECTYPE_INITIALIZED;
 
-    if (NULL != NTDLL_RtlAllocateAndInitializeSid) {
-        NTDLL_RtlAllocateAndInitializeSid(&sidIdAuth, 1, 0, 0, 0, 0, 0, 0, 0, 0, &winteb->o.odin.threadinfo.SidUser.User.Sid);
-    }
-    else DebugInt3();
+    RtlAllocateAndInitializeSid(&sidIdAuth, 1, 0, 0, 0, 0, 0, 0, 0, 0, &winteb->o.odin.threadinfo.SidUser.User.Sid);
 
     winteb->o.odin.threadinfo.SidUser.User.Attributes = 0; //?????????
@@ -330 +309 @@
     winteb->o.odin.threadinfo.pTokenGroups->GroupCount = 1;
 
-    if (NULL != NTDLL_RtlAllocateAndInitializeSid) {
-         NTDLL_RtlAllocateAndInitializeSid(&sidIdAuth, 1, 0, 0, 0, 0, 0, 0, 0, 0, &winteb->o.odin.threadinfo.PrimaryGroup.PrimaryGroup);
-    }
-    else DebugInt3();
+    RtlAllocateAndInitializeSid(&sidIdAuth, 1, 0, 0, 0, 0, 0, 0, 0, 0, &winteb->o.odin.threadinfo.PrimaryGroup.PrimaryGroup);
 
     winteb->o.odin.threadinfo.pTokenGroups->Groups[0].Sid = winteb->o.odin.threadinfo.PrimaryGroup.PrimaryGroup;