Changeset 297 for branches/branch-1-0/src/helpers

Timestamp:

Oct 9, 2005, 3:11:51 PM (20 years ago)

Author:

pr

Message:

Update functions using exception handlers to force non-register variables

Location:

branches/branch-1-0/src/helpers

Files:

• apps.c (modified) (2 diffs)
• cctl_tooltip.c (modified) (2 diffs)
• dialog.c (modified) (5 diffs)
• except.c (modified) (5 diffs)
• memdebug.c (modified) (7 diffs)
• memdebug_win.c (modified) (9 diffs)
• nlscache.c (modified) (3 diffs)
• timer.c (modified) (6 diffs)
• wphandle.c (modified) (2 diffs)

branches/branch-1-0/src/helpers/apps.c

@@ -15 +15 @@
 
 /*
- *      Copyright (C) 1997-2002 Ulrich M”ller.
+ *      Copyright (C) 1997-2005 Ulrich M”ller.
  *      This file is part of the "XWorkplace helpers" source package.
  *      This is free software; you can redistribute it and/or modify
@@ -1561 +1561 @@
 {
     APIRET      arc = NO_ERROR;
-
-    BOOL        fCrit = FALSE,
-                fResetDir = FALSE;
+    volatile BOOL        fCrit = FALSE;         // XWP V1.0.4 (2005-10-09) [pr]
+    volatile BOOL        fResetDir = FALSE;
     CHAR        szCurrentDir[CCHMAXPATH];
-
     ULONG       sid,
                 pid;
     STARTDATA   SData;
+
     SData.Length  = sizeof(STARTDATA);
     SData.Related = SSF_RELATED_INDEPENDENT; // SSF_RELATED_CHILD;

branches/branch-1-0/src/helpers/cctl_tooltip.c

@@ -15 +15 @@
 
 /*
- *      Copyright (C) 1997-2002 Ulrich M”ller.
+ *      Copyright (C) 1997-2005 Ulrich M”ller.
  *      This file is part of the "XWorkplace helpers" source package.
  *      This is free software; you can redistribute it and/or modify
@@ -1967 +1967 @@
         }
     }
-    CATCH(excpt1) {} END_CATCH();
+    CATCH(excpt1)
+    {
+        mrc = 0;        // XWP V1.0.4 (2005-10-09) [pr]
+    }
+    END_CATCH();
 
     return mrc;
 }
 
-

branches/branch-1-0/src/helpers/dialog.c

@@ -38 +38 @@
 
 /*
- *      Copyright (C) 2001-2002 Ulrich M”ller.
+ *      Copyright (C) 2001-2005 Ulrich M”ller.
  *      This file is part of the "XWorkplace helpers" source package.
  *      This is free software; you can redistribute it and/or modify
@@ -295 +295 @@
  *      the control _sizes_, and everything is layed out automatically.
  *      You may even have the formatter compute the sizes automatically
- *      based on the control classes and values; it is possible to
- *      create dialogs without specifying a single size also.
+ *      based on the control classes and values (strings); it is possible
+ *      to create dialogs without specifying a single size also.
  *
  *      There are several tricks to how this works.
@@ -313 +313 @@
  *          (which again goes into ProcessRow and ProcessColumn).
  *          There is no limit to how deep tables may nest, except
- *          the stack size of the current thread. ;-)
+ *          for the stack size of the current thread, of course.
  *
  *      3)  This whole recursive iteration is performed several times.
@@ -1299 +1299 @@
     APIRET      arc = NO_ERROR;
 
-    PCSZ        pcszClass = NULL;
-    PCSZ        pcszText = NULL;
-    ULONG       flStyle = 0;
-    LHANDLE     lHandleSet = NULLHANDLE;
-    ULONG       flOld = 0;
+    volatile PCSZ        pcszClass = NULL; // XWP V1.0.4 (2005-10-09) [pr]
+    volatile PCSZ        pcszText = NULL;
+    volatile ULONG       flStyle = 0;
+    volatile LHANDLE     lHandleSet = NULLHANDLE;
+    volatile ULONG       flOld = 0;
 
     if (pColumn->pNestedTable)
@@ -3084 +3084 @@
     APIRET      arc = NO_ERROR;
 
-    HPOINTER    hptrOld = winhSetWaitPointer();     // V1.0.0 (2002-08-21) [umoeller]
+    volatile HPOINTER hptrOld = winhSetWaitPointer(); // XWP V1.0.4 (2005-10-09) [pr]
 
     TRY_LOUD(excpt1)

branches/branch-1-0/src/helpers/except.c

@@ -128 +128 @@
  +          int your_func(int)
  +          {
- +              BOOL    fSemOwned = FALSE;
+ +              volatile BOOL    fSemOwned = FALSE;
  +
  +              TRY_QUIET(excpt1)           // or TRY_LOUD
@@ -188 +188 @@
 
 /*
- *      This file Copyright (C) 1992-99 Ulrich M”ller,
- *                                      Monte Copeland,
- *                                      Roman Stangl,
- *                                      Kim Rasmussen,
- *                                      Marc Fiammante,
- *                                      John Currier,
- *                                      Anthony Cruise.
+ *      This file Copyright (C) 1992-2005 Ulrich M”ller,
+ *                                        Monte Copeland,
+ *                                        Roman Stangl,
+ *                                        Kim Rasmussen,
+ *                                        Marc Fiammante,
+ *                                        John Currier,
+ *                                        Anthony Cruise.
  *      This file is part of the "XWorkplace helpers" source package.
  *      This is free software; you can redistribute it and/or modify
@@ -788 +788 @@
  *      writes no trap logs).
  *
+ *      Registering hooks affects all threads that use
+ *      the exception handlers.
+ *
  *      The hooks are as follows:
  *
@@ -914 +917 @@
      */
 
