October 2006 - Wine-Commits

Paul Vriens : advpack: Fix typos.
by Alexandre Julliard Oct. 31, 2006

Oct. 31, 2006

Module: wine Branch: master Commit: f8268719bf760fb031cdc74e13bf3cd8b4b7c63f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8268719bf760fb031cdc74e1… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Oct 31 15:17:31 2006 +0100 advpack: Fix typos. --- dlls/advpack/tests/install.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advpack/tests/install.c b/dlls/advpack/tests/install.c index b594a1e..f589a0d 100644 --- a/dlls/advpack/tests/install.c +++ b/dlls/advpack/tests/install.c @@ -235,8 +235,8 @@ static void test_LaunchINFSectionEx() /* try an invalid CAB filename */ lstrcpy(cmdline, CURR_DIR); - lstrcpy(cmdline, "\\"); - lstrcpy(cmdline, "test.inf,DefaultInstall,c:imacab.cab,4"); + lstrcat(cmdline, "\\"); + lstrcat(cmdline, "test.inf,DefaultInstall,c:imacab.cab,4"); hr = pLaunchINFSectionEx(NULL, NULL, cmdline, 0); ok(hr == 0, "Expected 0, got %d\n", hr);

1 0

Paul Vriens : advpack: Add another test.
by Alexandre Julliard Oct. 31, 2006

Oct. 31, 2006

Module: wine Branch: master Commit: 26172f8aa41d86644aa6a30a4d33cd190c614785 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26172f8aa41d86644aa6a30a4… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Oct 31 18:36:50 2006 +0100 advpack: Add another test. --- dlls/advpack/tests/install.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/advpack/tests/install.c b/dlls/advpack/tests/install.c index f589a0d..96c09a3 100644 --- a/dlls/advpack/tests/install.c +++ b/dlls/advpack/tests/install.c @@ -233,13 +233,19 @@ static void test_LaunchINFSectionEx() create_inf_file("test.inf"); - /* try an invalid CAB filename */ + /* try an invalid CAB filename with an absolute INF name */ lstrcpy(cmdline, CURR_DIR); lstrcat(cmdline, "\\"); lstrcat(cmdline, "test.inf,DefaultInstall,c:imacab.cab,4"); hr = pLaunchINFSectionEx(NULL, NULL, cmdline, 0); ok(hr == 0, "Expected 0, got %d\n", hr); + /* try an invalid CAB filename with a relative INF name */ + lstrcpy(cmdline, "test.inf,DefaultInstall,c:imacab.cab,4"); + hr = pLaunchINFSectionEx(NULL, NULL, cmdline, 0); + todo_wine + ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %d\n", hr); + DeleteFileA("test.inf"); }

1 0

Huw Davies : hhctrl.ocx: Don't fail if ole is already initialised.
by Alexandre Julliard Oct. 31, 2006

Oct. 31, 2006

Module: wine Branch: master Commit: 97e598b679fe5527d622ad0a37c91cd09057954c URL: http://source.winehq.org/git/wine.git/?a=commit;h=97e598b679fe5527d622ad0a3… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 31 19:19:44 2006 +0000 hhctrl.ocx: Don't fail if ole is already initialised. --- dlls/hhctrl.ocx/help.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index 4713185..426996d 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -847,7 +847,7 @@ int WINAPI doWinMain(HINSTANCE hInstance MSG msg; HHInfo *pHHInfo; - if (OleInitialize(NULL) != S_OK) + if (FAILED(OleInitialize(NULL))) return -1; pHHInfo = HH_OpenHH(hInstance, HH_ANSIToUnicode(szCmdLine));

1 0

Markus Amsler : cmd: Check for argument in copy, mkdir, delete, goto, move, rmdir, rename, type.
by Alexandre Julliard Oct. 31, 2006

Oct. 31, 2006

