July 2013 - Wine-Commits - list.winehq.org

Dmitry Timoshkov : gdiplus: Reimplement GdipSetClipRect to avoid potential problems with rotating world transform .
by Alexandre Julliard July 30, 2013

July 30, 2013

Module: wine Branch: master Commit: f575eb494bec354c0e6ca05605fc06995a51b2bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=f575eb494bec354c0e6ca0560… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jul 22 17:49:24 2013 +0900 gdiplus: Reimplement GdipSetClipRect to avoid potential problems with rotating world transform. --- dlls/gdiplus/graphics.c | 36 ++++++++++++++---------------------- 1 files changed, 14 insertions(+), 22 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index d79239e..76af444 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -54,26 +54,6 @@ static GpStatus draw_driver_string(GpGraphics *graphics, GDIPCONST UINT16 *text, static GpStatus get_graphics_transform(GpGraphics *graphics, GpCoordinateSpace dst_space, GpCoordinateSpace src_space, GpMatrix *matrix); -static void transform_rectf(GpGraphics *graphics, GpCoordinateSpace dst_space, - GpCoordinateSpace src_space, GpRectF *rect) -{ - GpPointF pt[3]; - - pt[0].X = rect->X; - pt[0].Y = rect->Y; - pt[1].X = rect->X + rect->Width; - pt[1].Y = rect->Y; - pt[2].X = rect->X; - pt[2].Y = rect->Y + rect->Height; - GdipTransformPoints(graphics, dst_space, src_space, pt, 3); - rect->X = pt[0].X; - rect->Y = pt[0].Y; - rect->Width = sqrt((pt[1].Y - pt[0].Y) * (pt[1].Y - pt[0].Y) + - (pt[1].X - pt[0].X) * (pt[1].X - pt[0].X)); - rect->Height = sqrt((pt[2].Y - pt[0].Y) * (pt[2].Y - pt[0].Y) + - (pt[2].X - pt[0].X) * (pt[2].X - pt[0].X)); -} - /* Converts from gdiplus path point type to gdi path point type. */ static BYTE convert_path_point_type(BYTE type) { @@ -5476,7 +5456,9 @@ GpStatus WINGDIPAPI GdipSetClipRect(GpGraphics *graphics, REAL x, REAL y, REAL width, REAL height, CombineMode mode) { + GpStatus status; GpRectF rect; + GpRegion *region; TRACE("(%p, %.2f, %.2f, %.2f, %.2f, %d)\n", graphics, x, y, width, height, mode); @@ -5490,9 +5472,19 @@ GpStatus WINGDIPAPI GdipSetClipRect(GpGraphics *graphics, REAL x, REAL y, rect.Y = y; rect.Width = width; rect.Height = height; - transform_rectf(graphics, CoordinateSpaceDevice, CoordinateSpaceWorld, &rect); + status = GdipCreateRegionRect(&rect, &region); + if (status == Ok) + { + GpMatrix world_to_device; - return GdipCombineRegionRect(graphics->clip, &rect, mode); + get_graphics_transform(graphics, CoordinateSpaceDevice, CoordinateSpaceWorld, &world_to_device); + status = GdipTransformRegion(region, &world_to_device); + if (status == Ok) + status = GdipCombineRegionRegion(graphics->clip, region, mode); + + GdipDeleteRegion(region); + } + return status; } GpStatus WINGDIPAPI GdipSetClipRectI(GpGraphics *graphics, INT x, INT y,

1 0

Nikolay Sivov : kernel32/tests: Remove unused helper argument.
by Alexandre Julliard July 30, 2013

July 30, 2013

Module: wine Branch: master Commit: e8cbae2e49264b5ab6a48368f77cd7fbeadd8cb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8cbae2e49264b5ab6a48368f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 30 19:05:18 2013 +0400 kernel32/tests: Remove unused helper argument. --- dlls/kernel32/tests/actctx.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index a9d5f29..50529f8 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -600,7 +600,7 @@ static void test_file_info(HANDLE handle, ULONG assid, ULONG fileid, LPCWSTR fil HeapFree(GetProcessHeap(), 0, info); } -static HANDLE test_create(const char *file, const char *manifest) +static HANDLE test_create(const char *file) { ACTCTXW actctx; HANDLE handle; @@ -1114,7 +1114,7 @@ static void test_actctx(void) trace("manifest1\n"); - handle = test_create("test1.manifest", manifest1); + handle = test_create("test1.manifest"); DeleteFileA("test1.manifest"); if(handle != INVALID_HANDLE_VALUE) { test_basic_info(handle, __LINE__); @@ -1139,7 +1139,7 @@ static void test_actctx(void) trace("manifest2 depmanifest1\n"); - handle = test_create("test2.manifest", manifest2); + handle = test_create("test2.manifest"); DeleteFileA("test2.manifest"); DeleteFileA("testdep.manifest"); if(handle != INVALID_HANDLE_VALUE) { @@ -1157,7 +1157,7 @@ static void test_actctx(void) trace("manifest2 depmanifest2\n"); - handle = test_create("test2-2.manifest", manifest2); + handle = test_create("test2-2.manifest"); DeleteFileA("test2-2.manifest"); DeleteFileA("testdep.manifest"); if(handle != INVALID_HANDLE_VALUE) { @@ -1185,7 +1185,7 @@ static void test_actctx(void) return; } - handle = test_create("test2-3.manifest", manifest2); + handle = test_create("test2-3.manifest"); DeleteFileA("test2-3.manifest"); DeleteFileA("testdep.manifest"); if(handle != INVALID_HANDLE_VALUE) { @@ -1215,7 +1215,7 @@ static void test_actctx(void) return; } - handle = test_create("test3.manifest", manifest3); + handle = test_create("test3.manifest"); DeleteFileA("test3.manifest"); if(handle != INVALID_HANDLE_VALUE) { test_basic_info(handle, __LINE__); @@ -1242,7 +1242,7 @@ static void test_actctx(void) return; } - handle = test_create("test4.manifest", manifest4); + handle = test_create("test4.manifest"); DeleteFileA("test4.manifest"); DeleteFileA("testdep.manifest"); if(handle != INVALID_HANDLE_VALUE) { @@ -1262,7 +1262,7 @@ static void test_actctx(void) skip("Could not create manifest file\n"); return; } - handle = test_create("..\\test1.manifest", manifest1); + handle = test_create("..\\test1.manifest"); DeleteFileA("..\\test1.manifest"); if(handle != INVALID_HANDLE_VALUE) { test_basic_info(handle, __LINE__); @@ -1282,7 +1282,7 @@ static void test_actctx(void) return; } - handle = test_create("test1.manifest", manifest1); + handle = test_create("test1.manifest"); DeleteFileA("test1.manifest"); if (handle != INVALID_HANDLE_VALUE) { test_basic_info(handle, __LINE__); @@ -1297,7 +1297,7 @@ static void test_actctx(void) return; } - handle = test_create("test1.manifest", manifest1); + handle = test_create("test1.manifest"); DeleteFileA("test1.manifest"); if (handle != INVALID_HANDLE_VALUE) { test_basic_info(handle, __LINE__);

1 0

Nikolay Sivov : msxml3: Implement IMXAttributes_removeAttribute().
by Alexandre Julliard July 30, 2013

July 30, 2013

Module: wine Branch: master Commit: 11736f36c9d498949c724ad525707d0b530bcd33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11736f36c9d498949c724ad52… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 30 15:03:22 2013 +0400 msxml3: Implement IMXAttributes_removeAttribute(). --- dlls/msxml3/mxwriter.c | 22 ++++++++++++++++++++-- 1 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index 3196374..03c1b67 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -1891,8 +1891,26 @@ static HRESULT WINAPI MXAttributes_clear(IMXAttributes *iface) static HRESULT WINAPI MXAttributes_removeAttribute(IMXAttributes *iface, int index) { mxattributes *This = impl_from_IMXAttributes( iface ); - FIXME("(%p)->(%d): stub\n", This, index); - return E_NOTIMPL; + mxattribute *src, *dst; + + TRACE("(%p)->(%d)\n", This, index); + + if (index < 0 || index >= This->length) return E_INVALIDARG; + + /* no need to remove last attribute, just make it inaccessible */ + if (index + 1 == This->length) + { + This->length--; + return S_OK; + } + + dst = &This->attr[index]; + src = &This->attr[index+1]; + + memmove(dst, src, (This->length-index-1)*sizeof(*dst)); + This->length--; + + return S_OK; } static HRESULT WINAPI MXAttributes_setAttribute(IMXAttributes *iface, int index,

1 0

Piotr Caban : oleaut32: Free guid_list in ITypeLib2_Release.
by Alexandre Julliard July 30, 2013

July 30, 2013

Module: wine Branch: master Commit: 1967b35962ea0c2476da8986404c8d8f45eda0b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1967b35962ea0c2476da89864… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 30 15:19:54 2013 +0200 oleaut32: Free guid_list in ITypeLib2_Release. --- dlls/oleaut32/typelib.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index b0cfc88..44eea5b 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -4577,6 +4577,7 @@ static ULONG WINAPI ITypeLib2_fnRelease( ITypeLib2 *iface) TLBImpLib *pImpLib, *pImpLibNext; TLBRefType *ref_type; TLBString *tlbstr, *tlbstr_next; + TLBGuid *tlbguid, *tlbguid_next; void *cursor2; int i; @@ -4604,6 +4605,11 @@ static ULONG WINAPI ITypeLib2_fnRelease( ITypeLib2 *iface) heap_free(tlbstr); } + LIST_FOR_EACH_ENTRY_SAFE(tlbguid, tlbguid_next, &This->guid_list, TLBGuid, entry) { + list_remove(&tlbguid->entry); + heap_free(tlbguid); + } + TLB_FreeCustData(&This->custdata_list); for (i = 0; i < This->ctTypeDesc; i++)

1 0

Alexandre Julliard : configure: Allow specifying relative paths in CFLAGS and LIBS variables.
by Alexandre Julliard July 30, 2013

July 30, 2013

Module: wine Branch: master Commit: bd049b2839a6a5ab9586147b7e608c9f03bb2be8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd049b2839a6a5ab9586147b7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 30 17:40:23 2013 +0200 configure: Allow specifying relative paths in CFLAGS and LIBS variables. --- aclocal.m4 | 2 ++ configure | 24 ++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 0 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index a12ac88..8aa81b2 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -88,6 +88,8 @@ ac_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS $ac_cflags" $6 CPPFLAGS=$ac_save_CPPFLAGS +test -z "$ac_cflags" || ac_cflags=`echo " $ac_cflags" | sed 's/ -I$[[^/]]$/ -I\$(top_builddir)\/\1/g'` +test -z "$ac_libs" || ac_libs=`echo " $ac_libs" | sed 's/ -L$[[^/]]$/ -L\$(top_builddir)\/\1/g'` AS_VAR_POPDEF([ac_libs])dnl AS_VAR_POPDEF([ac_cflags])])dnl diff --git a/configure b/configure index 719db97..5b1e50f 100755 --- a/configure +++ b/configure @@ -9889,6 +9889,8 @@ fi XML2_LIBS="" fi CPPFLAGS=$ac_save_CPPFLAGS +test -z "$XML2_CFLAGS" || XML2_CFLAGS=`echo " $XML2_CFLAGS" | sed 's/ -I$[^/]$/ -I\$(top_builddir)\/\1/g'` +test -z "$XML2_LIBS" || XML2_LIBS=`echo " $XML2_LIBS" | sed 's/ -L$[^/]$/ -L\$(top_builddir)\/\1/g'` fi if test "$ac_cv_lib_xml2_xmlParseMemory" != "yes"; then : @@ -9992,6 +9994,8 @@ fi XSLT_CFLAGS="" fi CPPFLAGS=$ac_save_CPPFLAGS +test -z "$XSLT_CFLAGS" || XSLT_CFLAGS=`echo " $XSLT_CFLAGS" | sed 's/ -I$[^/]$/ -I\$(top_builddir)\/\1/g'` +test -z "$XSLT_LIBS" || XSLT_LIBS=`echo " $XSLT_LIBS" | sed 's/ -L$[^/]$/ -L\$(top_builddir)\/\1/g'` fi if test "x$ac_cv_lib_soname_xslt" = "x"; then : @@ -10081,6 +10085,8 @@ fi CPPFLAGS=$ac_save_CPPFLAGS +test -z "$DBUS_CFLAGS" || DBUS_CFLAGS=`echo " $DBUS_CFLAGS" | sed 's/ -I$[^/]$/ -I\$(top_builddir)\/\1/g'` +test -z "$DBUS_LIBS" || DBUS_LIBS=`echo " $DBUS_LIBS" | sed 's/ -L$[^/]$/ -L\$(top_builddir)\/\1/g'` fi if test "x$ac_cv_lib_soname_dbus_1" = "x" -a \ @@ -10171,6 +10177,8 @@ fi CPPFLAGS=$ac_save_CPPFLAGS +test -z "$HAL_CFLAGS" || HAL_CFLAGS=`echo " $HAL_CFLAGS" | sed 's/ -I$[^/]$/ -I\$(top_builddir)\/\1/g'` +test -z "$HAL_LIBS" || HAL_LIBS=`echo " $HAL_LIBS" | sed 's/ -L$[^/]$/ -L\$(top_builddir)\/\1/g'` if test "x$ac_cv_lib_soname_hal" = "x" -a \ "x$ac_cv_header_DiskArbitration_DiskArbitration_h" != "xyes"; then : @@ -10276,6 +10284,8 @@ fi CPPFLAGS=$ac_save_CPPFLAGS +test -z "$GNUTLS_CFLAGS" || GNUTLS_CFLAGS=`echo " $GNUTLS_CFLAGS" | sed 's/ -I$[^/]$/ -I\$(top_builddir)\/\1/g'` +test -z "$GNUTLS_LIBS" || GNUTLS_LIBS=`echo " $GNUTLS_LIBS" | sed 's/ -L$[^/]$/ -L\$(top_builddir)\/\1/g'` fi if test "x$ac_cv_lib_soname_gnutls" = "x"; then : @@ -10500,6 +10510,8 @@ fi CPPFLAGS=$ac_save_CPPFLAGS +test -z "$SANE_CFLAGS" || SANE_CFLAGS=`echo " $SANE_CFLAGS" | sed 's/ -I$[^/]$/ -I\$(top_builddir)\/\1/g'` +test -z "$SANE_LIBS" || SANE_LIBS=`echo " $SANE_LIBS" | sed 's/ -L$[^/]$/ -L\$(top_builddir)\/\1/g'` fi if test "x$ac_cv_lib_soname_sane" = "x"; then : @@ -10645,6 +10657,8 @@ fi CPPFLAGS=$ac_save_CPPFLAGS +test -z "$GPHOTO2_CFLAGS" || GPHOTO2_CFLAGS=`echo " $GPHOTO2_CFLAGS" | sed 's/ -I$[^/]$/ -I\$(top_builddir)\/\1/g'` +test -z "$GPHOTO2_LIBS" || GPHOTO2_LIBS=`echo " $GPHOTO2_LIBS" | sed 's/ -L$[^/]$/ -L\$(top_builddir)\/\1/g'` if test -n "$GPHOTO2_PORT_CFLAGS"; then : @@ -10713,6 +10727,8 @@ fi CPPFLAGS=$ac_save_CPPFLAGS +test -z "$GPHOTO2_PORT_CFLAGS" || GPHOTO2_PORT_CFLAGS=`echo " $GPHOTO2_PORT_CFLAGS" | sed 's/ -I$[^/]$/ -I\$(top_builddir)\/\1/g'` +test -z "$GPHOTO2_PORT_LIBS" || GPHOTO2_PORT_LIBS=`echo " $GPHOTO2_PORT_LIBS" | sed 's/ -L$[^/]$/ -L\$(top_builddir)\/\1/g'` fi if test "$ac_cv_lib_gphoto2_gp_camera_new" != "yes"; then : @@ -10849,6 +10865,8 @@ fi LCMS2_LIBS="" fi CPPFLAGS=$ac_save_CPPFLAGS +test -z "$LCMS2_CFLAGS" || LCMS2_CFLAGS=`echo " $LCMS2_CFLAGS" | sed 's/ -I$[^/]$/ -I\$(top_builddir)\/\1/g'` +test -z "$LCMS2_LIBS" || LCMS2_LIBS=`echo " $LCMS2_LIBS" | sed 's/ -L$[^/]$/ -L\$(top_builddir)\/\1/g'` fi if test "$ac_cv_lib_lcms2_cmsOpenProfileFromFile" != "yes"; then : @@ -10995,6 +11013,8 @@ $as_echo "#define HAVE_FREETYPE 1" >>confdefs.h FREETYPE_LIBS="" fi CPPFLAGS=$ac_save_CPPFLAGS +test -z "$FREETYPE_CFLAGS" || FREETYPE_CFLAGS=`echo " $FREETYPE_CFLAGS" | sed 's/ -I$[^/]$/ -I\$(top_builddir)\/\1/g'` +test -z "$FREETYPE_LIBS" || FREETYPE_LIBS=`echo " $FREETYPE_LIBS" | sed 's/ -L$[^/]$/ -L\$(top_builddir)\/\1/g'` fi if test "x$ac_cv_header_freetype_freetype_h" != xyes -o "x$wine_cv_fttrigon" != xyes; then : @@ -11316,6 +11336,8 @@ fi CPPFLAGS=$ac_save_CPPFLAGS +test -z "$GSTREAMER_CFLAGS" || GSTREAMER_CFLAGS=`echo " $GSTREAMER_CFLAGS" | sed 's/ -I$[^/]$/ -I\$(top_builddir)\/\1/g'` +test -z "$GSTREAMER_LIBS" || GSTREAMER_LIBS=`echo " $GSTREAMER_LIBS" | sed 's/ -L$[^/]$/ -L\$(top_builddir)\/\1/g'` fi if test "x$ac_cv_lib_gstapp_0_10_gst_app_buffer_new" != xyes -a "x$ac_cv_header_QuickTime_ImageCompression_h" != xyes; then : @@ -11949,6 +11971,8 @@ fi PNG_CFLAGS="" fi CPPFLAGS=$ac_save_CPPFLAGS +test -z "$PNG_CFLAGS" || PNG_CFLAGS=`echo " $PNG_CFLAGS" | sed 's/ -I$[^/]$/ -I\$(top_builddir)\/\1/g'` +test -z "$PNG_LIBS" || PNG_LIBS=`echo " $PNG_LIBS" | sed 's/ -L$[^/]$/ -L\$(top_builddir)\/\1/g'` fi if test "x$ac_cv_lib_soname_png" = "x"; then :

1 0

Alexandre Julliard : secur32/tests: Run the tests against the winehq. org server.
by Alexandre Julliard July 30, 2013

July 30, 2013

Module: wine Branch: master Commit: 55e37bdbf3b92f509b897991a4cb5649222f94c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55e37bdbf3b92f509b897991a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 30 13:01:11 2013 +0200 secur32/tests: Run the tests against the winehq.org server. --- dlls/secur32/tests/schannel.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index 5076767..0bb07bf 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -513,11 +513,11 @@ static void test_remote_cert(PCCERT_CONTEXT remote_cert) cert_cnt++; } - ok(cert_cnt == 2, "cert_cnt = %u\n", cert_cnt); + ok(cert_cnt == 3, "cert_cnt = %u\n", cert_cnt); ok(incl_remote, "context does not contain cert itself\n"); } -static const char http_request[] = "HEAD /test.html HTTP/1.1\r\nHost: www.codeweavers.com\r\nConnection: close\r\n\r\n"; +static const char http_request[] = "HEAD /test.html HTTP/1.1\r\nHost: www.winehq.org\r\nConnection: close\r\n\r\n"; static void init_cred(SCHANNEL_CRED *cred) { @@ -639,7 +639,7 @@ static void test_communication(void) return; } - /* Create a socket and connect to www.codeweavers.com */ + /* Create a socket and connect to www.winehq.org */ ret = WSAStartup(0x0202, &wsa_data); if (ret) { @@ -647,10 +647,10 @@ static void test_communication(void) return; } - host = gethostbyname("www.codeweavers.com"); + host = gethostbyname("www.winehq.org"); if (!host) { - skip("Can't resolve www.codeweavers.com\n"); + skip("Can't resolve www.winehq.org\n"); return; } @@ -667,7 +667,7 @@ static void test_communication(void) ret = connect(sock, (struct sockaddr *)&addr, sizeof(addr)); if (ret == SOCKET_ERROR) { - skip("Can't connect to www.codeweavers.com\n"); + skip("Can't connect to www.winehq.org\n"); return; }

1 0

Piotr Caban : oleaut32: Store PARAMDESCEX structure inside lprgelemdescParam.
by Alexandre Julliard July 30, 2013

July 30, 2013

Module: wine Branch: master Commit: 2f707558fcd29df82afd71338591dd596807ae3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f707558fcd29df82afd71338… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 30 15:20:04 2013 +0200 oleaut32: Store PARAMDESCEX structure inside lprgelemdescParam. Thanks to this change we don't need to free the data differently depending on how it was created (by typelib reading or writing code). --- dlls/oleaut32/typelib.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 44eea5b..a8916d8 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -2356,7 +2356,7 @@ MSFT_DoFuncs(TLBContext* pcx, MSFT_ParameterInfo paraminfo; ptfd->funcdesc.lprgelemdescParam = - heap_alloc_zero(pFuncRec->nrargs * sizeof(ELEMDESC)); + heap_alloc_zero(pFuncRec->nrargs * (sizeof(ELEMDESC) + sizeof(PARAMDESCEX))); ptfd->pParamDesc = TLBParDesc_Constructor(pFuncRec->nrargs); @@ -2390,7 +2390,7 @@ MSFT_DoFuncs(TLBContext* pcx, PARAMDESC* pParamDesc = &elemdesc->u.paramdesc; - pParamDesc->pparamdescex = heap_alloc_zero(sizeof(PARAMDESCEX)); + pParamDesc->pparamdescex = (PARAMDESCEX*)(ptfd->funcdesc.lprgelemdescParam+pFuncRec->nrargs)+j; pParamDesc->pparamdescex->cBytes = sizeof(PARAMDESCEX); MSFT_ReadValue(&(pParamDesc->pparamdescex->varDefaultValue), @@ -5441,10 +5441,7 @@ static void ITypeInfoImpl_Destroy(ITypeInfoImpl *This) { ELEMDESC *elemdesc = &pFInfo->funcdesc.lprgelemdescParam[j]; if (elemdesc->u.paramdesc.wParamFlags & PARAMFLAG_FHASDEFAULT) - { VariantClear(&elemdesc->u.paramdesc.pparamdescex->varDefaultValue); - heap_free(elemdesc->u.paramdesc.pparamdescex); - } TLB_FreeCustData(&pFInfo->pParamDesc[j].custdata_list); } heap_free(pFInfo->funcdesc.lprgelemdescParam);

1 0

Bruno Jesus : ws2_32/tests: Add SO_ACCEPTCONN tests.
by Alexandre Julliard July 30, 2013

July 30, 2013

Module: wine Branch: master Commit: 4133fb4341bf5376c612af019831ae79427b7c7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4133fb4341bf5376c612af019… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Jul 30 09:58:38 2013 -0300 ws2_32/tests: Add SO_ACCEPTCONN tests. --- dlls/ws2_32/tests/sock.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index fce0b99..1a75ffd 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2460,7 +2460,7 @@ static void test_errors(void) static void test_listen(void) { SOCKET fdA, fdB; - int ret; + int ret, acceptc, olen = sizeof(acceptc); struct sockaddr_in address; memset(&address, 0, sizeof(address)); @@ -2507,9 +2507,17 @@ static void test_listen(void) ok (bind(fdB, (struct sockaddr*) &address, sizeof(address)), "bind should have failed\n"); ok (ret == WSAEINVAL, "expected 10022, received %d\n", ret); + acceptc = 0xdead; + ok (!getsockopt(fdA, SOL_SOCKET, SO_ACCEPTCONN, (char*)&acceptc, &olen), "getsockopt failed\n"); + ok (acceptc == 0, "SO_ACCEPTCONN should be 0, received %d\n", acceptc); + ok (!listen(fdA, 0), "listen failed\n"); ok (!listen(fdA, SOMAXCONN), "double listen failed\n"); + acceptc = 0xdead; + ok (!getsockopt(fdA, SOL_SOCKET, SO_ACCEPTCONN, (char*)&acceptc, &olen), "getsockopt failed\n"); + ok (acceptc == 1, "SO_ACCEPTCONN should be 1, received %d\n", acceptc); + SetLastError(0xdeadbeef); ok ((listen(fdB, SOMAXCONN) == SOCKET_ERROR), "listen did not fail\n"); ret = WSAGetLastError(); @@ -2521,7 +2529,6 @@ static void test_listen(void) fdB = socket(AF_INET, SOCK_STREAM, 0); ok ((fdB != INVALID_SOCKET), "socket failed unexpectedly: %d\n", WSAGetLastError() ); - SetLastError(0xdeadbeef); ok (bind(fdB, (struct sockaddr*) &address, sizeof(address)), "bind should have failed\n"); ret = WSAGetLastError();

1 0

Jacek Caban : mshtml: Added IHTMLTable::cellSpacing property implementation .
by Alexandre Julliard July 30, 2013

July 30, 2013

Module: wine Branch: master Commit: c897306d244c14188791d68e714121ff08c6bbda URL: http://source.winehq.org/git/wine.git/?a=commit;h=c897306d244c14188791d68e7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 30 14:10:16 2013 +0200 mshtml: Added IHTMLTable::cellSpacing property implementation. --- dlls/mshtml/htmltable.c | 42 ++++++++++++++++++++++++++++++++++++++---- dlls/mshtml/tests/dom.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmltable.c b/dlls/mshtml/htmltable.c index f3c7ba8..64157e7 100644 --- a/dlls/mshtml/htmltable.c +++ b/dlls/mshtml/htmltable.c @@ -170,15 +170,49 @@ static HRESULT WINAPI HTMLTable_get_rules(IHTMLTable *iface, BSTR *p) static HRESULT WINAPI HTMLTable_put_cellSpacing(IHTMLTable *iface, VARIANT v) { HTMLTable *This = impl_from_IHTMLTable(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + nsAString nsstr; + WCHAR buf[64]; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + switch(V_VT(&v)) { + case VT_BSTR: + nsAString_InitDepend(&nsstr, V_BSTR(&v)); + break; + case VT_I4: { + static const WCHAR formatW[] = {'%','d',0}; + sprintfW(buf, formatW, V_I4(&v)); + nsAString_InitDepend(&nsstr, buf); + break; + } + default: + FIXME("unsupported arg %s\n", debugstr_variant(&v)); + return E_NOTIMPL; + } + + nsres = nsIDOMHTMLTableElement_SetCellSpacing(This->nstable, &nsstr); + nsAString_Finish(&nsstr); + if(NS_FAILED(nsres)) { + ERR("SetCellSpacing failed: %08x\n", nsres); + return E_FAIL; + } + + return S_OK; } static HRESULT WINAPI HTMLTable_get_cellSpacing(IHTMLTable *iface, VARIANT *p) { HTMLTable *This = impl_from_IHTMLTable(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString nsstr; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&nsstr, NULL); + nsres = nsIDOMHTMLTableElement_GetCellSpacing(This->nstable, &nsstr); + V_VT(p) = VT_BSTR; + return return_nsstr(nsres, &nsstr, &V_BSTR(p)); } static HRESULT WINAPI HTMLTable_put_cellPadding(IHTMLTable *iface, VARIANT v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index da44190..8d3b951 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5513,11 +5513,29 @@ static void test_tr_elem(IHTMLElement *elem) IHTMLTableRow_Release(row); } +#define test_table_cell_spacing(a,b) _test_table_cell_spacing(__LINE__,a,b) +static void _test_table_cell_spacing(unsigned line, IHTMLTable *table, const char *exstr) +{ + VARIANT v; + HRESULT hres; + + V_VT(&v) = VT_ERROR; + hres = IHTMLTable_get_cellSpacing(table, &v); + ok_(__FILE__,line)(hres == S_OK, "get_cellSpacing failed: %08x\n", hres); + ok_(__FILE__,line)(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); + if(exstr) + ok_(__FILE__,line)(!strcmp_wa(V_BSTR(&v), exstr), "cellSpacing = %s, expected %s\n", wine_dbgstr_w(V_BSTR(&v)), exstr); + else + ok_(__FILE__,line)(!V_BSTR(&v), "cellSpacing = %s, expected NULL\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); +} + static void test_table_elem(IHTMLElement *elem) { IHTMLElementCollection *col; IHTMLTable *table; IHTMLDOMNode *node; + VARIANT v; HRESULT hres; static const elem_type_t row_types[] = {ET_TR,ET_TR}; @@ -5557,6 +5575,21 @@ static void test_table_elem(IHTMLElement *elem) test_elem_collection((IUnknown*)col, tbodies_types, sizeof(tbodies_types)/sizeof(*tbodies_types)); IHTMLElementCollection_Release(col); + test_table_cell_spacing(table, NULL); + + V_VT(&v) = VT_I4; + V_I4(&v) = 10; + hres = IHTMLTable_put_cellSpacing(table, v); + ok(hres == S_OK, "put_cellSpacing = %08x\n", hres); + test_table_cell_spacing(table, "10"); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = a2bstr("11"); + hres = IHTMLTable_put_cellSpacing(table, v); + ok(hres == S_OK, "put_cellSpacing = %08x\n", hres); + test_table_cell_spacing(table, "11"); + VariantClear(&v); + IHTMLTable_Release(table); }

1 0

Hans Leidekker : iphlpapi: Add partial support for the module classes in GetExtendedTcpTable and GetExtendedUdpTable .
by Alexandre Julliard July 30, 2013

July 30, 2013

Module: wine Branch: master Commit: 792eafa465943d5a1e20eda817a6d4556c162e7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=792eafa465943d5a1e20eda81… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jul 30 12:57:50 2013 +0200 iphlpapi: Add partial support for the module classes in GetExtendedTcpTable and GetExtendedUdpTable. --- dlls/iphlpapi/iphlpapi_main.c | 16 +++++++--------- dlls/iphlpapi/ipstats.c | 40 ++++++++++++++++++++++++++++------------ dlls/iphlpapi/tests/iphlpapi.c | 29 +++++++++++++++++++++++++++++ include/tcpmib.h | 18 ++++++++++++++++++ 4 files changed, 82 insertions(+), 21 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index e970162..837eb3d 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1859,14 +1859,14 @@ DWORD WINAPI GetExtendedTcpTable(PVOID pTcpTable, PDWORD pdwSize, BOOL bOrder, if (!pdwSize) return ERROR_INVALID_PARAMETER; - if (ulAf != AF_INET || - TableClass == TCP_TABLE_OWNER_MODULE_LISTENER || - TableClass == TCP_TABLE_OWNER_MODULE_CONNECTIONS || - TableClass == TCP_TABLE_OWNER_MODULE_ALL) + if (ulAf != AF_INET) { - FIXME("ulAf = %u, TableClass = %u not supported\n", ulAf, TableClass); + FIXME("ulAf = %u not supported\n", ulAf); return ERROR_NOT_SUPPORTED; } + if (TableClass >= TCP_TABLE_OWNER_MODULE_LISTENER) + FIXME("module classes not fully supported\n"); + if ((ret = build_tcp_table(TableClass, &table, bOrder, GetProcessHeap(), 0, &size))) return ret; @@ -1924,11 +1924,9 @@ DWORD WINAPI GetExtendedUdpTable(PVOID pUdpTable, PDWORD pdwSize, BOOL bOrder, if (!pdwSize) return ERROR_INVALID_PARAMETER; - if (ulAf != AF_INET || - (TableClass != UDP_TABLE_BASIC && TableClass != UDP_TABLE_OWNER_PID && - TableClass != UDP_TABLE_OWNER_MODULE)) + if (ulAf != AF_INET) { - FIXME("ulAf = %u, TableClass = %u not supported\n", ulAf, TableClass); + FIXME("ulAf = %u not supported\n", ulAf); return ERROR_NOT_SUPPORTED; } if (TableClass == UDP_TABLE_OWNER_MODULE) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 87651d3..9ca51e9 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -140,6 +140,7 @@ #include "wine/debug.h" #include "wine/server.h" +#include "wine/unicode.h" #ifndef HAVE_NETINET_TCP_FSM_H #define TCPS_ESTABLISHED 1 @@ -1815,6 +1816,14 @@ static DWORD get_tcp_table_sizes( TCP_TABLE_CLASS class, DWORD row_count, DWORD if (row_size) *row_size = sizeof(MIB_TCPROW_OWNER_PID); break; } + case TCP_TABLE_OWNER_MODULE_LISTENER: + case TCP_TABLE_OWNER_MODULE_CONNECTIONS: + case TCP_TABLE_OWNER_MODULE_ALL: + { + table_size = FIELD_OFFSET(MIB_TCPTABLE_OWNER_MODULE, table[row_count]); + if (row_size) *row_size = sizeof(MIB_TCPROW_OWNER_MODULE); + break; + } default: ERR("unhandled class %u\n", class); return 0; @@ -1824,7 +1833,7 @@ static DWORD get_tcp_table_sizes( TCP_TABLE_CLASS class, DWORD row_count, DWORD static MIB_TCPTABLE *append_tcp_row( TCP_TABLE_CLASS class, HANDLE heap, DWORD flags, MIB_TCPTABLE *table, DWORD *count, - const MIB_TCPROW_OWNER_PID *row, DWORD row_size ) + const MIB_TCPROW_OWNER_MODULE *row, DWORD row_size ) { if (table->dwNumEntries >= *count) { @@ -2012,7 +2021,7 @@ DWORD build_tcp_table( TCP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE DWORD *size ) { MIB_TCPTABLE *table; - MIB_TCPROW_OWNER_PID row; + MIB_TCPROW_OWNER_MODULE row; DWORD ret = NO_ERROR, count = 16, table_size, row_size; if (!(table_size = get_tcp_table_sizes( class, count, &row_size ))) @@ -2034,9 +2043,7 @@ DWORD build_tcp_table( TCP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE unsigned int dummy, num_entries = 0; int inode; - if (class == TCP_TABLE_OWNER_PID_ALL || - class == TCP_TABLE_OWNER_PID_LISTENER || - class == TCP_TABLE_OWNER_PID_CONNECTIONS) map = get_pid_map( &num_entries ); + if (class >= TCP_TABLE_OWNER_PID_LISTENER) map = get_pid_map( &num_entries ); /* skip header line */ ptr = fgets(buf, sizeof(buf), fp); @@ -2050,11 +2057,14 @@ DWORD build_tcp_table( TCP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE row.dwRemotePort = htons( row.dwRemotePort ); row.dwState = TCPStateToMIBState( row.dwState ); if (!match_class( class, row.dwState )) continue; - if (class == TCP_TABLE_OWNER_PID_ALL || - class == TCP_TABLE_OWNER_PID_LISTENER || - class == TCP_TABLE_OWNER_PID_CONNECTIONS) - row.dwOwningPid = find_owning_pid( map, num_entries, inode ); + if (class >= TCP_TABLE_OWNER_PID_LISTENER) + row.dwOwningPid = find_owning_pid( map, num_entries, inode ); + if (class >= TCP_TABLE_OWNER_MODULE_LISTENER) + { + row.liCreateTimestamp.QuadPart = 0; /* FIXME */ + memset( &row.OwningModuleInfo, 0, sizeof(row.OwningModuleInfo) ); + } if (!(table = append_tcp_row( class, heap, flags, table, &count, &row, row_size ))) break; } @@ -2304,8 +2314,7 @@ DWORD build_udp_table( UDP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE unsigned int dummy, num_entries = 0; int inode; - if (class == UDP_TABLE_OWNER_PID || class == UDP_TABLE_OWNER_MODULE) - map = get_pid_map( &num_entries ); + if (class >= UDP_TABLE_OWNER_PID) map = get_pid_map( &num_entries ); /* skip header line */ ptr = fgets( buf, sizeof(buf), fp ); @@ -2315,8 +2324,15 @@ DWORD build_udp_table( UDP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE &row.dwLocalAddr, &row.dwLocalPort, &inode ) != 4) continue; row.dwLocalPort = htons( row.dwLocalPort ); - if (class == UDP_TABLE_OWNER_PID || class == UDP_TABLE_OWNER_MODULE) + + if (class >= UDP_TABLE_OWNER_PID) row.dwOwningPid = find_owning_pid( map, num_entries, inode ); + if (class >= UDP_TABLE_OWNER_MODULE) + { + row.liCreateTimestamp.QuadPart = 0; /* FIXME */ + row.u.dwFlags = 0; + memset( &row.OwningModuleInfo, 0, sizeof(row.OwningModuleInfo) ); + } if (!(table = append_udp_row( class, heap, flags, table, &count, &row, row_size ))) break; } diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index d15e05c..dcbd3ab 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -1193,6 +1193,7 @@ static void test_GetExtendedTcpTable(void) DWORD ret, size; MIB_TCPTABLE *table; MIB_TCPTABLE_OWNER_PID *table_pid; + MIB_TCPTABLE_OWNER_MODULE *table_module; if (!pGetExtendedTcpTable) { @@ -1237,6 +1238,24 @@ static void test_GetExtendedTcpTable(void) ret = pGetExtendedTcpTable( table_pid, &size, TRUE, AF_INET, TCP_TABLE_OWNER_PID_LISTENER, 0 ); ok( ret == ERROR_SUCCESS, "got %u\n", ret ); HeapFree( GetProcessHeap(), 0, table_pid ); + + size = 0; + ret = pGetExtendedTcpTable( NULL, &size, TRUE, AF_INET, TCP_TABLE_OWNER_MODULE_ALL, 0 ); + ok( ret == ERROR_INSUFFICIENT_BUFFER, "got %u\n", ret ); + + table_module = HeapAlloc( GetProcessHeap(), 0, size ); + ret = pGetExtendedTcpTable( table_module, &size, TRUE, AF_INET, TCP_TABLE_OWNER_MODULE_ALL, 0 ); + ok( ret == ERROR_SUCCESS, "got %u\n", ret ); + HeapFree( GetProcessHeap(), 0, table_module ); + + size = 0; + ret = pGetExtendedTcpTable( NULL, &size, TRUE, AF_INET, TCP_TABLE_OWNER_MODULE_LISTENER, 0 ); + ok( ret == ERROR_INSUFFICIENT_BUFFER, "got %u\n", ret ); + + table_module = HeapAlloc( GetProcessHeap(), 0, size ); + ret = pGetExtendedTcpTable( table_module, &size, TRUE, AF_INET, TCP_TABLE_OWNER_MODULE_LISTENER, 0 ); + ok( ret == ERROR_SUCCESS, "got %u\n", ret ); + HeapFree( GetProcessHeap(), 0, table_module ); } static void test_GetExtendedUdpTable(void) @@ -1244,6 +1263,7 @@ static void test_GetExtendedUdpTable(void) DWORD ret, size; MIB_UDPTABLE *table; MIB_UDPTABLE_OWNER_PID *table_pid; + MIB_UDPTABLE_OWNER_MODULE *table_module; if (!pGetExtendedUdpTable) { @@ -1270,6 +1290,15 @@ static void test_GetExtendedUdpTable(void) ret = pGetExtendedUdpTable( table_pid, &size, TRUE, AF_INET, UDP_TABLE_OWNER_PID, 0 ); ok( ret == ERROR_SUCCESS, "got %u\n", ret ); HeapFree( GetProcessHeap(), 0, table_pid ); + + size = 0; + ret = pGetExtendedUdpTable( NULL, &size, TRUE, AF_INET, UDP_TABLE_OWNER_MODULE, 0 ); + ok( ret == ERROR_INSUFFICIENT_BUFFER, "got %u\n", ret ); + + table_module = HeapAlloc( GetProcessHeap(), 0, size ); + ret = pGetExtendedUdpTable( table_module, &size, TRUE, AF_INET, UDP_TABLE_OWNER_MODULE, 0 ); + ok( ret == ERROR_SUCCESS, "got %u\n", ret ); + HeapFree( GetProcessHeap(), 0, table_module ); } START_TEST(iphlpapi) diff --git a/include/tcpmib.h b/include/tcpmib.h index 8c3efa1..477500c 100644 --- a/include/tcpmib.h +++ b/include/tcpmib.h @@ -115,6 +115,24 @@ typedef struct _MIB_TCPTABLE_OWNER_PID MIB_TCPROW_OWNER_PID table[1]; } MIB_TCPTABLE_OWNER_PID, *PMIB_TCPTABLE_OWNER_PID; +typedef struct _MIB_TCPROW_OWNER_MODULE +{ + DWORD dwState; + DWORD dwLocalAddr; + DWORD dwLocalPort; + DWORD dwRemoteAddr; + DWORD dwRemotePort; + DWORD dwOwningPid; + LARGE_INTEGER liCreateTimestamp; + ULONGLONG OwningModuleInfo[TCPIP_OWNING_MODULE_SIZE]; +} MIB_TCPROW_OWNER_MODULE, *PMIB_TCPROW_OWNER_MODULE; + +typedef struct _MIB_TCPTABLE_OWNER_MODULE +{ + DWORD dwNumEntries; + MIB_TCPROW_OWNER_MODULE table[1]; +} MIB_TCPTABLE_OWNER_MODULE, *PMIB_TCPTABLE_OWNER_MODULE; + typedef struct _MIB_TCPROW2 { DWORD dwState;

1 0