Ros-diffs September 2010

ros-diffs@reactos.org

18 participants
278 discussions

[akhaldi] 48760: [CMAKE] - Fix usetup build.
by akhaldi＠svn.reactos.org 12 Sep '10

12 Sep '10

Author: akhaldi Date: Sun Sep 12 19:38:21 2010 New Revision: 48760 URL: http://svn.reactos.org/svn/reactos?rev=48760&view=rev Log: [CMAKE] - Fix usetup build. Modified: branches/cmake-bringup/base/setup/usetup/CMakeLists.txt Modified: branches/cmake-bringup/base/setup/usetup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/usetup… ============================================================================== --- branches/cmake-bringup/base/setup/usetup/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/setup/usetup/CMakeLists.txt [iso-8859-1] Sun Sep 12 19:38:21 2010 @@ -1,6 +1,10 @@ set(CMAKE_C_LINK_EXECUTABLE "<CMAKE_C_COMPILER> <FLAGS> <CMAKE_C_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES> -Wl,-L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") set(CMAKE_EXE_LINKER_FLAGS "-nodefaultlibs -nostdlib -Wl,-entry,_NtProcessStartup -Wl,--enable-stdcall-fixup -Wl,--enable-auto-image-base -Wl,--kill-at -Wl,-T,${REACTOS_SOURCE_DIR}/global.lds") + +include_directories(${REACTOS_SOURCE_DIR}/lib/newinflib) +include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/zlib) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/drivers) add_executable(usetup WIN32 interface/usetup.c @@ -26,10 +30,13 @@ progress.c registry.c settings.c -) + usetup.rc) -include_directories(${REACTOS_SOURCE_DIR}/lib/newinflib) -include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/zlib) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/drivers) -target_link_libraries(usetup mingw_main zlib newinflib ext2lib vfatlib ${REACTOS_SOURCE_DIR}/dll/ntdll/libntdll.a - mingw_common -lmsvcrt) +target_link_libraries(usetup + mingw_main + zlib + newinflib + ext2lib + vfatlib + mingw_common + -lmsvcrt)

1 0

[sir_richard] 48759: Likely fix for bug 5600: [NTOS]: Using IsBadRead/CodePtr, it's possible for user-mode code to generate cases where we *think* this is an ARM3-managed piece of VA, which will al...
by sir_richard＠svn.reactos.org 12 Sep '10

12 Sep '10

Author: sir_richard Date: Sun Sep 12 19:10:27 2010 New Revision: 48759 URL: http://svn.reactos.org/svn/reactos?rev=48759&view=rev Log: Likely fix for bug 5600: [NTOS]: Using IsBadRead/CodePtr, it's possible for user-mode code to generate cases where we *think* this is an ARM3-managed piece of VA, which will always have a VAD (Since we only manage the PEB/TEB), but actually it's a bogus VA-looking address that is actually invalid. We didn't consider this case. We now implement the same code Windows normally would also handle, when the VA is bogus, and accept that no VAD might be found, so MM_NOACCESS is returned and thus an access violation sent to the caller. In the case of the IsBad...Ptr, this function would then return TRUE, as the caller expects. 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] Sun Sep 12 19:10:27 2010 @@ -42,9 +42,14 @@ return MmSharedUserDataPte; } - /* Find the VAD, it must exist, since we only handle PEB/TEB */ + /* Find the VAD, it might not exist if the address is bogus */ Vad = MiLocateAddress(VirtualAddress); - ASSERT(Vad); + if (!Vad) + { + /* Bogus virtual address */ + *ProtectCode = MM_NOACCESS; + return NULL; + } /* This must be a TEB/PEB VAD */ ASSERT(Vad->u.VadFlags.PrivateMemory == TRUE); @@ -726,8 +731,23 @@ /* Check if this address range belongs to a valid allocation (VAD) */ ProtoPte = MiCheckVirtualAddress(Address, &ProtectionCode, &Vad); - ASSERT(ProtectionCode != MM_NOACCESS); - + if (ProtectionCode == MM_NOACCESS) + { + /* This is a bogus VA */ + Status = STATUS_ACCESS_VIOLATION; + + /* Could be a not-yet-mapped paged pool page table */ +#if (_MI_PAGING_LEVELS == 2) + MiCheckPdeForPagedPool(Address); +#endif + /* See if that fixed it */ + if (PointerPte->u.Hard.Valid == 1) Status = STATUS_SUCCESS; + + /* Return the status */ + MiUnlockProcessWorkingSet(CurrentProcess, CurrentThread); + return Status; + } + /* Did we get a prototype PTE back? */ if (!ProtoPte) {

