Changeset 5145

Timestamp:

Feb 17, 2001, 9:57:51 AM (24 years ago)

Author:

bird

Message:

Initial rewrite to notebook. We check for pre warp4 and uses old style.
Added MemInfo page.
Problem: hot-keys.

Location:

branches/notebook/src/win32k/utils

Files:

• Dialog.h (modified) (5 diffs)
• Win32kCC.c (modified) (24 diffs)
• Win32kCC.dlg (modified) (3 diffs)
• Win32kCC.h (modified) (2 diffs)
• Win32kCC.rc (modified) (4 diffs)

branches/notebook/src/win32k/utils/Dialog.h ¶

@@ -1 @@
-/* $Id: Dialog.h,v 1.2.2.1 2001-02-16 23:20:29 bird Exp $
+/* $Id: Dialog.h,v 1.2.2.2 2001-02-17 08:57:50 bird Exp $
  *
  * Dialog IDs.
@@ -28 +28 @@
 
 /*
- * The Logging page.
+ * The Logging Page.
  */
 #define DL_LOGGING_PAGE             1100
@@ -68 +68 @@
 
 /*
- * The Heaps page.
+ * The Heaps Page.
  */
 #define DL_HEAPS_PAGE               1300
@@ -106 +106 @@
 
 /*
- * The Status page.
+ * The Status Page.
  */
 #define PG_WIN32K_INFO_PAGE         1400
@@ -128 +128 @@
 #define CB_LDRFIX_FORCEPRELOAD      1504
 
+/*
+ * The MemInfo Page.
+ */
+#define DL_MEMINFO_PAGE             1600
+#define GR_MEMINFO                  1601
+
+#define GR_MEMINFO_SWAP             1610
+#define TX_MEMINFO_SWAP_SIZE        1611
+#define TX_MEMINFO_SWAP_AVAIL       1612
+#define TX_MEMINFO_SWAP_USED        1613
+#define TX_MEMINFO_SWAP_MINFREE     1614
+#define TX_MEMINFO_SWAP_CFG_MINFREE 1615
+#define TX_MEMINFO_SWAP_CFG_SIZE    1616
+#define TX_MEMINFO_SWAP_BROKEN_DFS  1617
+#define TX_MEMINFO_SWAP_GROW_FAILS  1618
+#define TX_MEMINFO_SWAP_DFS_IN_MEMFILE 1619
+
+#define GR_MEMINFO_PHYSPAGE         1640
+#define TX_MEMINFO_PHYS_SIZE        1641
+#define TX_MEMINFO_PHYS_AVAIL       1642
+#define TX_MEMINFO_PHYS_USED        1643
+#define TX_MEMINFO_PAGE_ENABLED     1651
+#define TX_MEMINFO_PAGE_FAULTS      1652
+#define TX_MEMINFO_PAGE_FAULTS_ACTIVE 1653
+#define TX_MEMINFO_PAGE_PHYSPAGES   1654
+#define TX_MEMINFO_PAGE_RESPAGES    1655
+#define TX_MEMINFO_PAGE_SWAPPAGES   1656
+#define TX_MEMINFO_PAGE_DISCPAGES   1657
+#define TX_MEMINFO_PAGE_DISCINMEM   1658
+
+#define GR_MEMINFO_VM               1680
+#define TX_MEMINFO_VM_ADDRESSLIMIT  1681
+#define TX_MEMINFO_VM_SHARED_MIN    1682
+#define TX_MEMINFO_VM_SHARED_MAX    1683
+#define TX_MEMINFO_VM_PRIVATE_MAX   1684
+#define TX_MEMINFO_VM_SYSTEM_MIN    1685
+#define TX_MEMINFO_VM_SYSTEM_MAX    1686
+#define TX_MEMINFO_VM_PRIVATE_HMAX  1687
+#define TX_MEMINFO_VM_SHARED_HMIN   1688
+#define TX_MEMINFO_VM_SHARED_HMAX   1689

branches/notebook/src/win32k/utils/Win32kCC.c ¶

@@ -1 @@
-/* $Id: Win32kCC.c,v 1.12.2.2 2001-02-16 23:23:05 bird Exp $
+/* $Id: Win32kCC.c,v 1.12.2.3 2001-02-17 08:57:50 bird Exp $
  *
  * Win32CC - Win32k Control Center.
@@ -24 +24 @@
  * Notebook page constants.
  */
-#define W32CCPG_INFO            0
-#define W32CCPG_LOADERS         1
-#define W32CCPG_LOGGING         2
-#define W32CCPG_STATUS          3
-#define W32CCPG_HEAPS           4
-#define W32CCPG_LDRFIX          5
-#define W32CCPG_PAGES           (W32CCPG_LDRFIX+1)
-
+#define W32KCCPG_STATUS         0
+#define W32KCCPG_LOADERS        1
+#define W32KCCPG_LOGGING        2
+#define W32KCCPG_HEAPS          3
+#define W32KCCPG_LDRFIX         4
+#define W32KCCPG_MEMINFO        5
+#define W32KCCPG_PAGES          (W32KCCPG_MEMINFO+1)
 
 
@@ -46 +45 @@
 #define INCL_WINBUTTONS
 #define INCL_WINWINDOWMGR
+#define INCL_WINSTDBOOK
+#define INCL_WINSYS
+#define INCL_GPIPRIMITIVES
+#define INCL_GPILCIDS
 #define INCL_DOSMISC
+
 
 /*******************************************************************************
@@ -71 +75 @@
 typedef struct _Win32kCCPage
 {
-    ULONG   ulPageId;
+    ULONG   ulId;
     HWND    hwnd;
 } WIN32KCCPAGE, *PWIN32KCCPAGE;
@@ -78 +82 @@
 {
     HWND    hwnd;
+    HWND    hwndNtbk;
     HAB     hab;
     BOOL    fDirty;
@@ -85 +90 @@
     K32STATUS  Status;
 
-    W32CCPG_PAGES   aPages[W32CCPG_PAGES];
+    WIN32KCCPAGE    aPages[W32KCCPG_PAGES]; /* Array containing generic page info. */
 
 } WIN32KCC, *PWIN32KCC;
@@ -98 +103 @@
                                          * WM_QUITs.
                                          */
-
+BOOL    fOldNtbk;                       /* Set if we must use the old notebook
+                                         * style.
+                                         */
 
 /*******************************************************************************
 *   Internal Functions                                                         *
 *******************************************************************************/
-MRESULT EXPENTRY    Win32kCCDlgProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2);
+MRESULT EXPENTRY    Win32kCCDlgProc (HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2);
+
+MRESULT EXPENTRY    LoadersDlgProc  (HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2);
+MRESULT EXPENTRY    LoggingDlgProc  (HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2);
+MRESULT EXPENTRY    StatusDlgProc   (HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2);
+MRESULT EXPENTRY    HeapsDlgProc    (HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2);
+MRESULT EXPENTRY    LdrFixDlgProc   (HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2);
+MRESULT EXPENTRY    MemInfoDlgProc  (HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2);
+
+MRESULT EXPENTRY    NtbkDefPageDlgProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2);
+
+BOOL                SetDlgItemTextF(HWND hwndDlg, ULONG idItem, PSZ pszFormat, ...);
 ULONG               ShowMessage(HWND hwndOwner, int id, ULONG flStyle);
 BOOL                Complain(HWND hwndOwner, int id, ...);
@@ -128 +146 @@
     ULONG   rc = 0;
     HWND    hwnd;
+    ULONG   aulVer[2];
 
     /*
@@ -166 +185 @@
 
     /*
+     * Check version and set fOldNtbk accordingly.
+     */
+    fOldNtbk = (DosQuerySysInfo(QSV_VERSION_MAJOR, QSV_VERSION_MINOR, &aulVer, sizeof(aulVer))
+                || (aulVer[1] <= 20 && aulVer[0] < 40));
+
+    /*
      * Load the dialog.
      */
@@ -171 +196 @@
                       Win32kCCDlgProc,
                       NULLHANDLE,
-                      DL_WIN32KCC,
+                      fOldNtbk ? DL_WIN32KCC_OLD : DL_WIN32KCC,
                       NULL);
 
@@ -212 +237 @@
 #pragma info(noord) /*remove annoying (and possible incorrect) messages on the MP* macros */
 
-#if 1
 /**
  * Dialog procedure for the DL_WIN32KCC notebook dialog.
@@ -220 +244 @@
 {
     PWIN32KCC   pThis;
+    int         i;
 
 
@@ -247 +272 @@
         case WM_INITDLG:
         {
+            static struct _NtbkPage
+            {
+                PFNWP   pfnDlgProc;
+                ULONG   idDlg;
+                ULONG   idPage;
+            }   aPages[W32KCCPG_PAGES] =
+            {
+                { StatusDlgProc ,  PG_WIN32K_INFO_PAGE, W32KCCPG_STATUS },
+                { LoadersDlgProc,  DL_LOADERS_PAGE,     W32KCCPG_LOADERS},
+                { LoggingDlgProc,  DL_LOGGING_PAGE,     W32KCCPG_LOGGING},
+                { HeapsDlgProc  ,  DL_HEAPS_PAGE,       W32KCCPG_HEAPS  },
+                { LdrFixDlgProc ,  DL_LDRFIX_PAGE,      W32KCCPG_LDRFIX },
+                { MemInfoDlgProc , DL_MEMINFO_PAGE,     W32KCCPG_MEMINFO }
+            };
+            CHAR            szTabText[128];
+            PDLGTEMPLATE    pdlgt;
+            APIRET          rc;
+            RECTL           rectl;
+            SWP             swp;
+            SWP             swp2;
+
             /*
              * Init and set instance data.
@@ -260 +306 @@
             pThis->hwnd = hwnd;
             pThis->hab = WinQueryAnchorBlock(hwnd);
+            pThis->hwndNtbk = WinWindowFromID(hwnd, DL_WIN32KCC_NTBK);
             if (!WinSetWindowPtr(hwnd, QWL_USER, pThis))
             {
                 /* complain, dismiss and return. */
-                Complain(hwnd, IDS_ERR_SET_INSTACEDATA,
+                Complain(hwnd, IDS_ERR_SET_INSTANCEDATA,
                          WinGetLastError(pThis->hab),
                          getLastErrorMsg(pThis->hab));
@@ -272 +319 @@
             }
 
+
             /*
              * Insert notebooks pages.
              */
