[weiden] 25534: Merged recent w32api changes

Author: weiden
Date: Fri Jan 19 19:46:36 2007
New Revision: 25534

URL: http://svn.reactos.org/svn/reactos?rev=25534&view=rev
Log:
Merged recent w32api changes

Modified:
    trunk/reactos/include/psdk/winbase.h
    trunk/reactos/include/psdk/windns.h

Modified: trunk/reactos/include/psdk/winbase.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winbase.h?rev=...
==============================================================================
--- trunk/reactos/include/psdk/winbase.h (original)
+++ trunk/reactos/include/psdk/winbase.h Fri Jan 19 19:46:36 2007
@@ -709,8 +709,8 @@
    } u;
 } DEBUG_EVENT,*LPDEBUG_EVENT;
 typedef struct _OVERLAPPED {
-	DWORD Internal;
-	DWORD InternalHigh;
+	ULONG_PTR Internal;
+	ULONG_PTR InternalHigh;
    DWORD Offset;
    DWORD OffsetHigh;
    HANDLE hEvent;
@@ -1070,7 +1070,7 @@
 typedef void(CALLBACK *LPOVERLAPPED_COMPLETION_ROUTINE)(DWORD,DWORD,LPOVERLAPPED);
 typedef LONG(CALLBACK *PTOP_LEVEL_EXCEPTION_FILTER)(LPEXCEPTION_POINTERS);
 typedef PTOP_LEVEL_EXCEPTION_FILTER LPTOP_LEVEL_EXCEPTION_FILTER;
-typedef void(APIENTRY *PAPCFUNC)(DWORD);
+typedef void(APIENTRY *PAPCFUNC)(ULONG_PTR);
 typedef void(CALLBACK *PTIMERAPCROUTINE)(PVOID,DWORD,DWORD);
 #if (_WIN32_WINNT >= 0x0500)
 typedef void(CALLBACK *WAITORTIMERCALLBACK)(PVOID,BOOLEAN);
@@ -1213,7 +1213,7 @@
 BOOL WINAPI CreateHardLinkA(LPCSTR,LPCSTR,LPSECURITY_ATTRIBUTES);
 BOOL WINAPI CreateHardLinkW(LPCWSTR,LPCWSTR,LPSECURITY_ATTRIBUTES);
 #endif
-HANDLE WINAPI CreateIoCompletionPort(HANDLE,HANDLE,DWORD,DWORD);
+HANDLE WINAPI CreateIoCompletionPort(HANDLE,HANDLE,ULONG_PTR,DWORD);
 #if (_WIN32_WINNT >= 0x0500)
 HANDLE WINAPI CreateJobObjectA(LPSECURITY_ATTRIBUTES,LPCSTR);
 HANDLE WINAPI CreateJobObjectW(LPSECURITY_ATTRIBUTES,LPCWSTR);
@@ -1538,7 +1538,7 @@
 DWORD WINAPI GetProfileSectionW(LPCWSTR,LPWSTR,DWORD);
 DWORD WINAPI GetProfileStringA(LPCSTR,LPCSTR,LPCSTR,LPSTR,DWORD);
 DWORD WINAPI GetProfileStringW(LPCWSTR,LPCWSTR,LPCWSTR,LPWSTR,DWORD);
-BOOL WINAPI GetQueuedCompletionStatus(HANDLE,PDWORD,PDWORD,LPOVERLAPPED*,DWORD);
+BOOL WINAPI GetQueuedCompletionStatus(HANDLE,PDWORD,PULONG_PTR,LPOVERLAPPED*,DWORD);
 BOOL WINAPI GetSecurityDescriptorControl(PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR_CONTROL,PDWORD);
 BOOL WINAPI GetSecurityDescriptorDacl(PSECURITY_DESCRIPTOR,LPBOOL,PACL*,LPBOOL);
 BOOL WINAPI GetSecurityDescriptorGroup(PSECURITY_DESCRIPTOR,PSID*,LPBOOL);
@@ -1841,7 +1841,7 @@
 #endif
 BOOL WINAPI QueryPerformanceCounter(PLARGE_INTEGER);
 BOOL WINAPI QueryPerformanceFrequency(PLARGE_INTEGER);
-DWORD WINAPI QueueUserAPC(PAPCFUNC,HANDLE,DWORD);
+DWORD WINAPI QueueUserAPC(PAPCFUNC,HANDLE,ULONG_PTR);
 #if (_WIN32_WINNT >= 0x0500)
 BOOL WINAPI QueueUserWorkItem(LPTHREAD_START_ROUTINE,PVOID,ULONG);
 #endif

Modified: trunk/reactos/include/psdk/windns.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/windns.h?rev=2...
==============================================================================
--- trunk/reactos/include/psdk/windns.h (original)
+++ trunk/reactos/include/psdk/windns.h Fri Jan 19 19:46:36 2007
@@ -51,7 +51,45 @@
    DNS_TYPE_HINFO,
    DNS_TYPE_MINFO,
    DNS_TYPE_MX,
-	DNS_TYPE_TEXT
+	DNS_TYPE_TEXT,
+	DNS_TYPE_RP,
+	DNS_TYPE_AFSDB,
+	DNS_TYPE_X25,
+	DNS_TYPE_ISDN,
+	DNS_TYPE_RT,
+	DNS_TYPE_NSAP,
+	DNS_TYPE_NSAPPTR,
+	DNS_TYPE_SIG,
+	DNS_TYPE_KEY,
+	DNS_TYPE_PX,
+	DNS_TYPE_GPOS,
+	DNS_TYPE_AAAA,
+	DNS_TYPE_LOC,
+	DNS_TYPE_NXT,
+	DNS_TYPE_EID,
+	DNS_TYPE_NIMLOC,
+	DNS_TYPE_SRV,
+	DNS_TYPE_ATMA,
+	DNS_TYPE_NAPTR,
+	DNS_TYPE_KX,
+	DNS_TYPE_CERT,
+	DNS_TYPE_A6,
+	DNS_TYPE_DNAME,
+	DNS_TYPE_SINK,
+	DNS_TYPE_OPT,
+	DNS_TYPE_UINFO=100,
+	DNS_TYPE_UID,
+	DNS_TYPE_GID,
+	DNS_TYPE_UNSPEC,
+	DNS_TYPE_ADDRS=248,
+	DNS_TYPE_TKEY,
+	DNS_TYPE_TSIG,
+	DNS_TYPE_IXFR,
+	DNS_TYPE_AXFR,
+	DNS_TYPE_MAILB,
+	DNS_TYPE_MAILA,
+	DNS_TYPE_ALL,
+	DNS_TYPE_ANY=DNS_TYPE_ALL
 };
 typedef enum _DNS_CHARSET
 {