Modified: trunk/reactos/lib/rpcrt4/rpc_binding.c
Modified: trunk/reactos/lib/rpcrt4/rpc_binding.h
Modified: trunk/reactos/lib/rpcrt4/rpc_message.c
Modified: trunk/reactos/lib/rpcrt4/rpc_server.c
Modified: trunk/reactos/lib/rpcrt4/rpcss_np_client.c
--- trunk/reactos/lib/rpcrt4/rpc_binding.c 2005-03-28 18:42:53 UTC (rev 14372)
+++ trunk/reactos/lib/rpcrt4/rpc_binding.c 2005-03-28 18:47:19 UTC (rev 14373)
@@ -147,11 +147,12 @@
RPC_MAX_PACKET_SIZE, RPC_MAX_PACKET_SIZE, 5000, NULL);
HeapFree(GetProcessHeap(), 0, pname);
memset(&Connection->ovl, 0, sizeof(Connection->ovl));
- Connection->ovl.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL);
- if (!ConnectNamedPipe(Connection->conn, &Connection->ovl)) {
+ Connection->ovl[0].hEvent = CreateEventW(NULL, TRUE, FALSE, NULL);
+ Connection->ovl[1].hEvent = CreateEventW(NULL, TRUE, FALSE, NULL);
+ if (!ConnectNamedPipe(Connection->conn, &Connection->ovl[0])) {
WARN("Couldn't ConnectNamedPipe (error was %ld)\n", GetLastError());
if (GetLastError() == ERROR_PIPE_CONNECTED) {
- SetEvent(Connection->ovl.hEvent);
+ SetEvent(Connection->ovl[0].hEvent);
return RPC_S_OK;
} else if (GetLastError() == ERROR_IO_PENDING) {
return RPC_S_OK;
@@ -171,10 +172,11 @@
RPC_MAX_PACKET_SIZE, RPC_MAX_PACKET_SIZE, 5000, NULL);
HeapFree(GetProcessHeap(), 0, pname);
memset(&Connection->ovl, 0, sizeof(Connection->ovl));
- Connection->ovl.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL);
- if (!ConnectNamedPipe(Connection->conn, &Connection->ovl)) {
+ Connection->ovl[0].hEvent = CreateEventW(NULL, TRUE, FALSE, NULL);
+ Connection->ovl[1].hEvent = CreateEventW(NULL, TRUE, FALSE, NULL);
+ if (!ConnectNamedPipe(Connection->conn, &Connection->ovl[0])) {
if (GetLastError() == ERROR_PIPE_CONNECTED) {
- SetEvent(Connection->ovl.hEvent);
+ SetEvent(Connection->ovl[0].hEvent);
return RPC_S_OK;
} else if (GetLastError() == ERROR_IO_PENDING) {
return RPC_S_OK;
@@ -225,7 +227,8 @@
/* pipe is connected; change to message-read mode. */
dwMode = PIPE_READMODE_MESSAGE;
SetNamedPipeHandleState(conn, &dwMode, NULL, NULL);
- Connection->ovl.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL);
+ Connection->ovl[0].hEvent = CreateEventW(NULL, TRUE, FALSE, NULL);
+ Connection->ovl[1].hEvent = CreateEventW(NULL, TRUE, FALSE, NULL);
Connection->conn = conn;
}
/* protseq=ncacn_np: named pipes */
@@ -259,7 +262,8 @@
/* pipe is connected; change to message-read mode. */
dwMode = PIPE_READMODE_MESSAGE;
SetNamedPipeHandleState(conn, &dwMode, NULL, NULL);
- Connection->ovl.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL);
+ Connection->ovl[0].hEvent = CreateEventW(NULL, TRUE, FALSE, NULL);
+ Connection->ovl[1].hEvent = CreateEventW(NULL, TRUE, FALSE, NULL);
Connection->conn = conn;
} else {
ERR("protseq %s not supported\n", Connection->Protseq);
@@ -278,10 +282,14 @@
CloseHandle(Connection->conn);
Connection->conn = 0;
}
- if (Connection->ovl.hEvent) {
- CloseHandle(Connection->ovl.hEvent);
- Connection->ovl.hEvent = 0;
+ if (Connection->ovl[0].hEvent) {
+ CloseHandle(Connection->ovl[0].hEvent);
+ Connection->ovl[0].hEvent = 0;
}
+ if (Connection->ovl[1].hEvent) {
+ CloseHandle(Connection->ovl[1].hEvent);
+ Connection->ovl[1].hEvent = 0;
+ }
return RPC_S_OK;
}
@@ -294,7 +302,8 @@
/* because of the way named pipes work, we'll transfer the connected pipe
* to the child, then reopen the server binding to continue listening */
NewConnection->conn = OldConnection->conn;
- NewConnection->ovl = OldConnection->ovl;
+ NewConnection->ovl[0] = OldConnection->ovl[0];
+ NewConnection->ovl[1] = OldConnection->ovl[1];
OldConnection->conn = 0;
memset(&OldConnection->ovl, 0, sizeof(OldConnection->ovl));
*Connection = NewConnection;
--- trunk/reactos/lib/rpcrt4/rpc_binding.h 2005-03-28 18:42:53 UTC (rev 14372)
+++ trunk/reactos/lib/rpcrt4/rpc_binding.h 2005-03-28 18:47:19 UTC (rev 14373)
@@ -32,7 +32,7 @@
LPSTR NetworkAddr;
LPSTR Endpoint;
HANDLE conn, thread;
- OVERLAPPED ovl;
+ OVERLAPPED ovl[2];
USHORT MaxTransmissionSize;
/* The active interface bound to server. */
RPC_SYNTAX_IDENTIFIER ActiveInterface;
--- trunk/reactos/lib/rpcrt4/rpc_message.c 2005-03-28 18:42:53 UTC (rev 14372)
+++ trunk/reactos/lib/rpcrt4/rpc_message.c 2005-03-28 18:47:19 UTC (rev 14373)
@@ -265,11 +265,12 @@
}
/* transmit packet header */
- if (!WriteFile(Connection->conn, Header, hdr_size, &count, &Connection->ovl)) {
+ if (!WriteFile(Connection->conn, Header, hdr_size, &count, &Connection->ovl[1]) &&
+ ERROR_IO_PENDING != GetLastError()) {
WARN("WriteFile failed with error %ld\n", GetLastError());
return GetLastError();
}
- if (!GetOverlappedResult(Connection->conn, &Connection->ovl, &count, TRUE)) {
+ if (!GetOverlappedResult(Connection->conn, &Connection->ovl[1], &count, TRUE)) {
WARN("GetOverlappedResult failed with error %ld\n", GetLastError());
return GetLastError();
}
@@ -281,11 +282,12 @@
}
/* send the fragment data */
- if (!WriteFile(Connection->conn, buffer_pos, Header->common.frag_len - hdr_size, &count, &Connection->ovl)) {
+ if (!WriteFile(Connection->conn, buffer_pos, Header->common.frag_len - hdr_size, &count, &Connection->ovl[1]) &&
+ ERROR_IO_PENDING != GetLastError()) {
WARN("WriteFile failed with error %ld\n", GetLastError());
return GetLastError();
}
- if (!GetOverlappedResult(Connection->conn, &Connection->ovl, &count, TRUE)) {
+ if (!GetOverlappedResult(Connection->conn, &Connection->ovl[1], &count, TRUE)) {
WARN("GetOverlappedResult failed with error %ld\n", GetLastError());
return GetLastError();
}
@@ -317,12 +319,13 @@
TRACE("(%p, %p, %p)\n", Connection, Header, pMsg);
/* read packet common header */
- if (!ReadFile(Connection->conn, &common_hdr, sizeof(common_hdr), &dwRead, &Connection->ovl)) {
+ if (!ReadFile(Connection->conn, &common_hdr, sizeof(common_hdr), &dwRead, &Connection->ovl[0]) &&
+ ERROR_IO_PENDING != GetLastError()) {
WARN("ReadFile failed with error %ld\n", GetLastError());
status = RPC_S_PROTOCOL_ERROR;
goto fail;
}
- if (!GetOverlappedResult(Connection->conn, &Connection->ovl, &dwRead, TRUE)) {
+ if (!GetOverlappedResult(Connection->conn, &Connection->ovl[0], &dwRead, TRUE)) {
if (GetLastError() != ERROR_MORE_DATA) {
WARN("GetOverlappedResult failed with error %ld\n", GetLastError());
status = RPC_S_PROTOCOL_ERROR;
@@ -355,12 +358,13 @@
/* read the rest of packet header */
if (!ReadFile(Connection->conn, &(*Header)->common + 1,
- hdr_length - sizeof(common_hdr), &dwRead, &Connection->ovl)) {
+ hdr_length - sizeof(common_hdr), &dwRead, &Connection->ovl[0]) &&
+ ERROR_IO_PENDING != GetLastError()) {
WARN("ReadFile failed with error %ld\n", GetLastError());
status = RPC_S_PROTOCOL_ERROR;
goto fail;
}
- if (!GetOverlappedResult(Connection->conn, &Connection->ovl, &dwRead, TRUE)) {
+ if (!GetOverlappedResult(Connection->conn, &Connection->ovl[0], &dwRead, TRUE)) {
if (GetLastError() != ERROR_MORE_DATA) {
WARN("GetOverlappedResult failed with error %ld\n", GetLastError());
status = RPC_S_PROTOCOL_ERROR;
@@ -405,12 +409,13 @@
}
if (data_length == 0) dwRead = 0; else {
- if (!ReadFile(Connection->conn, buffer_ptr, data_length, &dwRead, &Connection->ovl)) {
+ if (!ReadFile(Connection->conn, buffer_ptr, data_length, &dwRead, &Connection->ovl[0]) &&
+ ERROR_IO_PENDING != GetLastError()) {
WARN("ReadFile failed with error %ld\n", GetLastError());
status = RPC_S_PROTOCOL_ERROR;
goto fail;
}
- if (!GetOverlappedResult(Connection->conn, &Connection->ovl, &dwRead, TRUE)) {
+ if (!GetOverlappedResult(Connection->conn, &Connection->ovl[0], &dwRead, TRUE)) {
if (GetLastError() != ERROR_MORE_DATA) {
WARN("GetOverlappedResult failed with error %ld\n", GetLastError());
status = RPC_S_PROTOCOL_ERROR;
@@ -437,12 +442,13 @@
TRACE("next header\n");
/* read the header of next packet */
- if (!ReadFile(Connection->conn, *Header, hdr_length, &dwRead, &Connection->ovl)) {
+ if (!ReadFile(Connection->conn, *Header, hdr_length, &dwRead, &Connection->ovl[0]) &&
+ ERROR_IO_PENDING != GetLastError()) {
WARN("ReadFile failed with error %ld\n", GetLastError());
status = GetLastError();
goto fail;
}
- if (!GetOverlappedResult(Connection->conn, &Connection->ovl, &dwRead, TRUE)) {
+ if (!GetOverlappedResult(Connection->conn, &Connection->ovl[0], &dwRead, TRUE)) {
if (GetLastError() != ERROR_MORE_DATA) {
WARN("GetOverlappedResult failed with error %ld\n", GetLastError());
status = RPC_S_PROTOCOL_ERROR;
--- trunk/reactos/lib/rpcrt4/rpc_server.c 2005-03-28 18:42:53 UTC (rev 14372)
+++ trunk/reactos/lib/rpcrt4/rpc_server.c 2005-03-28 18:47:19 UTC (rev 14373)
@@ -483,7 +483,7 @@
conn = cps->conn;
while (conn) {
RPCRT4_OpenConnection(conn);
- if (conn->ovl.hEvent) count++;
+ if (conn->ovl[0].hEvent) count++;
conn = conn->Next;
}
cps = cps->Next;
@@ -500,7 +500,7 @@
while (cps) {
conn = cps->conn;
while (conn) {
- if (conn->ovl.hEvent) objs[count++] = conn->ovl.hEvent;
+ if (conn->ovl[0].hEvent) objs[count++] = conn->ovl[0].hEvent;
conn = conn->Next;
}
cps = cps->Next;
@@ -536,7 +536,7 @@
while (cps) {
conn = cps->conn;
while (conn) {
- if (conn->ovl.hEvent == b_handle) break;
+ if (conn->ovl[0].hEvent == b_handle) break;
conn = conn->Next;
}
if (conn) break;
--- trunk/reactos/lib/rpcrt4/rpcss_np_client.c 2005-03-28 18:42:53 UTC (rev 14372)
+++ trunk/reactos/lib/rpcrt4/rpcss_np_client.c 2005-03-28 18:47:19 UTC (rev 14373)
@@ -84,7 +84,9 @@
if (! WaitNamedPipeA(NAME_RPCSS_NAMED_PIPE, MASTER_MUTEX_WAITNAMEDPIPE_TIMEOUT))
{
ERR("Named pipe unavailable after waiting. Something is probably wrong.\n");
- return NULL;
+ CloseHandle(the_pipe);
+ the_pipe = NULL;
+ break;
}
}