Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-24 17:34:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixed GetCurrentDirectoryA() to properly handle the case where the caller only queries the required buffer size.

Browse source 
svn path=/trunk/; revision=13104
This commit is contained in:
Thomas Bluemel 2005-01-17 22:05:00 +00:00
parent d259b9f2fc
commit 2215233073
1 changed files with 36 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
reactos/lib/kernel32/file/curdir.c
View file

@ -38,39 +38,51 @@ GetCurrentDirectoryA (
ANSI_STRING AnsiString; ANSI_STRING AnsiString;
UNICODE_STRING UnicodeString; UNICODE_STRING UnicodeString;
/* initialize ansi string */
AnsiString.Length = 0;
AnsiString.MaximumLength = nBufferLength;
AnsiString.Buffer = lpBuffer;
/* allocate buffer for unicode string */ /* allocate buffer for unicode string */
UnicodeString.Length = 0; UnicodeString.Length = 0;
UnicodeString.MaximumLength = nBufferLength * sizeof(WCHAR); UnicodeString.MaximumLength = nBufferLength * sizeof(WCHAR);
UnicodeString.Buffer = RtlAllocateHeap (RtlGetProcessHeap (), if (nBufferLength > 0)
0, {
UnicodeString.MaximumLength); UnicodeString.Buffer = RtlAllocateHeap (RtlGetProcessHeap (),
0,
UnicodeString.MaximumLength);
/* initialize ansi string */
AnsiString.Length = 0;
AnsiString.MaximumLength = nBufferLength;
AnsiString.Buffer = lpBuffer;
}
else
{
UnicodeString.Buffer = NULL;
}
/* get current directory */ /* get current directory */
UnicodeString.Length = RtlGetCurrentDirectory_U (UnicodeString.MaximumLength, UnicodeString.Length = RtlGetCurrentDirectory_U (UnicodeString.MaximumLength,
UnicodeString.Buffer); UnicodeString.Buffer);
DPRINT("UnicodeString.Buffer %S\n", UnicodeString.Buffer); if (nBufferLength > 0)
{
DPRINT("UnicodeString.Buffer %wZ\n", &UnicodeString);
/* convert unicode string to ansi (or oem) */ /* convert unicode string to ansi (or oem) */
if (bIsFileApiAnsi) if (bIsFileApiAnsi)
RtlUnicodeStringToAnsiString (&AnsiString, RtlUnicodeStringToAnsiString (&AnsiString,
&UnicodeString, &UnicodeString,
FALSE); FALSE);
else
RtlUnicodeStringToOemString (&AnsiString,
&UnicodeString,
FALSE);
DPRINT("AnsiString.Buffer %s\n", AnsiString.Buffer);
/* free unicode string */
RtlFreeHeap (RtlGetProcessHeap (),
0,
UnicodeString.Buffer);
}
else else
RtlUnicodeStringToOemString (&AnsiString, {
&UnicodeString, AnsiString.Length = UnicodeString.Length / sizeof(WCHAR);
FALSE); }
DPRINT("AnsiString.Buffer %s\n", AnsiString.Buffer);
/* free unicode string */
RtlFreeHeap (RtlGetProcessHeap (),
0,
UnicodeString.Buffer);
return AnsiString.Length; return AnsiString.Length;
} }