October 2011 - Wine-commits

Piotr Caban : msvcrt: Fix __pioinfo block size.
by Alexandre Julliard 06 Oct '11

06 Oct '11

Module: wine Branch: master Commit: 190c67c70e0cd3700c04d9c2c42f1389bbd2e691 URL: http://source.winehq.org/git/wine.git/?a=commit;h=190c67c70e0cd3700c04d9c2c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 6 20:13:16 2011 +0200 msvcrt: Fix __pioinfo block size. --- dlls/msvcrt/file.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index f1af1b7..ecbec34 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -69,7 +69,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); /* FIXME: this should be allocated dynamically */ #define MSVCRT_MAX_FILES 2048 -#define MSVCRT_FD_BLOCK_SIZE 64 +#define MSVCRT_FD_BLOCK_SIZE 32 /* ioinfo structure size is different in msvcrXX.dll's */ typedef struct { @@ -82,7 +82,7 @@ typedef struct { /********************************************************************* * __pioinfo (MSVCRT.@) - * array of pointers to ioinfo arrays [64] + * array of pointers to ioinfo arrays [32] */ ioinfo * MSVCRT___pioinfo[MSVCRT_MAX_FILES/MSVCRT_FD_BLOCK_SIZE] = { 0 }; @@ -229,7 +229,7 @@ static HANDLE msvcrt_fdtoh(int fd) return INVALID_HANDLE_VALUE; } if (msvcrt_get_ioinfo(fd)->handle == INVALID_HANDLE_VALUE) - FIXME("returning INVALID_HANDLE_VALUE for %d\n", fd); + WARN("returning INVALID_HANDLE_VALUE for %d\n", fd); return msvcrt_get_ioinfo(fd)->handle; }

1 0

Piotr Caban : msvcrt: Free fd entries with incorrect HANDLE value.
by Alexandre Julliard 06 Oct '11

06 Oct '11

