November 2017 - Wine-Commits

Marcus Meissner : ws2_32/tests: Avoid crashes on flaky/ non-present network.
by Alexandre Julliard Nov. 13, 2017

Nov. 13, 2017

Module: wine Branch: master Commit: 0e18800f3955718dbf47a162810495e7ad4f477b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e18800f3955718dbf47a1628… Author: Marcus Meissner <meissner(a)suse.de> Date: Sun Nov 12 20:50:45 2017 +0100 ws2_32/tests: Avoid crashes on flaky/non-present network. Signed-off-by: Marcus Meissner <meissner(a)suse.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 179ace4..4cbc1e9 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -7657,10 +7657,13 @@ static void test_GetAddrInfoExW(void) ok(overlapped.Internal == ERROR_SUCCESS, "overlapped.Internal = %lx\n", overlapped.Internal); ok(overlapped.Pointer == &result, "overlapped.Pointer != &result\n"); ok(result != NULL, "result == NULL\n"); - ok(!result->ai_blob, "ai_blob != NULL\n"); - ok(!result->ai_bloblen, "ai_bloblen != 0\n"); - ok(!result->ai_provider, "ai_provider = %s\n", wine_dbgstr_guid(result->ai_provider)); - pFreeAddrInfoExW(result); + if (result != NULL) + { + ok(!result->ai_blob, "ai_blob != NULL\n"); + ok(!result->ai_bloblen, "ai_bloblen != 0\n"); + ok(!result->ai_provider, "ai_provider = %s\n", wine_dbgstr_guid(result->ai_provider)); + pFreeAddrInfoExW(result); + } result = (void*)0xdeadbeef; memset(&overlapped, 0xcc, sizeof(overlapped));

1 0

Jeremy Newman : Revert "remove wine patches list from forums page"
by Jeremy Newman Nov. 13, 2017

Nov. 13, 2017

