February 2010 - Wine-Commits

Scott Ritchie : Add "download" verb to download page web links
by Jeremy Newman Feb. 1, 2010

Feb. 1, 2010

Module: website Branch: master Commit: 2c23d47632c1a64a6a4fce093ea66a4b612e0aa1 URL: http://source.winehq.org/git/website.git/?a=commit;h=2c23d47632c1a64a6a4fce… Author: Scott Ritchie <scott(a)open-vote.org> Date: Mon Feb 1 10:27:04 2010 -0800 Add "download" verb to download page web links I still get confused emails from people who have gotten to the download page but didn't click through the link to see the instructions. I believe this might clarify they need to take an extra step. Thanks, Scott Ritchie >From 238070c32fe6dfb5adbdf2da57d4c3ece261c5a4 Mon Sep 17 00:00:00 2001 From: Scott Ritchie <scott(a)open-vote.org> Date: Mon, 1 Feb 2010 10:24:13 -0800 Subject: Add affirmative "download (foo) packages" to download page links --- templates/en/download.template | 40 ++++++++++++++++++++-------------------- 1 files changed, 20 insertions(+), 20 deletions(-) diff --git a/templates/en/download.template b/templates/en/download.template index c62c5ec..30bbacd 100644 --- a/templates/en/download.template +++ b/templates/en/download.template @@ -60,8 +60,8 @@ requested in exchange for hosting the Wine web site. <td align="center"><a href="{$root}/download/deb"> <img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu linux" border="0"></a> </td> - <td> <a href="{$root}/download/deb">Ubuntu</a> - binary and source .debs for Ubuntu Karmic (9.10), Jaunty (9.04), Intrepid (8.10), and Hardy (8.04) + <td> <a href="{$root}/download/deb">Download Ubuntu packages</a> + - binary and source .debs for Ubuntu Karmic (9.10), Jaunty (9.04), Intrepid (8.10), and Hardy (8.04) <td><a href="mailto:scott(a)open-vote.org">Scott Ritchie</a></td> </tr> @@ -69,8 +69,8 @@ requested in exchange for hosting the Wine web site. <td align=center><a href="{$root}/download/deblenny"> <img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian Linux" border="0"></a> </td> - <td> <a href="{$root}/download/deblenny">Debian</a> - binary .debs for Debian Lenny, Squeeze and Sid</td> + <td> <a href="{$root}/download/deblenny">Download Debian packages</a> + - binary .debs for Debian Lenny, Squeeze and Sid</td> <td><a href="mailto:repository(a)lamaresh.net">Maurilio Genovese</a> <a href="mailto:ben.klein(a)lamaresh.net">Ben Klein</a></td> </tr> @@ -78,8 +78,8 @@ requested in exchange for hosting the Wine web site. <td align="center"><a href="http://fedoraproject.org/wiki/AndreasBierfert/Wine"> <img src="{$root}/images/distro/redhat.png" width="50" height="50" alt="RedHat Linux" border="0"></a> </td> - <td> <a href="http://fedoraproject.org/wiki/AndreasBierfert/Wine">Red Hat / CentOS / Fedora</a> - binary and source .rpms for Red Hat Enterprise Linux 4, 5; CentOS 4, 5; Fedora Core 5, 6; Fedora Linux 7 and + <td> <a href="http://fedoraproject.org/wiki/AndreasBierfert/Wine">Download Red Hat / CentOS / Fedora packages</a> + - binary and source .rpms for Red Hat Enterprise Linux 4, 5; CentOS 4, 5; Fedora Core 5, 6; Fedora Linux 7 and compatible distributions. The wine meta package is available via <tt>yum</tt> through the EPEL / Fedora Extras / Fedora repository by running <tt>$ yum install @@ -92,8 +92,8 @@ requested in exchange for hosting the Wine web site. <td align="center"><a href="http://en.opensuse.org/Wine#Repositories"> <img src="{$root}/images/distro/suse.png" width="50" height="50" alt="SUSE Linux" border="0"></a> </td> - <td> <a href="http://en.opensuse.org/Wine#Repositories">SUSE</a> - release binary and source .rpms and daily snapshot RPMs for openSUSE 11.0, 11.1, 11.2 and SLES 9, SLE 10 and SLE 11. + <td> <a href="http://en.opensuse.org/Wine#Repositories">Download SUSE packages</a> + - release binary and source .rpms and daily snapshot RPMs for openSUSE 11.0, 11.1, 11.2 and SLES 9, SLE 10 and SLE 11. Old package versions available on <a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=7…">SourceForge</a> </td> <td><a href="mailto:meissner(a)suse.de">Marcus Meissner</a></td> @@ -103,8 +103,8 @@ requested in exchange for hosting the Wine web site. <td align="center"><a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=8…"> <img src="{$root}/images/distro/mandriva.png" width="50" height="50" alt="Mandriva Linux" border="0"></a> </td> - <td> <a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=8…">Mandriva</a> - binary .rpms for Mandriva Linux 2006, 2007, and 2008. Download the 2008.1 package if your Mandriva is a 2008.1 + <td> <a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=8…">Download Mandriva packages</a> + - binary .rpms for Mandriva Linux 2006, 2007, and 2008. Download the 2008.1 package if your Mandriva is a 2008.1 release, eg. 2008 Spring. Download the 2008.0 package if your Mandriva is the first 2008 release.</td> <td><a href="mailto:marco(a)mandrivaclub.nl">Marco Meijer</a></td> </tr> @@ -113,8 +113,8 @@ requested in exchange for hosting the Wine web site. <td align="center"><a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=6…"> <img src="{$root}/images/distro/slackware.png" width="50" height="50" alt="Slackware linux" border="0"></a> </td> - <td> <a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=6…">Slackware</a> - binary .tgz for Slackware 10.2</td> + <td> <a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=6…">Download Slackware packages</a> + - binary .tgz for Slackware 10.2</td> <td><a href="mailto:sadam(a)clemson.edu">Adam Schreiber</a></td> </tr> @@ -122,8 +122,8 @@ requested in exchange for hosting the Wine web site. <td align="center"><a href="http://www.freshports.org/emulators/wine/"> <img src="{$root}/images/distro/freebsd.png" width="50" height="54" alt="FreeBSD" border="0"></a> </td> - <td> <a href="http://www.freshports.org/emulators/wine/">FreeBSD</a> - source for FreeBSD 5.3 or later</td> + <td> <a href="http://www.freshports.org/emulators/wine/">Download FreeBSD packages</a> + - source for FreeBSD 5.3 or later</td> <td><a href="mailto:gerald(a)pfeifer.com">Gerald Pfeifer</a></td> </tr> @@ -131,8 +131,8 @@ requested in exchange for hosting the Wine web site. <td align="center"><a href="http://www.pbidir.com/bt/search/?str=wine&search=Search"> <img src="{$root}/images/distro/pcbsd.png" width="50" height="50" alt="FreeBSD" border="0"></a> </td> - <td> <a href="http://www.pbidir.com/bt/search/?str=wine&search=Search">PC-BSD</a> - binary packages .pbi for PC-BSD (FreeBSD based OS)</td> + <td> <a href="http://www.pbidir.com/bt/search/?str=wine&search=Search">Download PC-BSD packages</a> + - binary packages .pbi for PC-BSD (FreeBSD based OS)</td> <td><a href="mailto:kris(a)pcbsd.com">Kris Moore</a></td> </tr> @@ -140,8 +140,8 @@ requested in exchange for hosting the Wine web site. <td align="center"><a href="http://www.sunfreepacks.com/listing/?limit=1000&offset=0"> <img src="{$root}/images/distro/solaris.png" width="50" height="50" alt="Solaris 10" border="0"></a> </td> - <td> <a href="http://www.sunfreepacks.com/listing/?limit=1000&offset=0">Solaris 10, SXCE</a> - ASwine, ASwine-SXCE binary package .pkg for Solaris 10 and SXCE x86</td> + <td> <a href="http://www.sunfreepacks.com/listing/?limit=1000&offset=0">Download Solaris 10, SXCE packages</a> + - ASwine, ASwine-SXCE binary package .pkg for Solaris 10 and SXCE x86</td> <td><a href="mailto:asyropoulos(a)yahoo.com">Apostolos Syropoulos</a></td> </tr> @@ -149,8 +149,8 @@ requested in exchange for hosting the Wine web site. <td align="center"><a href="http://pkg.opensolaris.org/contrib/en/catalog.shtml"> <img src="{$root}/images/distro/opensolaris.png" width="50" height="50" alt="OpenSolaris" border="0"></a> </td> - <td> <a href="http://pkg.opensolaris.org/contrib/en/catalog.shtml">OpenSolaris</a> - binary package .pkg for OpenSolaris x86</td> + <td> <a href="http://pkg.opensolaris.org/contrib/en/catalog.shtml">Download OpenSolaris packages</a> + - binary package .pkg for OpenSolaris x86</td> <td><a href="mailto:asyropoulos(a)yahoo.com">Apostolos Syropoulos</a></td> </tr>

