Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tfaber] 68871: [SERVICES] - Correctly copy group dependencies in ScmWriteDependencies (DPH)
by tfaber＠svn.reactos.org 30 Aug '15

30 Aug '15

Author: tfaber Date: Sun Aug 30 09:52:57 2015 New Revision: 68871 URL: http://svn.reactos.org/svn/reactos?rev=68871&view=rev Log: [SERVICES] - Correctly copy group dependencies in ScmWriteDependencies (DPH) Modified: trunk/reactos/base/system/services/config.c Modified: trunk/reactos/base/system/services/config.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/confi… ============================================================================== --- trunk/reactos/base/system/services/config.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/config.c [iso-8859-1] Sun Aug 30 09:52:57 2015 @@ -129,6 +129,7 @@ if (*lpSrc == SC_GROUP_IDENTIFIERW) { lpSrc++; + cchLength--; cchGroupLength += cchLength; wcscpy(lpDst, lpSrc); lpDst = lpDst + cchLength;

1 0

[tfaber] 68870: [TCPIP_DRVTEST] - Handle errors to avoid uninitialized variable usage
by tfaber＠svn.reactos.org 30 Aug '15

30 Aug '15

Author: tfaber Date: Sun Aug 30 09:31:23 2015 New Revision: 68870 URL: http://svn.reactos.org/svn/reactos?rev=68870&view=rev Log: [TCPIP_DRVTEST] - Handle errors to avoid uninitialized variable usage Modified: trunk/rostests/drivers/tcpip/InterfaceInfo.c Modified: trunk/rostests/drivers/tcpip/InterfaceInfo.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/drivers/tcpip/InterfaceIn… ============================================================================== --- trunk/rostests/drivers/tcpip/InterfaceInfo.c [iso-8859-1] (original) +++ trunk/rostests/drivers/tcpip/InterfaceInfo.c [iso-8859-1] Sun Aug 30 09:31:23 2015 @@ -19,6 +19,7 @@ HANDLE FileHandle; DWORD BufferSize; BOOL Result; + DWORD Error; ULONG i; /* Open a control channel file for TCP */ @@ -44,8 +45,9 @@ sizeof(InterfaceInfo), &BufferSize, NULL); + Error = GetLastError(); ok(!Result, "DeviceIoControl succeeded.\n"); - ok_long(GetLastError(), ERROR_INVALID_FUNCTION); + ok_long(Error, ERROR_INVALID_FUNCTION); ok_long(BufferSize, 0); CloseHandle(FileHandle); @@ -73,7 +75,7 @@ sizeof(InterfaceInfo), &BufferSize, NULL); - ok(Result, "DeviceIoControl failed.\n"); + ok(Result, "DeviceIoControl failed, GLE %lu.\n", GetLastError()); ok(BufferSize != 0, "Buffer size is zero.\n"); trace("Buffer size is %lu.\n", BufferSize); @@ -92,14 +94,17 @@ BufferSize, &BufferSize, NULL); - ok(Result, "DeviceIoControl failed.\n"); + ok(Result, "DeviceIoControl failed, GLE %lu.\n", GetLastError()); } - /* Nothing much to test. Just print out the adapters we got */ - trace("We got %ld adapters.\n", pInterfaceInfo->NumAdapters); - for (i = 0; i < pInterfaceInfo->NumAdapters; i++) + if (Result && BufferSize >= RTL_SIZEOF_THROUGH_FIELD(IP_INTERFACE_INFO, NumAdapters)) { - trace("\tIndex %lu, name %S\n", pInterfaceInfo->Adapter[i].Index, pInterfaceInfo->Adapter[i].Name); + /* Nothing much to test. Just print out the adapters we got */ + trace("We got %ld adapters.\n", pInterfaceInfo->NumAdapters); + for (i = 0; i < pInterfaceInfo->NumAdapters; i++) + { + trace("\tIndex %lu, name %S\n", pInterfaceInfo->Adapter[i].Index, pInterfaceInfo->Adapter[i].Name); + } } if (pInterfaceInfo != &InterfaceInfo)

1 0

[akhaldi] 68869: [LIBPNG] Sync up to 1.6.18. CORE-10071
by akhaldi＠svn.reactos.org 30 Aug '15

30 Aug '15