Module: website Branch: master Commit: 27872268f722394cf18d83538ef70f3920dd7477 URL: http://source.winehq.org/git/website.git/?a=commit;h=27872268f722394cf18d83… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon Nov 13 09:53:17 2017 -0600 Revert "remove wine patches list from forums page" This reverts commit c7c702733f607203d34c67ab58deb9e54f199353. --- templates/en/forums.template | 9 +++++++++ templates/fr/forums.template | 9 +++++++++ templates/pl/forums.template | 8 ++++++++ templates/pt/forums.template | 8 ++++++++ templates/tr/forums.template | 9 +++++++++ templates/zh-cn/forums.template | 9 +++++++++ 6 files changed, 52 insertions(+) diff --git a/templates/en/forums.template b/templates/en/forums.template index cb211d7..f21dad4 100644 --- a/templates/en/forums.template +++ b/templates/en/forums.template @@ -71,6 +71,15 @@ mailing list software. </li> <li> + [<a href="//www.winehq.org/mailman/listinfo/wine-patches">(Un-)Subscribe</a>] + [<a href="//www.winehq.org/pipermail/wine-patches/">Archive 1</a>] + [<a href="http://news.gmane.org/gmane.comp.emulators.wine.patches">Archive 2</a>] + [<a href="news://news.gmane.org/gmane.comp.emulators.wine.patches">via newsreader</a>] + <a href="mailto:wine-patches(a)winehq.org">wine-patches(a)winehq.org</a> + A medium traffic (45/day) open list for submitting patches only. + </li> + + <li> [<a href="//www.winehq.org/mailman/listinfo/wine-cvs">(Un-)Subscribe</a>] [<a href="//www.winehq.org/pipermail/wine-cvs/">Archive 1</a>] [<a href="http://news.gmane.org/gmane.comp.emulators.wine.cvs">Archive 2</a>] diff --git a/templates/fr/forums.template b/templates/fr/forums.template index fcd87b6..e82b6c6 100644 --- a/templates/fr/forums.template +++ b/templates/fr/forums.template @@ -54,6 +54,15 @@ le mot de passe obtenu lors de l'inscription, ou employez simplement <a href="// </li> <li> + [<a href="//www.winehq.org/mailman/listinfo/wine-patches">(Dés-)inscription</a>] + [<a href="//www.winehq.org/pipermail/wine-patches/">Archive 1</a>] + [<a href="http://news.gmane.org/gmane.comp.emulators.wine.patches">Archive 2</a>] + [<a href="news://news.gmane.org/gmane.comp.emulators.wine.patches">via un lecteur de nouvelles</a>] + <a href="mailto:wine-patches(a)winehq.org">wine-patches(a)winehq.org</a> + Une liste moyen trafic (45 messages par jour) destinée uniquement à l'envoi de patchs. + </li> + + <li> [<a href="//www.winehq.org/mailman/listinfo/wine-cvs">(Dés-)inscription</a>] [<a href="//www.winehq.org/pipermail/wine-cvs/">Archive 1</a>] [<a href="http://news.gmane.org/gmane.comp.emulators.wine.cvs">Archive 2</a>] diff --git a/templates/pl/forums.template b/templates/pl/forums.template index 0f019d2..e260341 100644 --- a/templates/pl/forums.template +++ b/templates/pl/forums.template @@ -60,6 +60,14 @@ oprogramowanie listy mailingowej. WineHQ, łatek lub czegokolwiek innego leżącego w zakresie interesu programistów Wine. <li> + [<a href="//www.winehq.org/mailman/listinfo/wine-patches">(Wy-/Za-)pisz</a>] + [<a href="//www.winehq.org/pipermail/wine-patches/">Archiwum 1</a>] + [<a href="http://news.gmane.org/gmane.comp.emulators.wine.patches">Archiwum 2</a>] + [<a href="news://news.gmane.org/gmane.comp.emulators.wine.patches">przez czytnik aktualności</a>] + <a href="mailto:wine-patches(a)winehq.org">wine-patches(a)winehq.org</a> + Średni ruch (45/dziennie) otwarta lista przeznaczona wyłącznie do wysyłania łatek. + + <li> [<a href="//www.winehq.org/mailman/listinfo/wine-cvs">(Wy-/Za-)pisz</a>] [<a href="//www.winehq.org/pipermail/wine-cvs/">Archiwum 1</a>] [<a href="http://news.gmane.org/gmane.comp.emulators.wine.cvs">Archiwum 2</a>] diff --git a/templates/pt/forums.template b/templates/pt/forums.template index 83bf596..f109f50 100644 --- a/templates/pt/forums.template +++ b/templates/pt/forums.template @@ -62,6 +62,14 @@ do contrário o seu email será tratado como um possível spam pelo software da WineHQ, patches e qualquer outra coisa de interesse a desenvolvedores do Wine. <li> + [<a href="//www.winehq.org/mailman/listinfo/wine-patches">(Des-)Inscrever</a>] + [<a href="//www.winehq.org/pipermail/wine-patches/">Arquivo 1</a>] + [<a href="http://news.gmane.org/gmane.comp.emulators.wine.patches">Arquivo 2</a>] + [<a href="news://news.gmane.org/gmane.comp.emulators.wine.patches">via newsreader</a>] + <a href="mailto:wine-patches(a)winehq.org">wine-patches(a)winehq.org</a> + Uma lista aberta de tráfego médio (45/dia) para submeter patches apenas. + + <li> [<a href="//www.winehq.org/mailman/listinfo/wine-cvs">(Des-)Inscrever</a>] [<a href="//www.winehq.org/pipermail/wine-cvs/">Arquivo 1</a>] [<a href="http://news.gmane.org/gmane.comp.emulators.wine.cvs">Arquivo 2</a>] diff --git a/templates/tr/forums.template b/templates/tr/forums.template index 7a917c7..dcee48c 100644 --- a/templates/tr/forums.template +++ b/templates/tr/forums.template @@ -54,6 +54,15 @@ WWW</a> veya listeadı-request(a)winehq.org adresine konu satırı "subscri </li> <li> + [<a href="//www.winehq.org/mailman/listinfo/wine-patches">Abone ol/iptal et</a>] + [<a href="//www.winehq.org/pipermail/wine-patches/">Arşiv 1</a>] + [<a href="http://news.gmane.org/gmane.comp.emulators.wine.patches">Arşiv 2</a>] + [<a href="news://news.gmane.org/gmane.comp.emulators.wine.patches">haber okuyucu ile</a>] + <a href="mailto:wine-patches(a)winehq.org">wine-patches(a)winehq.org</a> + Sadece yamaları göndermek için kullanılan orta trafikli (45/gün) bir liste + </li> + + <li> [<a href="//www.winehq.org/mailman/listinfo/wine-cvs">Abone ol/iptal et</a>] [<a href="//www.winehq.org/pipermail/wine-cvs/">Arşiv 1</a>] [<a href="http://news.gmane.org/gmane.comp.emulators.wine.cvs">Arşiv 2</a>] diff --git a/templates/zh-cn/forums.template b/templates/zh-cn/forums.template index f7e9140..a50ba3b 100644 --- a/templates/zh-cn/forums.template +++ b/templates/zh-cn/forums.template @@ -61,6 +61,15 @@ WWW</a>，或者发送一封标题为“subscribe”的邮件到 指定列表 </li> <li> + [<a href="//www.winehq.org/mailman/listinfo/wine-patches">（取消）订阅</a>] + [<a href="//www.winehq.org/pipermail/wine-patches/">存档 1</a>] + [<a href="http://news.gmane.org/gmane.comp.emulators.wine.patches">存档 2</a>] + [<a href="news://news.gmane.org/gmane.comp.emulators.wine.patches">via newsreader</a>] + <a href="mailto:wine-patches(a)winehq.org">wine-patches(a)winehq.org</a> + 一个中等流量（45封/天）的开放性列表，只用于提交 patches。 + </li> + + <li> [<a href="//www.winehq.org/mailman/listinfo/wine-cvs">（取消）订阅</a>] [<a href="//www.winehq.org/pipermail/wine-cvs/">存档 1</a>] [<a href="http://news.gmane.org/gmane.comp.emulators.wine.cvs">存档 2</a>]

