Changeset 1220 for trunk/dll

Timestamp:

Sep 14, 2008, 1:09:45 AM (17 years ago)

Author:

John Small

Message:

Ticket 187: Moved typedef's and some #define's from fm3dll.h

Location:

trunk/dll

Files:

• arccnrs.c (modified) (3 diffs)
• arccnrs.h (modified) (1 diff)
• archive.c (modified) (1 diff)
• assoc.c (modified) (1 diff)
• attribs.c (modified) (2 diffs)
• autoview.c (modified) (1 diff)
• avl.c (modified) (1 diff)
• avl.h (modified) (1 diff)
• avv.c (modified) (2 diffs)

trunk/dll/arccnrs.c

@@ -80 +80 @@
 
 #include "fm3dll.h"
+#include "fm3dll2.h"                    // #define's for UM_*, control id's, etc.
+#include "arccnrs.h"
+#include "makelist.h"                   // Typedef
+#include "colors.h"                     // Typedef
 #include "mainwnd2.h"                   // Data declaration(s)
 #include "grep.h"                       // Data declaration(s)
@@ -85 +89 @@
 #include "info.h"                       // Data declaration(s)
 #include "init.h"                       // Data declaration(s)
-#include "arccnrs.h"                    // StartArcCnr
 #include "fm3dlg.h"
 #include "fm3str.h"
@@ -133 +136 @@
 #include "dirs.h"                       // save_dir2
 #include "fortify.h"
+
+#define ARCFLAGS_REALDIR    0x00000001
+#define ARCFLAGS_PSEUDODIR  0x00000002
+#define CON_COLS                6
+#define EXTRA_ARCRECORD_BYTES   (sizeof(ARCITEM) - sizeof(MINIRECORDCORE))
+
 
 #pragma data_seg(DATA1)

trunk/dll/arccnrs.h

@@ -27 +27 @@
 #include "avl.h"                        // ARC_TYPE
 
+#pragma pack(1)
+
+typedef struct _ARCITEM
+{                               // ARCHIVE CONTAINER RECORD STRUCTURE
+  MINIRECORDCORE rc;            // Base information
+  HWND hwndCnr;                 /* Container holding this record */
+  PSZ pszFileName;              // Points to full path name or NullStr
+  PSZ pszDisplayName;           // Points to displayable part of path name  - used by CFA_STRING
+  CHAR szDate[40];              // File's assembled date
+  PSZ pszDate;                  // Pointer to date
+  CDATE date;                   // if we know date format
+  CTIME time;                   // if we know time format
+  ULONGLONG cbFile;             // File's original size
+  ULONGLONG cbComp;             // File's compressed size
+  ULONG flags;
+}
+ARCITEM, *PARCITEM;
+
+#pragma pack()
+
 MRESULT EXPENTRY ArcClientWndProc(HWND hwnd, ULONG msg, MPARAM mp1,
                                   MPARAM mp2);

trunk/dll/archive.c

@@ -24 +24 @@
 
 #include "fm3dll.h"
+#include "fm3dll2.h"                    // #define's for UM_*, control id's, etc.
 #include "notebook.h"                   // Data declaration(s)
 #include "fm3dlg.h"

trunk/dll/assoc.c

@@ -34 +34 @@
 
 #include "fm3dll.h"
+#include "fm3dll2.h"                    // #define's for UM_*, control id's, etc.
 #include "arccnrs.h"                    // Data declaration(s)
 #include "notebook.h"                   // Data declaration(s)

trunk/dll/attribs.c

@@ -16 +16 @@
 
 #include <ctype.h>
+#include <time.h>
 
 #define INCL_DOS
@@ -21 +22 @@
 
 #include "fm3dll.h"
+#include "fm3dll2.h"                    // #define's for UM_*, control id's, etc.
 #include "notebook.h"                   // Data declaration(s)
 #include "info.h"                       // Data declaration(s)

trunk/dll/autoview.c

@@ -38 +38 @@
 
 #include "fm3dll.h"
+#include "fm3dll2.h"                    // #define's for UM_*, control id's, etc.
 #include "killproc.h"                   // Data declaration(s)
 #include "notebook.h"                   // Data declaration(s)

trunk/dll/avl.c

@@ -47 +47 @@
 
 #include "fm3dll.h"
+#include "fm3dll2.h"                    // #define's for UM_*, control id's, etc.
 #include "notebook.h"                   // Data declaration(s)
 #include "init.h"                       // Data declaration(s)

trunk/dll/avl.h

@@ -82 +82 @@
 ARCDUMP;
 
+#define LINES_PER_ARCSIG        21      // Lines in each archiver.bb2 definition
+
 ARC_TYPE *quick_find_type(CHAR * filespec, ARC_TYPE * topsig);
 ARC_TYPE *find_type(CHAR * filespec, ARC_TYPE * topsig);

trunk/dll/avv.c

@@ -32 +32 @@
 #include <stdlib.h>
 #include <string.h>
+#include <time.h>
 
 #define INCL_DOS
@@ -38 +39 @@
 
 #include "fm3dll.h"
+#include "fm3dll2.h"                    // #define's for UM_*, control id's, etc.
 #include "arccnrs.h"                    // Data declaration(s)
 #include "notebook.h"                   // Data declaration(s)