-#if defined(__WIN32__) && !defined(__win32s__) && 0
- // Gets the current user's full name according to the MS article PSS ID
- // Number: Q119670
- // Seems to be the same as the login name for me?
- char *UserName = new char[256];
- char *Domain = new char[256];
- DWORD maxCharacters = 255;
- GetUserName( UserName, &maxCharacters );
- GetComputerName( Domain, &maxCharacters );
-
- WCHAR wszUserName[256]; // Unicode user name
- WCHAR wszDomain[256];
- LPBYTE ComputerName;
-
- struct _SERVER_INFO_100 *si100; // Server structure
- struct _USER_INFO_2 *ui; // User structure
-
- // Convert ASCII user name and domain to Unicode.
-
- MultiByteToWideChar( CP_ACP, 0, UserName,
- strlen(UserName)+1, wszUserName, sizeof(wszUserName) );
- MultiByteToWideChar( CP_ACP, 0, Domain,
- strlen(Domain)+1, wszDomain, sizeof(wszDomain) );
-
- // Get the computer name of a DC for the specified domain.
- // >If you get a link error on this, include netapi32.lib<
-
- NetGetDCName( NULL, wszDomain, &ComputerName );
-
- // Look up the user on the DC.
-
- if(NetUserGetInfo( (LPWSTR) ComputerName,
- (LPWSTR) &wszUserName, 2, (LPBYTE *) &ui))
- {
- printf( "Error getting user information.\n" );
- return( FALSE );
- }
-
- // Convert the Unicode full name to ASCII.
-
- WideCharToMultiByte( CP_ACP, 0, ui->usri2_full_name,
- -1, buf, 256, NULL, NULL );
- }
- return( TRUE );
-/*
- DWORD nSize = maxSize;
- return ::GetUserName(buf, &nSize);
-*/
-#else
- char *user;
- const char *default_id = "anonymous";
-
- // Can't assume we have NIS (PC-NFS) or some other ID daemon
- // So we ...
- if ( (user = getenv("USER")) == NULL &&
- (user = getenv("LOGNAME")) == NULL ) {
- // Use wxWindows configuration data (comming soon)
- GetProfileString(WX_SECTION, eUSERID, default_id, buf, maxSize - 1);
- } else
- strncpy(buf, user, maxSize - 1);
- return *buf ? TRUE : FALSE;
-#endif
+#if !defined( __WXMICROWIN__) && wxUSE_DYNAMIC_LOADER
+ // TODO should use GetComputerNameEx() when available
+
+ // we don't want to always link with Winsock DLL as we might not use it at
+ // all, so load it dynamically here if needed (and don't complain if it is
+ // missing, we handle this)
+ wxLogNull noLog;
+
+ wxDynamicLibrary dllWinsock(_T("ws2_32.dll"), wxDL_VERBATIM);
+ if ( dllWinsock.IsLoaded() )
+ {
+ typedef int (PASCAL *WSAStartup_t)(WORD, WSADATA *);
+ typedef int (PASCAL *gethostname_t)(char *, int);
+ typedef hostent* (PASCAL *gethostbyname_t)(const char *);
+ typedef hostent* (PASCAL *gethostbyaddr_t)(const char *, int , int);
+ typedef int (PASCAL *WSACleanup_t)(void);
+
+ #define LOAD_WINSOCK_FUNC(func) \
+ func ## _t \
+ pfn ## func = (func ## _t)dllWinsock.GetSymbol(_T(#func))
+
+ LOAD_WINSOCK_FUNC(WSAStartup);
+
+ WSADATA wsa;
+ if ( pfnWSAStartup && pfnWSAStartup(MAKEWORD(1, 1), &wsa) == 0 )
+ {
+ LOAD_WINSOCK_FUNC(gethostname);
+
+ wxString host;
+ if ( pfngethostname )
+ {
+ char bufA[256];
+ if ( pfngethostname(bufA, WXSIZEOF(bufA)) == 0 )
+ {
+ // gethostname() won't usually include the DNS domain name,
+ // for this we need to work a bit more
+ if ( !strchr(bufA, '.') )
+ {
+ LOAD_WINSOCK_FUNC(gethostbyname);
+
+ struct hostent *pHostEnt = pfngethostbyname
+ ? pfngethostbyname(bufA)
+ : NULL;
+
+ if ( pHostEnt )
+ {
+ // Windows will use DNS internally now
+ LOAD_WINSOCK_FUNC(gethostbyaddr);
+
+ pHostEnt = pfngethostbyaddr
+ ? pfngethostbyaddr(pHostEnt->h_addr,
+ 4, AF_INET)
+ : NULL;
+ }
+
+ if ( pHostEnt )
+ {
+ host = wxString::FromAscii(pHostEnt->h_name);
+ }
+ }
+ }
+ }
+
+ LOAD_WINSOCK_FUNC(WSACleanup);
+ if ( pfnWSACleanup )
+ pfnWSACleanup();
+
+
+ if ( !host.empty() )
+ {
+ wxStrncpy(buf, host, maxSize);
+
+ return TRUE;
+ }
+ }
+ }
+#endif // !__WXMICROWIN__
+
+ return wxGetHostName(buf, maxSize);