February 2009 - Wine-Commits

Alexandre Julliard : winegcc: Hardcode the various gcc tool names when cross-compiling.
by Alexandre Julliard Feb. 12, 2009

Feb. 12, 2009

Module: wine Branch: master Commit: b58ef6bff66f09fb8e4e23ebb4cb463d649445ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=b58ef6bff66f09fb8e4e23ebb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 12 11:41:56 2009 +0100 winegcc: Hardcode the various gcc tool names when cross-compiling. --- tools/winegcc/winegcc.c | 35 ++++++++++++++++++++++++++++------- 1 files changed, 28 insertions(+), 7 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index d216d9b..2ac08f2 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -285,17 +285,38 @@ static char* get_temp_file(const char* prefix, const char* suffix) static const strarray* get_translator(struct options *opts) { const char *str; + strarray *ret; switch(opts->processor) { - case proc_cpp: str = CPP; break; - case proc_cc: str = CC; break; - case proc_cxx: str = CXX; break; - case proc_as: str = AS; break; - default: assert(0); + case proc_cpp: + if (opts->target) str = strmake( "%s-cpp", opts->target ); + else str = CPP; + break; + case proc_cc: + if (opts->target) str = strmake( "%s-gcc", opts->target ); + else str = CC; + break; + case proc_cxx: + if (opts->target) str = strmake( "%s-g++", opts->target ); + else str = CXX; + break; + case proc_as: + if (opts->target) str = strmake( "%s-as", opts->target ); + else str = AS; + break; + default: + assert(0); + } + ret = strarray_fromstring( str, " " ); + if (opts->force_pointer_size) + { + if (opts->processor == proc_as) + strarray_add( ret, strmake("--%u", 8 * opts->force_pointer_size )); + else + strarray_add( ret, strmake("-m%u", 8 * opts->force_pointer_size )); } - if (opts->target) str = strmake( "%s-%s", opts->target, str ); - return strarray_fromstring( str, " " ); + return ret; } static void compile(struct options* opts, const char* lang)

1 0

Alexandre Julliard : configure: Move down the X11 checks to allow defaulting to --without-x for the Windows build .
by Alexandre Julliard Feb. 12, 2009

Feb. 12, 2009

Module: wine Branch: master Commit: 40664c0c54cceb7f34f2896030afdfcffe7c8a97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40664c0c54cceb7f34f289603… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 11 20:40:58 2009 +0100 configure: Move down the X11 checks to allow defaulting to --without-x for the Windows build. --- configure | 3253 +++++++++++++++++++++++++++++----------------------------- configure.ac | 6 +- 2 files changed, 1631 insertions(+), 1628 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=40664c0c54cceb7f34f28…

1 0

Alexandre Julliard : configure: Print an error and fail if we don' t have libpthread.
by Alexandre Julliard Feb. 12, 2009

Feb. 12, 2009

