From c6842343501a6cc3782b7d2428947ef8d8b9b413 Mon Sep 17 00:00:00 2001
From: rnv <rnv@opencascade.com>
Date: Tue, 15 Nov 2011 07:07:18 +0000
Subject: [PATCH] rnv: Prepare SALOME-6.4.0 for Windows.

---
 src/Basics/Basics_Utils.cxx                   |  4 +-
 src/Basics/Basics_Utils.hxx                   | 20 ++++++-
 src/KernelHelpers/KernelHelpers.hxx           | 39 +++++++++++++
 src/KernelHelpers/KernelHelpersUseCases.cxx   |  7 ++-
 src/KernelHelpers/Makefile.am                 |  3 +-
 .../SALOMEDS_DriverDefaultImpl.hxx            | 56 ++++++++++---------
 src/KernelHelpers/SALOME_KernelServices.hxx   | 24 ++++----
 src/KernelHelpers/SALOME_StudyEditor.hxx      |  4 +-
 .../SALOMEDSImpl_StudyManager.cxx             | 14 ++---
 9 files changed, 115 insertions(+), 56 deletions(-)
 create mode 100755 src/KernelHelpers/KernelHelpers.hxx

diff --git a/src/Basics/Basics_Utils.cxx b/src/Basics/Basics_Utils.cxx
index eacda61be..8c19e413d 100644
--- a/src/Basics/Basics_Utils.cxx
+++ b/src/Basics/Basics_Utils.cxx
@@ -21,6 +21,7 @@
 //  Autor  : Alexander A. BORODIN
 //  Module : SALOME
 //
+
 #include "Basics_Utils.hxx"
 #include <string.h>
 #include <stdlib.h>
@@ -29,10 +30,9 @@
 #include <unistd.h>
 #include <sys/stat.h>
 #include <execinfo.h>
-#else
-#include <winsock2.h>
 #endif
 
