Changeset 1851

Timestamp:

Aug 14, 2015, 11:29:17 PM (10 years ago)

Author:

Gregg Young

Message:

Improved pci checks

Location:

trunk/dll

Files:

• arccnrs.c (modified) (5 diffs)
• sortcnr.c (modified) (2 diffs)

trunk/dll/arccnrs.c

@@ -3075 +3075 @@
             empty = TRUE;
             pci = (PARCITEM) CurrentRecord(hwnd);
-            if (pci && strchr(pci->pszFileName, '.'))
+            if (pci && (INT) pci != -1 && strchr(pci->pszFileName, '.'))
               strcpy(dcd->mask.szMask, pci->pszFileName);
           }
@@ -3312 +3312 @@
             }
           }
-          if (pci) {
+          if (pci && (INT) pci != -1) {
             DrgFreeDraginfo(pDInfo);
             return MRFROM2SHORT(DOR_NODROP, 0);
@@ -3338 +3338 @@
           if (pcd) {
             pci = (PARCITEM) pcd->pRecord;
-            if (pci) {
+            if (pci && (INT) pci != -1) {
               if (pci->rc.flRecordAttr & CRA_SELECTED)
                 wasemphasized = TRUE;
@@ -3393 +3393 @@
           PARCITEM pci = (PARCITEM) mp2;
 
-          if (pci) {
+          if (pci && (INT) pci != -1) {
             WinSendMsg(hwnd, CM_SETRECORDEMPHASIS, MPFROMP(pci),
                        MPFROM2SHORT(TRUE, CRA_CURSORED));
@@ -3488 +3488 @@
           PARCITEM pci = (PARCITEM) ((PNOTIFYRECORDENTER) mp2)->pRecord;
 
-          if (pci) {
+          if (pci && (INT) pci != -1) {
 
             CHAR *s;

trunk/dll/sortcnr.c

@@ -28 +28 @@
 #include "sortcnr.h"
 #include "valid.h"                      // TestCDates
+#if 0
+#define  __PMPRINTF__
+#include "PMPRINTF.H"
+#endif
 
 static SHORT SortCnr(PMINIRECORDCORE p1, PMINIRECORDCORE p2, INT Sortflags);
@@ -62 +66 @@
   if (SortFlags & SORT_NOSORT)
     return 0;
+  if (!strcmp(pCI1->pszFileName, NullStr) || !strcmp(pCI2->pszFileName, NullStr)) {
+    return 0;
+  }
   if (SortFlags && pCI1->pszFileName + 3 && pCI2->pszFileName + 3) {
     if (SortFlags & SORT_DIRSFIRST) {