August 2013 - Wine-commits - list.winehq.org

Frédéric Delanoy : makefiles: Remove unused TOPOBJDIR variable.
by Alexandre Julliard 02 Aug '13

02 Aug '13

Module: docs Branch: master Commit: 051face58ec8ba9887ea9ce8b4e69cd0efa02daf URL: http://source.winehq.org/git/docs.git/?a=commit;h=051face58ec8ba9887ea9ce8b… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Jul 29 02:56:49 2013 +0200 makefiles: Remove unused TOPOBJDIR variable. --- Makefile.in | 1 - en/Makefile.in | 1 - fr/Makefile.in | 1 - 3 files changed, 0 insertions(+), 3 deletions(-) diff --git a/Makefile.in b/Makefile.in index 368d401..93168df 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,5 +1,4 @@ TOPSRCDIR = @top_srcdir@ -TOPOBJDIR = . SRCDIR = @srcdir@ VPATH = @srcdir@ diff --git a/en/Makefile.in b/en/Makefile.in index f4ad503..6d11868 100644 --- a/en/Makefile.in +++ b/en/Makefile.in @@ -1,5 +1,4 @@ TOPSRCDIR = @top_srcdir@ -TOPOBJDIR = .. SRCDIR = @srcdir@ VPATH = @srcdir@ diff --git a/fr/Makefile.in b/fr/Makefile.in index 08eb9ad..4269ab4 100644 --- a/fr/Makefile.in +++ b/fr/Makefile.in @@ -1,5 +1,4 @@ TOPSRCDIR = @top_srcdir@ -TOPOBJDIR = .. SRCDIR = @srcdir@ VPATH = @srcdir@

1 0

Frédéric Delanoy : winedev: Use correct casing for listitem tag.
by Alexandre Julliard 02 Aug '13

02 Aug '13

Module: docs Branch: master Commit: ae82519c5853f25402d70a77db56d8b438b579fb URL: http://source.winehq.org/git/docs.git/?a=commit;h=ae82519c5853f25402d70a77d… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Jul 22 23:19:38 2013 +0200 winedev: Use correct casing for listitem tag. --- en/winedev-documentation.sgml | 48 ++++++++++++++++++++-------------------- 1 files changed, 24 insertions(+), 24 deletions(-) diff --git a/en/winedev-documentation.sgml b/en/winedev-documentation.sgml index 9d04327..070308d 100644 --- a/en/winedev-documentation.sgml +++ b/en/winedev-documentation.sgml @@ -44,29 +44,29 @@ <itemizedlist> - <listItem><para> + <listitem><para> The <emphasis>Wine User Guide</emphasis>. This book contains information for end users on installing, configuring and running Wine. </para></listitem> - <listItem><para> + <listitem><para> The <emphasis>Wine Developer's Guide</emphasis>. This book contains information and guidelines for developers and contributors to the Wine project. </para></listitem> - <listItem><para> + <listitem><para> The <emphasis>Winelib User's Guide</emphasis>. This book contains information for developers using Winelib to port Win32 applications to Unix. </para></listitem> - <listItem><para> + <listitem><para> The <emphasis>Wine Packager's Guide</emphasis>. This book contains information for anyone who will be distributing Wine to end users in a prepackaged format. It is also the exception to the rule as it has intentionally been kept in text format. </para></listitem> - <listItem><para> + <listitem><para> The <emphasis>Wine FAQ</emphasis>. This book contains frequently asked questions about Wine with their answers. </para></listitem> @@ -102,21 +102,21 @@ API: <itemizedlist> - <listItem><para> + <listitem><para> To allow Wine developers to know what each function should do, should they need to update or fix it. </para></listitem> - <listItem><para> + <listitem><para> To allow Winelib users to understand the functions that are available to their applications. </para></listitem> - <listItem><para> + <listitem><para> To provide an alternative source of free documentation on the Win32 API. </para></listitem> - <listItem><para> + <listitem><para> To provide more accurate documentation where the existing documentation is accidentally or deliberately vague or misleading. </para></listitem> @@ -132,19 +132,19 @@ of a function include: <itemizedlist> - <listItem><para> + <listitem><para> The purpose of the function. </para></listitem> - <listItem><para> + <listitem><para> The parameters of the function and their purpose. </para></listitem> - <listItem><para> + <listitem><para> The return value of the function, in success as well as failure cases. </para></listitem> - <listItem><para> + <listitem><para> Additional notes such as interaction with other parts of the system, differences between Wine and Win32 implementations, errors in MSDN documentation, undocumented cases and bugs that Wine corrects or is compatible with. @@ -308,22 +308,22 @@ section names: <orderedlist> - <listItem><para> + <listitem><para> <command>NOTES</command>. Anything that needs to be noted about the function such as special cases and the effects of input arguments. </para></listitem> - <listItem><para> + <listitem><para> <command>BUGS</command>. Any bugs in the function that exist 'by design', i.e. those that will not be fixed or exist for compatibility with Windows. </para></listitem> - <listItem><para> + <listitem><para> <command>TODO</command>. Any unhandled cases or missing functionality in the Wine implementation of the function. </para></listitem> - <listItem><para> + <listitem><para> <command>FIXME</command>. Things that should be updated or addressed in the implementation of the function at some future date (perhaps dependent on other parts of Wine). Note that if this information is only relevant to Wine developers then it should probably @@ -627,31 +627,31 @@ <orderedlist> - <listItem><para> + <listitem><para> Go to <ulink url="http://www.sgmltools.org">http://www.sgmltools.org</ulink> </para></listitem> - <listItem><para> + <listitem><para> Download all of the sgmltools packages </para></listitem> - <listItem><para> + <listitem><para> Install them all and build them (<command>./configure; make; make install</command>) </para></listitem> - <listItem><para> + <listitem><para> Switch to your toplevel wine-docs directory </para></listitem> - <listItem><para> + <listitem><para> Run <command>./configure</command> </para></listitem> - <listItem><para> + <listitem><para> run <command>make html</command> </para></listitem> - <listItem><para> + <listitem><para> View <filename>en/wineusr-guide.html</filename>, <filename>en/winedev-guide.html</filename>, etc. in your favorite browser </para></listitem>

