From eecf01b9bb2795ecd7ccbf6a2c7431b43fc2a562 Mon Sep 17 00:00:00 2001
From: Michael Curran <mick@kulgan.net>
Date: Fri, 20 Apr 2012 09:54:22 +1000
Subject: [PATCH] nvdaHelperLocal's startServer:  while we're fiddling with rpc
 and doing lots of testing, convert this code to use auto-listen interfaces
 just like nvdaHelperRemote does, rather than having to create a thread to run
 a specific server.  !. dlls are supposed to do this, and 2. There has always
 been a chance that our rpc server thread had not yet fully initialized before
  the first remote code was run.

---
 nvdaHelper/local/rpcSrv.cpp | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/nvdaHelper/local/rpcSrv.cpp b/nvdaHelper/local/rpcSrv.cpp
index d9d2e47a4..853476e07 100644
--- a/nvdaHelper/local/rpcSrv.cpp
+++ b/nvdaHelper/local/rpcSrv.cpp
@@ -68,26 +68,20 @@ RPC_STATUS startServer() {
 	//Register the interfaces
 	if(RpcServerRegisterIf3) { //Windows 8
 		for(int i=0;i<ARRAYSIZE(availableInterfaces);i++) {
-			if((status=RpcServerRegisterIf3(availableInterfaces[i],NULL,NULL,RPC_IF_ALLOW_CALLBACKS_WITH_NO_AUTH,RPC_C_LISTEN_MAX_CALLS_DEFAULT,0,NULL,psd))!=RPC_S_OK) {
+			if((status=RpcServerRegisterIf3(availableInterfaces[i],NULL,NULL,RPC_IF_AUTOLISTEN|RPC_IF_ALLOW_CALLBACKS_WITH_NO_AUTH,RPC_C_LISTEN_MAX_CALLS_DEFAULT,0,NULL,psd))!=RPC_S_OK) {
 				LOG_ERROR(L"RpcServerRegisterIf3 failed to register interface at index "<<i<<L", status "<<status);
 				return status;
 			}
 		}
 	} else { // Pre Windows 8
 		for(int i=0;i<ARRAYSIZE(availableInterfaces);i++) {
-			if((status=RpcServerRegisterIf(availableInterfaces[i],NULL,NULL))!=RPC_S_OK) {
+			if((status=RpcServerRegisterIfEx(availableInterfaces[i],NULL,NULL,RPC_IF_AUTOLISTEN,RPC_C_LISTEN_MAX_CALLS_DEFAULT,NULL))!=RPC_S_OK) {
 				LOG_ERROR(L"RpcServerRegisterIf failed to register interface at index "<<i<<L", status "<<status);
 				return status;
 			}
 		}
 	}
 	LocalFree(psd);
-	//Start listening
-	if((status=RpcServerListen(1,RPC_C_LISTEN_MAX_CALLS_DEFAULT,TRUE))!=RPC_S_OK) {
-		LOG_ERROR(L"RpcServerListen failed with status "<<status);
-		return status;
-	}
-	CreateThread(NULL,0,(LPTHREAD_START_ROUTINE)RpcMgmtWaitServerListen,NULL,0,NULL);
 	return status;
 }
 
@@ -99,5 +93,5 @@ RPC_STATUS stopServer() {
 			return status;
 		}
 	}
-	return RpcMgmtStopServerListening(NULL); 
+	return status;
 }
-- 
2.11.0