win7 compat

Author: smanolloff

.github/workflows/rebuildDependencies.yml

@@ -45,18 +45,10 @@ jobs:
             os: windows-latest
             conan_profiles: '["msvc-x64"]'
             conan_options: -o "&:target_pre_windows10=True"
-          - platform: windows-x64-win7
-            os: windows-latest
-            conan_profiles: '["msvc-x64-win7"]'
-            conan_options: -o "&:target_pre_windows10=True" -o "&:with_onnxruntime=False"
           - platform: windows-x86
             os: windows-latest
             conan_profiles: '["msvc-x86"]'
             conan_options: -o "&:target_pre_windows10=True"
-          - platform: windows-x86-win7
-            os: windows-latest
-            conan_profiles: '["msvc-x86-win7"]'
-            conan_options: -o "&:target_pre_windows10=True" -o "&:with_onnxruntime=False"
           - platform: windows-arm64
             os: windows-11-arm
             conan_profiles: '["msvc-arm64"]'

conan_patches/onnxruntime/conandata.yml

@@ -7,3 +7,7 @@ patches:
     - patch_file: "patches/msvc-x86.diff"
       patch_description: |
         Fixes detection of x86 windows targets during cross-compilation.
+    - patch_file: "patches/win7.diff"
+      patch_description: |
+        Fixes compile errors on for windows 7 targets:
+        error C3861: 'CreateFile2': identifier not found

conan_patches/onnxruntime/patches/win7.diff

@@ -0,0 +1,80 @@
+--- a/onnxruntime/test/shared_lib/test_model_loading.cc
++++ b/onnxruntime/test/shared_lib/test_model_loading.cc
+@@ -227,7 +227,7 @@ using ScopedFileDescriptor = ScopedResource<FileDescriptorTraits>;
+ 
+ void FileMmap(const ORTCHAR_T* file_path, void*& mapped_base) {
+ #ifdef _WIN32
+-  wil::unique_hfile file_handle{CreateFile2(file_path, GENERIC_READ, FILE_SHARE_READ, OPEN_EXISTING, NULL)};
++  wil::unique_hfile file_handle{CreateFileW(file_path, FILE_READ_ATTRIBUTES, FILE_SHARE_READ, nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr)};
+   ASSERT_TRUE(file_handle.get() != INVALID_HANDLE_VALUE);
+ 
+   wil::unique_hfile file_mapping_handle{
+--- a/onnxruntime/core/platform/windows/env.cc
++++ b/onnxruntime/core/platform/windows/env.cc
+@@ -314,7 +314,7 @@ PIDType WindowsEnv::GetSelfPid() const {
+ 
+ Status WindowsEnv::GetFileLength(_In_z_ const ORTCHAR_T* file_path, size_t& length) const {
+   wil::unique_hfile file_handle{
+-      CreateFile2(file_path, FILE_READ_ATTRIBUTES, FILE_SHARE_READ, OPEN_EXISTING, NULL)};
++      CreateFileW(file_path, FILE_READ_ATTRIBUTES, FILE_SHARE_READ, nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr)};
+   if (file_handle.get() == INVALID_HANDLE_VALUE) {
+     const auto error_code = GetLastError();
+     return ORT_MAKE_STATUS(ONNXRUNTIME, FAIL, "open file ", ToUTF8String(Basename(file_path)), " fail, errcode = ", error_code, " - ", std::system_category().message(error_code));
+@@ -361,7 +361,7 @@ Status WindowsEnv::ReadFileIntoBuffer(_In_z_ const ORTCHAR_T* const file_path, c
+   ORT_RETURN_IF_NOT(offset >= 0, "offset < 0");
+   ORT_RETURN_IF_NOT(length <= buffer.size(), "length > buffer.size()");
+   wil::unique_hfile file_handle{
+-      CreateFile2(file_path, GENERIC_READ, FILE_SHARE_READ, OPEN_EXISTING, NULL)};
++      CreateFileW(file_path, FILE_READ_ATTRIBUTES, FILE_SHARE_READ, nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr)};
+   if (file_handle.get() == INVALID_HANDLE_VALUE) {
+     const auto error_code = GetLastError();
+     return ORT_MAKE_STATUS(ONNXRUNTIME, FAIL, "open file ", ToUTF8String(Basename(file_path)), " fail, errcode = ", error_code, " - ", std::system_category().message(error_code));
+@@ -414,7 +414,7 @@ Status WindowsEnv::MapFileIntoMemory(_In_z_ const ORTCHAR_T* file_path,
+   }
+ 
+   wil::unique_hfile file_handle{
+-      CreateFile2(file_path, GENERIC_READ, FILE_SHARE_READ, OPEN_EXISTING, NULL)};
++      CreateFileW(file_path, FILE_READ_ATTRIBUTES, FILE_SHARE_READ, nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr)};
+   if (file_handle.get() == INVALID_HANDLE_VALUE) {
+     const auto error_code = GetLastError();
+     return ORT_MAKE_STATUS(ONNXRUNTIME, FAIL,
+@@ -600,16 +600,14 @@ common::Status WindowsEnv::GetCanonicalPath(
+     PathString& canonical_path) const {
+   // adapted from MSVC STL std::filesystem::canonical() implementation
+   // https://github.com/microsoft/STL/blob/ed3cbf36416a385828e7a5987ca52cb42882d84b/stl/inc/filesystem#L2986
+-  CREATEFILE2_EXTENDED_PARAMETERS param;
+-  memset(&param, 0, sizeof(param));
+-  param.dwSize = sizeof(CREATEFILE2_EXTENDED_PARAMETERS);
+-  param.dwFileFlags = FILE_FLAG_BACKUP_SEMANTICS;
+-  wil::unique_hfile file_handle{CreateFile2(
+-      path.c_str(),
+-      FILE_READ_ATTRIBUTES,
+-      FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
+-      OPEN_EXISTING,
+-      &param)};
++  wil::unique_hfile file_handle{CreateFileW(
++      path.c_str(),                                              // LPCWSTR lpFileName
++      FILE_READ_ATTRIBUTES,                                      // DWORD dwDesiredAccess
++      FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,    // DWORD dwShareMode
++      nullptr,                                                   // LPSECURITY_ATTRIBUTES lpSecurityAttributes
++      OPEN_EXISTING,                                             // DWORD dwCreationDisposition
++      FILE_FLAG_BACKUP_SEMANTICS,                                // DWORD dwFlagsAndAttributes
++      nullptr)};                                                 // HANDLE hTemplateFile
+ 
+   if (file_handle.get() == INVALID_HANDLE_VALUE) {
+     const auto error_code = GetLastError();
+--- a/onnxruntime/core/platform/windows/env_time.cc
++++ b/onnxruntime/core/platform/windows/env_time.cc
+@@ -22,6 +22,12 @@ limitations under the License.
+ #include <numeric>
+ #include <algorithm>
+ 
++#ifndef GetSystemTimePreciseAsFileTime
++static void WINAPI GetSystemTimePreciseAsFileTime(LPFILETIME lpSystemTimeAsFileTime) {
++    GetSystemTimeAsFileTime(lpSystemTimeAsFileTime);
++}
++#endif
++
+ namespace onnxruntime {
+ 
+ namespace {

conan_profiles/base/msvc-intel

@@ -11,3 +11,15 @@ compiler.update=4
 [conf]
 # VS 2022
 tools.microsoft.msbuild:vs_version=17
+
+# https://walbourn.github.io/a-brief-history-of-windows-sdks/
+# https://learn.microsoft.com/en-us/cpp/porting/modifying-winver-and-win32-winnt
+# https://learn.microsoft.com/en-us/windows/win32/WinProg/using-the-windows-headers
+{% set _WIN32_WINNT_WIN7 = '0x0601' %}
+{% set NTDDI_WIN7 = '0x06010000' %}
+{% set win7_defines = [
+    '_WIN32_WINNT={}'.format(_WIN32_WINNT_WIN7),
+    'WINVER={}'.format(_WIN32_WINNT_WIN7),
+    'NTDDI_VERSION={}'.format(NTDDI_WIN7),
+] %}
+tools.build:defines={{ win7_defines }}

conan_profiles/base/msvc-win7

@@ -1,5 +1,4 @@
 include(base/msvc-intel)
-include(base/msvc-win8)
 
 [settings]
 arch=x86_64

conan_profiles/base/msvc-win8

@@ -1,5 +1,4 @@
 include(base/msvc-intel)
-include(base/msvc-win8)
 
 [settings]
 arch=x86