Changeset 93

Timestamp:

Aug 3, 2001, 8:52:44 PM (24 years ago)

Author:

umoeller

Message:

Misc changes

Location:

trunk

Files:

• include/helpers/dosh.h (modified) (2 diffs)
• include/helpers/gpih.h (modified) (1 diff)
• src/helpers/apmh.c (modified) (1 diff)
• src/helpers/memdebug.c (modified) (1 diff)
• src/helpers/timer.c (modified) (10 diffs)

trunk/include/helpers/dosh.h

@@ -725 +725 @@
 
         // New Executable (NE) header, if ulExeFormat == EXEFORMAT_NE
+#ifndef __STRIP_DOWN_EXECUTABLE__       // for mini stubs in warpin, to reduce code size
         PNEHEADER           pNEHeader;
         ULONG               cbNEHeader;
+#endif
 
         // Linear Executable (LX) header, if ulExeFormat == EXEFORMAT_LX
@@ -733 +735 @@
 
         // Portable Executable (PE) header, if ulExeFormat == EXEFORMAT_PE
+#ifndef __STRIP_DOWN_EXECUTABLE__       // for mini stubs in warpin, to reduce code size
         PPEHEADER           pPEHeader;
         ULONG               cbPEHeader;
-
+#endif
         // module analysis (always set):
         ULONG               ulExeFormat;

trunk/include/helpers/gpih.h

@@ -78 +78 @@
     #define RGBCOL_DARKYELLOW       0x00808000
     #define RGBCOL_DARKGRAY         0x00808080
+
+    /*
+     *@@ GET_BLUE:
+     *      gets the BLUE (first) byte from a
+     *      LONG RGB value.
+     *
+     *@@added V0.9.14 (2001-08-03) [umoeller]
+     */
+
+    #define GET_BLUE(lcol)  *( ((PBYTE)(&(lcol))) )
+
+    /*
+     *@@ GET_GREEN:
+     *      gets the GREEN (second) byte from a
+     *      LONG RGB value.
+     *
+     *@@added V0.9.14 (2001-08-03) [umoeller]
+     */
+
+    #define GET_GREEN(lcol) *( ((PBYTE)(&(lcol))) + 1 )
+
+    /*
+     *@@ GET_RED:
+     *      gets the RED (third) byte from a
+     *      LONG RGB value.
+     *
+     *@@added V0.9.14 (2001-08-03) [umoeller]
+     */
+
+    #define GET_RED(lcol)   *( ((PBYTE)(&(lcol))) + 2 )
+
+    /*
+     *@@ MAKE_RGB:
+     *      composes a LONG color value from
+     *      three BYTE values for red, green,
+     *      and blue.
+     *
+     *@@added V0.9.14 (2001-08-03) [umoeller]
+     */
+
+    #define MAKE_RGB(r, g, b) (LONG)((BYTE)(b)) + (((LONG)((BYTE)(g))) << 8) + (((LONG)((BYTE)(r))) << 16)
 
     VOID XWPENTRY gpihManipulateRGB(PLONG plColor, double dFactor);

trunk/src/helpers/apmh.c

@@ -15 +15 @@
  *            numbering.
  *
- *@@header "helpers\apm.h"
+ *@@header "helpers\apmh.h"
  *@@added V0.9.14 (2001-08-01) [umoeller]
  */

trunk/src/helpers/memdebug.c

