Re: ws2_32: Implement get socket option SO_PROTOCOL_INFO (try 2)

[Alexandre Julliard]

Bruno Jesus  writes:
> try 2:
> Narrow the loop for the specified protocol
> Add a new test for invalid sockets

Considering what WSAEnumProtocols does, the loop doesn't seem necessary
at all.

ws2_32: Implement get socket option SO_PROTOCOL_INFO (try 2)

[Bruno Jesus]

On Tue, Sep 3, 2013 at 3:04 PM, Alexandre Julliard  wrote:
> Bruno Jesus  writes:
> > try 2:
> > Narrow the loop for the specified protocol
> > Add a new test for invalid sockets
>
> Considering what WSAEnumProtocols does, the loop doesn't seem necessary
> at all.

It will when WSAEnumProtocols return AF_INET6 data =)
> --
> Alexandre Julliard
> [e-mail]

Bruno

ws2_32: Implement get socket option SO_PROTOCOL_INFO (try 2)

[Bruno Jesus]

On Tue, Sep 3, 2013 at 3:16 PM, Bruno Jesus  wrote:
> On Tue, Sep 3, 2013 at 3:04 PM, Alexandre Julliard  wrote:
> > Bruno Jesus  writes:
> > > try 2:
> > > Narrow the loop for the specified protocol
> > > Add a new test for invalid sockets
> >
> > Considering what WSAEnumProtocols does, the loop doesn't seem necessary
> > at all.
>
> It will when WSAEnumProtocols return AF_INET6 data =)

Will you find more reasonable to "unstatic"
WINSOCK_EnterSingleProtocolW from protocol.c, add a family parameter
to it and use it inside socket.c ?

http://source.winehq.org/source/dlls/ws2_32/protocol.c#L85
> > --
> > Alexandre Julliard
> > [e-mail]

Bruno

ws2_32: Implement get socket option SO_PROTOCOL_INFO (try 2)

[Alexandre Julliard]

Bruno Jesus  writes:
> On Tue, Sep 3, 2013 at 3:16 PM, Bruno Jesus  wrote:
> > On Tue, Sep 3, 2013 at 3:04 PM, Alexandre Julliard  wrote:
> > > Bruno Jesus  writes:
> > > > try 2:
> > > > Narrow the loop for the specified protocol
> > > > Add a new test for invalid sockets
> > >
> > > Considering what WSAEnumProtocols does, the loop doesn't seem necessary
> > > at all.
> >
> > It will when WSAEnumProtocols return AF_INET6 data =)
>
> Will you find more reasonable to "unstatic"
> WINSOCK_EnterSingleProtocolW from protocol.c, add a family parameter
> to it and use it inside socket.c ?

Yes, though moving it all to socket.c is probably cleaner. We don't need
a separate file for just that one API.

ws2_32: Implement get socket option SO_PROTOCOL_INFO (try 2)

[Bruno Jesus]

On Tue, Sep 3, 2013 at 3:34 PM, Alexandre Julliard  wrote:
> Bruno Jesus  writes:
> > On Tue, Sep 3, 2013 at 3:16 PM, Bruno Jesus  wrote:
> > > On Tue, Sep 3, 2013 at 3:04 PM, Alexandre Julliard  wrote:
> > > > Bruno Jesus  writes:
> > > > > try 2:
> > > > > Narrow the loop for the specified protocol
> > > > > Add a new test for invalid sockets
> > > >
> > > > Considering what WSAEnumProtocols does, the loop doesn't seem necessary
> > > > at all.
> > >
> > > It will when WSAEnumProtocols return AF_INET6 data =)
> >
> > Will you find more reasonable to "unstatic"
> > WINSOCK_EnterSingleProtocolW from protocol.c, add a family parameter
> > to it and use it inside socket.c ?
>
> Yes, though moving it all to socket.c is probably cleaner. We don't need
> a separate file for just that one API.

You mean removing protocol.c and adding all content to socket.c? If
yes I would appreciate if you could do that because I don't have the
git skills and wouldn't now how to sort the functions inside socket.c.
> --
> Alexandre Julliard
> [e-mail]

ws2_32: Implement get socket option SO_PROTOCOL_INFO (try 2)

[Charles Davis]

