Ros-diffs March 2012

ros-diffs@reactos.org

22 participants
351 discussions

[tfaber] 56094: [CLT2012] - Create a branch for the 0.3.14-CLT2012 version
by tfaber＠svn.reactos.org 09 Mar '12

09 Mar '12

Author: tfaber Date: Fri Mar 9 19:00:33 2012 New Revision: 56094 URL: http://svn.reactos.org/svn/reactos?rev=56094&view=rev Log: [CLT2012] - Create a branch for the 0.3.14-CLT2012 version Added: branches/ros-branch-0_3_14-clt2012/ (props changed) - copied from r56093, tags/ReactOS-0.3.14/ Propchange: branches/ros-branch-0_3_14-clt2012/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Fri Mar 9 19:00:33 2012 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/ros-branch-0_3_14-clt2012/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/ros-branch-0_3_14-clt2012/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/ros-branch-0_3_14-clt2012/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Fri Mar 9 19:00:33 2012 @@ -1,0 +1,14 @@ +*.iso +makefile.auto +makefile-*.auto +config-*.rbuild +obj-* +output-* +reactos +reactos.* +RosBE-Logs +*.sln +*.ncb +*.suo +versionreport.xml +config.rbuild Propchange: branches/ros-branch-0_3_14-clt2012/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Fri Mar 9 19:00:33 2012 @@ -1,0 +1,14 @@ +/branches/GSoC_2011/GSoC_Network:51548 +/branches/GSoC_2011/GSoC_TcpIpDriver:51550 +/branches/GSoC_2011/TcpIpDriver:51551-53074,53076-53119 +/branches/GSoC_Network:51545-51546 +/branches/cmake-bringup:50484,50693,50719,51544-52564 +/branches/header-work:45691-47721 +/branches/reactos-yarotows:45219-46371,46373-48025,48027-49273 +/branches/reactx/reactos:49994-49995 +/branches/ros-amd64-bringup:36852 +/branches/ros-amd64-bringup/reactos:34711-34712,34741,34743,34770,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36443,36445,36475,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36990,36992,37019,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40926-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41483-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43852,43857-43858,43860,43905-43907,43952,43954,43965,43969,43979,43981,43992,44002,44036-44037,44039-44040,44044-44045,44053,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,45430,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,46868,47472,47846-47847,47878,47882 +/branches/shell32_new-bringup:51893-53652,53661,53700 +/branches/tcp-rewrite-branch:48720,48840-48841,49424-49426,49454 +/branches/wlan-bringup:54809-54998 +/trunk/reactos:55012,55173,55430,55432 Propchange: branches/ros-branch-0_3_14-clt2012/ ------------------------------------------------------------------------------ tsvn:logminsize = 10

1 0

[cgutman] 56093: [NTOSKRNL] - Add an assertion to catch a bug in the I/O manager
by cgutman＠svn.reactos.org 08 Mar '12

08 Mar '12

Author: cgutman Date: Thu Mar 8 23:02:45 2012 New Revision: 56093 URL: http://svn.reactos.org/svn/reactos?rev=56093&view=rev Log: [NTOSKRNL] - Add an assertion to catch a bug in the I/O manager Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] Thu Mar 8 23:02:45 2012 @@ -59,6 +59,9 @@ PAGED_CODE(); DPRINT1("Deleting driver object '%wZ'\n", &DriverObject->DriverName); + + /* There must be no device objects remaining at this point */ + ASSERT(!DriverObject->DeviceObject); /* Get the extension and loop them */ DriverExtension = IoGetDrvObjExtension(DriverObject)->

1 0

[sginsberg] 56092: - Addendum to 56090.
by sginsberg＠svn.reactos.org 08 Mar '12

08 Mar '12

Author: sginsberg Date: Thu Mar 8 09:23:24 2012 New Revision: 56092 URL: http://svn.reactos.org/svn/reactos?rev=56092&view=rev Log: - Addendum to 56090. Modified: trunk/reactos/ntoskrnl/include/internal/spinlock.h Modified: trunk/reactos/ntoskrnl/include/internal/spinlock.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/spinlock.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/spinlock.h [iso-8859-1] Thu Mar 8 09:23:24 2012 @@ -75,7 +75,7 @@ } #endif } -#ifdef DBG +#if DBG /* On debug builds, we OR in the KTHREAD */ *SpinLock = (KSPIN_LOCK)KeGetCurrentThread() | 1; #endif

