June 2007 - Wine-Commits - list.winehq.org

Michael Stefaniuc : winmm: Do not dump the version info when loading drivers.
by Alexandre Julliard June 22, 2007

June 22, 2007

Module: wine Branch: master Commit: cc2773008e4f844a5a8cd26eca002fd3b988a613 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc2773008e4f844a5a8cd26ec… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 21 21:32:28 2007 +0200 winmm: Do not dump the version info when loading drivers. --- dlls/winmm/lolvldrv.c | 69 ------------------------------------------------- 1 files changed, 0 insertions(+), 69 deletions(-) diff --git a/dlls/winmm/lolvldrv.c b/dlls/winmm/lolvldrv.c index 55ed500..f508395 100644 --- a/dlls/winmm/lolvldrv.c +++ b/dlls/winmm/lolvldrv.c @@ -103,68 +103,6 @@ BOOL MMDRV_Is32(unsigned int idx) } /************************************************************************** - * MMDRV_GetDescription32 [internal] - */ -static BOOL MMDRV_GetDescription32(const char* fname, char* buf, int buflen) -{ - OFSTRUCT ofs; - DWORD h; - LPVOID ptr = 0; - LPVOID val; - DWORD dw; - BOOL ret = FALSE; - UINT u; - FARPROC pGetFileVersionInfoSizeA; - FARPROC pGetFileVersionInfoA; - FARPROC pVerQueryValueA; - HMODULE hmodule = 0; - TRACE("(%p, %p, %d)\n", fname, buf, buflen); - -#define E(_x) do {TRACE _x;goto theEnd;} while(0) - - if (OpenFile(fname, &ofs, OF_EXIST)==HFILE_ERROR) E(("Can't find file %s\n", fname)); - - if (!(hmodule = LoadLibraryA( "version.dll" ))) goto theEnd; - if (!(pGetFileVersionInfoSizeA = GetProcAddress( hmodule, "GetFileVersionInfoSizeA" ))) - goto theEnd; - if (!(pGetFileVersionInfoA = GetProcAddress( hmodule, "GetFileVersionInfoA" ))) - goto theEnd; - if (!(pVerQueryValueA = GetProcAddress( hmodule, "VerQueryValueA" ))) - goto theEnd; - - if (!(dw = pGetFileVersionInfoSizeA(ofs.szPathName, &h))) E(("Can't get FVIS\n")); - if (!(ptr = HeapAlloc(GetProcessHeap(), 0, dw))) E(("OOM\n")); - if (!pGetFileVersionInfoA(ofs.szPathName, h, dw, ptr)) E(("Can't get FVI\n")); - -#define A(_x) if (pVerQueryValueA(ptr, "\\StringFileInfo\\040904B0\\" #_x, &val, &u)) \ - TRACE(#_x " => %s\n", (LPSTR)val); else TRACE(#_x " @\n") - - A(CompanyName); - A(FileDescription); - A(FileVersion); - A(InternalName); - A(LegalCopyright); - A(OriginalFilename); - A(ProductName); - A(ProductVersion); - A(Comments); - A(LegalTrademarks); - A(PrivateBuild); - A(SpecialBuild); -#undef A - - if (!pVerQueryValueA(ptr, "\\StringFileInfo\\040904B0\\ProductName", &val, &u)) E(("Can't get product name\n")); - lstrcpynA(buf, val, buflen); - -#undef E - ret = TRUE; -theEnd: - HeapFree(GetProcessHeap(), 0, ptr); - if (hmodule) FreeLibrary( hmodule ); - return ret; -} - -/************************************************************************** * MMDRV_GetNum [internal] */ UINT MMDRV_GetNum(UINT type) @@ -666,7 +604,6 @@ static BOOL MMDRV_Install(LPCSTR drvRegName, LPCSTR drvFileName, BOOL bIsMapper) if (lpDrv->bIs32) { WINEMM_msgFunc32 func; - char buffer[128]; if (d->d.d32.hModule) { #define A(_x,_y) AA(d->d.d32.hModule,_x,_y,32,GetProcAddress) @@ -678,12 +615,6 @@ static BOOL MMDRV_Install(LPCSTR drvRegName, LPCSTR drvFileName, BOOL bIsMapper) A(MMDRV_WAVEOUT, wodMessage); #undef A } - if (TRACE_ON(winmm)) { - if (MMDRV_GetDescription32(drvFileName, buffer, sizeof(buffer))) - TRACE("%s => %s\n", drvFileName, buffer); - else - TRACE("%s => No description\n", drvFileName); - } } else if (WINMM_CheckForMMSystem() && pFnLoadMMDrvFunc16) { count += pFnLoadMMDrvFunc16(drvFileName, d, lpDrv); }

1 0

Rob Shearman : msi: Only use the long name for the file source if the file has one.
by Alexandre Julliard June 22, 2007

June 22, 2007

Module: wine Branch: master Commit: f533159bb684cec693a6b4a62f4b44c46b4846ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=f533159bb684cec693a6b4a62… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Jun 21 17:19:57 2007 +0100 msi: Only use the long name for the file source if the file has one. --- dlls/msi/files.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 42f954c..98f20d6 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -467,7 +467,8 @@ static VOID set_file_source(MSIPACKAGE* package, MSIFILE* file, LPCWSTR path) LPWSTR p, path; p = resolve_folder(package, file->Component->Directory, TRUE, FALSE, TRUE, NULL); path = build_directory_name(2, p, file->ShortName); - if (INVALID_FILE_ATTRIBUTES == GetFileAttributesW( path )) + if (file->LongName && + INVALID_FILE_ATTRIBUTES == GetFileAttributesW( path )) { msi_free(path); path = build_directory_name(2, p, file->LongName);

1 0

Dmitry Timoshkov : shell32: Make SHGetDesktopFolder use a cached instance of IShellFolder.
by Alexandre Julliard June 22, 2007

June 22, 2007

Module: wine Branch: master Commit: 013652feeef3a69d43cedb7ad431010f1e4dbcdc URL: http://source.winehq.org/git/wine.git/?a=commit;h=013652feeef3a69d43cedb7ad… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Jun 21 23:50:55 2007 +0900 shell32: Make SHGetDesktopFolder use a cached instance of IShellFolder. --- dlls/shell32/shfldr_desktop.c | 64 ++++++++++++++++------------------------- 1 files changed, 25 insertions(+), 39 deletions(-) diff --git a/dlls/shell32/shfldr_desktop.c b/dlls/shell32/shfldr_desktop.c index 3fee311..14571b1 100644 --- a/dlls/shell32/shfldr_desktop.c +++ b/dlls/shell32/shfldr_desktop.c @@ -117,30 +117,12 @@ static HRESULT WINAPI ISF_Desktop_fnQueryInterface( static ULONG WINAPI ISF_Desktop_fnAddRef (IShellFolder2 * iface) { - IGenericSFImpl *This = (IGenericSFImpl *)iface; - ULONG refCount = InterlockedIncrement(&This->ref); - - TRACE ("(%p)->(count=%u)\n", This, refCount - 1); - - return refCount; + return 2; /* non-heap based object */ } static ULONG WINAPI ISF_Desktop_fnRelease (IShellFolder2 * iface) { - IGenericSFImpl *This = (IGenericSFImpl *)iface; - ULONG refCount = InterlockedDecrement(&This->ref); - - TRACE ("(%p)->(count=%u)\n", This, refCount + 1); - - if (!refCount) - { - TRACE ("-- destroying IShellFolder(%p)\n", This); - SHFree (This->pidlRoot); - SHFree (This->sPathTarget); - LocalFree ((HLOCAL) This); - return 0; - } - return refCount; + return 1; /* non-heap based object */ } /************************************************************************** @@ -865,9 +847,8 @@ static const IShellFolder2Vtbl vt_MCFldr_ShellFolder2 = HRESULT WINAPI ISF_Desktop_Constructor ( IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv) { - IGenericSFImpl *sf; + static IGenericSFImpl *cached_sf; WCHAR szMyPath[MAX_PATH]; - HRESULT r; TRACE ("unkOut=%p %s\n", pUnkOuter, shdebugstr_guid (riid)); @@ -876,26 +857,31 @@ HRESULT WINAPI ISF_Desktop_Constructor ( if (pUnkOuter) return CLASS_E_NOAGGREGATION; - if (!SHGetSpecialFolderPathW( 0, szMyPath, CSIDL_DESKTOPDIRECTORY, TRUE )) - return E_UNEXPECTED; + if (!cached_sf) + { + IGenericSFImpl *sf; - sf = LocalAlloc( LMEM_ZEROINIT, sizeof (IGenericSFImpl) ); - if (!sf) - return E_OUTOFMEMORY; + if (!SHGetSpecialFolderPathW( 0, szMyPath, CSIDL_DESKTOPDIRECTORY, TRUE )) + return E_UNEXPECTED; - sf->ref = 0; - sf->lpVtbl = &vt_MCFldr_ShellFolder2; - sf->pidlRoot = _ILCreateDesktop(); /* my qualified pidl */ - sf->sPathTarget = SHAlloc( (lstrlenW(szMyPath) + 1)*sizeof(WCHAR) ); - lstrcpyW( sf->sPathTarget, szMyPath ); + sf = LocalAlloc( LMEM_ZEROINIT, sizeof (IGenericSFImpl) ); + if (!sf) + return E_OUTOFMEMORY; - r = IUnknown_QueryInterface( _IUnknown_(sf), riid, ppv ); - if (!SUCCEEDED (r)) - { - IUnknown_Release( _IUnknown_(sf) ); - return r; + sf->ref = 1; + sf->lpVtbl = &vt_MCFldr_ShellFolder2; + sf->pidlRoot = _ILCreateDesktop(); /* my qualified pidl */ + sf->sPathTarget = SHAlloc( (lstrlenW(szMyPath) + 1)*sizeof(WCHAR) ); + lstrcpyW( sf->sPathTarget, szMyPath ); + + if (InterlockedCompareExchangePointer((void *)&cached_sf, sf, NULL) != NULL) + { + /* some other thread already been here */ + SHFree( sf->pidlRoot ); + SHFree( sf->sPathTarget ); + LocalFree( sf ); + } } - TRACE ("--(%p)\n", sf); - return S_OK; + return IUnknown_QueryInterface( _IUnknown_(cached_sf), riid, ppv ); }

1 0

lostwages/templates/en download-deb.template
by Jeremy Newman June 21, 2007

June 21, 2007

ChangeSet ID: 31229 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2007/06/21 15:27:31 Modified files: templates/en : download-deb.template Log message: Scott Ritchie <scott(a)open-vote.org> Put 64-bit not available warnings in italics for older versions on download-deb page Patch: http://cvs.winehq.org/patch.py?id=31229 Old revision New revision Changes Path 1.17 1.18 +4 -4 lostwages/templates/en/download-deb.template Index: lostwages/templates/en/download-deb.template diff -u -p lostwages/templates/en/download-deb.template:1.17 lostwages/templates/en/download-deb.template:1.18 --- lostwages/templates/en/download-deb.template:1.17 21 Jun 2007 20:27:31 -0000 +++ lostwages/templates/en/download-deb.template 21 Jun 2007 20:27:31 -0000 @@ -27,11 +27,11 @@ list of trusted APT keys by copy and pas <p><b>For Ubuntu Feisty (7.04):</b><br> <i>sudo wget http://wine.budgetdedicated.com/apt/sources.list.d/feisty.list -O /etc/apt/sources.list.d/winehq.list</i></p> -<p><b>For Ubuntu Edgy (6.10):</b><br> +<p><b>For Ubuntu Edgy (6.10):</b> <i>*64-bit packages not available*</i><br> <i>sudo wget http://wine.budgetdedicated.com/apt/sources.list.d/edgy.list -O /etc/apt/sources.list.d/winehq.list</i></p> -<p><b>For Ubuntu Dapper (6.06):</b><br> +<p><b>For Ubuntu Dapper (6.06):</b> <i>*64-bit packages not available*</i><br> <i>sudo wget http://wine.budgetdedicated.com/apt/sources.list.d/dapper.list -O /etc/apt/sources.list.d/winehq.list</i></p> -<p><b>For Debian Etch (4.0):</b><br> +<p><b>For Debian Etch (4.0):</b> <i>*64-bit packages not available*</i><br> <i>sudo wget http://wine.budgetdedicated.com/apt/sources.list.d/etch.list -O /etc/apt/sources.list.d/winehq.list</i></p> <p>Then, you can install Wine from WineHQ like it were any other package, such as by @@ -43,7 +43,7 @@ package information and then '<b>sudo ap <p>Packages for the 64 bit version of Ubuntu Feisty (7.04) are now available, however for users of Debian and older Ubuntus the entries above are for i386 users only. -Attempting to use these repositories with a different architecture (eg amd64), will result +Attempting to use these repositories with a different architecture will result in 404 errors as APT will be looking for files not in the repository.</p> <p>If you are using an older 64 bit distribution and would still like a working Wine package,

1 0

lostwages/templates/en download.template
by Jeremy Newman June 21, 2007

June 21, 2007

ChangeSet ID: 31228 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2007/06/21 15:26:08 Modified files: templates/en : download.template Log message: Scott Ritchie <scott(a)open-vote.org> Remove Winetools from download page and replace with a general note on 3rd party apps Patch: http://cvs.winehq.org/patch.py?id=31228 Old revision New revision Changes Path 1.91 1.92 +1 -34 lostwages/templates/en/download.template Index: lostwages/templates/en/download.template diff -u -p lostwages/templates/en/download.template:1.91 lostwages/templates/en/download.template:1.92 --- lostwages/templates/en/download.template:1.91 21 Jun 2007 20:26: 8 -0000 +++ lostwages/templates/en/download.template 21 Jun 2007 20:26: 8 -0000 @@ -121,40 +121,7 @@ for post-installation instructions.</b>< <h1><a name="binary"></a>3rd Party Tools</h1> -<table width="95%" border=0 cellpadding=5 cellspacing=1 bgcolor="#EFEFEF"> - - <tr> - <td align=center bgcolor=black><b><font color=white class=small>Product</font></b></td> - <td align=center bgcolor=black><b><font color=white class=small>Description</font></b></td> - - </tr> - - <tr> - <td align=center bgcolor="#ffffff"> - <a href="http://www.von-thadden.de/Joachim/WineTools/"> - <img src="../images/distro/winetools.png" - width="50" height="50" alt="WineTools" border="0"> - </a> - </td> - <td align=left bgcolor="#ffffff"> - <b><a href="http://www.von-thadden.de/Joachim/WineTools/">WineTools</a></b> - - WineTools is a menu driven installer for installing Windows programs. - This software lets you install the following Windows software: DCOM98, - IE6, Windows Core Fonts, Windows System Software, Office & Office Viewer, - Adobe Photoshop 7, Illustrator 9 and many other programs.<br /> - By <a href="http://www.von-thadden.de/Joachim/WineTools/">Joachim von - Thadden</a>.<br /> - <div style="margin: 10px; padding: 5px; border: 1px solid #C0C0C0; background-color: #F0F0F0;"> - <b>Note:</b> WineTools only recommended if installation or operability of - Windows software failed on pure Wine. Since WineTools radically alters your - Wine configuration please do not report bugs in programs with WineTools - installed. Instead contact the author of WineTools - <a href="mailto:thadden(a)web.de">Joachim von Thadden</a>. - </div> - </td> - </tr> -</table> - +<p>Sometimes a customization of Wine can cause an application to work, but this change cannot be incorporated into Wine for some reason. To help overcome current deficiencies in Wine, various third party applications for end users have been made over the years. These applications are entirely unsupported by the Wine developers, however you may find them useful. For more information, see <a href="http://wiki.winehq.org/ThirdPartyApplications">our wiki page</a> on third party applications.</p> <h1><a name="commercial"></a>Commercial Wine Versions</h1>

1 0

lostwages/templates/en cvs.template
by Jeremy Newman June 21, 2007

June 21, 2007

ChangeSet ID: 31227 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2007/06/21 15:22:51 Modified files: templates/en : cvs.template Log message: Alexander Q. Waite <awaite2(a)uiuc.edu> Use <code> tag and cleanup HTML in cvs.template Patch: http://cvs.winehq.org/patch.py?id=31227 Old revision New revision Changes Path 1.27 1.28 +41 -61 lostwages/templates/en/cvs.template Index: lostwages/templates/en/cvs.template diff -u -p lostwages/templates/en/cvs.template:1.27 lostwages/templates/en/cvs.template:1.28 --- lostwages/templates/en/cvs.template:1.27 21 Jun 2007 20:22:51 -0000 +++ lostwages/templates/en/cvs.template 21 Jun 2007 20:22:51 -0000 @@ -2,57 +2,45 @@ <h1>The Wine CVS Tree</h1> -<p><b>Note: We are switching development from CVS to <a href="http://git.or.cz">Git</a>.<br> - Instructions for using the <a href="{$root}/site/git">Wine GIT tree</a> - can be found on the <a href="http://wiki.winehq.org/GitWine">GitWine</a> - page on the <a href="http://wiki.winehq.org">Wine Wiki</a>. -</b></p> +<p><strong>Note: We are switching development from CVS to <a href="http://git.or.cz">Git</a>. + Instructions for using the <a href="{$root}/site/git">Wine GIT tree</a> + can be found on the <a href="http://wiki.winehq.org/GitWine">GitWine</a> + page on the <a href="http://wiki.winehq.org">Wine Wiki</a>.</strong></p> <ol> - <li><a href="#co">Getting a local copy of Wine</a> - <li><a href="#modules">Other modules available via CVS from WineHQ</a> - <li><a href="#docs">Documentation module available via CVS from Sourceforge</a> - <li><a href="#sourcetree">Source Tree Browsing via the Web</a> + <li><a href="#co">Getting a local copy of Wine</a></li> + <li><a href="#modules">Other modules available via CVS from WineHQ</a></li> + <li><a href="#docs">Documentation module available via CVS from Sourceforge</a></li> + <li><a href="#sourcetree">Source Tree Browsing via the Web</a></li> </ol> -<p><img src="./images/grey_pixel.gif" width="100%" height=1 border=0 alt="-"></p> +<hr /> -<a name="co" class="hidden"></a> +<h1 id="co">Getting a local copy of Wine</h1> -<h1>Getting a local copy of Wine</h1> +<p>To connect to the CVS server, run:</p> -<p> To connect to the CVS server, run: </p> - - <table width="500" border=0 cellpadding=10><tr><td class=black> - <span class=inverse> - export CVSROOT=:pserver:cvs(a)cvs.winehq.org:/home/wine<br> - cvs login - </span> - </td></tr> - </table> +<p><code>export CVSROOT=:pserver:cvs(a)cvs.winehq.org:/home/wine +cvs login +</code></p> <p>Use "cvs" as the password (without the quotes). Note that -<code>/home/wine</code> is a path on the <b>server</b>, not on your machine.</p> +<code>/home/wine</code> is a path on the <strong>server</strong>, not on your machine.</p> <p>To check out the entire Wine source tree run:</p> - <table width="300" border=0 cellpadding=10><tr><td class=black> - <span class=inverse> - cvs -z 3 checkout wine - </span> - </td></tr> - </table> - -<p><img src="./images/grey_pixel.gif" width="100%" height=1 border=0 alt="-"></p> - -<a name="modules" class="hidden"></a> - -<h1>Other modules available via CVS from WineHQ</h1> - -<p> -The WineHQ CVS server makes a couple of other things available as well. -To get these, log in anonymously as above and do <code>cvs co <i>modulename</i></code> where -<code><i>modulename</i></code> is one of:</p> +<p><code>cvs -z 3 checkout wine</code></p> + +<hr /> + +<h1 id="modules">Other modules available via CVS from WineHQ</h1> + +<p>The WineHQ CVS server makes a couple of other things available as well. + To get these, log in anonymously as above and do + <code>cvs co <em>modulename</em></code> + where + <code><em>modulename</em></code> + is one of:</p> <ul> <li><tt>lostwages</tt> -- source for the WineHQ web site</li> <li><tt>tools</tt> -- tools used on the WineHQ site</li> @@ -60,38 +48,30 @@ To get these, log in anonymously as abov <li><tt>bugzilla</tt> -- source for the bugzilla version used on the WineHQ site</li> </ul> -<p><img src="./images/grey_pixel.gif" width="100%" height=1 border=0 alt="-"></p> +<hr /> -<a name="docs" class="hidden"></a> +<h1 id="docs">Documentation module available via CVS from Sourceforge</h1> -<h1>Documentation module available via CVS from Sourceforge</h1> +<p>The documentation lives in a separate CVS tree on Sourceforge. To get the docs in + a terminal run:</p> +<p><code>cvs -z3 -d:pserver:anonymous(a)wine.cvs.sourceforge.net:/cvsroot/wine co -P docs</code></p> -<p> The documentation lives in a separate CVS tree on Sourceforge.<br/> -To get the docs in a terminal run:</p> - <table width="550" border=0 cellpadding=10><tr><td class=black> - <span class=inverse> - cvs -z3 -d:pserver:anonymous(a)wine.cvs.sourceforge.net:/cvsroot/wine co -P docs<br/> - </span> - </td></tr> - </table> <p>When prompted for a password press the enter key. A subdirectory named docs will be created.</p> -<p><img src="./images/grey_pixel.gif" width="100%" height=1 border=0 alt="-"></p> +<hr /> -<a name="sourcetree" class=hidden></a> -<h1>Source Tree Browsing via the Web</h1> +<h1 id="sourcetree">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> + 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> + <li><a href="http://source.winehq.org/">source.winehq.org</a></li> </ul> <p>Direct access from the web to the complete CVS tree is also possible, using -<a href="http://www.freebsd.org/projects/cvsweb.html">cvsweb</a> package:</p> + <a href="http://www.freebsd.org/projects/cvsweb.html">cvsweb</a> package:</p> <ul> - <li><a href="http://cvs.winehq.org/cvsweb">cvs.winehq.org/cvsweb</a>, on the primary CVS repository -</ul> - -<p> </p> + <li><a href="http://cvs.winehq.org/cvsweb">cvs.winehq.org/cvsweb</a>, on the + primary CVS repository.</li> +</ul> \ No newline at end of file

1 0

lostwages/templates/en contributing.template
by Jeremy Newman June 21, 2007

June 21, 2007

ChangeSet ID: 31226 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2007/06/21 15:21:46 Modified files: templates/en : contributing.template Log message: Alexander Q. Waite <awaite2(a)uiuc.edu> Cleanup HTML in contributing.template Patch: http://cvs.winehq.org/patch.py?id=31226 Old revision New revision Changes Path 1.32 1.33 +379 -454 lostwages/templates/en/contributing.template

1 0

lostwages/. winehq_styles.css
by Jeremy Newman June 21, 2007

June 21, 2007

ChangeSet ID: 31225 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2007/06/21 15:20:17 Modified files: . : winehq_styles.css Log message: Alexander Q. Waite <awaite2(a)uiuc.edu> Add CSS rule for <address> Patch: http://cvs.winehq.org/patch.py?id=31225 Old revision New revision Changes Path 1.19 1.20 +1 -0 lostwages/winehq_styles.css Index: lostwages/winehq_styles.css diff -u -p lostwages/winehq_styles.css:1.19 lostwages/winehq_styles.css:1.20 --- lostwages/winehq_styles.css:1.19 21 Jun 2007 20:20:17 -0000 +++ lostwages/winehq_styles.css 21 Jun 2007 20:20:17 -0000 @@ -15,6 +15,7 @@ code { border: 1px solid padding: .5em; white-space: pre; } +address { white-space: pre; } /* Link Colors */ A { color: #A50D0D; }

1 0

Lei Zhang : winex11.drv: Send WM_MOUSEACTIVATE before closing a window.
by Alexandre Julliard June 21, 2007

June 21, 2007

Module: wine Branch: master Commit: 9a67bded8c5b6ba48470f30437564b3ae1437ef6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a67bded8c5b6ba48470f3043… Author: Lei Zhang <thestig(a)google.com> Date: Mon Jun 18 14:00:04 2007 -0700 winex11.drv: Send WM_MOUSEACTIVATE before closing a window. --- dlls/winex11.drv/event.c | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index e3047fd..f13e079 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -405,6 +405,27 @@ static void handle_wm_protocols( HWND hwnd, XClientMessageEvent *event ) if (state == 0xFFFFFFFF || (state & (MF_DISABLED | MF_GRAYED))) return; } + if (GetActiveWindow() != hwnd) + { + LRESULT ma = SendMessageW( hwnd, WM_MOUSEACTIVATE, + (WPARAM)GetAncestor( hwnd, GA_ROOT ), + MAKELONG(HTCLOSE,WM_LBUTTONDOWN) ); + switch(ma) + { + case MA_NOACTIVATEANDEAT: + case MA_ACTIVATEANDEAT: + return; + case MA_NOACTIVATE: + break; + case MA_ACTIVATE: + case 0: + SetActiveWindow(hwnd); + break; + default: + WARN( "unknown WM_MOUSEACTIVATE code %d\n", (int) ma ); + break; + } + } PostMessageW( hwnd, WM_X11DRV_DELETE_WINDOW, 0, 0 ); } }

