Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ion] 60059: [NTOSKRNL]: Implement ThreadIsTermination info class in NtQueryInformationThread. [CSRSRV]: CsrInsertThread should call this API to make sure the thread isn't dead already. Update the ...
by ion＠svn.reactos.org 12 Sep '13

12 Sep '13

Author: ion Date: Thu Sep 12 09:02:48 2013 New Revision: 60059 URL: http://svn.reactos.org/svn/reactos?rev=60059&view=rev Log: [NTOSKRNL]: Implement ThreadIsTermination info class in NtQueryInformationThread. [CSRSRV]: CsrInsertThread should call this API to make sure the thread isn't dead already. Update the callers to handle this possible failure. This behavior was obeserved in Windows' CSRSRV.DLL. It now works in ReactOS as well. Modified: trunk/reactos/ntoskrnl/ps/query.c trunk/reactos/subsystems/win32/csrsrv/api.h trunk/reactos/subsystems/win32/csrsrv/procsup.c trunk/reactos/subsystems/win32/csrsrv/session.c trunk/reactos/subsystems/win32/csrsrv/thredsup.c Modified: trunk/reactos/ntoskrnl/ps/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/query.c?rev=60… ============================================================================== --- trunk/reactos/ntoskrnl/ps/query.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/query.c [iso-8859-1] Thu Sep 12 09:02:48 2013 @@ -2412,6 +2412,7 @@ (PTHREAD_BASIC_INFORMATION)ThreadInformation; PKERNEL_USER_TIMES ThreadTime = (PKERNEL_USER_TIMES)ThreadInformation; KIRQL OldIrql; + ULONG ThreadTerminated; PAGED_CODE(); /* Check if we were called from user mode */ @@ -2659,6 +2660,31 @@ Status = _SEH2_GetExceptionCode(); } _SEH2_END; + break; + + case ThreadIsTerminated: + + /* Set the return length*/ + Length = sizeof(ThreadTerminated); + + if (ThreadInformationLength != Length) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + break; + } + + ThreadTerminated = PsIsThreadTerminating(Thread); + + _SEH2_TRY + { + *(PULONG)ThreadInformation = ThreadTerminated ? 1 : 0; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + break; /* Anything else */ Modified: trunk/reactos/subsystems/win32/csrsrv/api.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrsrv/ap… ============================================================================== --- trunk/reactos/subsystems/win32/csrsrv/api.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrsrv/api.h [iso-8859-1] Thu Sep 12 09:02:48 2013 @@ -137,10 +137,14 @@ NTAPI UnProtectHandle(IN HANDLE ObjectHandle); -VOID +NTSTATUS NTAPI CsrInsertThread(IN PCSR_PROCESS Process, IN PCSR_THREAD Thread); + +VOID +NTAPI +CsrDeallocateThread(IN PCSR_THREAD CsrThread); VOID NTAPI Modified: trunk/reactos/subsystems/win32/csrsrv/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrsrv/pr… ============================================================================== --- trunk/reactos/subsystems/win32/csrsrv/procsup.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrsrv/procsup.c [iso-8859-1] Thu Sep 12 09:02:48 2013 @@ -690,7 +690,15 @@ CsrThread->Flags = 0; /* Insert the Thread into the Process */ - CsrInsertThread(CsrProcess, CsrThread); + Status = CsrInsertThread(CsrProcess, CsrThread); + if (!NT_SUCCESS(Status)) + { + /* Bail out */ + CsrDeallocateProcess(CsrProcess); + CsrDeallocateThread(CsrThread); + CsrReleaseProcessLock(); + return Status; + } /* Reference the session */ CsrReferenceNtSession(NtSession); Modified: trunk/reactos/subsystems/win32/csrsrv/session.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrsrv/se… ============================================================================== --- trunk/reactos/subsystems/win32/csrsrv/session.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrsrv/session.c [iso-8859-1] Thu Sep 12 09:02:48 2013 @@ -289,7 +289,15 @@ CsrThread->Flags = 0; /* Insert it into the Process List */ - CsrInsertThread(CsrProcess, CsrThread); + Status = CsrInsertThread(CsrProcess, CsrThread); + if (!NT_SUCCESS(Status)) + { + /* Bail out */ + CsrDeallocateProcess(CsrProcess); + CsrDeallocateThread(CsrThread); + CsrReleaseProcessLock(); + return Status; + } /* Setup Process Data */ CsrProcess->ClientId = CreateSession->ProcessInfo.ClientId; Modified: trunk/reactos/subsystems/win32/csrsrv/thredsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrsrv/th… ============================================================================== --- trunk/reactos/subsystems/win32/csrsrv/thredsup.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrsrv/thredsup.c [iso-8859-1] Thu Sep 12 09:02:48 2013 @@ -292,13 +292,24 @@ * @remarks None. * *--*/ -VOID +NTSTATUS NTAPI CsrInsertThread(IN PCSR_PROCESS Process, IN PCSR_THREAD Thread) { ULONG i; + NTSTATUS Status; + ULONG ThreadInfo; // ASSERT(ProcessStructureListLocked()); + + /* Make sure the thread isn't already dead by the time we got this */ + Status = NtQueryInformationThread(Thread->ThreadHandle, + ThreadIsTerminated, + &ThreadInfo, + sizeof(ThreadInfo), + NULL); + if (!NT_SUCCESS(Status)) return Status; + if (ThreadInfo == TRUE) return STATUS_THREAD_IS_TERMINATING; /* Insert it into the Regular List */ InsertTailList(&Process->ThreadList, &Thread->Link); @@ -311,6 +322,7 @@ /* Insert it there too */ InsertHeadList(&CsrThreadHashTable[i], &Thread->HashLinks); + return STATUS_SUCCESS; } /*++ @@ -623,7 +635,15 @@ CsrThread->Flags = 0; /* Insert the Thread into the Process */ - CsrInsertThread(CsrProcess, CsrThread); + Status = CsrInsertThread(CsrProcess, CsrThread); + if (!NT_SUCCESS(Status)) + { + /* Bail out */ + if (CsrThread->ThreadHandle != hThread) NtClose(CsrThread->ThreadHandle); + CsrUnlockProcess(CsrProcess); + CsrDeallocateThread(CsrThread); + return Status; + } /* Release the lock and return */ CsrUnlockProcess(CsrProcess); @@ -720,7 +740,14 @@ CsrThread->Flags = 0; /* Insert the Thread into the Process */ - CsrInsertThread(CsrProcess, CsrThread); + Status = CsrInsertThread(CsrProcess, CsrThread); + if (!NT_SUCCESS(Status)) + { + /* Bail out */ + CsrUnlockProcess(CsrProcess); + CsrDeallocateThread(CsrThread); + return Status; + } /* Release the lock and return */ CsrReleaseProcessLock();

1 0

[ion] 60058: [USER32]: Make ClientThreadSetup return TRUE, and document how initialization should work. Enable CsrConnectToUser in CSRSRV. Works-4-me(TM).
by ion＠svn.reactos.org 12 Sep '13

12 Sep '13