1 0

[sginsberg] 56091: Build fix from the cmake noob.
by sginsberg＠svn.reactos.org 08 Mar '12

08 Mar '12

Author: sginsberg Date: Thu Mar 8 09:20:31 2012 New Revision: 56091 URL: http://svn.reactos.org/svn/reactos?rev=56091&view=rev Log: Build fix from the cmake noob. Modified: trunk/reactos/CMakeLists.txt Modified: trunk/reactos/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeLists.txt?rev=56091&r… ============================================================================== --- trunk/reactos/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/CMakeLists.txt [iso-8859-1] Thu Mar 8 09:20:31 2012 @@ -105,7 +105,7 @@ if(DBG) add_definitions(-DDBG=1 -D_SEH_ENABLE_TRACE) - else + else() add_definitions(-DDBG=0) endif()

1 0

[sginsberg] 56090: - Fix DBG macro AGAIN which got broken during the switch to cmake. Checked build: DBG = 1, free build: DBG = 0. Noobs.
by sginsberg＠svn.reactos.org 08 Mar '12

08 Mar '12

Author: sginsberg Date: Thu Mar 8 09:18:28 2012 New Revision: 56090 URL: http://svn.reactos.org/svn/reactos?rev=56090&view=rev Log: - Fix DBG macro AGAIN which got broken during the switch to cmake. Checked build: DBG = 1, free build: DBG = 0. Noobs. Modified: trunk/reactos/CMakeLists.txt trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp trunk/reactos/drivers/wdm/audio/legacy/stream/driver.c trunk/reactos/hal/halx86/include/halp.h trunk/reactos/ntoskrnl/include/internal/spinlock.h trunk/reactos/ntoskrnl/ke/amd64/kiinit.c trunk/reactos/subsystems/win32/csrss/win32csr/harderror.c trunk/reactos/subsystems/win32/win32k/include/win32.h trunk/reactos/subsystems/win32/win32k/include/win32kdebug.h trunk/reactos/subsystems/win32/win32k/main/dllmain.c trunk/reactos/subsystems/win32/win32k/objects/gdidbg.c trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Modified: trunk/reactos/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeLists.txt?rev=56090&r… ============================================================================== --- trunk/reactos/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/CMakeLists.txt [iso-8859-1] Thu Mar 8 09:18:28 2012 @@ -105,6 +105,8 @@ if(DBG) add_definitions(-DDBG=1 -D_SEH_ENABLE_TRACE) + else + add_definitions(-DDBG=0) endif() if(KDBG) Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp [iso-8859-1] Thu Mar 8 09:18:28 2012 @@ -1312,7 +1312,7 @@ ULONG countDMA = ResourceList->NumberOfDmas(); ULONG lengthIO = ResourceList->FindTranslatedPort(0)->u.Port.Length; -#ifdef DBG +#if DBG DPRINT("Starting MPU401 Port 0x%lx", ResourceList->FindTranslatedPort(0)->u.Port.Start.LowPart); #endif Modified: trunk/reactos/drivers/wdm/audio/legacy/stream/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/s… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/stream/driver.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/stream/driver.c [iso-8859-1] Thu Mar 8 09:18:28 2012 @@ -226,7 +226,7 @@ IN PCHAR AssertText, IN ULONG AssertValue) { -#ifdef DBG +#if DBG DbgBreakPoint(); #endif } @@ -241,7 +241,7 @@ IN PCCHAR DebugMessage, ...) { -#ifdef DBG +#if DBG va_list ap; if (DebugPrintLevel <=STREAMDEBUG_LEVEL) 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] Thu Mar 8 09:18:28 2012 @@ -22,13 +22,13 @@ #endif #ifdef CONFIG_SMP -#ifdef DBG +#if DBG #define HAL_BUILD_TYPE (DBG ? PRCB_BUILD_DEBUG : 0) #else #define HAL_BUILD_TYPE 0 #endif #else -#ifdef DBG +#if DBG #define HAL_BUILD_TYPE ((DBG ? PRCB_BUILD_DEBUG : 0) | PRCB_BUILD_UNIPROCESSOR) #else #define HAL_BUILD_TYPE 0 | PRCB_BUILD_UNIPROCESSOR Modified: trunk/reactos/ntoskrnl/include/internal/spinlock.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/spinlock.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/spinlock.h [iso-8859-1] Thu Mar 8 09:18:28 2012 @@ -51,7 +51,7 @@ VOID KxAcquireSpinLock(IN PKSPIN_LOCK SpinLock) { -#ifdef DBG +#if DBG /* Make sure that we don't own the lock already */ if (((KSPIN_LOCK)KeGetCurrentThread() | 1) == *SpinLock) { @@ -63,7 +63,7 @@ /* Try to acquire the lock */ while (InterlockedBitTestAndSet((PLONG)SpinLock, 0)) { -#if defined(_M_IX86) && defined(DBG) +#if defined(_M_IX86) && DBG /* On x86 debug builds, we use a much slower but useful routine */ Kii386SpinOnSpinLock(SpinLock, 5); #else Modified: trunk/reactos/ntoskrnl/ke/amd64/kiinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/amd64/kiinit.c… ============================================================================== --- trunk/reactos/ntoskrnl/ke/amd64/kiinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/amd64/kiinit.c [iso-8859-1] Thu Mar 8 09:18:28 2012 @@ -114,7 +114,7 @@ #ifndef CONFIG_SMP Pcr->Prcb.BuildType |= PRCB_BUILD_UNIPROCESSOR; #endif -#ifdef DBG +#if DBG Pcr->Prcb.BuildType |= PRCB_BUILD_DEBUG; #endif Modified: trunk/reactos/subsystems/win32/csrss/win32csr/harderror.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/harderror.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/harderror.c [iso-8859-1] Thu Mar 8 09:18:28 2012 @@ -506,7 +506,7 @@ IN PCSR_THREAD ThreadData, IN PHARDERROR_MSG Message) { -#ifdef DBG +#if DBG PCSR_PROCESS ProcessData = ThreadData->Process; #endif ULONG_PTR Parameters[MAXIMUM_HARDERROR_PARAMETERS]; Modified: trunk/reactos/subsystems/win32/win32k/include/win32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] Thu Mar 8 09:18:28 2012 @@ -194,12 +194,12 @@ struct _GDI_POOL *pPoolBrushAttr; struct _GDI_POOL *pPoolRgnAttr; -#ifdef DBG +#if DBG BYTE DbgChannelLevel[DbgChCount]; #endif } PROCESSINFO; -#ifdef DBG +#if DBG void NTAPI UserDbgPreServiceHook(ULONG ulSyscallId, PULONG_PTR pulArguments); ULONG_PTR NTAPI UserDbgPostServiceHook(ULONG ulSyscallId, ULONG_PTR ulResult); #endif Modified: trunk/reactos/subsystems/win32/win32k/include/win32kdebug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/win32kdebug.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/win32kdebug.h [iso-8859-1] Thu Mar 8 09:18:28 2012 @@ -27,7 +27,7 @@ */ -#ifdef DBG +#if DBG typedef struct { Modified: trunk/reactos/subsystems/win32/win32k/main/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ma… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] Thu Mar 8 09:18:28 2012 @@ -30,7 +30,7 @@ extern UCHAR Win32kSSPT[]; extern ULONG Win32kNumberOfSysCalls; -#ifdef DBG +#if DBG void NTAPI DbgPreServiceHook(ULONG ulSyscallId, PULONG_PTR pulArguments) @@ -85,7 +85,7 @@ PsSetProcessWin32Process(Process, ppiCurrent); -#ifdef DBG +#if DBG DbgInitDebugChannels(); #endif @@ -566,7 +566,7 @@ PsEstablishWin32Callouts((PWIN32_CALLOUTS_FPNS)&CalloutData); /* Register service hook callbacks */ -#ifdef DBG +#if DBG KdSystemDebugControl('CsoR', DbgPreServiceHook, ID_Win32PreServiceHook, 0, 0, 0, 0); KdSystemDebugControl('CsoR', DbgPostServiceHook, ID_Win32PostServiceHook, 0, 0, 0, 0); #endif Modified: trunk/reactos/subsystems/win32/win32k/objects/gdidbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdidbg.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdidbg.c [iso-8859-1] Thu Mar 8 09:18:28 2012 @@ -8,7 +8,7 @@ /** INCLUDES ******************************************************************/ -#ifdef DBG +#if DBG #include <win32k.h> #define NDEBUG #include <debug.h> Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] Thu Mar 8 09:18:28 2012 @@ -1309,7 +1309,7 @@ } } -#ifdef DBG +#if DBG //#ifdef GDI_DEBUG DbgGdiHTIntegrityCheck(); //#endif

