Index: apitests/CMakeLists.txt
===================================================================
--- apitests/CMakeLists.txt	(revision 71259)
+++ apitests/CMakeLists.txt	(working copy)
@@ -7,6 +7,7 @@
 add_subdirectory(com)
 add_subdirectory(crt)
 add_subdirectory(dciman32)
+add_subdirectory(dnsapi)
 add_subdirectory(gdi32)
 add_subdirectory(gditools)
 add_subdirectory(iphlpapi)
Index: apitests/dnsapi/CMakeLists.txt
===================================================================
--- apitests/dnsapi/CMakeLists.txt	(revision 0)
+++ apitests/dnsapi/CMakeLists.txt	(working copy)
@@ -0,0 +1,10 @@
+
+list(APPEND SOURCE
+    DnsQuery.c
+    testlist.c)
+
+add_executable(dnsapi_apitest ${SOURCE})
+target_link_libraries(dnsapi_apitest wine ${PSEH_LIB})
+set_module_type(dnsapi_apitest win32cui)
+add_importlibs(dnsapi_apitest ws2_32 dnsapi msvcrt kernel32 ntdll)
+add_cd_file(TARGET dnsapi_apitest DESTINATION reactos/bin FOR all)
Index: apitests/dnsapi/DnsQuery.c
===================================================================
--- apitests/dnsapi/DnsQuery.c	(revision 0)
+++ apitests/dnsapi/DnsQuery.c	(working copy)
@@ -0,0 +1,95 @@
+/*
+ * PROJECT:         ReactOS api tests
+ * LICENSE:         GPLv2+ - See COPYING in the top level directory
+ * PURPOSE:         Test for DnsQuery_A
+ * PROGRAMMER:      Victor Martinez Calvo <victor.martinez@reactos.org>
+ */
+
+
+
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#include <stdio.h>
+#include <WinDNS.h>
+#include <apitest.h>
+
+
+void TestHostName(void)
+{
+
+    DNS_STATUS dns_status = {0};
+    char host_name[255];
+    PDNS_RECORD dp = NULL;
+    WCHAR host_nameW[255];
+
+    gethostname(host_name, sizeof(host_name));
+    mbstowcs(host_nameW, host_name, 255);
+
+    //DnsQuery_A:
+    //Testing HostName 
+
+    dns_status = DnsQuery_A(host_name, DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0);
+    ok(dns_status == 0,"DnsQuery_A failed with error %d", dns_status);
+    DnsRecordListFree(dp, DnsFreeRecordList);
+    
+    //127.0.0.1
+    dns_status = DnsQuery_A("127.0.0.1", DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0);
+    ok(dns_status == 0,"DnsQuery_A failed with error %d", dns_status);
+    DnsRecordListFree(dp, DnsFreeRecordList);
+
+    //Localhost strings
+    dns_status = DnsQuery_A("LocalHost", DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0);
+    ok(dns_status == 0,"DnsQuery_A failed with error %d", dns_status);
+    DnsRecordListFree(dp, DnsFreeRecordList);
+
+    dns_status = DnsQuery_A("Localhost", DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0);
+    ok(dns_status == 0,"DnsQuery_A failed with error %d", dns_status);
+    DnsRecordListFree(dp, DnsFreeRecordList);
+
+    dns_status = DnsQuery_A("localhost", DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0);
+    ok(dns_status == 0,"DnsQuery_A failed with error %d", dns_status);
+    DnsRecordListFree(dp, DnsFreeRecordList);
+
+    //DnsQuery_W:
+    //Testing HostName 
+
+    dns_status = DnsQuery_W(host_nameW, DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0);
+    ok(dns_status == 0,"DnsQuery_A failed with error %d", dns_status);
+    DnsRecordListFree(dp, DnsFreeRecordList);
+    
+    //127.0.0.1
+    dns_status = DnsQuery_W(L"127.0.0.1", DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0);
+    ok(dns_status == 0,"DnsQuery_A failed with error %d", dns_status);
+    DnsRecordListFree(dp, DnsFreeRecordList);
+
+    //Localhost strings
+    dns_status = DnsQuery_W(L"LocalHost", DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0);
+    ok(dns_status == 0,"DnsQuery_A failed with error %d", dns_status);
+    DnsRecordListFree(dp, DnsFreeRecordList);
+
+    dns_status = DnsQuery_W(L"Localhost", DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0);
+    ok(dns_status == 0,"DnsQuery_A failed with error %d", dns_status);
+    DnsRecordListFree(dp, DnsFreeRecordList);
+
+    dns_status = DnsQuery_W(L"localhost", DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0);
+    ok(dns_status == 0,"DnsQuery_A failed with error %d", dns_status);
+    DnsRecordListFree(dp, DnsFreeRecordList);
+
+}
+
+START_TEST(DnsQuery)
+{
+    WSADATA wsaData;
+    int iResult;
+
+    // Initialize Winsock
+    iResult = WSAStartup(MAKEWORD(2, 2), &wsaData);
+    ok(iResult == 0, "WSAStartup failed: %d\n", iResult);
+    if (iResult != 0) return;
+
+    // Tests
+    TestHostName();
+
+    return;
+
+}
\ No newline at end of file