Ros-diffs November 2013

ros-diffs@reactos.org

16 participants
348 discussions

[jimtabor] 61079: - Move ATI from stub file. Applications like Magnifier uses it but it seems to return an error.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Fri Nov 22 18:45:58 2013 New Revision: 61079 URL: http://svn.reactos.org/svn/reactos?rev=61079&view=rev Log: - Move ATI from stub file. Applications like Magnifier uses it but it seems to return an error. Modified: trunk/reactos/win32ss/user/ntuser/input.c trunk/reactos/win32ss/user/ntuser/ntstubs.c Modified: trunk/reactos/win32ss/user/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/input.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/input.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/input.c [iso-8859-1] Fri Nov 22 18:45:58 2013 @@ -591,6 +591,44 @@ return STATUS_SUCCESS; } +BOOL +APIENTRY +NtUserAttachThreadInput( + IN DWORD idAttach, + IN DWORD idAttachTo, + IN BOOL fAttach) +{ + NTSTATUS Status; + PTHREADINFO pti, ptiTo; + BOOL Ret = FALSE; + + UserEnterExclusive(); + ERR("Enter NtUserAttachThreadInput %s\n",(fAttach ? "TRUE" : "FALSE" )); + + pti = IntTID2PTI((HANDLE)idAttach); + ptiTo = IntTID2PTI((HANDLE)idAttachTo); + + if ( !pti || !ptiTo ) + { + ERR("AttachThreadInput pti or ptiTo NULL.\n"); + EngSetLastError(ERROR_INVALID_PARAMETER); + goto Exit; + } + + Status = UserAttachThreadInput( pti, ptiTo, fAttach); + if (!NT_SUCCESS(Status)) + { + ERR("AttachThreadInput Error Status 0x%x. \n",Status); + EngSetLastError(RtlNtStatusToDosError(Status)); + } + else Ret = TRUE; + +Exit: + ERR("Leave NtUserAttachThreadInput, ret=%d\n",Ret); + UserLeave(); + return Ret; +} + /* * NtUserSendInput * Modified: trunk/reactos/win32ss/user/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/ntstub… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/ntstubs.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/ntstubs.c [iso-8859-1] Fri Nov 22 18:45:58 2013 @@ -18,44 +18,6 @@ { STUB return 0; -} - - -BOOL -APIENTRY -NtUserAttachThreadInput( - IN DWORD idAttach, - IN DWORD idAttachTo, - IN BOOL fAttach) -{ - NTSTATUS Status; - PTHREADINFO pti, ptiTo; - BOOL Ret = FALSE; - - UserEnterExclusive(); - ERR("Enter NtUserAttachThreadInput %s\n",(fAttach ? "TRUE" : "FALSE" )); - - pti = IntTID2PTI((HANDLE)idAttach); - ptiTo = IntTID2PTI((HANDLE)idAttachTo); - - if ( !pti || !ptiTo ) - { - ERR("AttachThreadInput pti or ptiTo NULL.\n"); - EngSetLastError(ERROR_INVALID_PARAMETER); - goto Exit; - } - - Status = UserAttachThreadInput( pti, ptiTo, fAttach); - if (!NT_SUCCESS(Status)) - { - EngSetLastError(RtlNtStatusToDosError(Status)); - } - else Ret = TRUE; - -Exit: - ERR("Leave NtUserAttachThreadInput, ret=%d\n",Ret); - UserLeave(); - return Ret; } //

10 years, 10 months

[jimtabor] 61078: - Fix condition when window is null while in event. See CORE-7635.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Fri Nov 22 17:07:02 2013 New Revision: 61078 URL: http://svn.reactos.org/svn/reactos?rev=61078&view=rev Log: - Fix condition when window is null while in event. See CORE-7635. Modified: trunk/reactos/win32ss/user/ntuser/event.c Modified: trunk/reactos/win32ss/user/ntuser/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/event.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/event.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/event.c [iso-8859-1] Fri Nov 22 17:07:02 2013 @@ -260,7 +260,7 @@ ERR("Global Event 0x%x, idObject %d\n", Event, idObject); IntCallLowLevelEvent( pEH, Event, - UserHMGetHandle(pWnd), + pWnd ? UserHMGetHandle(pWnd) : NULL, idObject, idChild); } @@ -269,7 +269,7 @@ ERR("Local Event 0x%x, idObject %d\n", Event, idObject); co_IntCallEventProc( UserHMGetHandle(pEH), Event, - UserHMGetHandle(pWnd), + pWnd ? UserHMGetHandle(pWnd) : NULL, idObject, idChild, PtrToUint(NtCurrentTeb()->ClientId.UniqueThread),