1 0

Huw Davies : oleaut32: Fix font handle lifetimes.
by Alexandre Julliard Feb. 1, 2010

Feb. 1, 2010

Module: wine Branch: master Commit: 7aaaf738ecd06c12bfd69200ee74abd5cc9aef8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7aaaf738ecd06c12bfd69200e… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Feb 1 14:09:52 2010 +0000 oleaut32: Fix font handle lifetimes. --- dlls/oleaut32/olefont.c | 209 ++++++++++++++++++++++++----------------- dlls/oleaut32/tests/olefont.c | 42 ++++++++- 2 files changed, 160 insertions(+), 91 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7aaaf738ecd06c12bfd69…

1 0

Huw Davies : oleaut32: Add tests to explore the lifetime of font handles.
by Alexandre Julliard Feb. 1, 2010

Feb. 1, 2010

Module: wine Branch: master Commit: 439d5852183c6768118f5089537779a668cdb283 URL: http://source.winehq.org/git/wine.git/?a=commit;h=439d5852183c6768118f50895… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Feb 1 14:03:36 2010 +0000 oleaut32: Add tests to explore the lifetime of font handles. --- dlls/oleaut32/tests/olefont.c | 150 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 150 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tests/olefont.c b/dlls/oleaut32/tests/olefont.c index d57f66b..ca913fa 100644 --- a/dlls/oleaut32/tests/olefont.c +++ b/dlls/oleaut32/tests/olefont.c @@ -836,6 +836,155 @@ static void test_returns(void) IFont_Release(pFont); } +static void test_hfont_lifetime(void) +{ + IFont *font; + FONTDESC fontdesc; + HRESULT hr; + HFONT hfont, first_hfont = NULL; + CY size; + DWORD obj_type; + int i; + + fontdesc.cbSizeofstruct = sizeof(fontdesc); + fontdesc.lpstrName = arial_font; + fontdesc.cySize.int64 = 12 * 10000; /* 12 pt */ + fontdesc.sWeight = FW_NORMAL; + fontdesc.sCharset = ANSI_CHARSET; + fontdesc.fItalic = FALSE; + fontdesc.fUnderline = FALSE; + fontdesc.fStrikethrough = FALSE; + + hr = pOleCreateFontIndirect(&fontdesc, &IID_IFont, (void **)&font); + ok_ole_success(hr, "OleCreateFontIndirect"); + + hr = IFont_get_hFont(font, &hfont); + ok_ole_success(hr, "get_hFont"); + + /* show that if the font is updated the old hfont is deleted when the + new font is realized */ + for(i = 0; i < 100; i++) + { + HFONT last_hfont = hfont; + + size.int64 = (i + 10) * 20000; + + obj_type = GetObjectType(hfont); + ok(obj_type == OBJ_FONT, "got obj type %d\n", obj_type); + + hr = IFont_put_Size(font, size); + ok_ole_success(hr, "put_Size"); + + /* put_Size doesn't cause the new font to be realized */ + obj_type = GetObjectType(last_hfont); + ok(obj_type == OBJ_FONT, "got obj type %d\n", obj_type); + + hr = IFont_get_hFont(font, &hfont); + ok_ole_success(hr, "get_hFont"); + + obj_type = GetObjectType(last_hfont); +todo_wine + ok(obj_type == 0, "%d: got obj type %d\n", i, obj_type); + } + + /* now show that if we take a reference on the hfont, it persists + until the font object is released */ + for(i = 0; i < 100; i++) + { + + size.int64 = (i + 10) * 20000; + + obj_type = GetObjectType(hfont); + ok(obj_type == OBJ_FONT, "got obj type %d\n", obj_type); + + hr = IFont_put_Size(font, size); + ok_ole_success(hr, "put_Size"); + + hr = IFont_get_hFont(font, &hfont); + ok_ole_success(hr, "get_hFont"); + + hr = IFont_AddRefHfont(font, hfont); + ok_ole_success(hr, "AddRefHfont"); + + if(i == 0) first_hfont = hfont; + obj_type = GetObjectType(first_hfont); + ok(obj_type == OBJ_FONT, "got obj type %d\n", obj_type); + } + + IFont_Release(font); + + obj_type = GetObjectType(first_hfont); + ok(obj_type == 0, "got obj type %d\n", obj_type); + + /* An AddRefHfont followed by a ReleaseHfont means the font doesn't not persist + through re-realization */ + + hr = pOleCreateFontIndirect(&fontdesc, &IID_IFont, (void **)&font); + ok_ole_success(hr, "OleCreateFontIndirect"); + + hr = IFont_get_hFont(font, &hfont); + ok_ole_success(hr, "get_hFont"); + + for(i = 0; i < 100; i++) + { + HFONT last_hfont = hfont; + + size.int64 = (i + 10) * 20000; + + obj_type = GetObjectType(hfont); + ok(obj_type == OBJ_FONT, "got obj type %d\n", obj_type); + + hr = IFont_put_Size(font, size); + ok_ole_success(hr, "put_Size"); + + /* put_Size doesn't cause the new font to be realized */ + obj_type = GetObjectType(last_hfont); + ok(obj_type == OBJ_FONT, "got obj type %d\n", obj_type); + + hr = IFont_get_hFont(font, &hfont); + ok_ole_success(hr, "get_hFont"); + + hr = IFont_AddRefHfont(font, hfont); + ok_ole_success(hr, "AddRefHfont"); + + hr = IFont_ReleaseHfont(font, hfont); + ok_ole_success(hr, "ReleaseHfont"); + + obj_type = GetObjectType(last_hfont); +todo_wine + ok(obj_type == 0, "%d: got obj type %d\n", i, obj_type); + } + + /* Interestingly if we release a non-existent reference on the hfont, it persists + until the font object is released */ + for(i = 0; i < 100; i++) + { + size.int64 = (i + 10) * 20000; + + obj_type = GetObjectType(hfont); + ok(obj_type == OBJ_FONT, "got obj type %d\n", obj_type); + + hr = IFont_put_Size(font, size); + ok_ole_success(hr, "put_Size"); + + hr = IFont_get_hFont(font, &hfont); + ok_ole_success(hr, "get_hFont"); + + hr = IFont_ReleaseHfont(font, hfont); + ok_ole_success(hr, "ReleaseHfont"); + + if(i == 0) first_hfont = hfont; + obj_type = GetObjectType(first_hfont); + ok(obj_type == OBJ_FONT, "got obj type %d\n", obj_type); + } + + IFont_Release(font); + + obj_type = GetObjectType(first_hfont); + ok(obj_type == 0, "got obj type %d\n", obj_type); +} + + START_TEST(olefont) { hOleaut32 = GetModuleHandleA("oleaut32.dll"); @@ -869,4 +1018,5 @@ START_TEST(olefont) test_ReleaseHfont(); test_AddRefHfont(); test_returns(); + test_hfont_lifetime(); }