-    if (pReportRec->fHandlerFlags & EH_EXIT_UNWIND)
-       return XCPT_CONTINUE_SEARCH;
-    if (pReportRec->fHandlerFlags & EH_UNWINDING)
-       return XCPT_CONTINUE_SEARCH;
-    if (pReportRec->fHandlerFlags & EH_NESTED_CALL)
+    // XWP V1.0.4 (2005-10-09) [pr]: Optimize
+    if (pReportRec->fHandlerFlags & (EH_EXIT_UNWIND | EH_UNWINDING | EH_NESTED_CALL))
        return XCPT_CONTINUE_SEARCH;
 
@@ -1010 +1010 @@
                               PVOID pv)
 {
-    if (pReportRec->fHandlerFlags & EH_EXIT_UNWIND)
-       return XCPT_CONTINUE_SEARCH;
-    if (pReportRec->fHandlerFlags & EH_UNWINDING)
-       return XCPT_CONTINUE_SEARCH;
-    if (pReportRec->fHandlerFlags & EH_NESTED_CALL)
+    // XWP V1.0.4 (2005-10-09) [pr]: Optimize
+    if (pReportRec->fHandlerFlags & (EH_EXIT_UNWIND | EH_UNWINDING | EH_NESTED_CALL))
        return XCPT_CONTINUE_SEARCH;
 

branches/branch-1-0/src/helpers/memdebug.c

@@ -199 +199 @@
     }
     else
-        return (!DosRequestMutexSem(G_hmtxMallocList,
-                                    SEM_INDEFINITE_WAIT));
-
-    return (FALSE);
+        return !DosRequestMutexSem(G_hmtxMallocList,
+                                   SEM_INDEFINITE_WAIT);
+
+    return FALSE;
 }
 
@@ -246 +246 @@
 STATIC PHEAPITEM FindHeapItem(void *p)
 {
-    return ((PHEAPITEM)treeFind(G_pHeapItemsRoot,
-                                (ULONG)p,
-                                treeCompareKeys));
+    return (PHEAPITEM)treeFind(G_pHeapItemsRoot,
+                               (ULONG)p,
+                               treeCompareKeys);
 }
 
@@ -417 +417 @@
         }
 
-    return (prc);
+    return prc;
 }
 
@@ -440 +440 @@
                          pcszFunction);
     memset(p, 0, num * stSize);
-    return (p);
+    return p;
 }
 
@@ -547 +547 @@
         // p == NULL: this is valid, use malloc() instead
         // V0.9.12 (2001-05-21) [umoeller]
-        return (memdMalloc(stSize, pcszSourceFile, ulLine, pcszFunction));
+        return memdMalloc(stSize, pcszSourceFile, ulLine, pcszFunction);
 
     if (memdLock())
@@ -665 +665 @@
     }
 
-    return (prc);
+    return prc;
 }
 
@@ -727 +727 @@
     }
 
-    return (ulItemsReleased);
+    return ulItemsReleased;
 }
 

branches/branch-1-0/src/helpers/memdebug_win.c