1 0

[sir_richard] 48758: [NTOS]: Move the fix for pool corruption due to dangling MmProcessLinks pointer into its correct location. Thanks again to Martin for the fix.
by sir_richard＠svn.reactos.org 12 Sep '10

12 Sep '10

Author: sir_richard Date: Sun Sep 12 19:02:39 2010 New Revision: 48758 URL: http://svn.reactos.org/svn/reactos?rev=48758&view=rev Log: [NTOS]: Move the fix for pool corruption due to dangling MmProcessLinks pointer into its correct location. Thanks again to Martin for the fix. Modified: trunk/reactos/ntoskrnl/mm/procsup.c trunk/reactos/ntoskrnl/ps/kill.c Modified: trunk/reactos/ntoskrnl/mm/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/procsup.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/procsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/procsup.c [iso-8859-1] Sun Sep 12 19:02:39 2010 @@ -24,6 +24,8 @@ DPRINT("MmDeleteProcessAddressSpace(Process %x (%s))\n", Process, Process->ImageFileName); + + RemoveEntryList(&Process->MmProcessLinks); MmLockAddressSpace(&Process->Vm); Modified: trunk/reactos/ntoskrnl/ps/kill.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/kill.c?rev=487… ============================================================================== --- trunk/reactos/ntoskrnl/ps/kill.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/kill.c [iso-8859-1] Sun Sep 12 19:02:39 2010 @@ -300,8 +300,6 @@ /* Detach */ KeUnstackDetachProcess(&ApcState); - - RemoveEntryList(&Process->MmProcessLinks); /* Completely delete the Address Space */ MmDeleteProcessAddressSpace(Process);

1 0

[ekohl] 48757: Make Services.exe and Winlogon.exe wait for the LSA server to be up and running. Otherwise calls to any LSA function might fail. Thanks to Roel Messiant for testing and analyzing the...
by ekohl＠svn.reactos.org 12 Sep '10

12 Sep '10

