system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-31 11:43:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

include: Fix IsBad* prototypes.

Browse source 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Nikolay Sivov 2016-03-01 11:53:31 +03:00 committed by Alexandre Julliard
parent d37b3f59e9
commit cd220569dd
2 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
dlls/kernel32/virtual.c
View file

@ -647,7 +647,7 @@ UINT WINAPI ResetWriteWatch( LPVOID base, SIZE_T size )
* Success: TRUE. * Success: TRUE.
* Failure: FALSE. Process has read access to entire block. * Failure: FALSE. Process has read access to entire block.
*/ */
BOOL WINAPI IsBadReadPtr( LPCVOID ptr, UINT size ) BOOL WINAPI IsBadReadPtr( LPCVOID ptr, UINT_PTR size )
{ {
if (!size) return FALSE; /* handle 0 size case w/o reference */ if (!size) return FALSE; /* handle 0 size case w/o reference */
if (!ptr) return TRUE; if (!ptr) return TRUE;
@ -655,7 +655,7 @@ BOOL WINAPI IsBadReadPtr( LPCVOID ptr, UINT size )
{ {
volatile const char *p = ptr; volatile const char *p = ptr;
char dummy __attribute__((unused)); char dummy __attribute__((unused));
UINT count = size; UINT_PTR count = size;
while (count > system_info.PageSize) while (count > system_info.PageSize)
{ {
@ -689,14 +689,14 @@ BOOL WINAPI IsBadReadPtr( LPCVOID ptr, UINT size )
* Success: TRUE. * Success: TRUE.
* Failure: FALSE. Process has write access to entire block. * Failure: FALSE. Process has write access to entire block.
*/ */
BOOL WINAPI IsBadWritePtr( LPVOID ptr, UINT size ) BOOL WINAPI IsBadWritePtr( LPVOID ptr, UINT_PTR size )
{ {
if (!size) return FALSE; /* handle 0 size case w/o reference */ if (!size) return FALSE; /* handle 0 size case w/o reference */
if (!ptr) return TRUE; if (!ptr) return TRUE;
__TRY __TRY
{ {
volatile char *p = ptr; volatile char *p = ptr;
UINT count = size; UINT_PTR count = size;
while (count > system_info.PageSize) while (count > system_info.PageSize)
{ {
@ -730,7 +730,7 @@ BOOL WINAPI IsBadWritePtr( LPVOID ptr, UINT size )
* Success: TRUE. * Success: TRUE.
* Failure: FALSE. Process has read access to entire block. * Failure: FALSE. Process has read access to entire block.
*/ */
BOOL WINAPI IsBadHugeReadPtr( LPCVOID ptr, UINT size ) BOOL WINAPI IsBadHugeReadPtr( LPCVOID ptr, UINT_PTR size )
{ {
return IsBadReadPtr( ptr, size ); return IsBadReadPtr( ptr, size );
} }
@ -749,7 +749,7 @@ BOOL WINAPI IsBadHugeReadPtr( LPCVOID ptr, UINT size )
* Success: TRUE. * Success: TRUE.
* Failure: FALSE. Process has write access to entire block. * Failure: FALSE. Process has write access to entire block.
*/ */
BOOL WINAPI IsBadHugeWritePtr( LPVOID ptr, UINT size ) BOOL WINAPI IsBadHugeWritePtr( LPVOID ptr, UINT_PTR size )
{ {
return IsBadWritePtr( ptr, size ); return IsBadWritePtr( ptr, size );
} }
@ -786,7 +786,7 @@ BOOL WINAPI IsBadCodePtr( FARPROC ptr )
* Success: TRUE. * Success: TRUE.
* Failure: FALSE. Read access to all bytes in string. * Failure: FALSE. Read access to all bytes in string.
*/ */
BOOL WINAPI IsBadStringPtrA( LPCSTR str, UINT max ) BOOL WINAPI IsBadStringPtrA( LPCSTR str, UINT_PTR max )
{ {
if (!str) return TRUE; if (!str) return TRUE;
@ -810,7 +810,7 @@ BOOL WINAPI IsBadStringPtrA( LPCSTR str, UINT max )
* *
* See IsBadStringPtrA. * See IsBadStringPtrA.
*/ */
BOOL WINAPI IsBadStringPtrW( LPCWSTR str, UINT max ) BOOL WINAPI IsBadStringPtrW( LPCWSTR str, UINT_PTR max )
{ {
if (!str) return TRUE; if (!str) return TRUE;

12
include/winbase.h
View file

@ -2236,13 +2236,13 @@ WINBASEAPI PSLIST_ENTRY WINAPI InterlockedFlushSList(PSLIST_HEADER);
WINBASEAPI PSLIST_ENTRY WINAPI InterlockedPopEntrySList(PSLIST_HEADER); WINBASEAPI PSLIST_ENTRY WINAPI InterlockedPopEntrySList(PSLIST_HEADER);
WINBASEAPI PSLIST_ENTRY WINAPI InterlockedPushEntrySList(PSLIST_HEADER, PSLIST_ENTRY); WINBASEAPI PSLIST_ENTRY WINAPI InterlockedPushEntrySList(PSLIST_HEADER, PSLIST_ENTRY);
WINBASEAPI BOOL WINAPI IsBadCodePtr(FARPROC); WINBASEAPI BOOL WINAPI IsBadCodePtr(FARPROC);
WINBASEAPI BOOL WINAPI IsBadHugeReadPtr(LPCVOID,UINT); WINBASEAPI BOOL WINAPI IsBadHugeReadPtr(LPCVOID,UINT_PTR);
WINBASEAPI BOOL WINAPI IsBadHugeWritePtr(LPVOID,UINT); WINBASEAPI BOOL WINAPI IsBadHugeWritePtr(LPVOID,UINT_PTR);
WINBASEAPI BOOL WINAPI IsBadReadPtr(LPCVOID,UINT); WINBASEAPI BOOL WINAPI IsBadReadPtr(LPCVOID,UINT_PTR);
WINBASEAPI BOOL WINAPI IsBadStringPtrA(LPCSTR,UINT); WINBASEAPI BOOL WINAPI IsBadStringPtrA(LPCSTR,UINT_PTR);
WINBASEAPI BOOL WINAPI IsBadStringPtrW(LPCWSTR,UINT); WINBASEAPI BOOL WINAPI IsBadStringPtrW(LPCWSTR,UINT_PTR);
#define IsBadStringPtr WINELIB_NAME_AW(IsBadStringPtr) #define IsBadStringPtr WINELIB_NAME_AW(IsBadStringPtr)
WINBASEAPI BOOL WINAPI IsBadWritePtr(LPVOID,UINT); WINBASEAPI BOOL WINAPI IsBadWritePtr(LPVOID,UINT_PTR);
WINBASEAPI BOOL WINAPI IsDebuggerPresent(void); WINBASEAPI BOOL WINAPI IsDebuggerPresent(void);
WINBASEAPI BOOL WINAPI IsSystemResumeAutomatic(void); WINBASEAPI BOOL WINAPI IsSystemResumeAutomatic(void);
WINADVAPI BOOL WINAPI IsTextUnicode(LPCVOID,INT,LPINT); WINADVAPI BOOL WINAPI IsTextUnicode(LPCVOID,INT,LPINT);