AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wxGetUserName() returns the user name (wxGetUserId()) if all else fails

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1260 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 1998-12-24 23:26:41 +00:00
parent 793f619f7f
commit 0a1442719a
1 changed files with 30 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/msw/utils.cpp
View File

@ -151,7 +151,10 @@ bool wxGetHostName(char *buf, int maxSize)
// Get user ID e.g. jacs // Get user ID e.g. jacs
bool wxGetUserId(char *buf, int maxSize) bool wxGetUserId(char *buf, int maxSize)
{ {
#if defined(__WIN32__) && !defined(__win32s__) && 0 #if defined(__WIN32__) && !defined(__win32s__)
// VZ: why should it be so complicated??
#if 0
// Gets the current user's full name according to the MS article PSS ID // Gets the current user's full name according to the MS article PSS ID
// Number: Q119670 // Number: Q119670
// Seems to be the same as the login name for me? // Seems to be the same as the login name for me?
@ -195,11 +198,19 @@ bool wxGetUserId(char *buf, int maxSize)
-1, buf, 256, NULL, NULL ); -1, buf, 256, NULL, NULL );
} }
return( TRUE ); return( TRUE );
/* #else // 1
DWORD nSize = maxSize; DWORD nSize = maxSize;
return ::GetUserName(buf, &nSize); if ( ::GetUserName(buf, &nSize) == 0 )
*/ {
#else wxLogSysError("Can not get user name");
return FALSE;
}
return TRUE;
#endif // 0/1
#else // Win16 or Win32s
char *user; char *user;
const char *default_id = "anonymous"; const char *default_id = "anonymous";
@ -218,22 +229,7 @@ bool wxGetUserId(char *buf, int maxSize)
// Get user name e.g. Julian Smart // Get user name e.g. Julian Smart
bool wxGetUserName(char *buf, int maxSize) bool wxGetUserName(char *buf, int maxSize)
{ {
const char *default_name = "Unknown User"; #if wxUSE_PENWINDOWS && !defined(__WATCOMC__) && !defined(__GNUWIN32__)
#if defined(__WIN32__)
/*
DWORD nSize = maxSize;
In VC++ 4.0, results in unresolved symbol __imp__GetUserNameA
if (GetUserName(buf, &nSize))
return TRUE;
else
*/
// Could use NIS, MS-Mail or other site specific programs
// Use wxWindows configuration data
GetProfileString(WX_SECTION, eUSERNAME, default_name, buf, maxSize - 1);
return *buf ? TRUE : FALSE;
// }
#else
#if !defined(__WATCOMC__) && !defined(__GNUWIN32__) && wxUSE_PENWINDOWS
extern HANDLE g_hPenWin; // PenWindows Running? extern HANDLE g_hPenWin; // PenWindows Running?
if (g_hPenWin) if (g_hPenWin)
{ {
@ -247,10 +243,19 @@ bool wxGetUserName(char *buf, int maxSize)
{ {
// Could use NIS, MS-Mail or other site specific programs // Could use NIS, MS-Mail or other site specific programs
// Use wxWindows configuration data // Use wxWindows configuration data
GetProfileString(WX_SECTION, eUSERNAME, default_name, buf, maxSize - 1); bool ok = GetProfileString(WX_SECTION, eUSERNAME, "", buf, maxSize - 1) != 0;
if ( !ok )
{
ok = wxGetUserId(buf, maxSize);
}
if ( !ok )
{
strncpy(buf, "Unknown User", maxSize);
}
} }
return *buf ? TRUE : FALSE;
#endif return TRUE;
} }
int wxKill(long pid, int sig) int wxKill(long pid, int sig)