From: Brodie Thiesfield <brofield2@jellycan.com>
Date: Thu, 4 Feb 2010 04:27:40 +0000 (-0500)
Subject: Make Libevent 1.4.12 build on win32 with Unicode enabled.
X-Git-Tag: release-2.0.4-alpha~40
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=000a33ec83daec1c37c84a4370f509b97585dc37;p=libevent

Make Libevent 1.4.12 build on win32 with Unicode enabled.

This patch fixes calls to the win32 api to explicitly call the char* versions
of the functions. This fixes build failures when libevent is built with the
UNICODE define.
---

diff --git a/evdns.c b/evdns.c
index 3611bc63..2ef955ed 100644
--- a/evdns.c
+++ b/evdns.c
@@ -3530,7 +3530,7 @@ load_nameservers_with_getnetworkparams(struct evdns_base *base)
 	GetNetworkParams_fn_t fn;
 
 	ASSERT_LOCKED(base);
-	if (!(handle = LoadLibrary("iphlpapi.dll"))) {
+	if (!(handle = LoadLibraryA("iphlpapi.dll"))) {
 		log(EVDNS_LOG_WARN, "Could not open iphlpapi.dll");
 		status = -1;
 		goto done;
@@ -3603,13 +3603,13 @@ config_nameserver_from_reg_key(struct evdns_base *base, HKEY key, const char *su
 	int status = 0;
 
 	ASSERT_LOCKED(base);
-	if (RegQueryValueEx(key, subkey, 0, &type, NULL, &bufsz)
+	if (RegQueryValueExA(key, subkey, 0, &type, NULL, &bufsz)
 	    != ERROR_MORE_DATA)
 		return -1;
 	if (!(buf = mm_malloc(bufsz)))
 		return -1;
 
-	if (RegQueryValueEx(key, subkey, 0, &type, (LPBYTE)buf, &bufsz)
+	if (RegQueryValueExA(key, subkey, 0, &type, (LPBYTE)buf, &bufsz)
 	    == ERROR_SUCCESS && bufsz > 1) {
 		status = evdns_nameserver_ip_add_line(base,buf);
 	}
@@ -3641,12 +3641,12 @@ load_nameservers_from_registry(struct evdns_base *base)
 	if (((int)GetVersion()) > 0) { /* NT */
 		HKEY nt_key = 0, interfaces_key = 0;
 
-		if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, WIN_NS_NT_KEY, 0,
+		if (RegOpenKeyExA(HKEY_LOCAL_MACHINE, WIN_NS_NT_KEY, 0,
 				 KEY_READ, &nt_key) != ERROR_SUCCESS) {
 			log(EVDNS_LOG_DEBUG,"Couldn't open nt key, %d",(int)GetLastError());
 			return -1;
 		}
-		r = RegOpenKeyEx(nt_key, "Interfaces", 0,
+		r = RegOpenKeyExA(nt_key, "Interfaces", 0,
 			     KEY_QUERY_VALUE|KEY_ENUMERATE_SUB_KEYS,
 			     &interfaces_key);
 		if (r != ERROR_SUCCESS) {
@@ -3661,7 +3661,7 @@ load_nameservers_from_registry(struct evdns_base *base)
 		RegCloseKey(nt_key);
 	} else {
 		HKEY win_key = 0;
-		if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, WIN_NS_9X_KEY, 0,
+		if (RegOpenKeyExA(HKEY_LOCAL_MACHINE, WIN_NS_9X_KEY, 0,
 				 KEY_READ, &win_key) != ERROR_SUCCESS) {
 			log(EVDNS_LOG_DEBUG, "Couldn't open registry key, %d", (int)GetLastError());
 			return -1;
diff --git a/sample/event-test.c b/sample/event-test.c
index 5b4b14c4..ddb6c60e 100644
--- a/sample/event-test.c
+++ b/sample/event-test.c
@@ -77,7 +77,7 @@ main (int argc, char **argv)
 #ifdef WIN32
 	HANDLE socket;
 	/* Open a file. */
-	socket = CreateFile("test.txt",               /* open File */
+	socket = CreateFileA("test.txt",               /* open File */
 			GENERIC_READ,                 /* open for reading */
 			0,                            /* do not share */
 			NULL,                         /* no security */