Module: wine Branch: master Commit: c891f6bca74c4de74fba91a9a17ed9a43326a771 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c891f6bca74c4de74fba91a9a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 11 20:41:50 2009 +0100 configure: Print an error and fail if we don't have libpthread. --- configure | 169 +++++++++++++++++++++++++++++++++------------------------ configure.ac | 14 ++++- 2 files changed, 110 insertions(+), 73 deletions(-) diff --git a/configure b/configure index 691aa0d..b4fd46f 100755 --- a/configure +++ b/configure @@ -690,6 +690,7 @@ X_LIBS X_PRE_LIBS X_CFLAGS XMKMF +LIBPTHREAD CROSSTEST CROSSWINDRES CROSSCC @@ -715,7 +716,6 @@ DLLEXT CPP OPENGL_LIBS XLIB -LIBPTHREAD PRELINK ICOTOOL RSVG @@ -840,6 +840,7 @@ with_opengl with_openssl with_oss with_png +with_pthread with_sane with_xcomposite with_xcursor @@ -1529,6 +1530,7 @@ Optional Packages: --without-openssl do not use OpenSSL --without-oss do not use the OSS sound support --without-png do not use PNG + --without-pthread do not use the pthread library --without-sane do not use SANE (scanner support) --without-xcomposite do not use the Xcomposite extension --without-xcursor do not use the Xcursor extension @@ -2198,6 +2200,12 @@ if test "${with_png+set}" = set; then fi +# Check whether --with-pthread was given. +if test "${with_pthread+set}" = set; then + withval=$with_pthread; if test "x$withval" = "xno"; then ac_cv_header_pthread_h=no; fi +fi + + # Check whether --with-sane was given. if test "${with_sane+set}" = set; then withval=$with_sane; @@ -5445,76 +5453,6 @@ _ACEOF fi -{ $as_echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5 -$as_echo_n "checking for pthread_create in -lpthread... " >&6; } -if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lpthread $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char pthread_create (); -int -main () -{ -return pthread_create (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_lib_pthread_pthread_create=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_pthread_pthread_create=no -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5 -$as_echo "$ac_cv_lib_pthread_pthread_create" >&6; } -if test "x$ac_cv_lib_pthread_pthread_create" = x""yes; then - LIBPTHREAD="-lpthread" - -fi - XLIB="" @@ -7570,6 +7508,7 @@ fi enable_loader=${enable_loader:-no} enable_server=${enable_server:-no} with_x=${with_x:-no} + with_pthread=${with_pthread:-no} ;; darwin*|macosx*) DLLEXT=".so" @@ -8618,6 +8557,94 @@ test -n "$MINGWAR" || MINGWAR="false" fi +if test "$ac_cv_header_pthread_h" = "yes" +then + { $as_echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5 +$as_echo_n "checking for pthread_create in -lpthread... " >&6; } +if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lpthread $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char pthread_create (); +int +main () +{ +return pthread_create (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ac_cv_lib_pthread_pthread_create=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_pthread_pthread_create=no +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5 +$as_echo "$ac_cv_lib_pthread_pthread_create" >&6; } +if test "x$ac_cv_lib_pthread_pthread_create" = x""yes; then + LIBPTHREAD="-lpthread" + +fi + +fi +if test "x$LIBPTHREAD" = "x"; then + case "x$with_pthread" in + xno) ;; + *) { { $as_echo "$as_me:$LINENO: error: pthread ${notice_platform}development files not found. +Wine cannot support threads without libpthread. +Use the --without-pthread option if you really want this." >&5 +$as_echo "$as_me: error: pthread ${notice_platform}development files not found. +Wine cannot support threads without libpthread. +Use the --without-pthread option if you really want this." >&2;} + { (exit 1); exit 1; }; } ;; +esac +fi + + + { $as_echo "$as_me:$LINENO: checking for X" >&5 $as_echo_n "checking for X... " >&6; } diff --git a/configure.ac b/configure.ac index 074ad97..34650c8 100644 --- a/configure.ac +++ b/configure.ac @@ -56,6 +56,8 @@ AC_ARG_WITH(oss, AS_HELP_STRING([--without-oss],[do not use the OSS sound [if test "x$withval" = "xno"; then ac_cv_header_soundcard_h=no; ac_cv_header_sys_soundcard_h=no; ac_cv_header_machine_soundcard_h=no; fi]) AC_ARG_WITH(png, AS_HELP_STRING([--without-png],[do not use PNG]), [if test "x$withval" = "xno"; then ac_cv_header_png_h=no; fi]) +AC_ARG_WITH(pthread, AS_HELP_STRING([--without-pthread],[do not use the pthread library]), + [if test "x$withval" = "xno"; then ac_cv_header_pthread_h=no; fi]) AC_ARG_WITH(sane, AS_HELP_STRING([--without-sane],[do not use SANE (scanner support)])) AC_ARG_WITH(xcomposite,AS_HELP_STRING([--without-xcomposite],[do not use the Xcomposite extension]), [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xcomposite_h=no; fi]) @@ -240,8 +242,6 @@ dnl Check for -li386 for NetBSD and OpenBSD AC_CHECK_LIB(i386,i386_set_ldt) dnl Check for -lossaudio for NetBSD AC_CHECK_LIB(ossaudio,_oss_ioctl) -dnl Check for -lpthread -AC_CHECK_LIB(pthread,pthread_create,AC_SUBST(LIBPTHREAD,"-lpthread")) AC_SUBST(XLIB,"") AC_SUBST(OPENGL_LIBS,"") @@ -538,6 +538,7 @@ case $host_os in enable_server=${enable_server:-no} dnl Disable dependencies that are not useful on Windows with_x=${with_x:-no} + with_pthread=${with_pthread:-no} ;; darwin*|macosx*) DLLEXT=".so" @@ -668,6 +669,15 @@ then fi fi +dnl **** Check for pthread **** + +if test "$ac_cv_header_pthread_h" = "yes" +then + AC_CHECK_LIB(pthread,pthread_create,[AC_SUBST(LIBPTHREAD,"-lpthread")]) +fi +WINE_ERROR_WITH(pthread,[test "x$LIBPTHREAD" = "x"],[pthread ${notice_platform}development files not found. +Wine cannot support threads without libpthread.]) + dnl **** Check for X11 **** AC_PATH_XTRA

1 0

Alexandre Julliard : configure: Set the target flags from the --host option even if cross-compiling is not detected .
by Alexandre Julliard Feb. 12, 2009

Feb. 12, 2009