1 0

Jörg Höhle : winmm: Perform stricter MIDI-related error checking.
by Alexandre Julliard Feb. 1, 2010

Feb. 1, 2010

Module: wine Branch: master Commit: 06d6dd3e7204832f18913c8c2fb3cb67359ebfed URL: http://source.winehq.org/git/wine.git/?a=commit;h=06d6dd3e7204832f18913c8c2… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Jan 27 18:18:18 2010 +0100 winmm: Perform stricter MIDI-related error checking. --- dlls/winmm/winmm.c | 23 ++++++++++++++++------- 1 files changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index 4a03209..76c3752 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -130,6 +130,10 @@ const char* WINMM_ErrorToString(MMRESULT error) ERR_TO_STR(WAVERR_STILLPLAYING); ERR_TO_STR(WAVERR_UNPREPARED); ERR_TO_STR(WAVERR_SYNC); + ERR_TO_STR(MIDIERR_INVALIDSETUP); + ERR_TO_STR(MIDIERR_NODEVICE); + ERR_TO_STR(MIDIERR_STILLPLAYING); + ERR_TO_STR(MIDIERR_UNPREPARED); } #undef ERR_TO_STR return wine_dbg_sprintf("Unknown(0x%08x)", error); @@ -882,9 +886,7 @@ static LPWINE_MIDI MIDI_OutAlloc(HMIDIOUT* lphMidiOut, DWORD_PTR* lpdwCallback, lpwm = (LPWINE_MIDI)MMDRV_Alloc(size, MMDRV_MIDIOUT, &hMidiOut, lpdwFlags, lpdwCallback, lpdwInstance); - - if (lphMidiOut != NULL) - *lphMidiOut = hMidiOut; + *lphMidiOut = hMidiOut; if (lpwm) { lpwm->mod.hMidi = hMidiOut; @@ -1777,8 +1779,7 @@ MMRESULT WINAPI midiStreamOpen(HMIDISTRM* lphMidiStrm, LPUINT lpuDeviceID, return MMSYSERR_NOMEM; } lpMidiStrm->hDevice = hMidiOut; - if (lphMidiStrm) - *lphMidiStrm = (HMIDISTRM)hMidiOut; + *lphMidiStrm = (HMIDISTRM)hMidiOut; lpwm->mld.uDeviceID = *lpuDeviceID; @@ -1820,11 +1821,19 @@ MMRESULT WINAPI midiStreamOut(HMIDISTRM hMidiStrm, LPMIDIHDR lpMidiHdr, TRACE("(%p, %p, %u)!\n", hMidiStrm, lpMidiHdr, cbMidiHdr); + if (cbMidiHdr < sizeof(MIDIHDR) || !lpMidiHdr || !lpMidiHdr->lpData) + return MMSYSERR_INVALPARAM; + + if (!(lpMidiHdr->dwFlags & MHDR_PREPARED)) + return MIDIERR_UNPREPARED; + + if (lpMidiHdr->dwFlags & MHDR_INQUEUE) + return MIDIERR_STILLPLAYING; + if (!MMSYSTEM_GetMidiStream(hMidiStrm, &lpMidiStrm, NULL)) { ret = MMSYSERR_INVALHANDLE; - } else if (!lpMidiHdr) { - ret = MMSYSERR_INVALPARAM; } else { + lpMidiHdr->dwFlags |= MHDR_ISSTRM; if (!PostThreadMessageA(lpMidiStrm->dwThreadID, WINE_MSM_HEADER, cbMidiHdr, (LPARAM)lpMidiHdr)) {