1 0

[cgutman] 56089: [NTOSKRNL] - Release the IO database lock before unloading the device (and driver too) to prevent deadlocks
by cgutman＠svn.reactos.org 08 Mar '12

08 Mar '12

Author: cgutman Date: Thu Mar 8 03:02:28 2012 New Revision: 56089 URL: http://svn.reactos.org/svn/reactos?rev=56089&view=rev Log: [NTOSKRNL] - Release the IO database lock before unloading the device (and driver too) to prevent deadlocks Modified: trunk/reactos/ntoskrnl/io/iomgr/volume.c Modified: trunk/reactos/ntoskrnl/io/iomgr/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/volume.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/volume.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/volume.c [iso-8859-1] Thu Mar 8 03:02:28 2012 @@ -50,6 +50,9 @@ return; } + /* Release lock */ + KeReleaseQueuedSpinLock(LockQueueIoDatabaseLock, OldIrql); + /* Here, DO is not referenced any longer, check if we have to unload it */ if (UnloadIfUnused || IoGetDevObjExtension(DeviceObject)->ExtensionFlags & (DOE_UNLOAD_PENDING | DOE_DELETE_PENDING | DOE_REMOVE_PENDING)) @@ -57,9 +60,6 @@ /* Unload the driver */ IopUnloadDevice(DeviceObject); } - - /* Release lock */ - KeReleaseQueuedSpinLock(LockQueueIoDatabaseLock, OldIrql); } /*

