Changeset 5051

Timestamp:

Feb 2, 2001, 9:41:31 AM (24 years ago)

Author:

bird

Message:

Added new option for the All-in-one-object fix.

Location:

trunk/src/win32k

Files:

• include/options.h (modified) (6 diffs)
• k32/k32QueryOptionsStatus.cpp (modified) (2 diffs)
• k32/k32SetOptions.cpp (modified) (3 diffs)
• utils/Dialog.h (added)
• utils/Win32kCC.c (modified) (6 diffs)
• utils/Win32kCC.dlg (modified) (4 diffs)
• utils/Win32kCC.h (modified) (4 diffs)
• utils/Win32kCC.rc (modified) (2 diffs)

trunk/src/win32k/include/options.h ¶

@@ -1 @@
-/* $Id: options.h,v 1.18 2001-01-21 07:54:37 bird Exp $
+/* $Id: options.h,v 1.19 2001-02-02 08:39:52 bird Exp $
  *
  * Options.
@@ -39 +39 @@
 #define FLAGS_PE_MIXED      0x00000003UL
 
+/* fPEOneObject */
+#define FLAGS_PEOO_DISABLED 0x00000000UL
+#define FLAGS_PEOO_ENABLED  0x00000001UL
+#define FLAGS_PEOO_FORCED   0x00000002UL
+
 /* ulInfoLevel */
 #define INFOLEVEL_QUIET     0x00000000UL
@@ -63 +68 @@
             (unsigned short)~0,     /* usVerMinor    */     \
             FLAGS_PE_PE,            /* fPE           */     \
+            FLAGS_PEOO_FORCED,      /* fPEOneObject  */     \
             INFOLEVEL_QUIET,        /* ulInfoLevel   */     \
             FALSE,                  /* fElf          */     \
@@ -83 +89 @@
 #define isPe2LxLoaderEnabled()      (options.fPE == FLAGS_PE_PE2LX)
 #define isMixedPeLoaderEnabled()    (options.fPE == FLAGS_PE_MIXED)
+#define isPEOneObjectEnabled()      (options.fPEOneObject == FLAGS_PEOO_ENABLED)
+#define isPEOneObjectDisabled()     (options.fPEOneObject == FLAGS_PEOO_DISABLED)
+#define isPEOneObjectForced()       (options.fPEOneObject == FLAGS_PEOO_FORCED)
 
 #define isELFDisabled()             (!options.fElf)
@@ -129 +138 @@
     /** @cat Options affecting the generated LX executables */
     ULONG       fPE;                    /* Flags set the type of conversion. */
+    ULONG       fPEOneObject;           /* All in one object. */
     ULONG       ulInfoLevel;            /* Pe2Lx InfoLevel. */
 
@@ -165 +175 @@
 extern struct options DATA16_GLOBAL options;    /* defined in d16globals.c */
 extern char   szWin32kIni[160];                 /* defined in d16globals.c */
+#ifdef RING0
 #if defined(__IBMC__) || defined(__IBMCPP__)
     #pragma map( options , "_options"  )
     #pragma map( szWin32kIni, "_szWin32kIni" )
+#endif
 #endif
 /* INC */

trunk/src/win32k/k32/k32QueryOptionsStatus.cpp ¶

@@ -1 @@
-/* $Id: k32QueryOptionsStatus.cpp,v 1.4 2000-12-11 06:22:15 bird Exp $
+/* $Id: k32QueryOptionsStatus.cpp,v 1.5 2001-02-02 08:38:34 bird Exp $
  *
  * k32QueryOptionsStatus  - Queries the options and/or the status of
@@ -129 +129 @@
         TmpOptions.fLogging     = options.fLogging;
         TmpOptions.fPE          = options.fPE;
+        TmpOptions.fPEOneObject = options.fPEOneObject;
         TmpOptions.ulInfoLevel  = options.ulInfoLevel;
         TmpOptions.fElf         = options.fElf;

trunk/src/win32k/k32/k32SetOptions.cpp ¶

@@ -1 @@
-/* $Id: k32SetOptions.cpp,v 1.4 2000-12-11 06:22:15 bird Exp $
+/* $Id: k32SetOptions.cpp,v 1.5 2001-02-02 08:38:34 bird Exp $
  *
  * k32SetOptions - Sets the changable options of win32k.sys the options.
@@ -112 +112 @@
         if (TmpOptions.fPE > 4)
             return ERROR_INVALID_PARAMETER;
+        if (TmpOptions.fPEOneObject > 2)
+            return ERROR_INVALID_PARAMETER;
         if (TmpOptions.ulInfoLevel > 4)
             return ERROR_INVALID_PARAMETER;
@@ -150 +152 @@
         options.fLogging    = (USHORT)TmpOptions.fLogging;/* Logging. */
         options.fPE         = TmpOptions.fPE;           /* Flags set the type of conversion. */
