Changeset 1177

Timestamp:

Sep 10, 2008, 11:53:13 PM (17 years ago)

Author:

John Small

Message:

Ticket 187: Draft 2: Move remaining function declarations

Location:

trunk

Files:

• dll/attribs.c (modified) (2 diffs)
• dll/cmdline.c (modified) (2 diffs)
• dll/defview.h (modified) (1 diff)
• dll/dircnrs.c (modified) (4 diffs)
• dll/dirsize.c (modified) (2 diffs)
• dll/flesh.c (modified) (2 diffs)
• dll/init.c (modified) (2 diffs)
• dll/init.h (modified) (1 diff)
• fm4.c (modified) (1 diff)
• viewinfs.c (modified) (1 diff)

trunk/dll/attribs.c

@@ -20 +20 @@
 #define INCL_WIN
 
+#include "fm3dll.h"
 #include "fm3dlg.h"
 #include "fm3str.h"
@@ -27 +28 @@
 #include "defview.h"                    // QuickView
 #include "attribs.h"
-#include "fm3dll.h"
+#include "misc.h"                       // PaintRecessedWindow
+#include "wrappers.h"                   // xDosSetPathInfo
 
 static PSZ pszSrcFile = __FILE__;

trunk/dll/cmdline.c

@@ -32 +32 @@
 #define INCL_LONGLONG                   // dircnrs.h
 
+#include "fm3dll.h"
 #include "fm3dlg.h"
 #include "fm3str.h"
@@ -39 +40 @@
 #include "mainwnd.h"                    // BubbleHelp
 #include "cmdline.h"                    // CmdLineDlgProc, CmdLine2DlgProc
-#include "fm3dll.h"
+#include "chklist.h"                    // PosOverOkay
 #include "pathutil.h"                   // MaxCmdLineStr
+#include "strips.h"                     // bstrip
+#include "misc.h"                       // CheckDriveSpaceAvail
+#include "srchpath.h"                   // searchpath
+#include "wrappers.h"                   // xfgets_bstripcr
+#include "valid.h"                      // IsFile
+#include "dirs.h"                       // save_dir2
+#include "systemf.h"
 #include "fortify.h"
 

trunk/dll/defview.h

@@ -18 +18 @@
 VOID DefaultView(HWND hwnd, HWND hwndFrame, HWND hwndParent, SWP * swp,
                  ULONG flags, CHAR * filename);
+VOID DefaultViewKeys(HWND hwnd, HWND hwndFrame, HWND hwndParent,
+                     SWP * swp, CHAR * filename);
+
 #define QuickView(h,f) DefaultView(h,(HWND)0,(HWND)0,NULL,0,f)
 #define QuickEdit(h,f) DefaultView(h,(HWND)0,(HWND)0,NULL,8,f)

trunk/dll/dircnrs.c

@@ -64 +64 @@
 #define INCL_WINWORKPLACE
 
+#include "fm3dll.h"
 #include "fm3dlg.h"
 #include "fm3str.h"
@@ -78 +79 @@
                                         // AdjustDetailsSwitches, CnrDirectEdit, OpenEdit, QuickPopup
                                         // SayFilter, SaySort, SayView, SetCnrCols, SetDetailsSwitches
-                                        // SetSortChecks, SetViewMenu, SwitchCommand
+                                        // SetSortChecks, SetViewMenu, SwitchCommand, CheckMenu
+                                        // CurrentRecord, DrawTargetEmphasis, IsFm2Window
 #include "chklist.h"                    // CenterOverWindow, DropListProc
 #include "common.h"                     // CommonCnrProc, CommonCreateTextChildren, CommonFrameWndProc
-                                        // CommonTextPaint
-#include "mainwnd.h"                    // CountDirCnrs, MakeBubble, TopWindow
+                                        // CommonTextPaint, CommonTextButton, CommonTextProc
+#include "mainwnd.h"                    // CountDirCnrs, GetNextWindowPos, MakeBubble, TopWindow
 #include "select.h"                     // DeselectAll, HideAll, InvertAll, SelectAll, SelectList
                                         // SpecialSelect2
@@ -91 +93 @@
 #include "notify.h"                     // NotifyError
 #include "objcnr.h"                     // ObjCnrDlgProc
-#include "draglist.h"                   // PickUp
+#include "draglist.h"                   // DoFileDrag, FreeDragInfoData, PickUp
 #include "saveclip.h"                   // SaveListDlgProc
 #include "findrec.h"                    // ShowCnrRecord
@@ -99 +101 @@
 #include "walkem.h"                     // add_udir
 #include "strips.h"                     // chop_at_crnl
-#include "fm3dll.h"
-//#include "avl.h"                      // free_archivers
+#include "droplist.h"                   // AcceptOneDrop, CheckPmDrgLimit, DropHelp, GetOneDrop
+#include "presparm.h"                   // CopyPresParams
+#include "defview.h"                    // DefaultViewKeys
+#include "systemf.h"                    // ExecOnList
+#include "filter.h"                     // Filter
+#include "findrec.h"                    // FindCnrRecord
+#include "input.h"                      // InputDlgProc
+#include "shadow.h"                     // OpenObject
+#include "mkdir.h"                      // PMMkDir
+#include "collect.h"                    // StartCollector
+#include "viewer.h"                     // StartMLEEditor
+#include "newview.h"                    // StartViewer
+#include "undel.h"                      // UndeleteDlgProc
+#include "commafmt.h"                   // commafmt
+#include "getnames.h"                   // insert_filename
+#include "wrappers.h"                   // xfree
 #include "fortify.h"
 

trunk/dll/dirsize.c

@@ -55 +55 @@
 #define INCL_LONGLONG
 
+#include "fm3dll.h"
 #include "fm3dlg.h"
 #include "fm3str.h"
@@ -63 +64 @@
 #include "dirsize.h"
 #include "select.h"                     // ExpandAll
-#include "fm3dll.h"
-
+#include "valid.h"                      // CheckDrive
+#include "common.h"                     // OpenDirCnr
+#include "shadow.h"                     // OpenObject
+#include "presparm.h"                   // PresParamChanged
+#include "commafmt.h"                   // commafmt
+#include "getnames.h"                   // export_filename
+#include "wrappers.h"                   // xDosFindNext
+#include "dirs.h"                       // save_dir2
+#include "misc.h"                       // PostMsg
 #include "fortify.h"
 

trunk/dll/flesh.c

@@ -32 +32 @@
 #define INCL_LONGLONG                   // dircnrs.h
 
+#include "fm3dll.h"
 #include "fm3str.h"
 #include "filldir.h"                    // FileAttrToString...
@@ -39 +40 @@
 #include "valid.h"                      // IsValidDir
 #include "misc.h"                       // LoadLibPath
-#include "fm3dll.h"
+#include "findrec.h"                    // FindCnrRecord
+#include "notify.h"                     // Notify
+#include "wrappers.h"                   // xfree
 
 #pragma data_seg(DATA1)

trunk/dll/init.c

@@ -77 +77 @@
 #define DEFINE_GLOBALS 1
 
+#include "fm3dll.h"
 #include "fm3dlg.h"
 #include "datamin.h"
@@ -105 +106 @@
 #include "treecnr.h"                    // TreeClientWndProc, TreeStatProc
 #include "newview.h"                    // ViewStatusProc, ViewWndProc
-#include "fm3dll.h"
+#include "subj.h"                       // Subject
+#include "select.h"                     // UnHilite
+#include "dirs.h"                       // save_dir
+#include "copyf.h"                      // unlinkf
+#include "wrappers.h"                   // xDosSetPathInfo
 #include "misc.h"                       // HeapThread, LoadDetailsSwitches
 #include "notebook.h"                   // command line variables (editor etc)
+#include "strips.h"                     // bstrip
+#include "killproc.h"                   // GetDosPgmName
+#include "srchpath.h"                   // searchpath
 #include "fortify.h"
 

trunk/dll/init.h

@@ -16 +16 @@
 #define INIT_H
 
+BOOL InitFM3DLL(HAB hab, int argc, char **argv);
 HWND StartFM3(HAB hab, INT argc, CHAR ** argv);
 

trunk/fm4.c

@@ -19 +19 @@
 #define INCL_LONGLONG
 
+#include "dll\fm3dll.h"
 #include "dll\tools.h"
 #include "dll\version.h"
 #include "dll\mainwnd2.h"                       // StartFM32
-#include "dll\fm3dll.h"
+#include "dll\init.h"                   // InitFM3DLL
 
 int main(int argc, char *argv[])

trunk/viewinfs.c

@@ -16 +16 @@
 #define INCL_WIN
 
+#include "dll\fm3dll.h"
 #include "dll\fm3dlg.h"
-#include "dll\fm3dll.h"
+#include "dll\init.h"                   // InitFM3DLL
 #include "dll\viewinf.h"                        // ViewInfProc