Changeset 21720 for branches/gcc-kmk/src/kernel32/osliblvm.cpp
- Timestamp:
- Oct 19, 2011, 11:26:02 AM (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/gcc-kmk/src/kernel32/osliblvm.cpp
r21583 r21720 21 21 #include <win32type.h> 22 22 #include <winconst.h> 23 #include <win \winioctl.h>23 #include <win/winioctl.h> 24 24 #include "osliblvm.h" 25 25 … … 89 89 rc = DosQueryProcAddr(hModLVM, 0, "Write_Sectors", (PFN *)&pfnWrite_Sectors); 90 90 if(rc) goto fail; 91 91 92 92 return TRUE; 93 93 … … 267 267 Volume_Control_Array *volctrl; 268 268 CARDINAL32 lasterror; 269 269 270 270 if(!hModLVM) { 271 271 dprintf(("LVM dll not loaded -> fail")); … … 310 310 //****************************************************************************** 311 311 //****************************************************************************** 312 BOOL OSLibLVMQueryVolumeName(HANDLE hVolumeControlData, ULONG *pVolIndex, 312 BOOL OSLibLVMQueryVolumeName(HANDLE hVolumeControlData, ULONG *pVolIndex, 313 313 LPSTR lpszVolumeName, DWORD cchBufferLength) 314 314 { … … 346 346 static Volume_Information_Record OSLibLVMFindVolumeByDriveLetter(ULONG driveLetter, 347 347 Volume_Control_Record *pVolRec, 348 CARDINAL32 *lasterror) 348 CARDINAL32 *lasterror) 349 349 { 350 350 Volume_Control_Array *volctrl; … … 384 384 static Volume_Information_Record OSLibLVMFindVolumeByName(LPSTR pszVolName, 385 385 Volume_Control_Record *pVolRec, 386 CARDINAL32 *lasterror) 386 CARDINAL32 *lasterror) 387 387 { 388 388 Volume_Control_Array *volctrl; … … 564 564 // - -1 if volume wasn't found 565 565 // - 0 if volume is present, but not mounted 566 // 566 // 567 567 //****************************************************************************** 568 568 CHAR OSLibLVMQueryDriveFromVolumeName(LPCSTR lpszVolume) … … 596 596 //****************************************************************************** 597 597 //****************************************************************************** 598 DWORD OSLibLVMQueryVolumeSerialAndName(LPSTR lpszVolume, LPDWORD lpVolumeSerialNumber, 598 DWORD OSLibLVMQueryVolumeSerialAndName(LPSTR lpszVolume, LPDWORD lpVolumeSerialNumber, 599 599 LPSTR lpVolumeNameBuffer, DWORD nVolumeNameSize) 600 600 { … … 621 621 //****************************************************************************** 622 622 //****************************************************************************** 623 BOOL OSLibLVMGetVolumeNameForVolumeMountPoint(LPCSTR lpszVolumeMountPoint, 624 LPSTR lpszVolumeName, 623 BOOL OSLibLVMGetVolumeNameForVolumeMountPoint(LPCSTR lpszVolumeMountPoint, 624 LPSTR lpszVolumeName, 625 625 DWORD cchBufferLength) 626 626 { … … 665 665 strncpy(lpszOS2VolumeName, &lpszWin32VolumeName[sizeof(VOLUME_NAME_PREFIX)-1+1], cchBufferLength-1); //-zero term + starting '{' 666 666 length -= sizeof(VOLUME_NAME_PREFIX)-1+1; 667 if(lpszOS2VolumeName[length-2] == '}') 667 if(lpszOS2VolumeName[length-2] == '}') 668 668 { 669 669 lpszOS2VolumeName[length-2] = 0; … … 671 671 } 672 672 else 673 if(lpszOS2VolumeName[length-1] == '}') 673 if(lpszOS2VolumeName[length-1] == '}') 674 674 { 675 675 lpszOS2VolumeName[length-1] = 0;
Note:
See TracChangeset
for help on using the changeset viewer.