Chiebot-Mirror
/
c-ares
mirror of https://github.com/c-ares/c-ares.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Force using the ANSI versions of WinAPI functions (#142)

Browse Source 
When compiling c-ares with a build system that defines UNICODE,
bad versions of WinAPI functions are used causing failures or even
crashes. When windows.h is included in MBCS mode (like in the default
build system), the ..A versions are the same as using the one without
any suffix.
pull/151/head
Gergely Nagy 8 years ago committed by Brad House
parent 5ecc4c34be
commit 2a9e231396
3 changed files with 22 additions and 22 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      ares_gethostbyaddr.c
  2. 8
      ares_gethostbyname.c
  3. 28
      ares_init.c

8
ares_gethostbyaddr.c
Unescape View File

@ -190,18 +190,18 @@ static int file_lookup(struct ares_addr *addr, struct hostent **host)
char tmp[MAX_PATH]; char tmp[MAX_PATH];
HKEY hkeyHosts; HKEY hkeyHosts;
if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, WIN_NS_NT_KEY, 0, KEY_READ, if (RegOpenKeyExA(HKEY_LOCAL_MACHINE, WIN_NS_NT_KEY, 0, KEY_READ,
&hkeyHosts) == ERROR_SUCCESS) &hkeyHosts) == ERROR_SUCCESS)
{ {
DWORD dwLength = MAX_PATH; DWORD dwLength = MAX_PATH;
RegQueryValueEx(hkeyHosts, DATABASEPATH, NULL, NULL, (LPBYTE)tmp, RegQueryValueExA(hkeyHosts, DATABASEPATH, NULL, NULL, (LPBYTE)tmp,
&dwLength); &dwLength);
ExpandEnvironmentStrings(tmp, PATH_HOSTS, MAX_PATH); ExpandEnvironmentStringsA(tmp, PATH_HOSTS, MAX_PATH);
RegCloseKey(hkeyHosts); RegCloseKey(hkeyHosts);
} }
} }
else if (platform == WIN_9X) else if (platform == WIN_9X)
GetWindowsDirectory(PATH_HOSTS, MAX_PATH); GetWindowsDirectoryA(PATH_HOSTS, MAX_PATH);
else else
return ARES_ENOTFOUND; return ARES_ENOTFOUND;

8
ares_gethostbyname.c
Unescape View File

@ -351,18 +351,18 @@ static int file_lookup(const char *name, int family, struct hostent **host)
char tmp[MAX_PATH]; char tmp[MAX_PATH];
HKEY hkeyHosts; HKEY hkeyHosts;
if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, WIN_NS_NT_KEY, 0, KEY_READ, if (RegOpenKeyExA(HKEY_LOCAL_MACHINE, WIN_NS_NT_KEY, 0, KEY_READ,
&hkeyHosts) == ERROR_SUCCESS) &hkeyHosts) == ERROR_SUCCESS)
{ {
DWORD dwLength = MAX_PATH; DWORD dwLength = MAX_PATH;
RegQueryValueEx(hkeyHosts, DATABASEPATH, NULL, NULL, (LPBYTE)tmp, RegQueryValueExA(hkeyHosts, DATABASEPATH, NULL, NULL, (LPBYTE)tmp,
&dwLength); &dwLength);
ExpandEnvironmentStrings(tmp, PATH_HOSTS, MAX_PATH); ExpandEnvironmentStringsA(tmp, PATH_HOSTS, MAX_PATH);
RegCloseKey(hkeyHosts); RegCloseKey(hkeyHosts);
} }
} }
else if (platform == WIN_9X) else if (platform == WIN_9X)
GetWindowsDirectory(PATH_HOSTS, MAX_PATH); GetWindowsDirectoryA(PATH_HOSTS, MAX_PATH);
else else
return ARES_ENOTFOUND; return ARES_ENOTFOUND;

28
ares_init.c
Unescape View File

