Minor PAL refactor, cleanup, fix MAX_LONGPATH

(work originally by mikem, I just split his mega-commit so history would a little more understandable)

diff --git a/src/inc/palclr.h b/src/inc/palclr.h
index dabe86f3d36a6ec807e97d381e33441fe0a338c7..7a47b886c4898c88e84d23e0e2a25a00e8773754 100644 (file)
--- a/src/inc/palclr.h
+++ b/src/inc/palclr.h
@@ -597,10 +597,10 @@
 #endif
 
 #if !defined(MAX_LONGPATH)
-#define MAX_LONGPATH   260 /* max. length of full pathname */
+#define MAX_LONGPATH    1024        /* max. length of full pathname */
 #endif
 #if !defined(MAX_PATH_FNAME)
-#define MAX_PATH_FNAME   MAX_PATH /* max. length of full pathname */
+#define MAX_PATH_FNAME  MAX_PATH    /* max. length of full pathname */
 #endif
 
 #define __clr_reserved __reserved

diff --git a/src/pal/inc/pal.h b/src/pal/inc/pal.h
index e4e5275ac90e1a0f4cfa7067efeeea9b7f4c862e..e0fe3cb496cbbe5aee37af05e2a367870e24a498 100644 (file)
--- a/src/pal/inc/pal.h
+++ b/src/pal/inc/pal.h
@@ -442,15 +442,23 @@ CharNextExA(
 #define IDYES                   6
 #define IDNO                    7
 
+PALIMPORT
+int
+PALAPI
+MessageBoxA(
+    IN LPVOID hWnd,  // NOTE: diff from winuser.h
+    IN LPCSTR lpText,
+    IN LPCSTR lpCaption,
+    IN UINT uType);
 
 PALIMPORT
 int
 PALAPI
 MessageBoxW(
-        IN LPVOID hWnd,  // NOTE: diff from winuser.h
-        IN LPCWSTR lpText,
-        IN LPCWSTR lpCaption,
-        IN UINT uType);
+    IN LPVOID hWnd,  // NOTE: diff from winuser.h
+    IN LPCWSTR lpText,
+    IN LPCWSTR lpCaption,
+    IN UINT uType);
 
 
 #ifdef UNICODE
@@ -515,18 +523,29 @@ typedef struct _SECURITY_ATTRIBUTES {
 
 #define INVALID_SET_FILE_POINTER   ((DWORD)-1)
 
+PALIMPORT
+HANDLE
+PALAPI
+CreateFileA(
+    IN LPCSTR lpFileName,
+    IN DWORD dwDesiredAccess,
+    IN DWORD dwShareMode,
+    IN LPSECURITY_ATTRIBUTES lpSecurityAttributes,
+    IN DWORD dwCreationDisposition,
+    IN DWORD dwFlagsAndAttributes,
+    IN HANDLE hTemplateFile);
 
 PALIMPORT
 HANDLE
 PALAPI
 CreateFileW(
-        IN LPCWSTR lpFileName,
-        IN DWORD dwDesiredAccess,
-        IN DWORD dwShareMode,
-        IN LPSECURITY_ATTRIBUTES lpSecurityAttributes,
-        IN DWORD dwCreationDisposition,
-        IN DWORD dwFlagsAndAttributes,
-        IN HANDLE hTemplateFile);
+    IN LPCWSTR lpFileName,
+    IN DWORD dwDesiredAccess,
+    IN DWORD dwShareMode,
+    IN LPSECURITY_ATTRIBUTES lpSecurityAttributes,
+    IN DWORD dwCreationDisposition,
+    IN DWORD dwFlagsAndAttributes,
+    IN HANDLE hTemplateFile);
 
 #ifdef UNICODE
 #define CreateFile CreateFileW
@@ -535,6 +554,17 @@ CreateFileW(
 #endif
 
 
+PALIMPORT
+DWORD
+PALAPI
+SearchPathA(
+    IN LPCSTR lpPath,
+    IN LPCSTR lpFileName,
+    IN LPCSTR lpExtension,
+    IN DWORD nBufferLength,
+    OUT LPSTR lpBuffer,
+    OUT LPSTR *lpFilePart);
+
 PALIMPORT
 DWORD
 PALAPI
@@ -544,8 +574,8 @@ SearchPathW(
     IN LPCWSTR lpExtension,
     IN DWORD nBufferLength,
     OUT LPWSTR lpBuffer,
-    OUT LPWSTR *lpFilePart
-    );
+    OUT LPWSTR *lpFilePart);
+
 #ifdef UNICODE
 #define SearchPath  SearchPathW
 #else