Author: akhaldi Date: Sun Aug 30 09:23:53 2015 New Revision: 68869 URL: http://svn.reactos.org/svn/reactos?rev=68869&view=rev Log: [LIBPNG] Sync up to 1.6.18. CORE-10071 Modified: trunk/reactos/dll/3rdparty/libpng/docs/ANNOUNCE trunk/reactos/dll/3rdparty/libpng/docs/CHANGES trunk/reactos/dll/3rdparty/libpng/docs/LICENSE trunk/reactos/dll/3rdparty/libpng/docs/README trunk/reactos/dll/3rdparty/libpng/docs/libpng-manual.txt trunk/reactos/dll/3rdparty/libpng/png.c trunk/reactos/dll/3rdparty/libpng/pngmem.c trunk/reactos/dll/3rdparty/libpng/pngpread.c trunk/reactos/dll/3rdparty/libpng/pngpriv.h trunk/reactos/dll/3rdparty/libpng/pngread.c trunk/reactos/dll/3rdparty/libpng/pngrtran.c trunk/reactos/dll/3rdparty/libpng/pngrutil.c trunk/reactos/dll/3rdparty/libpng/pngset.c trunk/reactos/dll/3rdparty/libpng/pngstruct.h trunk/reactos/dll/3rdparty/libpng/pngtrans.c trunk/reactos/dll/3rdparty/libpng/pngwrite.c trunk/reactos/dll/3rdparty/libpng/pngwtran.c trunk/reactos/dll/3rdparty/libpng/pngwutil.c trunk/reactos/include/reactos/libs/libpng/png.h trunk/reactos/include/reactos/libs/libpng/pngconf.h trunk/reactos/include/reactos/libs/libpng/pnglibconf.h trunk/reactos/media/doc/3rd Party Files.txt [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/3rdparty/libpng/docs/ANNOUNCE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libpng/docs/A… Modified: trunk/reactos/dll/3rdparty/libpng/docs/CHANGES URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libpng/docs/C… Modified: trunk/reactos/dll/3rdparty/libpng/docs/LICENSE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libpng/docs/L… Modified: trunk/reactos/dll/3rdparty/libpng/docs/README URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libpng/docs/R… Modified: trunk/reactos/dll/3rdparty/libpng/docs/libpng-manual.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libpng/docs/l… Modified: trunk/reactos/dll/3rdparty/libpng/png.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libpng/png.c?… Modified: trunk/reactos/dll/3rdparty/libpng/pngmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libpng/pngmem… Modified: trunk/reactos/dll/3rdparty/libpng/pngpread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libpng/pngpre… Modified: trunk/reactos/dll/3rdparty/libpng/pngpriv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libpng/pngpri… Modified: trunk/reactos/dll/3rdparty/libpng/pngread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libpng/pngrea… Modified: trunk/reactos/dll/3rdparty/libpng/pngrtran.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libpng/pngrtr… Modified: trunk/reactos/dll/3rdparty/libpng/pngrutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libpng/pngrut… Modified: trunk/reactos/dll/3rdparty/libpng/pngset.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libpng/pngset… Modified: trunk/reactos/dll/3rdparty/libpng/pngstruct.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libpng/pngstr… Modified: trunk/reactos/dll/3rdparty/libpng/pngtrans.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libpng/pngtra… Modified: trunk/reactos/dll/3rdparty/libpng/pngwrite.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libpng/pngwri… Modified: trunk/reactos/dll/3rdparty/libpng/pngwtran.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libpng/pngwtr… Modified: trunk/reactos/dll/3rdparty/libpng/pngwutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libpng/pngwut… Modified: trunk/reactos/include/reactos/libs/libpng/png.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libpn… Modified: trunk/reactos/include/reactos/libs/libpng/pngconf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libpn… Modified: trunk/reactos/include/reactos/libs/libpng/pnglibconf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libpn… Modified: trunk/reactos/media/doc/3rd Party Files.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/3rd%20Party%20Fi…

1 0

[gadamopoulos] 68868: [SHELL32] - Fix copy paste mistake in CDesktopFolder
by gadamopoulos＠svn.reactos.org 30 Aug '15

30 Aug '15

