Changeset 5051 for trunk/src/win32k/utils/Win32kCC.c

Timestamp:

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

Author:

bird

Message:

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

File:

• trunk/src/win32k/utils/Win32kCC.c (modified) (6 diffs)

trunk/src/win32k/utils/Win32kCC.c

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