August 2014 - Wine-Commits - list.winehq.org

André Hentschel : wpcap: Implement pcap_next.
by Alexandre Julliard Aug. 20, 2014

Aug. 20, 2014

Module: wine Branch: master Commit: daae8422a0469639ec8770648e42af50bad365cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=daae8422a0469639ec8770648… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Aug 19 00:00:15 2014 +0200 wpcap: Implement pcap_next. --- dlls/wpcap/wpcap.c | 6 ++++++ dlls/wpcap/wpcap.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index 9335f2d..1509618 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -202,6 +202,12 @@ int CDECL wine_pcap_minor_version(pcap_t *p) return pcap_minor_version(p); } +const unsigned char* CDECL wine_pcap_next(pcap_t *p, struct pcap_pkthdr *h) +{ + TRACE("(%p %p)\n", p, h); + return pcap_next(p, h); +} + #define PCAP_OPENFLAG_PROMISCUOUS 1 pcap_t* CDECL wine_pcap_open(const char *source, int snaplen, int flags, int read_timeout, diff --git a/dlls/wpcap/wpcap.spec b/dlls/wpcap/wpcap.spec index 34eebbe..193ed52 100644 --- a/dlls/wpcap/wpcap.spec +++ b/dlls/wpcap/wpcap.spec @@ -42,7 +42,7 @@ @ cdecl pcap_loop(ptr long ptr ptr) wine_pcap_loop @ cdecl pcap_major_version(ptr) wine_pcap_major_version @ cdecl pcap_minor_version(ptr) wine_pcap_minor_version -@ stub pcap_next +@ cdecl pcap_next(ptr ptr) wine_pcap_next @ stub pcap_next_etherent @ stub pcap_next_ex @ stub pcap_offline_filter

1 0

Jacek Caban : mshtml: Override default onsubmit action with our submit implementation.
by Alexandre Julliard Aug. 20, 2014

Aug. 20, 2014

Module: wine Branch: master Commit: 255894c1f1f9f1d5ed1e8f812e5891f3216ce745 URL: http://source.winehq.org/git/wine.git/?a=commit;h=255894c1f1f9f1d5ed1e8f812… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 20 13:04:28 2014 +0200 mshtml: Override default onsubmit action with our submit implementation. --- dlls/mshtml/htmlevent.c | 2 +- dlls/mshtml/htmlform.c | 14 +++++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 484f3f7..33f763e 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -218,7 +218,7 @@ static const event_info_t event_info[] = { {selectstartW, onselectstartW, EVENTT_MOUSE, DISPID_EVMETH_ONSELECTSTART, EVENT_CANCELABLE}, {submitW, onsubmitW, EVENTT_HTML, DISPID_EVMETH_ONSUBMIT, - EVENT_DEFAULTLISTENER|EVENT_BUBBLE|EVENT_CANCELABLE} + EVENT_DEFAULTLISTENER|EVENT_BUBBLE|EVENT_CANCELABLE|EVENT_HASDEFAULTHANDLERS} }; eventid_t str_to_eid(LPCWSTR str) diff --git a/dlls/mshtml/htmlform.c b/dlls/mshtml/htmlform.c index 10b2df4..df425d1 100644 --- a/dlls/mshtml/htmlform.c +++ b/dlls/mshtml/htmlform.c @@ -714,12 +714,24 @@ static HRESULT HTMLFormElement_invoke(HTMLDOMNode *iface, return S_OK; } +static HRESULT HTMLFormElement_handle_event(HTMLDOMNode *iface, eventid_t eid, nsIDOMEvent *event, BOOL *prevent_default) +{ + HTMLFormElement *This = impl_from_HTMLDOMNode(iface); + + if(eid == EVENTID_SUBMIT) { + *prevent_default = TRUE; + return IHTMLFormElement_submit(&This->IHTMLFormElement_iface); + } + + return HTMLElement_handle_event(&This->element.node, eid, event, prevent_default); +} + static const NodeImplVtbl HTMLFormElementImplVtbl = { HTMLFormElement_QI, HTMLElement_destructor, HTMLElement_cpc, HTMLElement_clone, - HTMLElement_handle_event, + HTMLFormElement_handle_event, HTMLElement_get_attr_col, NULL, NULL,

1 0

André Hentschel : wpcap: Implement pcap_next_ex.
by Alexandre Julliard Aug. 20, 2014

Aug. 20, 2014

