Changeset 157 for trunk/dll/comp.c

Timestamp:

May 26, 2005, 4:18:54 AM (20 years ago)

Author:

root

Message:

Rework for CNRITEM.szSubject
Rework with ULONGLONG

File:

• trunk/dll/comp.c (modified) (13 diffs)

trunk/dll/comp.c

@@ -7 +7 @@
 
   Copyright (c) 1993-02 M. Kimes
-  Copyright (c) 2003, 2005 Steven H.Levine
+  Copyright (c) 2003, 2005 Steven H. Levine
 
   16 Oct 02 MK Baseline
@@ -13 +13 @@
   01 Aug 04 SHL Rework lstrip/rstrip usage
   24 May 05 SHL Rework Win_Error usage
+  24 May 05 SHL Rework for CNRITEM.szSubject
+  25 May 05 SHL Rework with ULONGLONG
 
 ***********************************************************************/
@@ -19 +21 @@
 #define INCL_WIN
 #define INCL_GPI
-
+#define INCL_LONGLONG
 #include <os2.h>
+
 #include <stdio.h>
 #include <stdlib.h>
@@ -27 +30 @@
 #include <share.h>
 #include <io.h>
+
 #include "fm3dll.h"
 #include "fm3dlg.h"
@@ -44 +48 @@
 
 
-void SnapShot (char *path,FILE *fp,BOOL recurse) {
-
+void SnapShot (char *path,FILE *fp,BOOL recurse)
+{
   FILEFINDBUF4 *fb;
   char         *mask,*enddir;
@@ -472 +476 @@
                 pciO->cbFile     = pci->cbFile;
                 pciO->easize     = pci->easize;
-                *pciO->subject   = 0;
+                *pciO->szSubject = 0;
                 *pci->szFileName = 0;
                 pci->pszFileName = pci->szFileName;
@@ -543 +547 @@
                 pciO->cbFile     = pci->cbFile;
                 pciO->easize     = pci->easize;
-                *pci->subject    = 0;
+                *pci->szSubject  = 0;
                 pci->flags       = CNRITEM_EXISTS;
                 WinSendMsg(hwndCnrS,CM_INVALIDATERECORD,MPFROMP(&pci),
@@ -999 +1003 @@
           pcir->rc.pszIcon = pcir->pszFileName;
           pcir->rc.hptrIcon = (HPOINTER)0;
-          pcir->pszSubject = pcir->subject;
-          pcir->pszLongname = pcir->Longname;
+          pcir->pszSubject = pcir->szSubject;
+          pcir->pszLongname = pcir->szLongname;
           pcir->pszDispAttr = pcir->szDispAttr;
           pcil->hwndCnr = hwndLeft;
@@ -1007 +1011 @@
           pcil->rc.hptrIcon = (HPOINTER)0;
           pcil->pszDispAttr = pcil->szDispAttr;
-          pcil->pszSubject = pcil->subject;
-          pcil->pszLongname = pcil->Longname;
+          pcil->pszSubject = pcil->szSubject;
+          pcil->pszLongname = pcil->szLongname;
           if((filesl && filesl[l]) && (filesr && filesr[r])) {
             x = stricmp(filesl[l]->fname,filesr[r]->fname);
@@ -1015 +1019 @@
                       (cmp->leftdir[strlen(cmp->leftdir) - 1] == '\\') ?
                       NullStr : "\\",filesl[l]->fname);
-//              pcil->rc.hptrIcon    = hptrFile;
+              // pcil->rc.hptrIcon    = hptrFile;
               pcil->pszFileName    = pcil->szFileName + lenl;
               pcil->attrFile       = filesl[l]->attrFile;
@@ -1084 +1088 @@
               pcil->flags |= CNRITEM_EXISTS;
               pcir->flags |= CNRITEM_EXISTS;
-              cl = pcil->subject;
+              cl = pcil->szSubject;
               if(pcil->cbFile + pcil->easize >
                  pcir->cbFile + pcir->easize) {
@@ -1113 +1117 @@
                 pcil->flags |= CNRITEM_NEWER;
                 pcir->flags |= CNRITEM_OLDER;
-                if(cl != pcil->subject) {
+                if(cl != pcil->szSubject) {
                   strcpy(cl,", ");
                   cl += 2;
@@ -1135 +1139 @@
                 pcil->flags |= CNRITEM_OLDER;
                 pcir->flags |= CNRITEM_NEWER;
-                if(cl != pcil->subject) {
+                if(cl != pcil->szSubject) {
                   strcpy(cl,", ");
                   cl += 2;