dnsapi: Better match the PSDK types, especially with regards to constness.

Francois Gouget fgouget at free.fr
Wed Aug 8 03:47:03 CDT 2007


Add some missing A/W prototype macros.
Update win32.api to fix the winapi_check warnings.
---
 dlls/dnsapi/main.c     |   16 ++++----
 dlls/dnsapi/name.c     |   20 +++++-----
 dlls/dnsapi/query.c    |    4 +-
 dlls/dnsapi/record.c   |    2 +-
 include/windns.h       |   86 +++++++++++++++++++++++++----------------------
 tools/winapi/win32.api |   14 +++-----
 6 files changed, 72 insertions(+), 70 deletions(-)

diff --git a/dlls/dnsapi/main.c b/dlls/dnsapi/main.c
index 2016d75..0c5020a 100644
--- a/dlls/dnsapi/main.c
+++ b/dlls/dnsapi/main.c
@@ -55,7 +55,7 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved )
  *
  */
 DNS_STATUS WINAPI DnsAcquireContextHandle_A( DWORD flags, PVOID cred,
-                                             HANDLE *context )
+                                             PHANDLE context )
 {
     FIXME( "(0x%08x,%p,%p) stub\n", flags, cred, context );
 
@@ -68,7 +68,7 @@ DNS_STATUS WINAPI DnsAcquireContextHandle_A( DWORD flags, PVOID cred,
  *
  */
 DNS_STATUS WINAPI DnsAcquireContextHandle_UTF8( DWORD flags, PVOID cred,
-                                                HANDLE *context )
+                                                PHANDLE context )
 {
     FIXME( "(0x%08x,%p,%p) stub\n", flags, cred, context );
 
@@ -81,7 +81,7 @@ DNS_STATUS WINAPI DnsAcquireContextHandle_UTF8( DWORD flags, PVOID cred,
  *
  */
 DNS_STATUS WINAPI DnsAcquireContextHandle_W( DWORD flags, PVOID cred,
-                                             HANDLE *context )
+                                             PHANDLE context )
 {
     FIXME( "(0x%08x,%p,%p) stub\n", flags, cred, context );
 
@@ -93,7 +93,7 @@ DNS_STATUS WINAPI DnsAcquireContextHandle_W( DWORD flags, PVOID cred,
  * DnsReleaseContextHandle                [DNSAPI.@]
  *
  */
-void WINAPI DnsReleaseContextHandle( HANDLE context )
+VOID WINAPI DnsReleaseContextHandle( HANDLE context )
 {
     FIXME( "(%p) stub\n", context );
 }
@@ -167,8 +167,8 @@ DNS_STATUS WINAPI DnsModifyRecordsInSet_W( PDNS_RECORDW add, PDNS_RECORDW delete
  * DnsWriteQuestionToBuffer_UTF8          [DNSAPI.@]
  *
  */
-BOOL WINAPI DnsWriteQuestionToBuffer_UTF8( PDNS_MESSAGE_BUFFER buffer, LPDWORD size,
-                                           LPSTR name, WORD type, WORD xid,
+BOOL WINAPI DnsWriteQuestionToBuffer_UTF8( PDNS_MESSAGE_BUFFER buffer, PDWORD size,
+                                           PCSTR name, WORD type, WORD xid,
                                            BOOL recurse )
 {
     FIXME( "(%p,%p,%s,%d,%d,%d) stub\n", buffer, size, debugstr_a(name),
@@ -180,8 +180,8 @@ BOOL WINAPI DnsWriteQuestionToBuffer_UTF8( PDNS_MESSAGE_BUFFER buffer, LPDWORD s
  * DnsWriteQuestionToBuffer_W              [DNSAPI.@]
  *
  */
-BOOL WINAPI DnsWriteQuestionToBuffer_W( PDNS_MESSAGE_BUFFER buffer, LPDWORD size,
-                                        LPWSTR name, WORD type, WORD xid,
+BOOL WINAPI DnsWriteQuestionToBuffer_W( PDNS_MESSAGE_BUFFER buffer, PDWORD size,
+                                        PCWSTR name, WORD type, WORD xid,
                                         BOOL recurse )
 {
     FIXME( "(%p,%p,%s,%d,%d,%d) stub\n", buffer, size, debugstr_w(name),
diff --git a/dlls/dnsapi/name.c b/dlls/dnsapi/name.c
index 4b9f8e1..514fec9 100644
--- a/dlls/dnsapi/name.c
+++ b/dlls/dnsapi/name.c
@@ -51,10 +51,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(dnsapi);
  * DnsNameCompare_A               [DNSAPI.@]
  *
  */
-BOOL WINAPI DnsNameCompare_A( LPSTR name1, LPSTR name2 )
+BOOL WINAPI DnsNameCompare_A( PCSTR name1, PCSTR name2 )
 {
     BOOL ret;
-    LPWSTR name1W, name2W;
+    PWSTR name1W, name2W;
 
     TRACE( "(%s,%s)\n", debugstr_a(name1), debugstr_a(name2) );
 
@@ -73,9 +73,9 @@ BOOL WINAPI DnsNameCompare_A( LPSTR name1, LPSTR name2 )
  * DnsNameCompare_W               [DNSAPI.@]
  *
  */
-BOOL WINAPI DnsNameCompare_W( LPWSTR name1, LPWSTR name2 )
+BOOL WINAPI DnsNameCompare_W( PCWSTR name1, PCWSTR name2 )
 {
-    WCHAR *p, *q;
+    PCWSTR p, q;
 
     TRACE( "(%s,%s)\n", debugstr_w(name1), debugstr_w(name2) );
 
@@ -105,9 +105,9 @@ BOOL WINAPI DnsNameCompare_W( LPWSTR name1, LPWSTR name2 )
  * DnsValidateName_A              [DNSAPI.@]
  *
  */
-DNS_STATUS WINAPI DnsValidateName_A( LPCSTR name, DNS_NAME_FORMAT format )
+DNS_STATUS WINAPI DnsValidateName_A( PCSTR name, DNS_NAME_FORMAT format )
 {
-    LPWSTR nameW;
+    PWSTR nameW;
     DNS_STATUS ret;
 
     TRACE( "(%s, %d)\n", debugstr_a(name), format );
@@ -123,9 +123,9 @@ DNS_STATUS WINAPI DnsValidateName_A( LPCSTR name, DNS_NAME_FORMAT format )
  * DnsValidateName_UTF8           [DNSAPI.@]
  *
  */
-DNS_STATUS WINAPI DnsValidateName_UTF8( LPCSTR name, DNS_NAME_FORMAT format )
+DNS_STATUS WINAPI DnsValidateName_UTF8( PCSTR name, DNS_NAME_FORMAT format )
 {
-    LPWSTR nameW;
+    PWSTR nameW;
     DNS_STATUS ret;
 
     TRACE( "(%s, %d)\n", debugstr_a(name), format );
@@ -152,9 +152,9 @@ DNS_STATUS WINAPI DnsValidateName_UTF8( LPCSTR name, DNS_NAME_FORMAT format )
  * DnsValidateName_W              [DNSAPI.@]
  *
  */
-DNS_STATUS WINAPI DnsValidateName_W( LPCWSTR name, DNS_NAME_FORMAT format )
+DNS_STATUS WINAPI DnsValidateName_W( PCWSTR name, DNS_NAME_FORMAT format )
 {
-    const WCHAR *p;
+    PCWSTR p;
     unsigned int i, j, state = 0;
     static const WCHAR invalid[] = {
         '{','|','}','~','[','\\',']','^','\'',':',';','<','=','>',
diff --git a/dlls/dnsapi/query.c b/dlls/dnsapi/query.c
index 5073b6a..0cf2928 100644
--- a/dlls/dnsapi/query.c
+++ b/dlls/dnsapi/query.c
@@ -769,7 +769,7 @@ DNS_STATUS WINAPI DnsQuery_W( PCWSTR name, WORD type, DWORD options, PVOID serve
 }
 
 static DNS_STATUS dns_get_hostname_a( COMPUTER_NAME_FORMAT format,
-                                      LPSTR buffer, PDWORD len )
+                                      PSTR buffer, PDWORD len )
 {
     char name[256];
     DWORD size = sizeof(name);
@@ -788,7 +788,7 @@ static DNS_STATUS dns_get_hostname_a( COMPUTER_NAME_FORMAT format,
 }
 
 static DNS_STATUS dns_get_hostname_w( COMPUTER_NAME_FORMAT format,
-                                      LPWSTR buffer, PDWORD len )
+                                      PWSTR buffer, PDWORD len )
 {
     WCHAR name[256];
     DWORD size = sizeof(name);
diff --git a/dlls/dnsapi/record.c b/dlls/dnsapi/record.c
index 8680b31..7c5366f 100644
--- a/dlls/dnsapi/record.c
+++ b/dlls/dnsapi/record.c
@@ -539,7 +539,7 @@ error:
  * DnsRecordListFree                       [DNSAPI.@]
  *
  */
-void WINAPI DnsRecordListFree( PDNS_RECORD list, DNS_FREE_TYPE type )
+VOID WINAPI DnsRecordListFree( PDNS_RECORD list, DNS_FREE_TYPE type )
 {
     DNS_RECORD *r, *next;
     unsigned int i;
diff --git a/include/windns.h b/include/windns.h
index 83fb178..7c02a5c 100644
--- a/include/windns.h
+++ b/include/windns.h
@@ -215,8 +215,8 @@ typedef struct _DnsRecordFlags
 
 typedef struct
 {
-    LPSTR pNamePrimaryServer;
-    LPSTR pNameAdministrator;
+    PSTR  pNamePrimaryServer;
+    PSTR  pNameAdministrator;
     DWORD dwSerialNo;
     DWORD dwRefresh;
     DWORD dwRetry;
@@ -226,8 +226,8 @@ typedef struct
 
 typedef struct
 {
-    LPWSTR pNamePrimaryServer;
-    LPWSTR pNameAdministrator;
+    PWSTR pNamePrimaryServer;
+    PWSTR pNameAdministrator;
     DWORD dwSerialNo;
     DWORD dwRefresh;
     DWORD dwRetry;
@@ -240,12 +240,12 @@ DECL_WINELIB_TYPE_AW(PDNS_SOA_DATA)
 
 typedef struct
 {
-    LPSTR pNameHost;
+    PSTR pNameHost;
 } DNS_PTR_DATAA, *PDNS_PTR_DATAA;
 
 typedef struct
 {
-    LPWSTR pNameHost;
+    PWSTR pNameHost;
 } DNS_PTR_DATAW, *PDNS_PTR_DATAW;
 
 DECL_WINELIB_TYPE_AW(DNS_PTR_DATA)
@@ -253,14 +253,14 @@ DECL_WINELIB_TYPE_AW(PDNS_PTR_DATA)
 
 typedef struct
 {
-    LPSTR pNameMailbox;
-    LPSTR pNameErrorsMailbox;
+    PSTR pNameMailbox;
+    PSTR pNameErrorsMailbox;
 } DNS_MINFO_DATAA, *PDNS_MINFO_DATAA;
 
 typedef struct
 {
-    LPWSTR pNameMailbox;
-    LPWSTR pNameErrorsMailbox;
+    PWSTR pNameMailbox;
+    PWSTR pNameErrorsMailbox;
 } DNS_MINFO_DATAW, *PDNS_MINFO_DATAW;
 
 DECL_WINELIB_TYPE_AW(DNS_MINFO_DATA)
@@ -268,14 +268,14 @@ DECL_WINELIB_TYPE_AW(PDNS_MINFO_DATA)
 
 typedef struct
 {
-    LPSTR pNameExchange;
+    PSTR pNameExchange;
     WORD wPreference;
     WORD Pad;
 } DNS_MX_DATAA, *PDNS_MX_DATAA;
 
 typedef struct
 {
-    LPWSTR pNameExchange;
+    PWSTR pNameExchange;
     WORD wPreference;
     WORD Pad;
 } DNS_MX_DATAW, *PDNS_MX_DATAW;
@@ -286,13 +286,13 @@ DECL_WINELIB_TYPE_AW(PDNS_MX_DATA)
 typedef struct
 {
     DWORD dwStringCount;
-    LPSTR pStringArray[1];
+    PSTR pStringArray[1];
 } DNS_TXT_DATAA, *PDNS_TXT_DATAA;
 
 typedef struct
 {
     DWORD dwStringCount;
-    LPWSTR pStringArray[1];
+    PWSTR pStringArray[1];
 } DNS_TXT_DATAW, *PDNS_TXT_DATAW;
 
 DECL_WINELIB_TYPE_AW(DNS_TXT_DATA)
@@ -337,7 +337,7 @@ typedef struct
 
 typedef struct
 {
-    LPSTR pNameSigner;
+    PSTR pNameSigner;
     WORD wTypeCovered;
     BYTE chAlgorithm;
     BYTE chLabelCount;
@@ -351,7 +351,7 @@ typedef struct
 
 typedef struct
 {
-    LPWSTR pNameSigner;
+    PWSTR pNameSigner;
     WORD wTypeCovered;
     BYTE chAlgorithm;
     BYTE chLabelCount;
@@ -376,14 +376,14 @@ typedef struct
 
 typedef struct
 {
-    LPSTR pNameNext;
+    PSTR pNameNext;
     WORD wNumTypes;
     WORD wTypes[1];
 } DNS_NXT_DATAA, *PDNS_NXT_DATAA;
 
 typedef struct
 {
-    LPWSTR pNameNext;
+    PWSTR pNameNext;
     WORD wNumTypes;
     WORD wTypes[1];
 } DNS_NXT_DATAW, *PDNS_NXT_DATAW;
@@ -393,7 +393,7 @@ DECL_WINELIB_TYPE_AW(PDNS_NXT_DATA)
 
 typedef struct
 {
-    LPSTR pNameTarget;
+    PSTR pNameTarget;
     WORD wPriority;
     WORD wWeight;
     WORD wPort;
@@ -402,7 +402,7 @@ typedef struct
 
 typedef struct
 {
-    LPWSTR pNameTarget;
+    PWSTR pNameTarget;
     WORD wPriority;
     WORD wWeight;
     WORD wPort;
@@ -414,7 +414,7 @@ DECL_WINELIB_TYPE_AW(PDNS_SRV_DATA)
 
 typedef struct
 {
-    LPSTR pNameAlgorithm;
+    PSTR pNameAlgorithm;
     PBYTE pAlgorithmPacket;
     PBYTE pKey;
     PBYTE pOtherData;
@@ -430,7 +430,7 @@ typedef struct
 
 typedef struct
 {
-    LPWSTR pNameAlgorithm;
+    PWSTR pNameAlgorithm;
     PBYTE pAlgorithmPacket;
     PBYTE pKey;
     PBYTE pOtherData;
@@ -449,7 +449,7 @@ DECL_WINELIB_TYPE_AW(PDNS_TKEY_DATA)
 
 typedef struct
 {
-    LPSTR pNameAlgorithm;
+    PSTR pNameAlgorithm;
     PBYTE pAlgorithmPacket;
     PBYTE pSignature;
     PBYTE pOtherData;
@@ -465,7 +465,7 @@ typedef struct
 
 typedef struct
 {
-    LPWSTR pNameAlgorithm;
+    PWSTR pNameAlgorithm;
     PBYTE pAlgorithmPacket;
     PBYTE pSignature;
     PBYTE pOtherData;
@@ -493,7 +493,7 @@ typedef struct
     DWORD dwMappingFlag;
     DWORD dwLookupTimeout;
     DWORD dwCacheTimeout;
-    LPSTR pNameResultDomain;
+    PSTR pNameResultDomain;
 } DNS_WINSR_DATAA, *PDNS_WINSR_DATAA;
 
 typedef struct
@@ -501,7 +501,7 @@ typedef struct
     DWORD dwMappingFlag;
     DWORD dwLookupTimeout;
     DWORD dwCacheTimeout;
-    LPWSTR pNameResultDomain;
+    PWSTR pNameResultDomain;
 } DNS_WINSR_DATAW, *PDNS_WINSR_DATAW;
 
 DECL_WINELIB_TYPE_AW(DNS_WINSR_DATA)
@@ -510,7 +510,7 @@ DECL_WINELIB_TYPE_AW(PDNS_WINSR_DATA)
 typedef struct _DnsRecordA
 {
     struct _DnsRecordA *pNext;
-    LPSTR pName;
+    PSTR pName;
     WORD wType;
     WORD wDataLength;
     union
@@ -540,13 +540,13 @@ typedef struct _DnsRecordA
         DNS_TSIG_DATAA TSIG, Tsig;
         DNS_WINS_DATA WINS, Wins;
         DNS_WINSR_DATAA WINSR, WinsR, NBSTAT, Nbstat;
-        } Data;
+    } Data;
 } DNS_RECORDA, *PDNS_RECORDA;
 
 typedef struct _DnsRecordW
 {
     struct _DnsRecordW *pNext;
-    LPWSTR pName;
+    PWSTR pName;
     WORD wType;
     WORD wDataLength;
     union
@@ -576,7 +576,7 @@ typedef struct _DnsRecordW
         DNS_TSIG_DATAW TSIG, Tsig;
         DNS_WINS_DATA WINS, Wins;
         DNS_WINSR_DATAW WINSR, WinsR, NBSTAT, Nbstat;
-        } Data;
+    } Data;
 } DNS_RECORDW, *PDNS_RECORDW;
 
 #if defined(__WINESRC__) || defined(UNICODE)
@@ -614,22 +614,26 @@ typedef struct _DnsRRSet
     _prrset->pLastRR->pNext = NULL;  \
 }
 
-DNS_STATUS WINAPI DnsAcquireContextHandle_A(DWORD,PVOID,HANDLE*);
-DNS_STATUS WINAPI DnsAcquireContextHandle_W(DWORD,PVOID,HANDLE*);
+DNS_STATUS WINAPI DnsAcquireContextHandle_A(DWORD,PVOID,PHANDLE);
+DNS_STATUS WINAPI DnsAcquireContextHandle_W(DWORD,PVOID,PHANDLE);
+#define DnsAcquireContextHandle WINELIB_NAME_AW(DnsAcquireContextHandle_)
 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,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);
+#define DnsModifyRecordsInSet WINELIB_NAME_AW(DnsModifyRecordsInSet_)
+BOOL WINAPI DnsNameCompare_A(PCSTR,PCSTR);
+BOOL WINAPI DnsNameCompare_W(PCWSTR,PCWSTR);
+#define DnsNameCompare WINELIB_NAME_AW(DnsNameCompare_)
 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*);
+#define DnsQuery WINELIB_NAME_AW(DnsQuery_)
 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);
-void WINAPI DnsRecordListFree(PDNS_RECORD,DNS_FREE_TYPE);
+VOID WINAPI DnsRecordListFree(PDNS_RECORD,DNS_FREE_TYPE);
 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);
@@ -637,11 +641,13 @@ void WINAPI DnsReleaseContextHandle(HANDLE);
 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);
-BOOL WINAPI DnsWriteQuestionToBuffer_W(PDNS_MESSAGE_BUFFER,LPDWORD,LPWSTR,WORD,WORD,BOOL);
-BOOL WINAPI DnsWriteQuestionToBuffer_UTF8(PDNS_MESSAGE_BUFFER,LPDWORD,LPSTR,WORD,WORD,BOOL);
+#define DnsReplaceRecordSet WINELIB_NAME_AW(DnsReplaceRecordSet)
+DNS_STATUS WINAPI DnsValidateName_A(PCSTR,DNS_NAME_FORMAT);
+DNS_STATUS WINAPI DnsValidateName_W(PCWSTR, DNS_NAME_FORMAT);
+DNS_STATUS WINAPI DnsValidateName_UTF8(PCSTR,DNS_NAME_FORMAT);
+#define DnsValidateName WINELIB_NAME_AW(DnsValidateName_)
+BOOL WINAPI DnsWriteQuestionToBuffer_W(PDNS_MESSAGE_BUFFER,PDWORD,PCWSTR,WORD,WORD,BOOL);
+BOOL WINAPI DnsWriteQuestionToBuffer_UTF8(PDNS_MESSAGE_BUFFER,PDWORD,PCSTR,WORD,WORD,BOOL);
 
 #ifdef __cplusplus
 }
diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api
index 2835e88..886668c 100644
--- a/tools/winapi/win32.api
+++ b/tools/winapi/win32.api
@@ -1206,7 +1206,6 @@ WORD
 
 %ptr
 
-HANDLE *
 PDNS_MESSAGE_BUFFER
 PDNS_RECORD
 PDNS_RECORD *
@@ -1215,26 +1214,23 @@ PDNS_RECORDA *
 PDNS_RECORDW
 PDNS_RECORDW *
 PDWORD
+PHANDLE
 PVOID
 PVOID *
 
 %str
 
-LPCSTR
-LPSTR
 PCSTR
 
-%void
-
-void
-
 %wstr
 
-LPCWSTR
-LPWSTR
 PCWSTR
 PWSTR
 
+%void
+
+VOID
+
 %%dplayx.dll
 
 %long
-- 
1.5.2.4




More information about the wine-patches mailing list