November 2014 - Wine-Commits

Julian Rüger : Download: Fix html tags and mailto link
by Jeremy Newman Nov. 21, 2014

Nov. 21, 2014

Module: website Branch: master Commit: 04aeba97b863025c65662e36ad09a3d81c0496c3 URL: http://source.winehq.org/git/website.git/?a=commit;h=04aeba97b863025c65662e… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri Nov 21 16:11:38 2014 +0100 Download: Fix html tags and mailto link --- templates/en/download.template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/en/download.template b/templates/en/download.template index a1cf748..bf494b6 100644 --- a/templates/en/download.template +++ b/templates/en/download.template @@ -63,7 +63,7 @@ requested in exchange for hosting the Wine web site.</p> <img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu linux" border="0"></a> </td> <td> <b><a href="{$root}/download/ubuntu">Download Ubuntu packages</a></b> - - binary and source .debs for Ubuntu Trusty (14.04 LTS) + - binary and source .debs for Ubuntu Trusty (14.04 LTS)</td> <td><a href="mailto:scottritchie(a)ubuntu.com">Scott Ritchie</a></td> </tr> @@ -85,9 +85,9 @@ requested in exchange for hosting the Wine web site.</p> compatible distributions. The wine meta package is available via <tt>yum</tt> through the EPEL / Fedora Extras / Fedora repository by running <tt>$ yum install - wine </tt>" + wine </tt> </td> - <td><a href="mailto:andreas.bierfert_at_lowlatency.de">Andreas Bierfert</a></td> + <td><a href="mailto:andreas.bierfert(a)lowlatency.de">Andreas Bierfert</a></td> </tr> <tr bgcolor="#ffffff">

1 0

Julian Rüger : Download: Fix html tags and mailto link
by Jeremy Newman Nov. 21, 2014

Nov. 21, 2014

Module: website Branch: master Commit: 8da75e10824ea1b452b99616ae5c82c71220a1ce URL: http://source.winehq.org/git/website.git/?a=commit;h=8da75e10824ea1b452b996… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri Nov 21 16:11:38 2014 +0100 Download: Fix html tags and mailto link --- templates/en/download.template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/en/download.template b/templates/en/download.template index a1cf748..bf494b6 100644 --- a/templates/en/download.template +++ b/templates/en/download.template @@ -63,7 +63,7 @@ requested in exchange for hosting the Wine web site.</p> <img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu linux" border="0"></a> </td> <td> <b><a href="{$root}/download/ubuntu">Download Ubuntu packages</a></b> - - binary and source .debs for Ubuntu Trusty (14.04 LTS) + - binary and source .debs for Ubuntu Trusty (14.04 LTS)</td> <td><a href="mailto:scottritchie(a)ubuntu.com">Scott Ritchie</a></td> </tr> @@ -85,9 +85,9 @@ requested in exchange for hosting the Wine web site.</p> compatible distributions. The wine meta package is available via <tt>yum</tt> through the EPEL / Fedora Extras / Fedora repository by running <tt>$ yum install - wine </tt>" + wine </tt> </td> - <td><a href="mailto:andreas.bierfert_at_lowlatency.de">Andreas Bierfert</a></td> + <td><a href="mailto:andreas.bierfert(a)lowlatency.de">Andreas Bierfert</a></td> </tr> <tr bgcolor="#ffffff">

1 0

Julian Rüger : Download: Update German translation
by Jeremy Newman Nov. 21, 2014

Nov. 21, 2014