10 years, 10 months

[tkreuzer] 61077: [NTOSKRNL] Fix / improve NtQueryDefaultLocale, NtSetDefaultLocale, NtQueryDefaultUILanguage and NtSetDefaultUILanguage

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Nov 22 15:23:18 2013 New Revision: 61077 URL: http://svn.reactos.org/svn/reactos?rev=61077&view=rev Log: [NTOSKRNL] Fix / improve NtQueryDefaultLocale, NtSetDefaultLocale, NtQueryDefaultUILanguage and NtSetDefaultUILanguage Modified: trunk/reactos/ntoskrnl/ex/locale.c Modified: trunk/reactos/ntoskrnl/ex/locale.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/locale.c?rev=6… ============================================================================== --- trunk/reactos/ntoskrnl/ex/locale.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/locale.c [iso-8859-1] Fri Nov 22 15:23:18 2013 @@ -178,8 +178,8 @@ /* Check if we have a user profile */ if (UserProfile) { - /* Return thread locale */ - *DefaultLocaleId = PsDefaultThreadLocaleId; + /* Return session wide thread locale */ + *DefaultLocaleId = MmGetSessionLocaleId(); } else { @@ -206,11 +206,14 @@ OBJECT_ATTRIBUTES ObjectAttributes; UNICODE_STRING KeyName; UNICODE_STRING ValueName; + UNICODE_STRING LocaleString; HANDLE KeyHandle; ULONG ValueLength; WCHAR ValueBuffer[20]; HANDLE UserKey; NTSTATUS Status; + UCHAR KeyValueBuffer[256]; + PKEY_VALUE_PARTIAL_INFORMATION KeyValueInformation; PAGED_CODE(); /* Check if we have a profile */ @@ -241,12 +244,52 @@ UserKey, NULL); - /* Check if we don' thave a default locale yet */ + /* Check if we don't have a default locale yet */ if (!DefaultLocaleId) { - DPRINT1("TODO\n"); - Status = STATUS_SUCCESS; - ASSERT(FALSE); + /* Open the key for reading */ + Status = ZwOpenKey(&KeyHandle, KEY_QUERY_VALUE, &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + KeyHandle = NULL; + goto Cleanup; + } + + /* Query the key value */ + KeyValueInformation = (PKEY_VALUE_PARTIAL_INFORMATION)KeyValueBuffer; + Status = ZwQueryValueKey(KeyHandle, + &ValueName, + KeyValuePartialInformation, + KeyValueInformation, + sizeof(KeyValueBuffer), + &ValueLength); + if (!NT_SUCCESS(Status)) + { + goto Cleanup; + } + + /* Check if this is a REG_DWORD */ + if ((KeyValueInformation->Type == REG_DWORD) && + (KeyValueInformation->DataLength == sizeof(ULONG))) + { + /* It contains the LCID as a DWORD */ + DefaultLocaleId = *((ULONG*)KeyValueInformation->Data); + } + /* Otherwise check for a REG_SZ */ + else if (KeyValueInformation->Type == REG_SZ) + { + /* Initialize a unicode string from the value data */ + LocaleString.Buffer = (PWCHAR)KeyValueInformation->Data; + LocaleString.Length = (USHORT)KeyValueInformation->DataLength; + LocaleString.MaximumLength = LocaleString.Length; + + /* Convert the hex string to a number */ + RtlUnicodeStringToInteger(&LocaleString, 16, &DefaultLocaleId); + } + else + { + Status = STATUS_UNSUCCESSFUL; + } } else { @@ -280,10 +323,15 @@ REG_SZ, ValueBuffer, ValueLength); - - /* And close the key */ - ZwClose(KeyHandle); - } + } + } + +Cleanup: + + /* Close the locale key */ + if (KeyHandle) + { + ObCloseHandle(KeyHandle, KernelMode); } /* Close the user key */ @@ -298,8 +346,8 @@ /* Check if it was for a user */ if (UserProfile) { - /* Set thread locale */ - PsDefaultThreadLocaleId = DefaultLocaleId; + /* Set the session wide thread locale */ + MmSetSessionLocaleId(DefaultLocaleId); } else { @@ -383,13 +431,13 @@ } _SEH2_EXCEPT(ExSystemExceptionFilter()) { - /* Get exception code */ - Status = _SEH2_GetExceptionCode(); + /* Return exception code */ + return _SEH2_GetExceptionCode(); } _SEH2_END; - /* Return status */ - return Status; + /* Return success */ + return STATUS_SUCCESS; } /* @@ -399,18 +447,29 @@ NTAPI NtSetDefaultUILanguage(IN LANGID LanguageId) { - PAGED_CODE(); - - /* Check if we don't have a default yet */ - if (!LanguageId) - { - /* FIXME */ - DPRINT1("TODO\n"); - ASSERT(FALSE); - } - - /* Otherwise, call the internal routine */ - return ExpSetCurrentUserUILanguage(L"MUILanguagePending", LanguageId); + NTSTATUS Status; + PAGED_CODE(); + + /* Check if the caller specified a language id */ + if (LanguageId) + { + /* Set the pending MUI language id */ + Status = ExpSetCurrentUserUILanguage(L"MUILanguagePending", LanguageId); + } + else + { + /* Otherwise get the pending MUI language id */ + Status = ExpGetCurrentUserUILanguage(L"MUILanguagePending", &LanguageId); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + /* And apply it as actual */ + Status = ExpSetCurrentUserUILanguage(L"MultiUILanguageId", LanguageId); + } + + return Status; } /* EOF */

