April 2017 - Wine-commits - list.winehq.org

Frédéric Delanoy : French translation for release 2.0
by Jeremy Newman 06 Apr '17

06 Apr '17

Module: website Branch: master Commit: 04621239572e8db9744fa9b51ee212f3a3319eae URL: http://source.winehq.org/git/website.git/?a=commit;h=04621239572e8db9744fa9… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Apr 3 18:56:46 2017 +0200 French translation for release 2.0 Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/fr/2017012401.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/news/fr/2017012401.xml b/news/fr/2017012401.xml new file mode 100644 index 0000000..536020a --- /dev/null +++ b/news/fr/2017012401.xml @@ -0,0 +1,11 @@ +<news> +<date>24 janvier 2017</date> +<title>Sortie de Wine 2.0</title> +<body> +L'équipe de Wine est fière d'annoncer la disponibilité de la version stable 2.0 de Wine. +Cette version représente plus d'un an d'efforts de développement et environ 6600 changements individuels. Les points forts principaux sont la prise en charge de Microsoft Office 2013 et la prise en charge du mode 64 bits sous macOS. +Elle comprend également quantité d'améliorations dans tous les domaines, ainsi que la prise en charge de nombreuses nouvelles applications et jeux. Voyez les <a href="{$root}/announce/2.0">notes de version</a> pour un résumé des changements principaux. +C'est la première version réalisée sur base du nouveau programme de livraisons annuelles. Cela +implique que certaines fonctionnalités en cours de développement mais qui n'ont pas pu être terminées à temps ont été reportées au cycle de développement suivant. Ceci inclut en particulier le flux de commandes Direct3D, la prise en charge complète du HID, le pilote graphique Android et les tubes en mode message. +Le <a href="//dl.winehq.org/wine/source/2.0/wine-2.0.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. +</body></news>

1 0

Frédéric Delanoy : French translation for release 2.1
by Jeremy Newman 06 Apr '17

06 Apr '17

Module: website Branch: master Commit: 1ab061b232ef7431d3323a39740ae525ea9400aa URL: http://source.winehq.org/git/website.git/?a=commit;h=1ab061b232ef7431d3323a… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Apr 3 19:55:41 2017 +0200 French translation for release 2.1 Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/fr/2017020301.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/news/fr/2017020301.xml b/news/fr/2017020301.xml new file mode 100644 index 0000000..eb7093f --- /dev/null +++ b/news/fr/2017020301.xml @@ -0,0 +1,18 @@ +<news> +<date>3 février 2017</date> +<title>Sortie de Wine 2.1</title> +<body> +La version de développement 2.1 de Wine est disponible. +<a href="{$root}/announce/2.1">Nouveautés</a> de cette version : +<ul> + <li>Divers correctifs qui étaient reportés durant la période de gel du code.</li> + <li>Instructions Shader Model 5 supplémentaires.</li> + <li>Quelques améliorations dans le traitement des messages MIME.</li> + <li>Meilleure prise en charge du retour à la ligne automatique dans DirectWrite.</li> + <li>Le service de bus HID tourne à présent par défaut.</li> + <li>Améliorations dans le rendu Direct2D.</li> + <li>Diverses corrections de bugs.</li> + <li>Les archives de sources tar utilisent à présent la compression xz.</li> +</ul> +Le <a href="//dl.winehq.org/wine/source/2.1/wine-2.1.tar.xz">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. +</body></news>

1 0

Frédéric Delanoy : French translation for release 2.2
by Jeremy Newman 06 Apr '17

06 Apr '17

Module: website Branch: master Commit: 80de6a23b980cc416ca7020db5ff64fb02c571c4 URL: http://source.winehq.org/git/website.git/?a=commit;h=80de6a23b980cc416ca702… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Apr 3 19:55:42 2017 +0200 French translation for release 2.2 Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/fr/2017021701.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/fr/2017021701.xml b/news/fr/2017021701.xml new file mode 100644 index 0000000..82299d2 --- /dev/null +++ b/news/fr/2017021701.xml @@ -0,0 +1,15 @@ +<news> +<date>17 février 2017</date> +<title>Sortie de Wine 2.2</title> +<body> +La version de développement 2.2 de Wine est disponible. +<a href="{$root}/announce/2.2">Nouveautés</a> de cette version : +<ul> + <li>Version de Windows fixée à Windows 7 pour les nouveaux préfixes.</li> + <li>Étapes supplémentaires en vue du flux de commandes Direct3D.</li> + <li>Toujours plus d'instructions Shader Model 5.</li> + <li>Prise en charge initiale de la peinture de thèmes avec double mémoire tampon.</li> + <li>Diverses corrections de bugs.</li> +</ul> +Le <a href="//dl.winehq.org/wine/source/2.x/wine-2.2.tar.xz">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. +</body></news>

