Changeset 1205 for trunk/dll


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

Ticket 187: Move datadevlarations/definitions out of fm3dll.h

Location:
trunk/dll
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/dll/codepage.c

    r1183 r1205  
    2222
    2323#include "fm3dll.h"
     24#include "notebook.h"                   // Data declaration(s)
     25#include "mainwnd.h"                    // Data declaration(s)
    2426#include "fm3dlg.h"
    2527#include "fm3str.h"

  • trunk/dll/collect.c

    r1181 r1205  
    7171
    7272#include "fm3dll.h"
     73#include "dircnrs.h"                    // Data declaration(s)
     74#include "info.h"                       // Data declaration(s)
     75#include "init.h"                       // Data declaration(s)
    7376#include "fm3dlg.h"
    7477#include "fm3str.h"
    … …  
    125128#include "fortify.h"
    126129
     130// Data definitions
     131#pragma data_seg(GLOBAL1)
     132HWND CollectorCnrMenu;
     133HWND hwndStatus2;
     134
     135#pragma data_seg(GLOBAL2)
     136INT CollectorsortFlags;
     137
    127138#pragma data_seg(DATA1)
    128 
    129139static PSZ pszSrcFile = __FILE__;
    130140

  • trunk/dll/collect.h

    r1195 r1205  
    2525HWND StartCollector(HWND hwndParent, INT flags);
    2626
     27// Data declarations
     28extern HWND CollectorCnrMenu;
     29extern INT CollectorsortFlags;
     30extern HWND hwndStatus2;
     31
    2732#endif  // COLLECT_H

  • trunk/dll/commafmt.c

    r1184 r1205  
    3232
    3333#include "fm3dll.h"
     34#include "init.h"                       // Data declaration(s)
    3435#include "commafmt.h"
    3536

  • trunk/dll/command.c

    r1188 r1205  
    3939
    4040#include "fm3dll.h"
     41#include "notebook.h"                   // Data declaration(s)
     42#include "init.h"                       // Data declaration(s)
     43#include "mainwnd.h"                    // Data declaration(s)
     44#include "newview.h"                    // Data declarations
    4145#include "fm3dlg.h"
    4246#include "fm3str.h"
    … …  
    6468COMMAND;
    6569
     70// Data defintions
    6671#pragma data_seg(DATA1)
    6772
    6873static PSZ pszSrcFile = __FILE__;
     74static LINKCMDS *cmdtail;
     75
     76#pragma data_seg(GLOBAL2)
     77LINKCMDS *cmdhead;
     78BOOL cmdloaded;
    6979
    7080MRESULT EXPENTRY CommandTextProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2)

  • trunk/dll/command.h

    r1029 r1205  
    3737LINKCMDS;
    3838
    39 // 01 Mar 08 GKY fixme for command.c globals to be here
    40 
    41 #ifdef DEFINE_GLOBALS
    42 #pragma data_seg(GLOBAL1)
    43 #endif
     39// Data declarations
     40extern BOOL cmdloaded;
     41extern LINKCMDS *cmdhead;
    4442
    4543#endif // COMMAND_H

  • trunk/dll/common.c

    r1182 r1205  
    3636
    3737#include "fm3dll.h"
     38#include "mainwnd2.h"                   // Data declaration(s)
     39#include "killproc.h"                   // Data declaration(s)
     40#include "collect.h"                    // Data declaration(s)
     41#include "grep.h"                       // Data declaration(s)
     42#include "dircnrs.h"                    // Data declaration(s)
     43#include "notebook.h"                   // Data declaration(s)
     44#include "inis.h"                       // Data declaration(s)
     45#include "init.h"                       // Data declaration(s)
     46#include "treecnr.h"                    // Data declaration(s)
    3847#include "fm3dlg.h"
    3948#include "fm3str.h"
    … …  
    5766#include "fortify.h"
    5867
     68// Data definitions
    5969#pragma data_seg(DATA1)
    60 
    6170static PSZ pszSrcFile = __FILE__;
     71static HWND hwndLED;
     72static HWND hwndLEDHdr;
     73
     74#pragma data_seg(GLOBAL1)
     75HWND hwndBack;
    6276
    6377MRESULT EXPENTRY CommonFrameWndProc(USHORT id,

  • trunk/dll/common.h

    r1195 r1205  
    3434                BOOL noautotile, char *directory);
    3535
     36// Data declarations
     37extern HWND hwndBack;
     38
    3639#endif // COMMON_H

  • trunk/dll/comp.c

    r1179 r1205  
    7373
    7474#include "fm3dll.h"
     75#include "mainwnd2.h"                   // Data declaration(s)
     76#include "inis.h"                       // Data declaration(s)
     77#include "init.h"                       // Data declaration(s)
     78#include "newview.h"                    // Data declarations
    7579#include "fm3dlg.h"
    7680#include "fm3str.h"
    … …  
    116120SNAPSTUFF;
    117121
     122// Data definitions
    118123static PSZ pszSrcFile = __FILE__;
     124
     125#pragma data_seg(GLOBAL1)
     126BOOL fSelectedAlways;
    119127
    120128//=== SnapShot() Write directory tree to file and recurse if requested ===

  • trunk/dll/comp.h

    r1195 r1205  
    2828
    2929#include "dircnrs.h"                    // DIRCNRDATA
    30 
    31 #ifdef DEFINE_GLOBALS
    32 #pragma data_seg(GLOBAL1)
    33 #endif
    3430
    3531typedef struct
    … …  
    7672MRESULT EXPENTRY CompareDlgProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2);
    7773
     74// Data declarations
     75extern BOOL fSelectedAlways;
     76
    7877#endif // COMP_H
Note: See TracChangeset for help on using the changeset viewer.