1 0

Frédéric Delanoy : winedev: Simplify/ tweak a number of URLs.
by Alexandre Julliard 02 Aug '13

02 Aug '13

Module: docs Branch: master Commit: 08b9db41c51a057ef87d642ad653691bb2c282c3 URL: http://source.winehq.org/git/docs.git/?a=commit;h=08b9db41c51a057ef87d642ad… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Jul 22 23:19:39 2013 +0200 winedev: Simplify/tweak a number of URLs. --- en/winedev-debugger.sgml | 5 ++--- en/winedev-documentation.sgml | 8 +++----- en/winedev-ole.sgml | 18 ++++++------------ en/winedev-otherdebug.sgml | 3 +-- 4 files changed, 12 insertions(+), 22 deletions(-) diff --git a/en/winedev-debugger.sgml b/en/winedev-debugger.sgml index c727985..0003f01 100644 --- a/en/winedev-debugger.sgml +++ b/en/winedev-debugger.sgml @@ -675,7 +675,7 @@ process tid prio (all id:s are in hex) <para> Also of considerable fame amongst disassemblers is <application>SoftIce</application> from NuMega. That software has since been - acquired by CompuWare (http://www.compuware.com/) and made part of + acquired by <ulink url="http://www.compuware.com/">CompuWare</ulink> and made part of their Windows driver development suite. Newer versions of SoftIce needs to run as a Windows Service and therefore won't currently work under Wine. @@ -1037,8 +1037,7 @@ winedbg myprog.exe <term> <application>XRAY</application>: <filename> - <ulink url="http://garbo.uwasa.fi/pub/pc/sysinfo/xray15.zip"> - http://garbo.uwasa.fi/pub/pc/sysinfo/xray15.zip</ulink> + <ulink url="http://garbo.uwasa.fi/pub/pc/sysinfo/xray15.zip"></ulink> </filename> </term> <listitem> diff --git a/en/winedev-documentation.sgml b/en/winedev-documentation.sgml index 070308d..9f30b87 100644 --- a/en/winedev-documentation.sgml +++ b/en/winedev-documentation.sgml @@ -628,7 +628,7 @@ <orderedlist> <listitem><para> - Go to <ulink url="http://www.sgmltools.org">http://www.sgmltools.org</ulink> + Go to <ulink url="http://www.sgmltools.org"></ulink> </para></listitem> <listitem><para> @@ -1067,8 +1067,7 @@ We won't cover all of these elements here (over 300 DocBook tags exist!), but we will cover the basics. To learn more about the other tags, check out the official - DocBook guide, at <ulink - url="http://docbook.org">http://docbook.org</ulink>. To + DocBook guide at <ulink url="http://docbook.org"></ulink>. To see how they are used in practice, download the SGML source for this manual (the Wine Developer's Guide) and browse through it, comparing it to the generated HTML (or @@ -1642,8 +1641,7 @@ <term><sgmltag class="starttag">ulink</sgmltag></term> <listitem> <para> - Hyperlink in URL form, e.g. <ulink - url="http://www.winehq.org">http://www.winehq.org</ulink>. + Hyperlink in URL form, e.g. <ulink url="http://www.winehq.org"></ulink>. </para> </listitem> </varlistentry> diff --git a/en/winedev-ole.sgml b/en/winedev-ole.sgml index 847f1b7..f1b2a27 100644 --- a/en/winedev-ole.sgml +++ b/en/winedev-ole.sgml @@ -1116,37 +1116,31 @@ static ICOM_VTABLE(IDirect3D) d3dvt = { <itemizedlist> <listitem><para> - <ulink url="http://www-csag.ucsd.edu/individual/achien/cs491-f97/projects/dcom-writeup.…"> - http://www-csag.ucsd.edu/individual/achien/cs491-f97/projects/dcom-writeup.…</ulink> + <ulink url="http://www-csag.ucsd.edu/individual/achien/cs491-f97/projects/dcom-writeup.…"></ulink> </para></listitem> <listitem><para> - <ulink url="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/com/htm/cm…"> - http://msdn.microsoft.com/library/default.asp?url=/library/en-us/com/htm/cm…</ulink> + <ulink url="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/com/htm/cm…"></ulink> </para></listitem> <listitem><para> - <ulink url="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/com/htm/cm…"> - http://msdn.microsoft.com/library/default.asp?url=/library/en-us/com/htm/cm…</ulink> + <ulink url="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/com/htm/cm…"></ulink> </para></listitem> <listitem><para> - <ulink url="http://www.microsoft.com/msj/0398/dcom.aspx"> - http://www.microsoft.com/msj/0398/dcom.aspx</ulink> + <ulink url="http://www.microsoft.com/msj/0398/dcom.aspx"></ulink> </para></listitem> <listitem><para> - <ulink url="http://www.microsoft.com/ntserver/techresources/appserv/COM/DCOM/4_Connecti…"> - http://www.microsoft.com/ntserver/techresources/appserv/COM/DCOM/4_Connecti…</ulink> + <ulink url="http://www.microsoft.com/ntserver/techresources/appserv/COM/DCOM/4_Connecti…"></ulink> </para></listitem> - <listitem><para><ulink url="http://www.idevresource.com/com/library/articles/comonlinux.asp"> - http://www.idevresource.com/com/library/articles/comonlinux.asp</ulink> + <listitem><para><ulink url="http://www.idevresource.com/com/library/articles/comonlinux.asp"></ulink> (unfortunately part 2 of this article does not seem to exist anymore, if it was ever written)</para></listitem> </itemizedlist> diff --git a/en/winedev-otherdebug.sgml b/en/winedev-otherdebug.sgml index 8b208d5..ee7cab0 100644 --- a/en/winedev-otherdebug.sgml +++ b/en/winedev-otherdebug.sgml @@ -337,8 +337,7 @@ less registry.c.gcov <para> For a further in depth description of gcov, the official gcc compiler suite page for gcov is <ulink - url="http://gcc.gnu.org/onlinedocs/gcc/Gcov.html"> - http://gcc.gnu.org/onlinedocs/gcc/Gcov.html</ulink>. + url="http://gcc.gnu.org/onlinedocs/gcc/Gcov.html"></ulink>. </para> </sect1>