1 0

[cgutman] 56088: [NTOSKRNL] - Fix broken reference counting and dereferencing the wrong device object
by cgutman＠svn.reactos.org 08 Mar '12

08 Mar '12

Author: cgutman Date: Thu Mar 8 02:58:21 2012 New Revision: 56088 URL: http://svn.reactos.org/svn/reactos?rev=56088&view=rev Log: [NTOSKRNL] - Fix broken reference counting and dereferencing the wrong device object Modified: trunk/reactos/ntoskrnl/io/iomgr/volume.c Modified: trunk/reactos/ntoskrnl/io/iomgr/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/volume.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/volume.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/volume.c [iso-8859-1] Thu Mar 8 02:58:21 2012 @@ -363,15 +363,11 @@ DEVICE_OBJECT, Queue.ListEntry); + /* Get the attached device */ + DeviceObject = IoGetAttachedDevice(DeviceObject); + ObReferenceObject(DeviceObject); IopInterlockedIncrementUlong(LockQueueIoDatabaseLock, (PULONG)&DeviceObject->ReferenceCount); - - /* Check if we're attached */ - if (DeviceObject->AttachedDevice) - { - /* Get the attached device */ - DeviceObject = IoGetAttachedDevice(DeviceObject); - } /* Build the shutdown IRP and call the driver */ Irp = IoBuildSynchronousFsdRequest(IRP_MJ_SHUTDOWN,

1 0

[cgutman] 56087: [NTOSKRNL] - Dereference the correct device object (the one who asked for shutdown notification) instead of whatever happens to be on the top of the device stack - Fix flag issues
by cgutman＠svn.reactos.org 08 Mar '12

08 Mar '12

