Jim Park's Unicode NSIS merging - Step 2 : merge TCHARs changes into trunk

Compiler output is identical before & after this step

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6037 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
wizou 2010-03-26 17:18:17 +00:00
commit cdf7735a77
206 changed files with 8437 additions and 6403 deletions

View file

@ -4,8 +4,12 @@
** Author: Justin Frankel
** File: asyncdns.cpp - JNL portable asynchronous DNS implementation
** License: see License.txt
**
** Unicode support by Jim Park -- 08/24/2007
*/
// Jim Park: For Unicode Support, all string functions must explicitly use
// ANSI versions if UNICODE is defined.
#include "netinc.h"
#include "util.h"
@ -47,7 +51,7 @@ int JNL_AsyncDNS::resolve(char *hostname, unsigned long *addr)
return 0;
}
if (lstrcmpi(m_hostname,hostname)) m_addr=0;
if (lstrcmpiA(m_hostname,hostname)) m_addr=0;
else if (m_addr == INADDR_NONE)
{
wait_for_thread_death();
@ -59,7 +63,7 @@ int JNL_AsyncDNS::resolve(char *hostname, unsigned long *addr)
wait_for_thread_death();
return 0;
}
lstrcpy(m_hostname,hostname);
lstrcpyA(m_hostname,hostname);
if (!m_thread)
{