Author: ekohl Date: Sun Sep 12 16:29:43 2010 New Revision: 48757 URL: http://svn.reactos.org/svn/reactos?rev=48757&view=rev Log: Make Services.exe and Winlogon.exe wait for the LSA server to be up and running. Otherwise calls to any LSA function might fail. Thanks to Roel Messiant for testing and analyzing the debug logs. See issue #5497 for more details. Modified: trunk/reactos/base/system/services/services.c trunk/reactos/base/system/winlogon/winlogon.c trunk/reactos/dll/win32/lsasrv/lsasrv.c Modified: trunk/reactos/base/system/services/services.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/servi… ============================================================================== --- trunk/reactos/base/system/services/services.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/services.c [iso-8859-1] Sun Sep 12 16:29:43 2010 @@ -80,6 +80,42 @@ } +static VOID +ScmWaitForLsass(VOID) +{ + HANDLE hEvent; + DWORD dwError; + + hEvent = CreateEventW(NULL, + TRUE, + FALSE, + L"LSA_RPC_SERVER_ACTIVE"); + if (hEvent == NULL) + { + dwError = GetLastError(); + DPRINT("Failed to create the notication event (Error %lu)\n", dwError); + + if (dwError == ERROR_ALREADY_EXISTS) + { + hEvent = OpenEventW(SYNCHRONIZE, + FALSE, + L"LSA_RPC_SERVER_ACTIVE"); + if (hEvent == NULL) + { + DPRINT1("Could not open the notification event (Error %lu)\n", GetLastError()); + return; + } + } + } + + DPRINT("Wait for the LSA server!\n"); + WaitForSingleObject(hEvent, INFINITE); + DPRINT("LSA server running!\n"); + + CloseHandle(hEvent); +} + + BOOL ScmNamedPipeHandleRequest(PVOID Request, DWORD RequestSize, @@ -304,9 +340,6 @@ DPRINT("SERVICES: Service Control Manager\n"); - /* Acquire privileges to load drivers */ - AcquireLoadDriverPrivilege(); - /* Create start event */ if (!ScmCreateStartEvent(&hScmStartEvent)) { @@ -345,6 +378,12 @@ /* Register event handler (used for system shutdown) */ SetConsoleCtrlHandler(ShutdownHandlerRoutine, TRUE); + + /* Wait for the LSA server */ + ScmWaitForLsass(); + + /* Acquire privileges to load drivers */ + AcquireLoadDriverPrivilege(); /* Start auto-start services */ ScmAutoStartServices(); Modified: trunk/reactos/base/system/winlogon/winlogon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo… ============================================================================== --- trunk/reactos/base/system/winlogon/winlogon.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/winlogon.c [iso-8859-1] Sun Sep 12 16:29:43 2010 @@ -198,6 +198,43 @@ return res; } + + +static VOID +WaitForLsass(VOID) +{ + HANDLE hEvent; + DWORD dwError; + + hEvent = CreateEventW(NULL, + TRUE, + FALSE, + L"LSA_RPC_SERVER_ACTIVE"); + if (hEvent == NULL) + { + dwError = GetLastError(); + TRACE("WL: Failed to create the notication event (Error %lu)\n", dwError); + + if (dwError == ERROR_ALREADY_EXISTS) + { + hEvent = OpenEventW(SYNCHRONIZE, + FALSE, + L"LSA_RPC_SERVER_ACTIVE"); + if (hEvent == NULL) + { + ERR("WL: Could not open the notification event (Error %lu)\n", GetLastError()); + return; + } + } + } + + TRACE("WL: Wait for the LSA server!\n"); + WaitForSingleObject(hEvent, INFINITE); + TRACE("WL: LSA server running!\n"); + + CloseHandle(hEvent); +} + BOOL DisplayStatusMessage( @@ -348,6 +385,10 @@ DisplayStatusMessage(WLSession, WLSession->WinlogonDesktop, IDS_REACTOSISSTARTINGUP); + + /* Wait for the LSA server */ + WaitForLsass(); + #if 0 /* Connect to NetLogon service (lsass.exe) */ /* Real winlogon uses "Winlogon" */ Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsasrv.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.c [iso-8859-1] Sun Sep 12 16:29:43 2010 @@ -45,9 +45,10 @@ hEvent = OpenEventW(GENERIC_WRITE, FALSE, L"LSA_RPC_SERVER_ACTIVE"); - if (hEvent != NULL) + if (hEvent == NULL) { - ERR("Could not open the notification event!"); + ERR("Could not open the notification event (Error %lu)\n", GetLastError()); + return STATUS_UNSUCCESSFUL; } } }

1 0

[spetreolle] 48756: Add cdmake to build.
by spetreolle＠svn.reactos.org 12 Sep '10

12 Sep '10

