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

Paul Vriens : setupapi/tests: Fix typos.
by Alexandre Julliard May 21, 2008

May 21, 2008

Module: wine Branch: master Commit: ed552b474ce18d6f84ef036ef952efb729c48607 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed552b474ce18d6f84ef036ef… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Wed May 21 17:18:12 2008 +0200 setupapi/tests: Fix typos. --- dlls/setupapi/tests/devinst.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 5d48cd2..f3d7415 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -435,11 +435,11 @@ static void testGetDeviceInstanceId(void) SetLastError(0xdeadbeef); ret = pSetupDiGetDeviceInstanceIdA(NULL, NULL, NULL, 0, NULL); ok(!ret && GetLastError() == ERROR_INVALID_HANDLE, - "Expected ERROR_INVALID_HANDLEHANDLE, got %08x\n", GetLastError()); + "Expected ERROR_INVALID_HANDLE, got %08x\n", GetLastError()); SetLastError(0xdeadbeef); ret = pSetupDiGetDeviceInstanceIdA(NULL, &devInfo, NULL, 0, NULL); ok(!ret && GetLastError() == ERROR_INVALID_HANDLE, - "Expected ERROR_INVALID_HANDLEHANDLE, got %08x\n", GetLastError()); + "Expected ERROR_INVALID_HANDLE, got %08x\n", GetLastError()); set = pSetupDiCreateDeviceInfoList(&guid, NULL); ok(set != NULL, "SetupDiCreateDeviceInfoList failed: %08x\n", GetLastError());

1 0

Paul Vriens : setupapi/tests: Fix typo.
by Alexandre Julliard May 21, 2008

May 21, 2008