Author: ion Date: Thu Sep 12 08:41:25 2013 New Revision: 60058 URL: http://svn.reactos.org/svn/reactos?rev=60058&view=rev Log: [USER32]: Make ClientThreadSetup return TRUE, and document how initialization should work. Enable CsrConnectToUser in CSRSRV. Works-4-me(TM). Modified: trunk/reactos/subsystems/win32/csrsrv/api.c trunk/reactos/win32ss/user/user32/misc/desktop.c trunk/reactos/win32ss/user/user32/misc/dllmain.c trunk/reactos/win32ss/user/user32/misc/stubs.c trunk/reactos/win32ss/user/user32/windows/hook.c Modified: trunk/reactos/subsystems/win32/csrsrv/api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrsrv/ap… ============================================================================== --- trunk/reactos/subsystems/win32/csrsrv/api.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrsrv/api.c [iso-8859-1] Thu Sep 12 08:41:25 2013 @@ -1016,7 +1016,6 @@ NTAPI CsrConnectToUser(VOID) { -#if 0 // FIXME: This code is OK, however it is ClientThreadSetup which sucks. NTSTATUS Status; ANSI_STRING DllName; UNICODE_STRING TempName; @@ -1073,21 +1072,6 @@ /* Return it */ return CsrThread; - -#else - - PTEB Teb = NtCurrentTeb(); - PCSR_THREAD CsrThread; - - /* Save pointer to this thread in TEB */ - CsrAcquireProcessLock(); - CsrThread = CsrLocateThreadInProcess(NULL, &Teb->ClientId); - CsrReleaseProcessLock(); - if (CsrThread) Teb->CsrClientThread = CsrThread; - - /* Return it */ - return CsrThread; -#endif } /*++ Modified: trunk/reactos/win32ss/user/user32/misc/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/d… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/desktop.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/desktop.c [iso-8859-1] Thu Sep 12 08:41:25 2013 @@ -128,8 +128,8 @@ int WINAPI RealGetSystemMetrics(int nIndex) { - GetConnected(); -// FIXME("Global Server Data -> %x\n",gpsi); + //GetConnected(); + //FIXME("Global Server Data -> %x\n",gpsi); if (nIndex < 0 || nIndex >= SM_CMETRICS) return 0; return gpsi->aiSysMet[nIndex]; } Modified: trunk/reactos/win32ss/user/user32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/d… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/dllmain.c [iso-8859-1] Thu Sep 12 08:41:25 2013 @@ -208,6 +208,47 @@ User32CallGetCharsetInfo, }; +/* +* @unimplemented +*/ +BOOL +WINAPI +ClientThreadSetup(VOID) +{ + // + // This routine, in Windows, does a lot of what Init does, but in a radically + // different way. + // + // In Windows, because CSRSS's threads have TIF_CSRSSTHREAD set (we have this + // flag in ROS but not sure if we use it), the xxxClientThreadSetup callback + // isn't made when CSRSS first loads WINSRV.DLL (which loads USER32.DLL). + // + // However, all the other calls are made as normal, and WINSRV.DLL loads + // USER32.dll, the DllMain runs, and eventually the first NtUser system call is + // made which initializes Win32k (and initializes the thread, but as mentioned + // above, the thread is marked as TIF_CSRSSTHREAD. + // + // In the DllMain of User32, there is also a CsrClientConnectToServer call to + // server 2 (winsrv). When this is done from CSRSS, the "InServer" flag is set, + // so user32 will remember that it's running inside of CSRSS. Also, another + // flag, called "FirstThread" is manually set by DllMain. + // + // Then, WINSRV finishes loading, and CSRSRV starts the API thread/loop. This + // code then calls CsrConnectToUser, which calls... ClientThreadStartup. Now + // this routine detects that it's in the server process, which means it's CSRSS + // and that the callback never happened. It does some first-time-Win32k connection + // initialization and caches a bunch of things -- if it's the first thread. It also + // acquires a critical section to initialize GDI -- and then resets the first thread + // flag. + // + // For now, we'll do none of this, but to support Windows' CSRSRV.DLL which calls + // CsrConnectToUser, we'll pretend we "did something" here. Then the rest will + // continue as normal. + // + UNIMPLEMENTED; + return TRUE; +} + BOOL Init(VOID) { @@ -310,38 +351,12 @@ return TRUE; } - -VOID -FASTCALL -GetConnected(VOID) -{ - USERCONNECT UserCon; -// ERR("GetConnected\n"); - - if ((PTHREADINFO)NtCurrentTeb()->Win32ThreadInfo == NULL) - NtUserGetThreadState(THREADSTATE_GETTHREADINFO); - - if (gpsi && g_ppi) return; -// FIXME HAX: Due to the "Dll Initialization Bug" we have to call this too. - GdiDllInitialize(NULL, DLL_PROCESS_ATTACH, NULL); - - NtUserProcessConnect( NtCurrentProcess(), - &UserCon, - sizeof(USERCONNECT)); - - g_ppi = GetWin32ClientInfo()->ppi; - g_ulSharedDelta = UserCon.siClient.ulSharedDelta; - gpsi = SharedPtrToUser(UserCon.siClient.psi); - gHandleTable = SharedPtrToUser(UserCon.siClient.aheList); - gHandleEntries = SharedPtrToUser(gHandleTable->handles); - -} - NTSTATUS WINAPI User32CallClientThreadSetupFromKernel(PVOID Arguments, ULONG ArgumentLength) { ERR("GetConnected\n"); + ClientThreadSetup(); return ZwCallbackReturn(NULL, 0, STATUS_SUCCESS); } Modified: trunk/reactos/win32ss/user/user32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/s… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/stubs.c [iso-8859-1] Thu Sep 12 08:41:25 2013 @@ -214,17 +214,6 @@ BOOL WINAPI GetAccCursorInfo ( PCURSORINFO pci ) -{ - UNIMPLEMENTED; - return FALSE; -} - -/* - * @unimplemented - */ -BOOL -WINAPI -ClientThreadSetup ( VOID ) { UNIMPLEMENTED; return FALSE; Modified: trunk/reactos/win32ss/user/user32/windows/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/hook.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/hook.c [iso-8859-1] Thu Sep 12 08:41:25 2013 @@ -211,7 +211,7 @@ PHOOK pHook, phkNext; LRESULT lResult = 0; - GetConnected(); + //GetConnected(); ClientInfo = GetWin32ClientInfo();

1 0

[ion] 60057: [SMLIB]: Use the right API port name. Now Windows's SMSS works fine in ROS.
by ion＠svn.reactos.org 12 Sep '13

12 Sep '13

Author: ion Date: Thu Sep 12 08:02:05 2013 New Revision: 60057 URL: http://svn.reactos.org/svn/reactos?rev=60057&view=rev Log: [SMLIB]: Use the right API port name. Now Windows's SMSS works fine in ROS. Modified: trunk/reactos/base/system/smss/sminit.c trunk/reactos/lib/smlib/smclient.c Modified: trunk/reactos/base/system/smss/sminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/sminit.c?… ============================================================================== --- trunk/reactos/base/system/smss/sminit.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss/sminit.c [iso-8859-1] Thu Sep 12 08:02:05 2013 @@ -2429,7 +2429,7 @@ RtlInitUnicodeString(&Os2Name, L"OS2"); /* Create the SM API Port */ - RtlInitUnicodeString(&PortName, L"\\SmApiPort2"); + RtlInitUnicodeString(&PortName, L"\\SmApiPort"); InitializeObjectAttributes(&ObjectAttributes, &PortName, 0, NULL, NULL); Status = NtCreatePort(&PortHandle, &ObjectAttributes, Modified: trunk/reactos/lib/smlib/smclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/smlib/smclient.c?rev=6… ============================================================================== --- trunk/reactos/lib/smlib/smclient.c [iso-8859-1] (original) +++ trunk/reactos/lib/smlib/smclient.c [iso-8859-1] Thu Sep 12 08:02:05 2013 @@ -81,7 +81,7 @@ SecurityQos.EffectiveOnly = TRUE; /* Set the SM API port name */ - RtlInitUnicodeString(&DestinationString, L"\\SmApiPort2"); + RtlInitUnicodeString(&DestinationString, L"\\SmApiPort"); /* Check if this is a client connecting to SMSS, or SMSS to itself */ if (SbApiPortName)

1 0

[ion] 60056: [NTOSKRNL]: Fix the fix
by ion＠svn.reactos.org 12 Sep '13