+        options.fPEOneObject= TmpOptions.fPEOneObject;  /* All in One Object Forces fix. */
         options.ulInfoLevel = TmpOptions.ulInfoLevel;   /* Pe2Lx InfoLevel. */
         options.fElf        = TmpOptions.fElf;          /* Elf flags. */

trunk/src/win32k/utils/Win32kCC.c ¶

@@ -1 @@
-/* $Id: Win32kCC.c,v 1.10 2001-01-08 18:05:26 bird Exp $
+/* $Id: Win32kCC.c,v 1.11 2001-02-02 08:41:31 bird Exp $
  *
  * Win32CC - Win32k Control Center.
@@ -374 +374 @@
                      * Update Config.sys.
                      */
-                    *pszConfigSys = ulBootDrv - 1 + 'A';
+                    *pszConfigSys = (char)(ulBootDrv - 1 + 'A');
                     phConfigSys = fopen(pszConfigSys, "r+");
                     if (phConfigSys)
@@ -529 +529 @@
             WinSendDlgItemMsg(hwnd, RB_LDR_PE_PE,           BM_SETCHECK,    (MPARAM)(pThis->Options.fPE == FLAGS_PE_PE),        NULL);
             WinSendDlgItemMsg(hwnd, RB_LDR_PE_NOT,          BM_SETCHECK,    (MPARAM)(pThis->Options.fPE == FLAGS_PE_NOT),       NULL);
+            WinSendDlgItemMsg(hwnd, CK_LDR_PE_ONEOBJECT,    BM_SETCHECK,    (MPARAM)(pThis->Options.fPEOneObject),              NULL);
             WinSendDlgItemMsg(hwnd, SB_LDR_PE_INFOLEVEL,    SPBM_SETCURRENTVALUE, (MPARAM)(pThis->Options.ulInfoLevel),         NULL); /* FIXME to be changed */
             sprintf(szNumber, "%d", pThis->Status.cPe2LxModules);
@@ -645 +646 @@
                 return (MPARAM)FALSE;
             }
+            pThis->NewOptions.fPEOneObject = (ULONG)WinSendDlgItemMsg(hwnd, CK_LDR_PE_ONEOBJECT, BM_QUERYCHECK, NULL, NULL);
+            if (pThis->NewOptions.fPEOneObject > 2)
+            {
+                if (fComplain)
+                    Complain(hwnd, IDS_ERR_NO_PE_RADIOBUTTON);
+                return (MPARAM)FALSE;
+            }
             if (!WinSendDlgItemMsg(hwnd, SB_LDR_PE_INFOLEVEL, SPBM_QUERYVALUE, (MPARAM)&ul, MPFROM2SHORT(0, SPBQ_UPDATEIFVALID)))
             {
@@ -766 +774 @@
     {
         va_list args;
+        #pragma info(none)
         va_start(args, id);
+        #pragma info(restore)
         vsprintf(szMsgOutput, szMsg, args);
         va_end(args);
@@ -940 +950 @@
     }
 
-    return (char*)(*pszStr != '\0' ? (char*)pszStr - 1 : NULL);
+    return (char*)(*pszStr != '\0' ? (const char*)pszStr - 1 : (const char*)NULL);
 }
 

trunk/src/win32k/utils/Win32kCC.dlg ¶

@@ -2 +2 @@
    #include <os2.h>
 #endif
-DLGINCLUDE 1 "G:\odin32\tree\src\win32k\utils\Win32kCC.h"
+DLGINCLUDE 1 "G:\odin32\tree\src\win32k\utils\test\Dialog.h"
 
 DLGTEMPLATE DL_WIN32KCC LOADONCALL MOVEABLE DISCARDABLE
 BEGIN
