Changeset 1211 for trunk/dll


Ignore:
Timestamp:
Sep 13, 2008, 8:52:08 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/notebook.c

    r1186 r1211  
    5252
    5353#include "fm3dll.h"
     54#include "dircnrs.h"                    // Data declaration(s)
     55#include "mainwnd2.h"                   // Data declaration(s)
     56#include "comp.h"                       // Data declaration(s)
     57#include "newview.h"                    // Data declaration(s)
     58#include "datamin.h"                    // Data declaration(s)
     59#include "arccnrs.h"                    // Data declaration(s)
     60#include "treecnr.h"                    // Data declaration(s)
     61#include "collect.h"                    // Data declarations
    5462#include "fm3dlg.h"
    5563#include "fm3str.h"
    … …  
    7280#include "fortify.h"
    7381
     82static VOID SaveLastPageIndex(HWND hwnd);
     83
     84// Data defintions
     85#pragma data_seg(GLOBAL1)
     86HWND Collector;
     87DETAILS_SETTINGS dsDirCnrDefault;
     88BOOL fAutoAddAllDirs;
     89BOOL fAutoAddDirs;
     90BOOL fBlueLED;
     91BOOL fCancelAction;
     92BOOL fCheckMM;
     93BOOL fCollapseFirst;
     94BOOL fConfirmDelete;
     95BOOL fConfirmTarget;
     96BOOL fCopyDefault;
     97BOOL fCustomFileDlg;
     98BOOL fDataMin;
     99BOOL fDontMoveMouse;
     100BOOL fDragndropDlg;
     101BOOL fDrivebarHelp;
     102BOOL fExternalArcboxes;
     103BOOL fExternalCollector;
     104BOOL fExternalINIs;
     105BOOL fExternalViewer;
     106BOOL fFM2Deletes;
     107BOOL fFolderAfterExtract;
     108BOOL fForceLower;
     109BOOL fForceUpper;
     110BOOL fGuessType;
     111BOOL fLeaveTree;
     112BOOL fLibPathStrictFtpRun;
     113BOOL fLibPathStrictHttpRun;
     114BOOL fLibPathStrictMailRun;
     115BOOL fLinkSetsIcon;
     116BOOL fLoadLongnames;
     117BOOL fLoadSubject;
     118BOOL fLookInDir;
     119BOOL fMinOnOpen;
     120BOOL fNoDead;
     121BOOL fNoFoldMenu;
     122BOOL fNoIconsDirs;
     123BOOL fNoIconsFiles;
     124BOOL fNoMailtoMailRun;
     125BOOL fNoRemovableScan;
     126BOOL fNoSearch;
     127BOOL fNoTreeGap;
     128BOOL fOtherHelp;
     129BOOL fQuickArcFind;
     130BOOL fRealIdle;
     131BOOL fRemoteBug;
     132BOOL fSaveState;
     133BOOL fSeparateParms;
     134BOOL fShowEnv;
     135BOOL fShowTarget;
     136BOOL fStartMaximized;
     137BOOL fStartMinimized;
     138BOOL fSwitchTree;
     139BOOL fSwitchTreeExpand;
     140BOOL fSwitchTreeOnFocus;
     141BOOL fSyncUpdates;
     142BOOL fTileBackwards;
     143BOOL fToolbarHelp;
     144BOOL fTrashCan;
     145BOOL fUnHilite;
     146BOOL fUseNewViewer;
     147BOOL fUserListSwitches;
     148BOOL fVTreeOpensWPS;
     149BOOL fVerify;
     150BOOL fViewChild;
     151HINI fmprof;
     152ULONG fwsAnimate;
     153HWND hwndHelp;
     154HWND hwndMain;
     155
     156#pragma data_seg(GLOBAL2)
     157CHAR *pszTreeEnvVarList;
     158ULONG FilesToGet;
     159CHAR appname[12];
     160CHAR *bined;
     161CHAR *binview;
     162CHAR *compare;
     163CHAR *dircompare;
     164CHAR *editor;
     165CHAR extractpath[CCHMAXPATH];
     166CHAR *ftprun;
     167CHAR ftprundir[CCHMAXPATH];
     168CHAR httprundir[CCHMAXPATH];
     169CHAR mailrundir[CCHMAXPATH];
     170CHAR szDefArc[CCHMAXPATH];
     171ULONG ulCnrType;
     172CHAR *viewer;
     173CHAR *virus;
     174
    74175#pragma data_seg(DATA2)
    75176
    76177static PSZ pszSrcFile = __FILE__;
    77 
    78178static HWND hwndNotebook;
    79179
    80 static VOID SaveLastPageIndex(HWND hwnd);
    81180
    82181MRESULT EXPENTRY CfgADlgProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2)

  • trunk/dll/notebook.h

    r1199 r1211  
    1818#define NOTEBOOK_H
    1919
    20 #if !defined(OS2_INCLUDED)
    21 #define INCL_LONGLONG
    22 #include <os2.h>
    23 #else
    24 #if !defined(INCL_LONGLONG)
    25 #error INCL_LONGLONG required by grep.h
    26 #endif
    27 #endif
     20// #if !defined(OS2_INCLUDED)
     21// #define INCL_LONGLONG
     22// #include <os2.h>
     23// #else
     24// #if !defined(INCL_LONGLONG)
     25// #error INCL_LONGLONG required by grep.h
     26// #endif
     27// #endif
    2828
    2929MRESULT EXPENTRY CfgDlgProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2);
    … …  
    3131VOID CfgMenuInit(HWND hwndMenu, BOOL fIsLite);
    3232
    33 #ifdef DEFINE_GLOBALS
    34 #define DATADEF
    35 #else
    36 #define DATADEF extern
    37 #endif
    38 
    39 DATADEF CHAR *editor, *viewer, *virus, *compare, *binview, *bined,
    40   *dircompare, *ftprun, *httprun, *mailrun, *pszTreeEnvVarList;
    41 DATADEF CHAR ftprundir[CCHMAXPATH], httprundir[CCHMAXPATH],
    42   mailrundir[CCHMAXPATH], targetdir[CCHMAXPATH];
     33// Data declarations
     34extern HWND Collector;
     35extern ULONG FilesToGet;
     36extern CHAR appname[12];
     37extern DETAILS_SETTINGS dsDirCnrDefault;
     38extern CHAR extractpath[CCHMAXPATH];
     39extern BOOL fAutoAddAllDirs;
     40extern BOOL fAutoAddDirs;
     41extern BOOL fBlueLED;
     42extern BOOL fCancelAction;
     43extern BOOL fCheckMM;
     44extern BOOL fCollapseFirst;
     45extern BOOL fConfirmDelete;
     46extern BOOL fConfirmTarget;
     47extern BOOL fCopyDefault;
     48extern BOOL fCustomFileDlg;
     49extern BOOL fDataMin;
     50extern BOOL fDontMoveMouse;
     51extern BOOL fDragndropDlg;
     52extern BOOL fDrivebarHelp;
     53extern BOOL fExternalArcboxes;
     54extern BOOL fExternalCollector;
     55extern BOOL fExternalINIs;
     56extern BOOL fExternalViewer;
     57extern BOOL fFM2Deletes;
     58extern BOOL fFolderAfterExtract;
     59extern BOOL fForceLower;
     60extern BOOL fForceUpper;
     61extern BOOL fGuessType;
     62extern BOOL fLeaveTree;
     63extern BOOL fLibPathStrictFtpRun;
     64extern BOOL fLibPathStrictHttpRun;
     65extern BOOL fLibPathStrictMailRun;
     66extern BOOL fLinkSetsIcon;
     67extern BOOL fLoadLongnames;
     68extern BOOL fLoadSubject;
     69extern BOOL fLookInDir;
     70extern BOOL fMinOnOpen;
     71extern BOOL fNoDead;
     72extern BOOL fNoFoldMenu;
     73extern BOOL fNoIconsDirs;
     74extern BOOL fNoIconsFiles;
     75extern BOOL fNoMailtoMailRun;
     76extern BOOL fNoRemovableScan;
     77extern BOOL fNoSearch;
     78extern BOOL fNoTreeGap;
     79extern BOOL fOtherHelp;
     80extern BOOL fQuickArcFind;
     81extern BOOL fRealIdle;
     82extern BOOL fRemoteBug;
     83extern BOOL fSaveState;
     84extern BOOL fSeparateParms;
     85extern BOOL fShowEnv;
     86extern BOOL fShowTarget;
     87extern BOOL fStartMaximized;
     88extern BOOL fStartMinimized;
     89extern BOOL fSwitchTree;
     90extern BOOL fSwitchTreeExpand;
     91extern BOOL fSwitchTreeOnFocus;
     92extern BOOL fSyncUpdates;
     93extern BOOL fTileBackwards;
     94extern BOOL fToolbarHelp;
     95extern BOOL fTrashCan;
     96extern BOOL fUnHilite;
     97extern BOOL fUseNewViewer;
     98extern BOOL fUserListSwitches;
     99extern BOOL fVTreeOpensWPS;
     100extern BOOL fVerify;
     101extern BOOL fViewChild;
     102extern HINI fmprof;
     103extern ULONG fwsAnimate;
     104extern HWND hwndHelp;
     105extern HWND hwndMain;
     106extern CHAR szDefArc[CCHMAXPATH];
     107extern ULONG ulCnrType;
     108extern CHAR *bined;
     109extern CHAR *binview;
     110extern CHAR *compare;
     111extern CHAR *dircompare;
     112extern CHAR *editor;
     113extern CHAR *ftprun;
     114extern CHAR ftprundir[CCHMAXPATH];
     115extern CHAR httprundir[CCHMAXPATH];
     116extern CHAR mailrundir[CCHMAXPATH];
     117extern CHAR *pszTreeEnvVarList;
     118extern CHAR *viewer;
     119extern CHAR *virus;
    43120
    44121#endif // NOTEBOOK_H

  • trunk/dll/notify.c

    r1188 r1211  
    2828#define INCL_LONGLONG                   // dircnrs.h
    2929
     30#include "fm3dll.h"
     31#include "collect.h"                    // Data declaration(s)
     32#include "grep.h"                       // Data declaration(s)
     33#include "notebook.h"                   // Data declaration(s)
     34#include "init.h"                       // Data declaration(s)
    3035#include "fm3dlg.h"
    3136#include "fm3str.h"
    … …  
    3439#include "notify.h"
    3540#include "presparm.h"                   // SetPresParams
    36 #include "fm3dll.h"
     41#include "mainwnd.h"                    // Data declaration(s)
    3742#include "wrappers.h"                   // xmalloc
    3843#include "misc.h"                       // PostMsg
    … …  
    4146#pragma data_seg(DATA1)
    4247
     48// Data definitions
    4349static PSZ pszSrcFile = __FILE__;
    44 
    4550static volatile HWND hwndNotify;        // 16 Apr 08 SHL
     51
     52#pragma data_seg(GLOBAL1)
     53BOOL fThreadNotes;
    4654
    4755VOID StartNotes(CHAR * s);

  • trunk/dll/notify.h

    r1199 r1211  
    2626VOID ShowNote(VOID);
    2727
     28// Data declarations
     29extern BOOL fThreadNotes;
     30
    2831#endif  // NOTIFY_H

  • trunk/dll/objcnr.c

    r1188 r1211  
    3636
    3737#include "fm3dll.h"
     38#include "draglist.h"                   // Data declaration(s)
     39#include "info.h"                       // Data declaration(s)
     40#include "init.h"                       // Data declaration(s)
     41#include "notebook.h"                   // Data declaration(s)
     42#include "newview.h"                    // Data declarations
    3843#include "fm3dlg.h"
    3944#include "fm3str.h"

  • trunk/dll/objwin.c

    r1178 r1211  
    2222
    2323#include "fm3dll.h"
     24#include "init.h"                       // Data declaration(s)
    2425#include "fm3dlg.h"
    2526#include "fm3str.h"

  • trunk/dll/obsolete.h

    r1199 r1211  
    5151MRESULT EXPENTRY ProgDlgProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2);
    5252
     53#pragma data_seg(GLOBAL2)
     54INT butxsize;
     55INT butysize;
     56BOOL fUseMCI;
     57
     58#pragma data_seg(GLOBAL1)
     59HPOINTER hptrCommon;
     60HWND hwndTrash;
     61USHORT nodes;
     62
    5363
    5464#endif // OBSOLETE_H

  • trunk/dll/pathutil.c

    r1185 r1211  
    2323
    2424#include "fm3dll.h"                     // needs_quoting
     25#include "notebook.h"                   // Data declaration(s)
     26#include "init.h"                       // Data declaration(s)
    2527#include "fm3str.h"
    2628#include "pathutil.h"

  • trunk/dll/presparm.c

    r1193 r1211  
    2222
    2323#include "fm3dll.h"
     24#include "notebook.h"                   // Data declaration(s)
    2425#include "presparm.h"
    2526#include "wrappers.h"                   // xmalloc

  • trunk/dll/printer.c

    r1189 r1211  
    2727
    2828#include "fm3dll.h"
     29#include "notebook.h"                   // Data declaration(s)
     30#include "mainwnd.h"                    // Data declaration(s)
    2931#include "fm3dlg.h"
    3032#include "fm3str.h"
    … …  
    4345#include "fortify.h"
    4446
     47// Data definitions
    4548#pragma data_seg(DATA1)
    4649
    … …  
    5154static BOOL PrinterReady(CHAR * printdevname);
    5255static BOOL SayPrinterReady(HWND hwnd);
     56
     57#pragma data_seg(GLOBAL2)
     58CHAR StopPrinting;
     59CHAR printer[CCHMAXPATH];
     60BOOL prnalt;
     61long prnbmargin;
     62BOOL prnformat;
     63BOOL prnformfeedafter;
     64BOOL prnformfeedbefore;
     65long prnlength;
     66long prnlmargin;
     67BOOL prnpagenums;
     68long prnrmargin;
     69long prnspacing;
     70long prntabspaces;
     71long prntmargin;
     72long prnwidth;
    5373
    5474BOOL PrinterReady(CHAR * printdevname)
Note: See TracChangeset for help on using the changeset viewer.