1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* win32/win32.c (rb_w32_osid, rb_w32_osver, CreateChild): XP is

Browse Source 
is different from Vista about pipe handle inheritance.
	  fixed [ruby-core:17367]



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17514 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2008-06-21 15:45:16 +00:00
parent 8fc91349e9
commit 7c936bcbb7
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Sun Jun 22 00:42:02 2008 NAKAMURA Usaku <usa@ruby-lang.org>
* win32/win32.c (rb_w32_osid, rb_w32_osver, CreateChild): XP is
is different from Vista about pipe handle inheritance.
fixed [ruby-core:17367]
Sun Jun 22 00:38:45 2008 NAKAMURA Usaku <usa@ruby-lang.org> Sun Jun 22 00:38:45 2008 NAKAMURA Usaku <usa@ruby-lang.org>
* README.EXT.ja: add note about mark and free. * README.EXT.ja: add note about mark and free.

18
win32/win32.c
View File

@ -200,14 +200,13 @@ rb_w32_map_errno(DWORD winerr)
static const char *NTLoginName; static const char *NTLoginName;
static OSVERSIONINFO osver;
#ifdef WIN95 #ifdef WIN95
static DWORD Win32System = (DWORD)-1; static DWORD Win32System = (DWORD)-1;
DWORD DWORD
rb_w32_osid(void) rb_w32_osid(void)
{ {
static OSVERSIONINFO osver;
if (osver.dwPlatformId != Win32System) { if (osver.dwPlatformId != Win32System) {
memset(&osver, 0, sizeof(OSVERSIONINFO)); memset(&osver, 0, sizeof(OSVERSIONINFO));
osver.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); osver.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
@ -217,6 +216,19 @@ rb_w32_osid(void)
return (Win32System); return (Win32System);
} }
#endif #endif
static DWORD Win32Version = (DWORD)-1;
static DWORD
rb_w32_osver(void)
{
if (osver.dwMajorVersion != Win32Version) {
memset(&osver, 0, sizeof(OSVERSIONINFO));
osver.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
GetVersionEx(&osver);
Win32Version = osver.dwMajorVersion;
}
return (Win32Version);
}
#define IsWinNT() rb_w32_iswinnt() #define IsWinNT() rb_w32_iswinnt()
#define IsWin95() rb_w32_iswin95() #define IsWin95() rb_w32_iswin95()
@ -882,7 +894,7 @@ CreateChild(const char *cmd, const char *prog, SECURITY_ATTRIBUTES *psa,
if (!psa) { if (!psa) {
sa.nLength = sizeof (SECURITY_ATTRIBUTES); sa.nLength = sizeof (SECURITY_ATTRIBUTES);
sa.lpSecurityDescriptor = NULL; sa.lpSecurityDescriptor = NULL;
sa.bInheritHandle = FALSE; sa.bInheritHandle = IsWinNT() && rb_w32_osver() > 5 ? FALSE : TRUE;
psa = &sa; psa = &sa;
} }