Changeset 1215

Timestamp:

Sep 13, 2008, 8:54:03 AM (17 years ago)

Author:

John Small

Message:

Ticket 187: Move data declarations/definitions out of fm3dll.h

Location:

trunk

Files:

• dll/worker.c (modified) (2 diffs)
• dll/worker.h (modified) (1 diff)
• dll/wrappers.c (modified) (2 diffs)
• dll/wrappers.h (modified) (1 diff)
• eas.c (modified) (1 diff)
• fm3.c (modified) (2 diffs)
• fm4.c (modified) (1 diff)
• global.c (modified) (1 diff)
• ini.c (modified) (1 diff)
• killproc.c (modified) (1 diff)

trunk/dll/worker.c

@@ -49 +49 @@
 
 #include "fm3dll.h"
+#include "mainwnd2.h"                   // Data declaration(s)
+#include "arccnrs.h"                    // Data declaration(s)
+#include "init.h"                       // Data declaration(s)
+#include "defview.h"                    // Data declaration(s)
+#include "newview.h"                    // Data declarations
 #include "fm3dlg.h"
 #include "fm3str.h"
@@ -87 +92 @@
 #include "wrappers.h"                   // xfopen
 #include "fortify.h"
+
+// Data definitions
+#pragma data_seg(GLOBAL2)
+FILE *LogFileHandle;
 
 #pragma data_seg(DATA2)

trunk/dll/worker.h

@@ -20 +20 @@
 VOID MassAction(VOID * args);
 
+// Data declarations
+extern FILE *LogFileHandle;
+
 #endif  // WORKER_H

trunk/dll/wrappers.c

@@ -29 +29 @@
 
 #include "fm3dll.h"
+#include "init.h"                       // Data declaration(s)
 #include "wrappers.h"
 #include "fm3str.h"
@@ -40 +41 @@
 #include "fortify.h"                    // GetPString
 
+// Data definitions
 static PSZ pszSrcFile = __FILE__;
+
+#pragma data_seg(GLOBAL1)
+BOOL fNoLargeFileSupport;
 
 APIRET xDosFindFirst(PSZ pszFileSpec,

trunk/dll/wrappers.h

@@ -54 +54 @@
 PVOID xstrdup(PCSZ pszIn, PCSZ pszSrcFile, UINT uiLineNumber);
 
+// Data declarations
+extern BOOL fNoLargeFileSupport;
 
 #endif // WRAPPERS_H

trunk/eas.c

@@ -24 +24 @@
 
 #include "dll\fm3dll.h"
+#include "dll\notebook.h"                       // Data declaration(s)
+#include "dll\mainwnd.h"                        // Data declaration(s)
 #include "dll\fm3dlg.h"
 #include "dll\makelist.h"

trunk/fm3.c

@@ -20 +20 @@
 #define INCL_LONGLONG
 
+#include "dll\fm3dll.h"
+#include "dll\mainwnd.h"                        // Data declaration(s)
 #include "dll\tools.h"
 #include "dll\version.h"
@@ -25 +27 @@
 #include "dll\fortify.h"
 #include "dll\init.h"                   // StartFM3
-#include "dll\fm3dll.h"
+#include "dll\notebook.h"               // Data declaration(s)
 
 int main(int argc, char *argv[])

trunk/fm4.c

@@ -20 +20 @@
 
 #include "dll\fm3dll.h"
+#include "dll\mainwnd.h"                // Data declaration(s)
+#include "dll\notebook.h"               // Data declaration(s)
 #include "dll\tools.h"
 #include "dll\version.h"
-#include "dll\mainwnd2.h"                       // StartFM32
+#include "dll\mainwnd2.h"               // StartFM32
 #include "dll\init.h"                   // InitFM3DLL
 

trunk/global.c

@@ -19 +19 @@
 
 #include "dll\fm3dll.h"
+#include "dll\mainwnd.h"                // Data declaration(s)
+#include "dll\notebook.h"               // Data declaration(s)
 #include "dll\fm3str.h"
 #include "dll\seeall.h"                 // StartSeeAll

trunk/ini.c

@@ -17 +17 @@
 
 #include "dll\fm3dll.h"
+#include "dll\notebook.h"               // Data declaration(s)
 #include "dll\init.h"                   // InitFM3DLL
 #include "dll\inis.h"                   // StartIniEditor

trunk/killproc.c

@@ -17 +17 @@
 
 #include "dll\fm3dll.h"
+#include "dll\mainwnd.h"                        // Data declaration(s)
 #include "dll\fm3dlg.h"
-#include "dll\init.h"                   // InitFM3DLL
+#include "dll\init.h"                           // InitFM3DLL
 #include "dll\killproc.h"                       // KillDlgProc