12 Sep '13

Author: ion Date: Thu Sep 12 07:55:45 2013 New Revision: 60056 URL: http://svn.reactos.org/svn/reactos?rev=60056&view=rev Log: [NTOSKRNL]: Fix the fix Modified: trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Thu Sep 12 07:55:45 2013 @@ -4871,17 +4871,6 @@ ULONG Protection; PROS_SECTION_OBJECT *SectionObject = (PROS_SECTION_OBJECT *)Section; - /* Convert section flag to page flag */ - if (AllocationAttributes & SEC_NOCACHE) SectionPageProtection |= PAGE_NOCACHE; - - /* Check to make sure the protection is correct. Nt* does this already */ - Protection = MiMakeProtectionMask(SectionPageProtection); - if (Protection == MM_INVALID_PROTECTION) - { - DPRINT1("Page protection is invalid\n"); - return STATUS_INVALID_PAGE_PROTECTION; - } - /* Check if an ARM3 section is being created instead */ if (!(AllocationAttributes & (SEC_IMAGE | SEC_PHYSICALMEMORY))) { @@ -4896,6 +4885,17 @@ FileHandle, FileObject); } + } + + /* Convert section flag to page flag */ + if (AllocationAttributes & SEC_NOCACHE) SectionPageProtection |= PAGE_NOCACHE; + + /* Check to make sure the protection is correct. Nt* does this already */ + Protection = MiMakeProtectionMask(SectionPageProtection); + if (Protection == MM_INVALID_PROTECTION) + { + DPRINT1("Page protection is invalid\n"); + return STATUS_INVALID_PAGE_PROTECTION; } /* Check if this is going to be a data or image backed file section */

1 0

[ion] 60055: [NTOSKRNL]: Make MiCreateImageSection return STATUS_SUCCESS, not some fucked-up ROS-specific status code. [NTOSKRNL]: Make MmCreateSection do the correct access checks and parameter ch...
by ion＠svn.reactos.org 12 Sep '13

12 Sep '13

Author: ion Date: Thu Sep 12 06:01:52 2013 New Revision: 60055 URL: http://svn.reactos.org/svn/reactos?rev=60055&view=rev Log: [NTOSKRNL]: Make MiCreateImageSection return STATUS_SUCCESS, not some fucked-up ROS-specific status code. [NTOSKRNL]: Make MmCreateSection do the correct access checks and parameter checks, just like ARM3 does. For example, asking for PAGE_EXECUTE on a non-image file no longer requests SYNCHRONIZE and FILE_READ_DATA...it asks... FILE_EXECUTE. Cause you know... that's what the caller..wants. Anyway, this, among other things, fixes LdrValidateImageChecksum (and those annoying errors 0xC0000022 in the logs). SMSS is now checking the checksums of Known DLLs just like before (in Win7 they stopped doing this to improve boot performance, lol). It also makes Windows' SMSS happy. Modified: trunk/reactos/base/system/smss/sminit.c trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/base/system/smss/sminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/sminit.c?… ============================================================================== --- trunk/reactos/base/system/smss/sminit.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss/sminit.c [iso-8859-1] Thu Sep 12 06:01:52 2013 @@ -1394,8 +1394,8 @@ NTSTATUS Status, Status1; PLIST_ENTRY NextEntry; PSMP_REGISTRY_VALUE RegEntry; - //ULONG_PTR ErrorParameters[3]; - //UNICODE_STRING ErrorResponse; + ULONG_PTR ErrorParameters[3]; + UNICODE_STRING ErrorResponse; IO_STATUS_BLOCK IoStatusBlock; SECURITY_DESCRIPTOR_CONTROL OldFlag = 0; USHORT ImageCharacteristics; @@ -1525,7 +1525,6 @@ SmpProcessModuleImports, RegEntry, &ImageCharacteristics); -#if 0 if (!NT_SUCCESS(Status)) { /* Checksum failed, so don't even try going further -- kill SMSS */ @@ -1547,7 +1546,6 @@ ErrorParameters[2] = (ULONG)&RegEntry->Value; SmpTerminate(ErrorParameters, 5, RTL_NUMBER_OF(ErrorParameters)); } -#endif /* Temporarily hack the SD to use a default DACL for this section */ if (SmpLiberalSecurityDescriptor) Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Thu Sep 12 06:01:52 2013 @@ -161,6 +161,7 @@ PAGE_EXECUTE_READWRITE, /* 15 = WRITABLE, READABLE, EXECUTABLE, SHARED */ }; +extern ULONG MmMakeFileAccess []; ACCESS_MASK NTAPI MiArm3GetCorrectFileAccessMask(IN ACCESS_MASK SectionPageProtection); static GENERIC_MAPPING MmpSectionMapping = { STANDARD_RIGHTS_READ | SECTION_MAP_READ | SECTION_QUERY, @@ -766,7 +767,7 @@ *Flags |= EXEFMT_LOAD_ASSUME_SEGMENTS_PAGE_ALIGNED; /* Success */ - nStatus = STATUS_ROS_EXEFMT_LOADED_FORMAT | EXEFMT_LOADED_PE32; + nStatus = STATUS_SUCCESS;// STATUS_ROS_EXEFMT_LOADED_FORMAT | EXEFMT_LOADED_PE32; l_Return: if(pBuffer) @@ -4867,8 +4868,19 @@ IN PFILE_OBJECT FileObject OPTIONAL) { NTSTATUS Status; - ULONG Protection, FileAccess; + ULONG Protection; PROS_SECTION_OBJECT *SectionObject = (PROS_SECTION_OBJECT *)Section; + + /* Convert section flag to page flag */ + if (AllocationAttributes & SEC_NOCACHE) SectionPageProtection |= PAGE_NOCACHE; + + /* Check to make sure the protection is correct. Nt* does this already */ + Protection = MiMakeProtectionMask(SectionPageProtection); + if (Protection == MM_INVALID_PROTECTION) + { + DPRINT1("Page protection is invalid\n"); + return STATUS_INVALID_PAGE_PROTECTION; + } /* Check if an ARM3 section is being created instead */ if (!(AllocationAttributes & (SEC_IMAGE | SEC_PHYSICALMEMORY))) @@ -4886,55 +4898,43 @@ } } - /* - * Check the protection - */ - Protection = SectionPageProtection & ~(PAGE_GUARD | PAGE_NOCACHE); - if (Protection != PAGE_READONLY && - Protection != PAGE_READWRITE && - Protection != PAGE_WRITECOPY && - Protection != PAGE_EXECUTE && - Protection != PAGE_EXECUTE_READ && - Protection != PAGE_EXECUTE_READWRITE && - Protection != PAGE_EXECUTE_WRITECOPY) + /* Check if this is going to be a data or image backed file section */ + if ((FileHandle) || (FileObject)) { - return STATUS_INVALID_PAGE_PROTECTION; - } - - if ((DesiredAccess & SECTION_MAP_WRITE) && - (Protection == PAGE_READWRITE || - Protection == PAGE_EXECUTE_READWRITE) && - !(AllocationAttributes & SEC_IMAGE)) - { - DPRINT("Creating a section with WRITE access\n"); - FileAccess = FILE_READ_DATA | FILE_WRITE_DATA | SYNCHRONIZE; + /* These cannot be mapped with large pages */ + if (AllocationAttributes & SEC_LARGE_PAGES) + { + DPRINT1("Large pages cannot be used with an image mapping\n"); + return STATUS_INVALID_PARAMETER_6; + } + + /* Did the caller pass an object? */ + if (FileObject) + { + /* Reference the object directly */ + ObReferenceObject(FileObject); + } + else + { + /* Reference the file handle to get the object */ + Status = ObReferenceObjectByHandle(FileHandle, + MmMakeFileAccess[Protection], + IoFileObjectType, + ExGetPreviousMode(), + (PVOID*)&FileObject, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to get a handle to the FO: %lx\n", Status); + return Status; + } + } } else { - DPRINT("Creating a section with READ access\n"); - FileAccess = FILE_READ_DATA | SYNCHRONIZE; + /* A handle must be supplied with SEC_IMAGE, as this is the no-handle path */ + if (AllocationAttributes & SEC_IMAGE) return STATUS_INVALID_FILE_FOR_SECTION; } - - /* FIXME: somehow combine this with the above checks */ - if (AllocationAttributes & SEC_IMAGE) - FileAccess = MiArm3GetCorrectFileAccessMask(SectionPageProtection); - - if (!FileObject && FileHandle) - { - Status = ObReferenceObjectByHandle(FileHandle, - FileAccess, - IoFileObjectType, - ExGetPreviousMode(), - (PVOID *)&FileObject, - NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT("Failed: 0x%08lx\n", Status); - return Status; - } - } - else if (FileObject) - ObReferenceObject(FileObject); #ifndef NEWCC // A hack for initializing caching. // This is needed only in the old case. @@ -4955,7 +4955,10 @@ &ByteOffset, NULL); if (!NT_SUCCESS(Status) && Status != STATUS_END_OF_FILE) + { + DPRINT1("CC failure: %lx\n", Status); return Status; + } // Caching is initialized... } #endif