Module: website Branch: master Commit: be07acd8290e8d82b680f4d32f3d8d8435cb42ea URL: http://source.winehq.org/git/website.git/?a=commit;h=be07acd8290e8d82b680f4… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri Nov 21 16:12:29 2014 +0100 Download: Update German translation --- templates/de/download.template | 56 ++++++++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 27 deletions(-) diff --git a/templates/de/download.template b/templates/de/download.template index bc7717e..34ec4fc 100644 --- a/templates/de/download.template +++ b/templates/de/download.template @@ -1,5 +1,5 @@  - + <h1 class="title">Wine Downloads</h1> @@ -23,29 +23,31 @@ <b><a href="http://www.codeweavers.com/products/">CrossOver</a></b> ist eine auf Hochglanz polierte Wine-Version, die von <b><a href="http://www.codeweavers.com">CodeWeavers</a></b> bereitgestellt wird. CrossOver vereinfacht die Bedienung von Wine und CodeWeavers leistet exzellenten - technischen Support für seine Nutzer. Alle Käufe von CrossOver werden direkt zur Unterstützung - der Wine-Entwickler genutzt. Darum ist CrossOver sowohl eine tolle Möglichkeit, Unterstützung für - Wine zu bekommen, als auch das Wine-Projekt zu unterstützen. CodeWeavers stellt vollständig funktionale + technischen Support für seine Nutzer. Alle Käufe von CrossOver werden direkt zur finanziellen Unterstützung + der Wine-Entwickler genutzt. Darum ist CrossOver eine großartige Möglichkeit, sowohl Unterstützung für + Wine zu bekommen, als auch das Wine-Projekt zu unterstützen. CodeWeavers stellt vollständig funktionsfähige <b><a href="http://www.codeweavers.com/products/download_trial/">Testversionen von Crossover</a></b> zur Verfügung. </td> </tr> </table> -<p class="small" align="center">Diese Befürwortung ist die hauptsächliche Anerkennung, die CodeWeavers dafür -erbeten hat, dass sie die Wine-Website hosten.</p> +<p class="small" align="center">Diese Empfehlung ist die hauptsächliche Anerkennung, die CodeWeavers als Dank +für das Hosten der Wine-Webseite erbeten hat.</p> -<h2 style="margin-bottom: 5px;"><a name="binary"></a>Wine Binär-Downloads</h2> +<h2 style="margin-bottom: 5px;"><a name="binary"></a>Wine Binärdownloads</h2> + +<p>Binärpakete werden von den Distributionen erstellt und verwaltet und können daher Patches enthalten, die hier nicht unterstützt werden. Die folgenden Links werden ausschließlich zum Komfort der Nutzer bereitgestellt und sind nicht als Empfehlung zu verstehen.</p> <table style="margin: 0 0 15px 0;" width="100%"> <tr> - <td width="200">Aktuellste stabile Version:</td><td>Wine {$config_stable_release}</td> - <td rowspan="2" valign="top" style="padding-left: 20px; text-align: center;"><b>Lies das + <td width="200">Aktuell stabile Version:</td><td>Wine {$config_stable_release}</td> + <td rowspan="2" valign="top" style="padding-left: 20px; text-align: center;"><b>Lesen Sie das <a href="http://wiki.winehq.org/HowTo">Installations- und Konfigurations-How-to (en)</a> für Informationen zu den Schritten, die nach der Installation auszuführen sind.</b></td> </tr> <tr> - <td>Aktuellste Entwicklerversion:</td><td>Wine {$config_master_release}</td> + <td>Neueste Entwicklungsversion:</td><td>Wine {$config_master_release}</td> </tr> </table> @@ -62,7 +64,7 @@ erbeten hat, dass sie die Wine-Website hosten.</p> <img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu linux" border="0"></a> </td> <td> <b><a href="{$root}/download/ubuntu">Ubuntu</a></b> - binär und Quellcode .debs für Ubuntu Trusty (14.04 LTS) + Binär- und Quellpakete (.deb) für Ubuntu Trusty (14.04 LTS)</td> <td><a href="mailto:scottritchie(a)ubuntu.com">Scott Ritchie</a></td> </tr> @@ -71,8 +73,8 @@ erbeten hat, dass sie die Wine-Website hosten.</p> <img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian Linux" border="0"></a> </td> <td> <b><a href="{$root}/download/debian">Debian</a></b> - binär .debs für Debian Sid</td> - <td><a href="mailto:curan(a)debian.org">Kai Wasserbäch</a></td> + Binärpakete (.deb) für Debian Sid</td> + <td><a href="mailto:curan(a)debian.org">Kai Wasserbäch</a></td> </tr> <tr bgcolor="#ffffff"> @@ -80,13 +82,13 @@ erbeten hat, dass sie die Wine-Website hosten.</p> <img src="{$root}/images/distro/redhat.png" width="50" height="50" alt="RedHat Linux" border="0"></a> </td> <td> <b><a href="http://fedoraproject.org/wiki/AndreasBierfert/Wine">Red Hat / CentOS / Fedora</a></b> - binär und Quellcode .rpms für Red Hat Enterprise Linux 5, 6; CentOS 5, 6; Fedora Linux 16, 17 und + Binär- und Quellpakete (.rpm) für Red Hat Enterprise Linux 5, 6; CentOS 5, 6; Fedora Linux 16, 17 und kompatible Distributionen. - Das wine meta package ist via <tt>yum</tt> im - EPEL / Fedora Extras / Fedora Repository verfügbar, indem man <tt>$ yum install - wine </tt> ausführt. + Das Wine-Metapaket ist via <tt>yum</tt> im + EPEL / Fedora Extras / Fedora Repository verfügbar, durch Ausführen von <tt>$ yum install + wine</tt> </td> - <td><a href="mailto:andreas.bierfert_at_lowlatency.de">Andreas Bierfert</a></td> + <td><a href="mailto:andreas.bierfert(a)lowlatency.de">Andreas Bierfert</a></td> </tr> <tr bgcolor="#ffffff"> @@ -94,7 +96,7 @@ erbeten hat, dass sie die Wine-Website hosten.</p> <img src="{$root}/images/distro/suse.png" width="50" height="50" alt="SUSE Linux" border="0"></a> </td> <td> <b><a href="http://en.opensuse.org/Wine#Repositories">SUSE</a></b> - stellt binär und Quellcode .rpms und tägliche snapshot RPMs für alle openSUSE Versionen (derzeit 12.3 bis 13.2) sowie SUSE Linux Enterprise 11 bereit.<br> + Binär- und Quellpakete (.rpm) von Releases und tägliche Snapshots für alle openSUSE Versionen (12.3 bis 13.2) sowie SUSE Linux Enterprise 11.<br> </td> <td><a href="mailto:meissner(a)suse.de">Marcus Meissner</a></td> </tr> @@ -104,7 +106,7 @@ erbeten hat, dass sie die Wine-Website hosten.</p> <img src="{$root}/images/distro/slackware.png" width="50" height="50" alt="Slackware linux" border="0"></a> </td> <td> <b><a href="http://sourceforge.net/projects/wine/files/Slackware Packages/">Slackware</a></b> - binär txz (Slackware 14.1), und tgz (für ältere Versionen)</td> + Binärpakete (.txz) für Slackware 14.1 und (.tgz) für ältere Versionen</td> <td><a href="mailto:studiosg(a)giustetti.net">Simone Giustetti</a></td> </tr> @@ -123,10 +125,10 @@ erbeten hat, dass sie die Wine-Website hosten.</p> <h2 style="margin-bottom: 10px;"><a name="binary"></a>Tools von Drittanbietern</h2> <p>Manchmal kann eine Änderung an Wine dafür sorgen, dass eine bestimmte Anwendung besser läuft, aber aus irgendeinem - Grund kann die Änderung nicht in Wine übernommen werden. Um bestimmte Defizite von Wine auszubessern, sind diverse - Anwendungen im Laufe der Jahre von Drittanbietern erstellt worden. Diese Anwendungen werden in keinster Art von den Wine-Entwicklern - unterstützt, sie können aber nützlich für Dich sein. Weitergehende Informationen über Anwendungen von - Drittanbietern findest Du auf <a href="http://wiki.winehq.org/ThirdPartyApplications">unserer Wiki-Seite (en)</a>.</p> + Grund kann diese Änderung nicht in Wine übernommen werden. Um bestimmte Defizite von Wine auszubessern, sind im Laufe + der Jahre diverse Anwendungen von Drittanbietern erstellt worden. Diese Anwendungen werden in keinster Weise von den Wine-Entwicklern + unterstützt, sie könnten jedoch nützlich für Ihre Zwecke sein. Weitergehende Informationen dazu finden Sie auf + <a href="http://wiki.winehq.org/ThirdPartyApplications">unserer Wiki-Seite (en)</a> über Anwendungen von Drittanbietern.</p> <h2><a name="source"></a>Wine Quellcode Downloads</h2> @@ -144,18 +146,18 @@ erbeten hat, dass sie die Wine-Website hosten.</p> <tr bgcolor="#ffffff"> <td> <a href="http://wiki.winehq.org/GitWine">source.winehq.org/git</a> </td> - <td> Die aktuellste Entwicklerversion. </td> + <td> Die aktuellste Entwicklungsversion. </td> </tr> <tr bgcolor="#ffffff"> <td><a href="http://ibiblio.org/pub/linux/system/emulators/wine/">ibiblio.org</a></td> - <td> Alternative Download Website für offizielle Quellcode- und Dokumentations-Tarballs. </td> + <td> Alternative Downloadseite für offizielle Quellcode- und Dokumentations-Tarballs. </td> </tr> </table> <div style="margin: 10px; padding: 5px; border: 1px solid #C0C0C0; background-color: #F0F0F0;"><b>Anmerkung:</b> Die - Informationen über <a href="http://wiki.winehq.org/Recommended_Packages">empfohlene Packages (en)</a> enthalten + Informationen über <a href="http://wiki.winehq.org/Recommended_Packages">empfohlene Pakete (en)</a> enthalten Hinweise zur Konfiguration und zum Kompilieren von Wine.</div>