1 0

Frédéric Delanoy : French translation for release 2.3
by Jeremy Newman 06 Apr '17

06 Apr '17

Module: website Branch: master Commit: edf59be09022e77ab989ed8f28cf223b9a1b4a2e URL: http://source.winehq.org/git/website.git/?a=commit;h=edf59be09022e77ab989ed… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Apr 3 19:55:43 2017 +0200 French translation for release 2.3 Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/fr/2017030301.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/fr/2017030301.xml b/news/fr/2017030301.xml new file mode 100644 index 0000000..15f8f3d --- /dev/null +++ b/news/fr/2017030301.xml @@ -0,0 +1,16 @@ +<news> +<date>3 mars 2017</date> +<title>Sortie de Wine 2.3</title> +<body> +La version de développement 2.3 de Wine est disponible. +<a href="{$root}/announce/2.3">Nouveautés</a> de cette version : +<ul> + <li>Script wineinstall obsolète supprimé.</li> + <li>Travail supplémentaire sur le flux de commandes Direct3D.</li> + <li>Quelques instructions Shader Model 5 de plus.</li> + <li>Meilleur rendu du soulignement dans DirectWrite.</li> + <li>Prise en charge améliorée d'ODBC sur 64 bits.</li> + <li>Diverses corrections de bugs.</li> +</ul> +Le <a href="//dl.winehq.org/wine/source/2.x/wine-2.3.tar.xz">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. +</body></news>

1 0

Frédéric Delanoy : French translation for release 2.4
by Jeremy Newman 06 Apr '17

06 Apr '17

Module: website Branch: master Commit: 9fc1a80c97c889a95aa798478967adf7d272993d URL: http://source.winehq.org/git/website.git/?a=commit;h=9fc1a80c97c889a95aa798… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Apr 3 19:55:44 2017 +0200 French translation for release 2.4 Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/fr/2017031701.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/fr/2017031701.xml b/news/fr/2017031701.xml new file mode 100644 index 0000000..a409386 --- /dev/null +++ b/news/fr/2017031701.xml @@ -0,0 +1,16 @@ +<news> +<date>17 mars 2017</date> +<title>Sortie de Wine 2.4</title> +<body> +La version de développement 2.4 de Wine est disponible. +<a href="{$root}/announce/2.4">Nouveautés</a> de cette version : +<ul> + <li>Implémentation intégrée des fonctions de hachage cryptographiques.</li> + <li>Moteur Mono mis à jour avec les correctifs en amont.</li> + <li>Travail supplémentaire sur le flux de commandes Direct3D.</li> + <li>Gras et italique simulés dans DirectWrite.</li> + <li>Améliorations dans le lecteur XML.</li> + <li>Diverses corrections de bugs.</li> +</ul> +Le <a href="//dl.winehq.org/wine/source/2.x/wine-2.4.tar.xz">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. +</body></news>

1 0

Jeremy Newman : wine-users closing down
by Jeremy Newman 06 Apr '17

06 Apr '17

