kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* win32/win32.c: drop Win2K support.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54864 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2016-05-01 12:00:35 +00:00
parent 62b6e90d58
commit 54916154a0
2 changed files with 6 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -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> 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 * cont.c, hash.c, random.c, win32/win32.c: cleanup some Win9x/ME/NT4

21
win32/win32.c
View file

@ -59,10 +59,6 @@
# define CharNextExA(cp, p, flags) CharNextExA((WORD)(cp), (p), (flags)) # define CharNextExA(cp, p, flags) CharNextExA((WORD)(cp), (p), (flags))
#endif #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_wopen(const WCHAR *file, int oflag, int perm);
static int w32_stati64(const char *path, struct stati64 *st, UINT cp); static int w32_stati64(const char *path, struct stati64 *st, UINT cp);
static int w32_lstati64(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; 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 */ /* License: Ruby's */
VALUE VALUE
rb_w32_special_folder(int type) rb_w32_special_folder(int type)
@ -504,7 +488,7 @@ rb_w32_system_tmpdir(WCHAR *path, UINT len)
WCHAR *p; WCHAR *p;
if (!get_special_folder(CSIDL_LOCAL_APPDATA, path)) { 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'/'); p = translate_wchar(path, L'\\', L'/');
if (*(p - 1) != L'/') *p++ = L'/'; if (*(p - 1) != L'/') *p++ = L'/';
@ -2361,8 +2345,7 @@ set_pioinfo_extra(void)
{ {
#if RUBY_MSVCRT_VERSION >= 140 #if RUBY_MSVCRT_VERSION >= 140
/* get __pioinfo addr with _isatty */ /* get __pioinfo addr with _isatty */
HMODULE mod = GetModuleHandle("ucrtbase.dll"); char *p = (char*)get_proc_address("ucrtbase.dll", "_isatty", NULL);
char *p = (char*)GetProcAddress(mod, "_isatty");
char *pend = p + 100; char *pend = p + 100;
/* _osfile(fh) & FDEV */ /* _osfile(fh) & FDEV */
#if _WIN64 #if _WIN64