August 2006 - Wine-Commits - list.winehq.org

Alexandre Julliard : wineboot: Added support for doing a proper shutdown before rebooting.
by Alexandre Julliard Aug. 18, 2006

Aug. 18, 2006

Module: wine Branch: master Commit: 54da7fb8cf87e336ff9ec1cab6573920b522c5f3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=54da7fb8cf87e336ff9ec1c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 17 20:54:15 2006 +0200 wineboot: Added support for doing a proper shutdown before rebooting. Send WM_QUERYENDSESSION messages to all windows of a given process before moving on to the next. Switch option parsing to getopt. Added a bunch of options to control shutdown behavior. --- programs/wineboot/Makefile.in | 3 - programs/wineboot/shutdown.c | 189 +++++++++++++++++++++++++++++++++++++++++ programs/wineboot/wineboot.c | 74 +++++++++++++--- 3 files changed, 250 insertions(+), 16 deletions(-) create mode 100644 programs/wineboot/shutdown.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=54da7fb8cf87e336ff9…

1 0

lostwages/include wwn.php
by Jeremy Newman Aug. 17, 2006

Aug. 17, 2006

ChangeSet ID: 27480 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2006/08/17 12:34:59 Modified files: include : wwn.php Log message: typo Patch: http://cvs.winehq.org/patch.py?id=27480 Old revision New revision Changes Path 1.26 1.27 +1 -1 lostwages/include/wwn.php Index: lostwages/include/wwn.php diff -u -p lostwages/include/wwn.php:1.26 lostwages/include/wwn.php:1.27 --- lostwages/include/wwn.php:1.26 17 Aug 2006 17:34:59 -0000 +++ lostwages/include/wwn.php 17 Aug 2006 17:34:59 -0000 @@ -469,7 +469,7 @@ class wwn $c++; } $this->body .= "</ol>\n"; - $this->body .= "\n\n</tr></td>\n"; + $this->body .= "\n\n</td></tr>\n"; $this->body .= $html->frame_end(""); break; case "QUOTE":

1 0

lostwages/news 2006060801.xml 2006062101.xml 2 ...
by Jeremy Newman Aug. 17, 2006

Aug. 17, 2006