@@ -553,14 +583,21 @@ SearchPathW(
 #endif // !UNICODE
 
 
+PALIMPORT
+BOOL
+PALAPI
+CopyFileA(
+    IN LPCSTR lpExistingFileName,
+    IN LPCSTR lpNewFileName,
+    IN BOOL bFailIfExists);
 
 PALIMPORT
 BOOL
 PALAPI
 CopyFileW(
-      IN LPCWSTR lpExistingFileName,
-      IN LPCWSTR lpNewFileName,
-      IN BOOL bFailIfExists);
+    IN LPCWSTR lpExistingFileName,
+    IN LPCWSTR lpNewFileName,
+    IN BOOL bFailIfExists);
 
 #ifdef UNICODE
 #define CopyFile CopyFileW
@@ -569,11 +606,17 @@ CopyFileW(
 #endif
 
 
+PALIMPORT
+BOOL
+PALAPI
+DeleteFileA(
+    IN LPCSTR lpFileName);
+
 PALIMPORT
 BOOL
 PALAPI
 DeleteFileW(
-        IN LPCWSTR lpFileName);
+    IN LPCWSTR lpFileName);
 
 #ifdef UNICODE
 #define DeleteFile DeleteFileW
@@ -582,18 +625,24 @@ DeleteFileW(
 #endif
 
 
-
 #define MOVEFILE_REPLACE_EXISTING      0x00000001
 #define MOVEFILE_COPY_ALLOWED          0x00000002
 
+PALIMPORT
+BOOL
+PALAPI
+MoveFileExA(
+    IN LPCSTR lpExistingFileName,
+    IN LPCSTR lpNewFileName,
+    IN DWORD dwFlags);
 
 PALIMPORT
 BOOL
 PALAPI
 MoveFileExW(
-        IN LPCWSTR lpExistingFileName,
-        IN LPCWSTR lpNewFileName,
-        IN DWORD dwFlags);
+    IN LPCWSTR lpExistingFileName,
+    IN LPCWSTR lpNewFileName,
+    IN DWORD dwFlags);
 
 #ifdef UNICODE
 #define MoveFileEx MoveFileExW
@@ -601,12 +650,20 @@ MoveFileExW(
 #define MoveFileEx MoveFileExA
 #endif
 
+
+PALIMPORT
+BOOL
+PALAPI
+CreateDirectoryA(
+    IN LPCSTR lpPathName,
+    IN LPSECURITY_ATTRIBUTES lpSecurityAttributes);
+
 PALIMPORT
 BOOL
 PALAPI
 CreateDirectoryW(
-         IN LPCWSTR lpPathName,
-         IN LPSECURITY_ATTRIBUTES lpSecurityAttributes);
+    IN LPCWSTR lpPathName,
+    IN LPSECURITY_ATTRIBUTES lpSecurityAttributes);
 
 #ifdef UNICODE
 #define CreateDirectory CreateDirectoryW
@@ -614,11 +671,18 @@ CreateDirectoryW(
 #define CreateDirectory CreateDirectoryA
 #endif
 
+
+PALIMPORT
+BOOL
+PALAPI
+RemoveDirectoryA(
+    IN LPCSTR lpPathName);
+
 PALIMPORT
 BOOL
 PALAPI
 RemoveDirectoryW(
-         IN LPCWSTR lpPathName);
+    IN LPCWSTR lpPathName);
 
 #ifdef UNICODE
 #define RemoveDirectory RemoveDirectoryW
@@ -675,12 +739,19 @@ typedef PWIN32_FIND_DATAA PWIN32_FIND_DATA;
 typedef LPWIN32_FIND_DATAA LPWIN32_FIND_DATA;
 #endif
 
