Changeset 1214


Ignore:
Timestamp:
Sep 13, 2008, 8:53:34 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/undel.c

    r1185 r1214  
    2929
    3030#include "fm3dll.h"
     31#include "init.h"                       // Data declaration(s)
     32#include "mainwnd.h"                    // Data declaration(s)
    3133#include "fm3dlg.h"
    3234#include "fm3str.h"

  • trunk/dll/update.c

    r1189 r1214  
    3131
    3232#include "fm3dll.h"
     33#include "init.h"                       // Data declaration(s)
     34#include "notebook.h"                   // Data declaration(s)
     35#include "info.h"                       // Data declaration(s)
     36#include "newview.h"                    // Data declarations
    3337#include "fm3str.h"
    3438#include "errutil.h"                    // Dos_Error...

  • trunk/dll/uudecode.c

    r1183 r1214  
    2828
    2929#include "fm3dll.h"
     30#include "notebook.h"                   // Data declaration(s)
    3031#include "fm3dlg.h"
    3132#include "fm3str.h"

  • trunk/dll/valid.c

    r1193 r1214  
    3939
    4040#include "fm3dll.h"
     41#include "treecnr.h"                    // Data declaration(s)
     42#include "info.h"                       // Data declaration(s)
     43#include "notebook.h"                   // Data declaration(s)
    4144#include "fm3str.h"
    4245#include "errutil.h"                    // Dos_Error...
    … …  
    4548#include "dirs.h"                       // save_dir2
    4649#include "strips.h"                     // bstrip
    47 
    48 static PSZ pszSrcFile = __FILE__;
     50#include "init.h"                       // GetTidForWindow
     51
    4952
    5053//static BOOL IsDesktop(HAB hab, HWND hwnd);
    5154//static BOOL IsFileSame(CHAR * filename1, CHAR * filename2);
    5255//static char *IsVowel(char a);
     56
     57// Data definitions
     58static PSZ pszSrcFile = __FILE__;
     59
     60#pragma data_seg(GLOBAL2)
     61CHAR *CDFS;
     62CHAR *FAT32;
     63CHAR *HPFS;
     64CHAR *HPFS386;
     65CHAR *ISOFS;
     66CHAR *JFS;
     67CHAR *NDFS32;
     68CHAR *NTFS;
     69CHAR *RAMFS;
    5370
    5471APIRET MakeFullName(char *pszFileName)

  • trunk/dll/valid.h

    r1202 r1214  
    4141BOOL needs_quoting(CHAR * f);
    4242
     43// Data declarations
     44extern CHAR *CDFS;
     45extern CHAR *FAT32;
     46extern CHAR *HPFS;
     47extern CHAR *HPFS386;
     48extern CHAR *ISOFS;
     49extern CHAR *JFS;
     50extern CHAR *NTFS;
     51extern CHAR *NDFS32;
     52extern CHAR *RAMFS;
     53
    4354#endif  // VALID_H

  • trunk/dll/viewer.c

    r1187 r1214  
    2929
    3030#include "fm3dll.h"
     31#include "mainwnd2.h"                   // Data declaration(s)
     32#include "collect.h"                    // Data declaration(s)
     33#include "grep.h"                       // Data declaration(s)
     34#include "dircnrs.h"                    // Data declaration(s)
     35#include "init.h"                       // Data declaration(s)
    3136#include "fm3dlg.h"
    3237#include "fm3str.h"

  • trunk/dll/viewinf.c

    r1183 r1214  
    3030
    3131#include "fm3dll.h"
     32#include "notebook.h"                   // Data declaration(s)
     33#include "init.h"                       // Data declaration(s)
     34#include "mainwnd.h"                    // Data declaration(s)
    3235#include "fm3dlg.h"
    3336#include "fm3str.h"

  • trunk/dll/walkem.c

    r1186 r1214  
    4949
    5050#include "fm3dll.h"
     51#include "arccnrs.h"                    // Data declaration(s)
     52#include "info.h"                       // Data declaration(s)
     53#include "init.h"                       // Data declaration(s)
     54#include "mainwnd.h"                    // Data declaration(s)
    5155#include "fm3dlg.h"
    5256#include "fm3str.h"
    … …  
    6569#include "fortify.h"
    6670
    67 #pragma data_seg(DATA1)
    68 
    69 static PSZ pszSrcFile = __FILE__;
    70 
    71 static MRESULT EXPENTRY WalkTwoDlgProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2);
    72 static VOID load_setups(VOID);
    73 static BOOL remove_ldir(PSZ path);
    74 
    7571typedef struct
    7672{
    … …  
    8379WALKER;
    8480
     81static MRESULT EXPENTRY WalkTwoDlgProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2);
     82static VOID load_setups(VOID);
     83static BOOL remove_ldir(PSZ path);
     84
     85// Data definitions
     86#pragma data_seg(DATA1)
     87
     88static PSZ pszSrcFile = __FILE__;
    8589static CHAR WalkFont[CCHMAXPATH] = "";
    8690static ULONG WalkFontSize = sizeof(WalkFont);
    … …  
    9599// 18 Aug 07 SHL fixme to stop supporting old style 1 year from now?
    96100static const ULONG ulOldSetupsBytes = 100 * 13; // Prior to 3.0.7
     101
     102#pragma data_seg(GLOBAL1)
     103BOOL fUdirsChanged;
     104BOOL loadedudirs;
     105
     106#pragma data_seg(GLOBAL2)
     107LINKDIRS *ldirhead;
     108LINKDIRS *udirhead;
    97109
    98110/**

  • trunk/dll/walkem.h

    r1202 r1214  
    5151#endif
    5252
     53// Data declarations
     54extern BOOL fUdirsChanged;
     55extern LINKDIRS *ldirhead;
     56extern BOOL loadedudirs;
     57extern LINKDIRS *udirhead;
     58
    5359#endif // WALKEM_H

  • trunk/dll/winlist.c

    r1186 r1214  
    2222
    2323#include "fm3dll.h"
     24#include "killproc.h"                   // Data declaration(s)
     25#include "init.h"                       // Data declaration(s)
     26#include "newview.h"                    // Data declaration(s)
     27#include "notebook.h"                   // Data declaration(s)
    2428#include "fm3dlg.h"
    2529#include "mainwnd.h"                    // GetNextWindowPos
Note: See TracChangeset for help on using the changeset viewer.