Changeset 1221

Timestamp:

Sep 14, 2008, 1:10:12 AM (17 years ago)

Author:

John Small

Message:

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

Location:

trunk/dll

Files:

• chklist.c (modified) (1 diff)
• chklist.h (modified) (1 diff)
• cmdline.c (modified) (1 diff)
• codepage.c (modified) (1 diff)
• collect.c (modified) (1 diff)
• colors.c (modified) (1 diff)
• colors.h (modified) (1 diff)
• command.c (modified) (1 diff)
• common.c (modified) (1 diff)
• comp.c (modified) (1 diff)

trunk/dll/chklist.c

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

trunk/dll/chklist.h

@@ -17 +17 @@
 #define CHKLIST_H
 
+#define CHECK_FILES 1
+
+typedef struct
+{
+  USHORT size;
+  ULONG flags;
+  ULONG cmd;
+  USHORT dummy;
+  CHAR *prompt;
+  CHAR **list;
+}
+CHECKLIST;
+
 VOID CenterOverWindow(HWND hwnd);
 MRESULT EXPENTRY CheckListProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2);

trunk/dll/cmdline.c

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

trunk/dll/codepage.c

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

trunk/dll/collect.c

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

trunk/dll/colors.c

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

trunk/dll/colors.h

@@ -17 +17 @@
 #define COLORS_H
 
+typedef struct
+{
+  USHORT size;
+  USHORT numcolors;
+  USHORT flags;
+  USHORT currentcolor;
+  ULONG prompt;
+  long *colors;
+  ULONG descriptions;
+  long *origs;
+}
+COLORS;
+
+// PMBITMAP_INCLUDED - IBM Toolkit
+// INCL_GPIBITMAPS - OpenWatcom Toolkit
+#if !defined(PMBITMAP_INCLUDED) && !defined(INCL_GPIBITMAPS)
+typedef struct _RGB2           /* rgb2 */
+{
+  BYTE bBlue;                  /* Blue component of the color definition */
+  BYTE bGreen;                 /* Green component of the color definition */
+  BYTE bRed;                   /* Red component of the color definition  */
+  BYTE fcOptions;              /* Reserved, must be zero                 */
+}
+RGB2;
+typedef RGB2 *PRGB2;
+#endif
+
 MRESULT EXPENTRY ColorDlgProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2);
 

trunk/dll/command.c

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

trunk/dll/common.c

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

trunk/dll/comp.c

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