wine-commits June 2021

wine-commits@winehq.org

1 participants
811 discussions

Zhiyi Zhang : wordpad: Enable visual styles.
by Alexandre Julliard 11 Jun '21

11 Jun '21

Module: wine Branch: master Commit: b564414e9b40ff749ac0a0ab7b90a2a16a0fe795 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b564414e9b40ff749ac0a0ab… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Jun 11 10:05:50 2021 +0800 wordpad: Enable visual styles. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wordpad/wordpad.manifest | 16 ++++++++++++++++ programs/wordpad/wordpad.rc | 3 +++ 2 files changed, 19 insertions(+) diff --git a/programs/wordpad/wordpad.manifest b/programs/wordpad/wordpad.manifest new file mode 100644 index 00000000000..51fb21fa97d --- /dev/null +++ b/programs/wordpad/wordpad.manifest @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<assemblyIdentity type="win32" name="Wine.Wordpad" version="0.0.0.0"/> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="*" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> +</dependency> +</assembly> diff --git a/programs/wordpad/wordpad.rc b/programs/wordpad/wordpad.rc index abf9ed9c50a..324b6d06d53 100644 --- a/programs/wordpad/wordpad.rc +++ b/programs/wordpad/wordpad.rc @@ -301,6 +301,9 @@ END LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL +/* @makedep: wordpad.manifest */ +1 RT_MANIFEST wordpad.manifest + /* @makedep: toolbar.bmp */ IDB_TOOLBAR BITMAP "toolbar.bmp"

1 0

Zhiyi Zhang : winver: Enable visual styles.
by Alexandre Julliard 11 Jun '21

11 Jun '21

Module: wine Branch: master Commit: fb84605470848103b4a7895bf4c981101a41d4ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb84605470848103b4a7895b… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Jun 11 10:05:41 2021 +0800 winver: Enable visual styles. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winver/Makefile.in | 2 +- programs/winver/version.rc | 5 +++++ programs/winver/winver.c | 3 +++ programs/winver/winver.manifest | 16 ++++++++++++++++ 4 files changed, 25 insertions(+), 1 deletion(-) diff --git a/programs/winver/Makefile.in b/programs/winver/Makefile.in index 0caef713865..8f74ab774df 100644 --- a/programs/winver/Makefile.in +++ b/programs/winver/Makefile.in @@ -1,5 +1,5 @@ MODULE = winver.exe -IMPORTS = shell32 +IMPORTS = shell32 comctl32 EXTRADLLFLAGS = -mwindows -mno-cygwin diff --git a/programs/winver/version.rc b/programs/winver/version.rc index ae042fb82a0..c079dde644a 100644 --- a/programs/winver/version.rc +++ b/programs/winver/version.rc @@ -15,6 +15,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <windef.h> +#include <winuser.h> #define WINE_FILEDESCRIPTION_STR "Windows Version" #define WINE_FILENAME_STR "winver.exe" @@ -25,3 +27,6 @@ #define WINE_PRODUCTVERSION_STR "5.1.2600.0" #include "wine/wine_common_ver.rc" + +/* @makedep: winver.manifest */ +1 RT_MANIFEST winver.manifest diff --git a/programs/winver/winver.c b/programs/winver/winver.c index 019eb5248b2..ee3120443eb 100644 --- a/programs/winver/winver.c +++ b/programs/winver/winver.c @@ -19,6 +19,7 @@ */ #include "windows.h" +#include "commctrl.h" #include "shellapi.h" int PASCAL WinMain (HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show) @@ -26,6 +27,8 @@ int PASCAL WinMain (HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show) char name[128] = "Wine "; const char * (CDECL *wine_get_version)(void); + InitCommonControls(); + wine_get_version = (void *)GetProcAddress( GetModuleHandleA("ntdll.dll"), "wine_get_version" ); if (wine_get_version) strcat( name, wine_get_version() ); return !ShellAboutA( NULL, name, NULL, 0 ); diff --git a/programs/winver/winver.manifest b/programs/winver/winver.manifest new file mode 100644 index 00000000000..519bd175c19 --- /dev/null +++ b/programs/winver/winver.manifest @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<assemblyIdentity type="win32" name="Wine.Winver" version="0.0.0.0"/> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="*" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> +</dependency> +</assembly>

