Changeset 301

Timestamp:

01/19/15 01:50:31 (10 years ago)

Author:

Maciej Komosinski

Message:

VirtFILE can have fields and still be used as a DLL thanks to declspec(dllimport)

Location:

cpp/frams/virtfile

Files:

• virtfile.cpp (modified) (6 diffs)
• virtfile.h (modified) (2 diffs)

cpp/frams/virtfile/virtfile.cpp

@@ -12 +12 @@
 VirtFileSystem *VirtFILE::vfs = NULL;
 
-VirtFILE *Vfopen(const char* path,const char*mode)
-{
+//#define DEBUG_DLL_CALLS
+
+VirtFILE *Vfopen(const char* path,const char* mode)
+{
+#ifdef DEBUG_DLL_CALLS
+printf("VirtFILE::Vfopen %s %s (vfs=%p)\n",path,mode,VirtFILE::vfs);
+#endif
 return VirtFILE::vfs ? VirtFILE::vfs->Vfopen(path,mode) : NULL;
 }
@@ -19 +24 @@
 VirtDIR *Vopendir(const char* path)
 {
+#ifdef DEBUG_DLL_CALLS
+printf("VirtFILE::Vfopendir %s (vfs=%p)\n",path,VirtFILE::vfs);
+#endif
 return VirtFILE::vfs ? VirtFILE::vfs->Vopendir(path) : NULL;
 }
@@ -45 +53 @@
 {}
 
-void VirtFILE::selectFileSystem(VirtFileSystem *s) {vfs=s;}
+void VirtFILE::selectFileSystem(VirtFileSystem *s)
+{
+vfs=s;
+#ifdef DEBUG_DLL_CALLS
+::printf("VirtFILE::selectFileSystem: %p := %p\n",vfs,s);
+#endif
+}
 
 int VirtFILE::Vprintf(const char *format, va_list args)
@@ -80 +94 @@
 
 // base class only returns NULL/false/not supported - implementations perform the actual work
-VirtFILE* VirtFileSystem::Vfopen(const char* path,const char*mode) {return NULL;}
+VirtFILE* VirtFileSystem::Vfopen(const char* path,const char* mode) {return NULL;}
 bool VirtFileSystem::Vfexists(const char* path) {return false;}
 VirtDIR* VirtFileSystem::Vopendir(const char* path) {return NULL;}
@@ -147 +161 @@
 //////////
 
-VirtFILE *ChainFileSystem::Vfopen(const char* path, const char*mode)
-{
+
+ChainFileSystem::ChainFileSystem(VirtFileSystem *_chain)
+{
+        chain=_chain;
+#ifdef DEBUG_DLL_CALLS
+printf("ChainFileSystem constructor: %p := %p\n",chain,_chain);
+#endif
+}
+
+
+VirtFILE *ChainFileSystem::Vfopen(const char* path, const char* mode)
+{
+#ifdef DEBUG_DLL_CALLS
+printf("ChainFileSystem::Vfopen %s %s (chain=%p)\n",path,mode,chain);
+#endif
         return (chain != NULL) ? chain->Vfopen(path, mode) : NULL;
 }
@@ -159 +186 @@
 VirtDIR *ChainFileSystem::Vopendir(const char* path)
 {
+#ifdef DEBUG_DLL_CALLS
+printf("ChainFileSystem::Vfopendir %s (chain=%p)\n",path,chain);
+#endif
         return (chain != NULL) ? chain->Vopendir(path) : NULL;
 }

cpp/frams/virtfile/virtfile.h

@@ -11 +11 @@
 #include <string>
 using std::string;
-//#include <dirent.h> //to jest inkludowane przez powyzsze 
-//struct dirent; //kiedys byla ta linia jak nie bylo jeszcze implementacji windowsowej dirent, ale borlandowi sie nie podoba jak s¹ obie
 
-#ifdef DLLEXPORTACTIVE  //tylko w tym pliku uzyte
+#ifdef DLLEXPORTACTIVE  //defined in the project that makes the DLL
 #define DLLEXP __declspec(dllexport)
 #else
+#ifdef __BORLANDC__ //assuming that all executables produced by borland use the DLL
+#define DLLEXP __declspec(dllimport) //without dllimport, fields in objects would have separate instances in DLL and in EXE
+#else
 #define DLLEXP
+#endif
 #endif
 
@@ -102 +104 @@
 public:
         VirtFileSystem *chain;
-        ChainFileSystem(VirtFileSystem *_chain = NULL) :chain(_chain) {}
+        ChainFileSystem(VirtFileSystem *_chain = NULL);
         VirtFILE *Vfopen(const char* path, const char*mode);
         bool Vfexists(const char* path);