September 2009 - Wine-Commits

Henri Verbeet : d3d10: Use the shader variable class/ type debug functions in parse_fx10_type().
by Alexandre Julliard Sept. 11, 2009

Sept. 11, 2009

Module: wine Branch: master Commit: b0c462080289ac4d064a788bfe2876011709b24b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0c462080289ac4d064a788bf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 10 16:57:14 2009 +0200 d3d10: Use the shader variable class/type debug functions in parse_fx10_type(). This got lost by 7c156c5753f57535b9c12ea3cb8ac17562b4f214. --- dlls/d3d10/effect.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 3ac6875..c80cf56 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -344,8 +344,8 @@ static HRESULT parse_fx10_type(struct d3d10_effect_type *t, const char *ptr, con TRACE("Type description: %#x.\n", tmp); TRACE("\tcolumns: %u.\n", t->column_count); TRACE("\trows: %u.\n", t->row_count); - TRACE("\tbasetype: %#x.\n", t->basetype); - TRACE("\tclass: %#x.\n", t->type_class); + TRACE("\tbasetype: %s.\n", debug_d3d10_shader_variable_type(t->basetype)); + TRACE("\tclass: %s.\n", debug_d3d10_shader_variable_class(t->type_class)); TRACE("\tunknown bits: %#x.\n", tmp & ~(D3D10_FX10_TYPE_COLUMN_MASK | D3D10_FX10_TYPE_ROW_MASK | D3D10_FX10_TYPE_BASETYPE_MASK | D3D10_FX10_TYPE_CLASS_MASK)); }

1 0

Ge van Geldorp : winhttp/tests: Fix tests on Win7.
by Alexandre Julliard Sept. 11, 2009

Sept. 11, 2009

Module: wine Branch: master Commit: 40446600dc8a92b06284a4e7d87e11b5ed7c4507 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40446600dc8a92b06284a4e7d… Author: Ge van Geldorp <ggeldorp(a)vmware.com> Date: Thu Sep 10 13:48:45 2009 +0200 winhttp/tests: Fix tests on Win7. --- dlls/winhttp/tests/winhttp.c | 44 ++++++++++++++++++++++++++--------------- 1 files changed, 28 insertions(+), 16 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=40446600dc8a92b06284a…

1 0

Vladimir Pankratov : jscript: Update Russian translation.
by Alexandre Julliard Sept. 11, 2009

Sept. 11, 2009

Module: wine Branch: master Commit: 7529008c700357d3f4d44135a352586a2130a4ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=7529008c700357d3f4d44135a… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Thu Sep 10 21:05:55 2009 +0500 jscript: Update Russian translation. --- dlls/jscript/jscript_Ru.rc | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/jscript_Ru.rc b/dlls/jscript/jscript_Ru.rc index 998c715..a2bf3ce 100644 --- a/dlls/jscript/jscript_Ru.rc +++ b/dlls/jscript/jscript_Ru.rc @@ -25,9 +25,9 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE { - IDS_TO_PRIMITIVE "Ошибка конвертирования обьекта в примитивный тип" + IDS_TO_PRIMITIVE "Ошибка конвертирования объекта в примитивный тип" IDS_INVALID_CALL_ARG "Неверный вызов процедуры или аргумент" - IDS_NO_PROPERTY "Обьект не поддерживает это свойство или метод" + IDS_NO_PROPERTY "Объект не поддерживает это свойство или метод" IDS_ARG_NOT_OPT "Отсутствует обязательный аргумент" IDS_SYNTAX_ERROR "Синтаксическая ошибка" IDS_SEMICOLON "Ожидается ';'" @@ -35,10 +35,11 @@ STRINGTABLE DISCARDABLE IDS_RBRACKET "Ожидается ')'" IDS_UNTERMINATED_STR "Незавершённая строковая константа" IDS_NOT_FUNC "Ожидается функция" - IDS_NOT_DATE "'[object]' не обьект типа 'date'" + IDS_NOT_DATE "'[object]' не объект типа 'date'" IDS_NOT_NUM "Ожидается число" + IDS_OBJECT_EXPECTED "Ожидается объект" IDS_ILLEGAL_ASSIGN "Неверное присваивание" IDS_UNDEFINED "'|' не определён" - IDS_NOT_BOOL "Ожидается обьект типа 'bool'" + IDS_NOT_BOOL "Ожидается объект типа 'bool'" IDS_INVALID_LENGTH "Длиной массива должно быть конечное положительное число" }

