- 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.

svn path=/trunk/; revision=50639

reactos/ntoskrnl/ex/init.c

@@ -1061,6 +1061,9 @@ ExpInitializeExecutive(IN ULONG Cpu,
         if (CmNtCSDReleaseType == 1) CmNtSpBuildNumber |= 1830 << 16;
     }
 
+    /* Add loaded CmNtGlobalFlag value */
+    NtGlobalFlag |= CmNtGlobalFlag;
+
     /* Initialize the executive at phase 0 */
     if (!ExInitSystem()) KeBugCheck(PHASE0_INITIALIZATION_FAILED);
 

reactos/ntoskrnl/include/internal/cm.h

@@ -1585,6 +1585,7 @@ extern ULONG CmDefaultLanguageIdType;
 extern WCHAR CmInstallUILanguageId[];
 extern ULONG CmInstallUILanguageIdLength;
 extern ULONG CmInstallUILanguageIdType;
+extern ULONG CmNtGlobalFlag;
 extern LANGID PsInstallUILanguageId;
 extern LANGID PsDefaultUILanguageId;
 extern CM_SYSTEM_CONTROL_VECTOR CmControlVector[];