Module: website Branch: master Commit: 55dab44ab812e2fe2fc04ec266eb260b0b66072c URL: http://source.winehq.org/git/website.git/?a=commit;h=55dab44ab812e2fe2fc04e… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Apr 6 11:41:19 2017 -0500 wine-users closing down The traffic on wine-users is near non-existent, and questions are going unanswered there. Closing down and redirecting to the forums where there is a much more active community. --- templates/en/forums.template | 11 +++-------- templates/fr/forums.template | 7 +------ templates/pl/forums.template | 8 +------- templates/pt/forums.template | 9 +-------- templates/tr/forums.template | 7 +------ templates/zh-cn/forums.template | 7 +------ 6 files changed, 8 insertions(+), 41 deletions(-) diff --git a/templates/en/forums.template b/templates/en/forums.template index 7e13370..f21dad4 100644 --- a/templates/en/forums.template +++ b/templates/en/forums.template @@ -8,8 +8,6 @@ Here are the most useful ones for users: <ul> <li>The <a href="//forum.winehq.org">WineHQ Forums</a></li> - <li>The <a href="//www.winehq.org/mailman/listinfo/wine-users">Wine-Users Mailing List</a> (and <a href="//www.winehq.org/pipermail/wine-users/">web archive</a>)</li> - <li>Ubuntu users may also want to visit the <a href="http://ubuntuforums.org/forumdisplay.php?f=313">Wine area at Ubuntu Forums</a> <li>Users might also want to visit the <a href="http://www.linuxforums.org/forum/wine/">Wine area at Linux Forums</a> @@ -50,12 +48,9 @@ mailing list software. </li> <li> - [<a href="//www.winehq.org/mailman/listinfo/wine-users">(Un-)Subscribe</a>] - [<a href="//www.winehq.org/pipermail/wine-users/">Archive 1</a>] - [<a href="http://news.gmane.org/gmane.comp.emulators.wine.user">Archive 2</a>] - [<a href="news://news.gmane.org/gmane.comp.emulators.wine.user">via newsreader</a>] - <a href="mailto:wine-users(a)winehq.org">wine-users(a)winehq.org</a> - A medium traffic (50/day) open list for end-user discussions. + [<a href="http://news.gmane.org/gmane.comp.emulators.wine.announce">Archive 1</a>] + [<a href="//www.winehq.org/pipermail/wine-users/">Archive 2</a>] + A list for end-user discussions. Now closed. Use the <a href="//forums.winehq.org/">forums</a> instead. </li> <li> diff --git a/templates/fr/forums.template b/templates/fr/forums.template index b30c1ea..e82b6c6 100644 --- a/templates/fr/forums.template +++ b/templates/fr/forums.template @@ -7,9 +7,7 @@ Voici les plus utiles pour les utilisateurs : <ul> - <li>Les <a href="//forum.winehq.org">forums WineHQ</a></li> - - <li>La <a href="//www.winehq.org/mailman/listinfo/wine-users">liste de discussion Wine-Users</a> (et l'<a href="//www.winehq.org/pipermail/wine-users/">archive web</a>)</li> + <li>Les <a href="//forums.winehq.org">forums WineHQ</a></li> <li>Les utilisateurs Ubuntu peuvent également visiter l'<a href="http://ubuntuforums.org/forumdisplay.php?f=313">espace Wine des forums Ubuntu</a> @@ -41,11 +39,8 @@ le mot de passe obtenu lors de l'inscription, ou employez simplement <a href="// </li> <li> - [<a href="//www.winehq.org/mailman/listinfo/wine-users">(Dés-)inscription</a>] [<a href="//www.winehq.org/pipermail/wine-users/">Archive 1</a>] [<a href="http://news.gmane.org/gmane.comp.emulators.wine.user">Archive 2</a>] - [<a href="news://news.gmane.org/gmane.comp.emulators.wine.user">via un lecteur de nouvelles</a>] - <a href="mailto:wine-users(a)winehq.org">wine-users(a)winehq.org</a> Une liste moyen trafic (50 messages par jour) pour les discussions des utilisateurs. </li> diff --git a/templates/pl/forums.template b/templates/pl/forums.template index bf5b216..e260341 100644 --- a/templates/pl/forums.template +++ b/templates/pl/forums.template @@ -7,9 +7,7 @@ Tutaj wymieniono najbardziej użyteczne dla użytkowników: <ul> - <li>The <a href="//www.winehq.org/mailman/listinfo/wine-users">Lista mailingowa używkowników Wine</a> (i <a href="//www.winehq.org/pipermail/wine-users/">archiwum sieciowe</a>) - najlepsze miejsce dla uzyskania wsparcia Wine na poziomie użytkownika</li> - - <li>The <a href="//forum.winehq.org">Fora WineHQ</a> - dla tych z was, którzy wolą interfejs forum od listy mailingowej. Lista mailingowa i forum są ze sobą połączone. Wiadomości wysyłane do jednego automatycznie są przesyłane do drugiego.</li> + <li>The <a href="//forums.winehq.org">Fora WineHQ</a> - dla tych z was, którzy wolą interfejs forum od listy mailingowej. Lista mailingowa i forum są ze sobą połączone. Wiadomości wysyłane do jednego automatycznie są przesyłane do drugiego.</li> <li>Użytkownicy Ubuntu mogą takżę odwiedzić <a href="http://ubuntuforums.org/forumdisplay.php?f=313">Dział Wine na forum Ubuntu</a> @@ -48,12 +46,8 @@ oprogramowanie listy mailingowej. i innych istotnych aktualności o Wine lub WineHQ. <li> - [<a href="//www.winehq.org/mailman/listinfo/wine-users">(Wy-/Za-)pisz</a>] [<a href="//www.winehq.org/pipermail/wine-users/">Archiwum 1</a>] [<a href="http://news.gmane.org/gmane.comp.emulators.wine.user">Archiwum 2</a>] - [<a href="news://news.gmane.org/gmane.comp.emulators.wine.user">przez czytnik aktualności</a>] - [<a href="//forum.winehq.org">przez fora sieciowe</a>] - <a href="mailto:wine-users(a)winehq.org">wine-users(a)winehq.org</a> Średni ruch (50/dziennie) otwarta lista dla dyskusji końcowych użytkowników. <li> diff --git a/templates/pt/forums.template b/templates/pt/forums.template index 6d679c7..f109f50 100644 --- a/templates/pt/forums.template +++ b/templates/pt/forums.template @@ -7,10 +7,7 @@ Aqui estão as mais úteis para os usuários: <ul> - <li>A <a href="//www.winehq.org/mailman/listinfo/wine-users">Lista de Email dos usuários do Wine</a> - (<a href="//www.winehq.org/pipermail/wine-users/">arquivo de emails</a>) - o melhor lugar para o suporte a usuários do Wine</li> - - <li>Os <a href="//forum.winehq.org">Fórums do WineHQ</a> - para aqueles que preferem uma interface de + <li>Os <a href="//forums.winehq.org">Fórums do WineHQ</a> - para aqueles que preferem uma interface de fórum ao invés de uma lista de email. As listas de email e os fóruns estão interligados. Mensagens mandadas para um lugar são automaticamente propagados para o outro.</li> <li>Usuários do Ubuntu talvez queiram visitar a <a href="http://ubuntuforums.org/forumdisplay.php?f=313">sessão do Wine nos Fóruns do Ubuntu</a> @@ -51,12 +48,8 @@ do contrário o seu email será tratado como um possível spam pelo software da e outras notícias importantes do Wine e WineHQ. <li> - [<a href="//www.winehq.org/mailman/listinfo/wine-users">(Des-)Inscrever</a>] [<a href="//www.winehq.org/pipermail/wine-users/">Arquivo 1</a>] [<a href="http://news.gmane.org/gmane.comp.emulators.wine.user">Arquivo 2</a>] - [<a href="news://news.gmane.org/gmane.comp.emulators.wine.user">via newsreader</a>] - [<a href="//forum.winehq.org">via fórums</a>] - <a href="mailto:wine-users(a)winehq.org">wine-users(a)winehq.org</a> Uma lista aberta de tráfego médio (50/dia) para discussões entre usuários finais. <li> diff --git a/templates/tr/forums.template b/templates/tr/forums.template index 7b2843a..dcee48c 100644 --- a/templates/tr/forums.template +++ b/templates/tr/forums.template @@ -6,9 +6,7 @@ Wine için posta listeleri ve forumlar bulunuyor. Kullanıcılar için en kullanışlı olanlar aşağıdakilerdir: <ul> - <li><a href="//forum.winehq.org">WineHQ Forumları</a></li> - - <li>The <a href="//www.winehq.org/mailman/listinfo/wine-users">Wine-Kullanıcıları Posta Listesi</a> (ve <a href="//www.winehq.org/pipermail/wine-users/">web arşivi</a>)</li> + <li><a href="//forums.winehq.org">WineHQ Forumları</a></li> <li>Ubuntu kullanıcıları ayrıca <a href="http://ubuntuforums.org/forumdisplay.php?f=313">Ubuntu Forumları Wine Alanı</a> sayfasını ziyaret etmek isteyebilirler.</li> @@ -41,11 +39,8 @@ WWW</a> veya listeadı-request(a)winehq.org adresine konu satırı "subscri </li> <li> - [<a href="//www.winehq.org/mailman/listinfo/wine-users">Abone ol/iptal et</a>] [<a href="//www.winehq.org/pipermail/wine-users/">Arşiv 1</a>] [<a href="http://news.gmane.org/gmane.comp.emulators.wine.user">Arşiv 2</a>] - [<a href="news://news.gmane.org/gmane.comp.emulators.wine.user">haber okuyucu ile</a>] - <a href="mailto:wine-users(a)winehq.org">wine-users(a)winehq.org</a> Son kullanıcı tartışmaları için orta trafikli (50 ileti/gün) açık liste </li> diff --git a/templates/zh-cn/forums.template b/templates/zh-cn/forums.template index 6da126d..a50ba3b 100644 --- a/templates/zh-cn/forums.template +++ b/templates/zh-cn/forums.template @@ -6,9 +6,7 @@ Wine 有很多邮件列表和论坛，这里列举了对用户最有用的一些： <ul> - <li><a href="//forum.winehq.org"> WineHQ 论坛</a></li> - - <li><a href="//www.winehq.org/mailman/listinfo/wine-users"> Wine-Users 邮件列表</a>（和<a href="//www.winehq.org/pipermail/wine-users/">在线存档</a>）</li> + <li><a href="//forums.winehq.org"> WineHQ 论坛</a></li> <li> Ubuntu 用户也许还想去 <a href="http://ubuntuforums.org/forumdisplay.php?f=313">Ubuntu 论坛 Wine 板块</a> @@ -41,11 +39,8 @@ WWW</a>，或者发送一封标题为“subscribe”的邮件到 指定列表 </li> <li> - [<a href="//www.winehq.org/mailman/listinfo/wine-users">（取消）订阅</a>] [<a href="//www.winehq.org/pipermail/wine-users/">存档 1</a>] [<a href="http://news.gmane.org/gmane.comp.emulators.wine.user">存档 2</a>] - [<a href="news://news.gmane.org/gmane.comp.emulators.wine.user">via newsreader</a>] - <a href="mailto:wine-users(a)winehq.org">wine-users(a)winehq.org</a> 一个中等流量（50封/天）的开放性列表，用于终端用户讨论。 </li>