@@ -91 +91 @@
 
 /*
- *      Copyright (C) 2000 Ulrich M”ller.
+ *      Copyright (C) 2000-2001 Ulrich M”ller.
  *      This program is part of the XWorkplace package.
  *      This program is free software; you can redistribute it and/or modify

trunk/src/helpers/timer.c

@@ -250 +250 @@
     PLINKLIST pllXTimers = (PLINKLIST)pSet->pvllXTimers;
     ULONG   cTimers = lstCountItems(pllXTimers);
+
+    #ifdef DEBUG_XTIMERS
+        _Pmpf((__FUNCTION__ ": entering"));
+    #endif
+
     if (!cTimers)
     {
@@ -278 +283 @@
             // only one timer:
             // that's easy
+            #ifdef DEBUG_XTIMERS
+                _Pmpf(("  got 1 timer"));
+            #endif
+
             pSet->ulPMTimeout = pTimer1->ulTimeout;
         }
@@ -285 +294 @@
             // find the greatest common denominator
             PXTIMER pTimer2 = (PXTIMER)pNode->pNext->pItemData;
+            #ifdef DEBUG_XTIMERS
+                _Pmpf(("  got 2 timers"));
+            #endif
 
             pSet->ulPMTimeout = mathGCD(pTimer1->ulTimeout,
@@ -297 +309 @@
                     i = 0;
 
-            // _Pmpf(("Recalculating, got %d timers", cTimers));
+            #ifdef DEBUG_XTIMERS
+                _Pmpf(("  got %d timers", cTimers));
+            #endif
 
             // fill an array of integers with the
@@ -305 +319 @@
                 pTimer1 = (PXTIMER)pNode->pItemData;
 
-                // _Pmpf(("  timeout %d is %d", i, pTimer1->ulTimeout));
+                #ifdef DEBUG_XTIMERS
+                    _Pmpf(("    timeout %d is %d", i, pTimer1->ulTimeout));
+                #endif
 
                 paInts[i++] = pTimer1->ulTimeout;
@@ -314 +330 @@
             pSet->ulPMTimeout = mathGCDMulti(paInts,
                                              cTimers);
-            // _Pmpf(("--> GCD is %d", pSet->ulPMTimeout));
-        }
+        }
+
+        #ifdef DEBUG_XTIMERS
+            _Pmpf(("--> GCD is %d", pSet->ulPMTimeout));
+        #endif
 
         if (    (!pSet->idPMTimerRunning)       // timer not running?
              || (pSet->ulPMTimeout != ulOldPMTimeout) // timeout changed?
            )
+        {
             // start or restart PM timer
             pSet->idPMTimerRunning = WinStartTimer(pSet->hab,
@@ -325 +345 @@
                                                    pSet->idPMTimer,
                                                    pSet->ulPMTimeout);
+        }
     }
 }
@@ -434 +455 @@
  *@@changed V0.9.12 (2001-05-24) [umoeller]: fixed crash if this got called during tmrTimerTick
  *@@changed V0.9.14 (2001-08-01) [umoeller]: fixed mem overwrite which might have caused crashes if this got called during tmrTimerTick
+ *@@changed V0.9.14 (2001-08-03) [umoeller]: fixed "half frequency" regression caused by frequency optimizations
  */
 
@@ -475 +497 @@
                                     &ulTimeNow, sizeof(ulTimeNow));
 
+                    #ifdef DEBUG_XTIMERS
+                        _Pmpf((__FUNCTION__ ": ulTimeNow = %d", ulTimeNow));
+                    #endif
+
                     while (pTimerNode)
                     {
@@ -484 +510 @@
                         PXTIMER pTimer = (PXTIMER)pTimerNode->pItemData;
 
+                        #ifdef DEBUG_XTIMERS
+                            _Pmpf(("   timer %d: ulNextFire = %d",
+                                    lstIndexFromItem(pllXTimers, pTimer),
+                                    pTimer->ulNextFire));
+                        #endif
+
                         if (    (pTimer)
-                             && (pTimer->ulNextFire < ulTimeNow)
+                             // && (pTimer->ulNextFire < ulTimeNow)
+                                // V0.9.14 (2001-08-01) [umoeller]
+                                // use <= because otherwise we'll get
+                                // only half the frequency...
+                                // we get here frequently where the
+                                // two values are EXACTLY equal due
+                                // to the above optimization (DosQuerySysInfo
+                                // called once only for the entire loop)
+                             && (pTimer->ulNextFire <= ulTimeNow)
                            )
                         {
                             // this timer has elapsed:
                             // fire!
+
+                            #ifdef DEBUG_XTIMERS
+                                _Pmpf(("   --> fire!"));
+                            #endif
+
                             if (WinIsWindow(pSet->hab,
                                             pTimer->hwndTarget))