Changeset 1189


Ignore:
Timestamp:
Sep 10, 2008, 11:58:57 PM (17 years ago)
Author:
John Small
Message:

Ticket 187: Draft 2: Move remaining function declarations

Location:
trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/dll/copyf.h

    r1167 r1189  
     1
     2/***********************************************************************
     3
     4  $Id: $
     5
     6  <<description here>>
     7
     8  Copyright (c) 1993-98 M. Kimes
     9  Copyright (c) 2001, 2008 Steven H. Levine
     10
     11  05 Sep 08 JBS Ticket 187: Refactor FM3DLL.H
     12
     13***********************************************************************/
     14
     15#if !defined(COPYF_H)
     16
     17#define COPYF_H
     18
    119BOOL AdjustWildcardName(CHAR * oldname, CHAR * newname);
     20char *MakeTempName(char *buffer, char *temproot, int type);
    221BOOL WriteLongName(CHAR * filename, CHAR * longname);
     22APIRET docopyf(INT type, CHAR * oldname, CHAR * newname, ...);
    323INT make_deleteable(CHAR * filename);
     24INT unlinkf(CHAR * string, ...);
     25INT wipeallf(CHAR * string, ...);
    426
     27#endif  // COPYF_H

  • trunk/dll/defview.c

    r1164 r1189  
    4545#include "srchpath.h"                   // RunFM2Util
    4646#include "inis.h"                       // StartIniEditor
     47#include "systemf.h"                    // ExecOnList
     48#include "shadow.h"                     // OpenObject
     49#include "viewer.h"                     // StartMLEEditor
     50#include "newview.h"                    // StartViewer
    4751#include "fm3dll.h"
    4852#include "misc.h"                       // ExecFile, ViewHelp

  • trunk/dll/fm3dll.h

    r1164 r1189  
    430430EXTRDATA;
    431431
    432 /* strips.c */
    433 void strip_lead_char(char *pszStripChars, char *pszSrc);
    434 void strip_trail_char(char *pszStripChars, char *pszSrc);
    435 #define lstrip(s)         strip_lead_char(" \t",(s))
    436 #define rstrip(s)         strip_trail_char(" \t",(s))
    437 #define stripcr(s)        strip_trail_char("\r\n",(s))
    438 // Strip leading and trailing white
    439 #define bstrip(s)         (strip_lead_char(" \t",(s)),strip_trail_char(" \t",(s)))
    440 // Strip leading and trailing white and trail cr/nl
    441 #define bstripcr(s)       (strip_lead_char(" \t",(s)),strip_trail_char("\r\n \t",(s)))
    442 
    443 /* init.c */
    444 BOOL InitFM3DLL(HAB hab, int argc, char **argv);
    445 
    446 /* valid.c */
    447 INT CheckDrive(CHAR Drive, CHAR * FileSystem, ULONG * type);
    448 BOOL IsRoot(CHAR * filename);
    449 INT IsFile(CHAR * filename);
    450 BOOL IsFullName(CHAR * filename);
    451 CHAR *MakeValidDir(CHAR * path);
    452 CHAR *assign_ignores(CHAR * s);
    453 BOOL needs_quoting(CHAR * f);
    454 BOOL TestBinary(CHAR * filename);
    455 BOOL ParentIsDesktop(HWND hwnd, HWND hwndParent);
    456 char *IsVowel(char a);
    457 char *RootName(char *filename);
    458 APIRET MakeFullName(char *filename);
    459 
    460 /* misc.c */
    461 BOOL IsFm2Window(HWND hwnd, BOOL chkTid);
    462 VOID SetShiftState(VOID);
    463 void DrawTargetEmphasis(HWND hwnd, BOOL on);
    464 VOID PaintRecessedWindow(HWND hwnd, HPS hps, BOOL outtie, BOOL dbl);
    465 VOID SetupCommandMenu(HWND hwndMenu, HWND hwndCnr);
    466 PMINIRECORDCORE CurrentRecord(HWND hwndCnr);
    467 BOOL PostMsg(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2);
    468 VOID PortholeInit(HWND hwndNew, MPARAM mp1, MPARAM mp2);
    469 HWND CheckMenu(HWND hwnd, HWND * hwndMenu, USHORT id);
    470 char *GetCmdSpec(BOOL dos);
    471 void Broadcast(HAB hab, HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2);
    472 void SetupWinList(HWND hwndMenu, HWND hwndTop, HWND hwndFrame);
    473 INT CheckDriveSpaceAvail(CHAR *pTargetPath, ULONGLONG ullSpaceNeeded,
    474                          ULONGLONG ullFreeSpaceWhenComplete);
    475 
    476 /* mainwnd.c */
    477 VOID GetNextWindowPos(HWND hwndClient, PSWP pswp, ULONG * ulCntR,
    478                       ULONG * ulNumMinChildrenR);
    479 VOID TileChildren(HWND hwndClient, BOOL absolute);
    480 
    481 #ifdef INCL_GPI
    482 VOID SetPresParams(HWND hwnd, RGB2 * back, RGB2 * fore, RGB2 * border,
    483                    CHAR * font);
    484 #endif
    485 VOID CopyPresParams(HWND target, HWND source);
    486 VOID PresParamChanged(HWND hwnd, CHAR * keyroot, MPARAM mp1, MPARAM mp2);
    487 VOID RestorePresParams(HWND hwnd, CHAR * keyroot);
    488 
    489 /* dirs.c */
    490 APIRET save_dir2(CHAR * curdir);
    491 APIRET save_dir(CHAR * curdir);
    492 
    493 /* delims.c */
    494 char *skip_delim(char *a, register char *delim);
    495 char *to_delim(char *a, register char *delim);
    496 
    497 /* copyf.c */
    498 APIRET docopyf(INT type, CHAR * oldname, CHAR * newname, ...);
    499 char *MakeTempName(char *buffer, char *temproot, int type);
    500 
    501432#define COPY 0
    502433#define MOVE 1
    503434#define WPSCOPY 2
    504435#define WPSMOVE 4
    505 INT unlinkf(CHAR * string, ...);
    506 INT wipeallf(CHAR * string, ...);
    507 CHAR *TruncName(CHAR * oldname, CHAR * buffer);
    508 CHAR *GetLongName(CHAR * oldname, CHAR * buffer);
    509 
    510 /* mkdir.c */
    511 APIRET SetDir(HWND hwndClient, HWND hwnd, CHAR * dir, INT flags);
    512 BOOL PMMkDir(HWND hwnd, CHAR * filename, BOOL copy);
    513 void SetTargetDir(HWND hwnd, BOOL justshow);
    514 
    515 /* srchpath.c */
    516 CHAR *first_path(CHAR * path, CHAR * ret);
    517 CHAR *searchapath(CHAR * path, CHAR * filename);
    518 CHAR *searchpath(CHAR * filename);
    519 
    520 /* literal.c */
    521 UINT literal(PSZ pszBuf);
    522 BOOL wildcard(const PSZ pszBuf, const PSZ pszWildCard,
    523               const BOOL fNotFileSpec);
    524 
    525 /* stristr.c */
    526 CHAR *stristr(const CHAR * t, const CHAR * s);
    527 CHAR *strnistr(register CHAR * t, CHAR * s, LONG len);
    528 CHAR *strnstr(register CHAR * t, CHAR * s, LONG len);
    529 CHAR *findstring(CHAR * findthis, ULONG lenthis, CHAR * findin,
    530                  ULONG lenin, BOOL insensitive);
    531436
    532437/* systemf.c */
    533 INT ExecOnList(HWND hwnd, CHAR * command, INT flags, CHAR * tpath,
    534                CHAR ** list, CHAR * prompt, PCSZ pszCallingFile, UINT uiLineNumber);
    535 INT runemf2(INT type, HWND hwnd, PCSZ pszCallingFile, UINT uiLineNumber,
    536             CHAR * directory, CHAR * environment,
    537             CHAR * formatstring, ...);
    538 
    539 #define RUNTYPE_MASK  0xf
    540 #define SYNCHRONOUS   1
    541 #define ASYNCHRONOUS  2
    542 #define DETACHED      3
    543 #define SEPARATE      4
    544 #define SEPARATEKEEP  5
    545 #define WINDOWED      16
    546 #define MAXIMIZED     32
    547 #define MINIMIZED     64
    548 #define FULLSCREEN    128
    549 #define INVISIBLE     256
    550 #define BACKGROUND    512
    551 #define WAIT          1024
    552 #define PROMPT        2048
    553 #define KEEP          4096
    554 #define ONCE          8192
    555 #define DIEAFTER      16384
    556 #define SEAMLESS      32768
    557 #define CHILD         65536
    558 
    559 /* chklist.c */
    560 VOID PosOverOkay(HWND hwnd);
    561 BOOL PopupMenu(HWND hwndParent, HWND hwndOwner, HWND hwndMenu);
    562 
    563 /* eas.c */
    564 HOLDFEA *GetFileEAs(CHAR * filename, BOOL ishandle, BOOL silentfail);
    565 MRESULT EXPENTRY DisplayEAsProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2);
    566 
    567 /* subj.c */
    568 INT Subject(HWND hwnd, CHAR * filename);
    569 
    570 /* getnames.c */
    571 BOOL insert_filename(HWND hwnd, CHAR * filename, INT loadit, BOOL newok);
    572 BOOL export_filename(HWND hwnd, CHAR * filename, INT overwrite);
    573 
    574 /* input.c */
    575 MRESULT EXPENTRY InputDlgProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2);
    576 
    577 /* select.c */
    578 VOID UnHilite(HWND hwndCnr, BOOL all, CHAR *** list, ULONG ulItemsToUnHilite);
    579 VOID Deselect(HWND hwndCnr);
    580 VOID MarkAll(HWND hwndCnr, BOOL quitit, BOOL target, BOOL source);
    581 VOID SetMask(CHAR * str, MASK * mask);
    582 
    583 /* viewer.c */
    584 HWND StartMLEEditor(HWND hwnd, INT flags, CHAR * filename, HWND hwndRestore);
    585 
    586 /* fonts.c */
    587 FATTRS *SetMLEFont(HWND hwndMLE, FATTRS * fattrs, ULONG flags);
    588 
    589 /* saveclip.c */
    590 CHAR **ListFromClipboard(HWND hwnd);
    591 CHAR **ListFromClipboardHab(HAB hab);
    592 
    593 /* filter.c */
    594 INT APIENTRY Filter(PMINIRECORDCORE rmini, PVOID arg);
    595 MRESULT EXPENTRY PickMaskDlgProc(HWND hwnd, ULONG msg, MPARAM mp1,
    596                                  MPARAM mp2);
    597 
    598 /* archive.c */
    599 MRESULT EXPENTRY ArchiveDlgProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2);
    600 MRESULT EXPENTRY SBoxDlgProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2);
    601 
    602 /* walkem.c */
    603 MRESULT EXPENTRY WalkAllDlgProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2);
    604 
    605 /*draglist.c */
    606 HWND DoFileDrag(HWND hwndCnr, HWND hwndObj, PCNRDRAGINIT pcd, CHAR * arcfile,
    607                 CHAR * directory, BOOL moveok);
    608 
    609 /* droplist.c */
    610 void DropHelp(MPARAM mp1, MPARAM mp2, HWND hwnd, char *text);
    611 BOOL AcceptOneDrop(HWND hwnd, MPARAM mp1, MPARAM mp2);
    612 BOOL GetOneDrop(HWND hwnd, MPARAM mp1, MPARAM mp2, char *buffer, ULONG buflen);
    613 LISTINFO *DoFileDrop(HWND hwndCnr, CHAR * directory, BOOL arcfilesok,
    614                      MPARAM mp1, MPARAM mp2);
    615 VOID FreeDragInfoData (HWND hwnd, PDRAGINFO pDInfo);
    616 BOOL CheckPmDrgLimit(PDRAGINFO pDInfo);
    617 
    618 /* shadow.c */
    619 VOID OpenObject(CHAR * filename, CHAR * type, HWND hwnd);
    620 
    621 /* findrec.c */
    622 PCNRITEM FindCnrRecord(HWND hwndCnr, CHAR * filename, PCNRITEM pciParent,
    623                        BOOL partial, BOOL partmatch, BOOL noenv);
    624 
    625 #if defined(__IBMC__)
    626 /* fsopen.c */
    627 FILE *_fsopen(CHAR * filename, CHAR * mode, INT sharemode, ...);
    628 #endif
    629 
    630 /* collect.c */
    631 HWND StartCollector(HWND hwndParent, INT flags);
    632 
    633 /* undel.c */
    634 MRESULT EXPENTRY UndeleteDlgProc(HWND hwnd, ULONG msg, MPARAM mp1,
    635                                  MPARAM mp2);
    636 
    637 /* killproc.c */
    638 CHAR *GetDosPgmName(PID pid, CHAR * string);
    639 
    640 /* notify.c */
    641 HWND Notify(char *text);
    642 
    643 /* commafmt.c */
    644 size_t commafmt(PSZ pszBuf, UINT cBufSize, LONG lNumber);
    645 size_t CommaFmtUL(char *pszBuf, UINT cBufSize, ULONG ullNumber,
    646                   CHAR chPreferred);
    647 size_t CommaFmtULL(char *pszBuf, UINT cBufSize, ULONGLONG ullNumber,
    648                    CHAR chPreferred);
    649 
    650 /* autoview.c */
    651 MRESULT EXPENTRY AttrListDlgProc(HWND hwnd, ULONG msg, MPARAM mp1,
    652                                  MPARAM mp2);
    653 
    654 /* newview.c */
    655 HWND StartViewer(HWND hwndParent, USHORT flags, CHAR * filename,
    656                  HWND hwndRestore);
    657 
    658 /* defview.c */
    659 VOID DefaultViewKeys(HWND hwnd, HWND hwndFrame, HWND hwndParent,
    660                      SWP * swp, CHAR * filename);
    661 
    662 /* common.c */
    663 MRESULT EXPENTRY CommonTextProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2);
    664 MRESULT EXPENTRY CommonTextButton(HWND hwnd, ULONG msg, MPARAM mp1,
    665                                   MPARAM mp2);
    666 HWND OpenDirCnr(HWND hwnd, HWND hwndParent, HWND hwndRestore,
    667                 BOOL noautotile, char *directory);
    668 VOID IncrThreadUsage(VOID);
    669 VOID DecrThreadUsage(VOID);
    670 
    671 /* wrappers.c */
    672 APIRET xDosFindFirst(PSZ pszFileSpec,
    673                      PHDIR phdir,
    674                      ULONG  flAttribute,
    675                      PVOID  pfindbuf,
    676                      ULONG  cbBuf,
    677                      PULONG pcFileNames,
    678                      ULONG  ulInfoLevel);
    679 APIRET xDosFindNext(HDIR   hDir,
    680                     PVOID  pfindbuf,
    681                     ULONG  cbfindbuf,
    682                     PULONG pcFilenames,
    683                     ULONG  ulInfoLevel);        // 06 Oct 07 SHL Added
    684 APIRET xDosSetPathInfo(PSZ   pszPathName,
    685                        ULONG ulInfoLevel,
    686                        PVOID pInfoBuf,
    687                        ULONG cbInfoBuf,
    688                        ULONG flOptions);
    689 PSZ xfgets(PSZ pszBuf, size_t cMaxBytes, FILE * fp, PCSZ pszSrcFile,
    690            UINT uiLineNumber);
    691 PSZ xfgets_bstripcr(PSZ pszBuf, size_t cMaxBytes, FILE * fp, PCSZ pszSrcFile,
    692                     UINT uiLineNumber);
    693 FILE *xfopen(PCSZ pszFileName, PCSZ pszMode, PCSZ pszSrcFile,
    694              UINT uiLineNumber);
    695 FILE *xfsopen(PCSZ pszFileName, PCSZ pszMode, INT fSharemode, PCSZ pszSrcFile,
    696               UINT uiLineNumber);
    697 VOID xfree(PVOID pv, PCSZ pszSrcFile, UINT uiLineNumber);
    698 PVOID xmalloc(size_t cBytes, PCSZ pszSrcFile, UINT uiLineNumber);
    699 PVOID xmallocz(size_t cBytes, PCSZ pszSrcFile, UINT uiLineNumber);
    700 PVOID xrealloc(PVOID pvIn, size_t cBytes, PCSZ pszSrcFile, UINT uiLineNumber);
    701 PVOID xstrdup(PCSZ pszIn, PCSZ pszSrcFile, UINT uiLineNumber);
     438// #if defined(__IBMC__)
     439// /* fsopen.c */
     440// FILE *_fsopen(CHAR * filename, CHAR * mode, INT sharemode, ...);
     441// #endif
    702442
    703443//=====================================================================

  • trunk/dll/killproc.h

    r1172 r1189  
    1616#define KILLPROC_H
    1717
     18CHAR *GetDosPgmName(PID pid, CHAR * string);
    1819MRESULT EXPENTRY KillDlgProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2);
    1920

  • trunk/dll/printer.c

    r1163 r1189  
    2626#define INCL_LONGLONG                   // dircnrs.h
    2727
     28#include "fm3dll.h"
    2829#include "fm3dlg.h"
    2930#include "fm3str.h"
    … …  
    3435#include "defview.h"                    // QuickView
    3536#include "printer.h"
    36 #include "fm3dll.h"
     37#include "common.h"                     // DecrThreadUsage, IncrThreadUsage
     38#include "chklist.h"                    // PosOverOkay
     39#include "strips.h"                     // bstrip
     40#include "valid.h"                      // IsFile
     41#include "wrappers.h"                   // xfopen
     42#include "misc.h"                       // PostMsg
    3743#include "fortify.h"
    3844

  • trunk/dll/update.c

    r1163 r1189  
    3030#define INCL_LONGLONG
    3131
     32#include "fm3dll.h"
    3233#include "fm3str.h"
    3334#include "errutil.h"                    // Dos_Error...
    … …  
    3637#include "flesh.h"                      // Flesh, Stubby
    3738#include "update.h"
    38 #include "fm3dll.h"
     39#include "findrec.h"                    // FindCnrRecord
     40#include "valid.h"                      // IsFullName
     41#include "wrappers.h"                   // xDosFindFirst
     42#include "misc.h"                       // PostMsg
    3943#include "fortify.h"
    4044

  • trunk/killproc.c

    r1164 r1189  
    1616#define INCL_WIN
    1717
     18#include "dll\fm3dll.h"
    1819#include "dll\fm3dlg.h"
    19 #include "dll\fm3dll.h"
     20#include "dll\init.h"                   // InitFM3DLL
    2021#include "dll\killproc.h"                       // KillDlgProc
    2122

  • trunk/undel.c

    r907 r1189  
    1818#define INCL_DOS
    1919
     20#include "dll\fm3dll.h"
    2021#include "dll\fm3dlg.h"
    21 #include "dll\fm3dll.h"
     22#include "dll\undel.h"                  // UndeleteDlgProc
     23#include "dll\init.h"                   // InitFM3DLL
     24#include "dll\valid.h"                  // MakeValidDir
     25#include "dll\dirs.h"                   // save_dir
    2226
    2327int main(int argc, char *argv[])
Note: See TracChangeset for help on using the changeset viewer.