1 0

Hans Leidekker : msi: Ignore CoInitialize failure in ACTION_CreateShortcuts .
by Alexandre Julliard Sept. 11, 2009

Sept. 11, 2009

Module: wine Branch: master Commit: dd1ca6ca5ef0bee4c69b7016d52d6e7a76ff6722 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd1ca6ca5ef0bee4c69b7016d… Author: Hans Leidekker <hans(a)meelstraat.net> Date: Thu Sep 10 10:10:33 2009 +0200 msi: Ignore CoInitialize failure in ACTION_CreateShortcuts. --- dlls/msi/action.c | 8 ++------ dlls/msi/tests/install.c | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 881c4a2..6bff87a 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -3387,16 +3387,12 @@ static UINT ACTION_CreateShortcuts(MSIPACKAGE *package) return ERROR_SUCCESS; res = CoInitialize( NULL ); - if (FAILED (res)) - { - ERR("CoInitialize failed\n"); - return ERROR_FUNCTION_FAILED; - } rc = MSI_IterateRecords(view, NULL, ITERATE_CreateShortcuts, package); msiobj_release(&view->hdr); - CoUninitialize(); + if (SUCCEEDED(res)) + CoUninitialize(); return rc; } diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 9d1237a..b78e3dc 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -6212,7 +6212,7 @@ static void test_shortcut(void) ok(SUCCEEDED(hr), "CoInitialize failed 0x%08x\n", hr); r = MsiInstallProductA(msifile, NULL); - todo_wine ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); CoUninitialize();

1 0

André Hentschel : winehq: Fix some HTML markup
by Jeremy Newman Sept. 10, 2009

Sept. 10, 2009

Module: website Branch: master Commit: 1cdaf6bb4e656442c91b40126c47977cce291699 URL: http://source.winehq.org/git/website.git/?a=commit;h=1cdaf6bb4e656442c91b40… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Sep 9 14:24:07 2009 +0200 winehq: Fix some HTML markup --- templates/de/about.template | 2 +- templates/de/contributing.template | 8 +++--- templates/de/download.template | 10 +++--- templates/de/help.template | 16 ++++++------ templates/en/about.template | 2 +- templates/en/contributing.template | 8 +++--- templates/en/documentation.template | 48 +++++++++++++++++----------------- templates/en/download.template | 10 +++--- templates/en/help.template | 16 ++++++------ templates/fr/about.template | 2 +- templates/pl/about.template | 2 +- templates/pl/download.template | 10 +++--- templates/pl/help.template | 16 ++++++------ templates/pt/about.template | 2 +- templates/pt/contributing.template | 8 +++--- 15 files changed, 80 insertions(+), 80 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=1cdaf6bb4e656442c9…

1 0

Łukasz Wojniłowicz : Polish translation for release 1.1.29
by Jeremy Newman Sept. 10, 2009

Sept. 10, 2009

Module: website Branch: master Commit: bac1269333f603cc25e3b59392cf9c4902284f61 URL: http://source.winehq.org/git/website.git/?a=commit;h=bac1269333f603cc25e3b5… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sun Sep 6 10:27:18 2009 +0200 Polish translation for release 1.1.29 --- news/pl/2009090201.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/pl/2009090201.xml b/news/pl/2009090201.xml new file mode 100644 index 0000000..08bdc9b --- /dev/null +++ b/news/pl/2009090201.xml @@ -0,0 +1,16 @@ +<news> +<date>Wrzesień 2, 2009</date> +<title>Wydano Wine 1.1.29</title> +<body> + Wydanie rozwojowe Wine 1.1.29 jest już dostępne. + <a href="{$root}/announce/1.1.29">Co nowego</a> w tym wydaniu: +<ul> + <li>Ulepszona integracja Gecko poprzez użycie warstw sieciowych Wine.</li> + <li>Użycie zewnętrznego libmpg123 do dekodowania mp3.</li> + <li>Wsparcie dla formatów JPEG i PNG w WindowsCodecs.</li> + <li>Wiele poprawek testów regresji dla Win64 i Windows 7.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.1.29.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkróce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Paul Vriens : wininet/tests: Fix a test failure on IE8.
by Alexandre Julliard Sept. 10, 2009