+PALIMPORT
+HANDLE
+PALAPI
+FindFirstFileA(
+    IN LPCSTR lpFileName,
+    OUT LPWIN32_FIND_DATAA lpFindFileData);
+
 PALIMPORT
 HANDLE
 PALAPI
 FindFirstFileW(
-           IN LPCWSTR lpFileName,
-           OUT LPWIN32_FIND_DATAW lpFindFileData);
+    IN LPCWSTR lpFileName,
+    OUT LPWIN32_FIND_DATAW lpFindFileData);
 
 #ifdef UNICODE
 #define FindFirstFile FindFirstFileW
@@ -688,12 +759,20 @@ FindFirstFileW(
 #define FindFirstFile FindFirstFileA
 #endif
 
+
+PALIMPORT
+BOOL
+PALAPI
+FindNextFileA(
+    IN HANDLE hFindFile,
+    OUT LPWIN32_FIND_DATAA lpFindFileData);
+
 PALIMPORT
 BOOL
 PALAPI
 FindNextFileW(
-          IN HANDLE hFindFile,
-          OUT LPWIN32_FIND_DATAW lpFindFileData);
+    IN HANDLE hFindFile,
+    OUT LPWIN32_FIND_DATAW lpFindFileData);
 
 #ifdef UNICODE
 #define FindNextFile FindNextFileW
@@ -701,17 +780,25 @@ FindNextFileW(
 #define FindNextFile FindNextFileA
 #endif
 
+
 PALIMPORT
 BOOL
 PALAPI
 FindClose(
       IN OUT HANDLE hFindFile);
 
+
+PALIMPORT
+DWORD
+PALAPI
+GetFileAttributesA(
+    IN LPCSTR lpFileName);
+
 PALIMPORT
 DWORD
 PALAPI
 GetFileAttributesW(
-           IN LPCWSTR lpFileName);
+    IN LPCWSTR lpFileName);
 
 #ifdef UNICODE
 #define GetFileAttributes GetFileAttributesW
@@ -719,6 +806,7 @@ GetFileAttributesW(
 #define GetFileAttributes GetFileAttributesA
 #endif
 
+
 typedef enum _GET_FILEEX_INFO_LEVELS {
   GetFileExInfoStandard
 } GET_FILEEX_INFO_LEVELS;
@@ -749,14 +837,21 @@ PALIMPORT
 BOOL
 PALAPI
 GetFileAttributesExW(
-             IN LPCWSTR lpFileName,
-             IN GET_FILEEX_INFO_LEVELS fInfoLevelId,
-             OUT LPVOID lpFileInformation);
+    IN LPCWSTR lpFileName,
+    IN GET_FILEEX_INFO_LEVELS fInfoLevelId,
+    OUT LPVOID lpFileInformation);
 
 #ifdef UNICODE
 #define GetFileAttributesEx GetFileAttributesExW
 #endif
 
+PALIMPORT
+BOOL
+PALAPI
+SetFileAttributesA(
+    IN LPCSTR lpFileName,
+    IN DWORD dwFileAttributes);
+
 PALIMPORT
 BOOL
 PALAPI
@@ -770,6 +865,7 @@ SetFileAttributesW(
 #define SetFileAttributes SetFileAttributesA
 #endif
 
+
 typedef struct _OVERLAPPED {
     ULONG_PTR Internal;
     ULONG_PTR InternalHigh;
@@ -880,37 +976,44 @@ PALIMPORT
 VOID
 PALAPI
 GetSystemTime(
-          OUT LPSYSTEMTIME lpSystemTime);
+    OUT LPSYSTEMTIME lpSystemTime);
 
 PALIMPORT
 BOOL
 PALAPI
 FileTimeToSystemTime(
-            IN CONST FILETIME *lpFileTime,
-            OUT LPSYSTEMTIME lpSystemTime);
-
-
+    IN CONST FILETIME *lpFileTime,
+    OUT LPSYSTEMTIME lpSystemTime);
 
 PALIMPORT
 BOOL
 PALAPI
 FlushFileBuffers(
-         IN HANDLE hFile);
+    IN HANDLE hFile);
 
 PALIMPORT
 UINT
 PALAPI
 GetConsoleOutputCP(
-           VOID);
+    VOID);
+
+PALIMPORT
+DWORD
+PALAPI
+GetFullPathNameA(
+    IN LPCSTR lpFileName,
+    IN DWORD nBufferLength,
+    OUT LPSTR lpBuffer,
+    OUT LPSTR *lpFilePart);
 
 PALIMPORT
 DWORD
 PALAPI
 GetFullPathNameW(
-         IN LPCWSTR lpFileName,
-         IN DWORD nBufferLength,
-         OUT LPWSTR lpBuffer,
-         OUT LPWSTR *lpFilePart);
+    IN LPCWSTR lpFileName,
+    IN DWORD nBufferLength,
+    OUT LPWSTR lpBuffer,
+    OUT LPWSTR *lpFilePart);
 
 #ifdef UNICODE
 #define GetFullPathName GetFullPathNameW
