Changeset 1210 for trunk/dll


Ignore:
Timestamp:
Sep 13, 2008, 8:51:37 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/mainwnd2.c

    r1186 r1210  
    4040
    4141#include "fm3dll.h"
     42#include "killproc.h"                   // Data declaration(s)
     43#include "grep.h"                       // Data declaration(s)
     44#include "autoview.h"                   // Data declaration(s)
     45#include "dircnrs.h"                    // Data declaration(s)
     46#include "worker.h"                     // Data declaration(s)
     47#include "init.h"                       // Data declaration(s)
    4248#include "fm3dlg.h"
    4349#include "fm3str.h"
    … …  
    8187PERSON1DATA;
    8288
     89// Data definitions
    8390static PSZ pszSrcFile = __FILE__;
     91static ULONG TreeWidth;
     92
     93#pragma data_seg(GLOBAL1)
     94PFNWP PFNWPFrame;
     95
     96#pragma data_seg(GLOBAL2)
     97CHAR realappname[12];
    8498
    8599static MRESULT EXPENTRY MainFrameWndProc2(HWND hwnd, ULONG msg, MPARAM mp1,

  • trunk/dll/mainwnd2.h

    r1198 r1210  
    1919HWND StartFM32(HAB hab, INT argc, CHAR ** argv);
    2020
     21// Data declarations
     22extern PFNWP PFNWPFrame;
     23extern CHAR realappname[12];
    2124
    2225#endif // MAINWND2_H

  • trunk/dll/makelist.c

    r1185 r1210  
    2626#define INCL_LONGLONG
    2727
     28#include "fm3dll.h"                     // 05 Jan 08 SHL fixme to be gone
    2829#include "fm3str.h"
    2930#include "makelist.h"
    … …  
    3233#include "dircnrs.h"
    3334#include "misc.h"                       // CurrentRecord
    34 #include "fm3dll.h"                     // 05 Jan 08 SHL fixme to be gone
     35#include "newview.h"                    // Data declarations
    3536#include "wrappers.h"                   // xfree
    3637#include "fortify.h"                    // 06 May 08 SHL

  • trunk/dll/misc.c

    r1182 r1210  
    6666
    6767#include "fm3dll.h"
     68#include "killproc.h"                   // Data declaration(s)
     69#include "comp.h"                       // Data declaration(s)
     70#include "treecnr.h"                    // Data declaration(s)
     71#include "mainwnd.h"                    // Data declaration(s)
     72#include "init.h"                       // Data declaration(s)
     73#include "dircnrs.h"                    // Data declaration(s)
     74#include "newview.h"                    // Data declarations
     75#include "collect.h"                    // data declaration(s)
     76#include "notebook.h"                   // data declaration(s)
     77#include "arccnrs.h"
    6878#include "fm3dlg.h"
    6979#include "fm3str.h"
    … …  
    8696#include "misc.h"
    8797
     98// Data definitions
     99#pragma data_seg(GLOBAL1)
     100HWND CollectorDirMenu;
     101HWND CollectorFileMenu;
     102HWND DirMenu;
     103HWND FileMenu;
     104HWND TreeMenu;
     105BOOL fDefaultDeletePerm;
     106BOOL fWorkPlace;
     107
     108#pragma data_seg(GLOBAL4)
     109ULONG numswitches;
     110HSWITCH switches[499];
     111
    88112#pragma data_seg(DATA1)
    89 
    90113static PSZ pszSrcFile = __FILE__;
    91114

  • trunk/dll/misc.h

    r1198 r1210  
    7575VOID disable_menuitem(HWND hwndMenu, USHORT id, BOOL enable);
    7676
     77// Data declarations
     78extern HWND CollectorDirMenu;
     79extern HWND CollectorFileMenu;
     80extern HWND DirMenu;
     81extern HWND FileMenu;
     82extern HWND TreeMenu;
     83extern BOOL fDefaultDeletePerm;
     84extern BOOL fWorkPlace;
     85extern ULONG numswitches;
     86extern HSWITCH switches[499];
     87
    7788#endif // MISC_H

  • trunk/dll/mkdir.c

    r1187 r1210  
    2323
    2424#include "fm3dll.h"
     25#include "common.h"                     // Data declaration(s)
     26#include "init.h"                       // Data declaration(s)
     27#include "info.h"                       // Data declaration(s)
     28#include "mainwnd.h"                    // Data declaration(s)
    2529#include "fm3dlg.h"
    2630#include "fm3str.h"
    … …  
    3438#include "dirs.h"                       // save_dir2
    3539#include "input.h"                      // InputDlgProc
     40
     41// Data definitions
     42#pragma data_seg(GLOBAL2)
     43CHAR targetdir[CCHMAXPATH];
    3644
    3745#pragma alloc_text(MKDIR,MassMkdir,SetDir,PMMkDir,SetTargetDir)

  • trunk/dll/mkdir.h

    r1198 r1210  
    2121void SetTargetDir(HWND hwnd, BOOL justshow);
    2222
     23// Data declarations
     24extern CHAR targetdir[CCHMAXPATH];
     25
    2326#endif // MKDIR_H

  • trunk/dll/mle.c

    r1185 r1210  
    3535
    3636#include "fm3dll.h"
     37#include "init.h"                       // Data declaration(s)
     38#include "mainwnd.h"                    // Data declaration(s)
     39#include "newview.h"                    // Data declarations
    3740#include "fm3dlg.h"
    3841#include "mle.h"

  • trunk/dll/newview.c

    r1186 r1210  
    4747
    4848#include "fm3dll.h"
     49#include "mainwnd2.h"                   // Data declaration(s)
     50#include "collect.h"                    // Data declaration(s)
     51#include "grep.h"                       // Data declaration(s)
     52#include "dircnrs.h"                    // Data declaration(s)
     53#include "init.h"                       // Data declaration(s)
    4954#include "fm3dlg.h"
    5055#include "fm3str.h"
    … …  
    8186#include "fortify.h"
    8287
     88// Data definitions
     89#pragma data_seg(GLOBAL1)
     90HEV CompactSem;
     91BOOL fFtpRunWPSDefault;
     92BOOL fHttpRunWPSDefault;
     93
     94#pragma data_seg(GLOBAL2)
     95CHAR *httprun;
     96CHAR *mailrun;
     97
     98#pragma data_seg(GLOBAL3)
     99LONG standardcolors[16];
     100
    83101#pragma data_seg(DATA2)
    84 
    85102static PSZ pszSrcFile = __FILE__;
    86103

  • trunk/dll/newview.h

    r1199 r1210  
    2121                 HWND hwndRestore);
    2222
     23// Data declarations
     24extern HEV CompactSem;
     25extern BOOL fFtpRunWPSDefault;
     26extern BOOL fHttpRunWPSDefault;
     27extern LONG standardcolors[16];
     28extern CHAR *httprun;
     29extern CHAR *mailrun;
     30
    2331#endif // NEWVIEW_H
Note: See TracChangeset for help on using the changeset viewer.