Module: wine Branch: master Commit: c867f3324ec6fd1330c8b3228bc5db79f0b4833c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c867f3324ec6fd1330c8b3228… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 6 20:13:38 2011 +0200 msvcrt: Free fd entries with incorrect HANDLE value. --- dlls/msvcrt/file.c | 17 +++++++---------- 1 files changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index ecbec34..90e0d80 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -797,18 +797,15 @@ int CDECL MSVCRT__close(int fd) LOCK_FILES(); hand = msvcrt_fdtoh(fd); TRACE(":fd (%d) handle (%p)\n",fd,hand); - if (hand == INVALID_HANDLE_VALUE) - ret = -1; - else if (!CloseHandle(hand)) - { - WARN(":failed-last error (%d)\n",GetLastError()); - msvcrt_set_errno(GetLastError()); + if (!msvcrt_is_valid_fd(fd)) { ret = -1; - } - else - { + } else { msvcrt_free_fd(fd); - ret = 0; + ret = CloseHandle(hand) ? 0 : -1; + if (ret) { + WARN(":failed-last error (%d)\n",GetLastError()); + msvcrt_set_errno(GetLastError()); + } } UNLOCK_FILES(); TRACE(":ok\n");

1 0

Piotr Caban : msvcrt: Added _iswdigit_l implementation.
by Alexandre Julliard 06 Oct '11

06 Oct '11

Module: wine Branch: master Commit: 45b4b4205a2b1967726685242e3244c55cef5fc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45b4b4205a2b1967726685242… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 6 20:14:23 2011 +0200 msvcrt: Added _iswdigit_l implementation. --- dlls/msvcr100/msvcr100.spec | 4 ++-- dlls/msvcr80/msvcr80.spec | 4 ++-- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 8 ++++++++ 5 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 9d0382f..59b1ac8 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -824,7 +824,7 @@ @ stub _iswcsym_l @ stub _iswcsymf_l @ stub _iswctype_l -@ stub _iswdigit_l +@ cdecl _iswdigit_l(long ptr) msvcrt._iswdigit_l @ stub _iswgraph_l @ stub _iswlower_l @ stub _iswprint_l @@ -1267,7 +1267,7 @@ @ cdecl _vswprintf_c(ptr long wstr ptr) msvcrt._vswprintf_c @ cdecl _vswprintf_c_l(ptr long wstr ptr ptr) msvcrt._vswprintf_c_l @ cdecl _vswprintf_l(ptr wstr ptr ptr) msvcrt._vswprintf_l -@ cdecl _vswprintf_p(ptr long wstr ptr) msvcrt._vswprintf +@ cdecl _vswprintf_p(ptr long wstr ptr) msvcr90._vswprintf_p @ cdecl _vswprintf_p_l(ptr long wstr ptr ptr) msvcrt._vswprintf_p_l @ cdecl _vswprintf_s_l(ptr long wstr ptr ptr) msvcrt._vswprintf_s_l @ stub _vwprintf_l diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index d3ebef5..c9e55d6 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -670,7 +670,7 @@ @ stub _iswcsym_l @ stub _iswcsymf_l @ stub _iswctype_l -@ stub _iswdigit_l +@ cdecl _iswdigit_l(long ptr) msvcrt._iswdigit_l @ stub _iswgraph_l @ stub _iswlower_l @ stub _iswprint_l @@ -1120,7 +1120,7 @@ @ cdecl _vswprintf_c(ptr long wstr ptr) msvcrt._vswprintf_c @ cdecl _vswprintf_c_l(ptr long wstr ptr ptr) msvcrt._vswprintf_c_l @ cdecl _vswprintf_l(ptr wstr ptr ptr) msvcrt._vswprintf_l -@ cdecl _vswprintf_p(ptr long wstr ptr) msvcrt._vswprintf +@ cdecl _vswprintf_p(ptr long wstr ptr) msvcr90._vswprintf_p @ cdecl _vswprintf_p_l(ptr long wstr ptr ptr) msvcrt._vswprintf_p_l @ cdecl _vswprintf_s_l(ptr long wstr ptr ptr) msvcrt._vswprintf_s_l @ stub _vwprintf_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index c93efdd..42b3b9f 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -658,7 +658,7 @@ @ stub _iswcsym_l @ stub _iswcsymf_l @ stub _iswctype_l -@ stub _iswdigit_l +@ cdecl _iswdigit_l(long ptr) msvcrt._iswdigit_l @ stub _iswgraph_l @ stub _iswlower_l @ stub _iswprint_l diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index b293e5e..fe07099 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -607,7 +607,7 @@ @ cdecl _iswalpha_l(long ptr) MSVCRT__iswalpha_l # stub _iswcntrl_l(long ptr) # stub _iswctype_l(long long ptr) -# stub _iswdigit_l(long ptr) +@ cdecl _iswdigit_l(long ptr) MSVCRT__iswdigit_l # stub _iswgraph_l(long ptr) # stub _iswlower_l(long ptr) # stub _iswprint_l(long ptr) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index ed0536a..1a685de 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1111,6 +1111,14 @@ INT CDECL MSVCRT_iswdigit( MSVCRT_wchar_t wc ) } /********************************************************************* + * _iswdigit_l (MSVCRT.@) + */ +INT CDECL MSVCRT__iswdigit_l( MSVCRT_wchar_t wc, MSVCRT__locale_t locale ) +{ + return isdigitW( wc ); +} + +/********************************************************************* * iswgraph (MSVCRT.@) */ INT CDECL MSVCRT_iswgraph( MSVCRT_wchar_t wc )

1 0

Louis Lenders : gdiplus: Return zero properties in stubbed GdipGetPropertyCount.
by Alexandre Julliard 06 Oct '11

06 Oct '11

Module: wine Branch: master Commit: 8435e40874f4ece88ead85ece760b92d5065f673 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8435e40874f4ece88ead85ece… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Thu Oct 6 20:45:26 2011 +0200 gdiplus: Return zero properties in stubbed GdipGetPropertyCount. --- dlls/gdiplus/image.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index ce14ef6..0e3848f 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -2399,7 +2399,8 @@ GpStatus WINGDIPAPI GdipGetPropertyCount(GpImage *image, UINT* num) if(!(calls++)) FIXME("not implemented\n"); - return InvalidParameter; + *num = 0; + return Ok; } GpStatus WINGDIPAPI GdipGetPropertyIdList(GpImage *image, UINT num, PROPID* list)

1 0

Damjan Jovanovic : windowscodecs: Read PNGs sequentially.
by Alexandre Julliard 06 Oct '11

06 Oct '11