1 0

Józef Kucia : wined3d: Avoid accessing "context-> current_rt" in wined3d_rendertarget_view_get_drawable_size().
by Alexandre Julliard 05 Apr '17

05 Apr '17

Module: wine Branch: master Commit: c6168a526e967eb63be767cc35821444fe644684 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6168a526e967eb63be767cc3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 5 15:38:04 2017 +0200 wined3d: Avoid accessing "context->current_rt" in wined3d_rendertarget_view_get_drawable_size(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/view.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 82fac25..f37b601 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -359,8 +359,8 @@ void wined3d_rendertarget_view_get_drawable_size(const struct wined3d_rendertarg /* The drawable size of an onscreen drawable is the surface size. * (Actually: The window size, but the surface is created in window * size.) */ - *width = context->current_rt.texture->resource.width; - *height = context->current_rt.texture->resource.height; + *width = texture->resource.width; + *height = texture->resource.height; } else if (wined3d_settings.offscreen_rendering_mode == ORM_BACKBUFFER) { @@ -374,13 +374,12 @@ void wined3d_rendertarget_view_get_drawable_size(const struct wined3d_rendertarg } else { - struct wined3d_surface *rt; + unsigned int level_idx = view->sub_resource_idx % texture->level_count; /* The drawable size of an FBO target is the OpenGL texture size, * which is the power of two size. */ - rt = context->current_rt.texture->sub_resources[context->current_rt.sub_resource_idx].u.surface; - *width = wined3d_texture_get_level_pow2_width(rt->container, rt->texture_level); - *height = wined3d_texture_get_level_pow2_height(rt->container, rt->texture_level); + *width = wined3d_texture_get_level_pow2_width(texture, level_idx); + *height = wined3d_texture_get_level_pow2_height(texture, level_idx); } }

1 0

Józef Kucia : wined3d: Introduce context_reacquire() helper function.
by Alexandre Julliard 05 Apr '17

05 Apr '17

Module: wine Branch: master Commit: 8b9ece67977249f66e21592832f42b3f6475aea0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b9ece67977249f66e2159283… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 5 15:38:05 2017 +0200 wined3d: Introduce context_reacquire() helper function. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 15 +++++++ dlls/wined3d/query.c | 89 ++++++++++++++++++------------------------ dlls/wined3d/wined3d_private.h | 2 + 3 files changed, 55 insertions(+), 51 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 8427eb7..2e9b38a 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3832,3 +3832,18 @@ struct wined3d_context *context_acquire(const struct wined3d_device *device, return context; } + +struct wined3d_context *context_reacquire(const struct wined3d_device *device, + struct wined3d_context *context) +{ + struct wined3d_context *current_context; + + if (context->tid != GetCurrentThreadId()) + return NULL; + + current_context = context_acquire(device, context->current_rt.texture, + context->current_rt.sub_resource_idx); + if (current_context != context) + ERR("Acquired context %p instead of %p.\n", current_context, context); + return current_context; +} diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 371f7d3..1927e7e 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -68,27 +68,28 @@ void wined3d_event_query_destroy(struct wined3d_event_query *query) static enum wined3d_event_query_result wined3d_event_query_test(const struct wined3d_event_query *query, const struct wined3d_device *device, DWORD flags) { - struct wined3d_context *context; const struct wined3d_gl_info *gl_info; enum wined3d_event_query_result ret; + struct wined3d_context *context; BOOL fence_result; TRACE("query %p, device %p, flags %#x.\n", query, device, flags); if (!query->context) { - TRACE("Query not started\n"); + TRACE("Query not started.\n"); return WINED3D_EVENT_QUERY_NOT_STARTED; } - if (!query->context->gl_info->supported[ARB_SYNC] && query->context->tid != GetCurrentThreadId()) + if (!(context = context_reacquire(device, query->context))) { - WARN("Event query tested from wrong thread\n"); - return WINED3D_EVENT_QUERY_WRONG_THREAD; + if (!query->context->gl_info->supported[ARB_SYNC]) + { + WARN("Event query tested from wrong thread.\n"); + return WINED3D_EVENT_QUERY_WRONG_THREAD; + } + context = context_acquire(device, NULL, 0); } - - context = context_acquire(device, query->context->current_rt.texture, - query->context->current_rt.sub_resource_idx); gl_info = context->gl_info; if (gl_info->supported[ARB_SYNC]) @@ -141,30 +142,32 @@ static enum wined3d_event_query_result wined3d_event_query_test(const struct win enum wined3d_event_query_result wined3d_event_query_finish(const struct wined3d_event_query *query, const struct wined3d_device *device) { - struct wined3d_context *context; const struct wined3d_gl_info *gl_info; enum wined3d_event_query_result ret; + struct wined3d_context *context; TRACE("query %p, device %p.\n", query, device); if (!query->context) { - TRACE("Query not started\n"); + TRACE("Query not started.\n"); return WINED3D_EVENT_QUERY_NOT_STARTED; } gl_info = query->context->gl_info; - if (query->context->tid != GetCurrentThreadId() && !gl_info->supported[ARB_SYNC]) + if (!(context = context_reacquire(device, query->context))) { /* A glFinish does not reliably wait for draws in other contexts. The caller has * to find its own way to cope with the thread switch */ - WARN("Event query finished from wrong thread\n"); - return WINED3D_EVENT_QUERY_WRONG_THREAD; + if (!gl_info->supported[ARB_SYNC]) + { + WARN("Event query finished from wrong thread.\n"); + return WINED3D_EVENT_QUERY_WRONG_THREAD; + } + context = context_acquire(device, NULL, 0); } - - context = context_acquire(device, query->context->current_rt.texture, - query->context->current_rt.sub_resource_idx); + gl_info = context->gl_info; if (gl_info->supported[ARB_SYNC]) { @@ -216,24 +219,21 @@ void wined3d_event_query_issue(struct wined3d_event_query *query, const struct w if (query->context) { - if (!query->context->gl_info->supported[ARB_SYNC] && query->context->tid != GetCurrentThreadId()) + if (!(context = context_reacquire(device, query->context)) + && !query->context->gl_info->supported[ARB_SYNC]) { context_free_event_query(query); context = context_acquire(device, NULL, 0); context_alloc_event_query(context, query); } - else - { - context = context_acquire(device, query->context->current_rt.texture, - query->context->current_rt.sub_resource_idx); - } + if (!context) + context = context_acquire(device, NULL, 0); } else { context = context_acquire(device, NULL, 0); context_alloc_event_query(context, query); } - gl_info = context->gl_info; if (gl_info->supported[ARB_SYNC]) @@ -378,15 +378,12 @@ static BOOL wined3d_occlusion_query_ops_poll(struct wined3d_query *query, DWORD TRACE("query %p, flags %#x.\n", query, flags); - if (oq->context->tid != GetCurrentThreadId()) + if (!(context = context_reacquire(device, oq->context))) { FIXME("%p Wrong thread, returning 1.\n", query); oq->samples = 1; return TRUE; } - - context = context_acquire(device, oq->context->current_rt.texture, - oq->context->current_rt.sub_resource_idx); gl_info = context->gl_info; GL_EXTCALL(glGetQueryObjectuiv(oq->id, GL_QUERY_RESULT_AVAILABLE, &available)); @@ -494,28 +491,24 @@ static void wined3d_occlusion_query_ops_issue(struct wined3d_query *query, DWORD { if (query->state == QUERY_BUILDING) { - if (oq->context->tid != GetCurrentThreadId()) + if ((context = context_reacquire(device, oq->context))) { - FIXME("Wrong thread, can't restart query.\n"); - - context_free_occlusion_query(oq); - context = context_acquire(query->device, NULL, 0); - context_alloc_occlusion_query(context, oq); + GL_EXTCALL(glEndQuery(GL_SAMPLES_PASSED)); + checkGLcall("glEndQuery()"); } else { - context = context_acquire(device, oq->context->current_rt.texture, - oq->context->current_rt.sub_resource_idx); - - GL_EXTCALL(glEndQuery(GL_SAMPLES_PASSED)); - checkGLcall("glEndQuery()"); + FIXME("Wrong thread, can't restart query.\n"); + context_free_occlusion_query(oq); + context = context_acquire(device, NULL, 0); + context_alloc_occlusion_query(context, oq); } } else { if (oq->context) context_free_occlusion_query(oq); - context = context_acquire(query->device, NULL, 0); + context = context_acquire(device, NULL, 0); context_alloc_occlusion_query(context, oq); } @@ -531,20 +524,17 @@ static void wined3d_occlusion_query_ops_issue(struct wined3d_query *query, DWORD * so avoid generating an error. */ if (query->state == QUERY_BUILDING) { - if (oq->context->tid != GetCurrentThreadId()) + if ((context = context_reacquire(device, oq->context))) { - FIXME("Wrong thread, can't end query.\n"); - } - else - { - context = context_acquire(device, oq->context->current_rt.texture, - oq->context->current_rt.sub_resource_idx); - GL_EXTCALL(glEndQuery(GL_SAMPLES_PASSED)); checkGLcall("glEndQuery()"); context_release(context); } + else + { + FIXME("Wrong thread, can't end query.\n"); + } } } } @@ -560,15 +550,12 @@ static BOOL wined3d_timestamp_query_ops_poll(struct wined3d_query *query, DWORD TRACE("query %p, flags %#x.\n", query, flags); - if (tq->context->tid != GetCurrentThreadId()) + if (!(context = context_reacquire(device, tq->context))) { FIXME("%p Wrong thread, returning 1.\n", query); tq->timestamp = 1; return TRUE; } - - context = context_acquire(device, tq->context->current_rt.texture, - tq->context->current_rt.sub_resource_idx); gl_info = context->gl_info; GL_EXTCALL(glGetQueryObjectuiv(tq->id, GL_QUERY_RESULT_AVAILABLE, &available)); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 82aecf7..c824e2b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1933,6 +1933,8 @@ void context_gl_resource_released(struct wined3d_device *device, GLuint name, BOOL rb_namespace) DECLSPEC_HIDDEN; void context_invalidate_compute_state(struct wined3d_context *context, DWORD state_id) DECLSPEC_HIDDEN; void context_invalidate_state(struct wined3d_context *context, DWORD state_id) DECLSPEC_HIDDEN; +struct wined3d_context *context_reacquire(const struct wined3d_device *device, + struct wined3d_context *context) DECLSPEC_HIDDEN; void context_release(struct wined3d_context *context) DECLSPEC_HIDDEN; void context_resource_released(const struct wined3d_device *device, struct wined3d_resource *resource, enum wined3d_resource_type type) DECLSPEC_HIDDEN;

1 0

Józef Kucia : wined3d: Simplify logic in wined3d_event_query_issue().
by Alexandre Julliard 05 Apr '17

05 Apr '17

Module: wine Branch: master Commit: 1d27b69f3219f3bd5ac9cf68dd0eebf0f0a86f7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d27b69f3219f3bd5ac9cf68d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 5 15:38:06 2017 +0200 wined3d: Simplify logic in wined3d_event_query_issue(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/query.c | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 1927e7e..685c5ce 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -214,27 +214,17 @@ enum wined3d_event_query_result wined3d_event_query_finish(const struct wined3d_ void wined3d_event_query_issue(struct wined3d_event_query *query, const struct wined3d_device *device) { + struct wined3d_context *context = NULL; const struct wined3d_gl_info *gl_info; - struct wined3d_context *context; - if (query->context) - { - if (!(context = context_reacquire(device, query->context)) - && !query->context->gl_info->supported[ARB_SYNC]) - { - context_free_event_query(query); - context = context_acquire(device, NULL, 0); - context_alloc_event_query(context, query); - } - if (!context) - context = context_acquire(device, NULL, 0); - } - else - { + if (query->context && !(context = context_reacquire(device, query->context)) + && !query->context->gl_info->supported[ARB_SYNC]) + context_free_event_query(query); + if (!context) context = context_acquire(device, NULL, 0); - context_alloc_event_query(context, query); - } gl_info = context->gl_info; + if (!query->context) + context_alloc_event_query(context, query); if (gl_info->supported[ARB_SYNC]) {

1 0

Jacek Caban : ws2_32: Added register_async helper.
by Alexandre Julliard 05 Apr '17

05 Apr '17

Module: wine Branch: master Commit: da4688ff4fb77a694cc4e21251fa8e57c07185b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da4688ff4fb77a694cc4e2125… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 5 13:37:01 2017 +0200 ws2_32: Added register_async helper. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 77 ++++++++++++++++++++-------------------------------- 1 file changed, 30 insertions(+), 47 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index d13fbf4..702d281 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -560,6 +560,29 @@ static struct ws2_async_io *alloc_async_io( DWORD size ) return HeapAlloc( GetProcessHeap(), 0, size ); } +typedef NTSTATUS async_callback_t( void *user, IO_STATUS_BLOCK *io, NTSTATUS status, void **apc, void **arg ); + +static NTSTATUS register_async( int type, HANDLE handle, async_callback_t callback, void *arg, HANDLE event, + PIO_APC_ROUTINE apc, void *apc_context, IO_STATUS_BLOCK *io ) +{ + NTSTATUS status; + + SERVER_START_REQ( register_async ) + { + req->type = type; + req->async.handle = wine_server_obj_handle( handle ); + req->async.callback = wine_server_client_ptr( callback ); + req->async.iosb = wine_server_client_ptr( io ); + req->async.arg = wine_server_client_ptr( arg ); + req->async.event = wine_server_obj_handle( event ); + req->async.cvalue = wine_server_client_ptr( apc ? 0 : apc_context ); + status = wine_server_call( req ); + } + SERVER_END_REQ; + + return status; +} + /****************************************************************/ /* ----------------------------------- internal data */ @@ -2500,17 +2523,8 @@ static NTSTATUS WS2_async_accept( void *user, IO_STATUS_BLOCK *iosb, if (!wsa->read) goto finish; - SERVER_START_REQ( register_async ) - { - req->type = ASYNC_TYPE_READ; - req->async.handle = wine_server_obj_handle( wsa->accept_socket ); - req->async.event = wine_server_obj_handle( wsa->user_overlapped->hEvent ); - req->async.callback = wine_server_client_ptr( WS2_async_accept_recv ); - req->async.iosb = wine_server_client_ptr( iosb ); - req->async.arg = wine_server_client_ptr( wsa ); - status = wine_server_call( req ); - } - SERVER_END_REQ; + status = register_async( ASYNC_TYPE_READ, wsa->accept_socket, WS2_async_accept_recv, wsa, + wsa->user_overlapped->hEvent, NULL, NULL, iosb); if (status != STATUS_PENDING) goto finish; @@ -2709,18 +2723,7 @@ static int WS2_register_async_shutdown( SOCKET s, int type ) wsa->hSocket = SOCKET2HANDLE(s); wsa->type = type; - SERVER_START_REQ( register_async ) - { - req->type = type; - req->async.handle = wine_server_obj_handle( wsa->hSocket ); - req->async.callback = wine_server_client_ptr( WS2_async_shutdown ); - req->async.iosb = wine_server_client_ptr( &wsa->iosb ); - req->async.arg = wine_server_client_ptr( wsa ); - req->async.cvalue = 0; - status = wine_server_call( req ); - } - SERVER_END_REQ; - + status = register_async( type, wsa->hSocket, WS2_async_shutdown, wsa, 0, NULL, NULL, &wsa->iosb ); if (status != STATUS_PENDING) { HeapFree( GetProcessHeap(), 0, wsa ); @@ -2869,18 +2872,8 @@ static BOOL WINAPI WS2_AcceptEx(SOCKET listener, SOCKET acceptor, PVOID dest, DW wsa->read->iovec[0].iov_len = wsa->data_len; } - SERVER_START_REQ( register_async ) - { - req->type = ASYNC_TYPE_READ; - req->async.handle = wine_server_obj_handle( SOCKET2HANDLE(listener) ); - req->async.event = wine_server_obj_handle( overlapped->hEvent ); - req->async.callback = wine_server_client_ptr( WS2_async_accept ); - req->async.iosb = wine_server_client_ptr( overlapped ); - req->async.arg = wine_server_client_ptr( wsa ); - req->async.cvalue = wsa->cvalue; - status = wine_server_call( req ); - } - SERVER_END_REQ; + status = register_async( ASYNC_TYPE_READ, SOCKET2HANDLE(listener), WS2_async_accept, wsa, + overlapped->hEvent, NULL, (void *)wsa->cvalue, (IO_STATUS_BLOCK *)overlapped ); if(status != STATUS_PENDING) { @@ -3143,18 +3136,8 @@ static BOOL WINAPI WS2_TransmitFile( SOCKET s, HANDLE h, DWORD file_bytes, DWORD wsa->offset.u.HighPart = overlapped->u.s.OffsetHigh; iosb->u.Status = STATUS_PENDING; iosb->Information = 0; - SERVER_START_REQ( register_async ) - { - req->type = ASYNC_TYPE_WRITE; - req->async.handle = wine_server_obj_handle( SOCKET2HANDLE(s) ); - req->async.event = wine_server_obj_handle( overlapped->hEvent ); - req->async.callback = wine_server_client_ptr( WS2_async_transmitfile ); - req->async.iosb = wine_server_client_ptr( iosb ); - req->async.arg = wine_server_client_ptr( wsa ); - status = wine_server_call( req ); - } - SERVER_END_REQ; - + status = register_async( ASYNC_TYPE_WRITE, SOCKET2HANDLE(s), WS2_async_transmitfile, wsa, + overlapped->hEvent, NULL, NULL, iosb ); if(status != STATUS_PENDING) HeapFree( GetProcessHeap(), 0, wsa ); release_sock_fd( s, fd ); WSASetLastError( NtStatusToWSAError(status) );

1 0