#include <vector>
#include <algorithm>
#include <mutex>
+#include <cassert>
namespace AxWin {
{
// Allocate a window ID
::std::lock_guard<std::mutex> lock(glWindowList);
- int id = ::std::find(gWindowList.begin(), gWindowList.end(), nullptr) - gWindowList.end();
+ int id = ::std::find(gWindowList.begin(), gWindowList.end(), nullptr) - gWindowList.begin();
if( id >= MAX_WINDOW_ID ) {
throw ::std::runtime_error("AxWin4_CreateWindow - Out of IDs (TODO: Better exception)");
}
{
gWindowList.push_back(nullptr);
}
+ assert(gWindowList[id] == nullptr);
// Create window structure locally
tAxWin4_Window *ret = new tAxWin4_Window();
req.WriteU16(Window->m_id);
CDeserialiser response = GetSyncReply(req, IPCMSG_GETWINBUF);
- if( response.ReadU16() != Window->m_id )
+ unsigned int rspwin = response.ReadU16();
+ if( rspwin != Window->m_id )
{
-
+ _SysDebug("AxWin4_GetWindowBuffer: GETWINBUF reply for different window (%u != %u)", rspwin, Window->m_id);
+ return NULL;
}
uint64_t handle = response.ReadU64();
Window->m_fd = _SysUnMarshalFD(handle);
+ if( Window->m_fd == -1 ) {
+ _SysDebug("AxWin4_GetWindowBuffer: Unable to unmarshal resultant FD (0x%llx)", handle);
+ return NULL;
+ }
_SysDebug("AxWin4_GetWindowBuffer: %llx = %i", handle, Window->m_fd);
}