diff options
Diffstat (limited to 'Master/tlpkg/tlperl/lib/CORE/vdir.h')
-rw-r--r-- | Master/tlpkg/tlperl/lib/CORE/vdir.h | 42 |
1 files changed, 10 insertions, 32 deletions
diff --git a/Master/tlpkg/tlperl/lib/CORE/vdir.h b/Master/tlpkg/tlperl/lib/CORE/vdir.h index db7ec8417fe..a4186a1ad9f 100644 --- a/Master/tlpkg/tlperl/lib/CORE/vdir.h +++ b/Master/tlpkg/tlperl/lib/CORE/vdir.h @@ -146,43 +146,21 @@ void VDir::Init(VDir* pDir, VMem *p) else { int bSave = bManageDirectory; DWORD driveBits = GetLogicalDrives(); - OSVERSIONINFO osver; - - memset(&osver, 0, sizeof(osver)); - osver.dwOSVersionInfoSize = sizeof(osver); - GetVersionEx(&osver); bManageDirectory = 0; - if (osver.dwMajorVersion < 5) { - char szBuffer[MAX_PATH*driveCount]; - if (GetLogicalDriveStringsA(sizeof(szBuffer), szBuffer)) { - char* pEnv = (char*)GetEnvironmentStringsA(); - char* ptr = szBuffer; - for (index = 0; index < driveCount; ++index) { - if (driveBits & (1<<index)) { - ptr += SetDirA(ptr, index) + 1; - FromEnvA(pEnv, index); - } - } - FreeEnvironmentStringsA(pEnv); - } - SetDefaultA("."); - } - else { /* Windows 2000 or later */ - WCHAR szBuffer[MAX_PATH*driveCount]; - if (GetLogicalDriveStringsW(sizeof(szBuffer), szBuffer)) { - WCHAR* pEnv = GetEnvironmentStringsW(); - WCHAR* ptr = szBuffer; - for (index = 0; index < driveCount; ++index) { - if (driveBits & (1<<index)) { - ptr += SetDirW(ptr, index) + 1; - FromEnvW(pEnv, index); - } + WCHAR szBuffer[MAX_PATH*driveCount]; + if (GetLogicalDriveStringsW(sizeof(szBuffer), szBuffer)) { + WCHAR* pEnv = GetEnvironmentStringsW(); + WCHAR* ptr = szBuffer; + for (index = 0; index < driveCount; ++index) { + if (driveBits & (1<<index)) { + ptr += SetDirW(ptr, index) + 1; + FromEnvW(pEnv, index); } - FreeEnvironmentStringsW(pEnv); } - SetDefaultW(L"."); + FreeEnvironmentStringsW(pEnv); } + SetDefaultW(L"."); bManageDirectory = bSave; } } |