From 54916154a0c90750377044df024223b694b28e1e Mon Sep 17 00:00:00 2001
From: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 1 May 2016 12:00:35 +0000
Subject: [PATCH] * win32/win32.c: drop Win2K support.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54864 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog     |  4 ++++
 win32/win32.c | 21 ++-------------------
 2 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 139abacf15..2f7eb8deb0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun May  1 21:00:07 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c: drop Win2K support.
+
 Sun May  1 20:39:47 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* cont.c, hash.c, random.c, win32/win32.c: cleanup some Win9x/ME/NT4
diff --git a/win32/win32.c b/win32/win32.c
index abf4dc2b4b..eb32b35d43 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -59,10 +59,6 @@
 # define CharNextExA(cp, p, flags) CharNextExA((WORD)(cp), (p), (flags))
 #endif
 
-#if _WIN32_WINNT < 0x0600
-DWORD WINAPI GetFinalPathNameByHandleW(HANDLE, LPWSTR, DWORD, DWORD);
-#endif
-
 static int w32_wopen(const WCHAR *file, int oflag, int perm);
 static int w32_stati64(const char *path, struct stati64 *st, UINT cp);
 static int w32_lstati64(const char *path, struct stati64 *st, UINT cp);
@@ -473,18 +469,6 @@ get_proc_address(const char *module, const char *func, HANDLE *mh)
     return ptr;
 }
 
-/* License: Ruby's */
-static UINT
-get_system_directory(WCHAR *path, UINT len)
-{
-    typedef UINT WINAPI wgetdir_func(WCHAR*, UINT);
-    FARPROC ptr =
-	get_proc_address("kernel32", "GetSystemWindowsDirectoryW", NULL);
-    if (ptr)
-	return (*(wgetdir_func *)ptr)(path, len);
-    return GetWindowsDirectoryW(path, len);
-}
-
 /* License: Ruby's */
 VALUE
 rb_w32_special_folder(int type)
@@ -504,7 +488,7 @@ rb_w32_system_tmpdir(WCHAR *path, UINT len)
     WCHAR *p;
 
     if (!get_special_folder(CSIDL_LOCAL_APPDATA, path)) {
-	if (get_system_directory(path, len)) return 0;
+	if (GetSystemWindowsDirectoryW(path, len)) return 0;
     }
     p = translate_wchar(path, L'\\', L'/');
     if (*(p - 1) != L'/') *p++ = L'/';
@@ -2361,8 +2345,7 @@ set_pioinfo_extra(void)
 {
 #if RUBY_MSVCRT_VERSION >= 140
     /* get __pioinfo addr with _isatty */
-    HMODULE mod = GetModuleHandle("ucrtbase.dll");
-    char *p = (char*)GetProcAddress(mod, "_isatty");
+    char *p = (char*)get_proc_address("ucrtbase.dll", "_isatty", NULL);
     char *pend = p + 100;
     /* _osfile(fh) & FDEV */
 #if _WIN64