@@ -12 +12 @@
 
 /*
- *      Copyright (C) 2000 Ulrich M”ller.
+ *      Copyright (C) 2000-2005 Ulrich M”ller.
  *      This program is part of the XWorkplace package.
  *      This program is free software; you can redistribute it and/or modify
@@ -151 +151 @@
                 ulTotalAllocated += Size;
         }
-        return (0);
+        return 0;
     }
 
@@ -194 +194 @@
             }
             else
-                return (1);     // stop
+                return 1;     // stop
         }
 
-        return (0);
+        return 0;
     }
 
@@ -285 +285 @@
 
     ULONG       cHeapItems = 0;
-    BOOL        fLocked = FALSE;
+    volatile BOOL       fLocked = FALSE; // XWP V1.0.4 (2005-10-09) [pr]
 
     TRY_LOUD(excpt1)
@@ -416 +416 @@
     if ((pmrc1) && (pmrc2))
         if (pmrc1->ulIndex < pmrc2->ulIndex)
-            return (-1);
+            return -1;
         else if (pmrc1->ulIndex > pmrc2->ulIndex)
-            return (1);
-
-    return (0);
+            return 1;
+
+    return 0;
 }
 
@@ -439 +439 @@
                                       0))
             {
-                case WCS_LT: return (-1);
-                case WCS_GT: return (1);
+                case WCS_LT: return -1;
+                case WCS_GT: return 1;
                 default:    // equal
                     if (pmrc1->ulLine < pmrc2->ulLine)
-                        return (-1);
+                        return -1;
                     else if (pmrc1->ulLine > pmrc2->ulLine)
-                        return (1);
+                        return 1;
 
             }
 
-    return (0);
+    return 0;
 }
 
@@ -464 +464 @@
     {
         if (pmrc1->ulSize > pmrc2->ulSize)
-            return (1);
+            return 1;
         else if (pmrc1->ulSize < pmrc2->ulSize)
-            return (-1);
+            return -1;
     }
 
-    return (0);
+    return 0;
 }
 
@@ -484 +484 @@
     {
         if (pmrc1->ulAddress > pmrc2->ulAddress)
-            return (1);
+            return 1;
         else if (pmrc1->ulAddress < pmrc2->ulAddress)
-            return (-1);
+            return -1;
     }
 
-    return (0);
+    return 0;
 }
 
@@ -843 +843 @@
     i++;
 }
-#endif
-
+#endif // __XWPMEMDEBUG__
+

branches/branch-1-0/src/helpers/nlscache.c

@@ -19 +19 @@
 
 /*
- *      Copyright (C) 2001-2002 Ulrich M”ller.
+ *      Copyright (C) 2001-2005 Ulrich M”ller.
  *      This file is part of the "XWorkplace helpers" source package.
  *      This is free software; you can redistribute it and/or modify
@@ -279 +279 @@
 PCSZ nlsGetString(ULONG ulStringID)
 {
-    BOOL    fLocked = FALSE;
+    volatile BOOL    fLocked = FALSE; // XWP V1.0.4 (2005-10-09) [pr]
     PSZ     pszReturn = "Error";
 
@@ -331 +331 @@
             pszReturn = "Cannot get strings lock.";
     }
-    CATCH(excpt1) {} END_CATCH();
+    CATCH(excpt1)
+    {
+        pszReturn = "Error";
+    }
+    END_CATCH();
 
     if (fLocked)

branches/branch-1-0/src/helpers/timer.c

@@ -68 +68 @@
 
 /*
- *      Copyright (C) 2000-2001 Ulrich M”ller.
+ *      Copyright (C) 2000-2005 Ulrich M”ller.
  *      This file is part of the "XWorkplace helpers" source package.
  *      This is free software; you can redistribute it and/or modify
@@ -162 +162 @@
 {
     if (!G_hmtxTimers)
-        return (!DosCreateMutexSem(NULL,
-                                   &G_hmtxTimers,
-                                   0,
-                                   TRUE));      // request!
-    else
-        return !DosRequestMutexSem(G_hmtxTimers, SEM_INDEFINITE_WAIT);
+        return !DosCreateMutexSem(NULL,
+                                  &G_hmtxTimers,
+                                  0,
+                                  TRUE);      // request!
+
+    return !DosRequestMutexSem(G_hmtxTimers, SEM_INDEFINITE_WAIT);
 }
 
@@ -207 +207 @@
                )
             {
-                return (pTimer);
+                return pTimer;
             }
 
@@ -394 +394 @@
     }
 
-    return (pSet);
+    return pSet;
 }
 
@@ -468 +468 @@
 VOID tmrTimerTick(PXTIMERSET pSet)      // in: timer set (from tmrCreateSet)
 {
-    BOOL fLocked = FALSE;
+    volatile BOOL fLocked = FALSE; // XWP V1.0.4 (2005-10-09) [pr]
 
     TRY_LOUD(excpt1)
@@ -733 +733 @@
     }
 
-    return (usrc);
+    return usrc;
 }
 

branches/branch-1-0/src/helpers/wphandle.c

@@ -24 +24 @@
 
 /*
- *      This file Copyright (C) 1997-2001 Ulrich M”ller,
+ *      This file Copyright (C) 1997-2005 Ulrich M”ller,
  *      This file is part of the "XWorkplace helpers" source package.
  *      This is free software; you can redistribute it and/or modify
@@ -795 +795 @@
     APIRET      arc = NO_ERROR;
 
-    PSZ         pszActiveHandles = NULL;
-    HHANDLES    hHandles = NULLHANDLE;
+    volatile PSZ         pszActiveHandles = NULL; // XWP V1.0.4 (2005-10-09) [pr]
+    volatile HHANDLES    hHandles = NULLHANDLE;
 
     TRY_LOUD(excpt1)