ChangeSet ID: 27479 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2006/08/17 12:29:10 Modified files: news : 2006060801.xml 2006062101.xml 2006071002.xml 2006072701.xml 2006081002.xml Log message: fix some HTML validation issues Patch: http://cvs.winehq.org/patch.py?id=27479 Old revision New revision Changes Path 1.1 1.2 +5 -2 lostwages/news/2006060801.xml 1.1 1.2 +5 -2 lostwages/news/2006062101.xml 1.1 1.2 +5 -2 lostwages/news/2006071002.xml 1.1 1.2 +5 -3 lostwages/news/2006072701.xml 1.1 1.2 +4 -2 lostwages/news/2006081002.xml Index: lostwages/news/2006060801.xml diff -u -p lostwages/news/2006060801.xml:1.1 lostwages/news/2006060801.xml:1.2 --- lostwages/news/2006060801.xml:1.1 17 Aug 2006 17:29:10 -0000 +++ lostwages/news/2006060801.xml 17 Aug 2006 17:29:10 -0000 @@ -4,14 +4,16 @@ <body> <p> A new beta version of Wine is out, 0.9.15. You might notice the following -changes in it: +changes in it:</p> + <ul> <li> More MS/RPC improvements.</li> <li> Core Audio driver for Mac OS X.</li> <li> More complete DNSAPI dll.</li> <li> Improvements to Web browser support.</li> </ul> -</p><p> + +<p> Binary packages are in the process of being built and it may take a few days for them to appear, but the source is <a href="http://prdownloads.sourceforge.net/wine/wine-0.9.15.tar.bz2">available @@ -22,5 +24,6 @@ changes in it: repository by running <tt>yum install wine</tt> from <a href="http://fedoraproject.org/extras/4/i386/repodata/repoview/W.group.html">Fedora Extras</a>. </p> + </body> </news> Index: lostwages/news/2006062101.xml diff -u -p lostwages/news/2006062101.xml:1.1 lostwages/news/2006062101.xml:1.2 --- lostwages/news/2006062101.xml:1.1 17 Aug 2006 17:29:10 -0000 +++ lostwages/news/2006062101.xml 17 Aug 2006 17:29:10 -0000 @@ -4,14 +4,16 @@ <body> <p> Wine 0.9.16 was released today. It contains some noticeable improvements -including: +including:</p> + <ul> <li> More work on Direct3D shaders.</li> <li> Major DirectDraw rewrite on top of Direct3D.</li> <li> Support for debug information in Dwarf format.</li> <li> Beginnings of an OleView Winelib application.</li> </ul> -</p><p> + +<p> Binary packages are in the process of being built and it may take a few days for them to appear, but the source is <a href="http://prdownloads.sourceforge.net/wine/wine-0.9.16.tar.bz2">available @@ -22,5 +24,6 @@ including: <a href="http://fedoraproject.org/extras/4/i386/repodata/repoview/W.group.html">Fedora Extras</a> repository by running <tt>yum install wine</tt> . </p> + </body> </news> Index: lostwages/news/2006071002.xml diff -u -p lostwages/news/2006071002.xml:1.1 lostwages/news/2006071002.xml:1.2 --- lostwages/news/2006071002.xml:1.1 17 Aug 2006 17:29:10 -0000 +++ lostwages/news/2006071002.xml 17 Aug 2006 17:29:10 -0000 @@ -4,14 +4,16 @@ <body> <p> Wine 0.9.17 was tagged today. Alexandre noted the following changes in this -release: +release:</p> + <ul> <li> Still more work on Direct3D shaders.</li> <li> Now using the Gecko engine directly for MSHTML.</li> <li> Better support for apps switching to full screen mode.</li> <li> Support for multiple joysticks.</li> </ul> -</p><p> + +<p> Binary packages are in the process of being built and it may take a few days for them to appear, but the source is <a href="http://prdownloads.sourceforge.net/wine/wine-0.9.17.tar.bz2">available @@ -22,5 +24,6 @@ release: <a href="http://fedoraproject.org/extras/4/i386/repodata/repoview/W.group.html">Fedora Extras</a> repository by running <tt>yum install wine</tt> . </p> + </body> </news> Index: lostwages/news/2006072701.xml diff -u -p lostwages/news/2006072701.xml:1.1 lostwages/news/2006072701.xml:1.2 --- lostwages/news/2006072701.xml:1.1 17 Aug 2006 17:29:10 -0000 +++ lostwages/news/2006072701.xml 17 Aug 2006 17:29:10 -0000 @@ -4,16 +4,17 @@ <body> <p> A new beta version of Wine was released today. Besides the usual bugfixes, -you might notice the following changes: -<ul> +you might notice the following changes:</p> +<ul> <li> Still more work on Direct3D.</li> <li> A lot of MSI bug fixes and improvements.</li> <li> More compatible memory management.</li> <li> Several fixes for Win64 support.</li> <li> Some performance improvements. </li> </ul> -</p><p> + +<p> Binary packages are in the process of being built and it may take a few days for them to appear, but the source is <a href="http://prdownloads.sourceforge.net/wine/wine-0.9.18.tar.bz2">available @@ -22,5 +23,6 @@ you might notice the following changes: <a href="/site/download">download page</a> for packages for your favorite distribution. </p> + </body> </news> Index: lostwages/news/2006081002.xml diff -u -p lostwages/news/2006081002.xml:1.1 lostwages/news/2006081002.xml:1.2 --- lostwages/news/2006081002.xml:1.1 17 Aug 2006 17:29:10 -0000 +++ lostwages/news/2006081002.xml 17 Aug 2006 17:29:10 -0000 @@ -5,15 +5,16 @@ <p> Summer development is rolling forward. Alexandre released Wine 0.9.19 today and a slew of updates:</p> -<ul> +<ul> <li> Support for a proper Trash folder.</li> <li> Many improvements to the IDL compiler.</li> <li> Better FreeBSD support.</li> <li> A number of MSI bug fixes.</li> <li> Many RichEdit improvements.</li> </ul> -</p><p> + +<p> Binary packages are in the process of being built and it may take a few days for them to appear, but the source is <a href="http://prdownloads.sourceforge.net/wine/wine-0.9.19.tar.bz2">available @@ -22,5 +23,6 @@ today and a slew of updates:</p> <a href="/site/download">download page</a> for packages for your favorite distribution. </p> + </body> </news>