Module: wine Branch: master Commit: 1c6902679b50ab46f778b8894a7dcbec99449606 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c6902679b50ab46f778b8894… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Aug 19 00:00:31 2014 +0200 wpcap: Implement pcap_next_ex. --- dlls/wpcap/wpcap.c | 6 ++++++ dlls/wpcap/wpcap.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index 1509618..c170413 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -208,6 +208,12 @@ const unsigned char* CDECL wine_pcap_next(pcap_t *p, struct pcap_pkthdr *h) return pcap_next(p, h); } +int CDECL wine_pcap_next_ex(pcap_t *p, struct pcap_pkthdr **pkt_header, const unsigned char **pkt_data) +{ + TRACE("(%p %p %p)\n", p, pkt_header, pkt_data); + return pcap_next_ex(p, pkt_header, pkt_data); +} + #define PCAP_OPENFLAG_PROMISCUOUS 1 pcap_t* CDECL wine_pcap_open(const char *source, int snaplen, int flags, int read_timeout, diff --git a/dlls/wpcap/wpcap.spec b/dlls/wpcap/wpcap.spec index 193ed52..46e1175 100644 --- a/dlls/wpcap/wpcap.spec +++ b/dlls/wpcap/wpcap.spec @@ -44,7 +44,7 @@ @ cdecl pcap_minor_version(ptr) wine_pcap_minor_version @ cdecl pcap_next(ptr ptr) wine_pcap_next @ stub pcap_next_etherent -@ stub pcap_next_ex +@ cdecl pcap_next_ex(ptr ptr ptr) wine_pcap_next_ex @ stub pcap_offline_filter @ stub pcap_offline_read @ cdecl pcap_open(str long long long ptr ptr) wine_pcap_open

1 0

Henri Verbeet : wined3d: Move the "swapchain" field from struct wined3d_surface to struct wined3d_texture.
by Alexandre Julliard Aug. 20, 2014

Aug. 20, 2014

Module: wine Branch: master Commit: aa7016054ad2b74f63b1855e043ce19188fd0a98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa7016054ad2b74f63b1855e0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 20 13:20:00 2014 +0200 wined3d: Move the "swapchain" field from struct wined3d_surface to struct wined3d_texture. --- dlls/wined3d/arb_program_shader.c | 5 ++-- dlls/wined3d/context.c | 10 +++---- dlls/wined3d/device.c | 2 +- dlls/wined3d/resource.c | 10 +++---- dlls/wined3d/surface.c | 55 ++++++++++++++------------------------- dlls/wined3d/swapchain.c | 12 ++++----- dlls/wined3d/texture.c | 29 +++++++++++++++++++-- dlls/wined3d/wined3d_private.h | 5 ++-- 8 files changed, 70 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=aa7016054ad2b74f63b18…

1 0

Adam Martinson : ntdll: Implement FILE_PIPE_INFORMATION for NtQueryInformationFile.
by Alexandre Julliard Aug. 20, 2014

Aug. 20, 2014

