Changeset 1180

Timestamp:

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

Author:

John Small

Message:

Ticket 187: Draft 2: Move remaining function declarations

Location:

trunk/dll

Files:

• avl.c (modified) (2 diffs)
• colors.c (modified) (1 diff)
• colors.h (modified) (1 diff)
• getnames.c (modified) (2 diffs)
• getnames.h (modified) (1 diff)
• saveclip.c (modified) (2 diffs)
• saveclip.h (modified) (1 diff)
• seeall.c (modified) (2 diffs)
• select.c (modified) (2 diffs)
• select.h (modified) (3 diffs)

trunk/dll/avl.c

@@ -46 +46 @@
 #define INCL_LONGLONG
 
+#include "fm3dll.h"
 #include "fm3dlg.h"
 #include "fm3str.h"
@@ -52 +53 @@
 #include "errutil.h"                    // Runtime_Error
 #include "avv.h"                        // ArcReviewDlgProc, rewrite_archiverbb2
-#include "droplist.h"                   // FullDrgName
-#include "fm3dll.h"
+#include "droplist.h"                   // DropHelp, FullDrgName
+#include "misc.h"                       // DrawTargetEmphasis
+#include "draglist.h"                   // FreeDragInfoData
+#include "chklist.h"                    // PosOverOkay
+#include "literal.h"                    // literal
+#include "wrappers.h"                   // xfgets
+#include "strips.h"                     // bstrip
+#include "srchpath.h"                   // searchpath
+#include "stristr.h"                    // stristr
+#include "delims.h"                     // to_delim
 #include "fortify.h"
 

trunk/dll/colors.c

@@ -22 +22 @@
 #define INCL_LONGLONG                   // dircnrs.h
 
+#include "fm3dll.h"
 #include "fm3dlg.h"
 #include "strutil.h"                    // GetPString
 #include "errutil.h"                    // Runtime_Error
 #include "colors.h"
-#include "fm3dll.h"
+#include "misc.h"                       // PostMsg
 
 #pragma data_seg(DATA2)

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

trunk/dll/getnames.c

@@ -21 +21 @@
 #define INCL_LONGLONG
 
+#include "fm3dll.h"
 #include "fm3dlg.h"
 #include "fm3str.h"
@@ -27 +28 @@
 #include "getnames.h"
 #include "walkem.h"                     // load_udirs, remove_udir
-#include "fm3dll.h"
+#include "valid.h"                      // MakeFullName
+#include "copyf.h"                      // unlinkf
+#include "misc.h"                       // PaintRecessedWindow
+#include "wrappers.h"                   // xDosFindFirst
 
 #pragma data_seg(DATA1)

trunk/dll/getnames.h

@@ -17 +17 @@
 
 MRESULT EXPENTRY CustomFileDlg(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2);
+BOOL export_filename(HWND hwnd, CHAR * filename, INT overwrite);
+BOOL insert_filename(HWND hwnd, CHAR * filename, INT loadit, BOOL newok);
 
 

trunk/dll/saveclip.c

@@ -35 +35 @@
 #define INCL_LONGLONG
 
+#include "fm3dll.h"
 #include "fm3dlg.h"
 #include "fm3str.h"
+#include "saveclip.h"
 #include "makelist.h"                   // AddToList
 #include "errutil.h"                    // Dos_Error...
 #include "strutil.h"                    // GetPString
 #include "pathutil.h"                   // BldFullPathName
-#include "saveclip.h"
 #include "literal.h"                    // fixup
-#include "fm3dll.h"
+#include "subj.h"                       // Subject
+#include "getnames.h"                   // export_filename
+#include "copyf.h"                      // unlinkf
+#include "wrappers.h"                   // xfgets
+#include "strips.h"                     // bstrip
+#include "misc.h"                       // CheckDriveSpaceAvail
+#include "commafmt.h"                   // CommaFmtULL
+#include "valid.h"                      // IsRoot
+#include "dirs.h"                       // save_dir2
 #include "fortify.h"
 
