Changeset 1179

Timestamp:

Sep 10, 2008, 11:54:09 PM (17 years ago)

Author:

John Small

Message:

Ticket 187: Draft 2: Move remaining function declarations

Location:

trunk/dll

Files:

• archive.c (modified) (1 diff)
• comp.c (modified) (2 diffs)
• eas.c (modified) (2 diffs)
• eas.h (modified) (1 diff)
• extract.c (modified) (2 diffs)
• fm2cmd.c (modified) (2 diffs)
• grep.c (modified) (2 diffs)
• key.c (modified) (2 diffs)
• key.h (modified) (1 diff)
• menu.c (modified) (1 diff)

trunk/dll/archive.c

@@ -23 +23 @@
 #define INCL_LONGLONG                   // dircnrs.h
 
+#include "fm3dll.h"
 #include "fm3dlg.h"
 #include "fm3str.h"
 #include "strutil.h"                    // GetPString
 #include "errutil.h"                    // Runtime_Error
-#include "fm3dll.h"
+#include "archive.h"
+#include "systemf.h"                    // ExecOnList
+#include "chklist.h"                    // PosOverOkay
+#include "getnames.h"                   // export_filename
+#include "misc.h"                       // PaintRecessedWindow
+#include "strips.h"                     // bstrip
 
 static PSZ pszSrcFile = __FILE__;

trunk/dll/comp.c

@@ -72 +72 @@
 #define INCL_LONGLONG
 
+#include "fm3dll.h"
 #include "fm3dlg.h"
 #include "fm3str.h"
@@ -81 +82 @@
 #include "tmrsvcs.h"                    // IsITimerExpired
 #include "comp.h"
-#include "misc.h"               // AddToListboxBottom, AdjustCnrColRO, AdjustCnrColVis, AdjustCnrColsForPref
+#include "misc.h"                       // AddToListboxBottom, AdjustCnrColRO, AdjustCnrColVis,
+                                        // AdjustCnrColsForPref, CurrentRecord,
                                         // AdjustDetailsSwitches, LoadDetailsSwitches, SetCnrCols
                                         // SetDetailsSwitches
-#include "select.h"                     // Deselect, InvertAll
+#include "select.h"                     // Deselect, Deselect, InvertAll
 #include "mkdir.h"                      // MassMkdir
 #include "valid.h"                      // TestCDates
 #include "walkem.h"                     // WalkTwoCmpDlgProc
-#include "fm3dll.h"
+#include "common.h"                     // DecrThreadUsage, IncrThreadUsage
+#include "defview.h"                    // DefaultViewKeys
+#include "draglist.h"                   // DoFileDrag
+#include "systemf.h"                    // ExecOnList
+#include "filter.h"                     // Filter
+#include "mainwnd.h"                    // GetNextWindowPos
+#include "shadow.h"                     // OpenObject
+#include "chklist.h"                    // PopupMenu
+#include "presparm.h"                   // SetPresParams
+#include "collect.h"                    // StartCollector
+#include "subj.h"                       // Subject
+#include "copyf.h"                      // docopyf
+#include "getnames.h"                   // export_filename
+#include "wrappers.h"                   // xDosFindNext
 #include "notebook.h"                   // External compare/dircompare
-
+#include "commafmt.h"                   // CommaFmtULL
 #include "fortify.h"                    // 06 May 08 SHL
 

trunk/dll/eas.c

@@ -35 +35 @@
 #define INCL_LONGLONG
 
+#include "fm3dll.h"
 #include "fm3dlg.h"
 #include "fm3str.h"
@@ -41 +42 @@
 #include "strutil.h"                    // GetPString
 #include "defview.h"                    // QuickView
-#include "fm3dll.h"
+#include "subj.h"                       // Subject
+#include "wrappers.h"                   // xDosSetPathInfo
 #include "eas.h"
+#include "strips.h"                     // bstrip
+#include "valid.h"                      // IsFile
+#include "misc.h"                       // PaintRecessedWindow
 #include "fortify.h"
 

trunk/dll/eas.h