Author: gadamopoulos Date: Sun Aug 30 08:51:18 2015 New Revision: 68868 URL: http://svn.reactos.org/svn/reactos?rev=68868&view=rev Log: [SHELL32] - Fix copy paste mistake in CDesktopFolder Modified: trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp Modified: trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp [iso-8859-1] Sun Aug 30 08:51:18 2015 @@ -274,7 +274,7 @@ if (FAILED(hr)) return hr; - hr = m_DesktopFSFolder->QueryInterface(IID_PPV_ARG(IPersistFolder3, &ppf3)); + hr = m_SharedDesktopFSFolder->QueryInterface(IID_PPV_ARG(IPersistFolder3, &ppf3)); if (FAILED(hr)) return hr;

1 0

[tfaber] 68867: [ADVAPI32_APITEST] - Do not call RtlInitUnicodeString on an unterminated string (DPH)
by tfaber＠svn.reactos.org 30 Aug '15

30 Aug '15

Author: tfaber Date: Sun Aug 30 08:37:13 2015 New Revision: 68867 URL: http://svn.reactos.org/svn/reactos?rev=68867&view=rev Log: [ADVAPI32_APITEST] - Do not call RtlInitUnicodeString on an unterminated string (DPH) Modified: trunk/rostests/apitests/advapi32/HKEY_CLASSES_ROOT.c Modified: trunk/rostests/apitests/advapi32/HKEY_CLASSES_ROOT.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/advapi32/HKEY_CL… ============================================================================== --- trunk/rostests/apitests/advapi32/HKEY_CLASSES_ROOT.c [iso-8859-1] (original) +++ trunk/rostests/apitests/advapi32/HKEY_CLASSES_ROOT.c [iso-8859-1] Sun Aug 30 08:37:13 2015 @@ -60,8 +60,9 @@ Status = NtQueryKey(hKey, KeyNameInformation, NameInformation, InfoLength, &InfoLength); ok_ntstatus(Status, STATUS_SUCCESS); - RtlInitUnicodeString(&InfoName, NameInformation->Name); + InfoName.Buffer = NameInformation->Name; InfoName.Length = NameInformation->NameLength; + InfoName.MaximumLength = InfoName.Length; RtlDuplicateUnicodeString(RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE, &InfoName, KeyName);

1 0

[tfaber] 68866: [RTL] - Use the correct busy node pointer in RtlpPageHeapDestroy CORE-9735 #resolve
by tfaber＠svn.reactos.org 30 Aug '15

30 Aug '15

Author: tfaber Date: Sun Aug 30 07:26:26 2015 New Revision: 68866 URL: http://svn.reactos.org/svn/reactos?rev=68866&view=rev Log: [RTL] - Use the correct busy node pointer in RtlpPageHeapDestroy CORE-9735 #resolve Modified: trunk/reactos/lib/rtl/heappage.c Modified: trunk/reactos/lib/rtl/heappage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heappage.c?rev=688… ============================================================================== --- trunk/reactos/lib/rtl/heappage.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heappage.c [iso-8859-1] Sun Aug 30 07:26:26 2015 @@ -1266,7 +1266,7 @@ RtlpDphNumberOfDelayedFreeBlocks--; /* Free the normal heap */ - RtlFreeHeap (NormalHeap, 0, BlockInfo); + RtlFreeHeap(NormalHeap, 0, BlockInfo); } /* Move to the next one */ @@ -1613,6 +1613,7 @@ RtlpPageHeapDestroy(HANDLE HeapPtr) { PDPH_HEAP_ROOT DphRoot; + PVOID Ptr; PDPH_HEAP_BLOCK Node, Next; PHEAP NormalHeap; ULONG Value; @@ -1637,10 +1638,11 @@ RtlpDphFreeDelayedBlocksFromHeap(DphRoot, NormalHeap); /* Go through the busy blocks */ - Node = RtlEnumerateGenericTableAvl(&DphRoot->BusyNodesTable, TRUE); - - while (Node) - { + Ptr = RtlEnumerateGenericTableAvl(&DphRoot->BusyNodesTable, TRUE); + + while (Ptr) + { + Node = CONTAINING_RECORD(Ptr, DPH_HEAP_BLOCK, pUserAllocation); if (!(DphRoot->ExtraFlags & DPH_EXTRA_CHECK_UNDERRUN)) { if (!RtlpDphIsPageHeapBlock(DphRoot, Node->pUserAllocation, &Value, TRUE)) @@ -1653,7 +1655,7 @@ //AVrfInternalHeapFreeNotification(); /* Go to the next node */ - Node = RtlEnumerateGenericTableAvl(&DphRoot->BusyNodesTable, FALSE); + Ptr = RtlEnumerateGenericTableAvl(&DphRoot->BusyNodesTable, FALSE); } /* Acquire the global heap list lock */