10 years, 10 months

[tkreuzer] 61076: [NTOSKRNL] Skip all images that were loaded using MmLoadSystemImage in MiFindInitializationCode. Drivers loaded by Mm are handled in MmFreeDriverInitialization (which we currently...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Nov 22 12:51:40 2013 New Revision: 61076 URL: http://svn.reactos.org/svn/reactos?rev=61076&view=rev Log: [NTOSKRNL] Skip all images that were loaded using MmLoadSystemImage in MiFindInitializationCode. Drivers loaded by Mm are handled in MmFreeDriverInitialization (which we currently run for boot loaded images as well, so duplicated work...). But now at least session loaded images are NOT processed this way. Because even though they can have INIT sections, they don't neccessarily like it when stuff gets removed, especially win32k doesn't like it when it's .rsrc section is being discarded due to it's section flags! Modified: trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c [iso-8859-1] Fri Nov 22 12:51:40 2013 @@ -1457,6 +1457,15 @@ LdrEntry = CONTAINING_RECORD(NextEntry, LDR_DATA_TABLE_ENTRY, InLoadOrderLinks); DllBase = (ULONG_PTR)LdrEntry->DllBase; + /* Only process boot loaded images. Other drivers are processed by + MmFreeDriverInitialization */ + if (LdrEntry->Flags & LDRP_MM_LOADED) + { + /* Keep going */ + NextEntry = NextEntry->Flink; + continue; + } + /* Get the NT header */ NtHeader = RtlImageNtHeader((PVOID)DllBase); if (!NtHeader) @@ -2561,6 +2570,10 @@ PFN_NUMBER PageFrameIndex; PMMPFN Pfn1; PAGED_CODE(); + + /* The page fault handler is broken and doesn't page back in! */ + DPRINT1("WARNING: MiSetPagingOfDriver() called, but paging is broken! ignoring!\n"); + return; /* Get the driver's base address */ ImageBase = MiPteToAddress(PointerPte);

10 years, 10 months

[tkreuzer] 61075: [NTOSKRNL] Check the PTE as well in MmArmAccessFault, when we are at high IRQL and fail if it's not valid. Otherwise we just end up in an endless loop.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Nov 22 12:23:11 2013 New Revision: 61075 URL: http://svn.reactos.org/svn/reactos?rev=61075&view=rev Log: [NTOSKRNL] Check the PTE as well in MmArmAccessFault, when we are at high IRQL and fail if it's not valid. Otherwise we just end up in an endless loop. Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pagfault.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] Fri Nov 22 12:23:11 2013 @@ -1365,9 +1365,10 @@ #if (_MI_PAGING_LEVELS >= 3) (PointerPpe->u.Hard.Valid == 0) || #endif - (PointerPde->u.Hard.Valid == 0)) - { - /* This fault is not valid, printf out some debugging help */ + (PointerPde->u.Hard.Valid == 0) || + (PointerPte->u.Hard.Valid == 0)) + { + /* This fault is not valid, print out some debugging help */ DbgPrint("MM:***PAGE FAULT AT IRQL > 1 Va %p, IRQL %lx\n", Address, OldIrql); @@ -1411,7 +1412,7 @@ } /* Nothing is actually wrong */ - DPRINT1("Fault at IRQL1 is ok\n"); + DPRINT1("Fault at IRQL %u is ok (%p)\n", OldIrql, Address); return STATUS_SUCCESS; }