Sept. 10, 2009

Module: wine Branch: master Commit: bf1b965e96e695f376ddf9140e4c17e687771899 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf1b965e96e695f376ddf9140… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Sep 10 15:17:17 2009 +0200 wininet/tests: Fix a test failure on IE8. --- dlls/wininet/tests/http.c | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index b11cb2c..dda4a41 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -1162,13 +1162,20 @@ static void test_http_cache(void) ok(ret, "HttpSendRequest failed: %u\n", GetLastError()); size = sizeof(file_name); + file_name[0] = 0; ret = InternetQueryOptionA(request, INTERNET_OPTION_DATAFILE_NAME, file_name, &size); - ok(ret, "InternetQueryOptionA(INTERNET_OPTION_DATAFILE_NAME) failed %u\n", GetLastError()); - - file = CreateFile(file_name, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, + if (ret) + { + file = CreateFile(file_name, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); - ok(file != INVALID_HANDLE_VALUE, "Could not create file: %u\n", GetLastError()); - CloseHandle(file); + ok(file != INVALID_HANDLE_VALUE, "Could not create file: %u\n", GetLastError()); + CloseHandle(file); + } + else + { + /* < IE8 */ + ok(file_name[0] == 0, "Didn't expect a file name\n"); + } ok(InternetCloseHandle(request), "Close request handle failed\n"); ok(InternetCloseHandle(connect), "Close connect handle failed\n");

1 0

Roderick Colenbrander : winex11: Fix a null pointer bug in ToLogical in case of 8-bit. Move the code to the place where the shifts are needed.
by Alexandre Julliard Sept. 10, 2009

Sept. 10, 2009

Module: wine Branch: master Commit: 2d1f55cce285f75f72393e699acd725ffe177bb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d1f55cce285f75f72393e699… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Thu Sep 10 15:00:17 2009 +0200 winex11: Fix a null pointer bug in ToLogical in case of 8-bit. Move the code to the place where the shifts are needed. --- dlls/winex11.drv/palette.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/palette.c b/dlls/winex11.drv/palette.c index 2f3600f..81bb73b 100644 --- a/dlls/winex11.drv/palette.c +++ b/dlls/winex11.drv/palette.c @@ -791,10 +791,6 @@ BOOL X11DRV_IsSolidColor( COLORREF color ) COLORREF X11DRV_PALETTE_ToLogical(X11DRV_PDEVICE *physDev, int pixel) { XColor color; - ColorShifts *shifts = &X11DRV_PALETTE_default_shifts; - - if(physDev->color_shifts) - shifts = physDev->color_shifts; #if 0 /* truecolor visual */ @@ -806,6 +802,11 @@ COLORREF X11DRV_PALETTE_ToLogical(X11DRV_PDEVICE *physDev, int pixel) if ( (X11DRV_PALETTE_PaletteFlags & X11DRV_PALETTE_FIXED) && !X11DRV_PALETTE_Graymax ) { + ColorShifts *shifts = &X11DRV_PALETTE_default_shifts; + + if(physDev->color_shifts) + shifts = physDev->color_shifts; + color.red = (pixel >> shifts->logicalRed.shift) & shifts->logicalRed.max; if (shifts->logicalRed.scale<8) color.red= color.red << (8-shifts->logicalRed.scale) |

1 0

Alexandre Julliard : msvcrt/tests: Add tests for the handle inheritance block.
by Alexandre Julliard Sept. 10, 2009

Sept. 10, 2009

Module: wine Branch: master Commit: da2db26dec5e67e470f76217d40eb48fc2d267e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da2db26dec5e67e470f76217d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 10 15:29:35 2009 +0200 msvcrt/tests: Add tests for the handle inheritance block. Based on a patch by André Hentschel. --- dlls/msvcrt/tests/file.c | 137 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 136 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index d405656..e652985 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -857,12 +857,89 @@ static void test_file_inherit_child_no(const char* fd_s) ok( ret == -1 && errno == EBADF, "Wrong write result in child process on %d (%s)\n", fd, strerror(errno)); } - + +static void create_io_inherit_block( STARTUPINFO *startup, unsigned int count, const HANDLE *handles ) +{ + static BYTE block[1024]; + BYTE *wxflag_ptr; + HANDLE *handle_ptr; + unsigned int i; + + startup->lpReserved2 = block; + startup->cbReserved2 = sizeof(unsigned) + (sizeof(char) + sizeof(HANDLE)) * count; + wxflag_ptr = block + sizeof(unsigned); + handle_ptr = (HANDLE *)(wxflag_ptr + count); + + *(unsigned*)block = count; + for (i = 0; i < count; i++) + { + wxflag_ptr[i] = 0x81; + handle_ptr[i] = handles[i]; + } +} + +static const char *read_file( HANDLE file ) +{ + static char buffer[128]; + DWORD ret; + SetFilePointer( file, 0, NULL, FILE_BEGIN ); + if (!ReadFile( file, buffer, sizeof(buffer) - 1, &ret, NULL)) ret = 0; + buffer[ret] = 0; + return buffer; +} + +static void test_stdout_handle( STARTUPINFO *startup, char *cmdline, HANDLE hstdout, BOOL expect_stdout, + const char *descr ) +{ + const char *data; + HANDLE hErrorFile; + SECURITY_ATTRIBUTES sa; + PROCESS_INFORMATION proc; + + /* make file handle inheritable */ + sa.nLength = sizeof(sa); + sa.lpSecurityDescriptor = NULL; + sa.bInheritHandle = TRUE; + + hErrorFile = CreateFileA( "fdopen.err", GENERIC_READ|GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, &sa, CREATE_ALWAYS, 0, NULL ); + startup->dwFlags = STARTF_USESTDHANDLES; + startup->hStdInput = GetStdHandle( STD_INPUT_HANDLE ); + startup->hStdOutput = hErrorFile; + startup->hStdError = GetStdHandle( STD_ERROR_HANDLE ); + + CreateProcessA( NULL, cmdline, NULL, NULL, TRUE, + CREATE_DEFAULT_ERROR_MODE | NORMAL_PRIORITY_CLASS, NULL, NULL, startup, &proc ); + winetest_wait_child_process( proc.hProcess ); + + data = read_file( hErrorFile ); + if (expect_stdout) + ok( strcmp( data, "Success" ), "%s: Error file shouldn't contain data\n", descr ); + else + ok( !strcmp( data, "Success" ), "%s: Wrong error data (%s)\n", descr, data ); + + if (hstdout) + { + data = read_file( hstdout ); + if (expect_stdout) + ok( !strcmp( data, "Success" ), "%s: Wrong stdout data (%s)\n", descr, data ); + else + ok( strcmp( data, "Success" ), "%s: Stdout file shouldn't contain data\n", descr ); + } + + CloseHandle( hErrorFile ); + DeleteFile( "fdopen.err" ); +} + static void test_file_inherit( const char* selfname ) { int fd; const char* arg_v[5]; char buffer[16]; + char cmdline[MAX_PATH]; + STARTUPINFO startup; + SECURITY_ATTRIBUTES sa; + HANDLE handles[3]; fd = open ("fdopen.tst", O_CREAT | O_RDWR | O_BINARY, _S_IREAD |_S_IWRITE); ok(fd != -1, "Couldn't create test file\n"); @@ -890,6 +967,64 @@ static void test_file_inherit( const char* selfname ) ok(read(fd, buffer, sizeof (buffer)) == 0, "Found unexpected data (%s)\n", buffer); close (fd); ok(unlink("fdopen.tst") == 0, "Couldn't unlink\n"); + + /* make file handle inheritable */ + sa.nLength = sizeof(sa); + sa.lpSecurityDescriptor = NULL; + sa.bInheritHandle = TRUE; + sprintf(cmdline, "%s file inherit 1", selfname); + + /* init an empty Reserved2, which should not be recognized as inherit-block */ + ZeroMemory(&startup, sizeof(STARTUPINFO)); + startup.cb = sizeof(startup); + create_io_inherit_block( &startup, 0, NULL ); + test_stdout_handle( &startup, cmdline, 0, FALSE, "empty block" ); + + /* test with valid inheritblock */ + handles[0] = GetStdHandle( STD_INPUT_HANDLE ); + handles[1] = CreateFileA( "fdopen.tst", GENERIC_READ|GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, &sa, CREATE_ALWAYS, 0, NULL ); + handles[2] = GetStdHandle( STD_ERROR_HANDLE ); + create_io_inherit_block( &startup, 3, handles ); + test_stdout_handle( &startup, cmdline, handles[1], TRUE, "valid block" ); + CloseHandle( handles[1] ); + DeleteFile("fdopen.tst"); + + /* test inherit block starting with unsigned zero */ + handles[1] = CreateFileA( "fdopen.tst", GENERIC_READ|GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, &sa, CREATE_ALWAYS, 0, NULL ); + create_io_inherit_block( &startup, 3, handles ); + *(unsigned int *)startup.lpReserved2 = 0; + test_stdout_handle( &startup, cmdline, handles[1], FALSE, "zero count block" ); + CloseHandle( handles[1] ); + DeleteFile("fdopen.tst"); + + /* test inherit block with smaller size */ + handles[1] = CreateFileA( "fdopen.tst", GENERIC_READ|GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, &sa, CREATE_ALWAYS, 0, NULL ); + create_io_inherit_block( &startup, 3, handles ); + startup.cbReserved2 -= 3; + test_stdout_handle( &startup, cmdline, handles[1], TRUE, "small size block" ); + CloseHandle( handles[1] ); + DeleteFile("fdopen.tst"); + + /* test inherit block with even smaller size */ + handles[1] = CreateFileA( "fdopen.tst", GENERIC_READ|GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, &sa, CREATE_ALWAYS, 0, NULL ); + create_io_inherit_block( &startup, 3, handles ); + startup.cbReserved2 = sizeof(unsigned int) + sizeof(HANDLE) + sizeof(char); + test_stdout_handle( &startup, cmdline, handles[1], FALSE, "smaller size block" ); + CloseHandle( handles[1] ); + DeleteFile("fdopen.tst"); + + /* test inherit block with larger size */ + handles[1] = CreateFileA( "fdopen.tst", GENERIC_READ|GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, &sa, CREATE_ALWAYS, 0, NULL ); + create_io_inherit_block( &startup, 3, handles ); + startup.cbReserved2 += 7; + test_stdout_handle( &startup, cmdline, handles[1], TRUE, "large size block" ); + CloseHandle( handles[1] ); + DeleteFile("fdopen.tst"); } static void test_tmpnam( void )

1 0

Alexandre Julliard : msvcrt: Add validity checks on the size of the handle inheritance block.
by Alexandre Julliard Sept. 10, 2009

Sept. 10, 2009

Module: wine Branch: master Commit: ded81aebc7ca9fe7a3362ec1b462dabad5e7986e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ded81aebc7ca9fe7a3362ec1b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 10 15:29:04 2009 +0200 msvcrt: Add validity checks on the size of the handle inheritance block. --- dlls/msvcrt/file.c | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 6671f2f..cbaa04e 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -349,18 +349,19 @@ void msvcrt_init_io(void) InitializeCriticalSection(&MSVCRT_file_cs); MSVCRT_file_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": MSVCRT_file_cs"); 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; + unsigned int count; - MSVCRT_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)); - handle_ptr = (HANDLE*)(wxflag_ptr + MSVCRT_fdend * sizeof(char)); - - MSVCRT_fdend = min(MSVCRT_fdend, sizeof(MSVCRT_fdesc) / sizeof(MSVCRT_fdesc[0])); - for (i = 0; i < MSVCRT_fdend; i++) + count = min(count, (si.cbReserved2 - sizeof(unsigned)) / (sizeof(HANDLE) + 1)); + count = min(count, sizeof(MSVCRT_fdesc) / sizeof(MSVCRT_fdesc[0])); + for (i = 0; i < count; i++) { if ((*wxflag_ptr & WX_OPEN) && *handle_ptr != INVALID_HANDLE_VALUE) { @@ -374,6 +375,7 @@ void msvcrt_init_io(void) } wxflag_ptr++; handle_ptr++; } + MSVCRT_fdend = max( 3, count ); for (MSVCRT_fdstart = 3; MSVCRT_fdstart < MSVCRT_fdend; MSVCRT_fdstart++) if (MSVCRT_fdesc[MSVCRT_fdstart].handle == INVALID_HANDLE_VALUE) break; }

1 0