X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=win32%2Fvdir.h;h=10119ead9ed84fb13d03260e00d6b9d1533abf42;hb=3890ecea71e8d1097fd1d7614b8a095c06dbb4f5;hp=af769f1549847ad2e9eb4dce9f50ca1274b71984;hpb=0e06870bf080a38cda51c06c6612359afc2334e1;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/win32/vdir.h b/win32/vdir.h
index af769f1..10119ea 100644
--- a/win32/vdir.h
+++ b/win32/vdir.h
@@ -150,7 +150,7 @@ void VDir::Init(VDir* pDir, VMem *p)
 	bManageDirectory = 0;
 	driveBits = GetLogicalDrives();
 	if (GetLogicalDriveStrings(sizeof(szBuffer), szBuffer)) {
-	    char* pEnv = GetEnvironmentStrings();
+	    char* pEnv = (char*)GetEnvironmentStrings();
 	    char* ptr = szBuffer;
 	    for (index = 0; index < driveCount; ++index) {
 		if (driveBits & (1<<index)) {
@@ -452,7 +452,9 @@ int VDir::SetCurrentDirectoryA(char *lpBuffer)
     DWORD r = GetFileAttributesA(pPtr);
     if ((r != 0xffffffff) && (r & FILE_ATTRIBUTE_DIRECTORY))
     {
-	SetDefaultDirA(pPtr, DriveIndex(pPtr[0]));
+	char szBuffer[(MAX_PATH+1)*2];
+	DoGetFullPathNameA(pPtr, sizeof(szBuffer), szBuffer);
+	SetDefaultDirA(szBuffer, DriveIndex(szBuffer[0]));
 	nRet = 0;
     }
 
@@ -677,7 +679,9 @@ int VDir::SetCurrentDirectoryW(WCHAR *lpBuffer)
     DWORD r = GetFileAttributesW(pPtr);
     if ((r != 0xffffffff) && (r & FILE_ATTRIBUTE_DIRECTORY))
     {
-	SetDefaultDirW(pPtr, DriveIndex((char)pPtr[0]));
+	WCHAR wBuffer[(MAX_PATH+1)*2];
+	DoGetFullPathNameW(pPtr, (sizeof(wBuffer)/sizeof(WCHAR)), wBuffer);
+	SetDefaultDirW(wBuffer, DriveIndex((char)wBuffer[0]));
 	nRet = 0;
     }