From 31b57676e8d7ab6048dbfb145187833fac5e478c Mon Sep 17 00:00:00 2001 From: Ryan Pavlik Date: Wed, 11 Jan 2012 18:06:50 +0100 Subject: [PATCH] Use WSAStartup()/WSACleanup() on WIN32 The alternative is to use these in every WIN32 application which uses xcb. Doing it this way should be safe, as, according to MSDN, "There must be a call to WSACleanup for each successful call to WSAStartup. Only the final WSACleanup function call performs the actual cleanup. The preceding calls simply decrement an internal reference count" (We should probably also include ws2_32 in Libs.private for libxcb, as anything which links with libxcb will also need that, but there seems to be some pkg-config issues to resolve first...) v2: Check for errors so WSAStartup()/WSACleanup() uses are balanced v3: Use same indentation style as surrounding code Reviewed-by: Peter Harris Signed-off-by: Julien Danjou --- src/xcb_conn.c | 4 ++++ src/xcb_util.c | 13 ++++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/xcb_conn.c b/src/xcb_conn.c index f79de33..725502a 100644 --- a/src/xcb_conn.c +++ b/src/xcb_conn.c @@ -315,6 +315,10 @@ void xcb_disconnect(xcb_connection_t *c) _xcb_xid_destroy(c); free(c); + +#ifdef _WIN32 + WSACleanup(); +#endif } /* Private interface */ diff --git a/src/xcb_util.c b/src/xcb_util.c index 64a1f6d..9329b81 100644 --- a/src/xcb_util.c +++ b/src/xcb_util.c @@ -426,11 +426,22 @@ xcb_connection_t *xcb_connect_to_display_with_auth_info(const char *displayname, if(!parsed) { c = _xcb_conn_ret_error(XCB_CONN_CLOSED_PARSE_ERR); goto out; - } else + } else { +#ifdef _WIN32 + WSADATA wsaData; + if (WSAStartup(MAKEWORD(2, 2), &wsaData) != 0) { + c = (xcb_connection_t *) &error_connection; + goto out; + } +#endif fd = _xcb_open(host, protocol, display); + } if(fd == -1) { c = _xcb_conn_ret_error(XCB_CONN_ERROR); +#ifdef _WIN32 + WSACleanup(); +#endif goto out; } -- 2.34.1