Author: hpoussin
Date: Tue Feb 6 02:58:06 2007
New Revision: 25734
URL: http://svn.reactos.org/svn/reactos?rev=25734&view=rev
Log:
Correctly fix the hack introduced in r25667.
Modified:
trunk/reactos/ntoskrnl/ex/init.c
trunk/reactos/ntoskrnl/io/iomgr/driver.c
Modified: trunk/reactos/ntoskrnl/ex/init.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=257…
==============================================================================
--- trunk/reactos/ntoskrnl/ex/init.c (original)
+++ trunk/reactos/ntoskrnl/ex/init.c Tue Feb 6 02:58:06 2007
@@ -1186,10 +1186,7 @@
InbvUpdateProgressBar(85);
/* Make sure nobody touches the loader block again */
- /* FIXME: IopLoadServiceModule() touches KeLoaderBlock->LoadOrderListHead,
- and that happens past this point too. So either copy that list to the
- Io's allocated space, or properly fix Io. */
- //if (LoaderBlock == KeLoaderBlock) KeLoaderBlock = NULL;
+ if (LoaderBlock == KeLoaderBlock) KeLoaderBlock = NULL;
LoaderBlock = Context = NULL;
/* Update progress bar */
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 (original)
+++ trunk/reactos/ntoskrnl/io/iomgr/driver.c Tue Feb 6 02:58:06 2007
@@ -443,18 +443,28 @@
if (*ModuleObject == NULL)
{
- Status = STATUS_UNSUCCESSFUL;
+ /*
+ * Case for disabled drivers
+ */
+
+ if (ServiceStart >= 4)
+ {
+ /* FIXME: Check if it is the right status code */
+ Status = STATUS_PLUGPLAY_NO_DEVICE;
+ }
/*
* Special case for boot modules that were loaded by boot loader.
*/
- if (ServiceStart == 0)
+ else if (KeLoaderBlock)
{
WCHAR SearchNameBuffer[256];
UNICODE_STRING SearchName;
PLIST_ENTRY ListHead, NextEntry;
PLDR_DATA_TABLE_ENTRY LdrEntry;
+
+ Status = STATUS_UNSUCCESSFUL;
/*
* FIXME:
@@ -499,10 +509,10 @@
}
/*
- * Case for rest of the drivers (except disabled)
+ * Case for rest of the drivers
*/
- else if (ServiceStart < 4)
+ else
{
DPRINT("Loading module\n");
Status = LdrLoadModule(&ServiceImagePath, ModuleObject);
Author: tkreuzer
Date: Tue Feb 6 02:31:17 2007
New Revision: 25733
URL: http://svn.reactos.org/svn/reactos?rev=25733&view=rev
Log:
No code change! Just a way to try to contact Eric.
Eric, I tried to contact you without success, I have code for the appearance page to add the needed functionality. I would talk with you about this, as you are also working on that. Please contact me, if you read this.
Modified:
trunk/reactos/dll/cpl/desk/appearance.c
trunk/reactos/dll/cpl/desk/preview.c
Modified: trunk/reactos/dll/cpl/desk/appearance.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/appearance.c?…
==============================================================================
--- trunk/reactos/dll/cpl/desk/appearance.c (original)
+++ trunk/reactos/dll/cpl/desk/appearance.c Tue Feb 6 02:31:17 2007
@@ -6,7 +6,7 @@
* PURPOSE: Appearance property page
*
* PROGRAMMERS: Trevor McCort (lycan359(a)gmail.com)
- * Eric Kohl
+ * Eric Kohl (email?)
*/
#include "desk.h"
Modified: trunk/reactos/dll/cpl/desk/preview.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/preview.c?rev…
==============================================================================
--- trunk/reactos/dll/cpl/desk/preview.c (original)
+++ trunk/reactos/dll/cpl/desk/preview.c Tue Feb 6 02:31:17 2007
@@ -3,7 +3,7 @@
* LICENSE: GPL - See COPYING in the top level directory
* FILE: lib/cpl/desk/preview.c
* PURPOSE: Draws the preview control
- * COPYRIGHT: Copyright 2006, 2007 Eric Kohl
+ * COPYRIGHT: Copyright 2006, 2007 Eric Kohl (email?)
*/
#include "desk.h"