1 0

Jörg Höhle : midimap: Perform stricter error-checking.
by Alexandre Julliard Feb. 1, 2010

Feb. 1, 2010

Module: wine Branch: master Commit: ed7a3662020a6a7ae553c37985b2ed05ccbc70fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed7a3662020a6a7ae553c3798… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Jan 27 18:08:04 2010 +0100 midimap: Perform stricter error-checking. --- dlls/midimap/midimap.c | 21 +++++++++++++++++---- 1 files changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/midimap/midimap.c b/dlls/midimap/midimap.c index f429497..293465f 100644 --- a/dlls/midimap/midimap.c +++ b/dlls/midimap/midimap.c @@ -318,8 +318,14 @@ static DWORD modLongData(MIDIMAPDATA* mom, LPMIDIHDR lpMidiHdr, DWORD_PTR dwPara if (MIDIMAP_IsBadData(mom)) return MMSYSERR_ERROR; + if (!(lpMidiHdr->dwFlags & MHDR_PREPARED)) + return MIDIERR_UNPREPARED; + if (lpMidiHdr->dwFlags & MHDR_INQUEUE) + return MIDIERR_STILLPLAYING; mh = *lpMidiHdr; + lpMidiHdr->dwFlags &= ~MHDR_DONE; + lpMidiHdr->dwFlags |= MHDR_INQUEUE; for (chn = 0; chn < 16; chn++) { if (mom->ChannelMap[chn] && mom->ChannelMap[chn]->loaded > 0) @@ -327,10 +333,15 @@ static DWORD modLongData(MIDIMAPDATA* mom, LPMIDIHDR lpMidiHdr, DWORD_PTR dwPara mh.dwFlags = 0; midiOutPrepareHeader(mom->ChannelMap[chn]->hMidi, &mh, sizeof(mh)); ret = midiOutLongMsg(mom->ChannelMap[chn]->hMidi, &mh, sizeof(mh)); + /* As of 2009, wineXYZ.drv's LongData handlers are synchronous */ + if (!ret && !(mh.dwFlags & MHDR_DONE)) + FIXME("wait until MHDR_DONE\n"); midiOutUnprepareHeader(mom->ChannelMap[chn]->hMidi, &mh, sizeof(mh)); if (ret != MMSYSERR_NOERROR) break; } } + lpMidiHdr->dwFlags &= ~MHDR_INQUEUE; + lpMidiHdr->dwFlags |= MHDR_DONE; return ret; } @@ -397,21 +408,23 @@ static DWORD modData(MIDIMAPDATA* mom, DWORD_PTR dwParam) return ret; } -static DWORD modPrepare(MIDIMAPDATA* mom, LPMIDIHDR lpMidiHdr, DWORD_PTR dwParam2) +static DWORD modPrepare(MIDIMAPDATA* mom, LPMIDIHDR lpMidiHdr, DWORD_PTR dwSize) { if (MIDIMAP_IsBadData(mom)) return MMSYSERR_ERROR; - if (lpMidiHdr->dwFlags & (MHDR_ISSTRM|MHDR_PREPARED)) + if (dwSize < sizeof(MIDIHDR) || lpMidiHdr == 0 || + lpMidiHdr->lpData == 0 || (lpMidiHdr->dwFlags & MHDR_INQUEUE)) return MMSYSERR_INVALPARAM; lpMidiHdr->dwFlags |= MHDR_PREPARED; + lpMidiHdr->dwFlags &= ~MHDR_DONE; return MMSYSERR_NOERROR; } static DWORD modUnprepare(MIDIMAPDATA* mom, LPMIDIHDR lpMidiHdr, DWORD_PTR dwParam2) { if (MIDIMAP_IsBadData(mom)) return MMSYSERR_ERROR; - if ((lpMidiHdr->dwFlags & MHDR_ISSTRM) || !(lpMidiHdr->dwFlags & MHDR_PREPARED)) - return MMSYSERR_INVALPARAM; + if (!(lpMidiHdr->dwFlags & MHDR_PREPARED)) return MIDIERR_UNPREPARED; + if (lpMidiHdr->dwFlags & MHDR_INQUEUE) return MIDIERR_STILLPLAYING; lpMidiHdr->dwFlags &= ~MHDR_PREPARED; return MMSYSERR_NOERROR;

1 0

Huw Davies : oleaut32: Fix an ole font leak.
by Alexandre Julliard Feb. 1, 2010

Feb. 1, 2010

Module: wine Branch: master Commit: ad9843faab04d9834dbd7d55df40d6bd946fd378 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad9843faab04d9834dbd7d55d… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Feb 1 13:58:55 2010 +0000 oleaut32: Fix an ole font leak. --- dlls/oleaut32/tests/olefont.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tests/olefont.c b/dlls/oleaut32/tests/olefont.c index fd26388..d57f66b 100644 --- a/dlls/oleaut32/tests/olefont.c +++ b/dlls/oleaut32/tests/olefont.c @@ -832,6 +832,8 @@ static void test_returns(void) ok(hr == E_POINTER, "IFont::get_Bold: Expected E_POINTER got 0x%08x\n", hr); + + IFont_Release(pFont); } START_TEST(olefont)