@@ -918,13 +1021,14 @@ GetFullPathNameW(
 #define GetFullPathName GetFullPathNameA
 #endif
 
+
 PALIMPORT
 DWORD
 PALAPI
 GetLongPathNameW(
-         IN LPCWSTR lpszShortPath,
-                 OUT LPWSTR lpszLongPath,
-         IN DWORD cchBuffer);
+    IN LPCWSTR lpszShortPath,
+    OUT LPWSTR lpszLongPath,
+    IN DWORD cchBuffer);
 
 #ifdef UNICODE
 #define GetLongPathName GetLongPathNameW
@@ -934,23 +1038,32 @@ PALIMPORT
 DWORD
 PALAPI
 GetShortPathNameW(
-         IN LPCWSTR lpszLongPath,
-                 OUT LPWSTR lpszShortPath,
-         IN DWORD cchBuffer);
+    IN LPCWSTR lpszLongPath,
+    OUT LPWSTR lpszShortPath,
+    IN DWORD cchBuffer);
 
 #ifdef UNICODE
 #define GetShortPathName GetShortPathNameW
 #endif
 
 
+PALIMPORT
+UINT
+PALAPI
+GetTempFileNameA(
+    IN LPCSTR lpPathName,
+    IN LPCSTR lpPrefixString,
+    IN UINT uUnique,
+    OUT LPSTR lpTempFileName);
+
 PALIMPORT
 UINT
 PALAPI
 GetTempFileNameW(
-         IN LPCWSTR lpPathName,
-         IN LPCWSTR lpPrefixString,
-         IN UINT uUnique,
-         OUT LPWSTR lpTempFileName);
+    IN LPCWSTR lpPathName,
+    IN LPCWSTR lpPrefixString,
+    IN UINT uUnique,
+    OUT LPWSTR lpTempFileName);
 
 #ifdef UNICODE
 #define GetTempFileName GetTempFileNameW
@@ -958,12 +1071,20 @@ GetTempFileNameW(
 #define GetTempFileName GetTempFileNameA
 #endif
 
+
+PALIMPORT
+DWORD
+PALAPI
+GetTempPathA(
+    IN DWORD nBufferLength,
+    OUT LPSTR lpBuffer);
+
 PALIMPORT
 DWORD
 PALAPI
 GetTempPathW(
-         IN DWORD nBufferLength,
-         OUT LPWSTR lpBuffer);
+    IN DWORD nBufferLength,
+    OUT LPWSTR lpBuffer);
 
 #ifdef UNICODE
 #define GetTempPath GetTempPathW
@@ -971,12 +1092,20 @@ GetTempPathW(
 #define GetTempPath GetTempPathA
 #endif
 
+
+PALIMPORT
+DWORD
+PALAPI
+GetCurrentDirectoryA(
+    IN DWORD nBufferLength,
+    OUT LPSTR lpBuffer);
+
 PALIMPORT
 DWORD
 PALAPI
 GetCurrentDirectoryW(
-             IN DWORD nBufferLength,
-             OUT LPWSTR lpBuffer);
+    IN DWORD nBufferLength,
+    OUT LPWSTR lpBuffer);
 
 #ifdef UNICODE
 #define GetCurrentDirectory GetCurrentDirectoryW
@@ -984,11 +1113,18 @@ GetCurrentDirectoryW(
 #define GetCurrentDirectory GetCurrentDirectoryA
 #endif
 
+
+PALIMPORT
+BOOL
+PALAPI
+SetCurrentDirectoryA(
+    IN LPCSTR lpPathName);
+
 PALIMPORT
 BOOL
 PALAPI
 SetCurrentDirectoryW(
-            IN LPCWSTR lpPathName);
+    IN LPCWSTR lpPathName);
 
 
 #ifdef UNICODE