1 0

Frédéric Delanoy : wineusr: Simplify/ tweak a number of URLs.
by Alexandre Julliard 02 Aug '13

02 Aug '13

Module: docs Branch: master Commit: f65cac12ddd94eda58ea36795a6ff9bd056ca7ef URL: http://source.winehq.org/git/docs.git/?a=commit;h=f65cac12ddd94eda58ea36795… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Jul 22 23:25:23 2013 +0200 wineusr: Simplify/tweak a number of URLs. --- en/wineusr-getting.sgml | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/en/wineusr-getting.sgml b/en/wineusr-getting.sgml index 8efcdfc..c3536a6 100644 --- a/en/wineusr-getting.sgml +++ b/en/wineusr-getting.sgml @@ -63,9 +63,8 @@ If you wish to try out the bleeding edge of Wine development, or would even like to help develop Wine yourself, you can download the very latest source code from our Git repository. Instructions for - downloading from the Wine Git repository are available at <ulink - url="http://www.winehq.org/site/git">http://www.winehq.org/site/git - </ulink>. + downloading from the Wine Git repository are available at <ulink + url="http://www.winehq.org/site/git"></ulink>. </para> <para> Please take note that the usual warnings for using a developmental

1 0

Alexandre Julliard : Wine release 1.7.0
by Alexandre Julliard 02 Aug '13