1 0

Zhiyi Zhang : winevdm: Enable visual styles.
by Alexandre Julliard 11 Jun '21

11 Jun '21

Module: wine Branch: master Commit: f304b2ae23bb537029fe51983f060f680de66a12 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f304b2ae23bb537029fe5198… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Jun 11 10:05:33 2021 +0800 winevdm: Enable visual styles. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winevdm/Makefile.in | 4 +++- programs/winevdm/winevdm.c | 3 +++ programs/winevdm/winevdm.manifest | 16 ++++++++++++++++ programs/winevdm/winevdm.rc | 25 +++++++++++++++++++++++++ 4 files changed, 47 insertions(+), 1 deletion(-) diff --git a/programs/winevdm/Makefile.in b/programs/winevdm/Makefile.in index 0ea89f4b0de..c841f3c4d46 100644 --- a/programs/winevdm/Makefile.in +++ b/programs/winevdm/Makefile.in @@ -1,6 +1,8 @@ MODULE = winevdm.exe APPMODE = -mwindows -IMPORTS = user32 kernel +IMPORTS = user32 kernel comctl32 C_SRCS = \ winevdm.c + +RC_SRCS = winevdm.rc diff --git a/programs/winevdm/winevdm.c b/programs/winevdm/winevdm.c index 0a43e579793..1ab91f41d66 100644 --- a/programs/winevdm/winevdm.c +++ b/programs/winevdm/winevdm.c @@ -30,6 +30,7 @@ #include "wine/winbase16.h" #include "winuser.h" #include "wincon.h" +#include "commctrl.h" #include "wine/unicode.h" #include "wine/debug.h" @@ -504,6 +505,8 @@ int main( int argc, char *argv[] ) char *cmdline, *appname, **first_arg; char *p; + InitCommonControls(); + if (!argv[1]) usage(); if (!strcmp( argv[1], "--app-name" )) diff --git a/programs/winevdm/winevdm.manifest b/programs/winevdm/winevdm.manifest new file mode 100644 index 00000000000..9634ec55524 --- /dev/null +++ b/programs/winevdm/winevdm.manifest @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<assemblyIdentity type="win32" name="Wine.Winevdm" version="0.0.0.0"/> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="*" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> +</dependency> +</assembly> diff --git a/programs/winevdm/winevdm.rc b/programs/winevdm/winevdm.rc new file mode 100644 index 00000000000..5ccf9e47151 --- /dev/null +++ b/programs/winevdm/winevdm.rc @@ -0,0 +1,25 @@ +/* + * Winevdm resources + * + * Copyright 2021 Zhiyi Zhang for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <windef.h> +#include <winuser.h> + +/* @makedep: winevdm.manifest */ +1 RT_MANIFEST winevdm.manifest

1 0

Zhiyi Zhang : winemine: Enable visual styles.
by Alexandre Julliard 11 Jun '21

11 Jun '21

