Changeset 1208


Ignore:
Timestamp:
Sep 13, 2008, 8:50:20 AM (17 years ago)
Author:
John Small
Message:

Ticket 187: Move data declarations/definitions out of fm3dll.h

Location:
trunk/dll
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/dll/fm2cmd.c

    r1179 r1208  
    2020
    2121#include "fm3dll.h"
     22#include "notebook.h"                   // Data declaration(s)
    2223#include "fm3dlg.h"
    2324#include "fm3str.h"
    … …  
    2930#include "misc.h"                       // PostMsg
    3031#include "delims.h"                     // skip_delim
     32
     33// Data definitions
     34#pragma data_seg(GLOBAL1)
     35BOOL fKeepCmdLine;
     36BOOL fSaveMiniCmds;
    3137
    3238#pragma data_seg(DATA2)

  • trunk/dll/fm2cmd.h

    r1197 r1208  
    1818BOOL FM2Command(CHAR * directory, CHAR * command);
    1919
     20// Data declarations
     21extern BOOL fKeepCmdLine;
     22extern BOOL fSaveMiniCmds;
    2023
    2124#endif // FM2CMD_H

  • trunk/dll/fm3dll.def

    r1148 r1208  
    277277         StartFM32_                                   .258,
    278278         _profile                                     .259,
    279          _hptrCommon                                  .260,
     279# JBS    _hptrCommon                                  .260,
    280280         switch_to_                                   .261,
    281281         CheckVersion_                                .262,
    … …  
    285285         _FM3DllHandle                                .266,
    286286         RootName_                                    .267,
    287          RunFM2Util_                                  .268,
     287         RunFM2Util_                                  .268,
    288288         xDosFindFirst_                               .269,
    289289         xDosFindNext_                                .270,

  • trunk/dll/fm3dll.h

    r1197 r1208  
    444444//=====================================================================
    445445
    446 #ifdef DEFINE_GLOBALS
    447 #define DATADEF
    448 #else
    449 #define DATADEF extern
    450 #endif
    451 
    452 DATADEF ARC_TYPE *arcsighead;
    453 DATADEF BOOL arcsigsloaded;
    454 DATADEF BOOL arcsigsmodified;
    455 DATADEF UINT arcsigs_header_lines;      // Header comments line count in archiver.bb2
    456 DATADEF UINT arcsigs_trailer_line_num;  // Trailer comments start line number (1..n)
    457 
    458 DATADEF USHORT nodes, shiftstate;
    459 DATADEF HEV CompactSem;
    460 DATADEF HWND hwndMain, hwndTree, hwndStatus, hwndStatus2, hwndTrash,
    461              hwndButtonlist, hwndDrivelist, hwndStatelist, hwndUserlist,
    462              hwndAutoview, hwndAttr, hwndDate, hwndName, hwndBack,
    463              hwndLED, hwndLEDHdr, hwndAutoMLE, hwndCmdlist;
    464 DATADEF HBITMAP hbmLEDon, hbmLEDoff;
    465 DATADEF CHAR ArcTempRoot[CCHMAXPATH], ThousandsSeparator[2], *pTmpDir, *pFM2SaveDirectory;
    466 DATADEF HPOINTER hptrArrow, hptrBusy, hptrLast, hptrDir, hptrFile, hptrRemote,
    467   hptrFloppy, hptrDrive, hptrRemovable, hptrCDROM,hptrVirtual,hptrRamdisk,
    468   hptrFinger, hptrApp, hptrDunno, hptrSystem, hptrHidden,
    469   hptrReadonly, hptrNS, hptrZipstrm, hptrArc, hptrArt, hptrEW,
    470   hptrCommon, hptrEnv;
    471 DATADEF PFNWP PFNWPCnr, PFNWPFrame, PFNWPButton, PFNWPStatic, PFNWPMLE;
    472 DATADEF BOOL fLoadSubject, fLoadLongnames, fForceUpper, fForceLower,
    473   fSyncUpdates, fAutoTile, fDontMoveMouse, loadedudirs,
    474   fUnHilite, fWorkPlace, fConfirmDelete, fToolbar,
    475   fToolsChanged, MenuInvisible, fFreeTree, fFollowTree,
    476   fNoIconsFiles, fNoIconsDirs, fVerify, fDCOpens,
    477   fLinkSetsIcon, fSaveState, fTextTools, fCopyDefault,
    478   fToolTitles, fLogFile, fRealIdle, fNoSaveState, fUseQSysState,
    479   fSplitStatus, fArcStuffVisible, fUseMCI, fAmAV2,
    480   fNoTreeGap, fDummy, fVTreeOpensWPS, fUseQProcStat,
    481   fStartMinimized, fStartMaximized, fRemoteBug, fReminimize,
    482   fDragndropDlg, fMinOnOpen, fUserComboBox,
    483   fQuickArcFind, fNoRemovableScan, fAutoView, fDataMin,
    484   fDataToFore, fDataShowDrives, fDataInclRemote,
    485   fExternalArcboxes, fExternalViewer, fExternalCollector,
    486   fExternalINIs, fDefaultDeletePerm, fIniExisted, fUseNewViewer,
    487   fTileBackwards, fFolderAfterExtract, fUserListSwitches,
    488   fGuessType, fAutoAddDirs, fUdirsChanged, fSelectedAlways,
    489   fToolbarHelp, fComments, fMoreButtons, fNoSearch, fOtherHelp,
    490   fKeepCmdLine, fAmClosing, fSeparateParms, fTopDir,
    491   fLookInDir, fSwitchTree, fSwitchTreeOnFocus, fDrivebar,
    492   fSwitchTreeExpand, fCollapseFirst, fFilesInTree, fNoDead,
    493   fThreadNotes, fOkayMinimize, fRunning, fDullMin, fBlueLED,
    494   fViewChild, fShowEnv, fLeaveTree, fNoFoldMenu,
    495   fCustomFileDlg, fSaveMiniCmds, fSaveBigCmds, fNoTileUpdate,
    496   fFM2Deletes, fAutoAddAllDirs, fConfirmTarget, fChangeTarget,
    497   fFirstTime, fShowTarget, fNoFinger, fDrivebarHelp, fCheckMM,
    498   fNoLargeFileSupport, fNoMailtoMailRun,
    499   fHttpRunWPSDefault, fFtpRunWPSDefault, fLibPathStrictMailRun,
    500   fLibPathStrictHttpRun, fLibPathStrictFtpRun, fCancelAction, fTrashCan;
    501 DATADEF DETAILS_SETTINGS dsDirCnrDefault;
    502 DATADEF PID mypid;
    503 DATADEF INT driveflags[26], driveserial[26];
    504 DATADEF ULONG NoBrokenNotify, fwsAnimate, OS2ver[2], DriveLines;
    505 DATADEF HINI fmprof;
    506 DATADEF HELPINIT hini;
    507 DATADEF HWND hwndHelp, LastDir, AboutBox, DirMenu, FileMenu, TreeMenu,
    508   ArcMenu, DirCnrMenu, TreeCnrMenu, ArcCnrMenu,
    509   CollectorCnrMenu, CollectorFileMenu, CollectorDirMenu,
    510   Collector, MainPopupMenu, DataHwnd, AutoMenu, hwndBubble,
    511   hwndToolback, MainObjectHwnd, hwndMainMenu;
    512 
    513 #ifdef DEFINE_GLOBALS
    514 #pragma data_seg(GLOBAL2)
    515 #endif
    516 
    517 DATADEF CHAR *FM3Str, *FM2Str, *NullStr, *Default, *Settings,
    518   *DRM_OS2FILE, *DRM_FM2ARCMEMBER, *DRF_FM2ARCHIVE,
    519   *DRMDRFLIST, *DRMDRFOS2FILE, *DRMDRFFM2ARC,
    520   *DRM_FM2INIRECORD, *DRF_FM2INI, *SUBJECT, *LONGNAME,
    521   *HPFS, *JFS, *CDFS, *FAT32, *HPFS386, *NDFS32, *CBSIFS, *ISOFS, *RAMFS, *NTFS,
    522   *WPProgram, *FM3Folder, *FM3Tools;
    523 DATADEF RGB2 RGBGREY, RGBBLACK;
    524 DATADEF CHAR archiverbb2[CCHMAXPATH], StopPrinting, profile[CCHMAXPATH], extractpath[CCHMAXPATH],
    525   lastextractpath[CCHMAXPATH];
    526 DATADEF CHAR appname[12], realappname[12];
    527 DATADEF CHAR  lasttoolbar[CCHMAXPATH], HomePath[CCHMAXPATH],
    528   SwapperDat[CCHMAXPATH], printer[CCHMAXPATH], szDefArc[CCHMAXPATH];
    529 DATADEF HMODULE FM3DllHandle, FM3ModHandle;
    530 DATADEF CHAR *quicktool[50];
    531 DATADEF BOOL qtloaded;
    532 DATADEF INT sortFlags, TreesortFlags, CollectorsortFlags;
    533 DATADEF INT butxsize, butysize;
    534 DATADEF FILE *LogFileHandle;
    535446
    536447#define FILESTOGET_MIN  256
    537448#define FILESTOGET_MAX  4096
    538449
    539 DATADEF ULONG ulCnrType, FilesToGet, AutoviewHeight, TreeWidth, FM3UL;
    540 DATADEF ULONGLONG ullTmpSpaceNeeded, ullDATFileSpaceNeeded;
    541 DATADEF long prnwidth, prnlength, prntmargin, prnbmargin, prnlmargin,
    542   prnrmargin, prnspacing, prntabspaces;
    543 DATADEF BOOL prnpagenums, prnformat, prnformfeedbefore, prnformfeedafter,
    544   prnalt;
    545 DATADEF LINKDIRS *udirhead, *ldirhead;
    546 DATADEF LINKCMDS *cmdhead, *cmdtail;
    547 DATADEF BOOL cmdloaded;
    548 DATADEF CHAR *WC_OBJECTWINDOW, *WC_BUBBLE, *WC_TOOLBUTTONS, *WC_DRIVEBUTTONS, *WC_DIRCONTAINER,
    549   *WC_DIRSTATUS, *WC_TREECONTAINER, *WC_TREEOPENBUTTON, *WC_TREESTATUS, *WC_MAINWND,
    550   *WC_MAINWND2, *WC_AUTOVIEW, *WC_LED, *WC_COLLECTOR, *WC_COLSTATUS, *WC_STATUS, *WC_TOOLBACK,
    551   *WC_DRIVEBACK, *WC_ARCCONTAINER, *WC_ARCSTATUS, *WC_MLEEDITOR, *WC_INIEDITOR, *WC_SEEALL,
    552   *WC_NEWVIEW, *WC_SEESTATUS, *WC_VIEWSTATUS, *WC_ERRORWND, *WC_MINITIME, *WC_DATABAR;
    553 
    554 #ifdef DEFINE_GLOBALS
    555 #pragma data_seg(GLOBAL3)
    556 #endif
    557 
    558 DATADEF BOOL fWantFirstTimeInit;
    559 DATADEF LONG standardcolors[16];
    560450
    561451#ifdef INCL_MMIOOS2
    … …  
    575465#endif
    576466
    577 #ifdef DEFINE_GLOBALS
    578 #pragma data_seg(GLOBAL4)
    579 #endif
    580 
    581 DATADEF HSWITCH switches[499];
    582 DATADEF ULONG numswitches;
    583467
    584468#define priority_idle()     DosSetPriority(PRTYS_THREAD,PRTYC_IDLETIME,30L,0L)

  • trunk/dll/getnames.c

    r1180 r1208  
    2222
    2323#include "fm3dll.h"
     24#include "notebook.h"                   // Data declaration(s)
     25#include "info.h"                       // Data declaration(s)
     26#include "mainwnd.h"                    // Data declaration(s)
    2427#include "fm3dlg.h"
    2528#include "fm3str.h"

  • trunk/dll/grep.c

    r1179 r1208  
    4343
    4444#include "fm3dll.h"
     45#include "notebook.h"                   // Data declaration(s)
     46#include "newview.h"                    // Data declarations
    4547#include "fm3str.h"
    4648#include "grep.h"
    … …  
    5961#include "misc.h"                       // PostMsg
    6062#include "fortify.h"
    61 
    62 #pragma data_seg(DATA2)
    63 
    64 static PSZ pszSrcFile = __FILE__;
    6563
    6664static VOID DoAllSubdirs(GREP *grep,
    … …  
    9795        ((year%400)==0))
    9896
     97// Data definitions
     98#pragma data_seg(DATA2)
     99static PSZ pszSrcFile = __FILE__;
    99100static INT monthdays[12] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
     101
     102#pragma data_seg(GLOBAL1)
     103HWND hwndStatus;
     104
    100105
    101106ULONG SecsSince1980(FDATE *date, FTIME *time)

  • trunk/dll/grep.h

    r907 r1208  
    8787GREP;
    8888
     89// Data declarations
    8990extern volatile CHAR diegrep;
     91extern HWND hwndStatus;
    9092
    9193#endif // GREP_H

  • trunk/dll/grep2.c

    r1185 r1208  
    3939
    4040#include "fm3dll.h"
     41#include "arccnrs.h"                    // Data declaration(s)
     42#include "init.h"                       // Data declaration(s)
     43#include "notebook.h"                   // Data declaration(s)
     44#include "info.h"                       // Data declaration(s)
     45#include "mainwnd.h"                    // Data declaration(s)
    4146#include "fm3dlg.h"
    4247#include "fm3str.h"

  • trunk/dll/info.c

    r1183 r1208  
    3939
    4040#include "fm3dll.h"
     41#include "draglist.h"                   // Data declaration(s)
     42#include "notebook.h"                   // Data declaration(s)
     43#include "inis.h"                       // Data declaration(s)
     44#include "init.h"                       // Data declaration(s)
     45#include "mainwnd.h"                    // Data declaration(s)
    4146#include "fm3dlg.h"
    4247#include "fm3str.h"
    … …  
    6166#include "fortify.h"
    6267
     68// Data definitions
    6369#pragma data_seg(DATA1)
    64 
    6570static PSZ pszSrcFile = __FILE__;
     71
     72#pragma data_seg(GLOBAL1)
     73INT driveflags[26];
    6674
    6775CHAR *FlagMsg(CHAR drive, CHAR * buffer)

  • trunk/dll/info.h

    r1197 r1208  
    2020MRESULT EXPENTRY SetDrvProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2);
    2121
     22// Data declarations
     23extern INT driveflags[26];
    2224
    2325#endif // INFO_H
Note: See TracChangeset for help on using the changeset viewer.