@@ -16 +16 @@
 #define EAS_H
 
+MRESULT EXPENTRY DisplayEAsProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2);
 VOID Free_FEAList(HOLDFEA * pFEA);
+HOLDFEA *GetFileEAs(CHAR * filename, BOOL ishandle, BOOL silentfail);
 VOID HexDump(HWND hwnd, CHAR * value, ULONG cbValue);
 
-
 #endif // EAS_H

trunk/dll/extract.c

@@ -25 +25 @@
 #define INCL_LONGLONG                   // dircnrs.h
 
+#include "fm3dll.h"
 #include "fm3dlg.h"
 #include "fm3str.h"
@@ -32 +33 @@
 #include "extract.h"
 #include "walkem.h"                     // WalkExtractDlgProc
-#include "fm3dll.h"
+#include "droplist.h"                   // AcceptOneDrop, DropHelp, GetOneDrop
+#include "misc.h"                       // DrawTargetEmphasis
+#include "chklist.h"                    // PosOverOkay
+#include "mkdir.h"                      // SetDir
+#include "valid.h"                      // MakeValidDir
+#include "systemf.h"                    // runemf2
+#include "dirs.h"                       // save_dir2
+#include "strips.h"                     // bstrip
 
 #pragma data_seg(DATA1)

trunk/dll/fm2cmd.c

@@ -19 +19 @@
 #define INCL_LONGLONG                   // dircnrs.h
 
+#include "fm3dll.h"
 #include "fm3dlg.h"
 #include "fm3str.h"
@@ -25 +26 @@
 #include "fm2cmd.h"
 #include "mainwnd.h"                    // FindDirCnrByName
-#include "fm3dll.h"
+#include "valid.h"                      // MakeFullName
+#include "misc.h"                       // PostMsg
+#include "delims.h"                     // skip_delim
 
 #pragma data_seg(DATA2)

trunk/dll/grep.c

@@ -42 +42 @@
 #define INCL_LONGLONG
 
+#include "fm3dll.h"
 #include "fm3str.h"
 #include "grep.h"
@@ -50 +51 @@
 #include "strutil.h"                    // GetPString
 #include "tmrsvcs.h"                    // ITIMER_DESC
-#include "fm3dll.h"
+#include "common.h"                     // DecrThreadUsage, IncrThreadUsage
+#include "valid.h"                      // MakeFullName
+#include "literal.h"                    // wildcard
+#include "wrappers.h"                   // xDosFindNext
 #include "eas.h"                        // Free_FEAList
+#include "stristr.h"                    // findstring
+#include "misc.h"                       // PostMsg
 #include "fortify.h"
 

trunk/dll/key.c

@@ -23 +23 @@
 #define INCL_LONGLONG                   // dircnrs.h
 
+#include "fm3dll.h"
 #include "fm3dlg.h"
 #include "fm3str.h"
@@ -29 +30 @@
 #include "strutil.h"                    // GetPString
 #include "key.h"                        // AboutDlgProc
-#include "fm3dll.h"
+#include "misc.h"                       // PostMsg
 
 #pragma data_seg(DATA1)

trunk/dll/key.h

@@ +1 @@
+
+/***********************************************************************
+
+  $Id: $
+
+  <<description here>>
+
+  Copyright (c) 1993-98 M. Kimes
+  Copyright (c) 2001, 2008 Steven H. Levine
+
+  05 Sep 08 JBS Ticket 187: Refactor FM3DLL.H
+
+***********************************************************************/
+
+#if !defined(KEY_H)
+
+#define KEY_H
+
 MRESULT EXPENTRY AboutDlgProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2);
 
+#endif  // KEY_H

trunk/dll/menu.c

@@ -23 +23 @@
 #define INCL_LONGLONG                   // dircnrs.h
 
+#include "fm3dll.h"
 #include "menu.h"
 #include "errutil.h"                    // Dos_Error...
-#include "fm3dll.h"
+#include "delims.h"                     // skip_delim
+#include "wrappers.h"                   // xfgets_bstripcr
 #include "fortify.h"