@@ -1001,19 +1137,19 @@ PALIMPORT
 DWORD
 PALAPI
 GetCurrentProcessId(
-            VOID);
+    VOID);
 
 PALIMPORT
 DWORD
 PALAPI
 GetCurrentSessionId(
-            VOID);
+    VOID);
 
 PALIMPORT
 DWORD
 PALAPI
 GetCurrentThreadId(
-           VOID);
+   VOID);
 
 #define STARTF_USESTDHANDLES       0x00000100
 
@@ -1915,16 +2051,27 @@ SetErrorMode(
 #define MEM_WRITE_WATCH                 0x200000
 #define MEM_RESERVE_EXECUTABLE          0x40000000 // reserve memory using executable memory allocator
 
+PALIMPORT
+HANDLE
+PALAPI
+CreateFileMappingA(
+    IN HANDLE hFile,
+    IN LPSECURITY_ATTRIBUTES lpFileMappingAttributes,
+    IN DWORD flProtect,
+    IN DWORD dwMaximumSizeHigh,
+    IN DWORD dwMaximumSizeLow,
+    IN LPCSTR lpName);
+
 PALIMPORT
 HANDLE
 PALAPI
 CreateFileMappingW(
-           IN HANDLE hFile,
-           IN LPSECURITY_ATTRIBUTES lpFileMappingAttributes,
-           IN DWORD flProtect,
-           IN DWORD dwMaxmimumSizeHigh,
-           IN DWORD dwMaximumSizeLow,
-           IN LPCWSTR lpName);
+    IN HANDLE hFile,
+    IN LPSECURITY_ATTRIBUTES lpFileMappingAttributes,
+    IN DWORD flProtect,
+    IN DWORD dwMaxmimumSizeHigh,
+    IN DWORD dwMaximumSizeLow,
+    IN LPCWSTR lpName);
 
 #ifdef UNICODE
 #define CreateFileMapping CreateFileMappingW
@@ -1932,6 +2079,7 @@ CreateFileMappingW(
 #define CreateFileMapping CreateFileMappingA
 #endif
 
+
 #define SECTION_QUERY       0x0001
 #define SECTION_MAP_WRITE   0x0002
 #define SECTION_MAP_READ    0x0004
@@ -1945,10 +2093,18 @@ CreateFileMappingW(
 PALIMPORT
 HANDLE
 PALAPI
-OpenFileMappingW(
+OpenFileMappingA(
          IN DWORD dwDesiredAccess,
          IN BOOL bInheritHandle,
-         IN LPCWSTR lpName);
+         IN LPCSTR lpName);
+
+PALIMPORT
+HANDLE
+PALAPI
+OpenFileMappingW(
+    IN DWORD dwDesiredAccess,
+    IN BOOL bInheritHandle,
+    IN LPCWSTR lpName);
 
 #ifdef UNICODE
 #define OpenFileMapping OpenFileMappingW
@@ -1956,38 +2112,54 @@ OpenFileMappingW(
 #define OpenFileMapping OpenFileMappingA
 #endif
 
+
 PALIMPORT
 LPVOID
 PALAPI
 MapViewOfFile(
-          IN HANDLE hFileMappingObject,
-          IN DWORD dwDesiredAccess,
-          IN DWORD dwFileOffsetHigh,
-          IN DWORD dwFileOffsetLow,
-          IN SIZE_T dwNumberOfBytesToMap);
+    IN HANDLE hFileMappingObject,
+    IN DWORD dwDesiredAccess,
+    IN DWORD dwFileOffsetHigh,
+    IN DWORD dwFileOffsetLow,
+    IN SIZE_T dwNumberOfBytesToMap);
 
 PALIMPORT
 LPVOID
 PALAPI
 MapViewOfFileEx(
-          IN HANDLE hFileMappingObject,
-          IN DWORD dwDesiredAccess,
-          IN DWORD dwFileOffsetHigh,
-          IN DWORD dwFileOffsetLow,
-          IN SIZE_T dwNumberOfBytesToMap,
-          IN LPVOID lpBaseAddress);
+    IN HANDLE hFileMappingObject,
+    IN DWORD dwDesiredAccess,
+    IN DWORD dwFileOffsetHigh,
+    IN DWORD dwFileOffsetLow,
+    IN SIZE_T dwNumberOfBytesToMap,
+    IN LPVOID lpBaseAddress);
 
 PALIMPORT
 BOOL
 PALAPI
 UnmapViewOfFile(
-        IN LPCVOID lpBaseAddress);
+    IN LPCVOID lpBaseAddress);
+
+
+PALIMPORT
+HMODULE
+PALAPI
+LoadLibraryA(
+    IN LPCSTR lpLibFileName);
+
+PALIMPORT
+HMODULE
+PALAPI
+LoadLibraryExA(
+    IN LPCSTR lpLibFileName,
+    IN /*Reserved*/ HANDLE hFile,
+    IN DWORD dwFlags);
 
 PALIMPORT
 HMODULE
 PALAPI
 LoadLibraryW(
-        IN LPCWSTR lpLibFileName);
+    IN LPCWSTR lpLibFileName);
 
 PALIMPORT
 HMODULE