-
+            for (i = 0; i < W32KCCPG_PAGES; i++)
+            {
+                ULONG ulErrId = 0;
+                ULONG iPage = aPages[i].idPage;
+
+                rc = DosGetResource(NULLHANDLE, RT_DIALOG, aPages[i].idDlg, (PPVOID)(void*)&pdlgt);
+                if (rc)
+                {
+                    Complain(hwnd, IDS_ERR_FAILED_TO_LOAD_DLGT, aPages[i].idDlg, rc);
+                    WinPostMsg(hwnd, WM_QUIT, NULL, NULL);
+                    WinSendMsg(hwnd, WM_DESTROY, NULL, NULL);
+                    return FALSE;
+                }
+
+                pThis->aPages[iPage].hwnd =
+                    (HWND)WinLoadDlg(hwnd, HWND_DESKTOP, aPages[i].pfnDlgProc,
+                                     NULLHANDLE, aPages[i].idDlg, pThis);
+                if (pThis->aPages[iPage].hwnd != NULLHANDLE)
+                {
+                    /*
+                     * Resize the notebook according to the first page.
+                     *  Get the size of the page we're inserting
+                     *  Calc notebook size according to that page.
+                     *  Resize the notebook controll.
+                     *  Resize the dialog.
+                     *  Recalc page rectangle.
+                     */
+                    if (i == 0)
+                    {
+                        WinQueryWindowPos(pThis->aPages[iPage].hwnd, &swp);
+                        rectl.xLeft = rectl.yBottom = 0;
+                        rectl.xRight = swp.cx;
+                        rectl.yTop = swp.cy;
+                        WinSendMsg(pThis->hwndNtbk, BKM_CALCPAGERECT, &rectl, (MPARAM)FALSE);
+
+                        WinQueryWindowPos(pThis->hwndNtbk, &swp);
+                        WinSetWindowPos(pThis->hwndNtbk, NULLHANDLE,
+                                        0, 0,
+                                        rectl.xRight - rectl.xLeft,
+                                        rectl.yTop - rectl.yBottom,
+                                        SWP_SIZE);
+
+                        WinQueryWindowPos(hwnd, &swp2);
+                        WinSetWindowPos(hwnd, NULLHANDLE,
+                                        0, 0,
+                                        swp2.cx + (rectl.xRight - rectl.xLeft) - swp.cx,
+                                        swp2.cy + (rectl.yTop - rectl.yBottom) - swp.cy,
+                                        SWP_SIZE);
+                    }
+
+                    /*
+                     * Insert page.
+                     */
+                    pThis->aPages[iPage].ulId =
+                        (ULONG)WinSendMsg(pThis->hwndNtbk, BKM_INSERTPAGE, NULL,
+                                          MPFROM2SHORT(BKA_MAJOR | BKA_AUTOPAGESIZE, BKA_LAST));
+                    if (pThis->aPages[iPage].ulId != 0)
+                    {
+                        /*
+                         * Place the dialog into the page.
+                         */
+                        if (WinSendMsg(pThis->hwndNtbk, BKM_SETPAGEWINDOWHWND,
+                                       (MPARAM)pThis->aPages[iPage].ulId, (MPARAM)pThis->aPages[iPage].hwnd))
+                        {
+                            /*
+                             * Set tab text - use the title of the dialog.
+                             */
+                            szTabText[0] = '\0';
+                            if (   pdlgt != NULL && pdlgt->adlgti[0].cchText != 0
+                                && pdlgt->adlgti[0].offText != 0xFFFF && pdlgt->adlgti[0].offText != 0)
+                                strncat(szTabText, (char*)((unsigned)(pdlgt) + pdlgt->adlgti[0].offText), pdlgt->adlgti[0].cchText);
+                            WinSendMsg(pThis->hwndNtbk, BKM_SETTABTEXT, (MPARAM)pThis->aPages[iPage].ulId, &szTabText[0]);
+                        }
+                        else
+                            ulErrId = IDS_ERR_ADD_NTBK_PAGE_SET;
+                    }
+                    else
+                        ulErrId = IDS_ERR_ADD_NTBK_PAGE_INSERT;
+                }
+                else
+                    ulErrId = IDS_ERR_ADD_NTBK_PAGE_LOAD;
+
+                /* Check for error */
+                if (ulErrId)
+                {
+                    Complain(hwnd, ulErrId, aPages[i].idDlg,  WinGetLastError(pThis->hab), getLastErrorMsg(pThis->hab));
+                    WinPostMsg(hwnd, WM_QUIT, NULL, NULL);
+                    WinSendMsg(hwnd, WM_DESTROY, NULL, NULL);
+                    return FALSE;
+                }
+            }
+
+            if (fOldNtbk)
+            {
+                POINTL      ptl;
+                FONTMETRICS fm;
+
+                /*
+                 * If it's an old style dialog we'll have to resize the tabs.
+                 *      Hackish!!! Seems like I don't do this right!
+                 */
+                for (i = 0, ptl.x = 7, ptl.y = 7; i < W32KCCPG_PAGES; i++)
+                {
+                    BOOKTEXT    booktxt = {&szTabText[0], sizeof(szTabText)};
+                    if (pThis->aPages[i].hwnd == NULLHANDLE) continue;
+
+                    if (WinSendMsg(pThis->hwndNtbk, BKM_QUERYTABTEXT, (MPARAM)pThis->aPages[i].ulId, &booktxt))
+                    {
+                        POINTL aptl[TXTBOX_COUNT];
+                        if (GpiQueryTextBox(WinGetPS(pThis->hwndNtbk), strlen(booktxt.pString)+1, booktxt.pString, TXTBOX_COUNT, aptl))
+                        {
+                            if (ptl.x < abs(aptl[TXTBOX_BOTTOMRIGHT].x - aptl[TXTBOX_BOTTOMLEFT].x))
+                                ptl.x = abs(aptl[TXTBOX_BOTTOMRIGHT].x - aptl[TXTBOX_BOTTOMLEFT].x);
+                        }
+                    }
+                }
+                if (GpiQueryFontMetrics(WinGetPS(pThis->hwndNtbk), sizeof(fm), &fm))
+                    ptl.y = fm.lXHeight + fm.lEmHeight;
+
+
+                /*
+                 * Before we resize anything, we'll have to get the size of a page.
+                 * Change the tab size. This may effect the notebook page size.
+                 * Recalc new notebook size using old page size.
+                 * Addjust dialog window.
+                 * Addjust notebook control.
+                 */
+                WinQueryWindowPos(pThis->aPages[aPages[0].idPage].hwnd, &swp);
+
+                WinSendMsg(pThis->hwndNtbk, BKM_SETDIMENSIONS, MPFROM2SHORT(ptl.x, ptl.y), (MPARAM)BKA_MAJORTAB);
+
+                rectl.xLeft = swp.x;
+                rectl.yBottom = swp.y;
+                rectl.xRight = swp.cx - swp.x;
+                rectl.yTop = swp.cy - swp.y;
+                WinSendMsg(pThis->hwndNtbk, BKM_CALCPAGERECT, &rectl, (MPARAM)FALSE);
+                WinQueryWindowPos(hwnd, &swp);
+                WinQueryWindowPos(pThis->hwndNtbk, &swp2);
+                WinSetWindowPos(hwnd, NULLHANDLE, 0, 0,
+                                swp.cx + rectl.xRight - rectl.xLeft - swp2.cx,
+                                swp.cy + rectl.yTop - rectl.yBottom - swp2.cy,
+                                SWP_SIZE);
+                WinSetWindowPos(pThis->hwndNtbk, NULLHANDLE, 0, 0,
+                                rectl.xRight - rectl.xLeft,
+                                rectl.yTop - rectl.yBottom,
+                                SWP_SIZE);
+
+                /*
+                 * Set Status text background color to dialog background color.
+                 */
+                WinSendMsg(pThis->hwndNtbk, BKM_SETNOTEBOOKCOLORS,
+                           (MPARAM)SYSCLR_DIALOGBACKGROUND,
+                           (MPARAM)BKA_BACKGROUNDPAGECOLORINDEX);
+            }
 
 
@@ -495 +696 @@
         {
             APIRET  rc;
-            CHAR    szNumber[32];
-            CHAR    szBuffer[100];
-
 
             /*
@@ -517 +715 @@
 
             /*
-             * Set the controls.
+             * Update the individual pages.
              */
-            /* win32k */
-            sprintf(szBuffer, "%d.%d", 0, pThis->Status.ulVersion);
-            WinSetDlgItemText(hwnd, TX_W32K_VERSION_VAL,        szBuffer);
-            sprintf(szBuffer, "%s %s", pThis->Status.szBuildTime, pThis->Status.szBuildDate);
-            WinSetDlgItemText(hwnd, TX_W32K_BUILD_DATETIME_VAL, szBuffer);
-            WinSetDlgItemText(hwnd, TX_W32K_SYMBOLFILE_VAL,     pThis->Status.szSymFile);
-            sprintf(szBuffer, "%d - ", pThis->Status.ulBuild);
-            if (GetFixpackDesc(pThis->Status.ulBuild, pThis->Status.fKernel, szBuffer + strlen(szBuffer)))
-                sprintf(szBuffer, "%d", pThis->Status.ulBuild);
-            WinSetDlgItemText(hwnd, TX_W32K_KERNELBUILD_VAL,    szBuffer);
-
-            /* logging */
-            WinSendDlgItemMsg(hwnd, CB_LOGGING_ENABLED,     BM_SETCHECK,    (MPARAM)(pThis->Options.fLogging),                  NULL);
-            WinSendDlgItemMsg(hwnd, RB_LOGGING_COM1,        BM_SETCHECK,    (MPARAM)(pThis->Options.usCom == 0x3f8),            NULL);
-            WinSendDlgItemMsg(hwnd, RB_LOGGING_COM2,        BM_SETCHECK,    (MPARAM)(pThis->Options.usCom == 0x2f8),            NULL);
-            WinSendDlgItemMsg(hwnd, RB_LOGGING_COM3,        BM_SETCHECK,    (MPARAM)(pThis->Options.usCom == 0x3e8),            NULL);
-            WinSendDlgItemMsg(hwnd, RB_LOGGING_COM4,        BM_SETCHECK,    (MPARAM)(pThis->Options.usCom == 0x2e8),            NULL);
-
-            /* loaders */
+            for (i = 0; i < W32KCCPG_PAGES; i++)
+            {
+                if (pThis->aPages[i].hwnd != NULLHANDLE)
+                    WinSendMsg(pThis->aPages[i].hwnd, msg, mp1, mp2);
+            }
+
+            /* Since all fields are update now - we can't be dirty any longer. */
+            pThis->fDirty = FALSE;
+            return NULL;
+        }
+
+
+        /*
+         * Validate data in the controls. Complains accoring to mp1.
+         * Put the data into the win32k option struct.
+         *
+         * mr:  Valid indicator.
+         *      TRUE:   Valid data.
+         *      FALSE:  Not valid data.
+         * mp1: BOOL fComplain.
+         *      TRUE:   Do complain about errors. The pThis->Options struct
+         *              is updated on successful return.
+         *      FALSE:  Do not complain about errors, and don't update the
+         *              pThis->Options struct.
+         * mp2: reserved.
+         */
+        case WM_QUERYCONTROLS:
+        {
+            /*
+             * Init temporary option struct.
+             */
+            memset(&pThis->NewOptions, 0, sizeof(K32OPTIONS));
+            pThis->NewOptions.cb = sizeof(K32OPTIONS);
+
+            /*
+             * Query the individual pages.
+             */
+            for (i = 0; i < W32KCCPG_PAGES; i++)
+            {
+                if (pThis->aPages[i].hwnd != NULLHANDLE)
+                if (!WinSendMsg(pThis->aPages[i].hwnd, msg, mp1, mp2))
+                {
+                    WinSendMsg(pThis->hwndNtbk, BKM_TURNTOPAGE, (MPARAM)pThis->aPages[i].ulId, NULL);
+                    return (MPARAM)FALSE;
+                }
+            }
+
+            /*
+             * Check if there is any change and set the fDirty flag accordingly.
+             */
+            pThis->fDirty = memcmp(&pThis->NewOptions, &pThis->Options, sizeof(K32OPTIONS)) != 0;
+            return (MPARAM)TRUE;
+        }
+    }
+
+    /*
+     * Return thru the default dialog procedure.
+     */
+    return WinDefDlgProc(hwnd, msg, mp1, mp2);
+}
+
+
+/**
+ * Dialog procedure for the DL_ dialog.
+ * (See PMREF for the general specifications of this function.)
+ */
+MRESULT EXPENTRY    LoadersDlgProc  (HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2)
+{
+    PWIN32KCC   pThis;
+
+
+    /*
+     * Get instance data pointer (pThis).
+     */
+    if (msg != WM_INITDLG)
+    {
+        pThis = (PWIN32KCC)WinQueryWindowPtr(hwnd, QWL_USER);
+        if (pThis == NULL)
+            return WinDefDlgProc(hwnd, msg, mp1, mp2);
+    }
+
+
+    /*
+     * Message switch.
+     */
+    switch (msg)
+    {
+        /*
+         * Sets the controls according to the data from win32k.
+         *
+         * mr:  Focus changed or not.
+         * mp1: hwnd of dialog
+         * mp2: (user data) (NULL)
+         */
+        case WM_INITDLG:
+        {
+            pThis = (PWIN32KCC)mp2;
+            if (!WinSetWindowPtr(hwnd, QWL_USER, pThis))
+            {
+                /* complain, dismiss and return. */
+                Complain(hwnd, IDS_ERR_SET_INSTANCEDATA,
+                         WinGetLastError(pThis->hab),
+                         getLastErrorMsg(pThis->hab));
+                WinPostMsg(hwnd, WM_QUIT, NULL, NULL);
+                return FALSE;
+            }
+
+            /*
+             * Initiate controls (ie. behaviour not data).
+             *  - Ranges of the info level spinbuttons.
+             */
+            WinSendDlgItemMsg(hwnd, SB_LDR_PE_INFOLEVEL, SPBM_SETLIMITS, (MPARAM)4, (MPARAM)0);
+            WinSendDlgItemMsg(hwnd, SB_LDR_ELF_INFOLEVEL, SPBM_SETLIMITS, (MPARAM)4, (MPARAM)0);
+            break;
+        }
+
+
+        /*
+         * Gets data from win32k.
+         * Sets the controls according to the data from win32k.
+         *
+         * mr:  reserved
+         * mp1: reserved
+         * mp2: reserved
+         */
+        case WM_SETCONTROLS:
+        {
+            CHAR    szNumber[32];
+
             WinSendDlgItemMsg(hwnd, CB_LDR_DISABLE_ALL,     BM_SETCHECK,    (MPARAM)(pThis->Options.fNoLoader),                  NULL);
             /* PE */
@@ -559 +867 @@
             /* REXX Scripts */
             WinSendDlgItemMsg(hwnd, CB_LDR_REXX,            BM_SETCHECK,    (MPARAM)(pThis->Options.fREXXScript),               NULL);
-
-            /* OS/2 Loader Fixes */
-            WinSendDlgItemMsg(hwnd, CB_LDRFIX_DLLFIXES,     BM_SETCHECK,    (MPARAM)(pThis->Options.fDllFixes),                 NULL);
-            WinSendDlgItemMsg(hwnd, CB_LDRFIX_FORCEPRELOAD, BM_SETCHECK,    (MPARAM)(pThis->Options.fForcePreload),             NULL);
-
-            /* heaps */
+            return NULL;
+        }
+
+
+        /*
+         * Validate data in the controls. Complains accoring to mp1.
+         * Put the data into the win32k option struct.
+         *
+         * mr:  Valid indicator.
+         *      TRUE:   Valid data.
+         *      FALSE:  Not valid data.
+         * mp1: BOOL fComplain.
+         *      TRUE:   Do complain about errors. The pThis->Options struct
+         *              is updated on successful return.
+         *      FALSE:  Do not complain about errors, and don't update the
+         *              pThis->Options struct.
+         * mp2: reserved.
+         */
+        case WM_QUERYCONTROLS:
+        {
+            BOOL    fComplain = (BOOL)mp1;
+            ULONG   ul;
+
+            pThis->NewOptions.fNoLoader = WinSendDlgItemMsg(hwnd, CB_LDR_DISABLE_ALL, BM_QUERYCHECK, NULL, NULL) != 0;
+            /* PE */
+            if (WinSendDlgItemMsg(hwnd, RB_LDR_PE_PURE, BM_QUERYCHECK, NULL, NULL))
+                pThis->NewOptions.fPE = FLAGS_PE_PE2LX;
+            else if (WinSendDlgItemMsg(hwnd, RB_LDR_PE_MIXED, BM_QUERYCHECK, NULL, NULL))
+                pThis->NewOptions.fPE = FLAGS_PE_MIXED;
+            else if (WinSendDlgItemMsg(hwnd, RB_LDR_PE_PE, BM_QUERYCHECK, NULL, NULL))
+                pThis->NewOptions.fPE = FLAGS_PE_PE;
+            else if (WinSendDlgItemMsg(hwnd, RB_LDR_PE_NOT, BM_QUERYCHECK, NULL, NULL))
+                pThis->NewOptions.fPE = FLAGS_PE_NOT;
+            else
+            {
+                if (fComplain)
+                    Complain(hwnd, IDS_ERR_NO_PE_RADIOBUTTON);
+                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)))
+            {
+                if (fComplain)
+                {
+                    Complain(hwnd, IDS_ERR_INVALID_INFOLEVEL);
+                    WinSetFocus(HWND_DESKTOP, WinWindowFromID(hwnd, SB_LDR_PE_INFOLEVEL));
+                }
+                return (MPARAM)FALSE;
+            }
+            pThis->NewOptions.ulInfoLevel = ul; /* FIXME to be changed */
+
+            /* Elf */
+            pThis->NewOptions.fElf = WinSendDlgItemMsg(hwnd, CB_LDR_ELF_ENABLED, BM_QUERYCHECK, NULL, NULL) != 0;
+            if (!WinSendDlgItemMsg(hwnd, SB_LDR_ELF_INFOLEVEL, SPBM_QUERYVALUE, (MPARAM)&ul, MPFROM2SHORT(0, SPBQ_UPDATEIFVALID)))
+            {
+                if (fComplain)
+                {
+                    Complain(hwnd, IDS_ERR_INVALID_INFOLEVEL);
+                    WinSetFocus(HWND_DESKTOP, WinWindowFromID(hwnd, SB_LDR_ELF_INFOLEVEL));
+                }
+                return (MPARAM)FALSE;
+            }
+            //pThis->NewOptions.ulInfoLevel = ul; /* FIXME to be changed */
+            /* UNIX Shell Scripts */
+            pThis->NewOptions.fUNIXScript = WinSendDlgItemMsg(hwnd, CB_LDR_SHELL_SCRIPTS, BM_QUERYCHECK, NULL, NULL) != 0;
+            /* JAVA */
+            pThis->NewOptions.fJava = WinSendDlgItemMsg(hwnd, CB_LDR_JAVA, BM_QUERYCHECK, NULL, NULL) != 0;
+            /* REXX Scripts */
+            pThis->NewOptions.fREXXScript = WinSendDlgItemMsg(hwnd, CB_LDR_REXX, BM_QUERYCHECK, NULL, NULL) != 0;
+            return (MRESULT)TRUE;
+        }
+    }
+
+    return NtbkDefPageDlgProc(hwnd, msg, mp1, mp2);
+}
+
+
+/**
+ * Dialog procedure for the DL_ dialog.
+ * (See PMREF for the general specifications of this function.)
+ */
+MRESULT EXPENTRY    LoggingDlgProc  (HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2)
+{
+    PWIN32KCC   pThis;
+
+
+    /*
+     * Get instance data pointer (pThis).
+     */
+    if (msg != WM_INITDLG)
+    {
+        pThis = (PWIN32KCC)WinQueryWindowPtr(hwnd, QWL_USER);
+        if (pThis == NULL)
+            return WinDefDlgProc(hwnd, msg, mp1, mp2);
+    }
+
+
+    /*
+     * Message switch.
+     */
+    switch (msg)
+    {
+        /*
+         * Gets data from win32k.
+         * Sets the controls according to the data from win32k.
+         *
+         * mr:  reserved
+         * mp1: reserved
+         * mp2: reserved
+         */
+        case WM_SETCONTROLS:
+        {
+            WinSendDlgItemMsg(hwnd, CB_LOGGING_ENABLED,     BM_SETCHECK,    (MPARAM)(pThis->Options.fLogging),                  NULL);
+            WinSendDlgItemMsg(hwnd, RB_LOGGING_COM1,        BM_SETCHECK,    (MPARAM)(pThis->Options.usCom == 0x3f8),            NULL);
+            WinSendDlgItemMsg(hwnd, RB_LOGGING_COM2,        BM_SETCHECK,    (MPARAM)(pThis->Options.usCom == 0x2f8),            NULL);
+            WinSendDlgItemMsg(hwnd, RB_LOGGING_COM3,        BM_SETCHECK,    (MPARAM)(pThis->Options.usCom == 0x3e8),            NULL);
+            WinSendDlgItemMsg(hwnd, RB_LOGGING_COM4,        BM_SETCHECK,    (MPARAM)(pThis->Options.usCom == 0x2e8),            NULL);
+            return NULL;
+        }
+
+
+        /*
+         * Validate data in the controls. Complains accoring to mp1.
+         * Put the data into the win32k option struct.
+         *
+         * mr:  Valid indicator.
+         *      TRUE:   Valid data.
+         *      FALSE:  Not valid data.
+         * mp1: BOOL fComplain.
+         *      TRUE:   Do complain about errors. The pThis->Options struct
+         *              is updated on successful return.
+         *      FALSE:  Do not complain about errors, and don't update the
+         *              pThis->Options struct.
+         * mp2: reserved.
+         */
+        case WM_QUERYCONTROLS:
+        {
+            BOOL    fComplain = (BOOL)mp1;
+
+            pThis->NewOptions.fLogging = WinSendDlgItemMsg(hwnd, CB_LOGGING_ENABLED, BM_QUERYCHECK, NULL, NULL) != 0;
+            if (WinSendDlgItemMsg(hwnd, RB_LOGGING_COM1, BM_QUERYCHECK, NULL, NULL))
+                pThis->NewOptions.usCom = 0x3f8;
+            else if (WinSendDlgItemMsg(hwnd, RB_LOGGING_COM2, BM_QUERYCHECK, NULL, NULL))
+                pThis->NewOptions.usCom = 0x2f8;
+            else if (WinSendDlgItemMsg(hwnd, RB_LOGGING_COM3, BM_QUERYCHECK, NULL, NULL))
+                pThis->NewOptions.usCom = 0x3e8;
+            else if (WinSendDlgItemMsg(hwnd, RB_LOGGING_COM4, BM_QUERYCHECK, NULL, NULL))
+                pThis->NewOptions.usCom = 0x2e8;
+            else
+            {
+                if (fComplain)
+                    Complain(hwnd, IDS_ERR_NO_COM_RADIOBUTTON);
+                return (MPARAM)FALSE;
+            }
+            return (MRESULT)TRUE;
+        }
+    }
+
+    return NtbkDefPageDlgProc(hwnd, msg, mp1, mp2);
+}
+
+
+/**
+ * Dialog procedure for the DL_ dialog.
+ * (See PMREF for the general specifications of this function.)
+ */
+MRESULT EXPENTRY    StatusDlgProc   (HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2)
+{
+    PWIN32KCC   pThis;
+
+    /*
+     * Get instance data pointer (pThis).
+     */
+    if (msg != WM_INITDLG)
+    {
+        pThis = (PWIN32KCC)WinQueryWindowPtr(hwnd, QWL_USER);
+        if (pThis == NULL)
+            return WinDefDlgProc(hwnd, msg, mp1, mp2);
+    }
+
+
+    /*
+     * Message switch.
+     */
+    switch (msg)
+    {
+        /*
+         * Gets data from win32k.
+         * Sets the controls according to the data from win32k.
+         *
+         * mr:  reserved
+         * mp1: reserved
+         * mp2: reserved
+         */
+        case WM_SETCONTROLS:
+        {
+            CHAR    szBuffer[100];
+
+            /*
+             * Set the controls
+             */
+            sprintf(szBuffer, "%d.%d", 0, pThis->Status.ulVersion);
+            WinSetDlgItemText(hwnd, TX_W32K_VERSION_VAL,        szBuffer);
+            sprintf(szBuffer, "%s %s", pThis->Status.szBuildTime, pThis->Status.szBuildDate);
+            WinSetDlgItemText(hwnd, TX_W32K_BUILD_DATETIME_VAL, szBuffer);
+            WinSetDlgItemText(hwnd, TX_W32K_SYMBOLFILE_VAL,     pThis->Status.szSymFile);
+            sprintf(szBuffer, "%d - ", pThis->Status.ulBuild);
+            if (GetFixpackDesc(pThis->Status.ulBuild, pThis->Status.fKernel, szBuffer + strlen(szBuffer)))
+                sprintf(szBuffer, "%d", pThis->Status.ulBuild);
+            WinSetDlgItemText(hwnd, TX_W32K_KERNELBUILD_VAL,    szBuffer);
+            return NULL;
+        }
+    }
+
+    return NtbkDefPageDlgProc(hwnd, msg, mp1, mp2);
+}
+
+/**
+ * Dialog procedure for the DL_ dialog.
+ * (See PMREF for the general specifications of this function.)
+ */
+MRESULT EXPENTRY    HeapsDlgProc    (HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2)
+{
+    PWIN32KCC   pThis;
+
+
+    /*
+     * Get instance data pointer (pThis).
+     */
+    if (msg != WM_INITDLG)
+    {
+        pThis = (PWIN32KCC)WinQueryWindowPtr(hwnd, QWL_USER);
+        if (pThis == NULL)
+            return WinDefDlgProc(hwnd, msg, mp1, mp2);
+    }
+
+
+    /*
+     * Message switch.
+     */
+    switch (msg)
+    {
+        /*
+         * Sets the controls according to the data from win32k.
+         *
+         * mr:  Focus changed or not.
+         * mp1: hwnd of dialog
+         * mp2: (user data) (NULL)
+         */
+        case WM_INITDLG:
+        {
+            pThis = (PWIN32KCC)mp2;
+            if (!WinSetWindowPtr(hwnd, QWL_USER, pThis))
+            {
+                /* complain, dismiss and return. */
+                Complain(hwnd, IDS_ERR_SET_INSTANCEDATA,
+                         WinGetLastError(pThis->hab),
+                         getLastErrorMsg(pThis->hab));
+                WinPostMsg(hwnd, WM_QUIT, NULL, NULL);
+                return FALSE;
+            }
+
+            /*
+             * Initiate controls (ie. behaviour not data).
+             *  - Max length of the max heap size entry fields.
+             */
+            WinSendDlgItemMsg(hwnd, SB_HEAP_RES_MAX, SPBM_SETLIMITS, (MPARAM)32678, (MPARAM)128);
+            WinSendDlgItemMsg(hwnd, SB_HEAP_SWP_MAX, SPBM_SETLIMITS, (MPARAM)32678, (MPARAM)128);
+            break;
+        }
+
+
+        /*
+         * Gets data from win32k.
+         * Sets the controls according to the data from win32k.
+         *
+         * mr:  reserved
+         * mp1: reserved
+         * mp2: reserved
+         */
+        case WM_SETCONTROLS:
+        {
+            CHAR    szNumber[32];
+
             /* Resident */
             WinSendDlgItemMsg(hwnd, SB_HEAP_RES_MAX,        SPBM_SETCURRENTVALUE, (MPARAM)(pThis->Options.cbResHeapMax / 1024), NULL);
@@ -593 +1185 @@
             sprintf(szNumber, "%d", pThis->Status.cSwpBlocksFree);
             WinSetDlgItemText(hwnd, TX_HEAP_SWP_FREE_BLOCKS_VAL,   szNumber);
-
-            pThis->fDirty = FALSE;
             return NULL;
         }
@@ -615 +1205 @@
         case WM_QUERYCONTROLS:
         {
-            BOOL        fComplain = (BOOL)mp1;
-            ULONG       ul;
-
-            /*
-             * Init temporary option struct.
-             */
-            memset(&pThis->NewOptions, 0, sizeof(K32OPTIONS));
-            pThis->NewOptions.cb = sizeof(K32OPTIONS);
-
-            /*
-             * Logging.
-             */
-            pThis->NewOptions.fLogging = WinSendDlgItemMsg(hwnd, CB_LOGGING_ENABLED, BM_QUERYCHECK, NULL, NULL) != 0;
-            if (WinSendDlgItemMsg(hwnd, RB_LOGGING_COM1, BM_QUERYCHECK, NULL, NULL))
-                pThis->NewOptions.usCom = 0x3f8;
-            else if (WinSendDlgItemMsg(hwnd, RB_LOGGING_COM2, BM_QUERYCHECK, NULL, NULL))
-                pThis->NewOptions.usCom = 0x2f8;
-            else if (WinSendDlgItemMsg(hwnd, RB_LOGGING_COM3, BM_QUERYCHECK, NULL, NULL))
-                pThis->NewOptions.usCom = 0x3e8;
-            else if (WinSendDlgItemMsg(hwnd, RB_LOGGING_COM4, BM_QUERYCHECK, NULL, NULL))
-                pThis->NewOptions.usCom = 0x2e8;
-            else
-            {
-                if (fComplain)
-                    Complain(hwnd, IDS_ERR_NO_COM_RADIOBUTTON);
-                return (MPARAM)FALSE;
-            }
-
-            /*
-             * Loaders
-             */
-            pThis->NewOptions.fNoLoader = WinSendDlgItemMsg(hwnd, CB_LDR_DISABLE_ALL, BM_QUERYCHECK, NULL, NULL) != 0;
-            /* PE */
-            if (WinSendDlgItemMsg(hwnd, RB_LDR_PE_PURE, BM_QUERYCHECK, NULL, NULL))
-                pThis->NewOptions.fPE = FLAGS_PE_PE2LX;
-            else if (WinSendDlgItemMsg(hwnd, RB_LDR_PE_MIXED, BM_QUERYCHECK, NULL, NULL))
-                pThis->NewOptions.fPE = FLAGS_PE_MIXED;
-            else if (WinSendDlgItemMsg(hwnd, RB_LDR_PE_PE, BM_QUERYCHECK, NULL, NULL))
-                pThis->NewOptions.fPE = FLAGS_PE_PE;
-            else if (WinSendDlgItemMsg(hwnd, RB_LDR_PE_NOT, BM_QUERYCHECK, NULL, NULL))
-                pThis->NewOptions.fPE = FLAGS_PE_NOT;
-            else
-            {
-                if (fComplain)
-                    Complain(hwnd, IDS_ERR_NO_PE_RADIOBUTTON);
-                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)))
-            {
-                if (fComplain)
-                {
-                    Complain(hwnd, IDS_ERR_INVALID_INFOLEVEL);
-                    WinSetFocus(HWND_DESKTOP, WinWindowFromID(hwnd, SB_LDR_PE_INFOLEVEL));
-                }
-                return (MPARAM)FALSE;
-            }
-            pThis->NewOptions.ulInfoLevel = ul; /* FIXME to be changed */
-
-            /* Elf */
-            pThis->NewOptions.fElf = WinSendDlgItemMsg(hwnd, CB_LDR_ELF_ENABLED, BM_QUERYCHECK, NULL, NULL) != 0;
-            if (!WinSendDlgItemMsg(hwnd, SB_LDR_ELF_INFOLEVEL, SPBM_QUERYVALUE, (MPARAM)&ul, MPFROM2SHORT(0, SPBQ_UPDATEIFVALID)))
-            {
-                if (fComplain)
-                {
-                    Complain(hwnd, IDS_ERR_INVALID_INFOLEVEL);
-                    WinSetFocus(HWND_DESKTOP, WinWindowFromID(hwnd, SB_LDR_ELF_INFOLEVEL));
-                }
-                return (MPARAM)FALSE;
-            }
-            //pThis->NewOptions.ulInfoLevel = ul; /* FIXME to be changed */
-            /* UNIX Shell Scripts */
-            pThis->NewOptions.fUNIXScript = WinSendDlgItemMsg(hwnd, CB_LDR_SHELL_SCRIPTS, BM_QUERYCHECK, NULL, NULL) != 0;
-            /* JAVA */
-            pThis->NewOptions.fJava = WinSendDlgItemMsg(hwnd, CB_LDR_JAVA, BM_QUERYCHECK, NULL, NULL) != 0;
-            /* REXX Scripts */
-            pThis->NewOptions.fREXXScript = WinSendDlgItemMsg(hwnd, CB_LDR_REXX, BM_QUERYCHECK, NULL, NULL) != 0;
-
-            /*
-             * OS/2 Loader Fixes.
-             */
-            pThis->NewOptions.fDllFixes = WinSendDlgItemMsg(hwnd, CB_LDRFIX_DLLFIXES, BM_QUERYCHECK, NULL, NULL) != 0;
-            pThis->NewOptions.fForcePreload = WinSendDlgItemMsg(hwnd, CB_LDRFIX_FORCEPRELOAD, BM_QUERYCHECK, NULL, NULL) != 0;
-
-            /*
-             * Heaps
-             */
+            BOOL    fComplain = (BOOL)mp1;
+            ULONG   ul;
+
             /* Resident */
             if (!WinSendDlgItemMsg(hwnd, SB_HEAP_RES_MAX, SPBM_QUERYVALUE, (MPARAM)&ul, MPFROM2SHORT(0, SPBQ_UPDATEIFVALID)))
@@ -730 +1230 @@
             }
             pThis->NewOptions.cbSwpHeapMax = ul*1024;
