ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-09-03 04:13:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

[NTVDM]

Browse Source 
- Fix a typo.
- Use a #define for the device flag.
- In r67526, the following change was committed but not described in the commit message:
- Enable opening devices in DosCreateFile and DosCreateFileEx.


svn path=/trunk/; revision=67527
This commit is contained in:
Aleksandar Andrejevic
2015-05-03 02:11:32 +00:00
parent a1e439008e
commit 3da5321a16
4 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.c
+12 -12
View File
@@ -62,7 +62,7 @@ BYTE DosFindWin32Descriptor(HANDLE Win32Handle)
for (i = 0; i < Sft->NumDescriptors; i++)
{
if ((Sft->FileDescriptors[i].RefCount > 0)
&& !(Sft->FileDescriptors[i].DeviceInfo & (1 << 7))
&& !(Sft->FileDescriptors[i].DeviceInfo & FILE_INFO_DEVICE)
&& (Sft->FileDescriptors[i].Win32Handle == Win32Handle))
{
return Count;
@@ -92,7 +92,7 @@ BYTE DosFindDeviceDescriptor(DWORD DevicePointer)
for (i = 0; i < Sft->NumDescriptors; i++)
{
if ((Sft->FileDescriptors[i].RefCount > 0)
&& (Sft->FileDescriptors[i].DeviceInfo & (1 << 7))
&& (Sft->FileDescriptors[i].DeviceInfo & FILE_INFO_DEVICE)
&& (Sft->FileDescriptors[i].DevicePointer == DevicePointer))
{
return Count;
@@ -369,7 +369,7 @@ WORD DosCreateFileEx(LPWORD Handle,
if (Node != NULL)
{
Descriptor->DevicePointer = Node->Driver;
Descriptor->DeviceInfo = Node->DeviceAttributes | (1 << 7);
Descriptor->DeviceInfo = Node->DeviceAttributes | FILE_INFO_DEVICE;
}
else
{
@@ -445,7 +445,7 @@ WORD DosCreateFile(LPWORD Handle,
if (Node != NULL)
{
Descriptor->DevicePointer = Node->Driver;
Descriptor->DeviceInfo = Node->DeviceAttributes | (1 << 7);
Descriptor->DeviceInfo = Node->DeviceAttributes | FILE_INFO_DEVICE;
}
else
{
@@ -593,7 +593,7 @@ WORD DosOpenFile(LPWORD Handle,
if (Node != NULL)
{
Descriptor->DevicePointer = Node->Driver;
Descriptor->DeviceInfo = Node->DeviceAttributes | (1 << 7);
Descriptor->DeviceInfo = Node->DeviceAttributes | FILE_INFO_DEVICE;
}
else
{
@@ -634,7 +634,7 @@ WORD DosReadFile(WORD FileHandle,
return ERROR_INVALID_HANDLE;
}
if (Descriptor->DeviceInfo & (1 << 7))
if (Descriptor->DeviceInfo & FILE_INFO_DEVICE)
{
PDOS_DEVICE_NODE Node = DosGetDriverNode(Descriptor->DevicePointer);
if (!Node->ReadRoutine) return ERROR_INVALID_FUNCTION;
@@ -689,7 +689,7 @@ WORD DosWriteFile(WORD FileHandle,
return ERROR_INVALID_HANDLE;
}
if (Descriptor->DeviceInfo & (1 << 7))
if (Descriptor->DeviceInfo & FILE_INFO_DEVICE)
{
PDOS_DEVICE_NODE Node = DosGetDriverNode(Descriptor->DevicePointer);
if (!Node->WriteRoutine) return ERROR_INVALID_FUNCTION;
@@ -749,7 +749,7 @@ WORD DosSeekFile(WORD FileHandle,
return ERROR_INVALID_HANDLE;
}
if (Descriptor->DeviceInfo & (1 << 7))
if (Descriptor->DeviceInfo & FILE_INFO_DEVICE)
{
/* For character devices, always return success */
return ERROR_SUCCESS;
@@ -797,7 +797,7 @@ BOOL DosFlushFileBuffers(WORD FileHandle)
return FALSE;
}
if (Descriptor->DeviceInfo & (1 << 7))
if (Descriptor->DeviceInfo & FILE_INFO_DEVICE)
{
PDOS_DEVICE_NODE Node = DosGetDriverNode(Descriptor->DevicePointer);
@@ -824,7 +824,7 @@ BOOLEAN DosLockFile(WORD DosHandle, DWORD Offset, DWORD Size)
}
/* Always succeed for character devices */
if (Descriptor->DeviceInfo & (1 << 7)) return TRUE;
if (Descriptor->DeviceInfo & FILE_INFO_DEVICE) return TRUE;
if (!LockFile(Descriptor->Win32Handle, Offset, 0, Size, 0))
{
@@ -847,7 +847,7 @@ BOOLEAN DosUnlockFile(WORD DosHandle, DWORD Offset, DWORD Size)
}
/* Always succeed for character devices */
if (Descriptor->DeviceInfo & (1 << 7)) return TRUE;
if (Descriptor->DeviceInfo & FILE_INFO_DEVICE) return TRUE;
if (!UnlockFile(Descriptor->Win32Handle, Offset, 0, Size, 0))
{
@@ -869,7 +869,7 @@ BOOLEAN DosDeviceIoControl(WORD FileHandle, BYTE ControlCode, DWORD Buffer, PWOR
return FALSE;
}
if (Descriptor->DeviceInfo & (1 << 7))
if (Descriptor->DeviceInfo & FILE_INFO_DEVICE)
{
Node = DosGetDriverNode(Descriptor->DevicePointer);
}
reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.h
+2
View File
@@ -8,6 +8,8 @@
/* DEFINES ********************************************************************/
#define FILE_INFO_DEVICE (1 << 7)
#pragma pack(push, 1)
typedef struct _DOS_FILE_DESCRIPTOR
reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/handle.c
+1 -1
View File
@@ -103,7 +103,7 @@ VOID DosCopyHandleTable(LPBYTE DestinationTable)
{
PDOS_DEVICE_NODE Node = DosGetDriverNode(SysVars->ActiveCon);
Descriptor->DeviceInfo = Node->DeviceAttributes | (1 << 7);
Descriptor->DeviceInfo = Node->DeviceAttributes | FILE_INFO_DEVICE;
Descriptor->DevicePointer = SysVars->ActiveCon;
/* Call the open routine */
reactos/subsystems/mvdm/ntvdm/emulator.c
+1 -1
View File
@@ -121,7 +121,7 @@ VOID EmulatorException(BYTE ExceptionNumber, LPWORD Stack)
Opcode = (PBYTE)SEG_OFF_TO_PTR(CodeSegment, InstructionPointer);
/* Display a message to the user */
DisplayMessage(L"Exception: %s occured at %04X:%04X\n"
DisplayMessage(L"Exception: %s occurred at %04X:%04X\n"
L"Opcode: %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X",
ExceptionName[ExceptionNumber],
CodeSegment,