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

advapi32: Fix output of GetUserNameW when joined to a domain. 

On a Windows box joined to a domain, GetUserName will not return the domain
part. On a Unix box joined to a domain via winbindd, wine_get_user_name will.
So we need to cut off the domain instead of just replacing the \ character.
This commit is contained in:
Kai Blin 2009-06-03 09:35:49 +02:00 committed by Alexandre Julliard
parent 25506ca64e
commit faf6f3f299
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dlls/advapi32/advapi.c
View File

@ -32,6 +32,7 @@
#include "wincred.h" #include "wincred.h"
#include "wine/library.h" #include "wine/library.h"
#include "wine/unicode.h"
#include "wine/debug.h" #include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(advapi); WINE_DEFAULT_DEBUG_CHANNEL(advapi);
@ -86,6 +87,7 @@ GetUserNameW( LPWSTR lpszName, LPDWORD lpSize )
{ {
const char *name = wine_get_user_name(); const char *name = wine_get_user_name();
DWORD i, len = MultiByteToWideChar( CP_UNIXCP, 0, name, -1, NULL, 0 ); DWORD i, len = MultiByteToWideChar( CP_UNIXCP, 0, name, -1, NULL, 0 );
LPWSTR backslash;
if (len > *lpSize) if (len > *lpSize)
{ {
@ -99,9 +101,22 @@ GetUserNameW( LPWSTR lpszName, LPDWORD lpSize )
/* Word uses the user name to create named mutexes and file mappings, /* Word uses the user name to create named mutexes and file mappings,
* and backslashes in the name cause the creation to fail. * and backslashes in the name cause the creation to fail.
* Also, Windows doesn't return the domain name in the user name even when
* joined to a domain. A Unix box joined to a domain using winbindd will
* contain the domain name in the username. So we need to cut this off.
* FIXME: Only replaces forward and backslashes for now, should get the
* winbind separator char from winbindd and replace that.
*/ */
for (i = 0; lpszName[i]; i++) for (i = 0; lpszName[i]; i++)
if (lpszName[i] == '\\' || lpszName[i] == '/') lpszName[i] = '_'; if (lpszName[i] == '/') lpszName[i] = '\\';
backslash = strrchrW(lpszName, '\\');
if (backslash == NULL)
return TRUE;
len = lstrlenW(backslash);
memmove(lpszName, backslash + 1, len * sizeof(WCHAR));
*lpSize = len;
return TRUE; return TRUE;
} }