Module: wine Branch: master Commit: 6c6cfb913b30905352612c9c19e1ac12d4d87f2d URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c6cfb913b30905352612c9c… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Jun 11 10:05:26 2021 +0800 winemine: Enable visual styles. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winemine/Makefile.in | 2 +- programs/winemine/main.c | 3 +++ programs/winemine/winemine.manifest | 16 ++++++++++++++++ programs/winemine/winemine.rc | 3 +++ 4 files changed, 23 insertions(+), 1 deletion(-) diff --git a/programs/winemine/Makefile.in b/programs/winemine/Makefile.in index 8f5aebd9645..5ae0eaf2c62 100644 --- a/programs/winemine/Makefile.in +++ b/programs/winemine/Makefile.in @@ -1,5 +1,5 @@ MODULE = winemine.exe -IMPORTS = user32 gdi32 advapi32 +IMPORTS = user32 gdi32 advapi32 comctl32 DELAYIMPORTS = shell32 EXTRADLLFLAGS = -mwindows -municode -mno-cygwin diff --git a/programs/winemine/main.c b/programs/winemine/main.c index 37ce1927047..cd0763042d3 100644 --- a/programs/winemine/main.c +++ b/programs/winemine/main.c @@ -23,6 +23,7 @@ #include <string.h> #include <time.h> #include <windows.h> +#include <commctrl.h> #include <stdlib.h> #include <shellapi.h> #include "main.h" @@ -1012,6 +1013,8 @@ int WINAPI wWinMain( HINSTANCE hInst, HINSTANCE hPrevInst, LPWSTR cmdline, int c HACCEL haccel; WCHAR appname[20]; + InitCommonControls(); + LoadStringW( hInst, IDS_APPNAME, appname, ARRAY_SIZE(appname)); wc.cbSize = sizeof(wc); diff --git a/programs/winemine/winemine.manifest b/programs/winemine/winemine.manifest new file mode 100644 index 00000000000..8850b090e37 --- /dev/null +++ b/programs/winemine/winemine.manifest @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<assemblyIdentity type="win32" name="Wine.Winemine" version="0.0.0.0"/> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="*" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> +</dependency> +</assembly> diff --git a/programs/winemine/winemine.rc b/programs/winemine/winemine.rc index 5bbd68247b8..1e1bdeae5bc 100644 --- a/programs/winemine/winemine.rc +++ b/programs/winemine/winemine.rc @@ -105,6 +105,9 @@ IDA_WINEMINE ACCELERATORS LANGUAGE LANG_NEUTRAL,SUBLANG_NEUTRAL +/* @makedep: winemine.manifest */ +1 RT_MANIFEST winemine.manifest + /* @makedep: winemine.ico */ IDI_WINEMINE ICON winemine.ico

1 0

Zhiyi Zhang : winefile: Enable visual styles.
by Alexandre Julliard 11 Jun '21

11 Jun '21

Module: wine Branch: master Commit: 7abfec447397f6e85058294e1bc0a5d5453cecf3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7abfec447397f6e85058294e… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Jun 11 10:05:18 2021 +0800 winefile: Enable visual styles. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winefile/winefile.manifest | 16 ++++++++++++++++ programs/winefile/winefile.rc | 3 +++ 2 files changed, 19 insertions(+) diff --git a/programs/winefile/winefile.manifest b/programs/winefile/winefile.manifest new file mode 100644 index 00000000000..4ebd48c8933 --- /dev/null +++ b/programs/winefile/winefile.manifest @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<assemblyIdentity type="win32" name="Wine.Winefile" version="0.0.0.0"/> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="*" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> +</dependency> +</assembly> diff --git a/programs/winefile/winefile.rc b/programs/winefile/winefile.rc index 4420019ec56..8d0f9940787 100644 --- a/programs/winefile/winefile.rc +++ b/programs/winefile/winefile.rc @@ -195,6 +195,9 @@ IDA_WINEFILE ACCELERATORS LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL +/* @makedep: winefile.manifest */ +1 RT_MANIFEST winefile.manifest + /* @makedep: winefile.ico */ IDI_WINEFILE ICON winefile.ico

1 0

Zebediah Figura : server: Do not bother clearing events in IOCTL_AFD_LISTEN.
by Alexandre Julliard 11 Jun '21

11 Jun '21

Module: wine Branch: master Commit: 00eb00f6d623347d27001a9a03774ccf7d244542 URL: https://source.winehq.org/git/wine.git/?a=commit;h=00eb00f6d623347d27001a9a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 10 19:36:28 2021 -0500 server: Do not bother clearing events in IOCTL_AFD_LISTEN. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/sock.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/server/sock.c b/server/sock.c index 827eba52117..66440a540dc 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1786,8 +1786,6 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) return 0; } - sock->pending_events &= ~FD_ACCEPT; - sock->reported_events &= ~FD_ACCEPT; sock->state = SOCK_LISTENING; /* a listening socket can no longer be accepted into */

1 0

Zebediah Figura : server: Do not bother clearing events in IOCTL_AFD_WINE_CONNECT.
by Alexandre Julliard 11 Jun '21

11 Jun '21