1 0

lostwages/ include/config.php templates/en/sen ...
by Jeremy Newman Aug. 17, 2006

Aug. 17, 2006

ChangeSet ID: 27478 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2006/08/17 12:21:15 Modified files: include : config.php templates/en : sending_patches.template Log message: Mike McCormack <mike(a)codeweavers.com> Update the sending patches page to recommend using Git Patch: http://cvs.winehq.org/patch.py?id=27478 Old revision New revision Changes Path 1.32 1.33 +1 -1 lostwages/include/config.php 1.15 1.16 +21 -42 lostwages/templates/en/sending_patches.template Index: lostwages/include/config.php diff -u -p lostwages/include/config.php:1.32 lostwages/include/config.php:1.33 --- lostwages/include/config.php:1.32 17 Aug 2006 17:21:15 -0000 +++ lostwages/include/config.php 17 Aug 2006 17:21:15 -0000 @@ -57,7 +57,7 @@ class config 'Development' => '{$root}/site/development', 'Developers Guide' => '{$root}/site/docs/winedev-guide/index', 'Mailing Lists' => '{$root}/site/forums', - 'CVS' => '{$root}/site/cvs', + 'GIT' => '{$root}/site/git', 'Sending Patches' => '{$root}/site/sending_patches', 'To Do Lists' => 'http://wiki.winehq.org/TodoList', 'Fun Projects' => '{$root}/site/fun_projects', Index: lostwages/templates/en/sending_patches.template diff -u -p lostwages/templates/en/sending_patches.template:1.15 lostwages/templates/en/sending_patches.template:1.16 --- lostwages/templates/en/sending_patches.template:1.15 17 Aug 2006 17:21:15 -0000 +++ lostwages/templates/en/sending_patches.template 17 Aug 2006 17:21:15 -0000 @@ -15,14 +15,14 @@ to make sure it's not spam before they c <p>When submitting patches, please:</p> <ul> - <li>Include a ChangeLog entry with your name, email address and + <li>Include a ChangeLog entry with your <b>real</b> name, email address and a description of what your patch does. <li>Keep the patch small and the point of the change clear. <li>Submit one fix or group of related changes per patch. - <li>Generate your patch against the latest version of Wine from the WineHQ CVS (see below). + <li>Generate your patch against the latest version of Wine from the WineHQ Git tree (see below). <li>Test your patch, and if possible write a test case demonstrating it is correct. @@ -47,64 +47,43 @@ resubmitting it.</p> <hr> -<h2>Generating a patch against the WineHQ CVS</h2> -<p>It's best to send small patches against the current tree. -The best way do to this is with CVS. First, you'll need to make sure your tree is up to date. -To do this, just run</p> +<h2>Generating a patch for WineHQ with Git</h2> - <table width="300" border=0 cellpadding=10><tr><td class=black> - <span class=inverse> - cvs update -PAd - </span> - </td></tr> - </table> +<p>It's best to send small patches against the current tree using Git. +First, make sure your tree is up to date, as described on the +<a href="{$root}/site/git">Git</a> page. -<p>in the top-level Wine directory. Make sure that you've set up the proper options in your -<code><a href="http://docs.freebsd.org/info/cvs/cvs.info.~_.cvsrc.html">.cvsrc</a></code> -file. Then, use</p> +<p>Check in your patches to your Git tree using +<a href="http://www.kernel.org/pub/software/scm/git/docs/git-commit.html">git commit</a>.</p> - <table width="300" border=0 cellpadding=10><tr><td class=black> - <span class=inverse> - cvs diff -u -p > patch.diff - </span> - </td></tr> - </table> - -<p>to generate the patch from the top source directory and save the output to a file. -<code>cvs diff</code> will always ignore newly added files, so you'll -need to do something like:</p> +<p>If you're going to use +<a href="http://www.kernel.org/pub/software/scm/git/docs/git-imap-send.html">git imap-send</a> +make sure that you've set up the proper options in your Git config file, then run:</p> - <table width="300" border=0 cellpadding=10><tr><td class=black> + <table width="700" border=0 cellpadding=10><tr><td class=black> <span class=inverse> - diff -u /dev/null newfile.c >> patch.diff + git format-patch --stdout --keep-subject --attach origin | git imap-send<br> </span> </td></tr> </table> +<p>That should upload your patches into your IMAP drafts folder, and allow you to check and +send them. In Mozilla Thunderbird, that is as simple as clicking "Edit Draft..." then "Send" +if you have setup the mail headers in the Git config file correctly. -<p>to make a patch for newly added files. -Use <code>diff -Nu olddir/ newdir/</code> in case of multiple files to add.</p> - -<p>If you can't use <code>cvs diff</code> for some reason (computer not connected to the net, -modified a Wine snapshot release rather than CVS, etc.), or just prefer not to use it, you can also use the -<code>diff</code> program as the output of both programs is compatible. You will need -a copy of the original tree you used, excluding any modification you did (let's label it -<code>oldwinedir/</code>), and a copy of your modified tree without all the build files -(<code>*.o</code>, <code>*.so</code>, etc.): let's label it <code>newwinedir/</code>. You can obtain such a tree -by copying the one you use for development to a new directory and issuing a <code>make distclean</code> in it. -Then, using the following command-line:</p> +<p>If you can't use IMAP, use the following command to generate patchs:</p> - <table width="300" border=0 cellpadding=10><tr><td class=black> + <table width="700" border=0 cellpadding=10><tr><td class=black> <span class=inverse> - diff -urN oldwinedir/ newwinedir/ > patch.diff + git format-patch --keep-subject origin<br> </span> </td></tr> </table> -<p>will get you a patch almost ready to be sent to <a href="{$root}/site/forums">wine-patches</a>.</p> +<p>That should generate a number of txt files, which you can send manually.</p> <p>There is no attempt to apply patches that appears in the newsgroup -to the CVS tree. Please send patches to +to the Git tree. Please send patches to <a href="mailto:wine-patches(a)winehq.org">wine-patches(a)winehq.org</a>.</p> <p> </p>

