[KERNEL32]

- Get rid of old function Basep8BitStringToLiveUnicodeString() that doesn't exist under Windows, and that was even unused
- Rename Basep8BitStringToHeapUnicodeString() to Basep8BitStringToDynamicUnicodeString() and fix its implementation (and all the calls)
- Define BasepUnicodeStringTo8BitString()

svn path=/trunk/; revision=50838

reactos/dll/win32/kernel32/file/npipe.c

@@ -251,7 +251,7 @@ WaitNamedPipeA(LPCSTR lpNamedPipeName,
     UNICODE_STRING NameU;
 
     /* Convert the name to Unicode */
-    Basep8BitStringToHeapUnicodeString(&NameU, lpNamedPipeName);
+    Basep8BitStringToDynamicUnicodeString(&NameU, lpNamedPipeName);
 
     /* Call the Unicode API */
     r = WaitNamedPipeW(NameU.Buffer, nTimeOut);

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

@@ -192,15 +192,12 @@ PUNICODE_STRING
 WINAPI
 Basep8BitStringToStaticUnicodeString(IN LPCSTR AnsiString);
 
-NTSTATUS
+BOOLEAN
 WINAPI
-Basep8BitStringToLiveUnicodeString(OUT PUNICODE_STRING UnicodeString,
+Basep8BitStringToDynamicUnicodeString(OUT PUNICODE_STRING UnicodeString,
                                       IN LPCSTR String);
  
-NTSTATUS
+#define BasepUnicodeStringTo8BitString RtlUnicodeStringToAnsiString
-WINAPI
-Basep8BitStringToHeapUnicodeString(OUT PUNICODE_STRING UnicodeString,
-                                   IN LPCSTR String);
 
 typedef NTSTATUS (NTAPI *PRTL_CONVERT_STRING)(IN PUNICODE_STRING UnicodeString,
                                               IN PANSI_STRING AnsiString,

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

@@ -4,6 +4,7 @@
  * FILE:            lib/kernel32/misc/utils.c
  * PURPOSE:         Utility and Support Functions
  * PROGRAMMER:      Alex Ionescu (alex@relsoft.net)
+ *                  Pierre Schweitzer (pierre.schweitzer@reactos.org)
  */
 
 /* INCLUDES ****************************************************************/
@@ -24,33 +25,6 @@ PRTL_CONVERT_STRING Basep8BitStringToUnicodeString;
 
 /* FUNCTIONS ****************************************************************/
 
-/*
- * Converts an ANSI or OEM String to the specified Unicode String
- */
-NTSTATUS
-WINAPI
-Basep8BitStringToLiveUnicodeString(OUT PUNICODE_STRING UnicodeString,
-                                   IN LPCSTR String)
-{
-    ANSI_STRING AnsiString;
-    NTSTATUS Status;
-    
-    DPRINT("Basep8BitStringToLiveUnicodeString\n");
-    
-    /* Create the ANSI String */
-    RtlInitAnsiString(&AnsiString, String);
-    
-    /* Convert from OEM or ANSI */
-    Status = Basep8BitStringToUnicodeString(UnicodeString, &AnsiString, FALSE);
-    
-    /* Return Status */
-    if (!NT_SUCCESS(Status))
-    {
-        SetLastErrorByStatus(Status);
-    }
-    return Status;
-}
-
 
 /*
  * Converts an ANSI or OEM String to the TEB StaticUnicodeString
@@ -81,18 +55,25 @@ Basep8BitStringToStaticUnicodeString(IN LPCSTR String)
     return StaticString;
 }
 
-NTSTATUS
+/*
+ * Allocates space from the Heap and converts an Unicode String into it
+ */
+BOOLEAN
 WINAPI
-Basep8BitStringToHeapUnicodeString(OUT PUNICODE_STRING UnicodeString,
+Basep8BitStringToDynamicUnicodeString(OUT PUNICODE_STRING UnicodeString,
                                       IN LPCSTR String)
 {
     ANSI_STRING AnsiString;
     NTSTATUS Status;
     
-    DPRINT("Basep8BitStringToCachedUnicodeString\n");
+    DPRINT("Basep8BitStringToDynamicUnicodeString\n");
 
     /* Initialize an ANSI String */
-    RtlInitAnsiString(&AnsiString, String);
+    if (!NT_SUCCESS(RtlInitAnsiStringEx(&AnsiString, String)))
+    {
+        SetLastError(ERROR_BUFFER_OVERFLOW);
+        return FALSE;
+    }
      
     /* Convert it */
     Status = Basep8BitStringToUnicodeString(UnicodeString, &AnsiString, TRUE);    
@@ -101,9 +82,11 @@ Basep8BitStringToHeapUnicodeString(OUT PUNICODE_STRING UnicodeString,
     if (!NT_SUCCESS(Status))
     {
         SetLastErrorByStatus(Status);
+        return FALSE;
     }
+
     /* Return Status */
-    return Status;
+    return TRUE;
 }
 
 /*

reactos/dll/win32/kernel32/process/procsup.c

@@ -1563,7 +1563,7 @@ CreateProcessInternalA(HANDLE hToken,
         else
         {
             /* Use a dynamic version */
-            Basep8BitStringToHeapUnicodeString(&LiveCommandLine,
+            Basep8BitStringToDynamicUnicodeString(&LiveCommandLine,
                                                   lpCommandLine);
         }
     }
@@ -1576,12 +1576,12 @@ CreateProcessInternalA(HANDLE hToken,
     /* Convert the Name and Directory */
     if (lpApplicationName)
     {
-        Basep8BitStringToHeapUnicodeString(&ApplicationName,
+        Basep8BitStringToDynamicUnicodeString(&ApplicationName,
                                               lpApplicationName);
     }
     if (lpCurrentDirectory)
     {
-        Basep8BitStringToHeapUnicodeString(&CurrentDirectory,
+        Basep8BitStringToDynamicUnicodeString(&CurrentDirectory,
                                               lpCurrentDirectory);
     }