Francois Gouget : ntoskrnel.exe: Better match the PSDK types and fix the winapi_check warnings.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: f20cd498e0781165788a119d94df0ef28a313fb4
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=f20cd498e0781165788a119d94...

Author: Francois Gouget 
Date:   Wed Aug 15 14:52:23 2007 +0200

ntoskrnel.exe: Better match the PSDK types and fix the winapi_check warnings.

---

dlls/ntoskrnl.exe/ntoskrnl.c |    2 +-
 include/ddk/wdm.h            |    4 ++--
 tools/winapi/win32.api       |   29 +++++++++++++++++++++++++++++
 3 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c
index d793d1a..4b16c39 100644
--- a/dlls/ntoskrnl.exe/ntoskrnl.c
+++ b/dlls/ntoskrnl.exe/ntoskrnl.c
@@ -461,7 +461,7 @@ ULONG WINAPI KeQueryTimeIncrement(void)
 /***********************************************************************
  *           MmAllocateNonCachedMemory   (NTOSKRNL.EXE.@)
  */
-LPVOID WINAPI MmAllocateNonCachedMemory( SIZE_T size )
+PVOID WINAPI MmAllocateNonCachedMemory( SIZE_T size )
 {
     TRACE( "%lu\n", size );
     return VirtualAlloc( NULL, size, MEM_RESERVE|MEM_COMMIT, PAGE_READWRITE|PAGE_NOCACHE );
diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h
index 8aabf79..f9e2a5f 100644
--- a/include/ddk/wdm.h
+++ b/include/ddk/wdm.h
@@ -886,7 +886,7 @@ void      WINAPI KeQuerySystemTime(LARGE_INTEGER*);
 void      WINAPI KeQueryTickCount(LARGE_INTEGER*);
 ULONG     WINAPI KeQueryTimeIncrement(void);

-LPVOID    WINAPI MmAllocateNonCachedMemory(SIZE_T);
+PVOID     WINAPI MmAllocateNonCachedMemory(SIZE_T);
 void      WINAPI MmFreeNonCachedMemory(PVOID,SIZE_T);

#define          PsGetCurrentProcess() IoGetCurrentProcess()
@@ -956,7 +956,7 @@ NTSTATUS  WINAPI ZwQueryEaFile(HANDLE,PIO_STATUS_BLOCK,PVOID,ULONG,BOOLEAN,PVOID
 NTSTATUS  WINAPI ZwQueryFullAttributesFile(const OBJECT_ATTRIBUTES*,FILE_NETWORK_OPEN_INFORMATION*);
 NTSTATUS  WINAPI ZwQueryInformationFile(HANDLE,PIO_STATUS_BLOCK,PVOID,LONG,FILE_INFORMATION_CLASS);
 NTSTATUS  WINAPI ZwQueryInformationThread(HANDLE,THREADINFOCLASS,PVOID,ULONG,PULONG);
-NTSTATUS  WINAPI ZwQueryInformationToken(HANDLE,DWORD,LPVOID,DWORD,LPDWORD);
+NTSTATUS  WINAPI ZwQueryInformationToken(HANDLE,DWORD,PVOID,DWORD,LPDWORD);
 NTSTATUS  WINAPI ZwQueryInstallUILanguage(LANGID*);
 NTSTATUS  WINAPI ZwQueryKey(HANDLE,KEY_INFORMATION_CLASS,void *,DWORD,DWORD *);
 NTSTATUS  WINAPI ZwQueryObject(HANDLE, OBJECT_INFORMATION_CLASS, PVOID, ULONG, PULONG);
diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api
index 2d8d82b..36ded2d 100644
--- a/tools/winapi/win32.api
+++ b/tools/winapi/win32.api
@@ -3238,6 +3238,35 @@ LPSTR
 LPCWSTR
 LPWSTR

+%%ntoskrnl.exe
+
+%long
+
+BOOLEAN
+DEVICE_TYPE
+HANDLE
+NTSTATUS
+POOL_TYPE
+SIZE_T
+ULONG
+
+%ptr
+
+DEVICE_OBJECT *
+DEVICE_OBJECT **
+DRIVER_OBJECT *
+LARGE_INTEGER *
+PCREATE_PROCESS_NOTIFY_ROUTINE
+PKTIMER
+PVOID
+ULONG *
+UNICODE_STRING *
+void *
+
+%void
+
+void
+
 %%odbc32.dll

%long