November 2014 - Wine-commits

Jeremy Newman : Merge branch 'master' of winehq.org:/home/winehq/opt/ source/git/website
by Jeremy Newman 21 Nov '14

21 Nov '14

Module: website Branch: master Commit: 1de2290da91ebd98f3d129dc4d8bae0e605825b9 URL: http://source.winehq.org/git/website.git/?a=commit;h=1de2290da91ebd98f3d129… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Nov 21 13:05:01 2014 -0600 Merge branch 'master' of winehq.org:/home/winehq/opt/source/git/website ---

1 0

Jeremy Newman : add announcement image to news posts in RSS
by Jeremy Newman 21 Nov '14

21 Nov '14

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

Julian Rüger : Download: Update German translation
by Jeremy Newman 21 Nov '14

21 Nov '14

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

Julian Rüger : Download: Fix html tags and mailto link
by Jeremy Newman 21 Nov '14

21 Nov '14

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

Nikolay Sivov : dwrite: Load freetype on module attach, create one FT_Face per fontface.
by Alexandre Julliard 21 Nov '14

21 Nov '14

Module: wine Branch: master Commit: a77b9ed0c733fcb71fe3189f533f80166efc577e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a77b9ed0c733fcb71fe3189f5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 21 11:48:23 2014 +0300 dwrite: Load freetype on module attach, create one FT_Face per fontface. --- dlls/dwrite/Makefile.in | 2 + dlls/dwrite/dwrite_private.h | 7 +++ dlls/dwrite/font.c | 25 ++++++++ dlls/dwrite/freetype.c | 138 +++++++++++++++++++++++++++++++++++++++++++ dlls/dwrite/main.c | 1 + 5 files changed, 173 insertions(+) diff --git a/dlls/dwrite/Makefile.in b/dlls/dwrite/Makefile.in index 2090883..ded14db 100644 --- a/dlls/dwrite/Makefile.in +++ b/dlls/dwrite/Makefile.in @@ -1,12 +1,14 @@ MODULE = dwrite.dll IMPORTLIB = dwrite IMPORTS = user32 gdi32 +EXTRAINCL = $(FREETYPE_CFLAGS) C_SRCS = \ analyzer.c \ bidi.c \ bracket.c \ font.c \ + freetype.c \ gdiinterop.c \ layout.c \ linebreak.c \ diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 3b1d283..c600f3e 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -119,9 +119,16 @@ extern void opentype_get_font_properties(const void*,const void*,DWRITE_FONT_STR extern void opentype_get_font_metrics(const void*,const void*,const void*,DWRITE_FONT_METRICS1*) DECLSPEC_HIDDEN; extern HRESULT opentype_get_font_strings_from_id(const void*,DWRITE_INFORMATIONAL_STRING_ID,IDWriteLocalizedStrings**) DECLSPEC_HIDDEN; +/* BiDi helpers */ extern HRESULT bidi_computelevels(const WCHAR*,UINT32,UINT8,UINT8*,UINT8*) DECLSPEC_HIDDEN; extern WCHAR bidi_get_mirrored_char(WCHAR) DECLSPEC_HIDDEN; +/* FreeType integration */ +struct ft_fontface; +extern BOOL init_freetype(void) DECLSPEC_HIDDEN; +extern HRESULT alloc_ft_fontface(const void*,UINT32,UINT32,struct ft_fontface**) DECLSPEC_HIDDEN; +extern void release_ft_fontface(struct ft_fontface*) DECLSPEC_HIDDEN; + /* Glyph shaping */ enum SCRIPT_JUSTIFY { diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index ed38a6f..eb7a274 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -119,6 +119,7 @@ struct dwrite_fontface { DWRITE_FONT_METRICS1 metrics; struct dwrite_fonttable cmap; + struct ft_fontface *ft; }; struct dwrite_fontfile { @@ -254,6 +255,7 @@ static ULONG WINAPI dwritefontface_Release(IDWriteFontFace2 *iface) if (This->files[i]) IDWriteFontFile_Release(This->files[i]); } + release_ft_fontface(This->ft); heap_free(This); } @@ -1928,9 +1930,14 @@ HRESULT create_fontface(DWRITE_FONT_FACE_TYPE facetype, UINT32 files_number, IDW DWRITE_FONT_SIMULATIONS simulations, IDWriteFontFace2 **ret) { struct dwrite_fontface *fontface; + const void *data_ptr; HRESULT hr = S_OK; + void *context; + UINT64 size; int i; + *ret = NULL; + fontface = heap_alloc(sizeof(struct dwrite_fontface)); if (!fontface) return E_OUTOFMEMORY; @@ -1954,6 +1961,7 @@ HRESULT create_fontface(DWRITE_FONT_FACE_TYPE facetype, UINT32 files_number, IDW fontface->cmap.size = 0; fontface->index = index; fontface->simulations = simulations; + fontface->ft = NULL; for (i = 0; i < fontface->file_count; i++) { hr = get_stream_from_file(font_files[i], &fontface->streams[i]); @@ -1968,8 +1976,25 @@ HRESULT create_fontface(DWRITE_FONT_FACE_TYPE facetype, UINT32 files_number, IDW get_font_properties_from_stream(fontface->streams[0], facetype, index, &fontface->metrics, NULL, NULL, NULL); + hr = IDWriteFontFileStream_GetFileSize(fontface->streams[0], &size); + if (FAILED(hr)) + goto fail; + + hr = IDWriteFontFileStream_ReadFileFragment(fontface->streams[0], &data_ptr, 0, size, &context); + if (FAILED(hr)) + goto fail; + + hr = alloc_ft_fontface(data_ptr, size, fontface->index, &fontface->ft); + IDWriteFontFileStream_ReleaseFileFragment(fontface->streams[0], context); + if (FAILED(hr)) + goto fail; + *ret = &fontface->IDWriteFontFace2_iface; return S_OK; + +fail: + IDWriteFontFace2_Release(&fontface->IDWriteFontFace2_iface); + return hr; } /* IDWriteLocalFontFileLoader and its required IDWriteFontFileStream */ diff --git a/dlls/dwrite/freetype.c b/dlls/dwrite/freetype.c new file mode 100644 index 0000000..86d85b3 --- /dev/null +++ b/dlls/dwrite/freetype.c @@ -0,0 +1,138 @@ +/* + * FreeType integration + * + * Copyright 2014 Nikolay Sivov for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#include "wine/port.h" + +#ifdef HAVE_FT2BUILD_H +#include <ft2build.h> +#include FT_FREETYPE_H +#endif /* HAVE_FT2BUILD_H */ + +#include "windef.h" +#include "wine/library.h" +#include "wine/debug.h" + +#include "dwrite_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dwrite); + +#ifdef HAVE_FREETYPE + +static void *ft_handle = NULL; +static FT_Library library = 0; +typedef struct +{ + FT_Int major; + FT_Int minor; + FT_Int patch; +} FT_Version_t; + +#define MAKE_FUNCPTR(f) static typeof(f) * p##f = NULL +MAKE_FUNCPTR(FT_Done_Face); +MAKE_FUNCPTR(FT_Init_FreeType); +MAKE_FUNCPTR(FT_Library_Version); +MAKE_FUNCPTR(FT_New_Memory_Face); +#undef MAKE_FUNCPTR + +struct ft_fontface +{ + FT_Face face; +}; + +BOOL init_freetype(void) +{ + FT_Version_t FT_Version; + + ft_handle = wine_dlopen(SONAME_LIBFREETYPE, RTLD_NOW, NULL, 0); + if (!ft_handle) { + WINE_MESSAGE("Wine cannot find the FreeType font library.\n"); + return FALSE; + } + +#define LOAD_FUNCPTR(f) if((p##f = wine_dlsym(ft_handle, #f, NULL, 0)) == NULL){WARN("Can't find symbol %s\n", #f); goto sym_not_found;} + LOAD_FUNCPTR(FT_Done_Face) + LOAD_FUNCPTR(FT_Init_FreeType) + LOAD_FUNCPTR(FT_Library_Version) + LOAD_FUNCPTR(FT_New_Memory_Face) +#undef LOAD_FUNCPTR + + if (pFT_Init_FreeType(&library) != 0) { + ERR("Can't init FreeType library\n"); + wine_dlclose(ft_handle, NULL, 0); + ft_handle = NULL; + return FALSE; + } + pFT_Library_Version(library, &FT_Version.major, &FT_Version.minor, &FT_Version.patch); + + TRACE("FreeType version is %d.%d.%d\n", FT_Version.major, FT_Version.minor, FT_Version.patch); + return TRUE; + +sym_not_found: + WINE_MESSAGE("Wine cannot find certain functions that it needs from FreeType library.\n"); + wine_dlclose(ft_handle, NULL, 0); + ft_handle = NULL; + return FALSE; +} + +HRESULT alloc_ft_fontface(const void *data_ptr, UINT32 data_size, UINT32 index, struct ft_fontface **ftface) +{ + FT_Face face; + FT_Error err; + + *ftface = heap_alloc_zero(sizeof(struct ft_fontface)); + if (!*ftface) + return E_OUTOFMEMORY; + + err = pFT_New_Memory_Face(library, data_ptr, data_size, index, &face); + if (err) { + ERR("FT_New_Memory_Face rets %d\n", err); + return E_FAIL; + } + (*ftface)->face = face; + + return S_OK; +} + +void release_ft_fontface(struct ft_fontface *ftface) +{ + if (!ftface) return; + pFT_Done_Face(ftface->face); + heap_free(ftface); +} + +#else /* HAVE_FREETYPE */ + +BOOL init_freetype(void) +{ + return FALSE; +} + +HRESULT alloc_ft_fontface(const void *data_ptr, UINT32 data_size, UINT32 index, struct ft_fontface **face) +{ + *face = NULL; + return S_FALSE; +} + +void release_ft_fontface(struct ft_fontface *face) +{ +} + +#endif /* HAVE_FREETYPE */ diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 1292086..79aa7d0 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -45,6 +45,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, LPVOID reserved) return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls( hinstDLL ); + init_freetype(); break; case DLL_PROCESS_DETACH: if (reserved) break;

1 0

Jacek Caban : mshtml: Merge htmlelem3.c into htmlelem.c.
by Alexandre Julliard 21 Nov '14

21 Nov '14

Module: wine Branch: master Commit: 6485a67a90c7d514ea9e700075fe9e07923e44d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6485a67a90c7d514ea9e70007… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 20 16:12:39 2014 +0100 mshtml: Merge htmlelem3.c into htmlelem.c. --- dlls/mshtml/Makefile.in | 1 - dlls/mshtml/htmlelem.c | 648 +++++++++++++++++++++++++++++++++++++++- dlls/mshtml/htmlelem3.c | 683 ------------------------------------------- dlls/mshtml/mshtml_private.h | 1 - 4 files changed, 646 insertions(+), 687 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6485a67a90c7d514ea9e7…

1 0

Jacek Caban : mshtml: Don't try to null terminate post data if it' s not available.
by Alexandre Julliard 21 Nov '14

21 Nov '14

Module: wine Branch: master Commit: ec97e3fd57e84a4d231c0ee567ea1b1fcfbbf4f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec97e3fd57e84a4d231c0ee56… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 20 17:59:42 2014 +0100 mshtml: Don't try to null terminate post data if it's not available. --- dlls/mshtml/navigate.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 39f298f..85e47aa 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -902,7 +902,8 @@ static HRESULT read_post_data_stream(nsIInputStream *stream, BOOL contains_heade post_data = new_data; } - post_data[data_len] = 0; + if(post_data) + post_data[data_len] = 0; request_data->post_data = post_data; request_data->post_data_len = data_len; TRACE("post_data = %s\n", debugstr_an(request_data->post_data, request_data->post_data_len));

1 0

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

21 Nov '14

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

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

21 Nov '14

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

Drew Ronneberg : user32/tests: Add tests for calling ShowWindow(SW_HIDE) on a hidden window.
by Alexandre Julliard 21 Nov '14

21 Nov '14

Module: wine Branch: master Commit: 0908c43327a6d0eb2fd2052339a75aba568d89af URL: http://source.winehq.org/git/wine.git/?a=commit;h=0908c43327a6d0eb2fd205233… Author: Drew Ronneberg <drew_ronneberg(a)yahoo.com> Date: Tue Nov 18 22:14:21 2014 -0500 user32/tests: Add tests for calling ShowWindow(SW_HIDE) on a hidden window. --- dlls/user32/tests/msg.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 9b7453f..d829c5f 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -4621,9 +4621,21 @@ static void test_MsgWaitForMultipleObjects(HWND hwnd) ok(ret == WAIT_IO_COMPLETION, "MsgWaitForMultipleObjectsEx returned %x\n", ret); } +static DWORD CALLBACK show_window_thread(LPVOID arg) +{ + HWND hwnd = arg; + + /* function will not return if ShowWindow(SW_HIDE) calls SendMessage() */ + ShowWindow(hwnd, SW_HIDE); + + return 0; +} + /* test if we receive the right sequence of messages */ static void test_messages(void) { + DWORD tid; + HANDLE hthread; HWND hwnd, hparent, hchild; HWND hchild2, hbutton; HMENU hmenu; @@ -4656,6 +4668,22 @@ static void test_messages(void) flush_events(); ok_sequence(WmHideOverlappedSeq, "ShowWindow(SW_HIDE):overlapped", FALSE); + /* test ShowWindow(SW_HIDE) on a hidden window - single threaded */ + ShowWindow(hwnd, SW_HIDE); + 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()); + ok(WaitForSingleObject(hthread, INFINITE) == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); + CloseHandle(hthread); + flush_events(); + ok_sequence(WmEmptySeq, "ShowWindow(SW_HIDE):overlapped", FALSE); + } + ShowWindow(hwnd, SW_SHOW); flush_events(); ok_sequence(WmShowOverlappedSeq, "ShowWindow(SW_SHOW):overlapped", TRUE);

1 0