Changeset 6459 for trunk/src

Timestamp:

Aug 4, 2001, 7:19:21 PM (24 years ago)

Author:

sandervl

Message:

removed ntdll dependency

Location:

trunk/src/custombuild

Files:

• guid.c (modified) (3 diffs)
• initterm.cpp (modified) (2 diffs)
• xxodin32.def (modified) (2 diffs)

trunk/src/custombuild/guid.c

@@ -1 @@
-/* $Id: guid.c,v 1.3 2001-08-04 15:29:20 sandervl Exp $ */
+/* $Id: guid.c,v 1.4 2001-08-04 17:19:20 sandervl Exp $ */
 #define ICOM_CINTERFACE 1
 #include <odin.h>
@@ -37 +37 @@
 #include <wine/obj_serviceprovider.h>
 #include <wine/unicode.h>
+
+#include <misc.h>
 
 /*********************************************************************
@@ -82 +84 @@
     return _wtol(string);
 }
+
+/******************************************************************************
+ *  RtlAllocateAndInitializeSid             [NTDLL.265]
+ *
+ */
+BOOLEAN WINAPI 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)
+{
+  dprintf(("NTDLL: RtlAllocateAndInitializeSid(%08xh,%08xh,%08xh,"
+           "%08xh,%08xh,%08xh,%08xh,%08xh,%08xh,%08xh,%08xh)",
+           pIdentifierAuthority,
+           nSubAuthorityCount,
+           nSubAuthority0,
+           nSubAuthority1,
+           nSubAuthority2,
+           nSubAuthority3,
+           nSubAuthority4,
+           nSubAuthority5,
+           nSubAuthority6,
+           nSubAuthority7,
+           pSid));
+
+  *pSid = (PSID)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(SID)+nSubAuthorityCount*sizeof(DWORD));
+  if(*pSid == NULL) {
+        SetLastError(ERROR_NOT_ENOUGH_MEMORY);
+        return FALSE;
+  }
+  (*pSid)->Revision          = SID_REVISION;
+  (*pSid)->SubAuthorityCount = nSubAuthorityCount;
+
+  if (nSubAuthorityCount > 0)
+        (*pSid)->SubAuthority[0] = nSubAuthority0;
+  if (nSubAuthorityCount > 1)
+        (*pSid)->SubAuthority[1] = nSubAuthority1;
+  if (nSubAuthorityCount > 2)
+        (*pSid)->SubAuthority[2] = nSubAuthority2;
+  if (nSubAuthorityCount > 3)
+        (*pSid)->SubAuthority[3] = nSubAuthority3;
+  if (nSubAuthorityCount > 4)
+        (*pSid)->SubAuthority[4] = nSubAuthority4;
+  if (nSubAuthorityCount > 5)
+        (*pSid)->SubAuthority[5] = nSubAuthority5;
+  if (nSubAuthorityCount > 6)
+        (*pSid)->SubAuthority[6] = nSubAuthority6;
+  if (nSubAuthorityCount > 7)
+        (*pSid)->SubAuthority[7] = nSubAuthority7;
+
+  if(pIdentifierAuthority) 
+        memcpy((PVOID)&(*pSid)->IdentifierAuthority, (PVOID)pIdentifierAuthority, sizeof(SID_IDENTIFIER_AUTHORITY));
+  return TRUE;
+}

trunk/src/custombuild/initterm.cpp

@@ -133 +133 @@
          SetRegistryRootKey(HKEY_USERS, hKeyUsers);
 
+         SetCustomBuildName("NTDLL.DLL");
+         if(RegisterLxDll(hModule, NULL, (PVOID)NULL) == 0)
+            return 0UL;
+
          SetCustomBuildName("KERNEL32.DLL");
          rc = inittermKernel32(hModule, ulFlag);
@@ -144 +148 @@
 
          SetCustomBuildName("GDI32.DLL");
-         hDllGdi32 = RegisterLxDll(hModule, NULL, NULL);
+         if(RegisterLxDll(hModule, NULL, (PVOID)NULL) == 0)
+            return 0UL;
 
          SetCustomBuildName("ADVAPI32.DLL");
-         hDllAdvapi32 = RegisterLxDll(hModule, NULL, NULL);
+         if(RegisterLxDll(hModule, NULL, (PVOID)NULL) == 0)
+            return 0UL;
 
          SetCustomBuildName("VERSION.DLL");        

trunk/src/custombuild/xxodin32.def

@@ -1 @@
-; $Id: xxodin32.def,v 1.4 2001-07-30 12:02:45 sandervl Exp $
+; $Id: xxodin32.def,v 1.5 2001-08-04 17:19:21 sandervl Exp $
 
 LIBRARY XXODIN32 INITINSTANCE
@@ -3158 +3158 @@
 ;    VerQueryValueIndexW        = _VerQueryValueIndexW@16     @12313
 ;    VerQueryValueW             = _VerQueryValueW@16          @12314
+
+; NTDLL
+    RtlExtendedIntegerMultiply     = _RtlExtendedIntegerMultiply@12     @12400
+    RtlExtendedLargeIntegerDivide  = _RtlExtendedLargeIntegerDivide@16  @12401
+    RtlAllocateAndInitializeSid   = _RtlAllocateAndInitializeSid@44     @12402
+