Module: wine Branch: master Commit: 765ff5d629c7161ea05574b023da897a75952579 URL: http://source.winehq.org/git/wine.git/?a=commit;h=765ff5d629c7161ea05574b02… Author: Markus Amsler <markus.amsler(a)oribi.org> Date: Tue Oct 31 21:11:28 2006 +0100 cmd: Check for argument in copy, mkdir, delete, goto, move, rmdir, rename, type. --- programs/cmd/builtins.c | 34 ++++++++++++++++++++++++++++++++++ 1 files changed, 34 insertions(+), 0 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 3329a0b..8a79b98 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -110,6 +110,11 @@ BOOL force, status; static const char overwrite[] = "Overwrite file (Y/N)?"; char string[8], outpath[MAX_PATH], inpath[MAX_PATH], *infile; + if (param1[0] == 0x00) { + WCMD_output ("Argument missing\n"); + return; + } + if ((strchr(param1,'*') != NULL) && (strchr(param1,'%') != NULL)) { WCMD_output ("Wildcards not yet supported\n"); return; @@ -203,6 +208,10 @@ BOOL create_full_path(CHAR* path) void WCMD_create_dir (void) { + if (param1[0] == 0x00) { + WCMD_output ("Argument missing\n"); + return; + } if (!create_full_path(param1)) WCMD_print_error (); } @@ -220,6 +229,10 @@ HANDLE hff; char fpath[MAX_PATH]; char *p; + if (param1[0] == 0x00) { + WCMD_output ("Argument missing\n"); + return; + } hff = FindFirstFile (param1, &fd); if (hff == INVALID_HANDLE_VALUE) { WCMD_output ("%s :File Not Found\n",param1); @@ -413,6 +426,10 @@ void WCMD_goto (void) { char string[MAX_PATH]; + if (param1[0] == 0x00) { + WCMD_output ("Argument missing\n"); + return; + } if (context != NULL) { SetFilePointer (context -> h, 0, NULL, FILE_BEGIN); while (WCMD_fgets (string, sizeof(string), context -> h)) { @@ -484,6 +501,11 @@ char outpath[MAX_PATH], inpath[MAX_PATH] WIN32_FIND_DATA fd; HANDLE hff; + if (param1[0] == 0x00) { + WCMD_output ("Argument missing\n"); + return; + } + if ((strchr(param1,'*') != NULL) || (strchr(param1,'%') != NULL)) { WCMD_output ("Wildcards not yet supported\n"); return; @@ -533,6 +555,10 @@ char string[32]; void WCMD_remove_dir (void) { + if (param1[0] == 0x00) { + WCMD_output ("Argument missing\n"); + return; + } if (!RemoveDirectory (param1)) WCMD_print_error (); } @@ -547,6 +573,10 @@ void WCMD_rename (void) { int status; + if (param1[0] == 0x00 || param2[0] == 0x00) { + WCMD_output ("Argument missing\n"); + return; + } if ((strchr(param1,'*') != NULL) || (strchr(param1,'%') != NULL)) { WCMD_output ("Wildcards not yet supported\n"); return; @@ -1008,6 +1038,10 @@ HANDLE h; char buffer[512]; DWORD count; + if (param1[0] == 0x00) { + WCMD_output ("Argument missing\n"); + return; + } h = CreateFile (param1, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if (h == INVALID_HANDLE_VALUE) {

1 0

Rob Shearman : rpcrt4: Set the AI_PASSIVE flag to getaddrinfo in rpcrt4_ip_tcp_open so that the bound-to port is connectable from other machines .
by Alexandre Julliard Oct. 31, 2006

Oct. 31, 2006

