Changeset 5283 for trunk/src/win32k/dev16

Timestamp:

Mar 2, 2001, 1:48:41 PM (25 years ago)

Author:

bird

Message:

Fixed CL compiler bugs.
And new toolkit boog.

Location:

trunk/src/win32k/dev16

Files:

• d16init.c (modified) (4 diffs)
• d16strat.c (modified) (2 diffs)

trunk/src/win32k/dev16/d16init.c

@@ -1 @@
-/* $Id: d16init.c,v 1.9 2000-12-11 06:53:48 bird Exp $
+/* $Id: d16init.c,v 1.10 2001-03-02 12:48:41 bird Exp $
  *
  * d16init - init routines for both drivers.
@@ -98 +98 @@
     USHORT          usAction = 0;
     NPSZ            npszErrMsg = NULL;
-    NPSZ            npszErrMsg2 = NULL;
+    const char *    npszErrMsg2 = NULL;
 
     /*
@@ -132 +132 @@
                     npszErrMsg = "Ring-0 initiation failed. rc=%x\n";
                     if (rc >= ERROR_D32_FIRST && rc <= ERROR_D32_LAST)
-                        npszErrMsg2 = GetErrorMsg(data.usRcInit32 + ERROR_PROB_SYM_D32_FIRST - ERROR_D32_FIRST);
+                        npszErrMsg2 = 
+                        GetErrorMsg(
+                        data.usRcInit32 
+                        + ERROR_PROB_SYM_D32_FIRST 
+                        - ERROR_D32_FIRST
+                        );
                 }
             }
@@ -289 +294 @@
     return rc;
 }
+

trunk/src/win32k/dev16/d16strat.c

@@ -1 @@
-/* $Id: d16strat.c,v 1.10 2000-09-04 16:40:48 bird Exp $
+/* $Id: d16strat.c,v 1.11 2001-03-02 12:48:41 bird Exp $
  *
  * d16strat.c - 16-bit strategy routine, device headers, device_helper (ptr)
@@ -39 +39 @@
 *   Global Variables                                                           *
 *******************************************************************************/
+extern DDHDR _far aDevHdrs[2]; 
 DDHDR aDevHdrs[2] = /* This is the first piece data in the driver!!!!!!! */
 {
     {
-        (unsigned long)(void _far *)(&aDevHdrs[1]), /* NextHeader */
+        &aDevHdrs[1], /* NextHeader */
         DEVLEV_3 | DEV_30 | DEV_CHAR_DEV,           /* SDevAtt */
         (unsigned short)(void _near *)strategyAsm0, /* StrategyEP */