Module: wine Branch: master Commit: 0fea4a5037b547b1077a6d03b08e98a301abefc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fea4a5037b547b1077a6d03b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 12 10:28:23 2009 +0100 configure: Set the target flags from the --host option even if cross-compiling is not detected. --- configure | 4 ++-- configure.ac | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure b/configure index b4fd46f..fa79111 100755 --- a/configure +++ b/configure @@ -3943,9 +3943,9 @@ fi $as_echo "$wine_cv_toolsdir" >&6; } TOOLSDIR=$wine_cv_toolsdir -if test "$cross_compiling" = "yes" +if test -n "$host_alias" then - TARGETFLAGS="-b $host_alias" + TARGETFLAGS="-b $host_alias $TARGETFLAGS" fi diff --git a/configure.ac b/configure.ac index 34650c8..57ec39d 100644 --- a/configure.ac +++ b/configure.ac @@ -169,9 +169,9 @@ AC_CACHE_CHECK([for the directory containing the Wine tools], wine_cv_toolsdir, AC_MSG_ERROR([could not find Wine tools in $with_wine_tools.]) fi]) AC_SUBST(TOOLSDIR,$wine_cv_toolsdir) -if test "$cross_compiling" = "yes" +if test -n "$host_alias" then - AC_SUBST(TARGETFLAGS,"-b $host_alias") + AC_SUBST(TARGETFLAGS,"-b $host_alias $TARGETFLAGS") fi dnl Check for flex

1 0

Huw Davies : gdi32: Correct the font family values returned in the text metrics.
by Alexandre Julliard Feb. 11, 2009

Feb. 11, 2009