1 0

Jeremy Newman : remove wine patches list from forums page
by Jeremy Newman Nov. 13, 2017

Nov. 13, 2017

Module: website Branch: master Commit: c7c702733f607203d34c67ab58deb9e54f199353 URL: http://source.winehq.org/git/website.git/?a=commit;h=c7c702733f607203d34c67… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon Nov 13 09:01:01 2017 -0600 remove wine patches list from forums page --- templates/en/forums.template | 9 --------- templates/fr/forums.template | 9 --------- templates/pl/forums.template | 8 -------- templates/pt/forums.template | 8 -------- templates/tr/forums.template | 9 --------- templates/zh-cn/forums.template | 9 --------- 6 files changed, 52 deletions(-) diff --git a/templates/en/forums.template b/templates/en/forums.template index f21dad4..cb211d7 100644 --- a/templates/en/forums.template +++ b/templates/en/forums.template @@ -71,15 +71,6 @@ mailing list software. </li> <li> - [<a href="//www.winehq.org/mailman/listinfo/wine-patches">(Un-)Subscribe</a>] - [<a href="//www.winehq.org/pipermail/wine-patches/">Archive 1</a>] - [<a href="http://news.gmane.org/gmane.comp.emulators.wine.patches">Archive 2</a>] - [<a href="news://news.gmane.org/gmane.comp.emulators.wine.patches">via newsreader</a>] - <a href="mailto:wine-patches(a)winehq.org">wine-patches(a)winehq.org</a> - A medium traffic (45/day) open list for submitting patches only. - </li> - - <li> [<a href="//www.winehq.org/mailman/listinfo/wine-cvs">(Un-)Subscribe</a>] [<a href="//www.winehq.org/pipermail/wine-cvs/">Archive 1</a>] [<a href="http://news.gmane.org/gmane.comp.emulators.wine.cvs">Archive 2</a>] diff --git a/templates/fr/forums.template b/templates/fr/forums.template index e82b6c6..fcd87b6 100644 --- a/templates/fr/forums.template +++ b/templates/fr/forums.template @@ -54,15 +54,6 @@ le mot de passe obtenu lors de l'inscription, ou employez simplement <a href="// </li> <li> - [<a href="//www.winehq.org/mailman/listinfo/wine-patches">(Dés-)inscription</a>] - [<a href="//www.winehq.org/pipermail/wine-patches/">Archive 1</a>] - [<a href="http://news.gmane.org/gmane.comp.emulators.wine.patches">Archive 2</a>] - [<a href="news://news.gmane.org/gmane.comp.emulators.wine.patches">via un lecteur de nouvelles</a>] - <a href="mailto:wine-patches(a)winehq.org">wine-patches(a)winehq.org</a> - Une liste moyen trafic (45 messages par jour) destinée uniquement à l'envoi de patchs. - </li> - - <li> [<a href="//www.winehq.org/mailman/listinfo/wine-cvs">(Dés-)inscription</a>] [<a href="//www.winehq.org/pipermail/wine-cvs/">Archive 1</a>] [<a href="http://news.gmane.org/gmane.comp.emulators.wine.cvs">Archive 2</a>] diff --git a/templates/pl/forums.template b/templates/pl/forums.template index e260341..0f019d2 100644 --- a/templates/pl/forums.template +++ b/templates/pl/forums.template @@ -60,14 +60,6 @@ oprogramowanie listy mailingowej. WineHQ, łatek lub czegokolwiek innego leżącego w zakresie interesu programistów Wine. <li> - [<a href="//www.winehq.org/mailman/listinfo/wine-patches">(Wy-/Za-)pisz</a>] - [<a href="//www.winehq.org/pipermail/wine-patches/">Archiwum 1</a>] - [<a href="http://news.gmane.org/gmane.comp.emulators.wine.patches">Archiwum 2</a>] - [<a href="news://news.gmane.org/gmane.comp.emulators.wine.patches">przez czytnik aktualności</a>] - <a href="mailto:wine-patches(a)winehq.org">wine-patches(a)winehq.org</a> - Średni ruch (45/dziennie) otwarta lista przeznaczona wyłącznie do wysyłania łatek. - - <li> [<a href="//www.winehq.org/mailman/listinfo/wine-cvs">(Wy-/Za-)pisz</a>] [<a href="//www.winehq.org/pipermail/wine-cvs/">Archiwum 1</a>] [<a href="http://news.gmane.org/gmane.comp.emulators.wine.cvs">Archiwum 2</a>] diff --git a/templates/pt/forums.template b/templates/pt/forums.template index f109f50..83bf596 100644 --- a/templates/pt/forums.template +++ b/templates/pt/forums.template @@ -62,14 +62,6 @@ do contrário o seu email será tratado como um possível spam pelo software da WineHQ, patches e qualquer outra coisa de interesse a desenvolvedores do Wine. <li> - [<a href="//www.winehq.org/mailman/listinfo/wine-patches">(Des-)Inscrever</a>] - [<a href="//www.winehq.org/pipermail/wine-patches/">Arquivo 1</a>] - [<a href="http://news.gmane.org/gmane.comp.emulators.wine.patches">Arquivo 2</a>] - [<a href="news://news.gmane.org/gmane.comp.emulators.wine.patches">via newsreader</a>] - <a href="mailto:wine-patches(a)winehq.org">wine-patches(a)winehq.org</a> - Uma lista aberta de tráfego médio (45/dia) para submeter patches apenas. - - <li> [<a href="//www.winehq.org/mailman/listinfo/wine-cvs">(Des-)Inscrever</a>] [<a href="//www.winehq.org/pipermail/wine-cvs/">Arquivo 1</a>] [<a href="http://news.gmane.org/gmane.comp.emulators.wine.cvs">Arquivo 2</a>] diff --git a/templates/tr/forums.template b/templates/tr/forums.template index dcee48c..7a917c7 100644 --- a/templates/tr/forums.template +++ b/templates/tr/forums.template @@ -54,15 +54,6 @@ WWW</a> veya listeadı-request(a)winehq.org adresine konu satırı "subscri </li> <li> - [<a href="//www.winehq.org/mailman/listinfo/wine-patches">Abone ol/iptal et</a>] - [<a href="//www.winehq.org/pipermail/wine-patches/">Arşiv 1</a>] - [<a href="http://news.gmane.org/gmane.comp.emulators.wine.patches">Arşiv 2</a>] - [<a href="news://news.gmane.org/gmane.comp.emulators.wine.patches">haber okuyucu ile</a>] - <a href="mailto:wine-patches(a)winehq.org">wine-patches(a)winehq.org</a> - Sadece yamaları göndermek için kullanılan orta trafikli (45/gün) bir liste - </li> - - <li> [<a href="//www.winehq.org/mailman/listinfo/wine-cvs">Abone ol/iptal et</a>] [<a href="//www.winehq.org/pipermail/wine-cvs/">Arşiv 1</a>] [<a href="http://news.gmane.org/gmane.comp.emulators.wine.cvs">Arşiv 2</a>] diff --git a/templates/zh-cn/forums.template b/templates/zh-cn/forums.template index a50ba3b..f7e9140 100644 --- a/templates/zh-cn/forums.template +++ b/templates/zh-cn/forums.template @@ -61,15 +61,6 @@ WWW</a>，或者发送一封标题为“subscribe”的邮件到 指定列表 </li> <li> - [<a href="//www.winehq.org/mailman/listinfo/wine-patches">（取消）订阅</a>] - [<a href="//www.winehq.org/pipermail/wine-patches/">存档 1</a>] - [<a href="http://news.gmane.org/gmane.comp.emulators.wine.patches">存档 2</a>] - [<a href="news://news.gmane.org/gmane.comp.emulators.wine.patches">via newsreader</a>] - <a href="mailto:wine-patches(a)winehq.org">wine-patches(a)winehq.org</a> - 一个中等流量（45封/天）的开放性列表，只用于提交 patches。 - </li> - - <li> [<a href="//www.winehq.org/mailman/listinfo/wine-cvs">（取消）订阅</a>] [<a href="//www.winehq.org/pipermail/wine-cvs/">存档 1</a>] [<a href="http://news.gmane.org/gmane.comp.emulators.wine.cvs">存档 2</a>]

