Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 16:45:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Properly convert between ascii and unicode in SearchPathA

Browse source 
svn path=/trunk/; revision=7298
This commit is contained in:
Gé van Geldorp 2003-12-28 21:25:48 +00:00
parent 755d9f5216
commit 3b85b43844
1 changed files with 19 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

32
reactos/lib/kernel32/file/dir.c
View file

@ -1,4 +1,4 @@
/* $Id: dir.c,v 1.40 2003/12/09 10:38:05 gvg Exp $
/* $Id: dir.c,v 1.41 2003/12/28 21:25:48 gvg Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS system libraries
@ -541,9 +541,9 @@ SearchPathA (
Buffer.MaximumLength = nBufferLength;
Buffer.Buffer = lpBuffer;
RetValue = SearchPathW (PathU.Buffer,
FileNameU.Buffer,
ExtensionU.Buffer,
RetValue = SearchPathW (NULL == lpPath ? NULL : PathU.Buffer,
NULL == lpFileName ? NULL : FileNameU.Buffer,
NULL == lpExtension ? NULL : ExtensionU.Buffer,
nBufferLength,
BufferU.Buffer,
&FilePartW);
@ -558,15 +558,21 @@ SearchPathA (
0,
ExtensionU.Buffer);
/* convert ansi (or oem) string to unicode */
if (bIsFileApiAnsi)
RtlUnicodeStringToAnsiString (&Buffer,
&BufferU,
FALSE);
else
RtlUnicodeStringToOemString (&Buffer,
&BufferU,
FALSE);
if (0 != RetValue)
{
BufferU.Length = wcslen(BufferU.Buffer) * sizeof(WCHAR);
/* convert ansi (or oem) string to unicode */
if (bIsFileApiAnsi)
RtlUnicodeStringToAnsiString (&Buffer,
&BufferU,
FALSE);
else
RtlUnicodeStringToOemString (&Buffer,
&BufferU,
FALSE);
/* nul-terminate ascii string */
Buffer.Buffer[BufferU.Length / sizeof(WCHAR)] = '\0';
}
RtlFreeHeap (RtlGetProcessHeap (),
0,