[KERNEL32]: Rearrange and rename some base functions.

[KERNEL32]: Fix some error cases in the helper string functions.
[KERNEL32]: Implement BasepIsRealtimeAllowed.
[KERNEL32]: Don't need RPL_MASK when setting up the CONTEXT, this now matches what Windows sets up (and also helps us validate the kernel is doing the right thing).

svn path=/trunk/; revision=54284

reactos/dll/win32/kernel32/client/dllmain.c

@@ -62,60 +62,6 @@ BOOLEAN InWindows = FALSE;
 
 /* FUNCTIONS *****************************************************************/
 
-NTSTATUS
-WINAPI
-BaseGetNamedObjectDirectory(VOID)
-{
-    OBJECT_ATTRIBUTES ObjectAttributes;
-    NTSTATUS Status;
-
-    InitializeObjectAttributes(&ObjectAttributes,
-                               &BaseStaticServerData->NamedObjectDirectory,
-                               OBJ_CASE_INSENSITIVE,
-                               NULL,
-                               NULL);
-
-    Status = NtOpenDirectoryObject(&BaseNamedObjectDirectory,
-                                   DIRECTORY_ALL_ACCESS &
-                                   ~(DELETE | WRITE_DAC | WRITE_OWNER),
-                                   &ObjectAttributes);
-    if (!NT_SUCCESS(Status)) return Status;
-
-    DPRINT("Opened BNO: %lx\n", BaseNamedObjectDirectory);
-    return Status;
-}
-
-/*
- * @unimplemented
- */
-BOOL
-WINAPI
-BaseQueryModuleData(IN LPSTR ModuleName,
-                    IN LPSTR Unknown,
-                    IN PVOID Unknown2,
-                    IN PVOID Unknown3,
-                    IN PVOID Unknown4)
-{
-    DPRINT1("BaseQueryModuleData called: %s %s %x %x %x\n",
-            ModuleName,
-            Unknown,
-            Unknown2,
-            Unknown3,
-            Unknown4);
-    return FALSE;
-}
-
-/*
- * @unimplemented
- */
-NTSTATUS
-WINAPI
-BaseProcessInitPostImport(VOID)
-{
-    /* FIXME: Initialize TS pointers */
-    return STATUS_SUCCESS;
-}
-
 BOOL
 WINAPI
 BasepInitConsole(VOID)
@@ -388,9 +334,6 @@ DllMain(HANDLE hDll,
                     RtlDeleteCriticalSection (&ConsoleLock);
                 }
                 RtlDeleteCriticalSection (&BaseDllDirectoryLock);
-
-                /* Close object base directory */
-                NtClose(hBaseDir);
             }
             break;
 

reactos/dll/win32/kernel32/client/environ.c

@@ -68,7 +68,7 @@ GetEnvironmentVariableA(IN LPCSTR lpName,
     Buffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, UniSize * sizeof(WCHAR));
     if (!Buffer)
     {
-        Status = STATUS_NO_MEMORY;;
+        Status = STATUS_NO_MEMORY;
         goto Quickie;
     }
 

reactos/dll/win32/kernel32/client/fiber.c

