Revert changes at few places and remove some code for Unix

dotnet · Dec 1, 2022 · 48e4852 · 48e4852
1 parent 4553e3a
commit 48e4852
Show file tree

Hide file tree

Showing 4 changed files with 162 additions and 219 deletions.
diff --git a/src/coreclr/inc/longfilepathwrappers.h b/src/coreclr/inc/longfilepathwrappers.h
@@ -5,6 +5,8 @@
 #define _WIN_PATH_APIS_WRAPPER_
 class SString;
 
+#ifdef HOST_WINDOWS
+
 HMODULE
 LoadLibraryExWrapper(
     _In_ LPCWSTR lpLibFileName,
@@ -35,7 +37,6 @@ GetFileAttributesExWrapper(
     _Out_writes_bytes_(sizeof(WIN32_FILE_ATTRIBUTE_DATA)) LPVOID lpFileInformation
     );
 
-#ifndef HOST_UNIX
 BOOL
 CopyFileExWrapper(
     _In_        LPCWSTR lpExistingFileName,
@@ -46,7 +47,7 @@ CopyFileExWrapper(
     _Inout_opt_ LPBOOL pbCancel,
     _In_        DWORD dwCopyFlags
     );
-#endif //HOST_UNIX
+#endif //HOST_WINDOWS
 
 DWORD
 SearchPathWrapper(

diff --git a/src/coreclr/inc/winwrap.h b/src/coreclr/inc/winwrap.h
@@ -189,11 +189,17 @@
 
 //File and Directory Functions which need special handling for LongFile Names
 //Note only the functions which are currently used are defined
+#ifdef HOST_WINDOWS
 #define WszLoadLibrary         LoadLibraryExWrapper
 #define WszLoadLibraryEx       LoadLibraryExWrapper
 #define WszCreateFile          CreateFileWrapper
-#define WszGetFileAttributes   GetFileAttributesWrapper
 #define WszGetFileAttributesEx GetFileAttributesExWrapper
+#else // HOST_WINDOWS
+#define WszLoadLibrary         LoadLibraryW
+#define WszLoadLibraryEx       LoadLibraryExW
+#define WszCreateFile          CreateFileW
+#define WszGetFileAttributesEx GetFileAttributesExW
+#endif // HOST_WINDOWS
 
 //Can not use extended syntax
 #define WszGetFullPathName     GetFullPathNameW