Module: wine Branch: master Commit: 139e95df619f8bb1069ae206c40539f930bc3718 URL: https://source.winehq.org/git/wine.git/?a=commit;h=139e95df619f8bb1069ae206… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 10 19:36:27 2021 -0500 server: Do not bother clearing events in IOCTL_AFD_WINE_CONNECT. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/sock.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/server/sock.c b/server/sock.c index aa2c6842efc..827eba52117 100644 --- a/server/sock.c +++ b/server/sock.c @@ -610,8 +610,6 @@ static void complete_async_connect( struct sock *sock ) if (debug_level) fprintf( stderr, "completing connect request for socket %p\n", sock ); - sock->pending_events &= ~(FD_CONNECT | FD_READ | FD_WRITE); - sock->reported_events &= ~(FD_CONNECT | FD_READ | FD_WRITE); sock->state = SOCK_CONNECTED; if (!req->send_len) @@ -1846,9 +1844,6 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) /* a connected or connecting socket can no longer be accepted into */ allow_fd_caching( sock->fd ); - sock->pending_events &= ~(FD_CONNECT | FD_READ | FD_WRITE); - sock->reported_events &= ~(FD_CONNECT | FD_READ | FD_WRITE); - if (!ret) { sock->state = SOCK_CONNECTED;

1 0

Zebediah Figura : server: Use an enum to store socket connection state.
by Alexandre Julliard 11 Jun '21

11 Jun '21

Module: wine Branch: master Commit: a7577014faeda217be282222e355c493064e139b URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7577014faeda217be282222… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 10 19:36:26 2021 -0500 server: Use an enum to store socket connection state. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winsock2.h | 5 -- server/sock.c | 185 ++++++++++++++++++++++++++++++----------------------- 2 files changed, 104 insertions(+), 86 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a7577014faeda217be28…

1 0

Zebediah Figura : server: Use separate fields to track socket shutdown state.
by Alexandre Julliard 11 Jun '21

11 Jun '21

