Add improved version support win32 and wrapper class name clibasewrapper.