02 Aug '13

Module: website Branch: master Commit: 6d0cb7e55366eb3eabdb1beb38a02e74d98ca92e URL: http://source.winehq.org/git/website.git/?a=commit;h=6d0cb7e55366eb3eabdb1b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 2 20:17:35 2013 +0200 Wine release 1.7.0 --- news/en/2013080202.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/en/2013080202.xml b/news/en/2013080202.xml new file mode 100644 index 0000000..11954a5 --- /dev/null +++ b/news/en/2013080202.xml @@ -0,0 +1,17 @@ +<news> +<date>August 2, 2013</date> +<title>Wine 1.7.0 Released</title> +<body> + The Wine development release 1.7.0 is now available. + <a href="{$root}/announce/1.7.0">What's new</a> in this release: +<ul> + <li>Support for vertical text in the Postscript driver.</li> + <li>Version 2 of liblcms used now instead of version 1.</li> + <li>Unicode data updated to Unicode 6.2.0.</li> + <li>Hyperlink controls supported in installers.</li> + <li>Improved support for XML attributes.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.0.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : Release 1.7.0.
by Alexandre Julliard 02 Aug '13

02 Aug '13

Module: wine Branch: master Commit: 5b1e70ce97454c8b22ec3d55d2543968eef4cb2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b1e70ce97454c8b22ec3d55d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 2 20:09:56 2013 +0200 Release 1.7.0. --- ANNOUNCE | 789 ++++++++++++++++++++++++++++--------------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 377 insertions(+), 433 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5b1e70ce97454c8b22ec3…

1 0

Tag wine-1.7.0 : Alexandre Julliard : Release 1.7.0
by Alexandre Julliard 02 Aug '13

02 Aug '13

Module: wine Branch: refs/tags/wine-1.7.0 Tag: 60cebf0100535efb28d1579be6b0414d8a578f94 URL: http://source.winehq.org/git/wine.git/?a=tag;h=60cebf0100535efb28d1579be6b0… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 2 20:09:56 2013 +0200 Release 1.7.0

1 0

André Hentschel : update-winehq: Correctly parse stable release announcements.
by Alexandre Julliard 02 Aug '13

02 Aug '13

Module: tools Branch: master Commit: 32ed233321a3fda5261c83b4554caa43285166f8 URL: http://source.winehq.org/git/tools.git/?a=commit;h=32ed233321a3fda5261c83b4… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Jul 18 21:54:47 2013 +0200 update-winehq: Correctly parse stable release announcements. --- update-winehq | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/update-winehq b/update-winehq index 046a8b8..79e08c7 100755 --- a/update-winehq +++ b/update-winehq @@ -34,6 +34,7 @@ system("git", "pull") == 0 or die "git pull failed"; open ANNOUNCE, $ARGV[1] || "ANNOUNCE" or die "cannot open ANNOUNCE"; my $whats_new = 0; +my $release_notes = 0; my $first = 1; push @text, "<body>\n"; @@ -41,7 +42,7 @@ push @text, "<body>\n"; while (<ANNOUNCE>) { chomp; - if (!$whats_new) + if (!$whats_new && !$release_notes) { if (/^What's new in this release/) { @@ -49,6 +50,14 @@ while (<ANNOUNCE>) push @text, " <a href=\"{\$root}/announce/$rel\">What's new</a> in this release:"; next; } + elsif (/See the release notes/) + { + $release_notes = 1; + xml_escape($_); + s/See the release notes/See the <a href=\"{\$root}\/announce\/$rel\">release notes<\/a>/; + push @text, " " . $_; + next; + } if (/^\s*$/) { push @text, "\n"; @@ -68,8 +77,13 @@ while (<ANNOUNCE>) } if (/^\s*$/) { - push @text, "</li>\n</ul>\n"; + if ($release_notes) { + push @text, "\n"; + } else { + push @text, "</li>\n</ul>\n"; + } $whats_new = 0; + $release_notes = 0; next; } push @text, " " . xml_escape($_);

