Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-22 16:36:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

[KERNEL32]

Browse source 
Don't make GetBinaryTypeA() rely on Wine's strings conversions functions

svn path=/trunk/; revision=50867
This commit is contained in:
Pierre Schweitzer 2011-02-22 18:43:38 +00:00
parent e9b58620aa
commit f617d8910c
1 changed files with 33 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
reactos/dll/win32/kernel32/file/bintype.c
View file

@ -301,23 +301,43 @@ GetBinaryTypeW (
*/
BOOL
WINAPI
GetBinaryTypeA (
LPCSTR lpApplicationName,
LPDWORD lpBinaryType
)
GetBinaryTypeA(IN LPCSTR lpApplicationName,
OUT LPDWORD lpBinaryType)
{
PWCHAR ApplicationNameW;
ANSI_STRING ApplicationNameString;
UNICODE_STRING ApplicationNameW;
BOOL StringAllocated = FALSE, Result;
NTSTATUS Status;
if(!lpApplicationName || !lpBinaryType)
{
SetLastError(ERROR_INVALID_PARAMETER);
return FALSE;
}
RtlInitAnsiString(&ApplicationNameString, lpApplicationName);
if (!(ApplicationNameW = FilenameA2W(lpApplicationName, FALSE)))
return FALSE;
if (ApplicationNameString.Length * sizeof(WCHAR) >= NtCurrentTeb()->StaticUnicodeString.MaximumLength)
{
StringAllocated = TRUE;
Status = RtlAnsiStringToUnicodeString(&ApplicationNameW, &ApplicationNameString, TRUE);
}
else
{
Status = RtlAnsiStringToUnicodeString(&(NtCurrentTeb()->StaticUnicodeString), &ApplicationNameString, FALSE);
}
return GetBinaryTypeW(ApplicationNameW, lpBinaryType);
if (!NT_SUCCESS(Status))
{
BaseSetLastNTError(Status);
return FALSE;
}
if (StringAllocated)
{
Result = GetBinaryTypeW(ApplicationNameW.Buffer, lpBinaryType);
RtlFreeUnicodeString(&ApplicationNameW);
}
else
{
Result = GetBinaryTypeW(NtCurrentTeb()->StaticUnicodeString.Buffer, lpBinaryType);
}
return Result;
}
/* EOF */