+
 namespace Kernel_Utils
 {
   std::string GetHostname()
diff --git a/src/Basics/Basics_Utils.hxx b/src/Basics/Basics_Utils.hxx
index 507217dbe..94991fd81 100644
--- a/src/Basics/Basics_Utils.hxx
+++ b/src/Basics/Basics_Utils.hxx
@@ -26,13 +26,14 @@
 #define _Basics_UTILS_HXX_
 
 #include "SALOME_Basics.hxx"
-
 #include <string>
 #include <iostream>
+
 #ifndef WIN32
 #include <sys/time.h>
 #else
-#include <sys/timeb.h>
+#include <winsock2.h>
+#include <windows.h>
 #endif
 
 
@@ -68,7 +69,7 @@ namespace Kernel_Utils
 // Helper macro for time analysis
 // =============================================================
 //
-
+#ifndef WIN32
 #define START_TIMING(name) static long name##tcount=0;static long name##cumul;long name##tt0; timeval name##tv; gettimeofday(&name##tv,0); \
                            name##tt0=name##tv.tv_usec+name##tv.tv_sec*1000000; \
                            if(name##tcount==0)std::cerr<<__FILE__<<":"<<__LINE__<<":"<<#name<<std::endl;
@@ -78,6 +79,19 @@ namespace Kernel_Utils
                                 if(name##tcount==NUMBER){ \
                                   std::cerr <<__FILE__<<":"<<__LINE__<<":"<<#name<<" temps CPU(mus): "<< name##cumul<<std::endl; \
                                   name##tcount=0;name##cumul=0;}
+#else
+
+#define START_TIMING(name) static long name##tcount=0;static long name##cumul;long name##tt0; SYSTEMTIME name##tv; GetSystemTime(&name##tv); \
+                           name##tt0=name##tv.wMilliseconds + name##tv.wSecond*1000; \
+                           if(name##tcount==0)std::cerr<<__FILE__<<":"<<__LINE__<<":"<<#name<<std::endl;
+
+#define END_TIMING(name,NUMBER) name##tcount=name##tcount+1;GetSystemTime(&name##tv); \
+                                name##cumul=name##cumul+name##tv.wMilliseconds + name##tv.wSecond*1000 - name##tt0; \
+                                if(name##tcount==NUMBER){ \
+                                  std::cerr <<__FILE__<<":"<<__LINE__<<":"<<#name<<" temps CPU(mus): "<< name##cumul<<std::endl; \
+                                  name##tcount=0;name##cumul=0;}
+#endif
+
 
 
 //
diff --git a/src/KernelHelpers/KernelHelpers.hxx b/src/KernelHelpers/KernelHelpers.hxx
new file mode 100755
index 000000000..98a718493
--- /dev/null
+++ b/src/KernelHelpers/KernelHelpers.hxx
@@ -0,0 +1,39 @@
+// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+//  File   : SALOME_Basics.hxx
+//  Author : Roman NIKOLAEV
+//  Module : SALOME
+//  $Header$
+//
+#ifndef _SALOME_KERNEL_HELPERS_HXX_
+#define _SALOME_KERNEL_HELPERS_HXX_
+
+
+#ifdef WIN32
+# if defined KERNELHELPERS_EXPORTS || defined SalomeKernelHelpers_EXPORTS
+#  define KERNELHELPERS_EXPORT __declspec( dllexport )
+# else
+#  define KERNELHELPERS_EXPORT __declspec( dllimport )
+# endif
+#else
+# define KERNELHELPERS
+#endif
+
+#endif //_SALOME_KERNEL_HELPERS_HXX_
diff --git a/src/KernelHelpers/KernelHelpersUseCases.cxx b/src/KernelHelpers/KernelHelpersUseCases.cxx
index 1d788b92b..4c986cb74 100644
--- a/src/KernelHelpers/KernelHelpersUseCases.cxx
+++ b/src/KernelHelpers/KernelHelpersUseCases.cxx
@@ -96,8 +96,11 @@ bool TEST_getSalomeLauncher() {
     catch (const std::exception& ex) {
       LOG("Receive undefined exception : "<<ex.what());
     }
-
-    sleep(2);
+#ifndef WIN32
+      sleep(2);
+#else
+      Sleep(2000);
+#endif
   }
   return true;
 }
diff --git a/src/KernelHelpers/Makefile.am b/src/KernelHelpers/Makefile.am
index be6428219..5210fc3ea 100644
--- a/src/KernelHelpers/Makefile.am
+++ b/src/KernelHelpers/Makefile.am
@@ -27,7 +27,8 @@ include $(top_srcdir)/salome_adm/unix/make_common_starter.am
 salomeinclude_HEADERS =                \
 	SALOME_KernelServices.hxx      \
 	SALOME_StudyEditor.hxx         \
-	SALOMEDS_DriverDefaultImpl.hxx
+	SALOMEDS_DriverDefaultImpl.hxx \
+	KernelHelpers.hxx
 
 # Libraries targets
 lib_LTLIBRARIES = libSalomeKernelHelpers.la
diff --git a/src/KernelHelpers/SALOMEDS_DriverDefaultImpl.hxx b/src/KernelHelpers/SALOMEDS_DriverDefaultImpl.hxx
index 6f44ca6a9..ed611f80a 100644
--- a/src/KernelHelpers/SALOMEDS_DriverDefaultImpl.hxx
+++ b/src/KernelHelpers/SALOMEDS_DriverDefaultImpl.hxx
@@ -1,6 +1,8 @@
 #ifndef __SALOMEDS_DRIVER_DEFAULT_IMPL_H__
 #define __SALOMEDS_DRIVER_DEFAULT_IMPL_H__
 
+#include "KernelHelpers.hxx"
+
 #include "SALOME_Component_i.hxx"
 #include "SALOME_NamingService.hxx"
 
@@ -9,7 +11,7 @@
 
 //---------------------------------------------------------
 
-class SALOMEDS_DriverDefaultImpl:
+class KERNELHELPERS_EXPORT SALOMEDS_DriverDefaultImpl:
   public virtual POA_SALOMEDS::Driver
 //---------------------------------------------------------
   {
@@ -18,10 +20,10 @@ class SALOMEDS_DriverDefaultImpl:
     SALOMEDS_DriverDefaultImpl();
   public:
     SALOMEDS_DriverDefaultImpl(CORBA::ORB_ptr orb,
-			       PortableServer::POA_ptr poa,
-			       PortableServer::ObjectId * contId,
-			       const char *instanceName,
-			       const char *interfaceName);
+             PortableServer::POA_ptr poa,
+             PortableServer::ObjectId * contId,
+             const char *instanceName,
+             const char *interfaceName);
 
 
     virtual ~SALOMEDS_DriverDefaultImpl();
@@ -32,45 +34,45 @@ class SALOMEDS_DriverDefaultImpl:
 
     //virtual SALOMEDS::TMPFile* Save(SALOMEDS::SComponent_ptr theComponent,
      SALOMEDS::TMPFile* Save(SALOMEDS::SComponent_ptr theComponent,
-				    const char* theURL,
-				    bool isMultiFile);
+            const char* theURL,
+            bool isMultiFile);
 
     virtual SALOMEDS::TMPFile* SaveASCII(SALOMEDS::SComponent_ptr theComponent,
-					 const char* theURL,
-					 bool isMultiFile);
+           const char* theURL,
+           bool isMultiFile);
 
     virtual bool Load(SALOMEDS::SComponent_ptr,
-		      const SALOMEDS::TMPFile &,
-		      const char* theURL,
-		      bool isMultiFile);
+          const SALOMEDS::TMPFile &,
+          const char* theURL,
+          bool isMultiFile);
 
     virtual bool LoadASCII(SALOMEDS::SComponent_ptr,
-			   const SALOMEDS::TMPFile &,
-			   const char* theURL,
-			   bool isMultiFile);
+         const SALOMEDS::TMPFile &,
+         const char* theURL,
+         bool isMultiFile);
 
     virtual void Close(SALOMEDS::SComponent_ptr IORSComponent);
 
     virtual char* ComponentDataType();
 
     virtual char* IORToLocalPersistentID(SALOMEDS::SObject_ptr theSObject,
-					 const char* IORString,
-					 CORBA::Boolean isMultiFile,
-					 CORBA::Boolean isASCII);
+           const char* IORString,
+           CORBA::Boolean isMultiFile,
+           CORBA::Boolean isASCII);
 
     virtual char* LocalPersistentIDToIOR(SALOMEDS::SObject_ptr theSObject,
-					 const char* aLocalPersistentID,
-					 CORBA::Boolean isMultiFile,
-					 CORBA::Boolean isASCII);
+           const char* aLocalPersistentID,
+           CORBA::Boolean isMultiFile,
+           CORBA::Boolean isASCII);
 
     virtual bool CanPublishInStudy(CORBA::Object_ptr theIOR);
 
     virtual SALOMEDS::SObject_ptr PublishInStudy
                              (SALOMEDS::Study_ptr theStudy,
-		              SALOMEDS::SObject_ptr theSObject,
-			      CORBA::Object_ptr theObject,
-			      const char* theName) 
-			      	throw (SALOME::SALOME_Exception);
+                  SALOMEDS::SObject_ptr theSObject,
+            CORBA::Object_ptr theObject,
+            const char* theName) 
+              throw (SALOME::SALOME_Exception);
 
     virtual CORBA::Boolean CanCopy(SALOMEDS::SObject_ptr theObject);
 
