[fireball] 50639: - Add a missing ORing of the registry-loaded GlobalFlags value in ExpInitializeExecutive. Thanks to Robert Horvath for spotting the issue. See issue #5870 for more details.

Author: fireball
Date: Wed Feb  9 21:22:47 2011
New Revision: 50639

URL: http://svn.reactos.org/svn/reactos?rev=50639&view=rev
Log:
- Add a missing ORing of the registry-loaded GlobalFlags value in ExpInitializeExecutive. Thanks to Robert Horvath for spotting the issue.
See issue #5870 for more details.

Modified:
    trunk/reactos/ntoskrnl/ex/init.c
    trunk/reactos/ntoskrnl/include/internal/cm.h

Modified: trunk/reactos/ntoskrnl/ex/init.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=5063...
==============================================================================
--- trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] Wed Feb  9 21:22:47 2011
@@ -1061,6 +1061,9 @@
         if (CmNtCSDReleaseType == 1) CmNtSpBuildNumber |= 1830 << 16;
     }

+    /* Add loaded CmNtGlobalFlag value */
+    NtGlobalFlag |= CmNtGlobalFlag;
+
     /* Initialize the executive at phase 0 */
     if (!ExInitSystem()) KeBugCheck(PHASE0_INITIALIZATION_FAILED);

Modified: trunk/reactos/ntoskrnl/include/internal/cm.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/c...
==============================================================================
--- trunk/reactos/ntoskrnl/include/internal/cm.h [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/include/internal/cm.h [iso-8859-1] Wed Feb  9 21:22:47 2011
@@ -1585,6 +1585,7 @@
 extern WCHAR CmInstallUILanguageId[];
 extern ULONG CmInstallUILanguageIdLength;
 extern ULONG CmInstallUILanguageIdType;
+extern ULONG CmNtGlobalFlag;
 extern LANGID PsInstallUILanguageId;
 extern LANGID PsDefaultUILanguageId;
 extern CM_SYSTEM_CONTROL_VECTOR CmControlVector[];