Module: wine Branch: master Commit: fb18592c938b121f38f04a5db55f551ee90b7fab URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb18592c938b121f38f04a5db… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Wed May 21 17:03:49 2008 +0200 setupapi/tests: Fix typo. --- dlls/setupapi/tests/devinst.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 0a9a9a8..5d48cd2 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -386,7 +386,7 @@ static void testCreateDeviceInfo(void) /* Finally, with all three required parameters, this succeeds: */ ret = pSetupDiCreateDeviceInfoA(set, "Root\\LEGACY_BOGUS\\0000", &guid, NULL, NULL, 0, NULL); - ok(ret, "pSetupDiCreateDeviceInfoA failed: %08x\n", GetLastError()); + ok(ret, "SetupDiCreateDeviceInfoA failed: %08x\n", GetLastError()); /* This fails because the device ID already exists.. */ SetLastError(0xdeadbeef); ret = pSetupDiCreateDeviceInfoA(set, "Root\\LEGACY_BOGUS\\0000", &guid,

1 0

Dmitry Timoshkov : gdi32: Slightly relax EMF record comparisons allowing rounding errors.
by Alexandre Julliard May 21, 2008

May 21, 2008

Module: wine Branch: master Commit: 8021a9d903e3559e5e1784ddd4a82756c2ced49c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8021a9d903e3559e5e1784ddd… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed May 21 21:54:29 2008 +0900 gdi32: Slightly relax EMF record comparisons allowing rounding errors. --- dlls/gdi32/tests/metafile.c | 53 +++++++++++++++++++++++++++++++----------- 1 files changed, 39 insertions(+), 14 deletions(-) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 78bbd8b..d7eda2d 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -976,7 +976,7 @@ static void dump_emf_record(const ENHMETARECORD *emr, const char *desc) } static BOOL match_emf_record(const ENHMETARECORD *emr1, const ENHMETARECORD *emr2, - const char *desc, BOOL todo) + const char *desc, BOOL ignore_scaling, BOOL todo) { int diff; @@ -1010,6 +1010,13 @@ static BOOL match_emf_record(const ENHMETARECORD *emr1, const ENHMETARECORD *emr /* contents of EMR_GDICOMMENT are not interesting */ if (emr1->iType == EMR_GDICOMMENT) return TRUE; + /* different Windows versions setup DC scaling differently when + * converting an old style metafile to an EMF. + */ + if (ignore_scaling && (emr1->iType == EMR_SETWINDOWEXTEX || + emr1->iType == EMR_SETVIEWPORTEXTEX)) + return TRUE; + diff = memcmp(emr1->dParm, emr2->dParm, emr1->nSize - sizeof(EMR)); if (diff && todo) { @@ -1035,7 +1042,8 @@ static BOOL match_emf_record(const ENHMETARECORD *emr1, const ENHMETARECORD *emr * otherwise returns the number of non-matching bytes. */ static int compare_emf_bits(const HENHMETAFILE mf, const unsigned char *bits, - UINT bsize, const char *desc, BOOL todo) + UINT bsize, const char *desc, + BOOL ignore_scaling, BOOL todo) { unsigned char buf[MF_BUFSIZE]; UINT mfsize, offset; @@ -1093,7 +1101,7 @@ static int compare_emf_bits(const HENHMETAFILE mf, const unsigned char *bits, trace("EMF record %u, size %u/record %u, size %u\n", emr1->iType, emr1->nSize, emr2->iType, emr2->nSize); - if (!match_emf_record(emr1, emr2, desc, todo)) return -1; + if (!match_emf_record(emr1, emr2, desc, ignore_scaling, todo)) return -1; offset += emr1->nSize; } @@ -1433,7 +1441,7 @@ static void test_emf_ExtTextOut_on_path(void) * are there, but their contents don't match for different reasons. */ if (compare_emf_bits(hMetafile, EMF_TEXTOUT_ON_PATH_BITS, sizeof(EMF_TEXTOUT_ON_PATH_BITS), - "emf_TextOut_on_path", TRUE) != 0) + "emf_TextOut_on_path", FALSE, TRUE) != 0) { dump_emf_bits(hMetafile, "emf_TextOut_on_path"); dump_emf_records(hMetafile, "emf_TextOut_on_path"); @@ -1488,6 +1496,15 @@ static void translate( POINT *pt, UINT count, const XFORM *xform ) } } +/* Compare rectangles allowing rounding errors */ +static BOOL is_equal_rect(const RECT *rc1, const RECT *rc2) +{ + return abs(rc1->left - rc2->left) <= 1 && + abs(rc1->top - rc2->top) <= 1 && + abs(rc1->right - rc2->right) <= 1 && + abs(rc1->bottom - rc2->bottom) <= 1; +} + static int CALLBACK clip_emf_enum_proc(HDC hdc, HANDLETABLE *handle_table, const ENHMETARECORD *emr, int n_objs, LPARAM param) { @@ -1574,7 +1591,7 @@ static int CALLBACK clip_emf_enum_proc(HDC hdc, HANDLETABLE *handle_table, translate((POINT *)&rc_transformed, 2, &xform); trace("transformed (%d,%d-%d,%d)\n", rc_transformed.left, rc_transformed.top, rc_transformed.right, rc_transformed.bottom); - ok(EqualRect(&rect, &rc_transformed), "rects don't match\n"); + ok(is_equal_rect(&rect, &rc_transformed), "rects don't match\n"); rect = *(const RECT *)rgn2.data.Buffer; trace("rect (%d,%d-%d,%d)\n", rect.left, rect.top, rect.right, rect.bottom); @@ -1582,7 +1599,7 @@ static int CALLBACK clip_emf_enum_proc(HDC hdc, HANDLETABLE *handle_table, translate((POINT *)&rc_transformed, 2, &xform); trace("transformed (%d,%d-%d,%d)\n", rc_transformed.left, rc_transformed.top, rc_transformed.right, rc_transformed.bottom); - ok(EqualRect(&rect, &rc_transformed), "rects don't match\n"); + ok(is_equal_rect(&rect, &rc_transformed), "rects don't match\n"); ok(rgn2.data.rdh.dwSize == sizeof(rgn1->data.rdh), "expected sizeof(rdh), got %u\n", rgn2.data.rdh.dwSize); ok(rgn2.data.rdh.iType == RDH_RECTANGLES, "expected RDH_RECTANGLES, got %u\n", rgn2.data.rdh.iType); @@ -1620,7 +1637,7 @@ static void test_emf_clipping(void) ok(hemf != 0, "CloseEnhMetaFile error %d\n", GetLastError()); if (compare_emf_bits(hemf, EMF_CLIPPING, sizeof(EMF_CLIPPING), - "emf_clipping", TRUE) != 0) + "emf_clipping", FALSE, TRUE) != 0) { dump_emf_bits(hemf, "emf_clipping"); dump_emf_records(hemf, "emf_clipping"); @@ -1686,6 +1703,7 @@ static HENHMETAFILE create_converted_emf(const METAFILEPICT *mfp) { HDC hdcMf; HMETAFILE hmf; + HENHMETAFILE hemf; BOOL ret; UINT size; LPBYTE pBits; @@ -1708,7 +1726,9 @@ static HENHMETAFILE create_converted_emf(const METAFILEPICT *mfp) pBits = HeapAlloc(GetProcessHeap(), 0, size); GetMetaFileBitsEx(hmf, size, pBits); DeleteMetaFile(hmf); - return SetWinMetaFileBits(size, pBits, NULL, mfp); + hemf = SetWinMetaFileBits(size, pBits, NULL, mfp); + HeapFree(GetProcessHeap(), 0, pBits); + return hemf; } static void test_mf_conversions(void) @@ -1726,7 +1746,7 @@ static void test_mf_conversions(void) hemf = create_converted_emf(&mfp); if (compare_emf_bits(hemf, EMF_LINETO_MM_ANISOTROPIC_BITS, sizeof(EMF_LINETO_MM_ANISOTROPIC_BITS), - "emf_LineTo MM_ANISOTROPIC", TRUE) != 0) + "emf_LineTo MM_ANISOTROPIC", TRUE, TRUE) != 0) { dump_emf_bits(hemf, "emf_LineTo MM_ANISOTROPIC"); dump_emf_records(hemf, "emf_LineTo MM_ANISOTROPIC"); @@ -1751,7 +1771,7 @@ static void test_mf_conversions(void) hemf = create_converted_emf(&mfp); if (compare_emf_bits(hemf, EMF_LINETO_MM_TEXT_BITS, sizeof(EMF_LINETO_MM_TEXT_BITS), - "emf_LineTo MM_TEXT", TRUE) != 0) + "emf_LineTo MM_TEXT", TRUE, TRUE) != 0) { dump_emf_bits(hemf, "emf_LineTo MM_TEXT"); dump_emf_records(hemf, "emf_LineTo MM_TEXT"); @@ -1771,7 +1791,7 @@ static void test_mf_conversions(void) hemf = create_converted_emf(NULL); if (compare_emf_bits(hemf, EMF_LINETO_BITS, sizeof(EMF_LINETO_BITS), - "emf_LineTo NULL", TRUE) != 0) + "emf_LineTo NULL", TRUE, TRUE) != 0) { dump_emf_bits(hemf, "emf_LineTo NULL"); dump_emf_records(hemf, "emf_LineTo NULL"); @@ -1920,12 +1940,17 @@ static void test_SetWinMetaFileBits(void) ok(diffx <= 1, "SetWinMetaFileBits (MM_ISOTROPIC): Reference bounds are not isotropic\n"); dc = CreateCompatibleDC(NULL); + + /* Allow 1 mm difference (rounding errors) */ + diffx = rclBoundsAnisotropic.right - GetDeviceCaps(dc, HORZRES) / 2; + diffy = rclBoundsAnisotropic.bottom - GetDeviceCaps(dc, VERTRES) / 2; + if (diffx < 0) diffx = -diffx; + if (diffy < 0) diffy = -diffy; todo_wine { - ok(rclBoundsAnisotropic.right == GetDeviceCaps(dc, HORZRES) / 2 - 1 && - rclBoundsAnisotropic.bottom == GetDeviceCaps(dc, VERTRES) / 2 - 1, + ok(diffx <= 1 && diffy <= 1, "SetWinMetaFileBits (MM_ANISOTROPIC): Reference bounds: The whole device surface must be used (%dx%d), but got (%dx%d)\n", - GetDeviceCaps(dc, HORZRES) / 2 - 1, GetDeviceCaps(dc, VERTRES) / 2 - 1, rclBoundsAnisotropic.right, rclBoundsAnisotropic.bottom); + GetDeviceCaps(dc, HORZRES) / 2, GetDeviceCaps(dc, VERTRES) / 2, rclBoundsAnisotropic.right, rclBoundsAnisotropic.bottom); } /* Allow 1 mm difference (rounding errors) */

1 0

Paul Vriens : setupapi/tests: Remove a duplicate function call.
by Alexandre Julliard May 21, 2008

May 21, 2008

Module: wine Branch: master Commit: 59b65064395d2a4e2ddb068819aa6621552a1ef7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59b65064395d2a4e2ddb06881… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Wed May 21 16:45:50 2008 +0200 setupapi/tests: Remove a duplicate function call. --- dlls/setupapi/tests/devinst.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index f64d9b4..822cd28 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -492,7 +492,6 @@ static void testRegisterDeviceInfo(void) ret = pSetupDiRegisterDeviceInfo(NULL, NULL, 0, NULL, NULL, NULL); ok(!ret && GetLastError() == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); - ret = pSetupDiRegisterDeviceInfo(NULL, NULL, 0, NULL, NULL, NULL); set = pSetupDiCreateDeviceInfoList(&guid, NULL); ok(set != NULL, "SetupDiCreateDeviceInfoList failed: %d\n", GetLastError()); if (set)

1 0

Paul Vriens : setupapi/tests: Skip some tests if we are on win9x.
by Alexandre Julliard May 21, 2008

May 21, 2008

Module: wine Branch: master Commit: bece26be546b518c7432e956ea1af1db78625c4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bece26be546b518c7432e956e… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Wed May 21 17:00:11 2008 +0200 setupapi/tests: Skip some tests if we are on win9x. --- dlls/setupapi/tests/devinst.c | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 822cd28..0a9a9a8 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -349,8 +349,22 @@ static void testCreateDeviceInfo(void) } SetLastError(0xdeadbeef); ret = pSetupDiCreateDeviceInfoA(NULL, NULL, NULL, NULL, NULL, 0, NULL); - ok(!ret && GetLastError() == ERROR_INVALID_DEVINST_NAME, - "Expected ERROR_INVALID_DEVINST_NAME, got %08x\n", GetLastError()); + ok(!ret, "Expected failure\n"); + ok(GetLastError() == ERROR_INVALID_DEVINST_NAME || + GetLastError() == ERROR_INVALID_PARAMETER /* NT4 */ || + GetLastError() == ERROR_INVALID_HANDLE /* Win9x */, + "Unexpected last error, got %08x\n", GetLastError()); + + /* If we are running on win9x we should skip these tests. Win95 + * fails most tests anyway and win98 pops up the "Add New Hardware + * Wizard". + */ + if (GetLastError() == ERROR_INVALID_HANDLE) + { + skip("We are on win9x where the tests introduce issues\n"); + return; + } + SetLastError(0xdeadbeef); ret = pSetupDiCreateDeviceInfoA(NULL, "Root\\LEGACY_BOGUS\\0000", NULL, NULL, NULL, 0, NULL);

1 0

Alexandre Julliard : configure: Upgrade notices to warnings for some important libraries.
by Alexandre Julliard May 21, 2008

May 21, 2008

Module: wine Branch: master Commit: 63ea670370fa288cfb4c3020801d35b6f7fcaacf URL: http://source.winehq.org/git/wine.git/?a=commit;h=63ea670370fa288cfb4c30208… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 21 15:00:28 2008 +0200 configure: Upgrade notices to warnings for some important libraries. --- configure | 12 ++++++------ configure.ac | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/configure b/configure index 071e566..a828897 100755 --- a/configure +++ b/configure @@ -10325,7 +10325,7 @@ fi fi if test "x$ac_cv_lib_soname_Xrender" = "x"; then case "x$with_xrender" in - x) wine_notices="$wine_notices|libxrender development files not found, XRender won't be supported." ;; + x) wine_warnings="$wine_warnings|libxrender development files not found, XRender won't be supported." ;; xno) ;; *) { { echo "$as_me:$LINENO: error: libxrender development files not found, XRender won't be supported. This is an error since --with-xrender was requested." >&5 @@ -11963,7 +11963,7 @@ done fi if test "$ac_cv_lib_xml2_xmlParseMemory" != "yes"; then case "x$with_xml" in - x) wine_notices="$wine_notices|libxml2 development files not found, XML won't be supported." ;; + x) wine_warnings="$wine_warnings|libxml2 development files not found, XML won't be supported." ;; xno) ;; *) { { echo "$as_me:$LINENO: error: libxml2 development files not found, XML won't be supported. This is an error since --with-xml was requested." >&5 @@ -12222,7 +12222,7 @@ fi fi if test "$ac_cv_lib_xslt_xsltCompilePattern" != "yes"; then case "x$with_xslt" in - x) wine_notices="$wine_notices|libxslt development files not found, xslt won't be supported." ;; + x) wine_warnings="$wine_warnings|libxslt development files not found, xslt won't be supported." ;; xno) ;; *) { { echo "$as_me:$LINENO: error: libxslt development files not found, xslt won't be supported. This is an error since --with-xslt was requested." >&5 @@ -15830,7 +15830,7 @@ fi fi if test "x$ac_cv_lib_soname_ssl" = "x" -o "x$ac_cv_lib_soname_crypto" = "x"; then case "x$with_openssl" in - x) wine_notices="$wine_notices|OpenSSL development files not found, SSL won't be supported." ;; + x) wine_warnings="$wine_warnings|OpenSSL development files not found, SSL won't be supported." ;; xno) ;; *) { { echo "$as_me:$LINENO: error: OpenSSL development files not found, SSL won't be supported. This is an error since --with-openssl was requested." >&5 @@ -15924,7 +15924,7 @@ fi fi if test "x$ac_cv_lib_soname_jpeg" = "x"; then case "x$with_jpeg" in - x) wine_notices="$wine_notices|libjpeg development files not found, JPEG won't be supported." ;; + x) wine_warnings="$wine_warnings|libjpeg development files not found, JPEG won't be supported." ;; xno) ;; *) { { echo "$as_me:$LINENO: error: libjpeg development files not found, JPEG won't be supported. This is an error since --with-jpeg was requested." >&5 @@ -16018,7 +16018,7 @@ fi fi if test "x$ac_cv_lib_soname_png" = "x"; then case "x$with_png" in - x) wine_notices="$wine_notices|libpng development files not found, PNG won't be supported." ;; + x) wine_warnings="$wine_warnings|libpng development files not found, PNG won't be supported." ;; xno) ;; *) { { echo "$as_me:$LINENO: error: libpng development files not found, PNG won't be supported. This is an error since --with-png was requested." >&5 diff --git a/configure.ac b/configure.ac index e3028bb..59dc996 100644 --- a/configure.ac +++ b/configure.ac @@ -670,7 +670,7 @@ then [$X_LIBS -lXext -lX11 $X_EXTRA_LIBS])],,[$X_LIBS -lXext -lX11 $X_EXTRA_LIBS]) fi - WINE_NOTICE_WITH(xrender,[test "x$ac_cv_lib_soname_Xrender" = "x"], + WINE_WARNING_WITH(xrender,[test "x$ac_cv_lib_soname_Xrender" = "x"], [libxrender development files not found, XRender won't be supported.]) dnl *** Check for X RandR extension @@ -816,7 +816,7 @@ then ]) CPPFLAGS="$ac_save_CPPFLAGS" fi -WINE_NOTICE_WITH(xml,[test "$ac_cv_lib_xml2_xmlParseMemory" != "yes"], +WINE_WARNING_WITH(xml,[test "$ac_cv_lib_xml2_xmlParseMemory" != "yes"], [libxml2 development files not found, XML won't be supported.]) if test "x$with_xslt" != "xno" @@ -848,7 +848,7 @@ then LIBS="$ac_save_LIBS"],,$ac_xslt_libs) fi fi -WINE_NOTICE_WITH(xslt,[test "$ac_cv_lib_xslt_xsltCompilePattern" != "yes"], +WINE_WARNING_WITH(xslt,[test "$ac_cv_lib_xslt_xsltCompilePattern" != "yes"], [libxslt development files not found, xslt won't be supported.]) dnl **** Check for libhal **** @@ -1166,7 +1166,7 @@ then WINE_CHECK_SONAME(ssl,SSL_library_init) WINE_CHECK_SONAME(crypto,BIO_new_socket) fi -WINE_NOTICE_WITH(openssl,[test "x$ac_cv_lib_soname_ssl" = "x" -o "x$ac_cv_lib_soname_crypto" = "x"], +WINE_WARNING_WITH(openssl,[test "x$ac_cv_lib_soname_ssl" = "x" -o "x$ac_cv_lib_soname_crypto" = "x"], [OpenSSL development files not found, SSL won't be supported.]) dnl **** Check for libjpeg **** @@ -1174,7 +1174,7 @@ if test "$ac_cv_header_jpeglib_h" = "yes" then WINE_CHECK_SONAME(jpeg,jpeg_start_decompress) fi -WINE_NOTICE_WITH(jpeg,[test "x$ac_cv_lib_soname_jpeg" = "x"], +WINE_WARNING_WITH(jpeg,[test "x$ac_cv_lib_soname_jpeg" = "x"], [libjpeg development files not found, JPEG won't be supported.]) dnl **** Check for libpng **** @@ -1182,7 +1182,7 @@ if test "$ac_cv_header_png_h" = "yes" then WINE_CHECK_SONAME(png,png_create_read_struct,,,,[[libpng[[0-9]]*]]) fi -WINE_NOTICE_WITH(png,[test "x$ac_cv_lib_soname_png" = "x"], +WINE_WARNING_WITH(png,[test "x$ac_cv_lib_soname_png" = "x"], [libpng development files not found, PNG won't be supported.]) dnl **** Check for libodbc ****

1 0

Alexandre Julliard : configure: Make the lack of FreeType an error, and add a --without option for it.
by Alexandre Julliard May 21, 2008

May 21, 2008

Module: wine Branch: master Commit: a20c0e124bb3292ef2a35081af7cfea8fa21954b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a20c0e124bb3292ef2a35081a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 21 14:55:53 2008 +0200 configure: Make the lack of FreeType an error, and add a --without option for it. --- configure | 31 ++++++++++++++++++++++--------- configure.ac | 13 ++++--------- 2 files changed, 26 insertions(+), 18 deletions(-) diff --git a/configure b/configure index 26899f1..071e566 100755 --- a/configure +++ b/configure @@ -1387,6 +1387,7 @@ Optional Packages: --without-curses do not use (n)curses --without-esd do not use the EsounD sound support --without-fontconfig do not use fontconfig + --without-freetype do not use the FreeType library --without-gphoto do not use gphoto (Digital Camera support) --without-glu do not use the GLU library --without-hal do not use HAL (dynamic device support) @@ -1967,6 +1968,12 @@ if test "${with_fontconfig+set}" = set; then fi +# Check whether --with-freetype was given. +if test "${with_freetype+set}" = set; then + withval=$with_freetype; +fi + + # Check whether --with-gphoto was given. if test "${with_gphoto+set}" = set; then withval=$with_gphoto; @@ -13866,7 +13873,7 @@ fi done test -n "$ft_devel" || ft_devel="false" -if test "$ft_devel" != "false" +if test "$ft_devel" != "false" -a "x$with_freetype" != "xno" then ac_freetype_libs=`$ft_devel --libs` ac_freetype_incl=`$ft_devel --cflags` @@ -14245,19 +14252,25 @@ _ACEOF FREETYPEINCL="$ac_freetype_incl" + FONTSSUBDIRS="fonts" + fi fi fi - -if test "x$FREETYPELIBS" = "x" -then - wine_warnings="$wine_warnings|FreeType development files not found. -Fonts will not be built. Dialog text may be invisible or unaligned." -else - FONTSSUBDIRS="fonts" - +if test "x$FREETYPELIBS" = "x"; then + case "x$with_freetype" in + xno) ;; + *) { { echo "$as_me:$LINENO: error: FreeType development files not found. +Fonts will not be built. Dialog text may be invisible or unaligned. +Use the --without-freetype option if you really want this." >&5 +echo "$as_me: error: FreeType development files not found. +Fonts will not be built. Dialog text may be invisible or unaligned. +Use the --without-freetype option if you really want this." >&2;} + { (exit 1); exit 1; }; } ;; +esac fi + { echo "$as_me:$LINENO: checking for parport header/ppdev.h" >&5 echo $ECHO_N "checking for parport header/ppdev.h... $ECHO_C" >&6; } if test "${ac_cv_c_ppdev+set}" = set; then diff --git a/configure.ac b/configure.ac index 942d989..e3028bb 100644 --- a/configure.ac +++ b/configure.ac @@ -34,6 +34,7 @@ AC_ARG_WITH(curses, AS_HELP_STRING([--without-curses],[do not use (n)curses]) AC_ARG_WITH(esd, AS_HELP_STRING([--without-esd],[do not use the EsounD sound support])) AC_ARG_WITH(fontconfig,AS_HELP_STRING([--without-fontconfig],[do not use fontconfig]), [if test "x$withval" = "xno"; then ac_cv_header_fontconfig_fontconfig_h=no; fi]) +AC_ARG_WITH(freetype, AS_HELP_STRING([--without-freetype],[do not use the FreeType library])) AC_ARG_WITH(gphoto, AS_HELP_STRING([--without-gphoto],[do not use gphoto (Digital Camera support)])) AC_ARG_WITH(glu, AS_HELP_STRING([--without-glu],[do not use the GLU library]), [if test "x$withval" = "xno"; then ac_cv_header_GL_glu_h=no; fi]) @@ -974,7 +975,7 @@ WINE_NOTICE_WITH(ldap,[test "x$LDAPLIBS" = "x"], dnl **** Check for FreeType 2 **** AC_CHECK_PROGS(ft_devel,[freetype-config freetype2-config],false) -if test "$ft_devel" != "false" +if test "$ft_devel" != "false" -a "x$with_freetype" != "xno" then ac_freetype_libs=`$ft_devel --libs` ac_freetype_incl=`$ft_devel --cflags` @@ -1014,18 +1015,12 @@ then AC_DEFINE(HAVE_FREETYPE, 1, [Define if FreeType 2 is installed]) AC_SUBST(FREETYPELIBS,"$ac_freetype_libs") AC_SUBST(FREETYPEINCL,"$ac_freetype_incl") + AC_SUBST(FONTSSUBDIRS,"fonts") fi fi fi - -dnl Only build the fonts dir if we have freetype -if test "x$FREETYPELIBS" = "x" -then - WINE_WARNING([FreeType development files not found. +WINE_ERROR_WITH(freetype,[test "x$FREETYPELIBS" = "x"],[FreeType development files not found. Fonts will not be built. Dialog text may be invisible or unaligned.]) -else - AC_SUBST(FONTSSUBDIRS,"fonts") -fi dnl **** Check for parport (currently Linux only) **** AC_CACHE_CHECK([for parport header/ppdev.h], ac_cv_c_ppdev,

1 0

Alexandre Julliard : configure: Added an ERROR_WITH macro for packages that we can't do without.
by Alexandre Julliard May 21, 2008

May 21, 2008

Module: wine Branch: master Commit: 76adea11a0a9ea7f1c1ca28988d8ff3c2d9cde04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76adea11a0a9ea7f1c1ca2898… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 21 14:48:33 2008 +0200 configure: Added an ERROR_WITH macro for packages that we can't do without. --- aclocal.m4 | 6 ++++++ configure | 7 ++----- configure.ac | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index dcbe78b..0f36122 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -178,6 +178,12 @@ AC_DEFUN([WINE_WARNING_WITH],[AS_IF([$2],[case "x$with_$1" in This is an error since --with-$1 was requested.]) ;; esac])]) +AC_DEFUN([WINE_ERROR_WITH],[AS_IF([$2],[case "x$with_$1" in + xno) ;; + *) AC_MSG_ERROR([$3 +Use the --without-$1 option if you really want this.]) ;; +esac])]) + AC_DEFUN([WINE_PRINT_MESSAGES],[ac_save_IFS="$IFS" IFS="|" if test "x$wine_notices != "x; then diff --git a/configure b/configure index e572c7f..26899f1 100755 --- a/configure +++ b/configure @@ -11563,18 +11563,15 @@ else fi if test "x$XLIB" = "x"; then case "x$with_x" in - x) wine_warnings="$wine_warnings|X development files not found. Wine will be built -without X support, which probably isn't what you want. You will need to install -development packages of Xlib/Xfree86 at the very least." ;; xno) ;; *) { { echo "$as_me:$LINENO: error: X development files not found. Wine will be built without X support, which probably isn't what you want. You will need to install development packages of Xlib/Xfree86 at the very least. -This is an error since --with-x was requested." >&5 +Use the --without-x option if you really want this." >&5 echo "$as_me: error: X development files not found. Wine will be built without X support, which probably isn't what you want. You will need to install development packages of Xlib/Xfree86 at the very least. -This is an error since --with-x was requested." >&2;} +Use the --without-x option if you really want this." >&2;} { (exit 1); exit 1; }; } ;; esac fi diff --git a/configure.ac b/configure.ac index fc81d92..942d989 100644 --- a/configure.ac +++ b/configure.ac @@ -781,7 +781,7 @@ else X_CFLAGS="" X_LIBS="" fi -WINE_WARNING_WITH(x,[test "x$XLIB" = "x"],[X development files not found. Wine will be built +WINE_ERROR_WITH(x,[test "x$XLIB" = "x"],[X development files not found. Wine will be built without X support, which probably isn't what you want. You will need to install development packages of Xlib/Xfree86 at the very least.])

1 0

Tomasz Jezierski : comctl32: Conformance test for multiple selection in listbox.
by Alexandre Julliard May 21, 2008

May 21, 2008

Module: wine Branch: master Commit: 1f051b8a7dd78c3adbb9687a5d681e275ffaeb49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f051b8a7dd78c3adbb9687a5… Author: Tomasz Jezierski <developers(a)tefnet.pl> Date: Mon May 19 16:17:22 2008 +0200 comctl32: Conformance test for multiple selection in listbox. --- dlls/comctl32/tests/listview.c | 76 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 76 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 91f9d00..790d8b6 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -1127,6 +1127,81 @@ static void test_getorigin(void) } +static void test_multiselect(void) +{ + typedef struct t_select_task + { + const char *descr; + int initPos; + int loopVK; + int count; + int result; + } select_task; + + HWND hwnd; + DWORD r; + int i,j,item_count,selected_count; + static const int items=5; + BYTE kstate[256]; + select_task task; + + static struct t_select_task task_list[] = { + { "using VK_DOWN", 0, VK_DOWN, -1, -1 }, + { "using VK_UP", -1, VK_UP, -1, -1 }, + { "using VK_END", 0, VK_END, 1, -1 }, + { "using VK_HOME", -1, VK_HOME, 1, -1 } + }; + + + hwnd = create_listview_control(); + + for (i=0;i<items;i++) { + insert_item(hwnd, 0); + } + + item_count = (int)SendMessage(hwnd, LVM_GETITEMCOUNT, 0, 0); + + expect(items,item_count); + + for (i=0;i<4;i++) { + task = task_list[i]; + + /* deselect all items */ + ListView_SetItemState(hwnd, -1, 0, LVIS_SELECTED); + SendMessage(hwnd, LVM_SETSELECTIONMARK, 0, -1); + + /* set initial position */ + SendMessage(hwnd, LVM_SETSELECTIONMARK, 0, (task.initPos == -1 ? item_count : task.initPos)); + ListView_SetItemState(hwnd,(task.initPos == -1 ? item_count -1 : task.initPos),LVIS_SELECTED ,LVIS_SELECTED); + + selected_count = (int)SendMessage(hwnd, LVM_GETSELECTEDCOUNT, 0, 0); + + ok(selected_count == 1, "There should be only one selected item at the begining (is %d)\n",selected_count); + + /* Set SHIFT key pressed */ + GetKeyboardState(kstate); + kstate[VK_SHIFT]=0x80; + SetKeyboardState(kstate); + + for (j=1;j<=(task.count == -1 ? item_count : task.count);j++) { + r = SendMessage(hwnd, WM_KEYDOWN, task.loopVK, 0); + expect(0,r); + r = SendMessage(hwnd, WM_KEYUP, task.loopVK, 0); + expect(0,r); + } + + selected_count = (int)SendMessage(hwnd, LVM_GETSELECTEDCOUNT, 0, 0); + + ok((task.result == -1 ? item_count : task.result) == selected_count, "Failed multiple selection %s. There should be %d selected items (is %d)\n", task.descr, item_count, selected_count); + + /* Set SHIFT key released */ + GetKeyboardState(kstate); + kstate[VK_SHIFT]=0x00; + SetKeyboardState(kstate); + } + DestroyWindow(hwnd); +} + START_TEST(listview) { HMODULE hComctl32; @@ -1163,4 +1238,5 @@ START_TEST(listview) test_item_position(); test_columns(); test_getorigin(); + test_multiselect(); }

1 0

Alexandre Julliard : comctl32: Fix extending a multiple listview selection.
by Alexandre Julliard May 21, 2008

May 21, 2008

Module: wine Branch: master Commit: 5315da844572aeb35e02a4a84c6ba8b7c661e791 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5315da844572aeb35e02a4a84… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 21 14:26:35 2008 +0200 comctl32: Fix extending a multiple listview selection. --- dlls/comctl32/listview.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 26a9eb2..0bec1d4 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -7521,10 +7521,9 @@ static BOOL LISTVIEW_SetItemState(LISTVIEW_INFO *infoPtr, INT nItem, const LVITE */ if (bResult && (lvItem.state & lvItem.stateMask & LVIS_SELECTED) && - ((infoPtr->nSelectionMark == -1) || (lvItem.iItem <= infoPtr->nSelectionMark))) + (infoPtr->nSelectionMark == -1)) { int i; - infoPtr->nSelectionMark = -1; for (i = 0; i < infoPtr->nItemCount; i++) { if (infoPtr->uCallbackMask & LVIS_SELECTED)

1 0