1 0

Frédéric Delanoy : wine_release: Install translated manpages on website.
by Alexandre Julliard 02 Aug '13

02 Aug '13

Module: tools Branch: master Commit: 89563ed316c9c12391a67fbb1737d13ff64f56f6 URL: http://source.winehq.org/git/tools.git/?a=commit;h=89563ed316c9c12391a67fbb… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Jul 31 23:41:37 2013 +0200 wine_release: Install translated manpages on website. --- wine_release | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-) diff --git a/wine_release b/wine_release index 32d245a..3e986bc 100755 --- a/wine_release +++ b/wine_release @@ -66,8 +66,15 @@ then manpages="\ loader/wine.man \ + loader/wine.de.man \ + loader/wine.fr.man \ + loader/wine.pl.man \ server/wineserver.man \ + server/wineserver.de.man \ + server/wineserver.fr.man \ tools/winemaker.man \ + tools/winemaker.de.man \ + tools/winemaker.fr.man \ tools/widl/widl.man \ tools/winebuild/winebuild.man \ tools/winedump/winedump.man \ @@ -79,7 +86,13 @@ then do name=`basename $f .man` make -s -C `dirname $f` $name.man - groff -man -T html -P -l -k -K utf8 $f | $tools_dir/html2template -o $name.template && mv -f $name.template $templates_dir/en/docs/$name.template + + lang=`echo $name | cut -d . -f 2` + if [ "$lang" = "$name" ] + then lang="en" + fi + + groff -man -T html -P -l -k -K utf8 $f | $tools_dir/html2template -o $name.template && mv -f $name.template $templates_dir/$lang/docs/`basename $name .$lang`.template done make -s htmlpages && rm -rf ../WineAPI && mv documentation/html ../WineAPI

1 0

Bruno Jesus : ws2_32/tests: Add and update WSASocketA() tests.
by Alexandre Julliard 02 Aug '13

02 Aug '13