1 0

lostwages/templates/en git.template
by Jeremy Newman Aug. 17, 2006

Aug. 17, 2006

ChangeSet ID: 27477 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2006/08/17 12:20:57 Added files: templates/en : git.template Log message: Mike McCormack <mike(a)codeweavers.com> Add a page on fetching Wine with GIT Patch: http://cvs.winehq.org/patch.py?id=27477 Old revision New revision Changes Path Added 1.1 +0 -0 lostwages/templates/en/git.template Index: lostwages/templates/en/git.template diff -u -p /dev/null lostwages/templates/en/git.template:1.1 --- /dev/null 17 Aug 2006 17:20:57 -0000 +++ lostwages/templates/en/git.template 17 Aug 2006 17:20:57 -0000 @@ -0,0 +1,102 @@ + + +<h1>The Wine Git Tree</h1> + +<p>Wine uses an Open Source, open process development model. +Anyone may get the code, post opinions on what should be done, +and contribute patches. You will need to know C and/or perl, and something +about <a href="{$root}/site/resources">Unix and Windows</a>.</p> + +<p><a href="http://git.or.cz/" target="_blank">git</a> is a fast directory +content manager, originally written for use with large repositories, +such as the Linux Kernel source. </p> + +<p>You will need Git 1.3.1 or above. </p> + +<p>Read the sections below on how to use our Git tree or check the +<a href="http://wiki.winehq.org/GitWine">GitWine</a> guide on the Wine Wiki.</p> + +<ol> + <li><a href="#clone">Getting a local copy of Wine</a> + <li><a href="#uptodate">Staying Up-To-Date</a> + <li><a href="#sourcetree">Source Tree Browsing via the Web</a> +</ol> + +<p><img src="./images/grey_pixel.gif" width="100%" height=1 border=0 alt="-"></p> + +<a name="clone" class="hidden"></a> + +<h1>Getting a local copy of Wine</h1> + +<p>To check out the entire Wine source tree, do:</p> + + <table width="500" border=0 cellpadding=10><tr><td class=black> + <span class=inverse> + git clone git://source.winehq.org/git/wine.git wine<br> + </span> + </td></tr> + </table> + +<p><img src="./images/grey_pixel.gif" width="100%" height=1 border=0 alt="-"></p> + +<a name="uptodate" class="hidden"></a> + +<h1>Cleaning up your existing tree</h1> + +<p>A quick way to clean up your tree after you've been modifying + it and want to remove changes you haven't checked in is this: </p> + + <table width="500" border=0 cellpadding=10><tr><td class=black> + <span class=inverse> + cd wine<br> + git diff-index -p HEAD > total-<i>x.x.x</i>.diff<br> + patch -p1 -R < total-<i>x.x.x</i>.diff<br> + git reset<br> + </span> + </td></tr> + </table> + +<p>Using the current x.x.x tags, you can keep a history of changes +that were in your Wine tree.</p> + +<p>If you have made commits to the tree, and want to remove them all, +you can use the following more dangerous command:</p> + + <table width="500" border=0 cellpadding=10><tr><td class=black> + <span class=inverse> + git reset --hard origin<br> + </span> + </td></tr> + </table> + +<p>This will wipe out any local changes you have made, so use it with caution.</p> + +<h1>Staying Up-To-Date</h1> + +<p> First, make sure to clean your tree as described above, then +run the following commands from the top level wine directory:</p> + + <table width="500" border=0 cellpadding=10><tr><td class=black> + <span class=inverse> + git fetch<br> + git rebase origin<br> + </span> + </td></tr> + </table> + +<a name="sourcetree" class=hidden></a> +<h1>Source Tree Browsing via the Web</h1> +<p>The source code of the entire Wine tree is (<a href="http://lxr.linux.no/">LXR</a>-based) +cross-referenced and available for browsing, including a search engine. +This cross-references source is based on the snapshot-releases and is made available at: </p> +<ul> + <li><a href="http://source.winehq.org/">source.winehq.org</a> +</ul> + +<p> Direct access from the web to the complete Git tree is also possible, using +<a href="http://www.kernel.org/pub/software/scm/gitweb/">gitweb</a> package:</p> +<ul> + <li><a href="http://source.winehq.org/git">source.winehq.org/git</a>, on the primary Git repository +</ul> + +<p> </p>