10 years, 10 months

[tkreuzer] 61074: [NTOSKRNL] Fix MmGetSessionLocaleId and implement MmSetSessionLocaleId

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Nov 22 12:14:47 2013 New Revision: 61074 URL: http://svn.reactos.org/svn/reactos?rev=61074&view=rev Log: [NTOSKRNL] Fix MmGetSessionLocaleId and implement MmSetSessionLocaleId Modified: trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/mm/ARM3/session.c Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] Fri Nov 22 12:14:47 2013 @@ -1798,3 +1798,8 @@ MmGetSessionById( _In_ ULONG SessionId); +_IRQL_requires_max_(APC_LEVEL) +VOID +NTAPI +MmSetSessionLocaleId( + _In_ LCID LocaleId); Modified: trunk/reactos/ntoskrnl/mm/ARM3/session.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/session.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/session.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/session.c [iso-8859-1] Fri Nov 22 12:14:47 2013 @@ -80,9 +80,9 @@ Process = PsGetCurrentProcess(); // - // Check if it's the Session Leader + // Check if it's NOT the Session Leader // - if (Process->Vm.Flags.SessionLeader) + if (!Process->Vm.Flags.SessionLeader) { // // Make sure it has a valid Session @@ -101,6 +101,31 @@ // return PsDefaultThreadLocaleId; } + +_IRQL_requires_max_(APC_LEVEL) +VOID +NTAPI +MmSetSessionLocaleId( + _In_ LCID LocaleId) +{ + PEPROCESS CurrentProcess; + PAGED_CODE(); + + /* Get the current process and check if it is in a session */ + CurrentProcess = PsGetCurrentProcess(); + if ((CurrentProcess->Vm.Flags.SessionLeader == 0) && + (CurrentProcess->Session != NULL)) + { + /* Set the session locale Id */ + ((PMM_SESSION_SPACE)CurrentProcess->Session)->LocaleId = LocaleId; + } + else + { + /* Set the default locale */ + PsDefaultThreadLocaleId = LocaleId; + } +} + VOID NTAPI

10 years, 10 months

[tkreuzer] 61073: [NTOSKRNL] Fix an off-by-one error in an ASSERT in MiDecrementReferenceCount (MmHighestPhysicalPage itself is still a valid PFN)

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Nov 22 12:10:20 2013 New Revision: 61073 URL: http://svn.reactos.org/svn/reactos?rev=61073&view=rev Log: [NTOSKRNL] Fix an off-by-one error in an ASSERT in MiDecrementReferenceCount (MmHighestPhysicalPage itself is still a valid PFN) Modified: trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c [iso-8859-1] Fri Nov 22 12:10:20 2013 @@ -1308,14 +1308,14 @@ ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); /* Sanity checks on the page */ - if (PageFrameIndex >= MmHighestPhysicalPage || + if (PageFrameIndex > MmHighestPhysicalPage || Pfn1 != MI_PFN_ELEMENT(PageFrameIndex) || Pfn1->u3.e2.ReferenceCount == 0 || Pfn1->u3.e2.ReferenceCount >= 2500) { DPRINT1("PageFrameIndex=0x%lx, MmHighestPhysicalPage=0x%lx\n", PageFrameIndex, MmHighestPhysicalPage); DPRINT1("Pfn1=%p, Element=%p, RefCount=%u\n", Pfn1, MI_PFN_ELEMENT(PageFrameIndex), Pfn1->u3.e2.ReferenceCount); - ASSERT(PageFrameIndex < MmHighestPhysicalPage); + ASSERT(PageFrameIndex <= MmHighestPhysicalPage); ASSERT(Pfn1 == MI_PFN_ELEMENT(PageFrameIndex)); ASSERT(Pfn1->u3.e2.ReferenceCount != 0); ASSERT(Pfn1->u3.e2.ReferenceCount < 2500);

10 years, 10 months

