Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 16:02:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

-sync msvcrt_init_io to wine 1.1.31

Browse source 
fixes 12 msvcrt file winetests

svn path=/trunk/; revision=43520
This commit is contained in:
Christoph von Wittich 2009-10-16 20:57:00 +00:00
parent 030837bb5e
commit 59ee8d397a
1 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
reactos/lib/sdk/crt/stdio/file.c
View file

@ -306,18 +306,19 @@ void msvcrt_init_io(void)
InitializeCriticalSection(&FILE_cs); InitializeCriticalSection(&FILE_cs);
FILE_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": FILE_cs"); FILE_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": FILE_cs");
GetStartupInfoA(&si); GetStartupInfoA(&si);
if (si.cbReserved2 != 0 && si.lpReserved2 != NULL) if (si.cbReserved2 >= sizeof(unsigned int) && si.lpReserved2 != NULL)
{ {
char* wxflag_ptr; BYTE* wxflag_ptr;
HANDLE* handle_ptr; HANDLE* handle_ptr;
unsigned int count;
fdend = *(unsigned*)si.lpReserved2; count = *(unsigned*)si.lpReserved2;
wxflag_ptr = si.lpReserved2 + sizeof(unsigned);
handle_ptr = (HANDLE*)(wxflag_ptr + count);
wxflag_ptr = (char*)(si.lpReserved2 + sizeof(unsigned)); count = min(count, (si.cbReserved2 - sizeof(unsigned)) / (sizeof(HANDLE) + 1));
handle_ptr = (HANDLE*)(wxflag_ptr + fdend * sizeof(char)); count = min(count, sizeof(fdesc) / sizeof(fdesc[0]));
for (i = 0; i < count; i++)
fdend = min(fdend, sizeof(fdesc) / sizeof(fdesc[0]));
for (i = 0; i < fdend; i++)
{ {
if ((*wxflag_ptr & WX_OPEN) && *handle_ptr != INVALID_HANDLE_VALUE) if ((*wxflag_ptr & WX_OPEN) && *handle_ptr != INVALID_HANDLE_VALUE)
{ {
@ -331,6 +332,7 @@ void msvcrt_init_io(void)
} }
wxflag_ptr++; handle_ptr++; wxflag_ptr++; handle_ptr++;
} }
fdend = max( 3, count );
for (fdstart = 3; fdstart < fdend; fdstart++) for (fdstart = 3; fdstart < fdend; fdstart++)
if (fdesc[fdstart].handle == INVALID_HANDLE_VALUE) break; if (fdesc[fdstart].handle == INVALID_HANDLE_VALUE) break;
} }