Author: cgutman Date: Thu Mar 8 02:43:47 2012 New Revision: 56087 URL: http://svn.reactos.org/svn/reactos?rev=56087&view=rev Log: [NTOSKRNL] - Dereference the correct device object (the one who asked for shutdown notification) instead of whatever happens to be on the top of the device stack - Fix flag issues Modified: trunk/reactos/ntoskrnl/io/iomgr/device.c Modified: trunk/reactos/ntoskrnl/io/iomgr/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/device.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/device.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/device.c [iso-8859-1] Thu Mar 8 02:43:47 2012 @@ -174,9 +174,12 @@ KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); } + /* Remove the flag */ + ShutdownEntry->DeviceObject->Flags &= ~DO_SHUTDOWN_REGISTERED; + /* Get rid of our reference to it */ - ObDereferenceObject(DeviceObject); - + ObDereferenceObject(ShutdownEntry->DeviceObject); + /* Free the shutdown entry and reset the event */ ExFreePoolWithTag(ShutdownEntry, TAG_SHUTDOWN_ENTRY); KeClearEvent(&Event); @@ -228,9 +231,12 @@ KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); } + /* Remove the flag */ + ShutdownEntry->DeviceObject->Flags &= ~DO_SHUTDOWN_REGISTERED; + /* Get rid of our reference to it */ - ObDereferenceObject(DeviceObject); - + ObDereferenceObject(ShutdownEntry->DeviceObject); + /* Free the shutdown entry and reset the event */ ExFreePoolWithTag(ShutdownEntry, TAG_SHUTDOWN_ENTRY); KeClearEvent(&Event); @@ -1485,6 +1491,9 @@ PSHUTDOWN_ENTRY ShutdownEntry; PLIST_ENTRY NextEntry; KIRQL OldIrql; + + /* Remove the flag */ + DeviceObject->Flags &= ~DO_SHUTDOWN_REGISTERED; /* Acquire the shutdown lock and loop the shutdown list */ KeAcquireSpinLock(&ShutdownListLock, &OldIrql); @@ -1543,9 +1552,6 @@ /* Release the shutdown lock */ KeReleaseSpinLock(&ShutdownListLock, OldIrql); - - /* Now remove the flag */ - DeviceObject->Flags &= ~DO_SHUTDOWN_REGISTERED; } /*

1 0

[jimtabor] 56086: [Screen Savers] - CMake it! MazeScr is skipped for now.
by jimtabor＠svn.reactos.org 08 Mar '12

08 Mar '12

