October 2011 - Wine-Commits

Jacek Caban : vbscript: Added lexer support for '_'.
by Alexandre Julliard Oct. 17, 2011

Oct. 17, 2011

Module: wine Branch: master Commit: 64fd6fa7872059379e0eb42392a9fe5f65487e2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=64fd6fa7872059379e0eb4239… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 17 14:32:13 2011 +0200 vbscript: Added lexer support for '_'. --- dlls/vbscript/lex.c | 10 ++++++++++ dlls/vbscript/tests/lang.vbs | 7 +++++++ dlls/vbscript/tests/run.c | 2 ++ 3 files changed, 19 insertions(+), 0 deletions(-) diff --git a/dlls/vbscript/lex.c b/dlls/vbscript/lex.c index ac3d65e..08ab375 100644 --- a/dlls/vbscript/lex.c +++ b/dlls/vbscript/lex.c @@ -354,6 +354,7 @@ static int parse_next_token(void *lval, parser_ctx_t *ctx) case '^': case '\\': case '.': + case '_': return *ctx->ptr++; case '(': /* NOTE: @@ -402,6 +403,15 @@ int parser_lex(void *lval, parser_ctx_t *ctx) while(1) { ret = parse_next_token(lval, ctx); + if(ret == '_') { + skip_spaces(ctx); + if(*ctx->ptr != '\n') { + FIXME("'_' not followed by newline\n"); + return 0; + } + ctx->ptr++; + continue; + } if(ret != tNL || ctx->last_token != tNL) break; diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 46a0330..de72338 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -177,6 +177,13 @@ Call ok(2^3^2 = 64, "2^3^2 = " & (2^3^2)) Call ok(-3^2 = 9, "-3^2 = " & (-3^2)) Call ok(2*3^2 = 18, "2*3^2 = " & (2*3^2)) +x =_ + 3 +x _ + = 3 + +x = 3 + if true then y = true : x = y ok x, "x is false" diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 367ffea..9fa4240 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -1226,6 +1226,8 @@ static void run_tests(void) parse_script_a("x = 1\n Call ok(x = 1, \"x = \" & x)"); + parse_script_a("x = _ \n3"); + test_global_vars_ref(TRUE); test_global_vars_ref(FALSE);

1 0

Huw Davies : gdi32: Implement nulldrv_StretchDIBits using the PutImage gdi driver function.
by Alexandre Julliard Oct. 17, 2011

Oct. 17, 2011

Module: wine Branch: master Commit: c9a7bb715d2db1512db30deb11e4676e76791a07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9a7bb715d2db1512db30deb1… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 17 15:46:07 2011 +0100 gdi32: Implement nulldrv_StretchDIBits using the PutImage gdi driver function. --- dlls/gdi32/dib.c | 160 ++++++++++++++++++++++++++++++++------------- dlls/gdi32/tests/bitmap.c | 4 +- 2 files changed, 116 insertions(+), 48 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index eea257c..550f099 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -388,68 +388,136 @@ fail: -/* nulldrv fallback implementation using SetDIBits/StretchBlt */ INT nulldrv_StretchDIBits( PHYSDEV dev, INT xDst, INT yDst, INT widthDst, INT heightDst, INT xSrc, INT ySrc, INT widthSrc, INT heightSrc, const void *bits, - BITMAPINFO *info, UINT coloruse, DWORD rop ) + BITMAPINFO *src_info, UINT coloruse, DWORD rop ) { DC *dc = get_nulldrv_dc( dev ); - INT ret; - LONG height; - HBITMAP hBitmap; - HDC hdcMem; + char dst_buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; + BITMAPINFO *dst_info = (BITMAPINFO *)dst_buffer; + struct bitblt_coords src, dst; + struct gdi_image_bits src_bits; + DWORD err; + HRGN clip = NULL; + INT ret = 0; + INT height = abs( src_info->bmiHeader.biHeight ); + BOOL top_down = src_info->bmiHeader.biHeight < 0, non_stretch_from_origin = FALSE; + RECT rect, clip_rect; - /* make sure we have a real implementation for StretchBlt and PutImage */ - if (GET_DC_PHYSDEV( dc, pStretchBlt ) == dev || GET_DC_PHYSDEV( dc, pPutImage ) == dev) - return 0; + TRACE("%d %d %d %d <- %d %d %d %d rop %08x\n", xDst, yDst, widthDst, heightDst, + xSrc, ySrc, widthSrc, heightSrc, rop); + + src_bits.ptr = (void*)bits; + src_bits.is_copy = FALSE; + src_bits.free = NULL; + + if (coloruse == DIB_PAL_COLORS && !fill_color_table_from_palette( src_info, dev->hdc )) return 0; - height = info->bmiHeader.biHeight; + rect.left = xDst; + rect.top = yDst; + rect.right = xDst + widthDst; + rect.bottom = yDst + heightDst; + LPtoDP( dc->hSelf, (POINT *)&rect, 2 ); + dst.x = rect.left; + dst.y = rect.top; + dst.width = rect.right - rect.left; + dst.height = rect.bottom - rect.top; + + if (dc->layout & LAYOUT_RTL && rop & NOMIRRORBITMAP) + { + dst.x += dst.width; + dst.width = -dst.width; + } + rop &= ~NOMIRRORBITMAP; + + src.x = xSrc; + src.width = widthSrc; + src.y = ySrc; + src.height = heightSrc; + + if (src.x == 0 && src.y == 0 && src.width == dst.width && src.height == dst.height) + non_stretch_from_origin = TRUE; - if (xSrc == 0 && ySrc == 0 && widthDst == widthSrc && heightDst == heightSrc && - info->bmiHeader.biCompression == BI_RGB) + if (src_info->bmiHeader.biCompression == BI_RLE4 || src_info->bmiHeader.biCompression == BI_RLE8) { - /* Windows appears to have a fast case optimization - * that uses the wrong origin for top-down DIBs */ - if (height < 0 && heightSrc < abs(height)) ySrc = abs(height) - heightSrc; + BOOL want_clip = non_stretch_from_origin && (rop == SRCCOPY); + if (!build_rle_bitmap( src_info, &src_bits, want_clip ? &clip : NULL )) return 0; + } - if (xDst == 0 && yDst == 0 && info->bmiHeader.biCompression == BI_RGB && rop == SRCCOPY) + if (rop != SRCCOPY || non_stretch_from_origin) + { + if (dst.width == 1 && src.width > 1) src.width--; + if (dst.height == 1 && src.height > 1) src.height--; + } + + if (rop != SRCCOPY) + { + if (dst.width < 0 && dst.width == src.width) { - BITMAP bm; - hBitmap = GetCurrentObject( dev->hdc, OBJ_BITMAP ); - if (GetObjectW( hBitmap, sizeof(bm), &bm ) && - bm.bmWidth == widthSrc && bm.bmHeight == heightSrc && - bm.bmBitsPixel == info->bmiHeader.biBitCount && bm.bmPlanes == 1) - { - /* fast path */ - return SetDIBits( dev->hdc, hBitmap, 0, abs( height ), bits, info, coloruse ); - } + /* This is off-by-one, but that's what Windows does */ + dst.x += dst.width; + src.x += src.width; + dst.width = -dst.width; + src.width = -src.width; + } + if (dst.height < 0 && dst.height == src.height) + { + dst.y += dst.height; + src.y += src.height; + dst.height = -dst.height; + src.height = -src.height; } } - hdcMem = CreateCompatibleDC( dev->hdc ); - hBitmap = CreateCompatibleBitmap( dev->hdc, info->bmiHeader.biWidth, height ); - SelectObject( hdcMem, hBitmap ); - if (coloruse == DIB_PAL_COLORS) - SelectPalette( hdcMem, GetCurrentObject( dev->hdc, OBJ_PAL ), FALSE ); + if (!top_down || (rop == SRCCOPY && !non_stretch_from_origin)) src.y = height - src.y - src.height; + + if (src.y >= height && src.y + src.height + 1 < height) + src.y = height - 1; + else if (src.y > 0 && src.y + src.height + 1 < 0) + src.y = -src.height - 1; + + get_bounding_rect( &rect, src.x, src.y, src.width, src.height ); + + src.visrect.left = 0; + src.visrect.right = src_info->bmiHeader.biWidth; + src.visrect.top = 0; + src.visrect.bottom = height; + if (!intersect_rect( &src.visrect, &src.visrect, &rect )) goto done; + + get_bounding_rect( &rect, dst.x, dst.y, dst.width, dst.height ); + + if (get_clip_box( dc, &clip_rect )) + intersect_rect( &dst.visrect, &rect, &clip_rect ); + else + dst.visrect = rect; + if (is_rect_empty( &dst.visrect )) goto done; + + if (!intersect_vis_rectangles( &dst, &src )) goto done; - if (info->bmiHeader.biCompression == BI_RLE4 || info->bmiHeader.biCompression == BI_RLE8) + if (clip) OffsetRgn( clip, dst.x - src.x, dst.y - src.y ); + + dev = GET_DC_PHYSDEV( dc, pPutImage ); + memcpy( dst_info, src_info, FIELD_OFFSET( BITMAPINFO, bmiColors[256] )); + err = dev->funcs->pPutImage( dev, 0, clip, dst_info, &src_bits, &src, &dst, rop ); + if (err == ERROR_BAD_FORMAT) + { + err = convert_bits( src_info, &src, dst_info, &src_bits, FALSE ); + if (!err) err = dev->funcs->pPutImage( dev, 0, clip, dst_info, &src_bits, &src, &dst, rop ); + } + + if (err == ERROR_TRANSFORM_NOT_SUPPORTED) { - /* when RLE compression is used, there may be some gaps (ie the DIB doesn't - * contain all the rectangle described in bmiHeader, but only part of it. - * This mean that those undescribed pixels must be left untouched. - * So, we first copy on a memory bitmap the current content of the - * destination rectangle, blit the DIB bits on top of it - hence leaving - * the gaps untouched -, and blitting the rectangle back. - * This insure that gaps are untouched on the destination rectangle - */ - StretchBlt( hdcMem, xSrc, abs(height) - heightSrc - ySrc, widthSrc, heightSrc, - dev->hdc, xDst, yDst, widthDst, heightDst, rop ); + memcpy( src_info, dst_info, FIELD_OFFSET( BITMAPINFO, bmiColors[256] )); + err = stretch_bits( src_info, &src, dst_info, &dst, &src_bits, GetStretchBltMode( dev->hdc ) ); + if (!err) err = dev->funcs->pPutImage( dev, 0, NULL, dst_info, &src_bits, &src, &dst, rop ); } - ret = SetDIBits( hdcMem, hBitmap, 0, abs( height ), bits, info, coloruse ); - if (ret) StretchBlt( dev->hdc, xDst, yDst, widthDst, heightDst, - hdcMem, xSrc, abs(height) - heightSrc - ySrc, widthSrc, heightSrc, rop ); - DeleteDC( hdcMem ); - DeleteObject( hBitmap ); + if (err) ret = 0; + else if (rop == SRCCOPY) ret = height; + else ret = src_info->bmiHeader.biHeight; + +done: + if (src_bits.free) src_bits.free( &src_bits ); + if (clip) DeleteObject( clip ); return ret; } diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 32fabb8..ed304aa 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -984,7 +984,7 @@ static void test_dib_formats(void) ret = SetDIBitsToDevice( memdc, 0, 0, 1, 1, 0, 0, 0, 1, data, bi, DIB_RGB_COLORS ); ok( ret, "SetDIBitsToDevice failed with null bitfields\n" ); ret = StretchDIBits( memdc, 0, 0, 1, 1, 0, 0, 1, 1, data, bi, DIB_RGB_COLORS, SRCCOPY ); - todo_wine ok( ret, "StretchDIBits failed with null bitfields\n" ); + ok( ret, "StretchDIBits failed with null bitfields\n" ); ret = GetDIBits(hdc, hbmp, 0, 2, data, bi, DIB_RGB_COLORS); ok( ret, "GetDIBits failed with null bitfields\n" ); bi->bmiHeader.biPlanes = 1; @@ -3152,7 +3152,7 @@ static void test_StretchDIBits(void) expected[2] = 0x00000000, expected[3] = 0x00000000; legacy_expected[0] = 0x00543210, legacy_expected[1] = 0x00000000; legacy_expected[2] = 0x00000000, legacy_expected[3] = 0x00000000; - todo_wine check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, + check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, 0, 0, 1, 1, 0, 0, 2, 2, expected, legacy_expected, __LINE__); expected[0] = 0x00000000, expected[1] = 0x00000000;