-
-            /*
-             * Check if there is any change and set the fDirty flag accordingly.
-             */
-            pThis->fDirty = memcmp(&pThis->NewOptions, &pThis->Options, sizeof(K32OPTIONS)) != 0;
-            return (MPARAM)TRUE;
-        }
-
-
-    }
-
-    /*
-     * Return thru the default dialog procedure.
-     */
-    return WinDefDlgProc(hwnd, msg, mp1, mp2);
+            return (MRESULT)TRUE;
+        }
+    }
+
+    return NtbkDefPageDlgProc(hwnd, msg, mp1, mp2);
 }
 
 
-#else
 /**
- * Dialog procedure for the DL_WIN32KCC dialog.
+ * Dialog procedure for the DL_ dialog.
  * (See PMREF for the general specifications of this function.)
  */
-MRESULT EXPENTRY Win32kCCDlgProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2)
+MRESULT EXPENTRY    LdrFixDlgProc   (HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2)
 {
     PWIN32KCC   pThis;
@@ -775 +1264 @@
     {
         /*
-         * Sets the controls according to the data from win32k.
-         *
-         * mr:  Focus changed or not.
-         * mp1: hwnd of dialog
-         * mp2: (user data) (NULL)
-         */
-        case WM_INITDLG:
-        {
-
-            /*
-             * Initiate controls (ie. behaviour not data).
-             *  - Ranges of the info level spinbuttons.
-             *  - Max length of the max heap size entry fields.
-             */
-            WinSendDlgItemMsg(hwnd, SB_LDR_PE_INFOLEVEL, SPBM_SETLIMITS, (MPARAM)4, (MPARAM)0);
-            WinSendDlgItemMsg(hwnd, SB_LDR_ELF_INFOLEVEL, SPBM_SETLIMITS, (MPARAM)4, (MPARAM)0);
-
-            WinSendDlgItemMsg(hwnd, SB_HEAP_RES_MAX, SPBM_SETLIMITS, (MPARAM)32678, (MPARAM)128);
-            WinSendDlgItemMsg(hwnd, SB_HEAP_SWP_MAX, SPBM_SETLIMITS, (MPARAM)32678, (MPARAM)128);
-
-
-            /*
-             * Init and set instance data.
-             */
-            pThis = malloc(sizeof(*pThis));
-            if (pThis == NULL)
-            {
-                /* complain, dismiss and return. */
-                Complain(hwnd, IDS_ERR_MALLOC_FAILED, __FILE__, __LINE__, __FUNCTION__);
-                WinPostMsg(hwnd, WM_QUIT, NULL, NULL);
-                return FALSE;
-            }
-            pThis->hwnd = hwnd;
-            pThis->hab = WinQueryAnchorBlock(hwnd);
-            if (!WinSetWindowPtr(hwnd, QWL_USER, pThis))
-            {
-                /* complain, dismiss and return. */
-                Complain(hwnd, IDS_ERR_SET_INSTACEDATA,
-                         WinGetLastError(pThis->hab),
-                         getLastErrorMsg(pThis->hab));
-                WinDismissDlg(hwnd, 0);
-                WinPostMsg(hwnd, WM_QUIT, NULL, NULL);
-                free(pThis);
-                return FALSE;
-            }
-
-            /*
-             * Send a set controls message which gets data from
-             * win32k and puts it into the controls.
-             */
-            WinSendMsg(hwnd, WM_SETCONTROLS, NULL, NULL);
-            break;
-        }
-
-
-        /*
-         * The user wants me to do something...
-         */
-        case WM_COMMAND:
-            switch (SHORT1FROMMP(mp1))
-            {
-                /*
-                 * The user pushed the "Apply" button.
-                 */
-                case PB_APPLY:
-                {
-                    /* Check and get data from the dialog. */
-                    if (WinSendMsg(hwnd, WM_QUERYCONTROLS, (MPARAM)TRUE, NULL)
-                        && pThis->fDirty
-                        )
-                    {
-                        APIRET rc;
-                        rc = libWin32kSetOptions(&pThis->NewOptions);
-                        if (rc != NO_ERROR)
-                            Complain(hwnd, IDS_ERR_SETPOPTIONS, rc);
-                        WinSendMsg(hwnd, WM_SETCONTROLS, NULL, NULL);
-                    }
-                }
-                break;
-
-
-                /*
-                 * User pushed the "Refresh" button.
-                 */
-                case PB_REFRESH:
-                    WinSendMsg(hwnd, WM_SETCONTROLS, NULL, NULL);
-                break;
-
-
-                /*
-                 * The user pushed the "Close" button.
-                 */
-                case DID_OK:
-                    /* Check if data is dirty */
-                    if (!WinSendMsg(hwnd, WM_QUERYCONTROLS, (MPARAM)FALSE, NULL) || pThis->fDirty)
-                    {
-                        if (ShowMessage(hwnd, IDM_INFO_DIRTY, MB_YESNO | MB_WARNING) != MBID_YES)
-                        {
-                            fNotExit = TRUE;
-                            return NULL;
-                        }
-                    }
-                    /* Close the dialog */
-                    fNotExit = FALSE;
-                    WinDismissDlg(hwnd, 0);
-                    WinPostMsg(hwnd, WM_QUIT, NULL, NULL);
-                    break;
-
-                /*
-                 * The use requested update of config.sys.
-                 */
-                case PB_UPD_CONFIGSYS:
-                {
-                    ULONG   ulBootDrv;
-                    FILE *  phConfigSys;
-                    char *  pszConfigSys = "A:\\Config.sys";
-                    char    szArgs[120];
-                    int     cchArgs;
-
-                    if (!WinSendMsg(hwnd, WM_QUERYCONTROLS, (MPARAM)TRUE, NULL))
-                        break;
-                    if (DosQuerySysInfo(QSV_BOOT_DRIVE, QSV_BOOT_DRIVE, &ulBootDrv, sizeof(ulBootDrv)))
-                        break;
-
-                    /*
-                     * Make argument list.
-                     */
-                    szArgs[0] = '\0';
-                    if (pThis->NewOptions.fLogging)             strcat(szArgs, " -L:Y");
-                    if (pThis->NewOptions.usCom == 0x3f8)       strcat(szArgs, " -C1");
-                    /*if (pThis->NewOptions.usCom != 0x2f8)       strcat(szArgs, " -C2"); - default */
-                    if (pThis->NewOptions.usCom == 0x3e8)       strcat(szArgs, " -C3");
-                    if (pThis->NewOptions.usCom == 0x2e8)       strcat(szArgs, " -C4");
-                    if (pThis->NewOptions.fPE == FLAGS_PE_PE2LX)strcat(szArgs, " -P:pe2lx");
-                    /*if (pThis->NewOptions.fPE == FLAGS_PE_MIXED)strcat(szArgs, " -P:mixed"); - old default */
-                    if (pThis->NewOptions.fPE == FLAGS_PE_MIXED)strcat(szArgs, " -P:mixed");
-                    /* if (pThis->NewOptions.fPE == FLAGS_PE_PE)   strcat(szArgs, " -P:pe"); - default */
-                    if (pThis->NewOptions.fPE == FLAGS_PE_NOT)  strcat(szArgs, " -P:not");
-                    if (pThis->NewOptions.ulInfoLevel != 0) /* -W0 is default */
-                        sprintf(szArgs + strlen(szArgs), " -W%d", pThis->NewOptions.ulInfoLevel); /* FIXME - to be changed */
-                    if (pThis->NewOptions.fElf)                 strcat(szArgs, " -E:Y"); /* default is disabled */
-                    if (!pThis->NewOptions.fUNIXScript)         strcat(szArgs, " -Script:N");
-                    if (!pThis->NewOptions.fREXXScript)         strcat(szArgs, " -Rexx:N");
-                    if (!pThis->NewOptions.fJava)               strcat(szArgs, " -Java:N");
-                    if (pThis->NewOptions.fNoLoader)            strcat(szArgs, " -Noloader");
-                    if (!pThis->NewOptions.fDllFixes)           strcat(szArgs, " -DllFixes:D"); /* default is enabled */
-                    if (!pThis->NewOptions.fForcePreload)       strcat(szArgs, " -ForcePreload:Y"); /* default is disabled */
-                    if (pThis->NewOptions.cbSwpHeapMax != CB_SWP_MAX)
-                        sprintf(szArgs + strlen(szArgs), " -HeapMax:%d", pThis->NewOptions.cbSwpHeapMax); /* FIXME - to be changed */
-                    if (pThis->NewOptions.cbResHeapMax != CB_RES_MAX)
-                        sprintf(szArgs + strlen(szArgs), " -ResHeapMax:%d", pThis->NewOptions.cbResHeapMax); /* FIXME - to be changed */
-                    strcat(szArgs, "\n");
-                    cchArgs = strlen(szArgs);
-
-                    /*
-                     * Update Config.sys.
-                     */
-                    *pszConfigSys = (char)(ulBootDrv - 1 + 'A');
-                    phConfigSys = fopen(pszConfigSys, "r+");
-                    if (phConfigSys)
-                    {
-                        ULONG   cbConfigSys;
-                        if (    fseek(phConfigSys, 0, SEEK_END) == 0
-                            &&  (cbConfigSys = ftell(phConfigSys)) > 0
-                            &&  fseek(phConfigSys, 0, SEEK_SET) == 0
-                            )
-                        {
-                            char *  pszConfigSys;
-
-                            pszConfigSys = (char*)calloc(1, 2 * (cbConfigSys + 256)); /* Paranoia... */
-                            if (pszConfigSys)
-                            {
-                                char *pszCurrent = pszConfigSys;
-
-                                /* Read and modify config.sys */
-                                while (fgets(pszCurrent, cbConfigSys + pszCurrent - pszConfigSys, phConfigSys))
-                                {
-                                    char *pszWin32k;
-                                    /* NB! This statment will not only update the "device=" statements!
-                                     * We'll call this a feature...
-                                     */
-                                    pszWin32k = stristr(pszCurrent, "win32k.sys");
-                                    if (pszWin32k)
-                                    {
-                                        int cch;
-                                        pszWin32k += 10;  /* skip "win32k.sys" */
-                                        cch = strlen(pszWin32k);
-                                        strcpy(pszWin32k, szArgs);
-                                        if (cchArgs < cch)
-                                        { /* fix which stops us from shrinking the file.. */
-                                            memset(pszWin32k + cchArgs - 1, ' ', cch - cchArgs);
-                                            pszWin32k[cch - 1] = '\n';
-                                            pszWin32k[cch]     = '\0';
-                                        }
-                                    }
-
-                                    /* next */
-                                    pszCurrent += strlen(pszCurrent);
-                                }
-                                if (pszCurrent[-1] != '\n')
-                                    *pszCurrent++ = '\n';
-
-                                /* Write it back
-                                 * One big question, how do we shrink a file?
-                                 */
-                                if (    fseek(phConfigSys, 0, SEEK_SET) == 0
-                                    &&  fwrite(pszConfigSys, 1, pszCurrent - pszConfigSys, phConfigSys))
-                                {
-                                    ShowMessage(hwnd, IDM_CONFIGSYS_UPDATED, MB_OK);
-                                }
-                                else
-                                    Complain(hwnd, IDS_FWRITE_FAILED, pszConfigSys);
-                                free(pszConfigSys);
-                            }
-                            else
-                                Complain(hwnd, IDS_MALLOC_FAILED, cbConfigSys + 256);
-                        }
-                        else
-                            Complain(hwnd, IDS_FSIZE_FAILED, pszConfigSys);
-                        fclose(phConfigSys);
-                    }
-                    else
-                        Complain(hwnd, IDS_ERR_FOPEN_FAILED, pszConfigSys);
-                    break;
-                }
-            }
-            return NULL;
-
-
-        /*
-         * Close window. Typically sent when Alt-F4 pressed or system-menu-Close is selected.
-         */
-        case WM_CLOSE:
-            fNotExit = TRUE;
-            WinSendMsg(hwnd, WM_COMMAND,
-                       MPFROMSHORT(DID_OK), MPFROM2SHORT(CMDSRC_MENU, FALSE));
-            break;
-
-
-        /*
-         * Window is destroyed (last message which ever should reach us!)
-         *  -Free instance data
-         *  -Set the instance data pointer to NULL (just in case).
-         */
-        case WM_DESTROY:
-        {
-            free(pThis);
-            WinSetWindowPtr(hwnd, QWL_USER, NULL);
-            break;
-        }
-
-
-        /*
          * Gets data from win32k.
          * Sets the controls according to the data from win32k.
@@ -1037 +1273 @@
         case WM_SETCONTROLS:
         {
-            APIRET  rc;
-            CHAR    szNumber[32];
-            CHAR    szBuffer[100];
-
-
-            /*
-             * Call Win32k.sys to get options and statuses.
-             */
-            memset(&pThis->Options, 0, sizeof(K32OPTIONS));
-            pThis->Options.cb = sizeof(K32OPTIONS);
-            memset(&pThis->Status, 0, sizeof(K32STATUS));
-            pThis->Status.cb = sizeof(K32STATUS);
-            rc = libWin32kQueryOptionsStatus(&pThis->Options, &pThis->Status);
-            if (rc != NO_ERROR)
-            {
-                Complain(hwnd, IDS_ERR_QUERYOPTIONSTATUS, rc);
-                fNotExit = FALSE;
-                WinDismissDlg(hwnd, 0);
-                WinPostMsg(hwnd, WM_QUIT, NULL, NULL);
-                return NULL;
-            }
-
-            /*
-             * Set the controls.
-             */
-            /* win32k */
-            sprintf(szBuffer, "%d.%d", 0, pThis->Status.ulVersion);
-            WinSetDlgItemText(hwnd, TX_W32K_VERSION_VAL,        szBuffer);
-            sprintf(szBuffer, "%s %s", pThis->Status.szBuildTime, pThis->Status.szBuildDate);
-            WinSetDlgItemText(hwnd, TX_W32K_BUILD_DATETIME_VAL, szBuffer);
-            WinSetDlgItemText(hwnd, TX_W32K_SYMBOLFILE_VAL,     pThis->Status.szSymFile);
-            sprintf(szBuffer, "%d - ", pThis->Status.ulBuild);
-            if (GetFixpackDesc(pThis->Status.ulBuild, pThis->Status.fKernel, szBuffer + strlen(szBuffer)))
-                sprintf(szBuffer, "%d", pThis->Status.ulBuild);
-            WinSetDlgItemText(hwnd, TX_W32K_KERNELBUILD_VAL,    szBuffer);
-
-            /* logging */
-            WinSendDlgItemMsg(hwnd, CB_LOGGING_ENABLED,     BM_SETCHECK,    (MPARAM)(pThis->Options.fLogging),                  NULL);
-            WinSendDlgItemMsg(hwnd, RB_LOGGING_COM1,        BM_SETCHECK,    (MPARAM)(pThis->Options.usCom == 0x3f8),            NULL);
-            WinSendDlgItemMsg(hwnd, RB_LOGGING_COM2,        BM_SETCHECK,    (MPARAM)(pThis->Options.usCom == 0x2f8),            NULL);
-            WinSendDlgItemMsg(hwnd, RB_LOGGING_COM3,        BM_SETCHECK,    (MPARAM)(pThis->Options.usCom == 0x3e8),            NULL);
-            WinSendDlgItemMsg(hwnd, RB_LOGGING_COM4,        BM_SETCHECK,    (MPARAM)(pThis->Options.usCom == 0x2e8),            NULL);
-
-            /* loaders */
-            WinSendDlgItemMsg(hwnd, CB_LDR_DISABLE_ALL,     BM_SETCHECK,    (MPARAM)(pThis->Options.fNoLoader),                  NULL);
-            /* PE */
-            WinSendDlgItemMsg(hwnd, RB_LDR_PE_PURE,         BM_SETCHECK,    (MPARAM)(pThis->Options.fPE == FLAGS_PE_PE2LX),     NULL);
-            WinSendDlgItemMsg(hwnd, RB_LDR_PE_MIXED,        BM_SETCHECK,    (MPARAM)(pThis->Options.fPE == FLAGS_PE_MIXED),     NULL);
-            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);
-            WinSetDlgItemText(hwnd, TX_LDR_PE_MODULES_VAL, szNumber);
-            /* Elf */
-            WinSendDlgItemMsg(hwnd, CB_LDR_ELF_ENABLED,     BM_SETCHECK,    (MPARAM)(pThis->Options.fElf),                      NULL);
-            WinSendDlgItemMsg(hwnd, SB_LDR_ELF_INFOLEVEL,   SPBM_SETCURRENTVALUE, (MPARAM)(pThis->Options.ulInfoLevel),         NULL); /* FIXME to be changed */
-            sprintf(szNumber, "%d", pThis->Status.cElf2LxModules);
-            WinSetDlgItemText(hwnd, TX_LDR_ELF_MODULES_VAL, szNumber);
-            /* UNIX Shell Scripts */
-            WinSendDlgItemMsg(hwnd, CB_LDR_SHELL_SCRIPTS,   BM_SETCHECK,    (MPARAM)(pThis->Options.fUNIXScript),               NULL);
-            /* JAVA */
-            WinSendDlgItemMsg(hwnd, CB_LDR_JAVA,            BM_SETCHECK,    (MPARAM)(pThis->Options.fJava),                     NULL);
-            /* REXX Scripts */
-            WinSendDlgItemMsg(hwnd, CB_LDR_REXX,            BM_SETCHECK,    (MPARAM)(pThis->Options.fREXXScript),               NULL);
-
-            /* OS/2 Loader Fixes */
             WinSendDlgItemMsg(hwnd, CB_LDRFIX_DLLFIXES,     BM_SETCHECK,    (MPARAM)(pThis->Options.fDllFixes),                 NULL);
             WinSendDlgItemMsg(hwnd, CB_LDRFIX_FORCEPRELOAD, BM_SETCHECK,    (MPARAM)(pThis->Options.fForcePreload),             NULL);
-
-            /* heaps */
-            /* Resident */
-            WinSendDlgItemMsg(hwnd, SB_HEAP_RES_MAX,        SPBM_SETCURRENTVALUE, (MPARAM)(pThis->Options.cbResHeapMax / 1024), NULL);
-            sprintf(szNumber, "%d", pThis->Status.cbResHeapInit / 1024);
-            WinSetDlgItemText(hwnd, TX_HEAP_RES_INIT_VAL,   szNumber);
-            sprintf(szNumber, "%d", pThis->Status.cbResHeapSize / 1024);
-            WinSetDlgItemText(hwnd, TX_HEAP_RES_SIZE_VAL,   szNumber);
-            sprintf(szNumber, "%d", pThis->Status.cbResHeapUsed / 1024);
-            WinSetDlgItemText(hwnd, TX_HEAP_RES_USED_VAL,   szNumber);
-            sprintf(szNumber, "%d", pThis->Status.cbResHeapFree / 1024);
-            WinSetDlgItemText(hwnd, TX_HEAP_RES_FREE_VAL,   szNumber);
-            sprintf(szNumber, "%d", pThis->Status.cResBlocksUsed);
-            WinSetDlgItemText(hwnd, TX_HEAP_RES_USED_BLOCKS_VAL,   szNumber);
-            sprintf(szNumber, "%d", pThis->Status.cResBlocksFree);
-            WinSetDlgItemText(hwnd, TX_HEAP_RES_FREE_BLOCKS_VAL,   szNumber);
-            /* Swappable */
-            WinSendDlgItemMsg(hwnd, SB_HEAP_SWP_MAX,        SPBM_SETCURRENTVALUE, (MPARAM)(pThis->Options.cbSwpHeapMax / 1024), NULL);
-            sprintf(szNumber, "%d", pThis->Status.cbSwpHeapInit / 1024);
-            WinSetDlgItemText(hwnd, TX_HEAP_SWP_INIT_VAL,   szNumber);
-            sprintf(szNumber, "%d", pThis->Status.cbSwpHeapSize / 1024);
-            WinSetDlgItemText(hwnd, TX_HEAP_SWP_SIZE_VAL,   szNumber);
-            sprintf(szNumber, "%d", pThis->Status.cbSwpHeapUsed / 1024);
-            WinSetDlgItemText(hwnd, TX_HEAP_SWP_USED_VAL,   szNumber);
-            sprintf(szNumber, "%d", pThis->Status.cbSwpHeapFree / 1024);
-            WinSetDlgItemText(hwnd, TX_HEAP_SWP_FREE_VAL,   szNumber);
-            sprintf(szNumber, "%d", pThis->Status.cSwpBlocksUsed);
-            WinSetDlgItemText(hwnd, TX_HEAP_SWP_USED_BLOCKS_VAL,   szNumber);
-            sprintf(szNumber, "%d", pThis->Status.cSwpBlocksFree);
-            WinSetDlgItemText(hwnd, TX_HEAP_SWP_FREE_BLOCKS_VAL,   szNumber);
-
-            pThis->fDirty = FALSE;
             return NULL;
         }