1 0

[jimtabor] 60054: Attempt to fix CORE-6024
by jimtabor＠svn.reactos.org 12 Sep '13

12 Sep '13

Author: jimtabor Date: Thu Sep 12 02:26:36 2013 New Revision: 60054 URL: http://svn.reactos.org/svn/reactos?rev=60054&view=rev Log: Attempt to fix CORE-6024 Modified: trunk/reactos/win32ss/user/user32/controls/button.c Modified: trunk/reactos/win32ss/user/user32/controls/button.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/contro… ============================================================================== --- trunk/reactos/win32ss/user/user32/controls/button.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/controls/button.c [iso-8859-1] Thu Sep 12 02:26:36 2013 @@ -79,6 +79,7 @@ #define BUTTON_BTNPRESSED 0x40 #define BUTTON_UNKNOWN2 0x20 #define BUTTON_UNKNOWN3 0x10 +#define BUTTON_BMCLICK 0x100 // ReactOS Need to up to wine! #define BUTTON_NOTIFY_PARENT(hWnd, code) \ do { /* Notify parent which has created this button control */ \ @@ -517,8 +518,20 @@ break; case BM_CLICK: + //// ReactOS + state = get_button_state( hWnd ); + if (state & BUTTON_BMCLICK) + break; + set_button_state( hWnd, state | BUTTON_BMCLICK ); // Tracked in STATE_GWL_OFFSET. + //// SendMessageW( hWnd, WM_LBUTTONDOWN, 0, 0 ); SendMessageW( hWnd, WM_LBUTTONUP, 0, 0 ); + //// + state = get_button_state( hWnd ); + if (!(state & BUTTON_BMCLICK)) break; + state &= ~BUTTON_BMCLICK; + set_button_state( hWnd, state ); + //// break; case BM_SETIMAGE:

1 0

[hbelusca] 60053: Fix other _SEH2_YIELD() issues, spotted for most of them by Pigglesworth, the other by myself. I'm wondering how much remaining ones are in our code. Only the Lord knows...
by hbelusca＠svn.reactos.org 12 Sep '13

12 Sep '13