-    DIALOG  "Win32k Control Center", DL_WIN32KCC, 159, 30, 274, 327,
-            WS_VISIBLE, FCF_SYSMENU | FCF_TITLEBAR | FCF_TASKLIST
+    DIALOG  "Win32k Control Center", DL_WIN32KCC, 146, 12, 274, 334, 
+            WS_VISIBLE, FCF_SYSMENU | FCF_TITLEBAR
     BEGIN
-        GROUPBOX        "", GR_W32K, 6, 279, 262, 46
-        LTEXT           "Symbol file", TX_W32K_SYMBOLFILE, 14, 291, 84, 8
-        LTEXT           "Kernel Build", TX_W32K_KERNELBUILD, 14, 283, 84, 8
-        LTEXT           "c:\\os2\\pdpsi\\pmdf\\warp4\\os2krnl.sym",
-                        TX_W32K_SYMBOLFILE_VAL, 100, 291, 165, 8
-        LTEXT           "Win32k version", TX_W32K_VERSION, 14, 307, 84, 8
-        LTEXT           "0.5", TX_W32K_VERSION_VAL, 100, 307, 165, 8
-        LTEXT           "Build time/date", TX_W32K_BUILD_DATETIME, 14, 299,
+        GROUPBOX        "", GR_W32K, 6, 286, 262, 46
+        LTEXT           "Symbol file", TX_W32K_SYMBOLFILE, 14, 298, 84, 8
+        LTEXT           "Kernel Build", TX_W32K_KERNELBUILD, 14, 290, 84, 8
+        LTEXT           "c:\\os2\\pdpsi\\pmdf\\warp4\\os2krnl.sym", 
+                        TX_W32K_SYMBOLFILE_VAL, 100, 298, 165, 8
+        LTEXT           "Win32k version", TX_W32K_VERSION, 14, 314, 84, 8
+        LTEXT           "0.5", TX_W32K_VERSION_VAL, 100, 314, 165, 8
+        LTEXT           "Build time/date", TX_W32K_BUILD_DATETIME, 14, 306, 
                         84, 8
-        LTEXT           "04:30:12 Sep 01 2000", TX_W32K_BUILD_DATETIME_VAL,
-                        100, 299, 165, 8
-        LTEXT           "9.036", TX_W32K_KERNELBUILD_VAL, 100, 283, 165, 8
-
-        GROUPBOX        "Logging", GR_LOGGING, 6, 251, 262, 24
-        AUTOCHECKBOX    "Enabled", CB_LOGGING_ENABLED, 14, 255, 50, 10
-        AUTORADIOBUTTON "COM1", RB_LOGGING_COM1, 76, 255, 36, 10, WS_TABSTOP
-        AUTORADIOBUTTON "COM2", RB_LOGGING_COM2, 123, 255, 36, 10,
+        LTEXT           "04:30:12 Sep 01 2000", TX_W32K_BUILD_DATETIME_VAL, 
+                        100, 306, 165, 8
+        LTEXT           "9.036", TX_W32K_KERNELBUILD_VAL, 100, 290, 165, 8
+        GROUPBOX        "Logging", GR_LOGGING, 6, 258, 262, 24
+        AUTOCHECKBOX    "Enabled", CB_LOGGING_ENABLED, 14, 262, 50, 10
+        AUTORADIOBUTTON "COM1", RB_LOGGING_COM1, 76, 262, 36, 10, WS_TABSTOP
+        AUTORADIOBUTTON "COM2", RB_LOGGING_COM2, 123, 262, 36, 10, 
                         WS_TABSTOP
-        AUTORADIOBUTTON "COM3", RB_LOGGING_COM3, 167, 255, 36, 10,
+        AUTORADIOBUTTON "COM3", RB_LOGGING_COM3, 167, 262, 36, 10, 
                         WS_TABSTOP
-        AUTORADIOBUTTON "COM4", RB_LOGGING_COM4, 213, 255, 36, 10,
+        AUTORADIOBUTTON "COM4", RB_LOGGING_COM4, 213, 262, 36, 10, 
                         WS_TABSTOP
