Re: WSACleanup fix.

[Robert Shearman]

Rein Klazes wrote:
> --- wine/dlls/winsock/socket.c	2005-11-24 17:00:02.000000000 +0100
> +++ mywine/dlls/winsock/socket.c	2005-11-29 14:58:24.000000000 +0100
> @@ -830,8 +830,10 @@ int WINAPI WSAStartup(WORD wVersionReque
>  */
> INT WINAPI WSACleanup(void)
> {
> -    if (num_startup)
> +    if (num_startup) {
> +        num_startup = 0;
>         return 0;
> +    }
>     SetLastError(WSANOTINITIALISED);
>     return SOCKET_ERROR;
> }

Hi,

I don't think the patch is quite correct. Attached is a patch that has 
been sitting in my tree for a while.

-- 
Rob Shearman

WSACleanup fix.

[Rein Klazes]

On Tue, 29 Nov 2005 10:33:49 -0600, you wrote:
> if (num_startup)
> +    {
> +        num_startup--;
>         return 0;
> +    }

Yes, that is more correct. Re-reading the MSDN this is what should be
happening.

Changelog:
dlls/winsock		: socket.c
dlls/winsock/tests	: sock.c
(With input from Robert Shearman) Decrement the reference counter in
WSACleanUp with regression test.

Rein.

WSACleanup fix.

[Vitaliy Margolen]

Tuesday, November 29, 2005, 12:10:52 PM, Rein Klazes wrote:
> On Tue, 29 Nov 2005 10:33:49 -0600, you wrote:
> > if (num_startup)
> > +    {
> > +        num_startup--;
> >         return 0;
> > +    }
> Yes, that is more correct. Re-reading the MSDN this is what should be
> happening.
> Changelog:
> dlls/winsock		: socket.c
> dlls/winsock/tests	: sock.c
> (With input from Robert Shearman) Decrement the reference counter in
> WSACleanUp with regression test.
> Rein.

I think you a little too late. <g> Check the CVS log.

Vitaliy

WSACleanup fix.

[Robert Shearman]

Rein Klazes wrote:
> On Tue, 29 Nov 2005 10:33:49 -0600, you wrote:
> > if (num_startup)
> > +    {
> > +        num_startup--;
> >        return 0;
> > +    }
>
> Yes, that is more correct. Re-reading the MSDN this is what should be
> happening.
>
> Changelog:
> dlls/winsock		: socket.c
> dlls/winsock/tests	: sock.c
> (With input from Robert Shearman) Decrement the reference counter in
> WSACleanUp with regression test.

Alexandre already committed a corrected version of your patch.

-- 
Rob Shearman