@ -585,7 +585,7 @@ static int get_REG_SZ(HKEY hKey, const char *leafKeyName, char **outptr)
*outptr = NULL; *outptr = NULL;
/* Find out size of string stored in registry */ /* Find out size of string stored in registry */
res = RegQueryValueEx(hKey, leafKeyName, 0, NULL, NULL, &size); res = RegQueryValueExA(hKey, leafKeyName, 0, NULL, NULL, &size);
if ((res != ERROR_SUCCESS && res != ERROR_MORE_DATA) || !size) if ((res != ERROR_SUCCESS && res != ERROR_MORE_DATA) || !size)
return 0; return 0;
@ -596,7 +596,7 @@ static int get_REG_SZ(HKEY hKey, const char *leafKeyName, char **outptr)
return 0; return 0;
/* Get the value for real */ /* Get the value for real */
res = RegQueryValueEx(hKey, leafKeyName, 0, NULL, res = RegQueryValueExA(hKey, leafKeyName, 0, NULL,
(unsigned char *)*outptr, &size); (unsigned char *)*outptr, &size);
if ((res != ERROR_SUCCESS) || (size == 1)) if ((res != ERROR_SUCCESS) || (size == 1))
{ {
@ -627,7 +627,7 @@ static int get_REG_SZ_9X(HKEY hKey, const char *leafKeyName, char **outptr)
*outptr = NULL; *outptr = NULL;
/* Find out size of string stored in registry */ /* Find out size of string stored in registry */
res = RegQueryValueEx(hKey, leafKeyName, 0, &dataType, NULL, &size); res = RegQueryValueExA(hKey, leafKeyName, 0, &dataType, NULL, &size);
if ((res != ERROR_SUCCESS && res != ERROR_MORE_DATA) || !size) if ((res != ERROR_SUCCESS && res != ERROR_MORE_DATA) || !size)
return 0; return 0;
@ -638,7 +638,7 @@ static int get_REG_SZ_9X(HKEY hKey, const char *leafKeyName, char **outptr)
return 0; return 0;
/* Get the value for real */ /* Get the value for real */
res = RegQueryValueEx(hKey, leafKeyName, 0, &dataType, res = RegQueryValueExA(hKey, leafKeyName, 0, &dataType,
(unsigned char *)*outptr, &size); (unsigned char *)*outptr, &size);
if ((res != ERROR_SUCCESS) || (size == 1)) if ((res != ERROR_SUCCESS) || (size == 1))
{ {
@ -683,11 +683,11 @@ static int get_enum_REG_SZ(HKEY hKeyParent, const char *leafKeyName,
for(;;) for(;;)
{ {
enumKeyNameBuffSize = sizeof(enumKeyName); enumKeyNameBuffSize = sizeof(enumKeyName);
res = RegEnumKeyEx(hKeyParent, enumKeyIdx++, enumKeyName, res = RegEnumKeyExA(hKeyParent, enumKeyIdx++, enumKeyName,
&enumKeyNameBuffSize, 0, NULL, NULL, NULL); &enumKeyNameBuffSize, 0, NULL, NULL, NULL);
if (res != ERROR_SUCCESS) if (res != ERROR_SUCCESS)
break; break;
res = RegOpenKeyEx(hKeyParent, enumKeyName, 0, KEY_QUERY_VALUE, res = RegOpenKeyExA(hKeyParent, enumKeyName, 0, KEY_QUERY_VALUE,
&hKeyEnum); &hKeyEnum);
if (res != ERROR_SUCCESS) if (res != ERROR_SUCCESS)
continue; continue;
@ -718,7 +718,7 @@ static int get_DNS_Registry_9X(char **outptr)
*outptr = NULL; *outptr = NULL;
res = RegOpenKeyEx(HKEY_LOCAL_MACHINE, WIN_NS_9X, 0, KEY_READ, res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, WIN_NS_9X, 0, KEY_READ,
&hKey_VxD_MStcp); &hKey_VxD_MStcp);
if (res != ERROR_SUCCESS) if (res != ERROR_SUCCESS)
return 0; return 0;
@ -750,7 +750,7 @@ static int get_DNS_Registry_NT(char **outptr)
*outptr = NULL; *outptr = NULL;
res = RegOpenKeyEx(HKEY_LOCAL_MACHINE, WIN_NS_NT_KEY, 0, KEY_READ, res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, WIN_NS_NT_KEY, 0, KEY_READ,
&hKey_Tcpip_Parameters); &hKey_Tcpip_Parameters);
if (res != ERROR_SUCCESS) if (res != ERROR_SUCCESS)
return 0; return 0;
@ -772,7 +772,7 @@ static int get_DNS_Registry_NT(char **outptr)
goto done; goto done;
/* Try adapter specific parameters */ /* Try adapter specific parameters */
res = RegOpenKeyEx(hKey_Tcpip_Parameters, "Interfaces", 0, res = RegOpenKeyExA(hKey_Tcpip_Parameters, "Interfaces", 0,
KEY_QUERY_VALUE | KEY_ENUMERATE_SUB_KEYS, KEY_QUERY_VALUE | KEY_ENUMERATE_SUB_KEYS,
&hKey_Interfaces); &hKey_Interfaces);
if (res != ERROR_SUCCESS) if (res != ERROR_SUCCESS)
@ -1463,7 +1463,7 @@ static int get_SuffixList_Windows(char **outptr)
return 0; return 0;
/* 1. Global DNS Suffix Search List */ /* 1. Global DNS Suffix Search List */
if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, WIN_NS_NT_KEY, 0, if (RegOpenKeyExA(HKEY_LOCAL_MACHINE, WIN_NS_NT_KEY, 0,
KEY_READ, &hKey) == ERROR_SUCCESS) KEY_READ, &hKey) == ERROR_SUCCESS)
{ {
if (get_REG_SZ(hKey, SEARCHLIST_KEY, outptr)) if (get_REG_SZ(hKey, SEARCHLIST_KEY, outptr))
@ -1475,7 +1475,7 @@ static int get_SuffixList_Windows(char **outptr)
/* 2. Connection Specific Search List composed of: /* 2. Connection Specific Search List composed of:
* a. Primary DNS Suffix */ * a. Primary DNS Suffix */
if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, WIN_DNSCLIENT, 0, if (RegOpenKeyExA(HKEY_LOCAL_MACHINE, WIN_DNSCLIENT, 0,
KEY_READ, &hKey) == ERROR_SUCCESS) KEY_READ, &hKey) == ERROR_SUCCESS)
{ {
get_REG_SZ(hKey, PRIMARYDNSSUFFIX_KEY, outptr); get_REG_SZ(hKey, PRIMARYDNSSUFFIX_KEY, outptr);
@ -1485,17 +1485,17 @@ static int get_SuffixList_Windows(char **outptr)
return 0; return 0;
/* b. Interface SearchList, Domain, DhcpDomain */ /* b. Interface SearchList, Domain, DhcpDomain */
if (!RegOpenKeyEx(HKEY_LOCAL_MACHINE, WIN_NS_NT_KEY "\\" INTERFACES_KEY, 0, if (!RegOpenKeyExA(HKEY_LOCAL_MACHINE, WIN_NS_NT_KEY "\\" INTERFACES_KEY, 0,
KEY_READ, &hKey) == ERROR_SUCCESS) KEY_READ, &hKey) == ERROR_SUCCESS)
return 0; return 0;
for(;;) for(;;)
{ {
keyNameBuffSize = sizeof(keyName); keyNameBuffSize = sizeof(keyName);
if (RegEnumKeyEx(hKey, keyIdx++, keyName, &keyNameBuffSize, if (RegEnumKeyExA(hKey, keyIdx++, keyName, &keyNameBuffSize,
0, NULL, NULL, NULL) 0, NULL, NULL, NULL)
!= ERROR_SUCCESS) != ERROR_SUCCESS)
break; break;
if (RegOpenKeyEx(hKey, keyName, 0, KEY_QUERY_VALUE, &hKeyEnum) if (RegOpenKeyExA(hKey, keyName, 0, KEY_QUERY_VALUE, &hKeyEnum)
!= ERROR_SUCCESS) != ERROR_SUCCESS)
continue; continue;
if (get_REG_SZ(hKeyEnum, SEARCHLIST_KEY, &p) || if (get_REG_SZ(hKeyEnum, SEARCHLIST_KEY, &p) ||

Write Preview
Loading…
Cancel
Save