October 2011 - Wine-Commits

Aric Stewart : usp10: Implement SSA_FALLBACK.
by Alexandre Julliard Oct. 11, 2011

Oct. 11, 2011

Module: wine Branch: master Commit: 14eaa18daeb0b304136226d023da2a0c5106a520 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14eaa18daeb0b304136226d02… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Oct 10 14:59:36 2011 -0500 usp10: Implement SSA_FALLBACK. --- dlls/usp10/Makefile.in | 2 +- dlls/usp10/usp10.c | 231 +++++++++++++++++++++++++++++++++++++----------- 2 files changed, 179 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=14eaa18daeb0b30413622…

1 0

Alexandre Julliard : winex11: Require an A8R8G8B8 format for blending with a source alpha.
by Alexandre Julliard Oct. 11, 2011

Oct. 11, 2011

Module: wine Branch: master Commit: d36b7a7f245e8bbc390605a3a0364ca7f04e6027 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d36b7a7f245e8bbc390605a3a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 11 11:53:02 2011 +0200 winex11: Require an A8R8G8B8 format for blending with a source alpha. --- dlls/winex11.drv/xrender.c | 20 +++++++++++++++----- 1 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 33ad4bd..cb0ec9b 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -507,7 +507,7 @@ static enum wxr_format get_xrender_format_from_color_shifts(int depth, ColorShif return WXR_INVALID_FORMAT; } -static enum wxr_format get_xrender_format_from_bitmapinfo( const BITMAPINFO *info, BOOL use_alpha ) +static enum wxr_format get_xrender_format_from_bitmapinfo( const BITMAPINFO *info ) { if (info->bmiHeader.biPlanes != 1) return WXR_INVALID_FORMAT; @@ -539,8 +539,7 @@ static enum wxr_format get_xrender_format_from_bitmapinfo( const BITMAPINFO *inf break; } if (info->bmiHeader.biCompression != BI_RGB) break; - if (info->bmiHeader.biBitCount == 16) return WXR_FORMAT_X1R5G5B5; - return use_alpha ? WXR_FORMAT_A8R8G8B8 : WXR_FORMAT_X8R8G8B8; + return (info->bmiHeader.biBitCount == 16) ? WXR_FORMAT_X1R5G5B5 : WXR_FORMAT_A8R8G8B8; } return WXR_INVALID_FORMAT; } @@ -2678,7 +2677,7 @@ static DWORD xrenderdrv_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMA dst_format = physdev->format; } - src_format = get_xrender_format_from_bitmapinfo( info, TRUE ); + src_format = get_xrender_format_from_bitmapinfo( info ); if (!(pict_format = pict_formats[src_format])) goto update_format; /* make sure we can create an image with the same bpp */ @@ -2792,7 +2791,12 @@ static DWORD xrenderdrv_BlendImage( PHYSDEV dev, BITMAPINFO *info, const struct return dev->funcs->pBlendImage( dev, info, bits, src, dst, func ); } - format = get_xrender_format_from_bitmapinfo( info, func.AlphaFormat & AC_SRC_ALPHA ); + format = get_xrender_format_from_bitmapinfo( info ); + if (!(func.AlphaFormat & AC_SRC_ALPHA)) + format = get_format_without_alpha( format ); + else if (format != WXR_FORMAT_A8R8G8B8) + return ERROR_INVALID_PARAMETER; + if (!(pict_format = pict_formats[format])) goto update_format; /* make sure we can create an image with the same bpp */ @@ -2866,6 +2870,12 @@ static BOOL xrenderdrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, return dst_dev->funcs->pAlphaBlend( dst_dev, dst, src_dev, src, blendfn ); } + if ((blendfn.AlphaFormat & AC_SRC_ALPHA) && physdev_src->format != WXR_FORMAT_A8R8G8B8) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + if (physdev_dst != physdev_src) { int status = X11DRV_LockDIBSection( physdev_src->x11dev, DIB_Status_None );

1 0

André Hentschel : Wine 1.3.30 freigegeben
by Jeremy Newman Oct. 10, 2011

Oct. 10, 2011

Module: website Branch: master Commit: 8bb7351eea284eec3b4f169c9886741796b74ade URL: http://source.winehq.org/git/website.git/?a=commit;h=8bb7351eea284eec3b4f16… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Oct 10 21:10:59 2011 +0200 Wine 1.3.30 freigegeben --- news/de/2011101001.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/de/2011101001.xml b/news/de/2011101001.xml new file mode 100644 index 0000000..2f4c7be --- /dev/null +++ b/news/de/2011101001.xml @@ -0,0 +1,17 @@ +<news> +<date>10. Oktober 2011</date> +<title>Wine 1.3.30 freigegeben</title> +<body> +<p> Die Entwicklungsversion 1.3.30 von Wine ist jetzt verfügbar.</p> +<p> <a href="{$root}/announce/1.3.30">Neuerungen (en)</a> in dieser Version:</p> +<ul> + <li>Neuimplementierung von DirectSound basierend auf MMDevAPI.</li> + <li>Unterstützung für StretchBlt in der DIB Engine.</li> + <li>Verbesserungen an der Benutzeroberfläche der HTML Hilfe.</li> + <li>Einige MSXML Fehlerbehebungen.</li> + <li>Leistungssteigerung in cmd.</li> + <li>Verschiedene Fehlerbehebungen.</li> +</ul> +<p>Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.30.tar.bz2">verfügbar</a>. +Binär-Downloads werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Download-Seiten</a> zur Verfügung. +</p></body></news>

1 0

Frédéric Delanoy : French translation for release 1.3.30
by Jeremy Newman Oct. 10, 2011

Oct. 10, 2011

Module: website Branch: master Commit: 2de7757c1dc20b456ee29c1d1a0ba2c39e473841 URL: http://source.winehq.org/git/website.git/?a=commit;h=2de7757c1dc20b456ee29c… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Oct 10 21:11:46 2011 +0200 French translation for release 1.3.30 --- news/fr/2011101001.xml | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/news/fr/2011101001.xml b/news/fr/2011101001.xml new file mode 100644 index 0000000..9efbfdd --- /dev/null +++ b/news/fr/2011101001.xml @@ -0,0 +1,20 @@ +<news> +<date>10 octobre 2011</date> +<title>Sortie de Wine 1.3.30</title> +<body> +<p> La version de développement 1.3.30 de Wine est disponible.</p> +<p> <a href="{$root}/announce/1.3.30">Nouveautés</a> de cette version : +<ul> + <li>DirectSound réimplémenté au-dessus de MMDevAPI.</li> + <li>Prise en charge de StretchBlt dans le moteur DIB.</li> + <li>Interface utilisateur améliorée dans l'aide HTML.</li> + <li>Quelques correctifs MSXML.</li> + <li>Améliorations de performance dans cmd.</li> + <li>Diverses corrections de bogues.</li> +</ul></p> +<p><p>Le <a +href="http://prdownloads.sourceforge.net/wine/wine-1.3.30.tar.bz2">code +source</a> est disponible dès à présent. +Les paquets binaires sont en cours de construction, et apparaîtront sous peu +sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</p></body></news>

1 0

Alexandre Julliard : Wine release 1.3.30
by Alexandre Julliard Oct. 10, 2011

Oct. 10, 2011

Module: website Branch: master Commit: 98445019c1d8031b8991affeea743b54a4386c0b URL: http://source.winehq.org/git/website.git/?a=commit;h=98445019c1d8031b8991af… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 10 20:10:46 2011 +0200 Wine release 1.3.30 --- news/en/2011101001.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/en/2011101001.xml b/news/en/2011101001.xml new file mode 100644 index 0000000..ac6227f --- /dev/null +++ b/news/en/2011101001.xml @@ -0,0 +1,17 @@ +<news> +<date>October 10, 2011</date> +<title>Wine 1.3.30 Released</title> +<body> +<p> The Wine development release 1.3.30 is now available.</p> +<p> <a href="{$root}/announce/1.3.30">What's new</a> in this release: +<ul> + <li>DirectSound reimplemented on top of MMDevAPI.</li> + <li>Support for StretchBlt in the DIB engine.</li> + <li>User interface improvements in HTML help.</li> + <li>Some MSXML fixes.</li> + <li>Performance improvements in cmd.</li> + <li>Various bug fixes.</li> +</ul></p> +<p><p>The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.30.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</p></body></news>

1 0

Tag wine-1.3.30 : Alexandre Julliard : Release 1.3.30
by Alexandre Julliard Oct. 10, 2011

Oct. 10, 2011

Module: wine Branch: refs/tags/wine-1.3.30 Tag: 2fbf04eab3b0706bc5955c7f0a04477ac18e116f URL: http://source.winehq.org/git/wine.git/?a=tag;h=2fbf04eab3b0706bc5955c7f0a04… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 10 19:58:48 2011 +0200 Release 1.3.30

1 0

Alexandre Julliard : Release 1.3.30.
by Alexandre Julliard Oct. 10, 2011

Oct. 10, 2011

Module: wine Branch: master Commit: 13643f59be7a1ce4b9d7486069b4a4a2ff57d4ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=13643f59be7a1ce4b9d748606… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 10 19:58:48 2011 +0200 Release 1.3.30. --- ANNOUNCE | 1187 +++++++++++++++++++++++++++---------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 529 insertions(+), 678 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=13643f59be7a1ce4b9d74…

1 0

Alexandre Julliard : patches: Add a script to generate a list of regressions per author.
by Alexandre Julliard Oct. 10, 2011

Oct. 10, 2011

Module: tools Branch: master Commit: 1ba92bc76756508da0ed0ecdd7ff8f2c737e775a URL: http://source.winehq.org/git/tools.git/?a=commit;h=1ba92bc76756508da0ed0ecd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 10 17:31:26 2011 +0200 patches: Add a script to generate a list of regressions per author. Based on the work of Henri Verbeet. --- patches/patches.css | 11 +++ patches/update-regressions | 172 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 183 insertions(+), 0 deletions(-) diff --git a/patches/patches.css b/patches/patches.css index ee1f8d9..9b2b8ca 100644 --- a/patches/patches.css +++ b/patches/patches.css @@ -125,6 +125,12 @@ table th { margin: 0; } +div.buglist { + margin: 5px 20px; + background-color: white; + width: 100%; + border: 1px solid #601919; +} table.main, table.legend { width: 100%; } table.legend ul { margin: 2px 0; } @@ -134,6 +140,11 @@ tr.odd { background-color: #f8e8e8; } .id, .status, .testbot { text-align: center; } .id, .status, .author { white-space: nowrap; padding: 0 3px; } +.sha1 { white-space: nowrap; font-family: monospace; padding: 2px 12px; } + +.id :link, .sha1 :link, .subject :link { color: #A50D0D; text-decoration: none; } +.id :visited, .sha1 :visited, .subject :visited { color: #ff0000; text-decoration: none; } +.id :hover, .sha1 :hover, .subject :hover { color: #FF6666; text-decoration: underline; } .nil, .nil :link, .nil :visited { color: blue; font-weight: bold; } .pending, .pending :link, .pending :visited { color: blue; } diff --git a/patches/update-regressions b/patches/update-regressions new file mode 100755 index 0000000..3a71509 --- /dev/null +++ b/patches/update-regressions @@ -0,0 +1,172 @@ +#!/usr/bin/perl -w +# +# Copyright 2011 Henri Verbeet +# Copyright 2011 Alexandre Julliard +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +use strict; +use warnings; +use Text::CSV::Encoded; +use CGI qw(:standard); +use open ':utf8'; +binmode STDOUT, ':utf8'; + +$ENV{"GIT_DIR"} = "/home/winehq/opt/source/git/wine.git"; + +my $bugzilla_base = "http://bugs.winehq.org/show_bug.cgi?id="; +my $gitweb_base = "http://source.winehq.org/git/wine.git/commit/"; +my $dest = "/home/winehq/opt/source"; + +my %regressions; +my %commits; +my @invalid; +my @unknown; + +my %authors; +my $count = 0; + +sub read_bugs() +{ + my $csv = Text::CSV::Encoded->new({ encoding_in => "utf-8", + encoding_out => "utf-8" }); + + open LIST, "-|", "wget", "-qO-", "http://bugs.winehq.org/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bu…" or die "cannot query bug list"; + + <LIST>; # skip header line + while (<LIST>) + { + if ($csv->parse($_)) + { + my ($bug_id, $commit_id, $desc) = $csv->fields(); + $regressions{$bug_id} = { "commit_id" => $commit_id, "description" => $desc }; + + if (!$commit_id) + { + push @unknown, $bug_id; + next; + } + + if (!defined $commits{$commit_id}) + { + open LOG, "-|", "git", "log", "-1", "--format=\%an\%n\%s", $commit_id or die "cannot start git log"; + my $author = <LOG>; + my $subject = <LOG>; + chomp $author; + chomp $subject; + close LOG; + next unless $author && $subject; + $commits{$commit_id} = { "author" => $author, "subject" => $subject }; + } + push @{$authors{$commits{$commit_id}->{"author"}}}, $bug_id; + $count++; + } + else + { + my $err = $csv->error_input; + die "Failed to parse line: $err\n"; + } + } + close LIST; +} + +sub print_bugs($@) +{ + my $row = shift; + printf OUTPUT "<table class=\"main\">\n"; + foreach my $id (sort {$b <=> $a} @_) + { + my $regression = $regressions{$id}; + my $commit_id = $regression->{"commit_id"}; + + printf OUTPUT "<tr class=\"regression %s\">", ++$row & 1 ? "odd" : "even"; + printf OUTPUT "<td class=\"id\"><a href=\"%s%u\">%u</a></td>", $bugzilla_base, $id, $id; + printf OUTPUT "<td class=\"sha1\"><a href=\"%s%s\" title=\"%s\">%s</a></td>", + $gitweb_base, escapeHTML($commit_id), + escapeHTML($commits{$commit_id}->{"subject"}), escapeHTML(substr($commit_id,0,12)); + printf OUTPUT "<td class=\"subject\" width=\"100%%\"><a href=\"%s%u\">%s</a></td></tr>\n", + $bugzilla_base, $id, escapeHTML($regression->{"description"}); + } + printf OUTPUT "</table>\n"; +} + +read_bugs(); + +open OUTPUT, "> $dest/regressions.new" or die "cannot create $dest/regressions.new"; + +my $js = <<END; +function toggle_display(id) +{ + var e = document.getElementById(id); + var display = e.style.display; + e.style.display = display == "none" ? "" : "none"; +} +END + +print OUTPUT start_html(-title=>"Regressions", + -encoding=>"utf-8", + -style=>{src=>"patches/patches.css"}, + -script=>$js); + +print OUTPUT "<div id=\"logo_glass\"><a href=\"/regressions\"><img src=\"http://winehq.org/images/winehq_logo_glass_sm.png\"></a></div>\n"; +print OUTPUT "<div id=\"logo_text\"><a href=\"/regressions\"><img src=\"http://winehq.org/images/winehq_logo_text.png\" alt=\"WineHQ\" title=\"WineHQ\"></a></div>\n"; +print OUTPUT "<div id=\"tabs\"><ul>", + "<li><a href=\"http://www.winehq.org/\">WineHQ</a></li>", + "<li><a href=\"http://wiki.winehq.org/\">Wiki</a></li>", + "<li><a href=\"http://appdb.winehq.org/\">AppDB</a></li>", + "<li><a href=\"http://bugs.winehq.org/\">Bugzilla</a></li>", + "<li><a href=\"http://forums.winehq.org/\">Forums</a></li></ul></div>\n"; +print OUTPUT "<div id=\"logo_blurb\">Wine source repository – Regressions</div>\n"; + +print OUTPUT "<div id=\"main_content\"><div id=\"content\"><div class=\"main\">\n"; +printf OUTPUT "<h2>%u bisected regressions</h2>\n", $count; + +print OUTPUT "<table class=\"main\"><tr><th class=\"count\">Count</th>", + "<th style=\"width: 100%;\" class=\"author\">Author</th></tr>\n"; + +my $row = 0; +foreach my $author (sort {@{$authors{$b}} <=> @{$authors{$a}} || $a cmp $b} keys %authors) +{ + printf OUTPUT "<tr class=\"regression %s\"><td class=\"id\" valign=\"top\">" + ."<span onclick=\"toggle_display('bugs_%u');\">%u</span></td>", + $row & 1 ? "odd" : "even", $row, scalar(@{$authors{$author}}); + printf OUTPUT "<td class=\"author\"><span onclick=\"toggle_display('bugs_%u');\">%s</span>" + ."<div class=\"buglist\" id=\"bugs_%u\" style=\"display: none;\">\n", + $row, escapeHTML($author), $row; + print_bugs $row, @{$authors{$author}}; + print OUTPUT "</div></td></tr>"; + ++$row; +} +print OUTPUT "</table></div>\n"; + +print OUTPUT "<div class=\"main\">\n"; +printf OUTPUT "<h2>%u regressions without commit id</h2>\n", scalar @unknown; +print OUTPUT "<table class=\"main\"><tr><th class=\"id\">Id</th>", + "<th style=\"width: 100%;\" class=\"subject\">Description</th></tr>\n"; + +$row = 0; +foreach my $id (sort {$b <=> $a} @unknown) +{ + my $regression = $regressions{$id}; + printf OUTPUT "<tr class=\"buglist %s\">", ++$row & 1 ? "odd" : "even"; + printf OUTPUT "<td class=\"id\"><a href=\"%s%u\">%u</a></td>", $bugzilla_base, $id, $id; + printf OUTPUT "<td class=\"subject\"><a href=\"%s%u\">%s</a></td></tr>\n", + $bugzilla_base, $id, escapeHTML($regression->{"description"}); +} + +print OUTPUT "</table></div>\n"; +print OUTPUT end_html; +close OUTPUT; + +rename "$dest/regressions.new", "$dest/regressions" or die "failed to update regressions";

1 0

Michael Stefaniuc : shell32: Return the IEnumIDList object on its creation.
by Alexandre Julliard Oct. 10, 2011

Oct. 10, 2011

Module: wine Branch: master Commit: bd407b700e46ade4ef2e860a7a93bebb70cc89eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd407b700e46ade4ef2e860a7… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Oct 10 01:02:48 2011 +0200 shell32: Return the IEnumIDList object on its creation. --- dlls/shell32/cpanelfolder.c | 10 ++++++---- dlls/shell32/enumidlist.c | 22 ++-------------------- dlls/shell32/recyclebin.c | 8 ++++---- dlls/shell32/shell32_main.h | 18 +++++++++++++++++- dlls/shell32/shfldr_desktop.c | 10 ++++++---- dlls/shell32/shfldr_fs.c | 10 ++++++---- dlls/shell32/shfldr_mycomp.c | 10 ++++++---- dlls/shell32/shfldr_netplaces.c | 7 +++++-- 8 files changed, 52 insertions(+), 43 deletions(-) diff --git a/dlls/shell32/cpanelfolder.c b/dlls/shell32/cpanelfolder.c index d6c8f5c..15ad067 100644 --- a/dlls/shell32/cpanelfolder.c +++ b/dlls/shell32/cpanelfolder.c @@ -445,16 +445,18 @@ static HRESULT WINAPI ISF_ControlPanel_fnEnumObjects(IShellFolder2 *iface, HWND DWORD dwFlags, LPENUMIDLIST *ppEnumIDList) { ICPanelImpl *This = impl_from_IShellFolder2(iface); + IEnumIDListImpl *list; TRACE("(%p)->(HWND=%p flags=0x%08x pplist=%p)\n", This, hwndOwner, dwFlags, ppEnumIDList); - *ppEnumIDList = IEnumIDList_Constructor(); - if (*ppEnumIDList) - CreateCPanelEnumList(*ppEnumIDList, dwFlags); + if (!(list = IEnumIDList_Constructor())) + return E_OUTOFMEMORY; + *ppEnumIDList = &list->IEnumIDList_iface; + CreateCPanelEnumList(*ppEnumIDList, dwFlags); TRACE("--(%p)->(new ID List: %p)\n", This, *ppEnumIDList); - return(*ppEnumIDList) ? S_OK : E_OUTOFMEMORY; + return S_OK; } /************************************************************************** diff --git a/dlls/shell32/enumidlist.c b/dlls/shell32/enumidlist.c index fbfe881..9e43ed4 100644 --- a/dlls/shell32/enumidlist.c +++ b/dlls/shell32/enumidlist.c @@ -36,22 +36,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); -struct enumlist -{ - struct enumlist *pNext; - LPITEMIDLIST pidl; -}; - -typedef struct -{ - IEnumIDList IEnumIDList_iface; - LONG ref; - struct enumlist *mpFirst; - struct enumlist *mpLast; - struct enumlist *mpCurrent; - -} IEnumIDListImpl; - /************************************************************************** * AddToEnumList() */ @@ -340,7 +324,7 @@ static const IEnumIDListVtbl eidlvt = IEnumIDList_fnClone, }; -IEnumIDList *IEnumIDList_Constructor(void) +IEnumIDListImpl *IEnumIDList_Constructor(void) { IEnumIDListImpl *lpeidl = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*lpeidl)); @@ -349,10 +333,8 @@ IEnumIDList *IEnumIDList_Constructor(void) lpeidl->ref = 1; lpeidl->IEnumIDList_iface.lpVtbl = &eidlvt; } - else - return NULL; TRACE("-- (%p)->()\n",lpeidl); - return &lpeidl->IEnumIDList_iface; + return lpeidl; } diff --git a/dlls/shell32/recyclebin.c b/dlls/shell32/recyclebin.c index 9e75c30..715be87 100644 --- a/dlls/shell32/recyclebin.c +++ b/dlls/shell32/recyclebin.c @@ -408,7 +408,7 @@ static HRESULT WINAPI RecycleBin_ParseDisplayName(IShellFolder2 *This, HWND hwnd static HRESULT WINAPI RecycleBin_EnumObjects(IShellFolder2 *iface, HWND hwnd, SHCONTF grfFlags, IEnumIDList **ppenumIDList) { RecycleBin *This = impl_from_IShellFolder2(iface); - IEnumIDList *list; + IEnumIDListImpl *list; LPITEMIDLIST *pidls; HRESULT ret = E_OUTOFMEMORY; int pidls_count; @@ -426,16 +426,16 @@ static HRESULT WINAPI RecycleBin_EnumObjects(IShellFolder2 *iface, HWND hwnd, SH if (FAILED(ret = TRASH_EnumItems(&pidls, &pidls_count))) goto failed; for (i=0; i<pidls_count; i++) - if (!AddToEnumList(list, pidls[i])) + if (!AddToEnumList(&list->IEnumIDList_iface, pidls[i])) goto failed; } - *ppenumIDList = list; + *ppenumIDList = &list->IEnumIDList_iface; return S_OK; failed: if (list) - IEnumIDList_Release(list); + IEnumIDList_Release(&list->IEnumIDList_iface); for (; i<pidls_count; i++) ILFree(pidls[i]); SHFree(pidls); diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index 9359a3a..18ddf71 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -205,8 +205,24 @@ HRESULT SHELL_RegisterShellFolders(void) DECLSPEC_HIDDEN; BOOL SHELL_IsShortcut(LPCITEMIDLIST) DECLSPEC_HIDDEN; +/* IEnumIDList stuff */ +struct enumlist +{ + struct enumlist *pNext; + LPITEMIDLIST pidl; +}; + +typedef struct +{ + IEnumIDList IEnumIDList_iface; + LONG ref; + struct enumlist *mpFirst; + struct enumlist *mpLast; + struct enumlist *mpCurrent; +} IEnumIDListImpl; + /* Creates an IEnumIDList; add LPITEMIDLISTs to it with AddToEnumList. */ -LPENUMIDLIST IEnumIDList_Constructor(void) DECLSPEC_HIDDEN; +IEnumIDListImpl *IEnumIDList_Constructor(void) DECLSPEC_HIDDEN; BOOL AddToEnumList(IEnumIDList *list, LPITEMIDLIST pidl) DECLSPEC_HIDDEN; /* Enumerates the folders and/or files (depending on dwFlags) in lpszPath and diff --git a/dlls/shell32/shfldr_desktop.c b/dlls/shell32/shfldr_desktop.c index 808b920..2ea5244 100644 --- a/dlls/shell32/shfldr_desktop.c +++ b/dlls/shell32/shfldr_desktop.c @@ -345,17 +345,19 @@ static HRESULT WINAPI ISF_Desktop_fnEnumObjects (IShellFolder2 * iface, HWND hwndOwner, DWORD dwFlags, LPENUMIDLIST * ppEnumIDList) { IDesktopFolderImpl *This = impl_from_IShellFolder2(iface); + IEnumIDListImpl *list; TRACE ("(%p)->(HWND=%p flags=0x%08x pplist=%p)\n", This, hwndOwner, dwFlags, ppEnumIDList); - *ppEnumIDList = IEnumIDList_Constructor(); - if (*ppEnumIDList) - CreateDesktopEnumList(*ppEnumIDList, dwFlags); + if (!(list = IEnumIDList_Constructor())) + return E_OUTOFMEMORY; + *ppEnumIDList = &list->IEnumIDList_iface; + CreateDesktopEnumList(*ppEnumIDList, dwFlags); TRACE ("-- (%p)->(new ID List: %p)\n", This, *ppEnumIDList); - return *ppEnumIDList ? S_OK : E_OUTOFMEMORY; + return S_OK; } /************************************************************************** diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index dd0231a..3556a62 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -448,17 +448,19 @@ IShellFolder_fnEnumObjects (IShellFolder2 * iface, HWND hwndOwner, DWORD dwFlags, LPENUMIDLIST * ppEnumIDList) { IGenericSFImpl *This = impl_from_IShellFolder2(iface); + IEnumIDListImpl *list; TRACE ("(%p)->(HWND=%p flags=0x%08x pplist=%p)\n", This, hwndOwner, dwFlags, ppEnumIDList); - *ppEnumIDList = IEnumIDList_Constructor(); - if (*ppEnumIDList) - CreateFolderEnumList(*ppEnumIDList, This->sPathTarget, dwFlags); + if (!(list = IEnumIDList_Constructor())) + return E_OUTOFMEMORY; + *ppEnumIDList = &list->IEnumIDList_iface; + CreateFolderEnumList(*ppEnumIDList, This->sPathTarget, dwFlags); TRACE ("-- (%p)->(new ID List: %p)\n", This, *ppEnumIDList); - return *ppEnumIDList ? S_OK : E_OUTOFMEMORY; + return S_OK; } /************************************************************************** diff --git a/dlls/shell32/shfldr_mycomp.c b/dlls/shell32/shfldr_mycomp.c index 265c5a4..9afb4d8 100644 --- a/dlls/shell32/shfldr_mycomp.c +++ b/dlls/shell32/shfldr_mycomp.c @@ -355,17 +355,19 @@ static HRESULT WINAPI ISF_MyComputer_fnEnumObjects (IShellFolder2 *iface, HWND hwndOwner, DWORD dwFlags, LPENUMIDLIST *ppEnumIDList) { IMyComputerFolderImpl *This = impl_from_IShellFolder2(iface); + IEnumIDListImpl *list; TRACE("(%p)->(HWND=%p flags=0x%08x pplist=%p)\n", This, hwndOwner, dwFlags, ppEnumIDList); - *ppEnumIDList = IEnumIDList_Constructor(); - if (*ppEnumIDList) - CreateMyCompEnumList(*ppEnumIDList, dwFlags); + if (!(list = IEnumIDList_Constructor())) + return E_OUTOFMEMORY; + *ppEnumIDList = &list->IEnumIDList_iface; + CreateMyCompEnumList(*ppEnumIDList, dwFlags); TRACE ("-- (%p)->(new ID List: %p)\n", This, *ppEnumIDList); - return (*ppEnumIDList) ? S_OK : E_OUTOFMEMORY; + return S_OK; } /************************************************************************** diff --git a/dlls/shell32/shfldr_netplaces.c b/dlls/shell32/shfldr_netplaces.c index 4c95d3e..c5034f8 100644 --- a/dlls/shell32/shfldr_netplaces.c +++ b/dlls/shell32/shfldr_netplaces.c @@ -244,15 +244,18 @@ static HRESULT WINAPI ISF_NetworkPlaces_fnEnumObjects (IShellFolder2 * iface, HWND hwndOwner, DWORD dwFlags, LPENUMIDLIST * ppEnumIDList) { IGenericSFImpl *This = impl_from_IShellFolder2(iface); + IEnumIDListImpl *list; TRACE ("(%p)->(HWND=%p flags=0x%08x pplist=%p)\n", This, hwndOwner, dwFlags, ppEnumIDList); - *ppEnumIDList = IEnumIDList_Constructor(); + if (!(list = IEnumIDList_Constructor())) + return E_OUTOFMEMORY; + *ppEnumIDList = &list->IEnumIDList_iface; TRACE ("-- (%p)->(new ID List: %p)\n", This, *ppEnumIDList); - return (*ppEnumIDList) ? S_OK : E_OUTOFMEMORY; + return S_OK; } /**************************************************************************

1 0

Alistair Leslie-Hughes : mscoree: Implement ICorDebug SetManagedHandler.
by Alexandre Julliard Oct. 10, 2011

Oct. 10, 2011

Module: wine Branch: master Commit: 5682743245d3c079b40899f7f840bd5a3813de05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5682743245d3c079b40899f7f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Sep 29 16:08:06 2011 +1000 mscoree: Implement ICorDebug SetManagedHandler. --- dlls/mscoree/cordebug.c | 100 +++++++++-- dlls/mscoree/corruntimehost.c | 7 +- dlls/mscoree/mscoree_private.h | 15 ++- dlls/mscoree/tests/Makefile.in | 2 +- dlls/mscoree/tests/debugging.c | 377 +++++++++++++++++++++++++++++++++++++++- 5 files changed, 473 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5682743245d3c079b4089…

1 0