Changeset 21388

Timestamp:

Jul 13, 2010, 12:46:59 AM (15 years ago)

Author:

dmik

Message:

Make CreateFile() return HANDLE rather than HFILE to match the current Win32 API behavior.

Location:

trunk

Files:

• include/win/winbase.h (modified) (1 diff)
• src/kernel32/Fileio.cpp (modified) (2 diffs)

trunk/include/win/winbase.h

@@ -1516 +1516 @@
 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)

trunk/src/kernel32/Fileio.cpp

@@ -187 +187 @@
 //******************************************************************************
 //******************************************************************************
-HFILE WIN32API CreateFileA(LPCSTR lpszName, DWORD fdwAccess, DWORD fdwShareMode,
-                           LPSECURITY_ATTRIBUTES lpsa, DWORD fdwCreate,
-                           DWORD  fdwAttrsAndFlags, HANDLE hTemplateFile)
+HANDLE WIN32API CreateFileA(LPCSTR lpszName, DWORD fdwAccess, DWORD fdwShareMode,
+                            LPSECURITY_ATTRIBUTES lpsa, DWORD fdwCreate,
+                            DWORD  fdwAttrsAndFlags, HANDLE hTemplateFile)
 {
   dprintf(("CreateFileA %s", lpszName));
@@ -203 +203 @@
 //******************************************************************************
 //******************************************************************************
-HFILE WIN32API CreateFileW(LPCWSTR lpszName, DWORD fdwAccess, DWORD fdwShareMode,
-                           LPSECURITY_ATTRIBUTES lpsa, DWORD fdwCreate,
-                           DWORD fdwAttrsAndFlags, HANDLE hTemplateFile)
+HANDLE WIN32API CreateFileW(LPCWSTR lpszName, DWORD fdwAccess, DWORD fdwShareMode,
+                            LPSECURITY_ATTRIBUTES lpsa, DWORD fdwCreate,
+                            DWORD fdwAttrsAndFlags, HANDLE hTemplateFile)
 {
   HANDLE rc;