1 0

Roderick Colenbrander : x11drv/opengl: Pixel format rewrite.
by Alexandre Julliard Aug. 17, 2006

Aug. 17, 2006

Module: wine Branch: master Commit: 59dc73b911e762495735e2ff6ed63b35a90cde21 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=59dc73b911e762495735e2f… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Wed Aug 16 16:42:23 2006 +0200 x11drv/opengl: Pixel format rewrite. --- dlls/opengl32/wgl.c | 86 +++++++++++++--- dlls/opengl32/wgl_ext.c | 117 +++++++++++++++++----- dlls/opengl32/wgl_ext.h | 3 + dlls/winex11.drv/opengl.c | 243 ++++++++++++++++++++++++--------------------- 4 files changed, 299 insertions(+), 150 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=59dc73b911e76249573…

1 0

Kai Blin : secur32: Add real signing / verifying to NTLM provider.
by Alexandre Julliard Aug. 17, 2006

Aug. 17, 2006

Module: wine Branch: master Commit: c4d5becd6fc8148d015142404859644f31bb05a2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c4d5becd6fc8148d0151424… Author: Kai Blin <kai.blin(a)gmail.com> Date: Thu Aug 17 02:11:39 2006 +0200 secur32: Add real signing / verifying to NTLM provider. --- dlls/secur32/Makefile.in | 1 dlls/secur32/ntlm.c | 64 +++++++++++++- dlls/secur32/secur32_priv.h | 20 ++++- dlls/secur32/util.c | 191 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 267 insertions(+), 9 deletions(-) create mode 100644 dlls/secur32/util.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=c4d5becd6fc8148d015…