-
-        GROUPBOX        "Loaders", GR_LOADERS, 6, 143, 262, 104
-        AUTOCHECKBOX    "Disable all loaders", CB_LDR_DISABLE_ALL, 14, 227,
+        GROUPBOX        "Loaders", GR_LOADERS, 6, 143, 262, 111
+        AUTOCHECKBOX    "Disable all loaders", CB_LDR_DISABLE_ALL, 14, 234, 
                         112, 10
-        GROUPBOX        "~PE Loader", GR_LDR_PE, 14, 171, 118, 54,
+        GROUPBOX        "~PE Loader", GR_LDR_PE, 14, 171, 118, 63, 
                         DT_MNEMONIC
-        AUTORADIOBUTTON "Pure", RB_LDR_PE_PURE, 22, 206, 44, 9, WS_TABSTOP
-        AUTORADIOBUTTON "Mixed", RB_LDR_PE_MIXED, 22, 197, 44, 9, WS_TABSTOP
-        AUTORADIOBUTTON "PE.EXE", RB_LDR_PE_PE, 78, 206, 44, 9, WS_TABSTOP
-        AUTORADIOBUTTON "Disabled", RB_LDR_PE_NOT, 78, 197, 51, 9,
+        AUTORADIOBUTTON "Pure", RB_LDR_PE_PURE, 22, 215, 44, 9, WS_TABSTOP
+        AUTORADIOBUTTON "Mixed", RB_LDR_PE_MIXED, 22, 206, 44, 9, WS_TABSTOP
+        AUTORADIOBUTTON "PE.EXE", RB_LDR_PE_PE, 78, 215, 44, 9, WS_TABSTOP
+        AUTORADIOBUTTON "Disabled", RB_LDR_PE_NOT, 78, 206, 51, 9, 
                         WS_TABSTOP
-        SPINBUTTON      SB_LDR_PE_INFOLEVEL, 96, 185, 28, 12,
+        CONTROL         "All-In-One-Object Fix", CK_LDR_PE_ONEOBJECT, 22, 
+                        196, 102, 10, WC_BUTTON, BS_AUTO3STATE | BS_AUTOSIZE | 
+                        WS_TABSTOP | WS_VISIBLE
+        SPINBUTTON      SB_LDR_PE_INFOLEVEL, 96, 185, 28, 12, 
                         SPBS_NUMERICONLY | SPBS_MASTER | WS_GROUP
         LTEXT           "Infolevel:", TX_LDR_PE_INFOLEVEL, 22, 185, 48, 8
-
-        GROUPBOX        "~ELF Loader", GR_LDR_ELF, 142, 181, 118, 44,
+        GROUPBOX        "~ELF Loader", GR_LDR_ELF, 142, 190, 118, 44, 
                         DT_MNEMONIC | WS_DISABLED
-        AUTOCHECKBOX    "Enabled", CB_LDR_ELF_ENABLED, 150, 205, 55, 10,
+        AUTOCHECKBOX    "Enabled", CB_LDR_ELF_ENABLED, 150, 214, 55, 10, 
                         WS_DISABLED
-        LTEXT           "Infolevel:", TX_LDR_ELF_INFOLEVEL, 150, 195, 48, 8,
+        LTEXT           "Infolevel:", TX_LDR_ELF_INFOLEVEL, 150, 204, 48, 8, 
                         WS_DISABLED
-        SPINBUTTON      SB_LDR_ELF_INFOLEVEL, 224, 195, 28, 12,
-                        SPBS_NUMERICONLY | SPBS_MASTER | WS_GROUP |
+        SPINBUTTON      SB_LDR_ELF_INFOLEVEL, 224, 204, 28, 12, 
+                        SPBS_NUMERICONLY | SPBS_MASTER | WS_GROUP | 
                         WS_DISABLED
-        AUTOCHECKBOX    "UNIX Shell Scripts", CB_LDR_SHELL_SCRIPTS, 14, 157,
+        AUTOCHECKBOX    "UNIX Shell Scripts", CB_LDR_SHELL_SCRIPTS, 14, 157, 
                         118, 10
         AUTOCHECKBOX    "JAVA", CB_LDR_JAVA, 142, 157, 118, 10