Module: wine Branch: master Commit: 8ab829a68a993434506d5307e7681fc97bbc3fee URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ab829a68a993434506d5307e… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Feb 11 13:49:52 2009 +0000 gdi32: Correct the font family values returned in the text metrics. --- dlls/gdi32/freetype.c | 55 ++++++++++++++++++++++++++++++------------ dlls/gdi32/tests/font.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 99 insertions(+), 16 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 34e4aed..97dd1a6 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -5420,31 +5420,54 @@ UINT WineEngGetOutlineTextMetrics(GdiFont *font, UINT cbSize, else TM.tmPitchAndFamily = 0; - switch(pOS2->panose[PAN_FAMILYTYPE_INDEX]) { + switch(pOS2->panose[PAN_FAMILYTYPE_INDEX]) + { case PAN_FAMILY_SCRIPT: TM.tmPitchAndFamily |= FF_SCRIPT; - break; + break; + case PAN_FAMILY_DECORATIVE: - case PAN_FAMILY_PICTORIAL: TM.tmPitchAndFamily |= FF_DECORATIVE; - break; + break; + + case PAN_ANY: + case PAN_NO_FIT: case PAN_FAMILY_TEXT_DISPLAY: + case PAN_FAMILY_PICTORIAL: /* symbol fonts get treated as if they were text */ + /* which is clearly not what the panose spec says. */ + default: if(TM.tmPitchAndFamily == 0) /* fixed */ TM.tmPitchAndFamily = FF_MODERN; - else { - switch(pOS2->panose[PAN_SERIFSTYLE_INDEX]) { - case PAN_SERIF_NORMAL_SANS: - case PAN_SERIF_OBTUSE_SANS: - case PAN_SERIF_PERP_SANS: - TM.tmPitchAndFamily |= FF_SWISS; - break; - default: - TM.tmPitchAndFamily |= FF_ROMAN; - } + else + { + switch(pOS2->panose[PAN_SERIFSTYLE_INDEX]) + { + case PAN_ANY: + case PAN_NO_FIT: + default: + TM.tmPitchAndFamily |= FF_DONTCARE; + break; + + case PAN_SERIF_COVE: + case PAN_SERIF_OBTUSE_COVE: + case PAN_SERIF_SQUARE_COVE: + case PAN_SERIF_OBTUSE_SQUARE_COVE: + case PAN_SERIF_SQUARE: + case PAN_SERIF_THIN: + case PAN_SERIF_BONE: + case PAN_SERIF_EXAGGERATED: + case PAN_SERIF_TRIANGLE: + TM.tmPitchAndFamily |= FF_ROMAN; + break; + + case PAN_SERIF_NORMAL_SANS: + case PAN_SERIF_OBTUSE_SANS: + case PAN_SERIF_PERP_SANS: + TM.tmPitchAndFamily |= FF_SWISS; + break; + } } break; - default: - TM.tmPitchAndFamily |= FF_DONTCARE; } if(FT_IS_SCALABLE(ft_face)) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 38339ea..abb3a4d 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -2019,6 +2019,14 @@ typedef struct ((DWORD)(BYTE)(ch2) << 16) | ((DWORD)(BYTE)(ch3) << 24)) #define MS_OS2_TAG MS_MAKE_TAG('O','S','/','2') +static void expect_ff(const TEXTMETRICW *tmW, const TT_OS2_V2 *os2, WORD family, const char *name) +{ + ok((tmW->tmPitchAndFamily & 0xf0) == family, "%s: expected family %02x got %02x. panose %d-%d-%d-%d-...\n", + name, family, tmW->tmPitchAndFamily, os2->panose.bFamilyType, os2->panose.bSerifStyle, + os2->panose.bWeight, os2->panose.bProportion); + +} + static void test_text_metrics(const LOGFONTA *lf) { HDC hdc; @@ -2130,6 +2138,58 @@ static void test_text_metrics(const LOGFONTA *lf) tmW.tmDigitizedAspectX, ret); } + /* test FF_ values */ + switch(tt_os2.panose.bFamilyType) + { + case PAN_ANY: + case PAN_NO_FIT: + case PAN_FAMILY_TEXT_DISPLAY: + case PAN_FAMILY_PICTORIAL: + default: + if((tmW.tmPitchAndFamily & 1) == 0) /* fixed */ + { + expect_ff(&tmW, &tt_os2, FF_MODERN, font_name); + break; + } + switch(tt_os2.panose.bSerifStyle) + { + case PAN_ANY: + case PAN_NO_FIT: + default: + expect_ff(&tmW, &tt_os2, FF_DONTCARE, font_name); + break; + + case PAN_SERIF_COVE: + case PAN_SERIF_OBTUSE_COVE: + case PAN_SERIF_SQUARE_COVE: + case PAN_SERIF_OBTUSE_SQUARE_COVE: + case PAN_SERIF_SQUARE: + case PAN_SERIF_THIN: + case PAN_SERIF_BONE: + case PAN_SERIF_EXAGGERATED: + case PAN_SERIF_TRIANGLE: + expect_ff(&tmW, &tt_os2, FF_ROMAN, font_name); + break; + + case PAN_SERIF_NORMAL_SANS: + case PAN_SERIF_OBTUSE_SANS: + case PAN_SERIF_PERP_SANS: + case PAN_SERIF_FLARED: + case PAN_SERIF_ROUNDED: + expect_ff(&tmW, &tt_os2, FF_SWISS, font_name); + break; + } + break; + + case PAN_FAMILY_SCRIPT: + expect_ff(&tmW, &tt_os2, FF_SCRIPT, font_name); + break; + + case PAN_FAMILY_DECORATIVE: + expect_ff(&tmW, &tt_os2, FF_DECORATIVE, font_name); + break; + } + test_negative_width(hdc, lf); end_of_test:

1 0

Alexandre Julliard : winmm/tests: Don't test upper bound on sound duration, it's not guaranteed.
by Alexandre Julliard Feb. 11, 2009

Feb. 11, 2009

Module: wine Branch: master Commit: 3c68ba1bad8f0a3e02bb1f93267713ecfc5c4bdf URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c68ba1bad8f0a3e02bb1f932… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 11 14:49:43 2009 +0100 winmm/tests: Don't test upper bound on sound duration, it's not guaranteed. Also avoid infinite waits. --- dlls/winmm/tests/wave.c | 26 ++++++++++++-------------- 1 files changed, 12 insertions(+), 14 deletions(-) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index 22ada89..37685ed 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -603,7 +603,7 @@ static void wave_out_test_deviceOut(int device, double duration, DWORD nSamplesPerSec = pwfx->nSamplesPerSec; BOOL has_volume = pcaps->dwSupport & WAVECAPS_VOLUME ? TRUE : FALSE; double paused = 0.0; - double actual; + DWORD actual; DWORD_PTR callback = 0; DWORD_PTR callback_instance = 0; HANDLE thread = 0; @@ -628,7 +628,7 @@ static void wave_out_test_deviceOut(int device, double duration, thread = CreateThread(NULL, 0, callback_thread, hevent, 0, &thread_id); if (thread) { /* make sure thread is running */ - WaitForSingleObject(hevent,INFINITE); + WaitForSingleObject(hevent,10000); callback = thread_id; callback_instance = 0; } else { @@ -680,7 +680,7 @@ static void wave_out_test_deviceOut(int device, double duration, if (rc!=MMSYSERR_NOERROR) goto EXIT; - WaitForSingleObject(hevent,INFINITE); + WaitForSingleObject(hevent,10000); ok(pwfx->nChannels==nChannels && pwfx->wBitsPerSample==wBitsPerSample && @@ -785,19 +785,17 @@ static void wave_out_test_deviceOut(int device, double duration, ok(rc==MMSYSERR_NOERROR,"waveOutWrite(%s, header[%d]): rc=%s\n", dev_name(device),(i+1)%headers,wave_out_error(rc)); } - WaitForSingleObject(hevent,INFINITE); + WaitForSingleObject(hevent,10000); } } - /* Check the sound duration was between -10% and +35% of the expected value */ + /* Check the sound duration was at least 90% of the expected value */ end=GetTickCount(); - actual = (end - start) / 1000.0; - if (winetest_debug > 1) - trace("sound duration=%g ms\n",1000*actual); - ok((actual > (0.9 * (duration+paused))) && - (actual < (1.35 * (duration+paused))), - "The sound played for %g ms instead of %g ms\n", - 1000*actual,1000*(duration+paused)); + actual = end - start; + trace("sound duration=%u ms\n",actual); + ok(actual > 900 * (duration+paused), + "The sound played for %u ms instead of %g ms\n", + actual,1000*(duration+paused)); for (i = 0; i < headers; i++) { ok(frags[i].dwFlags=(WHDR_DONE|WHDR_PREPARED), "WHDR_DONE WHDR_PREPARED expected, got %s\n", @@ -817,11 +815,11 @@ static void wave_out_test_deviceOut(int device, double duration, rc=waveOutClose(wout); ok(rc==MMSYSERR_NOERROR,"waveOutClose(%s): rc=%s\n",dev_name(device), wave_out_error(rc)); - WaitForSingleObject(hevent,INFINITE); + WaitForSingleObject(hevent,10000); EXIT: if ((flags & CALLBACK_TYPEMASK) == CALLBACK_THREAD) { PostThreadMessage(thread_id, WM_APP, 0, 0); - WaitForSingleObject(hevent,INFINITE); + WaitForSingleObject(hevent,10000); } CloseHandle(hevent); HeapFree(GetProcessHeap(), 0, frags);

1 0

Alexandre Julliard : user32/tests: Try to fix some more failures in the message test.
by Alexandre Julliard Feb. 11, 2009

Feb. 11, 2009

Module: wine Branch: master Commit: b03175e126f9753f695034d37110de5a9857bdd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b03175e126f9753f695034d37… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 11 14:21:51 2009 +0100 user32/tests: Try to fix some more failures in the message test. --- dlls/user32/tests/msg.c | 45 +++++++++++++++++++++++---------------------- 1 files changed, 23 insertions(+), 22 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index ededb3c..872c622 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -5210,8 +5210,10 @@ static void test_button_messages(void) ok(hwnd != 0, "Failed to create button window\n"); SetForegroundWindow(hwnd); - SetFocus(0); flush_events(); + + SetActiveWindow(hwnd); + SetFocus(0); flush_sequence(); SendMessageA(hwnd, WM_LBUTTONDOWN, 0, 0); @@ -6537,19 +6539,19 @@ static const struct message WmAltPressRelease[] = { { WM_SYSKEYUP, sent|wparam|lparam, VK_MENU, 0xc0000001 }, { 0 } }; -static const struct message WmAltMouseButton[] = { - { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_MENU, 0x20000001 }, /* XP */ - { WM_SYSKEYDOWN, wparam|lparam, VK_MENU, 0x20000001 }, - { WM_SYSKEYDOWN, sent|wparam|lparam, VK_MENU, 0x20000001 }, +static const struct message WmShiftMouseButton[] = { + { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_SHIFT, 1 }, /* XP */ + { WM_KEYDOWN, wparam|lparam, VK_SHIFT, 1 }, + { WM_KEYDOWN, sent|wparam|lparam, VK_SHIFT, 1 }, { WM_MOUSEMOVE, wparam|optional, 0, 0 }, { WM_MOUSEMOVE, sent|wparam|optional, 0, 0 }, - { WM_LBUTTONDOWN, wparam, MK_LBUTTON, 0 }, - { WM_LBUTTONDOWN, sent|wparam, MK_LBUTTON, 0 }, - { WM_LBUTTONUP, wparam, 0, 0 }, - { WM_LBUTTONUP, sent|wparam, 0, 0 }, - { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_MENU, 0xc0000001 }, /* XP */ - { WM_SYSKEYUP, wparam|lparam, VK_MENU, 0xc0000001 }, - { WM_SYSKEYUP, sent|wparam|lparam, VK_MENU, 0xc0000001 }, + { WM_LBUTTONDOWN, wparam, MK_LBUTTON|MK_SHIFT, 0 }, + { WM_LBUTTONDOWN, sent|wparam, MK_LBUTTON|MK_SHIFT, 0 }, + { WM_LBUTTONUP, wparam, MK_SHIFT, 0 }, + { WM_LBUTTONUP, sent|wparam, MK_SHIFT, 0 }, + { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_SHIFT, 0xc0000001 }, /* XP */ + { WM_KEYUP, wparam|lparam, VK_SHIFT, 0xc0000001 }, + { WM_KEYUP, sent|wparam|lparam, VK_SHIFT, 0xc0000001 }, { 0 } }; static const struct message WmF1Seq[] = { @@ -6770,22 +6772,23 @@ static void test_accelerators(void) /* this test doesn't pass in Wine for managed windows */ ok_sequence(WmAltPressRelease, "Alt press/release", TRUE); - trace("testing Alt+MouseButton press/release\n"); + trace("testing Shift+MouseButton press/release\n"); /* first, move mouse pointer inside of the window client area */ GetClientRect(hwnd, &rc); MapWindowPoints(hwnd, 0, (LPPOINT)&rc, 2); rc.left += (rc.right - rc.left)/2; rc.top += (rc.bottom - rc.top)/2; SetCursorPos(rc.left, rc.top); + SetActiveWindow(hwnd); flush_events(); flush_sequence(); - keybd_event(VK_MENU, 0, 0, 0); + keybd_event(VK_SHIFT, 0, 0, 0); mouse_event(MOUSEEVENTF_LEFTDOWN, 0, 0, 0, 0); mouse_event(MOUSEEVENTF_LEFTUP, 0, 0, 0, 0); - keybd_event(VK_MENU, 0, KEYEVENTF_KEYUP, 0); + keybd_event(VK_SHIFT, 0, KEYEVENTF_KEYUP, 0); pump_msg_loop(hwnd, 0); - ok_sequence(WmAltMouseButton, "Alt+MouseButton press/release", FALSE); + ok_sequence(WmShiftMouseButton, "Shift+MouseButton press/release", FALSE); trace("testing VK_F1 press/release\n"); keybd_event(VK_F1, 0, 0, 0); @@ -9342,7 +9345,7 @@ static void wait_move_event(HWND hwnd, int x, int y) } } -#define STEP 20 +#define STEP 5 static void test_PeekMessage2(void) { HWND hwnd; @@ -9372,7 +9375,7 @@ static void test_PeekMessage2(void) /* Do initial mousemove, wait until we can see it and then do our test peek with PM_NOREMOVE. */ mouse_event(MOUSEEVENTF_MOVE, STEP, STEP, 0, 0); - wait_move_event(hwnd, 80, 80); + wait_move_event(hwnd, 100-STEP, 100-STEP); ret = PeekMessageA(&msg, hwnd, WM_MOUSEMOVE, WM_MOUSEMOVE, PM_NOREMOVE); ok(ret, "no message available\n"); @@ -9383,7 +9386,6 @@ static void test_PeekMessage2(void) x1 = msg.pt.x; y1 = msg.pt.y; ok(message == WM_MOUSEMOVE, "message not WM_MOUSEMOVE, %04x instead\n", message); - PeekMessageA(&msg, hwnd, WM_MOUSEMOVE, WM_MOUSEMOVE, PM_REMOVE); } /* Allow time to advance a bit, and then simulate the user moving their @@ -9391,7 +9393,7 @@ static void test_PeekMessage2(void) * Although the previous mousemove message was never removed, the * mousemove we now peek should reflect the recent mouse movements * because the input queue will merge the move events. */ - Sleep(2); + Sleep(100); mouse_event(MOUSEEVENTF_MOVE, STEP, STEP, 0, 0); wait_move_event(hwnd, x1, y1); @@ -9406,11 +9408,10 @@ static void test_PeekMessage2(void) ok(message == WM_MOUSEMOVE, "message not WM_MOUSEMOVE, %04x instead\n", message); ok(time2 > time1, "message time not advanced: %x %x\n", time1, time2); ok(x2 != x1 && y2 != y1, "coords not changed: (%d %d) (%d %d)\n", x1, y1, x2, y2); - PeekMessageA(&msg, hwnd, WM_MOUSEMOVE, WM_MOUSEMOVE, PM_REMOVE); } /* Have another go, to drive the point home */ - Sleep(2); + Sleep(100); mouse_event(MOUSEEVENTF_MOVE, STEP, STEP, 0, 0); wait_move_event(hwnd, x2, y2);

1 0

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard Feb. 11, 2009

Feb. 11, 2009

Module: wine Branch: master Commit: f250f4fa048cb7568352205b3cb9a4c50b8ec2fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=f250f4fa048cb7568352205b3… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Feb 11 13:35:25 2009 +0100 Assorted spelling fixes. --- dlls/comctl32/tests/toolbar.c | 2 +- dlls/cryptui/cryptui_En.rc | 4 ++-- dlls/gdi32/driver.c | 2 +- dlls/msctf/context.c | 2 +- dlls/msvcrt/tests/file.c | 2 +- dlls/riched20/txthost.c | 2 +- dlls/shdocvw/oleobject.c | 2 +- dlls/wintrust/tests/crypt.c | 6 +++--- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index 1c155f5..02601cf 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -1034,7 +1034,7 @@ static void restore_recalc_state(HWND hToolbar) GetWindowLong(hToolbar, GWL_STYLE) & ~TBSTYLE_FLAT); /* recalc */ SendMessage(hToolbar, TB_ADDBUTTONS, 1, (LPARAM)&buttons3[3]); - /* top margin will be 0px if a recalc occures */ + /* top margin will be 0px if a recalc occurs */ SetWindowLong(hToolbar, GWL_STYLE, GetWindowLong(hToolbar, GWL_STYLE) | TBSTYLE_FLAT); /* safety check */ diff --git a/dlls/cryptui/cryptui_En.rc b/dlls/cryptui/cryptui_En.rc index c6d6559..b10e101 100644 --- a/dlls/cryptui/cryptui_En.rc +++ b/dlls/cryptui/cryptui_En.rc @@ -102,8 +102,8 @@ STRINGTABLE DISCARDABLE IDS_FRIENDLY_NAME_COLUMN "Friendly Name" IDS_ALLOWED_PURPOSE_ALL "<All>" IDS_ALLOWED_PURPOSE_NONE "<None>" - IDS_WARN_REMOVE_MY "You will no longer be able to decrypt mesages with this certificate, or sign messages with it.\nAre you sure you want to remove this certificate?" - IDS_WARN_REMOVE_PLURAL_MY "You will no longer be able to decrypt mesages with these certificate, or sign messages with them.\nAre you sure you want to remove these certificates?" + IDS_WARN_REMOVE_MY "You will no longer be able to decrypt messages with this certificate, or sign messages with it.\nAre you sure you want to remove this certificate?" + IDS_WARN_REMOVE_PLURAL_MY "You will no longer be able to decrypt messages with these certificates, or sign messages with them.\nAre you sure you want to remove these certificates?" IDS_WARN_REMOVE_ADDRESSBOOK "You will no longer be able to encrypt messages with this certificate, or verify messages signed with it.\nAre you sure you want to remove this certificate?" IDS_WARN_REMOVE_PLURAL_ADDRESSBOOK "You will no longer be able to encrypt messages with these certificates, or verify messages signed with it.\nAre you sure you want to remove these certificates?" IDS_WARN_REMOVE_CA "Certificates issued by this certification authority will no longer be trusted.\nAre you sure you want to remove this certificate?" diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 101bad4..20d3f36 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -496,7 +496,7 @@ INT WINAPI GDI_CallExtDeviceModePropSheet16( HWND hWnd, LPCSTR lpszDevice, /***************************************************************************** * @ [GDI32.102] * - * This should load the correct driver for lpszDevice and calls this driver's + * This should load the correct driver for lpszDevice and call this driver's * ExtDeviceMode proc. * * FIXME: convert ExtDeviceMode to unicode in the driver interface diff --git a/dlls/msctf/context.c b/dlls/msctf/context.c index feef421..2fc651f 100644 --- a/dlls/msctf/context.c +++ b/dlls/msctf/context.c @@ -67,7 +67,7 @@ typedef struct tagContext { ITextStoreACPSink *pITextStoreACPSink; - /* kept as seperate lists to reduce unnesseccary iterations */ + /* kept as separate lists to reduce unnecessary iterations */ struct list pContextKeyEventSink; struct list pEditTransactionSink; struct list pStatusSink; diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 9032e51..22a5141 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -365,7 +365,7 @@ static void test_asciimode(void) ok((c = fgetc(fp)) == '0'+ i, "fgetc after fseek with neg Offset failed in line %d\n", i); fseek(fp, -4 ,SEEK_CUR); } - /* Show what happens is fseek positions filepointer on \\r */ + /* Show what happens if fseek positions filepointer on \\r */ fclose(fp); fp = fopen("ascii.tst", "r"); fseek(fp, 3 ,SEEK_SET); diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index 7fc0e5a..5032e87 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -59,7 +59,7 @@ ITextHost *ME_CreateTextHost(HWND hwnd, BOOL bEmulateVersion10) editor = ME_MakeEditor((ITextHost*)texthost, bEmulateVersion10); editor->exStyleFlags = GetWindowLongW(hwnd, GWL_EXSTYLE); - editor->hWnd = hwnd; /* FIXME: Remove editor's dependance on hWnd */ + editor->hWnd = hwnd; /* FIXME: Remove editor's dependence on hWnd */ SetWindowLongPtrW(hwnd, 0, (LONG_PTR)editor); } diff --git a/dlls/shdocvw/oleobject.c b/dlls/shdocvw/oleobject.c index a38d03d..9b7168f 100644 --- a/dlls/shdocvw/oleobject.c +++ b/dlls/shdocvw/oleobject.c @@ -720,7 +720,7 @@ static HRESULT WINAPI OleControl_OnAmbientPropertyChange(IOleControl *iface, DIS switch(dispID) { case DISPID_UNKNOWN: /* Unknown means multiple properties changed, so check them all. - * BUT the Webbrowser OleControl object doesnt appear to do this. + * BUT the Webbrowser OleControl object doesn't appear to do this. */ return S_OK; case DISPID_AMBIENT_OFFLINEIFNOTCONNECTED: diff --git a/dlls/wintrust/tests/crypt.c b/dlls/wintrust/tests/crypt.c index 1d7f30e..6ef3c53 100644 --- a/dlls/wintrust/tests/crypt.c +++ b/dlls/wintrust/tests/crypt.c @@ -740,7 +740,7 @@ static void test_create_catalog_file(void) ok(attrcount == 2, "Expected 2 attributes, got %d\n", attrcount); pCryptCATCDFClose(catcdf); - /* Eventhough the resulting catalogfile shows the attributes, they will not be enumerated */ + /* Even though the resulting catalog file shows the attributes, they will not be enumerated */ test_catalog_properties(catfileA, 0, 0); DeleteFileA(catfileA); @@ -904,7 +904,7 @@ static void test_cdf_parsing(void) todo_wine ok(DeleteFileA(catfileA), "Expected a catalog file to be created\n"); - /* Header and non-existing member */ + /* Header and nonexistent member */ lstrcpyA(cdf_contents, "[CatalogHeader]\r\n"); lstrcatA(cdf_contents, "Name=tempfile.cat\r\n"); lstrcatA(cdf_contents, "[CatalogFiles]\r\n"); @@ -1106,7 +1106,7 @@ START_TEST(crypt) test_CryptCATCDF_params(); /* Test the parsing of a cdf file */ test_cdf_parsing(); - /* Create a catalogfile out of our own catalog definition file */ + /* Create a catalog file out of our own catalog definition file */ test_create_catalog_file(); test_CryptCATAdminAddRemoveCatalog(); }

1 0

Francois Gouget : twain_32/tests: Add a trailing '\n' to an ok() call.
by Alexandre Julliard Feb. 11, 2009

Feb. 11, 2009

Module: wine Branch: master Commit: ec6285a125773b2648c2ff92e3b28f2acc098007 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec6285a125773b2648c2ff92e… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Feb 11 13:35:29 2009 +0100 twain_32/tests: Add a trailing '\n' to an ok() call. --- dlls/twain_32/tests/dsm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/twain_32/tests/dsm.c b/dlls/twain_32/tests/dsm.c index f0e5b4b..4e3d7ce 100644 --- a/dlls/twain_32/tests/dsm.c +++ b/dlls/twain_32/tests/dsm.c @@ -180,7 +180,7 @@ static void test_onevalue_cap(TW_IDENTITY *appid, TW_IDENTITY *source, TW_UINT16 "Error [rc %d|cc %d] doing MSG_QUERYSUPPORT for type 0x%x\n", rc, status.ConditionCode, captype); if (rc != TWRC_SUCCESS) return; - ok(get_onevalue(cap.hContainer, (TW_UINT32 *) &actual_support, NULL), "Returned cap.hContainer invalid for QuerySupport on type 0x%x", captype); + ok(get_onevalue(cap.hContainer, (TW_UINT32 *) &actual_support, NULL), "Returned cap.hContainer invalid for QuerySupport on type 0x%x\n", captype); ok((actual_support & minimum_support) == minimum_support, "Error: minimum support 0x%x for type 0x%x, got 0x%x\n", minimum_support, captype, actual_support);

1 0

Francois Gouget : winapi_test: Improve the usage message.
by Alexandre Julliard Feb. 11, 2009

Feb. 11, 2009

Module: wine Branch: master Commit: 467691d3a0b5a102163a260348c83dff272c5ff4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=467691d3a0b5a102163a26034… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Feb 11 13:35:18 2009 +0100 winapi_test: Improve the usage message. --- tools/winapi/winapi_test_options.pm | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/winapi/winapi_test_options.pm b/tools/winapi/winapi_test_options.pm index 25e3a6b..240e840 100644 --- a/tools/winapi/winapi_test_options.pm +++ b/tools/winapi/winapi_test_options.pm @@ -46,7 +46,7 @@ my %options_short = ( "v" => "verbose" ); -my $options_usage = "usage: winapi_test [--help]\n"; +my $options_usage = "Usage: winapi_test [--help]\n\nGenerates tests checking the size and alignment of the Windows structures.\n\n"; $options = '_options'->new(\%options_long, \%options_short, $options_usage);

1 0