Merge pull request #1633 from BrzVlad/fix-w32-pinvoke