We certainly shouldn't be calling CloseHandle on a parameter like this anyway, so the change looks good to me.

However, I notice that we don't necessarily preserve GetLastError() throughout here, so perhaps we ought to consider changing the return value interpretation at some point? (e.g. CloseHandle() may change it, and so we lose the actual error) That can be a future task though.