-        AUTOCHECKBOX    "(Pure) REXX Scripts (.RX/.REX)", CB_LDR_REXX, 14,
+        AUTOCHECKBOX    "(Pure) REXX Scripts (.RX/.REX)", CB_LDR_REXX, 14, 
                         147, 160, 10
-
         GROUPBOX        "OS/2 Loader Fixes", GR_LDRFIX, 6, 115, 262, 24
-        AUTOCHECKBOX    "Long DLL names and non .DLL extention fixes (expr.)",
+        AUTOCHECKBOX    "Long DLL names and non .DLL extention fixes (expr.)", 
                         CB_LDRFIX_DLLFIXES, 14, 119, 252, 10
-
         GROUPBOX        "Heaps", GR_HEAPS, 6, 26, 262, 85
         GROUPBOX        "Resident Heap", GR_HEAP_RES, 14, 30, 118, 73
         LTEXT           "Max (KB):", TX_HEAP_RES_MAX, 22, 84, 53, 8
-        SPINBUTTON      SB_HEAP_RES_MAX, 82, 84, 42, 8, SPBS_NUMERICONLY |
+        SPINBUTTON      SB_HEAP_RES_MAX, 82, 84, 42, 8, SPBS_NUMERICONLY | 
                         SPBS_MASTER | SPBS_FASTSPIN | WS_GROUP
         LTEXT           "Initial (KB)", TX_HEAP_RES_INIT, 22, 74, 50, 8
@@ -76 +74 @@
         GROUPBOX        "Swappable Heap", GR_HEAP_SWP, 142, 30, 118, 73
         LTEXT           "Max (KB):", TX_HEAP_SWP_MAX, 150, 84, 53, 8
-        SPINBUTTON      SB_HEAP_SWP_MAX, 210, 84, 42, 8, SPBS_NUMERICONLY |
+        SPINBUTTON      SB_HEAP_SWP_MAX, 210, 84, 42, 8, SPBS_NUMERICONLY | 
                         SPBS_MASTER | SPBS_FASTSPIN | WS_GROUP
         LTEXT           "Initial (KB)", TX_HEAP_SWP_INIT, 150, 74, 50, 8
@@ -86 +84 @@
         LTEXT           "Current (KB)", TX_HEAP_RES_SIZE, 22, 66, 56, 8
         RTEXT           "257", TX_HEAP_RES_SIZE_VAL, 78, 66, 46, 8
-        LTEXT           "Used Blocks", TX_HEAP_RES_USED_BLOCKS, 22, 42, 53,
+        LTEXT           "Used Blocks", TX_HEAP_RES_USED_BLOCKS, 22, 42, 53, 
                         8
         RTEXT           "10", TX_HEAP_RES_USED_BLOCKS_VAL, 78, 42, 46, 8
-        LTEXT           "Free Blocks", TX_HEAP_RES_FREE_BLOCKS, 22, 34, 53,
+        LTEXT           "Free Blocks", TX_HEAP_RES_FREE_BLOCKS, 22, 34, 53, 
                         8
         RTEXT           "10", TX_HEAP_RES_FREE_BLOCKS_VAL, 78, 34, 46, 8
@@ -96 +94 @@
         LTEXT           "Current (KB)", TX_HEAP_SWP_SIZE, 150, 66, 56, 8
         RTEXT           "257", TX_HEAP_SWP_SIZE_VAL, 206, 66, 46, 8
-        LTEXT           "Used Blocks", TX_HEAP_SWP_USED_BLOCKS, 150, 42, 53,
+        LTEXT           "Used Blocks", TX_HEAP_SWP_USED_BLOCKS, 150, 42, 53, 
                         8
         RTEXT           "11", TX_HEAP_SWP_USED_BLOCKS_VAL, 206, 42, 46, 8
-        LTEXT           "Free Blocks", TX_HEAP_SWP_FREE_BLOCKS, 150, 34, 53,
+        LTEXT           "Free Blocks", TX_HEAP_SWP_FREE_BLOCKS, 150, 34, 53, 
                         8
         RTEXT           "11", TX_HEAP_SWP_FREE_BLOCKS_VAL, 206, 34, 46, 8
         LTEXT           "Modules", TX_LDR_PE_MODULES, 22, 175, 48, 8
         RTEXT           "3", TX_LDR_PE_MODULES_VAL, 77, 175, 47, 8