@@ -2026,6 +2198,15 @@ PALAPI
 DisableThreadLibraryCalls(
     IN HMODULE hLibModule);
 
+
+PALIMPORT
+DWORD
+PALAPI
+GetModuleFileNameA(
+    IN HMODULE hModule,
+    OUT LPSTR lpFileName,
+    IN DWORD nSize);
+
 PALIMPORT
 DWORD
 PALAPI
@@ -2040,6 +2221,7 @@ GetModuleFileNameW(
 #define GetModuleFileName GetModuleFileNameA
 #endif
 
+
 PALIMPORT
 DWORD
 PALAPI
@@ -2408,7 +2590,7 @@ PALIMPORT
 VOID
 PALAPI
 DebugBreak(
-       VOID);
+    VOID);
 
 PALIMPORT
 int
@@ -2428,13 +2610,21 @@ lstrlenW(
 #define lstrlen lstrlenA
 #endif
 
+PALIMPORT
+DWORD
+PALAPI
+GetEnvironmentVariableA(
+    IN LPCSTR lpName,
+    OUT LPSTR lpBuffer,
+    IN DWORD nSize);
+
 PALIMPORT
 DWORD
 PALAPI
 GetEnvironmentVariableW(
-            IN LPCWSTR lpName,
-            OUT LPWSTR lpBuffer,
-            IN DWORD nSize);
+    IN LPCWSTR lpName,
+    OUT LPWSTR lpBuffer,
+    IN DWORD nSize);
 
 #ifdef UNICODE
 #define GetEnvironmentVariable GetEnvironmentVariableW
@@ -2442,12 +2632,20 @@ GetEnvironmentVariableW(
 #define GetEnvironmentVariable GetEnvironmentVariableA
 #endif
 
+
+PALIMPORT
+BOOL
+PALAPI
+SetEnvironmentVariableA(
+    IN LPCSTR lpName,
+    IN LPCSTR lpValue);
+
 PALIMPORT
 BOOL
 PALAPI
 SetEnvironmentVariableW(
-            IN LPCWSTR lpName,
-            IN LPCWSTR lpValue);
+    IN LPCWSTR lpName,
+    IN LPCWSTR lpValue);
 
 #ifdef UNICODE
 #define SetEnvironmentVariable SetEnvironmentVariableW
@@ -2455,11 +2653,17 @@ SetEnvironmentVariableW(
 #define SetEnvironmentVariable SetEnvironmentVariableA
 #endif
 
+PALIMPORT
+LPSTR
+PALAPI
+GetEnvironmentStringsA(
+    VOID);
+
 PALIMPORT
 LPWSTR
 PALAPI
 GetEnvironmentStringsW(
-               VOID);
+    VOID);
 
 #ifdef UNICODE
 #define GetEnvironmentStrings GetEnvironmentStringsW
@@ -2467,11 +2671,18 @@ GetEnvironmentStringsW(
 #define GetEnvironmentStrings GetEnvironmentStringsA
 #endif
 
+
+PALIMPORT
+BOOL
+PALAPI
+FreeEnvironmentStringsA(
+    IN LPSTR);
+
 PALIMPORT
 BOOL
 PALAPI
 FreeEnvironmentStringsW(
-            IN LPWSTR);
+    IN LPWSTR);
 
 #ifdef UNICODE
 #define FreeEnvironmentStrings FreeEnvironmentStringsW
