Changeset 3485 for trunk/src

Timestamp:

May 3, 2000, 12:46:07 PM (25 years ago)

Author:

bird

Message:

Changed and hopefully corrected code identifying the kernel type.

Location:

trunk/src/win32k

Files:

• dev32/d32init.c (modified) (4 diffs)
• include/macros.h (modified) (2 diffs)

trunk/src/win32k/dev32/d32init.c

@@ -1 @@
-/* $Id: d32init.c,v 1.18 2000-04-17 01:56:48 bird Exp $
+/* $Id: d32init.c,v 1.19 2000-05-03 10:46:06 bird Exp $
  *
  * d32init.c - 32-bits init routines.
@@ -20 +20 @@
     #define kprintf2(a) (void)0
 #endif
-
 
 #define INCL_DOSERRORS
@@ -498 +497 @@
 
                                 /* If this is an Aurora/Warp 4.5 or Warp 3 kernel there is more info! */
-                                if (*psz != ','
-                                    && (   (psz[1] == '_' && (psz[2] == 'S' || psz[2] == 's'))  /* F_SMP */
-                                        || (psz[0] == '_' && (psz[1] == 'S' || psz[1] == 's'))  /* _SMP  */
-                                       )
+                                if ((psz[0] != ',' && psz[1] == '_' && (psz[2] == 'S' || psz[2] == 's'))  /* F_SMP */
+                                    || (psz[0] == '_' && (psz[1] == 'S' || psz[1] == 's'))  /* _SMP  */
                                     )
                                     pKrnlInfo->fchType = TYPE_SMP;
-                                else
-                                    if (*psz != ','
-                                            || (psz[0] == '_'
-                                                && (psz[1] == 'W' || psz[1] == 'w') && psz[2] == '4')  /* _W4  */
-                                        )
+                                else if (psz[0] == '_' && psz[1] == 'W' && psz[2] == '4')    /* _W4  */
                                     pKrnlInfo->fchType = TYPE_W4;
                                 else
@@ -519 +512 @@
                                 while (j < 5)
                                 {
-
                                     /* There should be no iopl object preceding the debugger data object. */
                                     if ((pKrnlOTE[j].ote_flags & OBJIOPL) != 0)

trunk/src/win32k/include/macros.h

@@ -1 @@
-/* $Id: macros.h,v 1.1 2000-01-22 16:34:24 bird Exp $
+/* $Id: macros.h,v 1.2 2000-05-03 10:46:07 bird Exp $
  *
  * Common macros for Win32k/Elf.
@@ -24 +24 @@
 #define ALIGN(a, alignment) (((a) + (alignment - 1UL)) & ~(alignment - 1UL))
 
+
+/*
+ * Makes an unsigned long from 4 (unsigned or signed) chars.
+ */
+#define MAKEULONG4(ch1, ch2, ch3, ch4) \
+            ((ULONG)(MAKEULONG(MAKEUSHORT(ch1, ch2), MAKEUSHORT(ch3, ch4))))
+
 #endif