1 0

[gadamopoulos] 68865: [SHELL32] - When binding to a drive item try to initialize the new CFSFolder using IPersistFolder3. That allows us to get the path of the drive right from the pidl instead of ...
by gadamopoulos＠svn.reactos.org 29 Aug '15

29 Aug '15

Author: gadamopoulos Date: Sat Aug 29 21:09:29 2015 New Revision: 68865 URL: http://svn.reactos.org/svn/reactos?rev=68865&view=rev Log: [SHELL32] - When binding to a drive item try to initialize the new CFSFolder using IPersistFolder3. That allows us to get the path of the drive right from the pidl instead of getting a new reference to the CDrivesFolder and using GetDisplayNameOf for the pidl. Modified: trunk/reactos/dll/win32/shell32/shlfolder.cpp Modified: trunk/reactos/dll/win32/shell32/shlfolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlfolde… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlfolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlfolder.cpp [iso-8859-1] Sat Aug 29 21:09:29 2015 @@ -163,7 +163,7 @@ CComPtr<IPersistFolder> ppf; CComPtr<IPersistFolder3> ppf3; - if (_ILIsFolder(pidlChild) && + if ((_ILIsFolder(pidlChild) || _ILIsDrive(pidlChild)) && SUCCEEDED(pShellFolder->QueryInterface(IID_PPV_ARG(IPersistFolder3, &ppf3)))) { PERSIST_FOLDER_TARGET_INFO ppfti;

1 0

[hbelusca] 68864: [NTOS:KD]: Disable to dprints.
by hbelusca＠svn.reactos.org 29 Aug '15

29 Aug '15

Author: hbelusca Date: Sat Aug 29 16:56:09 2015 New Revision: 68864 URL: http://svn.reactos.org/svn/reactos?rev=68864&view=rev Log: [NTOS:KD]: Disable to dprints. Modified: trunk/reactos/ntoskrnl/kd64/kdbreak.c Modified: trunk/reactos/ntoskrnl/kd64/kdbreak.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/kdbreak.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/kdbreak.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd64/kdbreak.c [iso-8859-1] Sat Aug 29 16:56:09 2015 @@ -194,7 +194,7 @@ if (!NT_SUCCESS(Status)) { /* This should never happen */ - KdpDprintf("Failed to delete deferred breakpoint at address 0x%p\n", + KdpDprintf("Unable to delete deferred breakpoint at address 0x%p\n", KdpBreakpointTable[i].Address); KdpOweBreakpoint = TRUE; } @@ -252,8 +252,8 @@ if (!NT_SUCCESS(Status)) { /* Memory is inaccessible now, restoring original instruction is deferred */ - KdpDprintf("Failed to delete breakpoint at address 0x%p\n", - KdpBreakpointTable[BpIndex].Address); + // KdpDprintf("Failed to delete breakpoint at address 0x%p\n", + // KdpBreakpointTable[BpIndex].Address); KdpBreakpointTable[BpIndex].Flags |= KD_BREAKPOINT_EXPIRED; KdpOweBreakpoint = TRUE; return FALSE; @@ -293,8 +293,9 @@ NULL); if (!NT_SUCCESS(Status)) { - KdpDprintf("Failed to restore breakpoint at address 0x%p\n", - KdpBreakpointTable[BpIndex].Address); + /* Memory is inaccessible now, restoring breakpoint is deferred */ + // KdpDprintf("Failed to restore breakpoint at address 0x%p\n", + // KdpBreakpointTable[BpIndex].Address); KdpBreakpointTable[BpIndex].Flags |= KD_BREAKPOINT_PENDING; KdpOweBreakpoint = TRUE; return FALSE;

1 0

[tfaber] 68863: [HAL] - Implement HalStartProfileInterrupt, HalSetProfileInterval, and HalpProfileInterruptHandler Now kernrate works! CORE-10066 #resolve
by tfaber＠svn.reactos.org 29 Aug '15

29 Aug '15

