+2020-05-28 Bruno Haible <bruno@clisp.org>
+
+ Avoid dynamic loading of Windows API functions when possible.
+ Reported by Steve Lhomme <robux4@ycbcr.xyz> in
+ <https://lists.gnu.org/archive/html/bug-gnulib/2020-05/msg00182.html>.
+ * lib/gettimeofday.c (GetProcAddress,
+ GetSystemTimePreciseAsFileTimeFuncType,
+ GetSystemTimePreciseAsFileTimeFunc, initialized, initialize): Don't
+ define in a build for Windows 8 or higher.
+ * lib/isatty.c (GetProcAddress, GetNamedPipeClientProcessIdFuncType,
+ GetNamedPipeClientProcessIdFunc, QueryFullProcessImageNameFuncType,
+ QueryFullProcessImageNameFunc, initialized, initialize): Don't define
+ in a build for Windows Vista or higher.
+ * lib/stat-w32.c (GetProcAddress, GetFileInformationByHandleExFuncType,
+ GetFileInformationByHandleExFunc, GetFinalPathNameByHandleFuncType,
+ GetFinalPathNameByHandleFunc, initialized, initialize): Likewise.
+
2020-05-28 Paul Eggert <eggert@cs.ucla.edu>
explicit_bzero-tests: improve -Wmissing-declarations pacification
#ifdef WINDOWS_NATIVE
+# if !(_WIN32_WINNT >= _WIN32_WINNT_WIN8)
+
/* Avoid warnings from gcc -Wcast-function-type. */
-# define GetProcAddress \
- (void *) GetProcAddress
+# define GetProcAddress \
+ (void *) GetProcAddress
/* GetSystemTimePreciseAsFileTime was introduced only in Windows 8. */
typedef void (WINAPI * GetSystemTimePreciseAsFileTimeFuncType) (FILETIME *lpTime);
initialized = TRUE;
}
+# endif
+
#endif
/* This is a wrapper for gettimeofday. It is used only on systems
<http://www.windowstimestamp.com/description>. */
FILETIME current_time;
+# if !(_WIN32_WINNT >= _WIN32_WINNT_WIN8)
if (!initialized)
initialize ();
+# endif
if (GetSystemTimePreciseAsFileTimeFunc != NULL)
GetSystemTimePreciseAsFileTimeFunc (¤t_time);
else
# include <io.h>
#endif
+#if !(_WIN32_WINNT >= _WIN32_WINNT_VISTA)
+
/* Avoid warnings from gcc -Wcast-function-type. */
-#define GetProcAddress \
- (void *) GetProcAddress
+# define GetProcAddress \
+ (void *) GetProcAddress
/* GetNamedPipeClientProcessId was introduced only in Windows Vista. */
typedef BOOL (WINAPI * GetNamedPipeClientProcessIdFuncType) (HANDLE hPipe,
initialized = TRUE;
}
+#endif
+
static BOOL IsConsoleHandle (HANDLE h)
{
DWORD mode;
BOOL result = FALSE;
ULONG processId;
+#if !(_WIN32_WINNT >= _WIN32_WINNT_VISTA)
if (!initialized)
initialize ();
+#endif
/* GetNamedPipeClientProcessId
<https://docs.microsoft.com/en-us/windows/desktop/api/winbase/nf-winbase-getnamedpipeclientprocessid>
#include "pathmax.h"
#include "verify.h"
+#if !(_WIN32_WINNT >= _WIN32_WINNT_VISTA)
+
/* Avoid warnings from gcc -Wcast-function-type. */
-#define GetProcAddress \
- (void *) GetProcAddress
+# define GetProcAddress \
+ (void *) GetProcAddress
-#if _GL_WINDOWS_STAT_INODES == 2
+# if _GL_WINDOWS_STAT_INODES == 2
/* GetFileInformationByHandleEx was introduced only in Windows Vista. */
typedef DWORD (WINAPI * GetFileInformationByHandleExFuncType) (HANDLE hFile,
FILE_INFO_BY_HANDLE_CLASS fiClass,
LPVOID lpBuffer,
DWORD dwBufferSize);
static GetFileInformationByHandleExFuncType GetFileInformationByHandleExFunc = NULL;
-#endif
+# endif
/* GetFinalPathNameByHandle was introduced only in Windows Vista. */
typedef DWORD (WINAPI * GetFinalPathNameByHandleFuncType) (HANDLE hFile,
LPSTR lpFilePath,
HMODULE kernel32 = LoadLibrary ("kernel32.dll");
if (kernel32 != NULL)
{
-#if _GL_WINDOWS_STAT_INODES == 2
+# if _GL_WINDOWS_STAT_INODES == 2
GetFileInformationByHandleExFunc =
(GetFileInformationByHandleExFuncType) GetProcAddress (kernel32, "GetFileInformationByHandleEx");
-#endif
+# endif
GetFinalPathNameByHandleFunc =
(GetFinalPathNameByHandleFuncType) GetProcAddress (kernel32, "GetFinalPathNameByHandleA");
}
initialized = TRUE;
}
+#endif
+
/* Converts a FILETIME to GMT time since 1970-01-01 00:00:00. */
#if _GL_WINDOWS_STAT_TIMESPEC
struct timespec
DWORD type = GetFileType (h);
if (type == FILE_TYPE_DISK)
{
+#if !(_WIN32_WINNT >= _WIN32_WINNT_VISTA)
if (!initialized)
initialize ();
+#endif
/* st_mode can be determined through
GetFileAttributesEx