1 0

Jeremy Newman : add announcement image to news posts in RSS
by Jeremy Newman Nov. 21, 2014

Nov. 21, 2014

Module: website Branch: master Commit: 01c47b79b720bd60578b58f347b970e817805416 URL: http://source.winehq.org/git/website.git/?a=commit;h=01c47b79b720bd60578b58… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Nov 21 13:01:38 2014 -0600 add announcement image to news posts in RSS --- include/plugins/news.php | 14 +++++++------- templates/global/xml/rss.template | 10 +++++----- templates/global/xml/rss_row.template | 7 ++++++- 3 files changed, 18 insertions(+), 13 deletions(-) diff --git a/include/plugins/news.php b/include/plugins/news.php index b8c4da8..aae63d2 100644 --- a/include/plugins/news.php +++ b/include/plugins/news.php @@ -30,10 +30,10 @@ switch (true) switch ($ogmode) { case 'wwn': - $html->meta_og['image'] = "http://media.codeweavers.com/pub/crossover/marketing/og/wine-hq-world-wine-…"; + $html->meta_og['image'] = "https://media.codeweavers.com/pub/crossover/marketing/og/wine-hq-world-wine…"; break; default: - $html->meta_og['image'] = "http://media.codeweavers.com/pub/crossover/marketing/og/wine-hq-announcemen…"; + $html->meta_og['image'] = "https://media.codeweavers.com/pub/crossover/marketing/og/wine-hq-announceme…"; } // add page title @@ -70,7 +70,7 @@ switch (true) header('Expires: 0'); header('Cache-Control: must-revalidate, post-check=0, pre-check=0'); header('Content-Type: application/xml'); - header('Content-Disposition: inline; filename="winehq_news.xml";'); + header('Content-Disposition: inline; filename="winehq_news.xml";'); $rss_rows = ""; $c = 0; foreach ($news as $key => $item) @@ -101,7 +101,7 @@ switch (true) // display row $rss_row = array( 'item_title' => strip_tags($vars['title']), - 'item_desc' => htmlentities($vars['body']), + 'item_desc' => $vars['body'], 'item_link' => $vars['link'], 'item_guid' => $config->base_url.'?news='.$item, 'item_date' => date("r", strtotime($vars['date'])) @@ -111,9 +111,9 @@ switch (true) unset($c); $rss = array( 'rss_date' => date("r", $top_date), - 'rss_title' => $config->site_name.' News', - 'rss_link' => "{$config->base_url}news/rss", - 'rss_img' => "{$config->base_url}images/classic_top_logo.png", + 'rss_title' => "{$config->site_name News", + 'rss_link' => "{$config->base_url}news/rss/", + 'rss_img' => "https://media.codeweavers.com/pub/crossover/marketing/og/wine-hq-announceme…", 'rss_desc' => 'News and information about Wine', 'rss_crt' => '(C) '.$config->site_name.' '.date("Y", time()), 'rss_rows' => $rss_rows diff --git a/templates/global/xml/rss.template b/templates/global/xml/rss.template index daa2c73..92c68a9 100644 --- a/templates/global/xml/rss.template +++ b/templates/global/xml/rss.template @@ -4,11 +4,11 @@ <rss xmlns:feedburner="http://rssnamespace.org/feedburner/ext/1.0" version="2.0"> <channel> <title>{$rss_title}</title> - <image> - <url>{$rss_img}</url> - <title>{$rss_title}</title> - <link>{$rss_link}</link> - </image> + <image> + <url>{$rss_img}</url> + <title>{$rss_title}</title> + <link>{$rss_link}</link> + </image> <link>{$rss_link}</link> <description>{$rss_desc}</description> <language>en</language> diff --git a/templates/global/xml/rss_row.template b/templates/global/xml/rss_row.template index 23949c5..16b50d1 100644 --- a/templates/global/xml/rss_row.template +++ b/templates/global/xml/rss_row.template @@ -1,7 +1,12 @@ <item> <title>{$item_title}</title> - <description>{$item_desc}</description> + <description> + <![CDATA[ + <img src="https://media.codeweavers.com/pub/crossover/marketing/og/wine-hq-announceme…" alt=""><br> + {$item_desc} + ]]> + </description> <link>{$item_link}</link> <guid>{$item_guid}</guid> <pubDate>{$item_date}</pubDate>