[tkreuzer] 61072: [NTOSKRNL/WIN32K] Always call the win32 process callout from PsConvertToGuiThread and handle the case where we alrady have an allocated win32 process there. (The original win32k s...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Nov 22 11:48:51 2013 New Revision: 61072 URL: http://svn.reactos.org/svn/reactos?rev=61072&view=rev Log: [NTOSKRNL/WIN32K] Always call the win32 process callout from PsConvertToGuiThread and handle the case where we alrady have an allocated win32 process there. (The original win32k sometimes allocates a win32 process, but doesn't initialize it, so it needs to be called again to do so) Modified: trunk/reactos/ntoskrnl/ps/win32.c trunk/reactos/win32ss/user/ntuser/main.c Modified: trunk/reactos/ntoskrnl/ps/win32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/win32.c?rev=61… ============================================================================== --- trunk/reactos/ntoskrnl/ps/win32.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/win32.c [iso-8859-1] Fri Nov 22 11:48:51 2013 @@ -82,13 +82,9 @@ MmDeleteKernelStack(OldStack, FALSE); } - /* This check is bizare. Check out win32k later */ - if (!Process->Win32Process) - { - /* Now tell win32k about us */ - Status = PspW32ProcessCallout(Process, TRUE); - if (!NT_SUCCESS(Status)) return Status; - } + /* Always do the process callout! */ + Status = PspW32ProcessCallout(Process, TRUE); + if (!NT_SUCCESS(Status)) return Status; /* Set the new service table */ Thread->Tcb.ServiceTable = KeServiceDescriptorTableShadow; Modified: trunk/reactos/win32ss/user/ntuser/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/main.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] Fri Nov 22 11:48:51 2013 @@ -57,7 +57,7 @@ BOOLEAN Create) { PPROCESSINFO ppiCurrent, *pppi; - DECLARE_RETURN(NTSTATUS); + NTSTATUS Status; ASSERT(Process->Peb); @@ -69,18 +69,26 @@ LARGE_INTEGER Offset; PVOID UserBase = NULL; PRTL_USER_PROCESS_PARAMETERS pParams = Process->Peb->ProcessParameters; - NTSTATUS Status; - - ASSERT(PsGetProcessWin32Process(Process) == NULL); - + + /* We might be called with an already allocated win32 process */ + ppiCurrent = PsGetProcessWin32Process(Process); + if (ppiCurrent != NULL) + { + /* There is no more to do for us (this is a success code!) */ + Status = STATUS_ALREADY_WIN32; + goto Leave; + } + + /* Allocate a new win32 process */ ppiCurrent = ExAllocatePoolWithTag(NonPagedPool, sizeof(PROCESSINFO), USERTAG_PROCESSINFO); - if (ppiCurrent == NULL) { - ERR_CH(UserProcess, "Failed to allocate ppi for PID:0x%lx\n", HandleToUlong(Process->UniqueProcessId)); - RETURN( STATUS_NO_MEMORY); + ERR_CH(UserProcess, "Failed to allocate ppi for PID:0x%lx\n", + HandleToUlong(Process->UniqueProcessId)); + Status = STATUS_NO_MEMORY; + goto Leave; } RtlZeroMemory(ppiCurrent, sizeof(PROCESSINFO)); @@ -111,7 +119,7 @@ if (!NT_SUCCESS(Status)) { TRACE_CH(UserProcess,"Failed to map the global heap! 0x%x\n", Status); - RETURN(Status); + goto Leave; } ppiCurrent->HeapMappings.Next = NULL; ppiCurrent->HeapMappings.KernelMapping = (PVOID)GlobalUserHeap; @@ -241,11 +249,11 @@ ExFreePoolWithTag(ppiCurrent, USERTAG_PROCESSINFO); } - RETURN( STATUS_SUCCESS); - -CLEANUP: + Status = STATUS_SUCCESS; + +Leave: UserLeave(); - END_CLEANUP; + return Status; } NTSTATUS NTAPI

10 years, 10 months

[tkreuzer] 61071: [VIDEOPRT] Handle IOCTL_VIDEO_USE_DEVICE_IN_SESSION

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Nov 22 11:36:22 2013 New Revision: 61071 URL: http://svn.reactos.org/svn/reactos?rev=61071&view=rev Log: [VIDEOPRT] Handle IOCTL_VIDEO_USE_DEVICE_IN_SESSION Modified: trunk/reactos/include/psdk/ntddvdeo.h trunk/reactos/win32ss/drivers/videoprt/dispatch.c trunk/reactos/win32ss/drivers/videoprt/videoprt.c trunk/reactos/win32ss/drivers/videoprt/videoprt.h Modified: trunk/reactos/include/psdk/ntddvdeo.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntddvdeo.h?re… ============================================================================== --- trunk/reactos/include/psdk/ntddvdeo.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntddvdeo.h [iso-8859-1] Fri Nov 22 11:36:22 2013 @@ -264,6 +264,11 @@ OUT HANDLE pPhysDeviceObject; OUT ULONG DualviewFlags; } VIDEO_WIN32K_CALLBACKS, *PVIDEO_WIN32K_CALLBACKS; + +typedef struct _VIDEO_DEVICE_SESSION_STATUS { + ULONG bEnable; + ULONG bSuccess; +} VIDEO_DEVICE_SESSION_STATUS, *PVIDEO_DEVICE_SESSION_STATUS; typedef struct _VIDEO_MEMORY { PVOID RequestedVirtualAddress; @@ -559,6 +564,7 @@ #define DISPLAYPOLICY_DC 0x00000002 #define DISPLAYPOLICY_BOTH 0x00000003 + #ifdef __cplusplus } #endif Modified: trunk/reactos/win32ss/drivers/videoprt/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/videoprt/d… ============================================================================== --- trunk/reactos/win32ss/drivers/videoprt/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/videoprt/dispatch.c [iso-8859-1] Fri Nov 22 11:36:22 2013 @@ -289,13 +289,75 @@ static NTSTATUS +VideoPortUseDeviceInSesion( + _Inout_ PDEVICE_OBJECT DeviceObject, + _Inout_ PVIDEO_DEVICE_SESSION_STATUS SessionState, + _In_ ULONG BufferLength, + _Out_ PULONG_PTR Information) +{ + PVIDEO_PORT_DEVICE_EXTENSION DeviceExtension; + + /* Check buffer size */ + *Information = sizeof(VIDEO_DEVICE_SESSION_STATUS); + if (BufferLength < sizeof(VIDEO_DEVICE_SESSION_STATUS)) + { + ERR_(VIDEOPRT, "Buffer too small for VIDEO_DEVICE_SESSION_STATUS: %lx\n", + BufferLength); + return STATUS_BUFFER_TOO_SMALL; + } + + /* Get the device extension */ + DeviceExtension = DeviceObject->DeviceExtension; + + /* Shall we enable the session? */ + if (SessionState->bEnable) + { + /* Check if we have no session yet */ + if (DeviceExtension->SessionId == -1) + { + /* Use this session and return success */ + DeviceExtension->SessionId = PsGetCurrentProcessSessionId(); + SessionState->bSuccess = TRUE; + } + else + { + ERR_(VIDEOPRT, "Requested to set session, but session is already set to: 0x%lx", + DeviceExtension->SessionId); + SessionState->bSuccess = FALSE; + } + } + else + { + /* Check if we belong to the current session */ + if (DeviceExtension->SessionId == PsGetCurrentProcessSessionId()) + { + /* Reset the session and return success */ + DeviceExtension->SessionId = -1; + SessionState->bSuccess = TRUE; + } + else + { + ERR_(VIDEOPRT, "Requested to reset session, but session is not set\n"); + SessionState->bSuccess = FALSE; + } + } + + return STATUS_SUCCESS; +} + +static +NTSTATUS VideoPortInitWin32kCallbacks( - IN PDEVICE_OBJECT DeviceObject, - PVIDEO_WIN32K_CALLBACKS Win32kCallbacks, - ULONG BufferLength) -{ + _In_ PDEVICE_OBJECT DeviceObject, + _Inout_ PVIDEO_WIN32K_CALLBACKS Win32kCallbacks, + _In_ ULONG BufferLength, + _Out_ PULONG_PTR Information) +{ + *Information = sizeof(VIDEO_WIN32K_CALLBACKS); if (BufferLength < sizeof(VIDEO_WIN32K_CALLBACKS)) { + ERR_(VIDEOPRT, "Buffer too small for VIDEO_WIN32K_CALLBACKS: %lx\n", + BufferLength); return STATUS_BUFFER_TOO_SMALL; } @@ -401,7 +463,16 @@ INFO_(VIDEOPRT, "- IOCTL_VIDEO_INIT_WIN32K_CALLBACKS\n"); Status = VideoPortInitWin32kCallbacks(DeviceObject, Irp->AssociatedIrp.SystemBuffer, - IrpStack->Parameters.DeviceIoControl.InputBufferLength); + IrpStack->Parameters.DeviceIoControl.InputBufferLength, + &Irp->IoStatus.Information); + break; + + case IOCTL_VIDEO_USE_DEVICE_IN_SESSION: + INFO_(VIDEOPRT, "- IOCTL_VIDEO_USE_DEVICE_IN_SESSION\n"); + Status = VideoPortUseDeviceInSesion(DeviceObject, + Irp->AssociatedIrp.SystemBuffer, + IrpStack->Parameters.DeviceIoControl.InputBufferLength, + &Irp->IoStatus.Information); break; default: Modified: trunk/reactos/win32ss/drivers/videoprt/videoprt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/videoprt/v… ============================================================================== --- trunk/reactos/win32ss/drivers/videoprt/videoprt.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/videoprt/videoprt.c [iso-8859-1] Fri Nov 22 11:36:22 2013 @@ -150,6 +150,7 @@ DeviceExtension->PhysicalDeviceObject = PhysicalDeviceObject; DeviceExtension->FunctionalDeviceObject = *DeviceObject; DeviceExtension->DriverExtension = DriverExtension; + DeviceExtension->SessionId = -1; InitializeListHead(&DeviceExtension->ChildDeviceList); Modified: trunk/reactos/win32ss/drivers/videoprt/videoprt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/videoprt/v… ============================================================================== --- trunk/reactos/win32ss/drivers/videoprt/videoprt.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/videoprt/videoprt.h [iso-8859-1] Fri Nov 22 11:36:22 2013 @@ -31,6 +31,7 @@ #include <ndk/kefuncs.h> #include <ndk/rtlfuncs.h> #include <ndk/obfuncs.h> +#include <ndk/psfuncs.h> #define __BROKEN__ #include <miniport.h> @@ -113,6 +114,7 @@ AGP_BUS_INTERFACE_STANDARD AgpInterface; KMUTEX DeviceLock; LIST_ENTRY DmaAdapterList, ChildDeviceList; + ULONG SessionId; CHAR MiniPortDeviceExtension[1]; } VIDEO_PORT_DEVICE_EXTENSION, *PVIDEO_PORT_DEVICE_EXTENSION;

10 years, 10 months

[aandrejevic] 61070: [FAST486] Fix CF calculation in SHRD/SHLD.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Fri Nov 22 02:47:48 2013 New Revision: 61070 URL: http://svn.reactos.org/svn/reactos?rev=61070&view=rev Log: [FAST486] Fix CF calculation in SHRD/SHLD. Modified: branches/ntvdm/lib/fast486/extraops.c Modified: branches/ntvdm/lib/fast486/extraops.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/extraops.c?re… ============================================================================== --- branches/ntvdm/lib/fast486/extraops.c [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/extraops.c [iso-8859-1] Fri Nov 22 02:47:48 2013 @@ -683,7 +683,9 @@ Result = (Destination << Count) | (DoubleSource >> (32 - Count)); /* Update flags */ - State->Flags.Cf = (Destination >> (16 - Count)) & 1; + if (Count <= 16) State->Flags.Cf = (Destination >> (16 - Count)) & 1; + else State->Flags.Cf = (Source >> (32 - Count)) & 1; + if (Count == 1) State->Flags.Of = (Result & SIGN_FLAG_WORD) != (Destination & SIGN_FLAG_WORD); State->Flags.Zf = (Result == 0); @@ -887,7 +889,9 @@ if (Count >= 16) Result |= (ULONG)(Source | (Source << 16)) >> (Count - 16); /* Update flags */ - State->Flags.Cf = (Result >> (Count - 1)) & 1; + if (Count <= 16) State->Flags.Cf = (Destination >> (Count - 1)) & 1; + else State->Flags.Cf = (Source >> (Count - 17)) & 1; + if (Count == 1) State->Flags.Of = (Result & SIGN_FLAG_WORD) != (Destination & SIGN_FLAG_WORD); State->Flags.Zf = (Result == 0);

10 years, 10 months

← Newer
1
...
6
7
8
9
10
11
12
...
35
Older →

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 November 2013