Fixed compiling with STRICT.
diff --git a/files/file.c b/files/file.c
index 3e5785b..d0219d5 100644
--- a/files/file.c
+++ b/files/file.c
@@ -327,7 +327,7 @@
*
* Implementation of CreateFile. Takes a Unix path name.
*/
-HFILE FILE_CreateFile( LPCSTR filename, DWORD access, DWORD sharing,
+HANDLE FILE_CreateFile( LPCSTR filename, DWORD access, DWORD sharing,
LPSECURITY_ATTRIBUTES sa, DWORD creation,
DWORD attributes, HANDLE template )
{
@@ -402,7 +402,7 @@
* Doesn't support character devices, pipes, template files, or a
* lot of the 'attributes' flags yet.
*/
-HFILE WINAPI CreateFileA( LPCSTR filename, DWORD access, DWORD sharing,
+HANDLE WINAPI CreateFileA( LPCSTR filename, DWORD access, DWORD sharing,
LPSECURITY_ATTRIBUTES sa, DWORD creation,
DWORD attributes, HANDLE template )
{
@@ -486,12 +486,12 @@
/*************************************************************************
* CreateFile32W (KERNEL32.48)
*/
-HFILE WINAPI CreateFileW( LPCWSTR filename, DWORD access, DWORD sharing,
+HANDLE WINAPI CreateFileW( LPCWSTR filename, DWORD access, DWORD sharing,
LPSECURITY_ATTRIBUTES sa, DWORD creation,
DWORD attributes, HANDLE template)
{
LPSTR afn = HEAP_strdupWtoA( GetProcessHeap(), 0, filename );
- HFILE res = CreateFileA( afn, access, sharing, sa, creation, attributes, template );
+ HANDLE res = CreateFileA( afn, access, sharing, sa, creation, attributes, template );
HeapFree( GetProcessHeap(), 0, afn );
return res;
}
@@ -548,7 +548,7 @@
/***********************************************************************
* GetFileInformationByHandle (KERNEL32.219)
*/
-DWORD WINAPI GetFileInformationByHandle( HFILE hFile,
+DWORD WINAPI GetFileInformationByHandle( HANDLE hFile,
BY_HANDLE_FILE_INFORMATION *info )
{
struct get_file_info_request *req = get_req_buffer();
@@ -610,7 +610,7 @@
/***********************************************************************
* GetFileSize (KERNEL32.220)
*/
-DWORD WINAPI GetFileSize( HFILE hFile, LPDWORD filesizehigh )
+DWORD WINAPI GetFileSize( HANDLE hFile, LPDWORD filesizehigh )
{
BY_HANDLE_FILE_INFORMATION info;
if (!GetFileInformationByHandle( hFile, &info )) return 0;
@@ -622,7 +622,7 @@
/***********************************************************************
* GetFileTime (KERNEL32.221)
*/
-BOOL WINAPI GetFileTime( HFILE hFile, FILETIME *lpCreationTime,
+BOOL WINAPI GetFileTime( HANDLE hFile, FILETIME *lpCreationTime,
FILETIME *lpLastAccessTime,
FILETIME *lpLastWriteTime )
{
@@ -1238,7 +1238,7 @@
/***********************************************************************
* SetFilePointer (KERNEL32.492)
*/
-DWORD WINAPI SetFilePointer( HFILE hFile, LONG distance, LONG *highword,
+DWORD WINAPI SetFilePointer( HANDLE hFile, LONG distance, LONG *highword,
DWORD method )
{
struct set_file_pointer_request *req = get_req_buffer();
@@ -1445,7 +1445,7 @@
/***********************************************************************
* FlushFileBuffers (KERNEL32.133)
*/
-BOOL WINAPI FlushFileBuffers( HFILE hFile )
+BOOL WINAPI FlushFileBuffers( HANDLE hFile )
{
struct flush_file_request *req = get_req_buffer();
req->handle = hFile;
@@ -1456,7 +1456,7 @@
/**************************************************************************
* SetEndOfFile (KERNEL32.483)
*/
-BOOL WINAPI SetEndOfFile( HFILE hFile )
+BOOL WINAPI SetEndOfFile( HANDLE hFile )
{
struct truncate_file_request *req = get_req_buffer();
req->handle = hFile;
@@ -1610,7 +1610,7 @@
/***********************************************************************
* GetFileType (KERNEL32.222)
*/
-DWORD WINAPI GetFileType( HFILE hFile )
+DWORD WINAPI GetFileType( HANDLE hFile )
{
struct get_file_info_request *req = get_req_buffer();
req->handle = hFile;
@@ -1885,7 +1885,7 @@
/***********************************************************************
* SetFileTime (KERNEL32.650)
*/
-BOOL WINAPI SetFileTime( HFILE hFile,
+BOOL WINAPI SetFileTime( HANDLE hFile,
const FILETIME *lpCreationTime,
const FILETIME *lpLastAccessTime,
const FILETIME *lpLastWriteTime )
@@ -1908,7 +1908,7 @@
/**************************************************************************
* LockFile (KERNEL32.511)
*/
-BOOL WINAPI LockFile( HFILE hFile, DWORD dwFileOffsetLow, DWORD dwFileOffsetHigh,
+BOOL WINAPI LockFile( HANDLE hFile, DWORD dwFileOffsetLow, DWORD dwFileOffsetHigh,
DWORD nNumberOfBytesToLockLow, DWORD nNumberOfBytesToLockHigh )
{
struct lock_file_request *req = get_req_buffer();
@@ -1955,7 +1955,7 @@
/**************************************************************************
* UnlockFile (KERNEL32.703)
*/
-BOOL WINAPI UnlockFile( HFILE hFile, DWORD dwFileOffsetLow, DWORD dwFileOffsetHigh,
+BOOL WINAPI UnlockFile( HANDLE hFile, DWORD dwFileOffsetLow, DWORD dwFileOffsetHigh,
DWORD nNumberOfBytesToUnlockLow, DWORD nNumberOfBytesToUnlockHigh )
{
struct unlock_file_request *req = get_req_buffer();
diff --git a/include/file.h b/include/file.h
index 10d786d..6e9ebc3 100644
--- a/include/file.h
+++ b/include/file.h
@@ -35,7 +35,7 @@
extern HFILE FILE_DupUnixHandle( int fd, DWORD access );
extern BOOL FILE_Stat( LPCSTR unixName, BY_HANDLE_FILE_INFORMATION *info );
extern HFILE16 FILE_Dup2( HFILE16 hFile1, HFILE16 hFile2 );
-extern HFILE FILE_CreateFile( LPCSTR filename, DWORD access, DWORD sharing,
+extern HANDLE FILE_CreateFile( LPCSTR filename, DWORD access, DWORD sharing,
LPSECURITY_ATTRIBUTES sa, DWORD creation,
DWORD attributes, HANDLE template );
extern HFILE FILE_CreateDevice( int client_id, DWORD access,
diff --git a/include/winbase.h b/include/winbase.h
index e07ef4a..af6677b 100644
--- a/include/winbase.h
+++ b/include/winbase.h
@@ -1171,9 +1171,9 @@
HANDLE WINAPI CreateEventA(LPSECURITY_ATTRIBUTES,BOOL,BOOL,LPCSTR);
HANDLE WINAPI CreateEventW(LPSECURITY_ATTRIBUTES,BOOL,BOOL,LPCWSTR);
#define CreateEvent WINELIB_NAME_AW(CreateEvent)
-HFILE WINAPI CreateFileA(LPCSTR,DWORD,DWORD,LPSECURITY_ATTRIBUTES,
+HANDLE WINAPI CreateFileA(LPCSTR,DWORD,DWORD,LPSECURITY_ATTRIBUTES,
DWORD,DWORD,HANDLE);
-HFILE WINAPI CreateFileW(LPCWSTR,DWORD,DWORD,LPSECURITY_ATTRIBUTES,
+HANDLE WINAPI CreateFileW(LPCWSTR,DWORD,DWORD,LPSECURITY_ATTRIBUTES,
DWORD,DWORD,HANDLE);
#define CreateFile WINELIB_NAME_AW(CreateFile)
HANDLE WINAPI CreateFileMappingA(HANDLE,LPSECURITY_ATTRIBUTES,DWORD,
@@ -1246,7 +1246,7 @@
HRSRC WINAPI FindResourceExW(HMODULE,LPCWSTR,LPCWSTR,WORD);
#define FindResourceEx WINELIB_NAME_AW(FindResourceEx)
BOOL WINAPI FlushConsoleInputBuffer(HANDLE);
-BOOL WINAPI FlushFileBuffers(HFILE);
+BOOL WINAPI FlushFileBuffers(HANDLE);
BOOL WINAPI FlushViewOfFile(LPCVOID, DWORD);
DWORD WINAPI FormatMessageA(DWORD,LPCVOID,DWORD,DWORD,LPSTR,
DWORD,LPDWORD);
@@ -1289,13 +1289,13 @@
BOOL WINAPI GetFileAttributesExA(LPCSTR,GET_FILEEX_INFO_LEVELS,LPVOID);
BOOL WINAPI GetFileAttributesExW(LPCWSTR,GET_FILEEX_INFO_LEVELS,LPVOID);
#define GetFileattributesEx WINELIB_NAME_AW(GetFileAttributesEx)
-DWORD WINAPI GetFileInformationByHandle(HFILE,BY_HANDLE_FILE_INFORMATION*);
+DWORD WINAPI GetFileInformationByHandle(HANDLE,BY_HANDLE_FILE_INFORMATION*);
BOOL WINAPI GetFileSecurityA(LPCSTR,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR,DWORD,LPDWORD);
BOOL WINAPI GetFileSecurityW(LPCWSTR,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR,DWORD,LPDWORD);
#define GetFileSecurity WINELIB_NAME_AW(GetFileSecurity)
-DWORD WINAPI GetFileSize(HFILE,LPDWORD);
-BOOL WINAPI GetFileTime(HFILE,LPFILETIME,LPFILETIME,LPFILETIME);
-DWORD WINAPI GetFileType(HFILE);
+DWORD WINAPI GetFileSize(HANDLE,LPDWORD);
+BOOL WINAPI GetFileTime(HANDLE,LPFILETIME,LPFILETIME,LPFILETIME);
+DWORD WINAPI GetFileType(HANDLE);
DWORD WINAPI GetFullPathNameA(LPCSTR,DWORD,LPSTR,LPSTR*);
DWORD WINAPI GetFullPathNameW(LPCWSTR,DWORD,LPWSTR,LPWSTR*);
#define GetFullPathName WINELIB_NAME_AW(GetFullPathName)
@@ -1369,7 +1369,7 @@
BOOL WINAPI IsProcessorFeaturePresent(DWORD);
BOOL WINAPI IsValidLocale(DWORD,DWORD);
BOOL WINAPI LocalFileTimeToFileTime(const FILETIME*,LPFILETIME);
-BOOL WINAPI LockFile(HFILE,DWORD,DWORD,DWORD,DWORD);
+BOOL WINAPI LockFile(HANDLE,DWORD,DWORD,DWORD,DWORD);
BOOL WINAPI LockFileEx(HANDLE, DWORD, DWORD, DWORD, DWORD, LPOVERLAPPED);
BOOL WINAPI LookupPrivilegeValueA(LPCSTR,LPCSTR,LPVOID);
BOOL WINAPI LookupPrivilegeValueW(LPCWSTR,LPCWSTR,LPVOID);
@@ -1458,21 +1458,21 @@
BOOL WINAPI SetConsoleTitleA(LPCSTR);
BOOL WINAPI SetConsoleTitleW(LPCWSTR);
#define SetConsoleTitle WINELIB_NAME_AW(SetConsoleTitle)
-BOOL WINAPI SetEndOfFile(HFILE);
+BOOL WINAPI SetEndOfFile(HANDLE);
BOOL WINAPI SetEnvironmentVariableA(LPCSTR,LPCSTR);
BOOL WINAPI SetEnvironmentVariableW(LPCWSTR,LPCWSTR);
#define SetEnvironmentVariable WINELIB_NAME_AW(SetEnvironmentVariable)
BOOL WINAPI SetEvent(HANDLE);
VOID WINAPI SetFileApisToANSI(void);
VOID WINAPI SetFileApisToOEM(void);
-DWORD WINAPI SetFilePointer(HFILE,LONG,LPLONG,DWORD);
+DWORD WINAPI SetFilePointer(HANDLE,LONG,LPLONG,DWORD);
BOOL WINAPI SetFileSecurityA(LPCSTR,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR);
BOOL WINAPI SetFileSecurityW(LPCWSTR,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR);
#define SetFileSecurity WINELIB_NAME_AW(SetFileSecurity)
-BOOL WINAPI SetFileTime(HFILE,const FILETIME*,const FILETIME*,const FILETIME*);
+BOOL WINAPI SetFileTime(HANDLE,const FILETIME*,const FILETIME*,const FILETIME*);
BOOL WINAPI SetHandleInformation(HANDLE,DWORD,DWORD);
-BOOL WINAPI SetLocalTime(const SYSTEMTIME*);
BOOL WINAPI SetPriorityClass(HANDLE,DWORD);
+BOOL WINAPI SetLocalTime(const SYSTEMTIME*);
BOOL WINAPI SetSecurityDescriptorDacl(PSECURITY_DESCRIPTOR,BOOL,PACL,BOOL);
BOOL WINAPI SetSecurityDescriptorGroup(PSECURITY_DESCRIPTOR,PSID,BOOL);
BOOL WINAPI SetSecurityDescriptorOwner(PSECURITY_DESCRIPTOR,PSID,BOOL);
@@ -1494,7 +1494,7 @@
LPVOID WINAPI TlsGetValue(DWORD);
BOOL WINAPI TlsSetValue(DWORD,LPVOID);
VOID WINAPI UnMapLS(SEGPTR);
-BOOL WINAPI UnlockFile(HFILE,DWORD,DWORD,DWORD,DWORD);
+BOOL WINAPI UnlockFile(HANDLE,DWORD,DWORD,DWORD,DWORD);
BOOL WINAPI UnmapViewOfFile(LPVOID);
LPVOID WINAPI VirtualAlloc(LPVOID,DWORD,DWORD,DWORD);
BOOL WINAPI VirtualFree(LPVOID,DWORD,DWORD);
@@ -1675,8 +1675,8 @@
HMODULE WINAPI LoadLibraryA(LPCSTR);
HMODULE WINAPI LoadLibraryW(LPCWSTR);
#define LoadLibrary WINELIB_NAME_AW(LoadLibrary)
-HMODULE WINAPI LoadLibraryExA(LPCSTR,HFILE,DWORD);
-HMODULE WINAPI LoadLibraryExW(LPCWSTR,HFILE,DWORD);
+HMODULE WINAPI LoadLibraryExA(LPCSTR,HANDLE,DWORD);
+HMODULE WINAPI LoadLibraryExW(LPCWSTR,HANDLE,DWORD);
#define LoadLibraryEx WINELIB_NAME_AW(LoadLibraryEx)
HINSTANCE16 WINAPI LoadModule16(LPCSTR,LPVOID);
HINSTANCE WINAPI LoadModule(LPCSTR,LPVOID);
diff --git a/loader/module.c b/loader/module.c
index 5508615..a833ab5 100644
--- a/loader/module.c
+++ b/loader/module.c
@@ -1357,7 +1357,7 @@
/***********************************************************************
* LoadLibraryExA (KERNEL32)
*/
-HMODULE WINAPI LoadLibraryExA(LPCSTR libname, HFILE hfile, DWORD flags)
+HMODULE WINAPI LoadLibraryExA(LPCSTR libname, HANDLE hfile, DWORD flags)
{
WINE_MODREF *wm;
@@ -1508,7 +1508,7 @@
/***********************************************************************
* LoadLibraryExW (KERNEL32)
*/
-HMODULE WINAPI LoadLibraryExW(LPCWSTR libnameW,HFILE hfile,DWORD flags)
+HMODULE WINAPI LoadLibraryExW(LPCWSTR libnameW,HANDLE hfile,DWORD flags)
{
LPSTR libnameA = HEAP_strdupWtoA( GetProcessHeap(), 0, libnameW );
HMODULE ret = LoadLibraryExA( libnameA , hfile, flags );