1 0

Henri Verbeet : wined3d: Handle a zero source value for WINED3DSIH_RSQ.
by Alexandre Julliard Feb. 1, 2010

Feb. 1, 2010

Module: wine Branch: master Commit: adf4ca2e23873811a22fc82022f5d7753e9d569a URL: http://source.winehq.org/git/wine.git/?a=commit;h=adf4ca2e23873811a22fc8202… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 1 13:52:58 2010 +0100 wined3d: Handle a zero source value for WINED3DSIH_RSQ. --- dlls/wined3d/glsl_shader.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ba16cae..6357e06 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2253,10 +2253,15 @@ static void shader_glsl_rsq(const struct wined3d_shader_instruction *ins) shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_3, &src_param); - if (mask_size > 1) { - shader_addline(buffer, "vec%d(inversesqrt(%s)));\n", mask_size, src_param.param_str); - } else { - shader_addline(buffer, "inversesqrt(%s));\n", src_param.param_str); + if (mask_size > 1) + { + shader_addline(buffer, "vec%d(%s == 0.0 ? FLT_MAX : inversesqrt(%s)));\n", + mask_size, src_param.param_str, src_param.param_str); + } + else + { + shader_addline(buffer, "%s == 0.0 ? FLT_MAX : inversesqrt(%s));\n", + src_param.param_str, src_param.param_str); } }