Module: wine Branch: master Commit: ce0e3158b2e8ac9c2e946f700727ef79537ff972 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce0e3158b2e8ac9c2e946f700… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Aug 1 21:51:31 2013 -0300 ws2_32/tests: Add and update WSASocketA() tests. --- dlls/ws2_32/tests/sock.c | 58 +++++++++++++++++++++++++++++++++++++++------ include/winsock2.h | 6 ++++ 2 files changed, 56 insertions(+), 8 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 7e70449..5ce4959 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1701,6 +1701,22 @@ todo_wine ok(sock != INVALID_SOCKET, "WSASocketA should have succeeded\n"); closesocket(sock); + /* SOCK_STREAM does not support IPPROTO_UDP */ + SetLastError(0xdeadbeef); + ok(WSASocketA(AF_INET, SOCK_STREAM, IPPROTO_UDP, NULL, 0, 0) == INVALID_SOCKET, + "WSASocketA should have failed\n"); + err = WSAGetLastError(); +todo_wine + ok(err == WSAEPROTONOSUPPORT, "Expected 10043, received %d\n", err); + + /* SOCK_DGRAM does not support IPPROTO_TCP */ + SetLastError(0xdeadbeef); + ok(WSASocketA(AF_INET, SOCK_DGRAM, IPPROTO_TCP, NULL, 0, 0) == INVALID_SOCKET, + "WSASocketA should have failed\n"); + err = WSAGetLastError(); +todo_wine + ok(err == WSAEPROTONOSUPPORT, "Expected 10043, received %d\n", err); + /* Set pi_size explicitly to a value below 2*sizeof(WSAPROTOCOL_INFOA) * to avoid a crash on win98. */ @@ -1739,6 +1755,18 @@ todo_wine pi[0].iProtocol = IPPROTO_UDP; pi[0].iSocketType = SOCK_DGRAM; pi[0].iAddressFamily = AF_INET; + sock = WSASocketA(0, 0, 0, &pi[0], 0, 0); +todo_wine { + ok(sock != INVALID_SOCKET, "Failed to create socket: %d\n", + WSAGetLastError()); + size = sizeof(socktype); + socktype = 0xdead; + err = getsockopt(sock, SOL_SOCKET, SO_TYPE, (char *) &socktype, &size); + ok(!err,"getsockopt failed with %d\n", WSAGetLastError()); + ok(socktype == SOCK_DGRAM, "Wrong socket type, expected %d received %d\n", + SOCK_DGRAM, socktype); + closesocket(sock); +} sock = WSASocketA(AF_INET, SOCK_STREAM, IPPROTO_TCP, &pi[0], 0, 0); ok(sock != INVALID_SOCKET, "Failed to create socket: %d\n", WSAGetLastError()); @@ -1771,7 +1799,9 @@ todo_wine ok(items != SOCKET_ERROR, "WSAEnumProtocolsA failed, last error is %d\n", WSAGetLastError()); - /* when no protocol is specified the first socket type from WSAEnumProtocols is returned */ + /* when no protocol and socket type are specified the first entry + * from WSAEnumProtocols that has the flag PFL_MATCHES_PROTOCOL_ZERO + * is returned */ sock = WSASocketA(AF_INET, 0, 0, NULL, 0, 0); todo_wine ok(sock != INVALID_SOCKET, "Failed to create socket: %d\n", @@ -1782,12 +1812,21 @@ todo_wine { socktype = 0xdead; err = getsockopt(sock, SOL_SOCKET, SO_TYPE, (char *) &socktype, &size); ok(!err, "getsockopt failed with %d\n", WSAGetLastError()); - ok(socktype == pi[0].iSocketType, "Wrong socket type, expected %d received %d\n", - pi[0].iSocketType, socktype); + for(i = 0; i < items; i++) + { + if(pi[i].dwProviderFlags & PFL_MATCHES_PROTOCOL_ZERO) + { + ok(socktype == pi[i].iSocketType, "Wrong socket type, expected %d received %d\n", + pi[i].iSocketType, socktype); + break; + } + } + ok(i != items, "Creating a socket without protocol and socket type didn't work\n"); } closesocket(sock); - /* when the protocol is specified the first socket type that matches the protocol is returned */ + /* when no socket type is specified the first entry from WSAEnumProtocols + * that matches the protocol is returned */ for (i = 0; i < sizeof(autoprotocols) / sizeof(autoprotocols[0]); i++) { sock = WSASocketA(0, 0, autoprotocols[i], NULL, 0, 0); @@ -1801,18 +1840,21 @@ todo_wine todo_wine ok(!err, "getsockopt failed with %d\n", WSAGetLastError()); - for (j = 0; j < items; j++) + for (err = 1, j = 0; j < items; j++) { if (pi[j].iProtocol == autoprotocols[i]) { + if (socktype == pi[j].iSocketType) + err = 0; + else todo_wine - ok(socktype == pi[j].iSocketType, "Wrong socket type, expected %d received %d\n", - pi[j].iSocketType, socktype); + ok(0, "Wrong socket type, expected %d received %d\n", + pi[j].iSocketType, socktype); break; } } todo_wine - ok(socktype != 0xdead, "Protocol %d not found in WSAEnumProtocols\n", autoprotocols[i]); + ok(!err, "Protocol %d not found in WSAEnumProtocols\n", autoprotocols[i]); closesocket(sock); } diff --git a/include/winsock2.h b/include/winsock2.h index 3e060e5..7516d25 100644 --- a/include/winsock2.h +++ b/include/winsock2.h @@ -213,6 +213,12 @@ typedef struct _WSAPROTOCOLCHAIN DWORD ChainEntries[MAX_PROTOCOL_CHAIN]; /* a list of dwCatalogEntryIds */ } WSAPROTOCOLCHAIN, * LPWSAPROTOCOLCHAIN; +/* constants used in dwProviderFlags from struct WSAPROTOCOL_INFO */ +#define PFL_MULTIPLE_PROTO_ENTRIES 0x00000001 +#define PFL_RECOMMENDED_PROTO_ENTRY 0x00000002 +#define PFL_HIDDEN 0x00000004 +#define PFL_MATCHES_PROTOCOL_ZERO 0x00000008 + #define XP1_CONNECTIONLESS 0x00000001 #define XP1_GUARANTEED_DELIVERY 0x00000002 #define XP1_GUARANTEED_ORDER 0x00000004

1 0