sync with upstream 36eba34
adjust win32 DLL names