May 2016 - Wine-Commits - list.winehq.org

Jacek Caban : wininet: Added support for IRF_NO_WAIT flag.
by Alexandre Julliard May 4, 2016

May 4, 2016

Module: wine Branch: master Commit: 9e08c5518706715518c9ecb7af87cf2b3e9b8726 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e08c5518706715518c9ecb7a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 4 12:39:43 2016 +0200 wininet: Added support for IRF_NO_WAIT flag. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 67b4a24..646619b 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3112,14 +3112,19 @@ static void AsyncReadFileExProc(task_header_t *hdr) { read_file_ex_task_t *task = (read_file_ex_task_t*)hdr; http_request_t *req = (http_request_t*)task->hdr.hdr; - DWORD res; + DWORD res = ERROR_SUCCESS, read = 0, buffered = 0; - TRACE("INTERNETREADFILEEXW %p\n", task->hdr.hdr); + TRACE("%p\n", req); - res = HTTPREQ_Read(req, task->buf, task->size, task->ret_read); + if(task->ret_read) + res = HTTPREQ_Read(req, task->buf, task->size, &read); + if(res == ERROR_SUCCESS) + res = refill_read_buffer(req, task->ret_read ? BLOCKING_DISALLOW : BLOCKING_ALLOW, &buffered); if (res == ERROR_SUCCESS) { - DWORD read = *task->ret_read; + if(task->ret_read) + *task->ret_read = read; + read += buffered; INTERNET_SendCallback(&req->hdr, req->hdr.dwContext, INTERNET_STATUS_RESPONSE_RECEIVED, &read, sizeof(read)); } @@ -3134,6 +3139,8 @@ static DWORD HTTPREQ_ReadFileEx(object_header_t *hdr, void *buf, DWORD size, DWO http_request_t *req = (http_request_t*)hdr; DWORD res, read, cread, error = ERROR_SUCCESS; + TRACE("(%p %p %u %x)\n", req, buf, size, flags); + if (flags & ~(IRF_ASYNC|IRF_NO_WAIT)) FIXME("these dwFlags aren't implemented: 0x%x\n", flags & ~(IRF_ASYNC|IRF_NO_WAIT)); @@ -3157,7 +3164,7 @@ static DWORD HTTPREQ_ReadFileEx(object_header_t *hdr, void *buf, DWORD size, DWO task = alloc_async_task(&req->hdr, AsyncReadFileExProc, sizeof(*task)); task->buf = buf; task->size = size; - task->ret_read = ret_read; + task->ret_read = (flags & IRF_NO_WAIT) ? NULL : ret_read; INTERNET_AsyncCall(&task->hdr);

1 0

Andrey Gusev : dbghelp: Fix a typo in comment.
by Alexandre Julliard May 4, 2016

May 4, 2016

Module: wine Branch: master Commit: b3c254cd75564b2f0169eadf431612a59475fe2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3c254cd75564b2f0169eadf4… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue May 3 16:58:33 2016 +0300 dbghelp: Fix a typo in comment. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/crc32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dbghelp/crc32.c b/dlls/dbghelp/crc32.c index e1f604e..73042fe 100644 --- a/dlls/dbghelp/crc32.c +++ b/dlls/dbghelp/crc32.c @@ -58,7 +58,7 @@ /* order from highest-order term to lowest-order term. UARTs transmit */ /* characters in order from LSB to MSB. By storing the CRC this way, */ /* we hand it to the UART in the order low-byte to high-byte; the UART */ -/* sends each low-bit to hight-bit; and the result is transmission bit */ +/* sends each low-bit to high-bit; and the result is transmission bit */ /* by bit from highest- to lowest-order term without requiring any bit */ /* shuffling on our part. Reception works similarly. */

1 0

Alexandre Julliard : ntdll: Support remaining information classes in NtQueryDirectoryFile.
by Alexandre Julliard May 4, 2016

May 4, 2016

Module: wine Branch: master Commit: 6261e2676446c3e1e4a0d7589dfb8d344e51a8c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6261e2676446c3e1e4a0d7589… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 4 16:05:35 2016 +0900 ntdll: Support remaining information classes in NtQueryDirectoryFile. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/directory.c | 52 ++++++++++---- dlls/ntdll/file.c | 7 ++ dlls/ntdll/tests/directory.c | 165 ++++++++++++++++++++++++++++++++++++------- include/winternl.h | 45 ++++++++++++ 4 files changed, 233 insertions(+), 36 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6261e2676446c3e1e4a0d…

1 0

Jacek Caban : wininet: Return synchronously from InternetReadFileEx if there is no more data to read.
by Alexandre Julliard May 4, 2016

May 4, 2016

Module: wine Branch: master Commit: 87fffa1ebfb71fe7a34aa989fa88f85409dbb62f URL: http://source.winehq.org/git/wine.git/?a=commit;h=87fffa1ebfb71fe7a34aa989f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 4 12:39:21 2016 +0200 wininet: Return synchronously from InternetReadFileEx if there is no more data to read. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 775ff61..67b4a24 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3145,7 +3145,7 @@ static DWORD HTTPREQ_ReadFileEx(object_header_t *hdr, void *buf, DWORD size, DWO if (TryEnterCriticalSection( &req->read_section )) { - if (get_avail_data(req)) + if (get_avail_data(req) || end_of_read_data(req)) { res = HTTPREQ_Read(req, buf, size, &read); LeaveCriticalSection( &req->read_section );

1 0

Andrey Gusev : user32/tests: Fix a typo in comment.
by Alexandre Julliard May 4, 2016

May 4, 2016

Module: wine Branch: master Commit: f5531dc3473812c35f9be9cb5e5b70872ef0fdf3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5531dc3473812c35f9be9cb5… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue May 3 16:58:57 2016 +0300 user32/tests: Fix a typo in comment. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/menu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index 65c8e93..e56cdc3 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -819,7 +819,7 @@ static void test_menu_ownerdraw(void) ok( MOD_rc[0].right - MOD_rc[0].left == 2 * MOD_avec + MOD_SIZE, "width of owner drawn menu item is wrong. Got %d expected %d\n", MOD_rc[0].right - MOD_rc[0].left , 2*MOD_avec + MOD_SIZE); - /* test hight */ + /* test height */ ok( MOD_rc[0].bottom - MOD_rc[0].top == GetSystemMetrics( SM_CYMENU) - 1, "Height of owner drawn menu item is wrong. Got %d expected %d\n", MOD_rc[0].bottom - MOD_rc[0].top, GetSystemMetrics( SM_CYMENU) - 1);

1 0

Nikolay Sivov : dwrite: Use common structure to pass stream/facetype/ index data around.
by Alexandre Julliard May 4, 2016

May 4, 2016

Module: wine Branch: master Commit: 2b962761830d9e8785a13d435f70aa1204689197 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b962761830d9e8785a13d435… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 3 21:26:48 2016 +0300 dwrite: Use common structure to pass stream/facetype/index data around. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 18 ++++++--- dlls/dwrite/font.c | 24 +++++++++--- dlls/dwrite/gdiinterop.c | 18 +++++---- dlls/dwrite/opentype.c | 87 +++++++++++++++++++++----------------------- 4 files changed, 82 insertions(+), 65 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2b962761830d9e8785a13…

1 0

Nikolay Sivov : dwrite: Implement GetFontSignature().
by Alexandre Julliard May 4, 2016

May 4, 2016

Module: wine Branch: master Commit: 5dc5bb7580f114fdf15303c7652ae35bd97fe498 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5dc5bb7580f114fdf15303c76… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 3 21:26:47 2016 +0300 dwrite: Implement GetFontSignature(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/gdiinterop.c | 37 +++++++++++++++++++++++++++++++++---- dlls/dwrite/opentype.c | 23 +++++++++++++++++++++++ dlls/dwrite/tests/font.c | 5 +---- 4 files changed, 58 insertions(+), 8 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 3dc29a1..d8d578b 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -201,6 +201,7 @@ extern BOOL opentype_get_vdmx_size(const void*,INT,UINT16*,UINT16*) DECLSPEC_HID extern UINT32 opentype_get_cpal_palettecount(const void*) DECLSPEC_HIDDEN; extern UINT32 opentype_get_cpal_paletteentrycount(const void*) DECLSPEC_HIDDEN; extern HRESULT opentype_get_cpal_entries(const void*,UINT32,UINT32,UINT32,DWRITE_COLOR_F*) DECLSPEC_HIDDEN; +extern HRESULT opentype_get_font_signature(IDWriteFontFileStream*,DWRITE_FONT_FACE_TYPE,UINT32,FONTSIGNATURE*) DECLSPEC_HIDDEN; struct dwrite_colorglyph { USHORT layer; /* [0, num_layers) index indicating current layer */ diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index e14dfa8..41cddf2 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -884,19 +884,48 @@ static HRESULT WINAPI gdiinterop1_GetFontSignature_(IDWriteGdiInterop1 *iface, I FONTSIGNATURE *fontsig) { struct gdiinterop *This = impl_from_IDWriteGdiInterop1(iface); + IDWriteFontFileStream *stream; + IDWriteFontFile *file; + UINT32 count; + HRESULT hr; - FIXME("(%p)->(%p %p): stub\n", This, fontface, fontsig); + TRACE("(%p)->(%p %p)\n", This, fontface, fontsig); - return E_NOTIMPL; + memset(fontsig, 0, sizeof(*fontsig)); + + count = 1; + hr = IDWriteFontFace_GetFiles(fontface, &count, &file); + hr = get_filestream_from_file(file, &stream); + IDWriteFontFile_Release(file); + if (FAILED(hr)) + return hr; + + hr = opentype_get_font_signature(stream, IDWriteFontFace_GetType(fontface), + IDWriteFontFace_GetIndex(fontface), fontsig); + IDWriteFontFileStream_Release(stream); + return hr; } static HRESULT WINAPI gdiinterop1_GetFontSignature(IDWriteGdiInterop1 *iface, IDWriteFont *font, FONTSIGNATURE *fontsig) { struct gdiinterop *This = impl_from_IDWriteGdiInterop1(iface); + IDWriteFontFace *fontface; + HRESULT hr; - FIXME("(%p)->(%p %p): stub\n", This, font, fontsig); + TRACE("(%p)->(%p %p)\n", This, font, fontsig); - return E_NOTIMPL; + if (!font) + return E_INVALIDARG; + + memset(fontsig, 0, sizeof(*fontsig)); + + hr = IDWriteFont_CreateFontFace(font, &fontface); + if (FAILED(hr)) + return hr; + + hr = IDWriteGdiInterop1_GetFontSignature_(iface, fontface, fontsig); + IDWriteFontFace_Release(fontface); + return hr; } static HRESULT WINAPI gdiinterop1_GetMatchingFontsByLOGFONT(IDWriteGdiInterop1 *iface, LOGFONTW const *logfont, diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index cbb372c..ec8bec7 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -1869,3 +1869,26 @@ void opentype_colr_next_glyph(const void *colr, struct dwrite_colorglyph *glyph) glyph->glyph = GET_BE_WORD(layer->GID); glyph->palette_index = GET_BE_WORD(layer->paletteIndex); } + +HRESULT opentype_get_font_signature(IDWriteFontFileStream *stream, DWRITE_FONT_FACE_TYPE face_type, UINT32 face_index, + FONTSIGNATURE *fontsig) +{ + const TT_OS2_V2 *tt_os2; + void *os2_context; + HRESULT hr; + + hr = opentype_get_font_table(stream, face_type, face_index, MS_OS2_TAG, (const void**)&tt_os2, &os2_context, NULL, NULL); + if (tt_os2) { + fontsig->fsUsb[0] = GET_BE_DWORD(tt_os2->ulUnicodeRange1); + fontsig->fsUsb[1] = GET_BE_DWORD(tt_os2->ulUnicodeRange2); + fontsig->fsUsb[2] = GET_BE_DWORD(tt_os2->ulUnicodeRange3); + fontsig->fsUsb[3] = GET_BE_DWORD(tt_os2->ulUnicodeRange4); + + fontsig->fsCsb[0] = GET_BE_DWORD(tt_os2->ulCodePageRange1); + fontsig->fsCsb[1] = GET_BE_DWORD(tt_os2->ulCodePageRange2); + + IDWriteFontFileStream_ReleaseFileFragment(stream, os2_context); + } + + return hr; +} diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 299607c..0ae3251 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -6020,7 +6020,6 @@ static void test_GetFontSignature(void) ok(hr == S_OK, "got 0x%08x\n", hr); hr = IDWriteGdiInterop1_GetFontSignature(interop1, NULL, &fontsig); -todo_wine ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); hr = IDWriteFactory_GetSystemFontCollection(factory, &syscollection, FALSE); @@ -6053,10 +6052,8 @@ todo_wine IDWriteLocalizedStrings_Release(names); hr = IDWriteGdiInterop1_GetFontSignature(interop1, font, &fontsig); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); -if (hr == S_OK) { get_expected_fontsig(font, &expected_signature); ok(fontsig.fsUsb[0] == expected_signature.fsUsb[0], "%s: fsUsb[0] %#x, expected %#x\n", wine_dbgstr_w(nameW), @@ -6072,7 +6069,7 @@ if (hr == S_OK) { fontsig.fsCsb[0], expected_signature.fsCsb[0]); ok(fontsig.fsCsb[1] == expected_signature.fsCsb[1], "%s: fsCsb[1] %#x, expected %#x\n", wine_dbgstr_w(nameW), fontsig.fsCsb[1], expected_signature.fsCsb[1]); -} + IDWriteFont_Release(font); IDWriteFontFace_Release(fontface); IDWriteFontFamily_Release(family);

1 0

Sebastian Lackner : ntdll: Fix buffer allocation check in get_dir_data_space.
by Alexandre Julliard May 4, 2016

May 4, 2016

Module: wine Branch: master Commit: bb48b11508c367936be58fbbe09df891aa9d7f1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb48b11508c367936be58fbbe… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed May 4 01:37:06 2016 +0200 ntdll: Fix buffer allocation check in get_dir_data_space. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/directory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index dab657a..4a34475 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -302,7 +302,7 @@ static void *get_dir_data_space( struct dir_data *data, unsigned int size ) struct dir_data_buffer *buffer = data->buffer; void *ret; - if (!buffer || size >= buffer->size - buffer->pos) + if (!buffer || size > buffer->size - buffer->pos) { unsigned int new_size = buffer ? buffer->size * 2 : dir_data_buffer_initial_size; if (new_size < size) new_size = size;

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard May 4, 2016

May 4, 2016

Module: wine Branch: master Commit: 09de5d01c5a5eb4a361368c306e50728d435af50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09de5d01c5a5eb4a361368c30… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Tue May 3 21:27:20 2016 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/lt.po b/po/lt.po index 5418a2c..bae9657 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2016-04-06 22:14+0300\n" +"PO-Revision-Date: 2016-05-03 21:19+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -11653,7 +11653,7 @@ msgstr "reg: Nepavyko užbaigti nurodytos operacijos. Įvyko netikėta klaida.\n #: reg.rc:55 msgid "Search complete. Number of matches found: %1!d!\n" -msgstr "" +msgstr "Paieška baigta. Rasta atitikimų: %1!d!\n" #: regedit.rc:34 msgid "&Registry"

1 0

Alexandre Julliard : kernel32: Don' t cache the full directory in FindFirstFileEx.
by Alexandre Julliard May 4, 2016

May 4, 2016

Module: wine Branch: master Commit: 0a8ce1d0bd1a4fb49aaec71874be14a1ae955915 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a8ce1d0bd1a4fb49aaec7187… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 5 01:27:44 2016 +0900 kernel32: Don't cache the full directory in FindFirstFileEx. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/file.c | 70 ++++++++++++++++++---------------------------------- 1 file changed, 24 insertions(+), 46 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 2111489..cc7ead1 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -64,7 +64,7 @@ typedef struct UINT data_pos; /* current position in dir data */ UINT data_len; /* length of dir data */ UINT data_size; /* size of data buffer, or 0 when everything has been read */ - BYTE *data; /* directory data */ + BYTE data[1]; /* directory data */ } FIND_FIRST_INFO; #define FIND_FIRST_MAGIC 0xc0ffee11 @@ -1946,7 +1946,7 @@ HANDLE WINAPI FindFirstFileExW( LPCWSTR filename, FINDEX_INFO_LEVELS level, OBJECT_ATTRIBUTES attr; IO_STATUS_BLOCK io; NTSTATUS status; - DWORD device = 0; + DWORD size, device = 0; TRACE("%s %d %p %d %p %x\n", debugstr_w(filename), level, data, search_op, filter, flags); @@ -1973,12 +1973,6 @@ HANDLE WINAPI FindFirstFileExW( LPCWSTR filename, FINDEX_INFO_LEVELS level, return INVALID_HANDLE_VALUE; } - if (!(info = HeapAlloc( GetProcessHeap(), 0, sizeof(*info)))) - { - SetLastError( ERROR_NOT_ENOUGH_MEMORY ); - goto error; - } - if (!mask && (device = RtlIsDosDeviceName_U( filename ))) { static const WCHAR dotW[] = {'.',0}; @@ -2004,6 +1998,7 @@ HANDLE WINAPI FindFirstFileExW( LPCWSTR filename, FINDEX_INFO_LEVELS level, goto error; } HeapFree( GetProcessHeap(), 0, dir ); + size = 0; } else if (!mask || !*mask) { @@ -2014,6 +2009,13 @@ HANDLE WINAPI FindFirstFileExW( LPCWSTR filename, FINDEX_INFO_LEVELS level, { nt_name.Length = (mask - nt_name.Buffer) * sizeof(WCHAR); has_wildcard = strpbrkW( mask, wildcardsW ) != NULL; + size = has_wildcard ? 8192 : max_entry_size; + } + + if (!(info = HeapAlloc( GetProcessHeap(), 0, offsetof( FIND_FIRST_INFO, data[size] )))) + { + SetLastError( ERROR_NOT_ENOUGH_MEMORY ); + goto error; } /* check if path is the root of the drive, skipping the \??\ prefix */ @@ -2052,8 +2054,7 @@ HANDLE WINAPI FindFirstFileExW( LPCWSTR filename, FINDEX_INFO_LEVELS level, info->wildcard = has_wildcard; info->data_pos = 0; info->data_len = 0; - info->data_size = 0; - info->data = NULL; + info->data_size = size; info->search_op = search_op; info->level = level; @@ -2072,41 +2073,23 @@ HANDLE WINAPI FindFirstFileExW( LPCWSTR filename, FINDEX_INFO_LEVELS level, UNICODE_STRING mask_str; RtlInitUnicodeString( &mask_str, mask ); - info->data_size = has_wildcard ? 8192 : max_entry_size * 2; - - while (info->data_size) + status = NtQueryDirectoryFile( info->handle, 0, NULL, NULL, &io, info->data, info->data_size, + FileBothDirectoryInformation, FALSE, &mask_str, TRUE ); + if (status) { - if (!(info->data = HeapAlloc( GetProcessHeap(), 0, info->data_size ))) - { - FindClose( info ); - SetLastError( ERROR_NOT_ENOUGH_MEMORY ); - return INVALID_HANDLE_VALUE; - } - - status = NtQueryDirectoryFile( info->handle, 0, NULL, NULL, &io, info->data, info->data_size, - FileBothDirectoryInformation, FALSE, &mask_str, TRUE ); - if (status) - { - FindClose( info ); - SetLastError( RtlNtStatusToDosError( status ) ); - return INVALID_HANDLE_VALUE; - } - - if (io.Information < info->data_size - max_entry_size) - { - info->data_size = 0; /* we read everything */ - } - else if (info->data_size < 1024 * 1024) - { - HeapFree( GetProcessHeap(), 0, info->data ); - info->data_size *= 2; - } - else break; + FindClose( info ); + SetLastError( RtlNtStatusToDosError( status ) ); + return INVALID_HANDLE_VALUE; } info->data_len = io.Information; - if (!info->data_size && has_wildcard) /* release unused buffer space */ - HeapReAlloc( GetProcessHeap(), HEAP_REALLOC_IN_PLACE_ONLY, info->data, info->data_len ); + if (!has_wildcard || info->data_len < info->data_size - max_entry_size) + { + if (has_wildcard) /* release unused buffer space */ + HeapReAlloc( GetProcessHeap(), HEAP_REALLOC_IN_PLACE_ONLY, + info, offsetof( FIND_FIRST_INFO, data[info->data_len] )); + info->data_size = 0; /* we read everything */ + } if (!FindNextFileW( info, data )) { @@ -2118,9 +2101,7 @@ HANDLE WINAPI FindFirstFileExW( LPCWSTR filename, FINDEX_INFO_LEVELS level, if (!has_wildcard) /* we can't find two files with the same name */ { CloseHandle( info->handle ); - HeapFree( GetProcessHeap(), 0, info->data ); info->handle = 0; - info->data = NULL; } } return info; @@ -2177,9 +2158,7 @@ BOOL WINAPI FindNextFileW( HANDLE handle, WIN32_FIND_DATAW *data ) if (status == STATUS_NO_MORE_FILES) { CloseHandle( info->handle ); - HeapFree( GetProcessHeap(), 0, info->data ); info->handle = 0; - info->data = NULL; } break; } @@ -2266,7 +2245,6 @@ BOOL WINAPI FindClose( HANDLE handle ) RtlFreeUnicodeString( &info->path ); info->data_pos = 0; info->data_len = 0; - HeapFree( GetProcessHeap(), 0, info->data ); RtlLeaveCriticalSection( &info->cs ); info->cs.DebugInfo->Spare[0] = 0; RtlDeleteCriticalSection( &info->cs );

1 0