-        LTEXT           "Modules", TX_LDR_ELF_MODULES, 150, 185, 48, 8,
+        LTEXT           "Modules", TX_LDR_ELF_MODULES, 150, 194, 48, 8, 
                         WS_DISABLED
-        RTEXT           "3", TX_LDR_ELF_MODULES_VAL, 205, 185, 47, 8,
+        RTEXT           "3", TX_LDR_ELF_MODULES_VAL, 205, 194, 47, 8, 
                         WS_DISABLED
-
         DEFPUSHBUTTON   "~Refresh", PB_REFRESH, 6, 5, 40, 14
         PUSHBUTTON      "~Apply", PB_APPLY, 49, 5, 40, 14
-        PUSHBUTTON      "Update Config.sys", PB_UPD_CONFIGSYS, 92, 5, 100,
+        PUSHBUTTON      "Update Config.sys", PB_UPD_CONFIGSYS, 92, 5, 100, 
                         14
-        PUSHBUTTON      "~Close", IDS_ERR_DIALOGLOAD, 195, 5, 40, 14
+        PUSHBUTTON      "~Close", DID_OK, 195, 5, 40, 14
     END
 END

trunk/src/win32k/utils/Win32kCC.h ¶

@@ -1 @@
-/* $Id: Win32kCC.h,v 1.5 2000-12-11 06:17:51 bird Exp $
+/* $Id: Win32kCC.h,v 1.6 2001-02-02 08:41:31 bird Exp $
  *
  *
@@ -9 +9 @@
  */
 
+#ifndef _Win32kCC_h_
+#define _Win32kCC_h_
+
+/*******************************************************************************
+*   Header Files                                                               *
+*******************************************************************************/
+#include "Dialog.h"
+
 /*******************************************************************************
 *   Defined Constants And Macros                                               *
 *******************************************************************************/