1 0

Jeremy Newman : Merge branch 'master' of winehq.org:/home/winehq/opt/ source/git/website
by Jeremy Newman Nov. 13, 2017

Nov. 13, 2017

Module: website Branch: master Commit: 395b9509ba916948dd1342cff40eb5ceb96098d9 URL: http://source.winehq.org/git/website.git/?a=commit;h=395b9509ba916948dd1342… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon Nov 13 09:01:25 2017 -0600 Merge branch 'master' of winehq.org:/home/winehq/opt/source/git/website ---

1 0

Alexandre Julliard : Wine release 2.21
by Alexandre Julliard Nov. 11, 2017

Nov. 11, 2017

Module: website Branch: master Commit: de12b434237d5226dc9724cadc42f08f1ee4c42a URL: http://source.winehq.org/git/website.git/?a=commit;h=de12b434237d5226dc9724… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 11 10:30:07 2017 +0100 Wine release 2.21 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2017111101.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/news/en/2017111101.xml b/news/en/2017111101.xml new file mode 100644 index 0000000..5185a95 --- /dev/null +++ b/news/en/2017111101.xml @@ -0,0 +1,18 @@ +<news> +<date>November 11, 2017</date> +<title>Wine 2.21 Released</title> +<body> + The Wine development release 2.21 is now available. + <a href="{$root}/announce/2.21">What's new</a> in this release: +<ul> + <li>Still more metafile support in GdiPlus.</li> + <li>Indirect draws support in Direct 3D.</li> + <li>Calling convention fixes on ARM.</li> + <li>Improved serial port detection on Linux.</li> + <li>Services fixes on WoW64.</li> + <li>Better DPI scaling in the Shell Explorer.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/2.x/wine-2.21.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : Release 2.21.
by Alexandre Julliard Nov. 11, 2017