1 0

Ričardas Barkauskas : ddraw: Use unsafe_impl_from_IDirect3DDevice for application provided interfaces.
by Alexandre Julliard Oct. 17, 2011

Oct. 17, 2011

Module: wine Branch: master Commit: d19e416dee0d9d12725b025a1dd1572b8f79a471 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d19e416dee0d9d12725b025a1… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Mon Oct 17 16:56:43 2011 +0300 ddraw: Use unsafe_impl_from_IDirect3DDevice for application provided interfaces. --- dlls/ddraw/ddraw_private.h | 2 ++ dlls/ddraw/device.c | 7 +++++++ dlls/ddraw/material.c | 9 +++++---- dlls/ddraw/surface.c | 5 +++-- 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 4fb6fc4..a0a0fe4 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -340,6 +340,8 @@ static inline IDirect3DDeviceImpl *device_from_device3(IDirect3DDevice3 *iface) return (IDirect3DDeviceImpl *)((char*)iface - FIELD_OFFSET(IDirect3DDeviceImpl, IDirect3DDevice3_vtbl)); } +IDirect3DDeviceImpl *unsafe_impl_from_IDirect3DDevice(IDirect3DDevice *iface) DECLSPEC_HIDDEN; + /***************************************************************************** * IDirectDrawClipper implementation structure *****************************************************************************/ diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 8cfeac1..da74128 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -6732,6 +6732,13 @@ static const struct IDirect3DDeviceVtbl d3d_device1_vtbl = IDirect3DDeviceImpl_1_GetDirect3D }; +IDirect3DDeviceImpl *unsafe_impl_from_IDirect3DDevice(IDirect3DDevice *iface) +{ + if (!iface) return NULL; + assert(iface->lpVtbl == &d3d_device1_vtbl); + return CONTAINING_RECORD(iface, IDirect3DDeviceImpl, IDirect3DDevice_vtbl); +} + /***************************************************************************** * IDirect3DDeviceImpl_UpdateDepthStencil * diff --git a/dlls/ddraw/material.c b/dlls/ddraw/material.c index 9fca200..f873726 100644 --- a/dlls/ddraw/material.c +++ b/dlls/ddraw/material.c @@ -335,14 +335,15 @@ static HRESULT WINAPI IDirect3DMaterialImpl_2_GetHandle(IDirect3DMaterial2 *ifac } static HRESULT WINAPI IDirect3DMaterialImpl_1_GetHandle(IDirect3DMaterial *iface, - IDirect3DDevice *lpDirect3DDevice, D3DMATERIALHANDLE *lpHandle) + IDirect3DDevice *device, D3DMATERIALHANDLE *handle) { IDirect3DMaterialImpl *This = impl_from_IDirect3DMaterial(iface); + IDirect3DDeviceImpl *device_impl = unsafe_impl_from_IDirect3DDevice(device); - TRACE("iface %p, device %p, handle %p.\n", iface, lpDirect3DDevice, lpHandle); + TRACE("iface %p, device %p, handle %p.\n", iface, device, handle); - return IDirect3DMaterial3_GetHandle(&This->IDirect3DMaterial3_iface, lpDirect3DDevice ? - (IDirect3DDevice3 *)&device_from_device1(lpDirect3DDevice)->IDirect3DDevice3_vtbl : NULL, lpHandle); + return IDirect3DMaterial3_GetHandle(&This->IDirect3DMaterial3_iface, device_impl ? + (IDirect3DDevice3 *)&device_impl->IDirect3DDevice3_vtbl : NULL, handle); } static HRESULT WINAPI IDirect3DMaterialImpl_2_QueryInterface(IDirect3DMaterial2 *iface, REFIID riid, diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 24d0497..f14374a 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -4551,11 +4551,12 @@ static HRESULT WINAPI d3d_texture1_GetHandle(IDirect3DTexture *iface, IDirect3DDevice *device, D3DTEXTUREHANDLE *handle) { IDirectDrawSurfaceImpl *This = impl_from_IDirect3DTexture(iface); - IDirect3DDevice2 *device2 = (IDirect3DDevice2 *)&device_from_device1(device)->IDirect3DDevice2_vtbl; + IDirect3DDeviceImpl *device_impl = unsafe_impl_from_IDirect3DDevice(device); TRACE("iface %p, device %p, handle %p.\n", iface, device, handle); - return d3d_texture2_GetHandle(&This->IDirect3DTexture2_iface, device2, handle); + return d3d_texture2_GetHandle(&This->IDirect3DTexture2_iface, + device_impl ? (IDirect3DDevice2 *)&device_impl->IDirect3DDevice2_vtbl : NULL, handle); } /*****************************************************************************

1 0

Ken Sharp : ntdll: Update Win2k8 to SP2.
by Alexandre Julliard Oct. 17, 2011

Oct. 17, 2011

Module: wine Branch: master Commit: e8d9483da93bad6773990eea75fb667538eb3b36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8d9483da93bad6773990eea7… Author: Ken Sharp <kennybobs(a)o2.co.uk> Date: Sat Oct 15 03:59:52 2011 +0100 ntdll: Update Win2k8 to SP2. --- dlls/ntdll/version.c | 6 +++--- programs/winecfg/appdefaults.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c index 74010dd..dfe7c3b 100644 --- a/dlls/ntdll/version.c +++ b/dlls/ntdll/version.c @@ -147,8 +147,8 @@ static const RTL_OSVERSIONINFOEXW VersionData[NB_WINDOWS_VERSIONS] = }, /* WIN2K8 */ { - sizeof(RTL_OSVERSIONINFOEXW), 6, 0, 0x1771, VER_PLATFORM_WIN32_NT, - {'S','e','r','v','i','c','e',' ','P','a','c','k',' ','1',0}, + sizeof(RTL_OSVERSIONINFOEXW), 6, 0, 0x1772, VER_PLATFORM_WIN32_NT, + {'S','e','r','v','i','c','e',' ','P','a','c','k',' ','2',0}, 0, 0, VER_SUITE_SINGLEUSERTS, VER_NT_SERVER, 0 }, /* WIN7 */ @@ -157,7 +157,7 @@ static const RTL_OSVERSIONINFOEXW VersionData[NB_WINDOWS_VERSIONS] = {'S','e','r','v','i','c','e',' ','P','a','c','k',' ','1',0}, 1, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 0 }, - /* WIN2K8 */ + /* WIN2K8R2 */ { sizeof(RTL_OSVERSIONINFOEXW), 6, 1, 0x1DB1, VER_PLATFORM_WIN32_NT, {'S','e','r','v','i','c','e',' ','P','a','c','k',' ','1',0}, diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index d2c9e7d..3a4c908 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -51,7 +51,7 @@ static const struct { { "win2008r2", "Windows 2008 R2", 6, 1, 0x1DB1,VER_PLATFORM_WIN32_NT, "Service Pack 1", 1, 0, "ServerNT"}, { "win7", "Windows 7", 6, 1, 0x1DB1,VER_PLATFORM_WIN32_NT, "Service Pack 1", 1, 0, "WinNT"}, - { "win2008", "Windows 2008", 6, 0, 0x1771,VER_PLATFORM_WIN32_NT, "Service Pack 1", 0, 0, "ServerNT"}, + { "win2008", "Windows 2008", 6, 0, 0x1772,VER_PLATFORM_WIN32_NT, "Service Pack 2", 0, 0, "ServerNT"}, { "vista", "Windows Vista", 6, 0, 0x1772,VER_PLATFORM_WIN32_NT, "Service Pack 2", 2, 0, "WinNT"}, { "win2003", "Windows 2003", 5, 2, 0xECE, VER_PLATFORM_WIN32_NT, "Service Pack 2", 2, 0, "ServerNT"}, { "winxp", "Windows XP", 5, 1, 0xA28, VER_PLATFORM_WIN32_NT, "Service Pack 3", 3, 0, "WinNT"},

1 0

Thomas Faber : ntdll/tests: Fix build with MSVC.
by Alexandre Julliard Oct. 17, 2011

Oct. 17, 2011

Module: wine Branch: master Commit: 385b8c398895db881e9cd066af97e884cb9b90e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=385b8c398895db881e9cd066a… Author: Thomas Faber <thfabba(a)gmx.de> Date: Sun Oct 16 13:18:55 2011 +0200 ntdll/tests: Fix build with MSVC. --- dlls/ntdll/tests/string.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/string.c b/dlls/ntdll/tests/string.c index 9422d41..802a165 100644 --- a/dlls/ntdll/tests/string.c +++ b/dlls/ntdll/tests/string.c @@ -1165,7 +1165,7 @@ static void test_wcslwrupr(void) ok(p_wcsupr((LPWSTR)constemptyW) == constemptyW, "p_wcsupr returned different string\n"); } -static __cdecl int intcomparefunc(const void *a, const void *b) +static int __cdecl intcomparefunc(const void *a, const void *b) { const int *p = a, *q = b; @@ -1174,7 +1174,7 @@ static __cdecl int intcomparefunc(const void *a, const void *b) return *p - *q; } -static __cdecl int charcomparefunc(const void *a, const void *b) +static int __cdecl charcomparefunc(const void *a, const void *b) { const char *p = a, *q = b; @@ -1183,7 +1183,7 @@ static __cdecl int charcomparefunc(const void *a, const void *b) return *p - *q; } -static __cdecl int strcomparefunc(const void *a, const void *b) +static int __cdecl strcomparefunc(const void *a, const void *b) { const char * const *p = a; const char * const *q = b;

1 0

Łukasz Wojniłowicz : po: Update Polish translation.
by Alexandre Julliard Oct. 17, 2011

Oct. 17, 2011

Module: wine Branch: master Commit: 975145a3852b5851297fda5c4c2305def67ee337 URL: http://source.winehq.org/git/wine.git/?a=commit;h=975145a3852b5851297fda5c4… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Oct 15 21:58:38 2011 +0200 po: Update Polish translation. --- po/pl.po | 399 +++++++++++++++++++++++++++++--------------------------------- 1 files changed, 186 insertions(+), 213 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=975145a3852b5851297fd…

1 0

André Hentschel : dbghelp: Rewrite stabs parsing to not need PATH_MAX.
by Alexandre Julliard Oct. 17, 2011

Oct. 17, 2011

Module: wine Branch: master Commit: 85051917fe99e5c257638bf04caf7dfa94440410 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85051917fe99e5c257638bf04… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Oct 14 20:41:58 2011 +0200 dbghelp: Rewrite stabs parsing to not need PATH_MAX. --- dlls/dbghelp/stabs.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/dbghelp/stabs.c b/dlls/dbghelp/stabs.c index 1bdd706..b4188d1 100644 --- a/dlls/dbghelp/stabs.c +++ b/dlls/dbghelp/stabs.c @@ -47,9 +47,6 @@ # include <unistd.h> #endif #include <stdio.h> -#ifndef PATH_MAX -#define PATH_MAX MAX_PATH -#endif #include <assert.h> #include <stdarg.h> @@ -1272,7 +1269,7 @@ BOOL stabs_parse(struct module* module, unsigned long load_offset, struct symt_function* curr_func = NULL; struct symt_block* block = NULL; struct symt_compiland* compiland = NULL; - char srcpath[PATH_MAX]; /* path to directory source file is in */ + char* srcpath = NULL; int i; int nstab; const char* ptr; @@ -1294,7 +1291,6 @@ BOOL stabs_parse(struct module* module, unsigned long load_offset, nstab = stablen / sizeof(struct stab_nlist); strs_end = strs + strtablen; - memset(srcpath, 0, sizeof(srcpath)); memset(stabs_basic, 0, sizeof(stabs_basic)); memset(&pending_block, 0, sizeof(pending_block)); memset(&pending_func, 0, sizeof(pending_func)); @@ -1565,7 +1561,8 @@ BOOL stabs_parse(struct module* module, unsigned long load_offset, if (*ptr == '\0') /* end of N_SO file */ { /* Nuke old path. */ - srcpath[0] = '\0'; + HeapFree(GetProcessHeap(), 0, srcpath); + srcpath = NULL; stabs_finalize_function(module, curr_func, 0); curr_func = NULL; source_idx = -1; @@ -1583,7 +1580,10 @@ BOOL stabs_parse(struct module* module, unsigned long load_offset, compiland = symt_new_compiland(module, 0 /* FIXME */, source_idx); } else + { + srcpath = HeapAlloc(GetProcessHeap(), 0, len + 1); strcpy(srcpath, ptr); + } } break; case N_SOL:

1 0

Luca Bennati : po: Update Italian translation.
by Alexandre Julliard Oct. 17, 2011

Oct. 17, 2011

Module: wine Branch: master Commit: e3f022b2bd0ea252303164872996fd91124538ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3f022b2bd0ea252303164872… Author: Luca Bennati <lucak3(a)gmail.com> Date: Sat Oct 15 12:52:56 2011 +0200 po: Update Italian translation. --- po/it.po | 18 ++++++++---------- 1 files changed, 8 insertions(+), 10 deletions(-) diff --git a/po/it.po b/po/it.po index 7e5e78f..eabf4e9 100644 --- a/po/it.po +++ b/po/it.po @@ -1,11 +1,11 @@ # Italian translations for Wine -# +# Luca Bennati <lucak3(a)gmail.com>, 2011. msgid "" msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-10-07 13:37+0200\n" +"PO-Revision-Date: 2011-10-14 14:56+0200\n" "Last-Translator: Luca Bennati <lucak3(a)gmail.com>\n" "Language-Team: none\n" "Language: Italian\n" @@ -8002,18 +8002,17 @@ msgstr "" "PATH %PATH%;c:\\temp\n" #: cmd.rc:128 -#, fuzzy msgid "" "PAUSE displays a message on the screen asking the user to press a key.\n" "\n" "It is mainly useful in batch files to allow the user to read the output\n" "of a previous command before it scrolls off the screen.\n" msgstr "" -"PAUSE mostra un messaggio sullo schermo 'Premere Invio per continuare'\n" -"e aspetta che l'utente prema Invio. È utile principalmente nei files\n" -"batch per permettere all'utente di leggere l'output di un comando " -"precedente\n" -"prima che scorra fuori dallo schermo.\n" +"PAUSE mostra un messaggio sullo schermo che chiede all'utente di premere un " +"tasto.\n" +"\n" +"È utile soprattutto in file batch per permettere all'utente di leggere\n" +"l'output di un comando precedente prima che scorra via dallo schermo.\n" #: cmd.rc:149 msgid "" @@ -8489,9 +8488,8 @@ msgid "PATH not found\n" msgstr "PATH non trovato\n" #: cmd.rc:321 -#, fuzzy msgid "Press any key to continue... " -msgstr "Premere Invio per continuare: " +msgstr "Premere un tasto qualsiasi per continuare... " #: cmd.rc:322 msgid "Wine Command Prompt"

1 0

Marcus Meissner : usp10: Fixed some oom handling (Coverity).
by Alexandre Julliard Oct. 17, 2011

Oct. 17, 2011

Module: wine Branch: master Commit: 76702f33916f69af67352c9c3e8720c5e3b8d267 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76702f33916f69af67352c9c3… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Oct 16 12:38:24 2011 +0200 usp10: Fixed some oom handling (Coverity). --- dlls/usp10/usp10.c | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 107f8cc..65d42e4 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1029,6 +1029,8 @@ static BOOL requires_fallback(HDC hdc, SCRIPT_CACHE *psc, SCRIPT_ANALYSIS *psa, return TRUE; glyphs = heap_alloc(sizeof(WORD) * cChars); + if (!glyphs) + return FALSE; if (ScriptGetCMap(hdc, psc, pwcInChars, cChars, 0, glyphs) != S_OK) { heap_free(glyphs); @@ -1111,6 +1113,11 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString, if (dwFlags & SSA_PASSWORD) { iString = heap_alloc(sizeof(WCHAR)*cString); + if (!iString) + { + hr = E_OUTOFMEMORY; + goto error; + } for (i = 0; i < cString; i++) iString[i] = *((const WCHAR *)pString); pString = iString; @@ -1133,6 +1140,9 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString, } if (hr != S_OK) goto error; + /* set back to out of memory for default goto error behaviour */ + hr = E_OUTOFMEMORY; + if (dwFlags & SSA_BREAK) { if ((analysis->logattrs = heap_alloc(sizeof(SCRIPT_LOGATTR) * cString))) @@ -1173,6 +1183,18 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString, const WCHAR* pStr = (const WCHAR*)pString; analysis->glyphs[i].fallbackFont = NULL; + if (!glyphs || !pwLogClust || !piAdvance || !psva || !pGoffset || !abc) + { + heap_free (glyphs); + heap_free (pwLogClust); + heap_free (piAdvance); + heap_free (psva); + heap_free (pGoffset); + heap_free (abc); + hr = E_OUTOFMEMORY; + goto error; + } + if ((dwFlags & SSA_FALLBACK) && requires_fallback(hdc, sc, &analysis->pItem[i].a, &pStr[analysis->pItem[i].iCharPos], cChar)) { LOGFONTW lf;

1 0

Dan Kegel : comdlg32/tests: Initialize find & replace strings before testing FindTextA, etc.
by Alexandre Julliard Oct. 17, 2011

Oct. 17, 2011

Module: wine Branch: master Commit: 4a38b10a56209758287b61553a2e389fdc09756f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a38b10a56209758287b61553… Author: Dan Kegel <dank(a)kegel.com> Date: Sun Oct 16 10:47:59 2011 -0700 comdlg32/tests: Initialize find & replace strings before testing FindTextA, etc. --- dlls/comdlg32/tests/finddlg.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/comdlg32/tests/finddlg.c b/dlls/comdlg32/tests/finddlg.c index 4a10909..82a7a46 100644 --- a/dlls/comdlg32/tests/finddlg.c +++ b/dlls/comdlg32/tests/finddlg.c @@ -103,11 +103,13 @@ static void test_param_check(void) /* invalid lpstrFindWhat (NULL) */ CHECK_FINDREPLACE_FAIL(FRERR_BUFFERLENGTHZERO); fr.lpstrFindWhat = findbuffer; + strcpy(findbuffer, "abc"); /* invalid lpstrReplaceWith (NULL) for ReplaceText */ CHECK_FIND_SUCCEED(); CHECK_REPLACE_FAIL(FRERR_BUFFERLENGTHZERO); fr.lpstrReplaceWith = replacebuffer; + strcpy(replacebuffer, "def"); /* wReplaceWithLen may be 0, even for ReplaceText */ CHECK_FIND_SUCCEED();

1 0