From 62b6bef318c6c0ab5b4b285556342d703034a771 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Wed, 10 Mar 2004 02:20:40 +0000 Subject: [PATCH] Moved a number of 16-bit functions to file16.c. --- dlls/kernel/file16.c | 268 +++++++++++++++++++++++++++++++++++++----- dlls/kernel/profile.c | 119 ------------------- files/directory.c | 37 ------ files/drive.c | 41 ------- 4 files changed, 241 insertions(+), 224 deletions(-) diff --git a/dlls/kernel/file16.c b/dlls/kernel/file16.c index e6704e1b5bc..d13a0a0387d 100644 --- a/dlls/kernel/file16.c +++ b/dlls/kernel/file16.c @@ -45,23 +45,37 @@ WINE_DEFAULT_DEBUG_CHANNEL(file); + /*********************************************************************** - * _hread16 (KERNEL.349) + * GetProfileInt (KERNEL.57) */ -LONG WINAPI _hread16( HFILE16 hFile, LPVOID buffer, LONG count) +UINT16 WINAPI GetProfileInt16( LPCSTR section, LPCSTR entry, INT16 def_val ) { - return _lread( (HFILE)DosFileHandleToWin32Handle(hFile), buffer, count ); + return GetPrivateProfileInt16( section, entry, def_val, "win.ini" ); } /*********************************************************************** - * _hwrite (KERNEL.350) + * GetProfileString (KERNEL.58) */ -LONG WINAPI _hwrite16( HFILE16 hFile, LPCSTR buffer, LONG count ) +INT16 WINAPI GetProfileString16( LPCSTR section, LPCSTR entry, LPCSTR def_val, + LPSTR buffer, UINT16 len ) { - return _hwrite( (HFILE)DosFileHandleToWin32Handle(hFile), buffer, count ); + return GetPrivateProfileString16( section, entry, def_val, + buffer, len, "win.ini" ); } + +/*********************************************************************** + * WriteProfileString (KERNEL.59) + */ +BOOL16 WINAPI WriteProfileString16( LPCSTR section, LPCSTR entry, + LPCSTR string ) +{ + return WritePrivateProfileString16( section, entry, string, "win.ini" ); +} + + /*********************************************************************** * _lclose (KERNEL.81) */ @@ -151,23 +165,6 @@ UINT16 WINAPI WIN16_lread( HFILE16 hFile, SEGPTR buffer, UINT16 count ) } -/*********************************************************************** - * DeleteFile (KERNEL.146) - */ -BOOL16 WINAPI DeleteFile16( LPCSTR path ) -{ - return DeleteFileA( path ); -} - -/************************************************************************** - * GetFileAttributes (KERNEL.420) - */ -DWORD WINAPI GetFileAttributes16( LPCSTR name ) -{ - return GetFileAttributesA( name ); -} - - /*********************************************************************** * GetTempFileName (KERNEL.97) */ @@ -216,12 +213,114 @@ UINT16 WINAPI GetTempFileName16( BYTE drive, LPCSTR prefix, UINT16 unique, return ret; } -/************************************************************************** - * SetFileAttributes (KERNEL.421) + +/*********************************************************************** + * GetPrivateProfileInt (KERNEL.127) */ -BOOL16 WINAPI SetFileAttributes16( LPCSTR lpFileName, DWORD attributes ) +UINT16 WINAPI GetPrivateProfileInt16( LPCSTR section, LPCSTR entry, + INT16 def_val, LPCSTR filename ) { - return SetFileAttributesA( lpFileName, attributes ); + /* we used to have some elaborate return value limitation (<= -32768 etc.) + * here, but Win98SE doesn't care about this at all, so I deleted it. + * AFAIR versions prior to Win9x had these limits, though. */ + return (INT16)GetPrivateProfileIntA(section,entry,def_val,filename); +} + + +/*********************************************************************** + * WritePrivateProfileString (KERNEL.129) + */ +BOOL16 WINAPI WritePrivateProfileString16( LPCSTR section, LPCSTR entry, + LPCSTR string, LPCSTR filename ) +{ + return WritePrivateProfileStringA(section,entry,string,filename); +} + + +/*********************************************************************** + * GetWindowsDirectory (KERNEL.134) + */ +UINT16 WINAPI GetWindowsDirectory16( LPSTR path, UINT16 count ) +{ + return GetWindowsDirectoryA( path, count ); +} + + +/*********************************************************************** + * GetSystemDirectory (KERNEL.135) + */ +UINT16 WINAPI GetSystemDirectory16( LPSTR path, UINT16 count ) +{ + return GetSystemDirectoryA( path, count ); +} + + +/*********************************************************************** + * GetDriveType (KERNEL.136) + * This function returns the type of a drive in Win16. + * Note that it returns DRIVE_REMOTE for CD-ROMs, since MSCDEX uses the + * remote drive API. The return value DRIVE_REMOTE for CD-ROMs has been + * verified on Win 3.11 and Windows 95. Some programs rely on it, so don't + * do any pseudo-clever changes. + */ +UINT16 WINAPI GetDriveType16( UINT16 drive ) /* [in] number (NOT letter) of drive */ +{ + UINT type; + WCHAR root[3]; + + root[0] = 'A' + drive; + root[1] = ':'; + root[2] = 0; + type = GetDriveTypeW( root ); + if (type == DRIVE_CDROM) type = DRIVE_REMOTE; + return type; +} + + +/*********************************************************************** + * GetProfileSectionNames (KERNEL.142) + */ +WORD WINAPI GetProfileSectionNames16(LPSTR buffer, WORD size) + +{ + return GetPrivateProfileSectionNamesA(buffer,size,"win.ini"); +} + + +/*********************************************************************** + * GetPrivateProfileSectionNames (KERNEL.143) + */ +WORD WINAPI GetPrivateProfileSectionNames16( LPSTR buffer, WORD size, + LPCSTR filename ) +{ + return GetPrivateProfileSectionNamesA(buffer,size,filename); +} + + +/*********************************************************************** + * CreateDirectory (KERNEL.144) + */ +BOOL16 WINAPI CreateDirectory16( LPCSTR path, LPVOID dummy ) +{ + return CreateDirectoryA( path, NULL ); +} + + +/*********************************************************************** + * RemoveDirectory (KERNEL.145) + */ +BOOL16 WINAPI RemoveDirectory16( LPCSTR path ) +{ + return RemoveDirectoryA( path ); +} + + +/*********************************************************************** + * DeleteFile (KERNEL.146) + */ +BOOL16 WINAPI DeleteFile16( LPCSTR path ) +{ + return DeleteFileA( path ); } @@ -234,6 +333,53 @@ UINT16 WINAPI SetHandleCount16( UINT16 count ) } +/*********************************************************************** + * _hread16 (KERNEL.349) + */ +LONG WINAPI _hread16( HFILE16 hFile, LPVOID buffer, LONG count) +{ + return _lread( (HFILE)DosFileHandleToWin32Handle(hFile), buffer, count ); +} + + +/*********************************************************************** + * _hwrite (KERNEL.350) + */ +LONG WINAPI _hwrite16( HFILE16 hFile, LPCSTR buffer, LONG count ) +{ + return _hwrite( (HFILE)DosFileHandleToWin32Handle(hFile), buffer, count ); +} + + +/*********************************************************************** + * WritePrivateProfileStruct (KERNEL.406) + */ +BOOL16 WINAPI WritePrivateProfileStruct16 (LPCSTR section, LPCSTR key, + LPVOID buf, UINT16 bufsize, LPCSTR filename) +{ + return WritePrivateProfileStructA( section, key, buf, bufsize, filename ); +} + + +/*********************************************************************** + * GetPrivateProfileStruct (KERNEL.407) + */ +BOOL16 WINAPI GetPrivateProfileStruct16(LPCSTR section, LPCSTR key, + LPVOID buf, UINT16 len, LPCSTR filename) +{ + return GetPrivateProfileStructA( section, key, buf, len, filename ); +} + + +/*********************************************************************** + * SetCurrentDirectory (KERNEL.412) + */ +BOOL16 WINAPI SetCurrentDirectory16( LPCSTR dir ) +{ + return SetCurrentDirectoryA( dir ); +} + + /************************************************************************* * FindFirstFile (KERNEL.413) */ @@ -292,3 +438,71 @@ BOOL16 WINAPI FindClose16( HANDLE16 handle ) GlobalFree16( handle ); return TRUE; } + + +/*********************************************************************** + * WritePrivateProfileSection (KERNEL.416) + */ +BOOL16 WINAPI WritePrivateProfileSection16( LPCSTR section, + LPCSTR string, LPCSTR filename ) +{ + return WritePrivateProfileSectionA( section, string, filename ); +} + + +/*********************************************************************** + * WriteProfileSection (KERNEL.417) + */ +BOOL16 WINAPI WriteProfileSection16( LPCSTR section, LPCSTR keys_n_values) +{ + return WritePrivateProfileSection16( section, keys_n_values, "win.ini"); +} + + +/*********************************************************************** + * GetPrivateProfileSection (KERNEL.418) + */ +INT16 WINAPI GetPrivateProfileSection16( LPCSTR section, LPSTR buffer, + UINT16 len, LPCSTR filename ) +{ + return GetPrivateProfileSectionA( section, buffer, len, filename ); +} + + +/*********************************************************************** + * GetProfileSection (KERNEL.419) + */ +INT16 WINAPI GetProfileSection16( LPCSTR section, LPSTR buffer, UINT16 len ) +{ + return GetPrivateProfileSection16( section, buffer, len, "win.ini" ); +} + + +/************************************************************************** + * GetFileAttributes (KERNEL.420) + */ +DWORD WINAPI GetFileAttributes16( LPCSTR name ) +{ + return GetFileAttributesA( name ); +} + + +/************************************************************************** + * SetFileAttributes (KERNEL.421) + */ +BOOL16 WINAPI SetFileAttributes16( LPCSTR lpFileName, DWORD attributes ) +{ + return SetFileAttributesA( lpFileName, attributes ); +} + + +/*********************************************************************** + * GetDiskFreeSpace (KERNEL.422) + */ +BOOL16 WINAPI GetDiskFreeSpace16( LPCSTR root, LPDWORD cluster_sectors, + LPDWORD sector_bytes, LPDWORD free_clusters, + LPDWORD total_clusters ) +{ + return GetDiskFreeSpaceA( root, cluster_sectors, sector_bytes, + free_clusters, total_clusters ); +} diff --git a/dlls/kernel/profile.c b/dlls/kernel/profile.c index ca537465ab7..3795458c467 100644 --- a/dlls/kernel/profile.c +++ b/dlls/kernel/profile.c @@ -1020,14 +1020,6 @@ static BOOL PROFILE_SetString( LPCWSTR section_name, LPCWSTR key_name, /********************* API functions **********************************/ -/*********************************************************************** - * GetProfileInt (KERNEL.57) - */ -UINT16 WINAPI GetProfileInt16( LPCSTR section, LPCSTR entry, INT16 def_val ) -{ - return GetPrivateProfileInt16( section, entry, def_val, "win.ini" ); -} - /*********************************************************************** * GetProfileIntA (KERNEL32.@) @@ -1211,16 +1203,6 @@ INT WINAPI GetPrivateProfileStringW( LPCWSTR section, LPCWSTR entry, buffer, len, filename, TRUE ); } -/*********************************************************************** - * GetProfileString (KERNEL.58) - */ -INT16 WINAPI GetProfileString16( LPCSTR section, LPCSTR entry, LPCSTR def_val, - LPSTR buffer, UINT16 len ) -{ - return GetPrivateProfileString16( section, entry, def_val, - buffer, len, "win.ini" ); -} - /*********************************************************************** * GetProfileStringA (KERNEL32.@) */ @@ -1241,15 +1223,6 @@ INT WINAPI GetProfileStringW( LPCWSTR section, LPCWSTR entry, buffer, len, wininiW ); } -/*********************************************************************** - * WriteProfileString (KERNEL.59) - */ -BOOL16 WINAPI WriteProfileString16( LPCSTR section, LPCSTR entry, - LPCSTR string ) -{ - return WritePrivateProfileString16( section, entry, string, "win.ini" ); -} - /*********************************************************************** * WriteProfileStringA (KERNEL32.@) */ @@ -1269,18 +1242,6 @@ BOOL WINAPI WriteProfileStringW( LPCWSTR section, LPCWSTR entry, } -/*********************************************************************** - * GetPrivateProfileInt (KERNEL.127) - */ -UINT16 WINAPI GetPrivateProfileInt16( LPCSTR section, LPCSTR entry, - INT16 def_val, LPCSTR filename ) -{ - /* we used to have some elaborate return value limitation (<= -32768 etc.) - * here, but Win98SE doesn't care about this at all, so I deleted it. - * AFAIR versions prior to Win9x had these limits, though. */ - return (INT16)GetPrivateProfileIntA(section,entry,def_val,filename); -} - /*********************************************************************** * GetPrivateProfileIntW (KERNEL32.@) */ @@ -1335,15 +1296,6 @@ UINT WINAPI GetPrivateProfileIntA( LPCSTR section, LPCSTR entry, return res; } -/*********************************************************************** - * GetPrivateProfileSection (KERNEL.418) - */ -INT16 WINAPI GetPrivateProfileSection16( LPCSTR section, LPSTR buffer, - UINT16 len, LPCSTR filename ) -{ - return GetPrivateProfileSectionA( section, buffer, len, filename ); -} - /*********************************************************************** * GetPrivateProfileSectionW (KERNEL32.@) */ @@ -1405,14 +1357,6 @@ INT WINAPI GetPrivateProfileSectionA( LPCSTR section, LPSTR buffer, return ret; } -/*********************************************************************** - * GetProfileSection (KERNEL.419) - */ -INT16 WINAPI GetProfileSection16( LPCSTR section, LPSTR buffer, UINT16 len ) -{ - return GetPrivateProfileSection16( section, buffer, len, "win.ini" ); -} - /*********************************************************************** * GetProfileSectionA (KERNEL32.@) */ @@ -1430,15 +1374,6 @@ INT WINAPI GetProfileSectionW( LPCWSTR section, LPWSTR buffer, DWORD len ) } -/*********************************************************************** - * WritePrivateProfileString (KERNEL.129) - */ -BOOL16 WINAPI WritePrivateProfileString16( LPCSTR section, LPCSTR entry, - LPCSTR string, LPCSTR filename ) -{ - return WritePrivateProfileStringA(section,entry,string,filename); -} - /*********************************************************************** * WritePrivateProfileStringW (KERNEL32.@) */ @@ -1498,15 +1433,6 @@ BOOL WINAPI WritePrivateProfileStringA( LPCSTR section, LPCSTR entry, return ret; } -/*********************************************************************** - * WritePrivateProfileSection (KERNEL.416) - */ -BOOL16 WINAPI WritePrivateProfileSection16( LPCSTR section, - LPCSTR string, LPCSTR filename ) -{ - return WritePrivateProfileSectionA( section, string, filename ); -} - /*********************************************************************** * WritePrivateProfileSectionW (KERNEL32.@) */ @@ -1581,14 +1507,6 @@ BOOL WINAPI WritePrivateProfileSectionA( LPCSTR section, return ret; } -/*********************************************************************** - * WriteProfileSection (KERNEL.417) - */ -BOOL16 WINAPI WriteProfileSection16( LPCSTR section, LPCSTR keys_n_values) -{ - return WritePrivateProfileSection16( section, keys_n_values, "win.ini"); -} - /*********************************************************************** * WriteProfileSectionA (KERNEL32.@) */ @@ -1606,25 +1524,6 @@ BOOL WINAPI WriteProfileSectionW( LPCWSTR section, LPCWSTR keys_n_values) return WritePrivateProfileSectionW(section, keys_n_values, wininiW); } -/*********************************************************************** - * GetPrivateProfileSectionNames (KERNEL.143) - */ -WORD WINAPI GetPrivateProfileSectionNames16( LPSTR buffer, WORD size, - LPCSTR filename ) -{ - return GetPrivateProfileSectionNamesA(buffer,size,filename); -} - - -/*********************************************************************** - * GetProfileSectionNames (KERNEL.142) - */ -WORD WINAPI GetProfileSectionNames16(LPSTR buffer, WORD size) - -{ - return GetPrivateProfileSectionNamesA(buffer,size,"win.ini"); -} - /*********************************************************************** * GetPrivateProfileSectionNamesW (KERNEL32.@) @@ -1709,15 +1608,6 @@ DWORD WINAPI GetPrivateProfileSectionNamesA( LPSTR buffer, DWORD size, return ret; } -/*********************************************************************** - * GetPrivateProfileStruct (KERNEL.407) - */ -BOOL16 WINAPI GetPrivateProfileStruct16(LPCSTR section, LPCSTR key, - LPVOID buf, UINT16 len, LPCSTR filename) -{ - return GetPrivateProfileStructA( section, key, buf, len, filename ); -} - /*********************************************************************** * GetPrivateProfileStructW (KERNEL32.@) * @@ -1821,15 +1711,6 @@ BOOL WINAPI GetPrivateProfileStructA (LPCSTR section, LPCSTR key, -/*********************************************************************** - * WritePrivateProfileStruct (KERNEL.406) - */ -BOOL16 WINAPI WritePrivateProfileStruct16 (LPCSTR section, LPCSTR key, - LPVOID buf, UINT16 bufsize, LPCSTR filename) -{ - return WritePrivateProfileStructA( section, key, buf, bufsize, filename ); -} - /*********************************************************************** * WritePrivateProfileStructW (KERNEL32.@) */ diff --git a/files/directory.c b/files/directory.c index 7f9d1fab317..98ce9b274bf 100644 --- a/files/directory.c +++ b/files/directory.c @@ -369,15 +369,6 @@ UINT WINAPI GetTempDrive( BYTE ignored ) } -/*********************************************************************** - * GetWindowsDirectory (KERNEL.134) - */ -UINT16 WINAPI GetWindowsDirectory16( LPSTR path, UINT16 count ) -{ - return (UINT16)GetWindowsDirectoryA( path, count ); -} - - /*********************************************************************** * GetWindowsDirectoryW (KERNEL32.@) * @@ -434,15 +425,6 @@ UINT WINAPI GetSystemWindowsDirectoryW( LPWSTR path, UINT count ) } -/*********************************************************************** - * GetSystemDirectory (KERNEL.135) - */ -UINT16 WINAPI GetSystemDirectory16( LPSTR path, UINT16 count ) -{ - return (UINT16)GetSystemDirectoryA( path, count ); -} - - /*********************************************************************** * GetSystemDirectoryW (KERNEL32.@) * @@ -477,16 +459,6 @@ UINT WINAPI GetSystemDirectoryA( LPSTR path, UINT count ) } -/*********************************************************************** - * CreateDirectory (KERNEL.144) - */ -BOOL16 WINAPI CreateDirectory16( LPCSTR path, LPVOID dummy ) -{ - TRACE_(file)("(%s,%p)\n", path, dummy ); - return (BOOL16)CreateDirectoryA( path, NULL ); -} - - /*********************************************************************** * CreateDirectoryW (KERNEL32.@) * RETURNS: @@ -585,15 +557,6 @@ BOOL WINAPI CreateDirectoryExW( LPCWSTR template, LPCWSTR path, } -/*********************************************************************** - * RemoveDirectory (KERNEL.145) - */ -BOOL16 WINAPI RemoveDirectory16( LPCSTR path ) -{ - return (BOOL16)RemoveDirectoryA( path ); -} - - /*********************************************************************** * RemoveDirectoryW (KERNEL32.@) */ diff --git a/files/drive.c b/files/drive.c index 014d9f31248..ce43e43b189 100644 --- a/files/drive.c +++ b/files/drive.c @@ -786,18 +786,6 @@ WCHAR *DRIVE_BuildEnv(void) } -/*********************************************************************** - * GetDiskFreeSpace (KERNEL.422) - */ -BOOL16 WINAPI GetDiskFreeSpace16( LPCSTR root, LPDWORD cluster_sectors, - LPDWORD sector_bytes, LPDWORD free_clusters, - LPDWORD total_clusters ) -{ - return GetDiskFreeSpaceA( root, cluster_sectors, sector_bytes, - free_clusters, total_clusters ); -} - - /*********************************************************************** * GetDiskFreeSpaceW (KERNEL32.@) * @@ -1028,26 +1016,6 @@ BOOL WINAPI GetDiskFreeSpaceExA( LPCSTR root, PULARGE_INTEGER avail, return ret; } -/*********************************************************************** - * GetDriveType (KERNEL.136) - * This function returns the type of a drive in Win16. - * Note that it returns DRIVE_REMOTE for CD-ROMs, since MSCDEX uses the - * remote drive API. The return value DRIVE_REMOTE for CD-ROMs has been - * verified on Win 3.11 and Windows 95. Some programs rely on it, so don't - * do any pseudo-clever changes. - * - * RETURNS - * drivetype DRIVE_xxx - */ -UINT16 WINAPI GetDriveType16( UINT16 drive ) /* [in] number (NOT letter) of drive */ -{ - UINT type = DRIVE_GetType(drive); - TRACE("(%c:)\n", 'A' + drive ); - if (type == DRIVE_CDROM) type = DRIVE_REMOTE; - return type; -} - - /*********************************************************************** * GetDriveTypeW (KERNEL32.@) * @@ -1175,15 +1143,6 @@ UINT WINAPI GetCurrentDirectoryA( UINT buflen, LPSTR buf ) } -/*********************************************************************** - * SetCurrentDirectory (KERNEL.412) - */ -BOOL16 WINAPI SetCurrentDirectory16( LPCSTR dir ) -{ - return SetCurrentDirectoryA( dir ); -} - - /*********************************************************************** * SetCurrentDirectoryW (KERNEL32.@) */