1 0

Kai Blin : secur32: Mask away NTLMv2 and key exchange flags so we never negotiate it for now.
by Alexandre Julliard Aug. 17, 2006

Aug. 17, 2006

Module: wine Branch: master Commit: 92a86a03e289c57d115dd44ee9eb2cc06dd557c3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=92a86a03e289c57d115dd44… Author: Kai Blin <kai.blin(a)gmail.com> Date: Thu Aug 17 02:11:27 2006 +0200 secur32: Mask away NTLMv2 and key exchange flags so we never negotiate it for now. --- dlls/secur32/ntlm.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index affc2e5..a132da6 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -516,6 +516,10 @@ static SECURITY_STATUS SEC_ENTRY ntlm_In max_len-1, &bin_len)) != SEC_E_OK) goto isc_end; + /* Mask away the NTLMv2 flag, as well as the key exchange flag */ + bin[14] &= ~0x08; + bin[15] &= ~0x40; + /* put the decoded client blob into the out buffer */ ret = SEC_I_CONTINUE_NEEDED;

1 0

Matt Finnicum : riched20: Send EN_LINK notifications. Properly underline / color links.
by Alexandre Julliard Aug. 17, 2006

Aug. 17, 2006

Module: wine Branch: master Commit: e73890a72c004fcddf5d15e95b76f49d97ce57c7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e73890a72c004fcddf5d15e… Author: Matt Finnicum <mattfinn(a)gmail.com> Date: Wed Aug 16 22:29:17 2006 -0400 riched20: Send EN_LINK notifications. Properly underline / color links. --- dlls/riched20/editor.c | 40 +++++++++++++++++++++++++++++++++++++--- dlls/riched20/editor.h | 1 + dlls/riched20/paint.c | 4 +++- dlls/riched20/style.c | 4 +++- 4 files changed, 44 insertions(+), 5 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 85f9a20..048c892 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2298,16 +2298,20 @@ LRESULT WINAPI RichEditANSIWndProc(HWND SetFocus(hWnd); ME_LButtonDown(editor, (short)LOWORD(lParam), (short)HIWORD(lParam)); SetCapture(hWnd); + ME_LinkNotify(editor,msg,wParam,lParam); break; case WM_MOUSEMOVE: if (GetCapture() == hWnd) ME_MouseMove(editor, (short)LOWORD(lParam), (short)HIWORD(lParam)); break; + ME_LinkNotify(editor,msg,wParam,lParam); case WM_LBUTTONUP: if (GetCapture() == hWnd) ReleaseCapture(); + ME_LinkNotify(editor,msg,wParam,lParam); break; case WM_LBUTTONDBLCLK: + ME_LinkNotify(editor,msg,wParam,lParam); ME_SelectWord(editor); break; case WM_CONTEXTMENU: @@ -2612,6 +2616,37 @@ void ME_SendOldNotify(ME_TextEditor *edi SendMessageA(GetParent(hWnd), WM_COMMAND, (nCode<<16)|GetWindowLongW(hWnd, GWLP_ID), (LPARAM)hWnd); } +void ME_LinkNotify(ME_TextEditor *editor, UINT msg, WPARAM wParam, LPARAM lParam) +{ + int x,y; + ME_Cursor tmpCursor; + ME_Run *tmpRun; + BOOL bNothing; + ENLINK info; + x = (short)LOWORD(lParam); + y = (short)HIWORD(lParam); + ME_FindPixelPos(editor, x, y, &tmpCursor, &bNothing); + tmpRun = &tmpCursor.pRun->member.run; + if (tmpRun->style->fmt.dwMask & CFM_UNDERLINE) + FIXME("CFM_UNDERLINE! GASP!\n"); + if (tmpRun->style->fmt.dwEffects & CFE_UNDERLINE) + FIXME("CFE_UNDERLINE! GASP!\n"); + + if ((tmpRun->style->fmt.dwMask & CFM_LINK) + && (tmpRun->style->fmt.dwEffects & CFE_LINK)) + { /* The clicked run has CFE_LINK set */ + info.nmhdr.hwndFrom = editor->hWnd; + info.nmhdr.idFrom = GetWindowLongW(editor->hWnd, GWLP_ID); + info.nmhdr.code = EN_LINK; + info.msg = msg; + info.wParam = wParam; + info.lParam = lParam; + info.chrg.cpMin = ME_CharOfsFromRunOfs(editor,tmpCursor.pRun,0); + info.chrg.cpMax = info.chrg.cpMin + ME_StrVLen(tmpRun->strText); + SendMessageW(GetParent(editor->hWnd), WM_NOTIFY,info.nmhdr.idFrom, (LPARAM)&info); + } +} + int ME_CountParagraphsBetween(ME_TextEditor *editor, int from, int to) { ME_DisplayItem *item = ME_FindItemFwd(editor->pBuffer->pFirst, diParagraph); @@ -2840,9 +2875,8 @@ int ME_AutoURLDetect(ME_TextEditor *edit RichEditANSIWndProc(editor->hWnd, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM) &cur_format); RichEditANSIWndProc(editor->hWnd, EM_GETCHARFORMAT, SCF_DEFAULT, (LPARAM) &default_format); link.cbSize = sizeof(link); - link.dwMask = CFM_LINK | CFM_COLOR | CFM_UNDERLINE; - link.dwEffects = CFE_LINK | CFE_UNDERLINE; - link.crTextColor = RGB(0,0,255); + link.dwMask = CFM_LINK; + link.dwEffects = CFE_LINK; curf_ef = cur_format.dwEffects & link.dwEffects; def_ef = default_format.dwEffects & link.dwEffects; link_ef = link.dwEffects & link.dwEffects; diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 4409069..c5be88a 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -247,6 +247,7 @@ void ME_RegisterEditorClass(HINSTANCE hI ME_TextEditor *ME_MakeEditor(HWND hWnd); void ME_DestroyEditor(ME_TextEditor *editor); void ME_SendOldNotify(ME_TextEditor *editor, int nCode); +void ME_LinkNotify(ME_TextEditor *editor, UINT msg, WPARAM wParam, LPARAM lParam); ME_UndoItem *ME_AddUndoItem(ME_TextEditor *editor, ME_DIType type, ME_DisplayItem *di); void ME_CommitUndo(ME_TextEditor *editor); void ME_Undo(ME_TextEditor *editor); diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 2384dd8..53261ce 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -138,7 +138,9 @@ static void ME_DrawTextWithStyle(ME_Cont int yOffset = 0, yTwipsOffset = 0; hOldFont = ME_SelectStyleFont(c->editor, hDC, s); rgbBack = ME_GetBackColor(c->editor); - if ((s->fmt.dwMask & CFM_COLOR) && (s->fmt.dwEffects & CFE_AUTOCOLOR)) + if ((s->fmt.dwMask & CFM_LINK) && (s->fmt.dwEffects & CFE_LINK)) + rgbOld = SetTextColor(hDC, RGB(0,0,255)); + else if ((s->fmt.dwMask & CFM_COLOR) && (s->fmt.dwEffects & CFE_AUTOCOLOR)) rgbOld = SetTextColor(hDC, GetSysColor(COLOR_WINDOWTEXT)); else rgbOld = SetTextColor(hDC, s->fmt.crTextColor); diff --git a/dlls/riched20/style.c b/dlls/riched20/style.c index 6104a0c..14c8d80 100644 --- a/dlls/riched20/style.c +++ b/dlls/riched20/style.c @@ -275,7 +275,7 @@ ME_LogFontFromStyle(HDC hDC, LOGFONTW *l lf->lfWeight = s->fmt.wWeight; if (s->fmt.dwEffects & s->fmt.dwMask & CFM_ITALIC) lf->lfItalic = 1; - if (s->fmt.dwEffects & s->fmt.dwMask & CFM_UNDERLINE) + if (s->fmt.dwEffects & s->fmt.dwMask & (CFM_UNDERLINE | CFE_LINK)) lf->lfUnderline = 1; if (s->fmt.dwEffects & s->fmt.dwMask & CFM_STRIKEOUT) lf->lfStrikeOut = 1; @@ -301,6 +301,8 @@ void ME_CharFormatFromLogFont(HDC hDC, L if (lf->lfWeight>400) fmt->dwEffects |= CFM_BOLD; if (lf->lfItalic) fmt->dwEffects |= CFM_ITALIC; if (lf->lfUnderline) fmt->dwEffects |= CFM_UNDERLINE; + /* notice that if a logfont was created with underline due to CFM_LINK, this + would add an erronious CFM_UNDERLINE. This isn't currently ever a problem */ if (lf->lfStrikeOut) fmt->dwEffects |= CFM_STRIKEOUT; fmt->bPitchAndFamily = lf->lfPitchAndFamily; fmt->bCharSet = lf->lfCharSet;

1 0

Andrew Talbot : ddraw: Write-strings warnings fix.
by Alexandre Julliard Aug. 17, 2006

Aug. 17, 2006

Module: wine Branch: master Commit: 704f8d7848263690a60e828538490a33a114c2b3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=704f8d7848263690a60e828… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed Aug 16 19:30:26 2006 +0100 ddraw: Write-strings warnings fix. --- dlls/ddraw/direct3d.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/direct3d.c b/dlls/ddraw/direct3d.c index fe56729..ab59340 100644 --- a/dlls/ddraw/direct3d.c +++ b/dlls/ddraw/direct3d.c @@ -290,6 +290,7 @@ IDirect3DImpl_3_EnumDevices(IDirect3D3 * ICOM_THIS_FROM(IDirectDrawImpl, IDirect3D3, iface); D3DDEVICEDESC dref, d1, d2; D3DDEVICEDESC7 newDesc; + static CHAR wined3d_description[] = "Wine D3DDevice using WineD3D and OpenGL"; HRESULT hr; /* Some games (Motoracer 2 demo) have the bad idea to modify the device name string. @@ -317,10 +318,12 @@ IDirect3DImpl_3_EnumDevices(IDirect3D3 * if(This->d3dversion != 1) { + static CHAR reference_description[] = "Reference Direct3D ID"; + TRACE("(%p) Enumerating WineD3D D3DDevice interface\n", This); d1 = dref; d2 = dref; - hr = Callback( (LPIID) &IID_IDirect3DRefDevice, "Reference Direct3D ID", device_name, &d1, &d2, Context); + hr = Callback( (LPIID) &IID_IDirect3DRefDevice, reference_description, device_name, &d1, &d2, Context); if(hr != D3DENUMRET_OK) { TRACE("Application cancelled the enumeration\n"); @@ -331,7 +334,7 @@ IDirect3DImpl_3_EnumDevices(IDirect3D3 * TRACE("(%p) Enumerating WineD3D D3DDevice interface\n", This); d1 = dref; d2 = dref; - hr = Callback( (LPIID) &IID_D3DDEVICE_WineD3D, "Wine D3DDevice using WineD3D and OpenGL", device_name, &d1, &d2, Context); + hr = Callback( (LPIID) &IID_D3DDEVICE_WineD3D, wined3d_description, device_name, &d1, &d2, Context); if(hr != D3DENUMRET_OK) { TRACE("Application cancelled the enumeration\n");

1 0