On Sep 3, 2013, at 12:37 PM, Bruno Jesus wrote:
> On Tue, Sep 3, 2013 at 3:34 PM, Alexandre Julliard  wrote:
> > Bruno Jesus  writes:
> > > On Tue, Sep 3, 2013 at 3:16 PM, Bruno Jesus  wrote:
> > > > On Tue, Sep 3, 2013 at 3:04 PM, Alexandre Julliard  wrote:
> > > > > Bruno Jesus  writes:
> > > > > > try 2:
> > > > > > Narrow the loop for the specified protocol
> > > > > > Add a new test for invalid sockets
> > > > >
> > > > > Considering what WSAEnumProtocols does, the loop doesn't seem necessary
> > > > > at all.
> > > >
> > > > It will when WSAEnumProtocols return AF_INET6 data =)
> > >
> > > Will you find more reasonable to "unstatic"
> > > WINSOCK_EnterSingleProtocolW from protocol.c, add a family parameter
> > > to it and use it inside socket.c ?
> >
> > Yes, though moving it all to socket.c is probably cleaner. We don't need
> > a separate file for just that one API.
>
> You mean removing protocol.c and adding all content to socket.c? If
> yes I would appreciate if you could do that because I don't have the
> git skills and wouldn't now how to sort the functions inside socket.c.

It's not that hard. Just copy all the substantial stuff from protocol.c
into socket.c, and then you can run:

$ git rm --force protocol.c
 $ git commit --amend socket.c protocol.c # apply changes to your existing commit

Chip

ws2_32: Implement get socket option SO_PROTOCOL_INFO (try 2)

[Bruno Jesus]

On Tue, Sep 3, 2013 at 4:26 PM, Charles Davis  wrote:
> > You mean removing protocol.c and adding all content to socket.c? If
> > yes I would appreciate if you could do that because I don't have the
> > git skills and wouldn't now how to sort the functions inside socket.c.
>
> It's not that hard. Just copy all the substantial stuff from protocol.c
> into socket.c, and then you can run:
>
> $ git rm --force protocol.c
>  $ git commit --amend socket.c protocol.c # apply changes to your existing commit

Thanks, but what about makefiles and automake stuff?
> Chip

Regards,
Bruno

ws2_32: Implement get socket option SO_PROTOCOL_INFO (try 2)

[Charles Davis]

On Sep 3, 2013, at 1:30 PM, Bruno Jesus wrote:
> On Tue, Sep 3, 2013 at 4:26 PM, Charles Davis  wrote:
> > > You mean removing protocol.c and adding all content to socket.c? If
> > > yes I would appreciate if you could do that because I don't have the
> > > git skills and wouldn't now how to sort the functions inside socket.c.
> >
> > It's not that hard. Just copy all the substantial stuff from protocol.c
> > into socket.c, and then you can run:
> >
> > $ git rm --force protocol.c
> > $ git commit --amend socket.c protocol.c # apply changes to your existing commit
>
> Thanks, but what about makefiles and automake stuff?

automake? Wine doesn't use automake.

As for the makefiles, just look in dlls/ws2_32/Makefile.in for the line:

C_SRCS = \
    async.c \
    protocol.c \
    socket.c

and remove the reference to protocol.c.

Chip
> > Chip
>
> Regards,
> Bruno

ws2_32: Implement get socket option SO_PROTOCOL_INFO (try 2)

[Bruno Jesus]

On Tue, Sep 3, 2013 at 4:57 PM, Charles Davis  wrote:
> On Sep 3, 2013, at 1:30 PM, Bruno Jesus wrote:
> > On Tue, Sep 3, 2013 at 4:26 PM, Charles Davis  wrote:
> > > > You mean removing protocol.c and adding all content to socket.c? If
> > > > yes I would appreciate if you could do that because I don't have the
> > > > git skills and wouldn't now how to sort the functions inside socket.c.
> > >
> > > It's not that hard. Just copy all the substantial stuff from protocol.c
> > > into socket.c, and then you can run:
> > >
> > > $ git rm --force protocol.c
> > > $ git commit --amend socket.c protocol.c # apply changes to your existing commit
> >
> > Thanks, but what about makefiles and automake stuff?
>
> automake? Wine doesn't use automake.
>
> As for the makefiles, just look in dlls/ws2_32/Makefile.in for the line:
>
> C_SRCS = \
>         async.c \
>         protocol.c \
>         socket.c
>
> and remove the reference to protocol.c.

Ok, I'll give it a try. Thanks again =)
> Chip
> > > Chip
> >
> > Regards,
> > Bruno