ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removed some of the DOS device hacks (based on a patch by Eric 

Pouech).
This commit is contained in:
Alexandre Julliard 2004-02-24 01:15:12 +00:00
parent 0511d33522
commit 1a87dc42e2
5 changed files with 23 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dlls/kernel/kernel32.spec
View File

@ -1152,7 +1152,6 @@
################################################################ ################################################################
# Wine dll separation hacks, these will go away, don't use them # Wine dll separation hacks, these will go away, don't use them
# #
@ cdecl DOSFS_GetDeviceByHandle(long)
@ cdecl DOSMEM_AllocSelector(long) @ cdecl DOSMEM_AllocSelector(long)
@ cdecl DOSMEM_Available() @ cdecl DOSMEM_Available()
@ cdecl DOSMEM_FreeBlock(ptr) @ cdecl DOSMEM_FreeBlock(ptr)

4
files/directory.c
View File

@ -531,7 +531,7 @@ BOOL WINAPI CreateDirectoryW( LPCWSTR path,
TRACE_(file)("(%s,%p)\n", debugstr_w(path), lpsecattribs ); TRACE_(file)("(%s,%p)\n", debugstr_w(path), lpsecattribs );
if (DOSFS_GetDevice( path )) if (RtlIsDosDeviceName_U( path ))
{ {
TRACE_(file)("cannot use device %s!\n", debugstr_w(path)); TRACE_(file)("cannot use device %s!\n", debugstr_w(path));
SetLastError( ERROR_ACCESS_DENIED ); SetLastError( ERROR_ACCESS_DENIED );
@ -630,7 +630,7 @@ BOOL WINAPI RemoveDirectoryW( LPCWSTR path )
TRACE_(file)("%s\n", debugstr_w(path)); TRACE_(file)("%s\n", debugstr_w(path));
if (DOSFS_GetDevice( path )) if (RtlIsDosDeviceName_U( path ))
{ {
TRACE_(file)("cannot remove device %s!\n", debugstr_w(path)); TRACE_(file)("cannot remove device %s!\n", debugstr_w(path));
SetLastError( ERROR_FILE_NOT_FOUND ); SetLastError( ERROR_FILE_NOT_FOUND );

90
files/dos_fs.c
View File

@ -94,24 +94,27 @@ typedef struct
/* Chars we don't want to see in DOS file names */ /* Chars we don't want to see in DOS file names */
#define INVALID_DOS_CHARS "*?<>|\"+=,;[] \345" #define INVALID_DOS_CHARS "*?<>|\"+=,;[] \345"
/* DOS device descriptor */
typedef struct
{
const WCHAR name[5];
} DOS_DEVICE;
static const DOS_DEVICE DOSFS_Devices[] = static const DOS_DEVICE DOSFS_Devices[] =
/* name, device flags (see Int 21/AX=0x4400) */ /* name, device flags (see Int 21/AX=0x4400) */
{ {
{ {'C','O','N',0}, 0xc0d3 }, { {'C','O','N',0} },
{ {'P','R','N',0}, 0xa0c0 }, { {'P','R','N',0} },
{ {'N','U','L',0}, 0x80c4 }, { {'N','U','L',0} },
{ {'A','U','X',0}, 0x80c0 }, { {'A','U','X',0} },
{ {'L','P','T','1',0}, 0xa0c0 }, { {'L','P','T','1',0} },
{ {'L','P','T','2',0}, 0xa0c0 }, { {'L','P','T','2',0} },
{ {'L','P','T','3',0}, 0xa0c0 }, { {'L','P','T','3',0} },
{ {'L','P','T','4',0}, 0xc0d3 }, { {'L','P','T','4',0} },
{ {'C','O','M','1',0}, 0x80c0 }, { {'C','O','M','1',0} },
{ {'C','O','M','2',0}, 0x80c0 }, { {'C','O','M','2',0} },
{ {'C','O','M','3',0}, 0x80c0 }, { {'C','O','M','3',0} },
{ {'C','O','M','4',0}, 0x80c0 }, { {'C','O','M','4',0} }
{ {'S','C','S','I','M','G','R','$',0}, 0xc0c0 },
{ {'H','P','S','C','A','N',0}, 0xc0c0 },
{ {'E','M','M','X','X','X','X','0',0}, 0x0000 }
}; };
static const WCHAR devW[] = {'\\','D','e','v','i','c','e','\\',0}; static const WCHAR devW[] = {'\\','D','e','v','i','c','e','\\',0};
@ -804,54 +807,6 @@ BOOL DOSFS_FindUnixName( const DOS_FULL_NAME *path, LPCWSTR name, char *long_buf
} }
/***********************************************************************
* DOSFS_GetDevice
*
* Check if a DOS file name represents a DOS device and return the device.
*/
const DOS_DEVICE *DOSFS_GetDevice( LPCWSTR name )
{
unsigned int i;
const WCHAR *p;
if (!name) return NULL; /* if wine_server_handle_to_fd was used */
if (name[0] && (name[1] == ':')) name += 2;
if ((p = strrchrW( name, '/' ))) name = p + 1;
if ((p = strrchrW( name, '\\' ))) name = p + 1;
for (i = 0; i < sizeof(DOSFS_Devices)/sizeof(DOSFS_Devices[0]); i++)
{
const WCHAR *dev = DOSFS_Devices[i].name;
if (!strncmpiW( dev, name, strlenW(dev) ))
{
p = name + strlenW( dev );
if (!*p || (*p == '.') || (*p == ':')) return &DOSFS_Devices[i];
}
}
return NULL;
}
/***********************************************************************
* DOSFS_GetDeviceByHandle
*/
const DOS_DEVICE *DOSFS_GetDeviceByHandle( HANDLE hFile )
{
const DOS_DEVICE *ret = NULL;
SERVER_START_REQ( get_device_id )
{
req->handle = hFile;
if (!wine_server_call( req ))
{
if ((reply->id >= 0) &&
(reply->id < sizeof(DOSFS_Devices)/sizeof(DOSFS_Devices[0])))
ret = &DOSFS_Devices[reply->id];
}
}
SERVER_END_REQ;
return ret;
}
/************************************************************************** /**************************************************************************
* DOSFS_CreateCommPort * DOSFS_CreateCommPort
*/ */
@ -941,9 +896,6 @@ HANDLE DOSFS_OpenDevice( LPCWSTR name, DWORD access, DWORD attributes, LPSECURIT
if (!*p || (*p == '.') || (*p == ':')) { if (!*p || (*p == '.') || (*p == ':')) {
static const WCHAR nulW[] = {'N','U','L',0}; static const WCHAR nulW[] = {'N','U','L',0};
static const WCHAR conW[] = {'C','O','N',0}; static const WCHAR conW[] = {'C','O','N',0};
static const WCHAR scsimgrW[] = {'S','C','S','I','M','G','R','$',0};
static const WCHAR hpscanW[] = {'H','P','S','C','A','N',0};
static const WCHAR emmxxxx0W[] = {'E','M','M','X','X','X','X','0',0};
/* got it */ /* got it */
if (!strcmpiW(DOSFS_Devices[i].name, nulW)) if (!strcmpiW(DOSFS_Devices[i].name, nulW))
return FILE_CreateFile( "/dev/null", access, return FILE_CreateFile( "/dev/null", access,
@ -969,12 +921,6 @@ HANDLE DOSFS_OpenDevice( LPCWSTR name, DWORD access, DWORD attributes, LPSECURIT
handle = 0; handle = 0;
return handle; return handle;
} }
if (!strcmpiW(DOSFS_Devices[i].name, scsimgrW) ||
!strcmpiW(DOSFS_Devices[i].name, hpscanW) ||
!strcmpiW(DOSFS_Devices[i].name, emmxxxx0W))
{
return FILE_CreateDevice( i, access, sa );
}
if( (handle=DOSFS_CreateCommPort(DOSFS_Devices[i].name,access,attributes,sa)) ) if( (handle=DOSFS_CreateCommPort(DOSFS_Devices[i].name,access,attributes,sa)) )
return handle; return handle;

6
files/file.c
View File

@ -395,7 +395,7 @@ HANDLE WINAPI CreateFileW( LPCWSTR filename, DWORD access, DWORD sharing,
ret = FILE_CreateDevice( (toupperW(filename[4]) - 'A') | 0x20000, access, sa ); ret = FILE_CreateDevice( (toupperW(filename[4]) - 'A') | 0x20000, access, sa );
goto done; goto done;
} }
else if (!DOSFS_GetDevice( filename )) else if (!RtlIsDosDeviceName_U( filename ))
{ {
ret = VXD_Open( filename+4, access, sa ); ret = VXD_Open( filename+4, access, sa );
goto done; goto done;
@ -425,7 +425,7 @@ HANDLE WINAPI CreateFileW( LPCWSTR filename, DWORD access, DWORD sharing,
goto done; goto done;
} }
if (DOSFS_GetDevice( filename )) if (RtlIsDosDeviceName_U( filename ))
{ {
TRACE("opening device %s\n", debugstr_w(filename) ); TRACE("opening device %s\n", debugstr_w(filename) );
@ -1408,7 +1408,7 @@ BOOL WINAPI DeleteFileW( LPCWSTR path )
SetLastError(ERROR_PATH_NOT_FOUND); SetLastError(ERROR_PATH_NOT_FOUND);
return FALSE; return FALSE;
} }
if (DOSFS_GetDevice( path )) if (RtlIsDosDeviceName_U( path ))
{ {
WARN("cannot remove DOS device %s!\n", debugstr_w(path)); WARN("cannot remove DOS device %s!\n", debugstr_w(path));
SetLastError( ERROR_FILE_NOT_FOUND ); SetLastError( ERROR_FILE_NOT_FOUND );

10
include/file.h
View File

@ -45,14 +45,6 @@ typedef struct
#define IS_END_OF_NAME(ch) (!(ch) || ((ch) == '/') || ((ch) == '\\')) #define IS_END_OF_NAME(ch) (!(ch) || ((ch) == '/') || ((ch) == '\\'))
/* DOS device descriptor */
typedef struct
{
const WCHAR name[9];
int flags;
UINT codepage;
} DOS_DEVICE;
/* locale-independent case conversion */ /* locale-independent case conversion */
inline static char FILE_tolower( char c ) inline static char FILE_tolower( char c )
{ {
@ -89,8 +81,6 @@ extern DWORD DIR_SearchPath( LPCWSTR path, LPCWSTR name, LPCWSTR ext,
/* files/dos_fs.c */ /* files/dos_fs.c */
extern BOOL DOSFS_ToDosFCBFormat( LPCWSTR name, LPWSTR buffer ); extern BOOL DOSFS_ToDosFCBFormat( LPCWSTR name, LPWSTR buffer );
extern const DOS_DEVICE *DOSFS_GetDevice( LPCWSTR name );
extern const DOS_DEVICE *DOSFS_GetDeviceByHandle( HANDLE hFile );
extern HANDLE DOSFS_OpenDevice( LPCWSTR name, DWORD access, DWORD attributes, LPSECURITY_ATTRIBUTES sa); extern HANDLE DOSFS_OpenDevice( LPCWSTR name, DWORD access, DWORD attributes, LPSECURITY_ATTRIBUTES sa);
extern BOOL DOSFS_FindUnixName( const DOS_FULL_NAME *path, LPCWSTR name, char *long_buf, extern BOOL DOSFS_FindUnixName( const DOS_FULL_NAME *path, LPCWSTR name, char *long_buf,
INT long_len, LPWSTR short_buf, BOOL ignore_case ); INT long_len, LPWSTR short_buf, BOOL ignore_case );