Module: wine Branch: master Commit: 55e10e4ae26a9bf9a92f35c189c2a246103c09a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55e10e4ae26a9bf9a92f35c18… Author: Adam Martinson <adam.r.martinson(a)gmail.com> Date: Mon Aug 11 16:22:02 2014 +0200 ntdll: Implement FILE_PIPE_INFORMATION for NtQueryInformationFile. --- dlls/ntdll/file.c | 22 ++++++++++++++++++++-- include/winternl.h | 11 +++++++++++ 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index d2efcc1..2ae8bee 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1981,7 +1981,7 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE hFile, PIO_STATUS_BLOCK io, sizeof(FILE_END_OF_FILE_INFORMATION), /* FileEndOfFileInformation */ 0, /* FileAlternateNameInformation */ sizeof(FILE_STREAM_INFORMATION)-sizeof(WCHAR), /* FileStreamInformation */ - 0, /* FilePipeInformation */ + sizeof(FILE_PIPE_INFORMATION), /* FilePipeInformation */ sizeof(FILE_PIPE_LOCAL_INFORMATION), /* FilePipeLocalInformation */ 0, /* FilePipeRemoteInformation */ sizeof(FILE_MAILSLOT_QUERY_INFORMATION), /* FileMailslotQueryInformation */ @@ -2032,7 +2032,7 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE hFile, PIO_STATUS_BLOCK io, if (len < info_sizes[class]) return io->u.Status = STATUS_INFO_LENGTH_MISMATCH; - if (class != FilePipeLocalInformation) + if (class != FilePipeInformation && class != FilePipeLocalInformation) { if ((io->u.Status = server_get_unix_fd( hFile, 0, &fd, &needs_close, NULL, NULL ))) return io->u.Status; @@ -2146,6 +2146,24 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE hFile, PIO_STATUS_BLOCK io, } } break; + case FilePipeInformation: + { + FILE_PIPE_INFORMATION* pi = ptr; + + SERVER_START_REQ( get_named_pipe_info ) + { + req->handle = wine_server_obj_handle( hFile ); + if (!(io->u.Status = wine_server_call( req ))) + { + pi->ReadMode = (reply->flags & NAMED_PIPE_MESSAGE_STREAM_READ) ? + FILE_PIPE_MESSAGE_MODE : FILE_PIPE_BYTE_STREAM_MODE; + pi->CompletionMode = (reply->flags & NAMED_PIPE_NONBLOCKING_MODE) ? + FILE_PIPE_COMPLETE_OPERATION : FILE_PIPE_QUEUE_OPERATION; + } + } + SERVER_END_REQ; + } + break; case FilePipeLocalInformation: { FILE_PIPE_LOCAL_INFORMATION* pli = ptr; diff --git a/include/winternl.h b/include/winternl.h index a95a016..95951e2 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -623,6 +623,11 @@ typedef struct _FILE_MAILSLOT_SET_INFORMATION { LARGE_INTEGER ReadTimeout; } FILE_MAILSLOT_SET_INFORMATION, *PFILE_MAILSLOT_SET_INFORMATION; +typedef struct _FILE_PIPE_INFORMATION { + ULONG ReadMode; + ULONG CompletionMode; +} FILE_PIPE_INFORMATION, *PFILE_PIPE_INFORMATION; + typedef struct _FILE_PIPE_LOCAL_INFORMATION { ULONG NamedPipeType; ULONG NamedPipeConfiguration; @@ -1602,6 +1607,12 @@ typedef struct _RTL_HANDLE_TABLE /* options for pipe's type */ #define FILE_PIPE_TYPE_MESSAGE 0x00000001 #define FILE_PIPE_TYPE_BYTE 0x00000000 +/* options for pipe's message mode */ +#define FILE_PIPE_MESSAGE_MODE 0x00000001 +#define FILE_PIPE_BYTE_STREAM_MODE 0x00000000 +/* options for pipe's blocking mode */ +#define FILE_PIPE_COMPLETE_OPERATION 0x00000001 +#define FILE_PIPE_QUEUE_OPERATION 0x00000000 /* and client / server end */ #define FILE_PIPE_SERVER_END 0x00000001 #define FILE_PIPE_CLIENT_END 0x00000000

1 0

André Hentschel : wpcap: Implement pcap_open.
by Alexandre Julliard Aug. 20, 2014

Aug. 20, 2014

Module: wine Branch: master Commit: c070c46ed4ff0d6341972c47a420f5121b72a935 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c070c46ed4ff0d6341972c47a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Aug 18 23:58:06 2014 +0200 wpcap: Implement pcap_open. --- dlls/wpcap/wpcap.c | 11 +++++++++++ dlls/wpcap/wpcap.spec | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index fb36326..aedfcc6 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -196,6 +196,17 @@ int CDECL wine_pcap_minor_version(pcap_t *p) return pcap_minor_version(p); } +#define PCAP_OPENFLAG_PROMISCUOUS 1 + +pcap_t* CDECL wine_pcap_open(const char *source, int snaplen, int flags, int read_timeout, + void *auth, char *errbuf) +{ + int promisc = flags & PCAP_OPENFLAG_PROMISCUOUS; + FIXME("(%s %i %i %i %p %p): partial stub\n", debugstr_a(source), snaplen, flags, read_timeout, + auth, errbuf); + return pcap_open_live(source, snaplen, promisc, read_timeout, errbuf); +} + pcap_t* CDECL wine_pcap_open_live(const char *source, int snaplen, int promisc, int to_ms, char *errbuf) { diff --git a/dlls/wpcap/wpcap.spec b/dlls/wpcap/wpcap.spec index 718d0fe..8b8a37e 100644 --- a/dlls/wpcap/wpcap.spec +++ b/dlls/wpcap/wpcap.spec @@ -47,7 +47,7 @@ @ stub pcap_next_ex @ stub pcap_offline_filter @ stub pcap_offline_read -@ stub pcap_open +@ cdecl pcap_open(str long long long ptr ptr) wine_pcap_open @ stub pcap_open_dead @ cdecl pcap_open_live(str long long long ptr) wine_pcap_open_live @ stub pcap_open_offline

1 0

Henri Verbeet : wined3d: Keep a reference to the frontbuffer texture instead of the surface in the swapchain.
by Alexandre Julliard Aug. 20, 2014

Aug. 20, 2014

Module: wine Branch: master Commit: ec87407e7c31451aab636f1b586edaf3ce38a6a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec87407e7c31451aab636f1b5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 20 13:20:02 2014 +0200 wined3d: Keep a reference to the frontbuffer texture instead of the surface in the swapchain. --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/context.c | 4 ++-- dlls/wined3d/device.c | 11 +++++---- dlls/wined3d/resource.c | 2 +- dlls/wined3d/surface.c | 23 ++++++++++-------- dlls/wined3d/swapchain.c | 49 ++++++++++++++++++++++----------------- dlls/wined3d/wined3d_private.h | 2 +- 7 files changed, 53 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ec87407e7c31451aab636…

1 0

André Hentschel : wpcap: Implement wsockinit.
by Alexandre Julliard Aug. 20, 2014

Aug. 20, 2014

Module: wine Branch: master Commit: b2962fb87ee3faf983537984b3d2ee8988da8f82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2962fb87ee3faf983537984b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Aug 19 00:02:22 2014 +0200 wpcap: Implement wsockinit. --- dlls/wpcap/Makefile.in | 1 + dlls/wpcap/wpcap.c | 9 +++++++++ dlls/wpcap/wpcap.spec | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/wpcap/Makefile.in b/dlls/wpcap/Makefile.in index 70a0fec..5caffbc 100644 --- a/dlls/wpcap/Makefile.in +++ b/dlls/wpcap/Makefile.in @@ -1,4 +1,5 @@ MODULE = wpcap.dll +DELAYIMPORTS = ws2_32 EXTRALIBS = @LIBPCAP@ C_SRCS = \ diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index 16b92f4..90b0647a 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -19,6 +19,7 @@ */ #include <pcap/pcap.h> +#include "winsock2.h" #include "windef.h" #include "winbase.h" #include "wine/debug.h" @@ -273,3 +274,11 @@ int CDECL wine_pcap_stats(pcap_t *p, struct pcap_stat *ps) TRACE("(%p %p)\n", p, ps); return pcap_stats(p, ps); } + +int CDECL wine_wsockinit(void) +{ + WSADATA wsadata; + TRACE("()\n"); + if (WSAStartup(MAKEWORD(1,1), &wsadata)) return -1; + return 0; +} diff --git a/dlls/wpcap/wpcap.spec b/dlls/wpcap/wpcap.spec index 33cc9ef..540089d 100644 --- a/dlls/wpcap/wpcap.spec +++ b/dlls/wpcap/wpcap.spec @@ -75,4 +75,4 @@ @ cdecl pcap_stats(ptr ptr) wine_pcap_stats @ stub pcap_stats_ex @ stub pcap_strerror -@ stub wsockinit +@ cdecl wsockinit() wine_wsockinit

1 0

André Hentschel : wpcap: Implement pcap_setnonblock.
by Alexandre Julliard Aug. 20, 2014

Aug. 20, 2014

Module: wine Branch: master Commit: f0f57c22bf7c9b25b708b51d423a9a19db2b35c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0f57c22bf7c9b25b708b51d4… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Aug 19 00:02:03 2014 +0200 wpcap: Implement pcap_setnonblock. --- dlls/wpcap/wpcap.c | 6 ++++++ dlls/wpcap/wpcap.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index b1a2149..16b92f4 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -256,6 +256,12 @@ int CDECL wine_pcap_setfilter(pcap_t *p, struct bpf_program *fp) return pcap_setfilter(p, fp); } +int CDECL wine_pcap_setnonblock(pcap_t *p, int nonblock, char *errbuf) +{ + TRACE("(%p %i %p)\n", p, nonblock, errbuf); + return pcap_setnonblock(p, nonblock, errbuf); +} + int CDECL wine_pcap_snapshot(pcap_t *p) { TRACE("(%p)\n", p); diff --git a/dlls/wpcap/wpcap.spec b/dlls/wpcap/wpcap.spec index 13a8f7f..33cc9ef 100644 --- a/dlls/wpcap/wpcap.spec +++ b/dlls/wpcap/wpcap.spec @@ -68,7 +68,7 @@ @ cdecl pcap_setfilter(ptr ptr) wine_pcap_setfilter @ stub pcap_setmintocopy @ stub pcap_setmode -@ stub pcap_setnonblock +@ cdecl pcap_setnonblock(ptr long ptr) wine_pcap_setnonblock @ stub pcap_setsampling @ stub pcap_setuserbuffer @ cdecl pcap_snapshot(ptr) wine_pcap_snapshot

1 0

Sebastian Lackner : server: Store pipe_flags in a separate variable for both server and client of named pipes.
by Alexandre Julliard Aug. 20, 2014

Aug. 20, 2014

Module: wine Branch: master Commit: 2e95f370d4a162b4f6955bc582fd8f551c79350a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e95f370d4a162b4f6955bc58… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Aug 11 15:35:50 2014 +0200 server: Store pipe_flags in a separate variable for both server and client of named pipes. --- server/named_pipe.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/server/named_pipe.c b/server/named_pipe.c index 4b23ba2..d864478 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -77,6 +77,7 @@ struct pipe_server struct timeout_user *flush_poll; struct event *event; unsigned int options; /* pipe options */ + unsigned int pipe_flags; }; struct pipe_client @@ -85,6 +86,7 @@ struct pipe_client struct fd *fd; /* pipe file descriptor */ struct pipe_server *server; /* server that this client is connected to */ unsigned int flags; /* file flags */ + unsigned int pipe_flags; }; struct named_pipe @@ -737,7 +739,8 @@ static struct pipe_server *get_pipe_server_obj( struct process *process, return (struct pipe_server *) obj; } -static struct pipe_server *create_pipe_server( struct named_pipe *pipe, unsigned int options ) +static struct pipe_server *create_pipe_server( struct named_pipe *pipe, unsigned int options, + unsigned int pipe_flags ) { struct pipe_server *server; @@ -750,6 +753,7 @@ static struct pipe_server *create_pipe_server( struct named_pipe *pipe, unsigned server->client = NULL; server->flush_poll = NULL; server->options = options; + server->pipe_flags = pipe_flags; list_add_head( &pipe->servers, &server->entry ); grab_object( pipe ); @@ -762,7 +766,7 @@ static struct pipe_server *create_pipe_server( struct named_pipe *pipe, unsigned return server; } -static struct pipe_client *create_pipe_client( unsigned int flags ) +static struct pipe_client *create_pipe_client( unsigned int flags, unsigned int pipe_flags ) { struct pipe_client *client; @@ -773,6 +777,7 @@ static struct pipe_client *create_pipe_client( unsigned int flags ) client->fd = NULL; client->server = NULL; client->flags = flags; + client->pipe_flags = pipe_flags; return client; } @@ -822,7 +827,7 @@ static struct object *named_pipe_open_file( struct object *obj, unsigned int acc return NULL; } - if ((client = create_pipe_client( options ))) + if ((client = create_pipe_client( options, pipe->flags ))) { if (!socketpair( PF_UNIX, SOCK_STREAM, 0, fds )) { @@ -977,7 +982,7 @@ DECL_HANDLER(create_named_pipe) pipe->outsize = req->outsize; pipe->maxinstances = req->maxinstances; pipe->timeout = req->timeout; - pipe->flags = req->flags; + pipe->flags = req->flags & NAMED_PIPE_MESSAGE_STREAM_WRITE; pipe->sharing = req->sharing; } else @@ -997,7 +1002,7 @@ DECL_HANDLER(create_named_pipe) clear_error(); /* clear the name collision */ } - server = create_pipe_server( pipe, req->options ); + server = create_pipe_server( pipe, req->options, req->flags ); if (server) { reply->handle = alloc_handle( current->process, server, req->access, req->attributes ); @@ -1026,7 +1031,7 @@ DECL_HANDLER(get_named_pipe_info) server = client->server; } - reply->flags = server->pipe->flags; + reply->flags = client ? client->pipe_flags : server->pipe_flags; reply->sharing = server->pipe->sharing; reply->maxinstances = server->pipe->maxinstances; reply->instances = server->pipe->instances;

1 0