Ros-diffs September 2015

ros-diffs@reactos.org

17 participants
535 discussions

[aandrejevic] 69420: [FAST486] - Don't forget to push the error code when the exception handler is a task gate. - Use SS0/ESP0, SS1/ESP1, or SS2/ESP2 for ring 0/1/2 code task CALLs.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Wed Sep 30 21:08:31 2015 New Revision: 69420 URL: http://svn.reactos.org/svn/reactos?rev=69420&view=rev Log: [FAST486] - Don't forget to push the error code when the exception handler is a task gate. - Use SS0/ESP0, SS1/ESP1, or SS2/ESP2 for ring 0/1/2 code task CALLs. Modified: trunk/reactos/lib/fast486/common.c Modified: trunk/reactos/lib/fast486/common.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/common.c?rev=6… ============================================================================== --- trunk/reactos/lib/fast486/common.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/common.c [iso-8859-1] Wed Sep 30 21:08:31 2015 @@ -313,7 +313,13 @@ if (IdtEntry->Type == FAST486_TASK_GATE_SIGNATURE) { /* Task call */ - return Fast486TaskSwitch(State, FAST486_TASK_CALL, IdtEntry->Selector); + if (!Fast486TaskSwitch(State, FAST486_TASK_CALL, IdtEntry->Selector)) + { + /* Exception occurred */ + return FALSE; + } + + goto Finish; } /* Check if the interrupt handler is more privileged or if we're in V86 mode */ @@ -428,7 +434,7 @@ } /* Clear NT */ - State->Flags.Nt = FALSE; + State->Flags.Nt = FALSE; if (OldVm) { @@ -496,6 +502,8 @@ /* Push the instruction pointer */ if (!Fast486StackPushInternal(State, GateSize, OldEip)) return FALSE; + +Finish: if (PushErrorCode) { @@ -908,15 +916,45 @@ State->GeneralRegs[FAST486_REG_ECX].Long = NewTss.Ecx; State->GeneralRegs[FAST486_REG_EDX].Long = NewTss.Edx; State->GeneralRegs[FAST486_REG_EBX].Long = NewTss.Ebx; - State->GeneralRegs[FAST486_REG_ESP].Long = NewTss.Esp; State->GeneralRegs[FAST486_REG_EBP].Long = NewTss.Ebp; State->GeneralRegs[FAST486_REG_ESI].Long = NewTss.Esi; State->GeneralRegs[FAST486_REG_EDI].Long = NewTss.Edi; NewEs = NewTss.Es; NewCs = NewTss.Cs; - NewSs = NewTss.Ss; NewDs = NewTss.Ds; NewLdtr = NewTss.Ldtr; + + if (Type == FAST486_TASK_CALL && State->Cpl < 3) + { + switch (State->Cpl) + { + case 0: + { + State->GeneralRegs[FAST486_REG_ESP].Long = NewTss.Esp0; + NewSs = NewTss.Ss0; + break; + } + + case 1: + { + State->GeneralRegs[FAST486_REG_ESP].Long = NewTss.Esp1; + NewSs = NewTss.Ss1; + break; + } + + case 2: + { + State->GeneralRegs[FAST486_REG_ESP].Long = NewTss.Esp2; + NewSs = NewTss.Ss2; + break; + } + } + } + else + { + State->GeneralRegs[FAST486_REG_ESP].Long = NewTss.Esp; + NewSs = NewTss.Ss; + } } else { @@ -926,15 +964,45 @@ State->GeneralRegs[FAST486_REG_ECX].LowWord = NewLegacyTss->Cx; State->GeneralRegs[FAST486_REG_EDX].LowWord = NewLegacyTss->Dx; State->GeneralRegs[FAST486_REG_EBX].LowWord = NewLegacyTss->Bx; - State->GeneralRegs[FAST486_REG_ESP].LowWord = NewLegacyTss->Sp; State->GeneralRegs[FAST486_REG_EBP].LowWord = NewLegacyTss->Bp; State->GeneralRegs[FAST486_REG_ESI].LowWord = NewLegacyTss->Si; State->GeneralRegs[FAST486_REG_EDI].LowWord = NewLegacyTss->Di; NewEs = NewLegacyTss->Es; NewCs = NewLegacyTss->Cs; - NewSs = NewLegacyTss->Ss; NewDs = NewLegacyTss->Ds; NewLdtr = NewLegacyTss->Ldtr; + + if (Type == FAST486_TASK_CALL && State->Cpl < 3) + { + switch (State->Cpl) + { + case 0: + { + State->GeneralRegs[FAST486_REG_ESP].Long = NewLegacyTss->Sp0; + NewSs = NewLegacyTss->Ss0; + break; + } + + case 1: + { + State->GeneralRegs[FAST486_REG_ESP].Long = NewLegacyTss->Sp1; + NewSs = NewLegacyTss->Ss1; + break; + } + + case 2: + { + State->GeneralRegs[FAST486_REG_ESP].Long = NewLegacyTss->Sp2; + NewSs = NewLegacyTss->Ss2; + break; + } + } + } + else + { + State->GeneralRegs[FAST486_REG_ESP].Long = NewLegacyTss->Sp; + NewSs = NewLegacyTss->Ss; + } } /* Set the NT flag if nesting */

9 years, 2 months

[gedmurphy] 69419: [DEVMGR] Add typedef for CStringAtlW. Fixes msvc build

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Wed Sep 30 19:55:52 2015 New Revision: 69419 URL: http://svn.reactos.org/svn/reactos?rev=69419&view=rev Log: [DEVMGR] Add typedef for CStringAtlW. Fixes msvc build Modified: trunk/reactos/lib/atl/atlstr.h Modified: trunk/reactos/lib/atl/atlstr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/atl/atlstr.h?rev=69419… ============================================================================== --- trunk/reactos/lib/atl/atlstr.h [iso-8859-1] (original) +++ trunk/reactos/lib/atl/atlstr.h [iso-8859-1] Wed Sep 30 19:55:52 2015 @@ -97,45 +97,26 @@ } }; -// -//template class <typename _BaseType = char, class StringIterator = ChTraitsOS<_BaseType>> -//class StrTraitATL : -// public StringIterator -//{ -//public: -// static HINSTANCE FindStringResourceInstance(_In_ UINT nID) throw() -// { -// return AtlFindStringResourceInstance(nID); -// } -// -// static IAtlStringMgr* GetDefaultManager() throw() -// { -// return CAtlStringMgr::GetInstance(); -// } -//}; -// -// -//template< typename _CharType = wchar_t> -//class ChTraitsOS : -// public ChTraitsBase<_CharType> -//{ -//protected: -// -//public: -// -//}; -// -//#ifndef _ATL_CSTRING_NO_CRT -// typedef CStringT<wchar_t, StrTraitATL<wchar_t, ChTraitsCRT<wchar_t>>> CAtlStringW; -//#else -// typedef CStringT<wchar_t, StrTraitATL<wchar_t>> CAtlStringW; -//#endif -// -//#ifndef _AFX -// typedef CAtlStringW CStringW; -//#endif + +template <typename _BaseType = char, class StringIterator = ChTraitsOS<_BaseType>> +class StrTraitATL : + public StringIterator +{ +public: + static HINSTANCE FindStringResourceInstance(_In_ UINT nID) throw() + { + return AtlFindStringResourceInstance(nID); + } + + static IAtlStringMgr* GetDefaultManager() throw() + { + return CAtlStringMgr::GetInstance(); + } +}; -} //namespace ATL +typedef CStringT<wchar_t, StrTraitATL<wchar_t, ChTraitsCRT<wchar_t>>> CAtlStringW; + +} #endif

9 years, 2 months

[pschweitzer] 69418: [CDROM] Properly implement support for IOCTL_DISK_GET_DRIVE_GEOMETRY, IOCTL_DISK_GET_DRIVE_GEOMETRY_EX, IOCTL_CDROM_GET_DRIVE_GEOMETRY_EX, IOCTL_DISK_GET_LENGTH_INFO in CdRomDe...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Wed Sep 30 16:29:07 2015 New Revision: 69418 URL: http://svn.reactos.org/svn/reactos?rev=69418&view=rev Log: [CDROM] Properly implement support for IOCTL_DISK_GET_DRIVE_GEOMETRY, IOCTL_DISK_GET_DRIVE_GEOMETRY_EX, IOCTL_CDROM_GET_DRIVE_GEOMETRY_EX, IOCTL_DISK_GET_LENGTH_INFO in CdRomDeviceControl CORE-10287 #resolve #comment Fixed with r69418 Modified: trunk/reactos/drivers/storage/class/cdrom/cdrom.c Modified: trunk/reactos/drivers/storage/class/cdrom/cdrom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/cdro… ============================================================================== --- trunk/reactos/drivers/storage/class/cdrom/cdrom.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/cdrom/cdrom.c [iso-8859-1] Wed Sep 30 16:29:07 2015 @@ -4727,12 +4727,48 @@ return STATUS_PENDING; } + case IOCTL_DISK_GET_DRIVE_GEOMETRY: case IOCTL_CDROM_GET_DRIVE_GEOMETRY: { DebugPrint((2,"CdRomDeviceControl: Get drive geometry\n")); if ( irpStack->Parameters.DeviceIoControl.OutputBufferLength < sizeof( DISK_GEOMETRY ) ) { + + status = STATUS_INFO_LENGTH_MISMATCH; + break; + } + + IoMarkIrpPending(Irp); + IoStartPacket(DeviceObject,Irp, NULL,NULL); + + return STATUS_PENDING; + } + + case IOCTL_DISK_GET_DRIVE_GEOMETRY_EX: + case IOCTL_CDROM_GET_DRIVE_GEOMETRY_EX: { + + DebugPrint((2,"CdRomDeviceControl: Get drive geometry ex\n")); + + if ( irpStack->Parameters.DeviceIoControl.OutputBufferLength < + sizeof( DISK_GEOMETRY_EX ) ) { + + status = STATUS_INFO_LENGTH_MISMATCH; + break; + } + + IoMarkIrpPending(Irp); + IoStartPacket(DeviceObject,Irp, NULL,NULL); + + return STATUS_PENDING; + } + + case IOCTL_DISK_GET_LENGTH_INFO: { + + DebugPrint((2,"CdRomDeviceControl: Get length info\n")); + + if ( irpStack->Parameters.DeviceIoControl.OutputBufferLength < + sizeof( GET_LENGTH_INFORMATION ) ) { status = STATUS_INFO_LENGTH_MISMATCH; break;

9 years, 2 months

[pschweitzer] 69417: [KMTESTS:IO] [KMTESTS:OB] Simplify kernel mode thread creation

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Tue Sep 29 18:43:35 2015 New Revision: 69417 URL: http://svn.reactos.org/svn/reactos?rev=69417&view=rev Log: [KMTESTS:IO] [KMTESTS:OB] Simplify kernel mode thread creation Modified: trunk/rostests/kmtests/ntos_io/IoCreateFile.c trunk/rostests/kmtests/ntos_ob/ObWait.c Modified: trunk/rostests/kmtests/ntos_io/IoCreateFile.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_io/IoCreateF… ============================================================================== --- trunk/rostests/kmtests/ntos_io/IoCreateFile.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_io/IoCreateFile.c [iso-8859-1] Tue Sep 29 18:43:35 2015 @@ -871,10 +871,7 @@ START_TEST(IoCreateFile) { - NTSTATUS Status; - OBJECT_ATTRIBUTES ObjectAttributes; - HANDLE ThreadHandle; - PVOID ThreadObject = NULL; + PKTHREAD ThreadHandle; TestSymlinks(); @@ -882,36 +879,6 @@ UserModeTest(); /* We've to be in kernel mode, so spawn a thread */ - InitializeObjectAttributes(&ObjectAttributes, - NULL, - OBJ_KERNEL_HANDLE, - NULL, - NULL); - Status = PsCreateSystemThread(&ThreadHandle, - SYNCHRONIZE, - &ObjectAttributes, - NULL, - NULL, - KernelModeTest, - NULL); - ok_eq_hex(Status, STATUS_SUCCESS); - if (Status == STATUS_SUCCESS) - { - /* Then, just wait on our thread to finish */ - Status = ObReferenceObjectByHandle(ThreadHandle, - SYNCHRONIZE, - *PsThreadType, - KernelMode, - &ThreadObject, - NULL); - ObCloseHandle(ThreadHandle, KernelMode); - - Status = KeWaitForSingleObject(ThreadObject, - Executive, - KernelMode, - FALSE, - NULL); - ok_eq_hex(Status, STATUS_SUCCESS); - ObDereferenceObject(ThreadObject); - } + ThreadHandle = KmtStartThread(KernelModeTest, NULL); + KmtFinishThread(ThreadHandle, NULL); } Modified: trunk/rostests/kmtests/ntos_ob/ObWait.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_ob/ObWait.c?… ============================================================================== --- trunk/rostests/kmtests/ntos_ob/ObWait.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_ob/ObWait.c [iso-8859-1] Tue Sep 29 18:43:35 2015 @@ -23,42 +23,9 @@ START_TEST(ZwWaitForMultipleObjects) { - NTSTATUS Status; - OBJECT_ATTRIBUTES ObjectAttributes; - HANDLE ThreadHandle; - PVOID ThreadObject = NULL; + PKTHREAD ThreadHandle; /* We've to be in kernel mode, so spawn a thread */ - InitializeObjectAttributes(&ObjectAttributes, - NULL, - OBJ_KERNEL_HANDLE, - NULL, - NULL); - Status = PsCreateSystemThread(&ThreadHandle, - SYNCHRONIZE, - &ObjectAttributes, - NULL, - NULL, - KernelModeTest, - NULL); - ok_eq_hex(Status, STATUS_SUCCESS); - if (Status == STATUS_SUCCESS) - { - /* Then, just wait on our thread to finish */ - Status = ObReferenceObjectByHandle(ThreadHandle, - SYNCHRONIZE, - *PsThreadType, - KernelMode, - &ThreadObject, - NULL); - ObCloseHandle(ThreadHandle, KernelMode); - - Status = KeWaitForSingleObject(ThreadObject, - Executive, - KernelMode, - FALSE, - NULL); - ok_eq_hex(Status, STATUS_SUCCESS); - ObDereferenceObject(ThreadObject); - } + ThreadHandle = KmtStartThread(KernelModeTest, NULL); + KmtFinishThread(ThreadHandle, NULL); }

9 years, 2 months

[sginsberg] 69416: Remove legacy _KeNumberProcessors hack. While we are at it fix its type (CCHAR not UCHAR) and remove it from the NDK as it is a public global provided by the DDK (where we proper...

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Tue Sep 29 18:34:33 2015 New Revision: 69416 URL: http://svn.reactos.org/svn/reactos?rev=69416&view=rev Log: Remove legacy _KeNumberProcessors hack. While we are at it fix its type (CCHAR not UCHAR) and remove it from the NDK as it is a public global provided by the DDK (where we properly define it with the "__CREATE_NTOS_DATA_IMPORT_ALIAS" fix when needed. Also, the variable KeActiveProcessors is not even exported from NTOS so move it to an internal header. Fix missed fix in UDFS as well in uncompiled file. Modified: trunk/reactos/drivers/filesystems/udfs/dldetect.cpp trunk/reactos/drivers/network/ndis/ndis/misc.c trunk/reactos/include/ndk/ketypes.h trunk/reactos/ntoskrnl/include/internal/ke.h trunk/reactos/ntoskrnl/include/ntoskrnl.h trunk/reactos/ntoskrnl/ke/amd64/kiinit.c trunk/reactos/ntoskrnl/ke/krnlinit.c trunk/reactos/ntoskrnl/ntoskrnl.spec Modified: trunk/reactos/drivers/filesystems/udfs/dldetect.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/d… ============================================================================== --- trunk/reactos/drivers/filesystems/udfs/dldetect.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/udfs/dldetect.cpp [iso-8859-1] Tue Sep 29 18:34:33 2015 @@ -50,7 +50,7 @@ /// Initialize deadlock detector VOID DLDInit(ULONG MaxThrdCount /// Maximum supported number of threads ) { - if (*KeNumberProcessors>1) { + if (KeNumberProcessors>1) { KdPrint(("Deadlock Detector is designed for uniprocessor machines only!\n")); BrutePoint(); } Modified: trunk/reactos/drivers/network/ndis/ndis/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/misc.c [iso-8859-1] Tue Sep 29 18:34:33 2015 @@ -324,7 +324,7 @@ NdisSystemProcessorCount( VOID) { - return (CCHAR)KeNumberProcessors; + return KeNumberProcessors; } Modified: trunk/reactos/include/ndk/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/ketypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/ketypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/ketypes.h [iso-8859-1] Tue Sep 29 18:34:33 2015 @@ -1480,17 +1480,6 @@ // // Exported Hardware Data // -extern KAFFINITY NTSYSAPI KeActiveProcessors; -#if (NTDDI_VERSION >= NTDDI_LONGHORN) -extern volatile CCHAR NTSYSAPI KeNumberProcessors; -#else -#if (NTDDI_VERSION >= NTDDI_WINXP) -extern CCHAR NTSYSAPI KeNumberProcessors; -#else -//extern PCCHAR KeNumberProcessors; -extern NTSYSAPI CCHAR KeNumberProcessors; //FIXME: Note to Alex: I won't fix this atm, since I prefer to discuss this with you first. -#endif -#endif extern ULONG NTSYSAPI KiDmaIoCoherency; extern ULONG NTSYSAPI KeMaximumIncrement; extern ULONG NTSYSAPI KeMinimumIncrement; Modified: trunk/reactos/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] Tue Sep 29 18:34:33 2015 @@ -78,6 +78,7 @@ IN ULONG Length ); +extern KAFFINITY KeActiveProcessors; extern PKNMI_HANDLER_CALLBACK KiNmiCallbackListHead; extern KSPIN_LOCK KiNmiCallbackListLock; extern PVOID KeUserApcDispatcher; Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/ntoskrnl.… ============================================================================== --- trunk/reactos/ntoskrnl/include/ntoskrnl.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/ntoskrnl.h [iso-8859-1] Tue Sep 29 18:34:33 2015 @@ -88,11 +88,6 @@ /* PNP GUIDs */ #include <umpnpmgr/sysguid.h> -// -// Define the internal versions of external and public global data -// -#define KeNumberProcessors _KeNumberProcessors -extern UCHAR _KeNumberProcessors; #define ExRaiseStatus RtlRaiseStatus // Modified: trunk/reactos/ntoskrnl/ke/amd64/kiinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/amd64/kiinit.c… ============================================================================== --- trunk/reactos/ntoskrnl/ke/amd64/kiinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/amd64/kiinit.c [iso-8859-1] Tue Sep 29 18:34:33 2015 @@ -385,7 +385,7 @@ KeLoaderBlock = LoaderBlock; /* Get the current CPU number */ - Cpu = (CCHAR)KeNumberProcessors++; // FIXME + Cpu = KeNumberProcessors++; // FIXME /* LoaderBlock initialization for Cpu 0 */ if (Cpu == 0) Modified: trunk/reactos/ntoskrnl/ke/krnlinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/krnlinit.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/krnlinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/krnlinit.c [iso-8859-1] Tue Sep 29 18:34:33 2015 @@ -32,7 +32,7 @@ PKPRCB KiProcessorBlock[MAXIMUM_PROCESSORS]; /* Number of processors */ -UCHAR KeNumberProcessors = 0; +CCHAR KeNumberProcessors = 0; /* NUMA Node Support */ KNODE KiNode0; Modified: trunk/reactos/ntoskrnl/ntoskrnl.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.spec?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.spec [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.spec [iso-8859-1] Tue Sep 29 18:34:33 2015 @@ -631,7 +631,7 @@ @ stdcall KeLeaveGuardedRegion() _KeLeaveGuardedRegion @ extern KeLoaderBlock @ cdecl -arch=x86_64 -private KeLowerIrql(long) -@ extern KeNumberProcessors _KeNumberProcessors +@ extern KeNumberProcessors @ stdcall -arch=i386,arm KeProfileInterrupt(ptr) @ stdcall KeProfileInterruptWithSource(ptr long) @ stdcall KePulseEvent(ptr long long)

9 years, 2 months

[pschweitzer] 69415: [MOUNTMGR] Remove last hack

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Tue Sep 29 18:22:38 2015 New Revision: 69415 URL: http://svn.reactos.org/svn/reactos?rev=69415&view=rev Log: [MOUNTMGR] Remove last hack Modified: trunk/reactos/drivers/filters/mountmgr/database.c trunk/reactos/drivers/filters/mountmgr/mntmgr.h Modified: trunk/reactos/drivers/filters/mountmgr/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filters/mountmgr/d… ============================================================================== --- trunk/reactos/drivers/filters/mountmgr/database.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filters/mountmgr/database.c [iso-8859-1] Tue Sep 29 18:22:38 2015 @@ -1714,7 +1714,7 @@ Status = IoCreateFile(&Database, SYNCHRONIZE | READ_CONTROL | FILE_WRITE_ATTRIBUTES | - FILE_READ_ATTRIBUTES | FILE_WRITE_PROPERTIES | FILE_READ_PROPERTIES | + FILE_READ_ATTRIBUTES | FILE_WRITE_EA | FILE_READ_EA | FILE_APPEND_DATA | FILE_WRITE_DATA | FILE_READ_DATA, &ObjectAttributes, &IoStatusBlock, @@ -1852,7 +1852,7 @@ Status = IoCreateFile(&Database, SYNCHRONIZE | READ_CONTROL | FILE_WRITE_ATTRIBUTES | - FILE_READ_ATTRIBUTES | FILE_WRITE_PROPERTIES | FILE_READ_PROPERTIES | + FILE_READ_ATTRIBUTES | FILE_WRITE_EA | FILE_READ_EA | FILE_APPEND_DATA | FILE_WRITE_DATA | FILE_READ_DATA, &ObjectAttributes, &IoStatusBlock, Modified: trunk/reactos/drivers/filters/mountmgr/mntmgr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filters/mountmgr/m… ============================================================================== --- trunk/reactos/drivers/filters/mountmgr/mntmgr.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filters/mountmgr/mntmgr.h [iso-8859-1] Tue Sep 29 18:22:38 2015 @@ -14,11 +14,6 @@ #else #define INIT_SECTION /* Done via alloc_text for MSC */ #endif - -/* Enter FIXME */ -#define FILE_READ_PROPERTIES 0x00000008 -#define FILE_WRITE_PROPERTIES 0x00000010 -/* Leave FIXME */ typedef struct _DEVICE_EXTENSION {

9 years, 2 months

[pschweitzer] 69414: [MOUNTMGR] Get rid of a hack, thanks to r69413

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Tue Sep 29 17:30:54 2015 New Revision: 69414 URL: http://svn.reactos.org/svn/reactos?rev=69414&view=rev Log: [MOUNTMGR] Get rid of a hack, thanks to r69413 Modified: trunk/reactos/drivers/filters/mountmgr/CMakeLists.txt trunk/reactos/drivers/filters/mountmgr/mntmgr.h Modified: trunk/reactos/drivers/filters/mountmgr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filters/mountmgr/C… ============================================================================== --- trunk/reactos/drivers/filters/mountmgr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/filters/mountmgr/CMakeLists.txt [iso-8859-1] Tue Sep 29 17:30:54 2015 @@ -10,7 +10,7 @@ mntmgr.h) add_library(mountmgr SHARED ${SOURCE} mountmgr.rc) -target_link_libraries(mountmgr wdmguid ioevent) +target_link_libraries(mountmgr wdmguid ioevent memcmp) set_module_type(mountmgr kernelmodedriver) add_importlibs(mountmgr ntoskrnl hal) add_pch(mountmgr mntmgr.h SOURCE) Modified: trunk/reactos/drivers/filters/mountmgr/mntmgr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filters/mountmgr/m… ============================================================================== --- trunk/reactos/drivers/filters/mountmgr/mntmgr.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filters/mountmgr/mntmgr.h [iso-8859-1] Tue Sep 29 17:30:54 2015 @@ -16,12 +16,6 @@ #endif /* Enter FIXME */ -#ifdef IsEqualGUID -#undef IsEqualGUID -#endif - -#define IsEqualGUID(rguid1, rguid2) (RtlCompareMemory(rguid1, rguid2, sizeof(GUID)) == sizeof(GUID)) - #define FILE_READ_PROPERTIES 0x00000008 #define FILE_WRITE_PROPERTIES 0x00000010 /* Leave FIXME */

9 years, 2 months

[tfaber] 69413: [CRT] - Add "memcmp" library that is used by kernel drivers to get memcmp/RtlEqualMemory CORE-10285 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Tue Sep 29 17:24:48 2015 New Revision: 69413 URL: http://svn.reactos.org/svn/reactos?rev=69413&view=rev Log: [CRT] - Add "memcmp" library that is used by kernel drivers to get memcmp/RtlEqualMemory CORE-10285 #resolve Modified: trunk/reactos/lib/sdk/crt/CMakeLists.txt trunk/rostests/kmtests/CMakeLists.txt trunk/rostests/kmtests/rtl/RtlMemory.c Modified: trunk/reactos/lib/sdk/crt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/CMakeLists.txt… ============================================================================== --- trunk/reactos/lib/sdk/crt/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/CMakeLists.txt [iso-8859-1] Tue Sep 29 17:24:48 2015 @@ -49,6 +49,9 @@ add_dependencies(user32_wsprintf psdk) add_target_compile_definitions(user32_wsprintf _USER32_WSPRINTF) +add_library(memcmp mem/memcmp.c) +add_dependencies(memcmp psdk) + add_library(getopt misc/getopt.c) add_target_compile_definitions(getopt _DLL __USE_CRTIMP) add_dependencies(getopt psdk) Modified: trunk/rostests/kmtests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/CMakeLists.txt?re… ============================================================================== --- trunk/rostests/kmtests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/kmtests/CMakeLists.txt [iso-8859-1] Tue Sep 29 17:24:48 2015 @@ -85,7 +85,7 @@ add_library(kmtest_drv SHARED ${KMTEST_DRV_SOURCE}) set_module_type(kmtest_drv kernelmodedriver) -target_link_libraries(kmtest_drv kmtest_printf chkstk ${PSEH_LIB}) +target_link_libraries(kmtest_drv kmtest_printf chkstk memcmp ${PSEH_LIB}) add_importlibs(kmtest_drv ntoskrnl hal) add_dependencies(kmtest_drv bugcodes xdk) add_target_compile_definitions(kmtest_drv KMT_KERNEL_MODE NTDDI_VERSION=NTDDI_WS03SP1) Modified: trunk/rostests/kmtests/rtl/RtlMemory.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/rtl/RtlMemory.c?r… ============================================================================== --- trunk/rostests/kmtests/rtl/RtlMemory.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/rtl/RtlMemory.c [iso-8859-1] Tue Sep 29 17:24:48 2015 @@ -287,7 +287,19 @@ KeRaiseIrql(HIGH_LEVEL, &Irql); /* RtlEqualMemory */ - /* TODO: where is memcmp? */ + MakePattern(Buffer, 8, HalfSize / 8 - 1, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xF0, + 1, 1, 0x12, + 8, HalfSize / 8, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xF0, + 1, 7, 0x12, 0); + + ok_bool_true(RtlEqualMemory((PVOID)1, (PVOID)2, 0), + "RtlEqualMemory returned"); + ok_bool_true(RtlEqualMemory(Buffer, Buffer + HalfSize - 7, HalfSize - 8), + "RtlEqualMemory returned"); + ok_bool_true(RtlEqualMemory(Buffer, Buffer + HalfSize - 7, HalfSize - 8 + 1), + "RtlEqualMemory returned"); + ok_bool_false(RtlEqualMemory(Buffer, Buffer + HalfSize - 7, HalfSize - 8 + 2), + "RtlEqualMemory returned"); /* RtlCompareMemory */ MakePattern(Buffer, 8, HalfSize / 8 - 1, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xF0,

9 years, 2 months

[pschweitzer] 69412: [NTOSKRNL] Don't bugcheck on unimplemented FsRtlOplockFsctrl(), FsRtlCurrentBatchOplock(), FsRtlCheckOplock() Properly implement FsRtlInitializeOplock() (which is no-op on Wind...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Tue Sep 29 16:28:59 2015 New Revision: 69412 URL: http://svn.reactos.org/svn/reactos?rev=69412&view=rev Log: [NTOSKRNL] Don't bugcheck on unimplemented FsRtlOplockFsctrl(), FsRtlCurrentBatchOplock(), FsRtlCheckOplock() Properly implement FsRtlInitializeOplock() (which is no-op on Windows 2k3) CORE-10284 #resolve #comment Resolved with r69412 Modified: trunk/reactos/ntoskrnl/fsrtl/oplock.c Modified: trunk/reactos/ntoskrnl/fsrtl/oplock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/oplock.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/oplock.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/oplock.c [iso-8859-1] Tue Sep 29 16:28:59 2015 @@ -49,7 +49,7 @@ IN POPLOCK_FS_PREPOST_IRP PostIrpRoutine OPTIONAL) { /* Unimplemented */ - KeBugCheck(FILE_SYSTEM); + UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; } @@ -72,13 +72,13 @@ FsRtlCurrentBatchOplock(IN POPLOCK Oplock) { /* Unimplemented */ - KeBugCheck(FILE_SYSTEM); + UNIMPLEMENTED; return FALSE; } /*++ * @name FsRtlInitializeOplock - * @unimplemented + * @implemented * * FILLME * @@ -94,7 +94,7 @@ NTAPI FsRtlInitializeOplock(IN OUT POPLOCK Oplock) { - UNIMPLEMENTED; + PAGED_CODE(); } /*++ @@ -124,7 +124,7 @@ IN ULONG OpenCount) { /* Unimplemented */ - KeBugCheck(FILE_SYSTEM); + UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; }

9 years, 2 months

[hbelusca] 69411: [NTVDM] - Add floppy image automount support from the registry, as it was done for HDDs in r69390 (it's really copy-paste & adaptation of the existing code). - Increase HDD number...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Sep 28 22:15:06 2015 New Revision: 69411 URL: http://svn.reactos.org/svn/reactos?rev=69411&view=rev Log: [NTVDM] - Add floppy image automount support from the registry, as it was done for HDDs in r69390 (it's really copy-paste & adaptation of the existing code). - Increase HDD number support from 1 to 4 (maximum) for INT 13h. Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/dskbios32.c trunk/reactos/subsystems/mvdm/ntvdm/emulator.c trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.c trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.h Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/dskbios32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/dskbios32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/dskbios32.c [iso-8859-1] Mon Sep 28 22:15:06 2015 @@ -32,7 +32,7 @@ // they will be arrays of objects containing disk information needed by // the BIOS only. static PDISK_IMAGE FloppyDrive[2] = {NULL}; -static PDISK_IMAGE HardDrive[1] = {NULL}; +static PDISK_IMAGE HardDrive[4] = {NULL}; #pragma pack(push, 1) @@ -689,6 +689,9 @@ FloppyDrive[0] = RetrieveDisk(FLOPPY_DISK, 0); FloppyDrive[1] = RetrieveDisk(FLOPPY_DISK, 1); HardDrive[0] = RetrieveDisk(HARD_DISK, 0); + HardDrive[1] = RetrieveDisk(HARD_DISK, 1); + HardDrive[2] = RetrieveDisk(HARD_DISK, 2); + HardDrive[3] = RetrieveDisk(HARD_DISK, 3); return TRUE; } Modified: trunk/reactos/subsystems/mvdm/ntvdm/emulator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/emul… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/emulator.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/emulator.c [iso-8859-1] Mon Sep 28 22:15:06 2015 @@ -553,6 +553,17 @@ return FALSE; } + /* Mount the available floppy disks */ + for (i = 0; i < ARRAYSIZE(GlobalSettings.FloppyDisks); ++i) + { + if (GlobalSettings.FloppyDisks[i].Length != 0 && + GlobalSettings.FloppyDisks[i].Buffer && + GlobalSettings.FloppyDisks[i].Buffer != '\0') + { + MountDisk(FLOPPY_DISK, i, GlobalSettings.FloppyDisks[i].Buffer, FALSE); + } + } + /* Mount the available hard disks */ for (i = 0; i < ARRAYSIZE(GlobalSettings.HardDisks); ++i) { Modified: trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/ntvd… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.c [iso-8859-1] Mon Sep 28 22:15:06 2015 @@ -335,6 +335,43 @@ static NTSTATUS NTAPI +NtVdmConfigureFloppy(IN PWSTR ValueName, + IN ULONG ValueType, + IN PVOID ValueData, + IN ULONG ValueLength, + IN PVOID Context, + IN PVOID EntryContext) +{ + PNTVDM_SETTINGS Settings = (PNTVDM_SETTINGS)Context; + UNICODE_STRING ValueString; + ULONG DiskNumber = (ULONG)EntryContext; + + ASSERT(DiskNumber < ARRAYSIZE(Settings->FloppyDisks)); + + /* Check whether the Hard Disk entry was not already configured */ + if (Settings->FloppyDisks[DiskNumber].Buffer != NULL) + { + DPRINT1("Floppy Disk %d -- '%Z' already configured\n", DiskNumber, &Settings->FloppyDisks[DiskNumber]); + return STATUS_SUCCESS; + } + + /* Check for the type of the value */ + if (ValueType != REG_SZ) + { + RtlInitEmptyAnsiString(&Settings->FloppyDisks[DiskNumber], NULL, 0); + return STATUS_SUCCESS; + } + + /* Convert the UNICODE string to ANSI and store it */ + RtlInitEmptyUnicodeString(&ValueString, (PWCHAR)ValueData, ValueLength); + ValueString.Length = ValueString.MaximumLength; + RtlUnicodeStringToAnsiString(&Settings->FloppyDisks[DiskNumber], &ValueString, TRUE); + + return STATUS_SUCCESS; +} + +static NTSTATUS +NTAPI NtVdmConfigureHDD(IN PWSTR ValueName, IN ULONG ValueType, IN PVOID ValueData, @@ -388,6 +425,26 @@ RTL_QUERY_REGISTRY_NOEXPAND, L"RomFiles", NULL, + REG_NONE, + NULL, + 0 + }, + + { + NtVdmConfigureFloppy, + 0, + L"FloppyDisk0", + (PVOID)0, + REG_NONE, + NULL, + 0 + }, + + { + NtVdmConfigureFloppy, + 0, + L"FloppyDisk1", + (PVOID)1, REG_NONE, NULL, 0 @@ -480,6 +537,12 @@ if (Settings->RomFiles.Buffer) RtlFreeAnsiString(&Settings->RomFiles); + for (i = 0; i < ARRAYSIZE(Settings->FloppyDisks); ++i) + { + if (Settings->FloppyDisks[i].Buffer) + RtlFreeAnsiString(&Settings->FloppyDisks[i]); + } + for (i = 0; i < ARRAYSIZE(Settings->HardDisks); ++i) { if (Settings->HardDisks[i].Buffer) Modified: trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/ntvd… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.h [iso-8859-1] Mon Sep 28 22:15:06 2015 @@ -76,6 +76,7 @@ { ANSI_STRING BiosFileName; ANSI_STRING RomFiles; + ANSI_STRING FloppyDisks[2]; ANSI_STRING HardDisks[4]; } NTVDM_SETTINGS, *PNTVDM_SETTINGS;

9 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2015