June 2008 - Wine-commits - list.winehq.org

Jeremy White : configure: On Solaris, libpng requires libm.
by Alexandre Julliard 30 Jun '08

30 Jun '08

Module: wine Branch: master Commit: 082e39f9514df57fa95e585a52d19a6eb2d54c1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=082e39f9514df57fa95e585a5… Author: Jeremy White <jwhite(a)winehq.org> Date: Fri Jun 27 13:28:45 2008 -0500 configure: On Solaris, libpng requires libm. --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 76111e1..e00a2dc 100755 --- a/configure +++ b/configure @@ -16044,7 +16044,7 @@ if test "${ac_cv_lib_soname_png+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_soname_save_LIBS=$LIBS -LIBS="-lpng $LIBS" +LIBS="-lpng -lm $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF diff --git a/configure.ac b/configure.ac index 84ffddd..d71d92d 100644 --- a/configure.ac +++ b/configure.ac @@ -1201,7 +1201,7 @@ WINE_WARNING_WITH(jpeg,[test "x$ac_cv_lib_soname_jpeg" = "x"], dnl **** Check for libpng **** if test "$ac_cv_header_png_h" = "yes" then - WINE_CHECK_SONAME(png,png_create_read_struct,,,,[[libpng[[0-9]]*]]) + WINE_CHECK_SONAME(png,png_create_read_struct,,,-lm,[[libpng[[0-9]]*]]) fi WINE_WARNING_WITH(png,[test "x$ac_cv_lib_soname_png" = "x"], [libpng development files not found, PNG won't be supported.])

1 0

Dylan Smith : richedit: Clicking below end of text now selects closest character.
by Alexandre Julliard 30 Jun '08

30 Jun '08

Module: wine Branch: master Commit: 66f948c0109f5365e546d4ea12d48f04e2321e42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66f948c0109f5365e546d4ea1… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Fri Jun 27 09:18:39 2008 -0400 richedit: Clicking below end of text now selects closest character. Before the end of the text was selected when clicking below the end of the text, rather than using the x position to find the appropriate character on the last row that is closest to the pixel position. --- dlls/riched20/caret.c | 14 ++++++++++++++ dlls/riched20/tests/editor.c | 23 ++++++++++++++++++++++- 2 files changed, 36 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 462b98a..ebf6c56 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -799,6 +799,20 @@ static void ME_FindPixelPos(ME_TextEditor *editor, int x, int y, ME_Cursor *resu } p = pp; } + if (p == editor->pBuffer->pLast) + { + /* The position is below the last paragraph, so the last row will be used + * rather than the end of the text, so the x position will be used to + * determine the offset closest to the pixel position. */ + p = ME_FindItemBack(p, diStartRow); + if (p != NULL){ + p = ME_FindItemFwd(p, diRun); + } + else + { + p = editor->pBuffer->pLast; + } + } for (; p != editor->pBuffer->pLast; p = p->next) { switch (p->type) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 064e780..241c65b 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -4496,7 +4496,8 @@ static void test_undo_coalescing(void) #define SEND_CTRL_LEFT(hwnd) SEND_CTRL_EXT_KEY(hwnd, VK_LEFT, 0x4b) #define SEND_CTRL_RIGHT(hwnd) SEND_CTRL_EXT_KEY(hwnd, VK_RIGHT, 0x4d) -static void test_word_movement(){ +static void test_word_movement(void) +{ HWND hwnd; int result; int sel_start, sel_end; @@ -4554,6 +4555,25 @@ static void test_word_movement(){ DestroyWindow(hwnd); } +static void test_EM_CHARFROMPOS(void) +{ + HWND hwnd; + int result; + POINTL point; + point.x = 0; + point.y = 50; + + /* multi-line control inserts CR normally */ + hwnd = new_richedit(NULL); + result = SendMessageA(hwnd, WM_SETTEXT, 0, + (LPARAM)"one two three four five six seven"); + + result = SendMessage(hwnd, EM_CHARFROMPOS, 0, (LPARAM)&point); + ok(result == 0, "expected character index of 0 but got %d\n", result); + + DestroyWindow(hwnd); +} + START_TEST( editor ) { MSG msg; @@ -4601,6 +4621,7 @@ START_TEST( editor ) test_eventMask(); test_undo_coalescing(); test_word_movement(); + test_EM_CHARFROMPOS(); /* Set the environment variable WINETEST_RICHED20 to keep windows * responsive and open for 30 seconds. This is useful for debugging.

1 0

Dylan Smith : richedit: Calculate tab positions relative to end of selection bar.
by Alexandre Julliard 30 Jun '08

30 Jun '08

Module: wine Branch: master Commit: 1bec9bb440b5d55514341d476a226e393597f987 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bec9bb440b5d55514341d476… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Fri Jun 27 09:18:50 2008 -0400 richedit: Calculate tab positions relative to end of selection bar. --- dlls/riched20/run.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index a64c9f5..0028536 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -678,9 +678,9 @@ static SIZE ME_GetRunSizeCommon(ME_Context *c, const ME_Paragraph *para, ME_Run } else { - pos += 720-(pos%720); + pos += lDefaultTab - (pos % lDefaultTab); } - ppos = ME_twips2pointsX(c, pos); + ppos = ME_twips2pointsX(c, pos) + c->editor->selofs; if (ppos > startx + run->pt.x) { size.cx = ppos - startx - run->pt.x; break;

1 0

Huw Davies : gdiplus: Fix a typo in the parameter validation check.
by Alexandre Julliard 30 Jun '08

30 Jun '08

Module: wine Branch: master Commit: 3e90d918db656df93dfa023986b6c5e72b9cf73e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e90d918db656df93dfa02398… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jun 27 14:04:22 2008 +0100 gdiplus: Fix a typo in the parameter validation check. --- dlls/gdiplus/font.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 86a3223..2455c1f 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -97,7 +97,7 @@ GpStatus WINGDIPAPI GdipCreateFont(GDIPCONST GpFontFamily *fontFamily, const TEXTMETRICW* tmw; GpStatus stat; - if ((!fontFamily && fontFamily->FamilyName && font)) + if (!fontFamily || !fontFamily->FamilyName || !font) return InvalidParameter; TRACE("%p (%s), %f, %d, %d, %p\n", fontFamily,

1 0

Alexandre Julliard : wine_release: Insert the new version in the bugzilla table (from a patch by Jeff Zaroyko ).
by Alexandre Julliard 27 Jun '08

27 Jun '08

Module: tools Branch: master Commit: e511f38d919b18fa96a178a76ed0bb517811b380 URL: http://source.winehq.org/git/tools.git/?a=commit;h=e511f38d919b18fa96a178a7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 27 17:01:02 2008 +0200 wine_release: Insert the new version in the bugzilla table (from a patch by Jeff Zaroyko). --- wine_release | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/wine_release b/wine_release index 1b45521..f02434b 100755 --- a/wine_release +++ b/wine_release @@ -38,6 +38,9 @@ git clone -l -s -n git/wine.git wine-$version rm -f wine ln -s wine-$version wine +# add version to bugzilla table +echo "INSERT INTO bugs.versions (value, product_id) VALUES(\"$version\",1)" | mysql + # make cross reference database for LXR # note that we must have write permission in this directory echo "==== UPDATING LXR ===="

1 0

Alexandre Julliard : wine_release: Add support for making releases from different branches.
by Alexandre Julliard 27 Jun '08

27 Jun '08

Module: tools Branch: master Commit: c8417a4a967134d46b8d618d2a79f8754e7fefa2 URL: http://source.winehq.org/git/tools.git/?a=commit;h=c8417a4a967134d46b8d618d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 27 15:17:04 2008 +0200 wine_release: Add support for making releases from different branches. --- wine_release | 69 +++++++++++++++++++++++++++++++-------------------------- 1 files changed, 37 insertions(+), 32 deletions(-) diff --git a/wine_release b/wine_release index c93b863..1b45521 100755 --- a/wine_release +++ b/wine_release @@ -3,18 +3,19 @@ # This script is ran after a new release of Wine. It updates the website # and FTP for the new wine release. -# usage: wine_release <new version> +# usage: wine_release <version> [branch] set -e umask 002 if [ $# -lt 1 ] then - echo "Usage: $0 version" + echo "Usage: $0 version [branch]" exit 1 fi version=$1 +branch=${2:-master} website_dir="/home/winehq/opt/website" templates_dir=$website_dir/templates @@ -24,7 +25,8 @@ cd /home/winehq/opt/source # update website config -echo "snapshot_date: $version" > globals.conf && mv -f globals.conf $website_dir/include/globals.conf +sed "s/^${branch}_release:.*$/${branch}_release: $version/" $website_dir/include/globals.conf >globals.conf +mv -f globals.conf $website_dir/include/globals.conf # nuke old attempt (if any) rm -rf wine-$version @@ -53,35 +55,38 @@ cd ../.. (echo "wine-$version"; cat wine-versions) | uniq > wine-versions.new && mv -f wine-versions.new wine-versions -# update man page and documentation -echo "==== UPDATING DOCUMENTATION ====" -cd wine-$version -./configure --quiet --without-x --without-freetype - -manpages="\ - loader/wine.man \ - server/wineserver.man \ - tools/winemaker.man \ - tools/wineprefixcreate.man \ - tools/widl/widl.man \ - tools/winebuild/winebuild.man \ - tools/winedump/winedump.man \ - tools/winegcc/winegcc.man \ - tools/wmc/wmc.man \ - tools/wrc/wrc.man" - -for f in $manpages -do - name=`basename $f .man` - make -C `dirname $f` $name.man - nroff -man $f | ../bin/man2html --pgsize=100000 | $tools_dir/html2template -o $name.template && mv -f $name.template $templates_dir/en/docs/$name.template -done - -make htmlpages && rm -rf ../WineAPI && mv documentation/html ../WineAPI - -# Wine API Stats -echo "==== UPDATING WINE API STATS PAGE ====" -$tools_dir/winapi_stats > winapi_stats.template && mv -f winapi_stats.template $templates_dir/en/winapi_stats.template +if [ "$branch" = "master" ] +then + # update man page and documentation + echo "==== UPDATING DOCUMENTATION ====" + cd wine-$version + ./configure --quiet --without-x --without-freetype + + manpages="\ + loader/wine.man \ + server/wineserver.man \ + tools/winemaker.man \ + tools/wineprefixcreate.man \ + tools/widl/widl.man \ + tools/winebuild/winebuild.man \ + tools/winedump/winedump.man \ + tools/winegcc/winegcc.man \ + tools/wmc/wmc.man \ + tools/wrc/wrc.man" + + for f in $manpages + do + name=`basename $f .man` + make -s -C `dirname $f` $name.man + nroff -man $f | ../bin/man2html --pgsize=100000 | $tools_dir/html2template -o $name.template && mv -f $name.template $templates_dir/en/docs/$name.template + done + + make -s htmlpages && rm -rf ../WineAPI && mv documentation/html ../WineAPI + + # Wine API Stats + echo "==== UPDATING WINE API STATS PAGE ====" + $tools_dir/winapi_stats > winapi_stats.template && mv -f winapi_stats.template $templates_dir/en/winapi_stats.template +fi # cleanup source tree git clean -q -d -x -f

1 0

Alexandre Julliard : Add support for separate stable and development releases.
by Alexandre Julliard 27 Jun '08

27 Jun '08

Module: website Branch: master Commit: 2dab31286e72d24b2196ee008db8c4e3ffbf01f8 URL: http://source.winehq.org/git/website.git/?a=commit;h=2dab31286e72d24b2196ee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 25 12:25:57 2008 +0200 Add support for separate stable and development releases. --- include/html.php | 4 ++-- templates/en/download.template | 3 ++- templates/en/wine_release.template | 14 ++++++++++---- templates/es/wine_release.template | 14 ++++++++++---- 4 files changed, 24 insertions(+), 11 deletions(-) diff --git a/include/html.php b/include/html.php index 171436d..fd1ee7d 100644 --- a/include/html.php +++ b/include/html.php @@ -875,8 +875,8 @@ class html $vars['self'] =& $_SERVER['PHP_SELF']; $vars['request_uri'] =& $_SERVER['REQUEST_URI']; $vars['base_url'] =& $GLOBALS['config']->base_url; - $vars['snapshot_date'] = $config->snapshot_date; - $vars['snapshot_date_rh'] = $config->snapshot_date_rh; + $vars['stable_release'] = $config->stable_release; + $vars['master_release'] = $config->master_release; // replace vars in template // NOTE: using preg_replace() breaks as it wants to interpret '$1' in $val diff --git a/templates/en/download.template b/templates/en/download.template index 6df9b7d..147bc8e 100644 --- a/templates/en/download.template +++ b/templates/en/download.template @@ -10,7 +10,8 @@ Updated with each release. <a href="{$root}/site/howto">installation and configuration how-to</a> for post-installation instructions. -Snapshot Date: {$snapshot_date} +<table><tr><td>Latest stable release:</td><td>Wine {$stable_release}</td></tr> +<tr><td>Latest development release:</td><td>Wine {$master_release}</td></tr></table> <table width="95%" border=0 cellpadding=5 cellspacing=1 bgcolor="#EFEFEF"> diff --git a/templates/en/wine_release.template b/templates/en/wine_release.template index d19e403..ba51573 100644 --- a/templates/en/wine_release.template +++ b/templates/en/wine_release.template @@ -1,5 +1,11 @@ -<a href="?announce={$snapshot_date}">Wine {$snapshot_date}</a> - +<table class="releases" cellspacing=5> +<tr><td>Stable:</td> +<td><a href="?announce={$stable_release}">Wine {$stable_release}</a> - (<a href="http://source.winehq.org/git/wine.git?a=shortlog;h=refs/tags/wine-{$snapsho…">shortlog</a>) - + (<a href="http://source.winehq.org/git/wine.git?a=shortlog;h=refs/tags/wine-{$stable_…">shortlog</a>) +</td></tr> +<tr><td>Development:</td> +<td><a href="?announce={$master_release}">Wine {$master_release}</a> + + (<a href="http://source.winehq.org/git/wine.git?a=shortlog;h=refs/tags/wine-{$master_…">shortlog</a>) +</td></tr></table> diff --git a/templates/es/wine_release.template b/templates/es/wine_release.template index d19e403..ba51573 100644 --- a/templates/es/wine_release.template +++ b/templates/es/wine_release.template @@ -1,5 +1,11 @@ -<a href="?announce={$snapshot_date}">Wine {$snapshot_date}</a> - +<table class="releases" cellspacing=5> +<tr><td>Stable:</td> +<td><a href="?announce={$stable_release}">Wine {$stable_release}</a> - (<a href="http://source.winehq.org/git/wine.git?a=shortlog;h=refs/tags/wine-{$snapsho…">shortlog</a>) - + (<a href="http://source.winehq.org/git/wine.git?a=shortlog;h=refs/tags/wine-{$stable_…">shortlog</a>) +</td></tr> +<tr><td>Development:</td> +<td><a href="?announce={$master_release}">Wine {$master_release}</a> + + (<a href="http://source.winehq.org/git/wine.git?a=shortlog;h=refs/tags/wine-{$master_…">shortlog</a>) +</td></tr></table>

1 0

Alexandre Julliard : Wine release 1.1.0
by Alexandre Julliard 27 Jun '08

27 Jun '08

Module: website Branch: master Commit: a9e1aaf897849c36eb7d2fc853518e9b73d3fee4 URL: http://source.winehq.org/git/website.git/?a=commit;h=a9e1aaf897849c36eb7d2f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 27 16:35:34 2008 +0200 Wine release 1.1.0 --- news/en/2008062701.xml | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/news/en/2008062701.xml b/news/en/2008062701.xml new file mode 100644 index 0000000..bf5aa2a --- /dev/null +++ b/news/en/2008062701.xml @@ -0,0 +1,20 @@ +<news> +<date>June 27, 2008</date> +<title>Wine 1.1.0 Released</title> +<body> + The Wine development release 1.1.0 is now available. + <a href="?announce=1.1.0">What's new</a> in this release: +<ul> + <li>Many more gdiplus functions implemented.</li> + <li>Improved graphics tablet support.</li> + <li>Many Richedit fixes and improvements.</li> + <li>Support for HWND_MESSAGE windows.</li> + <li>A lot of new MSHTML functions.</li> + <li>Many fixes in MSI registry handling.</li> + <li>Initial implementation of the inetmib1 DLL.</li> + <li>Improvements to the quartz renderers.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.1.0.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="/site/download">download locations</a>. +</body></news>

1 0

Tag wine-1.1.0 : Alexandre Julliard : Release 1.1.0
by Alexandre Julliard 27 Jun '08

27 Jun '08

Module: wine Branch: refs/tags/wine-1.1.0 Tag: a50738b365b702466122a5c6c28a952d2414d795 URL: http://source.winehq.org/git/wine.git/?a=tag;h=a50738b365b702466122a5c6c28a… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 27 16:24:42 2008 +0200 Release 1.1.0

1 0

Alexandre Julliard : Release 1.1.0.
by Alexandre Julliard 27 Jun '08

27 Jun '08

Module: wine Branch: master Commit: 73e547559317ce0e1b0367181c785012112ff237 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73e547559317ce0e1b0367181… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 27 16:24:42 2008 +0200 Release 1.1.0. --- ANNOUNCE | 756 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++---- VERSION | 2 +- configure | 18 +- 3 files changed, 726 insertions(+), 50 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=73e547559317ce0e1b036…

1 0