From 742cc8b01d3f45327a482cfba317e7cd08a86114 Mon Sep 17 00:00:00 2001
From: ski <ski@opencascade.com>
Date: Fri, 12 Aug 2016 18:38:48 +0300
Subject: [PATCH] 0027350: Support for Universal Windows Platform

- Toolchain file to configure a Visual Studio generator for a Windows 10 Universal Application was added (CMake).
- There is no support for environment variables in UWP.
- SID is not supported (were excluded).
- Windows registry is not supported (were excluded).
- Mess with usage of Unicode/ANSI was corrected.
- Added sample to check UWP functionality.
- Excluded usage of methods with Unicode characters where it is possible.
- Minor corrections to allow building OCAF (except TKVCAF) and DE (except VRML and XDE)
- Building of unsupported modules for UWP platform is off by default .
- Checking of DataExchange functionality was added to XAML (UWP) sample.
- Added information about UWP to the documentation.
- Update of results of merge with issue 27801
---
 CMakeLists.txt                                |  19 +-
 adm/cmake/vardescr.cmake                      |  11 +-
 adm/templates/uwp.toolchain.config.cmake      |   5 +
 dox/dev_guides/building/cmake/cmake.md        |   4 +
 dox/dev_guides/debug/debug.md                 |   2 +
 samples/xaml/App.xaml                         |   7 +
 samples/xaml/App.xaml.cpp                     | 124 +++++
 samples/xaml/App.xaml.h                       |  27 ++
 .../xaml/Assets/LockScreenLogo.scale-200.png  | Bin 0 -> 1430 bytes
 .../xaml/Assets/SplashScreen.scale-200.png    | Bin 0 -> 7700 bytes
 .../Assets/Square150x150Logo.scale-200.png    | Bin 0 -> 2937 bytes
 .../xaml/Assets/Square44x44Logo.scale-200.png | Bin 0 -> 1647 bytes
 ...x44Logo.targetsize-24_altform-unplated.png | Bin 0 -> 1255 bytes
 samples/xaml/Assets/StoreLogo.png             | Bin 0 -> 1451 bytes
 .../xaml/Assets/Wide310x150Logo.scale-200.png | Bin 0 -> 3204 bytes
 samples/xaml/CMakeLists.txt                   |  99 ++++
 samples/xaml/MainPage.xaml                    |  47 ++
 samples/xaml/MainPage.xaml.cpp                | 457 ++++++++++++++++++
 samples/xaml/MainPage.xaml.h                  |  51 ++
 samples/xaml/Package.appxmanifest             |  49 ++
 samples/xaml/ReadMe.md                        |  20 +
 samples/xaml/pch.cpp                          |   6 +
 samples/xaml/pch.h                            |  11 +
 samples/xaml/uwp_TemporaryKey.pfx             | Bin 0 -> 2446 bytes
 src/AppParCurves/AppParCurves_BSpGradient.gxx |   6 -
 .../BRepAlgoAPI_BooleanOperation.cxx          |   8 +-
 src/BRepPrimAPI/BRepPrimAPI_MakeCone.cxx      |  27 +-
 src/BRepPrimAPI/BRepPrimAPI_MakeCylinder.cxx  |  28 +-
 src/BRepPrimAPI/BRepPrimAPI_MakeSphere.cxx    |  26 +-
 .../BRepTools_NurbsConvertModification.cxx    |   1 -
 src/BiTgte/BiTgte_Blend.cxx                   |   7 +-
 src/CDF/CDF.hxx                               |  38 --
 src/CDF/CDF_Application.cxx                   |  37 +-
 src/CDF/CDF_StoreList.cxx                     |   9 -
 src/CDF/CDF_Timer.cxx                         |  49 --
 src/CDF/CDF_Timer.hxx                         |  71 ---
 src/CDF/FILES                                 |   2 -
 src/ChFi3d/ChFi3d_Builder_0.cxx               |   3 -
 src/ChFi3d/ChFi3d_Builder_6.cxx               |   5 -
 src/ChFi3d/ChFi3d_Debug.cxx                   |   5 +-
 src/ChFi3d/ChFi3d_FilBuilder.cxx              |   1 +
 src/IFSelect/IFSelect_SessionPilot.cxx        |  13 +-
 src/OSD/OSD.hxx                               |   1 -
 src/OSD/OSD_Chronometer.cxx                   |  10 +
 src/OSD/OSD_Directory.cxx                     |  24 +-
 src/OSD/OSD_DirectoryIterator.cxx             |   2 +-
 src/OSD/OSD_Disk.cxx                          |  54 ++-
 src/OSD/OSD_Environment.cxx                   |  13 +
 src/OSD/OSD_Error.cxx                         |  55 +--
 src/OSD/OSD_File.cxx                          | 175 ++++---
 src/OSD/OSD_FileIterator.cxx                  |   2 +-
 src/OSD/OSD_FileNode.cxx                      | 173 ++++---
 src/OSD/OSD_FileNode.hxx                      |   5 +-
 src/OSD/OSD_Host.cxx                          |   4 +-
 src/OSD/OSD_MemInfo.cxx                       |   3 +-
 src/OSD/OSD_Parallel.cxx                      |   9 +-
 src/OSD/OSD_Process.cxx                       |  21 +-
 src/OSD/OSD_SharedLibrary.cxx                 |  43 +-
 src/OSD/OSD_Timer.cxx                         |   5 +-
 src/OSD/OSD_WNT.cxx                           | 120 +++--
 src/OSD/OSD_signal.cxx                        |  96 ++--
 src/Resource/Resource_Manager.cxx             |  19 +-
 src/Standard/Standard.cxx                     |   6 +
 src/Standard/Standard_MMgrOpt.cxx             |  25 +-
 src/Standard/Standard_Macro.hxx               |  11 +-
 src/TKSTL/EXTERNLIB                           |   1 -
 .../TopOpeBRep_EdgesIntersector.cxx           |   1 -
 .../TopOpeBRepTool_CurveTool.cxx              |   1 -
 .../XmlLDrivers_DocumentStorageDriver.cxx     |   7 +-
 69 files changed, 1524 insertions(+), 637 deletions(-)
 create mode 100644 adm/templates/uwp.toolchain.config.cmake
 create mode 100644 samples/xaml/App.xaml
 create mode 100644 samples/xaml/App.xaml.cpp
 create mode 100644 samples/xaml/App.xaml.h
 create mode 100644 samples/xaml/Assets/LockScreenLogo.scale-200.png
 create mode 100644 samples/xaml/Assets/SplashScreen.scale-200.png
 create mode 100644 samples/xaml/Assets/Square150x150Logo.scale-200.png
 create mode 100644 samples/xaml/Assets/Square44x44Logo.scale-200.png
 create mode 100644 samples/xaml/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
 create mode 100644 samples/xaml/Assets/StoreLogo.png
 create mode 100644 samples/xaml/Assets/Wide310x150Logo.scale-200.png
 create mode 100644 samples/xaml/CMakeLists.txt
 create mode 100644 samples/xaml/MainPage.xaml
 create mode 100644 samples/xaml/MainPage.xaml.cpp
 create mode 100644 samples/xaml/MainPage.xaml.h
 create mode 100644 samples/xaml/Package.appxmanifest
 create mode 100644 samples/xaml/ReadMe.md
 create mode 100644 samples/xaml/pch.cpp
 create mode 100644 samples/xaml/pch.h
 create mode 100644 samples/xaml/uwp_TemporaryKey.pfx
 delete mode 100644 src/CDF/CDF_Timer.cxx
 delete mode 100644 src/CDF/CDF_Timer.hxx

diff --git a/CMakeLists.txt b/CMakeLists.txt
index de625e74f2..356714015d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -65,7 +65,7 @@ if (DEFINED CMAKE_BUILD_TYPE AND NOT CMAKE_BUILD_TYPE) # single-configuration ge
 endif()
 
 # enable extended messages of many OCCT algorithms
-if ((SINGLE_GENERATOR AND "${CMAKE_BUILD_TYPE}" STREQUAL "Debug") OR NOT SINGLE_GENERATOR)
+if (((SINGLE_GENERATOR AND "${CMAKE_BUILD_TYPE}" STREQUAL "Debug") OR NOT SINGLE_GENERATOR) AND (NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsStore"))
   if (NOT BUILD_WITH_DEBUG)
     set (BUILD_WITH_DEBUG OFF CACHE BOOL "${BUILD_WITH_DEBUG_DESCR}")
   endif()
@@ -309,6 +309,15 @@ if (MSVC)
   set (BUILD_MODULE_MfcSamples OFF CACHE BOOL "${BUILD_MODULE_MfcSamples_DESCR}")
 endif()
 
+# uwp sample
+if (MSVC)
+  if ("${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsStore")
+    set (BUILD_MODULE_UwpSample OFF CACHE BOOL "${BUILD_MODULE_UwpSample_DESCR}")
+  else()
+    unset (BUILD_MODULE_UwpSample)
+  endif()
+endif()
+
 # whether use optional 3rdparty or not
 if (APPLE)
   set (USE_GLX OFF CACHE BOOL "${USE_GLX_DESCR}")
@@ -647,6 +656,10 @@ if (INSTALL_SAMPLES)
     OCCT_INSTALL_FILE_OR_DIR ("samples/CSharp" "${INSTALL_DIR}/${INSTALL_DIR_SAMPLES}")
     OCCT_INSTALL_FILE_OR_DIR ("samples/mfc" "${INSTALL_DIR}/${INSTALL_DIR_SAMPLES}")
 
+    if ("${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsStore")
+      OCCT_INSTALL_FILE_OR_DIR ("samples/xaml" "${INSTALL_DIR}/${INSTALL_DIR_SAMPLES}")
+    endif()
+
     install (FILES "${CMAKE_BINARY_DIR}/env.samples.${SCRIPT_EXT}" DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_SAMPLES}/CSharp" RENAME "env.${SCRIPT_EXT}")
     install (FILES "${CMAKE_BINARY_DIR}/env.samples.${SCRIPT_EXT}" DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_SAMPLES}/mfc/standard" RENAME "env.${SCRIPT_EXT}")
   endif()
@@ -795,6 +808,10 @@ if (BUILD_MODULE_MfcSamples)
   add_subdirectory(samples/mfc/standard/10_Convert)
 endif()
 
+if (BUILD_MODULE_UwpSample)
+  add_subdirectory(samples/xaml)
+endif()
+
 # Prepare variables for configuration of OpenCASCADE cmake config file
 set (OCCT_MODULES_ENABLED)
 set (OCCT_LIBRARIES)
diff --git a/adm/cmake/vardescr.cmake b/adm/cmake/vardescr.cmake
index c406cd4b52..eb64e81a69 100644
--- a/adm/cmake/vardescr.cmake
+++ b/adm/cmake/vardescr.cmake
@@ -108,6 +108,9 @@ set (BUILD_MODULE_MfcSamples_DESCR
 These samples show some possibilities of using OCCT and they can be executed
 with script samples.bat from the installation directory (INSTALL_DIR)")
 
+set (BUILD_MODULE_UwpSample_DESCR
+"Indicates whether OCCT UWP sample should be built together with OCCT.")
+
 set (BUILD_DOC_Overview_DESCR
 "Indicates whether OCCT overview documentation project (Markdown format) should be
 created together with OCCT. It is not built together with OCCT. Checking this options
@@ -144,5 +147,11 @@ set (USE_GLX_DESCR "Indicates whether X11 OpenGl on OSX is used or not")
 set (USE_D3D_DESCR "Indicates whether optional Direct3D wrapper in OCCT visualization module should be build or not")
 
 macro (BUILD_MODULE MODULE_NAME)
-  set (BUILD_MODULE_${MODULE_NAME} ON CACHE BOOL "${BUILD_MODULE_${MODULE_NAME}_DESCR}")
+  set (ENABLE_MODULE TRUE)
+  set (OCCT_MODULES_FOR_UWP FoundationClasses ModelingAlgorithms ModelingData)
+  list (FIND OCCT_MODULES_FOR_UWP ${OCCT_MODULE} CAN_BE_USED_IN_UWP)
+  if ("${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsStore" AND CAN_BE_USED_IN_UWP EQUAL -1)
+    set (ENABLE_MODULE FALSE)
+  endif()
+  set (BUILD_MODULE_${MODULE_NAME} ${ENABLE_MODULE} CACHE BOOL "${BUILD_MODULE_${MODULE_NAME}_DESCR}")
 endmacro()
diff --git a/adm/templates/uwp.toolchain.config.cmake b/adm/templates/uwp.toolchain.config.cmake
new file mode 100644
index 0000000000..4dbd2ae6a9
--- /dev/null
+++ b/adm/templates/uwp.toolchain.config.cmake
@@ -0,0 +1,5 @@
+# A toolchain file to configure a Visual Studio generator for a Windows 10 Universal Application (UWP)
+# Specify the CMAKE_SYSTEM_VERSION variable to be 10.0 to build with the latest available Windows 10 SDK.
+
+set (CMAKE_SYSTEM_NAME WindowsStore)
+set (CMAKE_SYSTEM_VERSION 10.0)
diff --git a/dox/dev_guides/building/cmake/cmake.md b/dox/dev_guides/building/cmake/cmake.md
index ab4314b13f..c0892737fa 100644
--- a/dox/dev_guides/building/cmake/cmake.md
+++ b/dox/dev_guides/building/cmake/cmake.md
@@ -60,6 +60,10 @@ Once the source and build directories are selected, "Configure" button should be
 
 @figure{/dev_guides/building/cmake/images/cmake_image002.png}
 
+To build OCCT with using Universal Windows Platform (UWP) specify path to toolchain file for cross-compiling <i>d:/occt/adm/templates/uwp.toolchain.config.cmake</i>.
+
+**Note**: Universal Windows Platform (UWP) is supported only on "Visual Studio 14 2015". File <i>d:/occt/samples/xaml/ReadMe.md</i> desribes building procedure of XAML (UWP) sample.
+
 Once "Finish" button is pressed, the first pass of the configuration process is executed. At the end of the process, CMake outputs the list of environment variables which have to be properly specified for successful configuration. 
 
 @figure{/dev_guides/building/cmake/images/cmake_image003.png}
diff --git a/dox/dev_guides/debug/debug.md b/dox/dev_guides/debug/debug.md
index 963957c46c..d48434f09f 100644
--- a/dox/dev_guides/debug/debug.md
+++ b/dox/dev_guides/debug/debug.md
@@ -35,6 +35,8 @@ This feature can be activated by defining environment variable *CSF_DEBUG_BOP*,
 
 The diagnostic code checks validity of the input arguments and the result of each Boolean operation. When an invalid situation is detected, the report consisting of argument shapes and a DRAW script to reproduce the problematic operation is saved to the directory pointed by *CSF_DEBUG_BOP*.
 
+Note that this feature does not applicable for UWP build.
+
 @section occt_debug_call Functions for calling from debugger
 
 Modern interactive debuggers provide the possibility to execute application code at a program break point. This feature can be used to analyse the temporary objects available only in the context of the debugged code. OCCT provides several global functions that can be used in this way.
diff --git a/samples/xaml/App.xaml b/samples/xaml/App.xaml
new file mode 100644
index 0000000000..e922bc13c4
--- /dev/null
+++ b/samples/xaml/App.xaml
@@ -0,0 +1,7 @@
+<Application
+  x:Class="uwp.App"
+  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+  xmlns:local="using:uwp"
+  RequestedTheme="Light">
+</Application>
diff --git a/samples/xaml/App.xaml.cpp b/samples/xaml/App.xaml.cpp
new file mode 100644
index 0000000000..a948197a29
--- /dev/null
+++ b/samples/xaml/App.xaml.cpp
@@ -0,0 +1,124 @@
+//
+// App.xaml.cpp
+// Implementation of the App class.
+//
+
+#include "pch.h"
+#include "MainPage.xaml.h"
+
+using namespace uwp;
+
+using namespace Platform;
+using namespace Windows::ApplicationModel;
+using namespace Windows::ApplicationModel::Activation;
+using namespace Windows::Foundation;
+using namespace Windows::Foundation::Collections;
+using namespace Windows::UI::Xaml;
+using namespace Windows::UI::Xaml::Controls;
+using namespace Windows::UI::Xaml::Controls::Primitives;
+using namespace Windows::UI::Xaml::Data;
+using namespace Windows::UI::Xaml::Input;
+using namespace Windows::UI::Xaml::Interop;
+using namespace Windows::UI::Xaml::Media;
+using namespace Windows::UI::Xaml::Navigation;
+
+/// <summary>
+/// Initializes the singleton application object.  This is the first line of authored code
+/// executed, and as such is the logical equivalent of main() or WinMain().
+/// </summary>
+App::App()
+{
+  InitializeComponent();
+  Suspending += ref new SuspendingEventHandler(this, &App::OnSuspending);
+}
+
+/// <summary>
+/// Invoked when the application is launched normally by the end user.  Other entry points
+/// will be used such as when the application is launched to open a specific file.
+/// </summary>
+/// <param name="theEvent">Details about the launch request and process.</param>
+void App::OnLaunched(Windows::ApplicationModel::Activation::LaunchActivatedEventArgs^ theEvent)
+{
+#if _DEBUG
+  // Show graphics profiling information while debugging.
+  if (IsDebuggerPresent())
+  {
+    // Display the current frame rate counters
+    DebugSettings->EnableFrameRateCounter = true;
+  }
+#endif
+  auto rootFrame = dynamic_cast<Frame^>(Window::Current->Content);
+
+  // Do not repeat app initialization when the Window already has content,
+  // just ensure that the window is active
+  if (rootFrame == nullptr)
+  {
+    // Create a Frame to act as the navigation context and associate it with
+    // a SuspensionManager key
+    rootFrame = ref new Frame();
+
+    rootFrame->NavigationFailed += ref new Windows::UI::Xaml::Navigation::NavigationFailedEventHandler(this, &App::OnNavigationFailed);
+
+    if (theEvent->PreviousExecutionState == ApplicationExecutionState::Terminated)
+    {
+      // TODO: Restore the saved session state only when appropriate, scheduling the
+      // final launch steps after the restore is complete
+
+    }
+
+    if (theEvent->PrelaunchActivated == false)
+    {
+      if (rootFrame->Content == nullptr)
+      {
+        // When the navigation stack isn't restored navigate to the first page,
+        // configuring the new page by passing required information as a navigation
+        // parameter
+        rootFrame->Navigate(TypeName(MainPage::typeid), theEvent->Arguments);
+      }
+      // Place the frame in the current Window
+      Window::Current->Content = rootFrame;
+      // Ensure the current window is active
+      Window::Current->Activate();
+    }
+  }
+  else
+  {
+    if (theEvent->PrelaunchActivated == false)
+    {
+      if (rootFrame->Content == nullptr)
+      {
+        // When the navigation stack isn't restored navigate to the first page,
+        // configuring the new page by passing required information as a navigation
+        // parameter
+        rootFrame->Navigate(TypeName(MainPage::typeid), theEvent->Arguments);
+      }
+      // Ensure the current window is active
+      Window::Current->Activate();
+    }
+  }
+}
+
+/// <summary>
+/// Invoked when application execution is being suspended.  Application state is saved
+/// without knowing whether the application will be terminated or resumed with the contents
+/// of memory still intact.
+/// </summary>
+/// <param name="theSender">The source of the suspend request.</param>
+/// <param name="theEvent">Details about the suspend request.</param>
+void App::OnSuspending(Object^ theSender, SuspendingEventArgs^ theEvent)
+{
+  (void)theSender;  // Unused parameter
+  (void)theEvent;   // Unused parameter
+
+                    //TODO: Save application state and stop any background activity
+}
+
+/// <summary>
+/// Invoked when Navigation to a certain page fails
+/// </summary>
+/// <param name="theSender">The Frame which failed navigation</param>
+/// <param name="theEvent">Details about the navigation failure</param>
+void App::OnNavigationFailed(Platform::Object ^theSender, Windows::UI::Xaml::Navigation::NavigationFailedEventArgs ^theEvent)
+{
+  throw ref new FailureException("Failed to load Page " + theEvent->SourcePageType.Name);
+}
\ No newline at end of file
diff --git a/samples/xaml/App.xaml.h b/samples/xaml/App.xaml.h
new file mode 100644
index 0000000000..20cba08021
--- /dev/null
+++ b/samples/xaml/App.xaml.h
@@ -0,0 +1,27 @@
+//
+// App.xaml.h
+// Declaration of the App class.
+//
+
+#pragma once
+
+#include "App.g.h"
+
+namespace uwp
+{
+  /// <summary>
+  /// Provides application-specific behavior to supplement the default Application class.
+  /// </summary>
+  ref class App sealed
+  {
+  protected:
+    virtual void OnLaunched(Windows::ApplicationModel::Activation::LaunchActivatedEventArgs^ theEvent) override;
+
+  internal:
+    App();
+
+  private:
+    void OnSuspending(Platform::Object^ theSender, Windows::ApplicationModel::SuspendingEventArgs^ theEvent);
+    void OnNavigationFailed(Platform::Object ^theSender, Windows::UI::Xaml::Navigation::NavigationFailedEventArgs ^theEvent);
+  };
+}
diff --git a/samples/xaml/Assets/LockScreenLogo.scale-200.png b/samples/xaml/Assets/LockScreenLogo.scale-200.png
new file mode 100644
index 0000000000000000000000000000000000000000..735f57adb5dfc01886d137b4e493d7e97cf13af3
GIT binary patch
literal 1430
zcmaJ>TTC2P7~aKltDttVHYH6u8Io4i*}3fO&d$gd*bA_<3j~&e7%8(eXJLfhS!M@!
zKrliY>>6yT4+Kr95$!DoD(Qn-5TP|{V_KS`k~E6(LGS@#`v$hQo&^^BKsw3HIsZBT
z_y6C2n`lK@apunKojRQ^(_P}Mgewt$(^BBKCTZ;*xa?J3wQ7~@S0lUvbcLeq1Bg4o
zH-bvQi|wt~L7q<c#Bs@6tJZpsaDp5#@^Kxb76?JKPM4Rjg?OPEsE7|VN<kaCGX4#U
zNTLm`F?$G4$N`$9k`4t_b(DF9j%I-s(fmV5p2k4~0ig1T7HA2EIn9Qy+vVUsevG5Y
zx{BItLpMm(dMXfytN_Gpv|s{3(g?#ENwbAvnU@d>$~a-gDFP!{&TQfc3fX*6=uHv*
zT&1&U(-)L%Xp^djI2?~eBF2cxC@YOP$+9d?P&h?lPy-9M2UT9fg5jKm1t$m#iWE{M
zIf%q9@;<puwV{ydMhJnB$FpTP7~V`2Oc}26A)GW4cpwmuYh636R)YU&Y^xpiwub;-
z3Bq!lBEWk1a}r>fyT?0<D?&D0xgx=$@GVYRXbXU#>UP>tcw-bLkz;s2LlKl2qeP0w
zECS7Ate+Awk|KQ+DOk;fl}Xsy4o^CY=pwq%QAAKKl628_yNPsK>?A>%D8fQG6IgdJ
ztnxttBz#NI_a@f<SS;sI0I$l5SC(56T~N^^t8%zW4j~T5dexEVYowqkN5Z-BGHpcd
z1d8+q5Q`K!fUM`4leXai7{C&K6Nxc?hQWB61{h0|4Cb>k7SU`WtrpsfZsNs9^0(2a
z@C3#YO3>k~w7?2hipBf{#b6`}Xw1hlG$yi?;1dDs7k~xDAw@jiI*+tc;t2L<e7iLm
zP}mwR5QOujz`+rgnOi!Y{({?C=+*8leK`I4)q-bwZ~S$=`Qx8za!;_&ojSySG^`y-
zUwxr;y18tmHR*DH-R#Zfn@dafJ#VG;#JXCA1?Fhi?=z+K#EYHSuZ6R;t9!2P-`Czg
zntSi!KX=pneo0;EVH+kX{Tbnm^ke?~Z}v~j1(%4Y2eEUe-ebObqI@uC5e<?ngPC8q
zexSeKJ6Lye>flg&bM)0!Y;0_@=w%`LW^8DsYpS#-bLOklX9r?Ei}TScw|4DbpW%+7
zFgAI)f51s}{y-eWb|vrU-Ya!GuYKP)J7z#*V_k^Xo>4!1Yqj*m)x&0L^tg3GJbVAJ
zJ-Pl$R=NAabouV=^z_t;^K*0AvFs!vYU>_<|I^#c?>>CR<(T?=%{;U=aI*SbZADLH
z&(f2wz_Y0??Tf|g;?|1Znw6}6U43<uVfr(7fnD33UXp<u^(nDoL&FaIfW9||8X7Y8
zWBR>Q#qNRwv1vp9uFn1)V#*4p&%$mP9x&15^OaBiDS(XppT|z^>;B{PLVEbS3IFYV
yGvCsSX<sgWK5pRdjuceaUA*+*;fQZyG$}(jP`_}c_gGYm|0&(BGUuqhq31shAo>*m

literal 0
HcmV?d00001

diff --git a/samples/xaml/Assets/SplashScreen.scale-200.png b/samples/xaml/Assets/SplashScreen.scale-200.png
new file mode 100644
index 0000000000000000000000000000000000000000..023e7f1feda78d5100569825acedfd213a0d84e9
GIT binary patch
literal 7700
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

literal 0
HcmV?d00001

diff --git a/samples/xaml/Assets/Square150x150Logo.scale-200.png b/samples/xaml/Assets/Square150x150Logo.scale-200.png
new file mode 100644
index 0000000000000000000000000000000000000000..af49fec1a5484db1d52a7f9b5ec90a27c7030186
GIT binary patch
literal 2937
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
bht0Iza^2ykEt4(epJ78uh5nDlX8(TxzDYwP

literal 0
HcmV?d00001

diff --git a/samples/xaml/Assets/Square44x44Logo.scale-200.png b/samples/xaml/Assets/Square44x44Logo.scale-200.png
new file mode 100644
index 0000000000000000000000000000000000000000..ce342a2ec8a61291ba76c54604aea7e9d20af11b
GIT binary patch
literal 1647
zcmaJ?eM}Q)7(e+G1Q(|`V9JhTI2>MkceK4;p;PR&$Pi?ejk3YQ_3o`S&|W_dsOZ8#
zWPTt69g`t$ab`0cj-Y0yiBSOqmd)tG7G(}M5aP0_%&9TijB#&)I{zSE^4@#z^FF`l
z`8{8`o%wlL(UI|y2!cdsuVamHH~H86F!*-15em4)NqUpCQM5?aoC_eCf@lV4wvF2a
zjDQn1JBL69f&@2M3rvzJcfE!eZ8FZUBlFlC5RD)it33{mF9#B82AiyQE%w)`vlwa>
zv{<1sm&kSKK$&%2jSFn7$t&P%%6Ue>R=<X3cr?&}4M-g7u~pdJ8jlv6wyS~Pez6=w
zr&XkKEjB~Sl$($0L>EAnG8N7fqynWG8L3p!4801a;8{+n<rIMvj7FKJAt-eA!Js#n
zV9^*^!>liO(qd(j<j~0F)z#Iq>NJ_?+9W3#hLIDLoT6~3fx9=`CC-D}-AMrpEO7HK
zt3$GicGPc?GmDjy7K2P@La;e<bDtQtyJr&xQzrLt4ml|!<Tjf>u4!$zWCZ`ym{Z$b
zu-O6RM&K4JT|BIZB`E-gxqG%FzanI#+2FFmqHq<g$XD8cUCL&)7`%}QRzX8^7Mda`
zB~A$xhpTu6hcgyRz)6ZUQzWle5^6eNXD&RvRx$>XG7yxWB=w55RGOM)$xMb(>kSNR
z2w=1AZi%z=AmG~yea~XaXJR!v7vLn(RUnELfiB1|6D84ICOS}^Zo2AdN}<&*h}G_u
z{xZ!(%>tLT3J3<5XhWy-tg+6)0nmUUENLW8TWA{R6bgVd3X;anYFZ^IRis*_P-C-r
z;i>%1^eL3UI2-{w8nuFFcs0e~7J{O2k^~Ce%+Ly4U?|=!0LH=t6()xi<^I-rs+9sF
z*q{E-CxZbGPeu#a;XJwE;9S1?#R&uns>^0G3p`hEUF*v`M?@h%T%J%RChmD|EVydq
zmHWh*_=S%emRC*mhxaVLzT@>Z2SX0u9v*DIJ@WC^k<V?z``Q$(M}8`~@@9hcMtV<h
zde8Z&v6Hrv<iw6I|G5|6*`Tto7~DG5&b%0P`j40kroR1u$KAb_`tXQR)OGjNojrR;
zIr-Y;P|DPbNw=@$Rycaxb?Mm6+R_Q{<BFxhwGA1uSqc5x`>LVdlGV6LpK$KIrlJqc
zpJ921)+3JJdTx|<`G&kXpKkjGJv=76R`yYIQ{#c-`%+`#V(7}Q;&@6U8!Td1`d;?N
z_9mnI#?AA}4J!r)LN4!E-@H5eXauuB7TOawS>Y|{-P?NNx-lq+z1W-+y(;39P&&LP
zL{N<u_jdY@dYL+=<!7fm_;+?`-S_i4gNveMFA&McQ;PFSBL$~-w71=dIg=3{-96A2
z)LEa=cxwOqsS%!tyGy#;Z?M)!eaC#SI+BCVqg{P%kr~@ZAAA*5NZpCOdvZgJcet)L
z>80?&=C*qKmdA^moMZRuPcD!B<*mq$ch=0Cnlitw#txRWhb3%TQvPqjkC`F69G4b!
ze7z9MZ#+;_#l?H37UqUhDFb^l&s2{oM$3I0o^Q!yx;;V)QmCMo)Tb_ui|mit8MS?U
zm##6$sZZ1$@|s%?l@>4Z<*Q}sRBSKMhb4I{e5LdEhsHIHTe8Bod5c>6QtT>$XgUBz
z6MK`kO$=jmt@FqggOhJ5j~e@ygRbG;<{Vu)*+nn9aQeo0;$#j;|MS=S$&L?BeV25z
xs3B`@=#`5TF{^6(A1rvdY@|-RtQ|iS5{tyX+wH?;n8E)G$kykv-D^wh{{!TZT%7;_

literal 0
HcmV?d00001

diff --git a/samples/xaml/Assets/Square44x44Logo.targetsize-24_altform-unplated.png b/samples/xaml/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
new file mode 100644
index 0000000000000000000000000000000000000000..f6c02ce97e0a802b85f6021e822c89f8bf57d5cd
GIT binary patch
literal 1255
zcmaJ>TWs4@7*5+{G#S+<G69{CW?TuiXeYkMv1xisQWlzol0`IV5A4`JZcXaTY?q{w
z&?qX=E<%VR9^fg07bdg|(uRb1SP@065)#_u(4;|M;B82}FnECDG%0(iX30M1Kj;7c
z|NCz~KVN!rD0Va!3WbL9C$eR{J{`P+2k`fodipQC4EwpNf6~_dI&@KJTC){I<W0DU
z$_Q$!XSUIJC^WEcRH}ZpSddlQOu#@V(J&p14u!@i8xB-!$R`xEXjp0T{x>&C!qC#>
zf>5N3P6jO*Cz>ug*(_DmW=)kea&m$gZ^+nyiF`;j%w@}y8)>p*SH}C`m?DXeieF2U
zyQHecc_L%Gh!7G<pwbLah*E+PlA<IYCs-^~bc$kWKufZ~$uvuJ9};_WHC--eXS=?z
zlqQ#a-;pV*Uau$WT*7u2DMpecie@R61y}=ktCkNN!16|V7P81wUBmGW+adysP_bA1
zG>Mt+hG06y;+|p4>m~}PjA}rKViGiEnn7G0ZO<>G|7q;2?NwGCM3s?eued6%hd$B+
z<J>*kQJ{#~$S=DFE(%=E+UkmlEI*%3llUf~8Ja9YU1Vui0IbGBkW_gHB%Rd&!!ioX
zs40O?i9I{};kle7GMvE7(rk`la=gTI)47=>%?q@^iL-nUo3}h4S}N-KHn8t5mVP8w
z&bSErwp+37<z5%eFWJ8BE!hr{$#kktj4l|KX4k#3piH|_XOU~XiL_bQHi=H2Wn&)>
zNJJ8?a|{r5Q3R0Z5s-LB1WHOwYC@7pCHWND#cL1cZ?{kJ368_*(UDWUDyb<}0y@o#
zfMF016iMWPCb6obAxT$JlB6(2DrlXDTB&!0`!m??4F(qWMhjVZo?JXQmz`1*58Z=&
zcDmB|S-E@j?BoFGix0flckqdS4jsPNzhfWyWIM98GxcLs89C(~dw%$_t;JjX-SD}E
zfiGV;{8Q%8r}w9x>EEigW81>`kvnU@pK)4+xk9@+bNj9L!AAZ@SZ@q|)&BmY3+HZx
zul~BeG4|}-;L%cHViQGQX?^zFfO0&#cHwel=d`lH9sJ-@Sl@n*(8J2>%Ac`IxyY?Q
z{=GhWvC#gu-~Ia7*n{=+;qM?Ul_wy1+u7ho;=`>EwP^g~R@{unBds`!#@}tluZQpS
zm)M~nYEifJWJGx?_6DcTy>#uh%>!H9=hb^(v`=m3F1{L>db=<5_tm+_&knAQ2EU$s
Mu9UqpbNZeC0BbUo^Z)<=

literal 0
HcmV?d00001

diff --git a/samples/xaml/Assets/StoreLogo.png b/samples/xaml/Assets/StoreLogo.png
new file mode 100644
index 0000000000000000000000000000000000000000..7385b56c0e4d3c6b0efe3324aa1194157d837826
GIT binary patch
literal 1451
zcmaJ>eN5D57_Z|bH;{0+1#mbl)eTU3{h)Wf7EZV?;HD@XL@{B`Ui%(2aMxQ~xdXSv
z5nzWi(<Qp0OO$NM7W~Q_8E#Xi$ik*$nyFjFERiL|C5FvR_m#Nm-UE*L2eC=}zR&wU
zzvuZqU+t~gP??tUObUV^Y2GTg53Y3lH73JvZdvRkT$bsc2E9%R=n+8$h(l8R0QCli
zCg1~t)c*1XP>LW)U2=Vc-cY@s7nPt{i0hc6!7xN4NNHI#EQl>YNBy8l4%x9gr_W-j
zEZMQmmTIy(>;lblRfh`dIyTgc9W5d!VP$L4(kKrN1c5G~(O_#x<D+(L#x4){@nZr*
zXH@hSJ2p$Ip}GcjDJnoMW-Bg|6oayynX*_}jx9oIC=;ZOph=wMcuO%)(&*fSL2s%Q
z;C=3jIbTq+W6ioA<_RJaiI^kBW<_lxD30R@k|t;xhZ?xn9@2#<9@17OEVzLts&ZJD
zl@J=YDEO7_x*dZ|XF~{vtE=Y?hqSpw!ITkEAxuzak_ZOlam{FJx)1zMV?k}LzC8>G
zAJCNTstD^5SeXFB+&$h=ToJP2H>xr$iqPs-#O*;4(!Fjw25-!gEb*)mU}=)J;Iu>w
zxK(5XoD0wrPSKQ~rbL^Cw6O_03*l*}i=ydbu7adJ6y;%@tjFeXIXT+ms30pmbOP%Q
zX}S;+LBh8Tea~TSkHzvX6$rYb)+<VDq6=!86<yJql`!gZ%~TyN*er)6C88C^%QPFc
z8>n&{kSbIqh|c7hmlxmwSiq5iVhU#iEQ<>a18|O^Sln-8t&+t`*{qBWo5M?w<Zrf5
z;R%c*oS?(o7?BfgG=~RBn#Cy!Fu0#%8C>FM(JuimAOb5!K#D}XbslM@#1ZVz_;!9U
zpfEpLAOz=0g@bd6Xj_ILi-x^!M}73h^o@}hM$1jflTs|Yuj9AL@A3<-?MV4!^4q`e
z)fO@A;{9K^?W?DbnesnPr6kK>$zaKo&;FhFd(GYFCIU^T+OIMb%Tqo+P%oq(IdX7S
zf6+HLO?7o0m+p>~Tp5UrXWh!UH!wZ5kv!E`_w)PTpI(#Iw{AS`gH4^b(bm^ZCq^FZ
zY9DD7bH}rq9mg88+KgA$Zp!iWncuU2n1AuIa@=sWvUR-s`Qb{R*kk(SPU^`$6BXz8
zn#7yaFOIK%qGxyi`dYtm#&qqox0$h=pNi#u=M8zUG@bpiZ=3sT=1}Trr}39cC)H|v
zbL?W)=&s4zrh)7>L(|cc%$1#!zfL?HjpeP%T+x_a+jZ16b^iKOHxFEX$7d|8${H-*
zIrOJ5w&i$>*D>AKaIoYg`;{L@jM((Kt?$N$5OnuPqVvq**Nm}(f0wwOF%iX_Pba;V
z;m@wxX&NcV3?<1+u?A{y_DIj7#m3Af1rCE)o`D&Y3}0%7E;iX1yMDiS)sh0wKi!36
zL!Wmq?P^Ku&rK~HJd97KkLTRl>ScGFYZNlYytWnhmuu|)L&ND8_PmkayQb{HOY640
bno1(wj@u8DCVuFR|31B*4ek@pZJqxCDDe1x

literal 0
HcmV?d00001

diff --git a/samples/xaml/Assets/Wide310x150Logo.scale-200.png b/samples/xaml/Assets/Wide310x150Logo.scale-200.png
new file mode 100644
index 0000000000000000000000000000000000000000..288995b397fdbef1fb7e85afd71445d5de1952c5
GIT binary patch
literal 3204
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
F{{^ZoKyCm4

literal 0
HcmV?d00001

diff --git a/samples/xaml/CMakeLists.txt b/samples/xaml/CMakeLists.txt
new file mode 100644
index 0000000000..26d988bd96
--- /dev/null
+++ b/samples/xaml/CMakeLists.txt
@@ -0,0 +1,99 @@
+cmake_minimum_required(VERSION 3.4.0)
+project(uwp)
+
+set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+
+set(SOURCE_FILES
+  App.xaml.cpp
+  MainPage.xaml.cpp
+  pch.cpp
+  )
+
+set(HEADER_FILES
+  App.xaml.h
+  MainPage.xaml.h
+  pch.h
+  )
+
+set(XAML_FILES
+  App.xaml
+  MainPage.xaml
+  )
+
+set(ASSET_FILES
+    Assets/LockScreenLogo.scale-200.png
+    Assets/SplashScreen.scale-200.png
+    Assets/Square150x150Logo.scale-200.png
+    Assets/Square44x44Logo.scale-200.png
+    Assets/Square44x44Logo.targetsize-24_altform-unplated.png
+    Assets/StoreLogo.png
+    Assets/Wide310x150Logo.scale-200.png
+    )
+
+set(CONTENT_FILES
+    Package.appxmanifest
+    )
+
+set(RESOURCE_FILES
+  ${CONTENT_FILES} ${ASSET_FILES}
+  uwp_TemporaryKey.pfx)
+
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+
+set_property(SOURCE ${CONTENT_FILES} PROPERTY VS_DEPLOYMENT_CONTENT 1)
+set_property(SOURCE ${ASSET_FILES} PROPERTY VS_DEPLOYMENT_CONTENT 1)
+set_property(SOURCE ${ASSET_FILES} PROPERTY VS_DEPLOYMENT_LOCATION "Assets")
+
+set_property(SOURCE "App.xaml" PROPERTY VS_XAML_TYPE "ApplicationDefinition")
+
+source_group("Source Files" FILES ${SOURCE_FILES})
+source_group("Header Files" FILES ${HEADER_FILES})
+source_group("Resource Files" FILES ${RESOURCE_FILES})
+source_group("Xaml Files" FILES ${XAML_FILES})
+
+add_executable(uwp WIN32 ${SOURCE_FILES} ${HEADER_FILES} ${RESOURCE_FILES} ${XAML_FILES})
+
+set_property(TARGET uwp PROPERTY VS_WINRT_COMPONENT TRUE)
+
+set_property (TARGET uwp PROPERTY FOLDER Samples)
+
+if (SINGLE_GENERATOR)
+  install (TARGETS uwp DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}")
+else()
+  install (TARGETS uwp
+           CONFIGURATIONS Release RelWithDebInfo
+           DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}")
+  install (TARGETS uwp
+           CONFIGURATIONS Debug
+           DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}d")
+endif()
+
+#include_directories
+
+# OCCT libraries for using
+set (uwp_USED_LIBS        TKernel
+                          TKMath
+                          TKG2d
+                          TKG3d
+                          TKGeomBase
+                          TKBRep
+                          TKGeomAlgo
+                          TKTopAlgo
+                          TKPrim
+                          TKShHealing
+                          TKBO
+                          TKBool
+                          TKFillet
+                          TKMesh
+                          TKFeat
+                          TKHLR
+                          TKOffset
+                          TKXMesh
+                          TKIGES
+                          TKSTEP
+                          TKXSBase
+                          TKSTL
+#                         TKVRML
+                          )
+
+target_link_libraries (uwp ${uwp_USED_LIBS})
\ No newline at end of file
diff --git a/samples/xaml/MainPage.xaml b/samples/xaml/MainPage.xaml
new file mode 100644
index 0000000000..58ca32c34e
--- /dev/null
+++ b/samples/xaml/MainPage.xaml
@@ -0,0 +1,47 @@
+<Page
+  x:Class="uwp.MainPage"
+  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+  xmlns:local="using:uwp"
+  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+  mc:Ignorable="d">
+
+  <!-- Common grid-->
+  <Grid x:Name="contentPanel" HorizontalAlignment="Center" Background="{ThemeResource ApplicationPageBackgroundThemeBrush}" MinWidth="800" MinHeight="800">
+    <Grid.RowDefinitions>
+      <RowDefinition MinHeight="40" MaxHeight="40"/>
+      <RowDefinition MinHeight="30" MaxHeight="30"/>
+      <RowDefinition MinHeight="30"/>
+    </Grid.RowDefinitions>
+
+    <!-- Grid for buttons (locates at first row of Common grid)-->
+    <Grid x:Name="buttonPanel" Background="{ThemeResource ApplicationPageBackgroundThemeBrush}" Grid.Row="0">
+      <Grid.RowDefinitions>
+        <RowDefinition MinHeight="40"/>
+      </Grid.RowDefinitions>
+      <Grid.ColumnDefinitions>
+        <ColumnDefinition MinWidth="190"/>
+        <ColumnDefinition MinWidth="190"/>
+        <ColumnDefinition MinWidth="190"/>
+        <ColumnDefinition MinWidth="190"/>
+        <ColumnDefinition MinWidth="190"/>
+      </Grid.ColumnDefinitions>
+      <Button x:Name="offset"  MaxHeight="30" MinHeight="30" MaxWidth="180" MinWidth="180" Content="Test offset"                 Grid.Row="0" Grid.Column="0" Click="OnClickOffset"/>
+      <Button x:Name="mesh"    MaxHeight="30" MinHeight="30" MaxWidth="180" MinWidth="180" Content="Test mesh"                   Grid.Row="0" Grid.Column="1" Click="OnClickMesh"/>
+      <Button x:Name="boolean" MaxHeight="30" MinHeight="30" MaxWidth="180" MinWidth="180" Content="Test boolean operation"      Grid.Row="0" Grid.Column="2" Click="OnClickBoolean"/>
+      <Button x:Name="tmpdir"  MaxHeight="30" MinHeight="30" MaxWidth="180" MinWidth="180" Content="Create temp file"            Grid.Row="0" Grid.Column="3" Click="OnClickBuildTemporary"/>
+      <Button x:Name="de"      MaxHeight="30" MinHeight="30" MaxWidth="180" MinWidth="180" Content="Test DataExchange"           Grid.Row="0" Grid.Column="4" Click="OnClickDataExchange"/>
+    </Grid>
+
+    <!-- TextBlock for label -->
+    <StackPanel Grid.Row="1"  HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+      <TextBlock Text="Output:" HorizontalAlignment="Left" Grid.Row="1"/>
+    </StackPanel>
+
+    <!-- TextBlock for output information -->
+    <StackPanel Grid.Row="2"  HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+      <TextBlock x:Name="Output_TextBlock" Text="" HorizontalAlignment="Left" Grid.Row="2"/>
+    </StackPanel>
+  </Grid>
+</Page>
diff --git a/samples/xaml/MainPage.xaml.cpp b/samples/xaml/MainPage.xaml.cpp
new file mode 100644
index 0000000000..cee94f5004
--- /dev/null
+++ b/samples/xaml/MainPage.xaml.cpp
@@ -0,0 +1,457 @@
+//
+// MainPage.xaml.cpp
+// Implementation of the MainPage class.
+//
+
+#include "pch.h"
+#include "MainPage.xaml.h"
+
+using namespace uwp;
+
+using namespace Platform;
+using namespace Windows::Foundation;
+using namespace Windows::Foundation::Collections;
+using namespace Windows::UI::ViewManagement;
+using namespace Windows::UI::Xaml;
+using namespace Windows::UI::Xaml::Controls;
+using namespace Windows::UI::Xaml::Controls::Primitives;
+using namespace Windows::UI::Xaml::Data;
+using namespace Windows::UI::Xaml::Input;
+using namespace Windows::UI::Xaml::Media;
+using namespace Windows::UI::Xaml::Navigation;
+
+using namespace Windows::UI::Popups;
+
+#include <BRepAlgo.hxx>
+#include <BRepAlgoAPI_Fuse.hxx>
+#include <BRepMesh_IncrementalMesh.hxx>
+#include <BRepPrimAPI_MakeBox.hxx>
+#include <BRepPrimAPI_MakeSphere.hxx>
+#include <BRepTools.hxx>
+#include <Geom2dAPI_PointsToBSpline.hxx>
+#include <Geom2d_BSplineCurve.hxx>
+#include <Geom2d_OffsetCurve.hxx>
+#include <gp_Pnt.hxx>
+#include <IGESControl_Controller.hxx>
+#include <IGESControl_Reader.hxx>
+#include <IGESControl_Writer.hxx>
+#include <Interface_Static.hxx>
+#include <OSD_Directory.hxx>
+#include <OSD_File.hxx>
+#include <OSD_Path.hxx>
+#include <OSD_Protection.hxx>
+#include <STEPControl_Reader.hxx>
+#include <STEPControl_Writer.hxx>
+#include <StlAPI_Writer.hxx>
+#include <TCollection_AsciiString.hxx>
+#include <TCollection_ExtendedString.hxx>
+#include <TopExp_Explorer.hxx>
+#include <TopoDS.hxx>
+#include <TopoDS_Shape.hxx>
+#include <VrmlAPI_Writer.hxx>
+
+#include <Strsafe.h>
+
+//=======================================================================
+//function : MainPage
+//purpose  :
+//=======================================================================
+MainPage::MainPage()
+{
+  InitializeComponent();
+  ApplicationView::PreferredLaunchViewSize = Size(1000, 500);
+  ApplicationView::PreferredLaunchWindowingMode = ApplicationViewWindowingMode::PreferredLaunchViewSize;
+}
+
+//=======================================================================
+//function : Throw
+//purpose  : Test offset functionality
+//=======================================================================
+void MainPage::OnClickOffset(Platform::Object^  theSender,
+  Windows::UI::Xaml::Input::PointerRoutedEventArgs^ theEvent)
+{
+  TColgp_Array1OfPnt2d array(1, 5); // sizing array
+  array.SetValue(1, gp_Pnt2d(-4, 0)); array.SetValue(2, gp_Pnt2d(-7, 2));
+  array.SetValue(3, gp_Pnt2d(-6, 3)); array.SetValue(4, gp_Pnt2d(-4, 3));
+  array.SetValue(5, gp_Pnt2d(-3, 5));
+  Handle(Geom2d_BSplineCurve) SPL1 = Geom2dAPI_PointsToBSpline(array);
+
+  Standard_Real dist = 1;
+  Handle(Geom2d_OffsetCurve) OC =
+    new Geom2d_OffsetCurve(SPL1, dist);
+  Standard_Real dist2 = 1.5;
+  Handle(Geom2d_OffsetCurve) OC2 =
+    new Geom2d_OffsetCurve(SPL1, dist2);
+
+  Platform::String ^aMessage;
+
+  if (OC.IsNull()) {
+    aMessage = "Error: could not create offset curve with offset distance " + dist;
+  } else if (OC2.IsNull()) {
+    aMessage = "Error: could not create offset curve with offset distance 1.5" + dist2;
+  } else {
+    aMessage = "Result: Two offset curves OC and OC2 were successfully created from source curve SPL1. \n";
+  }
+  Output_TextBlock->Text = aMessage;
+}
+
+//=======================================================================
+//function : OnClickMesh
+//purpose  : Test mesh functionality
+//=======================================================================
+void MainPage::OnClickMesh(Platform::Object^  theSender,
+  Windows::UI::Xaml::Input::PointerRoutedEventArgs^ theEvent)
+{
+  TopoDS_Shape theBox = BRepPrimAPI_MakeBox(200, 60, 60);
+  TopoDS_Shape theSphere = BRepPrimAPI_MakeSphere(gp_Pnt(100, 20, 20), 80);
+  TopoDS_Shape ShapeFused = BRepAlgoAPI_Fuse(theSphere, theBox);
+  BRepMesh_IncrementalMesh(ShapeFused, 1);
+
+  Standard_Integer result(0);
+
+  for (TopExp_Explorer ex(ShapeFused, TopAbs_FACE); ex.More(); ex.Next()) {
+    TopoDS_Face F = TopoDS::Face(ex.Current());
+    TopLoc_Location L;
+    Handle(Poly_Triangulation) facing = BRep_Tool::Triangulation(F, L);
+    result = result + facing->NbTriangles();
+  }
+
+  Platform::String ^aMessage;
+  if (ShapeFused.IsNull()) {
+    aMessage = "Error: could not fuse source shapes";
+  } else if (result == 0) {
+    aMessage = "Error: mesh could not be created";
+  } else {
+    aMessage = "Result: Mesh was created\
+--- Number of created triangles ---\n";
+
+    aMessage += result;
+    aMessage += ("\n\n");
+  }
+  Output_TextBlock->Text = aMessage;
+}
+
+//=======================================================================
+//function : OnClickBoolean
+//purpose  : Test boolean operations
+//=======================================================================
+void MainPage::OnClickBoolean(Platform::Object^  theSender,
+  Windows::UI::Xaml::Input::PointerRoutedEventArgs^ theEvent)
+{
+  TCollection_AsciiString asd;
+  gp_Pnt P(-5, 5, -5);
+  TopoDS_Shape theBox1 = BRepPrimAPI_MakeBox(60, 200, 70).Shape();
+
+  TopoDS_Shape theBox2 = BRepPrimAPI_MakeBox(P, 20, 150, 110).Shape();
+
+  TopoDS_Shape FusedShape = BRepAlgoAPI_Fuse(theBox1, theBox2);
+
+  Platform::String ^aMessage;
+
+  if (FusedShape.IsNull()) {
+    aMessage = "Error: could not fuse shapes theBox1 and theBox2";
+  } else {
+    aMessage = "Result: Shapes were successfully fused. \n";
+  }
+  Output_TextBlock->Text = aMessage;
+}
+
+//=======================================================================
+//function : OnClickBuildTemporary
+//purpose  : Test OSD_File::BuildTemporary() method
+//=======================================================================
+void MainPage::OnClickBuildTemporary(Platform::Object^  theSender,
+  Windows::UI::Xaml::Input::PointerRoutedEventArgs^ theEvent)
+{
+  OSD_File theTmpFile;
+  theTmpFile.BuildTemporary();
+  Standard_Boolean fKO = theTmpFile.Failed();
+  if (fKO)
+  {
+    Output_TextBlock->Text = "Error: cannot create temporary file";
+  } else {
+    OSD_Path theTmpFilepath;
+    theTmpFile.Path(theTmpFilepath);
+    TCollection_AsciiString theTmpFilepathTrek;
+    theTmpFilepath.SystemName(theTmpFilepathTrek);
+    wchar_t wchar_str[MAX_PATH];
+    StringCchCopy(wchar_str, _countof(wchar_str), L"Result: ");
+    TCollection_ExtendedString aWName(theTmpFilepathTrek);
+    StringCchCat(wchar_str, _countof(wchar_str), (const wchar_t*)aWName.ToExtString());
+    Platform::String^ p_string = ref new Platform::String(wchar_str);
+    Output_TextBlock->Text = p_string;
+  }
+}
+
+//=======================================================================
+//function : OnClickDataExchange
+//purpose  : Test data exchange functionality
+//=======================================================================
+void MainPage::OnClickDataExchange(Platform::Object^  theSender,
+    Windows::UI::Xaml::Input::PointerRoutedEventArgs^ theEvent)
+{
+  Output_TextBlock->Text = "";
+
+  // Create box for export
+  TopoDS_Shape theBox = BRepPrimAPI_MakeBox(200, 60, 60);
+
+  // Create temporary directory
+  wchar_t tmpPath[MAX_PATH];
+  wchar_t filePath[MAX_PATH];
+  char tmpPathA[MAX_PATH];
+
+  if (!GetTempPathW(_countof(tmpPath), tmpPath)) {
+    StringCchCopyW(tmpPath, _countof(tmpPath), L"./");
+  }
+
+  WideCharToMultiByte(CP_UTF8, 0, tmpPath, -1, tmpPathA, sizeof(tmpPathA), NULL, NULL);
+  OSD_Path tmpDirPath(tmpPathA);
+  OSD_Directory tmpDir(tmpDirPath);
+
+  OSD_Protection srt;
+  tmpDir.Build(srt);
+
+  // Export box to .brep
+  StringCchCopyW(filePath, _countof(filePath), tmpPath);
+  StringCchCatW(filePath, _countof(filePath), L"/box.brep");
+  if (SaveBREP(filePath, theBox))
+    Output_TextBlock->Text += L"OK: export to .brep\n";
+  // Import from .brep
+  TopoDS_Shape theBoxFromBrep;
+  if (ReadBREP(filePath, theBoxFromBrep))
+    Output_TextBlock->Text += L"OK: import from .brep\n";
+  else
+    Output_TextBlock->Text += L"Error: import from .brep\n";
+
+  // Export box to .iges
+  StringCchCopyW(filePath, _countof(filePath), tmpPath);
+  StringCchCatW(filePath, _countof(filePath), L"/box.iges");
+  if (SaveIGES(filePath, theBox))
+    Output_TextBlock->Text += L"OK: export to .iges\n";
+  // Import from .iges
+  TopoDS_Shape theBoxFromIges;
+  if (ReadIGES(filePath, theBoxFromIges))
+    Output_TextBlock->Text += L"OK: import from .iges\n";
+  else
+    Output_TextBlock->Text += L"Error: import from .iges\n";
+
+  // Export box to .step
+  StringCchCopyW(filePath, _countof(filePath), tmpPath);
+  StringCchCatW(filePath, _countof(filePath), L"/box.step");
+
+  STEPControl_StepModelType aSelection = STEPControl_AsIs;
+  if (SaveSTEP(filePath, theBox, aSelection))
+    Output_TextBlock->Text += L"OK: export to .iges\n";
+  // Import from .iges
+  TopoDS_Shape theBoxFromStep;
+  if (ReadSTEP(filePath, theBoxFromStep))
+    Output_TextBlock->Text += L"OK: import from .step\n";
+  else
+    Output_TextBlock->Text += L"Error: import from .step\n";
+
+  // Export box to .stl
+  StringCchCopyW(filePath, _countof(filePath), tmpPath);
+  StringCchCatW(filePath, _countof(filePath), L"/box.stl");
+
+  if (SaveSTL(filePath, theBox))
+    Output_TextBlock->Text += L"OK: export to .stl\n";
+
+/*
+  // Export box to .vrml
+  StringCchCopyW(filePath, _countof(filePath), tmpPath);
+  StringCchCatW(filePath, _countof(filePath), L"/box.vrml");
+
+  if (SaveVRML(filePath, theBox))
+    Output_TextBlock->Text += L"OK: export to .vrml\n";
+*/
+}
+
+//=======================================================================
+//function : SaveBREP
+//purpose  : Export shape to .brep
+//=======================================================================
+Standard_Boolean MainPage::SaveBREP(const wchar_t* theFilePath, const TopoDS_Shape& theShape)
+{
+  std::filebuf aFileBuf;
+  std::ostream aStream(&aFileBuf);
+
+  if (!aFileBuf.open(theFilePath, ios::out)) {
+    Output_TextBlock->Text += L"Error: cannot open file for export (brep)\n";
+    return Standard_False;
+  }
+
+  BRepTools::Write(theShape, aStream);
+  return Standard_True;
+}
+
+//=======================================================================
+//function : SaveIGES
+//purpose  : Export shape to .iges
+//=======================================================================
+Standard_Boolean MainPage::SaveIGES(const wchar_t* theFilePath, const TopoDS_Shape& theShape)
+{
+  std::filebuf aFileBuf;
+  std::ostream aStream(&aFileBuf);
+
+  if (!aFileBuf.open(theFilePath, ios::out)) {
+    Output_TextBlock->Text += L"Error: cannot open file for export (iges)\n";
+    return Standard_False;
+  }
+
+  IGESControl_Controller::Init();
+  IGESControl_Writer ICW(Interface_Static::CVal("XSTEP.iges.unit"), Interface_Static::IVal("XSTEP.iges.writebrep.mode"));
+
+  ICW.AddShape(theShape);
+  ICW.ComputeModel();
+
+  if (!ICW.Write(aStream)) {
+    Output_TextBlock->Text += L"Error: cannot export box to .iges\n";
+    return Standard_False;
+  }
+
+  return Standard_True;
+}
+
+//=======================================================================
+//function : SaveSTEP
+//purpose  : Export shape to .step
+//=======================================================================
+Standard_Boolean MainPage::SaveSTEP(const wchar_t* theFilePath, const TopoDS_Shape& theShape, const STEPControl_StepModelType theValue)
+{
+  std::filebuf aFileBuf;
+  std::ostream aStream(&aFileBuf);
+
+  if (!aFileBuf.open(theFilePath, ios::out)) {
+    Output_TextBlock->Text += L"Error: cannot open file for export (step)\n";
+    return Standard_False;
+  }
+
+  STEPControl_Writer aWriter;
+
+  if (aWriter.Transfer(theShape, theValue) != IFSelect_RetDone) {
+    Output_TextBlock->Text += L"Error: cannot translate shape to STEP\n";
+    return Standard_False;
+  }
+
+  char theFilePathA[MAX_PATH];
+  WideCharToMultiByte(CP_UTF8, 0, theFilePath, -1, theFilePathA, sizeof(theFilePathA), NULL, NULL);
+
+  switch (aWriter.Write(theFilePathA))
+  {
+  case IFSelect_RetError:
+    Output_TextBlock->Text += L"Error: Incorrect Data\n";
+    break;
+  case IFSelect_RetFail:
+    Output_TextBlock->Text += L"Error: Writing has failed\n";
+    break;
+  case IFSelect_RetVoid:
+    Output_TextBlock->Text += L"Error: Nothing to transfer\n";
+    break;
+  default:
+    return Standard_True;
+  }
+  return Standard_False;
+}
+
+//=======================================================================
+//function : SaveSTL
+//purpose  : Export shape to .stl
+//=======================================================================
+Standard_Boolean MainPage::SaveSTL(const wchar_t* theFilePath, const TopoDS_Shape& theShape)
+{
+  StlAPI_Writer myStlWriter;
+
+  char theFilePathA[MAX_PATH];
+  WideCharToMultiByte(CP_UTF8, 0, theFilePath, -1, theFilePathA, sizeof(theFilePathA), NULL, NULL);
+
+  return myStlWriter.Write(theShape, theFilePathA) == StlAPI_StatusOK;
+}
+
+//=======================================================================
+//function : SaveVRML
+//purpose  : Export shape to .vrml
+//=======================================================================
+/*
+Standard_Boolean MainPage::SaveVRML(const wchar_t* theFilePath, const TopoDS_Shape& theShape)
+{
+  VrmlAPI_Writer aWriter;
+
+  char theFilePathA[MAX_PATH];
+  WideCharToMultiByte(CP_UTF8, 0, theFilePath, -1, theFilePathA, sizeof(theFilePathA), NULL, NULL);
+
+  aWriter.Write(theShape, theFilePathA);
+
+  return Standard_True;
+}
+*/
+
+//=======================================================================
+//function : ReadBREP
+//purpose  : Import shape from .brep
+//=======================================================================
+Standard_Boolean MainPage::ReadBREP(const wchar_t* theFilePath, TopoDS_Shape& theShape)
+{
+  theShape.Nullify();
+
+  BRep_Builder aBuilder;
+
+  char theFilePathA[MAX_PATH];
+  WideCharToMultiByte(CP_UTF8, 0, theFilePath, -1, theFilePathA, sizeof(theFilePathA), NULL, NULL);
+
+  if (!BRepTools::Read(theShape, theFilePathA, aBuilder))
+    return Standard_False;
+
+  return !theShape.IsNull() && BRepAlgo::IsValid(theShape);
+}
+
+//=======================================================================
+//function : ReadIGES
+//purpose  : Import shape from .iges
+//=======================================================================
+Standard_Boolean MainPage::ReadIGES(const wchar_t* theFilePath, TopoDS_Shape& theShape)
+{
+  theShape.Nullify();
+
+  IGESControl_Reader Reader;
+
+  char theFilePathA[MAX_PATH];
+  WideCharToMultiByte(CP_UTF8, 0, theFilePath, -1, theFilePathA, sizeof(theFilePathA), NULL, NULL);
+
+  if (Reader.ReadFile(theFilePathA) != IFSelect_RetDone)
+    return Standard_False;
+
+  Reader.TransferRoots();
+  theShape = Reader.OneShape();
+
+  return !theShape.IsNull();
+}
+
+//=======================================================================
+//function : ReadSTEP
+//purpose  : Import shape from .step
+//=======================================================================
+Standard_Boolean MainPage::ReadSTEP(const wchar_t* theFilePath, TopoDS_Shape& theShape)
+{
+  theShape.Nullify();
+
+  STEPControl_Reader aReader;
+
+  char theFilePathA[MAX_PATH];
+  WideCharToMultiByte(CP_UTF8, 0, theFilePath, -1, theFilePathA, sizeof(theFilePathA), NULL, NULL);
+
+  switch (aReader.ReadFile(theFilePathA))
+  {
+  case IFSelect_RetError:
+    Output_TextBlock->Text += L"Error: Not a valid Step file\n";
+    break;
+  case IFSelect_RetFail:
+    Output_TextBlock->Text += L"Error: Reading has failed\n";
+    break;
+  case IFSelect_RetVoid:
+    Output_TextBlock->Text += L"Error: Nothing to transfer\n";
+    break;
+  default:
+    return Standard_True;
+  }
+  return Standard_False;
+}
\ No newline at end of file
diff --git a/samples/xaml/MainPage.xaml.h b/samples/xaml/MainPage.xaml.h
new file mode 100644
index 0000000000..d59c6001ed
--- /dev/null
+++ b/samples/xaml/MainPage.xaml.h
@@ -0,0 +1,51 @@
+//
+// MainPage.xaml.h
+// Declaration of the MainPage class.
+//
+
+#pragma once
+
+#include <TopoDS_Shape.hxx>
+#include <STEPControl_StepModelType.hxx>
+
+#include "MainPage.g.h"
+
+namespace uwp
+{
+  /// <summary>
+  /// An empty page that can be used on its own or navigated to within a Frame.
+  /// </summary>
+  public ref class MainPage sealed
+  {
+  public:
+    MainPage();
+
+    void OnClickOffset(Platform::Object^  theSender,
+      Windows::UI::Xaml::Input::PointerRoutedEventArgs^ theEvent);
+
+    void OnClickMesh(Platform::Object^  theSender,
+      Windows::UI::Xaml::Input::PointerRoutedEventArgs^ theEvent);
+
+    void OnClickBoolean(Platform::Object^  theSender,
+      Windows::UI::Xaml::Input::PointerRoutedEventArgs^ theEvent);
+
+    void OnClickDataExchange(Platform::Object^  theSender,
+        Windows::UI::Xaml::Input::PointerRoutedEventArgs^ theEvent);
+
+    void OnClickBuildTemporary(Platform::Object^  theSender,
+      Windows::UI::Xaml::Input::PointerRoutedEventArgs^ theEvent);
+
+  private:
+    // test data exchange export functionality
+    Standard_Boolean SaveBREP(const wchar_t* theFilePath, const TopoDS_Shape& theShape);
+    Standard_Boolean SaveIGES(const wchar_t* theFilePath, const TopoDS_Shape& theShape);
+    Standard_Boolean SaveSTEP(const wchar_t* theFilePath, const TopoDS_Shape& theShape, const STEPControl_StepModelType theValue);
+    Standard_Boolean SaveSTL (const wchar_t* theFilePath, const TopoDS_Shape& theShape);
+    // Standard_Boolean SaveVRML(const wchar_t* theFilePath, const TopoDS_Shape& theShape);
+
+    // test data exchange import functionality
+    Standard_Boolean ReadBREP(const wchar_t* theFilePath, TopoDS_Shape& theShape);
+    Standard_Boolean ReadIGES(const wchar_t* theFilePath, TopoDS_Shape& theShape);
+    Standard_Boolean ReadSTEP(const wchar_t* theFilePath, TopoDS_Shape& theShape);
+  };
+}
diff --git a/samples/xaml/Package.appxmanifest b/samples/xaml/Package.appxmanifest
new file mode 100644
index 0000000000..6322608cca
--- /dev/null
+++ b/samples/xaml/Package.appxmanifest
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<Package
+  xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
+  xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest"
+  xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
+  IgnorableNamespaces="uap mp">
+
+  <Identity
+    Name="d1574dea-d11e-4b37-a8f2-f1c2b1bad122"
+    Publisher="CN=OPEN CASCADE S.A.S."
+    Version="1.0.0.0" />
+
+  <mp:PhoneIdentity PhoneProductId="d1574dea-d11e-4b37-a8f2-f1c2b1bad122" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
+
+  <Properties>
+    <DisplayName>Open CASCADE Technology UWP Sample</DisplayName>
+    <PublisherDisplayName>OPEN CASCADE S.A.S.</PublisherDisplayName>
+    <Logo>Assets\StoreLogo.png</Logo>
+  </Properties>
+
+  <Dependencies>
+    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.0.0" MaxVersionTested="10.0.0.0" />
+  </Dependencies>
+
+  <Resources>
+    <Resource Language="x-generate"/>
+  </Resources>
+
+  <Applications>
+    <Application Id="App"
+      Executable="$targetnametoken$.exe"
+      EntryPoint="uwp.App">
+      <uap:VisualElements
+        DisplayName="Open CASCADE Technology UWP Sample"
+        Square150x150Logo="Assets\Square150x150Logo.png"
+        Square44x44Logo="Assets\Square44x44Logo.png"
+        Description="Open CASCADE Technology UWP Sample"
+        BackgroundColor="transparent">
+        <uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png"/>
+        <uap:SplashScreen Image="Assets\SplashScreen.png" />
+      </uap:VisualElements>
+    </Application>
+  </Applications>
+
+  <Capabilities>
+    <Capability Name="internetClient" />
+  </Capabilities>
+</Package>
\ No newline at end of file
diff --git a/samples/xaml/ReadMe.md b/samples/xaml/ReadMe.md
new file mode 100644
index 0000000000..1a5bd413b0
--- /dev/null
+++ b/samples/xaml/ReadMe.md
@@ -0,0 +1,20 @@
+XAML (UWP) sample
+
+This sample was created to check possibility of OCCT compilation on Universal Windows Platform (UWP).
+Note that only FoundationClasses, ModelingAlgorithms and ModelingData modules can be built at the moment.
+
+Building OCCT and XAML (UWP) sample using CMake (since CMake version 3.4.0):
+  - Run CMake, select source and binary directories for OCCT
+  - Press "Configure" button
+  - Select generator for this project - "Visual Studio 14 2015"
+  - Select radio button "Specify toolchain file for cross-compiling" and press button "Next"
+  - Specify absolute path to the Toolchain file "OCCT/adm/templates/uwp.toolchain.config.cmake" and press button "Finish"
+  - After first configuration specify 3RDPARTY_DIR, INSTALL_DIR
+  - Turn ON BUILD_MODULE_Uwp checkbox.
+  - Press "Generate" button
+  - Build OCCT and XAML (UWP) sample from Visual Studio as usual.
+
+Troubleshooting:
+  If you have got an error like this (appears after running the sample from Visual Studio):
+    "Error : DEP3321 : To deploy this application, your deployment target should be running Windows Universal Runtime version 10.0.10240.0 or higher. You currently are running version 10.0.10166.0."
+  Go to the properties of uwp sample project and in tab "General", set minimum deployment target to the lowest one.
\ No newline at end of file
diff --git a/samples/xaml/pch.cpp b/samples/xaml/pch.cpp
new file mode 100644
index 0000000000..97b544ec11
--- /dev/null
+++ b/samples/xaml/pch.cpp
@@ -0,0 +1,6 @@
+//
+// pch.cpp
+// Include the standard header and generate the precompiled header.
+//
+
+#include "pch.h"
diff --git a/samples/xaml/pch.h b/samples/xaml/pch.h
new file mode 100644
index 0000000000..b793236d02
--- /dev/null
+++ b/samples/xaml/pch.h
@@ -0,0 +1,11 @@
+//
+// pch.h
+// Header for standard system include files.
+//
+
+#pragma once
+
+#include <collection.h>
+#include <ppltasks.h>
+
+#include "App.xaml.h"
diff --git a/samples/xaml/uwp_TemporaryKey.pfx b/samples/xaml/uwp_TemporaryKey.pfx
new file mode 100644
index 0000000000000000000000000000000000000000..28ae51ed3b078c014b9ae24ae4c444725bbf4868
GIT binary patch
literal 2446
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

literal 0
HcmV?d00001

diff --git a/src/AppParCurves/AppParCurves_BSpGradient.gxx b/src/AppParCurves/AppParCurves_BSpGradient.gxx
index abed1d250f..83953e2a5e 100644
--- a/src/AppParCurves/AppParCurves_BSpGradient.gxx
+++ b/src/AppParCurves/AppParCurves_BSpGradient.gxx
@@ -38,12 +38,6 @@
 #include <TColgp_Array1OfVec.hxx>
 #include <TColgp_Array1OfVec2d.hxx>
 
-#include <OSD_Chronometer.hxx>
-
-static OSD_Chronometer chr1;
-
-
-
 static AppParCurves_Constraint FirstConstraint
   (const Handle(AppParCurves_HArray1OfConstraintCouple)& TheConstraints,
    const Standard_Integer FirstPoint)
diff --git a/src/BRepAlgoAPI/BRepAlgoAPI_BooleanOperation.cxx b/src/BRepAlgoAPI/BRepAlgoAPI_BooleanOperation.cxx
index 225c41b819..ce200312e8 100644
--- a/src/BRepAlgoAPI/BRepAlgoAPI_BooleanOperation.cxx
+++ b/src/BRepAlgoAPI/BRepAlgoAPI_BooleanOperation.cxx
@@ -28,6 +28,7 @@
 #include <BRepAlgoAPI_Check.hxx>
 #include <BRepLib_FuseEdges.hxx>
 #include <BRepTools.hxx>
+#include <OSD_Environment.hxx>
 #include <OSD_File.hxx>
 #include <TCollection_AsciiString.hxx>
 #include <TopExp.hxx>
@@ -53,9 +54,10 @@ class BRepAlgoAPI_DumpOper {
     myIsDump(Standard_False),
     myIsDumpArgs(Standard_False),
     myIsDumpRes(Standard_False)  {
-      char *pathdump = getenv("CSF_DEBUG_BOP");
-      myIsDump=(pathdump!=NULL);
-      myPath=pathdump;
+      OSD_Environment env("CSF_DEBUG_BOP");
+      TCollection_AsciiString pathdump = env.Value();
+      myIsDump = (!pathdump.IsEmpty() ? Standard_True: Standard_False);
+      myPath=pathdump.ToCString();
   };
   //
   virtual ~BRepAlgoAPI_DumpOper() {
diff --git a/src/BRepPrimAPI/BRepPrimAPI_MakeCone.cxx b/src/BRepPrimAPI/BRepPrimAPI_MakeCone.cxx
index 00f1b90e07..728bf46885 100644
--- a/src/BRepPrimAPI/BRepPrimAPI_MakeCone.cxx
+++ b/src/BRepPrimAPI/BRepPrimAPI_MakeCone.cxx
@@ -23,31 +23,6 @@
 #include <gp_Dir.hxx>
 #include <Standard_DomainError.hxx>
 
-static gp_Ax2 ConeComputeAxes() { 
-  static Standard_Integer firsttime=1;
-  static Standard_Integer modif=0;
-  static Standard_Real cosa=cos(0.122);
-  static Standard_Real sina=sin(0.122);
-  static Standard_Real ux=1.0;
-  static Standard_Real uy=0.0;
-  
-  if(firsttime) { 
-    modif = getenv("PRIM_CONE") != NULL;
-    firsttime = 0;
-  }
-  if(modif) { 
-    Standard_Real nux = cosa*ux+sina*uy;
-    Standard_Real nuy =-sina*ux+cosa*uy;
-    ux=nux; uy=nuy;
-    return(gp_Ax2(gp::Origin(),gp::DZ(),gp_Dir(ux,uy,0.0)));
-  }
-  else { 
-    return(gp::XOY());
-  }
-}
-
-
-
 //=======================================================================
 //function : BRepPrimAPI_MakeCone
 //purpose  : 
@@ -56,7 +31,7 @@ static gp_Ax2 ConeComputeAxes() {
 BRepPrimAPI_MakeCone::BRepPrimAPI_MakeCone(const Standard_Real R1,
 				   const Standard_Real R2, 
 				   const Standard_Real H) :
-       myCone(ConeComputeAxes(),R1, R2, H)
+       myCone(gp::XOY(),R1, R2, H)
 {
 }
 
diff --git a/src/BRepPrimAPI/BRepPrimAPI_MakeCylinder.cxx b/src/BRepPrimAPI/BRepPrimAPI_MakeCylinder.cxx
index 2877c62ff2..e68e23d72b 100644
--- a/src/BRepPrimAPI/BRepPrimAPI_MakeCylinder.cxx
+++ b/src/BRepPrimAPI/BRepPrimAPI_MakeCylinder.cxx
@@ -23,32 +23,6 @@
 #include <gp_Dir.hxx>
 #include <Standard_DomainError.hxx>
 
-static gp_Ax2 CylinderComputeAxes() { 
-  static Standard_Integer firsttime=1;
-  static Standard_Integer modif=0;
-  static Standard_Real cosa=cos(0.1);
-  static Standard_Real sina=sin(0.1);
-  static Standard_Real ux=1.0;
-  static Standard_Real uy=0.0;
-  
-  if(firsttime) { 
-    modif = getenv("PRIM_CYLINDER") != NULL;
-    firsttime = 0;
-  }
-  if(modif) { 
-    Standard_Real nux = cosa*ux+sina*uy;
-    Standard_Real nuy =-sina*ux+cosa*uy;
-    ux=nux; uy=nuy;
-    return(gp_Ax2(gp::Origin(),gp::DZ(),gp_Dir(ux,uy,0.0)));
-  }
-  else { 
-    return(gp::XOY());
-  }
-
-}
-
-
-
 //=======================================================================
 //function : BRepPrimAPI_MakeCylinder
 //purpose  : 
@@ -56,7 +30,7 @@ static gp_Ax2 CylinderComputeAxes() {
 
 BRepPrimAPI_MakeCylinder::BRepPrimAPI_MakeCylinder(const Standard_Real R,
 					   const Standard_Real H) :
-       myCylinder(CylinderComputeAxes(), R , H)
+       myCylinder(gp::XOY(), R , H)
 {
 }
 
diff --git a/src/BRepPrimAPI/BRepPrimAPI_MakeSphere.cxx b/src/BRepPrimAPI/BRepPrimAPI_MakeSphere.cxx
index f4330a66b1..d302518252 100644
--- a/src/BRepPrimAPI/BRepPrimAPI_MakeSphere.cxx
+++ b/src/BRepPrimAPI/BRepPrimAPI_MakeSphere.cxx
@@ -24,37 +24,13 @@
 #include <gp_Pnt.hxx>
 #include <Standard_DomainError.hxx>
 
-static gp_Ax2 SphereComputeAxes() { 
-  static Standard_Integer firsttime=1;
-  static Standard_Integer modif=0;
-  static Standard_Real cosa=cos(0.111);
-  static Standard_Real sina=sin(0.111);
-  static Standard_Real ux=1.0;
-  static Standard_Real uy=0.0;
-  
-  if(firsttime) { 
-    modif = getenv("PRIM_SPHERE") != NULL;
-    firsttime = 0;
-  }
-  if(modif) { 
-    Standard_Real nux = cosa*ux+sina*uy;
-    Standard_Real nuy =-sina*ux+cosa*uy;
-    ux=nux; uy=nuy;
-    return(gp_Ax2(gp::Origin(),gp::DZ(),gp_Dir(ux,uy,0.0)));
-  }
-  else { 
-    return(gp::XOY());
-  }
-}
-
-
 //=======================================================================
 //function : BRepPrimAPI_MakeSphere
 //purpose  : 
 //=======================================================================
 
 BRepPrimAPI_MakeSphere::BRepPrimAPI_MakeSphere(const Standard_Real R) :
-       mySphere(SphereComputeAxes(),R)
+       mySphere(gp::XOY(),R)
 {
 }
 
diff --git a/src/BRepTools/BRepTools_NurbsConvertModification.cxx b/src/BRepTools/BRepTools_NurbsConvertModification.cxx
index 698ed411ae..1a8de56f7e 100644
--- a/src/BRepTools/BRepTools_NurbsConvertModification.cxx
+++ b/src/BRepTools/BRepTools_NurbsConvertModification.cxx
@@ -53,7 +53,6 @@
 #include <gp_GTrsf2d.hxx>
 #include <gp_Pnt.hxx>
 #include <gp_TrsfForm.hxx>
-#include <OSD_Chronometer.hxx>
 #include <ProjLib_ComputeApprox.hxx>
 #include <ProjLib_ComputeApproxOnPolarSurface.hxx>
 #include <Standard_NoSuchObject.hxx>
diff --git a/src/BiTgte/BiTgte_Blend.cxx b/src/BiTgte/BiTgte_Blend.cxx
index 1b1cb70be6..8fb6506569 100644
--- a/src/BiTgte/BiTgte_Blend.cxx
+++ b/src/BiTgte/BiTgte_Blend.cxx
@@ -69,7 +69,6 @@
 #include <gp_Pnt.hxx>
 #include <gp_Pnt2d.hxx>
 #include <gp_Sphere.hxx>
-#include <OSD_Chronometer.hxx>
 #include <Precision.hxx>
 #include <Standard_NotImplemented.hxx>
 #include <Standard_OutOfRange.hxx>
@@ -92,14 +91,20 @@
 #include <TopTools_MapIteratorOfMapOfShape.hxx>
 #include <TopTools_SequenceOfShape.hxx>
 
+#ifdef OCCT_DEBUG
+#include <OSD_Chronometer.hxx>
+#endif
+
 #include <stdio.h>
 // include - all hxx,
 //         - all small static functions.
 //======================== START STATIC FUNCTIONS ============
 // variables for performance 
 Standard_Real t_mkcurve;
+#ifdef OCCT_DEBUG
 extern void ChFi3d_InitChron(OSD_Chronometer& ch);
 extern void ChFi3d_ResultChron(OSD_Chronometer & ch, Standard_Real&    time);
+#endif
 #ifdef DRAW
 static Standard_Boolean Affich = Standard_False;
 static char name[100];
diff --git a/src/CDF/CDF.hxx b/src/CDF/CDF.hxx
index 705ae288db..b64755101d 100644
--- a/src/CDF/CDF.hxx
+++ b/src/CDF/CDF.hxx
@@ -32,52 +32,14 @@ class CDF_Store;
 class CDF_MetaDataDriver;
 class CDF_FWOSDriver;
 class CDF_MetaDataDriverFactory;
-class CDF_Timer;
-
-
 
 class CDF 
 {
 public:
-
-  DEFINE_STANDARD_ALLOC
-
   
   Standard_EXPORT static void GetLicense (const Standard_Integer anApplicationIdentifier);
   
   Standard_EXPORT static Standard_Boolean IsAvailable (const Standard_Integer anApplicationIdentifier);
-
-
-
-
-protected:
-
-
-
-
-
-private:
-
-
-
-
-friend class CDF_Directory;
-friend class CDF_DirectoryIterator;
-friend class CDF_Session;
-friend class CDF_Application;
-friend class CDF_StoreList;
-friend class CDF_Store;
-friend class CDF_MetaDataDriver;
-friend class CDF_FWOSDriver;
-friend class CDF_MetaDataDriverFactory;
-friend class CDF_Timer;
-
 };
 
-
-
-
-
-
-
 #endif // _CDF_HeaderFile
diff --git a/src/CDF/CDF_Application.cxx b/src/CDF/CDF_Application.cxx
index 31ad3665b5..3992409325 100644
--- a/src/CDF/CDF_Application.cxx
+++ b/src/CDF/CDF_Application.cxx
@@ -20,7 +20,6 @@
 #include <CDF_Directory.hxx>
 #include <CDF_MetaDataDriver.hxx>
 #include <CDF_Session.hxx>
-#include <CDF_Timer.hxx>
 #include <CDM_CanCloseStatus.hxx>
 #include <CDM_Document.hxx>
 #include <CDM_MetaData.hxx>
@@ -99,11 +98,8 @@ Handle(CDM_Document) CDF_Application::Retrieve(const TCollection_ExtendedString&
 Handle(CDM_Document)  CDF_Application::Retrieve(const TCollection_ExtendedString& aFolder, 
 				     const TCollection_ExtendedString& aName,
 				     const TCollection_ExtendedString& aVersion,
-				     const Standard_Boolean UseStorageConfiguration) {
-#ifdef OCCT_DEBUG
-  CDF_Timer theTimer;
-#endif
-
+				     const Standard_Boolean UseStorageConfiguration)
+{
   Handle(CDM_MetaData) theMetaData; 
   
   if(aVersion.Length() == 0) 
@@ -111,28 +107,14 @@ Handle(CDM_Document)  CDF_Application::Retrieve(const TCollection_ExtendedString
   else 
     theMetaData=theMetaDataDriver->MetaData(aFolder,aName,aVersion);
 
-#ifdef OCCT_DEBUG
-  theTimer.ShowAndRestart("Getting MetaData: ");
-#endif
-
   CDF_TypeOfActivation theTypeOfActivation=TypeOfActivation(theMetaData);
   Handle(CDM_Document) theDocument=Retrieve(theMetaData,UseStorageConfiguration,Standard_False);
 
-#ifdef OCCT_DEBUG
-  theTimer.ShowAndRestart("Creating Transient: ");
-#endif
-
   CDF_Session::CurrentSession()->Directory()->Add(theDocument);
   Activate(theDocument,theTypeOfActivation);
 
-#ifdef OCCT_DEBUG
-  theTimer.ShowAndStop("Activate: ");
-#endif
-
   theDocument->Open(this);
   return theDocument;
-
-
 }
 
 //=======================================================================
@@ -150,25 +132,13 @@ PCDM_ReaderStatus CDF_Application::CanRetrieve(const TCollection_ExtendedString&
 //=======================================================================
 PCDM_ReaderStatus CDF_Application::CanRetrieve(const TCollection_ExtendedString&  aFolder, const TCollection_ExtendedString&  aName, const TCollection_ExtendedString&  aVersion) {
   
-#ifdef OCCT_DEBUG
-  CDF_Timer theTimer;
-#endif
-
   if (!theMetaDataDriver->Find(aFolder,aName,aVersion))
     return PCDM_RS_UnknownDocument;
   else if (!theMetaDataDriver->HasReadPermission(aFolder,aName,aVersion))
     return PCDM_RS_PermissionDenied;
   else {
-#ifdef OCCT_DEBUG
-    theTimer.ShowAndRestart("theMetaDataDriver->Find: ");
-#endif
-
     Handle(CDM_MetaData) theMetaData = theMetaDataDriver->MetaData(aFolder,aName,aVersion);
 
-#ifdef OCCT_DEBUG
-    theTimer.ShowAndStop("Getting MetaData: ");
-#endif
-
     if(theMetaData->IsRetrieved()) {
       return theMetaData->Document()->IsModified()
 	? PCDM_RS_AlreadyRetrievedAndModified : PCDM_RS_AlreadyRetrieved;
@@ -199,11 +169,8 @@ PCDM_ReaderStatus CDF_Application::CanRetrieve(const TCollection_ExtendedString&
     }
   }
   return PCDM_RS_OK;
-  
 }
 
-
-
 //=======================================================================
 //function : Activate
 //purpose  : 
diff --git a/src/CDF/CDF_StoreList.cxx b/src/CDF/CDF_StoreList.cxx
index 619af206e2..5fc200a7b3 100644
--- a/src/CDF/CDF_StoreList.cxx
+++ b/src/CDF/CDF_StoreList.cxx
@@ -20,7 +20,6 @@
 #include <CDF_MetaDataDriverError.hxx>
 #include <CDF_Session.hxx>
 #include <CDF_StoreList.hxx>
-#include <CDF_Timer.hxx>
 #include <CDM_Document.hxx>
 #include <CDM_MetaData.hxx>
 #include <CDM_ReferenceIterator.hxx>
@@ -28,9 +27,7 @@
 #include <PCDM_Document.hxx>
 #include <PCDM_StorageDriver.hxx>
 #include <Standard_ErrorHandler.hxx>
-#include <Standard_Macro.hxx>
 #include <Standard_NoSuchObject.hxx>
-#include <Standard_Type.hxx>
 #include <TCollection_ExtendedString.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(CDF_StoreList,Standard_Transient)
@@ -112,15 +109,9 @@ PCDM_StoreStatus CDF_StoreList::Store (Handle(CDM_MetaData)& aMetaData, TCollect
           }
           TCollection_ExtendedString theName=theMetaDataDriver->BuildFileName(theDocument);
 
-          CDF_Timer theTimer;
           aDocumentStorageDriver->Write(theDocument,theName);
           status = aDocumentStorageDriver->GetStoreStatus();
-
-          theTimer.ShowAndRestart("Driver->Write: ");
-
           aMetaData = theMetaDataDriver->CreateMetaData(theDocument,theName);
-          theTimer.ShowAndStop("metadata creating: ");
-
           theDocument->SetMetaData(aMetaData);
 
           CDM_ReferenceIterator it(theDocument);
diff --git a/src/CDF/CDF_Timer.cxx b/src/CDF/CDF_Timer.cxx
deleted file mode 100644
index 3e229f091c..0000000000
--- a/src/CDF/CDF_Timer.cxx
+++ /dev/null
@@ -1,49 +0,0 @@
-// Created on: 1998-07-17
-// Created by: Jean-Louis Frenkel
-// Copyright (c) 1998-1999 Matra Datavision
-// Copyright (c) 1999-2014 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement.
-
-
-#include <CDF_Timer.hxx>
-
-#include <stdlib.h>
-CDF_Timer::CDF_Timer() {
-  myTimer.Start();
-}
-
-
-void CDF_Timer::ShowAndRestart(const Standard_CString aMessage) {
-  if(MustShow()) {
-    Show(aMessage);
-    myTimer.Reset();
-    myTimer.Start();
-  }
-}
-  
-void CDF_Timer::ShowAndStop(const Standard_CString aMessage) {
-  if(MustShow()) {
-    Show(aMessage);
-    myTimer.Stop();
-  }
-}
- 
-void CDF_Timer::Show(const Standard_CString aMessage) {
-  Standard_Integer minutes,hours; Standard_Real seconds,CPUtime;
-  myTimer.Show(seconds,minutes,hours,CPUtime);
-  cout << aMessage << hours << "h " << minutes << "' " << seconds << "'' (cpu: " << CPUtime << ")" << endl;
-}
-Standard_Boolean CDF_Timer::MustShow() {
-  static Standard_Boolean theMustShow=getenv("STORETIMER") != NULL;
-  return theMustShow;
-}
diff --git a/src/CDF/CDF_Timer.hxx b/src/CDF/CDF_Timer.hxx
deleted file mode 100644
index e979cb515f..0000000000
--- a/src/CDF/CDF_Timer.hxx
+++ /dev/null
@@ -1,71 +0,0 @@
-// Created on: 1998-07-17
-// Created by: Jean-Louis Frenkel
-// Copyright (c) 1998-1999 Matra Datavision
-// Copyright (c) 1999-2014 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement.
-
-#ifndef _CDF_Timer_HeaderFile
-#define _CDF_Timer_HeaderFile
-
-#include <Standard.hxx>
-#include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
-
-#include <OSD_Timer.hxx>
-#include <Standard_CString.hxx>
-#include <Standard_Boolean.hxx>
-
-
-
-class CDF_Timer 
-{
-public:
-
-  DEFINE_STANDARD_ALLOC
-
-  
-  Standard_EXPORT CDF_Timer();
-  
-  Standard_EXPORT void ShowAndRestart (const Standard_CString aMessage);
-  
-  Standard_EXPORT void ShowAndStop (const Standard_CString aMessage);
-  
-  Standard_EXPORT Standard_Boolean MustShow();
-
-
-
-
-protected:
-
-
-
-
-
-private:
-
-  
-  Standard_EXPORT void Show (const Standard_CString aMessage);
-
-
-  OSD_Timer myTimer;
-
-
-};
-
-
-
-
-
-
-
-#endif // _CDF_Timer_HeaderFile
diff --git a/src/CDF/FILES b/src/CDF/FILES
index 0c82247db5..d0aa8b6da7 100755
--- a/src/CDF/FILES
+++ b/src/CDF/FILES
@@ -21,7 +21,5 @@ CDF_StoreList.cxx
 CDF_StoreList.hxx
 CDF_StoreSetNameStatus.hxx
 CDF_SubComponentStatus.hxx
-CDF_Timer.cxx
-CDF_Timer.hxx
 CDF_TryStoreStatus.hxx
 CDF_TypeOfActivation.hxx
diff --git a/src/ChFi3d/ChFi3d_Builder_0.cxx b/src/ChFi3d/ChFi3d_Builder_0.cxx
index 9ba0cf32f2..9af214b001 100644
--- a/src/ChFi3d/ChFi3d_Builder_0.cxx
+++ b/src/ChFi3d/ChFi3d_Builder_0.cxx
@@ -161,7 +161,6 @@
 #include <ChFi3d_Builder_0.hxx>
 
 #ifdef OCCT_DEBUG
-#include <OSD_Chronometer.hxx>
 extern Standard_Boolean ChFi3d_GetcontextFORCEBLEND(); 
 extern Standard_Boolean ChFi3d_GettraceDRAWINT();
 extern Standard_Boolean ChFi3d_GettraceDRAWENLARGE();
@@ -169,8 +168,6 @@ extern Standard_Boolean ChFi3d_GettraceDRAWSPINE();
 extern Standard_Real  t_sameparam, t_batten;
 extern void ChFi3d_SettraceDRAWINT(const Standard_Boolean b);
 extern void ChFi3d_SettraceDRAWSPINE(const Standard_Boolean b);
-extern void ChFi3d_InitChron(OSD_Chronometer& ch);
-extern void ChFi3d_ResultChron(OSD_Chronometer & ch,Standard_Real& time);
 #endif
 
 #include <stdio.h>
diff --git a/src/ChFi3d/ChFi3d_Builder_6.cxx b/src/ChFi3d/ChFi3d_Builder_6.cxx
index 8728a198d3..c08336f944 100644
--- a/src/ChFi3d/ChFi3d_Builder_6.cxx
+++ b/src/ChFi3d/ChFi3d_Builder_6.cxx
@@ -100,11 +100,6 @@
 #include <TopTools_ListOfShape.hxx>
 
 #include <stdio.h>
-#ifdef OCCT_DEBUG
-// For measurements.
-#include <OSD_Chronometer.hxx>
-//static OSD_Chronometer appclock;
-#endif
 
 //#define DRAW 
 
diff --git a/src/ChFi3d/ChFi3d_Debug.cxx b/src/ChFi3d/ChFi3d_Debug.cxx
index c7de8104f3..d2e0c2affe 100644
--- a/src/ChFi3d/ChFi3d_Debug.cxx
+++ b/src/ChFi3d/ChFi3d_Debug.cxx
@@ -33,13 +33,13 @@
 #include <gp_Vec.hxx>
 #include <gp_Vec2d.hxx>
 #include <gp_Ax1.hxx>
-#include <OSD_Chronometer.hxx>
 
 #ifdef DRAW
 #include <DBRep.hxx>
 #endif
 
 #ifdef OCCT_DEBUG
+#include <OSD_Chronometer.hxx>
 OSD_Chronometer simul,elspine,chemine;
 #endif
 
@@ -169,6 +169,7 @@ void ChFi3d_SetcontextNOOPT(const Standard_Boolean b)
 Standard_Boolean ChFi3d_GetcontextNOOPT() 
 { return ChFi3d_contextNOOPT; }
 
+#ifdef OCCT_DEBUG
 // ***********************************************
 //    initialization and result of a chrono 
 //************************************************
@@ -186,7 +187,7 @@ Standard_EXPORT void ChFi3d_ResultChron( OSD_Chronometer & ch,
     ch.Show(tch);
     time=time +tch;
 }
-
+#endif
 
 //==============================================================
 // function : ChFi3d_CheckSurfData
diff --git a/src/ChFi3d/ChFi3d_FilBuilder.cxx b/src/ChFi3d/ChFi3d_FilBuilder.cxx
index 1ac6bebfaa..9539559380 100644
--- a/src/ChFi3d/ChFi3d_FilBuilder.cxx
+++ b/src/ChFi3d/ChFi3d_FilBuilder.cxx
@@ -71,6 +71,7 @@
 #include <TopTools_ListIteratorOfListOfShape.hxx>
 
 #ifdef OCCT_DEBUG
+#include <OSD_Chronometer.hxx>
 extern Standard_Boolean ChFi3d_GettraceCHRON();
 extern Standard_Real  t_computedata ,t_completedata; 
                     
diff --git a/src/IFSelect/IFSelect_SessionPilot.cxx b/src/IFSelect/IFSelect_SessionPilot.cxx
index f40e510a00..1ce7004c05 100644
--- a/src/IFSelect/IFSelect_SessionPilot.cxx
+++ b/src/IFSelect/IFSelect_SessionPilot.cxx
@@ -37,10 +37,10 @@ IMPLEMENT_STANDARD_RTTIEXT(IFSelect_SessionPilot,IFSelect_Activator)
 #define MAXCARS 1000
 
 static int initactor = 0;
-static char* trace;
-
 static TCollection_AsciiString nulword;
 
+//#define DEBUG_TRACE
+
 // Nb Maxi de words : cf thewords et method SetCommandLine
 
     IFSelect_SessionPilot::IFSelect_SessionPilot (const Standard_CString prompt)
@@ -57,7 +57,6 @@ static TCollection_AsciiString nulword;
   Add (4,"xsource");
   Add (5,"xstep");
   Add (6,"xnew");
-  trace = getenv("DEBUGMODE");
 }
 
 
@@ -100,7 +99,9 @@ static TCollection_AsciiString nulword;
       if (thenbwords >= MAXWORDS) {  unarg[nc] = val;  nc ++;  continue;  }
       unarg[nc] = '\0';
       thewords(thenbwords).Clear();  thewords(thenbwords).AssignCat(unarg);
-      if (trace) cout<<"thewords("<<thenbwords<<") ="<<unarg<<endl;
+#ifdef DEBUG_TRACE
+      cout<<"thewords("<<thenbwords<<") ="<<unarg<<endl;
+#endif
       thenbwords ++; nc = 0;
       continue;
     }
@@ -111,7 +112,9 @@ static TCollection_AsciiString nulword;
   if (nc > 0) {
     unarg[nc] = '\0'; thewords(thenbwords).Clear();
     thewords(thenbwords).AssignCat(unarg);
-    if (trace) cout<<"thewords("<<thenbwords<<")="<<unarg<<endl<<" .. Fin avec thenbwords="<<thenbwords+1<<endl;
+#ifdef DEBUG_TRACE
+    cout<<"thewords("<<thenbwords<<")="<<unarg<<endl<<" .. Fin avec thenbwords="<<thenbwords+1<<endl;
+#endif
     thenbwords ++;
   }
 /*
diff --git a/src/OSD/OSD.hxx b/src/OSD/OSD.hxx
index f3a1cd2e59..2520b43b8d 100644
--- a/src/OSD/OSD.hxx
+++ b/src/OSD/OSD.hxx
@@ -33,7 +33,6 @@ class OSD_File;
 class OSD_FileIterator;
 class OSD_Directory;
 class OSD_DirectoryIterator;
-class OSD_Chronometer;
 class OSD_Timer;
 class OSD_Printer;
 class OSD_Host;
diff --git a/src/OSD/OSD_Chronometer.cxx b/src/OSD/OSD_Chronometer.cxx
index 9c1d77d035..6153aafda9 100644
--- a/src/OSD/OSD_Chronometer.cxx
+++ b/src/OSD/OSD_Chronometer.cxx
@@ -136,10 +136,15 @@ static inline __int64 EncodeFILETIME (PFILETIME pFt)
 //=======================================================================
 void OSD_Chronometer::GetProcessCPU (Standard_Real& UserSeconds, Standard_Real& SystemSeconds)
 {
+#ifndef OCCT_UWP
   FILETIME ftStart, ftExit, ftKernel, ftUser;
   ::GetProcessTimes (GetCurrentProcess(), &ftStart, &ftExit, &ftKernel, &ftUser);
   UserSeconds   = 0.0000001 * EncodeFILETIME (&ftUser);
   SystemSeconds = 0.0000001 * EncodeFILETIME (&ftKernel);
+#else
+  UserSeconds = 0.0;
+  SystemSeconds = 0.0;
+#endif
 }
 
 //=======================================================================
@@ -148,10 +153,15 @@ void OSD_Chronometer::GetProcessCPU (Standard_Real& UserSeconds, Standard_Real&
 //=======================================================================
 void OSD_Chronometer::GetThreadCPU (Standard_Real& UserSeconds, Standard_Real& SystemSeconds)
 {
+#ifndef OCCT_UWP
   FILETIME ftStart, ftExit, ftKernel, ftUser;
   ::GetThreadTimes (GetCurrentThread(), &ftStart, &ftExit, &ftKernel, &ftUser);
   UserSeconds   = 0.0000001 * EncodeFILETIME (&ftUser);
   SystemSeconds = 0.0000001 * EncodeFILETIME (&ftKernel);
+#else
+  UserSeconds = 0.0;
+  SystemSeconds = 0.0;
+#endif
 }
 
 #endif /* _WIN32 */
diff --git a/src/OSD/OSD_Directory.cxx b/src/OSD/OSD_Directory.cxx
index 2415f4f998..88e12b0ee5 100644
--- a/src/OSD/OSD_Directory.cxx
+++ b/src/OSD/OSD_Directory.cxx
@@ -84,6 +84,7 @@ char                    name[] = "/tmp/CSFXXXXXX";
 #include <OSD_Protection.hxx>
 #include <Standard_ProgramError.hxx>
 #include <TCollection_ExtendedString.hxx>
+#include <NCollection_String.hxx>
 
 #include <OSD_WNT_1.hxx>
 
@@ -110,7 +111,7 @@ OSD_Directory :: OSD_Directory ( const OSD_Path& Name ) :
 
 }  // end constructor ( 2 )
 
-void OSD_Directory :: Build (const OSD_Protection& Protect ) {
+void OSD_Directory :: Build (const OSD_Protection& Protect) {
 
  TCollection_AsciiString dirName;
 
@@ -118,15 +119,15 @@ void OSD_Directory :: Build (const OSD_Protection& Protect ) {
 
  if (  dirName.IsEmpty ()  )
 
-  Standard_ProgramError :: Raise (
-                            TEXT( "OSD_Directory :: Build (): incorrect call - no directory name" )
-                           );
+  Standard_ProgramError :: Raise ( "OSD_Directory :: Build (): incorrect call - no directory name");
  TCollection_ExtendedString dirNameW(dirName);
- if (  Exists () || CreateDirectoryW ( (const wchar_t*) dirNameW.ToExtString (), NULL )  )
-
-  SetProtection ( Protect );
-
- else
+ if (Exists() || CreateDirectoryW((const wchar_t*)dirNameW.ToExtString(), NULL)) {
+#ifndef OCCT_UWP
+   SetProtection(Protect);
+#else
+   (void)Protect;
+#endif
+ } else
 
   _osd_wnt_set_error ( myError, OSD_WDirectory );
 
@@ -136,7 +137,10 @@ OSD_Directory OSD_Directory :: BuildTemporary () {
 
  OSD_Directory           retVal;
  OSD_Protection          prt;
- OSD_Path                dirPath (  tctmpnam ( NULL )  );
+
+ wchar_t* aName = _wtmpnam(NULL);
+ NCollection_String aFolder(aName != NULL ? aName : L"");
+ OSD_Path dirPath(aFolder.ToCString());
 
  retVal.SetPath ( dirPath );
  retVal.Build ( prt );                            
diff --git a/src/OSD/OSD_DirectoryIterator.cxx b/src/OSD/OSD_DirectoryIterator.cxx
index 1970977888..2c89a9553e 100644
--- a/src/OSD/OSD_DirectoryIterator.cxx
+++ b/src/OSD/OSD_DirectoryIterator.cxx
@@ -239,7 +239,7 @@ Standard_Boolean OSD_DirectoryIterator :: More () {
 
   // make wchar_t string from UTF-8
   TCollection_ExtendedString wcW(wc);
-  myHandle = FindFirstFileW ((const wchar_t*)wcW.ToExtString(), (PWIN32_FIND_DATAW)myData);
+  myHandle = FindFirstFileExW ((const wchar_t*)wcW.ToExtString(), FindExInfoStandard, (PWIN32_FIND_DATAW)myData, FindExSearchNameMatch, NULL, 0);
 
   if ( myHandle == INVALID_HANDLE_VALUE )
 
diff --git a/src/OSD/OSD_Disk.cxx b/src/OSD/OSD_Disk.cxx
index 5823c1e70e..b84a5662f2 100644
--- a/src/OSD/OSD_Disk.cxx
+++ b/src/OSD/OSD_Disk.cxx
@@ -162,6 +162,8 @@ Standard_Integer OSD_Disk::Error()const{
 #include <OSD_OSDError.hxx>
 #include <OSD_Path.hxx>
 #include <Standard_ProgramError.hxx>
+#include <NCollection_String.hxx>
+#include <TCollection_ExtendedString.hxx>
 
 #include <windows.h>
 
@@ -170,14 +172,22 @@ void _osd_wnt_set_error ( OSD_Error&, OSD_WhoAmI, ... );
 static void __fastcall _osd_wnt_set_disk_name ( TCollection_AsciiString&, const OSD_Path& );
 
 OSD_Disk :: OSD_Disk () {
-
- TCHAR cwd[ MAX_PATH ];
-
- GetCurrentDirectory ( MAX_PATH, cwd );
-
- cwd[ 3 ] = TEXT( '\x00' );
- DiskName = cwd;
-
+ DWORD aBuffLen = GetCurrentDirectoryW(0, NULL);
+ wchar_t* aBuff = new wchar_t[size_t(aBuffLen) + 1];
+ GetCurrentDirectoryW(aBuffLen, aBuff);
+ aBuff[aBuffLen - 1] = (aBuff[aBuffLen - 2] == L'\\') ? L'\0' : L'\\';
+ aBuff[aBuffLen] = L'\0';
+ if (aBuffLen > 3 && aBuff[0] != L'\\')
+ {
+   aBuff[3] = L'\0';
+   NCollection_String aFolder(aBuff);
+   DiskName = aFolder.ToCString();
+   delete[] aBuff;
+ }
+ else
+ {
+   DiskName = "";
+ }
 }  // end constructor ( 1 )
 
 OSD_Disk :: OSD_Disk ( const OSD_Path& Name ) {
@@ -223,8 +233,8 @@ Standard_Integer OSD_Disk :: DiskSize () {
   ULARGE_INTEGER lpTotalNumberOfBytes;    // receives the number of bytes on disk
   ULARGE_INTEGER lpTotalNumberOfFreeBytes;// receives the free bytes on disk
 
-
-  if (!GetDiskFreeSpaceEx (DiskName.ToCString (),
+  TCollection_ExtendedString DiskNameW(DiskName);
+  if (!GetDiskFreeSpaceExW ((const wchar_t*)DiskNameW.ToExtString(),
 			   &lpFreeBytesAvailableToCaller,
 			   &lpTotalNumberOfBytes,
 			   &lpTotalNumberOfFreeBytes))
@@ -261,8 +271,8 @@ Standard_Integer OSD_Disk :: DiskFree () {
   ULARGE_INTEGER lpTotalNumberOfFreeBytes;// receives the free bytes on disk
 
   // if (   !GetDiskFreeSpace (  DiskName.ToCString (), &dwSpC, &dwBpS, &dwFC, &dwC  )   )
-
-  if (!GetDiskFreeSpaceEx (DiskName.ToCString (),
+  TCollection_ExtendedString DiskNameW(DiskName);
+  if (!GetDiskFreeSpaceExW((const wchar_t*)DiskNameW.ToExtString(),
 			   &lpFreeBytesAvailableToCaller,
 			   &lpTotalNumberOfBytes,
 			   &lpTotalNumberOfFreeBytes))
@@ -349,26 +359,26 @@ static void __fastcall _osd_wnt_set_disk_name ( TCollection_AsciiString& result,
   dir = path.Trek ();
   
   if (   (  j = dir.UsefullLength ()  ) > 2 &&
-         dir.Value ( 1 ) == TEXT( '|' )     &&
-         dir.Value ( 2 ) == TEXT( '|' )
+         dir.Value ( 1 ) == '|'     &&
+         dir.Value ( 2 ) == '|'
   ) {
   
-   dir.SetValue (  1, TEXT( '\\' )  );
-   dir.SetValue (  2, TEXT( '\\' )  );
+   dir.SetValue (  1, '\\');
+   dir.SetValue (  2, '\\');
    
    for ( i = 3, k = 0; i <= j; ++i )
 
-    if (  dir.Value ( i ) == TEXT( '|' )  ) {
+    if (  dir.Value ( i ) == '|') {
     
      if ( k == 0 ) {
 
-      dir.SetValue (  i, TEXT( "\\" )  );     
+      dir.SetValue (  i, '\\');
       ++k;
       continue; 
      
      }  // end if
 
-     dir.SetValue (  i, TEXT( "\\" )  );
+     dir.SetValue (  i, '\\');
      break;
      
     }  /* end if */
@@ -381,14 +391,14 @@ static void __fastcall _osd_wnt_set_disk_name ( TCollection_AsciiString& result,
 
      else {
 
-      dir += TEXT( "\\" );
+      dir += '\\';
       dir += path.Name ();
       dir += path.Extension ();
       
      }  // end else    
     }
 
-    if (   dir.Value (  dir.UsefullLength ()  ) != TEXT( '\\' )   ) dir += TEXT( "\\" );
+    if (   dir.Value (  dir.UsefullLength ()  ) != '\\') dir += '\\';
 
     result = dir;
   
@@ -398,7 +408,7 @@ badPath:
 
   }  // end else
  
- } else result += TEXT( "/" );
+ } else result += '/';
 
 }  // end _osd_set_disk_name
 
diff --git a/src/OSD/OSD_Environment.cxx b/src/OSD/OSD_Environment.cxx
index c34a52413d..d3ed551773 100644
--- a/src/OSD/OSD_Environment.cxx
+++ b/src/OSD/OSD_Environment.cxx
@@ -246,7 +246,9 @@ Standard_Integer OSD_Environment::Error() const
   #pragma warning( disable : 4700 )
 #endif
 
+#ifndef OCCT_UWP
 static void __fastcall _set_error ( OSD_Error&, DWORD );
+#endif
 
 OSD_Environment :: OSD_Environment () {
 
@@ -276,6 +278,7 @@ void OSD_Environment :: SetValue ( const TCollection_AsciiString& Value ) {
 
 TCollection_AsciiString OSD_Environment::Value()
 {
+#ifndef OCCT_UWP
   myValue.Clear();
 
   SetLastError (ERROR_SUCCESS);
@@ -306,6 +309,10 @@ TCollection_AsciiString OSD_Environment::Value()
   }
   myValue = aValue.ToCString();
   return myValue;
+#else
+  myValue = "";
+  return myValue;
+#endif
 }
 
 void OSD_Environment :: SetName ( const TCollection_AsciiString& name ) {
@@ -322,14 +329,18 @@ TCollection_AsciiString OSD_Environment :: Name () const {
 
 void OSD_Environment::Build()
 {
+#ifndef OCCT_UWP
   NCollection_Utf8String aSetVariable = NCollection_Utf8String(myName.ToCString()) + "=" + myValue.ToCString();
   _wputenv (aSetVariable.ToUtfWide().ToCString());
+#endif
 }
 
 void OSD_Environment::Remove()
 {
+#ifndef OCCT_UWP
   NCollection_Utf8String aSetVariable = NCollection_Utf8String(myName.ToCString()) + "=";
   _wputenv (aSetVariable.ToUtfWide().ToCString());
+#endif
 }
 
 Standard_Boolean OSD_Environment :: Failed () const {
@@ -355,6 +366,7 @@ Standard_Integer OSD_Environment :: Error () const {
 
 }  // end OSD_Environment :: Error
 
+#ifndef OCCT_UWP
 static void __fastcall _set_error ( OSD_Error& err, DWORD code ) {
 
  DWORD              errCode;
@@ -377,5 +389,6 @@ static void __fastcall _set_error ( OSD_Error& err, DWORD code ) {
  err.SetValue ( errCode, OSD_WEnvironment, buffer );
 
 }  // end _set_error
+#endif
 
 #endif
diff --git a/src/OSD/OSD_Error.cxx b/src/OSD/OSD_Error.cxx
index e2d0ab9e60..130fdf62c6 100755
--- a/src/OSD/OSD_Error.cxx
+++ b/src/OSD/OSD_Error.cxx
@@ -449,6 +449,7 @@ void OSD_Error::Perror() {
 #include <TCollection_ExtendedString.hxx>
 
 #include <windows.h>
+#include <Strsafe.h>
 
 typedef struct _error_table {
 
@@ -570,82 +571,60 @@ OSD_Error :: OSD_Error () :
 
 void OSD_Error :: Perror () {
 
- Standard_Character buff[ 32 ];
- Standard_CString   ptr;
+ wchar_t buff[32];
 
-  lstrcpy (  buff, "Error ( "  );
+  StringCchCopyW(buff, _countof(buff), L"Error ( ");
 
   switch ( myCode ) {
   
    case OSD_WDirectoryIterator:
-
-    ptr = "OSD_DirectoryIterator";
-
+     StringCchCatW(buff, _countof(buff), L"OSD_DirectoryIterator");
    break;
 
    case OSD_WDirectory:
-
-    ptr = "OSD_Directory";
-
+    StringCchCatW(buff, _countof(buff), L"OSD_Directory");
    break;
 
    case OSD_WFileIterator:
-
-    ptr = "OSD_FileIterator";
-
+    StringCchCatW(buff, _countof(buff), L"OSD_FileIterator");
    break;
 
    case OSD_WFile:
-  
-    ptr = "OSD_File";
-
+    StringCchCatW(buff, _countof(buff), L"OSD_File");
    break;
 
    case OSD_WFileNode:
-
-    ptr = "OSD_FileNode";
-
+    StringCchCatW(buff, _countof(buff), L"OSD_FileNode");
    break;
 
    case OSD_WHost:
-
-    ptr = "OSD_Host";
-
+    StringCchCatW(buff, _countof(buff), L"OSD_Host");
    break;
 
    case OSD_WProcess:
-
-    ptr = "OSD_Environment";
-
+    StringCchCatW(buff, _countof(buff), L"OSD_Environment");
    break;
 
    case OSD_WEnvironmentIterator:
-
-    ptr = "OSD_EnvironmentIterator";
-
+     StringCchCatW(buff, _countof(buff), L"OSD_EnvironmentIterator");
    break;
 
    case OSD_WEnvironment:
-
-    ptr = "OSD_Environment";
-
+     StringCchCatW(buff, _countof(buff), L"OSD_Environment");
    break;
 
    case OSD_WDisk:
-
-    ptr = "OSD_Disk";
-
+     StringCchCatW(buff, _countof(buff), L"OSD_Disk");
    break;
 
    default:
-
-    ptr = "Unknown";
+     StringCchCatW(buff, _countof(buff), L"Unknown");
 
   }  // end switch
 
-  lstrcat ( buff, ptr );
-  lstrcat (  buff, " )"  );
-  std::cerr << buff;
+  StringCchCatW(buff, _countof(buff), L" )");
+
+  std::wcerr << buff;
  
  std::cerr << myMessage.ToCString() << std::endl << std::flush;
 
diff --git a/src/OSD/OSD_File.cxx b/src/OSD/OSD_File.cxx
index fb0c6f0c9f..4977f34737 100644
--- a/src/OSD/OSD_File.cxx
+++ b/src/OSD/OSD_File.cxx
@@ -839,6 +839,8 @@ void OSD_File::Rewind() {
 # include <tchar.h>
 #endif  // _INC_TCHAR
 
+#include <Strsafe.h>
+
 #if defined(__CYGWIN32__) || defined(__MINGW32__)
 #define VAC
 #endif
@@ -858,15 +860,16 @@ void OSD_File::Rewind() {
 #define OPEN_APPEND 2
 
 void                            _osd_wnt_set_error        ( OSD_Error&, OSD_WhoAmI, ... );
+#ifndef OCCT_UWP
 PSECURITY_DESCRIPTOR __fastcall _osd_wnt_protection_to_sd ( const OSD_Protection&, BOOL, wchar_t* = NULL );
 BOOL                 __fastcall _osd_wnt_sd_to_protection (
                                  PSECURITY_DESCRIPTOR, OSD_Protection&, BOOL
                                 );
 BOOL                 __fastcall _osd_print (const Standard_PCharacter, const wchar_t* );
-
+static int       __fastcall _get_buffer(HANDLE, Standard_PCharacter&, DWORD, BOOL, BOOL);
+#endif
 static void      __fastcall _test_raise ( HANDLE, Standard_CString );
 static Standard_Integer __fastcall _get_line (Standard_PCharacter& buffer, DWORD dwBuffSize, LONG& theSeekPos);
-static int       __fastcall _get_buffer ( HANDLE, Standard_PCharacter&, DWORD, BOOL, BOOL );
 static DWORD     __fastcall _get_access_mask ( OSD_SingleProtection );
 static DWORD     __fastcall _get_dir_access_mask ( OSD_SingleProtection prt );
 static HANDLE    __fastcall _open_file  ( Standard_CString, OSD_OpenMode, DWORD, LPBOOL = NULL );
@@ -942,7 +945,9 @@ int OSD_File::Capture(int theDescr) {
 }
 
 void OSD_File::Rewind() { 
-  SetFilePointer( myFileHandle, 0, NULL, FILE_BEGIN ); 
+  LARGE_INTEGER aDistanceToMove = { 0 };
+  aDistanceToMove.QuadPart = 0;
+  SetFilePointerEx(myFileHandle, aDistanceToMove, NULL, FILE_BEGIN);
 }
 
 // protect against occasional use of myFileHande in Windows code
@@ -952,9 +957,7 @@ void OSD_File::Rewind() {
 // Build a file if it doesn't exist or create again if it already exists
 // ---------------------------------------------------------------------
 
-void OSD_File :: Build (
-                  const OSD_OpenMode Mode, const OSD_Protection& Protect
-                 ) {
+void OSD_File :: Build ( const OSD_OpenMode Mode, const OSD_Protection& Protect) {
 
  TCollection_AsciiString fName;
 
@@ -980,8 +983,11 @@ void OSD_File :: Build (
   _osd_wnt_set_error ( myError, OSD_WFile );
 
  else {
-
+#ifndef OCCT_UWP
   SetProtection ( Protect );
+#else
+  (void)Protect;
+#endif
   myIO |= FLAG_FILE;
 
  }  // end else
@@ -1027,9 +1033,7 @@ void OSD_File :: Open (const OSD_OpenMode Mode, const OSD_Protection& /*Protect*
 // Append to an existing file
 // ---------------------------------------------------------------------
 
-void OSD_File :: Append (
-                  const OSD_OpenMode Mode, const OSD_Protection& Protect
-                 ) {
+void OSD_File :: Append ( const OSD_OpenMode Mode, const OSD_Protection& Protect) {
 
  BOOL                    fNew = FALSE;
  TCollection_AsciiString fName;
@@ -1059,8 +1063,11 @@ void OSD_File :: Append (
    Seek ( 0, OSD_FromEnd );
 
   } else {
-  
-   SetProtection ( Protect );
+#ifndef OCCT_UWP
+    SetProtection ( Protect );
+#else
+    (void)Protect;
+#endif
    myIO |= FLAG_FILE;
   
   }  // end else
@@ -1170,12 +1177,13 @@ void OSD_File :: ReadLine (
 
     } else if ( dwDummy != 0 ) {  // end-of-file reached ?
 
-     if ( peekChar != '\n' )  // if we did not get a <CR><LF> sequence
-    
-     // adjust file position
-
-      SetFilePointer (myFileHandle, -1, NULL, FILE_CURRENT);
-
+      if (peekChar != '\n')  // if we did not get a <CR><LF> sequence
+      {
+        // adjust file position
+        LARGE_INTEGER aDistanceToMove = { 0 };
+        aDistanceToMove.QuadPart = -1;
+        SetFilePointerEx(myFileHandle, aDistanceToMove, NULL, FILE_CURRENT);
+      }
     } else
      myIO |= FLAG_EOF;
 
@@ -1183,13 +1191,15 @@ void OSD_File :: ReadLine (
 
    } else if ( aSeekPos != 0 )
    {
-     SetFilePointer (myFileHandle, aSeekPos, NULL, FILE_CURRENT);
+     LARGE_INTEGER aDistanceToMove = { 0 };
+     aDistanceToMove.QuadPart = aSeekPos;
+     SetFilePointerEx(myFileHandle, aDistanceToMove, NULL, FILE_CURRENT);
    }
 
   }  // end else
    
  } else if ( myIO & FLAG_SOCKET || myIO & FLAG_PIPE || myIO & FLAG_NAMED_PIPE ) {
-
+#ifndef OCCT_UWP
   dwBytesRead = (DWORD)_get_buffer (myFileHandle, cBuffer, 
                                     (DWORD)NByte, TRUE, myIO & FLAG_SOCKET);
 
@@ -1241,7 +1251,7 @@ void OSD_File :: ReadLine (
    delete [] cDummyBuffer ;
 
   }  // end else
-   
+#endif
  } else
 
   RAISE(  "OSD_File :: ReadLine (): incorrect call - file is a directory"  );
@@ -1360,8 +1370,10 @@ void OSD_File :: Seek (
     RAISE(  "OSD_File :: Seek (): invalid parameter"  );
   
   }  // end switch
+  LARGE_INTEGER aDistanceToMove, aNewFilePointer = { 0 };
+  aDistanceToMove.QuadPart = Offset;
 
-  if (SetFilePointer (myFileHandle, (LONG)Offset, NULL, dwMoveMethod) == 0xFFFFFFFF)
+  if (!SetFilePointerEx(myFileHandle, aDistanceToMove, &aNewFilePointer, dwMoveMethod))
 
    _osd_wnt_set_error ( myError, OSD_WFile );
   
@@ -1464,9 +1476,13 @@ typedef struct _osd_wnt_key {
  void OSD_File::BuildTemporary () {
 
  OSD_Protection prt;
- HKEY           hKey;
- TCHAR          tmpPath[ MAX_PATH ];
+ wchar_t        tmpPath[ MAX_PATH ];
  BOOL           fOK = FALSE;
+
+// Windows Registry not supported by UWP
+#ifndef OCCT_UWP
+ HKEY           hKey;
+
  OSD_WNT_KEY    regKey[ 2 ] = {
  
                  { HKEY_LOCAL_MACHINE,
@@ -1488,25 +1504,25 @@ typedef struct _osd_wnt_key {
    DWORD dwType;
    DWORD dwSize = 0;
 
-   if (  RegQueryValueEx (
-          hKey, "TEMP", NULL, &dwType, NULL, &dwSize
+   if (  RegQueryValueExW (
+          hKey, L"TEMP", NULL, &dwType, NULL, &dwSize
          ) == ERROR_SUCCESS
    ) {
   
-    LPTSTR kVal = ( LPTSTR )HeapAlloc (
+     wchar_t* kVal = (wchar_t*)HeapAlloc (
                              GetProcessHeap (), HEAP_ZERO_MEMORY | HEAP_GENERATE_EXCEPTIONS,
-                             dwSize + sizeof ( TCHAR )
+                             dwSize + sizeof (wchar_t)
                             );
 
-     RegQueryValueEx (  hKey, "TEMP", NULL, &dwType, ( LPBYTE )kVal, &dwSize  );
+     RegQueryValueExW (  hKey, L"TEMP", NULL, &dwType, ( LPBYTE )kVal, &dwSize  );
 
      if ( dwType == REG_EXPAND_SZ )
     
-      ExpandEnvironmentStrings ( kVal, tmpPath, MAX_PATH );
+      ExpandEnvironmentStringsW ( kVal, tmpPath, MAX_PATH );
 
      else
 
-      lstrcpy ( tmpPath, kVal );
+       StringCchCopyW (tmpPath, _countof(tmpPath), kVal);
 
     HeapFree (  GetProcessHeap (), 0, ( LPVOID )kVal  );
     fOK = TRUE;
@@ -1520,15 +1536,21 @@ typedef struct _osd_wnt_key {
   if ( fOK ) break;
 
  }  // end for
+#else
+ if (GetTempPathW(_countof(tmpPath), tmpPath))
+   fOK = TRUE;
+#endif
+ if ( !fOK )       StringCchCopyW(tmpPath, _countof(tmpPath), L"./");
 
- if ( !fOK ) lstrcpy (  tmpPath, "./"  );
- 
- GetTempFileName ( tmpPath, "CSF", 0, tmpPath );
+ GetTempFileNameW ( tmpPath, L"CSF", 0, tmpPath );
 
  if ( IsOpen() )
   Close();
 
- SetPath (  OSD_Path ( tmpPath )  );
+ char tmpPathA[MAX_PATH];
+ WideCharToMultiByte(CP_UTF8, 0, tmpPath, -1, tmpPathA, sizeof(tmpPathA), NULL, NULL);
+ SetPath(OSD_Path(tmpPathA));
+
  Build   (  OSD_ReadWrite, prt    );
 }  // end OSD_File :: BuildTemporary
 
@@ -1598,8 +1620,12 @@ void OSD_File :: UnLock () {
  
   LARGE_INTEGER aSize;
   aSize.QuadPart = Size();
-  if (!UnlockFile (myFileHandle, 0, 0, aSize.LowPart, aSize.HighPart))
-   
+
+  OVERLAPPED anOverlappedArea;
+  anOverlappedArea.Offset = 0;
+  anOverlappedArea.OffsetHigh = 0;
+
+  if (!UnlockFileEx(myFileHandle, 0, aSize.LowPart, aSize.HighPart,&anOverlappedArea))
    _osd_wnt_set_error ( myError, OSD_WFile );
 
   ImperativeFlag = Standard_False;
@@ -1651,9 +1677,8 @@ Standard_Size OSD_File::Size()
 // -------------------------------------------------------------------------- 
 // Print contains of a file
 // -------------------------------------------------------------------------- 
-
-void OSD_File :: Print ( const OSD_Printer& WhichPrinter ) {
-
+void OSD_File :: Print ( const OSD_Printer& WhichPrinter) {
+#ifndef OCCT_UWP
  if (myFileHandle != INVALID_HANDLE_VALUE)
 
   RAISE(  "OSD_File :: Print (): incorrect call - file opened"  );
@@ -1668,9 +1693,10 @@ void OSD_File :: Print ( const OSD_Printer& WhichPrinter ) {
                       (const wchar_t*)fNameW.ToExtString ()  )   )
 
   _osd_wnt_set_error ( myError, OSD_WFile );
-
+#else
+  (void)WhichPrinter;
+#endif
 }  // end OSD_File :: Print
-
 // -------------------------------------------------------------------------- 
 // Test if a file is open
 // -------------------------------------------------------------------------- 
@@ -1687,6 +1713,7 @@ Standard_Boolean OSD_File :: IsOpen () const {
 #define __leave return retVal
 #endif
 
+#ifndef OCCT_UWP
 PSECURITY_DESCRIPTOR __fastcall _osd_wnt_protection_to_sd (
                                  const OSD_Protection& prot, BOOL fDir, wchar_t* fName
                                 ) {
@@ -1945,6 +1972,7 @@ leave: ;     // added for VisualAge
  return retVal;
  
 }  // end _osd_wnt_protection_to_sd */
+#endif
 
 #if defined(__CYGWIN32__) || defined(__MINGW32__)
 #undef __try
@@ -1954,17 +1982,13 @@ leave: ;     // added for VisualAge
 
 static void __fastcall _test_raise ( HANDLE hFile, Standard_CString str ) {
 
- Standard_Character buff[ 64 ];
+  if (hFile == INVALID_HANDLE_VALUE) {
+    TCollection_AsciiString buff = "OSD_File :: ";
+    buff += str;
+    buff += " (): wrong access";
 
- if (hFile == INVALID_HANDLE_VALUE) {
- 
-  strcpy (  buff, "OSD_File :: "  );
-  strcat (  buff, str );
-  strcat (  buff, " (): wrong access"  );
-
-  Standard_ProgramError :: Raise ( buff );
- 
- }  // end if
+    Standard_ProgramError::Raise(buff.ToCString());
+  }  // end if
 
 }  // end _test_raise
 
@@ -2006,6 +2030,7 @@ static Standard_Integer __fastcall _get_line (Standard_PCharacter& buffer, DWORD
  return dwBuffSize;
 }  // end _get_line
 
+#ifndef OCCT_UWP
 static int __fastcall _get_buffer (
                         HANDLE hChannel,
                         Standard_PCharacter& buffer, 
@@ -2283,7 +2308,7 @@ static DWORD __fastcall _get_dir_access_mask ( OSD_SingleProtection prt ) {
  return retVal;
 
 }  // end _get_dir_access_mask
-
+#endif
 static HANDLE __fastcall _open_file (
                           Standard_CString fName,
                           OSD_OpenMode oMode,
@@ -2324,12 +2349,24 @@ static HANDLE __fastcall _open_file (
 
  // make wide character string from UTF-8
  TCollection_ExtendedString fNameW(fName, Standard_True);
+#ifndef OCCT_UWP
  retVal = CreateFileW (
            (const wchar_t*) fNameW.ToExtString(), dwDesiredAccess,
            FILE_SHARE_READ | FILE_SHARE_WRITE,
            NULL, dwCreationDistribution, FILE_ATTRIBUTE_NORMAL, NULL
           );
-
+#else
+ CREATEFILE2_EXTENDED_PARAMETERS pCreateExParams = {};
+ pCreateExParams.dwSize = sizeof(CREATEFILE2_EXTENDED_PARAMETERS);
+ pCreateExParams.dwFileAttributes = FILE_ATTRIBUTE_NORMAL;
+ pCreateExParams.lpSecurityAttributes = NULL;
+ pCreateExParams.hTemplateFile = NULL;
+ retVal = CreateFile2 (
+           (const wchar_t*) fNameW.ToExtString(), dwDesiredAccess,
+           FILE_SHARE_READ | FILE_SHARE_WRITE,
+           dwCreationDistribution, &pCreateExParams
+          );
+#endif
  if ( retVal          == INVALID_HANDLE_VALUE &&
       dwOptions       == OPEN_APPEND          &&
       GetLastError () == ERROR_FILE_NOT_FOUND
@@ -2337,12 +2374,24 @@ static HANDLE __fastcall _open_file (
 
  
   dwCreationDistribution = CREATE_ALWAYS;
-  
+#ifndef OCCT_UWP
   retVal = CreateFileW (
             (const wchar_t*) fNameW.ToExtString(), dwDesiredAccess,
             FILE_SHARE_READ | FILE_SHARE_WRITE,
             NULL, dwCreationDistribution, FILE_ATTRIBUTE_NORMAL, NULL
            );
+#else
+  CREATEFILE2_EXTENDED_PARAMETERS pCreateExParams2 = {};
+  pCreateExParams2.dwSize = sizeof(CREATEFILE2_EXTENDED_PARAMETERS);
+  pCreateExParams2.dwFileAttributes = FILE_ATTRIBUTE_NORMAL;
+  pCreateExParams2.lpSecurityAttributes = NULL;
+  pCreateExParams2.hTemplateFile = NULL;
+  retVal = CreateFile2(
+    (const wchar_t*)fNameW.ToExtString(), dwDesiredAccess,
+    FILE_SHARE_READ | FILE_SHARE_WRITE,
+    dwCreationDistribution, &pCreateExParams2
+  );
+#endif
 
   *fNew = TRUE;
 
@@ -2357,7 +2406,6 @@ Standard_Integer __fastcall _get_file_type (
                             ) {
 
  Standard_Integer retVal = 0;
- DWORD            dwType;
  int              fileType;
 
  fileType = (fileHandle == INVALID_HANDLE_VALUE ? 
@@ -2375,10 +2423,11 @@ Standard_Integer __fastcall _get_file_type (
   {
    // make wide character string from UTF-8
    TCollection_ExtendedString fNameW(fName, Standard_True);
-   dwType = GetFileAttributesW ( (const wchar_t*) fNameW.ToExtString() );
-   if (  dwType  != 0xFFFFFFFF  )
 
-    retVal =  dwType & FILE_ATTRIBUTE_DIRECTORY ? FLAG_DIRECTORY : FLAG_FILE;
+   WIN32_FILE_ATTRIBUTE_DATA aFileInfo;
+   if (GetFileAttributesExW((const wchar_t*)fNameW.ToExtString(), GetFileExInfoStandard, &aFileInfo))
+
+    retVal = aFileInfo.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY ? FLAG_DIRECTORY : FLAG_FILE;
 
    else
 
@@ -2410,6 +2459,8 @@ Standard_Integer __fastcall _get_file_type (
 #define __leave return retVal
 #endif
 
+#ifndef OCCT_UWP
+// None of the existing security APIs are supported in a UWP applications
 BOOL __fastcall _osd_wnt_sd_to_protection (
                  PSECURITY_DESCRIPTOR pSD, OSD_Protection& prot, BOOL fDir
                 ) {
@@ -2495,13 +2546,14 @@ leave: ;      // added for VisualAge
  return retVal;
 
 }  // end _osd_wnt_sd_to_protection
+#endif
 
 #if defined(__CYGWIN32__) || defined(__MINGW32__)
 #undef __try
 #undef __finally
 #undef __leave
 #endif
-
+#ifndef OCCT_UWP
 static OSD_SingleProtection __fastcall _get_protection ( DWORD mask ) {
 
  OSD_SingleProtection retVal;
@@ -2717,6 +2769,7 @@ static OSD_SingleProtection __fastcall _get_protection_dir ( DWORD mask ) {
  return retVal;
 
 }  // end _get_protection_dir
+#endif
 
 #if defined(__CYGWIN32__) || defined(__MINGW32__)
 #define __try
@@ -2724,6 +2777,7 @@ static OSD_SingleProtection __fastcall _get_protection_dir ( DWORD mask ) {
 #define __leave return fOK
 #endif
 
+#ifndef OCCT_UWP
 BOOL __fastcall _osd_print (const Standard_PCharacter pName, const wchar_t* fName ) {
 
  BOOL   fOK, fJob;                
@@ -2802,6 +2856,7 @@ leave: ;       // added for VisualAge
  return fOK;
                 
 }  // end _osd_print
+#endif
 
 #if defined(__CYGWIN32__) || defined(__MINGW32__)
 #undef __try
diff --git a/src/OSD/OSD_FileIterator.cxx b/src/OSD/OSD_FileIterator.cxx
index f8f78b2032..399467ce97 100644
--- a/src/OSD/OSD_FileIterator.cxx
+++ b/src/OSD/OSD_FileIterator.cxx
@@ -317,7 +317,7 @@ Standard_Boolean OSD_FileIterator :: More () {
 
   // make wchar_t string from UTF-8
   TCollection_ExtendedString wcW(wc);
-  myHandle = FindFirstFileW ((const wchar_t*)wcW.ToExtString(), (PWIN32_FIND_DATAW)myData);
+  myHandle = FindFirstFileExW((const wchar_t*)wcW.ToExtString(), FindExInfoStandard, (PWIN32_FIND_DATAW)myData, FindExSearchNameMatch, NULL, 0);
 
   if (  myHandle == INVALID_HANDLE_VALUE  )
   
diff --git a/src/OSD/OSD_FileNode.cxx b/src/OSD/OSD_FileNode.cxx
index ebf969456d..c70994eb48 100644
--- a/src/OSD/OSD_FileNode.cxx
+++ b/src/OSD/OSD_FileNode.cxx
@@ -363,6 +363,11 @@ Standard_Integer OSD_FileNode::Error()const{
 //----------------------------------------------------------------------------
 
 #define STRICT
+#ifdef NONLS
+#undef NONLS
+#endif
+#include <windows.h>
+
 #include <OSD_FileNode.hxx>
 #include <OSD_Protection.hxx>
 #include <Quantity_Date.hxx>
@@ -375,13 +380,18 @@ Standard_Integer OSD_FileNode::Error()const{
 # include <tchar.h>
 #endif  // _INC_TCHAR
 
+#include <Strsafe.h>
+
 #define TEST_RAISE( arg ) _test_raise (  fName, ( arg )  )
 #define RAISE( arg ) Standard_ProgramError :: Raise (  ( arg )  )
 
+#ifndef OCCT_UWP
+// None of the existing security APIs are supported in a UWP applications
 PSECURITY_DESCRIPTOR __fastcall _osd_wnt_protection_to_sd ( const OSD_Protection&, BOOL, wchar_t* = NULL );
 BOOL                 __fastcall _osd_wnt_sd_to_protection (
                                  PSECURITY_DESCRIPTOR pSD, OSD_Protection& prot, BOOL
                                 );
+#endif
 Standard_Integer     __fastcall _get_file_type ( Standard_CString, HANDLE );
 
 void _osd_wnt_set_error ( OSD_Error&, OSD_WhoAmI, ... );
@@ -447,12 +457,14 @@ Standard_Boolean OSD_FileNode::Exists () {
 
  // make wide character string from UTF-8
  TCollection_ExtendedString fNameW(fName);
- if (  GetFileAttributesW ( (const wchar_t*) fNameW.ToExtString ()  ) == 0xFFFFFFFF  ) {
- 
+
+ WIN32_FILE_ATTRIBUTE_DATA aFileInfo;
+
+ if ( !GetFileAttributesExW((const wchar_t*)fNameW.ToExtString(), GetFileExInfoStandard, &aFileInfo)) {
+
   if (  GetLastError () != ERROR_FILE_NOT_FOUND  )
+    _osd_wnt_set_error(myError, OSD_WFileNode, (const wchar_t*)fNameW.ToExtString());
 
-   _osd_wnt_set_error (  myError, OSD_WFileNode, fName.ToCString ()  );
- 
  } else
 
   retVal = Standard_True;
@@ -480,9 +492,7 @@ void OSD_FileNode::Remove () {
   case FLAG_FILE:
 
    if (   !DeleteFileW (  (const wchar_t*) fNameW.ToExtString ()  )   )
-
-    _osd_wnt_set_error (  myError, OSD_WFileNode,  fName.ToCString ()  );
-
+     _osd_wnt_set_error (  myError, OSD_WFileNode, (const wchar_t*)fNameW.ToExtString());
   break;
 
   case FLAG_DIRECTORY:
@@ -492,16 +502,11 @@ void OSD_FileNode::Remove () {
 //      ne pas detruire un repertoire no vide.
 
    if (   !RemoveDirectoryW ( (const wchar_t*) fNameW.ToExtString ()  )   )
-
-    _osd_wnt_set_error (  myError, OSD_WFileNode, fName.ToCString ()  );
-
+     _osd_wnt_set_error (  myError, OSD_WFileNode, (const wchar_t*)fNameW.ToExtString());
   break;
 
   default:
-
-   RAISE(  TEXT( "OSD_FileNode :: Remove ():"
-                 " invalid file type - neither file nor directory" )  );
-
+   RAISE("OSD_FileNode :: Remove (): invalid file type - neither file nor directory");
  }  // end switch
 
 }  // end OSD_FileNode :: Remove
@@ -533,9 +538,7 @@ void OSD_FileNode::Move ( const OSD_Path& NewPath ) {
                      MOVEFILE_REPLACE_EXISTING | MOVEFILE_COPY_ALLOWED
                      )
        )
- 
-     _osd_wnt_set_error ( myError, OSD_WFileNode,
-                          fName.ToCString (), fNameDst.ToCString ()  );
+     _osd_wnt_set_error(myError, OSD_WFileNode, (const wchar_t*)fNameW.ToExtString(), (const wchar_t*)fNameDstW.ToExtString());
   break;
 
   case FLAG_DIRECTORY:
@@ -544,17 +547,11 @@ void OSD_FileNode::Move ( const OSD_Path& NewPath ) {
             (const wchar_t*) fNameW.ToExtString (), (const wchar_t*) fNameDstW.ToExtString ()
            )
    )
- 
-    _osd_wnt_set_error ( myError, OSD_WFileNode,
-                         fName.ToCString (), fNameDst.ToCString ()  );
-
+   _osd_wnt_set_error(myError, OSD_WFileNode, (const wchar_t*)fNameW.ToExtString(), (const wchar_t*)fNameDstW.ToExtString());
   break;
 
   default:
-
-   RAISE(  TEXT( "OSD_FileNode :: Move (): "
-                 "invalid file type - neither file nor directory" )  );
-
+   RAISE("OSD_FileNode :: Move (): invalid file type - neither file nor directory");
  }  // end switch
 
 }  // end OSD_FileNode :: Move
@@ -580,11 +577,14 @@ void OSD_FileNode::Copy ( const OSD_Path& ToPath ) {
  switch (_get_file_type (fName.ToCString(), INVALID_HANDLE_VALUE)) {
 
   case FLAG_FILE:
-
-   if (!CopyFileW ((const wchar_t*)fNameW.ToExtString (),
-                   (const wchar_t*)fNameDstW.ToExtString (), FALSE ))
-     _osd_wnt_set_error (myError, OSD_WFileNode,
-                         fName.ToCString (), fNameDst.ToCString ());
+#ifndef OCCT_UWP
+    if (!CopyFileW((const wchar_t*)fNameW.ToExtString(),
+      (const wchar_t*)fNameDstW.ToExtString(), FALSE))
+#else
+   if (CopyFile2((const wchar_t*)fNameW.ToExtString (),
+                 (const wchar_t*)fNameDstW.ToExtString (), FALSE ) != S_OK)
+#endif
+   _osd_wnt_set_error(myError, OSD_WFileNode, (const wchar_t*)fNameW.ToExtString(), (const wchar_t*)fNameDstW.ToExtString());
   break;
 
   case FLAG_DIRECTORY:
@@ -593,22 +593,21 @@ void OSD_FileNode::Copy ( const OSD_Path& ToPath ) {
             (const wchar_t*)fNameW.ToExtString (), (const wchar_t*)fNameDstW.ToExtString ()
           )
    )
- 
-    _osd_wnt_set_error (
-     myError, OSD_WFileNode, fName.ToCString (), fNameDst.ToCString ()
-    );
+
+   _osd_wnt_set_error(myError, OSD_WFileNode, (const wchar_t*)fNameW.ToExtString(), (const wchar_t*)fNameDstW.ToExtString());
 
   break;
 
   default:
-
-   RAISE(  TEXT( "OSD_FileNode :: Copy ():"
-                 " invalid file type - neither file nor directory" )  );
+   RAISE("OSD_FileNode :: Copy (): invalid file type - neither file nor directory");
 
  }  // end switch
 
 }  // end OSD_FileNode :: Copy
 
+// None of the existing security APIs are supported in a UWP applications
+#ifndef OCCT_UWP
+
 //=======================================================================
 //function : Protection
 //purpose  : 
@@ -671,8 +670,7 @@ void OSD_FileNode::SetProtection ( const OSD_Protection& Prot ) {
                        (const wchar_t*) fNameW.ToExtString (), DACL_SECURITY_INFORMATION, pSD
                       )
  )
-  
-  _osd_wnt_set_error (  myError, OSD_WFileNode, fName.ToCString ()  );
+  _osd_wnt_set_error (  myError, OSD_WFileNode, (const wchar_t*)fNameW.ToExtString());
 
  if ( pSD != NULL )
 
@@ -680,6 +678,46 @@ void OSD_FileNode::SetProtection ( const OSD_Protection& Prot ) {
 
 }  // end OSD_FileNode :: SetProtection
 
+#else /* UWP stub */
+
+#include <io.h>
+
+//=======================================================================
+//function : Protection
+//purpose  : 
+//=======================================================================
+
+OSD_Protection OSD_FileNode::Protection ()
+{
+ TCollection_AsciiString fName;
+
+ myPath.SystemName ( fName );
+ TCollection_ExtendedString fNameW(fName);
+
+ OSD_SingleProtection aProt = OSD_None;
+ if (_waccess_s ((const wchar_t*)fNameW.ToExtString(), 6))
+   aProt = OSD_RW;
+ else if (_waccess_s ((const wchar_t*)fNameW.ToExtString(), 2))
+   aProt = OSD_W;
+ else if (_waccess_s ((const wchar_t*)fNameW.ToExtString(), 4))
+   aProt = OSD_R;
+
+ // assume full access for system and none for everybody
+ OSD_Protection retVal (OSD_RWXD, aProt, aProt, OSD_None);
+ return retVal;
+}  // end OSD_FileNode :: Protection
+
+//=======================================================================
+//function : SetProtection
+//purpose  : 
+//=======================================================================
+
+void OSD_FileNode::SetProtection ( const OSD_Protection& /*Prot*/ )
+{
+}  // end OSD_FileNode :: SetProtection
+
+#endif
+
 //=======================================================================
 //function : AccessMoment
 //purpose  : 
@@ -714,8 +752,7 @@ Quantity_Date OSD_FileNode::AccessMoment () {
                     );
 }
  else
-
-  _osd_wnt_set_error (  myError, OSD_WFileNode, fName.ToCString ()  );
+  _osd_wnt_set_error (  myError, OSD_WFileNode, (const wchar_t*)fNameW.ToExtString());
 
  return retVal;
 
@@ -755,8 +792,7 @@ Quantity_Date OSD_FileNode::CreationMoment () {
                     );
 }
  else
-
-  _osd_wnt_set_error (  myError, OSD_WFileNode, fName.ToCString ()  );
+  _osd_wnt_set_error (  myError, OSD_WFileNode, (const wchar_t*)fNameW.ToExtString());
 
  return retVal;
 
@@ -809,26 +845,30 @@ Standard_Integer OSD_FileNode::Error () const {
 void _osd_wnt_set_error ( OSD_Error& err, OSD_WhoAmI who, ... ) {
 
  DWORD              errCode;
- Standard_Character buffer[ 2048 ];
+
+ wchar_t buffer[2048];
+
  va_list            arg_ptr;
 
  va_start ( arg_ptr, who);
 
  errCode = GetLastError ();
 
- if (  !FormatMessage (
-         FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ARGUMENT_ARRAY,
+ if (  !FormatMessageW (
+         FORMAT_MESSAGE_FROM_SYSTEM,
          0, errCode, MAKELANGID( LANG_NEUTRAL, SUBLANG_NEUTRAL ),
          buffer, 2048, &arg_ptr
         )
  ) {
- 
-  sprintf ( buffer, "error code %d", (Standard_Integer)errCode );
+  StringCchPrintfW(buffer, _countof(buffer), L"error code %d", (Standard_Integer)errCode);
+
   SetLastError ( errCode );
 
  }  // end if
 
- err.SetValue ( errCode, who, buffer );
+ char aBufferA[2048];
+ WideCharToMultiByte(CP_UTF8, 0, buffer, -1, aBufferA, sizeof(aBufferA), NULL, NULL);
+ err.SetValue(errCode, who, aBufferA);
 
  va_end ( arg_ptr );
 
@@ -851,11 +891,23 @@ static BOOL __fastcall _get_file_time (
  HANDLE     hFile = INVALID_HANDLE_VALUE;
 
  __try {
-
-  if (   (  hFile = CreateFileW ((const wchar_t*) fName, 0, 0,
-                                 NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL)
-         ) == INVALID_HANDLE_VALUE
-  ) __leave;
+#ifndef OCCT_UWP
+   if ((hFile = CreateFileW((const wchar_t*)fName, 0, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL)
+     ) == INVALID_HANDLE_VALUE
+     )
+#else
+   CREATEFILE2_EXTENDED_PARAMETERS pCreateExParams = {};
+   pCreateExParams.dwSize = sizeof(CREATEFILE2_EXTENDED_PARAMETERS);
+   pCreateExParams.dwFileAttributes = FILE_ATTRIBUTE_NORMAL;
+   pCreateExParams.lpSecurityAttributes = NULL;
+   pCreateExParams.hTemplateFile = NULL;
+   if ((hFile = CreateFile2(
+     (const wchar_t*)fName, NULL, NULL,
+     OPEN_EXISTING, &pCreateExParams)
+     ) == INVALID_HANDLE_VALUE
+     )
+#endif
+    __leave;
 
   if (  !GetFileTime ( hFile, &ftCreationTime, NULL, &ftLastWriteTime )  ) __leave;
 
@@ -890,17 +942,12 @@ leave: ;      // added for VisualAge
 #endif
 
 static void __fastcall _test_raise ( TCollection_AsciiString fName, Standard_CString str ) {
-
- Standard_Character buff[ 64 ];
-
  if (  fName.IsEmpty ()  ) {
- 
-  strcpy (  buff, "OSD_FileNode :: "  );
-  strcat (  buff, str );
-  strcat (  buff, " (): wrong access"  );
+   TCollection_AsciiString buff = "OSD_FileNode :: ";
+   buff += str;
+   buff += " (): wrong access";
 
-  Standard_ProgramError :: Raise ( buff );
- 
+   Standard_ProgramError::Raise(buff.ToCString());
  }  // end if
 
 }  // end _test_raise
diff --git a/src/OSD/OSD_FileNode.hxx b/src/OSD/OSD_FileNode.hxx
index 99dcd78dc6..f04055e6fa 100644
--- a/src/OSD/OSD_FileNode.hxx
+++ b/src/OSD/OSD_FileNode.hxx
@@ -57,13 +57,14 @@ public:
   
   //! Copies <me> to another FileNode
   Standard_EXPORT void Copy (const OSD_Path& ToPath);
-  
+
+  // None of the existing security APIs are supported in a UWP applications
   //! Returns access mode of <me>.
   Standard_EXPORT OSD_Protection Protection();
   
   //! Changes protection of the FileNode
   Standard_EXPORT void SetProtection (const OSD_Protection& Prot);
-  
+
   //! Returns last write access.
   //! On UNIX, AccessMoment and CreationMoment return the
   //! same value.
diff --git a/src/OSD/OSD_Host.cxx b/src/OSD/OSD_Host.cxx
index 8bf2a0849d..4ab93a99a8 100644
--- a/src/OSD/OSD_Host.cxx
+++ b/src/OSD/OSD_Host.cxx
@@ -200,7 +200,7 @@ static TCollection_AsciiString interAddr;
 static Standard_Integer        memSize;
 
 OSD_Host :: OSD_Host () {
-
+#ifndef OCCT_UWP
  DWORD              nSize;
  Standard_Character szHostName[ MAX_COMPUTERNAME_LENGTH + 1 ];
  char*              hostAddr = 0;
@@ -280,7 +280,7 @@ OSD_Host :: OSD_Host () {
  if ( fInit )
 
   myName = hostName;
-
+#endif
 }  // end constructor
 
 TCollection_AsciiString OSD_Host :: SystemVersion () {
diff --git a/src/OSD/OSD_MemInfo.cxx b/src/OSD/OSD_MemInfo.cxx
index f96df93e53..2d578d8bd4 100644
--- a/src/OSD/OSD_MemInfo.cxx
+++ b/src/OSD/OSD_MemInfo.cxx
@@ -57,7 +57,7 @@ void OSD_MemInfo::Update()
   {
     myCounters[anIter] = Standard_Size(-1);
   }
-
+#ifndef OCCT_UWP
 #if defined(_WIN32)
 #if (_WIN32_WINNT >= 0x0500)
   MEMORYSTATUSEX aStatEx;
@@ -167,6 +167,7 @@ void OSD_MemInfo::Update()
     myCounters[MemHeapUsage] = aStats.size_in_use;
   }
 #endif
+#endif
 }
 
 // =======================================================================
diff --git a/src/OSD/OSD_Parallel.cxx b/src/OSD/OSD_Parallel.cxx
index 8b80fbade7..28de4c66cd 100644
--- a/src/OSD/OSD_Parallel.cxx
+++ b/src/OSD/OSD_Parallel.cxx
@@ -30,13 +30,14 @@
     #endif
 #endif
 
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(OCCT_UWP)
 namespace {
   // for a 64-bit app running under 64-bit Windows, this is FALSE
   static bool isWow64()
   {
     typedef BOOL (WINAPI *LPFN_ISWOW64PROCESS) (HANDLE , PBOOL);
     BOOL bIsWow64 = FALSE;
+
     HMODULE aKern32Module = GetModuleHandleW(L"kernel32");
     LPFN_ISWOW64PROCESS aFunIsWow64 = (aKern32Module == NULL) ? (LPFN_ISWOW64PROCESS )NULL
       : (LPFN_ISWOW64PROCESS)GetProcAddress(aKern32Module, "IsWow64Process");
@@ -62,11 +63,14 @@ Standard_Integer OSD_Parallel::NbLogicalProcessors()
 #ifdef _WIN32
   // GetSystemInfo() will return the number of processors in a data field in a SYSTEM_INFO structure.
   SYSTEM_INFO aSysInfo;
+#ifndef OCCT_UWP
   if ( isWow64() )
   {
     typedef BOOL (WINAPI *LPFN_GSI)(LPSYSTEM_INFO );
+
     HMODULE aKern32 = GetModuleHandleW(L"kernel32");
     LPFN_GSI aFuncSysInfo = (LPFN_GSI )GetProcAddress(aKern32, "GetNativeSystemInfo");
+
     // So, they suggest 32-bit apps should call this instead of the other in WOW64
     if ( aFuncSysInfo != NULL )
     {
@@ -81,6 +85,9 @@ Standard_Integer OSD_Parallel::NbLogicalProcessors()
   {
     GetSystemInfo(&aSysInfo);
   }
+#else
+  GetNativeSystemInfo(&aSysInfo);
+#endif
   aNumLogicalProcessors = aSysInfo.dwNumberOfProcessors;
 #else
   // These are the choices. We'll check number of processors online.
diff --git a/src/OSD/OSD_Process.cxx b/src/OSD/OSD_Process.cxx
index b73c1e2ce9..065ed734b5 100644
--- a/src/OSD/OSD_Process.cxx
+++ b/src/OSD/OSD_Process.cxx
@@ -210,7 +210,7 @@ OSD_Process :: OSD_Process () {
 
 Standard_Integer OSD_Process::Spawn (const TCollection_AsciiString& cmd,
 			    const Standard_Boolean ShowWindow /* = Standard_True */) {
-
+#ifndef OCCT_UWP
  STARTUPINFO         si;
  PROCESS_INFORMATION pi;
  DWORD aRes = 0;
@@ -248,6 +248,11 @@ Standard_Integer OSD_Process::Spawn (const TCollection_AsciiString& cmd,
  }  // end else
 
  return aRes;
+#else
+  (void)cmd;
+  (void)ShowWindow;
+  return 0;
+#endif
 }  // end OSD_Process :: Spawn
 
 void OSD_Process :: TerminalType ( TCollection_AsciiString& Name ) {
@@ -273,6 +278,7 @@ Quantity_Date OSD_Process :: SystemDate () {
 
 TCollection_AsciiString OSD_Process :: UserName () 
 {
+#ifndef OCCT_UWP
 	Standard_PCharacter pBuff = new char[UNLEN + 1];
 	DWORD                   dwSize = UNLEN + 1;
 	TCollection_AsciiString retVal;
@@ -287,10 +293,13 @@ TCollection_AsciiString OSD_Process :: UserName ()
 	}
 	delete [] pBuff;
 	return retVal;
+#else
+  return "";
+#endif
 }  // end OSD_Process :: UserName
 
 Standard_Boolean OSD_Process :: IsSuperUser () {
-
+#ifndef OCCT_UWP
  Standard_Boolean retVal = FALSE;
  PSID             pSIDadmin;
  HANDLE           hProcessToken = INVALID_HANDLE_VALUE;
@@ -327,7 +336,9 @@ Standard_Boolean OSD_Process :: IsSuperUser () {
  if ( pTKgroups     != NULL                 ) FreeTokenInformation ( pTKgroups );
 
  return retVal;
-
+#else
+ return FALSE;
+#endif
 }  // end OSD_Process :: IsSuperUser
 
 Standard_Integer OSD_Process :: ProcessId () {
@@ -337,9 +348,8 @@ Standard_Integer OSD_Process :: ProcessId () {
 }  // end OSD_Process :: ProcessId
 
 OSD_Path OSD_Process :: CurrentDirectory () {
-
   OSD_Path anCurrentDirectory;
-
+#ifndef OCCT_UWP
   DWORD dwSize = PATHLEN + 1;
   Standard_WideChar* pBuff = new wchar_t[dwSize];
 
@@ -353,6 +363,7 @@ OSD_Path OSD_Process :: CurrentDirectory () {
     _osd_wnt_set_error ( myError, OSD_WProcess );
  
   delete[] pBuff;
+#endif
   return anCurrentDirectory;
 }  // end OSD_Process :: CurrentDirectory
 
diff --git a/src/OSD/OSD_SharedLibrary.cxx b/src/OSD/OSD_SharedLibrary.cxx
index 333bf9106a..c39ef0ccaa 100644
--- a/src/OSD/OSD_SharedLibrary.cxx
+++ b/src/OSD/OSD_SharedLibrary.cxx
@@ -184,13 +184,15 @@ void OSD_SharedLibrary::Destroy() {
 #endif
 #include <windows.h>
 
-
 #include <OSD_Path.hxx>
 #include <OSD_SharedLibrary.hxx>
 #include <TCollection_AsciiString.hxx>
+#include <TCollection_ExtendedString.hxx>
 
 static DWORD              lastDLLError;
-static Standard_Character errMsg[ 1024 ];
+
+static wchar_t errMsg[1024];
+static char errMsgA[1024];
 
 OSD_SharedLibrary :: OSD_SharedLibrary () {
 
@@ -224,7 +226,13 @@ void OSD_SharedLibrary :: SetName ( const Standard_CString aName ) {
  name = path.Name ();
  name.AssignCat (  path.Extension ()  );
 
- myHandle = GetModuleHandle (  name.ToCString ()  );
+#ifndef OCCT_UWP
+ myHandle = GetModuleHandle(name.ToCString());
+#else
+ TCollection_ExtendedString nameW(name);
+ myHandle = LoadPackagedLibrary ((const wchar_t*)nameW.ToExtString(), NULL  );
+ FreeLibrary ((HMODULE) myHandle);
+#endif
 
 }  // end OSD_SharedLibrary :: SetName
 
@@ -238,15 +246,17 @@ Standard_Boolean OSD_SharedLibrary :: DlOpen ( const OSD_LoadMode /*Mode*/ ) {
 
  Standard_Boolean retVal = Standard_True;
 
- if (  (  myHandle ) == NULL &&
-       (  myHandle = ( HINSTANCE )LoadLibraryEx (
-                                   myName, NULL, LOAD_WITH_ALTERED_SEARCH_PATH
-                                  )  ) == NULL
- ) {
- 
-  lastDLLError = GetLastError ();
-  retVal       = Standard_False;
- 
+ if ( myHandle == NULL ) {
+#ifndef OCCT_UWP
+  myHandle = (HINSTANCE)LoadLibraryEx(myName, NULL, LOAD_WITH_ALTERED_SEARCH_PATH);
+#else
+  TCollection_ExtendedString myNameW(myName);
+  myHandle = (HINSTANCE)LoadPackagedLibrary((const wchar_t*)myNameW.ToExtString(), NULL);
+#endif
+  if ( myHandle == NULL ) {
+   lastDLLError = GetLastError ();
+   retVal       = Standard_False;
+  }
  }  // end if
 
  return retVal;
@@ -273,13 +283,14 @@ void OSD_SharedLibrary :: DlClose () const {
 
 Standard_CString OSD_SharedLibrary :: DlError () const {
 
- FormatMessage (
+ FormatMessageW (
   FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ARGUMENT_ARRAY,
-  0, lastDLLError, MAKELANGID( LANG_NEUTRAL, SUBLANG_NEUTRAL ), errMsg, 1024, ( va_list* )&myName
+  0, lastDLLError, MAKELANGID( LANG_NEUTRAL, SUBLANG_NEUTRAL ),
+   errMsg, 1024, ( va_list* )&myName
  );
 
- return errMsg;
-
+ WideCharToMultiByte(CP_UTF8, 0, errMsg, -1, errMsgA, sizeof(errMsgA), NULL, NULL);
+ return errMsgA;
 }  // end OSD_SharedLibrary :: DlError
 
 void OSD_SharedLibrary :: Destroy () {
diff --git a/src/OSD/OSD_Timer.cxx b/src/OSD/OSD_Timer.cxx
index b011a4fbc9..93ca383c3c 100644
--- a/src/OSD/OSD_Timer.cxx
+++ b/src/OSD/OSD_Timer.cxx
@@ -42,7 +42,6 @@ static inline Standard_Real GetWallClockTime ()
 }
 
 #else
-
 //-------------------  Windows NT  ------------------
 
 #define STRICT
@@ -62,7 +61,11 @@ static inline Standard_Real GetWallClockTime ()
   LARGE_INTEGER time;
   return isOk && QueryPerformanceCounter (&time) ? 
          (Standard_Real)time.QuadPart / (Standard_Real)freq.QuadPart :
+#ifndef OCCT_UWP
          0.001 * GetTickCount();
+#else
+         0.001 * GetTickCount64();
+#endif
 }
 
 #endif /* _WIN32 */
diff --git a/src/OSD/OSD_WNT.cxx b/src/OSD/OSD_WNT.cxx
index a77c0b85db..13328f7704 100644
--- a/src/OSD/OSD_WNT.cxx
+++ b/src/OSD/OSD_WNT.cxx
@@ -23,9 +23,14 @@
 /***/
 #include <OSD_WNT_1.hxx>
 
+#include <Strsafe.h>
 #include <wchar.h>
 #include <stdlib.h>
+
+#include <Standard_Macro.hxx>
+
 /***/
+#ifndef OCCT_UWP
 static void Init ( void );
 /***/
 class Init_OSD_WNT {  // provides initialization
@@ -37,6 +42,7 @@ class Init_OSD_WNT {  // provides initialization
 }; // end Init_OSD_WNT
 
 static Init_OSD_WNT initOsdWnt;
+#endif
 /***/
 static BOOL   fInit = FALSE;
 static PSID*  predefinedSIDs;
@@ -59,6 +65,8 @@ static RESPONSE_DIR_PROC _response_dir_proc;
 #define SID_WORLD         7
 #define SID_NULL          8
 /***/
+#ifndef OCCT_UWP
+// None of the existing security APIs are supported in a UWP applications
 /******************************************************************************/
 /* Function : AllocSD                                                       */
 /* Purpose  : Allocates and initializes security identifier                 */
@@ -597,7 +605,7 @@ void FreeAce ( PVOID pACE ) {
  HeapFree ( hHeap, 0, pACE );
 
 }  /* end FreeAce */
-
+#endif
 #define WILD_CARD     L"/*.*"
 #define WILD_CARD_LEN (  sizeof ( WILD_CARD )  )
 
@@ -697,23 +705,24 @@ retry:
  retVal = CreateDirectoryW ( newDir, NULL );
 
  if (   retVal || (  !retVal && GetLastError () == ERROR_ALREADY_EXISTS  )   ) {
-
+  size_t anOldDirLength;
+  StringCchLengthW (oldDir, sizeof(oldDir) / sizeof(oldDir[0]), &anOldDirLength);
   if (   (  pFD = ( PWIN32_FIND_DATAW )HeapAlloc (
                                        hHeap, 0, sizeof ( WIN32_FIND_DATAW )
                                       )
          ) != NULL &&
-         (  pName = ( LPWSTR )HeapAlloc (
-                               hHeap, 0, lstrlenW ( oldDir ) + WILD_CARD_LEN +
-                               sizeof (  L'\x00'  )
-                              )
+         (
+           pName = (LPWSTR)HeapAlloc(
+             hHeap, 0, anOldDirLength + WILD_CARD_LEN +
+             sizeof(L'\x00')
+           )
          ) != NULL
   ) {
-
-   lstrcpyW ( pName, oldDir    );
-   lstrcatW ( pName, WILD_CARD );
+    StringCchCopyW (pName, sizeof(pName) / sizeof(pName[0]), oldDir);
+    StringCchCatW  (pName, sizeof(pName), WILD_CARD);
 
    retVal = TRUE;
-   fFind  = (  hFindFile = FindFirstFileW ( pName, pFD )  ) != INVALID_HANDLE_VALUE;
+   fFind  = (  hFindFile = FindFirstFileExW(pName, FindExInfoStandard, pFD, FindExSearchNameMatch, NULL, 0)  ) != INVALID_HANDLE_VALUE;
 
    while ( fFind ) {
   
@@ -721,28 +730,35 @@ retry:
           pFD -> cFileName[ 0 ] != L'.' &&
           pFD -> cFileName[ 1 ] != L'.'
     ) {
-  
-     if (   ( pFullNameSrc = ( LPWSTR )HeapAlloc (
-                                        hHeap, 0,
-                                        lstrlenW ( oldDir ) + lstrlenW ( pFD -> cFileName ) +
-                                        sizeof (  L'/'  ) + sizeof ( L'\x00'  )
-                                       )
-            ) == NULL ||
-            ( pFullNameDst = ( LPWSTR )HeapAlloc (
-                                        hHeap, 0,
-                                        lstrlenW ( newDir ) + lstrlenW ( pFD -> cFileName ) +
-                                        sizeof (  L'/'  ) + sizeof (  L'\x00'  )
-                                       )
-            ) == NULL
+     size_t anOldDirLength2;
+     size_t aNewDirLength;
+     size_t aFileNameLength;
+
+     StringCchLengthW (oldDir, sizeof(oldDir) / sizeof(oldDir[0]), &anOldDirLength2);
+     StringCchLengthW (newDir, sizeof(newDir) / sizeof(newDir[0]), &aNewDirLength);
+     StringCchLengthW (pFD->cFileName, sizeof(pFD->cFileName) / sizeof(pFD->cFileName[0]), &aFileNameLength);
+
+     if (    (pFullNameSrc = (LPWSTR)HeapAlloc(
+                                  hHeap, 0,
+                                  anOldDirLength2 + aFileNameLength +
+                                  sizeof(L'/') + sizeof(L'\x00')
+                                 )
+             ) == NULL ||
+             (pFullNameDst = (LPWSTR)HeapAlloc(
+                                      hHeap, 0,
+                                      aNewDirLength + aFileNameLength +
+                                      sizeof(L'/') + sizeof(L'\x00')
+                                 )
+             ) == NULL
      ) break;
-  
-     lstrcpyW ( pFullNameSrc, oldDir );
-     lstrcatW ( pFullNameSrc, L"/"  );
-     lstrcatW ( pFullNameSrc, pFD -> cFileName );
 
-     lstrcpyW ( pFullNameDst, newDir );
-     lstrcatW ( pFullNameDst, L"/"  );
-     lstrcatW ( pFullNameDst, pFD -> cFileName );
+     StringCchCopyW (pFullNameSrc, sizeof(pFullNameSrc) / sizeof(pFullNameSrc[0]), oldDir);
+     StringCchCatW  (pFullNameSrc, sizeof(pFullNameSrc) / sizeof(pFullNameSrc[0]), L"/");
+     StringCchCatW  (pFullNameSrc, sizeof(pFullNameSrc) / sizeof(pFullNameSrc[0]), pFD->cFileName);
+
+     StringCchCopyW (pFullNameDst, sizeof(pFullNameDst) / sizeof(pFullNameDst[0]), newDir);
+     StringCchCatW  (pFullNameDst, sizeof(pFullNameDst) / sizeof(pFullNameDst[0]), L"/");
+     StringCchCatW  (pFullNameDst, sizeof(pFullNameDst) / sizeof(pFullNameDst[0]), pFD->cFileName);
 
      if ( pFD -> dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY ) {
 
@@ -862,22 +878,24 @@ BOOL CopyDirectory ( LPCWSTR dirSrc, LPCWSTR dirDst ) {
 
  if (   retVal || (  !retVal && GetLastError () == ERROR_ALREADY_EXISTS  )   ) {
 
+   size_t aDirSrcLength;
+   StringCchLengthW (dirSrc, sizeof(dirSrc) / sizeof(dirSrc[0]), &aDirSrcLength);
+
   if (   (  pFD = ( PWIN32_FIND_DATAW )HeapAlloc (
                                        hHeap, 0, sizeof ( WIN32_FIND_DATAW )
                                       )
          ) != NULL &&
          (  pName = ( LPWSTR )HeapAlloc (
-                               hHeap, 0, lstrlenW ( dirSrc ) + WILD_CARD_LEN +
+                               hHeap, 0, aDirSrcLength + WILD_CARD_LEN +
                                sizeof (  L'\x00'  )
                               )
          ) != NULL
   ) {
-
-   lstrcpyW ( pName, dirSrc    );
-   lstrcatW ( pName, WILD_CARD );
+   StringCchCopyW (pName, sizeof(pName) / sizeof(pName[0]), dirSrc);
+   StringCchCatW (pName, sizeof(pName) / sizeof(pName[0]), WILD_CARD);
 
    retVal = TRUE;
-   fFind  = (  hFindFile = FindFirstFileW ( pName, pFD )  ) != INVALID_HANDLE_VALUE;
+   fFind = (hFindFile = FindFirstFileExW(pName, FindExInfoStandard, pFD, FindExSearchNameMatch, NULL, 0)) != INVALID_HANDLE_VALUE;
 
    while ( fFind ) {
   
@@ -885,28 +903,36 @@ BOOL CopyDirectory ( LPCWSTR dirSrc, LPCWSTR dirDst ) {
           pFD -> cFileName[ 0 ] != L'.' &&
           pFD -> cFileName[ 1 ] != L'.'
     ) {
-  
+      size_t aDirSrcLength2;
+      size_t aDirDstLength;
+      size_t aFileNameLength;
+
+      StringCchLengthW (dirSrc, sizeof(dirSrc) / sizeof(dirSrc[0]), &aDirSrcLength2);
+      StringCchLengthW (dirDst, sizeof(dirDst) / sizeof(dirDst[0]), &aDirDstLength);
+      StringCchLengthW (pFD -> cFileName, sizeof(pFD -> cFileName) / sizeof(pFD -> cFileName[0]), &aFileNameLength);
+
      if (   ( pFullNameSrc = ( LPWSTR )HeapAlloc (
                                         hHeap, 0,
-                                        lstrlenW ( dirSrc ) + lstrlenW ( pFD -> cFileName ) +
+                                        aDirSrcLength2 + aFileNameLength +
                                         sizeof (  L'/'  ) + sizeof (  L'\x00'  )
                                        )
             ) == NULL ||
             ( pFullNameDst = ( LPWSTR )HeapAlloc (
                                         hHeap, 0,
-                                        lstrlenW ( dirDst ) + lstrlenW ( pFD -> cFileName ) +
+                                        aDirDstLength + aFileNameLength +
                                         sizeof (  L'/'  ) + sizeof (  L'\x00'  )
                                        )
             ) == NULL
      ) break;
   
-     lstrcpyW ( pFullNameSrc, dirSrc );
-     lstrcatW ( pFullNameSrc, L"/"  );
-     lstrcatW ( pFullNameSrc, pFD -> cFileName );
 
-     lstrcpyW ( pFullNameDst, dirDst );
-     lstrcatW ( pFullNameDst, L"/"  );
-     lstrcatW ( pFullNameDst, pFD -> cFileName );
+     StringCchCopyW (pFullNameSrc, sizeof(pFullNameSrc) / sizeof(pFullNameSrc[0]), dirSrc);
+     StringCchCatW  (pFullNameSrc, sizeof(pFullNameSrc) / sizeof(pFullNameSrc[0]), L"/");
+     StringCchCatW  (pFullNameSrc, sizeof(pFullNameSrc) / sizeof(pFullNameSrc[0]), pFD->cFileName);
+
+     StringCchCopyW (pFullNameDst, sizeof(pFullNameDst) / sizeof(pFullNameDst[0]), dirDst);
+     StringCchCatW  (pFullNameDst, sizeof(pFullNameDst) / sizeof(pFullNameDst[0]), L"/");
+     StringCchCatW  (pFullNameDst, sizeof(pFullNameDst) / sizeof(pFullNameDst[0]), pFD->cFileName);
 
      if ( pFD -> dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY ) {
 
@@ -915,7 +941,11 @@ BOOL CopyDirectory ( LPCWSTR dirSrc, LPCWSTR dirDst ) {
    
      } else {
 retry:   
-      retVal = CopyFileW ( pFullNameSrc, pFullNameDst, FALSE );
+#ifndef OCCT_UWP
+      retVal = CopyFileW(pFullNameSrc, pFullNameDst, FALSE);
+#else
+      retVal = (CopyFile2(pFullNameSrc, pFullNameDst, FALSE) == S_OK) ? TRUE : FALSE;
+#endif
       if ( ! retVal ) {
       
        if ( _response_dir_proc != NULL ) {
diff --git a/src/OSD/OSD_signal.cxx b/src/OSD/OSD_signal.cxx
index 3c57948155..99968bf844 100644
--- a/src/OSD/OSD_signal.cxx
+++ b/src/OSD/OSD_signal.cxx
@@ -24,8 +24,13 @@
 #ifdef NOUSER
 #undef NOUSER
 #endif
+#ifdef NONLS
+#undef NONLS
+#endif
 #include <windows.h>
 
+#include <Strsafe.h>
+
 #ifndef STATUS_FLOAT_MULTIPLE_FAULTS
   // <ntstatus.h>
   #define STATUS_FLOAT_MULTIPLE_FAULTS     (0xC00002B4L)
@@ -72,7 +77,9 @@ static Standard_Mutex THE_SIGNAL_MUTEX;
 static LONG __fastcall _osd_raise ( DWORD, LPSTR );
 static BOOL WINAPI     _osd_ctrl_break_handler ( DWORD );
 
+#ifndef OCCT_UWP
 static LONG _osd_debug   ( void );
+#endif
 
 //# define _OSD_FPX ( _EM_INVALID | _EM_DENORMAL | _EM_ZERODIVIDE | _EM_OVERFLOW | _EM_UNDERFLOW )
 # define _OSD_FPX ( _EM_INVALID | _EM_DENORMAL | _EM_ZERODIVIDE | _EM_OVERFLOW )
@@ -86,7 +93,9 @@ static LONG CallHandler (DWORD dwExceptionCode,
                          ptrdiff_t ExceptionInformation0)
 {
   Standard_Mutex::Sentry aSentry (THE_SIGNAL_MUTEX); // lock the mutex to prevent simultaneous handling
-  static char          buffer[ 2048 ];
+
+  static wchar_t         buffer[2048];
+
   int                  flterr = 0;
 
   buffer[0] = '\0' ;
@@ -95,47 +104,47 @@ static LONG CallHandler (DWORD dwExceptionCode,
   switch ( dwExceptionCode ) {
     case EXCEPTION_FLT_DENORMAL_OPERAND:
 //      cout << "CallHandler : EXCEPTION_FLT_DENORMAL_OPERAND:" << endl ;
-      lstrcpyA (  buffer, "FLT DENORMAL OPERAND"  );
+      StringCchCopyW (buffer, _countof(buffer), L"FLT DENORMAL OPERAND");
       flterr = 1 ;
       break ;
     case EXCEPTION_FLT_DIVIDE_BY_ZERO:
 //      cout << "CallHandler : EXCEPTION_FLT_DIVIDE_BY_ZERO:" << endl ;
-      lstrcpyA (  buffer, "FLT DIVIDE BY ZERO"  );
+      StringCchCopyW (buffer, _countof(buffer), L"FLT DIVIDE BY ZERO");
       flterr = 1 ;
       break ;
     case EXCEPTION_FLT_INEXACT_RESULT:
 //      cout << "CallHandler : EXCEPTION_FLT_INEXACT_RESULT:" << endl ;
-      lstrcpyA (  buffer, "FLT INEXACT RESULT"  );
+      StringCchCopyW (buffer, _countof(buffer), L"FLT INEXACT RESULT");
       flterr = 1 ;
       break ;
     case EXCEPTION_FLT_INVALID_OPERATION:
 //      cout << "CallHandler : EXCEPTION_FLT_INVALID_OPERATION:" << endl ;
-      lstrcpyA (  buffer, "FLT INVALID OPERATION"  );
+      StringCchCopyW (buffer, _countof(buffer), L"FLT INVALID OPERATION");
       flterr = 1 ;
       break ;
     case EXCEPTION_FLT_OVERFLOW:
 //      cout << "CallHandler : EXCEPTION_FLT_OVERFLOW:" << endl ;
-      lstrcpyA (  buffer, "FLT OVERFLOW"  );
+      StringCchCopyW (buffer, _countof(buffer), L"FLT OVERFLOW");
       flterr = 1 ;
       break ;
     case EXCEPTION_FLT_STACK_CHECK:
 //      cout << "CallHandler : EXCEPTION_FLT_STACK_CHECK:" << endl ;
-      lstrcpyA (  buffer, "FLT STACK CHECK"  );
+      StringCchCopyW (buffer, _countof(buffer), L"FLT STACK CHECK");
       flterr = 1 ;
       break ;
     case EXCEPTION_FLT_UNDERFLOW:
 //      cout << "CallHandler : EXCEPTION_FLT_UNDERFLOW:" << endl ;
-      lstrcpyA (  buffer, "FLT UNDERFLOW"  );
+      StringCchCopyW (buffer, _countof(buffer), L"FLT UNDERFLOW");
       flterr = 1 ;
       break ;
     case STATUS_FLOAT_MULTIPLE_TRAPS:
 //      cout << "CallHandler : EXCEPTION_FLT_UNDERFLOW:" << endl ;
-      lstrcpyA (  buffer, "FLT MULTIPLE TRAPS (possible overflow in conversion of double to integer)"  );
+      StringCchCopyW (buffer, _countof(buffer), L"FLT MULTIPLE TRAPS (possible overflow in conversion of double to integer)");
       flterr = 1 ;
       break ;
     case STATUS_FLOAT_MULTIPLE_FAULTS:
 //      cout << "CallHandler : EXCEPTION_FLT_UNDERFLOW:" << endl ;
-      lstrcpyA (  buffer, "FLT MULTIPLE FAULTS"  );
+      StringCchCopyW (buffer, _countof(buffer), L"FLT MULTIPLE FAULTS");
       flterr = 1 ;
       break ;
     case STATUS_NO_MEMORY:
@@ -144,89 +153,92 @@ static LONG CallHandler (DWORD dwExceptionCode,
       Raise (  "MEMORY ALLOCATION ERROR ( no room in the process heap )"  );
     case EXCEPTION_ACCESS_VIOLATION:
 //      cout << "CallHandler : EXCEPTION_ACCESS_VIOLATION:" << endl ;
-      wsprintf ( buffer, "%s%s%s0x%.8p%s%s%s", "ACCESS VIOLATION",
-                 fMsgBox ? "\n" : " ", "at address ",
+      StringCchPrintfW (buffer, _countof(buffer), L"%s%s%s0x%.8p%s%s%s", L"ACCESS VIOLATION",
+                 fMsgBox ? L"\n" : L" ", L"at address ",
                  ExceptionInformation1 ,
-                 " during '",
-                 ExceptionInformation0 ? "WRITE" : "READ",
-                 "' operation");
+                 L" during '",
+                 ExceptionInformation0 ? L"WRITE" : L"READ",
+                 L"' operation");
       break;
     case EXCEPTION_ARRAY_BOUNDS_EXCEEDED:
 //      cout << "CallHandler : EXCEPTION_ARRAY_BOUNDS_EXCEEDED:" << endl ;
-      lstrcpyA (  buffer, "ARRAY BOUNDS EXCEEDED"  );
+      StringCchCopyW (buffer, _countof(buffer), L"ARRAY BOUNDS EXCEEDED");
       break;
     case EXCEPTION_DATATYPE_MISALIGNMENT:
 //      cout << "CallHandler : EXCEPTION_DATATYPE_MISALIGNMENT:" << endl ;
-      lstrcpyA (  buffer, "DATATYPE MISALIGNMENT"  );
+      StringCchCopyW (buffer, _countof(buffer), L"DATATYPE MISALIGNMENT");
       break;
 
     case EXCEPTION_ILLEGAL_INSTRUCTION:
 //      cout << "CallHandler : EXCEPTION_ILLEGAL_INSTRUCTION:" << endl ;
-      lstrcpyA (  buffer, "ILLEGAL INSTRUCTION"  );
+      StringCchCopyW (buffer, _countof(buffer), L"ILLEGAL INSTRUCTION");
       break;
 
     case EXCEPTION_IN_PAGE_ERROR:
 //      cout << "CallHandler : EXCEPTION_IN_PAGE_ERROR:" << endl ;
-      lstrcpyA (  buffer, "IN_PAGE ERROR"  );
+      StringCchCopyW (buffer, _countof(buffer), L"IN_PAGE ERROR");
       break;
 
     case EXCEPTION_INT_DIVIDE_BY_ZERO:
 //      cout << "CallHandler : EXCEPTION_INT_DIVIDE_BY_ZERO:" << endl ;
-      lstrcpyA (  buffer, "INTEGER DIVISION BY ZERO"  );
+      StringCchCopyW (buffer, _countof(buffer), L"INTEGER DIVISION BY ZERO");
       break;
 
     case EXCEPTION_INT_OVERFLOW:
 //      cout << "CallHandler : EXCEPTION_INT_OVERFLOW:" << endl ;
-      lstrcpyA (  buffer, "INTEGER OVERFLOW"  );
+      StringCchCopyW (buffer, _countof(buffer), L"INTEGER OVERFLOW");
       break;
 
     case EXCEPTION_INVALID_DISPOSITION:
 //      cout << "CallHandler : EXCEPTION_INVALID_DISPOSITION:" << endl ;
-      lstrcpyA (  buffer, "INVALID DISPOSITION"  );
+      StringCchCopyW (buffer, _countof(buffer), L"INVALID DISPOSITION");
       break;
 
     case EXCEPTION_NONCONTINUABLE_EXCEPTION:
 //      cout << "CallHandler : EXCEPTION_NONCONTINUABLE_EXCEPTION:" << endl ;
-      lstrcpyA (  buffer, "NONCONTINUABLE EXCEPTION"  );
+      StringCchCopyW (buffer, _countof(buffer), L"NONCONTINUABLE EXCEPTION");
       break;
 
     case EXCEPTION_PRIV_INSTRUCTION:
 //      cout << "CallHandler : EXCEPTION_PRIV_INSTRUCTION:" << endl ;
-      lstrcpyA (  buffer, "PRIVELEGED INSTRUCTION ENCOUNTERED"  );
+      StringCchCopyW (buffer, _countof(buffer), L"PRIVELEGED INSTRUCTION ENCOUNTERED");
       break;
 
     case EXCEPTION_STACK_OVERFLOW:
 //      cout << "CallHandler : EXCEPTION_STACK_OVERFLOW:" << endl ;
-#if defined( _MSC_VER ) && ( _MSC_VER >= 1300 )
+#if defined( _MSC_VER ) && ( _MSC_VER >= 1300 ) && !defined(OCCT_UWP)
     // try recovering from stack overflow: available in MS VC++ 7.0
       if (!_resetstkoflw())
-        lstrcpyA (  buffer, "Unrecoverable STACK OVERFLOW"  );
+        StringCchCopyW (buffer, _countof(buffer), L"Unrecoverable STACK OVERFLOW");
       else
 #endif
-        lstrcpyA (  buffer, "STACK OVERFLOW"  );
+      StringCchCopyW (buffer, _countof(buffer), L"STACK OVERFLOW");
       break;
 
     default:
-      wsprintf( buffer, "unknown exception code 0x%x, params 0x%p 0x%p",
+      StringCchPrintfW (buffer, _countof(buffer), L"unknown exception code 0x%x, params 0x%p 0x%p",
                 dwExceptionCode, ExceptionInformation1, ExceptionInformation0 );
 
   }  // end switch
 
  // provide message to the user with possibility to stop
-  int idx = lstrlenA ( buffer );
+  size_t idx;
+  StringCchLengthW (buffer, _countof(buffer),&idx);
   if ( idx && fMsgBox && dwExceptionCode != EXCEPTION_NONCONTINUABLE_EXCEPTION ) {
      // reset FP operations before message box, otherwise it may fail to show up
     _fpreset();
     _clearfp();
 
+#ifndef OCCT_UWP
     MessageBeep ( MB_ICONHAND );
-    int aChoice = ::MessageBox (0, buffer, "OCCT Exception Handler", MB_ABORTRETRYIGNORE | MB_ICONSTOP);
+    int aChoice = ::MessageBoxW (0, buffer, L"OCCT Exception Handler", MB_ABORTRETRYIGNORE | MB_ICONSTOP);
     if (aChoice == IDRETRY)
     {
       _osd_debug();
       DebugBreak();
     } else if (aChoice == IDABORT)
       exit(0xFFFF);
+#endif
   }
 
   // reset FPE state
@@ -237,7 +249,10 @@ static LONG CallHandler (DWORD dwExceptionCode,
    _controlfp ( 0, _OSD_FPX ) ;          // JR add :
 //     cout << "OSD::WntHandler _controlfp( 0, _OSD_FPX ) " << hex << _controlfp(0,0) << dec << endl ;
   }
-  return _osd_raise ( dwExceptionCode, buffer );
+
+  char aBufferA[2048];
+  WideCharToMultiByte(CP_UTF8, 0, buffer, -1, aBufferA, sizeof(aBufferA), NULL, NULL);
+  return _osd_raise(dwExceptionCode, aBufferA);
 }
 
 //=======================================================================
@@ -292,7 +307,9 @@ static void SIGWntHandler (int signum, int sub_code)
       cout << "SIGWntHandler unexpected signal : " << signum << endl ;
       break ;
   }
+#ifndef OCCT_UWP
   DebugBreak ();
+#endif
 }
 #endif
 
@@ -348,7 +365,7 @@ void OSD::SetSignal (const Standard_Boolean theFloatingSignal)
   Standard_Mutex::Sentry aSentry (THE_SIGNAL_MUTEX); // lock the mutex to prevent simultaneous handling
   LPTOP_LEVEL_EXCEPTION_FILTER aPreviousFilter;
 
-  OSD_Environment env (TEXT("CSF_DEBUG_MODE"));
+  OSD_Environment env ("CSF_DEBUG_MODE");
   TCollection_AsciiString val = env.Value();
   if (!env.Failed())
   {
@@ -377,8 +394,9 @@ void OSD::SetSignal (const Standard_Boolean theFloatingSignal)
 
   // Set Ctrl-C and Ctrl-Break handler
   fCtrlBrk = Standard_False;
+#ifndef OCCT_UWP
   SetConsoleCtrlHandler (&_osd_ctrl_break_handler, TRUE);
-
+#endif
 #ifdef _MSC_VER
 //  _se_translator_function pOldSeFunc =
   _set_se_translator (TranslateSE);
@@ -401,11 +419,11 @@ void OSD::SetSignal (const Standard_Boolean theFloatingSignal)
 void OSD::ControlBreak () {
   if ( fCtrlBrk ) {
     fCtrlBrk = Standard_False;
-    OSD_Exception_CTRL_BREAK :: Raise (  TEXT( "*** INTERRUPT ***" )  );
+    OSD_Exception_CTRL_BREAK :: Raise ( "*** INTERRUPT ***" );
   }
 }  // end OSD :: ControlBreak
-
 #if !defined(__MINGW32__) && !defined(__CYGWIN32__)
+#ifndef OCCT_UWP
 //============================================================================
 //==== _osd_ctrl_break_handler
 //============================================================================
@@ -418,7 +436,7 @@ static BOOL WINAPI _osd_ctrl_break_handler ( DWORD dwCode ) {
 
   return TRUE;
 }  // end _osd_ctrl_break_handler
-
+#endif
 //============================================================================
 //==== _osd_raise
 //============================================================================
@@ -487,6 +505,7 @@ static LONG __fastcall _osd_raise ( DWORD dwCode, LPSTR msg )
 //============================================================================
 //==== _osd_debug
 //============================================================================
+#ifndef OCCT_UWP
 LONG _osd_debug ( void ) {
 
   LONG action ;
@@ -525,7 +544,7 @@ LONG _osd_debug ( void ) {
 
       if (   (  hEvent = CreateEvent ( &sa, TRUE, FALSE, NULL )  ) == NULL   ) __leave;
 
-      wsprintf (  cmdLine, keyValue, GetCurrentProcessId (), hEvent  );
+      StringCchPrintf(cmdLine, _countof(cmdLine), keyValue, GetCurrentProcessId(), hEvent);
 
       ZeroMemory (  &si, sizeof ( STARTUPINFO )  );
 
@@ -569,8 +588,9 @@ LONG _osd_debug ( void ) {
   return action ;
 
 }  // end _osd_debug
-#endif
 
+#endif
+#endif
 #else
 
 //---------- All Systems except Windows NT : ----------------------------------
diff --git a/src/Resource/Resource_Manager.cxx b/src/Resource/Resource_Manager.cxx
index 73a5d580a6..f6752dbe5b 100644
--- a/src/Resource/Resource_Manager.cxx
+++ b/src/Resource/Resource_Manager.cxx
@@ -14,6 +14,7 @@
 
 
 #include <OSD_Directory.hxx>
+#include <OSD_Environment.hxx>
 #include <OSD_File.hxx>
 #include <OSD_Path.hxx>
 #include <OSD_Protection.hxx>
@@ -86,11 +87,13 @@ Resource_Manager::Resource_Manager(const Standard_CString aName,
 Resource_Manager::Resource_Manager(const Standard_CString aName,
 				   const Standard_Boolean Verbose) : myName(aName), myVerbose(Verbose)
 {
-  Debug = (getenv("ResourceDebug") != NULL) ;
+  OSD_Environment envDebug("ResourceDebug");
+  Debug = (!envDebug.Value().IsEmpty()) ;
 
   TCollection_AsciiString Directory ;
 
-  if ( getenv ("CSF_ResourceVerbose") != NULL )
+  OSD_Environment envVerbose("CSF_ResourceVerbose");
+  if (!envVerbose.Value().IsEmpty())
     myVerbose = Standard_True;
 
   TCollection_AsciiString aPath,aUserPath;
@@ -231,8 +234,10 @@ Standard_Boolean Resource_Manager::Save() const
   anEnvVar += myName;
   anEnvVar += "UserDefaults";
 
-  Standard_CString dir;
-  if ((dir = getenv (anEnvVar.ToCString())) == NULL) {
+  TCollection_AsciiString dir;
+  OSD_Environment anEnv(anEnvVar);
+  dir = anEnv.Value();
+  if (dir.IsEmpty()) {
     if (myVerbose)
       cout << "Resource Manager Warning: environment variable \""
 	   << anEnvVar << "\" not set.  Cannot save resources." << endl ;
@@ -479,8 +484,10 @@ void Resource_Manager::GetResourcePath (TCollection_AsciiString& aPath, const St
   anEnvVar += aName;
   anEnvVar += isUserDefaults?"UserDefaults":"Defaults";
 
-  Standard_CString dir;
-  if ((dir = getenv (anEnvVar.ToCString())) == NULL)
+  TCollection_AsciiString dir;
+  OSD_Environment anEnv(anEnvVar);
+  dir = anEnv.Value();
+  if (dir.IsEmpty())
     return;
 
   TCollection_AsciiString aResPath(dir);
diff --git a/src/Standard/Standard.cxx b/src/Standard/Standard.cxx
index cf2ee42b40..e1514125b6 100644
--- a/src/Standard/Standard.cxx
+++ b/src/Standard/Standard.cxx
@@ -36,6 +36,12 @@
   extern "C" int posix_memalign (void** thePtr, size_t theAlign, size_t theSize);
 #endif
 
+// There is no support for environment variables in UWP
+// OSD_Environment could not be used here because of cyclic dependency
+#ifdef OCCT_UWP
+#define getenv(x) NULL
+#endif
+
 #ifndef OCCT_MMGT_OPT_DEFAULT
 #define OCCT_MMGT_OPT_DEFAULT 0
 #endif
diff --git a/src/Standard/Standard_MMgrOpt.cxx b/src/Standard/Standard_MMgrOpt.cxx
index 4d0470926d..f188393bb2 100644
--- a/src/Standard/Standard_MMgrOpt.cxx
+++ b/src/Standard/Standard_MMgrOpt.cxx
@@ -13,6 +13,10 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
+#ifdef _WIN32
+#include <windows.h>
+#endif
+
 #include <Standard_MMgrOpt.hxx>
 #include <Standard_OutOfMemory.hxx>
 #include <Standard_Assert.hxx>
@@ -20,9 +24,7 @@
 #include <stdio.h>
 #include <errno.h>
 
-#ifdef _WIN32
-# include <windows.h>
-#else
+#ifndef _WIN32
 # include <sys/mman.h>    /* mmap() */
 #endif
 
@@ -32,6 +34,9 @@
 extern "C" int getpagesize() ;
 #endif
 
+#ifdef _WIN32
+#include <Strsafe.h>
+#endif
 //======================================================================
 // Assumptions
 //======================================================================
@@ -752,10 +757,16 @@ retry:
         goto retry;
       // if nothing helps, make error message and raise exception
       const int BUFSIZE=1024;
-      char message[BUFSIZE];
-      if ( FormatMessage (FORMAT_MESSAGE_FROM_SYSTEM, 0, GetLastError(), 0, message, BUFSIZE-1, 0) <=0 )
-        strcpy (message, "Standard_MMgrOpt::AllocMemory() failed to mmap");
-      Standard_OutOfMemory::Raise (message);
+
+      wchar_t message[BUFSIZE];
+
+      if ( FormatMessageW (FORMAT_MESSAGE_FROM_SYSTEM, 0, GetLastError(), 0,
+        message, BUFSIZE-1, 0) <=0 )
+        StringCchCopyW(message, _countof(message), L"Standard_MMgrOpt::AllocMemory() failed to mmap");
+
+      char messageA[BUFSIZE];
+      WideCharToMultiByte(CP_UTF8, 0, message, -1, messageA, sizeof(messageA), NULL, NULL);
+      Standard_OutOfMemory::Raise(messageA);
     }
 
     // record map handle in the beginning
diff --git a/src/Standard/Standard_Macro.hxx b/src/Standard/Standard_Macro.hxx
index 73747e6fd7..c81ceec8dd 100644
--- a/src/Standard/Standard_Macro.hxx
+++ b/src/Standard/Standard_Macro.hxx
@@ -169,4 +169,13 @@
 #   endif  // __Standard_DLL
 # endif  // __Standard_API
 
-#endif  
+// Support of Universal Windows Platform
+#if defined(WINAPI_FAMILY) && WINAPI_FAMILY == WINAPI_FAMILY_APP
+ #define OCCT_UWP
+#else
+ #ifdef OCCT_UWP
+   #undef OCCT_UWP
+ #endif
+#endif
+
+#endif
diff --git a/src/TKSTL/EXTERNLIB b/src/TKSTL/EXTERNLIB
index 1efec1ebc8..4f723a0887 100755
--- a/src/TKSTL/EXTERNLIB
+++ b/src/TKSTL/EXTERNLIB
@@ -3,5 +3,4 @@ TKMath
 TKBRep
 TKG2d
 TKG3d
-TKMesh
 TKTopAlgo
diff --git a/src/TopOpeBRep/TopOpeBRep_EdgesIntersector.cxx b/src/TopOpeBRep/TopOpeBRep_EdgesIntersector.cxx
index 6c9d1b689a..26c9018ed3 100644
--- a/src/TopOpeBRep/TopOpeBRep_EdgesIntersector.cxx
+++ b/src/TopOpeBRep/TopOpeBRep_EdgesIntersector.cxx
@@ -35,7 +35,6 @@
 #include <gp_Pnt2d.hxx>
 #include <IntRes2d_IntersectionPoint.hxx>
 #include <IntRes2d_IntersectionSegment.hxx>
-#include <OSD_Chronometer.hxx>
 #include <Precision.hxx>
 #include <Standard_Failure.hxx>
 #include <TCollection_AsciiString.hxx>
diff --git a/src/TopOpeBRepTool/TopOpeBRepTool_CurveTool.cxx b/src/TopOpeBRepTool/TopOpeBRepTool_CurveTool.cxx
index 2bdfe386ca..2fbe674fe5 100644
--- a/src/TopOpeBRepTool/TopOpeBRepTool_CurveTool.cxx
+++ b/src/TopOpeBRepTool/TopOpeBRepTool_CurveTool.cxx
@@ -47,7 +47,6 @@
 #include <gp_Pln.hxx>
 #include <gp_Pnt2d.hxx>
 #include <gp_Vec.hxx>
-#include <OSD_Chronometer.hxx>
 #include <Precision.hxx>
 #include <ProjLib_ProjectedCurve.hxx>
 #include <Standard_NotImplemented.hxx>
diff --git a/src/XmlLDrivers/XmlLDrivers_DocumentStorageDriver.cxx b/src/XmlLDrivers/XmlLDrivers_DocumentStorageDriver.cxx
index 522fe5744a..9a875174a4 100644
--- a/src/XmlLDrivers/XmlLDrivers_DocumentStorageDriver.cxx
+++ b/src/XmlLDrivers/XmlLDrivers_DocumentStorageDriver.cxx
@@ -200,11 +200,12 @@ Standard_Boolean XmlLDrivers_DocumentStorageDriver::WriteToDomDocument (const Ha
     "CSF_XmlOcafResource",
     "CASROOT"
   };
-  TCollection_AsciiString aResourceDir = "";
-  aResourceDir = getenv (aCSFVariable[0]);
+  OSD_Environment anEnv (aCSFVariable[0]);
+  TCollection_AsciiString aResourceDir = anEnv.Value();
   if (aResourceDir.IsEmpty()) {
     // now try by CASROOT
-    aResourceDir = getenv (aCSFVariable[1]);
+    OSD_Environment anEnv2(aCSFVariable[1]);
+    aResourceDir = anEnv2.Value();
     if ( !aResourceDir.IsEmpty() ) {
       aResourceDir += "/src/XmlOcafResource" ;
       aToSetCSFVariable = Standard_True; //CSF variable to be set later
-- 
2.20.1