Norse_Harold/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

fix bc warnings (RDC params)

Browse Source 
This was SVN commit r454.
This commit is contained in:
janwas 2004-06-09 15:45:15 +00:00
parent 69fb0064b4
commit 40b2cbcba3
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
source/lib/sysdep/win/wfam.cpp
View File

@ -84,6 +84,10 @@ struct Watch
DWORD last_action; // FILE_ACTION_* codes or 0
DWORD last_ticks; // timestamp via GetTickCount
DWORD dummy_nbytes;
// storage for RDC lpBytesReturned, to avoid BoundsChecker warning
// (dox are unclear on whether the pointer must be valid).
OVERLAPPED ovl;
// fields aren't used.
// overlapped I/O completation notification is via IOCP.
@ -205,17 +209,6 @@ static int alloc_watch(FAMConnection* const fc, const FAMRequest* const fr, Watc
}
static int free_watch(FAMConnection* const fc, const FAMRequest* const fr, Watch*& w)
{
GET_APP_STATE(fc, state);
Watches& watches = state->watches;
watches.erase(fr->reqnum);
w = 0;
return 0;
}
static int find_watch(FAMConnection* const fc, const FAMRequest* const fr, Watch*& w)
{
GET_APP_STATE(fc, state);
@ -232,6 +225,20 @@ static int find_watch(FAMConnection* const fc, const FAMRequest* const fr, Watch
CHECK_ERR(find_watch(fc, fr, watch_ptr_var))
static int free_watch(FAMConnection* const fc, const FAMRequest* const fr, Watch*& w)
{
GET_APP_STATE(fc, state);
Watches& watches = state->watches;
WatchIt it = watches.find(fr->reqnum);
if(it == watches.end())
return -1;
delete it->second;
watches.erase(it);
w = 0;
return 0;
}
///////////////////////////////////////////////////////////////////////////////
@ -459,7 +466,7 @@ static int get_packet(FAMConnection* fc)
FILE_NOTIFY_CHANGE_CREATION;
const DWORD buf_size = sizeof(w->change_buf);
memset(&w->ovl, 0, sizeof(w->ovl));
BOOL ret = ReadDirectoryChangesW(w->hDir, w->change_buf, buf_size, FALSE, filter, 0, &w->ovl, 0);
BOOL ret = ReadDirectoryChangesW(w->hDir, w->change_buf, buf_size, FALSE, filter, &w->dummy_nbytes, &w->ovl, 0);
if(!ret)
debug_warn("ReadDirectoryChangesW failed");