Module: wine Branch: master Commit: 85e28ae33d4f22809ae71a4ba6b4a4a24b1e679f URL: http://source.winehq.org/git/wine.git/?a=commit;h=85e28ae33d4f22809ae71a4ba… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Oct 31 19:02:33 2006 +0000 rpcrt4: Set the AI_PASSIVE flag to getaddrinfo in rpcrt4_ip_tcp_open so that the bound-to port is connectable from other machines. --- dlls/rpcrt4/rpc_transport.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 19da6a5..a264b9b 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -584,7 +584,7 @@ static RPC_STATUS rpcrt4_ncacn_ip_tcp_op if (tcpc->sock != -1) return RPC_S_OK; - hints.ai_flags = 0; + hints.ai_flags = Connection->server ? AI_PASSIVE : 0; hints.ai_family = PF_UNSPEC; hints.ai_socktype = SOCK_STREAM; hints.ai_protocol = IPPROTO_TCP;

1 0

Rob Shearman : rpcrt4: Improve the debug messages for failures in rpcrt4_ip_tcp_open.
by Alexandre Julliard Oct. 31, 2006

Oct. 31, 2006

Module: wine Branch: master Commit: 3ed6a201c20eb54ae2db5d827a68dd05dd80f1c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ed6a201c20eb54ae2db5d827… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Oct 31 19:03:20 2006 +0000 rpcrt4: Improve the debug messages for failures in rpcrt4_ip_tcp_open. --- dlls/rpcrt4/rpc_transport.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index a90b73c..19da6a5 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -596,7 +596,8 @@ static RPC_STATUS rpcrt4_ncacn_ip_tcp_op ret = getaddrinfo(Connection->NetworkAddr, Connection->Endpoint, &hints, &ai); if (ret) { - ERR("getaddrinfo failed: %s\n", gai_strerror(ret)); + ERR("getaddrinfo for %s:%s failed: %s\n", Connection->NetworkAddr, + Connection->Endpoint, gai_strerror(ret)); return RPC_S_SERVER_UNAVAILABLE; } @@ -615,7 +616,7 @@ static RPC_STATUS rpcrt4_ncacn_ip_tcp_op sock = socket(ai_cur->ai_family, ai_cur->ai_socktype, ai_cur->ai_protocol); if (sock < 0) { - WARN("socket() failed\n"); + WARN("socket() failed: %s\n", strerror(errno)); continue; } @@ -624,14 +625,14 @@ static RPC_STATUS rpcrt4_ncacn_ip_tcp_op ret = bind(sock, ai_cur->ai_addr, ai_cur->ai_addrlen); if (ret < 0) { - WARN("bind failed, error %d\n", ret); + WARN("bind failed: %s\n", strerror(errno)); close(sock); continue; } ret = listen(sock, 10); if (ret < 0) { - WARN("listen failed, error %d\n", ret); + WARN("listen failed: %s\n", strerror(errno)); close(sock); continue; } @@ -652,7 +653,7 @@ static RPC_STATUS rpcrt4_ncacn_ip_tcp_op { if (0>connect(sock, ai_cur->ai_addr, ai_cur->ai_addrlen)) { - WARN("connect() failed\n"); + WARN("connect() failed: %s\n", strerror(errno)); close(sock); continue; }

1 0

Rob Shearman : rpcrt4: Set the socket back to blocking in rpcrt4_conn_tcp_handoff as
by Alexandre Julliard Oct. 31, 2006

Oct. 31, 2006

Module: wine Branch: master Commit: 828c733f72cd45f6b356d741336afbafb3da71eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=828c733f72cd45f6b356d7413… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Oct 31 19:01:56 2006 +0000 rpcrt4: Set the socket back to blocking in rpcrt4_conn_tcp_handoff as the read and write function for the protseq assume that syscalls will block. --- dlls/rpcrt4/rpc_transport.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index d50b60b..a90b73c 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -684,6 +684,8 @@ static RPC_STATUS rpcrt4_conn_tcp_handof ERR("Failed to accept a TCP connection: error %d\n", ret); return RPC_S_SERVER_UNAVAILABLE; } + /* reset to blocking behaviour */ + fcntl(ret, F_SETFL, 0); client->sock = ret; TRACE("Accepted a new TCP connection\n"); return RPC_S_OK;

1 0

