Changeset 1467 for trunk/src/win32k/include/options.h

Timestamp:

Oct 27, 1999, 4:03:01 AM (26 years ago)

Author:

bird

Message:

Corrections to make win32k work.
(And now it does work, at least at my test machine...)

File:

• trunk/src/win32k/include/options.h (modified) (3 diffs)

trunk/src/win32k/include/options.h

@@ -1 @@
-/* $Id: options.h,v 1.1 1999-09-06 02:19:59 bird Exp $
+/* $Id: options.h,v 1.2 1999-10-27 02:02:57 bird Exp $
+ *
  * Options.
  *
  * Copyright (c) 1998-1999 knut st. osmundsen
+ *
+ * Project Odin Software License can be found in LICENSE.TXT
  *
  */
@@ -9 +12 @@
 #define _options_h_
 
+/*******************************************************************************
+*   Defined Constants And Macros                                               *
+*******************************************************************************/
 /* fKernel */
 #define KF_UNI      0x00000000UL
 #define KF_SMP      0x00000001UL
 
+/* Set defaults. */
+#define SET_OPTIONS_TO_DEFAULT(o)            \
+            o.fQuiet         = 0;            \
+            o.usCom          = OUTPUT_COM2;  \
+            o.fLogging       = 0;            \
+            o.ulBuild        = ~0;           \
+            o.fKernel        = KF_UNI;       \
+            o.usVerMajor     = ~0;           \
+            o.usVerMinor     = ~0;
 
+
+/*******************************************************************************
+*   Structures and Typedefs                                                    *
+*******************************************************************************/
 /** Option struct */
 struct options
@@ -39 +58 @@
     /** @cat Options affecting the generated LX executable */
     //******************************************************/
-    int noExeTIBFix;        /* ask win32k for initstuff (win32k only) */
-    int AlignSections;      /* don't align sections */
-    //int TIBFixObject;       /* make a TIBFix object - AlignSections = 0 */
-
-    int lxoffset;           /* if true use the fixed LXOFFSET if not ulPEOffset */
-    int ourstub;            /* our DOS stub or the one from the PE-file */
+    /* none yet... */
 };
 
 
-extern struct options options;
-
-#define SET_OPTIONS_TO_DEFAULT(o)            \
-            o.fQuiet         = 0;            \
-            o.usCom          = OUTPUT_COM2;  \
-            o.fLogging       = 0;            \
-            o.ulBuild        = 8259;         \
-            o.fKernel        = KF_UNI;       \
-            o.usVerMajor     = 20;           \
-            o.usVerMinor     = 30;           \
-            o.noExeTIBFix    = 0;            \
-            o.AlignSections  = 1;            \
-            o.lxoffset       = 0;            \
-            o.ourstub        = 0
-
-
-#define SET_OPTIONS_WIN32K(o)                \
-            SET_OPTIONS_TO_DEFAULT(o)
-
-#define SET_OPTIONS_WIN32K_SAFE(o)           \
-            SET_OPTIONS_TO_DEFAULT(o);       \
-            o.noExeTIBFix    = 0;            \
-            o.AlignSections  = 1
-
-
-#define SET_OPTIONS_PE2LX(o)                 \
-            SET_OPTIONS_TO_DEFAULT(o);       \
-            o.fLogging       = 1;            \
-            o.noExeTIBFix    = 0;            \
-            o.AlignSections  = 1;            \
-            o.lxoffset       = 0;            \
-            o.ourstub        = 0
+/*******************************************************************************
+*   Global Variables                                                           *
+*******************************************************************************/
+extern struct options options; /* defined in d32globals.c */
 
 #endif