Author: tfaber Date: Sat Aug 29 16:45:00 2015 New Revision: 68863 URL: http://svn.reactos.org/svn/reactos?rev=68863&view=rev Log: [HAL] - Implement HalStartProfileInterrupt, HalSetProfileInterval, and HalpProfileInterruptHandler Now kernrate works! CORE-10066 #resolve Modified: trunk/reactos/hal/halx86/generic/profil.c trunk/reactos/hal/halx86/generic/timer.c trunk/reactos/hal/halx86/include/halp.h Modified: trunk/reactos/hal/halx86/generic/profil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/profil.… ============================================================================== --- trunk/reactos/hal/halx86/generic/profil.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/profil.c [iso-8859-1] Sat Aug 29 16:45:00 2015 @@ -13,6 +13,11 @@ #define NDEBUG #include <debug.h> +/* GLOBALS *******************************************************************/ + +BOOLEAN HalpProfilingStopped = TRUE; +UCHAR HalpProfileRate = 8; + /* FUNCTIONS *****************************************************************/ /* @@ -23,6 +28,8 @@ HalStopProfileInterrupt(IN KPROFILE_SOURCE ProfileSource) { UCHAR StatusB; + + UNREFERENCED_PARAMETER(ProfileSource); /* Acquire the CMOS lock */ HalpAcquireCmosSpinLock(); @@ -36,6 +43,8 @@ /* Write new value into Status Register B */ HalpWriteCmos(RTC_REGISTER_B, StatusB); + HalpProfilingStopped = TRUE; + /* Release the CMOS lock */ HalpReleaseCmosSpinLock(); } @@ -47,8 +56,27 @@ NTAPI HalStartProfileInterrupt(IN KPROFILE_SOURCE ProfileSource) { - UNIMPLEMENTED; - return; + UCHAR StatusA, StatusB; + + UNREFERENCED_PARAMETER(ProfileSource); + + HalpProfilingStopped = FALSE; + + /* Acquire the CMOS lock */ + HalpAcquireCmosSpinLock(); + + /* Set the interval in Status Register A */ + StatusA = HalpReadCmos(RTC_REGISTER_A); + StatusA = (StatusA & 0xF0) | HalpProfileRate; + HalpWriteCmos(RTC_REGISTER_A, StatusA); + + /* Enable periodic interrupts in Status Register B */ + StatusB = HalpReadCmos(RTC_REGISTER_B); + StatusB = StatusB | RTC_REG_B_PI; + HalpWriteCmos(RTC_REGISTER_B, StatusB); + + /* Release the CMOS lock */ + HalpReleaseCmosSpinLock(); } /* @@ -58,6 +86,32 @@ NTAPI HalSetProfileInterval(IN ULONG_PTR Interval) { - UNIMPLEMENTED; - return Interval; + ULONG_PTR CurrentValue, NextValue; + UCHAR i; + + /* Normalize interval. 122100 ns is the smallest supported */ + Interval &= ~(1 << 31); + if (Interval < 1221) + Interval = 1221; + + /* Highest rate value of 15 means 500 ms */ + CurrentValue = 5000000; + for (i = 15; ; i--) + { + NextValue = (CurrentValue + 1) / 2; + if (Interval > CurrentValue - NextValue / 2) + break; + CurrentValue = NextValue; + } + + /* Interval as needed by RTC */ + HalpProfileRate = i; + + /* Reset the */ + if (!HalpProfilingStopped) + { + HalStartProfileInterrupt(0); + } + + return CurrentValue; } Modified: trunk/reactos/hal/halx86/generic/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/timer.c… ============================================================================== --- trunk/reactos/hal/halx86/generic/timer.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/timer.c [iso-8859-1] Sat Aug 29 16:45:00 2015 @@ -188,9 +188,21 @@ /* Start the interrupt */ if (HalBeginSystemInterrupt(PROFILE_LEVEL, PRIMARY_VECTOR_BASE + 8, &Irql)) { - /* Profiling isn't yet enabled */ - UNIMPLEMENTED; - ASSERT(FALSE); + /* Spin until the interrupt pending bit is clear */ + HalpAcquireCmosSpinLock(); + while (HalpReadCmos(RTC_REGISTER_C) & RTC_REG_C_IRQ) + ; + HalpReleaseCmosSpinLock(); + + /* If profiling is enabled, call the kernel function */ + if (!HalpProfilingStopped) + { + KeProfileInterrupt(TrapFrame); + } + + /* Finish the interrupt */ + _disable(); + HalEndSystemInterrupt(Irql, TrapFrame); } /* Spurious, just end the interrupt */ Modified: trunk/reactos/hal/halx86/include/halp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/halp.h?… ============================================================================== --- trunk/reactos/hal/halx86/include/halp.h [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/include/halp.h [iso-8859-1] Sat Aug 29 16:45:00 2015 @@ -68,6 +68,7 @@ #define RTC_REGISTER_B 0x0B #define RTC_REG_B_PI 0x40 #define RTC_REGISTER_C 0x0C +#define RTC_REG_C_IRQ 0x80 #define RTC_REGISTER_D 0x0D #define RTC_REGISTER_CENTURY 0x32 @@ -585,6 +586,9 @@ DECLSPEC_NORETURN VOID FASTCALL HalpApcInterrupt2ndEntry(IN PKTRAP_FRAME TrapFrame); DECLSPEC_NORETURN VOID FASTCALL HalpDispatchInterrupt2ndEntry(IN PKTRAP_FRAME TrapFrame); +/* profil.c */ +extern BOOLEAN HalpProfilingStopped; + /* timer.c */ VOID NTAPI HalpInitializeClock(VOID); VOID HalpClockInterrupt(VOID);