@@ -1158 +1295 @@
         case WM_QUERYCONTROLS:
         {
-            BOOL        fComplain = (BOOL)mp1;
-            ULONG       ul;
-
-            /*
-             * Init temporary option struct.
-             */
-            memset(&pThis->NewOptions, 0, sizeof(K32OPTIONS));
-            pThis->NewOptions.cb = sizeof(K32OPTIONS);
-
-            /*
-             * Logging.
-             */
-            pThis->NewOptions.fLogging = WinSendDlgItemMsg(hwnd, CB_LOGGING_ENABLED, BM_QUERYCHECK, NULL, NULL) != 0;
-            if (WinSendDlgItemMsg(hwnd, RB_LOGGING_COM1, BM_QUERYCHECK, NULL, NULL))
-                pThis->NewOptions.usCom = 0x3f8;
-            else if (WinSendDlgItemMsg(hwnd, RB_LOGGING_COM2, BM_QUERYCHECK, NULL, NULL))
-                pThis->NewOptions.usCom = 0x2f8;
-            else if (WinSendDlgItemMsg(hwnd, RB_LOGGING_COM3, BM_QUERYCHECK, NULL, NULL))
-                pThis->NewOptions.usCom = 0x3e8;
-            else if (WinSendDlgItemMsg(hwnd, RB_LOGGING_COM4, BM_QUERYCHECK, NULL, NULL))
-                pThis->NewOptions.usCom = 0x2e8;
-            else
-            {
-                if (fComplain)
-                    Complain(hwnd, IDS_ERR_NO_COM_RADIOBUTTON);
-                return (MPARAM)FALSE;
-            }
-
-            /*
-             * Loaders
-             */
-            pThis->NewOptions.fNoLoader = WinSendDlgItemMsg(hwnd, CB_LDR_DISABLE_ALL, BM_QUERYCHECK, NULL, NULL) != 0;
-            /* PE */
-            if (WinSendDlgItemMsg(hwnd, RB_LDR_PE_PURE, BM_QUERYCHECK, NULL, NULL))
-                pThis->NewOptions.fPE = FLAGS_PE_PE2LX;
-            else if (WinSendDlgItemMsg(hwnd, RB_LDR_PE_MIXED, BM_QUERYCHECK, NULL, NULL))
-                pThis->NewOptions.fPE = FLAGS_PE_MIXED;
-            else if (WinSendDlgItemMsg(hwnd, RB_LDR_PE_PE, BM_QUERYCHECK, NULL, NULL))
-                pThis->NewOptions.fPE = FLAGS_PE_PE;
-            else if (WinSendDlgItemMsg(hwnd, RB_LDR_PE_NOT, BM_QUERYCHECK, NULL, NULL))
-                pThis->NewOptions.fPE = FLAGS_PE_NOT;
-            else
-            {
-                if (fComplain)
-                    Complain(hwnd, IDS_ERR_NO_PE_RADIOBUTTON);
-                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)))
-            {
-                if (fComplain)
-                {
-                    Complain(hwnd, IDS_ERR_INVALID_INFOLEVEL);
-                    WinSetFocus(HWND_DESKTOP, WinWindowFromID(hwnd, SB_LDR_PE_INFOLEVEL));
-                }
-                return (MPARAM)FALSE;
-            }
-            pThis->NewOptions.ulInfoLevel = ul; /* FIXME to be changed */
-
-            /* Elf */
-            pThis->NewOptions.fElf = WinSendDlgItemMsg(hwnd, CB_LDR_ELF_ENABLED, BM_QUERYCHECK, NULL, NULL) != 0;
-            if (!WinSendDlgItemMsg(hwnd, SB_LDR_ELF_INFOLEVEL, SPBM_QUERYVALUE, (MPARAM)&ul, MPFROM2SHORT(0, SPBQ_UPDATEIFVALID)))
-            {
-                if (fComplain)
-                {
-                    Complain(hwnd, IDS_ERR_INVALID_INFOLEVEL);
-                    WinSetFocus(HWND_DESKTOP, WinWindowFromID(hwnd, SB_LDR_ELF_INFOLEVEL));
-                }
-                return (MPARAM)FALSE;
-            }
-            //pThis->NewOptions.ulInfoLevel = ul; /* FIXME to be changed */
-            /* UNIX Shell Scripts */
-            pThis->NewOptions.fUNIXScript = WinSendDlgItemMsg(hwnd, CB_LDR_SHELL_SCRIPTS, BM_QUERYCHECK, NULL, NULL) != 0;
-            /* JAVA */
-            pThis->NewOptions.fJava = WinSendDlgItemMsg(hwnd, CB_LDR_JAVA, BM_QUERYCHECK, NULL, NULL) != 0;
-            /* REXX Scripts */
-            pThis->NewOptions.fREXXScript = WinSendDlgItemMsg(hwnd, CB_LDR_REXX, BM_QUERYCHECK, NULL, NULL) != 0;
-
-            /*
-             * OS/2 Loader Fixes.
-             */
             pThis->NewOptions.fDllFixes = WinSendDlgItemMsg(hwnd, CB_LDRFIX_DLLFIXES, BM_QUERYCHECK, NULL, NULL) != 0;
             pThis->NewOptions.fForcePreload = WinSendDlgItemMsg(hwnd, CB_LDRFIX_FORCEPRELOAD, BM_QUERYCHECK, NULL, NULL) != 0;