Module: wine Branch: master Commit: ea35386b2b11f4f74f8dfbae5f614ee49689e6af URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea35386b2b11f4f74f8dfbae5… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue Oct 4 16:44:46 2011 +0200 windowscodecs: Read PNGs sequentially. --- dlls/windowscodecs/pngformat.c | 185 +++++++++++++++++++--------------------- 1 files changed, 87 insertions(+), 98 deletions(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index f5f6fdb..b3d92fd 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -56,11 +56,8 @@ MAKE_FUNCPTR(png_get_image_height); MAKE_FUNCPTR(png_get_image_width); MAKE_FUNCPTR(png_get_io_ptr); MAKE_FUNCPTR(png_get_pHYs); -MAKE_FUNCPTR(png_get_progressive_ptr); MAKE_FUNCPTR(png_get_PLTE); MAKE_FUNCPTR(png_get_tRNS); -MAKE_FUNCPTR(png_process_data); -MAKE_FUNCPTR(png_progressive_combine_row); MAKE_FUNCPTR(png_set_bgr); MAKE_FUNCPTR(png_set_error_fn); #if HAVE_PNG_SET_EXPAND_GRAY_1_2_4_TO_8 @@ -72,7 +69,6 @@ MAKE_FUNCPTR(png_set_filler); MAKE_FUNCPTR(png_set_gray_to_rgb); MAKE_FUNCPTR(png_set_IHDR); MAKE_FUNCPTR(png_set_pHYs); -MAKE_FUNCPTR(png_set_progressive_read_fn); MAKE_FUNCPTR(png_set_read_fn); MAKE_FUNCPTR(png_set_strip_16); MAKE_FUNCPTR(png_set_tRNS_to_alpha); @@ -80,7 +76,6 @@ MAKE_FUNCPTR(png_set_write_fn); MAKE_FUNCPTR(png_read_end); MAKE_FUNCPTR(png_read_image); MAKE_FUNCPTR(png_read_info); -MAKE_FUNCPTR(png_read_update_info); MAKE_FUNCPTR(png_write_end); MAKE_FUNCPTR(png_write_info); MAKE_FUNCPTR(png_write_rows); @@ -108,11 +103,8 @@ static void *load_libpng(void) LOAD_FUNCPTR(png_get_image_width); LOAD_FUNCPTR(png_get_io_ptr); LOAD_FUNCPTR(png_get_pHYs); - LOAD_FUNCPTR(png_get_progressive_ptr); LOAD_FUNCPTR(png_get_PLTE); LOAD_FUNCPTR(png_get_tRNS); - LOAD_FUNCPTR(png_process_data); - LOAD_FUNCPTR(png_progressive_combine_row); LOAD_FUNCPTR(png_set_bgr); LOAD_FUNCPTR(png_set_error_fn); #if HAVE_PNG_SET_EXPAND_GRAY_1_2_4_TO_8 @@ -124,7 +116,6 @@ static void *load_libpng(void) LOAD_FUNCPTR(png_set_gray_to_rgb); LOAD_FUNCPTR(png_set_IHDR); LOAD_FUNCPTR(png_set_pHYs); - LOAD_FUNCPTR(png_set_progressive_read_fn); LOAD_FUNCPTR(png_set_read_fn); LOAD_FUNCPTR(png_set_strip_16); LOAD_FUNCPTR(png_set_tRNS_to_alpha); @@ -132,7 +123,6 @@ static void *load_libpng(void) LOAD_FUNCPTR(png_read_end); LOAD_FUNCPTR(png_read_image); LOAD_FUNCPTR(png_read_info); - LOAD_FUNCPTR(png_read_update_info); LOAD_FUNCPTR(png_write_end); LOAD_FUNCPTR(png_write_info); LOAD_FUNCPTR(png_write_rows); @@ -165,6 +155,7 @@ typedef struct { LONG ref; png_structp png_ptr; png_infop info_ptr; + png_infop end_info; BOOL initialized; int bpp; int width, height; @@ -228,7 +219,7 @@ static ULONG WINAPI PngDecoder_Release(IWICBitmapDecoder *iface) if (ref == 0) { if (This->png_ptr) - ppng_destroy_read_struct(&This->png_ptr, &This->info_ptr, NULL); + ppng_destroy_read_struct(&This->png_ptr, &This->info_ptr, &This->end_info); This->lock.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->lock); HeapFree(GetProcessHeap(), 0, This->image_bits); @@ -245,18 +236,86 @@ static HRESULT WINAPI PngDecoder_QueryCapability(IWICBitmapDecoder *iface, IStre return E_NOTIMPL; } -static void info_callback(png_structp png_ptr, png_infop info) +static void user_read_data(png_structp png_ptr, png_bytep data, png_size_t length) { + IStream *stream = ppng_get_io_ptr(png_ptr); + HRESULT hr; + ULONG bytesread; + + hr = IStream_Read(stream, data, length, &bytesread); + if (FAILED(hr) || bytesread != length) + { + ppng_error(png_ptr, "failed reading data"); + } +} + +static HRESULT WINAPI PngDecoder_Initialize(IWICBitmapDecoder *iface, IStream *pIStream, + WICDecodeOptions cacheOptions) +{ + PngDecoder *This = impl_from_IWICBitmapDecoder(iface); + LARGE_INTEGER seek; + HRESULT hr=S_OK; + png_bytep *row_pointers=NULL; + UINT image_size; + UINT i; int color_type, bit_depth; png_bytep trans; int num_trans; png_uint_32 transparency; png_color_16p trans_values; - UINT image_size; - HRESULT hr = S_OK; - PngDecoder *This; + jmp_buf jmpbuf; + + TRACE("(%p,%p,%x)\n", iface, pIStream, cacheOptions); + + EnterCriticalSection(&This->lock); + + /* initialize libpng */ + This->png_ptr = ppng_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); + if (!This->png_ptr) + { + hr = E_FAIL; + goto end; + } - This = (PngDecoder*) ppng_get_progressive_ptr(png_ptr); + This->info_ptr = ppng_create_info_struct(This->png_ptr); + if (!This->info_ptr) + { + ppng_destroy_read_struct(&This->png_ptr, NULL, NULL); + This->png_ptr = NULL; + hr = E_FAIL; + goto end; + } + + This->end_info = ppng_create_info_struct(This->png_ptr); + if (!This->info_ptr) + { + ppng_destroy_read_struct(&This->png_ptr, &This->info_ptr, NULL); + This->png_ptr = NULL; + hr = E_FAIL; + goto end; + } + + /* set up setjmp/longjmp error handling */ + if (setjmp(jmpbuf)) + { + ppng_destroy_read_struct(&This->png_ptr, &This->info_ptr, &This->end_info); + HeapFree(GetProcessHeap(), 0, row_pointers); + This->png_ptr = NULL; + hr = E_FAIL; + goto end; + } + ppng_set_error_fn(This->png_ptr, &jmpbuf, user_error_fn, user_warning_fn); + + /* seek to the start of the stream */ + seek.QuadPart = 0; + hr = IStream_Seek(pIStream, seek, STREAM_SEEK_SET, NULL); + if (FAILED(hr)) goto end; + + /* set up custom i/o handling */ + ppng_set_read_fn(This->png_ptr, pIStream, user_read_data); + + /* read the header */ + ppng_read_info(This->png_ptr, This->info_ptr); /* choose a pixel format */ color_type = ppng_get_color_type(This->png_ptr, This->info_ptr); @@ -355,6 +414,7 @@ static void info_callback(png_structp png_ptr, png_infop info) goto end; } + /* read the image data */ This->width = ppng_get_image_width(This->png_ptr, This->info_ptr); This->height = ppng_get_image_height(This->png_ptr, This->info_ptr); This->stride = This->width * This->bpp; @@ -367,96 +427,24 @@ static void info_callback(png_structp png_ptr, png_infop info) goto end; } - ppng_read_update_info(This->png_ptr, This->info_ptr); - This->initialized = TRUE; - -end: - if (FAILED(hr)) - ERR("PNG info parsing failed, hr=0x%08X\n", hr); -} - -static void row_callback(png_structp png_ptr, png_bytep new_row, - png_uint_32 row_num, int pass) -{ - png_bytep old_row; - PngDecoder *This; - - This = (PngDecoder*) ppng_get_progressive_ptr(png_ptr); - if (!This->initialized) - return; - - old_row = ((png_bytep)This->image_bits) + row_num*This->stride; - ppng_progressive_combine_row(png_ptr, old_row, new_row); -} - -static void end_callback(png_structp png_ptr, png_infop info) -{ -} - -static HRESULT WINAPI PngDecoder_Initialize(IWICBitmapDecoder *iface, IStream *pIStream, - WICDecodeOptions cacheOptions) -{ - PngDecoder *This = impl_from_IWICBitmapDecoder(iface); - LARGE_INTEGER seek; - HRESULT hr=S_OK; - png_bytep *row_pointers=NULL; - jmp_buf jmpbuf; - BYTE buffer[8096]; - ULONG bytesRead = 0; - - TRACE("(%p,%p,%x)\n", iface, pIStream, cacheOptions); - - EnterCriticalSection(&This->lock); - - /* initialize libpng */ - This->png_ptr = ppng_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); - if (!This->png_ptr) + row_pointers = HeapAlloc(GetProcessHeap(), 0, sizeof(png_bytep)*This->height); + if (!row_pointers) { - hr = E_FAIL; + hr = E_OUTOFMEMORY; goto end; } - This->info_ptr = ppng_create_info_struct(This->png_ptr); - if (!This->info_ptr) - { - ppng_destroy_read_struct(&This->png_ptr, NULL, NULL); - This->png_ptr = NULL; - hr = E_FAIL; - goto end; - } + for (i=0; i<This->height; i++) + row_pointers[i] = This->image_bits + i * This->stride; - /* set up setjmp/longjmp error handling */ - if (setjmp(jmpbuf)) - { - ppng_destroy_read_struct(&This->png_ptr, &This->info_ptr, NULL); - HeapFree(GetProcessHeap(), 0, row_pointers); - This->png_ptr = NULL; - hr = E_FAIL; - goto end; - } - ppng_set_error_fn(This->png_ptr, &jmpbuf, user_error_fn, user_warning_fn); + ppng_read_image(This->png_ptr, row_pointers); - /* seek to the start of the stream */ - seek.QuadPart = 0; - hr = IStream_Seek(pIStream, seek, STREAM_SEEK_SET, NULL); - if (FAILED(hr)) goto end; + HeapFree(GetProcessHeap(), 0, row_pointers); + row_pointers = NULL; - /* set up progressive loading */ - ppng_set_progressive_read_fn(This->png_ptr, (void*)This, - info_callback, row_callback, end_callback); + ppng_read_end(This->png_ptr, This->end_info); - do - { - hr = IStream_Read(pIStream, buffer, sizeof(buffer), &bytesRead); - if (SUCCEEDED(hr)) - ppng_process_data(This->png_ptr, This->info_ptr, buffer, bytesRead); - } while (bytesRead == sizeof(buffer)); - if (hr == S_FALSE) - hr = S_OK; - if (FAILED(hr)) - ERR("reading PNG file failed, error 0x%08X\n", hr); - if (!This->initialized) - hr = E_FAIL; + This->initialized = TRUE; end: @@ -780,6 +768,7 @@ HRESULT PngDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) This->ref = 1; This->png_ptr = NULL; This->info_ptr = NULL; + This->end_info = NULL; This->initialized = FALSE; This->image_bits = NULL; InitializeCriticalSection(&This->lock);

1 0

Frédéric Delanoy : cmd: Infer handle type from handle value in WCMD_fgets and WCMD_ReadAndParseLine .
by Alexandre Julliard 06 Oct '11

06 Oct '11

Module: wine Branch: master Commit: 5e3cb1867b8a78a29ba62a306ba9f2ed5d572be4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e3cb1867b8a78a29ba62a306… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Oct 6 18:50:31 2011 +0200 cmd: Infer handle type from handle value in WCMD_fgets and WCMD_ReadAndParseLine. --- programs/cmd/batch.c | 6 +++--- programs/cmd/builtins.c | 4 ++-- programs/cmd/wcmd.h | 9 ++++++--- programs/cmd/wcmdmain.c | 23 +++++++---------------- 4 files changed, 18 insertions(+), 24 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index 77a49c9..79bb009 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -89,7 +89,7 @@ void WCMD_batch (WCHAR *file, WCHAR *command, int called, WCHAR *startLabel, HAN while (context -> skip_rest == FALSE) { CMD_LIST *toExecute = NULL; /* Commands left to be executed */ - if (!WCMD_ReadAndParseLine(NULL, &toExecute, h, FALSE)) + if (!WCMD_ReadAndParseLine(NULL, &toExecute, h)) break; WCMD_process_commands(toExecute, FALSE, NULL, NULL); WCMD_free_commands(toExecute); @@ -186,7 +186,7 @@ WCHAR *WCMD_parameter (WCHAR *s, int n, WCHAR **where, WCHAR **end) { * NULL on error or EOF */ -WCHAR *WCMD_fgets(WCHAR *buf, int noChars, HANDLE h, const BOOL is_console_handle) +WCHAR *WCMD_fgets(WCHAR *buf, int noChars, HANDLE h) { DWORD bytes, charsRead; BOOL status; @@ -196,7 +196,7 @@ WCHAR *WCMD_fgets(WCHAR *buf, int noChars, HANDLE h, const BOOL is_console_handl between DOS and Unix. Also need to lose the LF (or CRLF) from the line. */ p = buf; - if (is_console_handle) { + if (WCMD_is_console_handle(h)) { status = ReadConsoleW(h, buf, noChars, &charsRead, NULL); if (!status) return NULL; if (buf[charsRead-2] == '\r') diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index d9eae31..6b4d0ab 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1133,7 +1133,7 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { WCHAR buffer[MAXSTRING] = {'\0'}; WCHAR *where, *parm; - while (WCMD_fgets(buffer, sizeof(buffer)/sizeof(WCHAR), input, FALSE)) { + while (WCMD_fgets(buffer, sizeof(buffer)/sizeof(WCHAR), input)) { /* Skip blank lines*/ parm = WCMD_parameter (buffer, 0, &where, NULL); @@ -1393,7 +1393,7 @@ void WCMD_goto (CMD_LIST **cmdList) { if (*paramStart == ':') paramStart++; SetFilePointer (context -> h, 0, NULL, FILE_BEGIN); - while (WCMD_fgets (string, sizeof(string)/sizeof(WCHAR), context -> h, FALSE)) { + while (WCMD_fgets (string, sizeof(string)/sizeof(WCHAR), context -> h)) { str = string; while (isspaceW (*str)) str++; if (*str == ':') { diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index af75a5d..61cef8f 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -97,7 +97,11 @@ void WCMD_verify (const WCHAR *command); void WCMD_version (void); int WCMD_volume (BOOL set_label, const WCHAR *command); -WCHAR *WCMD_fgets (WCHAR *buf, int n, HANDLE stream, const BOOL is_console_handle); +static inline BOOL WCMD_is_console_handle(HANDLE h) +{ + return (((DWORD_PTR)h) & 3) == 3; +} +WCHAR *WCMD_fgets (WCHAR *buf, int n, HANDLE stream); WCHAR *WCMD_parameter (WCHAR *s, int n, WCHAR **where, WCHAR **end); WCHAR *WCMD_skip_leading_spaces (WCHAR *string); BOOL WCMD_keyword_ws_found(const WCHAR *keyword, int len, const WCHAR *ptr); @@ -110,8 +114,7 @@ WCHAR *WCMD_strdupW(const WCHAR *input); void WCMD_strsubstW(WCHAR *start, const WCHAR* next, const WCHAR* insert, int len); BOOL WCMD_ReadFile(const HANDLE hIn, WCHAR *intoBuf, const DWORD maxChars, LPDWORD charsRead); -WCHAR *WCMD_ReadAndParseLine(const WCHAR *initialcmd, CMD_LIST **output, - HANDLE readFrom, const BOOL is_console_handle); +WCHAR *WCMD_ReadAndParseLine(const WCHAR *initialcmd, CMD_LIST **output, HANDLE readFrom); CMD_LIST *WCMD_process_commands(CMD_LIST *thisCmd, BOOL oneBracket, const WCHAR *var, const WCHAR *val); void WCMD_free_commands(CMD_LIST *cmds); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 5611642..a4726e8 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -233,11 +233,6 @@ void WCMD_leave_paged_mode(void) pagedMessage = NULL; } -static inline BOOL is_console_handle(HANDLE h) -{ - return (((DWORD_PTR)h) & 3) == 3; -} - /*************************************************************************** * WCMD_Readfile * @@ -248,7 +243,7 @@ BOOL WCMD_ReadFile(const HANDLE hIn, WCHAR *intoBuf, const DWORD maxChars, LPDWO DWORD numRead; char *buffer; - if (is_console_handle(hIn)) + if (WCMD_is_console_handle(hIn)) /* Try to read from console as Unicode */ return ReadConsoleW(hIn, intoBuf, maxChars, charsRead, NULL); @@ -1781,8 +1776,7 @@ static BOOL WCMD_IsEndQuote(const WCHAR *quote, int quoteIndex) * - Anything else gets put into the command string (including * redirects) */ -WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, - HANDLE readFrom, const BOOL is_console_handle) +WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE readFrom) { WCHAR *curPos; int inQuotes = 0; @@ -1827,7 +1821,7 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, } else if (readFrom == INVALID_HANDLE_VALUE) { WINE_FIXME("No command nor handle supplied\n"); } else { - if (!WCMD_fgets(extraSpace, MAXSTRING, readFrom, is_console_handle)) + if (!WCMD_fgets(extraSpace, MAXSTRING, readFrom)) return NULL; } curPos = extraSpace; @@ -2188,7 +2182,7 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, /* Read more, skipping any blank lines */ while (*extraSpace == 0x00) { if (!context) WCMD_output_asis( WCMD_LoadMessage(WCMD_MOREPROMPT)); - if (!WCMD_fgets(extraSpace, MAXSTRING, readFrom, is_console_handle)) + if (!WCMD_fgets(extraSpace, MAXSTRING, readFrom)) break; } curPos = extraSpace; @@ -2280,8 +2274,6 @@ int wmain (int argc, WCHAR *argvW[]) WCHAR string[1024]; WCHAR envvar[4]; int opt_q; - BOOL is_console; - DWORD dummy; int opt_t = 0; static const WCHAR promptW[] = {'P','R','O','M','P','T','\0'}; static const WCHAR defaultpromptW[] = {'$','P','$','G','\0'}; @@ -2497,7 +2489,7 @@ int wmain (int argc, WCHAR *argvW[]) */ /* Parse the command string, without reading any more input */ - WCMD_ReadAndParseLine(cmd, &toExecute, INVALID_HANDLE_VALUE, FALSE); + WCMD_ReadAndParseLine(cmd, &toExecute, INVALID_HANDLE_VALUE); WCMD_process_commands(toExecute, FALSE, NULL, NULL); WCMD_free_commands(toExecute); toExecute = NULL; @@ -2593,7 +2585,7 @@ int wmain (int argc, WCHAR *argvW[]) if (opt_k) { /* Parse the command string, without reading any more input */ - WCMD_ReadAndParseLine(cmd, &toExecute, INVALID_HANDLE_VALUE, FALSE); + WCMD_ReadAndParseLine(cmd, &toExecute, INVALID_HANDLE_VALUE); WCMD_process_commands(toExecute, FALSE, NULL, NULL); WCMD_free_commands(toExecute); toExecute = NULL; @@ -2606,13 +2598,12 @@ int wmain (int argc, WCHAR *argvW[]) SetEnvironmentVariableW(promptW, defaultpromptW); WCMD_version (); - is_console = !!GetConsoleMode(GetStdHandle(STD_INPUT_HANDLE), &dummy); while (TRUE) { /* Read until EOF (which for std input is never, but if redirect in place, may occur */ if (echo_mode) WCMD_show_prompt(); - if (!WCMD_ReadAndParseLine(NULL, &toExecute, GetStdHandle(STD_INPUT_HANDLE), is_console)) + if (!WCMD_ReadAndParseLine(NULL, &toExecute, GetStdHandle(STD_INPUT_HANDLE))) break; WCMD_process_commands(toExecute, FALSE, NULL, NULL); WCMD_free_commands(toExecute);

1 0

Frédéric Delanoy : cmd: Avoid reading char by char from files.
by Alexandre Julliard 06 Oct '11

06 Oct '11

Module: wine Branch: master Commit: cd30c52b35e7e8884e9b66b6d5cd9822412f9a33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd30c52b35e7e8884e9b66b6d… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Oct 6 18:50:32 2011 +0200 cmd: Avoid reading char by char from files. --- programs/cmd/batch.c | 54 ++++++++++++++++++++++++++----------------------- 1 files changed, 29 insertions(+), 25 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index 79bb009..a276d3e 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -188,38 +188,42 @@ WCHAR *WCMD_parameter (WCHAR *s, int n, WCHAR **where, WCHAR **end) { WCHAR *WCMD_fgets(WCHAR *buf, int noChars, HANDLE h) { - DWORD bytes, charsRead; + DWORD charsRead; BOOL status; - WCHAR *p; + LARGE_INTEGER filepos; + int i; /* We can't use the native f* functions because of the filename syntax differences between DOS and Unix. Also need to lose the LF (or CRLF) from the line. */ - p = buf; - if (WCMD_is_console_handle(h)) { - status = ReadConsoleW(h, buf, noChars, &charsRead, NULL); - if (!status) return NULL; - if (buf[charsRead-2] == '\r') - buf[charsRead-2] = '\0'; /* Strip \r\n */ - else { - /* Truncate */ - buf[noChars-1] = '\0'; - } - return p; + if (!WCMD_is_console_handle(h)) { + /* Save current file position */ + filepos.QuadPart = 0; + SetFilePointerEx(h, filepos, &filepos, FILE_CURRENT); } - /* TODO: More intelligent buffering for reading lines from files */ - do { - status = WCMD_ReadFile(h, buf, 1, &bytes); - if ((status == 0) || ((bytes == 0) && (buf == p))) return NULL; - if (*buf == '\n') bytes = 0; - else if (*buf != '\r') { - buf++; - noChars--; - } - *buf = '\0'; - } while ((bytes == 1) && (noChars > 1)); - return p; + status = WCMD_ReadFile(h, buf, noChars, &charsRead); + if (!status || charsRead == 0) return NULL; + + /* Find first EOL */ + for (i = 0; i < charsRead; i++) { + if (buf[i] == '\n' || buf[i] == '\r') + break; + } + + if (!WCMD_is_console_handle(h) && i != charsRead) { + /* Sets file pointer to the start of the next line, if any */ + filepos.QuadPart += i + 1 + (buf[i] == '\r' ? 1 : 0); + SetFilePointerEx(h, filepos, NULL, FILE_BEGIN); + } + + /* Truncate at EOL (or end of buffer) */ + if (i == noChars) + i--; + + buf[i] = '\0'; + + return buf; } /* WCMD_splitpath - copied from winefile as no obvious way to use it otherwise */

1 0

Nikolay Sivov : oleaut32/typelib: Properly handle allocation failure on creation.
by Alexandre Julliard 06 Oct '11

06 Oct '11

Module: wine Branch: master Commit: c71637b69272b215cecf3a7aa5c6536f3d3c51c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c71637b69272b215cecf3a7aa… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 6 13:51:01 2011 -0500 oleaut32/typelib: Properly handle allocation failure on creation. --- dlls/oleaut32/typelib2.c | 53 ++++++++++++++++++++++++++-------------------- 1 files changed, 30 insertions(+), 23 deletions(-) diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index a7d43df..f3f424a 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -5218,49 +5218,56 @@ static const ITypeLib2Vtbl typelib2vt = static ICreateTypeLib2 *ICreateTypeLib2_Constructor(SYSKIND syskind, LPCOLESTR szFile) { - ICreateTypeLib2Impl *pCreateTypeLib2Impl; + ICreateTypeLib2Impl *create_tlib2; int failed = 0; TRACE("Constructing ICreateTypeLib2 (%d, %s)\n", syskind, debugstr_w(szFile)); - pCreateTypeLib2Impl = heap_alloc_zero(sizeof(ICreateTypeLib2Impl)); - if (!pCreateTypeLib2Impl) return NULL; + create_tlib2 = heap_alloc_zero(sizeof(ICreateTypeLib2Impl)); + if (!create_tlib2) return NULL; - pCreateTypeLib2Impl->filename = heap_alloc((strlenW(szFile) + 1) * sizeof(WCHAR)); - if (!pCreateTypeLib2Impl->filename) { - heap_free(pCreateTypeLib2Impl); + create_tlib2->filename = heap_alloc((strlenW(szFile) + 1) * sizeof(WCHAR)); + if (!create_tlib2->filename) { + heap_free(create_tlib2); return NULL; } - strcpyW(pCreateTypeLib2Impl->filename, szFile); + strcpyW(create_tlib2->filename, szFile); - ctl2_init_header(pCreateTypeLib2Impl); - ctl2_init_segdir(pCreateTypeLib2Impl); + ctl2_init_header(create_tlib2); + ctl2_init_segdir(create_tlib2); - pCreateTypeLib2Impl->typelib_header.varflags |= syskind; + create_tlib2->typelib_header.varflags |= syskind; /* * The following two calls return an offset or -1 if out of memory. We * specifically need an offset of 0, however, so... */ - if (ctl2_alloc_segment(pCreateTypeLib2Impl, MSFT_SEG_GUIDHASH, 0x80, 0x80)) { failed = 1; } - if (ctl2_alloc_segment(pCreateTypeLib2Impl, MSFT_SEG_NAMEHASH, 0x200, 0x200)) { failed = 1; } - - pCreateTypeLib2Impl->typelib_guidhash_segment = (int *)pCreateTypeLib2Impl->typelib_segment_data[MSFT_SEG_GUIDHASH]; - pCreateTypeLib2Impl->typelib_namehash_segment = (int *)pCreateTypeLib2Impl->typelib_segment_data[MSFT_SEG_NAMEHASH]; + if (ctl2_alloc_segment(create_tlib2, MSFT_SEG_GUIDHASH, 0x80, 0x80) == 0) + { + create_tlib2->typelib_guidhash_segment = (int *)create_tlib2->typelib_segment_data[MSFT_SEG_GUIDHASH]; + memset(create_tlib2->typelib_guidhash_segment, 0xff, 0x80); + } + else + failed = 1; - memset(pCreateTypeLib2Impl->typelib_guidhash_segment, 0xff, 0x80); - memset(pCreateTypeLib2Impl->typelib_namehash_segment, 0xff, 0x200); + if (ctl2_alloc_segment(create_tlib2, MSFT_SEG_NAMEHASH, 0x200, 0x200) == 0) + { + create_tlib2->typelib_namehash_segment = (int *)create_tlib2->typelib_segment_data[MSFT_SEG_NAMEHASH]; + memset(create_tlib2->typelib_namehash_segment, 0xff, 0x200); + } + else + failed = 1; - pCreateTypeLib2Impl->ICreateTypeLib2_iface.lpVtbl = &ctypelib2vt; - pCreateTypeLib2Impl->ITypeLib2_iface.lpVtbl = &typelib2vt; - pCreateTypeLib2Impl->ref = 1; + create_tlib2->ICreateTypeLib2_iface.lpVtbl = &ctypelib2vt; + create_tlib2->ITypeLib2_iface.lpVtbl = &typelib2vt; + create_tlib2->ref = 1; if (failed) { - ICreateTypeLib2_fnRelease(&pCreateTypeLib2Impl->ICreateTypeLib2_iface); - return 0; + ICreateTypeLib2_fnRelease(&create_tlib2->ICreateTypeLib2_iface); + return NULL; } - return &pCreateTypeLib2Impl->ICreateTypeLib2_iface; + return &create_tlib2->ICreateTypeLib2_iface; } /******************************************************************************

1 0

Nikolay Sivov : oleaut32/typelib: Use BSTR for filename.
by Alexandre Julliard 06 Oct '11

06 Oct '11

Module: wine Branch: master Commit: 8899c2e59aecf824d8b3fbbdc0a5464e2485508b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8899c2e59aecf824d8b3fbbdc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 6 13:55:47 2011 -0500 oleaut32/typelib: Use BSTR for filename. --- dlls/oleaut32/typelib2.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index f3f424a..d761491 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -167,7 +167,7 @@ typedef struct tagICreateTypeLib2Impl ITypeLib2 ITypeLib2_iface; LONG ref; - WCHAR *filename; + BSTR filename; MSFT_Header typelib_header; INT helpStringDll; @@ -4329,7 +4329,7 @@ static ULONG WINAPI ICreateTypeLib2_fnRelease(ICreateTypeLib2 *iface) This->typelib_segment_data[i] = NULL; } - heap_free(This->filename); + SysFreeString(This->filename); This->filename = NULL; while (This->typeinfos) { @@ -5216,22 +5216,21 @@ static const ITypeLib2Vtbl typelib2vt = ITypeLib2_fnGetAllCustData, }; -static ICreateTypeLib2 *ICreateTypeLib2_Constructor(SYSKIND syskind, LPCOLESTR szFile) +static ICreateTypeLib2 *ICreateTypeLib2_Constructor(SYSKIND syskind, LPCOLESTR filename) { ICreateTypeLib2Impl *create_tlib2; int failed = 0; - TRACE("Constructing ICreateTypeLib2 (%d, %s)\n", syskind, debugstr_w(szFile)); + TRACE("Constructing ICreateTypeLib2 (%d, %s)\n", syskind, debugstr_w(filename)); create_tlib2 = heap_alloc_zero(sizeof(ICreateTypeLib2Impl)); if (!create_tlib2) return NULL; - create_tlib2->filename = heap_alloc((strlenW(szFile) + 1) * sizeof(WCHAR)); + create_tlib2->filename = SysAllocString(filename); if (!create_tlib2->filename) { heap_free(create_tlib2); return NULL; } - strcpyW(create_tlib2->filename, szFile); ctl2_init_header(create_tlib2); ctl2_init_segdir(create_tlib2);

1 0

Huw Davies : gdi32: Keep track of the english family name if there' s a localised name as well.
by Alexandre Julliard 06 Oct '11

06 Oct '11

Module: wine Branch: master Commit: ab1373d84710350d73131c993afdc08acbab5bdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab1373d84710350d73131c993… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Oct 6 16:26:04 2011 -0500 gdi32: Keep track of the english family name if there's a localised name as well. --- dlls/gdi32/freetype.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 81c704b..ae8ca41 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -282,6 +282,7 @@ typedef struct tagFace { typedef struct tagFamily { struct list entry; const WCHAR *FamilyName; + const WCHAR *EnglishName; struct list faces; } Family; @@ -1378,6 +1379,7 @@ static INT AddFontToList(const char *file, void *font_data_ptr, DWORD font_data_ if(!family) { family = HeapAlloc(GetProcessHeap(), 0, sizeof(*family)); family->FamilyName = strdupW(localised_family ? localised_family : english_family); + family->EnglishName = localised_family ? strdupW(english_family) : NULL; list_init(&family->faces); list_add_tail(&font_list, &family->entry);

1 0