generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-01-31 06:35:03 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #494 from kolbma/develop

Browse Source 
Try OpenFileMapping in PAGE_READONLY mode because of SeCreateGlobalPrivi...
This commit is contained in:
Aleksandar Fabijanic 2014-07-11 09:04:45 -05:00
commit e1797983fb
3 changed files with 37 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Foundation/src/NamedEvent_WIN32.cpp
View File

@ -15,7 +15,9 @@
#include "Poco/NamedEvent_WIN32.h"
#include "Poco/Error.h"
#include "Poco/Exception.h"
#include "Poco/Format.h"
namespace Poco {
@ -26,7 +28,10 @@ NamedEventImpl::NamedEventImpl(const std::string& name):
{
_event = CreateEventA(NULL, FALSE, FALSE, _name.c_str());
if (!_event)
throw SystemException("cannot create named event", _name);
{
DWORD dwRetVal = GetLastError();
throw SystemException(format("cannot create named event %s [Error %d: %s]", _name, (int)dwRetVal, Error::getMessage(dwRetVal)));
}
}

7
Foundation/src/NamedEvent_WIN32U.cpp
View File

@ -15,7 +15,9 @@
#include "Poco/NamedEvent_WIN32U.h"
#include "Poco/Error.h"
#include "Poco/Exception.h"
#include "Poco/Format.h"
#include "Poco/UnicodeConverter.h"
@ -28,7 +30,10 @@ NamedEventImpl::NamedEventImpl(const std::string& name):
UnicodeConverter::toUTF16(_name, _uname);
_event = CreateEventW(NULL, FALSE, FALSE, _uname.c_str());
if (!_event)
throw SystemException("cannot create named event", _name);
{
DWORD dwRetVal = GetLastError();
throw SystemException(format("cannot create named event %s [Error %d: %s]", _name, (int)dwRetVal, Error::getMessage(dwRetVal)));
}
}

28
Foundation/src/SharedMemory_WIN32.cpp
View File

@ -15,8 +15,10 @@
#include "Poco/SharedMemory_WIN32.h"
#include "Poco/Error.h"
#include "Poco/Exception.h"
#include "Poco/File.h"
#include "Poco/Format.h"
#if defined (POCO_WIN32_UTF8)
#include "Poco/UnicodeConverter.h"
#endif
@ -46,7 +48,23 @@ SharedMemoryImpl::SharedMemoryImpl(const std::string& name, std::size_t size, Sh
#endif
if (!_memHandle)
throw SystemException("Cannot create shared memory object", _name);
{
DWORD dwRetVal = GetLastError();
if (_mode != PAGE_READONLY || dwRetVal != 5)
throw SystemException(format("Cannot create shared memory object %s [Error %d: %s]", _name, (int)dwRetVal, Error::getMessage(dwRetVal)));
#if defined (POCO_WIN32_UTF8)
_memHandle = OpenFileMappingW(PAGE_READONLY, FALSE, utf16name.c_str());
#else
_memHandle = OpenFileMappingA(PAGE_READONLY, FALSE, _name.c_str());
#endif
if (!_memHandle)
{
dwRetVal = GetLastError();
throw SystemException(format("Cannot open shared memory object %s [Error %d: %s]", _name, (int)dwRetVal, Error::getMessage(dwRetVal)));
}
}
map();
}
@ -88,9 +106,10 @@ SharedMemoryImpl::SharedMemoryImpl(const Poco::File& file, SharedMemory::AccessM
_memHandle = CreateFileMapping(_fileHandle, NULL, _mode, 0, 0, NULL);
if (!_memHandle)
{
DWORD dwRetVal = GetLastError();
CloseHandle(_fileHandle);
_fileHandle = INVALID_HANDLE_VALUE;
throw SystemException("Cannot map file into shared memory", _name);
throw SystemException(format("Cannot map file into shared memory %s [Error %d: %s]", _name, (int)dwRetVal, Error::getMessage(dwRetVal)));
}
map();
}
@ -110,7 +129,10 @@ void SharedMemoryImpl::map()
access = FILE_MAP_WRITE;
LPVOID addr = MapViewOfFile(_memHandle, access, 0, 0, _size);
if (!addr)
throw SystemException("Cannot map shared memory object", _name);
{
DWORD dwRetVal = GetLastError();
throw SystemException(format("Cannot map shared memory object %s [Error %d: %s]", _name, (int)dwRetVal, Error::getMessage(dwRetVal)));
}
_address = static_cast<char*>(addr);
}