Nov. 11, 2017

Module: wine Branch: master Commit: 53290d2ec483006656987352d53842ffc1852c91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53290d2ec483006656987352d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 11 10:27:31 2017 +0100 Release 2.21. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 522 ++++++++++++++++++++++++++++++++------------------------------ AUTHORS | 3 + VERSION | 2 +- configure | 18 +-- 4 files changed, 283 insertions(+), 262 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=53290d2ec483006656987…

1 0

Tag wine-2.21 : Alexandre Julliard : Release 2.21
by Alexandre Julliard Nov. 11, 2017

Nov. 11, 2017

Module: wine Branch: refs/tags/wine-2.21 Tag: 789cc923c7236d3365295dcb28d062235a832cd8 URL: http://source.winehq.org/git/wine.git/?a=tag;h=789cc923c7236d3365295dcb28d0… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 11 10:27:31 2017 +0100 Release 2.21

1 0

Paul Gofman : d3dx9: Zero constantinfo_reserved on error in get_constants_desc().
by Alexandre Julliard Nov. 10, 2017

Nov. 10, 2017

Module: wine Branch: master Commit: dc9607978451689d99c023add3a069d25b6eb038 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc9607978451689d99c023add… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Nov 10 10:33:30 2017 +0300 d3dx9: Zero constantinfo_reserved on error in get_constants_desc(). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/preshader.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index e3e91c6..78e4868 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -539,6 +539,8 @@ static HRESULT get_ctab_constant_desc(ID3DXConstantTable *ctab, D3DXHANDLE hc, D if (!constant) { FIXME("Could not get constant desc.\n"); + if (constantinfo_reserved) + *constantinfo_reserved = 0; return D3DERR_INVALIDCALL; } *desc = constant->desc;

1 0

Alex Henrie : d3dx9/tests: Use a helper function to set matrix values in math tests.
by Alexandre Julliard Nov. 10, 2017

Nov. 10, 2017

Module: wine Branch: master Commit: eaf9a28741284f6314517c63dc3101292b743477 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eaf9a28741284f6314517c63d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Nov 10 20:56:42 2017 +0100 d3dx9/tests: Use a helper function to set matrix values in math tests. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/math.c | 363 +++++++++++++++++++++++++-------------------- 1 file changed, 205 insertions(+), 158 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=eaf9a28741284f6314517…

1 0

Andrey Gusev : d3dx11: Fix D3DX11CompileFromMemory spec entry.
by Alexandre Julliard Nov. 10, 2017

Nov. 10, 2017

Module: wine Branch: master Commit: 26b57fae39f81f49f9c791324b4d620d75d2826d URL: http://source.winehq.org/git/wine.git/?a=commit;h=26b57fae39f81f49f9c791324… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Nov 10 17:46:13 2017 +0200 d3dx11: Fix D3DX11CompileFromMemory spec entry. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx11_42/d3dx11_42.spec | 2 +- dlls/d3dx11_43/d3dx11_43.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx11_42/d3dx11_42.spec b/dlls/d3dx11_42/d3dx11_42.spec index 12d4429..eaec2fc 100644 --- a/dlls/d3dx11_42/d3dx11_42.spec +++ b/dlls/d3dx11_42/d3dx11_42.spec @@ -1,7 +1,7 @@ @ stdcall D3DX11CheckVersion(long long) @ stdcall D3DX11CompileFromFileA(str ptr ptr str str long long ptr ptr ptr ptr) @ stdcall D3DX11CompileFromFileW(wstr ptr ptr str str long long ptr ptr ptr ptr) -@ stdcall D3DX11CompileFromMemory(str long str ptr ptr str str long long ptr ptr ptr ptr) +@ stdcall D3DX11CompileFromMemory(ptr long str ptr ptr str str long long ptr ptr ptr ptr) @ stub D3DX11CompileFromResourceA @ stub D3DX11CompileFromResourceW @ stub D3DX11ComputeNormalMap diff --git a/dlls/d3dx11_43/d3dx11_43.spec b/dlls/d3dx11_43/d3dx11_43.spec index a4e85af..1cafaa6 100644 --- a/dlls/d3dx11_43/d3dx11_43.spec +++ b/dlls/d3dx11_43/d3dx11_43.spec @@ -1,7 +1,7 @@ @ stdcall D3DX11CheckVersion(long long) @ stdcall D3DX11CompileFromFileA(str ptr ptr str str long long ptr ptr ptr ptr) @ stdcall D3DX11CompileFromFileW(wstr ptr ptr str str long long ptr ptr ptr ptr) -@ stdcall D3DX11CompileFromMemory(str long str ptr ptr str str long long ptr ptr ptr ptr) +@ stdcall D3DX11CompileFromMemory(ptr long str ptr ptr str str long long ptr ptr ptr ptr) @ stub D3DX11CompileFromResourceA @ stub D3DX11CompileFromResourceW @ stub D3DX11ComputeNormalMap

1 0