Author: spetreolle Date: Sun Sep 12 15:17:44 2010 New Revision: 48756 URL: http://svn.reactos.org/svn/reactos?rev=48756&view=rev Log: Add cdmake to build. Added: branches/cmake-bringup/tools/cdmake/CMakeLists.txt (with props) Modified: branches/cmake-bringup/tools/CMakeLists.txt Modified: branches/cmake-bringup/tools/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/CMakeLists.… ============================================================================== --- branches/cmake-bringup/tools/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/tools/CMakeLists.txt [iso-8859-1] Sun Sep 12 15:17:44 2010 @@ -13,3 +13,5 @@ #add_subdirectory(wmc) add_subdirectory(widl) #add_subdirectory(wrc) +#add_subdirectory(log2lines) +add_subdirectory(cdmake) Added: branches/cmake-bringup/tools/cdmake/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/cdmake/CMak… ============================================================================== --- branches/cmake-bringup/tools/cdmake/CMakeLists.txt (added) +++ branches/cmake-bringup/tools/cdmake/CMakeLists.txt [iso-8859-1] Sun Sep 12 15:17:44 2010 @@ -1,0 +1,2 @@ + +add_executable(cdmake cdmake.c llmosrt.c) Propchange: branches/cmake-bringup/tools/cdmake/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[spetreolle] 48755: Add usetup to build.
by spetreolle＠svn.reactos.org 12 Sep '10

12 Sep '10

Author: spetreolle Date: Sun Sep 12 15:12:20 2010 New Revision: 48755 URL: http://svn.reactos.org/svn/reactos?rev=48755&view=rev Log: Add usetup to build. Added: branches/cmake-bringup/base/setup/usetup/CMakeLists.txt (with props) Modified: branches/cmake-bringup/base/CMakeLists.txt branches/cmake-bringup/base/setup/CMakeLists.txt Modified: branches/cmake-bringup/base/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/CMakeLists.t… ============================================================================== --- branches/cmake-bringup/base/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/CMakeLists.txt [iso-8859-1] Sun Sep 12 15:12:20 2010 @@ -1,6 +1,6 @@ add_subdirectory(applications) #add_subdirectory(services) -#add_subdirectory(setup) +add_subdirectory(setup) #add_subdirectory(shell) #add_subdirectory(system) Modified: branches/cmake-bringup/base/setup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/CMakeL… ============================================================================== --- branches/cmake-bringup/base/setup/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/setup/CMakeLists.txt [iso-8859-1] Sun Sep 12 15:12:20 2010 @@ -1,6 +1,6 @@ #add_subdirectory(reactos) #add_subdirectory(setup) -#add_subdirectory(usetup) +add_subdirectory(usetup) #add_subdirectory(vmwinst) #add_subdirectory(welcome) Added: branches/cmake-bringup/base/setup/usetup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/usetup… ============================================================================== --- branches/cmake-bringup/base/setup/usetup/CMakeLists.txt (added) +++ branches/cmake-bringup/base/setup/usetup/CMakeLists.txt [iso-8859-1] Sun Sep 12 15:12:20 2010 @@ -1,0 +1,35 @@ + +set(CMAKE_C_LINK_EXECUTABLE "<CMAKE_C_COMPILER> <FLAGS> <CMAKE_C_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES> -Wl,-L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") +set(CMAKE_EXE_LINKER_FLAGS "-nodefaultlibs -nostdlib -Wl,-entry,_NtProcessStartup -Wl,--enable-stdcall-fixup -Wl,--enable-auto-image-base -Wl,--kill-at -Wl,-T,${REACTOS_SOURCE_DIR}/global.lds") + +add_executable(usetup WIN32 + interface/usetup.c + interface/devinst.c + interface/consup.c + native/utils/keytrans.c + native/utils/console.c + native/fslist.c + native/console.c + bootsup.c + cabinet.c + chkdsk.c + drivesup.c + filesup.c + filequeue.c + format.c + fslist.c + genlist.c + inffile.c + inicache.c + mui.c + partlist.c + progress.c + registry.c + settings.c +) + +include_directories(${REACTOS_SOURCE_DIR}/lib/newinflib) +include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/zlib) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/drivers) +target_link_libraries(usetup mingw_main zlib newinflib ext2lib vfatlib ${REACTOS_SOURCE_DIR}/dll/ntdll/libntdll.a + mingw_common -lmsvcrt) Propchange: branches/cmake-bringup/base/setup/usetup/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/cmake-bringup/base/setup/usetup/CMakeLists.txt ------------------------------------------------------------------------------ svn:mime-type = text/plain

