Author: cgutman
Date: Wed Mar 18 05:34:44 2015
New Revision: 66779
URL: http://svn.reactos.org/svn/reactos?rev=66779&view=rev
Log:
[NDIS]
- Don't allow a miniport to register more than once for shutdown callbacks
- Fixes hang on shutdown with the BCM57XX driver
Modified:
trunk/reactos/drivers/network/ndis/ndis/miniport.c
Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/…
==============================================================================
--- trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Wed Mar 18 05:34:44 2015
@@ -1708,6 +1708,12 @@
NDIS_DbgPrint(DEBUG_MINIPORT, ("Called.\n"));
+ if (Adapter->BugcheckContext != NULL)
+ {
+ NDIS_DbgPrint(MIN_TRACE, ("Attempted to register again for a shutdown callback\n"));
+ return;
+ }
+
BugcheckContext = ExAllocatePool(NonPagedPool, sizeof(MINIPORT_BUGCHECK_CONTEXT));
if(!BugcheckContext)
{
Author: dreimer
Date: Wed Mar 18 00:22:00 2015
New Revision: 66775
URL: http://svn.reactos.org/svn/reactos?rev=66775&view=rev
Log:
[BOOTDATA]
Update readme to german
Modified:
branches/ReactOS-0.3.17-CLT2015/reactos/boot/bootdata/readme.txt
Modified: branches/ReactOS-0.3.17-CLT2015/reactos/boot/bootdata/readme.txt
URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/…
==============================================================================
--- branches/ReactOS-0.3.17-CLT2015/reactos/boot/bootdata/readme.txt [iso-8859-1] (original)
+++ branches/ReactOS-0.3.17-CLT2015/reactos/boot/bootdata/readme.txt [iso-8859-1] Wed Mar 18 00:22:00 2015
@@ -1,55 +1,25 @@
-========================
-ReactOS Version 0.3.x
-Updated March 3, 2013
-========================
+===========================================================================
+ReactOS Version 0.4 Preview
+für die Chemnitzer Linux-Tage 2015
+===========================================================================
-1. What is ReactOS?
--------------------
+Willkommen zu ReactOS!
-ReactOS is an Open Source effort to develop a quality operating system that is
-compatible with applications and drivers written for the Microsoft® Windows NT
-family of operating systems (NT4, 2000, XP, 2003, Vista, Seven).
+CD-INHALT:
-Website: http://www.reactos.org
+ * ReactOS Live-System/Installation
+ * ReactOS in einer virtuellen QEMU-Maschine
+ * ReactOS Build Environment (RosBE)
+ * Quellcode
+Diese CD sollte unter Windows ein AutoRun-Programm starten. Alternativ
+können Sie sich den CD-Inhalt über einen Dateibrowser anschauen.
+Die Ordnernamen sollten selbsterklärend sein.
-2. Relationship with the WINE project
--------------------------------------
+Der gesamte Quellcode des Betriebssystems lässt sich unter Einsatz des
+ReactOS Build Environments sowohl unter Windows als auch unter
+Unix-ähnlichen Betriebssystemen wie Linux kompilieren.
-ReactOS has always intended to work with the WINE project to share as much
-programming effort as possible. This mainly concerns User Mode DLLs and
-still happens to a degree today. Other areas of cooperation lie in
-applications and testing suites.
+Weitere Informationen über ReactOS finden Sie unter www.reactos.org!
-
-3. Future compatibility
------------------------
-
-The ReactOS project, although currently focused on Windows Server 2003
-compatibility, is always keeping an eye toward compatibility with
-Windows Vista and future Windows NT releases.
-
-
-4. Supporting other System Applications
----------------------------------------
-
-The Windows NT architecture allows for subsystems, as does the ReactOS
-architecture. A subsystem is an implementation of the APIs of another
-operating system, allowing ReactOS to run applications from other systems.
-We are already looking at subsystems for: Java, OS/2, and DOS and possibly
-others in the future.
-
-
-5. Tutorials
-------------
-
-Developer and User Tutorials: http://www.reactos.org/wiki
-
-The tutorials contain more information on the project, compiling and testing
-ReactOS - amongst other topics. Contributors to the project are always welcome.
-
-
-6. Author
----------
-
-This document was written by Jason Filby (jasonfilby(a)yahoo.com).
+===========================================================================
Author: hbelusca
Date: Wed Mar 18 00:04:32 2015
New Revision: 66772
URL: http://svn.reactos.org/svn/reactos?rev=66772&view=rev
Log:
[WALLPAPERS]: Since we don't have any mechanism at the moment to preselect a non-bitmap wallpaper to use, I'm forced to convert the wallpaper we want to use for CLT2015 to bitmap first, and then add its entry into the registry (I cannot just use the jpg file in the registry).
Added:
branches/ReactOS-0.3.17-CLT2015/reactos/modules/wallpapers/ReactOS_CirclesGold.bmp (with props)
Modified:
branches/ReactOS-0.3.17-CLT2015/reactos/boot/bootdata/hivedef.inf
branches/ReactOS-0.3.17-CLT2015/reactos/modules/wallpapers/CMakeLists.txt
Modified: branches/ReactOS-0.3.17-CLT2015/reactos/boot/bootdata/hivedef.inf
URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/…
==============================================================================
--- branches/ReactOS-0.3.17-CLT2015/reactos/boot/bootdata/hivedef.inf [iso-8859-1] (original)
+++ branches/ReactOS-0.3.17-CLT2015/reactos/boot/bootdata/hivedef.inf [iso-8859-1] Wed Mar 18 00:04:32 2015
@@ -64,7 +64,7 @@
HKCU,"Control Panel\Desktop","ScreenSaveTimeOut",0,"600"
HKCU,"Control Panel\Desktop","WaitToKillAppTimeout",2,"20000"
HKCU,"Control Panel\Desktop","Pattern",2,"(None)"
-HKCU,"Control Panel\Desktop","Wallpaper",0x00000000,""
+HKCU,"Control Panel\Desktop","Wallpaper",0x00000000,"%SystemRoot%\Web\Wallpaper\ReactOS_CirclesGold.bmp"
HKCU,"Control Panel\Desktop","TileWallpaper",2,"0"
HKCU,"Control Panel\Desktop","WallpaperStyle",2,"0"
HKCU,"Control Panel\Desktop","FontSmoothing",0,"1"
Modified: branches/ReactOS-0.3.17-CLT2015/reactos/modules/wallpapers/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/…
==============================================================================
--- branches/ReactOS-0.3.17-CLT2015/reactos/modules/wallpapers/CMakeLists.txt [iso-8859-1] (original)
+++ branches/ReactOS-0.3.17-CLT2015/reactos/modules/wallpapers/CMakeLists.txt [iso-8859-1] Wed Mar 18 00:04:32 2015
@@ -5,6 +5,7 @@
lake.jpg
ReactOS_CirclesBlue.jpg
ReactOS_CirclesGold.jpg
+ ReactOS_CirclesGold.bmp
ReactOS_Light_4-3.jpg
ReactOS_Light_16-9.jpg
ReadMe.txt)
Added: branches/ReactOS-0.3.17-CLT2015/reactos/modules/wallpapers/ReactOS_CirclesGold.bmp
URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/…
==============================================================================
Binary file - no diff available.
Propchange: branches/ReactOS-0.3.17-CLT2015/reactos/modules/wallpapers/ReactOS_CirclesGold.bmp
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream