Changeset 1178

Timestamp:

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

Author:

John Small

Message:

Ticket 187: Draft 2: Move remaining function declarations

Location:

trunk/dll

Files:

• attribs.h (modified) (1 diff)
• cmdline.h (modified) (2 diffs)
• datamin.c (modified) (2 diffs)
• fsopen.c (modified) (1 diff)
• instant.c (modified) (2 diffs)
• internal/mkstr.c (modified) (2 diffs)
• objwin.c (modified) (1 diff)
• strips.h (modified) (1 diff)
• sysinfo.c (modified) (1 diff)
• treecnr.c (modified) (3 diffs)

trunk/dll/attribs.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(ATTRIBS_H)
+
+#define ATTRIBS_H
+
 MRESULT EXPENTRY AttrListDlgProc(HWND hwnd, ULONG msg, MPARAM mp1,
                                  MPARAM mp2);
 
+#endif  // ATTRIBS_H

trunk/dll/cmdline.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(CMDLINE_H)
+
+#define CMDLINE_H
+
 MRESULT EXPENTRY CmdLine2DlgProc(HWND hwnd, ULONG msg, MPARAM mp1,
                                  MPARAM mp2);
@@ -5 +23 @@
 VOID save_cmdlines(BOOL big);
 
+#endif  // CMDLINE_H

trunk/dll/datamin.c

@@ -35 +35 @@
 #define INCL_LONGLONG
 
+#include "fm3dll.h"
 #include "fm3dlg.h"
 #include "fm3str.h"
@@ -45 +46 @@
 #include "sysinfo.h"                    // SysInfoDlgProc
 #include "mainwnd.h"                    // TopWindowName
-#include "fm3dll.h"
+#include "commafmt.h"                   // CommaFmtUL
+#include "common.h"                     // OpenDirCnr
+#include "shadow.h"                     // OpenObject
+#include "chklist.h"                    // PopupMenu
+#include "presparm.h"                   // SetPresParams
+#include "undel.h"                      // UndeleteDlgProc
+#include "misc.h"                       // GetCmdSpec
+#include "wrappers.h"                   // xDosFindFirst
+#include "systemf.h"                    // runemf2
 #include "fortify.h"
 

trunk/dll/fsopen.c

@@ -28 +28 @@
 
 #include "fm3dll.h"
+#include "stristr.h"                    // stristr
 
 #pragma alloc_text(FSOPEN,_fsopen)

trunk/dll/instant.c

@@ -23 +23 @@
 #define INCL_LONGLONG                   // dircnrs.h
 
+#include "fm3dll.h"
 #include "fm3dlg.h"
 #include "fm3str.h"
@@ -29 +30 @@
 #include "strutil.h"                    // GetPString
 #include "instant.h"
-#include "fm3dll.h"
+#include "misc.h"                       // GetCmdSpec
+#include "systemf.h"                    // runemf2
+#include "strips.h"                     // bstrip
 
 #pragma data_seg(DATA1)

trunk/dll/internal/mkstr.c

@@ -22 +22 @@
 #include <ctype.h>
 
+#define INCL_LONGLONG
+#include <os2.h>
+
+#include "..\fm3dll.h"
+#include "..\fm3str.h"
 #include "..\version.h"
-#include "..\fm3str.h"
+
+static int  literal(char *fsource);
 
 /*
@@ -67 +73 @@
 #define DEC "0123456789"
 
-int literal(char *fsource)
+int  literal(char *fsource)
 {
 

trunk/dll/objwin.c

@@ -27 +27 @@
 #include "errutil.h"                    // Win_Error
 #include "fortify.h"
-#ifdef FORTIFY
 #include "misc.h"                       // GetTidForThread
-#endif
 #include "collect.h"                    // CollectorObjWndProc
 #include "objwin.h"

trunk/dll/strips.h

@@ -20 +20 @@
 VOID remove_first_occurence_of_character(char *pszRemoveChar, char *pszSrc);
 
+/* strips.c */
+void strip_lead_char(char *pszStripChars, char *pszSrc);
+void strip_trail_char(char *pszStripChars, char *pszSrc);
+#define lstrip(s)         strip_lead_char(" \t",(s))
+#define rstrip(s)         strip_trail_char(" \t",(s))
+#define stripcr(s)        strip_trail_char("\r\n",(s))
+// Strip leading and trailing white
+#define bstrip(s)         (strip_lead_char(" \t",(s)),strip_trail_char(" \t",(s)))
+// Strip leading and trailing white and trail cr/nl
+#define bstripcr(s)       (strip_lead_char(" \t",(s)),strip_trail_char("\r\n \t",(s)))
+
+
 
 #endif // STRIPS_H

