[janderwald] 49372: [SHELL32] - Enable code as we support now IOCTL_DISK_GET_LENGTH_INFO - IOCTL_DISK_GET_LENGTH_INFO implemented in 49369

Author: janderwald
Date: Sun Oct 31 10:09:55 2010
New Revision: 49372

URL: http://svn.reactos.org/svn/reactos?rev=49372&view=rev
Log:
[SHELL32]
- Enable code as we support now IOCTL_DISK_GET_LENGTH_INFO
- IOCTL_DISK_GET_LENGTH_INFO implemented in 49369

Modified:
    trunk/reactos/dll/win32/shell32/drive.c

Modified: trunk/reactos/dll/win32/shell32/drive.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/drive.c?…
==============================================================================
--- trunk/reactos/dll/win32/shell32/drive.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/drive.c [iso-8859-1] Sun Oct 31 10:09:55 2010
@@ -395,7 +395,6 @@
       {
          WCHAR szResult[128];
          LONGLONG Result;
-#ifdef IOCTL_DISK_GET_LENGTH_INFO_IMPLEMENTED
          HANDLE hVolume;
          DWORD BytesReturned = 0;
 
@@ -404,16 +403,13 @@
          if (hVolume != INVALID_HANDLE_VALUE)
          {
             ret = DeviceIoControl(hVolume, IOCTL_DISK_GET_LENGTH_INFO, NULL, 0,
(LPVOID)&TotalNumberOfBytes, sizeof(ULARGE_INTEGER), &BytesReturned, NULL);
-            if (ret && StrFormatByteSizeW(LengthInformation.Length.QuadPart,
szResult, sizeof(szResult) / sizeof(WCHAR)))
+            if (ret && StrFormatByteSizeW(TotalNumberOfBytes.QuadPart, szResult,
sizeof(szResult) / sizeof(WCHAR)))
                SendDlgItemMessageW(hwndDlg, 14007, WM_SETTEXT, (WPARAM)NULL,
(LPARAM)szResult);
 
             CloseHandle(hVolume);
          }
-         TRACE("szResult %s hVOlume %p ret %d LengthInformation %ul Bytesreturned
%d\n", debugstr_w(szResult), hVolume, ret, LengthInformation.Length.QuadPart,
BytesReturned);
-#else
-            if (ret && StrFormatByteSizeW(TotalNumberOfBytes.QuadPart, szResult,
sizeof(szResult) / sizeof(WCHAR)))
-               SendDlgItemMessageW(hwndDlg, 14007, WM_SETTEXT, (WPARAM)NULL,
(LPARAM)szResult);
-#endif
+
+         TRACE("szResult %s hVOlume %p ret %d LengthInformation %ul Bytesreturned
%d\n", debugstr_w(szResult), hVolume, ret, TotalNumberOfBytes.QuadPart,
BytesReturned);
 
          if (StrFormatByteSizeW(TotalNumberOfBytes.QuadPart -
FreeBytesAvailable.QuadPart, szResult, sizeof(szResult) / sizeof(WCHAR)))
              SendDlgItemMessageW(hwndDlg, 14003, WM_SETTEXT, (WPARAM)NULL,
(LPARAM)szResult);