Changeset 297 for branches/branch-1-0/src/helpers/except.c

Timestamp:

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

Author:

pr

Message:

Update functions using exception handlers to force non-register variables

File:

• branches/branch-1-0/src/helpers/except.c (modified) (5 diffs)

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;