1 0

Misha Koshelev : gdi32: Handle ArcTo in paths as native.
by Alexandre Julliard June 21, 2007

June 21, 2007

Module: wine Branch: master Commit: 859bf44c3389c843cf47866ca8e474e3b0e54146 URL: http://source.winehq.org/git/wine.git/?a=commit;h=859bf44c3389c843cf47866ca… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Wed Jun 20 17:02:58 2007 -0500 gdi32: Handle ArcTo in paths as native. --- dlls/gdi32/painting.c | 4 +++- dlls/gdi32/path.c | 22 ++++++++++++++++++---- dlls/gdi32/tests/path.c | 6 +++--- 3 files changed, 24 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/painting.c b/dlls/gdi32/painting.c index 838e0e0..ea36421 100644 --- a/dlls/gdi32/painting.c +++ b/dlls/gdi32/painting.c @@ -124,7 +124,9 @@ BOOL WINAPI ArcTo( HDC hdc, DC * dc = DC_GetDCUpdate( hdc ); if(!dc) return FALSE; - if(dc->funcs->pArcTo) + if(PATH_IsPathOpen(dc->path)) + result = PATH_Arc(dc,left,top,right,bottom,xstart,ystart,xend,yend,-1); + else if(dc->funcs->pArcTo) result = dc->funcs->pArcTo( dc->physDev, left, top, right, bottom, xstart, ystart, xend, yend ); else /* We'll draw a line from the current position to the starting point of the arc, then draw the arc */ diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 7999fef..1a37adc 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -725,8 +725,10 @@ BOOL PATH_Ellipse(DC *dc, INT x1, INT y1, INT x2, INT y2) * Should be called when a call to Arc is performed on a DC that has * an open path. This adds up to five Bezier splines representing the arc * to the path. When 'lines' is 1, we add 1 extra line to get a chord, - * and when 'lines' is 2, we add 2 extra lines to get a pie. - * Returns TRUE if successful, else FALSE. + * when 'lines' is 2, we add 2 extra lines to get a pie, and when 'lines' is + * -1 we add 1 extra line from the current DC position to the starting position + * of the arc before drawing the arc itself (arcto). Returns TRUE if successful, + * else FALSE. */ BOOL PATH_Arc(DC *dc, INT x1, INT y1, INT x2, INT y2, INT xStart, INT yStart, INT xEnd, INT yEnd, INT lines) @@ -736,7 +738,7 @@ BOOL PATH_Arc(DC *dc, INT x1, INT y1, INT x2, INT y2, /* Initialize angleEndQuadrant to silence gcc's warning */ double x, y; FLOAT_POINT corners[2], pointStart, pointEnd; - POINT centre; + POINT centre, pointCurPos; BOOL start, end; INT temp; @@ -811,6 +813,18 @@ BOOL PATH_Arc(DC *dc, INT x1, INT y1, INT x2, INT y2, corners[1].y--; } + /* arcto: Add a PT_MOVETO only if this is the first entry in a stroke */ + if(lines==-1 && pPath->newStroke) + { + pPath->newStroke=FALSE; + pointCurPos.x = dc->CursPosX; + pointCurPos.y = dc->CursPosY; + if(!LPtoDP(dc->hSelf, &pointCurPos, 1)) + return FALSE; + if(!PATH_AddEntry(pPath, &pointCurPos, PT_MOVETO)) + return FALSE; + } + /* Add the arc to the path with one Bezier spline per quadrant that the * arc spans */ start=TRUE; @@ -848,7 +862,7 @@ BOOL PATH_Arc(DC *dc, INT x1, INT y1, INT x2, INT y2, /* Add the Bezier spline to the path */ PATH_DoArcPart(pPath, corners, angleStartQuadrant, angleEndQuadrant, - start ? PT_MOVETO : FALSE); + start ? (lines==-1 ? PT_LINETO : PT_MOVETO) : FALSE); start=FALSE; } while(!end); diff --git a/dlls/gdi32/tests/path.c b/dlls/gdi32/tests/path.c index 2a80377..e567106 100644 --- a/dlls/gdi32/tests/path.c +++ b/dlls/gdi32/tests/path.c @@ -194,7 +194,7 @@ static void ok_path(HDC hdc, const path_test_t *expected, int expected_size, BOO static const path_test_t arcto_path[] = { {0, 0, PT_MOVETO, 0, 0}, /* 0 */ {229, 215, PT_LINETO, 0, 0}, /* 1 */ - {248, 205, PT_BEZIERTO, 1, 0}, /* 2 */ + {248, 205, PT_BEZIERTO, 0, 0}, /* 2 */ {273, 200, PT_BEZIERTO, 0, 0}, /* 3 */ {300, 200, PT_BEZIERTO, 0, 0}, /* 4 */ {355, 200, PT_BEZIERTO, 0, 0}, /* 5 */ @@ -204,7 +204,7 @@ static const path_test_t arcto_path[] = { {389, 275, PT_BEZIERTO, 0, 0}, /* 9 */ {370, 285, PT_BEZIERTO, 0, 0}, /* 10 */ {363, 277, PT_LINETO, 0, 0}, /* 11 */ - {380, 270, PT_BEZIERTO, 1, 0}, /* 12 */ + {380, 270, PT_BEZIERTO, 0, 0}, /* 12 */ {389, 260, PT_BEZIERTO, 0, 0}, /* 13 */ {389, 250, PT_BEZIERTO, 0, 0}, /* 14 */ {389, 228, PT_BEZIERTO, 0, 0}, /* 15 */ @@ -232,7 +232,7 @@ static void test_arcto(void) CloseFigure(hdc); EndPath(hdc); - ok_path(hdc, arcto_path, sizeof(arcto_path)/sizeof(path_test_t), 1); + ok_path(hdc, arcto_path, sizeof(arcto_path)/sizeof(path_test_t), 0); done: ReleaseDC(0, hdc); }

1 0