Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-25 05:38:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

[KERNEL32]

Browse source 
- 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
This commit is contained in:
Pierre Schweitzer 2011-02-20 19:40:15 +00:00
parent cbfa1e3dbb
commit 6b74e9a992
4 changed files with 32 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

13
reactos/dll/win32/kernel32/include/kernel32.h
View file

@ -192,15 +192,12 @@ PUNICODE_STRING
WINAPI WINAPI
Basep8BitStringToStaticUnicodeString(IN LPCSTR AnsiString); Basep8BitStringToStaticUnicodeString(IN LPCSTR AnsiString);
NTSTATUS BOOLEAN
WINAPI WINAPI
Basep8BitStringToLiveUnicodeString(OUT PUNICODE_STRING UnicodeString, Basep8BitStringToDynamicUnicodeString(OUT PUNICODE_STRING UnicodeString,
IN LPCSTR String); 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, typedef NTSTATUS (NTAPI *PRTL_CONVERT_STRING)(IN PUNICODE_STRING UnicodeString,
IN PANSI_STRING AnsiString, IN PANSI_STRING AnsiString,

57
reactos/dll/win32/kernel32/misc/utils.c
View file

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

12
reactos/dll/win32/kernel32/process/procsup.c
View file

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