-
-            /*
-             * Heaps
-             */
-            /* Resident */
-            if (!WinSendDlgItemMsg(hwnd, SB_HEAP_RES_MAX, SPBM_QUERYVALUE, (MPARAM)&ul, MPFROM2SHORT(0, SPBQ_UPDATEIFVALID)))
-            {
-                if (fComplain)
-                {
-                    Complain(hwnd, IDS_ERR_INVALID_MAXHEAPSIZE);
-                    WinSetFocus(HWND_DESKTOP, WinWindowFromID(hwnd, SB_HEAP_RES_MAX));
-                }
-                return (MPARAM)FALSE;
-            }
-            pThis->NewOptions.cbResHeapMax = ul*1024;
-            /* Swappable */
-            if (!WinSendDlgItemMsg(hwnd, SB_HEAP_SWP_MAX, SPBM_QUERYVALUE, (MPARAM)&ul, MPFROM2SHORT(0, SPBQ_UPDATEIFVALID)))
-            {
-                if (fComplain)
-                {
-                    Complain(hwnd, IDS_ERR_INVALID_MAXHEAPSIZE);
-                    WinSetFocus(HWND_DESKTOP, WinWindowFromID(hwnd, SB_HEAP_SWP_MAX));
-                }
-                return (MPARAM)FALSE;
-            }
-            pThis->NewOptions.cbSwpHeapMax = ul*1024;
-
-            /*
-             * Check if there is any change and set the fDirty flag accordingly.
-             */
-            pThis->fDirty = memcmp(&pThis->NewOptions, &pThis->Options, sizeof(K32OPTIONS)) != 0;
-            return (MPARAM)TRUE;
-        }
-
-
-    }
-
-    /*
-     * Return thru the default dialog procedure.
-     */
+            return (MRESULT)TRUE;
+        }
+    }
+
+    return NtbkDefPageDlgProc(hwnd, msg, mp1, mp2);
+}
+
+
+/**
+ * Dialog procedure for the DL_ dialog.
+ * (See PMREF for the general specifications of this function.)
+ */
+MRESULT EXPENTRY    MemInfoDlgProc  (HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2)
+{
+    PWIN32KCC   pThis;
+
+
+    /*
+     * Get instance data pointer (pThis).
+     */
+    if (msg != WM_INITDLG)
+    {
+        pThis = (PWIN32KCC)WinQueryWindowPtr(hwnd, QWL_USER);
+        if (pThis == NULL)
+            return WinDefDlgProc(hwnd, msg, mp1, mp2);
+    }
+
+
+    /*
+     * Message switch.
+     */
+    switch (msg)
+    {
+        /*
+         * Sets the controls according to the data from win32k.
+         *
+         * mr:  Focus changed or not.
+         * mp1: hwnd of dialog
+         * mp2: (user data) (pThis for notebook)
+         */
+        case WM_INITDLG:
+        {
+            WinEnableWindow(WinWindowFromID(hwnd, TX_MEMINFO_PAGE_ENABLED), FALSE);
+            break;                      /* break, not return thru ntbk page default procedure. */
+        }
+
+
+        /*
+         * Gets data from win32k.
+         * Sets the controls according to the data from win32k.
+         *
+         * mr:  reserved
+         * mp1: reserved
+         * mp2: reserved
+         */
+        case WM_SETCONTROLS:
+        {
+            K32SYSTEMMEMINFO    MemInfo;
+            APIRET              rc;
+
+            MemInfo.cb = sizeof(MemInfo);
+            MemInfo.flFlags = 0;
+            rc = W32kQuerySystemMemInfo(&MemInfo);
+            if (rc)
+            {
+                break;
+            }
+
+            SetDlgItemTextF(hwnd, TX_MEMINFO_SWAP_SIZE       , "%d", MemInfo.cbSwapFileSize / 1024);
+            SetDlgItemTextF(hwnd, TX_MEMINFO_SWAP_AVAIL      , "%d", MemInfo.cbSwapFileAvail / 1024);
+            SetDlgItemTextF(hwnd, TX_MEMINFO_SWAP_USED       , "%d", MemInfo.cbSwapFileUsed / 1024);
+            SetDlgItemTextF(hwnd, TX_MEMINFO_SWAP_MINFREE    , "%d", MemInfo.cbSwapFileMinFree / 1024);
+            SetDlgItemTextF(hwnd, TX_MEMINFO_SWAP_CFG_MINFREE, "%d", MemInfo.cbSwapFileCFGMinFree / 1024);
+            SetDlgItemTextF(hwnd, TX_MEMINFO_SWAP_CFG_SIZE   , "%d", MemInfo.cbSwapFileCFGSwapSize / 1024);
+            SetDlgItemTextF(hwnd, TX_MEMINFO_SWAP_BROKEN_DFS , "%d", MemInfo.cSwapFileBrokenDF);
+            SetDlgItemTextF(hwnd, TX_MEMINFO_SWAP_GROW_FAILS , "%d", MemInfo.cSwapFileGrowFails);
+            SetDlgItemTextF(hwnd, TX_MEMINFO_SWAP_DFS_IN_MEMFILE, "%d", MemInfo.cSwapFileInMemFile);
+
+            SetDlgItemTextF(hwnd, TX_MEMINFO_PHYS_SIZE , "%d", MemInfo.cbPhysSize);
+            SetDlgItemTextF(hwnd, TX_MEMINFO_PHYS_AVAIL, "%d", MemInfo.cbPhysAvail);
+            SetDlgItemTextF(hwnd, TX_MEMINFO_PHYS_USED , "%d", MemInfo.cbPhysUsed);
+            WinSendDlgItemMsg(hwnd, TX_MEMINFO_PAGE_ENABLED, BM_SETCHECK, (MPARAM)MemInfo.fPagingSwapEnabled, NULL);
+            SetDlgItemTextF(hwnd, TX_MEMINFO_PAGE_FAULTS   , "%d", MemInfo.cPagingPageFaults);
+            SetDlgItemTextF(hwnd, TX_MEMINFO_PAGE_FAULTS_ACTIVE, "%d", MemInfo.cPagingPageFaultsActive);
+            SetDlgItemTextF(hwnd, TX_MEMINFO_PAGE_PHYSPAGES, "%d", MemInfo.cPagingPhysPages);
+            SetDlgItemTextF(hwnd, TX_MEMINFO_PAGE_RESPAGES , "%d", MemInfo.cPagingResidentPages);
+            SetDlgItemTextF(hwnd, TX_MEMINFO_PAGE_SWAPPAGES, "%d", MemInfo.cPagingSwappablePages);
+            SetDlgItemTextF(hwnd, TX_MEMINFO_PAGE_DISCPAGES, "%d", MemInfo.cPagingDiscardablePages);
+            SetDlgItemTextF(hwnd, TX_MEMINFO_PAGE_DISCINMEM, "%d", MemInfo.cPagingDiscardableInmem);
+
+            SetDlgItemTextF(hwnd, TX_MEMINFO_VM_ADDRESSLIMIT, "%08xh", MemInfo.ulAddressLimit);
+            SetDlgItemTextF(hwnd, TX_MEMINFO_VM_SHARED_MIN  , "%08xh", MemInfo.ulVMArenaSharedMin);
+            SetDlgItemTextF(hwnd, TX_MEMINFO_VM_SHARED_MAX  , "%08xh", MemInfo.ulVMArenaSharedMax);
+            SetDlgItemTextF(hwnd, TX_MEMINFO_VM_PRIVATE_MAX , "%08xh", MemInfo.ulVMArenaPrivMax);
+            SetDlgItemTextF(hwnd, TX_MEMINFO_VM_SYSTEM_MIN  , "%08xh", MemInfo.ulVMArenaSystemMin);
+            SetDlgItemTextF(hwnd, TX_MEMINFO_VM_SYSTEM_MAX  , "%08xh", MemInfo.ulVMArenaSystemMax);
+            SetDlgItemTextF(hwnd, TX_MEMINFO_VM_PRIVATE_HMAX, "%08xh", MemInfo.ulVMArenaHighPrivMax);
+            SetDlgItemTextF(hwnd, TX_MEMINFO_VM_SHARED_HMIN , "%08xh", MemInfo.ulVMArenaHighSharedMin);
+            SetDlgItemTextF(hwnd, TX_MEMINFO_VM_SHARED_HMAX , "%08xh", MemInfo.ulVMArenaHighSharedMax);
+
+            return NULL;
+        }
+    }
+
+    return NtbkDefPageDlgProc(hwnd, msg, mp1, mp2);
+}
+
+
+
+/**
+ * Default notebook page dialog procedure.
+ * (See PMREF for the general specifications of this function.)
+ */
+MRESULT EXPENTRY    NtbkDefPageDlgProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2)
+{
+    /*
+     * Message switch.
+     */
+    switch (msg)
+    {
+        /*
+         * Sets the controls according to the data from win32k.
+         *
+         * mr:  Focus changed or not.
+         * mp1: hwnd of dialog
+         * mp2: (user data) (pThis for notebook)
+         */
+        case WM_INITDLG:
+        {
+            PWIN32KCC   pThis = (PWIN32KCC)mp2;
+
+            if (!WinSetWindowPtr(hwnd, QWL_USER, mp2))
+            {
+                /* complain, dismiss and return. */
+                Complain(hwnd, IDS_ERR_SET_INSTANCEDATA,
+                         WinGetLastError(pThis->hab),
+                         getLastErrorMsg(pThis->hab));
+                WinPostMsg(hwnd, WM_QUIT, NULL, NULL);
+                return FALSE;
+            }
+            break;
+        }
+
+
+        /*
+         * Gets data from win32k.
+         * Sets the controls according to the data from win32k.
+         *
+         * mr:  reserved
+         * mp1: reserved
+         * mp2: reserved
+         */
+        case WM_SETCONTROLS:
+        {
+            return NULL;
+        }
+
+
+        /*
+         * Validate data in the controls. Complains accoring to mp1.
+         * Put the data into the win32k option struct.
+         *
+         * mr:  Valid indicator.
+         *      TRUE:   Valid data.
+         *      FALSE:  Not valid data.
+         * mp1: BOOL fComplain.
+         *      TRUE:   Do complain about errors. The pThis->Options struct
+         *              is updated on successful return.
+         *      FALSE:  Do not complain about errors, and don't update the
+         *              pThis->Options struct.
+         * mp2: reserved.
+         */
+        case WM_QUERYCONTROLS:
+        {
+            return (MRESULT)TRUE;
+        }
+    }
+
     return WinDefDlgProc(hwnd, msg, mp1, mp2);
 }
