Francois Gouget : ntdll:
Better match the PSDK types and fix the winapi_check warnings.
Alexandre Julliard
julliard at wine.codeweavers.com
Fri Feb 9 08:22:12 CST 2007
Module: wine
Branch: master
Commit: f3899c2651f824496edd561ff29b153e6ad6bff2
URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3899c2651f824496edd561ff29b153e6ad6bff2
Author: Francois Gouget <fgouget at free.fr>
Date: Fri Feb 9 12:36:49 2007 +0100
ntdll: Better match the PSDK types and fix the winapi_check warnings.
---
dlls/ntdll/misc.c | 2 +-
dlls/ntdll/string.c | 4 ++--
tools/winapi/win32.api | 11 ++++++++++-
3 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c
index 1142133..2f63ebb 100644
--- a/dlls/ntdll/misc.c
+++ b/dlls/ntdll/misc.c
@@ -149,7 +149,7 @@ int CDECL NTDLL_abs( int i )
/*********************************************************************
* labs (NTDLL.@)
*/
-long int CDECL NTDLL_labs( long int i )
+long CDECL NTDLL_labs( long i )
{
return labs( i );
}
diff --git a/dlls/ntdll/string.c b/dlls/ntdll/string.c
index 874ead3..731d918 100644
--- a/dlls/ntdll/string.c
+++ b/dlls/ntdll/string.c
@@ -105,8 +105,8 @@ void __cdecl NTDLL_qsort( void *base, si
/*********************************************************************
* _lfind (NTDLL.@)
*/
-void * __cdecl _lfind( const void *key, const void *base, size_t *nmemb,
- size_t size, int(*compar)(const void *, const void *) )
+void * __cdecl _lfind( const void *key, const void *base, unsigned int *nmemb,
+ unsigned int size, int(*compar)(const void *, const void *) )
{
return lfind( key, base, nmemb, size, compar );
}
diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api
index 860e52a..5041168 100644
--- a/tools/winapi/win32.api
+++ b/tools/winapi/win32.api
@@ -2816,6 +2816,7 @@ WORD
int
long
obj_handle_t
+size_t
unsigned int
unsigned long
@@ -2833,6 +2834,7 @@ ULONGLONG
ANSI_STRING *
BOOLEAN *
+BYTE *
CLIENT_ID *
CONTEXT *
CURDIR *
@@ -2895,6 +2897,7 @@ PIMAGE_NT_HEADERS
PIMAGE_SECTION_HEADER
PIO_APC_ROUTINE
PIO_STATUS_BLOCK
+PKEY_MULTIPLE_VALUE_INFORMATION
PLARGE_INTEGER
PLDR_MODULE *
PLONG
@@ -2914,11 +2917,14 @@ PRTL_THREAD_START_ROUTINE
PRTL_USER_PROCESS_PARAMETERS
PRTL_WORK_ITEM_ROUTINE
PSECURITY_DESCRIPTOR
+PSECURITY_DESCRIPTOR *
PSECURITY_DESCRIPTOR_CONTROL
PSECURITY_QUALITY_OF_SERVICE
PSID
PSID *
PSID_IDENTIFIER_AUTHORITY
+PSLIST_ENTRY
+PSLIST_HEADER
PSTRING
PSYSTEM_MODULE_INFORMATION
PTIME_FIELDS
@@ -2927,6 +2933,7 @@ PTOKEN_GROUPS
PTOKEN_PRIVILEGES
PULARGE_INTEGER
PULONG
+PULONG_PTR
PUNICODE_STRING
PVECTORED_EXCEPTION_HANDLER
PVOID
@@ -2946,7 +2953,6 @@ RTL_USER_PROCESS_PARAMETERS **
SECURITY_DESCRIPTOR *
SIZE_T *
STRING *
-TEB *
UINT *
ULONG *
ULONGLONG *
@@ -2954,9 +2960,12 @@ UNICODE_STRING *
USHORT *
VOID *
WCHAR **
+char **
int *
+int (*)(void *, void *)
obj_handle_t *
union cptable *
+unsigned int *
va_list
va_list *
void *
More information about the wine-cvs
mailing list