1 0

Henri Verbeet : wined3d: Use the absolute source value in shader_glsl_rsq() .
by Alexandre Julliard Feb. 1, 2010

Feb. 1, 2010

Module: wine Branch: master Commit: c43c2a284513d85f3bb0a31da21e6177c97d41f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c43c2a284513d85f3bb0a31da… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 1 13:52:59 2010 +0100 wined3d: Use the absolute source value in shader_glsl_rsq(). --- dlls/wined3d/glsl_shader.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 6357e06..4892bfe 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2255,12 +2255,12 @@ static void shader_glsl_rsq(const struct wined3d_shader_instruction *ins) if (mask_size > 1) { - shader_addline(buffer, "vec%d(%s == 0.0 ? FLT_MAX : inversesqrt(%s)));\n", + shader_addline(buffer, "vec%d(%s == 0.0 ? FLT_MAX : inversesqrt(abs(%s))));\n", mask_size, src_param.param_str, src_param.param_str); } else { - shader_addline(buffer, "%s == 0.0 ? FLT_MAX : inversesqrt(%s));\n", + shader_addline(buffer, "%s == 0.0 ? FLT_MAX : inversesqrt(abs(%s)));\n", src_param.param_str, src_param.param_str); } }

1 0

Jörg Höhle : winmm: midiStreamPosition can select an alternative MMTIME format.
by Alexandre Julliard Feb. 1, 2010

Feb. 1, 2010

Module: wine Branch: master Commit: f1373d57c1e2c464c7c99e9fa85c24288e0127b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1373d57c1e2c464c7c99e9fa… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sat Jan 30 10:07:59 2010 +0100 winmm: midiStreamPosition can select an alternative MMTIME format. --- dlls/winmm/winmm.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index 1a1fdad..4a03209 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -1872,6 +1872,12 @@ MMRESULT WINAPI midiStreamPosition(HMIDISTRM hMidiStrm, LPMMTIME lpMMT, UINT cbm ret = MMSYSERR_INVALPARAM; } else { switch (lpMMT->wType) { + default: + FIXME("Unsupported time type %x\n", lpMMT->wType); + case TIME_BYTES: + case TIME_SAMPLES: + lpMMT->wType = TIME_MS; + /* fall through to alternative format */ case TIME_MS: lpMMT->u.ms = lpMidiStrm->dwPositionMS; TRACE("=> %d ms\n", lpMMT->u.ms); @@ -1880,11 +1886,6 @@ MMRESULT WINAPI midiStreamPosition(HMIDISTRM hMidiStrm, LPMMTIME lpMMT, UINT cbm lpMMT->u.ticks = lpMidiStrm->dwPulses; TRACE("=> %d ticks\n", lpMMT->u.ticks); break; - default: - WARN("Unsupported time type %d\n", lpMMT->wType); - lpMMT->wType = TIME_MS; - ret = MMSYSERR_INVALPARAM; - break; } } return ret;

1 0

Henri Verbeet : wined3d: Handle zero-length vectors for WINED3DSIH_NRM.
by Alexandre Julliard Feb. 1, 2010

Feb. 1, 2010

Module: wine Branch: master Commit: bef792f5ff2cd87db98b58acb182123ef76be6e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bef792f5ff2cd87db98b58acb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 1 13:52:55 2010 +0100 wined3d: Handle zero-length vectors for WINED3DSIH_NRM. Unfortunately there's no reliable way to generate infinity in GLSL, but a sufficiently large value will probably do. The important part of the patch is that we don't generate NaN, because that will keep propagating through the entire shader. --- dlls/wined3d/glsl_shader.c | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index dc1dc28..e548aca 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1172,6 +1172,8 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont } } + shader_addline(buffer, "const float FLT_MAX = 1e38;\n"); + /* Start the main program */ shader_addline(buffer, "void main() {\n"); if(pshader && reg_maps->vpos) { @@ -2127,7 +2129,6 @@ static void shader_glsl_map2gl(const struct wined3d_shader_instruction *ins) case WINED3DSIH_MAX: instruction = "max"; break; case WINED3DSIH_ABS: instruction = "abs"; break; case WINED3DSIH_FRC: instruction = "fract"; break; - case WINED3DSIH_NRM: instruction = "normalize"; break; case WINED3DSIH_EXP: instruction = "exp2"; break; case WINED3DSIH_DSX: instruction = "dFdx"; break; case WINED3DSIH_DSY: instruction = "ycorrection.y * dFdy"; break; @@ -2154,6 +2155,22 @@ static void shader_glsl_map2gl(const struct wined3d_shader_instruction *ins) shader_addline(buffer, "));\n"); } +static void shader_glsl_nrm(const struct wined3d_shader_instruction *ins) +{ + struct wined3d_shader_buffer *buffer = ins->ctx->buffer; + glsl_src_param_t src_param; + DWORD write_mask; + char dst_mask[6]; + + write_mask = shader_glsl_get_write_mask(ins->dst, dst_mask); + shader_glsl_add_src_param(ins, &ins->src[0], write_mask, &src_param); + + shader_addline(buffer, "tmp0.x = length(%s);\n", src_param.param_str); + shader_glsl_append_dst(buffer, ins); + shader_addline(buffer, "tmp0.x == 0.0 ? (%s * FLT_MAX) : (%s / tmp0.x));", + src_param.param_str, src_param.param_str); +} + /** Process the WINED3DSIO_EXPP instruction in GLSL: * For shader model 1.x, do the following (and honor the writemask, so use a temporary variable): * dst.x = 2^(floor(src)) @@ -4941,7 +4958,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_MOVA */ shader_glsl_mov, /* WINED3DSIH_MUL */ shader_glsl_arith, /* WINED3DSIH_NOP */ NULL, - /* WINED3DSIH_NRM */ shader_glsl_map2gl, + /* WINED3DSIH_NRM */ shader_glsl_nrm, /* WINED3DSIH_PHASE */ NULL, /* WINED3DSIH_POW */ shader_glsl_pow, /* WINED3DSIH_RCP */ shader_glsl_rcp,

1 0