Fix shared memory issues with boost>1.47.

rime · Apr 6, 2015 · 269b854 · 269b854
1 parent 6a6c880
commit 269b854
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/WeaselIPC/WeaselClientImpl.cpp b/WeaselIPC/WeaselClientImpl.cpp
@@ -196,7 +196,8 @@ bool ClientImpl::GetResponseData(ResponseHandler const& handler)
 	try
 	{
 		windows_shared_memory shm(open_only, WEASEL_IPC_SHARED_MEMORY, read_only);
-		mapped_region region(shm, read_only, WEASEL_IPC_METADATA_SIZE);
+		mapped_region region(shm, read_only, WEASEL_IPC_METADATA_SIZE,
+			WEASEL_IPC_SHARED_MEMORY_SIZE - WEASEL_IPC_METADATA_SIZE);
 		return handler((LPWSTR)region.get_address(), WEASEL_IPC_BUFFER_LENGTH);
 	}
 	catch (interprocess_exception& /*ex*/)
@@ -213,7 +214,8 @@ bool ClientImpl::_WriteClientInfo()
 	try
 	{
 		windows_shared_memory shm(open_only, WEASEL_IPC_SHARED_MEMORY, read_write);
-		mapped_region region(shm, read_write, WEASEL_IPC_METADATA_SIZE);
+		mapped_region region(shm, read_write, WEASEL_IPC_METADATA_SIZE,
+			WEASEL_IPC_SHARED_MEMORY_SIZE - WEASEL_IPC_METADATA_SIZE);
 		buffer = (LPWSTR)region.get_address();
 		if (!buffer)
 		{

diff --git a/WeaselIPCServer/WeaselServerImpl.cpp b/WeaselIPCServer/WeaselServerImpl.cpp
@@ -9,10 +9,13 @@ extern CAppModule _Module;
 
 SharedMemory::SharedMemory()
 {
+	boost::interprocess::permissions perms;
+	perms.set_unrestricted();
 	m_pShm.reset(new windows_shared_memory(create_only, 
 										   WEASEL_IPC_SHARED_MEMORY, 
 										   read_write, 
-										   WEASEL_IPC_SHARED_MEMORY_SIZE));
+										   WEASEL_IPC_SHARED_MEMORY_SIZE,
+										   perms));
 	m_pRegion.reset(new mapped_region(*m_pShm, read_write));
 }