-#endif
+
+/**
+ * Spirintf version of WinSetDlgItemText.
+ * @returns Same as WinSetDlgItemText.
+ * @param   hwndDlg     Dialog Window Handle.
+ * @param   idItem      Control ID.
+ * @param   pszFormat   Pointer to format string. (input to sprintf)
+ * @param   ..          Additional parameters.
+ * @status  completly implemented.
+ * @author  knut st. osmundsen (knut.stange.osmundsen@mynd.no)
+ */
+BOOL    SetDlgItemTextF(HWND hwndDlg, ULONG idItem, PSZ pszFormat, ...)
+{
+    BOOL    fRc;
+    char    sz[64];
+    va_list arg;
+
+    #pragma info(none)
+    va_start(arg, pszFormat);
+    #pragma info(restore)
+    vsprintf(sz, pszFormat, arg);
+    va_end(arg);
+
+    fRc = WinSetDlgItemText(hwndDlg, idItem, sz);
+    #ifdef DEBUG
+    if (!fRc)
+        Complain(hwndDlg, IDS_ERR_ASSERT, __FILE__, __LINE__, __FUNCTION__);
+    #endif
+
+    return fRc;
+}
 
 

branches/notebook/src/win32k/utils/Win32kCC.dlg ¶

@@ -2 +2 @@
    #include <os2.h>
 #endif
-DLGINCLUDE 1 "D:\odin32\worktree\src\win32k\utils\Dialog.h"
-
-DLGTEMPLATE DL_HEAPS_PAGE
-BEGIN
-    DIALOG  "Heaps", DL_HEAPS_PAGE, 0, 0, 274, 180, NOT FS_DLGBORDER |
-            WS_VISIBLE
-    BEGIN
-        GROUPBOX        "Heaps", GR_HEAPS, 6, 88, 262, 87
-        GROUPBOX        "Resident Heap", GR_HEAP_RES, 14, 94, 118, 73
-        LTEXT           "Max (KB):", TX_HEAP_RES_MAX, 22, 148, 53, 8
-        SPINBUTTON      SB_HEAP_RES_MAX, 82, 148, 42, 8, SPBS_NUMERICONLY |
-                        SPBS_MASTER | SPBS_FASTSPIN | WS_GROUP
-        LTEXT           "Initial (KB)", TX_HEAP_RES_INIT, 22, 138, 50, 8
-        RTEXT           "257", TX_HEAP_RES_INIT_VAL, 78, 138, 46, 8
-        LTEXT           "Used (KB)", TX_HEAP_RES_USED, 22, 122, 50, 8
-        RTEXT           "257", TX_HEAP_RES_USED_VAL, 78, 122, 46, 8
-        GROUPBOX        "Swappable Heap", GR_HEAP_SWP, 142, 94, 118, 73
-        LTEXT           "Max (KB):", TX_HEAP_SWP_MAX, 150, 148, 53, 8
-        SPINBUTTON      SB_HEAP_SWP_MAX, 210, 148, 42, 8, SPBS_NUMERICONLY |
-                        SPBS_MASTER | SPBS_FASTSPIN | WS_GROUP
-        LTEXT           "Initial (KB)", TX_HEAP_SWP_INIT, 150, 138, 50, 8
-        RTEXT           "257", TX_HEAP_SWP_INIT_VAL, 206, 138, 46, 8
-        LTEXT           "Used (KB)", TX_HEAP_SWP_USED, 150, 122, 50, 8
-        RTEXT           "257", TX_HEAP_SWP_USED_VAL, 206, 122, 46, 8
-        LTEXT           "Free (KB)", TX_HEAP_RES_FREE, 22, 114, 50, 8
-        RTEXT           "257", TX_HEAP_RES_FREE_VAL, 78, 114, 46, 8
-        LTEXT           "Current (KB)", TX_HEAP_RES_SIZE, 22, 130, 56, 8
-        RTEXT           "257", TX_HEAP_RES_SIZE_VAL, 78, 130, 46, 8
-        LTEXT           "Used Blocks", TX_HEAP_RES_USED_BLOCKS, 22, 106, 53,
-                        8
-        RTEXT           "10", TX_HEAP_RES_USED_BLOCKS_VAL, 78, 106, 46, 8
-        LTEXT           "Free Blocks", TX_HEAP_RES_FREE_BLOCKS, 22, 98, 53,
-                        8
-        RTEXT           "10", TX_HEAP_RES_FREE_BLOCKS_VAL, 78, 98, 46, 8
-        LTEXT           "Free (KB)", TX_HEAP_SWP_FREE, 150, 114, 50, 8
-        RTEXT           "257", TX_HEAP_SWP_FREE_VAL, 206, 114, 46, 8
-        LTEXT           "Current (KB)", TX_HEAP_SWP_SIZE, 150, 130, 56, 8
-        RTEXT           "257", TX_HEAP_SWP_SIZE_VAL, 206, 130, 46, 8
-        LTEXT           "Used Blocks", TX_HEAP_SWP_USED_BLOCKS, 150, 106, 53,
-                        8
-        RTEXT           "11", TX_HEAP_SWP_USED_BLOCKS_VAL, 206, 106, 46, 8
-        LTEXT           "Free Blocks", TX_HEAP_SWP_FREE_BLOCKS, 150, 98, 53,
-                        8
-        RTEXT           "11", TX_HEAP_SWP_FREE_BLOCKS_VAL, 206, 98, 46, 8
-    END
-END
-
-DLGTEMPLATE DL_LDRFIX_PAGE
-BEGIN
-    DIALOG  "OS/2 Enh.", DL_LDRFIX_PAGE, 0, 0, 274, 180, NOT FS_DLGBORDER |
-            FS_BORDER | WS_VISIBLE
-    BEGIN
-        GROUPBOX        "OS/2 Loader Fixes", GR_LDRFIX, 6, 142, 262, 34
-        AUTOCHECKBOX    "Long DLL names and non .DLL extention fixes",
-                        CB_LDRFIX_DLLFIXES, 14, 156, 252, 10
-        AUTOCHECKBOX    "Force Preload of Executable Modules (ICAT/R3 debug)",
-                        CB_LDRFIX_FORCEPRELOAD, 14, 146, 252, 10
-    END
-END
-
-DLGTEMPLATE DL_LOADERS_PAGE
-BEGIN
-    DIALOG  "Loaders", DL_LOADERS_PAGE, 0, 0, 274, 180, NOT FS_DLGBORDER |
-            FS_BORDER | WS_VISIBLE
-    BEGIN
-        GROUPBOX        "Loaders", GR_LOADERS, 6, 65, 262, 111
-        AUTOCHECKBOX    "Disable all loaders", CB_LDR_DISABLE_ALL, 14, 156,
-                        112, 10
-        GROUPBOX        "~PE Loader", GR_LDR_PE, 14, 93, 118, 63,
-                        DT_MNEMONIC
-        AUTORADIOBUTTON "Pure", RB_LDR_PE_PURE, 22, 137, 44, 9, WS_TABSTOP
-        AUTORADIOBUTTON "Mixed", RB_LDR_PE_MIXED, 22, 128, 44, 9, WS_TABSTOP
-        AUTORADIOBUTTON "PE.EXE", RB_LDR_PE_PE, 78, 137, 44, 9, WS_TABSTOP
-        AUTORADIOBUTTON "Disabled", RB_LDR_PE_NOT, 78, 128, 51, 9,
-                        WS_TABSTOP
-        CONTROL         "All-In-One-Object Fix", CK_LDR_PE_ONEOBJECT, 22,
-                        118, 102, 10, WC_BUTTON, BS_AUTO3STATE | BS_AUTOSIZE |
-                        WS_TABSTOP | WS_VISIBLE
-        SPINBUTTON      SB_LDR_PE_INFOLEVEL, 96, 107, 28, 12,
-                        SPBS_NUMERICONLY | SPBS_MASTER | WS_GROUP
-        LTEXT           "Infolevel:", TX_LDR_PE_INFOLEVEL, 22, 107, 48, 8
-        LTEXT           "Modules", TX_LDR_PE_MODULES, 22, 97, 48, 8
-        RTEXT           "3", TX_LDR_PE_MODULES_VAL, 77, 97, 47, 8
-        GROUPBOX        "~ELF Loader", GR_LDR_ELF, 142, 112, 118, 44,
-                        DT_MNEMONIC | WS_DISABLED
-        AUTOCHECKBOX    "Enabled", CB_LDR_ELF_ENABLED, 150, 136, 55, 10,
-                        WS_DISABLED
-        LTEXT           "Infolevel:", TX_LDR_ELF_INFOLEVEL, 150, 126, 48, 8,
-                        WS_DISABLED
-        SPINBUTTON      SB_LDR_ELF_INFOLEVEL, 224, 126, 28, 12,
-                        SPBS_NUMERICONLY | SPBS_MASTER | WS_GROUP |
-                        WS_DISABLED
-        LTEXT           "Modules", TX_LDR_ELF_MODULES, 150, 116, 48, 8,
-                        WS_DISABLED
-        RTEXT           "3", TX_LDR_ELF_MODULES_VAL, 205, 116, 47, 8,
-                        WS_DISABLED
-        AUTOCHECKBOX    "UNIX Shell Scripts", CB_LDR_SHELL_SCRIPTS, 14, 79,
-                        118, 10
-        AUTOCHECKBOX    "JAVA", CB_LDR_JAVA, 142, 79, 118, 10
-        AUTOCHECKBOX    "(Pure) REXX Scripts (.RX/.REX)", CB_LDR_REXX, 14,
-                        69, 160, 10
-    END
-END
-
-DLGTEMPLATE DL_LOGGING_PAGE
-BEGIN
-    DIALOG  "Logging", DL_LOGGING_PAGE, 0, 0, 274, 180, NOT FS_DLGBORDER |
-            FS_BORDER | WS_VISIBLE
-    BEGIN
-        GROUPBOX        "Logging", GR_LOGGING, 6, 152, 262, 24
-        AUTOCHECKBOX    "Enabled", CB_LOGGING_ENABLED, 14, 156, 50, 10
-        AUTORADIOBUTTON "COM1", RB_LOGGING_COM1, 76, 156, 36, 10, WS_TABSTOP
-        AUTORADIOBUTTON "COM2", RB_LOGGING_COM2, 123, 156, 36, 10,
-                        WS_TABSTOP
-        AUTORADIOBUTTON "COM3", RB_LOGGING_COM3, 167, 156, 36, 10,
-                        WS_TABSTOP
-        AUTORADIOBUTTON "COM4", RB_LOGGING_COM4, 213, 156, 36, 10,
-                        WS_TABSTOP
-    END
-END
-
-DLGTEMPLATE PG_WIN32K_INFO_PAGE
-BEGIN
-    DIALOG  "Win32k Info", PG_WIN32K_INFO_PAGE, 0, 0, 274, 180, NOT
-            FS_DLGBORDER | FS_BORDER | WS_VISIBLE
-    BEGIN
-        GROUPBOX        "", GR_W32K, 6, 130, 262, 46
-        LTEXT           "Symbol file", TX_W32K_SYMBOLFILE, 14, 142, 84, 8
-        LTEXT           "Kernel Build", TX_W32K_KERNELBUILD, 14, 134, 84, 8
-        LTEXT           "c:\\os2\\pdpsi\\pmdf\\warp4\\os2krnl.sym",
-                        TX_W32K_SYMBOLFILE_VAL, 100, 142, 165, 8
-        LTEXT           "Win32k version", TX_W32K_VERSION, 14, 158, 84, 8
-        LTEXT           "0.5", TX_W32K_VERSION_VAL, 100, 158, 165, 8
-        LTEXT           "Build time/date", TX_W32K_BUILD_DATETIME, 14, 150,
-                        84, 8
-        LTEXT           "04:30:12 Sep 01 2000", TX_W32K_BUILD_DATETIME_VAL,
-                        100, 150, 165, 8
-        LTEXT           "9.036", TX_W32K_KERNELBUILD_VAL, 100, 134, 165, 8
-    END
-END
-
-DLGTEMPLATE DL_WIN32KCC
-BEGIN
-    DIALOG  "Win32k Control Center", DL_WIN32KCC, 0, 0, 322, 220, WS_VISIBLE,
+DLGINCLUDE 1 "G:\odin32\tree\src\win32k\utils\Dialog.h"
+
+DLGTEMPLATE DL_WIN32KCC LOADONCALL MOVEABLE DISCARDABLE
+BEGIN
+    DIALOG  "Win32k Control Center", DL_WIN32KCC, 0, 0, 322, 220, WS_VISIBLE, 
             FCF_SYSMENU | FCF_TITLEBAR
     BEGIN