1 0

Sebastian Lackner : ole32: Don' t process window events when APC calls are queued.
by Alexandre Julliard Nov. 21, 2014

Nov. 21, 2014

Module: wine Branch: master Commit: f6f55058e4853d7685467af74e90b428a6234941 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6f55058e4853d7685467af74… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Nov 5 00:49:59 2014 +0100 ole32: Don't process window events when APC calls are queued. --- dlls/ole32/compobj.c | 17 ++++++++++++++--- dlls/ole32/tests/compobj.c | 1 - 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 1d9b943..da466c4 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -4427,6 +4427,7 @@ HRESULT WINAPI CoWaitForMultipleHandles(DWORD dwFlags, DWORD dwTimeout, DWORD start_time = GetTickCount(); APARTMENT *apt = COM_CurrentApt(); BOOL message_loop = apt && !apt->multi_threaded; + BOOL check_apc = (dwFlags & COWAIT_ALERTABLE) != 0; TRACE("(0x%08x, 0x%08x, %d, %p, %p)\n", dwFlags, dwTimeout, cHandles, pHandles, lpdwindex); @@ -4460,9 +4461,19 @@ HRESULT WINAPI CoWaitForMultipleHandles(DWORD dwFlags, DWORD dwTimeout, TRACE("waiting for rpc completion or window message\n"); - res = MsgWaitForMultipleObjectsEx(cHandles, pHandles, - (dwTimeout == INFINITE) ? INFINITE : start_time + dwTimeout - now, - QS_SENDMESSAGE | QS_ALLPOSTMESSAGE | QS_PAINT, wait_flags); + res = WAIT_TIMEOUT; + + if (check_apc) + { + res = WaitForMultipleObjectsEx(cHandles, pHandles, + (dwFlags & COWAIT_WAITALL) != 0, 0, TRUE); + check_apc = FALSE; + } + + if (res == WAIT_TIMEOUT) + res = MsgWaitForMultipleObjectsEx(cHandles, pHandles, + (dwTimeout == INFINITE) ? INFINITE : start_time + dwTimeout - now, + QS_SENDMESSAGE | QS_ALLPOSTMESSAGE | QS_PAINT, wait_flags); if (res == WAIT_OBJECT_0 + cHandles) /* messages available */ { diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 38b21c9..eed5ac8 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -2241,7 +2241,6 @@ static void test_CoWaitForMultipleHandles(void) ok(hr == S_OK, "expected S_OK, got 0x%08x\n", hr); ok(index == WAIT_IO_COMPLETION, "expected index WAIT_IO_COMPLETION, got %u\n", index); success = PeekMessageA(&msg, hWnd, WM_DDE_FIRST, WM_DDE_FIRST, PM_REMOVE); - todo_wine ok(success, "CoWaitForMultipleHandles unexpectedly pumped messages\n"); /* test with COWAIT_INPUTAVAILABLE (semaphores are still locked) */