Author: jimtabor Date: Thu Mar 8 02:02:58 2012 New Revision: 56086 URL: http://svn.reactos.org/svn/reactos?rev=56086&view=rev Log: [Screen Savers] - CMake it! MazeScr is skipped for now. Added: trunk/rosapps/applications/screensavers/blankscr/CMakeLists.txt (with props) trunk/rosapps/applications/screensavers/butterflies/CMakeLists.txt (with props) trunk/rosapps/applications/screensavers/circles/CMakeLists.txt (with props) trunk/rosapps/applications/screensavers/cylfrac/CMakeLists.txt (with props) trunk/rosapps/applications/screensavers/matrix/CMakeLists.txt (with props) trunk/rosapps/applications/screensavers/mazescr/CMakeLists.txt (with props) trunk/rosapps/applications/screensavers/starfield/CMakeLists.txt (with props) Modified: trunk/rosapps/applications/screensavers/CMakeLists.txt Modified: trunk/rosapps/applications/screensavers/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/CMakeLists.txt [iso-8859-1] Thu Mar 8 02:02:58 2012 @@ -1,1 +1,8 @@ +add_subdirectory(blankscr) +add_subdirectory(butterflies) +add_subdirectory(circles) +add_subdirectory(cylfrac) +add_subdirectory(matrix) +#add_subdirectory(mazescr) +add_subdirectory(starfield) add_subdirectory(ssstars) Added: trunk/rosapps/applications/screensavers/blankscr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/blankscr/CMakeLists.txt (added) +++ trunk/rosapps/applications/screensavers/blankscr/CMakeLists.txt [iso-8859-1] Thu Mar 8 02:02:58 2012 @@ -1,0 +1,14 @@ + +set_rc_compiler() + +add_executable(blankscr + scrnsave.c + scrnsave.rc) + +set_module_type(blankscr win32gui UNICODE) +set_target_properties(blankscr PROPERTIES SUFFIX ".scr") + +target_link_libraries(blankscr scrnsave) +add_importlibs(blankscr user32 gdi32) + +add_cd_file(TARGET blankscr DESTINATION reactos/system32 FOR all) Propchange: trunk/rosapps/applications/screensavers/blankscr/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/screensavers/butterflies/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/butterflies/CMakeLists.txt (added) +++ trunk/rosapps/applications/screensavers/butterflies/CMakeLists.txt [iso-8859-1] Thu Mar 8 02:02:58 2012 @@ -1,0 +1,14 @@ + +set_rc_compiler() + +add_executable(butterflies + butterflies.c + butterflies.rc) + +set_module_type(butterflies win32gui UNICODE) +set_target_properties(butterflies PROPERTIES SUFFIX ".scr") + +target_link_libraries(butterflies scrnsave) +add_importlibs(butterflies user32 gdi32 opengl32 glu32 advapi32 shell32 msvcrt kernel32) + +add_cd_file(TARGET butterflies DESTINATION reactos/system32 FOR all) Propchange: trunk/rosapps/applications/screensavers/butterflies/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/screensavers/circles/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/circles/CMakeLists.txt (added) +++ trunk/rosapps/applications/screensavers/circles/CMakeLists.txt [iso-8859-1] Thu Mar 8 02:02:58 2012 @@ -1,0 +1,14 @@ + +set_rc_compiler() + +add_executable(circles + circles.c + circles.rc) + +set_module_type(circles win32gui UNICODE) +set_target_properties(circles PROPERTIES SUFFIX ".scr") + +target_link_libraries(circles scrnsave) +add_importlibs(circles user32 gdi32 msvcrt kernel32) + +add_cd_file(TARGET circles DESTINATION reactos/system32 FOR all) Propchange: trunk/rosapps/applications/screensavers/circles/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/screensavers/cylfrac/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/cylfrac/CMakeLists.txt (added) +++ trunk/rosapps/applications/screensavers/cylfrac/CMakeLists.txt [iso-8859-1] Thu Mar 8 02:02:58 2012 @@ -1,0 +1,14 @@ + +set_rc_compiler() + +add_executable(cylfrac + cylfrac.c + cylfrac.rc) + +set_module_type(cylfrac win32gui UNICODE) +set_target_properties(cylfrac PROPERTIES SUFFIX ".scr") + +target_link_libraries(cylfrac scrnsave) +add_importlibs(cylfrac user32 gdi32 opengl32 glu32 winmm msvcrt kernel32) + +add_cd_file(TARGET cylfrac DESTINATION reactos/system32 FOR all) Propchange: trunk/rosapps/applications/screensavers/cylfrac/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/screensavers/matrix/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/matrix/CMakeLists.txt (added) +++ trunk/rosapps/applications/screensavers/matrix/CMakeLists.txt [iso-8859-1] Thu Mar 8 02:02:58 2012 @@ -1,0 +1,19 @@ + +set_rc_compiler() + +add_executable(matrix + config.c + matrix.c + message.c + password.c + screensave.c + settings.c + rsrc.rc) + +set_module_type(matrix win32gui UNICODE) +set_target_properties(matrix PROPERTIES SUFFIX ".scr") + +target_link_libraries(matrix scrnsave uuid) +add_importlibs(matrix user32 gdi32 winspool advapi32 comctl32 comdlg32 shell32 msvcrt kernel32) + +add_cd_file(TARGET matrix DESTINATION reactos/system32 FOR all) Propchange: trunk/rosapps/applications/screensavers/matrix/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/screensavers/mazescr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/mazescr/CMakeLists.txt (added) +++ trunk/rosapps/applications/screensavers/mazescr/CMakeLists.txt [iso-8859-1] Thu Mar 8 02:02:58 2012 @@ -1,0 +1,14 @@ + +set_rc_compiler() + +add_executable(mazescr + scrnsave.c + maze.c + scrnsave.rc) + +set_module_type(mazescr win32gui UNICODE) +set_target_properties(mazescr PROPERTIES SUFFIX ".scr") + +add_importlibs(mazescr user32 gdi32 msvcrt kernel32) + +add_cd_file(TARGET mazescr DESTINATION reactos/system32 FOR all) Propchange: trunk/rosapps/applications/screensavers/mazescr/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/screensavers/starfield/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/starfield/CMakeLists.txt (added) +++ trunk/rosapps/applications/screensavers/starfield/CMakeLists.txt [iso-8859-1] Thu Mar 8 02:02:58 2012 @@ -1,0 +1,13 @@ + +set_rc_compiler() + +add_executable(starfield + screensaver.c + starfield.rc) + +set_module_type(starfield win32gui UNICODE) +set_target_properties(starfield PROPERTIES SUFFIX ".scr") + +add_importlibs(starfield user32 gdi32 msvcrt kernel32) + +add_cd_file(TARGET starfield DESTINATION reactos/system32 FOR all) Propchange: trunk/rosapps/applications/screensavers/starfield/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[jgardou] 56085: Just get the whole tree...
by jgardou＠svn.reactos.org 07 Mar '12

07 Mar '12

Author: jgardou Date: Wed Mar 7 22:57:23 2012 New Revision: 56085 URL: http://svn.reactos.org/svn/reactos?rev=56085&view=rev Log: Just get the whole tree... Added: branches/c++-bringup/ - copied from r56084, trunk/

1 0

← Newer
1
...
18
19
20
21
22
23
24
...
36
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 March 2012