Re: advapi32: increase robustness for incorrect api usage