Francois Gouget : dnsapi: The DNS APIs don't take PIP4_ARRAYs anymore ( for IPv6 compatibility).
Module: wine Branch: master Commit: cace3f9e8c36d5f59b2b333eaf38a0c62337253d URL: http://source.winehq.org/git/wine.git/?a=commit;h=cace3f9e8c36d5f59b2b333eaf...
Author: Francois Gouget fgouget@free.fr Date: Sat Aug 4 03:20:32 2007 +0200
dnsapi: The DNS APIs don't take PIP4_ARRAYs anymore (for IPv6 compatibility).
---
dlls/dnsapi/main.c | 12 ++++++------ dlls/dnsapi/query.c | 6 +++--- include/windns.h | 20 ++++++++++---------- tools/winapi/win32.api | 1 - 4 files changed, 19 insertions(+), 20 deletions(-)
diff --git a/dlls/dnsapi/main.c b/dlls/dnsapi/main.c index 10e3204..2016d75 100644 --- a/dlls/dnsapi/main.c +++ b/dlls/dnsapi/main.c @@ -130,7 +130,7 @@ DNS_STATUS WINAPI DnsExtractRecordsFromMessage_W( PDNS_MESSAGE_BUFFER buffer, */ DNS_STATUS WINAPI DnsModifyRecordsInSet_A( PDNS_RECORDA add, PDNS_RECORDA delete, DWORD options, HANDLE context, - PIP4_ARRAY servers, PVOID reserved ) + PVOID servers, PVOID reserved ) { FIXME( "(%p,%p,0x%08x,%p,%p,%p) stub\n", add, delete, options, context, servers, reserved ); @@ -143,7 +143,7 @@ DNS_STATUS WINAPI DnsModifyRecordsInSet_A( PDNS_RECORDA add, PDNS_RECORDA delete */ DNS_STATUS WINAPI DnsModifyRecordsInSet_UTF8( PDNS_RECORDA add, PDNS_RECORDA delete, DWORD options, HANDLE context, - PIP4_ARRAY servers, PVOID reserved ) + PVOID servers, PVOID reserved ) { FIXME( "(%p,%p,0x%08x,%p,%p,%p) stub\n", add, delete, options, context, servers, reserved ); @@ -156,7 +156,7 @@ DNS_STATUS WINAPI DnsModifyRecordsInSet_UTF8( PDNS_RECORDA add, PDNS_RECORDA del */ DNS_STATUS WINAPI DnsModifyRecordsInSet_W( PDNS_RECORDW add, PDNS_RECORDW delete, DWORD options, HANDLE context, - PIP4_ARRAY servers, PVOID reserved ) + PVOID servers, PVOID reserved ) { FIXME( "(%p,%p,0x%08x,%p,%p,%p) stub\n", add, delete, options, context, servers, reserved ); @@ -194,7 +194,7 @@ BOOL WINAPI DnsWriteQuestionToBuffer_W( PDNS_MESSAGE_BUFFER buffer, LPDWORD size * */ DNS_STATUS WINAPI DnsReplaceRecordSetA( PDNS_RECORDA set, DWORD options, - HANDLE context, PIP4_ARRAY servers, + HANDLE context, PVOID servers, PVOID reserved ) { FIXME( "(%p,0x%08x,%p,%p,%p) stub\n", set, options, context, @@ -207,7 +207,7 @@ DNS_STATUS WINAPI DnsReplaceRecordSetA( PDNS_RECORDA set, DWORD options, * */ DNS_STATUS WINAPI DnsReplaceRecordSetUTF8( PDNS_RECORDA set, DWORD options, - HANDLE context, PIP4_ARRAY servers, + HANDLE context, PVOID servers, PVOID reserved ) { FIXME( "(%p,0x%08x,%p,%p,%p) stub\n", set, options, context, @@ -220,7 +220,7 @@ DNS_STATUS WINAPI DnsReplaceRecordSetUTF8( PDNS_RECORDA set, DWORD options, * */ DNS_STATUS WINAPI DnsReplaceRecordSetW( PDNS_RECORDW set, DWORD options, - HANDLE context, PIP4_ARRAY servers, + HANDLE context, PVOID servers, PVOID reserved ) { FIXME( "(%p,0x%08x,%p,%p,%p) stub\n", set, options, context, diff --git a/dlls/dnsapi/query.c b/dlls/dnsapi/query.c index 608f496..5073b6a 100644 --- a/dlls/dnsapi/query.c +++ b/dlls/dnsapi/query.c @@ -660,7 +660,7 @@ exit: * DnsQuery_A [DNSAPI.@] * */ -DNS_STATUS WINAPI DnsQuery_A( PCSTR name, WORD type, DWORD options, PIP4_ARRAY servers, +DNS_STATUS WINAPI DnsQuery_A( PCSTR name, WORD type, DWORD options, PVOID servers, PDNS_RECORDA *result, PVOID *reserved ) { WCHAR *nameW; @@ -695,7 +695,7 @@ DNS_STATUS WINAPI DnsQuery_A( PCSTR name, WORD type, DWORD options, PIP4_ARRAY s * DnsQuery_UTF8 [DNSAPI.@] * */ -DNS_STATUS WINAPI DnsQuery_UTF8( PCSTR name, WORD type, DWORD options, PIP4_ARRAY servers, +DNS_STATUS WINAPI DnsQuery_UTF8( PCSTR name, WORD type, DWORD options, PVOID servers, PDNS_RECORDA *result, PVOID *reserved ) { DNS_STATUS ret = DNS_ERROR_RCODE_NOT_IMPLEMENTED; @@ -737,7 +737,7 @@ DNS_STATUS WINAPI DnsQuery_UTF8( PCSTR name, WORD type, DWORD options, PIP4_ARRA * DnsQuery_W [DNSAPI.@] * */ -DNS_STATUS WINAPI DnsQuery_W( PCWSTR name, WORD type, DWORD options, PIP4_ARRAY servers, +DNS_STATUS WINAPI DnsQuery_W( PCWSTR name, WORD type, DWORD options, PVOID servers, PDNS_RECORDW *result, PVOID *reserved ) { char *nameU; diff --git a/include/windns.h b/include/windns.h index 1b1a4e1..83fb178 100644 --- a/include/windns.h +++ b/include/windns.h @@ -156,7 +156,7 @@ typedef enum _DnsSection } DNS_SECTION;
typedef LONG DNS_STATUS, *PDNS_STATUS; -typedef DWORD IP4_ADDRESS; +typedef DWORD IP4_ADDRESS, *PIP4_ADDRESS;
typedef struct { @@ -618,14 +618,14 @@ DNS_STATUS WINAPI DnsAcquireContextHandle_A(DWORD,PVOID,HANDLE*); DNS_STATUS WINAPI DnsAcquireContextHandle_W(DWORD,PVOID,HANDLE*); DNS_STATUS WINAPI DnsExtractRecordsFromMessage_W(PDNS_MESSAGE_BUFFER,WORD,PDNS_RECORDW*); DNS_STATUS WINAPI DnsExtractRecordsFromMessage_UTF8(PDNS_MESSAGE_BUFFER,WORD,PDNS_RECORDA*); -DNS_STATUS WINAPI DnsModifyRecordsInSet_A(PDNS_RECORDA,PDNS_RECORDA,DWORD,HANDLE,PIP4_ARRAY,PVOID); -DNS_STATUS WINAPI DnsModifyRecordsInSet_W(PDNS_RECORDW,PDNS_RECORDW,DWORD,HANDLE,PIP4_ARRAY,PVOID); -DNS_STATUS WINAPI DnsModifyRecordsInSet_UTF8(PDNS_RECORDA,PDNS_RECORDA,DWORD,HANDLE,PIP4_ARRAY,PVOID); +DNS_STATUS WINAPI DnsModifyRecordsInSet_A(PDNS_RECORDA,PDNS_RECORDA,DWORD,HANDLE,PVOID,PVOID); +DNS_STATUS WINAPI DnsModifyRecordsInSet_W(PDNS_RECORDW,PDNS_RECORDW,DWORD,HANDLE,PVOID,PVOID); +DNS_STATUS WINAPI DnsModifyRecordsInSet_UTF8(PDNS_RECORDA,PDNS_RECORDA,DWORD,HANDLE,PVOID,PVOID); BOOL WINAPI DnsNameCompare_A(LPSTR,LPSTR); BOOL WINAPI DnsNameCompare_W(LPWSTR,LPWSTR); -DNS_STATUS WINAPI DnsQuery_A(PCSTR,WORD,DWORD,PIP4_ARRAY,PDNS_RECORDA*,PVOID*); -DNS_STATUS WINAPI DnsQuery_W(PCWSTR,WORD,DWORD,PIP4_ARRAY,PDNS_RECORDW*,PVOID*); -DNS_STATUS WINAPI DnsQuery_UTF8(PCSTR,WORD,DWORD,PIP4_ARRAY,PDNS_RECORDA*,PVOID*); +DNS_STATUS WINAPI DnsQuery_A(PCSTR,WORD,DWORD,PVOID,PDNS_RECORDA*,PVOID*); +DNS_STATUS WINAPI DnsQuery_W(PCWSTR,WORD,DWORD,PVOID,PDNS_RECORDW*,PVOID*); +DNS_STATUS WINAPI DnsQuery_UTF8(PCSTR,WORD,DWORD,PVOID,PDNS_RECORDA*,PVOID*); DNS_STATUS WINAPI DnsQueryConfig(DNS_CONFIG_TYPE,DWORD,PWSTR,PVOID,PVOID,PDWORD); BOOL WINAPI DnsRecordCompare(PDNS_RECORD,PDNS_RECORD); PDNS_RECORD WINAPI DnsRecordCopyEx(PDNS_RECORD,DNS_CHARSET,DNS_CHARSET); @@ -634,9 +634,9 @@ BOOL WINAPI DnsRecordSetCompare(PDNS_RECORD,PDNS_RECORD,PDNS_RECORD*,PDNS_RECORD PDNS_RECORD WINAPI DnsRecordSetCopyEx(PDNS_RECORD,DNS_CHARSET,DNS_CHARSET); PDNS_RECORD WINAPI DnsRecordSetDetach(PDNS_RECORD); void WINAPI DnsReleaseContextHandle(HANDLE); -DNS_STATUS WINAPI DnsReplaceRecordSetA(PDNS_RECORDA,DWORD,HANDLE,PIP4_ARRAY,PVOID); -DNS_STATUS WINAPI DnsReplaceRecordSetW(PDNS_RECORDW,DWORD,HANDLE,PIP4_ARRAY,PVOID); -DNS_STATUS WINAPI DnsReplaceRecordSetUTF8(PDNS_RECORDA,DWORD,HANDLE,PIP4_ARRAY,PVOID); +DNS_STATUS WINAPI DnsReplaceRecordSetA(PDNS_RECORDA,DWORD,HANDLE,PVOID,PVOID); +DNS_STATUS WINAPI DnsReplaceRecordSetW(PDNS_RECORDW,DWORD,HANDLE,PVOID,PVOID); +DNS_STATUS WINAPI DnsReplaceRecordSetUTF8(PDNS_RECORDA,DWORD,HANDLE,PVOID,PVOID); DNS_STATUS WINAPI DnsValidateName_A(LPCSTR,DNS_NAME_FORMAT); DNS_STATUS WINAPI DnsValidateName_W(LPCWSTR, DNS_NAME_FORMAT); DNS_STATUS WINAPI DnsValidateName_UTF8(LPCSTR,DNS_NAME_FORMAT); diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index 30eee71..725a7c2 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -1173,7 +1173,6 @@ PDNS_RECORDA * PDNS_RECORDW PDNS_RECORDW * PDWORD -PIP4_ARRAY PVOID PVOID *
-
Alexandre Julliard