Author: hbelusca Date: Thu Sep 12 00:41:24 2013 New Revision: 60053 URL: http://svn.reactos.org/svn/reactos?rev=60053&view=rev Log: Fix other _SEH2_YIELD() issues, spotted for most of them by Pigglesworth, the other by myself. I'm wondering how much remaining ones are in our code. Only the Lord knows... Modified: trunk/reactos/base/setup/vmwinst/vmwinst.c trunk/reactos/drivers/storage/classpnp/class.c trunk/reactos/lib/rtl/acl.c trunk/reactos/lib/rtl/actctx.c trunk/reactos/lib/rtl/sd.c trunk/reactos/lib/rtl/sid.c trunk/reactos/ntoskrnl/mm/ARM3/virtual.c trunk/reactos/win32ss/user/user32/windows/text.c Modified: trunk/reactos/base/setup/vmwinst/vmwinst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/vmwinst… ============================================================================== --- trunk/reactos/base/setup/vmwinst/vmwinst.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/vmwinst/vmwinst.c [iso-8859-1] Thu Sep 12 00:41:24 2013 @@ -96,14 +96,14 @@ } #elif defined(_MSC_VER) && defined(_M_AMD64) DPRINT1("DetectVMware stub\n"); - return FALSE; + _SEH2_YIELD(return FALSE); #else #error TODO #endif } _SEH2_EXCEPT(_SEH2_GetExceptionCode() == EXCEPTION_PRIV_INSTRUCTION ? EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH) { - return FALSE; + _SEH2_YIELD(return FALSE); } _SEH2_END; Modified: trunk/reactos/drivers/storage/classpnp/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/c… ============================================================================== --- trunk/reactos/drivers/storage/classpnp/class.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/classpnp/class.c [iso-8859-1] Thu Sep 12 00:41:24 2013 @@ -2838,7 +2838,7 @@ DebugPrint((1, "ClassSendSrbSynchronous: Exception %lx " "locking buffer\n", status)); - return status; + _SEH2_YIELD(return status); } _SEH2_END; } Modified: trunk/reactos/lib/rtl/acl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/acl.c?rev=60053&r1… ============================================================================== --- trunk/reactos/lib/rtl/acl.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/acl.c [iso-8859-1] Thu Sep 12 00:41:24 2013 @@ -846,21 +846,21 @@ (Acl->AclRevision > MAX_ACL_REVISION)) { DPRINT1("Invalid ACL revision\n"); - return FALSE; + _SEH2_YIELD(return FALSE); } /* Next, validate that the ACL is USHORT-aligned */ if (ROUND_DOWN(Acl->AclSize, sizeof(USHORT)) != Acl->AclSize) { DPRINT1("Invalid ACL size\n"); - return FALSE; + _SEH2_YIELD(return FALSE); } /* And that it's big enough */ if (Acl->AclSize < sizeof(ACL)) { DPRINT1("Invalid ACL size\n"); - return FALSE; + _SEH2_YIELD(return FALSE); } /* Loop each ACE */ @@ -871,21 +871,21 @@ if (((ULONG_PTR)Ace + sizeof(ACE_HEADER)) >= ((ULONG_PTR)Acl + Acl->AclSize)) { DPRINT1("Invalid ACE size\n"); - return FALSE; + _SEH2_YIELD(return FALSE); } /* Validate the length of this ACE */ if (ROUND_DOWN(Ace->AceSize, sizeof(USHORT)) != Ace->AceSize) { DPRINT1("Invalid ACE size: %lx\n", Ace->AceSize); - return FALSE; + _SEH2_YIELD(return FALSE); } /* Validate we have space for the entire ACE */ if (((ULONG_PTR)Ace + Ace->AceSize) > ((ULONG_PTR)Acl + Acl->AclSize)) { DPRINT1("Invalid ACE size %lx %lx\n", Ace->AceSize, Acl->AclSize); - return FALSE; + _SEH2_YIELD(return FALSE); } /* Check what kind of ACE this is */ @@ -895,14 +895,14 @@ if (ROUND_DOWN(Ace->AceSize, sizeof(ULONG)) != Ace->AceSize) { DPRINT1("Invalid ACE size\n"); - return FALSE; + _SEH2_YIELD(return FALSE); } /* The ACE size should at least have enough for the header */ if (Ace->AceSize < sizeof(ACE_HEADER)) { DPRINT1("Invalid ACE size: %lx %lx\n", Ace->AceSize, sizeof(ACE_HEADER)); - return FALSE; + _SEH2_YIELD(return FALSE); } /* Check if the SID revision is valid */ @@ -910,21 +910,21 @@ if (Sid->Revision != SID_REVISION) { DPRINT1("Invalid SID\n"); - return FALSE; + _SEH2_YIELD(return FALSE); } /* Check if the SID is out of bounds */ if (Sid->SubAuthorityCount > SID_MAX_SUB_AUTHORITIES) { DPRINT1("Invalid SID\n"); - return FALSE; + _SEH2_YIELD(return FALSE); } /* The ACE size should at least have enough for the header and SID */ if (Ace->AceSize < (sizeof(ACE_HEADER) + RtlLengthSid(Sid))) { DPRINT1("Invalid ACE size\n"); - return FALSE; + _SEH2_YIELD(return FALSE); } } else if (Ace->AceType == ACCESS_ALLOWED_COMPOUND_ACE_TYPE) @@ -942,7 +942,7 @@ if (Ace->AceSize < sizeof(ACE_HEADER)) { DPRINT1("Unknown ACE\n"); - return FALSE; + _SEH2_YIELD(return FALSE); } } @@ -953,7 +953,7 @@ _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { /* Something was invalid, fail */ - return FALSE; + _SEH2_YIELD(return FALSE); } _SEH2_END; Modified: trunk/reactos/lib/rtl/actctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/actctx.c?rev=60053… ============================================================================== --- trunk/reactos/lib/rtl/actctx.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/actctx.c [iso-8859-1] Thu Sep 12 00:41:24 2013 @@ -1587,7 +1587,7 @@ _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { DPRINT1("Exception accessing buffer\n"); - return STATUS_SXS_CANT_GEN_ACTCTX; + _SEH2_YIELD(return STATUS_SXS_CANT_GEN_ACTCTX); } _SEH2_END; Modified: trunk/reactos/lib/rtl/sd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/sd.c?rev=60053&r1=… ============================================================================== --- trunk/reactos/lib/rtl/sd.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/sd.c [iso-8859-1] Thu Sep 12 00:41:24 2013 @@ -1062,28 +1062,28 @@ _SEH2_TRY { /* Fail on bad revisions */ - if (Sd->Revision != SECURITY_DESCRIPTOR_REVISION) return FALSE; + if (Sd->Revision != SECURITY_DESCRIPTOR_REVISION) _SEH2_YIELD(return FALSE); /* Owner SID must be valid if present */ Owner = SepGetOwnerFromDescriptor(Sd); - if ((Owner) && (!RtlValidSid(Owner))) return FALSE; + if ((Owner) && (!RtlValidSid(Owner))) _SEH2_YIELD(return FALSE); /* Group SID must be valid if present */ Group = SepGetGroupFromDescriptor(Sd); - if ((Owner) && (!RtlValidSid(Group))) return FALSE; + if ((Owner) && (!RtlValidSid(Group))) _SEH2_YIELD(return FALSE); /* DACL must be valid if present */ Dacl = SepGetDaclFromDescriptor(Sd); - if ((Dacl) && (!RtlValidAcl(Dacl))) return FALSE; + if ((Dacl) && (!RtlValidAcl(Dacl))) _SEH2_YIELD(return FALSE); /* SACL must be valid if present */ Sacl = SepGetSaclFromDescriptor(Sd); - if ((Sacl) && (!RtlValidAcl(Sacl))) return FALSE; + if ((Sacl) && (!RtlValidAcl(Sacl))) _SEH2_YIELD(return FALSE); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { /* Access fault, bail out */ - return FALSE; + _SEH2_YIELD(return FALSE); } _SEH2_END; Modified: trunk/reactos/lib/rtl/sid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/sid.c?rev=60053&r1… ============================================================================== --- trunk/reactos/lib/rtl/sid.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/sid.c [iso-8859-1] Thu Sep 12 00:41:24 2013 @@ -32,13 +32,13 @@ (Sid->SubAuthorityCount > SID_MAX_SUB_AUTHORITIES))) { /* It's not, fail */ - return FALSE; + _SEH2_YIELD(return FALSE); } } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { /* Access violation, SID is not valid */ - return FALSE; + _SEH2_YIELD(return FALSE); } _SEH2_END; Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Thu Sep 12 00:41:24 2013 @@ -883,7 +883,7 @@ // // Return the error // - return STATUS_WORKING_SET_QUOTA; + _SEH2_YIELD(return STATUS_WORKING_SET_QUOTA); } // @@ -3343,7 +3343,7 @@ // // Catch illegal base address // - if (BaseAddress > MM_HIGHEST_USER_ADDRESS) return STATUS_INVALID_PARAMETER_2; + if (BaseAddress > MM_HIGHEST_USER_ADDRESS) _SEH2_YIELD(return STATUS_INVALID_PARAMETER_2); // // Catch illegal region size @@ -3353,7 +3353,7 @@ // // Fail // - return STATUS_INVALID_PARAMETER_3; + _SEH2_YIELD(return STATUS_INVALID_PARAMETER_3); } // @@ -3370,7 +3370,7 @@ // // Must have a count // - if (CapturedEntryCount == 0) return STATUS_INVALID_PARAMETER_5; + if (CapturedEntryCount == 0) _SEH2_YIELD(return STATUS_INVALID_PARAMETER_5); // // Can't be larger than the maximum @@ -3380,7 +3380,7 @@ // // Fail // - return STATUS_INVALID_PARAMETER_5; + _SEH2_YIELD(return STATUS_INVALID_PARAMETER_5); } // Modified: trunk/reactos/win32ss/user/user32/windows/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/text.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/text.c [iso-8859-1] Thu Sep 12 00:41:24 2013 @@ -67,7 +67,7 @@ _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { SetLastError( ERROR_INVALID_PARAMETER ); - return NULL; + _SEH2_YIELD(return NULL); } _SEH2_END; @@ -267,7 +267,7 @@ _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { SetLastError( ERROR_INVALID_PARAMETER ); - return NULL; + _SEH2_YIELD(return NULL); } _SEH2_END;

1 0

[hbelusca] 60052: [NPFS_NEW] Use _SEH2_YIELD when exiting from a _SEH2 block via a return or a goto (otherwise --> bug in the stack). This limitation will be removed in SEH3, but it's not used at t...
by hbelusca＠svn.reactos.org 12 Sep '13

12 Sep '13

Author: hbelusca Date: Thu Sep 12 00:16:42 2013 New Revision: 60052 URL: http://svn.reactos.org/svn/reactos?rev=60052&view=rev Log: [NPFS_NEW] Use _SEH2_YIELD when exiting from a _SEH2 block via a return or a goto (otherwise --> bug in the stack). This limitation will be removed in SEH3, but it's not used at the moment. Modified: trunk/reactos/drivers/filesystems/npfs_new/datasup.c trunk/reactos/drivers/filesystems/npfs_new/fsctrl.c trunk/reactos/drivers/filesystems/npfs_new/writesup.c Modified: trunk/reactos/drivers/filesystems/npfs_new/datasup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/datasup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/datasup.c [iso-8859-1] Thu Sep 12 00:16:42 2013 @@ -402,7 +402,7 @@ _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { NpFreeClientSecurityContext(ClientContext); - return _SEH2_GetExceptionCode(); + _SEH2_YIELD(return _SEH2_GetExceptionCode()); } _SEH2_END; Modified: trunk/reactos/drivers/filesystems/npfs_new/fsctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/fsctrl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/fsctrl.c [iso-8859-1] Thu Sep 12 00:16:42 2013 @@ -336,7 +336,7 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - return _SEH2_GetExceptionCode(); + _SEH2_YIELD(return _SEH2_GetExceptionCode()); } _SEH2_END; } @@ -427,7 +427,7 @@ _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { Status = _SEH2_GetExceptionCode(); - goto Quickie; + _SEH2_YIELD(goto Quickie); } _SEH2_END; } Modified: trunk/reactos/drivers/filesystems/npfs_new/writesup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/writesup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/writesup.c [iso-8859-1] Thu Sep 12 00:16:42 2013 @@ -97,7 +97,7 @@ _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { if (AllocatedBuffer) ExFreePool(Buffer); - return _SEH2_GetExceptionCode(); + _SEH2_YIELD(return _SEH2_GetExceptionCode()); } _SEH2_END;

