Changeset 297 for trunk/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:

trunk/src/helpers

Files:

• apps.c (modified) (2 diffs)
• cctl_tooltip.c (modified) (2 diffs)
• dialog.c (modified) (3 diffs)
• except.c (modified) (4 diffs)
• memdebug_win.c (modified) (3 diffs)
• mmpmh.c (modified) (4 diffs)
• nlscache.c (modified) (5 diffs)
• timer.c (modified) (2 diffs)
• wphandle.c (modified) (2 diffs)

trunk/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
@@ -1480 +1480 @@
 {
     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;

trunk/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
@@ -1962 +1962 @@
         }
     }
-    CATCH(excpt1) {} END_CATCH();
+    CATCH(excpt1)
+    {
+        mrc = 0;        // XWP V1.0.4 (2005-10-09) [pr]
+    }
+    END_CATCH();
 
     return mrc;
 }
 
-

trunk/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
@@ -1300 +1300 @@
     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)
@@ -3102 +3102 @@
     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)

trunk/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
@@ -917 +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;
 
@@ -1013 +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;
 

trunk/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
@@ -285 +285 @@
 
     ULONG       cHeapItems = 0;
-    BOOL        fLocked = FALSE;
+    volatile BOOL       fLocked = FALSE; // XWP V1.0.4 (2005-10-09) [pr]
 
     TRY_LOUD(excpt1)
@@ -843 +843 @@
     i++;
 }
-#endif
-
+#endif // __XWPMEMDEBUG__
+

trunk/src/helpers/mmpmh.c

@@ -19 +19 @@
 
 /*
- *      Copyright (C) 1997-2003 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
@@ -553 +553 @@
     APIRET  arc = NO_ERROR;
 
-    HDC     hdcMem = NULLHANDLE;
-    HPS     hpsMem = NULLHANDLE;
+    volatile HDC     hdcMem = NULLHANDLE; // XWP V1.0.4 (2005-10-09) [pr]
+    volatile HPS     hpsMem = NULLHANDLE;
 
     if (!G_fFuncsResolved)
@@ -724 +724 @@
     APIRET  arc = NO_ERROR;
 
-    PBYTE   pbBitmapBits = NULL;
-    HMMIO   hmmio = NULLHANDLE;
+    volatile PBYTE   pbBitmapBits = NULL; // XWP V1.0.4 (2005-10-09) [pr]
+    volatile HMMIO   hmmio = NULLHANDLE;
 
     if (    (!pcszFilename)
@@ -779 +779 @@
 }
 
-

trunk/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
@@ -258 +258 @@
                     ULONG cEntities)            // in: array item count of paEntities or 0
 {
-    BOOL    fLocked = FALSE;
+    volatile BOOL    fLocked = FALSE; // XWP V1.0.4 (2005-10-09) [pr]
 
     TRY_LOUD(excpt1)
@@ -342 +342 @@
 PCSZ nlsGetString(ULONG ulStringID)
 {
-    BOOL    fLocked = FALSE;
+    volatile BOOL    fLocked = FALSE; // XWP V1.0.4 (2005-10-09) [pr]
     PSZ     pszReturn = "Error";
 
@@ -394 +394 @@
             pszReturn = "Cannot get strings lock.";
     }
-    CATCH(excpt1) {} END_CATCH();
+    CATCH(excpt1)
+    {
+        pszReturn = "Error";
+    }
+    END_CATCH();
 
     if (fLocked)
@@ -402 +406 @@
 }
 
-

trunk/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
@@ -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)

trunk/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)