1 0

[akhaldi] 48754: [PSDK] - Properly guard d3d9types.h and d3dtypes.h against DIRECT3D_VERSION versions.
by akhaldi＠svn.reactos.org 12 Sep '10

12 Sep '10

Author: akhaldi Date: Sun Sep 12 14:51:32 2010 New Revision: 48754 URL: http://svn.reactos.org/svn/reactos?rev=48754&view=rev Log: [PSDK] - Properly guard d3d9types.h and d3dtypes.h against DIRECT3D_VERSION versions. Modified: trunk/reactos/include/psdk/d3d9types.h trunk/reactos/include/psdk/d3dtypes.h Modified: trunk/reactos/include/psdk/d3d9types.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/d3d9types.h?r… ============================================================================== --- trunk/reactos/include/psdk/d3d9types.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/d3d9types.h [iso-8859-1] Sun Sep 12 14:51:32 2010 @@ -20,6 +20,8 @@ #ifndef __WINE_D3D9TYPES_H #define __WINE_D3D9TYPES_H + +#if(DIRECT3D_VERSION >= 0x0900) #pragma pack(push, 4) @@ -1586,4 +1588,6 @@ #pragma pack(pop) +#endif /* DIRECT3D_VERSION >= 0x0900 */ + #endif /* __WINE_D3D9TYPES_H */ Modified: trunk/reactos/include/psdk/d3dtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/d3dtypes.h?re… ============================================================================== --- trunk/reactos/include/psdk/d3dtypes.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/d3dtypes.h [iso-8859-1] Sun Sep 12 14:51:32 2010 @@ -26,6 +26,10 @@ #define __WINE_D3DTYPES_H /* #include <windows.h> FIXME: Need to include for compatibility. Inclusion caused compile fail */ + +#if (DIRECT3D_VERSION >= 0x0800) +#error "You should not include d3dtypes.h when compiling for DX8 or newer." +#endif #include <float.h> #include <ddraw.h>

1 0

[fireball] 48753: - Revert 48750, I was misinformed.
by fireball＠svn.reactos.org 12 Sep '10

12 Sep '10

Author: fireball Date: Sun Sep 12 12:14:46 2010 New Revision: 48753 URL: http://svn.reactos.org/svn/reactos?rev=48753&view=rev Log: - Revert 48750, I was misinformed. Modified: trunk/reactos/ntoskrnl/include/internal/cm.h Modified: trunk/reactos/ntoskrnl/include/internal/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/cm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/cm.h [iso-8859-1] Sun Sep 12 12:14:46 2010 @@ -1607,7 +1607,6 @@ extern PCMHIVE CmiVolatileHive; extern LIST_ENTRY CmiKeyObjectListHead; extern BOOLEAN CmpHoldLazyFlush; -extern UNICODE_STRING CmRegistryMachineSystemName; // // Inlined functions

1 0

[cgutman] 48752: [NDIS] - Fix timer queuing - See issue #5461 for details
by cgutman＠svn.reactos.org 12 Sep '10

12 Sep '10