trunk/dll/sysinfo.c

@@ -25 +25 @@
 #define INCL_LONGLONG
 
+#include "fm3dll.h"
+#include "fm3dlg.h"
 #include "pathutil.h"                   // BldFullPathName
-#include "fm3dlg.h"
 #include "sysinfo.h"
-#include "fm3dll.h"
+#include "copyf.h"                      // unlinkf
+#include "wrappers.h"                   // xfgets
+#include "systemf.h"                    // runemf2
+#include "misc.h"                       // PostMsg
+#include "strips.h"                     // bstrip
 
 #pragma data_seg(DATA1)

trunk/dll/treecnr.c

@@ -59 +59 @@
 #define INCL_LONGLONG
 
+#include "fm3dll.h"
 #include "fm3dlg.h"
 #include "fm3str.h"
@@ -69 +70 @@
 #include "command.h"                    // RunCommand
 #include "worker.h"                     // Action, MassAction
-#include "mainwnd.h"                    // BubbleHelp, FindDirCnrByName
+#include "mainwnd.h"                    // BubbleHelp, FindDirCnrByName, GetNextWindowPos
 #include "misc.h"                       // CnrDirectEdit, EmphasizeButton, FindDirCnr
                                         // FindDirCnr, FixSwitchList, OpenEdit, QuickPopup
-                                        // SetSortChecks, SwitchCommand
+                                        // SetSortChecks, SwitchCommand, CheckMenu
+                                        // CurrentRecord, IsFm2Window
 #include "common.h"                     // CommonCnrProc, CommonDriveCmd, CommonFrameWndProc
-#include "valid.h"                      // DriveFlagsOne, IsValidDrive
+                                        // CommonTextProc
+#include "valid.h"                      // CheckDrive, DriveFlagsOne, IsValidDrive
 #include "chklist.h"                    // DropListProc
 #include "select.h"                     // ExpandAll
-#include "findrec.h"                    // FindParentRecord, ShowCnrRecord
+#include "findrec.h"                    // FindCnrRecord, FindParentRecord, ShowCnrRecord
 #include "flesh.h"                      // Flesh, UnFlesh
 #include "notify.h"                     // HideNote
@@ -87 +90 @@
 #include "update.h"                     // SelectDriveIcon, UpdateCnrList, UpdateCnrRecord
 #include "sortcnr.h"                    // SortTreeCnr
-#include "fm3dll.h"
-
+#include "droplist.h"                   // AcceptOneDrop, CheckPmDrgLimit, DropHelp, GetOneDrop
+#include "presparm.h"                   // CopyPresParams
+#include "defview.h"                    // DefaultViewKeys
+#include "draglist.h"                   // DoFileDrag
+#include "filter.h"                     // Filter
+#include "shadow.h"                     // OpenObject
+#include "mkdir.h"                      // PMMkDir
+#include "collect.h"                    // StartCollector
+#include "viewer.h"                     // StartMLEEditor
+#include "newview.h"                    // StartViewer
+#include "walkem.h"                     // WalkAllDlgProc
+#include "commafmt.h"                   // CommaFmtULL
+#include "wrappers.h"                   // xDosFindFirst
+#include "systemf.h"                    // runemf2
+#include "dirs.h"                       // save_dir2
 #include "fortify.h"