1 0

[hbelusca] 60051: [NPFS_NEW] Don't hardcode the first parameter of the bugchecks. Instead, I introduce a NpBugCheck macro and file identifiers (their names conform to the existing name convention o...
by hbelusca＠svn.reactos.org 12 Sep '13

12 Sep '13

Author: hbelusca Date: Thu Sep 12 00:05:54 2013 New Revision: 60051 URL: http://svn.reactos.org/svn/reactos?rev=60051&view=rev Log: [NPFS_NEW] Don't hardcode the first parameter of the bugchecks. Instead, I introduce a NpBugCheck macro and file identifiers (their names conform to the existing name convention of the driver) so that, when bugchecking, we report as the first parameter of the NPFS_FILE_SYSTEM bugcheck the file ID (in the high word) and the line (in the low word) where the bugcheck was emitted. See the MSDN article "Bug Check 0x25: NPFS_FILE_SYSTEM" - http://msdn.microsoft.com/en-us/library/windows/hardware/ff557436(v=vs.85).… for more information. Inspired from the existing ext2 driver. Should be done for the other filesystems (FAT, NTFS, CDFS, Redirector, Mailslot, etc...). Modified: trunk/reactos/drivers/filesystems/npfs_new/cleanup.c trunk/reactos/drivers/filesystems/npfs_new/close.c trunk/reactos/drivers/filesystems/npfs_new/create.c trunk/reactos/drivers/filesystems/npfs_new/datasup.c trunk/reactos/drivers/filesystems/npfs_new/fileinfo.c trunk/reactos/drivers/filesystems/npfs_new/fileobsup.c trunk/reactos/drivers/filesystems/npfs_new/flushbuf.c trunk/reactos/drivers/filesystems/npfs_new/fsctrl.c trunk/reactos/drivers/filesystems/npfs_new/main.c trunk/reactos/drivers/filesystems/npfs_new/npfs.h trunk/reactos/drivers/filesystems/npfs_new/prefxsup.c trunk/reactos/drivers/filesystems/npfs_new/read.c trunk/reactos/drivers/filesystems/npfs_new/readsup.c trunk/reactos/drivers/filesystems/npfs_new/secursup.c trunk/reactos/drivers/filesystems/npfs_new/seinfo.c trunk/reactos/drivers/filesystems/npfs_new/statesup.c trunk/reactos/drivers/filesystems/npfs_new/strucsup.c trunk/reactos/drivers/filesystems/npfs_new/volinfo.c trunk/reactos/drivers/filesystems/npfs_new/waitsup.c trunk/reactos/drivers/filesystems/npfs_new/write.c trunk/reactos/drivers/filesystems/npfs_new/writesup.c Modified: trunk/reactos/drivers/filesystems/npfs_new/cleanup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/cleanup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/cleanup.c [iso-8859-1] Thu Sep 12 00:05:54 2013 @@ -9,6 +9,9 @@ /* INCLUDES *******************************************************************/ #include "npfs.h" + +// File ID number for NPFS bugchecking support +#define NPFS_BUGCHECK_FILE_ID (NPFS_BUGCHECK_CLEANUP) /* FUNCTIONS ******************************************************************/ Modified: trunk/reactos/drivers/filesystems/npfs_new/close.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/close.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/close.c [iso-8859-1] Thu Sep 12 00:05:54 2013 @@ -9,6 +9,9 @@ /* INCLUDES *******************************************************************/ #include "npfs.h" + +// File ID number for NPFS bugchecking support +#define NPFS_BUGCHECK_FILE_ID (NPFS_BUGCHECK_CLOSE) /* FUNCTIONS ******************************************************************/ Modified: trunk/reactos/drivers/filesystems/npfs_new/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/create.c [iso-8859-1] Thu Sep 12 00:05:54 2013 @@ -9,6 +9,9 @@ /* INCLUDES *******************************************************************/ #include "npfs.h" + +// File ID number for NPFS bugchecking support +#define NPFS_BUGCHECK_FILE_ID (NPFS_BUGCHECK_CREATE) /* FUNCTIONS ******************************************************************/ Modified: trunk/reactos/drivers/filesystems/npfs_new/datasup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/datasup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/datasup.c [iso-8859-1] Thu Sep 12 00:05:54 2013 @@ -9,6 +9,9 @@ /* INCLUDES *******************************************************************/ #include "npfs.h" + +// File ID number for NPFS bugchecking support +#define NPFS_BUGCHECK_FILE_ID (NPFS_BUGCHECK_DATASUP) /* FUNCTIONS ******************************************************************/ Modified: trunk/reactos/drivers/filesystems/npfs_new/fileinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/fileinfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/fileinfo.c [iso-8859-1] Thu Sep 12 00:05:54 2013 @@ -10,6 +10,9 @@ #include "npfs.h" +// File ID number for NPFS bugchecking support +#define NPFS_BUGCHECK_FILE_ID (NPFS_BUGCHECK_FILEINFO) + /* FUNCTIONS ******************************************************************/ NTSTATUS @@ -42,7 +45,7 @@ { if (NamedPipeEnd != FILE_PIPE_SERVER_END) { - KeBugCheckEx(NPFS_FILE_SYSTEM, 0xA04EFu, NamedPipeEnd, 0, 0); + NpBugCheck(NamedPipeEnd, 0, 0); } ReadQueue = &Ccb->DataQueue[FILE_PIPE_INBOUND]; WriteQueue = &Ccb->DataQueue[FILE_PIPE_OUTBOUND]; @@ -234,7 +237,7 @@ if (*Length < NameLength) { Status = STATUS_BUFFER_OVERFLOW; - NameLength = *Length; + NameLength = (USHORT)*Length; } else { Modified: trunk/reactos/drivers/filesystems/npfs_new/fileobsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/fileobsup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/fileobsup.c [iso-8859-1] Thu Sep 12 00:05:54 2013 @@ -9,6 +9,9 @@ /* INCLUDES *******************************************************************/ #include "npfs.h" + +// File ID number for NPFS bugchecking support +#define NPFS_BUGCHECK_FILE_ID (NPFS_BUGCHECK_FILEOBSUP) /* FUNCTIONS ******************************************************************/ @@ -46,7 +49,7 @@ return NPFS_NTC_CCB; default: - KeBugCheckEx(NPFS_FILE_SYSTEM, 0xB0108, Node->NodeType, 0, 0); + NpBugCheck(Node->NodeType, 0, 0); break; } } Modified: trunk/reactos/drivers/filesystems/npfs_new/flushbuf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/flushbuf.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/flushbuf.c [iso-8859-1] Thu Sep 12 00:05:54 2013 @@ -9,6 +9,9 @@ /* INCLUDES *******************************************************************/ #include "npfs.h" + +// File ID number for NPFS bugchecking support +#define NPFS_BUGCHECK_FILE_ID (NPFS_BUGCHECK_FLUSHBUF) /* FUNCTIONS ******************************************************************/ Modified: trunk/reactos/drivers/filesystems/npfs_new/fsctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/fsctrl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/fsctrl.c [iso-8859-1] Thu Sep 12 00:05:54 2013 @@ -9,6 +9,9 @@ /* INCLUDES *******************************************************************/ #include "npfs.h" + +// File ID number for NPFS bugchecking support +#define NPFS_BUGCHECK_FILE_ID (NPFS_BUGCHECK_FSCTRL) /* GLOBALS ********************************************************************/ @@ -212,7 +215,7 @@ { if (NamedPipeEnd != FILE_PIPE_SERVER_END) { - KeBugCheckEx(NPFS_FILE_SYSTEM, 0xD02E5, NamedPipeEnd, 0, 0); + NpBugCheck(NamedPipeEnd, 0, 0); } DataQueue = &Ccb->DataQueue[FILE_PIPE_INBOUND]; @@ -357,7 +360,7 @@ { if (NamedPipeEnd != FILE_PIPE_SERVER_END) { - KeBugCheckEx(NPFS_FILE_SYSTEM, 0xD0538, NamedPipeEnd, 0, 0); + NpBugCheck(NamedPipeEnd, 0, 0); } ReadQueue = &Ccb->DataQueue[FILE_PIPE_INBOUND]; WriteQueue = &Ccb->DataQueue[FILE_PIPE_OUTBOUND]; Modified: trunk/reactos/drivers/filesystems/npfs_new/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/main.c [iso-8859-1] Thu Sep 12 00:05:54 2013 @@ -9,6 +9,9 @@ /* INCLUDES *******************************************************************/ #include "npfs.h" + +// File ID number for NPFS bugchecking support +#define NPFS_BUGCHECK_FILE_ID (NPFS_BUGCHECK_MAIN) /* GLOBALS ********************************************************************/ Modified: trunk/reactos/drivers/filesystems/npfs_new/npfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/npfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/npfs.h [iso-8859-1] Thu Sep 12 00:05:54 2013 @@ -1,3 +1,13 @@ +/* + * PROJECT: ReactOS Named Pipe FileSystem + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: drivers/filesystems/npfs/npfs.h + * PURPOSE: Named Pipe FileSystem Header + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES *******************************************************************/ + // // System Headers // @@ -15,6 +25,9 @@ #pragma warning(disable:4214) #pragma warning(disable:4100) #endif + + +/* TYPEDEFS & DEFINES *********************************************************/ // // Pool Tags for NPFS (from pooltag.txt) @@ -46,6 +59,51 @@ #define NPFS_WRITE_BLOCK_TAG 'NpFw' // +// NPFS bugchecking support +// +// We define the NpBugCheck macro which triggers a NPFS_FILE_SYSTEM bugcheck +// containing the source file ID number and the line where it was emitted, as +// described in the MSDN article "Bug Check 0x25: NPFS_FILE_SYSTEM". +// +// The bugcheck emits 4 ULONGs; the first one is made, in its high word, by +// the current source file ID and in its low word, by the line number; the +// three other ones are user-defined. +// +// In order to avoid redefinition of the same file ID in different source files, +// we gather all of them here, so that you will have to add (or remove) a new +// one as soon as you add (or remove) a source file from the NPFS driver code. +// +// To use the NpBugCheck macro in a source file, define at its beginning +// the constant NPFS_BUGCHECK_FILE_ID with one of the following file IDs, +// then use the bugcheck macro wherever you want. +// +#define NPFS_BUGCHECK_CLEANUP 0x0001 +#define NPFS_BUGCHECK_CLOSE 0x0002 +#define NPFS_BUGCHECK_CREATE 0x0003 +#define NPFS_BUGCHECK_DATASUP 0x0004 +#define NPFS_BUGCHECK_FILEINFO 0x0005 +#define NPFS_BUGCHECK_FILEOBSUP 0x0006 +#define NPFS_BUGCHECK_FLUSHBUF 0x0007 +#define NPFS_BUGCHECK_FSCTRL 0x0008 +#define NPFS_BUGCHECK_MAIN 0x0009 +#define NPFS_BUGCHECK_PREFXSUP 0x000a +#define NPFS_BUGCHECK_READ 0x000b +#define NPFS_BUGCHECK_READSUP 0x000c +#define NPFS_BUGCHECK_SECURSUP 0x000d +#define NPFS_BUGCHECK_SEINFO 0x000e +#define NPFS_BUGCHECK_STATESUP 0x000f +#define NPFS_BUGCHECK_STRUCSUP 0x0010 +#define NPFS_BUGCHECK_VOLINFO 0x0011 +#define NPFS_BUGCHECK_WAITSUP 0x0012 +#define NPFS_BUGCHECK_WRITE 0x0013 +#define NPFS_BUGCHECK_WRITESUP 0x0014 + +#define NpBugCheck(p1, p2, p3) \ + KeBugCheckEx(NPFS_FILE_SYSTEM, \ + (NPFS_BUGCHECK_FILE_ID << 16) | __LINE__, \ + (p1), (p2), (p3)) + +// // Node Type Codes for NPFS // #define NPFS_NTC_VCB 1 @@ -263,6 +321,9 @@ extern PNP_VCB NpVcb; + +/* FUNCTIONS ******************************************************************/ + // // Functions to lock/unlock the global VCB lock // @@ -600,3 +661,4 @@ NpFsdQueryVolumeInformation(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); +/* EOF */ Modified: trunk/reactos/drivers/filesystems/npfs_new/prefxsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/prefxsup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/prefxsup.c [iso-8859-1] Thu Sep 12 00:05:54 2013 @@ -9,6 +9,9 @@ /* INCLUDES *******************************************************************/ #include "npfs.h" + +// File ID number for NPFS bugchecking support +#define NPFS_BUGCHECK_FILE_ID (NPFS_BUGCHECK_PREFXSUP) /* FUNCTIONS ******************************************************************/ @@ -25,7 +28,7 @@ Entry = RtlFindUnicodePrefix(&NpVcb->PrefixTable, Name, CaseInsensitiveIndex); - if (!Entry) KeBugCheckEx(NPFS_FILE_SYSTEM, 0x100065u, 0, 0, 0); + if (!Entry) NpBugCheck(0, 0, 0); Fcb = CONTAINING_RECORD(Entry, NP_FCB, PrefixTableEntry); Modified: trunk/reactos/drivers/filesystems/npfs_new/read.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/read.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/read.c [iso-8859-1] Thu Sep 12 00:05:54 2013 @@ -9,6 +9,9 @@ /* INCLUDES *******************************************************************/ #include "npfs.h" + +// File ID number for NPFS bugchecking support +#define NPFS_BUGCHECK_FILE_ID (NPFS_BUGCHECK_READ) /* GLOBALS ********************************************************************/ Modified: trunk/reactos/drivers/filesystems/npfs_new/readsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/readsup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/readsup.c [iso-8859-1] Thu Sep 12 00:05:54 2013 @@ -9,6 +9,9 @@ /* INCLUDES *******************************************************************/ #include "npfs.h" + +// File ID number for NPFS bugchecking support +#define NPFS_BUGCHECK_FILE_ID (NPFS_BUGCHECK_READSUP) /* FUNCTIONS ******************************************************************/ Modified: trunk/reactos/drivers/filesystems/npfs_new/secursup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/secursup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/secursup.c [iso-8859-1] Thu Sep 12 00:05:54 2013 @@ -9,6 +9,9 @@ /* INCLUDES *******************************************************************/ #include "npfs.h" + +// File ID number for NPFS bugchecking support +#define NPFS_BUGCHECK_FILE_ID (NPFS_BUGCHECK_SECURSUP) /* FUNCTIONS ******************************************************************/ Modified: trunk/reactos/drivers/filesystems/npfs_new/seinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/seinfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/seinfo.c [iso-8859-1] Thu Sep 12 00:05:54 2013 @@ -9,6 +9,9 @@ /* INCLUDES *******************************************************************/ #include "npfs.h" + +// File ID number for NPFS bugchecking support +#define NPFS_BUGCHECK_FILE_ID (NPFS_BUGCHECK_SEINFO) /* FUNCTIONS ******************************************************************/ Modified: trunk/reactos/drivers/filesystems/npfs_new/statesup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/statesup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/statesup.c [iso-8859-1] Thu Sep 12 00:05:54 2013 @@ -9,6 +9,9 @@ /* INCLUDES *******************************************************************/ #include "npfs.h" + +// File ID number for NPFS bugchecking support +#define NPFS_BUGCHECK_FILE_ID (NPFS_BUGCHECK_STATESUP) /* FUNCTIONS ******************************************************************/ @@ -170,7 +173,7 @@ break; default: - KeBugCheckEx(NPFS_FILE_SYSTEM, 0x1603DD, Ccb->NamedPipeState, 0, 0); + NpBugCheck(Ccb->NamedPipeState, 0, 0); break; } @@ -228,7 +231,7 @@ break; default: - KeBugCheckEx(NPFS_FILE_SYSTEM, 0x160133, Ccb->NamedPipeState, 0, 0); + NpBugCheck(Ccb->NamedPipeState, 0, 0); break; } @@ -377,7 +380,7 @@ break; default: - KeBugCheckEx(NPFS_FILE_SYSTEM, 0x1602F9, Ccb->NamedPipeState, 0, 0); + NpBugCheck(Ccb->NamedPipeState, 0, 0); break; } return STATUS_SUCCESS; Modified: trunk/reactos/drivers/filesystems/npfs_new/strucsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/strucsup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/strucsup.c [iso-8859-1] Thu Sep 12 00:05:54 2013 @@ -10,6 +10,9 @@ #include "npfs.h" +// File ID number for NPFS bugchecking support +#define NPFS_BUGCHECK_FILE_ID (NPFS_BUGCHECK_STRUCSUP) + /* GLOBALS ********************************************************************/ #define UNIMPLEMENTED @@ -67,7 +70,7 @@ PAGED_CODE(); Dcb = Fcb->ParentDcb; - if (Fcb->CurrentInstances) KeBugCheckEx(NPFS_FILE_SYSTEM, 0x17025F, 0, 0, 0); + if (Fcb->CurrentInstances) NpBugCheck(0, 0, 0); NpCancelWaiter(&NpVcb->WaitQueue, &Fcb->FullName, @@ -169,7 +172,7 @@ if (NpVcb->RootDcb) { - KeBugCheckEx(NPFS_FILE_SYSTEM, 0x1700F3, 0, 0, 0); + NpBugCheck(0, 0, 0); } NpVcb->RootDcb = ExAllocatePoolWithTag(PagedPool, sizeof(*Dcb), NPFS_DCB_TAG); @@ -199,7 +202,7 @@ &Dcb->FullName, &Dcb->PrefixTableEntry)) { - KeBugCheckEx(NPFS_FILE_SYSTEM, 0x170128, 0, 0, 0); + NpBugCheck(0, 0, 0); } return STATUS_SUCCESS; @@ -284,7 +287,7 @@ &Fcb->FullName, &Fcb->PrefixTableEntry)) { - KeBugCheckEx(NPFS_FILE_SYSTEM, 0x170222, 0, 0, 0); + NpBugCheck(0, 0, 0); } Fcb->NamedPipeConfiguration = NamedPipeConfiguration; Modified: trunk/reactos/drivers/filesystems/npfs_new/volinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/volinfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/volinfo.c [iso-8859-1] Thu Sep 12 00:05:54 2013 @@ -10,6 +10,9 @@ #include "npfs.h" +// File ID number for NPFS bugchecking support +#define NPFS_BUGCHECK_FILE_ID (NPFS_BUGCHECK_VOLINFO) + /* FUNCTIONS ******************************************************************/ NTSTATUS @@ -33,7 +36,7 @@ if (NameLength < 18) { - NameLength = *Length; + NameLength = (USHORT)*Length; Status = STATUS_BUFFER_OVERFLOW; } else @@ -96,7 +99,7 @@ NTSTATUS Status; USHORT NameLength; - NameLength = *Length - 12; + NameLength = (USHORT)(*Length - 12); if (NameLength < 8) { *Length = 0; Modified: trunk/reactos/drivers/filesystems/npfs_new/waitsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/waitsup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/waitsup.c [iso-8859-1] Thu Sep 12 00:05:54 2013 @@ -10,6 +10,9 @@ #include "npfs.h" +// File ID number for NPFS bugchecking support +#define NPFS_BUGCHECK_FILE_ID (NPFS_BUGCHECK_WAITSUP) + /* FUNCTIONS ******************************************************************/ VOID Modified: trunk/reactos/drivers/filesystems/npfs_new/write.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/write.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/write.c [iso-8859-1] Thu Sep 12 00:05:54 2013 @@ -9,6 +9,9 @@ /* INCLUDES *******************************************************************/ #include "npfs.h" + +// File ID number for NPFS bugchecking support +#define NPFS_BUGCHECK_FILE_ID (NPFS_BUGCHECK_WRITE) /* GLOBALS ********************************************************************/ Modified: trunk/reactos/drivers/filesystems/npfs_new/writesup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/writesup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/writesup.c [iso-8859-1] Thu Sep 12 00:05:54 2013 @@ -9,6 +9,9 @@ /* INCLUDES *******************************************************************/ #include "npfs.h" + +// File ID number for NPFS bugchecking support +#define NPFS_BUGCHECK_FILE_ID (NPFS_BUGCHECK_WRITESUP) /* FUNCTIONS ******************************************************************/