Module: wine Branch: master Commit: 5eaba82a7719e1f059ef5636aee37c4e49f28626 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5eaba82a7719e1f059ef5636… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 10 19:36:25 2021 -0500 server: Use separate fields to track socket shutdown state. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/sock.c | 59 ++++++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 38 insertions(+), 21 deletions(-) diff --git a/server/sock.c b/server/sock.c index 7941ed856d3..4cd84637baf 100644 --- a/server/sock.c +++ b/server/sock.c @@ -172,6 +172,8 @@ struct sock struct list accept_list; /* list of pending accept requests */ struct accept_req *accept_recv_req; /* pending accept-into request which will recv on this socket */ struct connect_req *connect_req; /* pending connection request */ + unsigned int rd_shutdown : 1; /* is the read end shut down? */ + unsigned int wr_shutdown : 1; /* is the write end shut down? */ unsigned int wr_shutdown_pending : 1; /* is a write shutdown pending? */ unsigned int nonblocking : 1; /* is the socket nonblocking? */ }; @@ -781,9 +783,9 @@ static int sock_dispatch_asyncs( struct sock *sock, int event, int error ) int status = sock_get_ntstatus( error ); struct accept_req *req, *next; - if (!(sock->state & FD_READ)) + if (sock->rd_shutdown) async_wake_up( &sock->read_q, status ); - if (!(sock->state & FD_WRITE)) + if (sock->wr_shutdown) async_wake_up( &sock->write_q, status ); LIST_FOR_EACH_ENTRY_SAFE( req, next, &sock->accept_list, struct accept_req, entry ) @@ -869,7 +871,7 @@ static void sock_poll_event( struct fd *fd, int event ) else if (event & POLLOUT) { /* we got connected */ - sock->state |= FD_WINE_CONNECTED|FD_READ|FD_WRITE; + sock->state |= FD_WINE_CONNECTED; sock->state &= ~FD_CONNECT; sock->connect_time = current_time; } @@ -911,12 +913,12 @@ static void sock_poll_event( struct fd *fd, int event ) } } - if ( (hangup_seen || event & (POLLHUP|POLLERR)) && (sock->state & (FD_READ|FD_WRITE)) ) + if ((hangup_seen || event & (POLLHUP | POLLERR)) && (!sock->rd_shutdown || !sock->wr_shutdown)) { error = error ? error : sock_error( fd ); if ( (event & POLLERR) || ( sock_shutdown_type == SOCK_SHUTDOWN_EOF && (event & POLLHUP) )) - sock->state &= ~FD_WRITE; - sock->state &= ~FD_READ; + sock->wr_shutdown = 1; + sock->rd_shutdown = 1; if (debug_level) fprintf(stderr, "socket %p aborted by error %d, event: %x\n", sock, error, event); @@ -969,7 +971,6 @@ static int sock_get_poll_events( struct fd *fd ) { struct sock *sock = get_fd_user( fd ); unsigned int mask = sock->mask & ~sock->reported_events; - unsigned int smask = sock->state & mask; struct poll_req *req; int ev = 0; @@ -996,7 +997,12 @@ static int sock_get_poll_events( struct fd *fd ) { if (async_waiting( &sock->read_q )) ev |= POLLIN | POLLPRI; } - else if (smask & FD_READ || (sock->state & FD_WINE_LISTENING && mask & FD_ACCEPT)) + else if (sock->state & FD_WINE_LISTENING) + { + if (mask & FD_ACCEPT) + ev |= POLLIN; + } + else if (!sock->rd_shutdown && (mask & FD_READ)) ev |= POLLIN | POLLPRI; /* We use POLLIN with 0 bytes recv() as FD_CLOSE indication for stream sockets. */ else if (sock->type == WS_SOCK_STREAM && (mask & FD_CLOSE) && !(sock->reported_events & FD_READ)) @@ -1006,7 +1012,7 @@ static int sock_get_poll_events( struct fd *fd ) { if (async_waiting( &sock->write_q )) ev |= POLLOUT; } - else if (smask & FD_WRITE) + else if (!sock->wr_shutdown && (mask & FD_WRITE)) ev |= POLLOUT; LIST_FOR_EACH_ENTRY( req, &poll_list, struct poll_req, entry ) @@ -1039,18 +1045,30 @@ static void sock_queue_async( struct fd *fd, struct async *async, int type, int switch (type) { case ASYNC_TYPE_READ: + if (sock->rd_shutdown) + { + set_error( STATUS_PIPE_DISCONNECTED ); + return; + } queue = &sock->read_q; break; + case ASYNC_TYPE_WRITE: + if (sock->wr_shutdown) + { + set_error( STATUS_PIPE_DISCONNECTED ); + return; + } queue = &sock->write_q; break; + default: set_error( STATUS_INVALID_PARAMETER ); return; } - if ( ( !( sock->state & (FD_READ|FD_CONNECT|FD_WINE_LISTENING) ) && type == ASYNC_TYPE_READ ) || - ( !( sock->state & (FD_WRITE|FD_CONNECT) ) && type == ASYNC_TYPE_WRITE ) ) + if ( ( !( sock->state & (FD_CONNECT|FD_WINE_LISTENING) ) && type == ASYNC_TYPE_READ ) || + ( !( sock->state & (FD_CONNECT) ) && type == ASYNC_TYPE_WRITE ) ) { set_error( STATUS_PIPE_DISCONNECTED ); return; @@ -1180,6 +1198,8 @@ static struct sock *create_socket(void) sock->ifchange_obj = NULL; sock->accept_recv_req = NULL; sock->connect_req = NULL; + sock->rd_shutdown = 0; + sock->wr_shutdown = 0; sock->wr_shutdown_pending = 0; sock->nonblocking = 0; init_async_queue( &sock->read_q ); @@ -1339,7 +1359,6 @@ static int init_socket( struct sock *sock, int family, int type, int protocol, u } #endif - sock->state = (type != SOCK_STREAM) ? (FD_READ|FD_WRITE) : 0; sock->flags = flags; sock->proto = protocol; sock->type = type; @@ -1404,7 +1423,7 @@ static struct sock *accept_socket( struct sock *sock ) } /* newly created socket gets the same properties of the listening socket */ - acceptsock->state = FD_WINE_CONNECTED|FD_READ|FD_WRITE; + acceptsock->state = FD_WINE_CONNECTED; acceptsock->nonblocking = sock->nonblocking; acceptsock->mask = sock->mask; acceptsock->proto = sock->proto; @@ -1458,7 +1477,7 @@ static int accept_into_socket( struct sock *sock, struct sock *acceptsock ) return FALSE; } - acceptsock->state |= FD_WINE_CONNECTED|FD_READ|FD_WRITE; + acceptsock->state |= FD_WINE_CONNECTED; acceptsock->pending_events = 0; acceptsock->reported_events = 0; acceptsock->proto = sock->proto; @@ -1808,7 +1827,7 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) if (!ret) { - sock->state |= FD_WINE_CONNECTED | FD_READ | FD_WRITE; + sock->state |= FD_WINE_CONNECTED; sock->state &= ~FD_CONNECT; if (!send_len) return 1; @@ -1866,11 +1885,11 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) if (how != SD_SEND) { - sock->state &= ~FD_READ; + sock->rd_shutdown = 1; } if (how != SD_RECEIVE) { - sock->state &= ~FD_WRITE; + sock->wr_shutdown = 1; if (list_empty( &sock->write_q.queue )) shutdown( unix_fd, SHUT_WR ); else @@ -2462,8 +2481,7 @@ DECL_HANDLER(recv_socket) status = STATUS_PENDING; } - /* are we shut down? */ - if (status == STATUS_PENDING && !(sock->state & FD_READ)) status = STATUS_PIPE_DISCONNECTED; + if (status == STATUS_PENDING && sock->rd_shutdown) status = STATUS_PIPE_DISCONNECTED; sock->pending_events &= ~(req->oob ? FD_OOB : FD_READ); sock->reported_events &= ~(req->oob ? FD_OOB : FD_READ); @@ -2567,8 +2585,7 @@ DECL_HANDLER(send_socket) status = STATUS_PENDING; } - /* are we shut down? */ - if (status == STATUS_PENDING && !(sock->state & FD_WRITE)) status = STATUS_PIPE_DISCONNECTED; + if (status == STATUS_PENDING && sock->wr_shutdown) status = STATUS_PIPE_DISCONNECTED; if ((async = create_request_async( fd, get_fd_comp_flags( fd ), &req->async ))) {

1 0

Zebediah Figura : server: Make FD_WINE_NONBLOCKING into a separate field.
by Alexandre Julliard 11 Jun '21

11 Jun '21

Module: wine Branch: master Commit: 5ee78d3460abb0c4c19667dc7b7a09ab3cbb8549 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ee78d3460abb0c4c19667dc… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 10 19:36:24 2021 -0500 server: Make FD_WINE_NONBLOCKING into a separate field. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winsock2.h | 1 - server/sock.c | 29 +++++++++++++++-------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/include/winsock2.h b/include/winsock2.h index c299583eaff..a10f81db668 100644 --- a/include/winsock2.h +++ b/include/winsock2.h @@ -293,7 +293,6 @@ extern "C" { #ifdef __WINESRC__ #define FD_WINE_LISTENING 0x10000000 -#define FD_WINE_NONBLOCKING 0x20000000 #define FD_WINE_CONNECTED 0x40000000 #endif diff --git a/server/sock.c b/server/sock.c index bbd82d57bd5..7941ed856d3 100644 --- a/server/sock.c +++ b/server/sock.c @@ -151,7 +151,6 @@ struct sock * any event once until it is reset.) */ unsigned int reported_events; unsigned int flags; /* socket flags */ - int wr_shutdown_pending; /* is a write shutdown pending? */ unsigned short proto; /* socket protocol */ unsigned short type; /* socket type */ unsigned short family; /* socket family */ @@ -173,6 +172,8 @@ struct sock struct list accept_list; /* list of pending accept requests */ struct accept_req *accept_recv_req; /* pending accept-into request which will recv on this socket */ struct connect_req *connect_req; /* pending connection request */ + unsigned int wr_shutdown_pending : 1; /* is a write shutdown pending? */ + unsigned int nonblocking : 1; /* is the socket nonblocking? */ }; static void sock_dump( struct object *obj, int verbose ); @@ -1166,7 +1167,6 @@ static struct sock *create_socket(void) sock->mask = 0; sock->pending_events = 0; sock->reported_events = 0; - sock->wr_shutdown_pending = 0; sock->flags = 0; sock->proto = 0; sock->type = 0; @@ -1180,6 +1180,8 @@ static struct sock *create_socket(void) sock->ifchange_obj = NULL; sock->accept_recv_req = NULL; sock->connect_req = NULL; + sock->wr_shutdown_pending = 0; + sock->nonblocking = 0; init_async_queue( &sock->read_q ); init_async_queue( &sock->write_q ); init_async_queue( &sock->ifchange_q ); @@ -1403,8 +1405,7 @@ static struct sock *accept_socket( struct sock *sock ) /* newly created socket gets the same properties of the listening socket */ acceptsock->state = FD_WINE_CONNECTED|FD_READ|FD_WRITE; - if (sock->state & FD_WINE_NONBLOCKING) - acceptsock->state |= FD_WINE_NONBLOCKING; + acceptsock->nonblocking = sock->nonblocking; acceptsock->mask = sock->mask; acceptsock->proto = sock->proto; acceptsock->type = sock->type; @@ -1657,7 +1658,7 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) { struct accept_req *req; - if (sock->state & FD_WINE_NONBLOCKING) return 0; + if (sock->nonblocking) return 0; if (get_error() != STATUS_DEVICE_NOT_READY) return 0; if (!(req = alloc_accept_req( sock, NULL, async, NULL ))) return 0; @@ -1818,7 +1819,7 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) sock->state |= FD_CONNECT; - if (params->synchronous && (sock->state & FD_WINE_NONBLOCKING)) + if (params->synchronous && sock->nonblocking) { sock_reselect( sock ); set_error( STATUS_DEVICE_NOT_READY ); @@ -1882,7 +1883,7 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) sock->event = NULL; sock->window = 0; sock->mask = 0; - sock->state |= FD_WINE_NONBLOCKING; + sock->nonblocking = 1; } sock_reselect( sock ); @@ -1900,7 +1901,7 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) } force_async = *(int *)get_req_data(); - if ((sock->state & FD_WINE_NONBLOCKING) && !force_async) + if (sock->nonblocking && !force_async) { set_error( STATUS_DEVICE_NOT_READY ); return 0; @@ -1919,7 +1920,7 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) } if (*(int *)get_req_data()) { - sock->state |= FD_WINE_NONBLOCKING; + sock->nonblocking = 1; } else { @@ -1928,7 +1929,7 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) set_error( STATUS_INVALID_PARAMETER ); return 0; } - sock->state &= ~FD_WINE_NONBLOCKING; + sock->nonblocking = 0; } return 1; @@ -2354,7 +2355,7 @@ DECL_HANDLER(set_socket_event) sock_reselect( sock ); - sock->state |= FD_WINE_NONBLOCKING; + sock->nonblocking = 1; /* if a network event is pending, signal the event object it is possible that FD_CONNECT or FD_ACCEPT network events has happened @@ -2442,7 +2443,7 @@ DECL_HANDLER(recv_socket) fd = sock->fd; /* recv() returned EWOULDBLOCK, i.e. no data available yet */ - if (status == STATUS_DEVICE_NOT_READY && !(sock->state & FD_WINE_NONBLOCKING)) + if (status == STATUS_DEVICE_NOT_READY && !sock->nonblocking) { #ifdef SO_RCVTIMEO struct timeval tv; @@ -2543,11 +2544,11 @@ DECL_HANDLER(send_socket) * not trying to force the operation to be asynchronous), return success. * Windows actually refuses to send any data in this case, and returns * EWOULDBLOCK, but we have no way of doing that. */ - if (status == STATUS_DEVICE_NOT_READY && req->total && (sock->state & FD_WINE_NONBLOCKING)) + if (status == STATUS_DEVICE_NOT_READY && req->total && sock->nonblocking) status = STATUS_SUCCESS; /* send() returned EWOULDBLOCK or a short write, i.e. cannot send all data yet */ - if (status == STATUS_DEVICE_NOT_READY && !(sock->state & FD_WINE_NONBLOCKING)) + if (status == STATUS_DEVICE_NOT_READY && !sock->nonblocking) { #ifdef SO_SNDTIMEO struct timeval tv;

1 0

← Newer
1
...
42
43
44
45
46
47
48
...
82
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2021