ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

secur32: Slightly simplify the GetUserNameExW implementation.

This commit is contained in:
Dmitry Timoshkov 2014-01-13 19:07:31 +09:00 committed by Alexandre Julliard
parent 55ad9da91f
commit bc59d7e830
1 changed files with 14 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
dlls/secur32/secur32.c
View File

@ -1096,16 +1096,16 @@ BOOLEAN WINAPI GetUserNameExA(
BOOLEAN WINAPI GetUserNameExW(
EXTENDED_NAME_FORMAT NameFormat, LPWSTR lpNameBuffer, PULONG nSize)
{
BOOLEAN status;
WCHAR samname[UNLEN + 1 + MAX_COMPUTERNAME_LENGTH + 1];
LPWSTR out;
DWORD len;
TRACE("(%d %p %p)\n", NameFormat, lpNameBuffer, nSize);
switch (NameFormat)
{
case NameSamCompatible:
{
WCHAR samname[UNLEN + 1 + MAX_COMPUTERNAME_LENGTH + 1];
LPWSTR out;
DWORD len;
/* This assumes the current user is always a local account */
len = MAX_COMPUTERNAME_LENGTH + 1;
if (GetComputerNameW(samname, &len))
@ -1115,25 +1115,20 @@ BOOLEAN WINAPI GetUserNameExW(
len = UNLEN + 1;
if (GetUserNameW(out, &len))
{
status = (lstrlenW(samname) < *nSize);
if (status)
if (lstrlenW(samname) < *nSize)
{
lstrcpyW(lpNameBuffer, samname);
*nSize = lstrlenW(samname);
return TRUE;
}
else
{
SetLastError(ERROR_MORE_DATA);
*nSize = lstrlenW(samname) + 1;
}
}
else
status = FALSE;
return FALSE;
}
else
status = FALSE;
}
break;
case NameUnknown:
case NameFullyQualifiedDN:
case NameDisplay:
@ -1144,14 +1139,12 @@ BOOLEAN WINAPI GetUserNameExW(
case NameServicePrincipal:
case NameDnsDomain:
SetLastError(ERROR_NONE_MAPPED);
status = FALSE;
break;
return FALSE;
default:
SetLastError(ERROR_INVALID_PARAMETER);
status = FALSE;
return FALSE;
}
return status;
}
BOOLEAN WINAPI TranslateNameA(