Changeset 224 for trunk/src/helpers/cctl_checkcnr.c

Timestamp:

Sep 9, 2002, 6:49:14 PM (23 years ago)

Author:

umoeller

Message:

Misc fixes.

File:

• trunk/src/helpers/cctl_checkcnr.c (modified) (4 diffs)

trunk/src/helpers/cctl_checkcnr.c

@@ -861 +861 @@
 
 /*
+ *@@ FINDCHECKRECORD:
+ *
+ *@@added V0.9.21 (2002-09-09) [umoeller]
+ */
+
+typedef struct _FINDCHECKRECORD
+{
+    ULONG               ulItemID;
+    PCHECKBOXRECORDCORE precFound;
+} FINDCHECKRECORD, *PFINDCHECKRECORD;
+
+/*
  *@@ fncbFindCheckRecord:
  *      helper callback for finding a checkbox
@@ -870 +882 @@
  *
  *@@added V0.9.0 (99-11-28) [umoeller]
- */
-
-STATIC ULONG EXPENTRY fncbFindCheckRecord(HWND hwndCnr,             // in: container
+ *@@changed V0.9.21 (2002-09-09) [umoeller]: adjusted for cnrhForAllRecords updates
+ */
+
+STATIC ULONG XWPENTRY fncbFindCheckRecord(HWND hwndCnr,             // in: container
                                           PRECORDCORE preccThis,    // in: current record (from cnrhForAllRecords)
-                                          ULONG ulItemID,           // in: item ID to find
-                                          ULONG ulppRecc)           // out: PRECORDCORE* if found
-{
-    ULONG   ulrc = 0;
-    PCHECKBOXRECORDCORE precc = (PCHECKBOXRECORDCORE)preccThis;
-    if (precc)
-    {
-        if (precc->ulItemID == ulItemID)
-        {
-            // found:
-            PCHECKBOXRECORDCORE *pprecc = (PCHECKBOXRECORDCORE*)ulppRecc;
-            // store
-            *pprecc = precc;
-            // and stop
-            ulrc = 1;
-        }
-    }
-
-    return ulrc;
+                                          ULONG ulUser)
+{
+    if (((PCHECKBOXRECORDCORE)preccThis)->ulItemID == ((PFINDCHECKRECORD)ulUser)->ulItemID)
+    {
+        // found: store found record
+        ((PFINDCHECKRECORD)ulUser)->precFound = (PCHECKBOXRECORDCORE)preccThis;
+        // and stop
+        return 1;
+    }
+
+    return 0;
 }
 
@@ -902 +907 @@
  *
  *@@added V0.9.1 (99-12-03) [umoeller]
+ *@@changed V0.9.21 (2002-09-09) [umoeller]: adjusted for cnrhForAllRecords updates
  */
 
@@ -907 +913 @@
                                        ULONG ulItemID)
 {
-    PCHECKBOXRECORDCORE precc = 0;
+    FINDCHECKRECORD fcr;
+
+    fcr.ulItemID = ulItemID;
+    fcr.precFound = NULL;
 
     cnrhForAllRecords(hwndCnr,
                       NULL,         // start with root
                       fncbFindCheckRecord,
-                      (ULONG)ulItemID,          // input
-                      (ULONG)&precc);
-
-    return precc;
+                      (ULONG)&fcr);
+
+    return fcr.precFound;
 }