Changeset 1224 for trunk/dll

Timestamp:

Sep 14, 2008, 1:11:41 AM (17 years ago)

Author:

John Small

Message:

Ticket 187: Moved typedef's and some #define's from fm3dll.h

Location:

trunk/dll

Files:

• inis.c (modified) (1 diff)
• init.c (modified) (4 diffs)
• input.c (modified) (1 diff)
• input.h (modified) (1 diff)
• instant.c (modified) (1 diff)
• key.c (modified) (1 diff)
• killproc.c (modified) (1 diff)
• mainwnd.c (modified) (1 diff)
• mainwnd.h (modified) (1 diff)
• mainwnd2.c (modified) (1 diff)

trunk/dll/inis.c

@@ -43 +43 @@
 
 #include "fm3dll.h"
+#include "fm3dll2.h"                    // #define's for UM_*, control id's, etc.
 #include "mainwnd2.h"                   // Data declaration(s)
 #include "collect.h"                    // Data declaration(s)

trunk/dll/init.c

@@ -64 +64 @@
 #include <share.h>
 #include <process.h>
+#include <time.h>
 
 #define INCL_DOS
@@ -78 +79 @@
 
 #include "fm3dll.h"
+#include "fm3dll2.h"                    // #define's for UM_*, control id's, etc.
+#include "init.h"
 #include "mkdir.h"                      // Data declaration(s)
 #include "dircnrs.h"                    // Data declaration(s)
@@ -84 +87 @@
 #include "fm2cmd.h"                     // Data declaration(s)
 #include "printer.h"                    // Data declaration(s)
-#include "init.h"                       // Data declaration(s)
 #include "flesh.h"                      // Data declaration(s)
 #include "worker.h"                     // Data declaration(s)
@@ -146 +148 @@
 #endif
 
-VOID FindSwapperDat(VOID);
+static VOID FindSwapperDat(VOID);
 
 // Data definitions

trunk/dll/input.c

@@ -22 +22 @@
 #define INCL_LONGLONG                   // dircnrs.h
 
+#include "fm3dll.h"
+#include "fm3dll2.h"                    // #define's for UM_*, control id's, etc.
+#include "input.h"
 #include "fm3dlg.h"
 #include "fm3str.h"
 #include "errutil.h"                    // Dos_Error...
 #include "strutil.h"                    // GetPString
-#include "input.h"
 #include "fm3dll.h"
 

trunk/dll/input.h

@@ -16 +16 @@
 #define INPUT_H
 
+typedef struct
+{
+  CHAR *title;                  /* title of dialog */
+  CHAR *prompt;                 /* prompt to user */
+  CHAR *ret;                    /* buffer out, default in */
+  CHAR *help;                   /* help text */
+  INT inputlen;                 /* max len of ret */
+}
+STRINGINPARMS;
+
 MRESULT EXPENTRY InputDlgProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2);
 

trunk/dll/instant.c

@@ -24 +24 @@
 
 #include "fm3dll.h"
+#include "fm3dll2.h"                    // #define's for UM_*, control id's, etc.
 #include "fm3dlg.h"
 #include "fm3str.h"

trunk/dll/key.c

@@ -24 +24 @@
 
 #include "fm3dll.h"
+#include "fm3dll2.h"                    // #define's for UM_*, control id's, etc.
 #include "mainwnd2.h"                   // Data declaration(s)
 #include "mainwnd.h"                    // Data declaration(s)

trunk/dll/killproc.c

@@ -34 +34 @@
 
 #include "fm3dll.h"
+#include "fm3dll2.h"                    // #define's for UM_*, control id's, etc.
 #include "init.h"                       // Data declaration(s)
 #include "notebook.h"                   // Data declaration(s)

trunk/dll/mainwnd.c

@@ -85 +85 @@
 
 #include "fm3dll.h"
+#include "fm3dll2.h"                    // #define's for UM_*, control id's, etc.
 #include "grep.h"                       // Data declaration(s)
 #include "autoview.h"                   // Data declaration(s)

trunk/dll/mainwnd.h

@@ -16 +16 @@
 
 #define MAINWND_H
+
+#include "colors.h"             // typedef for RGB2
 
 void BubbleHelp(HWND hwnd, BOOL other, BOOL data, BOOL above, char *help);

trunk/dll/mainwnd2.c

@@ -40 +40 @@
 
 #include "fm3dll.h"
+#include "fm3dll2.h"                    // #define's for UM_*, control id's, etc.
 #include "killproc.h"                   // Data declaration(s)
 #include "grep.h"                       // Data declaration(s)