1 0

[aandrejevic] 60050: [SOFT386] Implement ARPL.
by aandrejevic＠svn.reactos.org 12 Sep '13

12 Sep '13

Author: aandrejevic Date: Thu Sep 12 00:05:23 2013 New Revision: 60050 URL: http://svn.reactos.org/svn/reactos?rev=60050&view=rev Log: [SOFT386] Implement ARPL. Modified: branches/ntvdm/lib/soft386/opcodes.c Modified: branches/ntvdm/lib/soft386/opcodes.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opcodes.c?rev… ============================================================================== --- branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] Thu Sep 12 00:05:23 2013 @@ -3583,10 +3583,46 @@ SOFT386_OPCODE_HANDLER(Soft386OpcodeArpl) { - // TODO: NOT IMPLEMENTED - UNIMPLEMENTED; - - return FALSE; + USHORT FirstValue, SecondValue; + SOFT386_MOD_REG_RM ModRegRm; + + if (!(State->ControlRegisters[SOFT386_REG_CR0] & SOFT386_CR0_PE) + || State->PrefixFlags) + { + /* No prefixes allowed, protected mode only */ + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } + + /* Get the operands */ + if (!Soft386ReadModrmWordOperands(State, + &ModRegRm, + &FirstValue, + &SecondValue)) + { + /* Exception occurred */ + return FALSE; + } + + /* Check if the RPL needs adjusting */ + if ((SecondValue & 3) < (FirstValue & 3)) + { + /* Adjust the RPL */ + SecondValue &= ~3; + SecondValue |= FirstValue & 3; + + /* Set ZF */ + State->Flags.Zf = TRUE; + + /* Write back the result */ + return Soft386WriteModrmWordOperands(State, &ModRegRm, FALSE, SecondValue); + } + else + { + /* Clear ZF */ + State->Flags.Zf = FALSE; + return TRUE; + } } SOFT386_OPCODE_HANDLER(Soft386OpcodePushImm)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs