Use _dpctl_load_win_dynamic_lib()

Author: PokhodenkoSA

dpctl-capi/helper/include/dpctl_dynamic_lib_helper.h

@@ -33,9 +33,13 @@
 
 #elif defined(_WIN32) || defined(_WIN64)
 
+#include "Support/DllExport.h"
+
 #define NOMINMAX
 #include <windows.h>
 
+DPCTL_API HMODULE _dpctl_load_win_dynamic_lib(LPCTSTR filename);
+
 #endif // __linux__
 
 #include <cstdint>
@@ -55,7 +59,7 @@ class DynamicLibHelper final
 #ifdef __linux__
         _handle = dlopen(libName, flag);
 #elif defined(_WIN32) || defined(_WIN64)
-        _handle = LoadLibraryA(libName);
+        _handle = _dpctl_load_win_dynamic_lib(libName);
 #endif
     }
 

dpctl-capi/helper/source/dpctl_dynamic_lib_helper.cpp

@@ -1,19 +1,22 @@
-/* file: service_daal_load_win_dynamic_lib.cpp */
-/*******************************************************************************
-* Copyright 2021 Intel Corporation
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*******************************************************************************/
+//===-- dpctl_dynamic_lib_helper.cpp - Dynamic library helper     -*-C++-*- ===//
+//
+//                      Data Parallel Control (dpctl)
+//
+// Copyright 2020-2021 Intel Corporation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+//===----------------------------------------------------------------------===//
 
 /*
 //++
@@ -23,13 +26,13 @@
 
 #if defined(_WIN32) || defined(_WIN64)
 
-    #include "services/daal_defines.h"
+    #include "Support/DllExport.h"
     #include <windows.h>
 
-    #if !defined(DAAL_CHECK_DLL_SIG)
-        #define DAAL_LOAD_DLL(name) LoadLibrary(name)
+    #if !defined(DPCTL_CHECK_DLL_SIG)
+        #define DPCTL_LOAD_DLL(name) LoadLibrary(name)
     #else
-        #define DAAL_LOAD_DLL(name) _DAALLoadLibrary(name)
+        #define DPCTL_LOAD_DLL(name) _DPCTLLoadLibrary(name)
 
         #include <stdio.h>
         #include <Softpub.h>
@@ -38,7 +41,7 @@
 
         #pragma comment(lib, "Wintrust.lib")
 
-static HMODULE WINAPI _DAALLoadLibrary(LPCTSTR filename)
+static HMODULE WINAPI _DPCTLLoadLibrary(LPCTSTR filename)
 {
     TCHAR PathBuf[MAX_PATH];
     DWORD rv;
@@ -57,21 +60,21 @@ static HMODULE WINAPI _DAALLoadLibrary(LPCTSTR filename)
     rv1 = SetDllDirectoryA("");
     if (0 == rv1)
     {
-        printf("Intel oneDAL FATAL ERROR: Cannot exclude current directory from serch path.\n");
+        printf("Intel dpctl FATAL ERROR: Cannot exclude current directory from serch path.\n");
         return NULL;
     }
 
     rv2 = LoadLibraryExA(filename, NULL, DONT_RESOLVE_DLL_REFERENCES);
     if (NULL == rv2)
     {
-        printf("Intel oneDAL FATAL ERROR: Cannot find/load library %s.\n", filename);
+        printf("Intel dpctl FATAL ERROR: Cannot find/load library %s.\n", filename);
         return NULL;
     }
 
     rv = GetModuleFileNameA(rv2, PathBuf, MAX_PATH);
     if (0 == rv)
     {
-        printf("Intel oneDAL FATAL ERROR: Cannot find module %s in memory.\n", filename);
+        printf("Intel dpctl FATAL ERROR: Cannot find module %s in memory.\n", filename);
         return NULL;
     }
 
@@ -118,27 +121,27 @@ static HMODULE WINAPI _DAALLoadLibrary(LPCTSTR filename)
         lerr = GetLastError();
         if (TRUST_E_NOSIGNATURE == lerr || TRUST_E_SUBJECT_FORM_UNKNOWN == lerr || TRUST_E_PROVIDER_UNKNOWN == lerr)
         {
-            printf("Intel oneDAL FATAL ERROR: %s is not signed.\n", filename);
+            printf("Intel dpctl FATAL ERROR: %s is not signed.\n", filename);
         }
         else
         {
-            printf("Intel oneDAL FATAL ERROR: An unknown error occurred trying to verify the signature of the %s.\n", filename);
+            printf("Intel dpctl FATAL ERROR: An unknown error occurred trying to verify the signature of the %s.\n", filename);
         }
         break;
 
-    case TRUST_E_EXPLICIT_DISTRUST: printf("Intel oneDAL FATAL ERROR: The signature/publisher of %s is disallowed.\n", filename); break;
+    case TRUST_E_EXPLICIT_DISTRUST: printf("Intel dpctl FATAL ERROR: The signature/publisher of %s is disallowed.\n", filename); break;
 
     case ERROR_SUCCESS: break;
 
-    case TRUST_E_SUBJECT_NOT_TRUSTED: printf("Intel oneDAL FATAL ERROR: The signature of %s in not trusted.\n", filename); break;
+    case TRUST_E_SUBJECT_NOT_TRUSTED: printf("Intel dpctl FATAL ERROR: The signature of %s in not trusted.\n", filename); break;
 
     case CRYPT_E_SECURITY_SETTINGS:
-        printf("Intel oneDAL FATAL ERROR: %s. The subject hash or publisher was not explicitly trusted and user trust was not allowed "
+        printf("Intel dpctl FATAL ERROR: %s. The subject hash or publisher was not explicitly trusted and user trust was not allowed "
                "(CRYPT_E_SECURITY_SETTINGS).\n",
                filename);
         break;
 
-    default: printf("Intel oneDAL FATAL ERROR: %s. Error code is 0x%x.\n", filename, (unsigned int)sverif); break;
+    default: printf("Intel dpctl FATAL ERROR: %s. Error code is 0x%x.\n", filename, (unsigned int)sverif); break;
     }
 
     pWVTData.dwStateAction = WTD_STATEACTION_CLOSE;
@@ -159,9 +162,9 @@ static HMODULE WINAPI _DAALLoadLibrary(LPCTSTR filename)
 }
     #endif
 
-DAAL_EXPORT HMODULE _daal_load_win_dynamic_lib(LPCTSTR filename)
+DPCTL_API HMODULE _dpctl_load_win_dynamic_lib(LPCTSTR filename)
 {
-    return DAAL_LOAD_DLL(filename);
+    return DPCTL_LOAD_DLL(filename);
 }
 
 #endif // defined(_WIN32) || defined(_WIN64)