-        NOTEBOOK        DL_WIN32KCC_NTBK, 6, 24, 310, 196, BKS_BACKPAGESTR |
-                         BKS_POLYGONTABS | BKS_TABTEXTCENTER |
-                         BKS_TABBEDDIALOG | WS_GROUP
+        NOTEBOOK        DL_WIN32KCC_NTBK, 6, 24, 310, 196, BKS_BACKPAGESTR | 
+                        BKS_TABTEXTCENTER | WS_GROUP
         DEFPUSHBUTTON   "~Refresh", PB_REFRESH, 6, 4, 40, 14
         PUSHBUTTON      "~Apply", PB_APPLY, 49, 4, 40, 14
-        PUSHBUTTON      "Update Config.sys", PB_UPD_CONFIGSYS, 92, 4, 100,
+        PUSHBUTTON      "Update Config.sys", PB_UPD_CONFIGSYS, 92, 4, 100, 
                         14
         PUSHBUTTON      "~Close", DID_OK, 195, 4, 40, 14
@@ -159 +19 @@
 END
 
-DLGTEMPLATE DL_WIN32KCC_OLD
-BEGIN
-    DIALOG  "Win32k Control Center", DL_WIN32KCC_OLD, 0, 0, 322, 220, WS_VISIBLE,
-            FCF_SYSMENU | FCF_TITLEBAR
-    BEGIN
-        NOTEBOOK        DL_WIN32KCC_NTBK, 6, 24, 310, 196, BKS_BACKPAGESTR |
-                         BKS_POLYGONTABS | BKS_TABTEXTCENTER |
-                         BKS_SPIRALBIND | WS_GROUP
+DLGTEMPLATE DL_WIN32KCC_OLD LOADONCALL MOVEABLE DISCARDABLE
+BEGIN
+    DIALOG  "Win32k Control Center", DL_WIN32KCC_OLD, 0, 0, 322, 220, 
+            WS_VISIBLE, FCF_SYSMENU | FCF_TITLEBAR
+    BEGIN
+        NOTEBOOK        DL_WIN32KCC_NTBK, 6, 24, 310, 196, BKS_BACKPAGESTR | 
+                        BKS_TABTEXTCENTER | WS_GROUP
         DEFPUSHBUTTON   "~Refresh", PB_REFRESH, 6, 4, 40, 14
         PUSHBUTTON      "~Apply", PB_APPLY, 49, 4, 40, 14
-        PUSHBUTTON      "Update Config.sys", PB_UPD_CONFIGSYS, 92, 4, 100,
+        PUSHBUTTON      "Update Config.sys", PB_UPD_CONFIGSYS, 92, 4, 100, 
                         14
         PUSHBUTTON      "~Close", DID_OK, 195, 4, 40, 14
@@ -175 +34 @@
 END
 
+DLGTEMPLATE DL_HEAPS_PAGE LOADONCALL MOVEABLE DISCARDABLE
+BEGIN
+    DIALOG  "~Heaps", DL_HEAPS_PAGE, 0, 0, 274, 120, NOT FS_DLGBORDER | 
+            WS_VISIBLE
+    BEGIN
+        GROUPBOX        "Heaps", GR_HEAPS, 6, 29, 262, 87
+        GROUPBOX        "Resident Heap", GR_HEAP_RES, 14, 35, 118, 73
+        LTEXT           "Max (KB):", TX_HEAP_RES_MAX, 22, 89, 53, 8
+        SPINBUTTON      SB_HEAP_RES_MAX, 82, 89, 42, 8, SPBS_NUMERICONLY | 
+                        SPBS_MASTER | SPBS_FASTSPIN | WS_GROUP
+        LTEXT           "Initial (KB)", TX_HEAP_RES_INIT, 22, 79, 50, 8
+        RTEXT           "257", TX_HEAP_RES_INIT_VAL, 78, 79, 46, 8
+        LTEXT           "Used (KB)", TX_HEAP_RES_USED, 22, 63, 50, 8
+        RTEXT           "257", TX_HEAP_RES_USED_VAL, 78, 63, 46, 8
+        GROUPBOX        "Swappable Heap", GR_HEAP_SWP, 142, 35, 118, 73
+        LTEXT           "Max (KB):", TX_HEAP_SWP_MAX, 150, 89, 53, 8
+        SPINBUTTON      SB_HEAP_SWP_MAX, 210, 89, 42, 8, SPBS_NUMERICONLY | 
+                        SPBS_MASTER | SPBS_FASTSPIN | WS_GROUP
+        LTEXT           "Initial (KB)", TX_HEAP_SWP_INIT, 150, 79, 50, 8
+        RTEXT           "257", TX_HEAP_SWP_INIT_VAL, 206, 79, 46, 8
+        LTEXT           "Used (KB)", TX_HEAP_SWP_USED, 150, 63, 50, 8
+        RTEXT           "257", TX_HEAP_SWP_USED_VAL, 206, 63, 46, 8
+        LTEXT           "Free (KB)", TX_HEAP_RES_FREE, 22, 55, 50, 8
+        RTEXT           "257", TX_HEAP_RES_FREE_VAL, 78, 55, 46, 8
+        LTEXT           "Current (KB)", TX_HEAP_RES_SIZE, 22, 71, 56, 8
+        RTEXT           "257", TX_HEAP_RES_SIZE_VAL, 78, 71, 46, 8
+        LTEXT           "Used Blocks", TX_HEAP_RES_USED_BLOCKS, 22, 47, 53, 
+                        8
+        RTEXT           "10", TX_HEAP_RES_USED_BLOCKS_VAL, 78, 47, 46, 8
+        LTEXT           "Free Blocks", TX_HEAP_RES_FREE_BLOCKS, 22, 39, 53, 
+                        8
+        RTEXT           "10", TX_HEAP_RES_FREE_BLOCKS_VAL, 78, 39, 46, 8
+        LTEXT           "Free (KB)", TX_HEAP_SWP_FREE, 150, 55, 50, 8
+        RTEXT           "257", TX_HEAP_SWP_FREE_VAL, 206, 55, 46, 8
+        LTEXT           "Current (KB)", TX_HEAP_SWP_SIZE, 150, 71, 56, 8
+        RTEXT           "257", TX_HEAP_SWP_SIZE_VAL, 206, 71, 46, 8
+        LTEXT           "Used Blocks", TX_HEAP_SWP_USED_BLOCKS, 150, 47, 53, 
+                        8
+        RTEXT           "11", TX_HEAP_SWP_USED_BLOCKS_VAL, 206, 47, 46, 8
+        LTEXT           "Free Blocks", TX_HEAP_SWP_FREE_BLOCKS, 150, 39, 53, 
+                        8
+        RTEXT           "11", TX_HEAP_SWP_FREE_BLOCKS_VAL, 206, 39, 46, 8
+    END
+END
+
+DLGTEMPLATE DL_LOADERS_PAGE LOADONCALL MOVEABLE DISCARDABLE
+BEGIN
+    DIALOG  "~Loaders", DL_LOADERS_PAGE, 0, 0, 274, 120, NOT FS_DLGBORDER | 
+            WS_VISIBLE
+    BEGIN
+        GROUPBOX        "Loaders", GR_LOADERS, 6, 6, 262, 110
+        AUTOCHECKBOX    "Disable all loaders", CB_LDR_DISABLE_ALL, 14, 97, 
+                        112, 10
+        GROUPBOX        "~PE Loader", GR_LDR_PE, 14, 34, 118, 63, 
+                        DT_MNEMONIC
+        AUTORADIOBUTTON "Pure", RB_LDR_PE_PURE, 22, 78, 44, 9, WS_TABSTOP
+        AUTORADIOBUTTON "Mixed", RB_LDR_PE_MIXED, 22, 69, 44, 9, WS_TABSTOP
+        AUTORADIOBUTTON "PE.EXE", RB_LDR_PE_PE, 78, 78, 44, 9, WS_TABSTOP
+        AUTORADIOBUTTON "Disabled", RB_LDR_PE_NOT, 78, 69, 51, 9, WS_TABSTOP
+        CONTROL         "All-In-One-Object Fix", CK_LDR_PE_ONEOBJECT, 22, 59, 
+                        102, 10, WC_BUTTON, BS_AUTO3STATE | BS_AUTOSIZE | 
+                        WS_TABSTOP | WS_VISIBLE
+        SPINBUTTON      SB_LDR_PE_INFOLEVEL, 96, 48, 28, 12, 
+                        SPBS_NUMERICONLY | SPBS_MASTER | WS_GROUP
+        LTEXT           "Infolevel:", TX_LDR_PE_INFOLEVEL, 22, 48, 48, 8
+        LTEXT           "Modules", TX_LDR_PE_MODULES, 22, 38, 48, 8
+        RTEXT           "3", TX_LDR_PE_MODULES_VAL, 77, 38, 47, 8
+        GROUPBOX        "~ELF Loader", GR_LDR_ELF, 142, 53, 118, 44, 
+                        DT_MNEMONIC | WS_DISABLED
+        AUTOCHECKBOX    "Enabled", CB_LDR_ELF_ENABLED, 150, 77, 55, 10, 
+                        WS_DISABLED
+        LTEXT           "Infolevel:", TX_LDR_ELF_INFOLEVEL, 150, 67, 48, 8, 
+                        WS_DISABLED
+        SPINBUTTON      SB_LDR_ELF_INFOLEVEL, 224, 67, 28, 12, 
+                        SPBS_NUMERICONLY | SPBS_MASTER | WS_GROUP | 
+                        WS_DISABLED
+        LTEXT           "Modules", TX_LDR_ELF_MODULES, 150, 57, 48, 8, 
+                        WS_DISABLED
+        RTEXT           "3", TX_LDR_ELF_MODULES_VAL, 205, 57, 47, 8, 
+                        WS_DISABLED
+        AUTOCHECKBOX    "UNIX Shell Scripts", CB_LDR_SHELL_SCRIPTS, 14, 20, 
+                        118, 10
+        AUTOCHECKBOX    "JAVA", CB_LDR_JAVA, 142, 20, 118, 10
+        AUTOCHECKBOX    "(Pure) REXX Scripts (.RX/.REX)", CB_LDR_REXX, 14, 
+                        10, 160, 10
+    END
+END
+
+DLGTEMPLATE DL_LDRFIX_PAGE LOADONCALL MOVEABLE DISCARDABLE
+BEGIN
+    DIALOG  "~OS/2 Enh.", DL_LDRFIX_PAGE, 0, 0, 274, 120, NOT FS_DLGBORDER | 
+            WS_VISIBLE
+    BEGIN
+        GROUPBOX        "OS/2 Loader Fixes", GR_LDRFIX, 6, 82, 262, 34
+        AUTOCHECKBOX    "Long DLL names and non .DLL extention fixes", 
+                        CB_LDRFIX_DLLFIXES, 14, 96, 252, 10
+        AUTOCHECKBOX    "Force Preload of Executable Modules (ICAT/R3 debug)", 
+                        CB_LDRFIX_FORCEPRELOAD, 14, 86, 252, 10
+    END
+END
+
+DLGTEMPLATE DL_LOGGING_PAGE LOADONCALL MOVEABLE DISCARDABLE
+BEGIN
+    DIALOG  "Lo~gging", DL_LOGGING_PAGE, 0, 0, 274, 120, NOT FS_DLGBORDER | 
+            WS_VISIBLE
+    BEGIN
+        GROUPBOX        "Logging", GR_LOGGING, 6, 92, 262, 24
+        AUTOCHECKBOX    "Enabled", CB_LOGGING_ENABLED, 14, 96, 50, 10
+        AUTORADIOBUTTON "COM1", RB_LOGGING_COM1, 76, 96, 36, 10, WS_TABSTOP
+        AUTORADIOBUTTON "COM2", RB_LOGGING_COM2, 123, 96, 36, 10, WS_TABSTOP
+        AUTORADIOBUTTON "COM3", RB_LOGGING_COM3, 167, 96, 36, 10, WS_TABSTOP
+        AUTORADIOBUTTON "COM4", RB_LOGGING_COM4, 213, 96, 36, 10, WS_TABSTOP
+    END
+END
+
+DLGTEMPLATE PG_WIN32K_INFO_PAGE LOADONCALL MOVEABLE DISCARDABLE
+BEGIN
+    DIALOG  "~Win32k Info", PG_WIN32K_INFO_PAGE, 0, 0, 274, 120, NOT 
+            FS_DLGBORDER | WS_VISIBLE
+    BEGIN
+        GROUPBOX        "", GR_W32K, 6, 70, 262, 46
+        LTEXT           "Symbol file", TX_W32K_SYMBOLFILE, 14, 82, 84, 8
+        LTEXT           "Kernel Build", TX_W32K_KERNELBUILD, 14, 74, 84, 8
+        LTEXT           "c:\\os2\\pdpsi\\pmdf\\warp4\\os2krnl.sym", 
+                        TX_W32K_SYMBOLFILE_VAL, 100, 82, 165, 8
+        LTEXT           "Win32k version", TX_W32K_VERSION, 14, 98, 84, 8
+        LTEXT           "0.5", TX_W32K_VERSION_VAL, 100, 98, 165, 8
+        LTEXT           "Build time/date", TX_W32K_BUILD_DATETIME, 14, 90, 
+                        84, 8
+        LTEXT           "04:30:12 Sep 01 2000", TX_W32K_BUILD_DATETIME_VAL, 
+                        100, 90, 165, 8
+        LTEXT           "9.036", TX_W32K_KERNELBUILD_VAL, 100, 74, 165, 8
+    END
+END
+
+DLGTEMPLATE DL_MEMINFO_PAGE LOADONCALL MOVEABLE DISCARDABLE
+BEGIN
+    DIALOG  "~MemInfo", DL_MEMINFO_PAGE, 0, 0, 274, 120, NOT FS_DLGBORDER | 
+            WS_VISIBLE
+    BEGIN
+        GROUPBOX        "Mem Info", GR_MEMINFO, 6, 4, 260, 112
+        GROUPBOX        "Swapfile", 1602, 12, 37, 102, 72
+                        PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
+        LTEXT           "Size", 1603, 17, 95, 52, 7
+                        PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
+        LTEXT           "Avail", 1604, 17, 88, 52, 7
+                        PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
+        LTEXT           "Used", 1605, 17, 81, 52, 7
+                        PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
+        LTEXT           "Min Free", 1606, 17, 74, 52, 7
+                        PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
+        LTEXT           "CFG Min Free", 1607, 17, 67, 52, 7
+                        PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
+        LTEXT           "CFG Size", 1608, 17, 60, 52, 7
+                        PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
+        LTEXT           "Broken DFs", 1609, 17, 53, 52, 7
+                        PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
+        LTEXT           "Grow Fails", GR_MEMINFO_SWAP, 17, 46, 52, 7
+                        PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
+        LTEXT           "DFs in Memfile", TX_MEMINFO_SWAP_DFS_IN_MEMFILE, 17, 
+                        39, 52, 7
+                        PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
+        RTEXT           "108384", TX_MEMINFO_SWAP_SIZE, 70, 95, 28, 7
+                        PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
+        RTEXT           "108384", TX_MEMINFO_SWAP_AVAIL, 70, 88, 28, 7
+                        PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
+        RTEXT           "108384", TX_MEMINFO_SWAP_USED, 70, 81, 28, 7
+                        PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
+        RTEXT           "108384", TX_MEMINFO_SWAP_MINFREE, 70, 74, 28, 7
+                        PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
+        RTEXT           "108384", TX_MEMINFO_SWAP_CFG_MINFREE, 70, 67, 28, 7
+                        PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
+        RTEXT           "108384", TX_MEMINFO_SWAP_CFG_SIZE, 70, 60, 28, 7
+                        PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
+        RTEXT           "108384", TX_MEMINFO_SWAP_BROKEN_DFS, 70, 53, 28, 7
+                        PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
+        RTEXT           "108384", TX_MEMINFO_SWAP_GROW_FAILS, 70, 46, 28, 7
+                        PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
+        RTEXT           "108384", TX_MEMINFO_SWAP_DFS_IN_MEMFILE, 70, 39, 28, 
+                        7
+                        PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
+        LTEXT           "KB", 1621, 99, 95, 10, 7
+                        PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
+        LTEXT           "KB", 1622, 99, 88, 10, 7
+                        PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
+        LTEXT           "KB", 1623, 99, 81, 10, 7
+                        PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
+        LTEXT           "KB", 1624, 99, 74, 10, 7
+                        PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
+        LTEXT           "KB", 1625, 99, 67, 10, 7
+                        PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
+        LTEXT           "KB", 1626, 99, 60, 10, 7
+                        PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
+        GROUPBOX        "Physical/Paging", GR_MEMINFO_PHYSPAGE, 120, 37, 140, 
+                        72
+                        PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
+        LTEXT           "Size", 1627, 125, 95, 21, 7
+                        PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
+        LTEXT           "Avail", 1628, 125, 88, 21, 7
+                        PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
+        LTEXT           "Used", 1629, 125, 81, 21, 7
+                        PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
+        RTEXT           "108384", TX_MEMINFO_PHYS_SIZE, 146, 95, 28, 7
+                        PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
+        RTEXT           "108384", TX_MEMINFO_PHYS_AVAIL, 146, 88, 28, 7
+                        PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
+        RTEXT           "108384", TX_MEMINFO_PHYS_USED, 146, 81, 28, 7
+                        PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
+        LTEXT           "KB", 1633, 175, 95, 10, 7
+                        PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
+        LTEXT           "KB", 1634, 175, 88, 10, 7
+                        PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
+        LTEXT           "KB", 1635, 175, 81, 10, 7
+                        PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
+        LTEXT           "Faults", 1636, 193, 88, 34, 7
+                        PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
+        RTEXT           "108384", TX_MEMINFO_PAGE_FAULTS, 227, 88, 28, 7
+                        PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
+        LTEXT           "Active faults", 1639, 193, 81, 39, 7
+                        PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
+        RTEXT           "108384", TX_MEMINFO_PAGE_FAULTS_ACTIVE, 232, 81, 23, 
+                        7
+                        PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
+        LTEXT           "Paging", 1638, 193, 95, 30, 7
+                        PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
+        LTEXT           "Resident Pages", TX_MEMINFO_PHYS_USED, 125, 60, 75, 
+                        7
+                        PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
+        RTEXT           "108384", TX_MEMINFO_PAGE_RESPAGES, 227, 60, 28, 7
+                        PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
+        LTEXT           "Swappable Pages", 1645, 125, 53, 75, 7
+                        PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
+        RTEXT           "108384", TX_MEMINFO_PAGE_SWAPPAGES, 227, 53, 28, 7
+                        PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
+        LTEXT           "Discardable Pages", 1647, 125, 46, 75, 7
+                        PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
+        RTEXT           "108384", TX_MEMINFO_PAGE_DISCPAGES, 227, 46, 28, 7
+                        PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
+        LTEXT           "Discardable In Memory", 1649, 125, 39, 75, 7
+                        PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
+        RTEXT           "108384", TX_MEMINFO_PAGE_DISCINMEM, 227, 39, 28, 7
+                        PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
+        LTEXT           "Physical Pages", TX_MEMINFO_PHYS_AVAIL, 125, 67, 75, 
+                        7
+                        PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
+        RTEXT           "108384", TX_MEMINFO_PAGE_PHYSPAGES, 227, 67, 28, 7
+                        PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
+        GROUPBOX        "Virtual Memory", GR_MEMINFO_VM, 12, 7, 248, 30
+                        PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
+        LTEXT           "Address Limit", TX_MEMINFO_PAGE_FAULTS_ACTIVE, 17, 
+                        23, 48, 7
+                        PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
+        RTEXT           "20000000h", TX_MEMINFO_VM_ADDRESSLIMIT, 64, 23, 33, 
+                        7
+                        PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
+        LTEXT           "Shared Min", TX_MEMINFO_PAGE_RESPAGES, 16, 16, 48, 
+                        7
+                        PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
+        RTEXT           "20000000h", TX_MEMINFO_VM_SHARED_MIN, 64, 16, 33, 7
+                        PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
+        LTEXT           "Shared Max", TX_MEMINFO_PAGE_DISCPAGES, 16, 9, 48, 
+                        7
+                        PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
+        RTEXT           "20000000h", TX_MEMINFO_VM_SHARED_MAX, 64, 9, 33, 7
+                        PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
+        LTEXT           "Privat Max", 1659, 100, 23, 44, 7
+                        PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
+        RTEXT           "20000000h", TX_MEMINFO_VM_PRIVATE_MAX, 144, 23, 33, 
+                        7
+                        PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
+        LTEXT           "Priv HMax", 1661, 180, 23, 42, 7
+                        PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
+        RTEXT           "20000000h", TX_MEMINFO_VM_PRIVATE_HMAX, 222, 23, 33, 
+                        7
+                        PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
+        LTEXT           "Shrd HMin", 1663, 180, 16, 42, 7
+                        PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
+        RTEXT           "20000000h", TX_MEMINFO_VM_SHARED_HMIN, 222, 16, 33, 
+                        7
+                        PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
+        LTEXT           "Shrd HMax", 1665, 180, 9, 42, 7
+                        PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
+        RTEXT           "20000000h", TX_MEMINFO_VM_SHARED_HMAX, 222, 9, 33, 
+                        7
+                        PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
+        LTEXT           "System Min", 1667, 100, 16, 44, 7
+                        PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
+        RTEXT           "20000000h", TX_MEMINFO_VM_SYSTEM_MIN, 144, 16, 33, 
+                        7
+                        PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
+        LTEXT           "System Max", 1669, 100, 9, 44, 7
+                        PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
+        RTEXT           "20000000h", TX_MEMINFO_VM_SYSTEM_MAX, 144, 9, 33, 7
+                        PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
+        AUTOCHECKBOX    "", TX_MEMINFO_PAGE_ENABLED, 223, 95, 7, 7
+    END
+END