-/*
- * General PushButton ID(s)
- */
-#define PB_APPLY                    0xfffe
-#define PB_REFRESH                  0xfffd
-#define PB_UPD_CONFIGSYS            0xfffc
-
 
 /*
@@ -31 +32 @@
 #define  IDS_ERR_NO_COM_RADIOBUTTON     7
 #define  IDS_ERR_NO_PE_RADIOBUTTON      8
-#define  IDS_ERR_INVALID_INFOLEVEL      9
-#define  IDS_ERR_INVALID_MAXHEAPSIZE    10
-#define  IDS_ERR_SETPOPTIONS            11
-#define  IDS_ERR_FOPEN_FAILED           12
-#define  IDS_FSIZE_FAILED               13
-#define  IDS_MALLOC_FAILED              14
-#define  IDS_FWRITE_FAILED              15
+#define  IDS_ERR_NO_PE_ONEOBJECT        9
+#define  IDS_ERR_INVALID_INFOLEVEL      10
+#define  IDS_ERR_INVALID_MAXHEAPSIZE    11
+#define  IDS_ERR_SETPOPTIONS            12
+#define  IDS_ERR_FOPEN_FAILED           13
+#define  IDS_FSIZE_FAILED               14
+#define  IDS_MALLOC_FAILED              15
+#define  IDS_FWRITE_FAILED              16
 
 
@@ -46 +48 @@
 #define  IDM_CONFIGSYS_UPDATED          2
 
-
-/*
- * The Win32kCC (main) dialog.
- */
-#define DL_WIN32KCC                 1000
-
-#define GR_LOGGING                  1010
-#define CB_LOGGING_ENABLED          1011
-#define RB_LOGGING_COM1             1012
-#define RB_LOGGING_COM2             1013
-#define RB_LOGGING_COM3             1014
-#define RB_LOGGING_COM4             1015
-
-
-#define GR_LOADERS                  1030
-#define CB_LDR_DISABLE_ALL          1031
-
-#define GR_LDR_PE                   1040
-#define RB_LDR_PE_PURE              1041
-#define RB_LDR_PE_MIXED             1042
-#define RB_LDR_PE_PE                1043
-#define RB_LDR_PE_NOT               1044
-#define TX_LDR_PE_INFOLEVEL         1045
-#define SB_LDR_PE_INFOLEVEL         1046
-#define TX_LDR_PE_MODULES           1047
-#define TX_LDR_PE_MODULES_VAL       1048
-
-#define GR_LDR_ELF                  1060
-#define CB_LDR_ELF_ENABLED          1061
-#define TX_LDR_ELF_INFOLEVEL        1062
-#define SB_LDR_ELF_INFOLEVEL        1063
-#define TX_LDR_ELF_MODULES          1064
-#define TX_LDR_ELF_MODULES_VAL      1065
-
-#define CB_LDR_SHELL_SCRIPTS        1070
-#define CB_LDR_JAVA                 1080
-#define CB_LDR_REXX                 1090
-
-
-#define GR_HEAPS                    1150
-
-#define GR_HEAP_RES                 1160
-#define TX_HEAP_RES_MAX             1161
-#define SB_HEAP_RES_MAX             1162
-#define TX_HEAP_RES_INIT            1163
-#define TX_HEAP_RES_INIT_VAL        1164
-#define TX_HEAP_RES_USED            1165
-#define TX_HEAP_RES_USED_VAL        1166
-#define TX_HEAP_RES_FREE            1167
-#define TX_HEAP_RES_FREE_VAL        1168
-#define TX_HEAP_RES_SIZE            1169
-#define TX_HEAP_RES_SIZE_VAL        1170
-#define TX_HEAP_RES_USED_BLOCKS     1171
-#define TX_HEAP_RES_USED_BLOCKS_VAL 1172
-#define TX_HEAP_RES_FREE_BLOCKS     1173
-#define TX_HEAP_RES_FREE_BLOCKS_VAL 1174
-
-
-#define GR_HEAP_SWP                 1180
-#define TX_HEAP_SWP_MAX             1181
-#define SB_HEAP_SWP_MAX             1182
-#define TX_HEAP_SWP_INIT            1183
-#define TX_HEAP_SWP_INIT_VAL        1184
-#define TX_HEAP_SWP_USED            1185
-#define TX_HEAP_SWP_USED_VAL        1186
-#define TX_HEAP_SWP_FREE            1187
-#define TX_HEAP_SWP_FREE_VAL        1188
-#define TX_HEAP_SWP_SIZE            1189
-#define TX_HEAP_SWP_SIZE_VAL        1190
-#define TX_HEAP_SWP_USED_BLOCKS     1191
-#define TX_HEAP_SWP_USED_BLOCKS_VAL 1192
-#define TX_HEAP_SWP_FREE_BLOCKS     1193
-#define TX_HEAP_SWP_FREE_BLOCKS_VAL 1194
-
-#define GR_W32K                     1200
-#define TX_W32K_VERSION             1201
-#define TX_W32K_VERSION_VAL         1202
-#define TX_W32K_BUILD_DATETIME      1203
-#define TX_W32K_BUILD_DATETIME_VAL  1204
-#define TX_W32K_SYMBOLFILE          1205
-#define TX_W32K_SYMBOLFILE_VAL      1206
-#define TX_W32K_KERNELBUILD         1207
-#define TX_W32K_KERNELBUILD_VAL     1208
-
-#define GR_LDRFIX                   1250
-#define CB_LDRFIX_DLLFIXES          1251
-
-
-
+#endif

trunk/src/win32k/utils/Win32kCC.rc ¶

@@ -1 @@
-/* $Id: Win32kCC.rc,v 1.4 2000-11-26 13:36:53 bird Exp $
+/* $Id: Win32kCC.rc,v 1.5 2001-02-02 08:41:31 bird Exp $
  *
  * Resource File for Win32k Control Center.
@@ -28 +28 @@
     IDS_ERR_NO_COM_RADIOBUTTON, "Internal error. No COM port is selected!"
     IDS_ERR_NO_PE_RADIOBUTTON,  "Internal error. No PE Loader mode is selected!"
+    IDS_ERR_NO_PE_ONEOBJECT,    "Internal error. Invalid All-In-One-Object state!"
     IDS_ERR_INVALID_INFOLEVEL,  "Invalid infolevel."
     IDS_ERR_INVALID_MAXHEAPSIZE,"Invalid heapsize."