1 0

[ekohl] 68862: [WINLOGON] - Read notification DLL parameters. - Use the Enabled value.
by ekohl＠svn.reactos.org 29 Aug '15

29 Aug '15

Author: ekohl Date: Sat Aug 29 15:50:02 2015 New Revision: 68862 URL: http://svn.reactos.org/svn/reactos?rev=68862&view=rev Log: [WINLOGON] - Read notification DLL parameters. - Use the Enabled value. Modified: trunk/reactos/base/system/winlogon/notify.c Modified: trunk/reactos/base/system/winlogon/notify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/notif… ============================================================================== --- trunk/reactos/base/system/winlogon/notify.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/notify.c [iso-8859-1] Sat Aug 29 15:50:02 2015 @@ -37,6 +37,12 @@ LIST_ENTRY ListEntry; HINSTANCE hInstance; + BOOL bEnabled; + BOOL bAsynchronous; + BOOL bSafe; + BOOL bImpersonate; + BOOL bSmartCardLogon; + DWORD dwMaxWait; PWLX_NOTIFY_HANDLER Handler[LastHandler]; } NOTIFICATION_ITEM, *PNOTIFICATION_ITEM; @@ -117,7 +123,57 @@ if (NotificationDll == NULL) return; + NotificationDll->bEnabled = TRUE; + NotificationDll->dwMaxWait = 30; /* FIXME: ??? */ NotificationDll->hInstance = hInstance; + + dwSize = sizeof(BOOL); + RegQueryValueExW(hDllKey, + L"Asynchronous", + NULL, + &dwType, + (PBYTE)&NotificationDll->bAsynchronous, + &dwSize); + + dwSize = sizeof(BOOL); + RegQueryValueExW(hDllKey, + L"Enabled", + NULL, + &dwType, + (PBYTE)&NotificationDll->bEnabled, + &dwSize); + + dwSize = sizeof(BOOL); + RegQueryValueExW(hDllKey, + L"Impersonate", + NULL, + &dwType, + (PBYTE)&NotificationDll->bImpersonate, + &dwSize); + + dwSize = sizeof(BOOL); + RegQueryValueExW(hDllKey, + L"Safe", + NULL, + &dwType, + (PBYTE)&NotificationDll->bSafe, + &dwSize); + + dwSize = sizeof(BOOL); + RegQueryValueExW(hDllKey, + L"SmartCardLogonNotify", + NULL, + &dwType, + (PBYTE)&NotificationDll->bSmartCardLogon, + &dwSize); + + dwSize = sizeof(DWORD); + RegQueryValueExW(hDllKey, + L"MaxWait", + NULL, + &dwType, + (PBYTE)&NotificationDll->dwMaxWait, + &dwSize); for (i = LogonHandler; i < LastHandler; i++) { @@ -243,7 +299,7 @@ NOTIFICATION_ITEM, ListEntry); TRACE("NotificationDll: %p\n", NotificationDll); - if (NotificationDll != NULL) + if (NotificationDll != NULL && NotificationDll->bEnabled) { TRACE("NotificationDll->Handler: %p\n", NotificationDll->Handler[Type]); if (NotificationDll->Handler[Type] != NULL)

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