branches/notebook/src/win32k/utils/Win32kCC.h ¶

@@ -1 @@
-/* $Id: Win32kCC.h,v 1.6 2001-02-02 08:41:31 bird Exp $
+/* $Id: Win32kCC.h,v 1.6.2.1 2001-02-17 08:57:51 bird Exp $
  *
  *
@@ -26 +26 @@
 #define  IDS_ERR_DIALOGLOAD             1
 #define  IDS_ERR_MALLOC_FAILED          2
-#define  IDS_ERR_SET_INSTACEDATA        3
-#define  IDS_ERR_WIN32K_NOT_LOADED      4
-#define  IDS_ERR_WIN32K_OPEN_FAILED     5
-#define  IDS_ERR_QUERYOPTIONSTATUS      6
-#define  IDS_ERR_NO_COM_RADIOBUTTON     7
-#define  IDS_ERR_NO_PE_RADIOBUTTON      8
-#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
+#define  IDS_ERR_SET_INSTANCEDATA       3
+#define  IDS_ERR_ADD_NTBK_PAGE_LOAD     4
+#define  IDS_ERR_ADD_NTBK_PAGE_INSERT   5
+#define  IDS_ERR_ADD_NTBK_PAGE_SET      6
+#define  IDS_ERR_WIN32K_NOT_LOADED      7
+#define  IDS_ERR_WIN32K_OPEN_FAILED     8
+#define  IDS_ERR_QUERYOPTIONSTATUS      9
+#define  IDS_ERR_NO_COM_RADIOBUTTON     10
+#define  IDS_ERR_NO_PE_RADIOBUTTON      11
+#define  IDS_ERR_NO_PE_ONEOBJECT        12
+#define  IDS_ERR_INVALID_INFOLEVEL      13
+#define  IDS_ERR_INVALID_MAXHEAPSIZE    14
+#define  IDS_ERR_SETPOPTIONS            15
+#define  IDS_ERR_FOPEN_FAILED           16
+#define  IDS_FSIZE_FAILED               17
+#define  IDS_MALLOC_FAILED              18
+#define  IDS_FWRITE_FAILED              19
+#define  IDS_ERR_FAILED_TO_LOAD_DLGT    20
+#define  IDS_ERR_FAILED_NTBK_BUTTONS    21
+#define  IDS_ERR_ASSERT                 22
 
 

branches/notebook/src/win32k/utils/Win32kCC.rc ¶

@@ -1 @@
-/* $Id: Win32kCC.rc,v 1.5.2.1 2001-02-16 23:20:30 bird Exp $
+/* $Id: Win32kCC.rc,v 1.5.2.2 2001-02-17 08:57:51 bird Exp $
  *
  * Resource File for Win32k Control Center.
@@ -22 +22 @@
     IDS_ERR_DIALOGLOAD,         "Failed to load dialog.\rdialogid = %d\rlasterr = 0x%x\rmsg = %s"
     IDS_ERR_MALLOC_FAILED,      "Malloc failed. (file %s; line %d; function %s)"
-    IDS_ERR_SET_INSTACEDATA,    "Call to WinSetWindowPtr failed.\rlasterror = %d\rmsg = %s"
+    IDS_ERR_SET_INSTANCEDATA,   "Call to WinSetWindowPtr failed.\rlasterror = %d\rmsg = %s"
+    IDS_ERR_ADD_NTBK_PAGE_LOAD, "Error! Failed to Load page dialog, id = %d.\rlasterror = %d\rmsg = %s"
+    IDS_ERR_ADD_NTBK_PAGE_INSERT,"Error! Failed to insert page notebook page, id = %d.\rlasterror = %d\rmsg = %s"
+    IDS_ERR_ADD_NTBK_PAGE_SET,  "Error! Failed to set page hwnd, id = %d.\rlasterror = %d\rmsg = %s"
     IDS_ERR_WIN32K_NOT_LOADED,  "Win32k.sys is not loaded.\rTo fix it you'll have to add it to your config.sys. (see the Odin32 readme.txt for more details.)"
     IDS_ERR_WIN32K_OPEN_FAILED, "Failed to open Win32k.sys. (rc=0x%x)"
@@ -36 +39 @@
     IDS_MALLOC_FAILED,          "Error! malloc or calloc failed to allocate %d bytes of memory."
     IDS_FWRITE_FAILED,          "Error! failed to write to file %s."
+    IDS_ERR_FAILED_TO_LOAD_DLGT,"Error! Failed to load dialog template id=%d, rc=%d"
+    IDS_ERR_FAILED_NTBK_BUTTONS, "Error! Failed to add notebook buttons.\rlasterr = %d\rmsg = %s"
+    IDS_ERR_ASSERT,             "Assertion Failed. %s(%d), %s"
 END
 
@@ -48 +54 @@
 
 
+/*
+ * Put these here as DlgEdit messes up the flags.
+ */
+DLGTEMPLATE DL_WIN32KCC LOADONCALL MOVEABLE DISCARDABLE
+BEGIN
+    DIALOG  "Win32k Control Center", DL_WIN32KCC, 0, 0, 322, 220, WS_VISIBLE,
+            FCF_SYSMENU | FCF_TITLEBAR
+    BEGIN
+        NOTEBOOK        DL_WIN32KCC_NTBK, 6, 24, 310, 196,
+                        BKS_BACKPAGESTR |
+                        BKS_TABTEXTCENTER |
+                        BKS_TABBEDDIALOG |
+                        WS_GROUP
+        DEFPUSHBUTTON   "~Refresh", PB_REFRESH, 6, 4, 40, 14
+        PUSHBUTTON      "~Apply", PB_APPLY, 49, 4, 40, 14
+        PUSHBUTTON      "Update Config.sys", PB_UPD_CONFIGSYS, 92, 4, 100,
+                        14
+        PUSHBUTTON      "~Close", DID_OK, 195, 4, 40, 14
+    END
+END
+
+DLGTEMPLATE DL_WIN32KCC_OLD LOADONCALL MOVEABLE DISCARDABLE
+BEGIN
+    DIALOG  "Win32k Control Center", DL_WIN32KCC_OLD, 0, 0, 322, 220,
+            WS_VISIBLE, FCF_SYSMENU | FCF_TITLEBAR
+    BEGIN
+        NOTEBOOK        DL_WIN32KCC_NTBK, 6, 24, 310, 196, BKS_BACKPAGESTR |
+                        BKS_TABTEXTCENTER | BKS_SOLIDBIND |
+                        WS_GROUP
+        DEFPUSHBUTTON   "~Refresh", PB_REFRESH, 6, 4, 40, 14
+        PUSHBUTTON      "~Apply", PB_APPLY, 49, 4, 40, 14
+        PUSHBUTTON      "Update Config.sys", PB_UPD_CONFIGSYS, 92, 4, 100,
+                        14
+        PUSHBUTTON      "~Close", DID_OK, 195, 4, 40, 14
+    END
+END
+
+/*
+ * Redefine ID to prevent duplicate IDs.
+ */
+#undef DL_WIN32KCC
+#undef DL_WIN32KCC_OLD
+#define DL_WIN32KCC             61010
+#define DL_WIN32KCC_OLD         61011
+
 RCINCLUDE "Win32kCC.dlg"
+