Author: cgutman Date: Sun Sep 12 11:57:55 2010 New Revision: 48752 URL: http://svn.reactos.org/svn/reactos?rev=48752&view=rev Log: [NDIS] - Fix timer queuing - See issue #5461 for details Modified: trunk/reactos/drivers/network/ndis/ndis/time.c Modified: trunk/reactos/drivers/network/ndis/ndis/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/time.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/time.c [iso-8859-1] Sun Sep 12 11:57:55 2010 @@ -247,16 +247,21 @@ /* relative delays are negative, absolute are positive; resolution is 100ns */ Timeout.QuadPart = Int32x32To64(MillisecondsPeriod, -10000); - + + /* Lock the miniport block */ KeAcquireSpinLock(&Timer->Miniport->Lock, &OldIrql); - /* If KeSetTimer(Ex) returns FALSE then the timer is not in the system's queue (and not in ours either) */ - if (!KeSetTimerEx(&Timer->Timer, Timeout, MillisecondsPeriod, &Timer->Dpc)) - { - /* Add the timer at the head of the timer queue */ - Timer->NextDeferredTimer = Timer->Miniport->TimerQueue; - Timer->Miniport->TimerQueue = Timer; - } + + /* Attempt to dequeue the timer */ + DequeueMiniportTimer(Timer); + + /* Add the timer at the head of the timer queue */ + Timer->NextDeferredTimer = Timer->Miniport->TimerQueue; + Timer->Miniport->TimerQueue = Timer; + + /* Unlock the miniport block */ KeReleaseSpinLock(&Timer->Miniport->Lock, OldIrql); + + KeSetTimerEx(&Timer->Timer, Timeout, MillisecondsPeriod, &Timer->Dpc); } @@ -288,15 +293,20 @@ /* relative delays are negative, absolute are positive; resolution is 100ns */ Timeout.QuadPart = Int32x32To64(MillisecondsToDelay, -10000); + /* Lock the miniport block */ KeAcquireSpinLock(&Timer->Miniport->Lock, &OldIrql); - /* If KeSetTimer(Ex) returns FALSE then the timer is not in the system's queue (and not in ours either) */ - if (!KeSetTimer(&Timer->Timer, Timeout, &Timer->Dpc)) - { - /* Add the timer at the head of the timer queue */ - Timer->NextDeferredTimer = Timer->Miniport->TimerQueue; - Timer->Miniport->TimerQueue = Timer; - } + + /* Attempt to dequeue the timer */ + DequeueMiniportTimer(Timer); + + /* Add the timer at the head of the timer queue */ + Timer->NextDeferredTimer = Timer->Miniport->TimerQueue; + Timer->Miniport->TimerQueue = Timer; + + /* Unlock the miniport block */ KeReleaseSpinLock(&Timer->Miniport->Lock, OldIrql); + + KeSetTimer(&Timer->Timer, Timeout, &Timer->Dpc); }

1 0

[fireball] 48751: [PCIX] - Stefan Ginsberg: Fix a typo in the if expression.
by fireball＠svn.reactos.org 12 Sep '10

12 Sep '10

Author: fireball Date: Sun Sep 12 10:35:01 2010 New Revision: 48751 URL: http://svn.reactos.org/svn/reactos?rev=48751&view=rev Log: [PCIX] - Stefan Ginsberg: Fix a typo in the if expression. Modified: trunk/reactos/drivers/bus/pcix/pdo.c Modified: trunk/reactos/drivers/bus/pcix/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/pdo.c?rev… ============================================================================== --- trunk/reactos/drivers/bus/pcix/pdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/pdo.c [iso-8859-1] Sun Sep 12 10:35:01 2010 @@ -127,7 +127,7 @@ if (((DeviceExtension->BaseClass == PCI_CLASS_PRE_20) && (DeviceExtension->SubClass == PCI_SUBCLASS_PRE_20_VGA)) || ((DeviceExtension->BaseClass == PCI_CLASS_DISPLAY_CTLR) && - (DeviceExtension->SubClass -= PCI_SUBCLASS_VID_VGA_CTLR))) + (DeviceExtension->SubClass == PCI_SUBCLASS_VID_VGA_CTLR))) { /* Always force it on */ DeviceExtension->CommandEnables |= (PCI_ENABLE_IO_SPACE |

1 0

← Newer
1
...
17
18
19
20
21
22
23
...
28
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2010