@@ -237,11 +237,11 @@ CreateFiberEx(SIZE_T dwStackCommitSize,
     Fiber->Context.ContextFlags = (dwFlags & FIBER_FLAG_FLOAT_SWITCH) ? CONTEXT_FLOATING_POINT : 0;
 
     /* initialize the context for the fiber */
-    BasepInitializeContext(&Fiber->Context,
+    BaseInitializeContext(&Fiber->Context,
-                           lpParameter,
+                          lpParameter,
-                           lpStartAddress,
+                          lpStartAddress,
-                           InitialTeb.StackBase,
+                          InitialTeb.StackBase,
-                           2);
+                          2);
 
     /* Return the Fiber */
     return Fiber;

reactos/dll/win32/kernel32/client/file/filemap.c

@@ -80,7 +80,7 @@ CreateFileMappingW(HANDLE hFile,
     if (lpName) RtlInitUnicodeString(&SectionName, lpName);
 
     /* Now convert the object attributes */
-    ObjectAttributes = BasepConvertObjectAttributes(&LocalAttributes,
+    ObjectAttributes = BaseFormatObjectAttributes(&LocalAttributes,
                                                     lpFileMappingAttributes,
                                                     lpName ? &SectionName : NULL);
 
@@ -244,6 +244,7 @@ UnmapViewOfFile(LPCVOID lpBaseAddress)
 /*
  * @implemented
  */
+ /* FIXME: Convert to the new macros */
 HANDLE
 NTAPI
 OpenFileMappingA(DWORD dwDesiredAccess,
@@ -286,6 +287,7 @@ OpenFileMappingA(DWORD dwDesiredAccess,
 /*
  * @implemented
  */
+ /* FIXME: Convert to the new macros */
 HANDLE
 NTAPI
 OpenFileMappingW(DWORD dwDesiredAccess,

reactos/dll/win32/kernel32/client/loader.c

@@ -1175,4 +1175,35 @@ VOID WINAPI UTUnRegister( HMODULE hModule )
     STUB;
 }
 
+/*
+ * @unimplemented
+ */
+BOOL
+WINAPI
+BaseQueryModuleData(IN LPSTR ModuleName,
+                    IN LPSTR Unknown,
+                    IN PVOID Unknown2,
+                    IN PVOID Unknown3,
+                    IN PVOID Unknown4)
+{
+    DPRINT1("BaseQueryModuleData called: %s %s %x %x %x\n",
+            ModuleName,
+            Unknown,
+            Unknown2,
+            Unknown3,
+            Unknown4);
+    return FALSE;
+}
+
+/*
+ * @unimplemented
+ */
+NTSTATUS
+WINAPI
+BaseProcessInitPostImport(VOID)
+{
+    /* FIXME: Initialize TS pointers */
+    return STATUS_SUCCESS;
+}
+
 /* EOF */

reactos/dll/win32/kernel32/client/proc.c

@@ -193,14 +193,14 @@ BasepCreateFirstThread(HANDLE ProcessHandle,
                      &InitialTeb);
 
     /* Create the Thread's Context */
-    BasepInitializeContext(&Context,
+    BaseInitializeContext(&Context,
                            NtCurrentPeb(),
                            SectionImageInfo->TransferAddress,
                            InitialTeb.StackBase,
                            0);
 
     /* Convert the thread attributes */
-    ObjectAttributes = BasepConvertObjectAttributes(&LocalObjectAttributes,
+    ObjectAttributes = BaseFormatObjectAttributes(&LocalObjectAttributes,
                                                     lpThreadAttributes,
                                                     NULL);
 
@@ -319,7 +319,7 @@ BasepConvertPriorityClass(IN ULONG dwCreationFlags)
     else if(dwCreationFlags & REALTIME_PRIORITY_CLASS)
     {
         /* Check for Privilege First */
-        if (BasepCheckRealTimePrivilege())
+        if (BasepIsRealtimeAllowed(TRUE))
         {
             ReturnClass = PROCESS_PRIORITY_CLASS_REALTIME;
         }
@@ -2654,7 +2654,7 @@ GetAppName:
     }
 
     /* Initialize the process object attributes */
-    ObjectAttributes = BasepConvertObjectAttributes(&LocalObjectAttributes,
+    ObjectAttributes = BaseFormatObjectAttributes(&LocalObjectAttributes,
                                                     lpProcessAttributes,
                                                     NULL);
 

reactos/dll/win32/kernel32/client/thread.c

@@ -149,14 +149,14 @@ CreateRemoteThread(HANDLE hProcess,
     }
 
     /* Create Initial Context */
-    BasepInitializeContext(&Context,
+    BaseInitializeContext(&Context,
                            lpParameter,
                            lpStartAddress,
                            InitialTeb.StackBase,
                            1);
 
     /* initialize the attributes for the thread object */
-    ObjectAttributes = BasepConvertObjectAttributes(&LocalObjectAttributes,
+    ObjectAttributes = BaseFormatObjectAttributes(&LocalObjectAttributes,
                                                     lpThreadAttributes,
                                                     NULL);
 
@@ -171,7 +171,7 @@ CreateRemoteThread(HANDLE hProcess,
                             TRUE);
     if(!NT_SUCCESS(Status))
     {
-        BasepFreeStack(hProcess, &InitialTeb);
+        BaseFreeThreadStack(hProcess, &InitialTeb);
         BaseSetLastNTError(Status);
         return NULL;
     }

reactos/dll/win32/kernel32/client/utils.c

@@ -7,7 +7,7 @@
  *                  Pierre Schweitzer (pierre.schweitzer@reactos.org)
  */
 
-/* INCLUDES ****************************************************************/
+/* INCLUDES ******************************************************************/
 
 #include <k32.h>
 #ifdef _M_IX86
@@ -19,11 +19,34 @@
 #define NDEBUG
 #include <debug.h>
 
-/* GLOBALS ******************************************************************/
+/* GLOBALS ********************************************************************/
 
 PRTL_CONVERT_STRING Basep8BitStringToUnicodeString;
 
-/* FUNCTIONS ****************************************************************/
+/* FUNCTIONS ******************************************************************/
+
+NTSTATUS
+WINAPI
+BaseGetNamedObjectDirectory(VOID)
+{
+    OBJECT_ATTRIBUTES ObjectAttributes;
+    NTSTATUS Status;
+
+    InitializeObjectAttributes(&ObjectAttributes,
+                               &BaseStaticServerData->NamedObjectDirectory,
+                               OBJ_CASE_INSENSITIVE,
+                               NULL,
+                               NULL);
+
+    Status = NtOpenDirectoryObject(&BaseNamedObjectDirectory,
+                                   DIRECTORY_ALL_ACCESS &
+                                   ~(DELETE | WRITE_DAC | WRITE_OWNER),
+                                   &ObjectAttributes);
+    if (!NT_SUCCESS(Status)) return Status;
+
+    DPRINT("Opened BNO: %lx\n", BaseNamedObjectDirectory);
+    return Status;
+}
 
 VOID
 NTAPI
@@ -66,21 +89,29 @@ Basep8BitStringToStaticUnicodeString(IN LPCSTR String)
     NTSTATUS Status;
 
     /* Initialize an ANSI String */
-    if (!NT_SUCCESS(RtlInitAnsiStringEx(&AnsiString, String)))
+    Status = RtlInitAnsiStringEx(&AnsiString, String);
-    {
-        SetLastError(ERROR_FILENAME_EXCED_RANGE);
-        return NULL;
-    }
-
-    /* Convert it */
-    Status = Basep8BitStringToUnicodeString(StaticString, &AnsiString, FALSE);
     if (!NT_SUCCESS(Status))
     {
-        BaseSetLastNTError(Status);
+        Status = STATUS_BUFFER_OVERFLOW;
-        return NULL;
+    }
+    else
+    {
+        /* Convert it */
+        Status = Basep8BitStringToUnicodeString(StaticString, &AnsiString, FALSE);
     }
 
-    return StaticString;
+    if (NT_SUCCESS(Status)) return StaticString;
+
+    if (Status == STATUS_BUFFER_OVERFLOW)
+    {
+        SetLastError(ERROR_FILENAME_EXCED_RANGE);
+    }
+    else
+    {
+        BaseSetLastNTError(Status);
+    }
+
+    return NULL;
 }
 
 /*
@@ -94,32 +125,36 @@ Basep8BitStringToDynamicUnicodeString(OUT PUNICODE_STRING UnicodeString,
     ANSI_STRING AnsiString;
     NTSTATUS Status;
 
-    DPRINT("Basep8BitStringToDynamicUnicodeString\n");
-
     /* Initialize an ANSI String */
-    if (!NT_SUCCESS(RtlInitAnsiStringEx(&AnsiString, String)))
+    Status = RtlInitAnsiStringEx(&AnsiString, String);
-    {
-        SetLastError(ERROR_BUFFER_OVERFLOW);
-        return FALSE;
-    }
-     
-    /* Convert it */
-    Status = Basep8BitStringToUnicodeString(UnicodeString, &AnsiString, TRUE);    
-
-    /* Handle failure */
     if (!NT_SUCCESS(Status))
     {
-        BaseSetLastNTError(Status);
+        Status = STATUS_BUFFER_OVERFLOW;
-        return FALSE;
+    }
+    else
+    {
+        /* Convert it */
+        Status = Basep8BitStringToUnicodeString(UnicodeString, &AnsiString, FALSE);
     }
 
-    /* Return Status */
+    if (NT_SUCCESS(Status)) return TRUE;
-    return TRUE;
+
+    if (Status == STATUS_BUFFER_OVERFLOW)
+    {
+        SetLastError(ERROR_FILENAME_EXCED_RANGE);
+    }
+    else
+    {
+        BaseSetLastNTError(Status);
+    }
+
+    return FALSE;
 }
 
 /*
  * Allocates space from the Heap and converts an Ansi String into it
  */
+ /*NOTE: API IS A HACK */
 VOID
 WINAPI
 BasepAnsiStringToHeapUnicodeString(IN LPCSTR AnsiString,
@@ -163,16 +198,14 @@ BaseFormatTimeOut(OUT PLARGE_INTEGER Timeout,
  */
 POBJECT_ATTRIBUTES
 WINAPI
-BasepConvertObjectAttributes(OUT POBJECT_ATTRIBUTES ObjectAttributes,
+BaseFormatObjectAttributes(OUT POBJECT_ATTRIBUTES ObjectAttributes,
-                             IN PSECURITY_ATTRIBUTES SecurityAttributes OPTIONAL,
+                           IN PSECURITY_ATTRIBUTES SecurityAttributes OPTIONAL,
-                             IN PUNICODE_STRING ObjectName)
+                           IN PUNICODE_STRING ObjectName)
 {
-    ULONG Attributes = 0;
+    ULONG Attributes;
-    HANDLE RootDirectory = 0;
+    HANDLE RootDirectory;
-    PVOID SecurityDescriptor = NULL;
+    PVOID SecurityDescriptor;
-    BOOLEAN NeedOba = FALSE;
+    DPRINT("BaseFormatObjectAttributes. Security: %p, Name: %p\n",
-    
-    DPRINT("BasepConvertObjectAttributes. Security: %p, Name: %p\n",
             SecurityAttributes, ObjectName);
 
     /* Get the attributes if present */
@@ -180,32 +213,33 @@ BasepConvertObjectAttributes(OUT POBJECT_ATTRIBUTES ObjectAttributes,
     {
         Attributes = SecurityAttributes->bInheritHandle ? OBJ_INHERIT : 0;
         SecurityDescriptor = SecurityAttributes->lpSecurityDescriptor;
-        NeedOba = TRUE;
+    }
+    else
+    {
+        if (!ObjectName) return NULL;
+        Attributes = 0;
+        SecurityDescriptor = NULL;
     }
 
     if (ObjectName)
     {
         Attributes |= OBJ_OPENIF;
         RootDirectory = hBaseDir;
-        NeedOba = TRUE;
     }
-    
+    else
-    DPRINT("Attributes: %lx, RootDirectory: %lx, SecurityDescriptor: %p\n",
+    {
-            Attributes, RootDirectory, SecurityDescriptor);
+        RootDirectory = NULL;
+    }
 
     /* Create the Object Attributes */
-    if (NeedOba)
+    InitializeObjectAttributes(ObjectAttributes,
-    {
+                               ObjectName,
-        InitializeObjectAttributes(ObjectAttributes,
+                               Attributes,
-                                   ObjectName,
+                               RootDirectory,
-                                   Attributes,
+                               SecurityDescriptor);
-                                   RootDirectory,
+    DPRINT("Attributes: %lx, RootDirectory: %lx, SecurityDescriptor: %p\n",
-                                   SecurityDescriptor);
+            Attributes, RootDirectory, SecurityDescriptor);
-        return ObjectAttributes;
+    return ObjectAttributes;
-    }
-
-    /* Nothing to return */
-    return NULL;    
 }
 
 /*
@@ -340,8 +374,8 @@ BasepCreateStack(HANDLE hProcess,
 
 VOID
 WINAPI
-BasepFreeStack(HANDLE hProcess,
+BaseFreeThreadStack(IN HANDLE hProcess,
-               PINITIAL_TEB InitialTeb)
+                    IN PINITIAL_TEB InitialTeb)
 {
     SIZE_T Dummy = 0;
 
@@ -357,7 +391,7 @@ BasepFreeStack(HANDLE hProcess,
  */
 VOID
 WINAPI
-BasepInitializeContext(IN PCONTEXT Context,
+BaseInitializeContext(IN PCONTEXT Context,
                        IN PVOID Parameter,
                        IN PVOID StartAddress,
                        IN PVOID StackAddress,
@@ -365,7 +399,7 @@ BasepInitializeContext(IN PCONTEXT Context,
 {
 #ifdef _M_IX86
     ULONG ContextFlags;
-    DPRINT("BasepInitializeContext: %p\n", Context);
+    DPRINT("BaseInitializeContext: %p\n", Context);
 
     /* Setup the Initial Win32 Thread Context */
     Context->Eax = (ULONG)StartAddress;
@@ -374,11 +408,11 @@ BasepInitializeContext(IN PCONTEXT Context,
     /* The other registers are undefined */
 
     /* Setup the Segments */
-    Context->SegFs = KGDT_R3_TEB | RPL_MASK;
+    Context->SegFs = KGDT_R3_TEB;
-    Context->SegEs = KGDT_R3_DATA | RPL_MASK;
+    Context->SegEs = KGDT_R3_DATA;
-    Context->SegDs = KGDT_R3_DATA | RPL_MASK;
+    Context->SegDs = KGDT_R3_DATA;
-    Context->SegCs = KGDT_R3_CODE | RPL_MASK;
+    Context->SegCs = KGDT_R3_CODE;
-    Context->SegSs = KGDT_R3_DATA | RPL_MASK;
+    Context->SegSs = KGDT_R3_DATA;
     Context->SegGs = 0;
 
     /* Set the Context Flags */
@@ -426,7 +460,7 @@ BasepInitializeContext(IN PCONTEXT Context,
     }
 
 #elif defined(_M_AMD64)
-    DPRINT("BasepInitializeContext: %p\n", Context);
+    DPRINT("BaseInitializeContext: %p\n", Context);
 
     /* Setup the Initial Win32 Thread Context */
     Context->Rax = (ULONG_PTR)StartAddress;
@@ -473,11 +507,24 @@ BasepInitializeContext(IN PCONTEXT Context,
 /*
  * Checks if the privilege for Real-Time Priority is there
  */
-BOOLEAN
+PVOID
 WINAPI
-BasepCheckRealTimePrivilege(VOID)
+BasepIsRealtimeAllowed(IN BOOLEAN Keep)
 {
-    return TRUE;
+    ULONG Privilege = SE_INC_BASE_PRIORITY_PRIVILEGE;
+    PVOID State;
+    NTSTATUS Status;
+
+    Status = RtlAcquirePrivilege(&Privilege, TRUE, FALSE, &State);
+    if (!NT_SUCCESS(Status)) return NULL;
+
+    if (Keep)
+    {
+        RtlReleasePrivilege(State);
+        State = (PVOID)TRUE;
+    }
+
+    return State;
 }
 
 /*

reactos/dll/win32/kernel32/include/base_x.h

@@ -88,7 +88,7 @@
 // wraps the usual code path required to create an NT object based on a Unicode
 // (Wide) Win32 object creation API.
 //
-// It makes use of BasepConvertObjectAttributes and allows for a custom access
+// It makes use of BaseFormatObjectAttributes and allows for a custom access
 // mode to be used, and also sets the correct error codes in case of a collision
 //
 #define CreateNtObjectFromWin32ApiPrologue                                      \
@@ -100,7 +100,7 @@
     POBJECT_ATTRIBUTES ObjectAttributes = &LocalAttributes;
 #define CreateNtObjectFromWin32ApiBody(ntobj, sec, name, access, ...)           \
     if (name) RtlInitUnicodeString(&ObjectName, name);                          \
-    ObjectAttributes = BasepConvertObjectAttributes(&LocalAttributes,           \
+    ObjectAttributes = BaseFormatObjectAttributes(&LocalAttributes,           \
                                                     sec,                        \
                                                     name ? &ObjectName : NULL); \
     Status = NtCreate##ntobj(&Handle, access, ObjectAttributes, ##__VA_ARGS__);

reactos/dll/win32/kernel32/include/kernel32.h

@@ -167,7 +167,7 @@ BaseFormatTimeOut(OUT PLARGE_INTEGER Timeout,
 
 POBJECT_ATTRIBUTES
 WINAPI
-BasepConvertObjectAttributes(OUT POBJECT_ATTRIBUTES ObjectAttributes,
+BaseFormatObjectAttributes(OUT POBJECT_ATTRIBUTES ObjectAttributes,
                              IN PSECURITY_ATTRIBUTES SecurityAttributes OPTIONAL,
                              IN PUNICODE_STRING ObjectName);
                              
@@ -180,7 +180,7 @@ BasepCreateStack(HANDLE hProcess,
                  
 VOID
 WINAPI
-BasepInitializeContext(IN PCONTEXT Context,
+BaseInitializeContext(IN PCONTEXT Context,
                        IN PVOID Parameter,
                        IN PVOID StartAddress,
                        IN PVOID StackAddress,
@@ -202,8 +202,8 @@ BaseThreadStartup(LPTHREAD_START_ROUTINE lpStartAddress,
                   
 VOID
 WINAPI
-BasepFreeStack(HANDLE hProcess,
+BaseFreeThreadStack(IN HANDLE hProcess,
-               PINITIAL_TEB InitialTeb);
+                    IN PINITIAL_TEB InitialTeb);
 
 __declspec(noreturn)
 VOID
@@ -216,9 +216,9 @@ VOID
 WINAPI
 BaseProcessStartup(PPROCESS_START_ROUTINE lpStartAddress);
                   
-BOOLEAN
+PVOID
 WINAPI
-BasepCheckRealTimePrivilege(VOID);
+BasepIsRealtimeAllowed(IN BOOLEAN Keep);
 
 VOID
 WINAPI
@@ -241,6 +241,11 @@ typedef NTSTATUS (NTAPI *PRTL_CONVERT_STRING)(IN PUNICODE_STRING UnicodeString,
                                               IN BOOLEAN AllocateMemory);
                                                 
 extern PRTL_CONVERT_STRING Basep8BitStringToUnicodeString;
+extern HANDLE BaseNamedObjectDirectory;
+
+NTSTATUS
+WINAPI
+BaseGetNamedObjectDirectory(VOID);
 
 NTSTATUS
 WINAPI