Rob Shearman : rpcrt4: Fix a typo in rpcrt4_ip_tcp_open that would cause the function
by Alexandre Julliard Oct. 31, 2006

Oct. 31, 2006

Module: wine Branch: master Commit: e2e05d0493ee48b58b4b6997868d4bfea761a4f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2e05d0493ee48b58b4b69978… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Oct 31 19:01:33 2006 +0000 rpcrt4: Fix a typo in rpcrt4_ip_tcp_open that would cause the function to go into an infinite loop if getaddrinfo returned more than one entry. --- dlls/rpcrt4/rpc_transport.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 2f65f75..d50b60b 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -600,7 +600,7 @@ static RPC_STATUS rpcrt4_ncacn_ip_tcp_op return RPC_S_SERVER_UNAVAILABLE; } - for (ai_cur = ai; ai_cur; ai_cur = ai->ai_next) + for (ai_cur = ai; ai_cur; ai_cur = ai_cur->ai_next) { if (TRACE_ON(rpc)) {

1 0

Rob Shearman : rpcrt4: Convert the named pipe server code to look directly into the
by Alexandre Julliard Oct. 31, 2006

Oct. 31, 2006

Module: wine Branch: master Commit: 593d0fbac0cee12faeacdc88154d726c4336101c URL: http://source.winehq.org/git/wine.git/?a=commit;h=593d0fbac0cee12faeacdc881… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Oct 31 19:00:45 2006 +0000 rpcrt4: Convert the named pipe server code to look directly into the connection to get at the wait handles, instead of using get_connect_wait_handle which isn't generic enough to be used for other protocols. Remove the unneeded get_connect_wait_handle function from the connection operations function list. --- dlls/rpcrt4/rpc_binding.h | 6 ------ dlls/rpcrt4/rpc_transport.c | 37 ++++++++++++++----------------------- 2 files changed, 14 insertions(+), 29 deletions(-) diff --git a/dlls/rpcrt4/rpc_binding.h b/dlls/rpcrt4/rpc_binding.h index 221918d..e6b097c 100644 --- a/dlls/rpcrt4/rpc_binding.h +++ b/dlls/rpcrt4/rpc_binding.h @@ -66,7 +66,6 @@ struct connection_ops { unsigned char epm_protocols[2]; /* only floors 3 and 4. see http://www.opengroup.org/onlinepubs/9629399/apdxl.htm */ RpcConnection *(*alloc)(void); RPC_STATUS (*open_connection)(RpcConnection *conn); - HANDLE (*get_connect_wait_handle)(RpcConnection *conn); RPC_STATUS (*handoff)(RpcConnection *old_conn, RpcConnection *new_conn); int (*read)(RpcConnection *conn, void *buffer, unsigned int len); int (*write)(RpcConnection *conn, const void *buffer, unsigned int len); @@ -150,11 +149,6 @@ static inline int rpcrt4_conn_close(RpcC return Connection->ops->close(Connection); } -static inline HANDLE rpcrt4_conn_get_wait_object(RpcConnection *Connection) -{ - return Connection->ops->get_connect_wait_handle(Connection); -} - static inline RPC_STATUS rpcrt4_conn_handoff(RpcConnection *old_conn, RpcConnection *new_conn) { return old_conn->ops->handoff(old_conn, new_conn); diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index d3829c0..2f65f75 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -221,12 +221,6 @@ static RPC_STATUS rpcrt4_ncacn_np_open(R return r; } -static HANDLE rpcrt4_conn_np_get_connect_event(RpcConnection *Connection) -{ - RpcConnection_np *npc = (RpcConnection_np *) Connection; - return npc->ovl.hEvent; -} - static RPC_STATUS rpcrt4_conn_np_handoff(RpcConnection *old_conn, RpcConnection *new_conn) { RpcConnection_np *old_npc = (RpcConnection_np *) old_conn; @@ -406,19 +400,19 @@ static void rpcrt4_protseq_np_signal_sta static void *rpcrt4_protseq_np_get_wait_array(RpcServerProtseq *protseq, void *prev_array, unsigned int *count) { HANDLE *objs = prev_array; - RpcConnection* conn; + RpcConnection_np *conn; RpcServerProtseq_np *npps = CONTAINING_RECORD(protseq, RpcServerProtseq_np, common); EnterCriticalSection(&protseq->cs); /* open and count connections */ *count = 1; - conn = protseq->conn; + conn = CONTAINING_RECORD(protseq->conn, RpcConnection_np, common); while (conn) { - RPCRT4_OpenConnection(conn); - if (rpcrt4_conn_get_wait_object(conn)) + RPCRT4_OpenConnection(&conn->common); + if (conn->ovl.hEvent) (*count)++; - conn = conn->Next; + conn = CONTAINING_RECORD(conn->common.Next, RpcConnection_np, common); } /* make array of connections */ @@ -435,11 +429,11 @@ static void *rpcrt4_protseq_np_get_wait_ objs[0] = npps->mgr_event; *count = 1; - conn = protseq->conn; + conn = CONTAINING_RECORD(protseq->conn, RpcConnection_np, common); while (conn) { - if ((objs[*count] = rpcrt4_conn_get_wait_object(conn))) + if ((objs[*count] = conn->ovl.hEvent)) (*count)++; - conn = conn->Next; + conn = CONTAINING_RECORD(conn->common.Next, RpcConnection_np, common); } LeaveCriticalSection(&protseq->cs); return objs; @@ -455,8 +449,8 @@ static int rpcrt4_protseq_np_wait_for_ne HANDLE b_handle; HANDLE *objs = wait_array; DWORD res; - RpcConnection* cconn; - RpcConnection* conn; + RpcConnection *cconn; + RpcConnection_np *conn; if (!objs) return -1; @@ -474,14 +468,14 @@ static int rpcrt4_protseq_np_wait_for_ne b_handle = objs[res - WAIT_OBJECT_0]; /* find which connection got a RPC */ EnterCriticalSection(&protseq->cs); - conn = protseq->conn; + conn = CONTAINING_RECORD(protseq->conn, RpcConnection_np, common); while (conn) { - if (b_handle == rpcrt4_conn_get_wait_object(conn)) break; - conn = conn->Next; + if (b_handle == conn->ovl.hEvent) break; + conn = CONTAINING_RECORD(conn->common.Next, RpcConnection_np, common); } cconn = NULL; if (conn) - RPCRT4_SpawnConnection(&cconn, conn); + RPCRT4_SpawnConnection(&cconn, &conn->common); else ERR("failed to locate connection for handle %p\n", b_handle); LeaveCriticalSection(&protseq->cs); @@ -1004,7 +998,6 @@ static const struct connection_ops conn_ { EPM_PROTOCOL_NCACN, EPM_PROTOCOL_SMB }, rpcrt4_conn_np_alloc, rpcrt4_ncacn_np_open, - rpcrt4_conn_np_get_connect_event, rpcrt4_conn_np_handoff, rpcrt4_conn_np_read, rpcrt4_conn_np_write, @@ -1016,7 +1009,6 @@ static const struct connection_ops conn_ { EPM_PROTOCOL_NCALRPC, EPM_PROTOCOL_PIPE }, rpcrt4_conn_np_alloc, rpcrt4_ncalrpc_open, - rpcrt4_conn_np_get_connect_event, rpcrt4_conn_np_handoff, rpcrt4_conn_np_read, rpcrt4_conn_np_write, @@ -1028,7 +1020,6 @@ static const struct connection_ops conn_ { EPM_PROTOCOL_NCACN, EPM_PROTOCOL_TCP }, rpcrt4_conn_tcp_alloc, rpcrt4_ncacn_ip_tcp_open, - NULL, rpcrt4_conn_tcp_handoff, rpcrt4_conn_tcp_read, rpcrt4_conn_tcp_write,

1 0

Rob Shearman : rpcrt4: Eliminate the extra thread used for RPC over TCP/ IP servers by adding socket-specific server protseq functions.
by Alexandre Julliard Oct. 31, 2006

Oct. 31, 2006

Module: wine Branch: master Commit: 7553a8990c1499a7ed5327a2a2f4ef81ce5affcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=7553a8990c1499a7ed5327a2a… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Oct 31 18:59:55 2006 +0000 rpcrt4: Eliminate the extra thread used for RPC over TCP/IP servers by adding socket-specific server protseq functions. --- dlls/rpcrt4/rpc_transport.c | 250 ++++++++++++++++++++++++++----------------- 1 files changed, 150 insertions(+), 100 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 134ea4c..d3829c0 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -564,42 +564,8 @@ typedef struct _RpcConnection_tcp { RpcConnection common; int sock; - HANDLE onEventAvailable; - HANDLE onEventHandled; - BOOL quit; } RpcConnection_tcp; -static DWORD WINAPI rpcrt4_tcp_poll_thread(LPVOID arg) -{ - RpcConnection_tcp *tcpc; - int ret; - struct pollfd pollInfo; - - tcpc = (RpcConnection_tcp*) arg; - pollInfo.fd = tcpc->sock; - pollInfo.events = POLLIN; - - while (!tcpc->quit) - { - ret = poll(&pollInfo, 1, 1000); - if (ret < 0) - ERR("poll failed with error %d\n", ret); - else - { - if (pollInfo.revents & POLLIN) - { - SignalObjectAndWait(tcpc->onEventAvailable, - tcpc->onEventHandled, INFINITE, FALSE); - } - } - } - - /* This avoids the tcpc being destroyed before we are done with it */ - SetEvent(tcpc->onEventAvailable); - - return 0; -} - static RpcConnection *rpcrt4_conn_tcp_alloc(void) { RpcConnection_tcp *tcpc; @@ -607,9 +573,6 @@ static RpcConnection *rpcrt4_conn_tcp_al if (tcpc == NULL) return NULL; tcpc->sock = -1; - tcpc->onEventAvailable = NULL; - tcpc->onEventHandled = NULL; - tcpc->quit = FALSE; return &tcpc->common; } @@ -664,18 +627,19 @@ static RPC_STATUS rpcrt4_ncacn_ip_tcp_op if (Connection->server) { - HANDLE thread = NULL; ret = bind(sock, ai_cur->ai_addr, ai_cur->ai_addrlen); if (ret < 0) { WARN("bind failed, error %d\n", ret); - goto done; + close(sock); + continue; } ret = listen(sock, 10); if (ret < 0) { WARN("listen failed, error %d\n", ret); - goto done; + close(sock); + continue; } /* need a non-blocking socket, otherwise accept() has a potential * race-condition (poll() says it is readable, connection drops, @@ -685,47 +649,10 @@ static RPC_STATUS rpcrt4_ncacn_ip_tcp_op if (ret < 0) { WARN("couldn't make socket non-blocking, error %d\n", ret); - goto done; - } - tcpc->onEventAvailable = CreateEventW(NULL, FALSE, FALSE, NULL); - if (tcpc->onEventAvailable == NULL) - { - WARN("creating available event failed, error %lu\n", GetLastError()); - goto done; - } - tcpc->onEventHandled = CreateEventW(NULL, FALSE, FALSE, NULL); - if (tcpc->onEventHandled == NULL) - { - WARN("creating handled event failed, error %lu\n", GetLastError()); - goto done; - } - tcpc->sock = sock; - thread = CreateThread(NULL, 0, rpcrt4_tcp_poll_thread, tcpc, 0, NULL); - if (thread == NULL) - { - WARN("creating server polling thread failed, error %lu\n", - GetLastError()); - tcpc->sock = -1; - goto done; - } - CloseHandle(thread); - - done: - if (thread == NULL) /* ie. we failed somewhere */ - { close(sock); - if (tcpc->onEventAvailable != NULL) - { - CloseHandle(tcpc->onEventAvailable); - tcpc->onEventAvailable = NULL; - } - if (tcpc->onEventHandled != NULL) - { - CloseHandle(tcpc->onEventHandled); - tcpc->onEventHandled = NULL; - } continue; } + tcpc->sock = sock; } else /* it's a client */ { @@ -748,12 +675,6 @@ static RPC_STATUS rpcrt4_ncacn_ip_tcp_op return RPC_S_SERVER_UNAVAILABLE; } -static HANDLE rpcrt4_conn_tcp_get_wait_handle(RpcConnection *Connection) -{ - RpcConnection_tcp *tcpc = (RpcConnection_tcp*) Connection; - return tcpc->onEventAvailable; -} - static RPC_STATUS rpcrt4_conn_tcp_handoff(RpcConnection *old_conn, RpcConnection *new_conn) { int ret; @@ -764,7 +685,6 @@ static RPC_STATUS rpcrt4_conn_tcp_handof addrsize = sizeof(address); ret = accept(server->sock, (struct sockaddr*) &address, &addrsize); - SetEvent(server->onEventHandled); if (ret < 0) { ERR("Failed to accept a TCP connection: error %d\n", ret); @@ -799,15 +719,6 @@ static int rpcrt4_conn_tcp_close(RpcConn TRACE("%d\n", tcpc->sock); - if (tcpc->onEventAvailable != NULL) - { - /* it's a server connection */ - tcpc->quit = TRUE; - WaitForSingleObject(tcpc->onEventAvailable, INFINITE); - CloseHandle(tcpc->onEventAvailable); - CloseHandle(tcpc->onEventHandled); - } - if (tcpc->sock != -1) close(tcpc->sock); tcpc->sock = -1; @@ -949,6 +860,145 @@ static RPC_STATUS rpcrt4_ncacn_ip_tcp_pa return RPC_S_OK; } +typedef struct _RpcServerProtseq_sock +{ + RpcServerProtseq common; + int mgr_event_rcv; + int mgr_event_snd; +} RpcServerProtseq_sock; + +static RpcServerProtseq *rpcrt4_protseq_sock_alloc(void) +{ + RpcServerProtseq_sock *ps = HeapAlloc(GetProcessHeap(), 0, sizeof(*ps)); + if (ps) + { + int fds[2]; + if (!socketpair(PF_UNIX, SOCK_DGRAM, 0, fds)) + { + fcntl(fds[0], F_SETFL, O_NONBLOCK); + fcntl(fds[1], F_SETFL, O_NONBLOCK); + ps->mgr_event_rcv = fds[0]; + ps->mgr_event_snd = fds[1]; + } + else + { + ERR("socketpair failed with error %s\n", strerror(errno)); + HeapFree(GetProcessHeap(), 0, ps); + return NULL; + } + } + return &ps->common; +} + +static void rpcrt4_protseq_sock_signal_state_changed(RpcServerProtseq *protseq) +{ + RpcServerProtseq_sock *sockps = CONTAINING_RECORD(protseq, RpcServerProtseq_sock, common); + char dummy = 1; + write(sockps->mgr_event_snd, &dummy, sizeof(dummy)); +} + +static void *rpcrt4_protseq_sock_get_wait_array(RpcServerProtseq *protseq, void *prev_array, unsigned int *count) +{ + struct pollfd *poll_info = prev_array; + RpcConnection_tcp *conn; + RpcServerProtseq_sock *sockps = CONTAINING_RECORD(protseq, RpcServerProtseq_sock, common); + + EnterCriticalSection(&protseq->cs); + + /* open and count connections */ + *count = 1; + conn = (RpcConnection_tcp *)protseq->conn; + while (conn) { + RPCRT4_OpenConnection(&conn->common); + if (conn->sock != -1) + (*count)++; + conn = (RpcConnection_tcp *)conn->common.Next; + } + + /* make array of connections */ + if (poll_info) + poll_info = HeapReAlloc(GetProcessHeap(), 0, poll_info, *count*sizeof(*poll_info)); + else + poll_info = HeapAlloc(GetProcessHeap(), 0, *count*sizeof(*poll_info)); + if (!poll_info) + { + ERR("couldn't allocate poll_info\n"); + LeaveCriticalSection(&protseq->cs); + return NULL; + } + + poll_info[0].fd = sockps->mgr_event_rcv; + poll_info[0].events = POLLIN; + *count = 1; + conn = CONTAINING_RECORD(protseq->conn, RpcConnection_tcp, common); + while (conn) { + if (conn->sock != -1) + { + poll_info[*count].fd = conn->sock; + poll_info[*count].events = POLLIN; + (*count)++; + } + conn = CONTAINING_RECORD(conn->common.Next, RpcConnection_tcp, common); + } + LeaveCriticalSection(&protseq->cs); + return poll_info; +} + +static void rpcrt4_protseq_sock_free_wait_array(RpcServerProtseq *protseq, void *array) +{ + HeapFree(GetProcessHeap(), 0, array); +} + +static int rpcrt4_protseq_sock_wait_for_new_connection(RpcServerProtseq *protseq, unsigned int count, void *wait_array) +{ + struct pollfd *poll_info = wait_array; + int ret, i; + RpcConnection *cconn; + RpcConnection_tcp *conn; + + if (!poll_info) + return -1; + + ret = poll(poll_info, count, -1); + if (ret < 0) + { + ERR("poll failed with error %d\n", ret); + return -1; + } + + for (i = 0; i < count; i++) + if (poll_info[i].revents & POLLIN) + { + /* RPC server event */ + if (i == 0) + { + char dummy; + read(poll_info[0].fd, &dummy, sizeof(dummy)); + return 0; + } + + /* find which connection got a RPC */ + EnterCriticalSection(&protseq->cs); + conn = CONTAINING_RECORD(protseq->conn, RpcConnection_tcp, common); + while (conn) { + if (poll_info[i].fd == conn->sock) break; + conn = CONTAINING_RECORD(conn->common.Next, RpcConnection_tcp, common); + } + cconn = NULL; + if (conn) + RPCRT4_SpawnConnection(&cconn, &conn->common); + else + ERR("failed to locate connection for fd %d\n", poll_info[i].fd); + LeaveCriticalSection(&protseq->cs); + if (cconn) + RPCRT4_new_client(cconn); + else + return -1; + } + + return 1; +} + static const struct connection_ops conn_protseq_list[] = { { "ncacn_np", { EPM_PROTOCOL_NCACN, EPM_PROTOCOL_SMB }, @@ -978,7 +1028,7 @@ static const struct connection_ops conn_ { EPM_PROTOCOL_NCACN, EPM_PROTOCOL_TCP }, rpcrt4_conn_tcp_alloc, rpcrt4_ncacn_ip_tcp_open, - rpcrt4_conn_tcp_get_wait_handle, + NULL, rpcrt4_conn_tcp_handoff, rpcrt4_conn_tcp_read, rpcrt4_conn_tcp_write, @@ -1009,11 +1059,11 @@ static const struct protseq_ops protseq_ }, { "ncacn_ip_tcp", - rpcrt4_protseq_np_alloc, - rpcrt4_protseq_np_signal_state_changed, - rpcrt4_protseq_np_get_wait_array, - rpcrt4_protseq_np_free_wait_array, - rpcrt4_protseq_np_wait_for_new_connection, + rpcrt4_protseq_sock_alloc, + rpcrt4_protseq_sock_signal_state_changed, + rpcrt4_protseq_sock_get_wait_array, + rpcrt4_protseq_sock_free_wait_array, + rpcrt4_protseq_sock_wait_for_new_connection, }, };

1 0