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 (set_pioinfo_extra): simplified.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11826 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2007-02-23 06:07:55 +00:00
parent a9921d08f9
commit 5834171904
2 changed files with 30 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,7 @@
Fri Feb 23 15:05:57 2007 NAKAMURA Usaku <usa@ruby-lang.org>
* win32/win32.c (set_pioinfo_extra): simplified.
Fri Feb 23 14:23:20 2007 Minero Aoki <aamine@loveruby.net>
* test/ruby/test_literal.rb: new test.
@ -146,7 +150,7 @@ Fri Feb 16 11:18:21 2007 Eric Hodel <drbrain@segment7.net>
Thu Feb 15 20:48:36 2007 NAKAMURA Usaku <usa@ruby-lang.org>
* win32/win32.c (get_pioinfo_extra): new function for VC++8 SP1
* win32/win32.c (set_pioinfo_extra): new function for VC++8 SP1
workaround. [ruby-core:10259]
* win32/win32.c (NtInitialize): call above function.

72
win32/win32.c
View file

@ -1672,53 +1672,6 @@ typedef struct {
#if !defined(__BORLANDC__) && !defined(_WIN32_WCE)
EXTERN_C _CRTIMP ioinfo * __pioinfo[];
#if _MSC_VER >= 1400
static size_t pioinfo_extra = 0; /* workaround for VC++8 SP1 */
static void
set_pioinfo_extra(void)
{
char libpath[MAXPATHLEN+1];
HMODULE msvcrt = NULL;
MEMORY_BASIC_INFORMATION m;
DWORD dummy;
DWORD size;
void *buf;
VS_FIXEDFILEINFO *pffi;
int major, minor, teeny, build;
memset(&m, 0, sizeof(m));
if (VirtualQuery(stdin, &m, sizeof(m)) && m.State == MEM_COMMIT)
msvcrt = (HMODULE)m.AllocationBase;
if (!msvcrt)
return;
if (!GetModuleFileName(msvcrt, libpath, sizeof(libpath)))
return;
size = GetFileVersionInfoSize(libpath, &dummy);
if (size == 0)
return;
buf = malloc(size);
if (!GetFileVersionInfo(libpath, 0, size, buf) ||
!VerQueryValue(buf, "\\", &pffi, &dummy)) {
free(buf);
return;
}
major = HIWORD(pffi->dwFileVersionMS);
minor = LOWORD(pffi->dwFileVersionMS);
teeny = HIWORD(pffi->dwFileVersionLS);
build = LOWORD(pffi->dwFileVersionLS);
free(buf);
if (major == 8 && minor == 0 &&
(teeny > 50727 || (teeny == 50727 && build >= 762))) {
pioinfo_extra = 16;
}
}
#else
#define pioinfo_extra 0
#endif
#define IOINFO_L2E 5
#define IOINFO_ARRAY_ELTS (1 << IOINFO_L2E)
#define _pioinfo(i) ((ioinfo*)((char*)(__pioinfo[i >> IOINFO_L2E]) + (i & (IOINFO_ARRAY_ELTS - 1)) * (sizeof(ioinfo) + pioinfo_extra)))
@ -1726,6 +1679,31 @@ set_pioinfo_extra(void)
#define _osfile(i) (_pioinfo(i)->osfile)
#define _pipech(i) (_pioinfo(i)->pipech)
#if _MSC_VER >= 1400
static size_t pioinfo_extra = 0; /* workaround for VC++8 SP1 */
static void
set_pioinfo_extra(void)
{
int fd;
fd = open("NUL", O_RDONLY);
for (pioinfo_extra = 0; pioinfo_extra <= 64; pioinfo_extra += sizeof(void *)) {
if (_osfhnd(fd) == _get_osfhandle(fd)) {
break;
}
}
close(fd);
if (pioinfo_extra > 64) {
/* not found, maybe something wrong... */
pioinfo_extra = 0;
}
}
#else
#define pioinfo_extra 0
#endif
#define _set_osfhnd(fh, osfh) (void)(_osfhnd(fh) = osfh)
#define _set_osflags(fh, flags) (_osfile(fh) = (flags))