1 0

Sebastian Lackner : ole32: Verify arguments for CoWaitForMultipleHandles, always initialize index to zero.
by Alexandre Julliard Nov. 21, 2014

Nov. 21, 2014

Module: wine Branch: master Commit: bbf68910304b8a261e7dfdfad7f5d929cbb2dcd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbf68910304b8a261e7dfdfad… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Nov 5 00:39:51 2014 +0100 ole32: Verify arguments for CoWaitForMultipleHandles, always initialize index to zero. --- dlls/ole32/compobj.c | 11 +++++++++++ dlls/ole32/tests/compobj.c | 13 ------------- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 1fab04f..1d9b943 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -4431,6 +4431,17 @@ HRESULT WINAPI CoWaitForMultipleHandles(DWORD dwFlags, DWORD dwTimeout, TRACE("(0x%08x, 0x%08x, %d, %p, %p)\n", dwFlags, dwTimeout, cHandles, pHandles, lpdwindex); + if (!lpdwindex) + return E_INVALIDARG; + + *lpdwindex = 0; + + if (!pHandles) + return E_INVALIDARG; + + if (!cHandles) + return RPC_E_NO_SYNC; + while (TRUE) { DWORD now = GetTickCount(); diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index f879773..38b21c9 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -2139,32 +2139,24 @@ static void test_CoWaitForMultipleHandles(void) PostMessageA(hWnd, WM_DDE_FIRST, 0, 0); hr = CoWaitForMultipleHandles(0, 50, 0, handles, NULL); - todo_wine ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got 0x%08x\n", hr); success = PeekMessageA(&msg, hWnd, WM_DDE_FIRST, WM_DDE_FIRST, PM_REMOVE); - todo_wine ok(success, "CoWaitForMultipleHandles unexpectedly pumped messages\n"); index = 0xdeadbeef; PostMessageA(hWnd, WM_DDE_FIRST, 0, 0); hr = CoWaitForMultipleHandles(0, 50, 0, NULL, &index); - todo_wine ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got 0x%08x\n", hr); - todo_wine ok(index == 0, "expected index 0, got %u\n", index); success = PeekMessageA(&msg, hWnd, WM_DDE_FIRST, WM_DDE_FIRST, PM_REMOVE); - todo_wine ok(success, "CoWaitForMultipleHandles unexpectedly pumped messages\n"); index = 0xdeadbeef; PostMessageA(hWnd, WM_DDE_FIRST, 0, 0); hr = CoWaitForMultipleHandles(0, 50, 0, handles, &index); - todo_wine ok(hr == RPC_E_NO_SYNC, "expected RPC_E_NO_SYNC, got 0x%08x\n", hr); - todo_wine ok(index == 0, "expected index 0, got %u\n", index); success = PeekMessageA(&msg, hWnd, WM_DDE_FIRST, WM_DDE_FIRST, PM_REMOVE); - todo_wine ok(success, "CoWaitForMultipleHandles unexpectedly pumped messages\n"); index = 0xdeadbeef; @@ -2187,7 +2179,6 @@ static void test_CoWaitForMultipleHandles(void) PostMessageA(hWnd, WM_DDE_FIRST, 0, 0); hr = CoWaitForMultipleHandles(0, 50, 2, handles, &index); ok(hr == RPC_S_CALLPENDING, "expected RPC_S_CALLPENDING, got 0x%08x\n", hr); - todo_wine ok(index == 0 || broken(index == 0xdeadbeef) /* Win 8 */, "expected index 0, got %u\n", index); success = PeekMessageA(&msg, hWnd, WM_DDE_FIRST, WM_DDE_FIRST, PM_REMOVE); ok(!success, "CoWaitForMultipleHandles didn't pump any messages\n"); @@ -2209,7 +2200,6 @@ static void test_CoWaitForMultipleHandles(void) PostMessageA(hWnd, WM_DDE_FIRST, 0, 0); hr = CoWaitForMultipleHandles(0, 50, 2, handles, &index); ok(hr == RPC_S_CALLPENDING, "expected RPC_S_CALLPENDING, got 0x%08x\n", hr); - todo_wine ok(index == 0 || broken(index == 0xdeadbeef) /* Win 8 */, "expected index 0, got %u\n", index); success = PeekMessageA(&msg, hWnd, WM_DDE_FIRST, WM_DDE_FIRST, PM_REMOVE); ok(!success, "CoWaitForMultipleHandles didn't pump any messages\n"); @@ -2239,7 +2229,6 @@ static void test_CoWaitForMultipleHandles(void) PostMessageA(hWnd, WM_DDE_FIRST, 0, 0); hr = CoWaitForMultipleHandles(COWAIT_ALERTABLE, 50, 2, handles, &index); ok(hr == RPC_S_CALLPENDING, "expected RPC_S_CALLPENDING, got 0x%08x\n", hr); - todo_wine ok(index == 0 || broken(index == 0xdeadbeef) /* Win 8 */, "expected index 0, got %u\n", index); success = PeekMessageA(&msg, hWnd, WM_DDE_FIRST, WM_DDE_FIRST, PM_REMOVE); ok(!success, "CoWaitForMultipleHandles didn't pump any messages\n"); @@ -2263,7 +2252,6 @@ static void test_CoWaitForMultipleHandles(void) ok(success, "PeekMessageA returned FALSE\n"); hr = CoWaitForMultipleHandles(0, 50, 2, handles, &index); ok(hr == RPC_S_CALLPENDING, "expected RPC_S_CALLPENDING, got 0x%08x\n", hr); - todo_wine ok(index == 0 || broken(index == 0xdeadbeef) /* Win 8 */, "expected index 0, got %u\n", index); success = PeekMessageA(&msg, hWnd, WM_DDE_FIRST, WM_DDE_FIRST, PM_REMOVE); ok(!success, "CoWaitForMultipleHandles didn't pump any messages\n"); @@ -2278,7 +2266,6 @@ static void test_CoWaitForMultipleHandles(void) ok(hr == RPC_S_CALLPENDING || broken(hr == E_INVALIDARG) || broken(hr == S_OK) /* Win 8 */, "expected RPC_S_CALLPENDING, got 0x%08x\n", hr); ReleaseSemaphore(handles[1], 1, NULL); - todo_wine ok(index == 0 || broken(index == 1) /* Win 8 */, "expected index 0, got %u\n", index); success = PeekMessageA(&msg, hWnd, WM_DDE_FIRST, WM_DDE_FIRST, PM_REMOVE); ok(!success || broken(success && hr == E_INVALIDARG),

1 0

Drew Ronneberg : user32: Do not call SendMessage() to hide a window that is already hidden.
by Alexandre Julliard Nov. 21, 2014

Nov. 21, 2014

Module: wine Branch: master Commit: f271634296a952a7e0efdf8a7fe474e67367c7e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f271634296a952a7e0efdf8a7… Author: Drew Ronneberg <drew_ronneberg(a)yahoo.com> Date: Tue Nov 18 22:30:37 2014 -0500 user32: Do not call SendMessage() to hide a window that is already hidden. --- dlls/user32/tests/msg.c | 3 --- dlls/user32/winpos.c | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index d829c5f..28bb35e 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -4673,8 +4673,6 @@ static void test_messages(void) flush_events(); ok_sequence(WmEmptySeq, "ShowWindow(SW_HIDE):overlapped", FALSE); - if (0) - { /* test ShowWindow(SW_HIDE) on a hidden window - multi-threaded */ hthread = CreateThread(NULL, 0, show_window_thread, hwnd, 0, &tid); ok(hthread != NULL, "CreateThread failed, error %d\n", GetLastError()); @@ -4682,7 +4680,6 @@ static void test_messages(void) CloseHandle(hthread); flush_events(); ok_sequence(WmEmptySeq, "ShowWindow(SW_HIDE):overlapped", FALSE); - } ShowWindow(hwnd, SW_SHOW); flush_events(); diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 5373733..12d3ffa 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -1219,6 +1219,9 @@ BOOL WINAPI ShowWindow( HWND hwnd, INT cmd ) if ((full_handle = WIN_IsCurrentThread( hwnd ))) return show_window( full_handle, cmd ); + if ((cmd == SW_HIDE) && !(GetWindowLongW( hwnd, GWL_STYLE ) & WS_VISIBLE)) + return FALSE; + return SendMessageW( hwnd, WM_WINE_SHOWWINDOW, cmd, 0 ); }

1 0

Yifu Wang : msvcp120: Added std::locale::facet::~facet() export.
by Alexandre Julliard Nov. 21, 2014

Nov. 21, 2014

Module: wine Branch: master Commit: e23bfdd8318fd45bc2115c38f47de7f433cf0a3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e23bfdd8318fd45bc2115c38f… Author: Yifu Wang <ywang(a)esri.com> Date: Fri Nov 14 13:06:19 2014 -0800 msvcp120: Added std::locale::facet::~facet() export. --- dlls/msvcp120/msvcp120.spec | 6 +++--- dlls/msvcp90/locale.c | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index 8ebdc80..422f0b6 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -517,9 +517,9 @@ @ cdecl -arch=arm ??1ctype_base(a)std@@UAA(a)XZ(ptr) ctype_base_dtor @ thiscall -arch=i386 ??1ctype_base(a)std@@UAE(a)XZ(ptr) ctype_base_dtor @ cdecl -arch=win64 ??1ctype_base(a)std@@UEAA(a)XZ(ptr) ctype_base_dtor -@ stub -arch=arm ??1facet(a)locale@std@@MAA(a)XZ -@ stub -arch=i386 ??1facet(a)locale@std@@MAE(a)XZ -@ stub -arch=win64 ??1facet(a)locale@std@@MEAA(a)XZ +@ cdecl -arch=arm ??1facet(a)locale@std@@MAA(a)XZ(ptr) locale_facet_dtor +@ thiscall -arch=i386 ??1facet(a)locale@std@@MAE(a)XZ(ptr) locale_facet_dtor +@ cdecl -arch=win64 ??1facet(a)locale@std@@MEAA(a)XZ(ptr) locale_facet_dtor @ cdecl -arch=arm ??1ios_base(a)std@@UAA(a)XZ(ptr) ios_base_dtor @ thiscall -arch=i386 ??1ios_base(a)std@@UAE(a)XZ(ptr) ios_base_dtor @ cdecl -arch=win64 ??1ios_base(a)std@@UEAA(a)XZ(ptr) ios_base_dtor diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 551a924d..097dad8 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -214,6 +214,9 @@ static void ostreambuf_iterator_wchar_put(ostreambuf_iterator_wchar *this, wchar /* ??1facet(a)locale@std@@UAE(a)XZ */ /* ??1facet(a)locale@std@@UEAA(a)XZ */ +/* ??1facet(a)locale@std@@MAA(a)XZ */ +/* ??1facet(a)locale@std@@MAE(a)XZ */ +/* ??1facet(a)locale@std@@MEAA(a)XZ */ DEFINE_THISCALL_WRAPPER(locale_facet_dtor, 4) void __thiscall locale_facet_dtor(locale_facet *this) {

1 0

Sebastian Lackner : ole32/tests: Add tests for CoWaitForMultipleHandles.
by Alexandre Julliard Nov. 21, 2014

Nov. 21, 2014

Module: wine Branch: master Commit: f7f2167fe8c52f8c45ffdc301128de1aa085ff52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7f2167fe8c52f8c45ffdc301… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Nov 5 00:35:06 2014 +0100 ole32/tests: Add tests for CoWaitForMultipleHandles. --- dlls/ole32/tests/compobj.c | 210 +++++++++++++++++++++++++++++++++++++++++++++ include/objbase.h | 5 +- 2 files changed, 213 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f7f2167fe8c52f8c45ffd…

1 0

Austin English : opengl32: Load dll below 2GB address space.
by Alexandre Julliard Nov. 21, 2014

Nov. 21, 2014

Module: wine Branch: master Commit: c62514b953fb523107501277520030c335e9accb URL: http://source.winehq.org/git/wine.git/?a=commit;h=c62514b953fb5231075012775… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Nov 20 15:04:56 2014 -0600 opengl32: Load dll below 2GB address space. --- dlls/opengl32/Makefile.in | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/opengl32/Makefile.in b/dlls/opengl32/Makefile.in index 890b5b6..4df6bce 100644 --- a/dlls/opengl32/Makefile.in +++ b/dlls/opengl32/Makefile.in @@ -1,6 +1,7 @@ MODULE = opengl32.dll IMPORTLIB = opengl32 IMPORTS = user32 gdi32 advapi32 +EXTRADLLFLAGS = -Wl,--image-base,0x7a800000 C_SRCS = \ opengl_ext.c \

1 0