@@ -81,7 +83,7 @@ class SALOMEDS_DriverDefaultImpl:
                             CORBA::Long theObjectID);
 
     virtual SALOMEDS::SObject_ptr PasteInto(const SALOMEDS::TMPFile& theStream,
-				    CORBA::Long theObjectID,
-				    SALOMEDS::SObject_ptr theObject);
+            CORBA::Long theObjectID,
+            SALOMEDS::SObject_ptr theObject);
   };
 #endif
diff --git a/src/KernelHelpers/SALOME_KernelServices.hxx b/src/KernelHelpers/SALOME_KernelServices.hxx
index 875a1c46d..7caf01a75 100644
--- a/src/KernelHelpers/SALOME_KernelServices.hxx
+++ b/src/KernelHelpers/SALOME_KernelServices.hxx
@@ -21,6 +21,8 @@
 #ifndef __KERNEL_SERVICES_H__
 #define __KERNEL_SERVICES_H__
 
+#include "KernelHelpers.hxx"
+
 #include "SALOMEconfig.h"
 #include CORBA_SERVER_HEADER(SALOMEDS)
 #include CORBA_SERVER_HEADER(SALOMEDS_Attributes)
@@ -35,22 +37,22 @@ namespace KERNEL {
 
   // ---------------------------------------------
   // SALOME KERNEL main services
-  CORBA::ORB_ptr                getORB();
-  SALOME_NamingService *        getNamingService();
-  SALOME_LifeCycleCORBA *       getLifeCycleCORBA();
-  SALOME::Session_ptr           getSalomeSession();
-  SALOMEDS::StudyManager_ptr    getStudyManager();
-  Engines::SalomeLauncher_ptr   getSalomeLauncher();
-  Engines::ResourcesManager_ptr getResourcesManager();
+  KERNELHELPERS_EXPORT CORBA::ORB_ptr                getORB();
+  KERNELHELPERS_EXPORT SALOME_NamingService *        getNamingService();
+  KERNELHELPERS_EXPORT SALOME_LifeCycleCORBA *       getLifeCycleCORBA();
+  KERNELHELPERS_EXPORT SALOME::Session_ptr           getSalomeSession();
+  KERNELHELPERS_EXPORT SALOMEDS::StudyManager_ptr    getStudyManager();
+  KERNELHELPERS_EXPORT Engines::SalomeLauncher_ptr   getSalomeLauncher();
+  KERNELHELPERS_EXPORT Engines::ResourcesManager_ptr getResourcesManager();
 
   // ---------------------------------------------
   // SALOME KERNEL services to deal with a SALOME study, SObject and
   // SComponent.
   //
-  SALOMEDS::Study_ptr getStudyById(int aStudyId);
-  int                 getStudyId(SALOMEDS::Study_ptr study);
-  CORBA::Object_ptr   IORToObject(char * IOR);
-  CORBA::Object_ptr   SObjectToObject(SALOMEDS::SObject_ptr);
+  KERNELHELPERS_EXPORT SALOMEDS::Study_ptr getStudyById(int aStudyId);
+  KERNELHELPERS_EXPORT int                 getStudyId(SALOMEDS::Study_ptr study);
+  KERNELHELPERS_EXPORT CORBA::Object_ptr   IORToObject(char * IOR);
+  KERNELHELPERS_EXPORT CORBA::Object_ptr   SObjectToObject(SALOMEDS::SObject_ptr);
   
 
 
diff --git a/src/KernelHelpers/SALOME_StudyEditor.hxx b/src/KernelHelpers/SALOME_StudyEditor.hxx
index b3b56d52d..e2ea1ce6e 100644
--- a/src/KernelHelpers/SALOME_StudyEditor.hxx
+++ b/src/KernelHelpers/SALOME_StudyEditor.hxx
@@ -21,13 +21,15 @@
 #ifndef __STUDY_EDITOR_HXX__
 #define __STUDY_EDITOR_HXX__
 
+#include "KernelHelpers.hxx"
+
 #include <SALOMEconfig.h>
 #include CORBA_CLIENT_HEADER(SALOMEDS)
 #include CORBA_SERVER_HEADER(SALOME_Component)
 
 #include <vector>
 
-class SALOME_StudyEditor {
+class KERNELHELPERS_EXPORT SALOME_StudyEditor {
 
 public:
   SALOME_StudyEditor(int studyId);
diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_StudyManager.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_StudyManager.cxx
index 96fb9c896..67f16053a 100644
--- a/src/SALOMEDSImpl/SALOMEDSImpl_StudyManager.cxx
+++ b/src/SALOMEDSImpl/SALOMEDSImpl_StudyManager.cxx
@@ -30,6 +30,11 @@
 #include "HDFexplorer.hxx"
 #include "Basics_Utils.hxx"
 
+//Warning undef of Ascii Winwows define
+#ifdef WIN32
+# undef GetUserName
+#endif
+
 #include "SALOMEDSImpl_Attributes.hxx"
 #include "SALOMEDSImpl_Tool.hxx"
 #include "SALOMEDSImpl_SComponent.hxx"
@@ -42,15 +47,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef WIN32
-#include <Windows.h>
-#endif
-
-//Warning undef of Ascii Winwows define
-#ifdef WIN32
-# undef GetUserName
-#endif
-
 #define USE_CASE_LABEL_ID                       "0:2"
 
 static void SaveAttributes(const SALOMEDSImpl_SObject& SO, HDFgroup *hdf_group_sobject);
-- 
2.39.2