@@ -50 +59 @@
 //static VOID ListToClipboard(HWND hwnd, CHAR ** list, ULONG append);
 
+static CHAR **ListFromClipboardHab(HAB hab);
 static BOOL SaveToClipHab(HAB hab, CHAR * text, BOOL append);
 

trunk/dll/saveclip.h

@@ -16 +16 @@
 #define SAVECLIP_H
 
+CHAR **ListFromClipboard(HWND hwnd);
 VOID ListToClipboardHab(HAB hab, CHAR ** list, ULONG append);
 MRESULT EXPENTRY SaveAllListDlgProc(HWND hwnd, ULONG msg, MPARAM mp1,

trunk/dll/seeall.c

@@ -52 +52 @@
 #define INCL_LONGLONG
 
+#include "fm3dll.h"
 #include "fm3dlg.h"
 #include "fm3str.h"
@@ -76 +77 @@
 #include "uudecode.h"                   // UUD
 #include "walkem.h"                     // WalkCopyDlgProc, WalkMoveDlgProc
-#include "fm3dll.h"
+#include "archive.h"                    // ArchiveDlgProc
+#include "common.h"                     // CommonTextProc, DecrThreadUsage, IncrThreadUsage
+#include "defview.h"                    // DefaultViewKeys
+#include "eas.h"                        // DisplayEAsProc
+#include "mainwnd.h"                    // GetNextWindowPos
+#include "filter.h"                     // PickMaskDlgProc
+#include "avl.h"                        // SBoxDlgProc
+#include "collect.h"                    // StartCollector
+#include "subj.h"                       // Subject
+#include "commafmt.h"                   // commafmt
+#include "literal.h"                    // wildcard
+#include "wrappers.h"                   // xDosFindNext
 #include "seeall.h"
 #include "misc.h"                       // SetConditionalCascade
-
+#include "fonts.h"                      // SetMLEFont
+#include "stristr.h"                    // stristr
+#include "systemf.h"                    // runemf2
 #include "fortify.h"
 

trunk/dll/select.c

@@ -42 +42 @@
 #define INCL_LONGLONG
 
+#include "fm3dll.h"
 #include "fm3str.h"
 #include "filldir.h"                    // RemoveCnrItems
@@ -49 +50 @@
 #include "select.h"
 #include "valid.h"                      // TestCDates
-#include "fm3dll.h"
+#include "misc.h"                       // CurrentRecord
+#include "findrec.h"                    // FindCnrRecord
+#include "notify.h"                     // Notify
+#include "literal.h"                    // wildcard
+#include "wrappers.h"                   // xrealloc
+#include "strips.h"                     // bstrip
+#include "stristr.h"                    // findstring
 #include "fortify.h"
 

trunk/dll/select.h

@@ -16 +16 @@
 #define SELECT_H
 
+VOID Deselect(HWND hwndCnr);
 VOID DeselectAll(HWND hwndCnr, BOOL files, BOOL dirs, CHAR * mask,
                  CHAR * text, BOOL arc);
@@ -21 +22 @@
 VOID HideAll(HWND hwndCnr);
 VOID InvertAll(HWND hwndCnr);
+VOID MarkAll(HWND hwndCnr, BOOL quitit, BOOL target, BOOL source);
 VOID RemoveAll(HWND hwndCnr, ULONGLONG * ullTotalBytes, ULONG * totalfiles);
 VOID SelectAll(HWND hwndCnr, BOOL files, BOOL dirs, CHAR * mask, CHAR * text,
@@ -26 +28 @@
 VOID SelectList(HWND hwndCnr, BOOL partial, BOOL deselect, BOOL clearfirst,
                 PCNRITEM pciParent, CHAR * filename, CHAR ** list);
+VOID SetMask(CHAR * str, MASK * mask);
 VOID SpecialSelect2(HWND hwndParent, INT action);
+VOID UnHilite(HWND hwndCnr, BOOL all, CHAR *** list, ULONG ulItemsToUnHilite);