[cgutman] 48018: [DNSAPI] - Merge r45450 from aicom-network-branch

Author: cgutman
Date: Mon Jul 12 19:36:42 2010
New Revision: 48018

URL: http://svn.reactos.org/svn/reactos?rev=48018&view=rev
Log:
[DNSAPI]
- Merge r45450 from aicom-network-branch

Added:
    trunk/reactos/dll/win32/dnsapi/dnsapi/memory.c   (with props)
Removed:
    trunk/reactos/dll/win32/dnsapi/dnsapi/free.c
Modified:
    trunk/reactos/dll/win32/dnsapi/dnsapi.rbuild
    trunk/reactos/dll/win32/dnsapi/dnsapi.spec

Modified: trunk/reactos/dll/win32/dnsapi/dnsapi.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dnsapi/dnsapi.rb…
==============================================================================
--- trunk/reactos/dll/win32/dnsapi/dnsapi.rbuild [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/dnsapi/dnsapi.rbuild [iso-8859-1] Mon Jul 12 19:36:42 2010
@@ -12,7 +12,7 @@
 	<directory name="dnsapi">
 		<file>adns.c</file>
 		<file>context.c</file>
-		<file>free.c</file>
+		<file>memory.c</file>
 		<file>names.c</file>
 		<file>query.c</file>
 		<file>record.c</file>

Modified: trunk/reactos/dll/win32/dnsapi/dnsapi.spec
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dnsapi/dnsapi.sp…
==============================================================================
--- trunk/reactos/dll/win32/dnsapi/dnsapi.spec [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/dnsapi/dnsapi.spec [iso-8859-1] Mon Jul 12 19:36:42 2010
@@ -6,6 +6,8 @@
 @ stub DnsAddRecordSet_W
 @ stub DnsAllocateRecord
 @ stub DnsApiHeapReset
+@ stdcall DnsApiAlloc(long)
+@ stdcall DnsApiFree(ptr)
 @ stub DnsAsyncRegisterHostAddrs_A
 @ stub DnsAsyncRegisterHostAddrs_UTF8
 @ stub DnsAsyncRegisterHostAddrs_W

Removed: trunk/reactos/dll/win32/dnsapi/dnsapi/free.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dnsapi/dnsapi/fr…
==============================================================================
--- trunk/reactos/dll/win32/dnsapi/dnsapi/free.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/dnsapi/dnsapi/free.c (removed)
@@ -1,35 +1,0 @@
-/*
- * COPYRIGHT:   See COPYING in the top level directory
- * PROJECT:     ReactOS system libraries
- * FILE:        lib/dnsapi/dnsapi/free.c
- * PURPOSE:     DNSAPI functions built on the ADNS library.
- * PROGRAMER:   Art Yerkes
- * UPDATE HISTORY:
- *              12/15/03 -- Created
- */
-
-#include "precomp.h"
-
-#define NDEBUG
-#include <debug.h>
-
-VOID WINAPI
-DnsFree(PVOID Data,
-        DNS_FREE_TYPE FreeType)
-{
-    switch(FreeType)
-    {
-        case DnsFreeFlat:
-            RtlFreeHeap( RtlGetProcessHeap(), 0, Data );
-            break;
-
-        case DnsFreeRecordList:
-            DnsIntFreeRecordList( (PDNS_RECORD)Data );
-            break;
-
-        case DnsFreeParsedMessageFields:
-            /* assert( FALSE ); XXX arty not yet implemented. */
-            break;
-    }
-}
-

Added: trunk/reactos/dll/win32/dnsapi/dnsapi/memory.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dnsapi/dnsapi/me…
==============================================================================
--- trunk/reactos/dll/win32/dnsapi/dnsapi/memory.c (added)
+++ trunk/reactos/dll/win32/dnsapi/dnsapi/memory.c [iso-8859-1] Mon Jul 12 19:36:42 2010
@@ -1,0 +1,57 @@
+/*
+ * COPYRIGHT:   See COPYING in the top level directory
+ * PROJECT:     ReactOS system libraries
+ * FILE:        lib/dnsapi/dnsapi/memory.c
+ * PURPOSE:     DNSAPI functions built on the ADNS library.
+ * PROGRAMER:   Art Yerkes
+ * UPDATE HISTORY:
+ *              12/15/03 -- Created
+ */
+
+#include "precomp.h"
+
+#define NDEBUG
+#include <debug.h>
+
+VOID
+WINAPI
+DnsApiFree(IN PVOID Data)
+{
+    RtlFreeHeap(RtlGetProcessHeap(), 0, Data);
+}
+
+PVOID
+WINAPI
+DnsApiAlloc(IN DWORD Size)
+{
+    return RtlAllocateHeap(RtlGetProcessHeap(), 0, Size);
+}
+
+PVOID
+WINAPI
+DnsQueryConfigAllocEx(IN DNS_CONFIG_TYPE Config,
+                      OUT PVOID pBuffer,
+                      IN OUT PDWORD pBufferLength)
+{
+    return NULL;
+}
+
+VOID WINAPI
+DnsFree(PVOID Data,
+        DNS_FREE_TYPE FreeType)
+{
+    switch(FreeType)
+    {
+        case DnsFreeFlat:
+            RtlFreeHeap( RtlGetProcessHeap(), 0, Data );
+            break;
+
+        case DnsFreeRecordList:
+            DnsIntFreeRecordList( (PDNS_RECORD)Data );
+            break;
+
+        case DnsFreeParsedMessageFields:
+            /* assert( FALSE ); XXX arty not yet implemented. */
+            break;
+    }
+}

Propchange: trunk/reactos/dll/win32/dnsapi/dnsapi/memory.c
------------------------------------------------------------------------------
    svn:eol-style = native