@@ -2479,22 +2690,24 @@ FreeEnvironmentStringsW(
 #define FreeEnvironmentStrings FreeEnvironmentStringsA
 #endif
 
+
 PALIMPORT
 BOOL
 PALAPI
 CloseHandle(
-        IN OUT HANDLE hObject);
+    IN OUT HANDLE hObject);
 
 PALIMPORT
 DWORD
 PALAPI
 GetTickCount(
-         VOID);
+    VOID);
 
 PALIMPORT
 ULONGLONG
 PALAPI
-GetTickCount64(VOID);
+GetTickCount64(
+    VOID);
 
 PALIMPORT
 BOOL
@@ -2518,8 +2731,7 @@ PAL_nanosleep(
 
 #ifndef FEATURE_PAL_SXS
 
-typedef LONG (PALAPI *PTOP_LEVEL_EXCEPTION_FILTER)(
-                           struct _EXCEPTION_POINTERS *ExceptionInfo);
+typedef LONG (PALAPI *PTOP_LEVEL_EXCEPTION_FILTER)(struct _EXCEPTION_POINTERS *ExceptionInfo);
 typedef PTOP_LEVEL_EXCEPTION_FILTER LPTOP_LEVEL_EXCEPTION_FILTER;
 
 PALIMPORT
@@ -3145,10 +3357,6 @@ CreatePipe(
     IN DWORD nSize
     );
 
-#if defined FEATURE_PAL_ANSI
-#include "palprivate.h"
-#endif //FEATURE_PAL_ANSI
-
 /******************* C Runtime Entrypoints *******************************/
 
 /* Some C runtime functions needs to be reimplemented by the PAL.

diff --git a/src/pal/inc/palprivate.h b/src/pal/inc/palprivate.h
deleted file mode 100644 (file)
index be79f8c..0000000
--- a/src/pal/inc/palprivate.h
+++ /dev/null
@@ -1,220 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-#ifndef __PAL_PRIVATE_H__
-#define __PAL_PRIVATE_H__
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-PALIMPORT
-int
-PALAPI
-MessageBoxA(
-        IN LPVOID hWnd,  // NOTE: diff from winuser.h
-        IN LPCSTR lpText,
-        IN LPCSTR lpCaption,
-        IN UINT uType);
-
-
-PALIMPORT
-HANDLE
-PALAPI
-CreateFileA(
-        IN LPCSTR lpFileName,
-        IN DWORD dwDesiredAccess,
-        IN DWORD dwShareMode,
-        IN LPSECURITY_ATTRIBUTES lpSecurityAttributes,
-        IN DWORD dwCreationDisposition,
-        IN DWORD dwFlagsAndAttributes,
-        IN HANDLE hTemplateFile);
-
-PALIMPORT
-DWORD
-PALAPI
-SearchPathA(
-    IN LPCSTR lpPath,
-    IN LPCSTR lpFileName,
-    IN LPCSTR lpExtension,
-    IN DWORD nBufferLength,
-    OUT LPSTR lpBuffer,
-    OUT LPSTR *lpFilePart
-    );
-
-PALIMPORT
-BOOL
-PALAPI
-CopyFileA(
-      IN LPCSTR lpExistingFileName,
-      IN LPCSTR lpNewFileName,
-      IN BOOL bFailIfExists);
-
-
-PALIMPORT
-BOOL
-PALAPI
-DeleteFileA(
-        IN LPCSTR lpFileName);
-
-PALIMPORT
-BOOL
-PALAPI
-MoveFileExA(
-        IN LPCSTR lpExistingFileName,
-        IN LPCSTR lpNewFileName,
-        IN DWORD dwFlags);
-
-PALIMPORT
-BOOL
-PALAPI
-CreateDirectoryA(
-         IN LPCSTR lpPathName,
-         IN LPSECURITY_ATTRIBUTES lpSecurityAttributes);
-
-PALIMPORT
-HANDLE
-PALAPI
-FindFirstFileA(
-           IN LPCSTR lpFileName,
-           OUT LPWIN32_FIND_DATAA lpFindFileData);
-
-PALIMPORT
-BOOL
-PALAPI
-FindNextFileA(
-          IN HANDLE hFindFile,
-          OUT LPWIN32_FIND_DATAA lpFindFileData);
-
-PALIMPORT
-DWORD
-PALAPI
-GetFileAttributesA(
-           IN LPCSTR lpFileName);
-
-PALIMPORT
-BOOL
-PALAPI
-SetFileAttributesA(
-           IN LPCSTR lpFileName,
-           IN DWORD dwFileAttributes);
-
-PALIMPORT
-DWORD
-PALAPI
-GetFullPathNameA(
-         IN LPCSTR lpFileName,
-         IN DWORD nBufferLength,
-         OUT LPSTR lpBuffer,
-         OUT LPSTR *lpFilePart);
-
-PALIMPORT
-UINT
-PALAPI
-GetTempFileNameA(
-         IN LPCSTR lpPathName,
-         IN LPCSTR lpPrefixString,
-         IN UINT uUnique,
-         OUT LPSTR lpTempFileName);
-
-PALIMPORT
-DWORD
-PALAPI
-GetTempPathA(
-         IN DWORD nBufferLength,
-         OUT LPSTR lpBuffer);
-
-PALIMPORT
-DWORD
-PALAPI
-GetCurrentDirectoryA(
-             IN DWORD nBufferLength,
-             OUT LPSTR lpBuffer);
-
-PALIMPORT
-BOOL
-PALAPI
-SetCurrentDirectoryA(
-            IN LPCSTR lpPathName);
-
-PALIMPORT
-HANDLE
-PALAPI
-CreateFileMappingA(
-           IN HANDLE hFile,
-           IN LPSECURITY_ATTRIBUTES lpFileMappingAttributes,
-           IN DWORD flProtect,
-           IN DWORD dwMaximumSizeHigh,
-           IN DWORD dwMaximumSizeLow,
-           IN LPCSTR lpName);
-
-PALIMPORT
-HANDLE
-PALAPI
-OpenFileMappingA(
-         IN DWORD dwDesiredAccess,
-         IN BOOL bInheritHandle,
-         IN LPCSTR lpName);
-
-PALIMPORT
-HMODULE
-PALAPI
-LoadLibraryA(
-        IN LPCSTR lpLibFileName);
-
-PALIMPORT
-HMODULE
-PALAPI
-LoadLibraryExA(
-        IN LPCSTR lpLibFileName,
-        IN /*Reserved*/ HANDLE hFile,
-        IN DWORD dwFlags);
-
-PALIMPORT
-DWORD
-PALAPI
-GetModuleFileNameA(
-    IN HMODULE hModule,
-    OUT LPSTR lpFileName,
-    IN DWORD nSize);
-
-
-PALIMPORT
-LPSTR
-PALAPI
-GetEnvironmentStringsA(
-               VOID);
-
-PALIMPORT
-BOOL
-PALAPI
-SetEnvironmentVariableA(
-            IN LPCSTR lpName,
-            IN LPCSTR lpValue);
-
-PALIMPORT
-DWORD
-PALAPI
-GetEnvironmentVariableA(
-            IN LPCSTR lpName,
-            OUT LPSTR lpBuffer,
-            IN DWORD nSize);
-
-PALIMPORT
-BOOL
-PALAPI
-FreeEnvironmentStringsA(
-            IN LPSTR);
-
-PALIMPORT
-BOOL
-PALAPI
-RemoveDirectoryA(
-                 IN LPCSTR lpPathName);
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif// __PAL_PRIVATE_H__

diff --git a/src/pal/src/include/pal/palinternal.h b/src/pal/src/include/pal/palinternal.h
index aac1f73505afc8fd7b24b468d771b455982eb9c8..95ff40f274264f28eabd7dddb5a6b3b0637c43fd 100644 (file)
--- a/src/pal/src/include/pal/palinternal.h
+++ b/src/pal/src/include/pal/palinternal.h
@@ -331,8 +331,6 @@ function_name() to call the system's implementation
 #define FILE PAL_FILE
 
 #include "pal.h"
-#include "palprivate.h"
-
 #include "mbusafecrt.h"
 
 #ifdef _VAC_